gentoo resync : 22.10.2018

9364 files changed, 108498 insertions, 103832 deletions

diff --git a/Manifest b/Manifest
index 47ad033ce8a2..5d3e6afb9122 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28823 BLAKE2B eec86af1e9ab5acfe8b9d2b41bb6edbf94e8561ddc016b9de0d8d86e3fc1fd5d19b7b6b4bf3806c0688605ed3b47dc9beccb96208518dd17b22c31cd11fec3d7 SHA512 2535a09941096b891f14edc1da6b7c878448d23c23ca727f5fe9be0e36877d8a8aba75541742b4a9db3b6445ec85e75613fce71eb05bd988e5dfd904b8351347
-TIMESTAMP 2018-10-07T09:08:41Z
+MANIFEST Manifest.files.gz 28891 BLAKE2B e7ad6f5494634e65e0e6bf117272a5dc05556e1670a35db3b50a9930da546b6ca088d50d19b3bbfacd9f2bc5ad68943f3351785ec9f5e83c7f428b83944e814d SHA512 1e908b1708a0d75b8b960f55919d422747ffb4d129fd78461710a99385c39de8f9bb78d3b6157cf43b4bf042a06d39d9d4e58b3932e36b35502be69f4fcbc934
+TIMESTAMP 2018-10-22T09:08:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu5zRlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlvNk5lfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB29Q/9GxdCox0hzeMBrsb7HaJVr9kf7kt0wb2Zs2J21OEWFVZ8lm7QAwI/zxzO
-AdUnwvmUJSNE2u4D3vN7jmZYtH8xCxGgMxwB/AeIt2/Iz8OCd5Z398MUbm7yfbDa
-bukSwzGsHAN2WaDwb/L/+AIXMTtjLt3Jpj32XrE+W1UBII+xbHHG1Ou1MRG+RRCV
-oTDXbu4BfUzqZvMqIZL3FcAH6EhJICEqXFP1C2OxzelCPaRsEv1FbSL6TreMWBVc
-t/dxz4u0Z939CoTwqEP3mkxqxCghm/M/LpoANrsKQad96f9Gsyw+yJE1PH3o1FlR
-mnm60c3Tht2AM7fmJPLXAK6KluC5UAC6VFBKUTEMYrh5RpnEgvKCAQqIeTllBDWd
-N1/Tnw9/hkrmG11Zcpxbb3VDmI39o1CEdIiujpU7L8YZOnSIhxI9rAzwN72pWD99
-9i+aPTs5MMoYOSKQsMyVONshHovKKcULCwQIkJl5etTnpmrywxUOUDtZbJ+CnRRc
-+b315oAuFZAycTGJsn55g/tAahPYxgyPj6RnZnWLX8JvqDOz60L4iPbJL3MGJIuf
-hScvypPfJyngeKObj9clvi5qBe8J1MC7tPeCQmE0mzajGvaldKlibNqe6tPGDdEI
-Ov7aCy1mDG8N+PFL/9yricBsnsr1TMy0Mp3/0ESp+n98e7HH4j8=
-=m//7
+klALsg/+N5NFvpI9ytTcXz8+Rg4Gq0hx6SuuYbd9d64pNb+4b3v4KZIWEf+ql4ie
+Q04Nx0vlDU3QjpUWmTFDxIbDwb8uXpqq1/RQxHyklQFSPAZnfq9gkzXSJ69RBweF
+jRZNKKOwKHT2tWsTjduqGqbkO61T9a64ydYyqvuRkEuhR6D8oVWsUPyqGLnQD0qe
+rEPxPXFuE25z1lCngKG25SNPLp0DxZXY6QrjrW9ITvsRAOUSWMFrS1at6i2HQOBQ
+i6wbZAe4/J4oXD3Cc03WemeTe/GIz9gXIoM0ZUqegny+zjd7ihpQCNGkuf+NlO2Y
+14k16k8FFeNYOVuckn+WT/1zFFMIRoKFzrs2a6nQbhfKlmQ7PD1I55/UJSK94AVF
+xvenKJc6CqZC/a5Z08RHEYhzrxIrqsqSCtpIq8f7Cg9WRYmoTcYO4U1+/dP+NaKG
+PWXYw4ytTtqfZbFfCpIm+VEoalvacgb2IpdfVJtkqcy0KigA2VeAL5f8NdjPcjoN
+w6tqbnztA1hO4bSRFcy0CvZa7bpSDRQ5vUiQPuhdWpBlaBpA1FxSl3c8B0bvdNrW
+T2F8pvKMw/FcLeSyiSUU/xcqx/wDGDsXlur8wUNkPy8NUlx5jXdL4n8iSBU8Y+20
+iWyWBA+J0ued6iuoXNJlX4Bef8mSrjQafuPyg/1Et5vpX1huWMg=
+=J4Ye
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 18ef123bce61..ef379be56c86 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 73a9d08c7a44..98019cb264da 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index db19a9263f60..39d7cc7f1294 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,16 +1,12 @@
 DIST ansible-2.5.10.tar.gz 10167484 BLAKE2B 0c60758d54fabef8037ce7e79d86c1508786a3e8cfe2cb1cc9d09cc24ece107414793f4dd12013dbc4c9a1354669288e0989374a20b7ebc035115dfd907c7279 SHA512 911f1f616206136708ceb4f9955e8bf309d7b506fcca9e0f31d770ead0a47c803d670909b6fe10b0d26056d3fd5c140e144132284ad5dbb618d3b013abc9385f
 DIST ansible-2.5.8.tar.gz 10169397 BLAKE2B 7cb0abb168af25a3cd7b94880309cf19f018a68277472afb24811bb4ccc329c129f754d2b97626f71052712690e372856bfb62345cdae74165eca38066e86779 SHA512 8de8ddf1925ef1465654f4bc1d54fd9f5f9d700ef2c5a4982684f3a4560ac933b05ff0661c34e61235006abc64fd6acf299d0c45f7b5796c3a89dda5382099ed
-DIST ansible-2.5.9.tar.gz 10165368 BLAKE2B 10d30d3200702958e15695d8fb0aa84ee89b65f966b2879f3d9e89c1bae9d38bffa5936f88dbd7e3b0329f07e523677898230fff424d0d61f03cbe2dab8f3020 SHA512 0962d2f30030889b07e72346452f21cdc99305920bb8e246fc19d37ca4c837dbfba3230634db398b74959a6a67f4ed9dd097eb7783a2854f0969aeeab7e00341
-DIST ansible-2.6.3.tar.gz 10748570 BLAKE2B ff27e46771ab5c574202a195bdddb2affc256ba67de98627ef07d3899a1b6bbdb742a71deff63ad6a22aa53298eb22a22a44a885f53098e2404823565fbc513c SHA512 f34052379b892d5dff5e170e4237d4595ecf9d951226cc928fc092e253f5fa9f492a6e953ff09ed63b19ddb0f2b8df66ac738c2f48923e6d5b1dcc96fc2799c9
-DIST ansible-2.6.4.tar.gz 10751810 BLAKE2B 16a01b76387b6fb0c6554861fd02a57858cf2623ea89e55c0940589b69a6589d4db00bdf87f1e51ab64e638c187657f66ebb5af33a6fa008b7f1dba1e853b3f3 SHA512 b3dc3469dd7e34e3b39b3382df65c3684a44be0515f68861997a4d0e5fce44d64000bc0da0b38fd3d27b45aa1ec3973da581482e0de54c5cc41eb761b230b116
 DIST ansible-2.6.5.tar.gz 10757800 BLAKE2B 2389dfdbdf731382643227cb3a0df501d7b756d81dbddfe9b5ce609086eb04073441c01ed6f49480628fa2a2b3556e07c1b4588cb5df96a072d72c9a09fe2739 SHA512 3cab1d14abb3d173722ee76699ac778188481d575d589fb9e85541689a806b6f3eece9b1c5122cd863b46da56ed5cc3c32faaa143826ab3bd3e7a6cc06cbe2fe
+DIST ansible-2.6.6.tar.gz 10707168 BLAKE2B be41ee9b314a669069d4e8578baefdaa3e12864d132320ecad1cb539ae34d048a4f95b44c995f4695911f652064ef343ca35d9864326fd951e4e389088266505 SHA512 0fd8f208479bde3f9fa957c488abce17e6e7c492e6016a9acd88a11db44f777d148d451a4a246d2b55c6de85b9178e8127908e1fe36e490f7bbef350246ba716
 DIST ansible-2.7.0.tar.gz 11773769 BLAKE2B 00df537d2a8c6d76c7b4c4a424ff3c33a8a69d77ecdd741fe6ec4c6b30c7b136e28e644a488b6b49a305a454d1a923bd92d3b78be79a816fea6c127f4c2aa6da SHA512 a5e0e0b87bb2fa8fbc76825733a5c6afe642d4602be80466e5f28324e90be4487fd1c300e567a164222f171bd9eac65b7b36ca9b6fe4bebfcbd2c24dd60049ad
-EBUILD ansible-2.5.10.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
+EBUILD ansible-2.5.10.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
 EBUILD ansible-2.5.8.ebuild 1624 BLAKE2B 406259cdee18b3b47e523252906b28e2480e51d0522fd14bcf7905938a737de5895b972ea51f0309105555b6475f966473f223f0ee7112f6a3ec910a0afd8697 SHA512 1f964bda9e7b54c0810d338c2fd474cff966a79285762d6bce3dfb1210cffa0a4a1d015f46bf59ff9c6463a63319386fb6e4d2bdc3ad9ebf2b9ba53bcff57669
-EBUILD ansible-2.5.9.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
-EBUILD ansible-2.6.3.ebuild 1624 BLAKE2B 406259cdee18b3b47e523252906b28e2480e51d0522fd14bcf7905938a737de5895b972ea51f0309105555b6475f966473f223f0ee7112f6a3ec910a0afd8697 SHA512 1f964bda9e7b54c0810d338c2fd474cff966a79285762d6bce3dfb1210cffa0a4a1d015f46bf59ff9c6463a63319386fb6e4d2bdc3ad9ebf2b9ba53bcff57669
-EBUILD ansible-2.6.4.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
-EBUILD ansible-2.6.5.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
+EBUILD ansible-2.6.5.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
+EBUILD ansible-2.6.6.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
 EBUILD ansible-2.7.0.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
 EBUILD ansible-9999.ebuild 1639 BLAKE2B 363a22df345822cd047685b7cdf7114e5e1a1276bf90463799712ee90f751deea4c487f9c96a807558428d3e5993f4fded0017fb5d37b75ff6e550a6ccc32b2b SHA512 10d18db06a345555299b342eb01c7f3355f9f71d70f0ac6b3f2fc3837859161821c8c5771bec3d943647cb1c5ba8abae8c4febdccbbc4f2d747aa0f848682b46
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.10.ebuild b/app-admin/ansible/ansible-2.5.10.ebuild
index 71d5cc29eccb..652b1374c856 100644
--- a/app-admin/ansible/ansible-2.5.10.ebuild
+++ b/app-admin/ansible/ansible-2.5.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.5.9.ebuild b/app-admin/ansible/ansible-2.5.9.ebuild
deleted file mode 100644
index 6ca07021a91a..000000000000
--- a/app-admin/ansible/ansible-2.5.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.6.3.ebuild b/app-admin/ansible/ansible-2.6.3.ebuild
deleted file mode 100644
index 5b980c42cc10..000000000000
--- a/app-admin/ansible/ansible-2.6.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.6.4.ebuild b/app-admin/ansible/ansible-2.6.4.ebuild
deleted file mode 100644
index 652b1374c856..000000000000
--- a/app-admin/ansible/ansible-2.6.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.6.5.ebuild b/app-admin/ansible/ansible-2.6.5.ebuild
index 71d5cc29eccb..652b1374c856 100644
--- a/app-admin/ansible/ansible-2.6.5.ebuild
+++ b/app-admin/ansible/ansible-2.6.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.6.6.ebuild b/app-admin/ansible/ansible-2.6.6.ebuild
new file mode 100644
index 000000000000..71d5cc29eccb
--- /dev/null
+++ b/app-admin/ansible/ansible-2.6.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest
index c36ebec0626a..a45d6d0e6759 100644
--- a/app-admin/ccze/Manifest
+++ b/app-admin/ccze/Manifest
@@ -4,5 +4,5 @@ AUX ccze-ldflags.patch 424 BLAKE2B a769c1c617b7f421a0cac4cdb3141169eca8a0e23fd38
 AUX ccze-segfault.patch 660 BLAKE2B 863fa14c8ded2df423b0ff5cd9936ccb390b11d3b0dfa396d515e9a85e411c9f9f7f3ba76f04c4ba04ccc19cc43594f4d304b54cb2155ef44ef08c9c00d4b691 SHA512 e8ebdbc8293b4d765d683bbdd222c0af3aaf0668ea8376ed830efac3cdb4a99dfc75dda6e59b95e7a36b7ab4fc521a9a1937e4ab9a48218acc76d2b02844b900
 DIST ccze-0.2.1.tar.gz 139795 BLAKE2B 112e3968ca00bdb9ebda91b30a697f4422935755b3bf33d47c0a8800f3d05e371a4ca4db0ef52f10e5cba1c537ee3f666479103dc88a30f270c76268fece5cb6 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7
 EBUILD ccze-0.2.1-r3.ebuild 946 BLAKE2B a10072f19126232ed62677066e2acb0805a34492a902ad8cb5e0d03a1f39647b8572fc7444d116be0ebe5a01b199926921d0c7db8d15bc4327debda761c4470e SHA512 2aba3653cce66c2a95a960b0cbdcd7cf24e60b6340fe2f5b03cd2d0fe98fd5f52be1ae6691b184b594d6377f442b136fb0b95459fb4b2634658c62ca3c5a1b59
-EBUILD ccze-0.2.1-r4.ebuild 942 BLAKE2B 8a340fd17cf7205c9e9559e4a4ebeb7f09631326024494f13de8bf4c5233c4ab9b6f44285bd9259d0c8ea29b8ee84a3ba5003b4e80ceed8ba4f96d6d5f5a1dc8 SHA512 89175fcd5e332bfca5bafa3106b0e39b0cd786038d748faaa745e13eafc4d2a69d5bc6a08d4302eb5e0acea84265cab67f69ea148470b56d659103815cb4dddd
+EBUILD ccze-0.2.1-r4.ebuild 937 BLAKE2B aebde8aeef4e505ba0a4c78d534eff9756534cbba50eb75971b3d22e5d81d28b0fb8bbee63ccc1dbe8a690eed39cb3b9d8ea10e41ce8612b70716655ef816a1c SHA512 ae075f4af891bb67e0c8a48df96cc56592b6c32e0f62fddcaabb78b2acd1616e06c12bf7b97283ea6c019f0031784b02a050e6b4b5e9ba6f61d465eb4b51ceaf
 MISC metadata.xml 492 BLAKE2B a2658f32b8d62f60965cb71d66e3bc90c4d0aa03d4e53bca596de964c63bcd0b157b9e407ca91f789457731bf62d0d4b504376917acdf2f95b76a63bc513c29e SHA512 96d871b02eee0348e6d62f01bd25deca9044248f0f495be24fc8cadd30c16ef933a285e250f58d58b47f64eec8f964de2ef243617f66266a655cb83f02acd8d8
diff --git a/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r4.ebuild
index e2677e5eeb1f..c493acb5da82 100644
--- a/app-admin/ccze/ccze-0.2.1-r4.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit fixheadtails autotools eutils toolchain-funcs
 
 DESCRIPTION="A flexible and fast logfile colorizer"
-HOMEPAGE="https://dev.gentoo.org/~joker/ccze/ccze.txt"
+HOMEPAGE="https://github.com/madhouse/ccze/releases"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 RESTRICT="test"
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index 0f2ff44fba01..449cc96a3f4a 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -1,6 +1,8 @@
 AUX checksec-1.7.2-path.patch 510 BLAKE2B d17d260f41cf0c7e71accfa4b728a9c35511d1d1a90726bbd3a7fbbc401b69e6245f596c62d323013d29142d256eca6d792c6256f4b5d752bf55e64f96e7798a SHA512 5a5af3c35f8e8ca0ef0c44bc84ea3108bdd96c7ee98c3bda31a0f5308fd843c47a0d825fdff39e1995260391a7a747187ef804250fd0da6ccad5f93b3595a706
 DIST checksec-1.7.5.tar.gz 51266 BLAKE2B a77e6d0bf52bc8a0ec18c0f1ffe883b68acccaaee6fd0d1714d456c31c3004b5d9279c3926885be168befba1dc7a75b1269dac5cb5847c247470e765601f08e6 SHA512 7269fb3628907f6fe4e8b720d2dcbd5bf8586e1821bd758533dff6255c6a52be9146b58f60abea798ee92471c3d5ad9e867fa7ad4b8e5ea2d8aa03d5a3b83098
 DIST checksec-1.8.0.tar.gz 52391 BLAKE2B 3720e4faae5aa82172c673ce7ddc662db1433b82d25f25be4c219f1664da8af687d2a5ee9c05703e9f151a998be9226e896e125b7cff05d3881e61e8a9f5c918 SHA512 0236e40ba8b4f7c13ebd3b51f22dd05e6c4442e8646b5a1ee814556d9a6ca19f9bae638af33a6bfec2f8ef95567d222a20dcdcd9eae6ffb7ea5261919f020283
+DIST checksec-1.9.0.tar.gz 196168 BLAKE2B f9095a516f166e9a407c9796e28ed7da4ffd97686923745e46b0ab4110f084690781995b6cc190234b8a26fe1e6eb2c8f32f7f15191f0dbc26b38048c87e9a2d SHA512 8bf68dd0b86a6eceb6f5eb016a15ed1bf7d086777c3ec1c62848ec23e62dceed4579404d76824f17b8e1305e679ba6204f0dc4c224f7a11067651f33c2d96515
 EBUILD checksec-1.7.5.ebuild 761 BLAKE2B 928d7f91b7ac04ac04a9bcfaa14f8ea781eaaf2be75182d7b8d0f3cf63e0bdf9178d03da87732da11286ba172e2368eb5fa490021c3d5d71f3419d426b7b911d SHA512 5a15da1104314647688e68017189e1b661f0efd58d3a7ad5a788ab2cdda79249dce9c07e9db48d775ace6d8fb8679f2cb6669c1f16758f9c6e736e9eca2d57ba
 EBUILD checksec-1.8.0.ebuild 763 BLAKE2B 3456a3d42a58795e00cf46689bc60a99357dfec5a8ea7c43841584c10d4fe8bceb3d3c0e3a4965cd38e7c718b6c716a36cdbf895635a458122aaa34324f13600 SHA512 dd2af6317e19baef0e21112b6a64783dd1ccffaf2f0f2d80acf802b4ee14b021be23548375c9c86c8a073da38bbe4f1c58c533cb5b16cf60e082f8164dc84738
+EBUILD checksec-1.9.0.ebuild 757 BLAKE2B 526fb5bd77d4f06d01dafef1174eae285b5ee2a1ae72882f1d05d07ec141b519ef39f622f16f4e098c3df0b31f8419b6460f2d51a462b09324519efa3235fa67 SHA512 29ec62f61fbf71e19aae933ea6b01e6f606c043e50d4c004214219a04cbc96d8ede61a444a822e1a83c0245e0e379ee553e5f4bc2d7d11a2577aa0b2e9f9eeae
 MISC metadata.xml 334 BLAKE2B 96b933c9475a18c3957d46b58c41162e396f27ff7c53eaf4ba5be2a24e22e8a136a0814cce5c0d3c113e5d18a286fdd34a1b3cd46e509a7eec986f82d7d8ea9c SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716
diff --git a/app-admin/checksec/checksec-1.9.0.ebuild b/app-admin/checksec/checksec-1.9.0.ebuild
new file mode 100644
index 000000000000..eae3c30567d3
--- /dev/null
+++ b/app-admin/checksec/checksec-1.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.7.2-path.patch
+	eapply_user
+	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+}
+
+src_install() {
+	default
+
+	doman extras/man/*
+
+	insinto /usr/share/zsh/site-functions
+	doins extras/zsh/_${PN}
+
+	dobin ${PN}
+}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 614fa703efcb..e462d3a15648 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -4,4 +4,5 @@ AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a645
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 EBUILD conky-1.10.8-r1.ebuild 5148 BLAKE2B bb6889a8179156c0b53afc5650d7a12ccd9822ce71996301a77f093a835a78d9c7798fb5f3dd8d8e6263c1a1c7a2f1b1b84a3cfc932c2f7028a5973c7a536956 SHA512 94e69572ab007c4fe2b1289b2b6073031c7975ea7c0339ec34326d74a185858acb9677621f69043fe51caa79bb9b5df005b319d100bf05257c6126e654fa2bc6
 EBUILD conky-1.10.8-r2.ebuild 5191 BLAKE2B 445b7242fa320a6c3b97b56f509903f2541ec2921ea80d18a7562f80ac055f074703dafdb3ee9ad6a5713a475f5d43ea7962de0c2c77e15d153b2af823a77f2a SHA512 799f8d1d097058cc1783ed13843a9795485f8a9462ecd4686579904a2c4461e2f149c07071e56f2ae6b5cdc0985f3117028801c2ebfea79e8534606e6c9a2c84
+EBUILD conky-1.10.8-r3.ebuild 5175 BLAKE2B beabef522d97c4a2bf565824f2d58ee4cec4ded348789142fac8c20dcb2e266bdd70da896b48c36a9c9a93347ed527d691ae7be2c8d18b1969614e99f2b7712a SHA512 d8a054c323877a249502ca41661336e04ce8a2dae4dfaabf092d4b2e6a37ee763e3dc730c75365ce562d3f843f790c5e8654ae732c5b56e1e499f81ca2851b29
 MISC metadata.xml 2524 BLAKE2B c86460a6b065874ba17b35f4aba4240424a71bddf0d6648555d936259a2e9ef46ae373bcfc91a5382edd79e830945baef6c54eff52ed88a7f6648254c447675b SHA512 7f9aa6dcd65d7e4a9e1829cb273329b08cadec8820afb65de5e9fb189981b7084384e759909365adad36ea587161c6eb5a193363cc1a95e0aef65434ab827d55
diff --git a/app-admin/conky/conky-1.10.8-r3.ebuild b/app-admin/conky/conky-1.10.8-r3.ebuild
new file mode 100644
index 000000000000..55ef2440069d
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r3.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+	weather-metar weather-xoap webserver wifi X xmms2"
+
+COMMON_DEPEND="
+	X? (
+		imlib? ( media-libs/imlib2[X] )
+		lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
+		lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] )
+		lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg )
+		nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXfixes
+		x11-libs/libXext
+		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+		xmms2? ( media-sound/xmms2 )
+	)
+	cmus? ( media-sound/cmus )
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
+	ical? ( dev-libs/libical )
+	iconv? ( virtual/libiconv )
+	irc? ( net-libs/libircclient )
+	mysql? ( dev-db/mysql-connector-c )
+	ncurses? ( sys-libs/ncurses:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	systemd? ( sys-apps/systemd )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+	webserver? ( net-libs/libmicrohttpd )
+	>=dev-lang/lua-5.1.4-r8:0
+	"
+RDEPEND="
+	${COMMON_DEPEND}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/docbook2X
+	"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-use-pkgconfig.patch
+	"${FILESDIR}"/${P}-libical-3.patch
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT%/}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+	use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+		cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs
+
+	if use X; then
+		mycmakeargs=(
+			-DBUILD_X11=ON
+			-DOWN_WINDOW=ON
+			-DBUILD_XDAMAGE=ON
+			-DBUILD_XINERAMA=ON
+			-DBUILD_XDBE=ON
+			-DBUILD_XFT=$(usex truetype)
+			-DBUILD_IMLIB2=$(usex imlib)
+			-DBUILD_XSHAPE=ON
+			-DBUILD_ARGB=ON
+			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+			-DBUILD_NVIDIA=$(usex nvidia)
+			-DBUILD_AUDACIOUS=$(usex audacious)
+			-DBUILD_XMMS2=$(usex xmms2)
+		)
+	else
+		mycmakeargs=(
+			-DBUILD_X11=OFF
+			-DBUILD_NVIDIA=OFF
+			-DBUILD_LUA_CAIRO=OFF
+			-DBUILD_LUA_IMLIB2=OFF
+			-DBUILD_LUA_RSVG=OFF
+			-DBUILD_AUDACIOUS=OFF
+			-DBUILD_XMMS2=OFF
+		)
+	fi
+
+	if use weather-xoap; then
+		mycmakeargs+=(
+			-DBUILD_WEATHER_XOAP=ON
+			-DBUILD_WEATHER_METAR=ON
+		)
+	elif use weather-metar; then
+		mycmakeargs+=(
+			-DBUILD_WEATHER_METAR=ON
+			-DBUILD_WEATHER_XOAP=$(usex weather-xoap)
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_WEATHER_XOAP=OFF
+			-DBUILD_WEATHER_METAR=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_EVE=$(usex eve)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IPV6=$(usex ipv6)
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_OLD_CONFIG=OFF
+		-DBUILD_I18N=ON
+		-DMAINTAINER_MODE=ON
+		-DRELEASE=ON
+		-DBUILD_BMPX=OFF
+		-DDOC_PATH=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/ec2-ami-tools/Manifest b/app-admin/ec2-ami-tools/Manifest
index 04b05e13336b..5e132c477563 100644
--- a/app-admin/ec2-ami-tools/Manifest
+++ b/app-admin/ec2-ami-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ec2-ami-tools-1.5.7.zip 156611 BLAKE2B f3e4c05a1f25e1d47a6981981b92db551953028f0621e3f175e3ab5db8823d72f56d2145376c52dc6d134ec2a167c14d64997e969785991589f9c97b93277f78 SHA512 2754ded47cbe842f58e12207c4bb7f81c8cd366dc506cbadfa9bda74d91fd5f8e1cafbb117612b14833368ff5943c4943a072d1679f23f591c15f2f49b61b4c2
-EBUILD ec2-ami-tools-1.5.7.ebuild 1185 BLAKE2B f059d766b02cbfd94a8cb3aa02d32a5c214a89a23a15fd8d7443a874c70071d1f3f33251db415b10942d6f7c9e68d02a7f063bd972934cffe4b322abaf4d8319 SHA512 262a8bf922813cdbbcbbf22ba7456ef9e9f3829c73ebd36b2de481014280414612abf00ceb03485ac80d944559426b5c2d2350ab32a59c9856c599f3ea55564f
+EBUILD ec2-ami-tools-1.5.7.ebuild 1128 BLAKE2B f5d009ec1a67703ac2d93b25bd476c22bb47160531553184a936885c1d91f1608f180fe093f5ea9d61796094b14657f14c0226e52dcc41e6c3f6aa1d87f7b385 SHA512 777d350d9a0d17ec8b2acdbe37ec4b6a71a7801f54dad99c408c8b2bf199bcabb67f62067f562b6c9f5bf3f6d06269cf983667ef8ef7d14b1af6278b5204ef48
 MISC metadata.xml 299 BLAKE2B 3fb7a374afb6ce5b06c3272f2cb25ef4f05614ed59835b4d28b8e9f97a8027a349779215c26c6bccc1d26ef0413d9b662eddb9ba1e0b7dc6085818994fa72ac6 SHA512 32d0280896d9452574a1ca6ef923aee59cf559e2b9023a4b6986c735bc327df57eb2c73183f5cb660a991e2f41268f0477b24a7e68a81d283fd68c1d2a6ff6a8
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
index 5e2638f231a1..75de729d04c1 100644
--- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
+++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ USE_RUBY="ruby23 ruby24 ruby25"
 inherit ruby-single versionator
 
 DESCRIPTION="Command-line tools that serve as client interface to the Amazon EC2 web service"
-HOMEPAGE="http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88"
+HOMEPAGE="https://aws.amazon.com/en/tools/"
 SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip"
 
 LICENSE="Amazon
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
index 0bcab67a73e3..0d2528923da4 100644
--- a/app-admin/gixy/Manifest
+++ b/app-admin/gixy/Manifest
@@ -1,5 +1,7 @@
+DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
 DIST gixy-0.1.5.tar.gz 32594 BLAKE2B c92b95e4c17e07b2367337ab8dfa742d0eb995b6c979c4ba25e9f83e446d95dc8c89013b6f45e467c0dcad275b8f0ca4a163a7eb6ae0c2867e4102fe4765a8be SHA512 63c41a16f1a1d16664c660150bf1603b87d2a2b474db58bb13af79e123b372a666b94aa96ef081af89fb5608c7f9a43e03750afb80d52c212c06d3407c413e38
 DIST gixy-0.1.8.tar.gz 35176 BLAKE2B 3e875f63044244b19a7b881c0082c6ce91a2cdc9d0245c741e1b3f4cbcff70e0787d212c09ce2ef157c5a37942a87f9868975c43102df54f79f0b29721cd4acd SHA512 fe45522dbee238282f05f11fc22bdff6f04df117d9b909aa3a9c7ff0aef3c376e65119e91e8e562a2ea5d9c2e85a1e43462eb3ce14f30c171235bd44097c7a94
+EBUILD gixy-0.1.20.ebuild 967 BLAKE2B 158d4ee112fd46ee9abb7ba5d5d29a596193b898373a2bf2b49277079ffefa8df733d92f48af904db1fb5a478478c91614110395dfff631b4ef662da9f421f69 SHA512 0cd185ae489e58958935c04e19228f1de330e9ddedd1af862db5a1a8c62a100d0a6662695ee63eb748b9cd82468d5d559fccdc49f0b7b2f92e68d9d3bf30ef6d
 EBUILD gixy-0.1.5.ebuild 788 BLAKE2B 40f8bca747a06fbbca06aeeeff196a0d0674e6fe7060b2bc1410ce8fab59821c9e331b0c2fcc9ff721dd13467b18f4ce0b1396a50584112d88fa3f5c3b54c29a SHA512 558ba5a26aeaaaa75717ca22d133fa2fc63d7dad47335105982d8e193bab49b3b7dd0b30a3a135a53417c7ba86da0eeffeb25982f06419fdb062233e3f9890fd
 EBUILD gixy-0.1.8.ebuild 788 BLAKE2B 40f8bca747a06fbbca06aeeeff196a0d0674e6fe7060b2bc1410ce8fab59821c9e331b0c2fcc9ff721dd13467b18f4ce0b1396a50584112d88fa3f5c3b54c29a SHA512 558ba5a26aeaaaa75717ca22d133fa2fc63d7dad47335105982d8e193bab49b3b7dd0b30a3a135a53417c7ba86da0eeffeb25982f06419fdb062233e3f9890fd
 MISC metadata.xml 248 BLAKE2B f2e59d4d05a017ebeeed31b36a72a279974f8fa64886873d23671f1fa91bcf3152acf9652624f2b1a2f5d9524bb24ec7dab734ce43e8cb6475ccfef67af40697 SHA512 c0d402a47544d8f31d1fc9f23fef5d84bf000f2a9a8a07c8b23899306818152aa71844f1d9310e0c32a354189be1f53ae8c89cde90464176ab9b861e62084822
diff --git a/app-admin/gixy/gixy-0.1.20.ebuild b/app-admin/gixy/gixy-0.1.20.ebuild
new file mode 100644
index 000000000000..d56ff0091eef
--- /dev/null
+++ b/app-admin/gixy/gixy-0.1.20.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx configuration static analyzer"
+HOMEPAGE="https://github.com/yandex/gixy"
+# Use GitHub source insted PyPi to get tarball with tests
+SRC_URI="https://github.com/yandex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_prepare() {
+	sed -i -e "/argparse/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
index 34ee94252156..92098f9b9666 100644
--- a/app-admin/hardinfo/Manifest
+++ b/app-admin/hardinfo/Manifest
@@ -1,3 +1,3 @@
 DIST hardinfo-0.5.2_pre20130823.tar.xz 280472 BLAKE2B d72883e7e57234b3328d03daf4d81cc478b383b51f4de08981792c42b3278ede81731ca831fbc285a594aa7f00f861c870aa6d784b7c282960f5541f04f9ce45 SHA512 e36bd4eec0090461de5fdb6c17dccf76937ee8fa9cb3411068fc568847f519023037999278bbb8b9a24608ed5b1d7fd2bebfe7115c631ccca1c35fa259cb20b1
-EBUILD hardinfo-0.5.2_pre20130823.ebuild 499 BLAKE2B a89e52813f78ad50dd308fdfda68773dc1391b5051bdd517c9ec6fd835a9715ffd758342175adfde840dd06c062faaf530e4a77edefe990b1d11f0ea211082a1 SHA512 e8848107b3caf8c2673cab5b36889f82c5f2310649545356e676ec59ee3f390b085210aedfcd3925069f213a34475188d811b83ee8c26bff4c3de734fe5290aa
+EBUILD hardinfo-0.5.2_pre20130823.ebuild 512 BLAKE2B 207b8597c26c271345aca603bc0f807e95523a2b772c42e0a49f47723735e035703ccc48ec17cd2521871d0578a3868909dd67128729d3203041fc128201fd5b SHA512 9c9b051e7b25b4ad0b576688650ed51bb390a31a7b710014a5d39f63b4eb49e119ce600e46d2e9d0490490e86d235ba83ebee96c72d2c512a1611e3e6dc71569
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
index bd0e475811f1..2a5d57fe7276 100644
--- a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
+++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
-DESCRIPTION="A system information and benchmark tool for Linux systems"
-HOMEPAGE="http://hardinfo.org/"
+DESCRIPTION="System information and benchmark tool for Linux systems"
+HOMEPAGE="https://github.com/lpereira/hardinfo"
 SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
 	net-libs/libsoup
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:2
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 9f8f65838521..12d85a86a6e3 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,4 +1,4 @@
-AUX hddgentoo.db 19464 BLAKE2B 82577371ce2f8702a400bf10eb0a9300506a10c5cb780b72503b908c8129c14f78f0ef339b97d86e2bef96f889a6f43e82739d810add817cf94a731b73a7b591 SHA512 03aa8c528988a1d602cd17f2d3a02e00142634dd87f92af7cb2ceab30f1d525a5954300c74e61e6614043a0636f63151e641e57aa860ed878eb339a51db8b72b
+AUX hddgentoo.db 19595 BLAKE2B c02a706c8afc92f17854ae6b0b8d7071e95a5d53b8e4962e53d8209c0c70bcaed4392b2a3233717854838200cfd7d75b4a19444dec03719fb9f5a0bac8a61152 SHA512 097acfa6127ff3628e71edf72fec67731b6d9d2f105f62ce757fb67caa19afa16c7f2e21361fdd647209c33ecd5f97a44be209773c5b1fe3d175eeb441933593
 AUX hddtemp-0.3_beta15-byteswap.patch 1037 BLAKE2B 5e0df7da8f67facd8f5d466c502b44aa1e58822ec6b91992b973aea0d3e70fdba0812746fd697341419b670a984e14c1c44a1b952d27ffc82df56b06bf6a27a3 SHA512 4d37b31129be7f767a416d4b15e3eaf94af297a7d2f4ed57f900fc48775bbb389ca1259c13dd048d670f32fe53f8d0e06c6f1c02485cb95a08d2a80aac4f76a8
 AUX hddtemp-0.3_beta15-dontwake.patch 515 BLAKE2B 56061289e8d247a11a3172eebf3ed7f04f6b55b6021c9d79dbc41553828d4b265dc049ac139473dfd48c8e904d3cd4023405f9c787a21537872c6e2185395ee4 SHA512 ff5cfeb9fcd6a17ab3937212a85076fafa9abfde72a1b602ada09b5fb71f89a200e91398e9682a17034f630b90e57559e550c0f1565d12ca642af0c2e10a99e1
 AUX hddtemp-0.3_beta15-execinfo.patch 751 BLAKE2B 955e4d3501f7a8669036168740d67574f912197110cb2a156b3aef884596346bd1cbc32279248bc91f8e94993139092b80db02fe4cc42124ada99915fcb0b899 SHA512 cd320985142df5f07cb8c56613aa4110a63fed34e2e08f95272f3d43b75289d298e9dc61e86a42e0be5f15f9a76007d894d515d4d09c8a9deb41b16aa4ea3bc6
@@ -13,5 +13,7 @@ AUX hddtemp.service.conf 88 BLAKE2B 310463288da0fdee89d914c70aed0175b62d53a38285
 AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70438914d3c770b75f5b4912ddb17dff0555d9847b43d1e43b19a5a54598778b97bfb4c6829f7424f09f SHA512 7d923d582da2e8012de4ebb4243a4fccd6135cfca7d06f02f50b290c5984af288942f7588da7c8c57b91e362a8febc76f14b489798af14f66e3ec7bec9518ba4
 DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
+DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
 EBUILD hddtemp-0.3_beta15-r26.ebuild 2972 BLAKE2B f273cee116ed77f85fdedaab31f82c6a7bd109b306a9d56745767050cc65ed79c2b28875f934b02fbdde87db6e8e1185605525f1562d930d3b5eadf8bc4edd0c SHA512 64c30191b0103c410b9d8461c283738a56ccdc09b7fd2f9d8ee3f4e05f1a16768d2e94fe74f7638e1ed8c3852976a19fe9f3766581c49ed884f686495eca1bf5
+EBUILD hddtemp-0.3_beta15-r27.ebuild 2997 BLAKE2B 3eaa5dd05ed2075d71fb3b52d18a1641fd5de5bbd740f37f1d41ef78af7f44ba6065682bc97f162d26d28e3fa553760e41e113f713d879480574bd1d95374f42 SHA512 455cf277c4faa3c281585a6fa63f030ea2078635b237cbd27a3e39aa5defc56c52e525a3b3f3b16676cb9d358c5c2d58c624d5bd340e8e2aca0bb5c3636c81d6
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
index 539a88a4917d..c4f679052577 100644
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -215,6 +215,7 @@
 "Hitachi HDS721680PLA380"					194 C "Hitachi Deskstar 7K160 80GB SATA2 7200RPM 8MB"
 "Hitachi HDS721010CLA332"					194 C "Hitachi Deskstar 7K1000.C 1TB SATA2 7200RPM"
 "HGST HDS724040ALE640"						194 C "HGST Deskstar 7K4000 4TB SATA3 7200RPM"
+"HGST HUS726060ALE610"						194 C "HGST Ultrastar 7K6000 model HUS726060ALE610"
 "ST9120822AS"							194 C "Seagate Momentus 5400.3 120GB SATA 5400RPM 8MB"
 "ST32000542AS"							194 C "Seagate Barracuda LP 2000GB SATA2 5900RPM 32MB"
 "ST2000DL003-9VT166"						194 C "Seagate Barracuda LP 2000GB SATA3 5900RPM 64MB"
@@ -227,12 +228,13 @@
 "TOSHIBA HDWD130"						194 C "Toshiba P300 3TB SATA3 7200RPM 64MB"
 "Samsung SSD 850 EVO"						190 C "Samsung SSD 850 EVO Series"
 "Samsung SSD 840 Series"					190 C "Samsung SSD 840 Series"
-"Samsung SSD 840 PRO Serise"					190 C "Samsung SSD 840 Pro Series"
+"Samsung SSD 840 PRO Series"					190 C "Samsung SSD 840 Pro Series"
 "Samsung SSD 840 EVO"						190 C "Samsung SSD 840 EVO Series"
 "SAMSUNG HD203WI"						194 C "Samsung SpinPoint F3 EcoGreen 2TB SATA2 5400RPM 32MB"
 "SAMSUNG SSD 830 Series"					190 C "Samsung SSD 830 Series"
 "SanDisk SDSSDH2128G"						194 C "Sandisk SSD Ultra Plus 128GB"
 "SanDisk SDSSDH2256G"						194 C "Sandisk SSD Ultra Plus 256GB"
+"SuperMicro SSD"						194 C "SuperMicro SSD"
 "OCZ-VERTEX3"							194 C "OCZ Vertex 3 120GB SATA3"
 "Crucial_CT240M500SSD3"						194 C "Crucial M500 240GB SATA3 256MB"
 "WDC WD5003ABYX-01WERA2"					194 C "Western Digital RE4 500GB"
@@ -258,6 +260,6 @@
 "ST2000DM006-2DM164"						194 C "Seagate Barracuda 2TB SATA3 7200RPM 64MB"
 "Samsung SSD 850 PRO 128G"					190 C "Samsung SSD 850 PRO 128G"
 "WDC WD1600BEVS-08RST2"						194 C "Western Digital Scorpio Blue SATA 160GB 5400RPM 8MB"
-"WDC WD30EZRZ-00Z5HB0"						194 C "Western Digital Blue 3TB SATA3 5400RPM 64MB"
+"WDC WD(1|2|3|4|5|6)0EZRZ-00Z5HB0"				194 C "Western Digital Blue SATA3 5400RPM 64MB"
 "ST31000528AS"							194 C "Seagate Barracuda 7200.12 1TB SATA2 7200RPM 32MB"
 "HITACHI HTS727550A9E364"                                       194 C "Hitachi Travelstar 7K500 500GB SATA2 7200RPM 16MB"
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
new file mode 100644
index 000000000000..53a9a779e93a
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools readme.gentoo-r1 systemd
+
+MY_P=${P/_beta/-beta}
+DBV="20080531"
+DEB_PATCH="53"
+
+DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
+HOMEPAGE="https://savannah.nongnu.org/projects/hddtemp/"
+SRC_URI="
+	http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2
+	mirror://gentoo/hddtemp-${DBV}.db.bz2
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_/-}-${DEB_PATCH}.diff.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="network-cron nls selinux"
+
+DEPEND=""
+RDEPEND="selinux? ( sec-policy/selinux-hddtemp )"
+
+S="${WORKDIR}/${MY_P}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="In order to update your hddtemp database, run:
+emerge --config =${CATEGORY}/${PF} or update-hddtemp.db (if USE
+network-cron is enabled)
+
+If your hard drive is not recognized by hddtemp, please consider
+submitting your HDD info for inclusion into the Gentoo hddtemp
+database by filing a bug at https://bugs.gentoo.org/
+
+If hddtemp complains but finds your HDD temperature sensor, use the
+--quiet option to suppress the warning.
+"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}_${PV/_/-}-${DEB_PATCH}.diff
+	"${FILESDIR}"/${P}-nls.patch
+	"${FILESDIR}"/${P}-iconv.patch
+	"${FILESDIR}"/${P}-dontwake.patch
+)
+
+src_prepare() {
+	default
+	mv "${S}"/configure.{in,ac} || die
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
+	# disabling nls breaks compiling
+	use nls || myconf="--disable-nls ${myconf}"
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/hddtemp
+	newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
+	doins "${FILESDIR}"/hddgentoo.db
+
+	update_db "${ED}/usr/share/hddtemp/hddgentoo.db" "${ED}/usr/share/hddtemp/hddtemp.db"
+	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
+	newinitd "${FILESDIR}"/hddtemp-init hddtemp
+	systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
+	systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf
+
+	readme.gentoo_create_doc
+
+	if use network-cron; then
+		dosbin "${FILESDIR}"/update-hddtemp.db
+		exeinto /etc/cron.monthly
+		echo -e "#!/bin/sh\n/usr/sbin/update-hddtemp.db" > "${T}"/hddtemp.cron
+		newexe "${T}"/hddtemp.cron update-hddtemp.db
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+update_db() {
+	local src=$1
+	local dst=$2
+
+	while read line ; do
+		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
+			echo "${line}" >> "${dst}"
+		fi
+
+		id=$(echo "${line}" | grep -o '"[^"]*"')
+
+		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
+	done < "${src}"
+}
+
+pkg_config() {
+	cd "${ROOT}"/usr/share/hddtemp || die
+
+	einfo "Trying to download the latest hddtemp.db file"
+	wget http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db -O hddtemp.db \
+		|| die "failed to download hddtemp.db"
+
+	update_db "hddgentoo.db" "hddtemp.db"
+}
diff --git a/app-admin/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest
index 169b28835e60..50aa27d08d1c 100644
--- a/app-admin/packagekit-qt/Manifest
+++ b/app-admin/packagekit-qt/Manifest
@@ -1,5 +1,3 @@
-DIST packagekit-qt-1.0.0.tar.gz 53495 BLAKE2B a19ff095ec42bc16e498455323a4046365f6ae144fdfc998dee799df9f4ea022696ab30682316b6417c8a96e80e75db31704e36e43c1a5eddd0a7d86309adada SHA512 4109117a94c47180cff0f073c03820ac39a139b6b3ac88dec82758fffe01271f7a3dae85d94e86a4a1167f4660326adc1d58dc6eb0fd164bd0aefee2e412dad4
 DIST packagekit-qt-1.0.1.tar.gz 53503 BLAKE2B af96899e520f4139d6025746c2a2e7a65c67c2900cdf4fbdb410c12e33f494343d078ec24e7dcdb33749b1d5206b0bf622809827ed64beae162888e48d0aaec0 SHA512 e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a
-EBUILD packagekit-qt-1.0.0.ebuild 593 BLAKE2B da4d9255ac6569cae36ba9527248fcef33970d0bbc4e210835aaff48fe65262dfd9da204d80ca9faf2833d3130fe5281eeea67d19e4dffa00a71f80239f9ca17 SHA512 b536a04eefaea32a7931851527c296220934718edb1788fe97df4bbe03179d87ba8a92c4808a658de1a1c92621fce670b9b189bc47aa53c4f2a0781091016688
 EBUILD packagekit-qt-1.0.1.ebuild 593 BLAKE2B da4d9255ac6569cae36ba9527248fcef33970d0bbc4e210835aaff48fe65262dfd9da204d80ca9faf2833d3130fe5281eeea67d19e4dffa00a71f80239f9ca17 SHA512 b536a04eefaea32a7931851527c296220934718edb1788fe97df4bbe03179d87ba8a92c4808a658de1a1c92621fce670b9b189bc47aa53c4f2a0781091016688
 MISC metadata.xml 443 BLAKE2B 83c6d5495baf3a9909dbb0ea06f912b92f6faf6f48e6f1da7610a16cca3770c097516a748b44fc0aef99985929e16b7dc20de131bf5404bfd72895acca56f04b SHA512 f63f424329b0ffeac0dcfb50841e94644bd3a44852bebd0834fc36bedbbe4bbbb13bfdfd46e065ca3ddd9cffac1ba86590310267939c486f108913db84e1d093
diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild
deleted file mode 100644
index 8e125d096722..000000000000
--- a/app-admin/packagekit-qt/packagekit-qt-1.0.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=6
-
-MY_PN="PackageKit-Qt"
-MY_P=${MY_PN}-${PV}
-inherit cmake-utils
-
-DESCRIPTION="Qt PackageKit backend library"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=app-admin/packagekit-base-0.9
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 2cd0dddcb93c..de3dbaf4da89 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,8 +1,6 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
-DIST puppetdb-5.2.2.tar.gz 25436396 BLAKE2B e30d80b7da29c8cf3b00c9cda3d6e0a4c5635b3bb3a4e6d3e2bf284531509828df6d845a0d30b2a7a454ec35ab4879019fc4c68fc3aa8b6a72c3d0896b9e75f7 SHA512 cc598539801bedd4ef0052f50013320be5dc1eaf8098db8898a0759609d6d4e26aa094550bc1a45c041f9fe65ee99b0c00c00586d3cc93003836f1415bd92456
 DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
 DIST puppetdb-6.0.0.tar.gz 23168375 BLAKE2B 05b7738d1f1dfefac50ea54682b2c2f888d9227117fc676ef5d4754b8fddce449ee75a2ae9eac977426707654737c86499efa3692f4195547f997297c1b08f5a SHA512 f2be7049cf1615f7f235be16f32c599ad9679b9da59d43b30c63ca4fd9c9f24fbdb488def01372c516ac510105292ddb163bad403d1b06429bfc10310505501f
-EBUILD puppetdb-5.2.2.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
 EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
-EBUILD puppetdb-6.0.0.ebuild 2765 BLAKE2B 901c7cc97d00e0d8509ecee0964f59a49ef26db55d96865557239b7de67c78b95330fde7d3c13dd8b665e2f917c93cd401a6ab5be0a5ddf2930029217b879fe0 SHA512 7f5b58b55811ee346e6aa366d7be0f49e9b3103407aa10abfde785d3370d8113c9d2fe4ebcb9a0c69ff4884c3e6ba818ee199ffa72fa7ec05f71123a1f538252
+EBUILD puppetdb-6.0.0.ebuild 2760 BLAKE2B 57ea7ff1a81c62ec1d42bd40eb33dd0743b4d2d513991425d4ec35d5be751a76e340debab8c753098bf6d20c19d1ad54f669b6612bf77f032e96ec3c8693f927 SHA512 4c245b096cb4a169c566a294c026dcde1dfea946c5ca5e3cbd7a13bc8cb34a4ba9b55d8165b4d81feaf8b03fe073c5477219cfe290c0ace903addffcacac9788
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-5.2.2.ebuild b/app-admin/puppetdb/puppetdb-5.2.2.ebuild
deleted file mode 100644
index e2e9e4db500f..000000000000
--- a/app-admin/puppetdb/puppetdb-5.2.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-6.0.0.ebuild b/app-admin/puppetdb/puppetdb-6.0.0.ebuild
index 11bf34de0e67..17db5a3bc7c1 100644
--- a/app-admin/puppetdb/puppetdb-6.0.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 2c96a827bb67..d63c4bb72799 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -19,4 +19,4 @@ EBUILD rsyslog-8.35.0-r1.ebuild 11938 BLAKE2B 9275bcf376d28607c381b049e2b152c9f7
 EBUILD rsyslog-8.36.0-r1.ebuild 12113 BLAKE2B bc15f57f63da43c5b3a2d3121bcb8e2ce00c14d8173c53d0912b424c2b2ee3ce936fc4fe75885da4a520615a220625a543f7c3a2e6807fcdf2d118a6a3728a38 SHA512 6fe8a096cbbf06f0748d8545577f9752a92466a33a2785332ba057686ce9b489f78263de65b670e21b163dfb52928b1fdbe0e9a46d29622bf9f05012c154b31d
 EBUILD rsyslog-8.37.0.ebuild 12209 BLAKE2B 7b49e66fb2e432d6542ddfa493b7025440cc4c0d6634439fb92ea3ea48c0e91b1d8e81ea096ba757315bc36773b220133e2a512b4432451d405b966755651c90 SHA512 28185c7dfb8a55a21047c294338a64fade8f49ceab3df592070eacb1940307b466b78597f732d21a33fd3b9fddb9653a772c88b0f35ea92c3827867ef0a91e90
 EBUILD rsyslog-8.38.0.ebuild 12294 BLAKE2B cd4004934b1d53638f7cec94213146c1c19c56fd237a41a7e72afcd857bfd425c655c6f017e74579b075b81a34e875343f69a500ef5a847b0eec06ae42230f78 SHA512 16d3c2b271444c1ec193dcf5bcbb576f91cd6e698688c448b435add8480b3b60e97686da0c4da2b2179017bdd207dd7f148c8e740f5d5c8aef18ca8a306361b9
-MISC metadata.xml 3944 BLAKE2B 576087c54675c912537690dca0d039a217c8afec6fa4c32a8f52f2350393b30763a4d9f0718a9fa47651afb434186ba3e25d4dd9253cf20f3315d3b06bebb3eb SHA512 536dc844883178b310d7d104d0f3a002be4ae14aef6409bd1fb44fec9b30b40165ac51914de020c5e63bea61a88d8467da279f353ed841c9c50f84db079fc9fa
+MISC metadata.xml 3863 BLAKE2B b6b20eda59279463db8ced1764012aad3197c67cdaee5993294181ac7cd956485f16e9e557664af35ac65adc725f028cb68225e5419af4fa289d2d363f1bd9ea SHA512 3a382d17acaf29b1787c2b351ee5fc2a830738ecf6dc7967462ee5ae15596058123f933c7380feafd956fef4c375fa50b26cf68a21d9cce60003dc9de1712138
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 6abc65f4fb4f..ba4e59d215c0 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
 		<flag name="gnutls">Build the GnuTLS network stream driver (requires <pkg>net-libs/gnutls</pkg>)</flag>
 		<flag name="grok">Build the grok modify module (requires <pkg>dev-libs/grok</pkg>)</flag>
-		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
 		<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
 		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
 		<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 5be9fc18ce94..815e4284064a 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -33,9 +33,9 @@ DIST syslog-ng-3.16.1.tar.gz 8899693 BLAKE2B 850d83ff6f7e2db4aaf0737cc97403084bf
 DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 3268a51c587e66579b30ee8d27397eeeb3ab52c7e1939ad26ad976be2670565a389fda9dbc3a25f80710f855788c85f58d47f6a3c297b8ff6efa01e0dca386fe SHA512 2b82ea047bab125d35ab0a90e933b8a282852c6b4a9a8adc3f2a0ddf392f24210ce1296d0cfb389f98e54e50090a3ded5a64c5a9529d2a90cbecbfafd620edd7
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
-EBUILD syslog-ng-3.14.1.ebuild 4800 BLAKE2B 827277cd46a8484ab39656177f1bdbe4ee1e4e8715257289aa4642835f6bf5030c006b4147d9faf07888526e5dfc724967dd95efbb102867e2c2d5d3db03029c SHA512 5e36a93088045183cb8c2dc55809cef3412c1872f3eea356dd96569553d12d3fc3df624870d9b5a66558087781efd0769a880c35253485fdf6697e2371092563
-EBUILD syslog-ng-3.15.1.ebuild 4767 BLAKE2B c15f68a8d083a878ce7b12cb53a4d6515c0ba90b313a465a5e01b32d730a17070a57dc9a8b93a29ef02119b5a25090e013f89c378daa89c1d22330971442eb4f SHA512 18f5ee084f6494103b3046cd1aabfdd9f0039933d689acc154ef032e551798fa2c8abb1cbb91663a4bf9627687930e2cb3ada9d0db0b60ce49048699a69f5e47
-EBUILD syslog-ng-3.16.1.ebuild 4850 BLAKE2B aab49b02f504139fbc8c09a310dc3e32d0f11adfa3784643af55c898f959dcfcf6c81d4b4eeabe8fbb4674c20463d8f854e227fc35276907eb16c2bfa95b0cda SHA512 f6c7a21e0bb4c5a8bce3a0c9b8c00a4af55dc66cfd3ad9bfafd6e7a753eb0d963229d7837253422d58ac99e05c799ead6fa14bc7a13087da75d8510e2e0bc8ba
-EBUILD syslog-ng-3.17.2.ebuild 4917 BLAKE2B 36c8205c2c42d91ab4a9b7842d598ab6040ad048eb08cd80d720f096f1262042aa4e858e3bb3b9876bade4d8ab4287c7b55bf80b4c6704a1d5fa93cf9a13321b SHA512 2d5efc02d69b23addce794a073ffafcb1f3753ef0f1feea64c95eafec8dddd43df7bb61de0b079e5d6b3d194307e53ec2d7192ff4c068742c6fb6529826ed832
+EBUILD syslog-ng-3.14.1.ebuild 4807 BLAKE2B fda2a0d6d3c0c23e867b4162d062557b49949216e56831316b41475c0da1f0f4d41f3880e28a6558b17baa8f3a35310d389e778c88a7f5daeb58065b9b198119 SHA512 314185268f92097b76f1055c8a98b502f2e7e40d9f00e6dc18584c5433841cfe1656750f7a5ad30c96a08834dbab00153c151e3d5fc438353541d053da04065e
+EBUILD syslog-ng-3.15.1.ebuild 4774 BLAKE2B 1110e1c8b94f2085fcdc600fed136283ca74c9541b6ab20c237c49296a41f4e78babe79d1681fb3f58f691979a408362b69f17a441c61f454a1c93b987e04cf2 SHA512 083d58fbecdd5ef717468053f106ab9d2ed0a7064b1e8725341a447c8b40c4af138752f8e1216d16abac311c7ccbae857a43d4e68ee8d54efa852e45615c8112
+EBUILD syslog-ng-3.16.1.ebuild 4857 BLAKE2B 02ca3e2f022170afdc56ca066e1ad070b5d6bfa8242b4283eb1c967b82055b57612a585333f5e10ffcb25cdcdd4a4d5fe618c5f4896f9d4697d55c93d3d8a665 SHA512 c9c0b6dcf1a4007df67656d3277ddaa1906c275f14d7aca5490d008643103e35948cba77747f55e2a3df402de452eca3e44b0ff28f68165c24eaf0040f2f200d
+EBUILD syslog-ng-3.17.2.ebuild 4924 BLAKE2B 79ac67981c120e7c3611b2fbeb64cb57e1611aabeb05fef09eabe29e298fb2b6ac41231242ea9de6c4129b8906dec43a8b9aedbd2ed732ccd4bd4752b1907e8c SHA512 77a08de572e84eeb38384327b0b4b42bfa321a91ed33f6ff618f0f541e05cbbe5f447e29a4fd709792fd2d418239d95a02eae210a741034f21fec45ba506dcee
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1186 BLAKE2B 8fc7edd7e310b01dc6080332a62ed4ffc5d690d4082f800d8306232c138fac46f07ab7cebcbd40e91c2c41467880bbf61b4bbec0907e84f26cde51d24277f47c SHA512 5d8a62c83706e3bcb01b67e6873f7052c941518d566667e5b50aacdc8fcaf07a02c76ca3705369181795c2c62b5ea990cdb93501e1719d0693d597b5e6f8bee2
diff --git a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
index c700adcaabde..dab014aa5adb 100644
--- a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
diff --git a/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
index 6a1c1b82936f..330bc184b760 100644
--- a/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild
index 27ecc33b1e1a..f046b4bfc7ca 100644
--- a/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
index 56f3cc81cef2..3e29c529e654 100644
--- a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest
index 4379182f8605..81258627faad 100644
--- a/app-admin/syslog-summary/Manifest
+++ b/app-admin/syslog-summary/Manifest
@@ -1,3 +1,4 @@
 DIST syslog-summary-1.14.tar.gz 7278 BLAKE2B 609e506c099b734be87ba6d6e21f70283d4654ab5c6d3794da71099f3e590d178348c13ab271ddb84682220091adfd702c107bf2dee792419de3ce14d2a9c9db SHA512 db1f0660ad435eea26fc3ec4cd475f5f1b98bb629495707741077e52aef88fe8bff4a318bb5b0821e57ccfa0646454c6825a5a4fc1fb4b73ea67cbd4defef277
 EBUILD syslog-summary-1.14-r1.ebuild 753 BLAKE2B f53172e88a9c133bdbb4130fd2a9a45c563723ad7b2d2679745d60abf2b3d3febd03d68b7f11d2104b50bccb1538c67b178138738e404ab6449d224e136e0011 SHA512 d3a1d4bd6634b7a37b029b5231c924ab603f8512c55309a686851aa9d71f8f8e93315a72fb2566d35d22712aa6afea71849f6e940b8ec7ba9d7d6f020d96c83c
-MISC metadata.xml 260 BLAKE2B 05122248962f66c9b196f089fa2f4de513350f4151907e5703b7be273c5f6d0907265eb957a6762ef8048d5ae6d9628daa0143afbd8b31c6d9407932cb356113 SHA512 165a24f5387267c854334cc1de61522c00da716191e985aa2d7df5f85f042c85c2a5037fe8fdec791232e43bf3644294e6fef8150fd7449334488c4d54c60f7a
+EBUILD syslog-summary-1.14-r2.ebuild 931 BLAKE2B 03b945b067d8021b04bec57f6861b07af60bffc3a821eab41da18689cf3b95dfb3ff6709ca5503efd552c6e02bfc4587edb4673c9c28e0770a45289264b91ddd SHA512 e06eda58188b9a2ef9f55cf3c22117a950d142747268adcf6539e4c22aa291bdf0c08870f200dc637e6d1fb911aeb38d681097c88b2aa39ece54b78eba38e914
+MISC metadata.xml 464 BLAKE2B 862ef04e25fe1aa6609e2ea68c9d61a9c201d43ffab9db6a02244ca9192f4fd11a1f1f4e4d6f7e365660c4043b28a959d5da9783f3c6f0ed4f69eb625784763c SHA512 64073e0ef15c4fbe057f51c09505ea3db8d5e1427c2d581b55137e7fba37f5fef13103cfe4d0e58c74052601d4bae0ed26e36346d497653ea080fe5649f956eb
diff --git a/app-admin/syslog-summary/metadata.xml b/app-admin/syslog-summary/metadata.xml
index 262bb459b8c4..52456916eab7 100644
--- a/app-admin/syslog-summary/metadata.xml
+++ b/app-admin/syslog-summary/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>lmiphay@gmail.com</email>
+    <name>Paul Healy</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">dpaleino/syslog-summary</remote-id>
   </upstream>
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild
new file mode 100644
index 000000000000..7c61b49b0cbf
--- /dev/null
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Summarizes the contents of a syslog log file"
+HOMEPAGE="https://github.com/dpaleino/syslog-summary"
+SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+src_prepare() {
+	python_fix_shebang -f syslog-summary
+
+	sed -i -e 's:python-magic:sys-apps/file[python]:' "syslog-summary" || die
+
+	# Sadly, the makefile is useless for us.
+	rm Makefile || die
+
+	eapply_user
+}
+
+src_install() {
+	dobin syslog-summary
+	einstalldocs
+	doman syslog-summary.1
+
+	insinto /etc/syslog-summary
+	doins ignore.rules
+}
+
+pkg_postinst() {
+	elog "install sys-apps/file[python] to enable processing"
+	elog "of gzip compressed logfiles"
+}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 6b622b7b27c3..aae117612111 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -3,11 +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.4.tar.xz 528028 BLAKE2B 931a172ce399133a0827f7dc7090719e778e7c89a1383adf93a99c386cd11343de26649355dd3a382deceeffe6c2f1890d3424aae6ae441aaa4a47f046b520f7 SHA512 36affc6749d0eef5760e542dde060c257eea323196f9b83b52cc931825dfa796b48cad37060b9ca20d58fb3909c07b8bd67bc8d09c9c6285c08c4e2e9ca1d308
-DIST sysstat-11.6.5.tar.xz 527676 BLAKE2B 8473000924514bd089de431c3aa4e042559cac71248555eb97af3a5127d0f4f6c9c13c58ad1cf9254265d2c1c4b68a17b328f883ba80a2bd1a85c5ca7909fe72 SHA512 5e302ad1cd2050c6c391df902babf10a8a37c5458ecccfee173a4f5bce9b0dd7ba0b364e50affee3b38b91ed828e7461cd6f84e249b18d380ba55b655fc0cbe0
 DIST sysstat-12.0.1.tar.xz 602484 BLAKE2B 68f6f54a931f1b502ab065f25cd49c9d631d40689b380b5d535c540416a3c05233dbf151b7d8bec7061fbc8eb6fb61860ed6f5ef0d611314191a2c36601437ca SHA512 d8940dc71592c041f59b2b0bcda7ae2748f0527832e6da7b4722dc91abb0139f1b5c528d50c97b4df0bcb5607b844bed3651183acea738b02f3a8e88809740f9
+DIST sysstat-12.0.2.tar.xz 602408 BLAKE2B a3c27bf4f7ec74feab9bcd797027429c266dcef7041175d7be185f2f49e57a57b443423116ac9b8b89a312afb796748de3a7af749681c7273a5331f171676665 SHA512 c55c3fb8210f006f70e56c8ef5fe013ad1a9247125e69302f920592288725f76ba268c142f1da6ef078a3cdf75e471921ff41aa8b59b8edff57d3bc5345d36e9
+DIST sysstat-12.1.1.tar.xz 605396 BLAKE2B a75fc5c9d1ddea2817418629bc7929a58b22875b1af173558e97ca2c8eb431b3a489287dbae17072a327b36a762fc5193cc10787e2d4fa6340895b9647c1be11 SHA512 845adfb6e29bbf3a152496da1959d459b983ad50ad11f08a2887bf25339b988facbb7ca06693fc9df53c3d20d20662860176f589a8cfb70afcc8a825e0e5d122
 EBUILD sysstat-11.4.0.ebuild 1945 BLAKE2B 60e245699e621770f3f8aac3d622063b8e6bdad5135e3408dce587eae8d3b32c6884dc4db78a397b2a7ca0b58a7277fb652b21fad8a6e3c0e008f70eea0c8503 SHA512 25438d8e95dac4789c18215f83c09868ef7bb9886d5abe76f70b5461b65cfa42648c7593d861c0d075f1ec7bde52503d3235f3aea716e9fc9a39dfc5762e269c
-EBUILD sysstat-11.6.4.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
-EBUILD sysstat-11.6.5.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
 EBUILD sysstat-12.0.1.ebuild 1787 BLAKE2B d9235c61d19c41e58a65b61bd3188f085a3e08810cfbf2291067bca879f6465b27a115ed534d3d77c6bbf1e8d03286193a1f77a03e3065f62782e649ab49095a SHA512 2dc9618776ca53b7587094a337530e42e687fe83da4967bb8ed45e5a5da5e8ac6fb5980b4e2769d88e192b102e9f2a20a1fac25caf9dbafe2c71ecd716c14866
+EBUILD sysstat-12.0.2.ebuild 1784 BLAKE2B e54730998ee0c3402869d63f3bf755bda7e27d6050b512318a996ad5d6961c914c8124bbaf74cb302e9637c1750f43214cee940cea9db4a637c0f35dc1fdd125 SHA512 5dd30c3939f3bbcd5302303b63b9875d1aa0d5d52313cc54ac98d40f2e257388e5040c6f724c12b9525805ca23b3c5bd9ea0a4a653b2dfc4747b8c8ae9b93ea2
+EBUILD sysstat-12.1.1.ebuild 1784 BLAKE2B e54730998ee0c3402869d63f3bf755bda7e27d6050b512318a996ad5d6961c914c8124bbaf74cb302e9637c1750f43214cee940cea9db4a637c0f35dc1fdd125 SHA512 5dd30c3939f3bbcd5302303b63b9875d1aa0d5d52313cc54ac98d40f2e257388e5040c6f724c12b9525805ca23b3c5bd9ea0a4a653b2dfc4747b8c8ae9b93ea2
 MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/sysstat-11.6.4.ebuild b/app-admin/sysstat/sysstat-11.6.4.ebuild
deleted file mode 100644
index b9b3e8d42883..000000000000
--- a/app-admin/sysstat/sysstat-11.6.4.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 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}-10.0.4-flags.patch
-	"${FILESDIR}"/${PN}-11.0.4-cron.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_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-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.6.5.ebuild b/app-admin/sysstat/sysstat-11.6.5.ebuild
deleted file mode 100644
index b9b3e8d42883..000000000000
--- a/app-admin/sysstat/sysstat-11.6.5.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 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}-10.0.4-flags.patch
-	"${FILESDIR}"/${PN}-11.0.4-cron.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_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-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-12.0.2.ebuild b/app-admin/sysstat/sysstat-12.0.2.ebuild
new file mode 100644
index 000000000000..476a5d3a747f
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.0.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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-12.1.1.ebuild b/app-admin/sysstat/sysstat-12.1.1.ebuild
new file mode 100644
index 000000000000..476a5d3a747f
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.1.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index f6e7e3c5830a..cfbb277780e1 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,3 +1,6 @@
 DIST system-config-printer-1.4.8.tar.xz 904068 BLAKE2B dfadfd7f2ef8c37a588d2a4755c977a07c16d3779cf30652ca1056986d5de073fa334a912e4a8e865e88b323888f88b83c5ef8b086e4afafd7bf284c1b597f3d SHA512 9f832f11e0e6bca32a29201b9f78d7a3ea35a46f7484548e5e71e6939fd51065e07325e12bdb1bc577ee606299cfef54759def6564923904a79f27b654ec5304
+DIST system-config-printer-1.5.11-patchset-01.tar.xz 6948 BLAKE2B effe29c51cbe74fc72566df65f10ab845c9dc1f40ca2966c40be87e19f98046f34311c24b7bc77f471b840e35b0c8eb7754a7c5464d50335c8ab2e2ed0e79afd SHA512 2501bda0e75ea51cc8e14df6b3746a0ea51618919ef35ace849efeded0cddc49e6e3793142d1cd128ce3ce62c21661d5fdb85b19718df07b87a20f5fc641885b
+DIST system-config-printer-1.5.11.tar.xz 949816 BLAKE2B 96b41d64e0aa3494b7fc7ed15ac926d833a046ba2880b36b6f5dd4e7508e2bc1fac4cb52c9940c13cec6e34cb8972fbc11fcd5a7df510296444ca08a23f4cb2b SHA512 cc0a6faec0022092e64de3d7ab28669039c93853c6931d26c264f0035486e09ad0af784833e88ee8e3dc1b6f5be9dcf84144a2a6464dfa9711172966fa6a22b4
 EBUILD system-config-printer-1.4.8.ebuild 2305 BLAKE2B 594c35c24a8d0ed8c79ed6af9d73069022d3af1d8dd321898dd8b3a1773c38673e2ab26d4b4da065a03e5e54ae738f1d67bc9032a3933dbefc8c4889cae6ce23 SHA512 0e1d651a46c0cfec924aec183fdfbfe175e668d3e0c566838c72527d90a28ab194a92952cda5c9a46999b03487b7441cab4709521f2a5e1757b112d5ab09878f
+EBUILD system-config-printer-1.5.11.ebuild 2363 BLAKE2B 15afe46a1a6e953e99f227a09c086be95e852804381a915931afe2d622c081fa5d44c7316e6fe364474e0cb1abba82ddcef0ede6e7a18662303b452d93fa3d7e SHA512 612ba38005a37124927a04c8172ae90a519c78ef9aac0c778c4fde8b3fa3dc5d41d2e3a7deaf12a2c1c707ef12c1faabd589d987ef82d5f04bf3d59b4fcf301e
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11.ebuild
new file mode 100644
index 000000000000..0d78b3182a04
--- /dev/null
+++ b/app-admin/system-config-printer/system-config-printer-1.5.11.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="xml"
+inherit gnome2 python-single-r1 systemd
+
+DESCRIPTION="Graphical user interface for CUPS administration"
+HOMEPAGE="https://github.com/zdohnal/system-config-printer"
+SRC_URI="https://github.com/zdohnal/${PN}/releases/download/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-01.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+
+IUSE="doc gnome-keyring policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	net-print/cups[dbus]
+	virtual/libusb:1
+	>=virtual/udev-172
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+	gnome-keyring? ( app-crypt/libsecret[introspection] )
+	policykit? ( >=sys-auth/polkit-0.104-r1 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/xmlto-0.0.22
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-python/epydoc )
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-auth-dialog.patch
+	"${WORKDIR}"/${P}-libsecret-optional-{1,2}.patch
+	"${WORKDIR}"/${P}-scp-dbus-service-{1,2}.patch
+	"${WORKDIR}"/${P}-typo.patch
+	"${WORKDIR}"/${P}-appdata.patch
+	"${WORKDIR}"/${P}-empty-LC_MESSAGES.patch
+	"${WORKDIR}"/${P}-fdopen-utf8.patch
+	"${WORKDIR}"/${P}-typeerror.patch
+	"${WORKDIR}"/${P}-debugprint-typo.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-nls \
+		--with-desktop-vendor=Gentoo \
+		--with-udev-rules \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+	gnome2_src_compile
+	use doc && emake html
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( html/. )
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index ceeab2266c1b..f4c8613235d9 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -69,5 +69,5 @@ EBUILD systemrescuecd-x86-5.2.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf
 EBUILD systemrescuecd-x86-5.2.1.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
 EBUILD systemrescuecd-x86-5.2.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
 EBUILD systemrescuecd-x86-5.3.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
-EBUILD systemrescuecd-x86-5.3.1.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
+EBUILD systemrescuecd-x86-5.3.1.ebuild 1585 BLAKE2B 2990cf5577fe457ca542e4e1f51125dcde9df4242f13b2ef928a4cf9cb6b3119c27f4c3779aa99e2768c59812dc636492ef61ea0d37d32891907f2a96b6bd49c SHA512 0bab335bdfef131cfc6a8079eda20e85acf81e919811705fdc1dd73b80e1f635e6f061042bab60949a7b295d49c17b4237a049f74ff9cb09a9febd4f6aa125da
 MISC metadata.xml 610 BLAKE2B 400c26cbce80747fe88b60d34ea0f018b7119ad6ef333e8de931424aaa929db90ba0836a4520fbe62baa0c7aa9992745c4c082e495f318066acf5285e56dcd10 SHA512 5092c69f83df351b3697ab0c83e165eba5c7ceffd197707047bdd4d2e809ff7267e436e91e3035223beb088c48835ae28fd4032a8122687af116fa1405b30b15
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild
index 7bfc35a7dd27..44c6ac8ae730 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 
 LICENSE="GPL-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+isohybrid"
 
 DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index b5c137a9877f..9645cd74daa4 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,5 +1,5 @@
 DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
 DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc
 EBUILD testdisk-7.1_pre20180322-r1.ebuild 2512 BLAKE2B cb68ae32f495fb7ff57c9dbbd3cb63d9c826cfb34e58cd053c32d6797b3632227ad71caf62ea7899bb292c48849a0f6ac5da339cea1242b488ab8485226ac790 SHA512 bf6ccce7c91035b45dda4dcc5f651d783600de40a4df78e8ee39f0f0543e8049ec90ec875dd4ced6cb760faa1f8a9eb80da5b23b352f01d208d49c686f3fcd79
-EBUILD testdisk-7.1_pre20180922.ebuild 2515 BLAKE2B 81cc356d19a748ce835e05fe66a425feaf6b5df216ca74df8e1df9bf3bbbfb9ae3f8bba584dd19869dbaa5120a872ae9f18e4210f657d2875d8dd1fac3a9d1fe SHA512 eb575cac363ad016c9049585d1a78a426297b264c976281a6748d232047283d9716beb73b5c8db447b0ae08b410b0ff5fc7bc2069900e4917a8c02a827ea07fa
+EBUILD testdisk-7.1_pre20180922.ebuild 2510 BLAKE2B a97d78ddb4fab305cff0a51af1da64e64b0eac1e0811240a67931c0a1b6ffea5d9616f0a57d04495871f1a4d210bd056a363b85c0b91e17eb9f524f5f943ad71 SHA512 7f9f35932b002e410242d3cede3d8e129830c431784ee052a03de3c74ebf1d516c107d3483bf0a8c911f08cd79d2c15431e304cd15711bda67bcbc1791d26e15
 MISC metadata.xml 555 BLAKE2B 4b56bad0ebd1af77d90c4fa650adba5ae59d06940dff5aa346cb0e9dc9ebfad5324f774cb1afa646e15731b41cb09d7020ee3b6a5a0d941452099b6b7884da75 SHA512 3c47ad35d151d92e4be40cd91c7f0ced271f7b61a00280f536cc70a700d25ae36426593fcb8aec76e9cf1c24ae76dc8290b00bbcb73fa4d95182210fa680562e
diff --git a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
index f5f2f95d5e0a..9c65ee90ea01 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${EGIT_COMMIT}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
 IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
 
 REQUIRED_USE="static? ( !qt5 )"
diff --git a/app-admin/watchfolder/Manifest b/app-admin/watchfolder/Manifest
index 3d12d6a494ea..6c9876902640 100644
--- a/app-admin/watchfolder/Manifest
+++ b/app-admin/watchfolder/Manifest
@@ -1,5 +1,5 @@
 AUX 0.3.3-64bit.patch 450 BLAKE2B 8d88a4677bf59cdd95a6dc539364ef8aab46ab40e59107ba88198113bc79d1b61cdbe88e52a8c9cd805e4133dee2bde9bf068ce8a2822bb5a7201c118ef29a7a SHA512 86d6e072904fed5a168398fd80f648b30a9346745dac7b6ee460122e205f8f627aa4bfff78b007726af95b711c4bb91ca8282ca1a000e6954bf6d33e399f18c0
 AUX 0.3.3-fortify-sources.patch 410 BLAKE2B d44f872bd89cb0c3cccaf5b70e6293937340562ee71ff73185ff466b6dbac1e3b4854afa6eecec6558e36a070a9ed4a1efa275dde5d91ff0f1084509bcd60054 SHA512 0e3b372b9eaf1f4874ecbf7135ed67e1dcf62366516215a5d5fc5a1288893385b24f1d34855fc134eaad0dc29562ec4de0c90365ce87b7071234fcb1750e4676
 DIST watchfolder-0.3.3.tar.gz 86741 BLAKE2B d834f8aade7e648e27f95ca896355ec07afb24bac0f0116280f374e763c6fca8e7e7ffca7850d54b11fdf1c1ccfe8d28bd52a527eeb7110d4783a55de28828fb SHA512 162a3535748d280d06db8b05ddc4c87b578ff4be08aeb7a08858c28fd4612f46c4b8ed866513283edcd6ad24207c94a02e562200ae102d1897b4b28be6717dc6
-EBUILD watchfolder-0.3.3-r1.ebuild 877 BLAKE2B 6ae578f60dd9cfbd43367aa8f3fa77cd669a77c7bc92c30fc02181fab6ef3db89b9bab49c751a768f442486fe70314521f3ccf32ca2fc4c6eaa7a84ec3ce6465 SHA512 d84172d22d08f541039e3b74816d2745ac0dd8484bd912c3e81ef20d42aed241aa3bf310c14903e6619765010bb167d343f8c8c3abec7e9949bfafd3e68a60f2
+EBUILD watchfolder-0.3.3-r1.ebuild 860 BLAKE2B d5f367ed3890197d0434bb306b3f43029bb436e2343e7bdc585b4cbc345f88f8bcdbcd03c631f51daa2db0b2815a8a7eb15cd9c47bf87bad08ad1ec43fc339e9 SHA512 8f85fe02b273632d657dc303d5b3233ff880c1c079f2ba2dcdaeae273f3a5b8226ce9deac473fcf1f64c96ed5b28b92f85229b48527b5a5eaaabde5c89c349f7
 MISC metadata.xml 241 BLAKE2B f902bc0becbcf0a1830c4b9dca2ae4acd8ae91741ff1b6bf7cc68a08be61a26293b94c7690a06446e84f38d46dfe4c22c52a9e736b426c535b82acccb644b13c SHA512 9e7d032c1d5e4be915c726c4a312eb2bdad6eb036827f2aceecf5f370bbc255e72ee420816646fe639a607dee0f5d112d843e897183f8c587ec866fe8248b452
diff --git a/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
index ff216bde996b..d6fc7c4146b5 100644
--- a/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
+++ b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="watches directories and processes files"
-HOMEPAGE="http://freshmeat.net/projects/watchd/"
-SRC_URI="http://dstunrea.sdf-eu.org/files/${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/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 71318c47e10b..c0b96523c503 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,7 +1,7 @@
-AUX gentoo-setup-1.791 13727 BLAKE2B dca9dadd5775006f5bfbeee870723db8806a2236c984e2b4cec70031101f97fc5d4e1e1fd9219f27cdaa31ee860d247f71a01180b392154c16ca6554b1f73483 SHA512 fa6fde84eb9a16fea5d019fd920aed2a2f5dd51e5f32fa407fd1c424a0627eaafab7cd3b572a57e4f97e06ce5b6b5a7373ac377776a474a8512e077130eadc6e
+AUX gentoo-setup 13727 BLAKE2B dca9dadd5775006f5bfbeee870723db8806a2236c984e2b4cec70031101f97fc5d4e1e1fd9219f27cdaa31ee860d247f71a01180b392154c16ca6554b1f73483 SHA512 fa6fde84eb9a16fea5d019fd920aed2a2f5dd51e5f32fa407fd1c424a0627eaafab7cd3b572a57e4f97e06ce5b6b5a7373ac377776a474a8512e077130eadc6e
 AUX init.d.webmin 2160 BLAKE2B b26d1e22ceb655d62e467a30501ddacf29c825c84ed926805f39861982ff829d119da03f45ec60fd3c35c17b12a06ca051e15fbd3e54e53cde5d84681d15f839 SHA512 9a8b11f1375be7ced1a402b97bb16b627c3459871722d52b2c471f36f103bcfe51a1598014905ac22072aff38e4baf25f53ad08b99dc3d367ce9851c489c1681
 AUX webmin.service 416 BLAKE2B aef00b0f948286c54736613e37f114e6ffd90453cc6eadc3afffe7fa114df4e6a8b91e4f02da6fdfaa3eb2f57254e5e6785b201d0461f28839742cc13d883816 SHA512 7cf86342db3d34cbe39b62fa768660ba7dd160d9c0d113ef6a3a176187fa0c72531bed38e3203cf627ab05c1ac4d9a8b9e829d1baa9739d63dfa74f09c445f1e
-DIST webmin-1.791-minimal.tar.gz 2635024 BLAKE2B a817063c722586c99f19156733c2efbc87515498ae0238ba393c1f0a7e59726d1a6b4f797469128a75b8ab3b92d8a3fcfc2117a281a42e2a993c44d8ca0b8514 SHA512 e8e7b43865399e918ef017d4d710b21cc7ce2f6566056faa82d756be29f038e07a20055978531f8785639c78339970fbfeabd4a4aa1fa4b331f3a344a78954d2
-DIST webmin-1.791.tar.gz 28800013 BLAKE2B 90bcb65131b559f5a0e45aea6cc2735269ddbc49e91604cc37cac0951423ef57c4e1e8496aff1105925f67bce1d2ea10392fa73ca3ed4d714d12f14c76da1e27 SHA512 4ba19f057ee70bc0a283753a6c190bbae15f0e2af1650ef1656c7b94e07a6750203ef3b7190f7abd544b25988446df6b174bf06191426893bd4224e54451e771
-EBUILD webmin-1.791.ebuild 10395 BLAKE2B 1ba7729a111fe38ba7b7b774c563c7967794b27902b54398e9a3e5113fecca454baf9ebb4f0387c04682055f468d0beebce1647319a668253989db4291324463 SHA512 dc54fd107cefd1a4b08353135d72466b31b51114e2de85c82755452bdd6f50dc89796ceee273be730e65a7a3bb4fc9fc22c6e696c89fd7b893c546664007b09f
+DIST webmin-1.881-minimal.tar.gz 2827351 BLAKE2B b8ea9964147c09c91413fbdad3b6a0e5161497296bb33b614161e370ac1292ac9cdf752483835fb279aa70ba41eb09f2774d08caa58861049e467346ad0b64ff SHA512 5b855c5562a6eb6a8fd836e3bd1dcc30696b7f63776d0f8b5ee69f5e219c749210436315fe5fd8f811f4f19e02fe4d7d3cff451a831b085101081b97b8ce794d
+DIST webmin-1.881.tar.gz 28903876 BLAKE2B beaab3282ccbbe7716fe35e62ee93e64b636f420fa9235398954904b5e14888cdc4b0acd5126184dcdab59274d3e5b71a7997df3e73e18c55849b7197f024971 SHA512 eab1acb53aca5e947bb9fac1c08a32e9eeca2903bc19595fbc8e19895bda8f4c3432550c2a87cf8c2b577b223b97566b046b7c339bd8754266544f5777560cc7
+EBUILD webmin-1.881.ebuild 10425 BLAKE2B 81bf2acb05996ff6b601c5145bf2c1e1a55c0162c462e6fc70822ff400c8c63d1c5ec2305e231c20390ef327b4580b968f3329bd0b0b2594fc905c430b5f3e89 SHA512 a91a9acd44a690ae619a71823b8509868166d6bbb2cab7b75aee60e6391bfbdb6e2434f605ed0c9590053342b1a96227f55c387fcb350e3f50d986200d99c658
 MISC metadata.xml 245 BLAKE2B fb529d74f567dd37b9744ec3bfe3de132890694f483fcec456927b8edbdb0a7257fb39685079fe93cf8e8c52377bf87750dea764c98092dc8d6868b19d5dc7d9 SHA512 eb79433135fa9654e593b79830b2a34d158af83164c3f77c2b46950924ade8d03687ff26bb856e49c1e02bb33753c9771380480768ded4983d330f3e25f7c28a
diff --git a/app-admin/webmin/files/gentoo-setup-1.791 b/app-admin/webmin/files/gentoo-setup
index 680dfbb5303b..680dfbb5303b 100644
--- a/app-admin/webmin/files/gentoo-setup-1.791
+++ b/app-admin/webmin/files/gentoo-setup
diff --git a/app-admin/webmin/webmin-1.791.ebuild b/app-admin/webmin/webmin-1.791.ebuild
deleted file mode 100644
index c69abb400e6a..000000000000
--- a/app-admin/webmin/webmin-1.791.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils pam ssl-cert systemd
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-REQUIRED_USE="minimal? ( !mysql !postgres !ldap )"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-MIME-Base64
-	virtual/perl-Socket
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	dev-perl/Authen-Libwrap
-	dev-perl/IO-Tty
-	dev-perl/MD5
-	dev-perl/Net-SSLeay
-	dev-perl/Authen-PAM
-	dev-perl/Sys-Hostname-Long
-	>=net-dns/dnssec-tools-1.13
-	!minimal? (
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		ldap? ( dev-perl/perl-ldap )
-		dev-perl/XML-Generator
-		dev-perl/XML-Parser
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local perl="$( which perl )"
-
-	# Remove the unnecessary and incompatible files
-	rm -rf acl/Authen-SolarisRBAC-0.1*
-	if ! use minimal ; then
-		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
-		rm -f mount/{free,net,open}bsd-mounts*
-		rm -f mount/macos-mounts*
-	fi
-
-	# For security reasons remove the SSL certificate that comes with Webmin
-	# We will create our own later
-	rm -f miniserv.pem
-
-	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
-	# We will use our own later
-	rm -f setup.{sh,pl}
-
-	# Set the installation type/mode to Gentoo
-	echo "gentoo" > install-type
-
-	# Fix the permissions of the install files
-	chmod -R og-w "${S}"
-
-	# Since we should not modify any files after install
-	# we set the perl path in all cgi and pl files here using Webmin's routines
-	# The pl file is Prefix safe and works only on provided input, no other filesystem files
-	ebegin "Fixing perl path in source files"
-	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
-	eend $?
-}
-
-src_install() {
-	# Create config dir and keep
-	diropts -m0755
-	dodir /etc/webmin
-	keepdir /etc/webmin
-
-	# Create install dir
-	# Third party modules installed through Webmin go here too, so keep
-	dodir /usr/libexec/webmin
-	keepdir /usr/libexec/webmin
-
-	# Copy our own setup script to installation folder
-	insinto /usr/libexec/webmin
-	newins "${FILESDIR}"/gentoo-setup-${PV} gentoo-setup.sh
-	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
-	# This is here if we ever want in future ebuilds to add some specific
-	# config values in the /etc/webmin/miniserv.conf
-	# The format of this file should be the same as the one of miniserv.conf:
-	# var=value
-	#
-	# Uncomment it if you use such file. Before that check if upstream
-	# has this file in root dir too.
-	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
-	# Create the log dir and keep
-	diropts -m0700
-	dodir /var/log/webmin
-	keepdir /var/log/webmin
-
-	# Create the init.d file and put the neccessary variables there
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%config%:${EROOT}etc/webmin/config:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}etc/init.d/webmin" \
-		|| die "Failed to patch the webmin init file"
-
-	# Create the systemd service file and put the neccessary variables there
-	systemd_newunit "${FILESDIR}"/webmin.service webmin.service
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%config%:${EROOT}etc/webmin/config:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}$(_systemd_get_systemunitdir)/webmin.service" \
-		|| die "Failed to patch the webmin systemd service file"
-
-	# Setup pam
-	pamd_mimic system-auth webmin auth account session
-
-	# Copy files to installation folder
-	ebegin "Copying install files to destination"
-	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
-	eend $?
-}
-
-pkg_preinst() {
-	# First stop service if running so Webmin to not messup our config
-	ebegin "Stopping any running Webmin instance prior merging"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	# Run pkg_config phase first - non interactively
-	export INTERACTIVE="no"
-	pkg_config
-	# Every next time pkg_config should be interactive
-	INTERACTIVE="yes"
-
-	ewarn
-	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
-	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
-	ewarn "To avoid problems, please before using any module, look at its configuration options first."
-	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
-	ewarn
-	if systemd_is_booted ; then
-		elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
-	else
-		elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
-	fi
-	elog "- The default URL to connect to Webmin is: https://localhost:10000"
-	elog "- The default user that can login is: root"
-	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
-	# First stop service if running - we do not want Webmin to mess up config
-	ebegin "Stopping any running Webmin instance prior unmerging"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-}
-
-pkg_postrm() {
-	# If removing webmin completely, remind the user for the Webmin's own cron jobs.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		ewarn
-		ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
-		ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
-		ewarn "To fix this just disable them if you intend to use Webmin again,"
-		ewarn "OR delete them if not."
-		ewarn
-	fi
-}
-
-pkg_config(){
-	# First stop service if running
-	ebegin "Stopping any running Webmin instance"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-
-	# Next set the default reset variable to 'none'
-	# reset/_reset can be:
-	# 'none' - does not reset anything, just upgrades if a conf is present
-	#		   OR installs new conf if a conf is missing
-	# 'soft' - deletes only $config_dir/config file and thus resetting most
-	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
-	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
-	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
-	local _reset="none"
-
-	# If in interactive mode ask user what should we do
-	if [[ "${INTERACTIVE}" = "yes" ]]; then
-		einfo
-		einfo "Please enter the number of the action you would like to perform?"
-		einfo
-		einfo "1. Update configuration"
-		einfo "   (keeps old config options and adds the new ones)"
-		einfo "2. Soft reset configuration"
-		einfo "   (keeps some old config options, the other options are set to default)"
-		ewarn "   All Webmin users will be reset"
-		einfo "3. Hard reset configuration"
-		einfo "   (all options including module options are set to default)"
-		ewarn "   You will lose all Webmin configuration options you have done till now"
-		einfo "4. Exit this configuration utility (default)"
-		while [ "$correct" != "true" ] ; do
-			read answer
-			if [[ "$answer" = "1" ]] ; then
-				_reset="none"
-				correct="true"
-			elif [[ "$answer" = "2" ]] ; then
-				_reset="soft"
-				correct="true"
-			elif  [[ "$answer" = "3" ]] ; then
-				_reset="hard"
-				correct="true"
-			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
-				die "User aborted configuration."
-			else
-				echo "Answer not recognized. Enter a number from 1 to 4"
-			fi
-		done
-
-		if [[ "$_reset" = "hard" ]]; then
-			while [ "$sure" != "true" ] ; do
-				ewarn "You will lose all Webmin configuration options you have done till now."
-				ewarn "Are you sure you want to do this? (y/n)"
-				read answer
-				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-					sure="true"
-				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-					die "User aborted configuration."
-				else
-					echo "Answer not recognized. Enter 'y' or 'n'"
-				fi
-			done
-		fi
-	fi
-
-	export reset=$_reset
-
-	# Create ssl certificate for Webmin if there is not one in the proper place
-	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
-		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
-		install_cert "${EROOT}/etc/ssl/webmin/server"
-	fi
-
-	# Ensure all paths passed to the setup script use EROOT
-	export wadir="${EROOT}usr/libexec/webmin"
-	export config_dir="${EROOT}etc/webmin"
-	export var_dir="${EROOT}var/log/webmin"
-	export tempdir="${T}"
-	export pidfile="${EROOT}var/run/webmin.pid"
-	export perl="$( which perl )"
-	export os_type='gentoo-linux'
-	export os_version='*'
-	export real_os_type='Gentoo Linux'
-	export real_os_version='Any version'
-	# Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
-	# 'ssl_honorcipherorder', 'no_tls1' and 'no_tls1_1' for tightening security
-	export ssl=1
-	export no_ssl2=1
-	export no_ssl3=1
-	export ssl_redirect=1
-	export ssl_honorcipherorder=1
-	export no_sslcompression=1
-	export no_tls1=1
-	export no_tls1_1=1
-	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
-	export port=10000
-
-	export atboot=0
-
-	einfo "Executing Webmin's configure script"
-	$wadir/gentoo-setup.sh
-
-	einfo "Configuration of Webmin done"
-}
diff --git a/app-admin/webmin/webmin-1.881.ebuild b/app-admin/webmin/webmin-1.881.ebuild
new file mode 100644
index 000000000000..28d8074d3a83
--- /dev/null
+++ b/app-admin/webmin/webmin-1.881.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam ssl-cert systemd
+
+DESCRIPTION="A web-based Unix systems administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
+# because openssl is forced by dev-perl/Net-SSLeay
+IUSE="minimal +ssl mysql postgres ldap"
+REQUIRED_USE="minimal? ( !mysql !postgres !ldap )"
+
+# All the required perl modules can be found easily using (in Webmin's root src dir):
+# find . -name cpan_modules.pl -exec grep "::" {} \;
+# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
+# to install them using the in-built cpan module, and this will mess up perl on the system
+# That's why some modules are forced without a use flag
+# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
+DEPEND="virtual/perl-MIME-Base64
+	virtual/perl-Socket
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
+	virtual/perl-Time-Local
+	dev-perl/Authen-Libwrap
+	dev-perl/IO-Tty
+	dev-perl/MD5
+	dev-perl/Net-SSLeay
+	dev-perl/Authen-PAM
+	dev-perl/Sys-Hostname-Long
+	>=net-dns/dnssec-tools-1.13
+	!minimal? (
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		ldap? ( dev-perl/perl-ldap )
+		dev-perl/XML-Generator
+		dev-perl/XML-Parser
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	local perl="$( which perl )"
+
+	# Remove the unnecessary and incompatible files
+	rm -rf acl/Authen-SolarisRBAC-0.1*
+	if ! use minimal ; then
+		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
+		rm -f mount/{free,net,open}bsd-mounts*
+		rm -f mount/macos-mounts*
+	fi
+
+	# For security reasons remove the SSL certificate that comes with Webmin
+	# We will create our own later
+	rm -f miniserv.pem
+
+	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
+	# We will use our own later
+	rm -f setup.{sh,pl}
+
+	# Set the installation type/mode to Gentoo
+	echo "gentoo" > install-type
+
+	# Fix the permissions of the install files
+	chmod -R og-w "${S}"
+
+	# Since we should not modify any files after install
+	# we set the perl path in all cgi and pl files here using Webmin's routines
+	# The pl file is Prefix safe and works only on provided input, no other filesystem files
+	ebegin "Fixing perl path in source files"
+	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
+	eend $?
+}
+
+src_install() {
+	# Create config dir and keep
+	diropts -m0755
+	dodir /etc/webmin
+	keepdir /etc/webmin
+
+	# Create install dir
+	# Third party modules installed through Webmin go here too, so keep
+	dodir /usr/libexec/webmin
+	keepdir /usr/libexec/webmin
+
+	# Copy our own setup script to installation folder
+	insinto /usr/libexec/webmin
+	newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
+	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
+
+	# This is here if we ever want in future ebuilds to add some specific
+	# config values in the /etc/webmin/miniserv.conf
+	# The format of this file should be the same as the one of miniserv.conf:
+	# var=value
+	#
+	# Uncomment it if you use such file. Before that check if upstream
+	# has this file in root dir too.
+	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
+
+	# Create the log dir and keep
+	diropts -m0700
+	dodir /var/log/webmin
+	keepdir /var/log/webmin
+
+	# Create the init.d file and put the neccessary variables there
+	newinitd "${FILESDIR}"/init.d.webmin webmin
+	sed -i \
+		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+		-e "s:%config%:${EROOT}etc/webmin/config:" \
+		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+		"${ED}etc/init.d/webmin" \
+		|| die "Failed to patch the webmin init file"
+
+	# Create the systemd service file and put the neccessary variables there
+	systemd_newunit "${FILESDIR}"/webmin.service webmin.service
+	sed -i \
+		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+		-e "s:%config%:${EROOT}etc/webmin/config:" \
+		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+		"${ED}$(_systemd_get_systemunitdir)/webmin.service" \
+		|| die "Failed to patch the webmin systemd service file"
+
+	# Setup pam
+	pamd_mimic system-auth webmin auth account session
+
+	# Copy files to installation folder
+	ebegin "Copying install files to destination"
+	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
+	eend $?
+}
+
+pkg_preinst() {
+	# First stop service if running so Webmin to not messup our config
+	ebegin "Stopping any running Webmin instance prior merging"
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	# Run webmin_config first - non interactively
+	export INTERACTIVE="no"
+	webmin_config
+	# Every next time webmin_config should be interactive
+	INTERACTIVE="yes"
+
+	ewarn
+	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
+	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
+	ewarn "To avoid problems, please before using any module, look at its configuration options first."
+	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
+	ewarn
+	if systemd_is_booted ; then
+		elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
+	else
+		elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+	fi
+	elog "- The default URL to connect to Webmin is: https://localhost:10000"
+	elog "- The default user that can login is: root"
+	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
+}
+
+pkg_prerm() {
+	# First stop service if running - we do not want Webmin to mess up config
+	ebegin "Stopping any running Webmin instance prior unmerging"
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
+	eend $?
+}
+
+pkg_postrm() {
+	# If removing webmin completely, remind the user for the Webmin's own cron jobs.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		ewarn
+		ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
+		ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
+		ewarn "To fix this just disable them if you intend to use Webmin again,"
+		ewarn "OR delete them if not."
+		ewarn
+	fi
+}
+
+pkg_config(){
+	webmin_config
+}
+
+webmin_config(){
+	# First stop service if running
+	ebegin "Stopping any running Webmin instance"
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
+	eend $?
+
+	# Next set the default reset variable to 'none'
+	# reset/_reset can be:
+	# 'none' - does not reset anything, just upgrades if a conf is present
+	#		   OR installs new conf if a conf is missing
+	# 'soft' - deletes only $config_dir/config file and thus resetting most
+	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
+	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
+	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
+	local _reset="none"
+
+	# If in interactive mode ask user what should we do
+	if [[ "${INTERACTIVE}" = "yes" ]]; then
+		einfo
+		einfo "Please enter the number of the action you would like to perform?"
+		einfo
+		einfo "1. Update configuration"
+		einfo "   (keeps old config options and adds the new ones)"
+		einfo "2. Soft reset configuration"
+		einfo "   (keeps some old config options, the other options are set to default)"
+		ewarn "   All Webmin users will be reset"
+		einfo "3. Hard reset configuration"
+		einfo "   (all options including module options are set to default)"
+		ewarn "   You will lose all Webmin configuration options you have done till now"
+		einfo "4. Exit this configuration utility (default)"
+		while [ "$correct" != "true" ] ; do
+			read answer
+			if [[ "$answer" = "1" ]] ; then
+				_reset="none"
+				correct="true"
+			elif [[ "$answer" = "2" ]] ; then
+				_reset="soft"
+				correct="true"
+			elif  [[ "$answer" = "3" ]] ; then
+				_reset="hard"
+				correct="true"
+			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
+				die "User aborted configuration."
+			else
+				echo "Answer not recognized. Enter a number from 1 to 4"
+			fi
+		done
+
+		if [[ "$_reset" = "hard" ]]; then
+			while [ "$sure" != "true" ] ; do
+				ewarn "You will lose all Webmin configuration options you have done till now."
+				ewarn "Are you sure you want to do this? (y/n)"
+				read answer
+				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+					sure="true"
+				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+					die "User aborted configuration."
+				else
+					echo "Answer not recognized. Enter 'y' or 'n'"
+				fi
+			done
+		fi
+	fi
+
+	export reset=$_reset
+
+	# Create ssl certificate for Webmin if there is not one in the proper place
+	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
+		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
+		install_cert "${EROOT}/etc/ssl/webmin/server"
+	fi
+
+	# Ensure all paths passed to the setup script use EROOT
+	export wadir="${EROOT}usr/libexec/webmin"
+	export config_dir="${EROOT}etc/webmin"
+	export var_dir="${EROOT}var/log/webmin"
+	export tempdir="${T}"
+	export pidfile="${EROOT}var/run/webmin.pid"
+	export perl="$( which perl )"
+	export os_type='gentoo-linux'
+	export os_version='*'
+	export real_os_type='Gentoo Linux'
+	export real_os_version='Any version'
+	# Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
+	# 'ssl_honorcipherorder', 'no_tls1' and 'no_tls1_1' for tightening security
+	export ssl=1
+	export no_ssl2=1
+	export no_ssl3=1
+	export ssl_redirect=1
+	export ssl_honorcipherorder=1
+	export no_sslcompression=1
+	export no_tls1=1
+	export no_tls1_1=1
+	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
+	export port=10000
+
+	export atboot=0
+
+	einfo "Executing Webmin's configure script"
+	$wadir/gentoo-setup.sh
+
+	einfo "Configuration of Webmin done"
+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 79f5313cb1db..e18a5ae79bca 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 5e11a0f31d96..e58854ce00dc 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -10,14 +10,16 @@ AUX clamd.conf-r1 129 BLAKE2B 3a6b0adc07df276054cda4d9b879b30e81fed06cee7562bc35
 AUX clamd.initd-r6 3253 BLAKE2B 3d675b3ab2b0832abcb2206e0373e37ff19000fd125ca9240942edefab9ed54e12be4bce4112118710e44de5f4f66da61e1cc8e01d725021da629d05089b9412 SHA512 0a76233e67bc25ef4bdf02218c2b3771569c4f9b2b1ae8ca2da22fcf4c1fc0ea17013523c2e2b048ce3db5c793a568fb59b40f4be78186d3adc0f774c3442a79
 AUX clamd.service 202 BLAKE2B 4d02132cdb44a7155e881037b45bab28f42445808d1d3ff5821e9b179b31efd7d5f217fb968efa17e77f6e0739f0258c4c49656283177a0f5b3d572490259bcd SHA512 799d3f33ca69841882f86f6853dd0dc6d8af73db8cfa5ce6dd6c873c5e7bc07d29bfe0f85cfb77edf2b0d8c05de73988d06148b993996ce639c5d0eeac908647
 AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376725e7857b8b911c841df89ce63ed665a1d0ca6d30f9456c9d47c370b36a2cf8df1e2f3f520d121fe0 SHA512 69a0ca31a7288b5494d8c85ce5ff859a8f34b8a93f573eded90c270099ecac30e01d8549a07a160d74bfdc3c5401c3fd625b178080ea2c02520aab91252739e7
-AUX freshclamd.service 191 BLAKE2B 5b517bf15d008454052bd0f7d5a10fb89284a5b64d1cd11570981ca07d70d4dbab6739175ef7434c5c16625fc4f342d21fe6c67970ebac9e64dc8c08732ab68e SHA512 aaf78e763d2aa9c17fc95edb1550547b6681a91fd239a86535e5193d36ff0e152c51c3a3957542f80d5b170805f296159958ac347886981ddd324bec4237da92
+AUX freshclamd.service 240 BLAKE2B 1b72ffee3b0b1b51811aa5f3c7a52678b3beb260f020dd326a437d6abf4bc515392d0b263eeb0773de128b9c0eff1c1f0b7b604dd14b9dffd50aba31909963e1 SHA512 28da28d633f487806448e17aec36648b6ba12f549549485704607e403e64643caea6ee9420e8101f11b3edebe62b651e6d6c338ab232f33b97b315d64b3789ac
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
 DIST clamav-0.100.0.tar.gz 16036757 BLAKE2B c51edfb05726e16e2ff1ef1fee9f174af5a0d65396f847a4f6e1246d5844b92eb70896fc598d2c73719b1315ff3c41aca503823431e0918d52f56d29399dd796 SHA512 57e1da86a32fdfb66887c4aeed03008bc070ce3cb6b881db411332f2f2e640b73dca84d990f5886526b3d6bd0c2770c7dcce5b4e7cf48323824c362452593549
 DIST clamav-0.100.1.tar.gz 16154415 BLAKE2B df4ddde28b0b263765f4a571a407390b30aa6fe58d07e1b8fe427e70141219fb3d7c5addfbf30a350c6c08324dee1ec3dd80319306df7578ed87138c6513b99d SHA512 13a4e050e030ac3d1cc07b12bdd56c455e266e0b205a4c9bc9f18e53f6d8913a66eed2296abf857f395227ab0ed5c7bc90bc357bcb314dc9e18a9c6177dcc5b2
 DIST clamav-0.100.2.tar.gz 15926420 BLAKE2B 0a64a08b6cdad94f55852041df06b5517bcfa3bacb5871c694bf51692c4698ffd39f09c92fe2af167fcf2b27806a7175a9b649e6d6d5ffc65755509e3574d374 SHA512 70b51eafb11dc727188e7d4554b8095a9e0406e76b78778fede94f8a4c78146034478197217039384eb1fd15532e822cfa6b51707e431e9397ec21d5e393a60c
 DIST clamav-0.99.4.tar.gz 16083015 BLAKE2B 3c2e7d11ee05fe846f75c3fb6501b5fd809a2e58f8e69c82e493e32fcbc87ca0e5b5f7ab83a0d7e251a5dc8e84aed1475c87c1248b393fa04b6924a2ab32b9bf SHA512 778d5ef510d8d4bdfac5dc33d92469ed4283c414b3d42da6e1a0b13ed70e37755d5c837622dc336bc728ba1f8bf5485fc8a8d3a67a90e9aaa9e4dc71ece0691d
-EBUILD clamav-0.100.0.ebuild 5251 BLAKE2B b02a808c15f9da8c884650841f629271cca81442b31fd8e483e4784e1dfa44a3f8a6322593095a34d68c3623ede4fb77024ea3782a9147703a842a142228ca73 SHA512 b6340dadb1d4b4eb649581d4ffed622a5d1cb6f9cecd23de0f3519a7104e925257ab3f0735dff7ffa8e60285db136e9dc7205d120a194d279e82b80da534bee8
-EBUILD clamav-0.100.1.ebuild 5257 BLAKE2B 0fe7e478c10ef9a9967f70299b5bbc583ec5c6cadec9cad5823c8fb69d17b88d2bdc56c895c94a3ea7a9723e578c37009366cd0422702b6442ca0e13c997b405 SHA512 d7f541ad92de9a27e70a625b8dd16cc75919b0a43c14cdfca775dcb0154fb1fba89aa241361bb85f9ec925654145520b569d9830ad2e86bde8286a108c1d4cbf
+EBUILD clamav-0.100.0.ebuild 5258 BLAKE2B 79c3b2fa7d2acd9288785ecec5761132bd3b1fe9219513d59133dc0877d2802e1b57927a686dc55bc397e66fdc79c943d629e512dda99ded6f995139e9cc450e SHA512 2b1fde01326f798c7e52494090eef039400fec3d225d932b0a004728926a3d57559bb2ea0beb7584c624b037d5d3f14861408ec073f6be9a52bec77353ad50fd
+EBUILD clamav-0.100.1-r1.ebuild 5257 BLAKE2B 0fe7e478c10ef9a9967f70299b5bbc583ec5c6cadec9cad5823c8fb69d17b88d2bdc56c895c94a3ea7a9723e578c37009366cd0422702b6442ca0e13c997b405 SHA512 d7f541ad92de9a27e70a625b8dd16cc75919b0a43c14cdfca775dcb0154fb1fba89aa241361bb85f9ec925654145520b569d9830ad2e86bde8286a108c1d4cbf
+EBUILD clamav-0.100.1.ebuild 5263 BLAKE2B 48e800ac532b6d6f42d6e1d5766d4cb9fa33e3c9452fc5b5df0e72a5287c7124aefaaad0164b8863f85a58461aab0a3222bd5983731c828a8e3f2b73eb2ce990 SHA512 51c138ff3680b89770830f891fec9ae3bb69a169501cd550d23b8d954eb0d4a7273ddc671dac789544637a3a6c785a54572ad8922d6c9598a4f69b6479c72315
 EBUILD clamav-0.100.2.ebuild 5436 BLAKE2B 8c4f6b179e8799c7b867419a98d6ea2616a815de07e5d1b1ba101cba6a83a754f096a7392c7adc785364021832f92535f01a6eaae3833ac555c787eae7536fa9 SHA512 c5ce697ac52e7bf62ab91a9d63169b5976d0dcb2849490bd09b4190a59fa0bc0a7440dcb859c86a3aabfc938f7da1d24864d0de6a3b8426d9b7f89cd51832b93
 EBUILD clamav-0.99.4-r1.ebuild 5117 BLAKE2B 1af1ba195eec3e7c9154386101719e08d7e0f2a28f74871374195b9619cdd99b5306d203eec88fe1041f5f024ec9baadfd02ed1f269dcf806dd6b3341ac1fd59 SHA512 f211a3bcb516f86a2d2143aea40e61e0c4e54064dfd7e37f1130ae38323efbd70c4d93eec321669ec7274b1eaadd2acf16dc9ad41bb290b4a1136b16e505dd8e
+EBUILD clamav-0.99.4-r2.ebuild 5117 BLAKE2B 1af1ba195eec3e7c9154386101719e08d7e0f2a28f74871374195b9619cdd99b5306d203eec88fe1041f5f024ec9baadfd02ed1f269dcf806dd6b3341ac1fd59 SHA512 f211a3bcb516f86a2d2143aea40e61e0c4e54064dfd7e37f1130ae38323efbd70c4d93eec321669ec7274b1eaadd2acf16dc9ad41bb290b4a1136b16e505dd8e
 MISC metadata.xml 870 BLAKE2B 8cf11482134a16789726d801ea4562fd31cad0c107e2deeab8d0442d9f868a48445ac99245926278d781eee9d2883effeab2f4b3d036442e8f0876b47680f51b SHA512 6791e9ef08015b4ff640beae21b61c609f5e4c942b87acbd8eb2c67e7686729e1752affb7d6cd19233878d9608fe04f52367d7247ba92496e89abf561007e855
diff --git a/app-antivirus/clamav/clamav-0.100.0.ebuild b/app-antivirus/clamav/clamav-0.100.0.ebuild
index 0ee874e6b6ca..baf3b3b8f342 100644
--- a/app-antivirus/clamav/clamav-0.100.0.ebuild
+++ b/app-antivirus/clamav/clamav-0.100.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-antivirus/clamav/clamav-0.100.1-r1.ebuild b/app-antivirus/clamav/clamav-0.100.1-r1.ebuild
new file mode 100644
index 000000000000..2f4bd0aa4fdf
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.100.1-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic user systemd
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses:0 )
+	iconv? ( virtual/libiconv )
+	metadata-analysis-api? ( dev-libs/json-c:= )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	>=sys-libs/zlib-1.2.2:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-devel/libtool
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	system-libmspack? ( dev-libs/libmspack )
+	!!<app-antivirus/clamav-0.99"
+# hard block clamav < 0.99 due to linking problems Bug #567680
+# openssl is now *required* see this link as to why
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+DOCS=( docs/clamdoc.pdf docs/phishsigs_howto.pdf docs/signatures.pdf )
+HTML_DOCS=( docs/html )
+
+PATCHES=(
+	"${FILESDIR}/clamav-0.100.0_autotools.patch"
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	use ppc64 && append-flags -mminimal-toc
+	use uclibc && export ac_cv_type_error_t=yes
+
+	econf \
+		$(use_enable bzip2) \
+		$(use_enable clamdtop) \
+		$(use_enable ipv6) \
+		$(use_enable milter) \
+		$(use_enable static-libs static) \
+		$(use_enable test check) \
+		$(use_with iconv) \
+		$(use_with metadata-analysis-api libjson /usr) \
+		$(use_with system-libmspack) \
+		--cache-file="${S}"/config.cache \
+		--disable-experimental \
+		--disable-gcc-vcheck \
+		--disable-zlib-vcheck \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-zlib="${EPREFIX}"/usr \
+		--disable-llvm
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav
+	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
+	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
+
+	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
+	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+	systemd_dounit "${FILESDIR}/clamd.service"
+	systemd_dounit "${FILESDIR}/freshclamd.service"
+
+	keepdir /var/lib/clamav
+	fowners clamav:clamav /var/lib/clamav
+	keepdir /var/log/clamav
+	fowners clamav:clamav /var/log/clamav
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/clamav.logrotate clamav
+
+	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/clamd.conf.sample || die
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/freshclam.conf.sample || die
+
+	if use milter ; then
+		# MilterSocket one to include ' /' because there is a 2nd line for
+		# inet: which we want to leave
+		##dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+			"${ED}"/etc/clamav-milter.conf.sample || die
+		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
+			MILTER_NICELEVEL=19
+			START_MILTER=no
+		EOF
+
+		systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
+	fi
+
+	if use doc; then
+	   einstalldocs
+	   doman docs/man/*.[1-8]
+	fi
+
+	for i in clamd freshclam clamav-milter
+	do
+		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
+	done
+
+	prune_libtool_files --all
+}
+
+src_test() {
+	emake quick-check
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
+		ewarn "You must run freshclam manually to populate the virus database files"
+		ewarn "before starting clamav for the first time.\n"
+	fi
+}
diff --git a/app-antivirus/clamav/clamav-0.100.1.ebuild b/app-antivirus/clamav/clamav-0.100.1.ebuild
index 2f4bd0aa4fdf..7ae86603564c 100644
--- a/app-antivirus/clamav/clamav-0.100.1.ebuild
+++ b/app-antivirus/clamav/clamav-0.100.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-antivirus/clamav/clamav-0.99.4-r2.ebuild b/app-antivirus/clamav/clamav-0.99.4-r2.ebuild
new file mode 100644
index 000000000000..9e65d1d592f0
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.99.4-r2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic user systemd
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses:0 )
+	iconv? ( virtual/libiconv )
+	metadata-analysis-api? ( dev-libs/json-c:= )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	>=sys-libs/zlib-1.2.2:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-devel/libtool
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	!!<app-antivirus/clamav-0.99"
+# hard block clamav < 0.99 due to linking problems Bug #567680
+# openssl is now *required* see this link as to why
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.99.4-fix-newer-zlib.patch
+	"${FILESDIR}/${P}-pcre2-compile-erroffset.patch"
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	use ppc64 && append-flags -mminimal-toc
+	use uclibc && export ac_cv_type_error_t=yes
+
+	econf \
+		$(use_enable bzip2) \
+		$(use_enable clamdtop) \
+		$(use_enable ipv6) \
+		$(use_enable milter) \
+		$(use_enable static-libs static) \
+		$(use_enable test check) \
+		$(use_with iconv) \
+		$(use_with metadata-analysis-api libjson /usr) \
+		--cache-file="${S}"/config.cache \
+		--disable-experimental \
+		--disable-gcc-vcheck \
+		--disable-zlib-vcheck \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-zlib="${EPREFIX}"/usr \
+		--disable-llvm
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav
+	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
+	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
+
+	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
+	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+	systemd_dounit "${FILESDIR}/clamd.service"
+	systemd_dounit "${FILESDIR}/freshclamd.service"
+
+	keepdir /var/lib/clamav
+	fowners clamav:clamav /var/lib/clamav
+	keepdir /var/log/clamav
+	fowners clamav:clamav /var/log/clamav
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/clamav.logrotate clamav
+
+	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/clamd.conf.sample || die
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/freshclam.conf.sample || die
+
+	if use milter ; then
+		# MilterSocket one to include ' /' because there is a 2nd line for
+		# inet: which we want to leave
+		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+			"${ED}"/etc/clamav-milter.conf.sample || die
+		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
+			MILTER_NICELEVEL=19
+			START_MILTER=no
+		EOF
+
+		systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
+	fi
+
+	for i in clamd freshclam clamav-milter
+	do
+		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
+	done
+
+	prune_libtool_files --all
+}
+
+src_test() {
+	emake quick-check
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
+		ewarn "You must run freshclam manually to populate the virus database files"
+		ewarn "before starting clamav for the first time.\n"
+	fi
+}
diff --git a/app-antivirus/clamav/files/freshclamd.service b/app-antivirus/clamav/files/freshclamd.service
index a0a72c2e60eb..214876880661 100644
--- a/app-antivirus/clamav/files/freshclamd.service
+++ b/app-antivirus/clamav/files/freshclamd.service
@@ -3,6 +3,9 @@ Description=clamav updater
 
 [Service]
 Type=forking
+User=clamav
+Group=clamav
+RuntimeDirectory=clamav
 PIDFile=/run/clamav/freshclam.pid
 ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 900cfa70e78c..f793033d1e66 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/afio/Manifest b/app-arch/afio/Manifest
index e7070037ae8c..7ab27d994e42 100644
--- a/app-arch/afio/Manifest
+++ b/app-arch/afio/Manifest
@@ -1,4 +1,6 @@
+AUX afio-2.5.1-control-file-warning-fix.patch 776 BLAKE2B 6502ffa8200ef12394fe68678b7dd0ed8d61c8ab326eae660cfd1ea91d8c031dd8fe0895dfe41917add268ea3be2d053a5f132dd0033898eab8b606d346b407d SHA512 842c9bac9af3e5ece8c4bab55d5c1fd8f43585eb69e3f689d124e92e1972c5259510a206ba8c34d70f49f8e191ad1ad9b09a1b25efb63ed870c3322d00d6d249
 AUX afio-2.5.1-fix-build-system.patch 725 BLAKE2B 3ec8c1068d60db73727fabb02eae50005c1aef8db39df977add2ab312d627fbc16b107b1f007fad9be5b97d1afe02ec0fd38c97c80a804464f1e3985868a3f67 SHA512 ccf6af4e1591d9c8e519dcb9016c49c0a8601f2a03949270b205560bb13e90bdbd50079c4e0abcc3e6290a809ffb24455c00ee5cd70c0168b31b1c01b9bfc093
 DIST afio-2.5.1.tgz 191765 BLAKE2B 48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
 EBUILD afio-2.5.1-r1.ebuild 687 BLAKE2B 8c2a97cccf64764bffcb2bc2f48f427f31d66b8a866629ec0e37f96196799bdf818c4afbd631a3d7caed2025d6a98b5897598b0f1afed133113e11d1453d4208 SHA512 f7a87a25cb38074faee92f6a6952b7060d73dd2311c7792f459b45419a995490a8686666525576c0a53300a003d51142fc50295ef105841369c2657cdd07c77e
+EBUILD afio-2.5.1-r2.ebuild 747 BLAKE2B f0e15e42aea6cde81bbec46cedff260505c10939d6710973cafe6733090790ba6336b591662bf46928ad8daedce763c56ddc8db99a629210a3f26073b0c78d5c SHA512 2c4e948401e1db29a8f80443a1c39941ec236db5c702f49d2621d107ea7953d2d3b2c84872f9525990dcf36b41d41141b5d9c1e17436fb1d945014652567fd00
 MISC metadata.xml 591 BLAKE2B 1f4dfca240f8986aba12ac0ee887fc49ccb50248c300d318e09807aa2552f6dc642f0f8a629fd34f1156b9e8407f7a429245893f999afc87db90cb9860329fc7 SHA512 ecde4bb37f668f30eedbb5b07a648fa23183d64593595948e6caf575fa78f8c666a406ed33b4d590190203920e1db7368dfc99b95948a7ab7896d12490f50760
diff --git a/app-arch/afio/afio-2.5.1-r2.ebuild b/app-arch/afio/afio-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..fced7417de80
--- /dev/null
+++ b/app-arch/afio/afio-2.5.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Afio creates cpio-format archives."
+HOMEPAGE="http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio"
+SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
+
+LICENSE="Artistic LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch
+	"${FILESDIR}"/${PN}-2.5.1-control-file-warning-fix.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	dodoc ANNOUNCE-* HISTORY README SCRIPTS
+
+	local i
+	for i in {1..4}; do
+		docinto "script${i}"
+		dodoc -r "script${i}"/.
+	done
+}
diff --git a/app-arch/afio/files/afio-2.5.1-control-file-warning-fix.patch b/app-arch/afio/files/afio-2.5.1-control-file-warning-fix.patch
new file mode 100644
index 000000000000..f1c93c8e914c
--- /dev/null
+++ b/app-arch/afio/files/afio-2.5.1-control-file-warning-fix.patch
@@ -0,0 +1,29 @@
+Only in b: 1
+diff -ubBr a/afio.c b/afio.c
+--- a/afio.c	2018-03-23 09:16:07.230401966 -0400
++++ b/afio.c	2018-03-23 09:20:05.614421756 -0400
+@@ -3724,7 +3724,8 @@
+ 	
+ 	/* ASX check if file changed between the begining 
+ 	   and end of the backup */
+-	if (*fsname)
++        /* if *fsname==0, it was a control file, so do not check then */
++	if (*fsname!=0)
+ 	{
+ 	    struct stat st;
+ 	    /* I must check fsname ! 
+@@ -3739,13 +3740,10 @@
+ 	        if (st.st_mtime!=sb.sb_mtime)
+ 	        {
+ 	            warn (fsname, "File was modified during its backup");
++		    if(index(ignorewarnings,(int)'d')) warnings--;
+ 	        }
+ 	    }
+ 	}
+-	else
+-	{
+-	    warn (name, "ASX no fsname for this name ??");
+-        }
+ 	
+ 	if(aflag && *fsname && ((sb.sb_mode & S_IFMT)==S_IFREG))
+ 	{
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 497d4934a58b..f416766e06c2 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,5 +1,7 @@
 DIST cabextract-1.6.tar.gz 241731 BLAKE2B 49a94b1b0d8a6c9f61cd51280a035e3fedb8d7a2d097b132bc56114c6003a558647a7f8c47b8d08fcac1999e68bea5303adb2b03c8e6dd010995e8b0c6dcd442 SHA512 d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8
 DIST cabextract-1.7.tar.gz 293760 BLAKE2B d5ab4783c944d5d8b1d9ed8a2fbbfd60aeeab9f12b836032f982efc5721055b2caa521147246b3b5274d9456b1dbd2d513455cfd57750cf6d7fdc18f109f96c9 SHA512 63789e485d57299f2a0a60dc6d9a94e83639eb59b73789eff52977d3d3bd37a1c00713c86a4c6289e35541d0b7240ea0545ba84013713c070b4324ae1f2865ce
+DIST cabextract-1.8.tar.gz 289256 BLAKE2B ba9fea0cd12859b0de97b13362eaf276066650eb7151e0115af7ed2586cfa7497f72be2f9287d3ccb5ce5256ec26ca69e729df5bb0a327bb9f32ded25391460c SHA512 f8d676d6b738b0b13ac1cac7716c2fb46db423ef30b05ee64f00fcb19596131fbd34341c8b417af3de04896e9b6a8abf0d5976ee4bf87d016806a71317246d7a
 EBUILD cabextract-1.6.ebuild 1115 BLAKE2B d6898fc1ef97920e8c7a54d3f79963a59f93b90b0c432f3cf088efaa202a4eb37b1385cdae1c2f91b97f3252938216f55192851291824c33c79ec02df6f7a08e SHA512 10c82fad424f0e5093816ebab945c37e88180618431be7b1068c847534ceb83e3e9ee0379862ec3dc312b65b01cfc2954d3300dd98d36455421d6814840df534
 EBUILD cabextract-1.7.ebuild 1155 BLAKE2B 0f93ea1453dae2141d540a11ca038cc8dec1443d93bb4b517735e3b2eab92ab5f56a94330cb442896808d500600fe78a19a83e32c2e167f49fed37eec9ae402c SHA512 d0503c4541eb6eaf93fb3dfa50a6a968b8355a17cdfe5d52af0ccf2187b886bd23e1db740fb0f3647b43c88f1537fc6d992fc0cb96eda675f4e45672a4856266
+EBUILD cabextract-1.8.ebuild 1152 BLAKE2B e4db9bd87b69f44a8be2e56462245531b639a6a4700ac087f8919319997dff2fc9c3267e21a763fa7607a678598b20bfdc6705eba76a19d268aa9e945460b5d2 SHA512 9da9c8b743b7eb5a091af81ffc9d010dbea4580e6b15a43c8e68c0638b14c397412b1f4c4d1fca8759cf3a18d033dccec351dafddf894cb888ee39948189a09b
 MISC metadata.xml 497 BLAKE2B dc1c758e518500bcadecefb0a3ac5d6bcd62e97113ccf69ee034707c416e8d7e8282060609f24d2406ada0a443624600b2a9ef554c4adaa9b315a6712491213f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3
diff --git a/app-arch/cabextract/cabextract-1.8.ebuild b/app-arch/cabextract/cabextract-1.8.ebuild
new file mode 100644
index 000000000000..5990d8ff13fe
--- /dev/null
+++ b/app-arch/cabextract/cabextract-1.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Extracts files from Microsoft cabinet archive files"
+HOMEPAGE="https://www.cabextract.org.uk/"
+SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="extras"
+
+RDEPEND="extras? ( dev-lang/perl )"
+
+src_prepare() {
+	default
+	# the code attempts to set up a fnmatch replacement, but then fails to code
+	# it properly leading to undefined references to rpl_fnmatch().  This may be
+	# removed in the future if building still works by setting "yes" to "no".
+	export ac_cv_func_fnmatch_works=yes
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic )
+	default
+	docinto html
+	dodoc doc/wince_cab_format.html
+	if use extras; then
+		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
+	fi
+}
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index a120da9748f8..9d74afd90095 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -3,6 +3,8 @@ AUX dpkg-1.18.12-flags.patch 416 BLAKE2B c7fe40b28793420afa0b895585cc14a675f9be6
 AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919fbc3ee5e2837540f91cf80229e669a6fe24d6de1c4bd1c1debdc34a0c04a2bbc6a21eb964032f24526986678eb1b14 SHA512 743f4780b4c93e53924836fae96d59c2f1098dae6ef683b2b30146ab0345109718a507486f86ff96cda5b705aff858da563cdc0d40c965bf964cafe7105994ae
 DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a7143f87c581730797975303c1054003e41fd65ecf80df1dc053ba87c0e8449ec574ddcb158228b41ae57a23db18f SHA512 60d7198ffe6ea759c30ad82143b3107d41ce59224b853cb5a7beb79af0de6ba6a69414c365e6b3555a0a9c60e3cf9b543a3a448d80a734be38ccecb77ae963a9
 DIST dpkg_1.19.1.tar.xz 4600848 BLAKE2B daadc95f0f66312e6012a5c9ce053dba055d87f766d8e9b9e99ed3eed59e83616b89cb2324fc61205bf4e22388cc0f9f62d191cbdd858250a50f7c6d141adf7d SHA512 d2c745f8cc3db94be15ce3ef74f9317768b316d9bb96aac2c681c2f47433524774e0c2d5ff3daf6e7cc779e5ffc4ce96783de12802f32dab1d72022786ca6c20
+DIST dpkg_1.19.2.tar.xz 4607868 BLAKE2B 4c191fb3dbe64bb3a515dadbb5f81bb32a0ae3b7267603978f7aee34f6baa02bacb818600759fe4bac0c3470ce2d6409c778a408833af796fe65f27fe910713f SHA512 244a6ef6aad935aee649503d6ce3238e34f4fae3f57ca79e99c1890140d913c29255bc9d0e90b50e96d2cf44ab0e44d6c3675a7bed306213fe5fe31710324cf7
 EBUILD dpkg-1.19.0.5.ebuild 1845 BLAKE2B b6320665601e48f808499ad616aec40b0c7be70673561120eb963065e87a05f1f2e8e0f1fccedcd80fdcc98ff7239a07e7f9ee75396288058521099af94189f6 SHA512 54b06dd32e8a95fffb89a3f8e160d4156002fa51d02fb8648966eadfdc9e43d999dfb6d42c4eabc68f4b8c64b73c171221c1de3154b06e1ce180739a35e66f13
-EBUILD dpkg-1.19.1.ebuild 1945 BLAKE2B 23f02cba1ec5b2e7cd6085d11e67ab3e887cd8cd99602005367892b3517e153df1adb923ac27b107de98f5888c203de0eb5ec95956dd51da36036928f3b5b0a8 SHA512 de78a59565cf2cfded53447996c2e85e147f221f823f1beeee481311ebac22c9af85cf318dd06a35b652ccb2e58e48cc34f43680fbcf5cf834f1c7f45cc666c4
+EBUILD dpkg-1.19.1.ebuild 1965 BLAKE2B 5056d1012bf9b258295fa9fdb25ea7d94a40e3136c3ef7cd7f4614f354f685f121cc4dd73f06fe966f1d1f5b628b33c04883f7ac21177136900d09b06eef5dc8 SHA512 8b42d0c8076a71a542260e2e02b77c95f53c205a9b1c2b7be296418d4fbd516cb411a342e9ab511098febb34c62bd96a823a1a6f24376b05018a303135b4987f
+EBUILD dpkg-1.19.2.ebuild 1958 BLAKE2B e4c0079a20ff60c06340951c337f1c7b60590c7867cac197b21a6e902d9d1556f4ceb2a8b83dd28b35d3f157f1b1b829499f0eea75557454eabfb0deb6d9bbee SHA512 c8703cc76d41b3407d2c97f88164b30daba4afb0752b47de3d98fad9c7fc9bf1216aa0a762111c97b76eb23462ff2133e3656e1cf9b91285aa7ed8291c2ebade
 MISC metadata.xml 433 BLAKE2B bfddf84314750bbaf97250dc51916485e8226379d3d3aa925f7879ca456c3052e062b1516592c49b4b048a0fe76a55c6302b719747ba43a7a8d6fbd65c9eb8ec SHA512 da157c95d0dcf2086b37482bad4bd1c52da16c015e71411653f12e3f5e0f25d710e1819675a0d5b8e92a9e185dc61f602007e3a8875aa1b05b78f128de1b0ca1
diff --git a/app-arch/dpkg/dpkg-1.19.1.ebuild b/app-arch/dpkg/dpkg-1.19.1.ebuild
index aeee78ed9f49..c5a8a36ffabb 100644
--- a/app-arch/dpkg/dpkg-1.19.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 
 RDEPEND="
diff --git a/app-arch/dpkg/dpkg-1.19.2.ebuild b/app-arch/dpkg/dpkg-1.19.2.ebuild
new file mode 100644
index 000000000000..c9c51a2671a8
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.19.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
+
+RDEPEND="
+	>=dev-lang/perl-5.14.2:=
+	bzip2? ( app-arch/bzip2 )
+	libmd? ( app-crypt/libmd )
+	lzma? ( app-arch/xz-utils )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+DOCS=(
+	ChangeLog
+	THANKS
+	TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
+	"${FILESDIR}"/${PN}-1.18.12-flags.patch
+	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
+)
+
+src_prepare() {
+	use nls && strip-linguas -i po
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode) \
+		$(use_enable update-alternatives) \
+		$(use_with bzip2 libbz2) \
+		$(use_with libmd) \
+		$(use_with lzma liblzma) \
+		$(use_with selinux libselinux) \
+		$(use_with zlib libz) \
+		--disable-compiler-warnings \
+		--disable-dselect \
+		--disable-silent-rules \
+		--disable-start-stop-daemon \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+
+	keepdir \
+		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
+		/var/lib/dpkg/{alternatives,info,parts,updates}
+#		/usr/$(get_libdir)/db/{alternatives,info,parts,updates} \
+
+	prune_libtool_files
+}
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 6ced80686e16..68bbaf87ac9e 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,7 +1,8 @@
 AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
 AUX gzip-1.4-asmv.patch 630 BLAKE2B 64508293c8257db3dafd2b20fe5bc23aa37b54f90b63eaeb7a67643ea837b88d58b90fa8b177d84a538eef183d5e49ab98e6b5f8a482303e68ef2c5acb390faf SHA512 7769c98cfc8d6c7c48bc1772d45b44c6c4e1a9fa266dbe5bfe1b9822434b96f7c42ec0d2f4444a5ee8ae8086e571f6891756c7c22f61352649721044eda61a0f
+AUX gzip-1.9-gnulib-glibc-2.28.patch 5422 BLAKE2B 1c514d2ba6b3ff1596930b7efc32591bd7175bf5cbf07ef323f2566e0723fe8b125f746492ab25ef4cd892f75c832f79dba74d81da0814944898c83d03f54fa7 SHA512 5111b961d50906a5e27432628f5becbb63b993077861f4441cf445cbed3f4ec4e5c69aee22f209f05ccaa5514cace53b5805ef9f96886276d8f1b46620d614e3
 DIST gzip-1.8.tar.xz 728116 BLAKE2B 34b707bd403791aca8620de3520637c460dbd9167a4fb693c78438115862781350ef5e256ad0accce75b25515b82fcd3e405cc310d6ea36f2d2609b0a270c4db SHA512 efd3e2439476054badeb127d9156e24e9252129111219f13fd939596c057b2a96291630b2717181984b391abf249ac8699488bbd01ceeb8a70b121c500b10c55
 DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
 EBUILD gzip-1.8.ebuild 1177 BLAKE2B aaf2b99cec28e67f048a05c88d3a958140a322cc7f232242c06cd800443e8cb5f5e05d19bb60e6662aa01dea521a0ccb79cddc2bc8160880eaf3ea501da10a32 SHA512 f64ac3b923a2dfcb881f90cadfe64cabde16cbde83fef903b35bae5ce23f5422f281cc04e37c3a043978d59d08cc506a06b489d02b4a347a15b7aee1b43b4a4c
-EBUILD gzip-1.9.ebuild 1110 BLAKE2B 9655656fef362d12701a2b9599ec0ddb9cb14cf667027ca10c7d7f4a6103b12e8b120ea8e89d72e38ea32ddd1664404eb53b2379ae5d02508e3196fff7ec9235 SHA512 fa99968ef76bce8fe88179cd32a28b803739fcc72b28de268930e4f9c8196dbdd74f67669a33dd3f0b247e44dd6718d913dd45cb7f608c0728c78019440371ba
+EBUILD gzip-1.9.ebuild 1187 BLAKE2B 22866abfb740e978af928693edaceb9f660325215df6fc872686d79402fcd29f06366a8b0ef58a2a6a32bc3236374461c44e85db6046a5a9bf93f30c5b388918 SHA512 095eaa5e552918bfac58fabb4c06b530909f908947e6965e69211aa5de2476c92457b8ff1a478e173494c0c2778cbbf6654345eb1a23d09e397c8731e4b0e29e
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch b/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
new file mode 100644
index 000000000000..20039b9f0d2c
--- /dev/null
+++ b/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
@@ -0,0 +1,134 @@
+fix build failure against glibc-2.28
+
+https://bugs.gentoo.org/663928
+
+Adopted gnulib's upstream patch:
+
+From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpurge.c (fpurge):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+---
+ lib/fflush.c     |  6 +++---
+ lib/fpurge.c     |  2 +-
+ lib/freading.c   |  2 +-
+ lib/fseeko.c     |  4 ++--
+ lib/fseterr.c    |  2 +-
+ lib/stdio-impl.h |  6 ++++++
+
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,7 @@
+ #undef fflush
+ 
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+ 
+ #endif
+ 
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+ 
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+   if (stream == NULL || ! freading (stream))
+     return fflush (stream);
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+   clear_ungetc_buffer_preserving_position (stream);
+ 
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,7 @@ fpurge (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_IO_read_end = fp->_IO_read_ptr;
+   fp->_IO_write_ptr = fp->_IO_write_base;
+   /* Avoid memory leak when there is an active ungetc buffer.  */
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,7 @@ freading (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   return ((fp->_flags & _IO_NO_WRITES) != 0
+           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+               && fp->_IO_read_base != NULL));
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+--- a/lib/fseterr.c
++++ b/lib/fseterr.c
+@@ -29,7 +29,7 @@ fseterr (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+--- a/lib/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -18,6 +18,12 @@
+    the same implementation of stdio extension API, except that some fields
+    have different naming conventions, or their access requires some casts.  */
+ 
++/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
++   problem by defining it ourselves.  FIXME: Do not rely on glibc
++   internals.  */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+ 
+ /* BSD stdio derived implementations.  */
+ 
+-- 
+2.19.1
+
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index 5bfc0488effc..8b9d2dcb48b2 100644
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,13 +18,14 @@ IUSE="pic static"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
+	"${FILESDIR}/${PN}-1.9-gnulib-glibc-2.28.patch"
 )
 
 src_configure() {
 	use static && append-flags -static
 	# avoid text relocation in gzip
 	use pic && export DEFS="NO_ASM"
-	econf
+	econf --disable-gcc-warnings #663928
 }
 
 src_install() {
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index 6f7f04d4e40e..9c118414a685 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -1,9 +1,7 @@
 AUX lrzip-0.631-solaris.patch 372 BLAKE2B 93bfcfd952ebb976ac3fb2906eff79dd88b79906decefde76d3245e21cb711587b37750146a9a5db0221d37e7aea9259dc1ab85932463b8e94dc23e18ec7c4ac SHA512 eec9086ad4ed4a148540ef1729fc3be4e4763950a35e3f2eec981451353f9ab0358aaa754ae4675ba22d057a97f17c2478fae06c173a38e423e32338f1cf5784
 AUX lrzip-missing-stdarg_h.patch 259 BLAKE2B c191b888f7849030ef4584f3a461bd14eb44c9eed2d9ad2126ebf54f11f57f877a2c6e50847d53d6ab14e3a568118def65dbe7cbed522af411f3becca4ef0827 SHA512 33775d10e2588f55030033b845bb086abab9fd82798dd3257ab26692bcc3619169b32687cfd6d94de1fcc5afde8fd3eb4e2a40d9133249b5e83fd32499733dc8
 DIST lrzip-0.621.tar.bz2 503286 BLAKE2B 3fb80f72f0bb81340d4e83b996ad2cd94fc0067b8e67599defb535e86614ad4a2436d8e6ab00bae24e4c9799a01aef267a7078cc6745d68acf868d0f1dbd606a SHA512 be94f54c3d84c93e3c1ab7b08ca6d2a02bc343983785be4884f42521520d2babc31db3abbec4b77dc9f710d18648adcc3d24b203289d8d4728afb3ef0fb90c0a
-DIST lrzip-0.630.tar.bz2 521517 BLAKE2B 7b99caf1310b352839113fb20b6dd08fafde2a6696a84f96d5bf2118fb559ef61d599cbf3a293c607bc014ddbb042d25753b8d1293f416530e9738a80107028f SHA512 fa46a2e9cb2574086d24296b7376865ac9f998724041c00e69f28d4984a6b8f7441de7d7fab2820e6cd6d6da4ead8ba66d0eb18f0381e8438db09301fb009460
 DIST lrzip-0.631.tar.bz2 522158 BLAKE2B d0ffe63e1bdd21304d6d7a7dc969d4e79770fed105cf03ea9d504f890cda35178566afa5f88e13beadcc1095f052a014deada3b3f102247eadb8c746d989d119 SHA512 6420cd465ccd4581066408482335a82089f84f0aca1b05249b9fc6039b7e67df94457a7c871859e363206df3a40e93cfde576388785113f6c99b31d34c00a307
 EBUILD lrzip-0.621.ebuild 764 BLAKE2B df960ea53f8be42a3c77ff6e4f63969ab3d3d5d591c92d950c8f88c44b719edad1073271399d79bbb5e2d3ab1085b5875f3c811d3ffc660b843ef6296b8fefff SHA512 8fee8f421ebdb8e7e6f66cebbce65346a82f18a8e290fda9dc6295545c9132bbb2f48c1f30f2af880a939ab60f3ed58f74a15bb7939dc8390788bad0f84734b8
-EBUILD lrzip-0.630.ebuild 746 BLAKE2B 4a57f6ee2f9a02875813ed6cbdbc6957bbfc50ebc519318323c449baec3ea0b109170d28b3d1e3452b5f102844df0d408db3b7fd3f6668c59320814cb6614c76 SHA512 4737636d13d31d93308c2dc7525de24e2ae02270927d313b822e59adb75dcae8a16d66a5084ce1b1dbb9b694545fd2a1c6889781f8d2a0bc31d406a1142be6d9
-EBUILD lrzip-0.631.ebuild 870 BLAKE2B ae05e39fc88426380170164ff00aed0ee0a4f6f96759beff0d8622858c3cbef17cf45cbcacc3fffd41cd55fe383e0469758fae09a3549f49bb6375dc91a4ccac SHA512 698ba9830b8c0ef0fe16e43115c1f40fee79c282ef16d44096792f06ce6b28f6fc9ce61f0510388600a190ea1727476e5678e177cb92b5846c88b5c5ac291044
+EBUILD lrzip-0.631-r1.ebuild 1008 BLAKE2B 91f0b0a02f9c1772a0936170b3022a25a6edb4147980dfe4961bc847ce99e1d0602ef7b2714e6e5894e7f4c14c537b473d5908da715c96a9bfabd50fbd13cbae SHA512 55c3e67c1ef5ea8d35034f5420b8a9817d48b7f605918794859c137cda0cb9cf39b780a42144707fd153b4f8547e48f5f5c691ed6f72f56ad0b9f4959632b8e2
 MISC metadata.xml 581 BLAKE2B e34acd5b35b3f661015d6323b59056a981a7cf41da0b2ee1e440b912022e20e3fb9fe8ea513aa071837320e1d280076e6eac0213add715f1e8b70554536a7c40 SHA512 392a7bd77026e5e4726390c4fc649805234b6fe2803115f205e22f7669675cb404bc0f1341f16ba59c622e1c922300b3a4dc0466b8c420da69a941cd49954c9a
diff --git a/app-arch/lrzip/lrzip-0.630.ebuild b/app-arch/lrzip/lrzip-0.630.ebuild
deleted file mode 100644
index 42b8bbc2147c..000000000000
--- a/app-arch/lrzip/lrzip-0.630.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="https://github.com/ckolivas/lrzip"
-SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/lzo
-	 app-arch/bzip2
-	 sys-libs/zlib"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	virtual/perl-Pod-Parser"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
-	)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-arch/lrzip/lrzip-0.631-r1.ebuild b/app-arch/lrzip/lrzip-0.631-r1.ebuild
new file mode 100644
index 000000000000..198bfeec9a8e
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.631-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
+HOMEPAGE="https://github.com/ckolivas/lrzip"
+SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/lzo
+	 app-arch/bzip2
+	 sys-libs/zlib"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	virtual/perl-Pod-Parser"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
+	"${FILESDIR}"/${P}-solaris.patch
+)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
+	rm -f "${ED}"/usr/bin/lrz
+	rm -f "${ED}"/usr/share/man/man1/lrz.*
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-arch/lrzip/lrzip-0.631.ebuild b/app-arch/lrzip/lrzip-0.631.ebuild
deleted file mode 100644
index e5f89de483dd..000000000000
--- a/app-arch/lrzip/lrzip-0.631.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="https://github.com/ckolivas/lrzip"
-SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/lzo
-	 app-arch/bzip2
-	 sys-libs/zlib"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	virtual/perl-Pod-Parser"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
-	"${FILESDIR}"/${P}-solaris.patch
-)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index fafeca0ad2dc..eef21a92c511 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,8 +1,6 @@
-DIST lz4-1.8.0.tar.gz 222840 BLAKE2B 0b33f920f59a5ec9576051baa9ba887b320d424f8f64e1a752124371797d3f8bf2dbf13ee2e7268ef363d70697b8358e7ad627489c6843c61bdba004df80c5ec SHA512 aea46d4a900a3ede7dd7b498ee938ecd98397d3277c5b3a85b4236a44777cba85cd68a2f32c993b872afda96c5dafe0cb3dd391101fe8181e17c9f48884c1535
 DIST lz4-1.8.2.tar.gz 320742 BLAKE2B cd97b6a31a1f45d410d598af0b0b696b3ccc3ffdc4fd523316576ebc68e24e545b8ce359889b0dca1968b1c296cb69951617b91b49cbe8eb98cfdb9ce400803c SHA512 5fadc79334d37739c947d6dfc24f48ce82989fc5ee4f2bb8201ccf7ee3230b9e6e7c8488beb64050a035369f4247161d258bdb539578bec224ccebfef1b8a763
 DIST lz4-1.8.3.tar.gz 327897 BLAKE2B e2be80be14c67cf1a07cc6a2e6f6777a87abdd15499b9c32b8096e09284aea19620adf930e28454ce105e325cff684d2625e0a38211705f3c105a80b72f56be5 SHA512 5d284f75a0c4ad11ebc4abb4394d98c863436da0718d62f648ef2e2cda8e5adf47617a4b43594375f7b0b673541a9ccfaf73880a55fd240986594558214dbf9f
-EBUILD lz4-1.8.0.ebuild 1057 BLAKE2B e6b3016fe489b1d4fabad368d8aa41fe86950d35a741b0cfd4a0a04c29351a5bd49257afd8f52f50c75f2b41d194e71552435390f4d0c3582bdaece90732164d SHA512 0760e2cfa0aa04b9141728d1361f27bd82f55bb5814c9c3f92adbe763bf64fda6a0f36f965766263f49d36861ab6ff5a02e37cd597840550208543d2ab51f70f
-EBUILD lz4-1.8.2.ebuild 838 BLAKE2B df0e33b47c1455f6c1c6e405503ec5e4aee79d56bea75a24d544289331322440cfa5530cc83a0ded33c744526cbab76e4922a3af8d435fb4c01b827f135be675 SHA512 4d41edbbbab78d3dfe103d073f6b27cc177209e6858f85647e90d56567ec44024ec82f2824cb100f09625cd10fb9d1343f33040c1d1d106404e052b85fd59ff9
+EBUILD lz4-1.8.2.ebuild 831 BLAKE2B 7c1174195af69c90beabacba0e6d90f74d08deb479707bcde45805abdcb65ccdc7946c48baac5b5f07156db5b3a8a4d00d4a8666b4be013af0e173b493af40da SHA512 40dace38b210312b8131e906cbb4ec762826da994e11e2aa8cd8400e32aca3122c7d71148c6c220996a61463b4c2ef5ff7a57acf0cdc27c8fef6b7e44d610a65
 EBUILD lz4-1.8.3.ebuild 844 BLAKE2B b788ed201512932a181cb1a55ea9a1d4752a3d5c590642670d1caced74b768b908f039e6f7046a03e96b59c8dd5956bbac7f92aac85d05168609df28dd4d1714 SHA512 28f5c9e64979fecac61fb0db2e48acb0976bb853b3ed1a4b88a7d46ab3b14899bda008c5986ffbcbad3d3cbc537133da6fefb16179b33cef05b64ec2f5ae0734
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
 MISC metadata.xml 427 BLAKE2B 6d83f65cd913a612933b067bad6594e6e0e389a85a5b883e8d795f8c9591afa0bdb9b987ea35ceb3dbeebe3fbb81ca217a93fd5a8f8d42bec5aef6707dbf258b SHA512 022a6fcb7f89687c4817778b767e393f4488f893de14f0c68aff9aaa41a9ec3cae5034eed17c9d32e5ecff735cdad0f70bddfc0158d599f22bde70653e0d0f3e
diff --git a/app-arch/lz4/lz4-1.8.0.ebuild b/app-arch/lz4/lz4-1.8.0.ebuild
deleted file mode 100644
index 80f2cb6525f0..000000000000
--- a/app-arch/lz4/lz4-1.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
-	EGIT_BRANCH=dev
-else
-	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/lz4/lz4"
-
-LICENSE="BSD-2 GPL-2"
-# https://abi-laboratory.pro/tracker/timeline/lz4/
-# 1.7.5->1.8.0 has some minor changes; the only really incompatible
-# would be removing 'const' from LZ4F_freeDecompressionContext() arg
-# however, it is extremely unlikely that this 'const' would actually
-# be relied on
-SLOT="0/r131"
-IUSE="static-libs"
-
-CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-arch/lz4/lz4-1.8.2.ebuild b/app-arch/lz4/lz4-1.8.2.ebuild
index f853a680f72b..d81702967f3f 100644
--- a/app-arch/lz4/lz4-1.8.2.ebuild
+++ b/app-arch/lz4/lz4-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index a21a85998e8a..d68635b1eb16 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,11 +1,7 @@
 AUX rpm-4.11.0-autotools.patch 503 BLAKE2B e95c7d3b550f24310dd21c6cfd78785017ebaffbad9c2a14947c43e784ddaa349cc77da9ee7fb9e1ce4ee2dec296b57234a74d56c9e08449e067bca403fa7ee6 SHA512 fdec043c3db2315aaabd3da91067a8d299ba564eaf53ba6465840352586f0660a5216cfd291b19398a53b2646f4a0b312076e14e56004d8e941d4ae279d54305
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
-DIST rpm-4.11.0.1.tar.bz2 3670158 BLAKE2B 8190cd760ce86275a27a64aca7622340a2894f4f7aad0171425c7f5d3cfcf58e82c2a792f7d4687fff9270fe3f9c861027b6eea43f3602be8b12098dbccf408f SHA512 72bd3054b2d0def1e25fba7113eda14def38baef62b558e65cafaf3b374823d0905d982772cffddfd9dc6698eff293251acb2ace7dfda0964085669caa88d535
-DIST rpm-4.12.0.1.tar.bz2 4129093 BLAKE2B 85addde70d031f179566771350f5907311cf61a077b647b5dbb75e1e157141e541cb7a236e5a1d4fce881d98eb7c0331a0eadd0ca1dd09e53d9d28dd954203bf SHA512 ae751b04cec2463f1f259aec4b4750fca1e4cef6144b7e612d0c94f7b6a2864ed119547568f6acebb7fefddb7b040b6021c1f32cf465963db0b627f524c5760f
 DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444eb64b1018fc74bc6dfb1c19d4f30d96189172c4450925f3357174cde70b298116b53b9155223b52a593a67aea SHA512 29e95eaaf40a6ddf7f23446ea6cb8a1dcd12a45d4965595a705cb9130890d772a40ecfa475b189865da51248b3d2414e4f4b1a40cbfd7ca538c482d87c50a218
-EBUILD rpm-4.11.0.1.ebuild 2739 BLAKE2B 80664cf24466365a81eb4774a49a146327367b20c26fabc11c872ad8c4c22079235ae9dc0ece0956478668fcf47caca1215fe77674f7f06e778eea7003502ef6 SHA512 ecade45798b73e1a573edac06b60dbe0d0e2d4915a13beb41bbdfdc2596e208899bf6b7a36ad1144d65ebf1c186889c6f9928575ff7f5f14516deb5687b2d83a
-EBUILD rpm-4.12.0.1.ebuild 2894 BLAKE2B cf3ba401cf5c1b327c9911416926e849e52841bbc1ab937eaea44949a68ce91bc609ad2c6cf241d57f93b948ded48753cd888cadb3ff21a78fcc5b8586e9c355 SHA512 cf4c78083f32a3f54d732261d284e6a8ea4b7f5d6ff5150ff398627929b8329913a188e629fb930c7c042e4391725ce83546ec030a8d47095eb8065bc202d9f2
-EBUILD rpm-4.14.1-r1.ebuild 3325 BLAKE2B 2fee8b954de059fce00922e09c1da37f4e32da8c7333d8032fc31c9a6a2b978a61c40c4833c723b58c10db6a75e676c1be1c838084409e09c1075e076e050bf6 SHA512 9b991624f7def19b2e06b03a938930239c339fa411662577b20ed4ee744fc750c67fa5c22cc521dbd1c0931778ea9a6d5905db93922830769ab5c179a017383e
-EBUILD rpm-4.14.1.ebuild 3240 BLAKE2B c5affb6379387da560f5de40de55fbb22dd4ddad850a87b9f72ef7615cec38056d9465cf6b41b49f17b90fde0c4d72c4ddcba6134e06e0fc26bcf7f91f6da5b5 SHA512 88a58c95d18b05fb910ffc09ffaad08d8592235dc1b1110b4c07a7e8e6c1c0f886030c2e7629d7a8a1d45c9722ea82adc23bc589bb5fbea8c9e00d9447e6dd22
+EBUILD rpm-4.14.1-r1.ebuild 3381 BLAKE2B 2879ce331def5838c70d1103afb61b3ed033f30b90538d0455f27e314d89627b9ac293aaddb1ccd29893118b18ed1eb7e23f8f1386cf8b408847388457e1f648 SHA512 bef11e5de295892100f8005739550960c73c2d6f31f56eaca404761c90f7bfb9eae675b0d97bc465548d049ecee6e241875b703940f43b1d02aa97d133b5ec8c
+EBUILD rpm-4.14.1.ebuild 3239 BLAKE2B c1067b0afa91bc5902c1f9b0390e5234fb2af252c31ee90a841cfd2cb6b498d7af7dfc438f963fdfb1d6b5fc8f516d7562fd0e3d6d2005edc723098268363a59 SHA512 8f9f4cf67e8b4a389cbe9d78b2a7fea004f96f8e1b15e0243df2d51a5a0c61ba0f356d0c36ea06c8e01e230a171f3e4efdb344253a80358d2a826bbc756b9408
 MISC metadata.xml 446 BLAKE2B 7d96be70d67580be8b2f1726dc905d9ff4a6d291c6fe72e52bd5c7a4614cc0b61bc3c6dfe12c715558a89554878b20a5df7cd02414275728be15e3bb6f0eec66 SHA512 9a426e6ce042ecd050c19adadfe10c53d72c1ecbf313673c8a5cd66096aa05bf54d0f67b9659ec07be2367f90f9b43028d3b3302fead2fe8f8f55764e17d9dc6
diff --git a/app-arch/rpm/rpm-4.11.0.1.ebuild b/app-arch/rpm/rpm-4.11.0.1.ebuild
deleted file mode 100644
index 7f596c6dab79..000000000000
--- a/app-arch/rpm/rpm-4.11.0.1.ebuild
+++ /dev/null
@@ -1,117 +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 autotools flag-o-matic perl-module python-single-r1 versionator
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org"
-SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="nls python doc caps lua acl selinux"
-
-CDEPEND="!app-arch/rpm5
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
-		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
-		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--without-beecrypt \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	# remove la files
-	prune_libtool_files --all
-
-	mv "${ED}"/bin/rpm "${ED}"/usr/bin
-	rmdir "${ED}"/bin
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary}
-	done
-
-	use nls || rm -rf "${ED}"/usr/share/man/??
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CHANGES CREDITS GROUPS README*
-	if use doc; then
-		pushd doc/hacking/html
-		dohtml -p hacking -r .
-		popd
-		pushd doc/librpm/html
-		dohtml -p librpm -r .
-		popd
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.12.0.1.ebuild b/app-arch/rpm/rpm-4.12.0.1.ebuild
deleted file mode 100644
index 18a141c8aa2b..000000000000
--- a/app-arch/rpm/rpm-4.12.0.1.ebuild
+++ /dev/null
@@ -1,121 +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 eutils autotools flag-o-matic perl-module python-single-r1 versionator
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org"
-SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="nls python doc caps lua acl selinux"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="!app-arch/rpm5
-	app-arch/libarchive
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
-		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
-		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# fix #492642
-	sed -i 's:@__PYTHON@:/usr/bin/python2:' macros.in || die "Fixing %__python failed"
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--without-beecrypt \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	# remove la files
-	prune_libtool_files --all
-
-	mv "${ED}"/bin/rpm "${ED}"/usr/bin
-	rmdir "${ED}"/bin
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary}
-	done
-
-	use nls || rm -rf "${ED}"/usr/share/man/??
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CHANGES CREDITS GROUPS README*
-	if use doc; then
-		pushd doc/hacking/html
-		dohtml -p hacking -r .
-		popd
-		pushd doc/librpm/html
-		dohtml -p librpm -r .
-		popd
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.14.1-r1.ebuild b/app-arch/rpm/rpm-4.14.1-r1.ebuild
index 1afa7aeae2ca..c34b6839654a 100644
--- a/app-arch/rpm/rpm-4.14.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,6 +50,10 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-rpm )
 "
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/${PN}-4.11.0-autotools.patch
 	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild
index d931c8394a45..c3bc58da7ed4 100644
--- a/app-arch/rpm/rpm-4.14.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index dd4f18f221f0..4b5b64028aa3 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,11 +1,9 @@
 AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d03aa47f4c10f8d4c93689eac919aa68651bf20393fbadd94bb88439fddaa1448cf00153a2dbfb0468c938f1b1 SHA512 c6875ef2ed3f1cd5e8baae74fdc92c7c44c694169bfaa2b63af10eaacb52dd27ff12360ac6757a82499a0f14fb78cfa1bfbd8391435f95b125a81b2e776f28a0
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
 DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
-DIST unrar-5.6.5.tar.gz 226296 BLAKE2B c35dfdc10976ee2a7827f9386021f79af6712ae3a6641e83934ef7223e1202c46c59e12d2b78abe230c3f929f2228fe8c0664f05275b905ea06806a02cd685aa SHA512 984340935671913b4d2a765db5c4edc0d08d859fc43f3ae0e97e681c4ea302a51808fefa8c11c3aeecad1c2681541f363c5051813d978b5b14959c2e55f71281
 DIST unrar-5.6.6.tar.gz 226484 BLAKE2B f5facddd5c326c039c02b31ac28ba86d5417a51d00a463da1c6fbb714856ffb275defbe400a0d56a21850c754f06eda615fcab983a206f335422503d76f11427 SHA512 1e1e9dc2ed104ab7819d11ad2249780a4320cb30f3c427ea1669c3769fa3a8369841711a2d46d918049659bc67b2cd7dc7560a12127d810a57614293c24fe25a
-DIST unrar-5.6.7.tar.gz 226579 BLAKE2B 32b6e70539e4ba0a09bac5eaf880ce555a1012516ba6f439060e6604b5274b17e3f5c8dfa721999243eda64fa9b1b53eda95f7b9df11320ade1873bf665ee3c0 SHA512 2c102fdc2f1a924a57c5492b966b0e1d0035bc3de2a78a46733f300d412ff9983fc5c717856faeb21e71c4bd090296e57e5b87888190867eb3c41f62550647e9
+DIST unrar-5.6.8.tar.gz 226647 BLAKE2B a3f4f791d2527d13003b7d57506e61723312bb0537066c72fa5ea27e4e9de18644f5445b69e9f66ec479402f6d944ce76b17ad9192b3f835ff9781f0902e03c9 SHA512 5410308d7f462824bc10087cdc4515c58aaad776cc09eb6491864a338ae00ff35e3b54d1e7250c0a9576554ea382383155be718a0b95d7af00f27d5df04f4f56
 EBUILD unrar-5.5.8.ebuild 1851 BLAKE2B 68be65e1df26e7a21690e7f2fae539cb2314fec884ea62be47e8f7008cfdddc47e8ef097b41017e8c68c2a7fbc385bbada86715b3bc06a61e5635d3201fe0627 SHA512 dee6fd8a3d7dc51a1162aab23d9031b5524b74aa9fa1b50275a8b4a5b0524439277daffbfa062bec4c6622356232882eca023542da766db4af57789a853a4e4d
-EBUILD unrar-5.6.5.ebuild 1860 BLAKE2B f88156419bf1bdd826b64d9e3f7bfaf0adb8eaf740d056e1a8019fa000dbab6511eaa4d24480601f9c2f1c1d6bb88c5fc6e63669ade5104bb61b2b493f10d8a9 SHA512 6df34351e21f462a334b27d361ea3e6baf9a736ec29e9b21baa98d503761b508626ff18e8e28f81da1d1cd08ac807360f792dab428b3e9920d8cb500e73c5543
-EBUILD unrar-5.6.6.ebuild 1845 BLAKE2B 54766c25151e25f7e0c5e8c671b98ca9a2e6a420b40489bbb9ca392a75bdd3724bb4dd3e803364c6cd7885497175875f45bef7bdc953eccda7e7774ac6271c16 SHA512 25299b8fcbe59cea8f6ac92376412da2497f4e515d62f716714aa2ebd1e36ab4a20a1eb0f0e676ab0b7326dc2e8d8fcd399467ca713e555453ab271645620dee
-EBUILD unrar-5.6.7.ebuild 1852 BLAKE2B 70e7e9f58a06b2c726b2d227dd32045e10a5a36ff6a7a74550d8697472d9cf78913f2539f7c114b718367aa79053d75565f3906f81cf08c5096847b5fc38e5ac SHA512 d82cc2a9e8f3b46df705ebe5a897cd005ebfeb814b2dd095c8abe5485a6e3c0f6ff9f2a1da3cf6773f94099b1af7768ddcb2129553187fb2441d98be5bfc811b
+EBUILD unrar-5.6.6.ebuild 1840 BLAKE2B ad0e12315c013ba41e6157da0a8be8ed5dddceef617fc8cfd71c6e639f008988e1af80e11a8fabaa81f25090230e65eae342a913ee9fbb971f0a14f0919e2c6d SHA512 3ebcab78750c4bd802369cb91efbd482d52a3f71f0a234f4d94118897161a1465dc33796625baad03dbfa87dbceec070c7573b4ba43b40a3d4ecdf1c136f2e7d
+EBUILD unrar-5.6.8.ebuild 1852 BLAKE2B 70e7e9f58a06b2c726b2d227dd32045e10a5a36ff6a7a74550d8697472d9cf78913f2539f7c114b718367aa79053d75565f3906f81cf08c5096847b5fc38e5ac SHA512 d82cc2a9e8f3b46df705ebe5a897cd005ebfeb814b2dd095c8abe5485a6e3c0f6ff9f2a1da3cf6773f94099b1af7768ddcb2129553187fb2441d98be5bfc811b
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.6.5.ebuild b/app-arch/unrar/unrar-5.6.5.ebuild
deleted file mode 100644
index 33107fddf68d..000000000000
--- a/app-arch/unrar/unrar-5.6.5.ebuild
+++ /dev/null
@@ -1,68 +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 multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.5.5-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin}
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
diff --git a/app-arch/unrar/unrar-5.6.6.ebuild b/app-arch/unrar/unrar-5.6.6.ebuild
index 3b12004604d2..c0db136da2ac 100644
--- a/app-arch/unrar/unrar-5.6.6.ebuild
+++ b/app-arch/unrar/unrar-5.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unrar/unrar-5.6.7.ebuild b/app-arch/unrar/unrar-5.6.8.ebuild
index 384033090666..384033090666 100644
--- a/app-arch/unrar/unrar-5.6.7.ebuild
+++ b/app-arch/unrar/unrar-5.6.8.ebuild
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 8f7145abf1f3..ffda0dbfd71d 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -5,6 +5,6 @@ DIST zstd-1.3.4.tar.gz 2059958 BLAKE2B b1d332a35066fb00e32c6dccebd5ad1065bcc3c7d
 EBUILD zstd-1.1.3.ebuild 899 BLAKE2B 52b755114cb16adc89afd50fa1fdca48829170815b1ecdb1b26d2adb5e519d4af6e906b29dd282d67e7066792d4addf544a13c23f5c2effbd6d4aafcd08f41a1 SHA512 25065f6b5901c110b149b11b74d9b2249d241d74dd779ec7aff392db4163cf8276ced3c31d9c09afbac08588e5a560f467905b24f7ed1b418d8431938daf80dd
 EBUILD zstd-1.3.2.ebuild 1265 BLAKE2B f714674c9fec5168e389afd1733421bd91408f58ad7765bbdc5a461fe1ae3b584b452333d768031354d6f5b64f4fd7ed75df259c305cdad439f8f912083d4bde SHA512 4527e9019464671a27df4d76f77371e770a14d2e0420a433e63f77688146e5d2647cd95bbc38a5b0c05316c759f016eabef2a8b6338b406d83ee637b4497eea6
 EBUILD zstd-1.3.3.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
-EBUILD zstd-1.3.4-r1.ebuild 1327 BLAKE2B dc51deac27f4c5e89675ca519d9c268f187e46b0768db36c209975e6ce2eb1ff85be4e33105a12aefdb7522fc3259b945037972c72f8910e1fda842aecbbae06 SHA512 c24c65fbb57fd46bfcba186bee269ad628f87258a0c6e40df2c8b9eb15fcaa3979922f93c86f2597876b3131ea5e73a8c08d672b27e46f6004a5bdcb5a7a30af
+EBUILD zstd-1.3.4-r1.ebuild 1325 BLAKE2B e16867df0ee22463eb70757f9885b66563a8d65d2b168a2e033c8da1b1b7d2a73eaa02b099dcf675c018777f7e4fdf790b2e4003007c5bf6cd0502a9aeb476bd SHA512 938354909f39a90a94c5505b3d3dcbe111ab7d408996439fec299c6e5e7c4381b057fbcce5ed31085552895f046dde3ae8feb288fed88af0881a9254a8b48459
 EBUILD zstd-1.3.4.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
 MISC metadata.xml 457 BLAKE2B d8251ae19e395d977bd88e72fc3c666e6d6a462a7a65db0f62fe3ba9831189f0f48e9457e04028b03dadbd4d099d0b051b313b626a3aaaeb1845cee636558b8a SHA512 801938d4394220ffe8df4d8198308b0d5651ebc198711a4af48d1e6dd9aaffdd7da030a8075bcbc7c3182403aea86e56a9ddc999dcfb2556496679d835a16058
diff --git a/app-arch/zstd/zstd-1.3.4-r1.ebuild b/app-arch/zstd/zstd-1.3.4-r1.ebuild
index 535cb737c525..36ab42a5b0a1 100644
--- a/app-arch/zstd/zstd-1.3.4-r1.ebuild
+++ b/app-arch/zstd/zstd-1.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="lz4 static-libs"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 4e3ce7998e7e..86908edfa3d2 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 09e5160ccdce..3b0bed8be28e 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -2,9 +2,11 @@ DIST btrbk-0.24.0.tar.xz 72308 BLAKE2B 425811455087a5aec4443d8a7bc7ed23cd49813d8
 DIST btrbk-0.25.1.tar.xz 74904 BLAKE2B 12f0a1e9c383b1c736cba190bae6f948df5db608a689e2469af05716d2ed15f0206c9336148af1a09f29da44c44314d4d153c8d2e5eea8f7e425a185c9040d6d SHA512 6802e379f49c5433a811f6f844cf2663c752b23d8d678f001bb8cba9b099c7527983e23169814c7469ab8682b95fa0f742d1088415747ebebfe0fcc36425cd05
 DIST btrbk-0.26.0.tar.xz 82472 BLAKE2B 06effda16b2173e6d3dc3ea896ed9729d6f2840a29aebc0d271935a88fd54fbbc08bf0b257c8424976a2668907c74f1b34fe46465ba6457d60cacf0b15316052 SHA512 a08ec4e2e0d164b9a9a17b3d4b8417eb3890994c8aa2233ecda9d616659fce917311a94fdfd6762acacb40dc25a60fe8f6880703c980ccd4a176b14e24a2bb00
 DIST btrbk-0.26.1.tar.xz 83624 BLAKE2B a99c66dc16432edb1da38ac51e68ed939207ad8553108258346d4261c243a1a478a3e1dca1cf6d39d03e10a8a5c44e45a7784aec131246e060aded4fc24d708e SHA512 ee0043f468e11545ca28b5bd456aa9dab1b994ed6d8899ab0f53d455f78bb44f83bcf493e32fdecfec82b3029d5dabc2db72a2f32de80b709a12930df6d53b22
+DIST btrbk-0.27.0.tar.xz 86648 BLAKE2B bebb1c56b5c08e588829697df1d00e89366582d7c501ffc7c72baf8136ec62ac1f9b7aea300f1ba20c6060646e80916a52e2b83a85b383cb04289867d82b2a53 SHA512 2d65d32cecdd8598d5028a78a449559563bf38a172849e0a13ccfa8129189a044cb2d007561b5c7e611c8bbbe069fd9c1177085dca519c88d40233fb0d49db36
 EBUILD btrbk-0.24.0-r1.ebuild 755 BLAKE2B 1ee8bedbe3dd869c4afb8103763269906d4a75c5dccfebefebb851bdb4a1243d14eac3a35d5e8ac5d29660b96e7856e0421d2804f83c982c47d58f888e3b498c SHA512 2924123eeabd0b1e7a325d9b413c6ff9ee750184b85ea1f460f236aa74e978df1e5537ab77fc49e8f82148caff743724355d31cf60aa5e760d1615b60d22f7e5
 EBUILD btrbk-0.25.1-r1.ebuild 743 BLAKE2B bb707beaa6dd1dae7648262190ee05f76f70197982d6994386e9ee8bc8e885a88ba0c9f9eb33d2846f9f7b023d6a0c97a95d9bf04fbb6de72d8ff489da09d8b2 SHA512 452cdc0bbcba6b08e00bbccdc0332dc06aa59d746a0e8a608ee5da5bb5ac2047705380df2e7865fdd3a2e3d44fce6a4b1fda8e890f150a8a3d543d63fa2610eb
 EBUILD btrbk-0.26.0.ebuild 1078 BLAKE2B 9c92380e34d5005cc0d738c68e7b404a4db77fccc1a233ada610d7518e253cfaafa91135da7d9ce6cf6546150a6805f524b3a9302b680b84e63616a1f910b029 SHA512 0d22df7d376f96de76a19be8a3ce7a9e7773c02c6da7545949ce0083a32ea6e5aaeabf026ce91655af34109532fa06fbd8b074e494e591d529dbb9d6f0bd4a58
 EBUILD btrbk-0.26.1.ebuild 1086 BLAKE2B fc399e327dc380f2d8a6ba0afef6ed83fbd75b44e20cd1118e1d6bf554a01c1bbd9646cdd06141c5f2c6e20a51fa6dbb4a55c547ab7b4a67e52367f8df13a5c6 SHA512 a99fbb45829357f83e361a4e22cdbc38598d6dca808d7a84bbb0ec4c043f1ccba39dffd6c0c7c902de199a44106f6fbf6ff79066fad1a5781cefdb6a9cb4ae4e
-EBUILD btrbk-9999.ebuild 1086 BLAKE2B fc399e327dc380f2d8a6ba0afef6ed83fbd75b44e20cd1118e1d6bf554a01c1bbd9646cdd06141c5f2c6e20a51fa6dbb4a55c547ab7b4a67e52367f8df13a5c6 SHA512 a99fbb45829357f83e361a4e22cdbc38598d6dca808d7a84bbb0ec4c043f1ccba39dffd6c0c7c902de199a44106f6fbf6ff79066fad1a5781cefdb6a9cb4ae4e
+EBUILD btrbk-0.27.0.ebuild 2102 BLAKE2B 1d7acf9fbc93907dbb559472f674b259a5c5fe2ec8371f8dc7bdca82e7546770a7d6f227fc8c1ecbdec3397bb8809ad7ff40e04d6235e10d9eef58a8166c16c0 SHA512 7839a057d377e4ac0fb3b7602ef2a307215329b7e4b97017c8d63543a83a30d1613f8869c66d76feb408f07b0dc89c362459befd86cb54b458ee1fb7452ad01b
+EBUILD btrbk-9999.ebuild 1083 BLAKE2B 72c00de8a1f8e8bb26abe7994572a5f03214a7b075059ab4f91253919288d16a63e7bba529112b003d76aa830bdde20ca3381e80467fa2cb00132c5454f05448 SHA512 7a4fe7f80111569a080d4e2c234148113cdfe5120b7fa4fa1899010670b7de86e84d8c82df2de95dcb09f5104aa8502d7eeb76a80c4f5923bdadb30d4dd247a8
 MISC metadata.xml 1076 BLAKE2B 38beb88fb33730c665430ce275d33b231a57f02c2644b3ff89974935f93d1f0cea8b53b908019eb7bcb0ad99dca49e69475d44a506e08719270c2f8524b5e096 SHA512 20141d3aeba7ebe743ed3101af70c3f6515f11aaed4d43a73d507c18a933d30e778d10cfc17b98e33c616e80c79edd157d64fb0f54e35ad64a7e3114b3fd667f
diff --git a/app-backup/btrbk/btrbk-0.27.0.ebuild b/app-backup/btrbk/btrbk-0.27.0.ebuild
new file mode 100644
index 000000000000..f364036c572c
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.27.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+pv"
+
+DEPEND=">=app-text/asciidoc-8.6.0
+	app-text/xmlto"
+
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	pv? ( sys-apps/pv )
+	>=sys-fs/btrfs-progs-3.18.2"
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
+}
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
+		upgrade_0_27_0_warning="1"
+	fi
+}
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
+		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
+		ewarn 'monthly/yearly backups could get deleted when upgrading to'
+		ewarn 'btrbk-0.27.0.'
+		ewarn ''
+		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
+		ewarn 'or systemd timers calling btrbk.'
+		ewarn ''
+		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
+		ewarn 'check if any snapshots/backups would get deleted. If you want to'
+		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
+		ewarn ''
+		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
+		ewarn ''
+		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
+		ewarn '(".keep_forever" suffix in the example above).'
+		ewarn ''
+		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
+		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
+	fi
+}
diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild
index 621ad7e2a0a0..9be9d8c87f3e 100644
--- a/app-backup/btrbk/btrbk-9999.ebuild
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd
 
diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
index b998a27515fa..3bb9bdb41566 100644
--- a/app-backup/rear/Manifest
+++ b/app-backup/rear/Manifest
@@ -2,7 +2,9 @@ AUX rear-1.15-add-support-for-gentoo-kernels.patch 817 BLAKE2B 1bd821856ec3b52f7
 DIST rear-1.15.tar.gz 258153 BLAKE2B 1172806962df7d1a5f278d1aeb696e38d482f1710c6b13dba6b00f60f51fd3c02ba6d28c9c5e4b1a648468f9a6f5987b47ca1f819c8e66c9b6f209c75b0ba0b6 SHA512 dc953c33b82f221de6c2acd7ffbb26c34b86aebcd7f8a4d7d520a1d08c15c723fed75326b8e19614f5e09f6436d392091b362b350ffad06caf10c711eb97fcb2
 DIST rear-1.17.0.tar.gz 299444 BLAKE2B bbada2b5705a5ff0f82b97974f14de728a779847a6b410e0be71033404ae08f0ba6c4bd76c07aba0195aa677c174ebf016bbb6a17f3aa2698bed24bcb50618f3 SHA512 4b9991dc14138e6a2cd28c9fb9f1dcf46ea1a580454bb2c966024481657a102cc849baf6af5ebfa0793ac3f5ebff5b07abc87d1e4b02e1496a0f87b8cf79284e
 DIST rear-1.17.1.tar.gz 303253 BLAKE2B 3c84a76b0aaf1ef72191a49976aa86ce4fcf7c9aee1c6c85af3d68d80e0c6a7ba0d16e109847c7753a626ef34df9ee05f2912b30df5e205303c194831bd5af77 SHA512 66595e962345c0e61c5152f11aee6745ec348acc02d0cbc717faaca8618c83211d8c45ec5e80a17ba9d8c8ad9c6d2ecb109f827d976eb0d126bfc44cf4b49afc
+DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df91d28245655d414892f225e25125f7e3bfad080e139ddc9c728121894b4ebde48c4dff2a8071fb4a5d46e SHA512 8a20c0ffd913b1b4c27f6125c1ca31404daaceccb2bfff7932f1ea402806657252afc3f6719c75dcab2de18b7975f83544dac92f43a742654f90494454d7c088
 EBUILD rear-1.15-r1.ebuild 1275 BLAKE2B 36665c42c5ddaf6cef28c1f6e574e8e4aa64ca10e303022538e44d41b4af183572e81738fb24a3f2972c55f5de8b86b7c38b1d5f9ec3b27e1bd76c74fa6650ac SHA512 ed2893187e3388d1f2a3dc6dcb7220f6e4a77cfb720b86c67b464526c6a54469023f05a6481e44f939420b80651bb4e4e85dcaa06c022abd101b674dfbdd6653
 EBUILD rear-1.17.0.ebuild 1255 BLAKE2B afcd0f322104c658b9bfbada162bf498b1fb4689314826a3cef11bab11726d0f50bdac4826d43a0798b2e9a0e58f68875e513f8c035e7911f9fdd7479620b516 SHA512 fe04b73d4105763c99eb267d5fe7bbba9334b629de6423c47b1e6d8ef1461821ce809ff31cb5f2afc966f48f6d759e4c8e9abc6d40f0004ea6c38fcb9e854f36
 EBUILD rear-1.17.1.ebuild 1255 BLAKE2B afcd0f322104c658b9bfbada162bf498b1fb4689314826a3cef11bab11726d0f50bdac4826d43a0798b2e9a0e58f68875e513f8c035e7911f9fdd7479620b516 SHA512 fe04b73d4105763c99eb267d5fe7bbba9334b629de6423c47b1e6d8ef1461821ce809ff31cb5f2afc966f48f6d759e4c8e9abc6d40f0004ea6c38fcb9e854f36
+EBUILD rear-2.4.ebuild 848 BLAKE2B cb6d62e0984c11bbde7f61cea72f16b10119c98047341100b2c6e8dcdb25a02551f5f8683df2b4efc65727ba9777b057f388e28dd2a6df95bde3cc37606a960d SHA512 78a8fd39ea5df4f65362a33c5d18dc16e52cea47b0aeaaf10ada27eb0ed01679b0254c55bba318ff1464f9ca55c3dd606b99a4cb71c37956eb961e64dba099b7
 MISC metadata.xml 959 BLAKE2B 7e442e9959630922fdac4720c014d7e989c59739486180c5435375c5e88611a439ca4520f2cbc929e1c190b2624ae9b4eed1955d49b6a52c8c2594983389ffaa SHA512 eace4c6f5b1a3afdfa0beaa989daeaafe21ddb48a3539cfe9eb5575827a32e9a391289703fc4ed395ff2439d450af58fde6b302b4e0a62821b4cc4e1b401c69a
diff --git a/app-backup/rear/rear-2.4.ebuild b/app-backup/rear/rear-2.4.ebuild
new file mode 100644
index 000000000000..55b55d0c90cc
--- /dev/null
+++ b/app-backup/rear/rear-2.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Relax-and-Recover is a setup-and-forget bare metal disaster recovery solution"
+HOMEPAGE="http://relax-and-recover.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="libressl udev samba"
+
+RDEPEND="
+	net-dialup/mingetty
+	net-fs/nfs-utils
+	sys-apps/gawk
+	sys-apps/iproute2
+	sys-apps/lsb-release
+	sys-apps/sed
+	sys-apps/util-linux
+	sys-block/parted
+	sys-boot/syslinux
+	virtual/cdrtools
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	samba? ( net-fs/cifs-utils )
+	udev? ( virtual/udev )
+"
+
+src_compile() { :; }
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	keepdir /var/lib/rear
+	keepdir /var/log/rear
+}
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 11070bd02688..2388236fe0d6 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,5 +1,7 @@
 DIST restic-0.8.3.tar.gz 48746281 BLAKE2B 4161326068165b5ba19e9ee0e6386aa1df29a961a42509a2cb7924958100b9412abd1dd27d299d1eef76fdd4731d4a56f0a68e796a46071229a3e6767d3a6bb7 SHA512 758b2c69af8aad6bb62dc750141d5f5a1954ca2b51350ef59c35fd10afefaddc4d8d0cdd5914f249594946db6138124a48fba531b8a24353f022ccea773a240c
 DIST restic-0.9.2.tar.gz 27344284 BLAKE2B 17c121a0d4df470397b467e09ceac559848c34e6a43f289b68eff8b85af86a18a4d2e1340060812613cb7e9cecf86f706565a6bcce31fbcd5aab076a85b57c67 SHA512 e060e0e16031924df7347ec74972bf52c75c84cca8ae996b1c5dd8a6f42c9022062e004ec17af2ebc0b6e9480ecfdff4ca7f64956afab9b9799201848d0be731
+DIST restic-0.9.3.tar.gz 26183792 BLAKE2B 2bb98bd0b5430f928cdc566e558e503d84e611d05da8866f4f5d6f75a325ed73e7674098d73976d8f37ba8d38232adaedc25e2ea211403ea482cecc81f476ba9 SHA512 a8d906984d17e46533a377fba464d909a92016595d7585f37942bc68c24f9356c47df83f2e6ec15b877ea20f864be87362db4421665b594fecb4bca78b520393
 EBUILD restic-0.8.3.ebuild 1190 BLAKE2B b67c12c01ad4f69c281ffeeee90eff0dc1eaba5341ff18c519b2183ef1460843a50d7adb9ec518f8affbe3546328f9f488d274ae99071799e7e3d1ef5415fd3a SHA512 980f1040b4f6b2c46598dd6ba70bd3e9bff8d89274002dad12e497f82ff2c0eb362a43e91473da05f982c1b4aad3e19e1124c8fd753fc371eb5f73f7a43f7b17
 EBUILD restic-0.9.2.ebuild 1155 BLAKE2B 2370d9923040125cab0b8831850d5c997638669eb1a1939e3f59a51d27f131b2631ea5866d77ac1ef85e73fd74c54cd3d49aafc619924e7afdc4c888c08f0864 SHA512 5cdd3cff4ff86b0502f8d6e31f647e144a84db086c43d33fd53cdadcebe4f440a84f82f5bc478f2043adc4ac007a1800a33bf97f9c8b4d43fc11ca5d287572bf
+EBUILD restic-0.9.3.ebuild 1155 BLAKE2B 2370d9923040125cab0b8831850d5c997638669eb1a1939e3f59a51d27f131b2631ea5866d77ac1ef85e73fd74c54cd3d49aafc619924e7afdc4c888c08f0864 SHA512 5cdd3cff4ff86b0502f8d6e31f647e144a84db086c43d33fd53cdadcebe4f440a84f82f5bc478f2043adc4ac007a1800a33bf97f9c8b4d43fc11ca5d287572bf
 MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
diff --git a/app-backup/restic/restic-0.9.3.ebuild b/app-backup/restic/restic-0.9.3.ebuild
new file mode 100644
index 000000000000..89515ce18d02
--- /dev/null
+++ b/app-backup/restic/restic-0.9.3.ebuild
@@ -0,0 +1,54 @@
+# 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
+
+DESCRIPTION="A backup program that is fast, efficient and secure"
+HOMEPAGE="https://restic.github.io/"
+SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGO_PN="github.com/restic/restic"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	local mygoargs=(
+		-v
+		-work
+		-x
+		-tags release
+		-ldflags "-X main.version=${PV}"
+		-asmflags "-trimpath=${S}"
+		-gcflags "-trimpath=${S}"
+		-o restic ${EGO_PN}/cmd/restic
+	)
+
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go build "${mygoargs[@]}" || die
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
+}
+
+src_install() {
+	dobin restic
+
+	newbashcomp doc/bash-completion.sh "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins doc/zsh-completion.zsh _restic
+
+	doman doc/man/*
+	dodoc doc/*.rst
+}
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 3ad7a2a9bddd..5ebe49c9b277 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -5,5 +5,5 @@ DIST snapper-0.5.4.tar.bz2 579172 BLAKE2B ce23b56047b818946f1b885308abd21ce6df21
 DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e
 EBUILD snapper-0.5.0.ebuild 1583 BLAKE2B b32c38f849fd77202d3557e8aae208bb2e9d304cd042d1f32f5760aa73365e8a7b694b83e9db860478eb4f0c14ac103367981219819106d5963205fd8a270c01 SHA512 052e15517c42a84ab74dec462ad2f3afc8a9498d8b94692cbb0e0672c19a47c06a2d0383b3e790dff33e08a807eb97405c346d92f2b3a5bbc09503be6157aced
 EBUILD snapper-0.5.4.ebuild 1694 BLAKE2B eb03d7133e4094ffcbedbdc4aed28bcfdda6edb8eb34515c09d13e1b63f4724ddcc19637ebeb2c25f4945cb7e5fff67db99d852e98e171ef90c03af00923599b SHA512 d0156ebcbf1f0797f63eaedb6776993326fff17b8be3b673dbb87be29a84416419723e4bfdac5d9ae64cb188a51880831c9df2e5defa1e030d38bd1f32f28383
-EBUILD snapper-0.5.6.ebuild 1694 BLAKE2B eb03d7133e4094ffcbedbdc4aed28bcfdda6edb8eb34515c09d13e1b63f4724ddcc19637ebeb2c25f4945cb7e5fff67db99d852e98e171ef90c03af00923599b SHA512 d0156ebcbf1f0797f63eaedb6776993326fff17b8be3b673dbb87be29a84416419723e4bfdac5d9ae64cb188a51880831c9df2e5defa1e030d38bd1f32f28383
+EBUILD snapper-0.5.6.ebuild 1689 BLAKE2B 1cec6466a39993a32bfcfd2935f10243c3b6cf3a4fa4cb6768b4fada52fd1fff0e08d51559675d9d03a3fc4978d5b93e8bea458dfc5b2b2e65af7e437988bdef SHA512 049e53c5dacf41bad8c7da90a7734f42125965f3f50c841e1810ee682d2e3dfc1586a5c8bb2ed6b45c3a6d06b9b2f96039966687e56cf650168a7f8251c36c16
 MISC metadata.xml 1456 BLAKE2B 327ecba708769cd77e1cd785f178f124cdfa37bf3ba1a3e90161f673fdb10d823a3a1aa14b73877345ed39a71014c5cc51836fe7a539e2c62cc992f473deb31b SHA512 9954576d7d44f0f1a20a5bd5168a6b9c5968ad1a47708a198ae8b4a7054863c2de1c58d9d6108a3dcabf944fb5f266ffe6451be5c2b924636cc53380b2779976
diff --git a/app-backup/snapper/snapper-0.5.6.ebuild b/app-backup/snapper/snapper-0.5.6.ebuild
index 0615011a39c3..c2bd86dbdcb2 100644
--- a/app-backup/snapper/snapper-0.5.6.ebuild
+++ b/app-backup/snapper/snapper-0.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="lvm pam xattr"
 
 RDEPEND="dev-libs/boost:=[threads]
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index a29417bfc34f..e2796fdcb9a6 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 093849819ce0..27d9526726df 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -2,5 +2,7 @@ AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f8
 DIST cdrtools-3.02a07.tar.bz2 2127058 BLAKE2B 5307a012a0d4a593d7e0fc879e2ac0dab8ddcca573772194b3a5bbb3be74fc8109d9af720dd12369b4ef5c51ddc70ebad9e8c5a672d6dee62e7462dc67407ab4 SHA512 7f9835dd32ccca119d2ab77de1cdbd8cfbacc8e9923ca42175a15a5b1f45a8aa238fa3b0917ff67697b54905edc78a142f7106af9127854f944adead4a0d826d
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
 EBUILD cdrtools-3.02_alpha07-r1.ebuild 8265 BLAKE2B 33dc93262e7030aa38808cf24cc48953f25c02104ee9f4277685ce2765b997c2eeb6bd0314bff3834131ecedb9c05b31c3cb9b4b04cc0e8d80f0126caa9a0b38 SHA512 1bcbbd468dff045dc536553223f7b478dc73aad258df3f5a52d9e391d858c8d7f1b29a46fa8148ea373b0190af7317f96045eb3953181effe29048516484c39c
+EBUILD cdrtools-3.02_alpha09-r1.ebuild 8291 BLAKE2B 6f2165c3cae8178f983b022d726be5b3a57ea39e20b2ab20c99fa27088700ae451d16329c27ba72d8885b3cc9d7f708c37c0a90a1fca5110d399e1f2b83a82c5 SHA512 3e4d17d3803b521b9bf2c9f33346ef8405ce54ad14291c60c27ffc76460f2a7d34e707e79d103f7e1245df02569af06c79be0750db3774c9b97a3e4c5226ae55
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8341 BLAKE2B 67c7a09496ff2ebed4a04660dd1c20bff2040922041ce1efbfe11fef764a38a8dc5df3411ac73262e6f986d3ff7da8c5fe97e9900a37bb81580d5541a9631556 SHA512 9e8a412a449a0537473e916d9ceb92ecac82044a164286468d9e120a0faab75ca14650ac357ab885c2d49d382d4a99b84a6cba34f3025118b6579135525f44ae
 EBUILD cdrtools-3.02_alpha09.ebuild 8265 BLAKE2B 33dc93262e7030aa38808cf24cc48953f25c02104ee9f4277685ce2765b997c2eeb6bd0314bff3834131ecedb9c05b31c3cb9b4b04cc0e8d80f0126caa9a0b38 SHA512 1bcbbd468dff045dc536553223f7b478dc73aad258df3f5a52d9e391d858c8d7f1b29a46fa8148ea373b0190af7317f96045eb3953181effe29048516484c39c
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r1.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r1.ebuild
new file mode 100644
index 000000000000..ded357fb3ea7
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig
+
+MY_P="${P/_alpha/a}"
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
+SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
+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 ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="acl caps nls unicode"
+
+BDEPEND="
+	nls? ( >=sys-devel/gettext-0.18.1.1 )
+"
+RDEPEND="
+	acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	nls? ( virtual/libintl )
+	!app-cdr/cdrkit
+"
+DEPEND="
+	${RDEPEND}
+	x11-misc/makedepend
+"
+
+S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+
+FILECAPS=(
+	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
+	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
+	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
+)
+
+cdrtools_os() {
+	local os="linux"
+	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
+	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
+	echo "${os}"
+}
+
+src_prepare() {
+	default
+
+	gnuconfig_update
+
+	# This fixes a clash with clone() on uclibc.  Upstream isn't
+	# going to include this so let's try to carry it forward.
+	# Contact me if it needs updating.  Bug #486782.
+	# Anthony G. Basile <blueness@gentoo.org>.
+	use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
+
+	# Remove profiled make files.
+	find -name '*_p.mk' -delete || die "delete *_p.mk"
+
+	# Adjusting hardcoded paths.
+	sed -i -e "s|opt/schily|usr|" \
+		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
+		|| die "sed opt/schily"
+
+	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
+		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
+		|| die "sed doc"
+
+	# Respect libdir.
+	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
+		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
+		|| die "sed multilib"
+
+	# Do not install static libraries.
+	sed -i -e "s|include\t\t.*rules.lib||" \
+		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
+		|| die "sed rules"
+
+	# Enable verbose build.
+	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
+		RULES/*.rul RULES/rules.prg RULES/rules.inc \
+		|| die "sed verbose rules"
+
+	# Respect CC/CXX variables.
+	cd "${S}"/RULES || die
+	local tcCC=$(tc-getCC)
+	local tcCXX=$(tc-getCXX)
+	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
+		rules1.top || die "sed rules1.top"
+	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
+		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
+		-e "/COPTOPT=/s|-O||" \
+		-e 's|$(GCCOPTOPT)||' \
+		cc-gcc.rul || die "sed cc-gcc.rul"
+	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
+		rules.cnf || die "sed rules.cnf"
+
+	# Schily make setup.
+	cd "${S}"/DEFAULTS || die
+	local os=$(cdrtools_os)
+
+	sed -i \
+		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
+		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
+		-e "s|^\(LDPATH=\).*|\1|" \
+		-e "s|^\(RUNPATH=\).*|\1|" \
+		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
+		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
+		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
+		-e '/^DEFUMASK/s,002,022,g' \
+		Defaults.${os} || die "sed Schily make setup"
+	# re DEFUMASK above:
+	# bug 486680: grsec TPE will block the exec if the directory is
+	# group-writable. This is painful with cdrtools, because it makes a bunch of
+	# group-writable directories during build. Change the umask on their
+	# creation to prevent this.
+}
+
+ac_cv_sizeof() {
+	cat <<-EOF >"${T}"/test.c
+	#include <inttypes.h>
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <sys/types.h>
+	int main () {
+		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
+		test_array [0] = 0;
+		return test_array [0];
+	}
+	EOF
+
+	local i=1
+	while [[ ${i} -lt 20 ]] ; do
+		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
+			echo ${i}
+			return 0
+		fi
+		: $(( i += 1 ))
+	done
+	return 1
+}
+
+src_configure() {
+	use acl || export ac_cv_header_sys_acl_h="no"
+	use caps || export ac_cv_lib_cap_cap_get_proc="no"
+	export ac_cv_header_pulse_pulseaudio_h="no"
+
+	# skip obsolete configure script
+	if tc-is-cross-compiler ; then
+		# Cache known values for targets. #486680
+
+		tc-export CC
+		local var val t types=(
+			char "short int" int "long int" "long long"
+			"unsigned char" "unsigned short int" "unsigned int"
+			"unsigned long int" "unsigned long long"
+			float double "long double" size_t ssize_t ptrdiff_t
+			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
+			"char *" "unsigned char *"
+		)
+		for t in "${types[@]}" ; do
+			var="ac_cv_sizeof_${t// /_}"
+			var=${var//[*]/p}
+			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
+			export "${var}=${val}"
+			einfo "Computing sizeof(${t}) as ${val}"
+		done
+		# We don't have these types.
+		export ac_cv_sizeof___int64=0
+		export ac_cv_sizeof_unsigned___int64=0
+		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
+
+		export ac_cv_type_prototypes="yes"
+		export ac_cv_func_mlock{,all}="yes"
+		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
+		export ac_cv_func_dtoa_r="no"
+		export ac_cv_func_sys_siglist{,_def}="no"
+		export ac_cv_func_printf_{j,ll}="yes"
+		export ac_cv_realloc_null="yes"
+		export ac_cv_no_user_malloc="no"
+		export ac_cv_var_timezone="yes"
+		export ac_cv_var___progname{,_full}="yes"
+		export ac_cv_fnmatch_igncase="yes"
+		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
+		export ac_cv_file__usr_src_linux_include="no"
+
+		case $(cdrtools_os) in
+		linux)
+			export ac_cv_func_bsd_{g,s}etpgrp="no"
+			export ac_cv_hard_symlinks="yes"
+			export ac_cv_link_nofollow="yes"
+			export ac_cv_access_e_ok="no"
+
+			export ac_cv_dev_minor_noncontig="yes"
+			case ${ac_cv_sizeof_long_int} in
+			4) export ac_cv_dev_minor_bits="32";;
+			8) export ac_cv_dev_minor_bits="44";;
+			esac
+
+			cat <<-EOF >"${T}"/test.c
+			struct {
+				char start[6];
+				unsigned char x1:4;
+				unsigned char x2:4;
+				char end[5];
+			} a = {
+				.start = {'S', 't', 'A', 'r', 'T', '_'},
+				.x1 = 5,
+				.x2 = 4,
+				.end = {'_', 'e', 'N', 'd', 'X'},
+			};
+			EOF
+			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="no"
+			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="yes"
+			fi
+			;;
+		esac
+	fi
+}
+
+src_compile() {
+	if use unicode; then
+		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
+		if [[ -n ${flags} ]]; then
+			append-flags ${flags}
+		else
+			ewarn "Your compiler does not support the options required to build"
+			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
+		fi
+	fi
+
+	# If not built with -j1, "sometimes" cdda2wav will not be built.
+	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
+}
+
+src_install() {
+	# If not built with -j1, "sometimes" manpages are not installed.
+	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
+
+	# These symlinks are for compat with cdrkit.
+	dosym schily /usr/include/scsilib
+	dosym ../scg /usr/include/schily/scg
+
+	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
+
+	cd "${S}"/cdda2wav || die
+	docinto cdda2wav
+	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
+
+	cd "${S}"/mkisofs || die
+	docinto mkisofs
+	dodoc ChangeLog* TODO
+
+	# Remove man pages related to the build system
+	rm -rvf "${ED}"/usr/share/man/man5 || die
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		einfo
+		einfo "Darwin/OS X use the following device names:"
+		einfo
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
+		einfo
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
+		einfo
+	fi
+}
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
new file mode 100644
index 000000000000..b7c396deae03
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig
+
+MY_P="${P/_alpha/a}"
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
+SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
+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 ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="acl caps nls unicode selinux"
+
+BDEPEND="
+	nls? ( >=sys-devel/gettext-0.18.1.1 )
+"
+RDEPEND="
+	acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	nls? ( virtual/libintl )
+	!app-cdr/cdrkit
+	selinux? ( sec-policy/selinux-cdrecord )
+"
+DEPEND="
+	${RDEPEND}
+	x11-misc/makedepend
+"
+
+S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+
+FILECAPS=(
+	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
+	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
+	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
+)
+
+cdrtools_os() {
+	local os="linux"
+	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
+	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
+	echo "${os}"
+}
+
+src_prepare() {
+	default
+
+	gnuconfig_update
+
+	# This fixes a clash with clone() on uclibc.  Upstream isn't
+	# going to include this so let's try to carry it forward.
+	# Contact me if it needs updating.  Bug #486782.
+	# Anthony G. Basile <blueness@gentoo.org>.
+	use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
+
+	# Remove profiled make files.
+	find -name '*_p.mk' -delete || die "delete *_p.mk"
+
+	# Adjusting hardcoded paths.
+	sed -i -e "s|opt/schily|usr|" \
+		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
+		|| die "sed opt/schily"
+
+	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
+		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
+		|| die "sed doc"
+
+	# Respect libdir.
+	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
+		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
+		|| die "sed multilib"
+
+	# Do not install static libraries.
+	sed -i -e "s|include\t\t.*rules.lib||" \
+		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
+		|| die "sed rules"
+
+	# Enable verbose build.
+	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
+		RULES/*.rul RULES/rules.prg RULES/rules.inc \
+		|| die "sed verbose rules"
+
+	# Respect CC/CXX variables.
+	cd "${S}"/RULES || die
+	local tcCC=$(tc-getCC)
+	local tcCXX=$(tc-getCXX)
+	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
+		rules1.top || die "sed rules1.top"
+	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
+		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
+		-e "/COPTOPT=/s|-O||" \
+		-e 's|$(GCCOPTOPT)||' \
+		cc-gcc.rul || die "sed cc-gcc.rul"
+	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
+		rules.cnf || die "sed rules.cnf"
+
+	# Schily make setup.
+	cd "${S}"/DEFAULTS || die
+	local os=$(cdrtools_os)
+
+	sed -i \
+		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
+		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
+		-e "s|^\(LDPATH=\).*|\1|" \
+		-e "s|^\(RUNPATH=\).*|\1|" \
+		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
+		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
+		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
+		-e '/^DEFUMASK/s,002,022,g' \
+		Defaults.${os} || die "sed Schily make setup"
+	# re DEFUMASK above:
+	# bug 486680: grsec TPE will block the exec if the directory is
+	# group-writable. This is painful with cdrtools, because it makes a bunch of
+	# group-writable directories during build. Change the umask on their
+	# creation to prevent this.
+}
+
+ac_cv_sizeof() {
+	cat <<-EOF >"${T}"/test.c
+	#include <inttypes.h>
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <sys/types.h>
+	int main () {
+		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
+		test_array [0] = 0;
+		return test_array [0];
+	}
+	EOF
+
+	local i=1
+	while [[ ${i} -lt 20 ]] ; do
+		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
+			echo ${i}
+			return 0
+		fi
+		: $(( i += 1 ))
+	done
+	return 1
+}
+
+src_configure() {
+	use acl || export ac_cv_header_sys_acl_h="no"
+	use caps || export ac_cv_lib_cap_cap_get_proc="no"
+	export ac_cv_header_pulse_pulseaudio_h="no"
+
+	# skip obsolete configure script
+	if tc-is-cross-compiler ; then
+		# Cache known values for targets. #486680
+
+		tc-export CC
+		local var val t types=(
+			char "short int" int "long int" "long long"
+			"unsigned char" "unsigned short int" "unsigned int"
+			"unsigned long int" "unsigned long long"
+			float double "long double" size_t ssize_t ptrdiff_t
+			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
+			"char *" "unsigned char *"
+		)
+		for t in "${types[@]}" ; do
+			var="ac_cv_sizeof_${t// /_}"
+			var=${var//[*]/p}
+			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
+			export "${var}=${val}"
+			einfo "Computing sizeof(${t}) as ${val}"
+		done
+		# We don't have these types.
+		export ac_cv_sizeof___int64=0
+		export ac_cv_sizeof_unsigned___int64=0
+		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
+
+		export ac_cv_type_prototypes="yes"
+		export ac_cv_func_mlock{,all}="yes"
+		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
+		export ac_cv_func_dtoa_r="no"
+		export ac_cv_func_sys_siglist{,_def}="no"
+		export ac_cv_func_printf_{j,ll}="yes"
+		export ac_cv_realloc_null="yes"
+		export ac_cv_no_user_malloc="no"
+		export ac_cv_var_timezone="yes"
+		export ac_cv_var___progname{,_full}="yes"
+		export ac_cv_fnmatch_igncase="yes"
+		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
+		export ac_cv_file__usr_src_linux_include="no"
+
+		case $(cdrtools_os) in
+		linux)
+			export ac_cv_func_bsd_{g,s}etpgrp="no"
+			export ac_cv_hard_symlinks="yes"
+			export ac_cv_link_nofollow="yes"
+			export ac_cv_access_e_ok="no"
+
+			export ac_cv_dev_minor_noncontig="yes"
+			case ${ac_cv_sizeof_long_int} in
+			4) export ac_cv_dev_minor_bits="32";;
+			8) export ac_cv_dev_minor_bits="44";;
+			esac
+
+			cat <<-EOF >"${T}"/test.c
+			struct {
+				char start[6];
+				unsigned char x1:4;
+				unsigned char x2:4;
+				char end[5];
+			} a = {
+				.start = {'S', 't', 'A', 'r', 'T', '_'},
+				.x1 = 5,
+				.x2 = 4,
+				.end = {'_', 'e', 'N', 'd', 'X'},
+			};
+			EOF
+			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="no"
+			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="yes"
+			fi
+			;;
+		esac
+	fi
+}
+
+src_compile() {
+	if use unicode; then
+		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
+		if [[ -n ${flags} ]]; then
+			append-flags ${flags}
+		else
+			ewarn "Your compiler does not support the options required to build"
+			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
+		fi
+	fi
+
+	# If not built with -j1, "sometimes" cdda2wav will not be built.
+	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
+}
+
+src_install() {
+	# If not built with -j1, "sometimes" manpages are not installed.
+	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
+
+	# These symlinks are for compat with cdrkit.
+	dosym schily /usr/include/scsilib
+	dosym ../scg /usr/include/schily/scg
+
+	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
+
+	cd "${S}"/cdda2wav || die
+	docinto cdda2wav
+	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
+
+	cd "${S}"/mkisofs || die
+	docinto mkisofs
+	dodoc ChangeLog* TODO
+
+	# Remove man pages related to the build system
+	rm -rvf "${ED}"/usr/share/man/man5 || die
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		einfo
+		einfo "Darwin/OS X use the following device names:"
+		einfo
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
+		einfo
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
+		einfo
+	fi
+}
diff --git a/app-cdr/dumpet/Manifest b/app-cdr/dumpet/Manifest
index 18f29fa3c7cf..86228a3764f4 100644
--- a/app-cdr/dumpet/Manifest
+++ b/app-cdr/dumpet/Manifest
@@ -1,3 +1,5 @@
 DIST dumpet-2.1-15.fc27.src.rpm 25268 BLAKE2B ae80875f08211a825bbc357e4051bf6fcd26d2726b9fc477b61593155080fb460ea3cb6b7c5af519a740436313fa588cfffda7afdba41179a620702693e82ff2 SHA512 bf4b7f2de48590f5ff71ec17a05e331def234a1e57e7e06254c00eb60e44ae8c712e33515e01c6f5fe0bcecbea6e596e4e452ad192823b81dfb7de781d0d4e55
-EBUILD dumpet-2.1.ebuild 709 BLAKE2B 6cb0812b34c3ee6176400444444441ec9b4160ce77ae401d112e3a0a3713750b28477b2f5fa529a8577667b7b016344e725822646b53a7cb45307beafd4e63e0 SHA512 2a8d8664fb613f5ceefeb5c1ac8b0d5f18970664219a22e7c8133209ae17fd19b78cb4087d5ad03c736ce8b413106cdf1916b152648928a9e08aa6f4ae4a0f98
+DIST dumpet-2.1_p20140601.tar.gz 20140 BLAKE2B def3e7948096e2543bf24324b17c3b3123b867e750971858cb403732efde6c217fcf1c04955a0dd4ed2f99fdaedecab1becdcc1027645e7a955ed1addf11daa1 SHA512 161911ae136aa81abff5a591593acf421a4101e3f80cb259c5b2190581d5cbd06641eefe4c873d40d1b2adabedb2e42ef7fdd0a6e39ec98e1927550ae8960eda
+EBUILD dumpet-2.1.ebuild 658 BLAKE2B e58cd552a6a7aad3d24884bcf8021b6fd37f8c95ac53737f35487b9d46ecdb17f802b884d220610a5711d588254b4937d296fa4c14e4fd59abd5cdcec6f344f8 SHA512 e50a277d307c664b440f72d46ed814631144bb7525542b1149730cab1ced4e9d67471dd7bd0e149678b212e64ee7b8bd7ebaad07208dbf56244e268239f3542e
+EBUILD dumpet-2.1_p20140601.ebuild 695 BLAKE2B 065e56688e2e2bfb7894292232047c31b42b661543aa124c3f57457b7f91519342178b2fe0a5883c62c5047b5d2667a0a32410b814f2a036f979846d311ab3c7 SHA512 618cf11e764d617e013a323507a854ad289ceea1956087130fe95b69a65c72f160ed7927595dcd7c7ea2cdcc7e9836a100d144c07b66e2f5e6256d86ad26c574
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-cdr/dumpet/dumpet-2.1.ebuild b/app-cdr/dumpet/dumpet-2.1.ebuild
index 145917d4da49..965a359ba237 100644
--- a/app-cdr/dumpet/dumpet-2.1.ebuild
+++ b/app-cdr/dumpet/dumpet-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit rpm
 
 DESCRIPTION="A tool to dump and debug bootable CD-like images"
-HOMEPAGE="https://fedora.pkgs.org/rawhide/fedora-x86_64/dumpet-2.1-15.fc27.x86_64.rpm.html"
+HOMEPAGE="https://github.com/rhboot/dumpet"
 SRC_URI="http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/source/tree/Packages/d/dumpet-${PV}-15.fc27.src.rpm"
 
 LICENSE="GPL-2"
diff --git a/app-cdr/dumpet/dumpet-2.1_p20140601.ebuild b/app-cdr/dumpet/dumpet-2.1_p20140601.ebuild
new file mode 100644
index 000000000000..96ef9972e7ad
--- /dev/null
+++ b/app-cdr/dumpet/dumpet-2.1_p20140601.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm vcs-snapshot
+
+COMMIT="8f47670dd582c96ad1b6dd3c9b9da0acebded5d8"
+
+DESCRIPTION="A tool to dump and debug bootable CD-like images"
+HOMEPAGE="https://github.com/rhboot/dumpet"
+SRC_URI="https://github.com/rhboot/dumpet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/popt"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i Makefile \
+		-e "s/^install : all$/install :/" \
+		|| die
+	default
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" dumpet
+}
+
+pkg_setup(){
+	tc-export CC
+}
diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
index eca6789c02b9..18eb7896ebe2 100644
--- a/app-cdr/dvdisaster/Manifest
+++ b/app-cdr/dvdisaster/Manifest
@@ -1,5 +1,5 @@
 DIST dvdisaster-0.79.5.tar.bz2 8224726 BLAKE2B 443816b550a627ce1998eae71c6524c17105c7253af1e1591eae06055d342afc4457b847c53bfb857793676fc50ca9c5c7f33dafaf541c92e84f149a2987d632 SHA512 8630d4389983307afc3faa5b4256f531ded370f84ec35d4a363853dc7d79e5e15ee0b81bf64f4b88f57fe6176537df8195f83acf23e770d991c700b7408dd1f5
 DIST dvdisaster_0.72.4.orig.tar.bz2 5097738 BLAKE2B 77027d8f5c329525c69acccb0a1c780edc2abaae577473442259bfc3650a78d1443a30793c3fd9bbefe4d542bd7f77edaaf35f11d5285832405cdfeb9e8c225c SHA512 aa0a9f3040d45b16a9117b2b6756d2423cf55db4a00e8314a164f6dc32863cd4e5a5b5ec009a56782aa2afe6031e3a32954014101abc67291428e9edea1b5272
 EBUILD dvdisaster-0.72.4.ebuild 1787 BLAKE2B ad76b0d46ec89a633409c0c058292f6fd3d0f314d193aeda5aa3b002746b36d2e2e5567af667d52acaf75f393e833bc457a59b069ca3244e18aef36bb4c9c23f SHA512 76413a25bf5acfb4258b7dcf554c743ff96810e1abaec34f0436e0d0ef739cca776d35e16228fc380d1cb54ca641d461365e24d71e40619ca88de1f535473fd4
-EBUILD dvdisaster-0.79.5.ebuild 1730 BLAKE2B 2c956468351b47e4a085af56b8edd8b9e3eb265bf5d34588e5953f4403c6fe4a76e59957001d4faf3d8941dc58f205bef58e1d0366da3270965b951a7cf2b42c SHA512 611bf97c02003e0fe6f0a428d93257eee9c6c6269e27ab086b19c8680f439549dbd4926ec3739d0aa10320c8890434d56882d4cb08fa7a0149c1e6c37ed3ce8a
+EBUILD dvdisaster-0.79.5.ebuild 1728 BLAKE2B 5b2e6687ec1f3771b567bb6105cfb87a25f0d8d9e3a25188f76756fb97a55578f83d9d684536a3b8a3dbd27b005d30cb58357bfaa2f58272f27efa7c0239c2df SHA512 c18c942b7b23403942784c2184e65ec7362a4ca4a564f40fc31e7faa73e5144632844d4b79853ac58c2715345650c885ccbebd826035330959fc8cc9a854135e
 MISC metadata.xml 533 BLAKE2B 9db837ca6d8d637bd17eec18ae9f395d5217ca63455d90d1615bffe4a8cf858aa502b144ff9132853895d995db4776d2c9f2108ac3dcc0d6c451b0ad7d82e91f SHA512 d554061a440ce135ad7a799cc9717885f22d2da11bab7c7a755654e93aefa9404d80ed628d669473c411d3f6710eec6149ff2716075f02b99e4cc53f219a8716
diff --git a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
index edda38af4a4a..1cdfebed6125 100644
--- a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dvdisaster.net/downloads/${PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug nls"
 
 dvdi_langs="cs de it pt-BR ru sv"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index aa269ed6dc4d..8cd9b81a9922 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
new file mode 100644
index 000000000000..3058950e50c5
--- /dev/null
+++ b/app-crypt/acme-sh/Manifest
@@ -0,0 +1,6 @@
+AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
+AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
+DIST acme.sh-2.7.9.tar.gz 110323 BLAKE2B 244afad17ddf17fa95a11d5af7943a153ed37e67ef304511787767a5d769f9cd22fb66875d637f2d536cce8942e4feee0c442af8349a32a91940b1fbbc2e879c SHA512 24374783ca52835b400b84316ffab5e9066805362f02082f8ef409e21ca590d837b3dd11401633947f9fcc98dc977b0e8b6076d5deecd02b38478f257500a052
+EBUILD acme-sh-2.7.9.ebuild 1044 BLAKE2B f64a6b2dd8e6f71dafbd4179d7fb2841c282e7dabe857c4d23948e832508ef44a3169e42844804fbbe121ab8dec4e05524dd48cf672de9b41c134bd5816060db SHA512 942ab62d93e3209d2e104b8e851fda138ca88788e477994bc1ca90dbccd1bc550cadb5f5163542ea65226e3e57088004a198d838097f9d757acccb98b4c19575
+EBUILD acme-sh-9999.ebuild 968 BLAKE2B 8145bf971f9d990d0c861870132c2a34d196819682f4378ad5edef0d3cbfb96200824990db9b3c1ed57a5736381260220ccaff07b04a58f734807a56d109b2ec SHA512 6c24d8e509392cf9b1c25b56d4be8cff9b478e0f4eb9c4f57b49deb7fce8c1726b750c86e87fe9ceaf79f11bf12417f2f7abfd4042dcc44843e21229e49e3a11
+MISC metadata.xml 597 BLAKE2B abf8574531170e1bf807d45682c5a394e3ef11880b23a297b3a440ab1b3eaf2c283d5afac51ef7fb8726203b6303f626e5883f4a258897794a3848e4ade5980d SHA512 f45386c5ef271f698ce540ae61b9dad4ae6d7c624d13310daa2adc353a6145f4abdf19f7a0fc5120ca661668673efa6536297e25a374b65ec06dd8b41a7ebbb6
diff --git a/app-crypt/acme-sh/acme-sh-2.7.9.ebuild b/app-crypt/acme-sh/acme-sh-2.7.9.ebuild
new file mode 100644
index 000000000000..3224bb2b4484
--- /dev/null
+++ b/app-crypt/acme-sh/acme-sh-2.7.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An ACME Shell script"
+HOMEPAGE="https://github.com/Neilpang/acme.sh"
+SRC_URI="https://github.com/Neilpang/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-misc/curl
+	|| ( dev-libs/libressl dev-libs/openssl:0 )
+	|| ( net-analyzer/netcat6 net-analyzer/openbsd-netcat )
+	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx:0 )
+	virtual/cron"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	einstalldocs
+	newdoc dnsapi/README.md README-dnsapi.md
+	newdoc deploy/README.md README-deploy.md
+
+	keepdir /etc/acme-sh
+	doenvd "${FILESDIR}"/99acme-sh
+	insinto /etc/bash/bashrc.d
+	doins "${FILESDIR}"/acme.sh
+
+	exeinto /usr/share/acme.sh
+	doexe acme.sh
+	insinto /usr/share/acme.sh/dnsapi
+	doins -r dnsapi/*.sh
+	insinto /usr/share/acme.sh/deploy
+	doins -r deploy/*.sh
+
+	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
+}
diff --git a/app-crypt/acme-sh/acme-sh-9999.ebuild b/app-crypt/acme-sh/acme-sh-9999.ebuild
new file mode 100644
index 000000000000..23935922162c
--- /dev/null
+++ b/app-crypt/acme-sh/acme-sh-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/Neilpang/${PN/-/.}.git"
+
+inherit git-r3
+
+DESCRIPTION="An ACME Shell script"
+HOMEPAGE="https://github.com/Neilpang/acme.sh"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="net-misc/curl
+	|| ( dev-libs/libressl dev-libs/openssl:0 )
+	|| ( net-analyzer/netcat6 net-analyzer/openbsd-netcat )
+	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx:0 )
+	virtual/cron"
+
+src_install() {
+	einstalldocs
+	newdoc dnsapi/README.md README-dnsapi.md
+	newdoc deploy/README.md README-deploy.md
+
+	keepdir /etc/acme-sh
+	doenvd "${FILESDIR}"/99acme-sh
+	insinto /etc/bash/bashrc.d
+	doins "${FILESDIR}"/acme.sh
+
+	exeinto /usr/share/acme.sh
+	doexe acme.sh
+	insinto /usr/share/acme.sh/dnsapi
+	doins -r dnsapi/*.sh
+	insinto /usr/share/acme.sh/deploy
+	doins -r deploy/*.sh
+
+	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
+}
diff --git a/app-crypt/acme-sh/files/99acme-sh b/app-crypt/acme-sh/files/99acme-sh
new file mode 100644
index 000000000000..a502b49016ab
--- /dev/null
+++ b/app-crypt/acme-sh/files/99acme-sh
@@ -0,0 +1,2 @@
+LE_WORKING_DIR="/etc/acme-sh/"
+LE_CONFIG_HOME="/etc/acme-sh/"
diff --git a/app-crypt/acme-sh/files/acme.sh b/app-crypt/acme-sh/files/acme.sh
new file mode 100644
index 000000000000..f20d53850bc1
--- /dev/null
+++ b/app-crypt/acme-sh/files/acme.sh
@@ -0,0 +1 @@
+alias acme.sh="/usr/bin/acme.sh --config-home '/etc/acme-sh/'"
diff --git a/app-crypt/acme-sh/metadata.xml b/app-crypt/acme-sh/metadata.xml
new file mode 100644
index 000000000000..2a8926b55be2
--- /dev/null
+++ b/app-crypt/acme-sh/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>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	A shell script to automatically issue and renew the free certificates
+	from Let's Encrypt
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Neilpang/acme.sh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index b6c3528b3a8c..0f4c1ff42bcc 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -2,5 +2,5 @@ AUX argon2-20161029-makefile-soname-symlinks.patch 807 BLAKE2B 128d7f8db6bc85839
 DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
 EBUILD argon2-20161029-r1.ebuild 1059 BLAKE2B 5af6cfcc657b155477979103e641b1449c3c95430aed7594d5a7678b6c1622672e4b8581b6465721a8645065dd3bbf8c9be9bcd6d58f8f44c8844c9a4de09992 SHA512 bf74945ccbea5cd3017a91502a4ce67c5b39b02df1882b175c9d3c857b70914f3f91d41b10c7c46fc82ee4ab8e03b4b0b291e9f16a3a41f8f54f28216533ffec
-EBUILD argon2-20171227.ebuild 905 BLAKE2B 07c63a1d771bf1df6922d6ea1e0797480e92b6a3eee5605e7ddfa8ce3b9a3dd5472165bcfc0a97e8155dc959c4a4b68c2fde4b20435ff68fd543182e570c9d0f SHA512 408dcbe943362357959e5e76a2e82a31fc62c2b55f66b3fca54d7210767138bbb46e102f4867fd8b1a1d312360b34a9b528290c979c238feae93a4a1520d7447
+EBUILD argon2-20171227.ebuild 912 BLAKE2B b4b0636a8e5068e4ec01a40d1f0605cf5923bb0b899043fa8b506bc067f5ec305f6f63d3eb86dff48788ee775e22c768cbf8338f7ea5012c764fa8f02788f8e5 SHA512 8228265444ceb123ebb0b0ef284c55ab1308e99b6ad32de41e0b576bd3996d060459ad1aa17eecf828a8c7141aadc4eb4c204cc7c1f198e21fc24352882e9e98
 MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
diff --git a/app-crypt/argon2/argon2-20171227.ebuild b/app-crypt/argon2/argon2-20171227.ebuild
index 50f2f9d26ac5..6aeb567b2247 100644
--- a/app-crypt/argon2/argon2-20171227.ebuild
+++ b/app-crypt/argon2/argon2-20171227.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index d49dc49010cf..cad4d6854a6e 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,4 +1,6 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
 DIST ccid-1.4.29.tar.bz2 635761 BLAKE2B ff14bc6e181a6d44b8ef463a2255d0362842f6e1e7c79e0a01caaba0a88892f7b0f2bd9d2dadae7be8b0655d2502e5471cff29e582928d62235fa070f2eb1ba8 SHA512 9ff37acad086e959f660069b245fe06ecada140623025a19dfbff55edec71e1e72bce09ac4fc506ad985dd0831dafc6b12f5a5b109b38bf9ba7583856eb19418
+DIST ccid-1.4.30.tar.bz2 642342 BLAKE2B fd43aa2a4c8840abb0545760f6ceb31bb9d7dc22d7283888c9a142e0c3b34310ec4530d18986451b21c6b1a3975b1212ab653a4c8d58466b28713f0f72ce1cdb SHA512 1761a4053a99eb28184d0ffece951aec5d4b646080597b4ae36b18a31fb7a76c55fabfa57ee8e5d7f2db1a6e13d209f7fa995fe6ed067f44558bea34a26d46da
 EBUILD ccid-1.4.29.ebuild 1501 BLAKE2B 511ebcb55b36429cf1c30dda2aa00a936d3b5de284db08dac9df9f0436c8704e4a2e0a5410e356c4f0187047cbfdbe954b5fdafc15220b72b2e36e2c82bff28e SHA512 c77f20dc8ec1c2ac518237605de88318cb36f9dd09bb2fcfdafe827c47da7e8e7f6b33cf1fb19cfae83c57485ec7fda9c6b981ee4371a723335b24a829cd57a9
+EBUILD ccid-1.4.30.ebuild 1503 BLAKE2B 870a9f53f8c3d4ca1610b62167e1c6a2374bf8585fae78312f14fb278e0cbdb17ab10ef39ada95f3c246d1c81879faf289e7f4fc097901461e068bd71eb7b4ad SHA512 63cec050390e57f62d29afc20c0590bb55ffcaacd049464e2476283f6785fd6110f089c1e3d7aa1cb7dfe47a7dcab64f07cec4b18d49c62b1589ea192deb7136
 MISC metadata.xml 397 BLAKE2B 0b62fc531114bb9221d17ee3524db0858f4ff373b71a1b7beda520035eaf5679a63a420381dc52e40942a519bf15f95fae97b531267df133cf68687c49dad565 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b
diff --git a/app-crypt/ccid/ccid-1.4.30.ebuild b/app-crypt/ccid/ccid-1.4.30.ebuild
new file mode 100644
index 000000000000..7b28b5b26312
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.30.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr/"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+	usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
+	if use kernel_linux; then
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
+	fi
+}
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 42cf256d82ab..ed4eb457075c 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,6 +1,4 @@
-DIST eid-mw-4.3.6.tar.gz 7515482 BLAKE2B 8895564736be83ad2f9797a6cfcbc6cb50a928c36508b9ddcf8e9032d7b4de9284745d711a7664edba106ad005a63eb1fddb5c1e639305b4af12f49ab8dbc61c SHA512 336181c21896bec0e7a0a67f5bc739fdc63ca7b17eb6fefa98b6d468810fcdb52ecb6a64f267cdcfc063a2ef599d033064ec90b6bb41ec7ceccc2ca8e829a82b
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
-EBUILD eid-mw-4.3.6.ebuild 2376 BLAKE2B 83e666feb86ac93a1a3e4d3047cf871e6c62f04158767c6006c56d264c3327dabcb4059284857451431e22ac092aed3e5e47a4b9b6438f72dabec47d45008c58 SHA512 254c74676ceee8b5d7f3ccfe6efbc77fc3ce0a663f824ae91eb48a604354918da30b2c9ef48c4ffbe5cbab681c582bda94c1e8abf976898d8ba3513acca5d03b
 EBUILD eid-mw-4.4.1.ebuild 2109 BLAKE2B 2f9f1eec44db4c236d8a94a0e1e23a11b0c8bb204d8dff6de0a62314a687bbb5216a4cf4fbfd5418d1ef2e991bec479a517b6c1efd4e3ba31fb55d570a5130bb SHA512 2c6f5760f4a4501b3c4a5f591d9962b74147d30f14c645a54fce70558b1bec4cd93c89317525a843e32f594c118e3d1201701a02bb49c21428072c06c5560026
 EBUILD eid-mw-9999.ebuild 2500 BLAKE2B 47067bc95c8983684ae00c5f1b98c174e52526ca895dca8141b6578957a45a457abc9d55b2fb23ec4d8ac0180f79933474af28084ea6220e9f427a59943918ba SHA512 9d5d96e062832820be1a6290507a1e91041a32c219df205f60168f57e54d92367f24a3f1bb8dc438850f0fab3a912f6a38b823def485af02abf668691f6899f2
 MISC metadata.xml 1464 BLAKE2B 6f179b170658fc6b084e4ef8c6a89443b1dc39307b9d52083214d75fdb386ec3c3c9f0a6522e6a52eb6c33c792216db27115f017eff6ad922254d1ffcb671c0b SHA512 ed78298a9b246f9f8f9591dbb9fe54ab311d525db86166bcf66574c9e365f1476234d5bac3180226dfbdb5c4014dd5dae4598b670cd7c6c9538282940a0fa9eb
diff --git a/app-crypt/eid-mw/eid-mw-4.3.6.ebuild b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
deleted file mode 100644
index 322eaafd9ef6..000000000000
--- a/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools mozextension gnome2-utils
-
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-HOMEPAGE="https://eid.belgium.be"
-SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~arm"
-IUSE="+dialogs +gtk p11-kit +xpi"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.2.9
-	gtk? (
-		x11-libs/gdk-pixbuf[jpeg]
-		x11-libs/gtk+:*
-		dev-libs/libxml2
-		net-misc/curl[ssl]
-		net-libs/libproxy
-		!app-misc/eid-viewer-bin
-	)
-	p11-kit? ( app-crypt/p11-kit )
-	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="dialogs? ( gtk )"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-
-	# hardcoded lsb_info
-	sed -i \
-		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
-		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
-		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
-		plugins_tools/aboutmw/gtk/about-main.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable dialogs) \
-		$(use_enable p11-kit p11kit) \
-		$(use_with gtk gtkvers 'detect') \
-		--with-gnu-ld \
-		--disable-static \
-		--disable-signed
-}
-
-src_install() {
-	default
-
-	if use xpi; then
-		declare MOZILLA_FIVE_HOME
-		if has_version '>=www-client/firefox-3.6.20'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-		if has_version '>=www-client/firefox-bin-3.6.24'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-	else
-		rm -r "${ED}"/usr/lib/mozilla || die
-	fi
-	rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
-
-	if use gtk; then
-		rm -r "${ED}/usr/include/eid-util" || die
-	fi
-}
-
-pkg_postinst(){
-	if use gtk; then
-		gnome2_schemas_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm(){
-	if use gtk; then
-		gnome2_schemas_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 199c332ea2bb..ca28e1ed9eef 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -4,8 +4,8 @@ DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370be
 DIST gnupg-2.2.8.tar.bz2 6632465 BLAKE2B e13bdfb2b17f87dd2122da5a489318bfcefec26c0fbb65dc6a36034314985bbd405cb22cfaf9bffa4c7928657cbc63d363f16b77d00bf86737b73c73ffbce4f2 SHA512 24271ec2663b941ed5e72e2179b48ac73d5cd838292aa9d4954952b11713f4b466f30e6af632b22c9e7c284350e300a07046d41d0ab73dcbd1639b303cd09007
 DIST gnupg-2.2.9.tar.bz2 6659547 BLAKE2B 3715fa0fcfbed24b0c985811c14e5a8c84caef0e66937ec7eb2ebefb4603a2c9a994d3c73224941254c685ca32cd83d7bb924fb7171ee569b346f2092ed7ae5d SHA512 96faf227bef78fee99ff20606f3ce74eddc407c3864b928f8676a80f50dfaf2dd291eaeeaa0d291a254275a87e4f8506df9ed31c1cfc7652999208c292a16922
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
-EBUILD gnupg-2.2.10-r1.ebuild 3293 BLAKE2B 31c0b5f7e2b4f5feeb1cf5ffdbfe463075f86d56595ccb92b5a6a99a07b99613bb4e2915e456a435049a3674bba303a3ca782a9d98a8dcbc3432f98372385518 SHA512 6729c3c6885808059e8f5d3e4b19f8838a0908984d06abda0dc1340dd5944b7b3cc7f78648ba60352f7dec80b3d25bac51af849e631b25abe88b61801e26f5e1
-EBUILD gnupg-2.2.10.ebuild 3334 BLAKE2B b59f061776948cacfcf4b0e7e348a66e2d8ae8fbb1ec3b906afc98944b9e3a92f35db13b8befb42194cdb71f2eebbf8a2e04ee9ec511aa73a5934d7996f1932e SHA512 7a8db6bfb393b88a60331ebdc3892f3b8175824adcf02338972084a6f272231bba783ff7394d02696471d962dc4298595d110c9f5b6127b6d8bedc00f1784c0a
+EBUILD gnupg-2.2.10-r2.ebuild 3391 BLAKE2B 76baab11f3821af181f1747e131dd3ec86e748957a69009471147c509e5f795e681763deb8045db9c67ca05e5b57c244c03c82ae943e47c6e5a7d7cd0b6db0dc SHA512 205df2dd2b3fbb9f93f0a9fbbe24b922b8738a75921a1bc9147b799d9a383348fb7d8e836aae51e075865b9f0da5b7bc2f801c09fddd0048389b20435f9519ac
+EBUILD gnupg-2.2.10.ebuild 3330 BLAKE2B 5463913efe11b4845e60846cf4600609a3d52583138c3e2e569f2601fb740ffdcdbe92ffcecbe1aa1572a971863a814b6c8beab66947f5af7d76a727d7c6b4a5 SHA512 d451d3b831d03960cab03907b2f607ab9b623681fc11fbc1adaeca317461f919c046c27173de6ddffe779f554e3f551292a7374fe5aec8b5eaf19fbdfd16b672
 EBUILD gnupg-2.2.8.ebuild 3197 BLAKE2B 047ced194ad1467cdd5ade6f747b200aff373e5cbee4ae4ac17a113c4c1df5176abdb2658808c3bf00682dc08a42cca4c84c704016b682a8782521bf52783f4c SHA512 99bda452847ef64c1727b31d406034ad69da164355d18d36eefa7744f25cc2376abbf4dcc72b919884881b49cfdf27c8149c513c63c58467d4eb478d1db10fd7
 EBUILD gnupg-2.2.9.ebuild 3334 BLAKE2B b59f061776948cacfcf4b0e7e348a66e2d8ae8fbb1ec3b906afc98944b9e3a92f35db13b8befb42194cdb71f2eebbf8a2e04ee9ec511aa73a5934d7996f1932e SHA512 7a8db6bfb393b88a60331ebdc3892f3b8175824adcf02338972084a6f272231bba783ff7394d02696471d962dc4298595d110c9f5b6127b6d8bedc00f1784c0a
-MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
+MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac
diff --git a/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild
deleted file mode 100644
index 7d51332a5446..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
-
-# Existence of executables is checked during configuration.
-DEPEND="!app-crypt/dirmngr
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.28
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )
-	virtual/mta"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable ssl gnutls) \
-		$(use_enable tofu) \
-		$(use_enable usb ccid-driver) \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--disable-ntbtls \
-		--enable-all-tests \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		$(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild
new file mode 100644
index 000000000000..2bf51b3eec85
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND="!app-crypt/dirmngr
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.28
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	tofu? ( >=dev-db/sqlite-3.7 )
+	virtual/mta"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+src_configure() {
+	local myconf=()
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	#bug 663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable ssl gnutls) \
+		$(use_enable tofu) \
+		$(use_enable usb ccid-driver) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--disable-ntbtls \
+		--enable-all-tests \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		$(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.2.10.ebuild b/app-crypt/gnupg/gnupg-2.2.10.ebuild
index 0ca7e2fde80a..5824b9f624ac 100644
--- a/app-crypt/gnupg/gnupg-2.2.10.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index d9ae4079527c..710e79addfa5 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -22,6 +22,9 @@
 		<flag name="usb">
 		Build direct CCID access for scdaemon; requires <pkg>dev-libs/libusb</pkg>.
 		</flag>
+		<flag name="user-socket">
+		try a socket directory which is not removed by init manager at session end
+		</flag>
 		<flag name="mta">
 		Build mta support using <pkg>virtual/mta</pkg>.
 		</flag>
diff --git a/app-crypt/gpa/Manifest b/app-crypt/gpa/Manifest
index 3d7bd057d4d1..a001291c3289 100644
--- a/app-crypt/gpa/Manifest
+++ b/app-crypt/gpa/Manifest
@@ -1,3 +1,5 @@
+DIST gpa-0.10.0.tar.bz2 782455 BLAKE2B ef663432cbe20fb5c543696627f448b3970099b6a0f8f68b57e3d87af03550597adcfe4c27c2774d1f278cfc9d07a089652f42ef4f8c3cbc0192b645c465ac0e SHA512 87004fb0806e76012bc194f95afe9ef6044aec890b26e845f45c314e1bd8864f056ba5e32f9ef2e15b24b50840235e6e548a5e3006b255b4f1c20e0fd7710a3b
 DIST gpa-0.9.10.tar.bz2 763239 BLAKE2B 60763d63c39ca73c5f36d569e27388650060989386df10a867b0235d1b37ce3a46f1526668a1975b9e8c9ebd1c98ffaedab0fe92e55c80787a24dd412939e6a4 SHA512 ff81a78e6b7c46307af6648a2e691a5e8185db229ccc5e259f2c3c05a3c86b337dde492069e7e9510c155fbc64d71cc4e2f109a00400bfb7560c558b753c42a9
+EBUILD gpa-0.10.0.ebuild 823 BLAKE2B d6728fe1ab909e5a95afc9b6db222cd7acdf482bbddf486096a7c4ef60e67ae3f964dc23a9572fb61eaf12f0d0e13b732b04836884428abd0b0c3f873c05e14f SHA512 517069a42d9d794969aaf78e050e541b9277eb9b5abbcecd3908a3b802107a2291b82be0aefe251701f1875eb1456139228cbc19d72ffb85cc7fd0b68d3c33cf
 EBUILD gpa-0.9.10.ebuild 814 BLAKE2B 0dfd28852ffb2c119a891a4061711c1cfb1685d252c429d39cd1609e235e3213b766a83f7bf2ce1ad1299f7d8dc7656f3499494e8d09c1e7173e8245efc236a4 SHA512 4584ec11fe1c2bc335a68fa51eeed0f006e2e1f3b6add9af14d53ef5ac06c5931a2facd5735bc0df4798ae75ec7005acbbcdf3cd7ae5758b26059a8b37c8b220
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/gpa/gpa-0.10.0.ebuild b/app-crypt/gpa/gpa-0.10.0.ebuild
new file mode 100644
index 000000000000..b2e65c08bdac
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.10.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
+HOMEPAGE="http://gpa.wald.intevation.org"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="
+	>=app-crypt/gnupg-2:=
+	>=app-crypt/gpgme-1.11.1:=
+	>=dev-libs/libassuan-1.1.0:=
+	>=dev-libs/libgpg-error-1.4:=
+	>=x11-libs/gtk+-2.10.0:2=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	sed -i 's/Application;//' gpa.desktop
+}
+
+src_configure() {
+	econf \
+		--with-gpgme-prefix=/usr \
+		--with-libassuan-prefix=/usr \
+		$(use_enable nls) \
+		GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
+}
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 8c7da31a20f8..193535ba61b2 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,3 +1,5 @@
 DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
+DIST gpgme-1.12.0.tar.bz2 1658803 BLAKE2B 630646af597074c06a99c1170c4f8170ad0fe4ba643a27a87a61dd8df681ca14f023b07817657bb049eaeaef01df3975bd1fe1b75a026634a62f832c6c311b56 SHA512 c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014
 EBUILD gpgme-1.11.1.ebuild 2876 BLAKE2B 4ebc8efd4405dbb3aeb68591f4736879785baf3429a871bc3a4206be1e1efc871a1a9076d2c930d4a1552cfff123cf0a56c426c0f9e2f0753280a6f6be7e8f4a SHA512 9c77decd7a6635eb4299cc98b4100969aa941d063687b2181ba808e5ef6002a4e1ccf53e6cd13deff7e14b38ae30b5473f753171fcf7711ee372661b2a10018c
+EBUILD gpgme-1.12.0.ebuild 2881 BLAKE2B 6e171e8cbfd00804f334dfebe888d13759c7da8ef6478ead0725c8b51cb2f8da6dc6edf911aede93f92666e974a8d2a57057d311d27ba2dab69e1edbebf81a92 SHA512 6b052e328ed378263b29e148bba84791d533fac820defd17812428821ef129b6864b662691da0db4895839393bcfc34f8881f08d04a862efd6203d74a6e37967
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.12.0.ebuild b/app-crypt/gpgme/gpgme-1.12.0.ebuild
new file mode 100644
index 000000000000..a84457c507be
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.12.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs cxx python qt5"
+
+COMMON_DEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.0.2:=
+	>=dev-libs/libgpg-error-1.29:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/qttest:5 )"
+RDEPEND="${COMMON_DEPEND}
+	cxx? (
+		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
+		!kde-apps/gpgmepp:5
+		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
+		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
+	)"
+BDEPEND="python? ( dev-lang/swig )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
+pkg_setup() {
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
+		SKIP_TESTS=1
+	fi
+}
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b"
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	econf \
+		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	[[ -z "${SKIP_TESTS}" ]] || return
+
+	default
+	if use python; then
+		test_python() {
+			emake -C lang/python/tests check \
+				PYTHON=${EPYTHON} \
+				PYTHONS=${EPYTHON} \
+				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+		}
+		python_foreach_impl test_python
+	fi
+}
+
+src_install() {
+	default
+	do_python
+	find "${D}" -name '*.la' -delete || die
+
+	# backward compatibility for gentoo
+	# in the past we had slots
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index cbfb51d9a45d..0acb754b9ee9 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -4,11 +4,13 @@ DIST keybase-2.3.0.tar.gz 34524576 BLAKE2B 5793892b6bcfeafbaebb4a38d35e77d9267a7
 DIST keybase-2.5.0.tar.gz 35012800 BLAKE2B 46cba22bafbfcf519e658a05db349f047a622f30d6ec03d5e8b3c637e7d3351188c65b0725853c4c62da30ea1d4388d19c9a430a9c4d06b14712daca05c468d2 SHA512 05313c4373ffc8fc41097fabfd13fdbf4d0af789257bbbc4a9ff0500ab3ca9c9d5d50ab62bc38b7328aad3cbf631aa55fcd1a74b5dc73f3d31e76851733d7d5f
 DIST keybase-2.5.1.tar.gz 35005254 BLAKE2B fc397f588ef8d24343510742ef5ecb4b60804a3b5df4276e4efc95fc9e2965b99571c266f93e949e07ea6502a50d109a5ca736183365ee2a01eb279e187f87f3 SHA512 e077ccf3b949f6c94e5fd7bacf326db0acb1d862aa6b9088748cc4003d55ad6a92e0a78376253ce26d7a997f7f08a151f9de24f162b9d66af7788c11bb9fbcf1
 DIST keybase-2.6.0.tar.gz 34597277 BLAKE2B 3380cf081ed4e0c211ca47164a5d813e0ca647b004d8e54aae4ec51d24f0cd26437008dbdb2e81cf5372c943c2181e424918425cf11687b0629dae8df5020ada SHA512 25515e69e86c870b45852e93957ec37c7af9bbe3a4a8f8f2cb1ab9f4d02236b9de57fc6294b93aa4f6378ee8d33e03a2773aa445db5d8a34c3fbfe34eed256fe
+DIST keybase-2.7.3.tar.gz 34648144 BLAKE2B 6da664847640c35b1028868651e31b99fd154520942cb9fc3922565906b288c9b808c7368199ec3a37216e1b2c6930f2951b58cee543a72fb69d96006bbb33fa SHA512 0b3fc5f7830862ffdddd70606bbe2fd2b5dd2e5e4fb24349dc57ed0e8f2bd0cc9a9aba0f00b8080f910d877db5f092757d209f01de83f7113ed9d99aed68342d
 EBUILD keybase-1.0.48.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-2.5.1.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.6.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
+EBUILD keybase-2.7.3.ebuild 1305 BLAKE2B fe25947ce4516417eaaf427eacc71513b6839e53e31e440298e75f4427108a7c6f6d0fcbc0e9e5b388a305a2f7149a7ff58ef1ee7b32a7eaf17d16e0bb6fcf86 SHA512 36496057ccfe5cb5aa103122c3681136d1950bbe6de331496298730e116f021d7552cdb2030d3cbfd124d6d77f20478bd7beb30c432ff3ec7f64a4ae05ae2bd3
 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.7.3.ebuild b/app-crypt/keybase/keybase-2.7.3.ebuild
new file mode 100644
index 000000000000..0aa18c80d292
--- /dev/null
+++ b/app-crypt/keybase/keybase-2.7.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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-2.6.0"
+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-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index a88e34a2b16b..3e3eec296f5c 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,4 +1,4 @@
 DIST libmd-1.0.0.tar.xz 254852 BLAKE2B af0d3c645a18262965e708d678cb30c7ed168af8055885b08084fafd7299e9aaea95efb8437ffa756e43c5bb75fac99af067c6a560f3bb2b8b93ee889d5e664b SHA512 54c3cae1308f7686a1f642d25ae5d8cfb0fce2b98b33cf5e2891682893715c7de7e9700c70a6bd7e4ab4cf7f54c87643b259319e09e03f529b70d273477fc8be
-EBUILD libmd-1.0.0-r1.ebuild 582 BLAKE2B dc9ea8576239171893a8970f8cb5a8408fbd7187e6ff7d2147a6c315f771b1a94a1eab205666f72eb2fc6040d0b68503b946cc862c5f2d6e4c44b731f39a2a29 SHA512 d886f84b33ba392de775b49fa8283ca792af3d3dbcd3b0c09f778f94a97d61778e3d869f80318dbf25c3338a1a1b844143d243808f1373d213158d3292b7edfc
+EBUILD libmd-1.0.0-r1.ebuild 602 BLAKE2B d32db5fd5e30d1631edd14ba23e3acd42d372a1155b1539d15a7b1876ca80ea3692aa7af0b04bb8d811c80bb8371d047d4ec6d41a799b04304961ce76b4f2c55 SHA512 7be5cad811559162ea98e7e40fca972491d14d03fa3312356f0f80902a1bcdace2168f0ff12d762effb7ad31a786edd4b36dad0d48da6b3e38270fe635f12a4e
 EBUILD libmd-1.0.0.ebuild 386 BLAKE2B 03798470d2403edab2cb52c6dd7f36abf86ae1590642b7a46c5166adac60e272fae28f72f0384a2bf80763f2d814211b0aa4d562a43829a9236b1a47f4637107 SHA512 6a7cdfc8a8a1a271e328d03f60634b94e3901684af86659996b082a3ecdc858c7b8345d66edfcd0667863bb964f61d116ceb5e9850599409d362906692762b74
 MISC metadata.xml 217 BLAKE2B db2fea1f008893d22d3d43f938c7b7fc7c035cfe58b04e1652b74e3c6a6f35754cfee5351ab5cfbfe286f03ff558b83167764305186d6a15ff10dfa29639011e SHA512 d1543d516a9e55d1985a460e7b21735cb30b977ba2ee097a43bd220c1bdab573baba004968a2d027d99f1222d3fc06931154e70e47b60a61869da05137af20ce
diff --git a/app-crypt/libmd/libmd-1.0.0-r1.ebuild b/app-crypt/libmd/libmd-1.0.0-r1.ebuild
index 61a43ba2c9ed..1c96f649e426 100644
--- a/app-crypt/libmd/libmd-1.0.0-r1.ebuild
+++ b/app-crypt/libmd/libmd-1.0.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index ff2e06e67134..707f858e6ea9 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -8,6 +8,6 @@ DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1
 EBUILD pinentry-1.0.0-r2.ebuild 2874 BLAKE2B 8d2d5d2804270af7e717dd8bab0a025251da59ff4e82f3044420f437f0d89c7bb3efa88a7d725deb54635b5006d83b8496c4b29ee0a440bd70e08d8d80390b83 SHA512 944d73b638e782c52faf3596f38d3ebff7e7f4caa3d459cc41d6c4b37a31738782fe3414742d25f61c8749983030c26acd905f0b930db3fec42027ea3be114f4
 EBUILD pinentry-1.0.0-r3.ebuild 2947 BLAKE2B e60fcc295f85e56b52e3c06de406084aaee202398e03a596bcb68918c388074c02687c8bb28b1829ac118df5e98973eebee810a531d55eeae7f0241bb07dcbd7 SHA512 4e4c5c407d4acdcce021564852d24b5c9b7343f9059747a0b5efe4a700315ab2470dd2f15f9242189489338e5a9af47a33c55858d6145b3832a262e638a61580
 EBUILD pinentry-1.1.0-r1.ebuild 2798 BLAKE2B ddbaa44c716dfd7e3289c116f0205df9e5ae522884b37b822e0218d377f9d4b236a4a40969619a491989510a08e4e29405d2df8f1ffe7d040a389c274e6fe03d SHA512 6bff540b8ebac1269a5f79c68fdf7de8cb3f79ca00ada5746ddf7daed5b27f05e7f54caf768fb43b9c7e9ec6ecf43edb1471848170af59f62d38329934f98d08
-EBUILD pinentry-1.1.0-r2.ebuild 2857 BLAKE2B e56f945db99dbd41278ec407d606662da157227a2fd25320a49f58fddf0280d7a61f2b8d2d1a3b48c9b7a665c3d8ab719f3a61d87684fad99a7c67d335c8b729 SHA512 48c7a152adfa0ca2fe342c0107d6cf9a8ebb82bcd678d77f5d99b02558b0fa3764ce172e3aa5af515e6fc75ec4bf5b0d02428483abd4630b9d2b1ee58c8270ce
+EBUILD pinentry-1.1.0-r2.ebuild 2855 BLAKE2B 1fc9bb0f7fd46c9b2d1bb8c8fdf45be5441de46ce2e381e9d677398db3f0b21ab13f58ef39a6091e99533070cec4ce8307ffe0c0adaee61f9a88247e206c9f90 SHA512 f06b038be9bdd1f8af685e5ef7fb9e0a8d787b42bcd052d81e50ede05d61f3bad470bd3e1e353030972068fe7e1edbc4938299b9aa02d97718762a0a84ed3839
 EBUILD pinentry-1.1.0-r3.ebuild 2999 BLAKE2B cf291d49bc8236200f628fb173fc0f4c92aa404e04e50abfd47d05b809e17475e3bf6dc70d7416689c4f3d906a2dd1ad5e85b57862bb7c14e2d35790569c3ea8 SHA512 de1e7a1e6ee5fe2a96cbc057a6de10ccc3a69cad241b8c4300b65211f8ca8faf9ecacfe12ea9642462d0051d89a176549070c03551dd24767ce05278be05492f
 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
index 7c624a0187c4..feff9a9f2e11 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-crypt/ssdeep/Manifest b/app-crypt/ssdeep/Manifest
index 1c7257bf26f7..3b5e60885d40 100644
--- a/app-crypt/ssdeep/Manifest
+++ b/app-crypt/ssdeep/Manifest
@@ -1,4 +1,4 @@
 AUX ssdeep-2.10-shared.patch 174 BLAKE2B fff5447389ca80a63bf8ac422ca8c06aa1d17715bde05e00e9922b57004f807a435cef58d2d32af269eb39c764ba53b81daae4b745f69f74754f83f13923ee21 SHA512 9429c38e22cf100809062818c286419d141089e0dd081c11034d7f62143ef9fe2d2bac0ad67104d448c387b7bd4b84ff364933f363faae3dda527e5e8390ad1f
-DIST ssdeep-2.13.tar.gz 380712 BLAKE2B 8f5e81a7043fce72e05d45aed963067456c0f344ca66dc9c34cbf5206ba1a497315e0219344ac99815b342a811d2af16d2409421311102288e19084dafd80f22 SHA512 26473f1b8801398534c674d7fdd6e87cf4d7862ed91454bb22865f8b6cf885c777250d0d1cdf2c20a28fdf4961c3b21e505e82f37fb75486a9442902d96f5186
-EBUILD ssdeep-2.13.ebuild 598 BLAKE2B b6267e1b8f9bd2fa9393007e8cbf860cdecf799bed0ca967e4704fd4fd9e8e5993ecb6ccad78bc435be4fb044f26cc52a59183aa8976abace0598547fd721793 SHA512 aaf327f091d9974672057796a4fec56b89b47680d47ac5305b13832e1b08968484cddf31be2b2b1769a0e2e00a93f2f0aae01472204111f7d202dbff5824f49e
+DIST ssdeep-2.14.1.tar.gz 408831 BLAKE2B 7e0709a18876a192568e37d1deb63df11f2feadaff7b53c3bcb3a9f2566b18897e50b7543a29ec5cd3132981bcaf4609615793f31fa9cf654334e8fc5a90afac SHA512 a8f87e21f654d482a67709da273cf58808af377cfcb20f189986bad58530e382f8f1d3a5eaf33aa02284015a6fa7ccfc7fc383e487de6e0e4f57405a16537217
+EBUILD ssdeep-2.14.1.ebuild 764 BLAKE2B 2c00880ebae052c3fd6663147e44060beeacf9274b8fb24b2d7b1be57bd925daabe7e9796259b5b14fa14830d80d6086b6d9650f1e104e2b7a013afac1a1f20b SHA512 ecbb7c3a599fc47751a3b7cac607b2c4f9b2e4d272005310f7a226300082c564575a6ddcfaa765f8cf12d9c73fe6b7ad458f92ca59b4d27940c168a5f1142bf4
 MISC metadata.xml 316 BLAKE2B 1916bbf9c489db6a30a7ee238630b4c5b137c1d795ab18183761dd49a5d7bdd40c970c916201c6e217435569f35e7e74ade29f1c3b65b43997dcc0f0f9625d4a SHA512 3fd64f3472e5d036fb4617b2f44d074eff34eeb940cc90c55334712f745b5f4abe02939f423fbf5e28ab6b4eddea2655016711efeffd4707932fe136b0562707
diff --git a/app-crypt/ssdeep/ssdeep-2.13.ebuild b/app-crypt/ssdeep/ssdeep-2.13.ebuild
deleted file mode 100644
index 982b953c49d2..000000000000
--- a/app-crypt/ssdeep/ssdeep-2.13.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Computes context triggered piecewise hashes (fuzzy hashes)"
-HOMEPAGE="http://ssdeep.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DOCS=(
-	AUTHORS
-	ChangeLog
-	FILEFORMAT
-	NEWS
-	README
-	TODO
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10-shared.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-		econf
-}
diff --git a/app-crypt/ssdeep/ssdeep-2.14.1.ebuild b/app-crypt/ssdeep/ssdeep-2.14.1.ebuild
new file mode 100644
index 000000000000..306ea16efa2a
--- /dev/null
+++ b/app-crypt/ssdeep/ssdeep-2.14.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Computes context triggered piecewise hashes (fuzzy hashes)"
+HOMEPAGE="http://ssdeep.sourceforge.net/"
+SRC_URI="https://github.com/${PN}-project/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	FILEFORMAT
+	NEWS
+	README
+	TODO
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10-shared.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+		econf \
+			$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index b7549c7f8179..bd614775bb95 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index 35962b0f8a7e..be4a208e1f57 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-dictionary-3.24.1.tar.xz 880500 BLAKE2B f730276612d2578e7b25121b49be9639cf7a9fc67bda9687285f6d3873d3b825301246447d968b24ed29240a1b0e7fc48d63c8454e704b799eebdf340f5f6da2 SHA512 b3ee838888a97e914add58dd4b61fa096b9488aab360815f2e7b674e7a57b237849a1ccaf107c1e94968e534b24ee24d827c42a3a1b0dfd8c5ef25eeb90456d3
-EBUILD gnome-dictionary-3.24.1.ebuild 1032 BLAKE2B 226863b951121fe5190d892b087237493ce32c83869bb7402026afba37de83c09fa3e0d6b016374194f0a412be7a7dda402af4520ac485d1c6ebcacb3a0fed35 SHA512 0650e59d1c2cdaf26f2c2617b886e80a9118fbb2337c3a1acef5445e0f64327ed87939739821fdbf21fde6c2f594a868a88e12e71a7a7e4bc49a8a7a1068f39d
+EBUILD gnome-dictionary-3.24.1.ebuild 1050 BLAKE2B fa0f6f433e2785c838646926ec43398039e61b501eb70323b745ff471f59c2e29b2240ea9dd608f79eda1530e1676b2b454dee92f41e88e6b9b841792fd64144 SHA512 609a5a40b89a226fe75d14c7e9ed939c45a1b499aedaa977e69cdd7d41da318be31d2fc6de01a1d3cd8b89d315d318c94c852e7027f8a2833000787a7b8e51ec
 MISC metadata.xml 316 BLAKE2B 61e50cf64e718dff6380a8840d59f5679e8f084efadcda41cfb45af74177d1121af1db7485fe57690090b0d1deaceaf9d53733fe39447827643c1785b4c68f3d SHA512 c46d3611dc1954a3229a98892c23aa1ebbc74c572dc5562660fce3390cfb74252515ee3a3048418c855c8165a5cea8e5df1fc10c94f81915eac400d7c58850aa
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
index 21f7fccae549..06730a6ae42f 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,7 @@ RDEPEND="${COMMON_DEPEND}
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.15
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40
 	dev-util/itstool
 	>=sys-devel/gettext-0.17
diff --git a/app-dicts/myspell-nl/Manifest b/app-dicts/myspell-nl/Manifest
index 61ca00a27b55..058edef70be5 100644
--- a/app-dicts/myspell-nl/Manifest
+++ b/app-dicts/myspell-nl/Manifest
@@ -1,4 +1,5 @@
 DIST myspell-nl-2.10g.oxt 868845 BLAKE2B cace4a9750e9e7680c48a414065be3897afd29c3f6908c95021e92ebe050784bc7c7379f0a3ff74fc34c6ee6bb1b3499636c77dc60c757520c6d725735a2547a SHA512 070ef6a5d63a2fb9806f7bbbb1459e40097bbcb5c8ab9babb9195844e387847e2295890b149c0a90aba19e4fced7f3d90d338ba976614fc73c5c367bbc9cf4d4
 DIST myspell-nl-2.10g_thes.oxt 1956026 BLAKE2B cc8a79e746def1f6f1026a77890472005f6ad81a1addf1e86936848b07aa1aa31692151e1f7427f792d0c04d1854ff9a6b56abb755cbbc78e0c4dd1e03e378df SHA512 2a13b97ffee1fb98ba29f74595ff9e29a89f294d82efd2da2e89983ff5a21852a1222bee9a4684dd5df621e1dc5621853e1d87cbf0fca311c8eb9e267598eee0
+EBUILD myspell-nl-2.10g-r1.ebuild 1100 BLAKE2B 0f75b0f3683ac5e4309f8fe2e1d319b554684eab7c2ffa265f18d04349bbdf1476bf69f3ad116e451dd2e025f771d91cbc40b185cf5e24640333281adefe21a9 SHA512 124c2bcbb7bf88f2a216649371f64a296d7dfffb4aca9167283d1b495812f96e2d82ae30aaf1607b54ad837bfd74d67de14aae632fd7430840ec750c9719c715
 EBUILD myspell-nl-2.10g.ebuild 1093 BLAKE2B d37ef2480a0b9ca3ce3d64132f5ff46b43f13a216449093ab1fe793e3f79b44723e3342be7a9ce49e9e06a125569a9c83021fed395e0532f73750ba49cf175b3 SHA512 5de3e7c0283484b48cee4f775d1ed19774eb0177c32096c42a98e4b55618316c556a9154eaf66806a5a8a3a12a94ce9a62ea312e1417a8c6ad88c3f23bfdeaec
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
new file mode 100644
index 000000000000..896c93bf5d55
--- /dev/null
+++ b/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYSPELL_DICT=(
+	"nl.aff"
+	"nl.dic"
+)
+
+MYSPELL_HYPH=(
+	"hyph_nl.dic"
+)
+
+MYSPELL_THES=(
+	"th_nl_v2.dat"
+	"th_nl_v2.idx"
+)
+
+inherit myspell-r2
+
+DESCRIPTION="Dutch dictionaries for myspell/hunspell"
+HOMEPAGE="https://www.opentaal.org"
+# Thesarus is not versioned at all, I suppose we could bump it with each dict
+# release, or when people say that the download uri checksum changed.
+SRC_URI="
+	https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-${PV//./}-voor-openofficeorg-3?bid=20&agree=1 -> ${P}.oxt
+	https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> ${P}_thes.oxt
+"
+
+LICENSE="BSD-2 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+src_prepare() {
+	default
+	# Fix regions, bug #607080
+	mv nl_NL.aff nl.aff || die
+	mv nl_NL.dic nl.dic || die
+	mv hyph_nl_NL.dic hyph_nl.dic || die
+
+	# remove dutch translated license so it aint installed
+	rm -rf licentie* || die
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 4ac4fc6eafb7..a99f225f7f7d 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 6a28cd4c9b31..a6b3b8866725 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,9 +1,5 @@
-DIST gnucash-docs-3.0.tar.gz 92420576 BLAKE2B 95d8c310b3616b44a814c7c5d6e8b1b586eef12831ea967818bef302e0dde3f0ab8e1b1d4fd0d504173625d87d54738a392ad3d53b8bfa079fd5ba87ac3a2d91 SHA512 908694725de6d9595cb73d4b334f157287a864ff7ba1057bdff7c0fb55660c5828a6b5c1e868eea7fbd0fca4b3b594fb3989092f270446dbd56c07479c6036cf
-DIST gnucash-docs-3.1.tar.gz 92421041 BLAKE2B b169d26cb9fb07a265fb5b8fc492fa8b0ed240be094278416d54542dd4ca074b3d4a182421b75d09c1f6c435891c5637aed646f0d11bdd57a9b71cbc999676dd SHA512 4af1f0b895cc928c109ae4f883efd1b483a5b318e02fcd6ca4ff7631ed4e13bc0f89f28b2f8ea895f9e37f596eb7b84e84732dfac6b2d4fe98b7405603149339
 DIST gnucash-docs-3.2.tar.gz 92387447 BLAKE2B dac502975f885b777c1e91a7ea574789947e1dddfd3239c05973ce57fec41a6d78e605ef37aaf721db4aa4d2bc8f2dda7ed76cc4dc97dd49e30618414e262f15 SHA512 a58a583a457377f529223ced083fb64460b3b0c75a423db08c7f9542711be98fd59bd776bf77309ff91d1c46f22a5ae882d8c0a8ec3fc834d7a8028a95028aad
 DIST gnucash-docs-3.3.tar.gz 92417386 BLAKE2B 200f9b8d3006589eac5f0d66300d658f69f5c55078371c5b416e34784835350de9bd40fc5d85e59116022874294f74e259a034d6ebcaf315b1ea9942b8350c7b SHA512 5887171cbe95f545eb6e647aee2d04a26ab9102643acd8d3e5754000613a7fb08e4470777f7dfbfd0d1ed7609de7a6241cd82f5c7d62f632b2e3751b005bc01e
-EBUILD gnucash-docs-3.0.ebuild 861 BLAKE2B 16e5e35a8c624de231dab411108eb463f1d151312c5e33eec0f4b78f3efaec73a505149373297ee0376ea6576e83982325254c19a3e808f733a70c748e4451ac SHA512 33c547e298a0f2d601977e59ad3a19af7036ec4af5aef73de8f0d5fde47e1c4a878b34abd56e6e9fcfa4cfea7ddd9c9c8324ad17b1145a29c80236d55e022497
-EBUILD gnucash-docs-3.1.ebuild 861 BLAKE2B 16e5e35a8c624de231dab411108eb463f1d151312c5e33eec0f4b78f3efaec73a505149373297ee0376ea6576e83982325254c19a3e808f733a70c748e4451ac SHA512 33c547e298a0f2d601977e59ad3a19af7036ec4af5aef73de8f0d5fde47e1c4a878b34abd56e6e9fcfa4cfea7ddd9c9c8324ad17b1145a29c80236d55e022497
 EBUILD gnucash-docs-3.2-r1.ebuild 1665 BLAKE2B 16ad7acf14b9e37dafded93957de6c3246be6902ccea2198832b6dc5409f93ae06bcaf52e091f88d6df6b8327a77198140b67671b0f7a242a0e2bdccfb510222 SHA512 e95eab369275cfac0b5944ae8a0659e5743f44e76c650b78c055246d66c0b953ff8398070b87c3e1f341722b7d51ceaa6896b27b2dc8e424bc9a5e5ae40c3406
 EBUILD gnucash-docs-3.3.ebuild 1670 BLAKE2B f13f7fc2d51ee3c91c07d577c9245b8851ea3891ade3ee4e09756f793bf5babf469f1eb764c7cfa466790d894ce3b1add0ec93f184ccff9d6844380955ad38e9 SHA512 0fc4e16167f525c5aa1d9a6666cc23143b8068bd82c288e828c573554ec6a94d0fcaf41a6973d1eeecf31cbb51bc1041f57be456f04c55a21063711e2f1d59e7
 MISC metadata.xml 496 BLAKE2B a668cda0f44d550b086c539edbd5eeb93092fee992621cbd655b5c30e3bfd658fcd0a65d4140f2f9ba4d368438c224bac887e86e6d36b730afd4a24c195fc448 SHA512 19e5631659fe0153e6f2de3bcc8dc5eb1615dc3e6a3493d71ea0d5e18df48fe64fef31819883add93cd1da425ebea0aa82f62b0052bdc328773b8a3c0bfca26a
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.0.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.0.ebuild
deleted file mode 100644
index 19bdd1d2ff8c..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-3.0.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 autotools gnome2
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="!<=app-office/gnucash-2.2.1"
-DEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.5.10:2
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian
-	test? ( app-text/docbook-xml-dtd:4.4 )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-java/fop || elog "You need dev-java/fop to generate pdf files."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.1.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.1.ebuild
deleted file mode 100644
index 19bdd1d2ff8c..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-3.1.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 autotools gnome2
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="!<=app-office/gnucash-2.2.1"
-DEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.5.10:2
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian
-	test? ( app-text/docbook-xml-dtd:4.4 )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-java/fop || elog "You need dev-java/fop to generate pdf files."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/app-doc/single-unix-specification/Manifest b/app-doc/single-unix-specification/Manifest
index 41ed74991528..74bd6bb2afe4 100644
--- a/app-doc/single-unix-specification/Manifest
+++ b/app-doc/single-unix-specification/Manifest
@@ -1,5 +1,3 @@
-DIST susv3.tar.bz2 2212995 BLAKE2B 91b7f657c5ac92d164832a079bfbbfda3f57ce9663849872176a0b78e280b8851e95ec605a68d887f9d59bcaf8491994d2b5d963d6730c811e26842f1faa2a59 SHA512 b1b8a79112d3f41a3d2951341cd9220566f551e5750378bba5cf786a0c381b064fa1a1cfeb6e76e9c6beb85a893cbb6f90879203e9931e9043bcb95b032def40
 DIST susv4tc2.tar.bz2 3649434 BLAKE2B c09eb835badec0bf191da4caaa7b35ccedfb1512218d3ebb66d0301bbe6404a30df2e3c51838dcd9f91912f41ce3e39478d2c061ac2f075ef678ae20fcaf0ad6 SHA512 cc86b2b4860b1069cb8712ef7b5a9702510f48d6585b5414ff561f85677974c156d8cc95cf29dfdab360c13ecb884e19e2112fe5c6bc49666417c9a744a816ad
-EBUILD single-unix-specification-3.ebuild 582 BLAKE2B 2084ca18b5f46b7d0199d275b359d106010003ba8843716baa046f46e7326bb8da2320bcb1a9914b39b84daa7c808e59c9170a29c00461962db74846561fda06 SHA512 87e773609446afa0228f4a162985cbc0bff3e4aebfa5a703fbbc80ac81bfe90d113ea7385797d91693da403989c90334eb942da1a3cc593d533d66a55cd2c9b2
 EBUILD single-unix-specification-4_p2.ebuild 545 BLAKE2B 2c8805dfbef1cfbbc6f0f60ec3b8bbf4e5fefaac6400b6f081ee1f844509867775f74f362bfc74289b2b5499fcf6c18ee3c65b687a89bb4d28e6bf20660b3538 SHA512 600657ccc422accb61bc3e5b1d4c0e73ae90c84611b1b9396c14a6e5234a299b6e8829ccceb1dd4520329855191120bae566b4c0d246988504a690798cda093a
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/app-doc/single-unix-specification/single-unix-specification-3.ebuild b/app-doc/single-unix-specification/single-unix-specification-3.ebuild
deleted file mode 100644
index 3af7ec6b104c..000000000000
--- a/app-doc/single-unix-specification/single-unix-specification-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=0
-
-DESCRIPTION="The Single UNIX Specification, Version 3, 2004 Edition (8 Volumes)"
-HOMEPAGE="http://www.opengroup.org/bookstore/catalog/t041.htm"
-SRC_URI="http://www.opengroup.org/onlinepubs/009695399/download/susv3.tar.bz2"
-
-LICENSE="sus3-copyright"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND=""
-
-S="${WORKDIR}/susv3"
-
-src_install() {
-	insinto /usr/share/doc/${PF}/html
-	doins -r * || die "doins"
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index c2d8c0cbc9e9..2715198b1ff8 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
index 4e6e015cc9e3..ec1cfbe74c3b 100644
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@@ -1,7 +1,9 @@
 AUX bvi-1.3.2-fix-buffer-overflow.patch 622 BLAKE2B 8f081bfea567a7781923b8e95af76495eaaa03c3c2e20450d38c64064467350eeee05668a28ae5bd2ad46f4b0ae013b8c5dba50d0c25be258f1286a46d40f6a9 SHA512 87549381d8c9ef76c4153917faabe2b814dab9ecfb59e9b0cf75be5d02b917fd88266ad5e846982c8d40b80b3304f7efc912bd13f83f48e7a411f663cb10a28d
 AUX bvi-1.3.2-tinfo.patch 1342 BLAKE2B 709237b9c353f8147a5592dae56eb1189fcc67e624f089b4da1c67632eca62109573975d66066b38324fc3fccbc1d317cad01f09986d26d90cd5556c9fbe2e87 SHA512 0ebb9dd499f1959eb760f84a15f2ebeb98b60a576459d05f1280ff48b94ac167d5e5a1dc5877f69198e1fc91e7d3a652a6e4a1fc49fb94395191cbadf07d7cc7
 DIST bvi-1.3.2.src.tar.gz 170444 BLAKE2B 5726fe730b6751a768247581cfd4dce0a40a9ce8e8852c977b62ddd72bd8d8db7b66535a7c711b6837e10d63ee7aca9b5bdb6ba3ea0288d823e684fcabbd79b2 SHA512 eb8a01602751b61c471207124c90346375ccf34ba85e661143f6da8f113f48070d132e98213484bd16d0b6b4c8d0fa27776d36f18cac21336076ca35bcfcb58c
+DIST bvi-1.4.0.src.tar.gz 139202 BLAKE2B 151d86214aa93bb0a7f383c8de13b8a15fe2cfe7f5892dff52b80e362c049b49082abe846ffaf68ec69201bbffba2fdcc5d00f744756c49ecb26e16ab93bb13d SHA512 119cfc7350f81c324e77243f948cfb91cd9a3122fef307616e4756a99732f69131aed2a26ebe48048698b9c211a0214255f3e6605ad2cbf479a14a4a0f88923c
 DIST bvi-1.4.0alpha.src.tar.gz 128821 BLAKE2B b285e9aee5c510205684296afd975fdf4f392d9743561aa8c80c69785eb1b431886fb8664adcb1393b514e77b2e3df562d7c253427364891c36e1c56d4313975 SHA512 75cf0ff27809e2c4213da72b022e012003d6ef272d734d0c18f03d5cb49bc891b4d3d40a9e6bfff226906062fcd3e319a7503d09409fa2023f5ba1d434e66217
 EBUILD bvi-1.3.2-r2.ebuild 1165 BLAKE2B 217ca4311f9982e69b93a95466f6469f19ad2770e5697331f3928eaae731e286401e3e1e42883840f7d602fb3918634dca3feb3b12aa0e2a0d45e6a046b16c4b SHA512 cac249798af37841330e91e49d74d6badb65d8df69aa0512721bd3d47c8961e2c0a940efed31569863767485917d9ce3c42ee888a244a60a229920241b987002
+EBUILD bvi-1.4.0.ebuild 479 BLAKE2B a159b21ae853cb0ae42abc09e3a61538d88e3421bd9814bd09c185e6eaae1282858e47148562ad86591c5884cfa8aa252d28c02f69f57ae8388a96d5c3e7de08 SHA512 985f30bb894311c7b7d291ce81819963208c89e5a7f11ed9d1ccc037874dd696bdb2855f10f0c1e1b7ab6cfaccb708e0523a00b2b63c49d91000151799c73105
 EBUILD bvi-1.4.0_alpha.ebuild 1058 BLAKE2B fe2efcc9311f8b1945710f5b7c1705f909b8a5eea9b6f29acc65a845a175f3bf17214c32539941318e1bb877066b8cd91c0716d220b865984a14336663eb07a2 SHA512 065cad807372427e57158a12ec5ca095dd7a63a54db8e3a79a607766f79edd05e589b82606261d963eebdac37c3dfb87404bfc4b09106e299d435ef925b3b9cf
-MISC metadata.xml 212 BLAKE2B 0d954f27d3e4eee78d51082e8466a4e81b7ec1963e72b1ee613219df33a75debd7df85cf94226bebaf76f39f37ea84441abc6144dd703db2e9766bd582356e30 SHA512 79e460fd0f3b1b82105557fd8070ecbab50e70ee4c65d5ae289fc31808ef0dd947bfb33483c31b812100ec48864af8551250f739f54ceac2876dee264c4e56c5
+MISC metadata.xml 436 BLAKE2B ae30a6fe4365b8954c5ae093014aa1ed918f0d79f7a3f2a4a7a40992465b6b06ec22bcb9335dcde96328cd9c366a7dafbeed295089b286aae3ebeda06f77f09d SHA512 456ff0bd21bb62b2f6d98d9e50db4dd7d8924c48f19358aecf8b35f935478f59ce0fecbda47d8272f6785ef49e9eff5b82eb565a0dd0b0e928c091f86861e958
diff --git a/app-editors/bvi/bvi-1.4.0.ebuild b/app-editors/bvi/bvi-1.4.0.ebuild
new file mode 100644
index 000000000000..c1c5bf10bccf
--- /dev/null
+++ b/app-editors/bvi/bvi-1.4.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Display-oriented editor for binary files, based on the vi texteditor"
+HOMEPAGE="http://bvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bvi/${P}.src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
diff --git a/app-editors/bvi/metadata.xml b/app-editors/bvi/metadata.xml
index 02e1ad7c6d7e..0025187b728e 100644
--- a/app-editors/bvi/metadata.xml
+++ b/app-editors/bvi/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>chead@chead.ca</email>
+		<name>Christopher Head</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bvi</remote-id>
 	</upstream>
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 1d763237f733..38fd161003cc 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,9 +15,9 @@ DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25
 EBUILD emacs-18.59-r12.ebuild 4412 BLAKE2B e560829c6de369456f7a77ddba9a6047addace03406ca36aa7778473d470484e7a675cd5eceabc491b86a5a7140ecaafdb86fab9db5974d0fd817f4b55d48a85 SHA512 11144b4d09773faf8ea2fe054695b5a045778c0cfdf0314c9eb8b0af34526eac1e0ac6f245955361e99807eadea9e8c0d40411907e14e2845ce2b91f0d404245
 EBUILD emacs-23.4-r18.ebuild 11525 BLAKE2B 392ea4005890b48531149ce7a061a6b8154eeddd1abfd35ed98bdb8742cb0aee2c1e57690662d7842704c4402e43bfabccfeeceafc7f8c6e43d2946149c6da92 SHA512 12f3f575c67d5022782fa268bd0fbecc9b032f0b36209014dac73f90a63025d6586c4805c6214f061bbf2d527e1b8b7bf209641490ad8268fc86fdc450f54b8f
 EBUILD emacs-24.5-r5.ebuild 11261 BLAKE2B cee3de84ec6fe6b9a7592d090be1e0902c49d4f460633268e96547ea96f67d8cf590f0584780f057ed8fc0e79502e309bc3ad2105996ae5c7b315a03897cb16b SHA512 b0fba024fd12174d6fa55a87a7b5f3318adb23fff00d18508f3fb7cbbe1f4abb8bc565596b30321554c5619dacb56bc1c2eb13e09b046630852de690e06aa253
-EBUILD emacs-24.5-r7.ebuild 11335 BLAKE2B 4ef016333217c51f118a96d26eca3425ebfe58b0cb404f9cf5854148776ff99c2f652ee64af6ae049edac14b46305113efa12b327206d65b6475a3fa95b1bf39 SHA512 f790bd6abc22ac56f3adccae5d75380f594fa4b02434b0c5e3a6d4fe5df08ae9994438ee7a7a3af12a3a806d0869b8ecd229cd2d3b6d9ff12fc970b43e402705
+EBUILD emacs-24.5-r7.ebuild 11334 BLAKE2B d4b0daf78d6ab2502802841e7ae558922dd80244a63828968c74c6afdc5b48d83fe617c6717c4952346c1100aa7a64238f7658153a7a2050b88e7fa4ae52f0ad SHA512 565d86dde791f61f1fe5b19d90fd0e5d0bb7df04b04dc21519633e4cce3e7b873af1c6306377a222e1eb6611066ef9f3de198265926086d80a0fa32bb589f582
 EBUILD emacs-25.3-r4.ebuild 11753 BLAKE2B ab01076daf8c815a4bd7de83d652c8293219d9e4fb25002897527c0aaa87ac00c11f36a0c8a10e4e474629007950c67792ab3cd8e243cb046791fcba1fea19ff SHA512 dbae997b01fa892ce34dc554d1566e8c2a530c3246805b6028ebaf45cffdfb878e1fd98d827c0f6f3e37be52ae38b2929223161b234a5ed9e2dbfda6d786c191
-EBUILD emacs-25.3-r6.ebuild 11634 BLAKE2B 51cd2dac77f4c5aac03f065ff6f3fa5015a1b54ec6b4f3c5e5577281bcd16b0c17cd9a2f68da0f88839517fd6d41694938b6a287b7f07b1e05957460f8da54de SHA512 c1dc674aac430beb665a923926e33ba5ed56cb2332f998cd66325964cd64b75bb5cb11f327b95a0714c19b8353ff02bfaafd6a38fc5b0363994704d3e44b1df4
+EBUILD emacs-25.3-r6.ebuild 11633 BLAKE2B 4e730bfcbb25f3702595e671082c40b3c2ff0390696589ecd773b4c2cea98b5be76a9c9a1aeb247d67126ad03d6c60909d41b21918196f51adbaf576fdb097e7 SHA512 4c1cac124fe7d55af480e42a73496a223085b76f36e0a0c718bf4ddb351be192a4a2e26b424d090964db27978760a9f96565409349f73b5224e6e0dbe3cee326
 EBUILD emacs-26.1-r1.ebuild 12177 BLAKE2B 8849e102d459b68740e5127372c3ccdd07b64368cf6d364acd27ffcee331347dd2ee48d38204215b839d4682becc0449b104f168a86c1982c0940c1ab4f5389f SHA512 77b4ce147e8e091979d01ee111539111b2854a09caf85f637dddf3d2bac27509224f7437a6ed8f5321566042e1689b3c13d1b1485fdccfba5ef375e82367bdad
-EBUILD emacs-26.1-r3.ebuild 12280 BLAKE2B e0c0e6e52e221152df015618abd7484d9432fc21fb055f11c43a6bdf20f28ae43f67418f4905312800b12720086356321a66b14ebf32c3a2c58bb85986c9fa95 SHA512 7d46007b31ced805eacc53fc14c097c32c6352e83947116b96bb2d5cfd8e591d7bf6d63a5cc57511c4695860b7872853b784a1571cdad4f6bb98ce5464f3d8ae
+EBUILD emacs-26.1-r3.ebuild 12279 BLAKE2B f796e7c780b54a3f757c1b96be19fc683979aa8ecb3809eede44f4e379679af7183b2ac3be7e08f4216ec5931052a36a139947afe4b3f56e4fa014471703f623 SHA512 91a87e38ed266d1262c18c301079db9ea57b43284edc5c4963a35554a9063e6c1db0b0088ddd3c24e6f057b09e4b54193aa8c980c93e779eda4938113909ed27
 MISC metadata.xml 2849 BLAKE2B 28cad6b703be952825ae288ee9218209a2f38992bc8381ef60a0f6b36f57971bd133ccff284f0bc20d03a15d89c71950c21a2c32b3f47bd80bb793f5e439e1e0 SHA512 0db4dc9edb2a6f9e917b4648b887ec12f016f77d3332e67bf8962a0ba592908e34108610083e76f4abe7cd2f52a07bb75e8b14089b1ca87c138e711c2d31ff9b
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index 36e4dd3d9b6c..02f2b7403212 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index 27c885a8f56c..7a897cef6fd5 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-26.1-r3.ebuild b/app-editors/emacs/emacs-26.1-r3.ebuild
index 86d5ccefa1e8..fd64fea868e3 100644
--- a/app-editors/emacs/emacs-26.1-r3.ebuild
+++ b/app-editors/emacs/emacs-26.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 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 )"
 
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index fc15747bfd24..c985812055c2 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -2,5 +2,5 @@ AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5
 DIST focuswriter-1.6.10-src.tar.bz2 10202594 BLAKE2B d7b59dc2c37d87ed0d1e58358906a9fef6f14a339e12a50980d17cdbed043f604bb355edca956af61b5fcaa78f68eb35b54ef85fc08dfa00dfa747893d6c1200 SHA512 8c12481af77fa4353840f22a6aa54c5264041afc141d9746e097e42171a9f274663940fc0c5e5e2c91ef677190c682a195cb775199d4b8cc2b1ad040542e2e61
 DIST focuswriter-1.6.13-src.tar.bz2 10342493 BLAKE2B 11086bf7d35cc392169e7b6de57ea0b65c919bef0d845946893641f705ba0522bdef7244f4035104188d3fdf0dd3b6ad30ed6bf347b5ce8c422d7eea6c6dc714 SHA512 d78719d5a1e25afec8035759d0ebff17728e856fe346d4d8fefd38a15eea3476eb1c6e2aca30955ac148fadd4701a9c4a83399baffe93239a18b93854fab9858
 EBUILD focuswriter-1.6.10.ebuild 1091 BLAKE2B 48012e9467003fd8c88cc144cf6e587e1f8992b77bc69ea3e20c0f5bc271f6f4a45c944b8a8985eccb3e36db99d67c4efbd2a372fbae51be09df46083a01fe34 SHA512 175c404d257142889d797e67f6f47c7bb1756c253ecc41f96a79f26c604ef24595c1bfc5ae2739d0814938fb2c6240779da39cee0821b3aeab80c7b073c728d9
-EBUILD focuswriter-1.6.13.ebuild 1093 BLAKE2B 7ea0feb52027aa668d78ae5b01eb42ff682911251311f627ace120c22f889e8239f126db26c9d49a181110d3b0a4f3c230194bd99e9657b7224bb679797342df SHA512 207a2a1bf4876f782c17096c94dfe360ca8c76ad77891582f6fffc56ad493ab7ec6894f27d1e19d697b11a51bed5a2456929824a383b62f5de7e5ca12844db23
+EBUILD focuswriter-1.6.13.ebuild 1088 BLAKE2B ff94d0c7953ff3e0c76462014c9b401d7998eadc3cb8699667a931d7b8a70ca4c1685a78a8b0350a6124e1d32598cc1d8c4442983f46aa90e45920b4fe363a9a SHA512 631f853d16a2759b1e7e359fc020aa48eb82df1f41a024c4665485277ff4a0d7d9dba144f782425e12dc4ca9eec0506698fafb687292fd595a11cd6e789c36de
 MISC metadata.xml 392 BLAKE2B dcb98e8e1ba1c2a2aea89d380d6a2a1a1cfd5fd9773f133aa7603b88384c91911429832a7117026cea4c092c1c84dfe440a2c4da875ce56e1da7e8670aecf068 SHA512 beaf6206dfa83ffa8acbae3d5f8c5a9041974588a18de742fa049d4ff0b8d75bcb2f40ab081418cdd2987709566b678f7016b1be0acb02deeec480cd25ddf3cb
diff --git a/app-editors/focuswriter/focuswriter-1.6.13.ebuild b/app-editors/focuswriter/focuswriter-1.6.13.ebuild
index f61c59e9ba31..b76907d10e21 100644
--- a/app-editors/focuswriter/focuswriter-1.6.13.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # drop qtcore subslot when minimal Qt is 5.10
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 3c6925e0c47b..e7b79a6c9c5c 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST gedit-plugins-3.22.0.tar.xz 1314512 BLAKE2B 2910a101da94112b4190d96111013675234c109bfc37e05ff98d53e87e0a4db8e5a4a6823017153d65a9d554cfb95fed000d56d9e721faebfeeb033fc7be2901 SHA512 5560b48c0b21b535de7247c39653c111439f9cb138025d7e3a600b94babbe060777c2095160b7e5ea39b8ba8be520ea3966b0ffc2ec15d17ea0bf814bf58748d
+DIST gedit-plugins-3.28.1.tar.xz 1350468 BLAKE2B 4fd50ad7358581f5e27f0c3a7e127d4e2c0e7189c039daee1d8d7ddf7062846e1aebb634b3edd998c9a7c11840c71f56fe4eeca78ea2e91ae18db814e4fd79e5 SHA512 6258c627cd3fa2948375c30e87061375c0d09ce2c70301c2d10a403e6075d1df09e928a2d95b72f6d7950a31a720af645fff2f7f59a281d2999948beb56c1dc9
 EBUILD gedit-plugins-3.22.0.ebuild 2297 BLAKE2B 74878dee069c2eeed548f80084f2bf1b63cedeab159ab84b54bd2bde7ae5446b5b6facb77e0cc08184a6bfd7502508bd0e5e6130c412247b822233fdae060ada SHA512 dce1562f0c1882d55feec31b82f3261d5e026f1e7fc1eb295941769c2da57d4feba03637f266f2a370fa5efb9f33b90253900eb40ad1d065b2762a6f08ea9ad2
+EBUILD gedit-plugins-3.28.1.ebuild 2296 BLAKE2B 2be407a0435544e95cb64a26d9f6a566c3f4e4de49dce24739322646e8e67a586cd377ed33b6de7e1d17469af163abfeb9547655e9dd732a7405ecaf3bf36d1f SHA512 719d99894d7f9d9c51acb12e8f2b7f9c070fcc019c67f02cda00418b042cfb3220607afd4141c72e42d96588d69401ab5e1ebb95a5376111874f3491207c6825
 MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild
new file mode 100644
index 000000000000..fc8347b9387f
--- /dev/null
+++ b/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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} )
+PYTHON_REQ_USE="xml"
+VALA_MIN_API_VERSION="0.28"
+
+inherit eutils gnome2 multilib python-single-r1 vala
+
+DESCRIPTION="Official plugins for gedit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE_plugins="charmap git terminal vala"
+IUSE="+python ${IUSE_plugins}"
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	terminal? ( python )
+"
+
+RDEPEND="
+	>=app-editors/gedit-3.16
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libpeas-1.7.0[gtk]
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-3.21.3:3.0
+	python? (
+		${PYTHON_DEPS}
+		>=app-editors/gedit-3.16[introspection,python,${PYTHON_USEDEP}]
+		dev-libs/libpeas[python,${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.9:3[introspection]
+		>=x11-libs/gtksourceview-3.14:3.0[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+	)
+	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
+	git? ( >=dev-libs/libgit2-glib-0.0.6 )
+	terminal? ( x11-libs/vte:2.91[introspection] )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# FIXME: crazy !!!
+	if use python; then
+		find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
+		find "${ED}"/usr/share/gedit -type d -empty -delete || die
+	fi
+
+	# FIXME: upstream made this automagic...
+	clean_plugin charmap
+	clean_plugin git
+	clean_plugin terminal
+}
+
+clean_plugin() {
+	if use !${1} ; then
+		rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
+		rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
+	fi
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index ebec070cddf7..dbf29575dbef 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +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
+EBUILD gedit-3.28.1.ebuild 2330 BLAKE2B 5d7a9fafc3fb89e7aa7db115cb74657a809780e5e9b02954599592f725dde9ed2083eeabf34b858728da3ba15657579bc2b37652bb8c49e45bf4731ef8a8836b SHA512 105d6ea96961a2de1d9e201a281bc9df76d45f239d1b471836befec4b276c95a05e4c498d26e0fd3ece305e6316698c1209e6931a3d45fe49c5f5fefd1e019d3
 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
index e9119e64f700..5887754c0694 100644
--- a/app-editors/gedit/gedit-3.28.1.ebuild
+++ b/app-editors/gedit/gedit-3.28.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -48,6 +48,7 @@ DEPEND="${COMMON_DEPEND}
 	${vala_depend}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/yelp-tools
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.50.1
 	>=sys-devel/gettext-0.18
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 19bb9e353278..64123b86d7ff 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,3 +1,3 @@
 DIST ghex-3.18.3.tar.xz 1630720 BLAKE2B dacca0b015dd73dca9ea7a5303de8b6ef981c7e4fd93dfdbb0782ac61f073381fef7d5a1dcb8a88f2d31319fd9583ac6f556ed6856b5ba7d3449bbf2af2c991f SHA512 e03b154a22db000a5994c68bb72280113e69e7ef210f86ab2c6578e77daabf50bac8eb620ffaad5a7eb776d23383478cbdc7fb317fa336cef55173f858519023
-EBUILD ghex-3.18.3.ebuild 511 BLAKE2B a08be53d503c35c3a49e008da97bbdf7dd38bb44ff37ae7ea7b94fc6fdcfd8459fd6ac26c4e56b4741db05d8d9a7b6a05ac33af29c0c958175fe012e121ffb62 SHA512 c2549dc8e027269994643c0394dcd494406bca8d2bbf36f6aa1f0f0bde781df0b8c95042d7c2ec3e04c499f86602f3034ffb681b733222538670c4e3aed6b315
+EBUILD ghex-3.18.3.ebuild 515 BLAKE2B 6aa5555afa45caf838b4ac12c51eac0bc649a93b04670ff869e446a0f73031829809c10bdee66ed63262266fcb92d0bb9dbf7a5c7aabaaaa3d359ef11f878c78 SHA512 e2726043a37cd14228c21c47c8cba5cf2add49fc669db221c3635940f8c688250823c4933d5e4d28377d0aef09713345dd579ae3c4f045d78e021b447a3984bf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/ghex/ghex-3.18.3.ebuild b/app-editors/ghex/ghex-3.18.3.ebuild
index fb9c73c07e41..dbf011b8d722 100644
--- a/app-editors/ghex/ghex-3.18.3.ebuild
+++ b/app-editors/ghex/ghex-3.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/leafpad/Manifest b/app-editors/leafpad/Manifest
index ca0da40611f4..7d959f95ca5d 100644
--- a/app-editors/leafpad/Manifest
+++ b/app-editors/leafpad/Manifest
@@ -1,5 +1,7 @@
 AUX leafpad-0.8.18.1-fdo.patch 557 BLAKE2B be91b5e3c6159701303254d6c7c753dce3b19eb05046f097470b83ac0f21c52bc05da4862dedb05f658fd47efa8d349a4ee5b3361192076abe6ed451497ae7e3 SHA512 db3badb11cb1244035f988c7a512a0fc2559fdd0afa4c7fe432e3d600648526f9f19d42c939466325931819e229eecafb49b4c75837a01d122eac214fd66de32
 AUX leafpad-0.8.18.1-format-security.patch 821 BLAKE2B 2b26cdc2ddc6cd0047c40fcf0b4c1f4bab4aedd422169ccfcf88c58db60320f7fa75367ba6a6d46ba9fa28c6d7275f79dbadafb393e0e7e8f78352ebc7574c03 SHA512 d8a39dc2412055a41eeb7966ff7e3884489d584726501233f67d8d56bded6e50467bcc60a4c2d0be972c0eb6732d9bdc7d00f69845737b049e8b0cc046f87a64
+AUX leafpad-0.8.18.1-truncate.patch 590 BLAKE2B e12eec5436ba8bf2972a8e0bd09fff7a762e14a9a6a5ffc12817e6c051e6b702c8fa0c0b3fcc554759e4f88d58614f63956d3f4cd9580c7ba09d9a8f65892c2a SHA512 f2c3fcaeeeec9eee0dac5088c40c675deb2b01f313125443f76a869741dab5f88ea181a6b29b8f6ad1f8bbb708887cd10ee1162e121ef5029a4a43eacf14a7fa
 DIST leafpad-0.8.18.1.tar.gz 289117 BLAKE2B 41f01f9b9e031c749a4b1a06d32edbcf9b0f0a694141c79bb462fce29d59f87efa52bc4a7faf270ce28f04697deb6350fe4e26317d28450d7d785a01007c06c2 SHA512 1caad712967f634f585ab32e406534b5ce2c5621008c1eb5b2b48f17ca0f48cd834ea2ea1c67eda4053fa84e8727ff0e708e99d3b5dad838dcf0701389788257
+EBUILD leafpad-0.8.18.1-r1.ebuild 898 BLAKE2B 5ce31f8a162e5b56b9bef2045fb09f325aa401200d27be22aead77cbfaf42e0638f3e5f5407edfb5c0464b6f528ef4d5bd66892a804f9290a92d1f04e86a57bd SHA512 cf295724965db1a6da2852bb2ab3337c866e6da35638899b2eb0131b2033e92b83ad7b853d824d5098bfe7f7d4f639772a57cf4ba78cf2198c035924fae6f63a
 EBUILD leafpad-0.8.18.1.ebuild 826 BLAKE2B 51a19dda328c9d214a88a45f1df00462730fcfc758cf29650c4e587d2e8b2e0c6371f556f2aec9150ad6eb2dec2d6534122d63cfeed4701d7e9a0c2e9cef075b SHA512 08dc550cdec48dc11200f548341120674c6f81c17808dd99792f14d9b67191335a60d6b28b7ef80b86434d11fc3dbc7a7382944228bfed678e74f1b769a6e840
 MISC metadata.xml 205 BLAKE2B 14c07c010c87fb27c21a84c8c1a03a4f7a145a8de84571b9a112a7bbf9f0677a8cb7e02a61d9d9dc322174839e0f5e6c721a07988a835b189ac6fb97c39527ce SHA512 e94eb3d2eec0ffa8543112e75899eb7f2c582d2e5615a82b568e907e488f0a8b400946550ae39c7d278a8fa8c8912e6221e3013868ce7e218abbcf76b57cb693
diff --git a/app-editors/leafpad/files/leafpad-0.8.18.1-truncate.patch b/app-editors/leafpad/files/leafpad-0.8.18.1-truncate.patch
new file mode 100644
index 000000000000..872792199c80
--- /dev/null
+++ b/app-editors/leafpad/files/leafpad-0.8.18.1-truncate.patch
@@ -0,0 +1,20 @@
+diff --git a/src/file.c b/src/file.c
+index 5e44a43..4c90a37 100644
+--- a/src/file.c
++++ b/src/file.c
+@@ -190,6 +190,7 @@ gint file_save_real(GtkWidget *view, FileInfo *fi)
+ 	gtk_text_buffer_get_start_iter(buffer, &start);
+ 	gtk_text_buffer_get_end_iter(buffer, &end);	
+ 	str = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
++	gtk_text_buffer_set_modified(buffer, FALSE);
+ 	
+ 	switch (fi->lineend) {
+ 	case CR:
+@@ -229,7 +230,6 @@ gint file_save_real(GtkWidget *view, FileInfo *fi)
+ 		return -1;
+ 	}
+ 	
+-	gtk_text_buffer_set_modified(buffer, FALSE);
+ 	fclose(fp);
+ 	g_free(cstr);
+ 	
diff --git a/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild b/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild
new file mode 100644
index 000000000000..e1af082f7930
--- /dev/null
+++ b/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A simple GTK2 text editor"
+HOMEPAGE="http://tarot.freeshell.org/leafpad/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+RDEPEND="
+	virtual/libintl
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fdo.patch
+	"${FILESDIR}"/${P}-format-security.patch
+
+	# https://bugs.gentoo.org/657462
+	"${FILESDIR}"/${P}-truncate.patch
+)
+
+src_configure() {
+	econf \
+		--enable-chooser \
+		--enable-print \
+		$(use_enable emacs)
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index f7c12f5ecd2e..397aaac2f51a 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,13 +1,7 @@
-AUX nano-2.8.7-minimal_compile_fix.patch 1206 BLAKE2B 72265b226a23282baf1d16fe62637a3a6123342da9ddf9fa205d7eaafea710aa62fcafad1188cc1c08bd537be3ddb98403afbfd035fdac5712d6bf24bf2fa40e SHA512 1ebf43ca322c0cd49b7a3ffaad33057d4ac899c7a930569df124e54f713b28ece7e01aa625db91ece0126a07228256d188154bce464bd4c1a97945d686d9f0f3
-AUX nano-3.0-misbinding.patch 1517 BLAKE2B 2feac73d587beaed77649b7d6c92e3eabd411203e38f8b55ae874dcedcd4813ee6abc6b4e54fb33236c380e263257ac7e58b1c027446a4bc6caf5ab067a50c47 SHA512 0ba212b5b076ddb81f8ca723cc9c8656cf00375a913afe35036c84b3a3de23b773d11661d92d389275b26cb090a20445825fd91648579fb8a340b6992930f6bc
 AUX nano-3.1-enable_tiny_build_fix.patch 828 BLAKE2B 70899179a7f4d27202b7f70886f8ef73719e37d44c0b538432986bbb888a2d03620d7e4822550b1f5648f6733cbfbc6585c0c86ad02208cd38f7fe3b543c4e99 SHA512 b3ac68f0d64fcf4b92d59768342debefe24d8e4cabee9a649a94339ff4b0d0d014cd9f4c3a3dc32ff3e84850dbd1f71c5525d3c422cb964f380d6504b1985eec
-DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
 DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d
-DIST nano-3.0.tar.xz 1508248 BLAKE2B 1af09a02b9a7c2aac5ce48e9df12d682d1b213885330e5e936c674602249ca6227fb190611a03d9253c93749e892c1ef5e9569c72bb7df749b6b0888da90fdcd SHA512 120b606d65672a905e9ef9f3b55381cc62b7929abeaf409ea4af6be9f51b3d038e6e68f082755cbb7e198f0fb5203e0f4796c6c96ebd054d9a2241b313fcdda1
 DIST nano-3.1.tar.gz 2923258 BLAKE2B d8e8e0da8ed669940a2c5604d476a147cb61f96db03bc0bebafc458f4766561962c94f22f84cf714ece7052670c987272029d3fd6cbda20e5f09460d3bcc0ce1 SHA512 86cc1210cbc45ce2e392d6888e6e22a9214afcc24e95657f7bdb4c59476b4bea2e8ebd8b23c06b32f3acfe1da6da689135f25fcf09db34f6b1dfcc838ea5528f
-EBUILD nano-2.8.7.ebuild 2296 BLAKE2B 0136026fb72a5b1978057e7f9ae7348bd3fd32f47c64316a5b65eb8c74689f8effc4011ef6c1e058cb22f05df001a80e9c7607cd616d8f731ab9f052239389da SHA512 bef42b685a5afb428083378cb084b9c8a0ce679ce4aedf59056eefa4976543babeab6b411f3c002d878fbc50c78fba1e91ef24cd20ae9cb62efd40b36a770305
-EBUILD nano-2.9.8.ebuild 2276 BLAKE2B 29928b676aca3a4b9321e5458c88983021ddf2c688ac722dc0a6be231091717a6f31c7949077baf2657407b301b1b08b71e629911a962294f25476726a53aef7 SHA512 c44028414fbb1503ce1ce4e62820fbf18a5d07c669f21cdd5a272b662292bc11d6afc71cfe3446682768382185eb02086d8dfb46d0ddd3d66735d9ce24d71209
-EBUILD nano-3.0-r1.ebuild 2329 BLAKE2B ba5b2dcd3e38887a4a1e21789fc2955bfdd9f5328a65edc159d728b97b93612bb4addb9b239cd7175a1a51346f77018597fed1e67bc4a55751570a2320c1079a SHA512 439aef7945a4dbb37a9132a922179440d011d7b172318cd875f065db8a20f92ed58c6c4c507d28dfd5df5eedad02bbbb199b3982378c6ee0fde8db216c5e990d
+EBUILD nano-2.9.8.ebuild 2272 BLAKE2B 5c338053fba942e24c5e0da0073afc6dc6e78a09997ce82539e1ba069f23f6045b1f6299b7623294620839ba7067e5c08a66bf71263d8c52f50069b684d97f6b SHA512 f7b44353b2568c794e91f56177bab887f3e68bc25ab48a124dad3895e9e6a1691c8ec755da31b1c59985ab7f7a879cd1c10b91842bb28fa057839a793991440f
 EBUILD nano-3.1.ebuild 2337 BLAKE2B 13b03e1a7d6c511f07205e717ba46db0a812ea33b83fea240f19260558e789d0d6aac75dec56373290673c008166c6caa4de5f574ec3fa3319ab8e3e8b97d52e SHA512 488cf08e5b026af85c5ef01a0160b5e6c6973c14df1162e0bc66dd1a7732a06ce35599a8b733fa4056e76db4906796b7e6c6fa6c1f84b5dd83bd217756c905c0
 EBUILD nano-9999.ebuild 2279 BLAKE2B 6a4a167d78038e7c982383f87a94d8ced33eab3beb9a7765ec4de6832ffcc21a8105e5f8d2799e9df25545de224cc687365110db0f80cc6ef1578bd0b52e80ca SHA512 b9e7bbb9924ce98ed642ec963dfa0a585fd8bdda095fe19029df3b61c98d769e88760afb535e2f5fd728d1e9df39bd9c29524c90b1b3779b6e5d374917652955
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch
deleted file mode 100644
index ef8d74910164..000000000000
--- a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Tue, 29 Aug 2017 19:28:44 +0200
-Subject: tweaks: fix compilation when configured with --enable-tiny
-
-When moving the cursor to the top-left corner, it is not necessary
-to compute leftedge because firstcolumn IS the relevant leftedge.
-
-Reported-by: Jordi Mallach <jordi@debian.org>
----
- src/move.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/move.c b/src/move.c
-index d138356..ce276e4 100644
---- a/src/move.c
-+++ b/src/move.c
-@@ -121,7 +121,7 @@ void do_page_up(void)
- 	openfile->current = openfile->edittop;
- 	openfile->current_y = 0;
- 
--	leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
-+	leftedge = openfile->firstcolumn;
- 	target_column = 0;
-     } else
- 	get_edge_and_target(&leftedge, &target_column);
-@@ -152,7 +152,7 @@ void do_page_down(void)
- 	openfile->current = openfile->edittop;
- 	openfile->current_y = 0;
- 
--	leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
-+	leftedge = openfile->firstcolumn;
- 	target_column = 0;
-     } else
- 	get_edge_and_target(&leftedge, &target_column);
--- 
-cgit v1.0-41-gc330
-
diff --git a/app-editors/nano/files/nano-3.0-misbinding.patch b/app-editors/nano/files/nano-3.0-misbinding.patch
deleted file mode 100644
index 2312edcff06c..000000000000
--- a/app-editors/nano/files/nano-3.0-misbinding.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Wed, 12 Sep 2018 13:18:17 +0200
-Subject: [PATCH] bindings: when Ctrl+Shift+Delete has no keycode, don't
- use KEY_BSP
-
-When curses gives no code for Ctrl+Shift+Delete, do not fall back
-to KEY_BACKSPACE, because then ^H and/or <Backspace> get bound to
-'cutwordleft'.
-
-This fixes https://savannah.gnu.org/bugs/?54642.
-
-Bug was introduced with version 3.0, commit e6429e78.
----
- src/nano.c | 2 +-
- src/nano.h | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/nano.c b/src/nano.c
-index c7e0ca2d..74e12439 100644
---- a/src/nano.c
-+++ b/src/nano.c
-@@ -2580,7 +2580,7 @@ int main(int argc, char **argv)
- 	controlhome = get_keycode("kHOM5", CONTROL_HOME);
- 	controlend = get_keycode("kEND5", CONTROL_END);
- 	controldelete = get_keycode("kDC5", CONTROL_DELETE);
--	controlshiftdelete = get_keycode("kDC6", KEY_BACKSPACE);
-+	controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE);
- #ifndef NANO_TINY
- 	/* Ask for the codes for Shift+Control+Left/Right/Up/Down. */
- 	shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT);
-diff --git a/src/nano.h b/src/nano.h
-index e1042759..7de34bf3 100644
---- a/src/nano.h
-+++ b/src/nano.h
-@@ -588,6 +588,7 @@ enum
- #define SHIFT_CONTROL_DOWN 0x414
- #define SHIFT_CONTROL_HOME 0x415
- #define SHIFT_CONTROL_END 0x416
-+#define CONTROL_SHIFT_DELETE 0x417
- #define ALT_LEFT 0x421
- #define ALT_RIGHT 0x422
- #define ALT_UP 0x423
--- 
-2.17.1
-
diff --git a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild
deleted file mode 100644
index 9c57e32be25e..000000000000
--- a/app-editors/nano/nano-2.8.7.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"
-
-inherit eutils flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P=${PN}-${PV/_}
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-minimal_compile_fix.patch" #629510
-)
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		--disable-wrapping-as-root
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-		$(usex ncurses --without-slang $(use_with slang))
-	)
-	case ${CHOST} in
-		*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
-	esac
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/trash
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
-	fi
-
-	dodir /usr/bin
-	dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.9.8.ebuild b/app-editors/nano/nano-2.9.8.ebuild
index ab539d9df7ff..a8742cb86825 100644
--- a/app-editors/nano/nano-2.9.8.ebuild
+++ b/app-editors/nano/nano-2.9.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-3.0-r1.ebuild b/app-editors/nano/nano-3.0-r1.ebuild
deleted file mode 100644
index 44b716308be0..000000000000
--- a/app-editors/nano/nano-3.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-misbinding.patch
-)
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		--disable-wrapping-as-root
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-		$(usex ncurses --without-slang $(use_with slang))
-	)
-	case ${CHOST} in
-		*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
-	esac
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D%/}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
-	fi
-
-	dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 1a05f398b56e..86b477818939 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -8,4 +8,4 @@ EBUILD neovim-0.2.2-r1.ebuild 1878 BLAKE2B 8f2ddcdb916fe4ce6e83626c1b86ddad10253
 EBUILD neovim-0.3.0.ebuild 2001 BLAKE2B cfd33059aafd48996a178d0955f0311b0cc85e4e902de22866b8e3e0bded37f0b33ceb7a52db869267d4f9cb8117b80474fe088f2e5a425eed847b0687b3890e SHA512 4096e62bfebfc2e23a89d569e4c841039515aeb451ba3620e8bc860befb710c061b31b2f3ae2be69ee8db404e08ca2a2959604eb806c57c9a609cef2ba29ea25
 EBUILD neovim-0.3.1.ebuild 1972 BLAKE2B 8510f3a3fc8bda84eae188e6b1e8286ccd646703a1f1a85dd7e3ccecd5d0203c35e24221b94cbfebfc4bcbf8eb069a7d22bd581f94b3f179c9952fd54198fbac SHA512 9315a6c2d61b554f8638bbbe5ddc4e4307123965b8b18d3c7de1da07d5cc1baf32855f68bd85db9ce30253da7ee4584dbbe12a1cd3aa4cfd5175548ef27ed169
 EBUILD neovim-9999.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5
-MISC metadata.xml 720 BLAKE2B fda1bb6780b08bc3eeef497f01932dde422aa9ef5bdf3e713248c5d1234b1511b6c534ec761b2979861526a1eac54d63b36543bf2b36d0a6a0a2edc9cc58caea SHA512 8ac4d9b779ee3b6c13c16a7071c0f3a67ce867ac9538f3e89a420e16d2a8d2671f901fad4df6e4709141e5af10290543dfb5e79150a0bffb994456150c4fc77f
+MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index 57f11481bec1..d9da9e93722d 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -8,7 +8,6 @@
   <use>
     <flag name="clipboard">Enable clipboard support through a provider</flag>
     <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
-    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="remote">Enable support for remote options using nvr</flag>
     <flag name="tui">Build the neovim unix tui</flag>
   </use>
diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index 98850a53ce6d..606a9bba1cec 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,6 +1,7 @@
+AUX notepadqq-1.4.8-qt-5.11.patch 664 BLAKE2B 442012f9ad0046abf7ed6206d69db42b49b0f9d407ae99a4e7a6df0d5340dfadd664a3e8f97a90beb41014bba668174ca6090c9ad46dd090013ca3ffa07d03f5 SHA512 584e7f4c4032719c42eafcc9ff23031c7e980084aeac3044669a136be33ebc4fe0b6e6e61dbf1a70195953949ac05fae9150f97fb369bc9399ddae099a744549
 DIST notepadqq-1.2.0.tar.gz 2082931 BLAKE2B 41f81be45b5e36d58c2632fc9d03c6802b1a99f5ff9603682f3e1c6907143767f57034f053677d8edffae68a098ddf56d2b90e57fd9884442d80749a670f9d4a SHA512 4b6b3e646add4dc21b4d4ddecacefa59785e6525d52ecc17ca418ba14f38ef9024f48af6db3538d195327942971eb9ccf0b5567da58ba15facad332b47742717
 DIST notepadqq-1.4.8.tar.gz 4418925 BLAKE2B 91d993fd952609a7255c6541e97580b5dd01e6902cb6a84b77da7fbf8bc52a9a07ba85845d33e5801d539d8c560804b69947df965550dfb981e228330ea46ffd SHA512 fa1937b75a378fb81486a871a5b736f6ba216cd4b71f99e342e457de65ea034c2ee4d2c9f42754c4737671ccb1083fb1e6c946240ab2094042125430578141fa
 EBUILD notepadqq-1.2.0.ebuild 890 BLAKE2B 86363e195a2347add303903a1f9cf3930e0ad09549bc85d9b9dfe65a113c64cffac65a8b43b74458f6c9da6e80fee6252b0d3742f85384e0a5bb860cd92f3c95 SHA512 946d934e8d931a76bb5e958bfd7b46a2713229837a64059c9ea60e7ac790e777de41dc9f5e3cdb634d9ce424bf93942596ca7f16ec28ddc830cc868d85ab4078
-EBUILD notepadqq-1.4.8.ebuild 1008 BLAKE2B c65cc138faee367ad66004fc41b875a7fd4e2581ef6675ac9bd3d17bc4e032210e6a855a5566e5411b388f4acdcddf349a68ac96cca7c31d58fc5013e3ef1a76 SHA512 68f988d84a6f6535d2edf92a2b46dcee09b10019a62e9be01ac97eb4c5a6f26588939e4e4937592e6093a5e9227e63f310aad7363428d866f56cb76892c126d0
-EBUILD notepadqq-9999.ebuild 1034 BLAKE2B 39c30d0811cab55d047285f1aebc5788fb09f06a59668d5bae1fb42ee891ff56e5cd205c955614f060c10e2cadc92053d85cba06045ada2c9174501130913e13 SHA512 f2bf51e64055fb5f5b2560be7926a37327416b690a932b7778b32b04b83be72ee0e3aab0ebf68ec6fd47234fcb6faca097f818a696a80306e962bc11e7bb3082
+EBUILD notepadqq-1.4.8.ebuild 1051 BLAKE2B 54985b4b7040b5f3e424a5964862af89dd02c95f3ec37ed7a0b875cc0c613ee86c9b1197909376332aa8f7999eefc3280fbb4cd86e58f2d12c1b24df1703a6ef SHA512 670f79bcafc25bdb446bc01389407222a237594e8144a925fb6eb4be85cd4938bea673184b707bcdb7a5ae805547cfb064d4b520b200b89780e803248e99c4b2
+EBUILD notepadqq-9999.ebuild 1031 BLAKE2B 0a78f7bf57da204287bfcfc851937827020839bd8f44a3dacd4965de1b54f4b0811cc1e5057e0751cced0aa61cb7f113aed5a5dbaac87166221a1780b31a36ac SHA512 92cc2853f7324bbb185fce2db306c1ea557f26cb265b4795393b46862fe99646ebd7f65bb78ef4861e35e91ce4c2fd26bf24c222c70b8b0641fdb30a9edfdd62
 MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
new file mode 100644
index 000000000000..d656bd920940
--- /dev/null
+++ b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/665286
+
+From 8fabccfe2682583f5190b84dbc1922cce9c8d82b Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 23:23:08 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ src/ui/EditorNS/languageservice.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ui/EditorNS/languageservice.cpp b/src/ui/EditorNS/languageservice.cpp
+index bbe03dc..9a0f212 100644
+--- a/src/ui/EditorNS/languageservice.cpp
++++ b/src/ui/EditorNS/languageservice.cpp
+@@ -6,6 +6,7 @@
+ #include <QJsonDocument>
+ #include <QJsonObject>
+ #include <QJsonValue>
++#include <QTextStream>
+ 
+ namespace EditorNS {
+ 
+-- 
+2.18.1
+
diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
index d85db1653d71..0ce0b7273f52 100644
--- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
+++ b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,8 @@ DEPEND="
 	dev-qt/qtsvg:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_prepare() {
 	default
 
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
index 9db258a39568..8d386f10ca80 100644
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 6e8d6993747e..e0da9e8deace 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,5 @@
 DIST okteta-0.25.3.tar.xz 950956 BLAKE2B d177db59b5327f4e75157c99fdac2191de9a7ef63433635ccf8f11ef4dc4ff201942c9f68383d720b18c26a9e7335bc1181ea4f0e36491b34b27e6c7dc469c9e SHA512 f27b0c2ca3c5f1ad838af847e08c53c8f8f3c386921bd2e0d5e833902659477196e6c6b72a428443e2be9013928c2151c1889ef33d59404815a34d81560ef2a7
+DIST okteta-0.25.4.tar.xz 950344 BLAKE2B 3a3daf5cdb9e349e145a22afe836c78e18972e1f984472267cd182630b8f8132e10efb49cbc9fac40768aef4dadbb678afa26eb965642f07f407030f15b71dbd SHA512 d9887a90efbad3bb2caa0d3bb12af27708b77d54a90cd0da82eace7ea6dfc2efbcea3d7dc720bf4a088a823a8ed9edf75ab1c3680aa6d99c640d5c9e4c385e16
 EBUILD okteta-0.25.3.ebuild 1600 BLAKE2B 4a63d9f28a852ee3263a76b4498d0a08e7bba942b003d0c8d426b09940360eef677f4f9785190b3424400734a3b802b485b3fe573d9ae0df8fac5c59b96b6662 SHA512 4e5fde23df3ce32108e04afa9bf47905452d45b8996e13c37b4cf0e3606f45ad6fc7cffca361a2b03796d08881f13608150ecbe9e6aa00849ae1f20efeece1c9
+EBUILD okteta-0.25.4.ebuild 1602 BLAKE2B 8a2edfd625497bda5a473cb97cf5c7bbb1e5f259d5ea3afaa083e0cb1d3777488c33c11294c36bd73429cdc96e6c4356b89ab322f1e1b2ec0de81494f9195ce6 SHA512 eb26056d13e1037fe24d802d5585f59f7d48f0651ec03284072256015266cba27c031c788a2d1c7911dc4b833d7f976dcb4598ded6daf551942cdc8cd5fd30b1
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.25.4.ebuild b/app-editors/okteta/okteta-0.25.4.ebuild
new file mode 100644
index 000000000000..891f51eadc74
--- /dev/null
+++ b/app-editors/okteta/okteta-0.25.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index a9d5d6b395b5..500e3d91072b 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,3 +1,4 @@
+AUX xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch 597 BLAKE2B fe33a2ca16954fbfad90b19edb6c9e161fda4fc26650a4cccbe717bc23143dc54fe5689b83e135f16d1e3fc57c8794eb01e2760db927917fd1f858140d712d5b SHA512 e859277afe276a2e358a011a7c1a9d61e554463ebbe79985bcc159b49495eec076f24595b3b43ae3a3210797f59a92b9944f1a59754556a8322a9ec1d0d5d7d3
 DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d
-EBUILD xmlcopyeditor-1.2.1.3.ebuild 921 BLAKE2B 1011f90af104285a39642c5d8d04f8dcef32d7523f4fcd07f8c39b887aed86bd5547173aed2a700b528089df8b97e3bdc0f42f62d7ee00dfd927dfebc9418e76 SHA512 c226e815d601d6551bc97a85d731379fb627d64a49f0e8a6e3993b4667968604fa3882b7a94b75713f0ff4f417038f71ddd92a3f34e0c0abc824aa242cc0e3c2
+EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 946 BLAKE2B f14b5b0458bd945036024ba1e60e6cdd93657e89c2f8c6f9c9dfc1121b83ac84acec69a9313223942571258cc9b8376641dcd40cd67f1709ea6ddca2aa280130 SHA512 7ce718160893430a6bc75e5a052798013964f28b15409f08e4d499068b58199c208292e6b6c9fe042dcadb9a17ca1cad62edcaa488ae0e3438243ced97be60a8
 MISC metadata.xml 299 BLAKE2B d4eb8befeca3801e2b1c8762bc4fca6556be50259e1147ceb1f69ea9d952415e608c5c8bd117947cf1a67420ffa9a86dde85c1d1d3b388f59634764702b909e4 SHA512 8dd8d77282bf225c1d1f040808c10b766a361ac70d0c27a643d1c7a8654e2737570bd3f58238c907047decfa88ccb904ba2399d700fbbe04409c2269b89d9ef9
diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch
new file mode 100644
index 000000000000..435b777b43d7
--- /dev/null
+++ b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch
@@ -0,0 +1,19 @@
+--- xmlcopyeditor-1.2.1.3.orig/configure.ac
++++ xmlcopyeditor-1.2.1.3/configure.ac
+@@ -139,13 +139,9 @@
+ AC_CHECK_HEADER(expat.h, ,
+ 	AC_MSG_ERROR([Expat headers not found]))
+ 
+-# Check enchant is available
+-PKG_CHECK_MODULES(ENCHANT, [enchant], [CXXFLAGS="$CXXFLAGS -DUSE_ENCHANT"], 
+-	# otherwise Check ASPELL is available
+-	  [AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"],
+-		AC_MSG_ERROR([Aspell headers not found]))]
+-)
+-
++# Check Aspell is available
++AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"],
++	AC_MSG_ERROR([Aspell headers not found]))
+ AC_SUBST(ASPELL_LIBS)
+ 
+ # Check gtk
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
new file mode 100644
index 000000000000..d56c500752b8
--- /dev/null
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit autotools wxwidgets
+
+DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
+HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="aqua nls"
+
+RDEPEND="
+	app-text/aspell
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/xerces-c[icu]
+	dev-libs/libpcre
+	!aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+	aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[aqua] )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-util/intltool
+"
+
+PATCHES=( "${FILESDIR}"/${P}-no-automagic-enchant.patch )
+
+src_prepare() {
+	default
+
+	# bug #440744
+	sed -i  -e 's/ -Wall -g -fexceptions//g' configure.ac || die
+	eautoreconf
+
+	need-wxwidgets unicode
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild
deleted file mode 100644
index f8f58ca6770f..000000000000
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-WX_GTK_VER="3.0"
-
-inherit autotools wxwidgets
-
-DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
-HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="aqua nls"
-
-RDEPEND="
-	app-text/aspell
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/xerces-c[icu]
-	dev-libs/libpcre
-	!aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-	aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[aqua] )"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-util/intltool"
-
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_prepare() {
-	# bug #440744
-	sed -i  -e 's/ -Wall -g -fexceptions//g' configure.ac || die
-	eautoreconf
-
-	need-wxwidgets unicode
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index f1a3b975ddf3..007995ea6a8f 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
index 8a1d748bb17d..d03d17494376 100644
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@@ -1,5 +1,7 @@
 AUX 70ecb-gentoo.el 63 BLAKE2B aafdd070c44a1f7f4aad23ee1d0ff39f1816bb46fa1e667ef12eb276d1877ca18a81c43ae66c285574b85a089255e6613c92dbe751d382280b42613976829cae SHA512 984cfbfa398bd60008dee83721a55f5c6cad0a71caf0d7cc194a84f0d7c061a9a99398e40e90f0a9cf79d2ff689e374c860612bea16e9fa0049d7a82edc56283
 AUX ecb-2.32-gentoo.patch 3430 BLAKE2B 8d373b5ebc1064d5b2fb713f6d3bc31ec34eddfeb9b9519e655bdaab0ced4e4c4aaca03b3013d0daeceaca20f9210625b84d76264be24d9ea99a5745336c0f06 SHA512 1902cec83e62c9b65a62a1fd4a7c8e2ae309b3bd2217b6f821a5a047cf3bdda24b9b5c68e672c1555196a7d28ce06c22398ef15c3c0e6b87bcce1e15d3c333fb
 DIST ecb-2.41_pre20140215.tar.xz 565404 BLAKE2B 135aa4a71bb41e78933604c5e549d8a163715061c7946e90a115cf802499f9a78884e554cbf4fd4edc9b5856b1f32b3189eb3e1e2537b16e5dd57cfe3ccd1ee3 SHA512 bf87bdd38e7ddaeec044fc56d56f7c456ef0a1922f50b962f932bf739895f046387bab7a934439e749fd7e838d9f742938408f4f9cb47079440abd8c1ba181b6
+DIST ecb-2.50_pre20170728.tar.xz 562144 BLAKE2B 922a1f101d01717c5d078fbb055903c43e91360061b792e96e9aa9421d19df2cd47f7e69aae6dba4f188e26682d2a758ff8aa57ff500e5b6fdeaea6920b21a25 SHA512 074738cc323b595caf3d34d6eaa08d6a1a8d3a53762c9bf48b751ab25a16a26a8c71984996b7e7616f4999a0876c6d03751e1e45b68aad712020778da387a59d
 EBUILD ecb-2.41_pre20140215-r1.ebuild 1226 BLAKE2B 1cdc2a77228d611fd8ffea0f7f7136d0fbe7a519a0ede55eb06e83a6fb1098ebf8314bc1aed6086bc129c9787bfa4f28654c1082fbe953b4e90a428da0f554d5 SHA512 9cf484eb1e4cd0a895eacd2730e0d991b62d6bb3187ba096583e2c6a091496efcfddd86db61368c8bc2e83acf7fe0716791dd6620ddfe3ea064fc93ca093bbaa
+EBUILD ecb-2.50_pre20170728.ebuild 1191 BLAKE2B 13d7aa4c1eef3d532f05529e44f9c7e044e16d091faa6589e2e7e8abf7c07101544ccf19be2a905b80e980fb2873ed1fe222c85ba8fef6ff2fd308bba5c12691 SHA512 21128dffa364255c202b1e7b630bba0b20decf7bacdc2885edee40a5822c01ea277a8b7b40fa767a3ac7e1835e9c5f039a9deca45a27c1ac263f85001603f7d0
 MISC metadata.xml 1593 BLAKE2B 611c6e5a6f1bf4bcc78dcc3fd35e6e01067162d7fd4f6f0186f94011e9d4e154eb343189302713ec911fc70e00f603b08f2add5da2acf9272d5d3f90db1387e4 SHA512 613a3f9a08c5f467de2190b4de2a794c5f8cf8ff1fc3bca4328581be199799d01a312391176a6469643e4cfdf8aab757dce922115910f282931783993d81e392
diff --git a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
new file mode 100644
index 000000000000..15d6ed4c6d14
--- /dev/null
+++ b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Source code browser for Emacs"
+HOMEPAGE="http://ecb.sourceforge.net/"
+# snapshot of https://github.com/ecb-home/ecb.git, created with "make distrib"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="java"
+
+RDEPEND="java? ( app-emacs/jde )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+SITEFILE="70${PN}-gentoo.el"
+DOC_CONTENTS="ECB is autoloaded in site-gentoo.el. Add the line
+	\n\t(require 'ecb)
+	\nto your ~/.emacs file to enable all features on Emacs startup."
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-2.32-gentoo.patch
+	sed -i -e "s:@PF@:${PF}:" ecb-help.el || die "sed failed"
+	eapply_user
+}
+
+src_compile() {
+	local loadpath
+	use java && loadpath="${EPREFIX}${SITELISP}"/{elib,jde,jde/lisp}
+	emake LOADPATH="${loadpath}"
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITEETC}/${PN}"
+	doins -r ecb-images
+
+	doinfo info-help/ecb.info*
+	dodoc NEWS README RELEASE_NOTES
+	docinto html
+	dodoc html-help/*.html
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c2060b4c1305..626aaccb34f0 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index 57d63ae0b1a1..43f10b71f17a 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,5 +1,5 @@
-DIST fuse-1.5.3.tar.gz 1627487 BLAKE2B d942f0131ce713e8592abec6443015aca3f1ae73739f1db0eae84a19e4320fd8bffbd7d36afaf65b08cf059305f85a8854d39d46519ed7abd3705b11156d069c SHA512 6596f789a685c46752c46b2432953c0d9abb620b23541cdbfc066c224fcba47ac7be75db678e2ff76622a7d02cc81b7dfeae672dfdaee1085d2ae5f768a4d8c0
 DIST fuse-1.5.5.tar.gz 1629577 BLAKE2B b4765047507049b2fa3547d47384df2c5e6de75b74b7aa8d3549ca47ae6f3dad53a37fc48112db86426ce3d2d84711aa029d158c75eba89214761ed82d7ab57a SHA512 186635b632df9767b9ffcbba484370adc47833bd06240474db9c4dfe88b03209e15fc0c86a2f200b2cc7bd95ad93bf1f93f38d7f669b5c163f68e80802fb1041
-EBUILD fuse-1.5.3.ebuild 1711 BLAKE2B 91bd43861b0adc2e12b4e2db17d2f4c1909380b8b939b441ae4d34477ff9b7c317419c33abd17003f4c5e554c69f836425b33057f67d178e432f3ca7eb4ea784 SHA512 ac190f7174f18ae7c288a544b39724ce0014e2b38c95ff8f7626d64b96172ddbe27271a377fd5b3728f3d8d6c2984a17e2351d723d84e134d2827f30e7bb6404
+DIST fuse-1.5.6.tar.gz 1634711 BLAKE2B a581c106c668f0342b4a3b4ebbc0e92e750806e59d067798e23da02284cbb9a17cf580c5b6369144863fbf64b12326ea2982e4d83e87354d62ff51926e3293de SHA512 84312e4f83883b36d06f2b96ded1bfc71675cba71a0848f4cbb5a233a1d1c06466013d2655d759397f32d6d67d6ba26b2b6a5041796cb9143cd0b354a88fd589
 EBUILD fuse-1.5.5.ebuild 1711 BLAKE2B d81e148140fb353bb82cfef956bc946272e49f6c3e4fb121dfc0e75d472c3e0821b244529eaed00b4b4a251e776dbab62fbd99d042134ba0f88e501cc44fcfda SHA512 d2274c47e7ef1ee7a29c12d59033a2f2f34b33d7d7e9cd8a3a80402a7f5c38bd8b16e5a72cc1b71cd6d9cb334c56077571b719d6e85e89c3959f957c675d2c6a
+EBUILD fuse-1.5.6.ebuild 1709 BLAKE2B 4b993e540c8510a608912b733b8bd42311fe4e1afd392255fa1be316f424ef4efd375ef5dd16893d6298ca261ac6a816e04c338473619e211a147fbeed6091d2 SHA512 d2deeb6bed41cc69ca423d91261cdf84f2ce027d91d54fb9805cdf142674173766033a75616be58ab22c950dabbce215fcff786662da23862a4ba7cc42faaa1f
 MISC metadata.xml 731 BLAKE2B d157625420632cf041ce0d877f243e6d2fcfd62f8b487691bca757ed38e5d5173aaec623528b3e33cbcc09347464f9c26c3c50190dd28ebdd2f3b86ea0609d51 SHA512 c0a922b5cc6900b9fa7d219dc1cecbed616af7f77d018065e8b5d6f6da6350c4d9d4ba3004b8f34ebc97da22c7d4f4f8b59119098877c199abcc334dff933342
diff --git a/app-emulation/fuse/fuse-1.5.3.ebuild b/app-emulation/fuse/fuse-1.5.3.ebuild
deleted file mode 100644
index 913346a242fb..000000000000
--- a/app-emulation/fuse/fuse-1.5.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
-HOMEPAGE="http://fuse-emulator.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml"
-
-# Only one UI back-end can be enabled at a time
-REQUIRED_USE="?? ( backend-fbcon backend-sdl backend-svga backend-X )"
-
-RDEPEND="
-	>=app-emulation/libspectrum-1.4.2
-	dev-libs/glib:2
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	backend-sdl? ( media-libs/libsdl )
-	backend-svga? ( media-libs/svgalib )
-	backend-X? ( x11-libs/libX11 x11-libs/libXext )
-	!backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) )
-	gpm? ( sys-libs/gpm )
-	joystick? ( media-libs/libjsw )
-	png? ( media-libs/libpng:0= sys-libs/zlib )
-	xml? ( dev-libs/libxml2:2 )"
-DEPEND="${RDEPEND}
-	backend-fbcon? ( virtual/linux-sources )
-	dev-lang/perl
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README THANKS )
-
-src_configure() {
-	local myconf=(
-		--without-win32
-		$(use_with alsa)
-		$(use_with ao libao)
-		$(use_with gpm)
-		$(use_with joystick)
-		$(use_enable joystick ui-joystick)
-		$(use_enable memlimit smallmem)
-		$(use_with png)
-		$(use_with xml libxml2)
-	)
-
-	if use backend-sdl; then
-		myconf+=("--with-sdl")
-	elif use backend-X; then
-		myconf+=("--without-gtk")
-	elif use backend-svga; then
-		myconf+=("--with-svgalib")
-	elif use backend-fbcon; then
-		myconf+=("--with-fb")
-	else
-		myconf+=("--with-gtk")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-emulation/fuse/fuse-1.5.6.ebuild b/app-emulation/fuse/fuse-1.5.6.ebuild
new file mode 100644
index 000000000000..0e1754ea0792
--- /dev/null
+++ b/app-emulation/fuse/fuse-1.5.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
+HOMEPAGE="http://fuse-emulator.sourceforge.net"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml"
+
+# Only one UI back-end can be enabled at a time
+REQUIRED_USE="?? ( backend-fbcon backend-sdl backend-svga backend-X )"
+
+RDEPEND="
+	>=app-emulation/libspectrum-1.4.4
+	dev-libs/glib:2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	backend-sdl? ( media-libs/libsdl )
+	backend-svga? ( media-libs/svgalib )
+	backend-X? ( x11-libs/libX11 x11-libs/libXext )
+	!backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) )
+	gpm? ( sys-libs/gpm )
+	joystick? ( media-libs/libjsw )
+	png? ( media-libs/libpng:0= sys-libs/zlib )
+	xml? ( dev-libs/libxml2:2 )"
+DEPEND="${RDEPEND}
+	backend-fbcon? ( virtual/linux-sources )
+	dev-lang/perl
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README THANKS )
+
+src_configure() {
+	local myconf=(
+		--without-win32
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with gpm)
+		$(use_with joystick)
+		$(use_enable joystick ui-joystick)
+		$(use_enable memlimit smallmem)
+		$(use_with png)
+		$(use_with xml libxml2)
+	)
+
+	if use backend-sdl; then
+		myconf+=("--with-sdl")
+	elif use backend-X; then
+		myconf+=("--without-gtk")
+	elif use backend-svga; then
+		myconf+=("--with-svgalib")
+	elif use backend-fbcon; then
+		myconf+=("--with-fb")
+	else
+		myconf+=("--with-gtk")
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 1b111fec3518..0a956faa2b07 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,3 +1,3 @@
-DIST genymotion-2.11.0-linux_x64.bin 45096365 BLAKE2B 8686e37a0e1bd0acf1847de40dfff650db6b723b65dc369652114c19fb51554ea9b1c1f11c8e8db568e44f50aaf043617ee263258d04e2e90e6c23bb41a0cf56 SHA512 b128fbe1e27120cdd88a6ac4661031231cc17fc0adf007fa986f7892571db7d8ce259bf6f106eb9e620149572d5ca242ae6032b7360ba7502b208ac18ef98e2e
-EBUILD genymotion-bin-2.11.0.ebuild 3800 BLAKE2B dc2aa4e21e18bc81e20755febd757060c34b66cad5af6b079df693b0613bbe55be6807e4358165fa389b3efc8699a59b0937196a0c74bcf288a988c8d8564594 SHA512 b429aeeaebbb20bacd93e1f63cfa3ff8a5e316c16cf1873cf81f05f4d13ab7f0b0e7f80f4e9cd1a33e617c64efded6ddd5025d84e0561fa1bd8f0e69c8b34545
+DIST genymotion-2.12.2-linux_x64.bin 45850812 BLAKE2B 74c3dfa73818f1d7318235d13acbff79d5dd27fd8d7c8cd246046406aaf8f2b9cdb9e9cb7c44bd294b0a047c2bd1e6a419bd4191dd3e332d82494f358cc9d73c SHA512 31b1c9de1a264f285938fcc62612a6aa74393e88f6075664f3e168c5226e74ab25e72061904716f6b2d33ed77221b8c4605c247090c7e2fd149ea8be96f9b5dc
+EBUILD genymotion-bin-2.12.2.ebuild 3426 BLAKE2B a0dd9c1be92d3d6f88172dc0c32c44175af09b4728f06484286fab1456fdd306f1fefa9fadc7f4e2a9c08a911c5abac56c7e590887fe00233e69210c6415eb4f SHA512 a5457a9151f83c6e09a764e2ba0419fc14b634a7502805c8534dd5763ab876846dcb4318efe35ef340b21b3db9618294e8e6dff9904bb75ad219722797e126cb
 MISC metadata.xml 483 BLAKE2B 1ed85dae79388f3c548163e5fafd2838e1adf9bfc9a9c793ce7f9e7e323f8e3c9e7e2f3190b3ec54a0c598d048c61b6ad67c8eefb3845cd446ea67b01e0df8a8 SHA512 e88ad9fd8c20d5be5569c64544c3f4dd72eb3243d46333c30aaa1b939eb6ce35855aa3e771008b2fff990de5b2e5bf79ca378714e3cf7dc375144b7cd8f5649c
diff --git a/app-emulation/genymotion-bin/genymotion-bin-2.11.0.ebuild b/app-emulation/genymotion-bin/genymotion-bin-2.11.0.ebuild
deleted file mode 100644
index 15acb33f5a04..000000000000
--- a/app-emulation/genymotion-bin/genymotion-bin-2.11.0.ebuild
+++ /dev/null
@@ -1,123 +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 pax-utils
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Complete set of tools that provide a virtual environment for Android"
-HOMEPAGE="https://genymotion.com"
-SRC_URI="${MY_P}-linux_x64.bin"
-DOWNLOAD_URL="https://www.genymotion.com/download/"
-
-LICENSE="genymotion"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 )
-	virtual/opengl
-	dev-libs/openssl
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtsvg:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgraphicaleffects:5
-	sys-apps/util-linux
-	media-libs/gst-plugins-base:0.10
-"
-# note if you compile protobuf with >=gcc-5.1 you need to disable the new c++11 abi
-# -D_GLIBCXX_USE_CXX11_ABI=0  to your CXXFLAGS for protobuf
-#	=dev-libs/protobuf-2.6*
-
-RESTRICT="bindist fetch"
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo
-	einfo "Please visit ${DOWNLOAD_URL} and download ${A}"
-	einfo "which must be placed in DISTDIR directory."
-	einfo
-}
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die "cp failed"
-}
-
-src_prepare() {
-	default
-
-	# removed function _install_desktop_file because happens outside of sandbox
-	sed -i -e "s/_install_desktop_file\ ||\ abort//" ${A} || die "sed failed"
-	chmod +x ${A} || die "chmod failed"
-	yes | ./${A} -d "${S}" > /dev/null || die "unpack failed"
-
-	# removed windows line for bashcompletion
-	sed -i -e "s/complete\ -F\ _gmtool\ gmtool.exe//" "${S}/${MY_PN}/completion/bash/gmtool.bash" || die "sed failed"
-}
-
-QA_PREBUILT="
-	opt/${MY_PN}/*.so*
-	opt/${MY_PN}/imageformats/*.so
-	opt/${MY_PN}/plugins/*.so*
-	opt/${MY_PN}/device-upgrade
-	opt/${MY_PN}/${MY_PN}
-	opt/${MY_PN}/genyshell
-	opt/${MY_PN}/player
-	opt/${MY_PN}/${MY_PN}adbtunneld
-	opt/${MY_PN}/gmtool
-"
-
-src_install() {
-	insinto /opt/"${MY_PN}"
-	doins -r "${MY_PN}"/{plugins,translations,icons}
-
-	doins "${MY_PN}"/{libcom,librendering}.so*
-	# library that differ from system version
-	doins "${MY_PN}"/libprotobuf.so*
-	# android library
-	doins "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender,libemugl_logger}.so*
-
-	insopts -m0755
-	doins "${MY_PN}"/{device-upgrade,genymotion,genyshell,player,genymotionadbtunneld,gmtool}
-
-	pax-mark -m "${ED%/}/opt/${MY_PN}/${MY_PN}"
-	pax-mark -m "${ED%/}/opt/${MY_PN}/gmtool"
-
-	dosym "${ED%/}"/opt/"${MY_PN}"/genyshell /opt/bin/genyshell
-	dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}" /opt/bin/"${MY_PN}"
-	dosym "${ED%/}"/opt/"${MY_PN}"/gmtool /opt/bin/gmtool
-
-	# Workaround
-	dosym "${ED%/}/"usr/$(get_libdir)/qt5/plugins/imageformats/libqsvg.so /opt/"${MY_PN}"/imageformats/libqsvg.so
-	dosym "${ED%/}/"usr/$(get_libdir)/qt5/plugins/sqldrivers/libqsqlite.so /opt/"${MY_PN}"/sqldrivers/libqsqlite.so
-
-	newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool
-
-	if has_version "app-shells/zsh" ; then
-		insinto /usr/share/zsh/site-functions
-		doins "${MY_PN}/completion/zsh/_gmtool"
-	fi
-
-	make_desktop_entry "/opt/${MY_PN}/${MY_PN}" "Genymotion ${PV}" "/opt/${MY_PN}/icons/icon.png" "Development;Emulator;"
-	mv "${ED%/}"/usr/share/applications/*.desktop "${ED%/}"/usr/share/applications/"${MY_PN}".desktop || die "mv failed"
-}
-
-pkg_postinst() {
-	elog "Genymotion needs adb to work correctly: install with android-sdk-update-manager"
-	elog "'Android SDK Platform-tools' and 'Android SDK Tools'"
-	elog "Your user should also be in the android group to work correctly"
-	elog "Then in Genymotion set the android-sdk-update-manager directory: (Settings->ADB)"
-	elog
-	elog "      /opt/android-sdk-update-manager"
-}
diff --git a/app-emulation/genymotion-bin/genymotion-bin-2.12.2.ebuild b/app-emulation/genymotion-bin/genymotion-bin-2.12.2.ebuild
new file mode 100644
index 000000000000..b7acb03d4784
--- /dev/null
+++ b/app-emulation/genymotion-bin/genymotion-bin-2.12.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils bash-completion-r1 pax-utils
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Complete set of tools that provide a virtual environment for Android"
+HOMEPAGE="https://genymotion.com"
+SRC_URI="${MY_P}-linux_x64.bin"
+DOWNLOAD_URL="https://www.genymotion.com/download/"
+
+LICENSE="genymotion"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 )
+	app-arch/snappy
+	virtual/opengl
+	dev-libs/openssl
+	dev-libs/hiredis
+	media-gfx/graphite2
+	sys-apps/util-linux
+	media-libs/gst-plugins-base:0.10
+"
+# note if you compile protobuf with >=gcc-5.1 you need to disable the new c++11 abi
+# -D_GLIBCXX_USE_CXX11_ABI=0  to your CXXFLAGS for protobuf
+#	=dev-libs/protobuf-2.6*
+
+RESTRICT="bindist fetch"
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo
+	einfo "Please visit ${DOWNLOAD_URL} and download ${A}"
+	einfo "which must be placed in DISTDIR directory."
+	einfo
+}
+
+src_unpack() {
+	cp "${DISTDIR}/${A}" "${WORKDIR}" || die "cp failed"
+}
+
+src_prepare() {
+	default
+
+	# removed function _install_desktop_file because happens outside of sandbox
+	sed -i -e "s/_install_desktop_file\ ||\ abort//" ${A} || die "sed failed"
+	chmod +x ${A} || die "chmod failed"
+	yes | ./${A} -d "${S}" > /dev/null || die "unpack failed"
+
+	# removed windows line for bashcompletion
+	sed -i -e "s/complete\ -F\ _gmtool\ gmtool.exe//" "${S}/${MY_PN}/completion/bash/gmtool.bash" || die "sed failed"
+}
+
+QA_PREBUILT="
+	opt/${MY_PN}/*.so*
+	opt/${MY_PN}/imageformats/*.so
+	opt/${MY_PN}/plugins/*.so*
+	opt/${MY_PN}/device-upgrade
+	opt/${MY_PN}/${MY_PN}
+	opt/${MY_PN}/genyshell
+	opt/${MY_PN}/player
+	opt/${MY_PN}/${MY_PN}adbtunneld
+	opt/${MY_PN}/gmtool
+"
+
+src_install() {
+	insinto /opt/"${MY_PN}"
+	doins -r "${MY_PN}"/{plugins,translations,icons}
+
+	doins -r "${MY_PN}"/{QtGraphicalEffects,QtQuick,QtQuick.2,platforms,sqldrivers,imageformats}
+	doins "${MY_PN}"/libQt*
+	doins "${MY_PN}"/qt.conf
+	doins "${MY_PN}"/libicu*
+
+	doins "${MY_PN}"/{libcom,librendering}.so*
+	# android library
+	doins "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender}.so*
+
+	insopts -m0755
+	doins "${MY_PN}"/{device-upgrade,genymotion,genyshell,player,genymotionadbtunneld,gmtool}
+
+	pax-mark -m "${ED%/}/opt/${MY_PN}/${MY_PN}"
+	pax-mark -m "${ED%/}/opt/${MY_PN}/gmtool"
+
+	dosym "${ED%/}"/opt/"${MY_PN}"/genyshell /opt/bin/genyshell
+	dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}" /opt/bin/"${MY_PN}"
+	dosym "${ED%/}"/opt/"${MY_PN}"/gmtool /opt/bin/gmtool
+
+	newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool
+
+	if has_version "app-shells/zsh" ; then
+		insinto /usr/share/zsh/site-functions
+		doins "${MY_PN}/completion/zsh/_gmtool"
+	fi
+
+	make_desktop_entry "/opt/${MY_PN}/${MY_PN}" "Genymotion ${PV}" "/opt/${MY_PN}/icons/icon.png" "Development;Emulator;"
+	mv "${ED%/}"/usr/share/applications/*.desktop "${ED%/}"/usr/share/applications/"${MY_PN}".desktop || die "mv failed"
+}
+
+pkg_postinst() {
+	elog "Genymotion needs adb to work correctly: install with android-sdk-update-manager"
+	elog "'Android SDK Platform-tools' and 'Android SDK Tools'"
+	elog "Your user should also be in the android group to work correctly"
+	elog "Then in Genymotion set the android-sdk-update-manager directory: (Settings->ADB)"
+	elog
+	elog "      /opt/android-sdk-update-manager"
+}
diff --git a/app-emulation/libcacard/Manifest b/app-emulation/libcacard/Manifest
index 1c09190fd5ca..c5994ccc1954 100644
--- a/app-emulation/libcacard/Manifest
+++ b/app-emulation/libcacard/Manifest
@@ -4,5 +4,5 @@ DIST libcacard-2.5.1.tar.xz 325692 BLAKE2B f6ce08f08f359789886a63d4554e3492e8cb5
 DIST libcacard-2.6.0.tar.xz 364828 BLAKE2B 3a07243abb91dab05d89bf073fabb4a0ef7e820765066a8d87e72086b88cc726de77d1fdc5118e05ed47077d76ae0a57ff591a2e4e8623c3484c6cbf00cd025e SHA512 d6dfe6fe6cd2711bf8f71edc134a7caf459fc2a9c4f664ab2f1c28cc9ee8efe7a2d5a15c4dc735956638176e07e22416cad5e8e926aa7cab3fa95ded853f5982
 EBUILD libcacard-0.1.2.ebuild 741 BLAKE2B c4ad46e5168a718992a4e99e248e7c06565873ea4695843790fbe15e007a05ee45cb592d8cf710a6c7c5657560def536a3cb56aace5b4406f174b230330c5856 SHA512 591fae7bd4b09d2176c4369b717ad90c75dc00e7f077228676b096b54dba71253cdd74ff2b1ee3baf9be7a790ca7fc8f85c2d9e210912dac88fc82345ecfc760
 EBUILD libcacard-2.5.1.ebuild 670 BLAKE2B 0c83dde859da1b5fa65f0798942184ccdcd318cc55efc99846839f1c57762e42193e25b7d6269c2e77485e50b0d242fd30fa098874539e68614225183cb2e73e SHA512 47040ae3f979d378bc6977a4e3820603b5f9f43c42ea73fbd087825c43bccc0a5bf971b0ce16eb718d2b1d24fcdf0d5dff5c5f54092e38ec320054ede2d63785
-EBUILD libcacard-2.6.0.ebuild 759 BLAKE2B 5be446fda13238cbcfc71bb7d6462882b54a25436c645bafcf9ef04a0368c13f0c8c0002c9704ad5889009f7eacdd59451d4aa21371de7373d1e63e3bd126ec9 SHA512 80ce1eaa2e93cc016535f6c665750db4e64f662c6ec95845738040035630d985857a2c0f2696d68bd7babadda44d606e8c0b1b1b5e941ad0711e8539083ce88e
+EBUILD libcacard-2.6.0.ebuild 757 BLAKE2B 92317cc46fbf2b782baff942d09381ce1f9deb3e7a8cc181d863a06aaf105b3de840b4ab9b0bc4abd047c8d24e635a5bf00f836088cf1487e1f96d87547a8380 SHA512 beaf4d77d28ee5c3791965e3fabe7d9c33c3d0bbd33333d819c1bde880cccb1a06f0f446a7c4c9fb82924636f962cc219dcc18f4f8bc003be6e69a18b485f075
 MISC metadata.xml 401 BLAKE2B 585a9670acb4d98be5545e72793dd1998e8b1a01b9636899924a4a56cf1593e334bc562c615664c14897c78f975efb9844ff2935fce6ce2a443fbf318c371027 SHA512 32692892c082887a0fd59fe2ddcf68da7d46d6e79bac6d02e2420d80252f92d0a0868ebc100e94f92fdbc8a71155731c31c6fed1eebaa80d296b69aa1f25cede
diff --git a/app-emulation/libcacard/libcacard-2.6.0.ebuild b/app-emulation/libcacard/libcacard-2.6.0.ebuild
index e54815fe8095..5ab2f431a545 100644
--- a/app-emulation/libcacard/libcacard-2.6.0.ebuild
+++ b/app-emulation/libcacard/libcacard-2.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+passthrough static-libs"
 
 RDEPEND=">=dev-libs/nss-3.13
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index a1c95165949a..4ed3690c9389 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,15 +1,10 @@
 AUX de-translation-newline-1.patch 432 BLAKE2B 2b546cd7200f0d736bffd255bbb79d4e997241a35159e052598d4b9da77ca402a0eb90fcb6fae74ac7d9dca9b8383843fd67fb88b6cab474e547d892ac414d4b SHA512 2857ec4e4856d47340163c10644805ee7a65a0095539c7fdc422b874d1af645187a1de0aff4844d9ed0387cebbd82dbb33da32a839b6dda02df4c3d741e88d76
-AUX de-translation-newline.patch 717 BLAKE2B 0e06a23985c5e7485474de15ae086fa79c96d4fb9682abd1846b04cec8fd144faa10149703c03f415e659ecaf500ba58cd8b9733dce0ad803f2ec7683449fa9e SHA512 033ef2d794b3789761a9d7d8ad34b57fc90867b69ff860524a3a4492e738f476b5db85f682481b8f1bf351c6a65c95116e3b0bbea97d88b5dd6ec5cb4f93f2f8
-AUX ja-translation-newline.patch 402 BLAKE2B 238fc0f118070b428abf7b7ce72474f3bcbb80ebbe82b78174e105f07b8f29fd0bf77bc29cb3063951c6ac64cfbf8dc04acde620758be2073657ec306c4b3ed2 SHA512 2992d43cd142ed9b5517c84bbff8b77ef0d7d95364223bb9a51cc26a0ee20184a326882ceff59bc0b0b992c71fe3118cbd7b964ec012b73b16636de4fdf78bd4
 AUX lxd.confd 538 BLAKE2B f020d83375bddc3e88f752d4be49c65893901893eaa572f212c655f4d3c5631b41238ed917c70f16b4c092d82ced13011edd6e91140cda251ebf8745591cd886 SHA512 9ea61647a8da82bc595f78882adf5a6c71483c7adf8965d7d32016a67a0da6510f8dc3d09fd29f77d5f6d5f18282bca3b3b5c2abffaa67265a4fd4ddb07f31a8
 AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56
-AUX lxd.initd.1 900 BLAKE2B a63847e61bdb0e3f835c6707a22a7771a9a679839f7d7f07965dd7005216b9adbd0bc0c7e8a2011320089492174d278a65913446c71988daf96cde3aa9ec93d2 SHA512 a8d0f8ce1fb7d0cf762b0c655b1c9907f8b84351d704eec324a485879468dc1f95bfd9873ddf0d387ae524a27bcf8e4cf0de444ddf7f1c3eb88703794eaab2f3
 AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
-DIST lxd-3.3.tar.gz 28414680 BLAKE2B 7f3eecf400761548935e6e3c81d894379cd667ffbe6d8ef67a7dd3ad4f1c13846f524fcefc4cdc306674fb990706bda0b2c4ef390f320c41561fa86cf610586c SHA512 ed5d792c1080f2be7f48f34051fbfa28d138b4ccb5405edb13cd630776ec34312da491a1881f77dddbe1a121e589b44952e73ce1e61f2cba72243f3b8f4c0177
-DIST lxd-3.4.tar.gz 24313641 BLAKE2B 6f2db8a690474d020a0d43366e940760c0886c8af60e17ecc6bf1f9747d8454d09d619b723b1794bec503dda82028f7d81edc2d0c33216cbad9c810f2657198d SHA512 f041878fcfd2b45f594d97e748272d44c517f28e181861a604bef23f858c4bd59cc93ac56c24cce6d353743428b66940f11df268ff9f66e83a5c8f1fb95dc3aa
+AUX ptbr-translation-newline.patch 599 BLAKE2B a60e323bfcbdde55bb82f930165a56f0806975370ea090d30a2f40057445b7552b1ff368aac4518e3539f2a4f9b66bd474498f7797002c9bf92d0d837cb72246 SHA512 07c7682ac24b138da10e1a24da02b0cf6144d911200d89ae74d4a03c16fd2a75a22f5956902d071fb93ae1b9b74aacd4ad98e98764678881e19773ab64561581
 DIST lxd-3.5.tar.gz 28356957 BLAKE2B 44334026ed720cc9d8a16a0752abb102f07b186e9a5946ffce9872734d166a6d477e0dd324002f74c2cca36bc500f7def9ff7f358c7d07792124392ab815e07c SHA512 56f10a75ee2cfb6ed653e2d69dee979b0a661f267bc66ab642e5fc1835d1879e7df600671325973d9772ddc653334531f2420f129c06cdb5a93950083263f366
-EBUILD lxd-3.3.ebuild 5440 BLAKE2B 94950750d974e4c76698d9daeda6e74df5b6509314e14ebff9a7607bbad02ac6a1971133c5ccd6e297f48e73654fa7e79c033658cd6504bdc7835c94ac65a7a0 SHA512 2b6dee232ebb7b07b30396b21a679a0b60eed4cf36a328fa84688eb6520563cc1b2fbf5ff9ce6fc2dc09efb14fe3f79a29733dda6cde709bf7711fa11c9eccdb
-EBUILD lxd-3.4-r1.ebuild 6513 BLAKE2B 1ece714b8d62796cfdd1f26610ecb25612224c74f7f35201dcfbaa18674a23eccfbe1158d3b08dafd67649ab0692d220c0c19723a1c99409e9450dda6c5364ea SHA512 c7b5f7659827aa37e9101372097c7331bfd590f7a6f29abc6f197db3c8a4a25e615a88eb5ace58e05ed05d862d9a29bb544595d61f3e706240a82e10fd43dd89
-EBUILD lxd-3.4.ebuild 6442 BLAKE2B 852da44b8ee89fbe4fa9a62d7f9f15fc87f32686a35fbd31beec76d77604d4888c82757ef74a7fafbb82f777d141504fd03dce1b084063969d6954701e5cd853 SHA512 c7f363f90832fffd123f51c0305b514d9f43fdc82145712a7d0f2374e3a9bbe0806cc8468caffcda307cfca9fc57201d203b9e744861f3459e560873a6e1dfcb
-EBUILD lxd-3.5.ebuild 6696 BLAKE2B a47e527e8d6b67881cba9fb5aa5e2c7a4c7647c51bae7c9c3a1e46f9dee4f903af9cbab48348eb0a878ba33e699fd874f8cacb1abc1795ba25f3c089c1cf889a SHA512 e073b985d81fae9c1d302a71db79453528192ea97b00caa1f1fb6d0c236d49c9f2cf545eda2f57a9295480d2d9ff147b4f5a863b064f5d91da816b3a96f18da0
+DIST lxd-3.6.tar.gz 25777268 BLAKE2B f2c3f20108f5990b1e086d1f5db53cbd476d0613f97f60a29dd66d3779486aef10f9eebf514853960d5606a108aea2e7c89365207130e8345ede70ed5b22806e SHA512 7b1982b81cfee56185bc0929b7bd9f1eb705c1ae83f11fa6f9aa2c9f8fc9aa5c705112121b41e5ed3791aa2ab41be26d7f8fb0a78951bab382b77ae9ae95a793
+EBUILD lxd-3.5.ebuild 6692 BLAKE2B b7a5c1465e9d8d3f95d942663e552d8e1a998070d487a326b73690fd481764e17a33df64e673e710c53d76060e93fbd2950228436c121d9e07bd4a3206a6e33a SHA512 d41fdaeece4c14d8e40333500b9540debf4f11fc6a2c564350c23d27af404f04d254c5698fce8e2fd9335c53f2d0d69372208c4316f4bbd607914975fcea9cb8
+EBUILD lxd-3.6.ebuild 6746 BLAKE2B 6c7cd1c212bdc647be0ffd015361a4da86879fc117753271cba159c743c36f37bead7abaa0a3e8c4dc88d97d35acc9885b587a55bab9a3f84a56adbfca3b5027 SHA512 f9db429e7ec132a9921c7b754a130f10648ec3ffdc347993af73e349fb94fe1168721ac6949d4b9123bdaf200f854e7405db027583405f92b89b8647eef0bb20
 MISC metadata.xml 1033 BLAKE2B d50b256487cc43a6d9e529edaafedb5f7f4eb1bb3ec4a8eb5f8ad892f865652e6dc100fe699a5b07a55cbfb5f32ed8127cbc2e9e68befc2a37f4e1d24afbfc78 SHA512 82684b99e51f524ed8201eb2439c4aaadd1a6403287be2febc908c16290f412930fe415d6a1a7e3712b9fbf64111991b01bc74beab07a745c78e4072698aa81c
diff --git a/app-emulation/lxd/files/de-translation-newline.patch b/app-emulation/lxd/files/de-translation-newline.patch
deleted file mode 100644
index 9ef55ab2f0ee..000000000000
--- a/app-emulation/lxd/files/de-translation-newline.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- /po/de.po	2018-06-27 19:57:56.759130047 -0500
-+++ /po/de.po	2018-06-27 20:01:09.694634346 -0500
-@@ -65,7 +65,7 @@
- "### type: custom\n"
- "### used_by: []\n"
- "### config:\n"
--"###   size: \"61203283968\""
-+"###   size: \"61203283968\"\n"
- msgstr ""
- "### Dies ist eine Darstellung der Eigenschaften eines Abbildes in yaml.\n"
- "### Jede Zeile die mit '# beginnt wird ignoriert.\n"
-@@ -167,7 +167,7 @@
- "###\n"
- "### Each property is represented by a single line:\n"
- "### An example would be:\n"
--"###  description: My custom image"
-+"###  description: My custom image\n"
- msgstr ""
- "### Dies ist eine Darstellung der Eigenschaften eines Images in yaml.\n"
- "### Jede Zeile die mit '# beginnt wird ignoriert.\n"
diff --git a/app-emulation/lxd/files/ja-translation-newline.patch b/app-emulation/lxd/files/ja-translation-newline.patch
deleted file mode 100644
index bbda24c6f37e..000000000000
--- a/app-emulation/lxd/files/ja-translation-newline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /po/ja.po	2018-05-20 19:42:38.932990198 -0500
-+++ /po/ja.po	2018-05-20 19:42:55.839944861 -0500
-@@ -1380,7 +1380,7 @@
- "イメージ�エイリアスを一覧表示���\n"
- "\n"
- "指定�るフィルタ�イメージ��ッシュ値�一部�もイメージ�エイリアス�一部�"
--"も構���ん。"
-+"も構���ん。\n"
- 
- #: lxc/image.go:888
- msgid "List images"
diff --git a/app-emulation/lxd/files/lxd.initd.1 b/app-emulation/lxd/files/lxd.initd.1
deleted file mode 100644
index b6d3cd4eb264..000000000000
--- a/app-emulation/lxd/files/lxd.initd.1
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
-    need net
-    use lxcfs
-}
-
-start() {
-    ebegin "Starting lxd service"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      --env LD_LIBRARY_PATH="/usr/lib/lxd" \
-		      -- \
-		      ${LXD_OPTIONS}
-
-    eend $?
-}
-
-stop() {
-    if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
-	stopall
-    else
-	ebegin "Stopping lxd service (but not containers)"
-	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-	eend $?
-    fi
-}
-
-stopall() {
-    ebegin "Stopping lxd service and containers"
-    if "${DAEMON}" shutdown; then
-	/etc/init.d/lxd zap
-	rm -f ${PIDFILE}
-    fi
-    eend $?
-}
diff --git a/app-emulation/lxd/files/ptbr-translation-newline.patch b/app-emulation/lxd/files/ptbr-translation-newline.patch
new file mode 100644
index 000000000000..92d78ca14270
--- /dev/null
+++ b/app-emulation/lxd/files/ptbr-translation-newline.patch
@@ -0,0 +1,19 @@
+--- /po/pt_BR.po.orig	2018-10-13 23:27:01.523645894 -0500
++++ /po/pt_BR.po	2018-10-13 23:28:04.730644762 -0500
+@@ -95,7 +95,6 @@
+ "###\n"
+ "### Note that the name is shown but cannot be changed"
+ msgstr ""
+-"\n"
+ "### Esta é uma representação em yaml da configuração.\n"
+ "### Qualquer linha começando com '#' será ignorada.\n"
+ "###\n"
+@@ -112,7 +111,7 @@
+ "###     type: disk\n"
+ "### ephemeral: false\n"
+ "###\n"
+-"### Observe que o nome é exibido mas não pode ser modificado\n"
++"### Observe que o nome é exibido mas não pode ser modificado"
+ 
+ #: lxc/config_metadata.go:63
+ msgid ""
diff --git a/app-emulation/lxd/lxd-3.3.ebuild b/app-emulation/lxd/lxd-3.3.ebuild
deleted file mode 100644
index 393042c8ae5e..000000000000
--- a/app-emulation/lxd/lxd-3.3.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
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test"
-
-inherit bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-DEPEND="
-	>=dev-lang/go-1.9.4
-	dev-libs/protobuf
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-arch/xz-utils
-		>=app-emulation/lxc-2.0.7[seccomp]
-		dnsmasq? (
-			net-dns/dnsmasq[dhcp,ipv6?]
-		)
-		net-misc/rsync[xattr]
-		sys-apps/iproute2[ipv6?]
-		sys-fs/squashfs-tools
-		virtual/acl
-	)
-"
-
-CONFIG_CHECK="
-	~BRIDGE
-	~DUMMY
-	~IP6_NF_NAT
-	~IP6_NF_TARGET_MASQUERADE
-	~IPV6
-	~IP_NF_NAT
-	~IP_NF_TARGET_MASQUERADE
-	~MACVLAN
-	~NETFILTER_XT_MATCH_COMMENT
-	~NET_IPGRE
-	~NET_IPGRE_DEMUX
-	~NET_IPIP
-	~NF_NAT_MASQUERADE_IPV4
-	~NF_NAT_MASQUERADE_IPV6
-	~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-EGO_PN="github.com/lxc/lxd"
-
-PATCHES=(
-	"${FILESDIR}/ja-translation-newline.patch"  # https://github.com/lxc/lxd/pull/4572
-	"${FILESDIR}/de-translation-newline.patch"
-)
-
-# LXD tarball is packaged with a nice "dist" folder containing all dependencies
-# that were vendored by upstream at release time. That saves us the trouble of
-# vendoring the dependencies ourselves. This is why there was this drastic drop
-# in ebuild complexity compared to pre 3.0.0-r2 ebuilds.
-src_compile() {
-	export GOPATH="${S}/dist"
-
-	# We don't use the Makefile here because it builds targets with the
-	# assumption that `pwd` is in a deep gopath namespace, which we're not.
-	# It's simpler to manually call "go install" than patching the Makefile.
-	#
-	# ABOUT "-tags libsqlite3": we used to link to the system's sqlite3 library
-	# but since v3.0.0, LXD depends on github.com/CanonicalLtd/dqlite which
-	# at the time of this writing, depends on patched version of sqlite with
-	# replication capabilities added. We don't have that patch in dev-db/sqlite.
-	# Therefore, we let LXD use its own private copy of sqlite.
-	go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
-
-	if use daemon; then
-		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
-		go install -v -x ${EGO_PN}/lxd || die "Failed to build the daemon"
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		export GOPATH="${S}/dist"
-		# This is mostly a copy/paste from the Makefile's "check" rule, but
-		# patching the Makefile to work in a non "fully-qualified" go namespace
-		# was more complicated than this modest copy/paste.
-		# Also: sorry, for now a network connection is needed to run tests.
-		# Will properly bundle test dependencies later.
-		go get -v -x github.com/rogpeppe/godeps
-		go get -v -x github.com/remyoudompheng/go-misc/deadcode
-		go get -v -x github.com/golang/lint/golint
-		go test -v ${EGO_PN}/lxd
-	else
-		einfo "No tests to run for client-only builds"
-	fi
-}
-
-src_install() {
-	local bindir="dist/bin"
-	dobin ${bindir}/lxc
-	if use daemon; then
-		dosbin ${bindir}/lxd
-		dobin ${bindir}/fuidshift
-	fi
-
-	if use nls; then
-		domo po/*.mo
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${PN}.initd lxd
-		newconfd "${FILESDIR}"/${PN}.confd lxd
-
-		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	fi
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	dodoc AUTHORS README.md doc/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	einfo "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	einfo
-	einfo "Though not strictly required, some features are enabled at run-time"
-	einfo "when the relevant helper programs are detected:"
-	einfo "- sys-apps/apparmor"
-	einfo "- sys-fs/btrfs-progs"
-	einfo "- sys-fs/lvm2"
-	einfo "- sys-fs/lxcfs"
-	einfo "- sys-fs/zfs"
-	einfo "- sys-process/criu"
-	einfo
-	einfo "Since these features can't be disabled at build-time they are"
-	einfo "not USE-conditional."
-	einfo
-	einfo "Be sure to add your local user to the lxd group."
-	einfo
-	einfo "Networks with bridge.mode=fan are unsupported due to requiring"
-	einfo "a patched kernel and iproute2."
-}
diff --git a/app-emulation/lxd/lxd-3.4-r1.ebuild b/app-emulation/lxd/lxd-3.4-r1.ebuild
deleted file mode 100644
index 0988eae3ecc5..000000000000
--- a/app-emulation/lxd/lxd-3.4-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-DEPEND="
-	dev-lang/tcl
-	>=dev-lang/go-1.9.4
-	dev-libs/protobuf
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-arch/xz-utils
-		>=app-emulation/lxc-2.0.7[seccomp]
-		dev-libs/libuv
-		dev-libs/lzo
-		dev-util/xdelta:3
-		dnsmasq? (
-			net-dns/dnsmasq[dhcp,ipv6?]
-		)
-		net-firewall/ebtables
-		net-firewall/iptables[ipv6?]
-		net-libs/libnfnetlink
-		net-misc/rsync[xattr]
-		sys-apps/iproute2[ipv6?]
-		sys-fs/fuse
-		sys-fs/lxcfs
-		sys-fs/squashfs-tools
-		virtual/acl
-	)
-"
-
-CONFIG_CHECK="
-	~BRIDGE
-	~DUMMY
-	~IP6_NF_NAT
-	~IP6_NF_TARGET_MASQUERADE
-	~IPV6
-	~IP_NF_NAT
-	~IP_NF_TARGET_MASQUERADE
-	~MACVLAN
-	~NETFILTER_XT_MATCH_COMMENT
-	~NET_IPGRE
-	~NET_IPGRE_DEMUX
-	~NET_IPIP
-	~NF_NAT_MASQUERADE_IPV4
-	~NF_NAT_MASQUERADE_IPV6
-	~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-EGO_PN="github.com/lxc/lxd"
-
-src_prepare() {
-	eapply_user
-	eapply "${FILESDIR}/de-translation-newline.patch"
-
-	cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
-	eautoreconf
-}
-
-src_configure() {
-	export GOPATH="${S}/dist"
-	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
-
-	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-	PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd
-}
-
-src_compile() {
-	export GOPATH="${S}/dist"
-
-	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-	emake
-
-	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-	emake CFLAGS="-I${GOPATH}/sqlite"
-
-	# We don't use the Makefile here because it builds targets with the
-	# assumption that `pwd` is in a deep gopath namespace, which we're not.
-	# It's simpler to manually call "go install" than patching the Makefile.
-	cd "${S}"
-	go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
-
-	if use daemon; then
-
-		# LXD depends on a patched, bundled sqlite with replication
-		# capabilities.
-		export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/"
-		export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
-		export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/"
-
-		go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-	fi
-
-	if use tools; then
-		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
-		go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd"
-		go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark"
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		export GOPATH="${S}/dist"
-		# This is mostly a copy/paste from the Makefile's "check" rule, but
-		# patching the Makefile to work in a non "fully-qualified" go namespace
-		# was more complicated than this modest copy/paste.
-		# Also: sorry, for now a network connection is needed to run tests.
-		# Will properly bundle test dependencies later.
-		go get -v -x github.com/rogpeppe/godeps
-		go get -v -x github.com/remyoudompheng/go-misc/deadcode
-		go get -v -x github.com/golang/lint/golint
-		go test -v ${EGO_PN}/lxd
-	else
-		einfo "No tests to run for client-only builds"
-	fi
-}
-
-src_install() {
-	local bindir="dist/bin"
-	dobin ${bindir}/lxc
-	if use daemon; then
-
-		export GOPATH="${S}/dist"
-		cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-		emake DESTDIR="${D}" install
-
-		cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-		emake DESTDIR="${D}" install
-
-		# Must only install libs
-		rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary"
-		rm -r "${D}/usr/include" || die "Can't remove include directory"
-
-		cd "${S}" || die "Can't cd to \${S}"
-		dosbin ${bindir}/lxd
-	fi
-
-	if use tools; then
-		dobin ${bindir}/fuidshift
-		dobin ${bindir}/lxc-to-lxd
-		dobin ${bindir}/lxd-benchmark
-	fi
-
-	if use nls; then
-		domo po/*.mo
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${PN}.initd lxd
-		newconfd "${FILESDIR}"/${PN}.confd lxd
-
-		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	fi
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	dodoc AUTHORS doc/*
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	elog
-	elog "Though not strictly required, some features are enabled at run-time"
-	elog "when the relevant helper programs are detected:"
-	elog "- sys-apps/apparmor"
-	elog "- sys-fs/btrfs-progs"
-	elog "- sys-fs/lvm2"
-	elog "- sys-fs/zfs"
-	elog "- sys-process/criu"
-	elog
-	elog "Since these features can't be disabled at build-time they are"
-	elog "not USE-conditional."
-	elog
-	elog "Be sure to add your local user to the lxd group."
-	elog
-	elog "Networks with bridge.mode=fan are unsupported due to requiring"
-	elog "a patched kernel and iproute2."
-}
-
-# TODO:
-# - man page, I don't see cobra generating it
diff --git a/app-emulation/lxd/lxd-3.4.ebuild b/app-emulation/lxd/lxd-3.4.ebuild
deleted file mode 100644
index c5ce43a9eb1c..000000000000
--- a/app-emulation/lxd/lxd-3.4.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-DEPEND="
-	dev-lang/tcl
-	>=dev-lang/go-1.9.4
-	dev-libs/protobuf
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-arch/xz-utils
-		>=app-emulation/lxc-2.0.7[seccomp]
-		dev-libs/lzo
-		dev-util/xdelta:3
-		dnsmasq? (
-			net-dns/dnsmasq[dhcp,ipv6?]
-		)
-		net-firewall/ebtables
-		net-firewall/iptables[ipv6?]
-		net-libs/libnfnetlink
-		net-misc/rsync[xattr]
-		sys-apps/iproute2[ipv6?]
-		sys-fs/fuse
-		sys-fs/lxcfs
-		sys-fs/squashfs-tools
-		virtual/acl
-	)
-"
-
-CONFIG_CHECK="
-	~BRIDGE
-	~DUMMY
-	~IP6_NF_NAT
-	~IP6_NF_TARGET_MASQUERADE
-	~IPV6
-	~IP_NF_NAT
-	~IP_NF_TARGET_MASQUERADE
-	~MACVLAN
-	~NETFILTER_XT_MATCH_COMMENT
-	~NET_IPGRE
-	~NET_IPGRE_DEMUX
-	~NET_IPIP
-	~NF_NAT_MASQUERADE_IPV4
-	~NF_NAT_MASQUERADE_IPV6
-	~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-EGO_PN="github.com/lxc/lxd"
-
-src_prepare() {
-	eapply_user
-	eapply "${FILESDIR}/de-translation-newline.patch"
-
-	cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
-	eautoreconf
-}
-
-src_configure() {
-	export GOPATH="${S}/dist"
-	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-	econf --enable-replication --disable-amalgamation --disable-tcl --libdir=/usr/lib/lxd
-
-	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-	PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=/usr/lib/lxd
-}
-
-src_compile() {
-	export GOPATH="${S}/dist"
-
-	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-	emake
-
-	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-	emake CFLAGS="-I${GOPATH}/sqlite"
-
-	# We don't use the Makefile here because it builds targets with the
-	# assumption that `pwd` is in a deep gopath namespace, which we're not.
-	# It's simpler to manually call "go install" than patching the Makefile.
-	cd "${S}"
-	go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
-
-	if use daemon; then
-
-		# LXD depends on a patched, bundled sqlite with replication
-		# capabilities.
-		export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/"
-		export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/"
-		export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/"
-
-		go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-	fi
-
-	if use tools; then
-		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
-		go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd"
-		go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark"
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		export GOPATH="${S}/dist"
-		# This is mostly a copy/paste from the Makefile's "check" rule, but
-		# patching the Makefile to work in a non "fully-qualified" go namespace
-		# was more complicated than this modest copy/paste.
-		# Also: sorry, for now a network connection is needed to run tests.
-		# Will properly bundle test dependencies later.
-		go get -v -x github.com/rogpeppe/godeps
-		go get -v -x github.com/remyoudompheng/go-misc/deadcode
-		go get -v -x github.com/golang/lint/golint
-		go test -v ${EGO_PN}/lxd
-	else
-		einfo "No tests to run for client-only builds"
-	fi
-}
-
-src_install() {
-	local bindir="dist/bin"
-	dobin ${bindir}/lxc
-	if use daemon; then
-
-		export GOPATH="${S}/dist"
-		cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-		emake DESTDIR="${D}" install
-
-		cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-		emake DESTDIR="${D}" install
-
-		# Must only install libs
-		rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary"
-		rm -r "${D}/usr/include" || die "Can't remove include directory"
-
-		cd "${S}" || die "Can't cd to \${S}"
-		dosbin ${bindir}/lxd
-	fi
-
-	if use tools; then
-		dobin ${bindir}/fuidshift
-		dobin ${bindir}/lxc-to-lxd
-		dobin ${bindir}/lxd-benchmark
-	fi
-
-	if use nls; then
-		domo po/*.mo
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${PN}.initd.1 lxd
-		newconfd "${FILESDIR}"/${PN}.confd lxd
-
-		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	fi
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	dodoc AUTHORS doc/*
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	elog
-	elog "Though not strictly required, some features are enabled at run-time"
-	elog "when the relevant helper programs are detected:"
-	elog "- sys-apps/apparmor"
-	elog "- sys-fs/btrfs-progs"
-	elog "- sys-fs/lvm2"
-	elog "- sys-fs/zfs"
-	elog "- sys-process/criu"
-	elog
-	elog "Since these features can't be disabled at build-time they are"
-	elog "not USE-conditional."
-	elog
-	elog "Be sure to add your local user to the lxd group."
-	elog
-	elog "Networks with bridge.mode=fan are unsupported due to requiring"
-	elog "a patched kernel and iproute2."
-}
-
-# TODO:
-# - man page, I don't see cobra generating it
diff --git a/app-emulation/lxd/lxd-3.5.ebuild b/app-emulation/lxd/lxd-3.5.ebuild
index daa47a637068..8fca096264a2 100644
--- a/app-emulation/lxd/lxd-3.5.ebuild
+++ b/app-emulation/lxd/lxd-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 
diff --git a/app-emulation/lxd/lxd-3.6.ebuild b/app-emulation/lxd/lxd-3.6.ebuild
new file mode 100644
index 000000000000..52e97dfade68
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.6.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+DEPEND="
+	dev-lang/tcl
+	>=dev-lang/go-1.9.4
+	dev-libs/libuv
+	dev-libs/protobuf
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-arch/xz-utils
+		>=app-emulation/lxc-2.0.7[seccomp]
+		dev-libs/libuv
+		dev-libs/lzo
+		dev-util/xdelta:3
+		dnsmasq? (
+			net-dns/dnsmasq[dhcp,ipv6?]
+		)
+		net-firewall/ebtables
+		net-firewall/iptables[ipv6?]
+		net-libs/libnfnetlink
+		net-misc/rsync[xattr]
+		sys-apps/iproute2[ipv6?]
+		sys-fs/fuse
+		sys-fs/lxcfs
+		sys-fs/squashfs-tools
+		virtual/acl
+	)
+"
+
+CONFIG_CHECK="
+	~BRIDGE
+	~DUMMY
+	~IP6_NF_NAT
+	~IP6_NF_TARGET_MASQUERADE
+	~IPV6
+	~IP_NF_NAT
+	~IP_NF_TARGET_MASQUERADE
+	~MACVLAN
+	~NETFILTER_XT_MATCH_COMMENT
+	~NET_IPGRE
+	~NET_IPGRE_DEMUX
+	~NET_IPIP
+	~NF_NAT_MASQUERADE_IPV4
+	~NF_NAT_MASQUERADE_IPV6
+	~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+	eapply_user
+	eapply "${FILESDIR}/de-translation-newline-1.patch"
+	eapply "${FILESDIR}/ptbr-translation-newline.patch"
+
+	cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+	eautoreconf
+}
+
+src_configure() {
+	export GOPATH="${S}/dist"
+	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
+
+	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+	PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd
+}
+
+src_compile() {
+	export GOPATH="${S}/dist"
+
+	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+	emake
+
+	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+	emake CFLAGS="-I${GOPATH}/sqlite"
+
+	# We don't use the Makefile here because it builds targets with the
+	# assumption that `pwd` is in a deep gopath namespace, which we're not.
+	# It's simpler to manually call "go install" than patching the Makefile.
+	cd "${S}"
+	go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
+
+	if use daemon; then
+
+		# LXD depends on a patched, bundled sqlite with replication
+		# capabilities.
+		export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/"
+		export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
+		export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/"
+
+		go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
+	fi
+
+	if use tools; then
+		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
+		go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd"
+		go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark"
+	fi
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	if use daemon; then
+		export GOPATH="${S}/dist"
+		# This is mostly a copy/paste from the Makefile's "check" rule, but
+		# patching the Makefile to work in a non "fully-qualified" go namespace
+		# was more complicated than this modest copy/paste.
+		# Also: sorry, for now a network connection is needed to run tests.
+		# Will properly bundle test dependencies later.
+		go get -v -x github.com/rogpeppe/godeps
+		go get -v -x github.com/remyoudompheng/go-misc/deadcode
+		go get -v -x github.com/golang/lint/golint
+		go test -v ${EGO_PN}/lxd
+	else
+		einfo "No tests to run for client-only builds"
+	fi
+}
+
+src_install() {
+	local bindir="dist/bin"
+	dobin ${bindir}/lxc
+	if use daemon; then
+
+		export GOPATH="${S}/dist"
+		cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+		emake DESTDIR="${D}" install
+
+		cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+		emake DESTDIR="${D}" install
+
+		# Must only install libs
+		rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary"
+		rm -r "${D}/usr/include" || die "Can't remove include directory"
+
+		cd "${S}" || die "Can't cd to \${S}"
+		dosbin ${bindir}/lxd
+	fi
+
+	if use tools; then
+		dobin ${bindir}/fuidshift
+		dobin ${bindir}/lxc-to-lxd
+		dobin ${bindir}/lxd-benchmark
+	fi
+
+	if use nls; then
+		domo po/*.mo
+	fi
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/${PN}.initd lxd
+		newconfd "${FILESDIR}"/${PN}.confd lxd
+
+		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	fi
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	dodoc AUTHORS doc/*
+}
+
+pkg_postinst() {
+	elog
+	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	elog "including a Quick Start."
+
+	# The messaging below only applies to daemon installs
+	use daemon || return 0
+
+	# The control socket will be owned by (and writeable by) this group.
+	enewgroup lxd
+
+	# Ubuntu also defines an lxd user but it appears unused (the daemon
+	# must run as root)
+
+	elog
+	elog "Though not strictly required, some features are enabled at run-time"
+	elog "when the relevant helper programs are detected:"
+	elog "- sys-apps/apparmor"
+	elog "- sys-fs/btrfs-progs"
+	elog "- sys-fs/lvm2"
+	elog "- sys-fs/zfs"
+	elog "- sys-process/criu"
+	elog
+	elog "Since these features can't be disabled at build-time they are"
+	elog "not USE-conditional."
+	elog
+	elog "Be sure to add your local user to the lxd group."
+	elog
+	elog "Networks with bridge.mode=fan are unsupported due to requiring"
+	elog "a patched kernel and iproute2."
+}
+
+# TODO:
+# - man page, I don't see cobra generating it
+# - maybe implement LXD_CLUSTER_UPDATE per
+#     https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656
+#     EM I'm not convinced it's a good design.
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 307e56a754d7..ab88f70c17e0 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -4,8 +4,6 @@ AUX qemu-ga.conf-r1 452 BLAKE2B 546799fefad91644acc0cee1e5c3f4adfb3f12cf48831a61
 AUX qemu-ga.init-r1 624 BLAKE2B 79416a272a89349e4174a4238fc7763fc1f116c7c4a2e7c4d41ba2bb8d0a41a2db1abb2053e307a257519af3163e3d603280d45f20e259ec1a1a9b090a9891fd SHA512 820ae4b04b9eeb2c8ac6128544f764af67b4462cc98377ceb37708130a5cae118bd3ed892a945fb25234a8d73fb98e60dbf5da3a44861fc56f97b66a3f12532e
 AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a0679a90805919aa4b7afac4f1d0c3bac72fcc5c7c0e0d87b227be8b1697338b827c890c56be77b07db SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789
 AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
-DIST qemu-2.11.1.tar.bz2 32819412 BLAKE2B 6b6d4e7b8dcf33aeedb0b33bad267da07ad17c2eeeb5fbd2c038d760bc03224e55ba0f03eb248c62bc0e8636c2c660ea76b367eaea96bee16388053f82c8b8a9 SHA512 1b692bbdfc3dc785738c7192aa2a3f9cf53d9f5bf3b3f49fa8692050dc50f7056c8a4d1b527d48ffb2a674a0fd3a46d87addd1eaaa758f35eec1ab5adfe32354
 DIST qemu-2.12.0.tar.bz2 41196232 BLAKE2B f258e570558249ea647c3571908f90b8bacdcef9a1814009b98571cf0e96406194d44aa041fd0a97c9b673f39a9eaae8d873824745509778a6784cd85f8398b0 SHA512 91d829f44c431e4c1cd335f3efea5afff9da62d832b0296a92417463ea0826d09ce226c2ea8ac167fe7b99b6bb976c7cb1357aaf17735ee57af6602161e46346
-EBUILD qemu-guest-agent-2.11.1.ebuild 1732 BLAKE2B 15ad8c35a7178c60d8c588f3e7fbfa81612f72447e597f8b4061a96c20bacad118cf9d7d459eb887c5c27c7a25c326015972260aa5ff07e09e82913db2e3ff0a SHA512 9d4431c543eb33672b9581f995e3cd8c7a02a50bc9701506ffe250eb4aed6f71ab88d6245be4175c130e7a7bb5b45b04d4510ee7495f0dec4185d24f7cea6024
 EBUILD qemu-guest-agent-2.12.0-r1.ebuild 1726 BLAKE2B ecf84ebaf79fb62a7d39cd971fe5669211f1915cc7f1bd71d3bcc272684ae61dea705ee6d7b3a3b47d6320db87b3666601bfed7f75204ee6ffec9e76c4c99d88 SHA512 bc380e7dd9773921b48669400fceff34d9b5a3ddba47814cdeafba99aac640650710501780f0e254d831748a6ea24f634463d8176d20545475a6fdf4d2244b8c
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.11.1.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.11.1.ebuild
deleted file mode 100644
index b34558adc4a8..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.11.1.ebuild
+++ /dev/null
@@ -1,83 +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 eutils systemd udev python-any-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib
-	x11-libs/pixman"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
-)
-
-src_configure() {
-	tc-export AR LD OBJCOPY
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--disable-tools
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-	echo "./configure ${myconf[*]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	emake V=1 qemu-ga
-}
-
-src_install() {
-	dobin qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-}
diff --git a/app-emulation/simplevirt/Manifest b/app-emulation/simplevirt/Manifest
new file mode 100644
index 000000000000..7ac2633fea54
--- /dev/null
+++ b/app-emulation/simplevirt/Manifest
@@ -0,0 +1,10 @@
+AUX simplevirtd.confd 103 BLAKE2B 897b17aac8b81b60171267560c36a742dcd812cb3c883bb2855b2ec6fc0664d582f0779f2a5593105c94c0e18b82468dcbfc1b935f215f7d6b42f33043cd7121 SHA512 3e529de36a18bf082d7de220c8c0b52aedf6a1eb3860192db7a79cad5dc0d224d727d7377c8afde3c8d899d42b3ac4a6c56cbb4e17cd5b9217413b1657d0a516
+AUX simplevirtd.initd 334 BLAKE2B 356fcfa12c26bd1d26f4a2bfeee9c598d7c543739b2ea94a73fabce8f7180fcf2abec9ba9384be1c91e5415ae07786c513400ec627e81e4c2bf7f5f01a5dde12 SHA512 642efacdbfce06f6e78a2f9d62ee8417d230f94e55e79d2334c5b049ada1b38174a8ff057b27c00c5a87e64500ca37c542aaeb37a9eb59125e0ef5fe0b39ca28
+DIST github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz 30367 BLAKE2B c18a0f1aff1bde8e6fc533ea627377ca4de4830d84289355f68163855ec97ac47f537b3b2627568c31714ac3a7672ebf86d60452269c75c80c2cd7565d7c97a0 SHA512 94342de3aad4db1c4442062f4cf4e57c723a43bbcb0069a8bed3b719e3864eef7500a24c9c99c755114708d6822e9b23f296b6d0b2b46f32cc6ffc65944d1729
+DIST github.com-go-yaml-yaml-v2.2.1.tar.gz 70217 BLAKE2B 4ba34bd9432699ec60348d13d8b95498abf751a922f782bf177695e6854faf907c1728d1dc13ad1cb63215fe3a86366cd99068247d15c726ba77bd0cf434b9c6 SHA512 d49267ee361196b0a1e1b9ad6f6cfa903627ccf7925fc3acc8d1bd214b64d362a9dcee10ba524fb8887226235c5baa2c8812a9f62adc7e6719d4ed84baa4ce4b
+DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
+DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
+DIST github.com-spf13-pflag-v1.0.2.tar.gz 44042 BLAKE2B 157fa6c2b1efa594abebd76ff03121050187974d62475b1aa66af325a2198ea64105655597703c37f25e22c4a07864d9fc31a6a29ba9233fdeefcceef400d5e5 SHA512 fd3cefd683329316eda4ec660193a970e38435515c16805190235e2c969c8d65a6f602fdc7c2f7cf3d9740c5a321ee5be5e8034bd6cd7c05c12722cf64d1e8ae
+DIST simplevirt-0.0_p20181011.tar.gz 14667 BLAKE2B 02a7ecdf9ec9983a83c31fb728fbf61ffcb2ca71683ebf24d159815314b064e465da303b5c8712b18aff3ecd1da0c5170c4aa4be365855e233497f62c44ed888 SHA512 b290cbff14a3679600ca2cadcfd17184ea789c0f1556a6f1de64679ef9983eb7988ac7ebadd0de729286d8a86dbdaab3a9f7b7bbc300780c3a28aa9920610288
+EBUILD simplevirt-0.0_p20181011.ebuild 2111 BLAKE2B 1bb539551e4190aa9e278857c3e763198b48d4c8af657f52992ebb8810664f8fe571b3ddde0051506f14b745eb19f8325f14fdcd80d6a60568ce888d2191f32c SHA512 3bea399a586a3369c884fff30c34b2f2782d68f1c3f69b3fd6c3403b99f2d96468cf79487be165ac0359b99bae69a13b76253d3b2357ab8c1f63fccfd4b97303
+MISC metadata.xml 576 BLAKE2B d62570b65053dc9cb9c264b5fdc90aec72d429b6a166e0c4298e4d27105b127094b1a5ad2f96fe8ba6d23118d82faa3aada90643a5165e3874f2f425dc7d37f1 SHA512 91031a71f21466b4782efe38f645169a585dcc29346c4a6e98b129549b8ccb197cb00f03ce3d9d51306284bc24494afcf117efb003c33855f262177daf077987
diff --git a/app-emulation/simplevirt/files/simplevirtd.confd b/app-emulation/simplevirt/files/simplevirtd.confd
new file mode 100644
index 000000000000..9f679f6221ac
--- /dev/null
+++ b/app-emulation/simplevirt/files/simplevirtd.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/simplevirtd: config file for simplevirtd
+
+# See `simplevirtd --help`
+SIMPLEVIRTD_OPTS=""
diff --git a/app-emulation/simplevirt/files/simplevirtd.initd b/app-emulation/simplevirt/files/simplevirtd.initd
new file mode 100755
index 000000000000..f7ba444d6d98
--- /dev/null
+++ b/app-emulation/simplevirt/files/simplevirtd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="simplevirtd"
+pidfile="/run/simplevirtd.pid"
+retry="SIGTERM/7200"
+command="/usr/sbin/simplevirtd"
+command_background="1"
+command_args="--syslog ${SIMPLEVIRTD_ARGS}"
+
+depend() {
+	need net
+	use dns logger
+}
diff --git a/app-emulation/simplevirt/metadata.xml b/app-emulation/simplevirt/metadata.xml
new file mode 100644
index 000000000000..25e89f9e5959
--- /dev/null
+++ b/app-emulation/simplevirt/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		Simple virtual machine manager for Linux (QEMU/KVM)
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>rafael@rafaelmartins.eng.br</email>
+			<name>Rafael G. Martins</name>
+		</maintainer>
+		<remote-id type="github">rafaelmartins/simplevirt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/simplevirt/simplevirt-0.0_p20181011.ebuild b/app-emulation/simplevirt/simplevirt-0.0_p20181011.ebuild
new file mode 100644
index 000000000000..0dceee42cb54
--- /dev/null
+++ b/app-emulation/simplevirt/simplevirt-0.0_p20181011.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/spf13/cobra v0.0.3"
+	"github.com/spf13/pflag v1.0.2"
+	"gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check"
+	"gopkg.in/yaml.v2 v2.2.1 github.com/go-yaml/yaml"
+)
+
+inherit linux-info golang-vcs-snapshot user
+
+EGO_PN="github.com/rafaelmartins/simplevirt"
+GIT_COMMIT="2427500bce5bf9b365dc601790704694cd6c772e"
+GIT_VERSION="0.0.24-2427"
+ARCHIVE_URI="https://${EGO_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Simple virtual machine manager for Linux (QEMU/KVM)"
+HOMEPAGE="https://github.com/rafaelmartins/simplevirt"
+SRC_URI="
+	${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+	virtual/logger
+	app-emulation/qemu"
+
+CONFIG_CHECK="~TUN ~BRIDGE"
+ERROR_TUN="CONFIG_TUN: Universal TUN/TAP driver required to setup bridge networking"
+ERROR_BRIDGE="CONFIG_BRIDGE: 802.1d Ethernet Bridging required to setup bridge networking"
+
+pkg_setup() {
+	enewgroup simplevirt
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	pushd src/${EGO_PN} > /dev/null || die
+	GOPATH="${S}" go install -v -ldflags "-X ${EGO_PN}.Version=${GIT_VERSION}" ./cmd/... || die
+	popd > /dev/null || die
+}
+
+src_install() {
+	dobin bin/simplevirtctl
+	dosbin bin/simplevirtd
+
+	newinitd "${FILESDIR}/simplevirtd.initd" simplevirtd
+	newconfd "${FILESDIR}/simplevirtd.confd" simplevirtd
+
+	dodoc "src/${EGO_PN}/README.md"
+
+	keepdir /etc/simplevirt
+}
+
+src_test() {
+	pushd src/${EGO_PN} > /dev/null || die
+	GOPATH="${S}" go test -v ./pkg/... || die
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	elog
+	elog "To use simplevirt, the simplevirtd daemon must be running as root."
+	elog "To automatically start the daemon at boot, add it to the default runlevel:"
+	elog "  rc-update add simplevirtd default"
+	elog
+	elog "systemd is not supported for now."
+	elog
+	elog "To use simplevirtctl as a non-root user, add yourself to the 'simplevirt' group:"
+	elog "  usermod -aG simplevirt youruser"
+	elog
+}
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index e2c47561d822..a19cc5c183fb 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -2,5 +2,5 @@ DIST virt-manager-1.4.3.tar.gz 2765924 BLAKE2B fa888dc78bb8ab27ff5a507829c5ace5d
 DIST virt-manager-1.5.1.tar.gz 2796831 BLAKE2B 0fc8b266e7dd2ac3f337e3f95f4328ece930ff66605a444bd728183ffb8fb497204f5e73409f42e3d19ccaa009195a552864dc09f9d78efda7c04f4c5292dbf5 SHA512 e0da3b879ea33a8c394c33df85cadac4fbb9cfed65f9a904c5d9bf07232e29f8c96b5242e3f94cae390b7b5d7a20e1c25c3867962f0a39de40e71dc00013d32b
 EBUILD virt-manager-1.4.3-r1.ebuild 2385 BLAKE2B 1361cdbb0b185ff6dd6430e94c2416a9981ce360cbcd6330cde5f519989af3f9f85b98d194a23c2d6fe0f9fd9ccb701bf09f1fbae32d1906d1fa22ed30250bd3 SHA512 3a864d2802a1f61b3153c84c0cd1c91241d9003331aa749035133a06d21c06fbd094a9c7a5058b69f9a560961069611465b9054cfd57b7ce64299c83cf0fb183
 EBUILD virt-manager-1.5.1-r1.ebuild 2403 BLAKE2B 2e30a3cb3debac21490fb97a3bbc02bd7f24d5ebabe989340fe94ecc2dfbe30d9f7774fab428ca9d237e554f18863466359a6ab2f7c9e82f2dfa6a9dbf7f4e1c SHA512 952a3bb8d6f4e239b933e2b011db72dcb2d23ea34da193fcc58b755e44cb9acebaa3caceffff565c8db752188abba8d677858e96b76bdd801c8cdf54bedbb3d9
-EBUILD virt-manager-9999.ebuild 2309 BLAKE2B e215c429af443c797b2789dbbba3a87eaf792a918c082ea6f3a5a47eab503413523beff33610f981a2a0114094293d3c31bc0ab5c0c122cf0bcc0836d601f6bd SHA512 f70be63a5d9e02d3a560fd020c1b2cb8bf657ce6c0dc3dcaf7ba02c3b89504914de2beac4f7a252a6032ba21ffffef8cdb57e46a35806fbd5daa02c72ced7fd0
+EBUILD virt-manager-9999.ebuild 2288 BLAKE2B 17189fb1d6f9658d49bef4f218bc927a8151873eff389b087fb7a2027a5ce466959288cd169c55004d36826ef4296c1dc250b40585ece2e27286eb9d592b059c SHA512 407e8ddf0608fcdde7a7bc2fb743c2ae99ccaf3cf2c76cb0f086c7b948ad2bb44d30bb8bf0b1cb6de0a05e653e7f479b153de574168b8eb5daeb2957b4ad7f29
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 7e88178f48f6..69c24ad9817c 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -61,7 +61,6 @@ distutils-r1_python_compile() {
 	local defgraphics=
 
 	esetup.py configure \
-		--qemu-user=qemu \
 		--default-graphics=spice
 }
 
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 5d417eeb6c05..23107375abf3 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,11 +1,7 @@
-DIST VBoxGuestAdditions_5.1.36.iso 59596800 BLAKE2B c735a88f534b27f1f2f29d125d0fdf881285f64f7ea3f49a0bc9211af4f562562cc321983c222e6106459f3be14af94a3514765607d1cd8edf6e6352398cfe8c SHA512 08049007589f6bf56c84355b908355289f37eac8cb01d970e46ebe3b44b43ff406c37d0ddad245dd007447a00927a2d2312524e3ac99f8b6bad8695b403ca846
-DIST VBoxGuestAdditions_5.1.38.iso 59611136 BLAKE2B cde4ceb59159827304c99ab00fac4cd3598600c252e7b5a410a5be6ea50866ed2efae4ead9e5c4c1a1462b1cd6db973bd4b35b56d426934e80898837c536e778 SHA512 e082e6363e1e6fa8a7b6b6b4847e9f2ed17655b0ac143467553150f910d71e4dfff55686c38464dc60f77c57292610d13dc25ee5423877173467a86cfe232a3b
 DIST VBoxGuestAdditions_5.2.14.iso 57978880 BLAKE2B de5cb3c5b7e2f3ee018588308573389fd973820e87d5b2e6640499c96dc21db95e71eb4e5e2469455febba8b2ccb4a7c6014176e784613218fa7eccabefe9e53 SHA512 1fd878f9e7fc1687907ac8dff6827bfd7aefe3ed48012b0dbbaf42ced21695ce52be6fe146128a6d1c67c7a0c5c39c9ef24e8ee562271fda117d13cca81427cb
-DIST VBoxGuestAdditions_5.2.16.iso 57976832 BLAKE2B 78c8d71e2a68306efaf2951d73099b7199e15d83d9fc2c70f73266fdf59798948b22815234a5e30eff43471fcb8a5967c74a439d79b5ed47971dd170498145de SHA512 f25bf8ce789f640e5a80ac55c5d1918702bfed711aeacddc951948dcb56a4aa43a5a4e8760e3b8cc6e18eee18eabff032dd8fff8b95cc18bc60177b0a481b592
 DIST VBoxGuestAdditions_5.2.18.iso 57976832 BLAKE2B d212345e99856699ab43e83d747937a4bb7b0ee57dfa58d3e06d910fa94bb01a570afc2d5faa2ec64fd9c7377a0ab4c2bda32af5557b0655bc9cf30dc9c01691 SHA512 f4328afd4947e0e9d2f15bc15ec6ca7d9207d3d46e936d6575789e5a4f27ea271137b6f23592ff992530047a76393cdedd0dc8b10f61d7c94da5f5c7bd484a1c
-EBUILD virtualbox-additions-5.1.36-r1.ebuild 729 BLAKE2B f792450477b1a6b5689018926bce6a30608b288db6a9f546ea52bbc2dd463ba1c71c5dbe4a4970bce3a7dd3d92d6b9fa1e30ffc288f7a4597214021b6bacbde9 SHA512 3d90155e5c821b4831a31a154cbb7fcc31dd2b88637853b5dc8c3393158f555d1b6c3b5bff1856b363b12cd6e6ee039e08dec1aace2751ad618aa719dfef7074
-EBUILD virtualbox-additions-5.1.38.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db
+DIST VBoxGuestAdditions_5.2.20.iso 58013696 BLAKE2B 1a0df07f2a086c41741d884a3eabd43d6f1fee368b143fbae4c8dbc930834fb8d5dd82e8563fe7c9e4c562a58e79c25e9603847d9eca908943e525505bf2f697 SHA512 a8b8f12a8f0b26bb88745d33aa419c45adb4a1e682c3af9a34b0556ac1d8bdf33044253ede41d894e0dba1857f8f3c5cc234006149771a25133c6112ec4aa4c3
 EBUILD virtualbox-additions-5.2.14.ebuild 713 BLAKE2B a15e47b3d4c380d7fcf8c10a9bef4a16ccb0c34e0cad6fcdc7ccbbe20bb6a869a3d9906f98169219e7b6e6e77fc1f18d93859c133fe50dfae34899ddbbf9de44 SHA512 4898ace6d451998c593dffcbaf841c7e6b0944d96e364bde9c301d600f00dd8c0037e96bc0b42c4d0e5f5e5a35d1eb7ed1f8260541505ba8cf88cb17e9fb0e26
-EBUILD virtualbox-additions-5.2.16.ebuild 715 BLAKE2B 62ab7ae8b0a0fd236b4ca76a01948c1e5cd55def6e61983e73e7270e5cf45a7e679157bb9b0dd82c6fdd159d0a4d03d24beebc3b5c0ba24a3e225b65d52c9340 SHA512 92ad5b98e63888de898eaa86042fcd306b9a97502dac4805da502cff8e0462828200c09cbc59ad110508527ca830a288e311d15917410b42fdc7729ac2b2f49d
 EBUILD virtualbox-additions-5.2.18.ebuild 715 BLAKE2B 62ab7ae8b0a0fd236b4ca76a01948c1e5cd55def6e61983e73e7270e5cf45a7e679157bb9b0dd82c6fdd159d0a4d03d24beebc3b5c0ba24a3e225b65d52c9340 SHA512 92ad5b98e63888de898eaa86042fcd306b9a97502dac4805da502cff8e0462828200c09cbc59ad110508527ca830a288e311d15917410b42fdc7729ac2b2f49d
+EBUILD virtualbox-additions-5.2.20.ebuild 712 BLAKE2B 62074cbfee8bd9076c9413172381a77df8c4ab84bbfb6912337aa87930b4b90ec155ec52af68db593fc96c1de39bc38d9e4660ed570b5e0b33b201660049994d SHA512 a226e6b4188eef4ba7a5cc32c61c7a27981b104df9d5716772c2dd9887332e2c88119c538b5ffcc6cac16ce5e6faf7f484f1419b89c634257d32fc5967febcaa
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.36-r1.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.36-r1.ebuild
deleted file mode 100644
index dd3165781272..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.36-r1.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 eutils
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.38.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.38.ebuild
deleted file mode 100644
index a28d6005cb4f..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.38.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 eutils
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.16.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.16.ebuild
deleted file mode 100644
index 93e9fc9b6d49..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.16.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.20.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.20.ebuild
new file mode 100644
index 000000000000..7fa00c8a161c
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.20.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 1b1957cc0c16..701d86ed56f9 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -4,29 +4,19 @@ AUX vboxwebsrv-initd 674 BLAKE2B be1cb2574ff5e9e1efc6a137d18e67b2ecbe0e94b6a3a2d
 AUX virtualbox-bin-3-wrapper 2931 BLAKE2B bb8a72f749996b945d42a3d94ab895ee5b234bed907e6d1e055993f34a2459720bd8b0c56b61eae9c2e159e2b820d5117a6f9bed6ebfc3b327fa133c8f3aa812 SHA512 adb6ba2b3252b19b4c0331c10a025d05fd2399642530ba9aec2efa2dc8dbea4188a95806935532ad8229db29f0767c3098ef7646204f5e540e291ceb350b76ac
 AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a289ff56cd0d7638a0a3d47891e670e070be9f3bcc30d730982237fc9211d1a9bbdbf8429c7ca80d25fbcc1 SHA512 8086ef107aff0aa3e17f5fcb8ee5de4dd8a24cb119c3523e3e3a302819eb4258328adead1b6f40b96706539f4e1c43dbd5c055a16a304ac29f7f302ebf2e4c4c
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz 19605234 BLAKE2B 4b263b27b130e5b5d7917f15f0dc782f28f7708cc10e22028ee27b33be6541df5211c4fb36951a6b293d19b8933182097cd0575da8c1d00b6a96e747c1962762 SHA512 e11b294da83b4605c40132f2ea5f95f2820f901d2ed1d438c22c4cc9f779baa3112b9334036717d1593d5f9ec8374d7d7bc826012e2019ef0ba79bacb1deb7b8
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz 19717251 BLAKE2B 90dcaa58284c6dc9101dbc8eb9ceda55d16c4a48fd58fb43c4a6b7d3d5c582c31930f6e773397ae9379e75771c88b40aad276436bb1d56a71a8e744353e04ec9 SHA512 ba44d53e06adababd0ac7c8a68ea025e1e7afd39fe648079bbb879e81130d45f00b944795cfd37f7f05c16d5a7723b85c49a8435c8399180af627dd3b3de00bc
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.tar.gz 19589209 BLAKE2B 385bdfb4cef67788a1dd3e758f52dab7a367f56ca8d286e465af9a7674ffe3bc0f6187a66d7d19bb8f2a8fc0e23e0ce7ef35ac2d46fd6971dc2df96e8a61ca11 SHA512 a47a7173685b72995e5012386fc8f6c55f9106049a28ecaea223f58f1bb40077e0929cf05102a2588e516fe90891428b8e569ec9351fcaf235eb9f8293e45b92
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.tar.gz 19588810 BLAKE2B 51fb01ace72f6bc3f0e1ab6804c44ca44463ad24986af08b79c41bb06f43776c9f022d1766d07a4f9a47615119963636cad52d8f7d7bcc9f5e58f51c093f0bcd SHA512 8dfadb83111226a7bbc522d1caf16327051d76ee9382cb62281df5735f87d0e26994dd38a279027dae27c0371120bf95066d5260e79003c5a8982710579ecbce
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.18-124319.tar.gz 19592275 BLAKE2B 7be65024837e46073049d3d751df00b50bf2d5d81faef3ba2a869429800d999f473b570bfe75201d07347e751893d280f7238a076a172ad2046b64c151b675ba SHA512 fa4bf8202f4d5f86cf4a04aaf6e77ce2f86ccde126d5543846793a021fc1e861f35d256432d762aebd38fc6cd0fa0bfe2a4def76334f468de316fe925d2fe414
-DIST VirtualBox-5.1.36-122089-Linux_amd64.run 88329683 BLAKE2B 96e0296243056ebaecde4435fe68f82dacfc66a0d23b70365c7495112672b60be7682ef794851b68198d0d0f01ec84cb314f06b434726e5f75e47751771cbd3b SHA512 6c62c642da78561ec5130e18ebac24d52871b4c518ce507f1deb0a279c58dfc1b87c4afecf63236e7274da65d5d784575779ad39e17a4f8b1f05c29a3ca95d55
-DIST VirtualBox-5.1.36-122089-Linux_x86.run 87449039 BLAKE2B 826071838fdb7567ec7064eb6db216d9d695f3504b0c37b2db637df5757ece58b8c1c0b430cef1c1e6657bd9dc556c074891732cd4481243af72051f66ec6bec SHA512 c593483949a5389cddbe47fb3d07e7acc55868671d72ccd696e1c039ace24e7b88be9cf088c32b419c5f4ba76ceada6e388b63dbeac6376b13627543c472afe8
-DIST VirtualBox-5.1.38-122592-Linux_amd64.run 88329683 BLAKE2B 124b1a3d45b0aa213a63ccc225570158faa11adf51a9bc503c014a302ba6a9739e9b50780c93ca6b8704e4666f809b97d1548db74817020301f560252bf71182 SHA512 963ed0b5555bcc43a72dbf49d3d6d9a1a2b1118808ea601765ce102ce72a05439903247680d0b49df4d15cdca68b40a8c5a26df9340c24ed681c3353f2f8e072
-DIST VirtualBox-5.1.38-122592-Linux_x86.run 87449039 BLAKE2B a591a64422cd6e7bb292aaa0f35e5ed9a722b3d835800b2ce09814f2756f088e3a7adc0fc483f2a6ec36e265aeddf6ecfe1aa1bf60a78675696859bff1d0afb9 SHA512 41f9aebbb7c4ad6192cfef57ca956c5ec4b96c8547380abc3b56629c821094ccb28bac69645042e0ac22664db6c59aeff49ccc80d88e1eae5ffb95f55a467a07
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.20-125813.tar.gz 19641208 BLAKE2B ffe4e89b88609d575f7e9f5aed5330de5024462ae564684cf3f565b62649d022c8fc9368cfd1685e3e4fc34e9a23cb0651c483f129b533f9afec38bcae89d587 SHA512 df9ae6af9ad1c1106bf8bf0595fdcdd3ec45bc74b90655e762fb18a4c8ea268bed366ce3caaf0f95682577b61b337650a6fe7ef901f6925fa38679ccd885c21c
 DIST VirtualBox-5.2.14-123301-Linux_amd64.run 88749523 BLAKE2B 5a2791a1258adcdc82f8776fb0d5502d525faa0083b808f1875f0c61b848aa371fa0b6b73ca024c244b36dfb074a8839747ad27a87cb8dfbaad09096a0cec887 SHA512 8c4633ef0e3a9f7f26603009a23244696a6f91baffa9777a0daf8f09abd80b4aca944dabfd2a10acddf4759e64ec719948d73ecaaf187a60a15e097467060ea9
 DIST VirtualBox-5.2.14-123301-Linux_x86.run 87776718 BLAKE2B 609c24ad2ba5b005f7cb619fbe2c2a82f026a7ae4ef74cda800c526c8c3552a2a1ed1af5a2a2b3d9c56f0dfbcdda493c2cc92b58156cbf41ebfb1d43bfee8aca SHA512 820c2b6c97a48c125b69e1f749a3b1473d5fe672726ae2cec30f20a6652186a28b3900d4aeffca701415275229232925d1c8c347aefa7a86840a2c5bf13f21a7
-DIST VirtualBox-5.2.16-123759-Linux_amd64.run 88729043 BLAKE2B 0bc183146cdafbd5b12c4d46976cd3775a4ea11aaadae155d979ef81cf04ae8c77d6b48d0e240bad3bd440f532530e6d7584f58e7b29161a0f355bc8b7c15061 SHA512 c815a025376d86a5bed753ef8b729155b2a01d9e4c9b573e70d3b4f7db497285b991b278504d4b4fbf382a00080974551f214176c0e3fbaa2679534b3ee32b90
-DIST VirtualBox-5.2.16-123759-Linux_x86.run 87756239 BLAKE2B 911ddf8b260ce18ff12c9cd6675105327b9c5916f436ee7421db3362403ee4960a8e24a6c25348c7188becdfbbfe0685f42a84ac166e39a753d4407c04721248 SHA512 9b52faab1ecd9e30cbf37fbec1a9a150f3dabb47ac62f355ed67744a849f07c52885852c310c39d9d36f90461fb318f8923afde9ec81bd754c1afbeeb2788427
 DIST VirtualBox-5.2.18-124319-Linux_amd64.run 88780242 BLAKE2B a07e5bfcc2e988a4e499a974d97ed36cad9a95055d2df3aab8def3cbf19da4658411465d973935c86bd1642047e16a16041eb6f9da0f85183e86d5022208332a SHA512 f280ca01e4e9cd20bcd88479548b10931558052bcf45e96ba9dd70f9ca81036509c5391fac4ce1635b1d2597a10093979bd58017612d34a56b7df20a59a30b74
 DIST VirtualBox-5.2.18-124319-Linux_x86.run 87838159 BLAKE2B 6b89a068ac699a1aaf77859b4373ea93fc3bfa863234e8befda725326297589a6e8e535c2b6f48ae60ac50805c224b6a889b7fa4bfb06e5dbb44623a5c84b02e SHA512 791ba9bab7e92e058b41ada88925f3d1159eaf922f8029a254096b994608a0be4d916de9b067923e6fcc176a5d7fcfe16c45e00a204bac22e3a7ce7409014595
-DIST VirtualBoxSDK-5.1.36-122089.zip 9864160 BLAKE2B 0db3d44c44f93a80607791f2ff5cbdf6aed2b324c207bb9bbc808b5cc836f01ade9c48ed3474c4f174a43b29969fe632b5ccd2b3ad0af197894d63887144bf0c SHA512 98f6e59a5e344bf23f6af6c0e791f28920940de907721981c99b66b8e7c20cb06a7e1211b2029a1279e583fb4ed456019005c2bf3a91b3d8b3fbd61e6e44c914
-DIST VirtualBoxSDK-5.1.38-122592.zip 9867112 BLAKE2B d3deeda2adafcb675370c7228f49a209e5f76986fc4c9ac5aa8ff2e809912f458c9cfc2d8f011404fb4bd7b45b80f0ff857dd85dd597d622971a2556c6b17bbf SHA512 e03fab6573e61f59fc4e017d8c6cfde08e734939efe6c2f8edc5e6e9da5a1d616012cae06d630a3e2a2b1d72775eb8f0a05eb230fa81321ec33ba1975ec34ce9
+DIST VirtualBox-5.2.20-125813-Linux_amd64.run 88841683 BLAKE2B a3cce78d5a90187ece0eda11032a36096a05b0a7020ec729c07963510db6fa4e436edbf03b5e385d826c7e2ddeae84e4138273b6b5876be2b33c7a8f259753f3 SHA512 28614d71b564e138526cf75662d5e0ce2c083bfa4bc0124f7b0d20532b5a09391d00609a2c003ac5311220c844f2b1fffdee46f53e1018f0df5b6ff1b7a6ba12
+DIST VirtualBox-5.2.20-125813-Linux_x86.run 87889359 BLAKE2B bc66cf6af5e7a92c642e028bc82830641bed02f5e7daa4c607b165af9f707b3ec359a0ab40f68822472e0087a9a17723de20567f08f14125f8c74d058eecbc88 SHA512 8a7cba49194a7dcb86b3b908e9b8f83d3ad83cfd057e75bda6bb16da1f62ec65e10892696f94f0bc0f4bff4f4f055aa2bdc250e10b46d06b3f8f616000dad48a
 DIST VirtualBoxSDK-5.2.14-123301.zip 10154044 BLAKE2B 273219029c59ffd685fffb7e14fff914a5397acc0676c8b4ccaee9cecee51e90880e68d883125e061d6c02e09b53235821ff89a265e937c9b4e67365452a97d2 SHA512 c69e6f537af611b9a4bcbab3e014fa25c6593f754940c6596e451cf895cb088186d037ac4816a3bae793213c774befd54ffa86d43948fa546f753a37fcdabd51
-DIST VirtualBoxSDK-5.2.16-123759.zip 10158952 BLAKE2B 66140092c221b998919a3840745e2ae58671b65f1db774ddb6691d085e95a35cdfa1e939a84cb032e2f67bd4485bd8f940f5db6d3712569942cbcc2a0f1bf234 SHA512 2b735016ea99e94317876f2e845cf94dd845bf51a86b42e938cae4bee003483f6061a7d89150f3d1fe5b84970a4fa83ae5bed7acf6570b849df5258efc8eb38f
 DIST VirtualBoxSDK-5.2.18-124319.zip 10153509 BLAKE2B fc937cfe4c6bb1ad6416fc975b7f8c31604fc78fe4da59596054831a8f5e47b7e2c39ad855f3ae0f45b3aa3a527bc6ad9b559901aefbd2f188c04fc3f8342188 SHA512 fefac8821e0ba83d130fad1dffa5f1d49c063d39694028005f655b8dd4f93bb8ab9697cdd2ea03c9cbc1d977f01da92ca6e6aa571497171a1d414ece239db680
-EBUILD virtualbox-bin-5.1.36.122089.ebuild 8381 BLAKE2B 16a4aed3c9ae0fe4621fd97d30ce46808ff7c56783dbc27e2a4c2e6a6a1f290506d71659ad98c4def219d75789ff6f7f66c8d79ff90d2285ca0e1fceec14635a SHA512 a5cd6523a8a08b64f7d60ebd00d56576c7dbb33dbde06dee28b56ae1a31648a3155b7a1f3c3a739e71fa824d427c33b74ccd31dc1fb3520256b759c0e79dd193
-EBUILD virtualbox-bin-5.1.38.122592.ebuild 8383 BLAKE2B 0f07fa4a3383dde55f6ee12bebcbc44da33f96c498dd58eacd8dc1fd19bded41f720be5400e2ad9dcd01d80752a9825f89b68ca610105362d1eeffd9e2395c85 SHA512 96ac84742f050251faf70537d768654a21dd9f918ec282ca229f5490071e9d0aa7dd3dda3121bf39534f0f1547b039f1f138a15b1d5fd4b85bf5d82d79df216b
+DIST VirtualBoxSDK-5.2.20-125813.zip 10152506 BLAKE2B 0a0fe51b22391430b5f67f4dfa24e2985beb364f69acf67f19154bbd5acca00260abdc8ade32c245e1a19340c88ee49776442b036dccdb5f932c052c9701c7e3 SHA512 e87b41bc23de5aae3a368834dc33e4b0eff63e945f81323886491cd6139089c29dc113d5d2144ac76650d501d3a6f0fc858ff2e1afe29df4396ed7cc7552762d
 EBUILD virtualbox-bin-5.2.14.123301.ebuild 8330 BLAKE2B 6eb8f7e32b98ebede7cfe40e8dc4cfaaa91937b0a119226828b06edd207703981570eda551c78295d5cc78c65338c806ce5ceaa158fe7a219037e8af41753c47 SHA512 e7efb17b49257d1d0a4cec26bf229013e46aae6076dbeef0238faf21f84b81f7223e9986a3c6107ccb202a7aeeaa97ed8ac40d787d5e5e22ba9c8b06bfaae24e
-EBUILD virtualbox-bin-5.2.16.123759.ebuild 8332 BLAKE2B a7ca997e4da4bd000ab990d0aad48c32ab87806d82ddff744c16c9a1d1351f94fe76d640f74cded7caa66925e985a0a8e5930e9266dd67de522d5ec65a212a13 SHA512 907d13a5a2008872f3a336532064c297253f53877198ae95531f06bdc823d789d91d88c2d0a3e6a3c3fba9dd7209512b0805ecaeeec741f3b828acbc3ba2d59e
 EBUILD virtualbox-bin-5.2.18.124319.ebuild 8332 BLAKE2B a7ca997e4da4bd000ab990d0aad48c32ab87806d82ddff744c16c9a1d1351f94fe76d640f74cded7caa66925e985a0a8e5930e9266dd67de522d5ec65a212a13 SHA512 907d13a5a2008872f3a336532064c297253f53877198ae95531f06bdc823d789d91d88c2d0a3e6a3c3fba9dd7209512b0805ecaeeec741f3b828acbc3ba2d59e
+EBUILD virtualbox-bin-5.2.20.125813.ebuild 8329 BLAKE2B 2a35d5607dae7906042d693f6474d50fa90b8df6f95fd67ec46def27b02502421d34e36e56964573823a81f2746f53285138f70880af343dc31c50e146d2fcc3 SHA512 f027acf8007331bf7d73fd1f430bf55d3046dc4df3658a709e015efabea2b25d94717392c50be40f04e952a54651312a0ca45dd59e77d232fb7d58c87c773095
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.36.122089.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.36.122089.ebuild
deleted file mode 100644
index 8a5b8148a15a..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.36.122089.ebuild
+++ /dev/null
@@ -1,287 +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 eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/libpng
-		media-libs/libsdl[X]
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		chm? ( dev-libs/expat )
-	)
-	dev-libs/libxml2
-	sys-fs/lvm2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
-		# set up symlinks (bug #572012)
-		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
-		local size ico icofile
-		for size in 16 24 32 48 64 72 96 128 256 ; do
-			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
-			if [[ -f "virtualbox.png" ]] ; then
-				doicon -s ${size} virtualbox.png
-			fi
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="virtualbox-${ico}.png"
-				if [[ -f "${icofile}" ]] ; then
-					doicon -s ${size} ${icofile}
-				fi
-			done
-			popd &>/dev/null || die
-		done
-		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
-		insinto /usr/share/pixmaps
-		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
-	# The compile phase makes VBoxPython2_7.so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-	fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.38.122592.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.38.122592.ebuild
deleted file mode 100644
index 94de7dd7a102..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.38.122592.ebuild
+++ /dev/null
@@ -1,287 +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 eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/libpng
-		media-libs/libsdl[X]
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		chm? ( dev-libs/expat )
-	)
-	dev-libs/libxml2
-	sys-fs/lvm2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
-		# set up symlinks (bug #572012)
-		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
-		local size ico icofile
-		for size in 16 24 32 48 64 72 96 128 256 ; do
-			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
-			if [[ -f "virtualbox.png" ]] ; then
-				doicon -s ${size} virtualbox.png
-			fi
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="virtualbox-${ico}.png"
-				if [[ -f "${icofile}" ]] ; then
-					doicon -s ${size} ${icofile}
-				fi
-			done
-			popd &>/dev/null || die
-		done
-		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
-		insinto /usr/share/pixmaps
-		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
-	# The compile phase makes VBoxPython2_7.so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-	fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.16.123759.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.16.123759.ebuild
deleted file mode 100644
index 424d6d96060f..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.16.123759.ebuild
+++ /dev/null
@@ -1,287 +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 xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/libpng
-		media-libs/libsdl[X]
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		chm? ( dev-libs/expat )
-	)
-	dev-libs/libxml2
-	sys-fs/lvm2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
-		# set up symlinks (bug #572012)
-		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
-		local size ico icofile
-		for size in 16 24 32 48 64 72 96 128 256 ; do
-			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
-			if [[ -f "virtualbox.png" ]] ; then
-				doicon -s ${size} virtualbox.png
-			fi
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="virtualbox-${ico}.png"
-				if [[ -f "${icofile}" ]] ; then
-					doicon -s ${size} ${icofile}
-				fi
-			done
-			popd &>/dev/null || die
-		done
-		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
-		insinto /usr/share/pixmaps
-		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
-	# The compile phase makes VBoxPython2_7.so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-	fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
-		done
-
-		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.20.125813.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.20.125813.ebuild
new file mode 100644
index 000000000000..33b7d2250e10
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.20.125813.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		dev-libs/glib
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libpng
+		media-libs/libsdl[X]
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so VBoxPython2_7.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+		done
+
+		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index e7c2359a3b02..968c04adb6d5 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,11 +1,7 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz 19605234 BLAKE2B 4b263b27b130e5b5d7917f15f0dc782f28f7708cc10e22028ee27b33be6541df5211c4fb36951a6b293d19b8933182097cd0575da8c1d00b6a96e747c1962762 SHA512 e11b294da83b4605c40132f2ea5f95f2820f901d2ed1d438c22c4cc9f779baa3112b9334036717d1593d5f9ec8374d7d7bc826012e2019ef0ba79bacb1deb7b8
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz 19717251 BLAKE2B 90dcaa58284c6dc9101dbc8eb9ceda55d16c4a48fd58fb43c4a6b7d3d5c582c31930f6e773397ae9379e75771c88b40aad276436bb1d56a71a8e744353e04ec9 SHA512 ba44d53e06adababd0ac7c8a68ea025e1e7afd39fe648079bbb879e81130d45f00b944795cfd37f7f05c16d5a7723b85c49a8435c8399180af627dd3b3de00bc
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.tar.gz 19589209 BLAKE2B 385bdfb4cef67788a1dd3e758f52dab7a367f56ca8d286e465af9a7674ffe3bc0f6187a66d7d19bb8f2a8fc0e23e0ce7ef35ac2d46fd6971dc2df96e8a61ca11 SHA512 a47a7173685b72995e5012386fc8f6c55f9106049a28ecaea223f58f1bb40077e0929cf05102a2588e516fe90891428b8e569ec9351fcaf235eb9f8293e45b92
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.tar.gz 19588810 BLAKE2B 51fb01ace72f6bc3f0e1ab6804c44ca44463ad24986af08b79c41bb06f43776c9f022d1766d07a4f9a47615119963636cad52d8f7d7bcc9f5e58f51c093f0bcd SHA512 8dfadb83111226a7bbc522d1caf16327051d76ee9382cb62281df5735f87d0e26994dd38a279027dae27c0371120bf95066d5260e79003c5a8982710579ecbce
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.18-124319.tar.gz 19592275 BLAKE2B 7be65024837e46073049d3d751df00b50bf2d5d81faef3ba2a869429800d999f473b570bfe75201d07347e751893d280f7238a076a172ad2046b64c151b675ba SHA512 fa4bf8202f4d5f86cf4a04aaf6e77ce2f86ccde126d5543846793a021fc1e861f35d256432d762aebd38fc6cd0fa0bfe2a4def76334f468de316fe925d2fe414
-EBUILD virtualbox-extpack-oracle-5.1.36.122089.ebuild 1087 BLAKE2B 6c233d604a66c0abd454b537e5d374210a83e8a6a1cff28ab07d78af52fd94385f7eda46c9efa320b53f2deb2f6baf6d3581a0ab56bac91e841f074585d5d3c5 SHA512 ce18fe7011e3d6942d4718617d2d1218d19e50bc8fa80e03db4c78a2d16739a6dedee75de58bfaea6a28b45010cc26c8fda09d85ead4e69f229911c5a7f61e05
-EBUILD virtualbox-extpack-oracle-5.1.38.122592.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.20-125813.tar.gz 19641208 BLAKE2B ffe4e89b88609d575f7e9f5aed5330de5024462ae564684cf3f565b62649d022c8fc9368cfd1685e3e4fc34e9a23cb0651c483f129b533f9afec38bcae89d587 SHA512 df9ae6af9ad1c1106bf8bf0595fdcdd3ec45bc74b90655e762fb18a4c8ea268bed366ce3caaf0f95682577b61b337650a6fe7ef901f6925fa38679ccd885c21c
 EBUILD virtualbox-extpack-oracle-5.2.14.123301.ebuild 1008 BLAKE2B 5f2de91f90e5eb060a0eb3982b676ddf8956ed2cd730686740198bb5836f373949064c7db28cc699a00f2e40a643fd662bb9b3217bb61dc19ed343589856fb46 SHA512 ac29c2a036b7fdb9088a3ff1d77f1148f6ef8e05783e667b616bfb4243cf6a8f082b282ce76aea06296af56605c65f4c9429de6e5cfed71f905e4b619516e2a5
-EBUILD virtualbox-extpack-oracle-5.2.16.123759.ebuild 1010 BLAKE2B 476281386029dc67f5ee851d33a3f35902e7afc90a216fde7f611af20d2445cf53d6d2e356b9334e7db9861a5ea53c1cb5b0b14aa029094a6e162c1fe291875e SHA512 4ec9f04169e5b60ccd2020d888fe0340c921afa363d4484c075aeaa02693906ad0983c0c1836cc80f6f8eb0da3b875e0c4186fe76a75d8e7262dc3a0fdf7eece
 EBUILD virtualbox-extpack-oracle-5.2.18.124319.ebuild 1010 BLAKE2B 476281386029dc67f5ee851d33a3f35902e7afc90a216fde7f611af20d2445cf53d6d2e356b9334e7db9861a5ea53c1cb5b0b14aa029094a6e162c1fe291875e SHA512 4ec9f04169e5b60ccd2020d888fe0340c921afa363d4484c075aeaa02693906ad0983c0c1836cc80f6f8eb0da3b875e0c4186fe76a75d8e7262dc3a0fdf7eece
+EBUILD virtualbox-extpack-oracle-5.2.20.125813.ebuild 1007 BLAKE2B befd34ce4cb647bf650941e2c387391d978a6cbbfced35edb215d3e74d177aa21ecd1f758852784633cfe5aac2ea5bb42eed382d81e2827133ac6146550253fc SHA512 9bfa70d3ca567d03dc84518d9bc7fb835d15964bd8a34c364bd6c4da557d43d9ebe9b84b75e876e9261688a4c1f3585d5fc7224c1022fbf1b8a67a9eec057869
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.36.122089.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.36.122089.ebuild
deleted file mode 100644
index adb086974170..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.36.122089.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
-
-inherit eutils multilib versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.38.122592.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.38.122592.ebuild
deleted file mode 100644
index 7d7d5d2ea35c..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.38.122592.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
-
-inherit eutils multilib versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.16.123759.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.16.123759.ebuild
deleted file mode 100644
index d46e764cf177..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.16.123759.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.20.125813.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.20.125813.ebuild
new file mode 100644
index 000000000000..8a111898f4de
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.20.125813.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 2ad949a4fad2..7a57e7158ef4 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -5,17 +5,13 @@ AUX virtualbox-guest-additions-5.2.18-linux-4.18.patch 1064 BLAKE2B e8097cb1556b
 AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
-DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1
-DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8
 DIST VirtualBox-5.2.14.tar.bz2 118597539 BLAKE2B 5e0a8d92405378eb438cae375041609f7a0e1288b040d3a0bcc06157f16ddd48b3537f2f026aa12a71c5319bdef56d6f3907785ac51ebe05a8b7143e04f22d0a SHA512 b8202eccd83e9f2c92a77548d003082b6b3ff7838bb32ae48c3a25dcd622bfdc8ceca42cc49b855eeabf4439c55ad42df9b3959dd1bab77de154468e139c904e
-DIST VirtualBox-5.2.16.tar.bz2 118678441 BLAKE2B 9d912a51ceb69eb117d9886adf34fe4900bd941637c0610e0e0febb650cf7817b6f2fa0db4b085c0cb28c56892e7f8678e3533d7384cd155e356fa4a0ec7c0fa SHA512 361607c43e3f7fb60da6db898951317c45a7f7b782c42808759f7c29502e3778ae28e5a54b5c49d1c5e46d94f85dbd1891d69f16d756767f0155bb48531b9519
 DIST VirtualBox-5.2.18.tar.bz2 118700952 BLAKE2B 5e9a5ca5379d80a8d9d0d53fe7b1f7cd98e03b6c535867932d55aa6a936e65f2d294264da014f332c2caa933a262ced3e350d9eb685ad99dec02a02ffcf5e7cb SHA512 f67c17cdd39e699e6c80af82a2c2d0c5dab073ddba2b55393740e605debb973030c48ce736ae753fc1e680845f0b62209c0f8951db08b665e9cdd83c52d5be20
-DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
+DIST VirtualBox-5.2.20.tar.bz2 118760364 BLAKE2B 7a5f72340796d3278ef5f3210f4b25bf4d999ec93cdd0449853faf68b38c45a6ffd00fe2c88f12296029882f7715c012d1793cfff9d1c2441aa4db414fa3225e SHA512 ff039e487c43b584c5c5959df1622151d82f6c39101af869262f800d07e68a68005ed442112e36ebe249ed79de34c0b974bbd43e7889a5d40df2ebe7dec77a15
 DIST virtualbox-5.2.12-patches-01.tar.xz 2616 BLAKE2B 5731484d185414d83588ee227bbc1eef266451d1a3a710adf1b769cd6404ef1750dba7a60549f2ab9f3fb81ef15809db9ea0190127caefc72d7bc9bb8b741fb0 SHA512 712b55392a8e8357e95abb42ea4f8dac3391ecbf9cbecf27c7dbf674c40f42a1eb19d227a1b3adcf621384a9f64a6438d20fb43866c736189097fb5770c5c654
 DIST virtualbox-5.2.16-patches-01.tar.xz 2952 BLAKE2B 1d23d83bdb4d9576d402b67cc81d4427c5fe9163550d2817546382e1c1087000553d4a9a864f2527a909f52ce389105bcfe5518b5407de1299c7d2a62ee3cc21 SHA512 88c21583c51ae8e22e5fd3f08baae686045e884883153e2e365c35ba19f2773d5964c523a4ad3777fe30ca96bf76fab8819e09beeadf8350193041bff783893d
-EBUILD virtualbox-guest-additions-5.1.36.ebuild 5995 BLAKE2B c34c1d3e312781ad4a4a390f12e4986ee197a690f5875f829bf3e87fa7a0741d5eb2c08f506d9a5b43590ea762eb26cf516db591a1b55a2f27e5c36f8fc313e8 SHA512 068ae5ecd8aa8e9f30f5272f1a1f58f8da92b78ee0f62784e335ebcbd63605b34d6654bbb35b16d4b4572bce75478827de217aeacc062bfdd7e206d7d38c7bb6
-EBUILD virtualbox-guest-additions-5.1.38.ebuild 5997 BLAKE2B bd1110242825d9eccfa7235ce8de8fafd720610652dee85169f9e14c4fa6c806619736ab8db2b4f8041aef0a7fe0c6fa8dcd7a49a488287d8b0677b099894494 SHA512 b28006deb4ebe0bb199296262dec479bafc5a02c239116f2e3da9cf8198aca5fbbb281f6679b8415d3a0ffb88e3e42de4f71b808b2f0c38203af66cdebb36683
-EBUILD virtualbox-guest-additions-5.2.14.ebuild 6235 BLAKE2B 30c83c548577a2b4a27a6c5ae8b7ad775bbed3a73869afe40f0e634b41e4815b95003639962042e4d87bef27332d144eb5c9d4c6b03e061801bf8d56e3db5378 SHA512 92f2f2a63f9eede6c6b07ce90da2e2f4c5ef5fba4d4cba4598306a0879de71c20fb1bd22229b48dab346cb4aa91860b247a9c908b48493ade4220415bdb81830
-EBUILD virtualbox-guest-additions-5.2.16.ebuild 6279 BLAKE2B 0aba80b2bb816bf04325f5722fc872b157290a555a3cd69bbb22032c65dcc3f4500f18eb413d47cb5ed84f5f759c229614ad280e3e597ec3431c93ac4bb16eea SHA512 18501264ede98a15ad627f89a44ef0cbf07ff3f86907aa26e51b6cfd48514d6b45525a1b70412ad8e79449a4a8f4a91256c12ea919bc95c5e240248ab8649ba8
-EBUILD virtualbox-guest-additions-5.2.18.ebuild 6279 BLAKE2B 0aba80b2bb816bf04325f5722fc872b157290a555a3cd69bbb22032c65dcc3f4500f18eb413d47cb5ed84f5f759c229614ad280e3e597ec3431c93ac4bb16eea SHA512 18501264ede98a15ad627f89a44ef0cbf07ff3f86907aa26e51b6cfd48514d6b45525a1b70412ad8e79449a4a8f4a91256c12ea919bc95c5e240248ab8649ba8
+DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
+EBUILD virtualbox-guest-additions-5.2.14.ebuild 6162 BLAKE2B 387d7b3c897d68db498014ff54490b4c2b40683e4a37d53e9f1a93a42c71b04dffdd964344bc5a01a659e5f173d0996552a92eabe3c7273f6d82db4c3eb9596a SHA512 ec620e474c1906ae7bb0d2c1d57d22dbc0055e3e432daf67acefd1198a2fab0d078c1568b64bd86d7734ac94674c4cd326b8de0c64ca1ccf5806c61b86a4dce4
+EBUILD virtualbox-guest-additions-5.2.18.ebuild 6206 BLAKE2B 4353cbc8376d4bfb8c9806091b26f413df2754ad10a7b7340cb60478ab06a113b7a49a21eb9b66f03b0da64b028c138cfcbf5d100c6dd2e4270a12eb60f6cb74 SHA512 57d247a0b4cf51e06b54bfddf083f2154fae787a31aff1dd5fb57ea0cf2a67ca94ae3431017cf9d26dbca3b6d01531e65aad1ad13a5e23fd268d0785b11fd8bc
+EBUILD virtualbox-guest-additions-5.2.20.ebuild 6012 BLAKE2B 3bd29aa5b1464d3c511df21f0415e1b10c597c4c867fcbe11a1477b22990f3e1b418e4845bd848820b475ccf420a1e4a238707f192df7736a2038ad8f465e714 SHA512 9ee2e007b7534effb72caf52b7fdadcd8f6692b62492d493ad1185ef0a33509925b1e38fb149b121d1af36bc9bf883b4927a28ec233775fa12f9030dfd4099bc
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild
deleted file mode 100644
index 3c8b9c6ca161..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE )
-	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto"
-PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" \
-	emake TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.38.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.38.ebuild
deleted file mode 100644
index 97d4f9402e9b..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.38.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE )
-	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto"
-PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" \
-	emake TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.14.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.14.ebuild
index e0a70e26ee7b..77b0deee6c90 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.14.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.14.ebuild
@@ -30,8 +30,6 @@ RDEPEND="
 		x11-libs/libSM
 		x11-libs/libICE )
 	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox
-	!x11-drivers/xf86-video-virtualbox
 "
 DEPEND="
 	${RDEPEND}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.16.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.16.ebuild
deleted file mode 100644
index 551c7bdd592f..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.16.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="VirtualBox-${MY_PV}"
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE )
-	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox
-	!x11-drivers/xf86-video-virtualbox
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Apply before we create archive with Linux guest kernel modules
-	pushd "${S}" &>/dev/null || die
-	eapply "${FILESDIR}"/virtualbox-guest-additions-5.2.18-linux-4.18.patch # 663488
-	popd &>/dev/null || die
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# stupid new header references...
-	local vboxheader mdir
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" \
-	emake TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.18.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.18.ebuild
index 551c7bdd592f..753cfe70961c 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.18.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.18.ebuild
@@ -30,8 +30,6 @@ RDEPEND="
 		x11-libs/libSM
 		x11-libs/libICE )
 	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox
-	!x11-drivers/xf86-video-virtualbox
 "
 DEPEND="
 	${RDEPEND}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.20.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.20.ebuild
new file mode 100644
index 000000000000..64bc7a6872f8
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.20.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod systemd user toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="VirtualBox-${MY_PV}"
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )
+	sys-apps/dbus
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	x11-base/xorg-proto
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# stupid new header references...
+	local vboxheader mdir
+	for vboxheader in {product,revision,version}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" \
+	emake TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	insinto /usr/share/doc/${PF}
+	doins "${FILESDIR}"/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 24c8aea5bd4a..0d4f4977f198 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -3,14 +3,10 @@ AUX virtualbox-modules-4.1.4-pax-const.patch 1729 BLAKE2B 3cada201a2bfde671c073a
 AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c849a99ad0cf36a92cc4d89881ce72a0b7ebd53174f39e298c119670654932b790113fe7fbc3a3bae552f2c597cad20a370141f SHA512 f22e6c8edc360e0f97b207ba9a046042ef1898c10c724d9519badef004858720040caef12bffa1ed0f07517ae2d0b831973a0e4ef8ffb239a26faf62706b0618
 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd
 AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a
-DIST vbox-kernel-module-src-5.1.36.tar.xz 628368 BLAKE2B 49a3dfc4ff573f793eefcfd9b645af6fa6fc63b54475921064be146d3d4bf4db61f48d82f62d65811597fa12b88331153f7491890527fde76f41426355552abb SHA512 c69739c72a5555fc3bca90186129fa4eeb5bd930c4396b416a8a88e6f84bcd9e7498a9bbc9381da648cf87d601d98249feac2e4de6d93d8b7aba46b22d3ec40f
-DIST vbox-kernel-module-src-5.1.38.tar.xz 628552 BLAKE2B 9faa4e837a48ac27be5c0183edcf2b39c08eeab210bd39811704a7a578a93b28f8b8ecf26a34483f2d135a8cb8817756120d7bef0b8de245c5a5e232cfebfff0 SHA512 36311c3ff947fa763db1fc0612c5a4c10ac3d586c3faab3a91e463723488510cedfc1a69696381158a167edfc86d7abf66c18b287ced75cbaba3f1797c4265a8
 DIST vbox-kernel-module-src-5.2.14.tar.xz 637352 BLAKE2B 7ccefbb13f25fe995e0f769192a93baa91358c09e7126d6a6c8bef7fceeab50082f78843140d23cf88c4931c561552c4131b17625e7a3821766571387d78d2a3 SHA512 920eca67fb10ed4d1eeab95b14e65c585dd96df82a4690c34c9d85366ec6dd9835f9a772eb4718a80e6ffb2637de2a698151a6bdfd7984fc2070cd0bade5c077
-DIST vbox-kernel-module-src-5.2.16.tar.xz 638172 BLAKE2B 80a27100bb0be97796f03b368c589965d476e6d0c79424b94a5100561dc84bc2baf28b271a744b7b4ad53e015fb463faf2871d24596fafc83c80ccbe16087730 SHA512 35169a46ca9018f169b25359c0f4bf658622d71ea284768912bf0a8d2ac34ecec94f5dc774f77f0c02d1b83363faad53158baac7423f588deedfe8073a1e56a3
 DIST vbox-kernel-module-src-5.2.18.tar.xz 638008 BLAKE2B 8ad08362e81365956bace1f6591ddd5f8201f3464df6f3f378c6c1b88f8a58eb823646f5c36f8c5efbdcd9941ec8eb46b604b356a39bf44af50b0ee9e5a6914a SHA512 0ba280b111725f6e77544e29db4dfbc8c418d928fd03db0a5d747703513147bc3b7ff7fcfa544298414ec97e95c99f9408c1fe2349d652552a652b6518898401
-EBUILD virtualbox-modules-5.1.36.ebuild 1431 BLAKE2B 9ea7afbf141d43d3c6a22d5bb934bddb1c67a6afa69d65ac905df930cde73d5c8b921b11f4954e3577b6b63a1b1c156d23c97c9aaceeb2fd51be75d81df1d936 SHA512 e5becf1d7298567966b7653b73e3245a9db59b3eca1659890b004d8116a1c150e8c7042a81bb7fd9c0757328895dfe12c39baee9a49375110903d83f6422c988
-EBUILD virtualbox-modules-5.1.38.ebuild 1350 BLAKE2B abf66852d4f907de436721b8c8f06dfd3c3676a0676d6e569147e01aced9b6f5492c9e9a2ddaee5798b38aba0fbc8d812179427d8eb7c45e732ef9093542d40f SHA512 e09b4178d5e20260cdd59597c514a4cc7d78b8caa8e126248f213f3bb4a665762216f07076efb6e81b822920a80c09979a94df11a952488397ced662f8862108
+DIST vbox-kernel-module-src-5.2.20.tar.xz 638452 BLAKE2B f8fa29e21a77ebfec765ce0e006aaba9fdc76773e216d0c24c705e688730598e85b2c191406acd376f4020c67e296b6f22b0acecb7f15f3e343233b4a7da62fa SHA512 5378be30ab697ded6c07e74b15a38331914b19f72c55847e92e6e89541c25d89aeb6020aaaa3820e84902efb10a5b7ba7190a5271da93cd490b25fcbd787bf28
 EBUILD virtualbox-modules-5.2.14.ebuild 1197 BLAKE2B ea60276403c90846417bbf24cd2df6bccc67403900987e07697bcdb0a4801422690a7e413be9e87fe2be93eec4fa491d50e4fe1c3035145725bf432738cb0e86 SHA512 cfc1fec4a8fbc000bb40cdc68f66ab7f6b0da91d956fabd462e44fcb7ba7dd2a22b798a8cc129d9abd492d1f04e994da2ab1680467a6d94fa1b23f90381ef548
-EBUILD virtualbox-modules-5.2.16.ebuild 1199 BLAKE2B 467a7073743e16f5efb3e1a68402bad71bbe6afef8c9ae9f56e2029ea4d517eeafc46576e8149899f8c63cd6fee30e1e20d179006174714309eb4eab29bbe431 SHA512 67ca645212bd521d7655e38c390d346299ecf13e7485e7a269fe1891eebcdccf98c02cd4832ba563c449a9dbf3b11e9d242b1a2c5be6bc7bfb741282186087f5
 EBUILD virtualbox-modules-5.2.18.ebuild 1199 BLAKE2B 467a7073743e16f5efb3e1a68402bad71bbe6afef8c9ae9f56e2029ea4d517eeafc46576e8149899f8c63cd6fee30e1e20d179006174714309eb4eab29bbe431 SHA512 67ca645212bd521d7655e38c390d346299ecf13e7485e7a269fe1891eebcdccf98c02cd4832ba563c449a9dbf3b11e9d242b1a2c5be6bc7bfb741282186087f5
+EBUILD virtualbox-modules-5.2.20.ebuild 1189 BLAKE2B ded291957f85a194492d5c43bf9e9733b03466323d74d5a37932a0a35d86cc585106f7910893ffb88751a01de9cc2fc00f6743225e8820b501ed892f50644dc9 SHA512 106126714a5b82a5ebd02733d8dc8e48844543eba33297a0a4e507031a0bd34ed6d44675a588f1401e32f19845a93d492e6bd1e5033d056b04cea3fa0c6678c0
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild
deleted file mode 100644
index ad4b2205685b..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	enewgroup vboxusers
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-
-	if kernel_is -ge 4 14 0 ; then
-		eapply "${FILESDIR}"/${PN}-5.1.30-udp.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.38.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.38.ebuild
deleted file mode 100644
index 027b2333e334..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.38.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	enewgroup vboxusers
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.16.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.16.ebuild
deleted file mode 100644
index 89e331b6d043..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.16.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	enewgroup vboxusers
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.20.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.20.ebuild
new file mode 100644
index 000000000000..49a28e2fd79c
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.20.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=7
+
+inherit linux-mod user
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	enewgroup vboxusers
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 194e549bda89..c0cd8534143b 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,26 +1,19 @@
-AUX 050_virtualbox-5.1.24-nopie.patch 13749 BLAKE2B 5322746908c22f8c2eaaaa187ca10efbae9b81bb7ed13ee50346f622199dec88fa18b445d9a3bdb6a468c692116a4751e0d6facf64c4b952cf9b57ea681e6746 SHA512 85dea736b8e25751e3cad504cba00f667d1de1584ff6d528d3c291de51ab077f266b90c111d139d22e612a4310863b37c29ce91dd9c136f2065eb1464ff6b744
 AUX 050_virtualbox-5.2.8-nopie.patch 13011 BLAKE2B 17e94f0abbf52f5ee33538e63078f4cfc641fd72fc558a0f51dc3de033f2e2a2b4c38bb680847e80b1fed558e6ae287a5e1d8059ae54f59a1409215fb2424900 SHA512 a5af5766b8be4adda6fb1e1901ef18c88c24f59ac311afc58cc6d02555562f934c46159aa956b109342fb9890b1bd4af747d600c34ba8a211feebb8c9fd15715
 AUX 10-virtualbox.rules 576 BLAKE2B 11654424fdfe0276df88907476eda6ecdc84c2b2650c1d71a030009849c896ce34168daff8a29366109703f3d6756b40afa64f8a54f4ff6effedea80b4e9fc23 SHA512 12128375244e0fb090674e5a11cc70178f3c6208040830c009284addb91db7dc0a2d3cbd5d1056944782e936a63b0bcef03be0135683646c41d540413805f0ba
 AUX vboxwebsrv-confd 559 BLAKE2B 979dc91678fac7277c69e482b07f8d46df6b4df92ffb37d5358be33aa08b01808776f95e915377f3b65dc8b89b54141e70f655847aeba4d0bd12cfceb72d8889 SHA512 47af05e5c8f496f9d55cb1240ab55b3c12f655fda14a3e9d904ada18ed6b748f599b2429133772ff4bcd1f363e5afa19ff5873f9e538aebce58eb88253ef4cab
 AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6d28caaf600ca65da43006b6d69b58f6a05f7ca0301bafce2d983536db1c98ceb03ca880f5e7632023 SHA512 365bd3a9f5d8edeb921330eebf67b43f60b048d9869f8378fa68543ed6005320b06360590187631176c256d8ce49305b856a2e0c1dc20b42890e020a8c729719
 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
-AUX virtualbox-5.1.4-paxmark-bldprogs.patch 2642 BLAKE2B f8c25139dc58f6f2a9def4c3535457013a8f9ab9065d23ab858daede5d32b90a6387a0daab1fa39fad706f809799ba58405c2994c902d224cbf07118fe1af5b9 SHA512 40971ee2a2453cd830b118ee2d1d05468beec60b5c15fc36b2a01c30a454823bfc666149671f03ccbfd82abe1041e50c7d36d670da506cfb9b9faab9edcc83ee
 AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
-DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1
-DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8
 DIST VirtualBox-5.2.14.tar.bz2 118597539 BLAKE2B 5e0a8d92405378eb438cae375041609f7a0e1288b040d3a0bcc06157f16ddd48b3537f2f026aa12a71c5319bdef56d6f3907785ac51ebe05a8b7143e04f22d0a SHA512 b8202eccd83e9f2c92a77548d003082b6b3ff7838bb32ae48c3a25dcd622bfdc8ceca42cc49b855eeabf4439c55ad42df9b3959dd1bab77de154468e139c904e
-DIST VirtualBox-5.2.16.tar.bz2 118678441 BLAKE2B 9d912a51ceb69eb117d9886adf34fe4900bd941637c0610e0e0febb650cf7817b6f2fa0db4b085c0cb28c56892e7f8678e3533d7384cd155e356fa4a0ec7c0fa SHA512 361607c43e3f7fb60da6db898951317c45a7f7b782c42808759f7c29502e3778ae28e5a54b5c49d1c5e46d94f85dbd1891d69f16d756767f0155bb48531b9519
 DIST VirtualBox-5.2.18.tar.bz2 118700952 BLAKE2B 5e9a5ca5379d80a8d9d0d53fe7b1f7cd98e03b6c535867932d55aa6a936e65f2d294264da014f332c2caa933a262ced3e350d9eb685ad99dec02a02ffcf5e7cb SHA512 f67c17cdd39e699e6c80af82a2c2d0c5dab073ddba2b55393740e605debb973030c48ce736ae753fc1e680845f0b62209c0f8951db08b665e9cdd83c52d5be20
-DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
+DIST VirtualBox-5.2.20.tar.bz2 118760364 BLAKE2B 7a5f72340796d3278ef5f3210f4b25bf4d999ec93cdd0449853faf68b38c45a6ffd00fe2c88f12296029882f7715c012d1793cfff9d1c2441aa4db414fa3225e SHA512 ff039e487c43b584c5c5959df1622151d82f6c39101af869262f800d07e68a68005ed442112e36ebe249ed79de34c0b974bbd43e7889a5d40df2ebe7dec77a15
 DIST virtualbox-5.2.12-patches-01.tar.xz 2616 BLAKE2B 5731484d185414d83588ee227bbc1eef266451d1a3a710adf1b769cd6404ef1750dba7a60549f2ab9f3fb81ef15809db9ea0190127caefc72d7bc9bb8b741fb0 SHA512 712b55392a8e8357e95abb42ea4f8dac3391ecbf9cbecf27c7dbf674c40f42a1eb19d227a1b3adcf621384a9f64a6438d20fb43866c736189097fb5770c5c654
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
-EBUILD virtualbox-5.1.36.ebuild 13795 BLAKE2B b988e0db6a107ae6f5f736dd42472e6d3484c5ca99834039156eeb72ef399bc17e06a0d635cd993070450132e4fe847aa0d3b3d4b300cc5fc35507034f4f1fc1 SHA512 5d0cd2e29ebc2603deca6ededf55db38c087a5ecd0245a131fdbc52ea00b293da8f741fb1a44677b39259932930485c27821ea9205ff391011541688f014c01f
-EBUILD virtualbox-5.1.38.ebuild 13797 BLAKE2B efbb490230e3ed1468a397ba3257334bbfa7274e609f2d2c9b454e5f98458c6c78bdda845bf227edc59fda60afe92a0ac3d0e07473619166292c30453ca7c9a9 SHA512 e201534862e708eab0088e08b92b524db3723d6c2a4153507b7f760d45d4f85bb2bf4823d145ecebe7fc12ad06790a2b612e9efae7fa85de950a3147e58fd45b
 EBUILD virtualbox-5.2.14-r1.ebuild 13839 BLAKE2B 22507a4802ef4e0f8f50e622dbd0bde33ec66e23e968caa3ab22f965f9411aedeeac6fbc4ce716d7c6d48cafc4df89f30274a0ffedb05cfc86c1d230454cca4f SHA512 e0e58c4249c6b62b95f64f190217955ce4bba0b4998084fd3cfa0f5ece4466ecdb9df8084c9baf766d88ae873352dd3adaea354d86fe1bfe71d663c20072195a
-EBUILD virtualbox-5.2.16.ebuild 13908 BLAKE2B 400edf7c47f640eadae99e040afdc8fbf5bca74765998da8cae05f20cc5890b3630e4ec6d18fb7b3d12caa4286f28b96afba901bd833945f9c14b148aed632b9 SHA512 69cc9c884a3080d9b2604779c571d754224ab8ccb8f2ce3aa7bce9032a716c8669576403fc228d67e8057cb2d87c806de65c4d9392e57992d0c6db40e41560a4
 EBUILD virtualbox-5.2.18.ebuild 13908 BLAKE2B 400edf7c47f640eadae99e040afdc8fbf5bca74765998da8cae05f20cc5890b3630e4ec6d18fb7b3d12caa4286f28b96afba901bd833945f9c14b148aed632b9 SHA512 69cc9c884a3080d9b2604779c571d754224ab8ccb8f2ce3aa7bce9032a716c8669576403fc228d67e8057cb2d87c806de65c4d9392e57992d0c6db40e41560a4
-MISC metadata.xml 805 BLAKE2B 6ff816d3f6e3f51eef32f3695c7892d5be15dbd544fb384404c1409f5297df60383b3f956166230a6f6f7094647093cd4c08b3258017e0513504d74f785788f4 SHA512 5f13d0dd36d8bd45ef142c23a9a60128e31b4f40b388fee30e465100c1ee61172db4d1888dc93363f145181cab40f56ce9ae7c14b8d9f3cc91f076be86099eea
+EBUILD virtualbox-5.2.20.ebuild 13905 BLAKE2B fe95390a1b2ba8ea2d546abb7516054bf5e01ab2667973273f41b0b7f394d694f36e8205ae154baa7ca91e4323b040854bc3d21eb893a0dffbe567da74e4bea8 SHA512 6ba1b52ae6a40e311170978dd1ad5eccdfa71131e4890a461dc98984f8659ba1e477a441aa583f3eb8fc45ec0573dd5c3b8d766c87344cd65da55ed7a9661006
+MISC metadata.xml 715 BLAKE2B 76ee0065ae39b8775af3837eea940291bfd584ddc92b03629c138013d342c8e388ed61fe2dc6f22caaec093f1aa5dabddb6b8c3ae5f7e07150dd063a1e567b47 SHA512 8997ad296ccb4100bc34551601b5361b8ac0d4f2f863bb5a85f55d5b6eeb6b3fcc3dee9c91bd731f52009a2892936e170db8674bf453b59fe4768a5a1c94b2b2
diff --git a/app-emulation/virtualbox/files/050_virtualbox-5.1.24-nopie.patch b/app-emulation/virtualbox/files/050_virtualbox-5.1.24-nopie.patch
deleted file mode 100644
index 73c377a6c942..000000000000
--- a/app-emulation/virtualbox/files/050_virtualbox-5.1.24-nopie.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -Naur VirtualBox-5.1.24/Config.kmk VirtualBox-5.1.24/Config.kmk
---- VirtualBox-5.1.24/Config.kmk	2017-07-26 13:55:27.803972185 -0400
-+++ VirtualBox-5.1.24/Config.kmk	2017-07-26 13:53:10.700974328 -0400
-@@ -2601,6 +2601,7 @@
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-overlength-strings?= $(call VBOX_GCC_CHECK_CC,-Wno-overlength-strings,)'
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-overloaded-virtual?= $(call VBOX_GCC_CHECK_CXX,-Wno-overloaded-virtual,)'
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-stack-protector   ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)'
-+	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_nopie                 ?= $(call VBOX_GCC_CHECK_CC,-nopie,)'
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-dwarf2-cfi-asm    ?= $(call VBOX_GCC_CHECK_CC,-fno-dwarf2-cfi-asm,)'
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_m64                   ?= $(call VBOX_GCC_CHECK_CC,-m64,)'
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_no-pie                ?= $(call VBOX_GCC_CHECK_CC,-no-pie,)'
-@@ -3843,8 +3844,8 @@
- 
-  ifeq ($(VBOX_LDR_FMT32),elf)
-  TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
-- TEMPLATE_VBoxRc_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
-- TEMPLATE_VBoxRc_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
-+ TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
-+ TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
-   ifeq ($(KBUILD_TARGET),solaris)
-    TEMPLATE_VBoxRc_LDFLAGS           = -r
-   else
-@@ -3864,8 +3865,8 @@
-  ifeq ($(VBOX_LDR_FMT32),macho)
-  TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC_TOOL)
-  TEMPLATE_VBoxRc_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
-- TEMPLATE_VBoxRc_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-rtti
-- TEMPLATE_VBoxRc_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing
-+ TEMPLATE_VBoxRc_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-rtti
-+ TEMPLATE_VBoxRc_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing
-  TEMPLATE_VBoxRc_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)  -m32 -nostdlib
-  #TEMPLATE_VBoxRc_LDFLAGS.release     = -Wl,-S ???
-  endif
-@@ -3903,9 +3904,9 @@
-  endif
- 
-  ifeq ($(VBOX_LDR_FMT32),elf)
--  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0
--  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0
--  TEMPLATE_VBoxRcExe_LDFLAGS  = -g
-+  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0 $(VBOX_GCC_nopie)
-+  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0 $(VBOX_GCC_nopie)
-+  TEMPLATE_VBoxRcExe_LDFLAGS  = -g $(VBOX_GCC_nopie)
-   TEMPLATE_VBoxRcExe_LDFLAGS.dbgopt = -g
-   TEMPLATE_VBoxRcExe_LDFLAGS.strict = -g
-   TEMPLATE_VBoxRcExe_LDFLAGS.release = -g
-@@ -3984,8 +3985,8 @@
- 
- ifeq ($(VBOX_LDR_FMT),elf)
- TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
--TEMPLATE_VBoxR0_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
--TEMPLATE_VBoxR0_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
-+TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
-+TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
- TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
- TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
- ifeq ($(KBUILD_TARGET),solaris)
-@@ -4018,12 +4019,12 @@
- TEMPLATE_VBoxR0_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
- TEMPLATE_VBoxR0_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) \
- 	-fno-common -msoft-float -static -fno-rtti -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
--	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector)
-+	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
- TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
- TEMPLATE_VBoxR0_CXXFLAGS.x86        = -m32
- TEMPLATE_VBoxR0_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) \
- 	-fno-common -msoft-float -static -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
--	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector)
-+	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
- TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
- TEMPLATE_VBoxR0_CFLAGS.x86          = -m32
- TEMPLATE_VBoxR0_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -nostdlib
-@@ -4259,7 +4260,7 @@
- 	-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
- 	-Wimplicit-function-declaration -Werror-implicit-function-declaration \
- 	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
--	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
-+	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
- 	-nostdinc -std=c99
- TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
- TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
-@@ -4268,7 +4269,7 @@
- TEMPLATE_VBOXR0DRV_CXXFLAGS            = -fno-exceptions -fno-rtti \
- 	$(VBOX_GCC_WARN) -Wpointer-arith -Winline \
- 	-O2 -fno-strict-aliasing -fno-common -finline-limit=8000 \
--	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
-+	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
- 	-nostdinc
- TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
- TEMPLATE_VBOXR0DRV_CXXFLAGS.amd64      = $(TEMPLATE_VBOXR0DRV_CFLAGS.amd64)
-@@ -4341,7 +4342,7 @@
- 	-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
- 	-Wimplicit-function-declaration -Werror-implicit-function-declaration \
- 	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
--	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
-+	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
- 	-nostdinc -std=c99 -msoft-float
- TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 \
-     -mpreferred-stack-boundary=2 -mno-mmx -mno-sse -mno-avx \
-@@ -4353,7 +4354,7 @@
- TEMPLATE_VBOXR0DRV_CXXFLAGS            = -fno-exceptions -fno-rtti \
- 	$(VBOX_GCC_WARN) -Wpointer-arith -Winline \
- 	-O2 -fno-strict-aliasing -fno-common -finline-limit=8000 \
--	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
-+	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
- 	-nostdinc -msoft-float
- TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
- TEMPLATE_VBOXR0DRV_CXXFLAGS.amd64      = $(TEMPLATE_VBOXR0DRV_CFLAGS.amd64)
-@@ -4394,7 +4395,7 @@
- TEMPLATE_VBOXR0DRV_LDFLAGS             = -shared -no-undefined -dc -dy -lroot -rpath-link /boot/system/develop/lib/x86 --no-add-needed /boot/system/develop/lib/_KERNEL_ --no-add-needed /boot/system/develop/lib/haiku_version_glue.o
- TEMPLATE_VBOXR0DRV_CFLAGS              = -fno-PIC \
- 	$(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare \
--	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
-+	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
- TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
- TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
- TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
-@@ -5210,8 +5211,8 @@
-  TEMPLATE_VBoxNoCrtGccLib_TOOL             = $(VBOX_GCC_TOOL)
-  TEMPLATE_VBoxNoCrtGccLib_ASTOOL           = $(VBOX_ASTOOL)
-  TEMPLATE_VBoxNoCrtGccLib_ASFLAGS          = $(VBOX_ASFLAGS)
-- TEMPLATE_VBoxNoCrtGccLib_CFLAGS          += $(VBOX_GCC_fno-stack-protector)
-- TEMPLATE_VBoxNoCrtGccLib_CXXFLAGS        += $(VBOX_GCC_fno-stack-protector)
-+ TEMPLATE_VBoxNoCrtGccLib_CFLAGS          += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
-+ TEMPLATE_VBoxNoCrtGccLib_CXXFLAGS        += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
-  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-   # in 64-bit mode we'll build a sys-module (VBoxREM2).
-   if1of ($(KBUILD_TARGET), darwin solaris)
-@@ -6467,8 +6468,8 @@
- TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-pie -fno-merge-constants -std=c99 -ffreestanding
- TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants -ffreestanding
- ifndef VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE
-- TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS   += $(VBOX_GCC_fno-stack-protector)
-- TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS += $(VBOX_GCC_fno-stack-protector)
-+ TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS   += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
-+ TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
- endif
- TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
- TEMPLATE_VBOXGUESTR3XF86MOD_LIBS  = \
-diff -Naur VirtualBox-5.1.24/src/VBox/Devices/PC/ipxe/Makefile.kmk VirtualBox-5.1.24/src/VBox/Devices/PC/ipxe/Makefile.kmk
---- VirtualBox-5.1.24/src/VBox/Devices/PC/ipxe/Makefile.kmk	2017-07-26 13:55:27.746972186 -0400
-+++ VirtualBox-5.1.24/src/VBox/Devices/PC/ipxe/Makefile.kmk	2017-07-26 13:53:10.641974329 -0400
-@@ -132,6 +132,7 @@
- 	-W \
- 	-Wformat-nonliteral \
- 	$(VBOX_GCC_fno-stack-protector) \
-+	$(VBOX_GCC_nopie) \
- 	$(VBOX_GCC_fno-dwarf2-cfi-asm) \
- 	$(VBOX_GCC_Wno-address)
-  TEMPLATE_iPxe_ASFLAGS = \
-@@ -155,6 +156,7 @@
- 	-W \
- 	-Wformat-nonliteral \
- 	$(VBOX_GCC_fno-stack-protector) \
-+	$(VBOX_GCC_nopie) \
- 	$(VBOX_GCC_fno-dwarf2-cfi-asm) \
- 	$(VBOX_GCC_Wno-address) \
- 	-DASSEMBLY
diff --git a/app-emulation/virtualbox/files/virtualbox-5.1.4-paxmark-bldprogs.patch b/app-emulation/virtualbox/files/virtualbox-5.1.4-paxmark-bldprogs.patch
deleted file mode 100644
index 50fa306d1766..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-5.1.4-paxmark-bldprogs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-2017-02-20  Quentin Minster <quentin@minster.io>
-
-	#https://bugs.gentoo.org/show_bug.cgi?id=591582
-	* Config.kmk: add paxmark befor VBOX_VBOXTPG get run.
-	* src/VBox/VMM/Makefile.kmk: add paxmark befor VBOX_VBOXCPP get run.
-	* src/VBox/Main/Makefile.kmk: add paxmark befor USBIdDatabaseGenerator_1_TARGET get run.
-
---- a/Config.kmk
-+++ b/Config.kmk	2016-09-21 02:22:28 
-@@ -3719,11 +3719,13 @@
- 		$(if-expr $(intersects $(KBUILD_TARGET_ARCH),$(KBUILD_ARCHES_64)),-64,-32) \
- 		-h --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv
- define TOOL_VBoxTpG_DTRACE_HDR_CMDS
-+	$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)"
- 	$(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)"
- endef
- TOOL_VBoxTpG_DTRACE_OBJ_NOT_NEEDED :=
- TOOL_VBoxTpG_DTRACE_OBJ_FLAGS      := -G --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv
- define TOOL_VBoxTpG_DTRACE_OBJ_CMDS
-+	$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)"
- 	$(QUIET)$(VBOX_VBOXTPG) \
- 		$(if-expr $(intersects $(bld_trg_arch),$(KBUILD_ARCHES_64)),-64,-32) \
- 		$(flags) \
-@@ -3738,6 +3740,7 @@
- TOOL_VBoxTpG-Disabled_DTRACE_DEPORD     = $(VBOX_VBOXTPG)
- TOOL_VBoxTpG-Disabled_DTRACE_HDR_FLAGS := -h
- define TOOL_VBoxTpG-Disabled_DTRACE_HDR_CMDS
-+	$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)"
- 	$(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)"
- endef
- TOOL_VBoxTpG-Disabled_DTRACE_OBJ_NOT_NEEDED := $(KBUILD_OSES)
-@@ -3752,6 +3755,7 @@
- TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS =
- define TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS
- 	$(TOOL_StandardDTrace_DTRACE_HDR_CMDS)
-+	$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)"
- 	$(QUIET)$(VBOX_VBOXTPG) --generate-wrapper-header --host-$(VBOX_HC_ARCH_BITS)-bit --ring-3-context \
- 		$(filter-out -C, $(filter-out -h,$(flags))) \
- 		-o "$(out).tmp" -s "$(source)"
---- a/src/VBox/VMM/Makefile.kmk
-+++ b/src/VBox/VMM/Makefile.kmk	2016-09-21 02:26:11 
-@@ -795,6 +795,7 @@
-  define def_vmm_lib_dtrace_preprocess
-   $$$$(VMMLibDTrace_0_OUTDIR)/$1: $2 $$(VBOX_VBOXCPP) | $$$$(dir $$$$@)
- 	$$(QUIET)$$(call MSG_GENERATE,VMMLibDTrace,$$@,$$<)
-+	$$(QUIET)paxmark.sh -m "$(VBOX_VBOXCPP)"
- 	$$(QUIET)$(VBOX_VBOXCPP) -d \
- 		-D VBOX_FOR_DTRACE_LIB \
- 		-D VBOX_FOR_DTRACE_LIB_$(toupper $(KBUILD_TARGET_ARCH)) \
---- a/src/VBox/Main/Makefile.kmk
-+++ b/src/VBox/Main/Makefile.kmk	2016-09-21 02:31:23 
-@@ -522,6 +522,7 @@
-  $$(VBoxSVC_0_OUTDIR)/USBIdDatabase.cpp:  $$(USBIdDatabaseGenerator_1_TARGET) \
-  		$(PATH_SUB_CURRENT)/src-server/usb.ids $(PATH_SUB_CURRENT)/src-server/custom.ids | $$(dir $$@)
- 	$(call MSG_GENERATE,USBIdDatabase,$@,$<)
-+	$(QUIET)paxmark.sh -m "$(USBIdDatabaseGenerator_1_TARGET)"
- 	$(QUIET)$(USBIdDatabaseGenerator_1_TARGET) -o "$@" $(filter %.ids,$^)
- 
-  BLDPROGS += USBIdDatabaseGenerator
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index e75aaef2f83e..0c28b5e71973 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -8,7 +8,6 @@
   <use>
   <flag name="headless">Build without any graphic frontend</flag>
   <flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag>
-  <flag name="opus">Adds support for the Opus codec via <pkg>media-libs/opus</pkg></flag>
   <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
   <flag name="sdk">Enable building of SDK</flag>
   <flag name="udev">Controls installation of special USB udev rules.</flag>
diff --git a/app-emulation/virtualbox/virtualbox-5.1.36.ebuild b/app-emulation/virtualbox/virtualbox-5.1.36.ebuild
deleted file mode 100644
index b16e1523f1a6..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.1.36.ebuild
+++ /dev/null
@@ -1,470 +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 flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.32-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( virtual/opengl media-libs/freeglut )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130-r1
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jdk-1.6 )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Don't use "echo -n"
-	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	# *.rc files for x86_64 are only available on multilib systems
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${fwfile} 0644
-	done
-	popd &>/dev/null || die
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox 4750
-			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox VirtualBox ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.1.38.ebuild b/app-emulation/virtualbox/virtualbox-5.1.38.ebuild
deleted file mode 100644
index 82fd4f21ebc0..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.1.38.ebuild
+++ /dev/null
@@ -1,470 +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 flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.32-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( virtual/opengl media-libs/freeglut )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130-r1
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jdk-1.6 )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Don't use "echo -n"
-	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	# *.rc files for x86_64 are only available on multilib systems
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${fwfile} 0644
-	done
-	popd &>/dev/null || die
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox 4750
-			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox VirtualBox ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.2.16.ebuild b/app-emulation/virtualbox/virtualbox-5.2.16.ebuild
deleted file mode 100644
index cacca024750a..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.2.16.ebuild
+++ /dev/null
@@ -1,473 +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 flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( virtual/opengl media-libs/freeglut )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jdk-1.6 )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Don't use "echo -n"
-	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus --build-libopus '')
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	# *.rc files for x86_64 are only available on multilib systems
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${fwfile} 0644
-	done
-	popd &>/dev/null || die
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox 4750
-			pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox VirtualBox ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.2.20.ebuild b/app-emulation/virtualbox/virtualbox-5.2.20.ebuild
new file mode 100644
index 000000000000..adcba1fd0cd8
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.2.20.ebuild
@@ -0,0 +1,473 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jdk-1.6 )
+	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Don't use "echo -n"
+	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if  gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax_kernel
+	if use pax_kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus --build-libopus '')
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${fwfile} 0644
+	done
+	popd &>/dev/null || die
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox 4750
+			pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 81c306d93f95..92d6817cd48d 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -1,19 +1,19 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
 DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
 DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
 DIST wine-3.17.tar.xz 21457736 BLAKE2B 34c2390bd1180f81a15e7db4c712bddd3436033f209870d31f7f286d7dba8c8a65f5dd5cb13cf4c0719cef6a53c168d104e3c78a5ca1777ecf401d8d74e7927a SHA512 ea50c9e09d3fd7f41ff96a1219d43896946ac79c8cdef31ae56e10664fc3b0b6dd1f9d8cd72db874d08c431eba9c8033ea72182499666a5aa62c1056876b0a66
-DIST wine-d3d9-3.14.tar.gz 50546 BLAKE2B 47169741d0330902a006ce4a7663de317b221cfaa3e19abfbb3af2ff886e2a42a1185151531c2b67b57bdafc5646c10f57cd4ff11faf1d2f36c9f269f382637d SHA512 921bd096aa039d002b0f3c5f856668063a34164ad097cee696f45af7d148e80a78b05dfb879f91337fea2cb6e06dd99be2d199b5186c9cd7726dc72f31ddd1ea
+DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e
 DIST wine-d3d9-3.15.tar.gz 50540 BLAKE2B 5fbb56d4e6b2373fa9a2075a379e577584a50c04fa15fbe3e282d25b03211e64dc5f429082a654c3c61016ddda9c5a12277b78086a0938e5cb20952b01ef72e2 SHA512 448433198cb40628edf2ee6f7697671c9efb1c8e68ce826b0edc884625e5f1659956f0c76ea995443c29ca4cefe5030559860d7413f553fc4a3523df3a35b3a7
 DIST wine-d3d9-3.16.tar.gz 50547 BLAKE2B d2031ceeb048a1221bd99c634b4ff84787b46fe79bb781c429706c5030a2509792ee3f24ca0d69d844d2d1e505c688aec255b5bf9a6561dc74a819360522c8df SHA512 3f1d2d75fc11ea7dfbe6b9e4e75c4dccc6488814e53be53ba7513da56848d6a57a7a7c66a70088b0615078b00a784caa9033d0415d3c3bb29adbd373d72a4d10
 DIST wine-d3d9-3.17.tar.gz 50535 BLAKE2B 13e422d9c87696e7573f21120dbc4872792b6abd6dc28638ea3645d97eae1a6d12e8a8f91a219856aa5bf83c3882bc27fd52c5ae66f87a51d362694728f583ba SHA512 06b4c28650a6de9b5028ba9072f75f12c1d47aaa1008d4d21d1c3d26025dd1e42fa23928d2c33167dd969fcd9234b7766f4c6c2e0376b5aad5b38016e48296f8
-DIST wine-staging-3.14.tar.gz 9938677 BLAKE2B 0f801298ad23d24688d072236bfa5b9fc549e1ecb964912f90029efd71fab27a38661df27433b52d1356a2b800c9a7c39d91ae08f60eb2deaf211d97a1ba60b7 SHA512 f998baac6be3fece1ae6d4e924f883befea43f849d678c987e9fe4d102cf22fde7b4a0fa728294c46d70c7d29caa037022fb9e33ce4b4fac0e49c94d25cdfa66
+DIST wine-d3d9-3.18.tar.gz 50540 BLAKE2B 53e292015f420657d5fa54e4fdd1fa86cb03c0ae7c092cb96642a211600fd96fcbe7fa2f8451248e4fb4b7a78bcc174a2db07c7a3ca15ed95a2e70bd4d35876b SHA512 f62b88572210f318da6ff010b4615d0edf215d15fb29292548f116685cb51fffd48aeb393f3471b01604aacbddaf3115522d678307e2c3f5405d1fd6a6f4503c
 DIST wine-staging-3.15.tar.gz 9941091 BLAKE2B 5a0e37ce52ff3e6130434aa56953e70fafb0c83dc33fa1ad7562a9244821ae75c30b9c858c7506462348b6d13016c236a14bde0297bc43d2d282d60c6c012470 SHA512 f0ed9d4a099b03c04a126927919b7eddbdaff7a08a0b97cdf387c64318826d6454183cf03997425b349540d13b1ccf6262aa2c5af0af682939584e3de71b7541
 DIST wine-staging-3.16.tar.gz 9928264 BLAKE2B 61882e36da7026b078e753de7a3a089fc64578fc2cf4ceb27146125003e86cc386ada2fa55d48e40279665218ae630bf63fce12b72acddfd8e4a6ea1730a9fca SHA512 25f06b06a0880b3926d9d3dfb35fd1aeb1f168426917dee32dcf906970474862021416f4e9db1917d8320962bc0bc17d1f3dad21b634a60b8e0da87a4b54067e
 DIST wine-staging-3.17.tar.gz 9928657 BLAKE2B 549c44cb07423405b95351a8b7c2675ea8dafc015d457b87235d36c7b115778336bd52d6fa97b10dd9d439c8938f05fc81b6b73082680d906db93c8e401f29c8 SHA512 2fe9e8f801b53fa9b71fd908f5403956251522851383bfdde6828c6a8545d6f50ac8c41df54d89c2f92d74dc3bb563cd6a7d8ad394002c981197b71adc1a5e13
-EBUILD wine-any-3.14.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
+DIST wine-staging-3.18.tar.gz 9927742 BLAKE2B efd581555feacaac263e550c3a854b4a3ad92c72d7f81bb7cfc846a94d57decde1e82f38de4586eb824b2fe3574581621f0251cc1a126796f466e99e85e8e609 SHA512 d7c353b2302616b8ffe9f41090bc36c8869238410eda16072aed0b70e54c8a09b4a48d439fc9e4f211804945d55dc4a00a5d70efd2ca4a50f72db7607e6ef10e
 EBUILD wine-any-3.15.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
 EBUILD wine-any-3.16.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
 EBUILD wine-any-3.17.ebuild 20973 BLAKE2B 7e210014cb1cbfdabf10042c2d266e199ab7ca3a081f07bd1620c349a1d5bee567378baeb62b3733a942089298d0f8665e1f3ac42c4e0f516abb32059457965a SHA512 5340fc18b05d6cb936bfd75f2256f7d8b4ab89ab50f78957f995a02008466ae23dfaf4fb6b494552a97938079fc8850ef8dc001a43c650e1f5149465d95a770d
+EBUILD wine-any-3.18.ebuild 20973 BLAKE2B 7e210014cb1cbfdabf10042c2d266e199ab7ca3a081f07bd1620c349a1d5bee567378baeb62b3733a942089298d0f8665e1f3ac42c4e0f516abb32059457965a SHA512 5340fc18b05d6cb936bfd75f2256f7d8b4ab89ab50f78957f995a02008466ae23dfaf4fb6b494552a97938079fc8850ef8dc001a43c650e1f5149465d95a770d
 EBUILD wine-any-9999.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
 MISC metadata.xml 3643 BLAKE2B ced8978273d0254eccfd90f9e0f929d6de1161d9299f5f39e6381de0daa2f0a62fe59016b3c4bcb005ac6b4f329b9451e9e68412b723e4b173d0d59ba39eba40 SHA512 b4b14069065e796a337e5f3b28659ab5d81dc04041e73d08d913185778299b5b9bf793d04bdcee01fe30b1264826b02833aabe2b53b409f3e6699d84106acf5e
diff --git a/app-emulation/wine-any/wine-any-3.14.ebuild b/app-emulation/wine-any/wine-any-3.14.ebuild
deleted file mode 100644
index 66208fb6657b..000000000000
--- a/app-emulation/wine-any/wine-any-3.14.ebuild
+++ /dev/null
@@ -1,641 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-	D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
-	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	ffmpeg? ( staging )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	d3d9? (
-		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libxcb[${MULTILIB_USEDEP}]
-	)
-	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging || use d3d9; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
-			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-		if use d3d9; then
-			git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
-			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
-		fi
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE=""
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-	if use d3d9; then
-		if use staging; then
-			PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
-		else
-			PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
-		fi
-		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with ffmpeg)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-	use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${P} || die
-		fi
-		if use d3d9; then
-			eselect wine register --d3d9 ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging ${P} || die
-		fi
-		if use d3d9; then
-			eselect wine deregister --d3d9 ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-any/wine-any-3.18.ebuild b/app-emulation/wine-any/wine-any-3.18.ebuild
new file mode 100644
index 000000000000..67fbe2cda640
--- /dev/null
+++ b/app-emulation/wine-any/wine-any-3.18.ebuild
@@ -0,0 +1,641 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+	D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	ffmpeg? ( staging )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	d3d9? (
+		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.3 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging || use d3d9; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+		if use d3d9; then
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+	if use d3d9; then
+		if use staging; then
+			PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
+		else
+			PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+		fi
+		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with ffmpeg)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+	use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+		if use d3d9; then
+			eselect wine register --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+		if use d3d9; then
+			eselect wine deregister --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index a48a1234a2e2..10a051a3f0a9 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
 DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
 DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
 DIST wine-3.17.tar.xz 21457736 BLAKE2B 34c2390bd1180f81a15e7db4c712bddd3436033f209870d31f7f286d7dba8c8a65f5dd5cb13cf4c0719cef6a53c168d104e3c78a5ca1777ecf401d8d74e7927a SHA512 ea50c9e09d3fd7f41ff96a1219d43896946ac79c8cdef31ae56e10664fc3b0b6dd1f9d8cd72db874d08c431eba9c8033ea72182499666a5aa62c1056876b0a66
-DIST wine-d3d9-3.14.tar.gz 50546 BLAKE2B 47169741d0330902a006ce4a7663de317b221cfaa3e19abfbb3af2ff886e2a42a1185151531c2b67b57bdafc5646c10f57cd4ff11faf1d2f36c9f269f382637d SHA512 921bd096aa039d002b0f3c5f856668063a34164ad097cee696f45af7d148e80a78b05dfb879f91337fea2cb6e06dd99be2d199b5186c9cd7726dc72f31ddd1ea
+DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e
 DIST wine-d3d9-3.15.tar.gz 50540 BLAKE2B 5fbb56d4e6b2373fa9a2075a379e577584a50c04fa15fbe3e282d25b03211e64dc5f429082a654c3c61016ddda9c5a12277b78086a0938e5cb20952b01ef72e2 SHA512 448433198cb40628edf2ee6f7697671c9efb1c8e68ce826b0edc884625e5f1659956f0c76ea995443c29ca4cefe5030559860d7413f553fc4a3523df3a35b3a7
 DIST wine-d3d9-3.16.tar.gz 50547 BLAKE2B d2031ceeb048a1221bd99c634b4ff84787b46fe79bb781c429706c5030a2509792ee3f24ca0d69d844d2d1e505c688aec255b5bf9a6561dc74a819360522c8df SHA512 3f1d2d75fc11ea7dfbe6b9e4e75c4dccc6488814e53be53ba7513da56848d6a57a7a7c66a70088b0615078b00a784caa9033d0415d3c3bb29adbd373d72a4d10
 DIST wine-d3d9-3.17.tar.gz 50535 BLAKE2B 13e422d9c87696e7573f21120dbc4872792b6abd6dc28638ea3645d97eae1a6d12e8a8f91a219856aa5bf83c3882bc27fd52c5ae66f87a51d362694728f583ba SHA512 06b4c28650a6de9b5028ba9072f75f12c1d47aaa1008d4d21d1c3d26025dd1e42fa23928d2c33167dd969fcd9234b7766f4c6c2e0376b5aad5b38016e48296f8
-EBUILD wine-d3d9-3.14.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
+DIST wine-d3d9-3.18.tar.gz 50540 BLAKE2B 53e292015f420657d5fa54e4fdd1fa86cb03c0ae7c092cb96642a211600fd96fcbe7fa2f8451248e4fb4b7a78bcc174a2db07c7a3ca15ed95a2e70bd4d35876b SHA512 f62b88572210f318da6ff010b4615d0edf215d15fb29292548f116685cb51fffd48aeb393f3471b01604aacbddaf3115522d678307e2c3f5405d1fd6a6f4503c
 EBUILD wine-d3d9-3.15.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
 EBUILD wine-d3d9-3.16.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
 EBUILD wine-d3d9-3.17.ebuild 18589 BLAKE2B e5c7433d1d5a73e90d6602779799a6b8c7ef4700e3bd338e015c297c1aeae96c3d494bf3b3e3d31ff70d4ae0b2e9f7e46917fe5e1cd8901d7e930d0ead2049a8 SHA512 b077b02b80cb67a4aa717e398a231305a32bd37c0c2eb420dafd2025ec7ce87ce22573888d867eba215b157a5856a20e8b5e6505d04b6b05c3e14ca614058957
+EBUILD wine-d3d9-3.18.ebuild 18589 BLAKE2B e5c7433d1d5a73e90d6602779799a6b8c7ef4700e3bd338e015c297c1aeae96c3d494bf3b3e3d31ff70d4ae0b2e9f7e46917fe5e1cd8901d7e930d0ead2049a8 SHA512 b077b02b80cb67a4aa717e398a231305a32bd37c0c2eb420dafd2025ec7ce87ce22573888d867eba215b157a5856a20e8b5e6505d04b6b05c3e14ca614058957
 EBUILD wine-d3d9-9999.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
 MISC metadata.xml 3320 BLAKE2B bbf5e79928f29d124d8a7dd947aa42fdf690d0d7f8905a0e0f43185b7026d4dde787809844ce230c3ab285a3c476c807973b899589d0d383931c96c9f1d54966 SHA512 14e380383fa5345cbd6c5366456f8d122c7bccbf54db863945e5c7673457f29f97e629ec3538030bd991f254d0262045a2d97a467cb100e80e1989728ba65c96
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild
deleted file mode 100644
index b92ea182b4a0..000000000000
--- a/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild
+++ /dev/null
@@ -1,575 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
-	SRC_URI="${SRC_URI}
-	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	d3d9? (
-		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libxcb[${MULTILIB_USEDEP}]
-	)
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use d3d9; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT."
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT, and D3D9_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-		if use d3d9; then
-			git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
-			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
-		fi
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use d3d9; then
-		PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
-		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	else
-		if use d3d9; then
-			eselect wine register --d3d9 ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	else
-		if use d3d9; then
-			eselect wine deregister --d3d9 ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild
new file mode 100644
index 000000000000..175fd1b98d03
--- /dev/null
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild
@@ -0,0 +1,575 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
+else
+	SRC_URI="${SRC_URI}
+	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	d3d9? (
+		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.3 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use d3d9; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use d3d9; then
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use d3d9; then
+		PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use d3d9; then
+			eselect wine register --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use d3d9; then
+			eselect wine deregister --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 3270999f48e6..e7df3ba4361c 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
 DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
 DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
 DIST wine-3.17.tar.xz 21457736 BLAKE2B 34c2390bd1180f81a15e7db4c712bddd3436033f209870d31f7f286d7dba8c8a65f5dd5cb13cf4c0719cef6a53c168d104e3c78a5ca1777ecf401d8d74e7927a SHA512 ea50c9e09d3fd7f41ff96a1219d43896946ac79c8cdef31ae56e10664fc3b0b6dd1f9d8cd72db874d08c431eba9c8033ea72182499666a5aa62c1056876b0a66
-DIST wine-staging-3.14.tar.gz 9938677 BLAKE2B 0f801298ad23d24688d072236bfa5b9fc549e1ecb964912f90029efd71fab27a38661df27433b52d1356a2b800c9a7c39d91ae08f60eb2deaf211d97a1ba60b7 SHA512 f998baac6be3fece1ae6d4e924f883befea43f849d678c987e9fe4d102cf22fde7b4a0fa728294c46d70c7d29caa037022fb9e33ce4b4fac0e49c94d25cdfa66
+DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e
 DIST wine-staging-3.15.tar.gz 9941091 BLAKE2B 5a0e37ce52ff3e6130434aa56953e70fafb0c83dc33fa1ad7562a9244821ae75c30b9c858c7506462348b6d13016c236a14bde0297bc43d2d282d60c6c012470 SHA512 f0ed9d4a099b03c04a126927919b7eddbdaff7a08a0b97cdf387c64318826d6454183cf03997425b349540d13b1ccf6262aa2c5af0af682939584e3de71b7541
 DIST wine-staging-3.16.tar.gz 9928264 BLAKE2B 61882e36da7026b078e753de7a3a089fc64578fc2cf4ceb27146125003e86cc386ada2fa55d48e40279665218ae630bf63fce12b72acddfd8e4a6ea1730a9fca SHA512 25f06b06a0880b3926d9d3dfb35fd1aeb1f168426917dee32dcf906970474862021416f4e9db1917d8320962bc0bc17d1f3dad21b634a60b8e0da87a4b54067e
 DIST wine-staging-3.17.tar.gz 9928657 BLAKE2B 549c44cb07423405b95351a8b7c2675ea8dafc015d457b87235d36c7b115778336bd52d6fa97b10dd9d439c8938f05fc81b6b73082680d906db93c8e401f29c8 SHA512 2fe9e8f801b53fa9b71fd908f5403956251522851383bfdde6828c6a8545d6f50ac8c41df54d89c2f92d74dc3bb563cd6a7d8ad394002c981197b71adc1a5e13
-EBUILD wine-staging-3.14.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
+DIST wine-staging-3.18.tar.gz 9927742 BLAKE2B efd581555feacaac263e550c3a854b4a3ad92c72d7f81bb7cfc846a94d57decde1e82f38de4586eb824b2fe3574581621f0251cc1a126796f466e99e85e8e609 SHA512 d7c353b2302616b8ffe9f41090bc36c8869238410eda16072aed0b70e54c8a09b4a48d439fc9e4f211804945d55dc4a00a5d70efd2ca4a50f72db7607e6ef10e
 EBUILD wine-staging-3.15.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
 EBUILD wine-staging-3.16.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
 EBUILD wine-staging-3.17.ebuild 20005 BLAKE2B 80b25133664b4dd9f711f28b4ad0ac13d9c7dbcad0d60b43d37b79a992c9548ce4eb599766ad3409bdbe73f483da0110ceb1e0c01ae2585d09dfbe73da470b4c SHA512 70bf2780cfe12ab081ac4eea18d9aa808a9351db4e5e024c000ab777dc170955f5bf1d685bf16b0acbe1c0a500853dc787c73be228cc7999e6dabbe02e69ceeb
+EBUILD wine-staging-3.18.ebuild 20005 BLAKE2B 80b25133664b4dd9f711f28b4ad0ac13d9c7dbcad0d60b43d37b79a992c9548ce4eb599766ad3409bdbe73f483da0110ceb1e0c01ae2585d09dfbe73da470b4c SHA512 70bf2780cfe12ab081ac4eea18d9aa808a9351db4e5e024c000ab777dc170955f5bf1d685bf16b0acbe1c0a500853dc787c73be228cc7999e6dabbe02e69ceeb
 EBUILD wine-staging-9999.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
 MISC metadata.xml 3470 BLAKE2B 683b5e57f446a5b16aca729521acba46253b5977bedcd519deedf2c7745c0137b69c577d837e99fcdecd6c247f18078d37ac2e9e2e3348a2a302b2e3caf9940c SHA512 9170c486966e9ecdd04d33c05d14c8e4086fe6d3d93d86370424c02046a68dc970d17be6de1f4f976ebc6f7d4a8a40c8d9b0884743133752bc3d14242bec5a64
diff --git a/app-emulation/wine-staging/wine-staging-3.14.ebuild b/app-emulation/wine-staging/wine-staging-3.14.ebuild
deleted file mode 100644
index 2977288b1ee9..000000000000
--- a/app-emulation/wine-staging/wine-staging-3.14.ebuild
+++ /dev/null
@@ -1,612 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	ffmpeg? ( staging )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
-			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE=""
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with ffmpeg)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/wine-staging-3.18.ebuild b/app-emulation/wine-staging/wine-staging-3.18.ebuild
new file mode 100644
index 000000000000..fcac5949b93a
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-3.18.ebuild
@@ -0,0 +1,612 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	ffmpeg? ( staging )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.3 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with ffmpeg)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 523f67e8f09b..07d6000cd10c 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-3.0.2.tar.xz 19726920 BLAKE2B e108f851b2d893b052a26ae4368f3337bebcc81bb9ea9abf93c5b7d6e01e613ce6e5db98696ab6ad8e266f6f0f0b9c5ddccb66ae7ba7183912a7911fac4b9633 SHA512 dbd0f242c5eace297ad16e314b8ad139e7d430de7eb8ca52b2006d0b80db4809e28a0e785d404a65ea1acdb56e7f06ebfc9a50071db1edaa6180c8835e7c4b13
 DIST wine-3.0.3.tar.xz 19735412 BLAKE2B f0ccbe272f1013386f89805cf1573cf001eb875bccb31a1884fad1dff5f90caf727c460406af80f63db7a227d85f25f57c8e8e650a171adbe0c3f5178ddf17e8 SHA512 11043a9a9434681f9c73590688b600b3b9e3d311be2c4d97b5f58f0740500ebcfbdc826bd6584d5dd392dccbdd9389ffa04c8fedbba43a4df2e6aeb922414412
-DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
 DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
 DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
 DIST wine-3.17.tar.xz 21457736 BLAKE2B 34c2390bd1180f81a15e7db4c712bddd3436033f209870d31f7f286d7dba8c8a65f5dd5cb13cf4c0719cef6a53c168d104e3c78a5ca1777ecf401d8d74e7927a SHA512 ea50c9e09d3fd7f41ff96a1219d43896946ac79c8cdef31ae56e10664fc3b0b6dd1f9d8cd72db874d08c431eba9c8033ea72182499666a5aa62c1056876b0a66
+DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e
 EBUILD wine-vanilla-3.0.2.ebuild 17123 BLAKE2B 5aef4adb2ece22b4abaee6fcff8fc28aa73dff048c09f7dfce3314563bffa17657c35e243b9fa689f8ffd94c4dc266b32884f2a85d8161da76ec9b6dedfb0413 SHA512 eacd129eb9d98f3d46993505d81fb70bcb1435a9cf371fb1ca9a512edab6d235ec5398241a5db3e5281e5c677454b43de8dfbd15ea63c7b927db5dd5d3885904
-EBUILD wine-vanilla-3.0.3.ebuild 17125 BLAKE2B 51d4eeb0ef880774cfd8ffce30c8482e9c0a847cbfbecb15159e95497c9a56f62a7ecb1c941bda4f31fe4d89bd11fb740d747f28df28275ead43503af994eaf5 SHA512 011941555712a3a02ff08bdab12b467da71a151efdeb0bce060b9c51c02f8ffec5368b70969a36424b9272ad981e2e8a4725f7de35a8d6064e9e8ad00ccb0f35
-EBUILD wine-vanilla-3.14.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
+EBUILD wine-vanilla-3.0.3.ebuild 17120 BLAKE2B a8cf3d4872ba5f91a691817bfc9421a6a5bc1079141c8c3d53dc5726bc2aacd46090d253390278ec5e8e19c63e613c1289a62957a75487f7dc10ee68b8e4778d SHA512 36c54300f1d396a0e5d990316525dd68103a5e25623e84134b35e708d35d7c8b4cbf6100e91396b29daed058fc64a51bac39b7b14684baffafe1e2f05f695b23
 EBUILD wine-vanilla-3.15.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
 EBUILD wine-vanilla-3.16.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
 EBUILD wine-vanilla-3.17.ebuild 17345 BLAKE2B c414a4940927f4c3f840cfed8db171d6f2e67c3c46ff8fa82a28fb85ca2f81e6f8cb494f1bb55c027d48c09ab477430a7f17d736d1b55cd732e26cdc185f42b5 SHA512 2f6eb3194cfe10f45413123acfd28c7c50932a59fa760674264fb684c87fe5040980b6ef58dc5e55de5e5218f876efd6894a3eb5bdc1d93c42109ee24b82302d
+EBUILD wine-vanilla-3.18.ebuild 17345 BLAKE2B c414a4940927f4c3f840cfed8db171d6f2e67c3c46ff8fa82a28fb85ca2f81e6f8cb494f1bb55c027d48c09ab477430a7f17d736d1b55cd732e26cdc185f42b5 SHA512 2f6eb3194cfe10f45413123acfd28c7c50932a59fa760674264fb684c87fe5040980b6ef58dc5e55de5e5218f876efd6894a3eb5bdc1d93c42109ee24b82302d
 EBUILD wine-vanilla-9999.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
 MISC metadata.xml 3082 BLAKE2B 5ddadb49dd2e5b9da259d3313e2406e37871271f8261e9501508a50220a8ea31a68185d5fcecce968bc4f4915de6901060d980476ce2ddd61d1866d2766b0cfe SHA512 fa40b440a418dd442bdebb7914c84f648f74a18286f91d59726cbfefa1bebec8afab1f9a7b6ed8c7ae2788253dcaea9dc13cb4eff09ca6da56370e280952be70
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.3.ebuild
index 0fc721308065..f45b346be1f7 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(get_version_component_range 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild
deleted file mode 100644
index 9a0d8ea7f20a..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild
+++ /dev/null
@@ -1,532 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild
new file mode 100644
index 000000000000..72a38a225bc2
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild
@@ -0,0 +1,532 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.3 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/x48/Manifest b/app-emulation/x48/Manifest
index 5fb25f70c84a..1f852b62c675 100644
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@@ -1,4 +1,3 @@
 DIST x48-0.6.4.tar.bz2 227991 BLAKE2B 8db2962860eeb161a8efc9d46730c71d95d0331157e3e2481a978385ad54b04b7a4eb601c68e7df966194b23e0cd04bed4e80511d22695bb7ccdd3959d8fd8d7 SHA512 60fdba1171a02e4a5f9bcefb29fff9398fdbda50553c3d3b952fab0b4ebf87b219d4615139ca3673b1c61ff6d6559aab3e93218334aa6cdb442d4861347138ce
 EBUILD x48-0.6.4-r1.ebuild 1732 BLAKE2B f8b7e2da5f69ee7a95f36d800422a59007d3c3f887253e3e9725028bccd82c61605c20c78485e28829b12cef4f2ec55d15f7b183037a73ae9f9f8ce834d1ec25 SHA512 5ffd669ffa64e5c179a3791621830544cbe99935e465686b6be030173650080741a1f5e7a98a503b88218a609ef054941f42abf80148bcd491afa0df5b80229d
-EBUILD x48-0.6.4.ebuild 1658 BLAKE2B 188fa81f668f207fdf11b780dec7ed88d85aa361fe1d496a5e1aaa5c62525afce937c3fedae24927fd66746ceea936d5b7a0a0c2ca19181ec513234b4fd0ea91 SHA512 4c3d4048b5c51fa28d348c52ec61281eeca0a5765d69e96c2f978892f6760b6ba06dab713cd68483551022d3b08d5e74c4bca9ec47e03337bbdc59d16bba45eb
 MISC metadata.xml 716 BLAKE2B 6869cac178f0a9b87c943acbced134699bb4deb1309a14ceffd6ae71ec876224e50657b2adf8329c05f180f35317bccad048d4c4597b5945e940d98a734b1787 SHA512 518c89c4c0d49f9482a9dad05c0d6df7b28121807a9893dedd6448169c62f2719bf4bd1097ce88143bc44e80a782bf6ddb7897062fbce06a5c345b3efb8ffb14
diff --git a/app-emulation/x48/x48-0.6.4.ebuild b/app-emulation/x48/x48-0.6.4.ebuild
deleted file mode 100644
index cc84f6518da5..000000000000
--- a/app-emulation/x48/x48-0.6.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools
-
-DESCRIPTION="HP48 Calculator Emulator"
-HOMEPAGE="http://x48.berlios.de/"
-SRC_URI="mirror://sourceforge/x48.berlios/${P}.tar.bz2"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="readline"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-src_unpack() {
-	mkdir -p "${S}"
-	cd "${S}"
-	unpack ${A}
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable readline)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/share/"${PN}"/romdump
-	doins -r romdump/{README,ROMDump*}
-	dodoc AUTHORS README ChangeLog
-}
-
-pkg_postinst() {
-	elog "The X48 emulator requires an HP48 ROM image to run."
-	elog
-	elog "If you own an HP-48 calculator, you can use the ROMDump utility"
-	elog "included with this package to obtain it from your calculator."
-	elog "The instructions of how to do this are included in the package."
-	elog
-	elog "Alternatively, HP has provided the ROM images for non-commercial"
-	elog "use only."
-	elog
-	elog "Due to confusion over the legal status of these ROMs you must"
-	elog "manually download one from http://www.hpcalc.org/hp48/pc/emulators/"
-	elog
-	elog "If you do not know which one to use, try 'HP 48GX Revision R ROM.'"
-	elog
-	elog "Once you have a ROM, you will need to install it by running:"
-	elog
-	elog "x48 -rom gxrom-r"
-	elog
-	elog "You will only have to do this the first time you run X48. The"
-	elog "ROM will be stored in ~/.hp48/rom for future runs."
-}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index ed83f91a68ed..2d99efbb3325 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 217f3fa08132..a5b9293617c6 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,6 +1,8 @@
 DIST eselect-repository-4.tar.gz 5535 BLAKE2B 4dce6c0136ec9394c9bf4128ec26ab67260d4b96a165825ae7b15b8476d10d23fcc5190946fc54013d6eb8e4f18988b07df4c849ba50844571986a6823511547 SHA512 0d3c204d73bb4314bc24fdf6cd837f2a56ac00d1d11fbec7f072af874bc468777676bba40e0cc17553f6dec7a907f10865f9c356a6390372e0734173465ac483
 DIST eselect-repository-5.tar.gz 5607 BLAKE2B cc007474b51873b7fa7f9c56572be717e7b8dff0d46c21d838911bcf9ecea99549da8e9f2d63c8101c0bc9c2ca230bfaba46f8bd770488d6566a62b2ac2ab0a6 SHA512 b5cf1701cc1d0cb50afcb9403f5c6f41223240891029f51ff899144eecee6fa3d7cfad23c477fae23733f9005413facd2cb8e9e1dea70931abc691a225fa83b4
+DIST eselect-repository-6.tar.gz 5605 BLAKE2B 4a6dbb3f573cb1c4e212d02d011e79d8522828b8928bf28016b616c8eefd3beb08db8b555728d4e7f83473f2d36395eb1e2f1d8d21ccd5817e38a5d555cf6f09 SHA512 02ca2d66a6cfe4c68dea780440bf7fd431c575e535139a43c2b6201e833e43d174772486c97dc4154fc2d813935079d36c116ee907db115f7cb281db3d72add7
 EBUILD eselect-repository-4.ebuild 971 BLAKE2B 18ffed0ba63a3cd42f8d543038bdabd9498252b6fe0664dc09b29287b5960b16d04469506a90a0dae2dfd911a62ac8f7054837acb0c8593d1204b5fcd39c60c3 SHA512 e0f09d7f2a0532d294512c3556296e252483704abc5999faa1db093606d5fb3ffa39ac565d84cb4770d5868375b16035ff0d845b865483be769d1c766628d936
 EBUILD eselect-repository-5.ebuild 974 BLAKE2B 36f839e7750afa630535f802dce0e7e0784ddc9a3310013130b72f41c381da73621ffb60a2287cedd0f5804a3a3797c54dcde656f6facaf82f4dc6fda76677ec SHA512 ea3c3df9f4ff197bc202b1a26b8f9c3c37824179b1d331e33d4ba4ae984ec9c40b3c71f6b2bc7f693d5383602fced83ec03eab17e8a08f5866c6d041606374df
+EBUILD eselect-repository-6.ebuild 974 BLAKE2B 36f839e7750afa630535f802dce0e7e0784ddc9a3310013130b72f41c381da73621ffb60a2287cedd0f5804a3a3797c54dcde656f6facaf82f4dc6fda76677ec SHA512 ea3c3df9f4ff197bc202b1a26b8f9c3c37824179b1d331e33d4ba4ae984ec9c40b3c71f6b2bc7f693d5383602fced83ec03eab17e8a08f5866c6d041606374df
 EBUILD eselect-repository-9999.ebuild 888 BLAKE2B 9c5cd26305709a1b6f24845a726420ff0542169656356382c4f5ab25cb34a6e2f34c20e6a4094a2fa237e9c7a0130ca0a9ab1b3ae65c123077e402e64a9bf47d SHA512 283e639f646f8501ac95793d6c3d18307c61b5a8d12c1f66ddd4144154783a95f5262792db24373344a64c20ba863e7747c54fa4177feb72b3e789180981c56b
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-6.ebuild b/app-eselect/eselect-repository/eselect-repository-6.ebuild
new file mode 100644
index 000000000000..06ccc47c631d
--- /dev/null
+++ b/app-eselect/eselect-repository/eselect-repository-6.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{3_4,3_5,3_6,3_7} )
+inherit python-single-r1
+
+DESCRIPTION="Manage repos.conf via eselect"
+HOMEPAGE="https://github.com/mgorny/eselect-repository"
+SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	app-admin/eselect
+	dev-python/lxml[${PYTHON_USEDEP}]
+	net-misc/wget"
+
+src_compile() {
+	MAKEARGS=(
+		PREFIX="${EPREFIX}/usr"
+		SYSCONFDIR="${EPREFIX}/etc"
+		SHAREDSTATEDIR="${EPREFIX}/var"
+		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
+	)
+
+	emake "${MAKEARGS[@]}"
+	python_fix_shebang eselect-repo-helper
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	keepdir /var/db/repos
+	einstalldocs
+}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 3d80df2bf6bc..6b5d8e81f19a 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/foremost/Manifest b/app-forensics/foremost/Manifest
index 2540ab69b4e1..ea5b05a4e1f4 100644
--- a/app-forensics/foremost/Manifest
+++ b/app-forensics/foremost/Manifest
@@ -1,6 +1,5 @@
 AUX foremost-1.4-config-location.patch 462 BLAKE2B 7dadc7fd049b09992e9e3019aaaa27d53268a6b6cea03146d965bdd3f0ec3165fbde33c2ecd41a949758ff4b8d36259d048869d17b828e2f600ea9418e3d0bce SHA512 7b6dcc18cba4676ef4d54b87c9c31747754ecbebd9424340b2dd059495c9c6cec11513307fff802a336a99bc07c4bcd2ffcfad1c77ccdc49277ef7e40e30029e
 AUX foremost-1.5.7-format-security.patch 680 BLAKE2B 5565dc9d255ccbb4b721cdb0b41fef4f86369c4965000e35678e6ece00acec5ead0b15d90bd71a2456b812ab74fa9283bdf70c2fc36003a3d659105bb04a139d SHA512 1c28ed1fceedec728a5060b195214fd3ec3b0fa529e87f7421ee72d73f71ecc0d48a69a5b5ff4c6179dd65781552fbd272437134498ec865bd5c620375b6f85b
 DIST foremost-1.5.7.tar.gz 52352 BLAKE2B 5642c1afd86aab0a2f90986c3b030d37b37700c5d0e4b04e4f4a2004d69745280fabd4086a72c33b9eab05b57d125d6b11105c9e11b0112e30077f101eeab7ac SHA512 8827c29d52496783be26374f3943eb26a154d842f34e50fb489f87b3a5045bf85f1e44d7d8d8b12b2355ba3fe4b06a0db979cc22c0f431593c5976001eb931ab
-EBUILD foremost-1.5.7-r2.ebuild 847 BLAKE2B cecf175a8a7a4162d98dfa15d83f59e918274530193b7caaa6b97ec3390c1264fc988259a3909256e16f3a398903a8ee67d50c38f25b0503660c90eed3384706 SHA512 470fc501414f9a6144910af890f9d7f6aa5f948e16b2a3dc3328c54d85490e82a94416f747b7b6c12ab6a00951405938e90a242fc52912fb5d766b071a76b28f
-EBUILD foremost-1.5.7-r3.ebuild 885 BLAKE2B 7304e22381c001abea19e8b638c0c3312511867529c09c65aaf0b951853fd4c08185270e68a6f03029c4f29b1c18c73d1eeda6ecc3cd188208a3264a77aaf916 SHA512 0cc6e8cc9f5a54a3f17938741d75e8a2aa76890e083065095eb860e6905414d494fc41850ae15fee3042aa364ddd376ad6843135816d3a273650fdb50b64bd61
+EBUILD foremost-1.5.7-r3.ebuild 884 BLAKE2B ce1257966c1b49fdfa9272c165d34d18915300a2a2e24a5eb52111d990d7aad3e7a7eab726ef6e7a45b29a6bf5a8dfa88ae128f155c7227d837d3108467cb6ce SHA512 f900a27bcb24e414f194955c047b6c634a4e9463121ce3dea336e642d36aed94be30a0633e6a71aac8b221e8f0ae9af893dd6d76206cff7d6a847773fef96dcc
 MISC metadata.xml 303 BLAKE2B 14bc09979926d326ccb75438d8e32f9a60b1df8078e6344f4dc2e32a33c0994bf2740a4b29d7c1a479bb514815f037d2d9a9ac9c8387fbc01b7795e2a37fea86 SHA512 165c108232c3a65d3fbeb0fb2f612c7c4c4c16a57e4b3e280c4ef40d6a586b56df437454283ff5b52fa3a0880d9643682493b3d75cac01170edab53bb5f1ce52
diff --git a/app-forensics/foremost/foremost-1.5.7-r2.ebuild b/app-forensics/foremost/foremost-1.5.7-r2.ebuild
deleted file mode 100644
index 5bb7b1464fb3..000000000000
--- a/app-forensics/foremost/foremost-1.5.7-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A console program to recover files based on their headers and footers"
-HOMEPAGE="http://foremost.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-# starting to hate sf.net ...
-SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-LICENSE="public-domain"
-SLOT="0"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4-config-location.patch"
-	epatch "${FILESDIR}/${PN}-1.5.7-format-security.patch"
-}
-
-src_compile() {
-	emake RAW_FLAGS="${CFLAGS} -Wall ${LDFLAGS}" RAW_CC="$(tc-getCC) -DVERSION=\\\"${PV}\\\"" \
-		CONF=/etc
-}
-
-src_install() {
-	dobin foremost
-	doman foremost.8.gz
-	insinto /etc
-	doins foremost.conf
-	dodoc README CHANGES
-}
diff --git a/app-forensics/foremost/foremost-1.5.7-r3.ebuild b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
index 8cc4d22b4a5c..531cf1318f8e 100644
--- a/app-forensics/foremost/foremost-1.5.7-r3.ebuild
+++ b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://foremost.sourceforge.net/"
 # starting to hate sf.net ...
 SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"
 
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 LICENSE="public-domain"
 SLOT="0"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 5b39885de84a..0c0cffeb9659 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 7fb51a55c79b..c22748206eed 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -4,6 +4,6 @@ DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df1
 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
 DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
 DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
-EBUILD fcitx-4.2.9.6.ebuild 4393 BLAKE2B d62663cd669f9eab880237b563a4e5d28556dd8611affe11d90116b67248aef2b70ab85a7e703b5effe6339597f4e0feb34e37e00959d34347a093e0f6cda196 SHA512 e39ed2314c5502e4f9c479901b30643a0d7c7f279d02343d3072da9f5559770cf183598fc83d5aef49858380180368896da2eaa45c69e02f2f07db83a7fc42cb
-EBUILD fcitx-4.9999.ebuild 4368 BLAKE2B 9be628acad1d46b6360edb40df518f39431edfc64eec510d99ac569cf2c69cccd66671cdecba690044203361f19eadd8cbef7b95ea61c2a55068c565288bda45 SHA512 1d0b77cf941b1d8f1da9fdb6dd85ab02faf86a5c24594eaef4549b93912ce39660e24d31962573589b7066eac9ba69390e6165c34221c44f6eabfd0582830ddc
+EBUILD fcitx-4.2.9.6.ebuild 4443 BLAKE2B 837cb4bc9c37b315765aaade1e2b455e16535073a341756643174a63496dc950fa7e7922ae795fb183bd5bfe5cfe4dfa9b5f3d66f39f63645288898e1104bab0 SHA512 85bb46d411651a70f33bc19ba3a9bcd197ab003e963f502b358463a0bb873855140ba7e2a7fc477a5b4172c85ea2a62b94981ef35ca0cc0972c628e3440ce41f
+EBUILD fcitx-4.9999.ebuild 4418 BLAKE2B 732d53ec2d0bac9272d26aa1d3f6a2e03b3d50993133b826c5e1df9a5564bd7bb4155a5af940ff5d7bebdcf7f1bcd90fd92759d759f666234e684929f32f6814 SHA512 c65fd344f2d2b9a264d8527069eed655f6f019003472451695a5a7e7889113a14ad8ad553af2928fca6e903c4ced448e4be8680d283934991c44129e25581e78
 MISC metadata.xml 1076 BLAKE2B c4c0558a1e4b836fbf1e78ea1c4f8d60167fb07de270322133e9fa5479b7da4acd0bb5e7169e4759bbd0f8c1638aa271f6e82b2150c785ab5c54416b36a495ef SHA512 47382c905538cef508f9ca639a184dc767cd6ff063047da4ab4200c27631e833137a736899b45fcf5f0c9e4d59da93a6d1dd61873d6ad70a93ceb6cf4391da70
diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
index e5a259025b1d..dc0c2aaac844 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2003-2018 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -63,6 +63,7 @@ RDEPEND="dev-libs/glib:2
 		dev-libs/libxml2
 	)"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	kde-frameworks/extra-cmake-modules:5
 	virtual/pkgconfig"
 
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index 22103a582078..c6b7513ff0c0 100644
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2003-2018 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -63,6 +63,7 @@ RDEPEND="dev-libs/glib:2
 		dev-libs/libxml2
 	)"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	kde-frameworks/extra-cmake-modules:5
 	virtual/pkgconfig"
 
diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
index 7f1be53aa5a2..3b3ec575cd03 100644
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@@ -1,3 +1,3 @@
 DIST imsettings-1.7.2.tar.bz2 595754 BLAKE2B 9964ab7ca842a7e1b9e9c61434275b55d6a58e271dd12058195573aa65c623d5152a04bc893b3ac4d983c4798bd6f4e8cdb486577be45ec43db6600f72c8cc3b SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0
-EBUILD imsettings-1.7.2.ebuild 1770 BLAKE2B d78b7c6e84254ca09b26782499bd0fd043575d60705a760628b60ea02aa306ec26dfd0c7fb7e6dd911ccef5e12cc91905b8a77f9ddaade1c16f46f479ea1e6ed SHA512 c091b4a0eb1949c45422f3eb11483b66db365172e1e380cb864bc6ed90e75e599ae743d72ec416518780420c988eded857d4dbd4c1a688fda3089181d5a4fd9c
+EBUILD imsettings-1.7.2.ebuild 1790 BLAKE2B 3821a214446d88a1024aca91b2ef3cfb2980303e46e242e695049991ae13e236af4d23bea95a93269aad9c1fa85e1fde3b4f681e6e39a0e3b738d69c07cae824 SHA512 6eae2c40a5a472b6a0317fbb0075764c1ecfc72130ab61c7b3a913ec2594ba685c4fe110b42da56147d482e2ef2ea9b97b9f8780cc4f59ac47cbbcee71bffdfe
 MISC metadata.xml 618 BLAKE2B c16dbfede5fb6a394335483488c6bc195020c4161278088f7f44d82506f5e4b6e8afac64747098b703200b83b6ee8d7f18b790b5b2cb79e71647e0e6025e8820 SHA512 029b4a98d5fb139a0f504161627461e227b58a712d578aeba4da9deb2c5ae04a78a83a1cf42c0966315d6c43db860f64ac7f6a38a22ae3e4d87b2960fde14301
diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild
index bc89ae3d0896..5fce6e8f9e66 100644
--- a/app-i18n/imsettings/imsettings-1.7.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools ltprune xdg-utils
+inherit autotools xdg-utils
 
 DESCRIPTION="Delivery framework for general Input Method configuration"
 HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
@@ -27,6 +27,7 @@ RDEPEND="dev-libs/glib:2
 	introspection? ( dev-libs/gobject-introspection )
 	xfconf? ( xfce-base/xfconf )"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/autoconf-archive
 	sys-devel/gettext
@@ -59,7 +60,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 
 	fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}
 }
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index 84d4a60b204e..02a4fc34d197 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,10 +1,12 @@
 DIST libpinyin-2.1.0.tar.gz 246219 BLAKE2B cae5b41faeb2e0eedc2ae2c098b2db04b22e36d0bd9fd222a4516f71ab9b3e8ade7fa96e0d6d898e197bf91c1cb6a0b98a9fff97e7be31bb4f901400c87bfea7 SHA512 e6aa3998ac466cb155750b574140dd43673bfeb4f13d1b88c4892b61bb773aee84610dd67ad17871961d51a48067c535eab33a6fb6c9ac28179a9958c4e9b518
 DIST libpinyin-2.1.91.tar.gz 256045 BLAKE2B 148a2617cbe335ebda5b9fb26f63f7c75f06d2dfd3fb950f60b4db37762a5bb3a91459dba0759abd33fbc01d38fe26d7cce92dfaaa2c6e45c80552f0bbeb3d27 SHA512 568b263726a022bdca52fd54c7583a36a31385a8f19bb5c5903918a6036c5499ef8c8bb91ebb2db877449ec5177d2d4e4f0a20e7bb528534361ba1405dd1fd92
 DIST libpinyin-2.2.0.tar.gz 256221 BLAKE2B 72c0dc42ca6e63852c92975b871706d24c1066cb9bb37faf9ff0ccde9773308e1a29c7587f00ab337c52a1f957c8e67d6241bdff13a50d9dbf73c3b4e530d2be SHA512 7327e6726acaf984492fdecb5ed04f81624da261aeac3cbea9a8ea5540d84f39ca8d41ec8835b509da97b9de5837534885e4ba5f4041ce9c7252c8a438480598
+DIST libpinyin-2.2.1.tar.gz 256262 BLAKE2B 4fc081aa42b07eb7d21277c95407eafbf618c9aaf0c6707893f212be70f51d43fe00f50d1b4758d857d0f8aed1e9c177d61d6ca912e776633e8179279f09fb2e SHA512 d323655419aaceda12d794ac25387a2e073e8c2372511913febd5b8049f9d1764a0011cd97b538bbfb14f5c248495a150cf7e3b9f4af21182941e5920f2d879f
 DIST libpinyin-model14.text.tar.gz 19361973 BLAKE2B 702f0c2cb0c8157758f8c46e7b47221475f2a96a5e4f6181b5dee605bd72002827431f017a913275b4e9cf6b4b07bccec4b9a5b7960a9b2c42ffba4631c57ed6 SHA512 792d3cf7ab7fdea701737cea66d18f697015f19d18b6d26273db2da0ae28291f38b3d8a5717f595da63fbe573921c552bdce10c4bec9a0834947dfec92265da9
 DIST libpinyin-model15.text.tar.gz 19361973 BLAKE2B 3d24321db407e28c1adf49373dd9bacafe0e89409511c0656d7b9a85f1d1ac8693249088dd99beef069576f4a8d0d5db3fd47f98822b32aa3098315cf2660d22 SHA512 d3f5b42f6ea6b22570b5ba67cf23d94a3fee2d7d894191ebc11eb72edc162c72b90b2fe10b312bfd8d77d110654ee5dc00c21b25fb8b7c3f905d4088c9895ac1
 EBUILD libpinyin-2.1.0.ebuild 1336 BLAKE2B 278b7906485b7cbc0f4b3d2ae89af99a074cd9ad9a773521e3df1eeb869b8035e6a971cb8745fde6a659455b467a7bb63b29cc45cb883edd7906839dfcbabc60 SHA512 2c750d9f7dba999d155f0a1f587a12aab7fc4f0356ce2a241b8a884539732d3ed310ce5b7ada5226b519e18a8335cc7f9fb9bca41700c60049bb2c291af545ae
 EBUILD libpinyin-2.1.91.ebuild 1395 BLAKE2B e14ab61ce077f41ddefbf6d28231d9af8a4f1ecc5435ac46536a7c8c3c3af799c6bf7ebbcfe10c26a35a354f89ec9595e90d88d8393e265004cceff57c0bd67c SHA512 62eb6b628fa4dd91a89ebbf1c6d894b646015f7a445d4f96283ebf14a80ffad4b6fc17cf7f81848f482c2a9c595221f73d5208a0805fb15ceac7ce07d29ff0a0
 EBUILD libpinyin-2.2.0.ebuild 1395 BLAKE2B e14ab61ce077f41ddefbf6d28231d9af8a4f1ecc5435ac46536a7c8c3c3af799c6bf7ebbcfe10c26a35a354f89ec9595e90d88d8393e265004cceff57c0bd67c SHA512 62eb6b628fa4dd91a89ebbf1c6d894b646015f7a445d4f96283ebf14a80ffad4b6fc17cf7f81848f482c2a9c595221f73d5208a0805fb15ceac7ce07d29ff0a0
-EBUILD libpinyin-9999.ebuild 1365 BLAKE2B 5f01c5204f4d9ee246c43636fdf77f73a9001d64412c783d713c47e192fcbdbf6c3f9726a424e6f632450f46215188793d454de4bc7e0497d430b97857d3b718 SHA512 a65a580228b8f0024366c4462aee347182b233d736231234bd8ecb5bfc2d6733860019ce3be354f0e830259bcd8b253705b1eb382f8914c42d72e911ec6650fa
+EBUILD libpinyin-2.2.1.ebuild 1400 BLAKE2B c5d00bef579b915ee237a6a846e37cf4a88171e2730d3762d51ca38d029e57aae80015d9231ccaa1ddad660ef4ddd81ded9bb12fc990aee8e8f8ae20897bbee0 SHA512 3f973c0331269e9870e26f2007777493bff65b511cd64f9084838f9f985ef8c1536ce6a43dfb7bb23aa2e308270ea97afd9626f6087a719b584db176b73dc386
+EBUILD libpinyin-9999.ebuild 1370 BLAKE2B e8d09bac832f84d10e84b3f46cf9436d41c752b796c6eb008c04a1ea71d1902a9b90701165dfb9cf4fc85bb56c2830db5b8765f1c9e6ff1d44d0483134ce98e8 SHA512 de49fe3137247ca25e6b175ee3cefa689901de1455698360a513ad732f25e4bb9447a4c5f68c35a8eeb6221e3f10266d4b599bfc8c711966125545dd6a4a0136
 MISC metadata.xml 384 BLAKE2B b3f62b356f505bb69731e6f56d43a080e509b578da0762be6ccc112ed1262446034b82d89cbdcca87d502c006319fd11cb4069804b8d8c12f4263a15bbf4f525 SHA512 4317a502e82b23aa2c66d406148eab83996139b4522f999884559b7b6d15709ded6779dc64aeedc657a1be3cd1337281c9e1297ae22dc6b227aef419dc707518
diff --git a/app-i18n/libpinyin/libpinyin-2.2.1.ebuild b/app-i18n/libpinyin/libpinyin-2.2.1.ebuild
new file mode 100644
index 000000000000..df27b5154397
--- /dev/null
+++ b/app-i18n/libpinyin/libpinyin-2.2.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2012-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
+fi
+
+LIBPINYIN_MODEL_VERSION="15"
+
+DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
+HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/glib:2
+	sys-libs/db:="
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
+	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libzhuyin \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/libpinyin/libpinyin-9999.ebuild b/app-i18n/libpinyin/libpinyin-9999.ebuild
index 20abcddac60e..4d8800edce53 100644
--- a/app-i18n/libpinyin/libpinyin-9999.ebuild
+++ b/app-i18n/libpinyin/libpinyin-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools
 
@@ -27,10 +27,10 @@ SLOT="0/13"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="dev-libs/glib:2
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/glib:2
 	sys-libs/db:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	if [[ "${PV}" == "9999" ]]; then
diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
index ca5bf5a1b456..a899c2e9053c 100644
--- a/app-i18n/man-pages-de/Manifest
+++ b/app-i18n/man-pages-de/Manifest
@@ -2,7 +2,9 @@ AUX man-pages-de-1.3-bzip2.patch 604 BLAKE2B 0569a8303e3e28ecbdeaaab04f9ce7a84fb
 DIST manpages-de-1.15.tar.xz 1529576 BLAKE2B 600d9c186ffa46fd1db110c3889abc44bb6ccb6847ed8385c461c7fa696f5a9e8a65233d1290ae9d1e9eb26694e8769aa35983f07205a0e7e57c9b0c14c7d7bc SHA512 d1f1b9f60c4713d6be650e21b7664ff594dbd542b53148c00d1a2269413d39615dd76be4c4095eeb72e2598b94af134ca5d128b85d9520a1ac404364b8a53948
 DIST manpages-de-1.21.tar.xz 1585600 BLAKE2B f2364e0b5fc1ca8ce8f5eb7fa5987d1bc68b1f8f2c1a26240d5cabd03eb5bb094f0d63274c7208059a766498f5f20ca7ccab72a9d4847057aae3b7d6697018e7 SHA512 24cc36e8e9c2efb8cd2a0c374a3f5da96f6645a306082cc28aae5933081f7de24bac03652f690a2becd32a23a93c17ddd9029190c299dda95eeb25f49b327fac
 DIST manpages-de-2.3.tar.xz 7016372 BLAKE2B 3b89049d11bfd539e9114de38198f610145972068c9cec1da1b6398fb1d3e846b112ca0336891c1782a6fb142f397ac472ad78be0596503377318bfe65ec68d2 SHA512 abc3574c4a315d86b4fcccb25d617851c1ff43844fc7b1b92d7849a098280a96ab73d4986047fe6bb18e8f11d391182370eff9db476e0dd2021d0725b4e945eb
+DIST manpages-de-v2.5.tar.bz2 8744190 BLAKE2B 06b9f970e652892edda6079bd4b912b2272652b5060a0d7a7c3dcd074f2ac71730800a077b7aa4d5175fb44723a60642e39c1bf81ecc731dcadb0ab703461df9 SHA512 3bf5f794ec9a1036f0fdcbea6afc03fd845f42b83c928116e4f47980060b3dcedfb25cd4330a60cc3da7f573d73a50e61ccb6a681979fcc6bfb63b882de1fd20
 EBUILD man-pages-de-1.15.ebuild 1289 BLAKE2B 2aa0d95614a5cb2d22a63c661befd01b789e6c7e322a48c013d5b408058235141bf0db7680f81da0016b8f03d246b8de6cc6ac0528cbbfc3aad4fba11bc475d1 SHA512 7f090cb1bef72e48034e98f5868378f47683575dde6668177871b12e1d06bf46cdfffb7b03877d19e57c925cb5c6cb599f766710743d150a79e36ea4f5258f57
 EBUILD man-pages-de-1.21.ebuild 1252 BLAKE2B 49503d85ab5a60b5dc5475f11d4ddc042abb3883665336450179a2247279ee0171037f7937195467e4d7b25dd8671f7a676171c7ad983f9134c7430689139df1 SHA512 2158482fb6541e0391b3c916da51fbc1bd5e67c8a283cc0a795e6e68462eb3c1ce343b8fc9161199a8bf56632505f0c1fd39e4527dffdbb61e5797286d1ae6b9
 EBUILD man-pages-de-2.3.ebuild 1356 BLAKE2B 99e0104647b0f1d80125a744b33a0e846cdf8f3d3acc846908376cebfaa1648aceb4a570116e035765164cbabb360ae7b995c522355aba97ed84530eadb90b12 SHA512 6a6081d2116fd0d756e22b8f1ab6d905ab57b9bbef6f7f084df50afe1afbd1187f16c79d800bcf00f9ab8cf3ea3869dd527fa885c0ebad8b0b3d6074d0d919e9
+EBUILD man-pages-de-2.5.ebuild 1436 BLAKE2B 4e5bc9ae14f8fed5e6a13971e6bb5d688d2d626fafe4390c1946c7fe28d6c6785edc9878efbeaa6aca970911a01cacd50b2c514f4717ae749f0134c72f613b7f SHA512 4a009a516c425f5831e82ea223125cf165ce37b12948313e2c39524cb0ac390ae577e1520c671f65b5370820ad4956cde8905e0ea39913ff47c0c3523023919e
 MISC metadata.xml 369 BLAKE2B 41170815bcde0a65831b0453eee7b99359594bc67d345e31d1228d6b5def740d73087b96473511a8249528ac16a80b0eeee91791f9d4f113cb5caed918b40552 SHA512 e36208b3689927021e51ad2348ba3f5a5598b9657ffd7156d928dc817b90ed91a57d43605eb8a3e2fde1caf04349ba76b68ebc7ead1061ecca66280095179658
diff --git a/app-i18n/man-pages-de/man-pages-de-2.5.ebuild b/app-i18n/man-pages-de/man-pages-de-2.5.ebuild
new file mode 100644
index 000000000000..d8f50681b5ef
--- /dev/null
+++ b/app-i18n/man-pages-de/man-pages-de-2.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${PN/-/}-v${PV}"
+
+DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
+HOMEPAGE="https://salsa.debian.org/manpages-de-team/manpages-de"
+SRC_URI="https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+DEPEND="app-text/po4a"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	default
+
+	# sys-apps/shadow has it's own translated man-page for this
+	rm "${S}/upstream/primary/man1/groups.1" || die
+	rm "${S}/po/primary/man1/groups.1.po" || die
+}
+
+src_prepare() {
+	default
+
+	# Use the same compression as every other manpage
+	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
+	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
+		PORTAGE_COMPRESS_LOCAL="#"
+	fi
+	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
+		case ${PORTAGE_COMPRESS_LOCAL} in
+			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
+			;;
+		esac
+	fi
+	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
+		po/Makefile.in || die
+	eautoreconf
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake mandir="${ED}"/usr/share/man install
+	dodoc CHANGES.md README.md
+}
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 1cac514ef514..28a34dfa509d 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,5 +1,6 @@
+AUX opencc-stop-copy.patch 625 BLAKE2B ab2f98a03bb079ad116994c4d05e59e3638f648b3e03ea4e6a357a8658612a1425f2578989c0086e31d749e3533ffb814457071582f9fbf3fbcdf0d184892940 SHA512 e34388bc5d1841e3655c6209e31cf18957a9a02f23d49d9b1f184e48005cf5d5c108656439900f0d79fc1801700872a433ab761154abc424b717e12a616487ca
 AUX opencc-test.patch 202 BLAKE2B 1dd3bc35c1f8644cd4f27ce8a5b5dea3b0ef2750612f112d7dc6de658634ad5151972b80c7b2ede9f41ea98ac7a2d29eaeb961132c862f66dd160dc2dd522a6d SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec
 DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
-EBUILD opencc-1.0.5.ebuild 951 BLAKE2B 5754abcfea97a56100601ae189e2274542976063ab0ee943f227c67e98381dde4bfe1e153f6d9474eb79be2edbc8c73b220826589489f5c612751feb9314b240 SHA512 065cf96608de11939d91a30c5d1c6358c64066cd3a3c858d2c4ecc4aef2a4b77a83554e072e0f05234331818b7a4662dd32dfe114735023dd6ff0f44686aba8c
-EBUILD opencc-9999.ebuild 927 BLAKE2B 00d77822d6157ce7f0c29c6db267b76571a49c7ee80c8cbce464df499b23b42e99fb2e92795895cef2cb7485be3a9ec96c8db3d2148a7f19cefcb3e338913364 SHA512 868b831de1cc47afe1b471848df50eb036c8f29701839a3ca3767aba8e42b10a227dd9dc33ee726331a890ef3938ef71af444582f1f2d16c785158f7b36e5eb6
+EBUILD opencc-1.0.5.ebuild 986 BLAKE2B 7c74849f384202578f91e0b597415e6aa93f37e44537d6a4792d366ce997eb9d4c72d1a689fea400e2c900b73ea6ab83616379d3507f078b7a556bc706212d7d SHA512 a0fb31fe4ff4d791bdd837080e08844728c1da240f92dfa6a465e56cd3d733e5c592a62b92a9343837d6a47c062e2211f28e9ff3fb2bd47bce663ce19630880e
+EBUILD opencc-9999.ebuild 962 BLAKE2B 030f0cffd01ec8ebd917e2803d4222a7b365707fb2b5a18ccf4c61e6615522cc61c67f4a65eb2b01bcbfba56a4bf86e633d41fb1cbca620b9285c9c32c54d1db SHA512 1509dc3acde4d1d54ec538e6fad7b4310e0f0ce1616114f6200b6edfa7239e035483b03fe9ca033b3113cbf2d037ba272154181a754a34efe7a164e9b22363fe
 MISC metadata.xml 491 BLAKE2B ec523a795afb6ae99cc5835e3df9fe07916aac4bf8552254f3bacbb9e1764a3ba5a79eddcabd8f34417544709a10a0bd34e6133a01b9b7a15156a9d282316d86 SHA512 303cf35b932c5d5a1fdd1a25b2c71a65a4aab761fe3c66d72439d691255a5edd1b943287afe8b4c53ab62531a012dafb5f416471a172f5b487557684dc6655df
diff --git a/app-i18n/opencc/files/opencc-stop-copy.patch b/app-i18n/opencc/files/opencc-stop-copy.patch
new file mode 100644
index 000000000000..4793951dd251
--- /dev/null
+++ b/app-i18n/opencc/files/opencc-stop-copy.patch
@@ -0,0 +1,18 @@
+We don't need this copy command on Linux (or other than Visual Studio
+build).  Since it is colliding each other on parallel build, drop the
+command for now.
+
+See https://bugs.gentoo.org/666904
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 1516775..2deb764 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -109,8 +109,6 @@ foreach(DICT ${DICTS})
+       ${DICT}.ocd
+     COMMENT
+       "Building ${DICT}.ocd"
+-    COMMAND
+-      ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>"
+     COMMAND
+       ${OPENCC_DICT_BIN}
+         --input ${DICT_${DICT}_INPUT}
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index ba948e2bf80d..2ddcaab943f2 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,7 +26,10 @@ IUSE="doc test"
 DEPEND="doc? ( app-doc/doxygen )"
 
 DOCS="AUTHORS *.md"
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-test.patch
+	"${FILESDIR}"/${PN}-stop-copy.patch
+)
 
 src_prepare() {
 	sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild
index 9ec1cbd5d8b7..857d6dd70b8e 100644
--- a/app-i18n/opencc/opencc-9999.ebuild
+++ b/app-i18n/opencc/opencc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,7 +26,10 @@ IUSE="doc test"
 DEPEND="doc? ( app-doc/doxygen )"
 
 DOCS="AUTHORS *.md"
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-test.patch
+	"${FILESDIR}"/${PN}-stop-copy.patch
+)
 
 src_prepare() {
 	sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index f9cf69bd835c..786c94d065d7 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 4894 BLAKE2B 012a1c0a5202c5417825a3a69753c82ac51a9f9e60669d127190eb88644e7b31761c72a0bb424a106710fd321596bb4def686efd36396bb9ba83870400ff11bc SHA512 0ada75918cd193421bf62e853a7d3a8e86609e88612297c4a8533cda4bec97955f82f3b5f42554a064107debb2392812e3ecbee6a40a87513990e4a0c70d4d87
 EBUILD uim-1.8.6-r2.ebuild 4999 BLAKE2B d1695e9093d174eb6423e9b3e76dc8f51030b09738a1a8919f0ce2e6292eab1276cc8a9016b7bb6563815620d43cdde473e008b50ee0a5cb29454863a836e471 SHA512 ddb8ed7138a56171a3a878cf652d360ab4d3776201e933279a9f7c0c0ec61d576eddc0baf42b046ab8fe98bd7c6440c25d62ad03fe0596752604f66bad971a63
-EBUILD uim-1.8.8.ebuild 5464 BLAKE2B fe13e8de8d66c097126f80abe12f3aba0f850adea1d0f5419f4ecd403bb3081ecb655b68ad8ec925de42f6b54d0b8fc21f3099b4d198887e6dcf975a5767d26b SHA512 5c4bccbf032e5613b9948e419721305e40632f204195da22eafdf68a06ba11be8400f77f702395a45e7d18f44911fded290ef271a665db2fd1a4950a1bc93629
+EBUILD uim-1.8.8.ebuild 5460 BLAKE2B 29d06088ca36b40ce716814716320040cc4c4fc9e40993c739ebcec444a373014c5477f0ad8424549a86e599a00abf2df46bd67926e5e5c21ee991b6a152ef37 SHA512 6c8c03553de27969bd5c241f0b502e3097ae111ca93f3c4bc2b6730518f949b5020204a7afc9e8ccb04a659effadd34143b8b0cc525680f0047be875ee81afb5
 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 589023b40efe..7fbd2e0a6226 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 )
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index f266633f89a1..262060286722 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/mysqld_exporter/Manifest b/app-metrics/mysqld_exporter/Manifest
index 34631cf42efc..8744efac070b 100644
--- a/app-metrics/mysqld_exporter/Manifest
+++ b/app-metrics/mysqld_exporter/Manifest
@@ -1,6 +1,9 @@
+AUX mysqld_exporter-r1.confd 893 BLAKE2B bebec4ba675a5f7bfec52f0c1ad3b824f032258397dc9386892daa4d93ca1f7134c85e92c7662f9bd5b34d86478e2b3be2fc5b4adfb6fa1ece8d901ae530ec3e SHA512 3291e96479ece4f99de2c26e127469349f6197bc2764691fb4bffe5729fc9ce625fa84e2859649f0495260b339afa20edaa7bd2af99e6f161e6e6bbb153eee39
 AUX mysqld_exporter-r1.initd 2053 BLAKE2B 46542a80ac4c894c0cf4f50b8e8a616a019f1c2d7c6846b524b626859bf521d6f5b15336537c6fb06c5f876dd0d8adcd592363a678bc6779bfb5352a93dca06b SHA512 3a7c91492a2533cbdb2846cb5f3a03e66caf332ff931d10227c32332aaf210e74f2dd56977c5146a59042529dfb14eebd0c78e8dc63675d4884958bdc81f5252
 AUX mysqld_exporter.confd 891 BLAKE2B 340b8d6b5f3fdc0a52851197cfd94b1d9d20fa3cda349c581a016c6cc7edd53cb7d86b634487551f916fd5c84294add402397cb9bf0fc2efb211b589dd571dd2 SHA512 ed4f949c8f5f88ad54c536342adf90be5d74922b54c383735a957e571aba341057830c7e8cdc0e45b53e439c5297d3ad70ba7bd178f77d10615787ed51bcc03f
 AUX mysqld_exporter.logrotate 68 BLAKE2B 04a9a0df5dae2a2afd3374cd6f6fd5d04df7629bc85ed63792ecc9e2b4772668d1f5b1fe4baf14b17c26a495ffa1ed3a7d748719db9a72f427587243505158d1 SHA512 3eb2e6bfa0eae0847c0b1e2e7fd990068cb0ad570d14463c88a8860d70ebc378b2e3bc4141f0a98e95304c972c765ae48dbff726b208ba825fe1f4e58765e462
 DIST mysqld_exporter-0.10.0.tar.gz 971604 BLAKE2B ec077b7b6a15f6173e5cc04e741c51c4d26a214601da8eb1aede49ee325f52bea2140b8e5b3bdbc2a1e527e40c95099dca2a57501d44a26e787cdc330f4aa8b8 SHA512 0a7b0ff537ad59a9b64aa18dfe1d1eb9253b12ae566d5c151555fbd4457b7e65890b6569632b452ae317b3acbfa94c12d96f6fb6e4f982b9b2161fc4747330f5
+DIST mysqld_exporter-0.11.0.tar.gz 1393809 BLAKE2B ac6b04d2ad24f1c083c411f10bbb6724c2458be357ff60e1950aa624955497432295726e7f739dff03aa1ed8290d852a9511e01893f5a2b293e79b3214270578 SHA512 69f39ecc1b17bfcfd3acdad9d92a70c1daf3f0c9690770fa390a818bd29f43a98bfe4856f22b48e9d2d9945ce98ded0ea54c95010755a85ebc3ebfdc353d0c24
 EBUILD mysqld_exporter-0.10.0-r1.ebuild 1564 BLAKE2B e7342d8cd4a1b80c4ab3379bc2a4167a6127685c34e520929d1095b04c348b57d9d082ff5daa87f32c46df9f3d252acb205c63fe5e8e0941d625b1b85753c2f8 SHA512 6c2d62e603163bfc42b2508765da807322cdaae0d4534a96a319c5f3751d0a52178d2e3c110fe50ed0b87e563a87c91a1d9009c881b84c64fe79699cc52c3dbf
+EBUILD mysqld_exporter-0.11.0.ebuild 1905 BLAKE2B 3c9eedb162b1d027287dd7cf65f2b7b46faaa56eb74a4c8d85fb2b479e1e0af25cea6e8751d321bf840ab9792aacae5f4bb13da29fc88967d509c0ddb532ff1a SHA512 79d0eb9bad9f183cbda132232755112e51b697d54baed096d9e73da1aa6b1450f5c0a9ee338b4bf71bcafe4f389b278947252c9f30195f44ada543100973019e
 MISC metadata.xml 342 BLAKE2B c99db8a7ba47d8b948f5e8623c98ff234a67d14485a09a412d55155b878fe2cff4594934f2e1aef749072f4f52ca8c0b660e52764cc20b40aedc3ae2280d8fdd SHA512 55dcb15bda103364487e98359157961d7859af7e38cef4030e53fe2fb50ded0e34d27a1607171e62d60dd53e93b2cd1f30becded706dcb362ce3f45052cd0203
diff --git a/app-metrics/mysqld_exporter/files/mysqld_exporter-r1.confd b/app-metrics/mysqld_exporter/files/mysqld_exporter-r1.confd
new file mode 100644
index 000000000000..2b7f9bf17a3d
--- /dev/null
+++ b/app-metrics/mysqld_exporter/files/mysqld_exporter-r1.confd
@@ -0,0 +1,26 @@
+# /etc/conf.d/mysqld_exporter
+
+# PID file
+#EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+#EXPORTER_TERMTIMEOUT="TERM/60/KILL/5"
+
+# User to run exporter as
+#EXPORTER_USER="mysqld_exporter"
+
+# User group to run exporter as
+#EXPORTER_GROUP="mysqld_exporter"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#EXPORTER_SSDARGS="--wait 1000"
+
+# Exporter flags
+# See `mysqld_exporter --help` for more details
+EXPORTER_FLAGS="--log.level=info"
+#EXPORTER_FLAGS="${EXPORTER_FLAGS} --yourAdditionalFlag"
diff --git a/app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild b/app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild
new file mode 100644
index 000000000000..3571c885d167
--- /dev/null
+++ b/app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eapi7-ver user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/mysqld_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+MYSQLD_EXPORTER_COMMIT="8068006"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for MySQL server metrics"
+HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/mysqld_exporter ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/mysqld_exporter
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	popd || die
+
+	keepdir /var/lib/mysqld_exporter /var/log/mysqld_exporter
+	fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter
+	fperms 0770 /var/lib/mysqld_exporter
+
+	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-r1.confd ${PN}
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "Create \"${EROOT%/}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
+	else
+		local _replacing_version=
+		for _replacing_version in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${_replacing_version}" -ge "0.11.0"; then
+				elog "Starting with ${PN}-0.11.0, command-line flags will require double dashes (--)."
+				elog "You must update your configuration or ${PN} won't start."
+
+				break
+			fi
+		done
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 92e383be2dc7..2e2e61bdbfec 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 552c754474c0..192ff2b155fd 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -2,10 +2,10 @@ AUX carbon-c-relay.confd 362 BLAKE2B 7d33b9087ab77f07606fef84c4ed3dcff41e5604002
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
 AUX carbon-c-relay.initd 1678 BLAKE2B f97d7390e0d03ffaa9cca658ac206eff4ea22336f100e860aa81c72e593440c79596af6c0245a8f8759fff2c24084f1019581b44f21e984820a616f10543d09a SHA512 5a3415395affe6c4e315c650733d8e335d5fa8e490ffeba8dc7c944976f3b68ca14e801175a2136499b00fa6adf403428ae509cb9c3596b6a3188ef20d09c575
 AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
-DIST carbon-c-relay-3.1.tar.gz 271011 BLAKE2B 62d97ba268f121db466a761001f0c5f49e2571edc26c90ee4f40d311cc3f9abb55178ea375c6663407d5fce78c5162a8460a260c9baa7faed3908fc2e4bb9870 SHA512 8c8062e4fa9ec22281b1848923dc73b39c4617b0c6297f57f69080a7aedf07ef8d5c6e0bebbd5ef0faf3a1255ab155475bc40aeee582838d604da1cc2e43ca4e
 DIST carbon-c-relay-3.2.tar.gz 291396 BLAKE2B 6a7ba4f30498c217505098b3cafa69a481a0bb78776b207cb4120d686a896156a39a0c87795b2766d39c3b0e69d4ed17943bee43e3218bf079931ad2b8360116 SHA512 11065303e18e9e2660150a7ba2137abe48b514abcdba93632a5fa46c8412bfb3472bfebb93584c629e5978be210237fad77f975eb1abb1e07b9cdba119c7eef4
 DIST carbon-c-relay-3.3.tar.gz 293055 BLAKE2B 96d4d230e233f20ce02d519804f36787fc30238ba4fb173600e18a52af6a28bb954c476baffefcb229e42f3c2e6ff1d97196c188c527fc72fd5b98982f74451f SHA512 285f5d90c31644543a674b60e017c4d65f39762fe211b14a99583473e6d80313c3f907e4432750e6f25851e4a693457d1609a9bc176744b217f6cf0533ab4879
-EBUILD carbon-c-relay-3.1-r1.ebuild 765 BLAKE2B 6596ee93330fbe973d42479a8d8b1b1174464a5ffdc513cfb6235ed069873e59177fa1d9be862a579c2ed4c482b2a8df5b8cb3f9b8dc075ce4615133dbc5a381 SHA512 ab94696270aa31b1c4b48320aa211a4488f613a28497c6d08c502a9e14e642ea89d08233f6f128b7ddb5ef31e361bbe7053e91118d1fdbd4b40a9d1e12ce59fa
+DIST carbon-c-relay-3.4.tar.gz 297795 BLAKE2B 48e954af09db99fc6ab8a227be8742fadd268907c2dd203a9bd6b5417fbf77d604f13636416452108e9df77df6fe9350d5a3dba3f34b1f200b31aba5ebfb2d91 SHA512 12e5d952ac34d7ec33999946dc30c1c388fe5fba7d28355ead77377bca90228f003955353e8f92b743c1ccf5e55ffaf6c32188de3bfb0a1ad75a80cc418c5e00
 EBUILD carbon-c-relay-3.2.ebuild 941 BLAKE2B 08b97db03e44cc14b3b1d3d8f8a5acfb9c23d7dead00c2e1c3088b524e5f19865e8599e915d1b84c7ed7414c66cc1c75dba20ba467b8b4d8b34aa69f942f7e22 SHA512 41808fed0c890a1e335986e93ee3fb0ec764ba3e364f151080d477b8546707857f36a834b755d25caab9c393c5e12409b48a497aab292b49921697c8c5546a85
 EBUILD carbon-c-relay-3.3.ebuild 1468 BLAKE2B 682bd014531308e19c89b5ed966a04929c161d4ef338800e573d06dfa07173a121d490f5b02aeae90a2b76463adf9a03ecce325db8187d2abf04ed35e6568167 SHA512 2d5e58830ac28eefee38f254420d864d30512bd2ef6e60035e9cafe19d3bfa72de752cb672e1191b864d193d8823a4f856bb3f2b6f476dd175e33b2c56c8c967
-MISC metadata.xml 578 BLAKE2B 6b8f16ecb046eecf1315d39e62dacf5c79896b80375eed7696acf791b3e3324e008f122e8deec4098d2298200a655e497fdac1d059aac3d6b7d8df980b8a29cc SHA512 78615eb4a4d5812d45ede2a138ab70ad2c6152ef5e4f7873cb4e95f29ad643f9a9a7e8db5b52f61a7f464e2c875591bfe359970ed6dde1c7188c59c6ba87d211
+EBUILD carbon-c-relay-3.4.ebuild 1524 BLAKE2B 2a8981118520787f99095b5675c0b7a8796254fefb7c6060ef7433fc6b0e21b2688fbe6d87a43018efead41ff2ebe7c1d0e1e2ca296a7e5f1a9cf2f59bbca275 SHA512 d5245f24d09c3f352ad2aece0052744e74fae3b312313122b43d999453391a767a9ecca9265ec0f743f60e7dbbd9843de02454c7a4e2419daffa478f750897e5
+MISC metadata.xml 653 BLAKE2B 224540619f2aa5e40aeb57085a4d13640c7cc6381a7a26fea6a6854935f6705576b5ca5ea88b0b7647ff3c293c6bd83b4b170c66ab12521dc7e01811506a33da SHA512 91e5e7ea08dcac8edbbbe0ed7a6b8ccac8a6ea7c2ba89d33c4f188aabaa5a975ac1738c31b942c8db8c6a37f6b1dff67f757b60991143c13f821f63ffea5ca0a
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild
deleted file mode 100644
index b8caef32bf9c..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	enewgroup carbon
-	enewuser carbon -1 -1 -1 carbon
-}
-
-src_install() {
-	default
-	# rename too generic name
-	mv "${ED}"/usr/bin/{relay,${PN}} || die
-	dodoc ChangeLog.md
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
new file mode 100644
index 000000000000..7afbf976a689
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
+
+# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
+# unforunately pcre is in global USE, so we have to exclude that here
+REQUIRED_USE="
+	pcre2?     ( !oniguruma )
+	oniguruma? ( !pcre2 )
+"
+RDEPEND="lz4? ( app-arch/lz4 )
+	snappy? ( app-arch/snappy )
+	zlib? ( app-arch/gzip )
+	ssl? ( dev-libs/openssl:0 )
+	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
+	pcre2? ( dev-libs/libpcre2 )
+	oniguruma? ( dev-libs/oniguruma )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	enewgroup carbon
+	enewuser carbon -1 -1 -1 carbon
+}
+
+src_configure() {
+	local pcrecfg
+	if use !pcre2 && use !oniguruma ; then
+		pcrecfg=$(use_with pcre)
+	else
+		pcrecfg="--without-pcre"
+	fi
+
+	econf $(use_with lz4) $(use_with snappy) \
+		$(use_with ssl) $(use_with zlib gzip) \
+		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
+}
+
+src_install() {
+	default
+	# rename too generic name
+	mv "${ED}"/usr/bin/{relay,${PN}} || die
+	dodoc ChangeLog.md
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml
index c023cb5be2a9..e59bce50e430 100644
--- a/app-misc/carbon-c-relay/metadata.xml
+++ b/app-misc/carbon-c-relay/metadata.xml
@@ -6,6 +6,7 @@
   </maintainer>
   <use>
     <flag name="lz4">add support for LZ4 compressed transport</flag>
+    <flag name="snappy">add support for Snappy compressed transport</flag>
     <flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag>
     <flag name="oniguruma">use <pkg>dev-libs/oniguruma</pkg> as regex implementation</flag>
   </use>
diff --git a/app-misc/cdircmp/Manifest b/app-misc/cdircmp/Manifest
index a5f50352c87c..e393aa6a37b7 100644
--- a/app-misc/cdircmp/Manifest
+++ b/app-misc/cdircmp/Manifest
@@ -1,3 +1,3 @@
 DIST cdircmp-0.3.tar.gz 17253 BLAKE2B 090e73d2d60ff10e8ba01c77c172b6e4b4603c778f4ad8b29dbcedd8e214f54377c171bc964c14ab4f08dc8e995b5c6b55601f75977b35669cbcfb23d0c19fea SHA512 66fa27a3c06aa4bd6584da2c6a38ad0798f5f10eb9b021080c473d03733bd2dba344549e95c22485bf72536a03a4e91a7497192296b6c297166e47a679cf0079
-EBUILD cdircmp-0.3-r2.ebuild 661 BLAKE2B 765f4f6ffc232b57178724fecd2f17791fd36977ed6de2b04775011411918d9df3bfd27d4af582780a15e6d13c06c370640a5a7b627d8f75995adba8cd70293f SHA512 b040bfdcb52a22d3579420b993c8a3a02bdf1afbb2e4f20192c6caf17e2675b9925c5dbb29713f99b882c37c8533d4cb72e087f35511f9318ea5764e731d8274
+EBUILD cdircmp-0.3-r2.ebuild 727 BLAKE2B b5e09d848d206728b43f6ab953eedd87fa3b325536388f71d2ec36a05fc8833e02fba8e5a8da521142247a10d7469e5b389d8fe2f2e4a61dcf5cc3af4bd19905 SHA512 31a4cb6ef8f315c3d0ba171e07f3493aa8b02d33ddd9fc328f645c169c710439a89507bbd40b4721c88e05007fb1daa57fabed5b27df90652ad3b4ed28a7920a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
index 928b138f683c..320af7a9c01d 100644
--- a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
+++ b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,9 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.4:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	sed -i Makefile \
@@ -26,7 +29,7 @@ src_prepare() {
 src_compile() {
 	emake CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+		LDFLAGS="$(pkg-config --libs ncurses) ${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-misc/cdspeed/Manifest b/app-misc/cdspeed/Manifest
index 27dee7d6a862..ba0c82f200e7 100644
--- a/app-misc/cdspeed/Manifest
+++ b/app-misc/cdspeed/Manifest
@@ -1,4 +1,3 @@
 DIST cdspeed-0.4.tar.gz 3696 BLAKE2B bb3072478897c202de3732bc75cf1a3306066e639f1b23daf275af8b7e627c7a6353a881a19606f155f3c6a0938c7a72171a7ee070e7313dc19265f5c1840daa SHA512 2f656c0a8269a568f10a499efb6414c217369d42dc6fee393ccfdbb69b89ab6e01dae2e3901049081a29b7a2bed857591f9ff8b2855aa6e325b85aecba2e2b37
-EBUILD cdspeed-0.4-r1.ebuild 691 BLAKE2B 7872adab9e2355d257e819f9b4d4529c850a3809ff8f39e22a640856b50324d0293dd852219a4639164b38bcf69a538e1ddc07ff8179c7b317c9041bcbc7f63f SHA512 6a66a0206ab6628bde4b24878390249830e327c3e07e5917107e7df1d0660ed3d956d46e813f33f39ff6610ddf16b0a0e08d8c0d43ff18b358e27ff345313536
-EBUILD cdspeed-0.4-r2.ebuild 607 BLAKE2B 7e3698bfe020daa4f300eb7368bbe031fdc1d0bd8cd0a53afd69c49a603833902249023cb063a96fa3fc8b79fb146971c9ed52297c5168f512c0008371766474 SHA512 69b75a5ead830e1c903366aa7c2a708c5006c248699445155f685df4fa45464e6b66db0ddd42737f76e924bd060d8e4031da3310052f8f186c264a8671cba0f3
+EBUILD cdspeed-0.4-r2.ebuild 600 BLAKE2B bd151803e507ae48438aa30c6fd715992f1d91136a96ee68a8d5013e9c4836da2c4ba2c53703b60212bc3ae5a7788a514b61625a54bbcd4adf09d0ecc096449f SHA512 0ea41cbec546f786630b320f78fcd708056d99d5c6ae319b84e97e7f99d0ea7f304ef7bf88bc860620bc5e35e13237a78fffe829e41a9db5c94bb6a0100a9d28
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdspeed/cdspeed-0.4-r1.ebuild b/app-misc/cdspeed/cdspeed-0.4-r1.ebuild
deleted file mode 100644
index 9701b686d358..000000000000
--- a/app-misc/cdspeed/cdspeed-0.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Change the speed of your CD drive"
-HOMEPAGE="http://linuxfocus.org/~guido/"
-SRC_URI="http://linuxfocus.org/~guido/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
-
-src_prepare() {
-	sed -i Makefile \
-		-e 's| -o | $(LDFLAGS)&|g' \
-		|| die "sed Makefile failed"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS} -Wall -Wno-unused" CC=$(tc-getCC) \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install || die "emake install"
-	dodoc README
-}
diff --git a/app-misc/cdspeed/cdspeed-0.4-r2.ebuild b/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
index 6c933ac2caff..a51688d15102 100644
--- a/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
+++ b/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://linuxfocus.org/~guido/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc x86"
 
 src_prepare() {
 	default
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index 61eb71f5e033..949b8f8df229 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -1,5 +1,9 @@
 AUX fhem.cfg 791 BLAKE2B ba55b71711199794c38720ad724fbc9d5f05d1713c1af0d02662765e8248e845bc3c07ae619b46e450d9b3a96a993a814e0c831a51edce6129d8efe07baee0db SHA512 9ce1c1cc2d7c55a29df2e344ad6600704e68536b734997a7cc1a73a225970c26f924c902c4d4e6f318e22a000b9b4ec2ceb52edd650fe3a8d12488b5293f7ad3
 AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5adc580af2cad57a0c13549b3c9f4b19b6fdad279ebbf8d0b64a36f29690911b342a06c865c7da SHA512 3be01778d970f4b93e551ff3769ed7b0825508dc5216a43ed0bb12f589103350bdb400561cbada9315050d32a99f723f5291e9bf1c6318642b16b8b9dc9e8c61
+AUX fhem.service 208 BLAKE2B b577fd84a166ef87f2aaf58f2fc6758d070b4181f3254e236aa376322ad4bd4b0c7e04aa9205fbc235fc39f9e8f27d17a6ae36a732058d9a7ca97154ac61398d SHA512 3f2baf5e2238074ce65e1eacfadd8f2ffd582c26e50ab03d3ac18a03acbe6b5aa85bb1258e405dae81b51f9c5554a2ee872f72dc4e929df88f7fa5681916171b
+AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce
 DIST fhem-5.8.tar.gz 22139481 BLAKE2B 444b041b591d3c960036a262e6eb3fda026d4b229a21df16d7817c32a1fd57282a7fbe5559164b760bd9cfad314c2977e7d6f611320d35be090cdb9df66fb8fd SHA512 6cfaa14288ce553a2418db4cb47c719f2d5edbccbde9e76f221cd47cf8a175a67125031c4971f9f9972b218fc709a267757c2abefe6a33be47eb4bb45e23be57
+DIST fhem-5.9.tar.gz 23267499 BLAKE2B c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe SHA512 9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8
 EBUILD fhem-5.8.ebuild 2226 BLAKE2B 1e938078cde599e3a2acde068ff4e9f4be16c3160ca95819d7c51f0ca8e3c32902577c3076cdef2972dc13ac5b0cf31eb5bff9afc476548a3b25b34872724836 SHA512 9e104f7626b17dd8b43bd2ef36d264a1d48219d36fff8345f1b0bde78c289b88c3c4f3ab87a0e60d3683134b486759d5c5d407357367380daeab005a2662e1c6
+EBUILD fhem-5.9.ebuild 2359 BLAKE2B 5cdbf07dc8cdfeb9ac223edc366210ea91ade46d0e959935a33c592b0cdcb2eaa33f35c3c9d534be4bc9d9cdeef951aa1e46365fce7b5882745f3e3b1eaca621 SHA512 676f0f4a8d878f61e4ec9c32b38d756c2c5a9b5902baabd0b1562e1232c8e2b0705d4ed819325b46940b6cd08aefc16089995626d09eb6b1e77c541458b58271
 MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
diff --git a/app-misc/fhem/fhem-5.9.ebuild b/app-misc/fhem/fhem-5.9.ebuild
new file mode 100644
index 000000000000..622c74eac409
--- /dev/null
+++ b/app-misc/fhem/fhem-5.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd user
+
+DESCRIPTION="A GPL'd perl server for house automation"
+HOMEPAGE="https://www.fhem.de/"
+SRC_URI="https://www.fhem.de/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="dev-perl/Crypt-CBC
+	dev-perl/Device-SerialPort
+	dev-perl/Digest-CRC
+	dev-perl/JSON"
+
+DEPEND="media-gfx/pngcrush"
+
+pkg_setup() {
+	enewgroup fhem
+	enewuser fhem -1 -1 /opt/fhem fhem
+}
+
+src_prepare() {
+	default
+
+	# Allow install path to be set by DESTDIR in Makefile
+	sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
+
+	# Remove docs in Makefile, as they will be installed manually
+	sed -i -e 's/docs//g' Makefile || die
+	sed -i -e '/README_DEMO.txt/d' Makefile || die
+
+	# Remove manpage in Makefile, as it will be installed manually
+	sed -i -e '/fhem.pl.1/d' Makefile || die
+
+	# Remove lcd4linux binaries, as they are provied by app-misc/lcd4linux
+	rm -r contrib/lcd4linux || die
+
+	# Remove log dir, as it will be replaced with a symlink
+	rm -r log || die
+
+	# Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
+	# Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
+	pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
+
+	cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local DOCS=(
+		"CHANGED"
+		"HISTORY"
+		"MAINTAINER.txt"
+		"README.SVN"
+		"README_DEMO.txt"
+		"docs"/*.txt
+		"docs"/*.patch
+		"docs"/*.pdf
+		"docs/changelog"
+		"docs/copyright"
+		"docs/dotconfig"
+		"docs/fhem.odg.readme"
+		"docs/LIESMICH.update-thirdparty"
+		"docs"/README*
+		"docs/X10"
+	)
+
+	if use doc; then
+		local DOCS+=( "docs/X10" )
+		local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
+	fi
+
+	diropts -o fhem -g fhem
+	keepdir "/var/lib/fhem"
+	keepdir "/var/log/fhem"
+	diropts
+
+	dosym ../../var/lib/fhem /opt/fhem/data
+	dosym ../../var/log/fhem /opt/fhem/log
+
+	default
+
+	newinitd "${FILESDIR}"/fhem.initd fhem
+
+	systemd_dounit "${FILESDIR}"/fhem.service
+	systemd_newtmpfilesd "${FILESDIR}"/fhem.tmpfiles fhem.conf
+
+	newman docs/fhem.man fhem.pl.1
+
+	echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
+	doenvd "${T}"/99fhem
+
+	fowners fhem:fhem /opt/fhem/fhem.cfg
+}
diff --git a/app-misc/fhem/files/fhem.service b/app-misc/fhem/files/fhem.service
new file mode 100644
index 000000000000..697a10179d40
--- /dev/null
+++ b/app-misc/fhem/files/fhem.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=FHEM
+After=network-online.target
+
+[Service]
+Type=simple
+User=fhem
+Group=fhem
+WorkingDirectory=/opt/fhem
+ExecStart=/opt/fhem/fhem.pl /opt/fhem/fhem.cfg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/fhem/files/fhem.tmpfiles b/app-misc/fhem/files/fhem.tmpfiles
new file mode 100644
index 000000000000..bccf63774dee
--- /dev/null
+++ b/app-misc/fhem/files/fhem.tmpfiles
@@ -0,0 +1 @@
+d /run/fhem 0700 fhem fhem - -
diff --git a/app-misc/gnutu/Manifest b/app-misc/gnutu/Manifest
index 0aa8ae8b8542..a00c9e14a994 100644
--- a/app-misc/gnutu/Manifest
+++ b/app-misc/gnutu/Manifest
@@ -1,3 +1,3 @@
 DIST gnutu-2.5.tar.gz 287100 BLAKE2B 1e5c140e33097643dac12c1018468f34946d232237a35d16993a6750a04e71b9a1d5eff4e0e8388de7f22d98cec173107ebdfe276cff5d2969bfd45dbcfac584 SHA512 b3ce4a39ca06cdb18459b64ca0ee167a735ae01dcac155c606d4ee61ace4d128540aa60f5ca2c0a5ed9ed561a7b1ebe02cd1dd4cffe79c3f0cbb8af831fdcd82
-EBUILD gnutu-2.5-r1.ebuild 439 BLAKE2B f8c4fd6e6eb80a62ab014feeb8526f7ac08e39afe4cd730d620022d2d38e5736b7ec0163ffa8d55e567c686cb0f68bd2c52a7339035ed0c33642827aadc6ad3b SHA512 658c06c9ad74ffbcf4b950edff4b0256271eb85c0717b60e6a30b00e2100d881430e3f1b9b6a678c7599823e2cd850c18d735c315e3f79cf719a25e21c8cae77
+EBUILD gnutu-2.5-r1.ebuild 428 BLAKE2B a0b098383bfc8b3e0252d8cf3af352b7df77b99aca509384c8d547556658191edf50a08eed991ca646c1dbc80bd4edb38e149a6c1f015e8293b942299352ad2b SHA512 9c47c78124e7e1588ece414a94fe671887363b9420be44e895c875e472f05a5022c8b164944d42bbdb306063f79717bc092acfe153741d768cfa15993a7c9ad4
 MISC metadata.xml 873 BLAKE2B c317e6972dd81efa9ceebc224f089b9661c77be69894f0062f5e7e93cb5e17967ac683bba1c47332ec6448b6ae05d6db6835d25d3252e631dd893254307e1907 SHA512 c8954a8cd9ba16d5bb61e47ec33eec0c8631ebcffb01e324ddb2fd3cb7de1bf8c989d7a8e209449e99af1e72cd0aa86881ac6f22a63a5b3a63801cd22e15547b
diff --git a/app-misc/gnutu/gnutu-2.5-r1.ebuild b/app-misc/gnutu/gnutu-2.5-r1.ebuild
index fbb2fd2a9f30..15ea1c63c534 100644
--- a/app-misc/gnutu/gnutu-2.5-r1.ebuild
+++ b/app-misc/gnutu/gnutu-2.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="GNU Student's Timetable for polish users"
-HOMEPAGE="http://gnutu.devnull.pl/"
-SRC_URI="http://gnutu.devnull.pl/download/sources/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,4 +17,5 @@ RDEPEND="
 	>=dev-dotnet/gtk-sharp-2.12.21
 "
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+"
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 95248535a4bd..46f9f77ecebc 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,6 +1,8 @@
 AUX gramps-4.2.8-uncompressed-docs.patch 1261 BLAKE2B 48ebdddf13e9f29f01a3f5456686fce3d93e89437264c96918b39800f95a0bf65ed05802a74c6061aa3a375d710fdfe484c8a8afffd4a6805487453f4ebc96b7 SHA512 422338a2b6aa7865c59c5238728be95e7852097a464d328fc5d75c93305c05a1a05dc077c0a20838d66d67984d1cb9d9482fc92763f022f08a88d2dc414c5b0d
 DIST gramps-4.2.5.tar.gz 18694912 BLAKE2B f91bc665ab4a970e7de193ba3bea4250e99b692cb92e76fae4a37cfa2c46280e6a45ff6712c7a68213735b6e7016f2caa3180971976c92aaa7e61d73ad2e3d5a SHA512 20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c
 DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
+DIST gramps-5.0.0.tar.gz 16773759 BLAKE2B 603a73b448fd41e4d491ca681c0177112541ff780566756f26a2bca7614a4699b90006d321e7925dd936a32367ccfd9b4b93d6ce70af5b750de641b17dd9c2d8 SHA512 95d775fc48a8165b14431a76cd9e60a80df5db0256c98d953fd1a270849446748d8630e0b5ff1b823345fcc7992b48a7c9d577c81a28e10ba0a6177f2501b6e3
 EBUILD gramps-4.2.5.ebuild 1336 BLAKE2B fbf43f646f953dc31e245f29e2efb6c0cbccceac8272162819aaab5363d284a821ec7220c022563085e3540c2ff23e57e766a88e74bf0dece8e7188fd5b3b4b8 SHA512 4eb326bcf7909cdf56ed57d0d97203003b34472e4c6a5c774c8b55f09afcec64ef1e3ae93acb21fff40343e78179cf5fafaa6b7d3e587636b4dfca481435cb27
 EBUILD gramps-4.2.8.ebuild 1606 BLAKE2B 8a147903eb6ae7c9d75328977b6fbab798a40ae3bb9d51fb600488f780bd3194213e949f257039c87dc8d2180bf5523dae567bb54feffa09ed36d009c02d1bd4 SHA512 f324c0791d404b280784e77edd660b313e647d3bd6d8849568b7ef13816d6329f6f340c7c4ff000f7d88c054e64511b0313cd24b492319341fa35d2babd96b7b
-MISC metadata.xml 5730 BLAKE2B 0f0915a541ef3aebaa124fcd3914db315b0d0ab72ed50af26fa9010a28b5bf5f8514dfe280041d4c7fb7aecc904ccf6d32708074048e05f68efc75c2c7dc7163 SHA512 2b5bdbffe1c49e83a5df03d2158dfe3bce9a746c1ac07b15f6421c3c18ee6a5b24998e59b942482ce788820afc9f508d956f06a1472b65cebb36044dd648e48d
+EBUILD gramps-5.0.0.ebuild 1994 BLAKE2B 00994156b533444378cdc892b516d6cbabfa4467292727beeaf76e5b6313a0933c79ab03e27c2d4fd407c0a1369d63d062da1c157f7d2f3c91094e159f87fdea SHA512 72f722d1d8299196e5e686036a1c276f22b03fcaa29adc00596794056180f4004203974a4f06bd3e93576bdcb83fc7188b07318ab59d232d4fb9286684b4d77a
+MISC metadata.xml 5598 BLAKE2B ff887427b9bcb043e848c7e7b9fbcd3e4364f4a8672f94e35ae08644e0417d2c35292beca630731bf1a21f0c8bcc7075a7607c9fb35f3c3bd674bf199665b70e SHA512 42ac77766caef5c416c1c99dbeea7d3e8191f745f461147ba7ff04211339f961abe9cc4c609eb926799844bb0c83d9e58b33fd00ed4a4c71826ca7f48f8da264
diff --git a/app-misc/gramps/gramps-5.0.0.ebuild b/app-misc/gramps/gramps-5.0.0.ebuild
new file mode 100644
index 000000000000..f72ed60e1b6a
--- /dev/null
+++ b/app-misc/gramps/gramps-5.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rcs +reports exif geo postscript spell"
+
+RDEPEND="
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+	dev-python/pyicu[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	reports? ( media-gfx/graphviz[postscript?] )
+	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+"
+
+python_prepare_all() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the $PF variable,
+	# and that changes with every revision.
+	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+	)
+}
+
+python_test_all() {
+	# GRAMPS builds just fine out of tree but it confuses its test suite.
+	# The following might be an ugly hack but at least it lets the tests
+	# run properly until either I or upstream have come up with something
+	# better.
+	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
+		die "Failed to symlink build directory to source directory"
+
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/gramps/metadata.xml b/app-misc/gramps/metadata.xml
index f7eab38a8930..4398f3959769 100644
--- a/app-misc/gramps/metadata.xml
+++ b/app-misc/gramps/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>herb@hlmjr.com</email>
-		<name>Herb Miller Jr. (herbmillerjr)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<longdescription lang="en">
 		GRAMPS helps you track your family tree. It allows you to store, edit,
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 488b05f81d73..2f514a275035 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -2,5 +2,5 @@ AUX jq-1.5-dynamic-link.patch 292 BLAKE2B 65edf9902b3a97621cb5485931d6978625b898
 AUX jq-1.5-heap_buffer_overflow_in_tokenadd.patch 1241 BLAKE2B ae161ea9ce220f57ee5aeec1b9d202de8401dcb5e842ba8d105eb3a2bc2cbd0f387980d76bfe8a30a6304ea04a1d00fe8733e7dab46507602d16eac74387f3a6 SHA512 7c0e7268a8715f9354322b81e82971fd6e6810206024fb59f55fdf319c1053fdd17ab4d2a78c8edc9ed1638339671419f4ea92cbb0f8ffbb34e5b521efb35718
 AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 BLAKE2B 821dc0ba57bdabf268efb3429417ee5e32d666dc33debea89aa7550c4bbad3c5938a6a0bf0cb4adfc2c0173b7bfeac3dcd16c52b19be6e92733ea8dfee89b4b5 SHA512 3c7efccf85beda5f80c66432f6950b2d885c4587e6ed3cdc66447f60440dc0287da834cc5744ddd7af8ad36677254ebae6969bc498d36e457dfac69ca0da3f6d
 DIST jq-1.5.tar.gz 739309 BLAKE2B 9d36db80fa9365d9967c9e1691e723d5237e7db2ddef43e06391bb97ba3a163f07c79906b9cf94d4b53f20598dc8ccacaff9e54ff3c32387fef1b3d484c13e73 SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238
-EBUILD jq-1.5-r3.ebuild 1385 BLAKE2B e5e6fcc3dd40dc2a6667763dced918ed3c007275a2daecb60704ecfdcacae7398fcba373809c9f22c146f91caafae4b4d2b0eeae6c187a2cfeb34efdb9027d6d SHA512 da253fc8d393a3106437b5cba2a4c618076f9c8d23b834d8aab2079de876a53e8a2f2b5ebcd6d79ff48b53c54276a81aa314ccbbbc22e02d720a800a40e20ef7
+EBUILD jq-1.5-r3.ebuild 1392 BLAKE2B 3bf5f4a5124ed0e44158969a38201e5c9a5311ce23af5bca431acb2b0e69f50d5c6be60561a29c067f813f7bb4bb1d57bd7659672258574e3e9cebaf9e8da1c7 SHA512 2d1a0ca492838b08b40232cc574d3cbd3319250a45f23a53f5b8688e12def7702cce59bb761d3d30e58fd50ba8cde1dc0e1d7790a0ce0411444dc39922a81426
 MISC metadata.xml 423 BLAKE2B 1e5f03ac7d6b93814bdfe760d9b2d9b74447272b554f7e92c40918069c7787ee8c60dd68a86df38c67f27422f0f281c7ad7234305a45532b657be0397a5b81af SHA512 1787b1ce5d050aaa440996ceaf2367e39192af71e7d9a0d973e8dc8a87854f910aefd020c869867e3da5da33d27cc261047a1ded58b18052b21bf6737ef3081c
diff --git a/app-misc/jq/jq-1.5-r3.ebuild b/app-misc/jq/jq-1.5-r3.ebuild
index f2b7f8001e52..b64204f809c6 100644
--- a/app-misc/jq/jq-1.5-r3.ebuild
+++ b/app-misc/jq/jq-1.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="oniguruma static-libs"
 
 DEPEND="
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 43847a54cd62..fe6fc2779816 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -8,6 +8,6 @@ AUX lcd4linux-0.10.1_rc2.initd 539 BLAKE2B 314810d6bf8a402a435dc1cb53f610ed1f0fd
 AUX lcd4linux-r1.initd 775 BLAKE2B f1b4ee44d147e1ea191658edc2b7502acfc8d5a82e5b1af2deb74457cb3b20b32477d055cd24b7587019b711dfe55c7bb5dadd43d5a1d76d320e3ff6a2c19021 SHA512 471517952391880f3bcf85e21de56523ee40578fcf75b4e7256554498bbb691e8bbfe4add509d32dc99b409d7b7b3abd608a60326d883a43cb114b279a217213
 DIST lcd4linux-0.10.1-RC2.tar.gz 386188 BLAKE2B 7d396ee15e00212eb314721cd9627147ec1654f43fff1d3ae3f8c38d33d8d133f1fd5c53ef2b78eba7afefb7f65a53810da52a903911abdd95383b2b2c28d06f SHA512 8c4299f50ab4068d4106ba32309f4f66bfedf382a4aed7495cf400d22c57c22c4dfabd80f7e4355417c5c0d964e69f0c268a50bae6924b759b720bd728a969f9
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
-EBUILD lcd4linux-0.10.1_rc2-r4.ebuild 5156 BLAKE2B 9cd0d0231dfec0ff6fab4c668969e16a546e70167d0d495caf8d527554521a1878e3b4f14451ce7abd29c2db7b8c0bb87cb2815a087c79777592e431a8b4610d SHA512 a17a33cbeac88b0eec6a6d5fb8435667f3f9d5c33bb77e360ba7d755f6c3c138d3d6a7ee87c83eee4f4679d4df59dc27457a61ed108c0a11ed30d2dbf8d4b1d9
+EBUILD lcd4linux-0.10.1_rc2-r4.ebuild 5152 BLAKE2B c93e24bde5ee61bb926079a8b487d723046681c776954d41d6c258d638f5a0f4a47bbbcb4ce6592b76715cf28c6f60762dda7b82d02567c98fce599c126c1ab8 SHA512 b1ef4cf6203d51c7b8518ce9d554db5541b6eed4d59548218c4ac9d8d7fea3c0ce2a04a24dd518da1e75eeeda40c34ee819fd588a6c647baab3911216cecd340
 EBUILD lcd4linux-0.11.0_pre20170527.ebuild 5554 BLAKE2B 8df277c018df83a5f32907605bb8d43e45125cb8b285731bd0a4cc9e5a20a0aba4ecd08df5e098c354110f404b9e8e037fdc4cffc7ec076ce480d43b881ba0d6 SHA512 4a7ee882463293c0fc7bf8ca52fbc1726ad54208930bb707020419a2c9e6180b613987471a473ad282b24598060a579ae580b7f7e356e2b950a4482366942749
 MISC metadata.xml 3555 BLAKE2B 507770da472d7befe06269d3b8ed52ca258467acb8d18892f47db3a630742c66f48f55f069c160ef0c889bc0fd31fbdd41b81fc6574ff4a51eea247373b8e25e SHA512 618885236669c7b9c28114d01f2f2f8c05638eb4eb85aca3d311d180cf82af01255f143ccdc0db2e890d42d2cb7fa3223638fcf4985d80322c95101e6c00e9fe
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild
index dd4dad81be11..ce72ad458094 100644
--- a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="mysql python iconv mpd"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 5975d8880273..ed8d8a5fd567 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,26 +1,10 @@
 AUX irexec-confd 280 BLAKE2B ad6663659c459811710a257cf357ddd5efbd17c09201c6e3ecc68d680004e8212e76365e09984b6c422fb5fa9603245c7443d1b71bb6064a2ed35734ab6dd630 SHA512 2b33e1044086d11fd6e1f9a204ce925182a3a2b92ef4399610e01702f9c2c8fbc87cae52961123297171eef3d40468ac17437b4281b26a5f3b256c9cebc612ac
-AUX irexec-initd-0.8.6-r2 703 BLAKE2B c13b5348222f18d9883bc59f5db73ed1aa98f880c878f7059e0f150a9a0903395739a2364c2a9ce8d305f0d363bbc6aa676b20e4f70b941505770e30003897f9 SHA512 2d06c0bedbd2af9120caa54c049815a2bd920054afbcbd6b0bc1a48dab479527aea5e4fc7065428742f8d46032476ee37fb075669e93e16b2df5bfb8b572f86a
 AUX irexec-initd-0.9.4a-r2 681 BLAKE2B d2bf21ab1fe275bf5afea31a890c1de3300e836879b76c1c33bb40a59d9ad2b33285745a4d0a78f8bc2f589ba44e6fde31c7d07a02d9751e4b13b23975b1d9aa SHA512 0514712ce1a3e147e1c798319f90663baab7509299e2eb35551a716cf208e42b225f8539968bba1bd15270006fb728ff2f458015fb07bf325df8b0e095f5a206
-AUX irexec.service 140 BLAKE2B 6ee184023b77da18b2447704165fbda27b6b19ae70f0ae99fd3f07f046e80c480fa851a3315fda6c20c5d68c8186d200bb2637ae2249f993338e08ee62b1c345 SHA512 573e037d7132d216f095e4af370cdd020d72eca4ca6dfb1a652d6cd3f533b7d86491469a14d86419406561a6fb6500567e5e38a13b8dd0c99c63ff8494562249
-AUX lirc-0.8.3_pre1-remotewonderplus.patch 943 BLAKE2B 1041002d814fef683eefd409874783d5d3fc4fccfdc740d6d499628399c86a1b2a99243894752753cb6c0eef549e6293474d13ec0a92cb3c87202fc4b1010c67 SHA512 f1c5b03eafb8fb9d4190e438fb4ca734cac102c7f3a097f193a0a1ac7cdee33b01fb1d794959e00be16c78bb66e34d113f3ff8fb87678e99f82670ec0306e3ca
-AUX lirc-0.8.4-portaudio_check.patch 769 BLAKE2B 08450f17818ef2525af534345bd5e5544416b0fa6f91a854f98ce0b03667458cb54aa565a581f35169581f4ec7bb71bda365c41b00378bc2c5cac9ec19895924 SHA512 a4e63da5d03f1fbb072679c3a415ae55767d601512f158c5e2fc52a045b632a055b94dca4e9d0d236ceeeb367daf22d4cc71f542229edb4fb13410512a8e4f0b
-AUX lirc-0.9.0-add-zotac-support.patch 19305 BLAKE2B aa968c0fe02057c3310731bdab00bc196657a826c28746e0038c9b72b85140669fc008b69e90c0bbf28bc222424a149b78014367eea7ccc551cdd53102f139eb SHA512 72ac76eba13ed043630b10adad7a8a0df9183c7b2eeab1cc2bee3f7d6a97d56382debcf61aa4a2d6068d85bbd8d592ee425f34a6ac6eabcbf0a300ed6fb208cb
-AUX lirc-0.9.0-atiusb_kfifo.patch 437 BLAKE2B c2215e718924e5185cef1f5b80428902c20b3b69d313ee9f8fe0d98d5553bdf03ec64ac359c3e42c78e40c6d9d1b0f38986387e15a95e630796e3b2148688004 SHA512 d072ecd94ed4b7f1662441106650b7eb329cbe62887819c1e607ae87375a17dedea02a3a5dcf6956a1151743fd652ec5884577c595771740eef509daab8dbd02
-AUX lirc-0.9.0-fixed-font.patch 630 BLAKE2B 39e12cca466fbee96112395104b2055997ec6941465782ecb928de4793cba29203f5f99d280d530fbaadf5d2377d1e25a88e4897c103d3d12fbf0a6cfcd8e6e9 SHA512 782eb14bd540f202a3df71ce801a42b9adca17fa25a79265af6a3b0ed6b503a67b46a0d29ac6b4607862b712a3511a3a3f16cdc7bef70ba1e43967be11971ed4
-AUX lirc-0.9.0-kernel-2.6.39-fixes.patch 2175 BLAKE2B db4c75de0f7c2de3b99f50b17321ec1cd93bbba480536f533c64d07e8cac8fe1710f03d1f91005e5ff7db52ea906799aaf08ff1a6174fa4a2676d8f6f77da601 SHA512 a502b815cec565a49382e9ad0e7237a9bc7da431f41e94db42d214655577212606500ea2651a298db8cd3a68ce706461e6a773b0d9e3316ac7d49b2038fda354
-AUX lirc-0.9.0-kernel-3.3.0-fixes.patch 1545 BLAKE2B 400ef11e93b9cc58bbfa7f414df66208d1ad6fe14301b85dd05599b400aa1ecf6299b1e9692945f10f4b7ed085e8e087b0cdf218644bea0b7f785e00959d2be3 SHA512 75743844d7fe61a91174c1d7ee78a229e347659a35d1062a704c39e424d8a433efac4216a0b840282c38a4f2f22baa7a489c1c0402a40f734e7475992046a2ae
-AUX lirc-0.9.0-kernel-3.5-err-fix.patch 326 BLAKE2B ebfc117d5f1f1abe2a456ea6b5ed730ec22ebe03fee976eaf9005464afbfe5519f290cb5a107946286b8632a695d2f352ddb8581f63c429f75a7080d1916189b SHA512 c3a6e802b140595155a7ae8dc695bc13e4d6147323949a8dc9c86857bf7abcd442339eac64f99869925c308a100bfb1b7b0eb715f086afb8997252164ff079df
-AUX lirc-0.9.0-kernel-3.8-fixes.patch 2727 BLAKE2B 26601a6e34f0dadad36de1efa9b9a43127643a5c548372d9a64b2b919ddcef3d412ccd4bd59e8c18cd9d5fb9a41efe2d213a3f91397d9067a5851aa84b7832fe SHA512 0db9cbb3aba7d43dc497bc8009afb8335bfe013a06aa6936e1cd357e58c60f545575b06fb6941740d82b496dd4f2ac51b3a165435aee6b3c57107ae62bae7bdc
-AUX lirc.service 216 BLAKE2B f1ee64926ab99eaeb5604f93d6394994eff97b9e5ae5b32a10d066e143e66278114722e15c3757815911ebc0485fde43c1f10e8abecf4a90550ccf4c08c5aa1b SHA512 c3e43d24f562ba5ac7e0f12d160026ebf5db00fe066d9e28e0cbb6767fb272474103ad271fba10b970a6613f6e4545150d61b7aa096c696fddca4f2db8019e49
 AUX lircd-0.8.6-r2 1204 BLAKE2B ae4082b6f063d3100865bb3e974d9ebec8f04e08dae8c296c30152f69700924b8850c85687a5cedb3895f52c1e7a576b0855a52e350462a0552da64cd3a7e6a4 SHA512 482fccd204671f6258822029b9eb9a1e22abf02e382b3814f924f171fd1168d46560f52a90727f3de60c27a78158173a4e0c3e848d45e489471c27851c907c05
 AUX lircd.conf.4 699 BLAKE2B 573b16d756f6df55c399fd77027ebb1e6bec1f28106d1a1d4cb028ab3694350a959486d33b82502a258492882e2fdfcb8f8e5220998ee4e1a503618ec247b30b SHA512 1fb1778f4cc72fc9c11b13a704b3abe80bcce5b3770b69b6b6bea8571e5293adad8c6968779b812e611b67734462c9a577cc71c6b16da3a5bfe31b8007300a62
-AUX lircm.service 174 BLAKE2B 30db4e9dd3eed5ae896f60d2363d25f5bf11c83b946e668e7b13e31465682405eb1e5bb436c8987a59ddf9be6e0032745a5867cbeca978ccaf9c47e8eb24633c SHA512 8baccd7138fb9095c99f4f0a8ef398114dfa2bba798f23e07d41d6a7433242e2e1f071d44e1b336fb2a36b30c650ed01f2ccdb1ed365e590f85007c012343db5
-AUX lircmd 364 BLAKE2B 71971476198f92bb2d26cbacc8fe330c4d73e0b36370180cfc6438047339487451b093455761b92660e3f3571c7884b97e6c79cbf7415bff6bcc6ad5198ddd43 SHA512 2f4aae24982a51c54fa59ddd8a48190c11f86ac67fc25bbb599f750be5b91e457c2f779e915943803bde2ec3e5e8988f3c0ffb9d1ea4a08c2e7f05cd3e8b75a5
 AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297aae75b17ed1bb858a57aa1f524d096ec2744f0d543b719f13e80a467869b7ac86e560cc396a24b0648 SHA512 6a69c7600024f00947dc35e3c6cebf7524fcf5f2a1e799fe70590fef2070c1049c4e6177711821f4e7b13972fd6f535591b48bb1006acd44fa650591b3265ace
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 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 3737 BLAKE2B c301a74cc28fe71b2baa93b8e971473b5c91ac8b5257ab78d2b26e71c2e013dae6e352b7eb8c15aa60e2e05bed3413ed9b5e0b30045eb667b6d8b9846539bae4 SHA512 c80ef32cb9d6d9a2cc61fc346de899308405dade3bc6e6e504ebc09389b835095f88057eaee90b37bf3a27ec87e26f7c9b273d783f95739fdbb48054fd54bfbd
-EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b
-MISC metadata.xml 1175 BLAKE2B 1bcfd5d3fed6ee42c3e53168cc40fd930e6b92bf52bc787c43439f053e1fb97bf841d71ec58ce3fae56187c77cac767613107e74a90f8871dcfe3f33e4ff293f SHA512 c1d6ff9a423c0ea5d52410d5dfa2cd9dd94b61109494c629706dc74c228032e19e6504884c50694450624d6c05f437eaaebaee0ab626f7004fc7377331fa847c
+EBUILD lirc-0.10.1.ebuild 3733 BLAKE2B 54b4dbb14785de95d6db40fffdd8bb7ce1213ad23825fca80b952bfcfbc64957554bfeb150b7f3919386f47d34baf876b9e3e6337881ac82dc3b0e1143e156e5 SHA512 733bd887df1fa1ff895dedf91bae965b3c41d15e5e58d82858c54eca0576a6c69519f4be07cb0e20cb58becf5192c09b362c2513eecba9bdb9b49352b14335eb
+MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/files/irexec-initd-0.8.6-r2 b/app-misc/lirc/files/irexec-initd-0.8.6-r2
deleted file mode 100644
index e62497306d0f..000000000000
--- a/app-misc/lirc/files/irexec-initd-0.8.6-r2
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2003 Martin Hierling <mad@cc.fh-lippe.de>
-# Distributed under the terms of the GNU General Public License v2
-
-: ${IREXEC_USER:=root}
-
-depend() {
-	need lirc
-}
-
-start() {
-	if [ "x${IREXEC_USER}" = "xroot" -a "x${IREXEC_DISABLE_ROOT_WARNING}" != "xyes" ]; then
-		ewarn "Warning: Running irexec as root can open security holes"
-	fi
-
-	ebegin "Starting irexec"
-	start-stop-daemon --start --chuid ${IREXEC_USER} --user ${IREXEC_USER} --chdir / \
-		--exec /usr/bin/irexec -- --daemon ${IREXEC_OPTS}
-	eend $? "Failed to start irexec."
-}
-
-stop() {
-	ebegin "Stopping irexec"
-	start-stop-daemon --stop --exec /usr/bin/irexec --user ${IREXEC_USER}
-	eend $? "Failed to stop irexec."
-}
-
diff --git a/app-misc/lirc/files/irexec.service b/app-misc/lirc/files/irexec.service
deleted file mode 100644
index 53dac65dc234..000000000000
--- a/app-misc/lirc/files/irexec.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=IR Exec
-After=lirc.service
-Wants=lirc.service
-
-[Service]
-ExecStart=/usr/bin/irexec
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch b/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch
deleted file mode 100644
index 66527bcc5709..000000000000
--- a/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c.orig	2005-10-29 08:18:53.000000000 -0600
-+++ lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c	2006-04-01 14:31:05.000000000 -0700
-@@ -147,8 +147,9 @@
- /* init strings */
- #define USB_OUTLEN		7
- 
--static char init1[] = {0x01, 0x00, 0x20, 0x14};
--static char init2[] = {0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20};
-+static char init1[] = {0x80, 0x05, 0x1b, 0x15, 0x14, 0x20, 0x24, 0x15};
-+static char init2[] = {0x83, 0x03};
-+static char init3[] = {0x84, 0xd7, 0x020};
- 
- struct in_endpt {
- 	/* inner link in list of endpoints for the remote specified by ir */
-@@ -1034,8 +1034,9 @@
- 			usb_sndintpipe(ir->usbdev, oep->ep->bEndpointAddress), oep->buf,
- 			USB_OUTLEN, usb_remote_send, oep, oep->ep->bInterval);
- 
--		send_packet(oep, 0x8004, init1);
--		send_packet(oep, 0x8007, init2);
-+		send_packet(oep, 0x8007, init1);
-+		send_packet(oep, 0x8002, init2);
-+		send_packet(oep, 0x8003, init3);
- 	}
- }
- 
diff --git a/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch b/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch
deleted file mode 100644
index 36f5f360cd18..000000000000
--- a/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Portaudio is only needed for LIRC_DEVICES=audio, so not checking for Portaudio when the device is disabled will prevent automagic dependencies.
---- configure.ac.orig	2009-03-13 10:02:50.000000000 +0100
-+++ configure.ac	2009-03-13 10:04:00.000000000 +0100
-@@ -336,14 +336,6 @@
-   AC_DEFINE(HAVE_LIBIRMAN_SW)
-   possible_drivers="${possible_drivers} (irman_sw)"
- )
--dnl audio driver requires PortAudio library installed and some linker flags
--AC_CHECK_HEADERS(portaudio.h,[
--  AC_CHECK_LIB(portaudio, Pa_Initialize,[
--    AC_DEFINE(HAVE_LIBPORTAUDIO)
--    possible_drivers="${possible_drivers} (audio)"
--    ],,${portaudio_lib_other}
--  )]
--)
- dnl audio_alsa driver requires ALSA library installed and some linker flags
- have_alsa=no
- AC_CHECK_HEADERS(alsa/asoundlib.h,[
diff --git a/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch b/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch
deleted file mode 100644
index 381860ced6fb..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-diff -rupN base/configure.ac mod/configure.ac
---- base/configure.ac	2011-03-25 23:28:18.000000000 +0100
-+++ mod/configure.ac	2013-03-21 16:25:07.218419985 +0100
-@@ -383,7 +383,7 @@ AC_CHECK_HEADERS(linux/input.h,[
- dnl check if hiddev is available
- AC_CHECK_HEADERS([linux/types.h])
- AC_CHECK_HEADERS([linux/hiddev.h],[
--  possible_drivers="${possible_drivers} (asusdh) (bw6130) (dvico) (macmini)"
-+  possible_drivers="${possible_drivers} (asusdh) (bw6130) (dvico) (macmini) (zotac)"
-   AC_MSG_CHECKING(for HIDDEV_FLAG_UREF support)
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <linux/types.h>
-@@ -393,7 +393,7 @@ AC_CHECK_HEADERS([linux/hiddev.h],[
-     ]])],[
-     AC_MSG_RESULT(yes)
-     AC_DEFINE(HAVE_LINUX_HIDDEV_FLAG_UREF)
--    possible_drivers="${possible_drivers} (samsung) (sb0540)"
-+    possible_drivers="${possible_drivers} (samsung) (sb0540) (zotac)"
-     ],[
-     AC_MSG_RESULT(no)
-     ])
-@@ -446,7 +446,7 @@ AC_ARG_WITH(driver,
-                           srm7500libusb, tekram,
-                           tekram_bt829, tira, tira_raw, ttusbir,
-                           tuxbox, tvbox, udp, uirt2, uirt2_raw,
--                          usb_uirt_raw, usbx, wpc8769l],
-+                          usb_uirt_raw, usbx, wpc8769l, zotac],
- driver=${withval},
- driver="unset"
- )
-@@ -464,6 +464,7 @@ portaudio_lib=""
- alsa_lib=""
- atilibusb_lib=""
- atwf83_lib=""
-+zotac_lib=""
- awlibusb_lib=""
- dfclibusb_lib=""
- srm7500libusb_lib=""
-@@ -683,6 +684,10 @@ if test "$driver" = "userspace" -o "$dri
- 	usbx)
- 		hw_module="${hw_module} hw_usbx.o serial.o"
- 		;;
-+	zotac)
-+		hw_module="${hw_module} hw_zotac.o"
-+		zotac_lib=-lpthread
-+		;;
-   esac
-   done
-   #remove duplicates
-@@ -733,6 +738,14 @@ if test "$driver" = "alsa_usb"; then
-   lircd_conf="creative/lircd.conf.alsa_usb"
- fi
- 
-+if test "$driver" = "zotac"; then
-+  lirc_driver="$driver"
-+  hw_module="hw_zotac.o"
-+  HW_DEFAULT="hw_zotac"
-+  lircd_conf="zotac/lircd.conf.zotac"
-+  zotac_lib=-lpthread
-+fi
-+
- if test "$driver" = "animax"; then
-   lirc_driver="lirc_dev lirc_serial"
-   lircd_conf="animax/lircd.conf.animax"
-@@ -1499,6 +1512,7 @@ if test "$lirc_driver" = "none" || \
- 	test "$lirc_driver" = "macmini" || \
- 	test "$lirc_driver" = "samsung" || \
- 	test "$lirc_driver" = "sb0540" || \
-+	test "$lirc_driver" = "zotac" || \
- 	test "$lirc_driver" = "srm7500libusb" || \
- 	test "$lirc_driver" = "userspace"; then
-   lirc_driver=
-@@ -1669,7 +1683,7 @@ if ! echo ${hw_module}|grep " receive.o"
- 	receive="receive.o"
- fi
- 
--hw_module_libs="${alsa_lib} ${atilibusb_lib} ${awlibusb_lib} ${caraca_lib} ${commandir_lib} ${dfclibusb_lib} ${ftdi_lib} ${iguanaIR_lib} ${irman_lib} ${portaudio_lib} ${srm7500libusb_lib} ${atwf83_lib}"
-+hw_module_libs="${alsa_lib} ${atilibusb_lib} ${awlibusb_lib} ${caraca_lib} ${commandir_lib} ${dfclibusb_lib} ${ftdi_lib} ${iguanaIR_lib} ${irman_lib} ${portaudio_lib} ${srm7500libusb_lib} ${atwf83_lib} ${zotac_lib}"
- 
- dnl tell the Makefiles what we decided
- AC_SUBST(daemon)
-diff -rupN base/daemons/Makefile.am mod/daemons/Makefile.am
---- base/daemons/Makefile.am	2011-03-25 23:28:18.000000000 +0100
-+++ mod/daemons/Makefile.am	2013-03-21 16:25:40.488790784 +0100
-@@ -58,7 +58,8 @@ EXTRA_libhw_module_a_SOURCES = \
- 			hw_usbx.c hw_usbx.h \
- 			receive.c receive.h \
- 			transmit.c transmit.h \
--			serial.c serial.h
-+			serial.c serial.h \
-+			hw_zotac.c
- 
- libhw_module_a_LIBADD = @hw_module@
- libhw_module_a_DEPENDENCIES = @hw_module@
-diff -rupN base/daemons/hw-types.c mod/daemons/hw-types.c
---- base/daemons/hw-types.c	2011-03-25 23:28:18.000000000 +0100
-+++ mod/daemons/hw-types.c	2013-03-21 16:26:38.913200218 +0100
-@@ -59,6 +59,7 @@ extern struct hardware hw_uirt2;
- extern struct hardware hw_uirt2_raw;
- extern struct hardware hw_usb_uirt_raw;
- extern struct hardware hw_usbx;
-+extern struct hardware hw_zotac;
- 
- #ifndef HW_DEFAULT
- # define HW_DEFAULT hw_default
-@@ -160,6 +161,7 @@ struct hardware *hw_list[] = {
- #ifdef HAVE_LINUX_HIDDEV_FLAG_UREF
- 	&hw_samsung,
- 	&hw_sb0540,
-+	&hw_zotac,
- #endif
- 	&hw_silitek,
- #ifdef HAVE_LIBUSB
-diff -rupN base/daemons/hw_zotac.c mod/daemons/hw_zotac.c
---- base/daemons/hw_zotac.c	1970-01-01 01:00:00.000000000 +0100
-+++ mod/daemons/hw_zotac.c	2013-03-21 16:31:06.989272556 +0100
-@@ -0,0 +1,429 @@
-+/****************************************************************************
-+ ** hw_zotac.c *************************************************************
-+ ****************************************************************************
-+ *
-+ * Lirc driver for Zotac remote
-+ *
-+ * Copyright (C) 2010 Rainer Hochecker
-+ *
-+ * Distribute under GPL version 2 or later.
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include <stdio.h>
-+#include <pthread.h>
-+#include <sys/fcntl.h>
-+#include <signal.h>
-+#include <linux/hiddev.h>
-+#include <sys/ioctl.h>
-+#include "hardware.h"
-+#include "ir_remote.h"
-+#include "lircd.h"
-+
-+enum {
-+	RPT_NO = 0,
-+	RPT_YES = 1,
-+};
-+
-+static int zotac_init();
-+static int zotac_deinit();
-+static char *zotac_rec(struct ir_remote *remotes);
-+static int zotac_decode(struct ir_remote *remote, ir_code * prep, ir_code * codep, ir_code * postp, int *repeat_flagp,
-+			 lirc_t * min_remaining_gapp, lirc_t * max_remaining_gapp);
-+static void *zotac_repeat();
-+static int zotac_getcode();
-+
-+/** Max number of repetitions */
-+static unsigned max_repeat_count = 500;
-+/** Code that triggers key release */
-+static unsigned release_code = 0x00000000;
-+/** Code that triggers device remove  */
-+static unsigned remove_code =0x00FFFFFF;
-+/** Time to wait before first repetition */
-+static unsigned repeat_time1_us = 500000;
-+/** Time to wait between two repetitions */
-+static unsigned repeat_time2_us = 100000;
-+/** Pipe between main thread and repetition thread */
-+static int fd_pipe[2] = { -1, -1 };
-+
-+/** Thread that simulates repetitions */
-+static pthread_t repeat_thread;
-+/** File descriptor for the real device */
-+static int fd_hidraw;
-+
-+static int main_code_length = 32;
-+static signed int main_code = 0;
-+static struct timeval start, end, last;
-+static int repeat_state = RPT_NO;
-+static int error_state = 0;
-+static int probe_code = 0;
-+
-+#ifdef HAVE_LINUX_HIDDEV_FLAG_UREF
-+/* Zotac USB iR Receiver */
-+struct hardware hw_zotac = {
-+	"/dev/usb/hiddev0",		/* "device" */
-+	-1,			/* fd (device) */
-+	LIRC_CAN_REC_LIRCCODE,	/* features */
-+	0,			/* send_mode */
-+	LIRC_MODE_LIRCCODE,	/* rec_mode */
-+	32,			/* code_length */
-+	zotac_init,		/* init_func */
-+	zotac_deinit,		/* deinit_func */
-+	NULL,			/* send_func */
-+	zotac_rec,		/* rec_func */
-+	zotac_decode,		/* decode_func */
-+	NULL,			/* ioctl_func */
-+	NULL,			/* readdata */
-+	"zotac"		/* name */
-+};
-+#endif
-+
-+static int zotac_decode(struct ir_remote *remote, ir_code * prep, ir_code * codep, ir_code * postp, int *repeat_flagp,
-+		  lirc_t * min_remaining_gapp, lirc_t * max_remaining_gapp)
-+{
-+	LOGPRINTF(1, "zotac_decode");
-+
-+	if (!map_code(remote, prep, codep, postp, 0, 0, main_code_length, main_code, 0, 0)) {
-+		return 0;
-+	}
-+
-+	map_gap(remote, &start, &last, 0, repeat_flagp, min_remaining_gapp, max_remaining_gapp);
-+	/* override repeat */
-+	*repeat_flagp = repeat_state;
-+
-+	return 1;
-+}
-+
-+static int zotac_getcode() {
-+
-+	ssize_t rd;
-+	struct hiddev_usage_ref uref;
-+	struct hiddev_report_info rinfo;
-+	struct hiddev_field_info finfo;
-+	int shift = 0;
-+
-+	rd = read(fd_hidraw, &uref, sizeof(uref));
-+	if (rd < 0) {
-+		logprintf(LOG_ERR, "error reading '%s'", hw.device);
-+		logperror(LOG_ERR, NULL);
-+		zotac_deinit();
-+		error_state = 1;
-+		return -1;
-+	}
-+
-+	if (uref.field_index == HID_FIELD_INDEX_NONE) {
-+		/*
-+		 * we get this when the new report has been send from
-+		 * device at this point we have the uref structure
-+		 * prefilled with correct report type and id
-+		 *
-+		 */
-+
-+		switch (uref.report_id) {
-+		case 1:	/* USB standard keyboard usage page */
-+			{
-+				/* This page reports cursor keys */
-+				LOGPRINTF(3, "Keyboard (standard)\n");
-+
-+				/* check for special codes */
-+				uref.field_index = 0;
-+				uref.usage_index = 1;
-+				/* fetch the usage code for given indexes */
-+				ioctl(fd_hidraw, HIDIOCGUCODE, &uref, sizeof(uref));
-+				/* fetch the value from report */
-+				ioctl(fd_hidraw, HIDIOCGUSAGE, &uref, sizeof(uref));
-+
-+				if (uref.value)
-+					shift = 1;
-+
-+				/* populate required field number */
-+				uref.field_index = 1;
-+				uref.usage_index = 0;
-+				/* fetch the usage code for given indexes */
-+				ioctl(fd_hidraw, HIDIOCGUCODE, &uref, sizeof(uref));
-+				/* fetch the value from report */
-+				ioctl(fd_hidraw, HIDIOCGUSAGE, &uref, sizeof(uref));
-+				/* now we have the key */
-+
-+				LOGPRINTF(3, "usage: %x   value: %x   shift: %d\n",uref.usage_code, uref.value, shift);
-+
-+				/* now we have the key */
-+				if (uref.value) {
-+					probe_code = (uref.usage_code | uref.value);
-+					if (shift)
-+						probe_code |= 0x10000000;
-+					LOGPRINTF(3, "Main code 1: %x\n", probe_code);
-+					return 1;
-+				}
-+				else {
-+					LOGPRINTF(3, "rel button\n");
-+					probe_code = release_code;
-+					return 2;
-+				}
-+			}
-+			break;
-+
-+		case 2:
-+		case 3:	/* USB generic desktop usage page */
-+		case 4:
-+			{
-+				/* This page reports power key
-+				 * (via SystemControl SLEEP)
-+				 */
-+				LOGPRINTF(3, "Generic desktop (standard)\n");
-+
-+
-+				/* traverse report descriptor */
-+				rinfo.report_type = HID_REPORT_TYPE_INPUT;
-+				rinfo.report_id = HID_REPORT_ID_FIRST;
-+				rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
-+
-+				unsigned int i,j;
-+				while (rd >= 0) {
-+					for (i = 0; i < rinfo.num_fields; i++) {
-+						finfo.report_type = rinfo.report_type;
-+				        finfo.report_id = rinfo.report_id;
-+				        finfo.field_index = i;
-+				        ioctl(fd_hidraw, HIDIOCGFIELDINFO, &finfo);
-+				        for (j = 0; j < finfo.maxusage; j++) {
-+				        	uref.field_index = i;
-+				            uref.usage_index = j;
-+				            ioctl(fd_hidraw, HIDIOCGUCODE, &uref);
-+				            ioctl(fd_hidraw, HIDIOCGUSAGE, &uref);
-+
-+				            if (uref.value != 0) {
-+				            	LOGPRINTF(3, "field: %d, idx: %d, usage: %x   value: %x\n",i, j, uref.usage_code, uref.value);
-+				            	probe_code = uref.usage_code;
-+				            	return 1;
-+				            }
-+				        }
-+					}
-+					rinfo.report_id |= HID_REPORT_ID_NEXT;
-+				 	rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
-+				}
-+				return 2;
-+			}
-+			break;
-+		default:
-+			/* Unknown/unsupported report id.
-+			 * Should not happen because remaining reports
-+			 * from report descriptor seem to be unused by remote.
-+			 */
-+			logprintf(LOG_ERR, "Unexpected report id %d", uref.report_id);
-+			break;
-+		}
-+	}
-+	else {
-+			/* This page reports power key
-+			 * (via SystemControl SLEEP)
-+			 */
-+			LOGPRINTF(3, "Same Event ...\n");
-+
-+			/* traverse report descriptor */
-+			rinfo.report_type = HID_REPORT_TYPE_INPUT;
-+			rinfo.report_id = HID_REPORT_ID_FIRST;
-+			rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
-+
-+			unsigned int i,j;
-+			while (rd >= 0) {
-+				for (i = 0; i < rinfo.num_fields; i++) {
-+					finfo.report_type = rinfo.report_type;
-+				    finfo.report_id = rinfo.report_id;
-+				    finfo.field_index = i;
-+				    ioctl(fd_hidraw, HIDIOCGFIELDINFO, &finfo);
-+				    for (j = 0; j < finfo.maxusage; j++) {
-+				       	uref.field_index = i;
-+				        uref.usage_index = j;
-+				        ioctl(fd_hidraw, HIDIOCGUCODE, &uref);
-+				        ioctl(fd_hidraw, HIDIOCGUSAGE, &uref);
-+
-+				        if (uref.value != 0) {
-+				         	LOGPRINTF(3, "usage: %x   value: %x\n",uref.usage_code, uref.value);
-+				          	//probe_code = uref.usage_code;
-+				          	return 0;
-+						}
-+					}
-+				}
-+				rinfo.report_id |= HID_REPORT_ID_NEXT;
-+			 	rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
-+			}
-+			return 2;
-+	}
-+	return 0;
-+}
-+
-+static int zotac_init()
-+{
-+	logprintf(LOG_INFO, "zotac initializing '%s'", hw.device);
-+	if ((fd_hidraw = open(hw.device, O_RDONLY)) < 0) {
-+		logprintf(LOG_ERR, "unable to open '%s'", hw.device);
-+		return 0;
-+	}
-+	int flags = HIDDEV_FLAG_UREF | HIDDEV_FLAG_REPORT;
-+	if (ioctl(fd_hidraw, HIDIOCSFLAG, &flags)) {
-+		return 0;
-+	}
-+	hw.fd = fd_hidraw;
-+
-+	/* Create pipe so that events sent by the repeat thread will
-+	   trigger main thread */
-+	if (pipe(fd_pipe) != 0) {
-+		logperror(LOG_ERR, "couldn't open pipe");
-+		close(fd_hidraw);
-+		return 0;
-+	}
-+	hw.fd = fd_pipe[0];
-+	/* Create thread to simulate repetitions */
-+	if (pthread_create(&repeat_thread, NULL, zotac_repeat, NULL)) {
-+		logprintf(LOG_ERR, "Could not create \"repeat thread\"");
-+		return 0;
-+	}
-+	return 1;
-+}
-+
-+static int zotac_deinit()
-+{
-+	pthread_cancel(repeat_thread);
-+	if (fd_hidraw != -1) {
-+		// Close device if it is open
-+		logprintf(LOG_INFO, "closing '%s'", hw.device);
-+		close(fd_hidraw);
-+		fd_hidraw = -1;
-+	}
-+	// Close pipe input
-+	if (fd_pipe[1] >= 0) {
-+		close(fd_pipe[1]);
-+		fd_pipe[1] = -1;
-+	}
-+	// Close pipe output
-+	if (fd_pipe[0] >= 0) {
-+		close(fd_pipe[0]);
-+		fd_pipe[0] = -1;
-+	}
-+	hw.fd = -1;
-+	return 1;
-+}
-+
-+/**
-+ *	Runtime that reads device, forwards codes to main thread
-+ *	and simulates repetitions.
-+ */
-+static void *zotac_repeat()
-+{
-+	int repeat_count = 0;
-+	unsigned current_code;
-+	int ret;
-+	int sel;
-+	fd_set files;
-+	struct timeval delay;
-+	int pressed = 0;
-+	int fd = fd_pipe[1];
-+
-+	while (1) {
-+		// Initialize set to monitor device's events
-+		FD_ZERO(&files);
-+		FD_SET(fd_hidraw, &files);
-+		if (pressed) {
-+			sel = select(FD_SETSIZE, &files, NULL, NULL, &delay);
-+		} else {
-+			sel = select(FD_SETSIZE, &files, NULL, NULL, NULL);
-+		}
-+
-+		switch (sel) {
-+		case 1:
-+			// Data ready in device's file
-+			ret = zotac_getcode();
-+
-+			if (ret < 0) {
-+				// Error
-+				logprintf(LOG_ERR, "(%s) Could not read %s", __FUNCTION__, hw.device);
-+				goto exit_loop;
-+			}
-+			if (ret == 1) {
-+				// Key code : forward it to main thread
-+				pressed = 1;
-+				repeat_count = 0;
-+				delay.tv_sec = 0;
-+				delay.tv_usec = repeat_time1_us;
-+				current_code = probe_code;
-+			} else if (ret == 2) {
-+				// Release code : stop repetitions
-+				pressed = 0;
-+				current_code = release_code;
-+			} else if (ret == 0) {
-+				continue;
-+			}
-+			break;
-+		case 0:
-+			repeat_count++;
-+			if (repeat_count >= max_repeat_count) {
-+				// Too many repetitions, something must have gone wrong
-+				logprintf(LOG_ERR,"(%s) too many repetitions", __FUNCTION__);
-+				goto exit_loop;
-+			}
-+			// Timeout : send current_code again to main
-+			//           thread to simulate repetition
-+			delay.tv_sec = 0;
-+			delay.tv_usec = repeat_time2_us;
-+			break;
-+		default:
-+			// Error
-+			logprintf(LOG_ERR, "(%s) select() failed", __FUNCTION__);
-+			goto exit_loop;
-+		}
-+		// Send code to main thread through pipe
-+		write(fd, &current_code, sizeof(current_code));
-+	}
-+exit_loop:
-+
-+	// Wake up main thread with special key code
-+	current_code = remove_code;
-+	write(fd, &current_code, sizeof(current_code));
-+	return NULL;
-+}
-+
-+/*
-+*  Aureal Technology ATWF@83 cheap remote
-+*  specific code.
-+*/
-+
-+static char *zotac_rec(struct ir_remote *remotes)
-+{
-+	unsigned ev;
-+	int rd;
-+	last = end;
-+	gettimeofday(&start, NULL);
-+	rd = read(hw.fd, &ev, sizeof(ev));
-+
-+	if (rd == -1) {
-+		// Error
-+		logprintf(LOG_ERR, "(%s) could not read pipe", __FUNCTION__);
-+		zotac_deinit();
-+		return 0;
-+	}
-+
-+	if (ev == release_code) {
-+		// Release code
-+		main_code = 0;
-+		return 0;
-+	} else if (ev == remove_code) {
-+		// Device has been removed
-+		zotac_deinit();
-+		return 0;
-+	}
-+
-+	LOGPRINTF(1, "zotac : %x", ev);
-+	// Record the code and check for repetition
-+	if (main_code == ev) {
-+		repeat_state = RPT_YES;
-+	} else {
-+		main_code = ev;
-+		repeat_state = RPT_NO;
-+	}
-+	gettimeofday(&end, NULL);
-+	return decode_all(remotes);
-+}
-diff -rupN base/remotes/zotac/lircd.conf.zotac mod/remotes/zotac/lircd.conf.zotac
---- base/remotes/zotac/lircd.conf.zotac	1970-01-01 01:00:00.000000000 +0100
-+++ mod/remotes/zotac/lircd.conf.zotac	2013-03-21 16:31:31.343367869 +0100
-@@ -0,0 +1,77 @@
-+
-+# Please make this file available to others
-+# by sending it to <lirc@bartelmus.de>
-+#
-+# this config file was automatically generated
-+# using lirc-0.9.1-git(zotac) on Mon Apr  2 14:10:29 2012
-+#
-+# contributed by 
-+#
-+# brand:                       zotac.conf
-+# model no. of remote control: 
-+# devices being controlled by this remote:
-+#
-+
-+begin remote
-+
-+  name  zotac.conf
-+  bits           32
-+  eps            30
-+  aeps          100
-+
-+  one             0     0
-+  zero            0     0
-+  gap          100123
-+  min_repeat      9
-+#  suppress_repeat 9
-+#  uncomment to suppress unwanted repeats
-+#  toggle_bit_mask 0x7004F
-+
-+      begin codes
-+          KEY_SLEEP                0x00010082
-+          KEY_WAKEUP               0x00010083
-+          KEY_RECORD               0x000C00B2
-+          KEY_PAUSE                0x000C00B1
-+          KEY_STOP                 0x000C00B7
-+          KEY_REWIND               0x000C00B4
-+          KEY_PLAY                 0x000C00B0
-+          KEY_FORWARD              0x000C00B3
-+          KEY_LEFTSHIFT            0x000C00B6
-+          KEY_RIGHTSHIFT           0x000C00B5
-+          KEY_BACK                 0x000C0224
-+          KEY_INFO                 0x000C0209
-+          KEY_MENU                 0xFFBC000D
-+          KEY_UP                   0x00070052
-+          KEY_LEFT                 0x00070050
-+          KEY_RIGHT                0x0007004F
-+          KEY_DOWN                 0x00070051
-+          KEY_OK                   0x00070028
-+          KEY_VOLUMEUP             0x000C00E9
-+          KEY_VOLUMEDOWN           0x000C00EA
-+          KEY_MUTE                 0x000C00E2
-+          KEY_CHANNELUP            0x000C009C
-+          KEY_CHANNELDOWN          0x000C009D
-+          KEY_1                    0x0007001E
-+          KEY_2                    0x0007001F
-+          KEY_3                    0x00070020
-+          KEY_4                    0x00070021
-+          KEY_5                    0x00070022
-+          KEY_6                    0x00070023
-+          KEY_7                    0x00070024
-+          KEY_8                    0x00070025
-+          KEY_9                    0x00070026
-+          KEY_0                    0x00070027
-+          KEY_NUMERIC_STAR         0x10070025
-+          KEY_NUMERIC_POUND        0x10070020
-+          KEY_CLEAR                0x00070029
-+          KEY_TEXT                 0xFFBC005A
-+          KEY_TITLE                0x000C008D
-+          KEY_ENTER                0x00070028
-+          KEY_RED                  0xFFBC005B
-+          KEY_GREEN                0xFFBC005C
-+          KEY_YELLOW               0xFFBC005D
-+          KEY_BLUE                 0xFFBC005E
-+      end codes
-+
-+end remote
-+
-diff -rupN base/setup.data mod/setup.data
---- base/setup.data	2011-03-25 23:28:18.000000000 +0100
-+++ mod/setup.data	2013-03-21 16:28:11.433935463 +0100
-@@ -146,6 +146,7 @@ hw_menu_entry: @hw-usb
- 	usb_uirt_raw: "USB-UIRT"
- 	mplay: "VLSystem MPlay Blast"
- 	mplay: "VLSystem MPlay Mini"
-+	zotac: "Zotac USB IR Receiver"
- 
- param_type: \
- 	act200l \
-@@ -260,7 +261,8 @@ param_type: \
- 	ttusbir \
- 	tvbox \
- 	udp \
--	wpc8769l
-+	wpc8769l \
-+	zotac
- 	none:
- 
- default_param: \
-@@ -331,7 +333,8 @@ default_param: \
- 	ttusbir \
- 	tvbox \
- 	udp \
--	wpc8769l
-+	wpc8769l \
-+	zotac
- 	none:
- 
- default_param: \
diff --git a/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch b/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch
deleted file mode 100644
index 32edb244b412..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/drivers/lirc_atiusb/lirc_atiusb.c	2012-07-17 16:04:39.000000000 -0400
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c	2012-07-17 16:19:06.000000000 -0400
-@@ -1050,7 +1050,11 @@
- 		goto new_irctl_failure_check;
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
- 	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
-+#else
-+	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
-+#endif
- 		mem_failure = 4;
- 		goto new_irctl_failure_check;
- 	}
diff --git a/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch b/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch
deleted file mode 100644
index fd122e7362b6..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/tools/xmode2.c	2011-03-25 23:28:18.000000000 +0100
-+++ b/tools/xmode2.c	2012-07-29 19:36:34.972246587 +0200
-@@ -69,7 +69,7 @@
- Window w0, w1;			/*w0 = root */
- char w1_wname[] = "xmode2";
- char w1_iname[] = "xmode2";
--char font1_name[] = "-*-Courier-medium-r-*-*-8-*-*-m-*-iso8859-1";
-+char font1_name[] = "fixed";
- 
- int w1_x = 0, w1_y = 0;
- unsigned int w1_w = 640, w1_h = 480, w1_border = 0;
-@@ -201,7 +201,7 @@
- 		printf("coudn't allocate blue color\n");
- 	f1_str = XLoadQueryFont(d1, font1_name);
- 	if (f1_str == NULL) {
--		printf("could't load font\n");
-+		printf("couldn't load font\n");
- 		exit(EXIT_FAILURE);
- 	}
- 
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch
deleted file mode 100644
index 624737090bbe..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -u a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
---- a/drivers/lirc_atiusb/lirc_atiusb.c
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c
-@@ -48,7 +48,9 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- #include <linux/smp_lock.h>
-+#endif
- #include <linux/completion.h>
- #include <linux/uaccess.h>
- #include <linux/usb.h>
-diff -u a/drivers/lirc_i2c/lirc_i2c.c b/drivers/lirc_i2c/lirc_i2c.c
---- a/drivers/lirc_i2c/lirc_i2c.c
-+++ b/drivers/lirc_i2c/lirc_i2c.c
-@@ -555,8 +555,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
- 		kfree(ir);
- 		return -EINVAL;
- 	}
--	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
--	       adap->id, addr, ir->c.name);
-+	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
-+	       addr, ir->c.name);
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- 	/* register device */
-diff -u a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -361,14 +361,22 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs)
- 		size = count << 3;
- 
- 		ldata = (unsigned long *) data_buf;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- 		next_one = generic_find_next_le_bit(ldata, size, 0);
-+#else
-+		next_one = find_next_zero_bit_le(ldata, size, 0);
-+#endif
- 
- 		if (next_one > 0)
- 			put_pulse_bit(next_one
- 				* WPC8769L_USECS_PER_BIT);
- 
- 		while (next_one < size) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- 			next_zero = generic_find_next_zero_le_bit(ldata,
-+#else
-+			next_zero = find_next_zero_bit_le(ldata,
-+#endif
- 				size, next_one + 1);
- 
- 			put_space_bit(
-@@ -376,7 +384,11 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs)
- 				* WPC8769L_USECS_PER_BIT);
- 
- 			if (next_zero < size) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- 				next_one = generic_find_next_le_bit(ldata,
-+#else
-+				next_one = find_next_bit_le(ldata,
-+#endif
- 					size, next_zero + 1);
- 
- 				put_pulse_bit(
--- 
-1.7.5.4
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch
deleted file mode 100644
index 9b7d3ef1f539..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur drivers/lirc_serial/lirc_serial.c drivers.new/lirc_serial/lirc_serial.c
---- drivers/lirc_serial/lirc_serial.c	2011-03-25 18:28:18.000000000 -0400
-+++ drivers.new/lirc_serial/lirc_serial.c	2012-10-24 14:32:14.000000000 -0400
-@@ -66,7 +66,12 @@
- #include <linux/poll.h>
- #include <linux/platform_device.h>
- 
-+#include "drivers/kcompat.h"
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0)
-+#include <asm/switch_to.h>
-+#else
- #include <asm/system.h>
-+#endif
- #include <linux/io.h>
- #include <linux/irq.h>
- #include <linux/fcntl.h>
-@@ -80,7 +85,6 @@
- #define UART_IE_IXP42X_UUE   0x40 /* IXP42X UART Unit enable */
- #define UART_IE_IXP42X_RTOIE 0x10 /* IXP42X Receiver Data Timeout int.enable */
- 
--#include "drivers/kcompat.h"
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
- #include <media/lirc.h>
- #include <media/lirc_dev.h>
-diff -ur drivers/lirc_sir/lirc_sir.c drivers.new/lirc_sir/lirc_sir.c
---- drivers/lirc_sir/lirc_sir.c	2011-03-25 18:28:18.000000000 -0400
-+++ drivers.new/lirc_sir/lirc_sir.c	2012-10-24 14:32:46.000000000 -0400
-@@ -59,7 +59,14 @@
- #include <linux/mm.h>
- #include <linux/delay.h>
- #include <linux/poll.h>
-+
-+#include "drivers/kcompat.h"
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0)
-+#include <asm/switch_to.h>
-+#else
- #include <asm/system.h>
-+#endif
-+
- #include <linux/io.h>
- #include <asm/irq.h>
- #include <linux/fcntl.h>
-@@ -74,7 +81,6 @@
- 
- #include <linux/timer.h>
- 
--#include "drivers/kcompat.h"
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
- #include <media/lirc.h>
- #include <media/lirc_dev.h>
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch
deleted file mode 100644
index b06d94efb322..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/kcompat.h	2011-03-25 18:28:18.000000000 -0400
-+++ b/drivers/kcompat.h	2012-11-27 13:37:55.000000000 -0500
-@@ -136,4 +136,9 @@
- )
- #endif
- 
-+#ifndef err
-+#define err(format, arg...)                                     \
-+	printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
-+#endif
-+
- #endif /* _KCOMPAT_H */
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch
deleted file mode 100644
index bd11b61c19d8..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Naur lirc-0.9.0/drivers/lirc_serial/lirc_serial.c lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c
---- lirc-0.9.0/drivers/lirc_serial/lirc_serial.c	2013-05-24 11:58:31.017566567 -0400
-+++ lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c	2013-05-24 12:00:38.733568898 -0400
-@@ -1107,12 +1107,12 @@
- 
- static struct platform_device *lirc_serial_dev;
- 
--static int __devinit lirc_serial_probe(struct platform_device *dev)
-+static int lirc_serial_probe(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
--static int __devexit lirc_serial_remove(struct platform_device *dev)
-+static int lirc_serial_remove(struct platform_device *dev) 
- {
- 	return 0;
- }
-@@ -1163,7 +1163,7 @@
- 
- static struct platform_driver lirc_serial_driver = {
- 	.probe		= lirc_serial_probe,
--	.remove		= __devexit_p(lirc_serial_remove),
-+	.remove      = lirc_serial_remove, 
- 	.suspend	= lirc_serial_suspend,
- 	.resume		= lirc_serial_resume,
- 	.driver		= {
-diff -Naur lirc-0.9.0/drivers/lirc_sir/lirc_sir.c lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c
---- lirc-0.9.0/drivers/lirc_sir/lirc_sir.c	2013-05-24 11:58:31.017566567 -0400
-+++ lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c	2013-05-24 12:00:38.733568898 -0400
-@@ -1296,19 +1296,19 @@
- 	return 0;
- }
- 
--static int __devinit lirc_sir_probe(struct platform_device *dev)
-+static int lirc_sir_probe(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
--static int __devexit lirc_sir_remove(struct platform_device *dev)
-+static int lirc_sir_remove(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
- static struct platform_driver lirc_sir_driver = {
- 	.probe		= lirc_sir_probe,
--	.remove		= __devexit_p(lirc_sir_remove),
-+	.remove      = lirc_sir_remove, 
- 	.driver		=	{
- 		.name	= "lirc_sir",
- 		.owner	= THIS_MODULE,
-diff -Naur lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c
---- lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-05-24 11:58:30.974566567 -0400
-+++ lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-05-24 12:00:38.734568898 -0400
-@@ -942,12 +942,12 @@
- #ifdef MODULE
- static struct platform_device *lirc_wpc8769l_platform_dev;
- 
--static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
-+static int lirc_wpc8769l_probe(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
--static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
-+static int lirc_wpc8769l_remove(struct platform_device *dev) 
- {
- 	return 0;
- }
-@@ -975,7 +975,7 @@
- 
- static struct platform_driver lirc_wpc8769l_platform_driver = {
- 	.probe		= lirc_wpc8769l_probe,
--	.remove		= __devexit_p(lirc_wpc8769l_remove),
-+	.remove      = lirc_wpc8769l_remove, 
- 	.suspend	= lirc_wpc8769l_suspend,
- 	.resume		= lirc_wpc8769l_resume,
- 	.driver		= {
diff --git a/app-misc/lirc/files/lirc.service b/app-misc/lirc/files/lirc.service
deleted file mode 100644
index e184dfc09d44..000000000000
--- a/app-misc/lirc/files/lirc.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Linux Infrared Remote Control
-After=network.target
-
-[Service]
-RuntimeDirectory=lirc
-ExecStart=/usr/sbin/lircd --nodaemon --driver=default --device=/dev/lirc0
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/app-misc/lirc/files/lircm.service b/app-misc/lirc/files/lircm.service
deleted file mode 100644
index cfd2c93caf6a..000000000000
--- a/app-misc/lirc/files/lircm.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=LIRC Mouse
-Requires=lirc.service
-After=network.target lirc.service
-
-[Service]
-ExecStart=/usr/sbin/lircmd --nodaemon
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/app-misc/lirc/files/lircmd b/app-misc/lirc/files/lircmd
deleted file mode 100644
index e979f74413fc..000000000000
--- a/app-misc/lirc/files/lircmd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need lircd
-}
-
-start() {
-	ebegin "Starting lircmd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/lircmd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping lircmd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd
-	eend $?
-}
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index ee28e97e8f99..cb93b634743b 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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="
diff --git a/app-misc/lirc/lirc-0.9.0-r6.ebuild b/app-misc/lirc/lirc-0.9.0-r6.ebuild
deleted file mode 100644
index 8672858485e8..000000000000
--- a/app-misc/lirc/lirc-0.9.0-r6.ebuild
+++ /dev/null
@@ -1,428 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils linux-mod linux-info systemd toolchain-funcs flag-o-matic autotools
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-MY_P=${PN}-${PV/_/}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc hardware-carrier transmitter static-libs X"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-	)
-	lirc_devices_alsa_usb? ( media-libs/alsa-lib )
-	lirc_devices_audio? ( >media-libs/portaudio-18 )
-	lirc_devices_irman? ( media-libs/libirman )"
-
-# 2012-07-17, Ian Stakenvicius
-# A helper script that scrapes out values for nearly all of the variables below
-# from lirc's configure.ac is available at
-# https://dev.gentoo.org/~axs/helper-for-lirc-iuse.sh
-
-# This are drivers with names matching the
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_DIRECT="
-	all userspace accent act200l act220l
-	adaptec alsa_usb animax asusdh atilibusb
-	atiusb audio audio_alsa avermedia avermedia_vdomate
-	avermedia98 awlibusb bestbuy bestbuy2 breakoutbox
-	bte bw6130 caraca chronos commandir
-	cph06x creative creative_infracd
-	devinput digimatrix dsp dvico ea65 ene0100
-	exaudio flyvideo ftdi gvbctv5pci hauppauge
-	hauppauge_dvb hercules_smarttv_stereo i2cuser
-	igorplugusb iguanaIR imon imon_24g imon_knob
-	imon_lcd imon_pad imon_rsc irdeo irdeo_remote
-	irlink irman irreal it87 ite8709
-	knc_one kworld leadtek_0007 leadtek_0010
-	leadtek_pvr2000 livedrive_midi
-	livedrive_seq logitech macmini
-	mediafocusI mouseremote
-	mouseremote_ps2 mp3anywhere mplay nslu2
-	packard_bell parallel pcmak pcmak_usb
-	pctv pixelview_bt878 pixelview_pak
-	pixelview_pro provideo realmagic
-	remotemaster sa1100 samsung sasem sb0540 serial
-	silitek sir slinke streamzap tekram
-	tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
-	uirt2_raw usb_uirt_raw usbx wpc8769l zotac"
-
-# drivers that need special handling and
-# must have another name specified for
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_SPECIAL="
-	serial_igor_cesko
-	remote_wonder_plus xboxusb inputlirc"
-
-IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
-
-# The following are lists which are used to provide ewarns on incompatibilities
-# with the kernel:
-
-#drivers that do not build kernel modules
-NO_KMOD_BUILT_FOR_DEV="
-	accent bte creative creative_infracd devinput dsp ea65 exaudio
-	ftdi i2cuser irlink irreal livedrive_midi livedrive_seq logitech
-	mediafocusI mouseremote mouseremote_ps2 mp3anywhere mplay mplay2
-	pcmak pcmak_usb pctv realmagic remotemaster silitek tira tira_raw
-	tuxbox udp uirt2 uirt2_raw usb_uirt_raw usbx"
-
-#drivers that build lirc_dev and so will conflict with kernel lirc_dev
-LIRCDEV_BUILT_FOR_DEV="all
-	act200l act220l adaptec animax atiusb breakoutbox hauppauge
-	hauppauge_dvb hercules_smarttv_stereo igorplugusb imon imon_24g
-	imon_knob imon_lcd imon_pad imon_rsc irdeo irdeo_remote knc_one
-	leadtek_pvr2000 nslu2 packard_bell parallel pixelview_bt878
-	provideo sa1100 sasem serial sir tekram tekram_bt829 ttusbir
-	tvbox wpc8769l zotac"
-
-#lirc_gpio drivers, which cannot be supported on kernel >= 2.6.22
-LIRC_GPIO_DEV="
-	avermedia avermedia98 avermedia_vdomate bestbuy bestbuy2 chronos
-	cph03x cph06x flyvideo gvbctv5pci kworld leadtek_0007 leadtek_0010
-	pixelview_pak pixelview_pro"
-
-#device-driver which use libusb
-LIBUSB_USED_BY_DEV="
-	all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
-	imon_rsc streamzap xboxusb irlink commandir"
-
-for dev in ${LIBUSB_USED_BY_DEV}; do
-	DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
-done
-
-# adding only compile-time depends
-DEPEND="${RDEPEND} ${DEPEND}
-	virtual/linux-sources
-	lirc_devices_ftdi? ( dev-embedded/libftdi:0 )
-	lirc_devices_all? ( dev-embedded/libftdi:0 )"
-
-# adding only run-time depends
-RDEPEND="${RDEPEND}
-	lirc_devices_inputlirc? ( app-misc/inputlircd )
-	lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
-
-# add all devices to IUSE
-# and ensure lirc_devices_all is not set alongside lirc_devices_*
-REQUIRED_USE="lirc_devices_all? ("
-for dev in ${IUSE_LIRC_DEVICES}; do
-	IUSE="${IUSE} lirc_devices_${dev}"
-	if [[ "${dev}" != "all" ]]; then
-		REQUIRED_USE="${REQUIRED_USE} !lirc_devices_${dev}"
-	fi
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-add_device() {
-	local dev="${1}"
-	local desc="device ${dev}"
-	if [[ -n "${2}" ]]; then
-		desc="${2}"
-	fi
-
-	# Bug #187418
-	if kernel_is ge 2 6 22 && [[ " ${LIRC_GPIO_DEV} " == *" ${dev} "* ]]; then
-		eerror "${desc} uses lirc_gpio which fails with kernel 2.6.22 or above.  Not building."
-		eerror "Use 'devinput' instead, or use 'userspace' along with in-kernel drivers"
-		return 0
-	fi
-	: ${lirc_device_count:=0}
-	((lirc_device_count++))
-
-	elog "Compiling support for ${desc}"
-
-	if [[ " ${LIRCDEV_BUILT_FOR_DEV} " == *" ${dev} "* ]] ; then
-		if linux_chkconfig_present LIRC ; then
-			ewarn "${desc} builds lirc_dev and CONFIG_LIRC is set in the kernel -- this may conflict."
-		fi
-		if ! linux_chkconfig_present MODULE_UNLOAD ; then
-			ewarn "${desc} builds modules and CONFIG_MODULE_UNLOAD is unset in kernel."
-			ewarn "You will need MODULE_UNLOAD support in your kernel."
-		fi
-	fi
-	if [[ " ${NO_KMOD_BUILT_FOR_DEV} " == *" ${dev} "* ]] && ! linux_chkconfig_present IR_LIRC_CODEC ; then
-		ewarn "${desc} builds no kernel module and CONFIG_IR_LIRC_CODEC is unset in kernel."
-	fi
-
-	if [[ ${lirc_device_count} -eq 2 ]] ; then
-		ewarn
-		ewarn "LIRC_DEVICES has more than one entry."
-		ewarn "When selecting multiple devices for lirc to be supported,"
-		ewarn "it can not be guaranteed that the drivers play nice together."
-		ewarn "If this is not intended, then please adjust LIRC_DEVICES"
-		ewarn "and re-emerge."
-		ewarn
-	fi
-
-	MY_OPTS="${MY_OPTS} --with-driver=${dev}"
-}
-
-pkg_pretend() {
-	if [[ -n "${LIRC_OPTS}" ]] ; then
-		ewarn
-		ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
-		ewarn
-		ewarn "Please use LIRC_DEVICES from now on."
-		ewarn "e.g. LIRC_DEVICES=\"serial sir\""
-		ewarn
-		ewarn "Flags are now set per use-flags."
-		ewarn "e.g. transmitter, hardware-carrier"
-
-		local opt
-		local unsupported_opts=""
-
-		# test for allowed options for LIRC_OPTS
-		for opt in ${LIRC_OPTS}; do
-			case ${opt} in
-				--with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
-					MY_OPTS="${MY_OPTS} ${opt}"
-					;;
-				*)
-					unsupported_opts="${unsupported_opts} ${opt}"
-					;;
-			esac
-		done
-		if [[ -n ${unsupported_opts} ]]; then
-			eerror "These options are no longer allowed to be set"
-			eerror "with LIRC_OPTS: ${unsupported_opts}"
-			die "LIRC_OPTS is no longer supported, use LIRC_DEVICES."
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	# set default configure options
-	MY_OPTS=""
-	LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-	if use lirc_devices_all; then
-		# compile in drivers for a lot of devices
-		add_device all "a lot of devices"
-	else
-		# compile in only requested drivers
-		local dev
-		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
-			if use lirc_devices_${dev}; then
-				add_device ${dev}
-			fi
-		done
-
-		if use lirc_devices_remote_wonder_plus; then
-			add_device atiusb "device Remote Wonder Plus (atiusb-based)"
-		fi
-
-		if use lirc_devices_serial_igor_cesko; then
-			add_device serial "serial with Igor Cesko design"
-			MY_OPTS="${MY_OPTS} --with-igor"
-		fi
-
-		if use lirc_devices_imon_pad; then
-			ewarn "The imon_pad driver has incorporated the previous pad2keys patch"
-			ewarn "and removed the pad2keys_active option for the lirc_imon module"
-			ewarn "because it is always active."
-			ewarn "If you have an older imon VFD device, you may need to add the module"
-			ewarn "option display_type=1 to override autodetection and force VFD mode."
-		fi
-
-		if use lirc_devices_xboxusb; then
-			add_device atiusb "device xboxusb"
-		fi
-
-		if [[ "${MY_OPTS}" == "" ]]; then
-			if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
-				# on xbox: use special driver
-				add_device atiusb "device xboxusb"
-			else
-				# no driver requested
-				elog
-				elog "Compiling only the lirc-applications, but no drivers."
-				elog "Enable drivers with LIRC_DEVICES if you need them."
-				MY_OPTS="--with-driver=none"
-			fi
-		fi
-	fi
-
-	use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
-	use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
-
-	einfo
-	einfo "lirc-configure-opts: ${MY_OPTS}"
-	elog  "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
-
-	filter-flags -Wl,-O1
-}
-
-src_prepare() {
-	# Rip out dos CRLF
-	edos2unix contrib/lirc.rules
-
-	# Apply patches needed for some special device-types
-	use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
-	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
-
-	# Apply fixes for kernel-2.6.39 and above
-	epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch
-	# Slightly massaged upstream patch to fix kfifo issues >=2.6.38
-	# for bug 377033
-	epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
-	# Apply fixes for kernel-3.3 and above (bug 439538)
-	epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
-	# Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736)
-	epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch
-	# Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
-	epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
-	# Add support for zotac remote, bug 342848
-	epatch "${FILESDIR}"/${P}-add-zotac-support.patch
-	# Use fixed font
-	epatch "${FILESDIR}"/${P}-fixed-font.patch
-
-	# Do not build drivers from the top-level Makefile
-	sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am
-
-	# remove parallel driver on SMP systems
-	if linux_chkconfig_present SMP ; then
-		sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
-	fi
-
-	# Bug #187418 - only need this part for lirc_devices_all as others die in pkg_setup
-	if use lirc_devices_all && kernel_is ge 2 6 22 ; then
-		ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+"
-		sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
-	fi
-
-	# respect CFLAGS
-	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
-
-	# setting default device-node
-	local f
-	for f in configure.ac acconfig.h; do
-		[[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
-	done
-	echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die # automake 1.13
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-syslog=LOG_DAEMON \
-		--enable-sandboxed \
-		--with-kerneldir="${KV_DIR}" \
-		--with-moduledir="/lib/modules/${KV_FULL}/misc" \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_with X x) \
-		${MY_OPTS} \
-		ABI="${KERNEL_ABI}" \
-		ARCH="$(tc-arch-kernel)"
-}
-
-src_compile() {
-	# force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
-	emake -j1
-
-	MODULE_NAMES="lirc(misc:${S}/drivers)"
-	BUILD_TARGETS="all"
-	linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake -C drivers DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	systemd_dounit "${FILESDIR}"/irexec.service
-	systemd_dounit "${FILESDIR}"/lirc.service
-	systemd_dounit "${FILESDIR}"/lircm.service
-
-	if use doc ; then
-		dohtml doc/html/*.html
-		insinto /usr/share/doc/${PF}/images
-		doins doc/images/*
-	fi
-
-	insinto /usr/share/lirc/remotes
-	doins -r remotes/*
-
-	keepdir /etc/lirc
-	if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la"
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-
-	local dir="${EROOT}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf"
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf
-	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
-		cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${D}"/etc/lirc/lircd.conf
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT}"/etc/lircd.conf
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml
index 3a8d3814118e..98b33f1b6a8d 100644
--- a/app-misc/lirc/metadata.xml
+++ b/app-misc/lirc/metadata.xml
@@ -8,8 +8,6 @@
     <use>
         <flag name="uinput">Enable support for uinput</flag>
         <flag name="devinput">Support the devinput input device</flag>
-        <flag name="hardware-carrier">The transmitter device generates its clock signal in hardware</flag>
-        <flag name="transmitter">Add transmitter support to some lirc-drivers (e.g. serial)</flag>
         <flag name="inputlirc">Add a dependency on app-misc/inputlircd</flag>
         <flag name="audio">Support using an audio device connected to an IR receiver</flag>
         <flag name="ftdi">Support FTDI devices</flag>
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index b66100fde2a3..550b62b3178c 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,11 +1,10 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto-1.4.10-conditional-tests.patch 1142 BLAKE2B 66be5988681be543a1c9d61bbd47baa528be1d8d8b1206e7d711b0d7789aba41ae8bd28e2729d084c6bb64fc43386e31a426717b0719c5c26219d3fa0a166455 SHA512 d07a081830fe7d23db380033c0c68d366bf60652f86c43a39074faa9bbcc6286485aad225226b64ef3055b4bd7a6c6969fa9ddd97eb2e6d8d98e815a881e634c
-AUX mosquitto-1.4.15-conditional-tests.patch 371 BLAKE2B 4e96752a6ef489a6dec24cb02381f11ec38f3440c13f99ee2adee2aa7995b591c341ff050793960d81e73849147e809f9cd98a29c035038ed1f3b2047bd7431f SHA512 a970740b0cabd34f2532fbd27037546c125337943b848c4489ed44c3e3408e802d223b6f2c8a0144c43ccf5d7ae1270f0c4bb23833827492994d7bfe569639de
+AUX mosquitto-1.5-fix-socket_get_address.patch 1024 BLAKE2B 72cda074a2e609f4e67b22c8f40ca924814ab8b5053afc5860b132ecae0929f0d721aff7b8db0095abc23fd506a1a47b2398ea16cf21b5bada3d1e1b6c24ad35 SHA512 1e8828232ff795aab47c22f0d2bf380d71c0962acb2aa7f421c3618dc9476fc2ff58ddf9b3add33fd59f878d0456bbe0682428552cec1129e2b9a45431c33205
+AUX mosquitto-fix-conditional-tests.patch 371 BLAKE2B 4e96752a6ef489a6dec24cb02381f11ec38f3440c13f99ee2adee2aa7995b591c341ff050793960d81e73849147e809f9cd98a29c035038ed1f3b2047bd7431f SHA512 a970740b0cabd34f2532fbd27037546c125337943b848c4489ed44c3e3408e802d223b6f2c8a0144c43ccf5d7ae1270f0c4bb23833827492994d7bfe569639de
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
-DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
-EBUILD mosquitto-1.4.14-r1.ebuild 2462 BLAKE2B e747f7751b56d1f93a460985e19555fd7fdb1bf08540eec7ab2107ad8165797de2363f0383eeaab4b2bc5011d830022f63ec5baf73804a1f0492c03a7632de3b SHA512 59f100a47c98636c82f4ca5b4d2edb0c1e6399ef25d95dd62f576f9694b11fef32d01dc58c63d69d5aa4bd119dd467199f3d49d19760be9b8220ff7420749c0c
+DIST mosquitto-1.5.tar.gz 419614 BLAKE2B d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb SHA512 29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668
 EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
-EBUILD mosquitto-1.4.15-r2.ebuild 2463 BLAKE2B 3e6c1a3ab075a62675e3f9158a665f65238c8a35c72bd7e1a4b5517f756907e5769bc4ea46b6f5c1cff2a74f3983caa3945fb6a0df3203d76ae182764d43f9ec SHA512 6cc77d34fd71a288db14c8f2b74ead1602953d8c5c96fba9c6b742fa74ec0c356ded19ff0d0d6436c1f7c8b8bf42c239568c8ed7c59fbf07b2e525dcc47c2b49
-EBUILD mosquitto-1.4.15.ebuild 2366 BLAKE2B 6df167983ebe736631cc55fb47b9487bd456928e17d149653e7f5ec333ab874f41e4371ee882ee16a984fc055146ddb1fe7727ff71f5917fd1e3c0dd50db76f4 SHA512 609584b242bbabca2214fa6027f948ce6c237fe9e6be43acb38625abdf83e5c898c9158244612b5a4201a18e99b0fd78b987b71d54dbbf6a0a62f4a60ce4bb5c
-MISC metadata.xml 656 BLAKE2B 58ecef974e662c6dccf267ba8732116010a3db7679d6ee3e163cd351073a210f0bb06e5098945564f048353caf4ed7fe73d69bc96cce42c56ba298073fe95384 SHA512 2034ecb6ff73024cd905d275da23b27568d897dd616ca70a2485922667a74d4ac1d6df11b0a7a413bc8d595962697959e4cbe13c8934e8b3333c6a4e290d657f
+EBUILD mosquitto-1.5.ebuild 2553 BLAKE2B e24122599e0d670a92ee3a6b1063d0bd5eb342eae27ea2029f4a60b5e3ddc9c9c98fc07d7cd980ac1d72b9743e7f964210b05f7131101e8330d7974096006df3 SHA512 c73492cff20a123be5122fe37d9c0c4a12ec86d0dac6c18c8257d8999aa31d1696cb4524d5e13bd09d71a6be1545734f1b5cc4d367b65de3aeed11679c9a6e7c
+MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch b/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch
new file mode 100644
index 000000000000..7e9778e8b70f
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch
@@ -0,0 +1,29 @@
+# Fix missing rename of mosquitto__socket_get_address. Mosquitto bug 810.
+
+diff --git a/src/conf.c b/src/conf.c
+index f3d812d..daf2bf4 100644
+--- a/src/conf.c
++++ b/src/conf.c
+@@ -735,8 +735,8 @@ int config__read_file_core(struct mosquitto__config *config, bool reload, struct
+ 	struct mosquitto__listener *cur_listener = &config->default_listener;
+ #ifdef WITH_BRIDGE
+ 	char *address;
+-	int i;
+ #endif
++	int i;
+ 	int lineno_ext;
+ 	struct mosquitto__security_options *cur_security_options = NULL;
+ 
+diff --git a/src/net.c b/src/net.c
+index 7397de5..670b7e2 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -114,7 +114,7 @@ int net__socket_accept(struct mosquitto_db *db, mosq_sock_t listensock)
+ 	fromhost(&wrap_req);
+ 	if(!hosts_access(&wrap_req)){
+ 		/* Access is denied */
+-		if(!mosquitto__socket_get_address(new_sock, address, 1024)){
++		if(!net__socket_get_address(new_sock, address, 1024)){
+ 			log__printf(NULL, MOSQ_LOG_NOTICE, "Client connection from %s denied access by tcpd.", address);
+ 		}
+ 		COMPAT_CLOSE(new_sock);
diff --git a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch
index 1642597c5620..1642597c5620 100644
--- a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
+++ b/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch
diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 2b05da7a5d48..ec6718456c6e 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ramage.lucas@openmailbox.org</email>
+		<email>ramage.lucas@protonmail.com</email>
 		<name>Lucas Ramage</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild b/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
deleted file mode 100644
index 96530da48cb2..000000000000
--- a/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
+++ /dev/null
@@ -1,97 +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 systemd user toolchain-funcs python-any-r1
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="http://mosquitto.org/"
-SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bridge examples +persistence +srv ssl tcpd websockets"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	srv? ( net-dns/c-ares )
-	websockets? ( net-libs/libwebsockets )"
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.10-conditional-tests.patch"
-	if use persistence; then
-		sed -i -e "s:^#autosave_interval:autosave_interval:" \
-			-e "s:^#persistence false$:persistence true:" \
-			-e "s:^#persistence_file:persistence_file:" \
-			-e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \
-			mosquitto.conf || die
-	fi
-
-	# Remove prestripping
-	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
-		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
-
-	python_setup
-	python_fix_shebang test
-	eapply_user
-}
-
-src_configure() {
-	LIBDIR=$(get_libdir)
-	makeopts=(
-		"CC=$(tc-getCC)"
-		"LIB_SUFFIX=${LIBDIR:3}"
-		"WITH_BRIDGE=$(usex bridge)"
-		"WITH_PERSISTENCE=$(usex persistence)"
-		"WITH_SRV=$(usex srv)"
-		"WITH_TLS=$(usex ssl)"
-		"WITH_WEBSOCKETS=$(usex websockets)"
-		"WITH_WRAP=$(usex tcpd)"
-	)
-}
-
-src_compile() {
-	emake "${makeopts[@]}"
-}
-
-src_test() {
-	emake "${makeopts[@]}" test
-}
-
-src_install() {
-	emake "${makeopts[@]}" DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	elog "The Python module has been moved out of mosquitto."
-	elog "See http://mosquitto.org/documentation/python/"
-	elog ""
-	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-	elog ""
-	elog "    rc-update add mosquitto default"
-	elog "    or"
-	elog "    systemctl enable mosquitto"
-}
diff --git a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
deleted file mode 100644
index 48165a4db6f3..000000000000
--- a/app-misc/mosquitto/mosquitto-1.4.15-r2.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit systemd user toolchain-funcs python-any-r1
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="https://mosquitto.org/"
-SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	srv? ( net-dns/c-ares )
-	websockets? ( net-libs/libwebsockets )"
-
-PATCHES=( "${FILESDIR}/${P}-conditional-tests.patch" )
-
-_emake() {
-	LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		LIB_SUFFIX="${LIBDIR:3}" \
-		WITH_BRIDGE="$(usex bridge)" \
-		WITH_PERSISTENCE="$(usex persistence)" \
-		WITH_SRV="$(usex srv)" \
-		WITH_TLS="$(usex ssl)" \
-		WITH_WEBSOCKETS="$(usex websockets)" \
-		WITH_WRAP="$(usex tcpd)" \
-		"$@"
-}
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	default
-	if use persistence; then
-		sed -i -e "/^#autosave_interval/s|^#||" \
-			-e "s|^#persistence false$|persistence true|" \
-			-e "/^#persistence_file/s|^#||" \
-			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
-			mosquitto.conf || die
-	fi
-
-	# Remove prestripping
-	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
-		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
-
-	python_setup
-	python_fix_shebang test
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto "/usr/share/doc/${PF}"
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The Python module has been moved out of mosquitto."
-		elog "See https://mosquitto.org/documentation/python/"
-	else
-		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-		elog ""
-		elog "    rc-update add mosquitto default"
-		elog "    or"
-		elog "    systemctl enable mosquitto"
-	fi
-}
diff --git a/app-misc/mosquitto/mosquitto-1.4.15.ebuild b/app-misc/mosquitto/mosquitto-1.4.15.ebuild
deleted file mode 100644
index 65dffc2f3f19..000000000000
--- a/app-misc/mosquitto/mosquitto-1.4.15.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit systemd user toolchain-funcs python-any-r1
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="http://mosquitto.org/"
-SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	srv? ( net-dns/c-ares )
-	websockets? ( net-libs/libwebsockets )"
-
-_emake() {
-	LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		LIB_SUFFIX="${LIBDIR:3}" \
-		WITH_BRIDGE="$(usex bridge)" \
-		WITH_PERSISTENCE="$(usex persistence)" \
-		WITH_SRV="$(usex srv)" \
-		WITH_TLS="$(usex ssl)" \
-		WITH_WEBSOCKETS="$(usex websockets)" \
-		WITH_WRAP="$(usex tcpd)" \
-		"$@"
-}
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	if use persistence; then
-		sed -i -e "/^#autosave_interval/s|^#||" \
-			-e "s|^#persistence false$|persistence true|" \
-			-e "/^#persistence_file/s|^#||" \
-			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
-			mosquitto.conf || die
-	fi
-
-	# Remove prestripping
-	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
-		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
-
-	python_setup
-	python_fix_shebang test
-	eapply_user
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto "/usr/share/doc/${PF}"
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	elog "The Python module has been moved out of mosquitto."
-	elog "See http://mosquitto.org/documentation/python/"
-	elog ""
-	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-	elog ""
-	elog "    rc-update add mosquitto default"
-	elog "    or"
-	elog "    systemctl enable mosquitto"
-}
diff --git a/app-misc/mosquitto/mosquitto-1.5.ebuild b/app-misc/mosquitto/mosquitto-1.5.ebuild
new file mode 100644
index 000000000000..a2251b4ffda2
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/"
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	srv? ( net-dns/c-ares )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	websockets? ( net-libs/libwebsockets )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-conditional-tests.patch"
+	"${FILESDIR}/${P}-fix-socket_get_address.patch"
+)
+
+_emake() {
+	LIBDIR=$(get_libdir)
+	emake \
+		CC="$(tc-getCC)" \
+		LIB_SUFFIX="${LIBDIR:3}" \
+		WITH_BRIDGE="$(usex bridge)" \
+		WITH_PERSISTENCE="$(usex persistence)" \
+		WITH_SRV="$(usex srv)" \
+		WITH_TLS="$(usex ssl)" \
+		WITH_WEBSOCKETS="$(usex websockets)" \
+		WITH_WRAP="$(usex tcpd)" \
+		"$@"
+}
+
+pkg_setup() {
+	enewgroup mosquitto
+	enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+	default
+	if use persistence; then
+		sed -i -e "/^#autosave_interval/s|^#||" \
+			-e "s|^#persistence false$|persistence true|" \
+			-e "/^#persistence_file/s|^#||" \
+			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+			mosquitto.conf || die
+	fi
+
+	# Remove prestripping
+	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+	python_setup
+	rm test/{broker,lib}/ptest.py || die
+	python_fix_shebang test
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	systemd_dounit "${FILESDIR}/mosquitto.service"
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto "/usr/share/doc/${PF}"
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The Python module has been moved out of mosquitto."
+		elog "See https://mosquitto.org/documentation/python/"
+	else
+		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+		elog ""
+		elog "    rc-update add mosquitto default"
+		elog "    or"
+		elog "    systemctl enable mosquitto"
+	fi
+}
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index b14c529dfbcd..395e0247014c 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,8 +1,4 @@
-DIST neofetch-3.4.0.tar.gz 82090 BLAKE2B afc00b37d84cdf3ae0fd4037312b1c67fdadcbe99d6d602e8f3b6caa844b3780861c9d2522ec605ba5b7aa08e4e85ef804129da2ce3f6f01ab8b536704cdd182 SHA512 931648e8173eb91fdf5c79b5bb9b6efef132d30cf2f10d6f75dcff42f3661d40ceec712c109e90e2226e1aa85cad7676c438b6cad49e8298a77d990d9a3d197b
-DIST neofetch-4.0.2.tar.gz 111792 BLAKE2B 865c45a366224915aeeff82c843c869685814ccb5f553d7da59ab51e26336500cb133b5c827dd6dccccef3e771b357852e86db166d88cda894515419e9eadbc8 SHA512 326b7a9fdf08aa10b790c281148946727dc6a10c5c073654fc0ce9cee9afe663de84ac13144cb3e1d2e33b5ca3ed5094d2cb83e78b7b5f6e1ced49d78e191ce4
 DIST neofetch-5.0.0.tar.gz 110526 BLAKE2B 7149321c051021644407d28b232631c8149d21f1b8463b3a4470d1baaf88494f3a88026c606ac539938933333da5671f4a14b6ce029268ba01a16e85d4a30c33 SHA512 7872e646a0d784d0c9d851d16cb1ef03926d07f67ec9573b673b2a82fd9a1ffbb7bbcb0ca0e67c299dd210947396a8c36dacb98d8a61c3ea72b5a438995e7de6
-EBUILD neofetch-3.4.0.ebuild 528 BLAKE2B 55af7ef9e6137fe42359f3db5af58c3418d4efbb9c1cf2dd5321acb0990e31de3db5258bc1bd6f4784e54cc4e9b3dd6abfc7ebe7c6dc366d72ebba82f6964042 SHA512 21b9a4f2d6df165860872f58794b34550df3dcacc5a9a3673a5ac45eab46fa7e2c3de238f266f7ef3944aacfe6787b1debf70d8f7b85fb4c186029efdf78a2df
-EBUILD neofetch-4.0.2.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
-EBUILD neofetch-5.0.0.ebuild 698 BLAKE2B f42ee7ffcabbe948c1e4de18e24c10f82b019ddfa7bb2ea0a5310fe987a048f93cf42de6e48803424e39658b876eea0d3df08d84429fe9d0414219b4785fd5fd SHA512 63dff45a3587448eb429703d9b8695c4b7ab600864c3f104e9117c879f9ca29f9394bd7d552cb2845646acffd71bafab4417d42c0e6494358b0d845c3da6ad2e
+EBUILD neofetch-5.0.0.ebuild 693 BLAKE2B 322d42370c759b75c54d4059ffa49a6812878812ec7e00f1b22ffa067788741db2c5777cbc272e7bd7a40c2a5457524faff3aa0f9569373fcf0b9f415c2b26e5 SHA512 b4568a595e5dc2d2c73c42fa7a5fd7d55bd50568ff3f0822ba3bf48d8a189696dd487c882355c6ba706f875368ca2f33dd2f27564334e95372a075e9ce44bf63
 EBUILD neofetch-9999.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-3.4.0.ebuild b/app-misc/neofetch/neofetch-3.4.0.ebuild
deleted file mode 100644
index 861c13b16942..000000000000
--- a/app-misc/neofetch/neofetch-3.4.0.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
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-4.0.2.ebuild b/app-misc/neofetch/neofetch-4.0.2.ebuild
deleted file mode 100644
index 4757864917ab..000000000000
--- a/app-misc/neofetch/neofetch-4.0.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=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
-fi
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-5.0.0.ebuild b/app-misc/neofetch/neofetch-5.0.0.ebuild
index 83f1ec36f8d1..62677c4b07a8 100644
--- a/app-misc/neofetch/neofetch-5.0.0.ebuild
+++ b/app-misc/neofetch/neofetch-5.0.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 x86 ~amd64-fbsd"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 51ce9824000b..ca41cbec5d84 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,5 +1,4 @@
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
-EBUILD screenfetch-3.8.0-r1.ebuild 645 BLAKE2B da3565843558442dcfb92af2f56da8dbfddb25d88ea21492dd716377e6de0975b25e5ff25d25014c9342c0ee6abd7a1e479386bae10b5e5f505c1b109aee9efb SHA512 230977a4b296c7536799ebe36812bcbd1d311568cd5e243e96e6fdd6582dab322163dc767c796984e2fe7d16b904f3732d457b0fe59d206fcafc3a6cc3a55a6a
-EBUILD screenfetch-3.8.0.ebuild 693 BLAKE2B ad0cb380e1a3cd16f21e695e178abb984c76d6d696ef36dcd518b683c84ff82ebdbec02c9dd94f28c4b6b77a59f559614b07ef4cdd22a5a13104c9460a14da95 SHA512 99082dbdb51ba4ef62e0acdc41fddc59544644e8bb94dfbabe33bc3cd171e6416d5525c90770fdae8f86792ceb154e0be74373542668675cfff89c2d15074f9f
+EBUILD screenfetch-3.8.0-r1.ebuild 640 BLAKE2B 845d29382aa7241fad2ee9bb66e216df880fec4148eb3faebfa18ff739f51c66d2e1b9618f2b417248caf49081d1effc7cbc74b7e153e6652d14bec5da7edc3a SHA512 550f60f7ef1a57f44dedd488a2a8f015cb56d56608b061f436e75015a8307166c80d7d48444f5af4db8f2390e00b2873f630e0081a3b3ea09ace92a0499251ef
 EBUILD screenfetch-9999.ebuild 645 BLAKE2B da3565843558442dcfb92af2f56da8dbfddb25d88ea21492dd716377e6de0975b25e5ff25d25014c9342c0ee6abd7a1e479386bae10b5e5f505c1b109aee9efb SHA512 230977a4b296c7536799ebe36812bcbd1d311568cd5e243e96e6fdd6582dab322163dc767c796984e2fe7d16b904f3732d457b0fe59d206fcafc3a6cc3a55a6a
 MISC metadata.xml 433 BLAKE2B 50f5c928a8db5e71033fd780bd2ea13af87d8d14d83b694ff6765fc65ca3f7313c53de0a22ee5cdc0ed4ad88c754a0ccd750e59e46cfd1456b4ea185162ae1df SHA512 d07492a28cab27bba43976cc18148cde296f7e3a5ec76f06f066812b085c8b1a2b7ba9ed0a5eeea7aa838b052f177a2fde0a99ff5ff5ef9a46c4c0553cf012e0
diff --git a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
index f2c6bb16d7d5..459928ae2f31 100644
--- a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm x86 ~x64-macos"
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
diff --git a/app-misc/screenfetch/screenfetch-3.8.0.ebuild b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
deleted file mode 100644
index 35f27763226d..000000000000
--- a/app-misc/screenfetch/screenfetch-3.8.0.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
-
-MY_PN="${PN/f/F}"
-
-DESCRIPTION="Bash Screenshot Information Tool"
-HOMEPAGE="https://github.com/KittyKatt/screenFetch"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="curl X"
-
-DEPEND=""
-RDEPEND="
-	curl? ( net-misc/curl )
-	X? (
-		media-gfx/scrot
-		x11-apps/xdpyinfo
-	)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86 ~x64-macos"
-	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-src_install() {
-	newbin ${PN}-dev ${PN}
-	einstalldocs
-}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 9bf36cda9f21..45e0bc7a4f31 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -5,7 +5,7 @@ DIST tmux-2.8.tar.gz 637609 BLAKE2B d95fbdbc79c2c512908f82778816aa8540bf2fe26509
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1
 EBUILD tmux-2.6.ebuild 2140 BLAKE2B eaf576a0984fee2d9ef0eee0d823d28e5e4949e5a80003e539cb936e74fe1acf07ed883b71936dc3fd3c681806e766108a20cc574eb36a165f9abe584df2bd2c SHA512 cc02589f7cba6668bfe99193e910e4816cb9ef5e0adf6660bd6d4d2a281e3821e2ed383c50c905a95f97ec3c10d9b0c22a4f1fd552d05d7e869731deefc985ca
-EBUILD tmux-2.7.ebuild 2141 BLAKE2B 52286b25466be1d8108ef3370ba50c3628447cc8aa10756bb0ac10ba56a5b64d933b14b2fc246a6d207b8293ca3885461dbd97ac6431a919037817be71269295 SHA512 4a8dacdf74989e9fadb1dd159d938cd3b90b0ddca00ac102eea82fd267fc1e257491e62ccff4084141cb444b7f72863b6df18a530d721e83df7077d6169a43b5
+EBUILD tmux-2.7.ebuild 2139 BLAKE2B 5c9aa9bf3925ef13c0f5693537f5e67901a88b14468a9e912a3fdaa30f6df272981bff901e1ebf0018bbc28f4e6c4bde6c5c0d2b807084b4a0d73095562b87bb SHA512 8b78fae41fdcb1d773902045a5011a36f40378bb56a546d26cf50b9e2dd74dfd4e2cdf233de55dc8516748fb0094eb6cdaff88a505eeac7465f549bdf32cc460
 EBUILD tmux-2.8.ebuild 2117 BLAKE2B 3edfccc8b61961b65e7d866ae3797b437283e37c29b2da28d71ff7246a7146e01bd091ed4854a8df864ea242de3bea82eb2c52f0169ef16a2dabe3a744a7fd60 SHA512 8884a5ca026a5f84bffbc76f794a8460e31f50997790ef4cf7f6cd306d1108ccf33d18fcc203a15428d57ba5bcdb4589d6a746bce64033ce2f1e64b929a2e730
 EBUILD tmux-9999.ebuild 2350 BLAKE2B a2fea8d287803a5779740ce34ed42ecf8f889f9b10020921aaf1e48d2fb65b12a43773caf04c088b5ac963d5b5f879746c789d4d24a839a1fcc040b370e109b4 SHA512 db22402a7bfa146ea6f4553f7f8d1291456466aa1c2938a747671fbd8123a7ab8cfba9a5ed4405d2c8faefdac93307e99ea55ddf3c5e60f0d5667603fe7d26f4
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.7.ebuild b/app-misc/tmux/tmux-2.7.ebuild
index bfe4e67a390c..7b74613dbeb5 100644
--- a/app-misc/tmux/tmux-2.7.ebuild
+++ b/app-misc/tmux/tmux-2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-misc/ttyload/Manifest b/app-misc/ttyload/Manifest
index 1a6e497ed4c9..5344cd9c1006 100644
--- a/app-misc/ttyload/Manifest
+++ b/app-misc/ttyload/Manifest
@@ -1,3 +1,3 @@
 DIST ttyload-0.5.3.tar.bz2 15039 BLAKE2B 0614b492a86013c524d21de9dcb2c28e357afd8cc811b103b294d60c89c8b7503ca3e47dfe0c2eaa0ff92c76ff7e4453761300ea2fae1d8f5adbbe36d201c93e SHA512 1affc171fd569d4127d7a51dda5764272e554a96db6ad4418ff6120f9b0e573679b33d45797adcb667216d167e9f3ee41349a53d4f7808b3b1c5bed76e3f4bbb
-EBUILD ttyload-0.5.3.ebuild 715 BLAKE2B 4124a559f5873aae5105b0d5b8695ddd7d7ef0d076487eb88fe4ad8ee876accf04dc6c06579e50f372b938a1ce065b8f6c481f306470cc425c482ccfbbba9160 SHA512 c29bee509b9788891adb4971439cc2333a3f3856f1063aef12036314e33e4e2ec946ef20d7bd2f692ecb74c68e7211572f3d80e60e682fa0b57847047d4234c4
+EBUILD ttyload-0.5.3.ebuild 713 BLAKE2B 4f881ae2ad81300d4ad7fd7e3470dba988473e7ad8d60d5983a29c3d3777f169dfed5c2de5b8e7cf20c28776a8ac3ee89d9ae1be74b69d24b71395bf32dfc4a8 SHA512 9ce81b03526785457f46b962bbe5b8295e92869346c33e9fbeb51ff7b4639d5ecd6c4c7107d6f57f7bfb508fb1940e6f7a2f5b0545a295a9e575f3ca8ab4a0aa
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-misc/ttyload/ttyload-0.5.3.ebuild b/app-misc/ttyload/ttyload-0.5.3.ebuild
index 0ef762b01215..8f725f68538d 100644
--- a/app-misc/ttyload/ttyload-0.5.3.ebuild
+++ b/app-misc/ttyload/ttyload-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="color-coded graph of load averages over time"
 HOMEPAGE="http://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload"
 SRC_URI="http://www.daveltd.com/src/util/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="ISC"
 SLOT="0"
 
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
index ced57c0e75bf..727ff7b1eb11 100644
--- a/app-misc/vcontrold/Manifest
+++ b/app-misc/vcontrold/Manifest
@@ -1,4 +1,7 @@
+AUX man_generation.patch 1033 BLAKE2B 431deaaf6b7e48e975ac8c7bcee7bd144d610cd4e8bc2d7c472e26ac440f5a0c0b793026258ec75662eb6834e9542b0ca15f68c7619da9b6b9bf5e48da8baedd SHA512 67456107d42db0a2b584f3600c68ab9ba787b292198da0c69926c6b627b7f58b80b958513a3cfe537d8bc65fc03c3352b43886d433b6f06cc51bad24eb0da610
 AUX vcontrold 157 BLAKE2B c8d08ae44343850d95e9b99626690a2f79403bb9bafef9ea6125376623c617c4fc1523beb4be4d3cfa50d67c3a7ef84e4b3042afcaf8211ea0276d4e519cd713 SHA512 10583cff05a3099d06ec13cd35711c93dece72de1ba05a2026d85b31cb6279136cbbffa00bcc162cba841232d2f8fe2babda463bdadb6b4f3e1f39ce95562401
 DIST vcontrold-0.98.5.tar.gz 86684 BLAKE2B 07ed2c932b9f1c03410cbd6c23cfbfb7bf1aeaff027f597fb6f05a6b61c647f229a75b5a87d893a66c6b8e917595083d193c5da8585c6b9546d12c5867ca1a1b SHA512 b94dbb09ffe274e0a0a0ac4948365ed3213f221dbc00ed2b2adec2ac5a632e293686d62a07575454b3d11b1b8e4e058625a067461996dd720c2f84066d57e60e
+DIST vcontrold-0.98.6.tar.gz 86999 BLAKE2B bb2933c166793a851fc9b3292cdf00228e0f5383ab6cfce66150383103e7c6b54661ef8c7f0bb177aecedef9f7ca7d3e64a20c1af106d45a6c5a1f2a32bdd971 SHA512 74c17dc83af456e9fbece44a00d775d6e474b1de76993da69f5cb897658be13a83ef2abc3fe75f571f1d52120e2ddade08079336a338af81eae8557b3b357481
 EBUILD vcontrold-0.98.5.ebuild 906 BLAKE2B ede2a31302a852636266f97069eae207937bc630fa16db5f982ff676c453b1c2da0dfbf8d023197ebd4132f4a55ed16b8fa5bc6659d0cfe0ee7b9898416028f9 SHA512 cb627f085e3d3b9d0cce3c48a4e5e2f1e115c699414da293ff81783689fb7111e0f13d145901616cdd98526d7610a67fab72e0e9a051e07879e4b8371d77bd47
+EBUILD vcontrold-0.98.6.ebuild 950 BLAKE2B e8ec145ef75d4ff2d41fdcbd68e5d2f7ad541a84343cef2c3e8cd18d2830df3d5e08815b392990dfa901fa2bd3cf0a554a5d79e1721eda43a251f9cf9832ce84 SHA512 c22d888251d4f7c0e336436758c57c7d8da4e258af9c940c07819b864ebe5105af4903fd316cf33f733bab7a86a4f5eeaa1188652ebf82b0fe82bdbb11f24ec2
 MISC metadata.xml 910 BLAKE2B eb06d0c4ca09ba13dc5ec335afc9da950429c650c05289608c90f91e0b7d550f97f6833752a8e71101fad25d2600dd24c522f9747ddad20c958b31c790769d36 SHA512 9eeeb42e54cff821d986407940d3a8e434ba3126708eef45f3234bbd8519dc7fd564f5bd6767d249370a796e7ed13d934b52b309305b4bcc03401c63a68a3d64
diff --git a/app-misc/vcontrold/files/man_generation.patch b/app-misc/vcontrold/files/man_generation.patch
new file mode 100644
index 000000000000..81b8941d00a6
--- /dev/null
+++ b/app-misc/vcontrold/files/man_generation.patch
@@ -0,0 +1,22 @@
+diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
+index 65024b3..c3e3211 100644
+--- a/doc/man/CMakeLists.txt
++++ b/doc/man/CMakeLists.txt
+@@ -14,14 +14,13 @@ if(VSIM)
+ endif(VSIM)
+ 
+ foreach(MANUAL IN LISTS MANUALS)
+-    set(MANPAGE_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANUAL}.1.gz)
++    set(MANPAGE_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANUAL}.1)
+     set(MANPAGE_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${MANUAL}.rst)
+     add_custom_command(OUTPUT ${MANPAGE_OUTPUT}
+-        COMMAND ${RST2MAN} ${RST2MAN_OPTS} ${MANPAGE_SOURCE} | gzip > ${MANPAGE_OUTPUT}
++        COMMAND ${RST2MAN} ${RST2MAN_OPTS} ${MANPAGE_SOURCE} ${MANPAGE_OUTPUT}
+         DEPENDS ${MANPAGE_SOURCE}
+-        BYPRODUCTS ${MANPAGE_OUTPUT}
+         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-        COMMENT "Converting ${MANUAL}.rst from ReStructuredText into manpage ${MANUAL}.1.gz"
++        COMMENT "Converting ${MANUAL}.rst from ReStructuredText into manpage ${MANUAL}.1"
+         VERBATIM
+     )
+     list(APPEND MANPAGES_LIST ${MANPAGE_OUTPUT})
diff --git a/app-misc/vcontrold/vcontrold-0.98.6.ebuild b/app-misc/vcontrold/vcontrold-0.98.6.ebuild
new file mode 100644
index 000000000000..cd6ff144ee01
--- /dev/null
+++ b/app-misc/vcontrold/vcontrold-0.98.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Daemon for communication with Viessmann Vito heatings"
+HOMEPAGE="https://github.com/openv/vcontrold/"
+SRC_URI="https://github.com/openv/vcontrold/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+man +vclient vsim"
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	man? ( dev-python/docutils )"
+
+src_prepare() {
+	sed "s/@VERSION@/${PV}/" "src/version.h.in" \
+		> "src/version.h" || die "Setting version failed"
+	eapply "${FILESDIR}"/man_generation.patch
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMANPAGES="$(usex man)"
+		-DVCLIENT="$(usex vclient)"
+		-DVSIM="$(usex vsim)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doinitd "${FILESDIR}/vcontrold"
+	insinto /etc/vcontrold/
+	doins -r xml
+}
diff --git a/app-misc/zisofs-tools/Manifest b/app-misc/zisofs-tools/Manifest
index 3378051c92c0..7e8e356d17c9 100644
--- a/app-misc/zisofs-tools/Manifest
+++ b/app-misc/zisofs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST zisofs-tools-1.0.8.tar.bz2 52968 BLAKE2B 81224adfcf4309513ceec7c25f72d90e4dfbacc225c756b35f1ae2ce721709abd4f52559596632a121813bae2c14d259e7950e84cbed43a547e77bf3491f8fdb SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d
-EBUILD zisofs-tools-1.0.8.ebuild 663 BLAKE2B 68f0c648b1a0041af79cfd613370a0c3f4b21725c6e87450a16a2ad538f3a63746094530696f51e0e9ec0123892f97d7587b7aa8e1f5e0d324757667f84ddca4 SHA512 4d1216f196d2c2f3930c1db7472b087e0b2720a59cf22786133ea78afc773ab29eacdf326766397f21f69a2d15f6e00db5a68bbb4c3a6c23fa4cdbc6917377ee
+EBUILD zisofs-tools-1.0.8.ebuild 622 BLAKE2B efc2acf2469ef458e8ba0a11c49acf322d601783576343a729f762a94c9c485b530db3035c1c67c3baa4f52604ad245094439f0c37b8e394e1c60c125bebc879 SHA512 aaedbb20761ebbe192b6c71ce2a6cec225a15797202a8993a28065aa05d6b31163e7bc888170c4cb29c9f06215c29b376e988a3899bd2a0842dc64fb8d5edca8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
index 5cfc5013f7dc..e66ca77db98e 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
+EAPI=7
 inherit flag-o-matic
 
 DESCRIPTION="User utilities for zisofs"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/zisofs/"
-SRC_URI="mirror://kernel/linux/utils/fs/zisofs/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
-RDEPEND=">=sys-libs/zlib-1.1.4"
+RDEPEND=">=sys-libs/zlib-1.1.4:0="
 DEPEND="${RDEPEND}"
 
 src_configure() {
@@ -24,5 +23,5 @@ src_configure() {
 
 src_install() {
 	emake INSTALLROOT="${D}" install
-	dodoc CHANGES INSTALL README
+	einstalldocs
 }
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 2017e68d3f5c..b38c245577dd 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 086b185f0b2d..0f107945db41 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,12 +1,7 @@
-AUX gnucash-2.7.4-double_free.patch 553 BLAKE2B 3c59299aaf868e52834a8b7c594afedcfde35b7e6058fbe87a8fce57f2773d914b971566c831ae0a998680a3cfc69c5b1c75664087abaf1023e84fd650751592 SHA512 458bf645e16cb88e7ab37b218b442a11b02f6d3eb95fd1c4ae368813bff08bb3455666942c719f17df5348a5c775bc7e0e14507825896463624252aa24a056c9
-AUX gnucash-2.7.4-fix-tests-for-32bit-platforms.patch 1840 BLAKE2B 4de54cb147d563686febad739dddbc7e7e4f1cf92a5f1961fe4ccf452e8e2c495e7a4773a615a77835f4f1ef99d0f5d22c871c1643ada67bec216ae96dff3ce2 SHA512 f89f560e3e6d594836a431831a4a384301e405be49fccece0a761f1d2c17340a68f71ddc8cde4f7e99a2e05e2d3ddc6bda5b59e54ca0baa3a76ac63f7399d48b
 AUX gnucash-3.2-no-gui.patch 440 BLAKE2B 223d9527e0f290e73774b39ee25dae2c1740d4ed8b340d5d8cdfde74734ae30ebc391ca4ef8df6b162dd53cfd1b5ae3c7d5cd64446978a86969bb5fcc9ea6440 SHA512 628d38969abd7475f88ed9013d99691768abd11a751205092e04b92183551e0dce2e32f1212f66fde47e83730e1d26addbc47d990478e8a8968f9c9f0bc041bd
-DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61 SHA512 d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb
 DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274056bf10ef1721bce48ec18e4df4b488ce885dc767b4f1e951dabcdc2ba702cb5fe239f249ec50c8d2d1d12a434 SHA512 ef74cbf396096a71316e14500a5b4e57670f9e9c0c5d46f3afe051ccbae2e46a5f14edd8dd805dfb61276b934db286d48ae044160699df82689e2718ed2f7573
 DIST gnucash-3.3.tar.bz2 13440713 BLAKE2B a308af90d8a8e50eb732d29c7eadac1fb75b63006da5bbaa9044039c43c1c17976c6b6fdb1706a08a527b75b1300df3a8ed469151370097b0308a173a170e41b SHA512 4bf0369ca9b3c91c98a0d916f0befc7e5675a246559a6a72dba6592b64f56f3cbd1885b0711e44e8d9cca290be742812763691ae2f639ea31ec534e52e17b3f9
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-EBUILD gnucash-2.7.4-r1.ebuild 3952 BLAKE2B 011a368e9bf441c05aaaf3681ed666151ad7a68fb849c2ceca50079f47b91265f9ef10b2cf10367393f3df5243bd59e76c7a2362c3ff498c855058412112c977 SHA512 9cdf9f7b57fa0eda3d5d3d154b194bb869fc360fdac5049e327eedb9b27d91a2e4022a3388d1c372a6d84f337c7d1be96722603e05ac4028073e6a9b7baaadc2
 EBUILD gnucash-3.2-r2.ebuild 3959 BLAKE2B 37cdc89d7db8903b4b89332d7f9b47cef47fb29588a443b979a49d43bad5e883158a939898368afc02cae89402b25a7498a5a373c51cb8fb9c5265c7d05c15ae SHA512 97da97ae88ed1aa564ec605d5e8d24852869745521457d98e76adbb4b72a2a28025bcddad413e2f85a2d3f6c4116c40a889438428c9c5197a873e1834077235b
-EBUILD gnucash-3.2.ebuild 3888 BLAKE2B 7c7f0231e94ea7c430c2007968e70cd69c74dbb804f4b8e9858eafffc29e05ad8e2a1528b902294c75115161466ae2558e1149fc8c98a2376bf3f609e742e794 SHA512 b767881302588a21edc469ca1ed91a47a4560a756e099914c23a5907c78b1b9cd615831c3024c1c6f00a4c444b7c1c03d7417e1b9d90aa967c2196ab09d22b06
 EBUILD gnucash-3.3.ebuild 3964 BLAKE2B 8143c1d294c5b5df4cf83f0901919edbd44d2a22909cb09d9bccea15247c3e15ce050a8003f6845e00cf3cb74291f32e8c26700f851407ccbd5a83a5435d862e SHA512 3779398d4db88d1a8263fa4ffa44ca399b79e43fa0d956bedac9945d33bb90f2dc1fecca88c4321bfe1b5f43702cb8e2b49cdb007aea4756a3883099416c785b
 MISC metadata.xml 877 BLAKE2B 0fcba4a83ba82aa6634bc2e3d71da766f2890340e827ba478157fae994456daaecd12722991626069e04086d670a77f156e378a5b0d7b8ee35717561ca944a03 SHA512 1654790fbffc4ec76fc9520221877ad7eaa8fc774f4a05e9e250e44c0fb989081bafcacb018c8d2f6a4787d1794672a87e09c1687919b544a8f1fb36bb449bdc
diff --git a/app-office/gnucash/files/gnucash-2.7.4-double_free.patch b/app-office/gnucash/files/gnucash-2.7.4-double_free.patch
deleted file mode 100644
index 9d82e72f96b3..000000000000
--- a/app-office/gnucash/files/gnucash-2.7.4-double_free.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libgnucash/core-utils/test/test-userdata-dir.c b/libgnucash/core-utils/test/test-userdata-dir.c
-index 5a8cd5c50..a702a56aa 100644
---- a/libgnucash/core-utils/test/test-userdata-dir.c
-+++ b/libgnucash/core-utils/test/test-userdata-dir.c
-@@ -338,7 +338,6 @@ main(int argc, char **argv)
- 
-     /* Clean up the temporaries that were created for the GNC_DATA_HOME test run */
-     g_free (home_dir);
--    g_free (tmp_dir);
-     tmp_dir = g_build_filename(gnc_data_home_dir, "data", (gchar *)NULL);
-     g_rmdir (tmp_dir);
-     g_free (tmp_dir);
diff --git a/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch b/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch
deleted file mode 100644
index ec0e83a80bf5..000000000000
--- a/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3a0d2009741cdf825492020acab7c85867a60589 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 22 Feb 2018 12:27:36 +0100
-Subject: [PATCH] tests: Skip tests for dates on 32-bit platforms which cannot
- be representated
-
-Tests "test_IANA_Perth_tz" and "test_IANA_Minsk_tz" are failing on 32-bit
-platforms because the earliest timestamp which can be representated on a
-32-bit platform is "1901-12-13 20:45:52" but the test ranges start before
-that date.
-
-To be safe, this commit will add code to skip tests before year 1902 on
-32-bit platforms.
-
-Bug: https://bugs.gentoo.org/647596
----
- libgnucash/engine/test/gtest-gnc-timezone.cpp | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/libgnucash/engine/test/gtest-gnc-timezone.cpp b/libgnucash/engine/test/gtest-gnc-timezone.cpp
-index 5c46b2618..298220f6e 100644
---- a/libgnucash/engine/test/gtest-gnc-timezone.cpp
-+++ b/libgnucash/engine/test/gtest-gnc-timezone.cpp
-@@ -154,6 +154,14 @@ TEST(gnc_timezone_constructors, test_IANA_Perth_tz)
-         }
-         else if (year < 1916)
- #else
-+        if (year < 1902)
-+        {
-+            // Earliest timestamp which can be represented on a 32-bit
-+            // system is "1901-12-13 20:45:52" -- so skip tests until we
-+            // reach a year >1901 to be safe
-+            continue;
-+        }
-+
-         if (year < 1916)
- #endif
-         {
-@@ -216,6 +224,14 @@ TEST(gnc_timezone_constructors, test_IANA_Minsk_tz)
-         }
-         else if (year < 1924)
- #else
-+        if (year < 1902)
-+        {
-+            // Earliest timestamp which can be represented on a 32-bit
-+            // system is "1901-12-13 20:45:52" -- so skip tests until we
-+            // reach a year >1901 to be safe
-+            continue;
-+        }
-+
-         if (year < 1924)
- #endif
-         {
--- 
-2.16.2
-
diff --git a/app-office/gnucash/gnucash-2.7.4-r1.ebuild b/app-office/gnucash/gnucash-2.7.4-r1.ebuild
deleted file mode 100644
index 770723b97a17..000000000000
--- a/app-office/gnucash/gnucash-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-# Add doc back in for 3.0 and bump app-doc/gnucash-docs
-IUSE="aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres
-	  python quotes -register2 sqlite"
-REQUIRED_USE="
-	chipcard? ( aqbanking )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.7.0:2
-	>=dev-scheme/guile-2.0.0:12=[regex]
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-3.14.0:3
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxslt
-	gnome-base/dconf
-	net-libs/webkit-gtk:4=
-	aqbanking? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	~dev-cpp/gtest-${GV}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-# Uncomment for 3.0
-# PDEPEND="doc? (
-# 	~app-doc/gnucash-docs-${PV}
-# 	gnome-extra/yelp
-# )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-double_free.patch
-	"${FILESDIR}"/${P}-fix-tests-for-32bit-platforms.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-3.2.ebuild b/app-office/gnucash/gnucash-3.2.ebuild
deleted file mode 100644
index 7d93329d0017..000000000000
--- a/app-office/gnucash/gnucash-3.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
-		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres
-	  python quotes -register2 sqlite"
-REQUIRED_USE="
-	chipcard? ( aqbanking )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.7.0:2
-	>=dev-scheme/guile-2.0.0:12=[regex]
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-3.14.0:3
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxslt
-	gnome-base/dconf
-	net-libs/webkit-gtk:4=
-	aqbanking? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	~dev-cpp/gtest-${GV}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-#PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 558fdb697329..6e9943210a67 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,5 +1,3 @@
-DIST alkimia-7.0.1.tar.xz 38400 BLAKE2B c6dccf0702ae42bfcebfa20fc34233766ab4b08c81d7b8aa8af2be2003560f2e088e922a0ec5656c6f8e34d3f3a8348fb6315c3e5aecf72cda9fa2506e1a2161 SHA512 7f72eaf69ad38c5478498a212f6f644ab76a27aec588ff8817414c7e36190568012cd2faff7ae31978beec670539ac93e55f3637a331e90738bddc11a423138c
 DIST alkimia-7.0.2.tar.xz 38420 BLAKE2B ea2cc8dd80e2b9b2501d26936aa7d2799d040e8cf86f9adb4785e676046f3c76d0cbe3267e4159582086d910be35020bbc634140d32cc7e5588d06cf75a115a3 SHA512 275ea48cd33caed9393a170efcc6053a581c1cc000862dd73a63bdb6de3e3c3ad2e492901a859e517033e1239e297a43088580553efe32f1d99a85051f5af3e4
-EBUILD libalkimia-7.0.1.ebuild 716 BLAKE2B 1ed3a062482699441aca649c0907f5dbf836c66da3abf9a5fc710abd337683584112d546743932cadd3a8bb8f8bbb2a6048f9411370cb3b5a740a730c209110d SHA512 746880e0244af2c01c48759f53d0c81d4949a3faa9e9f5a5c47414746b6647af67f845eef5c40ab0f2c2676a31cae3fd6566dbd944bf318f7964e4afe064ecad
-EBUILD libalkimia-7.0.2.ebuild 762 BLAKE2B 2514096dcc7194868ee36bf13855578818279409248f19bad854f0ed443b52bb6819e08fb411940e17070973ad304b49ecb32e3bcc77c05486454595f9a4a751 SHA512 9e4f3b42a72e187c377ebe3f54009949e660a3bf68edb617fc07c4f0b13ba99c8181fc8e0f5e8d7b88af71de927745a71d4c9cef1acd6c62e5690c7dc6adeacf
+EBUILD libalkimia-7.0.2.ebuild 757 BLAKE2B 975665d1032105de21e1aa7d202234780b85f1e7c8e7fcdca1a55e28b8a500aa72585b1a1acc2fefff867426794d8e5eb3d58c0d41377a0fc6dea04ff83b265a SHA512 acf7cf9c0a56bb0ad937c9b0eff491cc16b3cd0b537bdff9b4f926ade4781b16009dc3d1bb90cebcef7dc82f395f2a556179d4d2774832f7a8cfa1f9b7af4cea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-office/libalkimia/libalkimia-7.0.1.ebuild b/app-office/libalkimia/libalkimia-7.0.1.ebuild
deleted file mode 100644
index 410a813b42f5..000000000000
--- a/app-office/libalkimia/libalkimia-7.0.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
-
-KDE_TEST="forceoptional"
-KMNAME="alkimia"
-inherit kde5
-
-DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
-SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/src/${KMNAME}-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/7"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	dev-libs/gmp:0=[cxx]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package doc Doxygen)
-	)
-	kde5_src_configure
-}
diff --git a/app-office/libalkimia/libalkimia-7.0.2.ebuild b/app-office/libalkimia/libalkimia-7.0.2.ebuild
index 6ddc34c445af..8c969cac92fa 100644
--- a/app-office/libalkimia/libalkimia-7.0.2.ebuild
+++ b/app-office/libalkimia/libalkimia-7.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 270d000641e0..14129a90d155 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,4 +18,4 @@ EBUILD libreoffice-6.0.6.2.ebuild 16750 BLAKE2B 7ea6bb2645ee81c15ed71d5353d15507
 EBUILD libreoffice-6.1.2.1.ebuild 16618 BLAKE2B 441609812a0aa894cbfef928847a2c835980ae70c549753cdaa143ca1bd6a72c31c500c7b1c3fdaec9bcb20a734d7d8732bab7195dd783f09b15b3e28371aca2 SHA512 a15b2d9b9ca06dca72ca99223b4e461acbd9f97253fff9679b51b40b63cfb141d683710858e6300bfe5e4dd40771bc2e58addf028cc03278b6ad2caa517c5eac
 EBUILD libreoffice-6.1.9999.ebuild 16618 BLAKE2B 441609812a0aa894cbfef928847a2c835980ae70c549753cdaa143ca1bd6a72c31c500c7b1c3fdaec9bcb20a734d7d8732bab7195dd783f09b15b3e28371aca2 SHA512 a15b2d9b9ca06dca72ca99223b4e461acbd9f97253fff9679b51b40b63cfb141d683710858e6300bfe5e4dd40771bc2e58addf028cc03278b6ad2caa517c5eac
 EBUILD libreoffice-9999.ebuild 16709 BLAKE2B 592d80e1376f0c90eb5ec8f8f38f7b25cfead38ae0f43750827b2770ee83d8b7bd7aee80758c55f373ada92b23831f404491aa4252449bb0ce05bc49b16ee713 SHA512 26c2071c5c1ce237032180ede3b8e9d7fa917115dab418d7e7b1726b169f381b93dbd10633923c1036ac4cbc2e909623c8535598ed22394404a105ffe5f2a025
-MISC metadata.xml 1090 BLAKE2B b30fc707317ea0601859f327540712eae38a9fc7365675501fca648e17e2ee3b35c2391e76dc7878b53e5216ca4eb2618595fbac2e07d8680f8daeaa67aaeeeb SHA512 4ffa1f2d605bc5666e25ce126d3264f9ed272ae1b12b9dd17ae366462d58de4a64767ee63928b233c21a15a77b549eb5c574064e73164cb20b0adb6ce12a9ec2
+MISC metadata.xml 1008 BLAKE2B 62a25f90e9b01f8fd924e861b0ddf1789e3124474cf73e2fad217e54e0324e38ad5bf37ff703b37bb5946d66e5de8711ff5e9b53a15e0ad368ebb3d04a3a05a3 SHA512 146662ca1c1dd7eb49c00b927657329befd3ee58ac0226ebb5fe81aefe90d7bf66ed6113cbe93774c0b917377eef8c1821a9ede278c9ba791a3ab544a2eaf2c7
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index b63d524dac8d..103556859a03 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,7 +14,6 @@ version</longdescription>
     <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
     <flag name="googledrive">Enable support for remote files on Google Drive</flag>
     <flag name="gtk2">Enable legacy gtk2 frontend</flag>
-    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="odk">Build the Office Development Kit</flag>
     <flag name="pdfimport">Enable PDF import via the Poppler library</flag>
     <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
diff --git a/app-office/upwork/Manifest b/app-office/upwork/Manifest
index 3a82f1888cc4..aab1aca23760 100644
--- a/app-office/upwork/Manifest
+++ b/app-office/upwork/Manifest
@@ -1,8 +1,5 @@
-AUX upwork-desktop.patch 399 BLAKE2B a1b6f4e55eecf2d2d604ed76efcecc5dd4d58abb2d9958041761cbc6c7728ded1c4f0636c67a2d2d1b60641f0c5ddb5e6e5a2dd6de01570f5196b683a3df10cc SHA512 76386929bf4327b050149e00127876221091db36dc2daa4d2d2f2b71a52cbf6171c6912b70640f5342554c1fec840a192bf51ac7334954143a9bcec8ce6cbaef
-DIST upwork-4.1.134_i386.rpm 34420908 BLAKE2B a1a3e76e44faa26852f67bf65d2040a2e53056f54dca7075dd6126f657837f0ad640ce804995ca5c78f385c92b92cc8df81d895c51781bbad1bdde1209ae8e0b SHA512 68190c4aa26df36857311b5944d2cdc15930ff248d8a4c841785451c1a48bb15ad1bf7bdd586d109994de70cef493a98a198b68bd785df2e8b88e45b85a25f23
-DIST upwork-4.1.134_x86_64.rpm 34025281 BLAKE2B 659eec23d72c838c7725a88efb773825395c520814665bd592903a9e764ebe4723cf4548ce4fe4c6b2109fef2018694a9ad620fee620a4f81808353ddb5582c4 SHA512 65ef2e6552e34b50f24102c6227267a07881955bdf6b41571374167f844e07a0be6ee752c9fe3ff2b4280b58895ddeda86d0ba4aaa229bc12ff378ac5b6f730a
-DIST upwork-4.2.153_i386.rpm 45812396 BLAKE2B 1f71ae1e984fa8ce29a37674aae7491aa42fb821ea3dd71c3947ebb7db76da51b3b7567301ab6952d47a873c242c52abe6cd976ff324287104b8ff58eba10a16 SHA512 8117e98dc72b64e094bc73c249d040c96cd04e974182db575dfdcd40bd93e09ecda9f0619953b41b71cb0d6f286cd355df41ae68be3787aa7b507195a15104d3
-DIST upwork-4.2.153_x86_64.rpm 44008199 BLAKE2B 95ee207f66e4a9c6a82c6a98f90b26254e10fb01a858817f206a5fbc114ac551568010cb3f88bab9dae744b62c3e56ef91996e6d49dbc163652d0f5ead6818bd SHA512 4defc588a32462d825da0e95847bf6739b6f66d3095016dd9d3b7e502a470f086c13edfe36f6511f2961e91ec8b96a0e4eac4682409e0761a3d6abbb3db172d4
-EBUILD upwork-4.1.134.ebuild 1198 BLAKE2B f099693afe3260a33de64763fef99d076a463b17e6f672d5cf04d5d006871837fa0522461f553593416d265dc2204961d1d6c87c485ca2fa4b46d55d8ccd23fd SHA512 a988c40a156cc95c4bc9a76979006384ad592ec887afb1946a25bf462345791e08240e08bbb4bfe8a560467663e5ce031f8e5c45b5fceb11bc64347191a27d63
-EBUILD upwork-4.2.153.ebuild 1210 BLAKE2B 3c8285769ee3eb7ca4e7b6f10cffc217775ebe5f47a0a30975bb3ac020e955293714de8a9c2813c52a41ebc0179ce69ab9d2c5c0d2b8ab421b9431a09fab9fa9 SHA512 42575acfc5605e6ac446a3ed554de5ff89809b0861238407a154df10f11aa12559e71bd815b0a617824d85ca8cc8113ba41d0b054a11bf54813c1206ec11c7d8
-MISC metadata.xml 600 BLAKE2B 82f9d59c6892afb1d7886135972cbbea63b1a7738a919360b5fa00a535fb87854c4ca4b1f0a16ca833bc0a9662031535878258c7ee4518cba3cc6376e3a612fc SHA512 3312eb3a1051c2f7892e851235b728e1bbbe30918788f81e756ed1373ab98b027bbce8837e8b1965708003d161fe355295fff089f8294e27528e8688c8dd859a
+AUX upwork-desktop-r1.patch 480 BLAKE2B a296b0c5274adf65e3c1f1e65a30dea48d147632b1afc39e4688e4b0d23a4735c957ce4d451f040d34ae2996670350bf467bc87008e5814a3c5e9bfc5e717398 SHA512 dce08bf79e672c07fa8c11e00b68e5b4bd2176a606a1192fd6a0dbf9343e99c2aa70909506d71b35b04a3eaf6be0a61f62e65f6a3802a0e17967bfe4dbbd4aef
+DIST upwork-5.1.0.562_i386.rpm 51520094 BLAKE2B 00ae85aa45cd4c39d7c3dc89db9f490741ffb1b291df4c1cebbf2f4d0510bbe38696f65b2022a1b7881f93a3f882f9fd0947a4cbd186debf81255275ab60ce75 SHA512 37b93e61c69f2ec0c350e968fa9e0fd88ef5d9de252f24f1187574625a763a3b3e2ffeeded01bb415006d3b3426b29385d2b31c28a11044e46df0c21c6f334e0
+DIST upwork-5.1.0.562_x86_64.rpm 50518342 BLAKE2B cbb35b6cbf45393b6b6b9c91923f502fba9eb9edd9674b455ba3bbe3ac99c9d54fb35b0c6e13013728e1f2358c8bc9a8f2fc07faa30577df4ddac4c1d639145d SHA512 2f21e0a0756d669512260237bfd28c1cdb8bdb53846411340f574ef6c9c04ba8c8abd36e1197547eb7339cc17aa51dd1d2ccbfdd3fc66eacc7e3c83125391c38
+EBUILD upwork-5.1.0.562.ebuild 1227 BLAKE2B 2bcace55fbea9b468b82324bc3822ada0bb3c86b1db170b6e6934fd732f71a6fe39d5fe2a430c4ca5b4e6c29e1540067a4845a93a26f455cc02c5f0d5c5cbc24 SHA512 56609bc83e0876b2e39f99e44d531db0a25f4a101e31d530b747b2cd70219a72cb84d08d8a647918f69575c3bfd6532d2ae90654b92bebb0cdcf6f36d4c0b335
+MISC metadata.xml 601 BLAKE2B d6bb0d933480847c8d5e0ea53b25b009260f8bbc02aafcb2d89525ffe3688c2f2a3d8e0147ace8e51dab5d37b6c25758ecaa9569ffae95d14b3075e57a4d3480 SHA512 4695a6e61e42e30295a1d5c4a676ddc164acf0b8c8642bf825b1376b501527b47039d7bc99b57697ee23364a11cd9c339fa47184c904904d5732d1b6aaf8f153
diff --git a/app-office/upwork/files/upwork-desktop-r1.patch b/app-office/upwork/files/upwork-desktop-r1.patch
new file mode 100644
index 000000000000..cffc1bb92e97
--- /dev/null
+++ b/app-office/upwork/files/upwork-desktop-r1.patch
@@ -0,0 +1,14 @@
+diff -ur a/usr/share/applications/upwork.desktop b/usr/share/applications/upwork.desktop
+--- a/usr/share/applications/upwork.desktop	2018-07-04 16:38:55.000000000 +0200
++++ b/usr/share/applications/upwork.desktop	2018-09-25 15:06:27.021679329 +0200
+@@ -2,8 +2,8 @@
+ Encoding=UTF-8
+ Name=Upwork
+ Exec=upwork
+-Icon=upwork.png
++Icon=upwork
+ Terminal=false
+ Type=Application
+-Categories=GTK;Network;Project Management
++Categories=GTK;Network;X-Project Management
+ StartupNotify=false
diff --git a/app-office/upwork/files/upwork-desktop.patch b/app-office/upwork/files/upwork-desktop.patch
deleted file mode 100644
index a7b76f815b00..000000000000
--- a/app-office/upwork/files/upwork-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/usr/share/applications/upwork.desktop	2015-05-15 10:58:10.166313615 -0400
-+++ b/usr/share/applications/upwork.desktop	2015-05-15 10:58:29.929383130 -0400
-@@ -2,8 +2,8 @@
- Encoding=UTF-8
- Name=Upwork
- Exec=upwork
--Icon=upwork.png
-+Icon=upwork
- Terminal=false
- Type=Application
--Categories=Development;Project Management;GTK
-+Categories=Development;X-Project Management;GTK;
- StartupNotify=true
diff --git a/app-office/upwork/metadata.xml b/app-office/upwork/metadata.xml
index 6df5fcb9e08d..33ffa3148d10 100644
--- a/app-office/upwork/metadata.xml
+++ b/app-office/upwork/metadata.xml
@@ -7,10 +7,10 @@
     </maintainer>
     <maintainer type="person">
         <email>stefantalpalaru@yahoo.com</email>
-        <name>Stefan Talpalaru</name>
+        <name>Ștefan Talpalaru</name>
     </maintainer>
     <longdescription lang="en">
-        upwork's desktop application enabling visibility, connectivity,
+        Upwork's desktop application enabling visibility, connectivity,
         collaboration and guaranteed payment for guaranteed work.
     </longdescription>
 </pkgmetadata>
diff --git a/app-office/upwork/upwork-4.1.134.ebuild b/app-office/upwork/upwork-4.1.134.ebuild
deleted file mode 100644
index 2827201a56b9..000000000000
--- a/app-office/upwork/upwork-4.1.134.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit rpm eutils pax-utils
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-DESCRIPTION="Project collaboration and tracking software for upwork.com"
-HOMEPAGE="https://www.upwork.com/"
-SRC_URI="
-	amd64? ( http://updates.team.odesk.com/binaries/v4_1_314_0_0bo6g5kfbj07y2x4/upwork_x86_64.rpm -> ${P}_x86_64.rpm )
-	x86? ( http://updates.team.odesk.com/binaries/v4_1_314_0_0bo6g5kfbj07y2x4/upwork_i386.rpm -> ${P}_i386.rpm )
-"
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-
-RDEPEND="
-	dev-libs/libgcrypt:11
-	gnome-base/gconf
-	media-libs/alsa-lib
-	sys-libs/libcap
-	virtual/udev
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-desktop.patch"
-}
-
-src_install() {
-	# Wrapper to the real executable
-	dobin usr/bin/upwork
-
-	insinto /usr/share
-	pax-mark m usr/share/upwork/upwork
-	doins -r usr/share/upwork
-	dosym /usr/lib/libudev.so /usr/share/upwork/libudev.so.0
-
-	# Make this executable because it's the real executable
-	fperms 0755 /usr/share/upwork/upwork
-
-	domenu usr/share/applications/upwork.desktop
-	doicon usr/share/pixmaps/upwork.png
-}
diff --git a/app-office/upwork/upwork-4.2.153.ebuild b/app-office/upwork/upwork-4.2.153.ebuild
deleted file mode 100644
index cdc73b3508dc..000000000000
--- a/app-office/upwork/upwork-4.2.153.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm eutils pax-utils
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-DESCRIPTION="Project collaboration and tracking software for upwork.com"
-HOMEPAGE="https://www.upwork.com/"
-SRC_URI="
-	amd64? ( https://updates-desktopapp.upwork.com/binaries/v4_2_153_0_tkzkho5lhz15j08q/upwork_x86_64.rpm -> ${P}_x86_64.rpm )
-	x86? ( https://updates-desktopapp.upwork.com/binaries/v4_2_153_0_tkzkho5lhz15j08q/upwork_i386.rpm -> ${P}_i386.rpm )
-"
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-
-DEPEND="dev-util/patchelf"
-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
-"
-
-PATCHES=( "${FILESDIR}/${PN}-desktop.patch" )
-
-src_install() {
-	pax-mark m usr/share/upwork/upwork
-
-	dobin usr/bin/upwork
-
-	patchelf --set-rpath /usr/share/upwork usr/share/upwork/upwork
-	dolib usr/share/upwork/libcef.so
-	rm usr/share/upwork/libcef.so
-
-	insinto /usr/share
-	doins -r usr/share/upwork
-	fperms 0755 /usr/share/upwork/upwork
-
-	domenu usr/share/applications/upwork.desktop
-	doicon usr/share/pixmaps/upwork.png
-}
diff --git a/app-office/upwork/upwork-5.1.0.562.ebuild b/app-office/upwork/upwork-5.1.0.562.ebuild
new file mode 100644
index 000000000000..27e39f4e7bca
--- /dev/null
+++ b/app-office/upwork/upwork-5.1.0.562.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm eutils pax-utils
+
+# Binary only distribution
+QA_PREBUILT="*"
+
+DESCRIPTION="Project collaboration and tracking software for upwork.com"
+HOMEPAGE="https://www.upwork.com/"
+SRC_URI="
+	amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_1_0_562_f3wgs5ljinabm69t/upwork-5.1.0.562-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
+	x86? ( https://updates-desktopapp.upwork.com/binaries/v5_1_0_562_f3wgs5ljinabm69t/upwork-5.1.0.562-1fc24.i386.rpm -> ${P}_i386.rpm )
+"
+LICENSE="ODESK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}/${PN}-desktop-r1.patch" )
+
+DEPEND="dev-util/patchelf"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf
+	media-libs/alsa-lib
+	media-libs/freetype
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/gtk+:2[cups]
+	x11-libs/gtkglext
+"
+
+src_install() {
+	pax-mark m usr/share/upwork/upwork
+
+	dobin usr/bin/upwork
+
+	patchelf --set-rpath /usr/share/upwork usr/share/upwork/upwork
+
+	insinto /usr/share
+	doins -r usr/share/upwork
+	fperms 0755 /usr/share/upwork/upwork
+
+	domenu usr/share/applications/upwork.desktop
+	doicon usr/share/pixmaps/upwork.png
+}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index fb710d8ef5f9..db7b0aa5b0cb 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index d0372b0140f9..6da594c14e7e 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,4 +1,5 @@
 DIST pilot-link-0.12.5-gentoo-patchset.tar.bz2 8182 BLAKE2B db6e053bebc2876308d5bf5c29b86b9f22aecd0e75ed6d16e9214d63d73cb5e2dc7080bcd03a9d4dc21d4f2ef84d9632bac6cd36673d93915db9fd095ae12dfd SHA512 141900ef42d8a6716d7e0a219e1b75609f392c393376fb60f645561cfe1cf67ad9cec03321a31dcf1e8a70c75591df6eac4f727c957487496ab46ae6aa2dc90d
 DIST pilot-link-0.12.5.tar.bz2 1578735 BLAKE2B acc8748448d90928ac393e3d716f9d12c7962e18564a738b5f01e19bb225d610e179bb0694aded57979c7240df2652cac72845e5b8cdcddf6a4a800bbac4424b SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868
 EBUILD pilot-link-0.12.5-r1.ebuild 2915 BLAKE2B c2f046807b4e573861361f522d59c318e800114095addac35d7f08355e7152ca35f5d4ba3450ed23ab42df1e3aeb671a6cc667567a8111a3053e42ef344c5dc8 SHA512 9376978300128ba5b930a36a497c4f8ce36640ad6cac9b0ca1412fd285f9202cfba1254f95d2157068cf42f66f44a16b73fc5bd0d59896a3b9bc88fef12acf57
+EBUILD pilot-link-0.12.5-r2.ebuild 3064 BLAKE2B 8dbad643c3855415b7e673458f7c624a90ba12f6b8609afd54b8a87bca58bca951163305f08fc5e2eb4eb0f208e5ff3c0c653f68f68aacc36becf37ca7d49d62 SHA512 f221e381a64fb2307081fde04a416c43f914e1486382a016696a1335caeb493bb908fc2852fb6a0f4944a9e2467fbce360ef8fa0fc78511caad37e59c75ff90c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
new file mode 100644
index 000000000000..0c758b2a6338
--- /dev/null
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools distutils-r1 perl-module java-pkg-opt-2
+
+DESCRIPTION="Suite of tools for moving data between a Palm device and a desktop"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="bluetooth debug java perl png python static-libs threads usb"
+
+COMMON_DEPEND="
+	dev-libs/popt
+	>=sys-libs/ncurses-5.7-r7:0=
+	>=sys-libs/readline-6:0=
+	virtual/libiconv
+	bluetooth? ( net-wireless/bluez )
+	perl? ( >=dev-lang/perl-5.12 )
+	png? ( media-libs/libpng:0= )
+	usb? ( virtual/libusb:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.4 )
+"
+
+src_prepare() {
+	default
+
+	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-java-install.patch
+	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-respect-javacflags.patch
+	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-werror_194921.patch
+	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-threads.patch
+	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libpng14.patch
+	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-png.patch
+	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-distutils.patch
+	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libusb-compat-usb_open.patch
+	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.5-perl514.patch
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467600
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	# tcl/tk support is disabled as per upstream request.
+	# readline is not really optional, bug #626504
+	econf \
+		--includedir="${EPREFIX}"/usr/include/libpisock \
+		$(use_enable static-libs static) \
+		--enable-conduits \
+		--with-readline \
+		$(use_enable threads) \
+		$(use_enable usb libusb) \
+		$(use_enable debug) \
+		$(use_with png libpng) \
+		$(use_with bluetooth bluez) \
+		$(use_with perl) \
+		$(use_with java) \
+		--without-tcl \
+		$(use_with python)
+}
+
+src_compile() {
+	emake
+
+	if use perl; then
+		cd "${S}"/bindings/Perl
+		perl-module_src_configure
+		local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629
+		perl-module_src_compile
+	fi
+
+	if use python; then
+		cd "${S}"/bindings/Python
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog NEWS README doc/{README*,TODO}
+
+	if use java; then
+		cd "${S}"/bindings/Java
+		java-pkg_newjar ${PN}.jar
+		java-pkg_doso libjpisock.so
+	fi
+
+	if use perl; then
+		cd "${S}"/bindings/Perl
+		perl-module_src_install
+	fi
+
+	if use python; then
+		cd "${S}"/bindings/Python
+		distutils-r1_src_install
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	perl_set_version
+	java-pkg-opt-2_pkg_preinst
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index c7aa89b929df..c50ec3115b1e 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index 71660d6d6c5a..51451cd59ea3 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -3,7 +3,7 @@ DIST g-sorcery-0.2.1.tar.gz 55546 BLAKE2B 56fb8a766c17c220a8279d2288f5de5c6976dc
 DIST g-sorcery-0.2.tar.gz 54173 BLAKE2B c110c670d792bf41430980a5155ca83d9ff45e9e301507628913666ebf313155e3b262856efcdd4896dad005c2eac393f9573fc106fa868b057a7b8f5a026b9f SHA512 9715d468c3eb34eac2bda81b7442d86fc8af984c2115c93682ae6c63d59a9ed3d7d0234df845659ccd991eb304d732ae33e31c217a7916b8dd08e2617984cb32
 EBUILD g-sorcery-0.1-r1.ebuild 666 BLAKE2B b0d63d33218764d3f41820017973e9ba785ccee04b2a0ba1bb9e1eb96e8fc3dd18baba1f36997e776a8ac23e69ca57b030f00c6f713ecf0fe7e46bd58e28f3e5 SHA512 0b86108e43627da22083a965455f8a2a109d207281eeff32d40cae1c4e8b360037e05f46731ec65aa8291ad8d8260288207ab189fd1ed06a934b2694d8fa2a12
 EBUILD g-sorcery-0.2-r1.ebuild 894 BLAKE2B cf6b55447cecabc742fe669f6f8f920348569270d62bd7d3983ceda343a957279d73d22fc659228436d0e2d3d746cc56fd54a3ea31d65037a2f3830ee787d688 SHA512 d590fcc4c64e6e2bcfb38e16653ed1bee65f47b6b349d3eac977219fb51f34afb4a2cb39b7b04b2629327fceb7f67aed81499c716482fe75e9135638847322ca
-EBUILD g-sorcery-0.2.1-r1.ebuild 956 BLAKE2B 2f23f94741d48725ae1ef3920a3e1f919a20cb80383b16a40cb7947cc2f9d5e7ccb1fd14d7a175a4699c18c701bd0d3b13eec916809348965b3daf622b4d8ab5 SHA512 0a343b118df47532e0b0e57a2908d6c8481130ce6e9a18615850a5f0c1129b6712add6d6e6a630e42b8a6411c2e5270f5caf5e3ce8289b78f70d514b95f8e1ed
+EBUILD g-sorcery-0.2.1-r1.ebuild 963 BLAKE2B 734d44e9c6347de14d14ba95911b705c0b49908ef5e17877e7a441c085543bc6d730ac22e908bf737bbea4acdf5d23e94666846e31dcd8e73f02b91d4323e2d2 SHA512 788ede4ba82312bbecc1aa9c0087847430d8a16553ff03c06fa6c097ff30e98855f41563c5a205dc057c9e9c894315e5b68ee4ad9cf28ce50beeda60657d986e
 EBUILD g-sorcery-0.2.1.ebuild 866 BLAKE2B 99748c1dc04ce8ac57784e4746dd015f52d60116651578a78aee0c37e1fadc92b012aef2dc8bc36be66adc5fd46ffd6312e5de44d42bd3ba676bedb470e95ef0 SHA512 f290aaab0f812cf104d6dc4fc0db9d4e7fd383f1743a3bba12600faa3fa03931f274760cf4ec046d27edd7daceb8ad989edef0c1b8558f0bd7bc89ad91360364
 EBUILD g-sorcery-9999.ebuild 894 BLAKE2B 7c419b97fab6213319ca2c75788c23b15dbf71c0c14bf8d2bfa41b7c539fafbf3ee6947006f02fc1df1e2db31e4712833221cb5eb2f216e80ae1bbd1c86ee9c4 SHA512 2f5665e85eba78c3f15c22cf1e52b8ac4d1a9d24091089f8391563e7669d59f2b2086d37606009b29cd12d9effe1823e741b47d0d005e51d2d8b9c34f020e5d6
 MISC metadata.xml 494 BLAKE2B 558f844e741fb22e9b08b8e926fdc0bb697a6d0697815efe74e925eca39f644223772a1ed3f98585383f58a5d2ed4b092b8868b595f453184762c62e1937f2da SHA512 dc99a22780958061da21e20aa74ea128b1397fe09092b8dc32268577315efdb6d8531b227e24863cab4eaf393ce94e783c763f0835a5358ea39c02bd628a74c1
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
index 0837fefd4932..0e9fb53fe35b 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="bson git"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	git? ( dev-vcs/git )
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 9afebfd540b2..4ee11e8d2f5c 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -12,6 +12,6 @@ EBUILD layman-2.0.0-r1.ebuild 1629 BLAKE2B ff95ce6ba92ce4d8b536260cb15149f786bee
 EBUILD layman-2.0.0-r3.ebuild 1668 BLAKE2B 9132c3dc910abfadf07e6fd9b3a69ea6234bd63dac873d20fd0235d3c35ba21991b2b97dc992d735a1b0452eaf44cb5eea7cab6678a977dce55c932bfbb685e2 SHA512 215e1136fbba7153772417deee4456b4174d0b551194f4ebeb3f29583315a74fcb4791b631c1049fb993218b2b8d6e30910366eaf935e4d0b010725488d7213f
 EBUILD layman-2.2.0-r7.ebuild 2178 BLAKE2B 2b3959e9f03c436dd07d7db4cc36b6d0a147cc0e3d35dfc9363e2baa1e869b9092c4eadda6a5424ea53c50667add23622065222ac4ade7142bc34cebc2e08f5f SHA512 04c77e388d73a53034fce76018c09d79ff67e1ece9719afb381bb79a4566b45873ba3acab4040f64b4012e0a442f72d9bb534f1cfe19840a461e5b607678b255
 EBUILD layman-2.4.1-r1.ebuild 2116 BLAKE2B 4f16a3e6aa26701a653c3b2e103085edd6420676f0667db18ccd87cf3aba8a858827f85f5fce383c379c658faeb82b736a77f17790a5ba95eaeafea72a1aa9f2 SHA512 5ecb7a7786ca0354090a20f4fc63def960d27a2a47b77d2d69742f905109a06f693154694967229ab3dcfbb52ec4ddfbfcee7260c426afe2253011f329035b60
-EBUILD layman-2.4.2-r1.ebuild 2289 BLAKE2B 46d9b5292320f7d091822630cb69037f0745a9dd35f1b4b5b7da8c60571a7072a82635603e0403e9b4819b80d511429025a6d2909eef14e64dd3bb37d5af93e9 SHA512 d4d2e268bba46ff1c6c33963c4ff75239db5f28c8eb64109a86d3531c7f707c61a2011d4270d2a55c3365aeb59a6344a6ccbdcabc89c0bae3405b6278c91eca1
+EBUILD layman-2.4.2-r1.ebuild 2290 BLAKE2B d0b14efa34f39d9e290cb5c0aa1f412da1f52c97bd711c09ce769784af9c1a6774edf38f61e50e58434a8ea9aebc4cedc72bd460b0084988070348551613dfce SHA512 e53e629e613c8507fabc046cc1549b3f8ab9334e43fb23e3a049ed76ab9b3f43b0f24111ed1bd3af683ecb6da1504779952a217d0d299c8f5d0f2cb6819709ef
 EBUILD layman-9999.ebuild 2223 BLAKE2B 1d32d63d9c99593e03dc8e3ed8b31d775918593bc115129433eee7dec66d115eba0424eba42864e187a2796e5bc3ea54aa5c3ac13a2d851fc81dcb18ad8d3342 SHA512 ac5a21aa58ae616b661f92ed4dfcd9cd15413be55778e496a22dded16de24efa26f707008d50a2e0bbe43a4c615dcff1333d972cde8eca2671b3c1f480c3b8d4
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
index 7cd74b995ce9..e5c2a340f727 100644
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ b/app-portage/layman/layman-2.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
 
 DEPEND="test? ( dev-vcs/subversion )
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index ce6fc07852f3..455ee31588a7 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -5,4 +5,5 @@ DIST pfl-2.4.tar.bz2 6274 BLAKE2B 7cf72dc4b9182b3ea43fb1661330debeb79afdaaab8a51
 DIST pfl-3.0.tar.bz2 4332 BLAKE2B 8e1dd17d0017cd972c02a9e8d3610a036447d7b898c6f0a9557ef2c598c0581a09ee7a72ca04860f3695d06d3fe3ee9426a99b1158db71e232ccaff69479d068 SHA512 94f7cc575689f46a0b9ce50c3de7d6a42767766c8c447616c7f3587438a6b3c09e5d00b3b80cd71b0d386ead1e396d49aa266ff408146f85b18e25ebfe887108
 EBUILD pfl-2.4-r5.ebuild 1198 BLAKE2B f5bb1fc20d4de3e00b6bfc3dd220605148d12888b7807071d499d923133317e10944e941f38c51c96d940578d071487ee5a83fe8cc7d24bdf338c955cd89514b SHA512 146f86054a8d782bf1947ef46b9710155cc938b231aed95e27d917fab8103021592cf5a853e6418927a19c7da4fdbe7297b5b99c96c4152092b43b749cc72889
 EBUILD pfl-3.0-r1.ebuild 1078 BLAKE2B ccdd5932a5724e4e47a3f0a8b1d7c545c264ec31c21b9a6cb0bf0818f04bb2f8b010855f271148d39333316d9b6d2a408395c9a3aafb779425c57c2d6f50875b SHA512 50f8a2ba5a57776237e409e5c28eaeea7e2112453023b55eb46cbf1eeb451045877f2647e4707dadd81b6225418c0a2e6f59e59345e5fc5852598ec75b2cc5b5
+EBUILD pfl-3.0-r2.ebuild 1061 BLAKE2B a8a9ffa62a3201b0bcfbc2fcbfb4db51841c92f0ad616ec1d5c1798044976a00790fbeb5543b0665f623aaae86ed5ef5d2f1fcfbc84b43394215e707cd550f88 SHA512 91922a261982c62e9d54beda026429f785517e26d86116be8b90d1dbb4727f410b38caa318bc85d474e1a99629e7be37416375b9f16522f35575c0b0f50746b0
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/pfl-3.0-r2.ebuild b/app-portage/pfl/pfl-3.0-r2.ebuild
new file mode 100644
index 000000000000..c285466a6032
--- /dev/null
+++ b/app-portage/pfl/pfl-3.0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Searchable online file/package database for Gentoo"
+HOMEPAGE="http://www.portagefilelist.de"
+SRC_URI="http://files.portagefilelist.de/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+network-cron"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	net-misc/curl
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)
+	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	if use network-cron ; then
+		exeinto /etc/cron.weekly
+		doexe cron/pfl
+	fi
+
+	keepdir /var/lib/${PN}
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}/var/lib/${PN}/pfl.info" ]]; then
+		touch "${EROOT}/var/lib/${PN}/pfl.info" || die
+		chown -R 0:portage "${EROOT}/var/lib/${PN}" || die
+		chmod 775 "${EROOT}/var/lib/${PN}" || die
+	fi
+}
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 611b4b8691f5..0ecf939eeec8 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -6,8 +6,8 @@ DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06
 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 2503 BLAKE2B 3c6b8981076ccbaa0c270c4a5a5e60382892d9793b47b163ac40ad965be32106e508cd9f8c020fe28c67778d36b8cf35653bef11c159d8fe7a663186a5cfdec0 SHA512 b79135e052cf2b1106e3ebda0dfd63b37f1fe5d2869b0a97149180f1e64f21f4543e4a1f0478531019e46d602232f15c13f49d9f5e51a07c97865223ae8b866d
-EBUILD repoman-2.3.10.ebuild 1953 BLAKE2B 90a562c2bf3bcce5ea43f28322d6c7d285b5bc24d79d0f7162d1b1adf4b9c31e639051620504b5065951dcb3d47744605d374106920535ad8e78e625a2fca89e SHA512 af0b103c450702051cab5ced77b387ae9684f83708ab52c294fb6dcef94a31759203e7d9e27536b9d5308c84369e3d5619e55f6b273a8594c8e781c4940d8720
-EBUILD repoman-2.3.11.ebuild 1951 BLAKE2B c2b70c97134210304bd2cda2871e95b613614e20ab95144386c15a73ad964aac88421c19487234005ab460d8d772c0c9885a370e51d584df759d0dfbf7ef679c SHA512 3a6ec245037db2ee04af521a5482bde45af18e2dff01a48cb7a3a9de96b60bffbdd6480aaf75459e80faa50b38c72691b3e30ce08f1d8a2a9bc73f6c877f742f
+EBUILD repoman-2.3.10.ebuild 1952 BLAKE2B e14b21a2bd636bff2104dcf56d91e99a5cf0ab1deaf6ccdd3c4c30a482f0780a37f005c80d14d74cb27d2ce523e1c7c6db6eaa8e6501178506053c38f4dcb5f6 SHA512 e053f9decb8bc1e4bc9a2df878ee227f5bfde2fa325eaa137a24b2ce070a8abe6fa6144e01b737da188bcb20d5d7b69133adff27296e7a77292f3761e9dba0fd
+EBUILD repoman-2.3.11.ebuild 1946 BLAKE2B 2286b77ccd4d1bd546e84ea0c50bb3ba12ea30c5b3a38ea98649bb74cbae82910c79ab0501087f12fa36fca9696c269b5610b082e462b765e3bc493c838030f9 SHA512 d866b6bdef1c4da28eb7368862b725e87c4bcf052b4df083e2c0a1631ed928814c9bdbda3022258fdb25a5b5c2fbbf13e235a617ab64d2d2e59d666795956469
 EBUILD repoman-2.3.6.ebuild 1843 BLAKE2B 7423ea5e4fe5e895912bf383fc4e319c08abd5ea0995c497baef8bb8291516691e92124156681d860c3963966db8ecba48efb364de8256860b9c09aa1ef72bbb SHA512 d8dda4aaf8518c40bf2fc6dda958fd6218cd604a4102f9d1aff9c9b7ed0cdd6314dad10a11ab5e38ce455cebb12eaa20d99e21dd3ae2495182411a6f7abe7acd
 EBUILD repoman-2.3.9.ebuild 2165 BLAKE2B 9dc5c9f83b489e59770411eb09b1706145eb931ced4ea11f70df8bded8b8ae01cc5d0fd817dcb24765abf71738f84bece86ad189ba5db2a2ec94ceeabbf92bd1 SHA512 a77bf9f1c9d5e13bd1d6459afde097187f2ab3c596fca467f63cb2090ae5d48c8f634f9d20accb750e2f674214a8c69609b3e2a80b254df4fc36b4622c560d19
 EBUILD repoman-9999.ebuild 1982 BLAKE2B 2da48849d7f710be3930ae5882f420d25e9e9aa07a5d94cb77e658b0914cfe94ec2b3bcb174bfbb8a9739a55732f4fea02ca85afe8516dcdaf89627bdefcf0be SHA512 e9ee663fd2019db232df7cba9b0842f654f64c7b83dacd991a9844c1736651ff74ce2096979035ca2b29e6e9ddbbf01891c35206b77bb4ca0f077c7354e65f6e
diff --git a/app-portage/repoman/repoman-2.3.10.ebuild b/app-portage/repoman/repoman-2.3.10.ebuild
index 28da531cca6a..76890f067318 100644
--- a/app-portage/repoman/repoman-2.3.10.ebuild
+++ b/app-portage/repoman/repoman-2.3.10.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.11.ebuild b/app-portage/repoman/repoman-2.3.11.ebuild
index bdac6b87c709..a5c219e15621 100644
--- a/app-portage/repoman/repoman-2.3.11.ebuild
+++ b/app-portage/repoman/repoman-2.3.11.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index ac1c502610fd..be57c51e758c 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index 73a5fe8a8da3..e275dd9ce6dd 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,3 +1,5 @@
 DIST loksh-6.3.tar.gz 249493 BLAKE2B 1790b3c272d0ab3f0129ee199c46905850f87a9fc0815833d005ebedde53605701a8820e4ff40761e5742d4e4cac8969c9a4d7004a8fd995e6a4585f352790d7 SHA512 414d25c10096485bd1bb6574d0f91526f452ee0102924398aff0b1451128e5bf3d5d7344bcc746f574ad1acdefd39a92ee59d0b86b05f0c149418302c4d2d3fb
+DIST loksh-6.4.tar.gz 250475 BLAKE2B 061538766834038677019ca8f1ccd16c77245855f0d666ec5af78fc24995e74b22637ccb29d92d6c436c377d21c1a9449dcb79568ab5ccf7f141e8f0b6040d99 SHA512 74cce1428346820331fb8bce8acf275077b05a3c46081bce5c35e8e0d47704446bb93ce3e457dbf2e379d5d9656844b78c736b1190b2fe39ee92717863adb86c
 EBUILD loksh-6.3.ebuild 571 BLAKE2B ebc8e10dbe921469fd25be5e6e9cdce08e177110847b44e02fbcf277d5f68b64fd1606b729339d05334a1453a2a0ad878c98534a2365158bc2b7123393b254a0 SHA512 f4c6e7873703c70bc2111d6805c5e96a7dca046eab53435e7dea6ce9ee9d96abd60c69b70b1747e035e771b8bc1bb99375fc7c7fd2c6073c7f9fa68aad4f41d1
+EBUILD loksh-6.4.ebuild 608 BLAKE2B c8e27b05cd194c18726e558032cc39845e2eccc5699ad3305fa9f0b80c1050c961d53970d7edcba3da99b1e4f664ca0d3f0c7dd16820d244d3671a09121a9884 SHA512 f78deb3b21e539c2f87f7ee01993ff2baaecc23dae39c948ee17c1f83212aa0d855b9d7e2295f09767e99b3a2222aa7d2652b6cbbbe725488267a5fb73111ce2
 MISC metadata.xml 446 BLAKE2B 0a875fdcc5daa79b15353c9cabae32697f435edfd153759193cfca0fd17ca3c76f649b27cc32bae132a1270c99faad5ca91475ebb6a51f0bd04eba6cd95373a0 SHA512 4e987382f9f5fab554e34afdf016fa59550f64831b8dbfeecc30029a6e0eacf42d14e22117c47bb183abf584ba549d24e3d8dac7e0101e78e2e30ef7a9020069
diff --git a/app-shells/loksh/loksh-6.4.ebuild b/app-shells/loksh/loksh-6.4.ebuild
new file mode 100644
index 000000000000..24cedba7c6b3
--- /dev/null
+++ b/app-shells/loksh/loksh-6.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux port of OpenBSD's ksh"
+HOMEPAGE="https://github.com/dimkr/loksh"
+SRC_URI="https://github.com/dimkr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}
+	!app-shells/ksh"
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install() {
+	emake \
+		BIN_DIR="${EROOT}/bin" \
+		DESTDIR="${D}" \
+		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" \
+		install
+
+	dodoc NOTES
+}
diff --git a/app-shells/posh/Manifest b/app-shells/posh/Manifest
index e89787da33fa..74a871f12405 100644
--- a/app-shells/posh/Manifest
+++ b/app-shells/posh/Manifest
@@ -1,3 +1,5 @@
 DIST posh_0.13.1.tar.xz 267436 BLAKE2B f534f64595eda7649a146555238309aba00ec79d53206b17c91ba9ed44ab47794541952af670c5040133d164167e8f2bc844fc4b3b646035e0d08e8495d7aedf SHA512 957fc2924ab8f634007db2e15ecdbb8a1c60ffb4917c127c1583c05e222f598a564906cc40c869c95d79995ea85af24010780e7d36d44a5907a691aa9044f23a
+DIST posh_0.13.2.tar.xz 267492 BLAKE2B 44a06528825485ac1c5d899e9b625785ec733fee945241dc0708e51e1f2145a31aae04023477f6b3abb8053ab42714d2ceac6b5a1d776780ea2ab78ca1fd44d5 SHA512 1d0de10e47e66cb654a47c18bb7f8b5361eff2d99e6c0b215ed9a1052134b534276ed58feafd53fe0ee2fbc3e048dc9cf747752568fb361ea47700e02a3478f0
 EBUILD posh-0.13.1.ebuild 594 BLAKE2B 3597877c2471425d0726b7d81f66f86c567cff15e11ab6e37023035392c9fecd3ae26263a1062dac89a0ff8a0d1da3c3bf0a33ace40deaeb8774787e84d24526 SHA512 6046007613ec2fc0a8e61f6fe4e97012a34e9cbbb512b2d5009f658913147ae23e4b43c8311fa35d7f81f26a1606b226f2603ba3454a79bb1cadee08d33d2f0c
+EBUILD posh-0.13.2.ebuild 487 BLAKE2B e3176a89e06c2d472d2daa40b7ad9c36d0af3a2eb0c4a6a0b5aa614fa982032ab1eb969653ec3b7259b0c7aeb5876cacd3c64c752b64a6072b2ee4e14f2deb3e SHA512 607897e031b413035ed3ca1b4e6b76f2eebf6a13921aa577ebabd06456015be1ece45e71e8670c5f2f2c0d27a99a0f612c96ab36712866ba5bc2a18cbc3985d8
 MISC metadata.xml 217 BLAKE2B 2c342b84369a3ba13606f35f163ee0aab11a086c23c83066fb5fd7d0ffcac5282b2cbb228982745c8ae1c1575b7d1605556f3562175ee150de6c701d86e347c8 SHA512 94cad0e7f10d53a2ee488ff9be4c417377f7cc6fed1ea4bad878364978cdbeb648974764477a18d2b222ad9111082ef0e00b14832ec7318646a47b56c58c828e
diff --git a/app-shells/posh/posh-0.13.2.ebuild b/app-shells/posh/posh-0.13.2.ebuild
new file mode 100644
index 000000000000..5eb687e80303
--- /dev/null
+++ b/app-shells/posh/posh-0.13.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
+HOMEPAGE="https://salsa.debian.org/clint/posh"
+SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+ BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+
+src_configure() {
+	local myconf=(
+		--exec-prefix="${EPREFIX:-/}"
+	)
+	econf "${myconf[@]}"
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 98346f3cd2a3..72adbba85764 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 57cdc61a14f6..43b6b4ab2da5 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,9 +1,3 @@
-DIST discount-2.1.8a.tar.bz2 85161 BLAKE2B 15b2f3e935115e6b9f2c4ba1c11b1d6ea6f32123bd11c1e13dcab7fd9badac9a4f7d671c0cf04a6dd9564e40fbd6970f26c473c188444db75e0ee6b91a1ed1bc SHA512 a1eba7076a27da56136b8057189c5474a36bf11f8233cbae270c8a0cf9b070332b4dcdbbbecfbfbe1d8c19961ccaf87cee27ebe855c6bc6558d8ccc423553c96
-DIST discount-2.2.2.tar.bz2 89288 BLAKE2B 43950b3000f4d6e30603562694e965518be10107e534f48592f7f2d62959778244193fe5ab788f7f697bb099bb1ac940948ec92dabde1219a69bbe380eb5f66a SHA512 67d882c0a334592230332815c543458b3c916a950bf7983f8a468fbc9f61154b4023d4bf451b76639fcb3a076506b48118f192a8e21f2535b3f49c7f081bbdf3
-DIST discount-2.2.3a.tar.bz2 98325 BLAKE2B b566a6f4d5a1f3481a0a665f7820508784b2ce6ec60d0b4ff833bed46c01a9a6bf6a697fc528bcddd37232246982e861a89733bf6654cedecc95a09def729463 SHA512 cf995a46879f269f3e02f7d480303d229676bb36f71fe045d3a8eab7306fca9cce98496611b9fb9e0a14a9cf46ee66bd239dd9c946dff54ae09277fd66459c1f
 DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf
-EBUILD discount-2.1.8a-r1.ebuild 2429 BLAKE2B 505a9c2e3d1ce65860a082d28564a9163cf8fa9edd9b9fbdade27e5a0c15bd66eab611296355f70623504636355f25ba83e997b05dfaa24667a26fc87742513e SHA512 065784f0effb3c1c24ba3b7897022480c956aa07a1288e047fb5e1a2fb51a347a7950f5ea09b4af2ef01222021297b4a8744fac70d07532651af978aebfe6118
-EBUILD discount-2.2.2.ebuild 1790 BLAKE2B fad3324fbb2c6894382d61f0bc36fdc2c058bacafebecb0c3f5e8b4383a8cb26258c2f31bf4ff4d22278bb1b6fe895ff3962214f18175b0adcfab3f71081a58c SHA512 a69861b85f1f2b30dfcbb08892ee4daa00fd4792536a9b90ff43e067d22f8f2716502d51e234e698eb09f4aa472bb68fb648083bfa1406abc29eba2f3239e989
-EBUILD discount-2.2.3a.ebuild 1796 BLAKE2B 537be30783469388cb353298bca0117956ad4916f7a613dbcf4d7466fea55e254cefeaf2abfe997715a267775f3d33f318389129997d474695d4ac58115312ae SHA512 be991bd13812130598e4231c5ca5ffdbe59a19baabf926f86adf571361e09f6d2e8da19690fb9b4b94315e7c997072ae31d6aa00f47cdcd7d8c7a13047d53f8b
-EBUILD discount-2.2.4.ebuild 1787 BLAKE2B 828913834a04e586de8b6dcb1db76c5668ab361b7cce88038e523a5d734aaa6c5aa811a99e7b2beb97c57e9fa438f03693dada95cc02172c3c57ced451c109b2 SHA512 d4465bcf671e5c77c14744b8350f93f842df12dcfdedbb71785fc5b879d142491095565092d4cd8a12e18f0ee3de537ac6c269993ee81cfc920d57c78a9d050a
+EBUILD discount-2.2.4.ebuild 1786 BLAKE2B af0d591a776ea4617cd108bf59b3b8f9c5c1466bfcde3aea81b05df6286dad36337329216ac32cf2814395a4211d4482ec29db38d5bc4d2fad2601dd2814f26d SHA512 279a7deb814cf1b15238f01aba1cbffd1078f051f60748f81f8f90c082b66b96cf58357388138c60cc77f920dccda31d32946b5ab353b69646a84c36e41da775
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/discount/discount-2.1.8a-r1.ebuild b/app-text/discount/discount-2.1.8a-r1.ebuild
deleted file mode 100644
index f913f6fad1fc..000000000000
--- a/app-text/discount/discount-2.1.8a-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="An implementation of John Gruber's Markdown text to html language written in C"
-HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="minimal"
-
-src_prepare() {
-	# for QA, we remove the Makefile’s usage of install -s.
-	# Drop ldconfig invocation.
-	# Force “librarian.sh� to respect LDFLAGS ($FLAGS should have CFLAGS
-	# at that point).
-	sed -i \
-		-e '/INSTALL_PROGRAM/s,-s ,,' \
-		-e 's/\(LDCONFIG=\).*/\1:/' \
-		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
-		configure.inc || die "sed configure.inc failed"
-
-	# Add LDFLAGS and CPPFLAGS hackily.
-	sed -i \
-		-e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \
-		-e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \
-		Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS"
-}
-
-src_configure() {
-	# How econf() handles quoted whitespace. This should go away next
-	# release of discount.
-	eval "local -a DISCOUNT_EXTRA_CONFIGURE_SH=(${DISCOUNT_EXTRA_CONFIGURE_SH})"
-
-	local configure_call=(
-		./configure.sh
-		--libdir="${EPREFIX}"usr/"$(get_libdir)"
-		--prefix="${EPREFIX}"usr
-		--mandir="${EPREFIX}"usr/share/man
-		--shared
-		$(usex minimal '' --enable-all-features)
-		# Because a lot of discount features are exposed through
-		# ./configure.sh flags that, in the future, won’t be, I will
-		# respect DISCOUNT_EXTRA_CONFIGURE_SH as a workaround pending
-		# upstream https://github.com/Orc/discount/issues/124 for bug
-		# #554520.
-		"${DISCOUNT_EXTRA_CONFIGURE_SH[@]}"
-		# Enable deterministic HTML generation behavior. Otherwise, will
-		# actually call rand() as parse of its serialization code…
-		--debian-glitch
-	)
-	einfo "Running ${configure_call[@]} || die"
-	"${configure_call[@]}" || die
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(usex minimal install install.everything) \
-		SAMPLE_PFX="${PN}-"
-}
-
-pkg_postinst() {
-	if ! use minimal; then
-		elog "Sample binaries with overly-generic names have been"
-		elog "prefixed with \"${PN}-\". Please see"
-		elog "https://github.com/Orc/discount/issues/81 for discussion."
-	fi
-	# This should also go away after 2.1.8a…
-	elog "To configure advanced options, use DISCOUNT_EXTRA_CONFIGURE_SH"
-	elog "and see https://bugs.gentoo.org/554520."
-}
diff --git a/app-text/discount/discount-2.2.2.ebuild b/app-text/discount/discount-2.2.2.ebuild
deleted file mode 100644
index bb4f809a591c..000000000000
--- a/app-text/discount/discount-2.2.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Markdown-to HTML translator written in C"
-HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="minimal test"
-
-src_prepare() {
-	default
-
-	# for QA, we remove the Makefile’s usage of install -s.
-	# Drop ldconfig invocation.
-	# Force “librarian.sh� to respect LDFLAGS ($FLAGS should have CFLAGS
-	# at that point).
-	sed -i \
-		-e '/INSTALL_PROGRAM/s,-s ,,' \
-		-e 's/\(LDCONFIG=\).*/\1:/' \
-		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
-		configure.inc || die "sed configure.inc failed"
-
-	# Add LDFLAGS and CPPFLAGS hackily.
-	sed -i \
-		-e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \
-		-e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \
-		Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS"
-}
-
-src_configure() {
-	local configure_call=(
-		./configure.sh
-		--libdir="${EPREFIX}"usr/"$(get_libdir)"
-		--prefix="${EPREFIX}"usr
-		--mandir="${EPREFIX}"usr/share/man
-		--shared
-		--pkg-config
-		$(usex minimal '' --enable-all-features)
-		# Enable deterministic HTML generation behavior. Otherwise, will
-		# actually call rand() as part of its serialization code...
-		--debian-glitch
-	)
-	einfo "Running ${configure_call[@]}"
-	CC="$(tc-getCC)" \
-	"${configure_call[@]}" || die
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(usex minimal install install.everything) \
-		SAMPLE_PFX="${PN}-"
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins libmarkdown.pc
-}
-
-pkg_postinst() {
-	if ! use minimal; then
-		elog 'Sample binaries with overly-generic names have been'
-		elog "prefixed with \"${PN}-\"."
-	fi
-}
diff --git a/app-text/discount/discount-2.2.3a.ebuild b/app-text/discount/discount-2.2.3a.ebuild
deleted file mode 100644
index 8aa88de24c65..000000000000
--- a/app-text/discount/discount-2.2.3a.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Markdown-to HTML translator written in C"
-HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="minimal test"
-
-src_prepare() {
-	default
-
-	# for QA, we remove the Makefile’s usage of install -s.
-	# Drop ldconfig invocation.
-	# Force “librarian.sh� to respect LDFLAGS ($FLAGS should have CFLAGS
-	# at that point).
-	sed -i \
-		-e '/INSTALL_PROGRAM/s,\$_strip ,,' \
-		-e 's/\(LDCONFIG=\).*/\1:/' \
-		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
-		configure.inc || die "sed configure.inc failed"
-
-	# Add LDFLAGS and CPPFLAGS hackily.
-	sed -i \
-		-e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \
-		-e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \
-		Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS"
-}
-
-src_configure() {
-	local configure_call=(
-		./configure.sh
-		--libdir="${EPREFIX}"usr/"$(get_libdir)"
-		--prefix="${EPREFIX}"usr
-		--mandir="${EPREFIX}"usr/share/man
-		--shared
-		--pkg-config
-		$(usex minimal '' --enable-all-features)
-		# Enable deterministic HTML generation behavior. Otherwise, will
-		# actually call rand() as part of its serialization code...
-		--debian-glitch
-	)
-	einfo "Running ${configure_call[@]}"
-	CC="$(tc-getCC)" \
-	"${configure_call[@]}" || die
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(usex minimal install install.everything) \
-		SAMPLE_PFX="${PN}-"
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins libmarkdown.pc
-}
-
-pkg_postinst() {
-	if ! use minimal; then
-		elog 'Sample binaries with overly-generic names have been'
-		elog "prefixed with \"${PN}-\"."
-	fi
-}
diff --git a/app-text/discount/discount-2.2.4.ebuild b/app-text/discount/discount-2.2.4.ebuild
index 1486b3455681..7119e482913b 100644
--- a/app-text/discount/discount-2.2.4.ebuild
+++ b/app-text/discount/discount-2.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
 IUSE="minimal test"
 
 src_prepare() {
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 87b727f9b584..9b702f421d83 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -21,5 +21,5 @@ EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1000 BLAKE2B dbb46cff1a33f8f0770588c18cf08
 EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1015 BLAKE2B 1dd036ea95d19b8bdbc825c4bf60b30dbd26ddcb97c4cecd020ccbdbb57294d5841882ef39dca414bab1e33533d390dd8ba0aee4f663c0bf35e0c5e7b9048c32 SHA512 8ddd813944172d0f8a858029292d7b22318e6795b1338f07057472e7042912c0c642d18876caabdf0d83aceb60c1852256bd36249741616510fbbb9abe69eaec
 EBUILD docbook-sgml-dtd-4.3-r2.ebuild 996 BLAKE2B 0368e87e3debadf66d48791a0e5044dbf6b047aa7461ac2ef190e7df56e619ecaddf16942d34570fff853b358ad030d67ba195793e79c061016e2834bab2185c SHA512 a1b777d1620c54fc30fa1d8ba1bfbded15eeebdc6a5289b8c15b7bf91577e4809db10bedc5929d1ea134a94d398929d9241b989e146012ad12b8564d84b10217
 EBUILD docbook-sgml-dtd-4.4.ebuild 1006 BLAKE2B 895942f94fb5e43c0cec90080720378b675751ea55657c759a372642f960c9e58d8427d4d8270aa8624b25847cd7556320bf0f754b81b6e3501d6ee6746607b9 SHA512 bb0b2a4b95c8b9ef77bdafb2e9129415de1be53fcbff278811049964eb9e5ab6674fd7083edd1dd502ffac560b27ee4a4d0238cfac8901c04e3f0b34a5c8894f
-EBUILD docbook-sgml-dtd-4.5.ebuild 1005 BLAKE2B 6aed4a3c42c3fb5c1f10eb727fc6742f8330000ed2d0be8da72690b8d35d6421ccc23a8f04ca479d509fd393491f9e524e91cfe8df0ed5d61652e82b2f54c76c SHA512 3c8be641d48208d311b4c7033fefa4d278a1a4f7bc446e9282819c22eb731cd9cd2f61cbd829c1a9c6aee3d8788deef7d7c0cb44735006e680aebb58f766745d
+EBUILD docbook-sgml-dtd-4.5.ebuild 1000 BLAKE2B 65ebfa392ba196b29f3156b40fea1825d1cb8a89ad49070ecd24af54dd7b9591d1dd0390f0918c279ea88184ad4e511e2470c328181da11ad2f4108dc4e85a9d SHA512 24e1845ac7278cb9602d8cd992413396a83b03097187d1d1ba519a43e368c3c3529acdb6e8d2f25b8fdfc076f656b50c90c22cdf9d46f299c817116ed8cbcabc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
index 67de063dc7f8..e642c2099ac0 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 9a1398278489..6777adf6220a 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -6,6 +6,7 @@ DIST dvisvgm-2.3.5.tar.gz 2897194 BLAKE2B 7661d6f5ac097a6dc62cf873dee84ec47b55e4
 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
+DIST dvisvgm-2.6.1.tar.gz 2911596 BLAKE2B 8dfe85140db4b462c1721a8bad322d52535a0fced4bb8c374c342bd4ca8fe5cf6dfa5751a8a8070b9ce622ab7bb7df14985802c596fdc387f90febc80151fbd6 SHA512 791183f92ec4733574614fd5b8b4247a7b766b62b1aa7b1444d508d0358178b1447b24fb51d09948d99552c2cb7ed3a0f9bce0416b66de8a4835f85476bbdb25
 DIST dvisvgm-2.6.tar.gz 2978741 BLAKE2B 342da9c26d05cf319053206d84e8c12ec3f3984b515f8fa6483a1ce5bf1748477f1119e8e03847a28c6458ba25229fd735a63122257450612fcc226a2e871441 SHA512 02fc3a92fe80d7146a1bc84eaa28fac714f533d9bcc3847993da978a66f533400c2c03019bb5efb3c16fcbf6774c565b1f6149cd15f4e04ae05304f879392b05
 EBUILD dvisvgm-1.10.ebuild 1090 BLAKE2B b4c79de3986a2fba7881da8c2434f1678d7b367f8b13dea7bf7421dcf68f6250681562754100a081b42c9b7d9d3d02cbadc8e7658faf26b29b6c9d2c2a317843 SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc
 EBUILD dvisvgm-2.1.3.ebuild 1144 BLAKE2B 905c8dd91653845c82e4ab1065eb69961b5a3fb4d0e0cd61f0174f9185d5cc376ede38becab539a8a60182a1f94fcfa871b1598ce269144fe133ec23a498b9b9 SHA512 d6e0f9fba9b8636e126ebf30c7eca4c14a9e31cb3e5e7bbc220a2f49c91e293e5cdaf23321be066dd38204e8abfa06d45a08577a78da589b28f1fccaf8fd8bea
@@ -14,6 +15,7 @@ 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 1216 BLAKE2B 4e39f999bf7a1c234c9f5e0e6ec0a37518b3003406fa4c78ce237bb38340c706ae41d4c246d1e29662f6df6a3309b583dd11d4e2e6086ae35cf5f754ebe7dce9 SHA512 4f767d7594f0f2985c8c5be50981c6719ef8b01266dc95f8aebed2d355153890318015fa5a5f3f278603015bead0fb28f929bee0e2aa38ce41c2b90cc40d5063
-EBUILD dvisvgm-2.6.ebuild 1216 BLAKE2B 4e39f999bf7a1c234c9f5e0e6ec0a37518b3003406fa4c78ce237bb38340c706ae41d4c246d1e29662f6df6a3309b583dd11d4e2e6086ae35cf5f754ebe7dce9 SHA512 4f767d7594f0f2985c8c5be50981c6719ef8b01266dc95f8aebed2d355153890318015fa5a5f3f278603015bead0fb28f929bee0e2aa38ce41c2b90cc40d5063
+EBUILD dvisvgm-2.5.ebuild 1220 BLAKE2B e5b91caafe503225573fde1ee223a87e011d7a7a7dcf22bbd057582384ed5acda31f9397d6423ef246049c830fca5a4c812d1dd9e6ae53b1225879e8a063c86d SHA512 2ff610011845f72035ae13c22fa306cc3bc9eb1f5a6d78def02729b9e1e8528c7bb5882af056b7f0798527b09fa47c2e04353b95e0ee0e121a72002ea93337ca
+EBUILD dvisvgm-2.6.1.ebuild 1220 BLAKE2B e5b91caafe503225573fde1ee223a87e011d7a7a7dcf22bbd057582384ed5acda31f9397d6423ef246049c830fca5a4c812d1dd9e6ae53b1225879e8a063c86d SHA512 2ff610011845f72035ae13c22fa306cc3bc9eb1f5a6d78def02729b9e1e8528c7bb5882af056b7f0798527b09fa47c2e04353b95e0ee0e121a72002ea93337ca
+EBUILD dvisvgm-2.6.ebuild 1220 BLAKE2B e5b91caafe503225573fde1ee223a87e011d7a7a7dcf22bbd057582384ed5acda31f9397d6423ef246049c830fca5a4c812d1dd9e6ae53b1225879e8a063c86d SHA512 2ff610011845f72035ae13c22fa306cc3bc9eb1f5a6d78def02729b9e1e8528c7bb5882af056b7f0798527b09fa47c2e04353b95e0ee0e121a72002ea93337ca
 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
index aacbe77eab61..86e6574e6539 100644
--- a/app-text/dvisvgm/dvisvgm-2.5.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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.
diff --git a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
new file mode 100644
index 000000000000..86e6574e6539
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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/dvisvgm/dvisvgm-2.6.ebuild b/app-text/dvisvgm/dvisvgm-2.6.ebuild
index aacbe77eab61..86e6574e6539 100644
--- a/app-text/dvisvgm/dvisvgm-2.6.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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.
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 5e6b60a511e5..ad04777a23f4 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -3,5 +3,5 @@ DIST ghostscript-9.25.tar.xz 33027708 BLAKE2B 7c6684898ef04bc5b6be8fec86adbf7b27
 DIST ghostscript-gpl-9.21-patchset-1.tar.xz 6196 BLAKE2B d2bccba582873d29c1724469af66a5aa72755d6ff73bbdadbf33e5eb4a2027c2cf14415319c3c3c6d03a9fbd9bad43e3bf7ef57eb7a3361305f6efb7fa550675 SHA512 58fef7080ca17a238231fb528be48f52bcfa771b1e496d7fede6df45fb927f1bb1c755cb77e02aa739295b0ccf0b3d3959f9a05a1628d32ffd11e134c0e0d355
 DIST ghostscript-gpl-9.25-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 EBUILD ghostscript-gpl-9.21.ebuild 5550 BLAKE2B 12dcddca96c1105b887ef804a1d7f6c6d5826691ee6e8ba525be77e65da82fa6f9910612ce84387ce9212c8ffffd3dacf4f10829256534582d7fb0bd09fc7cfb SHA512 b60cc50269906af827142897afb056d88a67e3ee10387d77a6b0b75d351bfb6239df41f9baa4e99d3d4f28ba38ea8849a282a0fc75e7aba25f2f707eee29f969
-EBUILD ghostscript-gpl-9.25.ebuild 5550 BLAKE2B e5ef67938e22007f726872a040c949866416d15f02de27def771ce5b2cae21745b4650fad0ebba99ebe48784aa5d9216b4cb2fcbeb2b1f5aff87fd04a0088bb0 SHA512 935f4f89f3805603315b5a0e7dae63c2286bf368fa1a0f4ed953e9452ef5ff6b32a54b28ee0f1b53fb2abc9a732e10b4b5027ed53035bce62a31cfb7f48622f9
+EBUILD ghostscript-gpl-9.25.ebuild 5549 BLAKE2B 0eb5122ecd40afc265fa4b3f4f462e785c3c3801e0c8bb0a4486fc78dacb790b44424a0a19a3c62a61944985eafc073ee1ac4ab866676f47158d6fc22dba9ff1 SHA512 07b2951651ced47cfa086db3913ea876751c464ff819e3e53ca019e88fa1296bb059e717418901c2016b943d42b8fc512853f392681bf0fc71a16b3c869b5266
 MISC metadata.xml 516 BLAKE2B 6afad0e1422537a40a445465a9ae3b974d40e45b177cced532a8b1cee0163cc8af68e1d0f8c79212876e8439a0c3826892d6d639fdcfdf4fcf7d4e22116e837b SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
index 78d7519966a5..645d8c76ef32 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
 
 COMMON_DEPEND="
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index 7e41b92a9fa8..03caca873f1d 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -8,4 +8,4 @@ EBUILD groonga-5.0.3.ebuild 2418 BLAKE2B 03e1f4e2e34961339ac0df2568733b5c5bbdb42
 EBUILD groonga-5.0.9.ebuild 2418 BLAKE2B 03e1f4e2e34961339ac0df2568733b5c5bbdb4243037c9b32290d24873598fc2583a7c1419d11440719f45a02b27d611de89e93ddefc18dd28f8af8d5090b17b SHA512 52c3e67423eb88c7626b9b831c2058af4eeda069589b9ff315350c57eb8e4c151bbfaff5702c6c474204a5699ef2548932d389bf75edffb94b286c7a18d7f0f1
 EBUILD groonga-6.1.2.ebuild 2447 BLAKE2B 0a21cc6f5012eeb06d3af52610a8ecd97731cae2ac7d66d81c4654af903033e37c2f5cea164db2e7224f5d8a1958a47824dcbc1e277c5f8e0bf7d8a101929300 SHA512 0770d4c27bee71d3fad3caf42b10ca0da006a1d20861c154e8f8b14edb19fb9f8e619b5f6b905a59eba8d3c17d982ec9b628b6d561b638df28da8fd3a9d48189
 EBUILD groonga-8.0.2.ebuild 2667 BLAKE2B a2f9ff65cf47440bbc8b28c7926b29cda03dc0b54acb82bb0c5492719513e1b529fb888b0ef943ac4f08c62890e5dc12da52a565304931e2fd76bcca7d2bc359 SHA512 5b298d025e26449d21877b3132f4a3886f9db42853a5ab53075b875b9fec91117e9f731519773d54a573e5e84625fdcebe7554700464e410d4f5191b6c930df4
-MISC metadata.xml 1382 BLAKE2B c6ba2a3a4ce9216fe21d22918ad7d332d769c031a85132e069874ab1e8ce6d66fdc7ddb225d31fb01001c7a6eb89f87da470c796cc8b2be8660098defb990749 SHA512 dd87cd905b0fb3f0c58805baf7c9be18de092c7c7375f79588f106bcab427ce28bc3376cd209e01dafec689a18e5bdcceb9ef6988ad123c66da2dd0a46bcb44b
+MISC metadata.xml 1292 BLAKE2B 1f51b23aa93ebc86d04c05039e2d938c2cd343f91d630ba8d3815175c905c9431d53a539eebeb9965acfb456f87be37e4500d725ac4b2eb505eaaad5ebd49214 SHA512 5f6d4480b7425d5dd9172e01dbd435a7f5645e04de2956ad20672fca8b056a5d83551b3871c1ac07c52cda6f03373ff195502392a3d5b1d2c59452cccbaeba95
diff --git a/app-text/groonga/metadata.xml b/app-text/groonga/metadata.xml
index 3bf71ce09a19..6c69341e576b 100644
--- a/app-text/groonga/metadata.xml
+++ b/app-text/groonga/metadata.xml
@@ -11,7 +11,6 @@
    <flag name="exact-alloc-count">Atomic counting for memory alloc count</flag>
    <flag name="fmalloc">Make memory allocation failed in specified condition for debug</flag>
    <flag name="futex">Use futex</flag>
-   <flag name="jemalloc">Enable <pkg>dev-libs/jemalloc</pkg> for memory management</flag>
    <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> used for suggestion</flag>
    <flag name="mecab">Use <pkg>app-text/mecab</pkg> for morphological analysis</flag>
    <flag name="msgpack">Enable <pkg>dev-libs/msgpack</pkg> used for suggestion</flag>
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 929605561a04..07cbe125d07c 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -4,5 +4,6 @@ DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c32
 DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
 DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
 EBUILD html2text-1.3.2a-r1.ebuild 994 BLAKE2B a6ecf556040564c64bba93dc0dd4d9fcf5060df5a6b9a487ea91f4b2b1fac6da4f4783910a86a98cc2e2c02c9f2ee19bc7ab9f7e40d0441f56c07f28b2979a45 SHA512 94ad8a3df67dc20c080bab7a5eabe3ed2f38c39df6f454f6425b0033774b5aa0f393afe16d69e01f499ee69c2f31316a979cc0326e19737550d5bfa57603e0fb
+EBUILD html2text-1.3.2a-r2.ebuild 974 BLAKE2B 2e2c23b127324b054e57c6d4927c43b39baf04fa977329f5b5a9f168f242d5ced6e2db251b6429d1aa4c020dcb29d6d0730606b21c711ab9909cd633d3f5aee3 SHA512 723302d8745c83cf48c1dc8406d4b6bf575b975164b3123ac2b40d5e882ccf7449709229975dc4bac23da0860ef86283749f4ac89be5ef68e30f5d344fbe12b5
 EBUILD html2text-1.3.2a.ebuild 933 BLAKE2B 79617efc95c443681009563030126da8aadc589ae081b7162a700622367647112fae06271797923f0de4ed462aa4b89d17f2ab36084dae3edfbf67784cdb0797 SHA512 ab234c98f3998db61cb17dad4fc72dbfa184a93511d7a4482bee1dd0f1a350ef59645b5ffbd427fb0d4107135d19a95cb3cf8e36760377309e63076a56158e4a
 MISC metadata.xml 373 BLAKE2B a4ea5de91e4a5f5a7653f4c9d86262c999e72c69863f0185700bd4fab6c27cf87d3e392aa013dd4b60a84b1ea0ddc42d811c4131c8db3ba427df86df7fa4abb8 SHA512 ae24dd6abb85c0abb4085f15c9c140d2dc3bb0c201ee22f1762e1eadc37899e8b5aa5cb794f9cd12bc26857195c9b9ba8cfa46d05628cdf765ddfc0639dd6bd4
diff --git a/app-text/html2text/html2text-1.3.2a-r2.ebuild b/app-text/html2text/html2text-1.3.2a-r2.ebuild
new file mode 100644
index 000000000000..f96c4819e230
--- /dev/null
+++ b/app-text/html2text/html2text-1.3.2a-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="HTML to text converter"
+HOMEPAGE="http://www.mbayer.de/html2text/"
+SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
+	http://www.mbayer.de/html2text/downloads/patch-utf8-${P}.diff
+	http://www.mbayer.de/html2text/downloads/patch-amd64-${P}.diff
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+PATCHES=(
+	"${FILESDIR}/${P}-compiler.patch"
+	"${FILESDIR}/${P}-urlistream-get.patch"
+	"${DISTDIR}/patch-utf8-${P}.diff"
+	"${DISTDIR}/patch-amd64-${P}.diff"
+)
+
+src_prepare() {
+	default
+	gunzip html2text.1.gz html2textrc.5.gz || die
+	tc-export CXX
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin html2text
+	doman html2text.1 html2textrc.5
+	dodoc CHANGES CREDITS KNOWN_BUGS README TODO
+}
diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
index 26c2ba9332e4..fc90f82e44c0 100644
--- a/app-text/htp/Manifest
+++ b/app-text/htp/Manifest
@@ -1,4 +1,6 @@
 AUX strip.patch 261 BLAKE2B 760a04284f2b79e942fbee21d7b075d41c047f8f7f5eca563f6754e4a9fec1c372986dbcc965f2a1009ac26f8347868f7c0cb4bb767ac98c3be8b2895c49677f SHA512 2f2a9afb828e9de08fa97ca2798a0d2dc6f65cbf192cbc749c3790ed542f75c49c5fbb4644fb8017f93dc24a42c584914d5659841a211c1fe74a3aa43be633e4
 DIST htp-1.16.tar.gz 141133 BLAKE2B 58f0ab7df1400d561ec1994a98ce4fa3acaa3299b51d9382f9baaecbd95a623795d72204617c153fd4e165910fdabd0328e737cccb242be2075edd2573af55c1 SHA512 f33a9497fc3a1d0b95d8e3ee2747583d58626b565644e7c8cc054570458907aac9db42c6fa816b176b0e10db98ec7d1cedb521406035a8e7173e1abd991533a0
+DIST htp-1.19.tar.gz 208683 BLAKE2B 86837290a2f14b8a0337d9eb6a0fa4ad553c5c51074d5df903ee19aa7ba441898199f0649b39b93c35fa3707e4084a284e02d8802c014bf5c0277e3f18d02c98 SHA512 32d82bb42ef877bd815fe45fa81599a1428ad6d3269cbe53a4e686bcfe6d1c12ac2af280462768d488b1983ca67cc521da4ed78cc82d904575ffeff08c7eec1d
 EBUILD htp-1.16-r1.ebuild 1254 BLAKE2B a2c8cce1c8d85d069dfc094dea5e60be6ad9adce7e31c5d692fcfec411a3bc1b0f79967a14f7b5f0682abcfa3998bf4cbde25f8572292f998a1d42c499eb8703 SHA512 0217b514defbe8cbf8bfee84c53287a3bd93b1841b4ae3c2bbd8927833174321c77e4b67c26d0587cfc0d855e76497af42cf04b179eb39a0cd2a218042a3b897
+EBUILD htp-1.19.ebuild 698 BLAKE2B 943bad8608f7c0eb9677747b2a68838204c4c8d0a1137eba07f8a7c8844dc16e99b215745b707d8df7e94616fc08b8802d625bdbf25cf18c176dde59dfdb69b7 SHA512 d7f085bbdc08fb1b1a0afaf076c1593bd4ad96d2ee26e65c98f958cd01fa1112074d2654a39ea3f47e12d787a33dfd1585fa24edad65ec0db0a9a0880535cdab
 MISC metadata.xml 323 BLAKE2B 815632fb1a839f62a7e2201270b77e1cb16955e5bcc978bebd09d0501eb2df6f56bf20a8ed6a7c2ed6d7a5fcb5d0900a06c38f22dc649c731ada0d36478f3aa1 SHA512 f5c0a7720bd23aa0c604e0ffa07e2925afe69f9af09c9364818e16197fdf55c1decac5839234cdb08e483be1bfb4d0a88279e57c2b48c0002d3de27e90616f26
diff --git a/app-text/htp/htp-1.19.ebuild b/app-text/htp/htp-1.19.ebuild
new file mode 100644
index 000000000000..962eb9f37525
--- /dev/null
+++ b/app-text/htp/htp-1.19.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An HTML preprocessor"
+HOMEPAGE="http://htp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RESTRICT="test"
+
+QA_PRESTRIPPED="/usr/bin/htp"
+
+src_compile() {
+	emake \
+		CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
+		CC="$(tc-getCC)" \
+		LINK='$(CC) $(LDFLAGS)'
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix='$(DESTDIR)/usr' \
+		pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
+		install
+}
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index a17616d27127..05ff8fd500fc 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,3 +1,5 @@
+DIST libnumbertext-1.0.5.tar.xz 281640 BLAKE2B 5480c72fed80a9d4825b37a876efa8588c8efb187ee5a65629ac800d98a2882312f443736f4c967ee0ae2fc32a0dbe758b1c275378d807df3d1da4cee6dff9bc SHA512 4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3
 DIST libnumbertext-1.0.tar.gz 408181 BLAKE2B ceeba0a98c0d6fbfa92ad37347f7b7cb9887ea516126e35212d61e572a382a56c520406409e08024d53f1520219ec7e986324893b1c2b53330a217319d35ffc7 SHA512 b30f3650ba8cbaa771415026f40b7fc2cf5d9cd956a365d6654b1e2996fe61f714adfda845432e41f61f0fa474b1b60d99cc46cd6b7e42e1dccfd53f5017ae63
+EBUILD libnumbertext-1.0.5.ebuild 518 BLAKE2B e809eebb2784f556d6c2123fad20031ea1438e2050df2e267ff882c1136379da0465ca803dd37c4077c761d8d98229238ee747a86746ba7955e67396a488dd87 SHA512 7c419d85bba72b10aa72143816b5dbb90ed0526a2a30194f24a56418529a62167658b80818b4200f48140822fa83f0fa84d460383422fd0336ebba6eaafb77c2
 EBUILD libnumbertext-1.0.ebuild 613 BLAKE2B fd5f9aaf06da104d4cc5da165b0ccfe10edc0f0768c93d9ebb646c774ecd173fe19d2788af71a98534c1c9381c5d24e22e3368defb78a9288b433ce0c5fa92da SHA512 2fb2bd3f82282b33c6d8513746c0ba9737447adf6c6704f625a3512d72f193ed31c829fc8f76dc9abe50bca84153f8a8f090e77118f91eec595c7b25c560308e
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.5.ebuild b/app-text/libnumbertext/libnumbertext-1.0.5.ebuild
new file mode 100644
index 000000000000..df23cdf0b8ea
--- /dev/null
+++ b/app-text/libnumbertext/libnumbertext-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Number to number name and money text conversion libraries"
+HOMEPAGE="https://github.com/Numbertext/libnumbertext"
+SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+src_configure() {
+	econf \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 9af4b14cbea7..a2372a77ee68 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -3,5 +3,5 @@ AUX libspectre-0.2.7-gs918.patch 1272 BLAKE2B 37f9b02992e622754c271d6c2d4921a3ee
 DIST libspectre-0.2.7.tar.gz 387947 BLAKE2B 1d8c5ce045e90cb10a159615d3b011dafd24fa07c8bbd79349663880d077b53944495cba7f5a77e8e32735123762d0f6fcd2feb382258b8d35107284f72243b8 SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794
 DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
 EBUILD libspectre-0.2.7.ebuild 1232 BLAKE2B d77eb5e11d74f44972efd3a04252e44a8b0d37734957ad7ecad6f847be51a78f37cf0617f49a62c77211ea1d3b03216ef1a725832c698c06e9fe5bacd0f6a4dd SHA512 b3e700400305328d680e5e1a62aa696990cdff6ac55e3fe5079549ffb3c53e30559ff69b5d05090c6929d4511d2c13a28b82ba50ab0adcc412546da52b7b4992
-EBUILD libspectre-0.2.8.ebuild 1104 BLAKE2B daf7b21d86d15067b412a9b7bc936d40bc7351035b5018619b02773f86eadc38ffca84bde5ac788606484b832bb26e94e07e363aab3d2ba16f9bacf2a8c3a16e SHA512 6cfd7ef0f0b0823378ffa9c85db2f65c64f16476ea0b93d82b0814ce1e732dac73acf568a624d6f499db37d0f0a0042b96db4e9465775898aac811292a3afbcb
+EBUILD libspectre-0.2.8.ebuild 1102 BLAKE2B 074b59cfcb28bf9fb73d9b593b3dc09d45bf6dee3e8f389cdd049074dd76f6b573b3978d051f7563f72500c86ec3d08bd1b5d4c774619294c21e457185e778fd SHA512 12ad49c7f4fceae639f8a4ec874e660fffb7fe92d33685dd7139159db7b0d1a163fa15df71ea768e223978118691aee1031abe20b321908d80f9391400e8a655
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/libspectre-0.2.8.ebuild b/app-text/libspectre/libspectre-0.2.8.ebuild
index df338f5da2da..3ece0e5cc846 100644
--- a/app-text/libspectre/libspectre-0.2.8.ebuild
+++ b/app-text/libspectre/libspectre-0.2.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 
 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 ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug doc static-libs"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.62"
diff --git a/app-text/lv/Manifest b/app-text/lv/Manifest
index 60db33d8bbb0..3221d01b8d7c 100644
--- a/app-text/lv/Manifest
+++ b/app-text/lv/Manifest
@@ -4,5 +4,5 @@ AUX lv-tinfo.patch 629 BLAKE2B 1923de4cb256d6752561f2489d1633a01987e4ad073bd28fc
 AUX lv-xz.patch 1415 BLAKE2B e4a9cbd5bb2ca71eb3c6eea8e132caf2f1bbfda84e8055654eac86948b7f0e57397af96beca2eeacf259f9258aafa5d03303a202ab5562236ba05f0adf22cfa7 SHA512 eb791a2e392070a01e372bbc6d0d4bc113fbb57394e50fb7a55e46ee4b0896177fdb1698db750b43e78b6aa120d0fef34ad4859fee5d4a1749c062a7afb6ec84
 DIST lv451.tar.gz 605082 BLAKE2B cbfdf1c4c90dc746de631e55e3d1e88335f22342991ca7d5bd4b3661803af4efc0c6dcd821ea58be6024fa7ce773ffaa0aa3844350b6f67dd61be09e2475cb70 SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810
 EBUILD lv-4.51-r3.ebuild 1067 BLAKE2B 22d15f031dc2edc33fd93e80e8bc9b596eb78cad3532307ba7bbe092f186f6cab722219441ff21aeb02a8aa8ac9b6c272951540e113440a9274af469a0dbbb5d SHA512 31a2d9bc82822582c2e68f746385b0e623a3aa05117f84c996023d4a9bfc575e281ebf7a15f71bc4d52b0297054b8e1bdb9e76202e911c7987aa388c8805fcec
-EBUILD lv-4.51-r4.ebuild 1010 BLAKE2B c2c90102b208760c5b3834746b4722cc5de3993715a6ca9ac464f20900b3080f282f4f6b5c0976a09ccee518df303831bdfc081e3d64d7d4f3bf77451adb0966 SHA512 b655b25cbc62ba0e582928ddbd1ef8f843d5e393b5daefb3e428ca6692ecfa579a6cd7fe97949d486de822ea56abcdb03c4a873846815a30dd501cf94571c293
+EBUILD lv-4.51-r4.ebuild 1007 BLAKE2B 51ee96a9678cd0e4c3b7b051d8f8ec43411258b08f398729bde0785454d29843fb4ea145ab336435b0f870ec8ad665063c1d67e078440a525b243b17354f543d SHA512 5860c40f73268d82f9ef8640d90d8827498d1cfea92a6ce8f338b8e84c4fb09747fd71feb3a22ecf260681bdc8080f443c40d238ab65aa5b2002885678826c1e
 MISC metadata.xml 358 BLAKE2B 56858cc481cec55add44dce0a02d0955fa787248b0a6861914fc450957d9b18ae256a698613d94479aca810cae4c264e0a91bf3ff89b52183c4945ce32a5dec5 SHA512 7b250d5ddc092d7ecd4e6f48175e1f57f1671af4f8529368f368071b777fd773e363e83bcd3cfee3c9352ee93c9c0bc205f940c4cb6601dac3164ad34766e6a1
diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
index 722c56da9cf5..8cc8939a23b3 100644
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ b/app-text/lv/lv-4.51-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="!app-editors/levee
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index c455fb9340d9..9bdd48303898 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -3,9 +3,14 @@ AUX mupdf-1.11-drop-libmupdfthird.patch 579 BLAKE2B a0a1ee93832135663c14a91bb181
 AUX mupdf-1.12-CFLAGS.patch 276 BLAKE2B 20a2440cbd5a8b2cbd17204939d876c8e6df3329c54ad477257ce875a9a5483e859be58cc2b4c6b93f7491aa1cbf4ae1444e8c43af161076feefbd570412b09c SHA512 834481f055df4ca8edc2991acade0295e753d72d1f973e4250ce25f81d33ea08bc4c5fafcef203efe686abd313b78512a36b2ce7c4b5b835206136793ab0e9d7
 AUX mupdf-1.13-libressl.patch 883 BLAKE2B ab4c59b95f035686b39906fc7a25bc92fa034857bbac30c4f27b97a6ed98e86fa3a39f907c663779d652e7f02e04faf8261c23f045c14f1fe4a835db16232255 SHA512 f1e189d07ac87819541938312efbc11cc4cfb90a35f6cea4a143a9a624b6e361b7dbca254a4de5522eda93d3e465fc11e0536065d9af02c6681be8ac14c6525c
 AUX mupdf-1.13-openssl-curl-x11.patch 1184 BLAKE2B 27428b976a8f3854f16968fa5b70d0c4df0fb24508bea3c214fd5a0e46b3c43129ab0953ff20f55b23080de54ae6c5760f7eb97b53195794350a832219449acc SHA512 46f28dc5b23831c7125e42224acf16fc4a6cb90a03f719d2bd423d92e22280689bd3d7dc634d123050c2762333062916712cc951634ec5e5a7d2d4fcef7ebabf
+AUX mupdf-1.14-CFLAGS.patch 395 BLAKE2B cc841dc186ac09892789664395bf632a33af3fd1e979e6f23809be0de74181004714b7352d52f3e4414147fe565e73ae9a6fe6b35a6674445e88a3d67ef640c8 SHA512 a5029fca7665e417f16062dcad22e084d6d99cd9ff9a6f1ad853d3ba182c8f565c75469d77edda521f7e777e14a55d4126ddd7631e70290c340d9c7411974c47
+AUX mupdf-1.14-Makefile.patch 1294 BLAKE2B 228ab49a5814e24b0fb1995c5137ce513a303f495973699a370a13a2af17e436ad67ecb47bab739740f7593b71087e167461ff188ef0fe8edf3980450d54984a SHA512 33be7134f8f469a4c72daf59d705de2ed2952ba4ff518ab54f5dc44279d4af8c5d05919bd19d4c6b84085f47f3713a752d678e708aa736e703d2f47d94391b84
+AUX mupdf-1.14-openssl-curl-x11.patch 1799 BLAKE2B 62ae64baad844a13379f8dd1e1a1fed7cc0675fafe79e92a1029a968f59aa0aa3557734f2aa8e56d84f9bbeffbd148ae12255538d2f7b27a07fad5030621d33e SHA512 b6892c58c8a0d7561af16cc3e45e666b8bd1a6824f803d7500dd2db09b4bb477c45ab71b955bf76eedea8352d62d062ee656157c55d635514e464afdef1c2583
 AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
 AUX mupdf-1.9a-debug-build.patch 159 BLAKE2B da7e5294cb9e348d057d1436d68c6d3ce62aff7d7e0923c1b3c492c8dbaa459f26894c9c0c3c83e6885b7607c42f8c3da68e646f0dee3f83a168c7caab236f39 SHA512 5337c7dc2c5b29200378082651b81f5483475fe5cba997b2c55f60143e3f00901b19fc51216413151be87cef80e8fe452cde81006bfc552bdb6b1e9d6c0309cb
 DIST mupdf-1.13.0-source.tar.gz 51425034 BLAKE2B 7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a SHA512 d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
-EBUILD mupdf-1.13.0-r1.ebuild 5214 BLAKE2B 5084a3f581138ec893379dec40cbc29f53bd6d5ab832960d8239ed410050529bfeb2cb0efc97d1e40cc29913fcaa1b144767f232c4e13f2eeef38857d8bde97e SHA512 813feb1aa5267790e9174ba57382b1e7d17c99a7e86a8c621447fb91c03b762edd9391be6c009ce6273a4ca644bc86b6518383a2ac1851eff093ff2a28c2ac77
-EBUILD mupdf-1.13.0.ebuild 5146 BLAKE2B ce63575c46687216ede7db12c924ce953ec80ca632a9218a155ad0854b04b30f19f02208704e3b21c04a6e1d6c616d61aa8ae3a181e6e176b6e6a2477fd208bf SHA512 c6f9e1cf4ebdd127ad07b5125312b75e5eb04f52a6246429ed3983efe498260a667c3b25d931d2f729ee94e3e342ff89704e2e6259fd1b6d1257fbb5cbe78186
-MISC metadata.xml 315 BLAKE2B b143559c33bb6e3b81fe4dd7df802d48470f9080987e6c888b96bfb3f17e51dd3beaeb5501941dbbc47e1a525900a4719dc42d3d457d391d725670ff201e0c5b SHA512 1f3d23236f716a9e02a4f320105a8cd36e0dc84e25e35764677b66f7ae42039e0ae6f82ef06635cb0fe53fbb2e27ab854e54d45280275b8235f186328daa2b4e
+DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
+EBUILD mupdf-1.13.0-r1.ebuild 5204 BLAKE2B f62442ec438a0f3245fb8a543a6f68c1474c11ebe2633c1460175c0c700575a6236ac1f4f747f5e85966577cf32d903f56c80353aef8cfa53570b204423ab154 SHA512 753f2e08443b4982f44a644d2be9fd769f9162ca387dae7ac49baaa4a12d906be6741f959bac14a78780085559e92d8ae2722fe2fe8a630d7983c37a171b53c3
+EBUILD mupdf-1.13.0.ebuild 5136 BLAKE2B deb1d486417e37df66461924632349d443f1b4b79a6a1c148c77cf5fc84799ce946a08d8bea7d79948b4a33914d96b30890e353d73cc49791cb6e16d8728ec8a SHA512 c9989b3ec1a39bfda215c798928723d1d099444e1695da24ed3709b355ccd99dc660ab6e7a245c3a5384376810c93649095c09255a6e8106ae599ae5bd55a343
+EBUILD mupdf-1.14.0-r2.ebuild 3051 BLAKE2B ebce615c6dd87355beedc8f8fc7fbd92cdb374bc7b3a37dadc173721c967e72129b1e6bb7e0887c13c3686e39ad88573e78eab9b38211d7d20f2b293376bd15f SHA512 a682a7f6f34bdcf54ab22eb59e6a3d46996d22af79d8c004163c078a6e9e495af8829cfd4421070eceb170a3f8d6ce1b452be1a27a2684fb1e5642c00e50482e
+MISC metadata.xml 429 BLAKE2B f2f025000df327431c06219bc8da22fc340cee333318f4006d889722cd089d8492c9b8b9b1b9591622606282574ccdcf4cb5ddea04b0ab9a8f22c22dae7bfe6c SHA512 60b17408d27057c7fa361d1b480d876db73b89850f3d1f1f06e442bd58e1bccd24ca599e25290614bb879898e87ecf6dc74116154c318e6bb1134144f0826e92
diff --git a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
new file mode 100644
index 000000000000..90972e8c53ea
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
@@ -0,0 +1,13 @@
+diff --git a/Makerules b/Makerules
+index fc9bf998..82f10b28 100644
+--- a/Makerules
++++ b/Makerules
+@@ -21,8 +21,6 @@ SANITIZE_FLAGS += -fsanitize=address
+ SANITIZE_FLAGS += -fsanitize=leak
+ 
+ ifeq ($(build),debug)
+-  CFLAGS += -pipe -g
+-  LDFLAGS += -g $(LDREMOVEUNREACH)
+ else ifeq ($(build),release)
+   CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
+   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
diff --git a/app-text/mupdf/files/mupdf-1.14-Makefile.patch b/app-text/mupdf/files/mupdf-1.14-Makefile.patch
new file mode 100644
index 000000000000..a8c4ef770dce
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-Makefile.patch
@@ -0,0 +1,46 @@
+1. debug build (not sure why...)
+2. build shared library
+3. add optional static lib target
+4. Don't install COPYING
+diff --git a/Makefile b/Makefile
+index 37fc48e6..4303e9fa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@
+ -include user.make
+ 
+ ifndef build
+-  build := release
++  build := debug
+ endif
+ 
+ ifndef OUT
+@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h
+ 
+ # --- Library ---
+ 
+-MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdf-third.a
++MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
++MUPDF_STATIC = $(OUT)/libmupdf.a
++THIRD_LIB =
+ THREAD_LIB = $(OUT)/libmupdf-threads.a
+ PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+ 
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
+-$(THIRD_LIB) : $(THIRD_OBJ)
++$(MUPDF_LIB): $(MUPDF_OBJ) $(THIRD_OBJ)
++	$(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -Wl,--no-undefined -o $@ $^ $(THIRD_LIBS) $(LIBS)
++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+ 
+@@ -355,7 +357,7 @@ install: libs apps
+ 
+ 	install -d $(DESTDIR)$(docdir)
+ 	install -d $(DESTDIR)$(docdir)/examples
+-	install README COPYING CHANGES $(DESTDIR)$(docdir)
++	install README CHANGES $(DESTDIR)$(docdir)
+ 	install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
+ 	install docs/examples/* $(DESTDIR)$(docdir)/examples
+ 
diff --git a/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch
new file mode 100644
index 000000000000..a1284a63d670
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch
@@ -0,0 +1,52 @@
+diff --git a/Makerules b/Makerules
+index fc9bf998..5c0fffa4 100644
+--- a/Makerules
++++ b/Makerules
+@@ -113,10 +113,14 @@ else ifeq ($(OS),Linux)
+ 	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
+   endif
+ 
++  WANT_CURL ?= yes
++  ifeq "$(WANT_CURL)" "yes"
+   HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
+   ifeq ($(HAVE_CURL),yes)
+ 	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+-	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++    # We have to forcibly add -lpthread to avoid linking errors.
++	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread
++  endif
+   endif
+ 
+   HAVE_GLUT := yes
+@@ -125,17 +129,29 @@ else ifeq ($(OS),Linux)
+ 	SYS_GLUT_LIBS := -lglut -lGL
+   endif
+ 
++  WANT_X11 ?= yes
++  ifeq "$(WANT_X11)" "yes"
+   HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
+   ifeq ($(HAVE_X11),yes)
+ 	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ 	X11_LIBS := $(shell pkg-config --libs x11 xext)
+   endif
++  endif
+ 
+-  HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
+-  ifeq ($(HAVE_LIBCRYPTO),yes)
++  WANT_OPENSSL ?= yes
++  ifeq "$(WANT_OPENSSL)" "yes"
++  ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre"
++  ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.0' && echo yes)" "yes"
++    HAVE_LIBCRYPTO := yes
++	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
++	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
++  endif
++  else ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
++    HAVE_LIBCRYPTO := yes
+ 	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+ 	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+   endif
++  endif
+ 
+   HAVE_PTHREAD := yes
+   ifeq ($(HAVE_PTHREAD),yes)
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 96d29f2af06a..38351433e8bd 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,10 +1,14 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 <use>
 	<flag name="openssl">Use dev-libs/openssl crypto backend</flag>
 </use>
diff --git a/app-text/mupdf/mupdf-1.13.0-r1.ebuild b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
index 3f522e8dc86f..e24a2812a4d2 100644
--- a/app-text/mupdf/mupdf-1.13.0-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
 
 LIB_DEPEND="
diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild b/app-text/mupdf/mupdf-1.13.0.ebuild
index 4c5c9d0cca84..45887a2ebd6c 100644
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
 
 LIB_DEPEND="
diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
new file mode 100644
index 000000000000..3ce32300c17c
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
+
+RDEPEND="
+	>=dev-lang/mujs-1.0.4
+	media-libs/freetype:2=[static-libs?]
+	media-libs/harfbuzz:=[static-libs?]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/libpng:0=[static-libs?]
+	>=media-libs/openjpeg-2.1:2=[static-libs?]
+	virtual/jpeg[static-libs?]
+	curl? ( net-misc/curl[static-libs?] )
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	opengl? ( >=media-libs/freeglut-3.0.0:= )
+	X? (
+		x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="
+	opengl? ( !static-libs )
+	curl? ( X )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.14-Makefile.patch
+	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+	# See bug #662352
+	"${FILESDIR}"/${PN}-1.14-openssl-curl-x11.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use hppa && append-cflags -ffunction-sections
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h
+
+	use vanilla || eapply \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getLD)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
+		-i Makerules || die
+}
+
+_emake() {
+	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+	emake \
+		GENTOO_PV=${PV} \
+		HAVE_GLUT=$(usex opengl yes no) \
+		WANT_CURL=$(usex curl) \
+		WANT_OPENSSL=$(usex openssl) \
+		WANT_X11=$(usex X) \
+		USE_SYSTEM_LIBS=yes \
+		USE_SYSTEM_MUJS=yes \
+		HAVE_OBJCOPY=no \
+		"$@"
+}
+
+src_compile() {
+	_emake XCFLAGS="-fpic"
+
+	use curl && _emake extra-apps
+
+	use static-libs && \
+		_emake build/debug/lib${PN}.a
+}
+
+src_install() {
+	if use X || use opengl ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	_emake install
+
+	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a build/debug/lib${PN}.a
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+	use curl && dobin build/debug/${PN}-x11-curl
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index 2325414669df..51fe12d678bd 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,6 +1,5 @@
-AUX pytextile-2.1.8-sanitizer.patch 606 BLAKE2B c916c46156ae5f01b7d6714b7c9acd078119a561fee2159cd54ae4db6859ef2be0664b8cc7ae4c3034302b9edd57244e31a2506ecbf0c9d81c7497f393279157 SHA512 3c7a568e64cd28cc0666f06e6b2022454126a654f4ae0d0c82edada69ca7ec1ebce1582961ac84667b3a0c932c5e9d98521c100e1d62df100d276ae33417ba13
 DIST pytextile-2.3.3.tar.gz 42277 BLAKE2B a6e6e1d96695f3ada03f5da9bd8bd19b99da345d83c62b1d4f2e765303dfbbbee072da4611f1b29b46d28ed334373c809117940ff0c1238dea3b12fb9076656c SHA512 980c872bfdc056753fa5b344cbc828dbdc9ddfc2656f3cfb5c15b3351cfd9e4016f57af14b60af2f2764e556865301d7923a8f0687c5857fc2201bf10f56ab60
-DIST textile-2.1.8.tar.gz 34002 BLAKE2B 0f4643da3cf47cd9b27e7b3237c6eac8b951caab9f6f36da929e159d582ae9e8ac04b835bd9006d7392ed935a875e169eef276caa52e25d618cdeafa27cef626 SHA512 b1675a131b482f4926efb45312b16c722ff158d9296704918b56316d470056f986ce18d495525a8e9f236bdd62e09ca6a17b443a7db8c8c36e5d05fcffce67da
-EBUILD pytextile-2.1.8.ebuild 924 BLAKE2B f30969b7afc0102a049e25f6943e37adead616a6d579f07754e351826d347320034895264457bfdaccb7ba388a370ea3c24bf11903c39562fba6df1cb0ad13bf SHA512 7a38a87b3459aeaf5af5c07db276d5b2bfa931d8fbd340b45d27e80aabbaab096e6dfdf2702c18416ae978015b2787b62ea4d1133234b842c40c8144ee389e73
-EBUILD pytextile-2.3.3.ebuild 1010 BLAKE2B 51a8857dacb5589ef8a296c8682acc1aea131e7f8f3d46b42c471c4348aa8cf3328f126c4e8dd6e1c35d2cc861e3601463b3f518dff1ae4104962e022755d533 SHA512 81bf94b7819e48bed1128e71c73b2e16cdedc339ed3ec8ee9f37fd33dfafe9ee152a995799d84cbc33002f10f0a062eac710819577e44ee3af25a2fe6f14dcdf
+DIST pytextile-3.0.3.tar.gz 48560 BLAKE2B f8d3077e2b8e4de7157dcd9ed17f7889301946c2d3034dbbb0171b4930bd7268c65ce1f950552db2b783aa48acae639d5f4ccfcbca96807562b4a6377c3dd220 SHA512 142fe77c8858b0444428f9ca0f24d1a054a1566f85f00fd5cf860bb705a19666249cd03420d258d5acfc9f45052dd25e52767492a60a10d986d86b711b54612f
+EBUILD pytextile-2.3.3.ebuild 1022 BLAKE2B 37b4074eb8fe9107d61b1c26a8f24f41efd69646eaa52cdcba0feac1f74b1255bb5d7953ebffdb6456033b4ba3600fb73dea3b1200d1616396decaeaf542e811 SHA512 555e58af6e404fecbc93372a064c208d27303f78c7607baded5bcb7267ec38bea4bfac24bf3a0b10909c6edd5de557b662d5d144673e190ede513d942f6cb941
+EBUILD pytextile-3.0.3.ebuild 1020 BLAKE2B 0891ae2944fa0a4338bcc67ae47cddcf5578e5e9f1b0ac3959753168aee4c480598354a0c90b38102573572a1f71af32e34b7d5f6b9d3aaa36c775bd8d69515a SHA512 58b533104b2efdb6a2fc07c6a546c2fd303781ac1efde727cc4302e8e0bdaa02fb4a8c9a881e79d452796f8b9073a5b2027c7c44628686393a075b76e36791c6
 MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/files/pytextile-2.1.8-sanitizer.patch b/app-text/pytextile/files/pytextile-2.1.8-sanitizer.patch
deleted file mode 100644
index 1a9e696f21e9..000000000000
--- a/app-text/pytextile/files/pytextile-2.1.8-sanitizer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/textile/python-textile/commit/83c81db387fa5f0c5ca25c27b8bc36d105bce599
-diff --git a/textile/tools/sanitizer.py b/textile/tools/sanitizer.py
-index 83b6799..4fc8fb2 100644
---- a/textile/tools/sanitizer.py
-+++ b/textile/tools/sanitizer.py
-@@ -12,7 +12,7 @@ def sanitize(string):
-     p = html5lib.HTMLParser(tokenizer=sanitizer.HTMLSanitizer)
-     tree = p.parseFragment(string)
- 
--    walker = treewalkers.getTreeWalker("simpletree")
-+    walker = treewalkers.getTreeWalker("etree")
-     stream = walker(tree)
- 
-     s = serializer.htmlserializer.HTMLSerializer(omit_optional_tags=False,
-
diff --git a/app-text/pytextile/pytextile-2.1.8.ebuild b/app-text/pytextile/pytextile-2.1.8.ebuild
deleted file mode 100644
index 583464ba033b..000000000000
--- a/app-text/pytextile/pytextile-2.1.8.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
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN="textile"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Python port of Textile, A humane web text generator"
-HOMEPAGE="https://github.com/ikirudennis/python-textile"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-sanitizer.patch )
-
-python_prepare_all() {
-	# This resolves a nasty race condition noted and observed by Arfrever
-	sed -e 's:with-id = 1::' -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests textile/tests/ || die "Tests failed under ${EPYTHON}"
-}
diff --git a/app-text/pytextile/pytextile-2.3.3.ebuild b/app-text/pytextile/pytextile-2.3.3.ebuild
index 3a17b6c192d4..0cf0146b654e 100644
--- a/app-text/pytextile/pytextile-2.3.3.ebuild
+++ b/app-text/pytextile/pytextile-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,10 +20,7 @@ IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)
-	"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 RDEPEND="
 	dev-python/regex[${PYTHON_USEDEP}]
 	"
@@ -33,6 +30,8 @@ S="${WORKDIR}/${MY_P}"
 python_prepare_all() {
 	# This resolves a nasty race condition, courtesy of Arfrever
 	sed -e 's:with-id = 1::' -i setup.cfg || die
+	# remove useless --cov arg injection
+	rm pytest.ini || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-text/pytextile/pytextile-3.0.3.ebuild b/app-text/pytextile/pytextile-3.0.3.ebuild
new file mode 100644
index 000000000000..ffe603741631
--- /dev/null
+++ b/app-text/pytextile/pytextile-3.0.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+
+inherit distutils-r1
+
+MY_PN="python-textile"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Python port of Textile, A humane web text generator"
+HOMEPAGE="https://github.com/textile/python-textile"
+SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# remove useless --cov arg injection
+	rm pytest.ini || die
+	# remove useless pytest-runner dep
+	sed -e "s/pytest-runner//g" -i setup.py || die
+}
+
+python_test() {
+	pytest || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 4c4556e39168..7b3378b5f203 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,7 +1,8 @@
 AUX sword-1.7.4-configure.patch 816 BLAKE2B 6b1dc70d5146178be9e2e650b6a46f9a64dfbab2edfddeea7c4f3825c00ccf1af7fe328b86be90c3730ecb928ae9fe1c4558f3a0bcb6acfba6a207a48c32b3f6 SHA512 b6209e3a01a3408ca7d338ada40f3e9e2db93167b74274f29ea4a790a22b21d9e871037eb71875ec6d84f14477a78944a9ef2296fb623dbedfdfd3a849e44186
 AUX sword-1.7.4-gcc6.patch 626 BLAKE2B 69b56ed6152d07962d5941868925ac35825256e4db22cc435c7580694925694902eb6c322d143af7148ea4a60828e059409625e9415cbb5f8905d98b4a1d85c5 SHA512 8084f3ce8be27879a5b038c5c55ed6c0071e02c2f19ee390cdbc6eaf822fb5268c0f5f9450ba22dfc944b5a1d46f5e4feeebd81f3810532edc9f905921b95f04
+AUX sword-1.8.1-icu61.diff 4838 BLAKE2B d0ea686e4fedd8a6cfe242d1048f85b047d414424fc3ca7618a098d6e3ee82c440eb95c3370eeb0dbe46a4abe7ccc0c62e7b725cfed0f8ec0951e11099627337 SHA512 7bd545014ea81fa5f6203d39fd1a4125ae163ac51fe76270511b1df65d4dbf44b912fbaf3fa6a6d6a20370efc3abfff9feabe5de7177981ce1b62f4d9c5ce49d
 DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20 SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
-DIST sword-1.8.0.tar.gz 2444386 BLAKE2B dd74ca409cdc3e4563ec5f0ed225556cfc3d1c89e63b41df8335b4abdd4f36b1423a2953a86105d2efe8d57c0e57065f74e74629309bab93f2a0222b9a8fcc86 SHA512 c45f3135255322a77e955297997db2529f31b397c42cc4b9474dc6ec8d329b2233b292078979de5fbf33cad4a1a607aabb66f86501072a729d68e9fc840c8c8e
+DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
 EBUILD sword-1.7.4-r1.ebuild 1974 BLAKE2B cdccfbf2bc8cc2f6a22b1bf88a929faf3a6305f271956acf83f0e9d4383b02a6e74201bc0accb28becc05b5e979f4032dcd48d9addab74ca5563c0bcb4d008c4 SHA512 b9c272643badb68f6af83bdf7a50f070f3a0fa56ed21ecf9c1b1ae941e5bee671cc9674fc8fba3b6042bc111f19576fa3d731700b7a9c91fbc637558e74886f0
-EBUILD sword-1.8.0.ebuild 1924 BLAKE2B aeb08e11551a7a8e81acf4da0aa69530772a49334c75a14f74b63109c73d89115d4abc0e1c815a892182edbc907a3689e8387c2c045f3230763c71f7c39bfaa8 SHA512 7c880515213d6fb58091177351f799ea49d8633e7f3bd8da5e396555c456dc4796d3b8798b21c56ae8d44b4ebd5543bf2116786cce2065a651572431dbc54475
+EBUILD sword-1.8.1-r1.ebuild 1826 BLAKE2B 7f9e2ae2a44ff3ec5704ede93ec93d08c47e4f78514d31d82326f910fd3f99fe2fc6a66283e405609ac9bff4c1f92849a1aa251cc2e74b2f3eebe3b29e04b686 SHA512 68b8d8194239b84cbfae825c91dda775ce0808eb07a0bf1b1affc046c736454153cb25c740f7310265d362eab8d15d701af38c6150fc394ea78dc18689852b0f
 MISC metadata.xml 564 BLAKE2B b7ed0b7e3e245079c82d4ebcb446a1e864e0f72610ac9c60d98fbfc73c7d078f12ddb7d1650fbc3816ac292c8c6b122990a71b0e99056eb21bdb4f3a8dc8b3ec SHA512 74ff38bf540aa48eb0195c7999adcf1226ede7ca4a6848a45b73913011f95e2bb7d84e0ca0534d2ee2610efee78234a52ae69f507704bb0ec80e4876a5d4aadc
diff --git a/app-text/sword/files/sword-1.8.1-icu61.diff b/app-text/sword/files/sword-1.8.1-icu61.diff
new file mode 100644
index 000000000000..2129f279ddc6
--- /dev/null
+++ b/app-text/sword/files/sword-1.8.1-icu61.diff
@@ -0,0 +1,138 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5cbd06a..1d3a2d2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,4 @@
+-# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken from another CMake system
+-#       limit pkg-config version to >= 0.14, demo, utilities, doc, tests
++# TODO: limit pkg-config version to >= 0.14, demo, utilities, doc, tests
+ #       use BUILD_SHARED_LIBS
+ #       convince perl swig bindings to build properly
+ #
+@@ -13,7 +12,7 @@
+ # all posterity and eternity, wherever such transfer is possible.  Where it is
+ # not, then this file is released under the GPLv2 by myself.
+ PROJECT(libsword CXX C)
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.7.0)
+ SET(SWORD_VERSION 1.8.1)
+ 
+ # Make sure it's an out-of-stream build
+@@ -56,7 +55,8 @@ IF(MSVC)
+ ELSE(MSVC)
+ 	FIND_PACKAGE(BZIP2 QUIET)
+ 	FIND_PACKAGE(XZ QUIET)
+-	FIND_PACKAGE(ICU QUIET)
++	FIND_PACKAGE(ICU
++	                COMPONENTS data i18n io uc)
+ 	FIND_PACKAGE(CURL QUIET)
+ ENDIF(MSVC)
+ FIND_PACKAGE(CLucene QUIET)
+@@ -237,7 +237,11 @@ ENDIF(WITH_CLUCENE)
+ IF(WITH_ICU)
+ 	INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
+ 	ADD_DEFINITIONS(${ICU_DEFINITIONS})
+-	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
++	MESSAGE(STATUS "ICU Version: ${ICU_VERSION}")
++	IF("${ICU_VERSION}" VERSION_GREATER "61")
++		ADD_DEFINITIONS(-DU_USING_ICU_NAMESPACE)
++	ENDIF("${ICU_VERSION}" VERSION_GREATER "61")
++	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES})
+ ENDIF(WITH_ICU)
+ IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
+ 	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
+diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake
+deleted file mode 100644
+index 451c2f3..0000000
+--- a/cmake/FindICU.cmake
++++ /dev/null
+@@ -1,68 +0,0 @@
+-# Finds the International Components for Unicode (ICU) Library
+-#
+-#  ICU_FOUND          - True if ICU found.
+-#  ICU_I18N_FOUND     - True if ICU's internationalization library found.
+-#  ICU_INCLUDE_DIRS   - Directory to include to get ICU headers
+-#                       Note: always include ICU headers as, e.g., 
+-#                       unicode/utypes.h
+-#  ICU_LIBRARIES      - Libraries to link against for the common ICU
+-#  ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
+-#                       (note: in addition to ICU_LIBRARIES)
+-
+-# Look for the header file.
+-find_path(
+-  ICU_INCLUDE_DIR 
+-  NAMES unicode/utypes.h
+-  DOC "Include directory for the ICU library")
+-mark_as_advanced(ICU_INCLUDE_DIR)
+-
+-# Look for the library.
+-find_library(
+-  ICU_LIBRARY
+-  NAMES icuuc cygicuuc cygicuuc32
+-  DOC "Libraries to link against for the common parts of ICU")
+-mark_as_advanced(ICU_LIBRARY)
+-
+-# Copy the results to the output variables.
+-if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+-  set(ICU_FOUND 1)
+-  set(ICU_LIBRARIES ${ICU_LIBRARY})
+-  set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
+-
+-  # Look for the ICU internationalization libraries
+-  find_library(
+-    ICU_I18N_LIBRARY
+-    NAMES icuin icui18n cygicuin cygicuin32
+-    DOC "Libraries to link against for ICU internationalization")
+-  if(MSVC)
+-    find_library(ICU_DATA_LIBRARY
+-	  NAMES icudt
+-	  DOC "Libraries to link against for ICU data")
+-	set(ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_DATA_LIBRARY})
+-  endif(MSVC)
+-  mark_as_advanced(ICU_I18N_LIBRARY)
+-  mark_as_advanced(ICU_DATA_LIBRARY)
+-  if (ICU_I18N_LIBRARY)
+-    set(ICU_I18N_FOUND 1)
+-    set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY})
+-  else (ICU_I18N_LIBRARY)
+-    set(ICU_I18N_FOUND 0)
+-    set(ICU_I18N_LIBRARIES)
+-  endif (ICU_I18N_LIBRARY)
+-else(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+-  set(ICU_FOUND 0)
+-  set(ICU_I18N_FOUND 0)
+-  set(ICU_LIBRARIES)
+-  set(ICU_I18N_LIBRARIES)
+-  set(ICU_INCLUDE_DIRS)
+-endif(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+-
+-IF(ICU_FOUND)
+-	IF(NOT ICU_FIND_QUIETLY)
+-		MESSAGE(STATUS "ICU: Yes ${ICU_I18N_LIBRARY}")
+-	ENDIF(NOT ICU_FIND_QUIETLY)
+-ELSE(ICU_FOUND)
+-	IF(ICU_FIND_REQUIRED)
+-		MESSAGE(FATAL_ERROR "ICU: No")
+-	ENDIF(ICU_FIND_REQUIRED)
+-ENDIF(ICU_FOUND)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 30818a8..08bc573 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -75,10 +75,12 @@ ENDFOREACH(TEST ${test_PROGRAMS})
+ 
+ ########################################################################################
+ # The following tests require extra libraries to run
+-# 
+-FOREACH(ICUTEST icutest translittest)
+-	TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
+-ENDFOREACH(ICUTEST icutest translittest)
++#
++IF(WITH_ICU)
++	FOREACH(ICUTEST icutest translittest)
++		TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
++	ENDFOREACH(ICUTEST icutest translittest)
++ENDIF(WITH_ICU)
+ 
+ # Excluded until I know we have the tests working
+ ADD_SUBDIRECTORY(testsuite)
diff --git a/app-text/sword/sword-1.8.0.ebuild b/app-text/sword/sword-1.8.0.ebuild
deleted file mode 100644
index bb6ed4a2b108..000000000000
--- a/app-text/sword/sword-1.8.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="Library for Bible reading software"
-HOMEPAGE="http://www.crosswire.org/sword/"
-SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
-IUSE="clucene curl debug doc icu static-libs"
-
-RDEPEND="sys-libs/zlib
-	curl? ( net-misc/curl )
-	icu? ( dev-libs/icu:= )
-	clucene? ( dev-cpp/clucene )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS CODINGSTYLE ChangeLog README"
-
-RESTRICT="test"	#Restricting for now, see bug 313207
-
-src_prepare() {
-	sed -i \
-		-e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
-		-e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
-		configure || die
-
-	sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
-	sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
-
-	cat <<-EOF > "${T}"/${PN}.conf
-	[Install]
-	DataPath=${EPREFIX}/usr/share/${PN}/
-	EOF
-	eapply "${FILESDIR}/${PN}-1.7.4-configure.patch"
-	eapply_user
-}
-
-src_configure() {
-	# TODO: Why is this here and can we remove it?
-	strip-flags
-
-	# bug 618776
-	append-cxxflags -std=c++14
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		--with-zlib \
-		$(use_with icu) \
-		--with-conf \
-		$(use_with curl) \
-		$(use_with clucene)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use doc; then
-		rm -rf examples/.cvsignore
-		rm -rf examples/cmdline/.cvsignore
-		rm -rf examples/cmdline/.deps
-		cp -R samples examples "${ED}"/usr/share/doc/${PF}/
-	fi
-
-	insinto /etc
-	doins "${T}"/${PN}.conf
-}
-
-pkg_postinst() {
-	elog "Check out http://www.crosswire.org/sword/modules/"
-	elog "to download modules that you would like to use with SWORD."
-	elog "Follow module installation instructions found on"
-	elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/app-text/sword/sword-1.8.1-r1.ebuild b/app-text/sword/sword-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..97ffa1634b52
--- /dev/null
+++ b/app-text/sword/sword-1.8.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic cmake-utils
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
+IUSE="clucene curl debug doc icu static-libs"
+
+RDEPEND="sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	clucene? ( dev-cpp/clucene )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS CODINGSTYLE ChangeLog README"
+
+RESTRICT="test"	#Restricting for now, see bug 313207
+
+src_prepare() {
+	sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
+	eapply "${FILESDIR}/${PN}-1.7.4-configure.patch"
+	eapply "${FILESDIR}/${PN}-1.8.1-icu61.diff"
+	eapply_user
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# bug 618776
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DWITH_CLUCENE=$(usex clucene)
+		-DWITH_CURL=$(usex curl)
+		-DWITH_ICU=$(usex icu)
+		-DWITH_ZLIB=1
+	)
+	use static-libs && mycmakeargs+=( -DLIBSWORD_LIBRARY_TYPE=Static )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	if use doc; then
+		rm -rf examples/.cvsignore
+		rm -rf examples/cmdline/.cvsignore
+		rm -rf examples/cmdline/.deps
+		cp -R samples examples "${ED}"/usr/share/doc/${PF}/
+	fi
+
+	insinto /etc
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "Check out http://www.crosswire.org/sword/modules/"
+	elog "to download modules that you would like to use with SWORD."
+	elog "Follow module installation instructions found on"
+	elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index e2367d9c8d02..59a7b8ca590f 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -145,4 +145,4 @@ EBUILD tesseract-3.05.01.ebuild 5839 BLAKE2B 60b51c0673443da142de10d6b2494a0e6e6
 EBUILD tesseract-3.05.02.ebuild 5844 BLAKE2B 498c5b5e633af1319b785c3ea40bfd3de48022710bd5edc8d381bf0dbc7d2ab29b11524be669a43cdbaae439677d606eae67ee334077961f0dbd952dd16a1745 SHA512 f8f9adc9e12ecaad1aafae82fed5ad3169b54275e43b225e91931044bc76822d4ac39dacbe0fdcc57a551eccce44ed4e5600deb1c100aca546a4467dfded99d2
 EBUILD tesseract-4.0.0_beta4.ebuild 3965 BLAKE2B c8d8b17f998368aca538ee664e6cdf12f6beba3ee0fb90c5439b84d16623b50cb75f0c81623d2fb777967d8531de583308127ec4e49c1f2c55d41e718479dc85 SHA512 0de2ba12cfb65644e126d2c4b635f6d3621d9cf4b6f0dc40e5ce606d27f55e9d4ddae567af7ee0b7691b6b57c951687ab623fcb6d6d1cf8f5fcab75e083f8715
 EBUILD tesseract-9999.ebuild 3842 BLAKE2B aef57e284d1268d22a48e832bb451999e05bf0a870d399f9e2d83ac53705ef8df3ea95973a42cfd40adaecd81595dd92a5cc5810c26128af15b922532604fd06 SHA512 a9e6935469b8b8dfef11ccfe86b0df0cacd2e7cc536517f0092fbc9242c29e7df3ef128b4057a09df5ebc57516457a11a231f7df554d3a55c8b85e1c34594ec3
-MISC metadata.xml 1271 BLAKE2B e2f8b18ee6fa20f2c059c5fc99e242743cc30153e783874e3b43ef7185b0f5827d611884dfa98242ec442edd8adf278fdc389731d61e9114d7549df934b6f7d9 SHA512 7ea459bc822290be824fc07b7abe26e13ad537e932b5cf71925e654f191fdee4d8681fabdd9a7fb246e87a9a365a8c0d6f933e34217aff24eb8bf3d741369656
+MISC metadata.xml 1203 BLAKE2B 72b792649c8f504bc809dd7ba99cead07f74704a5743532bacf1e010fd4877b8e5c8c929830e04899362d26fb086fcbadbbddaec7dae0295b9e5f3f9de76bc78 SHA512 b92b597ee4a1597c59646d21e7a293a601b74a06266b61ca5ace001ba0a7cf2e8a6454c81215e4e5534109ca7bb81cf045ffa2584cdb114e810f41c9ae5f7b1c
diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml
index 5d6b217bc6dd..90921345d113 100644
--- a/app-text/tesseract/metadata.xml
+++ b/app-text/tesseract/metadata.xml
@@ -17,7 +17,6 @@
     <remote-id type="github">tesseract-ocr/tessdata</remote-id>
   </upstream>
   <use>
-    <flag name="webp"> Enable support for webp image format.</flag>
     <flag name="math"> Enable support for recognition of equations.</flag>
     <flag name="scrollview"> Install viewer to debug recognition (ScrollView).</flag>
     <flag name="osd"> Enable support orientation and script detection.</flag>
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index d16b638a216e..61625afc2eeb 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -159,6 +159,6 @@ DIST texlive-module-typeoutfileinfo-2017.tar.xz 1596 BLAKE2B 3c20d6daebac40630f4
 DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 BLAKE2B d6ae70e4c4baf44728d0fc474cd1a39036997366b9f4565f6a1648a27ec904fc24100ab0109d35825b171f9d094a165cf72f7fbcf53ce766c5cd6acd336f2ac0 SHA512 277b08d5cdf7d6ebef2d03644c635c0a3ead2d18e037264a3505dd1c6a7c9c7bea60a7e81fd99648efa486158d573ebd58b10b62014b5194c84386f4ab6788de
 DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
-EBUILD texlive-core-2017-r3.ebuild 11616 BLAKE2B 1285fa47a8f24b7f055728e71e83208e21687491063b3edba33fbc254f92f5d5c20e899ded68ec8b4fd9200025bb4c88ab3c24e3e3c5a3bfc68dcdb33fc42af2 SHA512 0f2f0d97ff0933bb680a5a591d34b63b9c898dda27e908e7404ab0ffe7190d620b70a9900945c556cd5269944f46986681bdb94ebef8ece7dede2679651eae73
-EBUILD texlive-core-2017-r4.ebuild 11810 BLAKE2B 86ace87ccc5953c2ca93605edff43c03597bcdf5cd4ccecdb58b7b077ebaeb7c57dab32e3c151d741beb1bea5ddfb229af3f0d76d01b2b7d190f286b38827ba6 SHA512 4ba3beac7021d1ed6c0952515017c039e1e9f9d1dd7f777df3c599502dd90e8e01c797cd0a11b8b91a11911b69470f5132977c7dd6730fb067f92d318d6590b8
+EBUILD texlive-core-2017-r3.ebuild 11608 BLAKE2B 5f73ff31793371ac42d9ca6f527982b86ddb078d7d51da5344baa8c0b797b93785e2b607b04b4700ed60dfdeb119f3e54598dfa47db39c4cc3d0dc963d548968 SHA512 6594b8000529bb15dce0c6c3ff033143e9bcfa0dce43c54cb73e86f54b9324ababef04af1d55a3303a5d365ba3e764484c69e73dcdd449af0b4bc9de8a458300
+EBUILD texlive-core-2017-r4.ebuild 11801 BLAKE2B 4ddcc339eec638cb5b2ba2a0ff75ff22b67a9bd8d45fe3b0f05de043b9e9e404c61469434aefab022ef6bc80c1b2e30b4b58e63b1932f6743d3a3d90416b635e SHA512 ab52558e5d4cd66f92b8a3aba70336730694f9dc1e96c26bd5e9b10c70ff5c90ab18d6cd53a3e00ff718cd3efd7c24671e0631f12c156b4a461f8b0e457c7978
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index 29ea8dc071dd..660c0a04812b 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -74,7 +74,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index 72492b59e8ce..24df13d2485c 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -76,7 +76,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/uudeview/Manifest b/app-text/uudeview/Manifest
index ee1746422a86..9f296c25f355 100644
--- a/app-text/uudeview/Manifest
+++ b/app-text/uudeview/Manifest
@@ -5,5 +5,5 @@ AUX uudeview-0.5.20-makefile.patch 895 BLAKE2B b9f2d027b71667ea78bcc9de05b3f20df
 AUX uudeview-0.5.20-man.patch 3246 BLAKE2B 390d89a13080798b1ef0f902d92c82df59c10c6bb5b34eb8655ceadade0e31b0e81c100fc3e8908edf6c482c51c2560b90aaff8156b7ca805908036aa8342b77 SHA512 a940d6663563e7a91b35f5350e05b6cb7939f06d7db8767a8a5483dc82477c796a351cc03be9de49bd55513ca0b2e3203cd82c4b834caa54da9c8aae5750136b
 AUX uudeview-0.5.20-rename.patch 1736 BLAKE2B 820e32f9d2fd248ee2748e3f6173994b02074720814ec8adc6a896b72defc29ce24a356626c7bab414c516555547fe04cbaf304a52c9f141b80a836593c8638f SHA512 afb5b72bca70eb7c156584df1b44fa3cbb6cf07da97a79ff6330acb52ff102584b7a382ce779f2f695c9384d017984cabc670d31b243c0e5d916df19c6846439
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uudeview-0.5.20-r2.ebuild 912 BLAKE2B 9d997326962bb763ab127d3ff492ecd408d956fedc9a2c12dfdca6924273299204da74495f1c5c96d92a77b1403443796d9fb18a40895771d28081eb500c4c37 SHA512 9466c4e4c67a71fb7e05bb4f55684c3646f8ec16c86548ab4735b9088e968db497c077099bf67a812316587a66aa57f734b8007c7f51ee72660b0332905b8f4a
+EBUILD uudeview-0.5.20-r2.ebuild 865 BLAKE2B b6103031b60e088939a1eb5b88b2af38f92f5e622113f620d559a5064ed9442a63b26704d118728ed9f93d6c04e0915007d8044773a85a91414b98b82626a7b8 SHA512 c97c87e1881cf173b552aa4667b2e438ba7abbd216544b749a68fa4db310c784d3d2756a472c6f8f390ad21553c7ea00069acfbb78e13693200edca9a2802821
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
index 17446a4e771f..6331df769ce0 100644
--- a/app-text/uudeview/uudeview-0.5.20-r2.ebuild
+++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,10 +12,10 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="tk"
+IUSE=""
 
-RDEPEND="tk? ( dev-lang/tk:0 )"
-DEPEND="${RDEPEND}"
+RDEPEND=""
+DEPEND=""
 
 DOCS=( HISTORY INSTALL README )
 
@@ -39,6 +39,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable tk tcl) \
-		$(use_enable tk)
+		--disable-tcl \
+		--disable-tk
 }
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index f3b9b45b3cbc..5ca545fed7b7 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,4 +1,6 @@
+AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r1.ebuild 2759 BLAKE2B 94d4d96f58185f1a9a09b3049d2c20f9512a3e40944dfda58cfa15d5f17c5be3d9db0f3b7a5269edecf5ef0a2a023b72435aa069d16fc3fcc73e4e72e7c9a114 SHA512 1ab69335e01a7e8d5d4620015028041404c77ee8f56cbe0365f2f0b9c33aaaf434ced8999c86708a86f212ec8b6bf7370914fb3208bfb8f95f7cd2aaa4368037
+EBUILD xdvik-22.87.03-r1.ebuild 2782 BLAKE2B d20a9864521e5c6605393c63ecc76649194a4e305b4e9259c2002f963c53c55c29d61a03c5755ba3d5b91a2f8e4d28a03028e180223e0ef36fdf4987b0c4cea9 SHA512 eb072fce7b045f3a4318741935c0c23f40981e84ba5f9f9a8c936050c0537c8ba73b99455a4d0e80c349ae4e5a869d40aaae417175f985f7bbaa719b980f91f9
+EBUILD xdvik-22.87.03-r2.ebuild 2923 BLAKE2B 2e2721893d1e2378e80d81e62910ce5194460e0e4598e0f71a1b27c53899ccf4205d62a28751291117939ea098b762fd61b7f06a799be83a34063350595d158e SHA512 5d5ce903b6d8fd592c151cc06220b145d4db309eeb3a2e7b1d31ad65cb8f1e918068afcdbc2e9f38826d0947cf4d2b82eff0cc370448a59e07da23fc83d6379a
 MISC metadata.xml 594 BLAKE2B 338b1aedaaf7426ed8bc2b9ae08e03f9fd6170b0714f938fc97a0f4555e8daa385635200bcbea4d0959604fad44db3212bd7436ac70b2e49ba353dd48713e7c6 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd
diff --git a/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch b/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch
new file mode 100644
index 000000000000..6387b28c8ba2
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch
@@ -0,0 +1,23 @@
+--- a/m4/kpse-freetype2-flags.m4	2018-09-19 10:19:06.437789178 +0100
++++ b/m4/kpse-freetype2-flags.m4	2018-09-19 10:23:48.556050046 +0100
+@@ -21,17 +21,10 @@
+ 
+ # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
+ # -------------------------------------
+-AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
++AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])])
+ 
+ # KPSE_FREETYPE2_SYSTEM_FLAGS
+ # ---------------------------
+ AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+-  AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
+-fi
+-]) # KPSE_FREETYPE2_SYSTEM_FLAGS
++_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2])])
++
diff --git a/app-text/xdvik/xdvik-22.87.03-r1.ebuild b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
index 9c61d7036507..dc814d5d0db8 100644
--- a/app-text/xdvik/xdvik-22.87.03-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,6 +19,7 @@ RDEPEND="media-libs/freetype:2
 	x11-libs/libXmu
 	x11-libs/libXpm
 	x11-libs/libXt
+	emacs? ( virtual/emacs )
 	motif? ( >=x11-libs/motif-2.3:0 )
 	!motif? (
 		neXt? ( x11-libs/neXtaw )
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
new file mode 100644
index 000000000000..34a4d9669b4e
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools elisp-common eutils flag-o-matic multilib toolchain-funcs xdg-utils
+
+DESCRIPTION="DVI previewer for X Window System"
+HOMEPAGE="http://xdvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
+
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="motif neXt Xaw3d emacs"
+
+CDEPEND=">=media-libs/freetype-2.9.1-r2:2
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	emacs? ( virtual/emacs )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	!motif? (
+		neXt? ( x11-libs/neXtaw )
+		!neXt? (
+			Xaw3d? ( x11-libs/libXaw3d )
+			!Xaw3d? ( x11-libs/libXaw )
+		)
+	)
+	dev-libs/kpathsea"
+DEPEND="sys-devel/flex
+	virtual/yacc
+	virtual/pkgconfig
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	virtual/latex-base
+	!<app-text/texlive-2007"
+S=${WORKDIR}/${P}/texk/xdvik
+
+src_prepare() {
+	local i
+	# Make sure system kpathsea headers are used
+	cd "${WORKDIR}/${P}/texk/kpathsea"
+	for i in *.h ; do echo "#include_next \"$i\"" > $i; done
+
+	cd "${WORKDIR}/${P}"
+	eapply "${FILESDIR}"/${P}-freetype2-config.patch
+	cd "${S}"
+	eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+	local toolkit
+
+	if use motif ; then
+		toolkit="motif"
+		use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
+		use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
+	elif use neXt ; then
+		toolkit="neXtaw"
+		use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
+	elif use Xaw3d ; then
+		toolkit="xaw3d"
+	else
+		toolkit="xaw"
+	fi
+
+	econf \
+		--with-system-freetype2 \
+		--with-system-kpathsea \
+		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
+		--with-xdvi-x-toolkit="${toolkit}" \
+		--x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea"
+	use emacs && elisp-compile xdvi-search.el
+}
+
+src_install() {
+	dodir /usr/share/texmf-dist/dvips/config
+
+	emake DESTDIR="${D}" install
+
+	dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
+
+	dodoc BUGS FAQ README.*
+
+	use emacs && elisp-install tex-utils *.el *.elc
+
+	doicon "${FILESDIR}"/${PN}.xpm
+	make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
+	echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if use emacs; then
+		elog "Add"
+		elog "	(add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
+		elog "	(require 'xdvi-search)"
+		elog "to your ~/.emacs file"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index d73e42d20e20..d07e21e4f020 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -2,5 +2,5 @@ AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8
 DIST xmlto-0.0.26.tar.bz2 119819 BLAKE2B 9674389d7fac9e60ccab6530acc95338789401f6ddbd3bdea7cb98a350a50bbd8e539565fdcbad42778a1bbac22590bc923b3cae9108ec510dbc62e5d32e38c6 SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.26-r1.ebuild 1348 BLAKE2B fa3ef6d8ee89e8f7965ad6a4fd4a95a89962be6b301b8d799c2aaf417f235a316044a204fb0077584b3771a1bad11d476537d031ac6f7b3850fdf8cde4bf2b0a SHA512 36750c08fd77ccd4bcf23782c3a0f881b3f256f0f293f2a266b3de908aed2fdff0c119185ab0cb8e5a3c25659ea2236bf2b03148c5bd1f23eb4f963dbe891335
-EBUILD xmlto-0.0.28-r1.ebuild 1360 BLAKE2B 9ffe7e58938a26f59b73dfc8abc060d1e98078e5dae8d7e77adaa87977a7d13cc6a9541d672b946345705b0667f7d5472ff8507e25f39ec6241af176b02bcbee SHA512 83303264380434741e5b3897d853cf92bad11acd3ab4b11c1e8e7e7abaf5b2ea0e307eb67149536b67401d02c47481615b2f05f5fb94033a7380bce93ac38d34
+EBUILD xmlto-0.0.28-r1.ebuild 1356 BLAKE2B d150d85a8c8791eeffb26b660ed2b6dba527175b31f0f9e7de4ca0cb061fcbff6d0a6f7a6054cd2c388d582d02ee399ec939aa5d669da48f33c4b69be6953e8b SHA512 a5774c9b19d77c4afbe520f8db5df3be0b03e9a6df8ed80506ae197020ceb00784a0de03dd10c86bed69cb36433bdc037002e6e135970404cd6286aa318e3766
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index fae031611ce3..4942d1c4684b 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index ef7b7b8ab83a..f7b06e745440 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,6 @@
-DIST zathura-djvu-0.2.6.tar.gz 11137 BLAKE2B 23efc23cd53068abb3e118d6dc9b1e875c3f292d2e7ab49abbf6c599d6241c37959e9f74ac2b0f06838cadca0a07e39e1dda2e188f6861b72d4cd7a4bb1fcc62 SHA512 8534faa0de896ffea8d8d6f2d0c22697f2fd6ae3f73e955f5077e0a0656c13fd8823580f1b89c4b5aebb5189c69642ef690fc9167be178ce9533e9bb5d483dac
 DIST zathura-djvu-0.2.7.tar.gz 10909 BLAKE2B 6a55927aa99ec5d29b8f24922c4871c050c25f6c166ee3435390488deefd13f1f81f4286a0c3cd348e4f550e1b4082b9a7c5c7cce40371f8fb62074c87a2d372 SHA512 f0a33f53caced4cb90354e431d180a3b357db300ba5a376051e45f5409e8476105640e92768c2a31bdbbb0b37dea05df24a6489799c556e30336013f807b28b6
-EBUILD zathura-djvu-0.2.6.ebuild 869 BLAKE2B e808ea94258c503b48549c6dd56c1f037454ef06721b3c703ee20665dd14560765d02e0f838a3d79cce7f642c0b2fedb9bb11b848ce346fb2af1f685b4dfb377 SHA512 dabaa16d72e7281c7ed9cf8deda8fb011401127f671738bcbc1f9c370bd16147acfe716c01a5e1011be19f4bda718eda25800cdc7728f52c6ea475febcde2ce0
+DIST zathura-djvu-0.2.8.tar.xz 8860 BLAKE2B ea6eb70d7350ea388043c9ceb8ef8602030d17e4dabc353ac7346ba11c2d8f105bd235eee90823818fc1d4d5a9ca16755bb56a1e1b8aa633a79802ca2c3e92f2 SHA512 ec51d339a01e7f2d063d21ab0e32624770398a21727fe6714b8fa8f9a1ef46909d58fa26c4a50430234f04377cce076312ebefb8a6cbdc28ba5de1c205d944a9
 EBUILD zathura-djvu-0.2.7.ebuild 873 BLAKE2B c7329a9562bcd883ba1cfc042bea476d9a40a243f9d493704fd7655362c1e8c4a4fe6aeae5b509014db4a7a3d8e7323565d727aacc64a2ecdbc8271dcab53444 SHA512 616e7310f5bd94394546dd4cb624ee5c0a9b384064593a6d3098d11cc8669c3417e999e9adfc2c4b1f5a55256535f1633b8d6f644ce9772dd70b967a144bc32f
+EBUILD zathura-djvu-0.2.8.ebuild 793 BLAKE2B bee22309631b879837dab88c8d70954ca4ceb4272c7b3074ccc4bdd58f249e709f98252d9d90acd0354529556fa3df019077b5b1863a7daf2092a87111a49989 SHA512 f11599dc27c6b6dec3f66c7af1774a9dcd9790e0f2d38d7ff517a54e630e08031ff23023459c9c554577b38b17602314f67e52a02efa7c3bcc04025d0d85f437
 EBUILD zathura-djvu-9999.ebuild 876 BLAKE2B c0332a2c39389801dc8bbcfe42ed6aab193f23eccb43a29fce315c025f787cb47d3ee7945e2798b5b4407f5a63355a4c810e317a2b5c9826d3403bf660cce38b SHA512 e317ca99924d3e1c8a59e2f95ff91cb348b6e4dc310399f646d90b720c97e633f504508b63193fad90a7f9ec1c475253174ca4b9966b2b14ff7d6c9bcc58bed5
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild
deleted file mode 100644
index 2de3b88232f7..000000000000
--- a/app-text/zathura-djvu/zathura-djvu-0.2.6.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
-
-inherit eutils toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="DjVu plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/djvu-3.5.24-r1:=
-	>=app-text/zathura-0.3.1
-	dev-libs/glib:2=
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
new file mode 100644
index 000000000000..71046574478c
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+RDEPEND="app-text/djvu
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura-meta/Manifest b/app-text/zathura-meta/Manifest
index ea587ec5c89b..355ea6674422 100644
--- a/app-text/zathura-meta/Manifest
+++ b/app-text/zathura-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD zathura-meta-0.ebuild 518 BLAKE2B 08078da4df7db22f94b56a25525b454f08a35851bd3e7783fe3e2508371f3846d90b533bea45c1f2413e996e5c3ef88234ecf81c446bc9820512e225afdbec27 SHA512 5262dac8ffc3c9ab4e58b8d131a539ac53759cb8beddf1818a58d61dfc225f56ce3d76304cfa5d669fed018515948c2f98a767de04b1db351f6d64e56d79102e
+EBUILD zathura-meta-0.ebuild 515 BLAKE2B 78ce2092905f66cfd4baa9f6888536180fdba987584d0597ba7d03cf14865741f431e7dac9fa173621ec828e8bec094375fe62a1ad3e7e6f8852f69fc6b5160f SHA512 bce76a30ea72a3bea5d892e758dd7a0665a6e06dbc02f5202055cb313565e72f2993ee3928e8e4c50e3abab167ff4f470877979258e612c718e7510f8c1dfd4e
 MISC metadata.xml 784 BLAKE2B 1828dcb5847efbdff5b7cad10ba17fc6561debe2c8f860863ed158c918dc74fe7851ef21a9dd08c06cd62c4322aaee30b3f1e496d0fcc60a2fd85bc64e20b867 SHA512 862a83f9aef1dd793f72015ec94a778582639c421446775316ae8f7c22a627cce2e09bef70049252617340ee1ff71704a95ea1a78547aec65af1ca8dbe9fde45
diff --git a/app-text/zathura-meta/zathura-meta-0.ebuild b/app-text/zathura-meta/zathura-meta-0.ebuild
index 7c733b9625ff..aa5ddcaa810e 100644
--- a/app-text/zathura-meta/zathura-meta-0.ebuild
+++ b/app-text/zathura-meta/zathura-meta-0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Meta package for app-text/zathura plugins"
 HOMEPAGE="https://pwmt.org/projects/zathura/"
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index f9dc4aad1913..041169d47820 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-pdf-mupdf-0.3.2.tar.gz 9687 BLAKE2B 53ec5997c69ee160f60b90ba83ab15bff55fcd14f22b34cd54bf226a57d71d1fc95e62c2daac97f0285eee6bf6cd71e9c49a5f97920d19860c58bcc9d568deae SHA512 f6273923d0c1d7f6fad5cc3369c35fff9f87dabcb726d5ab4f814775f5e8783c552cbac7ad1381f3c6d91753698d64a96c7e76e0b8b5a16d9c28147fbdeb3089
+DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d2603a93a3fc05bbbcf036f825a534f9083fda3ea536de7b47091aca63409b54a15bec057b7fb3da687507e55efa779075 SHA512 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a
 EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1074 BLAKE2B 33d9faf3af3156f08f3a2ac764c3ef16c2fc32b31ff396eafe1027663d0464f735ba0349423e9a173aeb84498a5da7d3fe13606ae2e46a10eb5b20fa0bc5a08b SHA512 99caf865cbc7751aec41b38e1d179d52bed4523c1813554413b4631fda9318726cffdb476de2777fe35f80ee463c2364437e1b30e80271b79c106ad7f5b5bb11
+EBUILD zathura-pdf-mupdf-0.3.4.ebuild 646 BLAKE2B 806fe5ee655eb5c9d8871d6db13d3442cb330652f7d400a7372b78134607befbfe0a491d94a7b3625bb6e613172ee42a81ee08527444e362e52c721ec7378757 SHA512 266b87f0dc2b057203d57e222887ac297d1064ee4559f071ad13c9a599134392fa355b91782a19985164de2af4bf9ee96cddd2dbd559f5ab3c629d3f92e58b9e
 EBUILD zathura-pdf-mupdf-9999.ebuild 1077 BLAKE2B d4f06640c28f86f45c274fdb77dca863742a4685dc47d14d82095a8adbac0c713a00a5c7676d017128926473f7ead99d6fe520682693b3e811da8b55ea49644c SHA512 c1f52c483e368114ee230b920bbe440687d668499b991ad92d85d6a93f677e0671c1561f3f8ca8230f1d84941facee607fd7661225c139a79a8299ab0140749e
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
new file mode 100644
index 000000000000..69b7288a1bfe
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://pwmt.org/projects/zathura-pdf-mupdf/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-text/mupdf
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index c8e7ebf6b246..1854f2776dde 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,6 @@
-DIST zathura-pdf-poppler-0.2.7.tar.gz 9610 BLAKE2B ed0921545cfa435f47e45db223a469e80485ae3716ff20bb1fd213cd689eb5754935644198289a4fbe44cf30e837093e5f5568f714e66d4a3de11d53adfda5fb SHA512 815ef775059652337ca91ef6a089fa51105bbd3ac649ecd167da7da2a6ac62f617d04e85dbeb311ab47d86929338d8656037bcabc1177435804035914c6dfbdb
 DIST zathura-pdf-poppler-0.2.8.tar.gz 9504 BLAKE2B fc7ac4b4789f23d03b084dd90489c2b6e6fa0a93814140cf563fb826ed5bc7bad2cdcbf100cc6c2e708ecabd85be177c88a4faf9a0fc910bbfcddc1a515a7373 SHA512 644a36e31f89ee87a4d9bd50d5f9e209f06b6755af00009756422c89ad2ab50a97dd2c03a037b4e22bcf04bd620bd5b5ea55db7c380da9d3cebe0d1c00e18b9b
-EBUILD zathura-pdf-poppler-0.2.7.ebuild 854 BLAKE2B 48cd2dbd815496570c0826fb6f265b5b983f203689a5351c3a0a948ed9cd61d3b515940c755a2c297dbe294b6fd8b9cc732970ed2e24d7181d43a3a235a39f41 SHA512 8f1064fd8da384e347980adaf2370ea1e60eab857e50038ca16718768ccab732cfb95d5aef1fe1fcc53758e5ac872c3d0d787eae14bbbd76670e9679223f6396
+DIST zathura-pdf-poppler-0.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde
 EBUILD zathura-pdf-poppler-0.2.8.ebuild 858 BLAKE2B ba83d7d00563e03c080154f5e3c36964eb587dbd6bc6bf78bad02d5e7f0134e3c463dd793d6e864901c5b9569a773a4ec0d0b68bb5fd17db5b093980bf724126 SHA512 b751fbed29bae1a90d7be7e4346176c76266898abc5526a010a82e0c0c398898e138ea464fd2dac76316a470a8ac97344e2808dfc13021999a1d18225c435f05
+EBUILD zathura-pdf-poppler-0.2.9.ebuild 745 BLAKE2B 6abb817bbf4c1db7542f2b59e69eaa0785074578d9c32f7a37efc86dbe89b9888b8093061ebf4867727b52b205f941a7e5e453650006d4dd913e1bce851ae5cb SHA512 daac708c3c2b62185d843a8a649149165e028006987c7d0bf57f9959b7e01fbe52006ec3b46af9b0def91ba334bec0bee148d565b4749ca86ed1d1fb66246a73
 EBUILD zathura-pdf-poppler-9999.ebuild 861 BLAKE2B 5237bbfc9f3202dd7178a2a37abaaac0d67af71344823969175d7b677387ab1040d6a1fbd83d6927aee6faa95f9e2e36b4fb1bc5a348bf007ebbbbf0b363c8dc SHA512 e451c62dd3fae3610b36b0511bcdf760d70cb27b56fe2c75b57151fd9fab7c714e83ba511c3f2e622e0d8467d4c3c4d40593eb882cbfba69712af7e140104e0f
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
deleted file mode 100644
index c27384680f4d..000000000000
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-text/poppler[cairo]
-	>=app-text/zathura-0.2.7
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" DESTDIR="${ED%/}" install
-	dodoc AUTHORS
-}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
new file mode 100644
index 000000000000..5b4915a8a871
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-text/poppler[cairo]
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index c9a818132347..65f3d7857f01 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,6 @@
-DIST zathura-ps-0.2.4.tar.gz 5980 BLAKE2B ee60ebeea519eb618081816d0f0109cd5c327f5a4676e9260ec5b0d6c309368fe611a3bcb8dbefd7bd9661207630529311eebb1f54f4814eebf18378b640825e SHA512 c63cbd4ff032cffa85305393a8e7f2864986e3a8204832cd7f9f12878e2c69fd0393ace91dd7b0fa8829f3a785abc2675d2ecb99dfa71794d699b567be954922
 DIST zathura-ps-0.2.5.tar.gz 5845 BLAKE2B b716381b66f54626298544fab6ef6f857066db50b027e1b729cfa59e33a23fda4cab09ba8dc33317725058b6942ef84fbc7c24aa30a4d7db2c73f7ac1b6ef137 SHA512 043898fdca56bee28a8e2af61d3216af25e222c0a137737e599881bb21e805dd8a609ff2901a50763bdbb34bf2e3fca2afaf1a59b715f3ba6aa067971c99c258
-EBUILD zathura-ps-0.2.4.ebuild 927 BLAKE2B 28da921678d723a5a7039f80458e38b81e156ee9f1d6c2e472c70b69a66ea247e0e15b29f5218011f7585fa37a066223a6d3fe819063d244252bedc5dc1abd28 SHA512 ba7fbe161e87d476ed6413c44bc63d72ffe1ad79b5f555e9b01db19e7a06a772809b842ccd9e83e1ae98eede115cf9bcd97af005151510d2f2758f186841c837
+DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
 EBUILD zathura-ps-0.2.5.ebuild 931 BLAKE2B da60bdb706487c8e464285a963722cdcac0d979913b65ede2aa1d7d0bb3cfde63927f84aa729bff86f8a8380e245360689c6df6a6219d93fe4c224b7162ce41f SHA512 64e3ca1aead820f3c49c4d65d06b5f7ba3a39f44f0585efcf5daa4a7d4aea01bd59735e6f0132688cd0c5246d41c7feebd9d76c083255a2b5048aa616231f1c1
+EBUILD zathura-ps-0.2.6.ebuild 698 BLAKE2B 9fc5ef9ce7fe4592fa34b38b45b3d0cb67d6af3afbbadad41bf77900d84c7e9fcdf5262523ea26aa6927390fe68e387a6540d1f0ac8413cc57feb085c0fc2470 SHA512 1c7f95999fdb23daff98d731e83e9097afc1a123c2c26550ff0ce49f54a8aa573f305671212ca7736425a66751cb3c34aa62d1410b395e135eb450a9ee1f9e98
 EBUILD zathura-ps-9999.ebuild 934 BLAKE2B 3df19a2ebc4af3b76a3006cad4b381b2a8ac35c29c4c857f423d3a66a2be5870b9ff4aa4f53008dd8fef0b1ed39329dbc8d783444c5b142ebe1fffdc77caa697 SHA512 f4105099eef1796eb4d302c1ba0f76a1d6008464810da8c5bf59e0ef5076901a0dbe1f07dda5da8a52a6e723b8e34e0f3ff37ce4607fe16f98915a93664135d6
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-ps/zathura-ps-0.2.4.ebuild b/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
deleted file mode 100644
index f05771182caf..000000000000
--- a/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/libspectre-0.2.6:=
-	>=app-text/zathura-0.2.7
-	dev-libs/glib:2=
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}/usr"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
diff --git a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
new file mode 100644
index 000000000000..9a5fded445c1
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/libspectre
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 489a8b11ab5d..4faecd68d540 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,7 +1,6 @@
-AUX zathura-0.3.7-tests.patch 702 BLAKE2B 86ff60915631ab060eec0dbcf389157a1b6b8663404b4ea990dba509a64ce36d4921944a361b83e9ce83705b21aaa75b40441687c9b9e7d7d12634a47de99106 SHA512 8c1190b9511495328b841dd90500265e123fa4510e0660ca30510961b9222adcc72ad74f2e6a51d0710b9a86fb88d382c1f92739396804675a5b93cc78a941ca
-DIST zathura-0.3.7.tar.gz 174095 BLAKE2B f0025b75b319dbfa397362e102318f1dc1b5dd41f8beb1380cd781fd7594d15234781d862bf20b59ad4bcb9d1aa67210aa10779c19273e81341bfb74962f3139 SHA512 830a1b88820507a40a20b046c504d8ab3022a35c2c4c0d93a67f77ab5e31d746362a6f28fb9786a647cd0bfd943306aca74cbb2092774aedfb52380e713df533
 DIST zathura-0.3.8.tar.gz 174962 BLAKE2B 44d91564ee42cea80357230c789160e37774d5ae29f8de8bac1fbf734a28e7b862d58d807fe3fa01d323d0baaf88a3960243f8022893c3ad40b67ba8d8a1ae6d SHA512 bad10eaf6642885f96850a01921dc1580357144d8b9b27e88e7765e6fc8e7d8f8c94c240904469e1e6b22114be5117a28a24c87183476d2c89d93f27a5083109
-EBUILD zathura-0.3.7.ebuild 1481 BLAKE2B fb038b60a8a130a760f486dfaaf9051929bed9e6bc5defa99e89db283df286bd1e85ea71e5d88a97350e687125921c6884c0b0e7bf8ba56c3df98fa75158df36 SHA512 0927fdbf3d1a26580505cbdc31d97ffd056d8eb16a14e116673564ccc33fe78604a1913e48e29f4df24f66df07195489a3dd6fbad38764e96a98347261769d73
-EBUILD zathura-0.3.8.ebuild 1414 BLAKE2B f84bbb42bf21f125cf80f0b6304917002d956fcc46a5c14ba02ad8ac9baf7124a97e25b0e492b77a9724d9a6aa06a0d8a1538b2adb3913c82377722eb39dab0d SHA512 f32f5c67abc780518c4355642a40c8e5c0d4690223bee60efaa5988846b452b9fbb872331c38267825218ebc7160c1767c403b9f62cc3f12a17820c11c1062d5
-EBUILD zathura-9999.ebuild 1412 BLAKE2B 5f304234d4918670a7a4750a18e823998e464f1e853bd2a426d9bb683799b2d10a8c91aa1c72b8d6e0070573e45c639291f847cd0564f3977860ddf3e04f8e7c SHA512 f3d639e1dbf2cd2d4c998ae69ef6518c50ec1ba8d6944796cc4394d77e4974c2726529f9b019ce54816264921ec88a148ec0f23241fb729e5c0d58fb25bfd15e
+DIST zathura-0.4.1.tar.xz 148592 BLAKE2B c6fc495ce6413057dc86be95272e8178f32649c68f95052b2db00526b7805b1f6772c628902409af66ba88983171b5456f4cd26c77fcbe32023bf99d1081a55d SHA512 370e7fa12a3a3a2a973870a99f7b2b910c808d6932c1de9093630d7e8bd7d97feb4b7df713e9ac33c7927849b63174a899ce6eaa60db89b1c47d6e13ef181ad6
+EBUILD zathura-0.3.8.ebuild 1410 BLAKE2B 78e227aaf7716eadc6fc448b8f5d8bd0b1e2ab2f90914474270a7ef3700fe89225b8220cb46f617687d669b38c76d77f87dcd9f68858e79d5b16b593fcb89b1d SHA512 6148c69fd47e0342124ba49a6792422baaf4e9644a04473c42229f2e20c4f3559143f115703dde1d70e380a65b95f394acc19929ab59bb276c640c1d5e0697c1
+EBUILD zathura-0.4.1.ebuild 1425 BLAKE2B 389bf013932b8e990b85ce274159a4033852b1b39acdfb796452ecd6d99ff5506f8d2fd2f3c70d39019dffb9f285eb8a9e79813d082b305e3e2c08e369e2086f SHA512 f396dd3221ba19a8e9e666be3d21efa4f1ea684460de67177ee0d07781b77a830ff1c6fd42c42700c8811eec754f0dcff11b3b5b5f6fefd7ad666baabf63f4e0
+EBUILD zathura-9999.ebuild 1408 BLAKE2B 54b2855111b07b5901be97b75bc355bea4408fb4d56e3fc93f8adb8e79b5063ea80fbc2311e2849e52deb409cd1f4b43419c09027dfbaa88ee8ad306ccaf29d0 SHA512 87673c67c76d98776116a57ef204ff53dbc9ad3bf6d5fe2c37b4fe534994143c4626d7721977078af01bf36ace5e8691a686a6da66cb0ad199572739d5d951b4
 MISC metadata.xml 823 BLAKE2B 745fba701ca26b7b430c8b55393ef77dae3175068b0afebcd6e2b3a9ac90823e542734464e4c1852e1306963c06663d13a507b6dc4967b54cdcc12c117046f81 SHA512 4bf7d56010d989c286976ece526874abbeb90449d940d4ff550f5c084ded0e028998c7b021fc2e3015ebf202d43a5d35fa9b4e8083d6eeadfb9c2915cbbeaa87
diff --git a/app-text/zathura/files/zathura-0.3.7-tests.patch b/app-text/zathura/files/zathura-0.3.7-tests.patch
deleted file mode 100644
index 77321445c6a6..000000000000
--- a/app-text/zathura/files/zathura-0.3.7-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- zathura-0.3.7/tests/Makefile
-+++ zathura-0.3.7/tests/Makefile
-@@ -7,7 +7,11 @@
- include config.mk
- 
- PROJECT = tests
--SOURCE  = tests.c $(wildcard test_*.c)
-+ifneq (${WITH_SQLITE},0)
-+	SOURCE  = tests.c $(wildcard test_*.c)
-+else
-+	SOURCE  = $(filter-out database-sqlite.c,tests.c $(wildcard test_*.c))
-+endif
- OBJECTS       = $(addprefix ${BUILDDIR_RELEASE}/,${SOURCE:.c=.o})
- OBJECTS_DEBUG = $(addprefix ${BUILDDIR_DEBUG}/,${SOURCE:.c=.o})
- OBJECTS_GCOV  = $(addprefix ${BUILDDIR_GCOV}/,${SOURCE:.c=.o})
-@@ -23,8 +27,6 @@
- INCS     += $(SQLITE_INC)
- LIBS     += $(SQLITE_LIB)
- CPPFLAGS += -DWITH_SQLITE
--else
--SOURCE = $(filter-out database-sqlite.c,$(OSOURCE))
- endif
- 
- ifneq ($(WITH_MAGIC),0)
diff --git a/app-text/zathura/zathura-0.3.7.ebuild b/app-text/zathura/zathura-0.3.7.ebuild
deleted file mode 100644
index 8281cf21819d..000000000000
--- a/app-text/zathura/zathura-0.3.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs virtualx xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="+magic sqlite synctex test"
-
-RDEPEND=">=dev-libs/girara-0.2.7:3=
-	>=dev-libs/glib-2.32:2=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3.6:3
-	magic? ( sys-apps/file:= )
-	sqlite? ( dev-db/sqlite:3= )
-	synctex? ( >=app-text/texlive-core-2015 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tests.patch
-
-	epatch_user
-}
-
-src_configure() {
-	myzathuraconf=(
-		WITH_MAGIC=$(usex magic 1 0)
-		WITH_SQLITE=$(usex sqlite 1 0)
-		WITH_SYNCTEX=$(usex synctex 1 0)
-		PREFIX="${EPREFIX}"/usr
-		LIBDIR='${PREFIX}'/$(get_libdir)
-		CC="$(tc-getCC)"
-		SFLAGS=''
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_test() {
-	Xemake "${myzathuraconf[@]}" test
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura/zathura-0.3.8.ebuild b/app-text/zathura/zathura-0.3.8.ebuild
index 3bbbd76e6463..77c3802a951a 100644
--- a/app-text/zathura/zathura-0.3.8.ebuild
+++ b/app-text/zathura/zathura-0.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="+magic sqlite synctex test"
 
-RDEPEND=">=dev-libs/girara-0.2.8:3=
+RDEPEND=">=dev-libs/girara-0.2.8:=
 	>=dev-libs/glib-2.32:2=
 	x11-libs/cairo:=
 	>=x11-libs/gtk+-3.6:3
diff --git a/app-text/zathura/zathura-0.4.1.ebuild b/app-text/zathura/zathura-0.4.1.ebuild
new file mode 100644
index 000000000000..1b9071f73e74
--- /dev/null
+++ b/app-text/zathura/zathura-0.4.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson virtualx xdg-utils
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="+magic seccomp sqlite synctex test"
+
+RDEPEND="dev-libs/appstream
+	>=dev-libs/girara-0.3.1
+	>=dev-libs/glib-2.50:2
+	dev-util/desktop-file-utils
+	dev-python/sphinx
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	magic? ( sys-apps/file )
+	seccomp? ( sys-libs/libseccomp )
+	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+	synctex? ( app-text/texlive-core )"
+
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		--libdir=/usr/$(get_libdir)
+		-Denable-magic=$(usex magic true false)
+		-Denable-seccomp=$(usex seccomp true false)
+		-Denable-sqlite=$(usex sqlite true false)
+		-Denable-synctex=$(usex synctex true false)
+		)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 70f20b7aed63..89006688f4d4 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="+magic sqlite synctex test"
 
-RDEPEND=">=dev-libs/girara-0.2.7:3=
+RDEPEND=">=dev-libs/girara-0.2.7:=
 	>=dev-libs/glib-2.32:2=
 	x11-libs/cairo:=
 	>=x11-libs/gtk+-3.6:3
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 35145b268b04..343fed96d885 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/airline-themes/Manifest b/app-vim/airline-themes/Manifest
index 98ab04ca7e93..09ae33feea58 100644
--- a/app-vim/airline-themes/Manifest
+++ b/app-vim/airline-themes/Manifest
@@ -1,2 +1,4 @@
+DIST airline-themes-0_pre20181021.tar.xz 38516 BLAKE2B 2fe1e848b57546aa39e02262e5ae3e0164830641b1c8ccca1d3dc04afab8db4c618b079c63d5854697737610df1ab891d1622a22b89c431331b8bd16cc31fc3e SHA512 764fa44a4711c92a03f6f16a3d774ad871d13adfa53e7b942bad677ff1d03f32aa24723c612d50c14ca996fa971f48695e259cc53345d253d38e63f08651e002
+EBUILD airline-themes-0_pre20181021.ebuild 425 BLAKE2B e13a2eff69964474e51c50957793f8223092211f5d11acb5cbd7980bd7e23d5a52cfd647dc7c3cc0af9a62ab2577ef9f4b8b602cf6b33318d75507b8dacb42d7 SHA512 23d4c482b11453a84b77811bbd13fef6366ad2322a957cc1a39191e4d97ff38c316e692006010f4b28d86463eed703ea9c00040c71a2f8eaffc6ffd21eb21f16
 EBUILD airline-themes-9999.ebuild 408 BLAKE2B 465ac11ae90275b3cbdf3171b957257075a86ba73699f12fd5ef765ee31094bf39396dd2b246ea1dc321051f9701b95d09065363b4d735f45a83bab37c6e3da5 SHA512 4f96d7819deafa452e8efdb4531208a19fad406e96cbfd2765ff216ed0f191cccddeedc4cfa2b4346ed1896fa2424aa4064a833444f0b1a3e4957dc393a391de
 MISC metadata.xml 439 BLAKE2B 45dd2e92f4cbcd83e0acbe5d4bae4aebe12c541184edcdc1187e0a8f8aa3887bbb089d9253147c451e05be8b3b6d9f8fe84a9f4b6cacfa24e11a2288396ef86c SHA512 d652a18b151c701e17191e1dbe3dc57f6b8cd02ec2107ceef4dd9ae7164724b62389872025f473cc85c328b8552b9e16eadc2103080488e296e2d81253ce08f4
diff --git a/app-vim/airline-themes/airline-themes-0_pre20181021.ebuild b/app-vim/airline-themes/airline-themes-0_pre20181021.ebuild
new file mode 100644
index 000000000000..722ec491e216
--- /dev/null
+++ b/app-vim/airline-themes/airline-themes-0_pre20181021.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a collection of themes for vim-airline"
+HOMEPAGE="https://github.com/vim-airline/vim-airline-themes"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-vim/airline"
+RDEPEND="${DEPEND}"
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 9e01bab5cbaa..fca25e3faca1 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,8 +1,4 @@
-DIST gentoo-syntax-20160530.tar.gz 18950 BLAKE2B 0e769cb4d67ebf1b4299a1aa0dc1bc1ce942a9e6b4f3528b5499ff83ffe9d165697576901c5ba9cca52de6e26abd0298f1f7a5383cdc0c8ca1dff0de2945080c SHA512 38881c5f16499eb053eb7a5514f6324b2a161f1392a044db0bbaf0cb71a0f17e1edebd4a685ff856a78525fbcb8c6267daa2503cfbc6f94d841cf3f6a25045bd
-DIST gentoo-syntax-20170225.tar.gz 18939 BLAKE2B 7586b45791e74e69ad6e0607bc0a4d52eba4747a6c4d9933d43db1196ceb57ac6317279c9e86f77c71bdb7379828dd96fe6d63a2933a3660f1639faf1b6df5d5 SHA512 2c01577910eccd413b85c094dbd12bf8445e2f560be1fffc4a4c3130b32587f9c298d8442b5cf12bd7d2950ab8c9e5b95a72f2f41c42c6dc939ffa2c26fd71d5
 DIST gentoo-syntax-20180821.tar.bz2 18361 BLAKE2B 4134fd0a3d75d86f3984f135021063b68588083f191efcb94d7b599460703d6eb501bad7de2aa0cc9cdc4447d73b83e4b36cee2acdd113e7d0a879e1e864e2fb SHA512 09c70ded667b489e03f02e0e72fca32f13a40501a5e319b387967e75f616c7f3dc44ceab3a46b776a509263f58668223eb85d51ba58ca3fbc48e4c05d7345dfc
-EBUILD gentoo-syntax-20160530.ebuild 1808 BLAKE2B af7306c5b7ad151ef2da28bac70168ba6a2b0dd943fec7566b9392517ec04a851b5aa0fbea0c3cb355e9d2a79dbea352fa01d31cc8291db7a7bde5ff9a206387 SHA512 24f5f1a13094fa7afbad40c681270f867c6e9459b3558ed27c26a2664ba59f71b6f3dc34e142553f028cf1735577e6bdac6aecb030661af51faea237f2316e91
-EBUILD gentoo-syntax-20170225.ebuild 1823 BLAKE2B 1798286c3791945b838adab32855a01ad592e60d6f295d8dd31c2c95549651e17fc262bbe3f9c8d00480b6c0537a116fd26b70ae042c56983f845d64785b92e5 SHA512 1c6aa3f277c45d217d14347b32b44c14ccc3cdbea89ed8383177c51682cc2ce057f58d4f89406ee7b0289799df456575562031006110ea788523f6244dd9398e
-EBUILD gentoo-syntax-20180821.ebuild 1287 BLAKE2B c708e1b0229d178f87fe5c8eb8da11586ba954bcdd0460e1fb47685470be5bc0241762c53516627dfd01149233ccc467fd1ec44c81433045dabf7aae62f10fd6 SHA512 9962008a1e4cfc008926e29531a52cd66e8a4f8dedf6aac88cdd9e39e052d1359c564c046e3682ed30912ab5425a2eb46a8ea1772285506448f9d6f0af7895c6
+EBUILD gentoo-syntax-20180821.ebuild 1283 BLAKE2B 833c4fd4b2bc85a87359f188f86db454dafb1938183c4b65905d0cde2dc4099a0ba4e5cfbc4a99a18bd89f0d57ff47df48f4ad3a687b9aaa2309d22c57a1624e SHA512 b7af1703f420fed2e2a890e86e78e68037ff1405f55d7c8ec56a63c7466b998f1c9f024ae342ef45e301f8fe2acb5731c2bf941fb7a58ffdb67986dee9d4c69e
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 560 BLAKE2B 21f954af20949469ae0f30a81743d9bdd1114b64b51b640d0da2d294897a885878a13bb1d408c69cd9e1afe936fd02c1ae7170e48a2f5d2280afe525266e448a SHA512 89d979077e4171aece29bd44f3d6ab6a84261dfa8eaa655b5b5d77dc20c5e2ea7cd361002e0f4d8212793449bd86da03e2d2e59bc6d23a158dceca1d60d416fe
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
deleted file mode 100644
index 8d1a5d52296a..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20160530.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 vim-plugin
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/gentoo/gentoo-syntax.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-LICENSE="vim"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		else
-			elog "Note for developers and anyone else who edits ebuilds:"
-			elog "    This release of gentoo-syntax now contains filetype rules to set"
-			elog "    fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
-			elog "    If you find this feature breaks things, please submit a bug and"
-			elog "    assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
-			elog "    flag to remove these rules."
-		fi
-	fi
-}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
deleted file mode 100644
index e8e229270960..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20170225.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 vim-plugin
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/gentoo/gentoo-syntax.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-LICENSE="vim"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		else
-			elog "Note for developers and anyone else who edits ebuilds:"
-			elog "    This release of gentoo-syntax now contains filetype rules to set"
-			elog "    fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
-			elog "    If you find this feature breaks things, please submit a bug and"
-			elog "    assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
-			elog "    flag to remove these rules."
-		fi
-	fi
-}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
index 32d7c5342126..31b2eb13b129 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
 
 LICENSE="vim"
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/python-mode/Manifest b/app-vim/python-mode/Manifest
deleted file mode 100644
index f9fba336ce33..000000000000
--- a/app-vim/python-mode/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX python-mode-0.6.18-dont-add-cwd-to-syspath.patch 496 BLAKE2B c936b7966d7135d921f22d7750b56a246d3b9e2c89576eb17a063de9429df9fae9b2f0cd8dc11cd6e517f33aa9a5c4196effc0605468c288b98a49433c81f89e SHA512 3008c54ec29aa0c6f9a96874bf970ddf6264b26090df55336a493ac4d69f52a8e2cb938323c064c158dc6fa7f8b94f5ae1d4761fc4b093c14bb7664e9a196696
-DIST python-mode-0.6.18.tar.gz 386846 BLAKE2B 8fd330ddce4a9107e9ca3248a727e4291b3474810360962425ef4afab25eff8a5a7319bedd91ad7899d160b2f48a28ab8f56a27d5557859f6fb3d906f7d11758 SHA512 0e3159a055304443c8b15590c424ac0f4a4303e343882ff91f01f5b959274931dea83969ab1dcd19ce95894c7da5be60699d51b852dc73165a99a271feec4e64
-DIST python-mode-0.9.0.tar.gz 671985 BLAKE2B 3bfbbcd11953fbecc0214b66271ab37bfee4476aed5d9a6f0e82c9111d9f6e1404839340079c49f4b73608c899a12c7af2a5a1044f104a3aafdef3c8bd20310e SHA512 03aef010a95241abf9605ca334d95a2c0b917c61aea23f794e574acd56ba5d958032975d17d1af40a5edccd90f0172783a26fc301d799fd619bfd263da685161
-EBUILD python-mode-0.6.18-r3.ebuild 1554 BLAKE2B 66181b3a79742443316b446b1ecf9814217f3eaee2176ac3dfb7d0ce70590ae5eee592e90ceed5ee43265a60a761c58a91c9b77d981f2a4e31a0ba9198302bc0 SHA512 3276c95a1be4212fd8b3915aa999cdf114a90e1a4da98f555d7aab0af5ecc6a0202658864271e9214fd7b8725fd6e72b57834e628fe299977b7695d6f72af8de
-EBUILD python-mode-0.6.18-r4.ebuild 1862 BLAKE2B 20cd3c9c6bb42814f1103c27ff5b06d0e0b2334c923ceaa0ae0abd85774fccc180f875401686b96316ae3220e8e07dcea0256afb66fc687d58fd97c8733da255 SHA512 185c89c26be4533f2be897feb7810aa4dacd96c222ed200b807c52d59a3f374f764e6e412fbe15e9cf54f88c4fd65b30d6d612417d7c44111952fa7b40c3b666
-EBUILD python-mode-0.9.0-r1.ebuild 1194 BLAKE2B 0216204c6807cda3666fb928b086e0020aea538b816ef1efd48476f7a6f916e7bbc430881b5a5fb199f113529fed879812baa5d76b3bb06bf1bae7d2e1ddb38e SHA512 67d5059cd4bf8314161ac0fd7595364ca000c7613fba9eecc167955eb016a982e062154c7ea5e9ac16af0603e847700407fa3ec1e67cfc5a4458f72e862df255
-EBUILD python-mode-0.9.0.ebuild 990 BLAKE2B 7bb298fcca9fe332131d40a39ad81234794cffd285ff2d8bea80e826d540e4bc14807d0641947dfd9bbce9fd95e2ba3ca1afd3683cacdb5635989e42a5b35067 SHA512 4ed92ab57405e5903afb64c1029eb3a3fd866c9a966663ddbde65c0157a736ede66b2659ac82ec4845712eaec0897828fcc91d24edce109605ce6f1ef95d5f7a
-MISC metadata.xml 590 BLAKE2B fe1ad1cbd9d75eea115d7a6e24f3fda0fcebcd3fbca6627e822a50934ab02665bf6eecab920f000592b0572d8995d653cd8cd9dda5cfe12b3a9616459f2dc72c SHA512 b6fbd9c3f197ca6b1df05584448514c12f78eefa1a7f80fa74c0a46ab3e6fdce1b3824fdff22060cf056fce1463ee4af62b7988c7a5025942e7ed072ad9f2d99
diff --git a/app-vim/python-mode/files/python-mode-0.6.18-dont-add-cwd-to-syspath.patch b/app-vim/python-mode/files/python-mode-0.6.18-dont-add-cwd-to-syspath.patch
deleted file mode 100644
index fb92614233bd..000000000000
--- a/app-vim/python-mode/files/python-mode-0.6.18-dont-add-cwd-to-syspath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/klen/python-mode/issues/162
---- a/ftplugin/python/init-pymode.vim
-+++ b/ftplugin/python/init-pymode.vim
-@@ -46,10 +46,9 @@ if !pymode#Default('g:pymode_path', 1) || g:pymode_path
- python << EOF
- import sys, vim, os
- 
--curpath = vim.eval("getcwd()")
- libpath = os.path.join(vim.eval("expand('<sfile>:p:h:h:h')"), 'pylibs')
- 
--sys.path = [libpath, curpath] + vim.eval("g:pymode_paths") + sys.path
-+sys.path = [libpath] + vim.eval("g:pymode_paths") + sys.path
- EOF
- 
- endif " }}}
diff --git a/app-vim/python-mode/metadata.xml b/app-vim/python-mode/metadata.xml
deleted file mode 100644
index 40d7427cf17f..000000000000
--- a/app-vim/python-mode/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vim@gentoo.org</email>
-		<name>Gentoo Vim Project</name>
-	</maintainer>
-	<longdescription>
-		Python-mode is a vim plugin that allows you to use the pylint, rope,
-		pydoc, pyflakes, pep8, mccabe libraries in vim to provide features like
-		python code looking for bugs, refactoring and some other useful
-		things.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">klen/python-mode</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-vim/python-mode/python-mode-0.6.18-r3.ebuild b/app-vim/python-mode/python-mode-0.6.18-r3.ebuild
deleted file mode 100644
index 6900bfbcd9bb..000000000000
--- a/app-vim/python-mode/python-mode-0.6.18-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-VIM_PLUGIN_MESSAGES="filetype"
-VIM_PLUGIN_HELPFILES="PythonModeCommands"
-VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
-
-inherit vim-plugin eutils
-
-DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
-SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/astng
-	dev-python/autopep8
-	dev-python/pyflakes
-	dev-python/pylint
-	dev-python/rope
-	dev-python/ropemode
-	"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dont-add-cwd-to-syspath.patch
-
-	# debundling fun
-	rm -rf pylibs/pylama/{pep8.py,pyflakes} pylibs/{autopep8.py}
-	#rm -rf pylibs/{rope,ropemode}  #475686
-	sed -e 's/from .pep8/from pep8/g' \
-		-e 's/from .pyflakes/from pyflakes/g' \
-		-i pylibs/pylama/utils.py || die
-	# there's still pylint left, I failed to debundle it :/
-
-	mv pylint.ini "${T}" || die
-	sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
-		-i autoload/pymode.vim || die # use custom path
-}
-
-src_install() {
-	vim-plugin_src_install
-	insinto usr/share/${PN}
-	doins "${T}"/pylint.ini
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-	einfo "If you use custom pylintrc make sure you append the contents of"
-	einfo " ${EPREFIX}/usr/share/${PN}/pylint.ini"
-	einfo "to it. Otherwise PyLint command will not work properly."
-}
diff --git a/app-vim/python-mode/python-mode-0.6.18-r4.ebuild b/app-vim/python-mode/python-mode-0.6.18-r4.ebuild
deleted file mode 100644
index 0cfa612859c5..000000000000
--- a/app-vim/python-mode/python-mode-0.6.18-r4.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
-
-VIM_PLUGIN_MESSAGES="filetype"
-VIM_PLUGIN_HELPFILES="PythonModeCommands"
-VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vim-plugin
-
-DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
-SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)
-	dev-python/astng[${PYTHON_USEDEP}]
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/rope[${PYTHON_USEDEP}]
-	dev-python/ropemode[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-dont-add-cwd-to-syspath.patch
-	eapply_user
-
-	# debundling fun
-	rm -rf pylibs/pylama/{pep8.py,pyflakes} pylibs/{autopep8.py}
-	#rm -rf pylibs/{rope,ropemode}  #475686
-	sed -e 's/from .pep8/from pep8/g' \
-		-e 's/from .pyflakes/from pyflakes/g' \
-		-i pylibs/pylama/utils.py || die
-	# there's still pylint left, I failed to debundle it :/
-
-	mv pylint.ini "${T}" || die
-	sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
-		-i autoload/pymode.vim || die # use custom path
-}
-
-src_install() {
-	vim-plugin_src_install
-	insinto usr/share/${PN}
-	doins "${T}"/pylint.ini
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-	einfo "If you use custom pylintrc make sure you append the contents of"
-	einfo " ${EPREFIX}/usr/share/${PN}/pylint.ini"
-	einfo "to it. Otherwise PyLint command will not work properly."
-}
diff --git a/app-vim/python-mode/python-mode-0.9.0-r1.ebuild b/app-vim/python-mode/python-mode-0.9.0-r1.ebuild
deleted file mode 100644
index 4bb9eea27f02..000000000000
--- a/app-vim/python-mode/python-mode-0.9.0-r1.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
-
-VIM_PLUGIN_MESSAGES="filetype"
-VIM_PLUGIN_HELPFILES="PythonModeCommands"
-VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit vim-plugin python-single-r1
-
-DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
-SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/rope[${PYTHON_USEDEP}]
-	dev-python/astng[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	dev-python/ropemode[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
-		-i autoload/pymode.vim || die # use custom path
-}
-
-src_install() {
-	vim-plugin_src_install
-	insinto "usr/share/${PN}"
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-}
diff --git a/app-vim/python-mode/python-mode-0.9.0.ebuild b/app-vim/python-mode/python-mode-0.9.0.ebuild
deleted file mode 100644
index ea6be080f04c..000000000000
--- a/app-vim/python-mode/python-mode-0.9.0.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
-
-VIM_PLUGIN_MESSAGES="filetype"
-VIM_PLUGIN_HELPFILES="PythonModeCommands"
-VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
-
-inherit vim-plugin eutils
-
-DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
-SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/rope
-	dev-python/astng
-	dev-python/pylint
-	dev-python/pyflakes
-	dev-python/autopep8
-	dev-python/ropemode"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
-		-i autoload/pymode.vim || die # use custom path
-}
-
-src_install() {
-	vim-plugin_src_install
-	insinto usr/share/${PN}
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-}
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 1630ee9828cc..6a872093dacc 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/ada/Manifest b/app-xemacs/ada/Manifest
index 25c98a26354e..2954c172bff3 100644
--- a/app-xemacs/ada/Manifest
+++ b/app-xemacs/ada/Manifest
@@ -1,5 +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
+EBUILD ada-1.16.ebuild 291 BLAKE2B 04197addc267a2ee22fdbc635df26f5da9b21e133e64962c8e47d794e3f65f26bf90eaba0787228d70fe31037ae6413eb5d31f90a359822cdc7765dd033244dc SHA512 7b837a57d30e0efd3a3649aa4c65c05215e6c6547ac1ec4fc03e53364db3c4853e057b35c38456f3d52b0b3b6c1ce7605a39b6189ca254d9f450204bfff5ae65
 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
index bc9e72eb100c..5ad4db62d96d 100644
--- a/app-xemacs/ada/ada-1.16.ebuild
+++ b/app-xemacs/ada/ada-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/apel/Manifest b/app-xemacs/apel/Manifest
index 811f3234f1d5..044f9539cd6b 100644
--- a/app-xemacs/apel/Manifest
+++ b/app-xemacs/apel/Manifest
@@ -3,5 +3,5 @@ DIST apel-1.34-pkg.tar.gz 124989 BLAKE2B c8504878f8c0df2e41bfd81db76136f280f2230
 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
+EBUILD apel-1.36.ebuild 372 BLAKE2B cc98d444c3c14a0c9afa72de8ad2d600dcad0db81a1a147012f0a8155db06d1dcf0253465daa396f8e5e45271af501af25539ad374e66ee7ab6f704e507ef4ef SHA512 af5d9a0fbb2d76349aa43e316cc4eedda7ef4a02322e89a9eac98c8d5a6dae04c7ed0330342475b10a2ef1641f2c8821b6efeaa6c47c74000b1e534aa1b38a87
 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
index 378aeee4c8f5..5c6722ab5e11 100644
--- a/app-xemacs/apel/apel-1.36.ebuild
+++ b/app-xemacs/apel/apel-1.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+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 169f4179c158..f2193f5ef211 100644
--- a/app-xemacs/auctex/Manifest
+++ b/app-xemacs/auctex/Manifest
@@ -3,5 +3,5 @@ DIST auctex-1.51-pkg.tar.gz 1002835 BLAKE2B 8f71cb30bb78108d59e5ba76dbf0763c7811
 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
+EBUILD auctex-1.58.ebuild 402 BLAKE2B cbfc3cee83ed4eb9f8b7e949139fd3e391422b2b0bdf4c01ae94bb07e31dc780c0a0bbcf326baed254311a6abbeaedd41b7c51f5067fd90a19493c73c258100f SHA512 cfd77ce33af5eef790e4c1a0edbbd1b49815d9a9fef0fb6b081a1debfb167f621fc640c2fddeb36b5067a4b5137dd8483953eb6a6907154603b7c10ab5e2fa98
 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
index 811b4f7d062d..8296465bd655 100644
--- a/app-xemacs/auctex/auctex-1.58.ebuild
+++ b/app-xemacs/auctex/auctex-1.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,6 @@ app-xemacs/mail-lib
 app-xemacs/edit-utils
 app-xemacs/xemacs-ispell
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/bbdb/Manifest b/app-xemacs/bbdb/Manifest
index 83e112fc1341..319393b89ceb 100644
--- a/app-xemacs/bbdb/Manifest
+++ b/app-xemacs/bbdb/Manifest
@@ -1,5 +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
+EBUILD bbdb-1.34.ebuild 593 BLAKE2B 54cfde8e27de8e2877518b05365a0adcfb35ce8c6951962ad969bd5746f6283d726aada3bd2008f75c93656fde87f6e2c39a8ceb67594e3234d05c5d8bd3a8a9 SHA512 4580a71eb25897a8eaed543d2956621fa030338744a8ba749dab423576762f4a1f867e66f116c2d96660d705d9999ec853ed8c837d99a9966d1e3e0c87183447
 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
index 06710d64ad4b..c9cb958214dd 100644
--- a/app-xemacs/bbdb/bbdb-1.34.ebuild
+++ b/app-xemacs/bbdb/bbdb-1.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,6 @@ app-xemacs/net-utils
 app-xemacs/os-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/build/Manifest b/app-xemacs/build/Manifest
index a83aa0f29fea..027cae815177 100644
--- a/app-xemacs/build/Manifest
+++ b/app-xemacs/build/Manifest
@@ -3,5 +3,5 @@ DIST build-1.15-pkg.tar.gz 49849 BLAKE2B a41e3441a9e1734bfd5caf1b999644fe0ff36c5
 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
+EBUILD build-1.18.ebuild 383 BLAKE2B a45c48bb09da4ff470b2fd3b8542c561dc557148508d7dc9d3c06b43627f31350398b78d6f8147453512e92ed7ddddfba7460f4b75c55c6a2115ec1eb9957238 SHA512 f916583f1c60a1b8a070201cca7e57d1dc02e683595041393768e6e5356e5a6b3045d5f22b7c9f238c3989d949759fb49782a775025919b05ac55fc2e19619f7
 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
index d9ebc65fdffc..3054e6c56f7d 100644
--- a/app-xemacs/build/build-1.18.ebuild
+++ b/app-xemacs/build/build-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/dired
 app-xemacs/w3
 app-xemacs/prog-modes
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+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 56b1572e7f17..5488e7b79128 100644
--- a/app-xemacs/c-support/Manifest
+++ b/app-xemacs/c-support/Manifest
@@ -1,5 +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
+EBUILD c-support-1.24.ebuild 334 BLAKE2B 5d9ced878f9dff4127968a57a243355c8155fb5145b98a064536d2546e0db2a75091b87be3b5b4993e1c4f93ed684c24e23029e8186cf9de2e25e315d559e4a8 SHA512 f3aa4c63ee5f4b69bd88a7ca54ac011c40df5461376fd3b462c19e2ee4fba0c25cffe38951b7d916bf702c8c6102da8ea8574debaf811cd6517cdf1aad8dbfbe
 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
index b2cc61667f8e..4f7fe38422d5 100644
--- a/app-xemacs/c-support/c-support-1.24.ebuild
+++ b/app-xemacs/c-support/c-support-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/cc-mode
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/calc/Manifest b/app-xemacs/calc/Manifest
index 54f189b30ac4..f39753132b4e 100644
--- a/app-xemacs/calc/Manifest
+++ b/app-xemacs/calc/Manifest
@@ -1,5 +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
+EBUILD calc-1.28.ebuild 287 BLAKE2B aa145435f2626e62dc2e347e401d37c8fb8db36a2a4e7cadeacb473d5d25e2b56d63f94bd7fa38f75026cf63bb18305261ac62f99ca4facc34c82cd12bf7f316 SHA512 6947f2d16cf77fa2a53e2d711580b02c63b31f0fbd9fd433a73e5c605ca57bdf4086eb8c56a4f8b03903a28a1b01bf083767d838545d4e67d0e85092afe67f8e
 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
index 28092079ac3d..3f94d53e5c48 100644
--- a/app-xemacs/calc/calc-1.28.ebuild
+++ b/app-xemacs/calc/calc-1.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/calendar/Manifest b/app-xemacs/calendar/Manifest
index 9f9e6517d233..045a3c261fd8 100644
--- a/app-xemacs/calendar/Manifest
+++ b/app-xemacs/calendar/Manifest
@@ -3,5 +3,5 @@ DIST calendar-1.38-pkg.tar.gz 411386 BLAKE2B be833c4f81a9d2e79e06768836fe1e58601
 DIST calendar-1.42-pkg.tar.gz 409513 BLAKE2B 81f59fa4743682beed93be1eadf211ef8f096720bc44ee47d80142ec037029942e2cb02166b15318dbba300eedaa551c1426fbf3e454c3de119f5c2e41a8d4d8 SHA512 75e0eeaab3c818d28d4b0da798c961108457d7b2ffb9c671589194473ff3d3f967e52b956601acd42d53ef584d72cac08d4de47a9aa3ea3720211bfde201c8f2
 EBUILD calendar-1.32.ebuild 295 BLAKE2B 7b3ad75b0119b31f8531a1dbd36166253231fcea2352ad1802e75381bda52f263f11a3fbbd36a63cf557cc6629438a65211ffb5674e12b509e733dddb915f2cb SHA512 c57e15c7bfd9d85693440be694a0eea8a243643884ac3a222c44a0c0680fe772e11c3e010889032685e4d757da4c4ca02150788e3b667abf2aea66ca16717680
 EBUILD calendar-1.38.ebuild 295 BLAKE2B 7b3ad75b0119b31f8531a1dbd36166253231fcea2352ad1802e75381bda52f263f11a3fbbd36a63cf557cc6629438a65211ffb5674e12b509e733dddb915f2cb SHA512 c57e15c7bfd9d85693440be694a0eea8a243643884ac3a222c44a0c0680fe772e11c3e010889032685e4d757da4c4ca02150788e3b667abf2aea66ca16717680
-EBUILD calendar-1.42.ebuild 323 BLAKE2B 23c964084976bcb1afd8e6c985fd348bfcd2fa0a277c1ed417235d919a977ea648bb9443805f0060b3f3acc960666c48991eec9aa8069cb855ecb76c80dc605a SHA512 258f2204e81588b11517ad35715479db7ca7089c1f5d10169ba2e48216912d0d5e23ef8c6ca8cf44a13784dd2c827778b815504196569f4d3aa9b5fe4dba2c12
+EBUILD calendar-1.42.ebuild 319 BLAKE2B fd4f516b9970ed99b203fcb61cddc0cdd825ef53527698cf09b37aa98bcd0b05421db30e8e76e76a1516450f561b3845a8c70e73fb4a2545650cbbf9ed9fd158 SHA512 b18df8b493ff67aa22770b5c78acaac4e066f015c2c06cc03e60858868dba84356bbab5a0e0b9e2e311b0c86a379f1cfe42295673bf52ddc8aada2cad9b82d30
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/calendar/calendar-1.42.ebuild b/app-xemacs/calendar/calendar-1.42.ebuild
index 5e7641afd8c4..ead7639c6320 100644
--- a/app-xemacs/calendar/calendar-1.42.ebuild
+++ b/app-xemacs/calendar/calendar-1.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+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 cef9efef85c3..923f48315deb 100644
--- a/app-xemacs/cc-mode/Manifest
+++ b/app-xemacs/cc-mode/Manifest
@@ -1,5 +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
+EBUILD cc-mode-1.99.ebuild 323 BLAKE2B 8b489aa7b66bf2be024f524ac4c156bc83f10fb7d9148a8fe28ded5c101c76ecd291730f466b20264b5d29ca9f0c6e91f28fd2d5e13290956217a4de49769e5c SHA512 d6f9910591ae58db85fd4c1332f8e12c3d84d9cd591864a458089b1cfd0929b72fec062d96d9b4530e77b5be6b61c1c42275406c52731bfd335ce011e9400e39
 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
index 307cfcdff2cb..176e415f3407 100644
--- a/app-xemacs/cc-mode/cc-mode-1.99.ebuild
+++ b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+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 56e43ad2d55c..719ab0063339 100644
--- a/app-xemacs/cedet-common/Manifest
+++ b/app-xemacs/cedet-common/Manifest
@@ -1,5 +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
+EBUILD cedet-common-1.03.ebuild 335 BLAKE2B 45928a4818dad212150501a6619d03a66ee9430fdfc1e59c8ab3d5b537e78477150ffcb1722a749b1fe3c9797d8ad27f311b09ea1e8843506a44d07a93d1ae1d SHA512 1e7d23ef87412379f63ac4df5fdb584f42772dd9bde8bd78df978c2735e81232269c0477e9a4f153c78f9326956708691e91c4d4b695d848e3cb2c8b6373bc2f
 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
index f8607098af39..68de4283e5ac 100644
--- a/app-xemacs/cedet-common/cedet-common-1.03.ebuild
+++ b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/clearcase/Manifest b/app-xemacs/clearcase/Manifest
index ab4814ded62b..697f0576216d 100644
--- a/app-xemacs/clearcase/Manifest
+++ b/app-xemacs/clearcase/Manifest
@@ -1,5 +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
+EBUILD clearcase-1.12.ebuild 385 BLAKE2B cf858be00a08f9bcc19d8ebbb4603bc3907e50a2aa6bf71ffbe234781f7a9c910a61ee8ead6baa528060860d01ded325d1245bfacc6a30c0b8ebf4bd7d4b9b61 SHA512 83df7868610d665fe2067ea9b5d0ec49b7dc2f469253e0fe2efc05f373eee5f2893a9e69ce89470efc387696469ed59268e5fd6c00207761294e98ceaf87b2e6
 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
index 76360ec67b66..ef2e24e63929 100644
--- a/app-xemacs/clearcase/clearcase-1.12.ebuild
+++ b/app-xemacs/clearcase/clearcase-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/cogre/Manifest b/app-xemacs/cogre/Manifest
index ed4b8921c9e9..61472066db48 100644
--- a/app-xemacs/cogre/Manifest
+++ b/app-xemacs/cogre/Manifest
@@ -1,5 +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
+EBUILD cogre-1.04.ebuild 393 BLAKE2B cf7c835d86be2c06dadcbac122d5cdb47a5a0b141691e4a8f09010a14e0a13c7310d00b1dda7825b5f0ae4d1333d73380e29e573939a0fbd0343533a38f2ed82 SHA512 7b79ab9f565f34a6d7f802e8556b032518ac167eb44d427e4b0c495a78210d8b4d77248d1a2a752cd10ea9456209720830f3c53e99c3408e221b34f3743c38e7
 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
index a54c2ee0b728..b465590782be 100644
--- a/app-xemacs/cogre/cogre-1.04.ebuild
+++ b/app-xemacs/cogre/cogre-1.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,6 @@ app-xemacs/cedet-common
 app-xemacs/eieio
 app-xemacs/semantic
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/cookie/Manifest b/app-xemacs/cookie/Manifest
index 4531b85076e3..cfa56ed4d7b6 100644
--- a/app-xemacs/cookie/Manifest
+++ b/app-xemacs/cookie/Manifest
@@ -1,5 +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
+EBUILD cookie-1.17.ebuild 299 BLAKE2B d9646a3c02fd15cddfb79d0990b51433b171474ed82e117e154ea848e7cf40a451c6d86fc6f4b0935a07b5ac9dfb97c43b3b396fe94a82bc5ae83c3e4d4fb947 SHA512 28b95076b48fc334230c567eb1d039771767da8b444b7d703213b3ba7ed4054c5c6de7a762273fabca608fc71a192811cba6f06c9b239dab894e0255f8af0a66
 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
index e070c3cde313..0d462887e91d 100644
--- a/app-xemacs/cookie/cookie-1.17.ebuild
+++ b/app-xemacs/cookie/cookie-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/crisp/Manifest b/app-xemacs/crisp/Manifest
index 6029a37ae203..8360b410cee8 100644
--- a/app-xemacs/crisp/Manifest
+++ b/app-xemacs/crisp/Manifest
@@ -1,5 +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
+EBUILD crisp-1.17.ebuild 258 BLAKE2B aaa3059779033eac5038f3dd07de861a90b112ddb7e6b709367c96e50a1f6a08b47f13ad998304dbee34f25faa94b0efb0f78afc6744895f4aeb04bcc8706e33 SHA512 c17cbb8d225549b5a9c8652c8abdbc9cb39e429919d5482e9c73381d7e32f113405daeea017825b0c5d70ddda1fbeac7c28cec50409c8f95072ca59a490ac5b0
 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
index fb23418c07de..eb581fb3a9f9 100644
--- a/app-xemacs/crisp/crisp-1.17.ebuild
+++ b/app-xemacs/crisp/crisp-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Crisp/Brief emulation"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/debug/Manifest b/app-xemacs/debug/Manifest
index b5da7edfa1be..78581e052384 100644
--- a/app-xemacs/debug/Manifest
+++ b/app-xemacs/debug/Manifest
@@ -1,5 +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
+EBUILD debug-1.20.ebuild 327 BLAKE2B f244650a628293353307a55acb340bbff44743eaddc684193ec184e54ee3208053efd0582066c0484560cfbf11f04b889a3df5c8525d4ba750bb6651cb81709b SHA512 68b6d69f05225ff318764eaef43b6d35b895d0971f99b7d12fb6240735680f9d48835aa46fdd61f3a756d2d1de4ca211079a33b1eaf65704607ac2d476fefdbc
 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
index 07d8f44bb547..1b39a5b6302d 100644
--- a/app-xemacs/debug/debug-1.20.ebuild
+++ b/app-xemacs/debug/debug-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+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 cdad7f956c4b..ef5a93f71e21 100644
--- a/app-xemacs/dictionary/Manifest
+++ b/app-xemacs/dictionary/Manifest
@@ -1,5 +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
+EBUILD dictionary-1.18.ebuild 310 BLAKE2B a8d67cf121919a4133acee8154c79db20c4f4c56208af77243b3580d11ec55c44e6be0b7958440f3ddd94d8fd5a74de1890b98e63bfa3c72880f9194d94eed31 SHA512 871499a6630e561afcd965106c0608d91679ad4ffdbea89d6ff449724697a86537fec933eee57aa7a75b47ea1e5b2c10c5e735c925768dcbe865582e40090070
 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
index ecf40359c239..11c886f89191 100644
--- a/app-xemacs/dictionary/dictionary-1.18.ebuild
+++ b/app-xemacs/dictionary/dictionary-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/dired/Manifest b/app-xemacs/dired/Manifest
index 585e60aea80e..6ca82872c11d 100644
--- a/app-xemacs/dired/Manifest
+++ b/app-xemacs/dired/Manifest
@@ -5,5 +5,5 @@ DIST dired-1.22-pkg.tar.gz 203803 BLAKE2B 24a8980ecea5c3f1630f70cece6f84a25cf394
 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
+EBUILD dired-1.22.ebuild 312 BLAKE2B 99e87f2a400b0115b3d31eff22c6368d8378d50d444001c77b3fa49f90978b465bd6c0d1329fabe630fe7fc040b49447e14b3412ee4a333f697f302af487d1e3 SHA512 dcd46c79d417f62320997a21cec5be49b04dd4e8f1092f1bdca26d41f5e707ef4c359d30f980d6e46779d64d5dfcaf0e4a2496a30063f6a29218ef4202c90648
 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
index 67bd009c27a1..2f9bb3ca8a79 100644
--- a/app-xemacs/dired/dired-1.22.ebuild
+++ b/app-xemacs/dired/dired-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/prog-modes
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/docbookide/Manifest b/app-xemacs/docbookide/Manifest
index 628bee10338f..e296e7138c61 100644
--- a/app-xemacs/docbookide/Manifest
+++ b/app-xemacs/docbookide/Manifest
@@ -1,5 +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
+EBUILD docbookide-0.10.ebuild 339 BLAKE2B 5ce4fd405e512888d559fe168290c359193438c5901011c5d2e0c4b17ad0deb4896a28ead8ff9d64f764b46896ab182d4c054c80248abb5627ed12eeeb65df8d SHA512 ab93ea45c3070cbff450e76b993a1d7356fc903cc439f4c5af7cdad8cb1d4b3e07834737eb11a2f296e8051105ae497a367565d701dae19feb0aa3efd4663b87
 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
index 31851168aff0..06610ca1ff71 100644
--- a/app-xemacs/docbookide/docbookide-0.10.ebuild
+++ b/app-xemacs/docbookide/docbookide-0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/easypg/Manifest b/app-xemacs/easypg/Manifest
index 2bea49af79d2..70206984cf0d 100644
--- a/app-xemacs/easypg/Manifest
+++ b/app-xemacs/easypg/Manifest
@@ -3,5 +3,5 @@ DIST easypg-1.03-pkg.tar.gz 78192 BLAKE2B 5369dbf4f5da0c25c9a2e451dd775a0dc4e6bb
 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
+EBUILD easypg-1.05.ebuild 335 BLAKE2B 9b48e647a1df25d927622f9abcc86fd1b0ea5cb3d79b913ae84c6bb59071b8aa9eebe0bb87b1fcb0db5015fa2c862829a0198c0d6c1d14942801788958054af3 SHA512 31f4174b05a090d13367fbe5328155d867b87ee07d960d95ad825b2b771da9fac2f605972a9daf0e4651e0f1b20ed3928b63642737bb30b5fd6cac56bd3cc5fc
 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
index 6152b39b75a2..9fb349b757c6 100644
--- a/app-xemacs/easypg/easypg-1.05.ebuild
+++ b/app-xemacs/easypg/easypg-1.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit xemacs-packages
 SLOT="0"
 DESCRIPTION="GnuPG interface for Emacs"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/dired
diff --git a/app-xemacs/ecb/Manifest b/app-xemacs/ecb/Manifest
index bb087985de17..d88310b3dd50 100644
--- a/app-xemacs/ecb/Manifest
+++ b/app-xemacs/ecb/Manifest
@@ -1,5 +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
+EBUILD ecb-1.25.ebuild 556 BLAKE2B 4704140633980da64d1bfa3a4ae5d8e99fe957a625e5c2c21e7990d84c3d9a7f18a6c46dd86eb4dd75e913398b669097bd7b439cd5e7f57fae45c411bb2f6220 SHA512 b366a962d6a615acd9b605450cff393f0be96144dd218c5650a7c1ffb28d8a556e987bc34a536b86f8cf31af1742d99204dae4000c3d32cac7bc0a6274bdf8f1
 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
index 5e84aa1ffadf..b6d9a9d0bc4b 100644
--- a/app-xemacs/ecb/ecb-1.25.ebuild
+++ b/app-xemacs/ecb/ecb-1.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,6 @@ app-xemacs/speedbar
 app-xemacs/c-support
 app-xemacs/os-utils
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ecrypto/Manifest b/app-xemacs/ecrypto/Manifest
index 4ecc063e8b80..faafcf571f03 100644
--- a/app-xemacs/ecrypto/Manifest
+++ b/app-xemacs/ecrypto/Manifest
@@ -3,5 +3,5 @@ DIST ecrypto-0.21-pkg.tar.gz 76396 BLAKE2B b5f730a90370968ab5596a5b0ec8ee72ec93e
 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
+EBUILD ecrypto-0.23.ebuild 305 BLAKE2B 0015b9c2936b7f6c6f74615214cf3cf60ec588bf4273379d3d6e3f0f51923bd795f6f3cbbc63f7f53127fc07f95dda4059a0b4410f738e75cfa684b261ac2fab SHA512 0e4e018b10ee7574853a07fc81dea26f328b42f2aa544aed6d9d9f68a397054f067e94bc3572be50ab01ef1b07fb045c3745fab6b9e0fd645fa7360e87ca6598
 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
index dad8da2a7467..956dfc74704a 100644
--- a/app-xemacs/ecrypto/ecrypto-0.23.ebuild
+++ b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ede/Manifest b/app-xemacs/ede/Manifest
index f418d8b4e08e..f5e52faa0b73 100644
--- a/app-xemacs/ede/Manifest
+++ b/app-xemacs/ede/Manifest
@@ -1,5 +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
+EBUILD ede-1.07.ebuild 267 BLAKE2B 01d3e01ab63d4a3acb23d1aafd21079c606ad2e7734c0658d9256a63e41f5b03353b4d170535520f8bbf479b867f4b26d8fa50d64441ecc521510167d4c924a7 SHA512 09ad3261e56765587a25bc71f646acc7472ebc2d92ce2640044652019ae3d943a4b807c981006077a227402bc172bbdf1a8638d0d9fabff8bc5588068d2ba5cd
 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
index 788c976536a7..537531b89253 100644
--- a/app-xemacs/ede/ede-1.07.ebuild
+++ b/app-xemacs/ede/ede-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,4 +10,4 @@ inherit xemacs-packages
 SLOT="0"
 DESCRIPTION="Emacs Development Environment"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/edebug/Manifest b/app-xemacs/edebug/Manifest
index 66fdb13705ca..e17143fc01a9 100644
--- a/app-xemacs/edebug/Manifest
+++ b/app-xemacs/edebug/Manifest
@@ -1,5 +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
+EBUILD edebug-1.24.ebuild 317 BLAKE2B d60970e47500f9dddc12292b34de0b992d5906c561dbcbd6c77a78c36fca502a73c0ac10a863b4dcbf02abcdfb8f4ea5a0b4801d7b4391a3a6764a7675b528fd SHA512 8d1701dd8f23ad3a4cf059fd6e3a239aec6d4d06cf6b99fcfeec62557e638a55abb9d57c19f8649c1127507bc223a9c0c24dd6ff0f2742ba3c7a6744f1cdf043
 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
index b883c38a5fa4..c1e75a70d976 100644
--- a/app-xemacs/edebug/edebug-1.24.ebuild
+++ b/app-xemacs/edebug/edebug-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-devel
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/edict/Manifest b/app-xemacs/edict/Manifest
index 775ce49fba93..74bad0763f47 100644
--- a/app-xemacs/edict/Manifest
+++ b/app-xemacs/edict/Manifest
@@ -3,5 +3,5 @@ DIST edict-1.17-pkg.tar.gz 96241 BLAKE2B 7f353921e15a4334d5ba62048ed755b35e49253
 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
+EBUILD edict-1.19.ebuild 335 BLAKE2B a297cf06f25965ba96e4e8368d0df694e871aadb1e9ba4bebaa27145a3bf970405f3671d4f6420991a8467e2447c1e0dbd900ccdf31a393e2966f74485dc1e0f SHA512 520f1eaa96bf742174c316242b3a4d0e497394e1e5fd9ef5950371ab018d169251d6fa72059ca54a4d5b88bacf04e354ec097b54dfcca8f1ce278b1b280cf0c4
 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
index f229ae52e0f8..3a1513d2dee7 100644
--- a/app-xemacs/edict/edict-1.19.ebuild
+++ b/app-xemacs/edict/edict-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
 RDEPEND="app-xemacs/mule-base
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ediff/Manifest b/app-xemacs/ediff/Manifest
index 80d89ebcc5f7..e0dbb77e54ba 100644
--- a/app-xemacs/ediff/Manifest
+++ b/app-xemacs/ediff/Manifest
@@ -5,5 +5,5 @@ DIST ediff-1.84-pkg.tar.gz 321644 BLAKE2B 8d328b8d85103c6485af311b93265c0c48336f
 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
+EBUILD ediff-1.84.ebuild 455 BLAKE2B 78baeae8d8b00ca1a822b161ea9ee7e88e9cb8f9c18b63d975e5d0892cd60630b6c4dc0ca4fc0da8b232db322f4c84931c5dc4267a7848907d3d045af4c69411 SHA512 dc08d9ac42d6cd41c1a1032378929c8f254ac9dd6b265a1da0a152330f6a22d6ab0b518fcc8dc96805875c7b7aacf355593d2588e099b8a30ce3c6133312ef20
 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
index ffdec34fe923..779fdd2c2d2c 100644
--- a/app-xemacs/ediff/ediff-1.84.ebuild
+++ b/app-xemacs/ediff/ediff-1.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,6 @@ app-xemacs/tramp
 app-xemacs/vc
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+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 1136bef709fa..37b0dcb0a009 100644
--- a/app-xemacs/edit-utils/Manifest
+++ b/app-xemacs/edit-utils/Manifest
@@ -5,5 +5,5 @@ DIST edit-utils-2.58-pkg.tar.gz 1159051 BLAKE2B 4eb07e163863724431e2b2692014db84
 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
+EBUILD edit-utils-2.58.ebuild 409 BLAKE2B c5fa41591f154281819f490c589a7864f871599964348b5b406496e1f8d966eb9881e4f236319358b799b11de00265ff51348303b88552c6f2867ebb8355e17c SHA512 d1e042f5063b3565e5ae17fd778fdc6d7fe1cde0c2edf769f474756aa78a2c836c1cafefb2c8292d7a2e44a2fc929ebd199a0841c89586cf7eb639a552ae8b4a
 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
index efcece0b1fc3..6419a8deac6c 100644
--- a/app-xemacs/edit-utils/edit-utils-2.58.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/fsf-compat
 app-xemacs/dired
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/edt/Manifest b/app-xemacs/edt/Manifest
index a6eb86dec3fb..3f1b982b87f2 100644
--- a/app-xemacs/edt/Manifest
+++ b/app-xemacs/edt/Manifest
@@ -3,5 +3,5 @@ DIST edt-1.14-pkg.tar.gz 62824 BLAKE2B 9ab1cc9e55364b901ee51d16b97ea8a72a935e10d
 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
+EBUILD edt-1.16.ebuild 293 BLAKE2B 7730a2259252f68fc6f4b694bae2a5f8e3787b8f65f9a59813bb9bec2eb730da0ea9fce48664027d12069018ea498d311c8ba7fedc83a9c44f223710148ce668 SHA512 c151314d12f723ce1ca7a18f5a277bc91d10fcb1d9462af6bdfa15921e4802ee3930278101f9e84a9f44bef4a090c06b59759dd21203e79d2f979723bfab5f11
 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
index 1951947dcd69..e404b602f3b4 100644
--- a/app-xemacs/edt/edt-1.16.ebuild
+++ b/app-xemacs/edt/edt-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/efs/Manifest b/app-xemacs/efs/Manifest
index ce56c590da91..1fae5559e4d0 100644
--- a/app-xemacs/efs/Manifest
+++ b/app-xemacs/efs/Manifest
@@ -3,5 +3,5 @@ DIST efs-1.34-pkg.tar.gz 376920 BLAKE2B c441fb03cebb97f845d3767001312a99d505c3fb
 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
+EBUILD efs-1.37.ebuild 341 BLAKE2B 9bc5e17224d05879ea54e9aff6d8c57e2bcfe60c2101d16488f247d662c47a9d7a034ba635894e0f05c88da8bb929fe5061c2baaad4958042209c0be53240d31 SHA512 4ccf4cf1351bf2f664db88d83b21497d6a42d5c261df3a35188d717a8ba61c83a15de5ccd2e197ce225f15bd85b685c75efd9e506748e97c37023d8daef66823
 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
index 85118905d8af..acdb2fda56a5 100644
--- a/app-xemacs/efs/efs-1.37.ebuild
+++ b/app-xemacs/efs/efs-1.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/dired
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+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 1a604659d8cd..0f58fe624f62 100644
--- a/app-xemacs/egg-its/Manifest
+++ b/app-xemacs/egg-its/Manifest
@@ -1,5 +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
+EBUILD egg-its-1.29.ebuild 369 BLAKE2B bd68daadc6f49636e82613e1c19f9dafde50cb9464fcad6b00687d3fc5399648f8a4889272035faa48abf475539369c8306b856590fdaf8eea0417f68e6cecb8 SHA512 6f1afa24c5a73eebcd1b41482cbd9fc48a2d2e1cfabefd9d0754f950fe332165aa83f52282b68f9e34874a0f4b2cd3d44eb61a1c6f9dc4ba075508f9c64851e8
 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
index e6d72a6e844b..706ca8f28925 100644
--- a/app-xemacs/egg-its/egg-its-1.29.ebuild
+++ b/app-xemacs/egg-its/egg-its-1.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/mule-base
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/eieio/Manifest b/app-xemacs/eieio/Manifest
index e7cdf3322b5d..e2afae4d6974 100644
--- a/app-xemacs/eieio/Manifest
+++ b/app-xemacs/eieio/Manifest
@@ -3,5 +3,5 @@ DIST eieio-1.07-pkg.tar.gz 177923 BLAKE2B efc84c48fac4bd76ca4c843a4bff97dc10f21f
 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
+EBUILD eieio-1.10.ebuild 385 BLAKE2B 9f074a23e6e755ec60577aeea4500628bab7800ce403ccbd98a8cd14630b67a18f13cff767e9fb01aee855e33db9da06177829ffd1ec269d0e57c8ce1802d134 SHA512 dab99b0ce0e8d7c4a315ab99170379687d5fc8843f729c4373ac1f27be3d43b62355edabf6ec1f5913720ee92ceaf9cd7221d2cc1c8d48a4c0877091803e9e2c
 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
index 802f4d7753c9..041b0b40b3ba 100644
--- a/app-xemacs/eieio/eieio-1.10.ebuild
+++ b/app-xemacs/eieio/eieio-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/edebug
 app-xemacs/cedet-common
 app-xemacs/speedbar
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/elib/Manifest b/app-xemacs/elib/Manifest
index 41c586e42e1e..a8016873e186 100644
--- a/app-xemacs/elib/Manifest
+++ b/app-xemacs/elib/Manifest
@@ -3,5 +3,5 @@ DIST elib-1.13-pkg.tar.gz 80235 BLAKE2B b81ca5b529a808ee5a9c7f514cf53dfa1c5d5ad4
 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
+EBUILD elib-1.15.ebuild 308 BLAKE2B 7faa0b0241bf217b03fb1d057fd39fbe944ca22e432e8364c24dfc78924ce2858d4a5122aa5bd2221a09153778988df5038249179f7d209701f067cb412313f8 SHA512 905e3aa2237f81b912e56a61ecc74348445879b7563f49efe6a99191bdc760cf02f3065027ca49de3211456bcac14b153d677fae7ff7b7204e7728326eaddfe0
 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
index 1bca6430fd89..c33d000ca984 100644
--- a/app-xemacs/elib/elib-1.15.ebuild
+++ b/app-xemacs/elib/elib-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/emerge/Manifest b/app-xemacs/emerge/Manifest
index 6366e250ff95..36c80e3428a8 100644
--- a/app-xemacs/emerge/Manifest
+++ b/app-xemacs/emerge/Manifest
@@ -1,5 +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
+EBUILD emerge-1.13.ebuild 269 BLAKE2B e57a80607da281fec25d217381ed1cb6feaed2b3fd44bb34cece811dace068ddb486d2972b90c53e2b5672f36c73a2b4d95a465cca0e7d4a9536d5d61a92fa75 SHA512 facd0d5a6d5a607a7d2ac40d34c687e83e415548c0d2703f0418c29c4bf438e8065112f176283ded59e43f656634f55ee04db516fd3f96dafec496d4dfb1f229
 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
index 53c954926833..01e369b6d845 100644
--- a/app-xemacs/emerge/emerge-1.13.ebuild
+++ b/app-xemacs/emerge/emerge-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Another interface over GNU patch"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/erc/Manifest b/app-xemacs/erc/Manifest
index 4aa768aa53b1..528900e1ab4b 100644
--- a/app-xemacs/erc/Manifest
+++ b/app-xemacs/erc/Manifest
@@ -3,5 +3,5 @@ DIST erc-0.23-pkg.tar.gz 517288 BLAKE2B ce5a5f41b70b25d8e4a123d3a7a8d32815f3059d
 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
+EBUILD erc-0.26.ebuild 443 BLAKE2B 3d363f017936de1531d524de0d51072d03cca7b82e6b228e99193d068cc1ba4fdf40537c0110334f6e0ffb4506ef4f965fcd0c3588dd2257ef17e2dfb01b5bf1 SHA512 d1a94c22c917c5e1d4c44c5477098daeda94d121c0bbcb9664806c4bdac0beeb8bb2bc1272e9f198e8e09c65c19039b2215b5448ec5b2c2bd9dacda95940e020
 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
index efd9cc6db149..c6f78f5a1756 100644
--- a/app-xemacs/erc/erc-0.26.ebuild
+++ b/app-xemacs/erc/erc-0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ SLOT="0"
 DESCRIPTION="ERC - The Emacs IRC Client"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/escreen/Manifest b/app-xemacs/escreen/Manifest
index 3e641eaf05a8..610a109890a0 100644
--- a/app-xemacs/escreen/Manifest
+++ b/app-xemacs/escreen/Manifest
@@ -1,5 +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
+EBUILD escreen-1.03.ebuild 335 BLAKE2B 0c4387a85df257b29553ad45043465367690e7f64fafa28f0cca0f800150c62a6f697ed4481baa0942ef6d94bf7e61d1185f8a82b298200deb0f2bae46caa410 SHA512 514bebe4d5e51ccc3037ed0473a028560ba16c05221ad261f76729b4c0205d082b2e96981b3fd7fc1e22d16b79e4e3df427bf39038f7e1fbe1d21ae4cc1f05c0
 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
index 2398458f497b..68aca7b761c6 100644
--- a/app-xemacs/escreen/escreen-1.03.ebuild
+++ b/app-xemacs/escreen/escreen-1.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/eshell/Manifest b/app-xemacs/eshell/Manifest
index 9471806f1c29..fbff872b1b61 100644
--- a/app-xemacs/eshell/Manifest
+++ b/app-xemacs/eshell/Manifest
@@ -3,5 +3,5 @@ DIST eshell-1.18-pkg.tar.gz 238988 BLAKE2B d595f9c36ca5cd50ac46efabc813575b6f841
 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
+EBUILD eshell-1.21.ebuild 343 BLAKE2B e5c616d953d5deda8f561e373234ff564f9f51e7eeafefdfe4c71a8769e39051f4ddd2ca74d2fd3e9e35c72234ea839674024b068b070ea918578d5916f99057 SHA512 febda2b35e529ba4a7335bffd66eef79058ecd005302704756746dbd1a134f5ed9b9f58a9793a35bcee72bae103cfabe18c6121bdab0fb8f98eb78703b3ec67a
 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
index 6967a3169de9..e30337307be5 100644
--- a/app-xemacs/eshell/eshell-1.21.ebuild
+++ b/app-xemacs/eshell/eshell-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-eterm
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/eudc/Manifest b/app-xemacs/eudc/Manifest
index a080f843eed3..552e61b4ec25 100644
--- a/app-xemacs/eudc/Manifest
+++ b/app-xemacs/eudc/Manifest
@@ -3,5 +3,5 @@ DIST eudc-1.40-pkg.tar.gz 79675 BLAKE2B e3bac796fb0b7d496d6a3066795c5e89372b22a4
 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
+EBUILD eudc-1.43.ebuild 518 BLAKE2B 04cbe21f75b96170b07ede9d4ec8b17a18d1858373dd42811c840c6b925a33a4da86f84ffd81edf2b31096682cb8c0a8286641786290c157470cdaa4dd1521e3 SHA512 5b099e26e75024971439883345e397e7d233451a0750b837b07a3cd634114e9c665fca4df36e219a5b5c825f96171b1e9d1a5f9eb22e98010bcc06021d7a43dd
 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
index ddde8125ea79..46699ec18da7 100644
--- a/app-xemacs/eudc/eudc-1.43.ebuild
+++ b/app-xemacs/eudc/eudc-1.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,6 +20,6 @@ app-xemacs/sh-script
 app-xemacs/net-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/footnote/Manifest b/app-xemacs/footnote/Manifest
index 98e540e2507e..d2b62e8778b8 100644
--- a/app-xemacs/footnote/Manifest
+++ b/app-xemacs/footnote/Manifest
@@ -1,5 +1,5 @@
 DIST footnote-1.16-pkg.tar.gz 22152 BLAKE2B 4ff8d3df1d76fcf23ec5191516bfeb7be4dbdf11a428d387a5c4a722b8c9b7cf34680548a8e7be2fa39b8dc83f623c96328c974ea4f3d940879b57ae03fde259 SHA512 4eba15270fd4529c3a8b5e8f488cd9dc294dab2f4b968490e8bbfc09e81bc4abd4f9c95b38a295a8f5899f4df55b7dab18e8979130cd8b24a533fbc609f0bf92
 DIST footnote-1.18-pkg.tar.gz 22196 BLAKE2B a6e99875cda4cf8bba7d27c2fad3d0bc61fcca09d6a79cc30b4e83004fa3dce704201e818ab6b0df96b5359425691f02ee5be92b347c41df6e842a6de6c44437 SHA512 222f2aafa6b0e56fdeacacc36a3dffec6ee6de103ae100f8900e00bfbf866d9bc1c3b6f00999c4d9a3c657bea6282a8b3fd89cac10856491745cab182a86e2c9
 EBUILD footnote-1.16.ebuild 329 BLAKE2B 9daee3d0d1ca6c262183c9da21aadc479ddcdd8709503a4715dda3647ef982b95afe4eaaf37768a87cbe7171f2e4c757ac5235760418132fb941e64c80219396 SHA512 fd0fd82f2658b716f42eefca9d3ab9b4ce67c7280704d3dc5915a731c031b9d2133454b5bb974b626918c2141aa06218e09d7494549ecaa0f7969bdc023dc760
-EBUILD footnote-1.18.ebuild 335 BLAKE2B 6ac2fac47ac5a8313f49e9440ad0f6e0c3297c2d70e168c584a34498a3617aa086855e38519c608de18e4a94e9b27777637daf123f4f64b5615dc3b1fc0e83c6 SHA512 33ec8f393db3903f39648b741d07c5fb049d0b62444aad0509d84f24114e3ba6909c64bc624287f7610399fb0fb459c9fcef82b406fad4c5e6179cbc459bbc5a
+EBUILD footnote-1.18.ebuild 331 BLAKE2B 883c779eadb9aafbba500515c47e4a1b46da15c2878b52bc0b6023473a266426228cbb84e4762cbf36cd4bd6fc2b610fc2c3a178bfd1879ba5d58454147cd72c SHA512 5285fcd4232b656977f02af58fb23db73db2b9e12a4b4d6709a1a531eba5390aa070262c8c8c0317e2af9d10126a1ac330b360d20178c00485ea5b160a1ce0a5
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/footnote/footnote-1.18.ebuild b/app-xemacs/footnote/footnote-1.18.ebuild
index 93743dea6952..9cd2a7b8c35d 100644
--- a/app-xemacs/footnote/footnote-1.18.ebuild
+++ b/app-xemacs/footnote/footnote-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/forms/Manifest b/app-xemacs/forms/Manifest
index 331a7eb03c2f..ac3214a360a1 100644
--- a/app-xemacs/forms/Manifest
+++ b/app-xemacs/forms/Manifest
@@ -1,5 +1,5 @@
 DIST forms-1.15-pkg.tar.gz 48747 BLAKE2B a7695c1d07fc33cf6ccf7f0a3e7bd1039da1f662d589fea02716c9dcccf1441c7acc6bfdf344f6f0dd55965d45fd55633af3f369d57cb18bab3c62f3f95417c8 SHA512 eec09fe907c6b2ec94132ccc508d70903b27fb74cd02ae58a60d2196b80ea62111b0849db0c220e205d9e58394e588913b42dcf350d83cbe17cd9fbdd8ac6a62
 DIST forms-1.17-pkg.tar.gz 49071 BLAKE2B f0ef7c71819f5d4c036025d8acd7e9da369143500850f7c094729a0d98a5ff3d7fa8f39b2783f3338a9ce81f2036ad2161edecfd3a35966284f39ce5bf44ac55 SHA512 7ef9eade79bf53b1c2e3c1f86d9e3e70225f0041c7b41db844ec55bbfaded100edf9b432813ae5dc6a0f8237faa6e3ba7c58acaa26ec73438a45cd2ba326a249
 EBUILD forms-1.15.ebuild 287 BLAKE2B c028df35aff20fa2b4bbd1819bde15713aee1f89d290ebc17a46f368bc8844b3d8f0a0a3102efb3cf940290db342cfb3ba7720ab0719c8640c857728c76882c3 SHA512 2db088448bc5d2ad894543b4d46dfa3261b5a403f0ff13ddfa0fb2b3a2cec527ce05882daa35e4ed3bf3813f091b10440d04c978719aef83559764e234001918
-EBUILD forms-1.17.ebuild 293 BLAKE2B de047aaa79d6d6cb4f644fc50c5cdf94d95eadfd4508d03e3eb5b1a147eb6d0559893c67c1be6f758a75e85c11cda26161725118d47f2a6bb005c22b9afa995b SHA512 6c8d2bf47d23ed11ea9b4bb79581b304052acc0e1bc68328783b7325618c5ad680e541bb5176612d7be928cfb10db7c6157e83985045f7453bc93df4e7668f80
+EBUILD forms-1.17.ebuild 289 BLAKE2B 364a81760a58ff09b73b95d65bfe2944dfaed6cd9f4d68e5ec2358707f769ebb6b13682cdc655c79d51557312bb42d12f3730d4f3278e9f59f98eee016e22e68 SHA512 fefea61463f20b838ac5ac1bddeb5c6b148c8c7b7296ebb11414c9eff1848b32f566bdca3d41a965a8a1ae7c1e71142f2f14c425cbf729c54ab15dce6e1fbd2e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/forms/forms-1.17.ebuild b/app-xemacs/forms/forms-1.17.ebuild
index c63c8d46e4ee..c9e5fb1473c2 100644
--- a/app-xemacs/forms/forms-1.17.ebuild
+++ b/app-xemacs/forms/forms-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Forms editing support (obsolete, use Widget instead)"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/fortran-modes/Manifest b/app-xemacs/fortran-modes/Manifest
index b50c391d4a48..065eef7c31a7 100644
--- a/app-xemacs/fortran-modes/Manifest
+++ b/app-xemacs/fortran-modes/Manifest
@@ -1,5 +1,5 @@
 DIST fortran-modes-1.05-pkg.tar.gz 70602 BLAKE2B da1e620e74b497290bf655fcbf9d45b5510193388557e33abc769d874ef2d75786cb91ea9964f0019a40b19de968690f396523144f49c7bd79be783111830d8c SHA512 c3eac57a6d84605fde545951d423855cca8a40dd02dc24d0e005e165ab4e52f2f76f7347ddf33e4e85d25717689b85c578ce1e2b3b738df8a080b56057747b27
 DIST fortran-modes-1.07-pkg.tar.gz 70601 BLAKE2B 637c183415e196090acdaeaf73a1dbc35ba0aa089ed66ffb1cf69240c5bbce84dc30b7563665a0f7cb0615c16590f11ed5b167d25d71cbc50eb750d682e2d1f3 SHA512 760d60adacec1f9c1ee591193ced65560968363e7a3d148530a493ce04a4efca4c7a15e6058f30b744d7de7763968064b4f4a7b0a831542fbd2bf4d22d2adb38
 EBUILD fortran-modes-1.05.ebuild 284 BLAKE2B 83041f886a60ad6a9081ed68860f79d512e48f4e907899815cf144c5107ecf2761a5f8c39e2220c1132ace9bcfac55ba04aa9f32875bf5176e89689d74fcb99e SHA512 26b1f0c7e0f6bbe5af0b4541b6a7d3df343eb886f6715802dc3f48c268de614f05a91d7db33d983a11dab80682261452c5a9571554f468ad9a4c964daa57f357
-EBUILD fortran-modes-1.07.ebuild 290 BLAKE2B 6c113d2a9162fe1dfe02558cd54af4fc7b264792fc345d8781dcea6bc58c547b204cfe8d00d35b5bd2c05d941b4fa621937e1b6b480d044f2fcfd19138a5ecb2 SHA512 679663d24cf9041a0689dd1bec7fb0aeb1bce27b938dcc14851e4884c115f47f3aa98544b5a41722a7382515451f43b23ea46babd3cefffaf75d8de5169463d1
+EBUILD fortran-modes-1.07.ebuild 286 BLAKE2B b41bfb6e35bf402f91a8f9f55dcc7e49790f50a1325ed1db4dbe99f610c209eaa366ccb96e7b82413e4b800eb2d383004571264eddb8f7095a76911cbc1193c1 SHA512 0d53cabacb19876fb77ffb5f5fb78501ba048548a3bbdbcaebc5aa6ffd0ba0b00a149ada1245438dd47b9814d9097fc16c7432aa0c0878b047174f9a0f80a5b1
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
index 34282b386dbd..7c3c500d2b2e 100644
--- a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
+++ b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/frame-icon/Manifest b/app-xemacs/frame-icon/Manifest
index 404b2f3f86ab..7458577af167 100644
--- a/app-xemacs/frame-icon/Manifest
+++ b/app-xemacs/frame-icon/Manifest
@@ -1,5 +1,5 @@
 DIST frame-icon-1.11-pkg.tar.gz 33800 BLAKE2B 93c404c9dfc894634e1b463d54eb53812de102e20f0d622dec9dcd5b37006bc92f5f4c1a2d47c5e1e1bc2344a49819bb6839a5c3d41df68546d6027abf6f5f8f SHA512 30e4de2e4bdac71483d39f3893b4ccd5d1ec37bc8b522a621af35f569e00c69bf02312c1039a52bfae759da2eaa748d26356a2b7db8c6b4dc8ce2ceb494d7d82
 DIST frame-icon-1.13-pkg.tar.gz 33818 BLAKE2B 73f88b6a41c42a5376d68820245b341d9ff290f62b6cfb6b40201c90523d80386b07613a824e35c898456cdd8bcebeb82973eb98724c64e702b5ebdec4aa7ed9 SHA512 45e37a4dd59f6e7bdac12558079a4b7c0cd552053950fbc5b67b32b00c3631580d3645bfc2d662a91b3da7410754d89f402ed1faa02eecefcc1691460aea95a2
 EBUILD frame-icon-1.11.ebuild 289 BLAKE2B c013e5b9b897cacf48e0959b4df9baefd4d3a1b4618f7fe7cb819966a8d6ece07c05be2d9119e55ca8a3497735247a055dfe765121a8438676091378eb59b925 SHA512 f20f4b8028d1bcd20358894440fab60020d4df29e2b83796c87180c2a56d2462cc21214026aca21272cfffa3a2fb1f58d88198929fdd9a58e30779d0fba47878
-EBUILD frame-icon-1.13.ebuild 295 BLAKE2B df54ebd5bb61b130bccb9d3c41a56394d1683862bea1d1e24fb60521aebf9243c0fc6619a28ca8c3edb84b7aef5a021779a608906f6d77b47c64e48f73149ad2 SHA512 1c4e4014430d38a1112fab429f5a42731b68d43b861f8e3ee55cac5eb9ff612c6dba1f7c1400722c076fec3a0d3f200364a07cf81dd1a84314a6748301844005
+EBUILD frame-icon-1.13.ebuild 291 BLAKE2B 7dc4e08f5f3c6adcc3d7a8f2da9a03d449271f6ed2ded9a4cbf4866590a00f728175f0014f9b0d7405b6fa1dd0cff4672d35ef9856ed215cdeb12585cc08f5f4 SHA512 922e52c11980c6d976b764cfaf613f3a41875722537ffc50833483db69c229f4d2b85e127883c3b4b5962b20b10a1cf70e3cd328226524ffa7c6fbf8e30d46a9
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/frame-icon/frame-icon-1.13.ebuild b/app-xemacs/frame-icon/frame-icon-1.13.ebuild
index f1692ff4995e..c40b4980c099 100644
--- a/app-xemacs/frame-icon/frame-icon-1.13.ebuild
+++ b/app-xemacs/frame-icon/frame-icon-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Set up mode-specific icons for each frame under XEmacs"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/fsf-compat/Manifest b/app-xemacs/fsf-compat/Manifest
index 1186f410a1da..4f9a6d32feb4 100644
--- a/app-xemacs/fsf-compat/Manifest
+++ b/app-xemacs/fsf-compat/Manifest
@@ -3,5 +3,5 @@ DIST fsf-compat-1.19-pkg.tar.gz 20477 BLAKE2B d231757c8498693b1f08d164f1b93a8935
 DIST fsf-compat-1.24-pkg.tar.gz 30304 BLAKE2B e54d2484b0dd7e42543e7e629bf403e042e3966e3776e9a108a19b34db4ce634a2e9d99122225d005e09bf2a35411d95f613b1aaac2f57755e8af685084872b0 SHA512 b16e4ac297bbc6fecd278bb7e26842f92cba279c0edf7ddf880c43470e586232d30e84d923f52f5bf13904fb7ce3fb3193f48ecc3d5709fe6613bf6dec681f2d
 EBUILD fsf-compat-1.15.ebuild 303 BLAKE2B a07a401564e467a1f06d33f03a9f928ba148dbb919945a4bb34e90f7ad897fdd5ddee3fc3210478c65851a4bf10a6688ff4441b8f9c4f9b0c48db15a442cf83d SHA512 5595cee32937d00e83c396cac4490bc29edc9c92c4ff8da0dbd2e6197f547cd29b79a15cd7f748255898a7c8d141f70c36f014861d9c8ee1def032ec13f4d678
 EBUILD fsf-compat-1.19.ebuild 323 BLAKE2B ee930e5f0ee164c76dc73615f6abb37aa99e0dc80d583c7ef430f22bb7b1031daa11c2948047652809433b99d8f6cbc526539085fd2563b30ed47738671fd1fa SHA512 842d13d504dd7ed2a5bfd70d92c171ab371b3e0cf50c5010b94208876aea2e52a2f8b7044d982de613764daea68ebeffa93173b84e0d567df1784e715e4d0ded
-EBUILD fsf-compat-1.24.ebuild 330 BLAKE2B e04f151607374cd050e37f9acab04820dc24624b63269510252f35753269f121fb964d7fab7a4956a0002c456162fb47e50ba3ca3d7e912197add2c3e1a309c8 SHA512 70ae47a2fde60cd5fe388f7f7fb43ede96b0d0b29d666e6c3debeae97ed012ff6fb4e8dbf8ff9f6d05c74fbe85aa7351c54a51cbc04933b9688f716f262a6f9f
+EBUILD fsf-compat-1.24.ebuild 326 BLAKE2B 0cfcd528ce35e1ae69e2c29fa9539ddc66fb3138e5d22b2a895b8b77b4af8b3886fbd6ad5fb522e7307c2f2e7debfdd4b40097e57324b6666050397bd71044c9 SHA512 386685fe11686e54f204789bdefe1f236bb6f63405285e618f8038ef17118c86c90ffdcca86719758a44735adb01a8fbc4252ad4174ba4ef3cda662e2a26f3db
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild b/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild
index c6c238c48dd3..f6d9f9cc03fa 100644
--- a/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild
+++ b/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ SLOT="0"
 DESCRIPTION="FSF Emacs compatibility files"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/games/Manifest b/app-xemacs/games/Manifest
index da4bd553a9cb..bf2e56511d2a 100644
--- a/app-xemacs/games/Manifest
+++ b/app-xemacs/games/Manifest
@@ -1,5 +1,5 @@
 DIST games-1.20-pkg.tar.gz 84330 BLAKE2B c2f7fbd059de6e9da0670ed77fc86d8ada289f9841885038ed81bcf7db2825cf2006fc12f12dd308287a4bcea4d06ee98bb60ec0a0d4d4867356f1e48c446544 SHA512 dbee4a0da7a7ef1ddffcec72caa1af09aaa449c3d1f662c217bbd53ce0a7651c0ba3b31a3af750cba79454455c5325c5a9d81bcbae80610f356656b998b2f649
 DIST games-1.23-pkg.tar.gz 84601 BLAKE2B 05af9e6ef9425712324947369bc84cf8dfd5996293777255f4ff8b06990057eef91bf71d504243e11688098b2ea6f3942819ca0a3aa9762e1d94b5c7066b8605 SHA512 0aad12664b89c27bb809d02514cc406165c9d9c938c0cd910ff31380f30898faaf4e38a0cbebd5d9a744321ae4c726f30ad4a920185e7d78b654329adf533a0f
 EBUILD games-1.20.ebuild 295 BLAKE2B 59842188c0f5ee629d8582f2fd14224fac8b3861e59465670775d91dd56f856dad7225ac2b72750193ffe01726b331866d9df5b72cca3524a76883f198c5d2ea SHA512 db45b744179f294aed00fec0a6905e3cef91301254d10d60106a9f6a3b94e66d82acffdbfca9838ed8c2b91f5222959a2f955496bbbd8d80bc4e709390801b89
-EBUILD games-1.23.ebuild 301 BLAKE2B 636d6d9f459ad8ba934aaae9e7751b912f938cfab2182fdc95c83fe3ac028fd3c007ce31bbe822fec44b9e2e825fe7a41d6793c8e9e10b96924ee222f6ce328c SHA512 d200cd41438254a6eb3c5603a9fb99e8aeaad0ffa72331a327d381df299d2c01575e7448a717b2396670018aedb86a410ed562866c9eea7864fefaf41ac31536
+EBUILD games-1.23.ebuild 297 BLAKE2B 47e924a3acac09316b856b2fb6805cad8eb6e6dfa910b81f6a755cfea51b99fd304f56da9fa63e8dcc9b03b193395884f6a2cdf19ba44f6fec30c0628f0fa0d4 SHA512 1da3f19546c0e095bf49ccacfe8ed8f3673c2decde2ba3041d9e5cfa1f39bd330fcd7096a14346e76be877f2129fc5d79f7b3b2741fa597bb4abbeb849d961a7
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/games/games-1.23.ebuild b/app-xemacs/games/games-1.23.ebuild
index 65a8ef1009a6..c382b325a7a7 100644
--- a/app-xemacs/games/games-1.23.ebuild
+++ b/app-xemacs/games/games-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/general-docs/Manifest b/app-xemacs/general-docs/Manifest
index b4d0779d6b06..ff8768a9fa7c 100644
--- a/app-xemacs/general-docs/Manifest
+++ b/app-xemacs/general-docs/Manifest
@@ -3,5 +3,5 @@ DIST general-docs-1.06-pkg.tar.gz 146305 BLAKE2B 5341120385d4c6c9d631f604e8ad71a
 DIST general-docs-1.10-pkg.tar.gz 150069 BLAKE2B 12bc9cdb095685d954500373dcbf5b9000cbea49bda67dc81945ade24896a66ff3ec7b9d73a840706f48570b30da2dd10874bb15bc732a6cd11de5bfa56f64aa SHA512 f94798e437d5278c31e0cf18e22f22c88cc0c8eca1febf23f6c1e5dbe8856955c9334334c70832d6ce25db535704e56355536cb402c7c587a2bfee450c1485b9
 EBUILD general-docs-1.04.ebuild 274 BLAKE2B fbd4894c2845c46ed8defacad92d94666c4bb4b3ea5e703ccda285f6b9d680b56c6a9efc0ce1ab116adf104ec2ad077335273ce70764db6f346e75246b8f53cf SHA512 e0df4685f897bcb3a8515c711f1de6c6eb5084626483ffdfff62335a2aa72455fa6f40158ba32d08e4de2756b17915d2e93ab447522fa5fe92a73cabf6bdf2ca
 EBUILD general-docs-1.06.ebuild 274 BLAKE2B fbd4894c2845c46ed8defacad92d94666c4bb4b3ea5e703ccda285f6b9d680b56c6a9efc0ce1ab116adf104ec2ad077335273ce70764db6f346e75246b8f53cf SHA512 e0df4685f897bcb3a8515c711f1de6c6eb5084626483ffdfff62335a2aa72455fa6f40158ba32d08e4de2756b17915d2e93ab447522fa5fe92a73cabf6bdf2ca
-EBUILD general-docs-1.10.ebuild 280 BLAKE2B f572450d01ce2d51d969f308bad5ded6bc059ade8bfe2a7161173117a0911c644680c91ac128c731cc5177773df52ca5d92b5c4d2783a3e665f41ce531cf3fd8 SHA512 52c52e62225f23d838026ccbfe1ee2d02afda4383c5a366e30e616d090e2a8d742ab4c77c6eca99c1adad926151943e0dc782bcd52630454d42587ee724e297d
+EBUILD general-docs-1.10.ebuild 276 BLAKE2B 374df4861206eb4c542a7bd04cb2045d9afc57e60f3fe4f873117df334a42a39ee5e733b56fbe134abf66e648aa4aa6441d12fcd901eedf2a1be98043b043e90 SHA512 991084f9cbb5d31e118b1bcb6066b8a03e17535c70ed08a6ea4a620b9d7f4da7ac6f9133d2e6dccdf7185ae31704ffeef9ab5cfa90bc79acd5ed411db37a0cf3
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/general-docs/general-docs-1.10.ebuild b/app-xemacs/general-docs/general-docs-1.10.ebuild
index d0abd3616be9..e9dff7f9acb0 100644
--- a/app-xemacs/general-docs/general-docs-1.10.ebuild
+++ b/app-xemacs/general-docs/general-docs-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,6 +8,6 @@ DESCRIPTION="General XEmacs documentation"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/gnats/Manifest b/app-xemacs/gnats/Manifest
index 0b38832d3484..4e8c2e786093 100644
--- a/app-xemacs/gnats/Manifest
+++ b/app-xemacs/gnats/Manifest
@@ -1,5 +1,5 @@
 DIST gnats-1.17-pkg.tar.gz 188959 BLAKE2B fd32eea586b1610abba78a51383d86714091a3656dabeeb871bb56eb5b85e7f9ff52dfba87da76bdf3abd15c1e66f98c03d807b26071879f64b33b3fac048b4e SHA512 b8d5a0faeb55c46b7a4f2d42d7b347304bff7a94f8487df72fac0a1aa4e388f188abb351de8764fac1c2381b01b3ac21abb1682878d4e998b5e141e4c443d29b
 DIST gnats-1.19-pkg.tar.gz 190492 BLAKE2B a0ee4d1c7014dde6ece2f8e7919832a36ebdfa556083af37561404cd002239ff25d2c7074ac1498f2e388e133040445745620513955f5c4f345b213232c91219 SHA512 116375ab1830fff3ecb889a5236c1915a69b4d2e08daa95885aaa22c4980ee27d4e5ea41c3e5d2a9bad507acf3d668752b068c8e3ae9281e4a129f297fb0a9c1
 EBUILD gnats-1.17.ebuild 307 BLAKE2B 3381b54e8e014eca3ba5acfae67eae56bfcc4c149f89c5ba807324d2c428f9f6005918504772cc6ac4436992a004ae411315570b625bdf4fd2798a3d99997474 SHA512 66844e8572299bb04788add7b30dc670aeba48b08f39d915c6f542bdcf73d645861e83025325f60a2846500523683dc83cef111d5a26697c2f57c47f6a68e766
-EBUILD gnats-1.19.ebuild 313 BLAKE2B 38cdd1db2a0602a091e5f7dbe3dd97c0169460e3ffa8f5181b2fc1c132f1b3700f4ab0f8927394373e736ab25233656d2de616b686943173aedddd85c55b96d4 SHA512 35a96c4be3cf19b2539bf53d465681547ddd63ee448fd831479defbb31bbb1917aea68ac689712f1f8a365812c37d99162c81b16f80ccbdd14e44682b2db4c74
+EBUILD gnats-1.19.ebuild 309 BLAKE2B 138aa07c0085c653d4f68a63f73c2f492050c88b6e9331805ee7fd5e73b982e3914e7c7aefe60b068e65508678e093127e5cbc2761a52ce423f7c0a86f229f28 SHA512 86f99cbf1fa1e70932bc3998b1a835ddd5b0177e48745f65fffc12862d7c16775e5b0305b4919a3369998237c08bf562e4c993c690501e1c838510d7d0f1b191
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/gnats/gnats-1.19.ebuild b/app-xemacs/gnats/gnats-1.19.ebuild
index c85a4c571859..68194980919c 100644
--- a/app-xemacs/gnats/gnats-1.19.ebuild
+++ b/app-xemacs/gnats/gnats-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/gnus/Manifest b/app-xemacs/gnus/Manifest
index f166e1adaaa1..7cf2de9a0b17 100644
--- a/app-xemacs/gnus/Manifest
+++ b/app-xemacs/gnus/Manifest
@@ -1,5 +1,5 @@
 DIST gnus-1.99-pkg.tar.gz 3636886 BLAKE2B 5345498a95388998c5cefe65c20991ae34386e582e291c45d51194e509670ec395b2d4ad164ca219e4892a7377030bd769b2e76e3f624b6751d60f2a5161bb5d SHA512 f938e77d2a93e29b7eb89db5b67d717a55ff36e827b7ba3ea1d114f59eda763e06933b645fe42d51a53c483f1e6fe74c669d595af36aa97b30cb97f5ca39db79
 DIST gnus-2.04-pkg.tar.gz 3628467 BLAKE2B 1b6f6ffd4693065a666353e87cf5ec4ae5f897470fe1423f43c5f3ec99c827f6c9074c70f4add6cbf7462491ee0a50b8faf0b9f6e1d4cab16d23e64e20d07975 SHA512 d7bce3b6ff62ca901e9dabf59a5bf2044ec569ab1dd84898f11cb966dc97bc35b1842b61c62ad024e200db4bd1df9f7d17fd642c251e42931603b0eb286356e2
 EBUILD gnus-1.99.ebuild 592 BLAKE2B a33dab6e121bc96858b04426178c27e7437abb7d4f815d336936304b1135a11ec23d58fe2ea75eb4398038b9535df90855df85ae12db6613e795d25a27cf78c5 SHA512 6ce4a4b61e34ee5679dad6232f7edd48fa927016a25d9d2572a7caceb0e5a27368cbb038d4432b6c277d8b70e9d2642b0b00460cee7b38645b3e2a878db1c55a
-EBUILD gnus-2.04.ebuild 570 BLAKE2B b3c6f970d27318d2690be8e1b0ab8d2450b546e772d36a0d3ee38a7163ab703bc77656cd81e6ca26cc1503e6becc843bba527f3fd52afbadadf661588093751f SHA512 c402cac8238263ca5d6ff10370381cff5b399357c1ae8d94f8d1bc3dd69a8cc7ef5e118e8f2656473613614d575976f32667de50a20eb42fd1f2c44945ae722c
+EBUILD gnus-2.04.ebuild 566 BLAKE2B f098aa1ae0357ec330ebe3ed3f39b2e968c1deebd61dde3a9ab3f36eabb35234fdaaaa142ece2e22a5f578132c23be3fa704a98c0610b99479463b9a4ac2674d SHA512 3ca85f66d9db166b332c2d93ce550082f0b076702d5e2d1801afb5879eaefbc316a027da04806090957d6796b3b502b9c0073600535c606b703a866ed886041c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/gnus/gnus-2.04.ebuild b/app-xemacs/gnus/gnus-2.04.ebuild
index cbdc264e3f3f..7fc88af633f5 100644
--- a/app-xemacs/gnus/gnus-2.04.ebuild
+++ b/app-xemacs/gnus/gnus-2.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,6 @@ app-xemacs/mailcrypt
 app-xemacs/ecrypto
 app-xemacs/sasl
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/haskell-mode/Manifest b/app-xemacs/haskell-mode/Manifest
index 07e71c5a4954..0aee3c512c06 100644
--- a/app-xemacs/haskell-mode/Manifest
+++ b/app-xemacs/haskell-mode/Manifest
@@ -1,5 +1,5 @@
 DIST haskell-mode-1.11-pkg.tar.gz 110350 BLAKE2B 05acfe43c5fbf87dd97543d300c41695ee1383267dc0e88aa2b0ae9e2b84b179127500b5d292280099b77597fb93bee4504544979956a814d081b99bb0b88861 SHA512 719b65cbf70680be25912a972fc1c4ce4609bd93f6decac6904b8d8b6266d466c577eb1a60d179f4d356af96f755f24b2802a2803be27e01be0132a22c75abb0
 DIST haskell-mode-1.14-pkg.tar.gz 110367 BLAKE2B e59067f89993eeaa79f07110afdee88405a8b0c4ada8d817bb3e0dfa83baba1b8d1e5c1e7ce676cdc37aff02827746a29d1c2c4408d301a88e192dcecf13b509 SHA512 d3bbb6989182f8c2a432fac8d33c5a0deaf7e043a7b91f85a1016584beee5d45d5b480c1c810bbb8c78c56af61cec52ee3ef4e0467a098e080af5d1dfbd71442
 EBUILD haskell-mode-1.11.ebuild 351 BLAKE2B 0cda6ba6e4757ed8177c1ac9a2dfb506c9920e412f4effb6e9fef182cd1f80053b9eb2f8c03356ae9700bda8dfaff663d6917c69ecd30e984cf9f5d64a69cfb4 SHA512 fe9451a575cdb9d511d1602ea9e806abeada74fd7c0ee3739f2d62671a3c9b25d881e710968f7a8776e34f0ce3646b3ca430715755b32d99c6659136b67dff9a
-EBUILD haskell-mode-1.14.ebuild 357 BLAKE2B f3e70496699900f75ee33512655ce3bca169dc6ec5d05d9a5ab4ff4725e2b827c457747516b8af690b6a7c488d80d0789c214f43cfe206150052e714b50e726b SHA512 1c7a44d4d87997e70656d3a394e8930ee4e5f4deaa829fdfc86f806d2320c2e2b5689e84d1d4ae4ec23c523e5c7148ffb0ec4fa02085f2d55ff5a1102eb11a2b
+EBUILD haskell-mode-1.14.ebuild 353 BLAKE2B 2eaee2a9505b45044381eed2e47d0779c593c2a4eddfabe74a80553bddb8060d6383d29a8817e285b89a43093c4ee134245e24480fbd85d344a1f121e30f87fd SHA512 4bfdcbb2b750ee22ad52cc5dde85203cead3c59cb6959590c724bef2adea657c4414491ccddfd31faaf7fde97dd8390a25f176a9079618c71563c9a3cb3458f5
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
index 6f39a915e9f9..6f7d94d63b5a 100644
--- a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
+++ b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/edit-utils
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/hm-html-menus/Manifest b/app-xemacs/hm-html-menus/Manifest
index 92e69fc933cc..a43ae7681ccc 100644
--- a/app-xemacs/hm-html-menus/Manifest
+++ b/app-xemacs/hm-html-menus/Manifest
@@ -3,5 +3,5 @@ DIST hm--html-menus-1.24-pkg.tar.gz 179443 BLAKE2B 91c8d753f7687b12f0d0b95393a21
 DIST hm--html-menus-1.26-pkg.tar.gz 179409 BLAKE2B 483ec82621700591f47128f9268b0c839d9094cff1044ac00deea0c4d1629bd7a6d4a66d7bd4db7e3ef54a73e89574ec23a1568a204b05713ffedf083396dfe9 SHA512 943c3e5667ad1f2caf6d66ef046e744c90cd1a2b7f06dcbf1e935cda984b62365b34b74e66f014c79e1a1bc0b97b183f85846d59a9f3da1aa400cb3d39949ce1
 EBUILD hm-html-menus-1.23.ebuild 371 BLAKE2B 2fadac69b5ff520a92308a1c12da9a7747794ace73cee3fce249a2e8ae0a2ee656eba445c5cd9b9192f38465ef66f1c5ec4feb30b7814b2bc8e380478aa4de7b SHA512 f1f7b1a5064a5a89ec3630e716e4eebe7b98aa5f47fe61b71ade2f31dac9ceeade33b307d3c68a245c0fcd1c61e510ca04fc4e8677122fb7c57d59acfbb43504
 EBUILD hm-html-menus-1.24.ebuild 371 BLAKE2B 2fadac69b5ff520a92308a1c12da9a7747794ace73cee3fce249a2e8ae0a2ee656eba445c5cd9b9192f38465ef66f1c5ec4feb30b7814b2bc8e380478aa4de7b SHA512 f1f7b1a5064a5a89ec3630e716e4eebe7b98aa5f47fe61b71ade2f31dac9ceeade33b307d3c68a245c0fcd1c61e510ca04fc4e8677122fb7c57d59acfbb43504
-EBUILD hm-html-menus-1.26.ebuild 388 BLAKE2B 554c9ff615ed6ff5160c9880f25b1ed97f64f700c4d351ae4029a492e18e976bc166cf7bc4f93a7a70998c341c242f39281d021539d52a16809101b915da3997 SHA512 963c1a8caf0b53677470422bfb64886d086321402dafc3b2652dbeabcfdca5ea20fef321c9a4de02def720f04a0948ecb3a31a2ee7f1a7b52862bc745ed63104
+EBUILD hm-html-menus-1.26.ebuild 384 BLAKE2B e0c1416753db06762072473cbd063566ebe639d6f48c297b5deaf825bf7d64d5ff3081bb3410cc7085ff93efb5e7a39b11b0bdaa62fe38bf3a9d433896fc9302 SHA512 d0bf0c3e519a933c741c6aee82045530144806a90398c91d4887d4d3da3234aad72f20ffacd52fa1494c51743764e0433a06ddc41cbc09e67cdb6bd152d9a4cd
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
index d605b7391023..0ca21c255db3 100644
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/hyperbole/Manifest b/app-xemacs/hyperbole/Manifest
index fd14f79c391b..dbb8f7d10cc0 100644
--- a/app-xemacs/hyperbole/Manifest
+++ b/app-xemacs/hyperbole/Manifest
@@ -3,5 +3,5 @@ DIST hyperbole-1.17-pkg.tar.gz 555380 BLAKE2B 35deb594f6fc9c335d8e5f35dce0eb0581
 DIST hyperbole-1.22-pkg.tar.gz 555128 BLAKE2B 1774c3ebf35ed0806308bbb8138e9ee45ad8b0efece0d718ab1226429f6dab34f7e4582178bdd1403b47f965b5272950131238b443f645dd22fea7ca4c3ddfd6 SHA512 726a1fa769df822e077d649d7d24664b1293d7402afde832616d5fe9d1bc5cbb2db205cf78844559cf189ddbfba5c05140df300a9a2d7c1f95994c5cf476cae6
 EBUILD hyperbole-1.16.ebuild 502 BLAKE2B 3a2a834d0687fccbada5ee62f5ca7096cf1704f43fb4989dfe518ebe9e6053120193d639a336e6270cd39019fcc3b4357bf6655c38758924531b54bd9a1b7e17 SHA512 062def13e38f0fb8d218daebfe77a34b28a7d756ff0ce58b2264522754a1a73dd3efc1a06d87c875c73e189ee598b169ac4dfcaf927e61eddb80d43cc7a9a695
 EBUILD hyperbole-1.17.ebuild 521 BLAKE2B d214dc01766e8e333ba5c09828ab57b3f034c6b27f4d4d5d1ad60b5c5a98b8d76ad60bec383bcb11be2824d90a6b0a13dadd1c399f7a3f32f01c33eb506c0ee8 SHA512 9abc7535a5cf8690f99b99e91e96f216551fa3cdbda337584e559833a3ba122ae65415cf7a3af30b0a7ab3f48db6d3f9687c2e5559998199b57bf1c79f1c49d9
-EBUILD hyperbole-1.22.ebuild 527 BLAKE2B 17690f6fcd6cbfe5b474995253afd9356d656c88aa5f5c42ab5d1d49b986ec84bca524edb2fe93c7b3096ac46a245f960c37bd30ad5a86263efa40b7ca39b160 SHA512 a98ab910c9bb36899e9d59408a0c1bfd904992a8871b053f3fd851770aad42bf25360df2be4473445adc1ac3238e28bc8a073f37019295081dc7b044537d11e4
+EBUILD hyperbole-1.22.ebuild 523 BLAKE2B ee8a5e1d518fd8124505a88f2f257b1ce75310da0a6f22d8c706e68996a348ade68b5b0195d256d7c561cd0e6c201df135f3e2871bf9dff19fce31326d2b9c53 SHA512 93ffce618f615c48487a280548bd1cb5f040797a566996f441140c7b05cecd74d81e68b0c8f1ebc841db1861e5cf377d0ed6944fa11b765c63478e2211bfd22f
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/hyperbole/hyperbole-1.22.ebuild b/app-xemacs/hyperbole/hyperbole-1.22.ebuild
index d838193c04fd..612cbe152214 100644
--- a/app-xemacs/hyperbole/hyperbole-1.22.ebuild
+++ b/app-xemacs/hyperbole/hyperbole-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,6 @@ app-xemacs/sh-script
 app-xemacs/net-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ibuffer/Manifest b/app-xemacs/ibuffer/Manifest
index 85b5bff7cb27..8b3be242b323 100644
--- a/app-xemacs/ibuffer/Manifest
+++ b/app-xemacs/ibuffer/Manifest
@@ -3,5 +3,5 @@ DIST ibuffer-1.10-pkg.tar.gz 87849 BLAKE2B 54e5b403d50691cc3a0989f1aad9c043d815a
 DIST ibuffer-1.12-pkg.tar.gz 87663 BLAKE2B 895d5622534c6e25f6f3a4e1ec352fe481d965514eb75d41200dcf72cc0506239785b1f2f1fd4ffc73bc4de70e7c031564849490042f9f589fd313d842c071a3 SHA512 3ae3f79cddcb2c45ec485d8e0debf8b835c64fa0b4f4fa06a98ae682153d5983fe156982c784d26188a47f9a89cc9a370b88ded703b9672bd8f76fba41c7d3c9
 EBUILD ibuffer-1.09.ebuild 305 BLAKE2B 3f7976a9174ed8f44e221acf252d53648724a3baa7224ae407d60678887936767b6f0850f59e13c436a3b5a28d2c494985cc229c1b40b04e4e8b28c24a03cbe1 SHA512 30849094610ace97ace1846593ca3474b069ca93af9bb7ab557847c970eb6fe3e34feaa4f04f136f7f81160c79466b8d6c8234b7a3c8b4233c58e926747c88a0
 EBUILD ibuffer-1.10.ebuild 305 BLAKE2B 3f7976a9174ed8f44e221acf252d53648724a3baa7224ae407d60678887936767b6f0850f59e13c436a3b5a28d2c494985cc229c1b40b04e4e8b28c24a03cbe1 SHA512 30849094610ace97ace1846593ca3474b069ca93af9bb7ab557847c970eb6fe3e34feaa4f04f136f7f81160c79466b8d6c8234b7a3c8b4233c58e926747c88a0
-EBUILD ibuffer-1.12.ebuild 311 BLAKE2B fb4dfbca10eb8813c76aecbcdfb15003e01cad16aaf21c6a753818d51599ac8811b4e40e5f7f630dd5d1c9f2d9c35bf153bd268ac2878bc8cf4975cb8a78bfd2 SHA512 c624a9b46641120d521040c3daf08fa7e1e2762d627d16c0f5f727e414aff8eaf86290be041861e79fa884846bfe739bc59c79d57cf40128a7aed6039743900e
+EBUILD ibuffer-1.12.ebuild 307 BLAKE2B 1628c3c7bf21b127305ee9ae60f3fdc1dcbb9940e2285c8f893638e1dbb2d2ad6ff7812e542302cfaaaf1c5ee6ef9c4e2fdbdf104765a1f51288df52f16e1d57 SHA512 99c0114ef2799a077b4612fa6897e6f6eab036d5c3aeecd18948cb63b8a57630349f930da27e3bcacac05c06acf6ce1ff14a6ce9ebc9636c6412977a68efeae4
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ibuffer/ibuffer-1.12.ebuild b/app-xemacs/ibuffer/ibuffer-1.12.ebuild
index c615e7be9faa..3861e51ad4e2 100644
--- a/app-xemacs/ibuffer/ibuffer-1.12.ebuild
+++ b/app-xemacs/ibuffer/ibuffer-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/idlwave/Manifest b/app-xemacs/idlwave/Manifest
index f4f19037a6e8..e018861afbe8 100644
--- a/app-xemacs/idlwave/Manifest
+++ b/app-xemacs/idlwave/Manifest
@@ -1,5 +1,5 @@
 DIST idlwave-1.32-pkg.tar.gz 520863 BLAKE2B 1156dcb89c9900ade58f35de3fae1e6cad96fa7dcbfeda30a9097108614bb5d1f8e8e618112dd47320700d36165ee11abee86e41d8a0cf944a8c32c9c3f5904b SHA512 deebd2e3f49e8a0cf057735a6639f890da5282edbb67cc35bb653456d488e9d0c9f5c69a73a70023f276d7c8df974d9b9a3400c2a7ef1e0bbc4c07c416353995
 DIST idlwave-1.34-pkg.tar.gz 522052 BLAKE2B 3ceacc3d56ee54a678dbb4db84691eba451e382e1c0492efb13ad02a60efd9c046616dac8be838f82d4de2cb77dbba2ad1b9438af502d3133794f839bc1d9dce SHA512 ed4904fbd6f37dcce063c5507b2258d64e0909419ddf1f8dfa0b4526a99412a422b819560c502f92033071025d871b4f6f63ac18c7dce9970ad2fb54622d4bea
 EBUILD idlwave-1.32.ebuild 367 BLAKE2B 6600e69e872355459727faecc6deb2b1e5f963d06902c6eabd9d24fc3b04d284a718036069ee10caf18c3619c78acb5bb4acb34d897ea221f8c50aaf6051c52c SHA512 c0d78740b99435445102d796eeb49c537e3fa575e82c7a04e9650a2a2641609cc3d061d81f4f5667dbfc6880733ff87d7771d3822377fb34424d49e0f8038d95
-EBUILD idlwave-1.34.ebuild 373 BLAKE2B e48071bb66bf781945ed5b37080c36a1e35ad63d51256e30bfdbc3f49ed0aa302e2d3dee8caa8495a8c28ca34c0328f1a47b1958ce366dfdbfc135b801ca8496 SHA512 0a0c6134bb4e5a1f4608ef6db0be48266d0e6ae286be289b37fd09178fbda217876b8124ace1bd9c6b3d45b9a6ee49f8ea160888f892444bc7a053a2b8138ebb
+EBUILD idlwave-1.34.ebuild 369 BLAKE2B a8a6c18ca861217c5ad356a983c2cb02bb18ed87a153127bc21ca034f81527c10de0afeb09296951faba38f4a99fa428a2535c5cfaa67cc96701e410808eecf3 SHA512 fd654fedc274d1b05c5c095f5ee72647a8fd3d5f1268523285f666194e0682a6e08eef4648113a6bb6ac54cb702c72c9578ebd2594437a9d3066d127d4c70f74
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/idlwave/idlwave-1.34.ebuild b/app-xemacs/idlwave/idlwave-1.34.ebuild
index 70ae400fc3d1..db6d0f184554 100644
--- a/app-xemacs/idlwave/idlwave-1.34.ebuild
+++ b/app-xemacs/idlwave/idlwave-1.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/igrep/Manifest b/app-xemacs/igrep/Manifest
index d3bc06f0118e..b51d40b6ae98 100644
--- a/app-xemacs/igrep/Manifest
+++ b/app-xemacs/igrep/Manifest
@@ -3,5 +3,5 @@ DIST igrep-1.16-pkg.tar.gz 21993 BLAKE2B 688a1dd31421a07558da5d567d31d2ba14bc847
 DIST igrep-1.18-pkg.tar.gz 22032 BLAKE2B 57d8cfec4b210e52368bc5879f015323ad494ec6503f8ecd568f0ac3e12c7cdda40c08e1fd63ab006570342cc629e527c906ecf274e441d72b7134bb20e32c32 SHA512 c2e4420b43c00f38a368016ec46c2f8d24580c7d2d36d269be942d81af07b8997d402185d08a81acd863fda0716b4c0ae17dde812ea440b06672885638ce6f2e
 EBUILD igrep-1.14.ebuild 328 BLAKE2B d1415e7ed5ef3611c1203f3d2acd513ed0957a8eaa4bacf69cc7872cb84572cedadc163e8a4bdaca06b8550f38976b5d63acdbe14a06eb4b9e52b86d870cfaf4 SHA512 c4fab805232e04b45435ab7cb89b006a5f5d83268c91df659234ecddc6bc3c54e5aff219588940ddf1136d0f701398c399fda995da4f992d9c602aba8e871678
 EBUILD igrep-1.16.ebuild 328 BLAKE2B d1415e7ed5ef3611c1203f3d2acd513ed0957a8eaa4bacf69cc7872cb84572cedadc163e8a4bdaca06b8550f38976b5d63acdbe14a06eb4b9e52b86d870cfaf4 SHA512 c4fab805232e04b45435ab7cb89b006a5f5d83268c91df659234ecddc6bc3c54e5aff219588940ddf1136d0f701398c399fda995da4f992d9c602aba8e871678
-EBUILD igrep-1.18.ebuild 334 BLAKE2B 08e437bb04216eaee3137c91df3c423b502dfdac4cc64a04f5e57318c77fd41732b76185e836c58b8c4333cd09471ebe2791f28e73429b57d5e816cee7a5702f SHA512 a4b22292d942d12f179d6159f1ca33ce4c433efc4f3daed870259435b06db8471fcaa5dc762c7767c6bb61d8810f5edee3da0c25ba45398e498f20835c4faf06
+EBUILD igrep-1.18.ebuild 330 BLAKE2B 35dfe8c0b9c847997aee12fb78075b0a6e7374dac322574aca7069c0f7f31c036d37c48f7de1a3ded255dfa9f07be859b7e9a0d74015b36200524cbce994d3f0 SHA512 aac8ca8bd1efd0f241427f673891564b11c56a2230e3d229d2936e7a48c192a110794ff9e2fde855abfe44f8226d77d29c2d0b86e33ac598cf3aa70635451420
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/igrep/igrep-1.18.ebuild b/app-xemacs/igrep/igrep-1.18.ebuild
index 86d943e5026b..796a92305bef 100644
--- a/app-xemacs/igrep/igrep-1.18.ebuild
+++ b/app-xemacs/igrep/igrep-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 app-xemacs/efs
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ilisp/Manifest b/app-xemacs/ilisp/Manifest
index 331c1f3b45a6..31e8c4cfb8e3 100644
--- a/app-xemacs/ilisp/Manifest
+++ b/app-xemacs/ilisp/Manifest
@@ -3,5 +3,5 @@ DIST ilisp-1.36-pkg.tar.gz 347911 BLAKE2B 4e8783055d06b4824c806c80d79dacb4bad806
 DIST ilisp-1.38-pkg.tar.gz 347693 BLAKE2B 41e83efd134dd013aed6da858db1df6276483f613e920127db9fd289ef3bb27e7d59a2e99ce39e4a6e57f9a76f12e178daa5787f133e2cd3de9a592444578d80 SHA512 157cdaf3a4bfec9602c8a63cf573a40d50d5d88d5c620e1f23e41ef7c272bbeaaf4937361ab412a4e79ad9d60fe0a2d8c99362d086e4ad7b60cf0c122f9b82e0
 EBUILD ilisp-1.34.ebuild 383 BLAKE2B da09175af93d253484b6a8ddce7d24b4dc031be3e835e676ea0df55d06d6d043f5d1213f3da587deddc8d8f2d76c0315760c1fd64861050ab8ccef7c56a077e7 SHA512 d125ed711d37d7cb56c7b27a3c387e8d29aefc8e580a879b45d035f91f0493d17356ff7505e9a5ea53e643b57d841a255e5c71e48a0aabdb46879893e4045ccc
 EBUILD ilisp-1.36.ebuild 383 BLAKE2B da09175af93d253484b6a8ddce7d24b4dc031be3e835e676ea0df55d06d6d043f5d1213f3da587deddc8d8f2d76c0315760c1fd64861050ab8ccef7c56a077e7 SHA512 d125ed711d37d7cb56c7b27a3c387e8d29aefc8e580a879b45d035f91f0493d17356ff7505e9a5ea53e643b57d841a255e5c71e48a0aabdb46879893e4045ccc
-EBUILD ilisp-1.38.ebuild 389 BLAKE2B 1450b6aba47e171b818dfc3de368e8282d4085aaf48e18519f5e0be7656e2c0f3c081868a9baef4fe3fdabe6dc4376960a32de4f49a83a5a364291c45e65795f SHA512 2da309d4078a7d315bad44f4951d1cb77601e6e8b349b41b273752cc0ec14562d2491d7db5b03da2d11115670ac49deb493f42b37be771460db664d283189825
+EBUILD ilisp-1.38.ebuild 385 BLAKE2B 84bf154fecf992c5a00a2e51f0a371d82154e6edf63951b1e03ecb13936a1af2c35925384e2b2404ae62b16ce6a0f08e343b9a394a1b632a3cb650a4dd1838a9 SHA512 51733d85a02b1452c4cef94a75668d061095318ede32fec9c014ec33975ac0925bf2971f320fe8d5638fccf1180e4a9e1c2f4c69ce2be78ce6013081779fac82
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ilisp/ilisp-1.38.ebuild b/app-xemacs/ilisp/ilisp-1.38.ebuild
index 9e0a973ad97a..d47230fe62dc 100644
--- a/app-xemacs/ilisp/ilisp-1.38.ebuild
+++ b/app-xemacs/ilisp/ilisp-1.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/jde/Manifest b/app-xemacs/jde/Manifest
index befd96436aee..4e589d8cde21 100644
--- a/app-xemacs/jde/Manifest
+++ b/app-xemacs/jde/Manifest
@@ -3,5 +3,5 @@ DIST jde-1.52-pkg.tar.gz 3767445 BLAKE2B fddef76a453d594d896480089b45bb8472c7253
 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
+EBUILD jde-1.54.ebuild 600 BLAKE2B 4dc0d288f6b5afefeea65069e3215f1f42d04d6b461074d1bb235360d28f0ba472d62ce4eb5e3b4421e97bb564b4778d4ae6d5d24278181cacb8caba9f3a817d SHA512 25c45dc41cc29ef116d09cc6406550dcb4999c23434a484d1343ceb3cd5c300f3b3a29214733c7d737c0d4cd9437d0885b56712942bf2e7dfc065f3281651dd5
 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
index 7dd03b21d8a8..6a1bb1d47b66 100644
--- a/app-xemacs/jde/jde-1.54.ebuild
+++ b/app-xemacs/jde/jde-1.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,6 @@ app-xemacs/sh-script
 app-xemacs/fsf-compat
 app-xemacs/os-utils
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/latin-euro-standards/Manifest b/app-xemacs/latin-euro-standards/Manifest
index 15a2d2adcaec..b2400c88c428 100644
--- a/app-xemacs/latin-euro-standards/Manifest
+++ b/app-xemacs/latin-euro-standards/Manifest
@@ -3,5 +3,5 @@ DIST latin-euro-standards-1.09-pkg.tar.gz 14360 BLAKE2B 00ce57c201c0e815f30eb284
 DIST latin-euro-standards-1.11-pkg.tar.gz 14443 BLAKE2B 19c7675b682ad3d68325eddd6f0ff9c831347ecb27e8db98c1deb55eef4f866d60369f433b2a8577297117d338c936f6938a451bf5fcf79d3914a5fb74acc8e5 SHA512 ab7f05609ead5176a9effcad7aad29cf5e86a7954c8dc64e99cc4901f8551262a7e770888dce3855ef66349b85980c29eda895e7a619ea87fa239dbd420e2695
 EBUILD latin-euro-standards-1.07.ebuild 332 BLAKE2B 84f5d202ba77612ef8c94bbbcf6c5c06207218b93e5842bcf87d471d2978796e07a4ed8f30df8c9f932d75c9b3e5f1b6e1b96922193987cbe1fed175f41bb825 SHA512 c83f14c7b7e5667b6a2937904e9acc2473eb5e2ce00300251b70771c237968f60b2f3ae74c88bf4e8153cf19da4993f00aabdb5a1f2b61a9d176ad28c2c5709a
 EBUILD latin-euro-standards-1.09.ebuild 332 BLAKE2B 84f5d202ba77612ef8c94bbbcf6c5c06207218b93e5842bcf87d471d2978796e07a4ed8f30df8c9f932d75c9b3e5f1b6e1b96922193987cbe1fed175f41bb825 SHA512 c83f14c7b7e5667b6a2937904e9acc2473eb5e2ce00300251b70771c237968f60b2f3ae74c88bf4e8153cf19da4993f00aabdb5a1f2b61a9d176ad28c2c5709a
-EBUILD latin-euro-standards-1.11.ebuild 338 BLAKE2B b950860fd8f62031dcece93f9b2cbe9addebcc81add7b2dc3a8bb99354f938d675baab38e57956b3781e171a2cbf5f747a0309a7943e71145aa68d62f0946f6c SHA512 68b07bd6fb32945493b0ad32644ccb0a4ac809e374ef232fc8ba427638a6b973e538b15f014124cd5ea75d1aadaa0445df608540c403eca85a59f45a2c65fc9f
+EBUILD latin-euro-standards-1.11.ebuild 334 BLAKE2B 44e5214a5cf8428f282fc8d0a5e82ba7e53c9d907434007720f479be54397145dad14ab07a9ba91301a5d79275ef196a257e04d0679ab9dcb16b9385a2ce93c0 SHA512 7bd6a3023ea9406f45904c93008bf845703371308aa4a8f07c68d8422b9f0d86622a2f6c3be87c0af8f680b2b2a4da642e330fb59f1efc4ab12725a7e2969038
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
index 29529bc0a11b..1a1ffdb04c83 100644
--- a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
+++ b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/latin-unity/Manifest b/app-xemacs/latin-unity/Manifest
index 5f136ed59ca3..dd893e3e8fbb 100644
--- a/app-xemacs/latin-unity/Manifest
+++ b/app-xemacs/latin-unity/Manifest
@@ -1,5 +1,5 @@
 DIST latin-unity-1.20-pkg.tar.gz 106399 BLAKE2B 3e5270865879a49f0ecd2eace7635df32219834240ed84e1a1953d2ad5c943fbff96b2e6efb3bd79ea1053adcd4a0daa1de9a62320eea313d43b1cbf0dd6e994 SHA512 9e2634c69ba1382113811e31b9bb2a4d3aa5780fb5d98b0bcb3e8c3ae813ff881ae13032318e14000f9ecb2c68d4490cb168ea8b10a373889962ba7c920569d1
 DIST latin-unity-1.23-pkg.tar.gz 106169 BLAKE2B 4b3e3a72a9589a0afd4f5c6c03af269599300f785ae4f7bcf35aac0fd7b24c0d191f225501468f90a5ca9d422b3453d289ef8306fee4e8e24a53f2190dca5a83 SHA512 5fd5b05f0528a83eda423233a6312f7b81f8b9d77987193d2425c9308dbcec391edccc8c16ec1de3d95cacaba809c3e8ba8f170d32c772225ffc780ee5389553
 EBUILD latin-unity-1.20.ebuild 429 BLAKE2B a65a1e7c7f27a5de4cb4380309dbe4d68023dabbb3a33ab015662198b2ab7e8e0d3fffda0345554cac9d0c34ed5115ab90fce9cb18ac50d7ca346086b99c57d6 SHA512 e60863ceb4ae8457331cca30bdfad2fcd76c74586a7cf1e37241a2469f44e8532b84bd7de4ddbf12ae73641a3dd8bae350334b5588ff42ca68b209432ce7bc6f
-EBUILD latin-unity-1.23.ebuild 435 BLAKE2B 08c180a0fddd3ea980d1b4bab8d79eaabf988680405a5d18c7a214060036527a567baf224d49dcc87262b518baa1f3511b87381699232dfbfb8a164dbf3b0c02 SHA512 dd49fd7bdd765ad51e506e9c5637a56fa8da150d46eb169c431f4766856450d2ea2093bb4c5c5f507f344495f498b8efd5084634f66f9d0bad7bf4ac6c67b43f
+EBUILD latin-unity-1.23.ebuild 431 BLAKE2B bd303424f8c2416253c615bbbf8e60a0040229e1a57313e2675d0676147ac00b64756afcd8ad7ff58ffc84e7b7054a9a3c76cee91adf0d79493e2386007d77ca SHA512 688fbaa1037ba8525972d62071e7a9b52eb2cd1b64009808c9ca761260a90825996372e2a772ea7cfecdcb34df49d1f26e0ad91d62dad3d98175c453debb86b3
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/latin-unity/latin-unity-1.23.ebuild b/app-xemacs/latin-unity/latin-unity-1.23.ebuild
index 62df55dee657..7e58d2265941 100644
--- a/app-xemacs/latin-unity/latin-unity-1.23.ebuild
+++ b/app-xemacs/latin-unity/latin-unity-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,6 @@ app-xemacs/leim
 app-xemacs/fsf-compat
 app-xemacs/dired
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/leim/Manifest b/app-xemacs/leim/Manifest
index 510fea3cfb8d..1e5910a2bf86 100644
--- a/app-xemacs/leim/Manifest
+++ b/app-xemacs/leim/Manifest
@@ -3,5 +3,5 @@ DIST leim-1.31-pkg.tar.gz 1804784 BLAKE2B e18e999335494795f1821e8a6d6e762c1a5db7
 DIST leim-1.39-pkg.tar.gz 1810480 BLAKE2B 1e8be69ef59a89a6498fb51cbf261cdde90c2bcbbb515831dfcb7ec487f3e14842ac8ce2b5949bbb5197632a7d52f69500fb0bc81bb5814ba4f35c693bf870e1 SHA512 d695f725733cb4455e75a4c9b511abdb6c78a9208f5b04dd5ec8641ee8f899a269b72ef8820f3dd780f71bec67979640fb3968f54f4c304b2decaa0e442f4197
 EBUILD leim-1.24.ebuild 371 BLAKE2B 935252ec222ad5b8886938e3370b6176746b52a1ae477e0d277b0841f5f78619ac42d8edc1f0c5481f40daff8ada714d3051916de263b8e1b7356dd8d7e746c8 SHA512 dec3bf581588f9b6165cb8e7d017cdb00c8e391523479b3b86fffeaf50e272cd2a889a72fa525b252b33421e5ce2c90e62a12938746b75136a84756b8a5066a8
 EBUILD leim-1.31.ebuild 403 BLAKE2B fb221bb173a7f7b9ee5bb61d4214ed35dd0447072b9183364ede7e7b3852bbb8a2e6823c3b75837cf421b6b3e90b5e07730972094ab5625eeac72b7abeed2ff6 SHA512 4ffbc77bda44e9fecd2bfcd881d98a8e29798c75f1edfd3180375441b83cd51678f12c2664c2d25f03c63ac13809a6ff4c746faeb9c6a34c9ef021fd0a6fe958
-EBUILD leim-1.39.ebuild 409 BLAKE2B 93653edaee09ff14fe9639802749788f7a7ebdde4582823f71a1acfd956c15b29541ab1ef51249778e6ec5de4ac7a6cd95260d21b4ff75c7c4f0cec7987fc6e7 SHA512 4b429c48c82db32b73e27bfcd4b5456cb2997ca87e50c2822b94e5cc62e429abbdb0778c6f434e812a48f0c8d7007e94c07dbfbe3215fea50ec55848ef0aed8b
+EBUILD leim-1.39.ebuild 405 BLAKE2B 9c0edfad5146b22db341bf17cab8b66f82f9653f8c8ff327820a25870b0c83589eae84671f3d650df93f8d015f90f303d7e43261152355678ca1b4d07d3869e6 SHA512 144803f9fb15d9c64c24445ef9987860a5a1e081cbb9fb59266b1216978396b707941d7ab512cb9acbf36a3d7cbe6a5ed5fb87d3dcce52d5a241b693aff1f88b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/leim/leim-1.39.ebuild b/app-xemacs/leim/leim-1.39.ebuild
index d09c1d8e5a6d..aae8e80bf9ae 100644
--- a/app-xemacs/leim/leim-1.39.ebuild
+++ b/app-xemacs/leim/leim-1.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 app-xemacs/latin-euro-standards
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/locale/Manifest b/app-xemacs/locale/Manifest
index 5ac373a8f28f..b186d4941273 100644
--- a/app-xemacs/locale/Manifest
+++ b/app-xemacs/locale/Manifest
@@ -3,5 +3,5 @@ DIST locale-1.28-pkg.tar.gz 74931 BLAKE2B fa303cf6cacfada89cdc364fb9a6ab76b93b74
 DIST locale-1.30-pkg.tar.gz 74944 BLAKE2B 6a02a2a3f4d82509b05596ba0e19273994c0eb5adce028a812a2d6b82a716a19b0c21470c02f787b948c468ec37f0e4f3b363f9ae47741f9683d205aa2f3c5f7 SHA512 5e0bcef0b51cd10b69bf50589cb8bc85bfd0758b19ed2b63fb324ed867c2bdafa573e19a94916f6cd2025820fc71e806e12428039efa20c89ea9695011602251
 EBUILD locale-1.24.ebuild 316 BLAKE2B 3e3de5ff8d132f0b1f675e55e868731eb9d8a315b6faae3857e1f2fe8de4de702eb275cc7536e8d146d7b4284363ad133bdcfce622ee39477efcd526c35e9721 SHA512 d1b11430bc6977e58df971166bc1bf339ae40708c09d7cb2ada6fd52adfdddca53824bc5331a422a58a5b7b47fd03ae1b6267e798b74000b9817d94cf0051f86
 EBUILD locale-1.28.ebuild 316 BLAKE2B 3e3de5ff8d132f0b1f675e55e868731eb9d8a315b6faae3857e1f2fe8de4de702eb275cc7536e8d146d7b4284363ad133bdcfce622ee39477efcd526c35e9721 SHA512 d1b11430bc6977e58df971166bc1bf339ae40708c09d7cb2ada6fd52adfdddca53824bc5331a422a58a5b7b47fd03ae1b6267e798b74000b9817d94cf0051f86
-EBUILD locale-1.30.ebuild 322 BLAKE2B ba2f913d5e15d842e84708e3914c563a3faccca18cba8a063d9f7397dca7c6c1186f070b93839861b86b8101314c3596c0b50b2cc01fa186350f673556775bed SHA512 ed38dde627aae3eafbd0efd5c5dff3a62c5cb6e689dd00b88b73112bb156cd6beb1942d113ecc53448f9e8df83587df0f83eb50ebb37cf95da7caacbe25ca91f
+EBUILD locale-1.30.ebuild 318 BLAKE2B 78ff22240233a87cd70ed777eb6a0340f783936e12c01917f45d4970b91c32644c49db05fcc8f03af80bab73ee91713a28ef15913e8d5bba066c275ecbfe533c SHA512 3b5774302e7c66e5b8d531303dbf6d157c4f6e2b9d24121fcaa9ce1412a986ed033ffd7e697ca1702b83aaa782a1c36c6f7fe6f0681922106981a6e50004b7f5
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/locale/locale-1.30.ebuild b/app-xemacs/locale/locale-1.30.ebuild
index 6011f0be6350..bae27172946f 100644
--- a/app-xemacs/locale/locale-1.30.ebuild
+++ b/app-xemacs/locale/locale-1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/lookup/Manifest b/app-xemacs/lookup/Manifest
index 48e928eb5298..6511c2a4202f 100644
--- a/app-xemacs/lookup/Manifest
+++ b/app-xemacs/lookup/Manifest
@@ -1,5 +1,5 @@
 DIST lookup-1.15-pkg.tar.gz 225952 BLAKE2B 6894dabb547accf5732859a30d6589c3a283c2bd3e45eaa6b25831a997999a619754db7b2baee9c4b87a399e2d7d2dc73ba0245b4878d03d59f5a8f3155c18f0 SHA512 06d23009bb75475b7df36274ea67046938e328077185a9567a232f4b901f948fd4e36ec39fefacaaf4e1761d800e8803f9aa45dba93d00ccf71710673db28f01
 DIST lookup-1.17-pkg.tar.gz 226372 BLAKE2B 368f6b1cc4665cfa3cd47c8f207a71360380bd1e799f9167d74ef447a626e67a7a2887d80d7cf82c45e9fe8966d13123e921421bf69fbcad91f5203b99f7e59d SHA512 d3fe152db2e8acc81747c02264bca4c3a89cc5b3ad10779c4b7eac8eab1eff755a1c899ecdc4ed7eb6375f1fbba4ce469ce702108f39f8b492fc5b6841a2f604
 EBUILD lookup-1.15.ebuild 305 BLAKE2B b7caedc0da9d8adf0fcb1c6a21edde4e5d64e93ff130b8c5dbf97fd0e778ddec12b6224bcba6537d8778da8991ee988b0537fe17f329d44ecae7a047c05a4856 SHA512 58e7afe381c2fa9c3b002661158e5c81a37b7311c32260cce9659e9016167e77f390278f8db96bb0b89220f58c5d708694c1b583d31d0a90de2cfeea69a20af4
-EBUILD lookup-1.17.ebuild 311 BLAKE2B 253381e365d1db3936f4e2cc150198942fe9a93ad75296a382054f9e9d44a728c9b420370f6bbdf01c4b870fd3a33019dc16a33c910ccf5d991db6495f830f01 SHA512 5df3073813a1fb4c322dbe13d5a5c40bc6d3daa86d05f55e686bcf5cacf5999c204b26426b10cea82ec5dd60f1a45ce923b354051d1aa8f555949c4f65fab839
+EBUILD lookup-1.17.ebuild 307 BLAKE2B 0158ea5b354db74904674b49ccabe455b8fd84009221ee164c4264d78cf1b1ef7a07155a4ed03c1966f9834290e000a188559b452f301812ce80ab83e24d77e7 SHA512 cc81cd14c2f24a7176e17b5d504e94d3b76ddefe02f43c3b1d4eb675f3f46315d658cb581fed9ca43792fda215cbb9deca2bd4504fc6997326b4618e7ce1f1fc
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/lookup/lookup-1.17.ebuild b/app-xemacs/lookup/lookup-1.17.ebuild
index c1d0bd9cacb9..c255ff1550b2 100644
--- a/app-xemacs/lookup/lookup-1.17.ebuild
+++ b/app-xemacs/lookup/lookup-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
 RDEPEND="app-xemacs/mule-base
 app-xemacs/cookie
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/Manifest b/app-xemacs/mail-lib/Manifest
index add35cd8d021..643efcb42bc1 100644
--- a/app-xemacs/mail-lib/Manifest
+++ b/app-xemacs/mail-lib/Manifest
@@ -1,5 +1,5 @@
 DIST mail-lib-1.83-pkg.tar.gz 211862 BLAKE2B d84e39e45b8193bbb05a6d724d6b8672aae2daf506fef5ae99a71c4d122834d5259e82e83e05aa5480c1327c523c19f58f70e921eb44a6a90f84ad4c3aac36d1 SHA512 09149c96e3716c2df054654a6111cd45f0bc86c47ea5a8c699e8c7822052c68885a01392e07611ad7b5f721679aa1a9c5da0694d1a0aef6af3a51b4290c31162
 DIST mail-lib-1.84-pkg.tar.gz 245832 BLAKE2B 500f1f63a23b200a3636792886ffb61e7dcb22c03f6a2237f3f5789cb1798eac5abb52f24b54f31e0678af375f6d569c675ceca3385cc502e5bc1014e758ea70 SHA512 43c43715b1950fb665feceacf8422e26e8a7739ce2491bb9fb80bbda27c70f9452a3c146de3c54ed14f38e6b56176610fc301bdeff4cdbc8de83828f96d87269
 EBUILD mail-lib-1.83.ebuild 433 BLAKE2B 0def14b49f44b85d5b256161ebe0f2eb9800655b935d79e6524b04703d7e1632a702a794fbc6687829ba76142266f22157b26f1187ab87a340c09ba2703c0819 SHA512 17e0c51e0e2b68d0aa75bf7335392ec989e570b4c07c9d5621a93ccaba192413ae9264496551a8839ece75ecc12aa952e94043df037bf9f6c0feb048d42b2ae9
-EBUILD mail-lib-1.84.ebuild 411 BLAKE2B cbe91d8d46f3e17208818f0200099668e1c7679c9ab86bf350cca39e4416e5cf7547246e54e2fbffd597fff1a5af1495e2b42c5ff6ac30d33683563c2f7cdc98 SHA512 4948a63ba0b0076ce0479a602ac07bb222c2725eb4f4472b326ab80a1e39b7d84cb53acc6e44bdb9fc1e5dc8877ce49f235ae0d8a595cf0ef5e855d0a03aa8de
+EBUILD mail-lib-1.84.ebuild 407 BLAKE2B 7d339e490a9a3a5ad29cd4512a18e36c212df5a08aef5adfc80deabc45ca88b8ab23a5452be9efc588865f1a319a2cae7c9691feee19d1d8697bd4af9d8e122e SHA512 c4fa7fccef5d851ce881b0f7168b1c0fd361a38941f081456c88a82fe69b20fdca3f76e88e65b3c795828398ed342973055d81dab15de3279320c1b1f7634b13
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mail-lib/mail-lib-1.84.ebuild b/app-xemacs/mail-lib/mail-lib-1.84.ebuild
index 9ce66b562d66..051ef5c91e3b 100644
--- a/app-xemacs/mail-lib/mail-lib-1.84.ebuild
+++ b/app-xemacs/mail-lib/mail-lib-1.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/fsf-compat
 app-xemacs/sh-script
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mailcrypt/Manifest b/app-xemacs/mailcrypt/Manifest
index a303b0d25c1d..c729aa6b8aab 100644
--- a/app-xemacs/mailcrypt/Manifest
+++ b/app-xemacs/mailcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST mailcrypt-2.14-pkg.tar.gz 154180 BLAKE2B a5db41632b13930cadac65921026a5c5c2d393313d94c6c851e2691eb964eb6f70a25909f71dd7748f537f1dee037e6d3a45b9a7a7d031100e2018e9b2fd0759 SHA512 61e252f67f8848d54bd372341545d88d9f2150f671dd8cf371fa7650c9183eb7e4d8f3e661255110ae1a47df152060d81143f83a2f2fbc942aa6a83d36f09e9e
 DIST mailcrypt-2.16-pkg.tar.gz 154238 BLAKE2B 8d8837510d2b59ffaec0035f2d7bb124ee80d69c6b87c27a4ab5a36033560be685a90b6ef2acd0035d4b74e6ff3d1bb9aa9424e8ff5fc05908c3d39a8bc468e3 SHA512 93248f811bc40b42786021452406df113b5e872ad4e6a0fa72bc4055276a22e8a80439e01d3c2e51b506083193ee1031ee6ac1d11ddfb653d4fbb85d06c5c920
 EBUILD mailcrypt-2.14.ebuild 433 BLAKE2B 82af54a90bf6f7b049b4ab45c95cca132e41a933c67e431313139ce472196e845e75190dcd80b514876910b3e450e628772a375feca5987590dfd21e786c8ffd SHA512 dce3acb3daf5278f47248c34eb8c1abc9981f60276c055a0c3be73f807b576c65826b752d663dfc48ceca00e78c20048fcbfd5e5937b5ed5c14d6938806476d8
-EBUILD mailcrypt-2.16.ebuild 439 BLAKE2B 25e0779d504728d366940fe70e352473330c9fceb7bd5b068ca77e097f5bfda1d56de8aabb935d5002ad7f6a1492d2f74b60f014afc6603eb370de7dfa78833c SHA512 b173f36a435adf300deca6800bfbf17db7b9767f0545e1e9505d440b93565137fc2f98738166fdf328293f7a6cb9d8a276245b67b58e267cb01cf024e62e2da8
+EBUILD mailcrypt-2.16.ebuild 435 BLAKE2B bf3abe87bdc53d3a2791a52b1f079a041209b157ad6204fb528ba4774969654fa2dc87720b4f6b8c02b7ac6c2a206ce832afec9af4d36d1e81dda62aaf3db44f SHA512 98d776127b7b205254f1df8826ec1d31d6a1c73f237928936d52c1bf67f35a0ec02f5988c954d7ab66fadb53125ac9aa7ca5966cb51268b84688f006b3a44a15
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
index f7007300a353..a4f888e43fe1 100644
--- a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
+++ b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,6 @@ app-xemacs/mh-e
 app-xemacs/rmail
 app-xemacs/vm
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mew/Manifest b/app-xemacs/mew/Manifest
index 45c92faeff9f..3cc143696165 100644
--- a/app-xemacs/mew/Manifest
+++ b/app-xemacs/mew/Manifest
@@ -1,5 +1,5 @@
 DIST mew-1.19-pkg.tar.gz 745714 BLAKE2B b2f4a6889cb1e9aed82ce7a75c6861fe4e07a924f3adf32c9592800b6ba03f9960d65da579be2e5ed8343d2d70928336720d2f8f3578752df4cb9504a1231374 SHA512 9168cae8ad96d1050eecfffa46b4c15d65fef1908407f339757a5c9af21d2ef7b53a74cc6b805f0e6bed264fbcce81656117c44382b5884c2f772503cb5f1180
 DIST mew-1.22-pkg.tar.gz 745952 BLAKE2B 565409c958817abdef57bd6a1dc51efeaee2278699edfc2b60a751ce080742aaff1aaea310e61bcf1dc5b974cfb48e7cc6a111d26f025a8c7b45d649fa823a4c SHA512 84d87a78dac1ab0cae7cec9c93b4d64676298d9dbbfe20fa04fa052c132b1a0032e7422451f898cb7d11902e5680f520f0d7cf201ec7ab130c03d0e1b6f97b7e
 EBUILD mew-1.19.ebuild 367 BLAKE2B aade4c862b37c1f8ea44124bd2cec853d505b4e9d545c39967e17863a517de436086815168573d88cb6469c9ddb87a890765415799cd24b738b55e9132db01de SHA512 896042b88e4ff26008db92a281d0876ad20d4cd51f5a9fcbfa9d314e463bae0908b9f3e845e42b9fd3e9e126b2e013210fd78883f25d1e98bc9b14e932e4b17f
-EBUILD mew-1.22.ebuild 373 BLAKE2B c252b3f042e2e0aa940f8dd53ef49267af974cedb0d729dad91bceebd00fc921294b163e7d5c4c666ea991209e3ca4b951f2883cf17aadb73d3e05bab66722ba SHA512 4aa99d78497e75e467a5c52a5e790ea5c9b5cf893dd84c7cc2aea51103596b6eefdcae68f8fe070867a2f11539695d99a0ec8e2cad05e369353feee525b057a9
+EBUILD mew-1.22.ebuild 369 BLAKE2B c22951e0e610105b5433e17ba37512e514869bf79291f25e7e60a240101ca79fd5e52838e0f503800d24d5853c68298fba41744262e00f77ed6f8151071dbd0c SHA512 d1a65347c2b3c2e640a0848ceb8cd5bff5c699a1f88f1f0dcaaa0da667a4eececebcced88cd9d9a25d0f9713fa0846b483e593f126ddce1660ea2e14933f7070
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mew/mew-1.22.ebuild b/app-xemacs/mew/mew-1.22.ebuild
index 13a76f45a07c..e0a7e82cfd58 100644
--- a/app-xemacs/mew/mew-1.22.ebuild
+++ b/app-xemacs/mew/mew-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mh-e/Manifest b/app-xemacs/mh-e/Manifest
index efb143432b19..970a08a9ad44 100644
--- a/app-xemacs/mh-e/Manifest
+++ b/app-xemacs/mh-e/Manifest
@@ -3,5 +3,5 @@ DIST mh-e-1.32-pkg.tar.gz 580383 BLAKE2B 596c7111ae90fc19c00a30e7291a364e7695f68
 DIST mh-e-1.35-pkg.tar.gz 580631 BLAKE2B 7695d790f5ddf924e323270525b2d357f731a7589c0276c1121fc6ac1c2657bf45c86b7cc4e143b1aebc3f20147998d8e5f238a014a35e7d6566b3f45c1a3d37 SHA512 183d710cb725da65c40810833782bbf32f6f1815896261a4a4bd077a7fbb8fd260f38fd6eefc6e84ab46d98219c0214c8b43af36680f7940fb27f59e461de508
 EBUILD mh-e-1.29.ebuild 547 BLAKE2B 69de56b5e084fad9945de6a755c2b61dd42d5c34cf04a08649404f5e8a409c083d14242de46f7435aa0ec368bd7bb2b0e3c2a5465bb325aa4220415748454d83 SHA512 26f0e197a3b3eb5ef7ae8871d2a6633901bde888dc1b91482b8d6419592d02c611bf81945b2feabade17fd85569e8cb418424255736e2e871ef1957ff3d53e85
 EBUILD mh-e-1.32.ebuild 571 BLAKE2B 5a761d3ab3125b1292f4a18efec826cae640d6b80c4257dee0f4598c57bd98810dcd5e04dc330f264562f2c8a8008f78f318eefaffba3f892346cae346e2fa8c SHA512 3972481a9db695cff16abc41478eb994ac2823b75ea7a80e769ea622e91bda482a030e8169c2b8e52c3679646e95af47868c734af887a4acef6d7b36fdad85b6
-EBUILD mh-e-1.35.ebuild 577 BLAKE2B acd6625c813d32e9a01c708e4f01c9155e0548b4809169536d53fc7415424a5ba664b59315bad5bcf464e48242e5a5d296cfeb2146cd4057227bd682ca73c01f SHA512 0aaaa666deb1d345cce9c5057ad58bd7c0f612fd324ce4539b61f6ba718c710831a44a0a269b8c8b274528063bcfbf8a0071e167de7a192a3511d4045f39f404
+EBUILD mh-e-1.35.ebuild 573 BLAKE2B e5649a65cf1a3cb2a65274a1d05582be6a70105e9b443ff57343209b379727a179c40a15d05336aa6e8c810e9e8a112ff1811b320cf682f480e9eb18df9c136a SHA512 4a3209a92b10fbebf139a6880155c1e39ee8e91ede124255d993cf54c6d224f95bfe8c745c7b878ba4ba881e617ae826675b9e39f7f601f663e942450f50faaf
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mh-e/mh-e-1.35.ebuild b/app-xemacs/mh-e/mh-e-1.35.ebuild
index 5fc55c4e661c..3ad785d5d825 100644
--- a/app-xemacs/mh-e/mh-e-1.35.ebuild
+++ b/app-xemacs/mh-e/mh-e-1.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,6 @@ app-xemacs/ecrypto
 app-xemacs/cedet-common
 app-xemacs/speedbar
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mine/Manifest b/app-xemacs/mine/Manifest
index e522c1645c74..43d674bec85b 100644
--- a/app-xemacs/mine/Manifest
+++ b/app-xemacs/mine/Manifest
@@ -1,5 +1,5 @@
 DIST mine-1.16-pkg.tar.gz 67161 BLAKE2B f25b20f0e9f956c8dc31f26395435ec5d0f6f6d38e1becd4618f5a210fd4b11f2888e05ff35452b68d809770a63678ed2c419762d89f7c837be2219de71b4dd9 SHA512 5d319b2ac1e2b5a8cdc753cafe8bd2af54a44aa97443eb0c34ea5f58e3c173801e83bf6b22cbb3b5f1fcbb0e6894586a03085eac81f6d9d43236b70134b35a84
 DIST mine-1.18-pkg.tar.gz 67077 BLAKE2B e434a63c837d53a74c7dd7176fc5b7a32fcdbb337d6896141c6e99058dd83c8ac46da3aedb3946d7f20718f3a08f183bc9817ccfb69d89b966b67a8118851194 SHA512 04bdcbd98716849e4a7bef5590375a245842cd397aae2ea188bca82cbf8bd45d13f120b1a54fdeda69ec7a6847dee1e1a8b1dcd6fa9d05136786c77a1932f2e2
 EBUILD mine-1.16.ebuild 282 BLAKE2B 967dcf0c1861722391c5889c1138a6340fb0d5a98b75b59f695e411e368bf768bb62e512a7335328156dc898c58c794f067b73c0843e5522a8d8475726c16aa4 SHA512 ffb6f1003d3e42beb0f768bcb738333631f114de72fdbac405b55e392b6688ddd72cbdbc9bddf784351c2e670dda6066e619534bd7f87664904522897bf944d5
-EBUILD mine-1.18.ebuild 288 BLAKE2B cddb1f2f293b98a39a46cafc233be7997186f19cb6709d16768391a54de02335a31f498e8eccc62cd27cb67dd73ed91378f128544d89f94ef073abd08df7fde3 SHA512 46aaab6cab9bb935dfe3c49a01fc4be7edb215b1339e1d276e77609efd108e1619320a9d0f5674d5f2c0856538fecc294d38a4332842180a8794435b80574f31
+EBUILD mine-1.18.ebuild 284 BLAKE2B acb647009134ea701eede93d92683f36eafad00fae8086031cdb8916abe5b7d16ec29492cd80cd5c6d53cf122fd087023682d6b5474aea15caa7ce9530c28fd5 SHA512 5a227996b3db35d15d47085af73f8316c76db26ed19e4928ea30bf9e762508938b1ff73d1fa6e2e42da6a46dd4c4d26fc148d6dd345cc378048bc01c6f1b845d
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mine/mine-1.18.ebuild b/app-xemacs/mine/mine-1.18.ebuild
index d157cefcd354..08ff0b37ae47 100644
--- a/app-xemacs/mine/mine-1.18.ebuild
+++ b/app-xemacs/mine/mine-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/misc-games/Manifest b/app-xemacs/misc-games/Manifest
index cfa46e0c49d5..8cbd285dad92 100644
--- a/app-xemacs/misc-games/Manifest
+++ b/app-xemacs/misc-games/Manifest
@@ -3,5 +3,5 @@ DIST misc-games-1.22-pkg.tar.gz 170609 BLAKE2B 336bc894d513b9750be7ff26ba6139a0c
 DIST misc-games-1.25-pkg.tar.gz 170962 BLAKE2B 52ed8c629d0cca552d9a41f3ee122bcc206a693f9a1f57480e9c3bddebc4de1844e497f07be699d4074c1957285bc23416a7719cf8495b85c5a9d6fd3a93460f SHA512 168f0bb82cd1e6a37ba852930a1efe00000f46f91c2545c3c88cf639c2b7d60be1c572f3698bf2a0f1dbb5f04934fe38c27a0fef9f63b0568e484770e202316b
 EBUILD misc-games-1.19.ebuild 300 BLAKE2B fe9b575c4c686ab76f48360b9feffe2fde6f08b620ef62eb91e01fd8ec70752c48720b7e7a2b9ea121d4e17d6ac37ca927989a057d65c1363e151cdad0a2f591 SHA512 f1461522342a03cd2a94150810f6beeb6b6bdec8235910443e1c50a4e3ed9b1ad677bc958d0d05c6c3b6c90fd84df9cfe33c625404b64320695c7b7df69348ff
 EBUILD misc-games-1.22.ebuild 300 BLAKE2B fe9b575c4c686ab76f48360b9feffe2fde6f08b620ef62eb91e01fd8ec70752c48720b7e7a2b9ea121d4e17d6ac37ca927989a057d65c1363e151cdad0a2f591 SHA512 f1461522342a03cd2a94150810f6beeb6b6bdec8235910443e1c50a4e3ed9b1ad677bc958d0d05c6c3b6c90fd84df9cfe33c625404b64320695c7b7df69348ff
-EBUILD misc-games-1.25.ebuild 306 BLAKE2B 7ca0ae09c02d5b0e4ee9e56131e61e064df50a65d8dd0e4c2b3b505bf1aae21ec979ccb3207c78d0e5685ad5fc963a6738a9ab251c1f7ba018c0d58bed74203c SHA512 78e577c995a4c1121051e305c2d8a746f338e807af76f21d7fe0e9f353a59ce0a79dc145e544170e861e9109258fee53771224f2da1b115da402dc09bc48f073
+EBUILD misc-games-1.25.ebuild 302 BLAKE2B b6cfb771d7e1b61432023c00481db990fd069ba22a8cfb0736f934401c8f3890718751eaaa40485177e33a9506bec0291e23b5b94d653bdd9be75a603addc56e SHA512 67a7d68d9886783b1aa49e49493de5e636de57bf2e30b8dda10279909e861944e49b80cf3024f6dfe4a45c18650af80c0f9380764b251e12463d6470d4006975
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/misc-games/misc-games-1.25.ebuild b/app-xemacs/misc-games/misc-games-1.25.ebuild
index 409ceaf6677c..136977649704 100644
--- a/app-xemacs/misc-games/misc-games-1.25.ebuild
+++ b/app-xemacs/misc-games/misc-games-1.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mmm-mode/Manifest b/app-xemacs/mmm-mode/Manifest
index 6e67d9ded228..5479537bc355 100644
--- a/app-xemacs/mmm-mode/Manifest
+++ b/app-xemacs/mmm-mode/Manifest
@@ -3,5 +3,5 @@ DIST mmm-mode-1.05-pkg.tar.gz 205381 BLAKE2B 532d29da7ec761e1c79d0b5e77c7f95694f
 DIST mmm-mode-1.08-pkg.tar.gz 205604 BLAKE2B afb2b9c3f43fd3256ca2de0c32d3356a206a6f883303698cad719f8fd287366ce2fd91a275922fcd6d61e31cccba93b0f0c836a3ff468ca2e28aa2e18ad45e7f SHA512 d26b2d4762e363d34a0fdac19841640351532f3c28772eefa7dda3a24decfa8035f7e156fa3c8c49ede54291a4bda31ee707467757c704a76803718e7d463853
 EBUILD mmm-mode-1.02.ebuild 330 BLAKE2B df0c0818cad922be1e926bd3eeffae9fc1e92c40f2a7a50c965ddf1cbb715b426adbdbc86ead7248a2c4e1a7cbe9fb35605bb0f901194872f1ece2f64e930edb SHA512 156aaa9be31317d78c7fc7e21d18f0f490ab6b135067f475439344222fa3a59ac4c3858124b94e6c697baca92cb812dd63fdf461c66ebe5cdd6f5d7d70fe9f02
 EBUILD mmm-mode-1.05.ebuild 330 BLAKE2B df0c0818cad922be1e926bd3eeffae9fc1e92c40f2a7a50c965ddf1cbb715b426adbdbc86ead7248a2c4e1a7cbe9fb35605bb0f901194872f1ece2f64e930edb SHA512 156aaa9be31317d78c7fc7e21d18f0f490ab6b135067f475439344222fa3a59ac4c3858124b94e6c697baca92cb812dd63fdf461c66ebe5cdd6f5d7d70fe9f02
-EBUILD mmm-mode-1.08.ebuild 336 BLAKE2B 87196d36c718bc4a664fbe72a3535f7468e50f4868beceb0d1a2f81948e568c7eceb7b037dd0103b0de25440f3876e06abb09af1781d341746237f85799278c8 SHA512 b2d3ccf0e592edf1a815ff0b1b77314afddae28a79a922319920648324dc43c838a93c90e67d800c12515db27c7d5b1fb5db24271b08c5f9f769624353df5b4b
+EBUILD mmm-mode-1.08.ebuild 332 BLAKE2B 438d63c2f15613bfefd81aad13033b0ca6719555cd03d6e85e048227a9f82f55efd3d0f18e5c8d053ab8f7d8d0531734fee3ebcd8012ceb2f72051d1c30b82bf SHA512 98729b5d776a93f03e18ae32ffffad334900a1c3c34340d1d55e634dadbdc080b815d917baeb1ab8a1fd0372fe4fb1f30ef4caf4c831e8e7af394282a9804f0e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
index 7cff706d9c25..b0742a7baeab 100644
--- a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
+++ b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mule-base/Manifest b/app-xemacs/mule-base/Manifest
index 6ab6f6c02945..58fb3fce636c 100644
--- a/app-xemacs/mule-base/Manifest
+++ b/app-xemacs/mule-base/Manifest
@@ -3,5 +3,5 @@ DIST mule-base-1.56-pkg.tar.gz 445956 BLAKE2B 2d016323649ea702b7826091ed4af3513e
 DIST mule-base-1.60-pkg.tar.gz 430782 BLAKE2B 0dbc7905c4a294a56bb663ba368ca2bd27e5d052f712c7a5ebebd94d11ac14b2c983abdbf871c04cb14f544d299a9b2570191a17fed7b95f62d38060644c6df3 SHA512 02517a71b5b81c91b6d7e96536e05d42135d67d1168220828a9af5de9f6ff021b1397722d5f437411de258e82809f1c2f33fa524ddf73193171ed7d0ba80e65f
 EBUILD mule-base-1.49-r1.ebuild 365 BLAKE2B 47ec7ff233c20eb12895f03fe5ecbc8a7e5ec4a1a9a59cbe7f8981e79d4ad788a05d0daff60c5276f1ebc49e2c4051696ac617894f386ef199dec03816fae276 SHA512 2b68a7ff6d556c99ccaf3b98cd9f47488c9fbb30e383c2a8a31984aa6db776506d14effdda7002e804cb53a7c133a37125a8a5b6916ffb409835ed6034155996
 EBUILD mule-base-1.56.ebuild 384 BLAKE2B ff76bce98dba48c97c0d3058ad79556a3b70f91cd0fdc0e99115ef0efccf3c96772bfba039414db3d39c811ade905fe3d2bfc0a81550d7916423def99f1aba11 SHA512 57650e041aaa8d337193a779481ca00963a2d1839aa244f2d0eab9c485bbe4f0a2708b943717e310498292521ff130d336dc38db8c18f2837c516f2e65ce2235
-EBUILD mule-base-1.60.ebuild 391 BLAKE2B 76e317a38b79b67334c4cb58792147ab7e98e8c6958e14d9f0830df47a967b786c86514934325f227279b17c085e9b25e13e12b47e081a4af6b38fa7fd5b5437 SHA512 393c8b5af29c18e284d6e3ab4d7b73f64e05ee5e37faedc10d4e67525e483fd57884a348b5328af1ac227122bb9c0ed57a73fbec8bc730757ebee9631dc815bb
+EBUILD mule-base-1.60.ebuild 387 BLAKE2B f0a0334499ee462e125dd5ba114555fab737530f099eec97f8f67ae18ca6ed8b66a3adc5a60dfc84f51d2f9fddd9234053de34e09ce441c06203f6ac2155430f SHA512 68bccf8763b0bbea1579552dc676d644b68a0c3c03696937f94991488b71197ecad545d5b72ea4ccb73cd3ce86a0e3f984ffcbee48a356fc4e8032f65acfd19e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mule-base/mule-base-1.60.ebuild b/app-xemacs/mule-base/mule-base-1.60.ebuild
index 0565c9c48d59..12d97c3bb7e4 100644
--- a/app-xemacs/mule-base/mule-base-1.60.ebuild
+++ b/app-xemacs/mule-base/mule-base-1.60.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 app-xemacs/apel
 "
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mule-ucs/Manifest b/app-xemacs/mule-ucs/Manifest
index 78a05093fbac..a348d97c0058 100644
--- a/app-xemacs/mule-ucs/Manifest
+++ b/app-xemacs/mule-ucs/Manifest
@@ -3,5 +3,5 @@ DIST mule-ucs-1.18-pkg.tar.gz 1301082 BLAKE2B 57cb01431e8210d4ace63150b260600c14
 DIST mule-ucs-1.21-pkg.tar.gz 1300901 BLAKE2B 6d68a19b13e5b9d72101849080e4bbed932bad2d8399a5e7c8cd9217ec06ef15711f69d243bd8ed94aa7ffec74c84a22c85b743025f65bc2797be2d079062897 SHA512 8bfc6aaf064355c22b6d9e2b9d62e95faf31571fd99b7d4a7fd28b69bd99b87fa6e76ac9833712c5593dbbaf1981083e545f24e1cc704568ac6a6078fc88d677
 EBUILD mule-ucs-1.14.ebuild 355 BLAKE2B c7968bd3fa66cff036951c565393d4897b8757512a26c82c38bef7cb6d6e13f057024cfb0ebaf5b39d06b93f3207dfde1db29493d21e2d39b9ddae95a4094f27 SHA512 1fe7754b528250fa45ff60685234f050f9f793b8bcae4aeec7f63352c941f55df61f4c04c29f617e4a4c20770d31677fa5fce37008eadaab6448777975611b1a
 EBUILD mule-ucs-1.18.ebuild 355 BLAKE2B c7968bd3fa66cff036951c565393d4897b8757512a26c82c38bef7cb6d6e13f057024cfb0ebaf5b39d06b93f3207dfde1db29493d21e2d39b9ddae95a4094f27 SHA512 1fe7754b528250fa45ff60685234f050f9f793b8bcae4aeec7f63352c941f55df61f4c04c29f617e4a4c20770d31677fa5fce37008eadaab6448777975611b1a
-EBUILD mule-ucs-1.21.ebuild 361 BLAKE2B 38c0fd87e7af03effce86728579c5809008344cebef37fdc1c5119579f566147f769a4c229b4fb7ec2bbac13a2469f83cdcb7ce2e606c9b9c160fda500918230 SHA512 67fa4f816c9cedf5022c6638a6f92176f7c256f8097e56a1f053326bb057b773e2d12370c54ee1cc39df89301f8b8db7ece307bddd23b73a60637536c35e94b4
+EBUILD mule-ucs-1.21.ebuild 357 BLAKE2B cc32de90759342bf338c61bd9af390312911af599abf76b61434f292befcd1d57d92a56223ccb6f1b106ad43bc19793060d733693700048b98efa179248d1b82 SHA512 6cd8651330fb7dc391e58d64204950ac499c1af2fbdd76ad3292acd4633626dc5b5090822b4076f4924bb3af04bea641b6fe0d727ea05b0e9b75cf8fa64d1ea6
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
index a43664e87b8b..4177cbde12b9 100644
--- a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
+++ b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
 RDEPEND="app-xemacs/mule-base
 app-xemacs/latin-euro-standards
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/net-utils/Manifest b/app-xemacs/net-utils/Manifest
index 4d23232a6750..da9c58f24045 100644
--- a/app-xemacs/net-utils/Manifest
+++ b/app-xemacs/net-utils/Manifest
@@ -3,5 +3,5 @@ DIST net-utils-1.56-pkg.tar.gz 157356 BLAKE2B ace09a691e7722872deb666cc5c360ca78
 DIST net-utils-1.61-pkg.tar.gz 159809 BLAKE2B 60e89819bad3e1a9359457df2df5a96140e5ce1a09d7419daba5077d92bbfd7741436d2e3927a95e066ec032f1cca35e3e5acf38879b6da041ce248448ee0754 SHA512 37ba2c2273994da03b09bace22b5babdafa4fb61e09b1277ac06f68a406110d440f452a120ef0b675574f443904f243dbe7bdd4bca38a29525b5cf8ad6a91c69
 EBUILD net-utils-1.52.ebuild 370 BLAKE2B 70c4fd8e27740c4ca241293df98f548b02ad29993aafe0d6c3f3deb55e854cbe53999aaaee132c81b257afd86bb8182466b6d86a4825049b2161719203c55ec7 SHA512 0dbd4112ce8dc2cd933b9ad8f16dfabb75291c6dc36b6ac95191e62c87832c8161487027fc9eb8c8e1e53dbed0fa73883065b8730e1b8e87372e974bb3a43273
 EBUILD net-utils-1.56.ebuild 370 BLAKE2B 70c4fd8e27740c4ca241293df98f548b02ad29993aafe0d6c3f3deb55e854cbe53999aaaee132c81b257afd86bb8182466b6d86a4825049b2161719203c55ec7 SHA512 0dbd4112ce8dc2cd933b9ad8f16dfabb75291c6dc36b6ac95191e62c87832c8161487027fc9eb8c8e1e53dbed0fa73883065b8730e1b8e87372e974bb3a43273
-EBUILD net-utils-1.61.ebuild 376 BLAKE2B e8711909a79f13e43ef8301226fdaf539b4507e15b452a2e0eebe2c94ee476b72a4350adff373a9b757ce6ea9eed8832e409d1fc1f78a7be46027cd4c8d8592c SHA512 40cfd77d3258a10b3d9e2434c612861ce4a615e61a10169e0eb069a78374a41c795207797973ea5a98fb168b4607b726072868f0a493739aa83adee5f8f75e0d
+EBUILD net-utils-1.61.ebuild 372 BLAKE2B 9a4159c9639f69f9a713b1746c60573b206cce1f1297674471919ac28da20100f16cbc2eeff59b5c8f1c5561bd938f7d9e8d7c2173b9d8ca8ecfc80288b14c93 SHA512 1d58386c390a5838e696e7aac5a8f3dfd2315dcd6cdb4bc73c889b921ac4106ecf409f11509af56661d97981d051b2f9057f3277fd4b46273899c76b43872a7f
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/net-utils/net-utils-1.61.ebuild b/app-xemacs/net-utils/net-utils-1.61.ebuild
index 3500e6dfa162..b92c31cfd9ae 100644
--- a/app-xemacs/net-utils/net-utils-1.61.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/bbdb
 app-xemacs/xemacs-base
 app-xemacs/efs
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ocaml/Manifest b/app-xemacs/ocaml/Manifest
index ae0e4348e4b0..d2a71ad89fe2 100644
--- a/app-xemacs/ocaml/Manifest
+++ b/app-xemacs/ocaml/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-0.06-pkg.tar.gz 65300 BLAKE2B 74e672bbc94e735faf9fdae81f9a961f4b6f0b9f35b008ffc70ef978bc2b269215a1d7ab51fb585fd49281628c3bc85d362d3de60abb3fb8557a78a249ee89c7 SHA512 ab21c0c4bc6cf204c4e2b9b9e1d153a4ddc2de941032946fb460e480d7396c17c563b2234ebd5aec0ff1e833ec578470366204b959f621e1da1d0cace2eea7f2
 DIST ocaml-0.10-pkg.tar.gz 65370 BLAKE2B a33a6ce62d26f81ad5c742410bcc94ec6ad5f7948fd47cf765b48ddd6ad3f7ae5829083217f9fefd464343be7a38fbb4ea814b23ffdeaa97c86576472d390521 SHA512 8da59f782ac2d713b63912d33f26d17921112e8d79fd101e59a20712cdf5250c290472671d9c96c3fce750058cc195773900991a26690de0df6d4fef6263d47d
 EBUILD ocaml-0.06.ebuild 345 BLAKE2B 3b7fc238c0c74cd8343939149652770157e4a889d346d8a84648f4fce72d38424e77e8e883aab7a453b30bb1e37e33edb2194f7780ab507d4cfb3f7c929befdb SHA512 8424ad9fb150522940328ff22f8433f4ad7387c4f7f2e279e50681232e6428976796eb809e287893b12f9ded88f8ccf0c2e01827f857baa216171d636d07e0e1
-EBUILD ocaml-0.10.ebuild 352 BLAKE2B 386cfdd0d459b8d047d0845eecb7ccdcd0d48d1b47526b07bb5edefee71e241a36380304aa7c5ad348020f8feefec3f78ee2691658078e6dbd753b9f45500297 SHA512 3e3e19125a4120825d5dbeac9ffad5b0ebbb2a9a38205c1f7e438ea1f1384fe34915c06b82f1c50d61e39367d8abf18ed06b80267c63a0f27e246c9560ba6152
+EBUILD ocaml-0.10.ebuild 348 BLAKE2B 1f3fb59db4a2c71c5f9804a18fa5048332eac5986cb443b5a039feef3236ee6a205ccf7cff8f95b48dc89389ca99d1c4c1a945b0f0041d981538596d089acd57 SHA512 c14abdf319583e228b64250d6ffe60170b290417cee0a57260543d29afd60d450c9c63afb62f72dcbdbbb9bc5ee4eca045a4a8a890ce9e72746a2b190469e089
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ocaml/ocaml-0.10.ebuild b/app-xemacs/ocaml/ocaml-0.10.ebuild
index fe0aed3ace81..8d628ad51ded 100644
--- a/app-xemacs/ocaml/ocaml-0.10.ebuild
+++ b/app-xemacs/ocaml/ocaml-0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/oo-browser/Manifest b/app-xemacs/oo-browser/Manifest
index e360919eb193..140e65ec4167 100644
--- a/app-xemacs/oo-browser/Manifest
+++ b/app-xemacs/oo-browser/Manifest
@@ -3,5 +3,5 @@ DIST oo-browser-1.05-pkg.tar.gz 517598 BLAKE2B 6c09fbbdfce6f733e03b5f716076a30ff
 DIST oo-browser-1.07-pkg.tar.gz 516920 BLAKE2B 5a4ca2993f6fa8fe15fc72e05509b5af9ea0811077826fa3c67a4b123dcfaaf8ee54e7d8650bde4a8bd8812791859a2598dbe53a9e5126098bf388aec9a77c9a SHA512 6b871c64289eafe9cd41e0754253e28da0e73364686bc0ead3c50cc00b977ffee9b1988c4c6cdae685592d66d781979820342aaee729842a5df99c7170ac3287
 EBUILD oo-browser-1.04.ebuild 337 BLAKE2B 9533173f8aee6f5f7a3644f258f92f23fe06562643b2da4cc65e51c37fff9178b3c7a0a25b980d335dd280d1d9742db2b9aaac83c4cf462a69cc1473ed7e0cae SHA512 b652095556046c63e0b0935f9f1e8376dcc1de71757285526fd8c37d40feca6934e13c72e6c80c9a470d7f38ef66d2fe8ec1a30d182a3a6b248411b5b2597ce2
 EBUILD oo-browser-1.05.ebuild 374 BLAKE2B 8d8c854a46601df84e8410fc233e30e41bc75ea00f871fb467d7c2f78d94484c9f16cd3063b9e29609866ed300facd32779a7610830c695d9a44e9a861e55a65 SHA512 3574b7ca0abbf200e00223cc50a881bf7210480238bba0e62ddc62c59764b7250492d3c00a930f48edb403d4a30547c809bc31263a337ba6c2f92fe2bbd1c1c5
-EBUILD oo-browser-1.07.ebuild 380 BLAKE2B 9171018fbb20d58c80c56e4c3aa8948841ed80c5ff624ebfbd7e0966f80bff310de0bbda150c81caf7c8135edf7b2e0f6389619ef2aef2ac2110a24c48aff899 SHA512 6a15798fba08ddb01f15a5036a6f8acf4829d2c958a6b0ea83dd4c8d16ba0a4f84837b9c9a91aa8783b747090785ad2d94fc3e6e12c42d3a3b41db6f7401a64e
+EBUILD oo-browser-1.07.ebuild 376 BLAKE2B 2ecc599f594d05441ab322c7b0a7e43c1f4296c09fcb08cecb9e323999e08d526ac2e143d200ac62d1e93caf260d09eae68c235a5738c24387543a0df4641b12 SHA512 21f8f596376f69a8433e3cc7ecbcce61eb3851b5872b41d915a6b963c8fa3f47021d356dd22f366e88e915904cb1974e71b3b49104a46f4e9dcac84e07a8ec7e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/oo-browser/oo-browser-1.07.ebuild b/app-xemacs/oo-browser/oo-browser-1.07.ebuild
index 20af21290b28..e004dd5d74c3 100644
--- a/app-xemacs/oo-browser/oo-browser-1.07.ebuild
+++ b/app-xemacs/oo-browser/oo-browser-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/hyperbole
 app-xemacs/gnus
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/os-utils/Manifest b/app-xemacs/os-utils/Manifest
index 69b24f5a1930..e490df145629 100644
--- a/app-xemacs/os-utils/Manifest
+++ b/app-xemacs/os-utils/Manifest
@@ -3,5 +3,5 @@ DIST os-utils-1.41-pkg.tar.gz 232353 BLAKE2B 3212b72124c72b7c172c4767ea82aa7e072
 DIST os-utils-1.44-pkg.tar.gz 232382 BLAKE2B 6430e217638405aada6231b0253e2bac313181c3d8f3fae92cf3d541b427fc29031d475853448fd45cdeb4a8dfc3e8c27c87c381d5155b220a6115e85d4a23e2 SHA512 7245cde56f27fe677182ea3607fb069071b9139be224f02597407709b5b23aedd3e9272ba1ef5feb631fe919175d0b174a6d09fb1f7edcffeffe4b1e6a0ae299
 EBUILD os-utils-1.39.ebuild 296 BLAKE2B 531dcdd8ca70350ef0768d106d7391c78cf3ee9d97bfaa633d39f2ec258dd155326d35f2f6a01739128da3c763e9e2382d6208a98c694e648a120008a59e91ad SHA512 8b6ecca67c66de7cdbe3fcce27fc4ca9ac19e8a1c4d52cc2099d2c97ebbd8a80326313ed50f55b733503e3aa7af79bad97b1c46197de91af553341467c206f79
 EBUILD os-utils-1.41.ebuild 296 BLAKE2B 531dcdd8ca70350ef0768d106d7391c78cf3ee9d97bfaa633d39f2ec258dd155326d35f2f6a01739128da3c763e9e2382d6208a98c694e648a120008a59e91ad SHA512 8b6ecca67c66de7cdbe3fcce27fc4ca9ac19e8a1c4d52cc2099d2c97ebbd8a80326313ed50f55b733503e3aa7af79bad97b1c46197de91af553341467c206f79
-EBUILD os-utils-1.44.ebuild 302 BLAKE2B 6879dbe53ec6ceb2e67fb3cb2ef2e1dea487b0cd749f63721600b6289569f058905714f740292f44cd3b2c63ce62dbfd57edb86c3267be266ef74d607281e020 SHA512 6f6928ef4fab91864862a81b8e084a66aee38db64e24e73a181bef11e6a5fe1b7c843f5fe3c2078280331acb6284324f04c049a40c472c32cf9a88bb213dd9a3
+EBUILD os-utils-1.44.ebuild 298 BLAKE2B 8721f94dc18da2364fb4dcbcc2c4443494341bc51861f587600032be54bac816c90cbab9b9f304c61af03cdcec14284649322bf334d12e84cce67c4e96374a49 SHA512 0f9f50a9b4e6a6909e0ac466225ecf9182d39e047bf5c008f9d353a0f172ca964af8ea3b1b0b90ada422955a76a161abb03f8ea8273807efe9709bfbbe6c68ed
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/os-utils/os-utils-1.44.ebuild b/app-xemacs/os-utils/os-utils-1.44.ebuild
index b8616ce8ba6f..4922ca42749b 100644
--- a/app-xemacs/os-utils/os-utils-1.44.ebuild
+++ b/app-xemacs/os-utils/os-utils-1.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pc/Manifest b/app-xemacs/pc/Manifest
index 4e809ab3fe05..28e43c247d72 100644
--- a/app-xemacs/pc/Manifest
+++ b/app-xemacs/pc/Manifest
@@ -1,5 +1,5 @@
 DIST pc-1.28-pkg.tar.gz 17720 BLAKE2B 06856dbe980ca7313a83d87d87c6d42f0a9a42c9d03e05e0f080abf3e9634e5d763003ed9acf5fedb5e541bbf8f47e0c236728f154cb8565e70b18947795e886 SHA512 cd296e2ce019b54de33560622622cf955937b85205850f7e31218c8de03a05d0516176bc2c8775c2649d271678f18fed3591d2fac572cc78fd11d9d05a43e922
 DIST pc-1.30-pkg.tar.gz 17760 BLAKE2B bdf924d66b596fbd0f2770241713593e63576a229759b5cef10a5493b4f799fd60dd914320a4fcd6d0e444be842bae20a82334d3b223b6a95137a6d9e5e37e74 SHA512 6a64b7b330e4bf73563490de443db8525ea6d15158b78e8561e22609f24909cf2a7e83453024d985a4ef1dc0c00f69c69c7f31ac010c806b6e61811d0a15526c
 EBUILD pc-1.28.ebuild 297 BLAKE2B 34bb55d4d8dd732074d130d5ea1fe24c9c39115e1347d32263e782479aced9da68f817be4945bf733818717a7b672e6aa652f6c5463af53f322fc628d3a58963 SHA512 4412224247e1af153b265f701cfc7ee7b8391be49016f77e90bab17d353b3e80df1e1f01f6b58124d49cf3f0b71e493cb732c75db24d92aeb7ff528bab46ec35
-EBUILD pc-1.30.ebuild 303 BLAKE2B a3910dbd260f3cd608431fe83259ea3b075e48c1bf4f6520a090ad8e8b5e6e7362fe86ddcc31a06a46e143a11e0886196ee5eb2bdf4c3e40484602080b7bc257 SHA512 1be77b41c84d39bef0204828e635d340076c987a4de548c7410050035305ef3a26e7bdbe028fef55a383bc49e0eedf8337d6560ec41f5a2b2e215b9b83ea19b4
+EBUILD pc-1.30.ebuild 299 BLAKE2B b517fb1a53fea006a3de1bee172b0b9a7a47b3697094a9943b133901719ead6de59b4357b2e370ead64353ae0720a506b1751d8f9cb58ea4b9148434e4206495 SHA512 35967b3604be5c304b132d03f6f8120149ff968c6c6ceab70191771cbd6166f653df3d53024653a791211ca3ca547c8d3201df5283d8f67e69562991bd6b5ca7
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pc/pc-1.30.ebuild b/app-xemacs/pc/pc-1.30.ebuild
index ea5fa3da3983..a795a34426a3 100644
--- a/app-xemacs/pc/pc-1.30.ebuild
+++ b/app-xemacs/pc/pc-1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pcl-cvs/Manifest b/app-xemacs/pcl-cvs/Manifest
index 175bd0c51742..a1a0090b9c26 100644
--- a/app-xemacs/pcl-cvs/Manifest
+++ b/app-xemacs/pcl-cvs/Manifest
@@ -3,5 +3,5 @@ DIST pcl-cvs-1.70-pkg.tar.gz 162044 BLAKE2B 24ca04714035d00d77ca82f7a9722043be75
 DIST pcl-cvs-1.73-pkg.tar.gz 162031 BLAKE2B bdfc2c967e5b91c3e0fa3ff655ecc0a0d15b6ffd03b3b91c70d2873a21fd340428c43f18bda8e62bfda1bfbf4bbcc4518247ec7f9b26fc55f819c4f847877124 SHA512 c381f47521dbf2d811efe314b666eeed66cad3ea4e0c7d7f9ed5d1cc6e273e25b48904c3733f824428e03d9fe46d2952ba46cc3959270e0e4523929fd89f8cf7
 EBUILD pcl-cvs-1.67.ebuild 427 BLAKE2B 6471b996d4f840b495144dd49102a0c448f7491dac4414de19753f04ec1aa2b7ca8bb5a37ac22f995f193e2bb76b3c2f5a997a5e46be7b005c81785f592ae62e SHA512 15481d4e8a118bd85bd4c12bb1ee4d6769fd70b246eabda632d1a65b4c152cdcadf7f3718d2063bd2ee1e2185e069421290e236a739abb9eb04938e5abac1f17
 EBUILD pcl-cvs-1.70.ebuild 460 BLAKE2B b272935971477e384e31f645b9a5366e6228b25d72a35335aa598458ffa7795b251a73bb4953cd9ded0d3cb9a21b6cbd1884a84d460ea3e4f0c01ccf7994dbd3 SHA512 3585dfbe0d38c210a370ba06bdf9f3b988d0f6e2168c296169fae772a298512dcbb3573028b5ab6d339bea78c7df40db7e8d26de871847eb05a608c8d7cb8913
-EBUILD pcl-cvs-1.73.ebuild 487 BLAKE2B 19726d189e93199b338810b1f21f374c9df12e357435e47f466be5b32028478214634657f6b8586d36c00ee33f3a930684e52f1d03b99e922a73d5aa2dfd5188 SHA512 0f7b03b6a1d4b819746b9f3b0d60c15cb98683d4cba6d0309637e332e1f8a84d39a9d478e6a3fa1eea29bcdd5823ec790d0a94c9a3cf3ece1285c511257f98fd
+EBUILD pcl-cvs-1.73.ebuild 483 BLAKE2B 15853e6f0bb2cebe1613e3a7d54262efe10f289c7ed953c9992989d2b0b21dacc3fe98d2839b987b23aad8f16db1a9dcffce0fd1ce0b7f61df1b98d721d1ce3c SHA512 d20b4824231cc1de1a82da28bce24affce5396e759c28109035725cafc0ea5e245117b2107aa8c57674b6f467dbf4ffb818cd0faa0f7af1a224fa25a2454c80d
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
index 5ca196feeef6..5027e6814a77 100644
--- a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,6 +20,6 @@ app-xemacs/tramp
 app-xemacs/gnus
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pcomplete/Manifest b/app-xemacs/pcomplete/Manifest
index e921fb78d7e8..4337c9151484 100644
--- a/app-xemacs/pcomplete/Manifest
+++ b/app-xemacs/pcomplete/Manifest
@@ -3,5 +3,5 @@ DIST pcomplete-1.06-pkg.tar.gz 37844 BLAKE2B 5440edafa50d7b83111fff29603611a437f
 DIST pcomplete-1.08-pkg.tar.gz 37882 BLAKE2B 6cb4d719d006e928ec99164da9997b375782c3ad0e91b926b838a3ac3ddff97bdb697387ce5e2c4fe0ac6675cbc2549094c52f8bc4fdc5a5f8cbe20ac5e479c2 SHA512 aa1525020655f5224fa59cbc3e311947cc8bb54ae1d53be4c08478f622ee116dd90afadbb8de30b44f91dc36f86a96e6315fbfe47856759db5f4fd0eca405931
 EBUILD pcomplete-1.04.ebuild 322 BLAKE2B 2f97c636e4494a2fa3b5f2d327e9c30b3bf8c0d0d50f43515e149a7d90fa5cd6e57277eee8d77446d63faf22add2ae3aff142a89831b6eb1f1586356eb2a897e SHA512 cb196f3abbaaa11baa7bc9e0188353d99cc8fe6936f9ede3387f4b0b0bd58f686e1fe4fe4b90ce509c8ac891204659ef0907fd176b8b00f6ef15ffd13b086793
 EBUILD pcomplete-1.06.ebuild 322 BLAKE2B 2f97c636e4494a2fa3b5f2d327e9c30b3bf8c0d0d50f43515e149a7d90fa5cd6e57277eee8d77446d63faf22add2ae3aff142a89831b6eb1f1586356eb2a897e SHA512 cb196f3abbaaa11baa7bc9e0188353d99cc8fe6936f9ede3387f4b0b0bd58f686e1fe4fe4b90ce509c8ac891204659ef0907fd176b8b00f6ef15ffd13b086793
-EBUILD pcomplete-1.08.ebuild 328 BLAKE2B 2738264cea396f84103840f77153bc1842313846e33b86114bc0aa4a9991e4baa82189ccc93cd8353eb09893865a8d14bf2be1bd1538b5d29ec4bb085e2e142d SHA512 c88ba6f2f810884156e626bc509b87721c4c944dcdd0a0299e648338430273bf649dbfb3e9bf75412b31ad08ab0a8ceaddccc5d70b16116a6a21433893c16df6
+EBUILD pcomplete-1.08.ebuild 324 BLAKE2B 7a9339148dea8ce55a1fbece0a1567606017e27b51217a0d1db914b76cceb20e7a83b75bfe5559ec9f83f6d2f064740af8612f6d7be6affd243c0fb31a77fa72 SHA512 c87b077c738a9b1c0d2a168304e3d641f20c830103ee5d7c0294a63e8ac1e07da4f8d018a5a9bd865385710066b9c217faae14c80029b62f731206c69904eff9
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pcomplete/pcomplete-1.08.ebuild b/app-xemacs/pcomplete/pcomplete-1.08.ebuild
index cfaa2cec88c2..a6d2699f1b1b 100644
--- a/app-xemacs/pcomplete/pcomplete-1.08.ebuild
+++ b/app-xemacs/pcomplete/pcomplete-1.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/sh-script
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/perl-modes/Manifest b/app-xemacs/perl-modes/Manifest
index 165e1e90645c..829004e6790a 100644
--- a/app-xemacs/perl-modes/Manifest
+++ b/app-xemacs/perl-modes/Manifest
@@ -3,5 +3,5 @@ DIST perl-modes-1.14-pkg.tar.gz 204091 BLAKE2B d002ac798b306594250d1cc0e5451ad9e
 DIST perl-modes-1.16-pkg.tar.gz 204219 BLAKE2B 4b482b467023ca6ef81b21f4f23410547aca4c7679c90753f19a36dc64031f26ec2f14b3ac0173b03a595b76635cd764b9e55e2ffd1097feb51f5c39dc128b11 SHA512 f6b521fc336a93c8caf8e96293e338d1901838d86f8ef29141e240a0396a1182594ffdb9955d5eae1f113c0edd22e922e11cda6f174865c2a731dfaf9a78522b
 EBUILD perl-modes-1.09.ebuild 370 BLAKE2B 5d175889f7c830ef95cbed315b6d722eec2833646dafa9812aa55be51c2aaae01cf18f706bff3de37f7dcf8c338089c87e475200b97a64975dda33593c1c1bd7 SHA512 7ac38b042394eb3ce7093b27e3632f4122c5a1049b20fd6367ab8d26dde457fc97fe47a5aa789132342149b3068cb5bea5a2a426b67a3ac5f1f056d6c5af7e2a
 EBUILD perl-modes-1.14.ebuild 370 BLAKE2B 5d175889f7c830ef95cbed315b6d722eec2833646dafa9812aa55be51c2aaae01cf18f706bff3de37f7dcf8c338089c87e475200b97a64975dda33593c1c1bd7 SHA512 7ac38b042394eb3ce7093b27e3632f4122c5a1049b20fd6367ab8d26dde457fc97fe47a5aa789132342149b3068cb5bea5a2a426b67a3ac5f1f056d6c5af7e2a
-EBUILD perl-modes-1.16.ebuild 376 BLAKE2B 4f3333abfd55a87fbe25b46b34273db6373fd4fa7eda10f3557d6dedf26f02f865115c7c23e570c4003face86e2bb1a9f632b9f0266924d7a0761bef1e185991 SHA512 f1747b18ac9c7bcbdb8f1dad1bb11e3e8ffa577558810175eebc2596dae81f2b7da75f7cd4012b4bbb8b4f0f4683ac64ac5c512aa29b1867521f24ba51fb28f5
+EBUILD perl-modes-1.16.ebuild 372 BLAKE2B 5f625c607c4b36c8562236182232cbf0d299928d3dc80612fe371de5886ec6fd888028194e7785c8053ce14af34b2513877a292d754183212151802e62df1b0c SHA512 78e1afed83bd2a019f8c7692eac7cc9d8500484bfd72c1112a423edf377473adcfb5b60787cd5969994041468769f5f04ca8eaea697109a2c071f7df04b26dcd
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/perl-modes/perl-modes-1.16.ebuild b/app-xemacs/perl-modes/perl-modes-1.16.ebuild
index bfbb0ce85ffe..4402ccf33eb1 100644
--- a/app-xemacs/perl-modes/perl-modes-1.16.ebuild
+++ b/app-xemacs/perl-modes/perl-modes-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/ps-print
 app-xemacs/edit-utils
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pgg/Manifest b/app-xemacs/pgg/Manifest
index d23f17b10a8b..d2951e66d4fc 100644
--- a/app-xemacs/pgg/Manifest
+++ b/app-xemacs/pgg/Manifest
@@ -3,5 +3,5 @@ DIST pgg-1.07-pkg.tar.gz 34293 BLAKE2B 1b45e947de61678a2b85a3a7dac0c34d605becb8c
 DIST pgg-1.10-pkg.tar.gz 34644 BLAKE2B b7aeb3749c5867c8b785ad1c0b31636e3df4105b5c80815678fbc87e38269e8af526ae8fdd0bfb1188845bf40017304a3f9b40d270aad65cd69cbd0ddb4a78b6 SHA512 cb8971c3eecd3e1284fb9720184252a7df92d7a0bd789b1a5f8aa708690e653db30c418f6a2ed4a947a847961e474073d0a5489244f9daf74dc61b70ee06468a
 EBUILD pgg-1.06.ebuild 374 BLAKE2B e5779e34b897793e0d152e60cefa278445497d06590302b785abe9993b41a12b71f155732859d4a75380b86488753c3f8953a95686cb8b788c7a911b322040b0 SHA512 94e09e75a96f7c19ba8ea952cdf8f5277198f48d3dbf8154cbf6e5dc3c04b9f44bf6984e8f0fdae5d07b81b27503ac5467b61b64e839d6e3e04c62bfec05634e
 EBUILD pgg-1.07.ebuild 374 BLAKE2B e5779e34b897793e0d152e60cefa278445497d06590302b785abe9993b41a12b71f155732859d4a75380b86488753c3f8953a95686cb8b788c7a911b322040b0 SHA512 94e09e75a96f7c19ba8ea952cdf8f5277198f48d3dbf8154cbf6e5dc3c04b9f44bf6984e8f0fdae5d07b81b27503ac5467b61b64e839d6e3e04c62bfec05634e
-EBUILD pgg-1.10.ebuild 380 BLAKE2B 5a6c23ed552e4679518d71f2fce1d5721a5cba8ed3c933f946d3eadc303b52b1f4a2bd77ae53493789ef2cf610f6f86eab570c9acd926e76e7649ae2bc819ae5 SHA512 f095ab5064e5bcf766e4533d817c0228478a314f0630e3325971f256ca3b21a241349752039d362f57d695b6018adea763e358f3301eb64463fee1c7724a1987
+EBUILD pgg-1.10.ebuild 376 BLAKE2B f540949dac7bf14e539e05c125ce384ed3014c504ead19c09661499eca651b7e41813dc3586926f25859d1f4c25dc887acdc19ebf55a88748aeb3975a1d5dbbc SHA512 35adf237c38314f10597a177bc03307af8c69124d3c892298e79fa89ae1e5dd6e7dfbe40c7c77ec7021e0218ebe7496e5d0e0539d7977ef6b57c00f0525e0db7
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pgg/pgg-1.10.ebuild b/app-xemacs/pgg/pgg-1.10.ebuild
index b09a5903a425..884cb68021dd 100644
--- a/app-xemacs/pgg/pgg-1.10.ebuild
+++ b/app-xemacs/pgg/pgg-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/fsf-compat
 app-xemacs/edebug
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/prog-modes/Manifest b/app-xemacs/prog-modes/Manifest
index 757f39f2cb57..126068e98acb 100644
--- a/app-xemacs/prog-modes/Manifest
+++ b/app-xemacs/prog-modes/Manifest
@@ -3,5 +3,5 @@ DIST prog-modes-2.20-pkg.tar.gz 821805 BLAKE2B 73b69223d9c51338e4e9fa4cac4db8016
 DIST prog-modes-2.33-pkg.tar.gz 874585 BLAKE2B c29525ecad896041368bed7fb647110428c968fbd77b13b0322a59eb1fe2e73e7000e6e119b2658ca82bd01b6014aece2b588f807f80ecd926e755e28f09ed5c SHA512 e2c7cba8916b41c1c3e932c4daddb57ce330f242c6ef189916608b0f682122f066f18706e05b8a1b68ad5b993bd873e47fee558c540b7f6a58bdffa68544e880
 EBUILD prog-modes-2.10.ebuild 556 BLAKE2B e7f96eb6fe7aaea8fdcf26922b6894bc438d9dd2c0760590b9d9c04ff745cdc2ae42603eff98d58f5f7eb7e29dc7000777ef9de138015b337fdbf214207bd089 SHA512 3a15ce421ca023b453cd18747c2310c0ce0a9a4795418b3571ef39146cd3f25de132eab973a8874fd484fc5a37f129709067ff81735e176585250a78eed4af81
 EBUILD prog-modes-2.20.ebuild 580 BLAKE2B f4d5f26fc0406941cdf7fb40c7409b5790f4f8a60ab83b8b909a8b9ed4d54629e3306ec125f0b7228ee6af184e8fb363ed91976e8f23ee5df6d1e52e219495e5 SHA512 c1293f75c0ea4a5653707bc84229da4c55b5b7327fbad4015a66e292a96057034e24fc55198defea0b5b692bd92543194e3f7740a49aa220821730fc88a11b6c
-EBUILD prog-modes-2.33.ebuild 616 BLAKE2B 6ba5a6f65452e6a5b70272177fd4b83dd5e6444cc6926dad725e4a89407186e9c2070c11316956cf4088d39cf1bc2ef5fd97e3b6df27167e3c2d30b1e17f0f83 SHA512 e4396dca9b41db55c8880a2acf709bdeeafbe7c5e022ceabebc2b9c5dc677bdf9c58d861e3d0ab940df9164bbd9edcee23589db89c435bbc176856b727e1e02a
+EBUILD prog-modes-2.33.ebuild 612 BLAKE2B 842dd862028f846ba19decd3f02039d4bc471edcd470184546b8fb2d4667732d4add7ded3e890b926519a556fdb7d11c562e4c60934a69f8438184d323744053 SHA512 6ceaa89c4077068eecf90b9c0425e8112c18289648e290842569c97a82523f7ce714fe928d2a0f9d6e212934ce7f73e31183f4e50e5b09b0628bde6aa6aabf58
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/prog-modes/prog-modes-2.33.ebuild b/app-xemacs/prog-modes/prog-modes-2.33.ebuild
index 00f89fa61cb4..a0e7bd789f37 100644
--- a/app-xemacs/prog-modes/prog-modes-2.33.ebuild
+++ b/app-xemacs/prog-modes/prog-modes-2.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,6 @@ app-xemacs/cedet-common
 app-xemacs/w3
 app-xemacs/gnus
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ps-print/Manifest b/app-xemacs/ps-print/Manifest
index 7e1625b44823..165d7ae68bdf 100644
--- a/app-xemacs/ps-print/Manifest
+++ b/app-xemacs/ps-print/Manifest
@@ -3,5 +3,5 @@ DIST ps-print-1.12-pkg.tar.gz 156197 BLAKE2B 0eab7740f3b0fec7573b9da4583060ac051
 DIST ps-print-1.14-pkg.tar.gz 156374 BLAKE2B 9e2fc8b75c23d4a9768210a82b42a8ee77f2f7541c46af037172a96213ab3d800a3e8b4fdc6964e3aa6bbe1276a4bc09759edd6301932505a9c4d737a8f3d527 SHA512 9dd2208bcd2963f83e4b895ff01ca95e66031ca4003535a672a14a735b892c0522810dd7f0ed5bceefe10a6becab0f0cafb19b09d1dbd6656ce6cc99b7dd4023
 EBUILD ps-print-1.11.ebuild 300 BLAKE2B f57881f2e2d073169b1e3792a2758880aaffed732bf5da42900cf8a6bde75e7a0d3e9e0d42133f90a3d1545753391c1c8496de89541b99f3120297a0f9bd9bd2 SHA512 4a201a26a0b68c9b8c0526340e607f21f03fd1d6c1d4675d8a28fed379bd7e4484eccba8e7bb33353823ce00ea86d66dee19d50143c63867fcc22b437ab4b4bf
 EBUILD ps-print-1.12.ebuild 323 BLAKE2B 28b576c2966035a1f9c22a6c42940d58df5a43b18a3a1d47e5ba31e5ec422f5a011c4c44b11454a2591f5dfd095990b0ff48d219bf1a31a8edfd5bb2f1147a74 SHA512 74ce8d396ef0534c37f5b71969785c2c74789c1692b5c6a0d0b68f2b580ea67b665002f2b14fecfce340eae97225544f583d1a1db2b3e6070cb95d61591ce714
-EBUILD ps-print-1.14.ebuild 329 BLAKE2B 467be147b33ca43d7d20545c50b2c5062a7476805524c2865f11772262971788ccb0f798eb546fd42f22435ddb8839213f8b1dff8e7344e1569b1601384ea09a SHA512 d08cf1b341e417e024af2759285efc6bb46bbcad7a394cf37e26d0d72bb384d54de2187f13d008ba7bb81b6ee14977c3481ab20d15db56de4693f61abaea8cc6
+EBUILD ps-print-1.14.ebuild 325 BLAKE2B 07ee42859253fe87c16c767c79dac4c463a6905b9756c4a93deba369ce58c16e5c57823093c5d793fe041b97e503e4185aaddb88b0a0fb88efc42f7199f5f513 SHA512 4d2aa9e184c1b46586861c86ba7cdbb04dcaa3969e5c6038fa5e0ef9644ae33e6262ce456a8951931b636c8a594918cc7ce5360369a05d66f9bcb2e0ac622140
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ps-print/ps-print-1.14.ebuild b/app-xemacs/ps-print/ps-print-1.14.ebuild
index 5c0daa1a0715..ac4a873bfdaa 100644
--- a/app-xemacs/ps-print/ps-print-1.14.ebuild
+++ b/app-xemacs/ps-print/ps-print-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/text-modes
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/psgml-dtds/Manifest b/app-xemacs/psgml-dtds/Manifest
index 96396f4e0214..fc806e55b934 100644
--- a/app-xemacs/psgml-dtds/Manifest
+++ b/app-xemacs/psgml-dtds/Manifest
@@ -1,5 +1,5 @@
 DIST psgml-dtds-1.03-pkg.tar.gz 367476 BLAKE2B c7b06622895757b1ea73102a1bdf39be6f456c0e276b3d633c6f5c295b09249796429104499358c12da1204c9d95f93bac66c12311e38325f69a03fec81828f5 SHA512 947e3acd754ca9e730b7c3f7e45fb4cf94044dc61874bf37f77da2f11fec9649c4468f73e00db03c92f41fa460f896cdd610088c5ce21a64954584e7ed2bfecb
 DIST psgml-dtds-1.05-pkg.tar.gz 367368 BLAKE2B fe845e58c281909e43c2c7f9372f6b55da4133835df08dddd7f91881a48e73f4afd329ef02a445206c41466b5368c5fa8571a1e3d95a799ce6902245c12731e7 SHA512 700f1db7dff467987ddd9dabca48479f231c81486ea72129db5bf24f0583c0ae197fcf0477c7092e89c0edd7a0465f4e7c736bb95647a254d56dad9aa0935eb0
 EBUILD psgml-dtds-1.03.ebuild 434 BLAKE2B 6aa90d20a62d0493dcee9c6e315c6785391deaab0c7e62a02faa04b728ad6c5ce8b30844a7bdf09233537b49458ae0b7bc6d9bef10b5a73a0faecfcf3415bcec SHA512 d13484e8c37de95926aeeda05cb9eb5c23355f528ac16d8cfbddffddfa8ce256d916da5136545090127f267c0077c1316b9a07fe43d90b9a8a7a701c47f35edc
-EBUILD psgml-dtds-1.05.ebuild 440 BLAKE2B 3a98a3f21d65d0689c18335fb0065e6bd81f1604c8368095bedd9778b2b603a98c838b3e1e5d13ed9e3814cc0a4e2277951b0513f05643312122f6ee8cb03360 SHA512 1769b49dd21627a5173e1df60e60c1f78f2809a031a37fc9a415af19acd536bb7b7629b24e0e718e34004bb08fca7c2a69e7375e28b123ce5854133917376a65
+EBUILD psgml-dtds-1.05.ebuild 436 BLAKE2B 3484dc24d42313eb06c7cd36492bdb7536c4b0ceb17223cda900e6bbd9644b86418e3c9268d92b79125ee7c865868315de388fe883c03fa73f3724bb064c9792 SHA512 2bb970b7fe264334c2103de7420a67fc2aa4c6d8bc0c49ef7c5f107e2c301f956f722dcf6ff4de153ae0cbbd68bd7d932e0e12b28e7a68bca1f0c27a18eb4747
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
index b94533967f1d..f41408741b68 100644
--- a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
+++ b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/psgml/Manifest b/app-xemacs/psgml/Manifest
index 644e9f1d8c99..0994bd09f378 100644
--- a/app-xemacs/psgml/Manifest
+++ b/app-xemacs/psgml/Manifest
@@ -3,5 +3,5 @@ DIST psgml-1.45-pkg.tar.gz 307383 BLAKE2B 0d19188b0d21204a1045e792ec53596664a440
 DIST psgml-1.50-pkg.tar.gz 307252 BLAKE2B f846105420b201bcc17c06781f0746dd9f30824c066c2689d40902353c8a158867088ee4a4152128c1a3ecfab3e834c8069ed0d972c19f9140f362b9c585957b SHA512 92c598586e761bae229f0496ee07790809f9b98901465d078c7ec43750cb473b1b9c32edae1ef9c61f4f4847a9dd84bd8c4d7854a51784f1c91bf3e77fd2a079
 EBUILD psgml-1.44.ebuild 467 BLAKE2B c267c4d39f68c2771faef3c391d77d52f0ce8da25bfef9cd787ce9f4a7eafbd63e08dc65100a1170458b4a49da02e7a3f98ba291e3339e3ef0819f2180e79045 SHA512 a228a9bfa5ce457b906b1173e69aa02ce24b1c6b44b842ea536ac0ceabeb389187d88f6caf37ce220189a1a468164816175ca2f808912f740d1f32bd386c73eb
 EBUILD psgml-1.45.ebuild 467 BLAKE2B c267c4d39f68c2771faef3c391d77d52f0ce8da25bfef9cd787ce9f4a7eafbd63e08dc65100a1170458b4a49da02e7a3f98ba291e3339e3ef0819f2180e79045 SHA512 a228a9bfa5ce457b906b1173e69aa02ce24b1c6b44b842ea536ac0ceabeb389187d88f6caf37ce220189a1a468164816175ca2f808912f740d1f32bd386c73eb
-EBUILD psgml-1.50.ebuild 473 BLAKE2B 1814077148dddd5209fb9bf12dbba7d2c873625a03c508a4647bba132981ecb777bc244f7785a3ca4f815b9282fa80f5f753a119bc93106f52f66b319588d031 SHA512 1530e2d89bfeba6d919e10c124cbbc30e016bd6dbc5587d6d589fb219243ed3cea46968817bdf32792b0c7d724b82dd142cf92565b61f70fcc2c536b59e4cbe8
+EBUILD psgml-1.50.ebuild 469 BLAKE2B 7d7fe58a98853e78d89dcabcfb080aef0938ad70a0e70719b78d0b370c057597b88dd9d9a995fbf1924fd77dfcb075c7c7fde6d2e8f34b8841069b0b7bdd02ac SHA512 e2d1b8c9aa1f1943b27a571ae832c22136b590dd03438476b8623455f1d0cb3589289fd24da59bce793e91b4917252c7c0453fe3a217b51d417ebdb1a0ceae2e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/psgml/psgml-1.50.ebuild b/app-xemacs/psgml/psgml-1.50.ebuild
index a35003ab590a..75365178d064 100644
--- a/app-xemacs/psgml/psgml-1.50.ebuild
+++ b/app-xemacs/psgml/psgml-1.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,6 @@ app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 app-xemacs/ps-print
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/python-modes/Manifest b/app-xemacs/python-modes/Manifest
index 5814e8a3a84a..b226df4f72b7 100644
--- a/app-xemacs/python-modes/Manifest
+++ b/app-xemacs/python-modes/Manifest
@@ -3,5 +3,5 @@ DIST python-modes-1.14-pkg.tar.gz 97116 BLAKE2B 04f2121b03e45a01b1f7c727c4aa48fd
 DIST python-modes-1.16-pkg.tar.gz 97206 BLAKE2B 7390c84148dbd7280cb9472a960bfd720accf135fac0817c76373d9e66c76f3293b1552915fe81cc4f0cb7dfdce78cd958e7ed90a5e24c5e3f71388f2b4e9ec7 SHA512 f0faebd8c179138078f82ad7d8dce72547d890ab84111ddcbaa2270aa2464923e88feb898b9a9f0277432c62e98289390642edb635e6f8f692ee4000a8fab34a
 EBUILD python-modes-1.08.ebuild 347 BLAKE2B 3fe68ce644e1886986c91839ce575648bb1087582af60e8f5520557f9f6de21717431d8199d6a4ca6de08c1d1329e437c8d7108af0965367c7de726eae49c781 SHA512 b5bf404617837a7d3a6a72b973a26ba8a3a6d654a548921899bcfe893091d128be32200992205e0b8cfdea421249d2275810215f8b584a6245d70c85cc245622
 EBUILD python-modes-1.14.ebuild 369 BLAKE2B 61cf037f731310539e18025ab486f2a5aacb7165df14b181ef458790b52b5bf12a51a2ccf0ec19cd395b9a3319255cfa4cf387e142d515119dd58045fceba7cd SHA512 274e4f25096f013a062b88921db9f35d6291e7d77c95379d3ade04627610dd7210d64bcb7119db88f344888d310b31a5fb2c03662d84e3ab52446cc708bbe6ac
-EBUILD python-modes-1.16.ebuild 375 BLAKE2B 6f053edc90918744ff8a4b913583e1cbdc50334e6cc3cb29cc0aae5b7b34a5454766a90ab069a895fe4f9f761bcfc37d44c943d24bb12cb2cdb93d18ac0a2f76 SHA512 6b114f582247aca751bc89c2639d195aa77b67ad91128e7825905ec13d6fd40825f6631404d1c94f1b79234db53a6dfcabf2facc59b68c91b875e154a798e498
+EBUILD python-modes-1.16.ebuild 371 BLAKE2B acd1c60549b97cc85bd22ca23c446742b95f046186bf959b224145b98130c9f8da5cac8652246fe4337ac7a09b61ed228a7bc3b75c6edcb3364cc612b0f5d699 SHA512 59fabf195e82a815886e34605f6f194f214605283f0659365daa29968fd55ea88e41396f535e458706b6ae577ebdc5002bee0bd4be766538e970b7e6b755e809
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/python-modes/python-modes-1.16.ebuild b/app-xemacs/python-modes/python-modes-1.16.ebuild
index dd8c210a3c5f..318fcc766308 100644
--- a/app-xemacs/python-modes/python-modes-1.16.ebuild
+++ b/app-xemacs/python-modes/python-modes-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/edit-utils
 app-xemacs/fsf-compat
 app-xemacs/text-modes
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/re-builder/Manifest b/app-xemacs/re-builder/Manifest
index 7cbf0121b6cf..7afc357c3059 100644
--- a/app-xemacs/re-builder/Manifest
+++ b/app-xemacs/re-builder/Manifest
@@ -1,5 +1,5 @@
 DIST re-builder-1.05-pkg.tar.gz 20729 BLAKE2B bc4e7124bb08ba52662702bb29192a243c4ce48572b9530ddd5e5809aef7dfc47d8cc547b9aebe233425e1091371420bc1626f6c7a97f4b10e359862b61ecb0e SHA512 13c7dd7152089a21b4d3c1310df56c4cd16c5fda39766feb3eb1e33037245a466ad055d7f4b57b98b9bce484e9ae3325a346a0c5fd139114df7219a406d1d47b
 DIST re-builder-1.07-pkg.tar.gz 20781 BLAKE2B 08c9c9453811595b6dc531869fb41649dc096a54054e0ce516936438f05c64331a5b12a58d12ff7ef4a01cc99917674c32c02ca4f05510d83d0a28875a974ffe SHA512 0abd642f14c1433f122777c6e1b0939f55d3ef8b22baf3bef2d446f56067afc90aace0b09747ef5b667e39c31606b67b0f18b8490d659db64b3fd2ecbe501799
 EBUILD re-builder-1.05.ebuild 298 BLAKE2B da1bb15705616435ff5d1cbbad0548ed502c702ae6078428258d7cc54b181a801a350d273fd61e096dd1d946d5cf103e64536ed44ee3a28c2684d09091e7ed36 SHA512 c07a0c4cb4845bd5d8243d6ff1b1d9d48830fa4ac99c48260682e544dab4506f96dc6756e1a6abab05aa3d6530c0293ff0e69bf18d244b69be18419cef9b0b0c
-EBUILD re-builder-1.07.ebuild 304 BLAKE2B fd747776f29a9c5b09041a463090ba290e88d590e42e9138404c6a35f4b9d20a17b92d163c8e9c4d48049b7731c967bd6f25dec42f0b6e41a6063217fcff896c SHA512 6cb89b1c74a5e6870d7352fe0e8434fd41b2428712f2eb2e57edd0f14d8ebcdefa348c273fefe85b665e69a72463134e6fef765f383e17dedd5f8a6767ba8eec
+EBUILD re-builder-1.07.ebuild 300 BLAKE2B 4e8bbea9d3c66236390c113fc8d20a2a8fbf3bca67cdd017fced18ccf5b5f6e3de9e64869c2ed1da2ba6c5f16bb4fd3758de471a094817e7c6f95c41e5f7bcf1 SHA512 9384271101425ff28e7f6025a9eadddc583e5ccda0a4bc6b7fb9887885b3764a95b127b17681daf59b6d80f7c4e531624ea500dea2315a024674910ed1e87549
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/re-builder/re-builder-1.07.ebuild b/app-xemacs/re-builder/re-builder-1.07.ebuild
index 07ede7eb000e..77ff2871cf2b 100644
--- a/app-xemacs/re-builder/re-builder-1.07.ebuild
+++ b/app-xemacs/re-builder/re-builder-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,6 +8,6 @@ DESCRIPTION="Interactive development tool for regular expressions"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/reftex/Manifest b/app-xemacs/reftex/Manifest
index 34d61b456b59..a73f50fe08f8 100644
--- a/app-xemacs/reftex/Manifest
+++ b/app-xemacs/reftex/Manifest
@@ -1,5 +1,5 @@
 DIST reftex-1.34-pkg.tar.gz 352338 BLAKE2B 1f6b5afbed3b6c6de1637f8628724fc270132fd795a2d752a6e8d7c771501aabde48fbcabbc7a45ed89fb04eb1bb17b87f8478e34de0919d6a15f5b336de4ee3 SHA512 89e5b73b3dde0ae9271a9e9e5d6195f856ddf1a45db894d8b3796cdfe68bf278aa9a24bd5656f9158d629fe286082ee91b678c48a277394cd155bd7b3365b8ab
 DIST reftex-1.36-pkg.tar.gz 353645 BLAKE2B 8a5df96299474ff67663b6b0b5dccf693c192da5fce9be28244309c76557084d4166c09a0433ad8c63e1a7eeae0b86ad3e12a1354418abf45584d801ef584e42 SHA512 bf5ad1c89d2d0a7c171580668426e3a90f03354dbc297cd765bb4704b3ddbb3b2f5fdaf8349c616a95e3344997912e0dfafafc84c628831e96117e57393b0c69
 EBUILD reftex-1.34.ebuild 322 BLAKE2B 837a957989776f57de0e076b7dccf21e8cd09d8bc8f4d9b12cc26440748d3fcdf9c973400b5cbcb1e2766cc5408dc3165b49481f19836c83a8f02690373c2506 SHA512 04eeb8794a29ef8679d7b51cdb472feee5e5d4a6145e654a93dc3d70a2193a5cc1de17214be342636e62818a1b0a0f74df0ab23bdd6b02482857926eaef5c9ce
-EBUILD reftex-1.36.ebuild 328 BLAKE2B e6815a80c16103c2dfbe1d5344188656b8a5b6080c86e3240602e264e131809e4db11f6866c5980db111386a967d81dd38b02585e115bba69d1d137084df77e8 SHA512 9ffb1af3a3280a779d92e8c9070a814fc0404cf58a04f82441d4d7f44e6282518845b7c4189429a38ffdb9c3d81c0c7141cbd9f63725f01f5588cd5a82cc817f
+EBUILD reftex-1.36.ebuild 324 BLAKE2B 6ef72ef8f183cc98edd636867cc12f91b374d0f0e72f9f5e7057ab0b1afea64fbd032f1baa8e366d54eb0b11a0f66daac8e730f9ae6d416faaecd5811137e4c5 SHA512 3110769630933e9f47f2a66467d653fe8a73c419c4bb1beec0468adcc4901b39a8e8bb4c2b06f66f14958f40f16cc02cf511d9e06cf36b408c93efb8b4cee550
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/reftex/reftex-1.36.ebuild b/app-xemacs/reftex/reftex-1.36.ebuild
index 6ea9dcf2296f..fc4b9157e96e 100644
--- a/app-xemacs/reftex/reftex-1.36.ebuild
+++ b/app-xemacs/reftex/reftex-1.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/riece/Manifest b/app-xemacs/riece/Manifest
index c2ea937a0d23..5c2b2456a5b2 100644
--- a/app-xemacs/riece/Manifest
+++ b/app-xemacs/riece/Manifest
@@ -1,5 +1,5 @@
 DIST riece-1.23-pkg.tar.gz 221779 BLAKE2B 27ca4a644fd332c6c1e06ef4886c2f2fe744d50b4e15d701e35948c9e7682ce5e505ea92e32c8d5b8c71f521cb40a91b78f0044930c1e21e1e1f93769052e592 SHA512 ead33eb49e46b47b769dc8940774f1d9e3855e2ec91c9434a80c80da4ad7783e6c04f4c25ab5b71cfb1364f96c5eec03224758cee3b68ba16530d76b310c0b74
 DIST riece-1.26-pkg.tar.gz 221484 BLAKE2B ec568695ba9951212db742e2c25be26b7af44d0b11d000dd849e9b40abf63c47a44c1afeae6f9964f5080758261cbcc32b36be5c8efdfece7931ada1c0ca0fc3 SHA512 0e15ae4f941f25878c0875b31cfad9ac9221c82eb8c893101512ea0395bc177538602e8b475610f7738f81fb83ebdb9887a7a7caf1cb44943b499bef8df7b66a
 EBUILD riece-1.23.ebuild 325 BLAKE2B d9db7c46e0770b2ee4013cfcf4fcccf5aac72d97aebd1c2f1eabac37bbdd97bb6b0de44862950ceb06b12404b233d239283da984df2973f045b09f596e68c4da SHA512 0ca5fe759207c2d04747d44e84b86fd5a3785dfa72f77d082831ffeef933838fc8543f44fa6965b2f9f2b1df1827043bd84507039e853f14a45d34cf6c94ee5d
-EBUILD riece-1.26.ebuild 331 BLAKE2B 446aec94f85448872daaea858f9d9350f62c093aa18033cfbd14d71708b9303afc470a26bfaefb44925f6f42313614cc6a30e901e122eadbffd70aa99881e7fc SHA512 c10884968fe8779bbbfbba2bac522d8eb83fa7ca6f61e20d6dec79be2f79b606a8c537fe2fa811ab0095c22f9aedf055c6697ff4886a1833c7132173af934d0a
+EBUILD riece-1.26.ebuild 327 BLAKE2B 560cce42018c6f52b3af031dab66a940ecb4ced0c4d55656325097055eae2208cdcdc2832ee732e6c67b7dde8ca4d237fb7ee41046d2fc91e8e6d46bbff54e55 SHA512 71baa2b885ebe3331665b53d1146d70ccbe4f7d06955cb1691d1191e0fce38edfe73ae4650409ade75f725d8131fbb88b181655e139d4cc4968e64a603f7cd04
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/riece/riece-1.26.ebuild b/app-xemacs/riece/riece-1.26.ebuild
index f27196628b61..60ac432a8b45 100644
--- a/app-xemacs/riece/riece-1.26.ebuild
+++ b/app-xemacs/riece/riece-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 app-xemacs/bbdb
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/rmail/Manifest b/app-xemacs/rmail/Manifest
index 2f36c570c242..c52a545ea38b 100644
--- a/app-xemacs/rmail/Manifest
+++ b/app-xemacs/rmail/Manifest
@@ -1,5 +1,5 @@
 DIST rmail-1.14-pkg.tar.gz 96995 BLAKE2B 4d34d4a8ae5945232ce48405aed8c48d08a7db851a9505a53d4e2a699400a3bd95e405e86512522d64aabe1fd173ea0e2997a6f69df43c9c541bfd23605ba2e7 SHA512 a0e6c4279da4d70595c5bf1b90ee2047ccf181904f753f50211e2761fcb2d86a04267423e2076b276f5ea87fe5ab044c86c026c9e389cf38232518e288f60063
 DIST rmail-1.16-pkg.tar.gz 96986 BLAKE2B 3e7b56be235df5004d9b5b3f20b88894c75234d51cfdae2fcedbe499a306c75c176bc9832a833412590f50f7a6bf56cb1788efdf86ded3548da35d3ab9c204b3 SHA512 b06e1fa812c16d0dc7e54d89b115c14d6c96c31b9141a6f27c24dc3688f61ce76531844183d690224307de247326f95730e49d62de8a7f7b95d714ff0822545f
 EBUILD rmail-1.14.ebuild 343 BLAKE2B c4b4456de80ff3b18432e6e42b04a13c71fa86b92c8da5da2a013f1d5d14e7cb22912acb31378146b2bb1178ef73d7656a4d2669617c956403487e1de3bbddaf SHA512 aa0db8e997f57f1d501872e3adc502dc5e873674dc03546c67fcecd12a97a31932d9ea96bce359c5f3ca1edeaf6d6368a7827a63e391db7e871e73be437689a6
-EBUILD rmail-1.16.ebuild 349 BLAKE2B 1173e55fe5497cec12c8a3d8e45af7a14fe7954526735c3611809c19e618e506efc9cfecdab3749229936a5e5b5d66b8b2a61a7382e3688c39b934bb3494b091 SHA512 7e5f9b569d8a424105023e4f89c342042a15b7dddda3d265c371ad5ab56ce8fe15c6ec2318bb09176c73bfc378d6e14d029611fb26454ae322a3316f767a7eae
+EBUILD rmail-1.16.ebuild 345 BLAKE2B 7033fe7726d2b5f47a4affa86543331938dd67ba3c5ee4e65ca9233e312b88122a07a6d25afeac86f245903b92e36764c500c9c51dbb00abeb74f889c926a0e8 SHA512 13af258532c4b3bc87c410acca114e6c85e571af828915ed8609cf3247a01566687df03ff8358cbe5b015852ed01b8138d7764a1eb82684136b73007f3d6bfe7
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/rmail/rmail-1.16.ebuild b/app-xemacs/rmail/rmail-1.16.ebuild
index 14e2ccff6581..c2cb879afe53 100644
--- a/app-xemacs/rmail/rmail-1.16.ebuild
+++ b/app-xemacs/rmail/rmail-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/apel
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ruby-modes/Manifest b/app-xemacs/ruby-modes/Manifest
index 9a917d55d974..eb260f62fffa 100644
--- a/app-xemacs/ruby-modes/Manifest
+++ b/app-xemacs/ruby-modes/Manifest
@@ -3,5 +3,5 @@ DIST ruby-modes-1.04-pkg.tar.gz 31720 BLAKE2B 914d61671d48f5ba32269dc1ac68a3888c
 DIST ruby-modes-1.07-pkg.tar.gz 31834 BLAKE2B 9b6fe228b9dcc88391fb88a55a60b8f5134f027d92f7e7c686dc5200b4d1d7188461f2cb5b90bd1f0839c7c3e6d1a0086a1b526e32c9ea54c97d1421ef318d43 SHA512 a6bc6481e2730396d898d3facb5ad65b3a859e66125242352c0a81621429b073c225d8b5e88a5e9e9b5f777afe567f247dae396aeac49663d86d70e4e7181bdc
 EBUILD ruby-modes-1.02.ebuild 303 BLAKE2B cc14942542aa0853b9e82e61ae9c7c8d9daaed20528f446ed7d66bde7ad4730abdbe675a0f360fa838f21c7c1206e7c406bc7063b0a15dd3a1a2e87555127877 SHA512 8543c9a085d4a41282ad84a1f27b8025ba0f04d6f5f9b3e8bbfcb62d18899d49f1a5b62df4f3c9b61106f3419cd6cca9a00015dd467595d5b44e75069421f8a0
 EBUILD ruby-modes-1.04.ebuild 322 BLAKE2B 4f0de3607b3d98789cf2b2c78a3669b03de1e2adb06c7756868f0757fe470175d1d3337c85e03e1bbe510e4c18088f49ebc65d2a80c8bf4a2d9c4dca612ade96 SHA512 1f572d9f257061d519bc87e2808c00ac2dd8daedc399c0f6b7454d17337b4bd747d9d15e27cc33a5a97b154f0cf9d6b0a4d0bad8b2935204f2558e81cb20b821
-EBUILD ruby-modes-1.07.ebuild 329 BLAKE2B af3f9780f791b4a5ee4290a3ec54cd2edd2aa7b83f42a88a5f474c423bd396de087bacba120eeb517f470679865f30a1e8972dfd253a77c4f65dcede84dee390 SHA512 4c32d908e8547dedffc5742af8a47cd18b0a81e4d8a588f3046778187eae1eaaf737f046a1d1687a46480f0e7548ccc7cd508b790d35653066a22c6c1529684b
+EBUILD ruby-modes-1.07.ebuild 325 BLAKE2B 4c450b7220cde0acfda6b503f3424c116dabfed68845909e7f53eca39fb526157cd2b568ff42d41b615bbbcb9c35abf8bd4c017264910df9c6081f396c766d48 SHA512 281a65936cef81aa2ba918e26a48b49778407e87e920502b114a6d1ae6c11e4901f9073ac051b9e055f7eecd3e6812c0a610609e1f8476eba56c04f8f6b6d65c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
index 95dab066c373..3be8fab5d4c7 100644
--- a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
+++ b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/debug
 "
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sasl/Manifest b/app-xemacs/sasl/Manifest
index eaf7ffcfe9fc..36aa4dcfbab5 100644
--- a/app-xemacs/sasl/Manifest
+++ b/app-xemacs/sasl/Manifest
@@ -1,5 +1,5 @@
 DIST sasl-1.16-pkg.tar.gz 27864 BLAKE2B 0db7238e14ed56beec938885d881375a7e8635bfd369cee52db9daa70e27401237ee313b841f6898732121beaa4bd445945468175f94dfc17efbe7a1f391fff2 SHA512 dcc0a8c14b1f7f687f7abe9409f69c9501f0f8b5ae89d12bcfe9193922c196635e01bf5a0efd7af148e89daaee5a341d84e1d3f597f4904b1e7e3bad4b8e16df
 DIST sasl-1.18-pkg.tar.gz 27944 BLAKE2B d724598af6a93d9fc33f6eb2d0daea293e27ab12850c1f87c3450f51fb6f7f20fe68e390ffb49feb14e7254fb4c9aabf3af6e1f7ed2cac055f31c98734a0b3ac SHA512 cbfcbf123ed1b6da27d23a0a0caadf0d085168ac6d33529f4bbcffe9ca319e8d8021b528368eeed1c905bb7d6a93bca5506a3e004ef185f7c341f6bcd1e1cec0
 EBUILD sasl-1.16.ebuild 320 BLAKE2B 60e2b0a255792042ccc9af2ed696885c0fe72c0073656bf1bc187f2bdf8e21f7b0d73352850061b927f74393f6c942c68a5563aa1204b9afe247ca5c57354f7f SHA512 4c9d6e9b15802298e380f877bf74bcd905e404c2c3fd37518feff7d21778f2fed5e3b0cb246f3f0106c90d22d45a74c6498b00b18b5449beebed7903d50004eb
-EBUILD sasl-1.18.ebuild 326 BLAKE2B 60220fa79a65cc4510425c448b608f88ce74300d76c0954124721a8394017fa631ce2ecb6cb879729e309b99c2106622741525c89f5ee769562e81e8ff64eb2c SHA512 a68a8248db15d7708114f2bc0a21218a4d7f61f058aeb32dc0d14999edf8a85192b7e6214ae048d1bec9b87ba3079839c52b098ff6908092f41f50b00a30c40e
+EBUILD sasl-1.18.ebuild 322 BLAKE2B dd38ad8ec4ac175b1f137bcaccbb9cc59160c2e0e81bfefb471e007de7eefc05f13bcadab2b6b44d12228ab4bb633960401b57984c46e94ff33a0784ce501454 SHA512 bf8f112f4d59aa08bf12c10163dddfa506855d88375a311eb0274bc94f9364ff73d507172c59808c9b6b4b667cb832c740b8774444b1b5caf237bc64ac85cbc1
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sasl/sasl-1.18.ebuild b/app-xemacs/sasl/sasl-1.18.ebuild
index 403483735208..2b87de2a4434 100644
--- a/app-xemacs/sasl/sasl-1.18.ebuild
+++ b/app-xemacs/sasl/sasl-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/ecrypto
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/scheme/Manifest b/app-xemacs/scheme/Manifest
index ecbbe9031222..71d12850d799 100644
--- a/app-xemacs/scheme/Manifest
+++ b/app-xemacs/scheme/Manifest
@@ -3,5 +3,5 @@ DIST scheme-1.18-pkg.tar.gz 38398 BLAKE2B ae9846c8c60d644560644535e9a3570e86db0e
 DIST scheme-1.22-pkg.tar.gz 38550 BLAKE2B 243c74fda930330bb6385a346496bd94cbd8a09ba968bbbf94b9c4355d9924e10e5b708c4cc03056714a3e52c0317ddafa83d55aecefd64b47b07ef2bda9d8ee SHA512 f74d7c405047f86125b042a2054ec5522cec9c1bd6f9686e984d3eef674afdb9971400932c0794323a59eedb51a6d5f81839bed6ce37e7ae5b14d149de6233eb
 EBUILD scheme-1.15.ebuild 306 BLAKE2B 937237c94e1a76ebaeb7c6fc604fd87fe0b782da88882dc1dad483389f86a104c32c367a737d45eeaf2dc3a47b5b3bf010bb3f0cca0967b2a35717898eca9df7 SHA512 6713c036d2e8ed929044ae8b2aabdec8cf4145915299c09c2a9881cbdeacf4a8f0c1c8e4d4c255660699eb94713696f11678dd369d71081816ae2bdfa8389096
 EBUILD scheme-1.18.ebuild 306 BLAKE2B 937237c94e1a76ebaeb7c6fc604fd87fe0b782da88882dc1dad483389f86a104c32c367a737d45eeaf2dc3a47b5b3bf010bb3f0cca0967b2a35717898eca9df7 SHA512 6713c036d2e8ed929044ae8b2aabdec8cf4145915299c09c2a9881cbdeacf4a8f0c1c8e4d4c255660699eb94713696f11678dd369d71081816ae2bdfa8389096
-EBUILD scheme-1.22.ebuild 312 BLAKE2B 619a47e1adea72279c126a86c474bdf2811eea56295e11d1f4ffea0e1826d17f4fed3b4684cfb4c8441202d1500a9ef41b61f61f5c92735940785a214dfd5f49 SHA512 d2fd10028e3509183e158572dfea259eaae432e680044614e39dd802c25221747b4782f7d8f94123339313529473ac9f99023f41ae652b8e701be4840a359244
+EBUILD scheme-1.22.ebuild 308 BLAKE2B eb42e98d77b0a1b601828f78b95084e3b2c8fba0e92dbe623a4f46a0b7d53f51ffa141ce2d72885c318cb71c1cfb99b97231c4dbf34103ecf668b90d0cb14fec SHA512 be52146276e0e14400603ef9ef67bac4f7407feb9698133862413f0af031e257cc4a236759b36c332647b0f19e636ce387b189f0cfb258b341c98da2de483e26
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/scheme/scheme-1.22.ebuild b/app-xemacs/scheme/scheme-1.22.ebuild
index 5e0e7367eb47..97eebf0d4205 100644
--- a/app-xemacs/scheme/scheme-1.22.ebuild
+++ b/app-xemacs/scheme/scheme-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/semantic/Manifest b/app-xemacs/semantic/Manifest
index ccfd5679643b..9c1bca23f975 100644
--- a/app-xemacs/semantic/Manifest
+++ b/app-xemacs/semantic/Manifest
@@ -3,5 +3,5 @@ DIST semantic-1.21-pkg.tar.gz 1367279 BLAKE2B c4c4d0fc81039455e511ccf9b8439cafc4
 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
+EBUILD semantic-1.23.ebuild 545 BLAKE2B d1d10bdb1c8a56351f69064d18c70942ae44ab229042816845744463a75fcef7eb5af468693849dcb1170f44aec5d428a978e4ce2ddccf329a83b02a56d56111 SHA512 e1f397bc86b55cdc4b5c4cef5229fc392e3509a90664e3b8b7d9ad839a8babf57dd8bb35918cfc3344f63b45ac39c3d2e5de8f9ffcc2b873d580364a5dcb44e1
 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
index cef930a573cc..fde1045ef79e 100644
--- a/app-xemacs/semantic/semantic-1.23.ebuild
+++ b/app-xemacs/semantic/semantic-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,6 +20,6 @@ app-xemacs/cc-mode
 app-xemacs/edebug
 app-xemacs/sgml
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sgml/Manifest b/app-xemacs/sgml/Manifest
index 922be62d3fa2..9b39b15e8115 100644
--- a/app-xemacs/sgml/Manifest
+++ b/app-xemacs/sgml/Manifest
@@ -1,5 +1,5 @@
 DIST sgml-1.11-pkg.tar.gz 27506 BLAKE2B e12c4efdbdc8d66fe381bcd650462bb0b07bc9b13a7a9fa7ee51a9b850b904b737788a888ca0f4c91265e1be83d6343143c3fc97b8aaa1bccf5cd78c0e3ab0b5 SHA512 cd3e8d8694e77aad00d60f9331e60769cd6308715c698ed9d260b6d31838ba1f2e76fa0d90b430dad010b886576f8263d8223ca73ffda7d3654adcbc0d15b7d6
 DIST sgml-1.13-pkg.tar.gz 27499 BLAKE2B 7fab47838b14899e4c018a929d87f1b29abd0b155432c8484689ffb5d2fe4b61a6333364d19a4195daa39be43acc4a56362cb9ebdb8e4811237b834e37c2321d SHA512 5b33ac176bc39b181b8bcdc10d1d165ba239bc3535f461e08cfd56b44c782ad8d56f882903a2e9e0ef76544371992b95ceba654846535cdb85c1361a84333ab5
 EBUILD sgml-1.11.ebuild 295 BLAKE2B 3336901ea6db34402ad0f1ab6174dcf70d8e7a3090726331ed635d05075ff7f44fa0877a4503a477e8369c63cf1133706a627d32c2a1e6f203298b42ae42daba SHA512 8ed65cef663a3e4e95e5ee221cac87e14d4249e703c3fe27f1f5335002a67f5ef7a8001e53536f4102529dee6a2014c4aa67b24200eb0e8bb788f36d2fd38b1d
-EBUILD sgml-1.13.ebuild 301 BLAKE2B 2510ad071b403ae63d642e7a63c384b5432e67fc9bb0e654d632363ebf33e5f9d21c8a1086723300d35e396278601f03674d025ea118a1b2c4bf7cd27cd65f06 SHA512 2c9349c69505fef021bb6cf3b812e1bb2a7899ef578b0548c3fc46431bfe3eae9900f6810c5bb596dadaf937d0b8d7b8f13c9c7d1dd0612334e8c0dae7843573
+EBUILD sgml-1.13.ebuild 297 BLAKE2B 45003fd0d66a38b588fcf7273c715a0e2da5eacb8e20d9d40716537fc1a5c9be3dfd98230cb3427f48eb56332bbb86491d661ba7501e59a5ac53df9bee60e09a SHA512 bd0e32f1e2bd2568c5375bea17785cfe70fc05f6edfeaa0ce4ba8db5021c941ed9600c83c4da650d67b896f27763860fa1a82cebc5246111fc6c37d86f9723e4
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sgml/sgml-1.13.ebuild b/app-xemacs/sgml/sgml-1.13.ebuild
index 4ed3e46f494d..305aedf6c858 100644
--- a/app-xemacs/sgml/sgml-1.13.ebuild
+++ b/app-xemacs/sgml/sgml-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sh-script/Manifest b/app-xemacs/sh-script/Manifest
index f596ad36da0a..e03f302465a3 100644
--- a/app-xemacs/sh-script/Manifest
+++ b/app-xemacs/sh-script/Manifest
@@ -3,5 +3,5 @@ DIST sh-script-1.24-pkg.tar.gz 70667 BLAKE2B aa1290823da1d23a1eea030ae68fa5d1458
 DIST sh-script-1.26-pkg.tar.gz 70687 BLAKE2B 59c9f37a7e90cddc5968aea984348e8cfa366f51b59d5ba23be27d5f5b37bc02d9da879b011619cd8595613d1f5a760b9b325570ec95c45c5122aa9c622b1d34 SHA512 fed9b6796cb22838e40d400b8f21ce275540c8e9ae7b779b8cd214a2f16887fb6fe9bea985898fd4e8d0410d60dd20796690dca5d0a0cc019a26f757517711d8
 EBUILD sh-script-1.22.ebuild 302 BLAKE2B 3ca1b4fda2b78792a2e792dedffa954c365ce59c3bd87ca6ba432bd58271eca8b8452c59beffb37f874c5bf16772a9c397c9f5493191fda99a275a0629190544 SHA512 67921ac348d705374c0333bd40e7e3bbd0e335dd6794756283dd9f2ede1b86098d06b1c50fcf484435a3353c396debbd4c528581e366750d83f7ef6f42d7a4d9
 EBUILD sh-script-1.24.ebuild 307 BLAKE2B 5dc98cf4cbc2929080098fdbfaba1b863696273d39b3e847ad41cf42553537f93ff785a877e8d6b837d65c6a5e724e33a19a958a55bf0250693d6bda55151de8 SHA512 6b2470c568159de4c31824810917ad6f3fefffbf2d865528b8fe27269cb063b67d4e57b30351294272bd68fbaabc42a0f0ff797cc72b0f50184658a088ab1f3a
-EBUILD sh-script-1.26.ebuild 314 BLAKE2B 9f329ebbdbe5af8c9a7c43abd441ed811e02a6c796589853c02ec5f988703b7cee7b6e23b82f6a7154820e289f8412bf05f175862e31c193d4adefab5bd5ad85 SHA512 f74749c8a4bc873cb8005eba1ae4fa163df4a07b9d6fee3c88fee448d5c27be1c5106cfee08287eb2c0d0e3e084dd7900e8075a9f620d5f9f4b7a1884cf6eafe
+EBUILD sh-script-1.26.ebuild 310 BLAKE2B 759a12fe8d6562f7f2177012a58edd0e9143c4f4e7b550dbb2b40d23964e4b6897f7d473b5a640d58de0c7cc8e5c90a4a99554c01a07db57e1781a8bd8584d11 SHA512 cfad9b948cfb05af7da74f76c79f5ad2b084891ed16185bdb6806675022a7d60ef1ccf0f22c06f55cfaa5ab539894fbdac69752b9b4cdd4e993df835e968c44e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sh-script/sh-script-1.26.ebuild b/app-xemacs/sh-script/sh-script-1.26.ebuild
index c5ad020627e0..abca1f4be92e 100644
--- a/app-xemacs/sh-script/sh-script-1.26.ebuild
+++ b/app-xemacs/sh-script/sh-script-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sieve/Manifest b/app-xemacs/sieve/Manifest
index d11c859ba18f..b8df726f738c 100644
--- a/app-xemacs/sieve/Manifest
+++ b/app-xemacs/sieve/Manifest
@@ -1,5 +1,5 @@
 DIST sieve-1.18-pkg.tar.gz 27387 BLAKE2B f619083c07840e0386a47708f79ce1e1bb0f3693b3e675b6945b0cd5cf63ae3c1bddd974e10607f4ddaaf1954b69c26ff29eb4f4d5f294b9bf81907fe236fc1e SHA512 cd870e7cc302524818ffb081422d5009e046da11b4228baecf43b0b872719f223ecd3ddc9fcaf86f474620cbeb0d6d672a505c1a7151772e07149369102a3a13
 DIST sieve-1.20-pkg.tar.gz 27640 BLAKE2B 7cd851e6b8fcd86bda0fa435c32946ffa667eb7ae5a27cb16df6f619a6990cc10578e90b950bd4586fa0281ce1b6ec9396fd55c4ea8beaea08fa9c2d355914da SHA512 14d2fdd89b58a53ecdf99487d5acd0b18d5d0505c3c07ce24054c636aa52a2b868fe20bb77dcd613b32634025c9eccb220716f2ba10ed95fa460e53bc74c95a7
 EBUILD sieve-1.18.ebuild 400 BLAKE2B 806587a682c9daf2215a36b54790fcaf9be98208ba62afca30fa9a61d7a2a619ae1c21c9285f678d6d9612b0176a1fc4a4a1c7a00bae1ac9f3b539a3ede07c7e SHA512 a58efe0f829430abc9489471296d0bc7a49f05d5a892d9c9ba803645cdcd8eaa7ad33b2c952536daeff4e5dfaf0167f9e8e6861b103d48e1007d5aef432d9cf4
-EBUILD sieve-1.20.ebuild 406 BLAKE2B 20af3c1ace813a478ff76b85a59f86eaedb5e6d7ba01a01bc77b6c8556bcfab66fdf3465cf52d6904da7aea506308706433ebef798b705a652d4404690c02413 SHA512 f80de9a92f317e67b2467b2ed99874820de54e980c6f1fd0b89ebce006ea8a1b0f31082f79eeb01eb4207d122fb7499f4d0fcb4dd6bf1896ffc54a917fe1917a
+EBUILD sieve-1.20.ebuild 402 BLAKE2B 61f71380fa47b9b20e39e187eb4aae3161aa01a3ea2a98f4ddf9dd8fcbb7e42d455333640ad47e7e0463a2aa9b212f01dd5914465242e555ee0e7842e66ec070 SHA512 34408a6279a7c0bfd7a3ca1788a1f4342ada8b698b0d655b9dd578e28c8497c9c4490b0db11e70e1a83a94b469608971985725c76e03e901f39e1dbcfdd3af24
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sieve/sieve-1.20.ebuild b/app-xemacs/sieve/sieve-1.20.ebuild
index e13154a9eed7..f69cb1930090 100644
--- a/app-xemacs/sieve/sieve-1.20.ebuild
+++ b/app-xemacs/sieve/sieve-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,6 @@ app-xemacs/sasl
 app-xemacs/ecrypto
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/skk/Manifest b/app-xemacs/skk/Manifest
index d376d2b396d8..443097bb667d 100644
--- a/app-xemacs/skk/Manifest
+++ b/app-xemacs/skk/Manifest
@@ -3,5 +3,5 @@ DIST skk-1.24-pkg.tar.gz 1464019 BLAKE2B 28dcaa38a64f4d795494e0e5e37c94125a05bb7
 DIST skk-1.27-pkg.tar.gz 1506880 BLAKE2B c7b7fae367bb787f20d0c18769a8dfd26de6f74e7c93a9dc58e81c3fb16a6df30569204d30944718ce0262d91a59441a61592aed24a4bf8f2946ace6ff64154b SHA512 d8effc3e2b3c2c277c8388c3813379a0826eb7993287889f0ddab3b9edf08b415ca209ee2da3b948a3b803a0be0d12e46801978faf9dbd7f07edff9bddd84280
 EBUILD skk-1.23.ebuild 370 BLAKE2B 63e99b4755a3cc4235ceec41b43b960ebfc10e4c7c8e6d1948ea4d69c565788c29f0a65ae2a2fa06680930325d17ff4126d4a42d6ed0790807c68ba65ff913da SHA512 aefa13013d6237d48716cc4f37ff8686c07896030ba65d668e296d5babc52f019c4ec2c288274b6bae21605224fb4279cc6b4dec540e992a3dba60cc1721707a
 EBUILD skk-1.24.ebuild 371 BLAKE2B e26ffc0df314cda2249a6d72ab70c6d9ca0e9d726adba73d7dc07942206ab14672672ac16afd94e964a08b90e8d2b07074c7b3fadcd63492cb95874ec5200f7b SHA512 ea4ad2e797b4f998be8ef918aef72b80a9f9de0e9c98320cb4c80437c4bc909d1836f62a93ab45d158af5e337ba4ab90b72c07d008c998ea0126c3bff6c6b21d
-EBUILD skk-1.27.ebuild 377 BLAKE2B 1314e6b6924a7c1d5bb0a6fc21dc7aa9f856960340c3228352aff8f2dbe7b777097bf134d7b377f96e6dff350c9e7a5722a68d9332f8994bcf8818984fc8ff63 SHA512 4a36a1190bb6b03d59b02e744624d3bd6627a501b9b8897f6b70e2823b52ec9f3c2612552b85f565848168b653732de31bf166e4ca050ab6d132aa23861fde9e
+EBUILD skk-1.27.ebuild 373 BLAKE2B 0182b733bc65bde6c5acc2bebbc17f57f5262f17dfcc42c4da302cb908722a428b073434f50532e5f6882b23cc6e55c03d7c145e9da4aabdcc319ec0c508b59d SHA512 fbcd127cb51ab43fbfa4cf353b0ff78a35be0ddccf941d49df774d2f09490700dbb47bcb3854dade3358b88c976d1a9ca07a1e8aa1a3de565926220f6b2bde5a
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/skk/skk-1.27.ebuild b/app-xemacs/skk/skk-1.27.ebuild
index 1be0d6002d56..7fc9e54bfbff 100644
--- a/app-xemacs/skk/skk-1.27.ebuild
+++ b/app-xemacs/skk/skk-1.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ app-xemacs/elib
 app-xemacs/xemacs-base
 app-xemacs/apel
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/slider/Manifest b/app-xemacs/slider/Manifest
index b6433b9c40b8..0d33e0db1690 100644
--- a/app-xemacs/slider/Manifest
+++ b/app-xemacs/slider/Manifest
@@ -3,5 +3,5 @@ DIST slider-1.16-pkg.tar.gz 12857 BLAKE2B 6713ee639d6ebb6d21de13b59a34cf651543f3
 DIST slider-1.18-pkg.tar.gz 12903 BLAKE2B da1a3935f4265d0f14c8554729f853c2a542b929f2f95e69b2833c0c8e10fcae05c28b699e5da32169cfe0f60cfdb9d0baf9c9dbf9676a9f47b55d1256b7f783 SHA512 966bfe8104d9f1f697319e04b9716a263e8476afb884941af2f50198a734057121cec8ccaf11227d7bffc3b7025db32208387d0a2fcda4b4fed36bf4a6dc0990
 EBUILD slider-1.15.ebuild 254 BLAKE2B 9ba61d026d196eb152ff34e078458382b8dd2893e8caacda42b2c6595caa347137493ac0c128d59cce66e2d89f5fadcc75631ac23762791c0791c7609688f3f0 SHA512 b1fe14a11e8d05c5c43f240c069eccdab2f024e949c1439ff27d02386f3b845913003f2fae18f29f5212c0e9b98365822efacfed8cd106d52b2eef796d6fa800
 EBUILD slider-1.16.ebuild 254 BLAKE2B 9ba61d026d196eb152ff34e078458382b8dd2893e8caacda42b2c6595caa347137493ac0c128d59cce66e2d89f5fadcc75631ac23762791c0791c7609688f3f0 SHA512 b1fe14a11e8d05c5c43f240c069eccdab2f024e949c1439ff27d02386f3b845913003f2fae18f29f5212c0e9b98365822efacfed8cd106d52b2eef796d6fa800
-EBUILD slider-1.18.ebuild 260 BLAKE2B 71d9ea71461a61c3ff5796d4629245854af14ddf171c5d3d8228b13028b313650a4539e7ce8678102dfa884c040c2bed507edf988d993237fda166f0b74ac694 SHA512 f7ace5413ee960981f0ba9c51755edee36b023909b15e50d4c76ecdbbe3d64cfbfb1ccbf76f3ba1ae7af85772a4aa362e587a0f5a01bc813a7e680f0747cbef6
+EBUILD slider-1.18.ebuild 256 BLAKE2B 418b709c3cdc58dfc9efc9a6ad600fb189e00b1048db660295aa9b61737cbe0c940c971957f7e2d2cc49fe172fd88b0cb683cd5fdb8571dbd549d71d8d657d81 SHA512 0fef0c40cfc1fcc039fb9696fa815eb53e777a99a7ee7b2eb7aa6c1723ba1bcbbf2c8dc3c40c76b5ba9f6eddff1b4a64854744eaaf41cd4ce168c0922335bf9b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/slider/slider-1.18.ebuild b/app-xemacs/slider/slider-1.18.ebuild
index f79d26fd9a9d..a7cd5fbb393c 100644
--- a/app-xemacs/slider/slider-1.18.ebuild
+++ b/app-xemacs/slider/slider-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="User interface tool"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sml-mode/Manifest b/app-xemacs/sml-mode/Manifest
index 85f1995f8f9c..8440ad113efd 100644
--- a/app-xemacs/sml-mode/Manifest
+++ b/app-xemacs/sml-mode/Manifest
@@ -1,5 +1,5 @@
 DIST sml-mode-0.12-pkg.tar.gz 82366 BLAKE2B 61ebbe1dc2b075a65dbe6f6d852dbbd698017414c741b9a551afe3b80f3c8d6dafa96793dcdfa22a76a89f6fdf982acf8daff9d3c033cdd0542f3f92f941ce93 SHA512 7c059c485577516a13d4b58c594fc78eaea1779714d6cdf98a1ef57edd9b1e0442e854b421a8d9e9fa32cd2d8a060cc02b7e4743d3494a1f7271ac06fb092a9f
 DIST sml-mode-0.14-pkg.tar.gz 82549 BLAKE2B 79fbda68892b492c5d6839e0a380f5359776497eea32b99a9c77e663c6a0126dd3374f196fab712707b07f9ee7e36dd294343e273e08688b2ff655bdf876930f SHA512 fa15d961f67a71f545f0a417ecb67a12a518f89fd296cb8af7982e46fbc56dab0e352ea045d946ef477ccb0956845b4cebc09794a103c66b48c162355fe66961
 EBUILD sml-mode-0.12.ebuild 328 BLAKE2B d32c2512182ff911bc454d85ffd6d429628dcc6e05e8f5b28f9f147a4b43235c6a5ab32ce713a63b19b9ddc2ba167533acff4877c27eb041a8498e482fddcbc7 SHA512 1b09f2028d37b3d8f56b6768634d3c98ab781a561b3fd187e741a8ae4fc4d7effbd5e78390d236a8ee027995ad6a6314d2b58c536e8d2e104c9f2024ca1993a1
-EBUILD sml-mode-0.14.ebuild 334 BLAKE2B d709908a2769fa2412e7b76cfc852c137f750bd7c718e9ae253d346362b124c95b65101077797072f601d049507bbb69f067bc70d4f9fd6616e7a7cee9eb3d52 SHA512 f9067b84860a92bf8967c09c164749e4ce31c148a975186b0d40cc4bf68eb39c01f1198d5a92ea3ec7d7f6319e0739bbed7feb62aea1af3c754fcd5ed08e37fe
+EBUILD sml-mode-0.14.ebuild 330 BLAKE2B 8ccdbbe2fc104c58774d73b1073b8d6f8e8f8bcb1bb89f785faa9adf456bd0d4a2b018bf26ef7b413593e4b95090297be4663ed75dba8bc03bbdfc20453b62c8 SHA512 935af3da3a00f4b74975f5ec25361af35afc067f72c7967e1e539358785689f1653b898d8b3d9a0fff73effcd271070085b62dbee4e14df52927c3632530a2ee
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sml-mode/sml-mode-0.14.ebuild b/app-xemacs/sml-mode/sml-mode-0.14.ebuild
index 88755b7da1e7..62f9ba3c48db 100644
--- a/app-xemacs/sml-mode/sml-mode-0.14.ebuild
+++ b/app-xemacs/sml-mode/sml-mode-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sounds-au/Manifest b/app-xemacs/sounds-au/Manifest
index f3fb725a98b6..603c4370c602 100644
--- a/app-xemacs/sounds-au/Manifest
+++ b/app-xemacs/sounds-au/Manifest
@@ -1,5 +1,5 @@
 DIST sounds-au-1.12-pkg.tar.gz 126817 BLAKE2B d7942cb4d249ab8e147658bdccec4a837ee7834576d10fd71f7c070e3c4b23bc2df6233d707607e91172ebed3c4fd09f3aa1dccf25841ae106306764303892bf SHA512 fd7022f1a7c23b041416cb1c0eb0532fdc5dd492b37c4e1438d9d1f24ebbc7544488bcafd1eecb36b9183bdbe7494b5fe0ad6bf8b2762a573094675d80c5b5ae
 DIST sounds-au-1.14-pkg.tar.gz 126825 BLAKE2B 5834bb6d029961cfbcaa55aeffae3dd85b92c0668000a3f783ac58f3048a19f607b08a7f8e6aff6be0db3d22c78dcf34dbc401644782104add7a8a1fd23275df SHA512 ba4208f0f0d5e4b4237b8e1fcac22d53c634717ec84205345294aa5b0e51939445da39167e9edd6af365becef6164488501d679d89b858bdca4816845543730b
 EBUILD sounds-au-1.12.ebuild 268 BLAKE2B e2a19d6b3b1c219ece8e8bd7c8acbf012a58fe97be26287484cbb44269fdc27764dbe10c5545a847298b7112f928ea613357d9036cad8141ae56f1c60f634d42 SHA512 ca12bd90c7b5eccef24fa8f79e523de64f41abdf593cfa62a24288bfbf56d6365a54b7a3490b697469f32c426a457e32e7598493f4827554e34f0a6bec2784ce
-EBUILD sounds-au-1.14.ebuild 274 BLAKE2B de4660f69a3af681f5b566621ed194a59ed0125bb09b7982336161e338c3e5e2593ffd740a93bd0188dee208da72a62cb19e8ce1ef598246c77bef95c4b853b8 SHA512 7c51ea91ef85e4ee52a78cac0c715dc1889ee17d2f8ddd91ac13b0c23637222eb1d7c717f58f2abe977ab4de591b0a7a3c026f179424ebfaf70b8cc16338d85b
+EBUILD sounds-au-1.14.ebuild 270 BLAKE2B 1ce2e52bc4e73ea3bb2afae34f5f681f3d1954f95a7a4d0c7b575e1da146ac6fc2c5a2b1d08dc487acdee678460ebb59d620ac88db8c26bb397121070d89275e SHA512 3eb567a32b94618df0c606c7a676ff932611d3640277fc2836dfce1c7de58e399112832385b0a5680580bba6565d8b0a98b321aae01b3d7bfa5a8da3c7d16451
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sounds-au/sounds-au-1.14.ebuild b/app-xemacs/sounds-au/sounds-au-1.14.ebuild
index 4012c3a6fa6a..037eceab1b49 100644
--- a/app-xemacs/sounds-au/sounds-au-1.14.ebuild
+++ b/app-xemacs/sounds-au/sounds-au-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,6 +8,6 @@ DESCRIPTION="XEmacs Sun sound files"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sounds-wav/Manifest b/app-xemacs/sounds-wav/Manifest
index d685da327fc6..21bd8132ce33 100644
--- a/app-xemacs/sounds-wav/Manifest
+++ b/app-xemacs/sounds-wav/Manifest
@@ -1,5 +1,5 @@
 DIST sounds-wav-1.12-pkg.tar.gz 149624 BLAKE2B 3ee397582fba2258d32351875aff4747ca799468c39d3c47411970feed6d0f352c2b572869e7cbcb456eec153036825061c0fae40c916bc0dfb79f06ee57813d SHA512 28a996d2339de6a69efdb95b42e6ca407a6fb53f1fc4af5ba8ef6a95ce7210e804d52c6e4ef85c3383324ff1125620ce45156a0c3581091836c9e21852cc5f95
 DIST sounds-wav-1.14-pkg.tar.gz 149635 BLAKE2B 7d7430b8db6a9ca42e2906d7a83b4f4b2f2cc59dd92bce8e9689dc07d5353fb629f1da038ebe2e9661c7849cb53514dd879959da415d9c26d1467fa3ca6fe6df SHA512 cb44e4e1e1ec3e9afabae575d31e53ff03eba7d6fe00e8ae5bf17841861da1c9810106a4efd414ad4e2a55d99338a82b807f7d8fb5ee8946c7b2f81d903d8aa7
 EBUILD sounds-wav-1.12.ebuild 263 BLAKE2B 67222c096b92658dcc2a63cfbaac0045d0740ac5fb095c13d2ef245d69134ba2f90fcabee68abbb74efdeed23fb272d37e4a55112c10aaee5871ece794284b14 SHA512 526448d98906c0a44e0a289503c603cb0ec61dff94124ef4d9c84ed10cd3a9fa1f391b2fdd90a8421dff695b0b325c53ec80f1ceb4292a3ebfe239fd7cce3ea7
-EBUILD sounds-wav-1.14.ebuild 269 BLAKE2B 4ec8f511dd14d842e27b6af7a09f5d9132808087ecb56094d380b7012340e11f78a1a56dc6c8eb0e6491b3bd2084810772af8c20e777d75938385d8f110ceabf SHA512 efa13298ecadb0df4e482a58e92b51907618e55ce329059c557131150f7cd61907c7dfb90f5f325897383878c593ec9acbd0af469463de8eef7c5e601aa836f0
+EBUILD sounds-wav-1.14.ebuild 265 BLAKE2B a58739c486483659914bda13830bdc3c6ca371b8368b49d2349c510ea674b49219ccef89827fe5d764fba475e7d7d93af7986e59fe1b0830fd422eb45f3c42c5 SHA512 b4d05689f5444ac0780de462035e17be4e1e678846f8552992bb2463d9bee8f1cc87db9ac1132b2ccda78d79434c68fe33e2f5baf5894468449b118f4f0df5b2
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
index b55e9ccbf482..67f920628e57 100644
--- a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
+++ b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="XEmacs Microsoft sound files"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/speedbar/Manifest b/app-xemacs/speedbar/Manifest
index 9a28c1767caa..40dec8b9f965 100644
--- a/app-xemacs/speedbar/Manifest
+++ b/app-xemacs/speedbar/Manifest
@@ -3,5 +3,5 @@ DIST speedbar-1.29-pkg.tar.gz 153300 BLAKE2B 33b1674d9ad53b31f5fb8fc558f1f47b842
 DIST speedbar-1.32-pkg.tar.gz 153333 BLAKE2B eec9effa69362256aea02781ec8d8e842f562b53810d368d3f45948d383dcc0760ebe236d3ad71863b96eb84064d58fdbc6aecc08e3f046d475a7e7ebdb5c5ac SHA512 75bb0c779ce01986dc87feacc669445fcbbada9b9af1785f8fd49eed4f1f0e5795bd0ad3053cc7a2b4897f2d7109f11f4f56bc5b007298350fe88fad17e38ee3
 EBUILD speedbar-1.28.ebuild 339 BLAKE2B 9fbb402b642b13c1fbf5c0a6e9a5cea0724000dbbc5fe484c94c4359a47091959fe2cc70422143d09ae7c4da2c03cf743cf28ecded85d24729e01faa92f9653c SHA512 9fb5f072b88c4e56a672f9d1acbc4dc693a65565e56d6c9d4e969cc65c56495cc80731d3732ae99eb5f2bb5432706b2a19c9173bd6a9808d0dbbf6d85aeafed7
 EBUILD speedbar-1.29.ebuild 363 BLAKE2B 6876d3c6fbb14c8aa84715f9528c5779c9518ad349742d28c5ab979f31108e0d4f0ce839e8acc1c80a75ef6dd7544762a7dacb997fcc6bbdc3c4df2945ed9dbc SHA512 7fbe9b9bef27e7a47337171a722ee8a908ced2401d916cd2cd4c3ea3dbe38a9708f6cf6129f7408f7298526a0414c54e6a15453bf52b033471be0ee8bb725c4b
-EBUILD speedbar-1.32.ebuild 369 BLAKE2B a0c8997a6e930ccfda0bf3593a0703083613b79d2c66355ec8fa31c9cf33703a2cab95b2bf940eae23da80140d3672007a013c37b50575a0cf823ec53ec8f221 SHA512 89f8c8fdca33194b5b33378227cd24aeee2205f9dffedbc286cbeca92b799cd29c506a91293e122392ce26c9fd7d8c7d924eb813ab58418314c613d26eeeca0b
+EBUILD speedbar-1.32.ebuild 365 BLAKE2B b372155e1a569d1ea117d485b8583e5c89875fc1a3a92dbf7a73b3c4d5ac81b1e68fc672fd1d9c6bb7f69cdfbab18c7891914a1f2c2c959cfbb6bb65b9c7122c SHA512 10996e9a01153c50b9607f176a5394873a5d7abc96468731c4b1cac575d97e042081511df3ecc74267a95eb9149fa9b72a372b757ae1dcdd1e69b4a6a331c588
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/speedbar/speedbar-1.32.ebuild b/app-xemacs/speedbar/speedbar-1.32.ebuild
index d18e9442cda5..d45eae9f0912 100644
--- a/app-xemacs/speedbar/speedbar-1.32.ebuild
+++ b/app-xemacs/speedbar/speedbar-1.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 app-xemacs/cedet-common
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/strokes/Manifest b/app-xemacs/strokes/Manifest
index 87116f7b48cf..33d2732e5289 100644
--- a/app-xemacs/strokes/Manifest
+++ b/app-xemacs/strokes/Manifest
@@ -1,5 +1,5 @@
 DIST strokes-1.10-pkg.tar.gz 43728 BLAKE2B 525fc8fabcbd23eb62730b2a31a962bb406712931867fcdc115c9fa96db7d5c4d9968063eadd9ec17208f54085023bce1467231a2f67c0e9839cb77d57df5640 SHA512 dc4c2e49cf5778122056cf10a20faea646598a4dbe24497b0feeaa341a6a05d845d1baf9dbd89afce1025e604f2b48b0e95abd7c5c0e749b3fb4aa0a524d924c
 DIST strokes-1.12-pkg.tar.gz 43759 BLAKE2B 5d0a4e4545b4a1d50b13b7ef91f5b165094ece75c4ea5ea3c8c596cbd4753541e96367a859f89a766f25838b34a52e6677caf1456db35ad7dcbbdba3ccc22863 SHA512 6e4e94397d25cbaf1cba77589f64096cbf239de14ae2f29f6ac4ef876d4a44304d6fadf5c045bb5c08e5cba5f50480018dc6f4c1849a4e08a93c6eea648fdc44
 EBUILD strokes-1.10.ebuild 358 BLAKE2B 224846835cd791058f90ddcb0cc89e12ad3d03328d56c784ce9927b5a7416933683bd8e2ccccba9da771ca1f3ff7e6d11ae75b9bd492a5255a7abd5ad5b81f1c SHA512 98f92d630ad338739532ae4ce33f4fb0f7102b838f3b8283ba5a797c5ac9b868ed7ce8c3fa25fb52295acf947578e55491b4c7ba1bfe1f98138c2b0863515307
-EBUILD strokes-1.12.ebuild 364 BLAKE2B cd78c86a7dfda07cbbc749cc312de29483e2267920adfcd96b43cef1503735fcd234c72c14dc06fcc52987e940600044b063910b440cc6840de32e8c8cab859e SHA512 48d88f682447756e314f03fdcef8c856487340bf302fbcc30dfbac13a823b06c7695159ef1b501cf43766233b210d94eb8540bd2f27c9cef93bdc84274dde985
+EBUILD strokes-1.12.ebuild 360 BLAKE2B 23cac28c5af6b7335cb83c598c8febcd0eef83840b8434ca19d78b25b997d63548f796bea47d8877d689021af8353687e6e23138095209d499f3712ba68a28a7 SHA512 fbe7d4ab07a6e11a0fed38c2f30bb780bddb307ae159ead2d2173a1448013d93f4d6cda26eee8a7f443aa21fa5d9443bb9c72cd349543697da29d41be9c8f918
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/strokes/strokes-1.12.ebuild b/app-xemacs/strokes/strokes-1.12.ebuild
index f2029ebca832..1598501efb5e 100644
--- a/app-xemacs/strokes/strokes-1.12.ebuild
+++ b/app-xemacs/strokes/strokes-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ app-xemacs/edit-utils
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sun/Manifest b/app-xemacs/sun/Manifest
index 961fddf50149..84c91cedaf5b 100644
--- a/app-xemacs/sun/Manifest
+++ b/app-xemacs/sun/Manifest
@@ -1,5 +1,5 @@
 DIST Sun-1.16-pkg.tar.gz 64431 BLAKE2B 8511f5a999f4b9f595d788fffa67458d81a9e7168613b5ff245555731af5c5276c94908598d3a469593752570ad929920ee9f86e1f81047aadec6f6fe0994b58 SHA512 1e03553132adedf2d93e80094a6934919489360391d927614dccb85abe3e6a36e930312ee8ee9c70a0608d2041fc8161dfa54649b0822236ca9532e0d26c8c2c
 DIST Sun-1.19-pkg.tar.gz 64355 BLAKE2B eeb935eaf699d45214592a2e9930c1f055e3857113d4bdec0f7b3520e6e92a116e3634163982f6f7f66a529e049118224195d97f889c448fc9944f20baea6619 SHA512 89059893e721d1f8fc3445183e4184f55b30f09277321b0a495b48c6cdafdc5d6f41df0b0f3d740a8331d6844d63ab56b807277b94e55ff1510efcee70873fa5
 EBUILD sun-1.16.ebuild 392 BLAKE2B 4879a79ac8378ee64b36223fdb115ee8bc4bcb4dfb43d9d9b775dfef63126bcfdfcaaf16e6fcbcc24094079d17e1e3a667ec2db320234097647b737a88863908 SHA512 ddab4ae951d4bb17393f4d5381f0439e952e48f0553b44d160f9a9a14169531a28b661c31be395c0b16d24e9ef6a6fe9a3c54c3c1cfd75c40ad93cff2b145ed0
-EBUILD sun-1.19.ebuild 409 BLAKE2B 3d664a3b7008033cfe1483d932d9ddd0e97d4602887f17c81e14918bd8d8119b183340ee37b4bb18f1b51d81443d2b9c49cebc2eca6abd4ce899c12b2dc285fe SHA512 ebf4e9dafd8ce6d4f8833b3c9b99cf4909c6ad74d744f2b769b30e3f2e53a1fdd1df5e009aa1bbcd4b6960145191a7eaea126467a5fd9d7cf8901ddd174ef538
+EBUILD sun-1.19.ebuild 405 BLAKE2B 9b198dad92b7812574440867608b16965706befa902917bf0c305920a0585f6759110e70a48d8281ca1c898c9ac71f8ac55742092ba6f8611c1d0471c59120e0 SHA512 debddb1efc4e3fcabae0b4774372abd6efd76f9d55f8c8c6287663c78b745fec6655c19620aeda2937c2185fb6d362f6d2dbfdaa5048fb50396c25e7b2a22665
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sun/sun-1.19.ebuild b/app-xemacs/sun/sun-1.19.ebuild
index 449e3de767fc..7c4a3e6d0370 100644
--- a/app-xemacs/sun/sun-1.19.ebuild
+++ b/app-xemacs/sun/sun-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
 RDEPEND="app-xemacs/cc-mode
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/supercite/Manifest b/app-xemacs/supercite/Manifest
index 337c13315457..0d7cfb3b44fd 100644
--- a/app-xemacs/supercite/Manifest
+++ b/app-xemacs/supercite/Manifest
@@ -1,5 +1,5 @@
 DIST supercite-1.21-pkg.tar.gz 100802 BLAKE2B 6810ba1eb207914193f22d10ec30788e87f6d59f8fbe7bb87db46b71dca668b243a1b23f33e662f248873d6770382ced1b3c8a35662725c5f36a0f1265d77183 SHA512 6b1875e6b6913af7d5a6f32888472e75702e570067460a52f93e8d6d761d05c5cd5b373bca60c86c9d4d5edb8e6d8d0b6cb363c5645d527cd81c06e4a178487c
 DIST supercite-1.23-pkg.tar.gz 101982 BLAKE2B e4873e5ca9345239b3986080c32c4f2e36d3fb5eb723c99b2f630a47a2a2362b24d8cdfeddf35c9b89711806a1da4bfa30131341b5b1167ada2a0f1ec9aa4377 SHA512 7a8d79c12bd4c8a4aa8b9cc272edd97016262c42551d302f7c3268467c7475d3a807f15f9fcef775926a03688f6dc0ab65b90233ba16250ebbae928e21f12838
 EBUILD supercite-1.21.ebuild 336 BLAKE2B 4437af6cc778633e7857933a48f2a2a1e42e05670ebc51d73641303e55f27b9bd888b92a3c0e8b8bb83d528cce1a009190e1b4b7f96fe38e766cca936302298d SHA512 6af5509cc7507094eb4ea55aa4a33bd0d2615b1c60fd9ee8e80ca03e1564a905fbcfd9504326859b9eebd6d23db05cd4417f0a6c378c713fcc11e2dd7f0434f6
-EBUILD supercite-1.23.ebuild 342 BLAKE2B 12238451a2b5e6c466c1df9eed041cde70f3784eea73eb7a490fd19c45c96560e9e279cdbd1e50b0944a706a163a8906c8047777ce0dcfbdf21735d99539e794 SHA512 8fe284bf4469f1e7727cec2c56326f54e578dbc4e35d4f8a6c9674589a890c88e6b2097f3a24e48b176489c3cd28c10cfb8abb3f0297ddc945a42c5c5ccbe493
+EBUILD supercite-1.23.ebuild 338 BLAKE2B e125affa2e3e2439f3d3bd0c0b8bbfcec1c1d15708adf4b4d18b78f7192459c3098ee757805dd3185df0e011b4d158ef84f59823baee3696e4915f2e7d3bb644 SHA512 9b7d5a35b6f7b82b1daa19377157189be7aaff3ecb70b2137e081a29189ef5f661b2b076022698e3e217e3360d5197beff176b3005b7556a4a3a24fa7733934c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/supercite/supercite-1.23.ebuild b/app-xemacs/supercite/supercite-1.23.ebuild
index dd31d18664ad..4d6192a4c94c 100644
--- a/app-xemacs/supercite/supercite-1.23.ebuild
+++ b/app-xemacs/supercite/supercite-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/texinfo/Manifest b/app-xemacs/texinfo/Manifest
index 6ee91b391777..4bacc5b8b470 100644
--- a/app-xemacs/texinfo/Manifest
+++ b/app-xemacs/texinfo/Manifest
@@ -1,5 +1,5 @@
 DIST texinfo-1.30-pkg.tar.gz 145763 BLAKE2B f4bdd2381fb2efa5e6d318431e8a8a56911b2f84b161f96610e2e43a8e49c9ba15c63915f3219b4b47901834c3cf51aaa4fbc1b51ce18ae0d574bf99baafcae6 SHA512 dadcbb0a2dbbdc311d19a4e796ac574f18234938ddeb16da1ac8b9e150459536bac46b00b1609b8cd837ef980cc5b13f77b8321edfb347614340d1db0f3f78c0
 DIST texinfo-1.32-pkg.tar.gz 145642 BLAKE2B 75372484fccb2f8de979a29c506e1e4479ce5371bc4a8c3c06de6b407c1bab132cb156281e458966e673d505ba2f7547e767aadc124df14299fedf1f7145970f SHA512 026d5749acfb4f34bbc6bdb8471419fc48ae537051808d73bc04d6a11cae404b5e877305b5b02e1eabb79292f1cb73795c7521e384350948937d9cc7033bda66
 EBUILD texinfo-1.30.ebuild 318 BLAKE2B eefca977c12b4e5b3d6f3eba40645592a7c3306f4d4a358f2e304b1108d0a3ac51ae06bbc1cd3556581b7128520d3295c9f524837502e77842061b06c5d4caef SHA512 4be597af3575b397b4245e0f5b5b87f65ed2987f2521b0930d0343c0da1aad4ccb135340e6a24d120fad78a6ef993d324d84d2d695735f166e13d20804fc0fad
-EBUILD texinfo-1.32.ebuild 325 BLAKE2B 3341d9e91e3c09eed14dce22bd8d0b9503c79300552692a7186740f93438f28590a082b9813c943835c689871f06cf0e7cb456220966a23e6b5717e4168d12c7 SHA512 22677445a1693e7a41a59967fc81545c9ad3d9ce8564ad44d120cda645ffaecfdfcd9bc04da3c6fe61c9ea5ceee29b3c9967905eb66376396c41739422cae426
+EBUILD texinfo-1.32.ebuild 321 BLAKE2B 6f3a61906dfdc9ed771cebf7f0ae7d48bee764fc51100614a1d4dbc2fa6ea8977a64f868884e63daac7bbe072c4a8c64e2945dd7e3fa994325bf42ec15a1cd19 SHA512 15f02d64c806aa6006bc1c8d0ef0317154a6382c2965b5960722bad233925f912094adf2ee9243e9bf57e4d9f5a52dfb98ff65dd55aecbb9ebde314b6be188fb
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/texinfo/texinfo-1.32.ebuild b/app-xemacs/texinfo/texinfo-1.32.ebuild
index bfceabdcd5d8..eb1421851f6e 100644
--- a/app-xemacs/texinfo/texinfo-1.32.ebuild
+++ b/app-xemacs/texinfo/texinfo-1.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/text-modes
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/text-modes/Manifest b/app-xemacs/text-modes/Manifest
index 5c2c801df22b..ce8dd9ea9631 100644
--- a/app-xemacs/text-modes/Manifest
+++ b/app-xemacs/text-modes/Manifest
@@ -3,5 +3,5 @@ DIST text-modes-1.98-pkg.tar.gz 450607 BLAKE2B f4e3c2eaba1c8a1a6e751de1a483e1991
 DIST text-modes-2.06-pkg.tar.gz 542495 BLAKE2B 0a63c323d923344e01f3dfa5aaa9d4e17b91d8d3988ce0125056e6c48c8a48e1ee57b6c8427428d32076b3444c18c89808e23c675b890b35f6db6396a566d97a SHA512 45c7386214d623803d739e2140edb237bd561416c11a5c13df547483e0ce854a330a481a84efdde3a10cd4c2ee8ca78f422f5fb6d1e6b00e264886069d549217
 EBUILD text-modes-1.92.ebuild 365 BLAKE2B cb0b4a442eb21b81889826c3568244683b4b5435d463f843d635980e4868873877794f4ad6b7fdfafd9bd15fe0fc308d05bf9adfaaff824595c3cc1362f26865 SHA512 055f0dfda57627d9ace9268542c1d18d93cf20ffb022a74cfb4edb2d25ce40b2986fb8a28d476a1b4f1da9fe7f599876dc86717b1c2db57eb361beafd4da83b8
 EBUILD text-modes-1.98.ebuild 365 BLAKE2B cb0b4a442eb21b81889826c3568244683b4b5435d463f843d635980e4868873877794f4ad6b7fdfafd9bd15fe0fc308d05bf9adfaaff824595c3cc1362f26865 SHA512 055f0dfda57627d9ace9268542c1d18d93cf20ffb022a74cfb4edb2d25ce40b2986fb8a28d476a1b4f1da9fe7f599876dc86717b1c2db57eb361beafd4da83b8
-EBUILD text-modes-2.06.ebuild 372 BLAKE2B 2ac7877128420627dad580fe455e4e8a097592673f554a29d5ad5d6bcfd9c1415049888ebb157f9f70be78a5362896453bdd79090280b130ccf40427217a1014 SHA512 8032d3a5652376986097ff4eae15f9d766d43d42626ff5d44eeb16c4f57158260139432ff02cf33ee5e47a65609f47adbff77e22fd3a34b29c658a369619095a
+EBUILD text-modes-2.06.ebuild 368 BLAKE2B 963ef88000f6b23ef5f94ca358bee2e8799da33bd6aacb3edfcd6a3ba0b48cb78d33601b32c0a925a0701a31510394a973308dcff3ffa6ceed92861b5d469f4b SHA512 d4cbf2368323dd11f0f23e1d4c93e6530d0a3562effed79e58660ae16e8b2e9b402f4a12fc550f57fc97e85fcf53987d44578fe40baf29223e9af1cc480699aa
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/text-modes/text-modes-2.06.ebuild b/app-xemacs/text-modes/text-modes-2.06.ebuild
index 4ecfd2585c61..fe338c5ac59f 100644
--- a/app-xemacs/text-modes/text-modes-2.06.ebuild
+++ b/app-xemacs/text-modes/text-modes-2.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-ispell
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/textools/Manifest b/app-xemacs/textools/Manifest
index c6a2c296ce8b..c1234d25c09c 100644
--- a/app-xemacs/textools/Manifest
+++ b/app-xemacs/textools/Manifest
@@ -1,5 +1,5 @@
 DIST textools-1.15-pkg.tar.gz 79966 BLAKE2B 5b2de39719f7c8e9af949365e3ac6a615253017a022e027bd288456da15fa5baba13603bb5cc2a61384dfbb4fbad18b2d8e2e96d9937a14a4f298404b0d148ae SHA512 22c987d68acc1107eca9749246014f5a6c64e7d388519e7694dfa917241537cd7e815e73e5cd36edac564a27136b273c9b0e593a78ae63f683b0d70432b46310
 DIST textools-1.17-pkg.tar.gz 79944 BLAKE2B a90bc826e95e28437d740499653c1784bd688ac3983201b6bc4edb0cbda3cea80057cacb151f82b09255e606c1f6bc8b51ad29c075b6eae5de62b007a35abd35 SHA512 b6bf2493a2c220c8572709ff2a0068d0b7b42c93288dda22ee571d8d6ff0e93bc6deb12f110d8dd0e9f5cd83499c7c5a99180063712a08a41a8677ba2810c683
 EBUILD textools-1.15.ebuild 294 BLAKE2B 80e695edb61506c09f0459319ed203345eb008604b815c02cc334c750dd476d059d473cd8889d2f5a203387994e075f7219382c108582e2add3f6e5206dc2a6c SHA512 e78032e9d788333fb29376ff425c78b0ae9246dee7bf132d8a5d1caba870e4bbc2e544f8869066684525ee40b52f70617f4b13bc3cced44730401033710269e7
-EBUILD textools-1.17.ebuild 300 BLAKE2B 3b0a4cd48f0b776116f6668c0f218cd436359480b08892fa7f39941a2e69ecc901c10355a8181aee094a97c9958da6d11b2d0b4266b99cffe4521e5fd63384bb SHA512 92977b1774769341bf5dab751956164b3a068bc94935bd173524807d57ac726ebbfddd301ccd2978043ef141ab0fd8d739b0ee75e3b4eac6e1183060e955e6d3
+EBUILD textools-1.17.ebuild 296 BLAKE2B 9f1c3e6e1eb2363a1860baeb650d18368c5f268554cba9b14f4e4c1745e0426cb345e87f0ba9b794a671eb9624fca306e5dbc98b8846e68fe929d9c92353841b SHA512 6c95870375790ab8cfebbe2c1f11aa85e130057f4fff5403724d44cd696837de51bbce4d8a3be7d36630eeddfe7466df88af598fafc75639d1b2ef62c6805f64
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/textools/textools-1.17.ebuild b/app-xemacs/textools/textools-1.17.ebuild
index d2ffa79d9331..6d7f4b2886cd 100644
--- a/app-xemacs/textools/textools-1.17.ebuild
+++ b/app-xemacs/textools/textools-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/time/Manifest b/app-xemacs/time/Manifest
index 11b6a02a6592..76952caa2163 100644
--- a/app-xemacs/time/Manifest
+++ b/app-xemacs/time/Manifest
@@ -1,5 +1,5 @@
 DIST time-1.14-pkg.tar.gz 20431 BLAKE2B c0b28f83de39a82fad9965e13681e4c88c1fad59d19821f951739dc7fd915b01f3308d0b6fe6485def0e65a4396b6fb6941103863243e9848f5ec235112b7c67 SHA512 62dfea425ac0fd00d4e8003377341c03970fde921acc06f94cbe98e6c37e255462e7ba9e72d0d540c557d64559ce9d39d2f21bcb7736e0ee7939e4b41ab5c0ac
 DIST time-1.17-pkg.tar.gz 23678 BLAKE2B dadcbde74e0a007932bd63b85159dd431846428c44149544a7afc9e4039f0edda02c8d76da75636aad022afcd6491fb2d23a250213ea8f0fbd1bff10b4eca4c0 SHA512 d143cea2d2da37234b33581a1be2a90092c3e1de78e14331674e8bcacd3f38ce0d61ccff7b7c94153f6bf7daa0516eecdc493893933d68f57f6878f2c7105df8
 EBUILD time-1.14.ebuild 304 BLAKE2B ca4a708da9b787c518621da86b7d8495efb92d96bc5e4e5eb92a7dbc1a8b8a1fef14e3c665ef70ae27f493608f4488662b98f17396ab3b9dda6a71be3a56ff37 SHA512 96f1462556c3fe4997b6027508b5909635d7440cba30117828ca03b789b951f6db9f02536d000e8c2a88464b76816e78002a7e4f9f53c92bb410e22d583158d6
-EBUILD time-1.17.ebuild 310 BLAKE2B dc18b20cceebec97dfd2ff942927f3bfbfa7fd1e7cdfd97f8d26b786701019898683c165a88fd483be4129929b02b98d2231dedf80e82f255a62b703cdf9d9ac SHA512 d2131fd9c6d4ab1dcb858c6ed8b692da1645961448a31fe4b5da26485fe5da291ddbabd37b33422984159f9cb7119c38596761a41872bf93a13ba56c9199555d
+EBUILD time-1.17.ebuild 306 BLAKE2B 6edc6b3e7680a48d67ce4a23be8b54fe32a8380b23adb69b51c19a80e7964cab487f916b5350f489201280464fed7b20eebeb91e2ca0b34b483884b91b04b3e0 SHA512 03c620c3d93a0883d6509d2b37f4a5bc7190d61ef1486722308309303281cf464ca0b1cd384aae53d5a807d80b859d2beef840b504e87dc2534a6489094e4278
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/time/time-1.17.ebuild b/app-xemacs/time/time-1.17.ebuild
index 6b1ccf2de649..c1d53abab870 100644
--- a/app-xemacs/time/time-1.17.ebuild
+++ b/app-xemacs/time/time-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tm/Manifest b/app-xemacs/tm/Manifest
index 25c1b1b833fe..a83f67a7f7ca 100644
--- a/app-xemacs/tm/Manifest
+++ b/app-xemacs/tm/Manifest
@@ -3,5 +3,5 @@ DIST tm-1.39-pkg.tar.gz 335103 BLAKE2B a1dec2205292d4ab26f8427ca69ea6decf0935b15
 DIST tm-1.42-pkg.tar.gz 333595 BLAKE2B 60cabc1903ad38d1e7dc2e9d5eb346de7b4d160cfc44f553b91e632be27e48d37476ff393eb1214e26bec2247b0dd6ddbcba24d7a57aacdc5b7f6e32ca336fab SHA512 7c5310d1c4fb1c97167c3a39ce0ea352c7828751915556a892d5363a9e428c31e4117baeceb5ba3bcbd1cc456c7d73071427b0339ce221d940c76a5622fbf6d6
 EBUILD tm-1.38.ebuild 520 BLAKE2B 14aa73a3bb89f2c63337ddeb066e8b8d4adff89b9cd962f37629ab27fcd3282dae48940b59a72d3187400c63b07747e36262977176aa7c715b0a72d894c1abb6 SHA512 818f2277133cf58ccb714937485bfefb88705342c7f4f983ac5cdf2bc77a339dbe8c2372190d49a830a1a58baa0fb82f0414179dc6e5c65b6a609dca57019ed4
 EBUILD tm-1.39.ebuild 520 BLAKE2B 14aa73a3bb89f2c63337ddeb066e8b8d4adff89b9cd962f37629ab27fcd3282dae48940b59a72d3187400c63b07747e36262977176aa7c715b0a72d894c1abb6 SHA512 818f2277133cf58ccb714937485bfefb88705342c7f4f983ac5cdf2bc77a339dbe8c2372190d49a830a1a58baa0fb82f0414179dc6e5c65b6a609dca57019ed4
-EBUILD tm-1.42.ebuild 526 BLAKE2B 77a3b4b579af2d264075c280e6d20780237ad1d3a155d4ad807f4133d61a769dd2006ca1240f0fc3f30f074baca797f81db01f1cc275cbd051e6b6086c9d6e94 SHA512 a9e48909b218db8666b6dcc6d5615e4c9657b0d7151b4aba5fff1582cd230413bfe46dbaedd0655547cc6916246a29891fffe1c3b31b8632b7fd0d1391d40ab5
+EBUILD tm-1.42.ebuild 522 BLAKE2B 8694879ea411aa7c3f6f23d4a405cc2563c40992754efc3e1c06ce25ca2e674e8dd10e87fb75a329070b99ba3df44c52cbf90b28405d79179e604f22cfc8bd1b SHA512 fb464012753c0b9e9748a0d50e5cfea82f956d51eccb5036f82c19843f2c7a611f454c41113558372aa62f3cabc1ca3a34ed4ff1a0301e30d3e1a3a346522219
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tm/tm-1.42.ebuild b/app-xemacs/tm/tm-1.42.ebuild
index f1858a3ae07f..d7d5224d62a5 100644
--- a/app-xemacs/tm/tm-1.42.ebuild
+++ b/app-xemacs/tm/tm-1.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,6 +20,6 @@ app-xemacs/sh-script
 app-xemacs/net-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tooltalk/Manifest b/app-xemacs/tooltalk/Manifest
index 89eb9254a681..07e79ff015d8 100644
--- a/app-xemacs/tooltalk/Manifest
+++ b/app-xemacs/tooltalk/Manifest
@@ -1,5 +1,5 @@
 DIST tooltalk-1.15-pkg.tar.gz 9749 BLAKE2B f483f8972c0d8514b8cb1bae0795a82eb02858a632f2929cce114a6c0c98d0a92c176556bd6d87fef926936770b7afbbaa9541e090a42af6c0a18b567279b963 SHA512 c884d357a8ba534f6a640cb9b5b0bee5138758181f53a66d8064c7cee9a7277b4e2a4c7d3d831404b4727bef724694882c1334ca7e0a39b1f934c4af966fb2aa
 DIST tooltalk-1.17-pkg.tar.gz 9760 BLAKE2B 972b905c7ea92152528a00515d055975e5e3072f373977d33f70e7d88051c0864fbf5ead6590255486e50800af03fad2161bbce474aaea89dc94acdca1aff977 SHA512 3d83e9976b1364430f86b7d582e9110f83272692710c78642a92b1a489280658163c6566df54ee0bbf0b074716511569a6e61a124edf2174aa45b9779e52ce24
 EBUILD tooltalk-1.15.ebuild 269 BLAKE2B 264ff6be8cf653405aeec8ef6b6a137e65424ac058afe8abad417634697fd85ef32031350fe2cba063dc95eddd14ebfe3834f784d38d423813042f31fd68a309 SHA512 a1595fef67b54b93e9090f9bd6d521608bf4525c1362775a6b8013b17cb4509232bd84909290f41b4eaafeadedce76d8d1b2c2823ab88344c3c4e6b947bb8313
-EBUILD tooltalk-1.17.ebuild 275 BLAKE2B ba1bfdd87b31aa1063b24d7e20707686cebbda5bde00c7bb182845cdc8c8ff95fd1e42f429f7a5b96648758e7225e115b285695954271c8ba2f0e060df14b249 SHA512 a2be1fc90a32f177c85b5f349a002ea737d62632d8d8e926b4c47bb92d26177654f36474eefb8d8ae24b40ce51fd2e9a39b1bb0ef1aa547c2ff1fe74d919f8fa
+EBUILD tooltalk-1.17.ebuild 271 BLAKE2B a9b915574d63d4a33a07e70c9154373abccd6fdb595007b97db59b215787796376b94287698a69b7fb80c3bca1a7d4397b1b8dd6b071154161af5020b874b94e SHA512 6ae813107a8013859ea821c1a1d0edf5dd41efbc4d2b11a0838372b118dee3f5435b0fd7a907edfc19cd97c4003c45602f49b438ea825df0907ce337ba0a6bed
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tooltalk/tooltalk-1.17.ebuild b/app-xemacs/tooltalk/tooltalk-1.17.ebuild
index 0f684d3a1835..173c21170ee1 100644
--- a/app-xemacs/tooltalk/tooltalk-1.17.ebuild
+++ b/app-xemacs/tooltalk/tooltalk-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Support for building with Tooltalk"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tpu/Manifest b/app-xemacs/tpu/Manifest
index 0e30f93a10d3..d144cf1e2843 100644
--- a/app-xemacs/tpu/Manifest
+++ b/app-xemacs/tpu/Manifest
@@ -1,5 +1,5 @@
 DIST tpu-1.14-pkg.tar.gz 59529 BLAKE2B 75c562a4e83af5f077851410f0974aa09cb3f7dfdfe550e0c5904f7790694bbaa8c48798366086927fd26df6a17c4ce46fcb89664613cfcc967c6b548b43a239 SHA512 07c448f17be698ba9967762de3f3c0b94793276e72e5ad1562491bd6ad0a2fa431ccae919526e105313adc658dc22ec095ecc81433854f28bfbc422967cda82f
 DIST tpu-1.16-pkg.tar.gz 59496 BLAKE2B 782b3a50e8de9188660608a3720bed5c4b02331fd3f7ff388cf8c61304bc22ac9cba58a37698f8780b98faee1d2f0fe49b7d965d559dc4d6d9a253f7ac21d7a1 SHA512 9fe33bb1d80f453fff8261826b062b84c94a1b41daca2855ff37e2f9ef880ea576030fe1fc535c5c3255f669a411da0454711350879038e1c96072f68576d007
 EBUILD tpu-1.14.ebuild 266 BLAKE2B 2d7c545e63efafa5ed2a9b019a69b8846ba240ea8069326cf14451cfc7afdd61683011e47e2b778318ec3a70e2f56a428a0fb7bf4b7d632530ee4efd530ff193 SHA512 ca3946f3771062da50e0d89920f42098f6883dab4e99e8af547854af6347014e7c031833a9c720b8813e2736944b793bd11351011fe4efa1ec0bdcc98a116632
-EBUILD tpu-1.16.ebuild 272 BLAKE2B cacfe8450f4f05c06f38f6e2a18705caee1e47be5dc90381e490b3ac85737f6efb3f9614553a08a3408067c79fafe777c2c3ef0e0ab11fa046e564e05ac9383a SHA512 94985b5648522995ecd9ed32a1fbab81bd1ff031bfaf948f0b598ca28c03d2a03f482384b49f0d8f5f76102d84f4b21a11b7e8c6267415462367f496d27dacc2
+EBUILD tpu-1.16.ebuild 268 BLAKE2B 51fafbe54ccf02f1a9a8fbfa71ba2e8abadc542dc45ec3e40d9d2e244d9100471bab45c42b3daa7974b12051164aadb6903ee8bca1fe30dbaca9ec9565b89101 SHA512 7c2b1a210331d1ae6a723eb0d4aee3a8dc5cc0641ed62b3fbe5b654bcf73d307d9993a73359e1311bee99888ca898f1c8f6790b350859ccb50b9520028eac5d4
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tpu/tpu-1.16.ebuild b/app-xemacs/tpu/tpu-1.16.ebuild
index 948dcd60088f..7fa114ec8f81 100644
--- a/app-xemacs/tpu/tpu-1.16.ebuild
+++ b/app-xemacs/tpu/tpu-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,6 +8,6 @@ DESCRIPTION="DEC EDIT/TPU support"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tramp/Manifest b/app-xemacs/tramp/Manifest
index e0ce05e8b8c6..8459e8076af2 100644
--- a/app-xemacs/tramp/Manifest
+++ b/app-xemacs/tramp/Manifest
@@ -1,5 +1,5 @@
 DIST tramp-1.52-pkg.tar.gz 396316 BLAKE2B daa38f4ccd399564d84f9cd5445f4483c49a591302ddc8a881376e4d3eac506b1123040fa7395255fd5f76bc93f6ed124771d557104b4261a74100a2bc6273c9 SHA512 ce61fe02bf0803a845bf34df7d9c7c0f72a28bcc84e2ebbcd8b80b1a28a5304bcffd5756a5a61d297b537e79a7d90e60821ba857a4c06911d4c098f2694897c6
 DIST tramp-1.57-pkg.tar.gz 399264 BLAKE2B c7df03fd2cd201f5684743136ed092683b39b1a7cf0f24df998f42440e781ad4d7216f0d32aad9afae5333c94fdbcd7ce42c5e111be429494beff263c3e2538d SHA512 1e648bbbe7decdd57d63b55c3d6b6dba78bb9303d6d56e32ef36957ef377489afe94e0b40ec938f5beeff19d1517e0798d3af6729af7a97f9a83176fef7d5560
 EBUILD tramp-1.52.ebuild 466 BLAKE2B 79990a5c3370e602431de59152ceb46305f0035b5ea37c20e6961b1025dbb0281cd005034a8249d6d0a500aa5032897fa9d70a047b19c534809680b89c5f21db SHA512 629a84673ac29f86097e56acbff7e808e042ffa52be59fd997a387d9c0b55bf9a836e0c5e11d1e64300ef37a4c7e07599305452dc5b60910c9f27ad716595350
-EBUILD tramp-1.57.ebuild 444 BLAKE2B 1df0919d15e64d53960930c862d08b355c0a3ba37bcd63b365bbeaa61e78ed8303cb22b94f5c8413208d048fe7a52cc86a8462fde80fbc293c6d232cf9de7161 SHA512 b1fdfbd07273fc4602e4efcb3b764611a1ef9c019ff7d9fedd8a280cba6accea3c54d4f1782f2a3f815629b7ca0bb0fcc8479cd8aed68d9274ef9717293069c0
+EBUILD tramp-1.57.ebuild 440 BLAKE2B d31324896f7dac0b6c9c0c10e5374647a396006c12fae0c7ff9628eb116a40551c9adb15f8bcd40dd89842d82216ea002a9068b8ff0519096f6c89df1e0444ac SHA512 f97ace313c1c2c6b38148a2338547d8d2629cb1425c9919362db70c214353a73819675a30e3cc9285f27d51924b185a79bd1a3edb6c89caa1f6ed74de2256c24
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tramp/tramp-1.57.ebuild b/app-xemacs/tramp/tramp-1.57.ebuild
index af456ecd15db..b5ac579f94ab 100644
--- a/app-xemacs/tramp/tramp-1.57.ebuild
+++ b/app-xemacs/tramp/tramp-1.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,6 @@ app-xemacs/ediff
 app-xemacs/sh-script
 app-xemacs/edebug
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vc-cc/Manifest b/app-xemacs/vc-cc/Manifest
index caee15faad4e..2d1a0e6c493d 100644
--- a/app-xemacs/vc-cc/Manifest
+++ b/app-xemacs/vc-cc/Manifest
@@ -1,5 +1,5 @@
 DIST vc-cc-1.22-pkg.tar.gz 95028 BLAKE2B 6ba8a0475d7a65d3f52982674f0d1eeebd262c7c9bcd939a3f4278324b7457ad9169352a3974627f03a12d9baee85908e27ec77100c3303ae186f2de1fea4a9a SHA512 34aec1f857220ff35c6aa3b428605c7d42e1f10d2e6d265a815e8a1940b3cc52ef937c22c6fbabf736e3e6363023250daacb151622f3791972ecc74d7f7e876b
 DIST vc-cc-1.24-pkg.tar.gz 95024 BLAKE2B 0d9303bb80d72efa2d9850619b5f0023af6b58ffe0a1b04e1537621c343c25739e68f39a035ecd0e25890a2e12e5af9bd14d0658133e2e0f026900a758ff8218 SHA512 101eaabbf37dabbec710c20cc6aad76ce7ece962903a1284b1be72a41352ef00856bca9bcf72b9cefa520375e46f820a5c16a0067324cd79a2810d5b0b8211e9
 EBUILD vc-cc-1.22.ebuild 332 BLAKE2B 989412c4fbecf8da4bf295887f4002ee618986ed6966c9f0f59c4afc01c2bdcdd28bbe54f08e83295856fa8e80ad8482a966c65e4851aad1c36f90d15c738627 SHA512 d6c6db6fb845e6644929f284a0205456aa7c39f4789cf7550e13d3b60c327770e772ddcd222d46f03f249b54cce0e6bd041f24c9f2499e06a82ca8d2fd610a9b
-EBUILD vc-cc-1.24.ebuild 338 BLAKE2B c4835b5c26856f8ea913002fd66510c1ed86cf6554fdce96cdad94ef34a3d7181c81f041201a46c4beb0b37bf8ce3f96d6536fbbb13dd8a756ef59a04abf5991 SHA512 8c9cae495d8efee82459bb85a59aac5be1f37eb6c78808cc17d57ae66b42a4f3789d30e8275066b5db7f07b4ac65ed5959a4db805501cd5a55a6efe397623daa
+EBUILD vc-cc-1.24.ebuild 334 BLAKE2B 2cb370548d85f723fa8e81e8ae5101050024993b51485b975205ac1c0c9556ab8298a08cbadcc202097a6635cd6416b472307b45866d712a8fea3c46fd065916 SHA512 2a5ee12f643ecc898544850000b8e6b5737b4d45ec8403fd168a3aea8985c903068c1038436c35c8c208674cb88a6d45d3961f2306dfbf2c83fea2d9762bb647
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vc-cc/vc-cc-1.24.ebuild b/app-xemacs/vc-cc/vc-cc-1.24.ebuild
index dfb7b5f0bc8b..fa7894cc9d7e 100644
--- a/app-xemacs/vc-cc/vc-cc-1.24.ebuild
+++ b/app-xemacs/vc-cc/vc-cc-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vc/Manifest b/app-xemacs/vc/Manifest
index 5aa6cf47aa0c..cbc05a335467 100644
--- a/app-xemacs/vc/Manifest
+++ b/app-xemacs/vc/Manifest
@@ -3,5 +3,5 @@ DIST vc-1.48-pkg.tar.gz 231122 BLAKE2B 8dd697dc7fb1d973ab1fc8f0e6a25458221fa581d
 DIST vc-1.50-pkg.tar.gz 231057 BLAKE2B 0bba6cedd270a8200eba2c09b97f0d98aa46c747a65f4cfe08f7242e95bdce74d933b39d4b9e6e109b2536ad4c3a49e00e9afc185e0afd51ab2a910137ab240b SHA512 a0da1bd44e6309079ad4c699206f4f9cd9ee050724902af8695d62610dd1a2c59e0d48964ad318e3dc68be865ecd5480138aa305c0673df68c5d2c61a3b80afe
 EBUILD vc-1.41.ebuild 355 BLAKE2B a00f65a69ec60d0b3d5116e0baa6828bb620bae59036c360e1141840e049a7ba1961ffe3eb26176dd13999864a3a183483dfb7404d087bcbb10db8ae04de1e69 SHA512 3a688175d972352fcb505b8f667bbfc1f5b2b1ff9c3032cf791a341ace81891e089dbd7272837a64dea7c78b2f39c9425136651cf3b1af2b09c8b9c178c55b3c
 EBUILD vc-1.48.ebuild 484 BLAKE2B d3c8ac311417c5820b5d30539dca4f0d3563e4eb6b0554d15bb207c9a587aee32e8af586396f540501d59d520714e338049147ca5ba560f237bd28ab38544d56 SHA512 bcf16552e9a9f91cb693005b45fd65e72cde6efac823b8ac6e0e3037b829a0154fb21ae33b040f39cce7f5d6361f3fc34859c2aa2ccee24b74ef8f1eba0b2285
-EBUILD vc-1.50.ebuild 490 BLAKE2B 69d35f641559cbd13994b0f90546b78ce0aeb59b76cebbb316269d35efe07325844bca61aa33f8d90e254785e5a65b3a1368b6df3ae82213a6b6fab8ccd2106c SHA512 caef52b57b198918ff6ff39c3780096bbe39f2a1d3abe6264c422d901127dbf4c14655c0fd93b43f7dd507fcf53d883f335a70a80639b88b223a644e7e862ba2
+EBUILD vc-1.50.ebuild 486 BLAKE2B 989347a992352a114cfd5539c2e001c3361bf4ec0a7431b1ae4d8932b6574c92efc81e8d921e1a9445920cae3ad469d58f538df9fddc071d50c86c6d415e0acb SHA512 60a0a8aa0c388984e9dabc0f20b681b18e30cc226894f49f5ad4409cbc2a6d7d7412fa193e42a664a623f8230d3e6fb7b6a9b88064468632a3352ab24f78fe83
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vc/vc-1.50.ebuild b/app-xemacs/vc/vc-1.50.ebuild
index 1e822370008d..9116cff0f075 100644
--- a/app-xemacs/vc/vc-1.50.ebuild
+++ b/app-xemacs/vc/vc-1.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,6 @@ app-xemacs/elib
 app-xemacs/edebug
 app-xemacs/gnus
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vhdl/Manifest b/app-xemacs/vhdl/Manifest
index c17a776757d3..c7292dd0dae1 100644
--- a/app-xemacs/vhdl/Manifest
+++ b/app-xemacs/vhdl/Manifest
@@ -1,5 +1,5 @@
 DIST vhdl-1.22-pkg.tar.gz 302693 BLAKE2B c0ae6c5b079cf8e394a6e09eccaf327eb8729521f7982797e9ffe11cb150cd309752f79635a2f88845ce0888c562aa5fe1e23f491966c205a7c98ebfd0a2a3ec SHA512 3b0d6995f69d7dee47d4d5ab108be3c58f7911b37d31b6a46242eb678623275e32c3ee55393c5671237e11f3b84a56d8f1fa3b8f6492032aeb9f590bb1ad0848
 DIST vhdl-1.24-pkg.tar.gz 302748 BLAKE2B 9c5616c4eed1e14c89bfe950d0a58c7d33189b275da9ed57953ddab4b7c326c5799c1470c2775b6e5b13dc93d0a2877250937d664eb665eec50659b555f77075 SHA512 31b9f7d2d091f6eb5e1b872f5c923db402d68655017c727faaf6b40c0eb101b103f5c1ba838e1a0f346b8a3b9f0c976000de2052a6cc1b4065a490a25290185c
 EBUILD vhdl-1.22.ebuild 388 BLAKE2B 0b09aa3c65ddf8fac6e8080cb8054f22c3ed10e2f18096b499206c799972a78eb531068942b414ca1d5ab43d09e331e607d197fe8595d2647e26276d113e2641 SHA512 82f791cf9b49ee983971758f35226312169e1aa33adf1d05ed0b5c7eb87169561f87ed21075075263e6256ef9d317493785117c26a0e82456259fce8f5663def
-EBUILD vhdl-1.24.ebuild 418 BLAKE2B b231027c5fc067a57f586c7093b5be961a7f57a0f07dcb6e29f740dbf45a11f6cacb10c973f1afd6fd37b4ed449ddb2c67bdc5ba7c857e5ecd2fd10b081f421e SHA512 98df70a96d9ff5da26216d91783ff9272d456fa75fe0979d690026556e381986a4c9f8a82bd5d8275758e9bd60bebd3fb4c0092bdfe7c36d13972246f493cf3a
+EBUILD vhdl-1.24.ebuild 414 BLAKE2B f747f5c77b82deb202acf6a56a8ee1c062113957f5bdcebb5b7cdd0ce18ad1ac4e55a0ba50229bac2cdc4561a6daf8dfc1dda20c4fae489e37a1db5d52405ff9 SHA512 0d7211f415a889b0ed0491f5576428d58b26c1365a08893c7d654eb9cca746347b53a538beb5b7ad5f40eb506438d715cd240093d2917a1fcdea1d03dd070ec0
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vhdl/vhdl-1.24.ebuild b/app-xemacs/vhdl/vhdl-1.24.ebuild
index 6eac4a1d358f..d3f895f2f61c 100644
--- a/app-xemacs/vhdl/vhdl-1.24.ebuild
+++ b/app-xemacs/vhdl/vhdl-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,6 @@ app-xemacs/ps-print
 app-xemacs/os-utils
 app-xemacs/cedet-common
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/view-process/Manifest b/app-xemacs/view-process/Manifest
index f3e723de0763..45859ab946c9 100644
--- a/app-xemacs/view-process/Manifest
+++ b/app-xemacs/view-process/Manifest
@@ -1,5 +1,5 @@
 DIST view-process-1.13-pkg.tar.gz 60814 BLAKE2B 17a6ca037baf9660aa9c01eea1b52fbf86464d5b9b17bbef3d5e7a5879e7797c2ccaac28390992a3085f43d707272407daeef3e97870be534f3b8c6b1f41a7ea SHA512 01d965b9a1646ddb340c028177487010ac5411b217ac641587d62eed8c186cb4562c7d3f70f5165891ab761df20411f819abddf55c7480cfb7e73995f0d8dfcd
 DIST view-process-1.15-pkg.tar.gz 60754 BLAKE2B 351ef7db1399db510833b6960838472507cf7516259964466a74706a04aa51327d9c4f33f5ad5e503888382d6f477cb64649c92045fb78e1f07e87eb6080bc32 SHA512 121b78ba416129175b0a047948a419f1a6ee99df8534e8b7d8215540ad56d328160dc0bd26d9a6a22c8bf855f4db2eb857c961dfdb73d63e41a614e408caafeb
 EBUILD view-process-1.13.ebuild 297 BLAKE2B 63e461e14ee5868a78eb3475168425b53e19699e7a316d35687acd7c24e14e2c6099f0501f41d375799388437af40b2bc4257513924de3753d8528d7586ceec9 SHA512 b21e00953f5aff12e9f6a59258a0e64ed8350bd0fdb3ba835b7e8a599ae4a1fb8c44dba12838c9a07ea9ca0ff277b7f7ab15ebcbf30880d84816f2a15d6f8f5d
-EBUILD view-process-1.15.ebuild 303 BLAKE2B d4c18c47044583b2060485ffbe9d58c6710637e4fdc01bbda0dd9f5140b7015823d063627ec17f3930255fdfd183bb5178fefa8293d2f80bc2d410d9949cf345 SHA512 29e1e21dedfe7a3d97caccc0634473dd3a5cc764b41ab664a19e7d2d7f9388c72f8d595d9f8f48a05f4bd76b43a9944503fed96fc2dd5604021d3145278336b7
+EBUILD view-process-1.15.ebuild 299 BLAKE2B b491ae26ff301d070d28606d0a600314b19b21a4608c78e1731aae2ddc032ffef4a6c71348a9e649dc56176aaebca2d6b9a2be942610bc973f44c81d3c6dd4be SHA512 89ddfbc5c09cd31ec099503b7f4eb2ca9c2985ddde7ac4303091c155b18b32accefb5f42503240ba1f7b755ed03c433b2b7523452088a70b9c8227d40dc1a381
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/view-process/view-process-1.15.ebuild b/app-xemacs/view-process/view-process-1.15.ebuild
index e14a44f20c60..32d6a95dc7d7 100644
--- a/app-xemacs/view-process/view-process-1.15.ebuild
+++ b/app-xemacs/view-process/view-process-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/viper/Manifest b/app-xemacs/viper/Manifest
index e6f209ab0179..014ce95e75bb 100644
--- a/app-xemacs/viper/Manifest
+++ b/app-xemacs/viper/Manifest
@@ -3,5 +3,5 @@ DIST viper-1.67-pkg.tar.gz 338588 BLAKE2B 7898bd22d5f2e1afd02d5f6b8e13338325649b
 DIST viper-1.69-pkg.tar.gz 338444 BLAKE2B a2ac50bbbb8d1c023cb6057be0437238f1c275a1297a1e729bced5a2b878e0c9bf29ef4a856b784ba2587276d78e8526d30c09b00ca4abd37191bb402a26faf5 SHA512 f2e1bb057779aeb9171b005125fff25f0672a310b6f74d8821f93c7cac97a8518657645913280c5012082700be78e38bcd313b89df6b61e596938fdc3235ffaa
 EBUILD viper-1.55.ebuild 289 BLAKE2B 24fece3f90016260ff1c5745c550d28819c835218162cbab5b358b313789c70a3f68d5c8b62beac87a1ae10d51d166dc4eea7340b985f4ea824b416c314fcba2 SHA512 bbe5b8ce69390efe80cbf60223e15515f5afab86e634100b75d140ed433db4261515037ab99cf1730dc057f61d121837b01f4b1c5687cd7848ca41970d6bec48
 EBUILD viper-1.67.ebuild 289 BLAKE2B 24fece3f90016260ff1c5745c550d28819c835218162cbab5b358b313789c70a3f68d5c8b62beac87a1ae10d51d166dc4eea7340b985f4ea824b416c314fcba2 SHA512 bbe5b8ce69390efe80cbf60223e15515f5afab86e634100b75d140ed433db4261515037ab99cf1730dc057f61d121837b01f4b1c5687cd7848ca41970d6bec48
-EBUILD viper-1.69.ebuild 295 BLAKE2B 67f95e00044a22da82de33e3f739f208d425b2121b7b378dc1acea119cbdfd9c0a195dd57cb8b0c4e9c871ab57ce5b5909342fc5a5cdd53b0960a414cffc08ad SHA512 63a481f572a1ee5ac9fbd67ad7545f3f99dfd398ddc47071f83098b4bce87514bb543d5cbfcd0dcf5660585815e9828ada3f27e630ff26365ddfd43a05dc0ca9
+EBUILD viper-1.69.ebuild 291 BLAKE2B 69f38e130fc047cfce5f3db5596db9e68d3ab61ddf82dda79c561d74bd2b74e6c007a7ac8364773a6b9325bd7c9895ffa111ab08288683599b1b209721e30607 SHA512 7cf0a75456c70c5a193e3ca332220808716880caf2ebb4b40e7c6b2170928f31808a97f10e66f5fd2633eecb5283c2cb6dd3e34a0391de1fb4c4809d2ee2f786
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/viper/viper-1.69.ebuild b/app-xemacs/viper/viper-1.69.ebuild
index 1f72f19a3460..7eb63e013f9d 100644
--- a/app-xemacs/viper/viper-1.69.ebuild
+++ b/app-xemacs/viper/viper-1.69.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vm/Manifest b/app-xemacs/vm/Manifest
index da73f7170ff5..7432b353264b 100644
--- a/app-xemacs/vm/Manifest
+++ b/app-xemacs/vm/Manifest
@@ -3,5 +3,5 @@ DIST vm-8.08-pkg.tar.gz 825312 BLAKE2B ab6d84dfc6b830c51007dacab55b1932626c1cb2d
 DIST vm-8.11-pkg.tar.gz 956105 BLAKE2B 9ad1ade5dd6542217bc9a31eb737166836e0e8325ecf44b43e6c2f86aa95db60ed15a5688cd3a5f0c010b65726547542c63c4a498dcc65f49e1f56d901de98c0 SHA512 cf687bc55723d8e57374264346399db552d4da73f24dc5a1a227f726b5f7c27a38a8ce1344fd97b22ae37729aacb3fcc18e22df14863004fd0472eadb3efa1fa
 EBUILD vm-7.22.ebuild 304 BLAKE2B 3341d6a1b6ba2bd3cdd9da2fe1689aab9746e165fbce88f615ff590bb0941121ef92cdc3a88d906eea8b6290155e47df9dcfe9a230e6b578cc0bcd612b620eb8 SHA512 e2e03151189024a0b74c40ddca7e941c11a063d58db01e18c06ecb0aec735012988bb594d507ec527aaf0aa741edbd6e1091a6a2f971f4ee0703a2f3107535b9
 EBUILD vm-8.08.ebuild 498 BLAKE2B 79b36ebb60a644976ff1faf16d9e985da3c7fb0730f9aa99eef5062a7cdc2a6a864382e05782c91a6f44b28599a2d0a6ba35505f3a4cc31f525c8952c5db2cf0 SHA512 b241ef4f2765f5a411c58b1937f81fd8af8e55f0106cd6dfe406cb15ff56f77fb17b110e29dc9d221cd9b6c673f2fbc5ba7cee8b8294945f0c7af9aeea49043d
-EBUILD vm-8.11.ebuild 504 BLAKE2B ba709423f91eceac88b66916ecb01cb2fdda9927f6d9144bb0587eb9905bf974bdca0f7410065b38d93e7a6104e1e7bb52d1663b38187e4102a008df18375818 SHA512 24fbec6a55df11e0466d42971cc025ca8d8f718a5c097bcd1bb35d13e70fe93fa4c3c263fe76e857b63a3897641019d7d69ad488d567c6bb4e90b8dd8ae2ac05
+EBUILD vm-8.11.ebuild 500 BLAKE2B 718e4a0298ace2b0ce1979ba8adc55e8a95c8579b0842b992cba375402944ce5484a64bb0202bdf380ba53d9731cf959d63d54cb4c951b6d01edce56bd78732b SHA512 6172234b63d8b64dc90b7112698e9918680bf83aa2d3c4b87ad065e508672b22d03ac4c67cf95efdb1e6b06d6910b100cff48c13ee518fe8f13759407a6f8e7e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vm/vm-8.11.ebuild b/app-xemacs/vm/vm-8.11.ebuild
index 0a656a81de8d..f6bab0f339db 100644
--- a/app-xemacs/vm/vm-8.11.ebuild
+++ b/app-xemacs/vm/vm-8.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,6 +20,6 @@ app-xemacs/os-utils
 app-xemacs/bbdb
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/w3/Manifest b/app-xemacs/w3/Manifest
index bb4c4057e763..c03620a43490 100644
--- a/app-xemacs/w3/Manifest
+++ b/app-xemacs/w3/Manifest
@@ -3,5 +3,5 @@ DIST w3-1.35-pkg.tar.gz 696392 BLAKE2B a92f46c5cc3ec4d7bb9c250a88ba417c10fe0a398
 DIST w3-1.41-pkg.tar.gz 683044 BLAKE2B 4e00bf669ec3208771c08333e9231ad596b54727277d10b0dbad8e053dffd1269c1d8559621786b4a8e9c07f598ff564d9379212cc5a1ee8a8871e08cd17e953 SHA512 e050f51644f08f8a17976c118e4dcb1a70b1b91bf26c56d7a48a0f65e1076bbb6ba54e4c36c027ede8fade2f12542cd785dc0b876247523bb4933c4e89a6ce60
 EBUILD w3-1.33.ebuild 321 BLAKE2B 04e846928c535de69f6c95e4dd8ce9cc8fb51d7d4abfe97b623fd899c8fe034b77d063f7c5c2a3b448c4699d9f34d341b2cc60c000e2a8be3d7a5a9247879c42 SHA512 7b72dcef1ec9b7b80af26e425a68fb1bf3acaedab21b920245372a42eabd2e876008b5c43eb05fe1aa62b7ad32eab1eab27aa4ed1c976979733d45ec81996b37
 EBUILD w3-1.35.ebuild 321 BLAKE2B 04e846928c535de69f6c95e4dd8ce9cc8fb51d7d4abfe97b623fd899c8fe034b77d063f7c5c2a3b448c4699d9f34d341b2cc60c000e2a8be3d7a5a9247879c42 SHA512 7b72dcef1ec9b7b80af26e425a68fb1bf3acaedab21b920245372a42eabd2e876008b5c43eb05fe1aa62b7ad32eab1eab27aa4ed1c976979733d45ec81996b37
-EBUILD w3-1.41.ebuild 431 BLAKE2B 7dcf1cd574decfa9379fe60aec179feedcb8d59f49c0e118a2d92c38409d2988bbf7857ebe36169a8d85d02414247f226bb5b908e2e70ae56bd14020e2eb4c20 SHA512 2d087ba6ff9a16bfc2157179154f58588036f83b430cf49151ea69c81c3ec298e081045230e1c2b97026c290abf9ba1155c8efe8c92f21df70af88b418173453
+EBUILD w3-1.41.ebuild 427 BLAKE2B 5e0345af8752826857a44b3382d429b723108a4e2c0e89cff1bf4b29f3c1ec5a6536521d34c1031261203780e0f2913e3b4a6883e84e6d196c2f9617bc67c160 SHA512 a058355c6cc7f335063e9ee6e07cdc37a4ebf0a5a03f2754cb578008f5581e3373e928eef6410980df5a03c6139300ca3064f94cee7acd3847e493756aa85701
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/w3/w3-1.41.ebuild b/app-xemacs/w3/w3-1.41.ebuild
index e26c08048358..6d9888190951 100644
--- a/app-xemacs/w3/w3-1.41.ebuild
+++ b/app-xemacs/w3/w3-1.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,6 @@ app-xemacs/sh-script
 app-xemacs/fsf-compat
 app-xemacs/xemacs-eterm
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/x-symbol/Manifest b/app-xemacs/x-symbol/Manifest
index a6d7d47f1310..4636014705c2 100644
--- a/app-xemacs/x-symbol/Manifest
+++ b/app-xemacs/x-symbol/Manifest
@@ -3,5 +3,5 @@ DIST x-symbol-1.11-pkg.tar.gz 684579 BLAKE2B 46915c56133ba3232821ab75ec497b98457
 DIST x-symbol-1.16-pkg.tar.gz 683912 BLAKE2B 7fcaed893d8121cf80970e1bf1219d2a6641e44d88887929ec541a6a6dd4e6d21831f8f886a4b1e47a7e584bd70e26ccf7c143233d141c19b33a802aeda2e84a SHA512 435f8903abe7028a4ea9e95cc0d69ce7ac3db25469df00f71eba868d2d2dc8eea92fb468c056043a9fef9fa716b03466e72af704ea35bc357c29230d59c1db54
 EBUILD x-symbol-1.10.ebuild 364 BLAKE2B 6b6adf09a8d71ee9bdf6a80b702cfee67af4ce3b47201a3bbf182967fbcc668ac0043cd7a0b929cdff46b3014bb9bc6a0da03912449e54059d0b3d92b06b61b3 SHA512 bb34ecc190e6281915e82e2a5f0922646541a09dae2c6ba25695e3ee6b2d37d8d73fbec48ef62c6dea38963927756c722e62d63b463e8a84bd1f0b59761b8ebf
 EBUILD x-symbol-1.11.ebuild 364 BLAKE2B 6b6adf09a8d71ee9bdf6a80b702cfee67af4ce3b47201a3bbf182967fbcc668ac0043cd7a0b929cdff46b3014bb9bc6a0da03912449e54059d0b3d92b06b61b3 SHA512 bb34ecc190e6281915e82e2a5f0922646541a09dae2c6ba25695e3ee6b2d37d8d73fbec48ef62c6dea38963927756c722e62d63b463e8a84bd1f0b59761b8ebf
-EBUILD x-symbol-1.16.ebuild 370 BLAKE2B 0cd9f97171202b8a04d50de54f82b693b2f06f2933022f8c84211404a3b97b01b1a0ee698ae184aac6aebece2be5fe32cc444eb3dca3a9ec02c8546be0cd30a5 SHA512 3152aaacdf2a62d913c906aeb69984d505b62a349df88768418935c009dcea8e5d471d60dff9928729aa14f62b9066e445038829840f36cc38733930daab4b37
+EBUILD x-symbol-1.16.ebuild 366 BLAKE2B 7e27eacdb229e3e4c134e3c1683a464375ac8a6b8923fa1740aa42d0f7dfb05b3da2d7aff6572b19ef098f8fe0ec4381eb4dd8f9638e472aa8d2cf66404dd8a7 SHA512 d8733aabf7321d3a8db48901076e3ea23738fef5614164d13bc7194288d66e07edac73d5a596252a626d66d58551730f10fcd963759b5d3c650b7b23ea4e807e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/x-symbol/x-symbol-1.16.ebuild b/app-xemacs/x-symbol/x-symbol-1.16.ebuild
index 9542605c8d37..2b54fee44ba0 100644
--- a/app-xemacs/x-symbol/x-symbol-1.16.ebuild
+++ b/app-xemacs/x-symbol/x-symbol-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/auctex
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-base/Manifest b/app-xemacs/xemacs-base/Manifest
index 7d9244147c87..3af84b91da44 100644
--- a/app-xemacs/xemacs-base/Manifest
+++ b/app-xemacs/xemacs-base/Manifest
@@ -5,5 +5,5 @@ DIST xemacs-base-2.46-pkg.tar.gz 581493 BLAKE2B 096cd02bd906d6d382dcdc1ccf8d5ec1
 EBUILD xemacs-base-2.08.ebuild 298 BLAKE2B 2438d556418fb82a1c65e5e15b9ab7317d15252981cf6bc9030fbb0f20f801eba089387a91f6284cef1bac3b03d1a308f02ee7be4c83da093c949247e916aa72 SHA512 b8ee0b44e5f31ba74544144c91969193b4ef1b8c754575a98e1156b696ea5a442ed35e2da6e06a470ad3b1c8401a0c6b9ea01b84931cbad050ee2c1d6435dff6
 EBUILD xemacs-base-2.10-r1.ebuild 299 BLAKE2B efa783ea14cd8cd8866f142192109bc8885e2a0f465b4cb9955b5e90578aa77e43fcde7d8dcf5fc012d5c9f7e42820649f5a320853c68390248a80efa8f48db7 SHA512 e891ad50ea2d62de9ccafaf4df35fd96a6f87720549ff41ac7302a621d54a91dbee1f25748ca95c9db7e3d02685ff6bd4a6f36fdbd35cd0f92f64427e1909354
 EBUILD xemacs-base-2.27.ebuild 317 BLAKE2B cde62bbe910655f291d7420f1fa8794bc4d1570c94d26c39dbfc880a2dc3e3312c66748df7c0e454d226439238975053e067d86d770c7d0aeeb80e073cd3a363 SHA512 6dcee61615c40eed6fe952e477709739f8016a42c9002e7cc5e6f5d673369909881f54b20d67b349fc16f3fc63c9e5d3da60c93ea68a1ccc86facf9a236ed799
-EBUILD xemacs-base-2.46.ebuild 324 BLAKE2B e48d2797108451789c68c7e86e692f96c9a68ed90c498e38003427ec2dc0b690d38cb4c63a4879d3294d598a755fad9067c0a992a9d97567ecf514ad54e7e838 SHA512 e5f72b2161830c262c5f6041e41e4fd4d186615d68f2e98867faa086e093fbc3f9fc48a0ca6ac400a90cf0e1bcc0411ca4e8fa13a9c012ecac9717feaa83ccfe
+EBUILD xemacs-base-2.46.ebuild 320 BLAKE2B a33f6b152e8b5f331e376b69c1aac42cd1a3cd2a5b13b0d8b9d4c022289c1c71bcc8812e5e7ef50e9e5808953a6e030f4ea81299dfab28117bfe932f5dd8d620 SHA512 898711821725a0c0f9968a14b4c4d4448c30fb6610512d3d0e68c19b503578995c885aa043e3b7f130c7fdf49b26c2bf86959e460ddb987a4aa96b07536c1214
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild b/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild
index 615f67c6daac..eb32fb5f7288 100644
--- a/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild
+++ b/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Fundamental XEmacs support, you almost certainly need this"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-devel/Manifest b/app-xemacs/xemacs-devel/Manifest
index 49f952f7c376..a87c78db6085 100644
--- a/app-xemacs/xemacs-devel/Manifest
+++ b/app-xemacs/xemacs-devel/Manifest
@@ -3,5 +3,5 @@ DIST xemacs-devel-1.80-pkg.tar.gz 257410 BLAKE2B c678554fac620d56b687611e56ce7ca
 DIST xemacs-devel-1.84-pkg.tar.gz 257545 BLAKE2B 8fab5099be409c36b1f72daa4fbc57648fc6c40f5abfa686c029135fcbcc46cdf123ba35e11bfca1f4d1804d303005795cd6f52265dd060cd28afff1a56313c2 SHA512 eb20fe3fcca45b9feda2d70749c8a5af1936bf9a94d41b9a96ef83968b7f85ef9b9bd5121aecaafef59cccb6fb2e29a09ff0a7675a7b786909d86e59a6aa2005
 EBUILD xemacs-devel-1.75.ebuild 490 BLAKE2B a765e652abe813ccdedcda2774c88e9049b467e9e27b43a3585507c57e3f2e142d93dd57500b9a8469cc7fa7132e01173ab977e2da7d26352030be7deb793549 SHA512 f4e81cc060544a73e664e2f4e216b923e91cf7470f2a9ebb5a702f86bb49b3911347468b3f089f0a319346e6518dbe75d5ffb19a9b59ae1f94da69719d951645
 EBUILD xemacs-devel-1.80.ebuild 490 BLAKE2B a765e652abe813ccdedcda2774c88e9049b467e9e27b43a3585507c57e3f2e142d93dd57500b9a8469cc7fa7132e01173ab977e2da7d26352030be7deb793549 SHA512 f4e81cc060544a73e664e2f4e216b923e91cf7470f2a9ebb5a702f86bb49b3911347468b3f089f0a319346e6518dbe75d5ffb19a9b59ae1f94da69719d951645
-EBUILD xemacs-devel-1.84.ebuild 496 BLAKE2B 7130f87791b3079336776c82e13f90a2bd830fd5d0f7e170fd5321c50855da0edbb50a921f5a1536620cc9a9992839f0230e1c1de59135352273d89bad760bd9 SHA512 ce3bec9a24f4bda6b3cbb1db80b2422f43a5dacafc3b379b70a5795f0340a4dd77deb3c1cf833ca6b4416ecd9cd9dd543666897bb777516e1adac2edeb452aed
+EBUILD xemacs-devel-1.84.ebuild 492 BLAKE2B 72141da67368b23ee737867a3e67e686d236e66743ee54368fafe734059f1432e57d8a5be655d8b8777fa83f52ff77520dbef5432ef102a11b90ea28dc6b7c1f SHA512 0dd0ee38cc61e903da24c9ab5203c3a1372bf278252645d7679199b13244f78e1c7fbeb3f8672731c0451dc2c77aa7c9e1b5d2e85e6c48d30823cb9295943937
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
index de7348dc5b2a..06263c103a54 100644
--- a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,6 @@ app-xemacs/net-utils
 app-xemacs/xemacs-eterm
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-eterm/Manifest b/app-xemacs/xemacs-eterm/Manifest
index 79dcf26a7e59..cd2429e88083 100644
--- a/app-xemacs/xemacs-eterm/Manifest
+++ b/app-xemacs/xemacs-eterm/Manifest
@@ -3,5 +3,5 @@ DIST eterm-1.18-pkg.tar.gz 116169 BLAKE2B 2fdfd0575c9df55eee88ac14009518106af175
 DIST eterm-1.20-pkg.tar.gz 116176 BLAKE2B 953a801d761560e0a81de726d4b83e1b00c686360ccd66b7f89af190f154d0f563060ade702b8a63dcf68f885827e54ba15121e90a204f5dd108156c4dc458e8 SHA512 67d81b39761948d548fcd4fce200376702ce1884deb817c16e2db59c7eb3b571c60663ada91082433e08b42fedf62d07e31abd0f377cc4e44352398e826c7268
 EBUILD xemacs-eterm-1.17.ebuild 376 BLAKE2B 9e23269f6bff9b1ffbfe09e97a0c7d924159d7ba6a612c6cfb07c46c284ca0fca0db6ad321019698e7cd2d507d1dde80f1f6c49af59cc318f0e62bff8ecaace3 SHA512 05a34244ebd4ab43661af61c2d5fea28aba5c6a7d0c04e1938fcd52b1917f08de31a70ab009ad30eb17194b686c2370a2047a400a859e10f2af4692cd115e9c2
 EBUILD xemacs-eterm-1.18-r1.ebuild 377 BLAKE2B e1c740afb56908be358ef05bf0a75d9e81721e2eebff99276c68e950b17e366bb3500415f9cda18333c80960981776510283e73d040c66f3d82dda517b437251 SHA512 2d7bd3d9e591c8e3c2a5042e4d0edc840ab097b167177accd72470440b771927c5f78d648131d30c17cef84defaf32fc83ab91d9ac6245e05738bc5233e738e4
-EBUILD xemacs-eterm-1.20.ebuild 395 BLAKE2B 9bffeb98831919b74996b5246b59a031d12585196a4bdd258138e134f76637d88110bddced2b8e2f16b5acd0b1fcdc41f468aa3fff6f12e801d616c5b67dd848 SHA512 2e628c8661132dc730fce14a60716950e5533205f6c34a24778d8d20a9f26827fac3ab1b4fe42e0fd94cc51299867965bc5508f55f81362db23004ef6d666722
+EBUILD xemacs-eterm-1.20.ebuild 391 BLAKE2B 97e0f5759cae587dd9bbb933d03680b58b6d8ed959e37487306655632d2e08d648acd244360553ec46618161fb28f085d2adf2f2a90a06df9b868fe5b405e9e9 SHA512 41771d93ce5f97882cfe04fb7070546790b319d89aad81af6688696bf64f48d97e99a093c528e89f35c4a7b39529dae866c1fd1541ebdef8346ee85dc28cc93e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
index 65a4f592c0d5..d9689cf12663 100644
--- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
+++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ DESCRIPTION="Terminal emulation"
 
 SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="app-xemacs/xemacs-base
 "
diff --git a/app-xemacs/xemacs-ispell/Manifest b/app-xemacs/xemacs-ispell/Manifest
index 17b2356180ae..89368183125f 100644
--- a/app-xemacs/xemacs-ispell/Manifest
+++ b/app-xemacs/xemacs-ispell/Manifest
@@ -1,5 +1,5 @@
 DIST ispell-1.32-pkg.tar.gz 83587 BLAKE2B 80c65a5bb22711c6690ddef1213d60b5f6cca8d5fe342267e931294a10a976c9f3a50e6ba2d539720e460a25779363c954aac37b4c413741784251849fce0785 SHA512 02108c33e5611ecd4ce6c574fcb12a93d3c8753079925c624ae3b155a6b13efaef581c468e311e7aa1f85e0a032cebf2a466ce8e5a9647be0b748251c3dfc070
 DIST ispell-1.37-pkg.tar.gz 102787 BLAKE2B c77034361f9ac9e69b51e2a17db78e675acfa5f55a25dda453d2612558ca0b4a1c2fb9b57fde17e2550a7ee4f2a8187a8983766f2e0282ce2fb793e13ab619a4 SHA512 6896c5fe7b9a10d3e11103dde8dbe7a23446c969a2af8e99815d34f621227076aa57061ebca589a3cd5decf5bf47a8c34ecafc73fe13f5310874edfbbedb8c8c
 EBUILD xemacs-ispell-1.32.ebuild 371 BLAKE2B 8952fd46aed549fb8a0f852a76fcdadf0feeb9994dc4b16e710e9b1b6356df503c7b38ddcd905602810dc5846bf398b4d804ed58dbb59951d6747269da676021 SHA512 bcdad13ea3de590438808801a454c7c948e2fe489e50431f9510682dfbae3638879951a5500ee5a58c6fbe6e84437a7c99149691f41f2d87bf82c68422ffc6d0
-EBUILD xemacs-ispell-1.37.ebuild 389 BLAKE2B 443e0a3e7e391f90cb5eadadbd574fe2a4e13aa6547c18df322e0d655d97cca8136d29811b2bb7a3e1c5474eb965e68577200a22022133be472e16c837be9d9e SHA512 de9da74c47093f7eb333160f93a2fcc3585d6d74a7163598b96e558181373fe5ff11ee7db25c24235d9e74e710e8a81d2d8fc5e71ceb45343192a784ecfefea7
+EBUILD xemacs-ispell-1.37.ebuild 385 BLAKE2B b1150c757b0f464d19154f205078bf55dac67c9131c594cdf6ce4289784052122ffc8b8c67e9c631c2b02e43c1286a4f4afb5070ffa0fa470461577530e42ed7 SHA512 4612f3b614d0560e0963907f8ffdba0f9fd25cc74aa0d66e1eba0fee19d0df2ee27d0b2a0596419c595328091e5f7a5a445de1bf5820103d24cf8c8d47aea78f
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild b/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
index 415a28f17d60..8e654f12ad35 100644
--- a/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
+++ b/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ MY_PN=${PN/xemacs-/}
 SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
 
 RDEPEND=""
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-packages-all/Manifest b/app-xemacs/xemacs-packages-all/Manifest
index cc37489a830f..774ce5a3f0d5 100644
--- a/app-xemacs/xemacs-packages-all/Manifest
+++ b/app-xemacs/xemacs-packages-all/Manifest
@@ -1,3 +1,4 @@
 EBUILD xemacs-packages-all-2007.04.27-r1.ebuild 3677 BLAKE2B 1de81b1dcc451288572169d759f4ef117a6f74df5ce9b7ffab2d85cb7568e73cbacffb38e36f2405cba0f745511d1d268e5d9c0f3cbeb5748f0323213b453b16 SHA512 43b96eef5984f77199f6c91a2760320037564f45982f9ba25730ca176b40e01220dcefd16c1f4c6dbfcee3ecf2c6db7c4288cbb939f5be57ca0268949f80c4bb
 EBUILD xemacs-packages-all-2010.07.29.ebuild 3789 BLAKE2B d3fa5aa3ee1cc3d90eae67031bc8d4f45f3f84f7d8e9413729d96b2fa97168d2b965927073a11b1dfc22cef375bec75b5fd4bb3c97bf7d116bfbdc2fb33fa3e7 SHA512 ce4c7079aeeec6f76fabaa7a6c384fad28bb2d64e93dd8e271a882abba1149f083f014bdd5835c878ba21eb01b10a747a683b3212f8785cdea16293d627cd01d
+EBUILD xemacs-packages-all-2018.08.11.ebuild 3756 BLAKE2B d6b9229990e30c0a6ec46c1575a892e175f812920a4079fb7ba70e66af7045b769daeed31532d094d0e7f1b86a76ef253a6324cb0165d685af9f5d61fac52331 SHA512 574528368e77c0b7742f7e55eb8b4e3a70b55469434d8f15491fdf64421c56a3762072254d5409a589e36ec994f47ffef62b04c6bc40a91296c31ce4e1bff975
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild
new file mode 100644
index 000000000000..aea14a7e95a0
--- /dev/null
+++ b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Meta package for XEmacs elisp packages, similar to the sumo archives"
+HOMEPAGE="http://www.xemacs.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mule"
+
+RDEPEND="
+	>=app-xemacs/ada-1.16
+	>=app-xemacs/apel-1.36
+	>=app-xemacs/auctex-1.58
+	>=app-xemacs/bbdb-1.34
+	>=app-xemacs/build-1.18
+	>=app-xemacs/c-support-1.24
+	>=app-xemacs/calc-1.28
+	>=app-xemacs/calendar-1.42
+	>=app-xemacs/cc-mode-1.99
+	>=app-xemacs/cedet-common-1.03
+	>=app-xemacs/clearcase-1.12
+	>=app-xemacs/cogre-1.04
+	>=app-xemacs/cookie-1.17
+	>=app-xemacs/crisp-1.17
+	>=app-xemacs/debug-1.20
+	>=app-xemacs/dictionary-1.18
+	>=app-xemacs/dired-1.22
+	>=app-xemacs/docbookide-0.10
+	>=app-xemacs/easypg-1.05
+	>=app-xemacs/ecb-1.25
+	>=app-xemacs/ecrypto-0.23
+	>=app-xemacs/ede-1.07
+	>=app-xemacs/edebug-1.24
+	>=app-xemacs/ediff-1.84
+	>=app-xemacs/edit-utils-2.58
+	>=app-xemacs/edt-1.16
+	>=app-xemacs/efs-1.37
+	>=app-xemacs/eieio-1.10
+	>=app-xemacs/elib-1.15
+	>=app-xemacs/emerge-1.13
+	>=app-xemacs/erc-0.26
+	>=app-xemacs/escreen-1.03
+	>=app-xemacs/eshell-1.21
+	>=app-xemacs/eudc-1.43
+	>=app-xemacs/footnote-1.18
+	>=app-xemacs/forms-1.17
+	>=app-xemacs/fortran-modes-1.07
+	>=app-xemacs/frame-icon-1.13
+	>=app-xemacs/fsf-compat-1.24
+	>=app-xemacs/games-1.23
+	>=app-xemacs/general-docs-1.10
+	>=app-xemacs/gnats-1.19
+	>=app-xemacs/gnus-2.04
+	>=app-xemacs/haskell-mode-1.14
+	>=app-xemacs/hm-html-menus-1.26
+	>=app-xemacs/hyperbole-1.22
+	>=app-xemacs/ibuffer-1.12
+	>=app-xemacs/idlwave-1.34
+	>=app-xemacs/igrep-1.18
+	>=app-xemacs/ilisp-1.38
+	>=app-xemacs/jde-1.54
+	>=app-xemacs/mail-lib-1.84
+	>=app-xemacs/mailcrypt-2.16
+	>=app-xemacs/mew-1.22
+	>=app-xemacs/mh-e-1.35
+	>=app-xemacs/mine-1.18
+	>=app-xemacs/misc-games-1.25
+	>=app-xemacs/mmm-mode-1.08
+	>=app-xemacs/net-utils-1.61
+	>=app-xemacs/ocaml-0.10
+	>=app-xemacs/oo-browser-1.07
+	>=app-xemacs/os-utils-1.44
+	>=app-xemacs/pc-1.30
+	>=app-xemacs/pcl-cvs-1.73
+	>=app-xemacs/pcomplete-1.08
+	>=app-xemacs/perl-modes-1.16
+	>=app-xemacs/pgg-1.10
+	>=app-xemacs/prog-modes-2.33
+	>=app-xemacs/ps-print-1.14
+	>=app-xemacs/psgml-1.50
+	>=app-xemacs/psgml-dtds-1.05
+	>=app-xemacs/python-modes-1.16
+	>=app-xemacs/re-builder-1.07
+	>=app-xemacs/reftex-1.36
+	>=app-xemacs/riece-1.26
+	>=app-xemacs/rmail-1.16
+	>=app-xemacs/ruby-modes-1.07
+	>=app-xemacs/sasl-1.18
+	>=app-xemacs/scheme-1.22
+	>=app-xemacs/semantic-1.23
+	>=app-xemacs/sgml-1.13
+	>=app-xemacs/sh-script-1.26
+	>=app-xemacs/sieve-1.20
+	>=app-xemacs/slider-1.18
+	>=app-xemacs/sml-mode-0.14
+	>=app-xemacs/sounds-au-1.14
+	>=app-xemacs/sounds-wav-1.14
+	>=app-xemacs/speedbar-1.32
+	>=app-xemacs/strokes-1.12
+	>=app-xemacs/sun-1.19
+	>=app-xemacs/supercite-1.23
+	>=app-xemacs/texinfo-1.32
+	>=app-xemacs/text-modes-2.06
+	>=app-xemacs/textools-1.17
+	>=app-xemacs/time-1.17
+	>=app-xemacs/tm-1.42
+	>=app-xemacs/tooltalk-1.17
+	>=app-xemacs/tpu-1.16
+	>=app-xemacs/tramp-1.57
+	>=app-xemacs/vc-1.50
+	>=app-xemacs/vc-cc-1.24
+	>=app-xemacs/vhdl-1.24
+	>=app-xemacs/view-process-1.15
+	>=app-xemacs/viper-1.69
+	>=app-xemacs/vm-8.11
+	>=app-xemacs/w3-1.41
+	>=app-xemacs/x-symbol-1.16
+	>=app-xemacs/xemacs-base-2.46
+	>=app-xemacs/xemacs-devel-1.84
+	>=app-xemacs/xemacs-eterm-1.20
+	>=app-xemacs/xemacs-ispell-1.37
+	>=app-xemacs/xetla-1.04
+	>=app-xemacs/xlib-1.16
+	>=app-xemacs/xslide-1.11
+	>=app-xemacs/xslt-process-1.14
+	>=app-xemacs/xwem-1.26
+	>=app-xemacs/zenirc-1.18
+
+	mule? (
+	>=app-xemacs/edict-1.19
+	>=app-xemacs/egg-its-1.29
+	>=app-xemacs/latin-euro-standards-1.11
+	>=app-xemacs/latin-unity-1.23
+	>=app-xemacs/leim-1.38
+	>=app-xemacs/locale-1.30
+	>=app-xemacs/lookup-1.17
+	>=app-xemacs/mule-base-1.60
+	>=app-xemacs/mule-ucs-1.21
+	>=app-xemacs/skk-1.27
+	)
+"
diff --git a/app-xemacs/xetla/Manifest b/app-xemacs/xetla/Manifest
index c9ded4ed4d1f..7acb0c936e09 100644
--- a/app-xemacs/xetla/Manifest
+++ b/app-xemacs/xetla/Manifest
@@ -3,5 +3,5 @@ DIST xetla-1.02-pkg.tar.gz 294986 BLAKE2B fd586413dd9836987fb429e669bebe72117f10
 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
+EBUILD xetla-1.04.ebuild 519 BLAKE2B dbc10b6f59456b8f0e2891713e4e4274151fd73648173aad2136987129a300fd088b60ff4f0c0bb2a1c5deb3796c58e873f6776c2492f02eee07ec5a5742516c SHA512 fa9f395f6954646b83cd5503338ebfbf9c51dda1bdab789af148b87a2996eda2f0b3ad975a0a66ce29a9f415076c8d191e46c8ae6fc0c31eaf24e7e124e846c9
 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
index 41589f7a7ca4..edaf51f2a017 100644
--- a/app-xemacs/xetla/xetla-1.04.ebuild
+++ b/app-xemacs/xetla/xetla-1.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,6 @@ app-xemacs/mail-lib
 app-xemacs/dired
 app-xemacs/prog-modes
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xlib/Manifest b/app-xemacs/xlib/Manifest
index f3f66340e9cb..d566b78fe132 100644
--- a/app-xemacs/xlib/Manifest
+++ b/app-xemacs/xlib/Manifest
@@ -1,5 +1,5 @@
 DIST xlib-1.14-pkg.tar.gz 205806 BLAKE2B 87c98668972496db0950181354633409a1416a5a20e4764913b5b0ef6c99e3fa487ec67f2b460b60eecb2358b1ba6e9bb532fbae53036ecb5d73b07eb2b483c7 SHA512 ad704e10cfbf8fb01ab56666c47b58a0acefda615dda2d63b56c2416b023737a23e7b748f752b11336e2379271e84e1731db7e72274930ff82c16ed00921a0e0
 DIST xlib-1.16-pkg.tar.gz 205431 BLAKE2B 50f5e46555710d1425873bb3c1e3215b4cbd28b49cb3a6f63e0c3a3f1b7234c613567c46041f46a015e761191d9079b7f3a8658ff7b7adf7ea3837a6059e3dd1 SHA512 ce5ab77d6ceaed84f658544d3e9e158254db26165500834c6f01e2bf341ea306b0c94b46c7361e4b7f923685d390ec40bd16ad0ab18cd7a1ff219221d9fdf4d0
 EBUILD xlib-1.14.ebuild 296 BLAKE2B d335e4b96e99ffe55ef6608c226b3b8b545442853160884d59f0f57afbe7d435fe99d3c9195e65f4ab21c10838904497f9152e53ecaa0d6d4a666aa4b215e4bd SHA512 e69d1072be5f6b4be30f783f860a7aab4f8f16cb8a3ee7a2e175b26d4361dac1ef6a0d7f3cd806d1866ebfbb6c214293e8ccd947f7ed0f39a0539aabc52de651
-EBUILD xlib-1.16.ebuild 302 BLAKE2B dbeeec2b981e20c9d394cc3a2d12480a03fad77e5dbcb5998bbfbf33a474616712fd0fd7bb17b97a08f39e9361adf301d92a494445d714cfe7918c1a13b0fb49 SHA512 06849a7a24246d58d4be1931b850ebb5362cc3f71af547d8f3a018b044685e160a421ea347255eb9b7ce1748f8ad1f97fa49682ce7264b20386efd8f42c34754
+EBUILD xlib-1.16.ebuild 298 BLAKE2B eff79141e2f4062dea5d38fb4acb0222f279a4b9311801df66fc20b1763e74ded0360e77e8b7769f0e4f96fa743181c775b854e90959ad66462f06a5a42acfcd SHA512 a93d584fdf9a0292684d186f81d9163e60bfa83a0eb4a9936c0743dab44f42130844bc0b7e96c78702c32b26a046dc8a5d0794f06431b806b925e082b638c5a3
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xlib/xlib-1.16.ebuild b/app-xemacs/xlib/xlib-1.16.ebuild
index 302808dba289..4eb7e9ab98e0 100644
--- a/app-xemacs/xlib/xlib-1.16.ebuild
+++ b/app-xemacs/xlib/xlib-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xslide/Manifest b/app-xemacs/xslide/Manifest
index edbf1f32ee61..3ed92626bbcd 100644
--- a/app-xemacs/xslide/Manifest
+++ b/app-xemacs/xslide/Manifest
@@ -1,5 +1,5 @@
 DIST xslide-1.09-pkg.tar.gz 39199 BLAKE2B bd8cdfec35c9f7e309e51639958c15ffdbe0ed99a720f0dc3c001d1bda5904de914d075b65eb25ec0151d8b90260c2b1baadab2939f3d1c90f319461f9c2e4bf SHA512 2844b1d71b9a9938443d550e8a9dc5eb53932d92695839dd20d633dd5f0ab4448a08ff10f228d7b63380df6c367f27a236dd91e203d7cfe4b0632bb0639e6553
 DIST xslide-1.11-pkg.tar.gz 39204 BLAKE2B d333a427aff3532c6c04eb18de7d171c0f3737ee6c73f1ee33ff6967cab5e8ebbe30d12a0e12c63ceedbcf0a883cb4fb67328ccb33ef9ff99d3c880f7d0a05a0 SHA512 fb47d139bf61c632ea14aa9458c307a02cd4f2c70d69732c7d27d2247f70d338719525931d83dd9527669bd451c1eca8f92ce8a2c77f332d56ff64b979e1d513
 EBUILD xslide-1.09.ebuild 333 BLAKE2B 3384b027407bb7b2dcabb08ae56ca8ecabe21820b5d0fa3574c93bb0cda43f5fb99303608fa0487c98b6a51d53f6879e6e5a3ca43ed362b5d0f1f32d533995da SHA512 b924cb00a99f48edd86ded3234670f37fc3fc22c027edff37516dddb961ad086aff963365ade79ccc69cda6db9b8b8fe61a2986f5be320a9994de982e5d61e8c
-EBUILD xslide-1.11.ebuild 339 BLAKE2B b1546d00a4c9daa5498096aa996d4adf98e8823355b7b34b4959128a14545b6139019e7c01d06585abf24ed18be9b1f84e49e501ba23c86f5da537bab444b3ca SHA512 1ba61851df01b7f2359fd0c445c93c7be94f77c98e3c180eb470f56986ac0ecb133e8eaa38e2aca010653cf0d33919a943f270951a0b5351b4c125e91b269f9e
+EBUILD xslide-1.11.ebuild 335 BLAKE2B 51caabf0a0e78bbeffb1a924431223be0730e605fb79b765b630d18d90849924c9f4157d194c89cd034a590bb66fec5ee441097f22ea219d32790c2ae2cd255c SHA512 f6ed1346dd62000e6e74b5c1c4ff5b8fb70fc26c23b02f8a63e28eb71413b6a414d8df6d0860cf6b967acb134e5565035277a056f8a78ab500d6afb170ceda34
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xslide/xslide-1.11.ebuild b/app-xemacs/xslide/xslide-1.11.ebuild
index 89b7910cb350..0c1d5d766e45 100644
--- a/app-xemacs/xslide/xslide-1.11.ebuild
+++ b/app-xemacs/xslide/xslide-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+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 8096cc33993d..e42be7ea8c86 100644
--- a/app-xemacs/xslt-process/Manifest
+++ b/app-xemacs/xslt-process/Manifest
@@ -1,5 +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
+EBUILD xslt-process-1.14.ebuild 595 BLAKE2B 6f7f89a4750921e4c03aed2422025979f948d8d47d9b8038e929b646b65f0367703a2cdcf180fffdc610e6a8bbdb3130a6a18d3783c4bc1804ecca67a7d9fb30 SHA512 4c17d1fd48cf746d0cf511dda3c58f92cc48d17397148005971d503623ac146bcc1ee2648b02af16f060b3570b14934f33332d7b9c6a72f34c3cdd684c382600
 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
index 6efa16573923..cbbf7fde0c3e 100644
--- a/app-xemacs/xslt-process/xslt-process-1.14.ebuild
+++ b/app-xemacs/xslt-process/xslt-process-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-devel
 app-xemacs/os-utils
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xwem/Manifest b/app-xemacs/xwem/Manifest
index 624eeb24fb50..376187d838ac 100644
--- a/app-xemacs/xwem/Manifest
+++ b/app-xemacs/xwem/Manifest
@@ -3,5 +3,5 @@ DIST xwem-1.23-pkg.tar.gz 649490 BLAKE2B 1d31ae12ffda979da37872a1653709f80b89653
 DIST xwem-1.26-pkg.tar.gz 649043 BLAKE2B b644127e233b0c93816687d992f54a2c3cbbb822100d4e56ca088ee9d05306a1a14ff602ddfdf5ea1ed822813df4df6bd6dc802d5f27b670bae86ea61eca742a SHA512 00783faa899bd2f3da8128339c54b677843bafb30b8c1a5fca29709de31448aa29a91bf62affbbe42981a97a8ec7ab807b8ee0b64642c73e6a2fda412213eb0a
 EBUILD xwem-1.22.ebuild 457 BLAKE2B 869e50a55bc9d400af4b3d431f43d6128468e3442f4f10a15f48ee6bd01f326588f663c47e781201f62d07d7d44336b1a56c4953703deebb6733ccf3c6f5f2ed SHA512 a382b6018b4b8e7a282596f38f70c3d142502825c9000212e271971989203712be08faf86cd453bbb9d3378b3050a398e33744bfdace27fb0d60bacba8365a00
 EBUILD xwem-1.23.ebuild 457 BLAKE2B 869e50a55bc9d400af4b3d431f43d6128468e3442f4f10a15f48ee6bd01f326588f663c47e781201f62d07d7d44336b1a56c4953703deebb6733ccf3c6f5f2ed SHA512 a382b6018b4b8e7a282596f38f70c3d142502825c9000212e271971989203712be08faf86cd453bbb9d3378b3050a398e33744bfdace27fb0d60bacba8365a00
-EBUILD xwem-1.26.ebuild 463 BLAKE2B f9bde9920ca1317958a25ba6afd399456a715bc66b66a3c4d6e62568de5c25aca1ada117886fd4a35fe321f4efeb16fb17b41850a6c2895d22f14bce74fb70df SHA512 a1fa117c4d65f6f6d6c26377aee904331680c624e39798d9316e04ea59bd407e4d1de1b8cd3a479689d0a4139263ca0c055cd1713fdf392a8e08332d2a5ef952
+EBUILD xwem-1.26.ebuild 459 BLAKE2B c7a8680a208ed0e330407c6beefc3113c8b7286750366d1e0354d1fe4c286137556365d7272a6ff6e08026515dc7c998d3fe77ff2e916788265c5f3bec5c636e SHA512 909d73d0a754b428301e4e39fb016f6f5f936af26a3888ce293140967174da06693ea33dab2e4a6ad3f95e722d0199171a54a0f3b803a7f788d3c69f500ce0fb
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xwem/xwem-1.26.ebuild b/app-xemacs/xwem/xwem-1.26.ebuild
index 9eab91059292..3d107b8b1da6 100644
--- a/app-xemacs/xwem/xwem-1.26.ebuild
+++ b/app-xemacs/xwem/xwem-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,6 @@ app-xemacs/elib
 app-xemacs/ilisp
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/zenirc/Manifest b/app-xemacs/zenirc/Manifest
index c96af5abc115..6187c373bf65 100644
--- a/app-xemacs/zenirc/Manifest
+++ b/app-xemacs/zenirc/Manifest
@@ -1,5 +1,5 @@
 DIST zenirc-1.16-pkg.tar.gz 277377 BLAKE2B 9d4bbe33bfa82ad1eb06ffdedb73e3eb52fe43a1eeb1b2da8692b877207a8e28a43d345472f67812b8531eb0222c17f9b99a40e3ad4bcaf14820dbbd377afd63 SHA512 2fd93791a94682bd26a2133a9a10b13587aa5a5d0b9a559c9589153f3132810c86d5fd7c6b607f2b777f22edf3aa4eab61d47ca161e0c2bf8b4a6f43ced2a07c
 DIST zenirc-1.18-pkg.tar.gz 277811 BLAKE2B ab8e8ca711b04db52dc4139bd4f75cf661267d3fa629572960c07e1c0e5537e824f6179e8c3b252bd78315fdce043e97c2cd03dd7adfd014c017c18a6be47fad SHA512 f4440d02b65aff416dd8c6064e678c365cf2137e94ef2a701c4b5459612b295d35b14f93097cc896787d1d5b74e418e5326ee41eb0edfedd08e00c7e56d5546c
 EBUILD zenirc-1.16.ebuild 263 BLAKE2B 5bdcd2ebd6df48a91c82fc4f2b5b10762c02c31324f0bedf35cb2d5052b27717c515ea669c1c31e35dbb0b62be9cec59226602259485617971c031687773f6a2 SHA512 0a4ca81c63970ad7bd660875a95c1e10e5f6c1c58de441d86dbc63ab694f16115ff15ff984eccd727f2aceaed9c63f1a75ad3c2a7aadaad57a562447653ac37e
-EBUILD zenirc-1.18.ebuild 269 BLAKE2B 3e50b9b80c16c5fc79c5477b258541b4b72c12a686ef3663e9fe6449220dd8a6b27d81a30080e26f4b7b24a66f40424c9631e6db1c7daa678da0b9074caa9a1c SHA512 cc850fb3b520bdd5e219497934be21d995b294633df0bcf1f44fabedb19b64172dd8bf1c0a23a0f885f5413e8a6f3626a22dff3b2d50bf1046e0f161a183b32b
+EBUILD zenirc-1.18.ebuild 265 BLAKE2B b51b24aa280e3f26eed1c0dff74a2bfb99db31f11bdf789eb6c30833685d44442a23ebd2b5b92417182e118a0d0ce054895f62ebb9df09fa2af16c03111d8281 SHA512 38a6219802c0552c9a4a23747b4478efb5f19b9c002f65a2a13bc6da7bed3451460cdfae0a39a9827d58cdb26210366418f18a4c7d5718fc6fbadd93ac094126
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/zenirc/zenirc-1.18.ebuild b/app-xemacs/zenirc/zenirc-1.18.ebuild
index f06962cf26a9..476764dfbcc1 100644
--- a/app-xemacs/zenirc/zenirc-1.18.ebuild
+++ b/app-xemacs/zenirc/zenirc-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,6 +8,6 @@ DESCRIPTION="ZENIRC IRC Client"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 026ebefa1693..2ba8aa90cfa3 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 8e3b8ef0c2b5..2a3623f00c8b 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,4 +1,4 @@
-AUX gnatcoll-bindings-2018-gentoo.patch 395 BLAKE2B 2815a837cf68eb545c35d46d70b24fab8664580457f1525784c83519918984e225bde66a93c336f88f87ac0d6436229f350fa3b6e2d2f7bf2c37dd3bc55aa771 SHA512 e6511dac4d89c8751a0806495459de9d691a2136010ad4e6be31413a86659e286a6abcb53340dc22df2714eec925f26b7b222e63bd292e9689baa50a9a205d0c
+AUX gnatcoll-bindings-2018-gentoo.patch 1231 BLAKE2B 412d5de713267535d000b6a73a78030a9c1323c8548d4725fe487186c6f4bffd0835e05ebdf9e03a672848096b46065b5deb66d1cb5945fc7ad710a631c9a6c5 SHA512 f0a59191e29353657ddd7f1624512d4eef5e40911275928179d51f08f1466b356bc3702369d48ab7a2d42a8348df65d95392dbfd3b87cde1a66df376b2aa1245
 DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295
 EBUILD gnatcoll-bindings-2018.ebuild 2207 BLAKE2B 0eb1b8cdf92c3d37db3bd5d6a9587319530389f2eb6f9abbf4f0a4b42009f7a180d043a401fefc355ccd32d798fb83db7ce74c5ad40f13e70ed46f7b7f54f5dc SHA512 3dfaa068b84de81873cbfa4232bae4070d020c42aa9863785b5630ee3e618cbcbcd1083e668f0a967d6b2cc3d3f7ebe65dbaa6fef478beeea8cd593fb7a96308
 MISC metadata.xml 1317 BLAKE2B 99ea5cb11a8d16c2cde5c902f68f515b2a337d2753453405f2747c72e1d15ba597991ed2bc8d842d1ff127be653d9e59c9e18eec8e034bd5a3bb3726a8ed35a2 SHA512 833bd43bb77645561af5df8ebe904e1b2354ca4be7915aa0fdbe6f6986b116cb8850d91d36bfb1bfd520e037ce93eb206b86488939840e2f64e714f5c1daa083
diff --git a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch b/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch
index 9f37fea65eb9..79729c228420 100644
--- a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch
+++ b/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch
@@ -9,3 +9,24 @@
     end Compiler;
  
     package Binder is
+--- a/iconv/gnatcoll_iconv.gpr	2018-10-10 08:24:48.654714484 +0200
++++ b/iconv/gnatcoll_iconv.gpr	2018-10-10 08:24:16.926237733 +0200
+@@ -70,7 +70,7 @@
+             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ");
+             for Switches ("C") use ("-O2", "-Wunreachable-code");
+       end case;
+-
++      for Driver ("C") use External ("GCC", "gcc");
+    end Compiler;
+ 
+    package Binder is
+--- a/python/gnatcoll_python.gpr	2018-10-10 08:28:04.700481915 +0200
++++ b/python/gnatcoll_python.gpr	2018-10-10 08:27:33.880990030 +0200
+@@ -75,6 +75,7 @@
+             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ");
+             for Switches ("C") use ("-O2", "-Wunreachable-code") & Split(Python_CFLAGS, " ");
+       end case;
++      for Driver ("C") use External ("GCC", "gcc");
+    end Compiler;
+ 
+    package Binder is
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index f1e529c2cf91..ebd193c98080 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,11 +1,10 @@
 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
 AUX gprbuild-2017.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
-AUX gprbuild-2018-gentoo.patch 3384 BLAKE2B cf10449869b12fad0043b7422e6ce51a0c3a72a145b517b752c43d30f675366b0c7b5b2881b8d66c65848b637bd3bdad0fe0182551bb0e391c8e86d311349610 SHA512 29a751fbae2630d53c3d0c7a7ccb4a0828ceb17928eae25665fd7d5d3b2d4d8693e5b3a9a14718f8dee1cae94cd2d321ec3070a5fd0daf4da7ae475edd373874
-AUX gprbuild-2018.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
+AUX gprbuild-2018-gentoo.patch 10903 BLAKE2B ac85c698dd4f0fac0eb2e309cffac073608470408268763a4bea1be4716876fb57271e17b25d98e362dfe8f0b32b7f86f0079352f9a7336e3819fa40c5e05534 SHA512 b2c0a2d0df73d60ab1414675a9cc1cd77adf85076f8904ee7163fb1b2edaa70ebfea6addc6c5bf811d40a55e25d0369c5a25bddf8e6dcbd856fb4ef918d724f2
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
 EBUILD gprbuild-2017.ebuild 2019 BLAKE2B f90f05d9e8272399cf3b231631f58df984cdb4d2d3cec2591cb14e1736d218befe14b2b3d1f02ee287f0e6b588b70f3a2ab0d05d0d5404c78645b233b3bcc46b SHA512 6735d6e22ee72d60e7300fc3cd99e7065d3203feddc3a296352bedbecd3f780eba8f776c07bf859404acf24b731387caf44208641b6ec5e8a35ce4b42dc2ce60
-EBUILD gprbuild-2018.ebuild 2204 BLAKE2B affcc6b4a174e98efc65b5742c67d0d7824c2fc88f57b018905dd6de15491d1c28a6101c7469a10bfd75ffea60e882042cac523879326a16cd158ccbe0237b7f SHA512 1f739c44179a0f5fbdc8890d99af83561d06e8df8f8c59fa08506a0c5af2415389f881ac4a1ea861fb97f2e0e716f9a0818536c5dce85e8d10ec5b11807f0639
+EBUILD gprbuild-2018-r3.ebuild 2273 BLAKE2B 2b7b6eb22413a09dd3715f1ede55728d5f7b25121607f09de49522012ad8e967208b349d8be11f7cdd6d7e07dff492d477dcd4229cc61b50b60c53c5484899c2 SHA512 712601d90df99e241c6304f7b7faac8c11b11905d054d7ae806498ef9d8d8bcd3bdc2544d9ffe0ec3a65ca7875ab1d0741d060441386adbaadf63683a6e45d25
 MISC metadata.xml 1057 BLAKE2B 5f0e5e778d450e3f0d37ad489e0be03f69bdcd35e60d1555468ba69608268d7ff0bbffece8b36cac58a84a5739f381a449fe9684f7d5540ff8817ea5ac2b8562 SHA512 753f7ba070723fb9ae26bdb8580d72656d115c7f5515fc11fe4933a216bd0e0734a0a410bd14011a2cff0cc791a93b132d2bddfe889aea372d955c38dd91e650
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
index 35a98ae03fcb..1f967b61d4c7 100644
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
@@ -96,3 +96,180 @@
  
              when Copy_Source_Dir =>
                 Copy_Source_Directory := new String'(Line (1 .. Last));
+--- a/share/gprconfig/compilers.xml	2018-10-17 14:36:15.100480516 +0200
++++ b/share/gprconfig/compilers.xml	2018-10-17 15:38:57.333256634 +0200
+@@ -20,15 +20,15 @@
+   <!--    GCC 3.x & 4.x (not for GNAT Pro)-->
+   <compiler_description>
+     <name>GCC</name>
+-    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
++    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable>
+     <version>
+-      <external>${PREFIX}gcc -v</external>
++      <external>${PREFIX}gcc-@VER@ -v</external>
+       <nogrep regexp="for GNAT Pro"></nogrep>
+       <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
+     </version>
+     <languages>C</languages>
+     <target>
+-      <external>${PREFIX}gcc -dumpmachine</external>
++      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
+       <grep regexp="[^\r\n]+"></grep>
+     </target>
+   </compiler_description>
+@@ -170,14 +170,14 @@
+    -->
+   <compiler_description>
+     <name>GNAT</name>
+-    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls</executable>
++    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls-@VER@</executable>
+     <version>
+-      <external>${PREFIX}gnatls -v --version</external>
++      <external>${PREFIX}gnatls-@VER@ -v --version</external>
+       <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+     </version>
+     <languages>Ada</languages>
+     <variable name="gcc_version">
+-      <external>${PREFIX}gcc -v</external>
++      <external>${PREFIX}gcc-@VER@ -v</external>
+       <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+     </variable>
+     <runtimes default="default,kernel,native">
+@@ -187,71 +187,11 @@
+        <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
+     </runtimes>
+     <target>
+-      <external>${PREFIX}gcc -dumpmachine</external>
++      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
+       <grep regexp="[^\r\n]+"></grep>
+     </target>
+   </compiler_description>
+ 
+-  <!--  CodePeer -->
+-
+-  <compiler_description>
+-    <name>GNAT_CODEPEER</name>
+-    <executable prefix="1">(.*codepeer-)gnatls</executable>
+-    <version>
+-      <external>${PREFIX}gnatls -v</external>
+-      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+-    </version>
+-    <languages>Ada</languages>
+-    <variable name="gcc_version">
+-      <external>${PREFIX}gcc -v</external>
+-      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+-    </variable>
+-    <runtimes default="default,native">
+-       <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
+-       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
+-       <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
+-    </runtimes>
+-    <target>codepeer</target>
+-  </compiler_description>
+-
+-  <!--  C Target -->
+-
+-  <compiler_description>
+-    <name>GNAT_C</name>
+-    <executable prefix="1">(c-)gnatls</executable>
+-    <version>
+-      <external>${PREFIX}gnatls -v</external>
+-      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+-    </version>
+-    <languages>Ada</languages>
+-    <variable name="gcc_version">
+-      <external>${PREFIX}gcc -v</external>
+-      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+-    </variable>
+-    <runtimes default="default">
+-       <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
+-       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
+-    </runtimes>
+-    <target>c</target>
+-  </compiler_description>
+-
+-  <!--  GNAT_DOTNET -->
+-
+-  <compiler_description>
+-    <name>GNAT_DOTNET</name>
+-    <executable prefix="1">(.*dotnet-)gnatls</executable>
+-    <version>
+-      <external>${PREFIX}gnatls -v</external>
+-      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+-    </version>
+-    <languages>Ada</languages>
+-    <runtimes default="default,kernel">
+-       <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
+-       <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
+-    </runtimes>
+-    <target>dotnet</target>
+-  </compiler_description>
+-
+   <!--    G77  -->
+   <compiler_description>
+     <name>G77</name>
+@@ -295,21 +295,6 @@
+     </target>
+   </compiler_description>
+ 
+-  <!-- LLVM Compiler -->
+-  <compiler_description>
+-    <name>LLVM</name>
+-    <executable>clang</executable>
+-    <version>
+-      <external>clang -v</external>
+-      <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
+-    </version>
+-    <languages>C</languages>
+-    <target>
+-      <external>clang -dumpmachine</external>
+-      <grep regexp="[^\r\n]+"></grep>
+-    </target>
+-  </compiler_description>
+-
+   <!--  Windres compiler -->
+   <compiler_description>
+     <name>WINDRES</name>
+--- a/share/gprconfig/gnat.xml	2018-10-17 18:38:35.547094541 +0200
++++ b/share/gprconfig/gnat.xml	2018-10-17 18:40:16.281379341 +0200
+@@ -60,7 +60,7 @@
+    &filter_gnat;
+    <config>
+    package Compiler is
+-      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
++      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
+       for Language_Kind            ("Ada") use "unit_based";
+       for Dependency_Kind          ("Ada") use "ALI_File";
+       for Leading_Required_Switches        ("Ada") use
+@@ -77,6 +77,9 @@
+       for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
+       for Driver         ("Ada") use
+           "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
++      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
++      for Required_Switches ("Ada") use
++        Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
+    end Binder;
+ 
+    for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
+--- a/share/gprconfig/c.xml	2018-10-17 21:31:44.442501471 +0200
++++ b/share/gprconfig/c.xml	2018-10-17 21:33:06.562088044 +0200
+@@ -14,7 +14,7 @@
+      </compilers>
+      <config>
+    package Compiler is
+-      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc";
++      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
+    end Compiler;
+      </config>
+    </configuration>
+--- a/share/gprconfig/linker.xml	2018-10-17 21:36:15.856883517 +0200
++++ b/share/gprconfig/linker.xml	2018-10-17 21:35:15.985896804 +0200
+@@ -1044,7 +1044,7 @@
+     </targets>
+     <config>
+    for Library_Partial_Linker use
+-         ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
++         ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
+     </config>
+   </configuration>
+ 
diff --git a/dev-ada/gprbuild/files/gprbuild-2018.xml b/dev-ada/gprbuild/files/gprbuild-2018.xml
deleted file mode 100644
index 9e1e47b512ef..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-2018.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" ?>
-<gprconfig>
-  <compiler_description>
-    <name>GNAT-@VER@</name>
-    <executable prefix="1">gnatls-@VER@</executable>
-    <version>
-      <external>${PREFIX}gnatls-@VER@ -v --version</external>
-      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-    </version>
-    <languages>Ada</languages>
-    <variable name="gcc_version">
-      <external>${PREFIX}gcc-@VER@ -v</external>
-      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-    </variable>
-    <runtimes default="default,kernel,native">
-       <directory group="default" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory>
-       <directory group="default" contents="^rts-">\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory>
-       <directory group="2" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory>
-       <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
-    </runtimes>
-    <target>
-      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-      <grep regexp="[^\r\n]+"></grep>
-    </target>
-  </compiler_description>
-
-  <configuration>
-    <compilers>
-      <compiler name="GNAT-@VER@" />
-    </compilers>
-   <config>
-   package Compiler is
-      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
-      for Language_Kind            ("Ada") use "unit_based";
-      for Dependency_Kind          ("Ada") use "ALI_File";
-      for Leading_Required_Switches        ("Ada") use
-	  ("-c", "-x", "ada", "-gnatA")
-             &amp; Compiler'Leading_Required_Switches ("Ada");
-      for Mapping_File_Switches    ("Ada") use ("-gnatem=");
-      for Mapping_Spec_Suffix      ("Ada") use "%s";
-      for Mapping_Body_Suffix      ("Ada") use "%b";
-      for Config_File_Switches     ("Ada") use ("-gnatec=");
-      for Include_Path_File     ("Ada") use "ADA_PRJ_INCLUDE_FILE";
-      for Multi_Unit_Switches ("Ada") use ("-gnateI");
-      for Multi_Unit_Object_Separator ("Ada") use "~";
-      for Config_Body_File_Name ("Ada") use
-           "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");";
-      for Config_Spec_File_Name ("Ada") use
-           "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");";
-      for Config_Body_File_Name_Index ("Ada") use
-           "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);";
-      for Config_Spec_File_Name_Index ("Ada") use
-           "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);";
-      for Config_Body_File_Name_Pattern ("Ada") use
-           "pragma Source_File_Name_Project " &amp;
-           "  (Body_File_Name  => ""*%b""," &amp;
-           "   Casing          => %c," &amp;
-           "   Dot_Replacement => ""%d"");";
-      for Config_Spec_File_Name_Pattern ("Ada") use
-           "pragma Source_File_Name_Project " &amp;
-           "  (Spec_File_Name  => ""*%s""," &amp;
-           "   Casing          => %c," &amp;
-           "   Dot_Replacement => ""%d"");";
-      for Config_File_Unique    ("Ada") use "False";
-      for PIC_Option      ("Ada") use ("-fPIC");
-      for Leading_Required_Switches ("Ada") use
-        Compiler'Leading_Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-   end Compiler;
-
-   package Binder is
-      for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
-      for Driver         ("Ada") use
-          "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
-      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
-      for Required_Switches ("Ada") use
-        Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-   end Binder;
-
-   for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
-
-for Runtime_Dir       ("Ada") use "${RUNTIME_DIR(ada)}";
-   for Library_Encapsulated_Supported use "true";
-   </config>
-  </configuration>
-</gprconfig>
diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
new file mode 100644
index 000000000000..91e3da95792d
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
+		-> ${MYP}-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40
+		-> xmlada-gpl-${PV}-src.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018"
+
+DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}-src
+
+REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	elif use gnat_2017; then
+		GCC_PV=6.3.0
+	else
+		GCC_PV=7.3.1
+	fi
+	default
+	sed -i \
+		-e "s:@VER@:${GCC_PV}:g" \
+		share/gprconfig/compilers.xml \
+		share/gprconfig/gnat.xml \
+		share/gprconfig/c.xml \
+		share/gprconfig/linker.xml \
+		|| die
+	sed -i \
+		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
+		src/gprlib.adb \
+		|| die
+#	sed -i \
+#		-e "s:\"-Wl,-r\":\"-r\":g" \
+#		share/gprconfig/linker.xml \
+#		|| die
+}
+
+src_configure() {
+	emake prefix="${D}"usr setup
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	GCC=${CHOST}-gcc-${GCC_PV}
+	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
+	local xmlada_src="../xmlada-gpl-${PV}-src"
+	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+			-largs gpr_imports.o || die
+	done
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gprconfig
+	doins share/gprconfig/*
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	insinto /usr/share/gprconfig
+	einstalldocs
+}
diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild
deleted file mode 100644
index 95d0bdafd854..000000000000
--- a/dev-ada/gprbuild/gprbuild-2018.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 toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
-		-> ${MYP}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40
-		-> xmlada-gpl-${PV}-src.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018"
-
-DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}-src
-
-REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=7.3.1
-	fi
-	sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml
-	default
-	sed -i \
-		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
-		src/gprlib.adb \
-		|| die
-	sed -i \
-		-e "s:\"-Wl,-r\":\"-r\":g" \
-		share/gprconfig/linker.xml \
-		|| die
-}
-
-src_configure() {
-	emake prefix="${D}"usr setup
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	GCC=${CHOST}-gcc-${GCC_PV}
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	local xmlada_src="../xmlada-gpl-${PV}-src"
-	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-			-largs gpr_imports.o || die
-	done
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gprconfig
-	doins share/gprconfig/*
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	insinto /usr/share/gprconfig
-	doins gnat-${GCC_PV}.xml
-	einstalldocs
-}
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index 8d97f9122ce1..67700f350ce7 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,5 +1,5 @@
 AUX langkit-2017-gentoo.patch 4182 BLAKE2B 5f0a275837a80ac41e231c807eb54a620d49311b3539b995951ce30be3de6cbf1d00c7909f5ac3186b4e06892416f8a4274b75f1de10af123824f4eede466c57 SHA512 53530378e4e04d940656244f42161abc0aae9a5fc54b0ddd12c153faef0fd4a8d3f67e27742f6a2e27496a705a8dafe9288d1c7c066a43fe0e8e7c0a0886c21d
-AUX langkit-2018-gentoo.patch 948 BLAKE2B d34afd89907fef17207e5de6b4de61e5dc5ba33ef84c12d16b6c5f2c3ef31ad27a1474e251aebf87eca0bbad7c4b537f6458bf271d368d7f0c241dadfa526dd1 SHA512 41a3cb91d867f7ec33570082727167bf7c8c4514fd9a254c4adc515bd838c374530b5e24820a58cabfa1e3cf5ba713e261fe8e3f196fda7e7bc1b6839b0bb814
+AUX langkit-2018-gentoo.patch 569 BLAKE2B ea4df3a3651da82c7c61d251a2b330ef735d677f1303113160f7bfcf3c0760d7606d4ac7fdd3484efb3bf2fe23deb8d245a68a6425e2b8c36c2fdf0246ad0b38 SHA512 7a115b3f4307a01b7024571ad878b5c459cddf5c3e79747b9e5d7a64a15ffde75f6eef8225721b5f42821248df03d190030d24ae7f82492c8ff415eb76ca1113
 DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f
 DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
 EBUILD langkit-2017.ebuild 924 BLAKE2B 4fde947ea5db44e0e806162a7283bacd4d105d58bd20fcbb68952df7690e5f86c4dd6d998845a977f09808455bdbb29c572649e78addfb41bfe3fb9306ec283c SHA512 3430bc646265ccacc3178ba3f459613e3b0a0f4493b4238a97598158a4dbf7aa81ac5a60e40da380f86a075ce8119fe28770a438273133cef4ca3caa1626348d
diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch
index aacca6092c1e..52920e906eee 100644
--- a/dev-ada/langkit/files/langkit-2018-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch
@@ -1,13 +1,3 @@
---- a/langkit/templates/project_file.mako	2017-07-11 14:19:12.841221846 +0200
-+++ b/langkit/templates/project_file.mako	2017-07-11 14:12:39.104981170 +0200
-@@ -111,6 +111,7 @@
-                   --  ... and this prevents OOM on other platforms
-             end case;
-       end case;
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Binder is
 --- a/langkit/compile_context.py	2018-07-04 19:17:08.329346507 +0200
 +++ b/langkit/compile_context.py	2018-07-04 19:17:57.276615724 +0200
 @@ -1684,7 +1684,7 @@
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 7955fa858065..95fa35110a84 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,5 +1,5 @@
 AUX libadalang-2017-gentoo.patch 521 BLAKE2B 0493204f7a71f9f906017b69b988260add9744888559034e066dd0e33114aaad3c1f69cca23ca59b2c0b2d3503469772a91d6c278595ad8dbda5cf7fb063f8db SHA512 88613409e2ba5aa4e33ae01bdab3ac5298a363732372a33334a85781d1b29d045c7e1207650a1f9a819acad671c5dbfc1d3940a2eda9bf923456dadebb6c9af0
-AUX libadalang-2018-gentoo.patch 1161 BLAKE2B 421608844df562343aaa9c6fd1b1b61a13712a9d50b117011a69681e9da2b55ce29ddad3e91071d9f6aa09feb858358672dad4d037c8a593266d1cdabbe43484 SHA512 cafc3cea5da8cf958db102af78a2c675d9090a7848c83755249137c1d19879d0828c6df27f79c05707e80299ecf2be389411e04f77f021af36a797b6851acdf1
+AUX libadalang-2018-gentoo.patch 678 BLAKE2B ebc0c63b62a0b5c2b53a036de1a71ca33af992dd3774d894f4e0407e291bee15fac5be358c5f2600516ecb15c7b7846c7213b1fdd3c522ecd2f1393247d4b4b4 SHA512 346b561e2db3258e768bc4c4ee92a3ba6977f58de3cdae0ab84df9c31ba178dad3788309db2505c2dc8c8fd4319ef68201499303a6b92d837508a6bd91e49779
 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7
 DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c
 EBUILD libadalang-2017.ebuild 1096 BLAKE2B f0ee4b436c3a7c0288e9360ecf392e7f8b2ae9592f4e3e1a2c3cd50f1979849c52bc52835e8b331ed14c7beaa28ca1f794d3d1bed189935644910505b2c70efa SHA512 802a402622df6d21390aa497342ad4b2fd9b8ba18f7cb52a5377909eedb8e47085f9f3df35d16763904cfaf3dd51413c8526d25a04bd0e1bf26477b6d86ec09c
diff --git a/dev-ada/libadalang/files/libadalang-2018-gentoo.patch b/dev-ada/libadalang/files/libadalang-2018-gentoo.patch
index ef92b255cf48..96c45c74a852 100644
--- a/dev-ada/libadalang/files/libadalang-2018-gentoo.patch
+++ b/dev-ada/libadalang/files/libadalang-2018-gentoo.patch
@@ -1,13 +1,3 @@
---- a/ada/testsuite/testsuite_support/capi_driver.py	2017-07-30 16:01:31.495287196 +0200
-+++ b/ada/testsuite/testsuite_support/capi_driver.py	2017-07-30 16:00:08.104464440 +0200
-@@ -72,6 +72,7 @@
-                        --  different default standard.
- 
-                        "-I{support_include_dir}", "-g");
-+                   for Driver ("C") use External ("GCC", "gcc");
-                 end Compiler;
-             end P;
-             '''.format(main_source=compile_units[0],
 --- a/ada/testsuite/tests/c_api/unit_file_providers/test.out	2018-07-05 20:57:15.718357269 +0200
 +++ b/ada/testsuite/tests/c_api/unit_file_providers/test.out	2018-07-05 20:58:47.363026320 +0200
 @@ -5,6 +5,8 @@
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 4343370db280..57c045903c5b 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,9 +1,10 @@
 AUX libgpr-2016-gentoo.patch 2822 BLAKE2B 759977ffe76fefc27c1aecdfe8a8647c78c8c3b5305b5bcb20d5c403394cd492b68ff3256d65ef0969eb44aa002fdfb83815cf095017c0c06e441639fea8d607 SHA512 c0a507f692002a32d40d56216a033987c3e5e2ad07f9f25d0bd542fe1e77c8c3a7acd1e11a3d4f07d224b63002dbecd548a256599017cf97c820c6cfce2ac596
 AUX libgpr-2017-gentoo.patch 2047 BLAKE2B 8c8befa6b392863163fac1c03acc63b96c075929fec2207fb654ab191bb6a8995e0c2576c218c59b90b1eb90d330ea7837d032427b9b9495bdd5e98709363070 SHA512 51b82725f94488c06e9a9aece82b9a3df78f7a763ed6ae6055335c0eae802207a698e186fb321261b4c45539c2fba076d08605dd5fc64508d71928210fe80f0c
+AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285
 DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 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 1562 BLAKE2B 910ce408a6b2570240a2169e4ae18efd77792d9e81d75e6dfb2b845f920d79c73716fb7d480fd5fda4edfdbd50470631f887fa08540cfda4496d58f6e966aafe SHA512 0573b94a327abe3fcc5b4191d21d072ab58edf7c629c653536d78455f095f14face6ad79aafda8cc834932414839a2e0e8e1f47804f2bf95228c699bd44c4935
+EBUILD libgpr-2018.ebuild 1427 BLAKE2B bbec85a8110884673e969b9b4f0fb740daf289407e8e9bde5cc8c59f8f465862866806df216cc8c220e7299e14d29f0974a87862648b323e4a4d785f0854898b SHA512 7a4c42bae0287c4d78dd5ac14f1846092a3c639b5b5cdd5ae8be1bff7498df12f4b9041cb76f6063aabd32e4994fe0fda97386f72559094a3bd023b439501460
 MISC metadata.xml 1175 BLAKE2B 8b512fd5efae4481d319fc52a11f3730af081d5c3ff12f6c6d62768e905e0651e3b4792765f65edbf659862b56372f32ba3aa7ae51c12b2911b711cb12a013e1 SHA512 edd6bb889abfe036d2509e56f350cf058e249e398811fdb2890bd001b75143b8d9df28bb64acba195852d01d484b7e6381e82ce972aad6d8cf1e0c961b3ade72
diff --git a/dev-ada/libgpr/files/libgpr-2018-gentoo.patch b/dev-ada/libgpr/files/libgpr-2018-gentoo.patch
new file mode 100644
index 000000000000..013a56b92e78
--- /dev/null
+++ b/dev-ada/libgpr/files/libgpr-2018-gentoo.patch
@@ -0,0 +1,55 @@
+--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old	2017-11-13 22:16:53.349083426 +0100
++++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb	2017-11-13 22:17:22.692590351 +0100
+@@ -1948,6 +1948,8 @@
+ 
+       end if;
+ 
++      Add_Directories (Self, "/usr/share/gpr");
++
+       if Gpr_Prj_Path.all /= "" then
+          Add_Directories (Self, Gpr_Prj_Path.all);
+       end if;
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old	2017-11-19 13:09:18.947527738 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
+@@ -27,6 +27,8 @@
+    Name_Buffer : String (1 .. 1_000_000);
+    Name_Len    : Natural := 0;
+ 
++   Last_Id     : Name_Id := Name_Id'First;
++
+    procedure Get_Name_String (Id : Name_Id);
+    procedure Get_Name_String (Id : Unit_Name_Type);
+    procedure Get_Name_String (Id : File_Name_Type);
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old	2017-11-19 13:10:27.674316703 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
+@@ -354,6 +354,8 @@
+ 
+       Name_Chars.Append (ASCII.NUL);
+ 
++      Last_Id := Name_Entries.Last;
++
+       return Name_Entries.Last;
+    end Name_Enter;
+ 
+@@ -427,6 +429,8 @@
+ 
+       Name_Chars.Append (ASCII.NUL);
+ 
++      Last_Id := Name_Entries.Last;
++
+       return Name_Entries.Last;
+    end Name_Find;
+ 
+--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old	2017-11-19 13:12:41.592995718 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
+@@ -53,6 +53,10 @@
+          return;
+       end if;
+ 
++      if Last_Id = Name_Id'First then
++         Add_Name ("");
++      end if;
++
+       Add_Name ("a");
+       Add_Name ("b");
+       Add_Name ("c");
diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild
index c16efb2bfd51..10776c86ccd1 100644
--- a/dev-ada/libgpr/libgpr-2018.ebuild
+++ b/dev-ada/libgpr/libgpr-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,11 +20,11 @@ RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?]
 	dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=]
 	!net-libs/grpc"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
+	>=dev-ada/gprbuild-2018[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
 
 S="${WORKDIR}"/${MYP}-src
 
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
 	emake prefix="${D}"usr setup
@@ -36,14 +36,6 @@ src_compile() {
 			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
 			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
 	}
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=7.3.1
-	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
 	if use shared; then
 		build relocatable
 	fi
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 295e0834bd99..67234fb6afd1 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,7 +1,6 @@
 AUX xmlada-2017-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
-AUX xmlada-2018-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
 EBUILD xmlada-2017.ebuild 2120 BLAKE2B 075a4fc91c5a68063f01df6fbbadd51ba550cd4e1b6896b0ad4ab5345d920fbab354aa3dff9ad0c5609fa16a25173c7390cc03dce16cc59bf87c7c3335bcd17a SHA512 bb4e8f7623d06eec64d5677bb41ef69e2fe4dd503799c66da37a2d2a42f63ac125900a10c5f04c4ca1e9b19696c4112877ce233f009352f96b53fdb82eb4da7b
-EBUILD xmlada-2018.ebuild 1876 BLAKE2B 8ba99bf5e814c73acda968f19704b9c9e8133c44fbb5579089fb28671ab05046f9cf66c9faf9d4ad2ddbda6557a0e3e4f5d57285ead91cc8e8d6c3ad7d1dc294 SHA512 993cb87181ae50750db09301603658cfde9ddca99f91a0712af407a1fd6330709127cb57cafdcd3c37219b78e44ce420950502e48e7f2ee697552483f24d52f8
+EBUILD xmlada-2018.ebuild 1879 BLAKE2B 9b0727eb9929e46aaad938400a69d76399d91e9f3247d66e1a1b7e0543893ee7e886acbe24e1bb3a778df8b19ca07fda8be41b482317d3e2c78842699f4393e9 SHA512 275a71bf9ffda5142e3c51fd7e887f81ed7408c47cd405f66cceff8182fb4f0772d424ec7b03087dcbf2f921ba367593ab00f827b51191cf385038e32fa6b47f
 MISC metadata.xml 1143 BLAKE2B 7f633dfb6a079c1e981b7b7fe53f60df746919bea32c32c257002c3e13682d24b269d5bbe1b61700df930b7722d3f503bfff52c00676301f7a19523749edda81 SHA512 ce5fe7f5ca7d79bbd4b648608f1521056b62b90c70aec62b49e4be5737319df56a9248bd57b695b1469e2bb9b9b49c6c910c2321f1a690546ae1447bb0519006
diff --git a/dev-ada/xmlada/files/xmlada-2018-gentoo.patch b/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
deleted file mode 100644
index 9e79572e3067..000000000000
--- a/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- xmlada-gpl-2017-src/Makefile.in.old	2017-12-04 20:09:23.730805855 +0100
-+++ xmlada-gpl-2017-src/Makefile.in	2017-12-04 20:09:51.586331155 +0100
-@@ -62,7 +62,8 @@
- 
- # Rebuild the tests (and not the XML/Ada code itself)
- test: force
-+	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
- 	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} \
- 		-XTESTS_ACTIVATED=Only xmlada.gpr
- 
- # Run the tests. This requires an install of XML/Ada first
---- xmlada-gpl-2017-src/tests/Makefile.old	2017-12-04 21:38:29.722818904 +0100
-+++ xmlada-gpl-2017-src/tests/Makefile	2017-12-04 21:38:54.229382658 +0100
-@@ -1,8 +1,6 @@
- TESTS= test_unicode \
- 		 test_state \
--		 test_xml \
- 		 test_adacore_dom \
--		 test_schema \
- 		 test_date_time \
- 		 test_numbers \
- 		 test_adacore_schema \
-@@ -71,6 +71,7 @@
- test_multiple_xsd:
- 	@echo "multiple xsd"
- 	@cd schema/multiple_xsd; \
-+		GPR_PROJECT_PATH=../../../distrib:../../../input_sources:../../../dom:../../../sax:../../../schema:../../../unicode \
- 		gprbuild -q -Pdefault.gpr; \
- 		./validate > $(RESULTS)/multiple_xsd.out; \
- 		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \
diff --git a/dev-ada/xmlada/xmlada-2018.ebuild b/dev-ada/xmlada/xmlada-2018.ebuild
index 8d4099a1ce52..434c852375c6 100644
--- a/dev-ada/xmlada/xmlada-2018.ebuild
+++ b/dev-ada/xmlada/xmlada-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MYP}-src
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
 
 src_configure () {
 	econf --prefix="${D}"/usr
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c7905c5e3ca5..08ebfe0f4498 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/aixlog/Manifest b/dev-cpp/aixlog/Manifest
new file mode 100644
index 000000000000..9263383f4bf2
--- /dev/null
+++ b/dev-cpp/aixlog/Manifest
@@ -0,0 +1,4 @@
+DIST aixlog-1.2.1.tar.gz 11396 BLAKE2B 88cdc775acfd91ee74306fedd6429865f10bcd7cbe9b45f861463489330d74b017611078ca362a00994983dde746ba086a056c3da53b06099f200810d65c0c04 SHA512 776558fdd911f0cc9e8d467bf8e00a1930d2e51bb8ccd5f36f95955fefecab65faf575a80fdaacfe83fd32808f8b9c2e0323b16823e0431300df7bc0c1dfde12
+EBUILD aixlog-1.2.1.ebuild 592 BLAKE2B b9ca8cc5003a0979db8cd2992f7ee4a28782c166a4d387b4fa97252f4a52a522f0221ad13a6b2422660cfe1ca61dae975d050769f989d974c445ac976f9b5466 SHA512 6fca9db55df82d0ec0fa7e0d352d0c4ec09925373e2e07a498261b63bffe9ed7bea8afa7ea24163e29827b557cd30006d92fdf9bd8b3ebd6d369fa4d01210640
+EBUILD aixlog-9999.ebuild 592 BLAKE2B b9ca8cc5003a0979db8cd2992f7ee4a28782c166a4d387b4fa97252f4a52a522f0221ad13a6b2422660cfe1ca61dae975d050769f989d974c445ac976f9b5466 SHA512 6fca9db55df82d0ec0fa7e0d352d0c4ec09925373e2e07a498261b63bffe9ed7bea8afa7ea24163e29827b557cd30006d92fdf9bd8b3ebd6d369fa4d01210640
+MISC metadata.xml 620 BLAKE2B b484dc5a04a850df14940bed20bc6479347e16114268f6bb1d5035395d7456dce6108b5a7a84dcdadd2444df2819e0bdbc5c004814d29aef6229d01df13f857f SHA512 66120820a33f2d18734e9ba8256e259559cc2daa236b83f825c6ee2b1d8cf25aa53aebaf2e523b534ac9a0abd64d42227d78ce11cd2b7fdde7830ead1aac652f
diff --git a/dev-cpp/aixlog/aixlog-1.2.1.ebuild b/dev-cpp/aixlog/aixlog-1.2.1.ebuild
new file mode 100644
index 000000000000..1246304bfa01
--- /dev/null
+++ b/dev-cpp/aixlog/aixlog-1.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Header-only C++ logging library"
+HOMEPAGE="https://github.com/badaix/aixlog"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit cmake-utils git-r3
+
+	EGIT_REPO_URI="https://github.com/badaix/aixlog.git"
+	EGIT_BRANCH="develop"
+else
+	inherit cmake-utils
+
+	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
+
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/aixlog/aixlog-9999.ebuild b/dev-cpp/aixlog/aixlog-9999.ebuild
new file mode 100644
index 000000000000..1246304bfa01
--- /dev/null
+++ b/dev-cpp/aixlog/aixlog-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Header-only C++ logging library"
+HOMEPAGE="https://github.com/badaix/aixlog"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit cmake-utils git-r3
+
+	EGIT_REPO_URI="https://github.com/badaix/aixlog.git"
+	EGIT_BRANCH="develop"
+else
+	inherit cmake-utils
+
+	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
+
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/aixlog/metadata.xml b/dev-cpp/aixlog/metadata.xml
new file mode 100644
index 000000000000..c2a58d893f1b
--- /dev/null
+++ b/dev-cpp/aixlog/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cb-gentoo@guya.de</email>
+		<name>Christian Buchinger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<name>Johannes Pohl</name>
+			<email>github@badaix.de</email>
+		</maintainer>
+		<bugs-to>https://github.com/badaix/aixlog/issues</bugs-to>
+		<remote-id type="github">badaix/aixlog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index d5a30ef78f2a..267e4a684dc5 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -7,6 +7,6 @@ DIST Catch2-2.3.0.tar.gz 506374 BLAKE2B f692eb0933ca578edf0f15cb83139d2fab03390b
 EBUILD catch-1.11.0.ebuild 725 BLAKE2B 49c5034310812a931d9155d0aa3d791c30ab1f381c14bf102a26e23cd7c24ca97c4d4b7b11c8c859e665fdbd7beea44416e193ec06ad1d8e883f7459023ce3d6 SHA512 e7fa7e70cb02ab499606e656650d4ddb0c11c4990c720457dc0e21ebcee4a44e67356dfc89d3bdd0caf5e943fb5b59b5fa4ff9f2bd1963b6db20f362c1725560
 EBUILD catch-1.9999.ebuild 558 BLAKE2B bafe5cb18017202bd684d631b8839caab6bb128d8fc42d7772dd74aa91dcd99b139393fa22463536924da114fc508a92d5b49639590933397a57cab9f2159ac0 SHA512 1952c96b2fa49e674a32466f2ec709b2f92c8e2502eecb1f25c24d81d11c73e8c28cfbb1da5b7e322bbebd28d6ade06f6b157e07f47f1a06ad258c30efc118f0
 EBUILD catch-2.2.2.ebuild 1078 BLAKE2B 5c33d53d303e552418f2957e8c1c9f640fb03b356bb3e4f6d2988c2fc98225d1bc6a50621a1285d5ab0d255cd1a00b5916788de16527c3f7f436bdf9d4ba3f28 SHA512 3912a227443c1eff86b65831ea3f5c2703811c0978c8750e5b69c75cca0079d1ecc31d2c643aad6a02a2b210da061f111097db390e9be00fab807d4e54eb5534
-EBUILD catch-2.3.0.ebuild 1030 BLAKE2B d2aa24e6a9ea0274859df948e70f50db8e50cd7cf290c4857b3f4f4f1cae26ca97ffc6230dcd9c55d5cd53e400a6bc8560ea5f7a56803951fcaf963133e77f7b SHA512 8223fab7abd67fd6f736c9fa74169a514a12b6f775f4f00e21be47c345ac901a801e2a20942497add7ffbfd416bdd601d0a249116d3dca98a6c2330adfbf3eb7
+EBUILD catch-2.3.0.ebuild 1029 BLAKE2B 472cd9eb3b96e8c7bf766b42477f881ff3421dcd81617905fda7e6c530a457150f2dc4d543bfb73aa352a49713960d1db3a9758a55714b1dc100b697fc039ddd SHA512 7523558c0b75881959da3aec3d529c8bffb33f5d3bd9bbe409726845cde139b9a166d348a36e0e6742e045677f2142580925b950b605b7b4e318b1aaf5f8d276
 EBUILD catch-9999.ebuild 789 BLAKE2B 1eefb971644a62d137bd3af77bd3155fe82382f1520e5da503ad80bb4ace697ce461f5d3c6311ac0b241224f6df603b87ec00f5c9225d8d6bb6c7a6ecf9bb303 SHA512 930839ea809a06dcb8f66ade29cf3e5b109327ceaef66da33c55fc958974b2489bfb003238b560189868bc08246ca4ddb7b5f239ff0b804973c6fab50ab4b4b0
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.3.0.ebuild b/dev-cpp/catch/catch-2.3.0.ebuild
index a5f5b0bd658f..33544077cdf5 100644
--- a/dev-cpp/catch/catch-2.3.0.ebuild
+++ b/dev-cpp/catch/catch-2.3.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 
 	S=${WORKDIR}/${MY_P}
 fi
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 8d1dfba7625e..9754105339c4 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,5 +1,8 @@
 AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb8489919c130a64da9548b712a6a01fea5256294dca39afce813013f78c1b43a251b5b7fbe8846493dd9860aea2b7578c39c2cf766247202 SHA512 eec47c7f4d28d7b14a3403d046dc111bb3ef9e02e9e797f74636f3f7d11bc865c94e246bd4f98d9f39540c66b751de0ca81d523be3d523017e94886ec474799b
 AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
 DIST ms-gsl-1.0.0.tar.gz 58920 BLAKE2B 46b71ec1fe57ec311a53895498c375c2313ed1f2858cd6b67d19d92ef10230707ce14fb757c00c92ea3475d787cda400cc449c34d54a54a3d0123f71b87b11ad SHA512 cde55df9540fd08ca8d29a74b2cff360686aa75b01ee1c48bd9782a2d70d1b6eae712a51eaf9b60453f859e466df00345b0a2893137d16490cea8ee54362f7da
+DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726
 EBUILD ms-gsl-1.0.0.ebuild 740 BLAKE2B 064e283ba501e9fb3ad9dd3fd28576c4138ebab6d5c532cecbe6b416d3a468a96b9fcc94bddc6987562b3c9897c7623f874c2bd791568d59bf7fe2cb463756d7 SHA512 0f4ba6a3e412749c33ea001645cc3b43b4cc509ed9190e56201a9b2ad8f055431df55d7a2e77e85c2180fe542e4b60042e58618cb4840fd5187fdd2eda9201cd
+EBUILD ms-gsl-2.0.0.ebuild 763 BLAKE2B ea4084bab54323b98d7481a8681593bcd604e0ced3009c9bae6505ceaaca786c42c85446e82db6cabf2868c36dfd7a6505b9f2c461ebc75a77f3a1371ab28f65 SHA512 8e1c5817b892378487686862ebbcf23d8e66e8477abef5374dbc388c99b627d1533374bd6e030c9256a505ac41eb596ffcae2d4a1afa2a00b354a0b98728dd53
+EBUILD ms-gsl-9999.ebuild 743 BLAKE2B d680d641bbbf771789823bc7cf5996b34c0e9f2135427b466f6166c613a068e05ef6c79a21d4f6aed334f01e3c8c128e6ae14b516164c4b2ef22ac7667dd9395 SHA512 fcd37e590c9bb6397032fd3d10d968d42db22cd4e8d063df3aac6fd972bbedbbe9fed5055b61d841ccf758fb274ae813e4fbd5b6d784022afd3f4950cface488
 MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
diff --git a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
new file mode 100644
index 000000000000..c3af23471bc5
--- /dev/null
+++ b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Guideline Support Library implementation by Microsoft"
+HOMEPAGE="https://github.com/Microsoft/GSL"
+SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/GSL-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( ~dev-cpp/catch-1.11.0 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch"
+	"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSL_TEST=$(usex test)
+	)
+	use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON )
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
new file mode 100644
index 000000000000..d7c789086547
--- /dev/null
+++ b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="Guideline Support Library implementation by Microsoft"
+HOMEPAGE="https://github.com/Microsoft/GSL"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/Microsoft/GSL.git"
+
+S="${WORKDIR}/GSL-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( ~dev-cpp/catch-1.11.0 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch"
+	"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSL_TEST=$(usex test)
+	)
+	use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON )
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/popl/Manifest b/dev-cpp/popl/Manifest
new file mode 100644
index 000000000000..aad3284ef568
--- /dev/null
+++ b/dev-cpp/popl/Manifest
@@ -0,0 +1,4 @@
+DIST popl-1.2.0.tar.gz 12302 BLAKE2B cfe775ef5cd823ce7b6cb651f7f8de6c67d24e5e3b657d13e7b2087f3b9673c11a870adbe2195665f4e2c3c7799c2427020d4e86126090ef845aa6a906c7a825 SHA512 a5d372346dd282f634b1ca92f468588f7069b34a5911a6ea46e5ef33e8e6c360ca13f67bf221555d76c7620c4222694077a74589a1c32bdbc094e64366299609
+EBUILD popl-1.2.0.ebuild 603 BLAKE2B e612b297d510f4b66ab2efca139991f6e22fd9d8cc6481da6fc587768b0c2327fbe2641a7091083c736352edb446dc9f9272c2004bf13f993856afe3d68e52fb SHA512 66af1859f2c70494ea0f5caab0efba8c007ec568b88e8a67ab6b0ca006fde5ab37aae2695cc7a26cfd8d5f57196175d3c897a1c435036aaff168512b02c2bfea
+EBUILD popl-9999.ebuild 603 BLAKE2B e612b297d510f4b66ab2efca139991f6e22fd9d8cc6481da6fc587768b0c2327fbe2641a7091083c736352edb446dc9f9272c2004bf13f993856afe3d68e52fb SHA512 66af1859f2c70494ea0f5caab0efba8c007ec568b88e8a67ab6b0ca006fde5ab37aae2695cc7a26cfd8d5f57196175d3c897a1c435036aaff168512b02c2bfea
+MISC metadata.xml 616 BLAKE2B d60f9088e929110b1645fc5e30a372804e7a4b014ad0c86c06586bdc70573d93229c52b8b3e7e4ddb89613280023f5f882b0d5fac392c0580adf092d3bca6a87 SHA512 e85e808db993f6ba0086ca1896aab5ccf514c236158f1fd805e9968a6bfbc1b1fd4c54361a9c98b21b5ff4001608fea262be60bd72eb43301c5d0159fa53a31a
diff --git a/dev-cpp/popl/metadata.xml b/dev-cpp/popl/metadata.xml
new file mode 100644
index 000000000000..0edc57f0bdfe
--- /dev/null
+++ b/dev-cpp/popl/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cb-gentoo@guya.de</email>
+		<name>Christian Buchinger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<name>Johannes Pohl</name>
+			<email>github@badaix.de</email>
+		</maintainer>
+		<bugs-to>https://github.com/badaix/popl/issues</bugs-to>
+		<remote-id type="github">badaix/popl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/popl/popl-1.2.0.ebuild b/dev-cpp/popl/popl-1.2.0.ebuild
new file mode 100644
index 000000000000..39652fbae851
--- /dev/null
+++ b/dev-cpp/popl/popl-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Header-only C++ program options parser library"
+HOMEPAGE="https://github.com/badaix/popl"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit cmake-utils git-r3
+
+	EGIT_REPO_URI="https://github.com/badaix/popl.git"
+	EGIT_BRANCH="develop"
+else
+	inherit cmake-utils
+
+	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
+
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/popl/popl-9999.ebuild b/dev-cpp/popl/popl-9999.ebuild
new file mode 100644
index 000000000000..39652fbae851
--- /dev/null
+++ b/dev-cpp/popl/popl-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Header-only C++ program options parser library"
+HOMEPAGE="https://github.com/badaix/popl"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit cmake-utils git-r3
+
+	EGIT_REPO_URI="https://github.com/badaix/popl.git"
+	EGIT_BRANCH="develop"
+else
+	inherit cmake-utils
+
+	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
+
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 1e13b30da8e1..460f4acb489c 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -1,6 +1,4 @@
 AUX websocketpp-0.7.0-cmake-install.patch 970 BLAKE2B 2099c37b65d3f685f8b9745d92b481bb6a0434e6305e974c6f613ae44e70e1fa9d7bd577f875ef12228e506361409666099ce024578c5c524cc8fc5fbdef4b70 SHA512 c8b34b80890d8dc828d64e391e9541f7ebd6a18c79d3a5b91c72835745a11bafff110d04e8d75a2df2dba8b65ca1856050009a4eab3871cc2470066f9ad82f44
-DIST websocketpp-0.7.0.tar.gz 682271 BLAKE2B 4da1fb076c2f533cdbdaa2cc0b0b45509216fcbc3b465f137905a34477aff0e93005f36d0257f314fd91b7de59e587e1b1df9af664a717b8dbf477b168025f26 SHA512 91a86d4f5120db3f474169bb146f865f82167b1e9eedabec8793b31005e4ce3d22083283bc1b9f9e37fa0da835addcb2b68260a27c753852c06b3b1bb2f3c12e
 DIST websocketpp-0.8.1.tar.gz 699468 BLAKE2B e5769229b400d2f42e69541b07cfba17dcc82cdad20685a52ac1130c2fc4e94764a38d2e4f7c36101b11705e10c67eb149ba2c30750e7a6f63696d52c272fed2 SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c
-EBUILD websocketpp-0.7.0-r2.ebuild 785 BLAKE2B c6f38b15b53ecf7832562bf891cee935503f23a77e3405171b278d9194fd7fae6f4c7b00ad1d95719ba9f4582e87946dabd465b8eb9858e072a23cabeb6f2580 SHA512 048170cd90d448f2e22b81929eec28809a98c537a2ff84697a4818feb39d7c71a962a004a76021597d7b386baa5154a4562e55d1b5ece6e3fab6eb3a2598b5a6
-EBUILD websocketpp-0.8.1.ebuild 792 BLAKE2B 777abcc5726b40ae6c0be75a68a9fce88954a6f2287ba7611188127f158eea1c4efeca41c74ed0dc8fa0a48569d9398f27b245838cd3e24d887b4862d0eff4e2 SHA512 4354d47af35a22013f407299577cb88abb9a55ef1b6e37c03434715873bcf50af1e71e15a001803a51e92b6f74d86c30093f534086b36954f69ec85560e7e71c
+EBUILD websocketpp-0.8.1.ebuild 797 BLAKE2B e5df1ba0fea119712fa276409913d80c36414ff7a00614c5dff2f9339adebd5c7e447198851d22ce70d5c1d2053b034462f436f597d3b36868bbb0b8b5015132 SHA512 a9db3a6d6beee0a93c4ad6fda92f73729b1f861da7f3b1573d9ea327407f01217c2ab377a0566ed6c21fe24fc56ad5228663d540b123608850926f03f8cdc130
 MISC metadata.xml 419 BLAKE2B 11f113ce200752e1982b6f246f267e8029901c9dd6fa4dcdb131a28f62c3041792dc25b0ff449b20f755d9e9e9f1f4cfa23077f7648d8bfd17619b1887f44316 SHA512 92d8c85006a8857390b3bb83a9fcaa6e8a74a68eadc63018f6e70e2d4259332caaf549611a69baf44689557f05f1f7f7824d24bb9a5b582913b6580cc21608c0
diff --git a/dev-cpp/websocketpp/websocketpp-0.7.0-r2.ebuild b/dev-cpp/websocketpp/websocketpp-0.7.0-r2.ebuild
deleted file mode 100644
index 49aa4f68f4d9..000000000000
--- a/dev-cpp/websocketpp/websocketpp-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="C++/Boost Asio based websocket client/server library"
-HOMEPAGE="https://www.zaphoyd.com/websocketpp"
-SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE="boost examples test"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	boost? ( dev-libs/boost )
-"
-
-# bug 630450
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-cmake-install.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CPP11="$(usex !boost)"
-		-DBUILD_TESTS="$(usex test)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use examples && DOCS=( examples/ )
-	cmake-utils_src_install
-}
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.1.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.1.ebuild
index 332c2d9ffcaa..6bf27e854c14 100644
--- a/dev-cpp/websocketpp/websocketpp-0.8.1.ebuild
+++ b/dev-cpp/websocketpp/websocketpp-0.8.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="C++/Boost Asio based websocket client/server library"
 HOMEPAGE="https://www.zaphoyd.com/websocketpp"
 SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 LICENSE="BSD"
 SLOT="0"
 IUSE="boost examples test"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index ab877a13cb90..ed08373a6bfc 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index e3963426d0a5..f091ab301740 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -6,10 +6,12 @@ AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
 DIST etcd-3.2.22.tar.gz 3243190 BLAKE2B 165eff928f5f5419d02ef07aebb5160ac5473721a1e27ee1eb2a6b1e5ff775f2f7254ddfc20dec14c28cd2de68966e7b8521fb29c7242a420fa61d226e16b3ba SHA512 7a32dce894ca643f0c51267edc0fba2524c197f0ac3185c6acd22879cd58236f6bcc9c3825d9b8f196255c8bf6aed1b893e1a62124c946f95b4832b409a6b4c0
 DIST etcd-3.2.24.tar.gz 3246004 BLAKE2B 98a4265fdff3b86ab8741aa820c6d6e9ed97ff0e4d8ca04815f3e9e73c35f87999906a6deb092e775606793002a60ba11c89840ecac35999b166709140b81c80 SHA512 49cbd6c2c59face31202e5d96e05be03286129fd38124126a2d8bead2f2a441486a848749a2cc5862b62332dd5d560c4be1f4d6c05ded70081ac48d94bf4d16d
+DIST etcd-3.3.10.tar.gz 3526904 BLAKE2B 8266212707f8fb280d55deba8dffb44e4d48b906c56034b174848fe6f237d5efba8c15ebea076d799db7f3ec560e2d188fdcc8fe26334ae1cbef0384fe8cf847 SHA512 848e241e816312307f74520b99aeabf7def6862093897035ace16cb230817d8e2681d7d2f1c1ac220d7c2b4c7c0a1262bbe3e4db927524f785de888566d2097c
 DIST etcd-3.3.8.tar.gz 3518826 BLAKE2B 4d8ac66022c63250e37871a40041a799a21361f005f5ff259711ea7a0557acbe7f3920815ff0b5193499177e42c306ff8383192e7d4c31c94439d9461dea979f SHA512 c3a3f9ffb614e383854bf5a8819e3dcad8f02b267d74197685b546c856e983c92f8c459185c327adf7ba3d0326e2058fb34caac0896d78494cde86c3f7e04ac7
 DIST etcd-3.3.9.tar.gz 3521457 BLAKE2B 4c8ae96744b93efe19626225ccd5deca19e9e6bd18d87778e9ba1c207e288ed66d79410bc51bb8c7621c0bf261012ca95d86cd9d307655688a6026a46d891c34 SHA512 1e5143060d04138eee68250b57f73bf7a6fdb4ca085443df067b12a4824d24b591e42f3d890a285912126447e8b28c0e6bcee58b8633e01dcf9ae5764ff531a6
 EBUILD etcd-3.2.22.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
 EBUILD etcd-3.2.24.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
+EBUILD etcd-3.3.10.ebuild 1900 BLAKE2B 5af3103c025a7d134e3681e302f45c8c066551402f41e8ceae8c628047b3b99351894059b8fe365a3cf49628dc22333f5af7a599a613a59e63b67452ab96def2 SHA512 8fa5415e93583cb1a604d80a2dd21d50a59d21c9d5e064681f5d6ec5f46f266b42c0abcf488d24ebf20dfc167d978bd4616f113b1fb01eff6605065a438713d8
 EBUILD etcd-3.3.8.ebuild 1603 BLAKE2B ecc2eb8cd86fb1ca37d6fd7eecde005fcc3c633bc7569ce54acc5daf947b4be2cc88e596ada2c1e8a7b3d40d44273a143f80b26a2cbb8e851ad8d36b6fcb4beb SHA512 83a23179d8381a126fde6d9e9c521170b3148b78773421893175a81fb48d8b980e93309cc5c40d8993b9039fadc7d75a2ecc03fdc5186d5ba84ac71826dfe68d
 EBUILD etcd-3.3.9.ebuild 1603 BLAKE2B ecc2eb8cd86fb1ca37d6fd7eecde005fcc3c633bc7569ce54acc5daf947b4be2cc88e596ada2c1e8a7b3d40d44273a143f80b26a2cbb8e851ad8d36b6fcb4beb SHA512 83a23179d8381a126fde6d9e9c521170b3148b78773421893175a81fb48d8b980e93309cc5c40d8993b9039fadc7d75a2ecc03fdc5186d5ba84ac71826dfe68d
 MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0
diff --git a/dev-db/etcd/etcd-3.3.10.ebuild b/dev-db/etcd/etcd-3.3.10.ebuild
new file mode 100644
index 000000000000..19f780d06747
--- /dev/null
+++ b/dev-db/etcd/etcd-3.3.10.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+MY_PV="${PV/_rc/-rc.}"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc +server"
+DEPEND=">=dev-lang/go-1.9:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-i "${S}"/src/${EGO_PN}/build || die
+	sed -e 's:\(for p in \)shellcheck :\1 :' \
+		-e 's:^			gofmt \\$:\\:' \
+		-e 's:^			govet \\$:\\:' \
+		-i "${S}"/src/${EGO_PN}/test || die
+	# missing ... in args forwarded to print-like function
+	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
+		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
+}
+
+pkg_setup() {
+	if use server; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_compile() {
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/etcdctl
+	use doc && dodoc -r Documentation
+	if use server; then
+		insinto /etc/${PN}
+		doins "${FILESDIR}/${PN}.conf"
+		dobin bin/etcd
+		dodoc README.md
+		systemd_dounit "${FILESDIR}/${PN}.service"
+		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+		keepdir /var/lib/${PN}
+		fowners ${PN}:${PN} /var/lib/${PN}
+		fperms 0700 /var/lib/${PN}
+		keepdir /var/log/${PN}
+		fowners ${PN}:${PN} /var/log/${PN}
+		fperms 755 /var/log/${PN}
+	fi
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 2e680aa13a11..533e7c8757f3 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -2,6 +2,7 @@ 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-r1.ebuild 1923 BLAKE2B a4d5512227942fa186376800626487c25dd3427f2e59396fa33dcff7b3372b2ec77e937a00cb64449d7a293566779a909f7edddc52c617bd4acbdac18b6e6035 SHA512 e0b050b1f3e4561abcb78ba526ab3320d721dcb7374b37e231bd58af94f79937d5fa6ad91fd94410429e1cb4252a890fb1093185a50f3d3bb643b483d3c662b2
 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
diff --git a/dev-db/freetds/freetds-1.00.341-r1.ebuild b/dev-db/freetds/freetds-1.00.341-r1.ebuild
new file mode 100644
index 000000000000..5dc4218c97b3
--- /dev/null
+++ b/dev-db/freetds/freetds-1.00.341-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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).
+MY_PN="${PN}-dev"
+
+DESCRIPTION="Tabular Datastream Library"
+HOMEPAGE="http://www.freetds.org/"
+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="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
+# iODBC and unixODBC are mutually-exclusive choices for
+# the ODBC driver manager. Future versions of FreeTDS
+# will throw an error if you specify both.
+REQUIRED_USE="?? ( iodbc odbc )"
+
+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:= )
+	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= )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+
+# bind-tools is needed because the osql script calls "host".
+# binutils is for "strings".
+RDEPEND="${COMMON_DEPEND}
+	sys-devel/binutils
+	net-dns/bind-tools
+"
+
+S="${WORKDIR}/${MY_PN}.${PV}"
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable debug) \
+		$(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/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 812ffc92cbaa..e0bce7b8587a 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,9 +1,6 @@
 AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43cc68eed1ac71cf089c9fa32a1343d7ebfdf428e7f25032f5782aecfb86fb8f78528ffc708ab15dc7285a24e7 SHA512 4d5a48b4dd66aab04ba597b30e96b4601c6745acca21be1daf051ba6ce1e8fef1a0efa46d8e81da1ecdc893a8ee471bd8c7ed0c5436ee33b8b4f7cd18fdca1a5
-DIST mariadb-connector-c-3.0.3-src.tar.gz 666928 BLAKE2B 83181949f1867909fd96696ac5cc9d11433a0c772ecb97d862983916b235d380fd84462d547faf42756d6698dd9dbe7dcd4d6b1d0f6336e147f5a597108ea025 SHA512 6da66a32165cb74b106bf94e13a35d4bb38f05e5d2b3ff3740862dfc0892a7705977c1394b4f84b8e1f1e50a59a3fadbc62e7733b1feb532c6368a9fc262db04
-DIST mariadb-connector-c-3.0.4-src.tar.gz 659406 BLAKE2B 9285880338e6040976741d8b440d78ef95005d44e0e7b1428cb526735380038d6dfaccfd6bd689f4b9c084a340281b2d8f4f38a193d1c6a4c5853c5333617899 SHA512 6edc7b70380aade1c88a3d9dac70d6da846e6e2e7d7b0dc2eddaba148dc3889f2baa3e757a8b91e479b1ae14051d9f948fbfdc516219e21d4a3117f6700cb020
+AUX mariadb-connector-c-3.0.6-provide-pkconfig-file.patch 1838 BLAKE2B 454433d5815e818bb3cb08241b1629e7cb2e8c6b33d09e241db11cc7f18e73a8cbf40567fe47a613c420581f8487c39478bcbef22da4ba21b77a10f71e4b11ef SHA512 a3ec1a1702d2d5ae5ea6ef93e9bc7f01df548c65574b177a20e8b29694b078ebd67a409ed253467d1db38895e66285eaf73e604a507bfb09384bc3d15325cb60
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
-EBUILD mariadb-connector-c-3.0.3-r1.ebuild 3323 BLAKE2B fd0559a46920f20df4bfc0f96512c860345e63a3d9514ba43b4ba3c19d372da2d2eaa30e31d5c6756a857de0eb2f9f9e4b11bfff6396d65b0c0c7e844f0a4832 SHA512 654032eeeef401367f12941b21fd8f8ecaaaa53049b2699ce96a945e327defffcb257d0138b31a906aad1fcba0b43e6c4e52a8c7597583c6e2cd39e59a288a9a
-EBUILD mariadb-connector-c-3.0.4-r1.ebuild 2787 BLAKE2B 0f300bd4e7eb8f86f2ea358f0d26925ddb5df80bedeabb3bf1495da143a057afb4202d5a5335e4f439607d52e7eecfb0df22f25eb2d7a1fb754cec39f0f5ed73 SHA512 65fd079d9ebc7312a8ad47045b7653d6c4bc35b6581e10b4bf40208fbe1ef6b0edd45fbde18a65c86309b97c059d68441516c2b0149b99a8fbd39453628da099
-EBUILD mariadb-connector-c-3.0.6.ebuild 2787 BLAKE2B 0f300bd4e7eb8f86f2ea358f0d26925ddb5df80bedeabb3bf1495da143a057afb4202d5a5335e4f439607d52e7eecfb0df22f25eb2d7a1fb754cec39f0f5ed73 SHA512 65fd079d9ebc7312a8ad47045b7653d6c4bc35b6581e10b4bf40208fbe1ef6b0edd45fbde18a65c86309b97c059d68441516c2b0149b99a8fbd39453628da099
-EBUILD mariadb-connector-c-9999.ebuild 2787 BLAKE2B 0f300bd4e7eb8f86f2ea358f0d26925ddb5df80bedeabb3bf1495da143a057afb4202d5a5335e4f439607d52e7eecfb0df22f25eb2d7a1fb754cec39f0f5ed73 SHA512 65fd079d9ebc7312a8ad47045b7653d6c4bc35b6581e10b4bf40208fbe1ef6b0edd45fbde18a65c86309b97c059d68441516c2b0149b99a8fbd39453628da099
+EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2817 BLAKE2B a6096a7d9aa65984468bc171be778531a78d380fdb347c0377b9818f0637bb91a799c70572580aec6229aaefd084eb970fd62db98d92246c45dc0741a713209f SHA512 ef15674194ed80ed74ffb9a17e4ab6c2c347d1dd354606ba4a48ebf843439486548769d3c88c2d2eeb0348739ce00a75ddceba2bab7b309b538bb33923a57e9f
+EBUILD mariadb-connector-c-9999.ebuild 2824 BLAKE2B aeac543f01595fe6995ca8fb59450cfa4381593f7c034beec8f344880bf092f17e40e84fa3fb1e64aa1f8cdb82751bc75916b9d817df6800bcc8a3532c334734 SHA512 9c693876ede71b1ac59be9b10276e193b25497ee5c4411a6260449f31c73f1e7e28310574aa9e97f889f4f0382c167c188d0b3cbf03d2084aac73a1d2e5d2a90
 MISC metadata.xml 324 BLAKE2B fab5394015cd337683f65a257556ed0f15e35826bb0a6ce75a7033cd5931455ff2bed527064d698e9b3165f2cfcaff8a4bdfcad0b830482ae2e4389a79d529fb SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch
new file mode 100644
index 000000000000..02bbefce3576
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch
@@ -0,0 +1,48 @@
+--- a/mariadb_config/CMakeLists.txt
++++ b/mariadb_config/CMakeLists.txt
+@@ -46,6 +46,8 @@ ENDIF()
+ 
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in
+                ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in
++               ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY)
+ 
+ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
+ 
+@@ -54,3 +56,6 @@ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
+ INSTALL(TARGETS mariadb_config
+         DESTINATION "bin"
+         COMPONENT Development)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
++        COMPONENT Development)
+--- a/mariadb_config/libmariadb.pc.in
++++ b/mariadb_config/libmariadb.pc.in
+@@ -1,19 +1,11 @@
+-# 
+-#  pkg_config.pc.in
+-#
+-#  pkg_config configuration file 
+-#  For a detailed description of options, please visit
+-#  Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/)
+-#
+-
+-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
+-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
+-prefix=@PREFIX_INSTALL_DIR@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: libmariadb
+-Version: @LIBMARIADB_VERSION@
+ Description: MariaDB Connector/C dynamic library
+-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@
+-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@
+-
+-
++Version: @LIBMARIADB_VERSION@
++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
++Libs: -L${libdir} -lmariadb
++Cflags: -I${includedir}/mariadb
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3-r1.ebuild
deleted file mode 100644
index b15b8490e8e3..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3-r1.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
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
-	KEYWORDS="~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc"
-else
-	MY_PN=${PN#mariadb-}
-	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}-src"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	"
-RDEPEND="${DEPEND}
-	mysqlcompat? (
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	!dev-db/mysql-connector-c )
-	!>=dev-db/mariadb-10.2.0[client-libs(+)]
-	"
-PATCHES=(
-	"${FILESDIR}/gentoo-layout-3.0.patch" )
-
-src_prepare() {
-	local gpluginconf="${T}/gentoo-plugins.cmake"
-	touch "${gpluginconf}" || die
-	# Plugins cannot be disabled by a build switch, redefine them in our own file to be included
-	if ! use kerberos ; then
-		echo 'REGISTER_PLUGIN("AUTH_GSSAPI" "" "auth_gssapi_plugin" "OFF" "auth_gssapi_client" 1)' \
-			>> "${gpluginconf}" || die
-	fi
-	if ! use curl ; then
-		echo 'REGISTER_PLUGIN("REMOTEIO" "" "remote_io_plugin" "OFF" "remote_io" 1)' \
-			>> "${gpluginconf}" || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-DAUTH_GSSAPI_PLUGIN_TYPE:STRING=$(usex kerberos ON OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DPLUGIN_CONF_FILE:STRING="${T}/gentoo-plugins.cmake"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if use mysqlcompat ; then
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.4-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.4-r1.ebuild
deleted file mode 100644
index df11d5524952..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.4-r1.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
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-	KEYWORDS=""
-else
-	MY_PN=${PN#mariadb-}
-	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
-	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	"
-RDEPEND="${DEPEND}
-	mysqlcompat? (
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	!dev-db/mysql-connector-c )
-	!>=dev-db/mariadb-10.2.0[client-libs(+)]
-	"
-PATCHES=(
-	"${FILESDIR%/}/gentoo-layout-3.0.patch" )
-
-src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if use mysqlcompat ; then
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
new file mode 100644
index 000000000000..a72bd4c23537
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="git-r3"
+	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+	MY_PN=${PN#mariadb-}
+	MY_PV=${PV/_b/-b}
+	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+	KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc64 s390 sparc x86"
+fi
+
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
+	"
+RDEPEND="${DEPEND}
+	mysqlcompat? (
+	!dev-db/mysql[client-libs(+)]
+	!dev-db/mysql-cluster[client-libs(+)]
+	!dev-db/mariadb[client-libs(+)]
+	!dev-db/mariadb-galera[client-libs(+)]
+	!dev-db/percona-server[client-libs(+)]
+	!dev-db/mysql-connector-c )
+	!>=dev-db/mariadb-10.2.0[client-libs(+)]
+	"
+PATCHES=(
+	"${FILESDIR}"/gentoo-layout-3.0.patch
+	"${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch
+)
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_ZLIB=ON
+		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+		-DWITH_CURL=$(usex curl ON OFF)
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+		-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_LIBDIR="$(get_libdir)"
+		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+		-DINSTALL_BINDIR=bin
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	if use mysqlcompat ; then
+		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
+		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+	if use mysqlcompat ; then
+		dosym mariadb_config /usr/bin/mysql_config
+		dosym mariadb /usr/include/mysql
+	fi
+}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild
deleted file mode 100644
index df11d5524952..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.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
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-	KEYWORDS=""
-else
-	MY_PN=${PN#mariadb-}
-	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
-	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	"
-RDEPEND="${DEPEND}
-	mysqlcompat? (
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	!dev-db/mysql-connector-c )
-	!>=dev-db/mariadb-10.2.0[client-libs(+)]
-	"
-PATCHES=(
-	"${FILESDIR%/}/gentoo-layout-3.0.patch" )
-
-src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if use mysqlcompat ; then
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index df11d5524952..1b2b77025ff6 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,6 @@ VCS_INHERIT=""
 if [[ "${PV}" == 9999 ]] ; then
 	VCS_INHERIT="git-r3"
 	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-	KEYWORDS=""
 else
 	MY_PN=${PN#mariadb-}
 	MY_PV=${PV/_b/-b}
@@ -55,7 +54,9 @@ RDEPEND="${DEPEND}
 	!>=dev-db/mariadb-10.2.0[client-libs(+)]
 	"
 PATCHES=(
-	"${FILESDIR%/}/gentoo-layout-3.0.patch" )
+	"${FILESDIR}"/gentoo-layout-3.0.patch
+	"${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch
+)
 
 src_configure() {
 	# bug 508724 mariadb cannot use ld.gold
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index c6aaffd26a11..09f925f62941 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -2,4 +2,4 @@ AUX my.cnf-5.6 5144 BLAKE2B 2f977b6a92524cfabbdd19058430c62dd4d03a0587036f49057e
 DIST mariadb-galera-10.0.35.tar.gz 66950519 BLAKE2B a0b48de41234d1800c1734782bd604d30512e3d33d1937cd3e79f68ec804089166223ba53450ef630779d2b74bc4ace611dc748b4ceca7ed4e4151f97d693655 SHA512 e0160ef74d45c332edf49f21bb673b926008cba9ba650f97a47d7631260b2517db19e1730b76be77af4ee384aa5cc9b3453a24da57c48ab5f062f937494aee87
 DIST mysql-extras-20180515-1334Z.tar.bz2 321462 BLAKE2B 48fc1e0058fa824e6234b0f3319d261997e99f334c8583c0def4cdac4b59f2380d7153ab0fa2ca9a6ab15e35899c2a7586e3b61f4044c4c949110cc8ab9fb0e6 SHA512 de3000f0c65eed9595b52d53205cdcac60cb4a06a5aca27057c8beca6a7890f453aeeda0bb8487b8de75cfb4caa48682b7706273574876c5cefd0d03988c4f7e
 EBUILD mariadb-galera-10.0.35-r1.ebuild 27201 BLAKE2B d9a1443ed469f5ca28e4e25c494064877ae0363a46b6834488a83511da3e4149f4a033ec97da8e80a756e2b106a912748a4b78a46177543b4b1380ec2dab2a51 SHA512 df449a5020ee5d6993ad29026799d5987fb7c0bf3fd1de6fa2d1af521907fe71bb48e08ee6ffdd93722c823cb8719c3122e17aa7dcfba69cb9534d8d77b1fae2
-MISC metadata.xml 1812 BLAKE2B d8dca52245956dd59e770feaa45354e8b6d718b950a072bd8db93f162ac59ad4029556c5f02b7753a4b541eaf9e0d97d93eb29c06649be4391268212d395896e SHA512 7e2cb0d0b2bb303f475ac84dd9ebb23b1df940eec5fbe562cd238be1f2e1d3564edeb66b5d237d529ec1ab4b6aad4935d2ab490411f8083a934fd1f4894647e0
+MISC metadata.xml 1731 BLAKE2B 0e8a98423e36b3dd621d42ce512063fa8d703cb5254616fd2549cc6f2b03df3d521502b3def93b93000ea4c8b9c24d0bba01bb1417d88c2b2689dcf31876e996 SHA512 09073b18f31f6684cd0ecde266a1c41e7520baf8aa5ff31f19a815ce3f5fea3b1302e0eb702d377f5eb3535c5a7e2828965446b631bbf91219a8c898d1ee8c9e
diff --git a/dev-db/mariadb-galera/metadata.xml b/dev-db/mariadb-galera/metadata.xml
index 2e7afd2663cf..85ebf9880ac9 100644
--- a/dev-db/mariadb-galera/metadata.xml
+++ b/dev-db/mariadb-galera/metadata.xml
@@ -9,7 +9,6 @@
   <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages</flag>
   <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="jdbc">Enable the CONNECT engine to access foreign databases via JDBC</flag>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b221f81943d2..81c9c660ac32 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -20,8 +20,8 @@ EBUILD mariadb-10.0.36.ebuild 27527 BLAKE2B 492a99d33fdc94203de03864166a36cac62e
 EBUILD mariadb-10.1.34.ebuild 29472 BLAKE2B 859741b70abf8c2347395b26b7543f36be94165141227bb7dc75f054768490bf891eea5bd2f171aa0c0f8caed7603abf1347a0087caa10e55ce920aaa9c6677b SHA512 ff30a1fcdcc72b8324dec1be29db63a1792ca58474744f0c02014b1fba28d856ac0f154235b0889aedcc95cf24c4b58fcfd681458be726609861ba6f4220ad8f
 EBUILD mariadb-10.1.35.ebuild 29479 BLAKE2B b14a63bbdf81468902efaf712b2944b70964fafd0eaf42ec2dbc4ac2ea5d298031bbdadc43fa27dc7035931a50a818960fe2ddcfca4cef351ada73d028e4eaf9 SHA512 c346bc073836725d3a022a73106b4fea2e9de88cc0ee3571ce2e2d292f931b584ce21336d0a31ff7efe015e7692f51e5a1bdbfd21f2a69c65e5df08761ac9f72
 EBUILD mariadb-10.1.36.ebuild 29476 BLAKE2B 6b608a9e1ded83bc3d49644239912a7ee20f5fc5c48d60bdd9fa3320b7ac8d5188fc0a7039d28fc3ec1ced6b7a95b36c8f6807ad8da3700e34c2ff7300d73443 SHA512 0aeaabeb9cd43f0feba34013dd7381106bbd79370771429bcccbb821d9383d488264c7bd259d221776a6f971b021d1f902e7c61ba4e515e92eb908f789f74a90
-EBUILD mariadb-10.2.17.ebuild 33523 BLAKE2B e8209606e05f27c62ee62fdd6a65cc3b1265d43cf024cde462834d378926392791a26d76f7018df20ede173d1f374f7e38d13ea9f3ff8948ce55a16fea43f3cb SHA512 0bc6b436c69116b6e5a82b83691ff1ec57291a0be7a3ddc203380ec6d211807a2397b82922a9504b1d9060a18ef4f2d9cbf2e2eae651350cb568f76476efd8d0
-EBUILD mariadb-10.3.8.ebuild 32090 BLAKE2B b054d6ecb631b2d974dbe51723e0e517f791f62f80a3f198c0a9bbc9882d5152f9afc959e3c3dfd44af499f258bd3f2e6399c85535c899b93865ca50adf8b31a SHA512 e8f0d7053be5ab1b227af377892e2aa435b643534a162fa0a39d430611b59d55fbb116aaccebbe0528289a66fba6dcffd27e2f7d98015bd58b333b049d3733d6
-EBUILD mariadb-10.3.9.ebuild 32155 BLAKE2B 89b5292ee020e44ef89191da1c0d71bda768c7eaa77fea879fff22846aa8630ed46654902bc9ca18dd4ae8966897e94303b582290eb97d348ef5e48875d0b050 SHA512 cca2fd68be64bcf977ba4dc41844258557a7114f815ac40dcba9594d6488b4cb61d58ba53a9fa50d1b9ffb46ae265e7b68d0a45d94ce5528b0cc2e09a24af1bc
+EBUILD mariadb-10.2.17.ebuild 33523 BLAKE2B b7b5fbb5a3e548994978fa49c12f824c9765827251794c9a3fbef601b4999ad96fd359468112042849ff4be165df1beb018a094aa1ef2354ce9ec1f7f7342a07 SHA512 3e404176280ba7654240eb065a2964e7cb17a9ae4878c850641c6d40c33205954aab482a20709b999e56ef0f39ed2b6c1d69412cbd53ecccd8a4809af95b3116
+EBUILD mariadb-10.3.8.ebuild 32090 BLAKE2B 77fce2ea8c658e85face2c6ab7878b1ba8e392466e6e13704b2bf5678f54893660e1694c4247da75f37078ca8a4d33f65ab769fdec290dfa27670f45f581c026 SHA512 2d88a617f827d9f9a02b554c5ba2c712007431b8d3004084ee9f2b80efa017c3a744781e997e83448265114d4e08aa65c717682a0bb79d4c88d16f396ef58f22
+EBUILD mariadb-10.3.9.ebuild 32155 BLAKE2B db1ce7a82a3610bb3dde5f5ea6a565eead93046927e9d2a4b56f419f12fef7c92f9445502142b0ecd01ba401178a30aa3ef7de4fe1e207fdd17aeb3c8b11496f SHA512 a81b480072fa74ad311f63c85b119962d04ad19727aece8ec9e219420e9e7a8ec7c57965fb556d59fd47b2300f198a6d091920f272792fc3a5eb1619babc6211
 EBUILD mariadb-5.5.61.ebuild 27072 BLAKE2B f814240f2445f793ba04e912d20d3ad22c6bc1304379a0fbbbe0ae39cb8418ebe5c9d187253be11db4744ba75aabc70d0e4ef409ff71ea63cfbc3a6e08d464dc SHA512 d9b7f3d3711532e51938917b6b5976a7df15e74efb86c9c1621ef8e4dc813dbbf1d75d4e90e6ffb0d8924f58709a018ead3d153c6c250a4c775b18d005b4c300
-MISC metadata.xml 2692 BLAKE2B 2843540212ba28e3abc4e68851de3901801c25097f65d21f21698e47efbc32cce4d2e315e787c69cd2999c1077815a383eb52c9859e55bb0a5c3f4d6c6f48d17 SHA512 d5622dd8c6d4913801b8b7b0f893466c121857473673499a1e97cb47ab94c985bcf94fa9e2fed0fdb81ab6d8bbe6599ff51f8f78df4f6f5bdc33cca8aca9158e
+MISC metadata.xml 2611 BLAKE2B d1b6b11359e92a3d9cb2c58ed35a15e3cf42ab616ed907fa36a5f777168a805ffd03d01bd13fcd30352ef6c5e8b1d80f4e882ffaf8f6445ed3fce2bcc2a92923 SHA512 80395b35839acebbb18ac8d01e8c806bd89f18d32f85fcba41f41ecfc4f1f869dc8c51c90bb21ebd3c9ac30d51d47869a4dcf3b8ce73967e337e6e396b267c97
diff --git a/dev-db/mariadb/mariadb-10.2.17.ebuild b/dev-db/mariadb/mariadb-10.2.17.ebuild
index 774277f87d32..cb2ac87542dd 100644
--- a/dev-db/mariadb/mariadb-10.2.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.17.ebuild
@@ -247,7 +247,7 @@ pkg_postinst() {
 	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]."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
 	einfo
 }
 
diff --git a/dev-db/mariadb/mariadb-10.3.8.ebuild b/dev-db/mariadb/mariadb-10.3.8.ebuild
index f54bef478b0e..1a952db960e4 100644
--- a/dev-db/mariadb/mariadb-10.3.8.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.8.ebuild
@@ -238,7 +238,7 @@ pkg_postinst() {
 	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]."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
 	einfo
 }
 
diff --git a/dev-db/mariadb/mariadb-10.3.9.ebuild b/dev-db/mariadb/mariadb-10.3.9.ebuild
index d8976720941b..00cd9a6bcff1 100644
--- a/dev-db/mariadb/mariadb-10.3.9.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.9.ebuild
@@ -238,7 +238,7 @@ pkg_postinst() {
 	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]."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
 	einfo
 }
 
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index e58332a7acbe..3419b52226ee 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -14,7 +14,6 @@
   <flag name="innodb-lzo">Enables lzo compression methods for InnoDB/XtraDB</flag>
   <flag name="innodb-snappy">Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
   <flag name="jdbc">Enable the CONNECT engine to access foreign databases via JDBC</flag>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="mroonga">Add support for the Mroonga engine for interfacing with the Groonga text search</flag>
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index e67d2e7e2ee7..56040f63084b 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,18 +1,12 @@
-AUX 5.2.7-mariadb-dynamic-array.patch 3053 BLAKE2B 1c72b7318dcfd035655285c433a88d76d09200560db1530f76ab69e9ff765f17351b88aedabb297bb55f07aee5197cf29757534fc5373f95bad65fc49db93fe5 SHA512 26d35effbf4e74ef634c6e42dced40830402aa0925571f4bd55acd3dfe06f1c8c8f3bab4e9bb4bcd3f72dc87ecc3a093b984df4837548710899f97d8bdeca7b6
-AUX 5.2.7-my_malloc.patch 594 BLAKE2B c9d9aad2e9b9e3e2b30ff41e6ec68343557123517b808df6888d91f48e68cbb1de852f31b057dffea40264a717077e4bbce6f78438535eb11cb660986f469892 SHA512 bcd26b2f8de21404c741fec51bb7e7bec32a5d3fbc90471c157ee275dc6136a44a6ef4d2ad8dd170e2852679d3fcb0cc74cf4acca0570702206b4cded1cb1fa5
-AUX 5.2.7-r1-cxxlinkage.patch 1707 BLAKE2B aaf7ef0f319f2e00034307f51406c82580f5d257b61d722d7d610e731b9c549ff54b88279689c226df72837c5af35911ee1f4dd756b989f4018a78d3e3d5e940 SHA512 3d0f1839e1b200d7746d2c7161ee2a85813bf40517a70777d361e482efd6d6b0be88415d339d6dccc49de865a0d714fbbce2b74abb1bbc12c4f4681a5bd5abf8
 AUX 5.3-cmake-doc-path.patch 1480 BLAKE2B 5f89253a86fa97fbf4103fbe797f60449245195e9c8d0f6d7f065e654a402de0461459dd11d9d878f0794089261ee5ee9fac3240bf90f7c8382edb54d84b27a6 SHA512 aa2303161af2b53608acc127464951cf77492a1a90e869a58893ba10a014077d7f8f319325b77713fffceeaa002943f4ce52b6cb9571b0b3d3d7ab562601968d
 AUX 5.3.10-cxxlinkage.patch 1027 BLAKE2B b3df78658e4fb3243debb6f95cea6c5530db309ffc50f3a6afaff8bce143d147b4645a4bef4a54f6d04203ea132d4245812f5a2473ad7e9899f6e6b3c0799213 SHA512 f4d6df55313ccba995c8bd2e182397ce2652c2fbc0f0706474386654fb890fc47cad3a18f306206e840a47b729569e9a0ccb1cc2401c5280792afc4f544b41fd
 AUX 5.3.10-mariadb.patch 1744 BLAKE2B a9e33c86f999394d77757f69f1f314238123fa4158297961b4ce0f501e6fb743927e892c1f6640945842e843da56a826e5da1a968d84f7e5dcf3b2b4a590c0e8 SHA512 ebf62a2e0cc901fce81d0ad358f62d1c41494a5e35fb5a4df6913d1f4d5b8bbb638a23cabfe483818efa39688744b7be8b98d922b4bdff830de701c665da0fa0
 AUX cmake-doc-path.patch 1498 BLAKE2B b79110c92b7fc80c64fdf05b469c4bb333d68610ff4fadc78bd307689651e41bcd66f33fd782db1b69c863ef81faee3d5eb485d5c9bd284db8be3948d2bec7e7 SHA512 2e48af11efb55a1508402d5d1d717a3dfc9897bf0ccce5aa190792fb673ac78b27a9480e951a6347a2c8d0e2fe08a28c11fd08c55dbea835a93f525decaaf09e
 AUX odbc.ini.m4 406 BLAKE2B 3a20c28b1971753a14a4aa4d30efcc7de833488501a41d9404987567623d48250ce1daea1d3138adaef36741c4f2e0eafc60eba554e5262b45084f93f5205160 SHA512 84ab2a3aab594123d42b65205a7faf8e91fe9416a9e3c4c4c354533b9a298395f59172649c91dc0b671392bfbe5baeaddb6aa47119ce4c825917f3977d9dd521
 AUX odbcinst.ini.m4 118 BLAKE2B 6da835746e063f415ad7d640233cfd96e744cd56e12aaab4a21a2bf0bd5f1bd1e5c3d1c9a28522e3aa07c1261abac92301819d4112ac6a000a729aca9f7f7ad6 SHA512 6d929bbffd602a9f060a05998149a6b16334f8a5e3db30d02ff5d38c0065085d085042521e700b87a63766e32aa27ae92be72cef33c2a7aa8f6767b6b71c82c8
-DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 BLAKE2B 297f1ae57802f682616283bae9c3ff7ef88f8f016274884794f6b476bf9b92bc1da8af9cb89f41fa2a74238f91fbc39b9427529b806ac4ffb52aecd895cd8cd8 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
 DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a566668be17f595ca7ba SHA512 ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e SHA512 02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
-EBUILD myodbc-5.2.7-r1.ebuild 3300 BLAKE2B 9cc0f8a8ddf448c286594d7f27a85c113b98de2ded3eee1cc16661c54f48075fded3a8b0906a542a4a268e1144ab6d9c1b221d850b06faf9553bde8b4ca731bd SHA512 d8ffec3733dd3a811155fe03296081d3d54c17ed2d46b41e48213cf5f996ae7a4955d216355a8c0afa20142ccd243ebbbbfb8d40826fcd3f1a1e681b34126879
-EBUILD myodbc-5.2.7-r3.ebuild 3698 BLAKE2B 150992141e50dad64396392399791f02a8920485dae1d23c776a89cce3f648b9d0fac1c59202409be03c5bc27b7ca582d31ab1ff3480d9beef5847eda0e0380d SHA512 ee50335e1dff98d7b5b2a4248972c8423a4aaa8293a9404f659a789b9bb915f43e2d174482e07a9179af1cf6bf822de6a5a2e746f7410de7b06a350a3d03f9d2
 EBUILD myodbc-5.3.10-r2.ebuild 3588 BLAKE2B db9749af6dd80c60ae359485e3526258e43ea7003b2302076b0ef39a72098663b27f9413d050809328fe4348f5c129135f163da8d895f65d8c9f76bd53415eb4 SHA512 33d3aced0bc4575baa860dc53f1a6b35b6a5dc2e1815d88922d66c5270e570deaa0dc20018d9329c4651cef00f48b902b208671dd0836e7224d11972491b9e66
 EBUILD myodbc-5.3.9.ebuild 3072 BLAKE2B 4922ed231672f11742590007b7b1f5c5dfa27263a6c98893b373793da06088f29c5401917179d479f4c57b24b2a1be9c3507caa752db79f3268fceff4719013d SHA512 4da8b034a745c453a310391a38e5cb1697bfa51838edc6903ee643e7dbe28fa5fb8f7d34264f88bb79b2aba83fa042212c0a2dd251c15150f7f0a2fcf561e052
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch b/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch
deleted file mode 100644
index 6cfe7cd274b3..000000000000
--- a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c
---- a/driver/catalog_no_i_s.c	2014-06-18 18:50:16.000000000 -0400
-+++ b/driver/catalog_no_i_s.c	2014-08-20 14:08:33.997339096 -0400
-@@ -1093,7 +1093,11 @@
-   unsigned long *lengths;
-   SQLRETURN rc= SQL_SUCCESS;
- 
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+  my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0));
-+#else
-   my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
-+#endif
- 
-   /* Get the list of tables that match szCatalog and szTable */
-   pthread_mutex_lock(&stmt->dbc->lock);
-diff -aurN a/driver/desc.c b/driver/desc.c
---- a/driver/desc.c	2014-06-18 18:50:16.000000000 -0400
-+++ b/driver/desc.c	2014-08-20 14:07:37.409169269 -0400
-@@ -63,8 +63,12 @@
-      but in desc_get_rec we manually get a pointer to it. This avoids
-      having to call set_dynamic after modifying the DESCREC.
-   */
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+  if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0)))
-+#else
-   if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
-+#endif
-   {
-     x_free((char *)desc);
-     return NULL;
-   }
-@@ -995,9 +1003,15 @@
- 
-   /* copy the records */
-   delete_dynamic(&dest->records);
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+  if (my_init_dynamic_array(&dest->records, sizeof(DESCREC),
-+                            src->records.max_element,
-+                            src->records.alloc_increment, MYF(0)))
-+#else
-   if (my_init_dynamic_array(&dest->records, sizeof(DESCREC),
-                             src->records.max_element,
-                             src->records.alloc_increment))
-+#endif
-   {
-     return set_desc_error(dest, "HY001",
-               "Memory allocation error",
-diff -aurN a/driver/handle.c b/driver/handle.c
---- a/driver/handle.c	2014-06-18 18:50:16.000000000 -0400
-+++ b/driver/handle.c	2014-08-20 14:05:00.364248403 -0400
-@@ -403,7 +403,11 @@
-     }
-   }
- 
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+  my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0));
-+#else
-   my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
-+#endif
-   memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
- 											(*param_bind)->max_element);
- 
-diff -aurN a/driver/parse.c b/driver/parse.c
---- a/driver/parse.c	2014-06-18 18:50:16.000000000 -0400
-+++ b/driver/parse.c	2014-08-20 14:03:54.336383876 -0400
-@@ -129,8 +129,13 @@
- 
-     /* TODO: Store offsets rather than ptrs. In this case we will be fine
-        if work with copy of the originally parsed string */
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+    my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10, MYF(0));
-+    my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0));
-+#else
-     my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10);
-     my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
-+#endif
-   }
- 
-   return pq;
diff --git a/dev-db/myodbc/files/5.2.7-my_malloc.patch b/dev-db/myodbc/files/5.2.7-my_malloc.patch
deleted file mode 100644
index bc6c65ef3011..000000000000
--- a/dev-db/myodbc/files/5.2.7-my_malloc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Brau a/util/odbcinstw.c b/util/odbcinstw.c
---- a/util/odbcinstw.c	2014-04-23 21:54:40.000000000 +0200
-+++ b/util/odbcinstw.c	2015-05-08 15:29:09.400568356 +0200
-@@ -68,13 +68,7 @@
- 
-   if (lpszRetBuffer && cbRetBuffer)
-   {
--    ret= malloc(cbRetBuffer + 1);
--    /*
--      We cannot rely on getting correct results from the next call of
--      SQLGetPrivateProfileString. So, taking precautions against unititialized
--      values in the allocated buffer.
--    */
--    memset(ret, 0, cbRetBuffer + 1);
-+    ret= my_malloc(cbRetBuffer + 1, MYF(MY_ZEROFILL));
-   }
-   else
-     ret= NULL;
diff --git a/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch b/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch
deleted file mode 100644
index 2bdb4a581c89..000000000000
--- a/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -uarN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
---- a/cmake/FindMySQL.cmake	2014-06-18 18:50:16.000000000 -0400
-+++ b/cmake/FindMySQL.cmake	2014-08-20 10:05:00.191485304 -0400
-@@ -105,16 +105,16 @@
-   # Finally remove the dot
-   STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}")
- 
--  IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+  IF(MYSQL_CXX_LINKAGE)
-     EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags"
-             OUTPUT_VARIABLE _mysql_config_output
-             )
-     SET(MYSQL_CXX_LINKAGE 1)
--  ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+  ELSE (MYSQL_CXX_LINKAGE)
-     EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
-             OUTPUT_VARIABLE _mysql_config_output
-             )
--  ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+  ENDIF(MYSQL_CXX_LINKAGE)
- 
-   # Remove the stl4port dependency
-   STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}")
-diff -aurN mysql-connector-odbc-5.2.7-src.orig/CMakeLists.txt mysql-connector-odbc-5.2.7-src/CMakeLists.txt
---- a/CMakeLists.txt	2014-08-27 13:51:27.050553560 -0400
-+++ b/CMakeLists.txt	2014-08-27 13:55:41.702359680 -0400
-@@ -256,10 +256,9 @@
- SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
- SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
- 
--SET(LIB_SUBDIR "lib")
--IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)")
--  SET(LIB_SUBDIR "lib64")
--ENDIF()
-+IF(NOT LIB_SUBDIR)
-+        MESSAGE(ERROR "LIB_SUBDIR is not set")
-+ENDIF(NOT LIB_SUBDIR)
- MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
- 
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
deleted file mode 100644
index 2698ccabd5da..000000000000
--- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib eutils flag-o-matic versionator
-
-MAJOR="$(get_version_component_range 1-2 $PV)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql.com/products/myodbc/"
-SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
-
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	dev-db/unixODBC[${MULTILIB_USEDEP}]
-	~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-src_prepare() {
-	# Remove Tests
-	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
-		"${S}/CMakeLists.txt"
-
-	# Fix as-needed on the installer binary
-	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
-
-	# Patch document path so it doesn't install files to /usr
-	epatch "${FILESDIR}/cmake-doc-path.patch" \
-		"${FILESDIR}/${PVR}-cxxlinkage.patch" \
-		"${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
-
-	# Fix undefined references due to standards change
-	append-cflags -std=gnu89
-}
-
-multilib_src_configure() {
-	# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
-	# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
-	mycmakeargs+=(
-		-DMYSQL_CXX_LINKAGE=0
-		-DWITH_UNIXODBC=1
-		-DMYSQLCLIENT_LIB_NAME="libmysqlclient.so"
-		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-		-DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-		-DLIB_SUBDIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	dodir /usr/share/${PN}-${SLOT}
-	for i in odbc.ini odbcinst.ini; do
-		einfo "Building $i"
-			sed \
-			-e "s,__PN__,${DRIVER_NAME},g" \
-			-e "s,__PF__,${MAJOR},g" \
-			-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
-			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
-			<"${FILESDIR}"/${i}.m4 \
-			|| die "Failed to build $i"
-	done;
-	mv "${D}/usr/bin/myodbc-installer" \
-		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
-}
-
-pkg_config() {
-
-	[ "${ROOT}" != "/" ] && \
-		die 'Sorry, non-standard ROOT setting is not supported :-('
-
-	local msg='MySQL ODBC driver'
-	local drivers=$(/usr/bin/odbcinst -q -d)
-
-	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
-		rc=$?
-		eend $rc
-		[ $rc -ne 0 ] && die
-	else
-		einfo "Skipping already installed ${msg}"
-	fi
-
-	local sources=$(/usr/bin/odbcinst -q -s)
-	msg='sample MySQL ODBC DSN'
-	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
-		rc=$?
-		eend $rc
-		[ $rc -ne 0 ] && die
-	else
-		einfo "Skipping already installed ${msg}"
-	fi
-}
-
-pkg_postinst() {
-
-	elog "If this is a new install, please run the following command"
-	elog "to configure the MySQL ODBC drivers and sources:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "Please note that the driver name used to form the DSN now includes the SLOT."
-	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
-}
diff --git a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
deleted file mode 100644
index f44807fe599e..000000000000
--- a/dev-db/myodbc/myodbc-5.2.7-r3.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
-inherit cmake-multilib flag-o-matic versionator
-
-MAJOR="$(get_version_component_range 1-2 $PV)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql.com/products/myodbc/"
-SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
-
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-# Does not build with mysql-connector-c
-RDEPEND="
-	dev-db/unixODBC[${MULTILIB_USEDEP}]
-	~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
-	!dev-db/mysql-connector-c
-	!>=dev-db/mariadb-10.2.0
-"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-src_prepare() {
-	# Remove Tests
-	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
-		"${S}/CMakeLists.txt"
-
-	# Fix as-needed on the installer binary
-	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
-
-	# Patch document path so it doesn't install files to /usr
-	local FILES=( "${FILESDIR}/cmake-doc-path.patch"
-		"${FILESDIR}/${PV}-r1-cxxlinkage.patch"
-		"${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
-		"${FILESDIR}/${PV}-my_malloc.patch" )
-
-	# Fix undefined references due to standards change
-	append-cflags -std=gnu89
-
-	MYSQL_SERVER_INCLUDE=$(mysql_config --include | cut -d ' ' -f 1)
-	append-cflags "${MYSQL_SERVER_INCLUDE}/server"
-
-	append-cppflags -DSTACK_DIRECTION=1
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
-	# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
-	mycmakeargs+=(
-		-DMYSQL_CXX_LINKAGE=0
-		-DWITH_UNIXODBC=1
-		-DMYSQLCLIENT_LIB_NAME="libmysqlclient.so"
-		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-		-DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-		-DLIB_SUBDIR="$(get_libdir)"
-		-DNO_THREADS=ON
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	dodir /usr/share/${PN}-${SLOT}
-	for i in odbc.ini odbcinst.ini; do
-		einfo "Building $i"
-			sed \
-			-e "s,__PN__,${DRIVER_NAME},g" \
-			-e "s,__PF__,${MAJOR},g" \
-			-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
-			-e "s,lib/libmyodbc,$(get_libdir)/${DRIVER_NAME}/libmyodbc,g" \
-			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
-			<"${FILESDIR}"/${i}.m4 \
-			|| die "Failed to build $i"
-	done;
-	mv "${D}/usr/bin/myodbc-installer" \
-		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
-}
-
-pkg_config() {
-
-	[ "${ROOT}" != "/" ] && \
-		die 'Sorry, non-standard ROOT setting is not supported :-('
-
-	local msg='MySQL ODBC driver'
-	local drivers=$(/usr/bin/odbcinst -q -d)
-
-	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
-		rc=$?
-		eend $rc
-		[ $rc -ne 0 ] && die
-	else
-		einfo "Skipping already installed ${msg}"
-	fi
-
-	local sources=$(/usr/bin/odbcinst -q -s)
-	msg='sample MySQL ODBC DSN'
-	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
-		rc=$?
-		eend $rc
-		[ $rc -ne 0 ] && die
-	else
-		einfo "Skipping already installed ${msg}"
-	fi
-}
-
-pkg_postinst() {
-
-	elog "If this is a new install, please run the following command"
-	elog "to configure the MySQL ODBC drivers and sources:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "Please note that the driver name used to form the DSN now includes the SLOT."
-	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
-}
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index e2f29235e27c..cd33e296f0a1 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -8,5 +8,5 @@ DIST mysql++-3.2.1.tar.gz 2256735 BLAKE2B 8d5e713926a405fa9b93af690554595d8cc79c
 DIST mysql++-3.2.3.tar.gz 3241023 BLAKE2B 5faa5711c7ed7c64346013bd1ca6e7dc20e5b23d33983a719c892bbd1002f3986206df6cfef54316f11aa480f18dbc0a2cf6944f9572f3a7dca24cdb73099eb9 SHA512 b6b0a9856ede9e5e08be0f5ed1689b1256f8cf31c3afbb9c9e7f68d0734380e25909ef31cd04be6b253c86b2f881df10f3793a2d3e32042375dbbab4b0700d0a
 EBUILD mysql++-2.3.2-r1.ebuild 1410 BLAKE2B 6acbf4805dc44570d1d1b9df9a1c8769d3c13c9658b74cbad2052313d0538552693da45f2558be1afea78f80d6492ec36a9c02389ecbc054c60610ad521030eb SHA512 badefe7d214bd55b81965070b814b94c15fe3635d87c265225d2f9fef02360c3e09adeeb79a75c9990e89d596f111fc958c2a5fcec63624f14404192e4a26884
 EBUILD mysql++-3.2.1.ebuild 901 BLAKE2B 0e6c3feef947f749d7124284dad8ce91d14fed57d7a24730482dea19646a8b675113577138d4d81dd3e803df74f13a91fe40b1959fa145bf676b8d301a24d588 SHA512 6a2029dab230cf4c1e4c344362ef7ae8204775a1dd898da6d5bbe274c3b5ad1b1d223eb6e4b4c5915b87b7c6b401c40b3630c8aa0546d4c0192ba418f4d1cf31
-EBUILD mysql++-3.2.3.ebuild 1562 BLAKE2B bc58aef5302e7b7a56765dbb106d6e7d9701067dd44d47239372476bb2f5fd9a0b7aee8f08f424db3941e4a7bfad84a07987b4fad3ff0e4f5dbe6932a14bd2bf SHA512 8a3435d70bd453f94dc31b4759de016d9948e3b833cc5d74fdce7ef1b32a11a7e715265182eb7bf7275ba764f1e762cc8797b2995afd161bcc95100bf425338b
+EBUILD mysql++-3.2.3.ebuild 1561 BLAKE2B c55bc278056abe36b0ab2eb902882ad97b2d99230b50bc55ab0d426b9342b98a9fbb46fba0767fad520d0cce3bda9ed31457ced665d436df511abf9ff2fd9b41 SHA512 9cb3fb85b33b17ad94861dff4970a18e537b13e6b1d72b10ff21d93deb5d773a7529be4dca96ee75e877d5bb8da10f75960ffbea49fe22f22634b448a40c31ea
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3.ebuild
index e314c0bc75ab..4e9adb043372 100644
--- a/dev-db/mysql++/mysql++-3.2.3.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND="virtual/libmysqlclient:="
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 4a750a6af64a..7de631e1fb67 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -8,4 +8,4 @@ DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B c397fdf7ffb3fcbcecda2093
 EBUILD mysql-cluster-7.2.31.ebuild 4305 BLAKE2B 8fd24da2fb5a3ea90022791843f76a06ab1c12a0a8fa0bb64e0357e2d2367709093544646d0993f904ec5fc041c21380d4ed3e9358cc1809d36c70b777c092ea SHA512 930bd60377563298a1b596685c2b5bf43d995415f06fc8f6b9e1e10c97cbbe43a97de255450bb177873033b99bf303bc3c4fa41bef124d2b29a7767923b39a24
 EBUILD mysql-cluster-7.3.19.ebuild 6311 BLAKE2B 599d98a3ae24dc3d3162a436f00824db3fbf53dddc0ab913010460c60a229f2419523059f1bfd7f024a904c7b62295e9b40e0f7157580497e21dbe166f1fc8aa SHA512 f7f277ba28ef4159bf83cdfa5e2c81a0d10649d5fa9919517dffed567857b71a1c3259d404dd9b2dfbee6a7a0566c02c48c8fe04eab8b28a9001d372c9fec776
 EBUILD mysql-cluster-7.4.17.ebuild 6311 BLAKE2B 599d98a3ae24dc3d3162a436f00824db3fbf53dddc0ab913010460c60a229f2419523059f1bfd7f024a904c7b62295e9b40e0f7157580497e21dbe166f1fc8aa SHA512 f7f277ba28ef4159bf83cdfa5e2c81a0d10649d5fa9919517dffed567857b71a1c3259d404dd9b2dfbee6a7a0566c02c48c8fe04eab8b28a9001d372c9fec776
-MISC metadata.xml 1657 BLAKE2B b8d1d71537ecc478d51177e5f78f02d4d07fd056fa5f15742d33066fd71b78b60aa62cf02028964748238f6ec1879e19dff42bbf7da56018ad652b6a63751dc8 SHA512 594c4282f0ca9fd8b207778f5fcb00397a8779564b95f50ac99b22f48a4df80372675243a62a68f6e026733a31a383c43820450eb3f00cb13bce974b7e7368ae
+MISC metadata.xml 1576 BLAKE2B 271aa2c62b14389e7cefba652c6473058c4ecdb1efa698a8d5fbcde70ecd9d311b03b17a8ec5bdf85cea3cf00616ad5b97794e21639004ac739ea466c3653cc4 SHA512 9c5cb1fcd1ef3f94c94ac52bab99a0e794c33ec511f8800d1bfa84a94a1a576979560cad9ef539010b4865ff2392680227f18d7096f39e39c70e5720b4b0d53c
diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml
index 0efe3d7675fa..e769804157d3 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -10,7 +10,6 @@
   <flag name="community">Enables the community features from upstream.</flag>
   <flag name="embedded">Build embedded server (libmysqld)</flag>
   <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d360a7eb7002..14bf6c7e9344 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -9,8 +9,9 @@ DIST mysql-5.6.40.tar.gz 32083035 BLAKE2B efcc078341bae239df28ac0504111aa3492688
 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-20180804-2323Z.tar.bz2 322215 BLAKE2B cca9e502e375bf43473335868517f6c450fc7bcf03e55de5a294c8bdcfcac2bb783dec09bbb3b6c30a561ba7e3a943543c017e2d42b61d466e699acdef4c0231 SHA512 efd9d416f394cc61b977ab76f05ab3acc5803ff8bdee8e1dbc65cc5b3f07e4f9742140d9586c028908b10fcc44f21c98ebffdebcc5c3578acbe05b07526bcb3d
+DIST mysql-extras-20181017-2201Z.tar.bz2 328311 BLAKE2B f1b179e0f2d63105f03ba238125e6cfa2c0cbf2084251b6c344bd02517899322bd161470eddab28c514349caac6401c35909b2f37264fdaf2dc196a309d3cc27 SHA512 26e26a3ad926bc9267d89f0bc34b030bc6292f21d3007185c4c1155beaa608566b4268f93edb64fd6156dbae80ac4f2817e78c1e92e90985e2675c2b1f97854e
 EBUILD mysql-5.5.61.ebuild 25516 BLAKE2B 3363fc9f99fb6a3085a7de3cf540ddd853365b5865a418c752255417040ca568fa16a02e0b74cd98502eeadda4d11e7bd37269d1416232db279eedee15630320 SHA512 ccfbdef198de75215efb498a76525e03f469a5c596b9fe366f9e1973969f928263be1628b378369d76899eea6d7750c45ce07827d11b0f277b2aee2242540645
 EBUILD mysql-5.6.40-r2.ebuild 25633 BLAKE2B f8ec8617de040020878220e209fa36331f8570906177c950b36cca698c6864b38d8fc98eb7daf5b9f3536a2872ad5f5bc2dbaba8f72cd86894bb0bc5ca1385dd SHA512 9b3973d9c6c6c019f0b760f1b2a1f78b46337276d81b2c6b986c2e38a4aee5d4856ca5dde3f39ff33e503871ff6c9962da08a3ebfe1c74e52e970912908ee136
 EBUILD mysql-5.6.41.ebuild 25640 BLAKE2B 5398748da6151698932be68f502e5cf958b06304eda0a392c47d4e324334375b3f5359eacc76a8a9654ed18a6fce13e47a395c636e9718adc1bb3a0b41004911 SHA512 70e2783ad591e3c005c5324e92d36dd963e3241416435f41aaf37b14de3b812dd48b715557dff4fe41026bc8020c026bf33f99e518880cf62957250fc4242efc
-EBUILD mysql-5.7.23.ebuild 27020 BLAKE2B b430c1582c802202d25a13049fccbbfa761d729b868ac7a22930f685c40d8e6a122a7a4c8bf8b830b17328592cb353cc33a4b32094675dac95aa957e6332652d SHA512 f1284dc26df2fee22d8f3dcdcbe3a0c34da350849fa99fcd30e661310eb51dc09ad18cdf2b65d2527d91a9bc37f96f6553b9c3994f8110b4f134bd8656711430
-MISC metadata.xml 1436 BLAKE2B d05f050f50dd99df94a216e0d5b6a8837ee2b53853169a0fbd28d1cd6e2fec40d4fe87c229da31cd56a3fae18a31e5ff283ccbad6c3d69eaf06db0f6f9099f65 SHA512 987ad1be9aa1376f5819f23c457f7dbafedc703d6773281f0b56aba21da319f6b067e4c161a67c65fcec64e29482d71a5623265e3c4eda5a5398e5aa71d183c8
+EBUILD mysql-5.7.23-r2.ebuild 29896 BLAKE2B 0c9675fea61e83fe824be13c95cfe6eb57bf997ad82707e1ce1619fd5c09301f3359c733dd8f8a67ded5f5cf9915238a4975a73a57a3bfa3ee4772f373462b01 SHA512 3a22294d6138ed5194869fb71b590f37f99d8c94f01f67b0d241d6b69ee07325f5d8f7728b1ccffb7030b920522ff7d33cc6b2e64ed43b695c8c7a54c3277f7f
+MISC metadata.xml 1539 BLAKE2B 0bc66c5855bd1f4353a7f0b551229d68a940478687b4f38653f973e4a5cfcb946c86bdc2d8318aa96aba43598eb476b995005f26727dfa176ced00fbe2b129a1 SHA512 bc0ce8a3de5e55d954f65eec657930af069d3550f485334f80dfa4c6d17c6298d0609d1ba4fe8b6c988f8ad007858f147c17f1354c207891ac1a062a36af50ad
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 8ae0465d9236..d3fabed9ef6b 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -11,9 +11,10 @@ dev-db/mysql
 dev-db/mariadb
 -->
 <use>
+  <flag name="cjk">Add CJK support for InnoDB fulltext search using <pkg>app-text/mecab</pkg></flag>
   <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages (not recommended)</flag>
+  <flag name="experimental">Build experimental features aka "rapid" plugins</flag>
   <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
diff --git a/dev-db/mysql/mysql-5.7.23-r2.ebuild b/dev-db/mysql/mysql-5.7.23-r2.ebuild
new file mode 100644
index 000000000000..a291cfbf34aa
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.23-r2.ebuild
@@ -0,0 +1,932 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20181017-2201Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit cmake-utils eutils flag-o-matic linux-info \
+	prefix toolchain-funcs user multilib-minimal
+
+SRC_URI="https://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"
+fi
+
+HOMEPAGE="https://www.mysql.com/"
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+LICENSE="GPL-2"
+SLOT="0/18"
+IUSE="cjk client-libs cracklib debug experimental 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}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-libressl-support.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-add-missing-gcc-8-fix.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-mips-ASM.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="net-misc/curl:=
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	sys-libs/ncurses:0=
+	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
+	!client-libs? (
+		dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
+		>=sys-libs/zlib-1.2.3:0=
+	)
+	jemalloc? ( dev-libs/jemalloc:0= )
+	kernel_linux? (
+		dev-libs/libaio:0=
+		sys-process/procps:0=
+	)
+	server? (
+		>=app-arch/lz4-0_p131:=
+		cjk? ( app-text/mecab:= )
+		experimental? (
+			dev-libs/libevent:=
+			dev-libs/protobuf:=
+			net-libs/libtirpc:=
+		)
+		numa? ( sys-process/numactl )
+	)
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	tcmalloc? ( dev-util/google-perftools: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= )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	dev-libs/protobuf
+	virtual/yacc
+	server? (
+		dev-libs/libevent
+		experimental? ( net-libs/rpcsvc-proto )
+	)
+	static? ( sys-libs/ncurses[static-libs] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= )
+	selinux? ( sec-policy/selinux-mysql )
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+"
+# 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 )"
+
+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_pretend() {
+	if use numa ; then
+		local CONFIG_CHECK="~NUMA"
+
+		local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
+		WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
+
+		check_extra_config
+	fi
+}
+
+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 ${PN} reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/mysql.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/mysql.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 appropriate 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() {
+	cmake-utils_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
+
+	# Remove bundled libs so we cannot accidentally use them
+	# We keep extra/lz4 directory because we use extra/lz4/xxhash.c via sql/CMakeLists.txt:394
+	rm -rv \
+		"${S}"/extra/protobuf \
+		"${S}"/libevent \
+		"${S}"/zlib \
+		|| die
+
+	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
+}
+
+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
+
+	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_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_LIBEVENT=system
+			-DWITH_LZ4=system
+			-DWITH_MECAB=$(usex cjk system OFF)
+			-DWITH_NUMA=$(usex numa ON OFF)
+			-DWITH_RAPID=$(usex experimental 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
+		)
+
+		if use profiling ; then
+			# Setting to OFF doesn't work: Once set, profiling options will be added
+			# to `mysqld --help` output via sql/sys_vars.cc causing
+			# "main.mysqld--help-notwin" test to fail
+			mycmakeargs+=( -DENABLED_PROFILING=ON )
+		fi
+
+		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_FEDERATED_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+
+	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
+}
+
+# Official test instructions:
+# ulimit -n 16500 && \
+# USE='latin1 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 ; do
+			_disable_test "$t" "False positives in Gentoo"
+	done
+
+	if use numa && use kernel_linux ; then
+		# bug 584880
+		if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
+			for t in sys_vars.innodb_numa_interleave_basic ; do
+				_disable_test "$t" "Test $t requires system with NUMA support"
+			done
+		fi
+	fi
+
+	if ! use latin1 ; then
+		# The following tests will fail if DEFAULT_CHARSET
+		# isn't set to latin1:
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_xa_prepared_disconnect \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			innodb.innodb_pagesize_max_recordsize \
+			innodb.innodb-system-table-view \
+			innodb.mysqldump_max_recordsize \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			main.type_string \
+			main.information_schema \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_xa_survive_disconnect \
+			rpl.rpl_xa_survive_disconnect_lsu_off \
+			rpl.rpl_xa_survive_disconnect_table \
+		; do
+				_disable_test "$t" "requires DEFAULT_CHARSET=latin1 but USE=-latin1 is set"
+		done
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	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"
+}
+
+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
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+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
deleted file mode 100644
index aad033f5ecc8..000000000000
--- a/dev-db/mysql/mysql-5.7.23.ebuild
+++ /dev/null
@@ -1,845 +0,0 @@
-# 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/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index 24989252a86f..a88bda360680 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -1,29 +1,45 @@
 AUX 12.1.0.2-makefile.patch 2211 BLAKE2B 404433299397601d40d168c4ca7530fffdb9d5a39de630b04d51d3a9de70bae8859bfe047e7ac09318fa6b561ff9d94775ee08ba384c92908569855b9b42a209 SHA512 b42672e4c46f3f8a9e9bbb5bda935e20516a72ac71c9a7ba561f29fa7ff654da7abb7e6ddf3e4e236a29d29c1b7b35e469bbe60af62c5ff9065f7d8aa867b758
+AUX 18.3.0.0-makefile.patch 990 BLAKE2B c910fe75ffe32fe9b10a209670c28328492c9ce6a6fd51c6fb0a267b6c09b89eccab9ea40e8c923d181012c1b15e927f28b65d57f816f2b4eaf619a1a08655cb SHA512 907829ddbd58e98f5d07077cd14e3db54dc16f09e84a74b21f073305b5f39c38ae9d59dad5494241f985a125c24ec98223a88425fed65e838584c8b17e6611b7
 AUX tnsnames.ora.sample 2939 BLAKE2B d02d4be5eae8c8da346f8b0ddd2b6808e59f8e77f805b22154a77d22db325d415ecaf811323de3c7a6764a9167fb7f9a9708d1cf2de891858bc43bd5e050954d SHA512 25bb734bf4b7ea1d2ce2bddfd241204e796cad0d1d49036e567237d7ca92d158ab7bf69ff3abe210050c8ee0a0630f9217ced22dc31770814d822f93b2af5845
 DIST instantclient-basic-linux-12.1.0.2.0.zip 59727331 BLAKE2B 8a4beb891fd6693b74be4f575bff3af7f70cb751a9fbfab80aa145737008cc745f83f2ec349a5959fcaac9aa789210ecd6da88e0eea63d23ce62fcb402274ea8 SHA512 5d93c72c43ba2ca765209f4c1d518b9e93c80ff33625bf0bc33b974413e2b91ab22681e0922d2148fbfa6b6043fe84eee5334aa398e1ee7b1c2663ff2b3bb235
 DIST instantclient-basic-linux-12.2.0.1.0.zip 64594237 BLAKE2B bd74522486ec6be857ed83e23a1a64a2794dc14ac184ef9dd4324fc4b9d0d61be8b6b70e32cfe814c6c8972bc7c9aef1d48a60180b8310d861fa66179027c391 SHA512 35cdd84765f1e020cd1e7fe3a765449bcad1c3b09189ab64f6a969da27d7ff2932bad319037ec066615e672d2b3105d4c36b42ec30ab60d6c577a2796908d22b
+DIST instantclient-basic-linux-18.3.0.0.0dbru.zip 67930600 BLAKE2B 70d9c54a8df66859d40e4374cd3073613fbf3656850373ada6c9707a7076e0d0749e3b1a84e2d46d18643f80020ecf8c525224433c946946787388dc3f57c79c SHA512 3e1bda593c14d14942c7bf8393111792df01bc9d5a15ae0b4010bd29d71bda4ab044dca6741d00185976c70790fc24b5221afc436d33abe6277e7513cb8bd859
 DIST instantclient-basic-linux.x64-12.1.0.2.0.zip 63352239 BLAKE2B 88042fbdccc6b79e8ed82f78f47ac985af413c53b9f2c9654a8ab10008ca9f7cdc4c46a12af5eca6aca47f27bd4d28ee465cd6ed91076268a361faa247440162 SHA512 e4cbdf40f00521651002f0753ead292b7a33352a7dae5d77635fbdb784451a1b9331ad614326dccdea34ecff3d44ddd0932b83c4bd405e69d95c7decae945f2c
 DIST instantclient-basic-linux.x64-12.2.0.1.0.zip 68965195 BLAKE2B 11e4a995f00ec4f218fe08ddd139c6d60b28bd9ffb78ce566be989eb5d229e5186e60406598b78067f480755e49bbeb6675dd3081186599fc0cac89e66a6f2eb SHA512 13f9b80d1021309fa48ca6c9dd6406ba6f97dcd611f786e940db42eeaba40cdf603b108954b9b3195f830e49377593e31b04f8d9310f619418bcd129b39f2ff1
+DIST instantclient-basic-linux.x64-18.3.0.0.0dbru.zip 72794506 BLAKE2B 22db5d69d48c33061db72bdc050e081ec24152c5e4655505c7f75407646f5ffa140aa51f4638ad8e7c5628476bb44358cb061b2d228ab1e36cd9464e49fcf1f6 SHA512 92e607e1711b24ddf10f11ecd3b389795acc544a567a95cb62b624e5913ad11a1707699b5df659f5fb33dae5cd56700036644e643c7edbe51e7a67e57a152ecc
 DIST instantclient-jdbc-linux-12.1.0.2.0.zip 1571004 BLAKE2B 5d6d8f2ad86eff24be192ff0984a92351cb0dbf56619428a3c5c339dc0a5cc0048e2143e252803f5def6f0f111c4f69081d8aa41bc28002361586bef8ecff44b SHA512 ed3e5f831f1ac7351bd6eb7b3c10a09bba0f1989384ff1f041fdf94a5ca6acbf06e8285283f48731be6ece3dce55d307ac31e8bab57548dca0e3b3056060b5b2
 DIST instantclient-jdbc-linux-12.2.0.1.0.zip 1572140 BLAKE2B ac8a5767924a991503d64b7127e801bd09116ff5155a4943db76bf8678bccfd38c35d744d5a1654a51368feef97df39cad8a9b62ceb69f0cdf416af742385dea SHA512 3b57ab454645f8719a75c8778ab33589548018ec09d187ca88252006f44b014d62659a622ae423f79f9bf0f11149cafaa33880e90278c94a847e69e409bd3dca
+DIST instantclient-jdbc-linux-18.3.0.0.0dbru.zip 1574763 BLAKE2B 2ddbb6a6d61c3b6bc3e37b40f786dd86f5efadcf8cbe5b58dec2631b92ebae25065cb29f87ceed9a1f426ada094a9c0ef1887f8ea7b70e66527e9b75e11f213e SHA512 96298e579b6b5a81ae2ef679d6bf9a18f8bd08c33981d0a5b836c20710dc07d15d7964895a3d66c01075a20720d333f766ac439dc4f3867edac473e020eaf065
 DIST instantclient-jdbc-linux.x64-12.1.0.2.0.zip 1571639 BLAKE2B 1e50ff99548aa22e32ae48b629e6a83477cf7ad6d56b622e4c03831b43377841d3892b1f3079148a2a93b42d7d2be2670233c33edebac219f5a71384e43ab495 SHA512 1e6aa33c159d5769d10b16da3c5ff16629dae049c7e7d3ab1504a0ad625968f4d3f655a83ff128bff726c3ed03eab9ef7603c897aad288d1dc4e557c03ac7e2a
 DIST instantclient-jdbc-linux.x64-12.2.0.1.0.zip 1572942 BLAKE2B 3521505368a46046149ae28e2fae0bb85d5a70da33c029c684289a3586341fc0e63b0a88b93cbaa28aacbffaca678260f94658faa2b7e8aa31d1103a41660dac SHA512 79c939442431e14b9f30e94821fc4d8eeb34cd35b887fd8fa90a045357a241a58a53d591d22a5f42b188540c50350b842391a3871c86eb4fe8169ea23001a21a
+DIST instantclient-jdbc-linux.x64-18.3.0.0.0dbru.zip 1575572 BLAKE2B bb9d5ad0064b547a7152d4f9b170c646105b4a0731596fe381f7a2c63b720e36cc5a93eea59ea71aa3405999d972cf962a74063350c468a8d114ad28f5a0be0c SHA512 70ebece929cb11f34fdcb6aea75af3679f22d0b838c3d256d4c7c0249977423625b1244a54ca504b51d24e2f178b1784571e185574cd3db34c2cda8128298b60
 DIST instantclient-odbc-linux-12.1.0.2.0.zip 1100875 BLAKE2B f8b1475962ab8b66b0e24b7bebc74cd13278e2dfe24885e5ef41e051319baee615ed5015a6b7d87e363e8915ff07fde8e17764a8e6aaa4b5b516f266ef1649dd SHA512 ff3b13a338f0acbae07f23d0e54f0ffa803afcda1a798b9cf38ced103201c0698a7240a062fb67af3547c17e906089e236cc3454685ca4645161a8b14414235e
 DIST instantclient-odbc-linux-12.2.0.1.0-2.zip 590200 BLAKE2B 732c07ecd7d19fd425873f2ddec00ffbe3da3b07b05bb902d2e3bcf6bcdcd62c7cecdf2bf2289f2c60df4d6dab3f337729eb7c4aacb64dacf73eadcf3ae3f99a SHA512 78a237d165dab3e991bc9bb495c67913c78b660922bfce872be5c774176eaee2ba2af08798b983ad513a33451cde06fe3a727dec66b91b944dc698bf048c7ef5
+DIST instantclient-odbc-linux-18.3.0.0.0dbru.zip 605026 BLAKE2B 2f7808ef2706c65d1c876e44e7b831ea0629a218347f34dd4b81cce192b45b78b26c9e164b179232b1fceeeeb5f84d807ac6bef1f36fd7d077e620bbb6c093eb SHA512 370d3f34c57e33909642f18104de8b48c2ab0fd1cf679087f8601720ebc1097f64caceb118010b9e8d2f7207cef04210b22a36824de747683c3a1162ccb4f09e
 DIST instantclient-odbc-linux.x64-12.1.0.2.0.zip 1289004 BLAKE2B 674b50e841c66af1d17c5293e3b1909b937664d106864d7709a921ee6f1e46f6571b3c00d064c6ffae0583f4fd84a0e1e7f0b8f635338856c429d9986208c69d SHA512 b6dd02a2566aba66bbdd61e37e00f0c0ec2d466ad969658d4943657642e6e385cb08d0bee3a127b38a7077ec71c8f341aa4696f381e4d9978f807caa1f3ccb91
 DIST instantclient-odbc-linux.x64-12.2.0.1.0-2.zip 634023 BLAKE2B 82cd7683bde15a6ff2c96b6b45da95509a7acf0dc7f6a58a19276a526a397481075fc27a450c1a6ac053a460bf075222a3d5afeba9c33f35cff9365b38eb922a SHA512 48d831c798b455349e1a79cecdeee96652d1911f2371d67c4d280b6595ac253ddff5b052ff2f680b42a5fc77b655ee438837ad4abde3137e251facd22c31cf2e
+DIST instantclient-odbc-linux.x64-18.3.0.0.0dbru.zip 648825 BLAKE2B 1e96b87802c9ccc7d5f6ae2fdab501004e6fe8d4e155503bb983c82cdbfff729263e541689f4c2dbeeabfdd1037f0a97191e3a50842a8488a3267f24fec6b43d SHA512 23ad10a834fd92007147f8a7ad95dd9df4fbd5b786f7e2bb9afd6a12101fb934a40daa81ade914d8d0f59872591a1ae29438f23229b3767ed4ea3ff7cc730f66
+DIST instantclient-precomp-linux-18.3.0.0.0dbru.zip 5200252 BLAKE2B 1d3613de34ccd61fd7c3795170d6d012491bc2c045c39f39db716ac7ce2e68e7e8da84c5b95afa8e50afb97d2fcad8e469f25627b9ec570f58f0b167a2f2348e SHA512 f783b6f346cc4848567a1b7284a93d1bf20a9555fa9cbfd57597b3856444969653cc6d6c3c3e710da6775d39d2efa6399b9e91f4f7458de43b0a404f4f693dd0
+DIST instantclient-precomp-linux.x64-18.3.0.0.0dbru.zip 6403554 BLAKE2B bd8e1b3de4b8c12214ea066be22f7ca18133e62e1d9a70b2710578e967204561cdcc9f719f8c1310e19e94baca367e0aa8c482e637b2f13a51781328b229be92 SHA512 292322eb07e3707cf469cea8390636fb2fae99a50b3b900a9c43b5808ce741cb708541820de5e9aa9c341290ad5015be32d968c43e1a14aebf97dd5fd04fc925
 DIST instantclient-sdk-linux-12.1.0.2.0.zip 667183 BLAKE2B 7dc36af0ea105ea97a961a2332b3643ec22cd64b81adbfc7206fce6e963948d5e59f860b8d4fe1318ed238adfb95effa2a138aec3e017a54bd7ce4c4cf1941be SHA512 fdc0111dba77aa88dc7a39c8d9afbd08c4ffde63890595501915be48a70f6fc623762657a1f3e3b54dd08b0d1e5ce00f99ec5ce40990bb17fab63ae38b986dc9
 DIST instantclient-sdk-linux-12.2.0.1.0.zip 674751 BLAKE2B 385a51450ed05c0e80151545037ed58b08dd400c01c8cbb1140045bc6372d4e1d334854881498a5c5833746c796ff94694d495257748442bd49267cc830fda88 SHA512 b2e53e95aaee283f9077f422c7ea8e961a42decb0f58d438eeb32edb32e8c88321261ffd009ca453b531c4aa22a74b8cf71b9a91754c2bd082c83f644523c72e
+DIST instantclient-sdk-linux-18.3.0.0.0dbru.zip 927121 BLAKE2B 5b53d759cb82c854d67b9bebaffb07e442b62d13367e5acf19af2dec4dbca2ba3ee50c83f89cf6e865121ad039227d898e74fecf43439610254eb43a429422a0 SHA512 6e4ccafb69d047b96dbda2f493c175f005b593472ea3c9a75fed758d2f12d970509d58b32d94f7a59b3d0402a87efaa754e6487af9cde01f7211f0145434c6c9
 DIST instantclient-sdk-linux.x64-12.1.0.2.0.zip 667174 BLAKE2B ad3f85a45fa04a579c7233d549a2c4083f0c07348503baea20f8b5404f097c36aed382d0316fbfcd6ec85f56524c288933613de2fc9fcafe961fed32108e002a SHA512 451918e34c4e41dcaea6d678cf10a20a3fb80be5c060aa1a2890f2eb528e6e4982bfd758598eaa115cd367cde0468f7f0f811bac2ef28671075868857eaf9f2e
 DIST instantclient-sdk-linux.x64-12.2.0.1.0.zip 674743 BLAKE2B fd1ab9b7fb2c3151a30d4f3f01d4003f46f95ae78f822214beed071bd52caddb3df39488d4341cb39a1f9a3259be0bc65b53df7f221055d8540d8fcc531455e9 SHA512 4a62ae1be31514664a0f442f65df633b93bea25f1ebe84e405865b9e363017726075bf2d5b2181600018ee122f74649aaa8ec5b507ee8938e33ae056a7f828b6
+DIST instantclient-sdk-linux.x64-18.3.0.0.0dbru.zip 927118 BLAKE2B 9c6cd889843552cee3e84566d9c1b29369b1e7b20a01fac65676a33d6196b042a4c34cd2df8cf1ec5c8664a403e44e6a283f42912b7e056e093c744bd24ec24f SHA512 c9e1493601ec70541e437ded748f3be24deaa3f1037884fd003907bbab38b3099aef12dda1b9845c3eb3ce3827f743696f5ebe6d8dffe7974088c1329528b729
 DIST instantclient-sqlplus-linux-12.1.0.2.0.zip 828190 BLAKE2B b047e7ea3bbf1390c7ce3ad96c883d6a234798284b91b8ca8de2b086c27128144a0a3fdee2062c826e7e16b5dc263efdaab7e464371ef63deca4d9ffe4f668a7 SHA512 e521f141f0bb4fe62bda6da389a9c1038be879f1456500a9e70ac0a41d4f35cf2051181a03223521aa24ee06a33b67614d3afd91f01099afa0081f2771876d43
 DIST instantclient-sqlplus-linux-12.2.0.1.0.zip 869831 BLAKE2B f6c04823b1a6ac45594f13cc2ef45ab0ed25e5dd68bc33cc6412a578647df4472a71293cadbe1e98ea2983664a083b9b148aea04e717e5039e6def065d1ea583 SHA512 83894a72192ea9ca86d361ba70a6c011f297afa5d186a49fbab7050d9615de300d54b12af8d948fe18a75dcf51bd04f9feaa8460a1c69df9c55f9854e3cee61e
+DIST instantclient-sqlplus-linux-18.3.0.0.0dbru.zip 881315 BLAKE2B 787dd43ffaadd493d8cb3a9a8bbd160f75c51ad07e16d8eb7631e8368b4a8bfe9e574326837724b3573705e1c309cbe0bf364c1b98660534b05f5d72d28b1b11 SHA512 9087e5654143c9da3499fb7f1b8a15b04433cacc0d96257519788b3cd12a0aa480b37fa37fbe55a2f40940ea8da1eeae9881712a87d5942e142c0f29b580e54d
 DIST instantclient-sqlplus-linux.x64-12.1.0.2.0.zip 861284 BLAKE2B fe2c3e3cd90c61aba7220c7782bcb540017aaa82f884b730b0ab3dfce462f866b468cda71106e016f9581a186582701239c282cb52927face949b0c1f8690692 SHA512 ad0af692bcae1231b58c7ea55fa79d85c7a5c9875a805565b1b5956ed30e608d753ac9210f6169ab3ff4e42ac2f1d871ccff47bd2656f7684925136fef1f30c2
 DIST instantclient-sqlplus-linux.x64-12.2.0.1.0.zip 904309 BLAKE2B 5d2dca2c98187674a506808f18ef8032f595d250c2a2577cf0cd7a9d785384a29d612b686575ac15516848792539d362745cc1c8aa321d2c84c10df01c896017 SHA512 7d31a5262138f8ae0429cf08f0743b9c8c7863fc8e6abfa8ef089cee2059da75bf23503f9f1f09c28b82c5209aca27f81da6c890799236307395b59fea3bf012
+DIST instantclient-sqlplus-linux.x64-18.3.0.0.0dbru.zip 915778 BLAKE2B 8d93e462568a5bf5a294a5abcf0a0e30c08e9eef18c01a79b8f716261efbeb14a286d1058ddfa278108daeb49b74a3e296efa83291d7bc03f4ad35428c946701 SHA512 878ac2cf58aaa8cb237779fcd04378c95d738fd444eddd5745838fa86e8cd60f1c2be49f0f4fc3d4b16dca652fe66681ac0907a4aeddec1d9433e63d2f4e5db6
 DIST instantclient-tools-linux-12.1.0.2.0.zip 187088 BLAKE2B 41b68efbbe5925c64a869c71a12a947743e40b7d268c45a1b18c187a8b2179e224cd4ea940248d690b8f334c91afd901c1b3be34b2e8c2748e7f79487890cb60 SHA512 37a9eb3e2fdbbbf32f0fb5d017209db1b62d54efe48a875625e9d6162ea894d93d144358b2360989fa71704b346f86b36f1640a5c98f8aac7c1e6853b2d078fd
 DIST instantclient-tools-linux-12.2.0.1.0.zip 1032131 BLAKE2B 1a5d94b129d2d8a23031daee3882aef0b783c019baa69fcbd2a5d4ca4c97585212580196be158bdccaff2097027ceee881e948604ea2aa15525f36ea16e04ebd SHA512 e547d571bf881e787dc19bf23f82c4396f14dbca35a51a21e4133ff463f3c3c2c308cc2263f55b49ce70604569158266cd88d7ebf8b5cf51c9cd58b2871133e2
+DIST instantclient-tools-linux-18.3.0.0.0dbru.zip 1042756 BLAKE2B 1b1af7abb50b6977e0dd4bc0f2b5e89534cf5bffe216dbe553063761470c45f330f4a72ece428a3e0dc8162cebad3cf0ffa628f4b3879bc434ecda7b7b07570f SHA512 b809b83e2e7dbe19c13611c1eb819fa4648a127ddc8a97abaa794213c7f4b6d28b70956aac4f331389d088c6fccc998d0eda8dc39f2dedc338f3baf03bc3ceac
 DIST instantclient-tools-linux.x64-12.1.0.2.0.zip 203511 BLAKE2B 6482cfa3ba521a5f5ad3e1517037f514daa1f452d8a5b38f0b4c949681a87dc54fe9551f52fcdc4e1ea6d243a808d3bd763147eaa72d9f656274ac7185823754 SHA512 f18ca11300fc20925c72122d03fc00402b9a52b39f7f70cfd3fa97264a1a2a173e7f77059affba98e897546e05c6ac1e3a546ce1c7e63ef049130496d346342b
 DIST instantclient-tools-linux.x64-12.2.0.1.0.zip 1132671 BLAKE2B a9ae6d2cd4e5661cb6a5dbb08cbc08ae4a5c28ce0bcc43db86ebd37997f8b14ec27f76613a1429d9359a765b98b465964bc5d24f1fce1d7964597191be658957 SHA512 1697289fc4b6a37277036dbef1892bd113892fcd3b0f347f0960ef8a1b90f3e91411bb237060e88bfdd418e50600372b710df08d97a4e847fd90d077ed0647d2
+DIST instantclient-tools-linux.x64-18.3.0.0.0dbru.zip 1142609 BLAKE2B 5c915bd940b7bfaa42429710685cfafc5f0189607da2d789f4aaada2bc9d3365ad8e9ee31cc209830fa54b406ffe4b9b2fc2b5e0b6819ff176f7dbb566117a79 SHA512 2c198d9e723b39f7b512217eb08557dfa3c9ae32858acd882df8b9b24beecffe6b44eb089b50341edf01d7e4c0514d4b3de4aa06fa9185aa0538855963c174a4
 EBUILD oracle-instantclient-12.1.0.2.ebuild 8668 BLAKE2B 9f26688a731756debbc5ab9181e2c51289c7ba17cff45f018356c7fce4f17ef0429490a2f768c6e7d1e0b96d75ad722fa6343b5dec55bbc05eb7971465cc62af SHA512 6b395cc48970d9ee0401947a70306732688c2b8fc6c15b11139c395a31ba82cc66bcee8e16ea200468759709ad9bb0f1f270afda4507cf9d6c4fb698aa685706
 EBUILD oracle-instantclient-12.2.0.1_p2.ebuild 9015 BLAKE2B 25c9c2d664b7a8938f2dea9c2a1ade5be23cc56b753c028efd5b82f2c4462462772dccaa319ecf9694ec73f8d23c9bfe029d1d7d91c10446752bc3ce6bc99bf3 SHA512 a7d154e698de828593be605f5e47ad33251e7bad643d34ee667d531b1348053ff0ce2e06cc0e3b22f77a0732fd815ab6da2f4c33cfb8c713f2816a797cce286f
-MISC metadata.xml 827 BLAKE2B 3a06fcafb74d62d5edd44cd958f72c11da88dfb22becf03d6af168d4cf7d0f21f198df024be409cabae066de5a088064b86141668ebf31cdf984c87f477a184a SHA512 7c9b7c73eaaac80da5d48089c2537e26edf2e5788eafdef53416f84389fa88c5f3f470d888a8af4641a75303bab57226e82bb96e46c3bc66042890e1b1cd3204
+EBUILD oracle-instantclient-18.3.0.0.ebuild 10426 BLAKE2B c5ea6700fe03721d9b587134e281c8e234061d83d48b377dda3d097279a02debb13328f72f8cf426ff13d48eb0d9885cc79208e1eecc9c6e46edadf3948e54ce SHA512 9b6ff606dfdefb5629fef92f532ab072c98e1f7c7dd2e394e975994a4b3483706e541bd5124dd2c0ec562fd53c64705840ae861d9e50c849b2ff2671c8d593b9
+MISC metadata.xml 957 BLAKE2B dfe01a80765d0ec1afac4a5045e2081e39ee9060a17f278b6eb7cfae7670ec102a504397d037b2b8d8ad82d242a9fa3ed1d4309b25158b934f8674a062dec53e SHA512 dd8c982f1ce276e7701e6b82b71e2464eaa21e413115c2a4d3bbd49053539ff3a9bcfc84252ef7aa9c39d36054fee119002716de5d525a20bb1f2da0d44b3c89
diff --git a/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch b/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch
new file mode 100644
index 000000000000..eb6fc025d78b
--- /dev/null
+++ b/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch
@@ -0,0 +1,40 @@
+Fake demo_xe.mk found in Oracle eXpress Edition,
+known by CPAN DBD::Oracle (bug#165834).
+This provides absolute paths for headers and libraries.
+--- instantclient_18_3/sdk/demo/demo.mk
++++ instantclient_18_3/sdk/demo/demo.mk
+@@ -28,13 +28,18 @@
+ CC=/opt/SunProd/SUNWspro6.1/bin/CC
+ cc=/opt/SunProd/SUNWspro6.1/bin/cc
+ 
+-ICINCHOME=../
+-ICLIBHOME=../../
++ifeq ($(BUILD32),T)
++LIBDIR=lib32
++else
++LIBDIR=lib
++endif
++ICINCHOME=$(ORACLE_HOME)/sdk/include
++ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
+ ICLIBPATH=-L$(ICLIBHOME)
+ THREADLIBS=-lthread
+ CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)
+ 
+-CCINCLUDES = -I$(ICINCHOME)include
++CCINCLUDES = -I$(ICINCHOME)
+ 
+ CCFLAGS=$(CCINCLUDES) -D_REENTRANT -g -xs 
+ LDFLAGS=
+@@ -55,10 +60,10 @@
+ OCCIOTTPWD=tiger
+ 
+ .cpp.o:
+-	$(CC) -c -I$(ICINCHOME)include $(CCFLAGS) $<
++	$(CC) -c -I$(ICINCHOME) $(CCFLAGS) $<
+ 
+ .c.o:
+-	$(cc) -c -I$(ICINCHOME)include $(CCFLAGS) $<
++	$(cc) -c -I$(ICINCHOME) $(CCFLAGS) $<
+ 
+ all: clean buildoci $(OCCIDEMO) $(OCCIOBJDEMO)
+ 
diff --git a/dev-db/oracle-instantclient/metadata.xml b/dev-db/oracle-instantclient/metadata.xml
index 4021726b1f0e..d13ee6a779fb 100644
--- a/dev-db/oracle-instantclient/metadata.xml
+++ b/dev-db/oracle-instantclient/metadata.xml
@@ -5,15 +5,16 @@
 		<email>haubi@gentoo.org</email>
 	</maintainer>
 	<longdescription>
-		Free, light-weight and easily installed Oracle Database libraries
-		and SDKs for building and connecting client applications to local
-		or remote Oracle Databases.
+		Free, light-weight, and easily installed Oracle Database tools,
+		libraries and SDKs for building and connecting applications to
+		an Oracle Database instance.
 	</longdescription>
 	<use>
 		<flag name="jdbc">Support for XA, Internationalization, and RowSet operations under JDBC</flag>
 		<flag name="odbc">Libraries for enabling ODBC applications</flag>
+		<flag name="precomp">"proc" binary and related files to precompile a Pro*C application</flag>
 		<flag name="sdk">Header files and an example makefile for developing Oracle applications</flag>
-		<flag name="sqlplus">Libraries and executable for running SQL*Plus</flag>
-		<flag name="tools">Workload Replay Client</flag>
+		<flag name="sqlplus">The SQL*Plus command line tool for SQL and PL/SQL queries</flag>
+		<flag name="tools">Data Pump, SQL*Loader and Workload Replay Client</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0.ebuild
new file mode 100644
index 000000000000..0a67edfcb549
--- /dev/null
+++ b/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0.ebuild
@@ -0,0 +1,342 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils pax-utils multilib-minimal
+
+DESCRIPTION="Oracle 18c Instant Client with SDK"
+HOMEPAGE="https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html"
+
+MY_SOVER=18.1 # the library soname found in the zip files
+
+IUSE="jdbc odbc precomp +sdk +sqlplus tools"
+REQUIRED_USE="precomp? ( sdk )"
+
+MY_PVM=$(ver_cut 1-2)
+MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
+
+MY_PV=$(ver_cut 1-4)
+MY_PVP=$(ver_cut 5) # p2
+
+MY_PLAT_x86="Linux x86"
+MY_BITS_x86=32
+MY_A_x86="${PN/oracle-/}-basic-linux-${MY_PV}.0dbru.zip"
+MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
+MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
+MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
+MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
+MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
+MY_A_x86_tools="${MY_A_x86/basic/tools}"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_BITS_amd64=64
+MY_A_amd64="${PN/oracle-}-basic-linux.x64-${MY_PV}.0dbru.zip"
+MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
+MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
+MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
+MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
+MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
+MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
+
+if [[ ${MY_PVP} == p* ]]
+then
+	MY_PVP=-${MY_PVP#p}
+	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
+	MY_A_x86_odbc="${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
+	MY_A_amd64_odbc="${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
+fi
+
+SRC_URI="
+	abi_x86_32? (
+		${MY_A_x86}
+		jdbc?    ( ${MY_A_x86_jdbc}    )
+		odbc?    ( ${MY_A_x86_odbc}    )
+		precomp? ( ${MY_A_x86_precomp} )
+		!abi_x86_64? (
+			sdk?     ( ${MY_A_x86_sdk}     )
+			sqlplus? ( ${MY_A_x86_sqlplus} )
+			tools?   ( ${MY_A_x86_tools}   )
+	) )
+	abi_x86_64? (
+		${MY_A_amd64}
+		jdbc?    ( ${MY_A_amd64_jdbc}    )
+		odbc?    ( ${MY_A_amd64_odbc}    )
+		precomp? ( ${MY_A_amd64_precomp} )
+		sdk?     ( ${MY_A_amd64_sdk}     )
+		sqlplus? ( ${MY_A_amd64_sqlplus} )
+		tools?   ( ${MY_A_amd64_tools}   )
+	)
+"
+
+LICENSE="OTN"
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch splitdebug"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
+	!<dev-db/oracle-instantclient-basic-12
+	!<dev-db/oracle-instantclient-odbc-12
+	!<dev-db/oracle-instantclient-jdbc-12
+	!<dev-db/oracle-instantclient-sqlplus-12
+"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="usr/lib*/oracle/client/*/*"
+
+set_my_abivars() {
+	if multilib_is_native_abi; then
+		MY_WORKDIR="${WORKDIR}"
+		MY_S="${S}"
+	else
+		MY_WORKDIR="${WORKDIR}/${ABI}"
+		MY_S="${MY_WORKDIR}/${MY_P}"
+	fi
+
+	local abi=${ABI}
+	[[ ${abi} == 'default' ]] && abi=${ARCH}
+	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
+	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
+	MY_A=MY_A_${abi}                ; MY_A=${!MY_A}               # runtime distfile
+	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc}       # jdbc distfile
+	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc}       # odbc distfile
+	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp} # precomp distfile
+	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk}         # sdk distfile
+	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile
+	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools}     # tools distfile
+
+	[[ -n ${MY_PLAT} ]]
+}
+
+oic_distfile_status() {
+	: # We must not access DISTDIR in pkg_* phase, bug#612966.
+# Not removing this lines yet, we may eventually specify this feature.
+#	if [[ -r ${DISTDIR}/${1} ]]; then
+#		echo "already here"
+#	else
+#		echo "still absent"
+#	fi
+}
+
+pkg_nofetch() {
+	eerror "Please go to"
+	eerror "  ${HOMEPAGE//overview/downloads}"
+	eerror "  and download"
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		eerror "Instant Client for ${MY_PLAT}"
+		# convenient ordering like Linux x86-64 download site
+		eerror "            Basic: $(oic_distfile_status ${MY_A}) ${MY_A}"
+		use sqlplus && multilib_is_native_abi &&
+		eerror "         SQL*Plus: $(oic_distfile_status ${MY_A_sqlplus}) ${MY_A_sqlplus}"
+		use tools && multilib_is_native_abi &&
+		eerror "            Tools: $(oic_distfile_status ${MY_A_tools}) ${MY_A_tools}"
+		use sdk && multilib_is_native_abi &&
+		eerror "              SDK: $(oic_distfile_status ${MY_A_sdk}) ${MY_A_sdk}"
+		use jdbc &&
+		eerror "             JDBC: $(oic_distfile_status ${MY_A_jdbc}) ${MY_A_jdbc}"
+		use odbc &&
+		eerror "             ODBC: $(oic_distfile_status ${MY_A_odbc}) ${MY_A_odbc}"
+		use precomp &&
+		eerror "      Precompiler: $(oic_distfile_status ${MY_A_precomp}) ${MY_A_precomp}"
+	done
+	eerror "After downloading these files (for *all* shown architectures),"
+	eerror "put them in your DISTDIR filesystem directory."
+}
+
+src_unpack() {
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		mkdir -p "${MY_WORKDIR}" || die
+		cd "${MY_WORKDIR}" || die
+		unpack ${MY_A}
+		use jdbc    && unpack ${MY_A_jdbc}
+		use odbc    && unpack ${MY_A_odbc}
+		use precomp && unpack ${MY_A_precomp}
+		if multilib_is_native_abi; then
+			use sdk     && unpack ${MY_A_sdk}
+			use sqlplus && unpack ${MY_A_sqlplus}
+			use tools   && unpack ${MY_A_tools}
+		fi
+	done
+}
+
+src_prepare() {
+	if use sdk; then
+		rm sdk/include/ldap.h || die #299562
+		PATCHES=( "${FILESDIR}"/18.3.0.0-makefile.patch )
+	fi
+	default
+}
+
+# silence configure&compile messages from multilib-minimal
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	# all content goes here without version number, bug#578402
+	local oracle_home=/usr/$(get_libdir)/oracle/client
+	local ldpath=
+
+	local ABI
+	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
+	do
+		if ! set_my_abivars; then
+			elog "Skipping unsupported ABI ${ABI}."
+			continue
+		fi
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		# shared libraries
+		into "${oracle_home}"
+		dolib.so lib*$(get_libname)*
+		use precomp && dolib.a cobsqlintf.o
+
+		# ensure to be linkable
+		[[ -e libocci$(get_libname) ]] ||
+		dosym libocci$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
+		[[ -e libclntsh$(get_libname) ]] ||
+		dosym libclntsh$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
+
+		# java archives
+		insinto "${oracle_home}"/$(get_libdir)
+		doins *.jar
+
+		# runtime library path
+		ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
+
+		# Vanilla filesystem layout does not support multilib
+		# installation, so we need to move the libs into the
+		# ABI specific libdir.  However, ruby-oci8 build system
+		# detects an instantclient along the libraries, and
+		# does expect the sdk right there.
+		use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
+
+		eend $?
+	done
+
+	local DOCS=( BASIC_README )
+	local HTML_DOCS=()
+	local paxbins=( adrci genezi uidrvci )
+	local scripts=()
+
+	if use jdbc; then
+		DOCS+=( JDBC_README )
+	fi
+	if use odbc; then
+		DOCS+=( ODBC_README )
+		HTML_DOCS+=( help )
+		scripts+=( odbc_update_ini.sh )
+	fi
+	if use precomp; then
+		DOCS+=( PRECOMP_README )
+		paxbins+=( sdk/{proc,procob,rtsora} )
+		insinto "${oracle_home}/precomp/admin"
+		doins precomp/admin/{pcs,pcb}cfg.cfg
+	fi
+	if use sdk; then
+		einfo "Installing SDK ..."
+		DOCS+=( sdk/SDK_README )
+		scripts+=( sdk/ott )
+		insinto "${oracle_home}"/$(get_libdir)
+		doins sdk/ottclasses.zip
+		insinto "${oracle_home}"/sdk
+		doins -r sdk/{admin,demo,include}
+
+		# The build system in DBD::Oracle perl module would detect
+		# an instantclient along the sharedlibs in ORACLE_HOME, which
+		# we cannot provide. But it also knows Oracle eXpress Edition's
+		# layout - which we emulate enough here to let DBD::Oracle work.
+		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
+
+		# some build systems expect the headers here, also see bug#652096
+		dosym "${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
+
+		eend $?
+	fi
+	if use sqlplus; then
+		DOCS+=( SQLPLUS_README )
+		paxbins+=( sqlplus )
+		insinto "${oracle_home}"/sqlplus/admin
+		doins glogin.sql
+		dosym "${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+	fi
+	if use tools; then
+		DOCS+=( TOOLS_README )
+		paxbins+=( exp expdp imp impdp sqlldr wrc )
+	fi
+
+	einfo "Installing binaries for ${MY_PLAT} ..."
+	into "${oracle_home}"
+	dobin ${paxbins[*]} ${scripts[*]}
+	pushd "${ED}${oracle_home}/bin" >/dev/null || die
+	pax-mark -c ${paxbins[*]#*/} || die
+	popd >/dev/null || die
+	eend $?
+
+	einstalldocs
+
+	# create path for tnsnames.ora
+	insinto /etc/oracle
+	doins "${FILESDIR}"/tnsnames.ora.sample
+
+	# Add OCI libs to library path
+	{
+		echo "# ${EPREFIX}/etc/env.d/50${PN}"
+		echo "# Do not edit this file, but 99${PN} instead"
+		echo
+		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
+		echo "LDPATH=${ldpath}"
+		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
+	} > "${T}"/50${PN}
+
+	doenvd "${T}"/50${PN}
+
+	# ensure ORACLE_HOME/lib exists
+	[[ -e ${ED}${oracle_home}/lib/. ]] ||
+	dosym $(get_libdir) "${oracle_home#/}"/lib
+}
+
+pkg_preinst() {
+	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
+		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
+	else
+		{
+			echo "# ${EPREFIX}/etc/env.d/99${PN}"
+			echo "# Configure system-wide defaults for your Oracle Instant Client here"
+			echo
+			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
+			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
+			echo "#NLS_LANG="
+		} > "${ED}/etc/env.d/99${PN}"
+	fi
+}
+
+pkg_postinst() {
+	elog "${P} does not provide an sqlnet.ora"
+	elog "configuration file, redirecting oracle diagnostics for database-"
+	elog "and network-issues into ~USER/oradiag_USER/ instead."
+	elog "It should be safe to ignore this message in sqlnet.log there:"
+	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+	elog "If you want to directly analyse low-level debug info or don't want"
+	elog "to see it at all, so you really need an sqlnet.ora file, please"
+	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
+	elog ""
+	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
+	elog "put your tnsnames.ora there or configure TNS_ADMIN"
+	elog "to point to your user specific configuration."
+	ewarn "Please re-source your shell settings for ORACLE_HOME"
+	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
+}
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 11a841ca85d9..87e184a3f787 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,7 +1,14 @@
 AUX my.cnf-5.6 4568 BLAKE2B 633cc45bcc751046ef766dcabd1c8db2cd474f13cde436d41698a810787bc52cc8c11aee79c49ed884f4b01ea26fad11f9ffab08471eb10d6752007fd44d372b SHA512 498826f147ad01615358111511c88f671ff823c400782dbad5f359aff99fa88a7be66e3c3b42fd58a5634f17e12f6a18e1896340f1a5a7acecd75320671c3a10
+AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e216d3f10034796de9aa618efb11482cef78b7c7e50393b5f665810d03321b5ca770ac8a6144 SHA512 1d7250689005c948f4a849959baf33f5f0fda099f230611651919ed053fb563daa19d996b7ca6714e224174172fb504f4d7d08e9d449a7e1203e32cf3fdec782
+AUX my.cnf.distro-client 631 BLAKE2B 9ba4edf4398410ef40bf7312a485edd70a807a9da37c69bb6f6bee2c58a722fef1b9f37d28f09f41912722451cc0e9913218d15be472a853a942119f019bf486 SHA512 f40539a56afe79b7c0dff14de46690fd67e8350755b27fbb490d914001c01836cdf9f851aa461bd8b60943ef2ca084b70e48d995f5c18bcc241309f3473c610c
+AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
+DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
 DIST mysql-extras-20180628-0201Z.tar.bz2 322141 BLAKE2B fce35cfea4ffa9860908fcdf440cd0d714c402c42ee2afb22cec9e727971c216310c7db561ca1b37deebb2cea5137fe24f19b491ad500949e3170ccec3de0b13 SHA512 71a3800ec091b41e41d25536199149eb714c0bbfc0f6fc478e8e4dcaf4cf87a7e4d49c513da3c9badc0de810d7d78c05ad91dd898e45005b42136346237de42a
+DIST mysql-extras-20181017-2201Z.tar.bz2 328311 BLAKE2B f1b179e0f2d63105f03ba238125e6cfa2c0cbf2084251b6c344bd02517899322bd161470eddab28c514349caac6401c35909b2f37264fdaf2dc196a309d3cc27 SHA512 26e26a3ad926bc9267d89f0bc34b030bc6292f21d3007185c4c1155beaa608566b4268f93edb64fd6156dbae80ac4f2817e78c1e92e90985e2675c2b1f97854e
 DIST percona-server-5.6.40-84.0.tar.gz 52684007 BLAKE2B 11658be2319880f7e8815c7b620b7d460dd7a559316ca96905573b0fa2d7180b084ed425f76f6d850f06862e424b5a8d6ced8356f9075826b77e89e86095eb40 SHA512 b1075933bdf1afb726acd799e834cb45a1d2a15d3f37f313da71f8da03a7b9480d7ccfb4cb6a820fb6ccf58851d8c9473bce975203cd6bc007a2b74b36a1127f
 DIST percona-server-5.6.41-84.1.tar.gz 52736448 BLAKE2B 1ec5e17f08274caa3882f829f25bbf74a3b37d2ba208f62376106f0d89e5470f461f7852e365d5da9503d5500702e28f08461e5aa0c5ae6b1a30a0e98dbb426b SHA512 60783154f9ab097083a484c34e584b396eeba4aa53dc8616c467ca9c85cc626be08e3165740703453cc4fb35f3af94ac34260f1e2bb133d60f832661251cbb3c
+DIST percona-server-5.7.23-23.tar.gz 79165468 BLAKE2B a460ac88886fa2be65abb0520d541db54413274599e02d8de3a01a68f8c3da431bfe819eb32bf80518fdff69bbcfae90ee089d2a096ee6210f9e4efe60dbab25 SHA512 351d40d3f7c3fe72f733443a6ef3902e1455390835e52e73d7eb48698ac6f2363e07811d40b22af5b1c7607622017d613279581940522c5e99660fac89d4d4c6
 EBUILD percona-server-5.6.40.84.0.ebuild 31732 BLAKE2B 253a7c8f0a734824a8f11e689f49e5fd90369e6b507bbcfbf87d04af1c7804f8dfffd3ec69bd466a769203dae893d9326cbc8d8ded60ddf724a06369839a727a SHA512 414b14c70a25e2ad20a35013345ae81edc69c57d85662ef104dbc5d3d6bd98e9b89b775ad1f0f2c0842c3ec868a5c651d03b91cb15fb841700e9ec13d0e00d26
 EBUILD percona-server-5.6.41.84.1.ebuild 31633 BLAKE2B 0715c23cab0e532c855e6215bf8f1d319f774a9b825e69957639681027bf179b1cf5334e518ca066f561d9bb431bb8ebd9caed5acc33ffeb4369ed02c4962c0f SHA512 88f79bf0b9873a8daf0759cfcc0095d2480a1f098a9ef15536cb331eb4bd2c4e38b40299081baca296e4f6c51f9a3e6f65741c3886ba98473c59b43cfc8149df
-MISC metadata.xml 1387 BLAKE2B 0998726bdceb6d498051f6ae741a8d762f7bb0ec6cb6659e104cce9fd5bb8615ecb0a531a8d3691d70567973efee47ae6fac339f41cdd6851675dd10301d94c3 SHA512 836f32db502edd1de90ecf0ce155326d0f2d1338aaf0ad21bc2f755e50e1f3e456c5735d338d71095eb9f05142843a430675ff65603b07fd63fd74691e3c9040
+EBUILD percona-server-5.7.23.23-r1.ebuild 33817 BLAKE2B 7f717daa32a71cdf530ec8685d75a6d37fa26fcb81315792844ed9efab29abd2e524d24b5ca43748f19923ade89304a7e3989b48f30a49b1f298d6418730c473 SHA512 902abd98a239b571505b78add6be3331e3d0bde94341e43e0ed3dfba0e626a74b97097bdb50f7be3475a5bf9e0dcfe5a7a519989b06bac8fd61f152666c31279
+MISC metadata.xml 1490 BLAKE2B 8e9d17e8f501a86cf8293f3112ce98b920833fb8bf71d9c9ff3a8d6e452fd486cd2bb665ba9d7938dfc6b94551becdd498993c69f0647a6b64ccab417467d5e0 SHA512 8e75680e685703072f2628cf812e884eaf47974ed088f44445b8476caf38a97c91b525555f25b4279b73cae78be21af6f8dd173be51cc1e1b1e03a2c779355e5
diff --git a/dev-db/percona-server/files/my.cnf-5.7 b/dev-db/percona-server/files/my.cnf-5.7
new file mode 100644
index 000000000000..571ebf07a76e
--- /dev/null
+++ b/dev-db/percona-server/files/my.cnf-5.7
@@ -0,0 +1,3 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+
+!includedir @GENTOO_PORTAGE_EPREFIX@/etc/mysql/mysql.d
diff --git a/dev-db/percona-server/files/my.cnf.distro-client b/dev-db/percona-server/files/my.cnf.distro-client
new file mode 100644
index 000000000000..8bf183634304
--- /dev/null
+++ b/dev-db/percona-server/files/my.cnf.distro-client
@@ -0,0 +1,21 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/50-distro-client.cnf: The global mysql configuration file.
+
+# The following options will be passed to all MySQL clients
+[client]
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+character-sets-dir				= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[mysqldump]
+quick
+max_allowed_packet			= 16M
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
diff --git a/dev-db/percona-server/files/my.cnf.distro-server b/dev-db/percona-server/files/my.cnf.distro-server
new file mode 100644
index 000000000000..d4ed30c1f089
--- /dev/null
+++ b/dev-db/percona-server/files/my.cnf.distro-server
@@ -0,0 +1,28 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/50-distro-server.cnf: The global mysql configuration file.
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server				= utf8
+user						= mysql
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysql.pid
+log-error					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir						= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir						= @DATADIR@
+skip-external-locking
+lc_messages_dir					= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages					= en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address					= 127.0.0.1
+
+log-bin
+server-id					= 1
+
+# point the following paths to different dedicated disks
+tmpdir						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update					= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
diff --git a/dev-db/percona-server/metadata.xml b/dev-db/percona-server/metadata.xml
index f3ddb7484a2a..6cc220d337d3 100644
--- a/dev-db/percona-server/metadata.xml
+++ b/dev-db/percona-server/metadata.xml
@@ -6,8 +6,9 @@
     <name>MySQL</name>
   </maintainer>
 <use>
+  <flag name="cjk">Add CJK support for InnoDB fulltext search using <pkg>app-text/mecab</pkg></flag>
   <flag name="client-libs">Build the libmysqlclient libraries</flag>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
+  <flag name="experimental">Build experimental features aka "rapid" plugins</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
diff --git a/dev-db/percona-server/percona-server-5.7.23.23-r1.ebuild b/dev-db/percona-server/percona-server-5.7.23.23-r1.ebuild
new file mode 100644
index 000000000000..d4d61e034774
--- /dev/null
+++ b/dev-db/percona-server/percona-server-5.7.23.23-r1.ebuild
@@ -0,0 +1,1038 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20181017-2201Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Python2 required for innodb_stress.innodb_stress{,_blob,_crash} test
+PYTHON_COMPAT=( python2_7 )
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eapi7-ver cmake-utils eutils flag-o-matic linux-info \
+	prefix python-any-r1 toolchain-funcs user multilib-minimal
+
+MY_PV=$(ver_rs 3 '-')
+MY_PN="Percona-Server"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.7/release-notes/release-notes_index.html"
+
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+	mirror://sourceforge/boost/boost_1_59_0.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"
+fi
+
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server"
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+LICENSE="GPL-2"
+SLOT="0/18"
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa pam +perl profiling rocksdb
+	selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin 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}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
+	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.23-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.23-fix-libressl-support.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-add-missing-gcc-8-fix.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-mips-ASM.patch
+	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.23-rocksdb-use-system-libs.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="net-misc/curl:=
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	sys-libs/ncurses:0=
+	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
+	!client-libs? (
+		dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
+		>=sys-libs/zlib-1.2.3:0=
+	)
+	jemalloc? ( dev-libs/jemalloc:0= )
+	kernel_linux? (
+		dev-libs/libaio:0=
+		sys-process/procps:0=
+	)
+	server? (
+		>=app-arch/lz4-0_p131:=
+		cjk? ( app-text/mecab:= )
+		experimental? (
+			dev-libs/libevent:=
+			dev-libs/protobuf:=
+			net-libs/libtirpc:=
+		)
+		numa? ( sys-process/numactl )
+		pam? ( virtual/pam:0= )
+		rocksdb? (
+			app-arch/zstd:=
+			dev-libs/protobuf:=
+		)
+		tokudb? (
+			app-arch/snappy:=
+			app-arch/xz-utils:=
+		)
+		tokudb-backup-plugin? ( dev-util/valgrind )
+	)
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	tcmalloc? ( dev-util/google-perftools: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= )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	dev-libs/protobuf
+	virtual/yacc
+	server? (
+		dev-libs/libevent
+		experimental? ( net-libs/rpcsvc-proto )
+	)
+	static? ( sys-libs/ncurses[static-libs] )
+	test? (
+		$(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
+		dev-perl/JSON
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= )
+	selinux? ( sec-policy/selinux-mysql )
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+"
+# 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 )"
+
+python_check_deps() {
+	has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
+}
+
+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_pretend() {
+	if use numa ; then
+		local CONFIG_CHECK="~NUMA"
+
+		local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
+		WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
+
+		check_extra_config
+	fi
+}
+
+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
+
+		use test && python-any-r1_pkg_setup
+	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)/libperconaserverclient.so" ]] ; then
+		libpath=$(readlink "${EROOT%/}/usr/$(get_libdir)/libperconaserverclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libperconaserverclient."
+		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 ${PN} reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/mysql.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/mysql.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 appropriate 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}/${MY_P}" "${S}" || die
+}
+
+src_prepare() {
+	cmake-utils_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
+
+	# Don't build bundled xz-utils
+	if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
+		echo > "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+		sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
+	elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
+		echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+		sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+		sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+	fi
+
+	if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
+		 rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die
+	fi
+
+	# Remove bundled libs so we cannot accidentally use them
+	# We keep extra/lz4 directory because we use extra/lz4/xxhash.c via sql/CMakeLists.txt:394
+	rm -rv \
+		"${S}"/extra/protobuf \
+		"${S}"/libevent \
+		"${S}"/storage/rocksdb/third_party \
+		"${S}"/storage/tokudb/PerconaFT/third_party \
+		"${S}"/zlib \
+		|| die
+
+	# 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
+}
+
+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
+
+	if use tokudb ; then
+		# https://jira.percona.com/browse/PS-4399
+		append-cxxflags -Wno-error=shadow
+	fi
+
+	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_CURL=system
+		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
+		-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_LIBEVENT=system
+			-DWITH_LZ4=system
+			-DWITH_MECAB=$(usex cjk system OFF)
+			-DWITH_NUMA=$(usex numa ON OFF)
+			-DWITH_RAPID=$(usex experimental 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
+		)
+
+		if use profiling ; then
+			# Setting to OFF doesn't work: Once set, profiling options will be added
+			# to `mysqld --help` output via sql/sys_vars.cc causing
+			# "main.mysqld--help-notwin" test to fail
+			mycmakeargs+=( -DENABLED_PROFILING=ON )
+		fi
+
+		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_FEDERATED_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
+			$(usex tokudb '' -DWITHOUT_TOKUDB=1)
+		)
+
+		if use tokudb ; then
+			# TokuDB Backup plugin requires valgrind unconditionally
+			mycmakeargs+=(
+				$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
+			)
+		fi
+
+	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
+}
+
+# Official test instructions:
+# ulimit -n 16500 && \
+# USE='latin1 perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild percona-server-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 Percona-Server 5.7 for now and are believed to be
+	# false positives or are known to fail:
+	#
+	# group_replication.gr_communication_configuration: requires a valid local network address
+	#                                                   which clashes with FEATURES=network-sandbox
+	# main.percona_bug1289599:                          https://jira.percona.com/browse/PS-2072
+	# main.percona_log_slow_innodb:                     https://jira.percona.com/browse/PS-4930
+	# keyring_vault.keyring_vault_timeout:              requires network access to vault.public-ci.percona.com
+	#                                                   which clashes with FEATURES=network-sandbox
+	#
+	local t
+
+	for t in \
+		group_replication.gr_communication_configuration \
+		main.percona_bug1289599 \
+		main.percona_log_slow_innodb \
+		keyring_vault.keyring_vault_timeout \
+	; do
+			_disable_test "$t" "False positives in Gentoo / Known bug"
+	done
+
+	if use numa && use kernel_linux ; then
+		# bug 584880
+		if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
+			for t in sys_vars.innodb_numa_interleave_basic ; do
+				_disable_test "$t" "Test $t requires system with NUMA support"
+			done
+		fi
+	fi
+
+	if use tokudb ; then
+		if [[ -f "/sys/kernel/mm/transparent_hugepage/enabled" ]] ; then
+			if grep -q -E "\[always\]" /sys/kernel/mm/transparent_hugepage/enabled &>/dev/null ; then
+				# TokuDB refuses to start when transparent hugepages are enabled
+				for t in \
+					tokudb.rows-32m-rand-insert \
+					tokudb.savepoint-2 \
+					tokudb.savepoint-3 \
+					tokudb.savepoint-4 \
+					tokudb.savepoint-1078 \
+					tokudb.savepoint-1078-2 \
+					tokudb.savepoint-1078-3 \
+					tokudb.savepoint-1078-4 \
+				; do
+						_disable_test "$t" "TokuDB will not work with transparent hugepages enabled"
+				done
+			fi
+		else
+			einfo "Cannot determine transparent hugepage status."
+			einfo "Please note that TokuDB refuses to start when transparent hugepages are enabled!"
+		fi
+	fi
+
+	if ! use latin1 ; then
+		# The following tests will fail if DEFAULT_CHARSET
+		# isn't set to latin1:
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_xa_prepared_disconnect \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			innodb.innodb_pagesize_max_recordsize \
+			innodb.innodb-system-table-view \
+			innodb.mysqldump_max_recordsize \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			main.type_string \
+			main.information_schema \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_xa_survive_disconnect \
+			rpl.rpl_xa_survive_disconnect_lsu_off \
+			rpl.rpl_xa_survive_disconnect_table \
+		; do
+				_disable_test "$t" "requires DEFAULT_CHARSET=latin1 but USE=-latin1 is set"
+		done
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	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"
+}
+
+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
+
+		if use tokudb ; then
+			# Remove some unwanted files
+			rm -fv \
+				"${ED%/}"/usr/COPYING.AGPLv3 \
+				"${ED%/}"/usr/COPYING.GPLv2 \
+				"${ED%/}"/usr/PATENTS \
+				"${ED%/}"/usr/README.md \
+				|| die
+		fi
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+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/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 8ab21c88884e..8cba6237cefb 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,5 +1,5 @@
 DIST pgadmin4-3.0.tar.gz 28915010 BLAKE2B 7e6dccd91f082f7b5514f5d3abdf4653a9961b4efc706e10ce58d817785d514508233e25068762fe0e4bca4c1a3cf10a2515afa38e6f9ba3c99b4af3fa32f3d2 SHA512 5921340176e6748ef13112d906061f195d4bb2f73917d762371bbaeb44ef66cf8e0edcd1cd241eb78dae46ed0b3af014c749468a930fb0c0983b38b2c54dfc3a
-DIST pgadmin4-3.3.tar.gz 30471775 BLAKE2B 06fe13d4e87709aa7ea5a7eef0aa5c7f3aae6891da0c4414fdf5e8936bb6bb7ac9092fd1e4f32f2f253fad7ace5fb8bdf07fed7ccb6dac68175fee5db2d27f4f SHA512 25027298a51d2ce01902fcd2314e35a44dfb5e3d7f6f5f1620841488bd5b8215436ffcad102fe9846ed4a9dee550232cb0b03c2ee0d5f46f53c753c8107e7ec3
+DIST pgadmin4-3.4.tar.gz 30743447 BLAKE2B 4476989dc9bd672810ced56f4c3e6b87f27ec28d693ab6a909b1cdd4ddc0ae51552fe7ac5a3db4382ccded433b1dab239de01697c0709474381c117460a45163 SHA512 57160827a7577b89029a3a621653f2fec9f3b5379a554ea8bcaf80225f32f1ed93e4560ce5d5b499aff2091589e641bdfe82987be46b6155bca3fb072cf2c5e2
 EBUILD pgadmin4-3.0.ebuild 3481 BLAKE2B 697a5b6250d747aff9b4216603077a977a84c44bd344f935315eb0ca9a41b85527b32df819738d42626759fb8244392c15edd4909c9b8f03cdb82debf24f5172 SHA512 5f14d65bc3dac207fd3ced4105be3115cd0821a6a5054ce9d150d31d19ca5de44c66b3971444e200d79bfc6b11949cd437a0cbec388f26beef94ccdacb1c3b19
-EBUILD pgadmin4-3.3.ebuild 3530 BLAKE2B ab03ed3c766c2d49feeb057b20054c36b068898e2269f2bf0fb9a967e376d2aff1219932df9ccb1fda4d55aad05161b1caa6435abbb05ea8ae735805cb54bf3d SHA512 105d6449bb961770948128131b4338190fbf27e46467d5b75a99b3b8f32a102137608f3659fb1bfb6cf274e640e88424409d1c0e00df4a84e25553690e29f463
+EBUILD pgadmin4-3.4-r1.ebuild 3497 BLAKE2B eaf731dddc9a70f754b9c224dc5ccd69aa11ed05cbaac23b7be38d3c995a8bad81a678ebe823f5747c49e8b13b1b200ed285f082c9e5ac764d4f28cb764af164 SHA512 079991dff7bdb07fb21b8b0e6f9c0749d9d09021afb24265ab907141b80a5d728d6d8d0d5a6f752ceb3cbb7fd340d6bf6ebc65022e1a8b980817e0b17aa9f2d4
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-3.3.ebuild b/dev-db/pgadmin4/pgadmin4-3.3.ebuild
deleted file mode 100644
index 2577aff506aa..000000000000
--- a/dev-db/pgadmin4/pgadmin4-3.3.ebuild
+++ /dev/null
@@ -1,124 +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} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtwidgets:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwebengine:5[widgets]
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
-	>=dev-python/sshtunnel-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
diff --git a/dev-db/pgadmin4/pgadmin4-3.4-r1.ebuild b/dev-db/pgadmin4/pgadmin4-3.4-r1.ebuild
new file mode 100644
index 000000000000..18064c0d8eed
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-3.4-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 qmake-utils
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc"
+
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	>=dev-python/click-6.6[${PYTHON_USEDEP}]
+	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
+	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
+	>=dev-python/sshtunnel-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+	if use doc; then
+		cd "${WORKDIR}"/${P} || die
+		emake docs
+	fi
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/*
+	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	local CONFIG_DIR="/etc/xdg/pgadmin"
+	dodir "${CONFIG_DIR}"
+	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
+		[General]
+		ApplicationPath=${APP_DIR}
+		PythonPath=$(python_get_sitedir)
+	EOF
+
+	if use doc; then
+		rm -r docs/en_US/_build/html/_sources || die
+		insinto /usr/share/${PN}/docs/en_US/_build
+		doins -r docs/en_US/_build/html
+	fi
+}
diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index c739978566a7..c0a8077e10fa 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -1,5 +1,3 @@
 DIST pgbadger-10.0.tar.gz 775322 BLAKE2B 072a3b4c2d2d109734fdbf68ff466e34065a852948ae7961e8ba6a40a6881a98653258ee7b483c2a3c9d2d8238370fd842c9b525a0dd11baf1fbf98a0d322406 SHA512 dd1633f1186069a9d59d271cbf0913cf80bcfa88af8236a194f7580c96c84a3513ca0658628069b38ef43a9c9ca7c5573afb2b35e2b1b6d3526f240c2c673bff
-DIST pgbadger-9.2.tar.gz 745128 BLAKE2B 63e7d60992e903a136d4f91422a378a6adc5c0477e69ae1cae3d4c1940dc02517f0b6f16d0fa7c5fe0ea365851807dc800bfaef0e95c546d6c4eb4afe0e2d09d SHA512 c99636fc03e3e1c1cf4c8c034e58e2152ec1118954d4fd9bdfa782d7781eee308cdd7450c0bcca6f5936c173b3780c9362fccc8cf79f5b0fffc895f73a322c9e
-EBUILD pgbadger-10.0.ebuild 441 BLAKE2B 85fe68c7d32619db1b34515cac7830126777bed1601bba8ec64e6bddce1f874c172e4f3eeea3a993c05edf47a5db577e5f8065b6bd05ec35f6466ecc159d8834 SHA512 052318d8604c69d26f0f46be1006e8005daf7507dfe488c5d1c81a8ab15a34fbf5ffe4993d4429d342d8ca6c269e32aba2cc30916c473659c00ad6ea9afb8634
-EBUILD pgbadger-9.2.ebuild 437 BLAKE2B 51ec9c61888f6e01e9d1b4222166268162d8b8b9a6d57a9ed5e9054244a9c34edde5f0edc913a00fe164f57501c525253867df4f8c1b5cea7539f7070a231539 SHA512 9fd59dc534af5fa16a90f26b0953c5e1c606a873c800a9105dfa403e8372f11bd97840730488229a1f1d6e67ff7e27d58b247972480e15486151e988c3ca5078
+EBUILD pgbadger-10.0.ebuild 432 BLAKE2B 42ab8eb5952d04d2ab5ed39ab016c9849821f3e814173a3b7310cd4eeb7f9a1865de5fc332ffa05b7c51c1891881e01157f8011840a4c9478fc3a35e54741b07 SHA512 dd2a897d1741130a35049959bfe636bd522d96fd19ccb447e44f77bcc5ae3b854ab02bee64065992cb3ed4327de3d3f21aa74cb8422f430f4f947f2653a566b4
 MISC metadata.xml 413 BLAKE2B 9b4f24620b42d2cf5befbaed7d52ed2e03d4619ebb547d36e207a900fe481a825a5be0a6fac073d7b278076ced053ae9a3c4b5d05597e5fb4d7ea66c1bff7988 SHA512 6bf32dc50ecd2d51d450413500b00773177109ab3ad26d74b458ec902973fa38542dbc65e65fbbe103b4be63589f61c2b9a6ab6ea5492b1954142afc5c2f8f93
diff --git a/dev-db/pgbadger/pgbadger-10.0.ebuild b/dev-db/pgbadger/pgbadger-10.0.ebuild
index aa5e31f45792..9af05d162eb5 100644
--- a/dev-db/pgbadger/pgbadger-10.0.ebuild
+++ b/dev-db/pgbadger/pgbadger-10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,12 +6,12 @@ EAPI=6
 inherit perl-module
 
 DESCRIPTION="pgBadger is a PostgreSQL log analyzer."
-HOMEPAGE="http://dalibo.github.io/pgbadger/"
+HOMEPAGE="https://pgbadger.darold.net/"
 SRC_URI="https://github.com/darold/pgbadger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/dev-db/pgbadger/pgbadger-9.2.ebuild b/dev-db/pgbadger/pgbadger-9.2.ebuild
deleted file mode 100644
index 16ecc3a80b96..000000000000
--- a/dev-db/pgbadger/pgbadger-9.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-
-DESCRIPTION="pgBadger is a PostgreSQL log analyzer."
-HOMEPAGE="http://dalibo.github.io/pgbadger/"
-SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="
-		dev-perl/JSON-XS
-		dev-perl/Text-CSV_XS
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index dbf83d1f4e7f..6731c123da4f 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,8 +1,8 @@
 AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
 DIST phpMyAdmin-4.7.0-all-languages.tar.xz 7600296 BLAKE2B 10e1168ab7a1d8dfccf5837c211a2e6455d767e27f11aec870a9c4a1a19e8a4a1df67b82a7a83ff3c184c8a111dc272da5c876150615a9fd9a32a643bba84007 SHA512 03f3b56d3fed846e8e27e38a1bf32175b267a3cc2784ee499b64a48b6a37f0352302a9c150e1db1c99f633aabd8a373a834ad7ab2b694146b0ac13dd05bd27e3
 DIST phpMyAdmin-4.7.8-all-languages.tar.xz 6218056 BLAKE2B 879ef6703711725781fcf3b4c9ab607741c4df0d2f1955f632087e33b599e54128c0811dbd125d9015a0ec597dd6d9af54e7136e91f8637badf698ad7a30b8ba SHA512 ae6edcfba72413a6e0af0b120a99809320a840ab332ae77263f21e14f3b34a38cca70591628ba5818d6732ff6d23551ea51cbf6a75012d2326d0fab1c2a1b9ae
-DIST phpMyAdmin-4.8.2-all-languages.tar.xz 5914400 BLAKE2B 3a2bbef5cba6583e5b8a2409647a6657fcc54041213ad26143e6ca6ab58a7550d94c65afc9dac8f5751c31072748b7183ba255b4aebe047c10b06dc6efdbed16 SHA512 32c5f048b31089ea6a6bc0212b32f01eb842eddc323a9729b98a693d96d38b0ef091b4521381dae432d2482bf0214ad65ffaa13c925b0dca5dcb645e2987eb33
+DIST phpMyAdmin-4.8.3-all-languages.tar.xz 5996528 BLAKE2B cf00bab32547c5a6e8c81f529e5b074e3a7c576a7991d6823239172f91cebad7e1b10e2baee589043bf8a5d1d37470a7614a038a0054eaa18e74028bf3cecfd4 SHA512 95998eda6a2db9020671073c62458d819cbd5e54c5f56f467b109401f6b9ebd2dfbc34cc840980bf2d3a7ee3bc93683b7fe20d9bd72b537d8aa066d39089ff89
 EBUILD phpmyadmin-4.7.0.ebuild 1569 BLAKE2B 8582b641380f4a9c47dc3ff62a32774b35f2c252774c91a8ddfa8e7470c8649a192984ccf4124d21af09a3843c1a8d0d520907eb51d50c368d166f1b570ffb1a SHA512 dbc88883d5605423c3ed17563736c1f7e862fcf60e9f162d057229dbd8e372b056072fca592063349361be2a2baeab0ca3ca3a36b4af7130758836a95f1988b7
 EBUILD phpmyadmin-4.7.8.ebuild 1564 BLAKE2B 771fd31cb0188c4d229e7bb9af796cbc3ca6d90d03502fae7cdc0b038d3e9e723cfdf72db72952155d5bfbc37bd7d61b669ceac7a5b11304ad283e32321b51a0 SHA512 3b7fe1cd8b766138e569a82e3161c9c21a0853254f0392d94e9cdb3af3e8934a3cbc689bd14d5b04881dd6cde8dc057585417a1d5dd18ad9d250c2c66f35c9af
-EBUILD phpmyadmin-4.8.2.ebuild 1569 BLAKE2B 47a60e3d4c06cffc24717efcb8dd15040843407540afa833e3a1019c7bf45532e661a8ba770ec0e0dbdeb77b8274ec24eb44100a53920000805103ed6547259d SHA512 f55ba14d91a2b796e8a2e447458ae713242aede0c00b8a3863907d8a428e502abf5d3cd20cd05ca199185e51bd72b3ac303c1ce0db51e747ab9855d39f53607f
+EBUILD phpmyadmin-4.8.3-r1.ebuild 1564 BLAKE2B 5ac1abd3d55453b52b0eb5c9a6c32427e15ee221f7641222c999396b7efeb1dc3c0e6af8949661106d3e49d0a78c1532cfad1b6bfb2743c08d7f8a54e9bfff11 SHA512 247d39125762dd7117b05d4655364784e717a5ff536ef730327e3e83f6fb5ae14eabbf42839c5f568b3ef5e9caa474fb1e8e5b2c21243de651b6d0d750aba50e
 MISC metadata.xml 701 BLAKE2B aef0a047bca31221714bf27203bd720863c5cef6b7b4dd72b441761a0638bca38c03610e65b3819ca0fba6577973908d7ca40ec8baa3aac1255d19b7cfa9f0a7 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.8.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.8.2.ebuild
deleted file mode 100644
index f89f833a9205..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.8.3-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.8.3-r1.ebuild
new file mode 100644
index 000000000000..646226a38ba1
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-4.8.3-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+MY_PV=${PV/_/-}
+MY_PN="phpMyAdmin"
+MY_P="${MY_PN}-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="https://www.phpmyadmin.net/"
+SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[ctype,filter,json,session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+	virtual/httpd-php:*
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index fd9e38b9286c..4e5b0b26fa6a 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -11,15 +11,13 @@ AUX postgresql.service-9.2 1666 BLAKE2B d4b81415539db3d78e0f5908185f903b70966ce3
 AUX postgresql.service-9.6-r1 1477 BLAKE2B 2a652d5b2892f3a52f484fcc0b4f4dad09cf4b46c3739c3f805072040a26128cb2ad9a25d4a7c9f109a95696d739538d379af6bac53c656f5c41af45b6110de5 SHA512 9e2b04923f6ebec1424c0f276c58a6a0c4933f2de5e2a9776169227729afd06ce5284461be8b6ed70e5aaff2a68b9f96c6893d867d35761c9977f9847ccfe93d
 AUX postgresql.tmpfiles 39 BLAKE2B 25a5725af53c8e4e4009887e998172dd863ce218a5438351194548c4fc8ea15308dfba3602d5a922cf49b46015198268a4a4528119d8a74dcef4cc4c1767c052 SHA512 498060f2a597cf374f4fb31deaa2d6c5b00edef68efc0e71b82bfc20b717ae12518ba18fcb455a0c518ebba1a0868f38321470616151d02fa79b889a66dcb9f8
 DIST postgresql-10.5.tar.bz2 20284578 BLAKE2B af2bc5bdc7e69682dac38785ce4a10c2c5c04202f2c3cd4acbb9200dbae7eec75d83813ac4df84b5a8064e77167f22a4dd54c6e84a68e564642cb5d75effd0ac SHA512 1bad30ae88beca66f7e8b99b82e7f02aac1e9230b328e6e5a762a704cdd9dc767d924f5a66c68c93586badfef91b7ff336120a567ce970eaa58bb44c662ad48c
-DIST postgresql-11beta3.tar.bz2 21375988 BLAKE2B cd83fcfc55504a028bf42f2c31de4d9e12ead1ad0f238a1f36397b9405ddf8f6d371062a25e2660f8c6754447a09ddc3a122f178101b8ab80237b16422c8cf4c SHA512 6ac6ecf2fff014b3673b11f6f106fdc93e6692a4a67a4669c4a7557f2b3229e41ddf5365c1e9328d88b6fde9141c15bd1a4640356559e727ee7f9f11641d4bf6
-DIST postgresql-11beta4.tar.bz2 21143836 BLAKE2B d10fe7bd342dcbee3e98cf31355dad5b0bf4837969212e10e6e62549230ce8a3c24be9f61f9e629241b99eb5465e366196a43f58276c338d985fb2d3b6348114 SHA512 38a5f1e9df2b97054a1a9a5ab92b5a909315813cd93562f599f403b3f1f8f898ebd32cd36be9c8792bfb27650831a03eef1cd5335ae2470d22a6664e8b265605
+DIST postgresql-11.0.tar.bz2 21206820 BLAKE2B 7c985e6843162f9ba01a7efcba84743739eb107111d6013b8a5614964c105345e203db307d0da5b0dd42d9c765fcf9462621e3b06e2a09a7ee76befa1ec307ef SHA512 2cf471618dfaabdcbcbd68be3b85b6083376c97fdadce36d2ceb28438b7c736816118eacb1d4f12d48c39f584d78d7ffa89fa6d65858d440045a53921429970a
 DIST postgresql-9.3.24.tar.bz2 17042985 BLAKE2B 976debbc2a072cc307e22beac1d59352ecc214b9879284e635f30295d1f46ad2e0542ffc5f62639527be870afe46ea5daf5b8b2d3da9a069adf1701218def968 SHA512 3d457b6218eeb8da2d8dd134dabc7ec8000cad5863870079b85ce00d94218fa049146290a8389fec15e57d586b0edee9810cdad85f36cbabce49b6b4378ce1ee
 DIST postgresql-9.4.19.tar.bz2 17879273 BLAKE2B 775a8748218c40440df91307107d46a35bcb3b2baf1c383014684c15d06c0026548770f88dccb1c26c3247813761e4a43003c50fe930041afc5701cddabfbde3 SHA512 38e2f1f25bd80fdfdec728cd4a3fee6696ca051e496f0629a0a554ea013bfb9bb83ef5659b00130666462a45036a648cf880a2f49693a8ef2edbde938e4dd830
 DIST postgresql-9.5.14.tar.bz2 18687959 BLAKE2B ac377b5e279d9e8179a94eb91d0cf1a7e3f6443c860d68a4540357d80128fbc54ac1ffec198725b2a783a80448f8a625556f2e6018162304d65659982890d46f SHA512 9b5ebc8dc13bbdbd5b5bc02552e2b9b5029d899a80e82b653542c735868590ebe57d586951bf036c5abd28aae325c71cc69536f88321d50dd3d254f8ee0cfe35
 DIST postgresql-9.6.10.tar.bz2 19991204 BLAKE2B 3d99296b5045a0b56b89257b2aa3f0c8be1108428acd77469b8db94200ad6b0b8d2fa84c73f652f79db56620c46928524d2f3a1a265ac332eb36c0625b800f76 SHA512 960a32c86466f9d5f5491ef163f5c4a99cb5de7312d13371e2223b1d156e31eb2a23ed478e6654bcbb7bd19db9470aaf63473ff661c11c60971b92af5e9daf82
 EBUILD postgresql-10.5.ebuild 13694 BLAKE2B cbc3b1250d2b50dd7a9c318a9c610506db4b2593b013b2d89a573276ab8604cff741a1a3ca03a97e3c9a6bd7392762f821caf90d642c9a05cc9ca0b411340bbf SHA512 4b6fb894e8d5196139a56b897d3a06169c35def0d7e472ac8332987445f7c7ce72568b3b7a45bd7e8dac651108731761c413296864b0c9be4a617217d49ef3ec
-EBUILD postgresql-11_beta3.ebuild 13440 BLAKE2B 7c2cd1050b4e1bf5041fc551bf7e8c93aa309fd6e8e4ca30664214c2b21cd347b9d4473e1ff7d7f2a7697bfcf648173c30770dbc329aabb3229d2d49b38b4c34 SHA512 49d310d814d6d945c5a55f59e5e2b17935d7c3684295fafb27c4b8326146d49b06341c3844fde80ba80bda9fc81408d08a705293e3f1195bc342d953dcfd5ebf
-EBUILD postgresql-11_beta4.ebuild 13440 BLAKE2B 7c2cd1050b4e1bf5041fc551bf7e8c93aa309fd6e8e4ca30664214c2b21cd347b9d4473e1ff7d7f2a7697bfcf648173c30770dbc329aabb3229d2d49b38b4c34 SHA512 49d310d814d6d945c5a55f59e5e2b17935d7c3684295fafb27c4b8326146d49b06341c3844fde80ba80bda9fc81408d08a705293e3f1195bc342d953dcfd5ebf
+EBUILD postgresql-11.0.ebuild 13442 BLAKE2B 9246de6e7d20e8832eb7086be741d33cba3f9aad991eb54f48918b67347286494fa13fda84846ff6c0d0a43ec3f7de034adf2dfbf2a90325146f6470857e8684 SHA512 8621a42938a6f8110a517d2a05f8afb37443cf25066ac4b64dbd4893048725a7d0d1f61347fbcab4ac53ba27b846489d064d7a552834a00c213243897beb21a7
 EBUILD postgresql-9.3.24.ebuild 13747 BLAKE2B 12e74f2f7bc2b18507b5c4e07d093cebd96406c6d981fbcaa6c2851004183acfac3e3fb882e1eea662e8cf1d35c10a1bcd6ad2820a5770874f04ad9cf508c387 SHA512 c89150f9b09e18b196d267dbec2c6539d3eb1ed6326193681249770c5d1ad42e48cffcad160121497dc8dbdd692994bd2704f581d52d029ba4dff5178a773746
 EBUILD postgresql-9.4.19.ebuild 14557 BLAKE2B 57446276df8b11ebe12ef5a4b3e95dfc2892cdf93cb1a40117f0e7ae5774e0ba1a4a08b2306d971625636d4f0bddb4d0395bc6671397ef291c0251a31bc37256 SHA512 05b6604f17b63442a1eda4673a702eab7bb0ac4af87dce7c9f56085573768aec408aa441873317cf610e379972221f68d49c19f47f7be48b1e6a74809d13c407
 EBUILD postgresql-9.5.14.ebuild 14785 BLAKE2B bbd02c18eb7e6b6c9bb2f3e4b4010bc1aadc0aaabe158accac75b1f692c8905d565647bac95c46b69003f70ce6608017a877e74e37e915a2827f5a6f35a732a5 SHA512 2ae77b20602445192062ab5930cc518c3524aa8c57c4aaa4923ec15b924f3b166dcd51dca32a19618d3055214bfed7977c4630dd40b6967aaf491f1688aaf717
diff --git a/dev-db/postgresql/postgresql-11.0.ebuild b/dev-db/postgresql/postgresql-11.0.ebuild
new file mode 100644
index 000000000000..0db6206b7a97
--- /dev/null
+++ b/dev-db/postgresql/postgresql-11.0.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
+		 zh_TW"
+
+inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT=$(get_major_version)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="doc kerberos kernel_linux ldap libressl llvm nls pam perl python +readline
+	  selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? ( sys-devel/llvm:=
+	sys-devel/clang:= )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls nls "'$(l10n_get_locales)'")
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-11_beta3.ebuild b/dev-db/postgresql/postgresql-11_beta3.ebuild
deleted file mode 100644
index 27adb918d12f..000000000000
--- a/dev-db/postgresql/postgresql-11_beta3.ebuild
+++ /dev/null
@@ -1,452 +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} )
-
-PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
-		 zh_TW"
-
-inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT=$(get_major_version)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-IUSE="doc kerberos kernel_linux ldap libressl llvm nls pam perl python +readline
-	  selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-llvm? ( sys-devel/llvm:=
-	sys-devel/clang:= )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls nls "'$(l10n_get_locales)'")
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		# Temporarily tack on tmp to workaround a file collision
-		# issue. This is only necessary for 9.7 and earlier. 10 never
-		# had this issue.
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-11_beta4.ebuild b/dev-db/postgresql/postgresql-11_beta4.ebuild
deleted file mode 100644
index 27adb918d12f..000000000000
--- a/dev-db/postgresql/postgresql-11_beta4.ebuild
+++ /dev/null
@@ -1,452 +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} )
-
-PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
-		 zh_TW"
-
-inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT=$(get_major_version)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-IUSE="doc kerberos kernel_linux ldap libressl llvm nls pam perl python +readline
-	  selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-llvm? ( sys-devel/llvm:=
-	sys-devel/clang:= )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls nls "'$(l10n_get_locales)'")
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		# Temporarily tack on tmp to workaround a file collision
-		# issue. This is only necessary for 9.7 and earlier. 10 never
-		# had this issue.
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index c2edb3702e8e..a0c8753a261d 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -37,4 +37,4 @@ EBUILD redis-4.0.8.ebuild 4074 BLAKE2B a6190e8b3223f516c48889f5bd455e7c94c1c68e0
 EBUILD redis-4.0.9.ebuild 4074 BLAKE2B 609631167471b07d3caccad80d601e4d73a594a97979b25f828c171c341f2f8d24c12e2399ad81b8952e5f459f0a340726a4e8ee69a1f51b0626b52d18e7ce3c SHA512 86c003235c630c87a551b31f359a5fe824d7114016f22788cf8dc84dec56d5bea24c3fdbc86efd15734ccb636394bb6fc4f4d757566ac857605fa23c841db4d4
 EBUILD redis-5.0_rc4.ebuild 4127 BLAKE2B 110d57d99191a4adc8b3da6978320d744b7e83a876c2f0b569187da7e4d26f059368a0021a64ddc17846e3d48390ff9424457278def0df04436ce0b04352b371 SHA512 d8daa2fe2b0640001fdc66ef190801cafb542f61fb73546a2d428a7bb306fad9c6ffdc47336774aa072b8a2cd9a0021bbcf6a86a3124ddcb74037f7a1a7e2fd0
 EBUILD redis-5.0_rc5.ebuild 4130 BLAKE2B c4e496f916e3caeb24b2ada9c6c4bd709aee3a3a63bc695383ff2624277ea6cb74804dbb945aba8650d317ad06324c51a08c6432ae4c0306bc8428f5185f3cc3 SHA512 2930a1dfeeaafbc17e12c89b23527c874430451a5a60271ffa4d66e49fea6bed100c9d0ef8134a6d8b48e21f8bc7fabd7683c2617e6b37d78962c473b272a94d
-MISC metadata.xml 535 BLAKE2B 8b38981c28c1a1ac98cbadcc1a7e6ae9b48eff471f56a8ce182b26a331e8fdb92e0d76fa44f0c7f84f6d262fc7b1ad23ddb348d445dfc472f9b8be86d6ca222b SHA512 10302874f9e9818bfa599f4cb1e75bf9dc27f187cf7858855c2d77ddfb282ead944f40027596a80e8e22bdd5bf374613362be0c1779c0e5941e4135ad994c120
+MISC metadata.xml 440 BLAKE2B b853160a8483ff59c413a37b8fd1703283cc80c5ea9de092654dd1809bdc6ed3dc98fb6285a3f33bfea136bdf3db4065b3e22c34f7458e9e83aa63e137a13eb3 SHA512 7c125eed761e5f4c868a3fd5539d5182b9c4da6ddeb0cb82a46dc6d0cc682410eb100168ddb4b5fb214d6092395394cefef5bc8fd3dcce818542d30748f9bd17
diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml
index 19c095efc2a0..96eae677a075 100644
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@@ -8,9 +8,6 @@
     <email>robbat2@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="jemalloc">
-      Use <pkg>dev-libs/jemalloc</pkg> for allocations.
-    </flag>
     <flag name="tcmalloc">
       Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations.
     </flag>
diff --git a/dev-db/rethinkdb/Manifest b/dev-db/rethinkdb/Manifest
index 95b7ff5998e4..fa392a74b12e 100644
--- a/dev-db/rethinkdb/Manifest
+++ b/dev-db/rethinkdb/Manifest
@@ -6,4 +6,4 @@ AUX rethinkdb.service 261 BLAKE2B ac1f760843ebe249a5066031b5637c1375f84ee63ee230
 AUX rethinkdb.tmpfilesd 43 BLAKE2B a294bf834c883ebca33fb289328007e144d14f0fd9c685f3f10bb209af01100347334d21e49243e83f0cf6d5ac1bcc07f49071dc2017f2606f06c9304f67e296 SHA512 5996f72b8e08aac80285373e8e1b5a664177e9d0e8d13e5638c6b821fe5b7a0368001fbfa9ef3f6709dabf0616abcabea40adc4808d176572f8f99b7a3255bae
 DIST rethinkdb-2.3.6.tgz 76787356 BLAKE2B 291f5ff7f2574329e3c96a838a2b4a5f801fae5221612f97d9c6ac250f07e8b8495ce55e9b59fa6085328ef9b9061f63c90db088175458102d2ab319b08c3be1 SHA512 653177750f7439fa1d61a121e488d578be1eab90f87c7d17ad52b9793d8543f22bbe98f8d501c2ab2d7048c65118096430fe7bde945d87c7a3228905af801af2
 EBUILD rethinkdb-2.3.6.ebuild 3887 BLAKE2B dbc1ed84b0c50ac172d9b8e2e36f2f75ce831f1c9043de5e654908a4a2789442e4c25dede7cf07c94bf4b29002c369e750834edce8596c2605e29898085fce57 SHA512 593edaccf511e503382a40cfd2e637a49706b3cb9f5235fdcb93abed619987042e785fdae795eae97d06b8ca9c630a15b3b79de2b58d3020b26b76660953e5d9
-MISC metadata.xml 584 BLAKE2B 33c0de170a389d6a2a4d705786c5534881977fe779facc6e647b30d2c4c3cd66d7b7bd5669b58623af766b69f5c86c744ef9ba89489bca1a6b5df1912512fd98 SHA512 50641820a4f298ad66ceedafcb388b8f99d2732e0e7de9c0aa412d75482488a9d382845802ea55a451c39890ff5167715f47e3346aad29992fd3bc069d097dae
+MISC metadata.xml 479 BLAKE2B da42cd39b5a97d717bbba5d640794b8620783464226a641bdbcc3f9f89861051a88ad0789bd43ed606d4955d8265a148dc038e3f2d2851042e6f9080885cf845 SHA512 927c6fb7c435c6ebd562dd581a392cf36f48ac20fec63dd0c090efdadaa68fcbbd28d6aa8c5c2f24822d0453ac74847576dcb45fd93a3c6ece648c17b6abba7c
diff --git a/dev-db/rethinkdb/metadata.xml b/dev-db/rethinkdb/metadata.xml
index 91224a49a819..48fd46f66002 100644
--- a/dev-db/rethinkdb/metadata.xml
+++ b/dev-db/rethinkdb/metadata.xml
@@ -6,9 +6,6 @@
     <name>Ultrabug</name>
   </maintainer>
   <use>
-    <flag name="jemalloc">
-      Use <pkg>dev-libs/jemalloc</pkg> for allocations (default).
-    </flag>
     <flag name="tcmalloc">
       Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations.
     </flag>
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index e820c1761a85..fa928385a7fc 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/arduino-builder/Manifest b/dev-embedded/arduino-builder/Manifest
index d275e2c9bb50..eda424cb8d2c 100644
--- a/dev-embedded/arduino-builder/Manifest
+++ b/dev-embedded/arduino-builder/Manifest
@@ -1,7 +1,19 @@
 AUX arduino-builder-1.3.25-platform-paths.patch 982 BLAKE2B 9bc9d1d7cb12fe4f1e0539a2a548bbeb9ecc596e03fd9e7757d2d011e15b72a176095311063f0c58db2572db5912f6fbf8da493a83395f16f806ccd8a1c8de7a SHA512 8a2055cb6fdc0141701db908ca26c390d1f5992234eae5410b828a84972fcb0c2645b4062242064e37118ed20bad75b08fe044110a65a7b10c9662f62c3f44e7
+AUX arduino-builder-1.3.25-skip-tests.patch 5030 BLAKE2B ab80714f3168a61cb8d0787014e9710328319448e68f7d39758aa36227337a0f1609ffe43dc9c8104a831e96bccb81e4045c61a00137f4471ac9a575ecb797b8 SHA512 fe5730a5ff1bed4b214096840498613cf41e95fd700690bc1f45596b290c360b53458aab43d4a6bb6e3402724e6debcce8be47aa8e1d55731b9b213324d2fdfe
+AUX arduino-builder-1.4.1-platform-paths.patch 952 BLAKE2B 806ac4d6a0c1b2319d8ac3e76034893b809d21b84bf984c2ea73a935aa9c24613f2f48b11825611d6dac5c1c7ae413eae27bb1ba3b3144b8747bd3fa91e3090c SHA512 7d2acbaf5c4efd9773da7bf8e513cae4f013ffd016b84189981af839e1f4d518b8522049f07daf3e08c787d5f72ca307566bb1fd60ac3da86947f36ad29e8c27
+AUX arduino-builder-1.4.1-skip-tests.patch 5635 BLAKE2B 1aa9cd5a6826df30172cdb34b4bf71c553579c3f891abc4f630662e530d2b959f73225b0022e26b01b35306901e05498e11430a392115f53212959f2ebf7ac8e SHA512 09acfb0abfb02dba7d76641c7056a2f6b9e151cd43ffd8d8ceb0e0d692f35b372c9271456a6095b21dafd7971f64d9afb11af52720fffdc81e6035efc1e922d3
 DIST arduino-builder-1.3.25.tar.gz 206905 BLAKE2B 6770b89607c1563b68a79d34e6e214586106c63a4b3c854b4f85a4b9eb2fc24ce5d4a97c29b0c05c19b6834e103f3c3c574bd8cefed0eb684d8aab7e4c71ee7f SHA512 3740530800f8a3cfe1fe20a91579e6b632b76c2c4ace68c7b178a2d234032d5887abee3d0360c3039f2fec912a0d5cabe948bf930a7d9ea23221625456ad5357
+DIST arduino-builder-1.4.1.tar.gz 220058 BLAKE2B b993ad508b81b3f05bb24747a63ac7b826739265aabc0437be403ca7154e6f3b580dacf235979fa4b395c6cc8c978e2cbdcab072822bd8fe61e42074ca4323e8 SHA512 d72f63d4235531310c412b096d154977d7d6ea2746e8703c8208e33e7bf3cac416817ccb5fbc47248bfe4a5858fa3a91117919b8cb636261c5cec28b8bc415bc
+DIST github.com-arduino-go-paths-helper-751652ddd9f0a98650e681673c2c73937002e889.tar.gz 14609 BLAKE2B f8a5b54f9898db7ea02d8aad779fc32cb6b21e430c84c5f77b985f9a23dc62de95a6a366956b7861b6b4b261ff5f30d3b20c92e51b256ed6f223a309a644302d SHA512 6116531448270b502187cd91d2a0847a8791c53b65729766291f1ddaa9bc2ce95b0d24a54dc895ad62e2d04c092081ce46300101b9f371db78b0204a541c8252
+DIST github.com-arduino-go-properties-map-ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41.tar.gz 16406 BLAKE2B f6afeb160114bfb221c882d1b2c8e7f6d6841585affbf349c82c421500d28cf2b09b28bef960048c357fac69ef5432cecc0a0098f7a4929aa0d3d566cbe56bd1 SHA512 5327e207b4a1a978585345d498f4af39bdd716686c058dacebada113cc07066834ebe19eb8f4d8388d400755dca7e8656bc053e7d8804a1d7e04a1cc6c4414ea
+DIST github.com-arduino-go-timeutils-d1dd9e313b1bfede35fe0bbf46d612e16a50e04e.tar.gz 8086 BLAKE2B d2e558b3c88e084c99cd0dd0ccaa0859e21b53671d4d28f57cce505f7fda0f89fdde7a08bcf7d2e4d8b57e4a760bdc608e97f0c27542fd0a396a548494bb7351 SHA512 e573f448c4b0b17882be98516abcdbbc4174e3ab041ce1390bc7e3e365932f1a4c7fe63cebf4e82b43bec5d5f4748511fa608a777a0cbc18b29e224041884fb8
+DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
 DIST github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz 7835 BLAKE2B f4092b4ef5ebf996cb3c20183868dbdd154ea7cf02a4fd5a3375a3193e9ccacad08f0b6681b456786524b729ffb8c0b5c8af6ceec630eec22326d0fe1e00eb22 SHA512 b1d5e7c6f30f94f8a41b10d32b7f4ce7de8394f74ede6c14fb1f267a0514b24bc3bc7659c3baf6eacf424cea8451e7e57f5f72acc568342e90a447bd02f3e262
+DIST github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz 332903 BLAKE2B b05fa3e3316bd6adbad623ab239795172ee70c38380873ee52a32c10f8f3e750c26b27fc43da4a290d82eda5723fd56063bffe01fdedb2d3a65bf5349abdb376 SHA512 80407835aef3553f655c35e89aa884038c90a3667460af1db60b069ae31e870efc59d6907743ee080d85e167c20d778440b9a6d19ff79f9055bc666c8314fe30
+DIST github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz 2323831 BLAKE2B a614c74b60f8e347b47c8686807228ea76b021a918fc732b69293c8b59c1bc5396e320cbce6db87ab43b9a4fd649d19779874934bdd667f7cabf03165439c54a SHA512 a6524f31e8c4775195c245ffbe54c7f770591d46663ea86b8120ffd8efb3cf9269569fbf457b0d0272dc47177ccf3b413e858c2b437ee9892b5ac6698d07ed4d
+DIST github.com-grpc-grpc-go-8dea3dc473e90c8179e519d91302d0597c0ca1d1.tar.gz 506815 BLAKE2B 498909d0704b46d54571ad1f87d7636fafdf48f11fbf53e5e8ec6cd16aa6cd57cdfaedd8a7c00cd33ff60c99b0ab0dbf3f9c8df28155c75b2ceeaada3afabf92 SHA512 37970d20ce358d5186a9a152b1a0b1af816f7d53de8f2c35c901e8533e8191125e08ca60e1177bbab5e2585a1fa6e0fa9785ac70caadc5aa0fa58c189d26ca95
 DIST github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz 6901 BLAKE2B 6138ac40810ad000a4336ffbca3bc5c1d0e96854c7918fb2aad9f7b2596ac66f285ac8c519e30b6e97cdb0009b31ab73b83ff2e1db2f464c2d88f2c1045a6bd9 SHA512 00f38f51c5f761b5a3e60a6e6b602f1246a746f081f2d8946d01387234270544692c6af54d0e69919c1af8aa753f848eeecc4421f2ddf881f21522ccf5545d75
 DIST github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz 81099 BLAKE2B 592a7c114b01bc5b1982135f310aa8619c2888ac36ccb5d876a38655a13f7dc4d468a7a42a44cf9cf69fc7bd6769a9ba010b48089d5ce866dcd564e20487e04a SHA512 f10255b0f47237c7583626a3bb213ca67d0db92c2a1531cc31dac089cdb13139b01647809503313a26f3e53a64a98cebc3bf9c4e1bd1ed975d9b81aa516ab5af
-EBUILD arduino-builder-1.3.25.ebuild 2767 BLAKE2B c8ac8f94cffe79ff009aee2dbcefba7a5e282bde90c58f4254fe9dec7564e8e41fa56c61071f475ae5db660f090134cf7f55a0810b940952c78d9a6402820e0b SHA512 adda2529e4cf3fd8be368d3c026ca52970d5e30be7ec0233108a943715c014dadb4e37be79109b7cfdb6ab5746d83aa353afcddc6f1349475c83a48614f7eebe
+EBUILD arduino-builder-1.3.25.ebuild 2825 BLAKE2B cc4ec18475e9ecf08e317356bd613b0706e5aa455a22b2d6d1807228609afeb1e95e1e45e0fea2ae5e7651f2db163632d27a5d7212bbbe30b14e25cb61e5c358 SHA512 b121e4c06899ed675897cfa29d12f6b2879a43402bd2c02135e9ae5f54615385e55ec315492ebc43af7ad8ab9c0e2252b743abb5a76d7b53c46b98a784e22bc6
+EBUILD arduino-builder-1.4.1.ebuild 2478 BLAKE2B 85a284b161b9e98260c52fd5338db7c8f3afe1063f00306fa73e1ef7f0ce2cbf0cdfc07ec75729d89b8ceed995671dc96c62c0c90581edccb38a52ae367b1533 SHA512 0deb62c9ebaa1089f0b2e021e871a29a2994edc167a6f9cdb01ddb9fab38f2bd8a640759627adfa2c5d068b47afd0d6ac77520c5c40f6245aaaed0fef33d7233
 MISC metadata.xml 339 BLAKE2B 8353146b638f77f9846c37e1717f19e9d3eff24a88a8299bb43d6118e47c5159a53ed8612681f5f849269a8d250d99b9dc57030452d96ed81975196b3faedfb1 SHA512 3a107172d306efee35994af117181d4a08388883d4efeb48dd270f8a711deae39d68e1bd38423e0a71d91f708d4c1877d300ed4823e43fda8a924bd98b8f37c7
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
index 0930e5240c01..fbf0e5e82916 100644
--- a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
+++ b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="sys-devel/crossdev
 	dev-embedded/avrdude
@@ -48,6 +48,7 @@ src_prepare() {
 
 	# path paths so that they point to system ctags and avrdude
 	eapply "${FILESDIR}/arduino-builder-1.3.25-platform-paths.patch"
+	eapply "${FILESDIR}/arduino-builder-1.3.25-skip-tests.patch"
 
 	default
 }
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild
new file mode 100644
index 000000000000..078347f52348
--- /dev/null
+++ b/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/arduino/arduino-builder/..."
+
+EGO_VENDOR=(
+	"github.com/arduino/go-properties-map ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41"
+	"github.com/arduino/go-timeutils d1dd9e313b1bfede35fe0bbf46d612e16a50e04e"
+	"github.com/arduino/go-paths-helper 751652ddd9f0a98650e681673c2c73937002e889"
+	"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+	"github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
+	"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
+	"github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
+	"github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
+	"google.golang.org/grpc 8dea3dc473e90c8179e519d91302d0597c0ca1d1 github.com/grpc/grpc-go"
+	"google.golang.org/genproto af9cb2a35e7f169ec875002c1829c9b315cddc04 github.com/google/go-genproto"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="A command line tool for compiling Arduino sketches"
+HOMEPAGE="https://github.com/arduino/arduino-builder"
+SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-devel/crossdev
+	dev-embedded/avrdude
+	dev-embedded/arduino-ctags"
+
+DEPEND=">=dev-lang/go-1.9.2
+	dev-go/go-net
+	dev-go/go-text"
+
+PATCHES=(
+	"${FILESDIR}/arduino-builder-1.4.1-platform-paths.patch"
+	"${FILESDIR}/arduino-builder-1.4.1-skip-tests.patch"
+)
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+}
+
+src_install() {
+	# we unfortunately have to copy/paste the contents of golang-build_src_install() here because
+	# we *don't* want to call golang_install_pkgs() which installs all static libraries we've
+	# built. All we want is to install the final executable.
+
+	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+	echo "$@"
+	"$@" || die
+
+	# END OF COPY/PASTE
+
+	dobin bin/arduino-builder
+	# In addition to the binary, we also want to install these two files below. They are needed by
+	# the dev-embedded/arduino which copies those files in its "hardware" folder.
+	insinto "/usr/share/${PN}"
+	cd "src/github.com/arduino/arduino-builder/hardware" || die
+	doins "platform.txt"
+	doins "platform.keys.rewrite.txt"
+}
+
+pkg_postinst() {
+	[ ! -x /usr/bin/avr-gcc ] && ewarn "Missing avr-gcc; you need to crossdev -s4 avr"
+}
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch
new file mode 100644
index 000000000000..4ed170061c16
--- /dev/null
+++ b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch
@@ -0,0 +1,109 @@
+Skip tests that can't run on Gentoo because of the network sandbox
+diff --git a/src/arduino.cc/builder/test/hardware_loader_test.go b/src/arduino.cc/builder/test/hardware_loader_test.go
+index c9ea1d5..e7c68d2 100644
+--- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/hardware_loader_test.go
++++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/hardware_loader_test.go
+@@ -41,6 +41,7 @@ import (
+ )
+ 
+ func TestLoadHardware(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware"},
+ 	}
+@@ -85,6 +86,7 @@ func TestLoadHardware(t *testing.T) {
+ }
+ 
+ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
+ 	}
+@@ -155,6 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
+ }
+ 
+ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{"downloaded_board_manager_stuff"},
+ 	}
+@@ -203,6 +206,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
+ }
+ 
+ func TestLoadLotsOfHardware(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{"downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
+ 	}
+diff --git a/src/arduino.cc/builder/test/helper_tools_downloader.go b/src/arduino.cc/builder/test/helper_tools_downloader.go
+index 3642510..e6391b6 100644
+--- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/helper_tools_downloader.go
++++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/helper_tools_downloader.go
+@@ -83,6 +83,7 @@ type Core struct {
+ }
+ 
+ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
++    t.Skip("Gentoo skips tests requiring network");
+ 	cores := []Core{
+ 		Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
+ 		Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
+@@ -165,6 +166,7 @@ func patchFiles(t *testing.T) {
+ }
+ 
+ func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
++    t.Skip("Gentoo skips tests requiring network");
+ 	allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
+ 	NoError(t, err)
+ 	if allCoresDownloaded &&
+diff --git a/src/arduino.cc/builder/test/target_board_resolver_test.go b/src/arduino.cc/builder/test/target_board_resolver_test.go
+index 274eb92..d6973e3 100644
+--- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/target_board_resolver_test.go
++++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/target_board_resolver_test.go
+@@ -39,6 +39,7 @@ import (
+ )
+ 
+ func TestTargetBoardResolverUno(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ 		FQBN:            "arduino:avr:uno",
+@@ -64,6 +65,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
+ }
+ 
+ func TestTargetBoardResolverDue(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ 		FQBN:            "arduino:sam:arduino_due_x",
+@@ -89,6 +91,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
+ }
+ 
+ func TestTargetBoardResolverMega1280(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ 		FQBN:            "arduino:avr:mega:cpu=atmega1280",
+@@ -115,6 +118,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
+ }
+ 
+ func TestTargetBoardResolverMega2560(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ 		FQBN:            "arduino:avr:mega:cpu=atmega2560",
+@@ -141,6 +145,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
+ }
+ 
+ func TestTargetBoardResolverCustomYun(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
+ 		FQBN:            "my_avr_platform:avr:custom_yun",
+@@ -167,6 +172,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
+ }
+ 
+ func TestTargetBoardResolverCustomCore(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
+ 		FQBN:            "watterott:avr:attiny841:core=spencekonde,info=info",
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch
new file mode 100644
index 000000000000..be1f2b5edda1
--- /dev/null
+++ b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch
@@ -0,0 +1,19 @@
+diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
+index ca8df1f..17ce03f 100644
+--- a/src/github.com/arduino/arduino-builder/hardware/platform.txt
++++ b/src/github.com/arduino/arduino-builder/hardware/platform.txt
+@@ -1,11 +1,11 @@
+ # ctags
+ # ------------------------------
+-tools.ctags.path={runtime.tools.ctags.path}
+-tools.ctags.cmd.path={path}/ctags
++tools.ctags.path=/usr/bin
++tools.ctags.cmd.path={path}/arduino-ctags
+ tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
+ 
+ # additional entries
+-tools.avrdude.path={runtime.tools.avrdude.path}
++tools.avrdude.path=/usr/bin
+ 
+ preproc.macros.flags=-w -x c++ -E -CC
+ #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch
new file mode 100644
index 000000000000..f66e829e4b01
--- /dev/null
+++ b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch
@@ -0,0 +1,129 @@
+Skip tests that can't run on Gentoo because of the network sandbox
+diff --git a/test/hardware_loader_test.go b/test/hardware_loader_test.go
+index 147396e..da6c8ef 100644
+--- a/src/github.com/arduino/arduino-builder/test/hardware_loader_test.go
++++ b/src/github.com/arduino/arduino-builder/test/hardware_loader_test.go
+@@ -41,6 +41,7 @@ import (
+ )
+ 
+ func TestLoadHardware(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware"},
+ 	}
+@@ -85,6 +86,7 @@ func TestLoadHardware(t *testing.T) {
+ }
+ 
+ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
+ 	}
+@@ -155,6 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
+ }
+ 
+ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{"downloaded_board_manager_stuff"},
+ 	}
+@@ -203,6 +206,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
+ }
+ 
+ func TestLoadLotsOfHardware(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{"downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
+ 	}
+diff --git a/test/helper_tools_downloader.go b/test/helper_tools_downloader.go
+index 49aa847..ba77a57 100644
+--- a/src/github.com/arduino/arduino-builder/test/helper_tools_downloader.go
++++ b/src/github.com/arduino/arduino-builder/test/helper_tools_downloader.go
+@@ -83,6 +83,7 @@ type Core struct {
+ }
+ 
+ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
++    t.Skip("Gentoo skips tests requiring network");
+ 	cores := []Core{
+ 		Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
+ 		Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
+@@ -177,6 +178,7 @@ func patchFiles(t *testing.T) {
+ }
+ 
+ func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
++    t.Skip("Gentoo skips tests requiring network");
+ 	allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
+ 	NoError(t, err)
+ 	if allCoresDownloaded &&
+diff --git a/test/target_board_resolver_test.go b/test/target_board_resolver_test.go
+index 49e0abe..7a50fe1 100644
+--- a/src/github.com/arduino/arduino-builder/test/target_board_resolver_test.go
++++ b/src/github.com/arduino/arduino-builder/test/target_board_resolver_test.go
+@@ -39,6 +39,7 @@ import (
+ )
+ 
+ func TestTargetBoardResolverUno(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ 		FQBN:            "arduino:avr:uno",
+@@ -64,6 +65,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
+ }
+ 
+ func TestTargetBoardResolverDue(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ 		FQBN:            "arduino:sam:arduino_due_x",
+@@ -89,6 +91,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
+ }
+ 
+ func TestTargetBoardResolverMega1280(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ 		FQBN:            "arduino:avr:mega:cpu=atmega1280",
+@@ -115,6 +118,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
+ }
+ 
+ func TestTargetBoardResolverMega2560(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
+ 		FQBN:            "arduino:avr:mega:cpu=atmega2560",
+@@ -141,6 +145,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
+ }
+ 
+ func TestTargetBoardResolverCustomYun(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
+ 		FQBN:            "my_avr_platform:avr:custom_yun",
+@@ -167,6 +172,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
+ }
+ 
+ func TestTargetBoardResolverCustomCore(t *testing.T) {
++    t.Skip("Can't run on Gentoo")
+ 	ctx := &types.Context{
+ 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
+ 		FQBN:            "watterott:avr:attiny841:core=spencekonde,info=info",
+diff --git a/test/wipeout_build_path_if_build_options_changed_test.go b/test/wipeout_build_path_if_build_options_changed_test.go
+index 51bfe80..8501fb6 100644
+--- a/src/github.com/arduino/arduino-builder/test/wipeout_build_path_if_build_options_changed_test.go
++++ b/src/github.com/arduino/arduino-builder/test/wipeout_build_path_if_build_options_changed_test.go
+@@ -42,6 +42,7 @@ import (
+ )
+ 
+ func TestWipeoutBuildPathIfBuildOptionsChanged(t *testing.T) {
++    t.Skip("Can't run in Gentoo")
+ 	ctx := &types.Context{}
+ 
+ 	buildPath := SetupBuildPath(t, ctx)
+@@ -73,6 +74,7 @@ func TestWipeoutBuildPathIfBuildOptionsChanged(t *testing.T) {
+ }
+ 
+ func TestWipeoutBuildPathIfBuildOptionsChangedNoPreviousBuildOptions(t *testing.T) {
++    t.Skip("Can't run in Gentoo")
+ 	ctx := &types.Context{}
+ 
+ 	buildPath := SetupBuildPath(t, ctx)
diff --git a/dev-embedded/arduino-ctags/Manifest b/dev-embedded/arduino-ctags/Manifest
index 7d78925654ef..e6000e5707a0 100644
--- a/dev-embedded/arduino-ctags/Manifest
+++ b/dev-embedded/arduino-ctags/Manifest
@@ -1,3 +1,3 @@
 DIST arduino-ctags-20161123.tar.gz 490200 BLAKE2B f51b18a0db420124c5fed2b320c16d9eeb96fce6d0f118cf43a8177f88400daaeb83437c3993353c16b73781961c7476e782e66891582f4b3dc5301c73da64dc SHA512 ae5bde92c3dd0b9a179bc1df998f20312c4ab8b2c9c1840dbe543d23fb4531b9e5524f1399d9922ed9b2de4582bdb74635f7ec576a42c808d152c3fbb84f9687
-EBUILD arduino-ctags-20161123.ebuild 738 BLAKE2B d1819283886e1c211496388632a5573c0f55db9d89b047314acdb4a77eee379e5a488a3a374598dd57a53f246a4753d2cb3bebadcdc619e0105cb078cd324aeb SHA512 5b1e043f0ce8b3472be0f05b1e2601c7822db932d1e5c02fecf5f4cb4b4b3adb3b0d7e3cbb99c8d06123df4c1cabc7538ab5844fcb3102e7573991f2186380a9
+EBUILD arduino-ctags-20161123.ebuild 734 BLAKE2B 255520788f2d2e133bf01a233623fbdf5d8dd275a81fcfc7e14026a3d1f50a548a193e13c3726e6ca943a4e977ec92d24eb573ab615d84b31ca304f81909e4e9 SHA512 1cdd8a481ad8d7f02ada234df6e3da3baa63e879924e757bf83958e0ad44e131549f622ce2bb6b68a3c9015587a4a100ce12cce4cc5166cc84fa89b68b3417c3
 MISC metadata.xml 626 BLAKE2B 723945b93e97337df1fc85a27c7fb937d624372a1732ef026d0541ab6179806aaa8416e3e973873d7b2b2d5c39a32391158a1d0e172b02aa35b9c20aa1619ee7 SHA512 e129f6dec30edb56b3a85f26c171d314445c8bbe44cfb7e5fdd7f4d18a763fa13a79a6af95b7d0195bbc33b51d67fe84e33f402d30bf5672a7e7262738fba72f
diff --git a/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild b/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild
index e2bcd0810ab1..5fdb6990c1fe 100644
--- a/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild
+++ b/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/arduino/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 S="${WORKDIR}/ctags-${COMMITHASH}"
 
diff --git a/dev-embedded/arduino-listserialportsc/Manifest b/dev-embedded/arduino-listserialportsc/Manifest
index f034a951bb3e..6ebb5e050db9 100644
--- a/dev-embedded/arduino-listserialportsc/Manifest
+++ b/dev-embedded/arduino-listserialportsc/Manifest
@@ -1,3 +1,3 @@
 DIST arduino-listserialportsc-1.4.0.tar.gz 5448 BLAKE2B a1b5256c9e9ece7ec4de8b1481b6e20769fe07fd94b73d099922074ff20d251896d992aba1e3680dc7e667ff2897fec05812a07273efe097cf5387a5f0207554 SHA512 0e8bbf1e49fa8705a6d3c28b44043f8d13589b7ebdac245db79ed3826bf56028778fdf721af3cf756cc8ea19e7a2f7e5f19421a105211cf0cd35041ec718c2bb
-EBUILD arduino-listserialportsc-1.4.0.ebuild 1103 BLAKE2B 5abdba050e7e03c35162f6db68502052dec6ec39b5c7e6e5657d787d92929d2cb7383ccfd53d0c3a0a4d02236a189209a491c8fe338cf30f25a533f6ccfdb4c2 SHA512 511744e80332cf3fdc58a5a19e34dce6b7f83ef54b38261d8028793f82988a11618c32088bbdcbb4bf31e434005cf568f7015be1e14d6d062f7cf7dd30ab4759
+EBUILD arduino-listserialportsc-1.4.0.ebuild 1099 BLAKE2B d22c201011786d7bf1bf54078d475aad32f89bfa6cfffb07e714bfc2f310b0035983b71b988100c35cbb8227e71077d01716421fc214f43ef7f1722147f21f15 SHA512 73684175e543ebaa62e6e848456344efafb20a4abef24132a24501e8cf40c549ef8135f53e662be4b5baf548a37cacccb0cba5ce1fe6031a611c64f2c98427a6
 MISC metadata.xml 340 BLAKE2B 2cd9ba0239d059246ccb17feca24dc51e3ea6a03ffddc316e7ba596decd2cd52337f54ecb3746b04d1ebe6fbc1b4a8488e3080b5274283837fa43f5a75bead76 SHA512 67948320e986bc94e6ca659c06e6a914b824c54bddfbd507d1bdfc6773c673540bd07555eac945ab72e4ff85d93de97455abf3481d0ae3d99691e48efebb9cde
diff --git a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
index e93591a0c0b5..54309574a086 100644
--- a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
+++ b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/arduino/listSerialPortsC"
 SRC_URI="https://github.com/arduino/listSerialPortsC/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND=">=dev-libs/libserialport-0.1.1"
 DEPEND="${RDEPEND}
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index 77a0d402bebd..6519be28d330 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -28,5 +28,5 @@ DIST arduino-icons.tar.bz2 58775 BLAKE2B 20f230394a8d725eaf7300f66105b09b31eb96a
 DIST arduino-src-1.0.5.tar.gz 235284641 BLAKE2B 7e7ed1305be468dff5ee32238e51b56c214bb993531c67a5ed178a267b5ff8b0f5303aa2a539b64ac40b20278d0206513c3b26f74dd9120058d97fabbbafef27 SHA512 0a40203b8a31c4d9288500962ada7f5083c280a84d8c56ab7da2d1326e1c02a908a96db589ab10bafc115abefe010bf23f6994c08e43c86a4ac10c2d4ab93ec2
 EBUILD arduino-1.0.5-r1.ebuild 2583 BLAKE2B 78d8ff706d0bdeb6bcede5a70b8eabf862a91f38bb994218924ad01f6174bd181891e8d9e0237b3d2b8564ef519956f32393c6b61a161714ebf22b4f0181e1ea SHA512 40d26584bb9ac446fd29831774e476d984a900004128618883e161c1d2d39c185c2a4e8e34a66c961b2d8905186d67806a844d792f42d1b52c34eb840ea0badb
 EBUILD arduino-1.0.5-r2.ebuild 2602 BLAKE2B 1d32d6ad9581d02f2ba8d8844a19360d855a2ff1d1487898e77ad1b76e87679b8879cc928e0c30e362b22564fc9312b7c55e774f69f92d3bc0a22e18046336ae SHA512 c4a1a0d4ceafc9693c105995a0fae9696e9ed23c677588d9eee9ed25ecd43a011bfab27945201c89685dd3586607a33680ef938a37cc20bf0653c9d373f5b2d7
-EBUILD arduino-1.8.5-r2.ebuild 5057 BLAKE2B 8ac8e9b4518b1c20cb71441897d0441e8fdee0f9f013eadd604a437360dd8e961a328401cabc4cc6f16d4f71ef34ed1155501d0d7874f1fd94784f419e5946e7 SHA512 33319fc41870c0b15a6ad39409c2b656689d14216f750e98e6a4049ce6c7464fc909b18bac23b2107362f8bf3cc31c6c28e6abeb38e58c367a2b6b1a2cff8fc8
+EBUILD arduino-1.8.5-r2.ebuild 5053 BLAKE2B de8c70974d012e9fbf457e926d506b84a1069c1fe76358542139751dff7b7988e72f22da964db2e5b9ba9f7a4dc7170e9e72afee7a3bf76a297ce300b05c2ae3 SHA512 1600d9455ec9ad2065d4589806ca6ecbd0ccd3dd2e814e32d19b8fa3749156fe7e1f9c38710d72302dc4fbb303388e9b22d7af70ac825ddb248965a1a5e16657
 MISC metadata.xml 331 BLAKE2B 5449a181e8d470cb80c1a32d50e79c9f912117df14673adc2d1d989f037b1fd89c8bb4a263b4a883e30ab034e0e1ef1e82f54fa9134511755f9ccd62acff9af9 SHA512 6966c4f97ca07b9ef925691abe06e3110d9901cf15fbc7ed07c5ac65dbe583d346186961f64fba71ff796b5d6ff187870b8db41b3f1836b3fefbcc3e54c7ba4e
diff --git a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
index d20fd3fcd252..1f664fa2853c 100644
--- a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,7 +51,7 @@ SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 # bincheck RESTRICT is needed because firmware that ships with arduino contains code that makes
 # scanelf bark. It's also why we need a separate package for arduino-listserialportsc because if
diff --git a/dev-embedded/mcu8051ide/Manifest b/dev-embedded/mcu8051ide/Manifest
index 431e5c661402..7af334ce029c 100644
--- a/dev-embedded/mcu8051ide/Manifest
+++ b/dev-embedded/mcu8051ide/Manifest
@@ -1,3 +1,3 @@
 DIST mcu8051ide-1.4.10.tar.gz 5928583 BLAKE2B 4e8e119790d8130859034f2366ac3372373805dcb173328e61a9a18513cb6b9580e8f3912592888268bfdf694e835032fca3148d9fc00a7aa061660378674f0e SHA512 686c2b7054475aa38bbbe73ef745303141f038e2d6eca86d548317c130febb6b12d7c0e0737a9b15d2c3f4890bcd0238fffae030c689f8367f3b54821ab52866
-EBUILD mcu8051ide-1.4.10.ebuild 798 BLAKE2B 190eee97b8f0ee3648fcc56a465babdf2d8ca0e8d97ff0c591ae49e218d47ff8a95880c4194f9966906000d6540470d7879979cc343c4969baa202e464ede43e SHA512 6ef6d9e5d19b8669004dfbcc27ab71dac7c5259eba73e9407cffb074e0fe49910c70e745fa0fe76b2c935e1b4bdea5f0b4b1b1869dcc9606edaffb44bdc9d240
+EBUILD mcu8051ide-1.4.10.ebuild 728 BLAKE2B 176f6372793d42da96e0dd802fade820fe57baf0d9018cb2972eac147a80bca2ff21164fdfead280aaba99eb5915512f08edce5beb4a75eb935f192a695053e0 SHA512 3c659430086f91859aebbdf8844ac2937fd330572db130f2478a78acbabeffbe86776d608ce0a2985b260a80a95d1f76fcfcf1e58c771483aed540ec84e66f32
 MISC metadata.xml 304 BLAKE2B 290590d10851919866d1b0749c4f8101e267311ed98f1787cb4464d9408d37de3231159f2b8e9552e121a044752296f4e846a76c4cc2409c7e4358bd36fe138d SHA512 df2ca0cf75c510b030480139e1bc62faecc6c9a4538207434174fd404cf59437ed8c1f67dd76f44b66443db3ea71eb1952d13a45216aff3e48a5cf3e225bbda9
diff --git a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild
index 73b38e60146a..8d2c46293886 100644
--- a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild
+++ b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
+EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="Graphical IDE for microcontrollers based on 8051."
-HOMEPAGE="http://www.moravia-microsystems.com/mcu-8051-ide/"
-SRC_URI="http://www.moravia-microsystems.com/download/${PN}/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 
 # The doxygen dependency is suspect, but it appears to be used at runtime.
-RDEPEND=">=dev-embedded/sdcc-2.5[mcs51]
-		>=app-doc/doxygen-1.7
-		>=dev-util/indent-2.2
-		>=app-text/hunspell-1.3
-		>=dev-tcltk/bwidget-1.8
-		>dev-tcltk/itcl-3.3
-		>=dev-lang/tcl-8.5.9:*
-		>=dev-tcltk/tdom-0.8
-		>=dev-tcltk/tcllib-1.11
-		>=dev-lang/tk-8.5.9:*
-		>=dev-tcltk/tkimg-1.4
-		>=dev-tcltk/tclx-8.4"
+RDEPEND="
+	>=dev-embedded/sdcc-2.5[mcs51]
+	>=app-doc/doxygen-1.7
+	>=dev-util/indent-2.2
+	>=app-text/hunspell-1.3
+	>=dev-tcltk/bwidget-1.8
+	>dev-tcltk/itcl-3.3
+	>=dev-lang/tcl-8.5.9:*
+	>=dev-tcltk/tdom-0.8
+	>=dev-tcltk/tcllib-1.11
+	>=dev-lang/tk-8.5.9:*
+	>=dev-tcltk/tkimg-1.4
+	>=dev-tcltk/tclx-8.4
+"
 DEPEND="${RDEPEND}"
diff --git a/dev-embedded/parapin/Manifest b/dev-embedded/parapin/Manifest
index 0e47ae6972c3..36d85aed0ae2 100644
--- a/dev-embedded/parapin/Manifest
+++ b/dev-embedded/parapin/Manifest
@@ -1,3 +1,7 @@
 DIST parapin-1.0.0.tar.gz 240771 BLAKE2B 3c211d43028f1ee4b09568eae2408b96c9b3c1ecce5b81f3fd520ea3f480bb06044e99e04e7776b8a2b6cf7f99e57f2dcf186aea2ba9afbe4c31b9e0be3bc894 SHA512 43e4066b649bec8519c98052451ab1beb720c9c8086bbd045bb013e3c12c7e83bf0411ac4b8e7006c3acbc6d1487b918d26df65b246469e6c7e008a0e26874d9
+DIST parapin-1.5.0.tgz 249552 BLAKE2B 2a6621ec21542c35dbcae48f1bb93cd36621878b3bdfcb75f3b22aaa861e730a0f9f80f0d83eb4335d7d3b4c6c471e83003da5daea6dddc87b6e3c86ef2c7229 SHA512 732a2e4145f9dc2b765ecd1fd52d56409e69f4e3dc885f10d37661ab551604b986c95466e7d45265a268f7e759f6aa65537d1a8efcdd57d2d8b0ddfd3484728d
+DIST parapin-1.5.1-beta1.tgz 279115 BLAKE2B cce949828fec7654917da54be30ac6ed07baad615180adebbd12caba0c994e62ae95cc10a00c3653d23fe75afbe0721d6da901829a99a89ab355ea059c99d0f5 SHA512 3bc1a0a9fef5fd5f8efd84220e7e257a100d618d168332fe09c1331c38fc48e339bfda3f216713f454f43487fd7227036d8f1025ccc851806ae69326bfae97e0
 EBUILD parapin-1.0.0.ebuild 775 BLAKE2B 4cf48813609462289869def43d3a4e9d3e347d401299281e10ca89db1cb6c811e294ba38041c5354b2901969aa451bdf7d4a4fd964d94955d94aa3363cdec294 SHA512 e3df0592adf1bb8d7a00c5c07a7ecfaa45df9384c7f8f29260e69a425421f1d10ce9de8d3360542ddc3516c9b13be4564857e7505cfb8010906e4a046dc51640
+EBUILD parapin-1.5.0.ebuild 783 BLAKE2B c9d7a92a0294ec8ae2d7b867f202467fd28837733e4da484ff95ea8e83162b21fa1d7ac2459f3acc04b072ceda7176c3bba9c88c1d71db4ab8d9ac83e72cafd0 SHA512 a7b8c5877c33ea020b009e14a1ffcea9fea5499e52bf401efdde362c946abcbaac9c6df604d4229614c1f000ed065d3a987c9f481f1ef2840855989d1b57c7d9
+EBUILD parapin-1.5.1_beta1.ebuild 810 BLAKE2B 99c362b3430175c174c899b1410afba351b364e6c6679e3fc6d979c9de423ca4bf0238d7e7e9aa1012934b45e78edf198cca1bdb12adce51178ea05e257096bc SHA512 c9282f2a69ec5c5d64a0b55a731588f711a72958fedcfe2d8f093b9c82ca70fce4f8564675ea3e423f624e58d32c61257b7ec3de11b869518394e6ecbe3aaced
 MISC metadata.xml 987 BLAKE2B bc9d93c4a6baa98b6ee8631a33a9ccc4fec6bcd9a60adff8cca4f2376cf12145571bc23ad1dab299eda69cfffa77f0ea5a1e3cb72a26b6c25f9d7253b4048af4 SHA512 80c14ff7464a986fb91620df2c239c04be1098b38046d0516b9e38e85eeda520c06437ddaccbcca322f99fec8161645f15c83c042165a9a83a24cc14aee60db0
diff --git a/dev-embedded/parapin/parapin-1.5.0.ebuild b/dev-embedded/parapin/parapin-1.5.0.ebuild
new file mode 100644
index 000000000000..0c172e5d1c89
--- /dev/null
+++ b/dev-embedded/parapin/parapin-1.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A parallel port pin programming library"
+HOMEPAGE="http://parapin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+IUSE="doc"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DEPEND="doc? ( dev-tex/latex2html )"
+
+src_compile() {
+	# Note 2.4 and 2.6 makefiles are identical for the targets used
+	emake -f Makefile-2.4 CC=$(tc-getCC)
+	use doc && emake -C doc html
+}
+
+src_install() {
+	dolib.a libparapin.a
+	insopts -m0444;	insinto /usr/include; doins parapin.h
+
+	dodoc README
+	if use doc; then
+		cd "${S}"/doc/${PN}
+		docinto html
+		dodoc *.html *.css *.png
+
+		cd "${S}"/examples
+		docinto examples
+		dodoc *.c
+	fi
+}
diff --git a/dev-embedded/parapin/parapin-1.5.1_beta1.ebuild b/dev-embedded/parapin/parapin-1.5.1_beta1.ebuild
new file mode 100644
index 000000000000..51556291ee47
--- /dev/null
+++ b/dev-embedded/parapin/parapin-1.5.1_beta1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A parallel port pin programming library"
+HOMEPAGE="http://parapin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tgz"
+
+LICENSE="LGPL-2.1"
+IUSE="doc"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DEPEND="doc? ( dev-tex/latex2html )"
+
+S=${WORKDIR}/${P/_/-}
+
+src_compile() {
+	# Note 2.4 and 2.6 makefiles are identical for the targets used
+	emake -f Makefile-2.4 CC=$(tc-getCC)
+	use doc && emake -C doc html
+}
+
+src_install() {
+	dolib.a libparapin.a
+	insopts -m0444;	insinto /usr/include; doins parapin.h
+
+	dodoc README
+	if use doc; then
+		cd "${S}"/doc/${PN}
+		docinto html
+		dodoc *.html *.css *.png
+
+		cd "${S}"/examples
+		docinto examples
+		dodoc *.c
+	fi
+}
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index 4d07a342d1a8..2f570c2eaa5d 100644
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
diff --git a/dev-erlang/base64url/Manifest b/dev-erlang/base64url/Manifest
new file mode 100644
index 000000000000..e44cbe1c2448
--- /dev/null
+++ b/dev-erlang/base64url/Manifest
@@ -0,0 +1,3 @@
+DIST base64url-1.0.tar.gz 2759 BLAKE2B 7a9e1c4bd5343af2556b21255fed82375400088b461ad6aa5b308c49eb5fefe3597419a6cc6990ad8e29a11f4ac8814624f7c043ca19cecdfc1a4822e230693f SHA512 f9f5062d8a45c5d0fbfb7179359137e88a1af10e29c1329506446d2142331176f6be2aa30387e4c98855440c1da943ea16a655ed2ad5168d4f5f8a2cd1c47c5f
+EBUILD base64url-1.0.ebuild 423 BLAKE2B 293473eedb48581791f5e025ad92c3572907e33e14c67b2774f6bc5ea12f2945648e616ae55746e1b91ad8fe81000dcb8cb810c92ce8cded09acf686d6a0c272 SHA512 2214273c3fd6409dd5e70baa6b15cc9dc513ac04e6c977a4ee5f62a8d4fea39a370e89c869e9c4ba0985519aa8c5a6f7de7b0f885ab916089e53ea8ac15bfaac
+MISC metadata.xml 332 BLAKE2B 3f9f82161b5a3aee4360845cffc9a79e1ae4bc9b0740ce1d1c7ce64c0de66a7e20019efea13b063157b47fa586fc3b1389547d7d3808509c042a1e04cb269363 SHA512 a9f91e753902d9eeb094db199bef69506be2a5cd0c125c7be5570549d7b53b01e47d083aa23cc864558424cbf461c49ef615d8804f19a36be5ad673f366c92a8
diff --git a/dev-erlang/base64url/base64url-1.0.ebuild b/dev-erlang/base64url/base64url-1.0.ebuild
new file mode 100644
index 000000000000..4710ed85dd81
--- /dev/null
+++ b/dev-erlang/base64url/base64url-1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="URL safe base64-compatible codec"
+HOMEPAGE="https://github.com/dvv/base64url"
+SRC_URI="https://github.com/dvv/base64url/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
diff --git a/dev-erlang/base64url/metadata.xml b/dev-erlang/base64url/metadata.xml
new file mode 100644
index 000000000000..c37bd0ac221b
--- /dev/null
+++ b/dev-erlang/base64url/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>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dvv/base64url</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-erlang/cache_tab/Manifest b/dev-erlang/cache_tab/Manifest
index 5d3ca45c82b9..1aa0ab0a75bc 100644
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@@ -1,8 +1,10 @@
+DIST cache_tab-1.0.16.tar.gz 18736 BLAKE2B 7701ac2dbc57a8a2f3ebde2744ad27864e1e12d8a30bde5196789d702c0270345a74b9f064ca61835ace54d65d28f7b52e394abbcc155044f440752d13359862 SHA512 d4a81a64fc34ba6c784e9ade3575e6f6964d6273f84de4c0d81e18a9f9fa59547f6f270d76a42cf0061a63fddd04171e7de10abbc52de4c215f39697b7619746
 DIST cache_tab-1.0.2.tar.gz 12414 BLAKE2B 15c8d1bfe8e774b123bfedbe3ce7aaf006575670f8a41639effc7d9e4ad4e1717a47f02d195be7e60fabf8f0495ef05aa02ef91029cace32c7f66f147f723beb SHA512 9a4e225b4a1776771d964ef2b96b8eb976b930bb2e9c5ac93e1e8b238f6e259d086a550d41b4931fbde293306892cdde2a38a4af3afa581a74e9e76b5feef111
 DIST cache_tab-1.0.3.tar.gz 12600 BLAKE2B 5474ea27ee872893f1b834f361aeca17755d54571c853b39c87622daca03526529612c4ac04c5d7554d65ff838ef6bd32cff654ddbdd031b08deeb653f041591 SHA512 d6d6f23834144b58a590dcbda57c2f0d14fd6030a2ea1e1675d56ac1038618f275bb9f9f9c0f80fc03510f775c1a04637eebcf927daeb9af51e2c70efa8239f4
 DIST cache_tab-1.0.4.tar.gz 12611 BLAKE2B 191ea58bf29cd9bfe8b56a5418008e643199ac1a2f7e9b624a29a25d1f3a8a5fc85c6fc7f483b545458f3e1e4143e5cd5b79e06fbbfc60433806daed930559bc SHA512 c0f7167631eb11de59303a7cc96592c172c109019004f52759c6d5c02d581ca515a81568f2dca0bc1a38ea8303d48b5e415cf12629d27730318433843a1ff3eb
 DIST cache_tab-1.0.5.tar.gz 12632 BLAKE2B 12495a005982f23e3e2ec8fab85a1afbd6b1a49d7de8c8fcb784d9a0fd1aa21654d9df23670ad5418562a3c9854e5bb029f41a6c287cdde94e1724a220dd2314 SHA512 1a49f3e8c12f032d33fac18aab04a4fbfb0dfc31c22e1e47ee3005d65c80b6cc15cb8fccf955fee1a88002ce7b5dc1fd5fb13fd10196449117f21ac51c0abb39
 DIST cache_tab-1.0.7.tar.gz 12827 BLAKE2B 57d669e67a980550fb4d671b22e69ff2ebd0482aef9d6163ff831390135c7ee1e83e87ed50fdb8e331402398a7cae2b081ac2861125c92cff6e9570c564b2c40 SHA512 9727a0103f47d63e5a07d630ebf45b86d1f1ca7ab5006f127a749fb633a8a6b73b00ed5ddde6f420073a96542d0e073a420020947775bdadef5257675137787b
+EBUILD cache_tab-1.0.16.ebuild 515 BLAKE2B a987f4b454a11e3f56ff0c5bccc34393bc248fc3d3762cef06922bf7ec74f5b07cbf5934df081d597223858cfcba6078156871271732e592050db1e76bb2db28 SHA512 44e2eae89ea01030819ed5a562ca930f34e36df9e293201758b6f121bdab03ecbeecac51a7fde7b8658ee1243a412e1de6c05709885d30211a2e8b9b93a67110
 EBUILD cache_tab-1.0.2.ebuild 511 BLAKE2B 1b57e3e41b22e2625f111e54faf2f9fe9067ba54697c39a8fbd1feda9733dbd1e3894c4455469e6702e33ede06a21c255d252de2ec6b34a630e5938f50702496 SHA512 28f180faefccfe35c9f58f897f8fa0c87dc163c831a631833ec2f7f84fbb35b84792fa02b894ad12913b6c3ac3f2d793e49325c0a5a62a8839806673b7c680b2
 EBUILD cache_tab-1.0.3.ebuild 513 BLAKE2B 969f0afb070dc203f06944aa1c9e3265e01129998461efac0df89be570e9f3cae04099ae8e73abaf74d0e3beab832888519d9d19ab2deb31ba03732e178f9cd0 SHA512 debf2c7af326ca421de0af51fd6043fd30d14dc167826247edafc08257884bb7b901a515874b0e9c5b26953e09d31fa55de0f5fd4bcec57f12228e55594c5a9e
 EBUILD cache_tab-1.0.4.ebuild 511 BLAKE2B 75d469c04eaa18787523fb1d15e018b09808022224f657b7a7c21b25dd9d8fd898c8a3e1ee12bdd04a3c634a7fbedd657afa58cbebf1444a41f263cab1a4e9ff SHA512 d4eab4d39cada64eee3a95c74053e56ccf203e31c1c2e8f8abaa8793faf0db47deb496b38def8295981730769a38ccf18705c846a6950240db7372f8b2952f76
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.16.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.16.ebuild
new file mode 100644
index 000000000000..2c670bedbf40
--- /dev/null
+++ b/dev-erlang/cache_tab/cache_tab-1.0.16.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="In-memory cache Erlang and Elixir library"
+HOMEPAGE="https://github.com/processone/cache_tab"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.13
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/eimp/Manifest b/dev-erlang/eimp/Manifest
new file mode 100644
index 000000000000..61980f2403fd
--- /dev/null
+++ b/dev-erlang/eimp/Manifest
@@ -0,0 +1,3 @@
+DIST eimp-1.0.9.tar.gz 3471343 BLAKE2B 672e14cda50917a431d5bb29ef127c6bdf026234a5aeb66777540cd59167b48cfa1f264fdd631ef09c33a5ec9817d6d13c9763eecc5b076431976700f3af0ea7 SHA512 a86bf4927cf1da8004f140861a86d358c953a4871af34aa4768877f2b0618918c5a95d557e8535ce1615e272bfc3c9f27275ad4e5f5365c91a4a381ac2463977
+EBUILD eimp-1.0.9.ebuild 779 BLAKE2B 1638a892e479ddce06d341f7b4a1bbfe4341c6913595b8d2c834dc3879c5f7aca6b8df89f1c70b1e6d6c148002d677a1ddbb2d9ba309e7f895a445c3263047ac SHA512 e6220bb3347a467d01a05cbeeafb066d050ffbad6fb1e83c8c2eeb479b36c7207b37c402e597094c2f8b270d5965981de33dbabc322bebc38cd2bba5f1f7e617
+MISC metadata.xml 334 BLAKE2B 59d2c059b3eb6f96c2362806b54b62c606bbc35017766a4d44662aa9558ebc6cca0ec844083095afd87be6a8d453248b7a2f2fce231fec8346ed97367384a82b SHA512 982ce07e5b5b6684e95f9b55615e6c08a0db1c41c9e1b08dab9c917fa8933cbc99f081498c37b91f0b922e66980bc6d8cb2767bfe1652993ea9d4b7f670c60f8
diff --git a/dev-erlang/eimp/eimp-1.0.9.ebuild b/dev-erlang/eimp/eimp-1.0.9.ebuild
new file mode 100644
index 000000000000..70c21498151a
--- /dev/null
+++ b/dev-erlang/eimp/eimp-1.0.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang Image Manipulation Process"
+HOMEPAGE="https://github.com/processone/eimp"
+SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-erlang/p1_utils-1.0.13
+	>=dev-lang/erlang-17.1
+	media-libs/gd[png,jpeg,webp]"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md LICENSE.txt )
+
+src_prepare() {
+	rebar_src_prepare
+
+	# FIXME: The test fails when run from ebuild for some reason. I don't
+	# FIXME: Erlang and I don't know how to fix it other than by disabling
+	# FIXME: test.
+	sed -e '/^disconnected_test() ->/,/^$/ d' -i 'test/eimp_test.erl' || die
+}
diff --git a/dev-erlang/eimp/metadata.xml b/dev-erlang/eimp/metadata.xml
new file mode 100644
index 000000000000..960ada0d29c5
--- /dev/null
+++ b/dev-erlang/eimp/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>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">processone/eimp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-erlang/epam/Manifest b/dev-erlang/epam/Manifest
index a787f317935d..7c2944980f1f 100644
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@@ -1,6 +1,8 @@
 DIST epam-1.0.0.tar.gz 44008 BLAKE2B 5dcb21b17bd3e4a2dca5ab4776aa609cce784f0df1f6192acaa35024a342d72f6233c03997218113bc54d18e9ef3473dc420f93a6f00fb2c2c8079c4ce6dc353 SHA512 c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374
 DIST epam-1.0.2.tar.gz 43720 BLAKE2B 39a1056d068bdceb7ff640a498b0766aa59649228b03e03f9385bfc106f45aa210315162d4386907a1e9cbc8f177289adebf72f527a4eaf270cd62413f1daa13 SHA512 a3fdb379d8c25e56e51dcf1e683d289e9f3d19a537b1a55ca4c09185eb5731fe073a5bf0dd1449f09f8ee5b7d868b0e63f04473c1f3d1b97722dcd9832e4e030
+DIST epam-1.0.4.tar.gz 43816 BLAKE2B a8070e45be428e1cd55dbe369051f2c5566d6d8d41af5d4258ec8dc86b70d7e55f316df10d0a65687d0ad8c5de2bd493859fd0c839ad57c90bb0eb1e4ea9db96 SHA512 46cbdfa683f48f24c4709837cba49745c3b7f87b6c1223b01ced65d547a8ec1a0467997070daf40bedeeb8298d7bb31eb33b331098b406964642f059b77fd313
 EBUILD epam-1.0.0-r1.ebuild 724 BLAKE2B 539568b8b5af26822d3006ba2c320282b3c4d478e786374726f7ac54c28b44bfb0e341daf555ff6df5ecc09e2e0b8facbaaaba3feed47d4bca582ea8567da028 SHA512 6d2303c6ede3cb85e1cecfc2fe241480d1408dfcfcb2d79569f1d7a108153656a47d37129f0a89f45c6996ba0e542248ea6818bb90f7abdd1250a40c14903635
 EBUILD epam-1.0.0.ebuild 521 BLAKE2B 82b76739f0107e3ebbaa3dea319ffdb51e93a451089d9a6aeee5ef5ca4f57503f0a709ef4481d9209798241494914c77cb916bb9a5b13aff8f19d543e1cfe987 SHA512 6366da961a17a92992372a47466c68b9a8e4134193d3b60750309b41e882c43a128988a175d90081cc8d0cfe4a4c8687f78bcd81de02db904313cc31fbec0088
 EBUILD epam-1.0.2.ebuild 699 BLAKE2B 5db1ea05ee5c3c3c24802f27d3e768423638a8b8cdfe7e42e8d51538ad4b95b0e7044a728530492d6d321864fa82c365c579e999a28ed4ea1b767696a27e68f8 SHA512 b8e9b8e71f2053db1edef09d952335f4b56e9f2cd8bdddfdda1ebbca59b64aca880758fdd502273144104a16fac9f193b97689ca11a0fd72db51c442c5f73409
+EBUILD epam-1.0.4.ebuild 704 BLAKE2B 86d57a174d9536f23d3c98bd2565a36d65535d586b65b8c1502d79dc15e572a2d5a3eeee082b7328660f6eb76c5e47a4c95ad702b9606936dad86a22f6edf403 SHA512 fe759cfbb16d47bcaac1bc82521ad1aa38433cc8306ea8be6ce7e2c02ca58bf74614b764b60c16035284c81c639f6d785b3933a16c4a0debbc16339308ee7875
 MISC metadata.xml 334 BLAKE2B 976dbd5c52f26481e6c19bacd55b1e821188a9c692820dc5d4161fbbd9ae45155c099da4d2683ae5037f9773027b1228219760686b4f721a4bb7a55928b07bbb SHA512 7d1209c30d2535485d17d3744f7928cfc2fad0dafd75b83cfe6ddf851708334c001bf8f899ee9a194379c1a6b47e0dd4a64b7032a4f7de3e4af40544c39ed67c
diff --git a/dev-erlang/epam/epam-1.0.4.ebuild b/dev-erlang/epam/epam-1.0.4.ebuild
new file mode 100644
index 000000000000..faddaeab02f0
--- /dev/null
+++ b/dev-erlang/epam/epam-1.0.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar user
+
+DESCRIPTION="epam for ejabberd to help with PAM authentication support"
+HOMEPAGE="https://github.com/processone/epam"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+pkg_setup() {
+	enewgroup "${PN}"
+}
+
+src_install() {
+	rebar_src_install
+
+	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
+	fowners root:"${PN}" "${epam_path}"
+	fperms 4750 "${epam_path}"
+}
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index d72b9908a8af..42462fe2999f 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -1,10 +1,12 @@
 DIST esip-1.0.10.tar.gz 84598 BLAKE2B 14a8260c24a7fd9e74231e7f95d7fc910fe473037a974c3ad712c9ba2d1922a9f701cbf4096f0935fe54ba5c6b5738a97f31eed1052d631353152dab9f7e6e22 SHA512 d551b2120d630e85181c2cc867f2c3e6efd5b6c31066fd58fdc65605c00d8a5ea0bddb821d018bd9401bfe3746b95777fe98ecbcbeaea62e14f1a138ad390bbe
 DIST esip-1.0.11.tar.gz 84816 BLAKE2B 8cf1f872496097965d40e6bb1e776318056735e12cf48e746a88861602c32edccdab902fb989305e804054a220aad26ae3931cc22d9d1b2282d6aeac0795df64 SHA512 b62f99b9a9e160e2303a28dab3133c15ce25eae067e3dc16d64c9d60640fd7d5b1b7f69742fc2b94bd6993402ef618454e771ef76dea1ccf24c9ee708f59771f
+DIST esip-1.0.26.tar.gz 85846 BLAKE2B 03d3ba5d9706794eaec99cfd074c8fda548fc0911ae8cdb11cb991c910955c47a69280b5cabb384cfbc48a580cc862ac54e3c795e641e417019313ebecb9795f SHA512 4bdbd94c1e6cd029603bbc4b5166f2793293ac0041c79a4c3672387f5217a998ab950cba0a6cbef70c2c5eca393b3f3a4917ec87ab4e5edc08b85cb46e7c667f
 DIST esip-1.0.4.tar.gz 84478 BLAKE2B b2b040269e0d8f74f812cc8b8be862e3d7ac9e3dc6877deb66e16c4a56ef97f07b5ec0885f68017caeb9e7a8df1f46bc901f85f5b88b6b98ddba86a9b80dbb99 SHA512 50915831796f76986a00f5a2a08f308aa9fee71e92fbb6978e9e20f0c00007c0d442991cc7fc2f6df82560a1509f8189865afe8d0b6f94410c39e07ca4f1092b
 DIST esip-1.0.7.tar.gz 84522 BLAKE2B 4e9c95e72b2e4898f972759d80390bb32c2e2527768dfc99f5094b7108dc5fa21f0e7d224ac13831040660ab63a017accbeb0f028d83652fad7317cd444eefa2 SHA512 f25f2ea146a8fbea8f727210fc222649a6d434b5f2f9c2eaab62d56ecaddcd2f2986a96befb1e1291cff9130276d146321c20948d0469c36797c323f94431f3a
 DIST esip-1.0.8.tar.gz 84534 BLAKE2B 25e705d4d466ce2fe5464fac73714e898dea5654fce945507afe2c00ec954ac72a8e2bc4c19bd75fafe0f489c9da56f63a2a0b02cbc3161435c929bd9001d190 SHA512 c5ed3e4e25d8db7aa67002e7b0bc0f6e7355e4227339ed507064832c3f329d78f6aa7d71eaa80108629b7bb6141f68c2f079decc4799517ac886e7bb3c1415e6
 EBUILD esip-1.0.10.ebuild 707 BLAKE2B 9b3c5d21f56719efe646c763b7d6a06ee8ad6f1c13c38bc2dfa30dc228a4e5e7975ffeffb33af0e577c5478e251f2bf0d2d15491e30ff070cdb9e89154dbf644 SHA512 c25ae0cda0cf5b0bd79935292bbe64964301b848abb58baa3afc4781da565160a0c2791e000c124f542974fe554aeb4e497c64f95863440f6b186746c424684b
 EBUILD esip-1.0.11.ebuild 706 BLAKE2B 4712ad3a2b0157488138e4ee0f80a1f35280410fe80eb2ffc74a8dc895c1731f874c0790bf4268d8fcb833e0e6bb3706efbbccafc1c04b9a3867ea336bd6802c SHA512 5dadc0c98049fb26b5dab4c6e840f4cf3f9a520ceaff6fb2405233228ddee71537270077b754c22187d16c85224ee777b569fa73d331b0357072fa5e95a2fa69
+EBUILD esip-1.0.26.ebuild 710 BLAKE2B 7703708798a8af74eecb64842cdd517d38e53f098d02a5ae3c36958332e25f06ec378d568e244867462bc4f79b3178cadbca4d575b90cfe3dba9106c440c0c6e SHA512 c64030b253f73701be632c10f4a7ce6a7415846e5a3ba6e764933f22140e3ace84aebc0ee671fc6ef05370549e676b7c44eb3bfc38feb07e406f9deac1e3a2be
 EBUILD esip-1.0.4.ebuild 704 BLAKE2B 3005b344095148ef84e14c82454434f1f7908ad3ae7bd359b2edc705d24c651c6c96834c0baadbc859c13f576ae18c3766c37d0c3c0816b4a2c4a09c17b91224 SHA512 4c82c6df5ea2a7ed8067b6a3d86200caf1387530bd48b104482fd3f1d6c299f37b0dfd2b821ffe3a1e234264e4c5d5441c063c3b1f69a202521c32c84b8072b3
 EBUILD esip-1.0.7.ebuild 706 BLAKE2B 25bcd8eebdff281b2b4118d3b735975233ecf0b12709df983fe149170237960b3c9ef39c1c3fb3169202828cc5812084c95ffe3b64d554628c2875db45e09736 SHA512 27eef9025b2169fa6b28330011407e1247e73b4afbc9e5c0c3bba7a58539c753eb47aa0aeda1cd1df20cb44f3b5c5c4482be7d3649be99fd4dadde2c931cd934
 EBUILD esip-1.0.8.ebuild 704 BLAKE2B b0cbf81997f89045cc9d24ac4f6b7c72d2d9e1c9cdc4dd3e9aa72dddbab7262ecc77a4f72bb0e683fc93620b56a0cf39c572a83bc0c34e661d85caa596379cb2 SHA512 e54fe2eef6c98626887a1d7f4b09abbce48ca0ebf14b3059808499b6b6cb7b58e50ac58d30fb3fb46a2d2dd0a6c5cf31b9d34cf2949ca502c59d637513576b4d
diff --git a/dev-erlang/esip/esip-1.0.26.ebuild b/dev-erlang/esip/esip-1.0.26.ebuild
new file mode 100644
index 000000000000..6f530f6161b2
--- /dev/null
+++ b/dev-erlang/esip/esip-1.0.26.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="ProcessOne SIP server component"
+HOMEPAGE="https://github.com/processone/esip"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/fast_tls-1.0.25
+	>=dev-erlang/stun-1.0.25
+	>=dev-erlang/p1_utils-1.0.13
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_fix_include_path stun
+
+	# ebin contains lonely .gitignore file asking for removal.
+	rm -r "${S}/ebin" || die
+}
diff --git a/dev-erlang/ezlib/Manifest b/dev-erlang/ezlib/Manifest
index 2b10ffb510fa..96d4e5fc9c1a 100644
--- a/dev-erlang/ezlib/Manifest
+++ b/dev-erlang/ezlib/Manifest
@@ -1,5 +1,7 @@
 DIST ezlib-1.0.1.tar.gz 45307 BLAKE2B 1226319144df02963618ace22ee2e3031226677703dc6a68c011794b336799a48eabe8b9262ca5501c6d5feec6256e517f757aa9f9986dfee9133bf9b4954a33 SHA512 7ec02dd91034eeaad3556071ef78ff6d8e890bc49b2ce5010280db48f9eb65ebfe62628fbbb89110310e359847f0da616f9281683926fb7d0f72972ee77a463b
 DIST ezlib-1.0.2.tar.gz 45369 BLAKE2B d2d23cf9fcd530a76ed4a386df15401cd9598e158f20cba3eff19332e25532fdaba8cae93e576f5756559e74f169f6a01f9d09c41e844d3af4a9d9d3cac15185 SHA512 90671fdf0bbc23a7f54da665dfb31a3ed2d92180ff5c58d872001481584e6c8b39cd84b3dc947f1efdae10792c2547218017381cbc7056070d22b140e941c9bb
+DIST ezlib-1.0.4.tar.gz 45510 BLAKE2B 685935b2aad9d20dc0d367c1edddb701d3d12fd24ec3fab617d35f9207e3994ddb57aafa9083337d0752b5e1fe15941dbff2f9b916400f0e7a3c6350a3c6ff3e SHA512 16495a6756cd60ad921695d87136e399446850ce1160d92b825673fa1e0e7d3cd4a6b49f274debbfe7dfe4285370362ece64db8843afd564ffaffe9eeba0dc7a
 EBUILD ezlib-1.0.1.ebuild 492 BLAKE2B bfdfa1bd5d14874377a2eb534b64438fba5930d623b9f4f0da8569a7d2e7493fe8cf1b0116ef47f207c51feef211f861a33b057855d61ba7bed0368f14d0b4dd SHA512 7f99ab77b621cc1229cebda4865f461b5438cda0c209a0c0726bdf861679d4aa1b662835c026ec1b9fc82c9bd0f5c113fec4c8543deae05236329a35dc3e74b6
 EBUILD ezlib-1.0.2.ebuild 492 BLAKE2B 59600080ee8431b029b01a7280361f1c175ee261ac8134e38939ce4ad283f4547061bc64d39b17e72e857495443fa0a65b2473fd3e9d180c6a7ad32fd7048638 SHA512 94b6c1921510ec68c9f0c6300a064aa3efdff8fbde795e2c9f08ba697aa6dc95fd79e3a7e614630eefaf0a1928617cdfc0287dc691d0faa591c16ab80e69bf7e
+EBUILD ezlib-1.0.4.ebuild 495 BLAKE2B 8e8039025f74c16cb50bbb0edf84473b908828bed5c626a916a255257b702d214a77214d1f19afc32ee2b191c294593213f7fba9363e8d62c1fa70266cbae00b SHA512 3211bd7daf4663e2ce371608e8cf1cec7136eed0ee3ed52d8653766497caccb0378e83a14761683150e18aef083649306842433dc3e2ff34ce47d219f3d518a6
 MISC metadata.xml 335 BLAKE2B 4ad8e59014a4fc0e64dfd9e81d5e9cf468c621ca198f77b2c4902350eae875301c1dc95e80fda1b43870d56621ace24b05ea1a636eb8170a241f670660910f9b SHA512 dd160b8babdb0efb02c55b34ae184e88816b8ca95de3a522452978b1a47282b77ed64665e0f3414b4e2b154c0892954dea67fe7fb75994e86532d491c08d927d
diff --git a/dev-erlang/ezlib/ezlib-1.0.4.ebuild b/dev-erlang/ezlib/ezlib-1.0.4.ebuild
new file mode 100644
index 000000000000..78a239ce2a97
--- /dev/null
+++ b/dev-erlang/ezlib/ezlib-1.0.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Native zlib driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/ezlib"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index b06f6db0d3c8..148605dd9225 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -1,9 +1,11 @@
 DIST fast_tls-1.0.11.tar.gz 58366 BLAKE2B 1abf071b2007b1daddba53e3ea8823b5ad62d51d886968eef571495127c8ff97cf95d1bdd2a7183b6712e1518e5e3b302fd1150a26da768bef31087d4d291c3f SHA512 41ee00ef11fc0732fed4a1a0a114fc8c064ab489f9e74eaa769610c6236685f407702c5683ecc735857150e19b03e825bfec33ffcd0d03b503583f323bc48a7f
+DIST fast_tls-1.0.25.tar.gz 76303 BLAKE2B 3f926957dad6410a53bc933fb263d4cb269a8a0df6123be6231d9ac96a4e48188fd5db948fc779edb0cf705912f93319e7bed71c67e970d6324455afa0e9f132 SHA512 ff061ff19daa51348b075cbe393f0cc4b9c6c5824f9c458969685935e9d07439a5fcb40d76f365c622e7c2c2908c9eccdd86af192e54c8a326cc4bff5b067d62
 DIST fast_tls-1.0.3.tar.gz 57470 BLAKE2B 1e7a78ef0e46cb86bef8e621dded546f62bd93c02aa3166e4035e011dfa33a92397c51e01f24d9443de9aabfccd93a08ead28351f5d7147201be9a28f7f873c9 SHA512 701016ce045fcd13810f2c287772cc2828576b85bd1458227d9da9ce89c3e10e75c41a02eb78f6e1c155dd75b76ad3d3becf5b40832b1e1b4cf928488e3bdb04
 DIST fast_tls-1.0.6.tar.gz 57994 BLAKE2B db433550ff293f9e7b4eb0dd7f688f92c61efecc8188cea19b18ae92f4da4eae07076dc9bbfa6c50b4b573357d42e1c5b119a062fe2c6c50812c5befb08c6eff SHA512 d13a5758345521c9a295f6bb4aeedc58ea7fafb42ea3955ca61cb75e15c8755c7a331d139f2c544da9e8d23607a6520caf8fe1e1fad7c016acbca07c0d783fb8
 DIST fast_tls-1.0.7.tar.gz 58069 BLAKE2B d454f85e0ea010a564d5e88ded505c1a30f80d0b4c9f6ebafff043d8d718d05ff938f68cac5bb1939abd6ddf16cb833909b5db1b7439a57d51ccf6cd4c747b0d SHA512 46a3ebab09ec5e18b086c8c3e2a87a5d6a35e406e8988c48979d94c3e303d5f9a8bcdb1e8ce74266ba8c59fbb4a4310e445f5ad65f072d28a7b44a0bdec50b62
 DIST fast_tls-1.0.9.tar.gz 58299 BLAKE2B bc4c45b0fedea79f90644989c6ff734a85b701c2dab3121ad55ae548563ed92046add91780be172e2531dc5ef757415673aeda1215900db84aae178d707328eb SHA512 ed45a5b262d05dba23887e4bf391740f388079afe9a297221de2dae22b62c6dc51b9b739544a54501ee4aebdafce789290764e963218ed3c0095623b407bf0ec
 EBUILD fast_tls-1.0.11.ebuild 600 BLAKE2B ffc71b6e16de4c113317bb87a80262f1d724a1d91df77836e8bd07f8a03cd6ec814227a17588aa14b3858937975d653f710c335abc53a612e0ab47850766e420 SHA512 f33145c9e71f85dfa64364b53f10371fd8900c122ac6068ff32e8644cc5299b7ca1221caec38e900d81834e1adce177c7f29124cfd2b4fb60d625e0e6031816b
+EBUILD fast_tls-1.0.25.ebuild 604 BLAKE2B aaa476e6f79630217bdd37de024d38b097bab024ef79e8b38965289bda8e8895e7cfc0a6bce2f35e249f687412d6638effde2d8d46a773c13aaecbc83dd69a36 SHA512 6281b49e0bbb7ba91e786d48444dd39dd6173bc94b5fe66ef03b456e49942c80b48bcbbcb65cbc5620d6106601437b509821871016287545dad70ed2cda262a5
 EBUILD fast_tls-1.0.3.ebuild 532 BLAKE2B 4e67cd6b566be9f381af043f411c5df8e5cbc3fbb6fb6016201256f1eaaca3881e4ce947cd78e7ea77b9616ac064050bdf205a85cce32382b61bdc2dca563186 SHA512 14ae845928c88e7efbb4d9a693b9b61e301b2fd1edea60d01e7072c490c74aaf09b42fd6341047cabee49812f85110465aa24a8c9929e1276af6eee39f342c78
 EBUILD fast_tls-1.0.6.ebuild 602 BLAKE2B e46aeaf9df9d5f7ab938633175ba55901b9d894068f9463e6508b32cc379e6c198fd00e61d8b94b434aeb909e405bfd7674214902397cca2dd115656a557c226 SHA512 c920da9c247e00e8d2e2adb424ecd6bc2f31b9c363ffe8a2a5687cde527964918f89d7804c05269c1642788603bc2242789f4380d6d49c6517ba1c0e1b88a03a
 EBUILD fast_tls-1.0.7.ebuild 600 BLAKE2B 4b4d052cbdafd438f45968c4813be7e2d58a7e70698f4ab5f483fee137bec7becca997d2d6acc3947479f3c9f6364a0afb998eb65094702545c77501b53a6cdf SHA512 1428618c39ad08f6a37e28ff0b4793a384c196bc577b22ed3f375cd99587ff851816d2c5b9b310f3130a39375a17533cb615dc9680f5e556d514882cf0dfc4ab
diff --git a/dev-erlang/fast_tls/fast_tls-1.0.25.ebuild b/dev-erlang/fast_tls/fast_tls-1.0.25.ebuild
new file mode 100644
index 000000000000..43413ad8829e
--- /dev/null
+++ b/dev-erlang/fast_tls/fast_tls-1.0.25.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="TLS/SSL native driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_tls"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.13
+	>=dev-lang/erlang-17.1
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/fast_xml/Manifest b/dev-erlang/fast_xml/Manifest
index 29656cfda2f5..6189190497a8 100644
--- a/dev-erlang/fast_xml/Manifest
+++ b/dev-erlang/fast_xml/Manifest
@@ -1,3 +1,5 @@
 DIST fast_xml-1.1.22.tar.gz 92408 BLAKE2B efd6c69c4dcfe3c36162c0b47ee8b56561102fde130f8be503c767e40d66c0f698876ed384bd27aea41e18f6530bf712eeeca2ea497c4b1aafc630fe1b016981 SHA512 33c79cf34d6b0093cf98d11c5b68855d4201a6891786cc3caabd7dded81a04118638ce091cda1f1c86729ea8c8765214332cc34a361bbfb3c5958dbc2027a384
+DIST fast_xml-1.1.34.tar.gz 93530 BLAKE2B f4db5fd718f66e34b305d04ca7be5a72770ca9c749154c668072c6ef88eb545f3ff200d549fba6395eed46605ce384559dadda66b4281429b57706c579f4c47a SHA512 e2b29e1307c0513046de2ac8afe6c1a6ed8a8640b62451777233607a656517ac1b4d68f725b05712d3c254f68e76e49716b1e913c3d3c34222fe2a5a62fa378a
 EBUILD fast_xml-1.1.22.ebuild 574 BLAKE2B 89e167c6f9c89d3ff5c93a1e196932d8d719d82fa76d3710c7154951ca6a28336f71ec5d5e22a7eb3970a4b1a8ef5777eb609eda0f9e8a2593dfe6ee3531f58b SHA512 21fbfd5238e37bfe1a65696b3f41a2069403ba76c17dfb786e158ea308939e69ef450d23789540015ca1b65c2aa6c05fcd576131c8fe92cb02a35c332c7c7524
+EBUILD fast_xml-1.1.34.ebuild 578 BLAKE2B d9cc1eff851ee6d47e6170556393221c7e530117bc672d0196249e5b925a492c242d619d39a4ea2f11018dcdf16753d7f4f8377848dc5f90f6f22b2883291d85 SHA512 b25e2b972d0f6cf0d4abd547c6837e8aaff20fa3cc992eb31d59dc422e49c48a0e3286b5ad90cdd4bfc8ddbc571cda8376a8ff78a99a351b51ca68b31bba112f
 MISC metadata.xml 338 BLAKE2B eea63b356d75b2bfdbc4d46be95bb7b5b742f7e0ebcb70a25343cb7f0a193dbafd54584a4f338b0ea529e242e7d89edf5698696160a31d5b857938c4a0134181 SHA512 334d44bf23902819adc99490123ab35400bc934f5876d0cfd2a3ce05110a33c2462a30e0a5be39cc4947ba86b1eb274a18b5fbd4529fd2fc2aa061789d2e31be
diff --git a/dev-erlang/fast_xml/fast_xml-1.1.34.ebuild b/dev-erlang/fast_xml/fast_xml-1.1.34.ebuild
new file mode 100644
index 000000000000..4165cbbc37b4
--- /dev/null
+++ b/dev-erlang/fast_xml/fast_xml-1.1.34.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Expat based Erlang XML parsing library"
+HOMEPAGE="https://github.com/processone/fast_xml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-erlang/p1_utils-1.0.13
+	>=dev-lang/erlang-17.1
+	dev-libs/expat"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/elixir-1.1 )"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/fast_yaml/Manifest b/dev-erlang/fast_yaml/Manifest
index b9a708556cdf..a707b75c2e24 100644
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@@ -1,8 +1,10 @@
+DIST fast_yaml-1.0.17.tar.gz 49925 BLAKE2B 654a8f6ed516fc851a78a360c5f57faa302b068dbb84f9f26f3b0b8204e2cd55569ca27699181415453de469e524348b0db990736647df41843070446a20c9de SHA512 596e834a63b9ca78eee9b5021c711fdac2d7bd148dbbd6b0c162ec87f94dc41ebf7c8cd3d86c8a2c94da07d0926d31601d63123103678d42905243bb86c5f4a4
 DIST fast_yaml-1.0.3.tar.gz 49351 BLAKE2B ef705ef36f3ab2e43ac434abcce58f8fc3e0f1b0c0cfa88596c9b34b76ece0a2277a5f97046c789176231010711f906d5ec961b2053622404418e6a6d9380778 SHA512 321de1c0ff830de8a556bd661e600a66bccd944d6503a87a02111bcfb0b23c8c60b128296e7bb07ea39f923a04ebc7cd15e33971ca6691f16a75340c0695aee9
 DIST fast_yaml-1.0.5.tar.gz 49463 BLAKE2B d321ef3bbb4b51ad058b4c4125d7f53e65d5267fb0d3a6eedf2ab7b302d0b5cb9b1a2ac1cb60959ec74e8cc32684b6bf31f5247c26e61d810159d0b731541e96 SHA512 9d6b173f6086b2543273493cca460f161d16a4c3cfd8f84945a7040991fecd24a193bf0af47f3d0a326d2ebea3d46fcf5cfa0ff21607ee98e9a0bb6f2a535bab
 DIST fast_yaml-1.0.6.tar.gz 49461 BLAKE2B e79acf46f9ab85fc99774d727d3d64dfbfb583eb3e9a5379e95bde44a3a3703a1ad8aa22d9629d11f2c4346c8b0136b8076b67a4bd70a6a39c576f2df81bcf68 SHA512 04a466ebac30ee08827c9ba6d18861867571eda599e68937bbc8c924dab2387444db1f02da3cbf493ef63f03bc73cb6de32a90ee54901d269b3230611ee9600e
 DIST fast_yaml-1.0.7.tar.gz 49524 BLAKE2B d731cdbef28767ec0ef71ffcac7ae7150efcbf4e801ef1395ff95e22f9cc89909908ca26e493281487876bca361f82aeca852bb5a27ffe0ecdd1b658d6c0a78c SHA512 7d8dfd759fb6c406cb1e514b8bf66768b52e6be726067843035b037e88fa1986a465b173ead680971457059743d42829f0a9c0d9259fd0918e07804b6fbae89f
 DIST fast_yaml-1.0.9.tar.gz 49696 BLAKE2B a8cbda580e9c2bacdf046f82dc579eb5160d130f9af6c93e05e5c3e4fd7f8f30c9d767cb150a30c2abbd3d8fb3c62fa7c76bab3addb5754d04b9303e6c5bd3e3 SHA512 dd826643d1c841218bae1ccb6ea3dc0c35c64c20720c47e90b3dfad3231c4944216729bf3d46f19b06cd2d54a9487336e39a9ef15201cc315ab10a7ee950bf6a
+EBUILD fast_yaml-1.0.17.ebuild 538 BLAKE2B 208440244c10328d490bace4243f0d9d53cfb48064c6867385c83ade8d600d48a5d58eb7ed0dd7fa44633fdff569e463d49d806a2cbd09b6be72c9e7d063bf04 SHA512 85b15d8fc5b1c9f0b2887c786b31a104a1cf4ca6b3bc4fcdf2e8ebf887cdf8772dc0e7aa551ed74253770311ee1569d283c1bfac685e7697bca477b5136ed2d2
 EBUILD fast_yaml-1.0.3.ebuild 534 BLAKE2B 0d00c4102fa84821254bf7dfc942baf36b1b5b21ad9724a333af17fe9f30c4a7abb6645236fc351518851517bdc295f88f0a37c2ce5101298cb3c472d8442de8 SHA512 c73ecbdb62eb67e43ef0f52c9c9b0d1bda7e9ca6beb9945b61d78ce2c4cb0ad706fe009dad5f60f59f7bf13b05519b8fc9b538d58c92c55ede0830dda134c2ec
 EBUILD fast_yaml-1.0.5.ebuild 536 BLAKE2B e4837d431aed4780b061cd9db21ca066add911809057f83fe90da066a0eca164d84cd5f4489b0d68238f06ec731f3b14a18a90a4dec5702301be04d3013e5606 SHA512 1ecb41e6f8be61c5ae5436de14e48eb118dffede1a95bbf13c05ee2335eb414f269363497e83d40b147aa8f7bda00ff77425ca3d85476fe5b4efffe6eb66f2f8
 EBUILD fast_yaml-1.0.6.ebuild 534 BLAKE2B 9f24ada95572184c9d28b063dae707ae763174523008e6bc01c1335b01aaf60add36a748f9bb049141eb3d3ef90e213216835777e17b01dc3e87a0a84d66ac25 SHA512 9cc01d7a6cce598a7f9d809dfdf2d27d763e3ca8f9648a652a1794cbc32cce51680a00852f1c8c5d1c2bf1a4e10bcb184af125b657e5b4312656cac6685742ee
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.17.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.17.ebuild
new file mode 100644
index 000000000000..926060b6460c
--- /dev/null
+++ b/dev-erlang/fast_yaml/fast_yaml-1.0.17.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_yaml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.13
+	>=dev-lang/erlang-17.1
+	dev-libs/libyaml"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/iconv/Manifest b/dev-erlang/iconv/Manifest
index b0ccb623c78f..632b07857af4 100644
--- a/dev-erlang/iconv/Manifest
+++ b/dev-erlang/iconv/Manifest
@@ -1,10 +1,12 @@
 DIST iconv-1.0.0.tar.gz 91905 BLAKE2B 50903abf4cdc9c13de00875b6b253d8649e876b06f9a5c13d621d3d997b7bcfef56eb9635552ff34141e1449079e178b91f6a73355c53fc896de33db46e92811 SHA512 858ec07e2a8c2699c553de068451dc6dacf3fb1cf8a8e6727a746b72b191b5647a75a5b01443719a8625c1328c6b502a1f51fc1d367767e71792e38e1e34c1f1
 DIST iconv-1.0.1.tar.gz 121318 BLAKE2B 57d92de2599c018638f91eeea9d79fc5d59a81063be980186513b0ad5dec89afe61f0cf933a459f859088aee3bbd7b4f92ce1519e42d784ac9aaa3efb9809704 SHA512 bbccdc206c027e43a13388fc6c23ae5cd7084686ad56e39593b4a3db2abfe89e8000d2a88706d4b083b21e1399d5e7a527e72fa83c7f5e631ad39c8d39293bc1
+DIST iconv-1.0.10.tar.gz 121594 BLAKE2B 407a6cbe51aa50c561c577bf447dbc781c22bdc4ea20cacdcd2772e3cd7d262a1577381985ddafeb6fb48be94b35070de025b5d2301dbb4a3b9b9c0defd6a4be SHA512 c0537db617b83184111ce6f3be2e381c4a9f6a96d4887a2cf5bde3b275974411fb997f4a2f6a9c2b25c8e783e26af92b531788e9354be413d1837dd0482d41ef
 DIST iconv-1.0.2.tar.gz 121331 BLAKE2B 6b5533670c6e81c7fbfb00b9d5bbc0842f76ddb528becd2b9ab5aea2c741dcc15741b2a47fdc389474deeb14563c3646e5bbd642aa577fd5ab35372bf2f06a9b SHA512 910614320109993f359697bd78bb9c31275eb1e3a45f583f7caeeaff77d0f8aa513ebcb12110dc2ef1bf5ecc59e0f5f1c3e67f0cf47cde837a8af524e951901d
 DIST iconv-1.0.3.tar.gz 121413 BLAKE2B 0bbb79ebba8eb684895d2cf2524cf7cfd4f36535232474c0aa526d2e1e74715553e8880cb69c6ff47a3bfceef06852fcb5ee630f77c5e27cd86720f5f3ea98d3 SHA512 33b98d592eb0122b72894e7c06bd31763657615ecd9deefbd2ef6735150347708043bc574d8056be33d1d1bbc07a2bff4c65c504bb2a5170e6b8a2034cb803d0
 DIST iconv-1.0.4.tar.gz 121506 BLAKE2B ba2b3414feb8cd57681b8a866ee8862feae7a5cfce01077d94d0b2b90604a1f4757d138548deff9dad38e2ee88db54fc4e27c6a5120262d6620edfeadbbc388c SHA512 697f65a20aa42d92e2fe62bd88a6a6c7b1f6eff3a3ab14db3a17231875d2d36f5f36332c71db490b014cd3ea9b68abc0d815f3cf2b9cd72c18e1a94f62ff48a3
 EBUILD iconv-1.0.0.ebuild 495 BLAKE2B f3d55540c3350dc0701720a548cbd398a1548aa1470745248b745729f75547fff206ffc50c4cca40d627c004c8f1f886a50d686ca13c0734c9cb70c940cbddd9 SHA512 5157cd946fca930f18eec465af671b0f12cae83a82291e2681eb9e53499a6804e0166c7f8ab0edc46b2d9e14f3e85c6f59a33466ce84c901b9a0dee3b6022407
 EBUILD iconv-1.0.1.ebuild 526 BLAKE2B 55c6189591c4fc010064323f9f044efef049e93c9b0f1c5727129b6872802dbd072362879377bf469f96757b5c415d77685cecbee2305c986ea9b5ce666c8196 SHA512 28439fef5a728a17104256b92d23724bdd507da1c653168b3ce8f1dec54e00bdd2f47cfba12fb311898aa1175d1e2a96afca3ce9e467598b542c19605acf555f
+EBUILD iconv-1.0.10.ebuild 528 BLAKE2B 9eacacc4a12fbbec9700da95c9b72b771067083548073ba0540dbedfcf8d68fbae2978505e10386f2f7208b7263ce06989171a4c5bc5aae03b72ff93958e3c7a SHA512 9f4ae1190c3ac0197e32f572a0a17842b03919ed22a1cce53341418d3f774c43ad47ddb15716bc0d1ef3c9dba604a23730f57860b312a40044d337725cd31093
 EBUILD iconv-1.0.2.ebuild 524 BLAKE2B 6f8799774690486df93a3f84e790a4284a25a40da45bbac304db96cec17f3dca5b1ea80971e719abbf4db8c069957b2819e4b04d66472fa1e8dda8ae35aef014 SHA512 6ebda1d08f2c938ea0baae76f3ef69b783aa02d97ce3bae36bcde791cdfc2f4279f464df200104db6b3b921e887422363b490ae0b382dc4f9a29d5ec97d7debb
 EBUILD iconv-1.0.3.ebuild 527 BLAKE2B c3c8c23e5b9e11229e26acf80f788be76d84dc418dab4d066d541257f9d7aea5930c88b4b3650b0a02cc38dec2212b5d32167788fe19679f1c0db4b7c1330474 SHA512 4a309ea985fdcfab7babd104c2d6319c1d29ca89f15d07ea163a20e1eacd7341b0c029ceba71a502e18109e82b5aebe9d737ad6ab91c23cec9f7481c789f2a18
 EBUILD iconv-1.0.4.ebuild 524 BLAKE2B a4948172fd4e838cd86b828cf9471d35a6bd83bbfa2d1745e7f87163b855cf9dc9c179b308e7f2d34ce2fa1c07b773d3fd321c9c17643b9b6878441a59fd19cc SHA512 1669e7cb5678618745bb5e93b28af874e27553e2fd25336ab9f6327c6a89b5dd4803848159d776c3be931eb0d4dfc26efde98b068dd29f8bc74a62ef5eefa8a9
diff --git a/dev-erlang/iconv/iconv-1.0.10.ebuild b/dev-erlang/iconv/iconv-1.0.10.ebuild
new file mode 100644
index 000000000000..a90f949116cf
--- /dev/null
+++ b/dev-erlang/iconv/iconv-1.0.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast encoding conversion library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/iconv"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.13
+	>=dev-lang/erlang-17.1
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
diff --git a/dev-erlang/jose/Manifest b/dev-erlang/jose/Manifest
new file mode 100644
index 000000000000..a23992ca9691
--- /dev/null
+++ b/dev-erlang/jose/Manifest
@@ -0,0 +1,3 @@
+DIST erlang-jose-1.8.4.tar.gz 230947 BLAKE2B 18bfd6b710295575d0547afcc866674f2c65fec2742ee4dedbbe7a883fef45a9abbccfc669c90d75f5091e70b91bd7b478f4fea5d3beaa3f65510d92db07da39 SHA512 47171b4e5f6b61735a15365b4130c110c14de1f4b157cdbf97b448550d48de4ab27a30537e9d9f613d87862d592b3bd95638daacee60f3f5b9877d80a3de773b
+EBUILD jose-1.8.4.ebuild 721 BLAKE2B 88ca0c5a17bebbc9e42759b75048652f5ddde5b67b6fbe2b1761bca8faba4086bd31b13a04a636eb96cdc39aac7dc31844a41c47e07e7bcc815859e3719b645b SHA512 b826312015b2f8f6764796fc1581cbf3c4138626ca6b8a5f37b6469d840c1d841015d6dca0c830e734d8a5cf13b836058861890d50d2bb5ee0a218db4e819ef7
+MISC metadata.xml 342 BLAKE2B a097f6c9ea5d37a15155fe6cd9ab11bcd5855de8586d655d8b17a9911494c5539b704639ce96b8d9c4d8d2ab43ad63deda3df640895da77072de7580ee8d82ba SHA512 aa4363a2fe94789c5cfd82125bf478b72e2e3afe4112ce922693feb38e25f932d3dd429d566a02bd0077d7fdcf766622f61135517c59aaa8f241a593e79ca576
diff --git a/dev-erlang/jose/jose-1.8.4.ebuild b/dev-erlang/jose/jose-1.8.4.ebuild
new file mode 100644
index 000000000000..ac1b010be61f
--- /dev/null
+++ b/dev-erlang/jose/jose-1.8.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="JSON Object Signing and Encryption (JOSE) for Erlang and Elixir"
+HOMEPAGE="https://github.com/potatosalad/erlang-jose"
+SRC_URI="https://github.com/potatosalad/erlang-jose/archive/${PV}.tar.gz
+	-> erlang-${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/base64url-0.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
+
+# TODO: jose has test suite, but it require lots of dependencies. It may not be
+# TODO: urgent, but it would be nice to have those sooner or later.
+RESTRICT=test
+
+S="${WORKDIR}/erlang-${P}"
diff --git a/dev-erlang/jose/metadata.xml b/dev-erlang/jose/metadata.xml
new file mode 100644
index 000000000000..aded353904a2
--- /dev/null
+++ b/dev-erlang/jose/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>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">potatosalad/erlang-jose</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index 620a4a5d485e..92d182dd3869 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -1,8 +1,10 @@
+DIST p1_utils-1.0.13.tar.gz 56548 BLAKE2B a92aa78960673f2a52b5247dc48ea94e73e018f1a9504b57c15ebfb3b12eb9b6b5dd4e706782f4200cd35f07d3193c4cf07eff462bc74b4714d1e3da4d97077d SHA512 eb4fa41a46973c300b752efa273554e293c19235c3649166f1cb52d9512d0bfa3f032053a35ca10aec1d6594f352c386720ecb193233cebea226f45e0c0add34
 DIST p1_utils-1.0.4.tar.gz 44082 BLAKE2B e46625db03d449ed1dbfee9928ca276646f8c1e1f22798de4c48a72197972f6f8e969e5cc733574b281e0f116a26d474ec9fff765485ec9ae73ac69742065e7c SHA512 a86da4d5201ea9fa16574e4351f5f4ba32eb36fb61feb20231e4ee7c9bfe03a12724b6b50777adc65319055c29b8a3313c9fe72263089ad8a4c8b7ba9f30a3b8
 DIST p1_utils-1.0.5.tar.gz 44167 BLAKE2B 1863ab382557e6ec453ae868688f8bd9d64864891ede6f169f16f8a550d307761da8876c1bda280f15256e4f30f0a12b9d868bf4074af971d7a6fa73151e2575 SHA512 40d030e00eb5d9623035200c0a3650d2e0bc34c2cee3e46f8084c04643649fcaf33d265395d5d7414357e7e052a7be8929d3720e2c7a13a20a1379426fb5a5f2
 DIST p1_utils-1.0.6.tar.gz 46271 BLAKE2B 9742785528b82e5f7359d01e79f1f7e2bcdf33a6f9c177e3d5a21457bcbfaf768f3a18637f7a0ccd9368801f62d8d6794145bbda367d32bb75e45cac6b673ee2 SHA512 8944e8317358701a4bd5f266b32a8d07ac80e144c768a5118d67dea21321f01bdcc2bd13a8175e306313c8a117ebd8876fdce8fb2b52bc098341cd72ce041c29
 DIST p1_utils-1.0.7.tar.gz 46312 BLAKE2B 31e79fbf30f0ac90ff2319129f12df908243bdcd7b33310b975dc5a1d74fb2df590fc627f9ffd2d11ad9ff8be121cf79deb3b4672ca5aebb248c5758a21276bb SHA512 1a60ef061d543e688f22bbccafdd7d0aa749c23646546a55702eee5f8d6c8fa80f0c3b3a0b1054ea0b00bd76eb094473554fafd8d48f4785975e73e9c7dd4fee
 DIST p1_utils-1.0.8.tar.gz 53349 BLAKE2B f936b3a26b90c263f2b5e67e8b17e989c0be4270205eecfe3dafea27f704c3bf67c8914d104cfe14bf8ce06ff3e2352eb31a07bde956bee88e579a6d1e388436 SHA512 675439bf8872bc79a603032683eb322636b4c8687ac18d4bde2cd526bd86539c342024ef8aed5717083d9638f69f409bfd2f255d49267f528f67c42d7ad1e43f
+EBUILD p1_utils-1.0.13.ebuild 495 BLAKE2B 05b28afc1defa5ad9a89f5f30225e47d0c58540f11f9a5db7e78cd87224a1bc5ad6de43eb9e91b8b42e0917dd2c03057d8d8585780b4b3984d12f2987027d5b9 SHA512 ddde32486d70baa05752c5351012d0b92cb1bceaca64fa6eaef37dd5010804c75ac87e033d020a1a37534a93085633fd237ff7a7e414e5c6d6cd9dbda64b5050
 EBUILD p1_utils-1.0.4.ebuild 478 BLAKE2B 5009f8c618248a139f5c804a4d3854f041e4987ea581303cabae693bd8f789e7fec33d07213b046ed7cf26be0a4ac21787397f64beaa7e55417b84fa97e3e8b8 SHA512 cef6f78cb649a4fa1187dfe7762b4427d9f3e9ccfbd321cf7a39c11710ed8fc5d1c530d9712e62562a2b35547bcb61731c49cbb11be2710bd2165e88df0ce015
 EBUILD p1_utils-1.0.5.ebuild 478 BLAKE2B 0b77490421344acf82169ee6b536b2b94cfb113e79ea4290b54404049ad4c08b30628679480be447b8562016571dc2c46ef70ef990dd1092027b91829360690c SHA512 737e0078fa394041ee50a18f2fb4a31610decaaacf0da60043a7c71be0bef18915098e99cbafe4e7ffe46fb0286ee77e8c89a52a134752b5a3011a2cab660f32
 EBUILD p1_utils-1.0.6.ebuild 481 BLAKE2B d14873f33df23defd0472aa9c77ae57a2c677742039b7b0cdd2e1d455654671c5402f94b04915c6185cee6f050a1a82e21fd386279d039ed17d6d45df92f3233 SHA512 e2e73bc6e528c443c5387c9fcf21efdb9021d701431f4ace69f34056d77a440462862aa414fa51eec8b90e6884b0cde054053525b3a07d4b4c94e77c0b9ce56c
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
new file mode 100644
index 000000000000..e0a8a9e30c93
--- /dev/null
+++ b/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang utility modules from ProcessOne"
+HOMEPAGE="https://github.com/processone/p1_utils"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/stun/Manifest b/dev-erlang/stun/Manifest
index dc5ad0ec338e..5f1627aceef7 100644
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@@ -1,9 +1,11 @@
 DIST stun-1.0.10.tar.gz 28715 BLAKE2B ef8ba4d383df4374df065236b17d547d863bf8f323ce60779c772e7c8218872b0d460c513cc735001e7074c4defe0a36f3c0d41422d0bc9bb7f5139287f89c70 SHA512 9aba8c614af2f132c2a1cbeb96caa441934df389d24789f2d52b33b878f02a1b47602c95e717c7afd2a46ae85ceb70b4ba5c6eb96cd4fedf6ac56b0cd888ff74
+DIST stun-1.0.25.tar.gz 29332 BLAKE2B d234af437cbdd11116ed373c4ff4c5b67f80136d2c92e05a462138d3e31f6120363d0ad8af275eb753f4e724c1435fc4b5ec7399e30c25e7a6ad69c3e49d3ad9 SHA512 9c0eaa5cf21ca5305d6883f24d09a55fea2df261a1b32ab94770b9487c292f12ee3c55b101a4923a65407f0dd23149fef91bc35d2e754ab253c1c67adf584a3e
 DIST stun-1.0.3.tar.gz 28646 BLAKE2B f99ff996d8b228d89f2121aca9f25330a833d78bf974ebee22efd66f3ee44a6d0c94faf5556389786dcb2d118736a151633ef05e37736c041f252964184eb876 SHA512 c15918f4b1f81477a7834dc5ba837fcd512249bda569cf3ffd3066056e6f1abacfeab3d0dde575402291d841f257a3b33e27d6c76250ae353d77e3fdd87f9786
 DIST stun-1.0.6.tar.gz 28681 BLAKE2B dba8fc380670069f6b725aad71edc509fe7a6e1f142515adb6787a8de75f411b7030f5516e19c163ab9c7aa3a27a2ef86758a744db96223dce6d5e4361fea94d SHA512 30a34a660d246ed33015e2f4b890203a2648553ed6e2dced87e30bca2eb9d09486684947332f7239d535ce19a36028a0642136e5b574f3c5b867f598341bcaf9
 DIST stun-1.0.7.tar.gz 28689 BLAKE2B b1e32ad7a2e2da13fd514fca5318cb8695af2f818eef0053c3c290e0eaf32496e993095ee6bf865924caf5dc30e29d4409472f12c9743fa56a7f67680afd0ea5 SHA512 d494e020741e3e098c2ff9221a03cdb6f26a474a859e8e7dc41221050d7a99e8e7285b812556b95fd3f1e30ace45feb2e5613eccfc08bc99f9bbdcfd2d82687a
 DIST stun-1.0.9.tar.gz 28709 BLAKE2B d35baf946fdf07c27332de4a567a43824f2cf762be99efea5891ed5342b71bb7948a5e012a239742f8140cd5fc753b70f7e03dfc1ac8e521eb18c4ff49ff0979 SHA512 0ce53920194c4d020b1e0e302353eda24cbdab27ff45b1247d2aa7ab973944f89a0f3498508966daec43a0dc40a64cff15a31cab7837f7b105ebcbba8df63754
 EBUILD stun-1.0.10.ebuild 530 BLAKE2B 6936de72e2b09e848595cc7a128f105dc03d7bda49e12fb9a699ade7b862f434a1420434367d8cf645620c6588e26a8b5b1391a9868e75fc7670bc4720cdf68a SHA512 1ff462644a0f47ca55a27c41aec240fca2b10c3f2b5bade7f0d3178ebb456b0907c8e3d181da27c96a523ea3e7661574b827e114491cbad1ceb87e0b08e7b916
+EBUILD stun-1.0.25.ebuild 534 BLAKE2B b2183b3fabf5d6363603f854bc4db6a668a7cba80109863295fa639e8a8c60b7c37901b6b38717f271f234c395fa1188f229b10f14c0da4819d7ff72bbd0e6a4 SHA512 89e1ad27b1e97062b7772718c4a5d7ae687683626c1bc2e5c2caddda824abe9ccce589562410953248323f14ad2af81a3a3181d87264134d76cff536ff87ecdb
 EBUILD stun-1.0.3.ebuild 529 BLAKE2B 970d6cba01347a0055bde064fc7e23bc2f9d7b421cf5ce21b9d8c7d69bbc65767854931418928bd37931646195c1ffd6a92f71e0db25fe8009a2f1559492fb06 SHA512 34f189f5b2c82cdc778c05c88396d780bc5bdd27432b609c2f6fb2acdb4f71135bb1ad8eedbfe2ca1274ed774df895251d5e41e64c28b2646a3277690834ae1c
 EBUILD stun-1.0.6.ebuild 531 BLAKE2B cc415b5d2e1cc89d71590c3a0ab76d71dd53ab6c9400b31330c8d404ae80cf3377067daee84ac82e085c07f8b6f5e2aaf806f8bf74a5501bd04431af1ca4ac2b SHA512 e18819e6d67c4369fe403c46b27bb14b81c57c90265df4c458a85990f3a64fadbf7ef4185511ef28e712543a24615d3a3aec664522c38d31dcc81997d3fd9e58
 EBUILD stun-1.0.7.ebuild 529 BLAKE2B 184bb2f76d5f17ec92f3d8a5b367477e694319cb85a61b16b63f4607d3d267d331cf5e727e139f5cb6132c4b1de528908025ae427a633173c3863b58e6784bcb SHA512 7e7ced8943afaee99d256e4d1ab309ce18c5b537ffa7601e4beb1eda95a25b8e5538d94d720ecf6d0ab9e0bc38667a2c5c8eb8c110dd7ff6830d573067222eae
diff --git a/dev-erlang/stun/stun-1.0.25.ebuild b/dev-erlang/stun/stun-1.0.25.ebuild
new file mode 100644
index 000000000000..244fbc48606a
--- /dev/null
+++ b/dev-erlang/stun/stun-1.0.25.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="STUN and TURN library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stun"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/fast_tls-1.0.25
+	>=dev-erlang/p1_utils-1.0.13
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 7b6ffe048706..f8042fea7788 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 245492a5f57c..000da8f64be4 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -3,4 +3,4 @@ DIST Aseprite-v1.1.6-Source.zip 11801981 BLAKE2B f20186a1669d7f9ab1453a2104a5422
 DIST Aseprite-v1.1.7-Source.zip 11801711 BLAKE2B 282492c29ece6b5b5bed029c7f27aa0a287bcb475f60066b6c34f54607b2714f35540e4d6ef4737818712776c2202162ce47c5713ba26b756d9e1c1d8af9c904 SHA512 9a92853042c7de567a7eb33d10ddd38c6d6bd53acfe4b93dc96e11408a7bda39ef7503c159934c483f0455700933c541dfdc0cb4c505d3385778e40686e474e6
 EBUILD aseprite-1.1.6.ebuild 2137 BLAKE2B 25892ae8c493a1798ec344a840fe2f5dcb04e60441020095d00b294be7fb7af634138a715a36cb6135b9413b0a26ab21d25b42204e8c371d15e113acb1fcb0dd SHA512 41724723ae7a318ceff10178795709cfc2c9b8bc87836c02404f5af3ff03a5cdbc204ace11ca81f3699b649bdfda7471b4692eb6f1f3a6bf324965fd075a696f
 EBUILD aseprite-1.1.7.ebuild 2525 BLAKE2B 01c1954bf6a9ed76400da5c639a3efbdaa55117878febd7c049e38116245a8ee8602d693fbdcf8428692b5c7480b9603d6dbfebcb09dbf98da5ce4e765bf9da1 SHA512 d1fd7b3edcb428398aaeb794442aad5da944ddc03cc0a31ea5fc74bbe2fb9acce5f58b628b9789cbeb9fed54682336a5e4805d907d99e7ae9658b593d13442c9
-MISC metadata.xml 796 BLAKE2B f4d58bec1834431cd95364d44c0a61d5ed81c12a7b4d45d854fd69be57dbcd450936d0653c8a84640a4e23a2d59bf2e34d329db78c1c41943e6b835f0cf5ed50 SHA512 a85107e1261336c570d11265e0ede9eb9c6724c5f891786aadc509bc52e593cc61f6fc77022b928c56ef4dfe51b2f9d3f3eb603ffb2d0f4e6586fbc4d1794984
+MISC metadata.xml 736 BLAKE2B f51c9318ee809968234ec305c754f6eff180bb0117605e814d92729fd0c0b0b875977474451eec53883fdde4b6d619772b6d8180f8550a339bff0bc8e47492a2 SHA512 49d18653948b0426c33d0b85c0e6c827c0dd67fd8c4353d2b56ba4ab2dd3f891e6dd2f57c31591cd36a48c546b520a9937184e198103ebe6ebe59b1f92dc55cc
diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index 67070f03bd3e..e5313dbe03f0 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -15,7 +15,6 @@
 	<use>
 		<flag name="bundled-libs">Use the upstream provided bundled version of allegro 4.4.2</flag>
 		<flag name="gtk3">Enable support for the experimental native GTK File Dialog</flag>
-		<flag name="webp">Enable webp image format support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">aseprite/aseprite</remote-id>
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 6c2750a4555d..1aeecbbd21f1 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -2,12 +2,23 @@ AUX ogre-1.10.11-media_path.patch 922 BLAKE2B c39dfa7eec840d5952dfb0b854396268e4
 AUX ogre-1.10.11-resource_path.patch 782 BLAKE2B 9f4647d38880ac9cf29513159113cf2dc4b173846737ae5e0be74e71be0a02c42790260c86b5ed0382e04e43a75ed931702232421e589dc4011f69584ee949d5 SHA512 61e6f341377f0025ba1bcc4a3edcd6600e811e5bef83dad0f7bcbb8ec1f5d8bbcc2c238eee4cc556523eb4f36be833b6ab3d910da9a4d35186377a75fb6bcf89
 AUX ogre-1.10.11-samples.patch 225 BLAKE2B 52965ede36ed80a72f4cee7fb9800146ab95787e8f3bacf5d69d6fe35a29349f674cc5819b576def33bd0f8e4ead8160cb50822100fbd6bb39aaf9f39f53caa4 SHA512 08d94b7b381debcb2f40b7f4bebad76ea4ed8823fc5809a2a01ada75e36ad870c290aada1495f766c7c9cc446b24fcfdaddf7f518411da90edea827c76814528
 AUX ogre-1.10.12-use_system_tinyxml.patch 1617 BLAKE2B 0c0213b9ed63030d2538817ef73bb26d02a02e8e62d5acc923e748d9c1b9a24c4a9868e19816cc15c2b71a0b0c58974147ed0c7a019fbc5d1e5cb3640e9aabbf SHA512 b97040417bd1ec29e2b90a6b6a6ba82ab790786c08c994d77d1440d3c2054e7850b420850584f38d0783aa4c60f13b3ac8fcd32e3fc72f57554f6819e65b0bda
+AUX ogre-1.11.2-fix_sample_source_install.patch 1258 BLAKE2B 36006bb1e543638e1cb45c27f0a22507a98b919e336b795c5f2af33ab23dabefc593bf1cec678d3125f34bff364ade37d97592990b0e0a0c29cbe9c2ebcf3043 SHA512 db2e26199e264c29f1e1dcbf92fc1fdc82c9e01f089b3ebe789ab408e1653ae1261bf53cfaa86aff90083d7cde085e7cb6308d5d6b5786d8ee7a18f1ed62b7ed
+AUX ogre-1.11.2-media_path.patch 927 BLAKE2B b82d5986ca041534f1edfe4e5a1a0b62cab487406bff3f846b7686f37bd01646e384356a0a21c86a788aa603932e9eca24aaabf22b221f49914d55335aef7088 SHA512 20ae6a5599536d0e916fa1b05e4fe84fef1d4988b59af3c3212c796b9c6783680b339e522580381ef9b7f50239f47be701a73bbc4f7d7a7c1b4e2181e159db0b
+AUX ogre-1.11.2-resource_path.patch 589 BLAKE2B 4620819c5e14f0c6b034ea52845c1fb3ded4db08ce39b80a48dc89191c0521499020916a89d720b887bc9f59d3d33b2863d168411543e25889f525b5d43e5fa9 SHA512 2995f2720a188ffa9811f7073d97d3e2bdbaa08d81b3530f28dfb39d682c2934ce16fb7accf7b47a02384167acb01c9fb90900ad7a8ab766b3b8cf5ad75e5086
 AUX ogre-1.9.0-gcc52.patch 2392 BLAKE2B 3d41e4a6726dabd2f4861774c962a0b5e38cdc5403f3bd457b2ec4b003de6d3c59511a6b9590baee376b543520a00acd3df0839e5d045966d6aac8ba49c6a3dc SHA512 ade6885334698ea2df8a678b3b9058f2cd06aa6c32dd57645e5b28e3f22cbaacc4821bbd661e97ecc426f216114dd9595d9b98c9368061561afea82779a942c7
 AUX ogre-1.9.0-remove_media_path_to_bindir.patch 545 BLAKE2B 162ca81d22dfa100f624f3c62095bb3cd8bfff884e0754991904fbbe37ab60177d920872ea4955d4c8e3fd95a81f6488ed6ba6894dd1b0c7fe0b376ac62d9105 SHA512 7248e6dba4837765ebf0bc1cd06c07891ea785a415ecbd279f1d6adc88b4a8aae0a12993635d9139697771e8b94739e709e2410754e0e004571d1a48a1bf614d
 AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 452 BLAKE2B ef6aedfe4ee2bc1e17106164fec1d82a7fe927d5240e90c1db8a579dbf4fedc11e6b3cacb5138172fa198bf5681df09309412b6a48079353bd14568b667d5db4 SHA512 57cef0efbbbe791234b117556c6f56051ebeee90a1b1802a9fc8e106edabbfa53f96a2e43d4c332a8631b04954e87676444cdca417bcc8957f860d041f80d2b9
 AUX ogre-1.9.0-samples.patch 226 BLAKE2B d6bf78992d23d50d5f913238eeefed1e4e301eee3989dd759d2709db6c43e16826906f2f7492a29f3d4f15d14bcef35a1771b3edada39b5070691c42a2f6c951 SHA512 7e4a90954940ab87b338c680d22666d5c9a70425e02ab314ca925346862385a1e9ace75b4099b1223da5a658b5311f4557a3f846e2d404764153cdfafb7e5b3a
+AUX ogre-2.1-enhance_config_loading.patch 1303 BLAKE2B f03e3b00ee9f13bbcc4cfa9a8db318aa7e675ed3974751460060f8789f5a1ba38d47e9612eebbc164e81fd7b341c64ba3d2df79b499a05248207a8fbb8df9564 SHA512 c1db8c919d33e7e96b44ad44f0e5a51abc7920178a3b3119fbad5ff42e79f9f986ee3cffb55e6065a6b01dbc5d9b5060b757acd597d77aa9068df476c51eca14
+AUX ogre-2.1-media_path.patch 1212 BLAKE2B 7c34ff08246fc973b5fc99eea37d6cc7c6dd3e5a65ae20a5ce1016da29ae2f6a6adbf49e8c11148447b9279aefbcd078a0f2f67e3cc3029236d53fb573d6c877 SHA512 fa0151327228c3896ab29a5d121d5278a135b48227d390c63eebc148fc0227523bf3f53ea3571e154ea5788eda08f73fedd33c2117c8b92c83725a8a04cec696
+AUX ogre-2.1-resource_path.patch 794 BLAKE2B 4720eb3f7a07f6a654c391766f0f6728d983cf9ebc7b3ab424b48897e08137af806fe3fe2830051a297b5728a3901bfafd0cf099659b5abf43c00502e28c4a46 SHA512 5e0d323c47f6085774dc7f127304bdfced38be2b4b9a9ccdaae9e2bbeab4121afbf1da6a7585c02285b33b8eea7a7c38845582e30e2fe73926a0ce55d0996dda
+AUX ogre-2.1-samples.patch 1108 BLAKE2B 0b3b5bdb93f58952993a9a92c52b6057ef37e308fa93cbf1833a564f1188448c7eccb725eb37a591c18a7d4bc6f752454e52d08308be231e8602669720019730 SHA512 586b18f301906a82acad1d8211c8f63a2fd0e587dfe160dbddf0821893f17b7b1f772f1d5116e1adedc62017eb27eedc5fc30e0e861ae1c2ba12bd3bcc662372
 DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041
+DIST ogre-1.11.2.zip 127409383 BLAKE2B 7493892f434847ea4afda580868b2a8572d65c9ea9de3709aacd789229531803450dbd78994ff0fae29a9435912a80029edba51db035c7a175c860ce07912968 SHA512 dc6a7e14ee515d5a5c218aa3f31cefc8ad95a175604fb5fb252185220c6fd537f7094d3a1086d5eb5e9515f8c528c7f6e2ccc95594ef9882204c666b87fae4e2
 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
+DIST ogre-2.1_pre20180901.tar.bz2 152746767 BLAKE2B 758d31fca2e5e31080c688ba758948fb5998a8fe49b9052f79de6791786501d02d7079e8f55ed37dc1a93f360af1003d2a28a260ba687c60c75a1340b95232a7 SHA512 c3cb5630a35e0ddf8c688a972ab5f2821d62545b4febc013235157eaf5268b3ceac1b94c403d0298131991f3d80d1c9b3800212a49647c652ba02bd176f6cc04
 EBUILD ogre-1.10.12.ebuild 3379 BLAKE2B e617b49260f550f20ebc898168a9a8a274fe94b01297856b431f22e496260a2c8cca3c3bdc3d25777966bb83d51c50fbbfa871ec72bc24c7b8a8552d40c52e26 SHA512 a1c0a60967701eda0168560dd4a0ec33a869c0e751ef0eac078714874d2f4bc4e068b777fc145f35473fdf380f96987c5041e360d305c3d3cd3cabc3e1414667
+EBUILD ogre-1.11.2.ebuild 3988 BLAKE2B d6376d8ab869900c36b7f27761775d5898eb5d59c29b7021ab3fc0bc519b2f68fb0f45fc45a815884ab7ef47eccb81e2c66284db5a2af5a8f63eb2fd508bc647 SHA512 67545f35019f286b6d3b3666bbb2c642d9819276eb3550582e3fcf59ab2e5aff0623f95dee6b62b87212402e6940162686e0e0c38949d06e27de9de9b15a0926
 EBUILD ogre-1.9.0-r1.ebuild 3791 BLAKE2B cea064e4607e7892d2af6a375b4a7b6845ca27490b0bff72a08beb898d5ff62eff0777f407f5038771bc9181e822a8bc3c825cae9fb59a5aebbe0e20d09b83e9 SHA512 16839c39f7295f039fb59fd2e7422e0e9545070e0cf33b393c7eacdb57e9b84afa8238415f043dc25f7b2eaa20e38f63fc152e63c3e0d1dbf68cdb00bee35c23
-MISC metadata.xml 6139 BLAKE2B 7ec570cd9bf0e99b7ba2420526f6ede529dc3bfa35f3c2f169d768b7e2e425c81ef3bb1d75a20e96c3ff6215c27b82864df9d157a9fcb489183aa01532fde2ae SHA512 566077f56b9e7d92683c23745c46b19335e03044df87e19b8749396443d9f63087a703bc26f5651241536af2658e02c3d616f1610d350918be17ea4cc466a5a0
+EBUILD ogre-2.1_pre20180901.ebuild 4433 BLAKE2B 473fd9aa0ccb546f8fe0369b69ff9c5f63aeae3e73000b77f2d2343e2cef689f1b84b06186f2f93ef4cbaf374fddf6dad3d02430b407d85a872594862fe6598e SHA512 3cc8d28da6d8578f098765230fc06259c86838e325d10342a3919d3553a8509d2a6ba02fa1289e204e190f407de72e4df6377f7f9f6c8cd6f3a840fbbd4fb149
+MISC metadata.xml 6611 BLAKE2B 1d5eb84a08e6d6fb35363f95fe565e1b128ad85733bdfa2d71a6ded75121d058b0f1229b03808911b7e1b84954c769ea0d6ffc5a120aa38d7f63a13a1bdfdbc4 SHA512 98a6d956819ad294f262d8d8c32d5cf7886984928ca723c296a5c928c4e59241580fe1fd02f15ada30febe134cd7d9b8c8a052436e093c2df3cbb6bee03f3d96
diff --git a/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch
new file mode 100644
index 000000000000..6e4a476fbb4c
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch
@@ -0,0 +1,18 @@
+--- a/Samples/CMakeLists.txt	2018-04-25 07:30:38.211048775 +0200
++++ b/Samples/CMakeLists.txt	2018-04-25 07:32:32.842049802 +0200
+@@ -97,10 +97,11 @@
+ 	PATTERN "scripts" EXCLUDE
+   )
+   # install a new CMakeLists.txt file to allow building of samples
+-  configure_file(${OGRE_TEMPLATES_DIR}/SDK_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt @ONLY)
+-  configure_file(${OGRE_TEMPLATES_DIR}/SDK_Samples_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt @ONLY)
+-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}/../)
+-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR})
++# The SDK_CMakeLists.txt.in file does not exist at the moment (sed - 2018-04-25)
++#  configure_file(${OGRE_TEMPLATES_DIR}/SDK_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt @ONLY)
++#  configure_file(${OGRE_TEMPLATES_DIR}/SDK_Samples_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt @ONLY)
++#  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}/../)
++#  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR})
+ endif ()
+ 
+ # Install sample headers, some people rely on these
diff --git a/dev-games/ogre/files/ogre-1.11.2-media_path.patch b/dev-games/ogre/files/ogre-1.11.2-media_path.patch
new file mode 100644
index 000000000000..aea15218c178
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.11.2-media_path.patch
@@ -0,0 +1,18 @@
+--- a/CMake/InstallResources.cmake	2018-04-03 19:39:31.586129013 +0200
++++ b/CMake/InstallResources.cmake	2018-04-03 19:40:28.169128923 +0200
+@@ -170,10 +170,11 @@
+ 
+ # CREATE CONFIG FILES - BUILD DIR VERSIONS
+ if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
+-  set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
+-  set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
+-  set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
+-  set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
++  # No, they are fine already
++  # set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
++  # set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
++  # set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
++  # set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
+ else ()
+   # iOS needs to use relative paths in the config files
+   set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-1.11.2-resource_path.patch b/dev-games/ogre/files/ogre-1.11.2-resource_path.patch
new file mode 100644
index 000000000000..8557d783ec41
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.11.2-resource_path.patch
@@ -0,0 +1,14 @@
+--- a/CMake/InstallResources.cmake	2018-03-23 10:48:44.371486540 +0100
++++ b/CMake/InstallResources.cmake	2018-03-23 10:49:08.333486363 +0100
+@@ -184,8 +184,9 @@
+   set(OGRE_PLUGIN_DIR_REL "")
+   set(OGRE_SAMPLES_DIR_REL "")
+ elseif (UNIX)
+-  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
+-  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
++# No, this was already configured above, the BINARY paths are wrong!
++#  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
++#  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
+ endif ()
+ 
+ if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN)
diff --git a/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch b/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch
new file mode 100644
index 000000000000..365aa7c69d61
--- /dev/null
+++ b/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch
@@ -0,0 +1,29 @@
+--- a/OgreMain/src/OgreConfigFile.cpp	2018-07-27 07:52:31.121337386 +0200
++++ b/OgreMain/src/OgreConfigFile.cpp	2018-07-27 07:59:51.301317661 +0200
+@@ -62,8 +62,25 @@
+     //-----------------------------------------------------------------------
+     void ConfigFile::load(const String& filename, const String& separators, bool trimWhitespace)
+     {
+-        loadDirect(filename, separators, trimWhitespace);
++        // Try automatic loading first
++        try {
++            loadDirect(filename, separators, trimWhitespace);
++        } catch (Exception &e) {
++            // Try /etc/OGRE/<file> next
++            try {
++                loadDirect("/etc/OGRE/" + filename, separators, trimWhitespace);
++                return;
++            } catch (...) { /* was just a test */ }
++            // Try /usr/share/OGRE/<file> last
++            try {
++                loadDirect("/usr/share/OGRE/" + filename, separators, trimWhitespace);
++                return;
++            } catch (...) { /* was just a test */ }
++            /* dammit... */
++            throw e;
++        }
+     }
++
+     //-----------------------------------------------------------------------
+     void ConfigFile::load(const String& filename, const String& resourceGroup, 
+         const String& separators, bool trimWhitespace)
diff --git a/dev-games/ogre/files/ogre-2.1-media_path.patch b/dev-games/ogre/files/ogre-2.1-media_path.patch
new file mode 100644
index 000000000000..5e7ad276ac09
--- /dev/null
+++ b/dev-games/ogre/files/ogre-2.1-media_path.patch
@@ -0,0 +1,28 @@
+--- a/CMake/InstallResources.cmake	2018-03-23 10:49:24.620486243 +0100
++++ b/CMake/InstallResources.cmake	2018-03-23 10:50:52.089485597 +0100
+@@ -186,15 +186,16 @@
+ 
+ # CREATE CONFIG FILES - BUILD DIR VERSIONS
+ if (NOT (OGRE_BUILD_PLATFORM_APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
+-	if( NOT APPLE )
+-		set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
+-		set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
+-	else()
+-		set(OGRE_MEDIA_DIR_REL "Contents/Resources")
+-		set(OGRE_MEDIA_DIR_DBG "Contents/Resources")
+-	endif()
+-	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
+-	set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
++# No, they were fine already
++#	if( NOT APPLE )
++#		set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
++#		set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
++#	else()
++#		set(OGRE_MEDIA_DIR_REL "Contents/Resources")
++#		set(OGRE_MEDIA_DIR_DBG "Contents/Resources")
++#	endif()
++#	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
++#	set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
+ else ()
+ 	# iOS needs to use relative paths in the config files
+ 	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-2.1-resource_path.patch b/dev-games/ogre/files/ogre-2.1-resource_path.patch
new file mode 100644
index 000000000000..32cfef0d8d14
--- /dev/null
+++ b/dev-games/ogre/files/ogre-2.1-resource_path.patch
@@ -0,0 +1,18 @@
+--- a/CMake/InstallResources.cmake	2018-03-23 10:48:44.371486540 +0100
++++ b/CMake/InstallResources.cmake	2018-03-23 10:49:08.333486363 +0100
+@@ -226,10 +226,11 @@
+   set(OGRE_SAMPLES_DIR_REL "")
+   set(OGRE_SAMPLES_DIR_DBG "")
+ elseif (UNIX)
+-  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
+-  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
+-  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
+-  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
++# No, this was already configured above, the BINARY paths are wrong!
++#  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
++#  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
++#  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
++#  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
+ endif ()
+ 
+ if (WINDOWS_STORE OR WINDOWS_PHONE)
diff --git a/dev-games/ogre/files/ogre-2.1-samples.patch b/dev-games/ogre/files/ogre-2.1-samples.patch
new file mode 100644
index 000000000000..6d12fb4fed11
--- /dev/null
+++ b/dev-games/ogre/files/ogre-2.1-samples.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt	2018-03-23 10:48:02.309486850 +0100
++++ b/CMakeLists.txt	2018-03-23 10:48:04.157486836 +0100
+@@ -614,7 +614,9 @@
+ endif ()
+ 
+ # Setup samples
+-add_subdirectory(Samples)
++if (OGRE_BUILD_SAMPLES2)
++    add_subdirectory(Samples)
++endif ()
+ 
+ # Add android JNI binding
+ if(ANDROID AND OGRE_BUILD_ANDROID_JNI_SAMPLE)
+--- a/CMake/InstallResources.cmake	2018-04-06 19:18:45.095348540 +0200
++++ b/CMake/InstallResources.cmake	2018-04-06 19:20:00.342345608 +0200
+@@ -62,8 +62,8 @@
+   set(OGRE_TEST_MEDIA_DIR_DBG "${CMAKE_INSTALL_PREFIX}/Tests/Media")
+   set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE")
+   set(OGRE_PLUGIN_DIR_DBG "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE")
+-  set(OGRE_SAMPLES_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE/Samples")
+-  set(OGRE_SAMPLES_DIR_DBG "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE/Samples")
++  set(OGRE_SAMPLES_DIR_REL "${CMAKE_INSTALL_PREFIX}/share/OGRE/Samples")
++  set(OGRE_SAMPLES_DIR_DBG "${CMAKE_INSTALL_PREFIX}/share/OGRE/Samples")
+   set(OGRE_CFG_INSTALL_PATH "share/OGRE")
+ endif ()
+ 
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 9e726e9a8d33..841aaefd7dc8 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -82,7 +82,10 @@ Exporters
     <flag name="cg">NVIDIA toolkit plugin</flag>
     <flag name="double-precision">More precise calculations at the expense of speed</flag>
     <flag name="egl">Use egl instead of glx</flag>
-    <flag name="experimental">Build experimental BETA components 'Bites' and 'HLMS'</flag>
+    <flag name="experimental" restrict="&lt;dev-games/ogre-1.11">
+        Build experimental BETA components 'Bites' and 'HLMS'
+    </flag>
+    <flag name="experimental">Build experimental BETA component 'HLMS'</flag>
     <flag name="freeimage">Support images via media-libs/freeimage</flag>
     <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
     <flag name="gles2" restrict="&gt;dev-games/ogre-1.10">
@@ -90,8 +93,17 @@ Exporters
     </flag>
     <flag name="gles2">Build OpenGL ES 2.x RenderSystem</flag>
     <flag name="gles3">Enable OpenGL ES 3.x Features</flag>
+    <flag name="json">Use dev-libs/rapidjson (needed by Hlms JSON materials)</flag>
+    <flag name="legacy-animations">
+        Use the skeletal animation from 1.x. It's much slower, but the new system
+        is still experimental.
+    </flag>
     <flag name="ois">Pull in Object-oriented Input System library dev-games/ois for samples</flag>
     <flag name="poco">When USE=threads, use poco for threading</flag>
+    <flag name="mobile">
+        Build for OpenGL ES 2.0 only and use the mobile variants of the PBS and
+        unlit material systems.
+    </flag>
     <flag name="resman-pedantic">
         Resource Manager PEDANTIC : require an explicit resource group. Case
         sensitive lookup. Some demos might not work with this setting.
@@ -104,7 +116,6 @@ Exporters
     </flag>
     <flag name="tbb">When USE=threads, use tbb for threading</flag>
     <flag name="tools">Build and install helper tools</flag>
-    <flag name="zip">Support zip archives</flag>
   </use>
   <upstream>
     <remote-id type="bitbucket">sinbad/ogre</remote-id>
diff --git a/dev-games/ogre/ogre-1.11.2.ebuild b/dev-games/ogre/ogre-1.11.2.ebuild
new file mode 100644
index 000000000000..e3f452d99e9b
--- /dev/null
+++ b/dev-games/ogre/ogre-1.11.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_REMOVE_MODULES="yes"
+CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
+inherit cmake-utils
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="https://www.ogre3d.org/"
+SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
+
+LICENSE="MIT public-domain"
+SLOT="0/1.11"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+cache cg debug doc double-precision egl examples experimental +freeimage
+	gles2 json openexr +opengl pch profile resman-pedantic resman-strict tools"
+
+REQUIRED_USE="
+	|| ( gles2 opengl )
+	?? ( resman-pedantic resman-strict )
+"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	dev-games/ois
+	dev-libs/zziplib
+	media-libs/freetype:2
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	egl? ( media-libs/mesa[egl] )
+	freeimage? ( media-libs/freeimage )
+	gles2? ( media-libs/mesa[gles2] )
+	json? ( dev-libs/rapidjson )
+	openexr? ( media-libs/openexr:= )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	tools? ( dev-libs/tinyxml[stl] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-media_path.patch"
+	"${FILESDIR}/${P}-resource_path.patch"
+	"${FILESDIR}/${P}-fix_sample_source_install.patch"
+	"${FILESDIR}/${PN}-1.10.12-use_system_tinyxml.patch"
+)
+
+src_prepare() {
+	sed -i \
+		-e "s:share/OGRE/docs:share/doc/${PF}:" \
+		Docs/CMakeLists.txt || die
+	# In this series, the CMAKE_BUILD_TARGET is hard-wired to the
+	# installation. And only Debug, MinSizeRel and RelWithDebInfo
+	# are supported.
+	if use debug; then
+		sed -i \
+			-e 's/Debug/Gentoo/g' \
+			CMake/Utils/OgreConfigTargets.cmake \
+			|| die
+	else
+		sed -i \
+			-e 's/MinSizeRel/Gentoo/g' \
+			CMake/Utils/OgreConfigTargets.cmake \
+			|| die
+	fi
+	# Fix some path issues
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_INSTALL_RPATH=yes
+		-DOGRE_BUILD_COMPONENT_BITES=yes
+		-DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
+		-DOGRE_BUILD_COMPONENT_JAVA=no
+		-DOGRE_BUILD_COMPONENT_PAGING=yes
+		-DOGRE_BUILD_COMPONENT_PROPERTY=yes
+		-DOGRE_BUILD_COMPONENT_PYTHON=no
+		-DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=yes
+		-DOGRE_BUILD_COMPONENT_TERRAIN=yes
+		-DOGRE_BUILD_COMPONENT_VOLUME=yes
+		-DOGRE_BUILD_DEPENDENCIES=no
+		-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+		-DOGRE_BUILD_PLUGIN_FREEIMAGE=$(usex freeimage)
+		-DOGRE_BUILD_PLUGIN_EXRCODEC=$(usex openexr)
+		-DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl)
+		-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
+		-DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
+		-DOGRE_BUILD_SAMPLES=$(usex examples)
+		-DOGRE_BUILD_TESTS=no
+		-DOGRE_BUILD_TOOLS=$(usex tools)
+		-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
+		-DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
+		-DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=$(usex gles2 $(usex cg) no)
+		-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles2)
+		-DOGRE_CONFIG_THREADS=3
+		-DOGRE_CONFIG_THREAD_PROVIDER=std
+		-DOGRE_ENABLE_PRECOMPILED_HEADERS=$(usex pch)
+		-DOGRE_GLSUPPORT_USE_EGL=$(usex egl)
+		-DOGRE_INSTALL_DOCS=$(usex doc)
+		-DOGRE_INSTALL_SAMPLES=$(usex examples)
+		-DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
+		-DOGRE_PROFILING=$(usex profile)
+		-DOGRE_RESOURCEMANAGER_STRICT=$(\
+			usex resman-pedantic 1 $(\
+			usex resman-strict 2 0))
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	CONFIGDIR=/etc/OGRE
+	SHAREDIR=/usr/share/OGRE
+
+	# plugins and resources are the main configuration
+	insinto "${CONFIGDIR}"
+	doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
+	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
+	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
+
+	# These are only for the sample browser
+	if use examples ; then
+		insinto "${SHAREDIR}"
+		doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
+		doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+	fi
+}
diff --git a/dev-games/ogre/ogre-2.1_pre20180901.ebuild b/dev-games/ogre/ogre-2.1_pre20180901.ebuild
new file mode 100644
index 000000000000..9249788cc201
--- /dev/null
+++ b/dev-games/ogre/ogre-2.1_pre20180901.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_REMOVE_MODULES="yes"
+CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
+inherit cmake-utils
+
+MY_COMMIT="35b083cba64a"
+MY_P="sinbad-${PN}-${MY_COMMIT}"
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="https://www.ogre3d.org/"
+SRC_URI="https://bitbucket.org/sinbad/ogre/get/${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT public-domain"
+SLOT="0/2.1"
+KEYWORDS=""
+
+IUSE="+cache debug doc egl examples +freeimage gles2 json +legacy-animations
+	mobile +opengl profile tools"
+
+# USE flags that do not work, as their options aren't ported, yet.
+#	cg
+#	double-precision
+
+REQUIRED_USE="
+	|| ( gles2 opengl )
+	mobile? ( egl gles2 !opengl )"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	dev-games/ois
+	dev-libs/zziplib
+	media-libs/freetype:2
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt
+	egl? ( media-libs/mesa[egl] )
+	freeimage? ( media-libs/freeimage )
+	gles2? ( media-libs/mesa[gles2] )
+	json? ( dev-libs/rapidjson )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	tools? ( dev-libs/tinyxml[stl] )
+"
+# Dependencies for USE flags that do not work, yet.
+#	cg? ( media-gfx/nvidia-cg-toolkit )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1-samples.patch"
+	"${FILESDIR}/${PN}-2.1-resource_path.patch"
+	"${FILESDIR}/${PN}-2.1-media_path.patch"
+	"${FILESDIR}/${PN}-2.1-enhance_config_loading.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i \
+		-e "s:share/OGRE/docs:share/doc/${PF}:" \
+		Docs/CMakeLists.txt || die
+	# Stupid build system hardcodes release names
+	sed -i \
+		-e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \
+		CMake/Utils/OgreConfigTargets.cmake || die
+
+	# Fix some path issues
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOGRE_BUILD_COMPONENT_HLMS_PBS=$(         usex mobile no yes)
+		-DOGRE_BUILD_COMPONENT_HLMS_PBS_MOBILE=$(  usex mobile)
+		-DOGRE_BUILD_COMPONENT_HLMS_UNLIT=$(       usex mobile no yes)
+		-DOGRE_BUILD_COMPONENT_HLMS_UNLIT_MOBILE=$(usex mobile)
+		-DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=yes
+		-DOGRE_BUILD_COMPONENT_SCENE_FORMAT=yes
+		-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
+		-DOGRE_BUILD_RENDERSYSTEM_GLES=no
+		-DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
+		-DOGRE_BUILD_SAMPLES2=$(usex examples)
+		-DOGRE_BUILD_TESTS=no
+		-DOGRE_BUILD_TOOLS=$(usex tools)
+		-DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
+		-DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
+		-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(\
+			usex gles2 $(\
+			usex mobile no yes) no)
+		-DOGRE_CONFIG_ENABLE_JSON=$(usex json)
+		-DOGRE_CONFIG_THREADS=2
+		-DOGRE_CONFIG_THREAD_PROVIDER=std
+		-DOGRE_FULL_RPATH=no
+		-DOGRE_INSTALL_DOCS=$(usex doc)
+		-DOGRE_INSTALL_SAMPLES=$(usex examples)
+		-DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
+		-DOGRE_LEGACY_ANIMATIONS=$(usex legacy-animations)
+		-DOGRE_PROFILING_PROVIDER=$(usex profile none internal)
+		-DOGRE_USE_BOOST=no
+	)
+	# Options that aren't ported, yet:
+	#	-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+	#	-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
+
+	# These components are off by default, as they might not be ported, yet.
+	# When advancing to a newer commit, try whether any of the disabled
+	# components can be activated now.
+	mycmakeargs+=(
+		-DOGRE_BUILD_COMPONENT_PAGING=no
+		-DOGRE_BUILD_COMPONENT_PROPERTY=no
+		-DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=no
+		-DOGRE_BUILD_RTSHADERSYSTEM_CORE_SHADERS=no
+		-DOGRE_BUILD_RTSHADERSYSTEM_EXT_SHADERS=no
+		-DOGRE_BUILD_COMPONENT_TERRAIN=no
+		-DOGRE_BUILD_COMPONENT_VOLUME=no
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	CONFIGDIR=/etc/OGRE
+	SHAREDIR=/usr/share/OGRE
+
+	# plugins and resources are the main configuration
+	insinto "${CONFIGDIR}"
+	doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/plugins_tools.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/resources2.cfg
+	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
+	dosym "${CONFIGDIR}"/plugins_tools.cfg "${SHAREDIR}"/plugins_tools.cfg
+	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
+	dosym "${CONFIGDIR}"/resources2.cfg "${SHAREDIR}"/resources2.cfg
+
+	# These are only for the Samples
+	if use examples ; then
+		insinto "${SHAREDIR}"
+		doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+	fi
+}
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index a0985e090d54..36d7a36b7104 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -5,4 +5,4 @@ EBUILD physfs-2.0.3-r2.ebuild 1434 BLAKE2B e90dfa9de136d2d0c6df7247b7681cfae7dec
 EBUILD physfs-3.0.1-r1.ebuild 1357 BLAKE2B ccc70d74bc537f05b2ebe2cd64e0b6376e3791380d5d00a367f30d1f6169c0281addfa0e26b713c6ed74ff2882193f0dc84edd1d17b16582834f52a4dc898895 SHA512 f7a3c0d29d45754ceca70388d1fc93ae218bcce727006951089df7744038f88823cce3767e079ce41d6cb2bf7837731cd9f04e3e4417f0df2b64e254f72f2cfd
 EBUILD physfs-3.0.1.ebuild 1149 BLAKE2B 4d1741230adecf1df5380d3a15cc00d1fa1a2d21b5b5b5efa31e2dd11b7fdb44ebaf062bd4c8124bdfeed05f330edabd401e62720a432d4ff895dd7be635edfb SHA512 34a700288cb901ba432c748e47203e8234e0f1ba68af56edf490ea798c2afabf6f905cc8d95f602fe8fa66518e2e82d051b95ec7004a913e394bb525478f6dff
 EBUILD physfs-9999.ebuild 1458 BLAKE2B 903117df8a7c78a3e08aadaba7d418666ab387dd14172a48e5a63bf4a277c73fc96f2f49a3f81faad62a4aeed47304b64e72ad55253d238ed480568b785c04a8 SHA512 fd7fa508248f2e917cc11cf165da5c6b6fdde20d3d0340410de44ecc175dcfce8a9035b20a971998eb4733125860ad52aed9f6e34b0401266fff02dc7f15d84b
-MISC metadata.xml 2053 BLAKE2B 72bacd7ea9c8484446c109a062ca9f68eaa4e7d481d6b0d1e32eb3c7c1afc093c0550a20cb4280a7d3ce60929b204cde0499e20262fe591ca97c0c697e8e9bce SHA512 178d6468849870d0e557c04f899edf8513c3e695df0ce1b543de90ca57f87629a2a6c2ebdefeaf00ffe7891dcc9e340200136f94de0579e2e7f43897b138f3a2
+MISC metadata.xml 2002 BLAKE2B 4b4c48bdbb19836f3a2e5b09c737c1c0390dba6d2cdccb126a0f8caa6e593e0861b9ddf1d3d70b1da00385b323b86c2842482ccfa10de421a6ea57251fab703b SHA512 4a06786fe7cd30dc87225656ae0b09322f23f19fdd3919695629f76c54d7abb6ee970b8a67c59ef5895e460c5e65074ec7ffb06680f1572898aa15f2fb78fbdc
diff --git a/dev-games/physfs/metadata.xml b/dev-games/physfs/metadata.xml
index 62272a610b69..4c12a220b846 100644
--- a/dev-games/physfs/metadata.xml
+++ b/dev-games/physfs/metadata.xml
@@ -32,6 +32,5 @@ etc.
 <flag name="vdf">Enable Gothic/Gothic II VDF archive support</flag>
 <flag name="wad">Enable Doom WAD archive support</flag>
 <flag name="qpak">Enable Quake I/II QPAK archive support</flag>
-<flag name="zip">Enable ZIP archive support</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index a5681b9196eb..dec0b71d0f70 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,5 +1,6 @@
+AUX tiled-1.2.0-qt-5.11.patch 611 BLAKE2B a2113dcb7170c9a750372e6e3e07a56bde77ced34d4c62a5d31e4b93dcef2fb149330614be5f962193e537559efb897214163209c48cafe2ed5319f8bda3cad7 SHA512 5eacb68e75ec3595411cf79d9d565ad7480977df6d0814be27da2eeac83e6b1af106f5b707f6f5e2bc07adb2b139ef9731c88c432228870b32a0a0bcb3ab3f42
 DIST tiled-1.1.6.tar.gz 16051699 BLAKE2B 61e33682cbd0d3045c12b20fc852ec8ae81103fc1d9818a7e17222615676dd2d3889033d6d6ba536e63e069a44aaeebeaaffb96b94a2cbcb8f1793553a466703 SHA512 d1083a938bbbd87897c5897fe79d424706e719a4319680ed907be481773daea656fc5b3230ba6b674e5ea044e22ee0044df2a07a7c91c56f9521e32b86847830
 DIST tiled-1.2.0.tar.gz 17007687 BLAKE2B 6bb5a34a19868574801a69015f6a05b299dd5b34df865cacf5d2a747a62ae731b80778fe49a432c5487cbfa3d30186dc80011cc8882cb86ac347fb35a7421cbc SHA512 9c0c151348a90344b355e9bc8a7c9d38e2203d48474e8cf496e2c08cc75f764042e4355db2827f0e3518a1c03bfbcc79be7ba643c44c50430c7ecec09fbb8563
 EBUILD tiled-1.1.6.ebuild 1276 BLAKE2B 31c9ef74b458163b5ecbed4c307b1a32ebec6d5d635d4cb8373add7b3e3749057a307550fe68b35d0694fbf566cabc04d5c3abf1cb4ac2e7d9449c91f61c61ff SHA512 cbc32e28411d3cbcd7973e6072d1f9874997b467fc3760fa2ca54e8595e7bcd5599fe5b85db3cf6b1b78da1a393d48843f749713a647a2c8d6df63aacfb2a9df
-EBUILD tiled-1.2.0.ebuild 1274 BLAKE2B f52201c15fa94aae73e1e886a7fc770d62e9aa7228be3c1d3dee4f7dde1960f3bf58b9a596ede03e5b9fc146f5c298e2d071bcb330a1cf293069294e3145347e SHA512 8728f63f29bd82807db88b77e061a9648616864e09277c4478563c6b99dafc1d777c525dfdb26bd9a2cab309b228a926f354ad8e2a63247ea075ffd9139712a2
+EBUILD tiled-1.2.0.ebuild 1319 BLAKE2B 3dca6a8a8ba1407d0069e5c34694f1a2c7b254c00a7389c41578a6542ea390985fe0240770d651c19bfbfd6068a89411733779638237c62153ca0bb09f0e3ccc SHA512 d5c104765d08958e3898402e38c11c9aac1612d633eeaabdca6ed93c5720c070e9bc4f93c59ace7cfe2e2bb4d9a919f8bd5cbf12bb72c60447f17f71d366fd5e
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
new file mode 100644
index 000000000000..43b3c64659c4
--- /dev/null
+++ b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/667000
+
+From 1f039bc40c730cdd93df8213795bbb0fcb634dfe Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 22:51:03 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ src/tiled/newsfeed.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tiled/newsfeed.cpp b/src/tiled/newsfeed.cpp
+index ddf988c3..2e2e12b9 100644
+--- a/src/tiled/newsfeed.cpp
++++ b/src/tiled/newsfeed.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include "preferences.h"
+ 
++#include <QDebug>
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+ #include <QSettings>
+-- 
+2.18.1
+
diff --git a/dev-games/tiled/tiled-1.2.0.ebuild b/dev-games/tiled/tiled-1.2.0.ebuild
index fb9cfdad6b97..75a12ed885f7 100644
--- a/dev-games/tiled/tiled-1.2.0.ebuild
+++ b/dev-games/tiled/tiled-1.2.0.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( AUTHORS COPYING NEWS.md README.md )
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 194c9d645dd5..251018b86ead 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index 11f267042299..1ff74c72a4e5 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1,3 +1,3 @@
 DIST go-bindata-0_pre20151023.tar.gz 17860 BLAKE2B 281a4ccbac82af31017728dd309cc32852a959cbe4e468bb2cf7e05266de748a22d062d8863350caaa713a28efb3c0dc7543abcf1fd1812543364ed6ff166c65 SHA512 ed1d2fd1c5a833b6efdc731eb43f72fc072a701c447a926ad6c1f9be3c0f1ed92c689639d02a288230a49d53795f41092deab132389871a5b9f79abdc525fc43
-EBUILD go-bindata-0_pre20151023.ebuild 601 BLAKE2B 90c4070d09b39229e0a398c5d3e6d3524f35d95ba7565c3d4055914fccbb5fd651ce8b23d1d48d4de3c11950291a02a2ebe9972d867c53979205a92ee76d3c6d SHA512 e66e69d2366e910c7be09a1622e0f7cc148b3c47e377721dcb4368ee95086a12384fe0e7d13142d0482b040f743241cafcaac54123a553644bb3def10386d40c
+EBUILD go-bindata-0_pre20151023.ebuild 617 BLAKE2B 18f18747c43236052722c29fc10dbd6557d1db5c35c6a081de0f5c43457bd8ce867cc61a7359d6b610e41922c025be71fbfa4bd5c9e9b0bb060ac3a063857f29 SHA512 e30050887d94b8ab35c336aa509d46102f673236b0ae7ccc53af745cc16d8bd982f5f30d8ebd330550f9c93088af033a7431e6c350e0bdcd06892b7f96aed23e
 MISC metadata.xml 251 BLAKE2B 78b1289c2746a6805eeb73edc062b5309b69d11585038e4c26d863ad9c3b202b9ce1589a97e1e41f4b1c2472b45456dc0a555fd22387ffeea319d1fb3806c229 SHA512 d241954967f8571d47611771a1655e0719a0cdf7c339df0a8b7d184b01fb773a8e311465f18afcfe9dffcdbff427e1165bafb0aaca0d2837b2d1b55729b1b6cc
diff --git a/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild b/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild
index dac12764e414..9b145c321780 100644
--- a/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild
+++ b/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,6 +17,7 @@ SLOT="0/${PVR}"
 IUSE=""
 
 src_install() {
-	golang-build_src_install
+	GOBIN=${S}/bin \
+		golang-build_src_install
 	dobin bin/*
 }
diff --git a/dev-go/go-protobuf/Manifest b/dev-go/go-protobuf/Manifest
index cf571063feac..8ded7a48a880 100644
--- a/dev-go/go-protobuf/Manifest
+++ b/dev-go/go-protobuf/Manifest
@@ -1,6 +1,8 @@
-DIST go-protobuf-0_pre20150809.tar.gz 151982 BLAKE2B dc7722108d09f94395c204a3adb8cce46978daa73319012964863536e8e4d3eaaff1878097dab0a96cc94ebc66c1b2f8cc0f49e931c104392bd7d083f2f1af8f SHA512 04802b8d74ccaa17f9fc030badd0e74b6e47233ca5f1faab7c49f25bef2f06efd97aa4bf3f4783a7815958354744ddb9fee96d183aebbb03864069b0cc569564
+DIST github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz 965206 BLAKE2B 018ab877bfa7208bb0ca9b4ede85077ed37c8ee3c7065569646e6c9704715d6810b0286276ea0fa9a271f12ffbe964b41f55ec762711c8a43ccea564607f3265 SHA512 d56f5608e64e8d883a782f0c460f08da20e7d01a97330fad35c8757420ac82fb84b657c3f64e3c4d90a08cc4d8905ab37225d6fab8472e8f1fd3d7be212df8b9
+DIST github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz 16326 BLAKE2B d214c190a03006b726b4e5daa8320aa2f664572db46ac6a57545ccd3e98529c63fd5d9296e2afe0af0b781fcced4af52127d8079e72d116e0310688465e1882e SHA512 dc67de045513305edb3239b412b9154b44b6f408eace3cbbcf400c08d68322cec7090b9e6b22d63bcfaaec459e221d0e3f2c057aa19ae9b35a4a134dd72475c5
+DIST github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz 2323831 BLAKE2B a614c74b60f8e347b47c8686807228ea76b021a918fc732b69293c8b59c1bc5396e320cbce6db87ab43b9a4fd649d19779874934bdd667f7cabf03165439c54a SHA512 a6524f31e8c4775195c245ffbe54c7f770591d46663ea86b8120ffd8efb3cf9269569fbf457b0d0272dc47177ccf3b413e858c2b437ee9892b5ac6698d07ed4d
 DIST go-protobuf-0_pre20160216.tar.gz 198638 BLAKE2B 21b1780d9e792263eaa1babbefff855fc506177b56d907650968ae96e13c6624982511cbeb3b2bf002ad724ab454e4450f6d7649b55297fb2756b528f9789283 SHA512 d7f446ce7b3f78d646abccdbcb92c423fcca99a51275b55f2a357b5e44c2a6b6d7ea59a39b654daa36e59aa39d3b094ed3fb3d6f53c789a4396fceaecbd5ace5
-EBUILD go-protobuf-0_pre20150809.ebuild 686 BLAKE2B 435ee51c180111b8818babe66a412ad31aae3449c1e1a521a8648e2225668860a40c18947c40dfdf0e86b64c563729549e9dd8b688e00956b1fa388d3c814f08 SHA512 94c4ed39b29d2732506822a976af59bf48e8df022860b5e1be49da9f926e26eef971c27db3ddf3f6a3a42251218ec0b65c8cc0e5d71220e877fb59449f45dae6
+DIST go-protobuf-1.2.0.tar.gz 332565 BLAKE2B 6916341aaa30f593c9a27363d4d73c548d0f7a629adffeab927078bb3ebc64f59a5c568b7bb7999c7505d526ce0ead0c9163908080f24ecd6c7b94ed2db28335 SHA512 a0f596ee96f7501ee47da75ea234c1e29c0abb2c3fda731acd601a55880502ae90d70f6d3da9c9a35e493fd1bcb69971c062e16b1e49a0996137950dac2effac
 EBUILD go-protobuf-0_pre20160216.ebuild 687 BLAKE2B 77d253b98d6b0c41858e06ddd5cef35e1b3104e643594b0ef4a7f56629ca34c05da51f86f7a0f05415ec97673a051b2a0f3594e3b40bcc50fb3aa67e3b291207 SHA512 15ea925abcd9e8be28b4992f09ac7c1dbe7001cda8cf23d37137b3396e4c56e60fc033c0425a5876b912c7af7a5edb09379d1346dcb76ae7b9f687509ee0e055
-EBUILD go-protobuf-9999.ebuild 650 BLAKE2B c5c9beaddf5254cdc6aad3594c0ae8cd8115dee87c68877b6e39e8ad1485db4746824fd5d01c604736e644767d6e8e7be14f24d98a38d107fe788f93c1c1445f SHA512 c7da0ff7370f425fa5c568b1c97eaa0a14dffd4c6fb3def3683b8085ac181505243f464807b60520c13631b494e66576b7bce39411c5f559fdbefd8eac380b0a
+EBUILD go-protobuf-1.2.0.ebuild 1299 BLAKE2B 709a597af78b1877469c46cb3b01a6bbd7c5963fa5b418ca1a954d1a704e385a136e6b64ec39a70971a5f7ec62f4775424430cac0200ddb298f1716ea033c46e SHA512 2af83b2a4e2599c1908b034f8aca6e39ec173700ed8a244432f1747af718dbac59552b823dfe43c7fc2af1e8245d19637bd8f01ea763c6d13be2a6adf63fe23e
 MISC metadata.xml 306 BLAKE2B 0a4acdd528bf97660b3a3932c1073caf0f1593c32a5c03c9375e877650a40dbaf86b9cbfa568a30caa78e2d4cc90d468f24f3f4fdad395758d57f2985059b441 SHA512 f2502a8d1135fa06f2e580cc0dbbbc63dfbe7a2cbe296fd99be657f33cd0681f4e01813b8b4047ddd188089f7b99934dead4618377d002a0365d066137d4ca61
diff --git a/dev-go/go-protobuf/go-protobuf-0_pre20150809.ebuild b/dev-go/go-protobuf/go-protobuf-0_pre20150809.ebuild
deleted file mode 100644
index f5a8b85107e9..000000000000
--- a/dev-go/go-protobuf/go-protobuf-0_pre20150809.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_SRC=github.com/golang/protobuf
-EGO_PN=${EGO_SRC}/...
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="68c687dc49948540b356a6b47931c9be4fcd0245"
-	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go support for Google's protocol buffers"
-HOMEPAGE="https://github.com/golang/protobuf"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	rm -rf src/${EGO_SRC}/.git* || die
-	golang-build_src_install
-	dobin bin/*
-}
diff --git a/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild b/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild
new file mode 100644
index 000000000000..06fee922c86c
--- /dev/null
+++ b/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_SRC="github.com/golang/protobuf"
+EGO_PN=${EGO_SRC}/...
+EGO_VENDOR=(
+	"google.golang.org/genproto af9cb2a35e7f169ec875002c1829c9b315cddc04 github.com/google/go-genproto"
+	"golang.org/x/net aaf60122140d3fcf75376d319f0554393160eb50 github.com/golang/net"
+	"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Go support for Google's protocol buffers"
+HOMEPAGE="https://github.com/golang/protobuf"
+SRC_URI="https://${EGO_SRC}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	default
+	# golden_test.go:113: golden file differs: deprecated/deprecated.pb.go
+	sed -e 's:^\(func \)\(TestGolden\):\1_\2:' \
+		-i src/${EGO_SRC}/protoc-gen-go/golden_test.go || die
+}
+
+src_compile() {
+	env GOPATH="${S}" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	GOPATH="${S}" \
+		go test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+	rm -rf src/${EGO_SRC}/.git* || die
+	golang_install_pkgs
+	rm -rf "${D%/}$(get_golibdir_gopath)/src/${EGO_SRC}/vendor" || die
+
+	dobin bin/*
+}
diff --git a/dev-go/go-protobuf/go-protobuf-9999.ebuild b/dev-go/go-protobuf/go-protobuf-9999.ebuild
deleted file mode 100644
index b94987b944e1..000000000000
--- a/dev-go/go-protobuf/go-protobuf-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_SRC=github.com/golang/protobuf
-EGO_PN=${EGO_SRC}/...
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="68c687dc49948540b356a6b47931c9be4fcd0245"
-	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go support for Google's protocol buffers"
-HOMEPAGE="https://github.com/golang/protobuf"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	golang-build_src_install
-	dobin bin/*
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 59facf37cecb..eb1bfe13725e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/boot-bin/Manifest b/dev-java/boot-bin/Manifest
index d865b53f3e68..e41b62aace91 100644
--- a/dev-java/boot-bin/Manifest
+++ b/dev-java/boot-bin/Manifest
@@ -1,12 +1,6 @@
 AUX boot 247 BLAKE2B 138d1a35bb90dc4942c480b6d48494716dfeb406d8d66186e3732df247b74d65f947de22532f51b7c5c1b1a652a65e962e2c0ccdd2ae7189b102579c3a00ea3e SHA512 06ad5b0517a2ecddfa62e03b15d7af2bf76f029e2cd9dd096b27024a9dd1f6c8bc0ffe278b510249f624c6dc2178d41561e06c41dcef5cca8699f34722d215c0
-DIST boot-2.6.0.jar 8289462 BLAKE2B c9ff3c464f0ebf536594879681fb7d84454dd7e51db355ae48f9562a2b7f09e6b8aa3adf53c95d1310e29388b167030d6637eeb2cfe9817831f107a6ca8cfac2 SHA512 715aa320c0e44a2376020aa84c0640ae8e6fb15a4842b4267ff58e1d09682aae17f74dc568e50fa611993947bcd7b1430157a0f0b6b8bcddff1eaa3149ddc9ad
-DIST boot-2.7.0-CHANGES.md 19877 BLAKE2B 6d2190988bc73f41f88101eaf14c0d43e06f4386629ea712a0e6800288250ab9cfe3d435c68557005693bdda11047dde9e5b6d984f53a5cffd5032ccce69e756 SHA512 f97148da762a1e5ea5ab747dcff59e69a53690cd655a6b8968dd894b7e4184f49eacc2d1189d81df80eba78b74091dd47d137dc4963da5b9caead0db16259303
-DIST boot-2.7.0-README.md 16071 BLAKE2B de0f5168f1b4151ffc76bf02343a1d965ba418e90255d04ef8c6c0c30e32d1927042ed24d1e5e1e6dad3b9dc0e893bf7656a3cfc279f6e690a5c7587a3930897 SHA512 395b6fec79bd1299f4d84fda4ba3d0db0b54c9c591c7ffd2c3c0f239f5f1bade31bf6eb1b924d6e58775fb6d412417d251d77356698d54c93c3ee31b64c9652a
-DIST boot-2.7.0.jar 16723852 BLAKE2B ab067b0b2b42b4d8295b3de8367393e6e31192e127112a23ce6e21946afabff6f0bdb75a37b3120da361ec6a76d470185908e4264d5b5ee08f3d4749d86ecea0 SHA512 5a95b2d8e521d57e5773347df52982f0ab9cd325622606ea394f826610b9b27a1cbeed0749665d62f605cf9249b9f65d378b1b77e40c83e3cfe703d4d2fc2530
 DIST boot-2.7.1-CHANGES.md 20380 BLAKE2B 84a57834b78b752b6be051aa9513ad3360cc81b1311248892b3f61760c181a2c53083da8c61eeae2930b2501b95b71dd74bfededa2325806a83abbb0ef0f35e3 SHA512 5f8b9866dcb5e784caee89c7a0569d6a2392cda19aa498d15eaa8d4ea054900bdc0dff950ca60f6c62f0cd262373a3cd0760c755b805d952bc96838de135aeb8
 DIST boot-2.7.1-README.md 16071 BLAKE2B de0f5168f1b4151ffc76bf02343a1d965ba418e90255d04ef8c6c0c30e32d1927042ed24d1e5e1e6dad3b9dc0e893bf7656a3cfc279f6e690a5c7587a3930897 SHA512 395b6fec79bd1299f4d84fda4ba3d0db0b54c9c591c7ffd2c3c0f239f5f1bade31bf6eb1b924d6e58775fb6d412417d251d77356698d54c93c3ee31b64c9652a
 DIST boot-2.7.1.jar 8388320 BLAKE2B a5af7ee5468cd6db1c955fd7a1726da6bc370ff8fb2b38312c42b9b6577c9605cfd472f86878c8706e50a1523f9e8789e7b92aa7244f2ce0450b7447cd8d5aa8 SHA512 d8101ba2c3a2bdec655f0fcea95a3cb33aee90c9471f6cd31f465c3716cb3f6d9027b7ec0c1c7cd277f8b43cbc0fd69d2e164fa33b112bba94d4d3245caafb3c
-EBUILD boot-bin-2.6.0.ebuild 1524 BLAKE2B c968415c492f6b70529554fe4bf1d51bf36cbe115f73591bef5ad8dd76a88653156ff1e6a15369a3a0755b561c9858d35f2ae0d968d5dd2790b00c9f58ed04dc SHA512 d4f3886207b4e0057fab46c8f0a65ce4830c6d6c948f1cb37c8d3a5bbb4ff8a880bcfa920fa2c2e037d243e7f16926fa3f2105e69c0fec5564cd563b46ccb3e8
-EBUILD boot-bin-2.7.0.ebuild 1998 BLAKE2B e5e5c7d9a75fe277fa164a1cdbcd7b227011c4a945c628544f1a0afee867dbe9b5b4b8e79c64f1e59c5d5b7926e882cae1301a9d4fb89c23f4f8e4fc2b210027 SHA512 e4050452a886c3ecc9c8f9c42a8befed7f9aefd8f4123d8f49741f13c30f8bf59a73c067cbf0d4eb259ce64d353e7dd79c5de3cdb906d8348ef7f85bd3af4321
-EBUILD boot-bin-2.7.1.ebuild 1998 BLAKE2B e5e5c7d9a75fe277fa164a1cdbcd7b227011c4a945c628544f1a0afee867dbe9b5b4b8e79c64f1e59c5d5b7926e882cae1301a9d4fb89c23f4f8e4fc2b210027 SHA512 e4050452a886c3ecc9c8f9c42a8befed7f9aefd8f4123d8f49741f13c30f8bf59a73c067cbf0d4eb259ce64d353e7dd79c5de3cdb906d8348ef7f85bd3af4321
+EBUILD boot-bin-2.7.1.ebuild 1982 BLAKE2B efe1673b0038afac6d745700beb08cf6a910aee6e608c2d9c92d45adf082e41bca4778e632f7e8d6186d2277ef8eeb9bdf8b4e4304c552a1896a993665e67bc7 SHA512 64abf5291a9a696e413e74a3ae479e81dd0cc69c2c0ae80cad8cd0a7290357abf98ba8a16d54ce6d1a59139d903334d3cbda40a926f680c86433c5266a3ece53
 MISC metadata.xml 400 BLAKE2B 9b861c7bbcf7f885204ab9bfce1d364bf75b0001ce1e3623826b9d3009b51276dd8ee33817c49899583ca4d79e2108c01da676f2e815c980cdeaefe716a858ff SHA512 1293c586f0885348baaeaf2c98c031a5c673aaa3604bd81c73159341d55f83a85686efd4866709709dcfec289087422af258e4df8c4f43445e7ad87a2dc43096
diff --git a/dev-java/boot-bin/boot-bin-2.6.0.ebuild b/dev-java/boot-bin/boot-bin-2.6.0.ebuild
deleted file mode 100644
index 15ca39c55373..000000000000
--- a/dev-java/boot-bin/boot-bin-2.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Build tooling for Clojure"
-HOMEPAGE="http://boot-clj.com/"
-SRC_URI="https://github.com/boot-clj/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7:*"
-DEPEND=">=virtual/jdk-1.7:*"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying boot shell-script"
-	cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot"
-
-	java-pkg_init_paths_
-
-	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" 	"${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
-	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" 		"${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
-	sed -i "s|@@PN@@|${PN}|g" 					"${S}/boot" || die "Can't patch PN in boot"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/boot"
-	java-pkg_newjar "${S}/${MY_PNV}.jar"
-}
-
-pkg_postinst() {
-	einfo "This package will still download a whole lot of its own runtime"
-	einfo "dependencies the first time you run it."
-	einfo ""
-	einfo "This currently can't be helped and is expected behaviour for a"
-	einfo "java based development toolkit"
-}
diff --git a/dev-java/boot-bin/boot-bin-2.7.0.ebuild b/dev-java/boot-bin/boot-bin-2.7.0.ebuild
deleted file mode 100644
index 8809cdf42e6b..000000000000
--- a/dev-java/boot-bin/boot-bin-2.7.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-GITHUB_USER="boot-clj"
-
-DESCRIPTION="Build tooling for Clojure"
-HOMEPAGE="http://boot-clj.com/"
-SRC_URI="https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
-		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
-		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
-"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7:*"
-DEPEND=">=virtual/jdk-1.7:*"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying boot shell-script"
-	cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot"
-
-	for file in "README.md" "CHANGES.md"; do
-		einfo "Renaming ${MY_PNV}-${file} to ${file}"
-		mv "${S}/${MY_PNV}-${file}" "${S}/${file}" || die "Can't rename ${MY_PNV}-${file} to ${file}"
-	done
-
-	java-pkg_init_paths_
-
-	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" 	"${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
-	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" 		"${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
-	sed -i "s|@@PN@@|${PN}|g" 					"${S}/boot" || die "Can't patch PN in boot"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/boot"
-	dodoc "${S}/README.md"
-	dodoc "${S}/CHANGES.md"
-
-	java-pkg_newjar "${S}/${MY_PNV}.jar"
-}
-
-pkg_postinst() {
-	einfo "This package will still download a whole lot of its own runtime"
-	einfo "dependencies the first time you run it."
-	einfo ""
-	einfo "This currently can't be helped and is expected behaviour for a"
-	einfo "java based development toolkit"
-}
diff --git a/dev-java/boot-bin/boot-bin-2.7.1.ebuild b/dev-java/boot-bin/boot-bin-2.7.1.ebuild
index 8809cdf42e6b..91fe6b68b918 100644
--- a/dev-java/boot-bin/boot-bin-2.7.1.ebuild
+++ b/dev-java/boot-bin/boot-bin-2.7.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="6"
@@ -11,16 +11,17 @@ GITHUB_USER="boot-clj"
 
 DESCRIPTION="Build tooling for Clojure"
 HOMEPAGE="http://boot-clj.com/"
-SRC_URI="https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
-		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
-		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
+SRC_URI="
+	https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
+	https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
+	https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
 "
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
-RDEPEND=">=virtual/jdk-1.7:*"
-DEPEND=">=virtual/jdk-1.7:*"
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7"
 
 RESTRICT="test"
 
@@ -44,9 +45,9 @@ src_prepare() {
 
 	java-pkg_init_paths_
 
-	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" 	"${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
-	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" 		"${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
-	sed -i "s|@@PN@@|${PN}|g" 					"${S}/boot" || die "Can't patch PN in boot"
+	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" "${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
+	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" "${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
+	sed -i "s|@@PN@@|${PN}|g" "${S}/boot" || die "Can't patch PN in boot"
 
 	default
 }
diff --git a/dev-java/classmate/Manifest b/dev-java/classmate/Manifest
index ea5ea27c54b1..c99a0ffadad9 100644
--- a/dev-java/classmate/Manifest
+++ b/dev-java/classmate/Manifest
@@ -1,7 +1,9 @@
 DIST classmate-0.9.0.tar.gz 57752 BLAKE2B 31247d159be4898b9ae71024da41c8602fe4d82f4ee10edab3146355cac06b23991fe926397737c43341085f35b392fc3f8a6b8278b9e47706f6fd06012f4c59 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2
 DIST classmate-1.0.0.tar.gz 57807 BLAKE2B 171a82fb61fd1e183a5d435912099fd663d41c5d68791502c3a25752b77e809da817d2a8c5f8be55a211c4ab192aff6e2e566e8400c12fef688dfc05ea8a1b16 SHA512 cf721c813674e295fa6c1fe897493d14926d025cab51896ea0cec69ae285a540123060c39e3515daeffa48d6975d060861bf3ca5340bb9273980fee6d92d73b5
 DIST classmate-1.1.0.tar.gz 60936 BLAKE2B 07fe05e3f5e77b4d3551c99940b2c1e53473c37f59c592cca631266d9015618c0e72b4e659ffba999cf53bb6c5fff38a1525dbd2f49852b60ccfe66c1cb75e01 SHA512 461838806e9c181764433473af8a8d3e24539a8a8ccaed29fee8eab9c6a7a2a0b1a7dd4435931ab08ae46566330a69ce3a1d2efadb3bab2535aeb041c530ce9a
+DIST classmate-1.2.0.tar.gz 62150 BLAKE2B fac7cb24e527f69863cfb4c59e634ac77165aa5a1ecae9d887511818a87ae9cd2652eb47e72844f3e38bed3c4856185020db6ece90553d14ce84cf6ce859cae7 SHA512 82f38229cbe57531354300b967589afcf064970a2b41ac56ad3520582719416ca878d9a4adc46d46a4470077e5f14ddcf2906b0af03156863301dca0b20d4151
 EBUILD classmate-0.9.0-r1.ebuild 1153 BLAKE2B 8930a2941a6ba2dc88912ad163b6a90959b378b5589c762e35dd0a360337ba0695f554162e21bc5797cb84da76eaa5faf2e8274b35a18d978bfeb8581250bdbe SHA512 3f65f469845ed7e6d86e6f5e0473cac8d0a6c606270a0c256a01f78a5896267c975bf4b9dfbb4f36e25092c20e2baa1fc808ceb1ac18227aba3bee18ba24cfe4
 EBUILD classmate-1.0.0.ebuild 1161 BLAKE2B 2603fe68a5a76351ff3201e5e8afb8e89ffbf8e981a852b554d45022c61a5fba7c8c7a51dd0b6462d92fe732d795596c4c77f81f866a11a411e944f3f7ca0138 SHA512 d38fc03c084a8b941c8d6b6b2a8a5d07b2f092b416afc93b392c73c85eae14dd48485b223d61a14ac359c3526daf71bfe512d1080624b3d32f0562160a6a1ae3
 EBUILD classmate-1.1.0.ebuild 1221 BLAKE2B 4bc5b7d808f7068564b8b7cb7a641d7c469634664b4845aa9b9d63c1032ecefce973d6038facbbce4f8d7e4f33a22935ef88c2d29cf8d03d3ec0b8b42ac962c9 SHA512 1117e04a48578ab393ffa9222ea2bff023986e566c7fe12ee37ec0e502e7836d867cf512ab56a5236c95347de66cc03a46785b9ca1bd1e8822f668afeb3e2fd5
+EBUILD classmate-1.2.0.ebuild 1116 BLAKE2B 25424340aa51ee12ea829a0c53e730eac4c7efe3ce275fde5b89f0d784c869b3c7d98cf66c9f5d53310ac232b5e7d9db54cc57a4a4bf7f9f5b2d031fa98ea23f SHA512 3e3ef8cc197635ea6e0e271bfc632def2a893b38d1549f0f2248c279880fb92b232b0a3e496e0534a7ebb6460fa3ba8c0ec57eae0f829fe3b1c216ef07d84982
 MISC metadata.xml 328 BLAKE2B b3f4d20d37178f91bc06a2b989603370c97231531d8221d2aed030b538e9b0a93e4ae1e906b5a2b56b6877ec175abe04e4bf7b5ef9768bbb17c88879d0721184 SHA512 ed87fc70d548ed88634183da0afb2548e74bbf5f7435edfa25e71392438df87cc1e18aa90264519009f445810ccd750626460dccb66e0f68ac844c44ba8d9430
diff --git a/dev-java/classmate/classmate-1.2.0.ebuild b/dev-java/classmate/classmate-1.2.0.ebuild
new file mode 100644
index 000000000000..5b084f9f2a6c
--- /dev/null
+++ b/dev-java/classmate/classmate-1.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
+HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
+SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/java-${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+	rm -v pom.xml \
+		src/test/java/com/fasterxml/classmate/AnnotationsTest.java || die
+}
+
+src_test() {
+	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
+
+	mkdir target/tests || die
+	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
+
+	tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index 29816a8283d3..f3df38aa906b 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -2,6 +2,8 @@ AUX commons-math-2.1-r2-buildfixes.patch 770 BLAKE2B 99782f38b6efdfa94b0b69390bc
 AUX commons-math-3.2-build.xml 12448 BLAKE2B 04021b793945a00a95152ef98772dfb5735cce14307d33772701a6240a8d5a094b2156faf4fc775454c0c369df066f9404a0d5a5671f809647ae1e5389648ec4 SHA512 7f7d4a469843b218e90e3482360101058f027cf7d2319f1f7a5a4af7c09b6e4b05237c594eb217d5ffc3f07793fcabaa733be52686148af94a12727e4fda89ed
 DIST commons-math-2.1-src.tar.gz 1099423 BLAKE2B 83c52abc10eebb6c749aec218aa435df4cd05106e6bcbead5061df7381d168aa9392ab70dce8eb0b8e254d6d95a372cacddc8f7714198a186a95a04a394bda9d SHA512 53ed8c0400402c588d824c15365ebe60bef41697ff9728270a9fdc3ac30eb60c4c397caf939ccda839eb701453d98af4eac9eae2090575fcfdee4df2d6f6045b
 DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774329c7c2605aeea3e13769eed9f1578d412555ad90a8de68971daa42b270d4bcd5fbf0fe79714e839d41b08077e32633125 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b
+DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
 EBUILD commons-math-2.1-r2.ebuild 903 BLAKE2B 2b390b4109fd875bc79f957b2fc22a0e3ce1536476ed331bd57e32d1e90417200002f14045cd7af145f0a1a172e23773531682ac427f0a20e905cb10b8ae305f SHA512 aacd02d27d30d7f27c5bb35cad318b21a4235b0264282527244d892f509e3e0032eaf5407bfbab9b6c4f548c7e9efcbe68629bf0502899c1e9c6d32fb8ad9a4e
 EBUILD commons-math-3.2.ebuild 1315 BLAKE2B a0fe207cc34dae87b52df7709e27f9fc4588e591347d507f8b69cf46ded1eb0b2d23943a93af9997ab215146873fd60479628c80fbcc72dcf8cd1d3c5dc1b72f SHA512 a1f5e7f79e7b36e011a16ed87de7aecf5a9cf8ae8570cdc5fff90a79505bde6120c475df96e188129daec1c436d0409e1260136849c36edafef29e9a70389329
+EBUILD commons-math-3.6.1.ebuild 693 BLAKE2B da9523bb624ece2699913f23672a5374ec63ef447252fdbc27e67efedfb3c402d7679b55cabfc883000e758f8845e16128ab503dc3eb1b5e76be9fb72e858d65 SHA512 7e927986aa818cd297864fb3ceef5f23a75befa6001b924df7256448c2f021888bd13f406ef31339ff8dc4eb89954ee5807ebdb1a4fe0ae763c18fa9d90e5bd0
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-3.6.1.ebuild b/dev-java/commons-math/commons-math-3.6.1.ebuild
new file mode 100644
index 000000000000..5578f6ffa3a0
--- /dev/null
+++ b/dev-java/commons-math/commons-math-3.6.1.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+MY_PN="${PN}3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
+HOMEPAGE="https://commons.apache.org/math/"
+SRC_URI="https://repo1.maven.org/maven2/org/apache/commons/${MY_PN}/${PV}/${MY_P}-sources.jar
+-> ${MY_P}.jar"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 2000ec20a9d8..0de387995e64 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,4 +1,6 @@
 AUX commons-net-3.2-build.xml 12390 BLAKE2B 849ddf4c6525fdb7e7d8a753c5c0e854471c7f6b257bdc506d89be0dd81bc5c02f69c75e23051e283e74a2e66ac07c77a3432899e3de4e30dc93566a85eed554 SHA512 e4784b083ce86b5a22d5bfba0b0d71d811abf55f8375b9982f5ac1b11bb93f4be15ec0ff4bcb8cac58681a68a03cd6b598c998251097e9bf634674712887bdbe
 DIST commons-net-3.2-src.tar.gz 378351 BLAKE2B f40ad73ef7d9865cdbe9da94a458f0c9ce636b0b71dcab3b48b52716aa141de3215581b75b9283d4d918ad0dbbd2761c9b0d9eee1703a2bbc545718c129511d5 SHA512 2152b0c524320702c336b21308bb8166e00487938430b83e08d65b836ab775c372c9251957c674e0bccff6815fc3ed3bdb7113a0d2a140c53f64c2f557eef2ba
+DIST commons-net-3.6.jar 435798 BLAKE2B a8c28909715d76469ad4760ece6f7b3515c56badf8ce19fcadb5b776e0cf341b3f970689a22267d19f22dc12fc8d5e2a071347df1850f290231747d0712263b7 SHA512 50006ebef259c9d4f514bfd4e6b4578f8867e2a105edfcf30542a039e385a02e9c48dfeee0b287c39c375e1418817290713f7d0792b357267723a977a07062c5
 EBUILD commons-net-3.2.ebuild 1260 BLAKE2B c78c4c247038135b24d70b60d660b5d5bf98df859894e574f149f86ca9dafaaee81439ac394fff5143c732c18e8ca1103200105c135792dc1a0676926e049410 SHA512 f5cae63603d9fc2423431c21913b584103bf1d15a67c744a7012b9b0fc7ae303e51ebdcec162c260f005a58fe1a52a4a9215e801d3944c051f40e8788240de51
+EBUILD commons-net-3.6.ebuild 653 BLAKE2B 5a213d1165cec70de88d22f101ddf30d2486885e6cda3d40fcc670e1ffec7a4cafbe80cffb7b33a8474c96fcd4e27d3b93291badc8b18e9ba4436b7105ee5c3d SHA512 9380e5630043664be8d9db21825d005cc860d85b29e06f7068c9a9ba7840162012fe53da3184c92369ff79e6f28b634592a41cb4a839d7de7b8f5547db0f87aa
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-net/commons-net-3.6.ebuild b/dev-java/commons-net/commons-net-3.6.ebuild
new file mode 100644
index 000000000000..f102092a49c8
--- /dev/null
+++ b/dev-java/commons-net/commons-net-3.6.ebuild
@@ -0,0 +1,21 @@
+# 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
+
+MY_P="${P}-sources"
+
+DESCRIPTION="Client-oriented Java library to implement many Internet protocols"
+HOMEPAGE="https://commons.apache.org/net/"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 3ea7430c16ea..4dcc776e92b1 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,32 +1,32 @@
 AUX icedtea-bin.env.sh 1062 BLAKE2B fd3b099ba1cd2d4f817852ad6d5f6ee5690f4c4edf481ecb0e3b6a7ce7893d983405801ac997e7df53048a64c5c8c48b5370710a897aa68a086ec79d316d0026 SHA512 7d85767b6bc1d5761d2dfcdd560199f735bd2514bd1fe78d0a11af4f491c87b89cedb063d72e3170ced9cb01ebb5c40004f23e7b97b0c7e77a4d68c051a62b12
-DIST icedtea-bin-core-3.7.0-amd64.tar.xz 61959572 BLAKE2B f8241b980ac4f8296af0aa58700d23607829c99e0fae7961008d928caaff955e14ab32c4b65305da60c17014ed7dabfd3a4406900ce999354cfbb8991127509c SHA512 680ffb17bec2f8534ce08f6158dd912413fb0ee8afe2186a8a259dfbabee99a7fda8b1b6bd68a8520946f18a482cd370f7ac2a139a34b9409d45bc19dcebacf7
-DIST icedtea-bin-core-3.7.0-arm.tar.xz 58035752 BLAKE2B a745e93a8a794845b25cd08ad1078ddaad6bc5f339dd2123b1c012feaa4aa0f4b6ae170c8691bb2e35052ee7048e33d8076e4532c8796f2813b4f06140ce9058 SHA512 b54ed397da26d9178368e7cb3efff4d43c90b76f3a110bfc29d98493567801d5da3fa7063ca82288bfbc80d9680385ddea8e12fa2d581cbe4ffc5a3b6e4fbb2d
-DIST icedtea-bin-core-3.7.0-arm64.tar.xz 59140980 BLAKE2B 5615ba4c7ff2af6890a2d82a9a58bc896129d4fce362b5fadaaeb4e82203b346c0af6c89191bce3283f8f89f7c00ac728cc9e511d4893d59d48a0ae5efd4da22 SHA512 2d79ab55da14087c51ce997b3bd62b37cc769f1b2a3ead821fed574a3ff3012f0c2c07d2e9f92b385b10478c35def75d2da1226d5874c632dad8711b97e7c8c8
-DIST icedtea-bin-core-3.7.0-ppc64.tar.xz 54288800 BLAKE2B 4858529c37e05158c481f634796202a9cfeb3dcdf0c11dfe3b84d63d238790c714f0f4aaaf37a54d7d13ddbdab7d7a7083d73f9ea684508145ba0c6a725ce346 SHA512 b6411ef98525bd90c42c017b91a2acc3e4a94e9965391b7432b60d24d980667cdda27f527d0dfeb2d60285c3d34b2aaa4e7485b4b8f07e8e47b07bbbf5fd9b94
-DIST icedtea-bin-core-3.7.0-ppc64le.tar.xz 54323992 BLAKE2B eb03570034b7d271974c50c5649891522b89c3bb82437f7feeab12a228685f2d93e827493df7f72235cffa253e6c83ca9c9ae2bd16204987f3b67af452307cff SHA512 593c0947252bc5290684f8056a20ba7ebbe9517e0c118009446df43da15a6e18a1e4593675242bc001edab078e3a914a610a86559e4d7ea20b6d2349cf3977c1
-DIST icedtea-bin-core-3.7.0-x86.tar.xz 61466288 BLAKE2B d63b381f9ad6f1724f9fe549550252b8d298b8c5cbb1351ee13c7ecf9c052fdc1ce0a4d4eac27b9a4a5700bc1734f3d3f985deec0f97f97c473911ac749dabeb SHA512 cbec66498b016daae78a8ed7e8646a844538c0b7d87615aa71dead9539164799991cf8c11f51de8ae438045b2f8ae8a9c99b79c7b0d04e09d97d208d6d544b35
 DIST icedtea-bin-core-3.8.0-amd64.tar.xz 61957580 BLAKE2B 8648338daf7152a0c0317e33fa1433dd44b9e3f712e49ec4e9af907f94063e6c193effd350265ab9b89ab19d3411ac523693d381c0cd7f604f45c241d1843820 SHA512 856a9d2da9b4b1f9400742d17f6f4c0cb43e37c738c5ea8feba763554b8a4ef2f529f59e81fc6919318df7cf7fb1d94a8a682220fcd82b4d723376031b8575ee
 DIST icedtea-bin-core-3.8.0-arm.tar.xz 58006344 BLAKE2B 6792056b8ebe82976dbd288cbf2906b00124aef4958ad2e073d57c746d6fee3e0181c61381744bdeb34daf54524ddebae692e01a52f3a5cb88fc34e1156bc9c1 SHA512 e2025746421ae197f0ecf0702890f3a8be62ac7bd7cf08b35250a88ccf7fa37ab52bfa0c6c09d8801f6c8d4282677f957ccbcf54c7f501b441b196dba7eb9f9c
 DIST icedtea-bin-core-3.8.0-arm64.tar.xz 59142392 BLAKE2B aa653348bb9d76ecccf27c76daac5f25e8bb58e95a0aaca05c233fbdec42f9c0f285cef1397a99cc5f15f154c8d2fcb9c9e36867da369a984692abeba57b711d SHA512 fc6531dec845e8a0dbe2ffafc0f01093ac5ed861b4321825e04f9a72892c0eeebbe5ff36186ef6ad098aed0d6fe79a5324c55e709362cb5f44bdc7d5666a19be
 DIST icedtea-bin-core-3.8.0-ppc64.tar.xz 54282712 BLAKE2B 78f9f9fbbcdb5f36a970497eed6ea77ed142d32beec74caea489ee7105e08151878a622fef5ea66b521103dc5b561203c4bf3fe7ab2b80ac304b5d4bd2d1d84d SHA512 d354b2eeb591dc73c9547a56f1421b034c7789cfb44a7f6b717ebce39113b319b3c3afbc7367e14c86b42a52e2c27fb69a016657581ab7f3586b6a7cc62b0137
 DIST icedtea-bin-core-3.8.0-ppc64le.tar.xz 54314152 BLAKE2B 4a7988672a1bced1bc10c8ca7d6299e27aac624af6f6d1335c1a4722508aadb408e3f210de82491f3acc2873868d7f04bb26840161c56741ffd16c6c43e84430 SHA512 1382711e50f90ab1943c98214fdfdb971129eeb6ebdd710ecc8bf777487ce85aaee0e5c8dd17ac403e00f20a8829c1f1afcdf648794a08da6be9b0500d959815
 DIST icedtea-bin-core-3.8.0-x86.tar.xz 61435788 BLAKE2B 5b4da8a54354287994d249ab2b3d2011ccfc987675e1899789f2a09b709e54fbf586b76a98839acad88b81fdef624b58e3821fbd416ea8bcf710293619ef9941 SHA512 623fc1b1f125b241642219e3060396395a6d802c73b440689c984ea259a1a0bad7b8ae04a300058f0a2815abb590e2b77bcaf3b4cddf2a9ed37a0789b87f25ba
-DIST icedtea-bin-doc-3.7.0.tar.xz 11682076 BLAKE2B 6c4629cfee975532aae9692061037662761ff4a0e3d13e72e167edfa90c81894894b48e97ad0077b38ba9e7081e21d157969f471988150a11f11a0b1ca6bf073 SHA512 e9c9ffe923fd6d6cd2dbb1bed402cba282baf17791c87b6fe12907fb4da3e401f4d101a06e1e6614d1d75d5b49a3e7cc60912a67af4dc25a4351d38c5c8ed391
+DIST icedtea-bin-core-3.9.0-amd64.tar.xz 61995800 BLAKE2B dbef63538ae68e5e9d2e664fdbb8d1422d9d5a32c9dbb6bf77fbc0b3602eb9de3a8ae830df480bf3e91cc89d9a3593f2892cd3001eba782512e8e5ab9f8b58ca SHA512 349f7ab0dbe11614bc659f9a3a5cf75b7b1d1765cbf9f651684365cfc5fd7f608312b25362fb086521a077610cb88b19d33af4fce10e69dbeb29d8f4a23bad61
+DIST icedtea-bin-core-3.9.0-arm.tar.xz 58032620 BLAKE2B 1646096d659a702b5ddb08c2c1d56f2eb53d91d08902045973b177b640d0bc7abb51343e81594fee669506a4710b5ca012af11ef4c4490d27e1fa2a7cf52a3e4 SHA512 f362170bd60e0a6ecce0f712aaa00effe9d52d082e4ae524f88e4ec91c02908108a0b8496cc21787f94605c265212c7fe7da164959d0432cb927d274f79ec56b
+DIST icedtea-bin-core-3.9.0-arm64.tar.xz 59190292 BLAKE2B 8778d668e96a660b73371e4d67bd3c8121b981efea1d3c900c8d38b6be3bd3de65e79e87deeaa88b86be2ce766750471e332e0fbad08fb669b803eba3c367903 SHA512 577bb5bca4c9b9bc9ae14ba50fde73c89d37515e7287ff611d297394aecc2dfd69f4d2ca347ba5d833c41584cd4b644060f21ac5b6c3c11bf710037176065314
+DIST icedtea-bin-core-3.9.0-ppc64.tar.xz 54302616 BLAKE2B 6a354a96bdfd3d6398832e0840f88c50981a1ca304f076c599603f98d3f61b32192f03b5a9830966e3a683af63415c56769977202cda6a618bc6953922f94f89 SHA512 534d1c7d7e64b69cd6352b62c46da005df0855bb5a8d01657462a9202d1149f3e9d3e89b8fe499b53f3f7faff976b6fb665e200bc05ee7ac17c981096c7ba584
+DIST icedtea-bin-core-3.9.0-ppc64le.tar.xz 54336300 BLAKE2B 2cee58d745faee8dab0ad8b064b51d60552995d33407f40e50794a17f7d993b74fbd340db3aac520642e11a926a89554e9d686cd425b05bed4194eb1bc957e5f SHA512 6d680a987dddff0d569417c3d33d8c8b73bf2aeb454906047226be3ff7277ffc62d272c0dcd6c2bc9ee3724eacf77074ef9e931f980232ffb356e9e919f2247b
+DIST icedtea-bin-core-3.9.0-r1-x86.tar.xz 61523320 BLAKE2B c5c1415faefaf1199937158d953bdced763c1cb739cb521b5439d37dbe66d659546940154a4139c3a8b7ef13c822da877a335c7e09299c097ed97c22eb65c50d SHA512 8239e56248923d67174a7729cf0821862b8b349edfee46ffb92d25121b1b8bb7b5aac7e67b8cbb35ca97c480ed9292ae9a5eb14cfa03142de2fa77f93a1e4f81
 DIST icedtea-bin-doc-3.8.0.tar.xz 11683136 BLAKE2B 37fd84b58f6d6934b4775b23c3cfd47dbf275083719361ef74d55dcd2385f822b8cd0257e76cf4a194cc6d555c579a8373b39f72f4a8e80b8511acb5a0b2b537 SHA512 aee063874fa2de7cc7848deb511b1373df14ecb530eb00887920ca82b9af80763616ac4df641cd0debbf08011f71b20e8b250384e9d142387139e7698dece53a
-DIST icedtea-bin-examples-3.7.0-amd64.tar.xz 1856720 BLAKE2B d5e4497f946b48cd5e5a85c770674df5a9976d95fa4a5a562b53b0073ec51d4be3d6a9ca7145b3f79a31f89a3400493efe8c6cf425359d259c78dfa4f384bd6a SHA512 1155b8bf339b04e33ce986f0eb3fd9736e11d55ff2c3f7e515c74e83fe9cdc52e28a156f81b9f76efa769312fdb5a4080725ba7ef3e321e76caf6c911e8b7cd2
-DIST icedtea-bin-examples-3.7.0-arm.tar.xz 1840032 BLAKE2B 3f9ed953df3ea7d47dc43855256cf54c834d4b1ad4cc20114c2ba9cbf02f3cfcc1603da7e17325414368d7acddb717b116433efa52d987aabd5ae2dd8d1d21c5 SHA512 ff21951c7d81819c86366d4b6b450a14de6f45ab7916ae1061a9e7ef631f466df30434ed1f44bf007b7ae6693899e653e36e95c1e9f615e67f66bd4607dc62b3
-DIST icedtea-bin-examples-3.7.0-arm64.tar.xz 1838264 BLAKE2B 00c55e5af20654e3225622e7ccf55fb844870ee7e77683d9bb4b37181aab3ac119d5e7b4418bb0e50ebc87c3eb6ec9f37f745bfc5f0073ce33b8991e2ab20d68 SHA512 deeabd2bfc87eeb7d1f94b73501ec54f3c54a29fb9a857dca5cbe37fde49a63ec81049b62840eb6a36f6313ccffcad0910bd5d75e8de31ebabd59a129d613558
-DIST icedtea-bin-examples-3.7.0-ppc64.tar.xz 1847956 BLAKE2B 25ee12262da772e6fbecb57f67644981603919ce4711319bdcb771f6208109b6ef23ee0b6c5595a9490d1eb8f556303a023caa9d92d4d1059aa4c486f264ea14 SHA512 9f1dd454b3473efb5b32eec1abb5babe0d1fb16baaaa7daf197770add5bb230575b4de5c52b15c0eae65cbda8341a7f5fbb2f4092752e1dfc135cb2eaa77fa43
-DIST icedtea-bin-examples-3.7.0-ppc64le.tar.xz 1845292 BLAKE2B 1e8cdf15a1e4bc641b707f8df0432da83d874e74b41cac81445c3cc32d239d0e1370165ec847dcf4fbea8023fd44980b4b426459b4b4f69d850cd21aacd919da SHA512 a1c71085e8a9053ff8cf0c3c10c901657079a3df631994ce4c621ba25b9e89f211372fcb95c9b0dc1828fe4fa76ee2c0a33716da1b7c0a4af491fd418b799df4
-DIST icedtea-bin-examples-3.7.0-x86.tar.xz 1862536 BLAKE2B 7b033ad8e12cd4bb899acc40803bba9fcad1b5b6761cef65bdbb02b578478e09c64fda815cb4c518608d2a8120683a7d932341cd6d971adf381beb9cea7cbee3 SHA512 b3eb96ce677ee525ff5447e7ec0391e2bf5d79f451c71a3d78923c66664e8fa08008a4a3a90af2ae4c7a65787b86cb2f5a3689393d3548f2e9b229157313e887
+DIST icedtea-bin-doc-3.9.0.tar.xz 11685100 BLAKE2B 3c0301193e295b1441f657247263994deaf84c3c534b110db9a7e4fd3e6fe73d2499a2661dbed4f9d2751634c0b99242963b92a0cbea3fa846230d7dbfce1604 SHA512 d5190f0c341181321aab1a0113368cd138550a12d6be684568e45899df509b3e9ea95abd72c1505c298d6a14977ca2fcb07e85e6ab4d2d554959af35f993cb8f
 DIST icedtea-bin-examples-3.8.0-amd64.tar.xz 1856688 BLAKE2B c6ab09ae55a2c1ae42485acffa72ed7a16a5a19e5ee105f2e4e856c7929ac9758a5ff04873a5e3114f4fcb84184a85d30503904eeb21c34010b72b23b2b9f98d SHA512 de48a06fc39393e5967cf83565ce42845ce864104038a2094555cee4331ce1dbe1cc7e56668b773581a9f2e8bbd11c23dc77d922d20e0d80251ced09edd509be
 DIST icedtea-bin-examples-3.8.0-arm.tar.xz 1840028 BLAKE2B 9b4023252d5a862d2d769764cffe702ce6fe24c3870554b3c15cf0726435bb079f3c5bd53adcf851aee5af1f3ce9cc9c0d0b5ca53e8902935f88a2a423429a53 SHA512 70b5134bcbf41ace25967a1a75c6d8b55c9bb0f1c72bc4ef3bdb45a18356340b828d0666b1581ab4c2605244256db9acea9a229e53c5bc53e016a32057eb27c1
 DIST icedtea-bin-examples-3.8.0-arm64.tar.xz 1838420 BLAKE2B 6be665c5ee12ab6063fa01f13e4d5cdd957f844a498b6267a585c5f84faaff378661e012b6ef37ffc8e1fd81d14962413308a1717314d0928ae351d6c5de58c2 SHA512 30c32731ba7744d8dd1ea8b09c1540fded244f4fd641b29db441069510ed5691a2937a38821e821f47f73724e1ae3714dc5f9bab766daf1547b1a39ad5a346f1
 DIST icedtea-bin-examples-3.8.0-ppc64.tar.xz 1848128 BLAKE2B 2326df5f72f0c597b547afa06c2b73117b12d2eb96ef190a39c23a3b16e6b792487a077d4f07b00f6cfd446bff6069cc33bdb0635af8503b1ce9e38d5bd4c001 SHA512 266c7def17c119cf1b1f18729a8160a819a578868d73d175a18d486d924a355162a0c74858eb7bb21c75974ab6bc16e9de83d27d519bdc2ebefc9cba88ee669a
 DIST icedtea-bin-examples-3.8.0-ppc64le.tar.xz 1845000 BLAKE2B 1a08259383e40c7759af27b653835c5ece49721b9f12b21b24ec29e9f43d276d4fab616db7270ad9e290f49a08fbb5cf3a8b157bd56391ff1b209507e33df1be SHA512 51d7ac3901126a075825627e48f306b14157abcab82bd0c9989c443892c4fd7743fd37efa9cf6decc5465a1a682e7a0f710713991970a8b99d76619e36fb30dd
 DIST icedtea-bin-examples-3.8.0-x86.tar.xz 1862620 BLAKE2B d7ec2c538708620ce6dac1e09a91054a16e34400a2cd96266044c919d98a6433581089fe2f4d7e79c8253e258a19d4f32c45b10abd204baa43067eb3259e9388 SHA512 e7c6cc7f98f345987e1c003c479d65546deb086c8c281e99e475c448a470423789058575ff366a5b4819fac9115fbf648de686ac393450989e6dee75fd01fc9b
-DIST icedtea-bin-src-3.7.0.tar.xz 45735652 BLAKE2B c972f209e42df27137da8c03bb8555ec5831d49915c7b139578ff5e60efce9a1dbf390682604302d21bbd91f8e41da5079106ca0b016e2211453c5067e3de172 SHA512 67377e2dba3226146f220d7b923ad2a693949241d0c40dfcbceb47f691a6ce4fdedb28cbab3f4f5976029021b918cec49a7e61b373385a4b0514e10761fd3254
+DIST icedtea-bin-examples-3.9.0-amd64.tar.xz 1856872 BLAKE2B e5e4e20e289fc59c04c1987312e14baf94151b0e58ffc26d0c9c231c44459a34f9e2b0d464ecf30e177f52f140700ba23a30d6631436d838c86591783e978b57 SHA512 bf655e4eafe8e757a240c16eb85ee25a0404917d48829a0d4c0c6fa21771b1ee82ea4c3aa3123f21574abcc8455bfff62e0a5b254a9828f874c51285a685d380
+DIST icedtea-bin-examples-3.9.0-arm.tar.xz 1840572 BLAKE2B f3a5e470b4bcbc731066068690230e854cc6950ecd6c22cffcebd6afc6e18e0979bcbde272d97135b3bc2a3e1fdc5a43fd3d40efba3f770a53b1d9e524e14702 SHA512 db560fb4e2542c2aaac4d134030aba058c6591008cbac9b5ce45cd6f7a115fff4a97270e9825bcec17e66f723f0f6614095006cce791c326c44d75ebf42470cb
+DIST icedtea-bin-examples-3.9.0-arm64.tar.xz 1837768 BLAKE2B 96d870c5a823c5b8accbe540548ad29f648466a094a0bef2351770758c6f7481b359c6d64c4229e61a168c0514375174634a0fa5c74e63351e50de4b2b87078b SHA512 28a00121176df9ed71d8a65eea1c7592669e201b1b2f57bad4d219c64d14fc891766a7f33e9c4a7f6d28dadab9ff7f174612936cfc20ffa2802d4b477c3b11c1
+DIST icedtea-bin-examples-3.9.0-ppc64.tar.xz 1847612 BLAKE2B f14e5e4c2b28b19b9e05a98e98c930dfacf3afaac3bd7e791d3de51ad276316506f370e35e73b1f6cefc14b1215da2a6a51d2cba5f94cbcf76233a3fa51fe23f SHA512 334b5db34987eb0c2e17c2570bda2fc45de8c445ba226137a9dbf768d1627175c3621a29408e9f31fb40c0aa1b3801f3e050bc6bfc81e87a43da9fcc64d9cdad
+DIST icedtea-bin-examples-3.9.0-ppc64le.tar.xz 1845088 BLAKE2B 95f98bf4d76241ebaa3966675a78f871b388de7aa5e3d672b804fcc010e7506c961ea8a0c46e4e3a966007198a95144aa7f1d1abb0fd3fe1da610e4f99ffe49b SHA512 4be2961f5b042d0edacc944243c3cdb66ebb71919247a38f3e992e792c3a5c85a72a8b0fa87d614b21b6f93e5e96062be145666e9b5e9ace7982ec2976d9ca31
+DIST icedtea-bin-examples-3.9.0-r1-x86.tar.xz 1862632 BLAKE2B ac63c7f38ec35dd63b01e5f9472a1f226fd3eac7f5e5f8a55e5d211b20344b86ad2d55cbe8f67acfe80a30bbddc72f8de091ae6d3b7df454bbe43c42ec957726 SHA512 d5b377e015550f14996deb040ce753fa4f88eb1fc0ed76babee6e187feff61c8947c54c4f876d25e5fc6344b1411c4c93b75d362206f966e69b205a14d18380c
 DIST icedtea-bin-src-3.8.0.tar.xz 45741844 BLAKE2B b06e21b2d243a4be4e8328e7551285df9e71697b04b74a98a10293cbc8ee13bb570183e3c15511434e0b21a9052fbf945da8872c5db40fe28564794557f2d67e SHA512 527bbcec8d1c6a638e0861fb8041c94eda4d5d51ecc5a6ecaa615db155ba8cb1563e5009c4031c6b161328ff75654f2b46b09b08279260745288c5876336bd3e
-EBUILD icedtea-bin-3.7.0.ebuild 4356 BLAKE2B bd289cf7f42575d459a230abd0a0222815eb3ae18c79ebb665243840ef0ab6a7bfefbb667fe74da5168d6bad4fb638b16faf30691bc15c73a9d086e1f6096741 SHA512 04ec5586aa23ed5158be531b05dd9b13a9aeb8e057362582c977b8fa90648399d31aa484bf51e29aa7ecd8d16b124e60ebfc37f2f265f9ee2835a45dfa0095c8
+DIST icedtea-bin-src-3.9.0.tar.xz 45749212 BLAKE2B 2b66ddd1639e84c637775321648d24e6161c292f54af40d6ce1dbd07e9bbcbb177d5895548ea82a6168b35811d48807e58292533846091f13745f13408ee055e SHA512 05b4df389d84f7be144bc99c10cf544183db77b4a7c141826079edb445b5af333440a5bf0ac627133043e276334993969be22caca2db9edd6249560a4db031e2
 EBUILD icedtea-bin-3.8.0.ebuild 4357 BLAKE2B 333332b4a0d14ccac77464bdf5454ecd74471d8aa5dbf0f78f21a2015c6a8d59ed1dc0e2e29ffff69788af8f49f819bed8bede71507e98b86cc3ec306f26411e SHA512 8d2c6e326dc72070d7a8be2d567fc0fe274e57673e16842cb2e9b3ad4304a46d92d3810cb841e90f35a16c0cdb178eea13f865923216038bfcab70263f15f10c
+EBUILD icedtea-bin-3.9.0-r1.ebuild 4385 BLAKE2B 0c8570ad329da2c8655f520229ca1be1b801256b576e09270073a8bbfdb1f6ea7e837a3d4cd1612602731c2af7f8855706a55679bff24559711f57b76813c5d4 SHA512 24bc509dc03d592f206cd27dbcc82b6ab394e7db12f0e080ec2abb2f6b4b83cec93e2a3dc118303e3d970b0b39802894385410b67661ce3c5f70fe82776143b5
 MISC metadata.xml 448 BLAKE2B 5bc2cad0b1033c4e9eabfa2f651599c869f5c37f65b391885258063c7f2edcb0dbf6789e60de11302f87765fabf29a7453eb8ee61223c5d9a07a8e5efbd9a9e0 SHA512 4b2db8049d7a61cb4abeab6f602c585ca0841f0943411e14a991ed9d130e3a99997ee0c1c0383f9dc6a5c989292f8be659c70b6162271bc7cf9f6fa5a114d4ba
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.7.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.7.0.ebuild
deleted file mode 100644
index a196cca5d69e..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-3.7.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Don't block arm. See bug #600134.
-#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm ~arm64 ppc64 x86"
-
-inherit java-vm-2 multilib-build toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz )
-		)"
-}
-
-BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
-	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
-	big-endian? ( $(abi_uri ppc64) )
-	!big-endian? ( $(abi_uri ppc64le ppc64) )
-	$(abi_uri amd64)
-	$(abi_uri arm)
-	$(abi_uri arm64)
-	$(abi_uri x86)"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
-
-IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.42:2%
-	>=media-libs/fontconfig-2.11:1.0%
-	>=media-libs/freetype-2.5.5:2%
-	>=media-libs/lcms-2.6:2%
-	>=sys-libs/zlib-1.2.8-r1%
-	virtual/jpeg:62%
-	alsa? ( >=media-libs/alsa-lib-1.0% )
-	cups? ( >=net-print/cups-2.0% )
-	gtk? (
-		>=dev-libs/atk-2.16.0%
-		>=x11-libs/cairo-1.14.2%
-		x11-libs/gdk-pixbuf:2%
-		>=x11-libs/gtk+-2.24:2%
-		>=x11-libs/pango-1.36%
-	)
-	!headless-awt? (
-		media-libs/giflib:0/7%
-		=media-libs/libpng-1.6*%
-		>=x11-libs/libX11-1.6%
-		>=x11-libs/libXcomposite-0.4%
-		>=x11-libs/libXext-1.3%
-		>=x11-libs/libXi-1.7%
-		>=x11-libs/libXrender-0.9.8%
-		>=x11-libs/libXtst-1.2%
-	)"
-
-RDEPEND=">=sys-devel/gcc-6.4.0[multilib?]
-	>=sys-libs/glibc-2.25[multilib?]
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-java )
-	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
-	!multilib? ( ${RDEPEND//%/} )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# I wouldn't normally use -f below but symlinks in the arm files
-	# make this fail otherwise and any other approach would be tedious.
-
-	if ! use alsa; then
-		rm -fv */jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-		   */{,jre/}bin/policytool */bin/appletviewer || die
-	fi
-}
-
-multilib_src_install() {
-	local dest="/opt/${P}-${ABI}"
-	dest="${dest/%-${DEFAULT_ABI}/}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	if multilib_is_native_abi; then
-		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-		use doc && dodoc -r ${P}/doc/html
-
-		# doins doesn't preserve executable bits.
-		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
-		if use examples; then
-			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
-		fi
-
-		if use source; then
-			cp ${P}/src.zip "${ddest}" || die
-		fi
-
-		# Use default VMHANDLE.
-		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	else
-		local x native=$(get_system_arch ${DEFAULT_ABI})
-
-		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
-			dodir "${dest}"${x%/*}
-			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
-		done
-
-		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
-			[[ ${x##*/} = ${native} ]] && continue
-			[[ -e "${ddest}"/${x#*/} ]] && continue
-			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
-		done
-
-		# Use ABI-suffixed VMHANDLE.
-		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	# Each invocation appends to the config.
-	java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
-	if use multilib; then
-		multilib_foreach_abi multilib_src_install
-	else
-		multilib_src_install
-	fi
-
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.9.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.9.0-r1.ebuild
new file mode 100644
index 000000000000..47acc0d18744
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.9.0-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't block arm. See bug #600134.
+#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-r1-x86.tar.xz ) ) )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri arm64)
+	$(abi_uri x86 x86 1)"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+
+IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.42:2%
+	>=media-libs/fontconfig-2.11:1.0%
+	>=media-libs/freetype-2.5.5:2%
+	>=media-libs/lcms-2.9:2%
+	>=sys-libs/zlib-1.2.8-r1%
+	virtual/jpeg:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	cups? ( >=net-print/cups-2.0% )
+	gtk? (
+		>=dev-libs/atk-2.16.0%
+		>=x11-libs/cairo-1.14.2%
+		x11-libs/gdk-pixbuf:2%
+		>=x11-libs/gtk+-2.24:2%
+		>=x11-libs/pango-1.36%
+	)
+	!headless-awt? (
+		media-libs/giflib:0/7%
+		=media-libs/libpng-1.6*%
+		>=x11-libs/libX11-1.6%
+		>=x11-libs/libXcomposite-0.4%
+		>=x11-libs/libXext-1.3%
+		>=x11-libs/libXi-1.7%
+		>=x11-libs/libXrender-0.9.8%
+		>=x11-libs/libXtst-1.2%
+	)"
+
+RDEPEND=">=sys-devel/gcc-6.4.0[multilib?]
+	>=sys-libs/glibc-2.26[multilib?]
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 2715aa383293..bfcd8c865c30 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,17 +1,17 @@
 AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
 AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a
-DIST icedtea-3.8-aarch32-bd08b7f27e11.tar.xz 6762428 BLAKE2B d5c6b97ad133faf21f16328e1a86fe22a1e3bdcba73d43728cceddb6341f529661202e5384f3a7bc9f0de4bac9af897b86f942cbfaa310a44b959b0be5b55fde SHA512 99715812bf7b71e2031e96e27b27745d6963ee9749886a61a982628b5d95b9491a7696cf733d06adedef75dbb8dabecf5ffb72531e6b19329121b0e4f1b08afb
-DIST icedtea-3.8-corba-75fd375dd38a.tar.xz 942152 BLAKE2B 86ca4a62d8dfe7b8fec3a90471b48e2d0711fe708654695ddddbbc400bf71f1f3a3926f28989940ff325c0e171989336082d271ab468a13e38dfd93d680437d5 SHA512 a41d53d2d6471b94878ba18caf525f1b64e72c2ae6926a9f1f5dac2e9a9366151d35156fb519cca8aeeda97d8e42cc258a93390170859b3035de4da69e48e321
-DIST icedtea-3.8-hotspot-cb5711bf53d9.tar.xz 6838240 BLAKE2B a2419e93d736458c7853800c0efbd8a5035b2baa2b239e4326bdf70c5b6f08d36a96ae53b29de978e493c40ccf146f2c2115a08413b1fbf25c51850eb83fc4c2 SHA512 8c4b060611b867c43fbe6cac3d2f06f6979950781872b387220e12c7066b3efde24160b7bd03189350a6518615b492703425c2ea67a26c6b4d187f843093a780
-DIST icedtea-3.8-jaxp-2b279bb3475b.tar.xz 2287836 BLAKE2B 3705c8137a29a706aefe3dbb32fb0042e81c50cddcc54c31448d2c6f2c5a27ab3ea7e7f03f82990c379b9f39368aaeb6d8ee8adb56ecbf21faddb35d1727be07 SHA512 3eb04788776612f0de0b058908417c4735e6b1cfb56afaf73748e1f3121b25d6eea710cd1d72ed19f8788c8e00b701265d79237da3542d0947c00d37b4308e9c
-DIST icedtea-3.8-jaxws-c54a27559acb.tar.xz 2270928 BLAKE2B 2c5adb94aabd276fb00840ef6b0dfd04a36d728c603c8281bdbcc3d13b393144fb2336d4da54085ab999ef6725b6f706d727645a36b77f4a1294177947b6059f SHA512 1431e71e2281eef893904e686c8d33587c4332ed7cfacd5fd2e278fe0a4e6f225e03d22b8ca73517b030e3e33ffba964f023bed9b9e4f4a6f14b8cced43ce0a5
-DIST icedtea-3.8-jdk-9c9ff65b03b6.tar.xz 39146448 BLAKE2B 1f9a4efcc5697ce73af9018d39c632cecbca6945c4065f089db027d1fa86b6c315ead93f3acd291615c68edc057b470abe1cd0316300f54113eada7789b3a5cd SHA512 9f6b6e42e8bea6a00c9833bd9775bfa5c63d1126e25fc376f4ba2cf5601dea8ab6a3f1d442d5fb188de3f74ce0a6410dc3a8463f798b1aa23822a272faa5aa73
-DIST icedtea-3.8-langtools-21524ad5b914.tar.xz 2070064 BLAKE2B 5a5dcc0e40e08330e29850d99810fe62fc233390347ebb21fe12f606ddc6e8b5fe2060fe181210626d1e2ddc92828779f8fc138bdfda90f7b66f88e75f80ea43 SHA512 fd57023505d69246593ed24d90ad7052a88362ef7106900eca59e61ad5cadc247215cc9e8d410f9150e33a72126247ce1bb809540985062515b3d31d77d1535e
-DIST icedtea-3.8-nashorn-bb3e3345d3ec.tar.xz 2317148 BLAKE2B 9d85532853dfde6fcbf406d52f29e3b8130e5435e38200a48aadb16b4aa8a9dfe70fe6f7f83c4bd170e25a61fbaf3a8499893ae247239594e004f1a4aa37e708 SHA512 7c6d51a6565fe8c670a59caf001b1c0821b7fb2e42b2bbe24b35e337df4fc664c87868e0c55dcaa168f9c3e973ab9e75bca93d660e242c07d0f21eff83d674b5
-DIST icedtea-3.8-openjdk-499b993b345a.tar.xz 335928 BLAKE2B bb49fd086851110e9beb993167f2cb9b217800086070a1ba04a6b96b9e130157a2d8420a056e2e71e98144cd94454aa4c3a568c038f1b282cbc06b25df49a54c SHA512 e438a7ab0eb4e4374278afdbd40cab66875c9704f80a8963f0c965ce995744bcf23814c734ffd10e95329c7b767337fff18e3478c3f03481f8e15a5a9bfc853f
-DIST icedtea-3.8-shenandoah-c44a9eef4985.tar.xz 6954776 BLAKE2B 348735f8a2ecd656c4d323dd870fa63d028757a57babe0f4ffa0977d0446f17cd80a6709147b98d6712e1b5d26719cfad1ea01536930dddcf7389947b43a7d7d SHA512 2e84c6b398f35e59d3819e5ce23dd573e76c385c47f9971d6b77def1cfc1b19a86288e3cdbd78aa6dcdab068128852f4a1c82cf13229a760b1f625095cd51514
-DIST icedtea-3.8.0.tar.xz 1496972 BLAKE2B 9a376539ca2c4c8560aeaaa2fbc65c61a90519b9c87e924e2d54ef150401676e90df0fb5143fd90e9e4c6d254db56617456a668bf886573854f299402af378d8 SHA512 6336d35c11dbe16c96bc07eaa760fd849a2cd317416aba72b0732f8f1e52c9e3fedde5398d4a7f5a3057d4b6ae229965d597b3f5df09a76b5f31bbad0ad02a9a
+DIST icedtea-3.9-aarch32-891d70e93fb0.tar.xz 6771692 BLAKE2B 915e3287b7a3f251e3f274e84c127e16c3145e550305d1f5dabae56367e3f118810fccd3be3c0f773f02556e9411812f30964bc38f6b44234f5e08b69c0362e3 SHA512 a15670f1c3593367aec89d40946115f6bc03bf4ba439cbcc0544293f46cbc5c0bbd4bb1b644fc00c29d8c82cdcabd00d993615b1852fabade097b433de0190fa
+DIST icedtea-3.9-corba-c120c4fb7b31.tar.xz 944220 BLAKE2B 545430b398f6f33591faaf436a294c11d6a1ae83ed2c4ca474407568c01709aad0ecb3f7fe2a8b84900f1257b627890439439e200322b7c7d1d410c8f25a39c6 SHA512 644203f6b951b8a6af1291f732c0c1fd5a060ba87e0e371e77e6d40c8e36a094799ce8b29cbf094dd9a53a91aaaeea38f63c7340c8adba162ceff7a2695863ff
+DIST icedtea-3.9-hotspot-d78088224b98.tar.xz 6851860 BLAKE2B 1006b9840e7e0a76fda362a47503ffdb689a0a2ed025696dd57cafc5a17167b21373b6c225d01c1d6ad8583e39d4eaac99157cea361daf193c9d992972764630 SHA512 e7e333695e5871a7ebf9d663d5c5a7d16a31e3eca33a7f974d7d6941598732bb8514cff8f0da8baffa2cff639d404f27aca23f450198e8a45262acc69d89f25f
+DIST icedtea-3.9-jaxp-55420c5cc9f3.tar.xz 2289624 BLAKE2B acdc7ec79393178b7d8a7f46605e8114858f2040e445e1c6388e9ebf21bd2367d21a65d3f1f041b316f45978fae970af1c7340679c9fefb8385a45e19564a98f SHA512 98792ceeea825c91c6642bab14f43dfa8c3aeffcf9091c1b5c9587d154c6613c24bfa9d83a362393baf1eb0a71e424baaca4302729d1a8a30c0eb17c3688b6be
+DIST icedtea-3.9-jaxws-f824de94c42e.tar.xz 2272684 BLAKE2B 150d3ced87a87096eee0d4aee40a9f055047d4af1cbfa71a77902599bcc3addc6808e99538bfec21337909a3cd4240e79ee8fa28bd946abdae0f8ba6a5b6ddfc SHA512 d97f86bc8775cf83b7931f2503fc2c824e4433be46587416b314f6fc114e5d1117071625344305eb99101576e4639c8b24afa8be9c57387c9dd12b376150e835
+DIST icedtea-3.9-jdk-7b289a33ab97.tar.xz 39194584 BLAKE2B d08416b2757847f4218412dd8854b3488c4040e782dc672d77bd556869a91d6a7c4f529c79b5d3f3c69dad9996869c3d94359514b572ede879a2b1afb2d44b01 SHA512 192093916f442cac6d7a756f831a71e13407b327bb772031a795cb4578d82215c7eb38623e26781064f049ec7532bfac09bacda1d5241aba41f675ec84aa6730
+DIST icedtea-3.9-langtools-8496472630c5.tar.xz 2071464 BLAKE2B 321bc7817d437b93ddec6e1f2167521acc1b54a33338937352c3f4c59d3fba4ea06d6fc4a67d58e14b47d7357f4bec11dd657b5731b42676ce04a62c9cd0ba96 SHA512 20f7a53701621a827f45f8ec18b3a186b4d8ec2e58c11283a253c54e1182878e6c9ca0b6004c9c487c701ead9533912b7fe0d66339cdc8a39dab12a6da909064
+DIST icedtea-3.9-nashorn-79a2c8e2babc.tar.xz 2314292 BLAKE2B 813a16728ca48c7cf9c414caab721f5ff46878d41bf05221d85c7da27dc3bdcc1c9ca4da5acde5b030fe04a466dca950fddf0f0771557bf73f7e868979365e15 SHA512 e149ee35efff265074e57351d5ba4870ec241516e4d73d23cf75a3420f07e666e610847c996f9c1f742586af49d23518776c4c60d8d1051a4e05b39be163ddd0
+DIST icedtea-3.9-openjdk-3b2d372838b9.tar.xz 338056 BLAKE2B 1118cf74d6728685b7d9dcbee8351f462ef7c19020e7596e38e4b3b080d6108966c0f280e866e8925c620292592dc39e627808cde15dea47a01a39bcd675493b SHA512 775930ee4806ddcf39d37ddf0f7fbacad1e1bb174cb2754a830bb1f7941a636e013ff5d844e431c4840c423480238fdb88a6c28d345e3c1326ec1dbb1c511c85
+DIST icedtea-3.9-shenandoah-b8b742251e42.tar.xz 6990872 BLAKE2B e3ac745923932de3e5c8e41f418234a698ad06e1d4a9256c8b9bc0b07157259afc5abafa12f015e3dc3fe117e08d469f600de74f18f68891240b6e5927bcd478 SHA512 399406402e6f7a268e5ec837b4f8d4cb0a775c177596a71a964d8a5bb2ac915fcff050a521e8342d036a1ff48e8902dc22d8c1439237073f5983fc38201d38f3
+DIST icedtea-3.9.0.tar.xz 1513688 BLAKE2B 1e983a844cc45397d2c2b238a2a788b49aeedf69e6b2c9ac8210cee135aeb06490363a7d59d047dededdde6f9f2dce4eae7d8c66605e9ba1989e6aa7f16e80aa SHA512 a35b600f7fa7ef19bf980e26e4cc22b57ad7daf363c91ffcf4ab1a52af48bfb316bb5dcba75d0d9966b799d25f71bae2d04fe89ae28103c82f7711ba1e346465
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.8.0.ebuild 13422 BLAKE2B 63fdd99ae1c59aa76e9725a42ce1c00438496e2e9287dd12f230296b1ec1bee43c9b882282cedd43762db9ad1e5642c12894379a55343a28dc12780b59ecf1e7 SHA512 fcb67c2743f3503b626cd4214f7232e9c9acfe3f088807d5cad4b9699298ea92e9036b518664cec4f9e12192ff60b848145386779b7e16fbd24cec89c19cd2f2
+EBUILD icedtea-3.9.0.ebuild 12854 BLAKE2B 306a3e8d407eabda27795c43c92011817c29952fdcdd7015e51054128aea8a48bbb0ca328ce2eec4057fe89ae6ec8103e622ddd5888885f36915a2ba3fcb45df SHA512 0bdb481a8c30d9acd81fb7df4892abec1338f318019f2fdadb30a2ca4bb2a53155661d3d1d798e052a1f0b8a127a6763fb32899be1a38d61d3d712cd156d4f1d
 MISC metadata.xml 2310 BLAKE2B eab8a40ebfc3b3f462fed14a7f21187aa0546e9b3925d8e08951c99ac8ebf846c184d37ed271f07d6bdde6379be92f7fa0244d7be8d0cec29a354c1ac75f69a2 SHA512 e4f1924775a63f058fbc5a385ade16a95115cee0b9ee3c4de05f2e904861e1c3de4f643c4c330da90879ed0a54eed7199b41def3193a494e0eb038ce820e673d
diff --git a/dev-java/icedtea/icedtea-3.8.0.ebuild b/dev-java/icedtea/icedtea-3.8.0.ebuild
deleted file mode 100644
index cca3e65acb12..000000000000
--- a/dev-java/icedtea/icedtea-3.8.0.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-EAPI="6"
-SLOT="8"
-
-inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
-
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="75fd375dd38a.tar.xz"
-JAXP_TARBALL="2b279bb3475b.tar.xz"
-JAXWS_TARBALL="c54a27559acb.tar.xz"
-JDK_TARBALL="9c9ff65b03b6.tar.xz"
-LANGTOOLS_TARBALL="21524ad5b914.tar.xz"
-OPENJDK_TARBALL="499b993b345a.tar.xz"
-NASHORN_TARBALL="bb3e3345d3ec.tar.xz"
-HOTSPOT_TARBALL="cb5711bf53d9.tar.xz"
-SHENANDOAH_TARBALL="c44a9eef4985.tar.xz"
-AARCH32_TARBALL="bd08b7f27e11.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="http://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +sunec +system-lcms test +webstart zero"
-
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite"
-X_DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-util/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	sunec? ( >=dev-libs/nss-3.16.1-r1 )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )"
-
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/icedtea-bin:8
-		dev-java/icedtea:8
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-# @FUNCTION: get_systemtap_arch
-# @DESCRIPTION:
-# Get arch name used in /usr/share/systemtap/tapset so we can
-# install OpenJDK tapsets.
-
-get_systemtap_arch() {
-	local abi=${1-${ABI}}
-
-	case ${abi} in
-		*_fbsd) get_systemtap_arch ${abi%_fbsd} ;;
-		amd64*) echo x86_64 ;;
-		ppc*) echo powerpc ;;
-		x86*) echo i386 ;;
-		*) echo ${abi} ;;
-	esac
-}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-8 icedtea-bin-8
-		icedtea-7 icedtea-bin-7"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-src_configure() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah can only be built on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-ccache \
-		--disable-downloading --disable-Werror --disable-tests \
-		--disable-systemtap-tests --enable-improved-font-rendering \
-		--enable-system-jpeg --enable-system-zlib \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		$(use_enable sunec) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-	local stapdest="/usr/share/systemtap/tapset/$(get_systemtap_arch)"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	# Link SystemTap tapsets into SystemTap installation directory
-	mkdir -p "${ED}/${stapdest}"
-	for tapsets in "${ddest}"/tapset/*.stp; do
-		tapname=$(basename ${tapsets})
-		destname=${tapname/./-${SLOT}.}
-		dosym "${dest}"/tapset/${tapname} ${stapdest}/${destname}
-	done
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	# From 3.4.0 onwards, the arm directory is a symlink to the aarch32
-	# directory. We need to clear the old directory for a clean upgrade.
-	if use arm; then
-		local dir
-		for dir in "${EROOT}usr/$(get_libdir)/icedtea${SLOT}"/{lib,jre/lib}/arm; do
-			if [[ -d ${dir} && ! -L ${dir} ]]; then
-				rm -r "${dir}" || die
-			fi
-		done
-	fi
-
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/icedtea-3.9.0.ebuild b/dev-java/icedtea/icedtea-3.9.0.ebuild
new file mode 100644
index 000000000000..ef84f38c763b
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.9.0.ebuild
@@ -0,0 +1,394 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+EAPI="6"
+SLOT="8"
+
+inherit check-reqs flag-o-matic gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
+
+ICEDTEA_VER=$(get_version_component_range 1-3)
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+
+CORBA_TARBALL="c120c4fb7b31.tar.xz"
+JAXP_TARBALL="55420c5cc9f3.tar.xz"
+JAXWS_TARBALL="f824de94c42e.tar.xz"
+JDK_TARBALL="7b289a33ab97.tar.xz"
+LANGTOOLS_TARBALL="8496472630c5.tar.xz"
+OPENJDK_TARBALL="3b2d372838b9.tar.xz"
+NASHORN_TARBALL="79a2c8e2babc.tar.xz"
+HOTSPOT_TARBALL="d78088224b98.tar.xz"
+SHENANDOAH_TARBALL="b8b742251e42.tar.xz"
+AARCH32_TARBALL="891d70e93fb0.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
+	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt
+	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
+	pulseaudio sctp selinux shenandoah smartcard +source +sunec +system-lcms test +webstart zero"
+
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	>=media-libs/giflib-4.1.6:0=
+	>=media-libs/libpng-1.2:0=
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-libs/libXcomposite"
+X_DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+COMMON_DEP="
+	>=dev-libs/glib-2.26:2=
+	>=dev-util/systemtap-1
+	media-libs/fontconfig:1.0=
+	>=media-libs/freetype-2.5.3:2=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:0=
+	kerberos? ( virtual/krb5 )
+	sctp? ( net-misc/lksctp-tools )
+	smartcard? ( sys-apps/pcsc-lite )
+	sunec? ( >=dev-libs/nss-3.16.1-r1 )
+	system-lcms? ( >=media-libs/lcms-2.9:2= )"
+
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	!dev-java/icedtea-web:7
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	virtual/ttf-fonts
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	gtk? (
+		>=dev-libs/atk-1.30.0
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.8:2
+		>=x11-libs/pango-1.24.5
+	)
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests and the bootstrap javac
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		dev-java/icedtea-bin:8
+		dev-java/icedtea:8
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	dev-lang/perl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl:0 )
+	sys-apps/attr
+	sys-apps/lsb-release
+	x11-libs/libXt
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="9000M"
+	else
+		CHECKREQS_DISK_BUILD="8500M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-8 icedtea-bin-8
+		icedtea-7 icedtea-bin-7"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+src_configure() {
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use JamVM if requested
+	if use jamvm; then
+		use_jamvm="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		hotspot_port="yes"
+
+		# Work around stack alignment issue, bug #647954.
+		use x86 && append-flags -mincoming-stack-boundary=2
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use Zero for now until alternate VMs are working
+	if test "x${hotspot_port}" != "xyes"; then
+			use_zero="yes"
+	fi
+
+	if use shenandoah; then
+		if { use amd64 || use arm64; }; then
+			hs_config="--with-hotspot-build=shenandoah"
+			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+		else
+			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
+		fi
+	else
+		if use arm ; then
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
+		else
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+		fi
+	fi
+
+	# Turn on JamVM if needed (non-HS archs) or requested
+	if test "x${use_jamvm}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-jamvm"'
+		fi
+		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+		jamvm_config="--enable-jamvm"
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+		cacao_config="--enable-cacao"
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+		fi
+		zero_config="--enable-zero"
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		config+=" --enable-precompiled-headers"
+	else
+		config+=" --disable-precompiled-headers"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--with-pkgversion="Gentoo ${PF}" \
+		--disable-ccache \
+		--disable-downloading --disable-Werror --disable-tests \
+		--disable-systemtap-tests --enable-improved-font-rendering \
+		--enable-system-jpeg --enable-system-zlib \
+		$(use_enable headless-awt headless) \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable system-lcms) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable sctp system-sctp) \
+		$(use_enable smartcard system-pcsc) \
+		$(use_enable sunec) \
+		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	default
+}
+
+src_install() {
+	default
+
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use examples; then
+		rm -r "${ddest}"/demo "${ddest}"/sample || die
+	fi
+
+	if ! use source; then
+		rm -v "${ddest}"/src.zip || die
+	fi
+
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	# From 3.4.0 onwards, the arm directory is a symlink to the aarch32
+	# directory. We need to clear the old directory for a clean upgrade.
+	if use arm; then
+		local dir
+		for dir in "${EROOT}usr/$(get_libdir)/icedtea${SLOT}"/{lib,jre/lib}/arm; do
+			if [[ -d ${dir} && ! -L ${dir} ]]; then
+				rm -r "${dir}" || die
+			fi
+		done
+	fi
+
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 83f7ee4f065c..cac0b62c5fc5 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,7 +1,9 @@
 DIST jdk-10.0.2_doc-all.zip 69312792 BLAKE2B ad2cad74e78098672ecc7d4f80f0babbded5ac564948c51ec5eb50b4e4e2688bec5bb6804d6829ea6137354ef8b1554b0ef6f8d0e62fe40b2e0bd80836691b6f SHA512 424ca11b661eaf4012d31cbe200ce5209098dd8fb21648eae5838ba2dd55d96aec5a263664d0b4ab21bc5f8cfe13cfbc61294cf92353dcbf8d8134613b25f67a
-DIST jdk-8u181-docs-all.zip 93487519 BLAKE2B 4ae2901174d072f2bf44800c3b12f6700f70bfcd89adc709678a0e8f48da94fea352bc2571d9dc611d85a5a3a21b8c33b5bc5f8c7b9d86a1e5e456164491279d SHA512 157d33432829a86326d7a24643dd8a61a11d72e98647c5ed44145fbb81fadcb1a51fca86fab82fa671193468b9631e5c8ea92d265bc0bf5969584dac40d4a1ec
+DIST jdk-11.0.1_doc-all.zip 51573427 BLAKE2B 8b08e383922367f19a570e3c112c30ce0306292daf95678cd699d5a15fa4003e6b231ea2ecb278f039cdf9525a82b4e95e3c9b7866a09beb4240945ec293d2bd SHA512 9cb0e5e1b95874de46d63d747685eeeabfb6de5b80e3018025341f265fdf3d54e769479cf2c5f0d62af934a4c9c647fb8fd89920a9ae4ff1ef612eeccb4f0e99
+DIST jdk-8u192-docs-all.zip 93801790 BLAKE2B 32c8441a55f102f8f479fc02fe20f7ee6d65c707d56b99b70cda1a02b3061a9741bb551cd94b4f7e28d22199dec3df72bec2e978c80bcaa973402ac74805ffe5 SHA512 2a64e45596e01a80694b325ce5f7e0747436890373f45bd5a4cee5b54ae13580d7bc62a1981ade41101b4b9bab79231fbd603ed83ed1283f5b6104670bbd0f17
 DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b
-EBUILD java-sdk-docs-1.8.0.181.ebuild 1363 BLAKE2B 4e1af9bde37896fbaee9df13c26b2b2b3f6a991a456e9cb2ea6fdb15c4eb7ba5ded0e173a2281f2de58b7300d716d4296bbce5fb3661169b5463a77e1e5d4e2f SHA512 2fb385c575a900d27ea2cfedc2eaa29222346a34b21b9b18384261fb086e45235dc2bb07d4351644f72db6130633512384c9d65a5ab8164f36dfc169d66ac4e2
+EBUILD java-sdk-docs-1.8.0.192.ebuild 1463 BLAKE2B dce52b0da9ceff29a07d6191074b2f2e5f0a4f12286b4bca860701f2e8f25cd6c69da1210956dbd761b368f5befc735cdf585596679c6dbc66c7ba8d7599b2d7 SHA512 3c32a082f69d98ea878657063f108a475443e56f50351edf91fa03d67524bfd215f1063ad383d7a12715b967f196e58926ddd49a9878ec6469f538d65cfb14e5
 EBUILD java-sdk-docs-10.0.2.ebuild 1278 BLAKE2B 9e65d585197edbc771d06524cc1b10a1206397d413f51af1e903212e155ad7e486390e28399e3d7c310157a98a5dab7ef737a02856035c42cbdc56f4e69c79e0 SHA512 c1883973538623b240c0104df6c4610e9af82113872274326fbfb3bd17336454e5c5a660e70c6b089d71fd1b952eac9499b9f4dd64e21918ad28dc7a1cb17728
+EBUILD java-sdk-docs-11.0.1.ebuild 1276 BLAKE2B 62d83b8826c0db27f7845e0c3da9b75b09d07b8fffdbf5297849a41d223cde5a6a1329a42b72a23965e09424592370e73a85adad272bcc9d41e0fd6bd9cbd1ca SHA512 3a387c687e75f0a45cbb39a4512935bb2b25bb0dedcd9d1c25923ea17aada3cc2d9035f821ba3560e4497ea3fbcaea1c1e0af50ff301f43dd4fe6c219fe2e5bb
 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-1.8.0.181.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.181.ebuild
deleted file mode 100644
index 82f3255d8409..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.181.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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/jdk8-doc-downloads-2133158.html"
-
-[[ "$(ver_cut 4)" == 0 ]] \
-	|| MY_PV_EXT="u$(ver_cut 4)"
-
-MY_PV="$(ver_cut 2)${MY_PV_EXT}"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/8/docs/"
-SRC_URI="jdk-${MY_PV}-docs-all.zip"
-LICENSE="oracle-java-documentation-8"
-SLOT="1.8"
-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/java-sdk-docs/java-sdk-docs-1.8.0.192.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.192.ebuild
new file mode 100644
index 000000000000..290ac84e7cb9
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.192.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk8-doc-downloads-2133158.html"
+
+[[ "$(ver_cut 4)" == 0 ]] \
+	|| MY_PV_EXT="u$(ver_cut 4)"
+
+MY_PV="$(ver_cut 2)${MY_PV_EXT}"
+
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://download.oracle.com/javase/8/docs/"
+SRC_URI="jdk-${MY_PV}-docs-all.zip"
+LICENSE="oracle-java-documentation-8"
+SLOT="1.8"
+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_prepare() {
+	default
+
+	# Don't need both .Z and .bz2 archives.
+	find -name "*.Z" -delete || die
+}
+
+src_install() {
+	insinto /usr/share/doc/${PN}-${SLOT}/html
+	doins -r index.html */
+}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-11.0.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-11.0.1.ebuild
new file mode 100644
index 000000000000..06d84404b0f4
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-11.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOWNLOAD_URL="https://www.oracle.com/technetwork/java/javase/documentation/jdk11-doc-downloads-5097203.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/jcifs/Manifest b/dev-java/jcifs/Manifest
index 4ac531b334e0..a5e5371c86a1 100644
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@@ -1,3 +1,5 @@
 DIST jcifs-1.3.17.tgz 862091 BLAKE2B 67605ebd810caf097a9172c17f31d39c9e16af5885c706f7d8c2c2cff9b8e6a643174c9aaa8bd6aa06c816e312b7170a5aa06535f823a5c5b182e97beecccd0d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc
+DIST jcifs-1.3.19.tgz 883534 BLAKE2B ede24f43018a4bf304019aeddb6cf789e3a01622d840dc3f6bfa45104b97a39d256807f766f14b3e215e53519f3838aabeb73bdf7897323fb41ca5ef2b7c9372 SHA512 24ea656469ac7a5666d28dcdf122c80d254af5317a704718d8848858a21b38c6efe9b977854a33130cdb57d2fc8324ac3ee01fb5443360899f9572ec41788eef
 EBUILD jcifs-1.3.17-r2.ebuild 794 BLAKE2B 4da988b2dc46f9b33b84a6a18b3309c40cb775c7c5faa6312d89d0ee7444e69831cfccb62d4c4f99713c7c98b1755732cd50234aba5f4429f68a5fb449144c49 SHA512 5fa03afb1988311c5398d01ef9af4618260af25ebc0deafb204378553037eb0243051c14bc372484e2b0995a1791d6352f7eba956b564748e03d48f8c604141b
+EBUILD jcifs-1.3.19.ebuild 797 BLAKE2B 9dd98545ba043ab9ad45aa4337fbd2bf9e07a7a8820d7f8920a1acff96702ce6be8ea5e5b1c1245ed8b875592196ef4f455d9490f8953d61d93d5a97917d067c SHA512 256be2f575be136208dcf58989386d294076f53cc34b99c3e07e6a0f0f39ddfb9196c3b2362a43d539d226d167d368c14ec54a106dc915e02d78edb22399d7ad
 MISC metadata.xml 547 BLAKE2B 654c37f05e5dd6b09b76c364070d1fe0f60fb0c9adcbc4c111a900cff3f7a0d1320ae934ee1290d015f64eb59bbe18d6965af52a7be69db16461908cd6d5087a SHA512 5783f25610ce9cf8db737748ca4f493d62e22ac5014de06d8e051d114b8aad73484e496b0ca10216462c8f68125ec501f604168fa1957306b8a2ceaed64d42ae
diff --git a/dev-java/jcifs/jcifs-1.3.19.ebuild b/dev-java/jcifs/jcifs-1.3.19.ebuild
new file mode 100644
index 000000000000..de48d1147b20
--- /dev/null
+++ b/dev-java/jcifs/jcifs-1.3.19.ebuild
@@ -0,0 +1,45 @@
+# 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="Library that implements the CIFS/SMB networking protocol in Java"
+SRC_URI="https://jcifs.samba.org/src/${P}.tgz"
+HOMEPAGE="https://jcifs.samba.org/"
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CDEPEND="java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="servlet-api-3.0"
+
+JAVA_SRC_DIR="src"
+
+DOCS=( README.txt )
+
+S="${WORKDIR}/${P/-/_}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+	einstalldocs
+}
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 6c861790efc2..3f68c985d0c0 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,5 +1,5 @@
 DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
 DIST json-20160212.zip 52295 BLAKE2B a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
-EBUILD json-20150729.ebuild 688 BLAKE2B ec6bb2b42536b33e4a15144d4c0f0d5785c7b932e413881105242ac388b46d71282559377d1737080d76fd75392255e5c9c5e68d63a6349f57c28759d6ceae05 SHA512 7d7fb2348310ea877e5406bb20e156dd120e269cd3b0b4c144901c01fef8d745b763ff2809c9cc2f46f1d012f9e9619c35ebb1a3aa472f91f5da9eac72f13b33
-EBUILD json-20160212.ebuild 681 BLAKE2B d9f70c2ee4959cf9e197b51c7bc4c28b56d13486a03a7a6c31c7118d9989c216ad3f918069b77bbe201ced2ca026a7fb41ea5bd028b67347aa376e25e208c1d6 SHA512 bddd61f652ba800c27ca13e639280519d5fef30cc042a3cf02f9d416a4f91cb89e787db5f600c9b680a78a837676286344ced491d9a1bc3273ef8a5b72ef74a1
+EBUILD json-20150729.ebuild 708 BLAKE2B d3a14a757874cf3fb1d1c89bea956f3b98f9ff7b85877ee6bcbba4381d3dc007b3baed77f3b2330eb5037d2b62b4446d2457194d4e3a4355aa409d94b1cf9865 SHA512 c844bf4315d1bf805d85692429080260e3fc6dbb53240891bafef307b2d11e8099566ea17425918916b27aa940c2fe47ebc52651b06408a1046f46ac34c54b41
+EBUILD json-20160212.ebuild 701 BLAKE2B d3942025ffd549fa10739ff5c302d0baf3c2f8a3224d64d8fda0e2965ee9054670ed556f4227eacea4dcfa946f9ffa2300c09532fec72babedc8c382c1abef77 SHA512 8560f39e1389819ad9f822007786c3cb9577fd47469ceba7c0bf95853631808f43d98f1836066d6ad0615a7e77cb96c016e43fce2515b7fbbc6aea64d826fe51
 MISC metadata.xml 454 BLAKE2B 866e5582e539c06b6bd26785ff62c97b178aacf82888963aac47489844ad3a8d98fc00bba667ed43d3e527fb3e04bfb05c7c644eeb0cfc4c408bd45cdcdc0e7f SHA512 18ba78f62a286b7a86d2dd7f2f407b145946e5b79df2554d3252706f38162e562f176105746dd028ec46f50dfe07e00fdbc6a37ca31a7ea3d1093e069192b2b3
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 5c65acbd6d3c..6af44fe16dae 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.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,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="http://www.json.org/java/"
+HOMEPAGE="https://github.com/douglascrockford/JSON-java"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
index db4c7252b880..09e93dc08282 100644
--- a/dev-java/json/json-20160212.ebuild
+++ b/dev-java/json/json-20160212.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,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="http://www.json.org/java/"
+HOMEPAGE="https://github.com/douglascrockford/JSON-java"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
new file mode 100644
index 000000000000..d8d1b64142b0
--- /dev/null
+++ b/dev-java/openjdk-bin/Manifest
@@ -0,0 +1,6 @@
+AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
+DIST OpenJDK11-jdk_aarch64_linux_hotspot_11_28.tar.gz 193328951 BLAKE2B f7586ed6b5e5562f6b1b4ed155abadbe31cb85459c982b0011e75d85046261c0a78dcaab343fb5c5c7a382c3fd1ac52caefc8194262e35c3601b9aae5a9b94e3 SHA512 b2e5bd25fd62425e25a9a60cd2ca4b080748a352c04c29f206ab121245226c61fa5a8573d342d8bf88efd83a9a7890fd85cf90d700dae28f632878a60d79ea75
+DIST OpenJDK11-jdk_ppc64le_linux_hotspot_11_28.tar.gz 176285783 BLAKE2B a64f86a4f69302efe0eb2645d39c44ce89bcf58c765c12c109735fb2ede5959b0659d4b9f85cf8e79102fc6f00443b99a78fc5745086b1b5e16bd41958db1ed7 SHA512 84eb35634a985647d4fc90c6c4a1855c1c059e5fde8cf3ef7665fa754a7549cb3905a1c35710c6c936426efd6e0bc1ac773fbef11550dbadbff622fd2c201d74
+DIST OpenJDK11-jdk_x64_linux_hotspot_11_28.tar.gz 195689094 BLAKE2B 4d65b7993fddd113964103a1066faa6e7e83ab7807f6403c1f5bc5a72ca82dc51287d4911e264ba5754b7c1184aa1f1d1c94d19ae242ab02bf238f6c359c0de3 SHA512 f7a427bc33b2e8a2f68c7955b23d14f2eacf7b526f2990b29e55bdb1ae96d3e14f3d7c169c76ba4b18fd8195cef81d7199a37a81ce73d6b21a72f07388e70793
+EBUILD openjdk-bin-11_p28.ebuild 2775 BLAKE2B 20fabb82d8101b07553d846723eba61a7fbb2190778219380d0d765d8bb37a90bc7d283c362c9ead2a8bb976658ed106aa2403dca13c021a9d8cfb8edb0bbc8e SHA512 bdcd5bd21dd5f2bad6de0d49ea2a27994abf1cb005bfd0f84c385a6636ad9f76ba01b130a48540da2ba0cc2cb3496b0dde4d9fdc186798a0f9bf218a919d00b6
+MISC metadata.xml 921 BLAKE2B 9441e4d8e4ab3fd0c0523e7d96a60b6e1fd77e863fe6a2a9ab709d50864d72467304543c6771acea567440f9b02ab7b9c63053fe73c2780e655a12976964a4e3 SHA512 5ffc9ebc2ed1ecd969c0ce65032b174ecdc74614bc7f751d069d4cd2e2a17019bf24f6c1c3f27a0ba4f7ca2e78fb6ff420b51f4997fc8ec206e88af6ee8a0106
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
new file mode 100644
index 000000000000..9e9c5ec54870
--- /dev/null
+++ b/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
new file mode 100644
index 000000000000..7b83622b0d7c
--- /dev/null
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <longdescription>Javaâ„¢ is the world's leading programming language and platform. The code for Java is open source and available at OpenJDKâ„¢. AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.</longdescription>
+  <use>
+    <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
+    <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
+    <flag name="source">Install JVM sources</flag>
+    <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild b/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild
new file mode 100644
index 000000000000..bb324e59cec0
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}-jdk_${1}_linux_hotspot_${MY_PV//[.+]/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+RESTRICT="preserve-libs"
+QA_PREBUILT="*"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 7b8282c7ab84..a9cd4b6d196f 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -15,9 +15,24 @@ DIST jdk-8u181-solaris-sparcv9-demos.tar.gz 8869506 BLAKE2B 518519ee84e7b4b03062
 DIST jdk-8u181-solaris-sparcv9.tar.gz 98921065 BLAKE2B ad02fc872bb23c36990c3c4915a7f11beb490559382463852a6db9bbf046f5fa3f4003951c85d8e4b2bc870fa135967b083b125f9a11e3de996b4444e49fbaf5 SHA512 3acc108955b8669cfb83f26512d750ea977fb84cde0f515d791df76a2ea67a0951d0ebb120e00184d542e24678afcac35671d35573b7bb961759d8bf95b1ae91
 DIST jdk-8u181-solaris-x64-demos.tar.gz 8835006 BLAKE2B 32269b2bb6e8b2a6552ce53f666aec820838189c35e0f44491e944150422453a4a4bbaea3824053483a1a116f08365a2a13162fba11f5f632cdb3790d3146943 SHA512 ef27f42a0d9fa0bb8ee289a882e08c9ce1311cc2424439e7d342ef63885cc68cf5464fa7cebc715ad1efffaafeffd55720a121a1cf093fb2fd10bbe6f4a3d7fb
 DIST jdk-8u181-solaris-x64.tar.gz 96580362 BLAKE2B 03007adadcf89d8c0984fab34d6d5b01f0136eaea9a02da7f1afdb1fb4b1544fb04ad2943dcb0dd6da51375f1de3ee3e72e5170697a31b871a8da0d124d1070a SHA512 ecbd9c3fb5d757504186dcad0a9606f2aec6549f2fb3424527dd621618b9726152a7c3168c32eec8f28731e547feab96fa190fc4eacc713f608fe851658d10e0
+DIST jdk-8u192-linux-arm32-vfp-hflt-demos.tar.gz 9508019 BLAKE2B 6eabd83f98f1497c2c73cfb5972985ca879efba002f474dca9a0f4d30e3986ccae7886aac074f2f6ffc4100cc8c96514ccae0bc60af845028e8e89b301fbfcbb SHA512 8b5e79d55e2c88127b53f9c52fb0e7033b1023daddcb59b43c991baf46db7276a5fabf8b39516b097967aeed354e4d7399c459a5784448cd4f6f4872b1d758a0
+DIST jdk-8u192-linux-arm32-vfp-hflt.tar.gz 76544503 BLAKE2B fdafcddd9e277a9421e9218e2b5de83792f9533cfc3b3e99afe8ee94776ae573fc97ed73702dbf7e96461741e7939b111ac8dcdfba9bdf28d2b6951acad8479f SHA512 ccf6c6fbae9453c86b53255e13a3eaf3cc1ab999480244c8a38236c7d29ca46e9f1a0ce9e9fd02295a0f98eac97f3ac5231909fab655c0eda0f24a2d42c7c4ed
+DIST jdk-8u192-linux-arm64-vfp-hflt-demos.tar.gz 9506333 BLAKE2B 1928bab95e3877fd9f5c28a7ac988c37613f5ae74abca9646c8fca1d9ebb2c4d984783699411263537bd957b0268647e1dd1d62036a15f6dc7d918e4582ccebd SHA512 cee7a8de81fddafb26ca4b64f6c01052c51524e28e281863b17536200068de0e68ae66494e9e0d86cc6bad1dd01aafed281a9690e3e1c0a05d890a3e32850e5f
+DIST jdk-8u192-linux-arm64-vfp-hflt.tar.gz 73317460 BLAKE2B 5be8ac7829ecf7a95c7ee60436abf5ca318003d11a4c3ad9ba75306983c934bd3edbce2e54fbfd472a8a6ac6d7b24be57ef87f14c7af2ad4d5acb2c74ce167c9 SHA512 8471afed26e5ded356bbd39b95d8f1ebd3a5147ae7cc4a94c90efa9bf8baff23dc8f4b10f2973307a1f48d3722604603c3e4d708bdf21c4f5aacfb0cac088b7d
+DIST jdk-8u192-linux-i586-demos.tar.gz 58483041 BLAKE2B e333914701dcf4ae57506f12846b19de91b323a63cb11f1bf840d4f3dc1b620ff141b0b7c5e2a21e4d2e2e3141c1e9a9ea6ccb01d0a5bc97d51053e9ac4e5f9e SHA512 d9b2e4b2f1052c56dad3dc0c715ab51e3cd68eeb8e6911a4f15683fec98873bf510b36541c8725263bfca7fcba65e4cb6c8bb47e4bc7e67d660b06b7e0cf0fdf
+DIST jdk-8u192-linux-i586.tar.gz 194717101 BLAKE2B 73f59da39bb5b9c2bcedec5e112b4f7ad16df144a8ef0d030f157903eb3a51bbd7a7f262da5fb478c4441658c2a0a30ff96e497d72c24a143e2118e4b3ae6b96 SHA512 a4bd3bfa9dbd9d64d270c75b23c985ccc5bc2a706dedcf5007b6cd027249acf4e1a0379e470baf9cb2b83f8b3b26a3720320171b4ea286c38d9c1318195257d1
+DIST jdk-8u192-linux-x64-demos.tar.gz 58589568 BLAKE2B 3a025954ed0b9a174f3bd642fe3a650562e200a549e6dfde4b34e01df0137a24a8d89b30b3bc9a2f7f189b4a41236b3678d54a7012a7c3555e168ed258a2bb3e SHA512 48e1b112c91e7b81579625b29050a48f3237b18b15a278750ed4436a3eb9869392af091599e39f1d492eb3b92cdf932a8c772040539f9e10f0d263b1afafd1c4
+DIST jdk-8u192-linux-x64.tar.gz 191757099 BLAKE2B 42135add35e5acf2ebe539a5667828f41e88de1dbb79d39228353d5cb5597899b6a15cfc5637317706f209888120af5d044cf3a074bbea960f425226e8e4002c SHA512 96ce0662ab474b33d28fa14edada040bd6b0a17b9374741bb132f7e9cc21b6f5f03cf8926bdef5e44669a9ffa593f887ab82d42b7b701eeca74a173f70dfdedb
+DIST jdk-8u192-macosx-x64.dmg 257868944 BLAKE2B 86e915111aabf53fddc46cdea4d7a1b6a9425e1238d156888e5d2f2784a685873c7a388cf066099d8bf5d164ff7d14380c3b9c329a48accb4d300542d95a67a5 SHA512 db059e7c8ec627dabbad46a388c0a36ec5591ae9513e9f82db9a0bd154c6001e97a526234c5f435ead867702986995dc8b866d925b63dfe2ff6d4d6394f10db9
+DIST jdk-8u192-macosx-x86_64-demos.zip 58763903 BLAKE2B b38c05db314582c5015ee7253473aa8bf81bb098e27e952153b139186390047b9357a5134ed1574cd0923d9fea4fafd265248ed65179c4288b4d57c0ae86044a SHA512 c55ac8338b494cc20cf521163b500856d8583f6873100b30d1d7eb388789c28907f76f8504bfb1ccd657094280a1c26b26d5c0122bd95de6b30f3e72e300428c
+DIST jdk-8u192-solaris-sparcv9-demos.tar.gz 8867227 BLAKE2B 76d8a98475eaa3ae2c0209d11640dbbd32aa677f8db40fcc87a9a4c86dd249fbf6bbc3ae9b84ae268468b8082dedd23374b1cae41438f45f7bf42038b2c2a5b9 SHA512 d5ccf03d693ab8ed10aac35b2bbd6823524e915a32e953dd162352cfa1bad7b5fe0db5cd1dcb44d79ab454bc2566d1ca6ba145ab4b28dba1a6c6a001198f3f91
+DIST jdk-8u192-solaris-sparcv9.tar.gz 98913870 BLAKE2B a27a3dc4a6e68972919417f769aeab5716410ed4f793f46886a081799fd4f8b0c2de6f30d7a0a65e08fe9dafe35c83e33f2c26d5e71e9161b6ef40ff3e05d8b4 SHA512 e241c00b29b3e18a3d0ddcc3f88f35c092488cc1b93b0daa348088d85f0a117a43903c5cb3c9edc93653e6f420c4c2f2f8a2647682ed0a2a509add5dd844012e
+DIST jdk-8u192-solaris-x64-demos.tar.gz 8827060 BLAKE2B 9306b0cd984139a5ab1c32c8a436e1e294dbaf0118e1b88eed5079eada806d9049b0acc41279de385173bad94f351891e4bf6baeef4a0478ffb552773fab4dad SHA512 d6f2dc2a8c61b65b3a16b206b7ed7767153bd0713701b1b0d545cc1305739239dff6f1c33d0b7f1412f59262666bcb005b48154ae6d9ef4dbbc900e3ae253c88
+DIST jdk-8u192-solaris-x64.tar.gz 96644048 BLAKE2B 24cdbdc006c45ed28fb7eb855ec295f568bad1c866d57961085047901dcf72e341d05b407fccba43f66896fcf28b09bed8e02e6ee5069071a430b4424bdf1af4 SHA512 7db73b08d3ef52a7e486a99140265091916433c3d0768e2b0631de5ad649ca76a9792e40122de49677caac67951f036824021f91f50f36026d7cf7971b93e4a0
 DIST jdk-9.0.4_linux-x64_bin.tar.gz 354635831 BLAKE2B 6d102ca812c7fcf03b611d95880af51916dde52f09f3a5b972abd6575c73e8cca1855fb50ac00aac3f4643a1e422b5fdb97a746608b5a4235d8664926a061730 SHA512 787addfcf3d4736507ad8fa54b22894a33d39bde01d9d187d5c9f3433b43c9e8b14404a8366d0bc8510faa8936274bbfa304109d3927aa323b3f8a285efaffd6
 DIST jdk-9.0.4_osx-x64_bin.dmg 400672048 BLAKE2B 0bcc3643ccbc72cd98aca71823e06fd60068a7e1d72c7ce59f8e4c26bb9461a207f57ef239b244ec05c8f843666f2854b07a5f05841819cfe79ed8fefafb3650 SHA512 34191b5802c2d369f890cb1b563f77ee040b9af6ee4fc8ae81974f46afea675401e2a02803fc4345e11bab1103397dd8b583d68bb81edcdd02902cb3e595cc52
 DIST jdk-9.0.4_solaris-sparcv9_bin.tar.gz 217025485 BLAKE2B 6b3d4f4701ff3349f8acce727fcfcb06ce420e54dd32d2e6b91b71aa898a8d6a293375ec2cb0c66f14a5df77a6f5b7016160572b995ad84a593e9d5c6c928184 SHA512 9418a725a33dfbedf7f692abfb92550f23fca594fa8c1b85934d601284261339f177a32af7440e0b09233b2e99b2fd7cef835c54252cec6a645ea322a389de14
 EBUILD oracle-jdk-bin-1.8.0.181.ebuild 8502 BLAKE2B 2eecdd0539ad7080ab396b1f5af53fa256ba856d454c88bb6b5af80b8a062467ae3d3adf23987c8476bcb4d21c8a6683237535d74e33dea4549586f6903a68d3 SHA512 35d1b8277cd384a29818f3dd2a08e037c3e3ab1634c02f3f5a52564c86569648c824258dadd16ddfe35f79b85acc71579567e8e2fa4876fc54a15a4c03f454c2
+EBUILD oracle-jdk-bin-1.8.0.192.ebuild 8500 BLAKE2B 0c4a5bb29e08cee4502b11d39b6ab8656950385a326a23738cc5cc30e512eb6e511a9fd94af735f9f26fa0745ad2a9af89402f75fb657a69fa873057f7b2a5a7 SHA512 6476542f112f8ef34945bfbddc67a2241fcbdea3864f037819bb53df7b9c432052a47748edce337a517803684b8e945296f383223ae39f3ad5958cc4f7729b5c
 EBUILD oracle-jdk-bin-9.0.4-r2.ebuild 6803 BLAKE2B 8318572886e47fee4b4c94bf795a26203da64746c9a8f5c55f7c6a46305ac8b31792c784bb9d7e17160de8133a60b8a85e4ef5f5c9be89fa050d74e357df5fc8 SHA512 bbe8631108b393c382777df2651c0212efb8a1c532745ae584625a6bc6c918408bafa7bb27de2ec67982c8c33cb20d078de99b79752afed44bfab857afec1556
 MISC metadata.xml 1132 BLAKE2B 6029eb0374ee0cfeb6f83c56dc8fd5206e297cfad6a799626ccdd2df7cac20e9c97eb7008a3ca210da474a78a26c9052d97b85f04b38aad7367d83ce78bc1c24 SHA512 eeae92c31db1c935fc4b248342428f5a34138e3b6f558927aa75c7f2c9f42ab574083e00b234752a6dcc685e9bd5f1daa2a15571d73a1a7576a35860df90e903
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild
new file mode 100644
index 000000000000..26267a2299bb
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix versionator
+
+KEYWORDS="-* amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jdk-${MY_PV}-linux-x64.tar.gz"
+ARCH_FILES[arm]="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+ARCH_FILES[arm64]="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+ARCH_FILES[x86]="jdk-${MY_PV}-linux-i586.tar.gz"
+ARCH_FILES[x64-macos]="jdk-${MY_PV}-macosx-x64.dmg"
+ARCH_FILES[sparc64-solaris]="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+ARCH_FILES[x64-solaris]="jdk-${MY_PV}-solaris-x64.tar.gz"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	case "${keyword#\~}" in
+		*-linux) continue ;;
+		x64-macos) demo="jdk-${MY_PV}-macosx-x86_64-demos.zip" ;;
+		*) demo=${ARCH_FILES[${keyword#\~}]/./-demos.} ;;
+	esac
+
+	SRC_URI+="
+		${keyword#\~}? (
+			${ARCH_FILES[${keyword#\~}]}
+			examples? ( ${demo} )
+		)"
+done
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+IUSE="alsa commercial cups doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="app-arch/zip
+	examples? ( x64-macos? ( app-arch/unzip ) )"
+
+S="${WORKDIR}/jdk$(replace_version_separator 3 _  ${S_PV})"
+
+pkg_nofetch() {
+	local a
+	einfo "Please download these files and move them to your distfiles directory:"
+	einfo
+	for a in ${A} ; do
+		[[ ! -f ${DISTDIR}/${a} ]] && einfo "  ${a}"
+	done
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
+	einfo
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		mkdir -p "${T}"/dmgmount || die
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount || die
+		local jdkgen=$(get_version_component_range 2)
+		local uver=$(get_version_component_range 4)
+		( cd "${T}" &&
+		  xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \
+		  jdk${PV//.}.pkg/Payload ) || die
+		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
+		hdiutil detach "${T}"/dmgmount || die
+		mv Contents/Home "${S}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
+		# Mark this binary early to run it now.
+		pax-mark m ./bin/javap
+
+		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
+		eqawarn
+		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
+	fi
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr lib/missioncontrol jre/lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+		   {,jre/}bin/{javaws,policytool} \
+		   bin/appletviewer || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+		   bin/*javafx* bin/javapackager || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf jre/lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf jre/lib/*/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v jre/lib/fontconfig.* || die
+
+	# Packaged as dev-util/visualvm but some users prefer this version.
+	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
+	if [[ -d jre/lib/desktop/icons ]] ; then
+		local icon
+		pushd jre/lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JDK ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use examples && [[ ${A} = *-demos.* ]] ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/jre/lib/security/ || die
+
+	if use source ; then
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
+	fi
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/jre/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		local lib
+		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
+			ebegin "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}"/jre/lib/${lib} \
+				"${ddest}"/jre/lib/${lib} || die
+			eend $?
+		done
+	fi
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index c68a2da8d1ab..63136d646e3f 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -3,9 +3,12 @@ AUX oracle-jre-bin-9.env.sh 493 BLAKE2B 938985505c591afe17468af2314fd3e15c79205d
 AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
 DIST jre-8u181-linux-i586.tar.gz 84309787 BLAKE2B 3aa9f47698a35ca91bbc61d2f3ec43f5ee626b74fb913eb11be8e1478d8aad780b5ea672de4dcb6bd6c598058786d26d491d01a45d5f3cb5044d1f48db26c7d6 SHA512 86e4532248e383f6bca875bf039f4f852b79260b4d5affbbd5deb9cf2ea3e585ced9f1fe054526529dcc3dfbe031a829df078a7591dbc3cf3da7913703de7231
 DIST jre-8u181-linux-x64.tar.gz 81191893 BLAKE2B c29d638b7dae9cc58d9de6e43f1af397cab04786045e4956d05cd8c3825af1f27e8a77b42a9d4b9d8ab7d15aa5b94349fd8c98ca37fadb271dc0bd868d513491 SHA512 dea7bc79210d23ddc58a7013bea8386169b9ab6c156995a2190dac298919c933641639173cf3426730b248004767449c5a62057d6736f897831d8c86b36c5bed
+DIST jre-8u192-linux-i586.tar.gz 87804679 BLAKE2B bb1dea51f0d45dcd3aabc82668790ee274c83f2e3c596d836d7b57c971ff6535881849cce5757132fed1b537a4a9677fbbb0b8b003d423d26ee72cb71047428f SHA512 5c749f358aa5b55513765eeb52dd2e0d3cb2b3223cc93739aa36445af8c6a3171a01cab673e106312e816c0a3b584a8a1be4aed1e2662e86b6d318d86a135485
+DIST jre-8u192-linux-x64.tar.gz 84597342 BLAKE2B 655db641df8349109e2944838f16f37ea208772580f0753e664a0642649745c123b2a781497ca3b9028f55c0bd2816cb5746d7d1d04cc83bb536ca0b467a4fc0 SHA512 d786f9e032bc286f3d4f361c382b6606c7462240b191d04606ca5ed9e59e3d7703cbaf1d57693c6763d00374c76c99cdb2f58c0bc372ef5c14c6304d556b4c8a
 DIST jre-9.0.4_linux-x64_bin.tar.gz 87045353 BLAKE2B ccf3c0d725ca1431261a0b38cc06851fc10651415982fa2d97f512972c088c2c158ee51710b59e04f89326dd4cbb4c1ef8ecf514af190fbdc2be07cd222fd5d8 SHA512 20310fe68c89d26a89523eb1fe583eb5706fe2458342f5be0dfb4badd1d9df6ba25b00463f080fceb7c22781ff1555a61b29d187d8b02e1f9e165120b8140c3b
 DIST jre-9.0.4_osx-x64_bin.tar.gz 74599903 BLAKE2B a1bd4d51ee645347fcb735e46ee3311d34933bb0dbb20b9a668ed7b817be1d0432f4152f53f57a9fc16d6b6b7f38ea4118f5cae86a8b71143db0091c9baf62de SHA512 fc4bc4a062313a7e33943ace27287ba6e551727f0cf81d9a18f9f8c2f57b0ae00bd0d8619a65f596d75d4869fea757fedae3efdd8ba3ced58fa28b7cf93b3a85
 DIST jre-9.0.4_solaris-sparcv9_bin.tar.gz 54879298 BLAKE2B fb3ce1eefdb12378b28f5af0f0bbc1d9f3252eee5646be237b2ddc0ead37ed253fb73900475777c3f67d39b47112e0c2db2a18f6a05da7c5c19cd965e5513827 SHA512 709219f51d7455c127a38953babad39b344dee1275ad0fe65a0116e8fb15a10482589ba881ccae7910acff8f00aa7856c726c03daa8f3947d742bbbc09a276dd
 EBUILD oracle-jre-bin-1.8.0.181.ebuild 6054 BLAKE2B e7319d43fc1a84633f7366f3bc1bf691db58aa40de51e163e57cda9be6c23736e35201b01629722d3cd2f35f55c805d7b75abf11db03812e363dfe37e734377e SHA512 8c8d6a0575e4807d74feebaafe10bcf4bff5aceaaf46e2e3bbce261ca4e2613fa2fae915a09a25a22da2e71351c38206ccb62f98dc16ffcfbba29a49309b2c87
+EBUILD oracle-jre-bin-1.8.0.192.ebuild 6052 BLAKE2B 9bce83faa61dbd88c7c816c5ae52e528e753b9c7988ee05efb53e713686835912b979bf0b93b4223721de923551445951435bd84af2b3f534d8797c7b8f872b8 SHA512 e7f02f6ebf068681acbbdaed5487b81da33ecebd8ce147f154c01404e79774256bf2d54e755909bc3de1832bc6e714f06deb5fc9f129207443d708b77af1850d
 EBUILD oracle-jre-bin-9.0.4-r1.ebuild 6278 BLAKE2B fb43030f8341cdd68644921776ccc397bd2bccb5d1df0112e14bf33d2c9e6c1414323b13cf566d828ae53f6bd0db5af546bdad7137eb011309a37591a5650d7f SHA512 f52656f65e214e26bf9bdbbf411c75392f41247071d95ce2976fe2eb21ea17b41181376f2bb15a87839745bc76a85bb08a0779dc2702b3ed45bae9e20ffb61d3
 MISC metadata.xml 996 BLAKE2B 0ceaf014bbef2817e869d5364997a44f77be90717bd01a09114b18e9318f58b61e3f4048f3b22a7ee8430a1042695f313066e996c15db71ee0775cf73aa7f1ef SHA512 043f1e701ac085678dbbb662994f6b67c78634990d721c65de97b392555e3a2fe5bfaccbe00f48c5dbd7c4e48837c6662d70306bf7cb3485ee3b2efa440b7afe
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild
new file mode 100644
index 000000000000..a92c6e3e01b9
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix versionator
+
+KEYWORDS="-* amd64 ~x86"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jre-${MY_PV}-linux-x64.tar.gz"
+ARCH_FILES[x86]="jre-${MY_PV}-linux-i586.tar.gz"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
+done
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="app-arch/zip"
+
+S="${WORKDIR}/jre$(replace_version_separator 3 _  ${S_PV})"
+
+pkg_nofetch() {
+	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
+	einfo "your distfiles directory:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
+	einfo
+}
+
+src_prepare() {
+	default
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
+		   bin/{javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
+		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/*/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/*/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v lib/fontconfig.* || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JDK and other slots.
+	if [[ -d lib/desktop/icons ]] ; then
+		local icon
+		pushd lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JRE ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/lib/security/ || die
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 4832adcb2eee..a1c33db740bd 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -5,5 +5,5 @@ DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94ae
 EBUILD protobuf-java-3.5.1.1.ebuild 2095 BLAKE2B 9cb63175cfb02d00fa2e9273aba56bc3fe640d5a485af2746dde34505d6ec9317617dc41e7da0f7dba3f728673a9a846363f61889bb4c4fb46916852623435a5 SHA512 1cc3f361b4cb240b80cd3a5b43b7e3f8d95b08152b33e09aeb7a96a07683d621384468730cdbf1b99f24dd6937aef3745fe3678e0b57ba9f314b6a21fa2139ec
 EBUILD protobuf-java-3.5.2.ebuild 1814 BLAKE2B fd690cc2a8ecbf5d568ea3d20cd5c494dc97f75c3f61b3c506e2e39168bb5e138e0ffce2f1d3ae846e13c535372dc4638d32b356664849248d3b2e948dce5c4d SHA512 df61e203370b90295a3b48eea64c80fa53e9cabf51730e2c49db2520017833961560d7895f80060f08807089d3df54220c74df852807fa1d07efdca3b84991d4
 EBUILD protobuf-java-3.6.0.1.ebuild 1112 BLAKE2B ed95623a91d20e3c8e2ecbb69c8c52421441c0eed3a3f36bcf84486b98cc67cccab53da1f83f3299b071cd0332f59461af952d29be82dd9f65d58fb68ab47ef7 SHA512 2746cfa9ac7a844aac943cf6ea5e0b09b5544f0be8a2ef46bdd9d46a3e8261892d0cd153e668bffd5b7babe31601ec3338c81f79de3788353f48921ae2890f2b
-EBUILD protobuf-java-3.6.1.ebuild 1112 BLAKE2B f8ff861b086b130132f712a85066b9c3b05f9ed8673bd8e8787a598cc9bd78818b586255f0cddec1a5b2d1cf846d84ab35a5a78ce4fc6e940ed757e397579b91 SHA512 39aa4611274b54b2875eb8d8ff196c80362cbeb484bdfc4b0c058a179dba7451a7c6938aa01c4f187b018b3f3c3b3f49ace697c6960bcd99df04018b2651dd24
+EBUILD protobuf-java-3.6.1.ebuild 1109 BLAKE2B bd8fb8e90a5f6386f16a9d98351b30e34b3307d323565fa016b22d69285cea18495f4fb29c6ec7bd4052bab2cd5d7af82219209e36a7303de55ca92cba1797cf SHA512 cc09ccf03e073edd2c7ec711f3e4c55afe7dae532ee94916f9f4319c3c9b019c49b42f8ae5c43c2de6ea11dfe3ea34fc5f7c96a2bc66f3d7b02ce1bc7749ec32
 MISC metadata.xml 805 BLAKE2B d90fd4afcd89ea87b592be42fa34d1279f2fc28b24c3891c2065b909b197927014c3e96d6cc88797b5cb9ccb087efdb2f3b31bb436bde3e7d6858cdacb714c3e SHA512 4bbb4b673edf832e0e5bd985d3d11e813d8512c31e79441c8b0321b4d40f89bf0a15b5bbcf12f3ef9294fa831c35b7dc518be1a86b2fb87eab173a6b2bccf476
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
index 798a81f93df2..54c8396f2ffb 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/trove/Manifest b/dev-java/trove/Manifest
index 6064f06e6989..5e0fee619326 100644
--- a/dev-java/trove/Manifest
+++ b/dev-java/trove/Manifest
@@ -1,3 +1,5 @@
 DIST trove-3.0.2.tar.gz 5880161 BLAKE2B a3dbb6a967ad9a519bd04abbbbf9e6af483360991956ff79532462a9ad471d409744017a3b24e4a09d2377243406e5d7cd542b452da8f59a1a97b454a2f60a8c SHA512 27460a66bad6f206eaeae02453c94333456db5a9c566246d495fb4184d42de6033b66d1bf74060f799cf4298d531afeb9597b92da4e2963b43dd4ef072ee750b
+DIST trove-3.0.3.jar 1793123 BLAKE2B efc6ff678d2f5cef8c68403faafce3dfb66ba7b3c1ffa42ad6727cd71c6dbd77fa06b4a6eb23c44a794982a8f2933afa10d4a5555a8749f49cf5e0ae227afb5a SHA512 03e0a376258730cb79fd0dd0a68bfacba6ca4baf3a352cce621d64e091ccd3f24c143b592f3bbd5bbac26529bc425b814dff45680ac46fd323eca95b36d2b640
 EBUILD trove-3.0.2-r3.ebuild 804 BLAKE2B a45abfcf97789427544d1b181d6f1b1d1ae5b282ff6e4037ae7ccd4698d99e4d1d39a32521fbe7fea573b816428246c107e4684161eac702d7a947dae4702274 SHA512 fa0cea4d9739bbc1f3624de5b9032822b14c787321b6317b0ee1d078eb533fdedf053722b9800b532bdb93ec5647e28cc2d4f543d79bc228e34549516c3f9f48
+EBUILD trove-3.0.3.ebuild 664 BLAKE2B 6807abf758cd4a595ecfb521ecaf34f884e310e4a048b80b60de2fbe0a08a011520a948c34ede6ca0feca24d8d7a9689d5d7dd24a7635f3f9d55b0da1779455a SHA512 489bcab10a500cb16efe782610e7bd5c2bb69969e7691db843b8801952bd94ee8b01fc1876bdfcea5c8ca4a3842b4ee0461449009867a76fb506006a93405d75
 MISC metadata.xml 313 BLAKE2B 033a387e2850f70d371e4362736a66f796d8aa33ab9c46dc4d49a919533c0d9f6cf55588a58ae3d9a413cec5c98daaa65530e095dad86154d467a1749cd02b59 SHA512 8d83dca7ca9717cd91fab6805a9ec4fdab65161643d583cfe2134fbcbaea07ceb236773e88365b137a6e2fb5215c821f54955dd641d0037025b826d29ec0d2de
diff --git a/dev-java/trove/trove-3.0.3.ebuild b/dev-java/trove/trove-3.0.3.ebuild
new file mode 100644
index 000000000000..b8993f5ddf18
--- /dev/null
+++ b/dev-java/trove/trove-3.0.3.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+MY_PN="${PN}4j"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="GNU Trove: High performance collections for Java"
+SRC_URI="https://repo1.maven.org/maven2/net/sf/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+HOMEPAGE="http://trove4j.sourceforge.net"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+src_prepare() {
+	default
+	rm -v gnu/trove/impl/package.html || die
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 4f701e802d33..c616f19162cc 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index c7e9ebeb86be..d5bf39a65475 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -10,8 +10,8 @@ DIST R-3.3.2.tar.gz 29440670 BLAKE2B 37308fb0caf19c33196b496d5b6f2f1b5b6f75e3ed9
 DIST R-3.4.1.tar.gz 30200109 BLAKE2B 03602e9a48759caee8ce047fa6273df7a54af089de4489e21953c0e3fc7bfdf720d924f1e0167d3dbf65f63ed42ac10dea8b45289b921cda1c0e6d25a0063ebb SHA512 19bd50c87dc001ef947c15c1760f27ac8986ff6b43c6d90d3093ae184e42963027ef06faf31ec57ac9e519af7a35a2f53f8ea23ef75d800ebbd02945cedc4651
 DIST R-3.5.1.tar.gz 29812849 BLAKE2B 9390934e5da5bd223eee717d4e4c5bd7d47291811318b2fdeac59216081cf9e63119f17bc8fee7235e2426852c50eb5948e6a2a3a632047f41b36460e2584967 SHA512 382cc6e200469dd168799948edcf3a0b869d7ef3b3176fdfc60752f3f37e6ba356323c47d8815a4d9ab6ad3a21cd045d26ef5e75107c8685328e0ffcfd172f7f
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
-EBUILD R-3.2.2.ebuild 6037 BLAKE2B e0a3fc02936429eee12095a4ce5eb5421f9e028e13aea758f7b9a8e106b772f1b965533cc76ce93fbb08f63be0d52f3d38fd1e88f7022fc5f32bb6a45e0e0ad5 SHA512 e49930f4640d6ed0d641c0ffff2e8ce4c7c7238500a1f5d9250620f418c6687998a245b69101ba8186324bf4c8785c9e0125f8626879684c1740ab103795eb53
-EBUILD R-3.3.2.ebuild 6106 BLAKE2B bdc22fd06937cb17e5313b0f36e4f2f0749727114fdec3215df7f0db1f906e92b8bea7d729778507f0217d686f04d1d6f13315551e50a3a7debd0cd5e1dea122 SHA512 b831f6239d61f8f6026e0ad51d5046833ce7c1e8107f7af068be26f66bc275566cd98932a951837d6006014bb40b5196b0d30f40de985366fd094cb9d462f3a6
-EBUILD R-3.4.1.ebuild 6314 BLAKE2B 6287e46cf6ccc1aa201ca89f2936ee001b4befe4259c551e1488f44b5eca3b54f6705741aa8e908d03338e901dee669d54070eb8bd87d1d42c783ccc39b72c26 SHA512 80f4950a291300b4a08934d479c013ceec99c6a9099c07adfee1513940dbe1a3b27db2823855c22b242e82063cb0759344dac9f6d778ade940218de2c126a547
-EBUILD R-3.5.1.ebuild 6311 BLAKE2B f8c22be74d61be715aee736aa4d03c9dd5951aaef1efd95528305ef69e70a46e37bd553802642510866db37b8943c40dd67526103ebb10fb335c78b25ecdd6bf SHA512 a8f4c6047f1b7e397c27622261d7f4e507a723d9255514542905c8d5ffdefbd75cc53e5da46c18c1a3e51ba39241f1e1ba07c1123840d17d3751f04ed80cc464
+EBUILD R-3.2.2.ebuild 6029 BLAKE2B 53a91af83eed96a2c47c61ea3505efdb4f3960206bb6c5c39fbd758578b7b3cebc9d154d6a96c9ea9dfedbe851c0b97ff7066bac74ce598f3821730eb880e6e5 SHA512 45d3213900ba5a817867d1143e5f9d3aa2a418452ff7bd80b5ffdd2c8e056d281b85c0fcc222e3b7c11134ddf097503efee2d1ca5e152f17daa1d41026f69a21
+EBUILD R-3.3.2.ebuild 6097 BLAKE2B 61e6e9f500d6d5f12f8c97c63a183cd0a54c976a4725675cbe3b29f68ca082c8d18e7927132046a94945a692da132c7ab2822039d07abdeefe99c618c1107773 SHA512 0900d19c06a05baa83ab7fb0f802953aa9caab41bd59347e97dd23f6abb4a4f01af5c133db7a5c39a05d8296dc4cef8a8f8b4247c1967b784857ab0979d18ea3
+EBUILD R-3.4.1.ebuild 6305 BLAKE2B 825b0f75bdaa468e635d125f23a19ca694f5fcaf123476811dd4d556ff1126cfea3f0ba0022d6b11d77c2474ef25cbf76442ed33a60fe007798f337a6133194c SHA512 2e6f523d73c6847331f62cd3a1af9b46b67e96c7d610058df0f71c5a0fc49178332a03edc1f499a3c13d1ecf1ab6364e09d2bc8fa94bd8d38700d5489495ca32
+EBUILD R-3.5.1.ebuild 6302 BLAKE2B d2b6b0fa24f3f79c807c99bdcbf7f7898096455df955cd8c08ce8d01b78eac86d32d456c1684e0f7bb087778886c0caaf356d0e9437f22050c7f38dc7002be9e SHA512 41ea0238ff7d823519be6f6be57f4026097be3451a92ee344abcc2fcdd98a99e5bb262f97ef21c5896dd46c2ff672f0ce39c178b68a011341c2f4377850486be
 MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1
diff --git a/dev-lang/R/R-3.2.2.ebuild b/dev-lang/R/R-3.2.2.ebuild
index a4ca3845b1ea..df833c293e46 100644
--- a/dev-lang/R/R-3.2.2.ebuild
+++ b/dev-lang/R/R-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
 REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
 
diff --git a/dev-lang/R/R-3.3.2.ebuild b/dev-lang/R/R-3.3.2.ebuild
index 2a3cb85b5cef..6ca1d812f3ec 100644
--- a/dev-lang/R/R-3.3.2.ebuild
+++ b/dev-lang/R/R-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
 REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
 
diff --git a/dev-lang/R/R-3.4.1.ebuild b/dev-lang/R/R-3.4.1.ebuild
index 87ba2dd8f312..e273a93fab87 100644
--- a/dev-lang/R/R-3.4.1.ebuild
+++ b/dev-lang/R/R-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
 REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
 
diff --git a/dev-lang/R/R-3.5.1.ebuild b/dev-lang/R/R-3.5.1.ebuild
index 23d0c99a3273..6c443c1bd29f 100644
--- a/dev-lang/R/R-3.5.1.ebuild
+++ b/dev-lang/R/R-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
 REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
 
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index 14b0ac0638c4..2f3d5956d243 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -1,7 +1,9 @@
 DIST execline-2.1.1.0.tar.gz 75967 BLAKE2B 196edcfce385a2a3ef8bc3b16f94401430e06649c1ef9157da603904c296e3601433248046393d0c5ef9805107d09caf21f185b0c3ea3cabfde88508280bd5bd SHA512 250fe449b39a198193f1431b249b342f3c6c499fea12779a55d0e27aec2095285bbf9dc2a48d84eebdf9f540ecf5e67ef39393243ca0fadfc764d2cc95ac0b6b
 DIST execline-2.3.0.3.tar.gz 82476 BLAKE2B e54bf40037d988848a31b90ca477fb1a297bfc91a6ceb51289944cccc7af36a26b8323c63e8178bd9a252b482a703329c04c9f08a25c2cfe94f5baf60983d04c SHA512 2858ce62853f00f59e0cea8b886cd042f7ad04c6a86208266654d3d2e820b5d440e41cc4efb96fccdcc653d19957d343115a8e8c394b68f23addf941294fb172
 DIST execline-2.3.0.4.tar.gz 82774 BLAKE2B a658b538d0a17f15876fe9a822bb7c7e4edba48d2fce1d3c0fe0fd06fd8a414e062a962ca3935992903a4abccf920bf6ee957743609905a6ce498e6fd3deded8 SHA512 ce73b69394ec061ad85cf6f69211180bffe69f1b9716217dadca5894a261f77343d54d5f0339b3822c472720e60c4aa100a0e05dc83f2ad6b926bb53b5141c15
+DIST execline-2.5.0.1.tar.gz 81854 BLAKE2B a70e8c9c3a739fb32573937c9b5c1fb65c730bea7e7760d81b62ea7666727a29ae9902139f78660891e65ed3e6769fc5d6afcb2fb3e030e0c75d3acb6392fd39 SHA512 9e013a83844fc3f5b28c6aea44b446f550dafe52131facf0d7c0648c9ae62c4a62d895f72cedb010754319c0e298fb4c8396d2c6be019cd6218558934bffaea3
 EBUILD execline-2.1.1.0.ebuild 1213 BLAKE2B 6fc9dc130bd71bc590e0bf46e763b3936a8c9033fa7b9e267593901470a9a2dc15322c3a18e03fb38676fdd5db0bff0dbd647d1ecc82ece445da23112f7a4ca1 SHA512 788d3961de599828e7acc2159422780edd0c8cf5c0d98aa280d2c4f52eb796b3979dfd9e820ef81007b1c0f7a6252e5805b11c9fbeba5c11b9acc862f4b80bbf
 EBUILD execline-2.3.0.3.ebuild 1295 BLAKE2B 3b7562389a92c2d92bfcf7b7334638cb7bede79a7b1fc21b57c30661b316e1573c1b56476f94292d499d29ce8f8ccf6279c7f9886e92ed54a89bb2e22c452108 SHA512 f3b3659102780e31c0b6cc61505bf6af2bc1b23af11ca98c4ebb5012b3191f333f2eedc77a7644992c317d4fa3668acabe38f99d80356b07c770cc9b6b2c913f
 EBUILD execline-2.3.0.4.ebuild 1295 BLAKE2B 00c156c18fbffd8a09272af21cd1b347f8fcabd9d34f5f17f3d9e5ba76c80fcdddfe00a27df02965892b444269f4d3e1bf9d9f41ff2b7d5f67238a72e828d72f SHA512 5f7324afbf7106800542c548214b9d698ad0d2122590df5ea9f5f34433d2d966f7aca43fda286fcf740605358bf0c8d3d47d160cdd714f70dbfcc66db85e20aa
+EBUILD execline-2.5.0.1.ebuild 1190 BLAKE2B 9a158994fd21364aec75557447d50142d15bc995b5f4097d8d52dc441864caee948717fbffccb134f35f772bc83723ab20d3b4f1bb85a0e737aff182958ea3aa SHA512 00eb25af751c6efd32869019fe3d6370ae5728f911d1c9db7949cdd046f4c5cc9d5d025e044dd68637ed49a80db2641f912a73ef0de9c53383767454cc0022f0
 MISC metadata.xml 808 BLAKE2B 493e9369dca91a49b964006f1abc1a9285a03115b60c13312f83be014d8a8a3a8ab4b3a5b4c21fda6850c317da52440a0f9b5d8fdc5d3536b35d84c059b71731 SHA512 aa5d0e5f6898c853818187a40791e1fed0fce3f3e9429329d9a4224e9fa25165a2336a3202080404c531e8cba718bf6da158b49c108874bf8b72e6d21c9cd31f
diff --git a/dev-lang/execline/execline-2.5.0.1.ebuild b/dev-lang/execline/execline-2.5.0.1.ebuild
new file mode 100644
index 000000000000..e3d5fb4aabe0
--- /dev/null
+++ b/dev-lang/execline/execline-2.5.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="a non-interactive scripting language"
+HOMEPAGE="https://www.skarnet.org/software/execline/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+DEPEND=">=dev-libs/skalibs-2.7.0.0[static-libs?]"
+RDEPEND="!static? ( >=dev-libs/skalibs-2.7.0.0:= )"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/dev-lang/ferite/Manifest b/dev-lang/ferite/Manifest
index 932c5d38bd7e..1839a7b8c5b1 100644
--- a/dev-lang/ferite/Manifest
+++ b/dev-lang/ferite/Manifest
@@ -1,4 +1,4 @@
 AUX ferite-pcre.patch 1356 BLAKE2B f2c3669e33d12dce6e00d22b5884f0770021eb77297997bd94e777b114f8ae24f7ed23b10d7c877a7bffb61fe9ff0e126bd717ea8c8a8fb8186da89178ba4926 SHA512 e867c4b2fc993963bdf17d992d3dd007f636c85b0c13388480cec0f0ff70b6596274c19cd46b0e3ee11064f607b381f7f76888819ef6fb3bdd0804b07b5087fc
 DIST ferite-1.1.17.tar.gz 2174774 BLAKE2B 5e55ed4101bc5a9c031afef0d9bfcafdc0c498c4ddc712eb17e3059ebd55b925e6b0343113853b946a31a428e5f71c17a2365e629447bb504453b6a7d61358d8 SHA512 475983b865fba492661e59b7470b7e46889f29ed8ba829b112354963fafcbed6ab4d4677579337c1c4ed730c6fe02897743f56edae335ceda6277da975d1098f
-EBUILD ferite-1.1.17-r1.ebuild 2419 BLAKE2B fb80ad9d2c8a3686334bd5d1c1f589965358e48c6d76e915082df64f3b72104bac37ad01c4fee9fca5203e79227b52119a61521b4f1d4b027541cb12bcbe3214 SHA512 bf2c5f4bda036da71a796a15d4b5a2f035fcf90a81800bc3241b55b86b52a6bdba659bff62a257c75e4d8a9499c1c8cae40523623db32299649b56b7de0bef7a
+EBUILD ferite-1.1.17-r1.ebuild 2467 BLAKE2B c3610f42a663bca0d35c6234ba0e04c9d6894b46fe06fe43db55ae56b01e1b3dca9fdd915dcc8486fe19b42bb8993ea0f2efe0645abf71a0f865f5e8bd855dd3 SHA512 5bfb72482bea359601365f8d6c0d1fc453f457376478b1231f07bbc67c8f3dfb76fc01a17f628b83a3288a1fffee43229d9e535be4ea2abfd681337fc8aa0460
 MISC metadata.xml 243 BLAKE2B fc4ef3433d84176432ef31abd4960ce0e2dcd4979228bf565712a1e574451b34689a8fff3dab4142e3997f084729bba1bc3d2c38d6ddf10d95a11e0b4412e03a SHA512 e3315331fae1a640778867a807694dc624ac88e4dbae2546780534a629d65d054cc6e376245fd31432d663775121cf07d74b2f1cd65d9d2d9cf9137d6598897a
diff --git a/dev-lang/ferite/ferite-1.1.17-r1.ebuild b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
index 37886bbe0a6e..8b06ab09a724 100644
--- a/dev-lang/ferite/ferite-1.1.17-r1.ebuild
+++ b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit autotools eutils multilib
+EAPI=7
+inherit autotools
 
 DESCRIPTION="A clean, lightweight, object oriented scripting language"
 HOMEPAGE="http://www.ferite.org/"
@@ -14,13 +13,17 @@ SLOT="1"
 KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND="
-	>=dev-libs/libpcre-5
-	dev-libs/libxml2"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	dev-libs/boehm-gc[threads]
+	>=dev-libs/libpcre-5:3
+	dev-libs/libxml2:2
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/ferite-pcre.patch
+	default
+
+	eapply "${FILESDIR}"/ferite-pcre.patch
 
 	# use docsdir variable, install to DESTDIR
 	sed \
@@ -70,9 +73,11 @@ src_configure() {
 src_install() {
 	cp tools/doc/feritedoc "${T}" || die
 	sed -i -e '/^prefix/s:prefix:${T}:g' "${T}"/feritedoc || die
-	sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'usr/bin/ferite:' "${T}"/feritedoc || die
+	sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'/usr/bin/ferite:' "${T}"/feritedoc || die
 	sed -i -e 's:$library_path $library_path:${S}/tools/doc ${S}/tools/doc:' "${T}"/feritedoc || die
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}usr/lib"
+
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}/usr/lib"
 	emake DESTDIR="${D}" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install
-	prune_libtool_files
+
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index ab39b0aa13d4..736fb61d53a5 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -13,6 +13,7 @@ DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc SHA512 da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf
 DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812
+DIST gcc-4.9.4-patches-1.3.tar.bz2 26060 BLAKE2B a61cb29111e8a9e35d810c0c557e901fc0d78e3b62027f5ea622d29becff9492e350c932824b23e5a38604bc3fa6c39fed9db902df4f830a3a362f1a1c2d9f58 SHA512 0214da6712a1b583f028be60e562f742d3d484d930976e2fce7be090113517c0e07faa20f750411b5125902f38a9944fe0c1dc8605d161c5bb11843acdebab75
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
 DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
@@ -21,6 +22,7 @@ DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f2
 DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
 DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab863302943588226d5b599dfa1acf0e495111be1c581f4e130f911c312916669c4f2707eec5218601db090d5060248b2fe481d710 SHA512 79f06deca5753251de82a703f4a9698c117706290df779291a5405edb06f1c225d1d2416bda0e67dcd87cc308bf79504e89d4bd8e22aa0eedfbf06d88bc37f33
 DIST gcc-7.3.0-patches-1.4.tar.bz2 8238 BLAKE2B 72a5dcb046558c8f5c3a75040fe24ce1106c43af7510d6febf667b4377cb9caea5ebe9e1287af90e4ebfffa3f3f22ca85f533acf57c2e2d896f92adc1659b9f5 SHA512 24ed0d82240426efb111bbf48913b96fdc824ae3aa5a653298a726ebe64a40791f484229bbab9cc58f73d658e0b4b83ccd13081cfbea6e1673ef1d076cca3b33
+DIST gcc-7.3.0-patches-1.6.tar.bz2 11313 BLAKE2B cdb823d73a66949cd73f9ebff50cf1cdbb59f04b439a700c239110d36982d70c8acd219402ce8aea26f848d5067856d9aa54470ea683678bbfe9fe08a9f592d1 SHA512 7670deb57e07a83a05f54d962c0faa36d91d8cf43f9f023d3231983e98768d9f90f2a3c9a95f69853086012474fc336bc47fc4af4ab9337b69c89415ce61c1c4
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd
 DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
@@ -30,7 +32,9 @@ DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688
 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
+EBUILD gnat-gpl-2016-r1.ebuild 5680 BLAKE2B 60f04ec0a78d589656ca1c7307c67051cbfe9c97cf2125fc90531631d61e8f28f7b5d8039820033f37145f6780878c4270216c236744b791eb180c577ccbc5b4 SHA512 3879af661544424ef47dd02461e9a815e96411064e1bc12d7ad52dce29ec90a1f836a9619a08d3feb513a245a21f5eaa04e919ba6ff60081fea7bd6faa4f8801
 EBUILD gnat-gpl-2016.ebuild 5681 BLAKE2B d1c5db2018a8e8d5c9dbb10caf800aa2b3ea220ed7276fa77c43bdef541e523377ea6024d89db75277a68c28796d8fc5d339bdac52802682cc33e6cb458b3922 SHA512 3a6180130b11c3fc9c417f6cfb0303ee21b6e5c183a547e23e9510ea119d3a5becb31a4a073d5b160f9b7146b35c82ab12ea7bb7cdb53b899e89ca1177c3aebf
 EBUILD gnat-gpl-2017.ebuild 4916 BLAKE2B 63c46822894529952dec8f45723b09e590c69269bfc4b3408dc6d720fa72b574956aa3e2a8adc51c400baf02414454d3153022e59cb69ebb4c5c9214fefcc40f SHA512 3d7d6b8fac5e9d0be36df050451a959437796d63f30a678d756af7e9aa5a036d13d2a25a2dcbd16aee799c44cb41ade35ca5771a43dc779ec74d341cd835d99b
+EBUILD gnat-gpl-2018-r1.ebuild 5001 BLAKE2B 162100c8960728c1c161bf5f7abc89e1e20919e456968b68faaf6a76fb0ca40cd01f223a245a9cc46ccaba0c741a34ff5c2c3a5c6dcc1697f54b2999a6769d63 SHA512 f29bfbfe1e122e6c517f740b9da3a65953cdcae14394810446f3a26c26db81164d48275281d14ad2aa205feaf88780669fe31d8b65c746e84cc39a87c0dba740
 EBUILD gnat-gpl-2018.ebuild 4977 BLAKE2B d3444587edad2afcc11eb5a83bcbddc7bdd849140247d9cd049445b356030045709525699e7e616ffa1feda40cd27e141fda5514ef92646e6e56e024e49da504 SHA512 aad1ee06999dec10fa2e7e50867e1a6adbe361de5e795d8f1642831ce2d66559957917d0e9a80cd8498bb447ef8191692f62d162a8760c7831c3468c42946966
 MISC metadata.xml 1960 BLAKE2B e66552f4c0655619e736b6af14822d84e6c49aa6c019cb8c8b0e215629f9c8ab68aa55758639e35107120a39c578d82e1036bc0be82ff67728104f44c875d107 SHA512 04f14bcdd96ae4f6e285abfd07de89828eb989ce779aa59decf689920a179d859ffe809d7960e9c3599c2f6fff6ab2aafbb54458da07fa91841c61e0dfca47ab
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild
new file mode 100644
index 000000000000..ac29e3d9590c
--- /dev/null
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.3"
+UCLIBC_VER="1.0"
+
+# Hardened gcc 4 stuff
+PIE_VER="0.6.4"
+SPECS_VER="0.2.0"
+SPECS_GCC_VER="4.4.3"
+# arch/libc configurations known to be stable with {PIE,SSP}-by-default
+PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
+PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
+SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
+# uclibc need tls and nptl support for SSP support
+# uclibc need to be >= 0.9.33
+SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
+#end Hardened stuff
+
+TOOLCHAIN_GCC_PV=4.9.4
+
+inherit eutils toolchain-funcs toolchain
+
+REL=4.9
+MYP=gcc-${REL}-gpl-${PV}-src
+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
+
+DESCRIPTION="GNAT Ada Compiler - GPL version"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI+="
+	http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f
+		-> ${P}-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db
+		-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d
+		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
+	bootstrap? (
+		amd64? (
+			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
+			${BTSTRP_AMD64}.tar.gz
+		)
+		x86? (
+			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
+			${BTSTRP_X86}.tar.gz
+		)
+	)"
+
+LICENSE+=" GPL-2 GPL-3"
+SLOT="${TOOLCHAIN_GCC_PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bootstrap"
+
+RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	>=sys-devel/binutils-2.20"
+
+PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+
+S="${WORKDIR}"/${MYP}
+
+FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
+
+pkg_setup() {
+	toolchain_pkg_setup
+
+	if use amd64; then
+		BTSTRP=${BTSTRP_AMD64}
+	else
+		BTSTRP=${BTSTRP_X86}
+	fi
+	if use bootstrap; then
+		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
+	else
+		GCC=${ADA:-$(tc-getCC)}
+	fi
+	CC=${GCC}
+	local base=$(basename ${GCC})
+	CXX="${base/gcc/g++}"
+	GNATMAKE="${base/gcc/gnatmake}"
+	GNATBIND="${base/gcc/gnatbind}"
+	if [[ ${base} != ${GCC} ]] ; then
+		local path=$(dirname ${GCC})
+		GNATMAKE="${path}/${GNATMAKE}"
+		GNATBIND="${path}/${GNATBIND}"
+		CXX="${path}/${CXX}"
+	fi
+}
+
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	GCC_A_FAKEIT="${P}-src.tar.gz
+		${MYP}.tar.gz
+		${FSFGCC}.tar.bz2
+		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
+	if use bootstrap; then
+		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
+	fi
+
+	toolchain_src_unpack
+	if use bootstrap; then
+		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
+	fi
+}
+
+src_prepare() {
+	mv ../${P}-src/src/ada gcc/ || die
+	mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die
+
+	sed -i \
+		-e "s:gnatmake:${GNATMAKE}:g" \
+		gcc/ada/Make-generated.in || die "sed failed"
+
+	sed -i \
+		-e "/xoscons/s:gnatmake:${GNATMAKE}:g" \
+		gcc/ada/gcc-interface/Makefile.in || die "sed failed"
+
+	mv ../${FSFGCC}/gcc/doc/gcc.info gcc/doc/ || die
+	mv ../${FSFGCC}/libjava . || die
+	rm -r ../${FSFGCC} || die
+
+	cd ..
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	rm patch/10_all_default-fortify-source.patch
+	rm piepatch/34_all_gcc48_config_i386.patch
+	cd -
+
+	if has_version '<sys-libs/glibc-2.12' ; then
+		ewarn "Your host glibc is too old; disabling automatic fortify."
+		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
+		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
+	fi
+
+	# Bug 638056
+	epatch "${FILESDIR}/${P}-bootstrap.patch"
+
+	toolchain_src_prepare
+
+	use vanilla && return 0
+	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
+	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
+}
+
+src_configure() {
+	local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
+	GCC_BRANCH_VER=$(gcc-version)
+	downgrade_arch_flags
+	GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
+	toolchain_src_configure \
+		--enable-languages=ada \
+		--disable-libada \
+		CC=${GCC} \
+		GNATBIND=${GNATBIND} \
+		GNATMAKE=yes
+}
+
+src_compile() {
+	unset ADAFLAGS
+	toolchain_src_compile
+	gcc_do_make "-C gcc gnatlib-shared"
+	ln -s gcc ../build/prev-gcc || die
+	ln -s ${CHOST} ../build/prev-${CHOST} || die
+	gcc_do_make "-C gcc gnattools"
+}
+
+src_install() {
+	toolchain_src_install
+	cd "${D}"${BINPATH}
+	for x in gnat*; do
+		# For some reason, g77 gets made instead of ${CTARGET}-g77...
+		# this should take care of that
+		if [[ -f ${x} ]] ; then
+			# In case they're hardlinks, clear out the target first
+			# otherwise the mv below will complain.
+			rm -f ${CTARGET}-${x}
+			mv ${x} ${CTARGET}-${x}
+		fi
+
+		if [[ -f ${CTARGET}-${x} ]] ; then
+			if ! is_crosscompile ; then
+				ln -sf ${CTARGET}-${x} ${x}
+				dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+					/usr/bin/${x}-${GCC_CONFIG_VER}
+			fi
+			# Create versioned symlinks
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
+		fi
+
+		if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
+			rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
+			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
+		fi
+	done
+}
+
+pkg_postinst () {
+	toolchain_pkg_postinst
+	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
+	einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}"
+	einfo "Even if the c/c++ compilers are using almost the same patched"
+	einfo "source as the sys-devel/gcc package its use is not extensively"
+	einfo "tested, and not supported for updating your system, except for ada"
+	einfo "related packages"
+}
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
new file mode 100644
index 000000000000..13a8539ec192
--- /dev/null
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.6"
+
+TOOLCHAIN_GCC_PV=7.3.0
+GCC_CONFIG_VER=7.3.1
+
+inherit eutils toolchain-funcs toolchain
+
+REL=7
+MYP=gcc-${REL}-gpl-${PV}-src
+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
+
+DESCRIPTION="GNAT Ada Compiler - GPL version"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI+="
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5
+		-> ${P}-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7
+		-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6
+		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
+	bootstrap? (
+		amd64? (
+			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
+			${BTSTRP_AMD64}.tar.gz
+		)
+		x86? (
+			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
+			${BTSTRP_X86}.tar.gz
+		)
+	)"
+
+LICENSE+=" GPL-2 GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bootstrap"
+
+RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=sys-devel/binutils-2.20"
+
+S="${WORKDIR}"/${MYP}
+PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
+
+pkg_setup() {
+	toolchain_pkg_setup
+
+	if use amd64; then
+		BTSTRP=${BTSTRP_AMD64}
+	else
+		BTSTRP=${BTSTRP_X86}
+	fi
+
+	if use bootstrap; then
+		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
+	else
+		GCC=${ADA:-$(tc-getCC)}
+	fi
+
+	gnatbase=$(basename ${GCC})
+	gnatpath=$(dirname ${GCC})
+
+	GNATMAKE=${gnatbase/gcc/gnatmake}
+	if [[ ${gnatpath} != "." ]] ; then
+		GNATMAKE="${gnatpath}/${GNATMAKE}"
+	fi
+}
+
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	GCC_A_FAKEIT="
+		${P}-src.tar.gz
+		${MYP}.tar.gz
+		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
+	if use bootstrap; then
+		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
+	fi
+
+	toolchain_src_unpack
+	if use bootstrap; then
+		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
+	fi
+}
+
+src_prepare() {
+	CC=${GCC}
+	CXX="${gnatbase/gcc/g++}"
+	GNATBIND="${gnatbase/gcc/gnatbind}"
+	GNATLINK="${gnatbase/gcc/gnatlink}"
+	GNATLS="${gnatbase/gcc/gnatls}"
+	if [[ ${gnatpath} != "." ]] ; then
+		CXX="${gnatpath}/${CXX}"
+		GNATBIND="${gnatpath}/${GNATBIND}"
+		GNATLINK="${gnatpath}/${GNATLINK}"
+		GNATLS="${gnatpath}/${GNATLS}"
+	fi
+	mkdir bin || die
+	ln -s $(which ${GCC}) bin/gcc || die
+	ln -s $(which ${CXX}) bin/g++ || die
+	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
+	ln -s $(which ${GNATBIND}) bin/gnatbind || die
+	ln -s $(which ${GNATLINK}) bin/gnatlink || die
+	ln -s $(which ${GNATLS}) bin/gnatls || die
+
+	cd ..
+	mv ${P}-src/src/ada ${MYP}/gcc/ || die
+	mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	rm patch/91_all_bmi-i386-PR-target-81763.patch || die
+	rm patch/93_all_copy-constructible-fix.patch || die
+	rm patch/95*.patch || die
+	cd -
+	sed -i \
+		-e 's:$(P) ::g' \
+		gcc/ada/gcc-interface/Makefile.in \
+		|| die "sed failed"
+	toolchain_src_prepare
+}
+
+src_configure() {
+	export PATH=${PWD}/bin:${PATH}
+	local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
+	GCC_BRANCH_VER=$(gcc-version)
+	downgrade_arch_flags
+	GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
+	toolchain_src_configure \
+		--enable-languages=ada \
+		--disable-libada
+}
+
+src_compile() {
+	unset ADAFLAGS
+	toolchain_src_compile
+	gcc_do_make "-C gcc gnatlib-shared"
+	ln -s gcc ../build/prev-gcc || die
+	ln -s ${CHOST} ../build/prev-${CHOST} || die
+	gcc_do_make "-C gcc gnattools"
+}
+
+src_install() {
+	toolchain_src_install
+	cd "${D}"${BINPATH}
+	for x in gnat*; do
+		# For some reason, g77 gets made instead of ${CTARGET}-g77...
+		# this should take care of that
+		if [[ -f ${x} ]] ; then
+			# In case they're hardlinks, clear out the target first
+			# otherwise the mv below will complain.
+			rm -f ${CTARGET}-${x}
+			mv ${x} ${CTARGET}-${x}
+		fi
+
+		if [[ -f ${CTARGET}-${x} ]] ; then
+			if ! is_crosscompile ; then
+				ln -sf ${CTARGET}-${x} ${x}
+				dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+					/usr/bin/${x}-${GCC_CONFIG_VER}
+			fi
+			# Create versioned symlinks
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
+		fi
+
+		if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
+			rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
+			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
+		fi
+	done
+}
+
+pkg_postinst () {
+	toolchain_pkg_postinst
+	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
+	einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
+	einfo "Even if the c/c++ compilers are using almost the same patched"
+	einfo "source as the sys-devel/gcc package its use is not extensively"
+	einfo "tested, and not supported for updating your system, except for ada"
+	einfo "related packages"
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index ce7f97e4ba07..794c945bef19 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -12,12 +12,14 @@ DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe59
 DIST go1.10.1.src.tar.gz 18305765 BLAKE2B 61b8db22c50b9a4653244dc18267f405607755932d84ea2c475338a9f4a5421da2bb8cc808dbd166aa35c3c8778180bf47d6e51ebe303bc62e582516919058f9 SHA512 13f6b0643a4f92eeca04444b9fa10de38fc3427daea9aa3227cf9a5738ffee1a3f2e355ba5faf711b8506f7de118bdcd3b9064b65407a22613523e29ffd73415
 DIST go1.10.2.src.tar.gz 18308678 BLAKE2B 5f16757f879e9be9d2e936bc5e3cefcfd32914dbe7def8252b20ac647c90cfae09dfd7ff782f55cee4b3fecda6cc88c547f20087b571dbd06bc7600510c788bc SHA512 754e60bce1ea3479ebb57bbbb625e3d7875a151e7a6d7a1067478a9e45bde5423f47123d084832bb838acf7675a9d05057b76c1d773e43cae0fb4e7a52acf4a9
 DIST go1.10.3.src.tar.gz 18323736 BLAKE2B f07ea774378eb25e28fc29ce6d8d7ed84227d4b93bfa93d38a071fe294da30c3cdc3a559d643e7379873df56b0e2731dbd772e385ffcb4b2e93819db3b4e33f2 SHA512 fd2bd5fcb5c6d0a5336c4b1d2cacb368edbb01359297a83bdedc53f6018642598232f00633fc60fde879050f5f26a810c828d46b5d6626cbcc0702d93ad33fbb
+DIST go1.11.1.src.tar.gz 21097206 BLAKE2B 12303f57a92ec64badffea9e98a0361f48b844d423f3ed454ba4bfdd367425e7b318de1cf9b3e7835585f6dbb01f5c07bfb43adbfcc90a590b35984752ef8d3c SHA512 9c19f40b24f2180563705511a5692932c0db3585939053e6d78eea1f394902d37f05b0386f0e7d0c0266178de7e9bd7b003324ed232ce2e5050c9faafafdd979
 DIST go1.11.src.tar.gz 21091932 BLAKE2B 029b1c43b6244ab320b24fccca2bac693a0df0f975da2880a24e85fafbd7d6c836f63c609f1df44fb3eacc1c66c3d147858b7a2b9c0c370bb8fdbc8614b35713 SHA512 2758b7924b4b8cffc30b56fbf039b8e23d1a3c42506ed4997bd64531ba742e2c60e95d1fa70cae2ccda45d1959fadccfd2404af87d962530e4b1d3556c4aaf43
 DIST go1.9.6.src.tar.gz 16397247 BLAKE2B 36c9077177bd7bbe9b40c422c5faf7aa83fdd8a2360051cb026346a9fea35297d892d6c677962c498ea8531c1748d58a55bbb1db7c1cf323a1d65c0b9b8573fd SHA512 f7863a4fe586414c91465a6a82a47097b2593384688a7c68ad3e9981559047b4faf2c134104ad09a64125576dac557809884d9f125d91108dd51746620a368a2
 DIST go1.9.7.src.tar.gz 16401688 BLAKE2B f6fa7b7171595f6bb2b1860c10a34c386b781504b772a37b60ccd613850f916a463bdb1e2bf299c3d8e78e38cbdf0b59e1ee8dfc3597ef888450efb3eb6afc49 SHA512 1ed3375870223a73c9cf94839bfd8894b92f44f9a3ba3b2bec1e9cd8d2212519344c8afcb87a516d6ad3e1ccdc74d9dba225a222bdc5e60f6d73cb474d5f7664
 EBUILD go-1.10.1.ebuild 5653 BLAKE2B 4807f630943168bc970ee2f94acdd82b7619c55d0ea7fd33fbc5f5f0107342f1edf18edfe8e4c6f1a75063755c67a8b0c5d578ca3de275d8c960315dead33c5a SHA512 f51d57aa2a504ae77b3f117f2a3f1d088d534a3dcf9ec16d102e71b42a479618a18b495b6aacf967f90d7cbaf47f3e7c39e16d65fa120be1bba7726c552d1e48
 EBUILD go-1.10.2.ebuild 5656 BLAKE2B 1a140da0f482e46eaf80aa9836e934440fb309a61519c164999e75340614b383fc18dcc4cf3d70addd42f5ef289c9b167dfdc99abf52159aedb163c7426684e2 SHA512 630d6003c12c9f512f4c259be18e5c5716627968cc4725ed6d016076984aae3f90b30ce542ed8407f95a9db377502265e30b6a36d5725ce36ca3005d2c00535a
 EBUILD go-1.10.3.ebuild 5653 BLAKE2B 4807f630943168bc970ee2f94acdd82b7619c55d0ea7fd33fbc5f5f0107342f1edf18edfe8e4c6f1a75063755c67a8b0c5d578ca3de275d8c960315dead33c5a SHA512 f51d57aa2a504ae77b3f117f2a3f1d088d534a3dcf9ec16d102e71b42a479618a18b495b6aacf967f90d7cbaf47f3e7c39e16d65fa120be1bba7726c552d1e48
+EBUILD go-1.11.1.ebuild 5653 BLAKE2B 06e491cb9a25870709a9cc04f6e5d45121153bc02b9ff9f6390a006ba175550a2b3ca0adf4f9245b6726ae0b9db39146547f764dd0d466e04fb6552b7f0a26d6 SHA512 30f3f945be04c191e44cbaf2fff47a89cbe910bb2230bafe2817c39cfe4f3da7ea7ad586fa2752bdf378a1e7334e2fd6f392ffeb6d9b3d924c4be765b89a628e
 EBUILD go-1.11.ebuild 5656 BLAKE2B 1a140da0f482e46eaf80aa9836e934440fb309a61519c164999e75340614b383fc18dcc4cf3d70addd42f5ef289c9b167dfdc99abf52159aedb163c7426684e2 SHA512 630d6003c12c9f512f4c259be18e5c5716627968cc4725ed6d016076984aae3f90b30ce542ed8407f95a9db377502265e30b6a36d5725ce36ca3005d2c00535a
 EBUILD go-1.9.6.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84
 EBUILD go-1.9.7.ebuild 5649 BLAKE2B d448a6132d795715d7b42daa2f437b1bfadeae1fb5c4cef936343c0e31bd415bd5a6deab2a3690ddc03afbac612ec2a9d39951dfcdc49b3217016bbc620a25fc SHA512 275f0808e1e1b0687ed1ea85785afd02713e6877fe2a107b614522644fe5b7a81742f16aa8291c4001ef225ff7e31ed4270c3d8dcc991b2d97d20f1174f72f0f
diff --git a/dev-lang/go/go-1.11.1.ebuild b/dev-lang/go/go-1.11.1.ebuild
new file mode 100644
index 000000000000..3eecca0eb622
--- /dev/null
+++ b/dev-lang/go/go-1.11.1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_URI="
+amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
+arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
+arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
+ppc64? (
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+)
+s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
+x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
+x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
+x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/escapeinfo.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+}
diff --git a/dev-lang/mono-basic/Manifest b/dev-lang/mono-basic/Manifest
index a7f20c33a3d7..30e8a1ca8ec8 100644
--- a/dev-lang/mono-basic/Manifest
+++ b/dev-lang/mono-basic/Manifest
@@ -1,5 +1,7 @@
 DIST mono-basic-4.6.tar.bz2 2051520 BLAKE2B 0fc4961e9beb0894dcc081ecd06abf8a2e1c3d1aa6bb129b72d2c87ab15e9e779c0305f030515b18bd218ac595cd03ebad2fef5403dfc5aeb7a58b8886d085a0 SHA512 a8b50f9fa0d2e7533429722e584f42ee3e3794e1e013a2ca75b616b2b7b8c755dbe0722187b5e0982b9ebb8b5d22310a21fcfd55a6c027ee6eadcc7887e106d9
 DIST mono-basic-4.7.tar.bz2 2051806 BLAKE2B 8d8beb26bfc79c5ff648d671fc92d0f15204694ac735d1ab0c375547f7f4a89519f24bc512ecc16ae93455c7c28978ef2112804335a02b9ccb63e537298e11d5 SHA512 c690f81d7af64d1592bc480be230abc93480728288291fe85de5c8b273eb6127d619c3bd02f2acd285b9b055ef4f2970a764b34f49f15e59ed238d01c151c99a
 EBUILD mono-basic-4.6-r1.ebuild 362 BLAKE2B 618f679c8799d411890b6cc04659c483e625cf61fcbb90170f40e836b7dc70f0a43b5e8a74e882c41d6e38da6fae1b702b56bff81479cc889ba4a1ca30278254 SHA512 af3b3f01bf27ee045698b2f5eafbdac6aa38e78880059a484c22e0bf271702a105c26e44d2d045bf318d66886b05c221ca7c05ff4e8a87b9f8ba7d1b0c5daed9
+EBUILD mono-basic-4.6-r2.ebuild 376 BLAKE2B 488be1e16d840dc0cfa39a3da5fc5ec5cfb43d41cf9776d771df53a7144698afc459ff75b15097a7f1ac3ff10c460109d18bdb24e55a4d2d9e6efaef4ee4efbf SHA512 75a592dc0813ffeec52c2f5d00da1c56db926e2fb4620dc0073773a787abd046320339cd8dc7b34f846a7faec2f1a1de525fb10e8f27c0c874a2daaa7ef48d8f
+EBUILD mono-basic-4.7-r1.ebuild 376 BLAKE2B 488be1e16d840dc0cfa39a3da5fc5ec5cfb43d41cf9776d771df53a7144698afc459ff75b15097a7f1ac3ff10c460109d18bdb24e55a4d2d9e6efaef4ee4efbf SHA512 75a592dc0813ffeec52c2f5d00da1c56db926e2fb4620dc0073773a787abd046320339cd8dc7b34f846a7faec2f1a1de525fb10e8f27c0c874a2daaa7ef48d8f
 EBUILD mono-basic-4.7.ebuild 360 BLAKE2B 46c2cc0d9f60948231b3242130f042a2a90517d87ebd27630281a0b239ff0ba316c5ae481f0e3226c2c03516ba1f3ee7230d3a2c00eb73eeeec4d2746a82a3b7 SHA512 8c7955d9e62c3f065dabe59c0a4fa3be3f52fa238f3c8033abd8ff45d882b70dc8f326af304bb44b06996e42bc5127a2c40f809853df743f2d48e51e01fac6d3
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/dev-lang/mono-basic/mono-basic-4.6-r2.ebuild b/dev-lang/mono-basic/mono-basic-4.6-r2.ebuild
new file mode 100644
index 000000000000..9a28161ec719
--- /dev/null
+++ b/dev-lang/mono-basic/mono-basic-4.6-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit mono-env
+
+DESCRIPTION="Visual Basic Compiler and Runtime"
+HOMEPAGE="https://www.mono-project.com/docs/about-mono/languages/visualbasic/"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2 MIT"
+SLOT="0"
+
+RDEPEND="dev-lang/mono"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
diff --git a/dev-lang/mono-basic/mono-basic-4.7-r1.ebuild b/dev-lang/mono-basic/mono-basic-4.7-r1.ebuild
new file mode 100644
index 000000000000..9a28161ec719
--- /dev/null
+++ b/dev-lang/mono-basic/mono-basic-4.7-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit mono-env
+
+DESCRIPTION="Visual Basic Compiler and Runtime"
+HOMEPAGE="https://www.mono-project.com/docs/about-mono/languages/visualbasic/"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2 MIT"
+SLOT="0"
+
+RDEPEND="dev-lang/mono"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 7b03f0fcd927..4f43e3304b5b 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -4,15 +4,11 @@ AUX mono-4.8.0.371-x86_32.patch 1033 BLAKE2B cfcd8163180de91aec85841ce6c129faba2
 AUX mono-5.0.1.1-x86_32.patch 751 BLAKE2B 1a19219c5667715a9afb7dc74ba9714893eea684a0c48945bcb70bdd83e34138a77ca029bcc8341b58af93617b4eab3251885affb3d129e8bf072a0279b8d29b SHA512 8c3d3a65f9d9a9a51c4a01dfd14e32e01bcc7cb98bd4f6a196a2a166968521ff859ccb1efd689c612c8bab5d6a384b148039de5033235a2c0552bc455dd636b7
 AUX mono-5.12-try-catch.patch 1267 BLAKE2B e33836d53fd4c9a4e64614d3f309058b2009487a853aee48fae99cd0326095b6dc26e7fbdd178e25f9fc3901f74f937ce5e9d3bb4322ca50e139d13f66c209a5 SHA512 3a82d4bed31b212e23fe24647fc5b9c4788be5f4966377a3bef9f92a51d16181e77e19ca1ec4736792da6a18206986bbb54d967499e2ca7e224201cf811f91b5
 DIST mono-4.4.1.0.tar.bz2 85897587 BLAKE2B 79651189e696aa7352704e1ac659302423b1212c88337da8d522aad8e8a49855b74c43020f506b3455ce1a99566e96ae464fecced584b14470d0c8dfe605c5b6 SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a
-DIST mono-4.6.1.5.tar.bz2 83174665 BLAKE2B ce4586af882c6592d1615156d009e496b8405dcf3a2b59e53bb58d1949c33d68645506378eab272a6ef340194582333c515b38f635e961edc64767078905a2df SHA512 1d0c1ec2930ecea3faf1be572bc045300ef4a90d3fe7519f2a9c797be79298c61528d83baa5a24a57143a35be80f78297196556c33cd0f345d9907a973fe625a
 DIST mono-4.8.0.524.tar.bz2 87392723 BLAKE2B ac17c3da6d6c08c4cb72c4fa300ded92625bd8c14c1e45ea9539efa42c8d085759f7bb298fe5df57bd41f18abf83f293d26a9e6272944933fcff0a3c16a7e4f3 SHA512 eb77b768a4a26e6a2a872f4845769cdc83f01af3377ecd6d932437d2a1b54bfd1ce727563906146195a54997b4b624fb75449a6f0bcfe818cbc4e6544841bf2b
-DIST mono-5.12.0.226.tar.bz2 213373240 BLAKE2B 6aa8d9962aa51d6a7f8f6106835cef6a4eb626d7af56a09ca185736db2535dbaffd5d97d5d0eef39001b11d41d868706be4788496c8d0036bdbad24c5f6fcc46 SHA512 f4ab3066c9a3545ace0c4af50ddbe58cf5d9ffe4895cc546669f329b91988fcfebab91a070ea46b27536040823a3bbc1bd7e5552a49769988e8271d52662c583
 DIST mono-5.14.0.177.tar.bz2 219729440 BLAKE2B c21af7f541e5fcd456faeaf654ded7937da5241feb94b0de464a880915d758791ff7a645dbcb4023e7cced7ab0854bb8da0cc246abc6ab575bb278aa58fdc8c7 SHA512 f13afbe4289e177705642f79f4236710bdc8db8e956782c5370baf22207d6713f7997ec286c7742416c8206d2da205f295437d1afcdc430628d13e32f0e87d2d
-DIST mono-5.4.1.6.tar.bz2 204934321 BLAKE2B 7aa3450a9bc4033f8084c4271b215af636e0df72d6349c97e0acd110d91e276d22b735d19bac2fb1e995ec34fa9e041831358a01d5c098b9c5e8b567d98350fe SHA512 d3618e9f127bc95b15feba5bf73317574872208770d83b8b545a9888df81a629e6fb14160db8a38526ffeb005f682e8dd9b8ced84bdb0cbb36dc9e7b28c240a4
+DIST mono-5.16.0.179.tar.bz2 231379081 BLAKE2B bdcb770d28eea953d428b8d41221bb192adf17bd677711fe17b44e2faa174d59adbe7816297c5eafa2589bb871d3bc2bb84b6e99a11df63758ff6f1b83b8814e SHA512 17d29dc19e3694abd236a50dda99ab85a215d1e88b8d6474c8b8b638dfe8a0f8d60ee3d3d5da600a861cfe6a0dda77cbf3594e9c5dd8b599c80363b4f01d9f1e
 EBUILD mono-4.4.1.0.ebuild 3384 BLAKE2B fd16089b151c1666ceda7d05285fa8a10143a4157e46b75a3412b42dec80c0929f9ba8d9523ac65b64fb827ea8d1ad88fbe98a5e7d0d12423b970912d0ae50e4 SHA512 6c9c9ce5e19a33e4dbc1b0cdb2d17804a67eed5061e422358c971de5a2eb95b2848c4515312a4b082087c50040c1e7f9c687a134ca30354d8f4bde796432b126
-EBUILD mono-4.6.1.5-r1.ebuild 3486 BLAKE2B 6f041f91dce9157a3df0805760355d2b2e2025fdd3b99a2f3413e232aa109d311605fa389a282cb62de7aafebb47a52b6a789957ae965ed42d2e85e6ab3f2e27 SHA512 a242a3a79ba0b671dd77d1b607583c0ea30977d6b5753b55015b5caed6a2754469a9deae115f0a3a4c0e3632bddf7fd0859c2b2712cfd1059a26c5262bfe234f
 EBUILD mono-4.8.0.524.ebuild 3023 BLAKE2B 8b23acde97ed8ebe05eb7e4c3fab9f1c9b43ee775a460629a122eba13c56120d139c8732267c1fb2cb7ba9d96c3a9943a03c1c9894286205392dac8fd19a467c SHA512 0a229fdcbb0051e96e227f1a2bc2c85eea55f2277b549e866744c650a0c42172f5727abe2b1cf38660254757201b8f577401fb072814d266012058da3a2418ab
-EBUILD mono-5.12.0.226.ebuild 2966 BLAKE2B abf2eaf01a1aa04bf1d7c30ba61ccf4fb0126163ebb1290cd5a1a9f7b60c277a85e3b05542cfa98483a0d04d1b82c2488ba7dfbd001f64af393d215a748fb865 SHA512 2e7264375e88eba1cb081ad024701d0adde4d10cfa506cfee2c0d9126f573041d49040fe09ab504ffde118f803863fb403c923dcd25dd018525d3f42d4ae6c87
-EBUILD mono-5.14.0.177.ebuild 2966 BLAKE2B abf2eaf01a1aa04bf1d7c30ba61ccf4fb0126163ebb1290cd5a1a9f7b60c277a85e3b05542cfa98483a0d04d1b82c2488ba7dfbd001f64af393d215a748fb865 SHA512 2e7264375e88eba1cb081ad024701d0adde4d10cfa506cfee2c0d9126f573041d49040fe09ab504ffde118f803863fb403c923dcd25dd018525d3f42d4ae6c87
-EBUILD mono-5.4.1.6.ebuild 2981 BLAKE2B 0fa2e8a0574502869542c87491575b084e1a14eeb3eedc635e2c7f103f492086bf61f6bf4f9fe25d7d5abd80070bbdc6f742dd823c393fa6fb96f6c7a341cd93 SHA512 211b45145d9e37a302b0d0afcfbdc5676be2cbc3e39f5c51d171a3614de96bde1ea29658a95ef6d45da7c2a5d189da90c6f84a52eec20222a5dbb3428b050d02
+EBUILD mono-5.14.0.177.ebuild 2963 BLAKE2B 0be064f7eedc0b8b1e4eeba3998ce4e0ab10a4696630d0fd0a178407e231e1ce0511a3464c6ea7a00a9e5911d936fda6d1d479a11ed000f5cd1caf4f76f63d0d SHA512 66a592f345915c0a3d56138baec0e2127c3f4e0ec653c7fe8e6eec58846ac426ddf0db75adb07b6f5f13f3cadf7702e1a16a4d3f36bcbb8b361f3c33ecd9b1df
+EBUILD mono-5.16.0.179-r1.ebuild 3035 BLAKE2B 689cd28b9284d3620f772e12a0ce3762204ce4415d5347ef0c2d34ec1e4491bfcc35a132737e482b928f5899b681393fe44fb97b0dfb0ead73130fd407b7717a SHA512 61869e1ec8eeb0662f6bca5615394ae0f341e1ea80d5495ee7a84a22f25cb987bd516abfda8c4bbc361955421c68b80825cbd1ab6f640f9545c9f5d16fb53473
 MISC metadata.xml 507 BLAKE2B 91655de22fc1ff309c36ecef9d77aa8cada0b8f13ae30677665de837e99b7b43622a1dc0c677b0f5455c06b8e8a295c3c4f39753f66e749163a4f002ee481016 SHA512 e072a1abbf66276b0d139c3e918593010312c2059a0c6feba7b324689cdf90efe28bef0286ad9888125acfdd1fed2dee3e05e79a0aeb7f9ec1809bd128cf8a20
diff --git a/dev-lang/mono/mono-4.6.1.5-r1.ebuild b/dev-lang/mono/mono-4.6.1.5-r1.ebuild
deleted file mode 100644
index 3ed76fb6a64a..000000000000
--- a/dev-lang/mono/mono-4.6.1.5-r1.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
-
-inherit eutils linux-info mono-env flag-o-matic pax-utils versionator multilib-minimal
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="https://www.mono-project.com/Main_Page"
-SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE="nls minimal pax_kernel xen doc"
-
-COMMONDEPEND="
-	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
-	ia64? ( sys-libs/libunwind )
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMONDEPEND}
-	|| ( www-client/links www-client/lynx )
-"
-DEPEND="${COMMONDEPEND}
-	sys-devel/bc
-	virtual/yacc
-	pax_kernel? ( sys-apps/elfix )
-"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	if use kernel_linux; then
-		if linux_config_exists; then
-			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
-		else
-			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
-			ewarn "kernel config not found"
-			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
-			ewarn "See http://bugs.gentoo.org/261869 for more info."
-		fi
-	fi
-}
-
-pkg_setup() {
-	mono-env_pkg_setup
-}
-
-src_prepare() {
-	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
-	# get killed in the build proces when MPROTECT is enable. #286280
-	# RANDMMAP kill the build proces to #347365
-	# use paxmark.sh to get PT/XT logic #532244
-	if use pax_kernel ; then
-		ewarn "We are disabling MPROTECT on the mono binary."
-
-		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
-		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
-	fi
-
-	# mono build system can fail otherwise
-	strip-flags
-
-	# Fix VB targets
-	# http://osdir.com/ml/general/2015-05/msg20808.html
-	#eapply "${FILESDIR}/add_missing_vb_portable_targets.patch"
-
-	# Fix build when sgen disabled
-	# https://bugzilla.xamarin.com/show_bug.cgi?id=32015
-	#eapply "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
-
-	# TODO: update patch
-	# Fix atomic_add_i4 support for 32-bit ppc
-	# https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
-	#epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
-
-	# TODO: update patch
-	#epatch "${FILESDIR}/systemweb3.patch"
-	#epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch"
-	#epatch "${FILESDIR}/fix-for-bug36724.patch"
-
-	default
-	#eapply_user
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-silent-rules
-		$(use_with xen xen_opt)
-		--without-ikvm-native
-		--disable-dtrace
-		$(use_with doc mcs-docs)
-		$(use_enable nls)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	cd mcs/tests || die
-	emake check
-}
-
-multilib_src_install() {
-	default_src_install
-
-	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
-	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
-	# for reference.
-	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
-	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
-}
diff --git a/dev-lang/mono/mono-5.12.0.226.ebuild b/dev-lang/mono/mono-5.12.0.226.ebuild
deleted file mode 100644
index 4d520080eb69..000000000000
--- a/dev-lang/mono/mono-5.12.0.226.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64"
-RESTRICT="mirror"
-SLOT="0"
-
-IUSE="nls minimal pax_kernel xen doc"
-
-inherit autotools eutils linux-info mono-env flag-o-matic pax-utils multilib-minimal
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.mono-project.com/Main_Page"
-LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
-
-SRC_URI="http://download.mono-project.com/sources/mono/${P}.tar.bz2"
-
-COMMONDEPEND="
-	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
-	ia64? ( sys-libs/libunwind )
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMONDEPEND}
-	|| ( www-client/links www-client/lynx )
-"
-DEPEND="${COMMONDEPEND}
-	sys-devel/bc
-	virtual/yacc
-	pax_kernel? ( sys-apps/elfix )
-	dev-util/cmake
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch
-	"${FILESDIR}"/mono-5.12-try-catch.patch
-)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	if use kernel_linux; then
-		if linux_config_exists; then
-			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
-		else
-			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
-			ewarn "kernel config not found"
-			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
-			ewarn "See https://bugs.gentoo.org/261869 for more info."
-		fi
-	fi
-}
-
-pkg_setup() {
-	mono-env_pkg_setup
-}
-
-src_prepare() {
-	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
-	# get killed in the build proces when MPROTECT is enable. #286280
-	# RANDMMAP kill the build proces to #347365
-	# use paxmark.sh to get PT/XT logic #532244
-	if use pax_kernel ; then
-		ewarn "We are disabling MPROTECT on the mono binary."
-
-		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
-		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
-	fi
-
-	# mono build system can fail otherwise
-	strip-flags
-
-	#TODO: resolve problem with newer binutils
-	#bug: https://bugs.gentoo.org/show_bug.cgi?id=600664
-	#append-flags -fPIC
-
-	default
-	# PATCHES contains configure.ac patch
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-silent-rules
-		$(use_with xen xen_opt)
-		--without-ikvm-native
-		--disable-dtrace
-		$(use_with doc mcs-docs)
-		$(use_enable nls)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	cd mcs/tests || die
-	emake check
-}
-
-multilib_src_install() {
-	default_src_install
-
-	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
-	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
-	# for reference.
-	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
-	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
-}
diff --git a/dev-lang/mono/mono-5.14.0.177.ebuild b/dev-lang/mono/mono-5.14.0.177.ebuild
index 4d520080eb69..057c8e099f0a 100644
--- a/dev-lang/mono/mono-5.14.0.177.ebuild
+++ b/dev-lang/mono/mono-5.14.0.177.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 RESTRICT="mirror"
 SLOT="0"
 
diff --git a/dev-lang/mono/mono-5.16.0.179-r1.ebuild b/dev-lang/mono/mono-5.16.0.179-r1.ebuild
new file mode 100644
index 000000000000..8c768a037192
--- /dev/null
+++ b/dev-lang/mono/mono-5.16.0.179-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+RESTRICT="mirror"
+SLOT="0"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+inherit autotools eutils linux-info mono-env flag-o-matic pax-utils multilib-minimal
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page"
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+
+SRC_URI="http://download.mono-project.com/sources/mono/${P}.tar.bz2"
+
+COMMONDEPEND="
+	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+	ia64? ( sys-libs/libunwind )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}
+	|| ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+	sys-devel/bc
+	virtual/yacc
+	pax_kernel? ( sys-apps/elfix )
+	dev-util/cmake
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch
+	"${FILESDIR}"/mono-5.12-try-catch.patch
+)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	if use kernel_linux; then
+		if linux_config_exists; then
+			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
+		else
+			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
+			ewarn "kernel config not found"
+			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+			ewarn "See https://bugs.gentoo.org/261869 for more info."
+		fi
+	fi
+}
+
+pkg_setup() {
+	mono-env_pkg_setup
+}
+
+src_prepare() {
+	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
+	# get killed in the build proces when MPROTECT is enable. #286280
+	# RANDMMAP kill the build proces to #347365
+	# use paxmark.sh to get PT/XT logic #532244
+	if use pax_kernel ; then
+		ewarn "We are disabling MPROTECT on the mono binary."
+
+		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+	fi
+
+	# mono build system can fail otherwise
+	strip-flags
+
+	# prebuilt files were left in tarball by accident:
+	rm -rv external/corefx/src/Native/Unix/System.Native/.libs || die
+	rm -rv external/corefx/src/Native/Unix/System.Native/*.{o,lo} || die
+
+	default
+	# PATCHES contains configure.ac patch
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-silent-rules
+		$(use_with xen xen_opt)
+		--without-ikvm-native
+		--disable-dtrace
+		$(use_with doc mcs-docs)
+		$(use_enable nls)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	cd mcs/tests || die
+	emake check
+}
+
+multilib_src_install() {
+	default_src_install
+
+	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+	# for reference.
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}
diff --git a/dev-lang/mono/mono-5.4.1.6.ebuild b/dev-lang/mono/mono-5.4.1.6.ebuild
deleted file mode 100644
index 22de8a7240e6..000000000000
--- a/dev-lang/mono/mono-5.4.1.6.ebuild
+++ /dev/null
@@ -1,109 +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 mono-env flag-o-matic pax-utils versionator multilib-minimal
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="https://www.mono-project.com/Main_Page"
-SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64"
-
-IUSE="nls minimal pax_kernel xen doc"
-
-COMMONDEPEND="
-	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
-	ia64? ( sys-libs/libunwind )
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMONDEPEND}
-	|| ( www-client/links www-client/lynx )
-"
-DEPEND="${COMMONDEPEND}
-	sys-devel/bc
-	virtual/yacc
-	pax_kernel? ( sys-apps/elfix )
-	dev-util/cmake
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch
-)
-
-#S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	if use kernel_linux; then
-		if linux_config_exists; then
-			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
-		else
-			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
-			ewarn "kernel config not found"
-			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
-			ewarn "See https://bugs.gentoo.org/261869 for more info."
-		fi
-	fi
-}
-
-pkg_setup() {
-	mono-env_pkg_setup
-}
-
-src_prepare() {
-	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
-	# get killed in the build proces when MPROTECT is enable. #286280
-	# RANDMMAP kill the build proces to #347365
-	# use paxmark.sh to get PT/XT logic #532244
-	if use pax_kernel ; then
-		ewarn "We are disabling MPROTECT on the mono binary."
-
-		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
-		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
-	fi
-
-	# mono build system can fail otherwise
-	strip-flags
-
-	#TODO: resolve problem with newer binutils
-	#bug: https://bugs.gentoo.org/show_bug.cgi?id=600664
-	#append-flags -fPIC
-
-	default
-	# PATCHES contains configure.ac patch
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-silent-rules
-		$(use_with xen xen_opt)
-		--without-ikvm-native
-		--disable-dtrace
-		$(use_with doc mcs-docs)
-		$(use_enable nls)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	cd mcs/tests || die
-	emake check
-}
-
-multilib_src_install() {
-	default_src_install
-
-	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
-	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
-	# for reference.
-	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
-	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
-}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 99976d5d6362..197ec453fdf6 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -6,5 +6,5 @@ DIST mujs-1.0.1.tar.gz 116948 BLAKE2B 54d898eff95e65688a51d9df9175964609a55ad324
 DIST mujs-1.0.4.tar.xz 91520 BLAKE2B 6ffe62b19b140e2ae63ebe59a3b3bd352936ccba53dda3b0fcf575440dc790a0767c7de8c0a1441d26c11c65074520a80050cc0efa1113be0df51a802e719574 SHA512 a32498fee20ab6ddc8bbf79b4fdd82f3560d4e4b28bbe57c4e8f1df4a8a5367a689b6c9a391761abe47a8f15d2832fede4a508330eb181744b9563ae9954c102
 EBUILD mujs-0_p20161202.ebuild 824 BLAKE2B ef5920796454ab2cb26c54149228da8a4903f708fef17972a8bad581778e598b5e682d46f34327873d6fea3925b8310668c57a8ae9339a18624ce418676d8797 SHA512 15f9ad4f8bfa67ba51cf2429a8d985974fd39af83ddc53c238acfa5293b055a116c7de6c91271a975d7b044b6c5cd6c1bb645db5d3400b4399f9f96f7b4cd401
 EBUILD mujs-1.0.1-r1.ebuild 1103 BLAKE2B ca260b9e9864f98c2dc94d3297f4ebf98e7e6ccab60803c0abf90981e5b91e6505e9643e1e6d36e6da803a19d3fb935bcdc4dd7cabdfff9abcc5450a5dce9306 SHA512 98525a0a8fea64b8a223b88f082cdf8634e5eca55e51c5c792c6ff3407408e83c69d9d1b9f6bc6e36002bf33b7ce21fe927938c93fac1a925902e643336841e5
-EBUILD mujs-1.0.4.ebuild 1025 BLAKE2B 4b14f7ab8a7073ee7a08de5b0859ba2c23fa34282ec7f7568034e2fef0c07c67f0fd5c33fed076185e8105a9619a8410d9bed99c7ca930d7664d580bf80e679d SHA512 eaf763476bb88f9b5362ce9d126ddcc2189a9b0d10d0ceb74c6fb2b39ea7c32bc15e93b3cf8d37795ed0ecac8190f9ed4c360263623d9d77076359f273bdf125
+EBUILD mujs-1.0.4.ebuild 1018 BLAKE2B 23dc3714367525cb661ce959eda325a039a6cc31b4403717bb3a92e72237d411d7550d967affeb25960218e1a7863db3b9057b05be99a4cef00fc78b09ad979e SHA512 964401b2d68911961c0089efce3afdea3405eb91812061462a4a9ce604217af969ba10c6167904200d1b88ca73efc1e9b5dbf32f99a6e4a98e8e12f5390506bd
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-lang/mujs/mujs-1.0.4.ebuild b/dev-lang/mujs/mujs-1.0.4.ebuild
index 91ee7c0085a7..f835e190f0c0 100644
--- a/dev-lang/mujs/mujs-1.0.4.ebuild
+++ b/dev-lang/mujs/mujs-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 891180eb175c..de92b5079396 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,20 +6,20 @@ AUX php-5.6-no-bison-warnings.patch 1428 BLAKE2B d37bc7a1ae803aa4a14d32f0ca5613b
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
 AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875
-DIST php-5.6.36.tar.xz 12467560 BLAKE2B 8badaabc668ff3a4b1129f03605a1570729f8196d2e2539fe85bc42a628f2b24ea76c298b194e8466d9218ae98218243430c8d36d73fbd32b042dd6453510361 SHA512 807c68ab85b6685b19707bd18cfd46f3695b2dc67f9f17f85476634e4a80a036cb413ccae05ed5ba529eafe8df57ebf758dd664ed2942ec44f90a6e8b0172e5e
 DIST php-5.6.38.tar.xz 12467408 BLAKE2B d9ee47e193d80bce8a9ed6ffd3eb13e67ba6d1f597ece2803cd92fddc6245f46cdfe644d6cda12a6bb409b92c1fe748610cc5eb43dea0bf063fda81188ee8b3d SHA512 66c51a8e954b1496c0bad0a2864a2a1537dd1c1c573b553991d6d5bce85fc7bc340e56a21109bc5e9a03799e703204b980b569c95a5c0a1bddb01c8947e7a682
-DIST php-7.0.30.tar.xz 12030228 BLAKE2B cc4c50d108fca68ee98b70a3007893d912d2343dd255faf52e41c1de04f590f427d9edad7b637177ccf1d9c62212ee6060baca13931c0aa14532df548ef159aa SHA512 1f0914ebda79247aa65ace63f6c8c4fcd850b21a82704f7b6482760259239cc5fee4cfd5aa2ed590b56822b4d69330ac472f46537e7f25d59e73ba63a48827c5
 DIST php-7.0.32.tar.xz 12030780 BLAKE2B 0c277eac4c931a6e30954cceb7feef8dea1c3ef4aebac91779b7e1a6f90f608faa93d1750a2dc8f354c73304e0f7a9b9ac17bb0d1da4768ddb68925752c11aef SHA512 4a7c9a6b91ad7da69303916202062d639e6f02dcd483e851a44d8c7a2efeb5c9a666097935ab60d700c4445f86a0c68df1515300c57af1cdb76528b54b757608
-DIST php-7.1.18.tar.xz 12213396 BLAKE2B f851c6eb261b8b532e84e73e6f173deb6ac00cd5168a02db9811843540aeadc390a4c5416eb17749cc950bbb1eda1045f538e2b80e4734ea2c0c4e264776bffb SHA512 7eacbc3b98d8b668c90d5c93030263f47ba2e0d4d7820594662590b8b68670f734a2274ae476e3aeac7e030c4ef10411a80da3523383e87a6757e87597caee90
 DIST php-7.1.22.tar.xz 12227848 BLAKE2B 72fab94b1c7ecfd3479f6d6c9a76a9d8813f7789402664201615d79ab8b5bb26fb1b7273769c4898a36f0336e0ce4d50bf2f17b81ddb54acc9583e39623e3a5b SHA512 0fc0907d303711dbc4ba0a18618e3e73550c73d13988c769f8d50066017b1efe3feb0d22d5539f69271ea4e9532a3d997e22841cb59bdbf96313169e1c03538d
+DIST php-7.1.23.tar.xz 12227528 BLAKE2B d03470b07ae041c4677e100c1b4f7994d3e15d4830eccba3c654c1f3546345c8205cac057011d2d43ab962ebbc01652f6748270daa40aa1e540453923500288c SHA512 d5a451f1a48415175e3117ffa84ef3504275a407698b59c13eeb403958aa27342e04dc4ffea9791b923ac0cc5d6fdacf2e8672f0e19755bae858707c7fc3627f
 DIST php-7.2.10.tar.xz 12160864 BLAKE2B f1959a00622c1bd11fa87c61d152c802b307f0b9e89b51ed86b40086cda03eeb6652d47b59df8cc7c9b4e79ab687ae1292b978f453e9f07ac352d209b64c62d8 SHA512 aa90fce17034b2649012d66461626ae74c21ea938b1c71c7eb12419e562c641b432df87a7e900c245ad28df39624cf64a1b2f8ffb123608d94cd35e41f09c0fe
+DIST php-7.2.11.tar.xz 12132268 BLAKE2B 8007f6a8f4236efb796681d25f2066deeba98e6e136def0c323aa13399951d58d7f218b3544b3bd0418dfe220f87a38b6515547c50f65c641bd09a2d440eb4e1 SHA512 0cd8578147d17d612e013dfc22b73977719177058b39c7b61dd0bfdfb8c2441aba78af49f58c824f7e66c89b5ad201c36fafb89ccf1e2d20f19b79d6a8fed7e5
 DIST php-7.3.0RC2.tar.xz 11924624 BLAKE2B caa2c3752e7fcf2226b8351e96277a5af071cbe13f820f4c81cd54b2e98206b403327a97a7360e6a8e1c7e11687af0ddc24b9a08ef3ac3f18cbe488469c17c35 SHA512 6fca734a4dfbd8ef85838439bc965f6d6773ba270207222b710ab75a0254f6c68378763274ba5d6cfe60b6ea14c134a64cb3ef607cc2ef86c7010bac1e282498
-EBUILD php-5.6.36.ebuild 22792 BLAKE2B 0f22bd52f4acb9d69803120c63e3ef3418af89810e98da7b034d4e959b89da3e25e82a579127b427ccb533869e459cc59cbbd7069fa21ba7e05656be3bbb7b65 SHA512 097f033cfb430f5a57258319127c7604888a5026710830a0845d1328be729705834069235a45e326dde4277de6cf0001214b101efa1cb1f5ab7e27be30b2557e
-EBUILD php-5.6.38.ebuild 22799 BLAKE2B 63b3709f7fe8812faa62de75d71f16ccb3fac1328e3d6722a4706e827076e89ef3e8430dcee346a35432e0b2d608188d3182eb8c89ecdbc977fb6908061ac120 SHA512 c04a8ff3e45bb7a7660ab702c45de927821316b688572cbdb38dda918485e5af4b2d71180c64696ed5797d29b27f087e119fe903732e9f6e5174e4e740b19dfa
-EBUILD php-7.0.30.ebuild 22002 BLAKE2B 5766fabda46f0faf07cfd5121a32af05a7cd51f5ef694c083fd737612bd7575026bfdbaba1a5bf109c316c46d38a233658b75f79ba3622f7ed0139f6e2a4f397 SHA512 535391d50959e2e4f3094f2f6a7b0bc75810c4f5695bca319ed2fc7df4273d9f9e01feb1625992938b84ffd04ef350cf2dfe49e4e83b2dd346af75b79c476f31
-EBUILD php-7.0.32.ebuild 22009 BLAKE2B bf0d62e15cb11ed5669d5e485b53b58f8da8436315212627413b9c4a1a252cc311dce34752b0a4a1dd642715fbbe368fb613b18eb3df30660eff8f2d813b9eb9 SHA512 c1506f4481ed096747185fe438ff4c691f3810fb8aa74bad34d63df4de10df01b39cfc79e93203c8698dfac6ba2eebd11277e3c7bd3623ed386be288a5f4f50a
-EBUILD php-7.1.18.ebuild 21845 BLAKE2B 3752df2f5c1e9123e1906c315e07de6142cf4e37b6ae48b24af4858ec1491d4934daab688c747ffc06f6a67e54fa7fd80674a272fbf45bc2b56e0f2ba58bfbfd SHA512 4dccb83f1449520a0f4dfe78605ec1b0fcfaee46b67c32b8bada1811692042081f3c1364adecd077dec940a26cfab8bd4175b836d6a5fb5bf9893e546fc1eff2
-EBUILD php-7.1.22.ebuild 21716 BLAKE2B 282b45ed061c5d8bdc0fb1ca3f67e6f2be8b4f37f85c2e5c3c68ccaeed3b02c56024ecca242a8ef3bbc62ce747a007cd68d67347bed6a0dc0e50afa2bdcf4f8c SHA512 2f97af78bc7ed63a56d69799b4ae59a1ea688c29ddfda7a1910fded87c22bc0db040c242321ac634dc74c6149388ac6ff4fb532fdf1cff2af062dc18ceb7b27d
-EBUILD php-7.2.10.ebuild 22247 BLAKE2B 00489d5a607441338ed5002fbbf1f556642ae53d08b2817c569d04a33c9dcba76728f686ada07d88147dba1e4bc37289923ec244e0028477862a528d696b4051 SHA512 a58323e4db11e0e49f6f0e11200ee89e8c591f2cda641fb7baa3947e47115a237d76ef50cb01d29b6dbf349234a72f69e34915fd8e3dd712b0bb350bcafc3e00
+DIST php-7.3.0RC3.tar.xz 11927028 BLAKE2B b88b2abeac532a5c0de6ee92982514e78ef6ef8ef2436c0edb541b83da9bafa925177d76d54bcdd866f7863442691e6aa721356c123d07c3464f18e85abbdf6a SHA512 ef441fc7608ee5ef5062b252292656d42644307b5623ebd87104ca10191080ba83d44e5984e8eef987d8bec0f0ab8139b7c2d16577fe6dcc5f02e71ba87f5ed8
+EBUILD php-5.6.38.ebuild 22798 BLAKE2B 8bef3ae060eeb63fcc492a7c8c8a8b642b84f46ef7ed29e69badeecf26c0f853e974c8f224739875fee1b345987775c05f451908d4731550eab156993a55d23a SHA512 0a97787e0b80643e620815c32b29a56063ddb92c31516ad34f89be9769cc3cf9ba07eb0271d433f330d6493df2b1a63af29bf8b7ede81bdd3fbc2751be5ce561
+EBUILD php-7.0.32.ebuild 22008 BLAKE2B 26829e446d9608f52212a32e0092d83d65966a270a8e4d35f8ac4559f0679a4ff955848eb9c9ae3f7d25300d347a226adc1b71d1b322d09fe512188360f2182f SHA512 a9fdfe7a831fa4ad71ddd4bae29582053ee86a824dc93f02581a3add372561f34d457f2c9198c72c619b10666b679d3f929f6aaf309c2d446a60e9447e8d3cc2
+EBUILD php-7.1.22.ebuild 21715 BLAKE2B 13f34b9730b2f0f22cfcbf26af6575259d08d61f158b0c9bd9b6e7756326037e32e92992ec510bc1649eca0beb2044f820888c7e9b1fa48174974e754947f181 SHA512 187fd61cf4df1cda5c53e14aea0ac327c5e9fab193843165de2afe7e13fdb5b8be1ebab70fcb776dcb8ebe1966feedcc075e589c4ddf1f9f6d3d58f45519a9d4
+EBUILD php-7.1.23.ebuild 21727 BLAKE2B b35aa713090ba294565fee4d2c6edf5ede683083f349b8cb15a3bbed1d4f3761ca5d672891584b9853cd1c7f802898bf604da3d5508cd5c2ad367bb47a2f742d SHA512 8096b4d259c06c0ea3afff51ece85b6d0a7626676fc09c1df027b4f2ce17c6b8ff7d99dfdf8781d3bdc2ed13460e18d4dcdcc9eb7c1149b28687c6b0be976f40
+EBUILD php-7.2.10.ebuild 22246 BLAKE2B e06f62b7f5563d48d9e381b6ab44cc72e9e63831e209ee638321e93b90a1f42abb9a41b757629b45cfa610f7e985f40fbd002c5121acf86d862f8d648ee16f44 SHA512 c662c27b70663131899ffe595476bff326a337d584855e27f62480bf8824e3a3f49caee7c80b4f3aa19ccc40d1f95f3a9c4518621cbd43abd751981ba334e190
+EBUILD php-7.2.11.ebuild 22258 BLAKE2B 3ae1771b15208cdba10d534f69bfcea8ac4930a5f7e31d7bd976dfb7904fe3e60ae80b44c0ca65fa300a1d086587c3754821411059942f8db9df7d4cb6758f0b SHA512 c6aca341ff51f7fd5437b2578e9ce7ee4055a67603c4ad9a25f07ca030c75d58c627db6cdb979aa5ab9619051d1f3de4155cded38e4a17b09562a5842ea5a96a
 EBUILD php-7.3.0_rc2.ebuild 22329 BLAKE2B 7841e7d459849f06a47128e2c0a8f1997b3d1b6be02081d3dafa624f7ea319da13974cd904ce772260c8e001ae5c594508cf5be9f0426d8fd5da9ff6107111ca SHA512 f81a2d251ded29e6f91f72c736c27f44e8f8f6ef9cdfe57d7b8fefc0c3c27869a83972355d03532db95ba0c9c0b3322870174b7c8c0e57a1f9ea8ec4c40ca4c7
-MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa
+EBUILD php-7.3.0_rc3.ebuild 22329 BLAKE2B 7841e7d459849f06a47128e2c0a8f1997b3d1b6be02081d3dafa624f7ea319da13974cd904ce772260c8e001ae5c594508cf5be9f0426d8fd5da9ff6107111ca SHA512 f81a2d251ded29e6f91f72c736c27f44e8f8f6ef9cdfe57d7b8fefc0c3c27869a83972355d03532db95ba0c9c0b3322870174b7c8c0e57a1f9ea8ec4c40ca4c7
+MISC metadata.xml 2525 BLAKE2B 38170625904c1d6cb24a0bfef829b9e819d1ad3de42a69452205520620aaeffef7e2cc3a86a836940a7f0d19d5dcddfd256b970c9d5546c484bd1cba17484154 SHA512 666320279375242858d994456da112111b994445f6c1c5b379294b1d0b981fd103cc52b4c2dfcfb1b1eb49de77d502c8b7cbfb4c1c7ebe1602fdf9fd3b3a8242
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index cca331a3fa1f..609c0dce3af1 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -51,7 +51,6 @@
     <flag name="xslt">Enable the XSL extension</flag>
     <flag name="vpx">Enable webp support for GD in php-5.x</flag>
     <flag name="webp">Enable webp support for GD in php-7.x</flag>
-    <flag name="zip">Enable ZIP file support</flag>
     <flag name="zip-encryption">Enable ZIP file encryption from <pkg>dev-libs/libzip</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lang/php/php-5.6.36.ebuild b/dev-lang/php/php-5.6.36.ebuild
deleted file mode 100644
index 4721afbce53e..000000000000
--- a/dev-lang/php/php-5.6.36.ebuild
+++ /dev/null
@@ -1,777 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic eapi7-ver systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/libmysqlclient:= )
-		mysqli? ( virtual/libmysqlclient:= )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	)
-	unicode? ( dev-libs/oniguruma:= )
-	vpx? ( media-libs/libvpx:0= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib:0=
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	vpx? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	recode? ( !imap !mysql !mysqli !libmysqlclient )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	sharedmem? ( !threads )
-"
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
-	eapply "${FILESDIR}/5.6-mbstring-oniguruma-6.8.patch"
-	eapply "${FILESDIR}/php-freetype-2.9.1.patch"
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
-		|| die
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	eapply_user
-
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with mssql mssql "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_with truetype t1lib "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-		$(use_with vpx vpx-dir "${EPREFIX}/usr")
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib)
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.6.38.ebuild b/dev-lang/php/php-5.6.38.ebuild
index 95546dfd2561..471eb29bc1bf 100644
--- a/dev-lang/php/php-5.6.38.ebuild
+++ b/dev-lang/php/php-5.6.38.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild
deleted file mode 100644
index 94a37d5d0025..000000000000
--- a/dev-lang/php/php-7.0.30.ebuild
+++ /dev/null
@@ -1,751 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eapi7-ver systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd tidy +tokenizer truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || ( sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	)
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib:0=
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	sharedmem? ( !threads )
-	mysql? ( || ( mysqli pdo ) )
-"
-
-PATCHES=(
-	"${FILESDIR}/mbstring-oniguruma-6.8.patch"
-	# hopefully upstream will include the same version check fixes in upcoming releases
-	# patch added 20180429
-	"${FILESDIR}/libressl-compatibility.patch"
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.0.32.ebuild b/dev-lang/php/php-7.0.32.ebuild
index 8158cfae76c1..be14985636af 100644
--- a/dev-lang/php/php-7.0.32.ebuild
+++ b/dev-lang/php/php-7.0.32.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.1.18.ebuild b/dev-lang/php/php-7.1.18.ebuild
deleted file mode 100644
index a9061a4a930f..000000000000
--- a/dev-lang/php/php-7.1.18.ebuild
+++ /dev/null
@@ -1,731 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eapi7-ver systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-"
-PATCHES=(
-	# hopefully upstream will include the same version check fixes in upcoming releases
-	# patch added 20180429
-	"${FILESDIR}/libressl-compatibility.patch"
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.1.22.ebuild b/dev-lang/php/php-7.1.22.ebuild
index d748c46a4a94..ec1d9318de48 100644
--- a/dev-lang/php/php-7.1.22.ebuild
+++ b/dev-lang/php/php-7.1.22.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.1.23.ebuild b/dev-lang/php/php-7.1.23.ebuild
new file mode 100644
index 000000000000..4f54e9a7a856
--- /dev/null
+++ b/dev-lang/php/php-7.1.23.ebuild
@@ -0,0 +1,729 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic eapi7-ver systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.2.10.ebuild b/dev-lang/php/php-7.2.10.ebuild
index e577448e00a3..7d83e1171df3 100644
--- a/dev-lang/php/php-7.2.10.ebuild
+++ b/dev-lang/php/php-7.2.10.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.2.11.ebuild b/dev-lang/php/php-7.2.11.ebuild
new file mode 100644
index 000000000000..761d9460704b
--- /dev/null
+++ b/dev-lang/php/php-7.2.11.ebuild
@@ -0,0 +1,741 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic eapi7-ver systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
+	zip-encryption? ( zip )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.3.0_rc3.ebuild b/dev-lang/php/php-7.3.0_rc3.ebuild
new file mode 100644
index 000000000000..38dbc82aca6b
--- /dev/null
+++ b/dev-lang/php/php-7.3.0_rc3.ebuild
@@ -0,0 +1,743 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic eapi7-ver systemd
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://downloads.php.net/~cmb/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+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"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( >=sys-libs/zlib-1.2.0.4:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	zip-encryption? ( zip )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 1b8bd40c1b7a..eaa96b914909 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -40,7 +40,7 @@ DIST python-gentoo-patches-3.6.6.tar.xz 13876 BLAKE2B 4be56b54e70c9b83209734097e
 DIST python-gentoo-patches-3.7.0.tar.xz 12268 BLAKE2B 758b635ff53b6f7bfabb1db632ee2a5c14b163d6d6f14e4e44c31c9ac1591d411f597d42b05707f586f9ff7c3a030703502307bae732bcf003987939eb5b036d SHA512 19dd5bac06bb40622e74e3b16c7fba83f1178417e686eaf61b2b207602c76beebc8c78d675e401ec4d18add1ca033fd47baf2e48e9abb487593b7d821bcaf509
 EBUILD python-2.7.14-r1.ebuild 10806 BLAKE2B fce1997bac1ff3a2f3e11ee8a9477744d4db08186ba8453de7b1a270886596549ae8e5d4fe4f3f214f0e0d421a82ea1b63b09282ed58d7479976bc8df1ee2588 SHA512 5e6aeceb99c833a78078d0dcb50b8af7310a6c3adf5d7f88d3894966ec0eb8f5e1990f562e281aebd4e1f98c1234af102f18146dd8226c69b0ba850eecbb424e
 EBUILD python-2.7.14-r2.ebuild 11018 BLAKE2B 408b677be84fd7ceb31db5f6af74418adc6576e542aaa4ba2a2a812e94ee3af5a5d73fceea8cbbfac87156c4ae223ab2716814cce26e6bfdded9f3ac888e262c SHA512 0ccf4865666cf97b5ff4d22dc55c243aa8330819177b1b96f20e094ee490838227309f2f0b635e50b356eefdebb49b95aa3759cbb7725f781302e4b4a7a6bae5
-EBUILD python-2.7.15.ebuild 10812 BLAKE2B 53d50ce499b0ba1d33d3cfc4423ec0e2e21ca24ac9bc9cad89f6f93f7ce6d2df1618495969271b9cb2a90b9439c7aafa44f7d0cee4f7e5de88b09a4fb3b27def SHA512 8fbf1f69de2f0c17e39d1385f81a13b166708e017c9b724c27ab13b840bbae0f023111419e575e6dc86b4aa6b5b913c8504433730cec3c12f0d24ea8a05b7bae
+EBUILD python-2.7.15.ebuild 10811 BLAKE2B f828de10018c8a29ffec4fc405e5ad92f5d88c5230a4de428755a25494c65ff81e72e85e12a6de152381d4ffc54bdac04b1a699648331660a311b47b25e3c266 SHA512 d76caa98de7a649fab7d630bb14e2bfd38d74822ff42d863dd6d5307b0788d73490c6c83cabd14e126f477a17483bef2af7de5dda921b22e49f7e85ec35bcd18
 EBUILD python-3.4.5-r1.ebuild 10657 BLAKE2B 09b69868f6be57e40ed1a439a6dbfd4eb92c71bd67ee5733424e2478f9603b1083c2a4770bcfa8e009e9e0ef6fd81f6ce9a59de246121062c120dcd25eb8a012 SHA512 bfaa81cd21f5311595b9fdfd1c3f4851da18e38f8a4a6b9bda760946ae6f972596fbb03f281a6b81bb59bded2d8b7e6d95dd7594955130bd2f6a78c62f6bfc93
 EBUILD python-3.4.6-r1.ebuild 10587 BLAKE2B 0aca5a73b15e5122caa057fe71909f5afdb5ede203a7437ce27618ee64d0ce2164ee81477b8aec316b2cc81bc0b923fddffd5ec6056a271bfceef4e92a23e686 SHA512 0c7fa7b4e4ba49b6ae4fe0bc2119699381560a6c0eeaaaed5d974cbca2c089df4b08c0c19709e57e9da5ecfd934beb1f3cd03419d5d900306ffaeec24053ea57
 EBUILD python-3.4.8-r1.ebuild 10844 BLAKE2B c83f03d4ae829a950b2c5f416c700882e3dc796d6703d5bb38d298317c56662bc37053b0128f212d286024f510431d73ed7b8ed7e6317968f204eed8149f812f SHA512 531d32cb98ab3fc112b1c922bba134b18ad8f01a5ba304976222b345a38bcba5359e637a75e032a8537707fc283126e4fcc1b7e4fbdc6b1afb395f59e57f5549
diff --git a/dev-lang/python/python-2.7.15.ebuild b/dev-lang/python/python-2.7.15.ebuild
index f6f405968445..92db0aaa6dff 100644
--- a/dev-lang/python/python-2.7.15.ebuild
+++ b/dev-lang/python/python-2.7.15.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index bf8b4678ca13..d6b1097817cc 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -8,14 +8,21 @@ AUX 2.5/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819
 AUX 2.5/009_no-gems.patch 3454 BLAKE2B f2439a799776c39ba16f1503d573c90ea6d74fc2bad3b3874a961add6b605bb064c683080a4258ed1a0e83bca5cb67c02ba68bceb6acea7613ab7166e16a2f4c SHA512 bef8b2763993755b5b6ccba0b5cbe002fd721405d7c274f421ae3d95fa4d0d99cdf946f5fa9a907cac2c3696b2cc23f2f2e030b3a70eca93081e49b02f25a072
 AUX 2.5/010-libressl_2.7.patch 638 BLAKE2B 53f5f5d275e2c5482a608a947a1b3c41e9dcdd1763cc57a075e3abd536567852387506ec0ce2f5f49f5eed2246ca9f860d56637a9f18cd17cd49fff6fc92d340 SHA512 986aff99fd35814c94581cdc169cfc5a5f75c87889db5556941809ecaf878b6af838afe2ee108dd7147ea70be6fe9e47f98cce3c1804af0a34f7c1aab8c13d89
 DIST ruby-2.3.7.tar.xz 11438124 BLAKE2B 4f7e0422291794b254cb80edd2f0841bbc1e85cd62635024b6d43b23b1bcdc512d92b57d8885b253465cc8ef3c6cbcec97a6ef239dc11cc8b252e941d25e0487 SHA512 fd91c8db3d3aa4cc962a62f27b4d1a71f6b5567ab836e6dbfbbb1553eb269d11e12faf9e36af6c489c33b54fd89dab99bfe81a563158b704877f0628d6f5bc5a
+DIST ruby-2.3.8.tar.xz 11465792 BLAKE2B b9c8ef5c943872e3d1426c30cbd720acc66d17cc7bc926f3294e68f17fbc78edef42f6496295800c3d4efd3ae441730723bfcfbc1111e46239359930622697d9 SHA512 06373050e6c1af9cb6a5863aef878b21c8a45fd0e68414e3d546cb73ec3028207d3acc0a9326428f172b9347a30bbe69a16f9dc0bdb739161d677adb2d888095
 DIST ruby-2.4.4.tar.xz 10049304 BLAKE2B 76bb2c3f63cda8e6f3814c74dded23568b2f7f12036d745bf55fc4a68e281ef3ae0fe29bf8e194db71f72e724ffe750a31bec9246ad1c01eb05ed93512a6422e SHA512 4dc112a149273d4221484ccbf1260c6c5fcad7e0a6e4bc91e4ef69cbc093d3191f7abd71420f80d680f8ea5d111e6803ba2af32166aa501913639e6d5696fde0
+DIST ruby-2.4.5.tar.xz 10064712 BLAKE2B 0846125e617b43ea302b4c5309b20503577937865d445a6fee766323a188aa552d3a13740c3d38c7be812b19bffb2474021cb7b368cc144d51ea771552f62769 SHA512 658f676c623109f4c7499615e191c98c3dd72cfcaeeaf121337d0b8a33c5243145edd50ec5e2775f988e3cd19788984f105fa165e3049779066566f67172c1b4
 DIST ruby-2.5.1.tar.xz 11348108 BLAKE2B ea1019a81f96169ab8d435215362b36b098df373ac4f53ecda328686ec2c13204a38c66bb1bf9504d18e1762e7e6ae277bab3b16bb53b8e628962df715769f3b SHA512 31bacf58469953282cd5d8b51862dcf4b84dedb927c1871bc3fca32fc157fe49187631575a70838705fe246f4555647577a7ecc26894445a7d64de5503dc11b4
+DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 66c59448a23c22796b43f04a1f84359386b7bee7163da4255426ea75b1c7af0a7a7142991b870a75a72ded56ac49f47c51bc162ebf2be2af0d1b1608b60c02df SHA512 6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518
 DIST ruby-patches-2.3.7.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1
+DIST ruby-patches-2.3.8.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1
 DIST ruby-patches-2.4.4.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9 SHA512 d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed
 DIST ruby-patches-2.5.1.tar.bz2 2986 BLAKE2B 64d64eda19bff94f205a6314c2af59896064fb64c118e0f3859d82aeb7e58478170b9160804ab8faf569054b65228abeecc5900e568e17133c21e9aed9bdf589 SHA512 c2bca3f98c7bb1de267b9f07eb1b0903c499c79e9c9d0166a6924e88e837434f27ddedd7aead7ebbe32f0530f751601ac5486a0db46ee28b94d7cea13e0e7924
 EBUILD ruby-2.3.7.ebuild 6872 BLAKE2B d7cf4b0319f63d9485130c17a393671da672e4f6a4227147be161f0f3e941b8f9b2da4b43168018909ac38b002bea7348f8781fa5a7868913e0b88261dbbd874 SHA512 302d8e3feb1d532eab9e9b5e60d258ceec22a44d40c9adba4cc27d5460dc05deb932777163f06e39975756090a448a73af96c801288b0c3912cca4c591a3cd43
+EBUILD ruby-2.3.8.ebuild 6881 BLAKE2B 530d73cf9111885a8ac4c83e22e1f0f00bf309cc06f91f79e03cf40ffaca4c857f29387e3a3f9bd40fad279745afe77880c44f5ff36b9ddb01269448533d8a99 SHA512 31e52b200f366cdac1d3f3b9283f20a12478cb31b7e130417d4ff604ff2dee108ad6655b78176b41c24bd42b18c51ee21cb39718a36e7dfd218d4870ecf39703
 EBUILD ruby-2.4.4-r1.ebuild 6613 BLAKE2B 22c7fc546104b77e29e507bcf7a57d23d34df1aaaa3bc7e9e6a865152977718bfe0af970a8defbd5ee2bb22ef1f2d1b4724ef5d80501d000dc109ba5fa5a1715 SHA512 efcdcb89d71e85d03c8b6d076f85ee87fb850327a509ac2f7f1b94e55f212310b5983c3494c8c1a60ace8df3624b0c6518d4421339c63b27d56f967734213291
 EBUILD ruby-2.4.4.ebuild 6979 BLAKE2B 70d16f9f2f92572be797934936f8dd25fe074e8bb0aa24e80b86043f38b2dd8f0fc41e2bc4b603894d4026c1d724170dfe094e7a97e621c2bab37a2c968cd224 SHA512 0186b663596a9304c90e18e679f5736a509fd9cb7b456a0294c2b7da5be406467552da80dcfd2d50a5033de03a4ddf213642c139263282228aa3db02ca180c17
+EBUILD ruby-2.4.5.ebuild 6626 BLAKE2B 80e2a13b383820d0cc72a55f8e90b6bda55eac48bcd8b6f5701c1f74c4df18a136ff1e283c6f5d798414d8123f0dc496b1a00dca06568afecb1824fd0037d016 SHA512 95de895451d3688cbba12da2de466b88fd0396960be3309bb2add42d477d19898f2f904339bc4dc5b2c0301765d01c5db47cc1564427e1a30ed6c01877323ff0
 EBUILD ruby-2.5.1-r1.ebuild 6405 BLAKE2B 995547ae8855c9abacd956e07a08d250d3dd02d6374bbad0868a281bd712d8234285dc9256776e24dccaa138dc3e2e1ada5801c7425bc7eca44d487b082fb978 SHA512 3172a415da2caefbdec5802ee5a981d1e2a5a442bc0091a88722e61c01e5d90b0679334d50a62ed16b226db4335e610c9c504c3cf43ca5a3ee5e3c096f3b856e
 EBUILD ruby-2.5.1.ebuild 6771 BLAKE2B ae92da61788df6fc265539f4fac48f2edd7ebbd9625277b9a19b6463c7ba5473e7c83ab6bc3c00d2d85b3acebedc2dc4ca49c60c9fe2313b7fcb16443b245df6 SHA512 8d9d27fbe99aff48991cc6531646fcddb6f97a46b7c4a43e436b27d77f092337c30af7febe3aef74dde2d47056ffa93f78ac63dbb8cc99b5e623599aab9e394c
-MISC metadata.xml 911 BLAKE2B 7596a3d7a53742635e3262a0deac45eb6c37e51b473dde2b5da78742baba1ecab42a4a3e2f992cfa8f3765472df896ccff2e2936ba5dedba1aad05c2ab47d9dc SHA512 c5d9f15742132625061303ed71206e937933b402e183edbe0f37ee73ac7ba47b3f7ad54cbf12d1db3900a1f833ea2432790a10a02ba7e1e0c4bf128a716b9d72
+EBUILD ruby-2.5.3.ebuild 6418 BLAKE2B 40d7c916a9d83b0cee36d793c95aae501c7778e4cfe7a83a14f2a54223a4d1984b4fc8fea70712b8e65eabe31beaa98a12040ee4a3ff6f1263d9a3dfa8cca983 SHA512 826075b481abb9656c905a38bf70fbb5067b408afba0bd12f965ae129f3c6bd1f14e307bacd6f922ca212522ee1f016b6d6954a69c5b1054507d41883435a026
+MISC metadata.xml 824 BLAKE2B e426ed390cdea118f3301d329ce93729095bafb0a04db9a64edfd709251d6f16f91153d56976f99b82d7a9df4a452513d65593732ccbd7f71332870b52f369a7 SHA512 b6f4fab5888fb9605164d7f627edc86514ec2f83d9dd8c74003ccc5a0d9b6a306986930e027e81f09928fc7ac6677a7de58cebf75c31c2ada73e2a506a447453
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index 99e5faab0bb7..b8e5451fc581 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -17,6 +17,5 @@
 			editing functionality).
 		</flag>
 		<flag name="rdoc">Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.</flag>
-		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-lang/ruby/ruby-2.3.8.ebuild b/dev-lang/ruby/ruby-2.3.8.ebuild
new file mode 100644
index 000000000000..b5d01be70e1d
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.3.8.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=2.3.0
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
+		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	ncurses? ( sys-libs/ncurses:0= )
+	readline?  ( sys-libs/readline:0= )
+	dev-libs/libyaml
+	virtual/libffi:=
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20151229
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23]
+	>=dev-ruby/minitest-5.8.3[ruby_targets_ruby23]
+	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23]
+	>=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23]
+	>=dev-ruby/rake-10.4.2[ruby_targets_ruby23]
+	>=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby23]
+	>=dev-ruby/json-1.8.3[ruby_targets_ruby23]
+	rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700. Use explicit version numbers to ensure rm fails when they
+	# change so we can update dependencies accordingly.
+	rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use readline ; then
+		modules="${modules},readline"
+	fi
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use ncurses ; then
+		modules="${modules},curses"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(22|23|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-2.4.5.ebuild b/dev-lang/ruby/ruby-2.4.5.ebuild
new file mode 100644
index 000000000000..80efa3680809
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.4.5.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	virtual/libffi:=
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20161226
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24]
+	>=dev-ruby/minitest-5.10.1[ruby_targets_ruby24]
+	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24]
+	>=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24]
+	>=dev-ruby/rake-12.0.0[ruby_targets_ruby24]
+	>=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24]
+	>=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby24]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby24]
+	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${SLOT}/{002,005,009}*.patch
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700. Use explicit version numbers to ensure rm fails when they
+	# change so we can update dependencies accordingly.
+	rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-2.5.3.ebuild b/dev-lang/ruby/ruby-2.5.3.ebuild
new file mode 100644
index 000000000000..b837e6034f7a
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.5.3.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	virtual/libffi:=
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20171225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
+	>=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
+	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
+	>=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
+	>=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
+	>=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
+	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby25]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby25]
+	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby25] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${SLOT}/{001,005,009}*.patch
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700. Use explicit version numbers to ensure rm fails when they
+	# change so we can update dependencies accordingly.
+	rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index af03d83974dd..0a8bea7d2a62 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -4,5 +4,19 @@ DIST rust-1.29.1-arm-unknown-linux-gnueabihf.tar.xz 106051860 BLAKE2B 65d9a5f755
 DIST rust-1.29.1-armv7-unknown-linux-gnueabihf.tar.xz 106372416 BLAKE2B 25371071e52a585c3f0b99f5849cf674aedd6d024ce75f6bf7b0d88f485d715b42d6a0f5eb8871890240d1c2488d7ad75c8ac7b4b22dd88e3ce2d049d35ae8ee SHA512 0067476eb0972998cee33f27d8fd6ef51c497bd6edbbd8a289fcf768da525805646569ed029318d4be6ecb6aece6669e3554eb30a14e1d31f2a3e7d5896b14c3
 DIST rust-1.29.1-i686-unknown-linux-gnu.tar.xz 150811536 BLAKE2B 999997d268cbbb5485d8efde108462bb0086ed9428a9b7ba8136dac764cd871a39d9503f6b928ce5fd9f1cdbf20dd109877f4404cb4522ccb2d37bfd55b15664 SHA512 8dc2a3b7fb1eef4b009541c473b767d07ab1136b933495b22e3fa56925def80b141b4801ce362ce9986a559fda4299fea35dd4bd7209dc1b3425b44421605df8
 DIST rust-1.29.1-x86_64-unknown-linux-gnu.tar.xz 148184680 BLAKE2B be64a44619807be3151162e45cefe79242e965277606b7aac4f0456d34e4cb526b1779c327499c47c484a830c4c566ab1aeaef30cf17ae7d2bdc89ecbf1f5de5 SHA512 69809c2ae77be6a1f71a5f14cea74dee6ac59bb548bc8ed454819ce3db38146ad64b83a6bf2a6d5cea68c807bc8ecf6c7929c4f8365b419e40a23022074efa16
+DIST rust-1.29.2-aarch64-unknown-linux-gnu.tar.xz 99702524 BLAKE2B 669066ada5c88ad966125edca77723fbe0ebc0e19859a96cf02eb28a107df87647bc552358cb5e1f8be1fb79d836f8202f4e59349f123bd95383a3a9cb82d0f0 SHA512 f871359a3b1ac54fb237921204d98ef4fac06830e9835849538397c27d40283662c0f6ab3f6eafe0e9ef63182a460e26d615111055430ece0fe94ddf7ad03914
+DIST rust-1.29.2-arm-unknown-linux-gnueabi.tar.xz 105368092 BLAKE2B 7764689fdaeb2ade9aff248707f472ed35d06d4240b138ddf083ef614227845bf6e1d0be38ebc771e95b0998dab3f550de5abe50ffe89625690611d4bdf53aad SHA512 2ef8fda575b00bf7c6f20a8f2a1b6cb8c3b1de6287c9e07889c9a3a682f73f9470bb5649425652ac47af8f61f49abf21209f6b151c4a5ae42dcea59f6e79f84b
+DIST rust-1.29.2-arm-unknown-linux-gnueabihf.tar.xz 105657004 BLAKE2B 5813dde3020afda41e307f4d9ba57c3840ff800bceb0ef494d743095ce6d4da333da208fc72bb36e21209a9ae16e081ca3e7580d59a984ce561d85bcf4b2e2dc SHA512 81d4e392afe3f4bd1ad76a78610e92e8a27afe8f6d0ff1773dbdf35f2041a587c2a0d71db0658ff50fb43460b4f15f23bbb1cc03a018d49d153314e636befb8a
+DIST rust-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz 105958932 BLAKE2B 569cbee0ad0eba41c280be934fc5a59c52331b0853d890aad2188c1979a259d90f4092d72dc9e8027255e2ea6b5ea422a06dd9d82f6b2a865fb1d3bcf146c13d SHA512 bff1220781eca904a93d2cefafed3587e3f76e1dc04fbef09a0281295b6c06491c5fa327830c430d31df80eb7a3e64eac7f45739bc118e3626854f96dce246e2
+DIST rust-1.29.2-i686-unknown-linux-gnu.tar.xz 150567444 BLAKE2B d3b3cfa88e89e29cf2e502a2ee11b22ea45cf9fa5ca0611de273062a8885dc0b9206a43175895a873cbfbaa08bf0bbdcf38cca45436b77b47dbac1b09e0fdb68 SHA512 faac22aec54d0754ff991f2a34ed7b8bfefa8dc9720d247eec1c6b671bbc701907146a796699591e4a677a0f378b9d96bfea5b33452f05dd876c668525f9f33d
+DIST rust-1.29.2-mips-unknown-linux-gnu.tar.xz 96027696 BLAKE2B e12dbd41e45a5009c218be07f085d75ce99bd7a7daf8917db0127aa03ac78f4883b344b566d3a8947b836d55750388ea5387264e036c75de7ef4ba5dda081d63 SHA512 21d860c6f7219f51b65dced57e0173500e054d2d13300f0ee7721262a8354e5dbc272deb8387fcaaeb16ad793808f87edc6c087f7e442e7434264a3302acf537
+DIST rust-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz 102149796 BLAKE2B 1f40dd40e461769cfb75a671d6f83c650c74031302bd8872861cfdd3432e270e47c150382c6f02c38e7823f35a158de395cbc33f0061e51632d130b6fd0910f9 SHA512 5b98632b80d2ed4cef17bd068adabbe26146a6df68e6e70f2535f61f981c8f935b2491a2dcf388a2afe0cc225f10f9f262342457ce9def8c800364253cac7e67
+DIST rust-1.29.2-mipsel-unknown-linux-gnu.tar.xz 97362256 BLAKE2B 4d3170a8c48a68a606eff5631d198b16ca09953b0d8079c39f5edc6284a037c0b2212c74d098da4fa0a40a0917139022a9746734e9fdeb62e2564337430a4edb SHA512 9c5ca864da672a975730073e3291c2be218c2624a11ec5fc9a2637bdf58c7437ae77910bccbc6678d584a3464036377d4717d7f6ebdd5712e9bc86973e91d0ad
+DIST rust-1.29.2-powerpc-unknown-linux-gnu.tar.xz 93639612 BLAKE2B 54fe353f32bedb2567784bfe28ac741f137cc55928e874157f420460831cdb4617fee262c4d3b56d6720dba37bb7b6281c970d4a3002c673aaa85aa70eed922d SHA512 f217cd5169225b290870821b5ba17ad9dfffc99906057c79e91e2a2db5cfd8bc5a83d4e20023e9b73171d15c988e4b28cdbf3f8af2c70657566e6d89658998b0
+DIST rust-1.29.2-powerpc64-unknown-linux-gnu.tar.xz 103432092 BLAKE2B ed700d298770b621767f5439841e3be79c3c02d2b05feb211b8508933d4ca2d13c30cf689c5376cfc93bd374c09aaa4fdc4fb84dd4db264eef6a70cba62b6647 SHA512 1af0b55bc62d7641d33e2d33aadaf474298d3284cb2d914be0240eae54e20f464513db4b04f7518385dc5135498c58ec18e0d4cc6341c9e165847536479f44dc
+DIST rust-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz 106607384 BLAKE2B de19f341dcc1cc580e68865d3b0034f781ed4ca0ac1b07c89352409684670c7d0fd5c95ea6018fc7de4fbfacf4f7d0ebeec34c036c0062ca7f776403511df7dd SHA512 b9181da601a467f46713f2f438fc7ad69c46fc310e62a8d45f665744c8578491d832b8624ff454c19c94f1694fa406846a82289250241030a70b2cb4b88913d1
+DIST rust-1.29.2-s390x-unknown-linux-gnu.tar.xz 99114900 BLAKE2B 08e9251bd8e9c9ac6352ab81735b720052b3288b5fd344f6ba69205c7971f362270f0acce7dbd3763b20d3b1e976ff5404151253acb9c29708f36038d23299f1 SHA512 f76a030257edbdd993d7a4e83da895c8b4749904fb2252a125b3e4ef4331a1cb2c389ec54a372bea413718e3dad987e4b17eb29d301c29ba330222502e6b9b75
+DIST rust-1.29.2-x86_64-unknown-linux-gnu.tar.xz 148275708 BLAKE2B bd7c974f5c8cf78a1fbfc73544ecdab97b7f9ab28ed9ab66759eca3e0fa085fdb2689ba5dfc6dccc6746bab91b6b0b544c44cb729e493dddde2f9ed84c96a247 SHA512 8bc05942a72b186ea1765831bea6921f734e2dd58790a8e427a6d63a2db0d9064937d3198ca3febffeba73b1cc3bef716155ef6cb32127ddeef29ac884cde4b8
 EBUILD rust-bin-1.29.1.ebuild 5653 BLAKE2B 77ac557fd404c79aa691a6ba7f78b8113c2af5e2e769e6546a9806b02eebf0fc3eab96b9dbd495d47643d33cc7395ccebb9e4cf7f5183f50acec503ff5170046 SHA512 1151d8c5783a0ea17069b00a0d906b2a2777932bd21859bb8095fca2488fc7117634f44ddbcb054621ca1cf7a83ad3662ac986a2bde2a789c2f9d55a8fb015c1
+EBUILD rust-bin-1.29.2.ebuild 4740 BLAKE2B 7398415c37aa858dd14d210bd1715ea98fc28d61fe779e57d39251d30d31201780a90dcf5300ea117111026aaf60fa87372fe1bb47ea791e0b81e3371443f2a7 SHA512 9f16f92c1083daa8f060af48741ccbcad8f3410220fe324ec45b0d5c7c42b12f69bfb6faf28829da7e0522a73d9bee9011c34fa66c7592027325e58d597574b2
 MISC metadata.xml 435 BLAKE2B 5725f771e138720715bb1a5f317bbe0757d981da2059320e5be70583c3a98dcc4fc23141a3b489cdcffa2a53dfaf621b0ee0336a3ca6a05bf7bf8db1b06cf0c3 SHA512 af938d75754d54ed33a87410cdac16fe4b74614e3c5e352c2c1f906137f0a3e96a2eb1036d0aa7b2a17b629b05d44fdf44348b53f7720c770c6e6cae2a715f16
diff --git a/dev-lang/rust-bin/rust-bin-1.29.2.ebuild b/dev-lang/rust-bin/rust-bin-1.29.2.ebuild
new file mode 100644
index 000000000000..afca3183a7a0
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.29.2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils bash-completion-r1 rust-toolchain versionator toolchain-funcs
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cargo clippy cpu_flags_x86_sse2 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-misc/curl[ssl]
+		)"
+PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+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
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${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 clippy && components="${components},clippy-preview"
+	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 clippy; then
+		local clippy_driver=clippy-driver-bin-${PV}
+		local cargo_clippy=cargo-clippy-bin-${PV}
+		mv "${D}/opt/${P}/bin/clippy-driver" "${D}/opt/${P}/bin/${clippy_driver}" || die
+		mv "${D}/opt/${P}/bin/cargo-clippy" "${D}/opt/${P}/bin/${cargo_clippy}" || die
+		dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}"
+		dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}"
+	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 clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${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/Manifest b/dev-lang/rust/Manifest
index 54bfc92a23c5..072e11492805 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,6 +1,19 @@
+AUX 1.29.2-clippy-sysroot.patch 2571 BLAKE2B 1f65355cf47fb1ee2bd15f7424b6bf98106028fa46a8f89ab639acdc3a131684898dcda42abd6d5d7bc09c857990dcea86467b3c96e8e6d47b90726d9176a221 SHA512 2577c7540be9a197343bc06b5de52ba42832cbb2799997bb9778e6e392a421cfe6bce9ce48793d60af7a8f3e0ade0c79e0adbfc1125fbcd89b01e97ab96b8d30
 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-mips-unknown-linux-gnu.tar.xz 102116424 BLAKE2B 72c7cfa9157c0d7fb6a9dc0698322e5285bc2ef9f914a1be5063c8aeaed8a7d29bbcd71090aa5f09ec5229e38ac08e6883119f03af42ffa794cadf227450049d SHA512 0d2e2785178e235b0effd2a7251e9004c87c21e158c2e6f122eeb10942ce2545e5d67d7ff040b7c277627cc402321fff5ad5186a41f2de581f46633adb1894bf
+DIST rust-1.28.0-mips64-unknown-linux-gnuabi64.tar.xz 101617356 BLAKE2B eb0cc524e40cdf20ec16b72418cae9ea03ce946006412153a7c0a173f27a3f8e193a41685295be9917b10ca39565be57b6d3f7c7a7122cbee088a5652081dda1 SHA512 0d7bfafa1340de97efab8db3100d5462afde94e8e54d6543e229d9240aca5a69d469a3e5ac750527d5e40dad11286b40d6be22812655721a0b8bf3ecba485ad6
+DIST rust-1.28.0-mipsel-unknown-linux-gnu.tar.xz 103574324 BLAKE2B 671e8ee0de674e37c8156825603e3cea659c0ad016698c8f208a78afe18cf0411dc953cf683d297079e3eaedddad540dbfa1821950585fb5ffcf74267f0ebcdd SHA512 40233beb18c937f7293a8191d6a9d98c5628b0709ef808e48fac4db10ce0af91cb8d6bec9056dae00149e8e0b1613b1c66960e23302bc0b66b50fbb0994cb018
+DIST rust-1.28.0-powerpc-unknown-linux-gnu.tar.xz 100580084 BLAKE2B 2487976f495e78d8cc8129d81e1eb29cc86d7c523133d9ea42e6425f7607fea74c8a848877e926c53c2dd9599a0c3bede46109e96c3851fd7726b251442fca6c SHA512 450aa028644fc73cf8dadccfabc1a66c360880300479df9c0041f773b3f6b6072afb9aee0221fe51abd4194b86f8cc8b7f14c788b3792858a44bfc8c83bcc03d
+DIST rust-1.28.0-powerpc64-unknown-linux-gnu.tar.xz 105788856 BLAKE2B 828082612561ddd186472472e11e1afb9bc24a3332ff5f82a9924fc950b29655e892c974a88ce6c0b04c34a9c7d13856a8629027069808234ffb1e3cfb788e01 SHA512 1bd2c5069beecb765a2305715070e4052d5a66dafe50a5b53bea2c2082b22b3f9a2d2b9fb059c93476f88ee5e602effc18b807e5c964610e8255a3a945931f51
+DIST rust-1.28.0-powerpc64le-unknown-linux-gnu.tar.xz 105822856 BLAKE2B 0cf534a55efff99daf700127fc7bc7b82b93054d054fbf8479a8b247b41381fd82f8672ac12f3e3f53566d816964d83069593817d1932b33902f83994f1bdc33 SHA512 bdbdf3a64a184dd4510a113bbe20c058f42e35321cd2fb7c938487dfc9b1f04320b523ea215dd92a23c2537292eeb064097119e2097d6e24a1c4e237d9d4fc8b
+DIST rust-1.28.0-s390x-unknown-linux-gnu.tar.xz 98839840 BLAKE2B bbff015b3d2daf1443781cccb80527cf8c7f86a01ed928b49cc7e87e17f8c6354f6a47dd2356ff75357e09f7f79ec85812bd8458aee9455800fdf88761243e94 SHA512 5ffb44d16c990b8a6377b64e5042a3b2e709bcc7187013dbe4ab3c9d8cd781b6bf07b0d374340e2ccabe9f84fd4731b606cb05a10a739ebcfa49652518a2aa46
 DIST rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz 134120432 BLAKE2B 56fb79a98659d9c8e56b8eef87dea3302ee5901bc4507d1c204628370b20cf34b2875c9586faa0acc2bc2b1a5beedeb9b5ba199cfb85d52f268f084a02f04f27 SHA512 4f427c11a9cd22aedd01bd7ed5bee2ba5e00a27db25af4f596cf8627d88eff8e72625eb83729d2e6c6780aaffd44c0e7065a1c8fa22f4899349b72c726cf6a5f
 DIST rustc-1.29.1-src.tar.xz 61937676 BLAKE2B 6a60249538e1ec62471f4d0e3fc31c0a648433aa6f85ca7341657ea07772e338eb92a629941685808f4b80e84cb025d78aee9d0d6fa71c6635a1647c61bca9bc SHA512 1ded651b4c460e11e5e44c26de88a80fb13c2000097de2ee1e5af89638e12a7e8f43dd756689d4cc4fad45c52d4d43a3c70dd6a3ae550735b9dad5f8defea6a7
+DIST rustc-1.29.2-src.tar.xz 61888912 BLAKE2B f59b0bf45caa6f6136f92ffbaa612bbc6a340c8694ec69d75aadace9180c36753f985641915524388b52cc108f8f5b71840ee3a6c0b1fcff6decb61d2d8a161e SHA512 d8fa9501764348ace8f60f2069bcd016925abe56c8bbc2b87fb52ff796e4bc7284c1fccbb1671416437bb82fde7d9240eeae875d6099914e27e75cfe050e2d38
 EBUILD rust-1.29.1.ebuild 7965 BLAKE2B f84b3e11c73b20abf236f457435c56fc2ef160cbd174bb048a24c307a6627680ce266cdd276974a569d0ba715c13f0e1e2e36c2fef3d1600bc4eefefdbc0e3da SHA512 23d46b6feff4016ad6b9e508c58a7d41dfe1568b45b6332efd56c08100d8790f40509cc16b0aed699a839b47ae6bdba700b428c74ed7aa6bd03d8927d6af7233
-MISC metadata.xml 673 BLAKE2B d52ce94b5b6dcf9ceacafd0d7b5cd83c00a5c3fcf4310c1bc26c4c7730d6180f06f3d0addb90572a5ead86a7b9279cfcc95ecb6c7be2b043221f19753ade377d SHA512 7e92c8d0a294e2b4efe1ed5ee396d7434ffe309e0b4e9bf3edca0a4447612a6c8d7982aba2c14b60b2acc099c14242d7fc91f2a828957790400b6ead192c1052
+EBUILD rust-1.29.2.ebuild 7870 BLAKE2B a1c83338300b43ce54f1fbf8a28999a7574121c1eae70ddc7cdfc2587616a255cf83b26bb17a70c94a92d9a651b242e995878b6fbf8a89d4de9131cb202bd0da SHA512 08bfa1f80fa8845a9886f85d3280d0ba000a4c8460ea79148f85a9f67a90fa42a597399ce2a219fd06685c295aca7816008a5d58684c34a36e8e3fd19b3be030
+MISC metadata.xml 570 BLAKE2B 84133a816858a9787c2e5c5ca839e8e1c4586bd428711f356c64ea23396b0fd2d4f00abb66f0de8f9c81f34058c537491dee5c539c27be58e709972a5d344dc0 SHA512 f3c7511b766a86fb0ebc7a8a9c88226ec71761da29f0b2a12eb593f3205170504d733cf09b0fb72103fea12ac323fa115a121ab9deb0609c6115ac571330ad01
diff --git a/dev-lang/rust/files/1.29.2-clippy-sysroot.patch b/dev-lang/rust/files/1.29.2-clippy-sysroot.patch
new file mode 100644
index 000000000000..6a527e5a0206
--- /dev/null
+++ b/dev-lang/rust/files/1.29.2-clippy-sysroot.patch
@@ -0,0 +1,62 @@
+--- a/src/tools/clippy/src/driver.rs	2018-10-04 16:30:42.438486058 +0300
++++ b/src/tools/clippy/src/driver.rs	2018-10-04 16:31:45.044484028 +0300
+@@ -20,54 +20,22 @@
+         return;
+     }
+ 
+-    let sys_root = option_env!("SYSROOT")
+-        .map(String::from)
+-        .or_else(|| std::env::var("SYSROOT").ok())
+-        .or_else(|| {
+-            let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME"));
+-            let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN"));
+-            home.and_then(|home| toolchain.map(|toolchain| format!("{}/toolchains/{}", home, toolchain)))
+-        })
+-        .or_else(|| {
+-            Command::new("rustc")
+-                .arg("--print")
+-                .arg("sysroot")
+-                .output()
+-                .ok()
+-                .and_then(|out| String::from_utf8(out.stdout).ok())
+-                .map(|s| s.trim().to_owned())
+-        })
+-        .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust");
+-
+     // Setting RUSTC_WRAPPER causes Cargo to pass 'rustc' as the first argument.
+     // We're invoking the compiler programmatically, so we ignore this/
+-    let mut orig_args: Vec<String> = env::args().collect();
+-    if orig_args.len() <= 1 {
++    let mut args: Vec<String> = env::args().collect();
++    if args.len() <= 1 {
+         std::process::exit(1);
+     }
+-    if orig_args[1] == "rustc" {
++    if args[1] == "rustc" {
+         // we still want to be able to invoke it normally though
+-        orig_args.remove(1);
++        args.remove(1);
+     }
+-    // this conditional check for the --sysroot flag is there so users can call
+-    // `clippy_driver` directly
+-    // without having to pass --sysroot or anything
+-    let mut args: Vec<String> = if orig_args.iter().any(|s| s == "--sysroot") {
+-        orig_args.clone()
+-    } else {
+-        orig_args
+-            .clone()
+-            .into_iter()
+-            .chain(Some("--sysroot".to_owned()))
+-            .chain(Some(sys_root))
+-            .collect()
+-    };
+ 
+     // this check ensures that dependencies are built but not linted and the final
+     // crate is
+     // linted but not built
+     let clippy_enabled = env::var("CLIPPY_TESTS").ok().map_or(false, |val| val == "true")
+-        || orig_args.iter().any(|s| s == "--emit=dep-info,metadata");
++        || args.iter().any(|s| s == "--emit=dep-info,metadata");
+ 
+     if clippy_enabled {
+         args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]);
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 8da6b2e99de0..c6a534bebad8 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -8,8 +8,6 @@
   <use>
     <flag name="cargo">Install cargo component</flag>
     <flag name="clippy">Install clippy component</flag>
-    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> as the
-    standard memory allocator</flag>
     <flag name="rls">Install rls component</flag>
     <flag name="rustfmt">Install rustfmt component</flag>
     <flag name="wasm">Build support for the wasm32-unknown-unknown
diff --git a/dev-lang/rust/rust-1.29.2.ebuild b/dev-lang/rust/rust-1.29.2.ebuild
new file mode 100644
index 000000000000..b1d1b8dd282a
--- /dev/null
+++ b/dev-lang/rust/rust-1.29.2.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+
+inherit eapi7-ver multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
+
+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"
+else
+	ABI_VER="$(ver_cut 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.$(($(ver_cut 2) - 1)).0"
+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.$(($(ver_cut 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
+		$(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})"
+
+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 clippy cpu_flags_x86_sse2 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[*]} )
+				x86? ( cpu_flags_x86_sse2 )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+PATCHES=( "${FILESDIR}"/${PV}-clippy-sysroot.patch )
+
+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 clippy; then
+		extended="true"
+		tools="\"clippy\",$tools"
+	fi
+	if use rls; then
+		extended="true"
+		tools="\"rls\",\"analysis\",\"src\",$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_abi)"
+
+	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)/${P}"
+		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)"
+		channel = "stable"
+		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 = "rust-lld"
+		EOF
+	fi
+}
+
+src_compile() {
+	env $(cat "${S}"/config.env)\
+		"${EPYTHON}" ./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}" "${EPYTHON}" ./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 clippy; then
+		mv "${D}/usr/bin/clippy-driver" "${D}/usr/bin/clippy-driver-${PV}" || die
+		mv "${D}/usr/bin/cargo-clippy" "${D}/usr/bin/cargo-clippy-${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)/${P}/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 clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${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/solidity/Manifest b/dev-lang/solidity/Manifest
deleted file mode 100644
index b61ff514f917..000000000000
--- a/dev-lang/solidity/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX solidity-0.4.18-fix-cmake-external-jsoncpp.diff 378 BLAKE2B 00e8ae9719e3d7faaf22ff806793ccd47222e4eee34e8528327396dbeb0333a723e5a8959513f980c11a8d7d5fab57fe07a06226b3ec398c201911db65e1bf60 SHA512 44b76b9dd9a1cd37c4fcf39d7aa585873ed9b394d54b0d862b6909dbe905d2202e1d2a9ef0e84e959931b0805d6f049c6567ad424f9561229803768ceafad4ff
-DIST solidity-0.4.18.tar.gz 1005571 BLAKE2B b7748f1e9ceb260ee5c02a5e6ddb7a3387a6f1df252889258045cf03e3cab365f1ac41c7e75805a49b71beceb88439855c53b6c59a81d610db48f9fe5256da55 SHA512 aa88060567a50fa833a81ef2c9ce9614ed0fddd9dc82c1546998dacd9a7cad1863882aa0700d830f80fe52bd91659a9fa07434af193624206876ba7224c34eb7
-EBUILD solidity-0.4.18.ebuild 766 BLAKE2B cbba8496a179b2f273efa677f82749ce0b6bca2e2e642c7d01579c9c59ae14233ee80e3ff017f35bb9257cd3f43bbe518d92e14ef7a2f7e76692ed10d52bd12e SHA512 a6a19af46537d59bf273e9a031250fc57d1f743296fd02416c9289921f201d0c98129714d2b6212fddc4bfa8be2f5ca102b77e190c06bb088266b17dad47a42f
-MISC metadata.xml 450 BLAKE2B 43358d0df6ec754300e4e95ef6cf3abd0702ab121cd70c58bc7808ee3d47346c5a42843ce895b1a9974bba8ed9716ba5256cd74a31343ac2fc29f4ef60196232 SHA512 8de6f5dadccb7020d6fbbd17a3800dd9a44e4b19f484e38799fd00b240fbd2a4d213454eb7cec2d99ab8ea7834fe5a0d3f792c62420870e55986b2978af9789d
diff --git a/dev-lang/solidity/files/solidity-0.4.18-fix-cmake-external-jsoncpp.diff b/dev-lang/solidity/files/solidity-0.4.18-fix-cmake-external-jsoncpp.diff
deleted file mode 100644
index 1acafc9d9e36..000000000000
--- a/dev-lang/solidity/files/solidity-0.4.18-fix-cmake-external-jsoncpp.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 24bea3b3..4326927b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,7 +18,9 @@ include(EthCcache)
- 
- # Let's find our dependencies
- include(EthDependencies)
--include(jsoncpp)
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(JSONCPP jsoncpp)
-+include_directories("${JSONCPP_INCLUDE_DIRS}")
- 
- find_package(Threads)
- 
diff --git a/dev-lang/solidity/metadata.xml b/dev-lang/solidity/metadata.xml
deleted file mode 100644
index e0f4ff855bce..000000000000
--- a/dev-lang/solidity/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mathy@vanvoorden.be</email>
-		<name>Mathy Vanvoorden</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ethereum/solidity</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-lang/solidity/solidity-0.4.18.ebuild b/dev-lang/solidity/solidity-0.4.18.ebuild
deleted file mode 100644
index 8a36d44a9092..000000000000
--- a/dev-lang/solidity/solidity-0.4.18.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="The Solidity Contract-Oriented Programming Language"
-HOMEPAGE="https://github.com/ethereum/solidity"
-SRC_URI="https://github.com/ethereum/${PN}/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="=dev-libs/jsoncpp-1.8.1:=
-	>=dev-libs/boost-1.54:=
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Upstream downloads and builds a static jsoncpp during build
-	"${FILESDIR}"/${P}-fix-cmake-external-jsoncpp.diff
-)
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBoost_USE_STATIC_LIBS=off"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 2055f6b095e0..25c90fbd852a 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -2,15 +2,11 @@ AUX tcl-8.5.13-multilib.patch 258 BLAKE2B ca0453e8e0f6fdc1302f024ff81a8a6e012d0b
 AUX tcl-8.5.14-conf.patch 427 BLAKE2B c7d97bccebc45beec003bcf005fab6ed7f544744d81f08778a997b767ea0a60fd07f7b7cbc464ef8252e47717b34c0c42c871331a04740e23caeddbfb351de16 SHA512 e8097acb127966e6f2914c888278acdd9042d881b4d9436853ad7ed2361e8d67a372d4b0b0d5f0333e6bf90220e72df5c5eeffd4b44bc8e94ea9631ddc98cf16
 AUX tcl-8.6.8-conf.patch 401 BLAKE2B 278502e983b8c831a2bfe5e61c31d32181558aaebccb2c7a64c52c387ce674ad1543dcedb7b73bfa748e8b40424a59e4696057e3a7f6d0e9f7ddbe838473995f SHA512 8524f80bb54851fc28f1994cbbd9c78756f9f9b1ca31a2f602e2cc557bbb22093bb6cce0ce5099cb90847f3c0ed20503a3d122abb400482869afd2469b3867b8
 AUX tcl-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457
-DIST tcl-core8.6.5-src.tar.gz 5846556 BLAKE2B 9c3c48acffc13be526b507fc19711b21e710a84642d37d494bb46a2d4ac9445a95749fd9556ffbda57d55f90bd566d0c9cd72a800a34f062616aacf57e811aa4 SHA512 b726f7d3193ad92ba64911b8c724d5454c5a93d5f5e95462ec0a6d8ccbbdf20093888f66c83956d7631392ca805c1a80430f102c0a932de3ed55311101e0e09f
-DIST tcl-core8.6.6-src.tar.gz 5868427 BLAKE2B 3444d474bfdc4958919dbf75527420614251e3cffb0d18fbbf547ffb83ead544f266b6ea868738ae40e02075cf31be6e753e0f89da02a2a81ededf09fc9dd2e6 SHA512 469a0221ed16569b70986cdde261d0c0df3bf64c493b8d6fc8368eb14597f7c2f6a01f082a1c8f27eb720618956e053cc97fbb9aaf7bb29cc96781cdc8e9518c
-DIST tcl-core8.6.7-src.tar.gz 5875027 BLAKE2B bc08e4e6639ba33176c8c1e670b957b8ad62a4790ace4ff8f8dc964f676ca87473c31c28f645d32a8287f844756fa224a077f96f1425f61b9872a4a0ae1429a1 SHA512 95c8c5bcb4fe604a77ca6ba9d49f9e90d156feaa9f3ab97661983f256ab54476b103ec8de01cd47231ed95e6df5e36d60514aed2ba5b8f3619cc5a3698ad3ee5
 DIST tcl-core8.6.8-src.tar.gz 5887483 BLAKE2B 2b8428652e451b817fe63a811f910001929cdcbc8a8361cdf4f7df8e13cbf9b18c94a91c22c0f09cc46dc0174a66c44774b485539a8f24c14faee6658547b6b8 SHA512 36e6079b582c205e8c89435b361ef96550541357f473aea2ca4e6f01bd84e50ebd1474a75a1ae90640b9a5b392fb01ddfa71f0fa28e409b3569d88c32b4ddb69
 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
+EBUILD tcl-8.5.17-r1.ebuild 3766 BLAKE2B 735b31a87b13a4a107b451f1234699cb1dc4cab210846f992100e8f69543bfb2103e1814cefd1673e7081c6aeafed63cda87e36d433580ddbf5548cb779d8508 SHA512 3c3fadceaafeaad04780a44d40a10bd318d30fff0d1ff38bea683c2bf019ff4a3cb036f7fbc60c79cb095470c3c9a3f59ad8b27caf2ae9e98d2baf0ea6ebab14
 EBUILD tcl-8.5.17-r100.ebuild 2790 BLAKE2B d8de982d4d2f103bd5a1271101bc997cd1920c7274078f9004e6983d30326fa0379588d529c3e459f4e93e9e723548aa37fc5e074df768d046bafc3decb4297e SHA512 b09ac13d74992c34c333fba336e07e6baefbe8ee6a94e8c59b17ac40a508bab4146f7a6d00f712ef70b9d5d8d168d259dbbed77d4e5e2e65c2b45ff2769586d7
+EBUILD tcl-8.5.17-r101.ebuild 2850 BLAKE2B f34283905856e79de70e4894578b4d403c203ee00cdba9a96bc4e9c73e45b0fe4b773a40ec82679792380a87a34dc389ef468440bf32b05ab01c500e49b6aa0d SHA512 a057478a7535e9b596139693d5b104b14968cb7223bb90d8a4528d6560323a2bde925f94b349d1c67e1ce976849203b7105c1ad4792560a9628b7108012e7908
 EBUILD tcl-8.5.17.ebuild 3706 BLAKE2B 4f5b6c6fb9c25a7d31a1adc45fad8fa432478056d5a0895298ba79f2a5904bcd977a73d60f34355ed5290bf5077f5d74ba050583ebf0e99a119f9d4b14dbfe0b SHA512 11816e9baefbf29264fd844ddeb38fa94686b0b8ca667e7046713860a97945caf122f831d7778b7ac78ab392bd4ac9bc10578c70d74b21c83c5da1b479d9c800
-EBUILD tcl-8.6.5.ebuild 3951 BLAKE2B 91748bc079cafd2cb6f22f8c4870901f2d36fcfc45c115318f98f10bd024de23c926cab98297ba6db1619ead361cd1147ab182c9615995083765b760f078ce6b SHA512 e587e699d26b55dd7dc95527f260449b3ac0f121a1e593a16eb24c34c46fdd72e33399636177ed9c84fcba7032f2b42e1197bffdf95e965912c3f4a77d6d815d
-EBUILD tcl-8.6.6.ebuild 4038 BLAKE2B f2412b2e2cdd6f3d70fd90ab70e1ea65bafe9cf77d6274cb3a6c8377778c530c8a926a39fe5b9d2098be646168f6dbd00bd7ded07990d06bdfef3b64e2a5096f SHA512 76b1ad672e9f4102b64d945702f6a4daa0973a46a243a54611b9b13ee524815f61cd9b664eec6ea6f6448b86789cab5c5374cbfdaa8ed28dc2137ff8ce767f0c
-EBUILD tcl-8.6.7.ebuild 3964 BLAKE2B a0f5158a4ab510cf394b5df2af7da1c0d9ae4bf5ece4190d766fb3bb17f4e9b7a965456ad8c4f4213e55efc802e73beeed44fa588f7b3463606532b6a1925552 SHA512 fa39358b35da654852e9a097f7ca4dbf85b9dc0b5656805eeb1ccd33b1ba999598ca9ee1456a40676fac8b010e987c37b6ba8fbead23b09cbd7b751b37d89fe7
-EBUILD tcl-8.6.8.ebuild 3995 BLAKE2B a21acbefc4d086965f433fb5576d9b70755ffc17a98205f40de699cc10bdea71cef177dd0f74bff510fb046dcde23cc5b06c3c2faabcc210cf1f1d7e50ce280e SHA512 ab86bb84d7eb467a683838909f05f3c214bfabc7a5c1250de6c736e581be341477c5effe093844fae06cc71ad124215275f8a5a613e6e3716d59da9de76fdfaf
+EBUILD tcl-8.6.8.ebuild 3986 BLAKE2B 0d126b490efcf0165049479fe94d0b31157b8237b0d75a4e3d801c6d56f1a28df88788d612aca0f6e45a5488f73e544550e3c62566ca33b9a99e4b3bccbb9637 SHA512 851baf012be74129624423ad882a7580c14e96827ec4b0fb05a82ffe7dc96d11ce87b091ebce8a6297782beb067f7ae4875288dbf436cc22d5aed0aeb66bde48
 MISC metadata.xml 318 BLAKE2B 7ea8e51656c255c3aea3bee8849423604a164efff556974f6032de44d33e38bb0378b69c18821cc76f0284064bc84a1a56e79f522f8d7fb0adc50e2e191b5fca SHA512 61f3feb8311f1babb8a4df8c9fcddaab009ffc6d69248f18cb9e001a1659dfcf47f2699008ab83fb563b3417f6ead8113af20db7e3893f488e8d75bb2a3483cf
diff --git a/dev-lang/tcl/tcl-8.5.17-r1.ebuild b/dev-lang/tcl/tcl-8.5.17-r1.ebuild
new file mode 100644
index 000000000000..a56e7f4e4506
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5.17-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.5"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug threads"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+
+	# Bug 648570
+	epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins *.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	if multilib_is_native_abi; then
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+	fi
+}
+
+pkg_postinst() {
+	for version in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 8.5 ${version}; then
+			echo
+			ewarn "You're upgrading from <${P}, you must recompile the other"
+			ewarn "packages on your system that link with tcl after the upgrade"
+			ewarn "completes. To perform this action, please run revdep-rebuild"
+			ewarn "in package app-portage/gentoolkit."
+			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
+			ewarn "upgrade them before this recompilation, too,"
+			echo
+		fi
+	done
+}
diff --git a/dev-lang/tcl/tcl-8.5.17-r101.ebuild b/dev-lang/tcl/tcl-8.5.17-r101.ebuild
new file mode 100644
index 000000000000..c210e2d6ada6
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5.17-r101.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# this ebuild is only for the libtcl8.5.so SONAME for ABI compat
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="8.5"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug threads"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	!=dev-lang/tcl-8.5*:0"
+DEPEND="${RDEPEND}
+	"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+DOCS=()
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+
+	# Bug 648570
+	epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	dolib.so libtcl8.5.so
+	dolib.a libtclstub8.5.a
+
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i tclConfig.sh || die
+	fi
+
+	insinto /usr/${mylibdir}/tcl${v1}
+	doins tclConfig.sh
+}
diff --git a/dev-lang/tcl/tcl-8.6.5.ebuild b/dev-lang/tcl/tcl-8.6.5.ebuild
deleted file mode 100644
index e76f93f75edb..000000000000
--- a/dev-lang/tcl/tcl-8.6.5.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
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug +threads"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	# Bug 125971
-	"${FILESDIR}"/${PN}-8.5.14-conf.patch
-)
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		"${SPARENT}"/doc/try.n \
-		-delete || die
-
-	pushd "${SPARENT}" &>/dev/null || die
-	default
-	popd &>/dev/null || die
-
-	# workaround stack check issues, bug #280934
-	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
-
-	tc-export CC
-
-	sed \
-		-e '/chmod/s:555:755:g' \
-		-i Makefile.in || die
-
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	mv configure.{in,ac} || die
-
-	eautoconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# We went ahead and deleted the whole compat/ subdir which means
-	# the configure tests to detect broken versions need to pass (else
-	# we'll fail to build).  This comes up when cross-compiling, but
-	# might as well get a minor configure speed up normally.
-	export ac_cv_func_memcmp_working="yes"
-	export tcl_cv_str{str,toul,tod}_unbroken="ok"
-	export tcl_cv_strtod_buggy="no"
-
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-multilib_src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
-		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
-		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
-		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins *.h
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	if multilib_is_native_abi; then
-		dosym tclsh${v1} /usr/bin/tclsh
-		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-	fi
-}
-
-pkg_postinst() {
-	for version in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 8.6 ${version}; then
-			echo
-			ewarn "You're upgrading from <${P}, you must recompile the other"
-			ewarn "packages on your system that link with tcl after the upgrade"
-			ewarn "completes. To perform this action, please run revdep-rebuild"
-			ewarn "in package app-portage/gentoolkit."
-			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-			ewarn "upgrade them before this recompilation, too,"
-			echo
-		fi
-	done
-}
diff --git a/dev-lang/tcl/tcl-8.6.6.ebuild b/dev-lang/tcl/tcl-8.6.6.ebuild
deleted file mode 100644
index ddba72845ae3..000000000000
--- a/dev-lang/tcl/tcl-8.6.6.ebuild
+++ /dev/null
@@ -1,133 +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 multilib multilib-minimal toolchain-funcs versionator
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug +threads"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-# Bug 629680: need to disable testing since network-sandbox creates false negatives
-RESTRICT="test"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	# Bug 125971
-	"${FILESDIR}"/${PN}-8.5.14-conf.patch
-)
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		"${SPARENT}"/doc/try.n \
-		-delete || die
-
-	pushd "${SPARENT}" &>/dev/null || die
-	default
-	popd &>/dev/null || die
-
-	# workaround stack check issues, bug #280934
-	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
-
-	tc-export CC
-
-	sed \
-		-e '/chmod/s:555:755:g' \
-		-i Makefile.in || die
-
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	mv configure.{in,ac} || die
-
-	eautoconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# We went ahead and deleted the whole compat/ subdir which means
-	# the configure tests to detect broken versions need to pass (else
-	# we'll fail to build).  This comes up when cross-compiling, but
-	# might as well get a minor configure speed up normally.
-	export ac_cv_func_memcmp_working="yes"
-	export tcl_cv_str{str,toul,tod}_unbroken="ok"
-	export tcl_cv_strtod_buggy="no"
-
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-multilib_src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
-		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
-		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
-		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins *.h
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	if multilib_is_native_abi; then
-		dosym tclsh${v1} /usr/bin/tclsh
-		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-	fi
-}
-
-pkg_postinst() {
-	for version in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 8.6 ${version}; then
-			echo
-			ewarn "You're upgrading from <${P}, you must recompile the other"
-			ewarn "packages on your system that link with tcl after the upgrade"
-			ewarn "completes. To perform this action, please run revdep-rebuild"
-			ewarn "in package app-portage/gentoolkit."
-			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-			ewarn "upgrade them before this recompilation, too,"
-			echo
-		fi
-	done
-}
diff --git a/dev-lang/tcl/tcl-8.6.7.ebuild b/dev-lang/tcl/tcl-8.6.7.ebuild
deleted file mode 100644
index 4240a4a81029..000000000000
--- a/dev-lang/tcl/tcl-8.6.7.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
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug +threads"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	# Bug 125971
-	"${FILESDIR}"/${PN}-8.5.14-conf.patch
-)
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		"${SPARENT}"/doc/try.n \
-		-delete || die
-
-	pushd "${SPARENT}" &>/dev/null || die
-	default
-	popd &>/dev/null || die
-
-	# workaround stack check issues, bug #280934
-	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
-
-	tc-export CC
-
-	sed \
-		-e '/chmod/s:555:755:g' \
-		-i Makefile.in || die
-
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	mv configure.{in,ac} || die
-
-	eautoconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# We went ahead and deleted the whole compat/ subdir which means
-	# the configure tests to detect broken versions need to pass (else
-	# we'll fail to build).  This comes up when cross-compiling, but
-	# might as well get a minor configure speed up normally.
-	export ac_cv_func_memcmp_working="yes"
-	export tcl_cv_str{str,toul,tod}_unbroken="ok"
-	export tcl_cv_strtod_buggy="no"
-
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-multilib_src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
-		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
-		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
-		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins *.h
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	if multilib_is_native_abi; then
-		dosym tclsh${v1} /usr/bin/tclsh
-		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-	fi
-}
-
-pkg_postinst() {
-	for version in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 8.6 ${version}; then
-			echo
-			ewarn "You're upgrading from <${P}, you must recompile the other"
-			ewarn "packages on your system that link with tcl after the upgrade"
-			ewarn "completes. To perform this action, please run revdep-rebuild"
-			ewarn "in package app-portage/gentoolkit."
-			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-			ewarn "upgrade them before this recompilation, too,"
-			echo
-		fi
-	done
-}
diff --git a/dev-lang/tcl/tcl-8.6.8.ebuild b/dev-lang/tcl/tcl-8.6.8.ebuild
index 9cbda4fccbbd..31f0fcf3f657 100644
--- a/dev-lang/tcl/tcl-8.6.8.ebuild
+++ b/dev-lang/tcl/tcl-8.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index cb7ff9124def..cb1e5f9cf468 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -5,15 +5,10 @@ AUX tk-8.5.14-conf.patch 569 BLAKE2B 243b538978966531dcf59f76ffb3d1b82bb10c2d80f
 AUX tk-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457
 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
 DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f
-DIST tk8.6.5-src.tar.gz 4417393 BLAKE2B bff37ac292928095063ebd3131ab8bf9e9d0b075c115c9e9a1f0fe75c2843cae6153b15fc9b964cd16a1251feca13258034d14dadd5fa8967bff6d5fee813f8f SHA512 9acf2ef993a566a7cdd1efe21dc896b09125c65d86df53ab5a78542b21d3f031e9f9d72b81738705636c268b5ce72934c483eb087d5c0114f913c9075db9a3b1
-DIST tk8.6.6-src.tar.gz 4273737 BLAKE2B 65b139fffe628439137a02a72af19be0f7c44956d18852f1ce8892349d0fa370281e475fbbe7451da524ab4e74a8c258ee5ee70b8a146bf1ec71e3bf420314a3 SHA512 223c72ab5a6f6040928c56843598b878efafab44ed4152a38e68aa2800f2c181adc50a8bf23279b7d446493eec43854920e8b649b6a34ecdf31ecc07ccc74044
-DIST tk8.6.7-src.tar.gz 4282972 BLAKE2B b07102365539ee98e2972a5d3bee2bdee89cb4d3873b05c764810b89f0152b71bd0d14d007434a003cd784868afadf6a2a50deffc0c4596b4551a0be7625fd13 SHA512 adf35991b20878d18a6940cb3d24d821586828537edf6d20f9223f2989d317adbcbb5360f3226014d96fe44e7ec06cfdf434309438c90a09878345b7106c7dd9
 DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9
+EBUILD tk-8.5.17-r1.ebuild 3566 BLAKE2B a3eae0668b78a075d72b9c8a6751d341d5e021a1cba8d0501fdfb22a25b00095ba289dc46a4bf567e55639172a94dd0401af46651cea11879cdfa367c1e196f3 SHA512 3d09b21189e2cc5016da816ea1fbe99d393704b32aa31a307cdb52bca0d3c91b413031a4ea90b4e52ba12e49cdc22e38d150317b0190243de788a862c83a65b9
 EBUILD tk-8.5.17-r100.ebuild 2162 BLAKE2B e4e280058b3059213d10a20fcabcd54a17e74bf78bd6e18ac5acf3a51a3fd870743ea40dc793b6a0ce5ebbfefe9744f26c900542ed511f4ba2d37c404069bc63 SHA512 e0958680ae7beeb6f5ffe06093f27d482c22cba9dfc71fe727425d8fbe4b20e6270b2ddd6e8860b0f7433f84224f8b8251800570ea81f75209146876fd94bda7
+EBUILD tk-8.5.17-r101.ebuild 2222 BLAKE2B d632b0304e36ffc9d758efd99fa128c83ab655661d25361c747aff17b9dd16ddadd4386ae9586fa131d6e0288228603232eae7ab24088095e48d60ed8c9772e1 SHA512 82594980647370fbae9201e661024216776b8d1e3fa3d198e5181d99e810f681fb5e4cabc00be41dbcd477c99a80c3a1d8822ef285cf294bded8c41f64d63607
 EBUILD tk-8.5.17.ebuild 3506 BLAKE2B 073a60dae07cd8dbcb19f626a686cce74d4e8e0f1216b4a8911eae7245ea2ad4d3b0c4d4a947d56ac8fca418e4927421fa264ac50ecbbad5998e05aeb468df19 SHA512 ae25cad437b2ffb91053c82a0222ca0b01329a353d273b2fa326399fe78fcf129957e746c0cfe1488bf2017ee0455161a71897d5d7b793f1d816b8b2df4d0cc9
-EBUILD tk-8.6.5-r1.ebuild 4087 BLAKE2B d69eb5f9a39185136c9b2f171759ce1dbd14a96de033e7baa091280a2d767bb2dcb1d9b9bb3331f898de88fe02bbfecf8d2a2a8b09a2d6b7dbaff700804de51f SHA512 9010eb09e6120e639efad1bd00ef8521ebdfd0fa239465100c4097edcf103c184400ba915412a00157f965ae3e272f833c3efa1d7ec15f069e71f0ebaf18e7a1
-EBUILD tk-8.6.5.ebuild 3988 BLAKE2B e00838e897117cf68940e01d351e1034799a629c85d9ae06a3783d6ff3f3b0524d2463912c0855995d21e96ef3d8721511ecf8bf0e95f98fd9f5bea7d13dc457 SHA512 60fcf475165d06ccb14c75be62c3e3c345e17d82982d6ee54dceb34ba35cbaa924105ec3a2d5751df8e7e336a80b2374b50ef949007e015284e588057215f8e1
-EBUILD tk-8.6.6.ebuild 4085 BLAKE2B 6a7c20d97958042b33d33a773d66d4922e2d03f91da9673f51d1d58e289c9ac810984dc61d83ed885ea5f326f5772bb96d26a8b8cc6191d7f0bdb3060ac32ab9 SHA512 18dc21f5802713c1af13754f7b1708566f72333831066631300cbcdc63c69193be95fa95e903091fedca52abfb94086d9928a0ac7ebbd85e0c98f3a2dd7c4177
-EBUILD tk-8.6.7.ebuild 4094 BLAKE2B 6fe902d52648043a635bba952e896410a0077e74cd5352cbce0133aff3cec207e38cae28e948b6fc8a24871e6be9d5e5fcf0357b7436ce0d990c05663336ac65 SHA512 1d04133b247018dbaaf193705a3a7f5e2797d9f3086364c249c46020a49bdb55f8f2fb2b4d42036e3d1dafb9be5a867b0c5063c03f008a07c3fe2f4d851141f7
-EBUILD tk-8.6.8.ebuild 4124 BLAKE2B 6c33e1d1a4aa9ba5db75596a5e3b20d5b1fe22236acb27f6d614849ff827ecb2cbf9d22aca8f611a7af229d2c2f5899605b8e820c272928efdec5dd31c750908 SHA512 b024951352f421c4e631e209a66cfa7d607704da4190faddef9cffb46c9d96b4580ce73da26994c15bd70eac2d7bf68dba284d6b4d5fc561853cf54c76692e16
+EBUILD tk-8.6.8.ebuild 4116 BLAKE2B dca2259fdb3ae44dcf8f3eb91562b22f9cd8065bc15bad201dee93d868670c13a3026c50e21efa04a8fcb9dfb71b04d824f210914aef85447ac38ce4ed30194b SHA512 ae2c69570844eeee386378ed6b5f66fc8c4dfb2c52a517b8ddf8b65880e600ce7e8cf1fef0e9c04f7e7a549e279f5023d981b5ba2ac82981573aa0265776bb58
 MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-lang/tk/tk-8.5.17-r1.ebuild b/dev-lang/tk/tk-8.5.17-r1.ebuild
new file mode 100644
index 000000000000..10bfdfee32ac
--- /dev/null
+++ b/dev-lang/tk/tk-8.5.17-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.5"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug threads truetype aqua xscreensaver"
+
+RDEPEND="
+	!aqua? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		x11-libs/libX11
+		x11-libs/libXt
+		truetype? ( x11-libs/libXft )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+	)
+	~dev-lang/tcl-${PV}:0="
+DEPEND="${RDEPEND}
+	!aqua? ( x11-base/xorg-proto )"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
+		"${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
+	eprefixify Makefile.in
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+
+	# Bug 648570
+	epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch
+
+	# Make sure we use the right pkg-config, and link against fontconfig
+	# (since the code base uses Fc* functions).
+	sed \
+		-e 's/FT_New_Face/XftFontOpen/g' \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e 's:xft freetype2:xft freetype2 fontconfig:' \
+		-i configure.in || die
+	rm -f configure || die
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	tc-export CC
+
+	eautoconf
+}
+
+src_configure() {
+	local mylibdir=$(get_libdir)
+
+	econf \
+		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
+		$(use_enable threads) \
+		$(use_enable aqua) \
+		$(use_enable truetype xft) \
+		$(use_enable xscreensaver xss) \
+		$(use_enable debug symbols)
+}
+
+src_test() {
+	Xemake test
+}
+
+src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# normalize $S path, bug #280766 (pkgcore)
+	local nS="$(cd "${S}"; pwd)"
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
+		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tk${v1}/include/unix
+	doins "${S}"/*.h
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+	dosym wish${v1} /usr/bin/wish
+
+	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+}
diff --git a/dev-lang/tk/tk-8.5.17-r101.ebuild b/dev-lang/tk/tk-8.5.17-r101.ebuild
new file mode 100644
index 000000000000..fdf73fe90c60
--- /dev/null
+++ b/dev-lang/tk/tk-8.5.17-r101.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib prefix toolchain-funcs versionator virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="
+	mirror://sourceforge/tcl/${MY_P}-src.tar.gz
+	mirror://sourceforge/tcl/${MY_P//tk/tcl}-src.tar.gz
+	"
+
+LICENSE="tcltk"
+SLOT="8.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug threads truetype aqua xscreensaver"
+
+RDEPEND="
+	!aqua? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		x11-libs/libX11
+		x11-libs/libXt
+		truetype? ( x11-libs/libXft )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+	)
+	~dev-lang/tcl-${PV}:8.5=
+	!=dev-lang/tk-8.5:0"
+DEPEND="${RDEPEND}
+	!aqua? ( x11-base/xorg-proto )"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+DOCS=()
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
+		"${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
+	eprefixify Makefile.in
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+
+	# Bug 648570
+	epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch
+
+	# Make sure we use the right pkg-config, and link against fontconfig
+	# (since the code base uses Fc* functions).
+	sed \
+		-e 's/FT_New_Face/XftFontOpen/g' \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e 's:xft freetype2:xft freetype2 fontconfig:' \
+		-i configure.in || die
+	rm -f configure || die
+
+	append-cppflags \
+		-I"${WORKDIR}/${MY_P//tk/tcl}/generic" \
+		-I"${WORKDIR}/${MY_P//tk/tcl}/unix"
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	tc-export CC
+
+	eautoconf
+}
+
+src_configure() {
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	econf \
+		--with-tcl="${EPREFIX}/usr/${mylibdir}/tcl${v1}" \
+		$(use_enable threads) \
+		$(use_enable aqua) \
+		$(use_enable truetype xft) \
+		$(use_enable xscreensaver xss) \
+		$(use_enable debug symbols)
+}
+
+src_test() {
+	Xemake test
+}
+
+src_install() {
+	dolib.so libtk8.5.so
+}
diff --git a/dev-lang/tk/tk-8.6.5-r1.ebuild b/dev-lang/tk/tk-8.6.5-r1.ebuild
deleted file mode 100644
index aa3bd7ed7297..000000000000
--- a/dev-lang/tk/tk-8.6.5-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug +threads truetype aqua xscreensaver"
-
-RDEPEND="
-	!aqua? (
-		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-		truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)
-	~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	!aqua? ( x11-base/xorg-proto )"
-
-# Not bumped to 8.6
-#RESTRICT=test
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
-	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	"${FILESDIR}"/${PN}-8.4.15-aqua.patch
-
-	# Bug 125971
-	"${FILESDIR}"/${PN}-8.5.14-conf.patch
-)
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		-delete || die
-
-	pushd "${SPARENT}" &>/dev/null || die
-	default
-	popd &>/dev/null || die
-	eprefixify Makefile.in
-
-	# Make sure we use the right pkg-config, and link against fontconfig
-	# (since the code base uses Fc* functions).
-	sed \
-		-e 's/FT_New_Face/XftFontOpen/g' \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e 's:xft freetype2:xft freetype2 fontconfig:' \
-		-i configure.in || die
-	rm configure || die
-
-	tc-export CC
-
-	sed \
-		-e '/chmod/s:555:755:g' \
-		-i Makefile.in || die
-
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	mv configure.{in,ac} || die
-
-	eautoconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	if tc-is-cross-compiler ; then
-		export ac_cv_func_strtod=yes
-		export tcl_cv_strtod_buggy=1
-	fi
-
-	local mylibdir=$(get_libdir)
-
-	econf \
-		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
-		$(use_enable threads) \
-		$(use_enable aqua) \
-		$(use_enable truetype xft) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable debug symbols)
-}
-
-multilib_src_test() {
-	virtx emake test
-}
-
-multilib_src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
-		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
-		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
-		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	if multilib_is_native_abi; then
-		dosym wish${v1} /usr/bin/wish
-		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-	fi
-}
diff --git a/dev-lang/tk/tk-8.6.5.ebuild b/dev-lang/tk/tk-8.6.5.ebuild
deleted file mode 100644
index 4d9bc73a8568..000000000000
--- a/dev-lang/tk/tk-8.6.5.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug +threads truetype aqua xscreensaver"
-
-RDEPEND="
-	!aqua? (
-		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-		truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)
-	~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	!aqua? ( x11-base/xorg-proto )"
-
-# Not bumped to 8.6
-#RESTRICT=test
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
-	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	"${FILESDIR}"/${PN}-8.4.15-aqua.patch
-
-	# Bug 125971
-	"${FILESDIR}"/${PN}-8.5.14-conf.patch
-)
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		-delete || die
-
-	pushd "${SPARENT}" &>/dev/null || die
-	default
-	popd &>/dev/null || die
-	eprefixify Makefile.in
-
-	# Make sure we use the right pkg-config, and link against fontconfig
-	# (since the code base uses Fc* functions).
-	sed \
-		-e 's/FT_New_Face/XftFontOpen/g' \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e 's:xft freetype2:xft freetype2 fontconfig:' \
-		-i configure.in || die
-	rm configure || die
-
-	tc-export CC
-
-	sed \
-		-e '/chmod/s:555:755:g' \
-		-i Makefile.in || die
-
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	mv configure.{in,ac} || die
-
-	eautoconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mylibdir=$(get_libdir)
-
-	econf \
-		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
-		$(use_enable threads) \
-		$(use_enable aqua) \
-		$(use_enable truetype xft) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable debug symbols)
-}
-
-multilib_src_test() {
-	virtx emake test
-}
-
-multilib_src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
-		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
-		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
-		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	if multilib_is_native_abi; then
-		dosym wish${v1} /usr/bin/wish
-		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-	fi
-}
diff --git a/dev-lang/tk/tk-8.6.6.ebuild b/dev-lang/tk/tk-8.6.6.ebuild
deleted file mode 100644
index e2326cd6d805..000000000000
--- a/dev-lang/tk/tk-8.6.6.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug +threads truetype aqua xscreensaver"
-
-RDEPEND="
-	!aqua? (
-		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-		truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)
-	~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	!aqua? ( x11-base/xorg-proto )"
-
-# Not bumped to 8.6
-#RESTRICT=test
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
-	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	"${FILESDIR}"/${PN}-8.4.15-aqua.patch
-
-	# Bug 125971
-	"${FILESDIR}"/${PN}-8.5.14-conf.patch
-)
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		-delete || die
-
-	pushd "${SPARENT}" &>/dev/null || die
-	default
-	popd &>/dev/null || die
-	eprefixify Makefile.in
-
-	# Make sure we use the right pkg-config, and link against fontconfig
-	# (since the code base uses Fc* functions).
-	sed \
-		-e 's/FT_New_Face/XftFontOpen/g' \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e 's:xft freetype2:xft freetype2 fontconfig:' \
-		-i configure.in || die
-	rm configure || die
-
-	tc-export CC
-
-	sed \
-		-e '/chmod/s:555:755:g' \
-		-i Makefile.in || die
-
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	mv configure.{in,ac} || die
-
-	eautoconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	if tc-is-cross-compiler ; then
-		export ac_cv_func_strtod=yes
-		export tcl_cv_strtod_buggy=1
-	fi
-
-	local mylibdir=$(get_libdir)
-
-	econf \
-		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
-		$(use_enable threads) \
-		$(use_enable aqua) \
-		$(use_enable truetype xft) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable debug symbols)
-}
-
-multilib_src_test() {
-	virtx emake test
-}
-
-multilib_src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
-		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
-		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
-		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	if multilib_is_native_abi; then
-		dosym wish${v1} /usr/bin/wish
-		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-	fi
-}
diff --git a/dev-lang/tk/tk-8.6.7.ebuild b/dev-lang/tk/tk-8.6.7.ebuild
deleted file mode 100644
index 2fa86b88177c..000000000000
--- a/dev-lang/tk/tk-8.6.7.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug +threads truetype aqua xscreensaver"
-
-RDEPEND="
-	!aqua? (
-		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-		truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)
-	~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	!aqua? ( x11-base/xorg-proto )"
-
-# Not bumped to 8.6
-#RESTRICT=test
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
-	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	"${FILESDIR}"/${PN}-8.4.15-aqua.patch
-
-	# Bug 125971
-	"${FILESDIR}"/${PN}-8.5.14-conf.patch
-)
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		-delete || die
-
-	pushd "${SPARENT}" &>/dev/null || die
-	default
-	popd &>/dev/null || die
-	eprefixify Makefile.in
-
-	# Make sure we use the right pkg-config, and link against fontconfig
-	# (since the code base uses Fc* functions).
-	sed \
-		-e 's/FT_New_Face/XftFontOpen/g' \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e 's:xft freetype2:xft freetype2 fontconfig:' \
-		-i configure.in || die
-	rm configure || die
-
-	tc-export CC
-
-	sed \
-		-e '/chmod/s:555:755:g' \
-		-i Makefile.in || die
-
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	mv configure.{in,ac} || die
-
-	eautoconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	if tc-is-cross-compiler ; then
-		export ac_cv_func_strtod=yes
-		export tcl_cv_strtod_buggy=1
-	fi
-
-	local mylibdir=$(get_libdir)
-
-	econf \
-		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
-		$(use_enable threads) \
-		$(use_enable aqua) \
-		$(use_enable truetype xft) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable debug symbols)
-}
-
-multilib_src_test() {
-	virtx emake test
-}
-
-multilib_src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
-		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
-		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
-		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	if multilib_is_native_abi; then
-		dosym wish${v1} /usr/bin/wish
-		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-	fi
-}
diff --git a/dev-lang/tk/tk-8.6.8.ebuild b/dev-lang/tk/tk-8.6.8.ebuild
index 6d76b86c92e6..1061b8db122d 100644
--- a/dev-lang/tk/tk-8.6.8.ebuild
+++ b/dev-lang/tk/tk-8.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads truetype aqua xscreensaver"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 37cc09566fcc..0b18a337173a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index a886143423ec..2651b8747aff 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,5 @@
 DIST appstream-glib-0.6.13.tar.xz 1974864 BLAKE2B e9e0967b7657250659b3597bc2f6b049a20750e6dc66ee3672f3794b8c50f5060e48c7d4cd76d16e9e7d7cbc7d3364b7600e1c20fe24b33538c66d2a80cf0888 SHA512 d7e95a31d3f6fba974af2fab423282c7b0291d1325a634d8040fe2c2c2fcde49981be18900415251b3d71f20bb9e945e16d7c00fa830b27deac2e5547ec4c8b0
 DIST appstream-glib-0.7.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
-EBUILD appstream-glib-0.6.13.ebuild 1606 BLAKE2B af414cb338d410c75c55d94bcdfd1cc43d1c91de1fa503841ef1e5593b1b9269462a64faca6eeac0aaa93e77ec652af0de7f999482ee8420bed3b592fbb0475f SHA512 bc547565c79d072fefac5be7855f4cd00495495bf581c0e9ba57dd830746d137a1ad28eb5d9ed8e60cbcfb8b00d70158436835b5bbe2d7bcba253943ac8449ee
-EBUILD appstream-glib-0.7.9.ebuild 1517 BLAKE2B a3dea107a54200b19c154210e1957fd487453f6c31bad7960177b9d844697489f9b2563f1380b092a3fd3058731727ac16c56a91986ce4fa269fc5154d497089 SHA512 8ff93c762d932ac4df398e336ca1a6e74b3483674b1e47c442726a25747cc2a45460ed8d46c2020c01b256b60038e10e8e56c61fe18f7c3e3c4d81e74a5aade2
+EBUILD appstream-glib-0.6.13.ebuild 1608 BLAKE2B a9962fcdcc67adb507d3ebf22d4ea9cb168d1cb6d8f8bf818b4d9794b7d952d0c7965e58e26935908284caf16f5db5ce62d2fe8ba0b1e61b925238e34ee38ee9 SHA512 e5a83f1b4cec3ebf9447620f1c41faecf3f9b0c7996122dff5769eddb0a0d8c37ebf13f0f829c8f8ba8352c1d702e3832a10635c4add19ff8ad67510fda1c190
+EBUILD appstream-glib-0.7.9.ebuild 1520 BLAKE2B 28f3aa1996a2062e0ad0e0698699db63b24d5df7ea49e881409945b31936a89f331520e5705ee737f626a913efb8827e311b89c0e2cfcd09ae0ac8b2e25ef431 SHA512 fa46dcfa681baaa24cb6e627024aa3fdb6e20abe14e256623ffa337d2bf0853d9f9ec4a1a2ab281947fda683b65f80b24b75d0bb15db719c1eafcd0921b74da5
 MISC metadata.xml 352 BLAKE2B 2d04b5c85e8a4e5a62ddf862b7dc1d757896d4f7a5aa052b9139cb050d16aedf9b571b543484b91d3795a979703b4bebb6c42695f8238939a4179a613110053f SHA512 491790151594360b57d05b217381b3b6c6f3d3a72e8066d923230060a4b05d0e2ff1e31cdcb94eb8b1ac077a011d695f33b857bf049c04292a9e324c065895d9
diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
index ca763db967b6..a7707c71c57e 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="+introspection nls stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
index 1436a94fb8e2..e771c9b5bfd1 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/atf/Manifest b/dev-libs/atf/Manifest
index c0a13feafe78..bc0c1423a70a 100644
--- a/dev-libs/atf/Manifest
+++ b/dev-libs/atf/Manifest
@@ -1,4 +1,4 @@
 AUX atf-0.21-getopt-solaris.patch 191 BLAKE2B 100e710c5cd10d5b0cd35fc2b6fcbba440496c3bdf99b7b88162b214e1fbf030cf54a0289b801b9946f89df0fe26ecc452f498ecd9e546462ccfd989aa313f64 SHA512 c98c062793abb014731e249d833e94fb4c0e7f5ced37f7310caa6e3a26a3b391c4fe90133656c21f6bb467af5d8039f887a3a42630b6e9725ecb84b99309a94b
 DIST atf-0.21.tar.gz 567791 BLAKE2B e9449bb61008a91c10050462e84ff65c6fd88124db56ff3f6c149ff47fe8647fe8fe786cd7b1106cbfd62723a57ab613432323f266a93a4c86d8a6ab39bfcc0a SHA512 9b4b67d7d0d1f65cc9571d38c67dfc620b08ff7c0abf57d87bcae54055b4af21f95f3363f2cf8ee9b13b89a5351bc58669b784a0fd8c1beb0664c14933c10ce1
-EBUILD atf-0.21-r2.ebuild 671 BLAKE2B 92ff69da001d811e5e6cab4ea9ca4ee1f46beef82b7596c93c83a6361f3a9cee2f4cd27ecb408aee38639910d1870fe6017b0b9567bf3421759c5e5304571545 SHA512 d9bcd1c6767dd10e2661053da3cd03fdcddf22fedf03fe6cf1af76db567a2b3e666046ea77c252bfcc6d2b82eec04497f2062f3d01af9618b62a0b2df5667a23
+EBUILD atf-0.21-r2.ebuild 673 BLAKE2B 0835488e4336fc7848ed96281c33f9c00723a58144d3407c80e3052d1766e7b548f32a705e47433381d99f6174171bcb16868fc70ab1ab63b0e8b60f95f07544 SHA512 4a1ceceb6a0cebbce20ac71eeb8c53dc213b66e615732767be047ed1301e96a9ba447f3bd6d181a6bb919e90adc30a1406fd0d4709cd84955475e45caa721c8b
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild
index 71c1edb34d1a..5f4d52fca20f 100644
--- a/dev-libs/atf/atf-0.21-r2.ebuild
+++ b/dev-libs/atf/atf-0.21-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/pkgconfig"
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index afa0d0a5db0a..ab07b97a9a15 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -5,5 +5,5 @@ AUX beecrypt-4.2.1-gcc-4.7.patch 262 BLAKE2B a99fa0e61728bd38510622a1770c3ecad15
 AUX beecrypt-4.2.1-icu-61.patch 1348 BLAKE2B 7412a407e6da0349913733590c1fe650af65863eaf5112f89be8f834dd60629bfe8ff05852016ba710f4ccd16c2db5341a7120cd570669ea21d9560cf361873b SHA512 f84a078f8263eb8613a3114875926d4a12c0e2e5bb6dde823849686ae2e7ae1e27fc0b7d8dc9467322b815a09b63f91658b65250cd64809d14a8f85661205349
 DIST beecrypt-4.2.1.tar.gz 882758 BLAKE2B 7ca25613cf95df8657c762d932618979783ea2ddfbaecdf066701d61a5f9ac76bd474a51eb65e140c83ef01880477cb7104e3d67c2fc078ae7b710637d18bb53 SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc
 EBUILD beecrypt-4.2.1-r4.ebuild 2227 BLAKE2B f66a1cb5bea84db49c4bfb3928526e6d7927ac57ce04a0a525e8d75c8b49989d03e96e7e8be7c272af07adf8595635c142d4210fc1ec9f7e4f93e643b6c8d872 SHA512 bc49a21bada431dbfcd5be9233602d7c0feda3585c8a10887dfffcca99f781a5b6a1749b583b479360022ce20838282c47932643ba1816d0308c3de5698ca78f
-EBUILD beecrypt-4.2.1-r5.ebuild 2265 BLAKE2B c4d39a019a88c31a9022cbc5fbe390943025d0edcc532192cc75732df868bfbbe7ed7228b2f378ba6cc4cea385aa8817bd41c7ef7c51c4feb011f643e6883f17 SHA512 205c634304704bf0317a82493a26aa132049cb4f73f23d4fb0498d0c9657cf491235948122cbd6a93bd9bff68ce5e90a409af6bf182e0b29656bbd413443f499
+EBUILD beecrypt-4.2.1-r5.ebuild 2259 BLAKE2B 0e7149000256b0d7a64ed5192c6dcc7bfbd9ea675d7547c68bdf013faf12ce02dadbc6125da1516aa94b43da20a9885e85ffc4d7bf59d65995ab7e679f83a8bb SHA512 79065b8d809de043f36e326657536df01bf39d239f8d9551706511324ecc337f59544ba98b1acb25fd7a9a4eeb632754f41e72c5049c1e23b3da8a63da8c30fc
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
index 564e81f57995..adb3ef1d9d94 100644
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+threads java cxx python static-libs doc"
 REQUIRED_USE="cxx? ( threads )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/bitset/Manifest b/dev-libs/bitset/Manifest
index 13797a9e177a..581b5b19b306 100644
--- a/dev-libs/bitset/Manifest
+++ b/dev-libs/bitset/Manifest
@@ -1,3 +1,3 @@
 DIST bitset-2.8.4.tar.gz 37040 BLAKE2B 3a3db906c86fef73c20a038f01f7053efe2f7d2802b8a627657dbfe807c2d043834f7afab6a3fda66f3b4a87c27255c000f0cebffa7620e88e5f3790a3544914 SHA512 709c4f064416b22ae37fc9659a9eb74007fff5ce12eb998c386a268427a012238258bbd0f019682a5172a98b7b2a476fd60017bf34e199159e838b254b48ffe7
 EBUILD bitset-2.8.4-r1.ebuild 943 BLAKE2B ef2417a00b17526532c0042ac3248518508391ea2d392b382ecbf385dc1dd10dd45e910bc1bf0fa034c1f30c0119a2de90ef0e1d9d10451bd9d78d2d005e7ef4 SHA512 7179d196b836ff6e601f62d85e5ccfaf008d0eff5ae4f817301bac92b73f2dc38310389e0c8f501089f93b922279d85bf1e3edb91b08ef2cb0199813f2c18119
-MISC metadata.xml 522 BLAKE2B 7034e76df939a176a138b0016b1ee37b632f5822c2ca8f1b38f15242e06fe9ea836e9295ab907493a30e32a7ac76504a7bba9ddf1f3f643b264f8b02706c3712 SHA512 5c0fb4abffcc6da6ed48fec3e52e19b6526a526909463da6f9e4b8c0094f5701548d782c65a5b4c9787eb1143429ec4d0cdf71a7677e99331a9891a4acd3b537
+MISC metadata.xml 442 BLAKE2B 62782589bd4f5873f440b71efa6d0938e90f7b672babd073f316367aca8bf414cb6d57531700878267bad53e44d0c40b5d170f530827612cf7d6765b95acfb40 SHA512 4430820b6c01fbbc8f99e261c7abd221821ece94c954f0b9f78b99e7e06d9e82782baf873dc372ad00f0938d4050d899c1494e848c265662387666dcde63c70e
diff --git a/dev-libs/bitset/metadata.xml b/dev-libs/bitset/metadata.xml
index d1af046aa04c..2ef258274aa2 100644
--- a/dev-libs/bitset/metadata.xml
+++ b/dev-libs/bitset/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Sergey Popov</name>
 	</maintainer>
 	<use>
-		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
 		<flag name="tcmalloc">Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations</flag>
 	</use>
 	<upstream>
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 93b4c954c86c..454926f70bc0 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,6 +2,8 @@ AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432e
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
 DIST Botan-2.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858
+DIST Botan-2.8.0.tgz 7152674 BLAKE2B 7838423fc7cc3521b3feb95ab3958f8cd4df86534f1ef30d717b47e54a9a7ae0d2ed6618370b9adfd0a178b509750e5aacda8457caa89f408292837fe3426de0 SHA512 12f734eea3e60a956f75a5b58e9bd83fac7b0dbcd71fb9577b025d171702d87a9a11e2e73162320bdefb2d25f3900757d89dd7fe13089321c88d948efc2ba214
 EBUILD botan-1.10.17-r2.ebuild 4274 BLAKE2B cc2cc4d510a95803463c477848e09cfec79a11e5246d9c9d5678502f1f279989b0ebb92840e62c445bc13a0fe1276a41b63a3c1a14ad4b8bde058f51ac91e586 SHA512 5e256c4785e2560bcb151d687136688b3a2daa11e8f87a46965aa9e687b781c7fb00cabce5ee90b6fba6aca800ff636ee9921093d1de8d22a1780d809f0613de
 EBUILD botan-2.7.0.ebuild 2480 BLAKE2B 3207ded4663f1cf2cd55153f4369fef6a4a93967703a1afbe8f91b2dc0cca944a89eeaef3dd64b3ee8253deb034b8c69e4adcc0c018f80b3dafbe145d0955ce1 SHA512 e5cd37b8ff517686c295b094e66305d5b3d5741d95ee42e62c03dc6e0d5b452257033bd7c740c59bc65e47b179c2e4b2ade7cd11ebbf629f12a0c2c842590ff7
+EBUILD botan-2.8.0.ebuild 2494 BLAKE2B 2ff89959474d178a826802df9c6885d6eae6ce379011a3a3609f106d8af2761d6206d628b8cc4d522f97af4e3dcfe25a8962cacbbfc5d1fdee43b47b67f08c0c SHA512 1a67d9d1f391c2f0af33105b2a63be06e5e477b74e1cb2c81769587069c2b542daa635d6768ce76d9b4b977415a03d26505dbeadd698b4b1bbec7e18f33d8b08
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.8.0.ebuild b/dev-libs/botan/botan-2.8.0.ebuild
new file mode 100644
index 000000000000..f64ebf1a8fe6
--- /dev/null
+++ b/dev-libs/botan/botan-2.8.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 multilib python-r1 toolchain-funcs
+
+MY_PN="Botan"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+SLOT="2/$(ver_cut 1-2)" # soname version
+LICENSE="BSD"
+IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+	boost? ( >=dev-libs/boost-1.48:= )
+	lzma? ( app-arch/xz-utils:= )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+BDEPEND="dev-lang/python:*
+	doc? ( dev-python/sphinx )"
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling modules: ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)	myos=darwin ;;
+		*)			myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*)		CHOSTARCH=parisc ;;
+	esac
+
+	local pythonvers=()
+	if use python; then
+		append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+		python_foreach_impl append
+	fi
+
+	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
+		$(use_enable static-libs static-library) \
+		$(use_with boost) \
+		$(use_with bzip2) \
+		$(use_with doc documentation) \
+		$(use_with doc sphinx) \
+		$(use_with lzma) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		$(usex hppa --without-stack-protector '') \
+		--cc=gcc \
+		--cpu=${CHOSTARCH} \
+		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+		--docdir=share/doc \
+		--libdir=$(get_libdir) \
+		--os=${myos} \
+		--prefix="${EPREFIX}/usr" \
+		--with-endian="$(tc-endian)" \
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		--without-doxygen \
+		|| die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+	use python && python_foreach_impl python_optimize
+}
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index faee7e4790f6..0c2112d7afdf 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -3,5 +3,5 @@ DIST dbus-glib-0.108.tar.gz 812488 BLAKE2B e958c4054c09ec98d7bff659917a9c162dc43
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
 EBUILD dbus-glib-0.102.ebuild 2004 BLAKE2B 96ae72736aa5720e4a977014e4ddf8ea50296d1a769201864f19f36b1a910c8489a894b983a6106970a2407efea6d1c56510f78f2b5a27d6dff62972ac4e9de7 SHA512 abfa6ade67b9dfbbba290cf4bf5af1224763ec6ffb7b5bd5e1a420cef6117325dfa292f5916f905656348487346b041fff0fe98ea120229c5aecaf4ba1e92f54
 EBUILD dbus-glib-0.108.ebuild 1957 BLAKE2B 97f1a627cb0d1f45cb9668483e2ab90cd56c633759f0286a3ab87016fbcfc8126f890f5095275ab1ceae109783b2be1cf8d587e970f10798e48cf15edc4fc707 SHA512 3b419676f6a1b24181b61dcc20becb6f25df57ce61322f9f186e89f67a084efa8f86b69a282ae48f4ef451011238d7744e49df8f23f332d1a33297b934319325
-EBUILD dbus-glib-0.110.ebuild 1897 BLAKE2B 3572063aeb3e4481c231bbe838ff5ebfd9c52458896ec8dcb3a335ca8ab45f86d9f3b7cb08a5e5d445b07dca670c01f963e0a1cb2c8290d8cc02acaf4754c0a8 SHA512 6238cfd544298435a9c903906e2ed32362aa40b8663d426e20020c74aae6d5885aceeb8db514bb9cb803436aebcbe34034cea5d9ea4f7fb9669007ededb6e2dd
+EBUILD dbus-glib-0.110.ebuild 1894 BLAKE2B bb1612ef3b213d954453594e7f6a7c276f6ba2984e2497cc285405f43e6f23db5f5e30c66cde71584d7b0ec44ec09d99f5f7e1cf74771d83d30665204a07ad31 SHA512 5cc1121a6983b01c9bc245f08dbbb33e40d0d25e4d8a7b371c47b4bd5caa34ef303ce7a5db4edad693e74cff0dfddfe21b01e5b434c23c816d9b4cc2650928a9
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index cd25f239647f..2b44b1c57053 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 
 CDEPEND="
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 7f178bf71204..103201fade94 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,7 +1,5 @@
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
-DIST efl-1.21.0.tar.xz 71030532 BLAKE2B 3480e261aef05b169a850d27f3d9fa6da0ad9bc9ac04548137829e662546cd7d85c87596576e561bba33f9f1be657d81f261595e34c711ff9e35d551ae5f09a8 SHA512 497735f518976d70b96023b013a6d821f6695fe56def2abf5bd1e1c7ad89d324428017d7909c7b73bfb332b811b5596592b105bb4c3d2f6a40929f1cefc2b789
 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
-EBUILD efl-1.20.7-r1.ebuild 7783 BLAKE2B a10092c4415cfc8ed7660ec94053b945d207b4b13644c5c2dac89fd22ccaddc1fbbedc2ea3af1e6cd76ea633319bfb33e2d9a6be547f52d9aba843755b9ff4af SHA512 5ea232554e4567b165cd2e6782d4cf914acd659d9728e7041536217e5658a7aff1b2c98566a7766a173dedf3ce12d80afb929b105fcfa50e3579b3d7de950479
-EBUILD efl-1.21.0.ebuild 6729 BLAKE2B 3a59d6f24f00ae61aa43297a8f4108e5e16c8271faeca0d8a846a609591b6f52281df9352c10016a219f41273ebe7b03ef92b7aea0942c25fe59cf79451f997c SHA512 a243e2040a5aa957f13cfbb6742bd6f30bd675e321c352506ff8e83d35bd68fb5f1f0639825a23a56d4981327827117176f328ce02ad054beeaa1768ec3f4645
-EBUILD efl-1.21.1.ebuild 6606 BLAKE2B c053f82e19e81dfa8277c596f6e70db69c606e4e4459cca97fe1e67b36a0833fba82e024fbcb8abb3f6caf8e5657ad88683181add206381be9312c28e51c5f88 SHA512 8b83f2f4d78079d4c132476ef78fbf13d4942b984cd10c0af6d74874feebc3931918ffbd5629e87ddf3474263ef2bb601bb31a8b82ad517262d37cd07353a4b2
-MISC metadata.xml 2221 BLAKE2B e6dfe70c4d177dca3ca940c7e4b65493fc91b87b84fe4244783051f6483d65e4d38dba05e143815a5048b7c6414984256a523e4d9a30cccd21bfcd5318920384 SHA512 a7d3654e00527b45d747e68d5cc26007974c2e347554b44e811c4faa18558a3030960acc437fae6d31c18db29ba171eefa37800344b0f3ded431abd79e4edc23
+EBUILD efl-1.20.7-r1.ebuild 7790 BLAKE2B 8949614b2b22abd64583b987f5b2bbfa50f87575951833899c19245f191acc4fa08244307af6a23c9b8a2d4179f8cbf7a8cdc69698bb29897a9ea6ff80f85e17 SHA512 d4e847eac0d3f36aea057a7596d7277966343c80bd90338a4043cf0ad52d3ec7ac2aaa42fdcb4e94a750f81cd5cc712271c1631bf3e778354fb93d40a26eb773
+EBUILD efl-1.21.1.ebuild 6587 BLAKE2B 3d0eac3de903e7e01d5cf0299504bfe1db128080a9fe12995bd61fc85facd8e9a70310aff74d9fa50c6e09de01386dde00a1b8d92c760d2985118db0b492e61c SHA512 7eddc1df3186324e52cc3336c1207f5c4c46dfe7bfb69824e94ca313c510e2b9fb11de376d72ded9b2f9131cd95a77b93bcc33395cb23a4d111c7ef9ce719394
+MISC metadata.xml 2169 BLAKE2B 884096e54342ea876d8c6aaad16ac3f1928fbf2b791dcbf6ca5913fbc62800f63db5a1672a2b053f103e502fe581d6eaed7f978e02682f977688a3f038037b3f SHA512 2aa1f3dd9e121ec9f321329d4a209d671b8195cc1bdf41b70c4dfd3b0ba8a64c8b23231f11b3097023bfae013c49ded5eb1cfcafeeccd81ab81631757b8b2974
diff --git a/dev-libs/efl/efl-1.20.7-r1.ebuild b/dev-libs/efl/efl-1.20.7-r1.ebuild
index 8df2e68fbf5c..69bf06a886f0 100644
--- a/dev-libs/efl/efl-1.20.7-r1.ebuild
+++ b/dev-libs/efl/efl-1.20.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
 
 REQUIRED_USE="
diff --git a/dev-libs/efl/efl-1.21.0.ebuild b/dev-libs/efl/efl-1.21.0.ebuild
deleted file mode 100644
index 64ac0b67a25e..000000000000
--- a/dev-libs/efl/efl-1.21.0.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="avahi +bmp dds connman debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
-
-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 )
-"
-
-COMMON_DEPEND="
-	net-misc/curl
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	virtual/jpeg:0=
-	avahi? ( net-dns/avahi )
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	egl? ( media-libs/mesa[egl] )
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
-	glib? ( dev-libs/glib:2 )
-	gles? ( media-libs/mesa[gles2] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:0= )
-	libuv? ( dev-libs/libuv )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( dev-lang/lua:* )
-	nls? ( sys-devel/gettext )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		media-libs/freetype
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		gles? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-			xpresent? ( x11-libs/libXpresent )
-		)
-	)
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!media-libs/elementary
-	!media-plugins/emotion_generic_players
-	!media-plugins/evas_generic_loaders
-"
-
-src_prepare() {
-	default
-
-	# Upstream still doesnt offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-		configure || die "Sedding configure file with unwind fix failed."
-	fi
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-		--enable-image-loader-png
-		--enable-libeeze
-		--enable-libmount
-		--enable-xinput22
-
-		--disable-doc
-		--disable-gesture
-		--disable-gstreamer
-		--disable-image-loader-tgv
-		--disable-tizen
-		--disable-wayland-ivi-shell
-
-		$(use_enable avahi)
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable eet image-loader-eet)
-		$(use_enable egl)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable static-libs static)
-		$(use_enable svg librsvg)
-		$(use_enable system-lz4 liblz4)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-glib=$(usex glib)
-		--with-js=none
-		--with-net-control=$(usex connman connman none)
-		--with-profile=$(usex debug debug release)
-		--with-x11=$(usex X xlib none)
-
-		$(use_with X x)
-	)
-
-	use fbcon && use egl &&	myconf+=( --enable-eglfs )
-	use drm && use wayland && myconf+=( --enable-gl-drm )
-	use X && use xpresent && myconf+=( --enable-xpresent )
-
-	if use opengl ; then
-		myconf+=( --with-opengl=full )
-	elif use egl ; then
-		myconf+=( --with-opengl=es )
-	elif use drm && use wayland ; then
-		myconf+=( --with-opengl=es )
-	else
-		myconf+=( --with-opengl=none )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-
-	V=1 emake || die "Compiling EFL failed."
-}
-
-src_install() {
-	einstalldocs
-
-	V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.21.1.ebuild b/dev-libs/efl/efl-1.21.1.ebuild
index d020ef97f293..c627b1a33b84 100644
--- a/dev-libs/efl/efl-1.21.1.ebuild
+++ b/dev-libs/efl/efl-1.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ REQUIRED_USE="
 	vnc? ( X fbcon )
 	wayland? ( egl gles !opengl )
 	xim? ( X )
+	xpresent? ( X )
 "
 
 RDEPEND="
@@ -123,11 +124,11 @@ RDEPEND="
 			x11-libs/libX11
 			x11-libs/libXrender
 			virtual/opengl
-			xpresent? ( x11-libs/libXpresent )
 		)
 	)
 	xine? ( media-libs/xine-lib )
 	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
 "
 
 DEPEND="
@@ -215,6 +216,7 @@ src_configure() {
 		$(use_enable xim)
 		$(use_enable xine)
 		$(use_enable xpm image-loader-xpm)
+		$(use_enable xpresent)
 
 		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
 		--with-glib=$(usex glib)
@@ -227,7 +229,6 @@ src_configure() {
 	)
 
 	use drm && use wayland && myconf+=( --enable-gl-drm )
-	use X && use xpresent && myconf+=( --enable-xpresent )
 
 	if use opengl ; then
 		myconf+=( --with-opengl=full )
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index a50ab944fbb1..9a89497c2f4d 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -35,7 +35,6 @@
 		<flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
 		<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
 		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> support</flag>
-		<flag name="webp">Enable WebP image loader</flag>
 		<flag name="xcf">Enable XCF image loader</flag>
 		<flag name="xim">Enable X Input Method</flag>
 		<flag name="xpresent">Enable <pkg>x11-libs/libXpresent</pkg> support</flag>
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 8bc8fc962a64..2d0180d9d130 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,7 +1,5 @@
-DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce
-DIST ell-0.6.tar.xz 393016 BLAKE2B ad3a5402eca26a77caabb1d01054500333824c56403c1585c7aaf9ac19fd3f17e4d1dfc226f58ae1303d678e88d5b07c6b6e9c68a643f99b645ca4c4a10f7b19 SHA512 df39c460e781d5fa9838df362721687747148280cb7762dddce6aa35c38db1713b01efff5156d9dc144d6e11d50be7058db1362f4143f7a606bc6fbeeedaf8bf
+DIST ell-0.11.tar.xz 398012 BLAKE2B 61ca89e3cd59add835bac44f6de8078e76061dd3af1e135113d92f3b6431da426b4fb4b52e5e5bfd5577288fcea647e5a62c3f2086a19c225a051cd45058ac3f SHA512 9d70c441e2acaa91d61d82d84cd14b97e883b6d8a3fa457eec61d4fc29943dd72ff52a528d29ab4206fcf9994b0ad03008ddc0ec1934ce99d1262237b924742a
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.5.ebuild 711 BLAKE2B b2d4c540efc7456c20c10e42e79006ae43de0bd502ff4948a50d098c1eee1016f32b72d705d555a6b5dc6320467de1d962b3c382d785daec9025f1c288e8f8b2 SHA512 26fd2588d3630c874fb0a6ccc1bdd66d175022586b29b75362920ddf3e28928378d1e3c2156ffa6c70fbc57e0fc743ac8496ff8d0ef946fe51a417122f3c0fc0
-EBUILD ell-0.6-r1.ebuild 766 BLAKE2B aee6adbcf7019cbdf2a7d0221bec2b67e91e2ea86297888981b2f8851f9aae014506c3a3c7bfb8e9f0f728eb78a31648504f71e41e3daffe4e24167823fe26d2 SHA512 bdf1cdbf0ca2cb46cc2327bd0531afe03ba05fabfd3d6b3f85fe6e64c327e1f197239556ad99fea8099bdf1076f2f14a4e9125fbbac8cb912d8edcfc11a10896
-EBUILD ell-0.9.ebuild 764 BLAKE2B 89fbb06f993412a6b7fbed3807a1749be7d93dbce31728163381b2a9afbfe81009c9a075606d393c9bd3ca017fcd5bb5b3611297c44e2afa21d056302b94ef1f SHA512 2c6d9ac8e253326b15483d7351956a9186c566ee94d6d7fc0cf9cd7b7c7c2848df343f8d66ec82df96a0c225ad03b164023e926693a38e7134d9009317f1e6b6
+EBUILD ell-0.11.ebuild 768 BLAKE2B 7794aa0a34c2ba483f838a6b1556dd9a186d35f1f320822f9549c7ac34b7f93191b033bc2639298bfe46a5c4e85ac1173530e2518a0b16d4390d239c38734602 SHA512 69b84b4af59d25d1849f06842036e84d646097d2ec227bccd33825e72f2c5583eeaaac6e0b59fe104536532748ced0b554d0b57d19330ba54d25f47c84578f69
+EBUILD ell-0.9.ebuild 768 BLAKE2B 1d8bb3eb2ac59821d47058c5d6e3244db2b66240710b2c2bbd2b27715b9f48740f91ca58cab9749890b82231a461ed60875cb4ca8b8e6015fd917262e819b334 SHA512 c2313d3629b3ea728432e28b6a2a94d57237b062d659cc6ee2b7e6097da03ccff3afb2a34e556c9b259daf18ea8fed6a23862bdd576adc8b0eda9a985367313f
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.11.ebuild b/dev-libs/ell/ell-0.11.ebuild
new file mode 100644
index 000000000000..afb7985f2b41
--- /dev/null
+++ b/dev-libs/ell/ell-0.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/ell/ell-0.5.ebuild b/dev-libs/ell/ell-0.5.ebuild
deleted file mode 100644
index 2ca4c371acd8..000000000000
--- a/dev-libs/ell/ell-0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="glib pie"
-
-RDEPEND="
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable glib)
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.6-r1.ebuild b/dev-libs/ell/ell-0.6-r1.ebuild
deleted file mode 100644
index 78c8eb7ee33f..000000000000
--- a/dev-libs/ell/ell-0.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="glib pie"
-
-RDEPEND="
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable glib)
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.9.ebuild b/dev-libs/ell/ell-0.9.ebuild
index 16d539a5687e..af1ce781e17e 100644
--- a/dev-libs/ell/ell-0.9.ebuild
+++ b/dev-libs/ell/ell-0.9.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 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 IUSE="glib pie"
 
 RDEPEND="
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index c331a0bc541e..794b5027162c 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,7 +1,3 @@
 DIST flatbuffers-1.10.0.tar.gz 817750 BLAKE2B 1896b01afbdb8527836fa684980169890b1d5f1213d64cc88310f819c5fe7bc2a7e0a87e1abc2565ca165a0406dee9c814af382d2c8f08718ae5d9173530f98a SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2
-DIST flatbuffers-1.8.0.tar.gz 616362 BLAKE2B 545b568fbc1671005c351ba255f9dc2b5f97b618eae13bc74b717d1e08875e465a0afd3965b35ec8243c1dc80223fdab7f15abbfb4196a129700e4a1532a8965 SHA512 8f6c84caa6456418fc751ea9de456dd37378b3239d1a41d2205140e7b19a5b8b2e342a22dc8d7fdd0c36878455e9d7401cc6438d3b771f7875e8fcfe7bbd52f1
-DIST flatbuffers-1.9.0.tar.gz 681752 BLAKE2B 7886895f79ad5b8b62c4acb479d60a6fe16226a1a9daadf2c457189b7a3381676ba9dd3f8e2af5ebd5f2d78c6ac37d9d83de88ee08b566fd4e4507ecdb887938 SHA512 0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696
 EBUILD flatbuffers-1.10.0.ebuild 707 BLAKE2B f929f2b2ab5eb4fb4c5d428771ca3594882bfcc6f36cd8e3f852756e0bfa1a8ee9e4dde03b587f14466da9f0bec02fc0a1190078468d695dba8f919d83fb4bff SHA512 89ac8125c39a3e3636c5c31ef01a82b53a6c28f65241f441508485941e0d6d4a8827e40a53797aeed9292cd2303b69fe2e2f750f1f733aae57760e991d068321
-EBUILD flatbuffers-1.8.0-r1.ebuild 710 BLAKE2B 8d56bcf7a01f88839f94ae26e976e1e159700f21827addd0e8938e6a618da3c057c1f3d0714b38457d678bec40bc7ff1a7f6aa037c1378e81661499ec2808752 SHA512 b7ac615fb1a0db489fa47abe2649ab82f29ca4df6e649aabf9874aeeb859549b5f54c2437113dd972ed8b9e146d1d8c4fbd31de806265a2d3779ed49930e080b
-EBUILD flatbuffers-1.9.0.ebuild 710 BLAKE2B 8d56bcf7a01f88839f94ae26e976e1e159700f21827addd0e8938e6a618da3c057c1f3d0714b38457d678bec40bc7ff1a7f6aa037c1378e81661499ec2808752 SHA512 b7ac615fb1a0db489fa47abe2649ab82f29ca4df6e649aabf9874aeeb859549b5f54c2437113dd972ed8b9e146d1d8c4fbd31de806265a2d3779ed49930e080b
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild b/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild
deleted file mode 100644
index 4a387f3894c1..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.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 cmake-utils flag-o-matic
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="https://google.github.io/flatbuffers/"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-
-src_configure() {
-	append-cppflags -std=c++11
-
-	local mycmakeargs=(
-		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
-		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
-		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dobin "${CMAKE_BUILD_DIR}"/flatc
-}
diff --git a/dev-libs/flatbuffers/flatbuffers-1.9.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.9.0.ebuild
deleted file mode 100644
index 4a387f3894c1..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-1.9.0.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 cmake-utils flag-o-matic
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="https://google.github.io/flatbuffers/"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-
-src_configure() {
-	append-cppflags -std=c++11
-
-	local mycmakeargs=(
-		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
-		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
-		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dobin "${CMAKE_BUILD_DIR}"/flatc
-}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 08c239d018f2..8e5c264b2766 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,6 @@
-DIST girara-0.2.7.tar.gz 76723 BLAKE2B 7438709e15b9272260cfa9f5419b40672a2c33b2cdeed1d915b51b4d53b301a4347cb0c051155a9a20b09b61efb0ee13df7eb0fdc3a94d1a428a7cb1e296f0d2 SHA512 4229565b8a5fad1ecbf42e4f3f852644964a7d5c90154dab9b7dcb5ccd5f25731911452472bbeb28927d1e30d4df6ed066926e11c6a73f0fd5740570493a036f
 DIST girara-0.2.8.tar.gz 73646 BLAKE2B 08a3fea194922cfb84793d14905f15aac6e73daf3c4304842b88e7f517046daa287deaef770176bc06358b37c52418f1e42204df302c2c7d4f82c2f4a10a44a9 SHA512 d853f8337a63ae2ed319547a2daa2ccd3ce6f31b3dbb52522705c78dbbb94da1dc1efc4ac62d3c2af94531d4dea309323b878619ea0c9778c37960791ca0cb4e
-EBUILD girara-0.2.7.ebuild 1414 BLAKE2B 5da4f4a73ebcae523165ef9c7c8a91491b1d59fc1444f9c4dc52e551240d140f47ed0239e787aa3d2e57b6aabbc11f077baec982a469d6028e1a92e6a6298a55 SHA512 16beb54f7c54753de6743a767bab7c52f7961b651ff5a4df8336765086acb72e4645bc457410704364ecfe2e277edd1e0d546295d5be75e7afc8a54f4a5dfbf0
-EBUILD girara-0.2.8.ebuild 1414 BLAKE2B 5da4f4a73ebcae523165ef9c7c8a91491b1d59fc1444f9c4dc52e551240d140f47ed0239e787aa3d2e57b6aabbc11f077baec982a469d6028e1a92e6a6298a55 SHA512 16beb54f7c54753de6743a767bab7c52f7961b651ff5a4df8336765086acb72e4645bc457410704364ecfe2e277edd1e0d546295d5be75e7afc8a54f4a5dfbf0
-EBUILD girara-9999.ebuild 1374 BLAKE2B c62dc4c85ad520f17c5db15a541fc07336e5af6e25e536db8d269a95432846803816c90f25012d0db8daf6a41cb7dce4e949193deb6f5cfda48e312c77f1fe05 SHA512 033dc64f18e2a077463dc556475502cf322133f3942996b7398189c19c30ddf7efc55b76dc96d8ba9ba6e2240d4cf9af6c1bb745db4ffe3d139e32444c7610e4
+DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
+EBUILD girara-0.2.8.ebuild 1411 BLAKE2B 572289bb28e3150c8b4b67b2d7da7b47a413a408e968cdf04b3821e32f15f6e51266cb24a030f626d86355ee66cfae5ce696351c07056a6d1cfdb5a977ffadb8 SHA512 e55455523f3f92870d93ef1dd54796b61d14c4b8bf875da6b67c88611f20a55d623e6263852e9f88001c6725d7488f000eca2ae8332be60dd0a737807dee7125
+EBUILD girara-0.3.1.ebuild 1088 BLAKE2B d8a7b3d6df62bd55c8986aa7ad8211a9b724bce56564fea857119707ffbac4f0ddf4c22bf2f789d140ff743807db14a69d7b6e597513f3cb2ceebbddd1a9c685 SHA512 73978f226c851a22414e3d5a5be70a0315acf4acaa995e30ea03a393beef3cf8533937225e6262297ab39f7095129421c97904c8439b15b4510fe04f85388a3a
+EBUILD girara-9999.ebuild 1371 BLAKE2B d65ba5390bdced2ff54c92882f6735aa216716f7aa1933b193ed3c9929f19b494bce5298a6f963ad84ad129c44465e31368d22dfc84f39adc10ab39b4ac1b04f SHA512 078b7fdb2cd1dde3a8132bbb1085359e70ae89fc4dd59eb7d5e96decfa4869535007cdc39d5406b9d2b9bf5fcdcf7a159cdc033f09d3e6ae7ce7a54877d044c9
 MISC metadata.xml 700 BLAKE2B a40c7ce11c9e6ccee885e8da21856f4b74b9845b358f560e7cbd597a87cdc70942fbdc2a4a30c0ad156a964c4c07754ccd03be8be9a98021813dabc12c5483e1 SHA512 96d4e1a4d9d59be1e2613ae45def5357af5a20d2f9511f1f56418bf2eb3e41198a062ff3af741cfca9b644201703a2e7979cb533c4e00fc9b85336844b10e5c2
diff --git a/dev-libs/girara/girara-0.2.7.ebuild b/dev-libs/girara/girara-0.2.7.ebuild
deleted file mode 100644
index f8ff7c982364..000000000000
--- a/dev-libs/girara/girara-0.2.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs virtualx
-[[ ${PV} == 9999* ]] && inherit git-2
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="https://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
-
-LICENSE="ZLIB"
-SLOT="3"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="libnotify static-libs test"
-
-RDEPEND=">=dev-libs/glib-2.28
-	>=x11-libs/gtk+-3.4:3
-	dev-libs/json-c
-	!<${CATEGORY}/${PN}-0.1.6
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( x11-apps/xhost
-		dev-libs/check )"
-
-pkg_setup() {
-	mygiraraconf=(
-		WITH_LIBNOTIFY=$(usex libnotify 1 0)
-		PREFIX="${EPREFIX}"/usr
-		LIBDIR='${PREFIX}'/$(get_libdir)
-		CC="$(tc-getCC)"
-		SFLAGS=''
-		VERBOSE=1
-		DESTDIR="${D}"
-		)
-}
-
-src_prepare() {
-	# Remove 'static' and 'install-static' targets
-	if ! use static-libs; then
-		sed -i \
-			-e '/^${PROJECT}:/s:static::' \
-			-e '/^install:/s:install-static::' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	emake "${mygiraraconf[@]}"
-}
-
-src_test() {
-	virtx default
-}
-
-src_install() {
-	emake "${mygiraraconf[@]}" install
-	dodoc AUTHORS
-}
diff --git a/dev-libs/girara/girara-0.2.8.ebuild b/dev-libs/girara/girara-0.2.8.ebuild
index f8ff7c982364..1098c77dd33e 100644
--- a/dev-libs/girara/girara-0.2.8.ebuild
+++ b/dev-libs/girara/girara-0.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
-SLOT="3"
+SLOT="0"
 if ! [[ ${PV} == 9999* ]]; then
 KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 fi
diff --git a/dev-libs/girara/girara-0.3.1.ebuild b/dev-libs/girara/girara-0.3.1.ebuild
new file mode 100644
index 000000000000..6a933684b7c9
--- /dev/null
+++ b/dev-libs/girara/girara-0.3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc libnotify test"
+
+RDEPEND="dev-libs/glib:2
+	 dev-libs/json-c
+	 >=x11-libs/gtk+-3.20:3
+	 >=x11-libs/pango-1.14
+	 libnotify? ( x11-libs/libnotify )"
+
+DEPEND="${RDEPEND}
+	 doc? ( app-doc/doxygen )
+	 test? ( dev-libs/check )"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		--libdir=/usr/$(get_libdir)
+		-Denable-json=true
+		-Denable-docs=$(usex doc true false)
+		-Denable-notify=$(usex libnotify true false)
+		)
+		meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index 28df72617d4f..d4db899b1913 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
-SLOT="3"
+SLOT="0"
 if ! [[ ${PV} == 9999* ]]; then
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 else
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index 44d8197ec547..c7baa68b2acc 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,3 +1,3 @@
 DIST granite-0.5.0.tar.gz 365015 BLAKE2B 47b88d0b08a300fecc561161e1722cc1a544f58580d21244b6584f6aba7756afe6548dd663620fe9a09406fc0be2766b1d1093a21d262a5ab001992f309239ed SHA512 6042f40c1338768281ab3e6ad0bfdd8c5c69fc4951a069b0779a22b8999b35110ea8f09cf025dd88bafef7eca6cc0d076a608d55f01c078186e150908f8e4650
 EBUILD granite-0.5.0.ebuild 1233 BLAKE2B df2d0807d42020aa0179cf75b6ed3e6ce8f4c86fd17ee98ffc75220ddf08cc6cde6e472e7088ea493b843aaeabbfba863516873bd23a398e5a8e3531c880d6c7 SHA512 7cb63a7489f868bec6c6617d173f9faebc7012ca28a5f7ce5624f15eb9c3d6e9e8fea68913ec88d016162abea69f491ecb854414a4a8b9c87b49d12c3b89bdf8
-MISC metadata.xml 829 BLAKE2B 39f7f389875b4e27aa0657a3f2dde9d99e6cc18de9e2cbd24e9a7e7b441823255a04972cd470e04bccfd4db803ff05c0c5be74d592564129d1dff137294fc934 SHA512 152c9807840842a1388a9e10723af0eb7aeb198444f85eb27cd19a3a0233374e3c60c9c2c34319b1549a5cb59d71cdeba075f0f36fb784c69fd78059367e1a91
+MISC metadata.xml 617 BLAKE2B 6f609311b7e71993b807c57d0f7aec4f7df646d3d70a36bf7509237e0d455a55bfac903dd7a2a00cc0bd0fa33f846152c9d0297ac77faf76dfcc3923e3d6fdd4 SHA512 83d352d15ff87be181c05184d4615aaf73fb56877fcfd63f257149c45a72c939751bf84812775207487305296d0d70f06f8be7c1b6c7fcfb7cdc0edbdec816c7
diff --git a/dev-libs/granite/metadata.xml b/dev-libs/granite/metadata.xml
index 1071e73abde0..6ae6a460b068 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/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>herb@hlmjr.com</email>
-		<name>Herb Miller Jr. (herbmillerjr)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 		Granite is a companion library for GTK+ and GLib. Among other things,
 		it provides complex widgets and convenience functions designed for
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 496ddfeb1e3c..0cc87c756b8b 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,10 +1,10 @@
 AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
-DIST icu4c-61_1-src.tgz 23400587 BLAKE2B 6c6c78b4169ad3e900ff8a8a8fc7286f3dfb692dc04cc88103804799d1ce1fc7d1a3a7b1fc1b379e92196dd5976cfea3fe014a09dc65d387f34f141eae5b9465 SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
 DIST icu4c-62_1-src.tgz 23468750 BLAKE2B c0b665af53a494fc064425e6b3e66ae11d31509f4edc42268b12b85ece5ea635ebc76a8f3ab65a49b74a849a67ffd526e15e6d1b5b07e13c7f94cc94bef1d31c SHA512 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a
+DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
 EBUILD icu-layoutex-60.2.ebuild 2525 BLAKE2B 71f0e92ffabdfbafb429837c1c9241252fdc898da64ad2128fb4427ce7cfc492a9369c0d38e6545bfa3f39d5434a7a8dd9dd809b242bdab4a5b57c5bb2c2f477 SHA512 bf1d94af09720cdd5cb6461004182bc2debad0e12dcf46bcae21ac485a36011dee14ce54433940ee035f9306a1a986acdb697ecb8023aa6f0be25b15b285cee2
-EBUILD icu-layoutex-61.1.ebuild 2532 BLAKE2B 1816a69d005b941c307cc07b2b39a3e7ea6de68b34a5f974f83ec094fbc9ac5309a8343abeae46d345b6b30475392e87ef819b05c275f4861070317b5f9fa581 SHA512 93e0e30b393881b7e649fff1962f6764751303972f1f081f33f40f6b99615765d4cce70cfa08c15be42653c5fdd60a89e3d8886758fbb3b65ea59640074fd171
 EBUILD icu-layoutex-62.1.ebuild 2524 BLAKE2B 3ca648c43e0cd815b338d1096b44892c252ec6d82054f6ea6051b19fb05462b56b30777ae91786ed3f8f0990a35d99810944eb795995093766ed96fd237312a8 SHA512 cbc383eee712119e35b85c69601e839b75023816695f38c2db73a808d392c35f3a2b7f76c9a0bea71f750eb2891a1d38ad9549dc75555f1d021f76af4b9da1c8
+EBUILD icu-layoutex-63.1.ebuild 2533 BLAKE2B ba7672ae5186965cb2238295df9865d42d42ecf41477e203bd9275eda4f26e919264e04842541d213bb13f9939885065d2c43a347a5ba4fe803c91285d693b5b SHA512 c6693f8a07484686bb01584c9127515e6d59230ca69bc7c07e8719349f393b5fa27ac94ec982ec17e8fb9f0f85df162427b170402d9a8fe6e1fbfc352cbdc98f
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-61.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-61.1.ebuild
deleted file mode 100644
index 7d87f4217b72..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-61.1.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
-
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug static-libs"
-
-RDEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	${RDEPEND}
-"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild
new file mode 100644
index 000000000000..c2aa44f7de44
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+RDEPEND="
+	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+"
+
+S="${WORKDIR}/${PN/-layoutex}/source"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+)
+
+src_prepare() {
+	# apply patches
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--enable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	pushd layoutex &>/dev/null || die
+	emake -j1 VERBOSE="1" check
+	popd &>/dev/null || die
+}
+
+multilib_src_install() {
+	pushd layoutex &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 25ffcbb7e3bb..65240f362b6e 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,10 +5,10 @@ AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70
 AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
-DIST icu4c-61_1-src.tgz 23400587 BLAKE2B 6c6c78b4169ad3e900ff8a8a8fc7286f3dfb692dc04cc88103804799d1ce1fc7d1a3a7b1fc1b379e92196dd5976cfea3fe014a09dc65d387f34f141eae5b9465 SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
 DIST icu4c-62_1-src.tgz 23468750 BLAKE2B c0b665af53a494fc064425e6b3e66ae11d31509f4edc42268b12b85ece5ea635ebc76a8f3ab65a49b74a849a67ffd526e15e6d1b5b07e13c7f94cc94bef1d31c SHA512 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a
+DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-60.2.ebuild 3710 BLAKE2B 11a56611d570980031040391168bd5c18ca2000c30e9e56edf2662b9ead959c684cada13656726e5e868803ab9c4f81309b51f3b65693175298cb163417f32b0 SHA512 65919063056eb718f860664d42f466278da3bf5d78e54e4ad24b22768b244c76c81053ead55871fefd2d185dfcdfb065e93c38ccc4515000996d7ef307d4a1cb
-EBUILD icu-61.1.ebuild 3721 BLAKE2B 72fd1527eb1bd7425397de5eccf60ed03c22a58dc113f6fe4c9a1853f0553c3cde723583d24c875e2f928393ff8b494a889a98800bfb9948a314fa804c15f6eb SHA512 d766de018dfe7a908dd23914ac0994dbd98c9d515ba0cee76a4b7d6c1a9f44809cefe414c9a8ca556aef08e3e7f3a4d249b6af12449651cd2ea303818f12effd
 EBUILD icu-62.1.ebuild 3688 BLAKE2B ff8e850ead70730bfe852bbf2795d72d41325afd7b723e6abf815cad316a4b777ba0f94a71952eaa06dec331aa122d1dc4958728ba9ade5239e39d62cf18a4c2 SHA512 7ce709631d488554ca575361126362973f74589380367acc5b0cfedef93ea5d9ce339326e1fc9969640c3eff4537d4b6f669342400cc9cae7fc3a6a721e32c50
+EBUILD icu-63.1.ebuild 3697 BLAKE2B ce9836ddb2c78d65f8d3620a4dbb72cbaa77f9dde72d345eda94ed74973b6fed8d8e726362228b02721ddb627b9fda85855e57e1a3d01cf125ba70a83a835975 SHA512 2d0bae7f3bb25e8a0adbc3c7320f99e632c70b53133819f56d31d3a2f0b43f4172e59175952ab1aea880727b5495f0c553b2802b469bcf547e454bb7cc934c19
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-61.1.ebuild b/dev-libs/icu/icu-61.1.ebuild
deleted file mode 100644
index bebf5f978415..000000000000
--- a/dev-libs/icu/icu-61.1.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
-
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-	)
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.2-darwin.patch"
-)
-
-pkg_pretend() {
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-}
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	multilib_is_native_abi && myeconfargs+=(
-		$(use_enable examples samples)
-	)
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL=${EPREFIX}/bin/sh
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH}
-
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-63.1.ebuild b/dev-libs/icu/icu-63.1.ebuild
new file mode 100644
index 000000000000..1f5b0bbb21f4
--- /dev/null
+++ b/dev-libs/icu/icu-63.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs"
+
+DEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-58.2-darwin.patch"
+)
+
+pkg_pretend() {
+	if tc-is-gcc ; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
+			|| $(gcc-major-version) -lt 4 ]] ; then
+				die "You need at least sys-devel/gcc-4.9"
+		fi
+	fi
+}
+
+src_prepare() {
+	# apply patches
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-gcc ; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
+			|| $(gcc-major-version) -lt 4 ]] ; then
+				die "You need at least sys-devel/gcc-4.9"
+		fi
+	fi
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 5b1f5daaf300..173b2eeca51c 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,5 +1,5 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
-EBUILD ivykis-0.42.2.ebuild 395 BLAKE2B 5d9784acb3515e42e4052aba72a9331d57e81e8972867b6e572d211039e668bf78a238a28c149217ec40e17eaacd8fe0a4a8e976abdff772c7bf87a7d2dd472c SHA512 739ef5dfb0d8e5751fde43b642514f18e267f7da6cc27f91a966d5cc4046374e777bba2171fe262959a278291eb42610d1f308e9a9712aa22275aac4fc73dbb2
-EBUILD ivykis-0.42.3-r1.ebuild 554 BLAKE2B 3bbf9240398dab08f302c801927b7ce5ef810bba527679b788812e3c1d16a8877497d5e46a250a720b15189c6dea415c5ba9ef1d13e323ad4c9a4469db129468 SHA512 b4f26efc40a2a5b50d47967e18bd3acb54678695871d0e4ae4b09062348a07d3cc3b547575918f325bdef7b29c7ac457a0990c55fa6a58ddf91c7b0b260f69e2
+EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
+EBUILD ivykis-0.42.3-r1.ebuild 561 BLAKE2B b8cddcaf7952922684c8c3af2115db7907e1114a38382297d25f310f6a90ae6bbc0d126a8210d086d77f1cb56017b4121138b9914df7565f4388bd6c81a0922f SHA512 724b82b8f2879f61e10af185ce672677c07650d644b0a475435e5a48bb2655d4a84bd2551512789bcf37ba99bea502815f32297628ddaaaf048ccea00bb4bf1e
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.2.ebuild b/dev-libs/ivykis/ivykis-0.42.2.ebuild
index dd7b5f2f1ce0..b8f906e5f996 100644
--- a/dev-libs/ivykis/ivykis-0.42.2.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86"
diff --git a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
index a5ee1b0d17d3..7f38c8e61c22 100644
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index c321526bd6bd..d330dd1f038b 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,5 +1,3 @@
-DIST kdiagram-2.6.0.tar.xz 683792 BLAKE2B bc6074e4732a2eda4d8b2a321cfc8a2bad0f614c8d6dd48347f3e2f9ec013b2915a9793807b8640ee00cb1e20229741aae1e77abfd9f826016899a4178581f44 SHA512 243839e23171f5deafb167e5a05f1a2841f0294c9f7944cd2580c9e72830a7082a84e4dddd70da620751bcad4086325747e2308872dc272404540b13d91e4ca3
 DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
-EBUILD kdiagram-2.6.0.ebuild 636 BLAKE2B ee07b1a8f9181b13fc76fc6bed6731bdc17fc603ce4b9cec75483fcd2524565fc9590bed66e9a468571b7cc6d2ab3bc77432539b93f975b400204eeef8ed1396 SHA512 4a02370e857131d138f60614756811da8cd64e0059ac0c3adc8a7e2cf95854bb94e54e5aeedbd5edb81c858af95bad41690eecbe1ca947a6426aa342dd735265
-EBUILD kdiagram-2.6.1.ebuild 652 BLAKE2B 8fbf71fe669531b9df5011f6c7eb87243ba2d41d0c170c59b5515f1682568718e8bea7c0474ceeca262c8e5f216d07b5d81532a253d4b02f371847c3d38718e3 SHA512 803e14d99ec0380425cb4fe11e4f0b0317b983f29fae78bd6703d7bb0e1c2f44adb7a03b1a04e423d752e776fe4df2310c1f443c3da423817cff8cea544147af
+EBUILD kdiagram-2.6.1.ebuild 647 BLAKE2B 7f4015fa77095643a42ddacc4918187758d063a74dd414fa108d229f576332bb4042584a8d087e2b184f4fce985605b7ceea0ce1d6e658a84f8a9dadb65bdb25 SHA512 7dd2117d12ec0fef4268561d7fbc9e27a43bd22c0ce20ab1f798c4db47326be7af6c548f9ebc66d3f88d7ca7c0c17a158ee23fd77bd6b893b511bb562ece8cde
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.0.ebuild b/dev-libs/kdiagram/kdiagram-2.6.0.ebuild
deleted file mode 100644
index 49fd8352bcb6..000000000000
--- a/dev-libs/kdiagram/kdiagram-2.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_EXAMPLES="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
-HOMEPAGE="https://www.kde.org/"
-IUSE=""
-
-REQUIRED_USE="test? ( examples )"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep linguist-tools)
-"
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
index 9a92400c6611..2009639a09bb 100644
--- a/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE=""
 REQUIRED_USE="test? ( examples )"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 fi
 
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 7dc1f21bde38..c549c04e0313 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,11 +1,10 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
 DIST leatherman-1.4.2.tar.gz 814263 BLAKE2B 5ca8123f264ed0f7843c6fc1b0966c577fb9d12933e5baa375e0beef8ba17afe4388f1e05e1022e392c50e32e159b765531137cf069bd0f5b8baa3626c860949 SHA512 e0cb19605163b68ac5a8fc74e875d856af5e34345f19c38f0db45da7536ec27ba6cf4b4e8c5883ceb9a5978cdc8831181ec89ad4105252366b198af4f3f22bff
-DIST leatherman-1.4.3.tar.gz 814259 BLAKE2B 049cfab8240e5447bcb14bb4a96fa21ca7e4b7a24d8a38abf3820d6e1c25cf1e0841b04317c3d3a72ceb5f61f9b9a055ea76dcd5f731ffd567d96be60d2b8abd SHA512 a28d7f852904eafb3b703d5890d9514db24ef387fa440108ae8750041d1c5c1b36240b0925b37833ed68739d92a1d22463914e0838e5f09e03035aad47c49d81
-DIST leatherman-1.5.1.tar.gz 814327 BLAKE2B 133c65adb16b9eabd8dab341361d36a3736447596b019f15603e7cb45bef472a4267c5765adcb03bf9492d7f553d326c0f64ca026b4cad22e6f4744f9f12cc6e SHA512 3673a6ed530ae8f30b9a037ad42a3648ad61d50eae5c3a39a4a58f190567ccd21c4132289ecc8534202502bb7435ae79c9568a3dadf0ce75ae9c7d7fb65271f9
+DIST leatherman-1.4.4.tar.gz 814289 BLAKE2B d53ff660e28eaea1c11f95cc70348a2a5883e0dc5ae56482b0afe96e61938e4d15688f8abf9783976443c00b6a69e9037b5080194babb97200e25e2c548b9153 SHA512 a1955a3f7a7fd190f7d85ad07e30dee74b0f4b7ed670a4a9a7613317d2898faf776cbed0c5c7b6da25ddd5099c9638e9abb2aca16aec61c568fc2f8c9789ffe4
+DIST leatherman-1.5.2.tar.gz 814349 BLAKE2B 1bc2d85426683e9f82d31ba9e3b63b4c9185b0bfa5ae832ea252ecbd922b44dfa67b6011145489d5c5809a76011aef8b143f6b705ea0436d914fc0d8ca8091a2 SHA512 9cef854fd7a95c54fcfc2e639e469dfaa4625757ea8aceeb9ac2162bfc89cbcbc1d5e8217af5f1fad4f31d98528475e22157ca6b1046a36e0928074f866ddafd
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
-EBUILD leatherman-1.4.2-r1.ebuild 1155 BLAKE2B 1b6663520e7a3245ccc085cc5a5a3f9cc36a8d7112394224155f63851c7d52e42622c347e303f64f38959bbfcae4a38942fe571490e11a9bd4b4099a0a9c2041 SHA512 2d64e5114ebd7ced81278737367bb5470e6d431e5c517d67e23b7fc20dcaf0b3f58029b8be21f39bcfb4f684a82005ff8c7767d7ebe3feb017f3dd7f774cfb77
 EBUILD leatherman-1.4.2.ebuild 1151 BLAKE2B 8cde9882d7506f59fc13ebd6395efbdf8ebaf413eb17edff53b790f24394a6f68620ac39b9a4eb61c107cd8b898462fd603107764c805de52e24227e205a9dd1 SHA512 49c05ce146a7e89f9b18a856a96d8864f98a2e7dfde2818029c61c15da2b73409c44d5eb7d56015e6d32d9b21bff96176021a22937a3f768174e68a0d55dc04e
-EBUILD leatherman-1.4.3.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
-EBUILD leatherman-1.5.1.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
+EBUILD leatherman-1.4.4.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
+EBUILD leatherman-1.5.2.ebuild 1150 BLAKE2B 57977d3e1690caf8fd64c78e9c765e5bbe8f8d21faf82a53994a70a89d9f9667adfd8850784029b151b158dc8391edc97e6e875543bd43eeba0165ac717c100f SHA512 5c3e73bcbfdbc1f334b38ede1855e673e9d403c00b5352522844c7b25644212f31c1bf9d1e40e103d197b08a008f90c378acc9eabe90815309c5c19b0b57c160
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.4.2-r1.ebuild b/dev-libs/leatherman/leatherman-1.4.2-r1.ebuild
deleted file mode 100644
index f0eb93027909..000000000000
--- a/dev-libs/leatherman/leatherman-1.4.2-r1.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 cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0/1.4.2"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.4.3.ebuild b/dev-libs/leatherman/leatherman-1.4.4.ebuild
index cc7a76208a23..cc7a76208a23 100644
--- a/dev-libs/leatherman/leatherman-1.4.3.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.4.ebuild
diff --git a/dev-libs/leatherman/leatherman-1.5.1.ebuild b/dev-libs/leatherman/leatherman-1.5.1.ebuild
deleted file mode 100644
index cc7a76208a23..000000000000
--- a/dev-libs/leatherman/leatherman-1.5.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0/${PV}"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.5.2.ebuild b/dev-libs/leatherman/leatherman-1.5.2.ebuild
new file mode 100644
index 000000000000..29a1dceafddd
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.5.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+IUSE="debug static-libs test"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.54:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index edaf960d5e64..4fe704be81f2 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -1,6 +1,6 @@
 AUX libappindicator-12.10.0-conditional-py-bindings.patch 2019 BLAKE2B a57b1b2e3ac115ebc7395967f36b2f648abfba2abc32fb77505a77ddb63d3f7e99c0f5ceeeeabdbe541edc6db1f76fc23e28c0df81c0c4bea600d4a0f72b5f26 SHA512 69d86a3d1e930a0f0c79091dba9691610ecb0fcf13c672fc0ff511bb764b7f74f6c42cab558b6412863a8353fe9a8d72c40419db873fdc4716a93ba3bbbd0aea
 AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326b79a65f9ac7110c9d82a61efb993051d691d5cc728075bdd5ac904e9986cb0e41780d3e36e1637e5bd58532781934587b8c1bdf458e SHA512 b021bc0ec7fc1b311add7d6f8a9018fa6f5e807168055c95440e5f5d3d6d5b48375e11542b906058a0786194b1911c8bdcab9632573c1f128772ff6d54aa9173
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
-EBUILD libappindicator-12.10.0-r201.ebuild 2200 BLAKE2B 003ded270ba2b1eab5f003f028f445344003b0ab0dfd68651f09651ee999f608638e86dbb7a3a15237796c31831ca495fd43c5dcb875f21c477211fed07e1a66 SHA512 857d7e8283ab0701df9ef5f91285ca183de65966581ece8567d7ff290de6069e44f5ad756eac3e87f1c5b622ff45c15ecbddc3d32db804c46162ef2a09779892
-EBUILD libappindicator-12.10.0-r301.ebuild 1883 BLAKE2B 0e1e41b58a9bac1d7a0525f515c649ccc6db3e48dedb6097f1a1abf63eaad76f3b7771287d3f5f83d56748297f3f61dd76146a8058c9267da7e1fdd351bf7b21 SHA512 cc5df908bb9d28e61c39fb81e5bf8bd6b6b631049dff7d4081e3c1de87092b0f69568ae557db3ac1bb520132a940a86c86cec5faa64313e84776601eadc67975
+EBUILD libappindicator-12.10.0-r201.ebuild 2230 BLAKE2B c4d8027aca60142ed183ec9248b4ef6f5d4346727c36f69559bd19e77c77fe1a6c4a0045134ee190c2ca31c974fe1ed5a6e4b7161a9afda2c095031d3c66eec2 SHA512 34710e0c796dfc2091eaa98d2e72f6a27bbb5d45a00ed13981e83f892ca9ee3ca867a47faf65cc3a5318c654ae2fe8f13bc40c837862473d0a9e56f9c1998c4c
+EBUILD libappindicator-12.10.0-r301.ebuild 1920 BLAKE2B f83995d9896948c37b25184c21cbe6f708f040d393a1b1586d7e3e7a3b2de56c7307f9f5af25ed7fe4bcb309734af0577a6c5a4ef7eb9c81f36da01f1e0f6a1a SHA512 93dc214df5f47eecca89e5b4ee51f71ed14d09e734305a80b81ab7e08f57c2c42e7e1728f57811fe9adc91bfccfaa29a1b17a2d256ba465dc81b60fa55407666
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild
index 171bc7b67fb7..40fe8964c862 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,6 +44,7 @@ PATCHES=(
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
+	export MAKEOPTS+=" -j1" #638782
 }
 
 src_prepare() {
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
index e346621fec49..7a9ad414002a 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 IUSE="+introspection"
 
 RDEPEND="
@@ -39,6 +39,7 @@ src_prepare() {
 	default
 
 	xdg_environment_reset
+	export MAKEOPTS+=" -j1" #638782
 
 	# Don't use -Werror
 	sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 75182dfd4369..c5d32cfd5426 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -2,5 +2,5 @@ AUX libatomic_ops-7.6.4-gcc7.patch 1669 BLAKE2B b37d7940e2a793fcda7f20d509e326fd
 DIST libatomic_ops-7.6.4.tar.gz 497571 BLAKE2B 151cd518a346dcf2540c2e8229c2309aa83a7cecc3d66e3e8bab3d09c8688d725e26b27c836c0a3a3a46cde40fedfe26b0cca53cf2b2017f67e72d4a4993371f SHA512 2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b
 DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
 EBUILD libatomic_ops-7.6.4.ebuild 777 BLAKE2B 0f1a533dd9fe6603a0b8b4b02263d67830c3751aa31e4b12fcee2eb9c0f93af9f0cad132d2ae7705ccee3645c333ee893f9763aa6f949dbcc3a3a14c0c4b4c26 SHA512 a5ce9721e64aaeb642587edcb6219f0f4ef64448bd995c96b90bd69e75ef390b462ae58f773fc808068797416693ec81bc0e758fd36b79006ef4d6ae15c9c0be
-EBUILD libatomic_ops-7.6.6.ebuild 734 BLAKE2B e232e71e2fb3de24ea1710660294c5adcae596599112f90e7af8c328b41cbce194b7e0d40df91b08f7a39e539fb706c9eac12e381acb634fb1287e19dd078da0 SHA512 627b84b11582a66fc496d5dc6529eb8c7a93e96426a82deba0abb689db8a6edf8391026820de4852ff176891bda2ab2b7ce1f5a3568e5fda59a8be4e2d701be8
+EBUILD libatomic_ops-7.6.6.ebuild 732 BLAKE2B a99096ddbd682442ef8c2eefe2b9398cb5329cb9027360c86d1ffe550c2781ba8fe658e9ba277013741f429920e517c2309e6411e698c6fe3f8f6db3efb82ca5 SHA512 39af1cfb4290e4282f05e7a8ce44cbdb8b75d3c25794473c304411ec2aac3c57cc62b327b97d7e52bc82bc01ef4a0df1ade947bdc41dcd115d9ed0c2c307af14
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
index eb11eae64c09..ff63e5777ddb 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 1bff35281722..5d743ce8c45b 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -4,5 +4,5 @@ DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531
 DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
 EBUILD libbsd-0.8.6.ebuild 1227 BLAKE2B 2dcb7ad4b36a7de7c926ba5480814d060c325433ba3013e635c8b13ff940f303566b77f36a6b37920a3055ce3fb3e1c06882ddbbd58c6b9c98d379d78219b1f1 SHA512 a45b2b20b2b4b2a32277bd346f6433e8cef1d42260a6098aeb8c419d45c7a5c5db26e8ede2dbdef8039b03511e7ffb3ef65f450abea77b250e929889cea39939
 EBUILD libbsd-0.8.7.ebuild 1232 BLAKE2B d30cbbad96b19726f36e83d9fb8c69d14f53702c74f0401ce9abee5b7f7cddbd0f90da75d02833535e12fc1d9f4dbf202305466d8ef712fe892c08c707b94fc3 SHA512 1967086f1067249a65c99a6c68fe0e3238b120ad15d6dc5d6a9ebed7105ae3e4cd86b6c51aa4e1bfbd2ce5b3b0597ae20cfd6326c14d6a06f38d6406e1ad30f2
-EBUILD libbsd-0.9.1.ebuild 1175 BLAKE2B 0313bdfaebb0414fd50bcaff4e2486dbf40105b41717ff1264b251c38cc71b740a1f9e4106fe06a7bb3073e35c857b5fb7359576db7e9835d6e498f52baf675a SHA512 f9b23b91b0a8b92ed9b58c874677a4ba30c05cfd89e3782bae1604f07151dbff030e4a3655c16bbb0ab8ad8e41822c07fe7962e219bf7c9568f2e79976dd0333
+EBUILD libbsd-0.9.1.ebuild 1172 BLAKE2B b60e7440da2e884bc67e433b35987a472b304bd4722f6a910056f4bad3410b6a9191b12041e374c15a3af47c0b489332aecd47be3de0bff6e59eba92da34cf86 SHA512 b01b7ca5b04e27ebb7c6c0192317d86387658eb1626d3d2354e3d2c9d1521fc0197c30fb4040f62ed1fdab881628673b49f081182ff2fc0f97f714938f97e6e6
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild b/dev-libs/libbsd/libbsd-0.9.1.ebuild
index af8633e3a839..a3299a2bcae9 100644
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ b/dev-libs/libbsd/libbsd-0.9.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-3.17"
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index f14f1b4b2d5a..8beeb459fe07 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,3 +1,5 @@
 DIST libburn-1.4.8.tar.gz 977757 BLAKE2B 2a59adbd104238857cd848cb76c2da3e5ea61112607832c42bba2c47999218bf87563fe2a3901370d2a8cbbfbe2a6dfb1615efc6be10f7ee52d7f822917504f4 SHA512 e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c
+DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2
 EBUILD libburn-1.4.8-r2.ebuild 824 BLAKE2B d7df406726778b3752cdf5af3468893f09c1afc329e75f36f84a6e774b8a8706bdc3abb90cfefd1256a42a6783b4e8f6a089bd0ddbf1d78cb5315237fd0df915 SHA512 7f6c91c2cf05430cc03bf90c114fe577d674eff13a17d3477532adcc4d368078681fd2d8474692fdc6ca66a99e562c8de11edf0b32690583303bbd27b6113836
+EBUILD libburn-1.5.0.ebuild 847 BLAKE2B 94d035e5db069e9a32a866e7201a316825eb102b45c75356cc6ed91d922fb31b71121ce942d0fea67180ef58711b71fd817e280ebe63fb7c3244b23bcfe60846 SHA512 db74dac795a3b6f4803dfcbf6db42357b49d58a3d57f31b9a14a91a797823124302287866eb0c7fe5dc1ba9ad601611b5eac4ac4643faa7cf8d3a431a7676c9c
 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.5.0.ebuild b/dev-libs/libburn/libburn-1.5.0.ebuild
new file mode 100644
index 000000000000..8b37ce1e6841
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	--disable-ldconfig-at-install \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+	docinto cdrskin
+	dodoc cdrskin/{*.txt,README}
+	docinto cdrskin/html
+	dodoc cdrskin/cdrskin_eng.html
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 26862165a1c3..5664a6646bcd 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,7 +1,4 @@
-DIST libcss-0.6.1-src.tar.gz 487329 BLAKE2B 4a751158c63aadbd21997ac4b695b9b1959097248a2eb8af452411c7eca6db49e31ef93255d62c2b049efc3ee6850412385c534d311daade218a1d0f65d40417 SHA512 9b72765a4f1e9e0a6eca0892f50d36d84b25354fd6e55fd9da5c541077e466e585093b34f3ff35591d59294b05f1485b224d5f9df41f07535a09b445795ae2b3
-DIST libcss-0.7.0-src.tar.gz 493022 BLAKE2B 12c4a940d93ecbae20c62f80ad17bb2932d2095e9eea98f35282e6e3e1bb411bf1f96ee38ab47662650437547441c8386a7da6083ee6642628d23c2e7893b6b0 SHA512 937469c87dccc77083e8c864558225ae6299fab7dcffe7670af6507e65cbfc7fcee22b74e58f4c34a89c05e917d3ed31440a92d89c26cf85e36d6ff3281d7712
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libcss-0.6.1.ebuild 838 BLAKE2B 6a8efa2dcb7cb86afea6bb04fc48de79766051894908c9474d63211649933e2d089c2500fd669572dc02f17e3b54835278884461ba4a6c2fa588d1ffa4d9468a SHA512 7208299068f47c98813a5bef188d7d7b7dccc6b8d6feab3e0122eeebc42b96054f3d63a62b2daf7efa42af9db7edc2246486caf58759e0b4c6d3ce1b944df462
-EBUILD libcss-0.7.0.ebuild 862 BLAKE2B ad3def218c4c6916cf2766a22fd6cb3e56dc42ac0bddbab9cca3c9c30546242dd2232ee34b105bd972234a022f042738f6f65aff64c63aa7f76f620af024ef29 SHA512 4424de259d085e22af9767e111e8e796d2bcccc2db3fb4d30301071db308d807986954704ea0bac95c3f0331956df034edd88eae67f4b0a07dd5243b55ecfe7c
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libcss-0.8.0.ebuild 910 BLAKE2B fb7aa492eb5871987412e261da0d0338c83649e23e605f18a5c28a6ceb98fed5d0b1b6f9c7f998ef64002890d9ab0b99631e129b12a9745354088851bcd8d348 SHA512 d18ded471c155bb9351bbc9a586210e82c4d8de3f6a4dee8a12c08c97c8e4bbc7ed5aae07f66c59045fdeda381ee9dec1c88b56e2b3ace7f866a09f0779d47d2
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libcss/libcss-0.6.1.ebuild b/dev-libs/libcss/libcss-0.6.1.ebuild
deleted file mode 100644
index 349ae41ed4dc..000000000000
--- a/dev-libs/libcss/libcss-0.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="CSS parser and selection engine, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE="test"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.4.0[static-libs?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-src_prepare() {
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i src/parse/parse.c || die
-	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
-		-i src/parse/parse.c src/select/computed.c || die
-
-	netsurf_src_prepare
-}
diff --git a/dev-libs/libcss/libcss-0.7.0.ebuild b/dev-libs/libcss/libcss-0.7.0.ebuild
deleted file mode 100644
index 67066814eb82..000000000000
--- a/dev-libs/libcss/libcss-0.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="CSS parser and selection engine, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE="test"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.4.0[static-libs?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-src_prepare() {
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i src/parse/parse.c src/select/arena_hash.h || die
-	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
-		-i src/parse/parse.c src/select/computed.c || die
-
-	netsurf_src_prepare
-}
diff --git a/dev-libs/libcss/libcss-0.8.0.ebuild b/dev-libs/libcss/libcss-0.8.0.ebuild
new file mode 100644
index 000000000000..b1007296de25
--- /dev/null
+++ b/dev-libs/libcss/libcss-0.8.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="CSS parser and selection engine, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE="test"
+
+RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
+	>=dev-libs/libwapcaplet-0.4.0[static-libs?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+		-i src/parse/parse.c src/select/arena_hash.h || die
+	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
+		-i src/parse/parse.c src/select/computed.c || die
+
+	multilib_copy_sources
+}
diff --git a/dev-libs/libcss/metadata.xml b/dev-libs/libcss/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libcss/metadata.xml
+++ b/dev-libs/libcss/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index a9f8593a4d4c..833ecbff84aa 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,3 +1,3 @@
 DIST libdazzle-3.28.5.tar.xz 422792 BLAKE2B 65b994798c2f9c7ec0d5ec5b3506896ba3fe09e8e563f1c03246684837a876d0918763f8589deccfc1477071434acda56973097904c3ad5469aa4374a56d1914 SHA512 e4616994226a7e755913343487a2850030dc13816c94dd0de166bb617a001097f6b849fa45ee546e75a15ad3357bd5a61a0caf436c4e3656eaa3480ed4b7f903
-EBUILD libdazzle-3.28.5.ebuild 1312 BLAKE2B b3e420ebafb274f114956873fcca7dfa50e7777ef3a4dce3d7447ea072d736a6e9ff1b2c3a8834ea5320161a29a87fe60507441f0416d840afb8b8fabb1485e3 SHA512 ed769ee77c51416347f727784de2291f7ed30206f3e293236fcaaca5c0c6b42f5d44d4d97146e3d11f45b6d34bf93647556be2a2b7da25793661ccac0bb063c1
+EBUILD libdazzle-3.28.5.ebuild 1316 BLAKE2B fea311b5e322a68509d784e3c0bb4923f737c892c108efb06a245868014bb61ada0232acbc37f61f923025426f5b18c04efd706ca30006075506c80f465f7afd SHA512 948fe1592b4ca032d193f4c1758ada180fcd0dc9b600a3874f793c97980f023edc2e13eb1e94f9b5cecdc9f1598200f3034502b633bbf87b1c371182fe79cd63
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.28.5.ebuild b/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
index c769ee0bf0c5..221853d5f5ed 100644
--- a/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 28e24143425c..4283e79691e2 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,5 +1,5 @@
 AUX libdbusmenu-12.10.2-gtk2-signal-fix.patch 1379 BLAKE2B d625c02fe3e43f01c9ad0f5cefffe748a7ef59e7a5326fe65b5fefd0e060ff85a93affbf2594417f8a5dbac9325180be9cebf1e0f758ade1753304da7e6560ae SHA512 a96488c1522a202248fdaa9e3ca6a4a8c50d548e4e347894a3f30708b883a46c291cc5c5d611e58cafa5ca020451d3c358c8011a227af7f19129f897db8ddc78
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0.ebuild 3992 BLAKE2B 04ee0766b85b7798e214bba618a0f9ca07cc955154296971391542f6fe8e459a33cb9a5728479ee0117eef4f81cd88d8db7cee9479dae3800b6614384defaccc SHA512 02f859bddd0dae7ab698c4084a3d142ccafe85becf9b38ed68e67a9d32f3753cead65d46084322a36b5ed4103cf90435877d4e66a1a124f7dff2137515049559
+EBUILD libdbusmenu-16.04.0.ebuild 4010 BLAKE2B 57f8dc0556ec2ff1f14cb1cc8941851f4e51fea3ce06a2b3fb6c03ad975247373c7063b6bd8c771001f1f0ff3a19c1377d812acddbd5926347c67305074e0dab SHA512 451323a8a7017cf9c0c39180936693099253cec15ac6ab4cf215f85c518b7095c5265c771c14a3d4ba02e45905ed7b29aa2773fbeb2f4c3b50c812a744d86656
 MISC metadata.xml 491 BLAKE2B 2cf408454b7544b7db725159845410fc104e6b73f3629a7e81b42154ee9700fe94587408cbb95e91f28a9233972c0c0c06dbbbbb9d11d171b809d33ad7cd8e01 SHA512 9183ab899735954d60ecb8b7ca394a72bc519b291fb2032cf5888711ab0f748bed9bc1cfb657ea6c34224b657df5634ab4d54a5bf89fbb0762d5a23d90425d12
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
index 4adfd72eaac6..a5112080a494 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,6 +34,7 @@ RDEPEND="
 # tests also have optional dep on valgrind which we do not enforce
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
+	dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 9c51047d579c..cbf217fc6156 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c
-EBUILD libevdev-1.5.9-r1.ebuild 1060 BLAKE2B 6a86951c06d37389eba726579aeea3b6ad54c5d33e64ae4bc79900aef9cff38e98740fbf32c13986215f78c8e0bc4acf3254373a02e097e500bc49028c72f0e7 SHA512 395970e87ef33692d3276e5a367505d9162a6012f7feefe2e4be9b5f0ce3144d6dd826432be972af1288c32f6028436b0c0b0e1262ea5849bc03dcda1e8503e3
+EBUILD libevdev-1.5.9-r1.ebuild 1056 BLAKE2B 2e4ea381cd4e29845cc5109716cc657ef499329b9d9ddfd9c8b7bf9ab703ae404f2c62fe94c904c31905292f0848adfe51efce67990768dda9f298ce67a62bf4 SHA512 22b4f94635dc0cf44c75c4926d02c1efd3e18e8ae1f533f46faff30d40c3c1d0947518e5783af47d0678401a52fd987c86b0947911877c79c9b08b46655c25fc
 EBUILD libevdev-9999.ebuild 1069 BLAKE2B ce9fc469b63870e17fd86864afe1e18d154b6a2d9bd05e4f3fc71937c45aece02391275d960bece94ce998ba4f40fc7e1b0c73f8fbb1de83bd1e1d84fed19879 SHA512 0fe984fb6a8efe9692532041e9adc37e209d93641e4c4b00693242332610b6f6e6139738ed53ea2014ceef19c5615aac9e2948b3b7e3cc58819f2123a0b22bfa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
index 7d982501d6ad..5cf10a144879 100644
--- a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 8eeec982a7f2..b92e85217ec5 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,7 +1,7 @@
 DIST libfilezilla-0.12.3.tar.bz2 398275 BLAKE2B 0ba30e64b6aeae0bed58913248992b7152b389fc560291174388196a02a583dcbc485c9fb9680e0541e788c2d6691a6050f465e8719c2c3e7974eb5fd293bf8a SHA512 a08343a418b4147b42d38afd04c66a26c405770109818b48a291c127a5fde6c98515b716990fb056b319c3be859f44060d4ee83e96ec5c4bfa40c755ddc01bba
-DIST libfilezilla-0.13.1.tar.bz2 398991 BLAKE2B a1da4be42a3579ae6e0911f5bae78a2ce573abbe96fbbda368b613f3fcbbb53805601902a9f0e16cae8b788c69377145f4482420d81b26c6fa487f9f60e940ce SHA512 d6a0cb14d8008a945df94081a64d3b8857c5e45ce32275eddccae931434eb98a586bfcd8430adad09ee4e17ad42bb83abfed3a2d227d98714b1ba1720bbd2e7f
 DIST libfilezilla-0.13.2.tar.bz2 398889 BLAKE2B 8e4368fb3b0246aaac7ebb3f6bf515a6176bb8d72b2064d2390c4c585951472edaafe71d335599b6951e9a155689010f85fa4cd39304481c4ca3882d39565186 SHA512 97fd49fbfbfaabb0354c69f9a26d674e7cda7a085201eb0e3454558e5773404f4c13f87ae4e11cba9bd0737dbd7c65778d02a8de2f07dd39636514134cce5c88
+DIST libfilezilla-0.14.0.tar.bz2 399398 BLAKE2B 25c1397769adaf532823f85abcc8bec0a885f5c92af49219a1aa9379c12692bdcc94d223ac2ddeefbb221f0ce0d709b058b7018f3c358a40cc046e7c45c4ee82 SHA512 f20932e14ab81df9562e030ce10009b9ab55b6798f7bfff7249e9f472fc8cae4278eb142a655dffb63fec53894783874973eb33444bfdacdb06fa682c2dd66a6
 EBUILD libfilezilla-0.12.3.ebuild 921 BLAKE2B ddbbfbb499653641009d4ce494b7308bc92d6ffb58ae13888dfe892761c993fe03b5ead34638b238e96a171310d21f794981051d321d01f1d4b64ef63a47afa4 SHA512 7d04b1cd40129c05ffef86da072ef5da8fc91420ebe5444c6e5f8c471c0627502ee0575d19d3de2903e7bf8dc2a256aaaf7369cf165f62b868d35b54baa0f34e
-EBUILD libfilezilla-0.13.1.ebuild 923 BLAKE2B 42d482992114fc7d22bde3aee13d8e2ebd1a634702da8f05b33ab7b26e368171e5509e09662309ef735d760072fde58d6b48d7a1e4c1dbb7875e54274f4af2e6 SHA512 ad6b73746667125d5ef08f0f8ce0efb6d2da3f8c16f8c38fa031627859c2f6858e867e7c2c04ff18401ea98148941a10ba290c38135a963f011fca8bed084917
 EBUILD libfilezilla-0.13.2.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
+EBUILD libfilezilla-0.14.0.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.13.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.13.1.ebuild
deleted file mode 100644
index 28b3e2505fd9..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.13.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
-	http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-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
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.14.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.14.0.ebuild
new file mode 100644
index 000000000000..5fcb3b82864e
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.14.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
+	http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+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
+}
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index b52dd7e73cef..3dfc699fec3a 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,5 +1,4 @@
 AUX libindicate-0.6.1-no-mono.patch 1888 BLAKE2B 60cb0434e3974cf474fca729be08defcaa01d713e4039001f4994bcaae0a657fd04b0c2eafa447c25c2e56d92bddd39f2b17915fdb7d26b916eae3e3315588d7 SHA512 b2623349c139321403e285ce384191f2741b6216dd87ce5e05a439bd175a2846bca111ade729e87322a413bfc518fdfc2546274114fe5726de171b51d3be7cb1
 DIST libindicate-12.10.1.tar.gz 550378 BLAKE2B 9966c645c2538bf9246221e138771ce38e7f74629ae2365cd803a5e26372922cd5194ca1449f79a35f2bcd391e3ee2056183ab53b11fa8d92a8b2c258ead9c6d SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06
-EBUILD libindicate-12.10.1-r2.ebuild 1772 BLAKE2B 4e8fee45234f05b75aa26528d066db18718fdf68cf6312c4a124a81b57f2afdf404fc542634e5b0c22a9b09b90b543f5c7b8b4a337fbbaa3d487cbc7a7221cd7 SHA512 80cb5b9c8f5fb1eb512657a9df105e4540c5246c294b06dce21a433e85f92baee8308d5ee7bd0b70ba24a7a493346944b8831661d39a009d5f5671c1bc2d9fb6
-EBUILD libindicate-12.10.1-r3.ebuild 1680 BLAKE2B ff6b7415ef202771091e30bbb4883b20a1ce6d1e590a54c67a5f895bc6f0f9ff04e1974706795e499f5d16e00482265ae212b52be61d3f4808e54ed2708024be SHA512 060af29ebf73d4dff380ad77afd2495b94da1310e54f00d4a8adf666f4be2aee1b78f1c41666b14cacdcc372333484a47ae4a10f8946962935105d61762f1c0e
+EBUILD libindicate-12.10.1-r3.ebuild 1679 BLAKE2B 3a980835e3ab99b0b860b21cfb84cde7f8ffad2cb3494c3ec4e1885adbc54e6f4f45e8f0296d353670dc3c02c49bd8b854101e1e6e95a3936162c67f3c4c021f SHA512 72c0e40f47d614373ce3df91a38ac3e07c6b77d494be931c51ab3050a2fa3a497ff3730bf6cdced8c5b2d93bcbea5e31e6b3f18c617c6cef566b4f24f0475178
 MISC metadata.xml 328 BLAKE2B e528a6922cf244dd2e8e3387f539f9922378395dadf028852a3e17120186a4cdd82c89b29802ef5a0698a35737294733fbf9a717c3c31af90cb634ee5aa5cea9 SHA512 fc8169dee128e50da93fe6baec57989b4b2e0a59e36661328ae7bd5bf1db1ea5bcc08efb72e6ba2d0e0d9a18870144066a5c77a1f275801a4fc98953cf891a3b
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
deleted file mode 100644
index 8f70cb05fde7..000000000000
--- a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils flag-o-matic vala xdg-utils
-
-DESCRIPTION="A library to raise flags on DBus for other components of the desktop"
-HOMEPAGE="https://launchpad.net/libindicate"
-SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="3"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc x86"
-IUSE="gtk +introspection"
-
-RESTRICT="test" # consequence of the -no-mono.patch
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.30
-	>=dev-libs/libdbusmenu-0.6.2[introspection?]
-	dev-libs/libxml2
-	gtk? (
-		dev-libs/libdbusmenu[gtk3]
-		>=x11-libs/gtk+-3.2:3
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	!<${CATEGORY}/${PN}-0.6.1-r201"
-EAUTORECONF_DEPEND="dev-util/gtk-doc-am
-	gnome-base/gnome-common"
-DEPEND="${RDEPEND}
-	${EAUTORECONF_DEPEND}
-	$(vala_depend)
-	app-text/gnome-doc-utils
-	virtual/pkgconfig"
-
-src_prepare() {
-	xdg_environment_reset
-	vala_src_prepare
-
-	epatch "${FILESDIR}"/${PN}-0.6.1-no-mono.patch
-
-	sed -i \
-		-e "s:vapigen:vapigen-$(vala_best_api_version):" \
-		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -Wno-error
-
-	# python bindings are only for GTK+-2.x
-	econf \
-		--disable-silent-rules \
-		--disable-static \
-		$(use_enable gtk) \
-		$(use_enable introspection) \
-		--disable-python \
-		--disable-scrollkeeper \
-		--with-gtk=3
-}
-
-src_install() {
-	# work around failing parallel installation (-j1)
-	# until a better fix is available. (bug #469032)
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS
-
-	prune_libtool_files
-}
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
index 20f1036d1a87..2b05d40e90de 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc x86"
 IUSE="gtk +introspection"
 
 RESTRICT="test" # consequence of the -no-mono.patch
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index 694efd02d173..9c3738a63079 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,5 +1,5 @@
 AUX libindicator-ldflags-spacing.patch 298 BLAKE2B 2d0fb361e2980d429beee418d9bf8d2f786de0d2b337b6775f9457158aa30d02b4dcbccdc488fa79236f04bf766aad49df732d25f48f1ecba923c46a4e239280 SHA512 fa283a8d6b88da0e2b6f5d0711ebe8a5cc0d4ab87cb07c3cecae9974dd68be751169b89503ae66751bca6cd73df2b2a262ac55a667c5c8e00e129d51f4452c67
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
-EBUILD libindicator-12.10.1-r201.ebuild 1189 BLAKE2B f0a115fcafa345c177450ca0c360826d0fc7e39a7822fdbc3c32a7e5ea4e5a222c8cac3e196d712b4fe14d837ece06ed3762c43c5b1af4783b3db225008f66b2 SHA512 582f3fe2c4bdadf84b960f7e5ac0ffeef1f249c6e0c263d477af2121cc92b2516ac13c7636fcedfa41a0f8d77cb275a1fd0ff0b6b761e5c3dccc2359c757f9cd
-EBUILD libindicator-12.10.1-r301.ebuild 1151 BLAKE2B 435debec5fac0c2c61c75363c023cd6867bcf00ce50dab27215b2e317bb7767e5b1e8a5487a168ae3955bf98b6145eacb4875a1eddee5621216a4aa5e6cc8ada SHA512 c35b3c0a766b7dc6555f7a80cb3f7e6a65fa56408c859da38aa849344ad2a48c87325077c7fdf4017603d7dd72c3a9bfb538b2db85e09e207d1118d53f785e46
+EBUILD libindicator-12.10.1-r201.ebuild 1207 BLAKE2B d69e47daa9bf13333d31fdfde8f00e5dc49bb0ab8c3219ccc5e88698fdb8b12c3089fd1aa221e46452515a39bc938eb0127db19d927db57622df701d6e9730f4 SHA512 aad48d226c41fd1a282e4349a1686ffc2aa5c556a7d849ad40ebce9dcfe6fe8b2dc5d5ab60bf54d689fca4a579b3c3977bcd5bf9da2c0edc2156a540d573a355
+EBUILD libindicator-12.10.1-r301.ebuild 1176 BLAKE2B d795a1098a5a6e9f73e62a7c0046b88f42dc2679d466240cc79385f3001e4cf203e3c48b6286d2cd9295719f2d2a05fd2c553b4572f0fe9728c0c873020e4412 SHA512 554c24774f4d4f3bec43625015ea6f22a174f5423424136a92c4033977335935462b10fd9c8a099e66bef91fb208d83dafe799e8a17a92335434d1e244ba0027
 MISC metadata.xml 247 BLAKE2B 216107f32a44b828d5bd65432dbdf2f3b71d81e96ee3580fc551392310b9ee554715698dfcba215fa2181a90f361564b6d04546c61848c3a2d176f3590602f69 SHA512 f24203e0188dd8311689fc59007368585764703b92f6fde9b4ea01666d37304193fc728a9f99b7f6c936f5a5a51a58a8402a101dc4eddc0bf2bf09f221bb0054
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index df50dfaad519..c43c76e155f1 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ IUSE="test"
 RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
 	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	test? ( dev-util/dbus-test-runner )"
 
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index e4478c886b84..0f80459205ab 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,12 +10,13 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
 	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	test? ( dev-util/dbus-test-runner )"
 
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index e5c397c41e20..96830071059e 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,9 +1,8 @@
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
 DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
-DIST libinput-1.12.0.tar.xz 519320 BLAKE2B b40036740350180ca0e183088651647e3604bca236ab27c99a941934b27ed67a21d8596be9baab68dd798dea9c5967cca3a038623ba2870dc2ad3db8336e0b96 SHA512 4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924
 DIST libinput-1.12.1.tar.xz 520072 BLAKE2B 2d2b2d82f27ac01ff25b3bf6fd7b77ca56467ab818cdc5d4a641629fed623ef5042915889f54f71b1881595af1d85770bbf4ecfd798c079878efa0a0546c4a36 SHA512 de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68
 EBUILD libinput-1.10.7.ebuild 1440 BLAKE2B 203a9e8e20785cb93d221d8614aec3488a316d301672d3bbacbd223cd959c31edae176c17d1d575426cec24bd6e89c82b80244bcb7273a4531743555c4ba3b42 SHA512 c0e320acdb66994bcb5fe11b60ac4dc88955cae25da1dc3de028738bfb86c57eba90d23f258ed076ddba0da2737af9027ccde6a73705e6ff4feb8beffb591f0b
 EBUILD libinput-1.11.3.ebuild 1443 BLAKE2B 95c2a74f98abe1b021f14df89375e8acba26cad0df3ebbd753844cdbe477fcb7d2d9606c76b51676ee0fb27623a5de658a6326d74d7d90e9d1cf5be0cb8d8428 SHA512 2e91a777ad1f5a3a849ad7a559f34f43dffbeda2c5be97a06c0870d52d558c916045ff98229f155527cca58e38e155e76a48473a8f03c7d3b8ad045bb595fcd6
-EBUILD libinput-1.12.0.ebuild 1443 BLAKE2B 95c2a74f98abe1b021f14df89375e8acba26cad0df3ebbd753844cdbe477fcb7d2d9606c76b51676ee0fb27623a5de658a6326d74d7d90e9d1cf5be0cb8d8428 SHA512 2e91a777ad1f5a3a849ad7a559f34f43dffbeda2c5be97a06c0870d52d558c916045ff98229f155527cca58e38e155e76a48473a8f03c7d3b8ad045bb595fcd6
-EBUILD libinput-1.12.1.ebuild 1440 BLAKE2B 0a7cacdd6a101e465108981d625476b8e360872f7f0be8a7a583415215403a31f6c2f81275d00a626b2a8a7d5d31487cf64c768f4072d76ce695b7123478920b SHA512 60b1254d675c0bae51157b20145f4ba4a40983ec2950af0862a923a72df3a6de742752c27e0408c539698d9715b938b3abd65113859c2528a25eabc66aa7e4a1
+EBUILD libinput-1.12.1-r1.ebuild 1854 BLAKE2B d6f9387dfff57346bf5daa581c2426004244a77a23d86463370518ef9798dc2b497b0369c194784b8adb806063d9fc0f4e5aeb6d3356421c251aba3cef830ba5 SHA512 3b6f6bd4e80a894f474dc1ac66e206f3e9e12add2e682ea69c80d8a3661b3622397e2466038e2b2186eeb76d264610444755c378f6905c90a7a3fe812d8d1814
+EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.0.ebuild b/dev-libs/libinput/libinput-1.12.0.ebuild
deleted file mode 100644
index e26ac3c3c0ff..000000000000
--- a/dev-libs/libinput/libinput-1.12.0.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 meson udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc input_devices_wacom"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		-Dtests=false # tests are restricted
-		-Dudev-dir="$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/html/.
-	fi
-}
-
-pkg_postinst() {
-	udevadm hwdb --update --root="${ROOT%/}"
-}
diff --git a/dev-libs/libinput/libinput-1.12.1-r1.ebuild b/dev-libs/libinput/libinput-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..edf6037ad99c
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.12.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc input_devices_wacom"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT%/}"
+}
diff --git a/dev-libs/libinput/libinput-1.12.1.ebuild b/dev-libs/libinput/libinput-1.12.1.ebuild
index e4f4f74efb75..c19ff354838c 100644
--- a/dev-libs/libinput/libinput-1.12.1.ebuild
+++ b/dev-libs/libinput/libinput-1.12.1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
+		dev-python/sphinx
 		>=app-doc/doxygen-1.8.3
 		>=media-gfx/graphviz-2.38.0
 	)
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 2b80c62e240f..b20ccb241635 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,3 +1,5 @@
 DIST libisoburn-1.4.8.tar.gz 1537097 BLAKE2B 569684a115ac09506aa2fe6439f4dd80424ba7a5fb539b587e618a2a618c18512099117892ed0abc7268bb258c80a1ce8c2e4535f4eef963a14a5f8285806e23 SHA512 26dd6f6884d98d9d3f54bf18b529a688d28aa0ff54b7fe6fe7926c7765755a1c7f7b2d0ef02ca6ea2bdac9ddf6f928c01c89a3547aea1e9f0b47346b160d0d46
+DIST libisoburn-1.5.0.tar.gz 1550656 BLAKE2B 447c383b3847b7ca0c4aca73f5317dec03ef79b34debc3ad2149fae4e7216f29c4a0dd918271087b530fb6c476b219430159e1515bec4bcf51c47d5b2ee05d89 SHA512 c74a9e2887244c28c82abe70d2603dbcd49b639c370e5b7fea03aabce59ff2b361345cd6ec88fe8152727e8a416d4759b88d91e2b5aec8a697408e00b7dc9e4d
 EBUILD libisoburn-1.4.8-r1.ebuild 1816 BLAKE2B 61a5f767137fb65a53bbd9780153c71b024886a204649d1a9345d2caf8a7e559c09c4cb6d09e570f9ad356ec828ae4330a704b4b86d79b04ecb630675fcc6a16 SHA512 2124db392eefc46dc9e88f0784270b2955ee96df145282cfc790c7cf0c023dcd78a12c249b83de9743b1bcd97f7065ca9969ed6d2b47c5507a12d3b47c298729
+EBUILD libisoburn-1.5.0.ebuild 1840 BLAKE2B ec5c21338a4ced948104c073fe612264731b27f2a56c53f22a0d3aafc7ae69fe62d5a50af16340f690c2a30d90a433763ef7b1faaac1eed8546a47d06ee55986 SHA512 aece802088d8a271ef063548bf2c6ae1a89ed6ff9cc23267ed0f572979bf87197c7e2fbbae09e056a64a914a6b80b771ef98527e64f11100c9ae0108c4056bce
 MISC metadata.xml 829 BLAKE2B 3a7a3c710e8886e60f6447baba781e98cd29d64daeae498ed8423ba40ef08258e8b249530666c487a1ddff81e837a97dfa6a9746872ee1feb7c66dd949471edc SHA512 0a3690bc939275faf4c7179c1e26d4dd93464820d3c21e8694119faab3a417b823661ac399f33d423793b2cc234828445a5d6af7d5067150b5e5a3018ecdae7f
diff --git a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
new file mode 100644
index 000000000000..a43cbf926906
--- /dev/null
+++ b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug external-filters external-filters-setuid frontend-optional
+	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
+
+REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/libburn-1.5.0
+	>=dev-libs/libisofs-1.5.0
+	readline? ( sys-libs/readline:0= )
+	!readline? ( libedit? ( dev-libs/libedit ) )
+	acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+	launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	frontend-optional? ( dev-tcltk/bwidget )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable readline libreadline) \
+	$(usex readline --disable-libedit $(use_enable libedit)) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	$(use_enable external-filters) \
+	$(use_enable external-filters-setuid) \
+	$(use_enable launch-frontend) \
+	$(use_enable launch-frontend-setuid) \
+	--disable-ldconfig-at-install \
+	--enable-pkg-check-modules \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}
+
+	docinto frontend
+	dodoc frontend/README-tcltk
+	docinto xorriso
+	dodoc xorriso/{changelog.txt,README_gnu_xorriso}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 3707b805a2ca..29ec7c12055c 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,3 +1,5 @@
 DIST libisofs-1.4.8.tar.gz 829979 BLAKE2B 78275a8a1c2ed3824d25dcd2eb02675059d102f2f0b93ae469ea18c342bd6c72e79655eb9f3c700539f87ad46bb97b6a3e28950f84a03bf3d9f1fd982c4fc479 SHA512 0c6f505a951a1b7fce63bf63c715e5acb3158c15be2660627d2380771f025ec88bd67a4c2b8c86ef9dbb649a23cb26b826e875e7c87ff46c8bcd13d831fe8bcc
+DIST libisofs-1.5.0.tar.gz 834099 BLAKE2B 57dbdb4173df635d2811c61a0b88e49f617b628909a6f87eeca7715a2c94b25b381860722cd56752cac28993bb314c9b0371ae5c0ca73e37044192f50aa47179 SHA512 1d0bc488c18b95971b7aa89765d7b5772b64d17eadeae9ec52c0f880c6f68acee80ee39b603752a1f9fbe0f35029c27023d5a6710d149a0f568bb396c3dcede8
 EBUILD libisofs-1.4.8.ebuild 943 BLAKE2B 09cf690c8c32b58001b18f2d09931c1beca88841dcb8ad9cbedb1f402b705bfe20eef27bbe5a5756fc71587c9eb24325cf9869c0c745e6e45f5f7e48699f7bea SHA512 1ac774332041b72c4decbf1c6e58aae3e1d7eac9be9f341289da5db72c66a76a03fc782bc9799f4adf8ee07d3858ad0a3429ab1cc34b320a1d6f379212c88e45
+EBUILD libisofs-1.5.0.ebuild 967 BLAKE2B 04b740e5a5037be4de303481ff9e5dd0c95f6392f5fbcfe45a0dde439d79ffcd80e68723d4e3f9b815eca33c10e2772cb9e5cf7421b07968d16811fe924adc2e SHA512 6175ee513504abf53cc36a401f6c1a120160332ddb06afde2b2b23948bba113315df9727145f2465ffb9b5e50aa7f5f37b391cf06f8ec3318c9db2a072d47207
 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce
diff --git a/dev-libs/libisofs/libisofs-1.5.0.ebuild b/dev-libs/libisofs/libisofs-1.5.0.ebuild
new file mode 100644
index 000000000000..6c6df197b20a
--- /dev/null
+++ b/dev-libs/libisofs/libisofs-1.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug static-libs verbose-debug xattr zlib"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable debug) \
+	$(use_enable verbose-debug) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	--disable-ldconfig-at-install
+}
+
+src_install() {
+	default
+
+	dodoc Roadmap doc/{*.txt,Tutorial}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 39429f503b13..945adb0a35ec 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,6 +1,7 @@
 AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda
+AUX libmspack-0.7.1_alpha-fix-parallel-build.patch 954 BLAKE2B 545d90548a32c296d6bcbcd9e880574ba76bbb2d06a0ed41446b1632e8fdcf32c61dbdb6455cf9d9080d49840a1739983f9746614be0f08532c4db70ab16cf0e SHA512 251d7dd86f44f06bea8b1589b860e126e849743c4433703b4420da85737373af4b52c3f55dd8dab94e3bfb4a5e9626eee341f19f1ad649573727b7613170f2ef
 DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
 DIST libmspack-0.7.1alpha.tar.gz 486840 BLAKE2B f97abba7b261cced6e5c500c50243920c44ae8bc245e54386c4568e17989f2bad2c3316d83ebbd75220b50b09ed4ded156965e9aa430bd207aaa6b7c6218d800 SHA512 e903629a34c29099a261a108e4eb9cda485ab999bbc3383e3cd6a39715077d00b26a1c641b0f3df0eef60d2e15a7ef623379df0cfe25b99d4eda080529ffec7b
-EBUILD libmspack-0.6_alpha.ebuild 1179 BLAKE2B 26b87e8a8c53c60a7f7d75aa8f294c0edaa89afed3e2ded99c97700e3d5ec0154c7610883c9b0f504076389033ae6edad381b13ef40e465ec1da7bda6e4d9335 SHA512 ec70ba20463026e7a918908484fc114d78ca572ad276ed0e9cc77087977b58afd5be9ab8d384df58810c2801c32d1096de36d217d9656d64bc82c33eb34d255b
-EBUILD libmspack-0.7.1_alpha.ebuild 1347 BLAKE2B ffaa1c2516bcd34312195cd5f3345c5c201c9e701a2cfadc68c6dcde8730eb8da694d85fdc869367f1316273fcf8eafdcbee5b52dfff82f75b68a1d2f39110f8 SHA512 74f9481d5e94c72ad769a97e3a0f98bac1f6253a909e20221c1588f9d2a49829d499b2d71aec155054076580400250e2697e2bcbc0e732104fdebc2f160c0dbe
+EBUILD libmspack-0.6_alpha.ebuild 1185 BLAKE2B decc95044aeab67c2031bccf940a2c00f71263b4321d58e58ad8753aae67578b37d75964bad79457943be49e821d99c8d7bef56dcff383f02a23483c633adb97 SHA512 47ea82678d2701d15391697a498c8099b88742c82772bb79270d0c5138ea1061e5112a3609cfa4724517ce13790084e680deb385d48cc065bb9abd508ad6a50f
+EBUILD libmspack-0.7.1_alpha.ebuild 1350 BLAKE2B 2547d6a0d39530f7e019ea0073cd809c563094fc4ae8198f7b0c27c29d714b34c8f5f2a308d6a8df3a3cd5c847715e97a3d154483a90c3314e32a9761d0a3d4c SHA512 c4bd1afc5c42640541b70140295a860412beabfc7f90407acc2dc7263f711531bd3cd00b4f1280841a2fd556c7e4e32d554519e5a54ea258f5e24b963d08a274
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch b/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
new file mode 100644
index 000000000000..38935a8d26f4
--- /dev/null
+++ b/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
@@ -0,0 +1,20 @@
+From 43099fb1bba26792fe98b4157c950db9c333134d Mon Sep 17 00:00:00 2001
+From: Stuart Caie <kyzer@cabextract.org.uk>
+Date: Tue, 16 Oct 2018 11:25:24 +0100
+Subject: [PATCH] Fix parallel builds by adding adding libmschmd.la explicitly
+ to test_chmd_test_DEPENDENCIES
+
+---
+diff --git a/libmspack/Makefile.am b/libmspack/Makefile.am
+index ba19535..6130bc2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -89,7 +89,7 @@ test_chmd_order_SOURCES =	test/chmd_order.c test/md5.c test/md5.h \
+ test_chmd_order_LDADD =		libmschmd.la
+ test_chmd_test_SOURCES =	test/chmd_test.c libmschmd.la
+ test_chmd_test_LDADD =		libmschmd.la
+-test_chmd_test_DEPENDENCIES = 	test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
++test_chmd_test_DEPENDENCIES = 	libmschmd.la test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
+ test_chminfo_SOURCES =		test/chminfo.c libmschmd.la
+ test_chminfo_LDADD =		libmschmd.la
+ test_kwajd_test_SOURCES =	test/kwajd_test.c libmspack.la
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index 645770312919..dbb66269d83f 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86"
 IUSE="debug doc static-libs utils"
 
 DEPEND=""
diff --git a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
index a75ec2a107d3..4a10f2105900 100644
--- a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib-minimal
+inherit autotools multilib-minimal
 
 MY_PV="${PV/_alpha/alpha}"
 MY_P="${PN}-${MY_PV}"
@@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86"
 IUSE="debug doc static-libs utils"
 
 DEPEND=""
@@ -22,18 +22,19 @@ RDEPEND="
 	utils? ( !app-arch/mscompress )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-fix-parallel-build.patch )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
 
+	eautoreconf
+
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	# https://github.com/kyz/libmspack/issues/19
-	export MAKEOPTS=-j1
-
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable debug) \
 		$(use_enable static-libs static)
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index cf4cf44f7d55..e4302e01e33d 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,8 +1,5 @@
 AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac408954b85cc9798b12163564837e4fb44ec80eca33ca856e5344fafeb862a3eff43bddca27a9ae7603478505982a440 SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993
-DIST libnsfb-0.1.5-src.tar.gz 82897 BLAKE2B cc1287d8ac9d82f2286c7e4a0046e6bd05e994e3db50480c76f6bbf2fe8c1eae8593c53a0d59618b189979e196b7e23f4b55a7e5d311926b15c44ce623d5299b SHA512 7e1ff83552beb10fa44a05e34315502514c1eb9f160ec53f367d74718915400ac6630748704ffc2d4ea8633f74e0c446931042b6cbb7d9a2828a3cc565c872d4
-DIST libnsfb-0.1.6-src.tar.gz 83510 BLAKE2B 4d4c5cea7ae0f9a799cbf515f6ccad6bb24008f622871c0f4498bd2f292955d5c1c70fdff406839cc9173b3cdf17c7552563841eec5e1849624c4b25196fc36c SHA512 ed22b593e6475ee023818b8fe8109922b5714624137f71193edbd9d12c73003d5e161aba3cc86aed6c03dee3e247f251b3dc4d34db008d4cbfcae89331f34ee3
-DIST netsurf-buildsystem-1.4.tar.gz 38067 BLAKE2B cd09909e0565a7e63f16082c653f7dbf8de3e6b4d61aadd213bcd884a7cd3d10d8e22859322ffbe71a7d99823b3789c6e2454ea50cbe75578dc7d6eab324d0f5 SHA512 2c804ad7bef70c987e1d393ee4041bffc9797893b4fd513c90a665027205a1f7eee0a7d86ddaf833a6ee18346d6fe69587190c4e6722afc4ed18ce87783c35fc
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libnsfb-0.1.5.ebuild 1140 BLAKE2B 35170b1a458085e34c7cf63cb59a14099fd3ef3457d239585831886a9903a5ab58df41b68212ba495d1d9671ad47a3271aa54a6e0fe3f42586336eba1f6ea8a4 SHA512 9bea716436afff46ecc3d67313c174fc9c7892eda87c17c63d7b2d3719dc22aef689899b3f5ea357e271401b3beb0ed3613740e390619daf003fde17c5fbfce2
-EBUILD libnsfb-0.1.6.ebuild 1140 BLAKE2B 386e1939823ed2b4f35d3e9e111c6598b5c8b176eb0f573f299b23d13b151b0b0aba7e75a781caf7f4a446fe684be27dcc05f83f7651ba4388620aa7d851b3a8 SHA512 c2b640d335dfdf9459ff0bf08fc8c8deadf56e4880593ab8cc47186a3e0b3e8e8d453437b9eceb492b4b517f442588b2fc6aa2ac786d258a90755916d0c07f6b
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libnsfb-0.2.0-src.tar.gz 82322 BLAKE2B d805478728015663b4bf9c8de018bda33dcd84a7ace7246c450a7c31cc3358f834ade21ac1df9f0ca0e4dcea1138369cc3cd9ac468ebb484cce139d4bc89441e SHA512 b90eca76c8dcb22e554e13b5bea4268e5c9fc6e4711bafa5acbed92cc83513c3a3965208b3956de250fb3013cc3db6a33922ded471fa7a24bde97f748d2212c5
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libnsfb-0.2.0.ebuild 1228 BLAKE2B c17eff3f606360522f0491221a46b9742f2d206703c7bb71a1134cef423f3f08bc2c6d9042ebcfe0f1f6559175fc92efc5df20a962ede2e086271bec5addf9e3 SHA512 fcc5bb1188928defef453bf7400ed6db4f097288447343712a5125a71270bde80f88ca22c355a80e8d3c20c314750d40b258c9c1030fd605d763da45f0c02ddb
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libnsfb/libnsfb-0.1.5.ebuild b/dev-libs/libnsfb/libnsfb-0.1.5.ebuild
deleted file mode 100644
index 31d7b3ce4714..000000000000
--- a/dev-libs/libnsfb/libnsfb-0.1.5.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
-
-NETSURF_BUILDSYSTEM=buildsystem-1.4
-inherit netsurf
-
-DESCRIPTION="framebuffer abstraction library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE="sdl test vnc wayland xcb"
-
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4[static-libs?,${MULTILIB_USEDEP}] )
-	vnc? ( >=net-libs/libvncserver-0.9.9-r2[static-libs?,${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[static-libs?,${MULTILIB_USEDEP}] )
-	xcb? ( >=x11-libs/libxcb-1.9.1[static-libs?,${MULTILIB_USEDEP}]
-		>=x11-libs/xcb-util-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}]
-		>=x11-libs/xcb-util-image-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}]
-		>=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
-
-DOCS=( usage )
-
-src_configure() {
-	netsurf_src_configure
-
-	netsurf_makeconf+=(
-		WITH_VNC=$(usex vnc)
-		WITH_SDL=$(usex sdl)
-		WITH_XCB=$(usex xcb)
-		WITH_WLD=$(usex wayland)
-	)
-}
diff --git a/dev-libs/libnsfb/libnsfb-0.1.6.ebuild b/dev-libs/libnsfb/libnsfb-0.1.6.ebuild
deleted file mode 100644
index bd2d58faebd5..000000000000
--- a/dev-libs/libnsfb/libnsfb-0.1.6.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
-
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="framebuffer abstraction library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE="sdl test vnc wayland xcb"
-
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4[static-libs?,${MULTILIB_USEDEP}] )
-	vnc? ( >=net-libs/libvncserver-0.9.9-r2[static-libs?,${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[static-libs?,${MULTILIB_USEDEP}] )
-	xcb? ( >=x11-libs/libxcb-1.9.1[static-libs?,${MULTILIB_USEDEP}]
-		>=x11-libs/xcb-util-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}]
-		>=x11-libs/xcb-util-image-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}]
-		>=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
-
-DOCS=( usage )
-
-src_configure() {
-	netsurf_src_configure
-
-	netsurf_makeconf+=(
-		WITH_VNC=$(usex vnc)
-		WITH_SDL=$(usex sdl)
-		WITH_XCB=$(usex xcb)
-		WITH_WLD=$(usex wayland)
-	)
-}
diff --git a/dev-libs/libnsfb/libnsfb-0.2.0.ebuild b/dev-libs/libnsfb/libnsfb-0.2.0.ebuild
new file mode 100644
index 000000000000..c58a85060137
--- /dev/null
+++ b/dev-libs/libnsfb/libnsfb-0.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="framebuffer abstraction library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc"
+IUSE="sdl test vnc wayland xcb"
+
+RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4[static-libs?,${MULTILIB_USEDEP}] )
+	vnc? ( >=net-libs/libvncserver-0.9.9-r2[static-libs?,${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[static-libs?,${MULTILIB_USEDEP}] )
+	xcb? ( >=x11-libs/libxcb-1.9.1[static-libs?,${MULTILIB_USEDEP}]
+		>=x11-libs/xcb-util-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}]
+		>=x11-libs/xcb-util-image-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}]
+		>=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
+
+DOCS=( usage )
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
+
+src_configure() {
+	netsurf_src_configure
+
+	netsurf_makeconf+=(
+		WITH_VNC=$(usex vnc)
+		WITH_SDL=$(usex sdl)
+		WITH_XCB=$(usex xcb)
+		WITH_WLD=$(usex wayland)
+	)
+}
diff --git a/dev-libs/libnsfb/metadata.xml b/dev-libs/libnsfb/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libnsfb/metadata.xml
+++ b/dev-libs/libnsfb/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libnsutils/Manifest b/dev-libs/libnsutils/Manifest
index 6dab162f918c..6866f9ba2e72 100644
--- a/dev-libs/libnsutils/Manifest
+++ b/dev-libs/libnsutils/Manifest
@@ -1,4 +1,4 @@
-DIST libnsutils-0.0.3-src.tar.gz 7174 BLAKE2B 4557adc8c0ad7e292040ab9738f7c4fc85e67245642111e4ff79ea35cbd132c0d4006f13acb58cc2b92d4ae9e4b7be47a4f677c099c3e2853c6c8ae88d89815e SHA512 324c4d1d145ecc2643e244b515c72fde41ad31f43983e46ef181eff3f5bd767cab72a0ee73afbabdff8a92c476799ed6cd69326d7d194acd5ac330e2d4cb4122
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libnsutils-0.0.3.ebuild 362 BLAKE2B 443eca146c2e3344b86b816110db16ba88bb48fcef903b5a0a66a464b50b7281d6ecce686c7aae086a12596e5389e391f02f50be0fa84d92df884b78ea2982ce SHA512 66e674a620f8a6fd2ecfdd05e44e544aed26579573409e87dea7bbafb0fb20e145450bce6e7705a9b50289e93cd5dc712e8dc9091268cf0e52b95c8107048af3
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libnsutils-0.0.5-src.tar.gz 7653 BLAKE2B 4f7810f436f5ffd33084bc67095f3cb48a7744ef6f9ab0d632cd7b87467ff8bca54809de5a8ea837a00429c951d4e701909bd5f185e1c600a7323393017596cb SHA512 b9611db39adf11aa4e29387614bf55e241c075a223c687f5520e5b6808cc392c847be1a1d74559928e385a93886c4a67158504342384a1b200cf9ce13c00db50
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libnsutils-0.0.5.ebuild 450 BLAKE2B 1e12f4ec6a27013cb85915277c30a5e2efd491bc37198d49302ac3582d9d53e4bd3f1beee776c52f711b706ad802fd1270378dc5ef64b1d46c0755f5800d2004 SHA512 a56aa01b66ccbbbf5e7ce44b852ce3745d8cf6cb6380743be0ccf9a00979506dc9fc159b29cec15e005038fada27888db583f6d6356ec840951f45fe659d1c3b
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libnsutils/libnsutils-0.0.3.ebuild b/dev-libs/libnsutils/libnsutils-0.0.3.ebuild
deleted file mode 100644
index 9e9191abbf7b..000000000000
--- a/dev-libs/libnsutils/libnsutils-0.0.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="base64 and time library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-libs/libnsutils/libnsutils-0.0.5.ebuild b/dev-libs/libnsutils/libnsutils-0.0.5.ebuild
new file mode 100644
index 000000000000..a984dac5bcef
--- /dev/null
+++ b/dev-libs/libnsutils/libnsutils-0.0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="base64 and time library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/dev-libs/libnsutils/metadata.xml b/dev-libs/libnsutils/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libnsutils/metadata.xml
+++ b/dev-libs/libnsutils/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 0bb45f2ea883..6395938a9fd0 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -1,4 +1,7 @@
 DIST libparserutils-0.2.3-src.tar.gz 74509 BLAKE2B b9b68a91823181e7a95ec94b1a117da27180afe4ff2b05da279cf59a0b126cefb78712cae382c24b377292e4b5802273b1f9bd8ac52969a3a693da635ec88f65 SHA512 b68cbf3a3260bacea10c8115a1c247de3d7220e94a7f73da84ee4b400678132d8db71b8e84fe92eacafc4945c111f049779c8fead4cf9bd98c6e96340943d270
+DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 EBUILD libparserutils-0.2.3.ebuild 570 BLAKE2B 831f0a7473a068b051550eb316c096dcd4b7e5007210eb86d23136967cf7be7769964ceedf1caa77065c1e9e0b3f9f8af2d03cc3274c12e0e29e2d0085d2c1e1 SHA512 cd4cf38173e2231dd443c3c534cf1470566e6ffb8645341d9679fed0d469125141a52a6bc4078035b6f81c6fcc5eaa8521217e6864584a0df1edbe956f0a870b
+EBUILD libparserutils-0.2.4.ebuild 661 BLAKE2B f2b19b287717c30aac118842f905e46729fd53a868269dd88bcb116f574f6d5215ee49ff8f4482dc527de3a734dccb5df24b032d8c3e930b49744e7a4a496c50 SHA512 9889ca7ce51056c1c2c2ff4b2ebc926a264697fe4389c855406c32f91e85ce9a4fc1969628b537383a2d29dd44daa1b26fc5c27365b69f4db5b551d86ee112f1
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4.ebuild
new file mode 100644
index 000000000000..4f671e56ed9e
--- /dev/null
+++ b/dev-libs/libparserutils/libparserutils-0.2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit flag-o-matic netsurf
+
+DESCRIPTION="library for building efficient parsers, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~m68k-mint"
+IUSE="iconv test"
+
+DEPEND="test? (	dev-lang/perl )"
+
+DOCS=( README docs/Todo )
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
+
+src_configure() {
+	netsurf_src_configure
+
+	append-cflags "-D$(usex iconv WITH WITHOUT)_ICONV_FILTER"
+}
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index dc18e4f25f81..fde31ad26c01 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,3 +1,3 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
-EBUILD libpthread-stubs-0.4-r1.ebuild 793 BLAKE2B 6708ddf2f15707ea862a5ea1493b713e12c2369740d3ad0d860160f4f4b91bfe85567e7d0a38329441a4fc964f083326c884a4692bc745bd26c4e8417e722117 SHA512 5a6a82a68d8be67cca77f7ac27745b2c9670731a02799c844afa3bd662f87b232fb0ddb698655653d6026bb8e5263b38657e6b1b2b726a9b8273844cfd5c4df7
+EBUILD libpthread-stubs-0.4-r1.ebuild 789 BLAKE2B 4b5c7ed203d1c8f0314240d93ab6945e0e3dfbc17d5428201d0eb4f715c413ed0b00dd6e08f7bfa091f9586bfa7c96b48412ae5918efa3b965b4078b2322670d SHA512 dbb83391393a2c1c8ff9c08a5d6d24c540be37b2356da677dab3502665a857007e8ec7f0d2ee9bd2252f949444d9288a52aae2ef7b48822964c7451f02eab5b2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
index 7a504f5cfa41..342a0aa0d9c0 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 6b214cf97f8f..409a80d72f65 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,3 @@
-DIST libqtxdg-2.0.0.tar.xz 62404 BLAKE2B dc84654693c6504c36633394ce4bafb46705b45ac3e7576b03b92710603c86375fd70d5ea76a2864e498c5b33728b02d215da5b65eb3728218ff97defd883bf0 SHA512 f4e32346eddedd31195093214a45e9831742ee886a14b5d7ba1d640a91e05473b9b8adc7bca9970090f1fa8187597cd10796c32ecea4ac02229e9869cd4f1db3
 DIST libqtxdg-3.2.0.tar.xz 67736 BLAKE2B addc2636a9bbaa0163c3d344337eca9f350ffb38f4d0e785ade9775fc7d3e38c6f7a3c6c8d8d05e7b491f0cf2c34f5ceb8d51d34eb05b56e4170e190a5b5ae4c SHA512 1a52e79e97cd148c9f406402134d6feaa6ccb8d10cfa7c0e2a3fbf728690e193c05e444012b87e38790ce0570d1cf71c6c2cee7105f11d43923040543e0dd143
-EBUILD libqtxdg-2.0.0.ebuild 872 BLAKE2B c03f688865941559943912248790cad65cdd345c3b07dfaf0c2132c7690e86c295cf5a7c25aa441ac2b741b4186aa824753b669b6ee205f0f7f0674379dbdcfe SHA512 d33df38004393c16c002146a2d356676d315042da59fef98e6944e49e860101e19ed732673adc690435d95db8e0cdbcc614af29d0dadcb87c683943f27d46e34
-EBUILD libqtxdg-3.2.0.ebuild 903 BLAKE2B 153891db8770b7b5692fe65986aadfa1407d670d52d4a50ee1d814044c5688ffd6810cf3ae5bf5e386436b5da1ebcadb80e5ecdedd82e725b5f80773bdc29af2 SHA512 5ece9eb766adb3dc71dc3a5daa09841c48c378a32c33988b0c69fb42d652c9bd49ca86a3e6a2adaf9addd84e7758762363ecdc07637c71615e18cb8bcf00566e
+EBUILD libqtxdg-3.2.0.ebuild 898 BLAKE2B c53adcda19dc7700d4023a8edf956b86b78b6c61dd3afb8fe42028e9da196f9c9d68c7d1278d357edef9a4b2c52d1b2b9f88a77a86c04192ac661a68e773aceb SHA512 6d80157a0164728ccdbdd129426c35aa91b24796eb7657475cbaf0659c048378f9e4bb37f1c519c120a98f9ae19840d1ab470d15f8785b061463f7658e3a0aeb
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild b/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
deleted file mode 100644
index 710701f20200..000000000000
--- a/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils virtualx
-
-DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
-}
diff --git a/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild
index 8b7be2b0ab39..d9209aa16591 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 7c45bff8869d..d65bd87b07d0 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -4,9 +4,11 @@ DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec
 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
+DIST libressl-2.8.1.tar.gz 3375642 BLAKE2B 39b550e09cfe286e92c6b1168525bac927b37ed7c03db159e456e71abba1d411a78c7a3ad9084b28d41a3f132a959ea82e877ed159daa2c69fa59fef67fec1b8 SHA512 57af2c7a1a8522dca25c4e6371cb44f5ab074be1aded153e6e5fca4fa0844518710f7ce834d4dd309086686c492f10fca83f4d45c084eb49607cb5861f07ac99
 EBUILD libressl-2.6.4.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
 EBUILD libressl-2.6.5.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
 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
+EBUILD libressl-2.8.1.ebuild 1379 BLAKE2B a86a70b97ca897d22a9fc2d704ded84ef17e16835a27a80c10eb2e6c430e99583d6661ad726fb0a3331033b1d9ac5e7ba715a897f2d3ab7a94044678623a7056 SHA512 0e22d04b2d5f4bcbc519c07472d3b9d24f1c67323d256afa2e4f9fd43b45a92058cfc0f750a2b1aed4f3f4e388e7a6e0310cd8730ff545104e8081691a4b151d
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.8.1.ebuild b/dev-libs/libressl/libressl-2.8.1.ebuild
new file mode 100644
index 000000000000..45e86959cf53
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.8.1.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/46"
+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/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 9a63a5831cfa..0f091c187992 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -6,5 +6,5 @@ DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d
 EBUILD libsodium-1.0.11-r1.ebuild 1039 BLAKE2B d5abb8deb7cbe76beec8cc9b5a5b2300d1a6d62117b33525bc1087e1f09a499a4aa0e7e279dc5dd003a3e2f18dae20104262da5822ed6d62ea63bdb197f792de SHA512 93eddc42552a4921d4de77603e8b26fbc29627b44edb889d85fbe9948ece1f0864053a8b09f5f6457eacd6e6bd1da078a91d5c67266395e1e1f5edf20b1dcacb
 EBUILD libsodium-1.0.14-r1.ebuild 1049 BLAKE2B 6a2fca4e15d07b6f757012c33597beab78c3ef05dd57928876e8301c91d710c87a1c8ec168c8deb98d4f211a0d945ccaa85dffb588155fd36c63f5f7c286a019 SHA512 ec83eb24460a3614219d1139982ed129e1c2a8fb1e459e769084280e296684671e4f82529e4c3945434a3ea345042617e2ec5bd94cad8e9db179c08c9218a3c4
 EBUILD libsodium-1.0.15-r1.ebuild 1044 BLAKE2B 1e07b5338e770271c8a0ea1833d066d88b95a61992dd5cb98da4ff5e3c897c221e6c11651871619f145bf4f55fb42b1c993fd7970470913356c8b94244a1e633 SHA512 bcf15ab7e59a53ee010fe61cf76715d46ec021b4565c51fb363513e6b9e65cedd4ed4369dad97e3c65d6e71d29ef7e1a85f7883f97c54820a1edc527ae787abc
-EBUILD libsodium-1.0.16-r2.ebuild 1199 BLAKE2B 6df35838a1c4c1194457b91372692a3cf59158462d08865d8d7480a7027800fd96eb9eb17385c8d6308cce01dcf6abfd4c8776b6a957e9ad49ee141cb3072b93 SHA512 6dc67f08544c796824367276b042835d01aafe68e93575a09d8685c66f48fb60c4534d352042fd360100e236951b414a83ec42fc94431aac3654f266221e2f3d
+EBUILD libsodium-1.0.16-r2.ebuild 1195 BLAKE2B ae355b038ae057b6779d33d4f2fbc198b02c66152869c2143528a8e443b563eeb6a344d53ec83fb3e502d08bee9e8ba80eb7445e33cc76c5006374ec93b841df SHA512 58a1df0ca09c5c6275f9af6ec153146fe212a955ffe04614a8e1ddf218aa4ce054333ffce8f642e8bcff9156f2ad46c06a291fbe8d6908e790c93e509896bd81
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
index 2afa35b750c9..393a0f21ab8e 100644
--- a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest
index 7a46f44e44cf..fe60b70f716d 100644
--- a/dev-libs/libuev/Manifest
+++ b/dev-libs/libuev/Manifest
@@ -1,5 +1,7 @@
 DIST libuev-2.1.0.tar.xz 247388 BLAKE2B e2934fb79e32bf61e22a7c8fcdd6371f089c5e8a4f5b3039c10c90abd852d08c5612f7b871ef705afdca68857a270dfd133a1436cd9f49876e0bf47b903e6328 SHA512 82bd68c75f015284d3757886720d1a0e5689cf71b40b896410e5e4e952761fe05b090a33e0787f632afa7726567667e4dbbbc6270129828656953ded6d28d02b
 DIST libuev-2.1.2.tar.xz 248092 BLAKE2B 7229acc6ae0e55a5ceba00e970a9e7b4b11049dc4f4435643e0541a7b3c75ac300ffc2839da0eaa7b3819a5910d20b608247812d32c028ff19c0cf3735d2941c SHA512 65a35f1e2cda5383267ba47bc90e2cdd769e5fb1318c11969c8f44262d8a5b2edad522688619aa6e9219c278286ba9ff997967f9281aa4f667fbe9b0842bf0ee
+DIST libuev-2.2.0.tar.xz 245680 BLAKE2B 40d0912dcec56d58863411e034c6ddded3470bc2ea3a9f49d36fa0ef924e9ff206cb96ef93582134881ce8377938688d44cfa04d7e533321baf7cfd754f0dff0 SHA512 700c91100c61af2101a6d1756eed97aaf51d6b1dc3a59f90f668d8bb6e3d817aa6f765af5acbbdaeccd4382a97c8e99d2a13ad679fc8582891e0546baa6f001f
 EBUILD libuev-2.1.0.ebuild 534 BLAKE2B 4150427bd0e11f554676c94e81e83133558c64295861e0d0ad126f4800f7546e86aa24709754aee3d766d6228f9aac25990a9d5c572c6d507ae57d820b198a5e SHA512 da87d2ddac8efd98e103319718bc62e4737b2c8609df22b8f7064ccc66ddd10d003f7aee299c8a898658f4ce22a0e8feaaae1d1e220c0a0d59b710a2ae32e286
 EBUILD libuev-2.1.2.ebuild 534 BLAKE2B a87a2d9f2abc15dfbc0aa0f9e118fbf4b7c43f622d410aace856d9b9983b3a7574656add4335904526974cc0f96423fd95eae42f5d00e3d3e084e8a93bccc3f4 SHA512 b1e88c77b5c4a352f78c9b8e9f7835570df86e63e7e5dd5ae3550da7122395a97bdf0004bba8c7e0938a541f6c8d8b7a55d642d137d7f92889007560a3ced797
+EBUILD libuev-2.2.0.ebuild 541 BLAKE2B 217a18faa003337f8ec1e7cd92859a614d0764f52272f7b8690af10b83f71aee097b835e4b2249b55617ba80c0ceb99370c0606eec23a16158ccc5ec02a85437 SHA512 6cab65a348a30b3b2e1413e40551be6957320fa85fbe039d314072d2ab3a2f714a49907c57f42b1f7f34bef1af3dfabd069a412b0bbd2ce3e0778ee104d67f0c
 MISC metadata.xml 697 BLAKE2B dcba433b09e4af6c7a3e849ec4b084545f84d08faa409b7408ae95d3f2922632f08237b6c51e1274a09299b0b09cb2031d809a8f5957f75206573695e7a9b11e SHA512 5250db4faa8c97ffb7b2a7df81b1afd4300358e2f223e1dcb15e461521c816abb09aac8c333315e506c325464ea404a4651009ce2f82b7a1270cbb35020cd4ff
diff --git a/dev-libs/libuev/libuev-2.2.0.ebuild b/dev-libs/libuev/libuev-2.2.0.ebuild
new file mode 100644
index 000000000000..aab6a4daf462
--- /dev/null
+++ b/dev-libs/libuev/libuev-2.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Lightweight event loop library for Linux"
+
+HOMEPAGE="https://github.com/troglobit/libuev"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_configure(){
+	econf --enable-static=$(usex static-libs)
+}
+
+src_install(){
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
+}
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 285314c2a997..e9e08578bc05 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,9 +1,7 @@
 DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c5487917794abd2839e981924bf05e39aba5cee4fb9a366b78e4d265fb16a921fb64c9a083323993ce21543d37073720 SHA512 f42f0187bfec16ebabad64efef7a7651ee85dcf2af1b7cbe543b7de615f9c6432f7eea5fcc6b23335591dcad287c905eb9bd56199cc5d3b47435027ad678f2c1
-DIST libusb-1.0.20.tar.bz2 795247 BLAKE2B 9b3b4b9e372487ca355611917eb00a41d439df391796edf0b4fea28fcd88ca92214d05c4beb8eaf918028d833544e385e59ca38426880c293e070c5f1fc64647 SHA512 4230047dbc18db402f399a6b228f70da37ce4f9da9d57203e5c31cf0edec5ddd664865b4f16038a2ae72c26097e713b709b9e882a11b65a274e84993d617c765
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
 EBUILD libusb-1.0.19-r1.ebuild 1549 BLAKE2B 6a12714ca41ce219044e7e7e899b3ade24ef87a30279c0e736ca3d30aa16cc83316d879d790bc3917d57cb313a643c5863263488177504c833fca8f8e7d276d3 SHA512 95e8a31d19a4780bf8c4763be4c9b78fa07e25330e237a2bd3b73a5b2de6d0c74f90b8c1da857d9e6668778cb6cbe01130b62cc31a69b8dbbe56e3f012f0a762
-EBUILD libusb-1.0.20.ebuild 1608 BLAKE2B 2cf7b9d95cdd1145c0be082a4ac76f56db425515dd47f96843548e9dae8ae20f811a64f8e6854269e6624bbce1c6cc44096b2d3c718611e77360171712ccfcbc SHA512 f3ea152ec746f8f7d3bb436217376dda43332ecb0c5bdf1c8c8354eba4bff6106744f5b499ae69b4a457b106ccc935e2b90fd0c20f51ead919fb67df912a35a3
 EBUILD libusb-1.0.21.ebuild 1581 BLAKE2B a68ca4839ac711f9d88e12211c01e04fd58725bc848e005ad079115e08441ee4bbdb04d143037ac4ef4610bf6caa0b2f499f1866e42270c56deed1d23cb858a7 SHA512 bdfc6422076d472b292a5807b4f8d4505bd7bc66a00ee0327d59386c70efcf9974bc0d635f276e657fd8182ebcb71cf390e20df1f3ce5e047a771940cb8f3588
 EBUILD libusb-1.0.22.ebuild 1575 BLAKE2B 5f37b8ba133dc6fe02160b6a119f5a486798769c5993be4f20cbf48aa5d46e8784225b4b5772f70afa13a4d33b5294cd83b65b87e77062e147e9746d1d0d5060 SHA512 52cd79ff6b82b08d0a8409433bb281ba1a5dac67de872bdf40f534a8f03930eb9cf7e08d6315f47f48552347bb4e884ca93ca719393d88398e5cdd17eddbe868
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.20.ebuild b/dev-libs/libusb/libusb-1.0.20.ebuild
deleted file mode 100644
index ad04abe7f033..000000000000
--- a/dev-libs/libusb/libusb-1.0.20.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Userspace access to USB devices"
-HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc examples static-libs test udev"
-
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	!udev? ( virtual/os-headers )"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable udev) \
-		$(use_enable debug debug-log) \
-		$(use_enable test tests-build)
-}
-
-multilib_src_compile() {
-	# Bug 573802
-	emake -j1
-
-	if multilib_is_native_abi; then
-		use doc && emake -C doc docs
-	fi
-}
-
-multilib_src_test() {
-	emake check
-
-	# noinst_PROGRAMS from tests/Makefile.am
-	tests/stress || die
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		gen_usr_ldscript -a usb-1.0
-
-		use doc && dohtml doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-
-	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.{c,h}
-		insinto /usr/share/doc/${PF}/examples/getopt
-		doins examples/getopt/*.{c,h}
-	fi
-}
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index aee35d30b0a6..d62e2f9541e2 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,8 +1,5 @@
 AUX libutf8proc-1.3.1_p2-overrun.patch 1358 BLAKE2B 4583a42923db3ad30cd407ee736b6758151e4060a2aed528a54a61ca012d0bf7113ec68994805039a725958ac5bdf15bb9b482d7ff0ab53af2188bea2d4c816e SHA512 e897917e6346f3a0c539d3e2a762a37fc553bda17c64327249835f6f64e981cd9e98c627ffc95e5b36bc54837254cbc43fe9192e7671308f18b7167f0d6cbf6b
-DIST libutf8proc-1.3.1-2-src.tar.gz 144983 BLAKE2B ee9fddecf3b7f0865a63e56e511c251e28a4adb3b9220f313735960fff16356acc0c1b6cf19dd13adb787119a09efe0c4c3f9fd4c34d09ccba0d24a19f01a3c5 SHA512 50db8b324c244061835af8e1fff6d116328e5d40dff62477fdb78ba40b07b85612d610cc616ba165d13d0d933379a2d9629167ec4cbe31120518ae3bbcba3cce
-DIST libutf8proc-1.3.1-3-src.tar.gz 144985 BLAKE2B 92f21863df1a65a552cefa526a02e460de6e92f510b385d9f65b619176ca6dd429fc3f4d16a1e27bab6547109bfd353dd8e7c5126ac71e8065e8a2928543834a SHA512 c371c7ad6814a362179e70e4cb39bfd64d44a276860116dea441797d8dfc6c3ae1c7f0a981134a71952d8c773845ddaa60eb5b98241eccea488bb59411f1c880
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libutf8proc-1.3.1_p2-r1.ebuild 556 BLAKE2B 1009d675af19af1f876b1fbeb34aab259a96df9a49282ff7e27c3d0b0b56c81bdc94c32d637ee6c200a6a67f737b83a444f98f60139c0b187bc8430a254c8de7 SHA512 21984bb51d6f313321146870d03b9c9ac2b82b235ff29710efa62f86afc50dc18574867747546eab6bde16fe923737b356a4632a784ae2c73459661a53d13086
-EBUILD libutf8proc-1.3.1_p3.ebuild 581 BLAKE2B 1a92a09758f36de86465611afdc282b12ef3e2970cb40f4117ed0ac1eadc6b4fd4e78e15382d9d9279cb2fd57d881651a36a299b10eb97646f95f98936f719b0 SHA512 169645082503a0cb0a639e877efc0659cdddb781099df255670454728dad4bc3708f18ae94a815257b3d8dfb6a3aa7a950ae799f2223635810c643ba79aa41d2
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libutf8proc-2.2.0_p1.ebuild 620 BLAKE2B e4926d0a420ec2795d5ce3b7cc0151260c40bcb76fd2cb26bbe433f11c9e35d3fc1c3a3dcfee56595940fa2906dcd3395782ac5ec0c1c9ee992ba90de52eea9d SHA512 aafb3c0ecb9a4c4075ecb3d187545dd396d93b8afdbe11390623d8ac795c04732898626a648fdf80dfffe91be9991c85c1c3341e5890dc0c8606a34654ce7041
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libutf8proc/libutf8proc-1.3.1_p2-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-1.3.1_p2-r1.ebuild
deleted file mode 100644
index 944f03316eac..000000000000
--- a/dev-libs/libutf8proc/libutf8proc-1.3.1_p2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="mapping tool for UTF-8 strings"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="${NETSURF_BUILDSYSTEM_SRC_URI}
-	http://download.netsurf-browser.org/libs/releases/${P/_p/-}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.1_p2-overrun.patch )
-
-S="${WORKDIR}/${P/_p/-}"
diff --git a/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild b/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild
deleted file mode 100644
index bb3c286ff9b6..000000000000
--- a/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="mapping tool for UTF-8 strings"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="${NETSURF_BUILDSYSTEM_SRC_URI}
-	http://download.netsurf-browser.org/libs/releases/${P/_p/-}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.1_p2-overrun.patch )
-
-S="${WORKDIR}/${P/_p/-}"
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1.ebuild
new file mode 100644
index 000000000000..003cd696a2f6
--- /dev/null
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="mapping tool for UTF-8 strings"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="${NETSURF_BUILDSYSTEM_SRC_URI}
+	http://download.netsurf-browser.org/libs/releases/${P/_p/-}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_p/-}"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/dev-libs/libutf8proc/metadata.xml b/dev-libs/libutf8proc/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libutf8proc/metadata.xml
+++ b/dev-libs/libutf8proc/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index fe619b482fbe..3b10410e5d41 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -5,10 +5,12 @@ DIST libuv-1.21.0.tar.gz 1187827 BLAKE2B e534eb4a7cdde3988a34047c999fd20e83f443b
 DIST libuv-1.22.0.tar.gz 1186080 BLAKE2B 5e909c36e5ff75fb199f52d5910bb092ca4117ca0c53f8d3e7c9dd7e57f4959dca6e46db095cca93f3a079850268e5cc0fc68b2916a20773f09b2ba5f1531cc0 SHA512 e79cae6aa1d9cf2c8f7c0262c866fea2858d7104ece7c556e537e7d1cf884f191d5cd3e56539bfe857fa15dc50b57fdcb33019824cd585a2ca250a77d923af73
 DIST libuv-1.23.0.tar.gz 1189014 BLAKE2B 1bb2330773b8e7e7ee00e7000ea4076e0d93c3f54f7dc4e8ae0c6c73c652a406c907ee16a2364fc8688c7cc7a367fd3dab7a8b4885caf06a0196cb3d09fe7fb3 SHA512 d1622ea9c03661ce2dfa18e1725fc1bfdf3b16d7e40babc552dcc5b2f86d52f4dd81cac9bf89914024b11e4ed3671264dfcfba867cfa3b1a2206b89c59c95851
 DIST libuv-1.23.1.tar.gz 1190885 BLAKE2B 6a14ad9972f9f7e78627c2f1d0891c058189a26822fb99432f704ef959ad5d98a4f8308255e924ca87d14c6f64e38ed3ecf9d9203f5a51e70f555e12b32c33d7 SHA512 5c3170dea49d7954f5780bc94d5c021a8e1bf91e2d17188335825f1dc1098a8826d5eb9dac4be318ec68275888d0dfa9579a841d43de0c3520c89ab0dc70e5ab
+DIST libuv-1.23.2.tar.gz 1192529 BLAKE2B 045e7d46b9b45fb415be1827692021ae85a86b5a5b2fc5677de5d160e3b39c40a3379223fedd1ae7265707003f62e130b0c101b4fd367b9f44cd0daaa7d35dd5 SHA512 f91accf4ba9987fad23cc546a9821c3d643f8505cae22e0cbe28c4d5d5cb6b370b3483c6d95195cff3bcddd1e94f1bdab740075c3eaf22f8f673f7a57c1fdfc5
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B 822424c522ba27df7624d2b3e1fabb522e15865b8eb8a56127f6565da3d1ae55f519d47ddfe7cb7cecf406626487fba48d77a164a67e9d48be613cc2e36bf93e SHA512 3eb698ab1c3e9d31a90f79293a9484cf7a27e7a7945577bb241b74e6390bc4efee13e43b28de51c38c5fe3b921ca886f0ea8d26c752ea5f0437f5a4d0ab7bfd4
 EBUILD libuv-1.20.3.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.21.0-r1.ebuild 1223 BLAKE2B b722de91966dfb7612e4beec9e266099a83624183ae0d7b647c886e2b03d9b0de6cff5fc0e8c668db39c14adeb0469d38a2708adb7095c59c651bac3995cdda5 SHA512 e9743686b9e24773e37800b8437d58e6d1c3d6ab5fd664586d67b93b98981537ac1b3bdabbfcb13b1bc1b7b7bb0b06f8eab6d9f3b9c075da31c83279c95a86ea
 EBUILD libuv-1.22.0.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.23.0.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.23.1.ebuild 1184 BLAKE2B 4c01fa9bc2194f3f6053440a06ea037264753618ea5508ccf0b53294679854d6c6243e7ef4ce08e7a57eb67cf42705bb0b60dc55eb1fa1f000e2547b9a92fd22 SHA512 83883df664c3cfc1fddae6a834593efd5dfbe27fb767c7dd566ce95cef395e7989ddbd32ca1102251722ae180f03ba6710a03f03c45770736d36654420a2615f
+EBUILD libuv-1.23.2.ebuild 1225 BLAKE2B 7a7e7f855e8fe0ac81771e5cf64dbf9886e4a6600ec04de48d8c1b746389268d30ed0d5facc0eaaa47186f51760ce17523bb3ef641ee827c4635b57e14daee56 SHA512 c141a1f6216d4ee028937a17de132896eaaf9743eabdebaebbcadf0930bc73be9fdce7bfa33e296bd14852d69f1c2f87941b02d8ac7d4fb554faae24e0795893
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.23.2.ebuild b/dev-libs/libuv/libuv-1.23.2.ebuild
new file mode 100644
index 000000000000..446058848236
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.23.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 945cfe019690..f102310083ff 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,3 @@
-DIST libwacom-0.25.tar.bz2 478780 BLAKE2B fb9f3010f2db7aecd967508976daec40fdf956d600b2cc12a90b560e6195e7fac01d5df08413c78247fc17a97850f250b2b4533d78d9fff38871114ce5ab9357 SHA512 080d12706c3b685ee1cb963b79068e0e7c08e47296c1535cde4d2280239758d6bccbd38982a63d366cab1a77a4db287cc5bb329abaee6dbb285c4b8e010eaf67
 DIST libwacom-0.30.tar.gz 119261 BLAKE2B 4f76fcbed42c5453701e3b5dda880a26f9956a803827584aeaf080196b26bedb65f6bdccb7ffe18e7f93861dfee8a633894869b1ea4f6b95e72d64273087b60c SHA512 952ead4b39461d64d9592d0e05824669d0a8bc721aced46f5a99832da0fc63a4023f9803d416ceaf71dc7182660d05d45b799424bca7f54128fa7c44447b688b
-EBUILD libwacom-0.25.ebuild 1089 BLAKE2B 59837e9e7569797e5cefd876dcfd0a131096c147e418bee54391c4bc3aaa4755714aa5c2ef58799411b88df74b45c367b07c48103b9727c2a7704d755bc6b560 SHA512 40d0da1e92752643fe8305a75eb109ae94905376ca53c0cc0ee6e3d60c4ef6d251936249c56b11c3a90d1465ece431e5d0903e7cfd78f5cc07f8f1cafbb62944
-EBUILD libwacom-0.30.ebuild 1179 BLAKE2B 32a3cec17d3b2f9815a091fdd1361083cdfd83a07348c7091623fce80f0401aad468832bdaf98167f8dce9338a74dcce282848b626e05df0357371db7dbf5aab SHA512 955efa214c049fc5ff584e7dd091bec3fbabaf8a1e55d9ded9d22fac44c6436c697648f0331f6a311e6537a404eb609d343ef03e92053850ae7c4d606c34a99f
+EBUILD libwacom-0.30.ebuild 1175 BLAKE2B e9793b8744475b467d267622056ef59b02fa4b147bd87ff2cad3a38c29f45a50fd113008c925414fb230b47db8c7ae3a2d6581d0040d1b04b093c0a259e25d4c SHA512 5cf6d46b944b4dcbbaa7ee691f908bed59d911c3bbcb0cd19cdec73a4a964c93ba79008e025f751837b64bc4afe6749b0e42480b5b486a59125e5b52bf4b4bdc
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-0.25.ebuild b/dev-libs/libwacom/libwacom-0.25.ebuild
deleted file mode 100644
index e4c403cdcd67..000000000000
--- a/dev-libs/libwacom/libwacom-0.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="http://linuxwacom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-libs/glib:2
-	virtual/libgudev:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	default
-	if ! use doc; then
-		sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.in || die
-	fi
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	local udevdir="$(get_udevdir)"
-	dodir "${udevdir}/rules.d"
-	# generate-udev-rules must be run from inside tools directory
-	pushd tools > /dev/null || die
-	./generate-udev-rules > "${ED}/${udevdir}/rules.d/65-libwacom.rules" || die "generating udev rules failed"
-	popd > /dev/null || die
-	use doc && dohtml -r doc/html/*
-	prune_libtool_files
-}
diff --git a/dev-libs/libwacom/libwacom-0.30.ebuild b/dev-libs/libwacom/libwacom-0.30.ebuild
index 42c113e10635..874bf7986c96 100644
--- a/dev-libs/libwacom/libwacom-0.30.ebuild
+++ b/dev-libs/libwacom/libwacom-0.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index 022eb3d3dafa..71bce97e1901 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,4 +1,4 @@
-DIST libwapcaplet-0.4.0-src.tar.gz 31435 BLAKE2B 134846d6237f07cd60769ee7d21cb20f6f60dab3d4a335914851d8cc796a8cf1d3cd86dcd97a3cc2a3bb8415b12f0cc9c54fa01243ffe33d656c298dd99e6820 SHA512 b621b9575f248e4ac7164f0a33bbc9ad533266dcf231b511f6bf9d87e60235aa14863b9596562273d5793035d579293c3125e77f0b5428377c64b6f123d1fa5b
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libwapcaplet-0.4.0.ebuild 433 BLAKE2B 34d192b000abb5e80f6469c9e81d0d1c4b239ffabbd3e25105934d1e5484554b385c0ecc19a17fb6bf3b889bf1f3fec59b5f40151f6499590dd85e4d9cc00e20 SHA512 bb57641f6acf00b817d6a7d89f9a31902ac4fb063f5b488c1ca17f098524f0a856659f2522afc679a8731ba3a660e3a35228b1927b67fcb217c18a44dd0127f3
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libwapcaplet-0.4.1.ebuild 521 BLAKE2B 6ce29fd6054fb4efc353cdf8b484788efd7ec8fa333930244531a7c412a7dced958e12a81ea132c79dff45e6a44cddb816de9fda67fd58a6feff162b248c0931 SHA512 7b09ff1c9425f28d6c8337396b78e4033bcae04838820cf52b4c5487e45f0430c0242c072348a70bc5164b6b5b46e9cbeb86842a64ee37d3a306509b5559621a
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.0.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.0.ebuild
deleted file mode 100644
index dacea21d715b..000000000000
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="string internment library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE="test"
-
-DEPEND="test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild
new file mode 100644
index 000000000000..a291732ab001
--- /dev/null
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="string internment library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE="test"
+
+DEPEND="test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/dev-libs/libwapcaplet/metadata.xml b/dev-libs/libwapcaplet/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libwapcaplet/metadata.xml
+++ b/dev-libs/libwapcaplet/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 6fb3ada9adfe..5461b299fe18 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,7 +1,8 @@
+AUX libzia-4.14-ldadd.patch 474 BLAKE2B 65dab719d72ef136692fe4e047d93005976b0408894cfe408130db6aed93accee9388276e78042b4a59b9c2bdc9ddcb83ec14e1d19603a243f464d38ba31631e SHA512 6e2cd1766fa51d935bfd903577286ed3b167f7baee043b75573132e2425f4a75978db7863a1ebe4cb5a8a0df115a2e35a99c9f9d7004cad91f340155a5b77b9e
 DIST libzia-4.11.tar.gz 577185 BLAKE2B 80de10d5852742870ff7a7995b743eddf76a966695fd7ad786537ed4ad430b60a88b2f5bcb74fb41ecd01a84f02e126a0bfffa932761cb8bf73bbeb097cca181 SHA512 6d616ca12e1db20c8bbbe0a18b4e1e0ce1b086b38123762c2e4c3f46390ff5772dd27eb9b97b332b20f3430905f6eae0fdce70aca48fd56d5e43043369233964
 DIST libzia-4.13.tar.gz 583226 BLAKE2B 088c199c188fbbee54ed533565d3509a510db5f1d3bafeb1be76cb6b2f38d40244fe768ccfa2ee62aaba856ffa7b890dc6d5ea20ec7e1289cbce609d5a56b476 SHA512 b1dc294812342d8c4cf34b013d26c3e8d56da924ef22991b47bdf5ee18990e006a7cd216e9989a6fb3ffb3cb151fa04d5aff7707a7541ec7125b39a6f17eb80b
 DIST libzia-4.14.tar.gz 597138 BLAKE2B 200e0682c6bc28248646775c5e5a71bad329edf031d0950ad8ab5244e5e925903147467d23eb3a04f9be05cca6b34947692df15620331ffc5357b73f20d363b0 SHA512 c382ef352e80df69daf3d3e4da0c0de5d8037b32182a760f88a1edf7d2b9cc7d5112de942a5a85973ccf82ca1e0771c2e92de7972ff9bec745fdb525419a2365
 EBUILD libzia-4.11.ebuild 707 BLAKE2B be3320d6589dfd6a561a6809febe80273e8e312da0c01b2d42c853e99b1b47b3fbcc64ea5ae66e5b7212db89fd0516ac46a3aa06d13c1b6c67a243ea22116005 SHA512 8c6a1b708ff15d1e2bcd88d5179079110292e067e7b2901c6d7db4746fb0fa8ee3572ebbbe3b6f48b6844f8ecaeced13f55928f6c11953a5722268f9414efb3c
 EBUILD libzia-4.13.ebuild 709 BLAKE2B 3818ea32c4f00fd2457d1507aa9830efd17c24e15bd38b0bbfcf5ef5d4fbb12ff6bed0ec2252fbe9d8813b27091f24846064479cc359b7baf431205c9970e13a SHA512 f0a1b9b019217baaa60436057eb91c80715e760f9fa9dacd0948a24937b7aafdc653be0f7bf9fedd336ace4c9ca6e6611ed4ff90f2fc68d8ac247902d1cf1035
-EBUILD libzia-4.14.ebuild 709 BLAKE2B 3818ea32c4f00fd2457d1507aa9830efd17c24e15bd38b0bbfcf5ef5d4fbb12ff6bed0ec2252fbe9d8813b27091f24846064479cc359b7baf431205c9970e13a SHA512 f0a1b9b019217baaa60436057eb91c80715e760f9fa9dacd0948a24937b7aafdc653be0f7bf9fedd336ace4c9ca6e6611ed4ff90f2fc68d8ac247902d1cf1035
+EBUILD libzia-4.14.ebuild 786 BLAKE2B f3d6dd1ab50bc88416f93c79da98f439c8f5dbb40858456991bcae580e63651ff0c267b6809aff098bb143858bfd90ddc69f75e8075500915acec3104e8892b3 SHA512 4c1f5d96337747c96e19e1c293d95eb81edef56576ed9ba47d7a6da4a942b7b8d3f1d5cdfb2cd6b576adc06ec75383913ec5775b634a96ea626f842e8881e620
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/files/libzia-4.14-ldadd.patch b/dev-libs/libzia/files/libzia-4.14-ldadd.patch
new file mode 100644
index 000000000000..a8636e1d1273
--- /dev/null
+++ b/dev-libs/libzia/files/libzia-4.14-ldadd.patch
@@ -0,0 +1,16 @@
+# add local .libs directory to library search path during build of zsdltest
+--- src/Makefile.am.orig	2018-10-19 18:19:54.067784664 +0200
++++ src/Makefile.am	2018-10-19 18:20:26.419265774 +0200
+@@ -71,9 +71,10 @@
+ 
+ zsdltest_SOURCES = zsdltest.c
+ zsdltest_LDFLAGS = -lzia 
++zsdltest_LDADD = -L.libs
+ 
+-gpiotest_SOURCES = gpiotest.c
+-gpiotest_LDFLAGS = -lzia 
++#gpiotest_SOURCES = gpiotest.c
++#gpiotest_LDFLAGS = -lzia 
+ 
+ EXTRA_DIST = regcomp.c regex_internal.c regexec.c 
+ 
diff --git a/dev-libs/libzia/libzia-4.14.ebuild b/dev-libs/libzia/libzia-4.14.ebuild
index faa975e860ad..8182298faa85 100644
--- a/dev-libs/libzia/libzia-4.14.ebuild
+++ b/dev-libs/libzia/libzia-4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,10 +22,15 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/$P-ldadd.patch )
+
+MAKEOPTS+=" -j1"
+
 src_prepare() {
 	eapply_user
+	eapply -p0 ${PATCHES}
 	sed -i -e "s/docsdir/#docsdir/g" \
-		   -e "s/docs_/#docs_/g" Makefile.am || die
+		-e "s/docs_/#docs_/g" Makefile.am || die
 	eautoreconf
 }
 
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 859357ae8b01..34c7022daef9 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -7,5 +7,5 @@ DIST newt-0.52.18.tar.gz 180425 BLAKE2B 96c10d6eb63b62a51cd75f3cc34671954abd8e0c
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
 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 2031 BLAKE2B 5dfc354e41c737edacbf887f2ed076666bafa9d2865ad85469c2d726c06e5032fd57d709f2bc6781ca58152b22aa3939956271384e10adb15168ba6be6e4606d SHA512 542b14580a20c5cdc646f7d86f48413d5917db2e62a30cdac6b23f183d32be397b80310f58be7667eb5b4869c62f8b04be262364f781f449c602b15cd91c5d24
+EBUILD newt-0.52.20.ebuild 2027 BLAKE2B 2315559eaced516b0a32a25b1be8b4a0f1fd1fd529f9e4d136daf22f297ccea61fdcf227ede01d3b1424c6607212ce2c846959cbe09f5c6b33b8deec314dae45 SHA512 cebf7015bb84540574900df81e235c667f0d49436e884126975e46d1b82bc4832e9b8c6cd094b7f33853ebf513df566305a1d152c2ca0bec9c16ecdbdd5cdb66
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index 3e348b3697de..3f8f6f75f4b6 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
index 3ee7c502a2d8..4b171dedc8f5 100644
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@@ -1,7 +1,4 @@
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-DIST nsgenbind-0.4-src.tar.gz 97489 BLAKE2B e3ba3f5aa73fc2989ab93f237d90a3a6c902a66b64e01af5ca2be68e732771710748da59dbcaa0c47d356084c2096d7cb80e79dc314af1c0be26e3878e68e629 SHA512 14cb5e0ffc309c34b8387f53c2d6221d90fb8584348bd4ec73af3c0e1efc8348f11ea76799b5250ec5a253621ba106df261c0b1f3f93be641bc96b5efa118e8f
-DIST nsgenbind-0.5-src.tar.gz 106814 BLAKE2B a5de9089ff9c7607fbac8f2ba6f68575884937775355c4100f54dc9d5406eabb63670c0d80bd9180544066da1c691b2125669cf0caf21e602e939878ef4ca1be SHA512 3f3a2df9f005d03be6d36c5c4b2d11010b8cceb137ed7e0302599d526edd8a8c14dc866b971955f2a37c149f9a5bd56bf5eacb3a43ceb396efc178c732cb59bc
-EBUILD nsgenbind-0.4.ebuild 402 BLAKE2B 9dbec855096d1b238200d06b4a603502d4115ee8e96f706e9c82f447a0f4ea577fc4880f5e1794f4d71f3e4d2f075bebbbdf7d75d7124a781b8e9e030723f0af SHA512 3a7f2c0b099a896c473f6c0c4e600b09a289440c21f05e7e2c2087a9fa87b24b3adba3c8aea9ea6daf8087d09331fbc33e422a5da1d18e029cc463a179aa0a8b
-EBUILD nsgenbind-0.5.ebuild 402 BLAKE2B f7094759a34910eb790a0651cb55ae57fa3824eff6b3b1e9e0280b07f6395d3c6f5f43ee6af27e83281a2382127d598a2edd2e8d2a1676ce1e64c44aa9055c93 SHA512 f26139e6e5405848542a4f3de060f2370c0df46cadb16c9c6564807a8aa3e26c019da549d7e7cc7beb8332b3199be6506cfc47f278c9a6f13ce848174072a3b4
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+DIST nsgenbind-0.6-src.tar.gz 106862 BLAKE2B 9b40ae6298921736f7d876ae664207eb71102adbe44f4072ea46b08b63cb5cf608df4c96f3ade1c8cca964d8d8b32d68aad25431f6fd455eb8392d8313faa9e9 SHA512 3083b48e48fcf8c7f32b09d040998470d5917469e020c4ccbfb8ffdb7d1252fd27dd02f590f5a2485c6984cdbc005ea87adf0db45077aee0a91f68037c542ffb
+EBUILD nsgenbind-0.6.ebuild 490 BLAKE2B 745aca365d2097f0cffb3e1df5324b9ad6308a529f8647299b024a0a3a637b5f4b26737094474e04950310ef9b54315d86972a3dc0e9f30dbcf9da026134902d SHA512 cc986e21c41262fa74d8e90907e7ad69882345529a3a02c46ceedc2605aa6074b3ac3944e28bd4a9a36b621de51e7757d454707dd0c627c5dfdc7ac4bdaa3167
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/nsgenbind/metadata.xml b/dev-libs/nsgenbind/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/nsgenbind/metadata.xml
+++ b/dev-libs/nsgenbind/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/nsgenbind/nsgenbind-0.4.ebuild b/dev-libs/nsgenbind/nsgenbind-0.4.ebuild
deleted file mode 100644
index 03d8a77eaaa6..000000000000
--- a/dev-libs/nsgenbind/nsgenbind-0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
-HOMEPAGE="http://www.netsurf-browser.org/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE=""
-
-DEPEND="virtual/yacc"
diff --git a/dev-libs/nsgenbind/nsgenbind-0.5.ebuild b/dev-libs/nsgenbind/nsgenbind-0.5.ebuild
deleted file mode 100644
index 497bc1bd4d91..000000000000
--- a/dev-libs/nsgenbind/nsgenbind-0.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
-HOMEPAGE="http://www.netsurf-browser.org/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE=""
-
-DEPEND="virtual/yacc"
diff --git a/dev-libs/nsgenbind/nsgenbind-0.6.ebuild b/dev-libs/nsgenbind/nsgenbind-0.6.ebuild
new file mode 100644
index 000000000000..e0ee94d77258
--- /dev/null
+++ b/dev-libs/nsgenbind/nsgenbind-0.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NETSURF_COMPONENT_TYPE=binary
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
+HOMEPAGE="http://www.netsurf-browser.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc"
+IUSE=""
+
+DEPEND="virtual/yacc"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 1e24b5ad6fb4..0c065a1a6db6 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,9 +1,5 @@
-DIST ocl-icd-2.1.3.tar.gz 419083 BLAKE2B 2cd12aeb199a263581c1e02babb206b5fa1747977aa6d09bca6aa15376a5c9206a57e944b50f02cb7d2bbe634ac3522659c85b40cf336d03be48bb15e874fcda SHA512 5d0704bed8a664950131c985fc32ffe5e078874945642417122df79c66bad804307192db49a561330268664ceb59756b268cf52201b809398efe58c85f823ad3
 DIST ocl-icd-2.2.11.tar.gz 455800 BLAKE2B 64da3670d3631dba06030d5f6764522fae6c868d4cf45b1a47a0e2b004831797ff7881353a34fb6fff64e4af5b9ebd475b800303ad1e37c7c11b265981ed22a3 SHA512 54d6a281f0fc04858323ef8d1764c5d2276d9a003853d5af5821a6dd24c74a744da0ff2204179a5877d0e3f156d03c83236797cd5ca88e6897457c75da6713cd
-DIST ocl-icd-2.2.3.tar.gz 446966 BLAKE2B 53a6f960370580f2ffa954089f8d31ea3c275e3f28561883b4ad3d79bee1904d991aeec00898ef6cb0080c604ffea8fcc22c1da8f812eb162cd158f4737eddf2 SHA512 da890da32cd61e42f610df472ac651d47edb1b014d98c25a778551fe6973bdb47753417b2eeab220a07f2862468845e3ac31a2e9631eac5eed05153f09da2cb9
-DIST ocl-icd-2.2.8.tar.gz 452374 BLAKE2B b204fa88f140f854d66f8f6c2ce71423b2e9b98f203350608f302f965749e190e3afd88a19306ad3e65fe267643ed37154a0f07456a987f31bd6c81d8ec6849e SHA512 4d0364616c105ec421a39cc6a38b3a835a63280188a1e19f595eff655d50581ab1af83d2aa26fec956d33b5f492789797b3a05e29897e4342d38521d8902da96
-EBUILD ocl-icd-2.1.3.ebuild 785 BLAKE2B 8dd76c1ee749195ee0d01c155e56a19089e57534aa29d1325e212a9196610ae7cfc2e4854e518fd14007602d9eff02f4b86d2d3ffbfe88e5841c265f914a39df SHA512 f1319e24d9b2aed25101d88af02c6aaa7f92422e0fd489d6c6c91cca22a39e9bf4385a5a9737cf21d6d63a847c50800ea4faee0765e56330775f24a48ba2c140
+DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 EBUILD ocl-icd-2.2.11.ebuild 801 BLAKE2B 34e88e64693625630d301237d243f1a8f2e59db4a5797a116993286e3efb843ef058a15121d28e4d19fa33c60b1fcbc5123fdbef0596703bb57b2a91e7e7f0e8 SHA512 63fe2318b11c70188abc8d22c13db5bf55acf6bbba71eedb527390bad7785d1d2bd3d3143674c1201c0af82ae25b9b45f1e92affecee223834949b439174d7fa
-EBUILD ocl-icd-2.2.3.ebuild 803 BLAKE2B 8a208b038ff82c909ec2b65dcdef890bd486b0a59b1078b8777b31156f200c5b16e58cee2906aa16c23a61c54dd2d754b7975ff449dfeaa76f1e1ccec17fc1ff SHA512 b225f62ff73ff9ff3f866b497c22fb3de34fa7905b03b31e5482a6f1362bb06385c7e2ae47144bad4c3b95c4d72658f5f0064d44bf094babcf2a5c24d2430a80
-EBUILD ocl-icd-2.2.8.ebuild 803 BLAKE2B d51593836d6f3bf3e2ff575c30014a7fdd995f134caa9e9103342c37a839c36dd17c1031c7b4e47509f9c9d7cae5fa0277fed9dae2708832e528000f9e65fde4 SHA512 cc99d57245181dc8e1ef7fbfc228cc4e2950418d47db4fd91f5d88bfcb8efab8edee1a1100f2f42675901c75d28df6343f0e76006861c23fd86bf34bb043f60d
-MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
+EBUILD ocl-icd-2.2.12.ebuild 1207 BLAKE2B 3ff11573a0001205aa5d38ec5a5ae53384d1c34346b48eed3815a9bb95bc69ae91da8174b22f15464c1f98286dc63582adb79127e4f8bd2215b177cbfc292f85 SHA512 4b7ce8f69739927209769c583790a839c5421e5a8d3384b477496fe0869d5a8c5e822133f7c382f8f8f5a517d4d4a71ee52fc0821782d7e9a7f4f3a9d13f5629
+MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79
diff --git a/dev-libs/ocl-icd/metadata.xml b/dev-libs/ocl-icd/metadata.xml
index f3de5f693ed8..1cfa787eaf17 100644
--- a/dev-libs/ocl-icd/metadata.xml
+++ b/dev-libs/ocl-icd/metadata.xml
@@ -5,4 +5,9 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <use>
+    <flag name="khronos-headers" restrict="&gt;dev-libs/ocl-icd-2.2.11-r1">
+      Install Khronos OpenCL headers.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-libs/ocl-icd/ocl-icd-2.1.3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.1.3.ebuild
deleted file mode 100644
index d66ceb609c61..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/524/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
new file mode 100644
index 000000000000..6d59cbc62107
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25"
+inherit autotools flag-o-matic multilib-minimal ruby-single
+
+DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
+HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
+SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+khronos-headers"
+
+DEPEND="${RUBY_DEPS}"
+RDEPEND="app-eselect/eselect-opencl"
+
+src_prepare() {
+	replace-flags -Os -O2 # bug 646122
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --enable-pthread-once
+}
+
+multilib_src_install() {
+	default
+
+	# Drop .la files
+	find "${D}" -name '*.la' -delete || die
+
+	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
+	dodir ${OCL_DIR}/{,include}
+
+	# Install vendor library
+	mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
+
+	# Install vendor headers
+	if use khronos-headers; then
+		cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers"
+	fi
+}
+
+pkg_postinst() {
+	eselect opencl set --use-old ${PN}
+}
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
deleted file mode 100644
index 6bdcf99bb97e..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/598/${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby
-	dev-ruby/rubygems"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
deleted file mode 100644
index 3ccb21b5d9bd..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/698/${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby
-	dev-ruby/rubygems"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 486a6da958c0..261d27b43864 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,7 +1,5 @@
-DIST onig-6.7.1.tar.gz 951650 BLAKE2B 475f6de4dca5579071777de9805a7676f8bf0ba0fff360a8231895882ce5535c80ee8f12bede3d1db17497efcc904c4653f4d15d559cf5ac180039563f0c14cd SHA512 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc
-DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9044ac807444403ea0ca602aeaa7ab86f70b9835c2042a2b48a65531c355d1f32ba22294403dc5a3f3ce895 SHA512 50005d7bccdfd5090181781c942e7814eb82ef1652453ce4bdf7f4e763344c87af84fb06c5240494d3774568913cbfc3b158e0a69edfbc1283eaeb7842dc0631
 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
-EBUILD oniguruma-6.7.1.ebuild 1014 BLAKE2B 7d7ffa3f662ddd4f5e9a13c7869c03e1a924ffc3ea7ea97e57b701405c73bff9e46c0f1645dd80da07d51d1c2529f8540b226e8dc6d5519dd01568895433208b SHA512 e88607585975fe4afaa432e92f8319d2e63691ebbbba61ab3ac41af2796e37df5d369ac6c6152230fd723113999c9f060ff02708a11cc3a231e9312b5bbe94a9
-EBUILD oniguruma-6.8.1.ebuild 968 BLAKE2B a83d76cf686f58abf1adc1e5c210dc84ec82d5b6f85789a72ad5f5314a4df8166e6c6e98348a107dcd732ec1dc755026db0b887a27fb0c567fd655c06c77a5da SHA512 9d12c6b3e6e41e69f0658ebe45fd09c4f075ced52023080e76c76e38fcca32f2704ec5aaee48d151a64bff4cb4dce8a812f5136699bf927b9237fdb150f94f91
+DIST onig-6.9.0.tar.gz 869809 BLAKE2B a60b0f99e3a6cda81f09a4dd1af98d0ca98b9127090723d50f4c22874042719a31bcd23f2e3b1fac1daf62d723b1c8884036b8543c4c83a7fe5e2ad8e4daf625 SHA512 75d0f0406ad4313332a10990157cede5c2738d2b9b6aa780a99d2651f185e1de12dba57c919ee58ccef0633b1d703e67935af5ea4b36895279457a189b8825df
 EBUILD oniguruma-6.8.2.ebuild 970 BLAKE2B 5925f193741dfb7f8da7be4389c6bddfc8bb618d537edd2ac9e2477287f18e9997fdf282872b30f846cf92aec1c30fcd1aeb4c6e58cdacb069acf6220ed01602 SHA512 37c46f50bfd281fd331e9f799b7f9957aee3fba71824f69b6e2bb3d7b078125c53976a0c6651956034f47c6dca8a2885939b1334a6719a8d9d44e0265b2b97d2
-MISC metadata.xml 898 BLAKE2B e2c9418b8a69edf7d702de74609e6a4122c5a51160869dabe820d07a5f9f2ef478fcea57b9348babe49066b78b6d1b5bd6f60b7798fa0eb8edf13ff4510d7858 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a
+EBUILD oniguruma-6.9.0.ebuild 978 BLAKE2B 4a07a3eb8d1d61f09126c71b431e3dad423febc29dcd8434a345931c17469e4530214c8dbc0e96fb8980955606daf4db84be0fdf17a08b78ce1842e7b627f357 SHA512 94fc81c18f9c908b6fc743f7df96f2702e708be2a2dec1eb9d8baba527f5d6e6db2444c57120fd898fe88974b34e71bd66a438a1ecb95bc9ff3f9d138c7f96d3
+MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/metadata.xml b/dev-libs/oniguruma/metadata.xml
index 355bf4764886..2dc293268b64 100644
--- a/dev-libs/oniguruma/metadata.xml
+++ b/dev-libs/oniguruma/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -15,9 +15,6 @@
     <subslots>Reflect ABI of libonig.so.</subslots>
   </slots>
   <use>
-    <flag name="combination-explosion-check">
-      enable combination explosion check
-    </flag>
     <flag name="crnl-as-line-terminator">
       enable CR+NL as line terminator
     </flag>
diff --git a/dev-libs/oniguruma/oniguruma-6.7.1.ebuild b/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
deleted file mode 100644
index 3fc38a5bd562..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.7.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"
-
-inherit multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable combination-explosion-check) \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.8.1.ebuild b/dev-libs/oniguruma/oniguruma-6.8.1.ebuild
deleted file mode 100644
index c985bacd2f95..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.8.1.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 multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.9.0.ebuild b/dev-libs/oniguruma/oniguruma-6.9.0.ebuild
new file mode 100644
index 000000000000..c37d24a66105
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2003-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+MY_P="onig-${PV}"
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d0698cbdb29b..785c3620b33a 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -24,5 +24,5 @@ DIST openssl-1.1.1.tar.gz 8337920 BLAKE2B 266fb97bad4e1e7c0694c67a065d6669560695
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-1.0.2p.ebuild 10101 BLAKE2B c0e4eb3bd9dd21687d7a4be4c329baa6ca569b97ec16a090d0b5eaece0171a6f656facaab06fe085592038dd3d9d9aded69a5426e8605a32c3af8f295f74f34f SHA512 fc0affd0d6fe6dc12a6301135c6fed7beb5ca74fb0940d0af05551b402e09b6e130acc19de6f7b2853278f743c44a5f8c7da773c5324877b95bdc25b1b51b623
 EBUILD openssl-1.1.0i.ebuild 9107 BLAKE2B 8bee8407c13fbd1cfc7e13b4d11fb57ce9dd494d3ca8cf6cbd34f9f0e57dff824e421c31fc29e408ebf3a752896dc631f045b32757f2d89bacd2b9a52abe4722 SHA512 0cf7fd1a3957e197ac6b0d61a384a673b8216b0a07a90f61708759ef80e59afa1ab8e9f5761c1896439ee0cc6902bdd5bc83f4723302c648944d10d78d8396f4
-EBUILD openssl-1.1.1.ebuild 7879 BLAKE2B 5e14c797a51486b7b1affdeec121e10e5d83bd017e042a0cb182ec3e3dbb8c9394082f0757911c0e46341c881c842f63cf90f3f708333827cf4d1be135bdb47c SHA512 c9f76da7864f61edfb4a99f203b684b7d0c20708eb4aa5b064b4b43096b69f7fafecb1cfbe5df8a9f67da33707cf19fdca9de0fb41049d7497b0de75564fbe67
+EBUILD openssl-1.1.1.ebuild 7877 BLAKE2B df40954123b720ad283e694d22406c79287bf394d7cc52a76badad76aa33a81e20a44aa25f79e16bcaaa2c87eddf68973653cafe6884c476baafed3aba5c95e9 SHA512 e41af66f74829bce5210e659e5a9330c319ee572eecfeec5c59bd11eb117e95ef5ff7e9e880299291231069100873148b562865322e87a5db7cadd64013e62f1
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.1.1.ebuild b/dev-libs/openssl/openssl-1.1.1.ebuild
index 4c92eedb393a..3b7cd3fc0197 100644
--- a/dev-libs/openssl/openssl-1.1.1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -59,7 +59,7 @@ src_prepare() {
 		-e $(has noman FEATURES \
 			&& echo '/^install:/s:install_docs::' \
 			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
 		Configurations/unix-Makefile.tmpl \
 		|| die
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index ec7a05c5acbe..da1674e57e2e 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -7,6 +7,7 @@ AUX protobuf-3.5.0-atomic_operations.patch 812 BLAKE2B f55d364fa5b7ee405d7cb9b08
 AUX protobuf-3.6.0-disable_no-warning-test.patch 965 BLAKE2B 6ec0b1fc9d9d0be4f6dc9bc023d65b6b04c98d624ca4d1926cff0554d774d7cffd8d3597383acff1b7aca1a92dff4dd8368d5d86f1612aace16ede836f025af5 SHA512 82e601a26e51903e6b193c50960024240aecd3ddeeba8b29f437c550ad0bd277573ea4f83bcd70b2a4187c7df2b25af2790de22fb6f009640c403a9502d703be
 AUX protobuf-3.6.0-protoc_input_output_files.patch 9632 BLAKE2B 6466f6f6cf08e7a9a89ced8281790593fa9ea85e029d59ff20bba8c9add16bbb039a44d1839516bb109b9a2b269773640b43e6137fb9ccf5f100ef4109ad2b8d SHA512 8ac3c42684869e1b45d0d1ec70912610eaaa6962bc14d9a89b1244f424af7d638b4905b6dbd7445cd5f54bc4520fc1fbae88c66d9f4a9169db879abd1fba2faf
 AUX protobuf-3.6.0-system_libraries.patch 6323 BLAKE2B 0fb8e389a58b76c592b592782900b48bb6c68e85fc159d4b9a59a43ab5a116916f7d9ef15cca392e5751f015a887f855631abb124b4d4109d51f6ba401059549 SHA512 ab58b9aa9d1398a15346d6e85611ad826f8e52744aa137ca4f138348b4738afc7c6cd27129f925f5142edac7e272d56da880a83b216b2ce264804d6967997728
+AUX protobuf-3.6.1-libatomic_linking.patch 1753 BLAKE2B 50f8ac92dfada973ebcd187fa508a46ddd5d4e034e2eade2a3fcbb35ffab771578b241fa9a5343b46e91c90c4507e1d3a75a1bebc3426dbb1694c0fbb8cc03bf SHA512 c8bcb885dcf7d2871136a6410750aad69a61450b5a4bc80df56246a5875e1e9895d2d63e9e9e6deda3c4e516cd07344b92619457ef41f4f2ff0710c774957466
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
@@ -14,5 +15,5 @@ DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94ae
 EBUILD protobuf-3.5.1.1.ebuild 2621 BLAKE2B f5d279625735d30a1025c414b20f60dd0385c7d8449fde3e45e6540fc1dcc90614c7e5d3c22c26ef89e7c0374f112ea84a5702ef679d01448923bfccb3364133 SHA512 fe1689582cbd86d2cb31bf85e44a1968524350b7fe62d2f97b20ec368e3046d567c746c26d7d773cba6f1d498f2527ad59dbb749e738458912e90b8b44d7e070
 EBUILD protobuf-3.5.2.ebuild 2491 BLAKE2B 7d13d39cca5329ea99664f9ebc22c38d5a88f013e0e8dabe7f8a8b4229b993943a7cba2cdb81c28e3070e9fc5a652185d17e988efc32883da34615a1453dd198 SHA512 5f4aa9d253c246d6420badffb87eb66939c3e2faf765426da34c85977431341e2ae7b9aac2595cbd24d1ae8be9ec836771b02e66508af84b74ddc0d695c3418d
 EBUILD protobuf-3.6.0.1.ebuild 2491 BLAKE2B 00444b7406baff1560defc88f3e3cde102cd24db454684fb2a919141fae3ba9000486b062f9a8128e0627930794af0f825555526d5a822363d944f2d064c7c52 SHA512 98ebec7694e6a0a47fa98b52371f74ca538f00ae649973e82eed51e4a3600e44c385a028dc3156c0a6c2232a305e317a95b389249090ebba6c77f77375ce49c1
-EBUILD protobuf-3.6.1.ebuild 2491 BLAKE2B 5bca8ad4099728658473282f8649d56321c5c5ff1e560a0b552fc3431b7cb3fef3ba2092c02c9fb799e8c3dddc42a3e454ea35b6c63b91038caa4c183a83feae SHA512 f6d59bf331d98a6805b5fd29d9b9fc37ecb5dbb1e23afa05e1bfb46eb48ee63f81e2b3088e0be13538619daef3f3c4f1e92f3b6717f37adc4a39d13a4a0619ba
+EBUILD protobuf-3.6.1.ebuild 2537 BLAKE2B f8ab500061fc434db98568270a6babc1b33a407997a5084d60378d851000cd9d4669bae169ff4091d3745005bb1c37618a1771d40a456d0664a9d052cd4bec38 SHA512 bd1c242e1741f51f5d4e4592226b8b2958ad788d2ef2224428dc2445b121e3efc38039549ca32b4991a61a721f4e63f728696253501acb21c2b8c7f52f2fdfed
 MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983
diff --git a/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch b/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch
new file mode 100644
index 000000000000..2b357b213170
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch
@@ -0,0 +1,49 @@
+https://github.com/protocolbuffers/protobuf/issues/5219
+https://github.com/protocolbuffers/protobuf/pull/5227
+https://github.com/protocolbuffers/protobuf/commit/56b40a8f055cfd05633054aed5d3466a6e058b72
+
+--- /configure.ac
++++ /configure.ac
+@@ -165,6 +165,22 @@
+ ])
+ AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1])
+ 
++dnl On some platforms, std::atomic needs a helper library
++AC_MSG_CHECKING(whether -latomic is needed)
++AC_LINK_IFELSE([AC_LANG_SOURCE([[
++  #include <atomic>
++  #include <cstdint>
++  std::atomic<std::int64_t> v;
++  int main() {
++    return v;
++  }
++]])], STD_ATOMIC_NEED_LIBATOMIC=no, STD_ATOMIC_NEED_LIBATOMIC=yes)
++AC_MSG_RESULT($STD_ATOMIC_NEED_LIBATOMIC)
++if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then
++  LIBATOMIC_LIBS="-latomic"
++fi
++AC_SUBST([LIBATOMIC_LIBS])
++
+ AS_IF([test "$with_protoc" != "no"], [
+   PROTOC=$with_protoc
+   AS_IF([test "$with_protoc" = "yes"], [
+--- /src/Makefile.am
++++ /src/Makefile.am
+@@ -163,7 +163,7 @@
+ 
+ lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
+ 
+-libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
++libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
+ libprotobuf_lite_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined
+ if HAVE_LD_VERSION_SCRIPT
+ libprotobuf_lite_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf-lite.map
+@@ -209,7 +209,7 @@
+   google/protobuf/io/zero_copy_stream.cc                       \
+   google/protobuf/io/zero_copy_stream_impl_lite.cc
+ 
+-libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
++libprotobuf_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
+ libprotobuf_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined
+ if HAVE_LD_VERSION_SCRIPT
+ libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map
diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild
index 3b3bdeaf3517..380f12778c9f 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
@@ -23,6 +23,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
 	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
 	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 4ac334fab553..fe43e4fe79c1 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,3 @@
-DIST qtkeychain-0.8.0.tar.gz 34686 BLAKE2B bb20ace4393e04a8c8167ce112499fed75615ed165824bfcbba6a243e374523ff397aa85eb324ee8d742295a1bd4618a363fae6f92aae74caf09b9ca18d76c1e SHA512 be83ebc665a7916e96a2fd9990c72cd29373196591cf557fa6f9691f332ab67cc5475cab240c3e50e76cb37e0b7f189f0a1f2c3a70a6f655918e1d2465ed2f33
 DIST qtkeychain-0.9.0.tar.gz 35614 BLAKE2B b8fbcc3737808f8415f703cd92dd1f036fd6d1d83c056562e0142f67a234ddc29ad7f029ce9f520c8bcf179d8b99b5cf8b702ad010763956ff0fb8ce3f030934 SHA512 d8e7895169e9746c234a156e00edb939926d14da1a5eadab7cb1e67790958973bfd11c9c04c6fa5cf776aafbd0af40dcd50c683f1c80bef60d47d1465bb350df
-EBUILD qtkeychain-0.8.0.ebuild 771 BLAKE2B 0cce7f8a6e103b0a982454fe6d6c3faf82d0b2bc69060a59a80e1cd2e766eb80d87329614e04e441b7471741bee23c67d6b463c13d24df8493b3fef4ec7fbbc5 SHA512 41a537d69f072adf00720c891382795d6c4cd38fc7936cf91517f5ee56005defddda4d51d16dd8317bad2d8afa23ee0bfc4a7e47689b3ee315efd1bc5fa04e8e
-EBUILD qtkeychain-0.9.0.ebuild 899 BLAKE2B b3eb1cd027c97c362d6555ea1d6ffd8e8d6b1a3f44bb1dce7d2caaa89a593ff84f806aea78a7bfbef3732f72ba1a52b7b038bf8ca6baafa79294331d6fda4723 SHA512 16a16f1e8f8a1a1bf59643ec18f1c8c179987ed6075abdbb127cb3cd1503b4c5a61d2e2bbdc3a5c9a5606e1d343a27111d90e7bc226f20a83ca65d626a94f751
+EBUILD qtkeychain-0.9.0.ebuild 898 BLAKE2B ebc33253cd15e667f49e9fcb25743fa7578ea4a46512a41d992ff6ef14803e37aa58393377b66785e59e4990436b25d5b9ef5c1e3429bfdced8d3789dc6bf739 SHA512 01084d23b92c7da46a44bb2b16cd4eca4f82750c23c962306dc7ba3ed3dded92215bd16d6e933257106694cef594ed67fabdb97040ddd48fd5b52ad7e4a3d4cb
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
deleted file mode 100644
index 3c29800f75b1..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Qt API for storing passwords securely"
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gnome-keyring"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-"
-
-DOCS=( ChangeLog ReadMe.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT4=OFF
-		-DQTKEYCHAIN_STATIC=OFF
-		-DBUILD_TRANSLATIONS=ON
-		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
index 955b422dd8ce..78480512c988 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt API for storing passwords securely"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}.git"
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index 3d6a2cd7bb8c..6d2282f07e34 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,8 +1,5 @@
-AUX urdfdom1.patch 15931 BLAKE2B abd7a35201cc3e768555ce6c1d99ff0c2fba45cb86891abe26970f0fedde3190ab8a07f2f6f9037640bb43bd94334b010dd8b51c1fea9577a03abff88c86ba33 SHA512 3acc8f2c3e7908a09e5e71d64d13bfc6f439c0a83c56ec2b70ec1ec1491483d370f837e70db9872d02f1e1c77c0127263d8e28ccb8d5ac44c527d664a2b1694d
-DIST sdformat-5.2.0.tar.bz2 445542 BLAKE2B 89daf9e03613bd88aceb1a2034cf0f9efe7b28ffb7aef8add4fc484a6e78d7189b4b6183fca83db4bb8017a4901d2fb3df7dc43e995bf2da8bb0fcde9510c6c9 SHA512 65df9f0d351ab894af41cc2081dc8ab179336092ceba17979720bed4d58f77e9648863501d83f073ea8478197e7e0a7d7a9f8efd3a54d22ee28d74765cebcee7
-DIST sdformat-5.3.0.tar.bz2 447471 BLAKE2B 9b511782f5d2517778fc0c977d1deab00ee7789f50628546b5ca8c1f464cc3ca132b83e1054867ec1d6678bca664232e1d9a499ff095d4f9a623f5061fc340c1 SHA512 63106bc438decb00157eca5fd3f7f783197a1f17a76008bee5d18d5c146f199e67852ef74cbbc53918760a0cdf382628ea84d2b4618512738cd574de1fc719d8
 DIST sdformat-6.0.0.tar.bz2 473765 BLAKE2B af3ed14323c2bed8ee5a22580dcb6d73a5e5c772f39ad7f806bf2cdb88d6f2c885585f36a666f2ec711dbd7ad6051ba69d79d2a9f0af7ad3b3681543b9feafe7 SHA512 2188de97cb1eb1117a694d54a0a42112bd7e5b5a4b00c04e049de73a10947904940565e36df93ca08ea5910e628983e234d07c57694c463e0794c48e20cedb21
-EBUILD sdformat-5.2.0.ebuild 984 BLAKE2B a1ba8fb82e2424fd57be0d9eea2acf71088eda48d49e933d40c83cf89814b100f04f13a6490ec652218e47da7024b9cf16ff5951e8d0db08659f296eb030e5c0 SHA512 a6dedd6d405c876665d85fe6c7b21fde03563e374d04a84587e7dffb1efb63e55cb6f53946e74f4749114cee3e80219f2adddc94a8a7dabe65ba028a55de8e7a
-EBUILD sdformat-5.3.0.ebuild 984 BLAKE2B a1ba8fb82e2424fd57be0d9eea2acf71088eda48d49e933d40c83cf89814b100f04f13a6490ec652218e47da7024b9cf16ff5951e8d0db08659f296eb030e5c0 SHA512 a6dedd6d405c876665d85fe6c7b21fde03563e374d04a84587e7dffb1efb63e55cb6f53946e74f4749114cee3e80219f2adddc94a8a7dabe65ba028a55de8e7a
+DIST sdformat-6.1.0.tar.bz2 465231 BLAKE2B 5b12c4974662245ecb01e342632e274b58512dd2c223dfbf8e1ef9bb2ba267f16bc130b62367b09a9cac9e2ccbd2829439d055f2fa062f34df9f4a6ceb1a571e SHA512 6c5a03e877cba3b734f1cb132582274249bd0cb3a8d463be9077519d8ad126bb15650947b5455b3cdd1abea727918b21369b40a12de4fc5d6806880fd8686b97
 EBUILD sdformat-6.0.0.ebuild 944 BLAKE2B 1f9dd5d2c061f0964e8e3314d0cc68e09c5cee6861418eac1578f002ec016119000e5e2b7b516da129b7ee57c3399de75adc7355651ff5954a80f1a28c776226 SHA512 0d3563149ef99bb6805f02c71365378ffd7ea630251d52d8e7b818070ecc87c581d3a792b347c345955845e07e7ebfda08c79fe26ad23251bdb925e26e252e83
+EBUILD sdformat-6.1.0.ebuild 941 BLAKE2B 0fe4f1798fb5dd32f9b156ae629d37a30581018f31699e33144098e76152ba05d61fe8e01d604b2f1f183fd65dca5d3a62147a97a4af667b33187b03d00d368a SHA512 a5d7d31c0d4dd7d05d08737382b8b96e22d875ce28462a06300fc6db8063617b2c65fc8645b5f94053bb37a917f03057ecdcf621cba3303bb519d0f3d4339a77
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/dev-libs/sdformat/files/urdfdom1.patch b/dev-libs/sdformat/files/urdfdom1.patch
deleted file mode 100644
index d76376aec016..000000000000
--- a/dev-libs/sdformat/files/urdfdom1.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-Index: sdformat-4.1.1/src/parser_urdf.cc
-===================================================================
---- sdformat-4.1.1.orig/src/parser_urdf.cc
-+++ sdformat-4.1.1/src/parser_urdf.cc
-@@ -25,6 +25,7 @@
- #include "urdf_model/model.h"
- #include "urdf_model/link.h"
- #include "urdf_parser/urdf_parser.h"
-+#include <urdf_model/utils.h>
- 
- #include "sdf/SDFExtension.hh"
- #include "sdf/parser_urdf.hh"
-@@ -32,10 +33,10 @@
- 
- using namespace sdf;
- 
--typedef boost::shared_ptr<urdf::Collision> UrdfCollisionPtr;
--typedef boost::shared_ptr<urdf::Visual> UrdfVisualPtr;
--typedef boost::shared_ptr<urdf::Link> UrdfLinkPtr;
--typedef boost::shared_ptr<const urdf::Link> ConstUrdfLinkPtr;
-+typedef std::shared_ptr<urdf::Collision> UrdfCollisionPtr;
-+typedef std::shared_ptr<urdf::Visual> UrdfVisualPtr;
-+typedef std::shared_ptr<urdf::Link> UrdfLinkPtr;
-+typedef std::shared_ptr<const urdf::Link> ConstUrdfLinkPtr;
- typedef std::shared_ptr<TiXmlElement> TiXmlElementPtr;
- typedef std::shared_ptr<SDFExtension> SDFExtensionPtr;
- typedef std::map<std::string, std::vector<SDFExtensionPtr> >
-@@ -78,7 +79,7 @@ void InsertSDFExtensionJoint(TiXmlElemen
- /// reduced fixed joints:  check if a fixed joint should be lumped
- ///   checking both the joint type and if disabledFixedJointLumping
- ///   option is set
--bool FixedJointShouldBeReduced(boost::shared_ptr<urdf::Joint> _jnt);
-+bool FixedJointShouldBeReduced(std::shared_ptr<urdf::Joint> _jnt);
- 
- /// reduced fixed joints:  apply transform reduction for ray sensors
- ///   in extensions when doing fixed joint reduction
-@@ -217,9 +218,9 @@ std::string Values2str(unsigned int _cou
- 
- 
- void CreateGeometry(TiXmlElement* _elem,
--    boost::shared_ptr<urdf::Geometry> _geometry);
-+    std::shared_ptr<urdf::Geometry> _geometry);
- 
--std::string GetGeometryBoundingBox(boost::shared_ptr<urdf::Geometry> _geometry,
-+std::string GetGeometryBoundingBox(std::shared_ptr<urdf::Geometry> _geometry,
-     double *_sizeVals);
- 
- ignition::math::Pose3d inverseTransformToParentFrame(
-@@ -254,7 +255,7 @@ urdf::Vector3 ParseVector3(const std::st
-   std::vector<std::string> pieces;
-   std::vector<double> vals;
- 
--  boost::split(pieces, _str, boost::is_any_of(" "));
-+  urdf::split_string(pieces, _str, " ");
-   for (unsigned int i = 0; i < pieces.size(); ++i)
-   {
-     if (pieces[i] != "")
-@@ -262,7 +263,7 @@ urdf::Vector3 ParseVector3(const std::st
-       try
-       {
-         vals.push_back(_scale
--            * boost::lexical_cast<double>(pieces[i].c_str()));
-+            * std::stod(pieces[i].c_str()));
-       }
-       catch(boost::bad_lexical_cast &)
-       {
-@@ -349,7 +350,7 @@ void ReduceCollisionToParent(UrdfLinkPtr
-     UrdfCollisionPtr _collision)
- {
- #ifndef URDF_GE_0P3
--  boost::shared_ptr<std::vector<UrdfCollisionPtr> > cols;
-+  std::shared_ptr<std::vector<UrdfCollisionPtr> > cols;
-   cols = _parentLink->getCollisions(_name);
- 
-   if (!cols)
-@@ -427,7 +428,7 @@ void ReduceVisualToParent(UrdfLinkPtr _p
-     UrdfVisualPtr _visual)
- {
- #ifndef URDF_GE_0P3
--  boost::shared_ptr<std::vector<UrdfVisualPtr> > viss;
-+  std::shared_ptr<std::vector<UrdfVisualPtr> > viss;
-   viss = _parentLink->getVisuals(_name);
- 
-   if (!viss)
-@@ -950,7 +951,7 @@ void ReduceVisualsToParent(UrdfLinkPtr _
-   // (original parent link name before lumping/reducing).
- #ifndef URDF_GE_0P3
-   for (std::map<std::string,
--      boost::shared_ptr<std::vector<UrdfVisualPtr> > >::iterator
-+      std::shared_ptr<std::vector<UrdfVisualPtr> > >::iterator
-       visualsIt = _link->visual_groups.begin();
-       visualsIt != _link->visual_groups.end(); ++visualsIt)
-   {
-@@ -1057,7 +1058,7 @@ void ReduceCollisionsToParent(UrdfLinkPt
-   // (original parent link name before lumping/reducing).
- #ifndef URDF_GE_0P3
-   for (std::map<std::string,
--      boost::shared_ptr<std::vector<UrdfCollisionPtr> > >::iterator
-+      std::shared_ptr<std::vector<UrdfCollisionPtr> > >::iterator
-       collisionsIt = _link->collision_groups.begin();
-       collisionsIt != _link->collision_groups.end(); ++collisionsIt)
-   {
-@@ -1160,7 +1161,7 @@ void ReduceJointsToParent(UrdfLinkPtr _l
-   // a parent link up stream that does not have a fixed parentJoint
-   for (unsigned int i = 0 ; i < _link->child_links.size() ; ++i)
-   {
--    boost::shared_ptr<urdf::Joint> parentJoint =
-+    std::shared_ptr<urdf::Joint> parentJoint =
-       _link->child_links[i]->parent_joint;
-     if (!FixedJointShouldBeReduced(parentJoint))
-     {
-@@ -1431,31 +1432,31 @@ void URDF2SDF::ParseSDFExtension(TiXmlDo
-       else if (childElem->ValueStr() == "dampingFactor")
-       {
-         sdf->isDampingFactor = true;
--        sdf->dampingFactor = boost::lexical_cast<double>(
-+        sdf->dampingFactor = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "maxVel")
-       {
-         sdf->isMaxVel = true;
--        sdf->maxVel = boost::lexical_cast<double>(
-+        sdf->maxVel = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "minDepth")
-       {
-         sdf->isMinDepth = true;
--        sdf->minDepth = boost::lexical_cast<double>(
-+        sdf->minDepth = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "mu1")
-       {
-         sdf->isMu1 = true;
--        sdf->mu1 = boost::lexical_cast<double>(
-+        sdf->mu1 = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "mu2")
-       {
-         sdf->isMu2 = true;
--        sdf->mu2 = boost::lexical_cast<double>(
-+        sdf->mu2 = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "fdir1")
-@@ -1465,13 +1466,13 @@ void URDF2SDF::ParseSDFExtension(TiXmlDo
-       else if (childElem->ValueStr() == "kp")
-       {
-         sdf->isKp = true;
--        sdf->kp = boost::lexical_cast<double>(
-+        sdf->kp = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "kd")
-       {
-         sdf->isKd = true;
--        sdf->kd = boost::lexical_cast<double>(
-+        sdf->kd = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "selfCollide")
-@@ -1488,13 +1489,13 @@ void URDF2SDF::ParseSDFExtension(TiXmlDo
-       else if (childElem->ValueStr() == "maxContacts")
-       {
-         sdf->isMaxContacts = true;
--        sdf->maxContacts = boost::lexical_cast<int>(
-+        sdf->maxContacts = std::stoi(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "laserRetro")
-       {
-         sdf->isLaserRetro = true;
--        sdf->laserRetro = boost::lexical_cast<double>(
-+        sdf->laserRetro = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "springReference")
-@@ -1510,37 +1511,37 @@ void URDF2SDF::ParseSDFExtension(TiXmlDo
-       else if (childElem->ValueStr() == "stopCfm")
-       {
-         sdf->isStopCfm = true;
--        sdf->stopCfm = boost::lexical_cast<double>(
-+        sdf->stopCfm = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "stopErp")
-       {
-         sdf->isStopErp = true;
--        sdf->stopErp = boost::lexical_cast<double>(
-+        sdf->stopErp = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "stopKp")
-       {
-         sdf->isStopKp = true;
--        sdf->stopKp = boost::lexical_cast<double>(
-+        sdf->stopKp = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "stopKd")
-       {
-         sdf->isStopKd = true;
--        sdf->stopKd = boost::lexical_cast<double>(
-+        sdf->stopKd = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "initialJointPosition")
-       {
-         sdf->isInitialJointPosition = true;
--        sdf->initialJointPosition = boost::lexical_cast<double>(
-+        sdf->initialJointPosition = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "fudgeFactor")
-       {
-         sdf->isFudgeFactor = true;
--        sdf->fudgeFactor = boost::lexical_cast<double>(
-+        sdf->fudgeFactor = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "provideFeedback")
-@@ -1917,7 +1918,7 @@ void InsertSDFExtensionCollision(TiXmlEl
-           if ((*ge)->isMaxContacts)
-           {
-             AddKeyValue(_elem, "max_contacts",
--                boost::lexical_cast<std::string>((*ge)->maxContacts));
-+                std::to_string((*ge)->maxContacts));
-           }
-         }
-       }
-@@ -2339,7 +2340,7 @@ void InsertSDFExtensionRobot(TiXmlElemen
- 
- ////////////////////////////////////////////////////////////////////////////////
- void CreateGeometry(TiXmlElement* _elem,
--    boost::shared_ptr<urdf::Geometry> _geom)
-+    std::shared_ptr<urdf::Geometry> _geom)
- {
-   TiXmlElement *sdfGeometry = new TiXmlElement("geometry");
- 
-@@ -2351,8 +2352,8 @@ void CreateGeometry(TiXmlElement* _elem,
-     case urdf::Geometry::BOX:
-       type = "box";
-       {
--        boost::shared_ptr<const urdf::Box> box;
--        box = boost::dynamic_pointer_cast< const urdf::Box >(_geom);
-+        std::shared_ptr<const urdf::Box> box;
-+        box = std::dynamic_pointer_cast< const urdf::Box >(_geom);
-         int sizeCount = 3;
-         double sizeVals[3];
-         sizeVals[0] = box->dim.x;
-@@ -2366,8 +2367,8 @@ void CreateGeometry(TiXmlElement* _elem,
-     case urdf::Geometry::CYLINDER:
-       type = "cylinder";
-       {
--        boost::shared_ptr<const urdf::Cylinder> cylinder;
--        cylinder = boost::dynamic_pointer_cast<const urdf::Cylinder >(_geom);
-+        std::shared_ptr<const urdf::Cylinder> cylinder;
-+        cylinder = std::dynamic_pointer_cast<const urdf::Cylinder >(_geom);
-         geometryType = new TiXmlElement(type);
-         AddKeyValue(geometryType, "length",
-             Values2str(1, &cylinder->length));
-@@ -2378,8 +2379,8 @@ void CreateGeometry(TiXmlElement* _elem,
-     case urdf::Geometry::SPHERE:
-       type = "sphere";
-       {
--        boost::shared_ptr<const urdf::Sphere> sphere;
--        sphere = boost::dynamic_pointer_cast<const urdf::Sphere >(_geom);
-+        std::shared_ptr<const urdf::Sphere> sphere;
-+        sphere = std::dynamic_pointer_cast<const urdf::Sphere >(_geom);
-         geometryType = new TiXmlElement(type);
-         AddKeyValue(geometryType, "radius",
-             Values2str(1, &sphere->radius));
-@@ -2388,8 +2389,8 @@ void CreateGeometry(TiXmlElement* _elem,
-     case urdf::Geometry::MESH:
-       type = "mesh";
-       {
--        boost::shared_ptr<const urdf::Mesh> mesh;
--        mesh = boost::dynamic_pointer_cast<const urdf::Mesh >(_geom);
-+        std::shared_ptr<const urdf::Mesh> mesh;
-+        mesh = std::dynamic_pointer_cast<const urdf::Mesh >(_geom);
-         geometryType = new TiXmlElement(type);
-         AddKeyValue(geometryType, "scale", Vector32Str(mesh->scale));
-         // do something more to meshes
-@@ -2451,7 +2452,7 @@ void CreateGeometry(TiXmlElement* _elem,
- 
- ////////////////////////////////////////////////////////////////////////////////
- std::string GetGeometryBoundingBox(
--    boost::shared_ptr<urdf::Geometry> _geom, double *_sizeVals)
-+    std::shared_ptr<urdf::Geometry> _geom, double *_sizeVals)
- {
-   std::string type;
- 
-@@ -2460,8 +2461,8 @@ std::string GetGeometryBoundingBox(
-     case urdf::Geometry::BOX:
-       type = "box";
-       {
--        boost::shared_ptr<const urdf::Box> box;
--        box = boost::dynamic_pointer_cast<const urdf::Box >(_geom);
-+        std::shared_ptr<const urdf::Box> box;
-+        box = std::dynamic_pointer_cast<const urdf::Box >(_geom);
-         _sizeVals[0] = box->dim.x;
-         _sizeVals[1] = box->dim.y;
-         _sizeVals[2] = box->dim.z;
-@@ -2470,8 +2471,8 @@ std::string GetGeometryBoundingBox(
-     case urdf::Geometry::CYLINDER:
-       type = "cylinder";
-       {
--        boost::shared_ptr<const urdf::Cylinder> cylinder;
--        cylinder = boost::dynamic_pointer_cast<const urdf::Cylinder >(_geom);
-+        std::shared_ptr<const urdf::Cylinder> cylinder;
-+        cylinder = std::dynamic_pointer_cast<const urdf::Cylinder >(_geom);
-         _sizeVals[0] = cylinder->radius * 2;
-         _sizeVals[1] = cylinder->radius * 2;
-         _sizeVals[2] = cylinder->length;
-@@ -2480,16 +2481,16 @@ std::string GetGeometryBoundingBox(
-     case urdf::Geometry::SPHERE:
-       type = "sphere";
-       {
--        boost::shared_ptr<const urdf::Sphere> sphere;
--        sphere = boost::dynamic_pointer_cast<const urdf::Sphere >(_geom);
-+        std::shared_ptr<const urdf::Sphere> sphere;
-+        sphere = std::dynamic_pointer_cast<const urdf::Sphere >(_geom);
-         _sizeVals[0] = _sizeVals[1] = _sizeVals[2] = sphere->radius * 2;
-       }
-       break;
-     case urdf::Geometry::MESH:
-       type = "trimesh";
-       {
--        boost::shared_ptr<const urdf::Mesh> mesh;
--        mesh = boost::dynamic_pointer_cast<const urdf::Mesh >(_geom);
-+        std::shared_ptr<const urdf::Mesh> mesh;
-+        mesh = std::dynamic_pointer_cast<const urdf::Mesh >(_geom);
-         _sizeVals[0] = mesh->scale.x;
-         _sizeVals[1] = mesh->scale.y;
-         _sizeVals[2] = mesh->scale.z;
-@@ -2513,7 +2514,7 @@ void PrintCollisionGroups(UrdfLinkPtr _l
-     << static_cast<int>(_link->collision_groups.size())
-     << "] collisions.\n";
-   for (std::map<std::string,
--      boost::shared_ptr<std::vector<UrdfCollisionPtr > > >::iterator
-+      std::shared_ptr<std::vector<UrdfCollisionPtr > > >::iterator
-       colsIt = _link->collision_groups.begin();
-       colsIt != _link->collision_groups.end(); ++colsIt)
-   {
-@@ -2906,7 +2907,7 @@ void CreateCollisions(TiXmlElement* _ele
-   //   lumped meshes (fixed joint reduction)
- #ifndef URDF_GE_0P3
-   for (std::map<std::string,
--      boost::shared_ptr<std::vector<UrdfCollisionPtr> > >::const_iterator
-+      std::shared_ptr<std::vector<UrdfCollisionPtr> > >::const_iterator
-       collisionsIt = _link->collision_groups.begin();
-       collisionsIt != _link->collision_groups.end(); ++collisionsIt)
-   {
-@@ -3028,7 +3029,7 @@ void CreateVisuals(TiXmlElement* _elem,
-   //   lumped meshes (fixed joint reduction)
- #ifndef URDF_GE_0P3
-   for (std::map<std::string,
--      boost::shared_ptr<std::vector<UrdfVisualPtr> > >::const_iterator
-+      std::shared_ptr<std::vector<UrdfVisualPtr> > >::const_iterator
-       visualsIt = _link->visual_groups.begin();
-       visualsIt != _link->visual_groups.end(); ++visualsIt)
-   {
-@@ -3411,7 +3412,7 @@ TiXmlDocument URDF2SDF::InitModelString(
-   g_enforceLimits = _enforceLimits;
- 
-   // Create a RobotModel from string
--  boost::shared_ptr<urdf::ModelInterface> robotModel =
-+  std::shared_ptr<urdf::ModelInterface> robotModel =
-     urdf::parseURDF(_urdfStr.c_str());
- 
-   // an xml object to hold the xml result
-@@ -3453,7 +3454,7 @@ TiXmlDocument URDF2SDF::InitModelString(
-   // fixed joint lumping only for selected joints
-   if (g_reduceFixedJoints)
-     ReduceFixedJoints(robot,
--        (boost::const_pointer_cast< urdf::Link >(rootLink)));
-+        (std::const_pointer_cast< urdf::Link >(rootLink)));
- 
-   if (rootLink->name == "world")
-   {
-@@ -3514,7 +3515,7 @@ TiXmlDocument URDF2SDF::InitModelFile(co
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--bool FixedJointShouldBeReduced(boost::shared_ptr<urdf::Joint> _jnt)
-+bool FixedJointShouldBeReduced(std::shared_ptr<urdf::Joint> _jnt)
- {
-     // A joint should be lumped only if its type is fixed and
-     // the disabledFixedJointLumping joint option is not set
diff --git a/dev-libs/sdformat/sdformat-5.2.0.ebuild b/dev-libs/sdformat/sdformat-5.2.0.ebuild
deleted file mode 100644
index c3c7512d27ef..000000000000
--- a/dev-libs/sdformat/sdformat-5.2.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=5
-
-inherit cmake-utils
-
-DESCRIPTION="Simulation Description Format (SDF) parser"
-HOMEPAGE="http://sdformat.org/"
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# subslot = libsdformat major
-SLOT="0/5"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/urdfdom-1:=
-	dev-libs/tinyxml
-	dev-libs/boost:=
-	sci-libs/ignition-math:3=
-"
-DEPEND="${RDEPEND}
-	dev-lang/ruby:*
-	virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/urdfdom1.patch" )
-
-src_configure() {
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	local mycmakeargs=(
-		"-DUSE_EXTERNAL_URDF=ON"
-		"-DUSE_EXTERNAL_TINYXML=ON"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/sdformat/sdformat-5.3.0.ebuild b/dev-libs/sdformat/sdformat-5.3.0.ebuild
deleted file mode 100644
index c3c7512d27ef..000000000000
--- a/dev-libs/sdformat/sdformat-5.3.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=5
-
-inherit cmake-utils
-
-DESCRIPTION="Simulation Description Format (SDF) parser"
-HOMEPAGE="http://sdformat.org/"
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# subslot = libsdformat major
-SLOT="0/5"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/urdfdom-1:=
-	dev-libs/tinyxml
-	dev-libs/boost:=
-	sci-libs/ignition-math:3=
-"
-DEPEND="${RDEPEND}
-	dev-lang/ruby:*
-	virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/urdfdom1.patch" )
-
-src_configure() {
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	local mycmakeargs=(
-		"-DUSE_EXTERNAL_URDF=ON"
-		"-DUSE_EXTERNAL_TINYXML=ON"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/sdformat/sdformat-6.1.0.ebuild b/dev-libs/sdformat/sdformat-6.1.0.ebuild
new file mode 100644
index 000000000000..bc8209246277
--- /dev/null
+++ b/dev-libs/sdformat/sdformat-6.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Simulation Description Format (SDF) parser"
+HOMEPAGE="http://sdformat.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# subslot = libsdformat major
+SLOT="0/6"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/urdfdom-1:=
+	dev-libs/tinyxml
+	dev-libs/boost:=
+	sci-libs/ignition-math:4=
+"
+DEPEND="${RDEPEND}
+	dev-lang/ruby:*
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_configure() {
+	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
+	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
+	local mycmakeargs=(
+		"-DUSE_INTERNAL_URDF=OFF"
+		"-DUSE_EXTERNAL_TINYXML=ON"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index 5af6f4dc9fd3..faa70a35ecc2 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,3 @@
-DIST sink-0.5.0.tar.gz 330203 BLAKE2B 5b0448dfb984c1aa4bdb913f8ce5e5e4e3f1a6ee33d840ed3d9fdf9e0ea6003a928970d2e6dc25e824241768da9abed7dce31ef857e4986990aad16e7aecd667 SHA512 e47f3d99b934abb184a5f8293f1a092fccabe0bb550573cd8c35918471a4caa94eaaec0361c43376c93cdb480612dd0f78626d6649077f777c5cccc8c5d4389f
-EBUILD sink-0.5.0.ebuild 1226 BLAKE2B 39c490f401de52a044d153367360a12eab7f3b9837c8c16673f5f245165918da7fcc73fcdba1c720366f402a614d96d0a6925ed73709a19f1c490d4fba1b9deb SHA512 60c1461bf91bc959e22813611989bd9e30e06398134246bcc47c55dd9e7787971c3928ac26a203fc035f945d387faecd6fb922ebf22ba2c425de4ddd6a772050
+DIST sink-0.7.0.tar.gz 383090 BLAKE2B b853609889ead6f623c7288b9dfe8dba0388dc0d5e8f28d9967fa9be1d78b10bafd9d4674f11355bfe60506843d2abe033149c448ff293329db558ed00fef18b SHA512 591838cb9c76d89c1794b94b02bff3d67155e1f27ae32b7ac9369d15aa109130c7792f30e74b61009765e7b7cb78141bf5e3c93304d814bce22bf91059339fd0
+EBUILD sink-0.7.0.ebuild 1280 BLAKE2B b291dee7303f8f6fe2575ee21092204f3f98ed28633d72bbdb39850c11a1096c70e5e135d6c18e29b52449490a807d7397716c1cef1eb71739d8921fc7cc5259 SHA512 3e280a86919ff93e88505b7183cd10dd0393a843cae1ce225e2b18015925c342e688eaecd40e880c6aa011862a1204d3b97a99c1727598406f96d189e78c70ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/sink/sink-0.5.0.ebuild b/dev-libs/sink/sink-0.5.0.ebuild
deleted file mode 100644
index d83a654f28bb..000000000000
--- a/dev-libs/sink/sink-0.5.0.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_TEST="false" # build breaks otherwise. tests not isolated.
-inherit kde5
-
-DESCRIPTION="A data access layer handling synchronization, caching and indexing"
-SRC_URI="https://github.com/KDE/sink/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-# qtgui is bogus but is required because something else in the deptree
-# uses it as a public dependency but doesn't search for it properly
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	dev-db/lmdb:=
-	dev-libs/flatbuffers
-	dev-libs/kasync
-	net-libs/kdav2
-	net-libs/kimap2
-	net-misc/curl
-	sys-libs/readline:0=
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-
-# fails to build
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	# FIXME: sink is useless without its 'examples'. Workaround our eclass
-	sed -i -e "/add_subdirectory(examples)/ s/#DONOTCOMPILE //" \
-		CMakeLists.txt || die "Failed to fix CMakeLists.txt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
-	)
-	kde5_src_configure
-}
diff --git a/dev-libs/sink/sink-0.7.0.ebuild b/dev-libs/sink/sink-0.7.0.ebuild
new file mode 100644
index 000000000000..c2e8a3d3fa4b
--- /dev/null
+++ b/dev-libs/sink/sink-0.7.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false" # build breaks otherwise. tests not isolated.
+inherit kde5
+
+DESCRIPTION="A data access layer handling synchronization, caching and indexing"
+SRC_URI="https://github.com/KDE/sink/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+# qtgui is bogus but is required because something else in the deptree
+# uses it as a public dependency but doesn't search for it properly
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	dev-db/lmdb:=
+	dev-libs/flatbuffers
+	dev-libs/kasync
+	>=dev-libs/xapian-1.4.4:0=
+	net-libs/kdav2
+	net-libs/kimap2
+	net-misc/curl
+	sys-libs/readline:0=
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+
+# fails to build
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+	# FIXME: sink is useless without its 'examples'. Workaround our eclass
+	sed -i -e "/add_subdirectory(examples)/ s/#DONOTCOMPILE //" \
+		CMakeLists.txt || die "Failed to fix CMakeLists.txt"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
+	)
+	kde5_src_configure
+}
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index ae18d1055bab..62bff63a8cb1 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -2,8 +2,10 @@ DIST skalibs-2.3.2.0.tar.gz 205976 BLAKE2B 01e1694515093494d0d216e5b5f17524118c6
 DIST skalibs-2.6.1.0.tar.gz 210504 BLAKE2B 47be3c920d7e0db9baa5982c5e1273e3132636d84767b5a0087bcbda0c18039b0ca26428c1db9a33a0ed5186a9c94860c73aaccd7ecf38da21e56e9b3e5ffb4d SHA512 52db44f398bcc08a2b4243a32254fef87d11f152dd6e9f8fa85dcc548fff5dcd1ef83ffbd32aa572837f344f9a3e4a31f156edd5ad6b4274d8138fbf24213a57
 DIST skalibs-2.6.3.0.tar.gz 224463 BLAKE2B 0b051cb027b2c7335c5b6d581aeb8ff4fce8262b58551a9a0ec87d03148280a66be07a0f589731c65ef9b5298e64be93a5bd2a45818bc131cb2df5f31ac1040e SHA512 4f904cde17fa91070317b9ddd542715c5b4e19a8ccb3ae3b2eb014a782ae66b38033f7f5614d92cfb64e251aa4e97e11c03695f161cdd2b122b61fd3e627af9a
 DIST skalibs-2.6.4.0.tar.gz 226780 BLAKE2B 80d01d3696452b54d0247c8e523c059bb5ecd59fdea0d18a80992c3db70deab935fce13b5559835f98ccfacf81a2a81e8a6b432b67f851a42f8441f7f7ecc19e SHA512 19062853bd9df0dadeceaab96aca9d2a68d93aada7552d306902d1b13c55d421bbff7fd37dccaf1a81d66bbecf43ed2242961fdb7bd51ff22e9b6114c1b2bb77
+DIST skalibs-2.7.0.0.tar.gz 226543 BLAKE2B be626eed2f6b898c3b1cf6026f527730146a5c4175a76e43a2c9e0b22d7063de84378668e7e1c28c183b8ea9e187e92f86a1de06294ab708562f17ae7ae70b04 SHA512 33624b606a0846478e6fde10057633b43e76bda299d067cff269582c252f05108ebf28c539865c7f24b67e99575328fc7789326dfbb2e81bf209aa51445f04a1
 EBUILD skalibs-2.3.2.0.ebuild 1030 BLAKE2B 9a929766737a4e0a0f32fcdfe31d37d6bf1a0a12d921b22f4c25947183b59eff0ae70dc74f350b2043a4ab1b864b763a65014542ed3a69b9ff34672adf465f78 SHA512 ff52e56a44d1ec81ed2e21fb0bfd91e42b88228f19b63b32b843b90b103cfb971e7f9e94086e2afbbe0ae37d64d24aa637a8f54ce7c720f12eed2efefeffc578
 EBUILD skalibs-2.6.1.0.ebuild 1102 BLAKE2B 6e9f79ea36986f7695841068d69eb5fdf791b0dcd4982deb854983e9d2f30b2616b265e51c1b860df6b485d6178d94f9bb1a12df4d240182814d0e7f9aec5283 SHA512 f9afc8de965ca315a935cbccffc1083a165f8d2a6ac1742b431f21b666def320bd5ecad49a02bfa30c64fb97cc0bf2be3a77660741cb60af7c8c369873f956a4
 EBUILD skalibs-2.6.3.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
 EBUILD skalibs-2.6.4.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
+EBUILD skalibs-2.7.0.0.ebuild 962 BLAKE2B 9021ed99abba3ade6a91c7114f82dbbbd67d74e0fe6a25d161899e15c8a3633bb51221dd8a23ee3c71047d006333f8cc2322a01a91ed0bb8ca5525cc0d71bbdf SHA512 99aba2aea0c3160111ad3e405df848f77862a13caa96c654ddfc8a803190ffc8662e064f7a64096a0d3dd41a78f049e9a55265f5e98dcd55043aa6c958e18710
 MISC metadata.xml 682 BLAKE2B e5d2f804eddae75e951e0d779f6c26b9055186976bb27ab8c4afc8fa160aee1a6c119d03c19b95d54e7af721a86aae99b9c78277adc03e59fa4f86c0a5e93263 SHA512 cc1e8bf973b516a44122fa19165cd6c08547837d38c909d0a8ac7116c87ad93bb1f25ca31e5358c63abf4b13673a285cce8fb783506b61659f998ce47dc4b656
diff --git a/dev-libs/skalibs/skalibs-2.7.0.0.ebuild b/dev-libs/skalibs/skalibs-2.7.0.0.ebuild
new file mode 100644
index 000000000000..58829b19d4a7
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.7.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="skarnet.org general-purpose libraries"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc ipv6 static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--datadir=/etc \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--sysdepdir=/usr/$(get_libdir)/${PN} \
+		--enable-clock \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable ipv6)
+}
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index b971cbcb3616..dec320c24bd5 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,3 +1,6 @@
+AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f072f5c5779fb6aa6606857a12af7aa0228d349b722813449ed33a026ea5e8bec9b0e6235ac6c271f34c61fca7eafb4b4 SHA512 23c8048ef08417422194eb84d4581b4a1c443de6917608f953cdcb5b2433446272d937e05eabc6bae17d88061a0b3aa997355b7b47e71702dc52d69223972809
 DIST softhsm-2.4.0.tar.gz 1042566 BLAKE2B 01a0f4bdc589847c4a1f860c3e3f572644d874b11d7ab8e149e598fc123b75e898de9a46f73f5f2a107edcaeabdda29e4b9b6d54af5b95ad79a3c7b7b77b8bbf SHA512 f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84
+DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
 EBUILD softhsm-2.4.0.ebuild 1041 BLAKE2B c20642ae2741ce0941fa12b8ab4ba3162df9484c775a88c5e4a15b0e774471fc872b0c9d486a081afdda800d4e08b4798b05b44c32a387dd93b4ea1f433c2309 SHA512 721f120e09c2fc85154cecd824a85c36d499fcb11eb5173a52cb3c73c941fa7234d97492a1e675f04ceca192475cd31fde61313f0951eb0ba5618b434e483662
+EBUILD softhsm-2.5.0.ebuild 1089 BLAKE2B fc038b382c50a1f0b065dcf1145b5a74189119961f24432d78c89516cf3fb225a6de38118f63a5be9e2965b138810b395850e3f9d2a4c06cf06ad8bd4408a4df SHA512 d6f213a0edab60adc5c741f5a54d650ec4ee268c689e5b893ac1f4417f7f70cf90cf93d5b8dab105cfaa03dcea7ad4cb809b7e4693962233af1a79f83e00ebea
 MISC metadata.xml 322 BLAKE2B 64433451cd97495272e25d2bd1a4ad951781f7a61e47f1f048b13b4a1b4f577f9eb37f1145f1d9710969cfd9e38dd89aacc83641ec8b3bf0b36027c39a8dfe8b SHA512 b145c1ee8c20a9aad9c9b8e6f6526c596dd80a993faecb8e8caf6e930cf05e32f3e6ef5ad72c337a43c48cf57224f209e65d177567e3c5c577d3872eb11841a8
diff --git a/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch b/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch
new file mode 100644
index 000000000000..9aeaf2939ac4
--- /dev/null
+++ b/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch
@@ -0,0 +1,32 @@
+From 308b0b2760d6cb218003768747346d31764f1cfe Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 19 Oct 2018 23:19:48 +0300
+Subject: [PATCH] crypto: use ENGINE_load_rdrand with recent openssl
+
+libressl and probably older openssl do not support this.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/lib/crypto/OSSLCryptoFactory.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+https://github.com/opendnssec/SoftHSMv2/pull/423
+
+diff --git a/src/lib/crypto/OSSLCryptoFactory.cpp b/src/lib/crypto/OSSLCryptoFactory.cpp
+index dc5f737..04d383d 100644
+--- a/src/lib/crypto/OSSLCryptoFactory.cpp
++++ b/src/lib/crypto/OSSLCryptoFactory.cpp
+@@ -141,8 +141,10 @@ OSSLCryptoFactory::OSSLCryptoFactory()
+ 	// Initialise OpenSSL
+ 	OpenSSL_add_all_algorithms();
+ 
++#if !( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
+ 	// Make sure RDRAND is loaded first
+ 	ENGINE_load_rdrand();
++#endif
+ 	// Locate the engine
+ 	rdrand_engine = ENGINE_by_id("rdrand");
+ 	// Use RDRAND if available
+-- 
+2.18.1
+
diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild b/dev-libs/softhsm/softhsm-2.5.0.ebuild
new file mode 100644
index 000000000000..efb92f3af4d2
--- /dev/null
+++ b/dev-libs/softhsm/softhsm-2.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A software PKCS#11 implementation"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bindist libressl migration-tool test"
+SLOT="2"
+LICENSE="BSD"
+
+RDEPEND="migration-tool? ( dev-db/sqlite:3= )
+	!libressl? ( dev-libs/openssl:=[bindist=] )
+	libressl? ( dev-libs/libressl:= )
+	!~dev-libs/softhsm-2.0.0:0"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	sys-devel/gcc:=[cxx]
+	test? ( dev-util/cppunit )"
+
+DOCS=(
+	NEWS
+	README.md
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-crypto-backend=openssl \
+		--disable-p11-kit \
+		--localstatedir="${EROOT}/var" \
+		$(use_enable !bindist ecc) \
+		$(use_enable !libressl gost) \
+		$(use_with migration-tool migrate)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	keepdir "${EROOT}/var/lib/softhsm/tokens"
+}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 1591e14da720..95f1f64ca01b 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -3,8 +3,10 @@ AUX spdlog-1.0.0-unbundle-fmt.patch 707 BLAKE2B a62f2c48007de2a48fb1f6f28bd0aa60
 DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef
 DIST spdlog-1.0.0.tar.gz 183855 BLAKE2B 30d54fef03a83f968cfebacf95a484ff397126771a7ea022556aebd07e2f7694af35b278f75ee24372283ff1428e21247fd4329794d64a65bd6220a93f21db3c SHA512 4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1
 DIST spdlog-1.1.0.tar.gz 183937 BLAKE2B 51af49f641df69e78835bd6b9545da53c0e111bab60a5f0dbf4a1d0e70101309394ffea195176ea371f08b772c2be1c22c2da16006fc9699f47593cf82a6c0fd SHA512 65fbe6e9dffb25e814f72f2ef7982eed213fc16edfabb1377f865c94fd0488190e160dfea83ac06979a41f2fb2fa47a454989ebee0a2c5012bd404b977648439
+DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
 EBUILD spdlog-0.17.0.ebuild 778 BLAKE2B ca2793ad8aae142f0d08453d22f0369fd11d5cde01d7c94055af10d24bd987cf7ef995d142d43bcbb06961a693677f6b332373fe145d5e3270517f99ea2bf18d SHA512 f07f53320df02c39b51683d4ad461be31f8362f087e8c5f3d15112f14468df9bd8a881404bc1d75c0ddadecdae4301fa275ce8fdad17be5dddf92a7ce49f8e2d
 EBUILD spdlog-1.0.0.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 EBUILD spdlog-1.1.0.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
+EBUILD spdlog-1.2.1.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 EBUILD spdlog-9999.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.2.1.ebuild b/dev-libs/spdlog/spdlog-1.2.1.ebuild
new file mode 100644
index 000000000000..03aaec9bd608
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gabime/spdlog"
+else
+	SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+
+DEPEND="
+	>=dev-libs/libfmt-5.0.0
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
+
+src_configure() {
+	rm -r include/spdlog/fmt/bundled || die
+
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_EXAMPLES=no
+		-DSPDLOG_BUILD_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index 43c75f16ff0c..79d0495b3e9e 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,17 +1,11 @@
 AUX ucommon-6.0.3-disable_rtf_gen_doxy.patch 373 BLAKE2B 40496f603ec50786007fc97ac0390ecf29b2a296ac77f16d91c8861e7b98725c03aff488697ed9e7492c56bd298b920aab8eae0425e1bfaca574860517c33f46 SHA512 e486d3fc9d6235979d0d1e75aa1f90b5d525d3b7806de2a80737a825c62e1b6b94ef5976609a9a7654ea82bc5620ad62232ce61310da393617c5e5d98e6362c0
 AUX ucommon-6.0.3-gcrypt_autotools.patch 1712 BLAKE2B b1c8a0385c931fd1284c4cbe7ec412367566b360b4befc1fe75dee6f489215f86dff84c0612b0535204d83b89aa220b8082fcdab521023c83dfa466215b74298 SHA512 57c2d80c6795fa890e3ece384f92da3d8f7d216c91e72920ebccd5fcb1358e41932cd6fc6861ce009305f90a00ed11fdabf6df7b5c7e216ddbb0a6916e163f69
 AUX ucommon-6.0.3-install_gcrypt.m4_file.patch 4902 BLAKE2B 5c56eb0d9e397a653eb1a932e49cdce0c30fbe52f98f8d1b7403c27f53f5371da6f0bde83dff18250bfec5c9d3817bedb803d49344183e0dc5cb117e688dea6a SHA512 13604093ed0dba4064a8868785309d1de645dc0d010940febbf29166f69302c7272293bf161514396064d4f2ef0805dc6bb30336773568b0e5959ef76c1a0aad
-AUX ucommon-6.1.10-disable_rtf_gen_doxy.patch 224 BLAKE2B 241b6e1e94d7ad9067534a4cb6dd5e76fea92fd8cff5ffc819b7aa379bd05fa8d15079afb9860cc2f3e08739f340915b0c057fe9c095a03950ff14b75fd91080 SHA512 7bf2dc2e398eb3be86ec2593024953828db272ad19010b43e1c71658e474cb321f86265611c874781f9c6adfb68919ba1f44cb1efcc3d6d3711a09fdfcf2abe8
-AUX ucommon-6.1.10-gcrypt_autotools.patch 1657 BLAKE2B 3d6076aa2f4ef32e44d3ee471ceb547d352da42e361e18e6c17dfb718723dc5f73b4a4375e7cef2ad7662420bb14498979ae599976bcfff20a19af4427af68a2 SHA512 f9749158710aaf1dfce05f8b204e3f0463e71cbd06fe2c34dff1d675e9f5abf14fd33de4e4d46f0482524532abd378b81d1cf98f2b9a0371ba760872469ba5a9
 AUX ucommon-6.3.1-gcrypt_autotools.patch 1258 BLAKE2B 894f22a1755bf0d41fc3148a9c4ae8721ae7cc6307ba925493fa1c7896142219f6738f5d403a62ffacb5f0b44e95a9d8fd78528e5e7c3d470129b4391e8cfe0b SHA512 7bb6ce14558c9aec961b83fbba7efa38eeff6bb165d0d66a68436eda10e2d209e7d340e13fdc1e5e453f1a091a045aece50ead78ad5634a81d2d123d1a166e78
 DIST ucommon-6.0.3.tar.gz 806841 BLAKE2B 08e384f535529dbd27271861c473e18624d81029f7fecc08057b646f9c22d9bda956da2655114ec693a17f20764e4635701d1a932eeff2cdc8e82ad0fefd6496 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762
-DIST ucommon-6.1.10.tar.gz 833384 BLAKE2B 790d47b529550ab02651ed41954d1f6c171154d9ced01eee61d9789495e6d5b66599d3f12925f2cde1c432deb3414931a359d237572904f6ab1e17793b3bce9e SHA512 6d6e716dcb71d6a4e49307baa0e9e62b4b50f3dbe8301eb93e3b562d94eb9ccee73a733928059a5ed97deba55c00308af0326a32cec6a73dbf7884c322177050
-DIST ucommon-6.3.1.tar.gz 830661 BLAKE2B be97174c44ad79ed3e526f263da085dbc112c8f5f0b4f8415a5d30ff7f919fea65e1468aeaaf301940ce060952842fc0e59184539c63ba965c01a0cb598dce30 SHA512 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec
-DIST ucommon-6.5.2.tar.gz 847128 BLAKE2B a4bd6975ad0a83a109a85b5654fbf176957df0bad8edf1a519438c49af00a5523258e97a231021f9a3a3492746b6b6b88aa79600e58bf47b60ac6466b2f4fa12 SHA512 dc6dc048bad52d117edd1936ad31fd9fc6dba418fea3f7fd1578a96909c1eb53d2a42c4773a168db38ff24fc73b467ab30ec9b5ad5132ae473c36cea0e77b341
 DIST ucommon-6.5.7.tar.gz 855822 BLAKE2B 56b5eb5f8372f983e0f348e5fc494c15bea57dc711e88a9a9f4ceeb8abf03680a82948ea080053a9d4c846172b64443a3947b3774b50c6d0a60c1f2ced63e69d SHA512 9927c9726252cdf050f217fa5993d34dcf9f76fab8399ee3a4c91cf087d9409947ed486a21e8448cb57ea95b52826682120f99d39287983c306434f9121b4d24
+DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
 EBUILD ucommon-6.0.3.ebuild 1540 BLAKE2B 6b8a686eec4fe95ac91d5a6e0f00a0a5ae848ce27939c332a1c2fc093b19492e444c3af325bc14b7e1cfb6cff7331fa68fc6ed8147e68f83c33d8bdc2e52a2c6 SHA512 6b56d6e4f20d048881783366276a09820a9c0bb269f8d65acd3e4b4b968a9e966b49bc3cf7564ad5da53eb7268e6af9336c5d7d23df7a10cd86f1b58ee64a71c
-EBUILD ucommon-6.1.10.ebuild 1656 BLAKE2B 3bb2de5faad0c10aaac113ca9a6673b42585c60ba62e0e21a22a7d24776f8fa18e1a0fe73baad048d4d1884b953b7e0c24fc28f117f35240e841fe7f2a6d0cd2 SHA512 b6ad95d01aab30ef78e7e4a70334811dc25cd894a05e2c26cc60a270336daf9924d9d771aae36f193651c88ea870768350ec63b3a9f276949749aaa8d53ec34e
-EBUILD ucommon-6.3.1.ebuild 1735 BLAKE2B d94b09b08954f972ddcb28c43a266b2a65324ab88941cfc220f05dfa2e8d9775322bafdb0b958540d956c61a83d6b41663ac90e750c5a570db85ed270c8c4a8e SHA512 f5d698b80b6eac598e7e94ceeb0e1eccef801bfdc27f0c40905aeec7253cd3e764054629bd2a9238d4f7875146f7bf221eabe942ebdfa06525fc00143e7bb8d8
-EBUILD ucommon-6.5.2.ebuild 1735 BLAKE2B 77d03ce5dd28a014e1e1124b3ee657a95745f57a7b9510b624473b2932bf70539ed08fe3e4b318fba937cc405bfcdbfb47ef77cd2c5f3dee8736dd1bf3b411e8 SHA512 ddf5899ea21b6f1c631fad60d41ef17c30150f832a398c01f231cd249c4b226274e0486b0658f5fc63fbc6d5444da2515359a67cc043cd96767ed1db92f17377
 EBUILD ucommon-6.5.7.ebuild 1735 BLAKE2B 77d03ce5dd28a014e1e1124b3ee657a95745f57a7b9510b624473b2932bf70539ed08fe3e4b318fba937cc405bfcdbfb47ef77cd2c5f3dee8736dd1bf3b411e8 SHA512 ddf5899ea21b6f1c631fad60d41ef17c30150f832a398c01f231cd249c4b226274e0486b0658f5fc63fbc6d5444da2515359a67cc043cd96767ed1db92f17377
+EBUILD ucommon-7.0.0.ebuild 1486 BLAKE2B 442b3bbf9aff5faadc4eaaad23c996db7c15799b7b3c830d741a211062c31c43ca25e5c80bbcb1c08b87ed6f7952a90bb3aa59e804a0c144470ed54dac0b9391 SHA512 e87f63f6d663054718dbcf93367d3bf1da5293d708423685b0dfddbf50415621cac061c2640459d2e9d5ede70a737e7077123ed4c2fa2b9ffa14410b14490431
 MISC metadata.xml 316 BLAKE2B 8c4be49ccdfcd5353854b5b44e7cab7917695d50af5cb0e539b4a5d58fc31d3d6a98e77af95d0254324ba49f39d64d05a28adf2edbc9a71512c1f8e14bd2f78c SHA512 8095298e0382cc3e245df76d9b5bd4f27c9cf803aafc5b3fe9a9d63c94733192287a0d0348904320f07ec3a24edc9c437f09065b12dc3226f7acbe1e055c774c
diff --git a/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
deleted file mode 100644
index e9b581f7eb99..000000000000
--- a/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Doxyfile
-+++ b/Doxyfile
-@@ -40,7 +40,7 @@
- GENERATE_HTMLHELP = YES
- GENERATE_TREEVIEW = NO
- TREEVIEW_WIDTH = 256
--GENERATE_LATEX = YES
-+GENERATE_LATEX = NO
- COMPACT_LATEX = YES
- PDF_HYPERLINKS = YES
- USE_PDFLATEX = NO
diff --git a/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
deleted file mode 100644
index 916df95576ce..000000000000
--- a/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,6 +8,8 @@
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \
-     *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \
-     CMakeLists.txt ucommon-config.cmake ucommon.pc.cmake cmake-abi.sh \
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,9 @@
- 
- CHECKFLAGS="$CHECKFLAGS"
- 
-+m4_include([m4/libgcrypt.m4])
-+
-+
- case "$with_crypto" in
- ssl|openssl)
-     ssl="openssl"
-@@ -698,6 +701,8 @@
- gnutls|gnu)
-     if test ! -z "$GNUTLS_LIBS" ; then
-         SECURE_LIBS="$GNUTLS_LIBS"
-+	AM_PATH_LIBGCRYPT
-+	SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
-         SECURE="gnutls"
-     fi
-     ;;
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -9,9 +9,9 @@
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
- MAINTAINERCLEANFILES = Makefile.in Makefile
--AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@
-+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@
- AM_CPPFLAGS = -I$(top_srcdir)/inc
--LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@
-+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ @LIBGCRYPT_LIBS@
- EXTRA_DIST = *.1
- 
- man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \
-@@ -30,7 +30,7 @@
- scrub_files_LDFLAGS = @SECURE_LOCAL@
- 
- mdsum_SOURCES = mdsum.cpp
--mdsum_LDFLAGS = @SECURE_LOCAL@
-+mdsum_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
- 
- zerofill_SOURCES = zerofill.cpp
- zerofill_LDFLAGS = @SECURE_LOCAL@
diff --git a/dev-libs/ucommon/ucommon-6.1.10.ebuild b/dev-libs/ucommon/ucommon-6.1.10.ebuild
deleted file mode 100644
index e032afde5db3..000000000000
--- a/dev-libs/ucommon/ucommon-6.1.10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
-
-RDEPEND="
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=
-			dev-libs/libgcrypt:0=
-		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.10-disable_rtf_gen_doxy.patch
-	"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
-	"${FILESDIR}"/${PN}-6.1.10-gcrypt_autotools.patch
-)
-
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# Aclocal 1.13 deprecated error BGO #467674
-	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
-
-	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
-		${myconf}
-		--enable-atomics
-		--with-pkg-config
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/dev-libs/ucommon/ucommon-6.3.1.ebuild b/dev-libs/ucommon/ucommon-6.3.1.ebuild
deleted file mode 100644
index 8dd276b800f0..000000000000
--- a/dev-libs/ucommon/ucommon-6.3.1.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"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
-
-RDEPEND="
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=
-			dev-libs/libgcrypt:0=
-		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
-	"${FILESDIR}"/${PN}-6.3.1-gcrypt_autotools.patch
-)
-
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# Aclocal 1.13 deprecated error BGO #467674
-	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
-	# don't install latex and rtf documents
-	sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
-		-i Doxyfile.in || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
-
-	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
-		${myconf}
-		--enable-atomics
-		--with-pkg-config
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/dev-libs/ucommon/ucommon-6.5.2.ebuild b/dev-libs/ucommon/ucommon-6.5.2.ebuild
deleted file mode 100644
index e8e90402975e..000000000000
--- a/dev-libs/ucommon/ucommon-6.5.2.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"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
-
-RDEPEND="
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=
-			dev-libs/libgcrypt:0=
-		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch"
-	"${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch"
-)
-
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# Aclocal 1.13 deprecated error BGO #467674
-	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
-	# don't install latex and rtf documents
-	sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
-		-i Doxyfile.in || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
-
-	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
-		${myconf}
-		--enable-atomics
-		--with-pkg-config
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/dev-libs/ucommon/ucommon-7.0.0.ebuild b/dev-libs/ucommon/ucommon-7.0.0.ebuild
new file mode 100644
index 000000000000..77953319a895
--- /dev/null
+++ b/dev-libs/ucommon/ucommon-7.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Portable C++ runtime for threads and sockets"
+HOMEPAGE="https://www.gnu.org/software/commoncpp"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/8" # soname version
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="doc static-libs +cxx debug libressl ssl gnutls"
+
+RDEPEND="
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=
+			dev-libs/libgcrypt:0=
+		)
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch"
+)
+
+src_prepare() {
+	default
+
+	# Aclocal 1.13 deprecated error BGO #467674
+	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
+
+	# don't install latex and rtf documents
+	sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
+		-i Doxyfile.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+	if use ssl; then
+		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
+	else
+		myconf+=" --with-sslstack=nossl ";
+	fi
+
+	local myeconfargs=(
+		$(use_enable cxx stdcpp)
+		${myconf}
+		--enable-atomics
+		--with-pkg-config
+	)
+	econf "${myeconfargs}"
+}
+
+src_compile() {
+	default
+	use doc && emake doxy
+}
+
+src_install() {
+	use doc && HTML_DOCS="doc/html/*"
+	default
+}
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 3d10a84ac8dd..f14d5ced2cf4 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -3,7 +3,7 @@ DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
 EBUILD userspace-rcu-0.10.0.ebuild 663 BLAKE2B 2d1ad36229c78b15bf3e9c738a383aa39c201329bf814e7e29d4726cd9828c6e9575e3af4ac02b5f54db3ba703a1f0aa46b90eb88028709299ed13bcb0285889 SHA512 2e945347710ff7f1459e33def817e4c4ce4e640bcb8f94726559534ce5f14aa45752bc6e169fdaeeefb491751743b30f744cd56dbc4a56fcaf1bff1c0227619d
-EBUILD userspace-rcu-0.10.1.ebuild 676 BLAKE2B ee98949e39e87a0aea1d7d0c14f62d0682f25267e2709d6a2405fe72ef2b1f4d0f914b4e9161e04c11c79a13789124383d0320bd4c92f4b2fd3067e917f3a838 SHA512 56ba3cee83fee5c273444c017f1b0cee57e56e5b2f4444f3686a12f98921f6f157c97831dd540eedf615264ea8db2d01cb4f3bb4d031c2c09a41e4c99bc3d050
+EBUILD userspace-rcu-0.10.1.ebuild 683 BLAKE2B 3860c7e252f07feec4a4416959caaa78d76bfaf4a855904ee2346fbee44856e63a486667c33a371efab35ef03ad8f4805e77ced0569c7b4cf976d82d2e562b65 SHA512 4dceb17136ada3b7c12ecd30ec62dcfb3787256f000ab8c18913e37d14acda98d7573c2290f17daa8e115f91e1e317bcb7a9a64705362262235dd9e120d5d06c
 EBUILD userspace-rcu-0.9.1.ebuild 736 BLAKE2B 2254c2ca484cde4821753e7c2d8a2a5c8f71700d77068234f9215608104104f4eda13dd4d78e20222a5dec2295bd05b75dc9aaad733e8555e0bf57218079e330 SHA512 c6e0ddf946e8e07392545e52f2bad49d2da3637e800b77689112128374c6367d5efa6b9d44d6143b3f17a8d74cdcfb877f2922e6a112c0ee8bea834242af4818
 EBUILD userspace-rcu-0.9.2.ebuild 749 BLAKE2B b7782ed9c88695473c2bb23dd9025eca95aa54eec2109fb4f2574f39b985b86ac1c53f5728a0b224b628717556427ffcb78325cc07f6e2f079d2fe05da514827 SHA512 61c3e1d51f225d39c5e521016605c01a4cf6188344af5a71785dc71f0a6cf4c1108139e38f32a093898c76f547decc794c19dfe70367461445abbb5816b7a6ae
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
index 25c6126b63e0..e2b5412e6a97 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs regression-test test"
 
 DEPEND="test? ( sys-process/time )"
diff --git a/dev-libs/uulib/Manifest b/dev-libs/uulib/Manifest
index 8229b20d5a93..10628a413442 100644
--- a/dev-libs/uulib/Manifest
+++ b/dev-libs/uulib/Manifest
@@ -1,5 +1,5 @@
 AUX uulib-0.5.20-shared.patch 2729 BLAKE2B 22870e400a4bf64fdd30b03f8d699666eeb7832e1110347295123bab7cf196d3bc30c7a4bbb0fe1d42f45606adf8522e134611f827d2ce403bf27fbd2381e1dc SHA512 bb8c93c59077fa00dec75734f27effc3370c9b1aabea476cc3212d6388a94127d1d6678dd98e73304c7fd2dd3e7212764e7abd08201ae9e12544f39aacabedc9
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uulib-0.5.20-r1.ebuild 676 BLAKE2B d742678c1b2dc8732b898c3e238d09422e78a196abf849172a538a124e5c0a0ead6942bb259c9a3b2cbc44a37d50f78307c7b723b4532f312c9f697527986c16 SHA512 af1854aba9b4f0ec374a9253f984a4d7ff2a679be333bed80f77a64feb42ff8db9a4d677c3bfc0b22f848c84c34dd81945f1a17ca76b92db0bdd7cbfb3b1f70f
+EBUILD uulib-0.5.20-r1.ebuild 773 BLAKE2B 8ff1ad29ec1d732ac9c5b7d15da06105da8183ee4d91303732500c61f31e34ecfe591953d95042aeaf2e2051c57553f62763a584f3705a9248f1fadb255fd328 SHA512 3f53f0883a1af59a9fab2091aa78cad6e280398202199430afd1549714783f47b6c22a2c976a695d186a5336a2d29e6a19237b65dfda03f13bd21faf6d8032ef
 EBUILD uulib-0.5.20.ebuild 691 BLAKE2B 14d1cfc8f2ee94b4d2cf9104f6e9b12d859ccd0bec6af4dc4e3e8863a3226e68794ba27b62d7cb680669a1132c1c57a7013be97cdd4461829d5e89214b93034e SHA512 ff905fdecc1fff0af38fcf09b4e30a37d0ed014221e3d4e2dec81536617b7a1f3c66aa0a0dd773b8971892b90bb30a94955a5568488f717c69fd4ccf5ffa29e4
 MISC metadata.xml 277 BLAKE2B cecac90fb82fe0bd545f752051c2ce763ce3232fef47d6ec79511d72870e92c49a509f06e949671b517ba80295da3c27a10f5c72b374e59a4ad6017a13ac705a SHA512 37a5409e55c42abd634bfbf22e956a23cd8d2d27a600e02a23e304e3f7da3a434885ff8d5997091ee608a4ed32f10738911c1ad81624c3cba23a7a42f20fdf59
diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
index d590fa0e69c1..4f542854349e 100644
--- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild
+++ b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}/${PN}
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 34c690b218a4..553993b2924b 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -4,8 +4,10 @@ AUX volume_key-0.3.9-cryptsetup2.patch 11118 BLAKE2B a271091011046c5765f1202a655
 AUX volume_key-0.3.9-find_python.patch 1845 BLAKE2B 0924bdd416f4eab70648964a1ad76263db76a3c7c62819146d200c6a88ef65ed24aa90c3dcd426e5cd137e07ddf04ddfd95474f6204f4e76b0c2a3b746e16dfb SHA512 5b2de4c5c18bb17fbf2a7e5de8adc36d919c5e98aafc33bbd3464ab60ce520ee0b4da0447f7e55ae262c9f6243936badd20f8ce5f9f3367188d80ba28932d0d7
 DIST volume_key-0.3.10.tar.xz 474720 BLAKE2B 726252263976b63c3e73dc42bd0166aa1c05df7a61715ca19921e9cd92abf1f8c84347127c94f724e385e0a36411ffae92341d91d06d679c052c83edb5ab6c49 SHA512 b050d333e021bc3721f5e72c1d2498adea3265afe7f702e1b1e859546755745ac70dcffc194739a4833d4b0b77168506f7fe90fde382d8aab4df2af7b635932b
 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
+DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
 DIST volume_key-0.3.9.tar.xz 445092 BLAKE2B b9cec52ca02e331501d378482484535413f3ef7675b6592b9f26f272d36448a2ffee1a0ca1c7a552764324ab20cd6dac98447914faafbea96e4c526796bec587 SHA512 bc0e690997b9fa1c9fff361d04e7eddcac4cac09779d7a1f9e161be117f5c589a7e444ac16dab25fb3e3ce201591f7dc937595ddf2745d7daa625d4ab0a255e0
 EBUILD volume_key-0.3.10.ebuild 892 BLAKE2B f1698f22f16aa35276bc2b2eb4aee7a5fa3916b45c9bef3eaf2743d1c51dd6ddc8af059d47acdd64aec74f8304f50011a577b53ac112a2929d13f641a3f287f6 SHA512 76e10dd531efbf4f685fc0f5ae13c7548b20be8d80f232d128d07ac3aab57662bb90d10112b79b8ec417386f98b32ff342f5f7614ef9d053c28424ae53dd8a1d
-EBUILD volume_key-0.3.11.ebuild 853 BLAKE2B 638d69733a68fe645d717307bb5a207b0e5913196f1f751d2c48bb9d2b2595e127fd1dcb516df9e6e781d34c8275074f8f7b0f9c7578a46b2cf0fd1c3e59fcde SHA512 f07b6760999b9836d9c39bc1e94d4d4e5a5267ab1fef34ee3a45fff7a45d328b579bdd293dba9769a60062a2460dd6c1c4359b262a8cf0ce1bc6a3b97ed0e8be
+EBUILD volume_key-0.3.11.ebuild 844 BLAKE2B 01e2a04c36b783e99986987abc5b067059626018ab7b6d35249f5168f2ccf29164ba4008a625f5f668be66f568b7ca2eaff1c1bfa21fcee02e2072243ca39f13 SHA512 5d148f792a58c91af4ce9c9e7f6801e16b09770b2e9332bfbae0c8c79717fdbde57058d1efdb36dad8194e143642464f420097ca801e43cc7134fabe12b5f448
+EBUILD volume_key-0.3.12.ebuild 906 BLAKE2B d47cb3308f7d4347caade6a40cb8b57bfe73875babbe71fe5e0a8503d00a173281d8ff40c4b0d20fc4b43fccc1c237a717db64a83682d96e817457ffce128ed7 SHA512 29e77e6a082ae75d0d8e875913c3fd0e784f1b1d7f3666a55cec4f73da5459e4992b9e9c88611d3ac712f58f88492199eaea4682d866d79c205fabd804512b88
 EBUILD volume_key-0.3.9.ebuild 1030 BLAKE2B 4eb58cce79277f652acda134685f10db2c61093d8418cd7d5c550b0aa3f4acd5739a17bf45bbc2b9b707954ffa8179119ab9c41c3e752d5e958fe2ffdb76d33e SHA512 421e9f70ecc487ca8e8db52ff20deb6503d8106443e14f3781a5c4bc338b722ff2c453a0311a8b46f346986b31c4709f0d1b30e2df70f7fa6d7e166474dad455
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild
index 3c09344c519f..389ac8735673 100644
--- a/dev-libs/volume_key/volume_key-0.3.11.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/volume_key/volume_key-0.3.12.ebuild b/dev-libs/volume_key/volume_key-0.3.12.ebuild
new file mode 100644
index 000000000000..d0b33aaa8bf8
--- /dev/null
+++ b/dev-libs/volume_key/volume_key-0.3.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-single-r1
+
+DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
+HOMEPAGE="https://pagure.io/volume_key"
+SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-crypt/gpgme
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	sys-apps/util-linux
+	sys-fs/cryptsetup:=
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	test? ( dev-libs/nss[utils] )
+	"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# --without-python disables python2
+	econf --without-python --with-python3
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 4294a3b9f218..841a6401aab0 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-1.15.0.tar.xz 432932 BLAKE2B d86e5ba52c16664926e4688317db3fad4f9629c3903239dde46ee238ef7874f28e39daa6bbda96519dfda4ff83a1f540522f21fbabe9b71aa263523481d4eb5b SHA512 f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8
+DIST wayland-1.16.0.tar.xz 435216 BLAKE2B 862cc8ca9da060f9b8345aa0a62a4af76a31562246b75d2679bcf30cc894cc94ec28f97951f766b6e5297b2e113cd8b08e5682dacbfc79544c0085995693ec55 SHA512 64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c
 EBUILD wayland-1.15.0.ebuild 1745 BLAKE2B 833f9fa82246d92583090cc859fd98fe1084e4ce1f82f1ed135da2d6b48e075174239de3dc824a7a6f08c663d6b14807af593456da1a5c99617799b679792179 SHA512 d13a68804828eed61dddb4ca73e91898ad316fc7adbcb0bc94c73a13f4cbb6d6bf73787bcfa39724baa07aa9a49305d963edf0b0c7fe567d499dc4ba9d9497d1
-EBUILD wayland-9999.ebuild 1755 BLAKE2B 43f897b83819708141c70c1b8d678509101c5497a21d4ded684901c43295ada64934f95693a2458597a1bcfa7bb508a638a8447789ed511769219fb7d271bf0e SHA512 24b4b3d664e4cdd331d78f8f22ea3670513411577849c8f980b5b9f7c7687b692bce959dd25970055b940aa835fac1d22766dc40bba23d989b0300d29fd6474b
+EBUILD wayland-1.16.0.ebuild 1763 BLAKE2B f8c1e3518caf8c3506c8d966a1ad804a626727358a9d34d31b3afb2a2ad25d304d282ad424b41f95d406ad3dc4044bb4b204c04572e8baaf1d8ec0c9878bd7c5 SHA512 0168aee43cef82ac67c1e1a44611d14a2a5454a23f54c6959d5d66a7210860567524f0b7a38354d391b339ae9393256338b531f63845784ca6ab02e053cbaacb
+EBUILD wayland-9999.ebuild 1763 BLAKE2B f8c1e3518caf8c3506c8d966a1ad804a626727358a9d34d31b3afb2a2ad25d304d282ad424b41f95d406ad3dc4044bb4b204c04572e8baaf1d8ec0c9878bd7c5 SHA512 0168aee43cef82ac67c1e1a44611d14a2a5454a23f54c6959d5d66a7210860567524f0b7a38354d391b339ae9393256338b531f63845784ca6ab02e053cbaacb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.16.0.ebuild b/dev-libs/wayland/wayland-1.16.0.ebuild
new file mode 100644
index 000000000000..df8f72793cfe
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.16.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit autotools libtool multilib-minimal toolchain-funcs $GIT_ECLASS
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=
+	!<media-libs/mesa-18.1.1-r1"
+DEPEND="${RDEPEND}
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+		sys-apps/grep[pcre]
+	)
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
+}
+
+multilib_src_configure() {
+	local myconf
+	if tc-is-cross-compiler ; then
+		myconf+=' --with-host-scanner '
+	fi
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(multilib_native_use_enable doc documentation) \
+		$(multilib_native_enable dtd-validation) \
+		${myconf}
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	einstalldocs
+}
+
+src_test() {
+	# We set it on purpose to only a short subdir name, as socket paths are
+	# created in there, which are 108 byte limited. With this it hopefully
+	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
+	export XDG_RUNTIME_DIR="${T}"/xdr
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	multilib-minimal_src_test
+}
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index 62aa7b2393bb..df8f72793cfe 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit autotools libtool ltprune multilib-minimal toolchain-funcs $GIT_ECLASS
+inherit autotools libtool multilib-minimal toolchain-funcs $GIT_ECLASS
 
 DESCRIPTION="Wayland protocol libraries"
 HOMEPAGE="https://wayland.freedesktop.org/"
@@ -28,7 +28,7 @@ IUSE="doc static-libs"
 RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 	dev-libs/libxml2:=
-	!!<media-libs/mesa-18.1.1-r1"
+	!<media-libs/mesa-18.1.1-r1"
 DEPEND="${RDEPEND}
 	doc? (
 		>=app-doc/doxygen-1.6[dot]
@@ -57,7 +57,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 	einstalldocs
 }
 
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 93e83c45c87d..92acdfb9aa6b 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,4 +2,4 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
 EBUILD weston-3.0.0.ebuild 3460 BLAKE2B 3831b7e40fdf6a767a8c4686ce935f6323e1250e9338e7a2e4aaaaa94753098bf28ca3f37e6b05e20eea3feeef3079f889b31f0b44fc66b9be2443b912f8df30 SHA512 3ee0b31c75053f23a0e558a9e83ae737137e24682ef8905c54e2f3437306e6a46137f4300014f9c2471bd7958eb7078c69c8762ea18e79e84d618583b1ad72c6
 EBUILD weston-9999.ebuild 3450 BLAKE2B 32f9b8b7f712e7a948bd6addc68792234684314c3dcb59db31f0884432805a3dc64fb79f82225fca22043384af9532e34d7f5872424af180ecc768111348f3f6 SHA512 e56e09138148f71d36f2d6543bcfee9389d8df903def4ee23f3f326a1e47950dac07899a66234adfcea841a2e2b248741a4d5bdc73586761a43f116340540b02
-MISC metadata.xml 1309 BLAKE2B 3d7f849f84c4270533b9f13b7edae39c405f9ac0fdd61eca140d7244bc8cc9310600b349f611706200210f36d190d5b99917551edc3338876f4ce5aae75e8438 SHA512 537d4e99af7a368f16758fde18d271bdc76957c416b920934ff9248c1ee2172a95b3fb83cdaa8d138bdfc6cbef4224cc492e0c55d499f2f8e45314156330666c
+MISC metadata.xml 1245 BLAKE2B ee9948ac519b55c804770a134bddcc0f2a9656dd948b2eca13919f3d8d059db373bddb711b4a763e43bd4cfcc931e06503bb3a4f917baa5ab3a9c19db8091724 SHA512 668357837485ffcce4eb49d4dcd0d0b5de24fcac5f9cc22f6fbc63df951d37cc5dca6d2ff5f17d5a574e273167fff462e142c873893d2e9c517463d9fbc1883f
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 92b7b9cd58b3..c1c3e3956fa3 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -19,7 +19,6 @@
 	<flag name="screen-sharing">Enable screen-sharing through RDP</flag>
 	<flag name="unwind">Enable libunwind usage for backtraces</flag>
 	<flag name="wayland-compositor">Enable Wayland compositor support</flag>
-	<flag name="webp">Add support for the WebP image format</flag>
 	<flag name="xwayland">Enable ability support native X11 applications</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/xbyak/Manifest b/dev-libs/xbyak/Manifest
new file mode 100644
index 000000000000..1da7662a51d3
--- /dev/null
+++ b/dev-libs/xbyak/Manifest
@@ -0,0 +1,3 @@
+DIST xbyak-5.73.tar.gz 214021 BLAKE2B bf7ab78df7ac3f5a8860b3a613957bad8b6faba523126f6f4ce94be4ce25da8b91a418ac2445d8d706f09fc7434a8ab9ef6f63c56ef0b7860290fe6801849fe7 SHA512 1c2eb73c2e9b66d4b4f7689e071ea8ba8a3b7f0e05ef885ad35ca89f706772bd6e8ad448581c954b1a24f424ebd2db4e420410450a951fda7e02d6fd2e5e9a67
+EBUILD xbyak-5.73.ebuild 467 BLAKE2B d826f6cebb8f5bbe2cada4325e58e44df2c1f7834586a236bb41aede02737047938c741d336a519e949f604fbaf276c6cfa3caea2a1cc35b8cc1ae2a67456876 SHA512 678b36a0a5eca831168cf6d97b4495d592f0114003c6104c108e5546acb9e09093fa98a9b24d69e32244a80e3a5fb638a88f32990406787bafc5b0431d5c4bef
+MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/dev-libs/xbyak/metadata.xml b/dev-libs/xbyak/metadata.xml
new file mode 100644
index 000000000000..38b28ff6e621
--- /dev/null
+++ b/dev-libs/xbyak/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>zx2c4@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/xbyak/xbyak-5.73.ebuild b/dev-libs/xbyak/xbyak-5.73.ebuild
new file mode 100644
index 000000000000..4cfd5772e810
--- /dev/null
+++ b/dev-libs/xbyak/xbyak-5.73.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="JIT assembler for x86(IA-32)/x64(AMD64, x86-64)"
+HOMEPAGE="https://github.com/herumi/xbyak"
+SRC_URI="https://github.com/herumi/xbyak/archive/v5.73.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile() { :; }
+
+src_install() {
+	emake install PREFIX="${D}/usr"
+}
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index c02b2477e64d..ed058cab645e 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
-EBUILD xxhash-0.6.5.ebuild 834 BLAKE2B 1afc6f4abd178d88f9153357189adc568606438d44e31909e7e404a1927ca99d0066d71c331cbf4432702e99e8544ebb10d0d5bbf8625a36f6cfe8cc9a7a9662 SHA512 07a2ff9cbc7cd709e9b8288dfef2f17a8f96d5a4fc8845706d9d1a54afa496b173bbf8c5d1733c5f3b2eca5dfd5859b89a56b657cc995fdfbe61adda382e9666
+EBUILD xxhash-0.6.5.ebuild 841 BLAKE2B 0ae60d26d8550d51096667e808e58984cafe39e7f1e8282ec59e809d04fa0f1f20e6a5723d6e3d62b3410257fef08ca8691c87b6ec7de5d8debb36fdfb918021 SHA512 f84649c48e0409680c65251976b28c2b92c199cdf08e7c1fafc77d6e7ddd907f554d4061daa4e149a5bc1aac52c4d94ac3c6839b63e7833dbfb3ddc62b564409
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index 31959e459926..5c5cfd42d765 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index d8572e1d1b51..0ebedcaf0744 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 1f90edb5ac86..5401edb09b04 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -9,6 +9,6 @@ DIST clisp-2.49.92.tar.bz2 9055207 BLAKE2B 6cf331eb9f99f62579e35469e2d01cae06608
 DIST clisp-2.49.tar.bz2 8091011 BLAKE2B e034c581b8100837b34d0adf1ef45bd667272d062945875175958178b4ef5b11e899dfb76505eb8cb51fca6101c11a9f21fb2cc9a78a3c0f82b06166211434f7 SHA512 eef66fc85199a2c283b616db61bf67ff103eeb0f19fa907da48994dc790b6f5f8d0c74fb3bd723c6b827c0ff3cfd89fa6ba67934fc669ed5d5249044b5140d81
 EBUILD clisp-2.48-r1.ebuild 4667 BLAKE2B 3faf58158a98b83123813e31c4267af979eeaf32b4e5666e5c6ba770065e73112ba614141bcd4ad63b00025da83b4b2a1298e7f3486cc0100c930aedb94da065 SHA512 ea91c2007b376afc8d3b2e86753b63838e0662b9a4eadcdd473cbbbe17057dbfc6ab31411e5ff68a6814f83cbd37ddbb414cdd66b21c1aa9629c22b0daa40122
 EBUILD clisp-2.49-r9.ebuild 4238 BLAKE2B ff86f053328cf35a316be36309f43f881ae8490a866bdd0d00cf663f9fac6677824a2f5178f666966b0bcf24ab92aef09f9813f84b60bd1b9559ad7bcc72e8a2 SHA512 270ea4dac37edee7eaba10549e9cc126b622808951af59f84ac3955b83db6bc041475a7a5c83b394236e89ea74437324ef66f7e54821823a8d5ca143a3b5c9f2
-EBUILD clisp-2.49.90.ebuild 4038 BLAKE2B a95a22e5e69f9800164056d054d5bf85d6824e1f59927e99687d51b8028cba578952ca9154096ce7e99afec66a691d022c5ab46e1a3c98be42050328fd7233d7 SHA512 dbcb87db0248288e7f0dc2621cf30d7f73e0829536ebe36f39be05d4be11389a5b96a746ee1dc8c4c298a2fa8c51f25e033bc11cb384ed4cd76c67861ef76c55
+EBUILD clisp-2.49.90.ebuild 4045 BLAKE2B 382cf51c99663621a8c118d384c09fb6e490f986d65922558a2d5a998ed5204d9768ffc2a5a4963f6e8176b7f5ec1bfbbde9fd7e86275a54cd4a039bbe6c310f SHA512 5cb44922365a74b9451491baa2fe7f87be4d80323cd6601a65ed2f9d4f293e947df1af18dffce9404328a6702e162482b1d8a537d51f2fbb7f2f48780cfc6d1e
 EBUILD clisp-2.49.92.ebuild 4026 BLAKE2B a217cb0f52c5a7b81e12095c7a05395e8486c8e6a5fb8363dd536d74abafba934f566572c8584f65b392155e37732da666728245bcb6634118093bbc5c949834 SHA512 c55e1f0ebc7d14dc4704abb4e56870dcd1448d0b011db3da18b4ab24b357a5832de5b1a804e0a8f11554e784ccad9e824add04cc3681f2d414c7c95bf85c6064
 MISC metadata.xml 1362 BLAKE2B 707ff26161455d73fc21e7f22341e829e9310600a73f9ca28fa39f530f11bb497cc6eb781a628092fabde3eb342582fe34bd456ddd40022b5e4c5277e7be5fb2 SHA512 dc7eb6ebc84df7653de78f6a397677992a7c4c9f20e58562a78e409f8c83304de4ef9eb931db8fc23edee2157d92e9cfa9c08d6e129973bfd8c2cd767ace9a49
diff --git a/dev-lisp/clisp/clisp-2.49.90.ebuild b/dev-lisp/clisp/clisp-2.49.90.ebuild
index 0ad05dba06e8..660b5a4acdd1 100644
--- a/dev-lisp/clisp/clisp-2.49.90.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.90.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://haible.de/bruno/gnu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2/8"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib"
 # "jit" disabled ATM
 
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 6917438d6ebe..a32db26ac01e 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index 8e3b857d2c76..e50e2cb0bd34 100644
--- a/dev-lua/lutok/Manifest
+++ b/dev-lua/lutok/Manifest
@@ -1,3 +1,3 @@
 DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
-EBUILD lutok-0.4-r1.ebuild 745 BLAKE2B 56ae40a3334c79874fdddf10ceeadc5145f9ca14fc948e8b843d17d6bec3f6ef7f20e5826b8f9dd741f2c4085d857df7ee49d991ac0a5466b4f5d94f58a473e7 SHA512 87e597ed3ed9bfc1f25a9ada51eec93270129dc23d975ae2120fce76ce75c27270ef7332cf27fdc169e423e2f6ad516931dbd8db9a68194c8d37e5743e91dacc
+EBUILD lutok-0.4-r1.ebuild 747 BLAKE2B 267c98606fe34e92cdf497831b32683b87d7a1478649ac9612ddfaf98ffca84ada56c8b77b548b22bd76e9d2c86a80142cf20c4e0a8957254586dab9e65dc4c5 SHA512 0fcecb12aede8e73bbd4c77ed04d9b7807c42ddc8c56dad74910e8019728ed1d57726d2557313efab76c10a21a5a2c06efe964187528a3612bff215fdacd3ee5
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-lua/lutok/lutok-0.4-r1.ebuild b/dev-lua/lutok/lutok-0.4-r1.ebuild
index f67abbf4bf10..34302e797060 100644
--- a/dev-lua/lutok/lutok-0.4-r1.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index b45cb9215713..437e6cf41664 100644
--- a/dev-lua/luvit/Manifest
+++ b/dev-lua/luvit/Manifest
@@ -1,7 +1,7 @@
 AUX luvit-0.7.0-unbundle-http-parser.patch 1383 BLAKE2B 7b28d44ff91b9f599db4fc224dd471573e40c98caaa2404675d02cfc4de581457393952e4c793dd8ae55aedf133cd22e52ef6114670ae4d03ac0439dc6bab5f4 SHA512 0aefa90e3e10e557e59523f2d052aad8eb4f235471b34cf650a380f27faf97fa83cff6d1ae3c3f1e7642db839db8f0660c2ff2aa8e950041b3e1b3452d04619f
 DIST luvit-0.7.0.tar.gz 6440621 BLAKE2B 03cde753f19441bf408c3985704d9042bdbb217368d2effdb494c650038dd2f6a01acd81a73c8bd6e2ef5648d017eb27a8728f4ea568d62f9a94812cf19fe767 SHA512 9a2366d7033f685bdaed9d8fc22b74e570a6b2b5f0c2e5ecdea6b92776e12fed7ec8fa6c84ff457bdfc8849a7ee79c27803577857b3263e20c1fc53b87383b12
 DIST luvit-0.8.2.tar.gz 7126452 BLAKE2B fc08b9964883ad0708cfeec0740171936daa8e58b43ff587eecbe3986f86e46d850a67b47e7a14880c67b9abe650b5cac3bcffab1c6fb2a42f965f38663aa292 SHA512 46ce9e99d1a002697bb777000d97849135805c3b36344880c1d5cb48c648c7252ec440af35a78eb595d7706d11dc85f76e72c72569e2b3d26e2747b870f98c2b
-EBUILD luvit-0.7.0.ebuild 2162 BLAKE2B f7174ac4f2ed634360cffbd0fdc982325b79faf00912a9eee0d4de22785e9f8497c87e19f79819572cf611c9c46156a2a5c56e296c149745e6e78002b0153738 SHA512 191c8af8628f3560cd05899ff89b4333005e7efca09fb9a4cabeb572773e2f941818c0c45c6e1190c6402a1b2d6053bf05d6dee1f91d24fa455423598ed062fb
-EBUILD luvit-0.8.2.ebuild 2232 BLAKE2B f1c9f8b279f34c77a6e04ed6ac3ce118dc132c6a7c255022f60acfc552ef7e75824046e998318a936cf0c742e22cea4f6985df9a41c446aee98a5dba76909b52 SHA512 4d07fcaa70a0250e7960021ea73c972ea213d0b4f73d8455660713d08e6081620e9667b6fb4b8990fa8199c856853e4eee9f68105167e3bd86a9b21b941ba375
+EBUILD luvit-0.7.0.ebuild 2161 BLAKE2B ebed8a111f87384bdc048c737ee3a2a683ab793431e3bfdd38ea06914f83b0ae657826236d2d5ef8ed9622c790884293d2ca1c280e32c3c873f157ea2316264d SHA512 35aa95945973679b6d8eff916bd7d93071432d4c25c23729a7339cd68d5bab4258db8909aa7974c4e9db31681d07d5dc0f551d99c1b1cf2c7f910373e7d6ecff
+EBUILD luvit-0.8.2.ebuild 2231 BLAKE2B f4e8a1beb75015dc374e6e464280c56a146553532366f10fac7fef0f10c5771b17ad21b33d670d2a024b3a19b41022f6f03a538cfc35c1afce6947a91990eff6 SHA512 dfe469e0683498610a0dae6999c82e0d98f83374d636b72b48f503e5ab53803786d58c8da65ec2e81888ff082b17eea7eafa6418e070ea157952ce54fedb98c5
 EBUILD luvit-9999.ebuild 2425 BLAKE2B b625935d72facd0934674d6b6b93c8588ede4ad0baa87288fddd8b73acea37add5ca008c9993995bb96c0d9a3dcb1cd5f3523b56c620b71a7c830404abbf9d5c SHA512 082c7144b04be678eecbb1424a97b182d51730c5cf293c89c36d3cc1f36a8c0558be43c19c72ad6b6090194cb393836761f6a3926003366c704b4df647835ec2
 MISC metadata.xml 256 BLAKE2B 4770083294f5244f4cbac3512b31f2842b85efbe2d31a801f8937e0f0e616e8940c5f3c32836ab5404a29d4c07cb048a871360487d308eb68d01b7d97970ada6 SHA512 a8a13bfb63fbe12ba3f7753aff5fcd7711dcc1e5918d17fa67d0a9daaead72657f180538137148dfa70319ca0bb852c9c24416f9248564611caf75f68fa6f1eb
diff --git a/dev-lua/luvit/luvit-0.7.0.ebuild b/dev-lua/luvit/luvit-0.7.0.ebuild
index da21771c0b31..c36395406c9d 100644
--- a/dev-lua/luvit/luvit-0.7.0.ebuild
+++ b/dev-lua/luvit/luvit-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -29,7 +29,7 @@ RDEPEND="
 	!bundled-libs? (
 		dev-lang/luajit:2[lua52compat]
 		>=dev-libs/yajl-2.0.2
-		net-libs/http-parser
+		net-libs/http-parser:=
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/dev-lua/luvit/luvit-0.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
index 9dedec697b3b..69f8e85872ef 100644
--- a/dev-lua/luvit/luvit-0.8.2.ebuild
+++ b/dev-lua/luvit/luvit-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,7 +30,7 @@ RDEPEND="
 	!bundled-libs? (
 		dev-lang/luajit:2[lua52compat]
 		>=dev-libs/yajl-2.0.2
-		net-libs/http-parser
+		net-libs/http-parser:=
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 08343356e1d4..a06b3b46eae8 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index 21e8d14c0702..74b8f1492786 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1,3 +1,3 @@
 DIST yojson-1.4.0.tar.gz 26197 BLAKE2B c7d1a9d47f448995b31cd7631f64dec29e65b1f141854092bfe186a58c28b96c5c7f246f7e4ab4563dfcd84776904d4af77bbcbdc4e149229fbde339bd92df9f SHA512 dc019ecf0387299282c3df9a548456d2529993241911a83acb14f2361ed14886e5ebebe415773b6bc718cb0b12a25529184f3b5b62c71b42960fbd62e1c63bf6
-EBUILD yojson-1.4.0.ebuild 717 BLAKE2B 032af1cea5c51896945231bef8f53f5be2b79401ea62916615774be324f1069fb35c6c2290f40e616a32a994de12e90573a3e43b3f2e2510ad3a481bf4571825 SHA512 fab7a044839cd7cd13b7537ff3000c4a027ff69c1bb29e96f43e361a06941a8792df3018be945792cafc38b66bd2d955ff2e9b3214858f20c3e9e6d0d1518df7
+EBUILD yojson-1.4.0.ebuild 686 BLAKE2B 78ad59c5a42ab869a543ff97dbcb004cf5a7b5a49cb79d80f36a821eb866b06238d5843b7ffe72f272c559fdef8afb7443f73b05d7aaa742dcefabcf6eb28fac SHA512 7550239f54c45845b2844d9fdf00235d4fdf62990e5b8f988019772ecfa10e2c4cf1bebefac45e3ec2aa8cca12d04eb84858ae05fc016861deec9ba181b28756
 MISC metadata.xml 336 BLAKE2B cfb2743ed9621a08d35363acb760a838a06fe02cdcfface33fc399994ab0eb5569a30cc65e9dadc48fe3ac78c9ef01a07777174ee4ea631236650bc5a06be937 SHA512 414975df19a8bb9f75ace586c62505afe6d560d7303c88eb8823d61292b0ae87ab7f6fd2548dee1d08f682dfd31894b7cc8e328d5d68865d643b16d94a05c782
diff --git a/dev-ml/yojson/yojson-1.4.0.ebuild b/dev-ml/yojson/yojson-1.4.0.ebuild
index e3b9f39c5175..6a3ad0c2f226 100644
--- a/dev-ml/yojson/yojson-1.4.0.ebuild
+++ b/dev-ml/yojson/yojson-1.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=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit findlib opam
 
 DESCRIPTION="JSON parsing and pretty-printing library for OCaml"
-HOMEPAGE="http://mjambon.com/yojson.html https://github.com/mjambon/yojson"
+HOMEPAGE="https://github.com/mjambon/yojson"
 SRC_URI="https://github.com/mjambon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0/${PV}"
diff --git a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild
index fe986911f00b..e93a1bd0b83c 100644
--- a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild
+++ b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Compute intelligent differences between two files / lists"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+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"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Algorithm-Diff/Manifest b/dev-perl/Algorithm-Diff/Manifest
index e5b04119748c..ec5592e83965 100644
--- a/dev-perl/Algorithm-Diff/Manifest
+++ b/dev-perl/Algorithm-Diff/Manifest
@@ -1,3 +1,3 @@
 DIST Algorithm-Diff-1.1903.tar.gz 34174 BLAKE2B 85d64400c722d9547efb0c63d717f9c70cdd9f3b8282ca67d1b513507adeba0af68b2e45fe46c53ebaea85c3cd3f4e6d894c68d68587d88b01ba3eb362bf1458 SHA512 61632be4c19a03ccacaa218ab7cb8bdbc53a4a6030b8173a59c7611056375536788392c1da00ab88f3df9884fc8a67825efc83b70e2e564664d5187021d6b106
-EBUILD Algorithm-Diff-1.190.300.ebuild 498 BLAKE2B 6a79244a3f452b454203762968731bb26775656e156fdaf964e01140cdd96807eda435c1506406a58c816d3bb6cd3677937f451183374ccac5ce136a182843b2 SHA512 0c153790a51705c03dd0cfe3647f84e0314158a40e38813e90cae712515c46054751cf8026562e107b8061f7f9604a06ecdf5758cef36c7820fa2e9a8128b5af
+EBUILD Algorithm-Diff-1.190.300.ebuild 558 BLAKE2B 5477e83d04777ab9f1f0f4637a9ec0b2f9d208c8507da3cfee3f45d5dd79b4caef9f7dbf3a2cc6d51976dbc2a6194df342fe470851d01d1d9bc0fb86c755bcf6 SHA512 b6782cbda4599101f5704d4e29c0459653eb122a11b4e799b0be25c714cd4a6874cb996e224fce200fce20c7725825cd3159bea8e55f9b5c8cd84a3d1e9d0929
 MISC metadata.xml 589 BLAKE2B 151bc973e2175c575b9f4b3114020bda4272db296f8ef300d2af028927986fa6c383d853e37aa21adf80968ee72cfde6465ffacad81f8c68625147a8f2227cc6 SHA512 4c44635e9c899355e9e47f8d7c3a491b0fa403bc49e415e0d27fd5cca96fed72586cfe77fbf9ec516316d93bde1142b08d55ed1894d623dc9f0ff3ea677abd48
diff --git a/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild b/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild
index b8ecee0a4c0f..e1eb1a0d269f 100644
--- a/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild
+++ b/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl-only 'which'"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/App-pwhich/Manifest b/dev-perl/App-pwhich/Manifest
index 13c2e00352da..c143f01c6b62 100644
--- a/dev-perl/App-pwhich/Manifest
+++ b/dev-perl/App-pwhich/Manifest
@@ -1,5 +1,5 @@
 DIST App-pwhich-1.14.tar.gz 13900 BLAKE2B 679a834f85993c780b95dd8fb2db20d0c2f5c336ae6e48f702e0fe8d9e76c92534265c5aebb2d9a793f0aefd2bb3dc141d100229d52fcd913fae1fd369e25664 SHA512 515981eff1aa6e20f211336e9543dc3d3cd09c80e9b51698418350e112ab0985ab27e278c7beaecc61c26600ed74083a23a3d375e845e5ef8cddf9b95cfa5fcf
 DIST App-pwhich-1.15.tar.gz 15257 BLAKE2B bb693d8866b93c8cbfaae6bcd23730e1db2d89e5c30998816425df4ba15671cc1296afdc4afd91b57ba826711ae66e820e1eee5087395a20cba0b4a721030ca1 SHA512 ca4f8c2f4dd50123f16694e3ad7d4a0a45a0e2238b501e3598b0a3415406900f60ecf7cf43eaf501a03769c9c6bde2f21f4d34e8610582d6c657707f6c3ec461
 EBUILD App-pwhich-1.140.0.ebuild 459 BLAKE2B 6d70f70932c86561f503f6c28fc057c2171554fcc7c98b28445ba77ce23b58dfd8d4002ee2245ee151a0fef6bad968e1d533ccc367299def3ddada0f36d51671 SHA512 37758db699e1e69943d3f47396540b3ca636350d5100c7694b2c8069c03701aa50eb2c66bb664b2a697caa5273b4944933fb30daf3e5c3b5c70574d4dff1b2b9
-EBUILD App-pwhich-1.150.0.ebuild 543 BLAKE2B c3cda7d0edef65f913053ddb7cbf5d81d2814f524e23ca999f8f84182d8e7bda1cde133261bd91d12867a0ee46e7f171c85ee9b29bbb9f2e26942dfc367f42de SHA512 893707ad570447403670cab8f29fd740b9499605fa372bfbd24418f1332a199c937b235927f60adc0d4f5adf75a8809094200d8fbffa03ec42f3bbfa1d10b370
+EBUILD App-pwhich-1.150.0.ebuild 675 BLAKE2B 411e59e1c4cceebf43228fa29c92de532f22eee3a44436a39893ff54b8ca2c902d3f3ea6f3e0f3c4e101989881cccfce45e8a6895297bea48747cfd8161ad9f3 SHA512 3e3f2df4027420359332c9af86552c45a925439b22acf1ff3ffc59d0fda6ccdeb58e0fa6ea05d92652f4359cca9c0972ac9203db474423296a3a2f24690606ac
 MISC metadata.xml 392 BLAKE2B 80688a705e20a8786d2aaab17623c50d3f6ed1ce7ea10433d0f70fd907e9504d190028c2fc84d5c72ca6d759bbdaad5bbdbd5fbdb3c1933e144c2bc6841d3a64 SHA512 2bac82b1e61abeb1f1edf0ff8bbc01d200a6c34778502661347c8531cc6c2a19b0d0c8241250b1a93cce9070b41496bedf56320999fff73d6a93aff31513a0fa
diff --git a/dev-perl/AppConfig/AppConfig-1.710.0.ebuild b/dev-perl/AppConfig/AppConfig-1.710.0.ebuild
index 57d1a178855e..a756ce5c9b3f 100644
--- a/dev-perl/AppConfig/AppConfig-1.710.0.ebuild
+++ b/dev-perl/AppConfig/AppConfig-1.710.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl5 module for reading configuration files and parsing command line arguments"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/AppConfig/Manifest b/dev-perl/AppConfig/Manifest
index 246612689467..f97e005b910e 100644
--- a/dev-perl/AppConfig/Manifest
+++ b/dev-perl/AppConfig/Manifest
@@ -1,3 +1,3 @@
 DIST AppConfig-1.71.tar.gz 56739 BLAKE2B 6244f2e3f6b3d5c4a401fa711db894f401c3707f9d826688d7d6f5fdb6bf330bdc29b7084a69b58e505fbc8194b991f08d0f367e35776c798dc3b405f2145d95 SHA512 cbd58601ce0ea6c237e86b8b013cf75e552914263f56b1ab26b8079bff75b28ca2bb35585bfaa187b611afa969767c25494d3ec2a6b3ff5d1aecd2f9ffa8df72
-EBUILD AppConfig-1.710.0.ebuild 606 BLAKE2B e54629bd0fe347ee68640fd899373077c6e91fb8432b4b56f58cdeafc078d1223f0304e390e925ce0adf2829cc6779f66926415152d0b7636b9ce538c6fd7dbd SHA512 b03c2613bd740b25872e6ebbea6b660a419efb60963fd799f78949cc9c14e2cb3ea95e75895d00e4561b04fecb8eaaefe9c942d08a26186536c07679df86d15f
+EBUILD AppConfig-1.710.0.ebuild 716 BLAKE2B 1ec2cf40826768d158f67f333536c756fd98038f36fc321b0dda80706ea6cb52714edbe01cdf39cc95e6585dd6f9b802059e84505cb80f40035e772b899218c2 SHA512 323ec48e50c8e3ff84a8e594ae5ee6dfec737956e797d3fe1685ae4e4955bd1dfb37dedb2c5f2a52e537b94a717f1bb4604ef13b94e2cac9278ebdf035c217dc
 MISC metadata.xml 762 BLAKE2B be48787011bc20015c0cb17accf8f610d943a27e55543defbdc42487322a53767ea1aa0a284fbf8a2db5b03e58f699c855a11844a4d6d4ef63ea93d1f9d37c9d SHA512 6b05ed8510bdecf8e72fb5032fcc36a08387fcc175f4a3b040589ddc75db74dda4046b56e7ca65b34b364adf47592991c2bc72268d2496e7c4217a01c360586c
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild
index 67dec359bfc7..a11e2906e291 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Archive-Zip/Manifest b/dev-perl/Archive-Zip/Manifest
index a339a880b651..9777115674a7 100644
--- a/dev-perl/Archive-Zip/Manifest
+++ b/dev-perl/Archive-Zip/Manifest
@@ -3,5 +3,5 @@ DIST Archive-Zip-1.63.tar.gz 191957 BLAKE2B e69f132e09458a2d4286b504113b53a7efef
 DIST Archive-Zip-1.64.tar.gz 192005 BLAKE2B 0a9d4c9a7b74fe2136fe42cd10b667813e6528129452b7db72dc42af56ec7187491365ae65653bd475afeaa55440370c23a06ff842d9ebb3dbeaaaab14527ca3 SHA512 7ae4c87ad50b30e764a79ada8f39ea2d698cfba957294d28dc15a2f3b2497923266a00574c5e43ddd59d6ec76d911f39007851920e0f09bfe3f466d46e17d6fc
 EBUILD Archive-Zip-1.600.0.ebuild 789 BLAKE2B cff5d1ed7d2da83405e03bb6043354bb20e13228e62d7ab6dec4d5d2aedebc6bf2ec268d308e965b4282d9fe03db22ab667c06df876f8f89fe4ba3f4e639bb48 SHA512 8fae5015313e935b90209f988dc6a115602268845e3bb07da68a7891bf12aea775ee004c86b441df53bf07936b4b08bea49a8dd73553bdff50108e2a3c95fb1d
 EBUILD Archive-Zip-1.630.0.ebuild 819 BLAKE2B f317141b3ee00eb712b755e09407ae7b6951599c5eb0e6faf5c21a8372fa4b0701caf71105208fd9fd3b038fde9ed6f60adf9517ef4add205c426927839a9ee6 SHA512 dbd70ec8a334168cc7bf620d4ae095a78ea55cff890a43993c8db1b3fdd01917a0ae7029729568bb74defe98a3c74bc80d541f84975fbe0a3788bdc26014f0eb
-EBUILD Archive-Zip-1.640.0.ebuild 819 BLAKE2B 85c1527568157c797f7da712fee0ed8693fd41c8afa0c8ca383ea7554c953658aaf99437b75148a83082c30bfc48627a751912500d012f361eddbd8772f242f4 SHA512 a57325aa1bfdb739b38ae51f2fbeebcb8c8d73f97eb07e490efd504740c0bf3e1c2a7b9afea37d056ab81713360401dc0a6bad656a561a55794ca3f438f7323d
+EBUILD Archive-Zip-1.640.0.ebuild 853 BLAKE2B 51cc9efc6f58a3962599c62f725d046fb0a1d37c8a2e9c629c799c895b112c172f247a5a62b304be228ec9f6eb696de51c8e5c8e4a7130383b3a20268fde34b5 SHA512 f9fbec7ed70f3ecacd79b6fb682a371d4ad421a4408e2afd502ceb948ceb7363f99ba63184a5961330c3cc126c41f796fa902830bb7348fb78cbf9d86250fb04
 MISC metadata.xml 1187 BLAKE2B 93311e721bebc19566b1108db3e9ec72034db4aaacbbb3abba77d35c5c53ad87a8c57ab7a3778a9062ac452983a0bbefdf7fd11b49c23df07e043974f8922acc SHA512 cab4eed19897f888eb2ff9cc094ba567053eeb115610b0dd4093db37cb8a24488454bfda9b75668f57d37d46e64e3cec5fa300b4227fe40b437c167fb38b690f
diff --git a/dev-perl/Array-RefElem/Array-RefElem-1.0.0-r1.ebuild b/dev-perl/Array-RefElem/Array-RefElem-1.0.0-r1.ebuild
index 6080c4b9b4e8..531eccdb2c8c 100644
--- a/dev-perl/Array-RefElem/Array-RefElem-1.0.0-r1.ebuild
+++ b/dev-perl/Array-RefElem/Array-RefElem-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Set up array elements as aliases"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Array-RefElem/Manifest b/dev-perl/Array-RefElem/Manifest
index d4b9a6137f84..b0a2d53af058 100644
--- a/dev-perl/Array-RefElem/Manifest
+++ b/dev-perl/Array-RefElem/Manifest
@@ -1,3 +1,3 @@
 DIST Array-RefElem-1.00.tar.gz 2030 BLAKE2B 5849c06d97b7d6291ad5c97317fcf5383205cb6fa17d1eba046af652c6c072433733989b206e93895b7e5a7b04829085d1d93794065484fe0d05284e840405d8 SHA512 dd56af05e74462553d1a76d9b39b451af9376bebf2b2aa8653f16df9b0d1cad320c2a8539c592179a17c981ca4369b06b5343cef2642eeb2928640cb99caf23f
-EBUILD Array-RefElem-1.0.0-r1.ebuild 315 BLAKE2B 97b561862928c886a6c62a463569869cd0a949cfcfcb4e0e36dfff27b6391c9000e92f2be815ff28932809504723d53a831bb8bc7e6f8de8ca177f43835fb086 SHA512 6fc69dc56ad0b5d8698e2782f36f68a05a99605a250b33da12d04b8ad153e742dc746540187aa3cd7bfe48b113b6770ad6cf3e08cae79be8f54caa2bf09b49ff
+EBUILD Array-RefElem-1.0.0-r1.ebuild 447 BLAKE2B 3fa928a1a12dcdd77756d07ac81c230f76b390c6eef3540b04e4322ce8b55060520bba44dd0f8ab5c0592ec9c6d4977d1bc7521852aa31bbfd39667b1f9d68e2 SHA512 0e14ecd8f1ce36b36edc29fc44da06435f0885ed94ef0ab097c8fb7c04508ddf102b2da03d10f8334dcff76e81ac34692840cb5ee56990cb6a02a12fc011d576
 MISC metadata.xml 398 BLAKE2B ca89e45e07c0bc7e7d162a28cfeda60b6c58003b95e45aef83df86a635b2875d44575786a1fd34f7e1c66965f70554de78835ac80c1fe1ce2f5141b6c29e5068 SHA512 e56bf464308b7ca620ba10c938efec3d08c665302e49e3f343d19a1e29cc0418d2fbcd9f75727f955df279b67d949fe6368f3a52a5cafa6d9d368eb5f744c661
diff --git a/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild b/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild
index ade6122f9cf9..c446e00f4b14 100644
--- a/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild
+++ b/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An NTLM authentication module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/perl-MIME-Base64-3.00
diff --git a/dev-perl/Authen-NTLM/Manifest b/dev-perl/Authen-NTLM/Manifest
index eba87a7d0d35..e648573e7bc6 100644
--- a/dev-perl/Authen-NTLM/Manifest
+++ b/dev-perl/Authen-NTLM/Manifest
@@ -1,3 +1,3 @@
 DIST NTLM-1.09.tar.gz 28766 BLAKE2B dbf8f4497f2e57c72ad6a5dc6ff21e3cba35bdeee1ebccfc9efecb04a9808b7f3fb929c055acb7038f2990e6ef6a553a09573af70b065ffc74a72fba223e2fae SHA512 faae9a4a39f483a9612e5a7daec15bb8ddd940ccc73e52372dd004a9067336fccc4c490deafb3eaa0cf56c0dfe3a085cb6bba38631a5122c2f2fa6e960845039
-EBUILD Authen-NTLM-1.90.0-r1.ebuild 546 BLAKE2B 8fd5541a0e965c56f3ca70d76dc8e28e74211f0cb8761a09a10ca3f8752a133cb630bd955c87ad5ecb46af44edc9382bff7e621d0d7476e8354e7ac24000c799 SHA512 b5a497c8ba8c1d088660e2821550f9ce210bb1b4d158d19f616c08c6ce9e0864e8c509b7d68b92ebacc346438e7d50ad0f21fdf972c624b545383fa3b22a7872
+EBUILD Authen-NTLM-1.90.0-r1.ebuild 678 BLAKE2B 0539b19a6b5e45fb3e7feba9e428faf54f909f1003324c620ea8f9aca160e6c47cf1530680a9e7b5229c5c5c634fa885ef2239de101463146925b9ea99aaf7e9 SHA512 f434867802962cc0fd69d97a14922070d943f009dec371a90c86cfc32584d555528c36a4d4451259c9192329e383454f61b119341973d578f933f54f8e64e2aa
 MISC metadata.xml 515 BLAKE2B 921ac9699c641917c345c9856780467ca3249ca9ec0474aebf6c6aca9cc9962a75490b42333211e46190d588b6ee8460755cbd43ad1fd7211259d0431bf355df SHA512 eb1cc4c67fffcefe2e262f0b483d810e0d8719628dcfd5c528c95fc721f66862b1aabb4865d10add7851a557bc5d9cf484eeb49462f9ac493a6a4b4ec08f03a8
diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
index 4ee44b36b73f..72f021a19eb9 100644
--- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
+++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Execute code after a scope finished compilation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/B-Hooks-EndOfScope/Manifest b/dev-perl/B-Hooks-EndOfScope/Manifest
index 2d2ceeb9d4a0..8645cef1f4ef 100644
--- a/dev-perl/B-Hooks-EndOfScope/Manifest
+++ b/dev-perl/B-Hooks-EndOfScope/Manifest
@@ -1,3 +1,3 @@
 DIST B-Hooks-EndOfScope-0.24.tar.gz 37859 BLAKE2B b5e4f0061949af112b9bcb89c1352e1385222c291624df330e8e60d3faf48f78a669650b074b1659f8287f14d46bdb488da0c943a0d22adb5a50dc37aebf7754 SHA512 5c061a81a3fed88ad868a14a1f817f7952b2f0c9512408174354e0ecf7e3caa5d646054cf75efa8b8c558e6241a8dfebf9400e8826021bdb5cbdf3a00065b147
-EBUILD B-Hooks-EndOfScope-0.240.0.ebuild 721 BLAKE2B 7147e36799d2ab38c5fae639d55677aa7aecf5b9488b670436bd9a9915ade9b08807685a94b17d306ce6361f2b19c8a69463dc5647b377fde91f949410c51b83 SHA512 48fc1f69d72df7f5ce3c532474b5f23dbd273440567b1a17ea2e9ce35609d80ba90a5a18d1c37d88726ae6700eac728c971aa52cea59731bc82a7b92e5f9b57c
+EBUILD B-Hooks-EndOfScope-0.240.0.ebuild 833 BLAKE2B 17f05e529fe251e058d78d8ef8b94f0b2afc757051e1482c6dc57d4c57aeeb21fbac1ef4144810274607b18cb00b8e6a4ff7825963bc71e3d5c7805a7d6b9ee9 SHA512 0b7a622cd29c256d9f350ebb15edcae2efe52a4962711c527cd24c2bc183f7a9c97fefa5879ed857cbce2a74b0e749c074f3eb9a14fc8480a4653ffa5cddb8cc
 MISC metadata.xml 551 BLAKE2B 1f029ceea8b1946ac24943bfc3071524b2e5c245d8c9806383fa46d6e761f4d7ac84868acd65936bde6f98746d4df45d7af2b089bdc29c3593319194bf755cf5 SHA512 3624449a7844dfe649ebc7dc90e197a496e92a678d8d08009e164914198a1722b4cb3af43590dab725281d45c70c0414b3bbe888bffc0702e774f0e066e1806e
diff --git a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0.ebuild b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0.ebuild
index 0fa11ae6373f..f5e6fbb251a1 100644
--- a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0.ebuild
+++ b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Wrap OP check callbacks"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="virtual/perl-parent"
diff --git a/dev-perl/B-Hooks-OP-Check/Manifest b/dev-perl/B-Hooks-OP-Check/Manifest
index 23f300f6cc73..81b7780dfdf4 100644
--- a/dev-perl/B-Hooks-OP-Check/Manifest
+++ b/dev-perl/B-Hooks-OP-Check/Manifest
@@ -1,3 +1,3 @@
 DIST B-Hooks-OP-Check-0.22.tar.gz 76535 BLAKE2B bc0c6b7b057fab226ebc44376eecc26efd58b699ca87588dfc25d2f539f955f6e657a4e206430b80fceb5039d3203af75ace76d0e86b85bc734b8befaf0bd9aa SHA512 e68b08a34244afc73d7d3b2b0acdf8fe791b0b1f087b6b0496da0a1e655a9e51552ec8fb0f743c8626a0414fb469a2133d113ff5b4ba9f96217cc87bef877542
-EBUILD B-Hooks-OP-Check-0.220.0.ebuild 486 BLAKE2B 187fb9f9766c8311693153334fc804382ee3c5fc9c3724fdaca4e8b9a0a61ff665fdfd4a76e24155d849296e0a1033ba53619576740fe9d6d004a9caa4ee4da7 SHA512 cdd80869ea076caf935f7bc1759ddd926e137f8869ebdb9bb6c5a489186b6451a8eebb011d40045d916ae1b9cb15f8b7f6730c9803c1af36405d4c3a491a3263
+EBUILD B-Hooks-OP-Check-0.220.0.ebuild 618 BLAKE2B 6fa0e85c754ca2bd627c774fd2dfbe1f343f2de84c91fc029850a811e8d402ba325d4a8d08d19751de3a06315452cdb2dc3f770cf9af4eb73f8fefc8d85beb62 SHA512 dad2c87c7b0a333ec6f676931b0a7f98ccc7fb2915ab1677be0eaa107801fb093855c3f73231b41596a35b935a5ad52ecc674ae5f2bd1810449352aa90448454
 MISC metadata.xml 406 BLAKE2B b4956eb9a09808b0d00400a10debd60ebe56f1215212e14528d468144d1b119a0dcf2404aa07317f42222d7b0ab8760fe35759e700cc226076f2de44cc382377 SHA512 568d5590456bf5ea48ec90100403a58a2ced82657bd876d6850571c49fd932b438f882b85bd6df6552a1129c585db8bd8c32b1870da7f44ac3fa211ccd3bc57e
diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
index d10c9795bf8b..42d1a35039e0 100644
--- a/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
+++ b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Efficient bit vector, set of integers and big int math library"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Bit-Vector/Manifest b/dev-perl/Bit-Vector/Manifest
index 9d698e738a48..af11ed6d9f31 100644
--- a/dev-perl/Bit-Vector/Manifest
+++ b/dev-perl/Bit-Vector/Manifest
@@ -1,3 +1,3 @@
 DIST Bit-Vector-7.4.tar.gz 135965 BLAKE2B e05391b2a38a30f33d9029273c4f5ea029a8d97db21c0c2d60406c05185be1ada280744c5008129e27c79993a726ca0bfd682a9c33453f6709fdb5614bd3229e SHA512 80aa49aea8c31c60c14161198eab9d620d738530c3c209104b8ad8f1144822f80c3effb3303c569fc556b2457328659ae5d1aaf511d714c835618b84c722abc5
-EBUILD Bit-Vector-7.400.0.ebuild 506 BLAKE2B 43819877f7d27e341d20117a72cb2d36d813f0900a6e091c2789c7ba319814bbb755af75ecaddce616a19418bab4d5b25d55768484ec11c49398768ca6408f59 SHA512 acb51cf5819f0f4970767e8110095f62e4caee39c35c25d1369227eaea88e7be1ec2ddd2b1579d5de131f810c6d3a3204606d32aac49b49c74c7fcda1c852a39
+EBUILD Bit-Vector-7.400.0.ebuild 638 BLAKE2B c975b8c57dc8573176a828761d949e8aa31fbc0694fadacf4038d6635db07c4a971b8c1bb05e178f7a1c451e012bb1fdbafa2ffa026fd31b1d7c175c487b0283 SHA512 3b318a40c0bc6a996201438a113755c82eba26ad41a750d9cb1756b46be01425761e0d2c93928c9c0ea6c0568ecb39d15cebe25d97402b794d13e54342beb022
 MISC metadata.xml 526 BLAKE2B 846a5bca2fdbc8d8ff10bd7c6f468289fda120d522603880130901b0e5678dd9112c8a36f669ccf884c557dd6324686d310af1a1083efa1867f5d615d703c7e9 SHA512 746690e144d0445a278a63248f0a3be4e675f96e15e9f2422568d52d3d09713db7a6c8516b490f0021b8f1b725a40a83046180626731a9050884d8a2d1a5ee9f
diff --git a/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild b/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
index 5fb91d5638ff..c46794aa9b11 100644
--- a/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
+++ b/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="CGI Interface for Fast CGI"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/CGI-Fast/Manifest b/dev-perl/CGI-Fast/Manifest
index 19b28a13892d..da4c6606f006 100644
--- a/dev-perl/CGI-Fast/Manifest
+++ b/dev-perl/CGI-Fast/Manifest
@@ -5,5 +5,5 @@ DIST CGI-Fast-2.13.tar.gz 8844 BLAKE2B ece86a8ead5a83c0407f6c2713bf0848bfc895d90
 EBUILD CGI-Fast-2.100.0.ebuild 578 BLAKE2B 7c79c9f94ec968d920ded78ab3706cb172a01daf6c5752222607ede2e40936ba66e6c25f9ea609f232d4dc44786db5e3d971322d8bcc45d0d2a882c83bde3f96 SHA512 45ab65b6a135b10ffb5458fdc2a45ef382622d42cb93f45a223124ed036a6eae58d357f0410a7f33f1811cbf644a681a3be0d067e4b6e29287d60bdcefd879af
 EBUILD CGI-Fast-2.110.0.ebuild 600 BLAKE2B 6597e716cdc90414219244baa23fb011b1d7af88ca929d67e658d6fa1993068fc7f6db4d548be0552c46b83acc2f7b10b502e2e880ca5654f4f9e9b65caa9b87 SHA512 d3067abb78b0c633983f117928510e730a2cbb40847d357b1fd12e0921d80ea29c738d7ee3d86a1dd13b01154cc6a710d5fd70442b2a6ef9db511854eab616a6
 EBUILD CGI-Fast-2.120.0.ebuild 637 BLAKE2B 369af185b175ef0d9b1f7c4434a044be66b0f11d2b466d6ace60fafd2ae89c125bcf056d548a1da00a662519afd166f03e3cb0fe4501c65bd857d0bd6beee065 SHA512 d4575345e397a0fd3fc20eb77c0769ce05d1ba4f70b96eafc37ae0a560bbe8cb86850201564723dbbc5ad0175475e1233e8929ff2589faf09acfc8bc5a8dd6af
-EBUILD CGI-Fast-2.130.0.ebuild 644 BLAKE2B 66d6acfa166eb2d38ed3b770b914e803b78163828fec8b0e591ac30fb4419a7feeb502b1a7b88337e21330231f1e4210ef3ee762948f9646ceb4593811a4d470 SHA512 af59253c232f12b7ea3dcada23d09f5950c5d2dd98813c120126fee67fe18bd4c2e58c9210fdfd8f6ff568d1722bae770c91cb449f2ea4ce52bf9f3c3c07800b
+EBUILD CGI-Fast-2.130.0.ebuild 691 BLAKE2B b1308ab481117dd1b4064aa4d79f33d2ee46ce1c5c746b5a17a514387db46a45f1120d2187ae8dc18a2a37a6e59e0c67c6da77669454169713648eb858251aed SHA512 a6ca018a9e571f3462add92bb8457572754116cc42b4c352e2e209d2ded2efad0cf3472d613e420601f2a66651647a6c883660dc9cf3fc883c123f87dab37257
 MISC metadata.xml 388 BLAKE2B eae3b4d4c39119e174a7ba3675bae1fc2f284c6e36739cbe42f886ce5aa927c57df46afd0ec8fe9cfd0904807f0e41dcb07514baa23c6f3e930d8a3f9a03f10b SHA512 9381464ca55695107f53c7ded8490e9bfe24f3ffe77a4587a84624786c2125f28eb0b3141711bc27f934954c8816c72e7e6ef453918bcd16b832b7d370c76f1d
diff --git a/dev-perl/CGI/CGI-4.400.0.ebuild b/dev-perl/CGI/CGI-4.400.0.ebuild
index e321b61fd5bf..4199390f6ea9 100644
--- a/dev-perl/CGI/CGI-4.400.0.ebuild
+++ b/dev-perl/CGI/CGI-4.400.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Simple Common Gateway Interface Class"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/CGI/Manifest b/dev-perl/CGI/Manifest
index d2b4f07ada68..0977bdd65386 100644
--- a/dev-perl/CGI/Manifest
+++ b/dev-perl/CGI/Manifest
@@ -11,5 +11,5 @@ EBUILD CGI-4.310.0.ebuild 999 BLAKE2B 7a9755e03cc2bbceebfc95091aa7cb54d1a53fdd3d
 EBUILD CGI-4.330.0.ebuild 999 BLAKE2B ca6fcc42fe526fcc5927347eafacdd2efe484a61d5bb1e39c38f4d7c8e142264ed4c4fe452658d28c6aa07835e9fe137110c57148196da7f6cf800586475ddab SHA512 f7d912af07cb23b71be21e5f5957d45368949c670f5a52d76efcebd205ccf5337108f900828d125a5772847231b38ba692ae36f2d73dc7c25b23607a87708559
 EBUILD CGI-4.360.0.ebuild 1028 BLAKE2B 693854a91cbc87739b289e11417f9501ffc627edddc4b0e83c5551e2e3965bbe05b3f7b862745acc35196d0cd371beb89dfb72be7601e5bf14a7a402fa409008 SHA512 ff5db7662ae5551ed712417e73dcf2295bf7fd49ddc818fc716caa416ff109936b9c3422ccf763e1daf49f8313e27bfa75a3b1f3f1038f5050ae2eee28634ee5
 EBUILD CGI-4.380.0.ebuild 1007 BLAKE2B 63d2a85d0deb1df3892dcc27032438823b53ce8f5f89857b8305feb319b26f5fa83dfbf4a33652495d0a0748757fcb0bff78bdd65528e44f47862a349474b6a0 SHA512 0a8cf79a190ed02f5e21a3743858c031912e99a223cb5c259120519954189b9c600da0b8611ac269d1af88e45d592a1a9d042042f5a1e1029f1b9511b44edbb9
-EBUILD CGI-4.400.0.ebuild 998 BLAKE2B 7d162cf8576113e31d6157b19e97fcd794f82e9cec4e9bd403f37fd94c516466f8151a1fb6113c5c468202445337fc53a70ac90018f0cbe27cbaea4303bbd990 SHA512 587cfd72e0da6e159491c2783b4fb1e51675a5c50e3c80413c10b5fb5ed98f869b3f4348140c9750becc513429b4692908c8ba9426d67629a56f6d58e35bd7de
+EBUILD CGI-4.400.0.ebuild 997 BLAKE2B 05329bfe0419a968743d3f50fe5a2baf7e43ef2f35765653b15fdd04b1eb3f77be4a7121d04397cc5f214775f1fcc6f0cb0b3a3db18805f0c3120984afca1913 SHA512 26482279d6d62433952860fd3b19075852ed674074ca0d53e6b24d78ec52b764d5a2babe26badd042886992b07487291e9948552ea27063b93dcfedc766c5172
 MISC metadata.xml 906 BLAKE2B dfdc7b33ffc98d0b9322c6682e0ff42ccb21f7cc52f5bf1f30e14284bd598bb02c1a63af712c20880d391f756855d31a77b21e6c37f35716fcda5d74cec8dff3 SHA512 89ff442464fb49a81c17538be8756521ce901bfdffc7e72b8ddaf56b00bbda42e1b9dd779c7e975986a930662ef1e3e57bfee10f51aef656db48e2a573ea04ec
diff --git a/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild b/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild
index 4f2ad95fdcab..46c55178031f 100644
--- a/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild
+++ b/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION='Read and write Changes files'
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/CPAN-Changes/Manifest b/dev-perl/CPAN-Changes/Manifest
index 545ca6bfbd3e..1f20d3092829 100644
--- a/dev-perl/CPAN-Changes/Manifest
+++ b/dev-perl/CPAN-Changes/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-Changes-0.400002.tar.gz 21361 BLAKE2B fd3f293e3bedfc4b1dcc5a9fc20187d08a3ffdd5c9fcf8233cc666d614c65d9b071bc410843b969307a873ecc2c5ad375e5a7e8a9834da53da821b1b7ba74434 SHA512 d359073d9d5ed2126835d4895c1ee5288cc09e72202ba77441bb25cf13e9cd0f16d4040b7e2cf1785efd6e8ccbe7908415fb4fefeebe9c0548d838d2ac850dfb
-EBUILD CPAN-Changes-0.400.2.ebuild 474 BLAKE2B 52383ff1814c53244706ec2ddeaae52837efb3f912910cf8f84f79bd1d75e350cc3ab5fd1554e135d6b9dbd7d7aa09c804ba04b6c81b4dc2dbb041aac6514a0c SHA512 542320a695290c8d89a2148e131bfc9d34969192c21153195a44799a132ada97d7cdde985a23223a4da01bccedf9a6ae1fd7d52577428ec285f2882a39c494f4
+EBUILD CPAN-Changes-0.400.2.ebuild 606 BLAKE2B 9b48fef854afbe4e4c92ea8d7a76c460471bccbe1fcc2c3799330133f5e3def0ccb84675c87cae8457159b3dddd2191c4a57b5e634fc9e19a411cea8050c9bfa SHA512 909235da64b75a4e55578ae8ddb320de1a718cad73a7248fb5037c01e908b22a41a2cfa19d491f9fcd8331f54b0f2f9a414d2c541b788c3f627d3646bf912006
 MISC metadata.xml 515 BLAKE2B c093c6767c1ba2c6e696d267b7a04d4d60344977e89db38edc68f01912be59ec9f5763ce7ae82d726d0a108063c91ec8e04cb2e409eaba14aceb382a0f78b299 SHA512 5cfa3ef8a473d67691b66109e2c9133c3ac686db10ce09a8d19436fac039fe88281235f861cf46f30a9faa01028067c1b76bff0087184ec6a350643e727e36ff
diff --git a/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild b/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild
index 221913cfc58b..c282b803d66f 100644
--- a/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild
+++ b/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Write a CHECKSUMS file for a directory as on CPAN"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/CPAN-Checksums/Manifest b/dev-perl/CPAN-Checksums/Manifest
index 29b943fc996f..bf9157a9d846 100644
--- a/dev-perl/CPAN-Checksums/Manifest
+++ b/dev-perl/CPAN-Checksums/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-Checksums-2.12.tar.gz 14868 BLAKE2B f76ce9bf174d35225d16327b816ef34555c5417f577256b173731d15d7ccc38f6bd982758a3f578a7ca04b7bb08636accaada0f50a015808923d330a22ec18cf SHA512 86cf82d04bb9611d2efbbb1a5c5d5b793a07a1c844e205b6c3ebddc26b4fd5f5a9b3a5a8ca659d5a546c4c3ab0de93b39f1af2d4cae802213d40e1f93f60d4c7
-EBUILD CPAN-Checksums-2.120.0.ebuild 898 BLAKE2B d59ddd1124b43b948a054537ec05e063bb345a5e936494b57782c332b66e749da66aa93b2bcd98c74820c39e1168e53d2b2cec84a069dfe4f22c009bf08eff9e SHA512 9a61374d3df033e7d185eb30c8d6a5669e36f17129a3942ac6f92c5192b571d8ce9c905aaa0d46e791cf595b1ff6d482c92546e97d22a774514423ad5f41d0c3
+EBUILD CPAN-Checksums-2.120.0.ebuild 1030 BLAKE2B 967b0fddff62b276ae96e43a1d33a61ac448cc695061b7d2bf75480efc425965d61f7e4715285676769c8b8599af03f3dcc238d0504c67933eb5d406fb23e92f SHA512 affb746c3ecf0194c79a9f7c801e7e3a7d607618a2ee5c6e7a227a950f3293e0b5be873feab2c2040d4d6003cb7875b8ad3361435507a73d25055c61b7450ea3
 MISC metadata.xml 400 BLAKE2B eb45703d8ca7d98d7eb705d8e4b05afa3da417f2712fc820ecb145abd74f21fc7ba6981266a0754b3c29adae28f97ff15b3369dc7c135b7d48721d4cc39262c7 SHA512 c78dbbdbc22065b1a9dd61e1440ae74a25fb717843db22da342741667c262bb24f63aa72b15522bd3905d3b32a743d9f034c7d9ccc9221a98efba3938823e7fe
diff --git a/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r2.ebuild b/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r2.ebuild
index b08c53c3bcb6..0c2d51ca4ecf 100644
--- a/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r2.ebuild
+++ b/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Extract distribution name and version from a distribution filename"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/CPAN-DistnameInfo/Manifest b/dev-perl/CPAN-DistnameInfo/Manifest
index 9f1c573d23c3..c96abba433e9 100644
--- a/dev-perl/CPAN-DistnameInfo/Manifest
+++ b/dev-perl/CPAN-DistnameInfo/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-DistnameInfo-0.12.tar.gz 14523 BLAKE2B 62db32c6e158e08d876986960f5139c4b7020c662d03233ac08c1484b2cf623b80b1b11b5908d07a19f4d1e6c2ab8d129b403cd493dfc46dc7051498d1066f95 SHA512 f52eb88b87ab732d13c2ee4e4770cf27c249d2b2446b51e75abe31f2a70b8dc7d8370f4c4426fa68cc8fa7a905668dfdcd1387cd98e239393bde90d1965929f1
-EBUILD CPAN-DistnameInfo-0.120.0-r2.ebuild 403 BLAKE2B 2d261f8f7e0dd73c321bd4575b7849b6b0f4241e779536584e9e37e6c9e973f689b19a12116d2919c2869c832d012a11a1e167299f7291145dcd9e01ae5a4ebb SHA512 26ea7189693039e18c33469bb7a27fa5121e6495f20401466329509e328dba7c67faedf7e1a7b2c22f9a6036de0f7fd36d2997136a724d75f40a3e633c82fc19
+EBUILD CPAN-DistnameInfo-0.120.0-r2.ebuild 535 BLAKE2B 6b23e35196106b3f79127964207bdc5b09e568183544af88c752ad69009f39f98d1665a6986eb7459854e120dce8c8b7ff67058d5515cfb3c43a0e27fb4b4cc3 SHA512 6f3ef3c9eb069ae6ab79a9904e2c3aca3a53541e673c6aa10ca167a2b581bc175b16c3c7a085dde22b74b579e90b19622966a5d0679b6a8ef84d09fde0217d84
 MISC metadata.xml 406 BLAKE2B 1dfe5f63c03a17d32a5cf2f579188b67f29eab00bf76da637e421c8629916c073d213314cde630f1dfce48ac414748364ca4b0f0582cbfedd9fda8e837f6c258 SHA512 fc513ba3496de6f357e456ea379bc2f82e7c0efeabf8757794d2080b77a928e24f51e6535e4d703064529bbc1077138c7df148c3463db1b3df187625c07d7b1d
diff --git a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
index bbc4b7acbdfb..363427970a2d 100644
--- a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
+++ b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Verify requirements in a CPAN::Meta object"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # CPAN::Meta::Prereqs -> perl-CPAN-Meta
diff --git a/dev-perl/CPAN-Meta-Check/Manifest b/dev-perl/CPAN-Meta-Check/Manifest
index 7c08dcff3f5c..4db91bc96665 100644
--- a/dev-perl/CPAN-Meta-Check/Manifest
+++ b/dev-perl/CPAN-Meta-Check/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-Meta-Check-0.014.tar.gz 13187 BLAKE2B 49e21dd269265f6ce279fe88430d9eb3b7bcd65e932da18eb7b6e762a69c20683279c9413157b8df432c480a8950097ee288013e648e062fe55280088276a48c SHA512 a10af09a7ce771ca3983adea8053d141750fd09849609a28e7f973831fd3a3ece55281841aec93c099154bb59135986da4983bf612ae4e956c45dbb3f2770f5e
-EBUILD CPAN-Meta-Check-0.14.0.ebuild 683 BLAKE2B 6bdaa2b66ce9682e7f36c75b544d0dfc2fee35fef3023efcbd4e1395bae923c08b5cd062d96fafcd4c6d7182d87557aa292d16c089dd4ef995cb22bd0691e2af SHA512 ca75a5d3342ef34f2989118fdf344a78f1d7df81b61ce71663473712fd30c4f35b29dbd37d937437f459162ae867cc9da69b00a20bd185bccd0cf1189eff8e5d
+EBUILD CPAN-Meta-Check-0.14.0.ebuild 815 BLAKE2B 6a00ccbfcffb8b63995162fbdc776d549782fbaa08ce1a2123c8bcf928f811a11fa0527f732f14309d0c5bca8476962e2879a135e4edac44bbe39cd2cbf5a75d SHA512 13c266a5d69b364094495aaf71c9afe86700c967b9238351198f68db27ed05deef417e91319699a9175a687cd7397492f13d265416fb14d407503ea0d671ad34
 MISC metadata.xml 391 BLAKE2B 5d0a2b94e3a37af2aa336e3f7ae1455eb85d7dd575c91ab8617d950cf6b21a2f77ccad678e3d5630b5902321e23837d8584af1886985c138b4c6101efb30e580 SHA512 bc37f7b063ddb1b27a00462f8273c2b3e6324f06f6d852a64a939e377206fbe36e0b9be1a3778283092a16ad016cccd1af59bdf33dc3c029fea5ba320ca8c8cb
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild
index 5118cb38211a..79d9ce4170ad 100644
--- a/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild
+++ b/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Canary to check perl compatibility for schmorp's modules"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/Canary-Stability/Manifest b/dev-perl/Canary-Stability/Manifest
index fcbafac76af8..647a7d4617bc 100644
--- a/dev-perl/Canary-Stability/Manifest
+++ b/dev-perl/Canary-Stability/Manifest
@@ -1,3 +1,3 @@
 DIST Canary-Stability-2012.tar.gz 4334 BLAKE2B 47849a31c9ed3cddfde379b7a66c557b575235b30d8d55e5893b724e28ebb8f7c4bfac89f57e50ca09385d0535edbe46cfb4e0ee1afb32b3b60b9e9e7bcacd57 SHA512 7780731e4142d536182e1820c041c43ae67c5b47c044f15d8dcc060646bbab10a974bddcb703fdb27f427db3cd4dbdff54e131dc708c0260d7275be869eb27b1
-EBUILD Canary-Stability-2012.0.0.ebuild 564 BLAKE2B fd972a2a8a068964f17665e914cf0d9d564893335bea98bb64b195b28db58c8ab13d7aca2c5ea9d44ecee060e2b20ce20903e561ba0adcf174a84cc5bd4fbf1a SHA512 2b51e9277952584a97c112be9f2dc3149e6c24235b89d2a5ff3b9b4472af6c5f4b40666036cf7c8961e112973fa8b7132c74e0a3bd77a88e3ef4826322a1df73
+EBUILD Canary-Stability-2012.0.0.ebuild 696 BLAKE2B 4bb57d80c8c95526c3a373c2640a1a5fbff1b6a4e05042902ab2fc29ba22219ce4528e18ee3b4859c292254d882ba420d29f6a18cdc174c32bfac55463320df0 SHA512 4df90890653b7588cc8dc8ffdded3d8aaca0ca0d6e7d3010eea870b49ef22b1f2a85b620ea197caab72a0d0f3630908f8655c2676bd7d806a653165bf97a8fbb
 MISC metadata.xml 404 BLAKE2B b029dd8a9e04ac39ab7917ae1dfc108d9ec9d2f37fc9fc92f75c41bd2d42e44b7ed81b8d479c15e83cada7318c0cccd1c2e84da998d3cf720622d80268f37a6d SHA512 7d0c59169af0804ccc6e9f690c509b1894dc60d055f0536986053e1059fdcce831e7d3f8327ed3f3315c1b8a7d5df089cbfdc335fb61709c53867d14b55c6012
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild
index 0b6e0ee57f2c..d9426949b367 100644
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild
+++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Capture-Tiny/Manifest b/dev-perl/Capture-Tiny/Manifest
index d31601ff3202..f52bcc13f26c 100644
--- a/dev-perl/Capture-Tiny/Manifest
+++ b/dev-perl/Capture-Tiny/Manifest
@@ -1,5 +1,5 @@
 DIST Capture-Tiny-0.46.tar.gz 37424 BLAKE2B cfc9a208c488072972567ccc1fc3956fad32e3061d7dec5ad953d0e6d90b5b523ee57eb9ae43c883fbf6ccd82b859327d9346f2f3e849054dde656c066f84f11 SHA512 6247bff20b95628453a1bfbfc6fb59c6a3967506ea45e01327d0978f48ae75b597c27c828ef10ae5e55be217e3bd0b63419523de6a81c97fabc8cf4e2a0e6cd1
 DIST Capture-Tiny-0.48.tar.gz 37480 BLAKE2B e6de05459478131c5129dd5ffc84744e2d3440c2e31545ed101c2986b2bc970106f126286dea50350f4b5ea330ffac423693d755e29850883bdc215437bf7488 SHA512 96d140b33a5ee147804925353ec5b49b806fa9c98b4ac23ec9c9494828f52ac72fd6f69c08e14ada18e5187dc4cece3d72901ce07b12eef20595322161a98437
 EBUILD Capture-Tiny-0.460.0.ebuild 798 BLAKE2B 6097080358dc283c9702c42457b7e9438d0f26bba9e00c9f83500d9bde379cc320f887e975b08cd887c1552987211aa752dd2739a8dc79a44b0a7775c702cd7c SHA512 e636bd3ed9af5c0fecaa9ed5c1679e517e167ca927f5eda1c451a3f75b47001897c3332a991d3777b26e6b4af2b9c6a2ded13364e19ae542e3ed023743bf746b
-EBUILD Capture-Tiny-0.480.0.ebuild 809 BLAKE2B dc959088ca51f8ed15331fc6a7c0e937a4f5d7c1482a024ab8eee58c543a9de4dc5970c0dec0ec6beb265a826ea18337e1212cb894d7a4c0c455967febbdeb88 SHA512 09934e0f142a213883519439316067fd7d70ae3b71883303014e29e1faf292ce9e62bc6aa33d6b010d81c12ed99cd02113306a8dc050537b997543ed4095eaca
+EBUILD Capture-Tiny-0.480.0.ebuild 817 BLAKE2B d07c106eff00623347fc43e8354e705059025bb18c811f321d71515d1e258e464b9599d498264643b1b141eb14c63bf6e240449bbc307316e3f170da5f69f861 SHA512 32f9ae15a761766a201705b6f842c19aa9f31383d58d339760a34c5b358779aea9771d16304ab6b5e8c7ef0ba9c63b50f8c67d2f4b49cea2321673264bb06c63
 MISC metadata.xml 396 BLAKE2B f21556c36cc152b1db1fa5521a4733cd9d4b790f4af2011968f43bf27e3d146c4b83757f8fe9b9003eec6cc800d271da5303d0a318d2948f05a0fcadc7bdd077 SHA512 30de10bc3d78d68fa2bf7165525c2a84a79db417decebf19c3d5c8e54beae0749bb9894a476025848ddb7e66307bc570787a775c59b90ad513558b6348b8d644
diff --git a/dev-perl/Carp-Always/Carp-Always-0.130.0.ebuild b/dev-perl/Carp-Always/Carp-Always-0.130.0.ebuild
index 4d1b49bd1102..f59ce4ab7492 100644
--- a/dev-perl/Carp-Always/Carp-Always-0.130.0.ebuild
+++ b/dev-perl/Carp-Always/Carp-Always-0.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Warns and dies noisily with stack backtraces"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Carp-Always/Manifest b/dev-perl/Carp-Always/Manifest
index 0d3e20c88215..dbe0469b5e6f 100644
--- a/dev-perl/Carp-Always/Manifest
+++ b/dev-perl/Carp-Always/Manifest
@@ -1,3 +1,3 @@
 DIST Carp-Always-0.13.tar.gz 5462 BLAKE2B 3710f9594d82b5bc6268f6b8164a28b913fc76c564ce513b3fa49a6cd41e6bbcddab897b0eab43facac25b5639db1b0aaad49988a182ecdda3eed488a59e23c9 SHA512 0ef666c45ed85f4dad5f955d13116a4c3cccb3395db80547629bf0d87f9494653fe5a85405252b650d4d92a4008c0d541a995ccae1139c7374b057317324d361
-EBUILD Carp-Always-0.130.0.ebuild 439 BLAKE2B bc497b4b464b2aa606852d17ed38f202a31a98ba3c36480a30c4d2ae1d101ddf216c34a574c2f77f0c05eb445a70821709521093d7e8a1ccffacd7bf9e0fd6e0 SHA512 17a0273f09b9a94fb8e5709c684a3cd3e42f49d1768fc3fafbd7c9286086a601bb4d94808a860015c01d4961c12853e115d4bfbe1660304445b6acdb523311e2
+EBUILD Carp-Always-0.130.0.ebuild 571 BLAKE2B ca645854348f665ec15ba482119bcddf48991e45912eb2a1b48fefc7b00efd467d74b6a165f90639e3ccd3ffb10827c2ffbf43b765208cae68f5c037d642e962 SHA512 e5ac5514cc2d9e6cb8d493de334a0a471fe0c12f441807fcfa19093982ce298f9e842901ff643f76a91e5c20c6af57bcd778069bc8daa2ff054dbe55c506f2ac
 MISC metadata.xml 394 BLAKE2B 9cbc4e154b6e32e8114f71ecf029f12a0e3340a180b2e7c8c63bfef7c38c5b06b176ceda3302318e038dddf4f7e0f0a56d6fb6abb6822d8427f702957de5ed37 SHA512 b4aeccd321524d36649472d44390fa1f18968b58f3b54316d1712b7748911f04a3888c2f17baf4c45349414d5b9ef30818c46e2544d638b5dbf4b247f76e388c
diff --git a/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild b/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild
index 410c6f55db51..f586c5b938d5 100644
--- a/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild
+++ b/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Report errors from perspective of caller of a clan of modules"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Carp-Clan/Manifest b/dev-perl/Carp-Clan/Manifest
index 7a936a95cadf..78e10cf97bd5 100644
--- a/dev-perl/Carp-Clan/Manifest
+++ b/dev-perl/Carp-Clan/Manifest
@@ -1,3 +1,3 @@
 DIST Carp-Clan-6.06.tar.gz 21556 BLAKE2B cbc751d270933900c900354013c30027b0f4e08fdd7357f6a591c1f1a24532069a0bb49963c6fb6d9c0028ae809cb5960e47466eddadc099f38c94e845b6b09e SHA512 a3dede626814a71a5f99b25a5b01133ecd13037fd1fbbaacb04852962c5d23bb77c1cb70f417879ec173db0215904adb59136dd30de6166994aa9aa7b28ca08f
-EBUILD Carp-Clan-6.60.0.ebuild 604 BLAKE2B 97235acc419dea20ba54e6561d0f6fea329ba15b9bbc0ca80e01ea8e14552b46eba19e58c0fa8cf7cb60c4487a0cb0493b0dc6e022bf570494a8e1521f218975 SHA512 724f4b41e188ce3f310d77a5752a7fd5c159dac44d0052a68300ccb7397502e422e0e2c5edf67928bb7af49a5396b3e36e0c08bf5d9860a7e2af15609529f43c
+EBUILD Carp-Clan-6.60.0.ebuild 629 BLAKE2B b5caabb3cbd153a94eab1633a8de32d851cc1130a83b77df0b9480d4f67860a9bb5e1808b61aa9e9f7c960ca4c6a507cb66ac5f6d36666e3bf033dde6b9dc7d6 SHA512 8ebd2f2cba6f2ada6b474fca9c1c4c193aad76fea37101d3a613af07eab15900df3f17f936f3975d31001f12bf775a9ca0521cacc672fbcc636a25eac0112510
 MISC metadata.xml 390 BLAKE2B 72c4a6030032a6dbdbf0e7d163d4e253cc46815a25bf922dbf3c78037e2bac95914b9cf4c861c49c4baea78d53fb7610c53c886c965d9d0f3049c5996558d8f6 SHA512 9ab2ed2c26ebc1e27b9ab4877120fc748aa74bd620183564c594d480ce6a351c73003d20d38d131a0dee031a5778d5180926b36bc8501a052bc7c37dadac55a8
diff --git a/dev-perl/Class-Accessor/Class-Accessor-0.340.0-r1.ebuild b/dev-perl/Class-Accessor/Class-Accessor-0.340.0-r1.ebuild
index 5a48f5bcd041..f6d50d27592f 100644
--- a/dev-perl/Class-Accessor/Class-Accessor-0.340.0-r1.ebuild
+++ b/dev-perl/Class-Accessor/Class-Accessor-0.340.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Automated accessor generation"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/Sub-Name"
diff --git a/dev-perl/Class-Accessor/Manifest b/dev-perl/Class-Accessor/Manifest
index 9d9ae5fdea12..9c2690b6ea93 100644
--- a/dev-perl/Class-Accessor/Manifest
+++ b/dev-perl/Class-Accessor/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Accessor-0.34.tar.gz 12315 BLAKE2B 8dfc65c7b9f7d63112b6991b0ac3c8c93146fac2f800425ba88281f70ab9c5f27a00f7c2f0eca9cc92dd5391dabc24f7fd3d987075d421e26f1fe5dee77218f8 SHA512 a2978e5b8a7b080ef85e2b2499ee7263c9b5b8a70effc00a04e18fe92694fd59331b50b8162d3b8a6cb48ebedccca3b4780ec0984e6b8728b130a49781e35ee4
-EBUILD Class-Accessor-0.340.0-r1.ebuild 472 BLAKE2B e4d11d0b83d0186c66814ecc5c865ccba6483008a430689a439d8eba5f6d5b0fccdb5a6eec43f8f77a9598b26dcbc9d37d8d23bc19b462ec5495256592d603cb SHA512 282170fb058df7872e7d6528d6a58fbab632ed3e9adab007937eea0e82fc7e5aeb8074739aa2768871c60eeb9099f18875a74cf3ad6ecf7eda9b37288410bebb
+EBUILD Class-Accessor-0.340.0-r1.ebuild 510 BLAKE2B ef5f0bcf072106327c0cd6e3b4e5a34bcf65ff1f970d3b5a2486c3602e66728b8234f06d5d2ab6685ea9f5fba25145344b26dd12bd6eb28581505e39310f488c SHA512 693970faff7b18e113dbff5000d82a4f2d6719a9fcc5bac34ae8946e1ca4916f34e709781aa0460df30f6efb0eb7e5654551170638b277ae405027b3217e877e
 MISC metadata.xml 538 BLAKE2B 79d0860ce8f3e5f629ba931403752bbeedc64468adc4766025743e7f5c8448f4a3e4fec99f812d2c4ca445ec38f35baae3db7da6f3ac89ba060d40dba0feb596 SHA512 b1a7e3ecc5edb452c405b01f9827e3a803919fcf7573857514737fedb09312e8a279a4f18c6cd4c0fd9448bf203bbb7f48cdb5e862df59b2202a1ef3d3d40ec7
diff --git a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild
index 188a06235d27..43ece3dea8a0 100644
--- a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild
+++ b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Inheritable, overridable class data"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 export OPTIMIZE="${CFLAGS}"
diff --git a/dev-perl/Class-Data-Inheritable/Manifest b/dev-perl/Class-Data-Inheritable/Manifest
index e7b3303071e3..cba9d614e777 100644
--- a/dev-perl/Class-Data-Inheritable/Manifest
+++ b/dev-perl/Class-Data-Inheritable/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Data-Inheritable-0.08.tar.gz 5660 BLAKE2B 258e9d143b157b97995ace7236fbe12600d3de2c4301c6996ef66ac96c3d5f685224a0846fa0a52449e5c080dbaadc29ab9838037285ace5a6217bd69bb7ccd7 SHA512 bddc61096158b21d4cfa69538d5db0f53617a66c71447ee193141064f4f58194462b21e0a849510e24e4c263b13be3ee1bc6bb8504320e0a86c02b67ad1652c8
-EBUILD Class-Data-Inheritable-0.80.0-r2.ebuild 523 BLAKE2B c455b919de64a485c3ba009dcb51923a0b0f3db67d21bbc0b719e0d81d190cc16cceb2e23afce2a8c72e7e6609ecf5b8c477030a00a98cf7c4862abbc6385f8a SHA512 48c33be6cfcb38b4599382e175b3ec1252c480e0615ba042499d567d35f96bb0f8d6954da632da73af27dc8c1f5bf92883fdc8743e3615519a4741e6c7c3b541
+EBUILD Class-Data-Inheritable-0.80.0-r2.ebuild 561 BLAKE2B 81a43dba45c956da529f07a1ac6b5396e67015a2a2da20be594729428ac52ba16f55a694dcf1f56272d77f7da6fb98fbae018eb5780380a53c696bc704cc078c SHA512 2cf2298eadc6ebfce7ad605fea7da6db459383ecf962721e0280152d4fac3d1ff24c80578be86d6283cdfe8be44a5dabe4103e24475bde60f258f13ae2650437
 MISC metadata.xml 417 BLAKE2B a334b2837319a552aca138c2753b1b05256065c8470303f5400def6e499c80050a48640662fc78e8a194b11885bfce1715087b1b1e474e3b9f6ee6d09361988d SHA512 731a05fbcfc0746dad0d75e62c9dda05bafc73f33425761087beb269e32508c7a6c3c881f764dfb2fee84c95c095325e33965bf2448ee181e26f7478daafa6c2
diff --git a/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild b/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild
index d6438f13ec06..22875d3ec731 100644
--- a/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild
+++ b/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provides information about Classes"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-Inspector/Manifest b/dev-perl/Class-Inspector/Manifest
index 14cc4b5d6efd..e45918b1e17c 100644
--- a/dev-perl/Class-Inspector/Manifest
+++ b/dev-perl/Class-Inspector/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Inspector-1.32.tar.gz 25639 BLAKE2B 3bb007f076db85ed05476c29bc5fcd38570dff4e9eb7d2e309646635cbd0c53468fd201ac3f1db501fe9a92c62f9bf882214a0f441a9b0d14ade5966bbee3ac6 SHA512 980654614d968e2fb61df864322f5c5248e352f0697a425539600c3549505f47b857d7856bc9d406ebc8757f8fc379a669f1f5085412f6fa48672c9db8a82df4
-EBUILD Class-Inspector-1.320.0.ebuild 570 BLAKE2B 1bf4efb3a02b008a3747313b8d7af641f5a69c127d19a42bb806914b2f467886b5a15d58df099a892a2fc627673e719897b3da74708250c49b7228a8b1892707 SHA512 298180efe6a4c14ea7324b202780461066315678b9f3b2220bac6c9426c3869c4ad89d756824f9bac2b9b18aaa112ca0d3cbbb465a5a28cabd82f553737dacc2
+EBUILD Class-Inspector-1.320.0.ebuild 619 BLAKE2B 081935f8ee60464434d3c687804a369af1b3cc5ab4975df5a24fd5e206c5a51d1ecf1e892eebe61a2e630ccb599bd40af43b2f87f8f59df3853da4c2ad4053f9 SHA512 2c87546c36f5a5ea4a78d2404d683d96895ff5d3887f3c890f95595b367803ec0b3cde5b47ea7027cdf25688107545ad9f16e7cfd8e869830c39e2c64e0b6da3
 MISC metadata.xml 476 BLAKE2B 9a23e31d5863e4d6a3fc21f2d4802167f6b64877168116c45d78383be45ab9b47a3c31bba71804d375c022edc881aea98c1c85ef6ecd7f020ce542991a506100 SHA512 b10c02eb3589b01fae51383dde5dca831bc56cb65afdced92104ab9597379734b129c0f0b0c8172a61a79f150ed4af6db6c8eed8d4b5164592a36f7414ffea4b
diff --git a/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0.ebuild b/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0.ebuild
index e463663a5ca9..1e85cde5dfe2 100644
--- a/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0.ebuild
+++ b/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="XS implementation of parts of Class::Load"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Class-Load-XS/Manifest b/dev-perl/Class-Load-XS/Manifest
index 9b5dabd5657a..bbba72550371 100644
--- a/dev-perl/Class-Load-XS/Manifest
+++ b/dev-perl/Class-Load-XS/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Load-XS-0.10.tar.gz 77930 BLAKE2B 8d7540797a11fadf5f1d3622df0f39a1a8e97ec35aff807c04e55bfaf3ae3438c0cf777bfae8a39b44b4948b42fd05f8dbf476617b3321a1dee2149bd013a4b9 SHA512 16ab845dc393567f0b0e9597eda7d7678b8a41d218823a166bacdfd4dc93e704a6aff98662340b8d7f4d045a60530071bb84ea8da8be5a6930af47722207d126
-EBUILD Class-Load-XS-0.100.0.ebuild 682 BLAKE2B be5058230fe071bf50a3e144e1a4d94abf4cb57c29b45b23b95806abecb69e4d7e3db8def4f72ae10454e9cb5b9e234029aef936d317709292597b3d6342c997 SHA512 c57fbf1e96e8080bfed67a793351b0d050b2f7c13de0c265d96e97bc6a84e4bc2f13bbec23e8235e06b99445449f38c33191c456ca3c278f248485c45d2c790d
+EBUILD Class-Load-XS-0.100.0.ebuild 803 BLAKE2B 13859a5d3f155eb8ea7d798ba18ec135a7b213c9ec2f6dbf032065a7fef610083952e951418a48a96b0e8eacfaeaf491060f6a0e6d98151dd606c0f12e367aa0 SHA512 f344609045f1aaef5ecaa6bccd9cde9255af7aa877bad2f6e939514f83e6bdbcbe5f956187cc92355ecbb6eaa9a5226cd5b7d2b3dc33a4c7e27b90f45ef45294
 MISC metadata.xml 399 BLAKE2B ef94714122ef8479e4215abb0c2d74375aac887916bec428aa07c3ae4065323babaa9507012f8615428b370d5d0c9a9e960696c392a651c883daf0e9bc423163 SHA512 ffc09edf2364b43dd67a63c088f9cfbe6bc3c29d603eb6328f04574b0f98e8f08baf635530f483883f5e0940cedd5e04ae113077b23c90b78fb61a8a3c7bc74b
diff --git a/dev-perl/Class-Load/Class-Load-0.240.0.ebuild b/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
index 422348eb5ffa..3dc91436021f 100644
--- a/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
+++ b/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A working (require q{Class::Name}) and more"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # uses Scalar-Util
diff --git a/dev-perl/Class-Load/Manifest b/dev-perl/Class-Load/Manifest
index f0e02dc12691..c54056780449 100644
--- a/dev-perl/Class-Load/Manifest
+++ b/dev-perl/Class-Load/Manifest
@@ -3,5 +3,5 @@ DIST Class-Load-0.23.tar.gz 33610 BLAKE2B 3ecbd6c3604cdd0cb36bb2b3e59e65fd889f16
 DIST Class-Load-0.24.tar.gz 35412 BLAKE2B da000f18dc81641c28027bfaafd3cbea758356c5e2af5204c9b818b51fd51239432793a0b26605d0cce70af03ef28bbcf87b50b6cb9056a38cc04feb05adcc08 SHA512 42459727fc622334336aedaa49e3dfd1aa92103c838a33b30ac61d9d9fe74512f7b1012b3c20fd1c4eaab1456545feab4d9d22b91162ecddd4683defc1b987eb
 EBUILD Class-Load-0.200.0-r1.ebuild 738 BLAKE2B 6c8e4247f57a3a82f285d00b292dc5cf49271c8ea18689d8a66cc8c46f7a0e0233fb8ed61e72c25dbea30b798565f997708d4801ffcf1770c7cb9911572b397c SHA512 8bb55d7d235f4aaadb49c9dcc3dd694a3b1a033f0413b2d5cf5782d7320a2b2f56280ff130fca88de12661f0ee62c42b6cf74d19fea548249a35a79f48edd378
 EBUILD Class-Load-0.230.0.ebuild 770 BLAKE2B aa4e1ed7748d444f2b7e5f2ed1cb04c0efc063243608822a22a9087ee0d285686544ae63eea5ac7d21ed9163a0f3988179d0a4deff645f95c9ae480e383759dd SHA512 326413cd5cb5d1d8733cdc5a1d4d276a547cc967b010ac4e0f8e85364b36b87ffd2d2471feee4951a1e943032fb13c6df93b9ea54f703e81fc84b92d917ad8fd
-EBUILD Class-Load-0.240.0.ebuild 856 BLAKE2B 9aaee4362737e3fea557fc29f3aede56ac0d68a3bcbe725d907a10e7fecd615b7e548372b7ae592a7e3ad1f4a947f79c9aacac703302c8d24b4aa429c88945ec SHA512 d0607b7dfc69439a6937ebc432a6c34dd5ff4800e2afd80cf50e78e2ccf721990d7956131bcdfe4f49feb7c9426e1adc62303971b91641bea7d40c6b9553a6cb
+EBUILD Class-Load-0.240.0.ebuild 909 BLAKE2B 649203ca5fd368a181711757f123eaa270e880dc9e9ea81cca4d6157c7991fd4f1d814c95047fdb0eb31ad532da8b3b95ef95925fc40b84236729433843b9bb4 SHA512 bcfddd241a7a66c9e56b74e10b8d20eeb3581c361da85fb09e6d755b15998648808b7f61e7f8e0cd1f0dee1166025d7faeaa2f798ed1b4857729f95a808c4d62
 MISC metadata.xml 454 BLAKE2B a8c1f1b0738e85d0218338cd8071dbf11200543a85b0f5d5f69366ec6fba26b71aeba8642a7debfe3ccb3cec7e4ca0fe6c76da0cabc87d2b17961e61daebcee1 SHA512 78f2ae47292344dd9fb0f705dbfb639eea1be39fcebe1018645f5b598561756a26afbcb862651d62add961948a379df59391f94e22a2fc69952bbdaa641ceb2d
diff --git a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.120.0.ebuild b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.120.0.ebuild
index 717601aa29f4..e7c01bd14200 100644
--- a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.120.0.ebuild
+++ b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.120.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="provides Moose-like method modifiers"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Class-Method-Modifiers/Manifest b/dev-perl/Class-Method-Modifiers/Manifest
index 4f82976337b6..5de14ed239e9 100644
--- a/dev-perl/Class-Method-Modifiers/Manifest
+++ b/dev-perl/Class-Method-Modifiers/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Method-Modifiers-2.12.tar.gz 38979 BLAKE2B 60983ca8afaf6fe01119c06371b2a1581e7f0323f6cc55a9edda128467b7614287c4fa77831d6d3b48dc076f1c41dc25321d9648454b45995c7cfd193a574844 SHA512 18c7cdff214d39a475b116cc5e6dda043c31765bcdfa9a1fa7242ce61e42583c4981d41a43ba556fb5a057e0cfbd5e52dd60048ea7dfae0fec3618dc47876dd4
-EBUILD Class-Method-Modifiers-2.120.0.ebuild 581 BLAKE2B a264cfb9038a9428fee84d62305d296f878aa8fe423951e2b90b362a69fc1d5740daf167bfa8784e58d781bb9f3f24da64a23570ebd2dee46528e80dd5d15165 SHA512 7d4003202988fc45611d88573e3d0f30a21638776ad98f50a5f52939d35a5517ce840b42cc9271fb8b9246ce3ef59b4de393856154080c19a8a51058869f1cd7
+EBUILD Class-Method-Modifiers-2.120.0.ebuild 680 BLAKE2B c6142fe13d8a8c90e022435b1110bc1dd7468d3cb89ffd1792380b9f0ed6644df2c07ea19f62229e7f18403cc1337f3c55797702a9f31081781a25d16ed7a8c8 SHA512 d4c6e0e1adfba7dff58ed0c308ef6e90e104c7072a0db264dd95ed7c69af5ee2007d9a7a0a3650d74d789680ff703538d551f21169427ac44d49fec29513212d
 MISC metadata.xml 405 BLAKE2B 4be360e7c8188542a61227c6f94ebbce09bf41f78a0ef3079f29cd1367c765c12f97d0ee957339ea8fa0a8b3e776e88ddf3a6c7ade1217e1b671b56d7615c8b7 SHA512 b62508725a92b4985ea7bca9c1010670e7a6c94e41dc9cd575d8364fad22581f74ce6fcb0de3c574914b5caf2efb7c4065005c4c1b6dbbc992763a316df32ae5
diff --git a/dev-perl/Class-Singleton/Class-Singleton-1.500.0.ebuild b/dev-perl/Class-Singleton/Class-Singleton-1.500.0.ebuild
index 0a2cf1259596..c32c13fbe35d 100644
--- a/dev-perl/Class-Singleton/Class-Singleton-1.500.0.ebuild
+++ b/dev-perl/Class-Singleton/Class-Singleton-1.500.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Implementation of a Singleton class"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-perl/Class-Singleton/Manifest b/dev-perl/Class-Singleton/Manifest
index 0b5cc2cb53f1..d5982d5ec1b9 100644
--- a/dev-perl/Class-Singleton/Manifest
+++ b/dev-perl/Class-Singleton/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Singleton-1.5.tar.gz 7785 BLAKE2B 98bc10c6fda65abe6958360c780826bd76597cc597f8d1910cddf309c04eb3228d4ce8f5f03029a3a99a464eb158de69e167e5e9efc0c0f6d4f3c60938be2444 SHA512 f061a8b92d5f65e4fbcd14ef36ff1216f84443f487de34c98f7d08d6d18148f156c0cbd6249e75ac448c17547d1172dbda8b670a8e7573d3581c9c1196eb4804
-EBUILD Class-Singleton-1.500.0.ebuild 476 BLAKE2B 95a8ed76c6b4ae3930410674f7eb9e6410021b04f5b2a5554f04c8f88f2ac41a18953ecc511bae4a7fef5074600b5428938936d89171103e75b753b8d905460d SHA512 51d8aabc19c9ee290fff3c0dcb7262927ae0045f53ee673e963fc988fb0342eca509d042bc53851aaa8b9d8bb8eb671cd4a9cf263db8226c12e6c3f6587f1006
+EBUILD Class-Singleton-1.500.0.ebuild 529 BLAKE2B 2a2c59db33503a144923f2c91cd262f5772c40a4c336d19f48dda0921a7cf2eae179d6fe3d4a267f24cd77b8f42543e97acf3f19aeb5572edcbb5a43ac0c36ad SHA512 1308f8374656e1e2771b436b2356761268916236188660fa9f6d187b1f438a77c7e3e2dcb10a4858caa5ee584b52453c88ff98a0e6a0e191379defaf76720d28
 MISC metadata.xml 402 BLAKE2B 448b53179712f0a6f1ca4eab049c9f531b22f178e8a9ae2d9d9ce94cf7c5dc467b51a71a5f1234f0bd7fdd0d6bc480512d5a9e4291c98f7cd82ae395b4143ff9 SHA512 b2baa8b23ef41d09974517a93429563892d0c9b1fa0295253c936066f5256b9ee3fd4abc8a2458e20a2011c05ede9643899a8c9ae876c679f50ead08db33ac54
diff --git a/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild b/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild
index d9ae861c91f2..b42d2a401bef 100644
--- a/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild
+++ b/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Minimalist class construction"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 IUSE="test minimal"
 
diff --git a/dev-perl/Class-Tiny/Manifest b/dev-perl/Class-Tiny/Manifest
index 2f7ea98f1ac6..db46435635dd 100644
--- a/dev-perl/Class-Tiny/Manifest
+++ b/dev-perl/Class-Tiny/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Tiny-1.006.tar.gz 27773 BLAKE2B af9d754db8c260da6ee814c3bf6f4532b98a646719f5102b774204c07d6031c271a0e0d5fb6473e6ebe23790928c65723f4644f32f6b92e21a38979f81b65722 SHA512 0a6ca0b99bd10a39445bb582bcf89f3668747f05b13b1f7271e934a73781c855a0418ae19a41593c64288b74710f49c1dcda0005be4edf9965e8020139ca0c7e
-EBUILD Class-Tiny-1.6.0.ebuild 627 BLAKE2B 649fc202401537aa7fbcde4cf6990c9fdbf52da2253e52226059a6ff29022475b51d68f1eb0d543707a93439f74eebb33421150bab7c085396f9ae8cf27a5d96 SHA512 bd10cb88d4c0753843e2d2c8ec30bedc9f2b7c52e28809ee75bfda7f9c4452419d6c145e6e615f4ea765d3b553774184151ec4daedb0fe9f6795f49e1babe8bd
+EBUILD Class-Tiny-1.6.0.ebuild 759 BLAKE2B afcfcaf3667e1d3992f7258c1ee986f52e1b4150151f53c5789770effa09595fbb620b5c4eb5811edd92c1eebc54a2b5a2c505a9cd215dd05790b22b95df511b SHA512 71dd9e323374a4f7e5a5e594a8eae9506e4a247ca5e1edd589304b8f610c4c6161ce177157874bac50089705a281edaf448f3b8fac97afa5fe88443d94ba6287
 MISC metadata.xml 458 BLAKE2B 3bc4cc5affacfb2e54976aa0940f237246f2b220462bf57ccd69c95075203f03e86c700e21bcac74cdba206546fcfc3a3a3e672e14ee7ff6796947a924539a0d SHA512 90e34a2e7aabc285ae7eab086c596bc2ffe8b4f05650df85da3b1e25977cd30e580fb804e0c9ad1dca42e11dfdbe0522e6cb9069719206bb1741873adeb1ba06
diff --git a/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild b/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild
index 3b261b03c8f9..4cb0ecbf2990 100644
--- a/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild
+++ b/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An easy-to-use and comprehensive named-color library"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Color-Library/Manifest b/dev-perl/Color-Library/Manifest
index fe9d6bc9e0a0..8368ee3bcb63 100644
--- a/dev-perl/Color-Library/Manifest
+++ b/dev-perl/Color-Library/Manifest
@@ -1,3 +1,3 @@
 DIST Color-Library-0.021.tar.gz 343300 BLAKE2B f0debb8be5ef66111f24494509d75823faecad64f976cd229d8efc0212131b557b32a50fc85dd4c6c4e56efe3385af3fd59af92999b84923ba8bc72bef4719ea SHA512 2338ad5a4e313d0f47604678a511845be1d02ed62804109d7338cae0831130751933a4b0f6c0056e684da926e135542292a10cedd6b3d5cee6b3110bbb98cef8
-EBUILD Color-Library-0.21.0-r1.ebuild 454 BLAKE2B 7a3326ce3bfb8c3736a2e40f7433e3dd957df651ea5019e9a73d2331697a818aa8eed68511e6d25caf21f92b298c4b85ddaa0baa033c480ed94b5c7f669888ff SHA512 378e428508677c81a5c9e91fb71a49210234bdf4c1e97da8d0f429a94e6acdb68c736b05c392468c40113e624a609213905abfadc5eb30f5f587c14b075b023e
+EBUILD Color-Library-0.21.0-r1.ebuild 586 BLAKE2B 20996090e572a2cac94439966052a5f01cdf6f35b93084f11da5390d8d3d8c0c54d6abfdd89f541dd5970b16f3ddc6b021fb662bbc91ba11ec4c7583971f319d SHA512 5e74059fd56e855278f86f188e49ebfa70af531f3a01b03774f1fd379a52fe120ebb171147f06b01d09525c8e47395a8da5439b2e6aeace682ed9317fee19fc1
 MISC metadata.xml 2368 BLAKE2B 5a4c8e98f7f925a1b22fc75915b39aeab3bfd7e5bfdacc3bd5de9f1e68e460b448c18e57ac2f7af91ad82362b416ece3c0caf1ac9e82ab6c14b02e8817d97c2f SHA512 ce8f3b83c5a42176cc08d0cd7eb0ac57130020142ede964dff30f5dd491e635f1bca59984d161c8f5594223c58112ad09693cfc96b0836fa8331dcc7b7cac335
diff --git a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild
index 417e1d7a52d7..976ef25ab704 100644
--- a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild
+++ b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Interface to Bzip2 compression library"
 
 SLOT="0"
-KEYWORDS="amd64 ia64 ~mips sparc x86 ~ppc-aix"
+KEYWORDS="amd64 ia64 ~mips sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Compress-Bzip2/Manifest b/dev-perl/Compress-Bzip2/Manifest
index eb38bd91ea87..6fd380048d11 100644
--- a/dev-perl/Compress-Bzip2/Manifest
+++ b/dev-perl/Compress-Bzip2/Manifest
@@ -1,3 +1,3 @@
 DIST Compress-Bzip2-2.26.tar.gz 886999 BLAKE2B b7107d522c172958f9cf137b2fa5ba7a88da8114b467eb20eb7da5d67f09d86105277ad4711cff0cfc3478518557fb37cbc8a1b80d1f37070d51e69b93747f3b SHA512 be1670303496a9f48989777468234d52276b34e6c0fdb6e99d2199134f353f1ee32e0489a3797ab3a2d4777bb5f03f78dff39f3bf75b8cc511b754da2b7e4959
-EBUILD Compress-Bzip2-2.260.0.ebuild 521 BLAKE2B 11c7abbbacbd3b0ca12e6de01a9ccc9be87adf4d340f127b7323ad63aed1e6f50989a96e4696978af4054536b85fe27d995a72e43730bde40fb21b74a2d2dfed SHA512 cbbee6ec7d20ae0a36e51b1557babb4ca5f2beb09c0b1ad45a0301ee559ce1d1e81910ce40d193e4011e3284aca32835509a9c630f583c85c18c1d80420b32e8
+EBUILD Compress-Bzip2-2.260.0.ebuild 644 BLAKE2B 253c0d47af2c99ce058e5f009b643e3dfeba6e6601faf8fc5e2f9421cc6e3bd88511d1ef292458645274d4f900a8d405c04e48b89cf3f38afb5712b9998fd5e7 SHA512 229f6300f503bdb0b114a4bb85898413d7e984ae4521966b3902f3770aa7d73a555dff53d9dc24d6adc224695d13cc78715ad0effae115a569eec4a1934c729d
 MISC metadata.xml 400 BLAKE2B c512c84bdcbca2fb41f027d62b87c530dc853263a7f5b9fa60100817b32580e74e47a5957e2303de1dbb343c15d0ed4794185d505d38b67534a254dec1bf0bd2 SHA512 dfed7f8fa66ebd59fcb4cd990936135de4d58e0238d92c2b8969728a025bbcabc3b894308acd647f51a42e3b6a4d24320ea905e6f3232ceff6f50b5acae35c46
diff --git a/dev-perl/Config-General/Config-General-2.630.0.ebuild b/dev-perl/Config-General/Config-General-2.630.0.ebuild
index 67c0a045cf93..a8cb0bbb1c96 100644
--- a/dev-perl/Config-General/Config-General-2.630.0.ebuild
+++ b/dev-perl/Config-General/Config-General-2.630.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Config file parser module"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Config-General/Manifest b/dev-perl/Config-General/Manifest
index 8696c2a7d8dd..db99f56f9501 100644
--- a/dev-perl/Config-General/Manifest
+++ b/dev-perl/Config-General/Manifest
@@ -1,3 +1,3 @@
 DIST Config-General-2.63.tar.gz 64700 BLAKE2B 71217b5ffc163932804f329edc95204389964a7aa3e84cb6c1854c7559fbc4b8940bd6cc61c149a04f2db38d7c094017e98eadf48ec81b7b0f9f54b4a70615f6 SHA512 ba9fdbf992049936ea288a90d8f8360821fc96f8d42df0298888b25543d2ac43e2958c5f7a8bbbae7cad1e2151ea00528756a3bc0cfbe408e5ee82bf309615f3
-EBUILD Config-General-2.630.0.ebuild 437 BLAKE2B f45d45072160563d24d562f35e34f73d9505bb60596ffee92f2580fdecf16d0484b0c88cfefbb450274887965e6438399f4c60b843b6dd184ef14c81c17d320a SHA512 a72af376d4ac796ce6e2cd7d2910e7d9f2a7d977bdf46873dc68536beabde3a2aa9e401a4d4164d51a794979f19bcaddcc930e22957c3525f1ec3d14cbc34f96
+EBUILD Config-General-2.630.0.ebuild 545 BLAKE2B 0c1e92b5cfcce4a836ddb6a257473f1daecd1cdb54e88255f809df299e82e3615b3609e8530308be17c377d1819c78db44c43cc8880cf1e655f7d2b25c82f3b2 SHA512 0d743e4fabd93e08e3ab8ec62e9413c13b015112315ddb4c448e0d81730249aebae38c92895c181d1b7d73afa9cd4fed5ce6b62587898afe0fed8be15840aa39
 MISC metadata.xml 548 BLAKE2B 529dfe5fb4495e8aebc78eaf240a623d336c6ff523e3f75bd53c85cb9d0997a6c3cb5f32b62ecdb2435088f671ddc6f1d559696f6c6449439c2b1731a094bf18 SHA512 9339fd171b8f4816838817fcb9d1388b347861a3d8540a144cd6b476c22cebe5e53d4212d7f89660b132b0d317f3a0da4cea979d2469de46d6704100763e24d6
diff --git a/dev-perl/Config-Tiny/Config-Tiny-2.230.0.ebuild b/dev-perl/Config-Tiny/Config-Tiny-2.230.0.ebuild
index fb445c54a15f..36c6a97eae7c 100644
--- a/dev-perl/Config-Tiny/Config-Tiny-2.230.0.ebuild
+++ b/dev-perl/Config-Tiny/Config-Tiny-2.230.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Read/Write .ini style files with as little code as possible"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Config-Tiny/Manifest b/dev-perl/Config-Tiny/Manifest
index ceeb68ba2578..6df8eee9195c 100644
--- a/dev-perl/Config-Tiny/Manifest
+++ b/dev-perl/Config-Tiny/Manifest
@@ -1,3 +1,3 @@
 DIST Config-Tiny-2.23.tgz 20487 BLAKE2B b9b801fe529d79c00d6e317b84df1619c0e3a7f998c8e090ed64405966d602abe3325581bac5b043e71f29f4fc70895ce3d20c818a44e16bd45ec80c6ef78da4 SHA512 c5c77aa18a387f181ba9bb2df8859c328073521e14163fe04fd7a104928bd68cf654eab88d24bd23e556e6ecc139dfed716fb7b8119e98cd2ab6f6915c976f01
-EBUILD Config-Tiny-2.230.0.ebuild 626 BLAKE2B a0e614fb15325bfb2f70213485535da3ad70140c77e902d307bc49f2853cfc68791947a3c5e91feaed46810636cf9d9e9a2e37d62a3c0e565dc0ec42e926b416 SHA512 d14065abb06a288695118c391d0e080ae12fda60462d1640e40a907aed2a4ca5d9496e5fd6629c200c9826f0698b5080543a25e559498d6e50966c82761fae9e
+EBUILD Config-Tiny-2.230.0.ebuild 697 BLAKE2B 2a152ffb2bb727328b7ba79df1f4cc1afce72513be47c16d6faff9d4029047448ccfc2130ef2dc474e6c96ce809e415b80abf71f978b9a4aac4c357e5fbc9cbe SHA512 4d14e05f47c7cb92ee44568c280d94631c476dd9e643152eb2809b7579d722d249aef434e71c3e0908d33205b171cd107d730b30506211a6b4638996e4eeaf7b
 MISC metadata.xml 394 BLAKE2B 3dbf4d403e27f06b66f9782f8b72e29a753f65fee08cfc690cf6f5ec3f676b8d6274fdc6cdf05c375202c87858fd7dd2ace53f9c0c3aadd47e2cc3ee62de6a1a SHA512 678f52d06ea7925469aea4b382628a360020324f3ad5b7d1b63c0a31f68635616e2bdc9c7c1aea659db417e845b4464a7c617c524df61b00c72f9fe435fcedc3
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild
index 666241a61763..b475ebf4dc46 100644
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl interface to the uulib library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="system-uulib test"
 
 RDEPEND="
diff --git a/dev-perl/Convert-UUlib/Manifest b/dev-perl/Convert-UUlib/Manifest
index 63ad56c53ed7..b675deae37ec 100644
--- a/dev-perl/Convert-UUlib/Manifest
+++ b/dev-perl/Convert-UUlib/Manifest
@@ -2,5 +2,5 @@ AUX Convert-UUlib-1.500.0-unbundle.patch 1013 BLAKE2B 135b031a86c9951813a6a62cb2
 DIST Convert-UUlib-1.4.tar.gz 232006 BLAKE2B 61a5813b15302613b3b7cc40cc2feedc122a67cfbeb98ef9e8db71ce4d5d8a0aaf01827f5c21f13aa1ed98093ea2005a73a9e3ee1d3bc1c9b35eb6875ba0fbe3 SHA512 97dae96b173cfdaf35126f70a883b3462977c3bfb281334f2e54c66ba518ce936ae3046d911ed0a39974df47d0b46bc286afb01faa0d934895402049b3f79cfd
 DIST Convert-UUlib-1.5.tar.gz 236213 BLAKE2B dc7eebdac2715edfdec2fcd52e09cb2fcb3ce596a78364af47b56f4e29ca00061f532b3d4328e7f7ec147e5e5caef1a489247a052784dc0c7c5b271160777a2d SHA512 92c8b6f3a72546dca21018ddf2863113904f550e3ed950a1898ed4abfcc48738e9ca374f5adbc3226df2db6beeb0e12879ae52cdd067a030c199766d53603ec1
 EBUILD Convert-UUlib-1.400.0-r1.ebuild 372 BLAKE2B 5dbc0c44960234ffa9e27cbdfae9467f408d854babe890ce2cbd174370abe17201eb1068e39d59a5af2b51034cb474aa441c514a3a57dc280a7aa38cc657dc09 SHA512 58eed8730bf10e15a657f3bcaf9f8f2807fd3e0565e491e4104e48064d0816a1297e4ea9e32186c349a5cef9e461a81f74c2dcd58f60f3880cdb821d51e39c4b
-EBUILD Convert-UUlib-1.500.0-r1.ebuild 829 BLAKE2B 58a7f665126302d483b2cdcf156ad9d77ecf3eb42625316babcfffb0f216ce4a2ef19e96f8a88fd3f95f917f805519fc314b422ae32b6f7fc676c782d40bb637 SHA512 84fa14b4e5efba64c80dcce0e6b1dcf6e94a0a911486231338cc4a2135a12f5a2f79ae068a2f707edffd8f8865ed8ce86a58ae6c9e06d2165a77d236d99d5462
+EBUILD Convert-UUlib-1.500.0-r1.ebuild 961 BLAKE2B 91f1364155ee2598ed86bb0eef9f4da5959dbadbdf61c6fdf1d0a0c55e61c604e2ffc9dcb4e20401582e04f09f2974cd8b1313dc8135c31296cf48aefc85a973 SHA512 9cbec6940660600b808fb3d8712a330fa9829d0117e4417ea52d6f0dc73b84c41b8c3786ed1d41777309aad0a4581923af6030a62ee62f8bc1632de546a3a7b8
 MISC metadata.xml 510 BLAKE2B 696824ae2a36db94c00b8915dbb178318346b43369122597cfb8c03c0e0c74be7196f449fc6e321624e2e2a1b9c31d8e100ff40e73da0f9b6112c5ae0b9dcdb5 SHA512 c25cd13c17ff7ab01073adea9a969723fbcc22204bb802441e8efbe3261c8f421f2220a202dec9745f388d9bad401c067fae704db62a2ac0eed9d8f9181b66fb
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
index ba6244050a9b..bcc4e6c08feb 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Cpanel-JSON-XS/Manifest b/dev-perl/Cpanel-JSON-XS/Manifest
index fc0747c9d846..3099fa571f67 100644
--- a/dev-perl/Cpanel-JSON-XS/Manifest
+++ b/dev-perl/Cpanel-JSON-XS/Manifest
@@ -1,3 +1,3 @@
 DIST Cpanel-JSON-XS-3.0239.tar.gz 219371 BLAKE2B b03ad479cc1171d0aba84f0ba221caca14a0ac560712400632d90505e4fb74c50927cd9ad6453e91687e0b4c4f1fd2b50fa32d6355c7d46518bd63adda82734c SHA512 fee7b52f2bb48a4dc6314da4c274bb3456b6af2a0d891c1125425e5a0898e3115ea486a7dc057c25aaf7fc141bfebb5ea4341b17d00373b68a7388eb75f5bdb0
-EBUILD Cpanel-JSON-XS-3.23.900.ebuild 525 BLAKE2B f5ed117782b3b16f69d9237070dd7090c6fad8ebc43649b121adc76d4a2beb5f1b6258416138fffcb0af467a0ad7684c7a53cd45263824b4d36d276e4e7bc19e SHA512 15e3cfcb4263a97d59ef395e12538fc71d742c508a4afe6cb5719e01dcf0a757fdb1fd4bc7c5e69aa56289934b7e56f198273359dbd137c19e675d6b032af2eb
+EBUILD Cpanel-JSON-XS-3.23.900.ebuild 657 BLAKE2B 70d01a497975a19761cccc9ca3c4c4d8eaaff344a6eea90d39d5121425ba4f31c386dbcdf13349fd03b1e684c7b5e7d15ffbc08f20b15866114d5e021c3fce3c SHA512 55c86a7e53a59da60cc46429aaef90252a0cfb4355d8fcbef342b02e0bc4c59c949a928e65580a01af9d8883abec902ec0070aeceb42e223698df1dd28a49730
 MISC metadata.xml 401 BLAKE2B de5ee963566e3471500d6a481445c09715483b7bc913e5a1fbd139de0d3f34e986ceb4cf9966cdaae909027250b76c85f0ea8535ca02ce558b861e055371b05a SHA512 c1ab8b9c9957f6e48f83e6aa82ae0912f3a7db57e34f844b4c9e8c004bbe303e3ab4c5cc865bd9df3b9d5b818fdd2389820ae3ca98da56ee3216fedc8b10a771
diff --git a/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r1.ebuild b/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r1.ebuild
index 6248a43391c4..eaf574460a27 100644
--- a/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r1.ebuild
+++ b/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Crypt::Blowfish module for perl"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Crypt-Blowfish/Manifest b/dev-perl/Crypt-Blowfish/Manifest
index 0705c61f99c9..7c6d0eb3253f 100644
--- a/dev-perl/Crypt-Blowfish/Manifest
+++ b/dev-perl/Crypt-Blowfish/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-Blowfish-2.14.tar.gz 18006 BLAKE2B 45689eb76512e311278278cc724dba5ca7ad9161a7fa2cbb9d05b3fc5ae39d7d1338bfacbad2750d9a418bb8c004ab1334dba4475cdb21eccfc87c489f59fc2c SHA512 be2cdae50bff68858334ad57b124396ebcbfbf9002af4693850e881b9b857a4fa22672b8295b52a5e661381c8f910f3061290bc697770fc7f14c6b64d65496c8
-EBUILD Crypt-Blowfish-2.140.0-r1.ebuild 448 BLAKE2B 285ffaacb83f3861e1bbff1f58ead662389bda9ee64720f2f24d412d8dbc101df9087b559593324179d0492d4878a39e460ee54c04d348f06583707ebcf2ffe3 SHA512 02a50938ec29de63908f0a99948d3b74cd4cd73f3556314264d34e2268decfbc2a45720b3bbd87443312731c1e93df73b7b8b61ffdc0828411d6b68437a9ce21
+EBUILD Crypt-Blowfish-2.140.0-r1.ebuild 521 BLAKE2B 10e046890b25f4a7a685882ede44dca6bca33b20aaac90ba53b9837e0f65002b4e4d986f1774ecde3930cd4ccb4d63b7fa92c57840e14fe9b95668ddbdc32ad8 SHA512 bcf27413274e74c6be2bcff02d49bfab5d7f2dd2a26326a2dcf99a0d310c6cdb9a37bf0e78cae5e914949b9535797c33f0c453f7201dc769b3385df4c797bda4
 MISC metadata.xml 400 BLAKE2B 300e17a10f3a057f4945642b801fa28d3468e6bdeef83a517af35cef1d2fc32ad6b24b06aeec67d31ff84eedc176e3436d4a35e017cdc4cd8aacf4a246bb4694 SHA512 bdd46bd03582bc00b53d2a700ee6c196fc4670773dc5eb3dd1278d22f12cc5635e0174c6f03eeaf1814c1a950e6c4fb7bfed5d44c26c2b3dd20d985df2e8752e
diff --git a/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r1.ebuild b/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r1.ebuild
index cf864b70ea42..179d7532b9fc 100644
--- a/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r1.ebuild
+++ b/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Encrypt Data with Cipher Block Chaining Mode"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="virtual/perl-Digest-MD5"
diff --git a/dev-perl/Crypt-CBC/Manifest b/dev-perl/Crypt-CBC/Manifest
index aa023ebbd832..8fc5060092c6 100644
--- a/dev-perl/Crypt-CBC/Manifest
+++ b/dev-perl/Crypt-CBC/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-CBC-2.33.tar.gz 23470 BLAKE2B 476e555df0000fc81c8be9af6133f018bc1daaa5b0d4f5f16ba37c68ce07dc720d418fd9f0ce1c452d5ad82fe00014ab735c6a94d3d5cc052284faf95e21d548 SHA512 5db17905c38b46f496617095655bb48e4737d6813c794f65dce88556f177caee1d5f669ddb0da3ad4b00e11ff1bc0af91fd4cd312ed2fd8497e410ef11176244
-EBUILD Crypt-CBC-2.330.0-r1.ebuild 584 BLAKE2B 0114c1fba556d1b4ae50bebfb2bf42c71bc80ab6a4b582abb6452f846b07071dde2cee058c188b1b9d1292629e3721a83650b9aefce7a646a22af0a27e8247b7 SHA512 1acbfeee0e74b86395ffe506479cddeeeea9503960396f7768bd67ccee82224b2345780d0fcd05141d6eaad8971e7b2fc5715cf0a45b0b54da9fa79e619dc53c
+EBUILD Crypt-CBC-2.330.0-r1.ebuild 657 BLAKE2B 74bcca391428e5876ab563e7b45e0b3d7137a3bf7ceaed7c715f6f180f63b87e26f25fde9fc6567a93a0261437834202de211738f2979eb32d1f9a85184a9f79 SHA512 53eefa6ef604b80235504a219217df7c9844b8e42646f79b49f5cfdd619d4771531984968feceb5b1c2206ec130e5e1b879df398b61f57e8500c96dce72a0606
 MISC metadata.xml 390 BLAKE2B 4e0d374b1d7f5f80ea4a219f50f3f34f72b1adb39f8ea3c0cda62c619e16e1bba4e0aaa0f13b880fa0de208e48c1d92f9501be41a326af48e8baad5d6185edf5 SHA512 a8ba735447bc35f4649e69cc31c71baf84606cdc5dcd70f18b98bac80c239ba21cd46334d08c2a3f4f3277dd113996e7996e587a69e482b27393001840688e76
diff --git a/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild b/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
index 0c3793ae61a8..26da9a4d3cd5 100644
--- a/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
+++ b/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Perl DES encryption module"
 
 LICENSE="DES"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="test? ( dev-perl/Crypt-CBC )"
diff --git a/dev-perl/Crypt-DES/Manifest b/dev-perl/Crypt-DES/Manifest
index 7a2dd965d70d..ccda51ad6d02 100644
--- a/dev-perl/Crypt-DES/Manifest
+++ b/dev-perl/Crypt-DES/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-DES-2.07.tar.gz 16720 BLAKE2B d90b919ab493a7f37cd1506b86c459d68087e0dd153e16d0343b8b90fb44d19f57686aacb1c0dd34a3bb48c2d11ae1f910e7e131a3b05b38781d54d2e4d2c05d SHA512 95d40280850290fb2f9b2f26be2f47f2241e0aeeb842bd02c56d667062d65b3b65b9a87c045cbee50604f95f8a0d0b033c92334520de19022decaf77f77c7678
-EBUILD Crypt-DES-2.70.0-r1.ebuild 473 BLAKE2B a4f2c88bec145d4295c835d7119c7fd613d7f43f7bc6b36ba437a5c0b45f93fa783d97394d9185b50d4156a0f53b7bc2849e9f8a010660bd186d9cc19dfa0f14 SHA512 a9b2125af49977a72ead368cb7db18a00c4d2edce8299ba082c1bef552c5edbe30952738c2d5d6e924c58348c71cb163c8cef20bdf93b4690a46879a45ce084b
+EBUILD Crypt-DES-2.70.0-r1.ebuild 522 BLAKE2B 3fea2a6c81f126fc4cfcb0b14e2f54e1a04fcae8c7ea2378009e076d60708e4525814bc26a64439e8930247ddd97d7fde3c1aa2368a354941c1a90a5226e40aa SHA512 29184151e7d0a5726c00613ba6ce2a2a521c2371b8179c468054d7f73e8bd7ad59eb3ecbfdcf4b27db4d62639a355578ca582f7931b6a39c5652798ecf246570
 MISC metadata.xml 390 BLAKE2B e0ed7568ad13c3f2d6a8cdbd8dbab2105b0f7e61c1494a81018b8ccee85aac9d308258564b133246dc0a071be9d940956d982a38723cae45e8ed7d229a05edce SHA512 3a19fdc685de7f63552843b4436bb4e0aeb722cae6dcd036a8009117883516a2ed4c506775cb15bdad9f66995e6faf88fc2fa835db846d41450f43fa8a7a80ba
diff --git a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild
index 0ba332f75602..98e4dce953f6 100644
--- a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild
+++ b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and save PGP packet streams"
 
 LICENSE="Crypt-IDEA"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Crypt-IDEA/Manifest b/dev-perl/Crypt-IDEA/Manifest
index b271e3999ece..80e1178b78b2 100644
--- a/dev-perl/Crypt-IDEA/Manifest
+++ b/dev-perl/Crypt-IDEA/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-IDEA-1.10.tar.gz 7225 BLAKE2B f7c2321441714ae57e77be1cc3c47b4c48456c8758da4713e6f806825606a351bbefe8767a38bdfa78b7842923a857bf3085919ac1dbb0cf6744a2f2f02a07f7 SHA512 2459f8f8ca088564b037101129796d6d3652062e80f9342173508df95b60ceb9ccb836b946d50127f86b38b239e25c58e1f4efde4eb73a5b24fc823a100fd018
-EBUILD Crypt-IDEA-1.100.0.ebuild 425 BLAKE2B 0315e444ff28bb793e243c2211973ceae57e82fbdb8708d540a60b2518715df7b8c068bd7b09a1253253ef3cce6e67150ec5c6cffa1ae08c5f499270f7399d89 SHA512 876db0af4d14ee73747a8c7ac7782120307ac7b1bbda2dd3e694666b116238bfb9835eee9e00d04cf4047234b638fb53d917ecb8d19964448af6c5d9161b2922
+EBUILD Crypt-IDEA-1.100.0.ebuild 498 BLAKE2B a76c0b578f805377b0121fd76badacdc0e7cc47ced8eeca473c56fbc8e8bcf1ef5bb61e689261b86e942920a4dff8b027c07da562a57a1b07cbe863fa6c4ed50 SHA512 a657e607c0e9c6c2bd401bb99ac550aa43acba3528401e6d1bfb0e1497ef765bfc5baf515ca08ad532fae22880120af542ab25117845205c6542876450b7252e
 MISC metadata.xml 443 BLAKE2B b347d52c409f7ce634b42aa1f96f7d31f08814a4ac1257f6bf6c832215becf59461153670213dd9aee3d83619d63f7c7f96f7a93a082d75b89df717bf3820282 SHA512 fa184e8b05a5260b36577b71e91bd2f5178269796c73c3711de1897737ccf1171dd878e849c34ec747233ef8b632082f9a0782683e220f024f82a01549873241
diff --git a/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild
index 187df4eaa809..50b3aaccfcf3 100644
--- a/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="OpenSSL's multiprecision integer arithmetic"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-perl/Crypt-OpenSSL-Bignum/Manifest b/dev-perl/Crypt-OpenSSL-Bignum/Manifest
index db7b4c60f593..d486cfbaff93 100644
--- a/dev-perl/Crypt-OpenSSL-Bignum/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Bignum/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-OpenSSL-Bignum-0.09.tar.gz 16202 BLAKE2B 912329b37230d503e7928640b2861c05dbcdf64a5943b5b3d27dfd41ae2eb585b6c61811060c29952ab5f9c09a7160a4038656c7ed9046a27e3dc0c5361bcc63 SHA512 3480a64e35e158a7a7c75c0e57ac0f578ddcb901a14f80a58ffabd1f318a68a83b411a72c22c53650273507198907b1d62c88fddbf5587885f6fe1a75deff3ed
-EBUILD Crypt-OpenSSL-Bignum-0.90.0.ebuild 559 BLAKE2B 1ca7c373389a6f84d5c96eec596d6888e742d8b088eb751c51a39c68fc099676783e47fe3d9be8848b0b84599c5fa1c61102fc8c209f33fa10ad2a69d01e9ee1 SHA512 69f246127c514bf82133d87c05924a3465bf5b334224107bcd5373fec19c411c5059217cd0c0643fb87ccc6974cf386ace75277b6040aba5eddf451c347bc831
+EBUILD Crypt-OpenSSL-Bignum-0.90.0.ebuild 555 BLAKE2B 4a3073bd7f0bc0e943502eb923106b1538839f4aadd12bb9d8367e689d656170699bfea78c00550a8502287153b66ccd6e6b6b5a1e99c4d4add9105386692dd9 SHA512 8755e7ba38e719c1b4e369af58ad98891771fdef5d2595f66e062068ea217500752a7f6a320350f3d2edd76d41a8edab4c797bf790c546f9d6fb7d6fd7e97713
 MISC metadata.xml 487 BLAKE2B f989929f1ea0c37f69c27f3b0cf3466672831c28bd53d8a572e3c0cd04cb028c5fdc2e59861f6ce45d102a38e719993b43796dac1ee214d2fd3a27a2b4c613e6 SHA512 1e71784a35f318764db6f11bcbdc77aac5390288565af158ccd66cfa72c0b4e1d93973cd85bad2a39388600f6e29f0a7ab68f57832f3117626a17524b712d3a0
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
index 7c232dba1a65..fc3bb1d4e099 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="OpenSSL/LibreSSL pseudo-random number generator access"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-perl/Crypt-OpenSSL-Random/Manifest b/dev-perl/Crypt-OpenSSL-Random/Manifest
index ce7447b7a1a4..0fb5b3a1223a 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Random/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-OpenSSL-Random-0.11.tar.gz 15161 BLAKE2B 33c491755f210514361f6d97715dee781a3f1b99879b2357002dc6dfc8e6c63df530cbcc1ceb8da407928aa531d0fbe85f43afab3d86995f0ade6c58f8bbd320 SHA512 c579cb2b586dbabd697a9c7c989a360ed4bd8e9b28d7c93ad99a86bd9bd680a89c3fa77f6315a1105fd41bfdfa18087ca4cd51fb320faad7a6be9b90e3e69b95
-EBUILD Crypt-OpenSSL-Random-0.110.0.ebuild 699 BLAKE2B 258d68af87b84c0659befae55db582d0603a9a2adf3d03eac932eb8dee456dcbd639a78aa3c5446638a4162237b7a6849cffedee7a6b434570a01dc1c955f1b0 SHA512 6d35f38c726d7aea4845ad61fe899f348bd9b8521152521a2c47979adc068746c9a2861b74613ab000ac2e02759c6b694f5f10e82ebc23799fb157efc4fdff2b
+EBUILD Crypt-OpenSSL-Random-0.110.0.ebuild 695 BLAKE2B 186d5752ddd6cd68958db46ea8de86076a3fea91f7ddb3d24ce532fb931cb0e38a825add0e4b18511783d7d307e7bae456c531fd2da0d9fe7649bd3d1e710336 SHA512 0e29036702c03f99d4deb6b3beae7f54eabc05977047d7e2bdcffd38625c52c904d8db4dc80de4c2a31c91c06bbffc5b693c7472452232171e449605b6e9d0ee
 MISC metadata.xml 413 BLAKE2B 03a4dca7d919259dff481a02856287747167ede1794ca2a3307f653ea32c5e34c0a65d32961620ddb1a549da94b1b6a32d7db3f19651a4ff9e93fac03d34b642 SHA512 db707a5e0349fcbf52586739288ea6b95c907918897c611837baab0b8792e58c4864cf785d719af8b8a096c8bc607d2198c5e627dd4cb5a322cbe42c5bfc5e58
diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
index 2210a9210083..aa4cbe98798d 100644
--- a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
+++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Crypt-Rijndael/Manifest b/dev-perl/Crypt-Rijndael/Manifest
index fda8db7d3af9..c41e64a2a589 100644
--- a/dev-perl/Crypt-Rijndael/Manifest
+++ b/dev-perl/Crypt-Rijndael/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-Rijndael-1.13.tar.gz 71724 BLAKE2B 8b35819e0909f8eaf3952e95ef5d48440411abe267b23f9cad2d6a8f33f4376159376192747febf884d097255519baea58489b7ffcbd2bb024befc2c2e320d01 SHA512 46eea4eb6568d9bb70685314c6a29214552787c8cf138adb77271d07b85c16d83ee3faa53e6c3b7d0abb5cb735827407e970f954ae93123dfeaebb5fb34f1329
-EBUILD Crypt-Rijndael-1.130.0.ebuild 516 BLAKE2B 9fce122f1c402c8c4e27a6f6084a7860a080cc8b846c900d2e66e695d452da154861864f941a9b1fe683c895c41117e102dfc7c9c7d380be909f5eef9a591178 SHA512 7ee459e1d8d402bf23e91b10c1547255d3f103c6356cb445bcd3db79f9c7d8b47f8848eb544a1c54248c5d7ab9858fdd7451cba8444055765a111b5443bf956a
+EBUILD Crypt-Rijndael-1.130.0.ebuild 589 BLAKE2B c9bbd00395eeec7a3da2277e3baf50625bbcfc6afc70ddb31fb1459eae0503d3eaa63ed1386405cbd0d35b9207836b95a0258fbe0bea40ed49084226adf0e3d9 SHA512 38f98b3bb15e3845c911a02be05cb1d8fd5c3741eee52b467fafc35075487366d1cd8e4b98b8420cbb38af5458dc6443be471cd721954b638b9a23187850c9fd
 MISC metadata.xml 400 BLAKE2B a907d371bfe4d9c8279994d6354f1f265b08c94e11b498c23777182508c4c029931ffdcafeb74ea43216afcedc600528f15caaadb2cb1791b90a810217097118 SHA512 f14a879a9884a743e0b9df7efa0884fece988ee6b21ec96051cb7a9b80ebf76d8a240a80eb83fe4290cae270105bfeee79c8a7a7beece7c44724bd8e9077c485
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild
index 5c25b81e75c1..f0fac631857b 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/DBD-Pg/Manifest b/dev-perl/DBD-Pg/Manifest
index cbaf88f581bd..db8650308d3c 100644
--- a/dev-perl/DBD-Pg/Manifest
+++ b/dev-perl/DBD-Pg/Manifest
@@ -3,5 +3,5 @@ DIST DBD-Pg-3.6.2.tar.gz 258640 BLAKE2B 76e25905b0336eae4ead14c28cf8338412fec023
 DIST DBD-Pg-3.7.0.tar.gz 260083 BLAKE2B 73ae253e8033dab58075f6dc3c639e5d21f2df09880f59cb00fcdc201c17db1573e4902c4bfd535916775c0ef61a020a70e8f542ce28e257a903d4aabb9f6730 SHA512 edd4d3448dac1b563899c5fd4a1bad6cb810afdbbbf57b558bbe6710aa3e58530a6cf0932e35c3316c7f4f59763764d75ce1049f13c8c13deeb2e8a7c60ff73e
 EBUILD DBD-Pg-3.5.3.ebuild 1144 BLAKE2B 20d1d5fc5b14c8e596a34f09f7be7e15c16f080c4ceeff143aa7bcc1c685a49de251c7fa823983c190e8d4819af6be64c113c992e39e8eab5dfa2bd75b6f7569 SHA512 5f237cf091c9aa5eee967b6e80d004a4e1ff3e99f344bd124f28160892c72931f1615fa3a5470edd02078dd1608e6ce4efd339ea1cfb9accdf63cdaf9ce6dc3c
 EBUILD DBD-Pg-3.6.2.ebuild 1153 BLAKE2B d2618de3bb78d8192e1d0bdb1710f0f04f45028dca8ddbc05c92457d3a1f3f97c4f58ceb555cee2936a0c7d9150564846fae7434c81db8cbb2b719708b0ce188 SHA512 67933187e9e9f05347b13cb3a91d178c8c9af03cc2c2efeaadeb2ad522d9758a3c1ab4d65460b529d61eca976d177c9b52aeba16ad3513959fa27bf5a6026ed5
-EBUILD DBD-Pg-3.7.0.ebuild 2677 BLAKE2B 7854e36cfd92ae3250eddcf6b1a68b817cd0008f67ae052e2921471a211e34556eb04c48efbbfd0957edf4f5b07d28d67b62a75d9b5528618a613b4d6212fb32 SHA512 7b53c532067cce4913910ff45fb4665215c2e5ac5ca3cabd1346cb977327b419b159cced38ceff53cd04c780aebb900eb5696352ff8144b54b137dff3d7551a6
+EBUILD DBD-Pg-3.7.0.ebuild 2673 BLAKE2B dae3b4ed48c292c3b5f46e07df456ee2ad939c1a438ff1d56e1172b233bd92ddff0e786f0d6bfeca60a7ec34fe618da9f4a17ec58eb8d1c4f83c9e93abeecc00 SHA512 813388b5252da67302c03ae7355d924445350867ffb3877986896a148d1b47423c782b3afba7c478ce9a2b452e012e8a58457ea783541e8548d873beb631ea6a
 MISC metadata.xml 446 BLAKE2B 428b5b91a84ab6026f482e2e3404f7b43a1557d16f42340453d927b4ea676caa3ab422705ea99439fd6369a43af9f2dcd0d7d3ec6a42f82b9e8df17cd2642a1a SHA512 23e05469a61761595bc52b6798d152dfc82b42a4ce1ed8010cd17b6343557ef92433cd31c00102098ed698ed0fd0260e3d165c926b9ce3de91f52112c9b40684
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild
index d81d0a4e0202..0a39e9bed817 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Self Contained RDBMS in a DBI Driver"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x64-solaris ~x86-solaris"
 IUSE="test system-sqlite"
 
 # Please read https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBD-SQLite
diff --git a/dev-perl/DBD-SQLite/Manifest b/dev-perl/DBD-SQLite/Manifest
index 67cea54524cc..26e7a292a334 100644
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@@ -1,5 +1,5 @@
 DIST DBD-SQLite-1.56.tar.gz 2248699 BLAKE2B d6af8efed8149ff2ec5c68cc071355805f4a24e234e015c180d5326a4def4eab33352d168e9e41c06b2de28a0137f0d39a864749bfa972d28f8ec9221379bdc1 SHA512 1c9be3557691f76a9e543fe4bd6656a6b82f53fba4bc05261a55affa0a38b4eaa1cf876da975234c9c09985ba25b21f6f7a735f1cc47104169edf7fdd3a2e314
 DIST DBD-SQLite-1.58.tar.gz 2248800 BLAKE2B 54cb94d0c64389984290361104e723be4cc9c7352e2f1c80838efa15d8f3d9d671705117422a1076203821b24ef63e06bf95244a0bdd7b710394e655041af18e SHA512 080d1e304fb0d43926ce0345df3367132c317ba113bdc11952c0a159bc68d988a024828a28e66be267f82e07731dee225723854fb80914ba7c476b27dbdeb212
 EBUILD DBD-SQLite-1.560.0.ebuild 1289 BLAKE2B c9826778fd550d26995af24bf0beeaf2c1bb8f6597b52e0aa14071d599438e32281b783acf3b7d82cc4d8670f909f7ff678950005e84518524bd66e78978dd99 SHA512 1ac44eff172582e3190661c32eec0a6bf93e8abee86a8c00d5951cc0f5b081a43d14de5ea256899687b7c0d40565f4c2b2aa3d4fa211ebbcb3ccf5d008345e6e
-EBUILD DBD-SQLite-1.580.0.ebuild 1291 BLAKE2B 4551823cb7651d016855009ba3664b052acd8f1e87b321a97f10bd893b508008e2262d6d2736558796b5f6278dc56176c26b630734a416a23b252dc3f8337f30 SHA512 e6f442673a54689ac5726114f23e8420b4a3605e07ce57b03cb387281974427230666d104663c647e9438a63330b1ec6ea7c35ea25684ed0a9607f0dd5f4fdca
+EBUILD DBD-SQLite-1.580.0.ebuild 1290 BLAKE2B 18e1155137136a58f57021a08f01024d4f226e408bf4877327f6d93f0f5ce1abdc7d110be10f89bd3b75a460f18f98a3cbb59519e7ccd9bbef540b67701a312f SHA512 89092dcd34e8d73943569d74f5d9cf6a383226c69513267adc3e22365f7c525bffb47701f1e51168631ba23e947f57d8a231f0d4936ead461be668bd659c77c9
 MISC metadata.xml 1076 BLAKE2B da1e831d74cde4db051a301cce34e8a64ade0f85accb892a72f5480db33ce3672542932b455b69f8cb7c0abf792799639f8c06c572e89a0abdba64561d2aa4f9 SHA512 6dc34ac81f2eef0a16be36407d29a91f341f19706a9660d751b5d4b289b44d6595f31260a4987b2cff22c4b02440cd07dfbcef48b1422da5ca96a5dcfdea510e
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild
index 49b4d9e853d5..c9518763e2dc 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit eutils perl-module
 DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="test +ssl"
 
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index f402b59391e3..c8e5e15e1725 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -15,5 +15,5 @@ EBUILD DBD-mysql-4.37.0.ebuild 1973 BLAKE2B 072f8acba91a0512ed7b4f9ecd8c1dc71d14
 EBUILD DBD-mysql-4.41.0-r2.ebuild 2093 BLAKE2B 046ff0c8ddec85d2fab3b7ec4d7018c46609b54263846d81b513a770327315ca3bbcc34f2d09308610028cfd3cad85fcf9ea4d92b251cc4576add96bf475e742 SHA512 72f9938a6e98a0a1631eb75d97af59c0ddcb8b7e5436572ab3049967452aac9d6d0339fb7c07e2e7fea58038c2d14f7cd5635767baa43967b480e3e3189fbdbe
 EBUILD DBD-mysql-4.41.0.ebuild 1966 BLAKE2B 3bd3a45c3dec31844ade8b79edb2089dc20a627b0c8797947c0e0e0ea7780a47a8a60582d57361a0f3bfa833dc65f4686f61cd33c04f591b1b562ecf8e091b60 SHA512 88e2669b1feb2b6bdeec630a9fa2fc4dfd62b907d0af3ac0b97a90608a4113593f704ce92d14fd542c8b9760d3a4a345dfdec251359d30075da1a500526182e0
 EBUILD DBD-mysql-4.42.0.ebuild 1977 BLAKE2B f7e71ad84f2f9889e4b933b1bd9b1f41a01956ac112aff4184610193b3f413d5905e16ac32aed958739457c9b2dbd1ceec46fb1fa3cb56571d317ffbf75ffceb SHA512 ee15ba80bc64c0073a81f9883ceb0366e21aed63d3543eb75427166f01ffe0125087d4ea0aa196eed1c5c8596581664038bc9f41c2486c2ea5b8c4f68cf9c201
-EBUILD DBD-mysql-4.44.0.ebuild 1823 BLAKE2B f4347a03a9d728e16b3ad45c70cc2b69bc3038b442ebfb8701d72502fcedc84ae88bd55dd9a65358405d6caae2fc0d127861a23d71534c9a4db861dc9e2b7973 SHA512 8c510d77cb5dfae787ea3347665e0716e8870ae07bc38b55b71647c3449059dc0e52d7a80fd8f85c895129e7e9658565846f6a38f2f78da4e912b2f7338d3597
+EBUILD DBD-mysql-4.44.0.ebuild 1819 BLAKE2B 7f1b5cbde282bb12ac4a007e300ee698ceda78a3b158a4e24532a6ff045d84122778700069e6a083ecdcfb9eb63152995276d0da6f7bbefcb14c2ae241801ccc SHA512 142fcfe7b401298b6b6062fe46da15757372a1af00cac153ef3462a5a91b242c539eec301b576e203f5508021c665c8f4a802271f96b64b64de08b5343c609e7
 MISC metadata.xml 876 BLAKE2B 72a484b9d7cef869858a3ac26315ca83317344de66a903072a93af8b80bdcd310d3a59084140181faaca40c1bf640e7b1f6baf9939254624acc166906f4da476 SHA512 05226b4f30741e8d77f5174491aee480a958e3cdf9b9484ff261b975805b82eee9ff865df97891c6107307c5cc19994764110f5461c3e80c9d8828b34e076968
diff --git a/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild b/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild
index eaa9923913d5..79abf10f7d32 100644
--- a/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild
+++ b/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Compare perl data structures"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-Compare/Manifest b/dev-perl/Data-Compare/Manifest
index 15d557947fb8..2e70bfee0d71 100644
--- a/dev-perl/Data-Compare/Manifest
+++ b/dev-perl/Data-Compare/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Compare-1.25.tar.gz 26249 BLAKE2B 7671f063b17b7e531dd06684f44ffd2c8bd80eeb215c57c2af983330cc8bc47c6d887d3556aace6bedbe8985f3e4d6d6f0aa1c70d5164e7d1af5f2bd1ff4d5dd SHA512 6db1235672030aa1afe52de1de9fac1f8a2af9eed99a3143d6c5b30669908125f584638fe06b8b33208f6d7fb734ccec7381c9411408a3f4fde1998707f748c9
-EBUILD Data-Compare-1.250.0.ebuild 612 BLAKE2B a93f75d5a4fab5a85b0663e5857ece451c785291dca4daa98cb2557104b1deba17b11769b01feaff4aa5144d3b22dab78377cf5749b0c0f5e0a778707f501d75 SHA512 ba39482d63e02dc11bb0ae597d24af699e40c8f77a846999534b798e4dca54c79c5ac2ce9dc22c82f9a8b96948697b2fe0d6971d42d5746c042835952f531858
+EBUILD Data-Compare-1.250.0.ebuild 689 BLAKE2B 36ca986902ec7746054081c83657c0e6c3da29e0902c2c6f61c848cf6bb823d1a91c1d1778f67f99d3027850b77d1f6fb8dbfcd4262756f4df2f853fa4f1db79 SHA512 bd9d5ecf8d6bb6ba730b961d28cc3c07f2250a4b04343fd0277428daff82d4989350b74b2f07b5fd630a55138ae9ee6235d5dc3c135e477e9e1636e8bcabd329
 MISC metadata.xml 485 BLAKE2B 613cdb96c87111e13f3fb15810ee6fe807cd9d1d451506a445ddd35fe83d1812bf1f438ce5bc4c9fc00291c5b6d88f3bf95256dad5f217b6b8551f83aafa88ed SHA512 40da075143e67c0b74c5caaecc525234cfdb79c237b3889cf175e9e2dd8e0a90d01d2e4a7b80822f7c35b01b68a81e825c3a65a1b8baa0ffae2f13dcfeebab3e
diff --git a/dev-perl/Data-Dump/Data-Dump-1.230.0.ebuild b/dev-perl/Data-Dump/Data-Dump-1.230.0.ebuild
index e37a3de56c77..633c70f390b7 100644
--- a/dev-perl/Data-Dump/Data-Dump-1.230.0.ebuild
+++ b/dev-perl/Data-Dump/Data-Dump-1.230.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Pretty printing of data structures"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Data-Dump/Manifest b/dev-perl/Data-Dump/Manifest
index 5b9aeb1c8861..02c7f7f2f506 100644
--- a/dev-perl/Data-Dump/Manifest
+++ b/dev-perl/Data-Dump/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Dump-1.23.tar.gz 20771 BLAKE2B 04f28bc08e43a736cb9fc532883aecb85add98651e21f19a68387dd578efacc71ef85b567ed7f3c82a13a9e8ce84b0c4bebb9afffbb43f892f6b1adcd065ef92 SHA512 6fd6c23bb6df7f7396219149dbfd23132fc2ea1dd344c32f62fc27a1afeeb28d7ebf2d429184bb6d1189f412e218f9e62a966b49fdd9ad5564e5152d67a02b96
-EBUILD Data-Dump-1.230.0.ebuild 347 BLAKE2B 17af801f553bf32f4b61397f5c52f8b036b98097d3305b2a62ba8e6c17cf3cb7d99ec4b1b8b18703f12c9f30a8e78904e3ca034b63838578fc980dc219f2301c SHA512 ed109e62b7d245ec3c80888dc8c9ef46c9abb27be0e5719b32e93a6efc0163aaebb089ea674de4ed6ea42658cb58c6bc01cdc5ee56fb537a0ef957d37d6df105
+EBUILD Data-Dump-1.230.0.ebuild 442 BLAKE2B 78c8f1504960e8dcfd80090355b5329a1be25a79e1656d8333999e7f484742eb0704e07fd6c5bf7297ebae1cbd53912cf92b1af177fee87fe4d505d76e921a6e SHA512 07c6d82ca541fdfe582adb1636fa2eb12bf6695fd08aa115953210b2b93eae3903460cfa8fee6ebd8f0736719c377a1bcecda4570e2f23c32e5de987d4654c90
 MISC metadata.xml 736 BLAKE2B d30d91f804e452058e957e7ef0ac749355a441153d3a21b3087978b1c35d83f9764d45839c3154ff8784e0cf83261e369966e7ee29844395a7504267d417b119 SHA512 a9217cfe0f147e38c9337da8b98fee66971799b26af819c451147058933d01f70bd3e852a31afcb6823d7727d8a2336229e4af99ab4b3a2bad627653e4de665e
diff --git a/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild b/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
index c6ce08e4e174..0646be37fcae 100644
--- a/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
+++ b/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="parse and validate simple name/value option pairs"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-OptList/Manifest b/dev-perl/Data-OptList/Manifest
index a276e38fb0f4..1005fc171f38 100644
--- a/dev-perl/Data-OptList/Manifest
+++ b/dev-perl/Data-OptList/Manifest
@@ -1,3 +1,3 @@
 DIST Data-OptList-0.110.tar.gz 18846 BLAKE2B 509e12842175d6928805ad58969986fd91f707af9b04ca56bac15658b0ca8ea1de9494500282f8a97ecfb874dcb560b8c14681c80c5d91e7941e44b981a7761f SHA512 68393958a38f509a71cfba61f6dff8303821918ba29ad8492af0c23cfd4f741c6ce98c4f68ad295f27e166287fc546229c430816f0bdd6009d4f60860c967b76
-EBUILD Data-OptList-0.110.0.ebuild 659 BLAKE2B 5e6b4302e208b6d67a61f2e95085347a64450b991c3b7d7fb98959ab433d1fbe3047c91b7a6f8be20be7a9533b592d557a0eebaac7dd164bf48c17e7bb6d6282 SHA512 5987286e4f2da401ef788137e0e3974a7cc77fb9807af57e9d48d3d587917ac7d8365f03fce783c25a531e548b80baddf43db63e021eb3876cdc0237b4e1d76f
+EBUILD Data-OptList-0.110.0.ebuild 712 BLAKE2B 67750fa31f7a67e23dff24de371c24942881cc886a1229b076d312b03c78f1afeb789c3aef25f4e560db7cedc0e9de2241e54c3fd8f63e8fe1cf3df411d8f0d7 SHA512 746cad9614e7f9b614ade77795778083f2f9a67b3d543703f3f0f39ede881b0bad8a148d1230ee21fa8a8fbac65a5aee95b7bdf8b52c7d38987ef04448096121
 MISC metadata.xml 396 BLAKE2B 57d9a5f1cc2283f65e0ecc9ec9eb2d4878aaf3cbfa978ece09591448aebae173e1211661c8e25d48016aa3244da11976787233ba7d3c0a97e3ccd5a1cf79f5b8 SHA512 4ee9df642b89e573b900906480c734b4f09903b706a9196db040d0ae0fc35fcdfa0deb0c657645f627beb7f72cfdc9a150bbcd69649eb1307865012cb3daff28
diff --git a/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild b/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild
index a1d064349664..6a779edde9cf 100644
--- a/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild
+++ b/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base classes wrapping fundamental Perl data types"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~ppc-macos"
+KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-Perl/Manifest b/dev-perl/Data-Perl/Manifest
index ba069d5779d9..9bd4e31a9215 100644
--- a/dev-perl/Data-Perl/Manifest
+++ b/dev-perl/Data-Perl/Manifest
@@ -1,4 +1,4 @@
 DIST Data-Perl-0.002009.tar.gz 23155 BLAKE2B 1f8c1ba4353c26736b3473be2283df1e0a247150b842333010822f7e1d25ecdddea39ac7874ba79d777e4691eeac7257e40ae366ae0a3fae0747a205166c54de SHA512 872eae53641b7ac19a8bcd4a6522475bf042463fbb8380a45481289c6792fa17cf4d52d146228acf089b9cff091413684fa5b39f67bc28f362a5d2eb85d1d01a
-EBUILD Data-Perl-0.2.9-r1.ebuild 626 BLAKE2B 726cdbea654f93d41dc89f5060b238e52aeee21d50b9a9d09d41e74dbbd83d4720055453199518bd66a0078035eefc5ce5ce723b930d6732dfa6a3e136795e99 SHA512 7060472877f39baf787af1097fab05181f4150cb94046a265af56638f25f6853c8d8582243e91be49c0df1e8af66cdfd314a5611a838736a362ba5ad129abf0b
+EBUILD Data-Perl-0.2.9-r1.ebuild 747 BLAKE2B 9d045dd9da41056ae34d682284ea60fdfee51c668b43227e37d4d711a709c6905c40774de611466d5a5aa33439c70d59007c2c3f1bd22fe6f9da640dc2e0e7d4 SHA512 e4b329214f400bdc29b762b456f5b651230dcc98cc537c13f0e8c55499a99a4f06ea13355680bf451c98b892b55850b33cc9e121e62656a937ec4ad3f5be78d0
 EBUILD Data-Perl-0.2.9.ebuild 645 BLAKE2B 63ce4c4376cfdb08c88a15c7290e97b6c2d5d16fe03d79c7abbc44becea8c41aa6f2a6866778922a824ed3219e004949c0fda1b30d059f357a1832d4f3614d5b SHA512 ed93c6f9fd153aa79bf7b9156f2f6b476df4e9829f07fd2bc82410a0bf0ff972cba9f5288b12e288a21136916e152916009be629013bddf599663ea0d5b7d5be
 MISC metadata.xml 1378 BLAKE2B 22e5a37a6e977ff565611a6465e7b5ba9e94e97d4d24698e304b35522d52209dcfc64494091ad4b488187fa4ecee648b16c8bc5eb5d261935cfc0bd7b8538d25 SHA512 6166dd5902561f4f12158203b8affff35835c15b9d843b1924eea23a0af70832045cbb33fc534cad128ec06cc096abeb539f4fa6f670f78f173bb8ac164e16a6
diff --git a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild
index b01db92f7972..bce03b140036 100644
--- a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild
+++ b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Lightweight IPv4 and IPv6 validation module"
 
 SLOT="0"
-KEYWORDS="amd64 hppa sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-Validate-IP/Manifest b/dev-perl/Data-Validate-IP/Manifest
index 66f11b73bbe5..d1a300e7061b 100644
--- a/dev-perl/Data-Validate-IP/Manifest
+++ b/dev-perl/Data-Validate-IP/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Validate-IP-0.27.tar.gz 38139 BLAKE2B 5fd260fafc3a283bb14bee0b51aad9f829682353e4802cb570fd9f7ecdbfdfaaf2a7bc77ff704dc64c9866c93e054aac4252ed86fff57135c04849b817b06f52 SHA512 5a93f730d53e7adcac4fe5e227b69a44e58cdc94b0081d79978547263095e97c3690c8c6fc6664fc8e4b230ab4c360beda22e6600a3c7abe5e61129ee70553b8
-EBUILD Data-Validate-IP-0.270.0.ebuild 560 BLAKE2B dc714db3e19635115fd5c83e3019325d41a73a0a46920bae5362833ec18670828cddbfcbca4bac99a12827d1abbcbed549b7bfb4a92b2f4d29f301d8e19839c6 SHA512 d51ff3a7ead9a2f62b6c2ab093fd54a69a6a97b12f4c858a9881d73d37b2f7539bcaae79a442403947c4cad40d271aade7a741a7121ddf5f90dca79ad3effb5c
+EBUILD Data-Validate-IP-0.270.0.ebuild 577 BLAKE2B 21b8bb9ae57346d55f41feb60e8f56aa2d39f92268ad9ea8126200a5b959bb6f508d26a44683d6210e3aa9777b55b8157ffeec139d14ee9a5c6a12bbe752e23c SHA512 905047cf741484cb7580f5b9fae2c318f4ffacf1cd946e96945ae36147a48e27691f15a8ce12e9ccac9759c122fc294ddff20dbb9c271044cd1179e675b681a7
 MISC metadata.xml 405 BLAKE2B c3bfd8adc080f8b9326035f8596138e5fb7b6c2f22c33ca87c555d768d820e266e405a1c7853086258409bbf33dfeb149b59acb06b700f06988ec49287ca258c SHA512 5d39792f857258ebf9a8ea82ea7407b0ea4b05de767d562d026f5cfefddd940cd3d413f142b2e861981a3806b0a8559dc94d8db3ed43f4e5e9df79fba0ff6c31
diff --git a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.ebuild b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.ebuild
index 5c7877c688a0..336609519348 100644
--- a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.ebuild
+++ b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert between DateTime and RFC2822/822 formats"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime-Format-Mail/Manifest b/dev-perl/DateTime-Format-Mail/Manifest
index 413334ab0bc6..cc86772c4bc3 100644
--- a/dev-perl/DateTime-Format-Mail/Manifest
+++ b/dev-perl/DateTime-Format-Mail/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Format-Mail-0.403.tar.gz 178292 BLAKE2B 931547f40cab8d135167260783c5622a748f90c4d0b3b002496ec2ca26390adc30b5e8fe1b95a9fdd81fcc65a9fa1166413e2a79d390a652b1f74b4447329b2a SHA512 b5e6f0ffdda3c52aa64b65414f399dcc06f72004c5421f8f0dbf1f9d4cda6e0deb1c3873df62531dc265a44ac66fd110dfc1d4273c97a48b0c472a67b03fd56f
-EBUILD DateTime-Format-Mail-0.403.0.ebuild 617 BLAKE2B 936856b2c740134c431adb036c6fda503ca512877bc9b104e081be3cfd17b235d086b1e42e5058561c3a81cddb4ffdc39f446be9a0d352cab380429c013edd58 SHA512 e3604d4efd917034915886288a9afcb586f29d906fe5dc156485a6c82a31903ae518ce2192b6706cf6af6461535c660120d42d87380e7055cdafce2bbd06180b
+EBUILD DateTime-Format-Mail-0.403.0.ebuild 736 BLAKE2B f307160292da9b308e6816bbe4dc37427bd47a0a0e2b7dbcebc2d8ae40d38092dfc50179d3185542d2c4287d748468079144929a85ca63a7744a0c2b3a0127d1 SHA512 f593260bf4a0a186be43d12016ac5f6a68c0a26a0981acfde11e7aa72b41bb6bfba5a22c48b3e39263c66396484be186f88709c2c793636b3bda7463e58f28df
 MISC metadata.xml 413 BLAKE2B a0621506432e96e33421b27dfefc06731fdb3fa49d22fd6f7cb826e1aa36998ffe95326605369fa80224f1487b425129309a6aa6bb6959e83ce3de71f0f17cf5 SHA512 817090c051dff57cb4ce28ae9b3749f560bdf7ec26daa23d0c6797acb591808971907fc09cc4ff7e2fc4f10ace5f2abb9d45a39f1d9a16ad369f0f73570f2a9a
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
index b96e949919c2..c7fc08406c9c 100644
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and Format DateTimes using Strptime"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest
index 2ada5621cb50..374a3b63685e 100644
--- a/dev-perl/DateTime-Format-Strptime/Manifest
+++ b/dev-perl/DateTime-Format-Strptime/Manifest
@@ -1,5 +1,5 @@
 DIST DateTime-Format-Strptime-1.70.tar.gz 105460 BLAKE2B 6dc4ec11cf57b44f4ad7b03d55c1ba58e6f76b4f133e5c0feba22ebed8d8ba7fa67c2005cbf34457ac9900f1e8c7494f6b9f6a432fe83156cbe6c39243dd93da SHA512 a4f01f0032beb94d2bf359c2aab4050c2b321a6da236deec1ce198e88b657fb70b7328304f51fb12a9edf61035cb581c8a9a85c62a0ce8ff94c1ec5d22510d09
 DIST DateTime-Format-Strptime-1.74.tar.gz 105317 BLAKE2B 997a76591b710f61e003998fc97ec26a8c5ce43dff83e42dd9cab5b13238c21e40f327afe46a0258b9f8e725abfc35d0d9957cf4e89936aa17cf79b1f7d111d9 SHA512 3b2b640f93956e82aff47f068c596018700615414c9b9ccf8d6bf68ad7b626ec86a831ec2b68807d7f137c10d4b8cfa5d2d50a6304252f3dfecbe9ff94e59617
 EBUILD DateTime-Format-Strptime-1.700.0.ebuild 817 BLAKE2B c8f1f87781b5a628591bffce85e310924d1ce2bb1d066bbf271225322f8cc33a1e86cbf88456b518c655811e6dd34e70aba990417ac093c40102852960cc3ef1 SHA512 2b5042265816c6ef7ca71ba424decf733842bf3a5741ef3e50d9b3e8ee93e2e4df288419a449993871ed31a565f491b9fdc860292f468c689cae5fc9809d9f9c
-EBUILD DateTime-Format-Strptime-1.740.0.ebuild 852 BLAKE2B 390097bf37ed1874d1314fdada6e3e35f9d91949a24ebc292aadc536727cb3405c177b5aca41aa217981f4763e12993f03ca05872b8b2d36104fd56d53395a99 SHA512 d456cc4799a8bfe769db816b89b5a14ea19f8129e2ad6044ce9eb2215db327ea321b8f828d067523e7e6b9e43bc3161f4e89a87748e36bef735b9916d537014d
+EBUILD DateTime-Format-Strptime-1.740.0.ebuild 958 BLAKE2B 6acd723d4142ce622ca1408cfc20733ec6674d00a9f2f1dad8095930ee39c174106b9952a62e1e247b8b9730ffb8f82362d49783ba29035ef1374dec8db57913 SHA512 13518440b0f88693c4da06759d9ac27e157ba5bcf31f6197bdc36b4ea070e7712e7b0dd64c8c699c50003d6f031c784e59da2501b7ed326a213667c20c24cb6f
 MISC metadata.xml 501 BLAKE2B 0f79c43ee9cab97c8027a8bceea775c4e2579514e8e6062fb44d95cc04de45d2b60249e62c90c073ff0bd0de5e979d82aea6398e43b35fcd826ae67fe41ea93b SHA512 498bfbf685542fe1e8920f007e004338d06a0d28b88faf8a323370015a3697ba22be57b47b2d77ebcb5620e353dc8079cf6a05b03493c17e28074221895825c5
diff --git a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.70.0.ebuild b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.70.0.ebuild
index 6bc3fe665ff5..80b3497dd6e7 100644
--- a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.70.0.ebuild
+++ b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and format W3CDTF datetime strings"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-perl/DateTime"
diff --git a/dev-perl/DateTime-Format-W3CDTF/Manifest b/dev-perl/DateTime-Format-W3CDTF/Manifest
index c66f702d40bc..5bb2494ff7a8 100644
--- a/dev-perl/DateTime-Format-W3CDTF/Manifest
+++ b/dev-perl/DateTime-Format-W3CDTF/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Format-W3CDTF-0.07.tar.gz 29598 BLAKE2B 11d1281124a59ccc1734bad641b9f0278b3a34d1bcb6ad6dc030fe2e384961fbcdfea7653c62578c9c22d636610a1b0bb4fea327ab0b4674d0a27178fcc81b62 SHA512 f5b8f3437c4e9a7e192900af16e83a567889dbdf1a934d604461c5096c271b497cda9bd4f9359658f536d262232e4521519f92c06bf07712922403baf6429c64
-EBUILD DateTime-Format-W3CDTF-0.70.0.ebuild 556 BLAKE2B 536f3dd5a3b67258575ba775cfa70115f345eaef30e4ab5cb93d4e9133807a1338738a74b3c24bfa30314dcc9c79cbf4f2e6a14a5d12affe06678648f29efa29 SHA512 f90bd3c795c63cd89e0e96481c07d54d9427529dd2de5b4880cc193176284e72b5fb687f9df624e0a925446c32181a02055e804df49b5bc48320a9f917c17367
+EBUILD DateTime-Format-W3CDTF-0.70.0.ebuild 675 BLAKE2B 96b064ffb4a5610900a4ab94ccaf465bdbf800e93a7cb7cc81c6b502132d8328b5ba9b80a168a89fe979ca5f53e680da5fcb04c925d4acb3909d61ae709b513f SHA512 d06cd75dc84dc48342d5fbb7ab77685af2eb32ba841419307ce8bc133fa25316625867fd64a66e59943a156b8733507e0de54f1ad8f518da901900b8928ea649
 MISC metadata.xml 417 BLAKE2B 44fa86f9572cfad422ee8f6d33ad91f7930bb405c82bde1c161ff79908c847f8efd908c3c6740033aa11e36fcf552e87c42c7ea7e38750cece3d78d0b8be0e37 SHA512 d7429b4f2d1186d350035ed5a6d7c0f1da3e6ed460cd63e62dfc138744f777e412759e0b8bd7ebdfe851eb207649397d562dc01b92282b29efc8a2d4bdd1b024
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild
index f75fd495a720..7f7ae4fdb4fd 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
 
 LICENSE="|| ( Artistic GPL-2+ ) unicode"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.50.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.50.0.ebuild
index fd41728f029b..07efc9146927 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.50.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
 
 LICENSE="|| ( Artistic GPL-2+ ) unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime-Locale/Manifest b/dev-perl/DateTime-Locale/Manifest
index 534c6a16e5d3..22a6f4fab8b3 100644
--- a/dev-perl/DateTime-Locale/Manifest
+++ b/dev-perl/DateTime-Locale/Manifest
@@ -4,8 +4,8 @@ DIST DateTime-Locale-1.03.tar.gz 959190 BLAKE2B 025075d0606c83afacc0b21309068b23
 DIST DateTime-Locale-1.05.tar.gz 959564 BLAKE2B 14ce7e84922d3897829c464e6fff864088a6570afeb2a104802d55468845f8bcd3650b7267216a7c2c6e5337ee2b993175341dd5c8fc5589600b0671a9e220eb SHA512 8e5484e20ccd6f21343dd8eed708f4ec70a0a11f86b83d4a304ebc01b6f8a613d8b08b3a51cf520eeac7730720a996ef36b5e93e771f5fd03f92e283e4ff1f94
 DIST DateTime-Locale-1.16.tar.gz 1228443 BLAKE2B 43b9bc0439d269dd29856538c87ff866337dc989b85d7e677e62ececf93a194b65cfb99eae07c17a97e8d7c2c917cf533e751856e09c1d63684c70de99aac4a9 SHA512 66b09f2f2d9cbb9ed969c6e881dd68a48957d69d5d4cd8a998b7a79538050807d862813eae677ef28ec2ce645c8fc15b9b5de2b15ed077e936d63a44e072a145
 EBUILD DateTime-Locale-0.460.0.ebuild 750 BLAKE2B 9505b69f0f6d716b01de9dcc112f3bcc49db495c1f82d467424e40061e2b3b5f3927e3ae825e70f9a08ac327dae0b25128f9448bf00eb34b4aa5cf5754e2019c SHA512 8a395ce6047e91900b003a71df53c8f3e968ad59ea462eab23a1c7d0b9473e303ae648d95428c3d97a9298d703acd88bb4a89ee0ee9b20bf4ac6d7801d7e7cfb
-EBUILD DateTime-Locale-1.160.0.ebuild 1102 BLAKE2B fa69e8bdbeefe0c137393b626736803f13d78a0cd7685502b25736cb7b1138aa3456a2b5b94532cffc1e358dc9ea44c7abb1c5856770cc4eb47c74a4aeac67e1 SHA512 aebdc9acea9c395183e109737ac85a271481290d96eb0d8d3aa2aaa5e6ed3ee83e2d7bf98c834453ae73a48625c571c580484d3063b2828c3bff98342fb35c98
+EBUILD DateTime-Locale-1.160.0.ebuild 1162 BLAKE2B 07769d414624fdfec16974de35bb86e4d67a742b50ad4d5bd30ea79d7dce3f6ba3c2d7a21f2bb53d57267d61fafad7b3c62f9e86222061058b2b71b83bfa7ad3 SHA512 a588da6b11572f75c3b9d248cab98681c8770d3085ccde94a4acfbb60ba612dc35e3ed753311f512961c9542e106349f8d6592435fe8fee2f448b1cb0665c00b
 EBUILD DateTime-Locale-1.20.0.ebuild 827 BLAKE2B f4aa41f7d581b7a7666807d7983521b318705335b623821d8d87a87dabfae3fb2ac55da2c8ac0f947604e0df537d6c2956c18a3b69e07fc52c7918e8c9965ea0 SHA512 827d35957b661b26ca6ec5d65c2cf3b00f3554c1e1aa264095775b8ac3d5c9d5301bfee3dc6f926cdebf8254baf6b2577e4e154c68fcd8acd13db65289e23f8b
 EBUILD DateTime-Locale-1.30.0.ebuild 842 BLAKE2B 202b22f94833330bb07115eea2c6259eeda491a86a27e3182c0d2ced2149f969e4a67c47422a0d25387fe95e18aa59c06b9b59d333a03d9c758f576d4d09c296 SHA512 0200afaaec2ac67b8ee290886a2586e59735e773043b3521fe913a08792dfd360feb42509a914ea1841c3e16ce1437e6b6879b04b93870d0a1695072ce1c69bd
-EBUILD DateTime-Locale-1.50.0.ebuild 867 BLAKE2B 2efbd20f5d48ef3dd9e0921ffebfa1a638df903ac65f5bba7fd9c1fbcb88520eeb6b92735b1a9a292080b7329839543a46e4fb8cb867e276bc67aa7c024daca9 SHA512 55be9caf6180a147e27475b2f9fd1bfc92faf55cb94c4475955bad66d9a0d91cdeb019771cc52557213afb4ed4284d2e2e1d318f0080cc74f2951764188044eb
+EBUILD DateTime-Locale-1.50.0.ebuild 920 BLAKE2B b20ce9dd24b32871df879cc274304bef7e3974256abee443eda5ec7dbddc99e4a497694e15442c539a04e9b28dcd927cba72bc6e8e803de64c2a5dceada0d85d SHA512 f4515f2e73110f5e41b74a15fc80fa7a1ee1eeb1a527c72d79b23ceb967a0fa6875eb00593e481ec8de561ec29aec47744fc541a028af3a455e4be33a6c1e3ee
 MISC metadata.xml 825 BLAKE2B e89d502ee3fe1ba2ff7e95050a8cc9d91960a013d91f49bd7cad3f611fd675ed646a71f44da3875f1396d786b0fceb533f35ea9df5c80b64b2c1a3eb236586de SHA512 75e572955930e34ee22c2ec03d03659883d12f64d3c1b2e55112f42bef46cf8ddaacbb92293a3e1a4fe3989bd962c682fb76fa021c8f88f95a1f921a5f8d3de6
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild
index 8c44e987d9e7..67f373397d9c 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Time zone object base class and factory"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime-TimeZone/Manifest b/dev-perl/DateTime-TimeZone/Manifest
index 077d033f7ef0..cdaba742e4bf 100644
--- a/dev-perl/DateTime-TimeZone/Manifest
+++ b/dev-perl/DateTime-TimeZone/Manifest
@@ -7,5 +7,5 @@ EBUILD DateTime-TimeZone-1.930.0.ebuild 901 BLAKE2B d3d5804bfe298661d00300178078
 EBUILD DateTime-TimeZone-1.940.0.ebuild 868 BLAKE2B 6a413c3af9bad6ed33d22c5d8211367e906f1de9ebb805572d48f5e13fbbe2974431e28c245f559e6aae6d7729975fb1fde32a36a6ac26ca94cdcc032917eb34 SHA512 095d3a8147841b8e9e5abf595b02f36d40b26da5956335156c5fcc1c2c3b651d621b23e227cd7e4c91e2dc13abce8197e27f4a88da1b1f726f2fd1af2d6271ab
 EBUILD DateTime-TimeZone-2.10.0.ebuild 860 BLAKE2B f2ef8fccb6ae9cdd0a92f5f6be837c249cb1dc6bf78d2915ba97db148fb43f6ba9ffb95566c949b97fb7f30d7e200ca6e60f665c866521d0801d51efa7645ef1 SHA512 153bb7a785fd6c7aa52b87b569d6a836f04623bcd62a5d55bfe5ede5de6a105ac25d67a5f5132e423a95d7dae5d315f186a931a69ccadc54368e303daca7d1be
 EBUILD DateTime-TimeZone-2.110.0.ebuild 859 BLAKE2B 24388a278285d331b9669846d710b3a46bc11f5fdfaf80b9987df351b9108bc27d7028bf18f17806b486710e8a472ef707351f465ef3aa0fdec776fae64dc5bd SHA512 37731a454f4b10897effa43f4b5429f5985e7540c8f8e639f8d95c094b4c783dd8d7ca8c9b467d4a74a1bc0b2e31e7d09d52f7fafd6a98fb1911c46d66db7fb7
-EBUILD DateTime-TimeZone-2.130.0.ebuild 914 BLAKE2B 537f005edf9f802bfc270fb94b0b24a5e8a6e150c6519708d4b0baa450d5daf26338c794f7cd5828e581c41d3c142d52c7f69509fd26184ec7494b333b034a00 SHA512 6cf269dbd317828e9337af116130e9206788aabc5ffc58080b7edf7be53b86524c9a8dccfe4d32597f8d6f9ca8c8603130c393940b554809bdc24ac836449523
+EBUILD DateTime-TimeZone-2.130.0.ebuild 974 BLAKE2B 7c0d2b6255f4896b939c2c7f931b4c50810cc768a8873fd7201862b8a40c70ec5cd6feb9fa3fce922aeef6277d24c6351b25b865ce09132da18f2587ee445cff SHA512 9dcd95c1ab0e36d09c00fdafc8813ed300cfbf6d8aba8161af9e489a26d66f61bb517742e438beba78120050121281005ecb3330844e6ee0da244bfc53a0a8fc
 MISC metadata.xml 31072 BLAKE2B 180ff25ce0dbe3c72b21e789d1d2bfcda87a283cb955bf94e49ae1df99e1ab1c045fea5b23e7d351a9936130d39e9e2985805049f9053242f663e01bfe3dcdc5 SHA512 48a013c39c41bedd29a9a151a48afc237b59d491ae8542dc6881b918191b80e08a034a127c82108cf6e474509ff9ae28e797ec31285ce96f7dafa71aa9de7440
diff --git a/dev-perl/DateTime/DateTime-1.440.0.ebuild b/dev-perl/DateTime/DateTime-1.440.0.ebuild
index 3edd663eb880..4da5222d92b7 100644
--- a/dev-perl/DateTime/DateTime-1.440.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.440.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="A date and time object"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 CONFLICTS="
diff --git a/dev-perl/DateTime/Manifest b/dev-perl/DateTime/Manifest
index 9d39ea623946..ff2f033ce851 100644
--- a/dev-perl/DateTime/Manifest
+++ b/dev-perl/DateTime/Manifest
@@ -9,5 +9,5 @@ EBUILD DateTime-1.210.0.ebuild 889 BLAKE2B 46389733076ebc01959e7320be5bc3e1b9b45
 EBUILD DateTime-1.280.0.ebuild 847 BLAKE2B 32dee29b4f9ac2fc890f22e980e55cc0fd1ee1b05baeff9361d82ae558c41afe2ca18005e2ee7644ce2e69de781cad84a075f761b260dd2eb320174970cbcb09 SHA512 07dfdf87b8ba4db41c96d2a87a73399dc0b68725dd1639fa5108ca1a0f5da05e530156b10f7cb2c6d3e9ce41835c4ccd7b04bcb5a34aad9f9fe48ac94dab6206
 EBUILD DateTime-1.360.0.ebuild 1086 BLAKE2B 05e2867c4bd33a59fd4fb39e0885e31b4fca702e7a7c9bb9d613264eebc6ee931d94deece16375175796bba9435793e1ede4842c5536e895b3255a28ae7ba4fe SHA512 f6f0dde0c51244130ee502c80293938de683b65bab5a67b5523c02b2f2db8034653879312b66164e78b4370270446c11399c55a151ba689aaa0d770effaf71ac
 EBUILD DateTime-1.420.0.ebuild 1059 BLAKE2B 8a1e07169d6e3779724ac1f507f1deed54253109491ff6f5cac31478d03d3718da102788bd82000d19be200bffe42adbb2fd48c5bc6986f6068deb3dabd526ba SHA512 ded25038aaae410153e7c82ce513c7913255bbc40a89a16bc871bc64008ad6875d93b2bd31892614ac6fb1427a246bb294d0a2a6e7e91f10b6b669fc920d3bf9
-EBUILD DateTime-1.440.0.ebuild 1108 BLAKE2B f328168f59da1f9a58ed09ccf3007a5155aa8b3ff99e194ae1f9d45a6aeb356174f1db0a83dcce1c65c0fa15544542445fe39f7761a319a584889f1ea7d8a499 SHA512 2b59c0e0d91ffd3d9bb5744e0220e5163c90ac2aa81ae516c9af36e0f3e164772416858f4ed6cd187e43865e29d37b73191b964a54134e87a41d6e1cce48d3e9
+EBUILD DateTime-1.440.0.ebuild 1168 BLAKE2B 5c3de67c038184f957d1b67fe432a6c6cbd2e0165662319ba89b7e2e8e95a4a43f2de0226b48781b0155c4a52681c2b4e42d2026b22ff5170ca69da56bc19d68 SHA512 edb129ff64cbad17e979fc1257c1223adfb8a2a1ef13f009617dcbaefbbf5a1b36edfe5edc8093839d873a6497e9971519b122d9ba3499e50b26fed921d09042
 MISC metadata.xml 977 BLAKE2B c3034e3b60e1d4071537ea4af9734c061b1985440c00386cd12019af29cc47244c7d18db586d18c1c31041469ad7c3345b3619ff0422df086f75442cb91e3fb5 SHA512 03afecbf9a306c2ccde1c7cf682733d27f6eef0266d703cf51bc2fb946e5cc287bb24cffacb43dd1f3ecb2eacd40bf8182b4db7b0ffba3f64b3efb9fee04e58e
diff --git a/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild b/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild
index 092ba671b4de..f1ed45db4c92 100644
--- a/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild
+++ b/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Custom OP checking attached to subroutines"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Devel-CallChecker/Manifest b/dev-perl/Devel-CallChecker/Manifest
index 385ebebf06a3..c5417d67b8f2 100644
--- a/dev-perl/Devel-CallChecker/Manifest
+++ b/dev-perl/Devel-CallChecker/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-CallChecker-0.008.tar.gz 18940 BLAKE2B 0e856b625aa26bb877a88de70adb0d6a50516d723268b58e5c0b109e970281cdf3980371fdb88dad079b2b20a6955f4bfdd3eefcde855cc6d925b16973b568a5 SHA512 7ae7ee932e7e6a44d57178c84537cff8a9c350fbbf36c21dbc5ce56a5fe1d4ca748e0d5dd75abf5ebfa5e1223af4285b9b25074c0d1baa97eccfc6dddb62cfab
-EBUILD Devel-CallChecker-0.8.0.ebuild 619 BLAKE2B e7c8db9650edc27ee8d4014bc0402b3ae6c36487bb02544c76045f9adce6b9bf44b21e48f70edd1cdc006a56c3f3d1d4714f761f49212533abc91c8341ee0084 SHA512 854136e6be8e82baa9a6f1d73cb43ce020dbadd8cced8ef8d70d3951f65a7e77d92e9eaa13c23f5edc85320b39009dd4de3f04040ea20eafc72e2611dac8de1d
+EBUILD Devel-CallChecker-0.8.0.ebuild 758 BLAKE2B d18a359a63f6db963aa7e2102883bb7ec79787f536b2135fbf954e70ec70d8fb3b5fa93b3ee127ab5d417cff7b9f43106f9050a7ceaf93997d7df289136f1e0c SHA512 c78c646414dddc4e3d9298a5fef2ff2762f4b133a74d502145cd98d09b4ae94a792ce1e08e22facf5f85c22cd0ac8c53c526fa23385dcbdbf5e9eef8c46e8235
 MISC metadata.xml 406 BLAKE2B 8a45bb4f397cc4545e7f15b29a03413b03a892dcbfb01f5a3b0562a3137f7afbcd24565cd750d143546c783877525c625eb655916e0d9dac833122511b6d627d SHA512 0537509475830d775c3db25f36fc6f02f3afff38f3e72cad6c83c91db159a1ba951264813216aeb3b1fd4a9ddfaa90080100ad2bf9ac8aa48eb20c855df75987
diff --git a/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild b/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
index 6fb9fd712c34..e01419c88262 100644
--- a/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
+++ b/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Meatier versions of caller"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-perl/PadWalker"
diff --git a/dev-perl/Devel-Caller/Manifest b/dev-perl/Devel-Caller/Manifest
index 7b7c0d23707c..027db074ccc2 100644
--- a/dev-perl/Devel-Caller/Manifest
+++ b/dev-perl/Devel-Caller/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-Caller-2.06.tar.gz 6540 BLAKE2B 0463dac6e4b1a1dfadf4659b7d8e19eaa1b1660fd3f3d5e2f3fd7ee649123c8097f5392a2d150557c3f6927c04fd2ac7c574c1a141120fe00252e0be0639c8f7 SHA512 f15a59169e191c8526f613d21c415e5d8d51b59eabf309952468fdee15277b2e8f831a2263a9dc006d9f3144a234fbc9c46ad3ab464b6fc055360c6445b209f9
-EBUILD Devel-Caller-2.60.0.ebuild 389 BLAKE2B c846f2385f5664a0def95fc7820640382b077ffbd8551e6f6bca91194b4017b9265ccc5211d040e96d76252f311f096a4c4446239a10b7175954a8250aa66fd4 SHA512 fd84c06b64132b7e5e18ddeed9345abc1a4ae33827a9c88b5eb6d8d5002bae45b218b9f8c3f5fa13b3f5e8fd510f203ff7a0241dfa31ebbbf46bf2c94e7af439
+EBUILD Devel-Caller-2.60.0.ebuild 521 BLAKE2B 07c02231aca46a0ae69215ad488f1b1ff082a6fefff1cbf837be2a0e2826e216594ae504d8c3718b8f03ef7f3d5bcd7483494f8f5b92d1488009914c658d736c SHA512 3cbc34467c77498620b6e3f651e44f1ecbfa895927145206459823a3b3887e3f9be2e03f1e4e8fb40bad8b6c559fec72318e9ed490383869fc7bfdcff80cf4d7
 MISC metadata.xml 445 BLAKE2B dffce4885538817a9fabd44cd75bb6e774ed936ca1bfd044582f4d4c2e2bbd4b394b36a98b7357197314a57f0fdc451c38cb444f1aed9bbe709087665fa58e7d SHA512 a421f4dd19784c8aaa46ae271e51776ed24097b4797d444f9258d3896b568c61e7c0e91a940d0983370fd9c71faf3e0982ee9c341a1a97399015db9df26d26de
diff --git a/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild b/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
index 1cc1366e9e09..e192dac8116a 100644
--- a/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
+++ b/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="check that a command is available"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Devel-CheckBin/Manifest b/dev-perl/Devel-CheckBin/Manifest
index 2d3473d3016d..923f88211402 100644
--- a/dev-perl/Devel-CheckBin/Manifest
+++ b/dev-perl/Devel-CheckBin/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-CheckBin-0.04.tar.gz 9866 BLAKE2B 3af73c4617ce61c5aefbbfe0c50f615db5052c6a52a1eea095105360e10e257b1a159f7a5a2fdf0f44ef8a4e4d2df1656e99a5a5cfac41fd10a03c8e2b20b62d SHA512 7b28092fa2e6309ddc09976dcfadabbad9be678352c5b97a7938bf7e73944454e5c3c198aaf1a39939f24544e436ec4323925e77fa91e8d92e3986702c840f44
-EBUILD Devel-CheckBin-0.40.0.ebuild 704 BLAKE2B 326ec78ae05394b55fecec204701fcfaed0ecac8ce23b5c2d11c832a35a71618e584620431ac0513389028fafc2183a75982fa5b01be4c5d2cc4c0ef3d0adb19 SHA512 d8cb8cd9bbe4eb1e0f554e9ec6022d8ba308d2f5b13c0dc202a6e41faaab53e45d5c1cc5adaadedc5f1ab7f6770f806a2de07861b022f3a792b10b79b2747750
+EBUILD Devel-CheckBin-0.40.0.ebuild 712 BLAKE2B cb2dea18b709b67c6c9adb80b9d879f73cf4f23b7f8278f9cc5b65c3042818a88bbc36099fbb0582d0dadb9e21ce89eec092dfd25654595baf20f97a5bf22ec5 SHA512 f5f98c0ca009e0dfeb82f2449ee3b6115c6625981c92a5d0378b79e102bf18f07f5d0fbda82e1f30f1e4f70925f8e47c5795d850b3898973fc5f84a0b6a1d4ec
 MISC metadata.xml 400 BLAKE2B b85d354f848a85c94081164652dfdc5e05e01bdaa3121d3e6c97078aec870c73d76c16fa55036b33eb22115c80d36357d8035def85a66ba196585f2e46a8f864 SHA512 c26c65732866752bb7864d94223d837b8c9c21a4a2c0f96071971c9eeaa0768f2ee393194da3ef14e74dc6e37a990bb81159126bc77fb5e51fe90ff69b4695d8
diff --git a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild
index 1c18cbfb4d26..2ea94d0abae4 100644
--- a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild
+++ b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Find memory cycles in objects"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Devel-Cycle/Manifest b/dev-perl/Devel-Cycle/Manifest
index f7123d405c13..7c8128a12d09 100644
--- a/dev-perl/Devel-Cycle/Manifest
+++ b/dev-perl/Devel-Cycle/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-Cycle-1.12.tar.gz 7276 BLAKE2B 618e5474cdfcd524da340717e0522880ee7e3e6c3e59438188b7eef836c804b9874084a60e31d14104d36d07df26d9ccea733fb8ab99dd19f6d6d8b4e624fa8b SHA512 e2c83829905449d13c86233ad5bfce28e7b4eca61a8ac1e2f73e3c906a2d8580f66ae84d865ef876c38c2d25f0a5a8adeb05f6e94594274d8a5fa1739842d08d
-EBUILD Devel-Cycle-1.120.0.ebuild 477 BLAKE2B 8f094bd5080d8bd200ad7290a2f35984be9f683b024f0e0f7ac972d30528a30d17c44bf44067d5838cfaecaf730132e0f6bbb575a9730b3560f36818c7f9a267 SHA512 e8c8b2bfeecc827527f1b73f557772b7c7d36a62c559797676ef2f96a7b451e827129b14d09c63e455ebcad4f329b62b954bc457ce3595046ca149ac6440ae70
+EBUILD Devel-Cycle-1.120.0.ebuild 563 BLAKE2B 9f75273d67ef802a2063bc5e44deb7a4c565e19172d5a614c34f59b0483dbe65ed40b249093399d47663eee77638a2cce75c8576c0e3e9038f311ee5f792ac09 SHA512 2c1b04c7f647f4885dbe61d9d6e534f39e9e04c327b47b7d3c585ba9ce043def234f63ed01ea1b1be7411268885cf6ea2584269575f807fece304dbacfc7cc82
 MISC metadata.xml 394 BLAKE2B 0d2853bee89864942ae6b94f7779bfd4b5fba5dc1fd6780381c3c00a8b4b2a3ecc631e55add51dde9fd7c54571ef8f7a6e4a52f149cd4cfe2024738ba15b1cac SHA512 bb98439368d68502fe828326ec272c8b17537a40fc15ca8cacc190f471925e77bebb9d1276a832f295d783f821cfe744533f91d731e84ebd918c2b957f173737
diff --git a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0.ebuild b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0.ebuild
index 7c19aaf36d6a..c29ffe320ec1 100644
--- a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0.ebuild
+++ b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION='Returns the equivalent of ${^GLOBAL_PHASE} eq DESTRUCT for older perls'
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Devel-GlobalDestruction/Manifest b/dev-perl/Devel-GlobalDestruction/Manifest
index d6ee8f826341..b5bce96386c8 100644
--- a/dev-perl/Devel-GlobalDestruction/Manifest
+++ b/dev-perl/Devel-GlobalDestruction/Manifest
@@ -2,5 +2,5 @@ DIST Devel-GlobalDestruction-0.12.tar.gz 7803 BLAKE2B f8717c72ae9ec5e1bf43ca0290
 DIST Devel-GlobalDestruction-0.14.tar.gz 10041 BLAKE2B e803218cba1e95f459934907d27983c42e5657e95d75877482c6a9b5a654e5df563f32fba68de745f92d99772b6387e026af847c421a0b991970277bf51c71e7 SHA512 75c346feae98897fb202dea0295f0225bf3cac59f21915da5dd1cdcf845052f4f8bcd0362d357020fb0facb6358175112b3685860ca1c1f173421c7c6a54f45d
 EBUILD Devel-GlobalDestruction-0.120.0.ebuild 496 BLAKE2B f5e59f4becca78202e81e4e492e016fc542b15528e5ca8e0fde63c2fc1054756d60a1a5e798dc3274ee25e709966a8152d998904dfc96db5f533d3a5e268a74f SHA512 93f5b4ae0714cbea8238978815044569a6d276156f9601e471a84a1d26eea2207678343f3230265e86b38ecf037fbdd103099fcf8e1e76713fe13737f4770c5a
 EBUILD Devel-GlobalDestruction-0.130.0.ebuild 533 BLAKE2B 424bc3f448f0d33332721591278551e2e26d04eb69076ea3720f3e3ef3dfc9a0e09770fb3a4026d397896564f04b6d9f40637380f1bbe196c60729afc29c495e SHA512 7853b7cb326f9971ceefcce9bb2104cfc8e5c4c87ca5223dd844c1bd57b4aae04eece8621991ac598479a3267780e767e03623f71d3dbdac0d378c8d71c55d7a
-EBUILD Devel-GlobalDestruction-0.140.0.ebuild 478 BLAKE2B 64edfb51b5286ac6fb53137665e555a01c10b3b8efe0813b20d0397014a9a1e4e1cc9cb90badf7c7c808592ec478e05c2002cadbc28d300ff2bfabeccc3cc274 SHA512 b2bf292128a5e9926cc6d925c7b89dc62199d7a2d93a441c443e88ce5aa8661e647d33d7c70d0e63cf8524161118add05b8306dd159d2b2097c7e97843399f67
+EBUILD Devel-GlobalDestruction-0.140.0.ebuild 588 BLAKE2B 7b02bfb1c0143ddbb747c17890ab8eb944129bb6409a2aa7f95767f999416cb41a0b35419ea756aae689b4193b2afe0b89ef3075df7ab79fc73a5671af85c51b SHA512 ad94c36fa97ddeaabbbd15a52c0d679faa5dc60cc053d4eadad58a6e1ae3278159785ef62341b2f457eecc0151d5e6fd989e480fb5e36ed1cad1fbebf98cd925
 MISC metadata.xml 418 BLAKE2B f6315acc1b910e37a36caad9afada9f26720df36494c969847c077886baa0025b0ffb2b460c6aa0bbefa917137361c25372b64c5ac3f3f60c53760cff78de0ff SHA512 7e34dd76902412d23ea5f6c7f13334a09f723c35d3997e4cc079f1e52257d0ebaac2303d839cbcf270511282f41957394c11cb507bd891db081c982ab24783cb
diff --git a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
index 7b27540b90b3..42a3012c9384 100644
--- a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
+++ b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Alias lexical variables"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-perl/Devel-Caller-2.03"
diff --git a/dev-perl/Devel-LexAlias/Manifest b/dev-perl/Devel-LexAlias/Manifest
index 31a935569f60..c1251133617c 100644
--- a/dev-perl/Devel-LexAlias/Manifest
+++ b/dev-perl/Devel-LexAlias/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-LexAlias-0.05.tar.gz 3123 BLAKE2B f6317f5b7d3a9c5460be2455cfdf55ef76c7874056b193d7c6a30a366a4d9cf9770fef7d0e7b894a61264234a352293b9af387e78890bbc23c579adfb7e50aff SHA512 31f4e12d6d756790fba457f2a927d8dbf4c873033b1c83becc5c3668451041cb3ccea8c132529d35b2fd553dd34da34202ab97d25dc1c564024c68f9dd7a7367
-EBUILD Devel-LexAlias-0.50.0.ebuild 398 BLAKE2B d1634809dae544cbec882d45e8b12c60984ec3a1dcc702a8956b33222603fab0e7d748754f6a51e4c3a45d4fd85ca26c8ccfc5cbf3ff378df976f622cf4e1669 SHA512 6d43b6ecd4f15c9923005e6f9558ba7f9ac18d8156ce7da105082bbde93499e7b3e81add68aed99ee5441f9ec61180a9ec0862c6d0cbcc6dd0ddc3d6cdbed635
+EBUILD Devel-LexAlias-0.50.0.ebuild 530 BLAKE2B 859137dc2a8132c826a8f280396be29b33d7c14896f5933c408f3ad7eadc7dbe3bd8ad5aadf35c0fde2810284e68f4c7ee68713e292b52ca45f50ffc13c57c9d SHA512 5f0cd47554ae2638d11eafcf063a27565e9861372e5d62a2d0095ea8f8e789d2a5a46a960263d6e4d86dbd66566929742b8142d7694e634a1c495efd6795f4fe
 MISC metadata.xml 400 BLAKE2B 15d8858a8ecc88e7113bcee7ab9c20c5629b491fa0697daa045fa8fa8b0c2f595ea9466de8f3ce90ea95ea194ccb78c19e0957bf58b46b49d1e17a94203c2380 SHA512 409a0ead21f8b8bc464f71e74d3744d3be53e85a221c156a8bb64e749de8da70ba20e3d77ea7b5923fdc6fb8561215d364d3fcdf0824b2a8fb45e316ef286034
diff --git a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.4.0.ebuild b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.4.0.ebuild
index 13a79fecda37..033776f940a1 100644
--- a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.4.0.ebuild
+++ b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Introspect overloaded operators"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # Scalar::Util -> Scalar-List-Utils
diff --git a/dev-perl/Devel-OverloadInfo/Manifest b/dev-perl/Devel-OverloadInfo/Manifest
index b94c5c2e6adc..14d397566ab5 100644
--- a/dev-perl/Devel-OverloadInfo/Manifest
+++ b/dev-perl/Devel-OverloadInfo/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-OverloadInfo-0.004.tar.gz 12013 BLAKE2B da02c86620026beb903041f10496a1e1e5b6fd75ababfff2b03d8449f05717aad63cbde687037dd514de5fb10d11a8a3d191e9394f69bd530619d97260301988 SHA512 a8770f3319c8224d348fd28b1a057333e87d73b914c892d3c3581673db6fef8b5728a02a485eefc90edbc05899150cd8e172f464f0a4a29e8161815f6de8dcb1
-EBUILD Devel-OverloadInfo-0.4.0.ebuild 630 BLAKE2B 3f93eceba09429b491caf9c8d07f269a035caaface3d0e0df552a69ee177dc7dff285868497c9beeca1648ec5fca6a2b0c86ae81b38e00414973e8adbe6af54b SHA512 9d8bb4a9322256fd00db2cad30bef32617ec7b4585ad36dd6b1af1024f446a0f5cb20309b141a2406b86ee092fe530aaf30545be593ca663b5bde0ae39c849f4
+EBUILD Devel-OverloadInfo-0.4.0.ebuild 762 BLAKE2B 0ca3d790d5ee840b0fc2bded1121e2f66e545730049995eafdc5494241262b9495abe02174e55be158840010429cfbe16438db06c91bba1dbb740c6b43f0ebb8 SHA512 8a112cdf29dc53cdede4d326fde3564c96daaec9d7169b0723384feb4027bf438267d4591c0229e71e55e1502b5856d1920b2adaa4c9f6fa03960cba4b8b2b65
 MISC metadata.xml 408 BLAKE2B 6b167314e2c4dab81885a42c49b68eb1e781f8c45d7c945fdb08257ee37ae5e8535447bf076da1f8c980ae1f50227a909e3d56c1923435c56e92fb1229da34ce SHA512 e562e8c4bb0e9d7bc286d2c65ae2a485ca13ffed205240ed396a3bd612a95ce922521ac64ee9c8e4da0352d434766103218e3225c58b461dd8c4c161f572edfe
diff --git a/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild
index 5b4fd4340e42..335c3e7badd0 100644
--- a/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild
+++ b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="An object representing a stack trace"
 
 LICENSE="Artistic-2"
 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"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Devel-StackTrace/Manifest b/dev-perl/Devel-StackTrace/Manifest
index 160b7fc648dc..22d800c57796 100644
--- a/dev-perl/Devel-StackTrace/Manifest
+++ b/dev-perl/Devel-StackTrace/Manifest
@@ -3,5 +3,5 @@ DIST Devel-StackTrace-2.01.tar.gz 33728 BLAKE2B c640caa8376010e66e8178fcf2368027
 DIST Devel-StackTrace-2.02.tar.gz 38221 BLAKE2B f01a34ba22bb1e36ab37ea1e33742f3fdbe14764192677e7c8c0bae1891b1d525d65f532ac66115762675b784fcd5dae2dc7d530e630d92d165678e6bddd1738 SHA512 1744597ea86e0631a2f0b730f0448af21639f2360a95baecd47542bcd9be96163904ec438a34f70e794695046bac9751ece0e4705af95e717a5143295fce31db
 EBUILD Devel-StackTrace-2.0.0.ebuild 592 BLAKE2B cd56ab84910d1027bb387641684adb7a29ba26564adae5d3910195324f8307daccfaeefc1de7efcb4af771af22212c2f89c628fa2d78421257fd68d91c4fee35 SHA512 ee8f8d5d6a7434fa3a468ac674520f31089b920b4149033169eb23bf9d106761f68a8f814427285df3e76d6c7a0b91f47bd3a135dabee40c4aec00aa87b32e4c
 EBUILD Devel-StackTrace-2.10.0.ebuild 646 BLAKE2B 4382baf282fd8cb363a7107be2dbdbf916a3ccfdf70dff61eca36a5b954e20affb629f799b3af05a52d7a98795c0a539414f3cc5aa1aa63be775c6c7d5a6d615 SHA512 06851bf3e5cad3f1ea7efa853553a3a08a615373f81e3d3ae33b9ac96ebbd9f877a3d7e266a24e44ec9aac20f90fd9e288e0133e24ee5e4bd32b367b0b9a857f
-EBUILD Devel-StackTrace-2.20.0.ebuild 650 BLAKE2B 268fb52b5282d7e70074668b7f46d607f2c076433b55cd8dee4457f469c952f4d48e7a58f814adfd24d5030c4e9cbb0d96575a3b438da84e5516960231c82665 SHA512 1da1403147b3ff65c8c662115b3f014c3fb98dd58d08c56480627ff8d06788ffcba514cd6af1a2752fb18148b479685bd6000386cea1a4ea7136e422645e3116
+EBUILD Devel-StackTrace-2.20.0.ebuild 736 BLAKE2B 930c287a99d2211fa42b4699ca55bce5fb094967c5b3de37355c36110c10571033e18dc730095363eaec5f13e94a981d9b8dbf83d23776ae15e8dc5591f92da8 SHA512 0dcacd6574fbab84527b73a086d4da31a314cec90b35366fe79407388762305105db1d3ba75c6d163a8a92c6806a10b71d394bc857b65005298fc9c9e80fe8fa
 MISC metadata.xml 475 BLAKE2B 93821fedb70a9c7e43c2623c4066f19b35b50ee6d57dfe0eb54b6204921003bb7daf32e0b1ba00c4e4101b53d31c6286545601080f2f509c052f0e0dc1f5b258 SHA512 9100f9b2f46c30dcd594d6d05674deff141509fa89af6414e9ad0f928b5e589b2ae9dea9772874ab34f78c01db5067bb05e2a7aa4469216a241bbbadff4ca121
diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
index c497628b0032..b98ef0a536dd 100644
--- a/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
+++ b/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit versionator perl-module
 DESCRIPTION="Dump symbol names or the symbol table"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Devel-Symdump/Manifest b/dev-perl/Devel-Symdump/Manifest
index dca7b2e6b0fa..dd69ddc7d565 100644
--- a/dev-perl/Devel-Symdump/Manifest
+++ b/dev-perl/Devel-Symdump/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-Symdump-2.18.tar.gz 18439 BLAKE2B 98e7de99fdb8338cc9fbfb76f447d169a87309949a2fe38dc2f5acc16dc3ebe1a9b5bf84fbc9d32cdf6d7ebc26e7b1c6e129d492f27feaaa3f99a4831f20506f SHA512 4e8e1ee723e3e02d2f0c100dace40d7722f6366402cff24fb50c8616a863628bc2faa02210754132afa7cbebbd90c75ea6f173e15bbcfaa5158dfcfdfd03da73
-EBUILD Devel-Symdump-2.180.0.ebuild 618 BLAKE2B 4b6ae79fb2fe012b4b23ff4fe513d312e265056c02b8d7f98117f52d75ea0ea323b2b25b172b33ef5cc00c6803154b06bfdfb1afbe7f64e22f103f91a3e32e37 SHA512 6fdbf5145a3ac58c086fe72a2cb6cb6b4d53ab6136bbfd9ba12ac7d8c89adc57be1839dfd4dc2e5739d29682586da1706295629b9150d38c2a0d99089084079f
+EBUILD Devel-Symdump-2.180.0.ebuild 691 BLAKE2B b533db08057d9ec42ecf23f950ae745df0194d28bd8c58bd0769f39411fe705c062969669b2081b41e1f7dc73ed86abec907a331774a37730adbcc0c35c49eb1 SHA512 bb6e34a494f17ee2d2cd292aa66dceffc5c8a802b37f813f89fddacb598c9aac7f6c77b7902239788a6a2067c52f013dae6976d58fd58c7642a0c466fb67b58a
 MISC metadata.xml 467 BLAKE2B 20d8cfd167db062566af11f76fdb6767f2793dc72085831371cf24a67f803621cea18ccd5c444dbe131f518c4ff511fecff38aa29596d771b6db26da91456fc9 SHA512 f8d9f75a06b510c2a0f7dc33aaf0b234c52af4232928e4afd4509223919bcf863e2d1273a7e9a0b6e381ebf008920f0ca69287e5d4c867ad4928cf4030882f71
diff --git a/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r1.ebuild b/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r1.ebuild
index 8e6e5efc4fb1..b28201bdadac 100644
--- a/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r1.ebuild
+++ b/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Create bubble-babble fingerprints"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 PATCHES=( "${FILESDIR}/0.02-dot-in-inc.patch" ) # https://github.com/btrott/Digest-BubbleBabble/pull/1
 SRC_TEST="do parallel"
diff --git a/dev-perl/Digest-BubbleBabble/Manifest b/dev-perl/Digest-BubbleBabble/Manifest
index b879e047ac12..1e98270ecb59 100644
--- a/dev-perl/Digest-BubbleBabble/Manifest
+++ b/dev-perl/Digest-BubbleBabble/Manifest
@@ -1,4 +1,4 @@
 AUX 0.02-dot-in-inc.patch 1177 BLAKE2B 610cf3b0fd57dc6904c837fd10039a45f48f5a50bd3db5440ca6cfe854048d1b9910d6cacad21d02e7030485373e84bf3bdd01c732d8c64084971bf01dc21691 SHA512 2428b6e2edc373f0e629fb921adfa51efe202653480d150755991b0e96bce94778d0357d0846276b9c759c015d68c4c917d399caf1699b0f72389e5e351b9024
 DIST Digest-BubbleBabble-0.02.tar.gz 45661 BLAKE2B bfc081504022401deb99fd1e838907fe6f737a46d2206e48a480ac6f3790edc109b3e4aa34807ffa727fafe1e399e963bc1bd4ce5b2ae8f54b5980653cbda445 SHA512 7f5d7519184eed07e3b3ce302b7dd10980acf34af91f7ec8a317c2b7faf4a8a35dd4dadecf643c611456554ae7bfa82699afd80af195e801502047b243653ed5
-EBUILD Digest-BubbleBabble-0.20.0-r1.ebuild 433 BLAKE2B 25936ec36116ef611457122500da938dedf7df98a0ece9040c8fa770c50562fcc5df43792edd8f8c63c9f39149b2aaf27e92f4fe412fa0ecc11fbe48af3053d2 SHA512 e57e691850db9908cc159116c7b726615882b1abb964c50a898604537b44a1dd3632a3a3ec0b9695e9cd9888af9a9c8db3baa546f16ce2b75c20e1ab5c297b3f
+EBUILD Digest-BubbleBabble-0.20.0-r1.ebuild 570 BLAKE2B 8849b11e972110663d8a31be0082f8de962ab0535c18c5e0fec173a7d2616b299868b36081c4fe9dda27323be0a08fd538bfc8662f3e76b10952df9b845ad9f3 SHA512 1a12f089737554d75eb64a54c6e86b98fe36422f0e674085e88344dda33e7b49a842c110031151ec62b1af81b9c298db60cf558a456beddfe6765752702d59f9
 MISC metadata.xml 410 BLAKE2B e3879127357df103cfb973b0f77ef74656ad5dd91f90c4466500651dd86475355f35df7c8ea2c8fb09be994dfee01418594f9c67bad65cbb506904f964c2fa21 SHA512 b6a64b427ec1036e6359492607740d6739782f78cf05c1580b07da4df941908377a9bc19b122f1bd370d3231c2dd2fcbd36c917e93fd665fa8e5da6cf005a6d5
diff --git a/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r1.ebuild b/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r1.ebuild
index 1486cc65a5bb..dc1eda300093 100644
--- a/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r1.ebuild
+++ b/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl interface to the GOST R 34.11-94 digest algorithm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Digest-GOST/Manifest b/dev-perl/Digest-GOST/Manifest
index 82ae31f89996..b6b1851d95ff 100644
--- a/dev-perl/Digest-GOST/Manifest
+++ b/dev-perl/Digest-GOST/Manifest
@@ -1,4 +1,4 @@
 AUX Digest-GOST-0.60.0-bigendian-link.patch 1314 BLAKE2B 09ffd9e6303dd225cd052e4cfd6568ba1991b5db120db73e939d175e679b613c8e7ae22961b9a7c29348fe6dda97d9eb7e821f5b115564f86096a08fc39c925e SHA512 f3f755e4ae385f35b89c0fdd8934f6df4ecb83af0f8e35af84cd9a081e1d9edfbe5b41d257006bec93569e15601fd6bacd0a877738e04a48d425c2b2cb2427c4
 DIST Digest-GOST-0.06.tar.gz 39496 BLAKE2B b2495701373011fcdf9e0076dc51a2429f190252b772e5a9ee97d1d2286986eac50e5d6c4b5f5d03567f62bd7153264c56ef4f18ad33b655f11f38ccd181678a SHA512 7df9e5ce9cdc72da417207d197ae41e80ff4405d5fef1f6279a6043708b7688f4ca25c9d634b83a93be633b3ce7e672f6a697bfcc5ffa956379f9375f995e94e
-EBUILD Digest-GOST-0.60.0-r1.ebuild 558 BLAKE2B e241934c28741cbd9655868e132e2430c5057cae69258d6fd39f79c1c357f474c445bb8454ee4c0a3854df0cb66bc831ebb5af493c460cf67e7da604ea6ed7e9 SHA512 a26ad0a0411ca656be5ddd1d39f05931da928d3ed4e1099a6d6d6de8418aa4b3ed02a1da6ec39219ab9fdb407cf4dd63e52e9e930a6c88e874476bb7ceec2e27
+EBUILD Digest-GOST-0.60.0-r1.ebuild 560 BLAKE2B 4d657436678835b50f5a474146ff9114ee2871fd76175f84973ada4f59d47b5249ba5879e0b429bc3659c78c478dbb247c036fe4c2b7f5c0ba1d2d2dec75faa7 SHA512 2c442c9f2555f50f7764868726f5d3c56c3cdd65cc5640483a31a069ca2d113a0d1e1236ce41074f0fd223bdac671b73310ab32cfcb69c7e145e4bc47a8e1714
 MISC metadata.xml 464 BLAKE2B c3e9194f35f644fb250541f8faf34c3711d0a13bd1ed8854a94ce28b3e29a534253027fa8af57e780ab66232f0cca9c0760927b047481063e347f5f58b670dd3 SHA512 a2f394c73a87325c515b5d2420d85b300e6619d53962f0f68a9ffbbc4e610d281eac1a0d071a5917eadb7361ca9d0886db43f3c8efd3a6cdd9cc43f3c6e83eda
diff --git a/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild b/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
index b8d935f6aef7..1cf7a94febb7 100644
--- a/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
+++ b/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Declare version conflicts for your dist"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Dist-CheckConflicts/Manifest b/dev-perl/Dist-CheckConflicts/Manifest
index 1fa8a7486507..f5997de44f2c 100644
--- a/dev-perl/Dist-CheckConflicts/Manifest
+++ b/dev-perl/Dist-CheckConflicts/Manifest
@@ -1,3 +1,3 @@
 DIST Dist-CheckConflicts-0.11.tar.gz 19964 BLAKE2B 372e5d92912711fe87f4a772ed7d6a6613f59451241cb9eb74d277a11953aa8810033fcc639eff71e32afd04dc5b3ae573f7ce28354c9bf8e469994834f3d125 SHA512 6c3f8546c1c7904bbc2a3c1135d145cbff95997c3032e9129afc98bdd98578dd9219af444f357dd8e9b1f08442a2fdd9d6f7fe8768f8ef165e71570f5ae246ad
-EBUILD Dist-CheckConflicts-0.110.0.ebuild 684 BLAKE2B 5f24ef79e335af354ad7e82f8334a4b3bf3e6872320a3aabc69add2dad270b0c25cd9f460dd7f17c0955295cce24df23fc92deafc052c1c650791b1bb175ca43 SHA512 64ea35e5b515530a67d485a38ece9d078e31cd5cf932b3bdf28b1a43c57d85505885f850805165c65742842dd4e38c4e9ea390446880a9c816f7417eebf5d128
+EBUILD Dist-CheckConflicts-0.110.0.ebuild 737 BLAKE2B 0a3d6b4cfa7815b277fe4f69bb75dcc5a041f42fa430ac7dc537acb5cede31f738aa3af94b378933d13b868810008c2e09c7b9f4c0118e9ad0332784b204e962 SHA512 bfe0601483cdbee3656565aafe61765dd3cc8608fae20d91c930ee325f2a3db31a7e8fdb5a1bbd903701b7ca1c5ad55ed0894d175ce72fad0e2bc41aa7e28ebb
 MISC metadata.xml 410 BLAKE2B d9c593d3bfa19b0cc2221fb0d30936d857aad112bf0634b74efa4ddad89fba026cbbeaef9d5ecef756e81c41e908308c5f9cae6ed7e976c8603e6f23153e3ae5 SHA512 8a5c11c3c5d7da4e903194a7a3689554f02d24d194488639ab185d1e325949422923f5a8be344c9ff6d9797c299c24f8e7f69525e0ded541993114a6fa677f18
diff --git a/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild b/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild
index b96cf5966da8..5d3475cec55e 100644
--- a/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild
+++ b/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Information about a perl module distribution"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Dist-Metadata/Manifest b/dev-perl/Dist-Metadata/Manifest
index 706b19b6214a..2cea6ae9f7c7 100644
--- a/dev-perl/Dist-Metadata/Manifest
+++ b/dev-perl/Dist-Metadata/Manifest
@@ -1,3 +1,3 @@
 DIST Dist-Metadata-0.927.tar.gz 50860 BLAKE2B 92b8c1b5b4300284313949514aea0008e2a80e7f439aa0e451b99abbfbe1d3719ed353139e4bb95e01e596e1d244db993fc91188ffd1b8acba87c5cd2e3af173 SHA512 93fc74848e6591f1fca4e885c92982ae2265d555eacac9a4cc88ae3391230dd22deac50371bad068acbea831affe45bdca115c3c3eb2b4047963aa1c7c535728
-EBUILD Dist-Metadata-0.927.0.ebuild 999 BLAKE2B 032b4b8484138894d267cd7f663cf2812cc7f88975a573fa6f0a9a7f07c2c9c782933a7fed175387862ae06b3a64f064911fcff094feb60ca5dea7d6d9bbf59f SHA512 80d188683d09f6747cee0c74b5b8931b670b60b227878407ed7b10ccc9fd38d7e60301c2fd3e874604522d4b243f3dd4702930140eb27b20b1ce62dea490cdb3
+EBUILD Dist-Metadata-0.927.0.ebuild 1131 BLAKE2B f368080b55b2184c7766ce9fc19a57cd2dea89cb01a84509643b4c97c916c733b3b858a9d345c3e6e41b43cc91ad94e9095774fea84fdffd7ae64c5209299673 SHA512 f81fdc7d5180e727cde5a902535a9f004bcae63ef04ee5faff64fabb606457f21740e689c78557a4eb0f63cfb73f103bf2f24355ed5dba7d48b105219c11feb8
 MISC metadata.xml 802 BLAKE2B 53ad531298a44126fc5c9a10923e4fbfcd04c1ff6cf886a7012debc5194721122e1c3df4958be63c899ae50a66b4d197dd0186bc4ad6f204c900c2fb287e5f21 SHA512 f8bbf015d3888282fa7a8b27efa70e83492a8751232b1e8137c6fe0b039f6c7d9781984e89943bc6fbb555cc370e4fc9ecbff30a3aa9d1f06bb03f30646e559e
diff --git a/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild b/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
index 4dba1c623ae3..11ebabf2c17b 100644
--- a/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
+++ b/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Deconstructed Dynamic C Library Loading"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DynaLoader-Functions/Manifest b/dev-perl/DynaLoader-Functions/Manifest
index a4f943438ef2..4faa801a99b5 100644
--- a/dev-perl/DynaLoader-Functions/Manifest
+++ b/dev-perl/DynaLoader-Functions/Manifest
@@ -1,3 +1,3 @@
 DIST DynaLoader-Functions-0.003.tar.gz 9797 BLAKE2B 68e2a194d192adbd9a146a4fc1a06c04c9a7a9fc746573eb14faad2ff7ae16d7f7a71a08f329c29abd6a4dd39c318109455c36281ebcc645a3a05742c5f598bb SHA512 58147714352fbd6e90bb42599e5967c9a93dbb899a587ef8a2a64dd13fc9e24176e17b3c2b870b5fa846b077373ca9ea27bec49b31113a8d9cb7d800f6d29599
-EBUILD DynaLoader-Functions-0.3.0.ebuild 457 BLAKE2B d62c7ddf1f84f0136c007946ccbc7a02c15d039e59b60ce273fc44bef364f490b97f96978f62488417768e6a0676fb358942dcb96a6ec9472704f6ef44d74785 SHA512 e3848334c9f574f0bd03bbf5bf75d79de047eeb3f9465334f54afe89891b354573eab2a1b2efeafcdb3e892f5fbb400c54ef5ef6389a2edbf08bb5b3ea6755c5
+EBUILD DynaLoader-Functions-0.3.0.ebuild 596 BLAKE2B fe762a745549b384f350e5ad11e44e6d9a3186a643f4d1a53898505174013604403b4529b09602253bcc194a24cf799524a4107edc54b0e5ebfc8f44f2d37ec3 SHA512 74f569d7f4de46242474b6713526ce5cd25a0749f7985f22471358f7e94ded95d207e19a5c6475f5fd198e6bc02c128af3aec473045cd9f991b69c90a91d7fdb
 MISC metadata.xml 412 BLAKE2B 8474df2d8a151d3faf87bac779db59929532c6940509f098005e64cdc2afd526bb5d7ac4db02cea96c0e05024b4f3a3bdf80d2c7be552baa088bb2e2a27f5a96 SHA512 cb29e51586e4e26aa422c83314a537015b27129d880825bbcbc6da45075b4d87c6a65383f79a541b426269c94b9aef677ad595b78a9754d158d79e4b084d8536
diff --git a/dev-perl/Email-Address/Email-Address-1.908.0.ebuild b/dev-perl/Email-Address/Email-Address-1.908.0.ebuild
index 0babe2b649ad..ccbb426fa806 100644
--- a/dev-perl/Email-Address/Email-Address-1.908.0.ebuild
+++ b/dev-perl/Email-Address/Email-Address-1.908.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="RFC 2822 Address Parsing and Creation"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Email-Address/Manifest b/dev-perl/Email-Address/Manifest
index 2d99fb054668..ff46b2ba9e81 100644
--- a/dev-perl/Email-Address/Manifest
+++ b/dev-perl/Email-Address/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Address-1.908.tar.gz 41925 BLAKE2B 2472c9fc56565c24f25cfeea90b56f2fa0e9749944bcb3e878563950daa4dd2c8d22c43289751239356f57ea5ceabe3c46d9df4c8494d51ae9dfccaeefe7a18e SHA512 041744a43648ca53f3b78b387b8f170c000a2d67cf22f2740609a80feace70bc5d29389f22d96a7b7700efdd6a39c90eae494f17c7dc9e909f421df5ecb473ed
-EBUILD Email-Address-1.908.0.ebuild 537 BLAKE2B c06b919528885f5c141d6e3d73bf0b408bd9cab08b48767c0c01dd55013ccb05fe6f0922362782419c9a17fa00947067bedae1fe7d57a4ff0f6b8bbd40fe6206 SHA512 867c34ab96d7f2b01b85f12369f728a5cc8215e1f43b5dddd1f053cb6833f34a6b0b38d727e5ae7047f7efd9d00f1145140f5617596110ed2d5f78045764b346
+EBUILD Email-Address-1.908.0.ebuild 595 BLAKE2B 58dace6d46bbb41a969d2a17de4b27e8a633484359692a27ab24b94c0aa789dd692f0375606ebf8bf4126e9f192316ff8304ad92dd831c9227597e4c47806848 SHA512 a15b8597d284b726aac6ba6c9497d0a53d601dc56e6085d373f9ca6684714649fa91dfa097f9e5e20bcd41e30178c4a86507d60c519f3aa49c3464f54390bd51
 MISC metadata.xml 398 BLAKE2B cd04399455843eb5f52bd705a86512e0ef57a9cbac39ecddf04783055c9c22a318bc42b673ee7024612e5f8c72f1bcfc8ac53708da87c2e30a1f3f11b292a255 SHA512 70d785e83f3d49ddd1865a81f7b73351cf5f9ebb48a9c26fc477e1f125dcbf83dbb4699d427fcc65c3b54de4128f342c26dc93b643cec00a6265bb2968470144
diff --git a/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild b/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild
index 84574d7a33c8..b20430f04f52 100644
--- a/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild
+++ b/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Find RFC 822 email addresses in plain text"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/MailTools
diff --git a/dev-perl/Email-Find/Manifest b/dev-perl/Email-Find/Manifest
index 5fe241d2625a..2a729d8ddf59 100644
--- a/dev-perl/Email-Find/Manifest
+++ b/dev-perl/Email-Find/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Find-0.10.tar.gz 39511 BLAKE2B 846b6bfa5a02284d36b399ba32f944bba25ea07d3a352aeb9dab5f25039d34a988262c16cc043a60d8f611d8d28c7fe4f15ed07778bb79bb09c6375397a8a89f SHA512 0c31a108de7b146a9b1a35dad15d4a8afb6bf036f228b4997247e1406ea15a8a6c0ba6d79ba36c4262be69970211653b71587771d2d0170ca506a7f531265720
-EBUILD Email-Find-0.100.0-r1.ebuild 426 BLAKE2B 1869598a4428d10d682ed2e7ec5761cb147052108326ceeb74c8e2cce624d73424f41e663ad8254fd47184970b92b75b949f9fa3cf7c4d3706e13a1645784a63 SHA512 b31bf50834fa3008bf98163e7153dc63d537018fe8221e33297ea2c8823b43c9035579170033cd8d386cd1e2a490c24daee7d62f86e0281c1b812b809d4ab4d9
+EBUILD Email-Find-0.100.0-r1.ebuild 547 BLAKE2B fed27bea1909972ae7cf3adb50036087bdd2133f83af6489e452470075423b6ae189b4e2d3ff451f53240a88b95b6020a60adf2490d66f0a67d1a2beb5dd01b4 SHA512 d768e6fd287464d7e93ae2681fd38e96cb0f6210c3ec9e296d9256d903bcf6bd2ee3d107d1f59a77598f4db499c2738855600dec50bd105b64403788af0f32fa
 MISC metadata.xml 460 BLAKE2B dd55f62ad5512be7087e7bfa93df1daffc3213e6e89f106b8a062a803851700ab267bc7844d37f551fd04242da2f920f373f09e646d6931dec66607b1c5bcd1f SHA512 08ad3fde31149f98de29b5412129285e449859318855efc5c5ad61644d140ceba65543d0ce606b123247c25dfe83c3efdac9ceb9268a16d80136fb8ce151b8e9
diff --git a/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild b/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
index e186c4c0affc..ba77cb73dac8 100644
--- a/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
+++ b/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check validity of Internet email addresses"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Email-Valid/Manifest b/dev-perl/Email-Valid/Manifest
index 91217b1505f3..fa0a49ee7dd0 100644
--- a/dev-perl/Email-Valid/Manifest
+++ b/dev-perl/Email-Valid/Manifest
@@ -3,5 +3,5 @@ DIST Email-Valid-1.198.tar.gz 32952 BLAKE2B 158626f85116c85c1246f8ba4357cab9a1ba
 DIST Email-Valid-1.202.tar.gz 33891 BLAKE2B 439dd466fb9f28242531de30a1b3e6b90ee4db69c8680739fae3d97974eec8ca11f2c5f88a39e266851392bca221a429cd68b7f8ef628c93eb788d164b7200ac SHA512 16605a0f935cb429f83209e0b67a36339c74ce77aea1aefbb338a00d236f57648672bb179e543dcb28b02603ccdc0a9c6a696176eecb5075cbd119d1de7a114c
 EBUILD Email-Valid-1.196.0.ebuild 623 BLAKE2B d289a5ddd1765b9504590e14345d734cdf8dff017c7890640b6903169406398af2a2edebc1bdb8b7df405f1dccfb9a0aeb68293ca97a941c04b9477adf9eb252 SHA512 97ce0f4add1303357b87410e1dc2316cbf40ba56684838249b259cc7ce6d3ced929b8435fe266a808f9dd5f32fad79daa349d9e3a852995b066d4865489c211a
 EBUILD Email-Valid-1.198.0.ebuild 667 BLAKE2B f1734317020c6c4de458a3ca724fa371a4b853e75f27ade31dc4d442c099b9cc924c712a0ccd1f7669e8312ef13902ea82382b83153b1da085a33c3d35f95ec8 SHA512 d86643fe6d46bdd6ba4129e7f458c6bfd439b6edd07afa1106acfb035141930cd1e4d2658037579d40abd0fa0cf4b1e25b79fd25b576664f7bf7b42ecf341d36
-EBUILD Email-Valid-1.202.0.ebuild 667 BLAKE2B 935a11fee746c8f336c573f7fcb29f37e354f111e3eadb7e5478f1f668fcbfc17c35d4686c05e935099abc1954302b73ef0a25fced259650ab23ab710571a944 SHA512 7b30ea674ca9cc89872119c2b1b51c7b751d274212d75c834ca4a185f26fcb0f967f70ae36eea6c0fb88678a85133d2a3f486d5a7a6ab84ac0280e543464308f
+EBUILD Email-Valid-1.202.0.ebuild 788 BLAKE2B ff0d8b70969293e64be17696f8338b2ff7cc9d48a3f83248c4a0aac4353678618575e877f5bb85cfebba8c2b8048607e1d1076549cd64752c890494bcff8db13 SHA512 9a9299e3dde07acca05fc70c2043fbc4a835a10f353abe77b6ca0e12f891d945bb62db9d33e7f6aad0ea05b9b0fc0528b707a26212a87e2adf74c66a7cb97746
 MISC metadata.xml 394 BLAKE2B 62ecef1e269014bc28e745ba5c635d9ce69009f5e2a43597225d64b7fc634ed94f52f1696ff06e32272fd96aec16e897f956dee18acb21dfda1316f6c4e04d45 SHA512 45933ff20d285de8387006ef8f07b7979bcdfc052e05c8fdcce68561025c19dd48990fdb3fcc9376ad90109d5ea8f8ffb9e006b078d39e689910ccc57ae493dc
diff --git a/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild b/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
index f3b4a69ded87..57765841fd03 100644
--- a/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
+++ b/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An eucJP-open mapping"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/Encode-EUCJPASCII/Manifest b/dev-perl/Encode-EUCJPASCII/Manifest
index cc25cc470e5b..488ab1cd3731 100644
--- a/dev-perl/Encode-EUCJPASCII/Manifest
+++ b/dev-perl/Encode-EUCJPASCII/Manifest
@@ -1,3 +1,3 @@
 DIST Encode-EUCJPASCII-0.03.tar.gz 131775 BLAKE2B 9bb220eff388fd5d367a051f77b43f82e69e830272b292a85c639806760368378792a82f64bb1e1182c98738082329e9c07a7e6007d20d12487af6e51602abd6 SHA512 0d7a06e1f5eaa20451ef360ef78372cb0ecf0c9a525efed5db0b55b0fc98b47c87eff4f9be069bdd7be50156f8edfc0cb9a257e9efd5a33130cc745dca12b7d8
-EBUILD Encode-EUCJPASCII-0.30.0.ebuild 446 BLAKE2B ae292c0e58d7f34f72f24d6c2cc87ae87550669139394e475cd4ca993e446e09c14fc27b22b3356e53fa38834c43da9e4064dd6b3b22d0b8e267c0f49674051e SHA512 18762897018cb306f01bc52f2e542cb775f0fc709466902ca2844b570fe2f0f4cfe5fefb3ac76faed9bda40074f149ca73ceebaa467ba2e3608220588754d604
+EBUILD Encode-EUCJPASCII-0.30.0.ebuild 578 BLAKE2B dd348b8f90fb1403ce529ef3ec6c32ef35ef56e90328174f9f89dcf4ad46d35d6908c5c14a49ab00ae1bca53ec3aab9108ca4a1a7dd43310454aa2a743ba446c SHA512 e1e8d422be6db9066e4cc7dbfc3326af281f289b9650970ff4d38810c68a3638beb6e8894631621058d68aa0086a941b20de860506f7f056357852046a23c461
 MISC metadata.xml 407 BLAKE2B 173ae21fafb2dc05bdb5f1b61de44b6669b4c5fed618b0bde8867ac05d25d96d2d0c1734ab2cf9a280688792c13240b06eb5c2acb2cf7d78ed37500b44a00b67 SHA512 3b72dff6f5dc0de72f73eb56b1816b51fc1de9d9fe4381ad27d94b07f9281038f08f43344c0dbf40a7e2e643b0dedb0f540c9188899ed57790f43f3f1271b287
diff --git a/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild b/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
index cd43d666e26f..900122174e37 100644
--- a/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
+++ b/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Extra sets of Chinese encodings"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-Encode"
diff --git a/dev-perl/Encode-HanExtra/Manifest b/dev-perl/Encode-HanExtra/Manifest
index 97a8e225bb13..bc8a78c06ac2 100644
--- a/dev-perl/Encode-HanExtra/Manifest
+++ b/dev-perl/Encode-HanExtra/Manifest
@@ -1,3 +1,3 @@
 DIST Encode-HanExtra-0.23.tar.gz 1566682 BLAKE2B f3005f007e424977dd41c62a3ae4d3c4a5c2fffbae5c0040fed4df59cf7af7af47c8903fa240bcfc0d2749aa7eaa01d4cf7bdcc37e7b670aebd6973d961428db SHA512 218083b9b3b4517cfc714169479cba0689a3586d9abb24bcc79d3401d37dd9412cb4e878b6aad06676d5c4f0e03cc69dcaf2e5f48036e2da6f336508c381e462
-EBUILD Encode-HanExtra-0.230.0-r2.ebuild 592 BLAKE2B 029d9c1468082f505d3a7b6dbde2e80b450912f817d5f6f97d65818fbcd2d515661c77c365e2c9616317c300d777e16cafd21b83f9040593c8571b604a546ceb SHA512 a012cc9d73456fae5be66e946cffc97dbd68213bf8a74a9f84f1406a0d596ba38ada7d4ad5cbd1a49afdec79b49ba95edf09aa507d559d2fdad57af757c9179f
+EBUILD Encode-HanExtra-0.230.0-r2.ebuild 724 BLAKE2B 766bc5334d526c37f3bfdcdcd57929f5a659a176e86732c29867b0bd6e4a29eda98b62f0dce87c0cb664397d52ea9518049de31b846dde419d1a99b9f85ba47c SHA512 c49166ccb3ffc3652074f0c45f84f375dd5aea6eec33e126f119353be63b641577642a6498aa43c668f2e5386e9b0fbdf7a9535d96234ba7f8d219b596b662ec
 MISC metadata.xml 546 BLAKE2B 24a6b274fe0308bb0b86e5d67e5468ef110f6e5f87d684fcd6a85bfcddf930d6098e5846a6175e2fbf3d823f79ed15a14251a9aedfbbb9893198905acec3281c SHA512 21b7df344d8b930cd9b8d0c602c11c709b75ef85b55218e1809857b7b56dccdd54b0bfb487d896792deebf982a2af8806f5e1e4ad2e2f38be6bd45512524a203
diff --git a/dev-perl/Error/Error-0.170.250.ebuild b/dev-perl/Error/Error-0.170.250.ebuild
index 887f3bd2d32f..863a2433f5ab 100644
--- a/dev-perl/Error/Error-0.170.250.ebuild
+++ b/dev-perl/Error/Error-0.170.250.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Error/exception handling in an OO-ish way"
 
 LICENSE+=" MIT"
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Error/Manifest b/dev-perl/Error/Manifest
index aa18f26ccce2..625e32103289 100644
--- a/dev-perl/Error/Manifest
+++ b/dev-perl/Error/Manifest
@@ -1,5 +1,5 @@
 DIST Error-0.17024.tar.gz 31269 BLAKE2B 944e53e12b14e11f674ce503ba2afb53e09df420f7f146eecb23050bc9c3ddcef3435f3fc41da543187a2c6fb2c7804385652f96605ac72e6b05a778b8b52a87 SHA512 886ad8d527936ddca564c466bb753e29bcb203ebc32bee7c8af8db05f70fcae17d3536f1f0163d17e3d1a0669da0c559ea0e5d14a1e83c4c7e329d4368ba3e77
 DIST Error-0.17025.tar.gz 32013 BLAKE2B f05769f2d10f2d326f85b67b5ae6cf16605b4b908b56643258543ff321c74d3aa7382f4ccac1693fea44e31b4ad970eeb15219bf610da4d2f1c0c13d68596494 SHA512 0cb77d8be2f759aaf8970f9d5fa5483ba5ba687c115f6bbeaa22afb1b5c50fe6f70b4dce19a3c8d1bf6e9bfad0af86f2e03faac493f428b04962e5337be3ae2b
 EBUILD Error-0.170.240.ebuild 771 BLAKE2B 5d4050916e49b02cf7ffb2da91aa1a53af64f1883c59490b80703b5b4ff25c0b4cd6e074bc5bc6b4aebffcdc2cfa2ef3b91a83a3ea7fafc9545a4982212a66f9 SHA512 b4c23a6c38e0ffbc933d85009b299fc80f6dac625501d91840bbb6d3d6286c9e540ce400085337b5ded556df532559798431a4414b66ae65b2a8ae88f50e570d
-EBUILD Error-0.170.250.ebuild 770 BLAKE2B 05dd655d2bcc38c8ad485ddf62337ad02a52afd0f487a0bb75b3af91983f02bdeff608117b84b6e88554331df9542bc0ba702f23cf6f6daa05d95190c89b0976 SHA512 5269f7059e907bc485ac8b6dbeae1c9fbde2072670efa606c430bbf525927d8dab08dc10a49cefc49c7da248f31666e760eb97ee1640d765579bda5b44b907f8
+EBUILD Error-0.170.250.ebuild 769 BLAKE2B 8a1714b565601f71bcb3b0e88e80f9483db4b8b8f9c6eb81ba8b80bcbe33c766a2f2fc4c527c5ac6bc580957f85892dd5433dd714084e32792079fb14f7c3515 SHA512 7bb517b4590cf15a52d1b9d0e8baf1f12705c81a21b315cf8aebb1df8c040b35fb66d3cf64bc5b266aea87b8aa6fd1e3ff43ef58386ef098c26b2424db028432
 MISC metadata.xml 560 BLAKE2B 0d59c926b5fe430fcae8cf8431dd7a15c9e1144cae7ce86aecbf1ad44cea77c37e3d23e1a7f682b591dabdf48cfa7da235eae18a4edd104546b4b8b8c24a0e91 SHA512 348405f6cd75c3e1a5a5b21bcb3da8fd95a9ffc9117c2d4ca7c675cdc37437442edb9489689976712995e1956a1f722cb9f46e0228ff4735fd98fdf02d5957da
diff --git a/dev-perl/Eval-Closure/Eval-Closure-0.140.0.ebuild b/dev-perl/Eval-Closure/Eval-Closure-0.140.0.ebuild
index 04644442881c..8fa1060b7c8f 100644
--- a/dev-perl/Eval-Closure/Eval-Closure-0.140.0.ebuild
+++ b/dev-perl/Eval-Closure/Eval-Closure-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="safely and cleanly create closures via string eval"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 # Scalar::Util -> Scalar-List-Utils
diff --git a/dev-perl/Eval-Closure/Manifest b/dev-perl/Eval-Closure/Manifest
index 3c87a9931dba..3e30a5fbd27b 100644
--- a/dev-perl/Eval-Closure/Manifest
+++ b/dev-perl/Eval-Closure/Manifest
@@ -1,5 +1,5 @@
 DIST Eval-Closure-0.13.tar.gz 19735 BLAKE2B 90ccaf7ff47b037f140b41e32438ad0511bbed79f73a964c74bfdfbcc4aea526dbf3058f0e79cb0da52936d245ee48ae0fe056d93d74abf65bb7fe549df9a486 SHA512 f87d8aa8af5f87611f95a8f1f44f9c403ab669f944b3a63a9f8ca6a80075ed957f0050bd57b2076581bc47fa57b710712ed9e3abe5670a1881b12dd674414f89
 DIST Eval-Closure-0.14.tar.gz 20128 BLAKE2B 019ff41caddaf790b7b6e3d11c6a05bdc9c3d81fb1af59f9dea9f32d1f0eb5103a8d323d1f263e060ce56898f6631861ab03bbb13a9639688fae26f6c5ed979c SHA512 fc55206bd39c4cb39360d06b6f39a65743f34b5e59d1a1ce99bf5831b9d88a03fb6dadf32fa9f0868e140fce719d53a7b13027f397cdd7f6ca05cc81277bdc08
 EBUILD Eval-Closure-0.130.0.ebuild 755 BLAKE2B 48bad555a368ca16f590b62de1e4242ae76947f44b9001acc3beec1cb80eed14459c556937d6f9b22438fcc5195f747f01d8bde9d47f265fe31e2c7f6569ddbb SHA512 da0833b5b5eb5d809bde50e28481d253661c3140dd4b1e8b8096e65d71077a256e7b7fbe2e5be7320d066e3b747349601b0433fea7ec796a88acbf48b713749c
-EBUILD Eval-Closure-0.140.0.ebuild 774 BLAKE2B cb2b5596415a3541c46027506991e83cd929c644b8e541ed1027e7a888ba237b874b0f0ecfa1cef0b847b561de79ae8c35f45bd823883b6e77e1c2a6ee4501b4 SHA512 7cf116b1340d8fa23943992ef718aa63bd9311ac240e38cc467b9cad7e1546082ccd1fd4c884872fc08d36af0a56daeabcdf3b82c1283f0fe07c12e5839a25b8
+EBUILD Eval-Closure-0.140.0.ebuild 895 BLAKE2B 8b3c690ffb254bf4fee5b7f2c1ac97631bfa7e5d201d53393b0a6b833144377efc3c3b62f08b40d03f9a7a4bab99b628fe024c89a51024f516e3e30d28392685 SHA512 1d5b683a6722a486e5094a1984f79a7010a6b576bca5fc2cada4744fd1b71b2ad63faad54cd92017bd8d9d4793c01eeed5efcc37f718bf062bf63f3d889b9317
 MISC metadata.xml 396 BLAKE2B 4c24aaec07033b988c8fda5fc98a854028c2dce54b62332ed8d1d8e45ee4f4c2e81fb1a7997a8f364518fb21d36e3afdf96aaa123a805f3204a50fe751c56245 SHA512 6ddfd6641d94f1db70b821e1ff4abc42c640f34ef71c950f08d54337ad798114997009a248a64cb9cf369240d05dd62969b276e8d4b3e3cf096c2ba334cd42a7
diff --git a/dev-perl/Exception-Class/Exception-Class-1.430.0.ebuild b/dev-perl/Exception-Class/Exception-Class-1.430.0.ebuild
index 884048f57d5f..4fc5d4408bb1 100644
--- a/dev-perl/Exception-Class/Exception-Class-1.430.0.ebuild
+++ b/dev-perl/Exception-Class/Exception-Class-1.430.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module that allows you to declare real exception classes in Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Exception-Class/Manifest b/dev-perl/Exception-Class/Manifest
index b56de80fead1..cffd4864240f 100644
--- a/dev-perl/Exception-Class/Manifest
+++ b/dev-perl/Exception-Class/Manifest
@@ -5,5 +5,5 @@ DIST Exception-Class-1.43.tar.gz 45601 BLAKE2B d4069f801e4690f2d6347ee98f6570fa0
 EBUILD Exception-Class-1.390.0.ebuild 659 BLAKE2B 6f1d7c3300a505b14208a1f826d41ec6ee0a584451aa418a0abe71465ab3b483cdef2e2594402a9d74fc1afdd9db68d2bbb49be87e9d9f1e5d4cc3ae035111fb SHA512 756d9e20d341d11ca36f9ba64031183bc891605f6c77e1049b05e5b0030ef0d677e943d0423e277c97e90955f9659719aea6296cd69ddbfb475b8c062057243b
 EBUILD Exception-Class-1.410.0.ebuild 665 BLAKE2B d4cdc8e32a7482c519a1e88491c30d25dc03b970558d9beb6273746a6df70ed10067e3d482393d9fae4084306b329d8ba7e392db6a83edb2b8aeca50c83b3131 SHA512 aa64e655bd327743abb7273505a5e24905084b015318abbf573d30a366eeaa0faac9a54bcc231b59541dbcbb512b935f985e0490793ac1b82dbe03d52347596f
 EBUILD Exception-Class-1.420.0.ebuild 672 BLAKE2B 0cd3443e5403eafc860f0ff77071c57f33f76a4fd2d7383992c01fc561a20d03cff685000c64ce68f4bca8a430ebeef592bd66a81cae69c4909050f7b0a8dffb SHA512 d2c8694def3ab248d7800fc4392b5530c36324766d23c910995e4d53b22279a5e3270325dcbf49905fc4744f3df8a6053ae5ad113136a72be6d51defad243175
-EBUILD Exception-Class-1.430.0.ebuild 676 BLAKE2B 24035d16170e41e0a930b0ddeecbd326a8fe3e8c8634f8bebd9ccd4bc921197e24f835036e9ce88678992fe4747b96336df31c03b0864b267ad197489d9bf8ff SHA512 c31eef6482c38fb7a4ed52945bda5ad350ccbf9b831342783f96a61f3bea949f17f77a8c12217662f3b5829c23bd9e207ea4b7ae47790d64809c1c8f03ddef2c
+EBUILD Exception-Class-1.430.0.ebuild 773 BLAKE2B 95258390363b21b7c9d17127d10d78f8a1870e990af13c896b2bae6d2953f8fd973e719b98e773c9b064f8ee81521e21418ae392d2334b7ff6f9e89013559c05 SHA512 001436ac82750e17f8751034f0f3fee15595d47c86441d88512dde1c5c05a947220db0d73616783bfb41e0735df18fdc830e059d4ad59d2fba7cf50936a95c6d
 MISC metadata.xml 471 BLAKE2B 97ae454f0c53b8f3b7f051c157a0f6d89943964f35150850916606b09144c675511399136a637014b265981fb37fe176b76bf9e8f307c07228f54c6d3f85cfad SHA512 45f0b6b80305cdc7c1af3c62b9442e6464a02fee42908455f3e33de7c981046a7421d097320ed9be07e63c8d66f891fa6a4273d23ad025ef978e4ed20f0918e6
diff --git a/dev-perl/Expect/Expect-1.350.0.ebuild b/dev-perl/Expect/Expect-1.350.0.ebuild
index b7a47120e21f..99e91efc5626 100644
--- a/dev-perl/Expect/Expect-1.350.0.ebuild
+++ b/dev-perl/Expect/Expect-1.350.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Expect for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Expect/Manifest b/dev-perl/Expect/Manifest
index b11b8c231576..2d5cdcd3413a 100644
--- a/dev-perl/Expect/Manifest
+++ b/dev-perl/Expect/Manifest
@@ -3,5 +3,5 @@ DIST Expect-1.33.tar.gz 62268 BLAKE2B a577e8a2d095154cab41751d76b30389a53603a2f2
 DIST Expect-1.35.tar.gz 61667 BLAKE2B 09bdbad8257276dc3a4f130f8191a7fbca7633cd019cee71b74353bf908a782cd8d79bfa1cb3837231f14309dfdc9247926cdfb784eb5a6b8b960e3d63f0fd9f SHA512 97ff1969323cf0bcdecc792199111e273e1a4c032a9cdecac1acb521a280e772256c1a8c5433b4da1f34a585d83608522e9f00cf3c5a0a30211662a5373ef0b7
 EBUILD Expect-1.320.0-r1.ebuild 635 BLAKE2B 2d996570ed068942184eb310c98425abb11c3122fa113391826c4cb6c362c09147d2107debd425d783b6cde4af076f41bbc26ba55366ffd8381fb5e3a5c90b61 SHA512 3e87773a8fa7fa2987391fc118d86dc3d64531ef1f4ad3c26e6ebd57996521fc02a1bd0d119d14f09d158f9b729788be3d6f450a267618a35f4d83853a53e370
 EBUILD Expect-1.330.0.ebuild 639 BLAKE2B 2f5f03a10cdaf01b4bb88869e7ae84c7f1134085a475d05e0fa2a06a7df5d5e548a86ea98c13c5a34f17ded68fa1849dcdcc5b1dc8e2620e985ce11e366983e8 SHA512 83f7391c27964274f9dbe6ab7088774e759bfb6c20a4ae3cecaeb18f40d161b4b65fa20cbc4264c361213d520a3b36ebeb6298aa1ec03be42d8cd880e48557d5
-EBUILD Expect-1.350.0.ebuild 624 BLAKE2B 6bd8301bab2a88133c5ac0b0ab95f770c1c1f2df3b7f58ac29d8f776c1a31a49b83882b21b51f17a36d9bc5e6f99c9570b811e0333884e703e58ba01093a96c2 SHA512 88c19af11610bbae35b39802bc701e5d4b5bce403460da60e1afe8a33efb3744b403fcc8396e04d02adcca1f796d5e91c5f8735a31366c09f22e1bac4c02cbf0
+EBUILD Expect-1.350.0.ebuild 623 BLAKE2B 1ec27a8375a96f0af9773492a209b99af427a45d2363673e3e5ff48b8ba1a4ace2ae01a822168510359f257a376d2bd25bf133390146324793b1144609a39781 SHA512 4dde8bf6f209f3ced6fb344f81fa782f0c2b274f649040eae506f205214665c7c9e99ced5511876c44fa4b21146401aeadc2d303904f3586b901044c3764a45f
 MISC metadata.xml 383 BLAKE2B 7fad29322fb45dd695237211692c6c2dd6dd28537e9f13b1c64d6315712111f56a79080569972de64a448dda9da1e12633a2929f18098120f9422ef43c2d347d SHA512 6af4e95fab5ce669dce2f6cc4555081c6afbb37a041527278492531ac0ce8fb8f42cd704049aeac3a0429c46abcdb5b8fe3bd7bdacc8ea2a343beaf85d3d28e0
diff --git a/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.1.ebuild b/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.1.ebuild
index db1db574f1d0..cb0cb310639b 100644
--- a/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.1.ebuild
+++ b/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An exporter with the features of Sub::Exporter but only core dependencies"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Exporter-Tiny/Manifest b/dev-perl/Exporter-Tiny/Manifest
index b20b4f639a3c..b63900cfc82e 100644
--- a/dev-perl/Exporter-Tiny/Manifest
+++ b/dev-perl/Exporter-Tiny/Manifest
@@ -5,5 +5,5 @@ DIST Exporter-Tiny-1.002001.tar.gz 32304 BLAKE2B bb16d9195f5b8b68f9e786820ca21fe
 EBUILD Exporter-Tiny-0.42.0.ebuild 618 BLAKE2B e3f9827f40f4717dae6ddb931acbbd0a425d4191377ac37a3ae3ea6827544b3f46bf7871aca5aa4589a80af3b76a30031319753e592cc57c07686d784f21f953 SHA512 852a1efb581011412e9699c64051d37eb77730b6fad5c2d9843083ce5706eea26f86d428618ad8dac9eba2ca9be62a8655614330e81eb3473b21a335cc45ae3d
 EBUILD Exporter-Tiny-0.44.0.ebuild 653 BLAKE2B cff7e8873b4a4ea120134185b3e97fbc974f915d2f37ce64f7b5fdbe82e70f4b4f641f7c81a79e520532732d9d4c893364fab4c1bc199c3c41de9e3038d2d4ff SHA512 ec0b49f20bba74f8c3a05dc4c06f2c018c427d776002de93372deaf7fe8c9bc508b4ffc589bd11d716a84facd0cc6fc345001a9ae1398adf1971523128be3279
 EBUILD Exporter-Tiny-1.0.0.ebuild 679 BLAKE2B daf17409746641f2e638a9c29fef6a7b7178fbf6e917d3578f14b7f8bbf991a320a465f212374da8e3c12998c386266260592dd766dbf17b28c628da30c17dfd SHA512 f2bc2b0bd083b5f04e519a2413317875604e4d98c90f4f134722d3e5e2aa25cb220b1603f73835905801e6c148e958fad6c4f52d269562d8c0e9c4e1a19d4dfe
-EBUILD Exporter-Tiny-1.2.1.ebuild 680 BLAKE2B 1e13b2295e1477725760eb71e8ad75057ddfe0af67d23e673f136f1bf555bcf4fb32321676c8f9f6f53f4c3a5f97a06ea497bc54bfa5985089c14e66cf2736d5 SHA512 5fd4fa5ff954b906f0da07366759905d26acd85e8f1c3ab711abe9ad45bedd596417fce077226307e95c370cf134123000d35546c1c9c6290a12d3715671078a
+EBUILD Exporter-Tiny-1.2.1.ebuild 735 BLAKE2B 655b8581ee5381b13eba2ba2802dfbda6f3a4f2744e6c511f59a1022f20f911a18f7f207541b8cc79af5b08f0990bb5e94e5c9af6d9f04b46ba3fbc82fe1eda7 SHA512 548c171ea79f13c6ad8939800be54e78384fd2befc3b97f22e157d1ca5386f1fd5c7cd45d366a07a8476d4d759267655aa43659485b9c21c9dbaa72cdac647c1
 MISC metadata.xml 526 BLAKE2B ff3d85e25fb9fc01e22051e32193d99818a9ea73ed6ac8385ec4cb4a2734cb63e46c78c4c8467fdeacae7a66931fe608638080ca1eb5e615b926c4d35c9c494b SHA512 92bf9ce5fa1f9e099d8984eb0be24cfeb9596c50ce420f9d1c9e2ff62ed51ca2a7b23d95ae685ebd2657e5b607910d02492f0c93c6d0b926187ede4a35356679
diff --git a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild
index 5af410c603d4..56d87bba7eb2 100644
--- a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild
+++ b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="A wrapper for perl's configuration"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/ExtUtils-Config/Manifest b/dev-perl/ExtUtils-Config/Manifest
index 860630c0cdde..f66364d058b4 100644
--- a/dev-perl/ExtUtils-Config/Manifest
+++ b/dev-perl/ExtUtils-Config/Manifest
@@ -1,5 +1,5 @@
 DIST ExtUtils-Config-0.007.tar.gz 12135 BLAKE2B 9167fa541bd0f9a81791cbd5dda1e537d33df3e903a6856eae4877ceca6e0b6eb64603678bec048958555432a8dff79f99ff4a18b15552b236dc14320db2f74b SHA512 168facb55560ad562bf1e4ca59dd0cee119e0059a8ac7d62283b7074078f73aabd5cc8c217754492a1e0bae61456b9ed9480f9710fbddd3865e5eddaf746052f
 DIST ExtUtils-Config-0.008.tar.gz 11165 BLAKE2B 58468be3884311dea31e420511134eab122a923c445b2b489914227934ab50efba4a08253e86715385ad8aa7b6f0212e95b73f2f524a964704991e4227a68d47 SHA512 7775e2212b4605e60559c7e63604b8f2b4c56f4846e64f9f4454f3f5d0a7a21f618143e6c61eafabf5d9ee9bca8f722c04aedeaf9c51f59924de68c272b86db2
 EBUILD ExtUtils-Config-0.7.0.ebuild 529 BLAKE2B 3832e9b5dd0c973880999dd7668122532896447dc426f34b38ba7b10ae289cfb9c8fc12fe51e20a86b9598c264fb7a4778d56922f262256c917e137c877a15e9 SHA512 4ca77c59e82b2f2bc3d52242a568a85e3b9b310dc3601a7a51bf83b272d58a9e3976a4f31120819f873d09caf8429709dd5989cb56743e3faaa56ef08cf2affb
-EBUILD ExtUtils-Config-0.8.0.ebuild 596 BLAKE2B cd127e49fc33d429e131167fa586a491d9ce08d1d0ed6f872244bf5a9a7fc1aa230eabeef32484144525051c1df443994bf733281fac8caaa247ed1b30e3f558 SHA512 dee0f21b771ad122c2579834a45baa26d652527d4d80ce7bb2ce90471028cbf39c45e23a2446fd0733af13a86512eac3ef58a782c25fe2ce274ce2b47adac5fa
+EBUILD ExtUtils-Config-0.8.0.ebuild 728 BLAKE2B 3ee0f8afcce9175f1ea296e5fb4c078f3c0047c2a17c48e136fb63748cdf8fb602ca030c3e245323c88d4e0e354394827a7dbdb3d435f1f3922c18e0ab18c515 SHA512 59b03b547172877e179866cf0183f87fd74bd4d8b9ab2d91c4fa797d6943aa56565a08799e352898a9ccc11aecb424630eea4764eee82d95d80b0723a4149440
 MISC metadata.xml 390 BLAKE2B 59aeaba2fc188b68598514c89cb0935f577c751f1b081f6bb29b72e6a87eb1cb86df38bc578cf8662a9c4371b525afda6df35822aef264746eb800905647cbd4 SHA512 3f0dfaab3133ff6f2adb0b817b3579137e5422d3943759c8838de0ec60716f792c2b50700d7ad04cda4ba3241bc665a1cc570a10719213f4c77cf886d05efaea
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild
index 6a3203ede636..5d6f5bef35ac 100644
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild
+++ b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily build XS extensions that depend on XS extensions"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/ExtUtils-Depends/Manifest b/dev-perl/ExtUtils-Depends/Manifest
index 7c69b247c7d0..383bfb5e152a 100644
--- a/dev-perl/ExtUtils-Depends/Manifest
+++ b/dev-perl/ExtUtils-Depends/Manifest
@@ -1,5 +1,5 @@
 DIST ExtUtils-Depends-0.404.tar.gz 18207 BLAKE2B 31da4c8c131939e7a5006c70305fca64f01a96e94cabab95ff394b29662e4ce39a75123621af2dbf7a530797ce1187f424eb0c2cbea0ffdb7975e18a0eaf88f2 SHA512 b316309eadca551c5302b20b28b1ec2e2264a47524fc9a1a9763b59517dfbe84d22e86a76235fa0d0190c3348f49b913c40da60076ac6d01c51a98f7c0c5b783
 DIST ExtUtils-Depends-0.405.tar.gz 18122 BLAKE2B 94470f7d35d72942b65d4b1d56b748a6e68e1315cb734228d0f90ac2b6c7452d1aa1c244c246bab7a0b97e1393d2973d35e8926568b695b4f2432f290d60b403 SHA512 b9983ad763ff0cb81c899bc24f3152f13c69e608304b6e4446bd07b9b13d039650f3f87544c0bdd29c67246ea2973f04a1ce0fccbffb566fe89fdbe0bb03f11b
 EBUILD ExtUtils-Depends-0.404.0.ebuild 555 BLAKE2B c6b58b241add6d344774326135ec6ef0709a77689c4a6b3e398062fec16ac1a9e84a1879b9a372530fa44d0ea1683a776a7364b0bb5ea9a49bfadb6b84fcf8a4 SHA512 6e1aeadb7d4f467f95220669546ba13af71549723fb759ad9b8788ef490a780617f807562b42f42df2b14c38de7b06c6f61e11986402a2caa834a68115fc5029
-EBUILD ExtUtils-Depends-0.405.0.ebuild 574 BLAKE2B 31e542cd2bd42166d79ae5a64202bc538b887e120b7a4b81c1ccb24eec879727c7c8f831989e90b2170710872ef5aadcf3fa56576fa7205d444e5c45aa25d8fd SHA512 b7df49dc5a585e5ab4feba7e663888e097135659be26fa32a455694a0015d24edee06ede7ed20af842825dab541e28df06cf764aaef2bd3024bd961a831631dd
+EBUILD ExtUtils-Depends-0.405.0.ebuild 669 BLAKE2B 849e5b3028184d1cc1cfb10cf43c9f7bfed6d105770e76346be88bc0cff4d4710b3cd5edb4654755113fb94ec6e5e7e4e84655836d2633ffe3f355d7fe9c1c86 SHA512 67821dbd88164b1f9cce6fe9a5400394e2544a14c6994690bfcbe2dad375f95cf400c6fbaa2479d42b00c2f45320be2295d37cb044bde88d054e85142056ee33
 MISC metadata.xml 404 BLAKE2B 93cebeb39d2fe8da303c39e4ca965f8d801581aae1f7c7f53341a5a55f2df8cac89c22845f57355ee187b5c527e848cb9ffa8e41bd98bbc47b2f2e8d9851003e SHA512 a39e7e1c1a4173b6fa2c4df6616a91a52e83fca6bd481be52ff49a4e29076eb38866e27fb62c8eee49d39a0b681ca796eeb65243cc6bd35511e54f4a962adcba
diff --git a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild
index 4093b0eeaded..3e5719e2f4a8 100644
--- a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild
+++ b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Facilitate use of FORTRAN from Perl/XS code"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/perl-File-Spec
diff --git a/dev-perl/ExtUtils-F77/Manifest b/dev-perl/ExtUtils-F77/Manifest
index f05de60d645a..44ee5c460413 100644
--- a/dev-perl/ExtUtils-F77/Manifest
+++ b/dev-perl/ExtUtils-F77/Manifest
@@ -3,6 +3,6 @@ DIST ExtUtils-F77-1.19.tar.gz 12057 BLAKE2B da47f9b3e06a0be09beaf4f230c4a06aaeaf
 DIST ExtUtils-F77-1.20.tar.gz 12201 BLAKE2B 6adee5bb3cda1b37d230ca408384161777a4aee117f7acd36a2cc125f1b64ce06b3c86557e6dfaa7bb2b159c814694f2d79c3d2c2da8a6a67cb36358d5a7c89d SHA512 0d7cf351d84676d3dea2ec781b1e230ab4a737d34de4c15c5045603ac6e6e411b5d9b235e68bb9ba0552cc4de0ea67c8355c160840b3205429802ea1569f0400
 EBUILD ExtUtils-F77-1.180.0.ebuild 421 BLAKE2B 0065eb7108ce943f07a4231dde9fd63659f754a907732af37244ca303d009eddcd9fbd9c3d25382cd3c09cf3a2aacb008117e8a7e66a5173cdc6126561f346dc SHA512 5b82f8dc0cd15ddcb6d785e92d2179c2b0ed349fcd8d57a57b7f9183381eaadef235b83adbd9c3a894a894923aacbb6008851e75e80a973ec720146844d1d233
 EBUILD ExtUtils-F77-1.190.0.ebuild 402 BLAKE2B 7e9f0f65ed0467fcf12072eb8222d152332e11320cfd04c45ad9291419d0da8796cc3b8581f2bde9ac209a964a74b3ad2464f67b23054adad10297bcccb26fbb SHA512 b0570ad881fd4cf590f30aabb1d2d276a7a49f564a36d0cfb1b6db777156bc3e0453e659896ef465f680e8a3c974f9fe05ae08e7c8e4259bdcd0672bead97b01
-EBUILD ExtUtils-F77-1.200.0-r1.ebuild 457 BLAKE2B d168b85a809a660c13c85fe6de0c95c87cfa5897c64f1e9e7f14d33b6ba7a9a33a43d17d94aaacc6014f03cf14bf05544363893710d9e5d3f594290d38184f8e SHA512 538f76aae9bc365d7c7289ed065894f0503671625f798770653bb67a4c9214bfd62afe89143cfc63c16fd9548de89e6a78ce3113da47fb4e76fbbd4901e2e907
+EBUILD ExtUtils-F77-1.200.0-r1.ebuild 456 BLAKE2B 222687c8aeb8f3419aac8f6caa83b5a24e4772d6949205685efae68814180562c54ab2c64f60645420af81f765cb302a3937e0a4c276e6924838d40094f20d19 SHA512 988ad52addd2a58e2748e813874b85ab29d9605f80e9f1ec2ad0a5878501ab3cd4a474619c059ba1753752b8793409714f06f3f70b0383e2cdd1d17f0e9906ca
 EBUILD ExtUtils-F77-1.200.0.ebuild 447 BLAKE2B 43316cc110c82de6c9c2f34f07e12b152ab92714ce9656c276ebd9f58185022ec30f6bbe9c91402c5e55f88c82888bc0db7c730886f90cebf21eee7ca50a7b3f SHA512 6267937e4bab29df52cd860876e87664a6e77ac77b789b0a9ce6172c4e5e26f3b53723f363c0221c1578370c74d13815165cf6a3be40fb7d73b7bb9c0ca0d240
 MISC metadata.xml 396 BLAKE2B 5df2c10b2abcbe658257e6ae1e2fcdf1ca572c9ac4832eadedefeb84bcdff057784e041d97f9972e2dbdad2e998887cd7c8d3e48318d1fc463d6c2f6039c3a92 SHA512 1810bdaff85f127dea27d10e7dc7b03424a9cbfff171f0182d877d581c973fb49d833edd337ba5a1d9ca0d756c259700077edfa21b9ae15f9c6f87e712d0c49e
diff --git a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0.ebuild b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0.ebuild
index acf8ae609c6d..0a954bd261ce 100644
--- a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0.ebuild
+++ b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="Various portability utilities for module builders"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/ExtUtils-Helpers/Manifest b/dev-perl/ExtUtils-Helpers/Manifest
index d38d71212741..8421d90574f5 100644
--- a/dev-perl/ExtUtils-Helpers/Manifest
+++ b/dev-perl/ExtUtils-Helpers/Manifest
@@ -1,5 +1,5 @@
 DIST ExtUtils-Helpers-0.022.tar.gz 17078 BLAKE2B c2ad2eb45976f78cdfc4c6f6201ad2796ba1f4d06d97b88c0d5bc01b679f7d72b19dec61a2cc19da84b47097669fe951dd0035e87f6fbbea9fa49bfac011d6be SHA512 ffdec8c1cf96daadfea34860bbd72d205620dec891d617721bb8ac242ccd2ba0cd5a5f50440633e03ae5fd575add6ac539c95ed68909a64a44b97ac2bba2bb39
 DIST ExtUtils-Helpers-0.026.tar.gz 15099 BLAKE2B 7ddd2f84f970a5bc2993fb5be6be5fa42bad52049e52297b5c7d510a6168aa36ab3ff1c447e581a57f72c13d4f6389018f16aaacc0aa8244e0d2b0cbeb4bae72 SHA512 372d801f43003c571758823a84bfe418876f1b48e3d8c35f888ca41469f6771a33aa30cf893a4c4a68ea62c6e8c8c6ab2ef44ee783dbf9f25e18bc0389359399
 EBUILD ExtUtils-Helpers-0.22.0.ebuild 612 BLAKE2B 168152d60c050c685654d89868acd9329ceb3e6aa9dc5d1c799bc44bd71cd23bfc6b2db05710046fc12344f543e915345645480a1aa4ecbfec41edec28bcf495 SHA512 25094e22ab8f374d653d137ff55020500faa8188dd996a73b3e7d60724338a04469e4c2c731da53bf99495fd95e36c862addf3219cf3662534ae198b45b3c634
-EBUILD ExtUtils-Helpers-0.26.0.ebuild 554 BLAKE2B 4c3868cac00c5e0791122599f7ba102a0e7a9a9ebc14cfc9320d640335f2c631f157d6c14d7ae9fac0d10baf14df74669bcb1f5da8ce0493ffd333186ef0cb1d SHA512 cbeb1dbcd6d48db811501b4c4bca07c8fae855f025ad3730bdc50e6943a5527ac5cdf62ec319ecb5ee0c2b69ad6d70e38b9e6b14f4020e13cd6cb3f8dc1a59af
+EBUILD ExtUtils-Helpers-0.26.0.ebuild 686 BLAKE2B f94841252c910bd6305b7bb920ab41632babd3222f87328341663bc05793bdcd890d77fa9ed9fc6b075ad5b629063ce9ecd6bb6c214896a82525c5f6dc98bfce SHA512 3448c9cb65d6163730e2d1c2d1d47bf8cf39de7a6c37626ca03665c8c1daeb46d9b7e04f29517c91bb10c7c72ea70bae3782325701a00bf8a167aa38a761820c
 MISC metadata.xml 598 BLAKE2B 722a9172cf10dee20eef1fe07389756687afd524e33657cb8008835dafaaca8dea587b9f6c89b8d0427bd22b8d803d8cb857b1bceaf930207ab02aea75bbf420 SHA512 3db09f0090683381a27f3b75791d1b07d69aba8092ef2e8b69531bc1f318c5363cf2cea3be1bcc8299a20e9a1e54c7c2d8a5ec2d7ea808f82609dad12217f05d
diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild
index 2792f0d76a4c..66712d184bf7 100644
--- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild
+++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="Build.PL install path logic made easy"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/ExtUtils-InstallPaths/Manifest b/dev-perl/ExtUtils-InstallPaths/Manifest
index 0bedc182f336..c797be6235bc 100644
--- a/dev-perl/ExtUtils-InstallPaths/Manifest
+++ b/dev-perl/ExtUtils-InstallPaths/Manifest
@@ -1,5 +1,5 @@
 DIST ExtUtils-InstallPaths-0.010.tar.gz 18395 BLAKE2B 66e7f4128f70f1d316f3fbd9e9824533be5d49eefc509fd92706585134b85c2b9d55d59602d8e61a4548f9808b9abc9ab1586172be331b5c3c4fe74691e69ec1 SHA512 3639e8e05b2d59d1a5c4548d74e51158ce6e6b2260d2958f5500b7bb2f64470b72b8b9690e3ec917ff6db8baf0a81038178336bccbc272116e16b520cac73f0f
 DIST ExtUtils-InstallPaths-0.011.tar.gz 18588 BLAKE2B 35d10a3477837b00763ce039651d283d7a9ee047b68ab354456c2ff9f9abb9b4cdbb6b9869f0da0efa6080dc5f60ca22af7746c4e8a6f422cab24085f25702d1 SHA512 c31bfce1ba1094f1408409d9a50406d7eb974ce43195e968fae51493a7fd3c7112d41af561435233b14d2396df297604ec0c264bab910566c046f9f7b5b3beb7
 EBUILD ExtUtils-InstallPaths-0.10.0.ebuild 566 BLAKE2B 218f48e7224aeb80597aed0771a81518f7c8296db8b4dd959e5e62896c991db4ad74cfbba702c86d1b3f69eff61da50b53a9bb0dfe7abd6e75d528b19523ff13 SHA512 136237ee1965a8bb698b43ebe5ea804106368e0273e51ac9a72c99885dfada10b1a2559b86e853e8dcf0aea2b020b47534fde81019a3fc825f92ba39a59c09cd
-EBUILD ExtUtils-InstallPaths-0.11.0.ebuild 647 BLAKE2B 52a795592328e1d72958b11c7028ea63af919fed0c8a9615ba98ca33443bebff5bb5cce915e763a2d3abbf64ed2829f5c86d1df1c9fc0621ce2c0dfae7f5e206 SHA512 a45c0adbef874e18f639ec08440cc996199ec01ef9a89ebaa14e1ff68683680015ab23bee834c28146bf710f5b7d3485761f233d2768440dd5294f0cf489f257
+EBUILD ExtUtils-InstallPaths-0.11.0.ebuild 779 BLAKE2B 175646eb054b9cad801481fa9abdaf0be3c157ef7167bc998807cbe6d57b6cd195a1a8c5c45f324524361d1b292ae7521436ac0e9ee39639ba1fab11ac0ab494 SHA512 fbfcd1ca8f4dea5f1b048ae3cc818ffbaf73ffcf9a72453fc17c14107cc1fe013709a052df7eabee92b0386833f9a48a26da74d7af4224163d01967ddf9bf138
 MISC metadata.xml 402 BLAKE2B a472ac9c3aab745c81c5a097f9d033b4cfbe2895ff58ea4b2fd51ef9be3b179748bdb1463382a95d0ca2d0e0f1025965b5f3dc38e9bf30074c53a714896898fb SHA512 e54ec2e34cdb7a4825b4747b988bb2a534503dbac349d7a5e71f4e995586598a29357162197b62b4a727af8254c1f6247243edfb5420cf8b2207b915012101d3
diff --git a/dev-perl/FCGI/FCGI-0.780.0.ebuild b/dev-perl/FCGI/FCGI-0.780.0.ebuild
index 752a80b6ed0d..e1a7fd1da224 100644
--- a/dev-perl/FCGI/FCGI-0.780.0.ebuild
+++ b/dev-perl/FCGI/FCGI-0.780.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Fast CGI module"
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/FCGI/Manifest b/dev-perl/FCGI/Manifest
index 05da9ea67ac3..4f80c5cb477c 100644
--- a/dev-perl/FCGI/Manifest
+++ b/dev-perl/FCGI/Manifest
@@ -1,5 +1,5 @@
 DIST FCGI-0.77.tar.gz 90561 BLAKE2B 54e19ca62689e3445b78b762abadafa76bec7d9588b8061de5462ca91bb97f5dcb287c899af7a457bda603046db73d49d8877d51661725fbf4ec700dcf3e6144 SHA512 8586b6bb675aebc04eaa8b56fb762c292fe9f991083c447cbe0ba9ac943cd3e6e56853ba732cac9a6e3bfe8eb0767719794351ad3bce9550bc2df516819f47f4
 DIST FCGI-0.78.tar.gz 93598 BLAKE2B 5506f5d88a7db31aab61bb1f2fc3d8a92754252781825ec8d5765ea4c5add2a8ef03544c12c46dcd29e9ead360d97cb3f126c92591551903abc285dfa6fe6fd9 SHA512 d0932a70098ff414d23e55fb606f524bb36922d8733732c38d99fa872129f781af16696e72d6319bd897e8e9acc9deb4a26bc0f6b0913817f4f5be440eb21936
 EBUILD FCGI-0.770.0.ebuild 433 BLAKE2B 2d65ad6b0c963a9668a42a5231b01d390616a97986922870270d5a85eab23561018535c699e1d1afe6f7ce6127a121159e2a55a4a2a38387d7d2bc8dcd0d22dc SHA512 14d02d78b8d5b1d6a9f5cf37e41516d8d5ea3f90530a2292ecfcf74c2895fd1aa21312a0f89da8a2a912003db7506442c04969b475a909209710d3482d870849
-EBUILD FCGI-0.780.0.ebuild 421 BLAKE2B 4a548b12bb00c435a8f70359bffe9ee37beab231ebb67617a1612c3dfbf9c67d7f4d74ed0a49da36737e60734ef14ed3a831ab8e0a6b50c764e1ceedb83770e0 SHA512 02f5d1d30b4477329518722d6cda12023c06372e747156ff4317a17b74ad1d7f37efbacd3ab82d500191830cd5fd27937a526f5eb104e5cf59547983d48d6330
+EBUILD FCGI-0.780.0.ebuild 553 BLAKE2B d488b14297bba205c91904ce52ef1919ea59aaa1d5feb5cd7f7b13998256f1fecfe0798a7e2a514c458bb69643eb5ee930930f3e0287ef5cd0b0218390637cba SHA512 22104a4534330b605bd2ae0e157b3be8217791a56f03f8ada5105f3459e8b07ca5ff257b044810d2b1a3b9ca820f79e533dab6150b7f5152ac7edccb64599150
 MISC metadata.xml 438 BLAKE2B e8e07cf84113c2c530c44a729c74f6abc43bf5dfdb22e264a39e8d7bafec8d80ca52a8efd748ec78f5e6cb215f3df62560eef66696194477ad80084eb7c77f7b SHA512 e65148427f4d6c96d3da4165c6729b3e236c5050477263ff072c8e6e6740857909da23da508171cf55aeaf541b9951a470aa4ec85a63759554d97a9e3e190488
diff --git a/dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild b/dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild
index b3ab23ba60a3..c99b2aca94f7 100644
--- a/dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild
+++ b/dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use the Freedesktop.org base directory specification"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-BaseDir/Manifest b/dev-perl/File-BaseDir/Manifest
index 1ac9c3854784..d38c77ec0539 100644
--- a/dev-perl/File-BaseDir/Manifest
+++ b/dev-perl/File-BaseDir/Manifest
@@ -1,5 +1,5 @@
 DIST File-BaseDir-0.03.tar.gz 6065 BLAKE2B e94ee54a62c5015559cc0c7af97e054a61ad3ac5d70fc2337aa125556eeda95c74f7c868510ccfa41503ee8d361cf944fcab8de9b612b6d92cd36a23de758f79 SHA512 ed4dc0e293a830bf21eee02a68867c4350ce3b62d19543ed4b1528afe71af6fd57ecc974d48ecab155ed8110de7cac204b7494ac46e565738029ba4ef3eae068
 DIST File-BaseDir-0.07.tar.gz 9888 BLAKE2B 345c20687bc6c0d0096ab90a2f53d7d85667c12ca0f7c49e0e23e682dbc8e2f9876ec3790d3193b053b31f8d1d6c3db9a631dd1128662cd5605e093b989552f1 SHA512 782ed883f37aeb28c4c71a10108865b2cc152c2a7a6015f84cf775be452493a3f599182d213a934e48bd64ffc74369bea61ad89f26f8b7b0c2f94504f107b35d
 EBUILD File-BaseDir-0.30.0-r1.ebuild 612 BLAKE2B 9b50da0e340a7c44b15c1f4bb16b1234c799613e75890a18cd9c038ddfbf1a43eba1d42408ad290c5bd89b0ea67b7dda1593659d5889477cdc1b388e614223a9 SHA512 b68c05464a1fde5add664d093bc17c9393544b93b889fdc73db64ac8b5273d6b5aed36624aa2b712d8712be8f12b7ad9b2ea96a286fbfadcdb8e4687141ad293
-EBUILD File-BaseDir-0.70.0.ebuild 846 BLAKE2B 83da717bab1ced2da4286a5e7ae16d17f0be0b7f3bf4c5179d868d3b16276d42c7ff0092b0d7e95034a9d8d23e9183a6be8480c511e753d06b76df1a4934cbaa SHA512 18fb7c1ec5b5a8a62fee130ba1cb29e232d80eeef96bf246a74a1f3c7bb1f94692973494ec738db93ffadf226dd8e3b229f346fa2bb4ecc7392e95b30b4b19d9
+EBUILD File-BaseDir-0.70.0.ebuild 930 BLAKE2B 71d4020b34613d2f29cd7624cf98f6b65b4c09d8a4eb3add443363b2bffac7da387894fbec70793075a8847fd33efead80690564327a704599853e1930e13a4a SHA512 d5d5fb21f2e55ef19369a52a5525ab8d5bed9c2aa9ec6bbf41b684a4f64f45cb967adf10ebfa67551bb942ae74189a566f09ae901c3a9c66ad7b5f0855f84984
 MISC metadata.xml 519 BLAKE2B 875987e9e16f33472bc355fa0b6dbe05f0659d134c2e095ff64c758f20a26ca6fecb3d413d8308c0b3e91d35c8c84c250152ace8eb81de928aa1bbb386859044 SHA512 1d6892e71323a869a4f1ed70c1c32c0877a3dedfc13c2d019e833c0a2b230dc434a99821852dd52a60e35dd44e5254e51e7f6930fb8478356b495fca77905fc9
diff --git a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild
index a21c4f2ad3e5..f665c2e26916 100644
--- a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild
+++ b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="uses File::Copy to recursively copy dirs"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 SRC_TEST="do"
diff --git a/dev-perl/File-Copy-Recursive/Manifest b/dev-perl/File-Copy-Recursive/Manifest
index 9fd6ddcd8856..cc453d1dfe5c 100644
--- a/dev-perl/File-Copy-Recursive/Manifest
+++ b/dev-perl/File-Copy-Recursive/Manifest
@@ -1,3 +1,3 @@
 DIST File-Copy-Recursive-0.38.tar.gz 10843 BLAKE2B 5bba9545224c919e8de3e3bb48cbbd3b6707022cd4df43358c78582562c29f728688d91168c15e43b0cb6705cf65957c32c45fa2ba3dcfdb7b6a8530ebc70576 SHA512 49e5dbfc5bdbc554ad8a019c25db85ebfa55765a73758d95271b5f3de9550fd68b4d99aa287898d86bc6c11ea8de97469a85c53d4ad8534594b411be1f18eb87
-EBUILD File-Copy-Recursive-0.380.0-r1.ebuild 387 BLAKE2B 97e5d906d77b681734f3d670cd6652646292da038ce2f9c413d35049e4aedbbba54e074ceeb1aef7aca791cd3c45b1ac12de9b915c7db16ad524e9e82ed01c0d SHA512 597222303d0db06b4033cee71f3aa43967c178ad0cc85751353d0a6f7501d189079d45e78b57a19eb3073c6e225439f1bd8e126c76e08551ad37534654989936
+EBUILD File-Copy-Recursive-0.380.0-r1.ebuild 473 BLAKE2B 7866c863b9ace64b0a14ed8a589c18d07bc6d19e14257fe661e17ce3ccc13d3078fc95888e4ee7cfab1b976a79d2dba9f00aab424847aafc77479b198a07e653 SHA512 f00281261492528df8d5e6fae24400ee15f389dc92fe723f47a872570c1ba3dd0557d3edf43487239a740704549f1ee6fb6e9ce64fd78dbb305392c2b9bd0e74
 MISC metadata.xml 411 BLAKE2B e7ad5cf73916c9e73cf4f4ec8985c1e607ce601014c696d4b50f3b86133a7b811e292212987ea29146a103da68a1562230b13e0f7d4b6f3d2c56cfcc4274682c SHA512 e985cd6973bdcc89176854669990e5ae810cef2946925d89a2ca976534a4dd483861d30221e51704445dd3b80d1790ca7202b9a41c9c87e90736e51ea5f149dc
diff --git a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
index 3655b5b9093e..674d63cb8acc 100644
--- a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
+++ b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Object to handle .desktop files"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-DesktopEntry/Manifest b/dev-perl/File-DesktopEntry/Manifest
index a5c8c052eda1..83ffb208852b 100644
--- a/dev-perl/File-DesktopEntry/Manifest
+++ b/dev-perl/File-DesktopEntry/Manifest
@@ -1,5 +1,5 @@
 DIST File-DesktopEntry-0.04.tar.gz 13784 BLAKE2B acf4e611d2abb90a294a827b6c135aed88c7298af3f66860cc697538548187f2e7884fd7f17218b1b82df0d126d1300df526758759cfd85cd59d68b119b5ba38 SHA512 9582f1f226054a82aafd7cc74a924f9a635fa55f61b24c5bd4fcb30ecc8658ab098d782514b0df2bc29f66032cc416aa674bf7fe402e2afe96f018791265393c
 DIST File-DesktopEntry-0.22.tar.gz 18366 BLAKE2B accca0319aa3701cdfbe941f41e68e1ef1a28713ba557ac6f549cd3476df7635898ca2f6fc40cf99ad0ca86c1e42cd862468db2b59c4b79ce401e992a3e8066c SHA512 f6a0f2a91c66ea3e5ebac1e66f82317c4109d8d3e2211b4e84cd870b9df07320c03ee0d026e89f788338a1c02152c77e36402684da4f5a7093eb3ac21ff584a7
-EBUILD File-DesktopEntry-0.220.0.ebuild 751 BLAKE2B a0eacbd517bbbb9170e7cd8b391d1b030f1895dbed76b820655c47e7c9d8d3b5d125ccf3c461635d7407143735298cac17da30ee0b28c847b4819ff2dc49e48a SHA512 5e0a4c7a874989e7b40563cd55f5c880210912026ae78dc566fa1f16b3f71b49ab628be8ddf9943811cb65ba12f39d6c540bf8bb855ba113538162950875a264
+EBUILD File-DesktopEntry-0.220.0.ebuild 750 BLAKE2B 22aeceb433a710ff83088527c3b630cf9cd2fe701fb3b0d6688cc08bf32b811ff6cc2b3e5063fd9229825d0fd8f155068a7d73b5f9ccd594659a4c95fce6ce69 SHA512 2a898e92fa9cec54f6402a2e2d3d3aede1c3088253a03e5d5828a15227112eca74a88bd4a388b664de65678fd7c15bb8c90f5354b48c10f55cd924b1aba8aa8a
 EBUILD File-DesktopEntry-0.40.0-r1.ebuild 693 BLAKE2B 5fd9cbdcd91c503aa70f63291c531da18853bdc6945bb3df84572cc0197d6df94e37f475827e9184ab1c52f89f7dc30206323eb49a41e0d5d38f5c6420bdc1fd SHA512 b6291eeee73be961b6e8b97f2b5de0e12a41c0107335b61e2639db955b52b395e21ddafa6bb7780eef02c029d4fae76eca5562dab3e8f36a8a836bd03114dd9a
 MISC metadata.xml 406 BLAKE2B 188af9f87f30ac7ffc02f775edc9f33728812ce86352848013c03e4cf289e370085a016ae68c7055e5406b53c45f943b1c4665c2b5db5dd25826501729508bea SHA512 7132cce1914101f95c393eaa9a16bb56879eadd848ab0ab90735e1760ca0961657ed0925ae9b42e49f2061064795901ce4eaa02ae85ae1854c315f18ab219734
diff --git a/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild b/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild
index 37b6e1ddd180..bd0298f0c974 100644
--- a/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild
+++ b/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Alternative interface to File::Find"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-Find-Rule/Manifest b/dev-perl/File-Find-Rule/Manifest
index c037559fc8bc..90d4128421df 100644
--- a/dev-perl/File-Find-Rule/Manifest
+++ b/dev-perl/File-Find-Rule/Manifest
@@ -1,5 +1,5 @@
 DIST File-Find-Rule-0.33.tar.gz 15207 BLAKE2B 1f6779bc5400cb677b7953c97a62ff1b8bd74e9192d3ca592dea251724b1d339d671301bf0b8ca2d72f1079835f53169073f24dabe54abbd7469584c2109313e SHA512 287537a39e4ceeef6388dcf27c6b10fd7aceae7ab55b27f6acd608687ae695f964703e5b2ea2efbb57f7e5a6b658d7637fef5e87695fe39ae3222f8c7808ff31
 DIST File-Find-Rule-0.34.tar.gz 16165 BLAKE2B 5ea2d8b34e7115ea1ce5954df7b52d394e967c14618c9ab3c7458cdf9a9122b0ae3e8135361df05a1a551de4853ba04546f89d4859cac9da5e64e20f9e1b1930 SHA512 97328a86578942d214f7ac530cc88fc84dc7ef2018db06b8c0c58907a4045e90c9c97d1848ed4f16838bd8ca591aca4fa9f24649c81fd8dfe9efe7a2f9f2722c
 EBUILD File-Find-Rule-0.330.0-r1.ebuild 552 BLAKE2B 396a61b835b09d6e5cf5f3ee26655be79f4a981df75af5d61c7ee2a50df00599663098b38a983558d84a8892bfd3d876b22940ee30ce333cf587f49fa68db99c SHA512 17c9cd5fd7d55b1eb61ecc02caa135ff45a694373ae95ba8809e64366d68e5f8779f7560baf4e7c1ecfddc989136dde27339254d4bd777aa60a4830f45886045
-EBUILD File-Find-Rule-0.340.0.ebuild 568 BLAKE2B 59b6cf170a08c51d4272bb845928d2b9837e3384b9e0d2a2955cae61bfdb105e52e270b773b2cb85e3d7a1476f10c43dd5a038cf1a1ca3d99188e382244ee59b SHA512 1743a2cc5e368d5a429a87c134eaa445d39fe17f5b39bbc3ae5b20e1f388abbedaa1ff1eb1e85a25b7da6110c4049ab9b494d5793bccdb51ecc5e38f17a18aac
+EBUILD File-Find-Rule-0.340.0.ebuild 634 BLAKE2B 6ca84ab202fbce1023c7d2480b07ffa9aed42860eedbe12efbf50398832c774133a67336e97dba91cd5b8abde8436acc8dc89b6434078932cf8e5b293b22b941 SHA512 c3a440f1a1dc6653ee3912abc729cee92a9ee92d2d0866f72b5829179a22abec66630a010ae1769de3bbfd98f7e42e879fa5c4af6fccfda2e195677ac9aa87c5
 MISC metadata.xml 477 BLAKE2B 07c35ef70c2ea16e726923d764381286b4401a27cde5920fd91663401b7ec880e9c112d4cad0c006eb2f38de26915e33d957163ac0665dfa1b667252bf01af89 SHA512 e31e158a343010b4c52a6aa9dc1ef4b2ff18909c65f68bfc3c21f00a24e2dea32f9bf29826275282b624306601deea4f90cd367113cf97a191f4fb8e1dd9429a
diff --git a/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild b/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild
index 8a337a873e32..b21299fb1ed4 100644
--- a/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild
+++ b/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get home directory for self or other user"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+xdg test"
 
 RDEPEND="
diff --git a/dev-perl/File-HomeDir/Manifest b/dev-perl/File-HomeDir/Manifest
index bb4d44bd169a..6263a89b5134 100644
--- a/dev-perl/File-HomeDir/Manifest
+++ b/dev-perl/File-HomeDir/Manifest
@@ -1,3 +1,3 @@
 DIST File-HomeDir-1.002.tar.gz 35441 BLAKE2B 01cbebbcc18958cb0056160383880c9749a1e43a4c27e2da9d6a190985929b53b25d3cb50d84766a1a9bc9607c64265c2fd622dc1d0eb4884d7c799edb02ff12 SHA512 4862c78f65785579d4978d3c4d36ba2a71fb78f069b5671d0cedabd6d187fb4377ae40be45b0abfb00df8dd362fbc28032aab2f39acbbe9f1d7bc4a5b24863d4
-EBUILD File-HomeDir-1.2.0.ebuild 663 BLAKE2B 10ec062be708a4dba42c4ec2678009a55100439cf8a723b1832dcd429374b47f9e5a6fa87e2acafaa4984f06b7e7d090554d9735066aae7a1ff3b0d37f776b3c SHA512 92c50a0d338783bf7bccfe31542f488ef8d7b13022a1575b8b1cc6f5686be995eb082d6927515c1969d29ab4d63a5fcc329de7ab1a80266ad8303cfc339f1039
+EBUILD File-HomeDir-1.2.0.ebuild 751 BLAKE2B 94ef55c1701c0dffcc874e6418de489c58729a4b07484fc9e06b46371b736b400b282cf52e27847b05d0e0a40eab08fe8c18a50c6400b3a55b81f6e52f40575b SHA512 e18fbde525c7c2827461b4583bbc72832d0789aed8740b481d464bfe937bb6aa1b80583b90a4020b3155e46de7ca40d6431acefd8e6f09e57aa30d8ca6f002fb
 MISC metadata.xml 1202 BLAKE2B 930f6cc4e23ba7ce413f766fc818a880c3e5b561da84a2c08b2ccc9241d4516ef1581d75353d5df1dbb85f9f545e2c0290eb48c9394092a7077fdb28aa72f37f SHA512 287665e99912ca54ea9ef3e288f1398a34c236d170067ad6c227cf87e3ea238083a902fdbeec6acb32ee4b7b4a31b1c27d3212e389abe17a7e64168ad6275f18
diff --git a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild
index 7230e93fc14c..59c47122d211 100644
--- a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild
+++ b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Install shared files"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 PERL_RM_FILES=( "Build.PL" ) # Using MBTiny is stupid this high up
diff --git a/dev-perl/File-ShareDir-Install/Manifest b/dev-perl/File-ShareDir-Install/Manifest
index 7b206f15b79a..22999c415a13 100644
--- a/dev-perl/File-ShareDir-Install/Manifest
+++ b/dev-perl/File-ShareDir-Install/Manifest
@@ -1,3 +1,3 @@
 DIST File-ShareDir-Install-0.11.tar.gz 31187 BLAKE2B 4be6bd829fc9b2784069ba3ee8f54fadd390e3bd003d43a7754f3469fc14c01a5587044f045abe806688ed4442088256264d983ccf4080caec8b8062912e2acf SHA512 6611f6c3221ec52db7582f30b2159dba22ca8d899666526c069298b3350ced9e3b46872baaceb30f7a27e3c744c929ca4967fa820d14bbfdb41e5ed5485a9f72
-EBUILD File-ShareDir-Install-0.110.0.ebuild 725 BLAKE2B 579f1d9f319912a278638bcda40b1e567e2d37088e66cde4f4faee92d91c746768efc4ea4a1300c684c4585e4d520fe8f4f01f4709c453ee93834c2103726b5e SHA512 fa44373102469ea124690d9e68e61f47ef219920f2d801c91ee92aeec4fe970ba8e5263457434604dcc2ecaa6cfd36492a717ebdcc420a0513a4c2dbba1d60f4
+EBUILD File-ShareDir-Install-0.110.0.ebuild 857 BLAKE2B d3a8781e93698fbf33d9013b95f29634e80326eb132b0be381b59b294bd8ade7c36ae513cafccc8b55f6b1fa662f3a2f0eab944f9de9545e519f5921e0bf8764 SHA512 7e9f3e64ad2583ca3915db16ea2d71057d15e4724c77b50d3f17292f44058d8063cdeb8d915f2fe82531982be854246233d87d04bf9bbb053f5f4e02b34de16c
 MISC metadata.xml 415 BLAKE2B bb5f387e0912230ab8096ba0ca1542b30665647f37d0989c7dc11619978bef2ac9e64b0668f46cd70205fc20b820f879657e705a96e35e481aa98388d232db5e SHA512 0bda1e6c71c01da3c4062b9d29b71377874971cebb570d0cdc5289680c864f5ff6879b557698ef4fadf86475ae62ba6904d59bd85a6bbda3be9778f4f21eb986
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild
index 9f1abb1846bc..63b6f422c095 100644
--- a/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-ShareDir/Manifest b/dev-perl/File-ShareDir/Manifest
index 0a5bd1ea4d43..a0ed3b60a8aa 100644
--- a/dev-perl/File-ShareDir/Manifest
+++ b/dev-perl/File-ShareDir/Manifest
@@ -1,3 +1,3 @@
 DIST File-ShareDir-1.104.tar.gz 20500 BLAKE2B 567327d46e5ecde5c3ca8044c6ff7af5b502ba88a35eb3d697f73732338991e0402b1d1143f8ed364a4d76162996344bd0bebf91695e2242be3b0d8185ac2f23 SHA512 0fbe1a1b822e0de324fd05c7cc230a1022e74eb7ae9ec66281b57d2c4144a600f34395cfbfa08218b64a88cc2bbe3ab94abb6339cc65aef19a82191e1ba2ed52
-EBUILD File-ShareDir-1.104.0.ebuild 601 BLAKE2B 4c8fd28a4eaa24bb3e6a3f1c21f31b09f1b33d7474baec46d2ba31ebe8c02fc566133b0118267e6a594520f46a4845c3d3e5627ca28953a6424ee42ecfa71a99 SHA512 90b67faf0288a62cc65b87e3d1df1d71fb7c138060dfc9ae6098bd747df27064ea347e656e7501fad8529fc651ab847ebee4c02331c69199fb2270f05aee0d16
+EBUILD File-ShareDir-1.104.0.ebuild 711 BLAKE2B 7af194cf52e5f880c8f24457b783316962962e67afa9056a23f555f9f3c79c95d3fbd068cee41b6cddc7e6a1acefd28af325d9907e2faa985d993bd7ddbc0485 SHA512 72d9c75f68661420fb1c7afea5b20de412653964e8a41dac9b32ba21df187950688632d4cb5cb8dfc863a210bcda1d96437e0eabfe47f6a7286e344a60794850
 MISC metadata.xml 398 BLAKE2B 393f7f6723e23146e3c509b6fe955eaaed1800a4fd5b07bb01e793a4f4fa4045e75bb9e8fa19a7fc3ee424ef4e890465fdfb1d33079fb05771c8ce3b6ea9a185 SHA512 f13082c7aa0e876a02c76e56d91d53fcca5e0bf56b4b32c8219a4f18349287d07ad93f61bd2db22b213a90312534112fbe2d7cf493dbbc91633ef63115bf72f8
diff --git a/dev-perl/File-Slurp/File-Slurp-9999.190.0-r1.ebuild b/dev-perl/File-Slurp/File-Slurp-9999.190.0-r1.ebuild
index c02801557410..c2b2b1229c21 100644
--- a/dev-perl/File-Slurp/File-Slurp-9999.190.0-r1.ebuild
+++ b/dev-perl/File-Slurp/File-Slurp-9999.190.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Efficient Reading/Writing of Complete Files"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/File-Slurp/Manifest b/dev-perl/File-Slurp/Manifest
index 4de1673437c7..77bd6194409e 100644
--- a/dev-perl/File-Slurp/Manifest
+++ b/dev-perl/File-Slurp/Manifest
@@ -1,3 +1,3 @@
 DIST File-Slurp-9999.19.tar.gz 39927 BLAKE2B 3f6360ba8a8f69e4e5b565e20e6c81d7d32e358db31aebb63de0ccb9d8eba5faf0652cef7c8f49f2b858d7f7af5d5a3d8215044b27dc47e2c1f741cde7afc769 SHA512 3fb8f452d625e321e77475cbc7d5672d53fe49945581561a0001be0a9464e67659303271648e102d52b6ebd04c87afc7432238fcade0c098f584f3b58c90ec82
-EBUILD File-Slurp-9999.190.0-r1.ebuild 490 BLAKE2B 95cb0ea28de7a5893f3881f056b6735633d903f9f8a9eb0074064957a0e5a847655b7946d7e66422fe8cbdac4280c913f801e7e82ec06e13b0058011bdf50105 SHA512 fdf51a8e782ffbcd0690925248825b6107bbc63ee33474baab14e4e30158fa7e69fdca48b791efb42e04942e69278899e2f692c47ccacceac56d114302faa593
+EBUILD File-Slurp-9999.190.0-r1.ebuild 539 BLAKE2B e0b669931ac3d313999b6f78ba950bbf63a4f7083d4750b6c64d38fe74f96f666e7bf30d54421184e629afbedcf0fc424664ec7464e0d15ec052d9068f06ba2d SHA512 d461e8efbc93907392b45db8fade7cde97c8819578f0d09ab092c3f28a1bf82f77f9d9a34f9103d4bfbaf006622952df7414ebc420f122d99d0b066732c9ff10
 MISC metadata.xml 451 BLAKE2B 15ff0a94819e3233c2d898508a4204c17e89b3e570825cedb83a4d2de58d2b259d9defaa08fe4cabfdb6620e881390303e65f1b984cbe363fa4f7eb8a0bee173 SHA512 d8698d1a0d64ad6d0188edc7fffd2167d857a26652e99a9b4a3908cfe13552951e31b43663a7e81cbae18956ebfe89f3ac9104462f675ec71daf1120af40e1c0
diff --git a/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild b/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
index e9bbb40a886b..5a4657bc3fda 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple, sane and efficient module to slurp a file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-Slurper/Manifest b/dev-perl/File-Slurper/Manifest
index 5fef3e3ceb03..0809f60b5b23 100644
--- a/dev-perl/File-Slurper/Manifest
+++ b/dev-perl/File-Slurper/Manifest
@@ -2,6 +2,6 @@ DIST File-Slurper-0.008.tar.gz 14760 BLAKE2B 9b6ada68af8de801ed11c5e82d3e81cb164
 DIST File-Slurper-0.009.tar.gz 15858 BLAKE2B f7ab50008184bfba6b47c1122970a5eb294beac8928eb97d7071682c3e59cf78a3708e5f28a342be19244eeea6d5076b100b7e1290ecf728b0fa905ded9d3d0c SHA512 e07074eb5470df75c43848d9bd2e0c5d3bfabf3b6f9739e67d830ce87f4f38a3a569aeca885537d0f9c7d2e285e52f7dfdc27f8035ce0d74d6c750067959f057
 DIST File-Slurper-0.010.tar.gz 15905 BLAKE2B 92ead775ff7c796c0cfc7631160e7483b9defec4d603e9d5a7f7f3380788f6af2a2463f1c0fa66f21339f8a61651e4e9b48ffc829ba9765158c911df4531ec2b SHA512 a6e2a86d76d2e4c49a8df17a453a3da530cb62324cb91793c4bd6e7cabc4f5b4b4fadda8aa0f98390ac950a94a4b82cb3ec547caaba88bf61ec0aa086e298832
 EBUILD File-Slurper-0.0.800.ebuild 363 BLAKE2B 41bc6d5535a9143034dcefbcd66347c298a154965b0e2af2a8bda377796b9e0d2ee197293f9680dd9b0af5c46139ac5e85f67645f7a6efc4d70990b221a50ec5 SHA512 5fb3db96a682ce5c3eae6d948d4cb416b5867a3cedd1a20532743989c9422061ff3ec8e2f1a3ffaa14f0d67c77c14afaf8f3b31213d9223fea59dfa37d3eeea5
-EBUILD File-Slurper-0.10.0.ebuild 649 BLAKE2B 3447283da7fe633d3e1a836c7346f0f28862f3b6c89cb012e130e529f095a9c7168fd4f9c19b0d26f87e17abe4d88dd7c3548a5323906074336b435624e053cd SHA512 60be42f4a29a910d4c27b46d61c6796215c4d704045c7d09a4f2fd0c39e133cfea98d00f243a020c0de9f23b28fb9de56869f667d0e3cce436626d3861660121
+EBUILD File-Slurper-0.10.0.ebuild 781 BLAKE2B ad46f3b09d22a849a02cf3fe88ab97edff20a71352b3874e1c2379741a1ea468fd715e3eb212105789b690f98fdb1ea45c4b196143f932042ca8375dc0e1a6c1 SHA512 5efb54fde9e85a4c00cfe8df04a2eefd3fb21797586319f8cbaedd6a72bab26e528af91dcdc6f751027d168ca690f64000a8570176b22171b69e91e5ef1cd254
 EBUILD File-Slurper-0.9.0.ebuild 646 BLAKE2B 01d5fcbd0709f9e3b8e01a7a7df3fb5ae2f58d03242c6c18056b7a6b824b079b5237eefa534e249a82ee1a2ff9feb58ecbda8a6ed208ebad65ee498395b757ae SHA512 2317597db5c0caeb10e8c9a3e926b82383e09ae8d6a560fda720b153c8f2bd3053627fd89063a9b8d90bd2041a38e8c4f8956fc796090962db0e7a32389b8eb3
 MISC metadata.xml 481 BLAKE2B 2f8f554f6beb1ed6ac889fe379ff15c4bd76fb8ad050ea6a14f400572aebce11a7bf91468d62ec2844c00c1827928809fb48344f326b55b61f3e4913842641cc SHA512 62906c3487d2b3b8ea9bdf5a5d6fd6aaed39500bc41346fb918363771220742c31de061eb825916f3897a229e8b92bbff87a9181551718cc3fde1eccd9b60600
diff --git a/dev-perl/File-Spec-Native/File-Spec-Native-1.4.0.ebuild b/dev-perl/File-Spec-Native/File-Spec-Native-1.4.0.ebuild
index 5f5d0b513f6f..5d9c09a7fd51 100644
--- a/dev-perl/File-Spec-Native/File-Spec-Native-1.4.0.ebuild
+++ b/dev-perl/File-Spec-Native/File-Spec-Native-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Use native OS implementation of File::Spec from a subclass"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/File-Spec-Native/Manifest b/dev-perl/File-Spec-Native/Manifest
index a2e0937d325e..9abe1da857c5 100644
--- a/dev-perl/File-Spec-Native/Manifest
+++ b/dev-perl/File-Spec-Native/Manifest
@@ -1,3 +1,3 @@
 DIST File-Spec-Native-1.004.tar.gz 20265 BLAKE2B 63d5a16d7afd7e09514bb4eb27b5c1be495dbfe8fe0e782859c4de8eb01cd8f32dfca711a80beefefd91930832708d9329af7e2514000fe4cdb411616fbef40d SHA512 0c59040d13377648e6a849f8634731426b38e596ef3399db4acdef441194720186241ee02f12932d39d45fe5973feef7f394bd4c8f1d8459adbefeaa83adf6e1
-EBUILD File-Spec-Native-1.4.0.ebuild 502 BLAKE2B 826ec478435654af7d9b8165cc8f81716893127ff3f96940129e231efbef8db523d5ec47e821d75a32b63128ab869b8de15ae02e612657f6f804f4af55c629ec SHA512 b309574bab50dba112220bb03e7e5c98552700b23ad6695538361188ccc47f9c3b23e7fff9eb3fb8fe87a04b76f21b69387d816be5d2588bc423a8a4ba698f5e
+EBUILD File-Spec-Native-1.4.0.ebuild 634 BLAKE2B 6efff3a9c9ef85cc94973d1f777d07979c369dd44d6626efa18a9c93fab8127809df4dd90aa3be4a7c996dc887047baef7ca67934b7dc8b24d2924582bc89810 SHA512 8a1e3b628f591b574cfd9373222adb8da558c07b2fd3eb7bc5fa079711f06dd3e31e1f6c3dd6c278d2a6e9beedcb4965c6c548bac9c4064fd4e5cb9586b81f4f
 MISC metadata.xml 405 BLAKE2B 2ffa1626e2edee60a058506a4388d2251c08e16031c9f51e5a7416a9e33407fd072a8f449d46349e339ea9238f8d21861a021b651a8c972c7c10b14028c7730d SHA512 476e6280e833e3547f4bb81a8ff055469521d09143f6ecd9d2e8e2906ce1e85c7664fe5b1737e6d75201dc00b9c8faaf26408b995b730e99ddb793376084d93e
diff --git a/dev-perl/File-Which/File-Which-1.220.0.ebuild b/dev-perl/File-Which/File-Which-1.220.0.ebuild
index 8d53dd60e25e..4eaaa3cd03cd 100644
--- a/dev-perl/File-Which/File-Which-1.220.0.ebuild
+++ b/dev-perl/File-Which/File-Which-1.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl module implementing 'which' internally"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test +pwhich"
 
 # Was part of File::Which, but depends on File::Which
diff --git a/dev-perl/File-Which/Manifest b/dev-perl/File-Which/Manifest
index 48124f91a7d2..916ef50b0c5e 100644
--- a/dev-perl/File-Which/Manifest
+++ b/dev-perl/File-Which/Manifest
@@ -2,6 +2,6 @@ DIST File-Which-1.09.tar.gz 15637 BLAKE2B 4025269dba9b3b373a1e981ab81b77fd9f71a2
 DIST File-Which-1.21.tar.gz 21456 BLAKE2B b1a207b1fd2b2860d385e853b6e733baf843c69f944e64dad17520f7e65e9c1ab04d1d516b6b160150e39a4d359f02e9b4c065c9e13380e22a054bd242ac52fc SHA512 9b75fbd30250820adfefb5c0239d7bc704ce9f84062cad9ff9c033c97ddf32064de0adef44847c63d8af3d05b30da15996b3d238261ea2fc680f76fdca627520
 DIST File-Which-1.22.tar.gz 21685 BLAKE2B ec2ecbdaf9e5f25e2d8928611a63438b0f2372f46c400159fcb3276ec8f03a244feed36d388bf89ca0abf3f844736b25abd6fed49d80e325e22a763c1980df1e SHA512 9efd8cc6d08e82a429ab3b0ec5193cb894432311338dc4cdcb73b4536a40bf4829c414e75e5dcb0d03b9190511b232f1d27e441657afa7299b0a5b882877f2d1
 EBUILD File-Which-1.210.0.ebuild 672 BLAKE2B e552f532f07cbd9057dbce898b056d3a1098e81dca717dc86e7b0c9b1f7d8711b05f03e50dc7b7b0c061d492aa4ce7c9b42630337aecc90b81aa637fc33ffcd7 SHA512 17b41992c57a982a2c4a3ee4db58eb5ed8462746b70de2307105d895e435bbf4d58860dade2e93e9bb812917e5813dbda785b29f8953d2071c6bea02f3f3f4a3
-EBUILD File-Which-1.220.0.ebuild 677 BLAKE2B 127af8ed747e96bf18e3b47f2546f5f177a6c75ef1582b1bbbba5422a140b8c4886dbefa679ccecbf5472d343496872ee142a6741ccf43d3dcd528cb7e1951fc SHA512 4df6690cc4b339010a6f54fbf29dd9676581b5f651ff706a08bf0b79605023771041222995b8a1e51144de37682dffe2fa9bf9e5de6afb73725c3fd596d46872
+EBUILD File-Which-1.220.0.ebuild 718 BLAKE2B a8a596045f2f3933d64342ea1e6f84095fec1ca876694d596b6854931be3f4fbdf9d178ee9e6fda34a3bfece9230f970b5726aae48aab90d3822cc888e0b3efb SHA512 6a9a2fff3ed400fc217fa1cffa14c239b79d6e9819d4d74217c3671fc29e093aaae5125dc6df92e6ec0f2178c0af0b2396379580561fd7c16861581ea9cbf43c
 EBUILD File-Which-1.90.0-r1.ebuild 527 BLAKE2B 4129f291e90854357d90ee0814d6701391bfd7eacc3982f38a49f1597ca2b00c4f42a68515e9a4b72251eb3600a4d30b7552ccbb96ee0fa31f3ea16a8d8cbd9a SHA512 82f7c7117aeec817d8c293e92ed9b3aa3f2d2950b94eaa841746ba9eb90df01a3f3069c6d4ec24381d6a4dd0e0a205252c6e32c6719f4d747628d0d25ea27da3
 MISC metadata.xml 519 BLAKE2B dad66f597916a87de8fdaac5afab5aac9a4f6aeb21e492a2eb61e15bcd354cd3e4d2dd02934b2463553c8f774ca945859103d4d127ee13c843f5cb8752dc0c95 SHA512 2f7f593061c1a254bdc712c25723fadfbbb70f9d680250cfd5d8077608dfe27f8472edc2bcf1ea50c029a1b36ddeb58cc1af900178275d6ea6720e4242a33a49
diff --git a/dev-perl/File-chmod/File-chmod-0.420.0.ebuild b/dev-perl/File-chmod/File-chmod-0.420.0.ebuild
index 0a854b04c1b7..6617d5fdbdf4 100644
--- a/dev-perl/File-chmod/File-chmod-0.420.0.ebuild
+++ b/dev-perl/File-chmod/File-chmod-0.420.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Implements symbolic and ls chmod modes"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-chmod/Manifest b/dev-perl/File-chmod/Manifest
index 78a215341925..3dbe283e6646 100644
--- a/dev-perl/File-chmod/Manifest
+++ b/dev-perl/File-chmod/Manifest
@@ -1,3 +1,3 @@
 DIST File-chmod-0.42.tar.gz 24940 BLAKE2B 9290ae39f13d48d55741609285fc0b330dcc18acfb79c1c7f8966082122cc3fc560b975b7361de50f552eb19352ce2a7d307813a110c2f06c0e356c0efa227ed SHA512 1b6bc41c43434914c0cb160a063f4cc6cbdfef85233b962c5a6885a23aebd7cafe05eb2d59253c7dc7f1cd323cdd3888d82a6ce19a9b7a00aaa8212d40c064d8
-EBUILD File-chmod-0.420.0.ebuild 587 BLAKE2B 9537a0f90a05b69f18a6570979a3d66fac503a2de2a13dedb726d5a70b54c8224dba211815fcaa8120ffc2915d29cecbcbbad4af656d9e3c62b90db34acaca6b SHA512 393707c16d2b1fc428adfdc4cde50dc9cfdde7c4aad248dd46065c2f41095d19becc0d0fab4188e197d28e8f68b43b72b4ea1e42407cb847cdc407863da070a5
+EBUILD File-chmod-0.420.0.ebuild 682 BLAKE2B 4a821c7925130ffd78352eb47fc8ac07d2b4e7839b2e6b2d4133e1b7e819d72aa7c82731342d0950787ab825e647805888fc8afa9b090837107d35491e9f9ba8 SHA512 b5e7b830d6ffd7af70c79f24a8a1324b8dcba625d7ac435ece9875b95b6bc6ae289f49956f097c21b93473489c6a13b9794a8c80c6c54c09184e70b59c4e7ded
 MISC metadata.xml 392 BLAKE2B d97b9d8fa15a9800adb6116454bc3f576e92aaf9236d57a1bba4c5d1f2cc4f9e36d544e6a908e7e9fe76ae1a1fc8816529a7b179719091cd142b762cd4a01872 SHA512 d18e4b138a69977171713d535162eb1380693a5be64504b6d37bb035f319b044f71052f5b43473db0026702eee269b44f1ec3f39c63b4ef143d728300528fab8
diff --git a/dev-perl/File-pushd/File-pushd-1.14.0.ebuild b/dev-perl/File-pushd/File-pushd-1.14.0.ebuild
index af7f98a3a936..684284fa02c0 100644
--- a/dev-perl/File-pushd/File-pushd-1.14.0.ebuild
+++ b/dev-perl/File-pushd/File-pushd-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Change directory temporarily for a limited scope"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-pushd/File-pushd-1.9.0.ebuild b/dev-perl/File-pushd/File-pushd-1.9.0.ebuild
index a842e1ddb6a8..f8668b88e79e 100644
--- a/dev-perl/File-pushd/File-pushd-1.9.0.ebuild
+++ b/dev-perl/File-pushd/File-pushd-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Change directory temporarily for a limited scope"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-pushd/Manifest b/dev-perl/File-pushd/Manifest
index ffeb6e30cc8d..73469822a6fd 100644
--- a/dev-perl/File-pushd/Manifest
+++ b/dev-perl/File-pushd/Manifest
@@ -1,7 +1,7 @@
 DIST File-pushd-1.003.tar.gz 13984 BLAKE2B eafdbb3950b4d30bcc76f65f1c36dd00441d6887e96e03a12acaf81288d21b407399b6bbc5b083eea8a275e6248a64b0872706d30157d89ecc5f34fc61236c51 SHA512 a93cd9332eab8a095e1d85002c4d3c7f7b066231decc028ff19a6946b218d377a834dc1db6b51c45a18ffdfa7db4f091fd8e8c268973199187b02d3462563fd2
 DIST File-pushd-1.009.tar.gz 18933 BLAKE2B ad84563bdca16eb3fbe77b7c8b6ff79dc8b66415632dcb84fdf1fbd7255b3c54ddf073bc40c5da13acaf8ef6308b5c2fc8bdd56b35e79d8b1282b642af1e3461 SHA512 d0644ec0d7921137844a91bbd4e566408756c1603bca3d9b19102b1d3d3b57da3da635d2364bdab0e54a8f7f0d9769b6eac52f3492dd504f978d5b7b7d824080
 DIST File-pushd-1.014.tar.gz 20674 BLAKE2B 0e06d1c527aa2cf34c2d55302ec255e4aedbeded7a9c3cc0c4d40bec0b97ddd3c49fa13ee1e36764b9ef17db293cd4c63580bc471a723bfe9eb717eabc6f2aea SHA512 f81b852b6c64d330291b382df83b6cd15c807bbefb00fc51ccbf709ee7c6deca57f996cbe86322b81adf0b14e608d4f63f969330561b7c25a4a7b32f0e3df6bb
-EBUILD File-pushd-1.14.0.ebuild 613 BLAKE2B 9371dd4c87ca15dd4f0203e1cac48d11319f667232853573bf6d4f80287f936708cc6d81ddf2a91f1b3015ad87b097b0880028bf03ed602cf1c515272a70d484 SHA512 b9792729ca30c4e25e2e7fd56c45586a42f59fc73ebe9dd257f33c2aac834a2b4f5cf3267ab336f69407ea65b4e9e407cd6ee866a5bb6358622566f1e5686a7f
+EBUILD File-pushd-1.14.0.ebuild 745 BLAKE2B 1c7fc1247cd75ebb5c05948bdf860573878b4e0fa6ef23e2fbdaa2cf520739b3ca06983bdf1be1f32c3abfdc04ececdf844a2c4f5ee343e9254ca76b77ad844d SHA512 1caf7f54a5b67405aa4895b61aeb771ce90a3ef11904c202a9a9c0b477ca12ad450d4003d6962c2d9d7007398a78356b149f80fa120a0639b6570a394d233b4a
 EBUILD File-pushd-1.3.0-r1.ebuild 341 BLAKE2B 434dd58242d6fe88842cea62e888b9ff9d7a684a2f7fee7130a21b2f15d2824dec0c9d35f56f7196b681e50495f1b8a27b8da24e49e905c4174ffac8cfb11572 SHA512 cf980ca8930dd34292d2f250648c667ee915da2211859b737f00c85685ec52bd9e43ceec696093968d7e7d298b3872cdf394601cf49efb241392f4051044f330
-EBUILD File-pushd-1.9.0.ebuild 649 BLAKE2B 7f6f65034af2e861e65a61fa2a33698cd7c382d57b3ae050ffd7e00c4ad3b7742e23fe4851b0b4cf7c7ab79165d0748833d0a8537d5ebfb7238d30dd16e4bed2 SHA512 c070fbc9b193dff419d4e592b4ee1c26a3535936c12ddc98409424e6b223b0e1bf6a25cb114e9dda024dcaec25f897ca879d42451139c4fc77a335dd52d1f61b
+EBUILD File-pushd-1.9.0.ebuild 781 BLAKE2B 3f9aa290c30f4fb045e5edefa29849d03b8e118ef571694ff27fa4fb115097dd1682715036782ff4273d92df80a7e0814799684a9df35704d25ac1254d8650bb SHA512 b2641a6900584ac475c873f3d44ccefadcf40244a48c3edbaefd68067d887e137a1af0b4930e9e7c2ab83837ba5a4ee147ca992c8e9e53b0f20f9e9f9109038f
 MISC metadata.xml 392 BLAKE2B bdc5e64729f046e151159ce2c8003b077054d1196a911595c80be4becab313fbf90a3889334d76e661497e4a180cf34995c907cff823271772eac0cc0ee97c8d SHA512 af0eeb03c65f2b1b820087db10cfb986f176dcb78f23ff98e883e9f31878867d5fe6d161f01e9c5baefdc80fdb025c1623f50993f83df9cd24405846ba4c53d2
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.103.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.103.0.ebuild
index a3cb53187d6a..f920a7354498 100644
--- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.103.0.ebuild
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.103.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Getopt::Long with usage text"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 CONFLICTS="!<dev-perl/MooseX-Getopt-0.660.0"
diff --git a/dev-perl/Getopt-Long-Descriptive/Manifest b/dev-perl/Getopt-Long-Descriptive/Manifest
index 00d8f76f0a61..a41fd677ba8a 100644
--- a/dev-perl/Getopt-Long-Descriptive/Manifest
+++ b/dev-perl/Getopt-Long-Descriptive/Manifest
@@ -1,5 +1,5 @@
 DIST Getopt-Long-Descriptive-0.100.tar.gz 31366 BLAKE2B 09fac34156dfbd22f3d14f85b44c0c327e0d6e7b535d2c4b80a492a1f4ab184b85d7b14456c375ce6cf882c69c4e99e3341a6ee764fea6ea966b85068a2410cb SHA512 0efd6f707487b9b44d5c3b5c9e46c3718546e44bf1b66c198be6ebfc922e7bdb23a9c57c5a9c0985dc3769617141696750e1bd982457247b679e3bdb5f9f16c7
 DIST Getopt-Long-Descriptive-0.103.tar.gz 32683 BLAKE2B 9e457690d61e8b2330761ffd09174403d7e485c80af84d2cc61b7443762dcbe9832a15c589b729536103e80c75556f60040d5d1d3637a5eb3226bf1cc1d57ce6 SHA512 9229575bde794fa1213871fbb33a12222737d7979cf4c290200fd85c7da9e3227539809b8380a88a85675429ceb61e505bac8cc4e1408ca63ba92b4e1b33149f
 EBUILD Getopt-Long-Descriptive-0.100.0.ebuild 920 BLAKE2B 85c8cde8988ccc34dce08e18bf549956026f8e17a79bacb8699811f24b23e3acb8d8a5318119c796eba7fd61cfca51c5e3c8f3c02c131e31acd373c4929ed3a8 SHA512 249379860aa7cd2f4e60364ce1779e53fd9418ef87e4b124ede4285aba54ca6aaf47c41ccedb123e79a89065c62a54097b68213c0b47db65e7398952d4ed830e
-EBUILD Getopt-Long-Descriptive-0.103.0.ebuild 924 BLAKE2B 5fe47dadfa9029c95caa93f42ece82a2072f3ec62a328018cb19fc2bbf286ae9f4c47e60261be0b53393dc7cc726077dfd3afb6cd51f1b4134826beb9b7a77b0 SHA512 8bf425f2b24d7de71c8ebb3902cfb3c2aec242dfbb1c58b7d9d8c17375a5335c9d11a078893b3793c791e762fd7408b794bd8242a753f8b678b11b916b9653d5
+EBUILD Getopt-Long-Descriptive-0.103.0.ebuild 1023 BLAKE2B 24521add77f47ff420288d2bafc4782ffdc196e5513b4e09028a781468c2436afc89ef55eab5fa4533fc229a0e7d5fbf5d7553522765570ca0e7c29a0a8bd12b SHA512 55649a4c4ccaf64d722d9963dad26d2482b665e66b3e4eaa3992f55589400d5f9cccf2e60f1f6883b3543e6c6a58d8c7f53d8fc61b1adee60debea516303a750
 MISC metadata.xml 576 BLAKE2B 284499ae9040033acd83c3f9ca6f5263c1b0652146333fff6e808587149264f7114d523c116c84f1e133cb558da9095403197da0c90f917777791e869515aef1 SHA512 4a83ea267c2c7d62a81da04c2afd355b6a6d35a1fb6dd8e2fb22b23e59b269b01ce6a91e1a76ca36ae6c621bf33e0fad295c733cc7f84255416c0aa146162bcc
diff --git a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
index 52d52889a55b..d9711d8e6c21 100644
--- a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
+++ b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert plain text to HTML"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc x86"
+KEYWORDS="amd64 ~arm hppa ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # Email::Find::addrspec -> Email-Find 0.09
diff --git a/dev-perl/HTML-FromText/Manifest b/dev-perl/HTML-FromText/Manifest
index 50161c80b96e..9fa9e9d2b2e8 100644
--- a/dev-perl/HTML-FromText/Manifest
+++ b/dev-perl/HTML-FromText/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-FromText-2.05.tar.gz 13875 BLAKE2B ded8a8755844f913c8ff3884967287b39bcb7e40207e88e51f062c5ebca0b282f6c03497edaa7dbcf2e35e59f1be80e364ce3aea548c8bae445262fdd61bf7dc SHA512 69263aa7aca3ce002e2e0db9553b15f01e5e6d7d148a410846b170cf19d3fcfbbfd9b7cc52d9264de081b9292cec89ec1ed17e3069552dc27a83620e901602cb
 DIST HTML-FromText-2.07.tar.gz 23596 BLAKE2B a76f39aff15e4fe622ca3773e36f1c7cf7a8542dd3f084fd392438d569e4bf1a326d3c1b93b3b0de4aab37ae20529d4f2612255927c5b4c26af5a99784b985ac SHA512 4aacb6be9d1c860c1e758201be40a9c966cb43f1593714e65964bce4bf5d72c86028290ec584321365de36909b6e44e8851f5c2a417b6e38da984ec9c5c30112
 EBUILD HTML-FromText-2.50.0-r1.ebuild 449 BLAKE2B 2b6a8b0e7fe1321cb7c42d7be6f600ee31112b29ea733a59f067505595b42a499c251fe51b11df4d1c9202d19d2a335adc9fbba41345e886d1f9abe3796af47e SHA512 5ff2d4bede8ef276d603a8b062f0967c5a39e7a264f16c5317557534889b837a77c1dee9c706bcb0d36bbef9f4eb8934d2a53ae79c189f11b47801d2d29d905d
-EBUILD HTML-FromText-2.70.0.ebuild 785 BLAKE2B 173119765288faed7ff553f7549568e1fe394d00d1ee900fdf4d5e24061e584978a9692313c9eacb67175c20d2cd0a5cca0378edeff514a29fe36e547df17648 SHA512 fa43cbca3b8fd8b89b8aa6d969a30f4fad8e0845ffb070a65d1df0fb7f50c632a1e899d706e3b6dd6c85bf1f78e47d90c40bb5809c5bae4e26db8ab1d95db31d
+EBUILD HTML-FromText-2.70.0.ebuild 917 BLAKE2B 7aeaa01bca5867c75dea839f329485685b17c2dfca00c3f8e71c0c1857e53fa50c26165713825f56d1259049b09c71b7c58c75654057397228c3911f0c2929dd SHA512 80f7c555f3e1486c367ab5441caaf41451ffd1086921f0cfd5674f39c06b9876cebbad79d426284a079d09932bb02745804d4d4a3f96709f050bdb594e12d195
 MISC metadata.xml 398 BLAKE2B b3bd218856eec071a94e6ea14213b81fdbfc664a37e31b322d69c2a197cd9a7cba9c9b05e0bb1cdbd29c903c252d4ef1b79672b1e86e6e397cca2e59fee22435 SHA512 34d82e7ad99c3e1aea8182f086c82d7f2254e4845e81ce9df5fa57db567d147224a8eec17c0aff7149a270b53748c3fdbf504e5f3d1ff1952a8888d64bbc682f
diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild b/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
index 7bc2fee3d4f5..6e2303be2562 100644
--- a/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
+++ b/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse <HEAD> section of HTML documents"
 
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/HTML-Parser/Manifest b/dev-perl/HTML-Parser/Manifest
index 7506d2a8a262..cf3d68745d52 100644
--- a/dev-perl/HTML-Parser/Manifest
+++ b/dev-perl/HTML-Parser/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-Parser-3.71.tar.gz 90368 BLAKE2B 04b82ea4b248aa546263e8ffe67c81a9a339ac92891d97b9a0759a6a7a75e15471a26ebc82d0bdfa8c54796f0734c37b7730890c7f70ed7dd54f44445a1b107b SHA512 98165e22534477a4e06e6c61c10a16ad04f0e4ec79a52e458a322751d66fc3fe0182391ff60dce76076449f29dcfcb613a6e43a839d4fc15c4af5b4e8751036e
 DIST HTML-Parser-3.72.tar.gz 90680 BLAKE2B aed1c788b4039f82e9968aa8d2ef0067262c9e986dc24ccc5e570bcaa8dfe46c48fe0f795c84df6747cf3b63f338154c7272eb0dd579d0e2bab833fbc05b88b4 SHA512 9fded69219791af085018ffbe6737e74e370c543af52aa221aec174daf52d1b8d3cdd07f025176c0212ae572a924555262f2eefc73781f82cdb7d9cff58ae716
 EBUILD HTML-Parser-3.710.0-r1.ebuild 669 BLAKE2B 6ef0c590e886da4cdd0b33f4bc7912573e1dd630a96425fbe007c87e79b4491ed11a6193826eb4448e11af300e6103e4a3b64f56bb1d025d04170a5f75273273 SHA512 85a8373393c980d4e6ba2f15822a88f1f0e4c32c2152300883b2168c810c95f56cb35ff5302d611a9649ed8d47cb1cdd92b63b56ac561808dc8ca0eee513e4de
-EBUILD HTML-Parser-3.720.0.ebuild 731 BLAKE2B f6151f30e9b9e91b52b24e1f9fe7cc0d8302882ceb8c609a086164312f0ac02cbf2b8d2dda40d415aa99bb1544aab0be0bba7dd718e42d90409ff92a5aa9f848 SHA512 120610003fd2ed1664a9fe311758769c02f0e1242c630756057fa090096639f5ec4542a0b2c831c805439c46607038c3101761f4ce0ba1f295e57bd7ca70585a
+EBUILD HTML-Parser-3.720.0.ebuild 739 BLAKE2B 1f0460ad5c6b0b2a9869c505523c0ae0c39e4415d5214b8f3ad64bc03da51b1c630a8c682caaa4aa8317e9e58212604c92ae5e8e9501553126654b2242c843fb SHA512 780c13a7f479fa74d48f2704c98650fc7f10b46885202eab71cf31db1bb3ab8e3d6ae85e2524f55fdab9474c2273e5e46cd7ebbd4a90a8651f0cf3065f31f0b9
 MISC metadata.xml 765 BLAKE2B 95bb8cf9ddbd12a47914cdd78641d929e66d81f101cc1e8a06ee5227ccd7403d268c779580b612e219b72f22714b04a127b3561d9e420a46a94db3a69d4c45e6 SHA512 e8bc92e65b8d41011856abd50a8f37a0a76c5bcc18272a3dcf480ca33cf07232b5c0296d6048b8ea792703c8ca3d656aab7901da23b5f5e0c3867d16d8bab5ea
diff --git a/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild b/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild
index 05ff9edd96a5..d7d35e5fa9a9 100644
--- a/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild
+++ b/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Data tables useful in parsing HTML"
 
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/HTML-Tagset/Manifest b/dev-perl/HTML-Tagset/Manifest
index 34cae9fc252c..eb5597dfcd80 100644
--- a/dev-perl/HTML-Tagset/Manifest
+++ b/dev-perl/HTML-Tagset/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Tagset-3.20.tar.gz 8150 BLAKE2B d74358e6c5eb1d1b9fa78e40a80ffc0e98ccedcaa743e99eda18ed82d2c1244700ccb0e9db6bba7dca71b1e1fceb04e157b556e52cc00d245ecbd3dd2d68a063 SHA512 b53c099a96b493c3d03c51fcf3d58dd3b830069583f2d07477175ea234c43e91a0b380c82a71126f971faf2768e832af34967d08d899db7653d65613d6530072
-EBUILD HTML-Tagset-3.200.0-r1.ebuild 502 BLAKE2B ee434b8321a5acd7d4b710558ca2b0e2fcabd454a57952f46c56a71b3826c5e5f14be9f5fe4b2a3910627f3bbd7db2309d2f1d855ef666fdd842d292621a6a58 SHA512 dd4acbebbe9eb2dc71de23278f77beb09f98c408117175cb5a39ddedd7c4027776f9566775dc7caa11672860d8c427b7cec0a2ba6fd8b22372abb523db0d96bf
+EBUILD HTML-Tagset-3.200.0-r1.ebuild 510 BLAKE2B 2717696759f6ee500c443cc67aeb3e16649e896e611d1a95d383d9721d93b6558fae44c063f4188e31ecc6047a75910eabf697784609296906bc1073602f7f14 SHA512 4980e61425393eca7fecfa748944621b47cd9e798df9e67d110f459747e4ea86dd1b34ca44ce974de7da93b92b42e3c95e0c1c7a5d926635bed757e955a96144
 MISC metadata.xml 394 BLAKE2B 37fc53e97d199a6975fcf389953b08a3c5689551c8ec2ba01e823eedf60ce630899548c315a97e30230c1036ce1a7f74232c23124ee98c5e423a57f3c612969f SHA512 66fc5b74653e2086b40c3f5ed8379edc305d3c4941ed1c3e34d109eeacab8d5fc2097fb67f9bf3e0fa53bb96fdd42c16e816355b67175417e4db6d02899675e8
diff --git a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild
index 54426d19495a..ce34c502c1d2 100644
--- a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild
+++ b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lightweight HTTP Server"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/HTTP-Server-Simple/Manifest b/dev-perl/HTTP-Server-Simple/Manifest
index 8c62ca422546..7a672d648e9a 100644
--- a/dev-perl/HTTP-Server-Simple/Manifest
+++ b/dev-perl/HTTP-Server-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Server-Simple-0.52.tar.gz 36722 BLAKE2B 353cad8e72810703e8c4a07953d9f7b273900c54ec65e49ce34e7b2e611439544e8cc3e0bc717b0f0cc0f9b710200cb42dd913c12a5509687facdcd3fb5c4ecf SHA512 57c0aa4ceb7e0f430f577e24c275d96d54ceb15ddf6e53710067f57dac50e8a57661399d0093edf28c1ff7b6ed313471cded48f5792349191b8d60d8d7cde2d1
-EBUILD HTTP-Server-Simple-0.520.0.ebuild 559 BLAKE2B 8875a96ae7e91bcacbe0c6671e7cd8091d88989adaad46cdca4f2619e76af27a3f8e8a44a3492f4320c5303569d9e8f082cb2a8de7e9c2c5d92dd65ac6675654 SHA512 e674a47d97855789cf6e0c6bb704fa40b1c7afbc5dd071ae733eae97b4a27b60ea06471199fcd97c99e05c1b5a669ad19057fcf0a622e96140665b4efe65b1ee
+EBUILD HTTP-Server-Simple-0.520.0.ebuild 645 BLAKE2B c8adf38ce2a87b88aaf296f5816b2dd4b8ff3c38504576c807b424db7ec966157dbe29b7f483f22da599eaa166ae4fabb0ebecf2fbd486d6c31d34ff85f98956 SHA512 cceafb78c38a463eaa1a40fd0089cabeee9bd61e72ea8abd4a20edcceb555058d6a18869de3019c9e6d024504cf917b7e8ecd181b6ae02cbbd069f4a32e5be25
 MISC metadata.xml 566 BLAKE2B d01bf2a7a9ef89f9fcc71866157881a8acdd5742ae779ce85e91cf631e5bf1cac10e75dcf65f5f9ee15ef62908912ef0855cde88b1ccc224defcc1ba0ddf329c SHA512 82f6536dcc5a0580dc26d9b22965eb9d00e7e6109d311e7d59af431fcf394e0c864dfd46a5e282175adbd49c749ad14d3aeebf496a983f272228f02a0ed69954
diff --git a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0.ebuild b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0.ebuild
index 6074fe576040..20939d7e7ba7 100644
--- a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0.ebuild
+++ b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Lightweight field hash for inside-out objects"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Hash-FieldHash/Manifest b/dev-perl/Hash-FieldHash/Manifest
index 8761102934e2..d3c7d83a1561 100644
--- a/dev-perl/Hash-FieldHash/Manifest
+++ b/dev-perl/Hash-FieldHash/Manifest
@@ -1,3 +1,3 @@
 DIST Hash-FieldHash-0.15.tar.gz 29082 BLAKE2B 5b8426f3d44e1ba0d10bc24e473b8162189ddad3b378f0863903eae844fe26cff378c73602c4b49085bd0c9e42d5549013111182bd5a09c4f14e523b1c6c7254 SHA512 2f42b0e7efdba03b99c9646882afc47130de1989777eb1ceaf8031769a3a11ebdaa841abedea8288b770aa27c44108846d0765f531a35d707e44a8c1f0f8036e
-EBUILD Hash-FieldHash-0.150.0.ebuild 902 BLAKE2B 8d5338205f5a39e7ad2b004afdeef35839b477b24cd6911cacbdda12caac3ea908282f2abf9f71b2ec9d0342411b984779bbd0f8d532c03f6d01225f4f4e3db2 SHA512 95e429b25aaa6d62f4129647f394e6bb614cbc1d8e4d8d2b6d62d4a2d4fb847a36ad5f3d357b87039d69c019fe8d57e863c1de95558523d1ac459ed6a34d47ae
+EBUILD Hash-FieldHash-0.150.0.ebuild 1034 BLAKE2B 69e25333da6c63f21e1eba4079804f090f485d9df3bdf86304e5570ec189588032ec053cd2b269fa56c789e8c9b7513f7c367339c2cbff041f15a21806d85271 SHA512 b1a1544e58887870c29a328145cdf50cef679013fcdb3c4c8def9e44e47f69adb149a40bedb3cd57babff7157efca79451301b2a20afa81dc36f37b89b30a6dd
 MISC metadata.xml 400 BLAKE2B 5a93cc38f97d3203f7e32191e8ebc7fc30aaa92272fec85e579f1ed857cba352463ebb8b8d3677c13e4bd592d7fd1776ba5d56e9cf4c0e82604a1eb9d9cbc871 SHA512 01f782c54b4bf4e453848b4e30f21cd4cd08da3ed15bc0f94f52018e5a958c52e2c47d0f845f2719cf79e38678e9966a45859d3b6cf6f80edee1081ea369d30c
diff --git a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.400-r1.ebuild b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.400-r1.ebuild
index 14531f4b3a08..e6db580094d6 100644
--- a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.400-r1.ebuild
+++ b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.400-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Capture STDOUT and STDERR from Perl code, subprocesses or XS"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IO-CaptureOutput/Manifest b/dev-perl/IO-CaptureOutput/Manifest
index ee374e7d87c5..c5d2207b01c9 100644
--- a/dev-perl/IO-CaptureOutput/Manifest
+++ b/dev-perl/IO-CaptureOutput/Manifest
@@ -1,4 +1,4 @@
 DIST IO-CaptureOutput-1.1104.tar.gz 27651 BLAKE2B 998153cb491436e1dbca26f216833898f9c14949b42bd30afdf94c042f35126d8df6db8bb13718ac944de8d252e0be90fbbf3e5f8ea0048bab8d61fc30d0c20a SHA512 5694635c91e4dd11279c33fb9d58e2eb27014f4ea0a976e62c23505524e3d37264aab6d6b1cfe5d925e123d6aa240e574dbc4f489c6c1007da09631368af94f5
-EBUILD IO-CaptureOutput-1.110.400-r1.ebuild 609 BLAKE2B 294dc4b376db1732069d04b7bdbcefb1970b9c774b6005c3f3ba920b90523d6f222bb0bfa85c1a4fcab0b330de85702fb3825f0020eca5a3fecf128ad214d55f SHA512 7e7482552b01c04836e7ab43332f362052b3ec0c28f4b04de978e78a374bb8d4e9d1fd5aad7804ac008183e6a8726bf66eccdbc662a27ee8ffc32b71c16af41a
+EBUILD IO-CaptureOutput-1.110.400-r1.ebuild 733 BLAKE2B 89b7f94b0e492a098b0b3e6d69fb1cb098aa522a63ac072cf3376d35e72ce428329a1c1477149c94475bc52eecd90149610f69473583f7f5edf6ea2a69833a6d SHA512 8325d27cc08eccd5ff2c987bfcb383adb816cc3b4c198c22ad0ab41e8a7e8422261182112aa193f6a7de69e00320ce15c8c4a2966cb44d3560183482c14ecd5c
 EBUILD IO-CaptureOutput-1.110.400.ebuild 631 BLAKE2B 59c1dad09af79b7e9245272db861fd28d845298da64846662e526e5beb7c28c56f6cd6e5421b784b36c7b0abf6278e0043767fd8d2cb04113b95adfcfe1df442 SHA512 edb2051f671b2a1bed2563bee61c3a371a3fc04f75771e66fd3e3d0f6b4e68cb899f5a869fd57c839bf83ae607607ade460390332d1c302d95f680c330869e84
 MISC metadata.xml 404 BLAKE2B 06521a15fa1b4e1fba429b7c3f1502de955edf51bf75d143125df13995871aa80b503836bf016dd48d12553a53561ea90fd58253cf203d8e94992dce02f15856 SHA512 8f47e8f2ce312ba5b5dd1a168515f2de2dd4c2a1c44713be9e1f85bd5ff265958c553f35812fd67dc9adebbe42e4254a5b71471a304c0da463303e78435f0677
diff --git a/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r1.ebuild b/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r1.ebuild
index d555e9867c2f..67d015d8351a 100644
--- a/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r1.ebuild
+++ b/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manage IO on many file handles"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="virtual/perl-IO"
diff --git a/dev-perl/IO-Multiplex/Manifest b/dev-perl/IO-Multiplex/Manifest
index 53ac2680606c..dbc20561975c 100644
--- a/dev-perl/IO-Multiplex/Manifest
+++ b/dev-perl/IO-Multiplex/Manifest
@@ -1,4 +1,4 @@
 DIST IO-Multiplex-1.16.tar.gz 15974 BLAKE2B 9810093876f5c91ed6c3c3b983872b4b20ef08ae3e5d73deffe1a4554599d3b46bcb74e4a4402bf5167185cf973a5134c3e9a42ce1d9f5cd4edb0202178868f2 SHA512 695462be217a107f734e214d2f0a00800962abac24cf4e30272376f5effa25584bc458377feed16b5cc7bab5858c00e547dc97d02962e57b2b8fa6e55df20fa6
-EBUILD IO-Multiplex-1.160.0-r1.ebuild 389 BLAKE2B 8f2d78b49ed813d455d35ddae3fbf45ec1a74914d6ef2aa7bd187a9f764417e59b39c3cd0b9b559c85cbeaf924b7187c26da1443d649cc0701ec871fd9d36038 SHA512 62c12af7a8f1f8b10913877656bf6c82b51287ecd689766cdeca0767c522753fbd8ff380316a347877bcec8dfe7c57adc953bcdc73a3b6b90233029e1187c34d
+EBUILD IO-Multiplex-1.160.0-r1.ebuild 388 BLAKE2B 4c543dedb86a470f90bc8e683222127357a2bdafda4c800a52a1f349a620d44e47966c0d47ba400e28a95c775fcb6e1074af385177a3188c8c9b8df4178304d2 SHA512 494943b6a248d72781b06e0592618f88ed751bd61fd29be58b087b0577f01fedd8ffa824446d8472e09a1f3db42ac9c71a3dc54c2238049d65988ad48b2f4577
 EBUILD IO-Multiplex-1.160.0.ebuild 368 BLAKE2B 1611ff95f2aa1993b9af480d87b1f945df4b783a9e920e06e2f681ba8d9a34983e05cf03a66a98768468acce3512832616fe2d857f1c5ce1277dd094b7462f03 SHA512 497027cd1c9340bb40ee22115601ee91266f15cf5105876baee45a85a3dae442c03abe745fe6eeab8d7856a1fd2a8c67f716e7f7a46533964b295b767b4f6213
 MISC metadata.xml 464 BLAKE2B a8afbef916a37948c420aa92fe2f9b3c93ede420e2d31de212b465cea8ffd5aefc4e6670d326fbb5bcf83e62a77adcabc123c763869bc7aa75f6616f5b573b40 SHA512 4b8ec44d06e6b8ede6af6ba2fe923ce75c7432a8365bba2a129da1ecf25d609cc96b3da5859cfacb57cb534f53055f54607a262f508aae7c086ab467e9fed009
diff --git a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild
index 02a4ae4aa42a..134820eba928 100644
--- a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild
+++ b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Work with IO sockets in ipv6"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/Socket6"
diff --git a/dev-perl/IO-Socket-INET6/Manifest b/dev-perl/IO-Socket-INET6/Manifest
index 8793c01c8c7e..08f9211d32bd 100644
--- a/dev-perl/IO-Socket-INET6/Manifest
+++ b/dev-perl/IO-Socket-INET6/Manifest
@@ -1,4 +1,4 @@
 DIST IO-Socket-INET6-2.72.tar.gz 27615 BLAKE2B 70925d4cf3ea74702b6d96d8e1079a12953bb8350649e6b6a2bac5690a1a8e25f2a9c2441b4eff3148eea374f2d7df4bf9f4048cbf71f103b78425c5133a2a8f SHA512 c6dc0bbcc81682d317597de26d5023de84781e4bd2af224145cc4980db7fcbc93295a7d0a80c1eaa649c6aebf4057d0b0159f47e6a6379d4b545b49305f28a37
-EBUILD IO-Socket-INET6-2.720.0-r1.ebuild 688 BLAKE2B 67781b5041a76934536fbab5c020651c4a94b2ab10034c86284079dd099560a921856f04e3354efd3d9cb7d7f6f9c063c9e00808196493a30589ba8643329a81 SHA512 65c45047c06d95e746c26329551a3fb7c949c3eef20ba81c36c4d97e6e98a565f659541e08836bddc458ac88b8d28c4c396a5e2b5e88c43e2b87f85bcea150a5
+EBUILD IO-Socket-INET6-2.720.0-r1.ebuild 705 BLAKE2B e7f82840ee0f2ecf7457202f2f945c4541783b22fd0769c8b1a0346517b99b73f0361ffa2c0d8a288647b1aeba721d8a10494f6263d2f4af49c0eb06018c6771 SHA512 9917ef4a40eac5852fdfbb53c5995df0bad044af5d8585a1e569d2b52ea37849cb5fcab229200c39203f0de9e5887a5a6a4d8be9d5da5ac7c9f4f22df55c4584
 EBUILD IO-Socket-INET6-2.720.0.ebuild 583 BLAKE2B 7139b23bd4920d9167b11b93267b0593226a9fc4586f6da6ed345b098567c03cf10c2fc23975a7c6710b93ff52bb2f1a57d2144fd3c104f9573b429b2dddce0b SHA512 cc7ca06dc17e32e3c002c51b94de82e20accf07b501ae255a0465197a89a2adf094b15fea61e955db4601eb485a14358a8863def2e3d048d6be91b9bf3d15d8a
 MISC metadata.xml 403 BLAKE2B f8d2f6ebc7671b68e0b1178d7b8336e57ea5d127bd1f3551b64a4161731c847d0a87c875fe457f98b3e08f2b383e64cc5b6452a4c68b44a9cce45a705b5a1f43 SHA512 b851067acb98373c142f64d081a78c257fff689546283457041b810e28d7b007c66c1ca26baec8b85f8c96a5be7a87cc9b5840e5cf07ee2d0ef4d9dc078b94a5
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild
index e30fe16a3e80..5d48203488a8 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="idn"
 
 RDEPEND="
diff --git a/dev-perl/IO-Socket-SSL/Manifest b/dev-perl/IO-Socket-SSL/Manifest
index 3ec3e7747bb7..d368745e0bae 100644
--- a/dev-perl/IO-Socket-SSL/Manifest
+++ b/dev-perl/IO-Socket-SSL/Manifest
@@ -3,5 +3,5 @@ DIST IO-Socket-SSL-2.048.tar.gz 214926 BLAKE2B 1defa05aaa3f7b8e3fb078ca2d919400a
 DIST IO-Socket-SSL-2.052.tar.gz 221703 BLAKE2B 764dfa3b81e649bd67fec030f89c4e994372d7f18d126ce38653aa935011687f19ce6142bc7bb21f2d86613cdaa1cbd432568a3870f110427a639c81fb28a050 SHA512 44a2ba94d1e9f911d6815a784263e2cddac0cea90e79cf8e267f73d8b2a3726ca9933d621bac8849a52db50bff0bd7a0d2cfd546a550f2963ea44346d3f8b600
 EBUILD IO-Socket-SSL-2.24.0.ebuild 725 BLAKE2B 8a7ed0dc93b3d83937a761080acb1712cac96a2662e48c714aded892014db08f5eb6bf04518fe07d42cd4c7fe542378dbecd7609514b790e0429550e628e66a9 SHA512 b1b4e89420059f915420a6c6b63b321057bb9d73ac4421e3b75afe8608ae4e26eb295b8ccfa5b0ac132891bb378ca63472cc010f90aea663e8617a61d402a881
 EBUILD IO-Socket-SSL-2.48.0.ebuild 801 BLAKE2B 935d1a8d6dd14f004f0fdfc3af9d2d1cbb1fddd17b2582ea2473804bf14aa020c9d7ae48dcdd18f9c935216ec2a440d72255cb94b356debadcfd0ab0b1637959 SHA512 6049b9c5c99bbd833b2ca11d320fbf8004bd8b6015848d0d1e2ae1b99c88f32294e0ce4031b0bc3403a86d71af88f51426ca4b30050de8c138917bde1e912146
-EBUILD IO-Socket-SSL-2.52.0.ebuild 803 BLAKE2B a18cc12480cfa224bb70a0b71667d12f61388691261a71305d5ea3ae79fc1a30e86f546e060f272c26509119d6c49aa2c93d5da7a513e8382af2d210a4198765 SHA512 b6bff429e3cb0a61a871edc225e37be053fef5f30ed1ed3d91ccabf7d36d9857c455b73ca514f3f729cc31281c523afe9799d79e223edc69c6fcfc0cf453e1b8
+EBUILD IO-Socket-SSL-2.52.0.ebuild 802 BLAKE2B e597276ca78e844edc8d4506d0a0e0a92321ca9699c01fcba40dec00338f14ee713e60ec94bf0d87e323972c77a591b3fbf7ad828696060bc1588a9e7427ec25 SHA512 ef539444f2f9b68e01cbc7d21664b16882070fac945dab4adba87c228f903c15837553a721894315c41c4b9e45f2e93b1caa778df623e20a5dca71512726da8f
 MISC metadata.xml 994 BLAKE2B 4a4916d4a8b216f0eb6c82056f70732295918bdc80a2c3715be97568ef8e7d1084a42666db47f4b2bad4045e175aa45674fd4ed2c4ef4c6d38873434a2bc4640 SHA512 c861d564131ef33b1949718f73b16df3b14a801465f544e831b969b52d5c03bd0b4906416e99a92331ef08641d283099d1ab0352c29f90b4b835d46819c20c26
diff --git a/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild b/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
index a40f0ac5e84e..4d468baa66db 100644
--- a/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
+++ b/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="IO::Tty and IO::Pty modules for Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/IO-Tty/Manifest b/dev-perl/IO-Tty/Manifest
index 2eb746bef211..eae9a2148f98 100644
--- a/dev-perl/IO-Tty/Manifest
+++ b/dev-perl/IO-Tty/Manifest
@@ -1,3 +1,3 @@
 DIST IO-Tty-1.12.tar.gz 24564 BLAKE2B da0b252d938b115e8cb7e46866829fcf76a56754c5c3cde8f64dcddda4c9bde9cb77a1b1a022dc8ff94f785d1e1020f76be3ff805c50f276902128d397039244 SHA512 23733e7832a0de370952420df8a781f85d28ff60eb4cd55be22147337bf5587f4e1ec7fcfc190ae3ad1fd9df0f9697f2d647e00739f4a2927b1ac9c81435454d
-EBUILD IO-Tty-1.120.0.ebuild 405 BLAKE2B e8094854b0d932e1e4c7f54d397a2ebe6b680361d387aa20ce2afe04251375bde257c89de8dc729a686da17e8d0e5f3da3f0f863ab17c7275005afa624310fc0 SHA512 9e99f58270ebd39a6e620c49ccf7c18e9ce3d8fff6b3308f9c5803d7457df7ff3c952b15805c2125787c54811f09f047cf0502fdac783238775cdc10041cd667
+EBUILD IO-Tty-1.120.0.ebuild 480 BLAKE2B 6c4e008bf606618a726d3c0ac8c16b7b19350c843ed423634856a990b773099898a4b3efec2ab22a6150042cc5af396e0071a2d1850e09bb180c3435df5e5879 SHA512 b4de7a80d805d5d9409fa2fa97d7aad6baf529ae1f9d65b9004b990fe9538f2897aa7c9c8e713e1627c8631d5c09fa22ce3188102df0319418a6a213dfc2f330
 MISC metadata.xml 438 BLAKE2B 6008db4a5c8b043e0212175dc9401efa1e5e78c24181076645fc322d653f4deb0fa37439fb23cb0b84eddecabf4b1b1db72115d0431ab114a2dbf673741dc0c7 SHA512 6c1792c3eedaa6d8c766d0a2f030b04cf9a19c9dbc80209f57a206bffdeecaaec0d98bf96762107e0918b2129f1d1974694a5ed61869f91c199a87fa68fdcbeb
diff --git a/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild b/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
index 93a476dea925..41a84b0cb2dc 100644
--- a/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IPC-Run/Manifest b/dev-perl/IPC-Run/Manifest
index 83bbb00c6df2..9c621044440b 100644
--- a/dev-perl/IPC-Run/Manifest
+++ b/dev-perl/IPC-Run/Manifest
@@ -1,3 +1,3 @@
 DIST IPC-Run-0.96.tar.gz 121644 BLAKE2B 83181fc4da8eb2199ac1978e2f593fb4579d2f4b6acff41f36ad2af866e07816c3ddbce8f1fb4e54a905fa00c3398df4ffa25eb10c49f677da23a4e0dc922fc8 SHA512 8a531a2126c15653ab0230813985cc7c83f2c3467c987757fc1f04c3c9952ee0246bcf743dcc4381351c72989f7271ede16962cca24e030404e414ff000c57a8
-EBUILD IPC-Run-0.960.0.ebuild 598 BLAKE2B 0d56f8cea39d19971dea7245d348c423b94295cd26c3abad3558ab3fd2fbe6c8662b28fbf751c576c3bbfbf6166cc5ab19f61191c123ff402502a697b49707df SHA512 d26209c898e4d5785b2c461a71b5fcaea18ae11ba5c8c85305e75d0dfe611336c4f6d1b1a3f983f3c42f69d5c7bd35d4ec432746fe956e99019aaa16da4899d2
+EBUILD IPC-Run-0.960.0.ebuild 719 BLAKE2B b979bc63939764b3f6884e9e8b4c4a79493b5cc8c7f5f1cb5cfb995825b649f37622f32a31e86e22abefe16140f2faacc17c1d508e1ed94b653cbdc62ab3c388 SHA512 7d6addd21cf91ae4e865be13293ad45a854c84f25b7033e47242fd2810a3929da6cf3cb8013ccf974a254b8305421648945ebc65226a9e44a7777c3f334605f4
 MISC metadata.xml 767 BLAKE2B a74f1549a2078c12cccbf9953b34bb77e4dddd5faa234524b7981e00a37feb0d798b3c531dc1dc8d7765b9ebed0eda80c501d1bc4a384681a9c60587002f1e60 SHA512 a07f01e225a9fc724be559d9a268e91c25bab1108f6a960c29fb7ff80d4cab9bb865d3fc646abed08895a1e797a64e8bf5f44da6de62ab59a76fda4d8852dc1a
diff --git a/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild b/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild
index 577981938ea5..340132ae0d33 100644
--- a/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild
+++ b/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Run a subprocess in batch mode (a la system)"
 
 LICENSE="|| ( BSD-2 Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+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"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IPC-Run3/Manifest b/dev-perl/IPC-Run3/Manifest
index 4523c49d3c7f..35100bd659e3 100644
--- a/dev-perl/IPC-Run3/Manifest
+++ b/dev-perl/IPC-Run3/Manifest
@@ -1,3 +1,3 @@
 DIST IPC-Run3-0.048.tar.gz 20312 BLAKE2B 4f5931d37bb9e14ea948efaafd1a1e9218934337c6d39fca5832bb1279e1752aea9ffbb83b2a3ebd10112cd617d0c735b1e201fe309cb92bdb64dcea3adc1e89 SHA512 50432850d8dccd2e59aa6684d34f3e3242fd7df3eb4d9a5eb02dae389aa46b5fd68cc54114a157c3fe99956e68e74d575ab3db5009b7bf7d5c325f1f109b1262
-EBUILD IPC-Run3-0.48.0.ebuild 556 BLAKE2B e579cb643b3c45bf600c56b8b08124e036b4233f23fc36e38e830ab94083d09ec2e589a3bd66e797815f2df7c5ce3f991dca9d260f49954debf2e32cc8f239cd SHA512 39f13275f31c64d9b3cc0b7a6824dd394d7a66d923fc2a25cc0f94ebbdaca3e07cd31a02137fb7f17bb4afc075ed19566c78b17a6c7c684fbbb7d13f487471be
+EBUILD IPC-Run3-0.48.0.ebuild 656 BLAKE2B e53ba21ae5a8073840d37dba31a41e699f1abe2b333528122775b91b7bde73b3bd993956f932e32ea84ba6d3adf9a3c125df651c372366bb3d50c2bb4c31367f SHA512 571ff824e16f6f4b68eafeb3d46e488f80460c76b45aebf7e5e66b79a0266241551813ec98b7c1ee3f9dd67feae09dda331366c923ff004fc791e968cdea2d40
 MISC metadata.xml 388 BLAKE2B dbd12a08a1457fd13082c32b2635bdb5606e170a2ff84c2399c9362a882af193152b37c1d6e2c0c1e7e303b3a15133d80d000b67f39e0be45cdeb985f251abd6 SHA512 28e5784339ccc5cc6024dccd1e17a9f4042c20bc72baf5e022d4be4990bdd8cde76548e481d657e2fcb312b80a0d5e46d256343a4da41bdd7916e60dcd84ff65
diff --git a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.250.0.ebuild b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.250.0.ebuild
index b537859507b8..b98da0331521 100644
--- a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.250.0.ebuild
+++ b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Run commands simply, with detailed diagnostics"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IPC-System-Simple/Manifest b/dev-perl/IPC-System-Simple/Manifest
index 41d9178819ac..638b776a5e04 100644
--- a/dev-perl/IPC-System-Simple/Manifest
+++ b/dev-perl/IPC-System-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST IPC-System-Simple-1.25.tar.gz 29744 BLAKE2B 9e80c0d72d4857b401bc99a24117c23608af5e2bc468dd9bcf5465e71c3011141393214e07667b7552a0079764f7e489e5e1d417d4b4933dc7a485f7c0db40a4 SHA512 fda275786605eb80acaa6062cc51c32aa0e84f150e7ca7afcfe874f088ce7b8f9a97669e91bec24fdb05426db8b0f05552aa8853e44b08996e625281d1892f72
-EBUILD IPC-System-Simple-1.250.0.ebuild 567 BLAKE2B c13ef76cd5a021a2cbffb1a9e63d09c83258d680b031b937afb4ac6cf92b9a93e0dda2551b2d11ed6d881c6c8dd6c67a4d2ae497a157523389d5d9bc370cb4d2 SHA512 b996811be6ba1daa8e88cd939497ab8e8f7b029251fafc99e096ecd0caf1fc834cec0843a174fb460a27b5bbb50909cc2bb61410460ac7bbfeaf317cd9dbd50e
+EBUILD IPC-System-Simple-1.250.0.ebuild 701 BLAKE2B 747319130bee362953cc95b9115197858c579be88545643a18346076fa1b80f5347769532c900ca78414381345f58ae8964fe6bd91d5dc3c7346d52e073c2613 SHA512 323ea3eaadd0433639609ea16e2399186829e703487a11b4058f094f19f71eeb68632e112d024ae8882b8f250b93e8ff6822cb236e110242e7588f97aa72375f
 MISC metadata.xml 395 BLAKE2B 85e5ac1bea2549603f246cb86958de6be604eb17684095bb6836f0d880d184566dbd5905ff4d10e64c5ad5c7af3f073e583066955a2c0d9aefc30be309012373 SHA512 b7dea887b8f7f9b9911e9deeaa787dd80cabd1840b08432caadbc88ac685b6f7851678b8d5472eff11f66dc2beecc455d54521d086f6fe1fd73dc51e245f054b
diff --git a/dev-perl/Importer/Importer-0.24.0.ebuild b/dev-perl/Importer/Importer-0.24.0.ebuild
index 6a3360e8edfc..8b9c094535db 100644
--- a/dev-perl/Importer/Importer-0.24.0.ebuild
+++ b/dev-perl/Importer/Importer-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Alternative interface to modules that export symbols"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Importer/Manifest b/dev-perl/Importer/Manifest
index 8f1d7f7a7437..bc2213113248 100644
--- a/dev-perl/Importer/Manifest
+++ b/dev-perl/Importer/Manifest
@@ -1,3 +1,3 @@
 DIST Importer-0.024.tar.gz 41264 BLAKE2B 21a839e1e3a3d5757d17be05ea6275ad8b9e248debfccacee9551b47f27df81715961fb63be8a28a423041365717d65d9a9c75c6e090fbf7c69a84d50fef762f SHA512 f368f19a63fd52b88886b1ba6d51716050db8f475628238d16d2962ab7d6c21d6818205a82c86cc7f254736eb1c261dd6abd606dfcb16ca675e84898d03cab32
-EBUILD Importer-0.24.0.ebuild 466 BLAKE2B 1b36bf4388b4706fa6cfd862a9fafb197570da18be3b3407b327ecca1005aa9275764a17ecb92c3f9d85a00b98fe34db1001dd32c6182be48b661ff201ea9c18 SHA512 11caf6a2447c24d12eb4f6449c5e9b14cdab290f95ee3384ad84188f627e0fbe1e854ef5a5c00557eecbbeaa0b03e6943fa3cd77d3a64206f65dbc6dd54b825a
+EBUILD Importer-0.24.0.ebuild 598 BLAKE2B ce96d6cbb7ad464e23e32fe8a0ded5eb693d969c92fa288902dbfcdd612d26e3aadf45eb2488b21baecb65f0d0df338e7093a1c575fe59427f6722ea1502ea71 SHA512 f459ee5c119f09c85601aeb64eca8005d7419f991605b56e6ec721a0a49f11a373a59c00b2972f37ce15fd2d64eae2f3ceab0f828fa169f743698aadc7a20e57
 MISC metadata.xml 387 BLAKE2B 097a448901783cc8e799dbb2d9ef53e40656d4f54774fc2bf5c740e394a6be4aae57331a17bac1848fa382c09360d4d416f9da4f5e5204012833e6014e8cdc5f SHA512 6716fc7a7311d4119c708230f4cec828655d122e37f6e70e29d60bf75c370564e72382f474acda87f29ad5660f93413653de31c38908cb19157ec35c5a0670af
diff --git a/dev-perl/JSON-Any/JSON-Any-1.390.0.ebuild b/dev-perl/JSON-Any/JSON-Any-1.390.0.ebuild
index edfe47153c2d..567b3b3c6009 100644
--- a/dev-perl/JSON-Any/JSON-Any-1.390.0.ebuild
+++ b/dev-perl/JSON-Any/JSON-Any-1.390.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Wrapper Class for the various JSON classes (DEPRECATED)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/JSON-Any/Manifest b/dev-perl/JSON-Any/Manifest
index f1a54d772624..90b0d5ea8c6a 100644
--- a/dev-perl/JSON-Any/Manifest
+++ b/dev-perl/JSON-Any/Manifest
@@ -1,3 +1,3 @@
 DIST JSON-Any-1.39.tar.gz 35890 BLAKE2B 7498dea7c32462125802243ba3d7526c589d26b0c59f1dc922b7535caf851e77410a4ad13d8f02f11dd2df36df9f4f3be5fb547d8b3aa1411782b67d4c7d665f SHA512 a4e9494ef650fe6f0144fddad49962e717470390b5783ab7bed6ef1c34fa7aa3d4f8699b9967ec8ca8813f43ee8c1d594e5af4d4962929791aa95b470104cd9b
-EBUILD JSON-Any-1.390.0.ebuild 731 BLAKE2B c1e99209c1ec7ef549cad673a54fef66733c346f07326897bf4ad97170c8bdedd9bb225a54ebecbf056ece257ef8514d1d15dcec6b9e1d44941558f43a52217a SHA512 dd7b8ab4d921a88e09f80a82a9c0d1ca53277e8658a3b5a541ddb33e931c3edd4d9049d7c12791cad426653a1a4e7ea46d29a55f24f12cb0c758bbc421f79b59
+EBUILD JSON-Any-1.390.0.ebuild 839 BLAKE2B 7b91b3cc64475437ebaec99fd1eadd7c00844351dd2b10819898b867692fa611f36e6bdb04b606c47e22b10be1b058162a99ff1f090ebb271587ed460ae07494 SHA512 23f6dfc3f1fb61fb9e00cc00bf29df6f02da89c276d67ddfb2f0d99bfa76e46416b4e633b00dd0f33c5aa42bb6a4ab5a3e0aa110db2dfd9f1dda34f553504023
 MISC metadata.xml 388 BLAKE2B f96139b2b4bcb12a34a5cc313380ab81930877fd001e206cc0383084df82ec90414f28a7174f3713f279a632e70a227850e20f252bbbbb149a4ab3548030b27f SHA512 4046bfc9bf529bbb336190f5a686d29ec639dddbb5d6e76978baaecbe67a0412c27529177ae2d31e0b7c47adbfb3891f7bdedbcf2300cfb17cab144cd4bfcc4e
diff --git a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
index eab5bd96fabf..9ce934aee462 100644
--- a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
+++ b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test +xs"
 
 # needs Scalar-Util
diff --git a/dev-perl/JSON-MaybeXS/Manifest b/dev-perl/JSON-MaybeXS/Manifest
index 832dbed365d3..e29d29b1c7b7 100644
--- a/dev-perl/JSON-MaybeXS/Manifest
+++ b/dev-perl/JSON-MaybeXS/Manifest
@@ -1,3 +1,3 @@
 DIST JSON-MaybeXS-1.003009.tar.gz 11699 BLAKE2B e1d961451908d3872d23006f68fcf94cf01c88e1cbcbbe005cee6deac30fbad26f8121a921d815fb15f135af7f4e15bf78f323ce3c20b0ea0849b7e16ac36eb1 SHA512 a8606ccaac749650004d70bd5d6219fb18f66c4c86f720bbec3daf21a15bacd17d308c2a394fb1c9f6584be4d7c519cbc8653bdf5c7c7fa4129b75261645d8e3
-EBUILD JSON-MaybeXS-1.3.9.ebuild 762 BLAKE2B 2ebda75c9a228f944bba081c10a528bdada790767115c8f9cf28e72270ccda2e5ac3e874fd0e071490e53f5884a23fc5eb148afcae755f31bb97d7b53574eca3 SHA512 8628b3397a272b6ddcd0effc3493edbbad50c99a4602b35f5583589d65f98fe5b3257c4514af2f670ce2aeb661161ed3695cc33700e68233ba3ef6c2ecd25615
+EBUILD JSON-MaybeXS-1.3.9.ebuild 894 BLAKE2B 633d672e643a4ca210d3b18edd14dcee70958ab6e791cabb75955c54305700b684ffad361e3b78171d8f19c2f526fa6b5e09a60692a3f4fff1d27513bad03dba SHA512 70e39a7603460774f8d3587585e98181e6236090d86d27296bc214a51d329e5c70c2d2e20d691be8f2819a585c3eeb9d6df0a22bc3e2632e310413f069941636
 MISC metadata.xml 498 BLAKE2B c3debaa67344aa149dba4497a9ed45a96484b63cc6e9a2d029ce87fa6c880f0bba050bbcdf43cd16bd55787a56fd3fd4bc2b35d239eaab54e737219ce1ba6213 SHA512 2db10423cb5558048db54f639e62d4ab05776edb1945089d48c979979fb1e369ae4f447c963d0ceefcbe5cca9ae525f6a0c6e59d29f7d536291b8300f2639fd8
diff --git a/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild b/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild
index 322cc5fbf343..a4bd28a2d1fd 100644
--- a/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild
+++ b/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/JSON-XS/Manifest b/dev-perl/JSON-XS/Manifest
index ea515b5b022b..de50ac6c8caf 100644
--- a/dev-perl/JSON-XS/Manifest
+++ b/dev-perl/JSON-XS/Manifest
@@ -3,5 +3,5 @@ DIST JSON-XS-3.03.tar.gz 83303 BLAKE2B ad2f20e2a2393a055dd18879de5c4f7e1254f7905
 DIST JSON-XS-3.04.tar.gz 83424 BLAKE2B 031e3b9d4902b7d9ad704655914fc4ee880874aa3073ded7248e5a842287cdaea47fce8be9d6c2999d19bdd3b5026fa2c0fb963c3183d6ac006387a741e0cdd0 SHA512 69c2e199385b5b5e331d905b64805304de80e1a3b393acaf7dce21c45254b1f23f1a83b246dcd3a80c2cfdadaf8ce3634ee587c469629cb69106f0c2239c73db
 EBUILD JSON-XS-3.10.0.ebuild 567 BLAKE2B dcec410f7a6518d8b751a8730c1ed154eadeeec1586be4bcf5496036535c631af535120b39ef7d3496f5e851315e69ac7a258880ae45a4ccfe4245e42f0673ca SHA512 4a31de3344bdf0c1bcd265c395ab9acdd7666e9ad0cbfe42a7b4f69edd283229a0134e165cd847f0ea8f21d694d81ea848a6e420b936ed7127723bd013f7ff00
 EBUILD JSON-XS-3.30.0.ebuild 641 BLAKE2B b272b7a3421dc60fda88af1532ae7ec4dc1e173433bc6187178069fa34b9dd91d4971b334cc144ad5d5e70f962d3daabb657028b333fd27087eeee6b88048b76 SHA512 2873b8afce78193e0825f0d7308ff3b4c090cdcca5ee9e3a138984989091225c69c5a06987bf7ccc122cb49c22d39ad0cc0dad2df8238ac2950096c3bc00bf83
-EBUILD JSON-XS-3.40.0.ebuild 661 BLAKE2B 1a2d6b3ae3f8c5946e2096c11836cfc80db88cc8c77831748f09452031f58e470bd530a5e21c1e94871f4b1a18e1c1e8722e01d8fdb6aefb748f764cd614e462 SHA512 348302055645f5e562475e62a17f27f4a2050bc24422753281e62e235eccad4bf75ffdbb4279827eda458c9f97fa272b4d73e73a624cdbff420225e628bb2b4e
+EBUILD JSON-XS-3.40.0.ebuild 769 BLAKE2B 7f5474d1147ac1e85e1987447278e75bbbe86fceec4e3e38dd3467188403324fdd715c9a940a58f7b86a13f7f5ac4c592d27a35f85c869c678b1b88ae3787c21 SHA512 2f29e462b77ead886ec3606fe152a1079220bfe5a5eb2df1f39747eceba3111b88b640ec76e25320723d2bc12f66ac4cd5a135a727bc5086b96cc0386f85f270
 MISC metadata.xml 386 BLAKE2B 954784aa8f5cb4d83e745dfbff8010f054d9bd01fbd020c60a186fd34b1410f94a75d9bd073f634e549a8ccaa754e35dd81d16cbcb229288b6f8eb2c58f58967 SHA512 929eec3831d4f9accf2ea3dda8eddf68f49c905d299f433ad01f854e7ee8a537854c84c22581545f3a0a4a2076322c2eeae485a9ed58789b23382055c752fa30
diff --git a/dev-perl/JSON/JSON-2.940.0.ebuild b/dev-perl/JSON/JSON-2.940.0.ebuild
index 6b68c350dd64..08fd4573ecbd 100644
--- a/dev-perl/JSON/JSON-2.940.0.ebuild
+++ b/dev-perl/JSON/JSON-2.940.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON (JavaScript Object Notation) encoder/decoder"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test +xs"
 
 RDEPEND="xs? ( >=dev-perl/JSON-XS-2.340.0 )"
diff --git a/dev-perl/JSON/Manifest b/dev-perl/JSON/Manifest
index 78d974f82ea8..a7502925cbc3 100644
--- a/dev-perl/JSON/Manifest
+++ b/dev-perl/JSON/Manifest
@@ -1,5 +1,5 @@
 DIST JSON-2.90.tar.gz 85333 BLAKE2B bcba4f04c1981ce15aeef5e862c567625425802ec25d46f29f4d053b0cbc69b5c1f203300d7d1bc7d2ea4ba99f8148dae63dbdf2494f34ed7b7b52d144dcd5f2 SHA512 72462a468aa37da73d164c91b5123c237c268f87215019fae49b7f212b0a25e0b48cd57b3cf0bd93c9fff6afc553b2417faafc0c319e62cb0cf4b1cf432698e7
 DIST JSON-2.94.tar.gz 82629 BLAKE2B 284e8fc19732ad680c9f953211f916222e29a032f2d70075d81df2372769874d409aea5a77c4f25fd00f2ff47784e34f421603adbdd0001834ce2e579c4de4b1 SHA512 0a20562441d525ee37fff467111f7d65124525e06b4f825079948752da2a983757e719025dd2ab896115b34ba146b4c495f738e4f005542dce0b058440c73a46
 EBUILD JSON-2.900.0.ebuild 523 BLAKE2B d258221d63c1260f98456deb1a2cc9832436dd578ec5c2caffcf65f1597689d31f1098815ce6201657556509f432bdf89f4eed5d2c05f3f0575c13ac22b678d6 SHA512 7a2ac585c9bab95b0d4d8747cfbf80e95a1734be309cd3df1d0b1331e060c269a996fd2a54a44f370a85f931d84baf1b469f655ed08f2a96c4d7110c3e6bdde4
-EBUILD JSON-2.940.0.ebuild 635 BLAKE2B e43511b9511fd26b648dc929ec422d45fcce933a1bc34d15e3cd91052d95ae88a8568957b62b7cb381f19bd5d9d901daa8b81ff9913db7dc7c332b0c7ae5bba8 SHA512 314a36f964aefc4d51076c98f13b09fb1fede753fba1e691910e534640b6f76998a6870fd763ab3f7314a41ff886071a88452e7960cb9c6f555bc7f34b710347
+EBUILD JSON-2.940.0.ebuild 708 BLAKE2B 725472179a0fe543798c5a4068b3ca44559f3c9e9dfde8f04d75463a060dc1ec4db01c6bf2e2227967c41c230a4722a89c7a341b3e2fc5a804d107719e464543 SHA512 dfd1a6484558d510268da9f85116b55b5417513b487c8cdb4ef01545827a0e6228416aeebfd377839a23de55f29e59d65e68fd66b33b6bb11fddb26aa7477c32
 MISC metadata.xml 740 BLAKE2B acb47648a40ada4067586febbeb3eca5497fe1f4f14fc16fd5e2adaa69c307853244ef061097a13ce60967a0f7bdb83267f45302f911accaed2d5abb6f81cb8e SHA512 39d70cef0132f7d359c8b473ba38bd0b7497e01b8c77edab5ecaab542a1300173a29252118e4ab4ffc16aab340e13b16a4c50c95a4e0aede2a5fc93420d33216
diff --git a/dev-perl/Jcode/Jcode-2.70.0-r1.ebuild b/dev-perl/Jcode/Jcode-2.70.0-r1.ebuild
index 61d971534889..2a387dc7384c 100644
--- a/dev-perl/Jcode/Jcode-2.70.0-r1.ebuild
+++ b/dev-perl/Jcode/Jcode-2.70.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Japanese transcoding module for Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/perl-MIME-Base64-2.1"
diff --git a/dev-perl/Jcode/Manifest b/dev-perl/Jcode/Manifest
index 8846fb81845f..4e312ae88e4c 100644
--- a/dev-perl/Jcode/Manifest
+++ b/dev-perl/Jcode/Manifest
@@ -1,3 +1,3 @@
 DIST Jcode-2.07.tar.gz 350179 BLAKE2B 71826dfa31ac87a50312fbdbbf7310cf7cde0fa2acb122757f009ff6c42d64e3e3499a6d51c8e8dd9d0800ae66dd9eb154c5d953a273791592892ee83bebb858 SHA512 821a917e24eda21bea3fe1188597b48463948c2ef75071882574eff1c1c8e3322aab8ff1ace0028bbc3340416cbaa834a6f0c9f82b18579206ba0cfe7b55062d
-EBUILD Jcode-2.70.0-r1.ebuild 426 BLAKE2B 059c6f79ca538e5336db2824a3aef0b3e6e21fad5b76224974c74322d93816542e7aef5e08750c3a897e849f0434e7d64ae83e778dfac9e78da5c711b5ef9956 SHA512 859756ed5322719fc8037775a1a24e2da9c00430928d2348a76560d86affa4d827c961f788307bed2a47879698019cbb5168f441349a0cf64dba32fbe1e304b3
+EBUILD Jcode-2.70.0-r1.ebuild 558 BLAKE2B b3c4dbda31b785ac95e3af2d4f141c888db8d8c88a2893efb084b07318becbcdebf87e3a55856914aeef0bf4176cd53bd59c60657a24a5909b1a879a70ebfc55 SHA512 fd65ed93b8597a163f5e83bf79de3286e747d82dd189164d28b0bc3109491720d674960d7befb3bcf10b06d645cae6e59f1afc521f7817e8da7665fbd2fae73d
 MISC metadata.xml 819 BLAKE2B 1b731e19787e91076278b81e414320977a450d5ee1565a7570c0b990c304f9b5cda17237c6a0d7988d2847e81985fcf1b7e1a53f97409e39843c98de9289b18e SHA512 62a7b847af8eb03fe872f0ffdb9f15cd18a02153426972f74348e97590b71736fd10d9cb508731187ec65748c874cad1366a1e33608ebab52970e4d3ee2ba418
diff --git a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
index 06203c876658..0c260616a798 100644
--- a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
+++ b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Does your process have access to the web"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # https://rt.cpan.org/Public/Bug/Display.html?id=112728
diff --git a/dev-perl/LWP-Online/Manifest b/dev-perl/LWP-Online/Manifest
index 1e3909f2c87f..cf5c9fc5aebe 100644
--- a/dev-perl/LWP-Online/Manifest
+++ b/dev-perl/LWP-Online/Manifest
@@ -1,4 +1,4 @@
 AUX 1.08-no-network.patch 1029 BLAKE2B dcd74d51a01bdd61d7ac6ca89f9198c57141168907d51179fe7d4dfb461b3aaa725a0493e25ed807095bab5c7e0cc97b2ec5d49fc6afb01d924dcff1fec57e2f SHA512 1bedc7075021fcf7e8be1fbe972ce26f39af5ac2b46ccad96697ae05ac87f6bb8303e78c4c2b67f096ec22f39265a95ff5d86a64b13f9d364ae608593f0bc0a1
 DIST LWP-Online-1.08.tar.gz 32250 BLAKE2B 4696ef7d50498b5373bd52568afac5876aa7afbe41ca6fed0029274bc0b52e05b005179fa520a63c2e43e9ba78df0dc1e99a2011f4ff13915f2cad829e706064 SHA512 2b255f60ee6521757ce3d49cc0720e3985ff17e3db7b7868ced6a9e1c5444dc067c80b7d34dbe7be9679c134f3de1dbe0e9421a1a20ff388c812aacd1d964497
-EBUILD LWP-Online-1.80.0-r2.ebuild 845 BLAKE2B f5ad58f709347054be61f65f0f971c9c523111ce16f4128bba196880ff94dd9df76e18b015cbbe752b5e06069bb5d5380b4e10da40bc531b1c13c2cdf7a46447 SHA512 e6dbe4fc14328c9f2a6053089444150f2ae8b8c0fe896b5416dee802a3f6b5292f941987fcef8154d4df7c0a07a019cb4477d90d7e9c9c2288551d12f8795c9f
+EBUILD LWP-Online-1.80.0-r2.ebuild 977 BLAKE2B f0e0354c98936c239d219ae5fa6bef4430686a58157ca0be9572521d5733589f95068a50c33dac1dd0bc89e2e807fad00a0a868f3ba3d6720554bb43ef4f6752 SHA512 2b5d02188ba72d5d29a009069a788d5f31e36d3373429d548201ed2159a1dd355f31fe620f5d56f54eadd4f9724df0c5ebb433d5adfdb009ce87c49b80a668b6
 MISC metadata.xml 506 BLAKE2B 8946eac364e58e9d3965e0baa455a1b09fa28a77a6b021c52ce9fe168f172591142f2ff69a8a0988adaa6fb2b1e6ed63b428e8d5e4262628dc0b76583a55d859 SHA512 d8ba13433a74f5ce01cbf7f8813d5694ccafdd1eb5e6eb52aa37e5e5ead36063c782e777c791cc740850e69af6543b2122d7e714afa173b1748a9d40861ec7d4
diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild
index b2ecc41e78e1..67869b8dcc04 100644
--- a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild
+++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Provide https support for LWP::UserAgent"
 
 SLOT="0"
 IUSE="test"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-perl/LWP-Protocol-https/Manifest b/dev-perl/LWP-Protocol-https/Manifest
index bdcf851a1184..d8c690df65a3 100644
--- a/dev-perl/LWP-Protocol-https/Manifest
+++ b/dev-perl/LWP-Protocol-https/Manifest
@@ -5,5 +5,5 @@ AUX LWP-Protocol-https-6.70.0-etcsslcerts.patch 1595 BLAKE2B 1a0d41704506f988405
 DIST LWP-Protocol-https-6.06.tar.gz 8376 BLAKE2B f8c19db22689c50b707f45d19f745e49329edf14d87a888f9d5d4eab901d5bbeac0b525f13a3dd0ad8ab642a2ea7f2a77167a86ccbe5bc6644bc4478531be8ec SHA512 acc65d63da858f25cf9cc1e11d074f035e8ead4c1ffea22bac930f61100ff98f2bf0bb4ede12219d6c22bd5fe4d99532a45fe5cbc9a4b863dd16b0c379f8d2ea
 DIST LWP-Protocol-https-6.07.tar.gz 9184 BLAKE2B 0104a51ac8b5cedeedc2f19bf6079a2f22f050db5f9e9030a015b473c63c8c01ea1716551a30e9602323dd420fdd50e304840722d214d38e1ae2a0347c91448a SHA512 4a07cd8a1c44e31781069a632a77f3af43747933420e831b4fd4a12faac7dc04f0c6b10ea773c3e14ecb66209a547b3587c0e3f481a55b9929db65f7b10343aa
 EBUILD LWP-Protocol-https-6.60.0.ebuild 789 BLAKE2B 648d81b504d633d148fe678135ea6dbfdca6f71ede4850277d8a6c023e6a794e79665bd74bd0678fdb88e678e8639cd7569bf09d9254e8cde398fc39b3f27027 SHA512 f93b94a719cf5afc38782b5b3dd7c75ccc9b8654c35404204ea1c46c4b430a2ceca9c4db00b2f96028f46fb554f9d2864c0f9e9648a4c5f27c2395bc03f9c87f
-EBUILD LWP-Protocol-https-6.70.0.ebuild 931 BLAKE2B 886d00518d7ef1bf687aee1bb06387fffe0eadc99a97d0eecb662afb42ae0c600ccb1bb4ee11e9b0b5be307abf536328d11db48faa0345d644ae237bd894e9d2 SHA512 bd5d4c25d343042dfb48e52bb108a222d95c0a8149b2f26c6e2d5a53117f6b9345c0ef8b941a2e61f2f4c99a17a096ef7f4562430626b8b40957377b3ff76de0
+EBUILD LWP-Protocol-https-6.70.0.ebuild 939 BLAKE2B 9ec5d2a65aa9918378432e3827f933e372fbf6b0361ebe9c8dee98dc13b9eaaf7d02d86f66d3108f155efadd92552dfb9346310648f244ca5289b14939cc915b SHA512 0e6bde8cf2dc11e18311a957f5ceb82ca53badba3783e8d81d3e19c39d416b158551bca1b6bdde96a09b4f414b6742d29e3aa9038b77835005e84d29fd06af74
 MISC metadata.xml 470 BLAKE2B 3ca8b3351b051c0c140dfd02e57b98551aa5e3015d008ecd4c609aae9067535e9eec71c5c94b7f8f33931a69d6ad5f4a357cf91d070fc7932c8ccd692fc4471e SHA512 53faefb3533b9b8534d5a41f25eb5c77e0d9a5e765ef0c90a18c6bb1bee62bc9ee88ad4e8eed4c85453ef4cfabb240d5ff1e60e6a6651af0476ce0fa1d269bb8
diff --git a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.300.2.ebuild b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.300.2.ebuild
index af275dac9d72..a89ce2eac4d9 100644
--- a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.300.2.ebuild
+++ b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.300.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl encapsulation of invoking the Latex programs"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/LaTeX-Driver/Manifest b/dev-perl/LaTeX-Driver/Manifest
index 4c6713828747..23f70bd6fad9 100644
--- a/dev-perl/LaTeX-Driver/Manifest
+++ b/dev-perl/LaTeX-Driver/Manifest
@@ -1,5 +1,5 @@
 DIST LaTeX-Driver-0.200.4.tar.gz 63968 BLAKE2B 9464b55274f2fd4ceabe3a82c5f10620ffc05c7e838b12d58f155650927f93e41db3e1004999373073fa6517a4482a0cfebb3f5e6aa88fa3ce65684c577e6a80 SHA512 7ed52118076460d84aa465cbe6c637d7289e2197aff0a40a654d4fdcea9e7a96ab945c7552709ba7cc65f818828e4107477da47b3fe184e474d4baf105048993
 DIST LaTeX-Driver-0.300.2.tar.gz 54084 BLAKE2B ea26e2fd065cbd79304116ca10ac5f1cfe77247aa615c2ca635cf5eaa9701276ee94e66be0efccf2bb560c6271cdfee55f56a0a00f7a77086bf5e641cba1c1ff SHA512 09f485071004d151c2d3ced576ac7b5423fd2d014a3950e0bc8bc2bb1e507b4aa6f041a7d54ad085632a0988d48d69ad726439adcabb8d8a81e10fb613e78271
 EBUILD LaTeX-Driver-0.200.4.ebuild 842 BLAKE2B b79b07021b8288f727eab12dd4d05fcf1ea242660951025763fc473caf164e2095ab5dcba08802535ff08b3f59d4c28c38155cde6dbc43a5f459ef3d4b8f083d SHA512 8dd76ac1daa5bdeb3e9ed766d3bc41d63038d38b423bbfbd1ef52846c97d3849a81ed693d4b66b1412f2c55379c46a26ed868b2bdda5af5275635d4eae926d2b
-EBUILD LaTeX-Driver-0.300.2.ebuild 1023 BLAKE2B 22c043df989339d9098108079a5de7f868046c97b22478f3581f8c0aedf417f29d5da1ae0d0b88f96ab5725d655825ea21761ce45e6b54e46a26fdff8f83c4e0 SHA512 c712602a620258fbe6904b58a244b98008d9a6b7b60d8bff7c6fffebc967e852aeeab3ca2db3b094431f87ea7f5c1205a3556f5cf06888a71cb22d096b3a21ce
+EBUILD LaTeX-Driver-0.300.2.ebuild 1155 BLAKE2B 1cdedff115bbf954bfee05895f8ef556f101e16584c73ce98a6e036d538b56305350e65bafdb082b65651ac0d28c282497c1f57cbb51a24e3f20e155cff04b88 SHA512 fc60e050b00fd92fd1d4cb6a79c642c3488c67d80be2368c94e171a6ee952584ff655e0f6abe0c35c5af0dd4fb9429e4a822be05937bd93c6365faf9e876e305
 MISC metadata.xml 471 BLAKE2B 0e15a8c8c20685d48b85e2c474cd8f646be44850b144712b85f8cf1b36e5510b3980d3335e0a42d937af61556807f0ba739a096126e573382b540ef72cede42a SHA512 f65e222344ca0d16b7254b7d8dd180a12e898a7fa7e041e442f01273dfefc0b38678f690d8b0ae75948ae8443f0b9158150df473dd164f88faa50e210a4654b8
diff --git a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.92.0.ebuild b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.92.0.ebuild
index 9e2c9e035b4e..1f6b8930fa51 100644
--- a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.92.0.ebuild
+++ b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Encode characters for LaTeX formatting"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/LaTeX-Encode/Manifest b/dev-perl/LaTeX-Encode/Manifest
index dc9a469fd5b8..e6e06cdf005c 100644
--- a/dev-perl/LaTeX-Encode/Manifest
+++ b/dev-perl/LaTeX-Encode/Manifest
@@ -1,5 +1,5 @@
 DIST LaTeX-Encode-0.091.6.tar.gz 45887 BLAKE2B c687e36b21a77448d92a41d39f83827aa619f2c8d290e06ae23d9d9871fb0d5ef3c3c5da45aa665d0b262ca7e62949ae330ae9f7a70ca1df09be41a1d788331c SHA512 a0d6bb32a72aba07256b86fee134795792e52e90ddafd344f8bdc4aba318ac35a2fa62e47ac4586956f78db79ed6382bf859fe5151cc1319ca5a92f5712fd9ea
 DIST LaTeX-Encode-0.092.0.tar.gz 46309 BLAKE2B 85dc90a91f7455c2bd14271cf40f4d9af16aa9298dcf44b889fec16b809b09d5bf6c81ecfd4cd5747379f21e6e27de9ae6f6d1ca71d6296492e0a885d9596825 SHA512 6e77a3f48d40f47c20cc08c65eaf9a8635b2fa8b6f3ea403dadace85f2b8bc7e2e7a0834b3d55b0f24ab808ed9d2fa36dafdbcf04670e566b51c8f6a3ffdd144
 EBUILD LaTeX-Encode-0.91.6-r1.ebuild 507 BLAKE2B 69ce94646657eab002f1d3cc815a15636e9d08315ef8bf7bd52ccf7ddd2c0e191feac795154dd510b2b8a2976e268433f1777489aaa112112ed616e0da66f8fd SHA512 1a19d78899345e82a5f44fc77feea37904545af1dff68c17a4c1bda49d2c0ebc0363ad79fbe5fe971894bd678492654f8274fd3542371ca21f91ede064e8e607
-EBUILD LaTeX-Encode-0.92.0.ebuild 566 BLAKE2B 265a2e7ab66fcf1f80601bb6b37b66773ca374f0db957be420630f47f886c86a8944c41a30c3c95bc8da86746e101b207ce8b7bba5f4d62e5f034e5095c3ba2e SHA512 b406857e964ccb9dc4db20cffdeda19fcce2ec79a300fb4c358b973617007050a01013d2d8e748bcc444fbaa4e246e371bb052fe1a220371bd27b27e689413d1
+EBUILD LaTeX-Encode-0.92.0.ebuild 698 BLAKE2B ef0e6342ef74a277b1883d6aadd1c2a1502936e2e78bcdcc949c8fb2a333d49a94e35e2df0f1e9c08d0ac69be04d1aa83c24251a0570c73a03cf010ac37e5b37 SHA512 916471cbff70f2b414c0ac6e1b239909aa8f43dd1fcd22bda37de78e42ad7294febd1ed05a1c9520c8e38a3f5b4f3bfe8dd72a38d4beb6b2d6d4094231f3e952
 MISC metadata.xml 396 BLAKE2B d98702bb55d87aa3bb7aa1c55bbe37c067d79728b3a684fc6f1ada704591835cdde5dd392dfdc762e2cf989fcb356a20f3211b346a3838210d09669bcaca07c2 SHA512 390044b90f7d35948ecda4859cede41bc052d4865a98c77899e879e4d5f8fe0c6ce15b7c223b850382b003711782bce1b5d06d4963cfc65ef03a41729a0ecfb4
diff --git a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r1.ebuild b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r1.ebuild
index 34525457ce0c..e7e343efdb81 100644
--- a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r1.ebuild
+++ b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for the automatic generation of LaTeX tables"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/LaTeX-Table/Manifest b/dev-perl/LaTeX-Table/Manifest
index e5263d9c504d..33421a2f6b70 100644
--- a/dev-perl/LaTeX-Table/Manifest
+++ b/dev-perl/LaTeX-Table/Manifest
@@ -1,4 +1,4 @@
 DIST LaTeX-Table-v1.0.6.tar.gz 427725 BLAKE2B 54d4d1fa0a376fb1825fcd7b8f21ca5f1942a2e7d0d6b2dc698cda0d1ffca7c18b73c14790fa9b0a72315f042c12281e71d5d37afd2e99aa2000377d12e0c270 SHA512 589b2b5f065348d15959af3d83040b54ab986bb8c5ec0c1e51f7a315230266dce5d6d3b43c9293ad2f6163fa3bddae62b825306c5a0a519f38903b50988f003a
-EBUILD LaTeX-Table-1.0.6-r1.ebuild 668 BLAKE2B b1ce99629338013c6eb91ff98933e71da75b3af9df49fc01a396793300588e0182f6d9875303698d326663e11e6d6dc2801e432fb74ff342113c70207c99973a SHA512 13c77e9af547d9528477c8f741d2571c3e32e2ecfcf92b0b6ac35a0696edffcf6e803e1dd73fcf1fac45cc0a2d904043a47f75771985f7de1835fee174774b4d
+EBUILD LaTeX-Table-1.0.6-r1.ebuild 800 BLAKE2B c20ae292cc7686d884bd58057128ca26fa1dff256c93e21aa150cfbdd9d106f3d12b9d0b43d12fa435fbae988706dfeade5516b501c12eec69e15c22797398a7 SHA512 72d4f32bd7ab3e1f730827b85e1b451e02be221aaeaddce2cb0e6f9856642ed5ebf2ad0c3f3928a58b527663b1cbf4d02ecc09d842fd80dd7f23df77012c5d9b
 EBUILD LaTeX-Table-1.0.6.ebuild 658 BLAKE2B 8ae44ade8bace0a0842ba424e095da43af95ba3074382b1680fac348dcfbc6ccb9ec427e04e40883eb982e0aecc5eff5820b77335797cedea43f89279a8d1691 SHA512 7af9ad48eca1a7fd08060e2fa2292475e18106b3b0e67031b8e7d1f5883ab8b034136e37487438a2c2d0b5cc1b21a14487b1f2f0633e07f4456bb376f39e50f8
 MISC metadata.xml 1139 BLAKE2B 8707cc647a805bf6c3c0f20e216c1282b1d2041de29e7a6f8ae1ba46606c957ea2d654e7c36bc508b0c05a2fd27f8375f729e20406f3ac9a0ce94f98b732d7f5 SHA512 343d73ee69b99e97f12cf4a9dfc42ef594db8462b6c09e8aac4132597847ddaddaaef8ea34e97314b3c544adb80f929eff70698325e9d4792a04db116e4d240f
diff --git a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
index 0ea28bcfe347..ad43f085ea5a 100644
--- a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
+++ b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Prevent leakage of lexical hints"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # Note: This module is a no-op at runtime since Perl 5.12
diff --git a/dev-perl/Lexical-SealRequireHints/Manifest b/dev-perl/Lexical-SealRequireHints/Manifest
index d6fd263b5402..377981820d0d 100644
--- a/dev-perl/Lexical-SealRequireHints/Manifest
+++ b/dev-perl/Lexical-SealRequireHints/Manifest
@@ -1,3 +1,3 @@
 DIST Lexical-SealRequireHints-0.011.tar.gz 20649 BLAKE2B b95d6c03c9f85de34b594a09b22713467746e52340ce752c0a4b2ab4268a7b3df057a1e769b38a6562b48eb566389fc162873960a73d28507051e72d28621f1d SHA512 b31d3527e3ea1d28ebcac58cfdb35893643c7c371dba96cf06509cc7b1ce61c38f6cc37f420c2ec93b0a57adfc3d3cd797af97fad9aeb6e1000ef1769e26c31e
-EBUILD Lexical-SealRequireHints-0.11.0.ebuild 595 BLAKE2B eee5c39673315f1fefc0dcc043f2084bde28068d36bfdeaec2e88256f1b5b732236314ffabe2a7c46b9e7e03f6d6931dd007ed48fc30e797da0c35566f10bf5d SHA512 48b78e033a6b1335c3a4c88c537d8c2820528c5ebe772f6e980e9cf8c280f9a64b45c4a395e2870d970baf3676dd6cbb65a5b9a8a91e1906d859f917781f76d5
+EBUILD Lexical-SealRequireHints-0.11.0.ebuild 727 BLAKE2B 049c6db0818fb3189cf66b4517cb6767f02ce66dc44d35e3eafc28f9ff3ca95166d0153a52e80078fba61b54ce7ef87557f71ffd5fb9233a7e9e7b13a620d229 SHA512 bfe54d4bb6514a39e988108eece13a2ecec5661048a2901678ad72af1a3a0bf91713a30bef79944c89a334fcde33f799b9141c8197164fec0353dfd6c3518753
 MISC metadata.xml 420 BLAKE2B 64b6e4cf7a687278b3ff304184ef846a2822f46edb06f6489d29ccca791f858f635f3b94320f45acbf2dd29fe9f3c59e770c1c4544033e0f8cdb4008bfd26f43 SHA512 5ac0a4033b8d78fa425532735ce04caad6ab864b44d1d672120f2bf7ad3398f382662e36217265521718e99c4de9810e848cffb9b5579c6cedda2b90c73b3426
diff --git a/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild b/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
index 7c6ba7dded3e..9066140bed63 100644
--- a/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
+++ b/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lets you build groups of accessors"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/MRO-Compat/Manifest b/dev-perl/MRO-Compat/Manifest
index 05eb96e7b8c5..20f6c5d4f360 100644
--- a/dev-perl/MRO-Compat/Manifest
+++ b/dev-perl/MRO-Compat/Manifest
@@ -1,3 +1,3 @@
 DIST MRO-Compat-0.13.tar.gz 8711 BLAKE2B 01b2341481d289f3ba283c1acdb4da0952beddfd53646c4b0b2ad9cbd64a4ea5e98ba32bc0a40f6bbf057556c58e872b1ef8c7bdd5738cc1aa112336e4e82b7d SHA512 3311c37c8fc73acaf68bae2b12315a448a87de8f756e817c967cf49b753cf218e8c762ecc44890297afd82193d71b2407060db0bc70720d228b31c0a30de10c1
-EBUILD MRO-Compat-0.130.0.ebuild 544 BLAKE2B ebe8782c753ec38f9065224b17b059e6f376af3ac7d30f9289f64760bf042ccfd5f7ee9b96553a4f0a52ab438101c4253b9a441448ffef2eb9be3ba171360684 SHA512 f80b25ebcc87e78a2f35d0b91e519c6f218c20f30daa5a544f9a28b108834a8d99ecac466f1b76bd4a05d0ad6ea89616fb583e21a0f15154cbd1f7d50ff9e78d
+EBUILD MRO-Compat-0.130.0.ebuild 632 BLAKE2B bf7566412edd926d6c6ed337f9958b25e78cdca23c5c88b83ca7bcf12cc01850877334052dc4c1469fc0d788d737a7a0e02d04b51c22d8ce3027d4dae38d54b9 SHA512 f1d20bd60419258d968fc6e5eb652b2858c0a72b17abf9b4367801811a23e1a56c6f6514c034448dce66394849e10d3d417d427fe58f202871d008a1d2941b73
 MISC metadata.xml 392 BLAKE2B 4283579119a97c4572d4a917aea467e55d3d36e829374a88ff0856693420c2a7e507aafd729fa2d347a5abe8d3c401f3baf1d0ab227624e79732904a8ef8ebe3 SHA512 aa5bb7a69d8ddc0946c29f34fc947d78edbf46a85da4993521b78d72266f565125ebe1e425e30db1c74589fe9b162a9c0f638c29feb94f7dd96508b7fcaf5783
diff --git a/dev-perl/MailTools/MailTools-2.190.0.ebuild b/dev-perl/MailTools/MailTools-2.190.0.ebuild
index f9f8a9577532..24afb79946a5 100644
--- a/dev-perl/MailTools/MailTools-2.190.0.ebuild
+++ b/dev-perl/MailTools/MailTools-2.190.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation of electronic mail addresses"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/MailTools/Manifest b/dev-perl/MailTools/Manifest
index 8cbbdada751c..88d33595839e 100644
--- a/dev-perl/MailTools/Manifest
+++ b/dev-perl/MailTools/Manifest
@@ -3,5 +3,5 @@ DIST MailTools-2.18.tar.gz 55263 BLAKE2B eb7f48d3f33c0b691a7eb42ad186d6fc98bc900
 DIST MailTools-2.19.tar.gz 55887 BLAKE2B fedfb8fcf94935746b3678b34ea52dc90722646ce28138990952325d8f94c26204fe8f0d1ae9ea541663b7a4875330a8006987dfa581457f62763fac64ab5d99 SHA512 a4ecba2acba56f2d41294e1b299c08b138d5e4796880635afcea7628adf60e11d5b138fc56001c331f765048bd91fa94da27bd7fdeedc51ff91e4ef5770a068e
 EBUILD MailTools-2.140.0.ebuild 591 BLAKE2B 0f39ff1aeabb8fe8394b2419c1ba73eaca443175a14b84929c681acfeb5eb02a3e65577336b43da326363497cfa20e1cad920e68067cf9ccd4611845781bdc98 SHA512 576e1006edfe1ab5cd6033688c5eed6cfcb01fdd873b43d15e38daf15fe0cc7db3af2bf943e1e9fba7ca0c99d9a1811b6b7097c25a080d82be9e6d1212085c8f
 EBUILD MailTools-2.180.0.ebuild 601 BLAKE2B ac3a04002eccde3ea067deb3c94ce3e27cb60b925a260aabfaac5c4ec6076cde6e8a4101056623d615a2e0b034e8dd8668389d5dda0e3b3dc1f568da339dbc03 SHA512 c10eeba31e9eeb8ccebdf1eee9fa7a7455fa829a5630ce0c77cc9167ac0d459e2b2439dac71a85374bf05f0badefe49dc807852ed6dc723058c7a68b1473984c
-EBUILD MailTools-2.190.0.ebuild 655 BLAKE2B 3d989064b14e77430941f2ec2c1e26a508c634e48cab1d03544429baebac6fe52f2ee6287a8eb97de16ba8a7ff68cfef9ab639aecdb7f8cb7747fb0e0c0e3928 SHA512 d53ee117f1211d47159ee58c6cbf1b2abd598d7043a9e0092d3afba88f3060584f8a733ac3426e48803959338bd92a7c062e1324302300779141e4e3dbad544c
+EBUILD MailTools-2.190.0.ebuild 688 BLAKE2B 557f2e82a366d8e6b2f8a4d57423ffe7e5049d56c7b4ee53b334029d677c4b8afd1e5f0eecf6dffcc9dcc1634178ff06608baa43780b06630329794443e3d4c1 SHA512 ed59d3d48c956de282b9be41cd0444c055d27d6b8e1b910977f79bd779fe1807171fe48b53b3f529cafbdca7c5d063e80793b7ee6fb59194b3d579389aceac48
 MISC metadata.xml 1734 BLAKE2B 8f4ec9850270c7af488676002e89bda5cbbeeaa14516f865c2d0603fabacc1b560511a048b109dc823f412a8a84c9b4084a89259879580d881e42d5b9d441e9e SHA512 24fdaa48c4c5a36b7f77ae6d1fce705db6d53cf5e2280136fb10b24acf869f7ac2b006abfa51f8711cfc74b0204c4bfc06d4fd8e4b6cde04dc53e3e018b1cbed
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index ec1089410306..b814e6af78ab 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Module-Build-Tiny/Manifest b/dev-perl/Module-Build-Tiny/Manifest
index 6427931e9859..67313151b74d 100644
--- a/dev-perl/Module-Build-Tiny/Manifest
+++ b/dev-perl/Module-Build-Tiny/Manifest
@@ -1,3 +1,3 @@
 DIST Module-Build-Tiny-0.039.tar.gz 20663 BLAKE2B 730ba49b5d7090321dc11d44d6e3a3fd42f81baf5f82c3e5044ede7bbe86e83d78dc8a0678671ebda4256365c5d24f118df5c12f0d2f8fad96cd8ab49206837d SHA512 26ca6fe4c1792b26bb2b4711035847f4215ea7c37234fbe24fc07432682fd9d3b6016dbdb2ecb455a7b13f6bea13994826c7f84f21075f0a6e575fa74672903a
-EBUILD Module-Build-Tiny-0.39.0.ebuild 971 BLAKE2B c6e866134c91805c74a3baa511f0b6b9a5ca4b4f496cc651fe399c4f1029706f3f717c71ead5ee2fa0235cfe68c88e1d084565c88eaea87f43bb60d447c9d426 SHA512 ffc6389c471670d114798b82e258a2cef419b035b1e1064d28aab734a32d40d0c1a1996beecceca4bdca28fc4439fe182925c47abc157474906a14ff354063f7
+EBUILD Module-Build-Tiny-0.39.0.ebuild 1103 BLAKE2B 31d53cf2e30fd0c0dd015844d6160c49c8a7b810f57341d4051eb92d54a3c752b81ec8c0f0836e9266eef3991d4e9cd2c6f8e5306de91952eefdfaf8a934511e SHA512 afb53f2d19f259cb1a456efd4e1d97c0feb571965334b14359197d6139cbfbaddb460178f3453ef384162ab2ce65334ce76d335ebb692ddfc9aa111320f36df9
 MISC metadata.xml 395 BLAKE2B e86cb4512be53eef00ee89d4eeab8a7413f3a7bb4b93a0223cb2b48891b4f0ff52216d4116efb7a29861d8b4cb6ab85dc30876c51da8ebda2a7ab3e3c2b1172a SHA512 956e4ff8b67c038faead4f080f7bf19b1587d526aa4d68f72a78545a6473046aabd8386ce7a37b6d5ebd3420613d5ec3599747cf1850500033b74a4a1f0d5b49
diff --git a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
index 47147bc60b3a..c320e0b3ba8b 100644
--- a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
+++ b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION='A tiny replacement for Module::Build'
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Module-Implementation/Manifest b/dev-perl/Module-Implementation/Manifest
index be7a77992cac..f19cd0311efa 100644
--- a/dev-perl/Module-Implementation/Manifest
+++ b/dev-perl/Module-Implementation/Manifest
@@ -1,3 +1,3 @@
 DIST Module-Implementation-0.09.tar.gz 18553 BLAKE2B bab4c80f852b72ab8392d4e4f2717c1af0742ed6078ce92f1d5ff345c60f752d16f98b46b371c0c7596ff1c1df5d2e41e05927b6384b9e4b11ab7c352e54e5f1 SHA512 049f967ba1bd8a3914968b34006030ae318d99ac629a0f34736f1c2b5392490c30aa0914e777eaefda7f0f58755d2d3363a266b90db59b53fe145ef68e1d953c
-EBUILD Module-Implementation-0.90.0.ebuild 854 BLAKE2B 29160e5f98f238da637bbf3e675092a67a8b85f6723b3b119f392b9163925dfe30180ad67ea31a53c41276dc36f8ec873ddae285ee3857283fb217674ebb2e7e SHA512 0acb0775624bc5d91706b6fb56fe6ab17793ece535563fa93ad246a6a64d78fdd472a4fdd5b758c2168f2c2505188e54bbb55eceb7835a86ca4288b933b991b0
+EBUILD Module-Implementation-0.90.0.ebuild 907 BLAKE2B 5a559418359dcf21651190757577cd713ca412334db7dc05c255d5455b5a727ca0b411cb7cf0cae7d26e3247d9873a0eec066ea7f1cd145c7a7d596bfb71df57 SHA512 c819e2a7908e227e8c942759947d4efd22dd354452a126cf55dabcfab3065b0af297b33d8406c6296d165daec47dc778996073b0a592d06ee165ca443806365f
 MISC metadata.xml 414 BLAKE2B bb3116f016b54f7b6c302a995fc1fa4addb0e140624766d518cddbf33423cf197fbf20feea579a2f5a57a368eb756c5338facebe66ff7ecc4562246f3bd1e57b SHA512 be433eb1fb26d27174824a01d076585b7d32877a8936f87b876282d71bf9e2280571dcd64d1612c34a4bf58741a23166d4c5f4415fb907e0bfbe5c339bd64887
diff --git a/dev-perl/Module-Implementation/Module-Implementation-0.90.0.ebuild b/dev-perl/Module-Implementation/Module-Implementation-0.90.0.ebuild
index 37563d695ae8..84795a8208b4 100644
--- a/dev-perl/Module-Implementation/Module-Implementation-0.90.0.ebuild
+++ b/dev-perl/Module-Implementation/Module-Implementation-0.90.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Loads one of several alternate underlying implementations for a mod
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Module-Pluggable/Manifest b/dev-perl/Module-Pluggable/Manifest
index 1b1ec940728d..320a7534a469 100644
--- a/dev-perl/Module-Pluggable/Manifest
+++ b/dev-perl/Module-Pluggable/Manifest
@@ -1,3 +1,3 @@
 DIST Module-Pluggable-5.2.tar.gz 26920 BLAKE2B 061ec1353ec7ea8fd00e503914f8dba283be47ca1c2ecfa237ae985e8c099228dc949f66e2f182729378c578b25417e7c3c798f855b4bf1b5194f62d513a0f66 SHA512 7df8ee6713c8e0d4df756736c43c2033632cb8887c82ed5b9f38476dbf402b5daa3af83d3b2bd1228afb020ce5855831812f86299b63518e04e0929390b0c5f5
-EBUILD Module-Pluggable-5.200.0.ebuild 627 BLAKE2B 75b68db380343b3988d7fec77f3ef78d059003f9c6577b4c30ee8cd5690819e2ffe5f46413ee1db0f435ec1b29b1ad0a515be0c8362d4fc09de2be94ccb6c954 SHA512 9b1dda3ae59dd913c8137fd774b24a09be2d56e0136910c1a201ce44004f823a2a9631d26ddf4c97b18387ec884807c3dd4af0f09bd354a003cf5f979558be90
+EBUILD Module-Pluggable-5.200.0.ebuild 676 BLAKE2B 4b27baeb7e4af4f105d1ccc7354f84c4de767fa8c88e9bdae161c4fc7520e68e9c18939c0f0768b31ccd9cc8a85b652ac61945f046bb27b6045409dbd76b7dd6 SHA512 d8ece555cb7375ed60b17e321ebdd3c0729c375e83413ef98a27a5df98cda40409113b33cb09d685a677cdb8c9db1a9c85def2642d6a4d572cfa95609802ebf5
 MISC metadata.xml 542 BLAKE2B 0ced543ca277446ae494855819e6c5aa3c6d2d2f99102bbea8d0f0eeb9d0cb61dab3a2cb001d2f898b22d2a9f6af21c1f687b6c4313080bd7933d33688309a2f SHA512 e4c24921dc692f77272596175897da215580e5cf3f2d7bc64bd2f7e3fedc17a3d1b78ca4eb8cff151ecf5c579e47e81e2c654f6d71c201f9e7c7b28e278d3a3d
diff --git a/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0.ebuild b/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0.ebuild
index d42b1f42e419..4e83707c9e21 100644
--- a/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0.ebuild
+++ b/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Automatically give your module the ability to have plugins"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Module-Runtime-Conflicts/Manifest b/dev-perl/Module-Runtime-Conflicts/Manifest
index 8b35a46c85fe..2a3ab9da3225 100644
--- a/dev-perl/Module-Runtime-Conflicts/Manifest
+++ b/dev-perl/Module-Runtime-Conflicts/Manifest
@@ -1,5 +1,5 @@
 DIST Module-Runtime-Conflicts-0.002.tar.gz 24802 BLAKE2B 5b401a4489e0a60e8dc1ef84f91f3cc970d668501446f1b58226f900b5c5335d1d8ed6bec5e6bb4fe841700e58f58ca3f1846db3509acc80e907163a1df53f72 SHA512 e07ee4e7707b6c8ee52afc01f7fb7e8a04fc9ab3f3e4624fa7f4011bb314aa77aa0e060c58592e3bc21d9fb6d9d83190bb655b43940e79a4d95557ce720530af
 DIST Module-Runtime-Conflicts-0.003.tar.gz 24935 BLAKE2B f67a6647ef8a55e2de845f9cfc004f12bb2a813843f70d1aa0cc53912f385d6dae884ae0a12f81d69039d810d0ea306cbfab6bfba913c4eb2583c77d4a075aa6 SHA512 1b72ea7cc9516721290d5ea433169697b4134b5fc77872d6822e4c395a154bf956d469ab5da2802d587d60dfb13b9784014fe492988cf3f8b5820da2d63e8ca1
 EBUILD Module-Runtime-Conflicts-0.2.0.ebuild 584 BLAKE2B 77d38bb325ee7be68d9cb2d5263cc882521691925b57106fda545525d0ea7c72c0625bd56be949f0b8498ce9375a7408cf27313d0560196997fffbd9c188ff0a SHA512 d896b14ac0ad6a02892bfa9a884146c370f02993d7ea0d1e00883edfa920354c5d3b8167e102ccd09378e76591bacf4a40e0590e8773cce5f883667c35959f0b
-EBUILD Module-Runtime-Conflicts-0.3.0.ebuild 555 BLAKE2B 2640860586400940a7a969ac3d7260987015bf806804d8724826616471ba77544c0d64481f3d952afb25bbee83590d3101591844b6a59ad43c59677a416c026a SHA512 630535800f703aa28539d35aceefd393e416eee93283318b088f8fe5ef3d4c9822cb3888d81225a5ffd5819a081346b9ae102bf5f6a2c48e7c86858c79639a54
+EBUILD Module-Runtime-Conflicts-0.3.0.ebuild 687 BLAKE2B 6fc06ce7ba19669a892d3edf2ace73970fc312a7803b41fd98f2bcb43041d913b5bfb04de722dff7e793c90f1263274c74736608df6c4b78b36c6066a49bc43c SHA512 c32ec945b8178f3c8940f5f53a4e0f411358c86d6484da5ef2bca28fd4f21519c3bbd11c07415aa613319f1643cf6e770b5c219e4917460e2cb5491b6b3b98f3
 MISC metadata.xml 421 BLAKE2B dd6205334e793d2b7d57945a3c6cfca124c7e3bd74e8bc103e8f5205940caad2802a4bc426da8c6d1ecdfa988affeea7433271f294fe9651f0acec124fceccc6 SHA512 ccf1414909c21772296c3e201e3f04daeee42883671e447957d113c204de1a6ba415a647717a60dbd4d8745ed2efc3c9eb778ba04e471975a279e0cba7d26c34
diff --git a/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.3.0.ebuild b/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.3.0.ebuild
index 191c62b49cf1..a5e88f560b8b 100644
--- a/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.3.0.ebuild
+++ b/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide information on conflicts for Module::Runtime"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Module-Runtime/Manifest b/dev-perl/Module-Runtime/Manifest
index 98b846c5d935..8ad780055831 100644
--- a/dev-perl/Module-Runtime/Manifest
+++ b/dev-perl/Module-Runtime/Manifest
@@ -1,3 +1,3 @@
 DIST Module-Runtime-0.016.tar.gz 18275 BLAKE2B c8b3d71deb7cff7817fb154c3b2d88eee79f56d10bdee0d41b880097dcec72a7eb0dc9db4b760d09463b3ff78139e1cd3b5bf3b1f0005d1e044e1858028832cf SHA512 64a362ee897646173dbbdd8794f863d93379d45d7ac20d3ae890d77b4ec3f5e36aaff66c41b4a6a33b28bf492216283528755550ab09e466ceafb4f0cfbaeb9e
-EBUILD Module-Runtime-0.16.0.ebuild 593 BLAKE2B f529e9d91f5a4bb871c4d24db8169a5a24dd412e63c1f5f2a71e8ec3fce14c56956303277eee1a6b545d4617c445496f29ca0bbe0f447630282214488ebc2c42 SHA512 08e5a97ab4365429c2421ca0519b921651cedf6e7cb907a03de044a68aacb85d21f57720a6a8103945b503358098830c339f5596e07a72b5687512f362c14c37
+EBUILD Module-Runtime-0.16.0.ebuild 646 BLAKE2B a37ce6c2d3ed4f378458294bb63c8e249c56e6777e65adb309b6d20ebe1902afe023702850a25934200e497972c5bb3fb824ce9aedbc6edb1253e7e98b102723 SHA512 39d28e5aab22b03c8913d60d42238df1bcbcc4b654406ddfc3b633d60eaa8993c01d313c149185531323ec5f504e719b1a54ee5eae953d3d892408b93ebe458f
 MISC metadata.xml 424 BLAKE2B f46423f84511442d70c4f2ff264e6f901ea40badd762c37c047d0e7568afa1fb6ecee6ba3a790f7963c99a5421dfc59d74a7e1ed067f13afbf8b746d9d6d654a SHA512 99a0a6e1014cb85c49d4e1131f808d0ad362c0627cfe1a21116b4fc75462ed67d16e0069714f38a8cf52f1ac2366fae192d99d9139b8ece470e12e71800ab4e5
diff --git a/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild b/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
index f856f1b4554a..7be6899d5f54 100644
--- a/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
+++ b/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Runtime module handling"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Moo/Manifest b/dev-perl/Moo/Manifest
index abdaee78e74d..083ff22abae3 100644
--- a/dev-perl/Moo/Manifest
+++ b/dev-perl/Moo/Manifest
@@ -5,5 +5,5 @@ DIST Moo-2.003003.tar.gz 97527 BLAKE2B c23975f64aae881e6e17ce899b7a2f393d52e598e
 EBUILD Moo-2.3.0.ebuild 746 BLAKE2B 6e91152ec66b411d76dbf44918807ee4abd00a346d48795615e6146be22af42568d79f5b7c32e691a01488062655fa9ffccd7dd0312b34b8f1b2482cc464e7a0 SHA512 bfadb9bd0d3a60a8bc78cdac5edc021dbe0c463cbb0d6dff740846d17eed2e8990f1b8b3196376059c07b5b3c1f9c3ce7fd397667c978da877d3f0da0f1e616d
 EBUILD Moo-2.3.1.ebuild 750 BLAKE2B 06098bc162e5101a7a9e63377bb8dc0c17fee5168eb0b3462b5b4091d8a0017ef4d25b0502cdfd8b50b982ead5b08f42ccd25953a5f5877f5d9b94fb4375fef9 SHA512 5bbe4d3a4a3d458443cc05237754786e9769da631014d1c863b7d3aebbc4975b46e7ee946bf51a012bf454dba6c4b4941e391c2bd8d75ff58b68a333eab8168c
 EBUILD Moo-2.3.2.ebuild 750 BLAKE2B d6d011db117011071a427c5a4f4c2960b91da810b2871bd4f37270cb4936af20ff27ce34f0a559f6ef675371d83c5c7a7d5884b2b5010b940c04a8a59d44fa77 SHA512 9ec857e543a99d4261d6cb60bb9d5fa3e5ed203010ef35b4b40e2748f49a73355cbf932e0fc3fed26337a7225522cf80a98f0427298d55cca7f14a301ff53b91
-EBUILD Moo-2.3.3.ebuild 746 BLAKE2B 043a9e2843abf1a1bcce6da7f996faa68e624a9c4ef6b8c75d980ee9df540f8d867c0fd407ff7ba73effb04a4c367f555a2473d7ceec94daa86ddc81efbc6d5d SHA512 6b802338dece1b71dbff0fa8242b2a876c25280eb5ebf53238d49ebd55a8cd1a7dec41bcbd4625e9a9832c7bb5489257c830fcf71aeea3e5cb2a58e22e97f252
+EBUILD Moo-2.3.3.ebuild 845 BLAKE2B a5d7429a852b1cd9ffad2fd7eeb0d9cb259a6213db7e05ca331ed177795a8d44b304ea6a1237ab710a1d2bc7e7a7df5159dfce0fe57789c56c835c67111c9165 SHA512 5b705a2fe33331aceec31df0fbc457fa9d3f30747f9e3946f88ea22ef1dc3f54e81ad7532c092a1bf97bd28ced0fe6e61153402550e691df12ea5bdd8eafcb01
 MISC metadata.xml 1197 BLAKE2B 7611199f57b617634c1aaeca3184d66f3f445bb700fae40ca5880aa8e654f7fd1f90f03fcdbef60ec200cd6e3a5da0f6b385628c15a1098219b6bdd9458eadec SHA512 1baccf32ca49e459aa24ad83ccd3206630462181219ad5981787b42f70591254103231e26065848716b52e579c2b09f471b559dd54925750e80adb9494c06a28
diff --git a/dev-perl/Moo/Moo-2.3.3.ebuild b/dev-perl/Moo/Moo-2.3.3.ebuild
index e44afc5a0bc8..d527b6ffe8c9 100644
--- a/dev-perl/Moo/Moo-2.3.3.ebuild
+++ b/dev-perl/Moo/Moo-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Minimalist Object Orientation (with Moose compatiblity)"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # needs Scalar::Util
diff --git a/dev-perl/Moose/Manifest b/dev-perl/Moose/Manifest
index b45592606cdc..34f9964c8a75 100644
--- a/dev-perl/Moose/Manifest
+++ b/dev-perl/Moose/Manifest
@@ -9,5 +9,5 @@ EBUILD Moose-2.180.600.ebuild 4062 BLAKE2B b14d0db18bbd3f9a4c9ef4133f84dd9d9b533
 EBUILD Moose-2.180.700.ebuild 4093 BLAKE2B 2b849031dbc1c1492e4da88ce5087c658427dabfdfbdf13b61a640de3425bc8c7d83992bfa52f22a5f708a72d5c897863f7e7fdfb1e8947bf5ab03acf96c079b SHA512 3493746ef2767503f75a8eafb53aac0eff076fc1abbd59419b8451575f6a26c131b3684d121051bab9c3f5b7aee056285c8f82e07a26c439939575b48797b1f6
 EBUILD Moose-2.200.400.ebuild 4094 BLAKE2B 382455b006e3889bc849f7a7a9525275fcd02d43795b3d3685d2ae4c62dc3c8a63cd40c67064f694614e24b574268f13612079dc4e1795202e6c5efa923bb932 SHA512 1ae21624bad4caefe97d0494376e4e45a4b2221011bbff18d6c518af55d15be0dce6307b99924389ca7dec59864405fc78e45296788529bb5ccb13f9787b34b6
 EBUILD Moose-2.200.500.ebuild 4094 BLAKE2B 9fd2b23f4c7ed270d878b8d211fa69c3b9774bd4e40866971f25d7203948d69158eca12977c8a5540d56c20866552801f109964a7648774d1dbec00101534756 SHA512 d6c4434c6443181c89188c190789c7dde417ed1e69ce06f2a5aa76e4c0d7bd1a44b0f4f1168565c50f53955a567e668f6f0d0a3cbfa7eeeeda2ee56b5c482b59
-EBUILD Moose-2.200.700.ebuild 4094 BLAKE2B 1627e0cf4d8e97aa7c5eea9a9e70e071bd345c52fd1eec3de4fc7fd0e07e11de1f886b0446029a06b90fe44d8730dcadbc01a36f24d420c3ae36c280ab65766f SHA512 2b8302c7a2f931a280ba04e02079df85dfa450eca38ccab3601bc38e3bee2c7c1ca704e0b4ffab141dc8cf44a996a77aa7b14e1252d197713d3dd8bdc470e49f
+EBUILD Moose-2.200.700.ebuild 4215 BLAKE2B 4cecefe3712f4b126298f1ffda683b8cd06d233f30eaa742d485754f39b255257a1154ecc3f45343466080d1fdbcd9dd0654ee3382640f323d6dc5f101f41173 SHA512 6adfd7ee7add714a602d34de3045c8c60df9fbc8a140ce14fa361832cad4e6bddde50623ba6020bd2e4f39caf308e571966e9c7aaf3559fd249b670a3eccfa8d
 MISC metadata.xml 35448 BLAKE2B f6c44e9aedab6ac47f51848cc9ea2d3518f2854e59ef1742866394e2ab4cd7de18275e27da82c885df7d1865ae1ad8f397979f9a175dd10599290d4c566c4f8e SHA512 5d7a51806b0278fc5dd7cd1d487c0f211aefa638dbe6839eb5aeaf5219b03d97d7d0765bcfd603a9add64ea3f72ef770ffc9b39578cd728467e066f1abc12579
diff --git a/dev-perl/Moose/Moose-2.200.700.ebuild b/dev-perl/Moose/Moose-2.200.700.ebuild
index eaa8793ed68e..e4dd629f8750 100644
--- a/dev-perl/Moose/Moose-2.200.700.ebuild
+++ b/dev-perl/Moose/Moose-2.200.700.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A postmodern object system for Perl 5"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 CONFLICTS="
diff --git a/dev-perl/MooseX-FollowPBP/Manifest b/dev-perl/MooseX-FollowPBP/Manifest
index 02e9b09486e3..9706249d2719 100644
--- a/dev-perl/MooseX-FollowPBP/Manifest
+++ b/dev-perl/MooseX-FollowPBP/Manifest
@@ -1,4 +1,4 @@
 DIST MooseX-FollowPBP-0.05.tar.gz 9517 BLAKE2B 67c21347a374d6e9722e4354d9ab640d40186eef4ce84d668ddfaf6ef85a0ab1a6221900176599bd89446abe81a12b87be28a6bb8a54dd5c82b57458ee5a6489 SHA512 40edd8219c6afc032901b3a692fb51aa0867eb5bb91d17fc806cb74a19a034ab11992fbaa8f3b2f711b667abe9cc911f819b1f0b572f152b199e226cf6dcb7f2
-EBUILD MooseX-FollowPBP-0.50.0-r1.ebuild 561 BLAKE2B ee96db8c3f862d97881c8ba0af546fb838b8e4bc882b3a9eef730af394a54a6dd0134050ae20b2fb8d9ecccb4f9d41df4b3139870b50c47aff16472053227c74 SHA512 1589c90033ad8143e40ed1e36c1d815a0d13e99c9aa4a97e3e7e02caf6036b07e3e456d375bdc377f3969f2434f749938bdd09a7d41dc2fa9f3ff80036bb0a26
+EBUILD MooseX-FollowPBP-0.50.0-r1.ebuild 693 BLAKE2B ed2da470507eab2f6dd1897932598f18f42404842efcc727a613c1d900bcf1bfb590199cda38c91b6dee9dc168a4bfedbf8a00fce5f2d9829cb3bc31aebfbc0d SHA512 6d8ed23a8bde8bc4af52fdb58969c6ee6936ff3f295fa68ee9fbc604507dca2602ff8a5a54566ee3b4cc986e6634a7bda80adc32b7ed343860a4f9f791b1c69f
 EBUILD MooseX-FollowPBP-0.50.0.ebuild 444 BLAKE2B 3603d5ca6305455a8b9d60b6392e5ae81e5e9f51fd6f108c34f1c4814dcc2dd02af45f77fae21f0a1d7df939de76a98a1b5dc50c2cfad25f0ed515d45871e360 SHA512 f8140f8212f2c42cb0f718c2dfa82bdb2df95febb701c6be47a7e78e7d1add4178f932c04babec5f453e84e362bc46e72c35989b3f5b51cd67dfb957df48cde1
 MISC metadata.xml 485 BLAKE2B 54b4891a708345956dc152c708002fb6e157f355edfe12e6e0ee5c90681e6a80f14bff2a3337514d3ee8dfe2aea192a612b5a299eb01f6814c21c4a909ff015c SHA512 f6e90e161a39b2d488b4d4ff218d7379720552b64ceb95a9e76e6eb3d175a5fff406116c62f04177c2ea96a5b014b84dd7c80d4732ef0c615299e02c9ff5c6f7
diff --git a/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0-r1.ebuild b/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0-r1.ebuild
index 65002c580c4d..ff1d6870ba3c 100644
--- a/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0-r1.ebuild
+++ b/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Name your accessors get_foo() and set_foo(), whatever that may mean
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-DBus/Manifest b/dev-perl/Net-DBus/Manifest
index dd54583793d5..4e40a4d77ae8 100644
--- a/dev-perl/Net-DBus/Manifest
+++ b/dev-perl/Net-DBus/Manifest
@@ -1,3 +1,3 @@
 DIST Net-DBus-1.1.0.tar.gz 2075154 BLAKE2B e5f75f63678b72d2d80406af76430802c715c59e535487b4dcd8bf1502a3de915035eec26fdce020f44aab27ca46993b85d3e23dd62f472bcfce923b27306a11 SHA512 96f5983ef1e33b4abea93277e39e779821c8ee4b1f2bc7a4a3aaa3612b9513a426b9f8e04094eb8449e89324c22c264df2d34b3d3e43dace85f443a57c770cc3
-EBUILD Net-DBus-1.1.0.ebuild 611 BLAKE2B deef80b4720d9dc3d174d161f38544fd8de5c6bd342b0881d79f1c63a44d7429bc13984d369db1989f14c31a60095197d65bcc804ac9f4e3ebdc453c70669575 SHA512 c3d611d0a5829a043bbacdca59b492c12ac53b1f4a94a0c014a69ed1cac97ef040eedc262cdc9c45aca43a7bba08d1737edad80a85a8870c393e876b528bd58e
+EBUILD Net-DBus-1.1.0.ebuild 610 BLAKE2B 253b5fd45f96553241911204c119263c0fb5cfa7d8e880bcecb3c4e64d66039a13fe7cb2fe4bd423c54f7bac7b02125af064b3dee18e637242ad1befe1dd3d42 SHA512 ca9ac51b2483bf9958b8e29ca2b256d45481f02e6c95c528de109cafe8de4f8fa4928fe879204adbb1925e06091016c3b872ecd600f64434d27d80a1e16d4a97
 MISC metadata.xml 2428 BLAKE2B 0ed3b699ea865b088921855030debc8a323d80d18a656f5e7a132b18ddccf34a926e1bf081bc779bc7583715c75a58dd4e79b04aa5c557a9cb42a26874bffa45 SHA512 ec204108cdc58e7a0c59d4f8ea88e04eb29e47ac52f83600bedd2279608cccb09c60840883f477be475ccea923e7a8344196b6053aefd7d8315dd8d628560f44
diff --git a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
index 704153c795f9..b531932f86c5 100644
--- a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the DBus message system"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-DNS-SEC/Manifest b/dev-perl/Net-DNS-SEC/Manifest
index 96036923e034..e28821e4cf6f 100644
--- a/dev-perl/Net-DNS-SEC/Manifest
+++ b/dev-perl/Net-DNS-SEC/Manifest
@@ -1,5 +1,5 @@
 DIST Net-DNS-SEC-1.02.tar.gz 35915 BLAKE2B 164cd7399c98cd32dc6293feb3d331e413319c16027bed806ee7b7beb9fb60b61ceb74991a124174fd35a299a9a6d2484de3433e88393721df08175d333197cf SHA512 cbbf0a4eb6948047a991cf473b0824cfa69c7f7e2d07190fbc9fe62be79106635ebfc02ab02a559079f2936ff354f5ff9275fd16cf37d7bc2d78a87cf0b103b0
 DIST Net-DNS-SEC-1.03.tar.gz 35605 BLAKE2B 8d7ab450986b4cc4f7d31ae50f3efdeb56e6a437269ff6a54d5ece26a863405f12faf16e52aff2ba991d6e8320ed5b5cd3d07fdee20a5b3db7da4683e02c6243 SHA512 17d9f2125b9ed687791941ea777927daf8cfe4a6a379d02cda499fb01a71606b1c01154a3d4f2f2ffb70f5a658aaf02e64c8e5cc308de8c8e0cc543271ee7bce
 EBUILD Net-DNS-SEC-1.20.0.ebuild 648 BLAKE2B f5d4479bdec7c6c35a681c7447d352eef0fffb8573a029e50003604eb69f0586e04db187bc198712220841c3b6a91e4d575a8d7c12c5d7d4d2cf562afc6264dd SHA512 5562f9d01f1b1eb9cddfdfda915c22b75c0c290e57c6785347ae1ea1086d9628b08c689d44ed7eafc45dcad5d4cd995969502a8e9bacee10b56884e913ae8941
-EBUILD Net-DNS-SEC-1.30.0.ebuild 1999 BLAKE2B 56e3e8ab33ee3a199abdc7a5a1dbace1607275d0da1bb266e262e74a433b45c3a5fa8dc9bfe096c91aee8b0d246ded72f23b1e46270a528672900bc4e9d2b4a2 SHA512 4519502650576155da514ec43b7dc9e369925ee72f49fd3253f8600bdecb2d8c54d6273515f707375e43a07dbe131c19bffe235bdff049fa61b363c43e3a9506
+EBUILD Net-DNS-SEC-1.30.0.ebuild 1995 BLAKE2B 9945c66e6204bfb7765e85a7c2ff94369003c134228f68dae2bba4263b9a926a9be519c549f1dd4aada8d71720d7b20a50e4024faa5701f081badf36a83e6adf SHA512 179ec11c0d5e0dca0a08c128a74f011c3398693dfefb3a2f0b02078db9d7df5f8a771a61b16ab49c7323dc8df41d4d6a17b38d2fc1a31b99f580d455f434e7dd
 MISC metadata.xml 774 BLAKE2B 499ff62d59f3a4fb22101e7f77ecacd7a8dbf91cfa6da377441cffe5b8d6de13ee182986a648489f31ef0b9f89eba285db8611e811934bc4f901a75431f9ab36 SHA512 1d75565f3222a788b979180d6bdeaa396a47bf4751011c9917bd88c8f0fd90646b61673ca62950159068d9751cf52d422d2d07d93884e07adf63958974bd9a5b
diff --git a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild
index c54a2ce7243b..a50a3f3bff0a 100644
--- a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild
+++ b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="DNSSEC extensions to Net::DNS"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-Domain-TLD/Manifest b/dev-perl/Net-Domain-TLD/Manifest
index e6bcb6b2e6af..5e7116bb1dcf 100644
--- a/dev-perl/Net-Domain-TLD/Manifest
+++ b/dev-perl/Net-Domain-TLD/Manifest
@@ -1,5 +1,5 @@
 DIST Net-Domain-TLD-1.74.tar.gz 36300 BLAKE2B 7dc4a302b2ed3002dbc40dc6cd1ad1948a8eb53a246eafe7a06f3e0932b61c6f8dddce20a7c6473a8ff48c230c3e8a2de44f1d24fe40c0e45728797ec3ab548e SHA512 40e9e4776b078c525e886e6f7c5151aee44ce9187bb348128221927c8c92ae72318328d420a3626c0b5a1c05a742e4fefe8ca1d2eb4fac6a2e74c65ebc1c4507
 DIST Net-Domain-TLD-1.75.tar.gz 39719 BLAKE2B c6b68374e7d738d4bb73e0a59e291c9adb612b8c1d3ae25db29563e5ff9566757a1fddeaf5a3973cff4f4d890d0038d56f78c267aaf19eb91e6a2e1fde300123 SHA512 88b090f427e7fccd8394059b643f260a83fe9ec3fd6741972ec388325bb8c178d9d89fc8da9b1338441972e6744117c4effe3551c2c3f95d52022496667fa4f1
 EBUILD Net-Domain-TLD-1.740.0.ebuild 440 BLAKE2B f503def8407e7b5fb4d37136ade6fdc960d047b338f593db5410e5d04f05eb01beb1230d4649050f9f104ef8bf42a4ecf42063c79e11646ec385572a0486d6c1 SHA512 b51396d824c895c27f296be583bafb6ec06bc41f3203cd81a19c2985c04f4fa223d282be4d461c91137a92ced89135b648dc6472a741e30bd6af63855fe3dcbf
-EBUILD Net-Domain-TLD-1.750.0.ebuild 440 BLAKE2B 59db60d20d51ffd247344704fd375142f505ebda4db89404d9019874935e548fac3bf8cb0805b83fc46aff591aee2012fe95e6adbd42b32994f9bfd405e6b690 SHA512 a0be9ee3afcd32183708b23f7526801bdb8eba2d48b38226a234490d53c3c1fc55c275603ec8f5898529f37d5f5a2c0e9f0658f7b1df995248553c9e78811c83
+EBUILD Net-Domain-TLD-1.750.0.ebuild 572 BLAKE2B 937b671ac165df1948db2a8aba5e6694c08c3501ed3af110618742a702cc8d15dbb8618d07d0fa212ac4977843e0d1367d8961820b6e06b1bcc6e23e5c8effa6 SHA512 2c307d83f44d22aa7842243545e1691224aa31b2bd6279775551148eddbd4915c94cef4d96f2a5de5950122f9880f8de76dc88d722cff217c019ebcfc694344c
 MISC metadata.xml 401 BLAKE2B c448963ce478f79c767b536e41758ff64db2d0976c0f2384571c2edbc2a697d0d5add70aae603946823eb9f5fcb6fe9436a6dd5c7e08319b29cc93db9047c21a SHA512 2843912ba604beb75b986da3e4c24ce959db67bcbd069cd47dfb535f3aeefe9209d4381b705bbe1996617fcb438c432699cab9f85336ea65436e78b174ae1a6c
diff --git a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild
index 55bc6fd0af41..b4b07290e07e 100644
--- a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild
+++ b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Current top level domain names including new ICANN additions and ccTLDs"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Net-HTTP/Manifest b/dev-perl/Net-HTTP/Manifest
index 8234e9298c57..727192756eed 100644
--- a/dev-perl/Net-HTTP/Manifest
+++ b/dev-perl/Net-HTTP/Manifest
@@ -10,6 +10,6 @@ EBUILD Net-HTTP-6.120.0.ebuild 938 BLAKE2B d991947a2069808c02a2829deb0e84d0fb8e2
 EBUILD Net-HTTP-6.130.0.ebuild 939 BLAKE2B 9d9778608168b836d72221bd70f83d50ad892e96e7ab983a014c43c779350d1cca1cc52f32a7e9d8651d4acd0551865f7cf20c6b4777b070641374a3fe61a383 SHA512 99c3738031c03e4ca09c32c4deb2858ad9121b52a811f6642d580ed841b0486e880ef89f632fca3a31a51495b571dbeabe5efae786a3af269b4c7e11422a40d0
 EBUILD Net-HTTP-6.150.0.ebuild 915 BLAKE2B a41eb35af3d941aec2501ff3f88058184ea42f51c49c44d1490646d214851d98c43560976c5c21ce00ad94fd63d5b18d1bb381072b9fa30ef73de8c456223bc1 SHA512 87df865344ddc2f6bc1a4f9ae951b2df0ea83b40bed63200e43733f1c1a1bd063e15b0164160ce3fffc8019ee50d5a30666fed7276724a5db0063156558f625a
 EBUILD Net-HTTP-6.160.0.ebuild 914 BLAKE2B e1a43fbe16dcbed3b4abf6ce64c1ebdc940c29b16eb8091ffdea701fa723763e398b90ec25a278b729a33940adb6c26725cbb6d20267af9acf93d7266dc0e21e SHA512 12c63f21f36869284836a1458d982fef4ce6e408b096d62fec1e7d73b7cb54aca09b247f2cefd26fd032ffec9408ec822d9bbf44efe5ab6b4341e8677c94d3c9
-EBUILD Net-HTTP-6.170.0.ebuild 914 BLAKE2B 87bfc7e8b76cef41a02b09eb1935f72602e2564c9d8ff56f3ef363aa975170da796eb2567c6b0458041e940310e6cdc882562445b5d137cfaa4ac54033f50dd0 SHA512 44c378ce4c6edadcb94d285899782a75c0fbbd66cdaf680f76cf1ba6cbfa62eca6c72024ee86bd580c9647417294254d4ee5d81ce49154a484378a5078df5a4b
+EBUILD Net-HTTP-6.170.0.ebuild 925 BLAKE2B 5234c95cb67825449b7314a9d6eda99c80f1e0067f3c6cf2e6449d68a09beeaa14f2261001869255b9a9132410e7e61810d2086c617fc8e6dac842e3cd7b945b SHA512 fcb0c1f395d4c3c705d2b488775304b05deb12d76e1a4a8c6160e6eaa2efa7130cac4e757ef42d63c8b85e456adb910636ad80e8d7190acd671e24edfd29b7f6
 EBUILD Net-HTTP-6.90.0.ebuild 755 BLAKE2B 1e06552e8b1013b04d97d3b2655fac2febe0bb9d8d51a8d83d8f5dad1d579873618a164067ee8e92a077d409528c78a168497da5a77c69e18b94e10786dbef85 SHA512 01f76d093691a809dfa34e65fa11341012dac802ecd21a48e70b008f945ab828cee201668626af364ab2f9b8e2db1bcb4da89ee61537978589f6cbc17761c4a6
 MISC metadata.xml 552 BLAKE2B cceb9dac240083ce84261040992af424efbb107431e3c705afe9b8a328cf6fb69c1fa20dec1233fe71e7b2d1103161831293f780c2d1b2c7ff0a56352d1e3f89 SHA512 961ea4e69d6fee34cb1e0086fb4fd451ecb36192a1ab48373350f77e6f7e84e79f20dd7d8fb51429a7e678287f494472358d8e6ad5f8839ce2f159d7bdbb2be0
diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild
index 7267c60a5238..ee3dec56deab 100644
--- a/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Low-level HTTP connection (client)"
 
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal test"
 
 RDEPEND="
diff --git a/dev-perl/Net-IDN-Encode/Manifest b/dev-perl/Net-IDN-Encode/Manifest
index de6d7a53cbd2..3d3bba7d15f3 100644
--- a/dev-perl/Net-IDN-Encode/Manifest
+++ b/dev-perl/Net-IDN-Encode/Manifest
@@ -1,5 +1,5 @@
 DIST Net-IDN-Encode-2.303.tar.gz 432454 BLAKE2B 9a5994a17ce5d81b1866db4cce3801698be97436413a28b291796ff68dfb608eaa95415f8e435f4e635da45318746c644ac85f80d1875ab21877c119dace2a6e SHA512 3053792fdba9dfa5239b20f21f8b9922d438a5e247cc3066d5097df588ec3fe2800b013c72dcebaff847468fefeb709fc2f2dbb8c2e984a384a2d66aa318d379
 DIST Net-IDN-Encode-2.400.tar.gz 432177 BLAKE2B 1377340423c72775414fd27d2c140d3eaf231d782f44570998add049f18a7904b0f24514bd1d79b88d0c828fbdc7974e702e33af3a05a5d1c22c00193e5890d1 SHA512 ea58d8825a9552851a0cac898744cdeb0e99e48f76809b58e7586d6992919339cc670506584df2d81c4e98cf7e6cfd1e96330e00f0e216f33033a743cb872d94
 EBUILD Net-IDN-Encode-2.303.0.ebuild 592 BLAKE2B 3c637d4695bb7b2d40d64c7a9ce891de1296d6c65155fb05c25fe0233a7ce2b6c89fb69276cb26b564d080ebdec6c6aa613ca81ced19177b545fd4a958924b4d SHA512 819290b3d217170bdf6d8daca030663b79590164337475dff856db3868302cf7f8211dd493f50870ecf1021412fde46e4ccdf76d1be6dbd105d4c731041fd51d
-EBUILD Net-IDN-Encode-2.400.0.ebuild 533 BLAKE2B 4f90234c78b89eaa2b9844c15cd5070b9d3c967fc51ce34674f0c3796b544cf673b34f4af55853dfb325b5f64f85f05cec9e6f3282f5521d85dda8f1989e9b33 SHA512 75f9b917eecdcc45e9ae6f9709951f01467bcf67755ff1fe9eb323bc6850805d5b88473dce412edd4cfa48ce4693c8e921f8fe15a2660622b2b33a563257fb84
+EBUILD Net-IDN-Encode-2.400.0.ebuild 540 BLAKE2B 5378056a6634eb3fd8759e8b4504e2aadff95a472bf818b0468f5f9734b85c72961faf9e217673083ced9aed9e69e03ba9b7cc2f5f8267549d596e6907002439 SHA512 13b936c3aa8155c6b29dd639957df10633ee0e519dc6323209f4cd175663ea6e5639c1ca75f39dbe75c40368e1b8298b9a3c809459fc2f0e3299d2bae3e3ac74
 MISC metadata.xml 597 BLAKE2B 36725313df1fd525773e0b5df39fcfc8674c5d05e4d859c9a11cfae9adbd49c0a3e8a1f670134dda1932c72ce7a9d520f7429f4a24f8e290b851385372902d88 SHA512 d709bc4a5f6c71d2840c8e4c5d765f8d54e6ee1ad635612d1a0074ca8132afb618391f856a709423ccc47ee31608311feb48674dbe7c76a4ea01ceaf4dd15f65
diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
index d66e33812d8a..cc04572c3fea 100644
--- a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
+++ b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Number-Compare/Manifest b/dev-perl/Number-Compare/Manifest
index df108d85f9e1..c4db708a6927 100644
--- a/dev-perl/Number-Compare/Manifest
+++ b/dev-perl/Number-Compare/Manifest
@@ -1,3 +1,3 @@
 DIST Number-Compare-0.03.tar.gz 2572 BLAKE2B 5b7ec7adf7c8b3f295c6587317f892ed5e9b726bf87f0ab8ddefeb26e3db5d9df4586f97e1f71ba7220771374143ec0fd727ff7b5b2f909eba66af2cad7b4332 SHA512 fc7efb0177bcb84142619b7d8c0252f4548e547650ddbe9cfafaba97b8ae791c20fbffa6f8b01449b9dd217d9914f94bfeaff57cdfdc2c11e2a1456992bd9893
-EBUILD Number-Compare-0.30.0-r1.ebuild 390 BLAKE2B 9c2944d75990bc7ce2fbe2db7b5df868b68acf12af087f586039878f482bc4118dfb38b26a85f59718a8c72def20d29d1ac561f979eac522af5d567549fff102 SHA512 38b0a0c53cee9d30c971310dcc1c2f8062f0834a0abe7d0eea2f62cc395f30e3d78bf9e72cfe1e9d508c6517485b8954c2f1ac3ebb5d00a1cc87684d1548c655
+EBUILD Number-Compare-0.30.0-r1.ebuild 456 BLAKE2B cfc89939e38414c4acbead63647b33a30201ffc3422443774a95a42f3b90a90cb5db482c4d2bac920fe712d1f389d2425bf0bd1b4cb0c9a80d4f36c74486c15e SHA512 07400a9add3d1d4a06ac4bdbd1a56b4bf03f1c1d90799cfb56557ec74287ad8505d141d5181da84b057a3baaaf92397ca8efa2335c693a4360561f44e959ec7b
 MISC metadata.xml 400 BLAKE2B 64be48cd4efa47e2d82387acacc76514b9f7872aff49f3e20814614fca2ff34f8120c1470c7be8456589fed938a02b2e92e17bf6d4b607d5a80b46bb8eda858c SHA512 3e6ed8cecaebad99f6d9f932e7ce5313fcbf69253acb01a32c459216e189cda22b6d4f44d7d01d6973847889a90c53555d2ff5f8dcf9d61a4e7778cfe9cbe36c
diff --git a/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild b/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild
index 5518e59ba558..ea2a1f13fca3 100644
--- a/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild
+++ b/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Numeric comparisons"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/PPI/Manifest b/dev-perl/PPI/Manifest
index c3dd833731f0..4adb0f86dab3 100644
--- a/dev-perl/PPI/Manifest
+++ b/dev-perl/PPI/Manifest
@@ -2,5 +2,5 @@ AUX PPI-1.224.0-t-marpa-dot-inc.patch 670 BLAKE2B 87feb1cff3cc7a6ed77c11f1854268
 DIST PPI-1.224.tar.gz 257197 BLAKE2B 47b80a0794bb9157cf0c3ef37d381f3dd5afe938cc6f3df1952ddfca87aa56ae0a4272f34fcd18f713e59ee4a0bcdd90043f012fef5ccf41130926021cb3c70a SHA512 7c5f4a01b3d4a1e7e2f68d7e5c81368387fbe9a4cd2f20afc494706f742c9ba0b293747b692fb77af9a1457e077687c7d5217bf09137ab71bb50ba52da24431c
 DIST PPI-1.236.tar.gz 257245 BLAKE2B 7f49ba8baa67b6597b774420d379e832412f666995701e5c6ab56d8ecbdb7a2542e7b2bb18ed76e944ccd47ba8bda970d0fd170683d9236f20991902eb401f86 SHA512 93a7f4059b12156bdcba77958c17841ab43d85cb0045d0c58d087d6e637e09e253a559cfe465d9d8699329098582759cb8381978c121b9661a9a755e919dece1
 EBUILD PPI-1.224.0.ebuild 1028 BLAKE2B 50fdec8e33e40aeaf4329158f156f84bfc1738db1bfee8e24c38014e87d8ac38cecf61b9a71df8824e1e81b058f640da815472690ea49e6619467f1cdf8503e0 SHA512 eec3ad49f714a3962e532f9c0384ddef9d18c4acdaa44ac62cf84a5670b59053047420a027cf03a5c8bf2e85f82341915ea32bd0acbfb688c880735c1e384f51
-EBUILD PPI-1.236.0.ebuild 945 BLAKE2B e059a17fd78082ec03d0faddc02bb1b20f37a1e3e22d29d7a7d8d21bbf5567dbaba2793423767b275ecf0306f56d3b6395679e85f1c108acdc870353748a2e20 SHA512 cee03548a2fa01b538bf5d09e30c4f038c6f3ea996b996a62cc98a3553fb322d95393c8cc08b6aeba4c7c96e2f569a0b3dec81ceee9e1f6a5aa7034844f16b11
+EBUILD PPI-1.236.0.ebuild 944 BLAKE2B 0c50678f2310a7c9cca95b4b2189daddc990e11761ba6dcacad79fb8f6796e3914861fd20dcfee05347d31241b84d414a221dc886e0c87acca8c25018ea52b83 SHA512 c608217697d5773cf95fc5beb07919ae86534f3cf7b031b51a6713c425a6bf7d5e1ca21546778ea9b6b97a6989a07faefd666672a3d4486522b36d68bf1b1c1e
 MISC metadata.xml 6633 BLAKE2B 66b064eed0aab9a099bb6ea9e621e10f4c5c06b052abf393a5edaccdb5ddbf068382ad767a2d9fb6a68e70766234ace27da4ceddbe0b2174167d27e56d705717 SHA512 a6f5d77c3a8a13f3c454185c090d595b400b665a9aa2dc7e7edbc0c643109bc251d6522a330510080c5ce905f84cfd8892ed0783032a6e45dccc710df5569ec2
diff --git a/dev-perl/PPI/PPI-1.236.0.ebuild b/dev-perl/PPI/PPI-1.236.0.ebuild
index 3ad1fff2c3ee..7f18921366b5 100644
--- a/dev-perl/PPI/PPI-1.236.0.ebuild
+++ b/dev-perl/PPI/PPI-1.236.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha ~amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Package-DeprecationManager/Manifest b/dev-perl/Package-DeprecationManager/Manifest
index 632dad6ad7b7..9e7e8487e485 100644
--- a/dev-perl/Package-DeprecationManager/Manifest
+++ b/dev-perl/Package-DeprecationManager/Manifest
@@ -1,5 +1,5 @@
 DIST Package-DeprecationManager-0.15.tar.gz 23626 BLAKE2B 2055d9695df1fa666acd3db3cb4cfb808d7a841aa1b4439dfdd175c438613af6773ef197b0702c2403329062bb784a96b129d364d68c5fd5749ae9611eb0c23f SHA512 644aae95e7124f91dab9ab71e20679a310df869dc970ee3b180d8274657226d9ad91c79d56222f6b30ad026e92f4d86609b8933ce3fc1298247da15f4a5c542b
 DIST Package-DeprecationManager-0.17.tar.gz 27647 BLAKE2B af12433cef899e8d5f911ce76746e1862e8d6f5eceae9a5c890da7fa4f10e73fd41118c0754ca56d4b0f4865fdd09139358f3c9020940d34a348e7a27f68a495 SHA512 57bf79df657895342ca5b8d13f155d85f34d1a85415570b112138b6c50c5d08b421a1707671fbf807918cc334006e4558a626a7201c60096924fc2200c751cde
 EBUILD Package-DeprecationManager-0.150.0.ebuild 779 BLAKE2B 4ba95d81f76b548921b413fc231c0cc2fd6fc8ef27ec1d50a3ad86f652c915b9db1a958d77cafdf7efaf8da525cd2158d4deb25a4089d906587e3f60e79945bc SHA512 1cadf0710f8e4ea2a86d255a5aa07eefb70d7ad101159c0bb059ce02d3047efa7dcfa614fd65a7058514582d0f2f2060d6be3f53a34479160885e093c581242c
-EBUILD Package-DeprecationManager-0.170.0.ebuild 789 BLAKE2B 2b53d9195992e2766e87ea112f597cd4bdb64889ca2fe3b95c31271e6c60d2c347eafc0e84b428e7eca8b850c8e626eb72ed12781c752de7b440ec15cdee3537 SHA512 31a48c4ebc72184c9ae9529a3dfb01357c5f188b345d62112ce963482695a7c7282a1e93092de6c2408809d5ff15656d4b7e44e2f6559e3dcfdd294f0bf46bf2
+EBUILD Package-DeprecationManager-0.170.0.ebuild 858 BLAKE2B 15a4eeb35c071fdbea17252768da73b05d70531be8761d2faa4f521b26826358a2f44a262c29e3df5915c8f3298be91be03b202949e2ee15ba29d62fdbaf3e5c SHA512 2babb576582b716ac446b2a2babc902644fe4e8da991545f05d809d016f7702a90ba8fcc7b631a1a9ecbf95644fa97691869d33501eb59671547dd2410857811
 MISC metadata.xml 424 BLAKE2B cfdc58a331b544b4f448536f23a79871169616f3b95ca7c1cfb71ea8af2243c363058b4d0657188dad48d23fe78b814a43c79c6f3ac2ac10d0a881f01738daae SHA512 803b02216bdc60a695de8758cd970827bc683e217c580faed6300ddb6a7d07d2370ac87360bad50d972ee8c6d6ec791d6159144402690811bd6603d661e00333
diff --git a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild
index efaca52ffc7d..12c87a640e61 100644
--- a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild
+++ b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Manage deprecation warnings for your distribution"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Package-Stash-XS/Manifest b/dev-perl/Package-Stash-XS/Manifest
index 9bd16476495b..dfc2155716d2 100644
--- a/dev-perl/Package-Stash-XS/Manifest
+++ b/dev-perl/Package-Stash-XS/Manifest
@@ -1,3 +1,3 @@
 DIST Package-Stash-XS-0.28.tar.gz 74161 BLAKE2B d4e0361ff62ace98116cfca1d8ea057cf6f641b5ca2c88a753b2db0724b96a210900201e3070723811e99f9dafafa7f1dec47595703f832db4962789c9c758c7 SHA512 409e884998bf063f438335067ff8f702aa1f12fc686c1912ad532f6536a711273e52c140d9c407c47b7ba4ccacedec480c1542437a90dd76367dc0f732c0db38
-EBUILD Package-Stash-XS-0.280.0.ebuild 637 BLAKE2B ce8223e0c8bcc76a5a718f86d0d11603a6f05ed99a762274b87edee75158b3084be0bbdef98c828997a81b0ec3d9f7f8c632d67c78bee6a150039d48811576c1 SHA512 0a372509b7eb837e9f672d24947e41986fb115672083e875c45056816ec2709c3f9d178af122e5dc407c937f9622090644b47d95433d7cb2c732daff71b2575b
+EBUILD Package-Stash-XS-0.280.0.ebuild 690 BLAKE2B 0d9ea0bdb0a7dfe0dfb4d214232c343fe5d7011fbfe159edd1e47bcbb48ac0cf66771febaf685981d439f7d98e25ef9f1ad6dbdcce117fc6a73ee12931954195 SHA512 ec35a870087535ef524d6613b6e1283fffc478bbbbac457d9deeda46b1543378b634987d0d76ce69328516f3279b79c667d138235de9e4fe8d0c502499164a7c
 MISC metadata.xml 405 BLAKE2B e257711d919dea89cf86f1b361af4a1cea58d22f0eb575ac52d56993ca8c27ffc7a1d326addc6f274f98b8f20079ed1fea9d9f3766f26ec31cf302727b7687e9 SHA512 eed17fb737efbdb196d2e2d50ba117f11c61c2180dcd0f13e7b98d8a7773d72162403e73e5ebaf65531792d157d9a6b3f1a614743d4838b684e1a8da04d0a0be
diff --git a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild
index af27a60284db..b0b9ba101334 100644
--- a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild
+++ b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Faster and more correct implementation of the Package::Stash API"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Package-Stash/Manifest b/dev-perl/Package-Stash/Manifest
index 1d8ee90078b7..01cac9e1126a 100644
--- a/dev-perl/Package-Stash/Manifest
+++ b/dev-perl/Package-Stash/Manifest
@@ -1,3 +1,3 @@
 DIST Package-Stash-0.37.tar.gz 40309 BLAKE2B 6afb95f87288d1c9081d288c71a77fb5b98dc6ab80ec16db1fbb7a7fcc949afefc249e5a9d33c5835b944ecaa6e9cec771988e2987315bd034764ab977576550 SHA512 d10321903591568d4ac4db91ad9e4dfcffe564ab22a5ecdd8fa103749c9708da082ffb3ca478e98ac120a23e51c0ab0ccf799c0da10fe2be194e9cace1f16b06
-EBUILD Package-Stash-0.370.0.ebuild 1041 BLAKE2B 53443aa0e74f44808536ae434c6bd590104b5b3d17492f21f1eb0a46ee92e1b4d63fa2c9faa6f67c62f66167be3084e59a86c82729eae97680c1cfc487ded4f2 SHA512 5dea47745c54632b59deeb522bded4c909db26d6e46b73430638f51999ada82e0f4933fc8c879a7388ec0f7f5ab5151c442939c2552452fba8fc80778009a6fc
+EBUILD Package-Stash-0.370.0.ebuild 1094 BLAKE2B 22d0dad0509ae8ba4b5d464720b70d40b526a571b8c82f8141a3c9adeb54b4fe29c2e3890740dbd98595294a4d0865f1595dc3558262dc3d6db9d4ed98a85429 SHA512 71961e3128631166550ecbb75a3589897ad4cbaed2aab1e1209ce00735bbeefaad4f78be98f79b4e4881fdff75a1c95e6b94a327ec81b4b85de90d38e26085c4
 MISC metadata.xml 463 BLAKE2B d3b8057579c6439184990d6a8090f76b0800966c0c75bfb9bd0317aefa2f48a1ac375c7b60b3c05c7de7f992f1931ad0606fc44c6e77e4508b71b3987dfa745f SHA512 2b2e4ef2cf309de39aed1422386e2a9737c1b19ba6128e60b21d4faecf2b8f8515036701d3e42f4742d160e745e953b63511e921d206f5643db1ed7c7542a426
diff --git a/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild b/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild
index 225ae156893e..477681219c4a 100644
--- a/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild
+++ b/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Routines for manipulating stashes"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/PadWalker/Manifest b/dev-perl/PadWalker/Manifest
index b567f4d0e5d4..8b2163fe83cd 100644
--- a/dev-perl/PadWalker/Manifest
+++ b/dev-perl/PadWalker/Manifest
@@ -1,3 +1,3 @@
 DIST PadWalker-2.3.tar.gz 16177 BLAKE2B b809448751e907083cde30ab95ab6229d47089044ac20695968b3488f7a45beda3b1567ac96d7d76a49c06399307419088a6d3d727a537dcca0859efe6d73843 SHA512 0a222dc2ed26825bc031b0e4b4b78660fe9d1a5a5d98552f30e730aa4c8e5c38577da9a960669258a11cfd712f6e3827bafa23162aa1101f01b47b08e303b4b0
-EBUILD PadWalker-2.300.0.ebuild 424 BLAKE2B 1da3ca6e6391f39e6e901dbaff9bf70bdca49062ae02d390785da668ae6ef958beeced06f64c0ebf73b3f9f2a260e864e29fb8b717600c4b22d39e126bff4e32 SHA512 e6d393c453532b916266ad11cbaa291150150cee18b065ce0cbe3103cfd385f1a4664f4465ee8538cf02d46bca5b79d6356fb6f5beef71853aea91158d540408
+EBUILD PadWalker-2.300.0.ebuild 510 BLAKE2B 6d56f4227a214a6f79b25cc94f235dff2f061afd2c31204c73298523287a13deff26bb163fe93f4ffad53dd99c1f314636c5477c3102f60a7d4ce5738e321994 SHA512 2f54f5dfc6ad330bc9d1dacb7306b49bf032d45b676d6e50f89723957625198f0ca042ff1532f48d37a5aff533706a52e1595b9c0c9641c53fa8ea6cf9258ecf
 MISC metadata.xml 389 BLAKE2B 7c98c1fe323f72769d7d734e454c205631e44cba76754b44cba8dcd3ee863c90719e0d9aed5f9579fee035931066b728ce7fcd46e0559cb5728e6c9bb7a8e869 SHA512 a85027bbaa6c174e996335493d2959a26edeb8147dc2ff5fb89a4580c9d13c590cca322a94e24e1ba1ab19129dcbc298802a4cb26b57e0c421c12f006c5b5432
diff --git a/dev-perl/PadWalker/PadWalker-2.300.0.ebuild b/dev-perl/PadWalker/PadWalker-2.300.0.ebuild
index e1d32000c193..93e6e745adb1 100644
--- a/dev-perl/PadWalker/PadWalker-2.300.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.300.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="play with other peoples' lexical variables"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Params-Classify/Manifest b/dev-perl/Params-Classify/Manifest
index 826bfbef6ac3..6f1f940c1330 100644
--- a/dev-perl/Params-Classify/Manifest
+++ b/dev-perl/Params-Classify/Manifest
@@ -3,5 +3,5 @@ AUX Params-Classify-0.13.0-op_sibling.patch 2504 BLAKE2B b191de076d3b275c90d02f6
 DIST Params-Classify-0.013.tar.gz 21014 BLAKE2B b3eae7c6c94866c4cef340ec55c4a7fa31fa2964b631f5b701c62adc24f7bd1896a45c6462452ace9cb8abffc9946077609506195d66f43e049b2518805f0e95 SHA512 8638d0d952854770049a8cf382ce02f6164025ad7224588d41be02f504947cb9d309d95c33d8fc1c2e3b5de6dfdbeac7fdaf9cd16dd6ba0a3d546c7a002e65e6
 DIST Params-Classify-0.015.tar.gz 22061 BLAKE2B c905a067415d6c2846fed8c52689cd93ad81fed70414369aa7d36a314c40668ab0ddc025fe296777fdd959161e79330cca41374044a2e5ad5887d96ae76548d4 SHA512 1c41590a3f06d21d5f23e12371b0aee5d4249f773bfb0738e955fbdccdccc6e495744c50d3b91305a6b470e022475446705c8eb8e8d05ca1ed037d369a67617c
 EBUILD Params-Classify-0.13.0-r1.ebuild 673 BLAKE2B 7083a3fb9cbcf51a271d21065cd23e835498e2dadc564207a75a2728a81416d91f1ec3b766a9bb1ce2a4a0ec9755a45190e9d193259415fc9fc5bf6b1c664390 SHA512 4fe3a730e81b1acc921dd7b17ed77af73bcedda9c125a29b0daececf12928e8cc9d12265010e66d5317f79b7a204a9c7156d01f689c2b1c669440860eb1da3b0
-EBUILD Params-Classify-0.15.0.ebuild 678 BLAKE2B a7434c9a47b2f9230789b29c75838afb568a6f0f11d6b34068f1a822ce0286286b8eed7721e6d690409e7c3a90df7a3dff721c28c576f748aebdd84374dfe51d SHA512 fd44dfa7b7c4847937dfea9757b931d53779dfa23e36ec0b2287cbada09b713c5b7e340f6c7012c5f03645fdbea885ede92e45da79f1a3bbab807ece9ac8a039
+EBUILD Params-Classify-0.15.0.ebuild 685 BLAKE2B 46146bb927940b3332373064fc4e0376b5b49c89a24082dacc60b5a236f07ae3d01075509f4e0ff2d7541e6977242d43489888ac4d2afec4f6d5643e25591be2 SHA512 80d57c6437806c7d6ff28362afbedd4dc27947a52c8797adfe50c0c1aa690616ead060b2a22fa2be25fdadb883a59ad0899e646452657a279cc069039c770b3e
 MISC metadata.xml 426 BLAKE2B 1de0a01712ae8f7ef7b1fd36ae0750f786972b1f4fed908bc04b7b5c2242a4418edd0c25503b9f16e78cbb9a766540ffc3c66cedb1c66be754721ad7702dc67f SHA512 f225a5362caebe1c868973ee63115caf802b914443e8a9a3347e72fa4ac533fe3f16e95f8ec1ae96ce5a85fcb1e6b971bc18ba1a9b14b410a7e5b23e9ead0214
diff --git a/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild b/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild
index 63d9d1afe100..8d8b0a2c77a6 100644
--- a/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild
+++ b/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Argument type classification"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Params-Util/Manifest b/dev-perl/Params-Util/Manifest
index aacc76e984b6..c413398ff048 100644
--- a/dev-perl/Params-Util/Manifest
+++ b/dev-perl/Params-Util/Manifest
@@ -1,5 +1,5 @@
 DIST Params-Util-1.06.tar.gz 40584 BLAKE2B 7ae01ed17b6efc8e436ceb4b62120673a73b51d64b03eb64c358753ff2b88bdbbfef43e0ad59d3171b8c0219c4bf2b4c6db01986e2fb924f87900a138d5b9f44 SHA512 6ff5e5280c29ac8f31d8ec43925ed5dadc02e3bba18797a9fa27d39fa284d2b1cde300db6ffe1ba8e141465fd8b5f984d36fcae4dc1f3121903d2bb75fff4d5c
 DIST Params-Util-1.07.tar.gz 40726 BLAKE2B 96d84eaab47a880520b666e5410215003f498b6a4b66d7b3df25a0d9bd2ee3d5ecb655da37e17174d3e4dccde7143bab3cf2f197799de6f6ca64dfaee3fb78d4 SHA512 ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56
 EBUILD Params-Util-1.60.0-r1.ebuild 608 BLAKE2B 47e5ac2a26ab4bcc47dd7843f60152f607fc458c49d0794f5adc808193c43d008967bf9162d7f5755185362b4c36c99a9ff46359e1db93177dd563cfcfe5eab2 SHA512 00a8ce2080d9a067385a1eb35375f976ec18db5096820162320c7dbaf3f3f58af640658d618243f264c48f55ecd878dda205dd289d9209688a7890a488db0078
-EBUILD Params-Util-1.70.0.ebuild 669 BLAKE2B f40791a53238e95b957f494ba72bded0b3883b2bac33ea778fd3f1e29fe22e201e9489e00956f54cca0f3ca199e0f4577fe14d34fec1306ba2540671c75404f7 SHA512 1c7abf7d4087092d25467b3876d98f3e379c05657c7984a8b41cb75effa4f0d65352abcb90253cb6110eb7e10bd345c451ce17dad6f22760b5b382c977735b9a
+EBUILD Params-Util-1.70.0.ebuild 710 BLAKE2B 4b50210c7ca72e75619d9cd9a2439cb124133900f8ae03dfd4fc80a833bddb4fe7cb033ed30db9285947c3da5eaf9214dac6719ba8087ac691ff2aa0b39b39d6 SHA512 26b8e730198f616947ee0b21608dc8ae199dcc9d1745f12936568b5b8ffacdd8eb0bcab09a0f069b18132ca12a176473d57c762eab09227d029edc9797031e7e
 MISC metadata.xml 394 BLAKE2B 81eb56b97951dab4d8b65fc45a485bd1ee1384690a930afefaef194abf96053b680e9ac4ad1b6056c785c173eac7802f6a3ec90dc899b8feca163d25dc4374c7 SHA512 5ecf99ab4566f2737d6554c15ddbd221bf50c3b03f8e48a898eff9341d51e9a6d47bc9ec976114ad77392238ff05c2fac3d63fab436dcd09984ba90ef1d08438
diff --git a/dev-perl/Params-Util/Params-Util-1.70.0.ebuild b/dev-perl/Params-Util/Params-Util-1.70.0.ebuild
index 32cce58cc43d..6c0a6983e43d 100644
--- a/dev-perl/Params-Util/Params-Util-1.70.0.ebuild
+++ b/dev-perl/Params-Util/Params-Util-1.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utility functions to aid in parameter checking"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/perl-Scalar-List-Utils-1.180.0"
diff --git a/dev-perl/Params-Validate/Manifest b/dev-perl/Params-Validate/Manifest
index 4cbc043a80dd..36f43686899e 100644
--- a/dev-perl/Params-Validate/Manifest
+++ b/dev-perl/Params-Validate/Manifest
@@ -6,6 +6,6 @@ DIST Params-Validate-1.29.tar.gz 137609 BLAKE2B 46c62649a7bfc1d2a97f2c038d3ee288
 EBUILD Params-Validate-1.220.0.ebuild 891 BLAKE2B e263b1845789ea825b81fd4e904eabbe6c1e7d1fcbfa26242d021bb854de0b150ece679dfea7178889dd0bfaac97d995d9ce4e6846f7f6067878796a90abc03f SHA512 6d362c8c150c95a4decf86e6f39701dcf9d8aca8c065e465db2f71af2f8a306eeffad1e955cba49771991a6fa16441603a5b21afceb86476581555a02465f760
 EBUILD Params-Validate-1.230.0.ebuild 900 BLAKE2B 8a0e96f005188b2478f4864065af06449e6266ad4ec7dbe0fcd28b3d3886b416b41419ee1fdfa3a5502a7ae430da686079e2e2aadb673ae4f31bdb714863c66b SHA512 baf3c668e738323d4322daa0f6b7e4ea3ab66a9901002ed2a2ce56e175146233e2a540a63c610db01238f5be96f99ecaa8186ad96cff91a3d770e8a4267a0cbe
 EBUILD Params-Validate-1.280.0.ebuild 900 BLAKE2B 4bdf122e6786891f56075a85d1f316e99cbcc79bf46cee7a16d41679f6a62859e715881c52285a0fc36a30fd8fb22add5c51d31545dd2fff0ad12b2c051bd9f3 SHA512 37adae235281bc66830edf4a1e6f4a7e679eaf5b55a02b166d1fb6826b92a1931d58ef7fffd0d5a302bc111d4a7470e96c582f8453ec57925c72815e7742c1b0
-EBUILD Params-Validate-1.290.0.ebuild 921 BLAKE2B 5adfd3e5e12460a11c487102322922e8aac41d4c7633782e06c7226c62a465dedc27c35f97b533a6ec5d93449d1343422b8c86dd714cc0acc4e65f8b615bd1c6 SHA512 e42933b3a60f1a06752dd69a1e01f2d41741ef13140e453d2cdf13e461b91d079a828dfd172c3db6ac8c0f1e3d17c760ef39b7ccb5f2cb8f11be98612d9a1092
+EBUILD Params-Validate-1.290.0.ebuild 977 BLAKE2B e73cde38f8d39216b4c053eb1eae310571a7828ff196228c87112ac2ccf15af32f13686f8540ff89fe3db305042e0a0972c97617ed7af4a00f56def2592abf71 SHA512 9c4d1d9e6a984521666160cb5b557eb2a6c3cf565512d794737b82049323c83719e799b719d1db07c1d6d3db7417006a4e0f5c3a049f2cbfccff53b3fc68bb3c
 EBUILD Params-Validate-1.70.0-r1.ebuild 649 BLAKE2B bb083004fe04ef6bdea26722a11b93727f07a79f91011ccec9df4f05bd7bf2cafd64fd0c23e75aef0d6bf42280ef4963bbdcc3e0c23986997072fd9cf4b75771 SHA512 69f7e3ab72d30ef51fa08cb8792602efd5d84d7831c1b548fb858d53a2b85d6877dd86b2dfa58f636f7743b9d6ffe5088e51fb6dce52b935df58b4e9e15f8e32
 MISC metadata.xml 610 BLAKE2B abeef76db866cb3a21286596a461749aef30f1055cfc1037f945a52842ac93da72a58ed9809064e3c917cb38b5be851e6cd2ab18ea7a0baacc110a89e7937a1c SHA512 487c0ddf29751ac3118c1a3fdcdb0675900152d089537663a4bd30028c5b2edf70696678b5d2a03afa7361dee8da4518402e75491b673d41e91258ef7c6ab158
diff --git a/dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild b/dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild
index 7b2de905583e..36b19e3d99f8 100644
--- a/dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild
+++ b/dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Flexible system for validation of method/function call parameters"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Params-ValidationCompiler/Manifest b/dev-perl/Params-ValidationCompiler/Manifest
index aad812042d62..96bd04f40c19 100644
--- a/dev-perl/Params-ValidationCompiler/Manifest
+++ b/dev-perl/Params-ValidationCompiler/Manifest
@@ -1,5 +1,5 @@
 DIST Params-ValidationCompiler-0.24.tar.gz 43439 BLAKE2B ff9a63fd63751ad929f92b5bde06a245ade4893eab5023a0452046790a00cce9e6d92bfaa8651f49231d2da3470b0b0527d36218bd923803351d300b533a0370 SHA512 ea54587db2729991fd7f9d8c9f420449e8d0218473f465783a69d4b118cdfe9e7d7ff045d57ba6d989a79950fb61ad81caac781b3bbaeb6325e061e664cc1665
 DIST Params-ValidationCompiler-0.26.tar.gz 44588 BLAKE2B 8dc61a15e7a559ead00f6e9a4c05c0eb17f14cebfc29ad69db2c0c4814eab9ee84312cfa98c4683b9b7c6487af5c47afa47cf33600a1209195cb8e7b016dc657 SHA512 f393b1cf063ea4e504ddbc863b4f478924b071810431b7817bf6faeb1fe632cbd493bc2e96033dccc99c4ecb5fdba072044f90387c92f262b54cf8f0b0386c0b
 EBUILD Params-ValidationCompiler-0.240.0.ebuild 769 BLAKE2B 9c14e66f622c68cdaf0235874a7a94569762161fbd32de3ff0f2b94ec9b24a2e9c605770a394855ac738506935db3eed7c541d8898f47fd7ba99440a4f0f9501 SHA512 48a874a1df664282840303be433d178c99d427b6a26c2df1d213d2cc7121187d5f036a07f290b6529ebabb91a79549f8ccc0456178b908ccf4f37c0b23e7398a
-EBUILD Params-ValidationCompiler-0.260.0.ebuild 811 BLAKE2B c5f6bac81623de54182294196b941d9e3e74e5f6e86881457985eee10fca57840dd7321416cca3816cfadcd392b0ee8eb5bd186f24e3f9c1bae30a4fc815d887 SHA512 1372aae8ced7bc0916bece717d68df8f71521cd40a1db4cf9ddcb2476bee2f6ab46f3deefbcb2881b137709cd7b05a5f18bb0c7e0a662d7dc4b8a73780e8df1c
+EBUILD Params-ValidationCompiler-0.260.0.ebuild 943 BLAKE2B 0bdd53e0fbd9ad53ddeaa30910b0eac53e1b4cbd7d37b5f3446dd5e7af24323da9aa387d1ac20cbafbce9687bfaf9b8c9f2c6247c00c34175eb1a913ad67bf2a SHA512 dda5e23110367732d2b48a1b980080f5f1d1ebaee73d3539fb67ebcc26a144e497c307ebe4b7d1ebf17a1707fce2a3095ef85930914a5b4eb8aa0babccdc2c56
 MISC metadata.xml 590 BLAKE2B 7caf050225ba76929c61e7782f322517105fd429fdfb301ecc58fae55347d8c1f0da4155c951986c4f113c885e8939ac120b7b2478bde6d6d8f4c3dc0cc4f284 SHA512 9635b89b9c2297a9d33d30b89b393e4b0968432d9f99467a8d7844f3a0d046285937ca9713d662d02d0f2b46e502fdf1936960b2d2ee8db519a654221dc83890
diff --git a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild
index 20b67ca7895f..1695749eabb5 100644
--- a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild
+++ b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Build an optimized subroutine parameter validator once, use it forever"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="Artistic-2"
 IUSE="test"
 
diff --git a/dev-perl/Path-Class/Manifest b/dev-perl/Path-Class/Manifest
index c741876105c6..4fdf65cb55b1 100644
--- a/dev-perl/Path-Class/Manifest
+++ b/dev-perl/Path-Class/Manifest
@@ -1,5 +1,5 @@
 DIST Path-Class-0.36.tar.gz 37033 BLAKE2B 5ec7833a334da957e928ecbe3b2dafbc12f63c51959af3ce89208ce54f0d7c1ca9cc6c76fb391c871bab98574f4dd17fb50036c45a9c04f28cfe51d1dee0c2e6 SHA512 17ab96c897537a5964efecc3d4883fedc048145f4980d3959cf501a7646f2f7837614da9e379411f7ecb1f8de1bf23615ee57555cc437878470865b3fabc4c2d
 DIST Path-Class-0.37.tar.gz 37473 BLAKE2B 1017de1f17cf0d0f27b07b8f59dfaa4a139e573ff67e7b8c37b522a8c164156943d5281daa5b4daaea87e72fa6b2d0229ede6aafe8f7b093ad0aac1d51d8314b SHA512 044d86f85eebff96bdff8fc11e97884eb4e06d56ecd2d3bfdc045135da6f08c40e644e0e5c1a779a8ef5d6c7c04e159e47721b4e637a92fed7d298b5f798ef83
 EBUILD Path-Class-0.360.0.ebuild 886 BLAKE2B dd51ee485dc07dfaf916dee7c5ecc8488fff715297e57418cab38b6755d951da5513c0b56439843fce9acbb0c6512fca6974aa9693265f312c5b07dd598de7e4 SHA512 496c9730de03dc46caef550247be81d194a673fbf5ec26639b9388a34938240d91dc06ea07258f0d4d8fa935ce376357b98934006c45ce542671032833d2dbf5
-EBUILD Path-Class-0.370.0.ebuild 884 BLAKE2B 8f01530761dbf762399dd044c5c28a71ddad88c5fc42f7e0e0d9dd717f2a037f12fede4a23697e78922eaf1b1c9a1504865bb4e850923be7c28f9b82b82227bc SHA512 6905e433856a887876da8dec8942e985bd4837072a941ff1fa5b3bc9e75a162e2ae16a74d53a6be5285c3b9152d9639732c35dbf8b3101f69eac20d4ec0869e6
+EBUILD Path-Class-0.370.0.ebuild 951 BLAKE2B 0d87a9c1b874eb22da50c4b417b946e68fe70bd4132a080a85318408e0df1e63cd0869934cd0c90bd53b97810a01e50f972732f4f6c6c1bbf90bf341643a440b SHA512 1837fc438ea095035b1d328aa91c33cd042b010462c0e4d5ebd15fe64704f19244b29b2a3211a254e86a518fb9d196e612900d1aae3cd8384af01c1647dbeebf
 MISC metadata.xml 585 BLAKE2B bab95c7547e43f88f7600192f911af16c29bf7356a62b64d94058dd4f8d1f44de76ad65490c05db359cf2f21ce86b788e92ea88dd83fe738b0ff795c4b05e5f5 SHA512 305513019b4556f6d88bd4e6948d9def1f95bad924a3c347a9b8b9d4912cfd24dc1d9ea1cfe499e6660d45b7dbccb8cefa66d3f83526556b7f0d1b7ddc5cdb83
diff --git a/dev-perl/Path-Class/Path-Class-0.370.0.ebuild b/dev-perl/Path-Class/Path-Class-0.370.0.ebuild
index 7f7eb81767da..04000dc2eb00 100644
--- a/dev-perl/Path-Class/Path-Class-0.370.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.370.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cross-platform path specification manipulation"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Path-Tiny/Manifest b/dev-perl/Path-Tiny/Manifest
index 2d63381d3ea3..4f71ec95b747 100644
--- a/dev-perl/Path-Tiny/Manifest
+++ b/dev-perl/Path-Tiny/Manifest
@@ -1,3 +1,3 @@
 DIST Path-Tiny-0.104.tar.gz 93011 BLAKE2B 6492f651d1b5aa82309d0caf32a97bc890d8952b0fb37429babbba4c66beab24dd3e6bb2e36aedd1098b98828b367e43d25b6fc7529ae897358ea60373797200 SHA512 6574e48645ebb4f61d45c1365e8b63cfaac6423394ba08363cfd62d3d98d163bd333d997bf5f7fd0e37ff94fcb3a3e19871eb7499b295399f048fd6a4bd3c78c
-EBUILD Path-Tiny-0.104.0.ebuild 867 BLAKE2B 50c1288aa5b963025c41a7d85bb247224e169602808cdf9cfa0dd985064125667d50b6d6bcf7fabc5c30007a4a5cf9ef84535aa852720ac84ad6c3b3454c5273 SHA512 0e1fa613af4327f496d916747cd7cd82eca634330be895c74956f92a4cbee7f37e1671ed3e3eddbdadb5b26898f1c6c7868afc55f364fe1aed43e842f97f3428
+EBUILD Path-Tiny-0.104.0.ebuild 866 BLAKE2B 2a6c2098127cd2c891a86cb7b6c02455e46ee6ab3b9c5450fa914dcf49a5014d66f445b9b7d1a5d2ca696c4e990995d17735cdc9d10e8a242977ae1a936e6b5e SHA512 ac9121e093db9445f9530526ce722e328d3dac6de8b5bbe2dd0341ad023e4d33763fec79949fa580baea2a11e3b372cfbd9d6b9105b41ae5167df317627a0fc8
 MISC metadata.xml 454 BLAKE2B 14146a711440cfdc26ceda88d069c2cd4a8873fb00cd498c4602221c09acf8b6458e4b58a59ef64a04460fba994193e1e6766f4d1e77e59edc6d5f2c6bac0132 SHA512 95e88429a9f4309e146db578b6be913fe804e18249c10bdafc93d8ea98b50e0aa9106d655f80ed11010769db0c5d579cec164fc3f68adca300a09045f79c159a
diff --git a/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild b/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
index e8388881e2a9..c6a7775b697a 100644
--- a/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
+++ b/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="File path utility"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Perl-Tidy/Manifest b/dev-perl/Perl-Tidy/Manifest
index 25648aecee0b..18280cfa66ad 100644
--- a/dev-perl/Perl-Tidy/Manifest
+++ b/dev-perl/Perl-Tidy/Manifest
@@ -3,5 +3,5 @@ DIST Perl-Tidy-20170521.tar.gz 432394 BLAKE2B b791abb6213d7c8af42a1298854da81c7d
 DIST Perl-Tidy-20171214.tar.gz 435256 BLAKE2B 03e7ec8e7d76e6de68a54cd474f192b24ec4eaea563dae185b1723f80ac86df7c03bafbfcdcdffc0e3a18d2b57acf3f40321637fc66a64f1d0f72988e19a7e81 SHA512 bc561146f184dd0023de44741cafdcf6882ef553ed2e0c0ec8cd9a234f45b76638b4dc7edde0abfc36e4cc1f84ef908c35dc63f776de65e2abd938d35563cc65
 EBUILD Perl-Tidy-20160302.0.0.ebuild 996 BLAKE2B b10e65f29f1e74a831b1ddf003472251aad5d192bbd79f000cfb480627269815df9d2ceb29d3a826acf87391f9e0fac025329430ab0ab32b524af2a44b1865a4 SHA512 b47e6ab6786607e88b2386f1aed5cdbfa30ac8f086f2a42ca77703e6820a33e0fafd7334e5ed6f08c4535de5b1b3ab8f0b16c4fe2439e0e5264a594d24ecf7c6
 EBUILD Perl-Tidy-20170521.0.0.ebuild 915 BLAKE2B ff4afe65b03d92f0e25337820fa94c6ff10a19a6485a1c994600d4d4cb9f229a3b54d31bcb18030b81c0411a974fa9ea5bf58f3ce1b498b33d458a08a41971f1 SHA512 3bc647c30e6aff64fbee527d840957572bfd10f0fda6750c58859d684724c629cace73ee5ecc44b3ae90c2c951e74ff8a44c8bfe7cfed123d99974c74435c3a3
-EBUILD Perl-Tidy-20171214.0.0.ebuild 921 BLAKE2B ad0b29a9ef592e73a4d4efe6f3207fa72bf204dce041331e52b40753476f055d3bfd8a36bda6c21f1e057379f9ed3e729b6cadad817ea795ece209aa77884dc2 SHA512 f638a84f76018bec564710001ec1c7d91c75c7db523f27c76c8526702b4114436c22351834e4e73b9bce4f2ace8f4ee1ac4371415b5adf1bec14c5556b395d05
+EBUILD Perl-Tidy-20171214.0.0.ebuild 992 BLAKE2B ebc839a7037ab639076dad828d0f6de2f8585b7aac7b2966748bde815a5d25c0f4dd07471d5ee5ba66bb66e5cd0062153b4cc2136bcf88089b25e63232e1a7e3 SHA512 e50d41213cbdbd23224708b15f89be8470a4003bc346ccdcc783195e0a0ef149440df1d5169a4d9cdae1952b465786eb9e21dd3d7d9b5436ecea7ba45abfb48e
 MISC metadata.xml 1644 BLAKE2B 0c6fd7d907aa2865cae8f00b485322bd63ce2b950deef2c12db8b85fe6b064f91351a0687053c3800ed4c5332d99478aef04e527615ad4b83e50b0c23c572cf8 SHA512 a423f7ee82d755f703d5367b988153e08b181d62dd9121d4ac407333ddf8211e6e5b4467c9333f5141fbdc1b13e4a0d1ede40abd1136f5aaae70804352b09fc4
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
index dc16f2974c96..cd70f7fe2b77 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/PerlIO-utf8_strict/Manifest b/dev-perl/PerlIO-utf8_strict/Manifest
index b11a70d2aee4..7fb96d878963 100644
--- a/dev-perl/PerlIO-utf8_strict/Manifest
+++ b/dev-perl/PerlIO-utf8_strict/Manifest
@@ -1,3 +1,3 @@
 DIST PerlIO-utf8_strict-0.007.tar.gz 67922 BLAKE2B 4d13dc6e6b4cdf7a4bf3cd51ca1e054d82cab4094894f4cee7503201cc11f80ab27951417778f7e179aee03b75b4bbb30e839a498c83d5afd3881db64973d324 SHA512 0d39be9bcbab4cea087f59c67dc1af6773b6258c5e836590ff58cc18bf3392ba6e95c55a0c7ce94236e0be7053802b4b1d6010130355e1a973a3698aaf49af0f
-EBUILD PerlIO-utf8_strict-0.7.0.ebuild 716 BLAKE2B 20c612e071e53d6115da6e40710c6f186d1f9cdcbaef03df4564f8e2f433d788e25d59a7a07bcc9220b38498f291f215ffd542617929effc765f042ec040bc82 SHA512 e5b064ea8057b5ed4089d21f2cffb5065baa512bd28d1a296d0f7467d06d45d88a9b8ec6ded1b7b6940650db442ac90d88519af11e336ca7a3c937ffe1dafb37
+EBUILD PerlIO-utf8_strict-0.7.0.ebuild 848 BLAKE2B d9b127ce093034a81da91b75f4418c10cc83289871ac80130594f825b5e29fe669ce3c2f47635a0e9d7d2095f324180526fef6e1221f18e466f74dfd80e1352a SHA512 5511bbe4a1496e484a5ab7b12ad57e9b43bddf82e90dea634bc9d1340e80f5299e441168ea1fb40c81e13e95ea7170c0c078d145c7f877b07a0fc678b999f937
 MISC metadata.xml 408 BLAKE2B 7c975db4716a114a97f21cfaebc54334634ae0d8f6c8d58bd19edc8853a74583c4f16d0f3729f380bf9cf6cb1d0a668f9484ef58418370e977151877a79c5860 SHA512 bc9d04bc551d13a2712b9e57613d9e423a1649e3cda65436178079dc13cbdadf183f4aea41963d023744d60d638900944ddb60752f054a728d6868594d2f4c55
diff --git a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
index 09080a630f84..6a530ea31f5f 100644
--- a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Fast and correct UTF-8 IO"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 # r: strict, warnings -> perl
 RDEPEND="
diff --git a/dev-perl/Probe-Perl/Manifest b/dev-perl/Probe-Perl/Manifest
index dd182fd894b3..37fe95898448 100644
--- a/dev-perl/Probe-Perl/Manifest
+++ b/dev-perl/Probe-Perl/Manifest
@@ -1,3 +1,3 @@
 DIST Probe-Perl-0.03.tar.gz 13096 BLAKE2B eabee810d4eaa498801fdbdc320d93d08d301bca628899594b0fe8ddd6b27a02c4913f73854b7c46126dfaeba415498331bcf480aa5152163d0bde9ace21c8cc SHA512 739bdb9d1a74eb77ab885a5aca861a1915cadbb1002bb4cb0d21fc6940ae6b3aa64ee52951ac8b2dca41c9e8fe188e17ae5f3c848c4a1caaf66fec5d25bef49c
-EBUILD Probe-Perl-0.30.0.ebuild 589 BLAKE2B 43ae4e7b23938643a32f90a91cb44b099ee94d2ad8486618e6bb2098ced92c6e8632cbb57421bd1885bad60a61e57d78df7ab4c5729a171ba76c08368555651e SHA512 8e3caf3e1ea1b1f5023dba04d9d50643cc537753e8fa661c182efe547b13e4df187ecbb0be934454187b54d6f0846b58412b8ebb09e300c9dbd2e71f3ae8244c
+EBUILD Probe-Perl-0.30.0.ebuild 689 BLAKE2B 814fe9fc4ac9a7fdd3fdc7094cbf67a72c7ae6ba1d9409ade3ea991697270164fc6d9478197503568d1f16e70c043522d4609b8b12ef1e2e8e586368eb96bcea SHA512 2df0dc5f0fdea0217c6caf2c91a2dcb6d91816202dacefad0d1dec0cf5235ba325d6b4bbc9a8e02a0d6236892bf0b0d87525fa704ec36e2fc2ef63f777a18dba
 MISC metadata.xml 392 BLAKE2B b12043546e2503cec012599625a1eaa5b7a3a78ab1a1b68b0f913863a7976892ce8d4d51f1f71cfc4c8cc86eebab5d160d0a33d79c71a56df5b3c1638ce547c1 SHA512 17a9624f787b94aa9e570dcae2de67c85f9ecd2b287af0f97dd8abaa68fe1efd9f6c35cd93328ce24abc8a0f2c5b61761010aef6321c5afffd6aabd211e8334f
diff --git a/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild b/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
index e9f79e7bd6ed..4058f6aa5b5f 100644
--- a/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
+++ b/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Information about the currently running perl"
 
 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"
+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"
 IUSE="test"
 
 RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/Readonly/Manifest b/dev-perl/Readonly/Manifest
index 661087a5a4ad..4d9c81af5133 100644
--- a/dev-perl/Readonly/Manifest
+++ b/dev-perl/Readonly/Manifest
@@ -3,5 +3,5 @@ DIST Readonly-2.01.tar.gz 23227 BLAKE2B 7a245411a17132cdd3617de70386cd1f7f511505
 DIST Readonly-2.05.tar.gz 28877 BLAKE2B 7fb072e0057cb125665855eaa058b77b74aeadc3fa4be3ca4e87ed6214b22a52c0ee4fe7df4739b288c49116d16d05cbcc93bd7035e71bc51e55be69002265e0 SHA512 d42406c1985248a352860f80c3b0b1a41476e5a7b4bff71e83122d7c5eb609296a1eb00aa71cf9f899317e31c706d75ff07950815eff84afb6bec40de6de2ace
 EBUILD Readonly-2.0.0.ebuild 525 BLAKE2B fc9123a64c1f8ad26c24f87a08f515a348f4d6280884559c9ff289beb6ff6f898e752d036b5bc269255e49c77e51b345131835bee56d088f255c321c3c3df031 SHA512 3e2d4681e7f6caa8fa3869ba691956ea0c6bd7150cf14c285b7665956450d782489f23a71f08823fb6743cbdd315367a86f542bd3f232e23d6bb3aa269d91815
 EBUILD Readonly-2.10.0.ebuild 493 BLAKE2B 27a7a4dd1e70fff937ee325803eb5e8d41d89a57264a6a9701ffaebb4452b1f51c0ba5220479b6c79866dc15fa88c17640af948f1c315f80991939c97986ac27 SHA512 bc4998169ec43e0d14f7f75bf6e98b5dd35514e295ef2bbcd590e6f5a8ea7a0a5d15312e994d33678ba3d9ce04bda1cc5bf298f202cd918f88161d227669723f
-EBUILD Readonly-2.50.0.ebuild 483 BLAKE2B 105ba746e74c0b5553331c9acdaa7194512a6acdc522eff5b4216a75a711e389b3443626751fd1e162ce5ba5bdcc4c75d46369b1bcd6c62eb76bb6fa54acf5f6 SHA512 111effe817da0127a9dade0cb637f8fd1ac6ed21265b306d62dd8081f2b46b68bb9e3f72b846f6a74f46cfd96f9db4cc83dcf3bdc7823a7f7f799f4e09c5edf5
+EBUILD Readonly-2.50.0.ebuild 561 BLAKE2B 73dca39346bf088c7513ac38800555e325f2e120bf6e81cacdc03d1f4fa72528341e986fe83b09a8cabe1445e1af5504dba919037eb087e0507ba99541214163 SHA512 8e87675d891883d68190d9777f58a3659a262697e9c34fd67dc84453dccc29214130d69d1b560be7bd547da8d665811d5d7940adae895e16752604b0ec45fe39
 MISC metadata.xml 573 BLAKE2B 71bcb9521e50f5017a6b98c3d6df2a46bd27455b922b6b2ff8a1dc234cb867c0d973dfe6046b7521982656d610d6039b27280492580bf427a54548eca640a890 SHA512 d401187b68959c86290c4588ddea6dac4eddca3d00ad180fbf38c319b7a1399c85aaa0becc3ffc5e010f708d6a0a0eb457f8d54c5fb3f407187271306a610048
diff --git a/dev-perl/Readonly/Readonly-2.50.0.ebuild b/dev-perl/Readonly/Readonly-2.50.0.ebuild
index 91259dddab20..501bfc133fc0 100644
--- a/dev-perl/Readonly/Readonly-2.50.0.ebuild
+++ b/dev-perl/Readonly/Readonly-2.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Role-Tiny/Manifest b/dev-perl/Role-Tiny/Manifest
index fb6f3c5c5e05..db471e9c326c 100644
--- a/dev-perl/Role-Tiny/Manifest
+++ b/dev-perl/Role-Tiny/Manifest
@@ -1,5 +1,5 @@
 DIST Role-Tiny-2.000005.tar.gz 23119 BLAKE2B c89f8aeda9470e365656087bbfdeb9f915000b5c65e56e278c73e10c7d56f80de05821234e9f7ae8f82179f9dc7e23bc71d2ac1673a5e3e4cf6eacf8076d1e58 SHA512 5573fcbffcf6532003906b36799f5a61f46d03a71e294d79f62f7b15f358291319e928c27e3f0c24ae54a581a01429c7e18927c728028ba2a36a37d6de75ad4d
 DIST Role-Tiny-2.000006.tar.gz 21556 BLAKE2B 5ca2b557dd5976a83a84aba9d7a18e3eb05efed08469b057f9596b685502ec9a2794fbb6b0fdea2cf3f1673825a19735ec878f1e37cc25f5a729f826e5d27d81 SHA512 7640196c4bc1bf7a5437c57f0137f3bbf7c5fb92b9614805f16fec41dfb87a8bf6b7f3348ceade0800bccd72c4e5b72bcd4ab8bf28768ecda9d912c1b4c78047
 EBUILD Role-Tiny-2.0.5.ebuild 514 BLAKE2B 104ed2ad0cf677c87086924ca7e14b06e870367ee78d0f257a3f610ff067de87594b2c6edb7c1ad7c37a2f1f8a11ee20b1466c6e4ef2d651991c030f0313c1dc SHA512 602e2486b8afe4261edae95b76b1e5ae8b476aa721732aea360e8d0baba3d6061bc3fd3bc68b1262194d98ed25e213efb348d33a37467edbd79910d787a4515a
-EBUILD Role-Tiny-2.0.6.ebuild 523 BLAKE2B 6e72800aca5a877dc4c76d7c2a19ac98f1dbd6f883ea50b4890137c1f4d8ad2399ddf0aff53fd92dc41e73031d223dc53991ade2851a630ff5f9da7036a4313b SHA512 391c83e0b78c0c3a6d5307f3905be52e87a51fe2675bd7002cddbf273011be0f71060bc989c67cf04e02ae3e4e160c7a154483041c11874d28e0c35d9d960c33
+EBUILD Role-Tiny-2.0.6.ebuild 634 BLAKE2B ef19bafb2cbc3e84121e318704acd9234dce39963e939a2b1c1ab35b4fe7f6b81fc5d0a859b9521c694d94964897cad7f343cf42e9f358123f0876f1299c5c1b SHA512 93df7b79abaf90e8985777e0cfa60c560dc5d4a156d325fd7c11aae39db11f1a938c55d8fafe2f4c375f831644a296ade64976ee8d616cce948689a9b77601b9
 MISC metadata.xml 453 BLAKE2B 267ab7409d21834206628add9a2cc0fbdc5d5cd3dc0066711799164339abfe44064cde5b63146645d925069a5abc43c5998b17491c14a2cabe4683585eb3fd9c SHA512 69c8fb110bcc06fbe73114409af76b2123cd645b0342e83ed1a6341c4941f12289b7767c33876856281feb23a792681dac5a78cd742f37c5fe36a982d7f3cd10
diff --git a/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild b/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
index 4d99e50e0e61..6a3949178dd8 100644
--- a/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
+++ b/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Roles. Like a nouvelle cuisine portion size slice of Moose"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/SUPER/Manifest b/dev-perl/SUPER/Manifest
index 0de4d43994b1..faa9f37dfe7a 100644
--- a/dev-perl/SUPER/Manifest
+++ b/dev-perl/SUPER/Manifest
@@ -1,3 +1,3 @@
 DIST SUPER-1.20141117.tar.gz 14477 BLAKE2B c49278dff91a754f69b365f04e9e7c64643a57ae58291ef909f5ba1444c129b7ad0f2e385c4ebaeb252dc488d6442849a1677a2aeedb284cd73a82593cf1452b SHA512 c17fe478fcb9ebc2749c27fc75b839bd77e81c9d0170697b2a697dcebb9f4eef4b954d023b76d33a8b4201b110e5e997b1e0993faf7a04ef2e1191a2f7c516a0
-EBUILD SUPER-1.201.411.170.ebuild 527 BLAKE2B 3bb3f9382357a6f83ac48bdac4937a9dc19a5f6ed05e4b558550e6953765e78928b4d969cba00837042597774ee7cec8690d3e04f95679e1af41a98379e34769 SHA512 5dbf534a95ac4353bf3d4488da251f6ec695b156f8ca71f499e4416b41c7d1e53fd3566d406fe2ad0e2d3cb33cf9a84028671056214b85f01d3e58c8a78582f6
+EBUILD SUPER-1.201.411.170.ebuild 659 BLAKE2B 5d9f65e91661f4daf30e02f6e55aa9952b4bb0d220a726cc6a76baadc21447f91f50d073c1d75d226f45ad2b3178c69b2d3d83d4260290b0c8fe99a52e9bea9b SHA512 06965ee5f4789f6d33479bd0846db63fb06eebf6a1583120d74f5dfd3afc6a4e7184593de0fe66d4499098f251fe4e8960d9f97cab6ca9b35c270c678924b04b
 MISC metadata.xml 381 BLAKE2B af5644e02b2bcf30d7ff75ab9b110e88721714c38b323b91a6bf26ad86458c44055bb7349af9b5c1d9ae1662f57ccb9bd6a0180ad27e7c62549878645bb04ca5 SHA512 3b03f4e5db44029813521bc5433475639c27c32c793c2c9289af95659fc231e1470c05017e9399850f8a79b0da2a3041944f1bb168c19e0fb1bab47db64de6c9
diff --git a/dev-perl/SUPER/SUPER-1.201.411.170.ebuild b/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
index 7c19aefdb42b..ebdc8b24fc2b 100644
--- a/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
+++ b/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="control superclass method dispatch"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Scope-Guard/Manifest b/dev-perl/Scope-Guard/Manifest
index 7b49e37abf1b..6027ebe67d01 100644
--- a/dev-perl/Scope-Guard/Manifest
+++ b/dev-perl/Scope-Guard/Manifest
@@ -1,3 +1,3 @@
 DIST Scope-Guard-0.21.tar.gz 4377 BLAKE2B bb9c690b9367a7129555a2b688efabc12e473b9639f0ce4298bc3a6afacb7620438b5514dc7de7532b31125c0b7b9f61dc565e08c4dd7912d0a8ff40f3e7a26b SHA512 65492e08ab79dc323649166e83ffc13c6f1fffaa9c60d581d8854dfe427a54a3c3c5e4d8b90308d4b1a31a1a54c7977b4e1d36fc9005c6e716c2361ce187fc9f
-EBUILD Scope-Guard-0.210.0.ebuild 443 BLAKE2B 439388cbc8637087b99af73f6cab4c8cf6d751c4fd693cf127fc7a842282b3c49a322fb0053ef7c19b56360986f798f329510dad8aa074b6f3e780e33fc1603b SHA512 d88152b4b3262385be19bd8d8c5b10703640c75d512fa02c2121ed9d96409d19957ddbf1b42f35afac4163a9a1a8f9604e30b6b5a6d343d30925556d3888f295
+EBUILD Scope-Guard-0.210.0.ebuild 450 BLAKE2B 93a362bef35c795c4f189b8fd08080b9d1196fd5da1135d14b4d0d178266e810b023b4af9e62d35f873facb3a8539999e7e32d48dd95497dc9a6fc73b99c98d3 SHA512 8bab44b64feff3ecc4b88dd261c4559ac0c9dba74fc7179ca93ee930591af6dd8cbb8428e293d1109b3d470b8ae1b97b12c8182a4059404ca5116f3207da691f
 MISC metadata.xml 394 BLAKE2B c11d06eaeccbf286775d255d21a8cae6d5310da65136cefb0cf7c7b4b907fdc398f39d3972aaeafe0e6d84666cea8989745a39b2d9bcef8546a75dc97168dd48 SHA512 03a15e4f4408cbfbf1a441de41033ea67dceacbd915f46f79f28a13a24235b015b41329ef321aee2f033e5da067e7e3a573d2c799dda7260156af33949b88003
diff --git a/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild b/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
index 1f443920da50..82361761f61f 100644
--- a/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
+++ b/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lexically scoped resource management"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Socket6/Manifest b/dev-perl/Socket6/Manifest
index 45337b772d33..5e654c73a551 100644
--- a/dev-perl/Socket6/Manifest
+++ b/dev-perl/Socket6/Manifest
@@ -1,5 +1,5 @@
 DIST Socket6-0.27.tar.gz 64936 BLAKE2B 14b5777662f883989f23ae5004000974acc2e9bf7d5908e82d9b55532fa0be5a109d52c1c801052a1dd8375fbd400b3f61914a33091ac77eec46f9423405ac22 SHA512 8431d3d3d48da0b55dbe5478f9226ddb77bc2fbd2db164683312d51446dfdf52c2f596ff1ee7287a4321386579db8713169eabf65b93ff900808ca311cefe6d5
 DIST Socket6-0.28.tar.gz 65567 BLAKE2B 9f8b83bafb9e57f4f26b2e123bda04c9ffeb801487743046f46ed583add67e663a9ce6dfbdd150cb0dcaa606f83198d44c0fa932be19b444d96b86ef2281fb58 SHA512 6f7ea283b0eabbe3051ec6d54e070a0290aa1cec6bb82b949a5a23b38b591766d19d2ae7e085c86cf44dac19784c5df3c2bf25a011b77281d5cb7d025beaafce
 EBUILD Socket6-0.270.0.ebuild 545 BLAKE2B 154df7c066b5f259c30921471e33a2f21b130e764360b34b5245debd5eaf68b21899906c12355c5c0ad1dd5f94512c5da54ffe6abdca28eba0a7d7bad9d8b305 SHA512 1d9c2b73c20f4cea62f62d8990179cbc9e1199f4c38ff37e1b57d39e8fbac65caeb418bc9dc1787d8dadbaccc5e0493347cf80433f43f9d06ec15770023903f2
-EBUILD Socket6-0.280.0.ebuild 538 BLAKE2B ee529e04628b6e219de8395dfe3cc26735dcb1f75e7eeef010fb49f856201e72a4e7ce6eff5122e17fc51b85c7de0fa1abeb19efd66c6909b65ab7d3a232bae9 SHA512 cc20fc6bffda403e2bca51288bf904a8c8c022e07149d29b0ff52a0e1747a7361d5dd56a3104dc8ea11e368494d71c0298430ef59724a46f356c63ef210d92ba
+EBUILD Socket6-0.280.0.ebuild 600 BLAKE2B 65ec7cd8ee3093e108cba90ec032399384b74adb6579c4d99728a744487c9f3ad94e2f55b0203066c00db54c10a7314d31c48b81649c8d6d9682954e31e1cadf SHA512 7396dfcb66951df3d815204026c3897c168acbdee41b05a6afd7ec3cce67a97cdcd37e00806f379d911e3e30179e798b3eb3d5ac2520833601a10d1c630b0780
 MISC metadata.xml 385 BLAKE2B b434cae1c1b59a635335aa32a84cce3ba7f04ecb1a305fa6ef8db820cd8a237c9f0a88ea13837e6ffd71df522e271ffc573da9faf3b04aa78a47f2c5e33201e8 SHA512 bcabd5ec895d143170b58c356b11d4c09512a9767e4fe3452939954267786b0a99b2e3bb501d097e9563891f15173ba3e60a730f4fccd79a349a6723fb603311
diff --git a/dev-perl/Socket6/Socket6-0.280.0.ebuild b/dev-perl/Socket6/Socket6-0.280.0.ebuild
index 36df909f1515..ede352a2abba 100644
--- a/dev-perl/Socket6/Socket6-0.280.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.280.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_unpack() {
diff --git a/dev-perl/Specio/Manifest b/dev-perl/Specio/Manifest
index 7ff7945e5e79..6f4f9d567103 100644
--- a/dev-perl/Specio/Manifest
+++ b/dev-perl/Specio/Manifest
@@ -3,5 +3,5 @@ DIST Specio-0.37.tar.gz 96573 BLAKE2B 4c67bf55fb0fd46062cae23b42efcb2a3d9a4367ca
 DIST Specio-0.42.tar.gz 101641 BLAKE2B 9c527cd1b306d1a8394ad5b6757153aa00edcf111a444b3792cf088aec0a00597c655f59971eef7a8a6a7689e9b683ca78789b7adf1c9d19a0b6861cd4b90733 SHA512 7a9ff3e96cf3957d7857cd5f6af5efd9e35fc4c888fcd8177041e34a2388f54269e7a3da84ec60961fb61307beb882ebf54e19ae4346876e06197b1ff57891a0
 EBUILD Specio-0.320.0.ebuild 771 BLAKE2B a1e4a2ae6a049399eb7f1a9134a0ffccaa94103804bc55210ab83f640582b6ebe38563ebc12c35d453c840b4ca25ff9a49dce053f875de4795625b8be5e5d02c SHA512 4bdbb5b9c0e14c03f295556dd4e5fe4381dc0eefe77d6096b4ae3efef47928cb7101766d61c0f41c1ee04cefc46e3d962a91166e1d88194e514c2ddf955de11d
 EBUILD Specio-0.370.0.ebuild 874 BLAKE2B 99ff4c2b38f8e5ee62f72df126292b900974daeaad56ce8c3869b6abec8010a6ee40bfd6a078e232706167f5d2da81bb1baefce1d93df1f15b7d91de59880b6e SHA512 466f9c353a8fe8d4eb2949283b0a723a28fba17922c57a9f688ccec8af97b24e025f9993508895e8fd94ec7a13f3f5832f2027d9668c46db58bfa47a2587db44
-EBUILD Specio-0.420.0.ebuild 918 BLAKE2B 1c266b9a459e903f08399bbfeea8f58db6055fe34b6519afbbf808f67faeb44e714ec153abb78c87c7f6947c3337e0bf81067d0e8cc88aa889c7de4b375e5aa4 SHA512 781ab12344d79ab8d055a46d9c673bfa8546aecb81477eec5ed7a1fd512218730d73056d0d6419782a7e88adeac04c1150e941d31212eba607e99982cf2ba207
+EBUILD Specio-0.420.0.ebuild 1057 BLAKE2B a06d8defa2a8cf88ba064ffae9e148c1ec902a848dbb8efbf70fae07bb1ac04ea9860f020c35227fc04540ca7ae711d655f5fa24f201ab129ee12a4fbe31c2aa SHA512 34cdc192a3d18655a43febc891dc024502fcd80fcde7e1a0fc47c871e473c21bb85ecc4cdb0d5cd8be49cdc74af4274e449e7a5292e312befb0211f4d6ae86af
 MISC metadata.xml 3181 BLAKE2B b9c67b2ca34c1b6e169f856c59731f884558f46dbabd5313093597283cfa507443c7745c4dea004cda322c5bf7a89862cd531d3570a610383d5a4e1cdaafd589 SHA512 fa6cedfa101b23b99f854562aa4f914170afbf027e1657a8338e19d5bcbcf4db5370d44062f1df1bbf4b9090051264baba5ebd18c79fb9c2c608d4a931aafc27
diff --git a/dev-perl/Specio/Specio-0.420.0.ebuild b/dev-perl/Specio/Specio-0.420.0.ebuild
index 7bcda2644cf6..2bc9e11aa263 100644
--- a/dev-perl/Specio/Specio-0.420.0.ebuild
+++ b/dev-perl/Specio/Specio-0.420.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Type constraints and coercions for Perl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Spreadsheet-WriteExcel/Manifest b/dev-perl/Spreadsheet-WriteExcel/Manifest
index d7349496bf01..65a3ba3c74b1 100644
--- a/dev-perl/Spreadsheet-WriteExcel/Manifest
+++ b/dev-perl/Spreadsheet-WriteExcel/Manifest
@@ -1,3 +1,3 @@
 DIST Spreadsheet-WriteExcel-2.40.tar.gz 480975 BLAKE2B 7015f1174227c7ea2f5e470452dfe115d9c7189c2656f19b2388198e7154858a9d48358c930a558842baf1f1a726d84431013888296c640b51a7bd5a241908d8 SHA512 aa6690b4b7b66620e6490f97b0d82520dbe2a51cdc0fd03c9f83bf963f609c39e5f9f45c31e0a68809d0ba8f8ea3120c7c53cddd48a875074d5dd8250d19574e
-EBUILD Spreadsheet-WriteExcel-2.400.0.ebuild 504 BLAKE2B 543ed10a9bfdb6e4fa42dc4eb65695ee612357eff92caf91c26d190cba1439c67b3ff16eba74d8c7a1291f221e58abefb1fc552fc4cf5de287c83ec06ffc6f96 SHA512 40223abe0821d3ff135c2e730b0f8b57116863b3d52220e2e4d5cead6b1430108b6d64f7106ebbcfdb83d12907f9fc5e26e7a8900f5f372fa1dfa69141231a73
+EBUILD Spreadsheet-WriteExcel-2.400.0.ebuild 500 BLAKE2B aa7d392d6286170e2e2b5a937485ae89a16bcfe2f8d33a1d492ab8812f84febe603885cdb054bdd5fd030956adffcd7c35217d25a4b04ca2cf21b8be6493fc9b SHA512 12610f55fa4b16bdc024534194ddb4baac3bd5e9eea16698917020c25b6aafa754053a6a926cd2743a32fdd522ed7167aa974a977c1e651217d973d3db1ba9e5
 MISC metadata.xml 1962 BLAKE2B 792e64d4e043bcdea370174e7ac4b2dbbc23d3207aa2db16ea3b300479f1ba6c9bbfa81361d9ea7e03dd98f549c4ce9baabdba62d4a3d3b04f3131c0632cff75 SHA512 43ec14548a37d130c4dfaf3771996a672b5c5faab91bdf9429ba826cc8f42048bf2fd04881c85566205a3ca5a48b05de01b647bc5370bb9f58cf279d86b2109a
diff --git a/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild b/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild
index 8734fe410929..f7f9b30ced62 100644
--- a/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild
+++ b/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Write cross-platform Excel binary file"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="virtual/perl-File-Temp
diff --git a/dev-perl/Sub-Exporter-Progressive/Manifest b/dev-perl/Sub-Exporter-Progressive/Manifest
index 23f1b72f79fc..9196a7c9bff0 100644
--- a/dev-perl/Sub-Exporter-Progressive/Manifest
+++ b/dev-perl/Sub-Exporter-Progressive/Manifest
@@ -1,5 +1,5 @@
 DIST Sub-Exporter-Progressive-0.001011.tar.gz 5829 BLAKE2B 5e5ff8589fad5570f60e1179fa8ced0ffc80f3dfb395cdcf84594fb76477a61b3a19e8fa612dc5ae3f4c2d14ae950cd6da439c6be40a371c1f30546052d3ba1e SHA512 897c93813aa0e0e5a7337eea861230a3180bdf9c7983f035c9afbee9d56992ab707456ee7ceb392b31d0fa9ef0138bcab36b3a4efcd03f98ccc022e799601daa
 DIST Sub-Exporter-Progressive-0.001013.tar.gz 13468 BLAKE2B fa89dabd394888994df760982526139e6afece0f012b7aa269b354519966f9f3ed0549a2c148403eb23fd7446037931d49b7c3d5dcf5511ffe43367ab23e4aaf SHA512 28d0ac6a380a4fc1515bd69320bcfd073c0c0e92ea34bb924972aa46fb2f6912485d686f0eca5d5b885d8b06927250dfaacd1a7ff86ba029f879a183cba546c4
 EBUILD Sub-Exporter-Progressive-0.1.11.ebuild 505 BLAKE2B 0e49d14e989e93098bd71aab9d68a85affe1c0d8deb1cb7356d71be1068cbd8313e98e37363a58e55829ead15a016225117fa3b21f7b5d63076020ad153e2d91 SHA512 908d170c14787d011be0f9330555a0d91fa0bf7f566ed8a9698fa64bf9560a0a842288987ea17e05d6ea6fea26a3b4ee1860cb5080bb5c55d2c3673fe1af06a0
-EBUILD Sub-Exporter-Progressive-0.1.13.ebuild 565 BLAKE2B 4dce71bc6c939f4f741681a8e800f95900dd8d5dbef08a2ef56c914817101e8ba93892eb821710788533742523294896d2beeb0f35ea683cfc9e210b2b5525f4 SHA512 a8024fac1e02d560dbb84f9b7999920687ebad15d352d133341094a186aaf7aa8e40c7c082348994913717f7c2b8579c4419c8ccbf073e25eea706efd2d9c338
+EBUILD Sub-Exporter-Progressive-0.1.13.ebuild 640 BLAKE2B 6044a1b10ccb19bf16d69e98409670add4cc108656fed5086455d3f5d5f6b5556ac75eb02693ec1186368d674515e3498c93167c03557942d461c09cb493f5d7 SHA512 2c0f18d50e13431356c39cd6f8eea5c430eb2d2035206494c9e7603be4153694858af8d362f96b3c43b5d1dc0dbca1320a0a54cc137f08fba927838f78135434
 MISC metadata.xml 409 BLAKE2B 8aaddbfc0a137889fa1b408d1a64ecec329f2e3c5434d5351cd1a3735a217152dac346e7ffbad990a44d590c5851935f81beabd80be72b4a498de09d46150722 SHA512 17297583180f217b9263475386120f0da3ce1e40348c7cbb5eb924075863834788dd8539d63441e41986d27b6dfa3b9f249c1a3ff0e9cd122b20c5c7a6e31780
diff --git a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
index 5af67eabc0f6..317c465214d2 100644
--- a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
+++ b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Only use Sub::Exporter if you need it"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Sub-Exporter/Manifest b/dev-perl/Sub-Exporter/Manifest
index 56e1ba89ed2d..66f260dfcadb 100644
--- a/dev-perl/Sub-Exporter/Manifest
+++ b/dev-perl/Sub-Exporter/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-Exporter-0.987.tar.gz 45980 BLAKE2B 3d23be5e98084b5de691dc981f2fcb36d443e079705758884dab2d9ef083681b20f25443410ead21c6a62935edfa2146192c44f1afeca51ac89204078cfcf454 SHA512 6b682d27a0df8ce971ea48aeca5162e1c70929c51cf27119b30361477876b0b86ecb15ab13a6c3cbe5bb85be9e600589fb9e3c9c4e94bad3fc05b675d293adad
-EBUILD Sub-Exporter-0.987.0.ebuild 578 BLAKE2B ca7d3182d9256092c6ea9f6edbc6167dd564e65b6e74ef9ac9fec67468f8031856a0d93582e6aa0dc033cb2366d0444a7b85b06aeb9d8a5fddbc7d190f748df0 SHA512 fa67e18851c0c75929d11a85c4f82794a0794c20909640bab563494500e894f8ca476c2443c3376c980f503bf9470e15a1181c2eb1f6a77830e78cf490198723
+EBUILD Sub-Exporter-0.987.0.ebuild 631 BLAKE2B ed64d045fc35615b1d591e8643cc4437c6742e1f2a0ee602b54ec5f59d9abf793e9d59b7e8f0d0d9810de47995dff12449c1a5f81b10cba11eceb9eb68c8275d SHA512 8819204fde065fbf788be3358df01084f3b6f2f6882a1c051d05dfa18214dd82eb11e93093e0d1beb867412da7e3ddee1886e4a5ffa2747926824349f0840bf4
 MISC metadata.xml 462 BLAKE2B 20135668e7979808796a3c204c379b2442a8525d02f95e0ed34dac1c0de9527c722a9eb817831e0a31814109767882efc8296c0dd1e8e9397b91eed4c1a3375a SHA512 607af948dc7dd71be2e7f7251baba253b9746407953c1e2a2d03366f187fb2e1dc4ae74637edf8759aa58026a1edca5943fe61bb07db4d2739613a08f65720bc
diff --git a/dev-perl/Sub-Exporter/Sub-Exporter-0.987.0.ebuild b/dev-perl/Sub-Exporter/Sub-Exporter-0.987.0.ebuild
index 9e71602b12d1..d7bdc3ff3c16 100644
--- a/dev-perl/Sub-Exporter/Sub-Exporter-0.987.0.ebuild
+++ b/dev-perl/Sub-Exporter/Sub-Exporter-0.987.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A sophisticated exporter for custom-built routines"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Sub-Identify/Manifest b/dev-perl/Sub-Identify/Manifest
index fe5aa3b815f1..a75fe4b7d0c8 100644
--- a/dev-perl/Sub-Identify/Manifest
+++ b/dev-perl/Sub-Identify/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-Identify-0.14.tar.gz 53135 BLAKE2B e9f502d3a21a106d0220acc909dd0bac16e236b702d48c3cea65ce630a099311951f890fbd9ee171b7e62e113d60f8df4f184bda8198edbaf5f949ba2467ce8c SHA512 f69f542c84c5c3ca1f1c7f5f58fd2cf19279a65229f43117c31f24ab0e49d5f329bef2bc00f22252fd2e52b4e17f16b279dac438920668e046e59f2e22e52c14
-EBUILD Sub-Identify-0.140.0.ebuild 613 BLAKE2B d7f8be9299b1fb29a7fe5c9a9f0d0aae1410c290f17ef4589209862667eb3325fcfb798e91095e1d3b9ac5384678fd36d99bac5ed63219162569acd5d49e140f SHA512 7248fdbf0f1a2c1d93bfb4afe553504127330bb97a66ad9e683328d6f3e354db0d95da05b9835ae65c087b93363aa4253f1eafb860e4960667e693193422d2db
+EBUILD Sub-Identify-0.140.0.ebuild 710 BLAKE2B 62f7ef992738b50df9c806466b81b597a145502a5939e498fd2469490a0961d890544cf81528a8fb12280066d233b31a7fb90f556c35fd0e880c615620ca86bb SHA512 6948d3f017e9650f6619353bced0b396a2e2c654e42fa6727915c26efb546895cc44768e64b04fa8fee666f39958221fc0d3f0ad5042326d5c5044a4e3693926
 MISC metadata.xml 396 BLAKE2B 3e523076dbc6b0832ce1e533b9eab131160ec37f322de4f813aaaaab5822bde673a69409de3aab2735f7b062f7e928c7f4896e0c9ca79935bf49acca8af7ceae SHA512 c8ebe0a2216aed23b9df58a19cf1b22bebfc41576c0fc64b32340787b0ed27dc9ac219b9d51b4173266254d20cb6c19f6d2d5b3654f48ddfb8502b4092b994e1
diff --git a/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild b/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild
index 88cd5db295f2..8a6cf4360988 100644
--- a/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild
+++ b/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Retrieve names of code references"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Install/Manifest b/dev-perl/Sub-Install/Manifest
index 436fbea6aec5..e24d1ccec3a5 100644
--- a/dev-perl/Sub-Install/Manifest
+++ b/dev-perl/Sub-Install/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-Install-0.928.tar.gz 18669 BLAKE2B cc5f6dbfd7d74299a4a8534c377b3f393bce9976ea86b4e026630101cd85935eb2f0cac74612dad8eabe9caab3a0744f1e33f23cab9ef8873ca762a25e990122 SHA512 3f25df9f5992075968830d4235e9f6520c526331b9180391e41483241d43253a61ad8dc381d77aaeb6c6fb841cfc5c097598e62abb46208894275c393a133ade
-EBUILD Sub-Install-0.928.0.ebuild 629 BLAKE2B 84736f7ff65057cc6330456582facf59bfca53c19d89cf4db3b088657dbec8965da2745ae5b3fd909966b923b5123d5e5b200778f6c2bd0912e68ebd262da9ce SHA512 43f60a6261bd0401910a6c736d1a527e2987a3f2f414526de213189bc029e59293b0de0d742a284930b0a545a187bc5532b048fe71a859feb3c469755135fffc
+EBUILD Sub-Install-0.928.0.ebuild 682 BLAKE2B 4fc2812efd9845189934b2a299fca17ea3743e77cf1b97d028ab7e40665c9f454bfbebc676dbbb1150a1622225bb80e53db1aedd52c9095321145fe641d1e27a SHA512 959c7975b9e2c53e4fdb463013386768d047da2a3eb6e6875a65d0b3b50e6472a35533d68bf8f3f738b44a60858e92043fd3e906be0cbc25f7e8e324bc1ddae7
 MISC metadata.xml 394 BLAKE2B 6526f7f0eadbd35d51aee25897b4c4123ad8571cd6b90d7b0fb34ddee7a7e6492f16c7a363b6d2a605b24e9ad764487809febcc0c19b44de12ae752eb7a339dd SHA512 406189a02b985750990b43fd465c28107ab12421326f5ef70d5afc2a0efcff1ca80e2683e61254145ebc37a6f973cbdc85d0a99d117f585e0482ff0f011173b4
diff --git a/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild b/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild
index 5c7765a829f7..4dee373d303d 100644
--- a/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild
+++ b/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Install subroutines into packages easily"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Name/Manifest b/dev-perl/Sub-Name/Manifest
index 2c6371e67f16..ff527f425508 100644
--- a/dev-perl/Sub-Name/Manifest
+++ b/dev-perl/Sub-Name/Manifest
@@ -2,6 +2,6 @@ DIST Sub-Name-0.05.tar.gz 3463 BLAKE2B ded3c809a533e3c10e9400e539808788b62e0c959
 DIST Sub-Name-0.15.tar.gz 76856 BLAKE2B cec7f3ec670db709e420baac009693b77c595acfa99250f41af1ffcc090ded8ea6ecbb1792de42b15a594f0e8365a5caa7283a0510551b0a8a74714388cda950 SHA512 6b8f0ce56e4706148cd71d5e937986714d69162c9ce16b177866832ef1c0245f5d11f5bd555e325098ab54fdb1d46a32e37d0213d2dadef03cc53f2d4da59cc6
 DIST Sub-Name-0.21.tar.gz 81155 BLAKE2B 2472cedc9dcfee28fd7f6944ef4b839d8b40e02c165fb00a760e6bc32a2bcb0131438ef1ece617df5f2603e60c033e25641bb8a8bd5826496db6a950c79b277a SHA512 94be57b569f6c434ec3ef4fdff1a9d946067cf6c7ee58f716f4bc188764ee103f9a2579ee0ddf4068ec6889c186d9d447d8252a5dd2a0e882719239ac1102294
 EBUILD Sub-Name-0.150.0.ebuild 739 BLAKE2B de790837bd1192b5c972dda2b88413c06b44e31a915964702c7ae97149a0deb92e63b5e3581e6e1376e8c40c9f8fece9e2c42a46baa606b75db1d21518ec0777 SHA512 db773e2aa80ef411969dbf6c05dfb40255b8f68d26022f0bb5ed195d34a93f224c38f70db30aba349e8eb7e23380636c26b5daa8764c2f2c4c3c5111531744b2
-EBUILD Sub-Name-0.210.0.ebuild 751 BLAKE2B 635302de48b9546005cee6b676c271e7c49917174d2705f4280e361fd9227f46fb693e636db1e62756228c64810d1868df8a1f4ce23e9da44b9f82b70ee16d20 SHA512 036fecbe7d7278c70bb2c54baf909b7b5807573f0d7032c186798b2f4ca357cb656656965b67e579b7071271b28fb8f602d50bcf1d881a6b1ddcc0c55d01aeec
+EBUILD Sub-Name-0.210.0.ebuild 759 BLAKE2B b3d1304bd8007cc214864964739dc4431a19d707936898a6860b5179dc600918fdaa2b5f34130c2bdfdb27133af4d3ab4c21c641c667a740a1314167c1bd039c SHA512 39646e01c59d1856721488054a03525b029a9c18dadfd5644120385c49126c869211881d195427783a772f9ee2cfd4594c4846e469f5d4227c39070c60ca0db6
 EBUILD Sub-Name-0.50.0-r1.ebuild 404 BLAKE2B c16ada970a0bcbd1478869415029ec542190bbe0aa91ff044af04a0ccbab78349020bf089870b5b76bf6010e28d3e68a127df09820c6313189d96ec083a9d300 SHA512 4f362d2b39f37417152d46960c4e91ec474535695967e85baf7d8e225fbddc04766aacd72677d85d87fb221179f07bc832ec5b824c9a3ba4dfe9f2cc1437c79a
 MISC metadata.xml 503 BLAKE2B 013c0b29e42f1442f688d441cfee99714734fc6333e0e1a24d687c099be87f209a14929835cfeb502e7d0689d03e8940357462e18c88bd4d983f1c0b17a7dd7d SHA512 936241d736b811bfe49ba47fb394048890e4f05445af99b2d961209ae2ab295e4adb44671be5363dd06bff121a1f6b611c9b1775fe9b276b5d8f88b2b369d386
diff --git a/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild b/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild
index 5310e3582ce3..a6f8b6dbe1fe 100644
--- a/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild
+++ b/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="(Re)name a sub"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test suggested"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Quote/Manifest b/dev-perl/Sub-Quote/Manifest
index 002899af4e72..bda347f54c80 100644
--- a/dev-perl/Sub-Quote/Manifest
+++ b/dev-perl/Sub-Quote/Manifest
@@ -1,5 +1,5 @@
 DIST Sub-Quote-2.003001.tar.gz 19131 BLAKE2B 20ae1ffacd8f2d582cac67671ece00ce34cad0fd28ec9e76effa26a07fc655bbc4ecf9ba2bc814eaa0325ac9ae0fd7fb4617d91e5c69e9442513ccc98d574985 SHA512 cd24460e52b68955a460accf673a58235c8f846285a01862198bbb4f6c5718f2977e615099da7eb54a41d76ae75fd7167c7d682c14f6819e65c83f163189dd49
 DIST Sub-Quote-2.004000.tar.gz 20363 BLAKE2B 0697f2a0a9aec799161289bee34f991fc86eb59e23a72f300f207ba80608d8f96653222dd8fb2393085cf052b875e9861bf6f34f9c099d1258bb36a0db3d63f5 SHA512 222354896728154da7bfc6ef9d4562430ab250b1e1169330f63b43eef01527785c1c8559c5eb77a8d42484187be74a9ff97b325bb2404a205a6d4b990f8656c5
 EBUILD Sub-Quote-2.3.1.ebuild 572 BLAKE2B b68029bc3d9ed497c9bda56265b28599eb7ab3069504381995957059f2ade40b3d6c4f935d3ad25a4de46f39abe5e30361a2b7d794001db335196a0e6ac67f9e SHA512 52312e7e175a3638ad4b8e64d68ab66f50d4198159bd4e11e2f6aa7537ae7960c270b9e483aa770769e6ef82f2483b2b7c20ebaacea442d4c69202754cc272d5
-EBUILD Sub-Quote-2.4.0.ebuild 591 BLAKE2B b8a5e369e69393548e0b3ae1335daabb5501dd31c882d6c0125d56327a7f6fdb4b9de7de1c66812699254eb375587eac99defa7f45c3dd77785ed95506767feb SHA512 bb1108d5ac5a5417e02003b465908eba0f081a1299b18b6c84666516daf933a49b63bb6630b332b2a3757b29f4852e7ec227254a8a07f7c9e9b6cc048462b120
+EBUILD Sub-Quote-2.4.0.ebuild 730 BLAKE2B 03eb71b2f97248b26db6a98c617e9d690757636052f2878e89c489e78b98ce7219c29c99baf161966f166dfe4d92c99e729a7887009e0d123f50bdcd1f0d156d SHA512 07c769cb67069215c25d3bf681a5935715b71a7f57294991280328958360d06c8988e699a293f1a8af4be582c4c89cbc5345062a630e55c25171dc858719b344
 MISC metadata.xml 447 BLAKE2B b414878a42aceb8390f1de47f02ff23dd6ca3ed337074f06c252824c968d933023dbba655430ceab71406ede17a30fd2b3d8b376a1159425116c2898b316d182 SHA512 b3147fbe7cfbafec109ef47574f27a5d3f49558f55ac6b9d6ee52c56c2701b26114209f0f675e32de3eb253b375719d2faed0ffdd4087ab49b3e6c9d0cd1237a
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
index 5a35aaf251b1..43222fb898dd 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Efficient generation of subroutines via string eval"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Taint-Runtime/Manifest b/dev-perl/Taint-Runtime/Manifest
index d947e78122ac..833ae0d27945 100644
--- a/dev-perl/Taint-Runtime/Manifest
+++ b/dev-perl/Taint-Runtime/Manifest
@@ -1,3 +1,3 @@
 DIST Taint-Runtime-0.03.tar.gz 18932 BLAKE2B 6c80885bd054ad4f9729b55f09f8ebb7abef5fd3d4f6c54f8aa9f648a9b28b296e2d88affe0bdb218726ced4cbe7edb66862070eaa216f9e1296e75903144cc3 SHA512 29fc770e795e4e6a29c2e963c94955142ab6187b9687ee3e327005afdab930792194f9918e63ebbc4435f39c53987ceb0a11d9411d05a658d9e16f4afcab6624
-EBUILD Taint-Runtime-0.30.0-r1.ebuild 340 BLAKE2B 49579e579dd4e2a80f17564035faa8eb24ceb95919fc6e23769cb5f70519ae0fb8d11a0f8f266ac31a47d4f6aa2dc6c843f1b44fb664b6e1db18643ef5d95918 SHA512 9a0926fd6aadd496ba2a46f52bd1ea1dfbdf90ea1aada39c3a0ca64967c8b36a29ceeafe28ce18961b58e285adc8edd90d6c9fcb25d2b564f086fb244cd84445
+EBUILD Taint-Runtime-0.30.0-r1.ebuild 339 BLAKE2B 55a66b9ec9ed99537101269ed0ac20f1507c3628abe939ac8e3ce3c65feda414e8a984428daeeb1f3a06e4bf992809099b37106d7d633692994372e9a983a851 SHA512 5502d6b1a88bd65348139247568810e5d5270ca1af6f793f922a3a266b34ab0037684a17e4150be7fa59a0dbbd25a060dbd9f58cce66d752549fc70ac1bed7a8
 MISC metadata.xml 398 BLAKE2B 828201bb7b9a3811c1063fbad205341b7f36606299af1e5a071bef3ac84fcb54566b3c40455bc9680e3654440be52ba6a5fe96ef29736d7dee78b29353043d24 SHA512 9a2f7f97eb7c045edf5a35957684ed5bfd881125ea791bc3c414ddc087732bf27caa4583d0b781a37284d9ece8f00a7d377e1c3cef8efff0b4447a73846ee6fe
diff --git a/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild b/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild
index 65efb2af14e5..bfc29cc49a94 100644
--- a/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild
+++ b/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Runtime enable taint checking"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Template-Toolkit/Manifest b/dev-perl/Template-Toolkit/Manifest
index 806e9a78bab5..8af6a1b79339 100644
--- a/dev-perl/Template-Toolkit/Manifest
+++ b/dev-perl/Template-Toolkit/Manifest
@@ -1,5 +1,5 @@
 AUX Template-Toolkit-2.27-cgipm.patch 1819 BLAKE2B 06c8fa20721a0d68576b5c8883eb2f0c85af72e84bbdd7bc2deb721576d8ee453dbb0b3ea9e9d770604fb916538b9067f3e3311b176558309160c705068aa305 SHA512 d7927a35a3d287ad2a515cedb01f9f80fa9d23293b694fb03b59b18b159f4c4584b9ce8870d8d4b9c56d9f1c28c624e918332d668c0c375167b44f783229a9e4
 AUX Template-Toolkit-2.27-no-dot-inc.patch 1987 BLAKE2B feaae674dd01ef2d7ae7c1a660c838b69d3b1fcc07b735a66dbab2bb6d27c7ea1916c3bb2855b7f8d566f3516874925ca2a23f20cf2f9258aa1a7bcec8d46f1b SHA512 e7ce9167bc2ecc648efb0e021f1481c63093cb9a8f42492c081200938e075dc272eeaef903e1cd14b4f81407037d8d5dce43f7f04d113dd01c4f24516ce93b19
 DIST Template-Toolkit-2.27.tar.gz 511172 BLAKE2B 62ffce1fe5679799afff6b3865882c91e70efeb2ec14474f3b49bdf35bd64f7ce4439d5c58ddd73bad26589816d2f24f4691a02c69405fb6b6b604d28edee4e2 SHA512 17f03a01a3d6ab0ef2247c77da15c46d9bbce3e0158172162da6abe47f53c5e7ca041a7c31506bb3a37f31c476ba747f5111c5b1b1d69614a4ce3352927fd4e6
-EBUILD Template-Toolkit-2.270.0-r1.ebuild 1043 BLAKE2B 2cfd47bb00be4a268018c63a209358dfa0692187a16739c52a5c9c017ed8d4f42306b44f5fca57736f6fa875861477c66b9ee6237c8df2595ca0264324cb2521 SHA512 d130bc14cd93c6e815eec7a42222ac6079bcb72207fa305e45297baa20033164eb5c50d68ce933db77c9e87b222091a7376f4e84601bec62e3df306692306b52
+EBUILD Template-Toolkit-2.270.0-r1.ebuild 1153 BLAKE2B 6624b42387c1bfb65c2527714b4e338ad8ddd5ddd9a00b963eed519fc2622189a5aefbcc4d0cbcd24c2850a3e8a6591ad187670d0231b423e1f48d053f999624 SHA512 d2604d24540550ad771d9c56259d1f5765e70a783a1657fb1e781fc1148abca4aec13136a0be2746a300d7b87ed71461bdd1a4347b66f138a097446b819d1ed7
 MISC metadata.xml 3834 BLAKE2B 0d0cd7506fc2864b9e26a1d580c53931016006ed82e6a788a474f80b490e780da32e07855778bad14ff4b8c444d8e79f6a42a71013bed0db95d0ba8a14f395b7 SHA512 34d9afc89acd0a65724c1af1f5720b15665fcaf06e25db62210bf8fe7dc7c6e83009c0ba6c346821d320de5587cc678c921d0982d3ca317633a6c049ffeee1e7
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
index b368290f838b..f4f6f510e9ab 100644
--- a/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Template Toolkit"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="xml gd mysql postgres latex vim-syntax test"
 
 RDEPEND="dev-perl/Text-Autoformat
diff --git a/dev-perl/TermReadKey/Manifest b/dev-perl/TermReadKey/Manifest
index 1ed93b47538a..8d6ea9ae53f7 100644
--- a/dev-perl/TermReadKey/Manifest
+++ b/dev-perl/TermReadKey/Manifest
@@ -1,5 +1,5 @@
 DIST TermReadKey-2.33.tar.gz 82916 BLAKE2B e8bdd9c78001de3b2060bcf6ed376b8043697b290609f8cdd3b776dc73262c9ff50ca0b9e992869e9675780bf3e434b44468f589d2bbcf2411ed2a570ef31072 SHA512 ecee70695f8d48f8eeeb6916a7f25aac536e8725815e6c22ed01791f152b55a4203460cb090b00b64ed71e093890b9bc096679223cc97bda0c323e61f105a0ee
 DIST TermReadKey-2.37.tar.gz 85082 BLAKE2B 59c999924455b6c4165897c7650209a98b5097c7fffd1044de005b8823d0867f6b16a835d5188c4a671b58109312ac2aa70012edd84d4a485b1534241f9525ab SHA512 b602d612be17ec4a56fe50742728dae17733f251ef399e8fb69cc8eb22885d7e1c1073c735fb23826137e80be8d3597e60f496ac63180739752d070957880eea
 EBUILD TermReadKey-2.330.0.ebuild 558 BLAKE2B 1de342ce521b7d52498cd507bc9762051d82198afe4fe2fba28b7e71fa41d860658585f29261f41930c44d480f42f499af725975f539f4f4a5fcde05f4b8c1c4 SHA512 1637ad059d4829d738bd4bde0925905dd3d90fa2a1c90439ed4f1944094d0bb0c132edeecbd06e2a37b8f54616010fdd920877cad29b20454fc8155f7777bc5b
-EBUILD TermReadKey-2.370.0.ebuild 572 BLAKE2B 85454b8c09edb806f97a4b98070c268917ebfda1160ed815da1d756ecc6d0c041cd72f3e094dffd79b52f524925cad564ee0976c53913d5430d586b7e33ce1fb SHA512 2399bc8dee1cf11f8d81330964780bf02c0c5d752dd5cabb573802605d516f48c994689fedd5bde0a4a44c51870ecb529eb84b943683efedfe136ef6b8cb13e1
+EBUILD TermReadKey-2.370.0.ebuild 571 BLAKE2B 5633f53496b497caf24ba02778cb69fdd1a72e95ab7192b918873b01af2c8846c53da529329b69014f273a3245edbe066112f489e8eca31496678bed199119f3 SHA512 2999d2bd1c2f2db2bf7f1957c4f483b88e44586a6a0d621ad57adcb5bc1852ec3d46b1397d3643597d20c9a786e61a445f61f2c9bf79f43d63a2048a90fd300b
 MISC metadata.xml 395 BLAKE2B f86356973a22082d5ce869e889844d35568085856436b5ab2642f67fc782ff6320b1586040bd3818ae9632f645103ebdec54ded39fbf834ef0b577f0fac16d25 SHA512 0d250d3580f36080ca33e28bdd6335ed060ebd3760247cd84af2557d71e3b510d463617a34657f46748587cda43b38a128b60d806e641f995a191933c6b18ad4
diff --git a/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild b/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
index 26300e0c77f2..346d5d11d7f8 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Change terminal modes, and perform non-blocking reads"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/perl-ExtUtils-MakeMaker-6.580.0"
diff --git a/dev-perl/Test-Deep/Manifest b/dev-perl/Test-Deep/Manifest
index ed190ab438de..63d340f98cb3 100644
--- a/dev-perl/Test-Deep/Manifest
+++ b/dev-perl/Test-Deep/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Deep-1.126.tar.gz 41285 BLAKE2B 0d7e71563cc0934d791e97fb94a5f41c2936688b8fe761f521d01487b058d32c5464e584e46af75b1b531aef454f06920933533477aee832bba887030a42eeee SHA512 e4667a3294a6a9d4b2a35e1c6dcc2b52db92589f3060e69fc7d4a4cad604dd2484341156b2cfeabdb4f70b777b687297be93b84a33838eb9622b734569ae9b33
 DIST Test-Deep-1.127.tar.gz 41606 BLAKE2B 95349f07f628cd985bf5a9bd9588cfed0472e978025bfbb799e44028580ca4081a766dc8844fc7990eb5ba8145176331cac277303162b6490505bb6f7e6d1303 SHA512 d8cf3c495d62b6cbe01628115daed0a131ba330645a77074867740ffb7420cf261f2da0da62613e4fdbaab40167e6a77668a7f772e885038427518711a0ab4d7
 EBUILD Test-Deep-1.126.0.ebuild 956 BLAKE2B fc4286dd98786b528b2f9804c2d10c1556f2d64c8e9cb7285576a248e7b62a08ac7f97c944cf5879b783b530c967b1bd60504ff26c907a6e74de872f5699547a SHA512 90c15d41eb0da3ffde4f53b39112fdb0520c0b6ebeac7b420ad8581ff1185ec09baadf0005264b348ad161d8c218f42d0526b131dd39d15710cd1b33cf10806c
-EBUILD Test-Deep-1.127.0.ebuild 957 BLAKE2B ca5f7602de9a72e8ffec4d65c6d9321f9408c41c2c09ef5cb6de117e1eb083690c7fee93d8f2f7761cfa26e214ccd73006820949097c0cbcf424119dc9f8d6df SHA512 82b6860788bcb9fa86cfad957fd6c48ed8f0a117cf66e29fe8d448a3820a2faf78770f184fdf7a83eeed28cb5a9bca44f5cb0434b5b9d12071dfc9a575ed8242
+EBUILD Test-Deep-1.127.0.ebuild 1030 BLAKE2B b20065fcefb8a3a192c51dce517a144117793c06b51614d017871d22a1f8e6d60d2bbdfc65d40403bef937403d59ca1fd64dbd2c9b82d25e0c1912c0073c028a SHA512 25852b81185f745717e94cfc94151a7b3570e5f0ef5121bf3a0654d54c9833ab9f1cdf5e7a1dd7dc802ee0a6042fe8680ce20ea50fe5adf8b82e884f12cd904f
 MISC metadata.xml 3760 BLAKE2B c0c2f3ba38a6d884aee20a38feb661bff7f68e8834b2700264928cfb24dd1b1ccf92d390aeab1e0c950b38fb90045171e9eac5adfd474726f482eebae206a3bb SHA512 392c422b42d4e896778b6f1a4f3b117586eca9ba1e80e91eb45da910060f5e670dafb7828d3667f8f7a9049254947a67636c28f466ba0be1a9b9ee591be3a8b7
diff --git a/dev-perl/Test-Deep/Test-Deep-1.127.0.ebuild b/dev-perl/Test-Deep/Test-Deep-1.127.0.ebuild
index 8582dc47d33d..c74b39359423 100644
--- a/dev-perl/Test-Deep/Test-Deep-1.127.0.ebuild
+++ b/dev-perl/Test-Deep/Test-Deep-1.127.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extremely flexible deep comparison testing"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Exception/Manifest b/dev-perl/Test-Exception/Manifest
index 72609798182a..f887a0d42957 100644
--- a/dev-perl/Test-Exception/Manifest
+++ b/dev-perl/Test-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Exception-0.43.tar.gz 15204 BLAKE2B 072705a06992fea690e3e71896fba8c916dd153f47cdaff4eb1d4f8730baa3e9589861ffe901208aff48169b8b054ca118cecf5c92c116be9fd61bf4748923a8 SHA512 f5ab65ce7b142ab7a96b0075838826a7f6b975a151a285e00d99db307bea07b359d5ca44eb678ba93d97b2ae37a112f0002ae1c06bb6e5654b80ce8c5473aa20
-EBUILD Test-Exception-0.430.0.ebuild 659 BLAKE2B bd540a99a0fb938d968acad8f7e1d17bbc0d775e9edc62ea2001fedc35e94510708ef4f59071f048d99a2aacb9c1944f11ecf2dd526cf4a9d07d34395700cff9 SHA512 1e676a7526d208b0ddfe0980b3a42f17683c6c58b14e0386ff33ea029b0d0f3a03d65f04e1dcf043857435cd4f1a5f64f114c3ec3c507f50164dd1626b2203a9
+EBUILD Test-Exception-0.430.0.ebuild 682 BLAKE2B e0dcaa5dd8f9befcc68c1ae51db7125fd03958a6e186d8439d33afb44b6ed2d813e0f3584e220aceb1751854d02b1ffc059109bf4d2b58298378e7666ab305da SHA512 c4998556eb3d949cb43a9a348726ff9d3e7dc2c5b9bfeb201cf06e5a56cfa82c50b665ef8f2149bd33486a776ca6fdb782e15a130054d933f2ca84a78b218204
 MISC metadata.xml 400 BLAKE2B a0cfad7338fd59c9ff94063be86dbacc79301f95f0fb4ed0c78baa75b976bd234c08574aa3b99940f73794fe037feb97924df0ab7a2bb1dca76e836ff99ae8b5 SHA512 c0cf344db8299f4f5174267d9b75e23538330143cba4a0c46bc8e8af29f5a0ac33f624dc5f86b7cc8d01b8ff28e58ef5480e13c378230e88d8a65b5393151171
diff --git a/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild b/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild
index ab32db242d31..0f56f7ab4431 100644
--- a/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild
+++ b/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test functions for exception based code"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-FailWarnings/Manifest b/dev-perl/Test-FailWarnings/Manifest
index 405c23c0ab59..04d4b81ab476 100644
--- a/dev-perl/Test-FailWarnings/Manifest
+++ b/dev-perl/Test-FailWarnings/Manifest
@@ -1,3 +1,3 @@
 DIST Test-FailWarnings-0.008.tar.gz 13734 BLAKE2B bf14da69bcfed50d8bd2801f629ffe4f9382e89a9febc334cafa7cc69e72357e4452a21aa1d630f9b7392cbc3ead4f26c3af93d810dbb98e94d2f7993193c855 SHA512 7bffcc18191326095d99ad01be6426f4d9d927f769a156318f9abfea67da6adfecb657bad89390740c9f531fe69c717afa1d250258eed63d127bf10cbbf2bd51
-EBUILD Test-FailWarnings-0.8.0-r1.ebuild 691 BLAKE2B 222bf5e01012e4b73bd1470347862c01a644a8b2dc21704219eb2fe44d875caa2126e45aa436d7231de887f7013aab07bbbd050308f8c0373197ed60439ae79d SHA512 6eed0ca2eec4d80c5ba2a8ebcb3d6de177fff1c7cf5bfbe3a1d6790d99216346948e43e3dc4fcb9ec98bba5a996659ccd6e36a8eca5d456cf854b11e1a15487d
+EBUILD Test-FailWarnings-0.8.0-r1.ebuild 690 BLAKE2B aba5e45131e086be1b340c3bd674374449feba5aad34ead1407e00d8ac285aae89d8a327247dd133de8f45d027264200b6fe7614794a2a74a9855a1a63744876 SHA512 d53f30d10f08ba5d2bfea2284a342e4bd82112f0956b7d007297c9439f59b9b92f25b5fb2716aa0241a23aa2ec5d8b541c03872f154b646f023abdc88d38f73d
 MISC metadata.xml 406 BLAKE2B 49fbe94f177fca2a050e4750fa41b51826fa42ae88cb6329ec15631b92c9e1d25672b579c6d56870e5e9cef469fcddd74e456b5f66b10b2bdf49745a1088f5d2 SHA512 710f76778cb06039848865d8c0c163dfa2789f626315ab904765647ed304f684254c08cc5bddd1f5608a97b4215db3d511e6aa4dbb3219ec4ba4c215ee2afba4
diff --git a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
index b2a557d8ef0f..b3476b118f58 100644
--- a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
+++ b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Add test failures if warnings are caught"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 LICENSE="Apache-2.0"
 
diff --git a/dev-perl/Test-Fatal/Manifest b/dev-perl/Test-Fatal/Manifest
index 60c0036676ae..3556c80a320f 100644
--- a/dev-perl/Test-Fatal/Manifest
+++ b/dev-perl/Test-Fatal/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Fatal-0.014.tar.gz 19685 BLAKE2B 02cfcb6c075bfcdc3ae1213c18132e124126b44d5e923f8ccd09f2df15eda6a1e1bea1c0c41c46ad9439b91a8fdb0db8f7083650b35bf3d69c50b0fe26a1cbaf SHA512 339d9b33231f8c8d93c0f9374a51458d004568a2f3e28471976e954c35d27efd348f68fb56e3cabd11dc47d37e7ce46282eba967c156ba5081811d221c6a7523
-EBUILD Test-Fatal-0.14.0.ebuild 811 BLAKE2B 089c53245677c435ff3c712041cc920395d3d14a87afa24203fd04420a71d6d6f636ed8fdb08477a52e4c7c868873577f715bbf1e6fa5994ac0e2b270f93a0f9 SHA512 2815f85e0fa4943ca2b30443519eab76997ab27d466f0e29c96f7bbac6ff4d45aa2444cf1fca8df911786f25620193e95ac2dce851e687e431c4e7628d954e10
+EBUILD Test-Fatal-0.14.0.ebuild 819 BLAKE2B 3d30b22f4dbf210ca2a000db06f4f318fea449ae8119eb64e7af18182a6e4ae44add14b2ecd539158ed554fdb5032f0c31bc58e33b0d5a48c3d63c6f465def40 SHA512 bfc1e91760fe0436d2c150a338c5d3630f220fdb42cba808708a69421e117de2e61bbd732dd35762782e99c29bdbe2b21fee6526cc757085069b1fd1f3ed9958
 MISC metadata.xml 392 BLAKE2B fbfe9106bced1fb9d4c92734d31c87f3ce8227f7a15d3b7cae6063990042aa2448f096580e52a98a01429c85a6bdb47bf3e0bdd9a49fd417ccfba26533f33015 SHA512 6e8ac4ccd30204c7035788dc7a71ac6388312ffd3a6830dd9007bcc8dd5c43b8e5d723ace38550313bfb4e2e09f012aa309941088f7749ae7e18d1495096eac8
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild
index 4349f22200bf..5a7e6bf82025 100644
--- a/dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild
+++ b/dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-File-ShareDir/Manifest b/dev-perl/Test-File-ShareDir/Manifest
index e9a85d7280fa..642c1761b2ba 100644
--- a/dev-perl/Test-File-ShareDir/Manifest
+++ b/dev-perl/Test-File-ShareDir/Manifest
@@ -1,3 +1,3 @@
 DIST Test-File-ShareDir-1.001002.tar.gz 65466 BLAKE2B d2bd8634b5cd4eb156814e2e456c0ed5749b6ab55feb3fcf674124e71450f05e548657f0bb189d0445912a6171c14bb3ad44a7b338f72dc6609e5030d27596e0 SHA512 858fd7483a63fe4742e48663d64088b811658c9d24dfc730ae1fb5786818949133de98f1cc3a705f67ad97fed1144420a96c22e2cfa663c79953c33f1633f00e
-EBUILD Test-File-ShareDir-1.1.2.ebuild 740 BLAKE2B 73c25b2a69a09519b7662d70099fbcd37c32c8eb4d676b4b0b6e5fa25af987ecd9dfc09257dff9b5fc398b444ef10ce2a7d8e19a10c9719e73406c5f8205617e SHA512 0abdc4324fb254787427ae704412f8c259c1545a2c5b9121a269e829045851f05a371a8d3f620365d194c62f387f945446272b635c86d101d251e0e9f6c92a17
+EBUILD Test-File-ShareDir-1.1.2.ebuild 747 BLAKE2B 820839c6073f3cfd5f9e9ccd46c3347488c47f2d24ec8ea0917b4fc4ab4c44277f505304c52a9d6e855f9606c58d47ec498437d791f93f8a41874ef4c146013d SHA512 23530aa01c97e537beac2b51d80754d9c25f5d38c3ec2fed3d52878e305e4215cece070da9528cf31bca3dc3c4a343c29f5fb7373b78f559f44c1634f45e39ec
 MISC metadata.xml 1124 BLAKE2B f1e8e53b564644d94761591bc70fc0466ae69aa71bef249151d0ad29c5ea981e9137b7fc12f9ff5bfe03174fbb4fd3ee4aeff183abbf3af7007b02375314b54d SHA512 05e6ebfbffab43419b645a94566e63ee68792462e5031312f8cfebd7b3d319b5f2d21c96d1a97708641081516cecfbb962cc6b532230265b24cf2c69e32d9f31
diff --git a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
index 65cb31cfacb9..d5051280194f 100644
--- a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
+++ b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="Create a Fake ShareDir for your modules for testing."
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="virtual/perl-Carp
diff --git a/dev-perl/Test-MockModule/Manifest b/dev-perl/Test-MockModule/Manifest
index 22e5c3b12d6e..29ab639ad690 100644
--- a/dev-perl/Test-MockModule/Manifest
+++ b/dev-perl/Test-MockModule/Manifest
@@ -1,5 +1,5 @@
 DIST Test-MockModule-0.11.tar.gz 23756 BLAKE2B 1edabcb0f8b0627602be1dab9c572fdf0648360bad4debd4f1c632695938e9a2bb23afbff6f43c07339f0c066835eaee65af0914070643bfa53a1223424b55aa SHA512 417a0de701458e3e26ea194cb2de7756d9a1665b2b7283a375ee95362ee2d7b77996801d4dafd8ead12e97d59c2a57ffd1e98620446d5f47a1836c8ef18983b4
 DIST Test-MockModule-0.13.tar.gz 24561 BLAKE2B 2ae6f41b29d78c88e8632fecc560d0a96cf38c7b25c7dcc63f935fe98a718fdea41997ef9663d8838edab89fa815a0696d49439a7b99304332f1b636bea0be0b SHA512 17c2aa7b67fcae2a333788db74fc94da9a680ad83786705e70417cb78df0cfa32e6fcca44962dcc9d7c2ee27c45d8f142ce03b62691da4940ccc405a0bb26472
 EBUILD Test-MockModule-0.110.0.ebuild 690 BLAKE2B dc12a4ab2c2d5c852bd742dd2d63f7d26ad4268eea9bb89617145a5c74662d1f890924b7138ff1d870636379da89ba9fe0200002f0f93da481e07f99dcc7851f SHA512 06548739e6bd1689fedcbf95a51a8762996000a7cc6a3ed5edfc6daaeb7cf24027624ba9c66e7594ee23e42052fbd5ce30e6aef8d283e824fb29fef0f49d3638
-EBUILD Test-MockModule-0.130.0.ebuild 660 BLAKE2B 3e4f386085d65dba907826eabd989027d8d378e35a7b9c1b7ff6943b0eb0f1f03e294d49b0afc08152021ccd2b158b9e1106979410cb9da2deff20ef4002e858 SHA512 4ba2524b6c3e0486e0d787972a769f80bed29030ed0da910eba0e8d06a164c646444b83f22288b50d93473b3f9684f078bf9741a6ccdc15b53fdc73636468a96
+EBUILD Test-MockModule-0.130.0.ebuild 694 BLAKE2B 24675d7049ed834a3b53e3c0adff081e580e3a781051b22bf78c4dbeb4c46769248206f85716cd07294db72f901eb6c80ed40f237e30c4860d78f5030c810a90 SHA512 969aa5f904f19c82cfbef7c9b5c00a723d02347af9d2869dc5d449e6be3da59ea1edf3e8aa3f798491c8e8efc0f251fff82a8a5c520913cb079ee7e34bc17019
 MISC metadata.xml 402 BLAKE2B 61ad5df007d8ce18bb2c8c06b3dea6c52967d70a0956c9af51feea0afc9c5e616c92165540d7eaaa043774ae10d565bd892b48fa825eec37d03816de5e292422 SHA512 1035f23a2b634006eea4e5292fda035b6db107289703d60d71936898242b6f4e819de4081f6e5c2b4820f94ba9562f916a881293acc216742334e935310102a4
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild
index 867796a4e16f..6aeb9bc313b0 100644
--- a/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Override subroutines in a module for unit testing"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-MockRandom/Manifest b/dev-perl/Test-MockRandom/Manifest
index b9a1e86cc1f8..468c1d91ef44 100644
--- a/dev-perl/Test-MockRandom/Manifest
+++ b/dev-perl/Test-MockRandom/Manifest
@@ -1,3 +1,3 @@
 DIST Test-MockRandom-1.01.tar.gz 24449 BLAKE2B 23b20452fba66e1187bd54dba67a9fe006549b7adc33bd8447ae4be5c3de40648498acc19b586fa300042e178f9221fceb8f948c05b6c43b615eaf8c6c8fdabc SHA512 e222bd0d3d7673b403e80d1633ddaca0ee35f96f2245e8df859d661edc7efc09b9a96d3718f25b6614395d1f24d66c9498e842cec476cf8c5b12464d585f85e7
-EBUILD Test-MockRandom-1.10.0.ebuild 874 BLAKE2B 727c074b7d5f6850470f2dbd44870f04023816f967e1ae2b68a11091e146cbf43762fa6b18a540d2526eb7219daa3489526760e620d135a8d8a3b3c0e1e47917 SHA512 6b6fb0ab38eb906790441a5459d6c937ac7213d22ed8e1cadde4da496b43c2760760353241a0332cf36bc3dd2b103e5b67fa7696b43265fa4fa83d769cac87c1
+EBUILD Test-MockRandom-1.10.0.ebuild 873 BLAKE2B 0ee644b438719d1eddfa8f02c7793e3f29ede838ccecc72372bea6145598886818924691756592e4fdba2583d7f954c39d84eab0605a70d68c064d234837590b SHA512 abd74bb6e57e4ab07bf1670d909f34e52b7d3a47a039b8f49fdd6dde61f89e1792148d24725e770bb89059cbffa538b49c7bd500907f868625a37107e84a968a
 MISC metadata.xml 390 BLAKE2B 14d04b2a43ac0d3837fbd53056a3928ecce101bf26c47b3763de3947f118ca035532d25fd7d401204f79ac6a6798757d55a16625728135493a04f7841312514e SHA512 935708795308c099cf850aff026347137ea3f0ca5be9f9a4d616fde8d082b3a877eeed30fc59d9532d76c71b31d167a041b26a84d6001c4222527416f8f218fa
diff --git a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
index c64c23498682..16cc9ddc76fc 100644
--- a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
+++ b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Replaces random number generation with non-random number generation
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test minimal examples"
 
 RDEPEND="
diff --git a/dev-perl/Test-NoWarnings/Manifest b/dev-perl/Test-NoWarnings/Manifest
index 83db30c9fdf7..a88d075ea304 100644
--- a/dev-perl/Test-NoWarnings/Manifest
+++ b/dev-perl/Test-NoWarnings/Manifest
@@ -1,3 +1,3 @@
 DIST Test-NoWarnings-1.04.tar.gz 18204 BLAKE2B 60f8eae51f8ada20f91d7b512d254c224a7d3ca3c4d4e72d614338fa2561e31a4224d619157b8ecda5405e4cf900783c1d3d4759eccf92722bd72d75a6710e0a SHA512 48126d2385e6f7863067f541763f64bc72132f6093f316f75d15ad7dca9b863dc469dff18c6e3f93105647844acb5cd10e4d056d3aa19217cb9588eb8a5f0d7a
-EBUILD Test-NoWarnings-1.40.0-r3.ebuild 833 BLAKE2B 3611da8ca6ea9b26d4c3e9a9e7b7406fd51df6bd0578774ba9f4ef8bd17b7b3f4bda9efedac7a5b6c787327e0fe09775dd2c94fd5f862fd3da9b58e96164dc93 SHA512 74c34d65e1740634ed743fbab45b72dc609713bfbbcdf9a1230d963dc4fa071193555b1deb36ee186a7b4a38d824b9c4ac8391640dba2c933056d0deffb01ae0
+EBUILD Test-NoWarnings-1.40.0-r3.ebuild 910 BLAKE2B 2740659819a632c88abd2084abbdb595dc6358bd83d5776257c8094085f6070d21d22aaf726599f557e3262cabb9d05e110a3254b470055716885501a59c8d07 SHA512 9136db574919d5fe1911dcde8d5740c20335fce891a5a07a887615750e79763ee5ed59be6fe31f4c65d44c564420d1b23a529524f014da3e789b23ffa1b2c0c0
 MISC metadata.xml 474 BLAKE2B 69c539de255e30eee9489996aa94144bac05dc7c3de933b4c3a671e24a890bf43fdc06c8ae3b052f3bd435db48e3a087386b7ba933df79612935319ffba2d3aa SHA512 b5f39a7406004d542a5a0c6845d15fe71e293ecd2f5e515350f2f1d10f9f5109ca2bc211a26b3fbd402d35906c9eafa64bc50ec3a9e88ff8821f39b83c535afc
diff --git a/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild b/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild
index 0b710e0f6063..84806d603d87 100644
--- a/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild
+++ b/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Make sure you didn't emit any warnings while testing"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+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"
 IUSE=""
 
 RDEPEND="virtual/perl-Test-Simple"
diff --git a/dev-perl/Test-Requires/Manifest b/dev-perl/Test-Requires/Manifest
index 7f26a50ad04b..ed6eef10f380 100644
--- a/dev-perl/Test-Requires/Manifest
+++ b/dev-perl/Test-Requires/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Requires-0.10.tar.gz 10788 BLAKE2B 712e902d6e69354465876a6a20b38a5809e46fe81630c0e0f7b484ccb1b6c7d8a9128cd27a2054c774fc8e1fde5b87d21c5892be3e30f0f322437d9e13e6228b SHA512 5bc6bf52ae5ab3c56f49b7b17faedf7d6afef2cadfca8aab4770f2c2f91cd4fcb98921e1af159d1dc42684b80f50d4b7fc12bd05ef9dccdcbeeeb6100a9e5ae6
-EBUILD Test-Requires-0.100.0.ebuild 548 BLAKE2B 2b11faf43c1992cf67f47bb2225d47e7b42be04428652b6fa409cf02537a20f1ff6c3beb9c1921302d19ad92d614e3eb4ac874ba250135b701fd76f8df8ffe32 SHA512 592ae63eebb05c097d38bdfc478ac52c184605f11b6f1f034603d3c419664f21480456d596fde08a7f171072b4bd44827d45fae1d9c4d1fce990784431586a31
+EBUILD Test-Requires-0.100.0.ebuild 544 BLAKE2B c9e45317c204021eabe7198d4ee9462099b308f99b44d35df91a7cf8c78fd44bb1c123d39783f5587c72d442447ffcb5862da599e72d5b7e11b6e07ed4a354f3 SHA512 853f0a4c24bd7e409e867e8c56e8c8ed1e8e422e32dce8103c0fdcebbebae313e318f91aca7050d590db269a4e01a1ecff56f9a96bd436d69df0b3fb880fa44c
 MISC metadata.xml 398 BLAKE2B 71cd6563a5de13c0d583c9182f130bb140448e6c427fcdf25704e3b7599de8acd33a402e53d702b076dd15d10ebe1bc99cf439a8fe7b181b95ad18b92b738d8c SHA512 e7699b426477a5538fca75ec341bfc9fa25e537b888e798488b76ff9e06dbbdd6f95d66edbcea4527dedbb00ecf0749cee2aaef7dcab9554f0a4f5d4958358a3
diff --git a/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild b/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild
index 670a225322ef..b259e3580e65 100644
--- a/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild
+++ b/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Checks to see if the module can be loaded"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/perl-Test-Simple-0.470.0"
diff --git a/dev-perl/Test-Script/Manifest b/dev-perl/Test-Script/Manifest
index c860a8f8dda6..171f77c74a86 100644
--- a/dev-perl/Test-Script/Manifest
+++ b/dev-perl/Test-Script/Manifest
@@ -5,5 +5,5 @@ DIST Test-Script-1.23.tar.gz 22974 BLAKE2B 94267dfc75af9aecb02a9cc49f9f41223f852
 EBUILD Test-Script-1.100.0.ebuild 571 BLAKE2B aab27a9b349dd20e104711ca1fccccb9c56a82b202083a8e4068524b572e05d738c795a43c095b9593c29383a99ca4dda5bd1a7b421bab5fe4b62e0062f98874 SHA512 def6b20e704600a85b23bc677ed60539fb7d5891b72ea88397267978e8727387dbed7d37f6f936ca6ca63d361e1a3cc45fb4afecede7ac5895a65d1035f972c4
 EBUILD Test-Script-1.120.0.ebuild 587 BLAKE2B 8d49b1c13c7db34a3abf1d0d5c6f334e0dd1f3f1c27ddb7e4320cf82bb5d60fb1bcfcdc5b3a5963e732c2b1532891ece170bba2a126894927b046b7f3aef2a80 SHA512 f8b6821026270adb637b50726d05729dd8ba3beb74e0b790f43418bf0bb8b1e04c8a3dc249367786f662282008efb04d3d55692bb4cb4f94c95e53f2cc405d4a
 EBUILD Test-Script-1.180.0.ebuild 651 BLAKE2B 538f143964f11fe65032253ff4115829c38f947a97e54f82a5153bf6bc109f8d7fccd10509283f7e654092a56c13afe6b543fabd2a4ad4e37f39f1b6cdc3a903 SHA512 956b673513f4683903a8eaa717865cbda5d8fdff9b7599d88e70fcd6b215913085fe2732063eab0118318aeb50e844c84837d92f7a8df32b20ec87f381b78520
-EBUILD Test-Script-1.230.0.ebuild 649 BLAKE2B d3c0cfd18c96258bc7ab2a5ad277e3a75aca26a61864cd14d41c37e3b8364cbdc4202c3abb0b40103b2b051499a35605b43cd7b02dfc414d6fbee319bdbf68c6 SHA512 79676a38578ce765b1c8aea0448399da2c122c822335801fa717a7664f833454691131e704fd8cda122fc8a15f28328867594603663391770f50d1e0fa9027e5
+EBUILD Test-Script-1.230.0.ebuild 746 BLAKE2B 3aa01505dc805778efc15e38200363a99c78583e4433bbe342be7db5aa2c4b9e6a53a501b793f54817239edd679b7023a857dd20469a93b6d2d8cb0fe77bd78c SHA512 0307516a68dff8c3a952cbf2a47709e1203763a1141077e5ee3c6bd44aca4cfc9a958ed3dbbdb07d92024ff2bfd3a28843d4876897c2c0070d6e0b493c40f007
 MISC metadata.xml 394 BLAKE2B 37e062fb84c0a2fd2277ca3ac7a06e4d76e2dff12a4c9a03ed3704bdeb191fc61762078bfa90a22c9c1a9663c346ada26df66428cdae0114f795521be918b533 SHA512 aada2f2396d768e5b41edf9d6c24f030cf137d3eb3341f560935ca014ff6fb3b747908cc673bfc66a21863dc33a4ed3dbd82c5ee04b0743e6732115d669dd4eb
diff --git a/dev-perl/Test-Script/Test-Script-1.230.0.ebuild b/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
index fec32ab3e6f9..781689323702 100644
--- a/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
+++ b/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cross-platform basic tests for scripts"
 
 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"
+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"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Warn/Manifest b/dev-perl/Test-Warn/Manifest
index 7dcecb541d25..83271f76ac26 100644
--- a/dev-perl/Test-Warn/Manifest
+++ b/dev-perl/Test-Warn/Manifest
@@ -3,5 +3,5 @@ DIST Test-Warn-0.31.tar.gz 11582 BLAKE2B 7c1bf8fe89a0006a6d5b44c211bc7e7714d278d
 DIST Test-Warn-0.32.tar.gz 11641 BLAKE2B 86c428064b8b0cb3359d7612a32a6f0d3ca7158320e9bcc1081cf001667af9da8a043f309f0197712a60d2e5c9ab4c11e22917629560349a36b0858024404645 SHA512 a14d6a87cfa19d54a3055b3c94143b95788ed2a30b2813d952255891a84165f0baf8b9cad167c8d5c87870220aaeeedcfe48db73246966be6aea41ad26779e6a
 EBUILD Test-Warn-0.300.0-r1.ebuild 602 BLAKE2B c4b803bd492138a75b76c065d7d88ae5a45c3b7215a5ac52648d53af1e5ec63a78884805cde0c2cd1f4933225443631378e17a27cb32a7c2297a73404542a5cb SHA512 6a1bd978b2ee00d0d7e22f020d182d4159cb0f08fa8bc83fbdfac4d2ef8c2503f9f27b499793617b5c13790565001494480bafc5d15b12768ff4bf945147c72b
 EBUILD Test-Warn-0.310.0.ebuild 677 BLAKE2B ddda0fa0c573e08bb118cc1b4668c59b4326fa1fa28f778a51c312d9bf570ce40df3c042b9d00bdf56dca3063000d677befa84599be089eb99e362621bba302d SHA512 092e467a9608df2f6e19bf9580f65d2adc295955e8d126ee6d386c47092ed6e9de6a1a8744c52ad1031bdb15a09aa7847d484005e7b8bb5ccfe4e69325ac1960
-EBUILD Test-Warn-0.320.0.ebuild 671 BLAKE2B 5adc6c7251e1dc310ab65002f94a75987d8f3197ebcc55ab38e865cb61fa46eab2745a98f9575557f5f09212c7749eb0159735efa185c62c8c3b505399be3e88 SHA512 81ec501dcbc17c404164f720dd8fa9f34663984ee4c8e5725a0909cba08cea211ca28f1999772962d06a0943cd51b4a9e552f0862798ba418c372ecb6aaa2dc1
+EBUILD Test-Warn-0.320.0.ebuild 670 BLAKE2B c2ee88f3305dc678df5ec300692f1c633d1668e19c8d11a5e7c6b3b1d2ae467c3325537576600bb21da42ea70b9c02610856556d940286d7d3bc5a2b1e7b17f8 SHA512 727d63a08378bdadfd9ce8fe0692eaba582533f9eaf630ad54830af2e91462871d8f26a7ea2f96b3eaa16da80a2edba4289a9e38e7fcbc900c919dfe2b3695a8
 MISC metadata.xml 463 BLAKE2B 04fadf933e0d8125facc008c857f45ab7365abed6a529b7b5773b6d000d29a6289c2e3e10443bc16b5a4868cd9938ff1a56c0987d702ed7fde6635aab82dbd2d SHA512 1d17398908154d7dadd842686ab8ed90e45c72a0db6b8305a354b59179114c7c8ab59b502fbee5add6615b007b0a29242aa1b1cd29472e37474495770d0e19da
diff --git a/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild b/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild
index 2afe35aa6d2c..14e49ff9db32 100644
--- a/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild
+++ b/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to test methods for warnings"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="test"
 
diff --git a/dev-perl/Test-Without-Module/Manifest b/dev-perl/Test-Without-Module/Manifest
index cbede8c43de8..42d3f69e2b03 100644
--- a/dev-perl/Test-Without-Module/Manifest
+++ b/dev-perl/Test-Without-Module/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Without-Module-0.20.tar.gz 13609 BLAKE2B f580eb127513e92526fe78cc7ec31fcd3216d17ebc38b270252d6dd98747719895f919321246eae2a88dd62c7ba8265245d21c1d585883f4cba854bb8251dfa7 SHA512 e92353cee46e712ddc6515c5872a61a84eb4186f9ce736bbf0fcca2979bfa7143588c05e683d31fc22cbaaa792ce8364768310f9de621e881cc207b80cf14d87
-EBUILD Test-Without-Module-0.200.0.ebuild 394 BLAKE2B 36d27f4e1c80ef0d56275f6cc190374473ec7585eff3398f45315d35bf8e7239f1edf6f03087d05fc5dea0847e28a6c8ba5d43cdecffd7443de5ba62418a5e1d SHA512 bc53b9be21593883c98201543d2e98490c2e2694578f1ef7bcf8fc6a4d937789967576e10606599fc7149169eb8e7638fcb8df6e63e9f00c30614d45a1f40bc4
+EBUILD Test-Without-Module-0.200.0.ebuild 526 BLAKE2B 3e78c55fc58545041140852fb24b02edc63c92db59b52d8bc6c39716f7c83b795bc1d24dc9fe0e3d6abfca69595b9f0d7e479e6217a1c50e1e4516b8943c9f1d SHA512 632bd80ec6aaf26daf78028e540d33211ccf89e1b3917e63582408a35e7c8902ffdc7970495c822421efbfe60b83f11a55dd7ac5bdc4b1834a85e15351dfcc21
 MISC metadata.xml 399 BLAKE2B e4fc3f73e67b0eb356dbc2383d7653684ee19f49c5c540434bcff354050c908b62eda8edfcde39f878c37ead17f3aff636247b1c82f8d08caf91dc8abd66c0d5 SHA512 69c6cd0ebd521c61a257c3d2e5aba6ab17c2e06321df6fe27837a95995f27c53d8d94a525d2ac79ee44c7f04352da5b765dfebdb80215b4ff97679f3d939725e
diff --git a/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild b/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
index c2e6198efc79..41ec7fe20bdd 100644
--- a/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
+++ b/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test fallback behaviour in absence of modules"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Test2-Plugin-NoWarnings/Manifest b/dev-perl/Test2-Plugin-NoWarnings/Manifest
index b7631fc5d876..b54458ab3dca 100644
--- a/dev-perl/Test2-Plugin-NoWarnings/Manifest
+++ b/dev-perl/Test2-Plugin-NoWarnings/Manifest
@@ -1,3 +1,3 @@
 DIST Test2-Plugin-NoWarnings-0.06.tar.gz 23237 BLAKE2B 7c390da923bb355a0e4539dde11c4b52846d1d39cbd474e15e61f6237da3cd8b357044e89e2f5133772fe3e9bda008fa22f5f299f4deb8ce62f67ffa65fc5500 SHA512 aed9a3769085028adffd0aa7cbbe2d7d8b89b5f4768e47ae4155dcc1f4aa8fd47319ae7c87ddbc1ed08ca99e1d703eebb74977e88696ea4dcc1104a53332ade2
-EBUILD Test2-Plugin-NoWarnings-0.60.0.ebuild 547 BLAKE2B b3a2e15d82496ee4c11ee0985c12a4ce8c0c2e9a206aac8c2ad1a247b9f2141425e1aa89e9196f44566d10d815231421e12fc003de7c59d132d49e1eb1a0f633 SHA512 51a9d454d15b2b8812c1ab34ce0c77093a81d0551e7d6d0d16c85287fbc5e69caf80d58ca2fefc341cb1154bf845aa19fafdd933db45fd70da95d51e661d2414
+EBUILD Test2-Plugin-NoWarnings-0.60.0.ebuild 679 BLAKE2B 009d777fb7ffb15905bed72ce6b5fe28852672249ad9fcac9882a3febc44f38b02ee5aa48db0d9aac6ca6411968c5b7692f149a49f126e4ac32c88d614920717 SHA512 ea7264c4bf09f6046fde3c37acba7251d814f3c0259d1a32c5903f0742cc57f283785efc3530d2fb57900f57d2aaf7eafb2c6e46fdb41d74c444b2d9fafc8ab2
 MISC metadata.xml 487 BLAKE2B af2d5b4e1671f9e07fa25ad479ce732b78389b0a1c981a6ca41f8acd514915d196997adced687a67e50931225f6e18c6aff829758fd2524e8cf10563a6e55b5d SHA512 f4d2815beb0ecc88f9ac6570ec9aee04f7baf71b837c014c58372b53874588a2c2c1d1b4cdb0fa7096963b5f4748e60d1ceed3a3dead6ea6cabb6727fe138165
diff --git a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild
index abc1735ab9a0..eab897025cc4 100644
--- a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild
+++ b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Fail if tests warn"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test2-Suite/Manifest b/dev-perl/Test2-Suite/Manifest
index aa1b08fc73b6..b131a7b78895 100644
--- a/dev-perl/Test2-Suite/Manifest
+++ b/dev-perl/Test2-Suite/Manifest
@@ -1,3 +1,3 @@
 DIST Test2-Suite-0.000077.tar.gz 144835 BLAKE2B 5a3db61f48f479f8bd00639a538fada5a917ea054abb8dc22b92b5fb2a73ad2da33776f264b1fe7ec53f1a3786af286bdaada7d611772e56a9f883d91139507e SHA512 e9337fee244f572c5b0af54c78a1be47bf590caf905ef6a40928c6e914a183d3fbc5fa3312a0903f697ef5e44341c5425873ade50aeabb63de3f795902bb0f71
-EBUILD Test2-Suite-0.0.77.ebuild 601 BLAKE2B 9be3b484f0bd35d8586a90065f23160a3a79a3988bca8b1507d6af05126a7d347b23fd81bf32c4602c539c914ef44b016acc785dd98cd4b325b1e50a7ba6f25e SHA512 4d5c03bd9525f71001d29ebb08fab3e5a423055ac6e2148bfebf28a6b3bc6acf390ec30a8795c45ff59f4211f4d4cd606601b44a0c87e3819124aac5bf7e6587
+EBUILD Test2-Suite-0.0.77.ebuild 733 BLAKE2B 19f7350d143a1ee6b0587c30001f437052356311782e9d620940ed712e33a5355a7821f20e8b658dbceb87cfb6630ff2bb85d1e34c96b0b57bc453d895440f02 SHA512 b87f74d1e6b27d94d938f77c786d2a9ab715c67dddc7fe9db1d8e5d0edce8136f959cfd555cf475afef3701375bc9f8bd15b0cad54dad76bbc40907416bfedd8
 MISC metadata.xml 5303 BLAKE2B 7bdfd9b31a45fedd69595fc5da50f93d52865d600c2bf7f480d507f7fece8ebadd02114cd6b000388e2bee479bcd0c243d1a176bb6bf6c911d2499737da9134f SHA512 acc269672170b9427444854bd73769c31e45a5e87ccac7441024b8db93dd1a02b09a9700b6c38f15379981cd34c490a6937cf780c544a245239ac7c1c323de16
diff --git a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
index 75de4ba4130e..20f49d36f7e3 100644
--- a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
+++ b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A rich set of tools built upon the Test2 framework"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Text-Autoformat/Manifest b/dev-perl/Text-Autoformat/Manifest
index 355b92c18ebe..e8b935252ee7 100644
--- a/dev-perl/Text-Autoformat/Manifest
+++ b/dev-perl/Text-Autoformat/Manifest
@@ -1,3 +1,3 @@
 DIST Text-Autoformat-1.74.tar.gz 29485 BLAKE2B e8fca3c994877488ca3f3a98681fc3cc189f8b9294bee775248b9c43a14dad2341f4b92fad201ae4e44dcb4d589631ffb43fcac21ecb44aa186bb0e38cfeb412 SHA512 276e97a0db20032919a6aeacba701350fa8fadf6c1bda7dcda714ef4f1c168b8cc3150a126719d940194c8b20dd534543ec914f03c50e27e4a61b1083ca312c6
-EBUILD Text-Autoformat-1.740.0.ebuild 720 BLAKE2B 5c7f56f6b9ef1d61bf5cad9477de41022ffbb4221ae5cf2fad14c8d262872a5037d772f71fa08cd72588f826442c3bc3bd2fc27f7ace580ea3cae7b55f909832 SHA512 6cd8fc71132013aef9d73b6953464fadbb49bc629aec4663a184a5e0cda1d80a04f004029d7cd6e04a904c3c58dfbc4490fafae440b9908f4d90da848834e8fc
+EBUILD Text-Autoformat-1.740.0.ebuild 769 BLAKE2B baa795afa7fd54311897c2378f56f3fc6b424a0197cdcd49483797deb2f983c482497bfd0282681f845447caae5bfc1bcfc4179bb980e3e74f648a53c064e623 SHA512 dbaa9ef2a656c25bcfee80c5e1067268186ec0c90997091beac23b6465624db88daa4419efeedbe77a144d0c13e17d650c1669d367426c961803acbd358a54be
 MISC metadata.xml 544 BLAKE2B 82cd10187b784bf19904edaa287eaeadab90c53f710ce37c727954beb649ad4f5618f3b08c30d6b5f6d6a1b7add350703e7be8e2e2ff67749c53ddc7ac5089d7 SHA512 1c8c5fd5304c9d939e9493a79052165953277cad6f7d9d0073583eb15549285b73d868dec19b71a19bc0e1dd41576f226efd499521ac939b76068c415d70dc1d
diff --git a/dev-perl/Text-Autoformat/Text-Autoformat-1.740.0.ebuild b/dev-perl/Text-Autoformat/Text-Autoformat-1.740.0.ebuild
index 915b46b72fe6..530f84a30e51 100644
--- a/dev-perl/Text-Autoformat/Text-Autoformat-1.740.0.ebuild
+++ b/dev-perl/Text-Autoformat/Text-Autoformat-1.740.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Automatic text wrapping and reformatting"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test examples"
 
 RDEPEND="
diff --git a/dev-perl/Text-Glob/Manifest b/dev-perl/Text-Glob/Manifest
index 950552447fbf..941b4bbff07c 100644
--- a/dev-perl/Text-Glob/Manifest
+++ b/dev-perl/Text-Glob/Manifest
@@ -1,5 +1,5 @@
 DIST Text-Glob-0.09.tar.gz 4171 BLAKE2B 770e5f54fa7ce8ecbdf884e6823b2928b1826602657905be998dac9642e372dc809673a2fc5e4ab16ca08c9908f17ffca42fd44c71ec11de12ac157984986e44 SHA512 9b729e4ece88ad79e1b637c7f35e5e1ecae3fd7f62c408ed4f3fcac2e8e8afff32d7d805e1b0269800aada5ae609d03335d42ac54def2797d301e91fa488ae47
 DIST Text-Glob-0.11.tar.gz 4862 BLAKE2B d57c2f2cde24b8fedfe0e0bc17c4008c1107b07bb91fa62d95428100c80bc8dfebdcae2e16dd0768a88130d43a0461b6c5227bcd00607afcdb09606cdbb8db61 SHA512 20322fee3f56ee7e65f0f8e5371d9dbbe89895d8b9c9207486e7934e29bd883fb557c9765e406f85f56b67019293d82a0318ded83a9387b164cb5e8f58bef0cb
-EBUILD Text-Glob-0.110.0.ebuild 532 BLAKE2B 72b31212aba16e65e5ee72c0ea9567a510a129b2426b8257cc7192ad735c001c5f7f5f5210687aa57071bcea2e0747634a474e34c975cc3bcfa51796636ddc68 SHA512 7a2b48ff61972fe52b573f1e4ab18d466d8d5beafe5bc47c838b2951d558a69c1fbd91019ccec5939c1f8d999b9c1fa8267491581ca2f74bbf1d3ce325f8be08
+EBUILD Text-Glob-0.110.0.ebuild 583 BLAKE2B 0892c63c903f366da3656625a314b9bd1dc0ef438a65684426dfa029036618ce2c8a2496b55687fd4e3dbf1cf6db667fc07a2dd5b60700e1d83d8aa3d500cbcd SHA512 33f40f3d8ebd3d904221005dd9b5a48bf682edc73d77914e44733d7d7f1f5aeab1957032eda43315cceabf8395bef56860e109288bf3b308fd5ff8e045b7ec29
 EBUILD Text-Glob-0.90.0-r1.ebuild 479 BLAKE2B 6c1cc9cc26a53da0f443e839ca313f7e59f0149d0e14f0eca5f7898dbe51f0fee6ad5b9ec715780b64eec65155b638d9dfff3ab63584331319e5a84da34d9b68 SHA512 d7a330d0b7bd0309ad523161455d957ac417b1cde773566eced6ab284e9435ac2cca883062fc761356af1b4db0979e88ffdf1522bb446f497a9f70477d7df013
 MISC metadata.xml 390 BLAKE2B b3fbf72067dc1b95f45b0914371b1621f1e98499d61a801e21aa44dd1c48d6dab24295eee67dd20fc1efc0bf6cb89e7f29703fb6a97d6cab110fd1f3529f4c9b SHA512 f1cc139c1d538130ec018cbde30e42d5503f82d0c4c2fd47d52aeeab72dc505078ebcf5d7613f39ad5aa7dea3cc5274c02952454e89bd4a38cd161667ded59aa
diff --git a/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild b/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild
index 797a560f657a..fafee2c7348c 100644
--- a/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild
+++ b/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Match globbing patterns against text"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="virtual/perl-Exporter"
diff --git a/dev-perl/Text-Iconv/Manifest b/dev-perl/Text-Iconv/Manifest
index 38c368689c5c..3620ccd241d1 100644
--- a/dev-perl/Text-Iconv/Manifest
+++ b/dev-perl/Text-Iconv/Manifest
@@ -1,4 +1,4 @@
 DIST Text-Iconv-1.7.tar.gz 10454 BLAKE2B 2a6e364babaa9584674b7d1cfb50d0f781f0c62231c687cde4fccd55689fd53a841012960512b88ca03328e6e2a7c9092c77c557a25270dd9944c721576bfb10 SHA512 ea801640e3595d2daa063ec04feae6ef2847fc50e999c173d2f6322288c8053c20e00c9c707f4f66240d28b7e451566ee7327224e6770a75aa0252c28ae2a290
 EBUILD Text-Iconv-1.700.0-r1.ebuild 431 BLAKE2B fa33ea15ab43f7898c2357ed1c355f91d3aaf767627e74c5ef0007c5bcbdbac0056bf3f867721e955e02c562a1af7eaadbaf9414562736b3e4a1e37a5fb162de SHA512 6dc362a0454cd1f0b71f3558c4e30f59eae356661bbaa8d50275a8e5c9d2c4d1c7adf8ad2e70d022709c8e31a2664f191cb7505869b71d32fcc7d46877b7bff6
-EBUILD Text-Iconv-1.700.0-r2.ebuild 477 BLAKE2B 1b5f3024da74f97b11ecb7420bf9b02c3674f9f5e169e9a307b7ed160a6eacdfdbf0417ca63c18657d6dcbb3c1dd2ed1f8550ddfd432c8d3a0a8a3fdbb12b296 SHA512 f527b3861fbc80a57fe69c332932dbd7815f2b1e2e2883f39ba5f1d76e593916c13f02973bef2ef6a44da0437f50899328bc55ccc4eec28c9b228c6e86141e0b
+EBUILD Text-Iconv-1.700.0-r2.ebuild 476 BLAKE2B 5a31e7f5c44cfc1a618ce37540d6ea62854ec832132bd71bb4d0272fa603984c3fa2ab6918b4a30ff572e0d7e81883e50ba9bca91df508d51d8ef25787b58b4f SHA512 c509744d1c2cfb9ae43d4a313c20c2c5f6ee737ba54ecc7589eaa7c362de5403a36a607b931744b2ce37239a8d35bdd2ac3022055aa137b96a6fcd0d5dd0bba3
 MISC metadata.xml 392 BLAKE2B be1df2f85e4ba3b48c0465dee16534c3c6b4e22673565e75a736584706982ac4282be7b69aea056ce683423bcdde1613fd247a548226b0c3b4c117bc1f0f9f66 SHA512 37cd928389545e7dc1c18c65e12105d4602a4e030d8ddb0d9c4b6253390bf94cfa650b1b493bdb4287cbcfdd1b44e382504800a827c2128fd4c52a52f787b5e5
diff --git a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild
index 339c80605888..37fac3185390 100644
--- a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild
+++ b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl interface to the iconv() codeset conversion function"
 
 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 ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="virtual/libiconv"
diff --git a/dev-perl/Text-Reform/Manifest b/dev-perl/Text-Reform/Manifest
index ab5b2c6bd067..81c575d701d0 100644
--- a/dev-perl/Text-Reform/Manifest
+++ b/dev-perl/Text-Reform/Manifest
@@ -1,3 +1,3 @@
 DIST Text-Reform-1.20.tar.gz 29521 BLAKE2B 66be7b1dc9c7a89d4716a62bdd45b015a2d378263fe3f52873c00fbacd133c58ec39901abfc95733b408f832441fd6f08fd174c198c947c76e7abec37e63046c SHA512 2a8901c59dcee91d479735c243ee563da69dbbc340ba5573dc0d6be62cf7b485cea2e90301eb8b529bd8b39a1fc09597381680c4882c17462613321a80f2a110
-EBUILD Text-Reform-1.200.0-r1.ebuild 579 BLAKE2B 35813f1fa6c0648a064132155e657d9f7f16d12d470a5779d7716472d0b78d0ea1cb0b554067a26d0c9ee7a30dd5bae95ae2fec4fcbfd3b691df074f1713debd SHA512 11acd86ea49bd5e762036f661df379b508321d18085a7feadc1529671387c7d37a42c78281d27f93697172df4ac3d939061c614f30e7427068ec17d12861a657
+EBUILD Text-Reform-1.200.0-r1.ebuild 628 BLAKE2B e3c6451ba4839d52dc931315f8e1f592d06438995ec9cf299bcc82f20b64631a3fba11de94bcf9130d5a2ab0400547e35937a34bac077426cfdb41bb513e6c0e SHA512 3207f69b00f2b7958bb8576f7052df76391c49d648b653d23ef38bb0917ecd3f893d897080fa9a8536cd2212292794324492f2837f3491f62b605bbf76dda997
 MISC metadata.xml 394 BLAKE2B 917c928ae7403aec142ca5542c502ca7124d6e7150153e8092ad862172b3575842f63ab3d8d9441ae992d7dadc268bf3ea6eb07cf7577b075969fd080d99e7d7 SHA512 69e8382e452bad9ab722af7101283323889432ad04b1be3241e41ca8b8a8419baf3451e353b8087911c9e98ba1b5f9b9cc6d54c419a90ac2eb84113385621d0a
diff --git a/dev-perl/Text-Reform/Text-Reform-1.200.0-r1.ebuild b/dev-perl/Text-Reform/Text-Reform-1.200.0-r1.ebuild
index 4b2177f6f2c2..e01873075bc0 100644
--- a/dev-perl/Text-Reform/Text-Reform-1.200.0-r1.ebuild
+++ b/dev-perl/Text-Reform/Text-Reform-1.200.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manual text wrapping and reformatting"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Try-Tiny/Manifest b/dev-perl/Try-Tiny/Manifest
index d29619e1bb3e..f301403a1418 100644
--- a/dev-perl/Try-Tiny/Manifest
+++ b/dev-perl/Try-Tiny/Manifest
@@ -1,5 +1,5 @@
 DIST Try-Tiny-0.24.tar.gz 30666 BLAKE2B aa9085787127f421b3fc5c8605c074d96033a3dd5e0afc3897c54b3654e08d1535c87af023261af52fdc55e9e61eac9e243d9f8975c646543619b213ba9a08b4 SHA512 403ce12b7cda7356b1a86d7661ed406ce4e526f416033fa5eb04b83bbeb7f198b4660342383232affe2ef9a8e0dbd237a6e6c0f290c277c8abc319c949d3c959
 DIST Try-Tiny-0.30.tar.gz 34395 BLAKE2B 5f128ec532e9091e0987bf8b0b540c38158b49d37af42f72366151f25da722e12b746626a242d8a8f7755d243ee5fe0232d1828d4f94ddac0c70ad9334b8a6d1 SHA512 f523736ab0504ca0f7150be312e62988c4b9473a9e8469b0746dc8364945e2922c64c92e95e6c2b5792c5d6399dabea3d00aa45c065155b95519d5658a07216c
 EBUILD Try-Tiny-0.240.0.ebuild 901 BLAKE2B b4546df5fa30f87fbeac0d6665564b02851653938d31b7bfd91d46f3a2f8630919e15bc54a7bfb502c308a075d889de708e8325509f1751c539e52ee4ab64f67 SHA512 1208f67abca94d924e5f1416dbb78a16728d26ae5f317368e0083a025b4869df66b0905d7df454aa6d05cbf3c4f2e8abd2fa4bda9ef2bd459efd350c24e9ee22
-EBUILD Try-Tiny-0.300.0.ebuild 935 BLAKE2B 29ccce38b9d095308bd43ed3ec0a2ae8ad244be034ff961663e91879389e1ffec6911aac79ecd1584b00bb459519fcf81351e07500a2dedafa36de3ff0188b2c SHA512 239ffe1dc58cf14e3e1b4d55bbb525cf9e3d39d99511223c01e0bac4579153469d0014004bc2cd43198de4a09be6d34ca84eba809cfa692ef0b3dd90810e31e5
+EBUILD Try-Tiny-0.300.0.ebuild 943 BLAKE2B 20f2a2e81279ebe9cf337b35aa7a3c69e92c0c3acff2d839a6f9c42932cddf2edb4aec3a062b83c6017fb32430944551e9cf478fec4e94a156712a201820e1d5 SHA512 99141703cd918c5ea2bd12b7371ba87ee40990418bd9366bd56508761ab48d05a98704db81ef91c9c0adbc6fd5044eeed51ca67145a03894680a32851cacd104
 MISC metadata.xml 388 BLAKE2B 0c006675175ee71c7fc5631750d7a293103c9ad64a32780c010720804de0306b198731ba246d1ed3d2150f5e63fb4f82719b312af2bbe1a33022f44d862a4720 SHA512 0a83e2632d6a212e0e50dd9f6af6d929d29eb21271e7f361d1f55529a1aa542485269321672c8741d4595f63c65c587fc4225a783436d65be20fce70b1a01ba8
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
index 0f27356b0195..91d1d49da950 100644
--- a/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
+++ b/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Minimal try/catch with proper localization of \$@"
 
 LICENSE="MIT"
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Types-Serialiser/Manifest b/dev-perl/Types-Serialiser/Manifest
index 2940001f2b8a..26a6d5cab95d 100644
--- a/dev-perl/Types-Serialiser/Manifest
+++ b/dev-perl/Types-Serialiser/Manifest
@@ -1,3 +1,3 @@
 DIST Types-Serialiser-1.0.tar.gz 6238 BLAKE2B ec0dee2f4519605b1fbbdad832bbf2eced1f27005f6b84a4ed1c2f8d6b4ca898f0c2747f1c1986de78fe92f730cad7d93aa54ac56010e6146a9d699c54a3fe88 SHA512 b786bcd3ee976a6ad948cc98a9c71d2cdcd30f485528eff059091f6d86ae7078c10ba2dc2982326fcf0184dbfbdddea84daff324c6ec6a129fe6aac01253c8fb
-EBUILD Types-Serialiser-1.0.0-r1.ebuild 459 BLAKE2B b5e29e48e8b1e7bc5f2d8c33244f053f2e7edf4ce489a905dee8bf6bbab595dc99135b35d13a0e92ea668ae40f314a0d18085eaae92818ceb23475ea7510c2d0 SHA512 7b7779bd964ef2d936c4edd0817305477e8e74096ab74606a623c5fd601e71da935c0e4804b4305d297630d457f9831a915ddf2e0105acc9c69d44e2e66a589e
+EBUILD Types-Serialiser-1.0.0-r1.ebuild 567 BLAKE2B c2c44e1518b7b99be4fde0a9cef8da1871717a4c0e203740aa783196a11f9f09c015088ff3eca1090236a822d0ed04330bb7ef0da3bee5adbcd62c05a1b02144 SHA512 daa75ef3098ecc5f125ca92498496957f8921fb5356f021f356f63b67c9cbb0f2144a795aab6f9a22a10da406b21657156277b257405d1cd51425f99219482e3
 MISC metadata.xml 552 BLAKE2B 20d13f727a17efa1b10eae668d4d1d5b030eefa6af7b0644afb3a7453583b960566d6b44ecc1b84a5fb3b74c6cddfb4903c0c6c1ec8d284f7b7d854e2c2c0437 SHA512 7242de2c5a48f45650fbb22a5a86e90e7f3f6440633a63d5e0c6cee6492abf17789a5265bbba9d95ac5c995c6e61d9a417942c995a7f3c8ca18bfcafa52f4995
diff --git a/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild b/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild
index 9f7364d5f727..fbaba4102936 100644
--- a/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild
+++ b/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="simple data types for common serialisation formats"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/URI/Manifest b/dev-perl/URI/Manifest
index cd1a51f60ef2..ad2126c1dd1c 100644
--- a/dev-perl/URI/Manifest
+++ b/dev-perl/URI/Manifest
@@ -1,5 +1,5 @@
 DIST URI-1.71.tar.gz 100141 BLAKE2B 8efc84c878c96a6ddb52d6ff91df3003125db2780c295070f2012739d3154d6692326dceda8acee5078b11bca5ca65094b1567178d2a7372b3768c74b2a94e0a SHA512 db412b75054a4d315eb861060fa4641832c2428b9dfe56bbe35f530c9ba572d4de2061d9782454750293dd5a64f3375830988d8512f410e84a9d599c80458405
 DIST URI-1.73.tar.gz 106930 BLAKE2B 85adc080b463d67142c96e7ab7af13ff4a231054f28976edb8d7746cd9d788693f1cc2f1b30658530634e2693bc76bbdb47b1dfb6a6caca89117bd92aa78b910 SHA512 b72d07e9e9e284f360ad4bf42b22ddec2d1930be40ec465ca28c68484e87b01c55ab664cdec63af387bc435e9428681c64aed39b46b668d7c7c5f36be5fbeb2e
 EBUILD URI-1.710.0.ebuild 761 BLAKE2B a7616d4ab3a753b3d2ff18bb5ade5bbd502427c84e855bb0314d01778c42237bc7179c9f456b0219f54527ad66fd0348a31adc7bf93b5ce92f06170981c05e66 SHA512 5c52307813114557bc8500fef2b498f35dd2edf27fec38e19a791990f80605dce35e9f39e2ba1f667f430dd4fa9ef4b6d8e18ff684c00a78d81ce09e037a2c2f
-EBUILD URI-1.730.0.ebuild 893 BLAKE2B e6092a0ff1b4f313683e6aacb007caf76a0ee5d0ebce0a00f120b24e448f4960ce61d955d08ab04b69ba9397ee6d5033df4e6361563296fc0a492f0bfbcef676 SHA512 216f29ff14482c5ffdf5c95223e8a6a93559f638e88bd9cc53123e81c5208d6159fcb9793693126b0ea45612f1e8a09816a78c41c895f669713f6487102d3441
+EBUILD URI-1.730.0.ebuild 901 BLAKE2B e9e681cb7013dd0b5b797f986938316da113ab69c7568599b39170743f8ec32698a23d4694f4143f73eaffa7554ffd8ea4215285f8f5e2c2882c9f40368f2c40 SHA512 6432a4ba542d3ff810155de081f2e2686efab3f3e91518f59d792b94c4502f5033669985e830d5cdfe2b89dd910504fabcf2fc2e033e128ab3dc8e0ae1dd948c
 MISC metadata.xml 3394 BLAKE2B 49ba41e67806f2095df0e7c7ca14b990a78f1456339073239990b4f2940b7f0dae85b9c55fae9b01bfeea1a5c22e267e97b17a6ca26a69671546dac1f7de1423 SHA512 3ef0266ecdc2518338db76759effedf7ee8ca1134159174f8b8fb2ad67e7b7523b002bcb77f30ca13efbbeef6f34eb2ef6abfe4da64668d056c5ef82dd2d32cc
diff --git a/dev-perl/URI/URI-1.730.0.ebuild b/dev-perl/URI/URI-1.730.0.ebuild
index a2d442d691f7..593d2d188812 100644
--- a/dev-perl/URI/URI-1.730.0.ebuild
+++ b/dev-perl/URI/URI-1.730.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Uniform Resource Identifiers (absolute and relative)"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Unicode-MapUTF8/Manifest b/dev-perl/Unicode-MapUTF8/Manifest
index fb958113fda8..8e279c45755c 100644
--- a/dev-perl/Unicode-MapUTF8/Manifest
+++ b/dev-perl/Unicode-MapUTF8/Manifest
@@ -1,4 +1,4 @@
 DIST Unicode-MapUTF8-1.11.tar.gz 16402 BLAKE2B 4664e66d389edc24b2b09d0c4847a863930bc553761c2567adf824d30b5e4a687ce9cb86f45273173c122c391e184c0cdd754afe00b1145eb7d4c231a742a763 SHA512 6af57450761fcff70006537bb37df1769d8868178c1664c75905307c976bfda76afb57d4808612434939afe90a9f254a4e380115e201c78d1b3a64c8eeba9fc4
 EBUILD Unicode-MapUTF8-1.110.0-r1.ebuild 480 BLAKE2B b482522d6a5e6e171cf2d6a2566095d05234da7596f5e266c57add9adf0d75036f46bfd8afef19800a15f4d26fa42ace0692b2f3e5c03b4121b19e46bac124e1 SHA512 08bf8223e3487724a813bbc0e8f312a3bc4c83cd3ad415a82d519275fc4d4fd7e456ef5de0fdd84ee771c9224d04f95ac3c733bd7d683fb8c69832bbb772b8a3
-EBUILD Unicode-MapUTF8-1.110.0-r2.ebuild 553 BLAKE2B b9bf4190c923cfe8b761c130bcc2b1b50f5310d956f2092da84d20f31789bf38e25ff3a4668db14b4edc628b50f594b524e428aee2ebe54173a19b183706eeed SHA512 3986b4b6ddbf34aeb3e0a4b3aa35e0786dde23b29a10b9cce931746ea730814717d41c88485ef19b605a541c4ad3dcfd7e0346a12d0f93f3bcba5c20ca08d888
+EBUILD Unicode-MapUTF8-1.110.0-r2.ebuild 552 BLAKE2B f8e6faa943fbd8dcf8fcd38c73cf6cc269f99c1f85b2ebd41a55958ac3082f422f7ab89362cc62cde426f8ba2e93649c03e00ba9705f459096d8b2517cd7dda0 SHA512 7a1d972ee3625085e17425fd30fe58de7d9b57d7e8c7c04c3e87a693e4116e06e2aa69df3eff5bccc9ad6ae2e1eda5dc83a2f5f45eb764c22b4f230c89a6fcc4
 MISC metadata.xml 402 BLAKE2B 367850efdbdb14382b71f5e7f8734cf10b938ebfb2c47a0d0591d9653d84a842a73902b6ff3bf872bb130be815aaabc202e98e0aa94578b8757ecc6b12b1e5db SHA512 076b40594e0d09cc7e25814cb4aa851b1f8468eeae73173f09abf45fa4533b3e1d1429565f8473d6c3f56f504eb32b983ca2bf2795a4ca592073a34919680d4b
diff --git a/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild b/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild
index 6d08908f12bd..c189f9e56cea 100644
--- a/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild
+++ b/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Conversions to and from arbitrary character sets and UTF8"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Unicode-Map
diff --git a/dev-perl/Unicode-UTF8/Manifest b/dev-perl/Unicode-UTF8/Manifest
index 71409a49e7ea..fc3c99a29d57 100644
--- a/dev-perl/Unicode-UTF8/Manifest
+++ b/dev-perl/Unicode-UTF8/Manifest
@@ -1,3 +1,3 @@
 DIST Unicode-UTF8-0.62.tar.gz 87838 BLAKE2B 95f196bc7eee1515d5016cbd28a6e134ac4cb88413d3665eb2570f7838b56582840f6e78355f23ad4a3360c9468051b589c3003e6d5bcb6df977fe15ec778590 SHA512 056026ac2ee4c101de5ea6017db59f875121dba8fd23ab5c2ae525effb8cf864e8a1c24588bb2a027792e27568742fc75bd5765694027b110afef867a4b982e0
-EBUILD Unicode-UTF8-0.620.0.ebuild 739 BLAKE2B 150fd338017d2f0aea78a5599dc5dd004d3319bb191fd7b14f817eb2ad24bbb4b19814135d9c475fdd13f43b8a118380964932d1a70c22e13fc73ff226b4e346 SHA512 a17b50b96fc84d75361d8dad28dff8a133296b800fab6683d2842b4eb1dc3af5c145803888af0fdcaddc8f012250535765f82e307650bf5217b62088c2006e85
+EBUILD Unicode-UTF8-0.620.0.ebuild 738 BLAKE2B 2f5776ab35bb5ed73db40729396b22bdcbc633e8673ab64b934524ee49d4d583f803a55b393caed828ab9cbbc243c466159997a5b403d7077f88e9acde034899 SHA512 285987267ab928c319f789a0889f72ce3d802efe294605f4047997dc028e93c8ed1bafa4ee3979901ba611caaab674aca7c5a4319ff3ee71d1cf642632dcb5e7
 MISC metadata.xml 384 BLAKE2B a8ad6a2ec3d5e83106a0db3b02a49c47bc5865b4a25176148535f38c58955c9252001731f42439a28df10322c33c385ebf3b57d79e983be6129d31371fb71c7e SHA512 a0350d8efdbfa84f03e8b82425bf11bdb5abbf4280d4ef0c44d963c80ddc5116eb3d199555f6c2ea07f342357befbc5ef2cd141b44735c03d69b20ab398674b5
diff --git a/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild b/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
index 18bafd40170a..8cd8c8b396a9 100644
--- a/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
+++ b/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Encoding and decoding of UTF-8 encoding form"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Variable-Magic/Manifest b/dev-perl/Variable-Magic/Manifest
index 1de15e0a13b6..486264d5e464 100644
--- a/dev-perl/Variable-Magic/Manifest
+++ b/dev-perl/Variable-Magic/Manifest
@@ -1,3 +1,3 @@
 DIST Variable-Magic-0.62.tar.gz 79009 BLAKE2B e99fc85fa3765475c0393e7c396e3ead5bee3ac49d6d6e82a1ae3ec962367303f85ce0a02dbcfc24189ec29e820650810035c9fe74aebba24ceb24485926f46e SHA512 fdaad8ab1a16a4723e30a155086f7f9ecad60b021b0ca5d449a0bc001b858a53e2857cfdc3fc4e3dcc28e2f59a14f3531afd93e3f71fda3b8fcaa8bc50d0c380
-EBUILD Variable-Magic-0.620.0.ebuild 576 BLAKE2B 29cc0be70e30ceeed9fe1b7c04e236ec3622e79ae8fcc2f96f240ad036f4ccdf375545d38d2ec61d81f0a57f1c643a04a51fb04e17009c8fe420d0f4d92d9d3a SHA512 1f51e10dc536158a6849d16b66357a346d7f39c60d39bc3e3754f15101d60b0af04c4b0d569dc1880a1cc8d96c5c29762cd386caa41d9247d4a6b0a1b9459fb2
+EBUILD Variable-Magic-0.620.0.ebuild 690 BLAKE2B 5387c1e6b4b7ed30e38a899d2a5fe563ad88ae2560581d439a5131b8fcdd0ddaacc6452a05674a86516595a6ac4c5db3426e09802b0658dd8de28e4142e7609e SHA512 67f386cb2dcf544a7a186e72a3e2e1636e3b07ae5402c87202acc20d070fcf6db796a00cd33921471257295da799300aefcd04254151c51df652f52aadf01b28
 MISC metadata.xml 400 BLAKE2B d64f4563ea4cd25cb51d26df159071319ed1381cbbe5128198cffa6252493bbb4b89be911080311934b51d736c4a90dd21654b39043f369d95ae3b6c837af660 SHA512 81b3eb37457b11cc8ec0674cc934402d65629ca51726cffa1a5ea7c17744b864fc55d867597f7881464aa4a633daf289eeea8c97b903efbefb2776d6a4148a5f
diff --git a/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild b/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild
index 8666aba0beba..db2ff44b2a83 100644
--- a/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild
+++ b/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Associate user-defined magic to variables from Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-Handler-YAWriter/Manifest b/dev-perl/XML-Handler-YAWriter/Manifest
index d4ac09aff69b..72e002eb9aaf 100644
--- a/dev-perl/XML-Handler-YAWriter/Manifest
+++ b/dev-perl/XML-Handler-YAWriter/Manifest
@@ -1,4 +1,4 @@
 DIST XML-Handler-YAWriter-0.23.tar.gz 25695 BLAKE2B 081ef78b93d502387313dc88a37830cf5923fce0b22cb58df02fd19433516974b70d8dc40b1db78dfdafd4f65af662f3dbdab7f8623ed99ec4c2769b40dfd0c4 SHA512 3d41bfa4a33296ae1556b269b0c6ecd732a809fa517805de37aa452aff8394cdf639a68a7a3248e5457297dae4bedf22ea73407de0dbf25ea6a9facccbd4098f
 EBUILD XML-Handler-YAWriter-0.230.0-r1.ebuild 478 BLAKE2B 4a808fc794561400733e6e3d5189907ef54710c8f13b5af767fffc5463817744a24ea4d192b1bc8e361366834bc0f606dbfe659ecca296e5f3dd6b9ba01443fe SHA512 c923d6befe103caf1b4dc8a3bec090806f580a7c6efc0d9618b4f767f828aacff923d36f900c200999abb98704fa9787f6888a161e327f44509d751b6b01d94d
-EBUILD XML-Handler-YAWriter-0.230.0-r2.ebuild 479 BLAKE2B 38cfbdfdb3a82e0de24b92583ca4b65cfe9c7ab7964066516f924bcd38df1667e917f0cccd51c336af34ce646fad188b80a8569e85d854b1416a2cd1095757b9 SHA512 e32b398d04d33adf02aeadbf754dba6df3ce52c230a8d9c33a3de74f5a085f0a19790026deebeac358eef6dc54056d1db90231ffb935d80cbe12975853df545a
+EBUILD XML-Handler-YAWriter-0.230.0-r2.ebuild 478 BLAKE2B 2a0889845f9bde4803c4a9b4492636aa4f3a34baec745419f2baf0fe505d2f030aebfd9c81b9c37fe81e08e0c5c7f57ed036730e5929e22e73815b248bcb4e0d SHA512 42e839a2678d5d3e62c1f214bea0cb3ebb50bb6b18f9b2dac67100e85d13adfbe0549556e89f655ce80b0f2fb573c989532a33922b9300ba391ba4df06f77cc2
 MISC metadata.xml 413 BLAKE2B f3c1cfef7c72e5127a4e9cfcb225982ffa8ff956eeaf5b90382e661e0c010f460fd13af7f07c09db4ad8fabf1e6cfe831d40b4de6270f7f61c6f9df1d0e2bf4a SHA512 5798214cb2a76bc3a800a3013343a792ff2e76a5c59950bdbaf0d834e28a14455ce053a576afe4984f21440f9e3c20196dde474e4d11662cdab309184b9764e0
diff --git a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild
index 57531cda649e..00d9f88d7a6e 100644
--- a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild
+++ b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A Perl module providing a simple API to parsed XML instances"
 
 LICENSE="GPL-2" # GPL
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-perl/libxml-perl-0.07-r1"
diff --git a/dev-perl/XML-Twig/Manifest b/dev-perl/XML-Twig/Manifest
index 55a652e3dace..27def26311b6 100644
--- a/dev-perl/XML-Twig/Manifest
+++ b/dev-perl/XML-Twig/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Twig-3.52.tar.gz 407769 BLAKE2B 7420f694db127bac536efc124f8735b6c285615781a8ed00d410938df25b629c15dbf0703cebfc0c7ea8ebdcf290826cf66d25052adc19a90a3eb9ad16132a52 SHA512 1594e127fb76c0e53d0bd1f0a12fe3874c9523dd2bc55675d5a6cf44d5682ddea481671f786d3a65e6b69f5307c4da1701529f318453a1f8a22685b2dae793a6
-EBUILD XML-Twig-3.520.0.ebuild 977 BLAKE2B 83be37f613f2b3bff6fe8d1a16ba32c483d2fec7b511b340ac99d6edfaa492c2ccd6b4fd9e3ac2b976f882ab5fc0290ce6e00b9e71893e4fe5ccffef498c6fe5 SHA512 feb1fc487872f10261f5cd2556b61b21cbe21dad29ad591a801a0eaeaf83fcb2af60b00efc10a3ec19584e598c78f55e45ca490c66b0f20a21ed1ab4b038e9a6
+EBUILD XML-Twig-3.520.0.ebuild 976 BLAKE2B a9b8819f2830fe74d6b2f81baeca41934395779ab04e560ff13c27baa158d382f5218c70fa8e7e1f59a6823f5242daafbea3f384d89698c7605bbe7ac550b5e3 SHA512 fa170f209236ce4e54a7793f2edff092cd1c8e685f3b27511b9d9632cecfa9a7494292e9b65a7f8fc7027f67034cf7e6b021a21082a4086940d213ad2640c85f
 MISC metadata.xml 998 BLAKE2B a2f5790ed712c731447edd885f2fd8b48b608c0f621e20bca24f640f5d5b3f6c94e21e94913963c4236f327bf14c2a9fc6d709209a191da29015bf8429f4bb9f SHA512 64b1a3797be80d2246fd8214c27ae50ae9e1c5743a16532a49736d62f2dad26713cca8b66908b248934efc24b4c082b87eb024a1ce8d1616a635c57e1ab4e08b
diff --git a/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild b/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
index 54a6720eb713..7eebd9418234 100644
--- a/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
+++ b/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Process huge XML documents in tree mode"
 
 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 ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="nls test"
 
 RDEPEND="
diff --git a/dev-perl/XML-XPath/Manifest b/dev-perl/XML-XPath/Manifest
index 7d87fdcb419e..9a3dc902433a 100644
--- a/dev-perl/XML-XPath/Manifest
+++ b/dev-perl/XML-XPath/Manifest
@@ -1,7 +1,7 @@
 DIST XML-XPath-1.13.tar.gz 39832 BLAKE2B 7a0cc2379a0097b9bc35a62ba341bdf739c5066bfbc83c7adc23e5b27d8d21d79f62e16c0d98478101c2740f0556680bab475cd3e7909ffc46964e89ce654bc9 SHA512 c5af746f36562803e42c5afb63b533b59ecaa263977c5ef4bf6488b7597cae334bb3b0c644acdfbb453e87a22ba9a785df3f81b95faec89d974704d6f04f6503
 DIST XML-XPath-1.37.tar.gz 54747 BLAKE2B 20b8c556e5379e6b655a26c16808c76dac60420eb7691e2644c4ee43bd034252ea3cde116f4fb5456fedbb591270a24f7b320c71c4bd391e9e85a73092375ab9 SHA512 37531049cb7d029d8777b21368404af17cee32328a6426a6470b43d050dc2bb605ac6cfefd51fe1614fe76bbb9306986a50960ea8e106232c209d9efe8c6dac0
 DIST XML-XPath-1.42.tar.gz 55907 BLAKE2B 8146556e2f144e12b1303e54bddb5d4b0f6f3fd46ff81d8baf8753f07e97c2779e1a144e46f2f08a9ccb4591bda5bf044063a1c81dab1efbdbb9ade0c537f821 SHA512 170e0d5369f937444ae340dcceccef2e836a3a87f393e4f2915a189d822101278c5046665f1bc9b165f7358deab9207e199903d5d4f2f3d8e62ee04a31fafe0b
-EBUILD XML-XPath-1.130.0-r1.ebuild 431 BLAKE2B 86d67e2d1764942ffc3b4c90f38f39645b1c87a5993de5e0c9f6ba6547429e20f2b2e075452b6105bfc2691b2933dab6a97e110cda5f8c90bd20cdf4ed7ef195 SHA512 c6129c855345759b0f9a91e53c5b3c42941b6c836e542090f5758a88e337a283fa88a0a5e0c9213811f4475c20e414f0a0b391bf9aacccca5d62947721325573
-EBUILD XML-XPath-1.370.0.ebuild 606 BLAKE2B 65388f549fe81f17c8b06e5e6e9ed7bd34581fabd9295ca53c9dcaffd79211e48c7e20b35b89ad1a7be82751e81afeb1ae6f2c0483c15dc5dd75093a43acd6d3 SHA512 20634eb79ebe932f58cd84637b67daa276912da28c9fb02747ac5e4057b0bdcff66a3c21ca2132e31ef389377d951fa26938e45e362a791835786da02c98391a
-EBUILD XML-XPath-1.420.0.ebuild 653 BLAKE2B 553151f93c0bea1d24658d264f4789e0e700fe8a55fdfe3fd56428691796491a586683e5eb4f98cd1a1440e6e415780ef50216e6f515acc742b441b4852095e8 SHA512 5f2f0015c4ea0fba43d51940c17234d117780101f8917a946130460fd7e5dc1d22e09f50f0c2467e64eea4bb1b75dcfe4c5db35e60831ca6c638028d7cfd5331
+EBUILD XML-XPath-1.130.0-r1.ebuild 433 BLAKE2B cf1f8b7d0e14f524045e1707b0c7a4d448607b8171e86fceb84eacd1b688a7313025ffa31e29f10f9fa37f876094007d8762261ca9e2f5565a24e2237d3eae24 SHA512 8771533438afac38526960de4d6fb98eeda0062bddfc47cc0a199ff24a50d12ffab62e0adfba1e29ac969c4997375d9f53297d73339a1660f4dec29bb70262af
+EBUILD XML-XPath-1.370.0.ebuild 609 BLAKE2B 304b043e34da31180a06d421e1204b884867d2e3625e24de6ae33fc51c82bea5b533a8f6387c6da9a2058c08096542b156c4790771cea073dad2c91f08c5ab2c SHA512 018340f6bc7b367c3618f79ae30a69b66bdb16970f0331a7bb74822db975edd3bb3096b3169ed16b9abbb9c182b97634f5193a91c0221cd68b9e94ec3f107faf
+EBUILD XML-XPath-1.420.0.ebuild 657 BLAKE2B 0719e34bde1bed3cfb71dde7be0de3d756d5f801c65cf983256d532752cb5131ae643835a65c0b3339c81a6f01ec6037fb378bc7038413c04f683562aa458d02 SHA512 8312900a1d61d10f1de9a900dc3b0f735ed0cf45d14d36866ead49677e98f10ec333c954f6f0d99b79bbd05ad1213c5523bf5f63bde7d78e24fedab34b2b058b
 MISC metadata.xml 2322 BLAKE2B 764deebac617014956ef0fb69432bea3063f4b5c5b2467394468417e3d5cbf5d3cca0c550d0b8c155f58dca44416c46f9fc43e03f4a17e5a2bbd3f3c90474af6 SHA512 b75e8efc7beb5ad2732323126cd20dad66b01986427a2dd97ace202ab7a65b2d3604df2f2a7c9314659c12ef1f9cb8c5d442b5ba6838dc019ec24edc22d80efc
diff --git a/dev-perl/XML-XPath/XML-XPath-1.130.0-r1.ebuild b/dev-perl/XML-XPath/XML-XPath-1.130.0-r1.ebuild
index f75abbcfae33..d017fc8931b8 100644
--- a/dev-perl/XML-XPath/XML-XPath-1.130.0-r1.ebuild
+++ b/dev-perl/XML-XPath/XML-XPath-1.130.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A XPath Perl Module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Parser-2.30"
diff --git a/dev-perl/XML-XPath/XML-XPath-1.370.0.ebuild b/dev-perl/XML-XPath/XML-XPath-1.370.0.ebuild
index 9441cc0744af..1d5f99c55148 100644
--- a/dev-perl/XML-XPath/XML-XPath-1.370.0.ebuild
+++ b/dev-perl/XML-XPath/XML-XPath-1.370.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A XPath Perl Module"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/XML-Parser-2.230.0"
diff --git a/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild b/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
index 5b0927ce6c2f..143b780f69b2 100644
--- a/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
+++ b/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A XPath Perl Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/XML-Parser-2.230.0"
diff --git a/dev-perl/bareword-filehandles/Manifest b/dev-perl/bareword-filehandles/Manifest
index 3cce7c0b15c2..ebe1a1211f88 100644
--- a/dev-perl/bareword-filehandles/Manifest
+++ b/dev-perl/bareword-filehandles/Manifest
@@ -1,5 +1,5 @@
 DIST bareword-filehandles-0.005.tar.gz 67564 BLAKE2B a144edf6bdc549d5fe6d45569a35865d35c0d0a846c9482e5d11abd43edff60be7b6602f8f893cde2f0027e7b62443a83d677ea3e7ed698ac426aae14f21cdb7 SHA512 ea1117a31ad9d8d58aa0c17dd6d327ccc82f3ddc8e6c3649a1b35c9e623a39fb851b94a69c855a400d1e678d1a18da1143678efc16ccd78b151b10a2ec5a8a02
 DIST bareword-filehandles-0.006.tar.gz 67243 BLAKE2B 152879d5df2a4d40d6617e7b5fbefc28484deb6d9c48db5820c5f93702e053d2e9f7218c1190d67eb9c4b78937dfef309c60412284a7822ad9b539b5ccf17447 SHA512 73cf85f35d10d13d4ad3be471e30cce0a19a899a7c4d033d2202d815dae8e30aa54b2ad7923dba6d798db1c49d2dcbc7c4f72b2d3f1f08e6e009700682d4e65e
 EBUILD bareword-filehandles-0.5.0.ebuild 576 BLAKE2B 3558dfa69076720da16353a6a383608fcbb54066576fb813b1def759b8119500836d4fd2df664c015c689169413885aa834b3248804f2516ee84eef5c1868b78 SHA512 8efb584d0854799771826982b06dd8cc935ffa57f73b9b03069fff4f28aa87de3764fc74d09def3a5917d5c24c0dd63d95529ed2bcb7f496aa00b07b22d9610e
-EBUILD bareword-filehandles-0.6.0.ebuild 650 BLAKE2B e9e73d71ccfd4e2294be615173511697513b062bed8e9ff4b59e7450fe807571ff438d3f88e090c81245d2656ed5e4acb17e6ebdabdb7ce7f475dec1b74d2185 SHA512 be09e3602873690560dd98630583036ae1acfc7af4e878283a367735483008d6d01a71237d32b915a858be7986c25a0585e2dc4e0cbe3b82009d6ca1983326b0
+EBUILD bareword-filehandles-0.6.0.ebuild 782 BLAKE2B 569ad5babb71fdb87991aa9ef9c14df6e01a5067f5ba452fbfbb9ee8f0c8bb6302141ea6a325222e15c3df94c1cd9f4d0d6b739e21cc664d0f90192238ae0d6b SHA512 331bf504e5bf78471cbbbb177d64501198d0d5f6df3481711ab091a5d985294dd51435046100792bc79f8eb20c4084add4fafbad3e7564f1be42e88219363169
 MISC metadata.xml 412 BLAKE2B 4f50f77d41ef36a3ff55441a9a39275f5b49543199c268f8b538fa38450a6bc4d651094ae28fd56ca152351822f9dacc79f0f505b3be13c77f6745020ec6816c SHA512 04cc8f3c7bc3ef56bd4876632e5e19c647ead0ddf97da3270866ccae5801e19f95755f3385f7533c57c65a841eff28819e1cad780533415ca9caf0d92ae41253
diff --git a/dev-perl/bareword-filehandles/bareword-filehandles-0.6.0.ebuild b/dev-perl/bareword-filehandles/bareword-filehandles-0.6.0.ebuild
index 23f1e5559509..21e9bad5a9dd 100644
--- a/dev-perl/bareword-filehandles/bareword-filehandles-0.6.0.ebuild
+++ b/dev-perl/bareword-filehandles/bareword-filehandles-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Disables bareword filehandles"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # Lexical::SealRequireHints only required with Perl < 5.12
diff --git a/dev-perl/common-sense/Manifest b/dev-perl/common-sense/Manifest
index 7b644c9c76ba..a206722efe7d 100644
--- a/dev-perl/common-sense/Manifest
+++ b/dev-perl/common-sense/Manifest
@@ -1,3 +1,3 @@
 DIST common-sense-3.74.tar.gz 13002 BLAKE2B 234f86e1d51d650c43be0e79f1e87f24f07c529fc7724084fdb75048e3a7295961131dc108bc573e8d3ca757e6b51c657426adcfb800afdf8ded3d8bf86a352c SHA512 658ad70a2d1bbd0b26f91c4ea5d69b4cc0b632ede9532b88282987002a5e280f0475d63ee846b7bd2d38ef82f2680e20c2093803e4b62a984750ed447f318d60
-EBUILD common-sense-3.740.0-r1.ebuild 406 BLAKE2B 3cb8e893150ae4ce73a527f21e944d93a993621c128e6f612ee119853f0c7060c63866d04c2e70085d95b4bfb7da545cb67fc66256dae94f82c10b3852a34bce SHA512 0adb32956e534fb71c8f218f7f5ce50a17e28ee24eebf709d965851172920fc0ff53ad3dc207d4058fa25b0cf8dc6c81c551a1876ab267b1097a6b43488e9ed5
+EBUILD common-sense-3.740.0-r1.ebuild 514 BLAKE2B 3bfb761a58c78fe7b03b3fb4a0b824fe3df793c261ab6b997ae2d8906f253052a28c3fb2d4edef103083c419ecaf53182e89fe2923f3a3fea873bde22e73db15 SHA512 7f65c690bc90bec496bfea9cde5135569d5a00d5cce26bc0e318012b34147d871166cff6f971f92afcc37af3f8836bc25fa0d306e69f365a4bc6582fd4af7949
 MISC metadata.xml 396 BLAKE2B d3197948deba91188cc433d79f8c000591fe9d9b2d9022144a4ba7f8c532360401d24a5d8836ee4c66e01e5ee369a574d0d4778da08bc4735dc8cda752e726dd SHA512 5d18911426507b4496be965fc4ac8881a322f2996bad79d40693f62e63a09b82ddbc9ecc13a9d13cff4aab6441b08250f4538a0ffb4b20e216d6d191373d5caa
diff --git a/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild b/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild
index d946002f7ca1..c1ee39a21fc8 100644
--- a/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild
+++ b/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Save a tree AND a kitten, use common::sense!"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/indirect/Manifest b/dev-perl/indirect/Manifest
index 7d476f8dfb27..2725838a7801 100644
--- a/dev-perl/indirect/Manifest
+++ b/dev-perl/indirect/Manifest
@@ -1,5 +1,5 @@
 DIST indirect-0.36.tar.gz 48597 BLAKE2B f96ed76f1970855ed709a3e765334bcdfaae9966e574be011b2460c735511e2d92dae99add8efee00477c7f0454dc059d0c1d999438b4620dab4353dd900e102 SHA512 27f86702a2b3597e2bc20390130584324bfe86cc4d9f33a488b4788d6e1513ac19dfd4e1407f29b6f862172b020b3001a248450ad8dddb5a31e07220c0783ceb
 DIST indirect-0.37.tar.gz 54892 BLAKE2B 28ccc890a61eb6c6ad0c164d408580f2959b4b41cdbd2231a34a136ed16b0af33f90d300b1146c68ca0cf14b2b6aa056e1e3a55e9bf1c290b3e5e737a454f668 SHA512 8d46ff62c86b23519b030474155f7d8aa4872a9a4a2bb1e3199ac506aee60343b4c572eae8fa41dc5148c115de3c80bcb7f21900ad30822dc9eb437033defe09
 EBUILD indirect-0.360.0.ebuild 491 BLAKE2B 08a5fdf9426df57a0226fb3f9562add08406bcddaf987e607d680f52c122cd87718c95e06ce6d49148471def3a880ff03ad88043843c37893d840cf5720ea721 SHA512 14db46465fdb0ca15e50e19351bed34af8bd7ba9c740c8c7a4f704646faa18415b7e6a24ae10c85625af48bd1a378bfea787a5f8ebca762af590f27c85c47908
-EBUILD indirect-0.370.0.ebuild 463 BLAKE2B 3e741bdec1024d36526c2a690d39e5a065b9082dc0a0b27f5ca1e8eca6f263456bf06b2b7abc43661a2973a8d8a1e7ef0477a73b18c4710ce768fcd8be61d522 SHA512 098ec8e51a1ead72d6ac75f2f52b76fc0391118c58cce0c50a9ce9fca2f66038d2e23106e259d34d515815fb411acb46b745cb47f4086c63c57dd13a9d9f6cd1
+EBUILD indirect-0.370.0.ebuild 595 BLAKE2B 6a1ad750d2b67fb7a68cdc731496a64807b4c6e5cee7ce28c2c71a40481f725d745f64c34487654daab4f931e20bf3f4ea8728299f22879616eb5e8012822155 SHA512 129c40125b9a2590926a93eb92efc395560cd725ecb6b858290b4377e041df6d2057220cf3b4f3ed9e8db67d22a1557cac1d79627320360b058219fe04877b78
 MISC metadata.xml 375 BLAKE2B e64e10776f8d36ac7082e4e29a8366449422117463193cc5308f4832da92f67a43cb91925fa9aae2f287a1aaf81dfa2eda1ec5e3467e467a02af762e0757b08c SHA512 7237dd49000e3cffe04121f726aa9453e0ef709b7f43d1d4c583bcd363c0732415fa79a49ab1e7cb864e35563480a20e750782719ff1f897ab8d57e80644b33d
diff --git a/dev-perl/indirect/indirect-0.370.0.ebuild b/dev-perl/indirect/indirect-0.370.0.ebuild
index 79935c28c5c5..9d1d16ae2797 100644
--- a/dev-perl/indirect/indirect-0.370.0.ebuild
+++ b/dev-perl/indirect/indirect-0.370.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lexically warn about using the indirect method call syntax"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/libwww-perl/Manifest b/dev-perl/libwww-perl/Manifest
index 52ae0706aa5c..b7b5377c048c 100644
--- a/dev-perl/libwww-perl/Manifest
+++ b/dev-perl/libwww-perl/Manifest
@@ -9,5 +9,5 @@ EBUILD libwww-perl-6.160.0.ebuild 1904 BLAKE2B 17dc5365f9c1ba95f3c60e28aadfa381a
 EBUILD libwww-perl-6.240.0.ebuild 1992 BLAKE2B 064383d65aaaf35b34f403dd1dcefeaa573914362228bb543a09b8a16cf9900e3147bb1fc2b184b4d5c666a19031f8c02db656b894627a7a84187788d35661a3 SHA512 d69091cb32431b05a00bb7314ce43253a26f2c247349a32985ebe4b6178da61ef3a76d69b40b3984003e870a83a532ae61243362b933f4a1eff4d8c77928143f
 EBUILD libwww-perl-6.250.0.ebuild 1992 BLAKE2B 359b83ddec81dd460ca4d789d9786689b6c884d781ff34f2e9ee734996f63c409c8d4e8c1b40cb761c2aec1af055f33eefd7aa17d34e5ee6a0cffd91d2b9fd8d SHA512 b167f3be2fcf70bcd9f69b53169406f489d3ad88b836305b62d0405d757ee02c4cc3e5961a1106af939925caa4e9927faca0c4617697ae0f613a324e8ab01802
 EBUILD libwww-perl-6.260.0.ebuild 1965 BLAKE2B 668f55597b4bbdc78903cc71829d70d7f324529e66db2c52c4e9c3b0c7ad4eb984f3f47e4116621161b370f6674fad954de68c5bd397237c71873f5ee0da6580 SHA512 8ad2df68bc1bc6ed78bf50832fac868d1fca5a76f389b793367ddfeabec7f45297d0111ed3d00e5dc904563af2cd910bcfe2e71da1995d3d4edec48e8ee48eea
-EBUILD libwww-perl-6.270.0.ebuild 1980 BLAKE2B ab0ec667168bd9e0810ee9661260d47757d5a8d1fdd396477fbac717c5eeb85803ac081a0a97f7d3d3cb41a500a396f79ccdfb8f0c4d6916c33039fa3e2a969d SHA512 d0b88c719193f23e4678a3681911b8a9ae99f60823049e0dc2c1b08757c72d9fbe9f8f80fb6c16a0786ef5dd22c88b4ad67a84a0ea9e103679a47796439eebb0
+EBUILD libwww-perl-6.270.0.ebuild 1990 BLAKE2B c4b436ddbed930e1592b40a184871f24b175e208c791e886069f26224ea4b2938b0a4ca2e028242678f02fa283984d987666ecc8076817590833c9a67e3a48f1 SHA512 9e047790bb1274d9a6aed9eda0206e51e851bcf07d1cbcefd0fb8e57d4c63de10d3ff3488c99c062814246a0df5db474021214eb75b002612ab4e687ae601d17
 MISC metadata.xml 1921 BLAKE2B 22c228aa757f00263a1f331482e24e83acdd93186747ad53aedf289f9a1fa97642a21a43ba97f64a508f023e27dcb0a8e78d2d4ba20ec296e6851e6f7370f5f4 SHA512 77a8184ec9d8248afd05f6cfaf8d69f26f85eff2ab95180cf763f9b2334e7fbb83ffa072cc5c9cdbb99a592db860ac4f7e3b21c29104a460f5e4a2f44e3251ee
diff --git a/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild
index 81c8280039ad..a6cdbd1c1543 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A collection of Perl Modules for the WWW"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl test"
 
 RDEPEND="
diff --git a/dev-perl/multidimensional/Manifest b/dev-perl/multidimensional/Manifest
index bf91d70a6291..a6cbe6d187f9 100644
--- a/dev-perl/multidimensional/Manifest
+++ b/dev-perl/multidimensional/Manifest
@@ -1,3 +1,3 @@
 DIST multidimensional-0.013.tar.gz 67528 BLAKE2B 8167da19e5bc0f28547277580cefa871031b7dc129fc6eae521ecc4e5e5714b38b5c5b32446dc41123b6d79c93fd7399e6cd4f33d244d85e937deaa5831ffa2c SHA512 9abc93efd0060042f16c9e89c37a11a08c781ab2d095964701661a17f4adfeaf7cf3cb134db9c91a366b5ddda482716eda5d3b002fdb38fa4694d7e24dbc76f6
-EBUILD multidimensional-0.13.0.ebuild 565 BLAKE2B c42a2d101746dcc88a486b1cff9e18ab6b4e0ce229cb72b5c6176fe7ce360dd4c1e9e1766ef985d4efdf70cced4a7152b2797f50059b1b308d73c3a9807380d1 SHA512 73466741a2f378b87d4b0acfa5fd09db853b75ea4a40ac8ab927aa368236772dae8cb46353745b090bebd387294d7d5537a3e0abff7d0ac2bfdedd5b0dac3646
+EBUILD multidimensional-0.13.0.ebuild 697 BLAKE2B beeef477e0a4de2f175f245fa9455a9177e98cc72cf1a1d88b4eec71b9abec10154df6afc329bac01364a6a3a544c45c4ae75ed4736e0f381b924aedcfe77ad7 SHA512 8d5dad08b35c2c47d3ad660601eebf6f6ea38eef5747ce981348e175256b69d5dc53baa89e6480a48e86d9c3ae836dd74603aed90cb985a633d6e0bcbe1046d9
 MISC metadata.xml 403 BLAKE2B 870297fd97515f9de1863ee0feff9176340b423acfe8033eab27041d366cbfcef1494bcc15446838693e6c8b61c6815ea62ee6f6c5c949d2d590254e2b92b5b3 SHA512 0e28ef2915fe99d06a068e221fcd34c9cb388ef1afe5f9750e88370f84bda19fe3083523bacbed95204c1cc1a2ac598e38e872c23b07069d42cc2b26998558b8
diff --git a/dev-perl/multidimensional/multidimensional-0.13.0.ebuild b/dev-perl/multidimensional/multidimensional-0.13.0.ebuild
index c945c82e5f23..c2e1ea794173 100644
--- a/dev-perl/multidimensional/multidimensional-0.13.0.ebuild
+++ b/dev-perl/multidimensional/multidimensional-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="disables multidimensional array emulation"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/namespace-autoclean/Manifest b/dev-perl/namespace-autoclean/Manifest
index ce43043b9af6..04aada349976 100644
--- a/dev-perl/namespace-autoclean/Manifest
+++ b/dev-perl/namespace-autoclean/Manifest
@@ -1,3 +1,3 @@
 DIST namespace-autoclean-0.28.tar.gz 36130 BLAKE2B ecbc71cec5256087799f91b337c98d87bbc8be7d670b03b74533f01724a7251cc592f26669756756413dc52d7d25478f22d683e72a9df67a687a862a09819bf0 SHA512 2541f69862b334fcfe30059d025668175de1b182a5c8ee8f2619bf1d661c316a38fe2014f274bb23e887cd36959f98abb297154ac8ceb600e2e93cbd4a75e28d
-EBUILD namespace-autoclean-0.280.0.ebuild 784 BLAKE2B e768737bb52798e7b12a3a5d46a82b14108d4e89aea355746dfb6fcd1fae8be7798ae6200bd4d4ce527f0ed91398ef07fa01957e9c1b8b71fa87a6aaa195e290 SHA512 545d30d1a587cf94c5866935d4fe9eb4c6cdf322f4a3db789913ee96f51d79125cf7144de0cf19a44b72852a8e43247acd16a1b29d7453494f21261e58e213c4
+EBUILD namespace-autoclean-0.280.0.ebuild 850 BLAKE2B 3d5e3f0cb57ca931633bfd0ad11ffb30f89353b544e4a5558227ee64878d2198e40062a248434d118dca11f4624c7558404db1754263156b0b45dc92f82b26c7 SHA512 4ec21247e970ab00f6592d367d88f807ddeacaffce8a20ba09bc49c818b5bf33bb657a5f4c961b9dda109419ff9decaf5ddf4873b0e1a90f40adb871a54d055a
 MISC metadata.xml 410 BLAKE2B 253c1f1b727fa4b6f8e336806756909de12d17a2f75880fedb0dd4abc7c84e096b5b03e4b2bbd493a67a18ec462a7885b12ed50c0db11373eabb6247d3c6b3f8 SHA512 27e0bffb8b96ab0449bbb16249ed023a836f3bc7b803cf03b761baec7582df30ae0e3881ee8b5b120dc68193c1a06aca5ab2f292b8e1f0f464d127c0f72ce692
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
index 6b75d210b554..c2f18348e3ac 100644
--- a/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keep imports out of your namespace"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/namespace-clean/Manifest b/dev-perl/namespace-clean/Manifest
index 16033f57a8ff..85703857a6db 100644
--- a/dev-perl/namespace-clean/Manifest
+++ b/dev-perl/namespace-clean/Manifest
@@ -1,3 +1,3 @@
 DIST namespace-clean-0.27.tar.gz 17801 BLAKE2B caf9c4f88236eb3169ec6b7fd74157466476166fcf119187d9c455b859aa26edd11884de78c18d7d75f95da3a410fba9631482e7bb3bc25edec209aeb9e0a0d4 SHA512 4422640656602e44c6d3675e55a0e699f8c0e07abbaf11f0b0905043f90e13bb95ee0eaa4c4a08c853296825dd8ef33c806e0a7c284a70448e35ac3354545744
-EBUILD namespace-clean-0.270.0.ebuild 560 BLAKE2B ba651375763e95fcb1bfab713c370469a62263f1d83d1b5c6351898fdd1fc0fe85a7c3bee072ca853f570b725bc55d310f35e1662511dbe469404689742d3eb0 SHA512 137edb4bec69954588b6807085dcdfeac17f5aac7dc70768f0b44cc4eea21d5a5626bd898d18a782ac2e1eee2e035708b79014a3722def86bbc2163a2a010cf5
+EBUILD namespace-clean-0.270.0.ebuild 672 BLAKE2B 0afed4adf7a80bc4d3eaeef33dc58a8aaaceaca5ab45c76dd4d8bf092c226a6c3e7cfde32a4bfabf50f83ad1b1199e51299325de32f009389e2e8db1dd0ae896 SHA512 36923d60b765d4a295e303d768f08bd8c845ddae3e74e74ddddcb376df0e36b34f2b6a5fbb3eafbeada9287952229b2a4b10a5e293fcfe1d177d416ebf5b6cdd
 MISC metadata.xml 402 BLAKE2B 8237a644ff3e0b7543520a1993ebe70da0b6eca32405c9d8d2ac5d1d85bf3bf653387bcf9c09ff68a4e96cc0c397af62637d8e2c9b22c55f5aa8250f80fa8ec3 SHA512 d34109e67cdd50bfca925ee9f3952e179a9fbe575ce6288f13ac08a41cb77ebd7a7b2610e30e59c49f53f161c64ef3dd93a1d546238a5eeddc55bf126b7d98e4
diff --git a/dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild b/dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild
index e042a4a39711..e41662dcbbec 100644
--- a/dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild
+++ b/dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keep imports and functions out of your namespace"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/strictures/Manifest b/dev-perl/strictures/Manifest
index f03e466fc0e4..676c87bbf516 100644
--- a/dev-perl/strictures/Manifest
+++ b/dev-perl/strictures/Manifest
@@ -1,3 +1,3 @@
 DIST strictures-2.000003.tar.gz 15319 BLAKE2B 3158e92282de5ca2bea5c7f79de3c6cf4e49d3641fcfde91ffedcfd291f102f7a61918136846bd6923abe557c2484db57b5b0692d93231f6f73c7aeb8854dc00 SHA512 c187a32f70c2be97cbe783e700d54d1e7b7ce7a8ea0b5ce72851b1efbe9b64121fb4b626463c4c62fb384893e4e3102afeaa21cd3e500fefc61c5b4b3924d21b
-EBUILD strictures-2.0.3.ebuild 527 BLAKE2B a3daa811fe9b18d6358ec683f8ce2080155b2474ce1bb0083527de9beb8740c956ef5f1fe062a67329b957e2d65e2b040339b2bcfb4cd9e94fa131061b9fc7b1 SHA512 cefdd9b4e17567c00feaaadf70c03447db0cc0e998c7e75354f6bd4517efbdad1bb57796b037c27df9fac127eb624e666a7306d30d695c6a4ca7d6fcabbc4455
+EBUILD strictures-2.0.3.ebuild 626 BLAKE2B 7eda4aca53ea791853720424207d479be1475c4e9b96e2b49b9299525b09914acdfcd538edeb3c0b6a9d511924de7f83d25d28580b6063ccb77a701449c96e79 SHA512 dcff019ff02b4a30d8c0939f1f91f59b8c7236a85eaf5f95943ff83a70bc3d73e24d391c0f2346822fc335dc24b9cf76141f2a1a7275fc9ceef2769e669130f2
 MISC metadata.xml 441 BLAKE2B 3d5493de7f2194d9a1495e56e6a4354590414e05043d89b1255c8cbea12ca057c8df23c686ea5e24598a95bff7889e11b6b85e27ab2df4e404a0116149c2e7dd SHA512 f68001e7c186751fad6041a4d4c6f208d8d72dfd14e2a41ab74ba124a2f0e15e5040dfad8a827b0125373056ca82e427432d2e4eb5f05ffe4901598bab31b80d
diff --git a/dev-perl/strictures/strictures-2.0.3.ebuild b/dev-perl/strictures/strictures-2.0.3.ebuild
index 3f1dea514229..a9bd13c2b2b3 100644
--- a/dev-perl/strictures/strictures-2.0.3.ebuild
+++ b/dev-perl/strictures/strictures-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Turn on strict and make most warnings fatal"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 64232ab9eede..3e3facc19753 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/ming-php/Manifest b/dev-php/ming-php/Manifest
index 9dc05fcac2f5..f11a71482488 100644
--- a/dev-php/ming-php/Manifest
+++ b/dev-php/ming-php/Manifest
@@ -3,5 +3,5 @@ AUX php_ext-config.m4 2939 BLAKE2B cb3e65a0397b753fb6675425e3eaab0c68349b7d14f38
 DIST ming-0_4_7.tar.gz 14903570 BLAKE2B 48e7b3c2b8a81fa63da18dd140064c572efe563eb621f33b4bc57cdcad8d6cb828e8f62fc63b47144389b0eefa5b571c47e39013ec2724611d20e74928275213 SHA512 232cf45daabd7b60203c9382aa6568455a42ddcd1bd60eec9bfe3f5e80376fcc9ff6304efbafca1ac8a504e2e167bc394e4902e0d067303d9582551461e09d3c
 DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
 EBUILD ming-php-0.4.7.ebuild 1332 BLAKE2B 4eb3cb1d05c52660df43e15e172154564754261cc0630669f212c31a5d551fd389966bac27becca64e5ab531a8039feb5b2cd214bd970ef21a5772f1410ad648 SHA512 0793f4410f866ae8fbe38e083c5c0a828d9e0d643aeeb1973d9b644854e336fbe3fa2f812e4a26948474af242ba7bf202c3f8dbfb4c3ad1ca63f74c4a10c3b28
-EBUILD ming-php-0.4.8.ebuild 1390 BLAKE2B 902397fe190fe48d63687bc64e8951dbeb408da155f7a7da27aa57edbb232358323d1c36fe24c4aa10bc8307105a3ae9d7121de5aa8048e2f1c7b8d3a4bf0155 SHA512 2055cf88d133dfa890cbe9ece0d579c5a5259149270a91522620472c02b2d1905328fbbfd5be547afc9ef7c82621f34a281228d5dd7e270d9ed73f0d7a22ad59
+EBUILD ming-php-0.4.8.ebuild 1389 BLAKE2B 15f1769d2325610d9e6f4a9240d2d4026d38b150b5130550da120f79e80d5615c6ea6b1083bab8619af6295a37a6d73560a90f15851d5d6407d1a75d0ab55b98 SHA512 7930915098bc709c114488ea58b381eb3a638cb23bca18a9416bbf7792d32e9a1430f794b95400eaa07832ba6e87585e372de85390adcd007b7bd42ad7cf5055
 MISC metadata.xml 475 BLAKE2B 3f1db2ece7aef5e9f24e7fc1b2649422102cacb521ba830ae36a7cb7683957bcb89366d980c305fb9ad2a7fee9ecb87176e934f6ba328a6a2039d36f9c3ca207 SHA512 f5586b50f459b96dd287bb1ee2d1a166cb8086584c76f5b5b68cf1d8271afe22903f77d8641aee3c2d68ffd2b41441aed5f641a303b6f43243d67d65d41748c4
diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild
index c9c148106640..2a52fa37106e 100644
--- a/dev-php/ming-php/ming-php-0.4.8.ebuild
+++ b/dev-php/ming-php/ming-php-0.4.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libming/libming/archive/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/ming"
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 1c7954ea6fa1..6c532dd2def7 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -7,7 +7,7 @@ DIST apcu-5.1.9.tgz 111049 BLAKE2B c7138f65d73a056e4a34972098c2b543ad6d96d0d8215
 EBUILD pecl-apcu-4.0.11.ebuild 1453 BLAKE2B 3d0e75d3dbe866f5e10dc464fb5a54a67ed79656ef9d97d62052da4670be39d91122fb2b1da4e6629c26b7aff71585e683e3fccddf59d77afda21d47eaea2c8b SHA512 b0fb1cdceb8e2c48b459309c6e98a1fb16faa48e1228bc0bfbe5c01cee0b038121ffae8a094cdc030fd1bc94624d4602e6abcb5b99dd6a2109024856446571b1
 EBUILD pecl-apcu-5.1.10.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
 EBUILD pecl-apcu-5.1.11.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
-EBUILD pecl-apcu-5.1.12.ebuild 2098 BLAKE2B 97d552bdc1761e87d52e67d39fdff255bbdb6b568ce7d675af3cdc5fa4f4121585b62b94c512f9cf483969fc34b763193198b1236c3e8e290d538dc6d903c3c7 SHA512 bc1c9b72740a48fadfdb3299ed0277007fb2f1026c76bfae8a6e9006e84628a436e2de6d55e1d499d47ef7c641903a7fae8aab8244f9711cdb9651292d76d37b
+EBUILD pecl-apcu-5.1.12.ebuild 2094 BLAKE2B 4ffddcfef85ed487edb45462633875576a28ee2e1e1a437bd4019aba67e003a56d7de6e3214f102808e6b3a04d90717a5f79961caabba6d5627da6574d6358dc SHA512 534cc3793e3d6be2f15be3c0faf0e14d6791ad5a0d544641f16e0b72c05780aebab60f8217de8d5d594abaf0b1f275f15ac79a9cc2b8053f687f379863c8b484
 EBUILD pecl-apcu-5.1.8.ebuild 1860 BLAKE2B f13dd25e9afa2054bd3474d72f326f815384befe594b9bec7803021bbe4c67fc9501e9b23760b08a22d29654a3b34a6c76120ebe5baf27cb22814bef8b7425c4 SHA512 f086a6e970a87a65658064feecbe42b30c3e1bb6c01effb0cd890ced791df3228b8143374957e94c970899a7d7fffaf3abe818816de8f29b4398fbc23002be9b
 EBUILD pecl-apcu-5.1.9.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
 MISC metadata.xml 540 BLAKE2B 87b95a306509825ceb5c27c471c496692da1efaf9fc04c357d9aa47c458db302456884401b077cd040bc70a6540706cc54ac2aa76f7da8a1d3b63b6af8661e5a SHA512 46b3e028a3632c8ebfa89a9e2053bc0bb8893fd0a75ee3f84e1d62daec9be5cadbe1f9fc55bb14931a91cde04ff04c5f7c19b2dcf57551ee08fa3eb64ed88232
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
index 531e6e6b911d..fcbe122680b2 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ inherit php-ext-pecl-r3
 # However, we only really build for 7.x; so redefine it here
 USE_PHP="php7-0 php7-1 php7-2 php7-3"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 DESCRIPTION="Stripped down version of APC supporting only user cache"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
index 53020437a2ed..d29c9ffd352a 100644
--- a/dev-php/pecl-apcu_bc/Manifest
+++ b/dev-php/pecl-apcu_bc/Manifest
@@ -1,5 +1,5 @@
 DIST apcu_bc-1.0.3.tgz 7245 BLAKE2B cf3a632568218a3dead69c251aac67a3e1c9c03e0bef0b57184bb1e85c60aadc09dcbcf49f2703869783128949a9aa2f4e5eb660d9ca88f800e85ce0692847b1 SHA512 b1faf811316bbba25354b9b28d5c13c69ae93913b90eb36d1904ef4d9ca35000e1d83f8204ab4500813cb8858feccebb262523f42b3116b85c59c6a796affe67
 DIST apcu_bc-1.0.4.tgz 7406 BLAKE2B c7099f13bfe589c9752fb7fa8454f16094a13d63924ceef614db1fef11d37265673e745383241836685dcabca8ae83af3c71ba2f2d8a77b4ab213db209924f12 SHA512 633ae74c4be3ee0c2c98540f696dc440f3f345c52811e856cb46c65c6b6fa8fa9f06ecb1d784cd990cf8b5219b65e14a29b97e57828dc6e7aa6b91d2475e6a0e
 EBUILD pecl-apcu_bc-1.0.3-r1.ebuild 738 BLAKE2B 3a84093f3a30dc29947a13c78a2e8a0f05817789ae4f4ce57aaf86ad0f56d149613276168918d7c1ea2d85b5ce1283e7964243c3afa7b0cc6a1847a751c44030 SHA512 c82072c2bf7f501479cc92d379bcb53ed83e99b1da929feb1ca8a15455a01c3b48dd48f778641f091c76f13f12fe92c85a14175332f5e9a0a263a7ceb499f9fc
-EBUILD pecl-apcu_bc-1.0.4.ebuild 537 BLAKE2B a43ad349a6771bd5a295ef00fea28eeb4aea43627697b6e965f8a5cd9f5513efd298342ba98b90e515a5c0666d4a647e01316a8d2aa1c47edd1d141ee32ab6b7 SHA512 caf27a7b5a273f2058672aebce00a5b7214f8cd1914615a9cda0c905970738869ac20d4ead57619cbe19dbfda40ebf8bfe8595a34b92b57d34782e4f47433251
+EBUILD pecl-apcu_bc-1.0.4.ebuild 1155 BLAKE2B cb0c6cbc416d7e8276eaa96459ab41faf374f4f3fa1a5211f0ccb6128fb8534c265f3c4ffc7e0217dae3b5ee115e00857bf2c7994053e21b90fe62251d8d9db6 SHA512 e1eb65ae54350768149d4d6610e07b0a9237d78409d0d976a8319814204b1b8fdc05bdc78b5994f954322037d67f8bdcd9a88449bff9a914e6ffd3eb2e8925ad
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
index 6cb699b96c74..0725748dbc35 100644
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,9 +12,9 @@ DOCS=( README.md )
 
 USE_PHP="php7-0 php7-1 php7-2"
 
-inherit php-ext-pecl-r3
+inherit php-ext-pecl-r3 multilib
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 DESCRIPTION="Provides APC backwards compatibility functions via APCu"
 LICENSE="PHP-3.01"
@@ -23,3 +23,22 @@ IUSE=""
 
 DEPEND="dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?]"
 RDEPEND="${DEPEND}"
+
+src_test() {
+	# This fixed version is necessary to have apcu load
+	# from the install before the tested apc.
+	# It is intentional to specify phpoptions twice.
+	# This mimics the Makefile.
+	local slot phpoptions
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		ln -s "${EXT_DIR}/apcu$(get_libname)" \
+			"modules/" || die
+		phpoptions=( -n -d extension_dir="${PHP_EXT_S}/modules"
+			-d extension=apcu$(get_libname)
+			-d extension=apc$(get_libname)  )
+		NO_INTERACTION="yes" TEST_PHP_EXECUTABLE="${PHPCLI}" \
+			"${PHPCLI}" "${phpoptions[@]}" \
+			run-tests.php "${phpoptions[@]}" || die
+	done
+}
diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest
index 15b0b6bc309c..cb264dcb27f2 100644
--- a/dev-php/pecl-crack/Manifest
+++ b/dev-php/pecl-crack/Manifest
@@ -3,5 +3,5 @@ AUX fix-pecl-bug-5765.patch 375 BLAKE2B 6664659603006d260b578fc1169465007a600eb1
 AUX fix-php-5-4-support.patch 674 BLAKE2B 5b2ce7a76aca15d6ff626ebced6e8844bac3d1fb959903c9882e1e59bdfc06027c6993431552deceb09df8d35e57e338818fa9b5ac11b31d4484369d3bd9d1e3 SHA512 ca2475557dc1d2f23a1e5745e7f3bac70855d0916a9d37d1a7efcd04e3bb973220b87aa2cc7ba8315473a2fd16dfd142c5c01608e94c595541ff15838c1e1d44
 DIST crack-0.4.tgz 25524 BLAKE2B 99e2289413a672d4dc3d8f9d70866efb499902a0d27379ac7b59d2873013c918d535851d8c3dbf2592596d6483f2abafe2f7bbd31fff40ce9827c7a97e16b8bc SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f
 EBUILD pecl-crack-0.4-r6.ebuild 581 BLAKE2B 04f52129dce7e4ec373a17fd4a68b256981743d568723f428dbae41883e511ca8adad3dfd155ebd3f56feb04162b8cecde4b9619814a990ab50870be7fc9764e SHA512 7d305dc22b4972335d32906f25582b35bedaef94b0b9b53d69683f41f5f9c4011b6c5aa75f23f4f7b1eba5c8f277c77a8fc78b013669a7a96d0922e2bbdc0a27
-EBUILD pecl-crack-0.4-r7.ebuild 587 BLAKE2B b15100c8d1273f37af327015ea6af4560a107a9a1fe8b69e7396401b478bcc9274ee0da38ee72629291aae4285cc8dba7a39c84a5f1e551b9ead7c2ea1382448 SHA512 e2afea0e7690ac98679b2f19ebe0a636f34e0b0dff4ed44985acbc6d2807bde66ca34384da8c9d4f60dd0c81c2363abb9d7fc8156e638b8db725fb06e1b039a3
+EBUILD pecl-crack-0.4-r7.ebuild 585 BLAKE2B 29c477f8edd07f00f7f442ab27d674d877ed79630d47182b5b886580d3a9527025d011e6a236a63058e796f392a26692ae511c635aad0ff4f41877b9754de4ab SHA512 79a512e5d11dfc96587278bec8b2a3eddeb3298e8bbc0d97fd8e140cff54353be6f9ce77de635224f727f3e750368502ddda32d65c98f8151b1fc7b2eb05fc13
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
index 258b1f66c5f9..08d5e3ea1c16 100644
--- a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
@@ -13,7 +13,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 DESCRIPTION="PHP interface to the cracklib libraries"
 LICENSE="PHP-3 CRACKLIB"
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index 4aae39a0386e..93276c0fbbc6 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,6 +1,6 @@
 DIST mailparse-2.1.6.tgz 36538 BLAKE2B c079a5f9980384ea90113d3e295b3de4182c8c3006a62439bfb73ab39dc67bb03202298e7bf5e42f71d599d645cf4d79fbf2d09a536e621efe73f8fff6bce56a SHA512 a7337dd2e99a953a55b38c236da95a6bd2950c2bca16fc0ddfec39be8b0ffe01007353fc7b562d0509e0bb1623c3d2b03935d1c98a07dcd9f0b14bb508bce374
 DIST mailparse-3.0.2.tgz 38206 BLAKE2B f50b3f5abfc6e2e5a3647eb33ad07de9e3e66a94933be612a51c868210745b109ddca8e3e174a7a4abcfdc72856f34848e65972b277cfa3e836bef3ee4c79897 SHA512 be04e15cf3577542447186d7ead4e31159c171c99de0a255d4ee2f6f760b80ecb44be056bd9089180601f622b9a71f4331f194e1adaa702d1d964009682896f6
 EBUILD pecl-mailparse-2.1.6-r4.ebuild 839 BLAKE2B 518ecef31d10faf97091c9c7e8cd13789d47b42ecafd7c75822c5e91a10fa2a952e48440503b5697a3581d3723ebb279e134e42b66284b017b2d11ab7341bdc8 SHA512 0ca4e958f293f3dbef2cbbbd08248a11f9eeadc971c5e5f940b56fc721aaa841ae143e4a60989e344307c5641e3e1266c771397f422e8f30074b0d0041e716c9
-EBUILD pecl-mailparse-3.0.2-r1.ebuild 1217 BLAKE2B f68fb5fcc84fa36088a404c2cd8b0134e81e7fd9ef502e82a1b6c8dc70d1a392385dce9dd696c72fd41da604632d51b371b49399aeb815e4abe38c0ea140ed76 SHA512 a7dfe604eda9b46a238f01f6de06ed59b75a0a3d3c323b2ae8268b2927ee0363d0f910dc0975be3d1600f52a5f1dc2ab62f6288e1024f04028960e4be694c4be
+EBUILD pecl-mailparse-3.0.2-r1.ebuild 1215 BLAKE2B e11ab31a74778d1228285c6b472e461650f0b81fc524e6e7977bf8b9c863cf98b7e04d86a94a52182511cafbcf06263b02fa16f44ca21b94b0eb81fabfbbdccd SHA512 fb3956912162485dfd720d83200d5789ef11f0bb9bba527da658e8fb555083c32c83b7879897f2471e98c784089671be7cafc625ea2f5d979821aa445ed15429
 EBUILD pecl-mailparse-3.0.2.ebuild 1070 BLAKE2B ed243cc104739cca574ff091ac1ff0722e7971a05cf9fb42cc5f6592d0f6363b1f73382cf61b3181e91c7bf7f441c702e946b787749b784648c4c8c548dd2f8a SHA512 69b0b8ded36c21069f5aa10244288526af79a3afb7b24044e1ac50fc7888158c7ca6e1d6cd247c207a3c0a43892d65ea6826f579acb74fe36f4a05ed05e13d11
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
index d9d400423ad0..7d86d5ec5871 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
@@ -16,7 +16,7 @@ inherit php-ext-pecl-r3
 # Only build for 7.x
 USE_PHP="php7-0 php7-1 php7-2"
 
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
new file mode 100644
index 000000000000..31b3bdaf80c8
--- /dev/null
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -0,0 +1,3 @@
+DIST mcrypt-1.0.1.tgz 33782 BLAKE2B db5f89fdbc64c81bd50c92301155527f40b28cd274312565c79327133baa20e14c488f8ad1f87e6ddfd3ced9706ca30f10dc69a08279c82c9ec83fb5f713e826 SHA512 1677202715499a41ac6999089257a059106e58cbac06ca8a7dd2e9edd28be5a4118234dd7468110e9e3d7f9de5d099367848fe84bcd06716ea56645c9015c578
+EBUILD pecl-mcrypt-1.0.1.ebuild 647 BLAKE2B 0003f92a3422b4727eff96664caae6e85fbb6b575cae2b4d3144aef86e3d4e7531c5a4dae828074fa7f988287b7a729c739c0ca8aab6aa744a5f6f657bfcc662 SHA512 e3f99a96ca617d71654571b2fea7454477cce1ea02f429298295e33819fa92429e006e863a7e64a9303357a78333457b42d30b9669f6e812a57bec3595a5cf3d
+MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
diff --git a/dev-php/pecl-mcrypt/metadata.xml b/dev-php/pecl-mcrypt/metadata.xml
new file mode 100644
index 000000000000..1b662aaef98c
--- /dev/null
+++ b/dev-php/pecl-mcrypt/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>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild
new file mode 100644
index 000000000000..133d25ed4e63
--- /dev/null
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mcrypt"
+USE_PHP="php7-2"
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Bindings for the libmcrypt library"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/libmcrypt"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# PHP Warning: Use of undefined constant MCRYPT_CBC - assumed 'MCRYPT_CBC'
+	sed -i '/MODE3/s/MCRYPT_CBC/"MCRYPT_CBC"/g' tests/bug8040.phpt || die
+
+	php-ext-source-r3_src_prepare
+}
diff --git a/dev-php/recaptcha/Manifest b/dev-php/recaptcha/Manifest
index 7f1f03a4bf16..654f7efeb0df 100644
--- a/dev-php/recaptcha/Manifest
+++ b/dev-php/recaptcha/Manifest
@@ -1,3 +1,5 @@
 DIST recaptcha-1.1.3.tar.gz 12909 BLAKE2B cbffb64148f3359f4d351089fde65d2b9c8136e0814b5f6aedb3cd9b7f7d3f8f77d9673059f3909b381cf9151ca34a31bb961fe8686bdda4612c718828e46036 SHA512 54e22654d3b24400e448260f1d075ba2586d33cf44e0a5187b5c1288705b29bf9de394f8ca48f7717a2480cb1ae21348cc63e724f1eb93f268407a942b13f9dd
+DIST recaptcha-1.2.1.tar.gz 19935 BLAKE2B 43077b25d484940951bf070fa440b5d13c6992c2a157e06b81961b9692683a277d9507e44102dd0ba0cde66c892fd4736ed34cae4b001bdce0d4ab619828b432 SHA512 62df22a6f4b05006a6051db689994e455ada43f76406dd62c5c13f1d90ae64401e9d75c6a92f2c620a14c070d2b49199c20e70eb6284e42e676d37412a98abe4
 EBUILD recaptcha-1.1.3.ebuild 919 BLAKE2B 8e8949018ab7f21addc45fe32ffff4cba9031d2045f0133e41024f39049b9a59d43f9c848b1dec9c3ab779b8aaa52727d15f5f355d6628dc8d6b95d6b69f4eb5 SHA512 87b6ea66c192985a3e9a6502cefd9e7710a7ba6545201bd2f26245db4577ddaa9511ba26f3e56a62309bf46cb7745c568022cbea967a40c6e2e2594a363a23ac
+EBUILD recaptcha-1.2.1.ebuild 933 BLAKE2B 0c82cb9aed9bb2129d49d3af983a3ba08e8df20421c94b436a33cc2d1e398e81305dd9ac25a42bbccded96efcb95776d95fa6a97c80dcb0622117133798c345b SHA512 2101b3495bc2a7b36b62ff9b932699c4dd74f71cf39d5de61e6068cc459c3b4db6ff5ef9c4f9c367b61aa809a012e51e5a3f655d171ccf6769c8552337da383f
 MISC metadata.xml 337 BLAKE2B f5bf73fb4a4f700d08f240f2f5fbf629322ab2f8db346085d09331b69958545dbbf53973a6f04d105edc070901b2cc82ee7800f6be134f159bd7b6587631119b SHA512 abbe5982149863ee6b21edcc5299238a1449ec2ff4088b86453ef4196a2903c1d6fe38cec785562904369944fc6231b463cc1c4914e3eba8e6744bbe2a8ed520
diff --git a/dev-php/recaptcha/recaptcha-1.2.1.ebuild b/dev-php/recaptcha/recaptcha-1.2.1.ebuild
new file mode 100644
index 000000000000..867c4344a21b
--- /dev/null
+++ b/dev-php/recaptcha/recaptcha-1.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="PHP client library for Google's reCAPTCHA service"
+HOMEPAGE="https://github.com/google/recaptcha"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="dev-lang/php"
+BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_install(){
+	insinto "/usr/share/php/${PN}"
+	doins -r src/autoload.php src/ReCaptcha
+	dodoc CONTRIBUTING.md README.md
+	use examples && dodoc -r examples
+}
+
+src_test(){
+	phpunit || die "test suite failed"
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog "To use it in a script, require('${PN}/autoload.php'),"
+	elog "and then use the ${PN} class normally. Most of the examples in"
+	elog "the documentation should work without further modification."
+}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index d770761367b1..d5892e43ddbf 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -11,5 +11,5 @@ EBUILD xdebug-2.5.0.ebuild 1039 BLAKE2B 297525d73effe294aee72c9505876c5b2d59c54e
 EBUILD xdebug-2.5.3.ebuild 1035 BLAKE2B 33b476351fde796721bf602b127488496a65ad078cf2f6a2c49ba1d8f80252f08416b6c73c8424dd8a31d1ee4950dae9aa12c651c303db1c14a219c07ff25a96 SHA512 d6ba05f536ce9ab502ac4a0008b04544f37755b007a3c2efea9e75cc5e9d5b7f9c2f2bc58d76b682addef1681d747af8c6682cbf7073bee234c1571d99836081
 EBUILD xdebug-2.5.5.ebuild 1039 BLAKE2B 1e6a6b488a3e8041378d044646831021f047bbb3e923e8f5587540f35fb2234e5be4ff2017a2c293d1b3b2656d7161e1474daa724df5c0dcf1658ebe8686d38a SHA512 13d6f35f02f8869dec0c46283a8ca5c198d4d87d0be0e374c5f355c94f4e84f176713199733df72bb4eaf06a042c43c8037c2cb4a58eb621c9d14362185aa7f8
 EBUILD xdebug-2.6.0.ebuild 1039 BLAKE2B 4f5ec55ab03c1dd13a259f1bac5038594793cf8e62b620b3db8d153c445bfd678190321220565ba012d1a6c03ff93fc86216405cacf6ecd42bef790ad4196cf7 SHA512 afeda7e2133f7ada6c06743ae4839219c5afbc980c08f90ec718846c9e3a41fe026aeb176aa94ffd7d5c978f5255fcb1942fee9cec746eacf0ac7eaf80f6156b
-EBUILD xdebug-2.6.1.ebuild 1046 BLAKE2B 2d278c4123f65cb08c8d0935be9952ca7b26cdc61b5bc39568354a27eb27922b416ccd61abfa3ef7c03388579a34d1a21b5a245a043c6d091473e2be48fb4d65 SHA512 2268b379acd23ed378df6a124f63b1a0dd7c8a820fdf9c54016fe881e0b207c30a3644de5f3986300deead6e429dc5b03f6b7146a4273864b2ba7ae5aa5f4f59
+EBUILD xdebug-2.6.1.ebuild 1036 BLAKE2B b6a2c5e3cd1d53a8b86c87429c2d3e75fdbe87ee110f970401b215e904aa42f21099a1ed797387c6c8631ddff6af789d200623bd6ea80a0a7a4a784c2585c5ad SHA512 05a747c280de622ae6141c130c04c5f478096a9adb57b6aeb7bc75c0c217e80acb07c9e7c6eb50a9de70adf909a8605595f1c23923ca6dbbab820e9edc72c9e7
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/xdebug-2.6.1.ebuild b/dev-php/xdebug/xdebug-2.6.1.ebuild
index d25ad627eea4..6450d9968aa9 100644
--- a/dev-php/xdebug/xdebug-2.6.1.ebuild
+++ b/dev-php/xdebug/xdebug-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_INIFILE="2.6.0-xdebug.ini"
 
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php7-0 php7-1 php7-2"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
diff --git a/dev-python/CommonMark/CommonMark-0.5.4.ebuild b/dev-python/CommonMark/CommonMark-0.5.4.ebuild
deleted file mode 100644
index e8eb5056c3b6..000000000000
--- a/dev-python/CommonMark/CommonMark-0.5.4.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python parser for the CommonMark Markdown spec"
-HOMEPAGE="https://github.com/rtfd/CommonMark-py"
-LICENSE="BSD"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/hypothesis[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# unrestrict for versions >= 0.7.2
-RESTRICT=test
-
-python_test() {
-	LC_ALL='en_US.utf8' LC_CTYPE='en_US.utf8' LANG=en_US.utf8 PYTHONIOENCODING=UTF-8 \
-		  esetup.py test
-}
diff --git a/dev-python/CommonMark/CommonMark-0.7.3.ebuild b/dev-python/CommonMark/CommonMark-0.7.3.ebuild
deleted file mode 100644
index 95f715545b5d..000000000000
--- a/dev-python/CommonMark/CommonMark-0.7.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python parser for the CommonMark Markdown spec"
-HOMEPAGE="https://github.com/rtfd/CommonMark-py"
-LICENSE="BSD"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/hypothesis[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	PYTHONIOENCODING='utf8' \
-	esetup.py test
-}
diff --git a/dev-python/CommonMark/CommonMark-0.7.4.ebuild b/dev-python/CommonMark/CommonMark-0.7.4.ebuild
deleted file mode 100644
index bd4fc9bf81bd..000000000000
--- a/dev-python/CommonMark/CommonMark-0.7.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python parser for the CommonMark Markdown spec"
-HOMEPAGE="https://github.com/rtfd/CommonMark-py"
-LICENSE="BSD"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/flake8-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.7.1[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	PYTHONIOENCODING='utf8' \
-	esetup.py test
-}
-
-src_prepare() {
-	default
-	# Fix file collision with app-text/cmark, see bug #627034
-	sed -i -e "s:'cmark\( = CommonMark.cmark\:main'\):'cmark.py\1:" \
-		setup.py || die
-}
-
-pkg_postinst() {
-	ewarn "/usr/bin/cmark has been renamed to /usr/bin/cmark.py due file"
-	ewarn "collision with app-text/cmark (see bug #627034)"
-}
diff --git a/dev-python/CommonMark/CommonMark-0.7.5.ebuild b/dev-python/CommonMark/CommonMark-0.7.5.ebuild
deleted file mode 100644
index 8da735bd09db..000000000000
--- a/dev-python/CommonMark/CommonMark-0.7.5.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python parser for the CommonMark Markdown spec"
-HOMEPAGE="https://github.com/rtfd/CommonMark-py"
-LICENSE="BSD"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/hypothesis-3.7.1[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	PYTHONIOENCODING='utf8' \
-	esetup.py test
-}
-
-src_prepare() {
-	default
-	# Fix file collision with app-text/cmark, see bug #627034
-	sed -i -e "s:'cmark\( = CommonMark.cmark\:main'\):'cmark.py\1:" \
-		setup.py || die
-}
-
-pkg_postinst() {
-	ewarn "/usr/bin/cmark has been renamed to /usr/bin/cmark.py due file"
-	ewarn "collision with app-text/cmark (see bug #627034)"
-}
diff --git a/dev-python/CommonMark/Manifest b/dev-python/CommonMark/Manifest
deleted file mode 100644
index 5af1a2018fd6..000000000000
--- a/dev-python/CommonMark/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST CommonMark-0.5.4.tar.gz 120316 BLAKE2B 47904d101d9d0e3759f82c28a4b80edfc0ed12cf0888e4915339118e496322cf0791d8a46d2edddca0d1794e82a9647cc22cbcfcc2d385a740c7c31cb8251659 SHA512 1983714a50a627f30f86af0d02dad9e52cb7b0ffce29691d0e740f587e599ead6de2412d72b895b7df772e1c81e171e56dfecaf593e611af65bd5798632a98ad
-DIST CommonMark-0.7.3.tar.gz 85177 BLAKE2B f7940e00918d3c737dbbc79c336b20caf3974bc4ba162f9adb1f34bd09b43af69252bd0b5f2f7c072edd1fb55b812fa104c471b7f43daf6187404ccabe0225c9 SHA512 34ddf0539b54d79cd16356124a15e4f51076a7afdde78fbaa0cab06658279357c5523d89bdfa7d595d85da9df9b194491ddac22b78444b230f53298ffd11c8cf
-DIST CommonMark-0.7.4.tar.gz 87841 BLAKE2B 8820d9ee182753ea6069d30c84458a6a5e9f41948ef16e9382d9ac223508f022268f8bbd0661313d458365ef5bedabac41c2508943fb30c1b54a4d3dbcc4892d SHA512 7c76a5f0dec02e9ae8c2f73ebd2980a5a684b43ee8a82ea23b72c7f2332e1d4316a7b2d7b66ad8fe912803115a57e03b2ae4c7b042cc53e1205e579093053b89
-DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e61b17d0335c3234fc0fa0d3738e9117a8ca29e7a6bbaa6cd0d58b112defb6e19a7efce3ca57ca25c8ce67b2d3d2 SHA512 b0e3c4fea6c99b51c541054ecfe887935c2cc517a82df86da1d9cb4914189652326ec5b543cbbcb40ec43e5e09c285c47f5304ca1907764692e659c540591bdd
-EBUILD CommonMark-0.5.4.ebuild 752 BLAKE2B 230b188503b96ba631d281eb59ad6b3f9f8705f614465877f1ad6fe407921e6be28286cb0c701c2e5fef72ba94706a56ddccb00fe7ed59d73401f56f29524277 SHA512 27e404e755cf427e1e8cd61817a1810e8cbfb59112a929ade454eb51f3ad57353805257133cccf3fe2facad1db3e7a149b79cf4f75e4fb6395dfe7c54718e3be
-EBUILD CommonMark-0.7.3.ebuild 674 BLAKE2B bc6633250e17b3a3f0a16661b3c500e93c3827e4723b77cc2ed2f6c176be5667eae4809a4fd6284117bc768ded8642c954dfb813a2740e5ac00f8d47e253b3aa SHA512 c12aaa35eab159bd46736ba914a0b5828e8a8660fd2e6d321905a42178ff06e8fa61eb3cd59cd5dcbadcd492bc26e6a4589c4a595a66e1326fdfe6b6f7e907f0
-EBUILD CommonMark-0.7.4.ebuild 1028 BLAKE2B 37d886bd5fffd2c0fd0edcd392ba49a4999a3c37520b8d7f1f7599f4a583c78453ad3906c840c3ed57aecb091923c863c5995563f159022aa7a8f57b17edef83 SHA512 6346dd647dd2a40844c0b9521fd15d4658c79db46e52c6456f5802de305a28201cc33a565a2a29699cd79f602867079a83a84ec007889d0014f1d2474105896a
-EBUILD CommonMark-0.7.5.ebuild 993 BLAKE2B cd7287ab2dcd865f42b4cc76653d1b6179e0b8fc3c99349dc0ca0c5b2ba20a64e49f0b13db66dc794dc4f716647e05dccb589ed444d6de9f1b2a1a445571237a SHA512 dab1ee5f78ef0ed94af125ac4d1e7bb4fa4e1ca4deefb52ad50b4351cd911d17ff28313fe30a887720480febae37868daf9a6c40c723321bf33194168d283d99
-MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e19287d75d14..4453385d68e9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 0c0435308f57..ec4a8591e714 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,7 +1,9 @@
 AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662fd63590e097fbb8b681ac02cb3d96c9670ab1a1bbe873c1c1320dd78cc4c738f9f714c8ffd5be732bc15f084ad7ca721 SHA512 bfe80fa6018174a6981777031ffa97bc834e17848580d02c994c61507aa4ea16091e582b6bbc3754d469de1901fa8cf2e3e12240cced44fd0dbe928bdd360925
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
+DIST PyQt5_gpl-5.11.3.tar.gz 3121036 BLAKE2B e7881fea18535ba55c0b6946718fd1eccdc6a4678b869678c9413c500daee0cbfb281116db40a13655c8cb5e778b605f141821e20bf3834f1434908f73fc22bd SHA512 6f4abb1866ce357263c208121607072e127c8853e9c6bf039b034fefdda4c40e38f917c3b313375f0d692d764ecf26ff3a6b12cda2a2eeb5237db8b5e9443548
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
 EBUILD PyQt5-5.10.1-r1.ebuild 5726 BLAKE2B 2fd96947e8386cd0cb04392bd62644340f5b0345f06decca25e21e2cf194d4a9e42fd3bce5b06c7d3afb1d86a83ca17625a45b8b3d66e41f06a3340b8eeb360b SHA512 ad1a428b6894868156bd36810c5476f68e7d23311cddae2f5b7f47bce7827caf223b6423204b4afa3a697848e6ffba46cee8a45753796550a0b6edab4b23f72c
+EBUILD PyQt5-5.11.3.ebuild 5675 BLAKE2B 0066cee24acae56af544117ff497132171fc6d09e7e30eb3a0236467830864cd7b2514f7c576b9bffe56f10375e29d7c27cf5e129aab89dce4801ba035f8ed30 SHA512 edae44de1577c98ac55639c6da68018c7ffd03fdace48ff44f6ac661cef85ec25acb74d8af128456ca4282d4fdabebc0c2ee6aab81859d3c2918dd7716fa96e4
 EBUILD PyQt5-5.9.2.ebuild 5687 BLAKE2B 42b0f29d9e9652571b29acfdc3ff90fe5bf1f4ff8776855df37faebb92c11c5e6c049fa10d4d8b6dcb323da379dba0a8bbf231f6751a3be715b7384847d2730c SHA512 d71ebc7f8f90b4e80566a31b8eca0a291f51aeef5cc66f8c860581e69ca70131339606f917e9a1f0e99beb5132796721bc9033667c977ca4a92023be5c5bca8c
 MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
diff --git a/dev-python/PyQt5/PyQt5-5.11.3.ebuild b/dev-python/PyQt5/PyQt5-5.11.3.ebuild
new file mode 100644
index 000000000000..5eedcadd3ead
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.11.3.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}_gpl-${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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNetworkAuth, QtNfc
+IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
+	multimedia network opengl positioning printsupport sensors serialport sql svg
+	testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+	webengine? ( network widgets? ( printsupport webchannel ) )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.9.6:5"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19.11:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
+	webkit? ( dev-qt/qtwebkit:5[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( "${S}"/{ChangeLog,NEWS} )
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --qml-debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--sip-incdir="$(python_get_includedir)"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webengine QtWebEngine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		eqmake5 -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
+		# parallel install fails (same issue as qscintilla-python-2.10.8)
+		emake -j1 INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		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
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index fc94a0150123..46e26d188f3f 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -3,5 +3,5 @@ DIST alabaster-0.7.11.tar.gz 10998 BLAKE2B 93975fcb93cac425d6db903f89c862041dd48
 DIST alabaster-0.7.9.tar.gz 10485 BLAKE2B c3a22dd8b813f2dc717a1fb24d252db949f6336cb5b785603f933d4cf32236f9bdff117118d85ca3f6995e761e8d2689feb2c69be516ab681dc664323da43605 SHA512 b1286c4d5d17d172baaacbc40ba6a435d433f0880e31416c37ac88df8787bf522f1c28b6903fe92c88414f54286734508860eab86ff7f12da72315bf9ae0e6c8
 EBUILD alabaster-0.7.10.ebuild 549 BLAKE2B f77214a48102e0180908d429b4789c2506e443dbcf80d39526905b0d801536da43a53c44914f6aee5d214242f8a24ecd63fc1611769246b02f9084b58745e821 SHA512 c7db4066c01d964a285426bc8e783bffd085c2f874e90c339c6c666b751f23134fd135bdbacfd3519c8aa8e2fd8eab87e8da02f7e8263f4c6ad3fcaa9c9a0868
 EBUILD alabaster-0.7.11.ebuild 551 BLAKE2B 5f556550fc40ea3fb2c19d49f0721c7a34ac7531ff90c6ffde8decc9037cbf3e75370295936d951ae68bb7cf000bd5911c1fb85f1825017e4c65e1646b75250c SHA512 24bfb0b2f393a2c4b0f295b2fea2add1ecb7e2b089a3f3a4635cc1671a057ff03c953ef51895f9166f562c8cf180a6f33d8184e32d7d93ce4479b19ae9f3f3dc
-EBUILD alabaster-0.7.9.ebuild 514 BLAKE2B a59f7f5a7a1da542c832ed7a186f77366caff8187c17d7992a2ad039c718127893f6efff900ac10186e76998af035b7f16314abbf8e899cef8cc8146f237e2f6 SHA512 5818d0decaecea3d5340b45c01f3e8e6000f94e7be42a018252a53dd8e9bc1dec17d806fef2367656a7be359b08da987143658895681c219d8e09f720c892480
+EBUILD alabaster-0.7.9.ebuild 510 BLAKE2B f8a0e47fb4322c2016242595fd64e9714fca2595d9e9aed5ba4f2550e234af3323fbce5224c1115ae07fe6fa941d24476a7583b4e1b9847c62363937bab7f0ed SHA512 da85d1ea7dd8035a1f800283474e95fa21adc4fe846d1b4a5a5733ec6cbabf10b4e82f00a6ceae0985bff711ff8350b125725d16c82ac99d0396e3b547b6576c
 MISC metadata.xml 384 BLAKE2B 55991f34f966ecaa57dfd6474f3ffc0d25b04b106c3a45c6d5fbb88457598b7ea93ef5edbb84af23fcfd1ff4b6314c6c56397a5a52da64e3fde3ce1f40587d6b SHA512 7464f7780562e6a8aff5a243e0a87e08740b06210a25c83ec82649974b0b50aabcab46f6c35b5e568b898ae8a4d10087961ae8953785f4dab33b62cf782e4657
diff --git a/dev-python/alabaster/alabaster-0.7.9.ebuild b/dev-python/alabaster/alabaster-0.7.9.ebuild
index 3a98a7540eb5..01cf94b1540a 100644
--- a/dev-python/alabaster/alabaster-0.7.9.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-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"
 SLOT="0"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index ff8c9de10cef..2f24160ebafb 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -2,8 +2,10 @@ DIST ansi2html-1.1.1.tar.gz 46591 BLAKE2B e2eb3d9b2665fd495ee8591a3cbfebcd1d565e
 DIST ansi2html-1.2.0.tar.gz 46748 BLAKE2B c5ea7d35640f93562f6098a46dbeff9248e25b6210bfa5e71265d529599eea7713581ef986faa5afefb445492fe09d2170d164a63b2a602c57a79f2c72cbe118 SHA512 3106488da19cd093d7ae2a7499a66baf77877f47da0e497791cea2a63079c184f1d36743e78116b3faf08ab145ca97b5774151114b9ca193020578c8a3bdc860
 DIST ansi2html-1.3.0.tar.gz 35989 BLAKE2B b2f949e2c559b2da91d3095b4d8ac2091bd15aad46b178a01aa59d4c900917e733f6ab3884d9c4c7c46bfa530936339d9b105a0471a09eb7a01693c43e8a87dd SHA512 73d1b3431e22146c4fe18fef4b05413231d79d627c396d67528d0aa1ab07a7ef4bcfeff56829b85d9fe9ad508599b782318911f7b10d6b9a1bc98780e31389d7
 DIST ansi2html-1.4.2.tar.gz 25485 BLAKE2B 93f3bbd307b916c9ca60379235600606dbe16f1b6e423d0d2615f7825e92a6d7a8469ae7d60cf5131b4c3431897b3161bfcd2a0327525a332bcd6a6980dad5c9 SHA512 29c569839788968ba5a1fed8dddd4cc92f40ca88b4135b597815012ea44a44e8b7a3c2259d2d5d5f3cc690400be882236b88c0764a649da5679431501aab0b1c
+DIST ansi2html-1.5.1.tar.gz 27133 BLAKE2B 8a8017b8f4edb878b105138ec0dfe3fbde8647315382d763eeae7f90f094b60f0cb7205718c75930ccb7ca1183e40e5205eca6f8362e20445d930d92db23bc22 SHA512 367fa9721de65a6e14118d65de9ea8ede1ecc9f0809115ecccf481947aa442409ca972442e51a75bc4f14913566255142da4e411fe060dfda5e55f84a7ac67af
 EBUILD ansi2html-1.1.1.ebuild 974 BLAKE2B 63d51cb4874427dc950def125e69f094048c770b43c1c53677199c5688efc2e505a64599c2b26d69f62e58bdb0b373aad14e9faa5b27c151050e998d916a0a77 SHA512 d0e2fb2fa975c8a3db5fa5e1a7c316e655188fde167e8a09772c9296f2d0515bb03b48960f98c8ba1b2c322f92d51572878e78236f0687dc7f40e14c77cc1d76
 EBUILD ansi2html-1.2.0.ebuild 974 BLAKE2B 76346fb51b15eef7d57484aa8d15cd36d5a740e18d6f3c75494ddf9bad1cfaa89bd7597aa446fc33bd1399d2fc3787732efb30884c8396f22afe1d458a3867d9 SHA512 9a0a7bbf42528bb6aeb8231bd4179b4de056708f28caef17fe8a0fcd636dfcc13f79aa7bb71a9b1a4613944b23008f827aa514bd92582e575b0104766191405f
 EBUILD ansi2html-1.3.0.ebuild 1091 BLAKE2B 3c1cb0b29a60d36a478ca0d25dcb5c83189ce5f5cbd5eb568890b9447a8e812bee8e04d6cb6e5cea7d130b6700954e17d07eca1bd03ab2add1b3b1858b9f208a SHA512 c08e8fcd4bf6e2590a7d9a56b62d8ca8944d3b5dc72fbc11bf0d96a8500e4650254ca0dca1e92f51cd3b9729c663cfa391f03eb8804b9e6533113dba46201b7c
 EBUILD ansi2html-1.4.2.ebuild 1090 BLAKE2B 5df0dec2430651026cfae0df0218f71a57ec893d223136793355c707c334488a2c6c4fc3c5c2e1b3568a9c975116da5441542e20dcb0453f33b95600f558a92d SHA512 40ed7958d2ffe8c5470efc0881994cb552e54f306c5a334209399361ea2c06dc282e04c55c9c83483dec85020e70eab09f88cc18638af2c18f4314ed306ec64e
+EBUILD ansi2html-1.5.1.ebuild 979 BLAKE2B 1c4ae47f10db340813216ee782450af430abbfdc139c3352d323c8135090896977983e219a8dc0b97d8cec410cd9a48698c09f0f218ffc903067bdfd6bcf103b SHA512 f9fd53e3670073b907e174a8c26ce27fffda82c84197fafd85160246e1b35fa9a8961b8dbeeb36a4580f434a830be4793b447f78a1a74db8121b5da779d18243
 MISC metadata.xml 392 BLAKE2B 13621595cc083a069522c51b4e29b362f7217698c194d5247d73a3acdaca7ca8b13a3afb0e9b0671785ce246219d44bd8511c5ef243111d43067b138635f5963 SHA512 a17684f5bd76762a832cba99a1edcd2b2ebb1abdd27f36528fb4d2ded639b6223f60495c6dd2ee548826f3a2e177238318c02962d2300ace37eaa881e76cf095
diff --git a/dev-python/ansi2html/ansi2html-1.5.1.ebuild b/dev-python/ansi2html/ansi2html-1.5.1.ebuild
new file mode 100644
index 000000000000..076a1f0115aa
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	chmod -x "${S}"/tests/* || die
+	esetup.py check
+	esetup.py test
+}
+
+python_install_all() {
+	doman man/${PN}.1
+	DOCS=( README.rst man/${PN}.1.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/argon2_cffi/Manifest b/dev-python/argon2_cffi/Manifest
new file mode 100644
index 000000000000..f823244f011b
--- /dev/null
+++ b/dev-python/argon2_cffi/Manifest
@@ -0,0 +1,3 @@
+DIST argon2_cffi-18.3.0.tar.gz 1806363 BLAKE2B b60711ac929792ccd87a948f213288d4d47f45bf4bb52a1f6ac698d229e0953e37186c4e7d140231c205777be2fe31982a808cc676c13f12fe8602381665b74c SHA512 482a97ca17a23e4c1f93a0642e5aab1f2556d10f8a24d74afd051e6b58533c4767465abbfe8f1d39c150c5dbb191ad138d08e70633721753c7d317dbaf1cb375
+EBUILD argon2_cffi-18.3.0.ebuild 1172 BLAKE2B c2ce2a0410afa76935e54fdf7bb73ace85051817ce2716558226addb678b933f0dde93e9f135db262e2229145bb10b0d7bc889e4f669a424b0f36123ae9d8adf SHA512 66999c73637722feba791a9e9ac9d63e6fce862e758b2abd3f3695a9abba74674f9e340170d0c98f2169578e47f9230b2fc75cc8b61c87c2ef6da97a4db191b6
+MISC metadata.xml 727 BLAKE2B 8ca033f1a646a7d55dd8c78f483998d8ee34863d372c88b0d9e42c7d1fa7a14962b9a2e9c19aa13d0d35c7cd0e68599419a9641982dd376d76ade5c98d3cf338 SHA512 770cffcd4f6ecbf4fe93463bdb1670a9ec882844da62ac8ce18d606efcda6f314a3942b205d6a4ec54aee6b53f784faf6d19482601c9b570567217c31c6846b2
diff --git a/dev-python/argon2_cffi/argon2_cffi-18.3.0.ebuild b/dev-python/argon2_cffi/argon2_cffi-18.3.0.ebuild
new file mode 100644
index 000000000000..14c6988af3e6
--- /dev/null
+++ b/dev-python/argon2_cffi/argon2_cffi-18.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
+HOMEPAGE="https://github.com/hynek/argon2_cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+COMMON_DEPEND="
+	~app-crypt/argon2-20171227:=
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst FAQ.rst README.rst )
+
+python_configure_all() {
+	export ARGON2_CFFI_USE_SYSTEM=1
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/argon2_cffi/metadata.xml b/dev-python/argon2_cffi/metadata.xml
new file mode 100644
index 000000000000..3404c181dec2
--- /dev/null
+++ b/dev-python/argon2_cffi/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>m.seifert@digitalernachschub.de</email>
+    <name>Michael Seifert</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>CFFI bindings for the Argon2 password hashing library.</longdescription>
+  <upstream>
+    <remote-id type="pypi">argon2_cffi</remote-id>
+    <remote-id type="github">hynek/argon2_cffi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astng/Manifest b/dev-python/astng/Manifest
deleted file mode 100644
index 11a3b02c3d1e..000000000000
--- a/dev-python/astng/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pypy-test.patch 1863 BLAKE2B 4d0cb211cd9129f8a8cef2a8e15e169a23024bd30c065c6e7109f9044a7d9bd017a2d7ec121a652e6d94433f91d491626ca984202eecc85dde19cfa8ca3f6947 SHA512 474805cd55ae930b3d2f0595549b74f8a718ad21de016204367f5513d69afc5a6ad4f43b44162a5b752a820f642ef5600c2c3f7e7111839b1d3ef0d95a7819ad
-DIST logilab-astng-0.24.3.tar.gz 106660 BLAKE2B 0f82787fc0a3de025fb2921d0e94ca8e2ee33dfe636c9ad55f6494983467c8acfdab0aa83e7f84f1525697a6a5317569ff51537732a90ccdec2646f380b316ac SHA512 fb1e46ebf7111d727cd9d187968cb349dc23dfba0d4d8c6c793a8c081d4506f11e488074cc51b632c525aa264cfa50279dda90f0cf35dc2120ebbf4714902525
-EBUILD astng-0.24.3-r1.ebuild 1572 BLAKE2B 8118ddce7e4edf07126eaab8c3c76ee8740fc233c0c51d5167e790ce70da55fc1fc3b0d941829343f6112e09f8ac526e11811d68ba18e438ea4f0122d76c8946 SHA512 d65d12a96c937eafb1577301f5c911904662b825b7fae728c33d7f584e989ad7592b0fdb802988db72df7d5a37311d664f1cdc4ada7d0e06c379779a89b64b9b
-EBUILD astng-0.24.3.ebuild 1468 BLAKE2B 3644639859e5a92bacc0808fff4fd50f7fd738d8fdc3d10267633af8e69c7592415b980105d55c85e4e79abbcb0e534f01d3daa485cbd8f631837fa5fd91049d SHA512 e6e1ec7f70afdbfe2d0f5b3cc4fcf6d75adb47cb9ddd5c5676eaa7fe568d9cbd1d7a8d98bbfb6d4bb59aaf244dd9aa6c7e79de2acdc1f578073b6db4e6bc3793
-MISC metadata.xml 1068 BLAKE2B 0c0056ab7befb8cd391372534f9c7c84fb8f44a789446ec06b5653606d2748341342fc3a7b3886891930faa86404cc831cff0d8825691e99237c01f5e7e04e29 SHA512 c31304cd3895351242c47fef547bc6277421cc634b63862bbb84de081b0638a3020a6347510fff386d78aad432ee6382f8d7f4e1766aa1af32c2b44e83425cc2
diff --git a/dev-python/astng/astng-0.24.3-r1.ebuild b/dev-python/astng/astng-0.24.3-r1.ebuild
deleted file mode 100644
index c082787d9da0..000000000000
--- a/dev-python/astng/astng-0.24.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng/"
-SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="test"
-
-# 1.2.2-r1 for namespace files
-RDEPEND=">=dev-python/logilab-common-1.2.2-r1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/egenix-mx-base-3.0.0[$(python_gen_usedep 'python2*')] )"
-
-S="${WORKDIR}/logilab-${P}"
-RESTRICT="test"		# erroneous failures
-
-# a wit; pypy reports astng modules differently
-PATCHES=( "${FILESDIR}"/pypy-test.patch )
-
-python_test() {
-	distutils_install_for_testing
-	# test target needs unpacked test directories, doesn't like binary egg
-	esetup.py install_lib --install-dir="${TEST_DIR}"/lib
-	#https://bitbucket.org/logilab/astroid/issue/1/test-suite-fails-in-0243-under-py32-pypy
-	# Make sure that the tests use correct modules.
-	cd "${TEST_DIR}"/lib || die
-	pytest -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	rm "${D}$(python_get_sitedir)/logilab/__init__.py" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/astng/astng-0.24.3.ebuild b/dev-python/astng/astng-0.24.3.ebuild
deleted file mode 100644
index 4bbd302c3dd6..000000000000
--- a/dev-python/astng/astng-0.24.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=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng/"
-SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="test"
-
-# Version specified in __pkginfo__.py.
-RDEPEND=">=dev-python/logilab-common-0.59.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/egenix-mx-base-3.0.0[$(python_gen_usedep 'python2*')] )"
-
-S="${WORKDIR}/logilab-${P}"
-RESTRICT="test"		# erroneous failures
-
-# a wit; pypy reports astng modules differently
-PATCHES=( "${FILESDIR}"/pypy-test.patch )
-
-python_test() {
-	distutils_install_for_testing
-	# test target needs unpacked test directories, doesn't like binary egg
-	esetup.py install_lib --install-dir="${TEST_DIR}"/lib
-	#https://bitbucket.org/logilab/astroid/issue/1/test-suite-fails-in-0243-under-py32-pypy
-	# Make sure that the tests use correct modules.
-	cd "${TEST_DIR}"/lib || die
-	pytest -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	rm "${D}$(python_get_sitedir)/logilab/__init__.py" || die
-}
diff --git a/dev-python/astng/files/pypy-test.patch b/dev-python/astng/files/pypy-test.patch
deleted file mode 100644
index 42cb3864b43b..000000000000
--- a/dev-python/astng/files/pypy-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur logilab-astng-0.24.3.orig/test/unittest_builder.py logilab-astng-0.24.3/test/unittest_builder.py
---- test/unittest_builder.py	2013-04-17 17:38:31.000000000 +0800
-+++ test/unittest_builder.py	2013-06-19 02:13:51.425269363 +0800
-@@ -62,8 +62,12 @@
-         self.assertEqual(name.tolineno, 4)
-         strarg = callfunc.args[0]
-         self.assertIsInstance(strarg, nodes.Const)
--        self.assertEqual(strarg.fromlineno, 5) # no way for this one (is 4 actually)
--        self.assertEqual(strarg.tolineno, 5)
-+        if hasattr(sys, 'pypy_version_info'):
-+            self.assertEqual(strarg.fromlineno, 4) # no way for this one (is 4 actually)
-+            self.assertEqual(strarg.tolineno, 4)
-+        else:
-+            self.assertEqual(strarg.fromlineno, 5) # no way for this one (is 4 actually)
-+            self.assertEqual(strarg.tolineno, 5)
-         namearg = callfunc.args[1]
-         self.assertIsInstance(namearg, nodes.Name)
-         self.assertEqual(namearg.fromlineno, 5)
-diff -ur logilab-astng-0.24.3.orig/test/unittest_inference.py logilab-astng-0.24.3/test/unittest_inference.py
---- test/unittest_inference.py	2013-04-17 17:38:31.000000000 +0800
-+++ test/unittest_inference.py	2013-06-19 02:52:41.618270007 +0800
-@@ -710,8 +710,12 @@
-         node = get_name_node(astng, 'open', -1)
-         infered = list(node.infer())
-         self.assertEqual(len(infered), 1)
--        self.assertIsInstance(infered[0], nodes.Function)
--        self.assertEqual(infered[0].name, 'open')
-+        if hasattr(sys, 'pypy_version_info'):
-+            self.assertIsInstance(infered[0], nodes.Class)
-+            self.assertEqual(infered[0].name, 'file')
-+        else:
-+            self.assertIsInstance(infered[0], nodes.Function)
-+            self.assertEqual(infered[0].name, 'open') 
- 
-     def test_callfunc_context_func(self):
-         code = '''
diff --git a/dev-python/astng/metadata.xml b/dev-python/astng/metadata.xml
deleted file mode 100644
index b7ac41e3d53b..000000000000
--- a/dev-python/astng/metadata.xml
+++ /dev/null
@@ -1,22 +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">The aim of this module is to provide a common base representation of
-  python source code for projects such as pychecker, pyreverse,
-  pylint... Well, actually the development of this library is
-  essentially governed by pylint's needs.
-  It provides a compatible representation which comes from the _ast
-  module. It rebuilds the tree generated by the builtin _ast module by
-  recursively walking down the AST and building an extended ast (let's
-  call it astng ;). The new node classes have additional methods and
-  attributes for different usages. They include some support for static
-  inference and local name scopes. Furthermore, astng builds partial
-  trees by inspecting living objects.</longdescription>
-  <upstream>
-    <remote-id type="pypi">logilab-astng</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 942a8e1d41e8..408e23a23082 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,6 +1,6 @@
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 DIST atomicwrites-1.2.1.tar.gz 11660 BLAKE2B 06b4ca25f39be0e7e8d8e8b46749d7dce052f912e82b1ccd39e308c8ed51ab0d4891f00c11d0e52ef50901c01566f20fcf1318cb472c9a1f3a08617fd1b56235 SHA512 4df7ee97e0817a80378b273ced310b8ad88eb6ced93a594a6e3dc38ad1e7208226fde01b6d282f85583c57a50859e82c85bacaae8a7c64fce55e6965f74b12c5
 EBUILD atomicwrites-1.1.5-r2.ebuild 578 BLAKE2B ad9188acc6f21a3352510d2efae465d010e763f21f45d6604979b4a48da0e77817746037f8472bc86bdd034163e0c75da40a56784eb0e979e856b5dc86d8eeb0 SHA512 1af57e581631a2cda8f7ee9de709bbd2abb1475d5f25331d9fa2683e5b75892f897e68f092f96b5ffe522a5d2b1966aca0a81a37fe80c38f08b9599d63d2b715
-EBUILD atomicwrites-1.1.5-r3.ebuild 949 BLAKE2B d40c8c6e5272d374d466f61e4280e4dd9fca3966671f61feadf7856d5c3a0f28eee3cd4e9d4475780b610468cb0de0c0d17da552be4f45108ec1d23cbca76d36 SHA512 6fd59e1210ca15b1a16382e42a0e4a3cc563b4ba6fdcf0f8df4098d32489a2685e1d78c7bee6fcfc0558af2cbfde7600969d5db3f4e5fbf6587f57c7ba9e8183
-EBUILD atomicwrites-1.2.1.ebuild 942 BLAKE2B d1a3f23d9b752035b1445e344e06db342b6ec15461d17fc9d8640773892e7a5fc83a7b344a3cd566d3ba7c0c5f425a1d70936e262ded4c0d86d15583c86db963 SHA512 1afea14ad6f9b9e14fe88d1023c9e2610299edd9e1f5913ed1678fe01b490a7d6cc326bfb2ec6ebff205d14a2682ce4c509a3d4f9e8e786dfaaf7fadf2fc409a
+EBUILD atomicwrites-1.1.5-r3.ebuild 959 BLAKE2B 3fd41a1bc3fd32c3654e73f9b75d99ca63c98bc41d3de5fc98ba40c03bee51e7dd9b0a72e7a2b6f2dd5880af5a79869aee42799e035645d755e8d0afcaaf8fb2 SHA512 70bd31d5dd33240206ce96eafbef95e2284ec850d4aeac0632350941c82e62ecc9c4d718f30f4d8ec1a2d70c0f2e9642255e1cd39db5d6e1c8d8de7d6a4e6e17
+EBUILD atomicwrites-1.2.1.ebuild 945 BLAKE2B 1686a341278586a5fbebef6b5d9f1c7607a6b55e60fee93d702a8a92ac32af22f83fc2eb0a7d5527ef6f602f26be5a8bfede176bea96ed0f44430b8df0ded9dc SHA512 39d897f6c908237ca75bc591ddef2a663c23750f8787de5a706bfc02e0753b123f32cd89b3e53722783e64f891ca3b4d5b5cf11bae7a0ee954d5a0e64127664a
 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 8fe927585a77..2fb60c61c275 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
index 5ca007ff2e86..edd01805d3d7 100644
--- a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
new file mode 100644
index 000000000000..130340b40b86
--- /dev/null
+++ b/dev-python/backports-os/Manifest
@@ -0,0 +1,3 @@
+DIST backports-os-0.1.1.tar.gz 11359 BLAKE2B 8c1f9ba4d62d9b6b625d31c902feb7532919a0a42064133ef07756a3806a6423a479f5b3c4c9824ebb421a9e1901d8932aa024ced7dd7700119236c186d11137 SHA512 d17c5f6146401fa96c02f2d848d515a5d1dd587ee2199b5e45c177e1853e21e7e7c205a4d89322c5aada71e3a7b34bc7f9afe8183625f76e4ba26aedf2150268
+EBUILD backports-os-0.1.1.ebuild 972 BLAKE2B 7998d36861786c93ce30852f8fdd27ffbdfc325740a8b31fd24999915a3362c0c09c83dec1ab797ed6414b36d6fd95760154678b787f5feab7d6305792b97346 SHA512 6e64c69bdc405cc63412d5549bd3739827749910afcbcd84e9c49d58dc66508c9353fbe75364e5388d3962ef834f1954301880ff2d671ad830fac8a98e5d1bef
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
new file mode 100644
index 000000000000..3b30347de811
--- /dev/null
+++ b/dev-python/backports-os/backports-os-0.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Backport of new features in Python's os module"
+HOMEPAGE="https://github.com/pjdelport/backports.os"
+SRC_URI="https://github.com/pjdelport/backports.os/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${P/-/.}"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	distutils-r1_python_install
+	# main namespace provided by dev-python/backports
+	rm "${ED}/$(python_get_sitedir)"/backports/__init__.py* || die
+	rm -rf "${ED}/$(python_get_sitedir)"/backports/__pycache__ || die
+}
diff --git a/dev-python/backports-os/metadata.xml b/dev-python/backports-os/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/backports-os/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index 10c7aa7b4340..bbd315328ccc 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -3,5 +3,5 @@ DIST beautifulsoup4-4.5.1.tar.gz 158039 BLAKE2B 5eb99c7efdb13c359385c7c7f3280332
 DIST beautifulsoup4-4.6.3.tar.gz 167469 BLAKE2B 0bc8f729298a2fd1e8f3cc8a7635587217f9a2e6e2c71709e99c40eedf1ebb4d76cd0d17ec36b99f3ee047193e4d44e31b8d2aa9864c43ce5db380fbdc083f76 SHA512 0cacae77843326ebee87d108b6706a7ca6943684bcccc62554d2ae5d77dfd181c97435ceca9d3e2e51962b024bbe52bc08d7f0dc516311aa87b3a1f87fb4ae23
 EBUILD beautifulsoup-3.2.1-r1.ebuild 858 BLAKE2B d8a3a865e18101053361a4be6d569344484317891f1611d8a3ce2d168a8e4eb0d6b28fb067fb1cb74cc57fa89d99da7c50f6edd37bc120232a51e5962d6eadb9 SHA512 879c787894a065f4150c8b6021ff30f15ee0d273de06c0d151ef84157eee1e5d2ca56df9104ac8a6a44d43cb332d3367cc8f2861b7324d851f0285e1c7e174ad
 EBUILD beautifulsoup-4.5.1.ebuild 1359 BLAKE2B 7629a7dd000b55c72fdf523e361be3756c290a478eda10e20cec96e7725d15082125755ab28fda3c79d1b8f1500f4f6aecb832af93db4077a9ca68eaae37383a SHA512 334927959ed9a41f0bb9b7deea78481504d0051801eab94a66981d3ca3fe5dc69f953dcdb46294a9f68177031b3571b9efed3cf9bff598072d4a1eeb6087bf61
-EBUILD beautifulsoup-4.6.3.ebuild 1328 BLAKE2B 29406083fa344a392e411e0a168c00ae1f7bcc273433b6a0d64afde460fc84f0e68b12ac29e3b14fb264ce2c26eed6c6e19e34a77de5155a9d85203069c64296 SHA512 0e6dfd282f0d3ca65e9a18b976922647be15af48d826f49cf8ae68fe1dd6bfb04cd443e2dc41cc29b188b0d732925d9d37a1c61c602007fefae0da9aaab35196
+EBUILD beautifulsoup-4.6.3.ebuild 1324 BLAKE2B 34832ce698f74ccd1c331a8c392b165567dd44899991d9799f4b885ba1b177227c8c9f74d19481958965907c40524d11d6cf3407760a7d0f1ff53b7e1dd33f40 SHA512 e2b79e8cc2f0852c93330c20741fc1a6edd447d46c07ee9602c19086636be841a3928db571c8a683719f9f113df2908ec13013aeaa011d68fb5707b9071abff8
 MISC metadata.xml 720 BLAKE2B eb5a827491cd19df36bee9593e3e110a986fceee9f6d62a4de47edfc3daf4e1090062a2a9a4c8bc9cbb4f9b378de0c21126b3229740b7e75fba22643fb28fbcd SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
index 8ae9560e9941..48b282ab4639 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 6691d358fb65..c7bec08c57a0 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,7 @@
 DIST bleach-1.5.0.tar.gz 36502 BLAKE2B a56eb875a5becd21f7ff71a29db8178a7536a7aadfe81fe178360ba61ba599df9d4d9a782bbf72eb186b61a0b2e3f99058c483cc0d194e735a787319697c7327 SHA512 572a089691af61f096716d96517a96755fe674cc471bdbcff80615ae903eaeff72c47b918ee28a1db60ee5c0253c0c52ba02544f8535ae4f283a3a87a3061124
 DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
-DIST bleach-3.0.0.tar.gz 164459 BLAKE2B a9e873428cf629dc98c8adf56ad8a45f63e355ffb5eb495df4d452106e77a5919c90e2f1651f671e8807e0dddbdb7543fbd4c78fd95afad4cf8cee68e7a797d8 SHA512 7bc13af18baed440c0ce39f8caf7a14fc7264aba8a14a1999334d1ddd78183a0f84a17b3f2088453ee20d4873162f2a8cbd273e6f881201744b2a0f47805839e
+DIST bleach-3.0.1.tar.gz 165179 BLAKE2B 261ef2692c8c30e1ce387346aee03e45d46e195d45778485371a4e5d5d754c579853b50633fd5a834038c931cb48dc458771e7a44b7e0726015ea5934b2968bf SHA512 c90fee244d10ae66c30c8bff80e096cf508b2413a7ee082cbe2c5e0f1508d078133c2db6cd09f05ce875e867d4c0fab985659e4fe6d7bd9fe6ad4f823af03736
 EBUILD bleach-1.5.0.ebuild 773 BLAKE2B 6afda52e437aa252b31174f09b7a6f61fa95f4b91f96ec364ac9375e26c2aeec5f5df001b92a8ee6c0f7ffc5a62eaf1830e64d216f3660e43661230000d2f770 SHA512 984382fe1f458fac718dde60f3e6089edb2cafa69296b3e21ef9049907da625ac44af15b87c062801a68a5b15a2fc3a989015cb5ad94c2584f2a8783311dba0f
 EBUILD bleach-2.1.3.ebuild 792 BLAKE2B 62915001c423ea8c8db88bebc2f06a605702dd7caa93fadad76e347c66c47d2cc666657383169895b175f2cd1755489eac685e6c71de0f2b6ae40c34f30f1b0a SHA512 04c8437eed67e4f48a0829316ee5641f49bb77fe1628168b5d5df72dbaa207bba7b9ce7e6528c0c71c98e815312a0c147f717b204710b1a76bc16cc2bc3c70f3
-EBUILD bleach-3.0.0.ebuild 770 BLAKE2B d409b89d4930f5823d06f62945b33bff6b92e97d68eeee07a7735ba1de80997c6e2425a003a8be398a9bad1b145991c88890fe87edfa232d34ed7ca2cae1db98 SHA512 3e809fc9eb92847ae78a2d60052256fa8a0dff512b2ab3ef75bbded0a953dfb0996c7e21f9f1d114b1bfe801cb5850f6f9148a2d6f4b49e7dc6a6fe45a6810f1
+EBUILD bleach-3.0.1.ebuild 770 BLAKE2B d409b89d4930f5823d06f62945b33bff6b92e97d68eeee07a7735ba1de80997c6e2425a003a8be398a9bad1b145991c88890fe87edfa232d34ed7ca2cae1db98 SHA512 3e809fc9eb92847ae78a2d60052256fa8a0dff512b2ab3ef75bbded0a953dfb0996c7e21f9f1d114b1bfe801cb5850f6f9148a2d6f4b49e7dc6a6fe45a6810f1
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-3.0.0.ebuild b/dev-python/bleach/bleach-3.0.1.ebuild
index 71d5a9790dcd..71d5a9790dcd 100644
--- a/dev-python/bleach/bleach-3.0.0.ebuild
+++ b/dev-python/bleach/bleach-3.0.1.ebuild
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
new file mode 100644
index 000000000000..0e86e397012a
--- /dev/null
+++ b/dev-python/booleanOperations/Manifest
@@ -0,0 +1,3 @@
+DIST booleanOperations-0.8.0.tar.gz 19914 BLAKE2B 121eb4c8587cd56717c757589cadd08334c7a3d90d878c17d24e36b232a1cbf0386a4c1090638818f0e264296796d89a8231204656d2a7432802b385e8200c80 SHA512 76eaeb6a5039f4f5ff3a066545a70c35a512b7ec20e54873cde90a14a18f6a9fc33a2ac356325f7390f206ad2f34412e178212e30065ede41d4b3fa8397eecea
+EBUILD booleanOperations-0.8.0.ebuild 694 BLAKE2B 419289377d4c19650390f8a20594c5e0b56cfced88bac86e8f1e15ce2ac87b0257c707cb691dff9a2bf88a5071c9fc3892c017cb5b00db6a821eca630ee4bab7 SHA512 b308af6e4fba358d384b67c074db8e140bdafbdc09c9977f191cb29fbe950555f9c4a4341e61865cbb9d15eab659867357e96ebb050ab824ee7dc4be1fc2ab5c
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild b/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild
new file mode 100644
index 000000000000..3a04ff471681
--- /dev/null
+++ b/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Boolean operations on paths"
+HOMEPAGE="https://github.com/typemytype/booleanOperations"
+SRC_URI="https://github.com/typemytype/booleanOperations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	dev-python/pyclipper[${PYTHON_USEDEP}]
+	dev-python/ufoLib[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/booleanOperations/metadata.xml b/dev-python/booleanOperations/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/booleanOperations/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 7535e20273e7..cb1a48924247 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,4 @@
-AUX 9999/0001-python-tests-Update-test_code_completion.patch 1807 BLAKE2B 4c1dbeb485af50ed09453c3c19a2efe45e866dc53efe9fe7332b6fe2d8e885dc2af95ececeebb9f3c8aeb6ae95f360ef4b76bd767b5e4988e16a664445f11263 SHA512 c58e860bc4a7d60491db5d25102c645e8b9d9ba1347d131f6dc1ac721d8cbf70b7999709ccbb889232eca5ea59f638c4e3b6cae2bd829754d5d7d87c6e5facbc
+AUX 7.0.0/0001-python-tests-Update-test_code_completion.patch 1807 BLAKE2B 4c1dbeb485af50ed09453c3c19a2efe45e866dc53efe9fe7332b6fe2d8e885dc2af95ececeebb9f3c8aeb6ae95f360ef4b76bd767b5e4988e16a664445f11263 SHA512 c58e860bc4a7d60491db5d25102c645e8b9d9ba1347d131f6dc1ac721d8cbf70b7999709ccbb889232eca5ea59f638c4e3b6cae2bd829754d5d7d87c6e5facbc
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
@@ -6,7 +6,7 @@ DIST cfe-7.0.0.src.tar.xz 12541904 BLAKE2B 92ecfcb37e7efb4f3dde275e7a087a52f1ddc
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a492625ddb681b920b4ecc0aec30306087136ea5ab2f8d7bc36cc4c8474f44e67bfd637f90cd78ae7e1c85719f1a14be5aa SHA512 bf34b1c9b9b43fcda7d3a350e8d664355056b634b65f7741538d8f1eabe7556a46063df7340706f4fe2e0708b0cb4a34c85ce609149ab4f15d64478964622176
 EBUILD clang-python-6.0.1.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
-EBUILD clang-python-7.0.0.ebuild 1277 BLAKE2B dfb603b473855cc6ac4ac0f8edd0a689a8d8f10d5131fa286f24100cd483043f4bbcf72ed2b2d3d8364fbb94f45758c3401d0468eda150370064c6b8a6034662 SHA512 0e261d1d3cb6a683e9ec254f4c95b47afcd34c9499d0922e581dc7707d6beb63ff76e075e9ea1eaffd51aa3dbf6e1a8da742fe9e256de834a34792a98b3f561c
-EBUILD clang-python-7.0.9999.ebuild 1235 BLAKE2B 7d203e547693c00763be1542721f005d4bd5ca70a0cc1345509e3112b4a3fde2aa17aa250bd256e68f38c5657b2a060ed8606c42203dba500e6d43fb58fa00d1 SHA512 46fbf754690b5aaa8b56ae2a00191681104bd66c45f062b5744fa6eeeb5624c4341d91d256f370339f25ff25c075c3eea737d8b4c163af9b691712e762b09e37
-EBUILD clang-python-9999.ebuild 1210 BLAKE2B 4e9d11a29d220b74ed4526ad72af2524084a0d7c237e1daa403e2236ee2efe2c96484d7d664e159de6fc394b4a477b1208715e3a398ddaca8fbede6997061fcb SHA512 7717ef6fecad0b31cb9c1656e4945dfb8167e679c899d78283c32ab0bd005ef6b54492776d5447937c64f406c10d54a91fb59a6ee19f6d418e00fb9c8797ec4c
+EBUILD clang-python-7.0.0.ebuild 1278 BLAKE2B 0a2585c72ea4677a34886063d389fe11b89c27ca458e7b0814e5f181bb716e1385057e7a4a2b01ff337d98d421c64a04f5aaef805c80f1d0e7f36aa3ff29868c SHA512 7c6158ff08a0f46e3b5bf3aa968be8336c28040e51d1f4d88d68ff05bf8941088f5154595b2e889b668f7060643cd2b98d4e25169ed909e59a9e40007985f5a4
+EBUILD clang-python-7.0.9999.ebuild 1236 BLAKE2B 7ef1a49beda02ec169fb0d85606a91cc422485b06b52f4b63599b9b55303749ace19a5b25e1b95e4afc3f15d44c02b211a805077d20cca102cd76ebfad4858ea SHA512 091742af56e14d2ddb284a1d3fdc126c66fa2f309121be5927bd266e185f840ad19e2e07ca077a10c981e1ca3e342f33d9751386e410ae2951e2c8bdad5b7a5a
+EBUILD clang-python-9999.ebuild 1030 BLAKE2B 4152729630f6822b4a22e1ec754bf99833951c49e94eb55583ea8d3b2dedd957b435dfc3e24bd8adbd9f12a02161fcd5a16962165f9ec592469a4716820332af SHA512 5889e98300f26a540c93017e72b76232b2c9c871be3bb39c248d30a88316d44114fd1d7545acc0963ccdb4d15dc55f70fa8f30825cccfba69b33ef90e3d73401
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-7.0.0.ebuild b/dev-python/clang-python/clang-python-7.0.0.ebuild
index 6587ca010e17..cb4c02ae7491 100644
--- a/dev-python/clang-python/clang-python-7.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.0.ebuild
@@ -32,7 +32,7 @@ S=${WORKDIR}/${MY_P}/bindings/python
 PATCHES=(
 	# update completion test results due to completion changes
 	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/9999/0001-python-tests-Update-test_code_completion.patch
+	"${FILESDIR}"/7.0.0/0001-python-tests-Update-test_code_completion.patch
 )
 
 src_unpack() {
diff --git a/dev-python/clang-python/clang-python-7.0.9999.ebuild b/dev-python/clang-python/clang-python-7.0.9999.ebuild
index 56917d10ff17..ff42c58b9e72 100644
--- a/dev-python/clang-python/clang-python-7.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.9999.ebuild
@@ -34,7 +34,7 @@ S=${WORKDIR}/${P}/bindings/python
 PATCHES=(
 	# update completion test results due to completion changes
 	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/9999/0001-python-tests-Update-test_code_completion.patch
+	"${FILESDIR}"/7.0.0/0001-python-tests-Update-test_code_completion.patch
 )
 
 src_unpack() {
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild
index b3138a01e172..cf488945799b 100644
--- a/dev-python/clang-python/clang-python-9999.ebuild
+++ b/dev-python/clang-python/clang-python-9999.ebuild
@@ -30,12 +30,6 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P}/bindings/python
 
-PATCHES=(
-	# update completion test results due to completion changes
-	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/9999/0001-python-tests-Update-test_code_completion.patch
-)
-
 src_unpack() {
 	git-r3_fetch
 	git-r3_checkout '' '' '' bindings/python
diff --git a/dev-python/clang-python/files/9999/0001-python-tests-Update-test_code_completion.patch b/dev-python/clang-python/files/7.0.0/0001-python-tests-Update-test_code_completion.patch
index 824da55ca416..824da55ca416 100644
--- a/dev-python/clang-python/files/9999/0001-python-tests-Update-test_code_completion.patch
+++ b/dev-python/clang-python/files/7.0.0/0001-python-tests-Update-test_code_completion.patch
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 0c8f90ed3083..ad1d0df54cb4 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -3,8 +3,10 @@ AUX click-6.7-support-sphinx-1.7.patch 1243 BLAKE2B d4939d49d43b50a3cddb77899ed2
 DIST click-5.1.tar.gz 275592 BLAKE2B 0a58e210003f88081fd2ba8e9f401c74d8d61758ae096fde9fa4aebe8a819623aeb90106bf141d5193d632d70488629cf63833297dc1e4b200824cee205c3c4b SHA512 b860b0227644f5d1cc24d41e66985421ec971f11f3f596fb46508fdc787200b949e7ef29b2035421ebb0115384688da03c3c95a0d6acc58dd3b566b32a2b7c6a
 DIST click-6.6.tar.gz 283420 BLAKE2B 1fdc90ca65d18153d6260b6753e14a1d94cae77ab7f52dcda4fb439f9fdfeea8fdc33b1ce60e93711ba40ecdc508dc3fc5f8aadc371bd85b7dca1bfa070786c2 SHA512 5650cfe6c8b55a7e823e22248964143278d61383dac63497508a864807f1950f9dd5d76ce6a501e589dd81fed6e2a1248d3f8973be25a91950896b7408dc88bc
 DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
+DIST click-7.0.tar.gz 289077 BLAKE2B 0e180eeb1d7d9da34c33f95398c2b53dce124317bd2777ad545c1d4b4f3a96da0e281fac46c8fe6446848f25f7b705d2348d3ab6f5786219b4214650424ab260 SHA512 7ed2bf677f4a56f120deb61318675679a8f09c152af618e8808d24a20cc8537b0691c18b0de2e25b814c59e34b47d6f4d71191856422fc3be206de7669d78f3a
 EBUILD click-5.1.ebuild 1205 BLAKE2B bd6d5fb8ca349249840a8db62756295ce6d79d214d90e6f655b9edf5d5ccf86e53399508d01725270bfb5960156f0381fe046c5bf7929e0c91d0ad7b9010a0eb SHA512 dbc45857683e0cb698b9b95f743a13f0d7f77df33eb9d58397404040dac04fb8b0e811afae51ce886a4ace5c6136c3ac1d4ab3dfc53208a5bcd2f74ca5dce464
 EBUILD click-6.6.ebuild 1192 BLAKE2B 6506d88b1792f1a1f5107537a8ed73c34bb4b8dd87b27036df1fa6945f0359ec3482d4a7f33f2c78f3bc438bd534d4483079d1eacdc274f9f64bcde43ac8e91e SHA512 9523bcfd4ac931ab76891ed4a7409bc1f9df8a78a5f180aa26e47fdbcf23989f5854534c0440ae1aabfa07f0186236001f3a5c40e997d8582283990369d75272
 EBUILD click-6.7-r1.ebuild 1411 BLAKE2B a3a7ddead3e59990b4816ff70a2b21f54f1365ad8894da5577eb312ecf9f2d187ff6184176064d04d19ffcfda50a36dc850b066ba0c9de91d5d42b3378a5203b SHA512 626698fd9c56d08591dee76d8b5f525e16ae8bc708ec460b1a24782ec7e7442b35a1ed1d4f78a6598829e296fb312535715395991a0c9021b76b75343fd29575
 EBUILD click-6.7.ebuild 1299 BLAKE2B b06ef47d14e3fa73a2392febdfce4b1de139a7c26262122bea89e402e0a4c8a8c861a6190ca852e4b721bc97b772a760a5583c91f4625c2bc40ec7ed1989d429 SHA512 347af3d728b0ae9c766880daf863eb2da95d6c94aa71cb93fc3402aa4e77105cee2841d8f1d5c769379c22dc351238f827c36c3728125515a4194adae474bf0f
+EBUILD click-7.0.ebuild 1081 BLAKE2B d0088141c8d36e22791760971159b9def2402f56d5c3db114a799d16eee30b429cc28b0763188c3b5c055f435a672ce193f9af4a6b40dc6da9e087c6f4b72f6c SHA512 4639cb83331f5ade0e97dcbb0bcb767e66010f814f2ed3941db4eea44b86b00bd4210e301736cc078a54a3e35998fbefcbc521128349ff627f308e0485d228c6
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
new file mode 100644
index 000000000000..e6e39841fdc4
--- /dev/null
+++ b/dev-python/click/click-7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/pallets-sphinx-themes[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pytest -vv || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
new file mode 100644
index 000000000000..1ddac91462eb
--- /dev/null
+++ b/dev-python/commonmark/Manifest
@@ -0,0 +1,7 @@
+DIST CommonMark-0.5.4.tar.gz 120316 BLAKE2B 47904d101d9d0e3759f82c28a4b80edfc0ed12cf0888e4915339118e496322cf0791d8a46d2edddca0d1794e82a9647cc22cbcfcc2d385a740c7c31cb8251659 SHA512 1983714a50a627f30f86af0d02dad9e52cb7b0ffce29691d0e740f587e599ead6de2412d72b895b7df772e1c81e171e56dfecaf593e611af65bd5798632a98ad
+DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e61b17d0335c3234fc0fa0d3738e9117a8ca29e7a6bbaa6cd0d58b112defb6e19a7efce3ca57ca25c8ce67b2d3d2 SHA512 b0e3c4fea6c99b51c541054ecfe887935c2cc517a82df86da1d9cb4914189652326ec5b543cbbcb40ec43e5e09c285c47f5304ca1907764692e659c540591bdd
+DIST commonmark-0.8.1.tar.gz 90795 BLAKE2B 718c2b1af035672d74e2c6b6f89ea0cd23f45d7b0e47b6dadeef742d772f5458e08ec5f69fd4f34df9ab2c491d9d7add4c4acc7018c4048649aa0d8244d7db91 SHA512 dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf
+EBUILD commonmark-0.5.4.ebuild 816 BLAKE2B 4623bcdc238c125819bf1abdc13d5784fa38002ff745d295b8570008bb265d60f5958de44ec7afa324af5bb3676fae2288881f1592863fb15a5f994916dbec84 SHA512 53d96ed5ab173d09aafc4a5001704f1bd29d5c3b9d20f8df9712a570504ccf24bdc75526c9f1b988bd7d5b46e7bf936838efecbb92d50c6e132ed1b033ce7879
+EBUILD commonmark-0.7.5.ebuild 1072 BLAKE2B 663fb0549b8dc91e3324db235612c655f28d0edcb50a9af1bb5e0bd8ddb34b3772cd0aa1901efe564cb1175f444a1f2a47c1f529f8af84cae8f5da8c21accd4a SHA512 68857c0969b7be6e7ae489cf63abdc77063b5368760b6aca4149733bf69bc2a3507664ad55642bf13203a0a79346f0a2745505d7eca901a8723b11c9a4be6b12
+EBUILD commonmark-0.8.1.ebuild 1004 BLAKE2B 601fee072353ca32a0c4daea40a3a4a57f1fdb0e3f44062bdb7f7d941ba0e5f84f7afde7ed2f074089d717503a0a89f170670c388d90c636b48ae3fb738d4a72 SHA512 3bb45d760e2f8cff6f582043d587f05d0a1fae49c163bfd708b51e5191e5a560ee9192f852f04ff4070ed72f7d38ad69388e963be52194e073ee45588195f4f0
+MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
diff --git a/dev-python/commonmark/commonmark-0.5.4.ebuild b/dev-python/commonmark/commonmark-0.5.4.ebuild
new file mode 100644
index 000000000000..630fd63052eb
--- /dev/null
+++ b/dev-python/commonmark/commonmark-0.5.4.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=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN=CommonMark
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Python parser for the CommonMark Markdown spec"
+HOMEPAGE="https://github.com/rtfd/CommonMark-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/hypothesis[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+# unrestrict for versions >= 0.7.2
+RESTRICT=test
+
+python_test() {
+	LC_ALL='en_US.utf8' LC_CTYPE='en_US.utf8' LANG=en_US.utf8 PYTHONIOENCODING=UTF-8 \
+	esetup.py test
+}
diff --git a/dev-python/commonmark/commonmark-0.7.5.ebuild b/dev-python/commonmark/commonmark-0.7.5.ebuild
new file mode 100644
index 000000000000..52faefc635f9
--- /dev/null
+++ b/dev-python/commonmark/commonmark-0.7.5.ebuild
@@ -0,0 +1,47 @@
+# 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 distutils-r1
+
+MY_PN=CommonMark
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Python parser for the CommonMark Markdown spec"
+HOMEPAGE="https://github.com/rtfd/CommonMark-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-3.7.1[${PYTHON_USEDEP}]
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	PYTHONIOENCODING='utf8' \
+	esetup.py test
+}
+
+src_prepare() {
+	default
+	# Fix file collision with app-text/cmark, see bug #627034
+	sed -i -e "s:'cmark\( = CommonMark.cmark\:main'\):'cmark.py\1:" \
+		setup.py || die
+}
+
+pkg_postinst() {
+	ewarn "/usr/bin/cmark has been renamed to /usr/bin/cmark.py due file"
+	ewarn "collision with app-text/cmark (see bug #627034)"
+}
diff --git a/dev-python/commonmark/commonmark-0.8.1.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
new file mode 100644
index 000000000000..68e34aca47df
--- /dev/null
+++ b/dev-python/commonmark/commonmark-0.8.1.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=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python parser for the CommonMark Markdown spec"
+HOMEPAGE="https://github.com/rtfd/CommonMark-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-3.7.1[${PYTHON_USEDEP}]
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	PYTHONIOENCODING='utf8' \
+	esetup.py test
+}
+
+src_prepare() {
+	default
+	# Fix file collision with app-text/cmark, see bug #627034
+	sed -i -e "s:'cmark\( = commonmark.cmark\:main'\):'cmark.py\1:" \
+		setup.py || die
+}
+
+pkg_postinst() {
+	ewarn "/usr/bin/cmark has been renamed to /usr/bin/cmark.py due file"
+	ewarn "collision with app-text/cmark (see bug #627034)"
+}
diff --git a/dev-python/CommonMark/metadata.xml b/dev-python/commonmark/metadata.xml
index fc5b696a8da1..fc5b696a8da1 100644
--- a/dev-python/CommonMark/metadata.xml
+++ b/dev-python/commonmark/metadata.xml
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index 49d72ab81bcb..2259066a4388 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1,3 +1,3 @@
 DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
-EBUILD ctypesgen-0_p72-r1.ebuild 827 BLAKE2B d1083c3eb66ea791152fd9b1342babe99795cd9b9ff6d87dd97987519c5de9259ef77337073cc4b79856005652f4fd01dd7596475cc5fdb489557eecddd4f068 SHA512 41f75aa9f6ef7ea850bdaf111816dfbff825f134b8f5545f8114193f8c7df8b008b4f261104eece9a73f01811095b1112098e16f797532ace088ca2a1e125c9b
+EBUILD ctypesgen-0_p72-r1.ebuild 823 BLAKE2B f5b124923569a694bf55b73156d97a90638135996e8958f2bd3e68057270f0e71345b8f4fdb00fc31ff8a426e6f7316a24269a4af9ef4936d318f89bc0747226 SHA512 9d8369da25cd922a09236c420030ef236f85852fb9a350f734582db0d3ff6b920963fa4dc9afdb16d41002db77e510da6aee2b4b8942211e9efbe4fca6011760
 MISC metadata.xml 327 BLAKE2B 0c2d0845df5c1de25a375b7cd59ba658b8f60fa45224dd02a9bfe864685f3414dd741aef1b3256e2780470e87ae71d46fd872ecc8ad5f801bf0f281a83c04f04 SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index 5e0843d1709c..3f1f7452a12c 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/daemonize/Manifest b/dev-python/daemonize/Manifest
index e8e590f582b1..56a5d9a0e01f 100644
--- a/dev-python/daemonize/Manifest
+++ b/dev-python/daemonize/Manifest
@@ -1,3 +1,3 @@
 DIST daemonize-2.4.7.tar.gz 10096 BLAKE2B aeac5b0c0ac3dc0a1a069f3b1bdcc81bc8cc6703c4650ee6b569f6ce9caf6255551655e41a94406b1ff22817ef2f64d7826ad9491cbe1b0591e357141f34f06f SHA512 33c32893916b9bc45949bb4115bc8aee2eacd809535783eb7b07d3d3ee162ea969da5a739078f8b061e89da52e8da468f9d7fe916dd4f9d7dbea7012c2955e9d
-EBUILD daemonize-2.4.7.ebuild 457 BLAKE2B 06d131875c27ca68fa0c8cba2154577748fca2f21b28e8e59ba0543943ab5cc8f8b9c9aa978d20d3045f7bfba0dea4e34dcf8aa608c8d038629c790a5b10b610 SHA512 7a3d533a6965809eb1518482da18e432b5912c99bfdafc4f0d58e49d2aa4abfb1e8121610fd98ed87aaea7e59ba6a75f697b0b72b1cf91f44e65b12ea1f8f8e2
+EBUILD daemonize-2.4.7.ebuild 467 BLAKE2B be33a2d6711e30c43993cdc389f63de65c6614622c2166bc2c95cbb74ba4b7dc01a19a558429863c0a8271bd0d364b5248a616aa1403e98321b03779f506ede7 SHA512 c3d0aff4707e4e71ea130215fbe33fea2bc46756e2bc6e641b722ba639d2f0c4509e7d455185843c15bd897a2ad55098b008e34106490f43cb40fc723a9fe0c9
 MISC metadata.xml 377 BLAKE2B c8bc7c4e33e27cb2f208673e213460e02fa448f41226b08324f44d700d856be8b1bd408dce6f24dbdc1ffe8d2b15d99f56160fb93727066d887362fee7a532db SHA512 7d2e4141f084e93515957fb82473b1504b53c5082063b3f4c97fc1d326bc03b589405df8b3f19f8f926656fd52d7972b1b95a479c045d8a691cec255bb95d4c0
diff --git a/dev-python/daemonize/daemonize-2.4.7.ebuild b/dev-python/daemonize/daemonize-2.4.7.ebuild
index e186dc2bcd22..8a120a67f65c 100644
--- a/dev-python/daemonize/daemonize-2.4.7.ebuild
+++ b/dev-python/daemonize/daemonize-2.4.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index a039ceabd81f..b13f011a0e5b 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 1657 BLAKE2B 6852964adbdeb9cb39f26c19c12ae810e5af4e6919bf7eeb973066fdb43311d5f88f54c5772626c7ab0819759e41fcb132c722e97999c8202d197356721d14aa SHA512 00bcdbffc06a5c6369b619f34738d9afc4665dafcf8d8d794ae5a52c065b7bfd7e7425f68e19c26939f16f22f09b5b74ea0ea43856ad8a18703f302222b668b2
+EBUILD dbus-python-1.2.8.ebuild 1664 BLAKE2B 21b843ec9b7d2eabaaa2f9dc132a1f67ad5edeafc5c454ed6e23489c7a1cc5dfb1efb984a949c49421c198a3d58c3a5780cfe3dbe97dd296db93b1e6245e5a80 SHA512 d08825d0b7e0712b2df9913d3c675f65c012065dd0ec10963e3c3938ad462e5db5aae2d394a7b82056c57e06dd18b22b9bf50275ef4417d94be83dd2f3ba2dbf
 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 b3a174b9cf04..dd14d3ba6b4f 100644
--- a/dev-python/dbus-python/dbus-python-1.2.8.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
new file mode 100644
index 000000000000..8a9f6a31bfd3
--- /dev/null
+++ b/dev-python/defcon/Manifest
@@ -0,0 +1,3 @@
+DIST defcon-0.5.3.tar.gz 439149 BLAKE2B 5407eeb8c9bb8e63056d0d42e653eb3bad793b17139fc31f153b12f7ae604aa6615442556f5360f84cc29dfd9674b8117a9022a1e4bdc62324c31378b4c075f1 SHA512 5975c2c0054a1c5d067414b5fe02dc4546fffd12d316c6773ce48425276d7ca7b4e132b772fab2ebc4e683170d02592e1917a67f0dbad64a4c2f2a6a3bfae9ce
+EBUILD defcon-0.5.3.ebuild 576 BLAKE2B 89f6beffdc27454d2e09a110e0fdef48ba3c3443d622db27032ac56a8b316a88e6c03ba5942dc7b430e2e9cae793624750da7cb02a4116265d01c6dfcc436580 SHA512 15c083854d7e5cfcb7d2c3869cab40ca0f152fdb4078fe505c4bb01d599018653afdb2a9ef9ab68d217984a8d2666271cb2eec7d8d0aa8860c112c9ada7397a7
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/defcon/defcon-0.5.3.ebuild b/dev-python/defcon/defcon-0.5.3.ebuild
new file mode 100644
index 000000000000..08be7e8bd1fb
--- /dev/null
+++ b/dev-python/defcon/defcon-0.5.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="A set of UFO based objects for use in font editing applications"
+HOMEPAGE="https://github.com/typesupply/defcon"
+SRC_URI="https://github.com/typesupply/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	dev-python/ufoLib[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/defcon/metadata.xml b/dev-python/defcon/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/defcon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 83b18cc67e96..90ed05192894 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.7.4.tar.gz 61901 BLAKE2B 70e4ba2b261d2007f80e52c43bf3fca4b41d2e53067e82aa46010334450b2a81723045f377956340d7b7d4388e829b8648a267a89c7ba69fd1ce28ca1f42ca10 SHA512 7ac9a25ecb46f0556acf48c1427154d3282a59185640aa85f2ae5d638d4b7fffea5b53a1964c621751e42d1d45fd6a6d5c273e1c850e2e473159bd099394e24e
 DIST denonavr-0.7.5.tar.gz 61972 BLAKE2B 17a6d7079cfea1f349b4ca2eafdfadc7cb1731737c9319d60239710e27608da1bdb0101fb36057a8618ceb0f2573aefc7b14932171e6e5ed2f393dc681f62ea2 SHA512 441b256ad34d7e998381a48d34296404418a8297d24fa7f748540e8daf9b067ca7acef4d04289665204ff1cf63e75333d4d49d173cf0eea42283e6eeedac6de1
-EBUILD denonavr-0.7.4.ebuild 739 BLAKE2B b17948d21ece30d16b9d1b06d8798e148b72f3ed28d7d9e384efcdb9341af44bb4d9af4c89e989b024e54275a100bcdc1345e1b13597fc5aeeaeaa1c045986be SHA512 281143ed79912e720b465d2b7709b47c3d3eae7187f3da4c9a8dad0739d5bad78f2a624667c60d67a2d4d557c4bc74f2c5ab3fa88e41d91c50bbb4bd0b23b269
+DIST denonavr-0.7.6.tar.gz 62285 BLAKE2B 45004465f1d8c371535c0e64b5d6decb224a80a986a5bfb1a960d320564e28a152a06c3c5375013261110a1d7c23ee301166580614dd1a727dac296c38b38899 SHA512 87c35325e46d8dc3129366dc45632705157e793d3faf4377f884b1d40430047fc2ff2613a975d6223a925c8c83c807454c03331b706a2d06474e649bbdb85c10
 EBUILD denonavr-0.7.5.ebuild 740 BLAKE2B f34d099173d6731367dd853519efd276eda64f70692a703cf08bb12a474427e670d858c4a3e7969cb19706bb9ec9c0a7315d88d43320265b9f667d9c26497d55 SHA512 9fe357f3e60214b998e1a59ef3d1c888be2acfbceef0a42ccf1a9aef8ea09054a30a6f0ab578e20d0389b54dd1fc8de99caafdd6685435689d6e3b911fd4ccf3
+EBUILD denonavr-0.7.6.ebuild 737 BLAKE2B 6bd02890359a2513508e06e324765385552092882605166c28a3c641c2a7f06c253c659559b06ed76e86f01c98649061ca9d8b8dfc05de53bb2fae7dc3138b61 SHA512 e584987d381b2439101ee760da869bc6efb4e1f8ede5f835989792538769f527260b6fd3decaea24c0a7aacb1d9dd693d82738475421ef974920886fc4811274
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.4.ebuild b/dev-python/denonavr/denonavr-0.7.4.ebuild
deleted file mode 100644
index 6f32967db35f..000000000000
--- a/dev-python/denonavr/denonavr-0.7.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/denonavr/denonavr-0.7.6.ebuild b/dev-python/denonavr/denonavr-0.7.6.ebuild
new file mode 100644
index 000000000000..6d935e83ad72
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.7.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	pytest -vv || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 491e1236f579..3893e620c0ce 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,5 +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
+EBUILD dnspython-1.16.0_pre20180731.ebuild 1226 BLAKE2B a67046b2f2e4a0a0d84225bd084a11b1fa4bcb045f425de3f2e9aa337e759c85c08d100e2d0d8713646cd4a5c10e65d0c7e7187ef637d241e4aad87628975612 SHA512 696f5e82e492300de104c652c0218fa3bf021f2f859fb8b50bd6000950182d633ecb54e126fad0328f5679f23cdb9bbea99f1d9d8e5dd2c00e3e7b08251675a4
 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
index 1d9163245a63..c488c69b30dd 100644
--- a/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 890514b7ec38..e36f64006c30 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 776 BLAKE2B a7ed4e78008b95a4b924900e40da06d83dcd41db08e7ed820d05b31ee96bb58ae7af0c4ec17194e68d07a6351537a082018844b68ee2d19d1fcf4fe2fb7adb0f SHA512 cf7f86d1e02e323313773f706859358934e03329dc27c9781167ee8fefe288dc983c2c081fa546ec5c52610e23e731674b63eb98e0f16b3b7a21f22c51a9e9ac
+EBUILD docopt-0.6.2-r2.ebuild 783 BLAKE2B 1b1a52edde01ad371bf7639a3ca048824594b9dc789ee91adfa06a72711766f4ac264e3be1667f46084abdf4b9b1ad89c0a2dee9b57abbacd90a35dc5d7a58c0 SHA512 a53579ebf10cbf0af0156377c84346efb9a43283977836e38651444daf95ff15455040079750ef11f1d1f34da5c0f38b5c6ed71729ca64c777a33be22f76391b
 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 2851613c91a2..92c9b8f77b03 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 arm ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index d35f6b32b749..ec24e1300487 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,13 +1,8 @@
 AUX ebuildtester.bash-completion 501 BLAKE2B 55a6ddf54f05c2958fad5d3abc6ea1cf65de1320e5cb6aff14eac2755b1fafaff1df6ea5e813135d66f96329c806a3a3db326f3ed988c09973f20297b6dbeacf SHA512 a5fd613548258585fd6ff9905f9fd4f87517d6821f4e5da8443f1f83a666ddcb40d0e09b305505894677c3f9feb1826e8f2e0ddb8af238000e3462d0da236530
-DIST ebuildtester-0.1.10.tar.gz 12912 BLAKE2B 8d1c28c14dbae7d67b718fd957e6d7c1e1d1c996f77d4ffaf8feb505424c533996858bd7051331111d955d772106c3924f81cc1c2490ff9ac7068d10d838d9fa SHA512 f238fac69415e3a7e0a9ca684aa16ab3a3df5da71daed49a4d6d57b76a696af9089079b995da667d1307b1d4646e7291b8e86777f0486af3b51a8be435b8fe16
 DIST ebuildtester-0.1.12.tar.gz 13608 BLAKE2B 4ba39f8317028f906da54aca3a3cab466eeeed9b223a93e56b25dd8212c5266e593dbfdc96f8babfc3569bd9bf676ca255636ca1d285481972a794dd9d8208bf SHA512 62d9245c0e6dc428d3def73266aea83b73659318a5a771062b5dddb634398bab62ae12d8588c247377e84a4ba4088b0ef0cc86ff1d5774a306c43af8eb6fdecb
 DIST ebuildtester-0.1.13.tar.gz 14687 BLAKE2B d88c739707e6bc0dabaf5f03eb94a55c98f73b2dd23f311df6101556899b9ddebc4f9d40715ab9d2c2a01018fa121589e707afc28b59f18378690a9176b48c75 SHA512 88ebe3218d795e395eca2d048f74bbc0bca7c304e3b70d5a04e07256e8d8ae66feadf37d196f46523b9589ec9748aa47f8807e15479b9dd9f42871819f1523f7
-DIST ebuildtester-0.1.6.tar.gz 11350 BLAKE2B 2dbc73a080cb0e6334e1e852f67dbf04e646030714f706e2ac355aac30679bab4e8420d31072d6c6de85a6dda5c2d4d412643f15cc2692f19b1715b22350c259 SHA512 68c877d9eb5dcd0ec21781e92225b3e360ef4fce8aca18b166f1589ba57eaf26e8d9af859e325e1c7c0f80640389a6da137e1fe5920b9be4aa9d35e215d7b80d
-DIST ebuildtester-0.1.7.tar.gz 12257 BLAKE2B cfa936bed77cb9a1e7be55055d1feacbd29d10167a7a4987258d197621ee48697335bdc67e1006ea2b6524397a2ad107677aaa70d1fdf8768ec024959ac9aa08 SHA512 53bbe3c6cd502c4678cea62d3743ff61ed055d5143a5074c9ac6b136aa05692bdd082467c309ccffb63ad1ba25d88ebcaa1562333ccbd73f4191233c22ca6261
-EBUILD ebuildtester-0.1.10.ebuild 676 BLAKE2B 19e4eeb9e50aacd6113315a12c1b09091a84a55d5e553a92bb4f0cf864ef74421ea7215c532c8a85d1ccb097bd40f8740901e50c8dc83ed1aba7d5e966283137 SHA512 793dab26a447bdafae2bb7dd4db9da38331ba6c125b5cec30806ac40714cbce9a60f02609ec8bd6e02d2253788f61cf4a68a2c83b541d2dfaae6337e134db68d
+DIST ebuildtester-0.1.14.tar.gz 14601 BLAKE2B ccd2b921524dfb2d6bd1de862292e4f918d14acc806838018f2571a691be5f8226c5666a53e367ca687b3153ac8f568e13b3112a514afccb24c182c96535be81 SHA512 e01a614b00df8e1e5bc5a25e61cb2154c4f39caf2b42b2ba3c8d69341a3f105fa80988f6afff305a96a91d277b6132f00426cac290893d16d2ca2f37f4573011
 EBUILD ebuildtester-0.1.12.ebuild 676 BLAKE2B 19e4eeb9e50aacd6113315a12c1b09091a84a55d5e553a92bb4f0cf864ef74421ea7215c532c8a85d1ccb097bd40f8740901e50c8dc83ed1aba7d5e966283137 SHA512 793dab26a447bdafae2bb7dd4db9da38331ba6c125b5cec30806ac40714cbce9a60f02609ec8bd6e02d2253788f61cf4a68a2c83b541d2dfaae6337e134db68d
 EBUILD ebuildtester-0.1.13.ebuild 676 BLAKE2B 19e4eeb9e50aacd6113315a12c1b09091a84a55d5e553a92bb4f0cf864ef74421ea7215c532c8a85d1ccb097bd40f8740901e50c8dc83ed1aba7d5e966283137 SHA512 793dab26a447bdafae2bb7dd4db9da38331ba6c125b5cec30806ac40714cbce9a60f02609ec8bd6e02d2253788f61cf4a68a2c83b541d2dfaae6337e134db68d
-EBUILD ebuildtester-0.1.6-r1.ebuild 666 BLAKE2B ab0a1d3b3f790a1ff0bdfeb5e754dcebeada2814b9099f56a345fb4def30d4f55e9c0a316d88e0b0bc7f00e5fe94e8771e5992762a4ce3f456700099d42971b7 SHA512 ad1108482b911ee746fc627ef4dc363926a404650d3c88b879abec82dce377f883e3bc4c27e96ee1caa637010d02cf18c7cf973b91d386815d994a6ce731463a
-EBUILD ebuildtester-0.1.6.ebuild 508 BLAKE2B e079d1f3db025e13346638417bf27f4f4afa870d70bac21667a918af9320038db9d32369da2b55fbef4c849dfccb172e18bd59aa7797107fe564038dc75b621b SHA512 b7afffaef484458f18db0fad6016a838b6ad0653492e3f9daa22c4d0213eeeb73c7a5bf884ed3373326f3564ae02bf619258ea5b101ef58b161198a84b026ecd
-EBUILD ebuildtester-0.1.7.ebuild 666 BLAKE2B ab0a1d3b3f790a1ff0bdfeb5e754dcebeada2814b9099f56a345fb4def30d4f55e9c0a316d88e0b0bc7f00e5fe94e8771e5992762a4ce3f456700099d42971b7 SHA512 ad1108482b911ee746fc627ef4dc363926a404650d3c88b879abec82dce377f883e3bc4c27e96ee1caa637010d02cf18c7cf973b91d386815d994a6ce731463a
+EBUILD ebuildtester-0.1.14.ebuild 673 BLAKE2B fb2d202baeb5734b3e2db1667edff0347f227f6e33cad57912cbc83e1e3830273eb9b96931db4e70df0127d39f906c64f10a73d14f230efc2d2b30b4aebca800 SHA512 907575a642cd22324132ae0a13ba5bf6de80a44d4189d5a2d1c6ee2b24963baae814efeb288f7370ce736bfcc208bd374001e5d1fca262021dde73c09283d4c4
 MISC metadata.xml 222 BLAKE2B aa232ff5c60f78800795caafa7e9ad7cf285afeca45a8d7d5d95808dbadbdd6dd1e7ca04ef38eebde2b199302691fe8cb0f1428150be4b29a8660a4f30f75709 SHA512 7dd37880388ed41ddfd8eddc790e4e800039bc34fcf03baf6d77865f081b3a8cf425060ec9a77182479fec918b7d04ceead69eae2b357f0fe7481be42adfe1c0
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.10.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.10.ebuild
deleted file mode 100644
index 3f9b13bcc09d..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.10.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
-HOMEPAGE="http://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.14.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.14.ebuild
new file mode 100644
index 000000000000..2cb7371a4528
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.14.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="http://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	app-emulation/docker
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.6-r1.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.6-r1.ebuild
deleted file mode 100644
index ed8da344648e..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.6-r1.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="http://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.6.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.6.ebuild
deleted file mode 100644
index 0eec6d900f30..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.6.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="http://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.7.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.7.ebuild
deleted file mode 100644
index ed8da344648e..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.7.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="http://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index c29788d7977c..75a38899d559 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,3 +1,3 @@
 DIST ecdsa-0.13.tar.gz 55579 BLAKE2B b8fab652527f945820b87931477d431bbfa605ec123fd5fea313b377edc118809c4109737ec6f6a97fb536f4aad193a4fd3154401d40f26fe05a336ab730e33e SHA512 f21d4d196404455135a1a2255c889ffa26160ea1e9b9d16c914ea82614831816acb6d27c86aac68cdaafa8b1d5fefe065b5f49ce45acaae4a035cd7f08a97594
-EBUILD ecdsa-0.13.ebuild 620 BLAKE2B 102aab718680fc16ccb3361de579f2dc00635736a7cb78aeb07a30a3e6efdc18f80fcd65d043bc92c26c4fbf8a88ef59da2b361c37c0d31966af72ae848aee47 SHA512 10a1076717a4f3c8e8b2432c77679d468efcb6b78d77bccba296daa414967c9ec742a90ab3ea1d8215d9984b564df3e41103f36d1a056d3d033a5cdf10f8455f
+EBUILD ecdsa-0.13.ebuild 619 BLAKE2B 46c6df0250fe6062601df8e4488717cd6dd4a6f092d5be451e96da6d75ffc43a284cb1d73b95fdf6d5278ac49257cea476dd74a72b298061aea5f65682418b04 SHA512 3aa23d0bdc3b9f8a450740b856fb35075bc88f5e62b9865ef209d14e1b5f8f8cbe3262bf3142dd2937b540c3538052333ff7008cb52d53e919ff2901dad1dd5d
 MISC metadata.xml 638 BLAKE2B 70c66edf039ec739f21145846f74e2306ce879551a2ae39a9321b53a6f5a636235006146c2049dae41ecf3b77dad887f88f45cbf67ead493288570b4b79c6d2b SHA512 b08361b7b3fca4f1623aa71fe1090e3a8890f7b475ae2edfb5f0d7d2075be226e9826ad54b90756060be1d58aaa03a942d39834bf29c09338359b402db5ea7b8
diff --git a/dev-python/ecdsa/ecdsa-0.13.ebuild b/dev-python/ecdsa/ecdsa-0.13.ebuild
index 231b94165cd8..3f06e8c1e58c 100644
--- a/dev-python/ecdsa/ecdsa-0.13.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index fc1ec1b65fbf..a7e33e747e42 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,13 +1,7 @@
-DIST elasticsearch-5.5.1.tar.gz 33476827 BLAKE2B 4f37f13fcd0a236c5da5b74c4eec5ac9ce40234059643bed69b56e93a9d5b9758ebaf0f6d50155b7338c0c203cdd7296816d6c7bc5cb0ee5455e406e586c4bf8 SHA512 9bedd48396cdd6c39c107a7951eba8446b8574493bd44c17a79ba3443670a48b72c053006821cf69dc17bf49ff1c05904db14a07d8a6403b2d2061fc605937bd
 DIST elasticsearch-6.1.1.tar.gz 28462503 BLAKE2B a3ac6edf6ed110fc3832bc6b1c5e4d7acbc67ee2faeba35d9dc7215bbcf10fb3617cfbc050687d7361fc4b6f644afe9cbfc23591b5ae26e692f38dbf13872e7d SHA512 dcc23ef80ad2545490508d3e9db2fd0e6ae9a99cece0990f537c522265961dad234734548d1d86288af7f65a6ee681f5624d2c0e71df0e1dcc32fdb56dcefe92
-DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
-DIST elasticsearch-curator-5.1.2.tar.gz 290616 BLAKE2B 57c02ddaf188b8dd08286e47d4eaf4e0af05d65d89139f77f5d71274c394defe491393a7043bb426fa4b260c199e92221c1e57b6d24922898e5e3b8e9e2de58b SHA512 4ac0ae789fe662d352c3d228acc6aaf78873bb02b7108f985fd0a048d0b90cb2b30572eaa5f984025ab0d4209eda9d6fe6ac66cd8cc856f0707e3f12bb2e574d
 DIST elasticsearch-curator-5.4.1.tar.gz 294363 BLAKE2B 180882cee9ed3424569705beda727f823cea0cfc47897d06b1cb8258166e40fc9913eb266481b09155a0f5f88b52a680b9187f69417983c2d78b5d24874489c3 SHA512 a2f187d99ebcf8069bfd472316aefe501719400268120c250812670e5525209cebffa913f5fb988305d963bb2a7b61cf47426905b856e34f41afd3a9d67d28f3
-DIST elasticsearch-curator-5.5.1.tar.gz 301351 BLAKE2B 1dfcf53995c203a7201e421bc9f01a840597d8c1099ae434be52ff27e47e30f509bf1c5a42d507b549f5fe8ce45cbe74614ea76c338b0ae9de1d51877c8b32fe SHA512 a0ccb35fe93cefb927020add9629d5879cb64ee41a25130150ee8c45867e210f611a5fca0a43357c6f68cbf0c3f0acf677a7f8d2b3b493f4c2815637640ed9f6
 DIST elasticsearch-curator-5.5.4.tar.gz 221161 BLAKE2B 41828800dd9237142767d3163b3d87770ea5b904858991598cce2feb7c3a22d85c0d73275a2f232099ea82e7346fc20080a3bfef692ee808b730d3e4e6de405d SHA512 99ed18592105d19791513ad713115b6e2a6b589ab8b4e3fc4435b2878e25f552e0bda8d63cb6279970afc6ba39d9f3db17af1b4fb44500fe8a14b060e1530258
-DIST elasticsearch-oss-6.3.1.tar.gz 29417012 BLAKE2B 356665cde2f12ae5813d95302398f5fced07c53d25e6e1dc7ad41c8dc8ad42cd3d5bd4ffa6cab24af8088c29800f6ec59a483710272b756af2f76b5967d4b932 SHA512 3df0f7f35e150198f7ff660cf4d90fbd1c2ca587287c6340d427f968711b6390123bfafd09a744c9bdf328d57423bcb75f6e4701ce14a7257388611abea62545
-EBUILD elasticsearch-curator-5.1.2.ebuild 3228 BLAKE2B 92a193fc2278315ff7cc67188600a48d3a2ecc98968bcf011b90debd62eb3b2fa728eccaf85d476bd503eaac10e48eeed89518b9db95f299bc980a50858c5954 SHA512 405c09c900b116bcac6ac2936e27bb40e7b97b9e804b30ee55fb3c92b95f61caa607268e5f264eaf941d47cd53857e9e6549922fda9a4da299e079f4b5141205
+DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
 EBUILD elasticsearch-curator-5.4.1.ebuild 3229 BLAKE2B b43563ab3e0cde11ce7823a0dfc5ac2dfe6d3ebfe726859734153a63007a872d4b6ca74a8988aeb59cb8e502a8c479b4fb4e212b4eb711ee100f99cd8cb4741d SHA512 35f0749472eb1117d6086b2f0733f4d5c191ecc5e0270ddc6a3b03f9ab1955592d2417b1fbd29f546b231cd718049a782b2ba86aef0869d99d64702e20c5ea5a
-EBUILD elasticsearch-curator-5.5.1.ebuild 3358 BLAKE2B 7e6584f2ce49718446931ebc79f9552137d34a975101d70df3e7b6bbf849f6ce8c016464813422dae83e6839dd9ebbd0e93496e84a97bf9edbcce185c77e24fb SHA512 064a58f3ae727a9c30c356b77148856e8e42eb4059bf01a7e972747ed41041962127673a490783d10dda5644685352a35bb97ff7486278f25d680039c65d7ee4
-EBUILD elasticsearch-curator-5.5.4.ebuild 3396 BLAKE2B 0a5d235cbbb632cbe4bf3351e1cf0005fc45475069670e04ca74b842dabec2c26ba509942414841034996d84f1f57cbd87d498e3fb778823c926e1aa81f964d0 SHA512 ab4f09a87ce7f819bb8a305c8431bcce63a96035626a81e9ed91b8ab025ed8c9fcf765734aaf70d9b0c5c386383b0a64cde63690657fb7739122068641771e3e
+EBUILD elasticsearch-curator-5.5.4-r1.ebuild 3670 BLAKE2B 6a4895ac1f709e3a700a489de3f9cfc73fa20a53013bdc9a5bbc8af4a91d6507702096d7f1bf148f3cf614564e3c597951b4eaa2bc98cbcbd31dd8bbd8e90214 SHA512 9d8cce68c940ebfb8d91dced1e408a0d22c2314171f80c9d03319e26abccc4a7d81b8e6428c78a046340bc049fabf16d10af0eeba1979df65376d4a5f77a4a64
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
deleted file mode 100644
index 91d448a28e3c..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-MY_PN="curator"
-ES_VERSION="5.5.1"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-# running tests in non-chroot environments:
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
-
-inherit distutils-r1
-
-DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.7[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre:1.8
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25123"
-	ES_INSTANCE="gentoo-es-curator-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" "${ES_LOG}" 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_prepare_all() {
-	# avoid downloading from net
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
-	ewarn ""
-	ewarn "Example usage on Python 3:"
-	ewarn "export LC_ALL=en_US.UTF-8"
-	ewarn "export LANG=en_US.UTF-8"
-	ewarn "curator ..."
-}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild
deleted file mode 100644
index ac00f389bed6..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.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=( python{2_7,3_4,3_5,3_6} )
-
-MY_PN="curator"
-ES_VERSION="6.2.4"
-
-inherit distutils-r1
-
-DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.7[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2018.01.18[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre:1.8
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	# avoid downloading from net
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
-	# allow to use newer dev-python/elasticsearch-py
-	sed -e 's/elasticsearch==5.5.2/elasticsearch>=5.4.0/g' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-#
-# running tests in non-chroot environments:
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25123"
-	ES_INSTANCE="gentoo-es-curator-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" "${ES_LOG}" 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
-	ewarn ""
-	ewarn "Example usage on Python 3:"
-	ewarn "export LC_ALL=en_US.UTF-8"
-	ewarn "export LANG=en_US.UTF-8"
-	ewarn "curator ..."
-}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
new file mode 100644
index 000000000000..2c9e4be06f93
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+MY_PN="curator"
+ES_VERSION="6.3.2"
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+IUSE="doc test"
+
+# require >=elasticsearch-py-6.1.0 because starting with version 5.5.2, the package
+# was renamed to elasticsearch5 so elasticsearch-curator cannot find it #667526
+#
+# require <click-7.0
+# https://github.com/elastic/curator/issues/1279
+RDEPEND="
+	>=dev-python/elasticsearch-py-6.1.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	<dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2018.04.16[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		virtual/jre:1.8
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	# avoid downloading from net
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
+	# requests_aws4auth not in portage
+	sed -e '/boto3/d' \
+		-e '/requests_aws4auth/d' \
+		-i setup.cfg setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# running tests in non-chroot environments:
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25123"
+	ES_INSTANCE="gentoo-es-curator-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" "${ES_LOG}" 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4.ebuild
deleted file mode 100644
index 765bcfef370c..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4.ebuild
+++ /dev/null
@@ -1,123 +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} )
-
-MY_PN="curator"
-ES_VERSION="6.3.1"
-
-inherit distutils-r1
-
-DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/elasticsearch-py-5.5.2[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.7[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2018.04.16[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre:1.8
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	# avoid downloading from net
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
-	# requests_aws4auth not in portage
-	sed -e '/boto3/d' \
-		-e '/requests_aws4auth/d' \
-		-i setup.cfg setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# running tests in non-chroot environments:
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25123"
-	ES_INSTANCE="gentoo-es-curator-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" "${ES_LOG}" 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
-	ewarn ""
-	ewarn "Example usage on Python 3:"
-	ewarn "export LC_ALL=en_US.UTF-8"
-	ewarn "export LANG=en_US.UTF-8"
-	ewarn "curator ..."
-}
diff --git a/dev-python/eradicate/Manifest b/dev-python/eradicate/Manifest
new file mode 100644
index 000000000000..941320c8a7e4
--- /dev/null
+++ b/dev-python/eradicate/Manifest
@@ -0,0 +1,3 @@
+DIST eradicate-0.2.1.tar.gz 4357 BLAKE2B 8dd1854cd5a93940365048c1adcd8d05ac25cb511a14a278c083be018770088ad5bb888195ad474776026eef6c41405b515d5661244998286e8b9c29c01ea883 SHA512 726db51e1d5ecc89a256e2c28835c20e60f4f42cef55193ec8cd3323c06f00e7c1bc270517baebcd69a145bc189f392c96d60b4582f48aef10ece05582942167
+EBUILD eradicate-0.2.1.ebuild 403 BLAKE2B 3d61e2438734cb7f434cc541c3230671ca1bfcf97f823b410019b068d6666f0fa06941af5e8c1eea90215a4ee4a8b447a646294dc8072ff2813325501668dd79 SHA512 6f07c7fd6a63886131d2f9e49e9f27db018592f9bfecb10ebb91edd4a064d23046945e65fec8f423c5c3ee7870195a5ba1867ead2d65e027f2d21763c2cac197
+MISC metadata.xml 371 BLAKE2B 924c04cdb095b17bac52491203ea5545d8aa7450aa910e247a6cc48f6180646a7149b161e4dbeb10b2489bdd39ee056383079a7892c12c8a524219d750b0003f SHA512 edb9d679a9edbbde36b66a12764c0e625b33087c7ad5b89c719c364f08f359862eb8f091c69061ab54d38ff2b83d53f660c6a3e0db03bf6408978e145b75eed2
diff --git a/dev-python/eradicate/eradicate-0.2.1.ebuild b/dev-python/eradicate/eradicate-0.2.1.ebuild
new file mode 100644
index 000000000000..9fff1fea76b8
--- /dev/null
+++ b/dev-python/eradicate/eradicate-0.2.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="Removes commented-out code from Python files"
+HOMEPAGE="https://github.com/myint/eradicate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/eradicate/metadata.xml b/dev-python/eradicate/metadata.xml
new file mode 100644
index 000000000000..61239fd850db
--- /dev/null
+++ b/dev-python/eradicate/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">eradicate</remote-id>
+		<remote-id type="github">myint/eradicate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 4668826e5a22..81e7f8577157 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.0.1.tar.gz 8427 BLAKE2B 39677f4e8101eee012427bbc2959a187bee96bf052e14c47a2d5fc9000d62243e3842ce20953f7541ca534b151c025ee8cd8da96ec8bd82d926a21c68e8a0a04 SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b
-EBUILD et_xmlfile-1.0.1.ebuild 677 BLAKE2B 497c49707f669f0f4814f069679a9141a2ff63f64ed3d2af2143792cb2efd583a52349f61b2ca3331079d2ea90a2e738d0cde24b201720139570a68e981fc5de SHA512 e4b6de0bec677248c208573a9f8074794e89de9d38f373b85f28626d40c67475548d5d2c3488f2324b1043fe2f5ae5f38d3512659f2e4df035a103a4b3e718a9
+EBUILD et_xmlfile-1.0.1.ebuild 679 BLAKE2B a0d4c26f40dee783013b2d0540c92c33e176615414c8a80a1111ecbcc0bf9f8c712ab3e59a39ffb8ea94825b49ce5b3fd463dd99a3a1948f78a8050d2400e8f2 SHA512 215026d67d3dc653395a434845d059eda27f7d5fd803684f760bd9fa22ca6f4515386f9b25eb434704c6f8bd4307bc6359a4b81f4e6482b19c4d090ab51ca514
 MISC metadata.xml 387 BLAKE2B 3845ddfa1338a00f43db111a459108eeedebd0946dc93ef359f7dc01a005acf19d9985d7fd508853bb2a44de18579018450bd0f56850766bb7afa542ad8adec9 SHA512 777c9ddb70e315fa3d5a943a4037b2876361f9ae53db8d86fd84453d2ad21f10882e79b3f9148263bc2288e77382a04614a006797a35f8da810104063826d244
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
index 0e82eb214a0a..314e0b888701 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 0321a7858a89..92abcb1d05ed 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -2,8 +2,10 @@ DIST eventlet-0.18.4.tar.gz 288920 BLAKE2B 497b5e154de495049e477ab54660fa4e5af97
 DIST eventlet-0.20.0.tar.gz 466828 BLAKE2B 43beb8f924c5e375a554db3fb90e3c39121ff9899aa1a214118531e3e6fa7711899f278b2187e1e61409a58c05e9bba1a8a6392e1b31a811ef1f32dd7b929016 SHA512 4be70ba8cc3ac76d424aad66cd214e97249a42785319b992d048a77cd26f53a428f7959596d07da9a88c92ee103d73d4990733fc00bca57cc8fd242041365348
 DIST eventlet-0.20.1.tar.gz 469509 BLAKE2B 727844b70c4e1874a58efc95551dd7f12bec1c8d01cadeaedbc49f00a86e1393b690076fe720e8efdf00107f72b892a3a1f4c4921f95656b904221e748df7f09 SHA512 875c1ca82822a486bf28866c7d1f34df2419e7d33450a21740434d2e7f15c37a1090436cb7fe1feaeb5c810d39e4b238206c502323317897c8a42e844cbe7734
 DIST eventlet-0.21.0.tar.gz 484191 BLAKE2B 07d3f5d1dca11032d51fef9ceb624e07da9e93bed914233da9abbdff27f21f2482b9e3417b50a63f383cae13615c6a781104a05dfb66f28d6ab4e469bce06ef9 SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47
+DIST eventlet-0.24.1.tar.gz 391579 BLAKE2B f8abfe6d18ed3b2edf4b2fa3d197abdd1e9029dd10c035427a2ddcb70cdaa76da114083ce7016af7151927fcb2f93ce6ffa0417dbe1a125948318baaed2f6184 SHA512 867f8ead3a6c0dd692c5cc5d9f1181b04456bdb270ea95d84f7f97da4603b333df539721cda002437c035fac51134bee8cc3495e09b6a25ae1c46fdaf015d0c3
 EBUILD eventlet-0.18.4.ebuild 2037 BLAKE2B 15c627a2b2f5825ed8e2654a21ac67ba9a6283ded875679097f9003d33236533a7256cadd4c5a12dd56d22856c4f018a4cf61ecb95a9e195286c22f64b679808 SHA512 88c1b1ad3be87b7d7ecf5e02b83c7134f9689d71459e0057de369f26aa76f183875c27d59e66090febf0c241d3552fb6584f47278b882cde9cf2979baff6fc52
 EBUILD eventlet-0.20.0-r1.ebuild 2141 BLAKE2B ee5de43d1cfcde83d350dfdf935f78e1bb7a31ea1974850fc7a163e2ee87e69b0603e4e3dc2d5728379128c2a3891b1b5d806f641cd586266e2074384254a01e SHA512 c7dfbedd5d7087fb0b1a3d1f71ed0ba4e6312cf3457f790e3fc3ea09b5d9b9678773fc376d33f6ff6a7d344cac7f1f7a71cd064da39aadb7ea84c560500c8cd5
 EBUILD eventlet-0.20.1-r1.ebuild 2157 BLAKE2B 7908eedcbda5f7fe1efa550a30660d987db09e421d426d10c16bc3e5b6fcf53bd60c9feb32250a15ed90d504898902d150faf363886649dec117b70fb4f72713 SHA512 c44f0f71befb99bcf73e43212f136a46efc36095c0935393baf31c8b306f2032c8ed52dc067ee268af0ea05069eddfb6bbb2f7a72d38a91f4525bcd385dae8fe
 EBUILD eventlet-0.21.0-r1.ebuild 2159 BLAKE2B a70dfa0c5215ba3213ec29134695f9f7b0599c9d22515fc96e828ab653b3421fce63b622df264a70eb8a1eb065f618febac12ff9022150827f2b2dd64d08bdde SHA512 c5ba76b113ba10d526b8d1a83c90c3557cd762b914c5bac70063821dd86465dd28cf4618892b68c4579a1d865faeea87716a631eef41e7eba73eed3682bd4aa7
+EBUILD eventlet-0.24.1.ebuild 2296 BLAKE2B 2900b85a763e8147816c4d596d8613ba608249002b74065de1a8623c9de976820f317e550a395e4361f6f82a4938c194ed6e8663d265666a78893c02f094f3e1 SHA512 2ed8d27d45cc2abe563a4e9b3eb08f4cbdaad9d7d3e4ea0765c213d22240438d6a44ffabf65cabf1ab98b7b017aab08760dbc048ec768ed14c023e618422fc5c
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.24.1.ebuild b/dev-python/eventlet/eventlet-0.24.1.ebuild
new file mode 100644
index 000000000000..1480db301ebe
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.24.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# provided by virtual/python-enum34
+	sed -i '/enum-compat/d' setup.py || die
+
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flake8-import-order/Manifest b/dev-python/flake8-import-order/Manifest
new file mode 100644
index 000000000000..0264f90e4cfe
--- /dev/null
+++ b/dev-python/flake8-import-order/Manifest
@@ -0,0 +1,3 @@
+DIST flake8-import-order-0.18.tar.gz 18507 BLAKE2B 01d9ea712dd5cc4177aec2c1ea2c2dfa72266edfa6b9143657076edab02548058a5bb4642a9a9b7c3dcad36cd76491114cc36a128d57076d09e4cd9e0f1568fe SHA512 8a897d42c81e99d9373fdf03e975b65309700fddf7c38294fe65562ce788e788c9d6c2ec8dd2c8d24e65b4360b3b3577a7a66eb279a5952f8b9d212b06047395
+EBUILD flake8-import-order-0.18.ebuild 862 BLAKE2B 7da4f16ca60c4f002950c53596f98926f9625959d2bdc75e4fa7a6e14532ed461a8f95b1ccee9976d7d26647318296321e69a5361cb61797eac245feea5286e6 SHA512 9bdcf58a14c1fc5e47b811fadfa4bd8115ea8b8482babb3f565dbd450c1a7973d142d12974bc8d36b540741a585cdbc0d4b26c4595f722aff46f16715a12f50c
+MISC metadata.xml 391 BLAKE2B d16fa34c609e11492136a3f76ae408540ae909313b3afafed9a9f806b7addba6e8e5a00453d6dac9a32b6c93c3772ca7a475fa8b5727f2269eba78c32929fa86 SHA512 c485906927b34ab4e97c9361ea9f0a013f5e64ae9888074972a7db50bc3d3d7a592564217e7ba01894fc252690ab05c3029f0ce64fcbc73683f7f4a7ae541e7f
diff --git a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
new file mode 100644
index 000000000000..d06f09a5e6e1
--- /dev/null
+++ b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Flake8 plugin that checks import order against various Python Style Guides"
+HOMEPAGE="https://github.com/PyCQA/flake8-import-order"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+		dev-python/pylama[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v tests || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flake8-import-order/metadata.xml b/dev-python/flake8-import-order/metadata.xml
new file mode 100644
index 000000000000..2bcccd127d53
--- /dev/null
+++ b/dev-python/flake8-import-order/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flake8-import-order</remote-id>
+		<remote-id type="github">PyCQA/flake8-import-order</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 3b4217a0f301..346cf4284695 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,4 +1,3 @@
 DIST Flask-WTF-0.14.2.tar.gz 254903 BLAKE2B dd6b650d97622dbb56cc0bdd3c036f14e562181720ede0c48652b8fcbc88d2d684f013f0468e723b8b0746f2c6f44ca18ffe0ea353594680b47bc1212664ce52 SHA512 9d4b4b24eb24827aeb524699e6720eab384c42901a102daddd9fdc6b8dbc8eebec8c9d31a1e9052c9af4d61bd08eef8ef9dc4cdc8d9b950ff5bdd0201db1dfde
 EBUILD flask-wtf-0.14.2-r1.ebuild 1362 BLAKE2B b5a5723a99950cfbc263776f5c5edc106755f5bc73a681176c8f83465911950de1ccf8f50b28bb30f0750bb3f7da4a30590860a638a96276925923a2e695290d SHA512 308f86f9d237a6fc0ba97b18baa9f9437ba5441660c022801e5b0c4cdc27dd026503b1c20862a3350a789de32836b38c46168d0b522e556d733a06ebdc305a58
-EBUILD flask-wtf-0.14.2.ebuild 1375 BLAKE2B cd7c15f2f84bcd4956aca938b5832243006d832aac5a02723c56655669c66ea3d20212a37c8fb92fbed08530f2fbf3bfa82be7c54c3d05edabc960a070e0eaa4 SHA512 e1c6afcdc1218114d96e0a4da16a93a028cf6f67f551496a78a0a346484bda5d1da9aa33fe78007e0a622afd376bb86f03147133343a99174fef2b91f379c44b
 MISC metadata.xml 628 BLAKE2B ff9c34258d4f106beb1089406a7be3b776e9b60f72fe2885d7141a88096250334bc26c43881853ca5019f3a0b24f306315ac36f303efa28e2921698d8d5484d9 SHA512 cc8c127cf6483396ba9a849683ecbc34527a9d51c8464b8ba523f015244a5a4efe1052691150f8888e4577dee538a1280afab28901be367f8856405bf380aea7
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
deleted file mode 100644
index 102f1593796b..000000000000
--- a/dev-python/flask-wtf/flask-wtf-0.14.2.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-WTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple integration of Flask and WTForms"
-HOMEPAGE="https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flask-testing[${PYTHON_USEDEP}]
-		dev-python/flask-uploads[${PYTHON_USEDEP}]
-		dev-python/speaklater[${PYTHON_USEDEP}]
-		dev-python/flask-babel[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/werkzeug[${PYTHON_USEDEP}]' python2_7 )
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# tries to access things over the network
-	rm tests/test_recaptcha.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/foolscap/Manifest b/dev-python/foolscap/Manifest
index 3dce79d33a52..5792816b211d 100644
--- a/dev-python/foolscap/Manifest
+++ b/dev-python/foolscap/Manifest
@@ -1,5 +1,7 @@
 DIST foolscap-0.11.0.tar.gz 491916 BLAKE2B bf36442b4274943c00df244c2880dbf8f16b67288a6b8391c8f3e8547ab907ff6de3e1dd92e7173c5801349d1f04f3789ef1f95b5baa32dadc3c56d3dd5b5d0e SHA512 577cd15e7f9207a9675999590cb1189edbdd77a2daee5cab80d66d40b1343bcb338a064eedf372ca7f8a102ed1cef0770923d6dea27dd6c3b37c0717cdc912e8
+DIST foolscap-0.13.1.tar.gz 524167 BLAKE2B 4d68b0a969dc90fdabadc38ceb7a912f7e0c25f2c1206d4613d3bc314a907832de02656c32f32bd2361e519476e1178a80c2d4ade7fc1f17caeb6ab7b4b72dfc SHA512 aa77fc22d6c1c32e1361f0ccc42902f25cf18ac917f81428d32f1170b75ecb4fe73f639e8bb641822775326ec920f14308ad7f4c5c01cd8051305fccde9c5e9e
 DIST foolscap-0.7.0.tar.gz 478999 BLAKE2B fbe3979efe8533a7727703af79aa3074f5ff54e4cd42cee4e981d8b2b73c445272792472236a52dc9fa69e9a25bd8cd30972d1fd2f37127db857ce5d5d3e7f6d SHA512 b2eb5415376d4e8e4ee3fd9ecef80a02d195d6b44059e5292c2daa7dcfdea9deafd8678ff89391128244a8d41fb6a69a92f9e4f07cc599f7358783dc8cb70f15
 EBUILD foolscap-0.11.0.ebuild 1268 BLAKE2B 17697a21cb0a1914a37105fb74358777adb430301b08be1a64aea6e3386acc2c70146ce092604b8e2fe9f5f1f81ccf575b6b41891d4aa84c7cafe4648dc32801 SHA512 8f61c6d8e2f9d8dfb5992a639f2e1ffa4441686be755dd603979887b09d335578432c5aa589d5ab07019082d141be2c29fe688ca55f19bc226c1c7b380742620
+EBUILD foolscap-0.13.1.ebuild 1280 BLAKE2B baa2aebad2976eb72c1b172cfabfe836683d2b26ec5026075decf303fad0ac4d8aed978a5f1661464477e6795c93b22c6b855718717564d92d39ed0c9d727d11 SHA512 1103feefe4b6da74d3b7dbb5fdd2bf150e7bb80b73a6212476f50dca69b295e14c274de85ae82eac7160a530a20830331146d4d9a230673a84543af4d14efc1e
 EBUILD foolscap-0.7.0.ebuild 910 BLAKE2B eda252d8f8aef4648d06e3c281fbae305669142dbaf1120482c97899b003721d37545e104c3c0b0c4e52e2da476b8e61fbb91e6609c555202144afa53d69cef8 SHA512 3c181ec3d826f9e1f8c843266e5513341530e4c62533f56107d600da7da08030747c9c1710913b2d66c0fe1441e2e2b418259108ec9d360f1301428d38c2501d
 MISC metadata.xml 1272 BLAKE2B 2e8117819b9d14b123baeb54170b7e166c591af67d1d53911add7cf9cf1d7f5a1e23b00a4f32792d3109750a474c97341ae4d57db400c4884e2c212bfaea1547 SHA512 5509a54a69ca4d5c6898cdf125fc62d974b494dcce9117e9c66fc2e4e17b7f0d07e423739c9ea8b81cd2b3f16012400df9f764a5e2a4ab939edb2f8a3428ced0
diff --git a/dev-python/foolscap/foolscap-0.13.1.ebuild b/dev-python/foolscap/foolscap-0.13.1.ebuild
new file mode 100644
index 000000000000..39dfee6a6758
--- /dev/null
+++ b/dev-python/foolscap/foolscap-0.13.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="RPC protocol for Twisted"
+HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc +ssl test"
+
+# Many tests still failing (#657604), others rely on network
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/twisted-16[${PYTHON_USEDEP}]
+	dev-python/service_identity[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )
+"
+#dev-python/txtorcon[${PYTHON_USEDEP}] will be needed when tests work
+
+python_test() {
+	trial ${PN} || die "Tests fail for ${EPYTHON}"
+}
+
+python_compile_all() {
+	local i;
+	if use doc; then
+		pushd doc > /dev/null
+		mkdir build || die
+		for i in ./*.rst
+		do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null
+	fi
+}
+
+python_test() {
+	trial ${PN} || die "Tests fail for ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 9f627f387ab2..9376b6689d50 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,6 +1,6 @@
 AUX freezegun-0.3.10-py37.patch 2157 BLAKE2B 9d7815473f512a36431872664aae95d9aba815380ec08ed6bd54d764a3e65347c9214fbc7ede39b94964105f8fca2a3127e1eddb9b4385d30788b3bceb2f975d SHA512 1664ce2e1947a6b9b37beb3191ab83f3e7e257f500aa512c0d0d085af34b150fb964b18875faba976f0d094b80681e778a7b06b5251eaa1e811cfb2eaf9a2fb3
 DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5
 DIST freezegun-0.3.9.tar.gz 18118 BLAKE2B 7382646acf0ca8100680cd44d22de3263541031686e05f7957023eaf22f2a1dea370c98f8b6af89a5075aa5636c304e6e7d5a1c64285aa221a73c732bfc5e0c6 SHA512 1aba8ffacc8b9ebdf810253181418bacb75c04222dc59a5e1e526a9f2d97573944926b1b9fcb6c6e6971a7958acaf9b7522c5582190ae6be448c043b6f908c17
-EBUILD freezegun-0.3.10.ebuild 957 BLAKE2B bec9ab1b916ca8d8bd2cf9af1a698cdac8a473fbd9bafc98ba1c99c89a60c6abbc33438ed6cd27920479c1d66f9f8e543fc658747811e8626207994a00c8a996 SHA512 0de365fcdf602cea427ad229b4093d60bcc6ed7d0827664c152bb7845012773510bb24f829aa11d5b3a9fb802b71f0a51a909774796b7f395ba84440a5aa56f9
+EBUILD freezegun-0.3.10.ebuild 953 BLAKE2B 2a6740e075508c29348f0d84ccd20d7c220d1c9b04b64b205a932ec147ce9d8d6009d4491724a36ccfdeda216c058c15cf2614ee22778bc4387c8235de8e9793 SHA512 cd92bc266b8bccc446095dcbd02ea5b8ac8a177f691d0390ceb238ac218f73693396cba3c151eb6c0472ca56c9d886ab9573bce111234cdb81ca520976143492
 EBUILD freezegun-0.3.9.ebuild 654 BLAKE2B a48e34dd3278053d7eb42f73e0e6c226f2c28d0075dfd7457bae59a6913631b0389334eaa1ccfef4535ffca72f3370f0a255f362a26c54c9f19ce37317384f30 SHA512 0060d7b5a703225eae1dc91cf3d5568cbb48926e1f60bc7ee4ae9936a62a7286f974d9887b91af19cc3269779ab9e68a334ab6208f239e5aebf9342a75c47510
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
index c25ac0361722..2e8762982bee 100644
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/fuse-python/Manifest b/dev-python/fuse-python/Manifest
index b612b05e4dea..c9760593ba87 100644
--- a/dev-python/fuse-python/Manifest
+++ b/dev-python/fuse-python/Manifest
@@ -1,3 +1,3 @@
 DIST fuse-python-0.2.1.tar.gz 57833 BLAKE2B 99da322bfbfec193d2e4dfacedfd4e08a885152d1f1ceac19f49288be642c722d7776208dfdef5019b28a03cc00432e898744345041a7d615582c34668fb47a6 SHA512 f89c738352ca23e92b5c0222dde0a13bbee4d86432e9c339080203ed5bf4f885c42a0a3a252ed485f26b569d87e68dc0d78c55d8f7b2f3ce0cbac8afb251bdaa
-EBUILD fuse-python-0.2.1-r1.ebuild 424 BLAKE2B 2dd105c04b2cf555d9002ffe2f9c708198247b21518028ad177d35b82772f8299e6112c8e074ff7f471889fec5f598594116ecd27948d1b4efcf3c6d1044c2c0 SHA512 ff9f02a55327537d0a99b7d874bc6a4118d7d66c9a9094a6b2b407f7a63ec8a2bbd37bae76e83a3e41d250692d6eb06ea6f9805b494a5a3e3957de5432901855
+EBUILD fuse-python-0.2.1-r1.ebuild 406 BLAKE2B 1fcda89353995a57c036f1917f7b86bc416a882ea5ac1ef3eefa7d68c24e943371c155971fde7decf6c417044252febce7a0f774a7a8986853f723d04e843238 SHA512 2ab2f2dd29b167ff026baaa698038e481d2de2266feb87ef9e2c71bc472bcefc5b397bad6a3154d74e6a8774bf855ca3b7a0ff94f72509b38e0112ee8180ed44
 MISC metadata.xml 241 BLAKE2B cacf8034dd7b4cfc624467a8d32b4a0f0b97ebf3ba84ee4572d491ab3da93098f7ae1c765efed3a6c2372cc859098ebf0853753c35d7b23d9c92bcb04e426f11 SHA512 fae6c0b9c2f7b479a2ae029b5e79207756486f5c59a9fc5a2094b239464270eb7a18928a34c11237811a3d1537cd35839778da6704ee6ea3fd806c76e3e6bb6a
diff --git a/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild b/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
index 627c96fe3666..f20fac61e99d 100644
--- a/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
+++ b/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 KEYWORDS="amd64 x86"
 DESCRIPTION="Python FUSE bindings"
-HOMEPAGE="http://fuse.sourceforge.net/wiki/index.php/FusePython"
+HOMEPAGE="https://github.com/libfuse/python-fuse"
 
 SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
 LICENSE="GPL-2"
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 2acc5a6f7ffb..c10239d463ec 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -4,6 +4,6 @@ AUX future-0.16.0-fix-tests-py37.patch 1700 BLAKE2B 175dd229c31768555aef3ed3156c
 DIST future-0.15.2.tar.gz 1583441 BLAKE2B 9c552a5f3598922f8910480d054015020112aae4f7e14d2c139dda13a0b26e878b75eaf5068d66f20823ac4659d85edd4087a95d9474dc27bf15767cf6e9d921 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee
 DIST future-0.16.0.tar.gz 824484 BLAKE2B b098366cc7a7866c4aa4a35f1a6a5cf113698307de8f4cce6c77e4ce72a8433dd102111f991e35ffa920c09a0d31cc048b9502dacd0aba1b701c11eaaeab8392 SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f
 EBUILD future-0.15.2.ebuild 495 BLAKE2B 6796334fd8cb1a1e2c90a4a55c4262bbfba55eab6defad0deb788466ed93790887b38f1e3d63f41baa0b586d7cab5e5731c08cbc4f958ae9799ef7c085ed4b8d SHA512 39de67be4877db5f248267e72642090763473ea15935e69ec069a726a5d4836c1de9efc46626e422d4bb18299b5ddcb5e42514781020417fdfdd6038350ea2b3
-EBUILD future-0.16.0-r1.ebuild 1267 BLAKE2B 4371b204cbe93400f3041443fc411df89dd2cf16239a45c334c1dfa14f48677b53ed5e7854c4bdbf5393e3c3dbe224230d779adef8d3a12685864e9295dbc427 SHA512 d70b38403832a533be2a451225514ccb3af4fb0fc8c795a8fa3f34af65414c693ed1f6841c33308f783e40b1cc15539a92fbddba80dd4ab1e63ec182a1af1d0a
+EBUILD future-0.16.0-r1.ebuild 1274 BLAKE2B c22f1d227fafbf3662c15ec331b1eac6e0fefd559ba4593226ac8316e7388f9f2a6227bca8c9307f2fa5063dedfa9d2ece2d299d83141dc79adbbf292e7ff1d9 SHA512 d03dc0e49c637ad09a7c0d663161d15296634ff59473bed4e5b0de3171e94b2119e1b41565ccc2eb5d4c4abd44dcbf41916bdfdaff7af5db922c0afdadc1d557
 EBUILD future-0.16.0.ebuild 614 BLAKE2B 40f614b47a93320680e6d44e8921cc9e615addd818662b9a03ed87ee8affec386445365c8e9253afe3b7881d451d3badbf1a9ba6ec86455a47beb3fd982b723f SHA512 2f527a66bc8efdc8d5ad0e191af6c8012a96bec239335628ee60ea7479d639f30d3b5de7f5096ef20002f4995becc37d19e7c7895cf41f1f241fd0658ec786b5
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.16.0-r1.ebuild b/dev-python/future/future-0.16.0-r1.ebuild
index 03ae068da381..4eb6715d68c2 100644
--- a/dev-python/future/future-0.16.0-r1.ebuild
+++ b/dev-python/future/future-0.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~amd64-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
index 009896c8f310..b75d2d8bd0d2 100644
--- a/dev-python/genty/Manifest
+++ b/dev-python/genty/Manifest
@@ -1,3 +1,3 @@
 DIST genty-1.3.2.tar.gz 20818 BLAKE2B a3344869e63f4f6e564836fdcf5e36b3184f5df2a20994ded3a20ee0ff1360ea5e9db574bf6097f5b47673fc7db70bb9bfd3238075fb0a3b7b722a6461f09632 SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13
-EBUILD genty-1.3.2.ebuild 745 BLAKE2B 18fffd4db162b81254756763702639aab42eeceea375c67d43516e4582a64b0baad3296b9b707338566d7baa2bbf2b351ec5ad2bfe63361ec9449499daaa8eb9 SHA512 49612d372e3c1f07eed6afd6ecf5e435c32f4c4f15f07c7be6cd3b0ae9b205594f703e9103f1e1ce89516150e81e1595edbc68a2f1d04dcbe0b3e4353588b7c8
+EBUILD genty-1.3.2.ebuild 741 BLAKE2B 622eceb5aced65fdc498b5ee76188c3550cc1c8a28ae93c04801cde8b09bd4d6f41bebf9238051113fe1f74d268ee7dc99ef819d1ca504221af234e47c033c18 SHA512 92ca817072aa94ee96619ea35e6aae37e10216067a9e6f4937e42c8bb921be47acf62e23222160438547a070ff667a0f6f35005571e1689787a5a06df5123089
 MISC metadata.xml 357 BLAKE2B c4b7d3382dabce66ab01fecd442eb82e979d27434b0888c06d75d138ced20b984c67367f632a9fe00602d8d385f2222af1e195b8cb5e8b8b7e50494b9b018627 SHA512 ba3b3f11913ffc8848a7d2b1637b028812badef52306565f5d0462314d97ddb5795219cc6f674f3dfdc47c3d9b0bce602425b25df99c7227dcc166f1b1f536a0
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index 4981c4de3fab..9c1fa1621fd2 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 8081c47b29cb..78cb0eeb6080 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -2,8 +2,10 @@ DIST gevent-1.0.1.tar.gz 1455636 BLAKE2B 1de7c6986db96f8568a43aef1ff3c9b80b09047
 DIST gevent-1.2.1.tar.gz 2808619 BLAKE2B 2e3c15adb33401012951f0f93fe7f17c1c7597bb4021a4a9ebc7ecae390565d9892bb2fffe9cdac4f7e207d97d50da5d335ed8e42070d67d6be617cf955eb0b4 SHA512 22740e8e114869c1f53bcfd6796226927a3a726d4fd49d104b947f0c97546c7490eabea98b4492db794e21d26d0aee85f1e40b01d386a47063b042a719e61726
 DIST gevent-1.2.2.tar.gz 3108671 BLAKE2B f80df00f58ae2f65aa7f65fc9eac5cbf63a0084f24ccebc71ba9bafba72cd48fff2e7d0b1d8de7939dc669d7708e120fc14077cc845fe3ce212d6a80a42b5158 SHA512 1e2dd544cffea62ee32de2e4066b3f4c121058a1211b89da281ec3882f3763217fe2d346ce38b66e27df9f59cfe05bb137d1608a681dd10eaf06a33dc22f531c
 DIST gevent-1.3.5.tar.gz 4609085 BLAKE2B 55cb4111c9eaf9bbf636c9f1ef8d695def15a92e5591a0c441aae27f41a126487b37b8cc7a701a43453109f24114e3a0c584dff4b9b202018fd8334f0bae8e8d SHA512 4fd6d66e62437c859d653de4e981500fb3a025e6608b91fbb3d5ba4d8f0bff7cce980c03484c1c160a608427979ca763a6660d40ffcb45df4abe5f152ce65d1c
+DIST gevent-1.3.7.tar.gz 4614437 BLAKE2B 43d50c36fba2bedf41a7b33d38180f096b18846146953fa68325155f4a3cb6edb7352b9bb4cff5c7eca7a06ac25dc5b3e82a04545704fd0d6f43e9839a8749a1 SHA512 6dba487a9527eb352dc6a5f57120bf7973da655b3a331cad6637271b626c6e9e5439b20ee8abd9035ecb36e5259c99c69dea5ecdb8fa7ad0dbe28876c4d746d8
 EBUILD gevent-1.0.1.ebuild 1461 BLAKE2B 2d74fcc19654b02d952b6b0b4614633aedc38ad294f359004c59b8ea58e64d869e0eaed913f477147fd42bdb927ec03e178ce6e535cc832ce0afbe8b59bea17e SHA512 e8d65da8ede2d244ab2e9d67c626b84f83b0d1264ef25f63842a7787844411c188019426bd83b412de5fa8c6ce9948efabf29fe128c6e7c10f838d6a8112a76a
 EBUILD gevent-1.2.1.ebuild 1845 BLAKE2B c8e7b334fbdf922c12d22be2817fe0abbe64c09df6f7a73113f2211b54ab470a556e69c5bc80f02cb71e62cff3ccc0afab86d8dc2eb1fd96ad90633cec2731c1 SHA512 3b11b6d47ddd96df5f79a262e8ba03908986b324de4aedf10f920a5b87765e4e694aaa6d1bda8ec5747df7ddb6aa976d7a003cb81c04d3a5e16f7f0a2c22288b
 EBUILD gevent-1.2.2.ebuild 1856 BLAKE2B e88950d1a0efff78649584c1f745a9212c3e428af471a7522c771ed2c784ef9700adbaeaa51dd54b43d4ebc83497ae1267538f338abed270c49260fdc947a25b SHA512 f9b23e2db58298a567f81eee28a0388814f5deec19ffcec88bb1c47618137997d20bb287abe6949cef157f8f062010f65b90b35ffb8736d2e02b2bd725a8f46b
 EBUILD gevent-1.3.5.ebuild 1791 BLAKE2B 8cdca98a2012faf3dab69f6933e24b575d6028a833ff90e02837fb63e23fde97d5af58939abad4fe3e3239d550d9e7a057529f308e45d4df007ab47a5a864126 SHA512 78545274f97b632aa9addf4782c098e2d85085100c2aeffd2b7aae0ca79bb7a6bfd921e636df8d8c9d5ea52952310526ad32d776960e8547248a7cd53c1381e7
+EBUILD gevent-1.3.7.ebuild 1788 BLAKE2B 70bf9da70305330e0a95128fa53b3f0e6e41d10e46d42c84cde3d13941b636af776d5bd67ffe9d1dafcdef4ddcb3597b244b4545e35cab26a973fb0bbba9fec8 SHA512 28312c2c99a33c2f0d014d8eb37dc5627507ede40f861e74935f07e0cf7515f245a5b83e1386b57c23a1c677dc7d0eed662706598947681bf6f2e5b4b5194557
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.3.7.ebuild b/dev-python/gevent/gevent-1.3.7.ebuild
new file mode 100644
index 000000000000..8c3be0fa7244
--- /dev/null
+++ b/dev-python/gevent/gevent-1.3.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-libs/libev-4.23
+	>=net-dns/c-ares-1.12
+	>=dev-python/greenlet-0.4.14
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd src/greentest || die
+
+	GEVENT_RESOLVER=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py || die
+	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
+		"${PYTHON}" testrunner.py --config known_failures.py \
+		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py $(grep -l subprocess test_*.py) || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
index e24979e5e62a..bc00e1413c9e 100644
--- a/dev-python/git-python/Manifest
+++ b/dev-python/git-python/Manifest
@@ -1,5 +1,7 @@
 DIST GitPython-1.0.2.tar.gz 387615 BLAKE2B 50915f5ea98a47eeaf086f57ecc0847592721390b7eb38bc3d03e8258c74b4708cb3043142c160139d399337180300037db874d126abb5e54bbae855cd4e8039 SHA512 faff50d5272158f1d05d932e7827c05272f9a28772aabbcabd631b735bb4d8306d2861d13c327d02a4c554bd9a9902c473fb282318036405497dd8bf0fcc51a8
+DIST GitPython-2.1.11.tar.gz 428531 BLAKE2B 18b00f1e622c6588c14e1625f944d117348fb77e67161117510f42c8381db8cde8c6e16fa911edabfc4410239622fb845931b247bab4133585d2ec27969fea4c SHA512 5f964ee56c3f27c28f502150216af29b8463b19d9c0f773458dbabf17ba8587ee5c5e3fbcb31ad46c55e202d06bae447fd40007890a1bc116fe0370cdfc6401f
 DIST GitPython-2.1.7.tar.gz 426362 BLAKE2B 1d543b760bc0dbfdf95b120876c1f3454442a2e2bca69529229316fe5345129b852f4f6195066bc4750ac650083750c5ae0f842aeae871cba969aaf4c6563899 SHA512 3081fcf4944d49042fa95b55f1f0a152b405830fa592fbe546710798388e2bd7422bd2c62f5a7545f0820693fe1948ef31e1485d7b6bc2b37f2b807962e7da83
 EBUILD git-python-1.0.2.ebuild 1073 BLAKE2B 6e0dd038d4c0f28cb7edbf89a8f1f7a3cc5425adc7385e16b4ce181d125eb4897e51d4837df9c7561c0f71dac15c9e2de0a4c31f69eaa91c89be87d17b564b91 SHA512 a6c1b36aa1846f904cc4f9a9d1d9efd4af92f8d8699db38dfb91b576b944c10f8809e292507188b64a3bd50d9f5f27a2483464dd13942e0763a4d13e72d17fec
+EBUILD git-python-2.1.11.ebuild 891 BLAKE2B 3052bd8613842f2fbcb22ddd83992f096aa54d627d4a0d71e97779c355e967b52b4143d5f973f228359f91fc524e6fd6261c8ade182daba2ebfd6b722f5e0404 SHA512 faa49d40a5fcc9be3c814716b2227dc3f419d0ab5faa5b5c550d2f9bfa42f871e7ba17736bfe3b10c0b7728b5316b02ade56addbde89ba4d2286f7173c9b0bc3
 EBUILD git-python-2.1.7.ebuild 892 BLAKE2B 1dbe094db47261a1a8e6c841d4e7be6be55944a709c337ff6564b30f22b991987de2cbd813b3f9cfa5ce49a2bfe0e479be9c7f9e5af4ffc01fbccf45bd54a56c SHA512 e6d094f2729cbf83b1d03818ec2c059d760f6e2ee6e81462f90b8570b07069e7cfe539f35db2f5e92ba0790579e96227eda06133bc69431382863dd133d0d64f
 MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/git-python/git-python-2.1.11.ebuild b/dev-python/git-python/git-python-2.1.11.ebuild
new file mode 100644
index 000000000000..96f8566ba217
--- /dev/null
+++ b/dev-python/git-python/git-python-2.1.11.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=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="GitPython"
+MY_PV="${PV/_rc/.RC}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# Tests only work with the GitPython repo
+RESTRICT="test"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb2-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 31447391b948..1a83d54e14ac 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,5 +1,7 @@
 DIST greenlet-0.4.12.tar.gz 57319 BLAKE2B 8260e495bb67e1a2b5b593d3513c3e2157a7b68b71fa3cb2a77de3b4ccc21b5d56bab26b6f0caf00cb669f051d22d7d6ad2700059a3d23b9ad7591f3d6608f43 SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6
 DIST greenlet-0.4.13.tar.gz 58382 BLAKE2B a4afd9621ccd6444738c9b536af7ad5ceef5d3c8c4193ce637b4a8580c7070805419a917bef131f397286fae13f6e6f23409f5eedb814a41fcfee98356c0951a SHA512 625aaa8875b408442139191e1a63eca71c668675229907335f5caee623487aba5305c1d53b51e1764ad982b8edd07d04f984e08a75318a0a5672805667917a61
+DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89
 EBUILD greenlet-0.4.12.ebuild 1078 BLAKE2B 458d9db8a53c1ff0d076f4ec9b189ef0dbe73c2b2261c347200825df8a63ade022181b80590ece02fce1548f8aa9e24e282ff4dd412eaf319fe54a00c7528eb3 SHA512 94b4be233d2fbd8f88155165673e303ae92ccd1fb33fd9a0be98338dd39871183f1ea12b75ec2765a380fa9af6a34827bbc91745558ca76ac6497d750c96ec75
 EBUILD greenlet-0.4.13.ebuild 1086 BLAKE2B b83981cb8992091fee5df423f5434d5afdbd06ef0c1f8f9f329e2396807d30cc39acd804a5f427ea1c3e5acd0546953c36638fa86219c7e459bb69ac8d09eea4 SHA512 3dc08375923c4e114d6680e9ae9e86623508176c8ea2d349cce535f9f5a5f7b01dd86c5c047548ff5a329ecf77cbe8e5e4bba14c1f330dfdf50085ebba00dffa
+EBUILD greenlet-0.4.15.ebuild 1083 BLAKE2B a665d6bd1e0f18f0ba037c0187cf76e1261e8290e75d98e0aa5ef494560b5b59c39542e5d71b32b670eecd83349df16cea1eaba888f04a77686a92c3cc2d63c6 SHA512 05043a4f4205ccceebbf83ae4ac5bdd4cb89cea93057689f7430930ec5eca4fee62ad65e294e225a0a92243c4cf4374425a83a6071d8a68333422a3d42eb03e9
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.15.ebuild b/dev-python/greenlet/greenlet-0.4.15.ebuild
new file mode 100644
index 000000000000..31c49398afe7
--- /dev/null
+++ b/dev-python/greenlet/greenlet-0.4.15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="https://pypi.org/project/greenlet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e31e53e638dc..0b9595bf5237 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,8 @@
+AUX hypothesis-3.74.3-no-werror.patch 646 BLAKE2B d398319202a662d87018d99919ba0745d628c08afae85fda67113555f61babd83cae5dee7a79b224d7aa5ead73f29a91441f0de27086b9a4f74a3b53dda05be1 SHA512 d25646d35b94dc19b8c9c7a97601a7666ca6140b6a22a4f6b0bf232a7bd3a75c533f53feb9758cc8d5c9189163a0d90149f57c08dd945b763c0920aa361f2bbc
 DIST hypothesis-3.6.0.tar.gz 73586 BLAKE2B b0ec133e8c71f752114211061155c15a7d536e771ba85eab6489440b2063d3083018bf8502d9e9dbc73105ee5f03060e3189e64574a3dfa052b091040e7e7915 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389
 DIST hypothesis-python-3.59.1.tar.gz 500529 BLAKE2B 5c171045e363f2337d7ca30797b9fc7f96430c805dd4b3ec78fe927247d2c2ba4a216789a82f1e956b89d66c5ecdb2050a5f93467f2d557a05d1d48507fc06db SHA512 c3aad4cc54152963806e09af5f351e60e30cd64ad48ba3d922451b10dbb1747ea3e5d432ebc611dcb0646687d7e8755051b967304e74798d091be0b2901c832f
-EBUILD hypothesis-3.59.1.ebuild 1165 BLAKE2B 6a6f93aba2e1e8e21aaba137c7ce3552f507df5848acfdee1f04faceaf16c8e1bbef2ebfd5eb89931b9ffc2b3ed01371a0789c8a1664c549e4c94b8e0cc95356 SHA512 c55850a992b3088c2b7639bfff783e356b359463df972e8c9efc1670cb3d0c6eb838c885cc0e6b17b30fdde2ccf02e211fd423fd845c91d42f2b917e57b50c54
+DIST hypothesis-python-3.74.3.tar.gz 552616 BLAKE2B e19a0991e7ae2fa6208c81d336cc66e3392bb78663f567fe28b570a1463a5359ccf713776f1f9cbd19a27a53b9a71a5be6eedfa05599fa12c047c373aa339592 SHA512 f4927d6e908a9222fa06f82ad6e4cf90c62a0a3d0c7632c17ee57a3705239901fcb5dbbcfca402c153bf2bea9dde0e51c852d2024ed5a236888327963fe13a3e
+EBUILD hypothesis-3.59.1.ebuild 1164 BLAKE2B 8c53e03eda9e4061ca0a29efb99729002c74f8ffbf3965562954e6b5e53de94a93089c4bd5ce82a5780dac8419082d54b700675d32402bec3698becb3b40dd37 SHA512 c8fdb48e750c664d97b6c64601bb8ae8a9fc091747c8433747e2fdecd4d9b5cc220c700ebb4027b1dbe25718f3f7109a4b38e8576595d0e69cd2bedbfeaa0c04
 EBUILD hypothesis-3.6.0-r1.ebuild 911 BLAKE2B 4107db5cf3dee7f521f54dbfe0488742ddf21876b88b5b637c361d8808fa09686252e5d464391adb3e2e45737c2e347eb963fc0e49c41a04c0ff84536a131885 SHA512 315866abf6fa890934c3125d86beba7c3bd799f1472c5661725418806f68f20c850b3204b687a03c1887ecdf6a535117446a049509050da5f9d6d93cb0f6cd0b
+EBUILD hypothesis-3.74.3.ebuild 1587 BLAKE2B 054b13c44587d63e9e82aa54832201e8eba16bd0c00c37595636ecc3a119c5ec6e18586d8612344fe7a840abe9e2bbbb9a52c5d8b1eb29da3402afee13c676f5 SHA512 b3d646c35ec68c74dd315df5e1db85c47580aa7370868a1ae8eb5d4015c2c3bbd79216194e6fb0ce265d4f400551804682250bf97f3baf94e9d3feee7ccbfa38
 MISC metadata.xml 379 BLAKE2B 3623a13a813bf71f9474fa018b2f83392ec168193b9853cabcf112267d38e7278e97a415bb8b7e52f9ebb28864b8709a64996dcb0d97e1f03b3ecb31a944d74d SHA512 40bb5c1916d9027ff81cd32073de34753a30d8430f36d0fd16667a111af8fd222379dcd817edd723d362f5ff5578ad7b212f98388c00de6dff1a64bd2c3978b0
diff --git a/dev-python/hypothesis/files/hypothesis-3.74.3-no-werror.patch b/dev-python/hypothesis/files/hypothesis-3.74.3-no-werror.patch
new file mode 100644
index 000000000000..1e09133c6fb3
--- /dev/null
+++ b/dev-python/hypothesis/files/hypothesis-3.74.3-no-werror.patch
@@ -0,0 +1,12 @@
+--- hypothesis-python/tests/common/setup.py	2018-10-09 15:41:19.106029968 +0200
++++ hypothesis-python/tests/common/setup.py	2018-10-09 15:42:09.464413825 +0200
+@@ -33,6 +33,9 @@
+     filterwarnings('ignore', category=ImportWarning)
+     filterwarnings('ignore', category=FutureWarning, module='pandas._version')
+ 
++    # Fixed in recent versions but allowed by pytest=3.0.0; see #1630
++    filterwarnings('ignore', category=DeprecationWarning, module='pluggy')
++
+     # See https://github.com/numpy/numpy/pull/432
+     filterwarnings('ignore', message='numpy.dtype size changed')
+     filterwarnings('ignore', message='numpy.ufunc size changed')
diff --git a/dev-python/hypothesis/hypothesis-3.59.1.ebuild b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
index d6a43fd2932a..6b2b3a54b38b 100644
--- a/dev-python/hypothesis/hypothesis-3.59.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-3.74.3.ebuild b/dev-python/hypothesis/hypothesis-3.74.3.ebuild
new file mode 100644
index 000000000000..e213b96fb5f9
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-3.74.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+# See https://github.com/HypothesisWorks/hypothesis/issues/1630
+PATCHES=(  ${FILESDIR}/${P}-no-werror.patch )
+
+python_test() {
+	 pytest tests/cover/test_testdecorators.py || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
new file mode 100644
index 000000000000..907a6fdfadfe
--- /dev/null
+++ b/dev-python/indexed_gzip/Manifest
@@ -0,0 +1,3 @@
+DIST indexed_gzip-0.8.7.tar.gz 77640 BLAKE2B ff35693204a41df439b835f232b4e0ad5ceab19532a7f1f4a4aba5cfd810f447ea56c0f6cc0c5600f32317c5a4f4283a3dd5bc791dc9aec5742303728e76ecc2 SHA512 90872898b69269f42d28f61f7840879c1942060da923e8d5480c4f99feb160c1b03412378b1dda3cdf94f64434d81e4cdc524e19c268797f11444362149d0e18
+EBUILD indexed_gzip-0.8.7.ebuild 862 BLAKE2B 038ab1274ad7e5461ecde8b33f2c3f1998a28c22d1af40563475ce28c031b0fefee768b7feeb3a2f88c4f08b6188f2f690c91477043a5e35c980a3fe0c3e19fd SHA512 94928d70395816767b7e8a53f83e751ea8a8fb33864b0eba24db802d6281fc3ef609e22201087c24d2c43cc6a20e625c8f77163716530526a253fe33c2139372
+MISC metadata.xml 902 BLAKE2B 8d1c493782d05a3c3626279266a44b0d0954977dccbd9d0a87e2f1e744dd6b87c21a8d61d4967da6ec278d09b87c5939b7997ab1138346e63616aa65de6c9b4e SHA512 c6bc3e97af583690a86620ed44925827d3320bd295018c44c7dd057848c6c9833906ac35e99404032377b8f6584b2bce92deb1465dec9e0f7daa21f66c52120b
diff --git a/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild b/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild
new file mode 100644
index 000000000000..3533fde36c98
--- /dev/null
+++ b/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Fast random access of gzip files in Python"
+HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
+SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	"
+RDEPEND=""
+
+src_compile() {
+	if use test; then
+		export INDEXED_GZIP_TESTING=1
+	fi
+	distutils-r1_src_compile
+}
+
+python_test() {
+	cp conftest.py "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	pytest -vv --nelems 500000 --niters 250 || die
+}
diff --git a/dev-python/indexed_gzip/metadata.xml b/dev-python/indexed_gzip/metadata.xml
new file mode 100644
index 000000000000..11c36e8de929
--- /dev/null
+++ b/dev-python/indexed_gzip/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>horea.christ@gmail.com</email>
+		<name>Horea Christian</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		The indexed_gzip project is a Python extension which aims to provide a
+		drop-in replacement for the built-in Python gzip.GzipFile class,
+		the IndexedGzipFile. This package was written to allow fast random
+		access of compressed NIFTI image files (for which GZIP is the de-facto
+		compression standard), but will work with any GZIP file.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pauldmccarthy/indexed_gzip</remote-id>
+		<remote-id type="pypi">indexed-gzip"</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index eef53fc59f12..50f4fb2b995b 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.collections-1.5.3.tar.gz 11669 BLAKE2B 2dbcac99edf28f4544e354724f8d95c0cbcdd793b33bcf892b403e72410f3b5b72b6eae62a49f0e56991cfb19b4ad5da0e95a3327f11fe5ae885e9a0029a92be SHA512 6e1fa88b468b9d971a7a302ebfdf8b9762404c2fdc1b003eee6653704b9f385f0f2e0c84ac075bdc81f8693195781cc5532c4adb31bcabd87974624a14e287ed
-DIST jaraco.collections-1.5.tar.gz 10615 BLAKE2B 4331a1df4a1232817e5bde97ce22b019ecb50711c0f4dfd18d050233b820a51c420719ff2a0d013e60da4710a63ab34293ee15f091b86392ec0d5e36e8262880 SHA512 7e2d3849d26422d687cfeb560f8096fb099a9c7b99b3061a06f9ad7037c3805b577754f62e5d5ead3f6f89bcd7dbf574df2844aa3c28928941ea2c99d50fc161
+DIST jaraco.collections-1.6.0.tar.gz 11991 BLAKE2B 8f8b3da18641d6348a28ef3792afabd504771f31f1de17ebb621aff493cbb7357e11d49d8b3f4ab4fc7b9a662986d10a90d20734cd802c6d34be1d169390aa96 SHA512 9bd472b51668129f12fabb90b86ed929e135a17217bc850d67d945a786d1952cf1f11b0cd8f5d4ae16b3b19ac35cf87e0584df622877185362e93ba3915dbe6b
 EBUILD jaraco-collections-1.5.3.ebuild 1426 BLAKE2B ad973ab473d0cc84679f9338fcc5f1a3d0f30a29232c67d1e68353213d8fee7ae4ddd0d5625108540f4b9cb4260e4b81a94e769765bf97917571d1969b0e39e6 SHA512 1a57784f212c32a82cc16f748ecbf35b92e2e0b04c348f5003787a5040ec509d4f7714d15811a40941be73f4a24111fef16955be7d05284b6cc078d89d6f262d
-EBUILD jaraco-collections-1.5.ebuild 1402 BLAKE2B ea6bb23d97ca077a13ef637cb68af51d165b8f8b3319fa4d35c279413793e1aa3104fbee394f35b464ff39db264e94d63966e6ef3eaff1d369f9d02baef52666 SHA512 a48e9c9a8918ce2734bf0d2ad37e9ef85353bb502a057e3f3ce63d97ef0e9871fd086c36219452788c9bbcb29e4e0c90aa4094c4cca11360bc645e81c7c30fdd
+EBUILD jaraco-collections-1.6.0.ebuild 1425 BLAKE2B 4637fc3a51a5284dba54125afb0742c76ac6bb34d84280a8461d6015c01ea5993b329aceb2d2ab6081112ea603a8e391ca5d0a7310d399e7272f2bbb7b384f01 SHA512 d3c0610357fa18d0be4c242fd761923e2b44a59f5c484c3e770d5960568b2500622cb2b55e2648c4d42e4f2d603999961950e76adf7144af63ca48cf9ef70df9
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild
deleted file mode 100644
index 708280d2b630..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	if use test && ! has_version "dev-python/jaraco-text"; then
-		die "Ensure dev-python/jaraco-text is installed or the" \
-			"test suite will fail"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild
new file mode 100644
index 000000000000..e604a649977d
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${PDEPEND}
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index 22dfe5fa5598..153676c4a977 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,5 +1,7 @@
 DIST jdcal-1.0.tar.gz 5677 BLAKE2B d45ed1955cc62fceb07dae87ef4c97714ebaa9e5462d647b7f09e87c1f607d04c488f13ba74272e0783ffab218513e87016e0bce2bcf6c00f2fbff0a291772ab SHA512 5e9f865a3c9a123a56d084c9ddd325cfe6c246e1a9162bb8f000abaf7cdf376b1e38f7c2a97f14a13d2f4b3f3de4e7e3773a903f905685ce76f541b50134a408
 DIST jdcal-1.2.tar.gz 7059 BLAKE2B 6795e5511349490bda9df4e47566d3d65d9a69f654466d6c0090cae3b21e4be38090e2582b753f5eb04fbfc4ba33183a69b4e658ca3125f6105fe0b55b6d1d4c SHA512 cb7805229968cb9f5822e97c255b3666e50ac424725ece20ec3b980b87b84334bc13f2e772a4be2a0341b31f569edc11779796a41ae22d85cf822f9aa0a471af
+DIST jdcal-1.4.tar.gz 7545 BLAKE2B 20c3e64a0c1a2cb2078c3058b38a7ae7337880703305ff26d4b0990f4efe1532ebbf8dbaf666a656f7d0176011b651d96853db0c0713356f46191c849630a041 SHA512 d49ac3cb4241556900c0a4dcbbea0ba621206cea767e272fb994c7ec76edd6859b184cf17ea5f9a42ab2134a5be13bca4b6d74021d627584576c01f2cded438e
 EBUILD jdcal-1.0.ebuild 433 BLAKE2B e1ed961cbfbc837d95cb6bb4a2920b0db9045ae66801e3190d3cca708e3062553b0b23f94972601043f15a44eb6658f464b6a1ab2ee8ac6a7f3ded894eadc9f3 SHA512 cd2a1bbc9455f6c4ffb2f544539022c9127c3edf8dc27a5f806437ba4d31f9af72ca1a1ae32cb02f3df8ebe2b1f591164eccfbba93ddd5c8dcc39f4dd9c44e21
 EBUILD jdcal-1.2.ebuild 435 BLAKE2B 066df1a0e50fc5ecc0858ea65de0b222ce2e8df48b362ca3e4bc69ca8ed3c1796eb933a40a1ced9eaaf04b8d691deef8fa322355d305940ac0e6588a0afdda58 SHA512 71a34b4c910a8a38f10808ab4167882498dfae48ba5cf078c24efc2e65bcce26e8edb5c7cec00af421f1b42c71155059a6ded626b5c7e5b5aff550cba9eed765
+EBUILD jdcal-1.4.ebuild 611 BLAKE2B 6517e5058c7c3076e89909d04daf314418310c6f39fd87da3e308b3ac812836b4139adf8e4ec42898b8f40d7fb04a4dc4661cae2d255331eca2443ff577bf25c SHA512 9163d5572ef35fdaa3b00c2f0d9f99c6c50a765818b2cb72cc362ec4901594d20ec87e33327110f71dd781a9108b80b8750644f01e1eac3239a3ba57c85fcd5f
 MISC metadata.xml 369 BLAKE2B f0096e762647b29c559df839d2c8cef8c42c846e8b19ee151efc141d72270cfe31a5e90eb0545f4a9b79582f1169e1f8ec797d918079630ca4424e8d3b6bc113 SHA512 dd32db88be812a5a89482abf0c22de65201ebc26b6caea99ef3cccbb170273da086b9b6380a7e8894574c96b03844a76256498941d9821cedf817126d6594a8f
diff --git a/dev-python/jdcal/jdcal-1.4.ebuild b/dev-python/jdcal/jdcal-1.4.ebuild
new file mode 100644
index 000000000000..67aa9a72b7d5
--- /dev/null
+++ b/dev-python/jdcal/jdcal-1.4.ebuild
@@ -0,0 +1,25 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
+HOMEPAGE="https://github.com/phn/jdcal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest -vv || die
+}
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
deleted file mode 100644
index 3ecf660f2f30..000000000000
--- a/dev-python/logilab-common/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX logilab-common-1.2.2-test-namespace-fix.patch 502 BLAKE2B 257f19769d7e2f6df1fa606a1f596d24f24c3f5be319944929d4e258ff8f7068edc977dddf4be2b58df6eedb22e0135d1bfc119340853a1f9352dfe9b8de6aed SHA512 c8a9898a6fa497c21edebe4b6890a87215622dfd1c4ccdd7b23ca7669131200cf82ae82bd17c7226ac79ff3fb4ae964b1bf1470eb79c5aec0018850eacd2760f
-DIST logilab-common-1.2.2.tar.gz 184817 BLAKE2B 0318b4144150303b483fe921e01af326b55b7a3b93a014506685fde0b4e094a88efaaa70f63623264ee34fdfa72703e31cb0c8e9f4a69e309cab50997acae7ac SHA512 9c2161e8644e50cb3d4418430ca95363363e532b286d39cbdb73a51274bee02e5e8d0632b7564049243f497df96102c90ab0aeff9c91e91f7275407a6cfc56e2
-DIST logilab-common-1.4.1.tar.gz 185150 BLAKE2B 4c77b0a136a0de708801971f85b55fdd598767737ed17bc83ad1b934bcea5db67534370c202bc4b874ac774494ec6295a2458a7ae39fae36a9d5b482bce65563 SHA512 e016aa8bd8641b4178aa1d1dd58c8c78bf6c3a80c35c9096d9761eeb49c9ee1ab5952839a1b7ecc404cd60b31078d3e997d73ad4f8d07d88badffe6c8748a059
-EBUILD logilab-common-1.2.2.ebuild 1195 BLAKE2B 1cf354ede8e340b349aa444b3eda7f796477a6940a89be8df4800c9452067a05f43ca93f1d8bb44cad402d60c747b69eb1fe107138e94d2e50914632be1df74a SHA512 cbf438ab6492feebfd8855a8ca83449ccf3777ae9158f27bf6d12e6c025225588dda111bf2f55b38cbc1af3361a281f67ee7821a2cad656692189cc7002be850
-EBUILD logilab-common-1.4.1.ebuild 1417 BLAKE2B df8268e7eec082e91c336630259adb687bf5b04bdf23bb6a7f234e6ba175e0a43bb248de42f02577d68c613a9053cb47d4fdd5de248c6cee40e7c0c8e8435d40 SHA512 685563a02a69cd5320d24620dfb362495388f81a593ee006f4e5e4e5a58ad55f1606b136670746fd01b754aa8ab6161dbaa3186b70c351ef4cc5164245253f8b
-MISC metadata.xml 317 BLAKE2B 88f2ad57938f816c897d8d8c26d26135c064ea7fadd6363cc916f6a047b3a0deb1e3fb9f1282d91198036f457998fca4ab43dafbd2c8c03a72d8ab601542c186 SHA512 4e3f634378fd3dcd721af5e038a2331fab376c3625cb8b9dce6a87921886602ff75d308fc9d7f887a65cda607e9e635fb59e86b1da0c7c11a75860229f90c3c9
diff --git a/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch b/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch
deleted file mode 100644
index 044fc67f0d3f..000000000000
--- a/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/bin/pytest-local b/bin/pytest-local
-new file mode 100755
-index 0000000..a2b771b
---- /dev/null
-+++ b/bin/pytest-local
-@@ -0,0 +1,15 @@
-+#!/usr/bin/env python
-+
-+import sys
-+try:
-+    # remove an already installed logilab-common module from
-+    # the list of namespaces to force the local module to be tested
-+    del sys.modules['logilab']
-+except KeyError:
-+    pass
-+
-+import warnings
-+warnings.simplefilter('default', DeprecationWarning)
-+
-+from logilab.common.pytest import run
-+run()
diff --git a/dev-python/logilab-common/logilab-common-1.2.2.ebuild b/dev-python/logilab-common/logilab-common-1.2.2.ebuild
deleted file mode 100644
index 8ba0caf8087d..000000000000
--- a/dev-python/logilab-common/logilab-common-1.2.2.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common/"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-test-namespace-fix.patch" )
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman doc/pytest.1
-}
-
-python_test() {
-	# https://www.logilab.org/ticket/149345
-	# Prevent timezone related failure.
-	export TZ=UTC
-
-	"${PYTHON}" bin/pytest-local || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/logilab-common/logilab-common-1.4.1.ebuild b/dev-python/logilab-common/logilab-common-1.4.1.ebuild
deleted file mode 100644
index dd8fe62baecc..000000000000
--- a/dev-python/logilab-common/logilab-common-1.4.1.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common/"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	# https://www.logilab.org/ticket/149345
-	# Prevent timezone related failure.
-	export TZ=UTC
-
-	${EPYTHON} bin/logilab-pytest || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# this package is commonly used by all logilab.* in ::gentoo,
-	# so let's just keep the namespace here
-	python_moduleinto logilab
-	python_domodule logilab/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman doc/logilab-pytest.1
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/logilab-common/metadata.xml b/dev-python/logilab-common/metadata.xml
deleted file mode 100644
index 6d7823824e72..000000000000
--- a/dev-python/logilab-common/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>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">logilab-common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/logilab-constraint/Manifest b/dev-python/logilab-constraint/Manifest
deleted file mode 100644
index 2657c3f11fb0..000000000000
--- a/dev-python/logilab-constraint/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST logilab-constraint-0.5.0.tar.gz 48395 BLAKE2B d08759f5f329f1d155e449e16cb20896ebad9b5f1c946485dd5e66bd8e931608467511b2d2ecbbc8c1d165b3773c95630233b79d96945235ce7c22e7c863a48a SHA512 b1ccc6e7400eacb7c446c1904f5e2b0129104482e312929292c6ca7c9c18bf4e1fa0d0e78fce61527a97e00d85c4e2a5c1bb8cce7c18792cd5d2a295449e435c
-EBUILD logilab-constraint-0.5.0-r1.ebuild 885 BLAKE2B a68b2214857416c57c4cc8daffd6546647f3c4c8a7e5970b45dc4473a230898c2214bf99c9face4b82eb6f1465e0a7b54f2eec6b1d4667b1bacdde5a1370eb88 SHA512 bfd9f37cd733b2bad87c0c1d822098185c29e56af3f31ade0f2232dac5a26def8b4d1f457564351dd773370d6e4f64f46e2e13b123a10fc8d9b50d52ce394959
-EBUILD logilab-constraint-0.5.0-r2.ebuild 942 BLAKE2B 8050e0c8d363dd8a2e989173ab704892ba531701755cf80ad5def5cb2eedb8d197dd8584c59a59ad59673a776574e0ce7c91e436bd641544336a5b9c9aa70acf SHA512 ba48b583b96ad426df4c8a7f4f67c01ce9b6d99db1641093958f7b7e0cc9bcf1f0a5c328ce074d1fe340b51af6df47c480e9de08419d58a4ee3e64e4c5a1fdb5
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
deleted file mode 100644
index 500b9772df7f..000000000000
--- a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,34 +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 distutils-r1
-
-DESCRIPTION="A finite domain constraints solver written in 100% pure Python"
-HOMEPAGE="https://www.logilab.org/project/logilab-constraint"
-SRC_URI="ftp://ftp.logilab.org/pub/constraint/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/logilab-common[${PYTHON_USEDEP}]"
-
-DOCS=( doc/CONTRIBUTORS )
-
-python_install() {
-	# Avoid collisions with dev-python/logilab-common.
-	distutils-r1_python_install
-	rm -f "${D}$(python_get_sitedir)/logilab/__init__.py" || die
-}
-
-python_install_all() {
-	use doc && dohtml doc/documentation.html
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r2.ebuild b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r2.ebuild
deleted file mode 100644
index 45fdab0c6cfd..000000000000
--- a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,36 +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 distutils-r1
-
-DESCRIPTION="A finite domain constraints solver written in 100% pure Python"
-HOMEPAGE="https://www.logilab.org/project/logilab-constraint"
-SRC_URI="ftp://ftp.logilab.org/pub/constraint/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/logilab-common-1.2.2-r1[${PYTHON_USEDEP}]"
-
-DOCS=( doc/CONTRIBUTORS )
-
-python_install() {
-	# Avoid collisions with dev-python/logilab-common.
-	distutils-r1_python_install
-	rm -f "${D}$(python_get_sitedir)/logilab/__init__.py" || die
-}
-
-python_install_all() {
-	use doc && dohtml doc/documentation.html
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/logilab-constraint/metadata.xml b/dev-python/logilab-constraint/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/logilab-constraint/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>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/lxc-python2/Manifest b/dev-python/lxc-python2/Manifest
new file mode 100644
index 000000000000..a29605e781eb
--- /dev/null
+++ b/dev-python/lxc-python2/Manifest
@@ -0,0 +1,3 @@
+DIST lxc-python2-0.1.zip 15251 BLAKE2B e9a7ef693f2cab70a626a5fb7325d2bbdd8b56356d984eebccbdc26e61abf7e55cb87df3fbc717af38ba2278de2c6d2bc40ea950f88aff43c8859b2784e17a54 SHA512 e2374373dbf0567209f028df6c8dcf66b1f06be89934824c9663104e4fed9341f2b68d89011624f87de0e4e2702affaf1f7b17987bb179d1d945c2e04f8aa1bc
+EBUILD lxc-python2-0.1.ebuild 460 BLAKE2B aea88ece733d227d1282f28d2b98de15eda5a4094ae7a1a3cfa31306b8140a616911eae71da1c711a14329d6bf61084c1e6eb35dede847662ccb9de0dfb23a42 SHA512 63a7376d098e527543c83e656226b2229d7ef62bb39ff11139a0494f86b79c14481964a09f80e823ff45a2f10e6ba65ae671fe29d43e5231430e711a41209da1
+MISC metadata.xml 650 BLAKE2B dbeccf480a7490564add2ef993fa1e07ef8ecf61ea4991128e4125dd1a9a7ecac1f4b846a59065b382c7e526341c341901b5375526d5eaa2a88d216653e6425c SHA512 651a2eccf19cbec960bec4baf4b3b4425d896df55249882640068e3fb4fd005fa8a77a2a2cbf88c77542532b9161f9d1390a90fb61659b09971acbc86016bec3
diff --git a/dev-python/lxc-python2/lxc-python2-0.1.ebuild b/dev-python/lxc-python2/lxc-python2-0.1.ebuild
new file mode 100644
index 000000000000..9e09af92cbcc
--- /dev/null
+++ b/dev-python/lxc-python2/lxc-python2-0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE=""
+
+RDEPEND=">=app-emulation/lxc-3.0"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/lxc-python2/metadata.xml b/dev-python/lxc-python2/metadata.xml
new file mode 100644
index 000000000000..91254ea2063e
--- /dev/null
+++ b/dev-python/lxc-python2/metadata.xml
@@ -0,0 +1,21 @@
+<?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>
+  </maintainer>
+  <maintainer type="project">
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Python 2.7 binding for liblxc
+  </longdescription>
+  <upstream>
+    <remote-id type="github">lxc/python2-lxc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 518cdcd2b270..04abfe830241 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,6 +1,4 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d2bbaec24cf44b5910d4fc1a956723a8ed8fecaa428aea361a7ec8a3ff60b82e0d9468ac21d251c16ac8c2b52eafec6ab3 SHA512 0cceeedff6c584d2d7037ff91fbba0fe580fabfda810b9a9ed7c8d8495445339e3ff115d63d4429bcd3eff2b13b123e1bd5855ff1bc9dcd986b968a82c368591
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
-EBUILD miniupnpc-2.0.20180222.ebuild 755 BLAKE2B 09f856aa3c72074d75a01e1b1d15d48da5d2dc82f05a1167cbf0f04667db97f8688c6b7f54f3286743b12caa861490201d0d0727a21bb0fad8e2739bdf90234d SHA512 a4f28b3223ce19f6c6cacc4b299bb667865b60979095737577fdca1b94dd9d72184db42a076450607309dfc90344905e521aead19f99d82382089c39322c4cee
 EBUILD miniupnpc-2.0.20180503.ebuild 755 BLAKE2B 09f856aa3c72074d75a01e1b1d15d48da5d2dc82f05a1167cbf0f04667db97f8688c6b7f54f3286743b12caa861490201d0d0727a21bb0fad8e2739bdf90234d SHA512 a4f28b3223ce19f6c6cacc4b299bb667865b60979095737577fdca1b94dd9d72184db42a076450607309dfc90344905e521aead19f99d82382089c39322c4cee
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
deleted file mode 100644
index 1fc60e04a6a8..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.0.20180222.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
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest
index 4023900a35fd..0b31784daeda 100644
--- a/dev-python/mockldap/Manifest
+++ b/dev-python/mockldap/Manifest
@@ -1,6 +1,9 @@
-AUX mapping.patch 440 BLAKE2B 85788659884ba57f093680a6796ce0e71f0bf6a0f1f221d3d79ecd9055862b472d2cde87c436bbd18b387a4694c09d63e95974552f3f5652060f77e0625653ab SHA512 d69af2a319dc5f3511063b36b456a11c44b8d85d93b541cb223542b71eaef71fecd5405bdaa688d9516ca162060f64a4abe284841b7cbeaf69203f37ee5df120
+AUX mapping.patch 444 BLAKE2B 5d7da6146cb68d71d367900da68e7b1d18cf789c5df7ba4c614e32f6b8c18e17fe0c03c1bbb599438d052ed241590634c6011497adbe0128544b93294ab464af SHA512 09836864043b8f9d7e8eee7ed9bb2613d3ec34b90a1af3fc30239c54ea901a13b7ab89bdd3dc49a42873de783d1f622cc8b691b02f48b04947dd3667b4dc4fda
+AUX python-ldap-3.patch 1541 BLAKE2B 28a7ee4636c00a78ebcbbeaa86a33fe3e962d0fe8457a2e48817da48fcc2f6d3b1fc7dbdab785795f2a42e735f969fc63b3858634ee8e6ea63bfe754c44ce973 SHA512 ff112f3f0b5646d745c88319ed66bedf97b8c3b8b80ac84ea836f2fc6cc9427fcc600980bc3fc5c31f0ec8de73e23ca60bb9ff4b9ba6a11b2dae8382867fc2d7
 DIST mockldap-0.2.3.tar.gz 22369 BLAKE2B 0021951556c0b8ea1f043b702f4d8f8719d272559db3ad8ee4e49955bb17a3caab4083a37486366145d8a7aea927fdc0528c1194f849917471ba6174b52bb46a SHA512 3e17d9f3d6ae5a33014e2ccfe521170af1b136f38b68b216df721059941d958b87f03fb4ed5772282d319cfae9974cf1ae9e4e3bec629d161761e2018ed26788
 DIST mockldap-0.2.6.tar.gz 22892 BLAKE2B 9ed6e7cb7c8ab770ec7ab3af01fb2228190c505ac2025adb7b728d9daa4851f51eeafdcaa3a7413d44a181f005a19ee25da99d93a7c71b9d0207c454a533401d SHA512 7ff0219eb349bc9cffd0580eb80fc7428ea856824428c048ee7e133d4c6609edfb713a73d6a26e2293156482304bdd4fb8034f600631c8b1e290355a4e9e7f4c
+DIST mockldap-0.3.0.tar.gz 18973 BLAKE2B d13665afb0fbbb8095036ab7576ff5a8c77f5711a0c6ec96032924191ff8b86f16031895ec7c1d8a0c67993121a70b2d62d645e5a2a4df713e48d82e2fe0e1e7 SHA512 0af4cf1762e280024525e8fbf897493925b91393311b36beec83dfb152c1dda5b8c7e45ddd10c02ea329a62b25133a4113a0a12292dcc669416ed4cebcabbaa8
 EBUILD mockldap-0.2.3.ebuild 1044 BLAKE2B fbbf56b1cf41eeeca71eebf637711643f7c254441d7d4f605c5b5e00970c4ca71c55c5c88609c666c10816c9c7f9d04c0f2426b5ba4b14899f284e2e229c42d2 SHA512 83fa5a12c8e030b1a4e181f3312f88ebcb6a3c8fd119da6f26884ba72b97fb5755021cf7be1da0a0b41ff4898218e100134b0db299e761e5e1b83c165cc8da36
 EBUILD mockldap-0.2.6.ebuild 1169 BLAKE2B 1c49245f498486d3416b4fcb5cf0a45826e8ddfe26009f34d217b5e3fda0a491467cffe5a070cc093206d7e085eb67eddcae0d0223503e75e2ff744aa9a60b0f SHA512 3c391760df32f971a39a2043c0c4f7f021e9c2478a560b198ee7256debe20cb12d629127928db24136ee03456102729529ccd9dab432c8a3c749fb90d519975b
+EBUILD mockldap-0.3.0.ebuild 1255 BLAKE2B a1e8aad6a61fb752f401bbaaf3bc0552eefaae2ab9aa93fccbb237bb56c5dd6ae6f69acbd093ffafe25cae4f70d564ce4809080d5c6fde1165c79f0dc293608e SHA512 3fb0280dd392d3d6c1e0be36f2a274c0b03383d0910c2ac596c521d7f8714b5ae13311b6beafdeb2d64c3807f1e284c78e5f6adbfaaf0a9b64feb4b7f730887b
 MISC metadata.xml 382 BLAKE2B ad5c85cdb04b4f63756abdfbeda8c5f7b5a03a763c0249119a8d8bd2cc72d4283217731b4abe0dd8b90d607ec9309c42d82b8292f75b1884c41a439331df263c SHA512 2b137abc6da4c0782249954a50bdf8d6ba9dd0254e04afdc5e0d7f5406a0451c78c2ed8b8fbc0c2214eb04a3ad842b250dc1910327cdab58fa5aa43f0de296da
diff --git a/dev-python/mockldap/files/mapping.patch b/dev-python/mockldap/files/mapping.patch
index f3cdd862a9d6..b8c25eca5833 100644
--- a/dev-python/mockldap/files/mapping.patch
+++ b/dev-python/mockldap/files/mapping.patch
@@ -1,7 +1,7 @@
 Disable un-needed d'loading during doc build
 diff -ur mockldap-0.1.7.orig/docs/source/conf.py mockldap-0.1.7/docs/source/conf.py
---- docs/source/conf.py	2014-03-08 00:51:00.000000000 +0800
-+++ docs/source/conf.py	2014-04-12 16:04:52.113446583 +0800
+--- a/docs/source/conf.py	2014-03-08 00:51:00.000000000 +0800
++++ b/docs/source/conf.py	2014-04-12 16:04:52.113446583 +0800
 @@ -28,7 +28,6 @@
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
  extensions = [
diff --git a/dev-python/mockldap/files/python-ldap-3.patch b/dev-python/mockldap/files/python-ldap-3.patch
new file mode 100644
index 000000000000..e047032ed56c
--- /dev/null
+++ b/dev-python/mockldap/files/python-ldap-3.patch
@@ -0,0 +1,47 @@
+# HG changeset patch
+# User Jon Dufresne <jon.dufresne@gmail.com>
+# Date 1521133853 25200
+# Node ID c938f5b558833dd290bbdcbde26c97a6bbfea623
+# Parent  8784bdea1cb29b2a5b5d21045b024880ab84c05d
+Unify Python 2 and 3 dependency on python-ldap >= 3.0
+
+python-ldap now supports both Python 2 and 3. The pyldap package is
+deprecated. The project recommends switching to python-ldap instead.
+From the github page:
+
+https://github.com/pyldap/pyldap
+
+> THIS FORK IS DEPRECATED
+>
+> The pyldap fork was merged back into python-ldap, and released as
+> python-ldap 3.0.0b1.
+
+diff --git a/README b/README
+--- a/README
++++ b/README
+@@ -1,6 +1,6 @@
+-This project provides a mock replacement for python-ldap (pyldap on Python
+-3). It's useful for any project that would like to write unit tests against
+-LDAP code without relying on a running LDAP server.
++This project provides a mock replacement for python-ldap. It's useful for any
++project that would like to write unit tests against LDAP code without relying
++on a running LDAP server.
+ 
+ * Repository: https://bitbucket.org/psagers/mockldap
+ * Documentation: https://mockldap.readthedocs.io/
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -40,11 +40,8 @@
+     keywords=['mock', 'ldap'],
+     install_requires=[
+         'funcparserlib == 0.3.6',
+-
+-        'pyldap; python_version >= "3.0"',
+-        'python-ldap >= 2.0; python_version < "3.0"',
+-
+         'mock; python_version < "3.0"',
++        'python-ldap >= 3.0',
+     ],
+     setup_requires=[
+         'setuptools >= 0.6c11',
diff --git a/dev-python/mockldap/mockldap-0.3.0.ebuild b/dev-python/mockldap/mockldap-0.3.0.ebuild
new file mode 100644
index 000000000000..320fd5560f03
--- /dev/null
+++ b/dev-python/mockldap/mockldap-0.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A simple mock implementation of python-ldap"
+HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+	virtual/python-unittest-mock[${PYTHON_USEDEP}]
+	>=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests are not distributed as part of the release
+RESTRICT="test"
+
+# Disable un-needed d'loading during doc build
+# Import python-ldap 3.0 instead as a requirement from upstream
+PATCHES=( "${FILESDIR}"/mapping.patch "${FILESDIR}"/python-ldap-3.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "hashed password support" dev-python/passlib
+}
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 69d96246c14a..9ece88213db2 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,5 +1,7 @@
 DIST monotonic-1.3.tar.gz 7211 BLAKE2B ee05b43f8734099c3d7472ff98bc815cb33cd45d33cd780f33703429773cb3f7cccbf97c3e476247b749616f16ee4493cf300ea137b6da89068c912e4689f72c SHA512 870b9530235715eda099cc332c94935ebb80f52a30523dca90639b9f8b3391dd706a9a8f3aac402ebd8c008672e84cd09b5397e954160751e71940b3a9120bd9
 DIST monotonic-1.4.tar.gz 7463 BLAKE2B c9123bb5ed5ece16014c9467c7e25dfaee8d0f30096a73f5d001b0bfc965c0c1f2b501ae39f5b490edd61f179c4e688ce4b794bdb6a842ba350d499eccd8335f SHA512 f9fa079cc325592b0bff799fabe7f9e87922cfe351776ed08be7a0060d27f81ae2c23aa7a1fac2ac2203ec26547e05fe3a918e68e6a474768b431ce860522eca
+DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
 EBUILD monotonic-1.3.ebuild 485 BLAKE2B 260a18bd71b5219dc858737b101ebd13209edeaffeb64be09138bd476902d500d8304fee42b72b259359f406c31412fa7d24d615a99d1a07a727bf2bb8b016b7 SHA512 e536452af47fbd12dfe47a5d8a637f031ca736e171f4b39d3f0f41a8b131f653e9174ddc1b3eb8f564861cf8df5d61d154b800f9d6277a4ca9741e6990f8daea
 EBUILD monotonic-1.4.ebuild 490 BLAKE2B f1a693d907ba48b51abda74002232a42ccfe37ccb4912e444e5aca61616726f79a4ce542cb7200072f43430b8af53fda6982be83a17f57f666d4fbe7502c8d47 SHA512 2ab6bd131db94be8a62248c8e7ed3f09f9d6ceaad663834e027bfb45fbc5c361ee44bbc5be717fbd4d2f51651f442d81ce957d29db8fc2fd61f1ac404bc42ceb
+EBUILD monotonic-1.5.ebuild 491 BLAKE2B bda25a56c8710a65aa27171ab3132cc0b79d19cba1c68bbe3cd0ecb687681db972867fe21bd6ca1f9a0e9d35742270c294d8d00bbca508eb22fef7b15422a89d SHA512 50c1659e3a11184ead7cd64e5952806be38bdd811e53e0f3e0bb48ac9c15b8b6593a54cdb9f63b02adec236d8c86f8e534272391d22b6c7c6eb856d15971e602
 MISC metadata.xml 265 BLAKE2B 3933f653f010c95cad9fed21d1511497c49a48ec369592bf48061a987133ef492a792274685c56a0aaa640cc1f39b2aafe6dd141191191dd1693f6ac9a9aab1d SHA512 46857509ccd598f4774b26386248a7309cde1fdf63a3edb3e75926029abff5cd653a57e213bdea8b976b452ad4ba9f35b65111f6a53ee5868ca4bf76bd8bd1f9
diff --git a/dev-python/monotonic/monotonic-1.5.ebuild b/dev-python/monotonic/monotonic-1.5.ebuild
new file mode 100644
index 000000000000..72cfe7194bd6
--- /dev/null
+++ b/dev-python/monotonic/monotonic-1.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 53a75d1ac388..a3406f36d5f0 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,7 @@
 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 1045 BLAKE2B bf29d6e86974069ab1cebc6dc2686b471ddbfc8ce2ddd0dd6d9529587aa4d9cefde959761028a99771c87d3fd144a2e370236afee04cef1b0fc8ab4cbdff3dd2 SHA512 47b043ed42f24099ff415f43ea66aa55c64bd8cdcbd47939ea1b10032b589683200628c76ce4949b6d886efc9305ec23848cff96ff2f587b1c4e707fef3029bf
+DIST more-itertools-4.3.0.tar.gz 63266 BLAKE2B fcad717550931f267594f0e338def6e8d6119f28452ed8654b9e3ca073c4219f78d58d691855c4f6b4817afbe94d176077c342fe9b57ae522bc113049da97b57 SHA512 5fee3d99fd796b0f0f6b5aa99a8db22e219d3dced71fef6f4b16286fe67061dce280389b3638c55c6e5f6c828ef1286cee845d76a6861d2af66d90e995d5aa4e
+EBUILD more-itertools-3.0.0.ebuild 943 BLAKE2B fee0e2ba67b0b5ae02665f090be10fe7f9a1610c72857b4ea56b44b4709e0af7f93ebb48b9d12279e9e9e77825868e4338d7e6724095ccdab7d17e49e88a3fd0 SHA512 7e3546efeadde855f65e9aa5b751e0186ee33125544d8a0683ebe5e3997bb00f1e150d35df184019e2df26230cb4b50562bd2b10d2d6745e202ab70957913167
+EBUILD more-itertools-4.2.0-r1.ebuild 1055 BLAKE2B 567d1228b00e311e9f0c94633b8a0ef771d3a0a2a27c65f9c4441640dba76dc42c497976612b9690b8ccd67383125257a106b0fd9a6471bf6606a2516343e95f SHA512 ce7348d9ffb14cf68b1c360f20d2fe89fc95995f96a5e24be54b7b171d45ed86b98b363f8e8785d3d358ea3d7075e81c6d9541020dd1d7b143c5aea186829bf0
+EBUILD more-itertools-4.3.0.ebuild 915 BLAKE2B f6ccf7a011620e0fa00eb4bf6cfe657f66724fb19364866f6b10cb663b816ea3487fb768a1d6a4bf4d8be39c53dadf89a31e53402a26f1cde99d1e4e39221721 SHA512 f0ad666b48c265864284b1fd124e3218f0eb18ecda86286f36685ff9027e8b638650332788219f026ae4e9d54131a46941dcc0e0d475273031d51b7b4940ae10
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
index 50b22feb0655..337eb39858c8 100644
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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 ~arm ~ia64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc x86"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
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 80dfefd9c853..1ed28b384772 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/more-itertools/more-itertools-4.3.0.ebuild b/dev-python/more-itertools/more-itertools-4.3.0.ebuild
new file mode 100644
index 000000000000..0b78adf9d36a
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-4.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (	${RDEPEND} )
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index a49295d1f592..72d04f711cbc 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-paste-1.ebuild 806 BLAKE2B 3448b3a0002a6fa66b51512104d5925e36f62d09b88d721b4fe4923db97120f5dce1a50df4a480c62edbfb9347034328e8457cea94f12a905f6b180bf227cad1 SHA512 404ea5912e7eddbb6b5d0f61033e083cdd4a25df0c11b317e725f10bec3373a3774df5233b451cb6e2c0593ce323867d51d1d509d3c180b26ce61bab5da0091d
+EBUILD namespace-paste-1.ebuild 808 BLAKE2B caea416e6ee2687a9c5841c67b2ded6ceb721d1aee61032aa0030124cd280344d1754ed177f60fc85b63acb7e9bb3d3a7e816f0c82c3d0a89fdd35fe79761792 SHA512 5e7a2bb3985a298745cbf1c37060b076d7857566708a4506a58093dd3ef6b60b84ab956fdd064eda7e576e652b78eab7db91265cc627dc5ca9c86a4c65d02e8f
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-paste/namespace-paste-1.ebuild b/dev-python/namespace-paste/namespace-paste-1.ebuild
index c2f6b3a81b24..c43cb62ecde8 100644
--- a/dev-python/namespace-paste/namespace-paste-1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index fc82e19b6ae4..dc9ef039ef36 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.tar.gz 8798 BLAKE2B 57e1eeaa96b9e5354991db36440abfbf80471887c094e41dd6ccff72f1b1b35524bebf83b44afa455c64cdc3fb7b0ef66d2517ca499340a3d001e796828ff9b6 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f
-EBUILD notify2-0.3.ebuild 653 BLAKE2B b9f9362db64a230f7f8e6ad2c2d7fae00842d7327cefbb287d01acc0cd919111a9d1c76c79df71fcdebe747071430fb39506a94e667b2f23f180f0c78c454b6a SHA512 f278fcf00bd29146f4c09e717a7ec102f363c3b1db1ae87a2a6c07e1efc75adde1c3611578de0c4b41598714ee327723aa13c1773c7f502704b2a08a996ef49f
+EBUILD notify2-0.3.ebuild 655 BLAKE2B cb702004604502914589f845d24652f6bd627c45283a2b79a28d40dee4efaeb8c4ba427fcd5123a00fe25fc3995b136a642f8e582ff909870e93ae2204bc4c3c SHA512 3a15e082adf783afa7f14d83f4698617232379f15e486f955cfd36917cbbdc71a5e3828ae5573f30b941b62605789e178c42c2bcd58c4fd8b97b55a28afba296
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.ebuild b/dev-python/notify2/notify2-0.3.ebuild
index a36960451652..60cbba01f397 100644
--- a/dev-python/notify2/notify2-0.3.ebuild
+++ b/dev-python/notify2/notify2-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
new file mode 100644
index 000000000000..7d462a040be2
--- /dev/null
+++ b/dev-python/nototools/Manifest
@@ -0,0 +1,3 @@
+DIST nototools-40aa4936022295cf851bb62f09a070f63fc8f5ae.tar.gz 9649749 BLAKE2B 5637373dfb70552f640b728814f3db1f3732b7335e7edac502a553a896e9715a8ef9356502c5d33a09a04ef45b0b27989f5a3602707964c7f91a1eee21e9112d SHA512 b1bfacc69f79b9ff7d40ff9b475a2e5808e57a66fa3bf2c79cdc56999e390cfdd2f92b71fd9e53e0e3571f30f3a54d1dcde2c3d8bf38378c72f79260d8d9d5ba
+EBUILD nototools-20180827.ebuild 904 BLAKE2B 48f7110934037aec586c9c72d0c0e30e67f1c24b791559f04fc8b8ddccf2dd9e8dad372ea4724db2b3ae71d0a5e6e232dddcfbb4f715ad2883bb916a341d5790 SHA512 6eee76ad1058c9f8d1d0a894e53adb8e8ab86d6bc3f2426ae35e2a3dc09204a55d470a0136078bc3b406d8b6c6bf5b1c1fc7abdc972b93b7c13d780f6ef95ba6
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/nototools/metadata.xml b/dev-python/nototools/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/nototools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/nototools/nototools-20180827.ebuild b/dev-python/nototools/nototools-20180827.ebuild
new file mode 100644
index 000000000000..ae273247db2c
--- /dev/null
+++ b/dev-python/nototools/nototools-20180827.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Doesn't work with python3 yet:
+# https://github.com/googlei18n/nototools/issues/472
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Noto fonts support tools and scripts plus web site generation"
+HOMEPAGE="https://github.com/googlei18n/nototools"
+
+COMMIT="40aa4936022295cf851bb62f09a070f63fc8f5ae"
+SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/nototools-${COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/backports-os[${PYTHON_USEDEP}]
+	dev-python/booleanOperations[${PYTHON_USEDEP}]
+	dev-python/defcon[${PYTHON_USEDEP}]
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 8dd7a26473c5..1ccca39d818f 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.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.44.ebuild 669 BLAKE2B 7dc78d7b23c50af368ca63085b7a2af810a84fa6d7cef025657da5ca17d340e1d6deacd44941fc142076f8c3740098db4e0bd399d1daf122bd60d8eb9196eba2 SHA512 46556d11118e8053722add7636da336b9770a735c84f11f7c41640a6ca8c4b205a640b3c0123bd1bf6ff9ca8a772c745afeb72edffbb78b933f23623d2daa4ba
+EBUILD olefile-0.44.ebuild 667 BLAKE2B ab27843fb2c01c63473b9ad347295899740feae07dcdf4d43ccbf6d065d7b21dae68e193c4edec13866f8cb097caadfffdf783b3105a8abd27766fcf56a92d2c SHA512 708f9ed2e39c038345e6826789a4db271f6d4fdd6ca564322a2621494723f23a8ce07f738ba7dabf53b57535e2d27d4c42d55ad6123eeb10d91bc883e7e80ea4
 EBUILD olefile-0.46.ebuild 673 BLAKE2B 7079b5ba6ab8da7f06e11931fd8693abed7b0897f6654f5ac57045c6e4453953086f88f3af144b5b7d2316bdbc41f57ab140dd58406cbc1c2f1a7c87545f2789 SHA512 1e338ae9e07b7a640bf848a0a7b3836715738d5edec752c8cc424ab12fa379b860f9f5a08bb82ced903f1792b2c166d0801b8187be8075cfe47822ef4769bef0
 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 7d8ce108ca3a..e98d48d5c1f4 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 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index d3bd1be41c3c..9198ee271e9a 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,6 +1,8 @@
 AUX paho-mqtt-1.3.1-strip-test-dependency.patch 681 BLAKE2B 0ed9a448e5e72813aa05ad1d37ae957150ad09b6d48a54f668a969e5e98ad25f8d55b223064e01f6773d0e42da3ba26f2e0a7f43a628ff68fee4b619b8de96c9 SHA512 dbadb8c1bd7691a973d8c1cd146ac9bd72407625ddfc5042b25bc81ff74af6d554c06fa3b2972637acc4a466e75a65c9371990e43bbf649fe5a5a22da2bb36fb
 DIST paho-mqtt-1.1.zip 159529 BLAKE2B ca3a39628c9cab8c4f3606587a5c853e79535b37a92991ecc32903967952cc00f6a9b967af0d343c4619f3e46ace1330baebc7c2e9dc231673f51775e4e1de25 SHA512 ef6d1a29480671413dbb655bd8f668b99f8587c14589d2180a37142b368e0ce058f8ed967dbfaa82f239c86e295338bc35c9f28a3ea39d21a6034cd8787a63ce
 DIST paho-mqtt-1.3.1.tar.gz 102133 BLAKE2B 905a51824d487cb125e06114bcba6b1ba862de4ab816db16aadb6ff761145fd4724dc6523a0c6837b8a16ced6730c5558612deb138bd95721f15054f5d6851a4 SHA512 95adeeaffbbd4b39d19fbd46feb39ec4a2ac923addd3c754a474b7a91d620bfca1678645c1a09c925e38a33995575944b873e3b2300d7bc2f3c5be3005c74d4c
+DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839afcc6fe91f880e29de24d5cf8e2491af81a30eb82c27fe63eee90114326eb75b06a32e05ec2fffed27b92d9601902 SHA512 2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c
 EBUILD paho-mqtt-1.1.ebuild 499 BLAKE2B 43da38aa5822daa6968d4a7b9514ddb86d0297617c59caede2453fe0d96ab29daa11c3ef6a38d9bda79c4f1133901b1eb4f2b6752b54162b684c63dca76f60f8 SHA512 b9c0957e161058d9594f7516fb31b2f45168a55fca7780b84e2ca695eb37b5acda3bee064fe2d4f3f603586565c2f806521123844f84924f325b75f9743eb928
 EBUILD paho-mqtt-1.3.1.ebuild 833 BLAKE2B 5363c1872085058e86c8dde20d56db395b34aac97f673d3e11749fe9945c1c3d28582128e2b3c69540e69cf26ab9498113fd1414ca1d17659f41f463bb64ee5f SHA512 4f5c9188b6cd1729ec53d12e0bc56a25251cf0468fb73464acfd3a1cf39faf885cbfbec3a951fb222fb862136e61879e3adfe5f80ee3eafd862b34d666abdfb3
-MISC metadata.xml 462 BLAKE2B bb478b5d843359050dbdb5ba67e9bca36dec28f6c65b6e89ac49cc00cf63c80abebc4525de91bd0c43f6979bc2c1a3b850243de39f3d5620a1f19d6b3c9fb8dd SHA512 bb6dabe3f0a5dcda951a9aa58ae0c883ceb7324f8538dd2962fbe216eeedf9af09829b79e35f5bbd8baa00cdfd16602411430276329554bb1908d6ca9609a9ae
+EBUILD paho-mqtt-1.4.0.ebuild 842 BLAKE2B 4fd0c6caf9dcd89bc2a31f68abfacc82203573cd82aa62e3399c6c304c761fae52ae47397557f56bd301848e97417731852b3f3bb33a2255f750e4c5f88194c3 SHA512 c01700aa20434c2bccddaa9ce0b59f6f90fc54540ac681f7515bda78f189741ba923079f9fcd75d55d3a49a0e867ee5a539a4163775e2ac08c53cec53824f609
+MISC metadata.xml 461 BLAKE2B aafc02224eae792f2800211f291493df079437667e706879cff3d8f7e895f16b8b778fe623280434f36ee878db2da6edefb459ad7b59b3fe5ec6e4dc8e3c7b36 SHA512 a9b6ab584e14070bcc2087a7027b1e36bc91706124039938a7bc2eaef5c14247afbe3c4827a22a3899c8e3c527f0d0ca0e394f1465b42e759e2fd26cf965297c
diff --git a/dev-python/paho-mqtt/metadata.xml b/dev-python/paho-mqtt/metadata.xml
index c1efb3bd1df1..87bf6367c9c2 100644
--- a/dev-python/paho-mqtt/metadata.xml
+++ b/dev-python/paho-mqtt/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ramage.lucas@openmailbox.org</email>
+		<email>ramage.lucas@protonmail.com</email>
 		<name>Lucas Ramage</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
new file mode 100644
index 000000000000..3f9c95cc4cd4
--- /dev/null
+++ b/dev-python/paho-mqtt/paho-mqtt-1.4.0.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,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
+HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
+SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	) "
+
+S="${WORKDIR}/paho.mqtt.python-${PV}"
+
+RESTRICT="test" #659106
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.3.1-strip-test-dependency.patch"
+	default
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
new file mode 100644
index 000000000000..afff70195bfd
--- /dev/null
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -0,0 +1,3 @@
+DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 535 BLAKE2B 65599a6f145dfcc63c8e4c00a311beec07af0f395c07fe2426f87a9cd394963adfab4fb81386b7f88278913422a684a715063bfd458044bec4eb4cb8af3fd413 SHA512 d8965db6b45f0ba4818fce5081109a888263917f41bad546af26fb61703af4738020c9975b2597ee8184a999fe5132bf1afa95385441b01791c1ee82d17199cf
+MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/metadata.xml b/dev-python/pallets-sphinx-themes/metadata.xml
new file mode 100644
index 000000000000..8c8ac13155bf
--- /dev/null
+++ b/dev-python/pallets-sphinx-themes/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Pallets-Sphinx-Themes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
new file mode 100644
index 000000000000..72e586a5bfbb
--- /dev/null
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx themes for Pallets and related projects"
+HOMEPAGE="https://github.com/pallets/pallets-sphinx-themes"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 92e7341bcb7d..134038f1fb3a 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,8 +1,6 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
-DIST paramiko-2.1.2.tar.gz 1196746 BLAKE2B c184e171fe550fc231d67473867db283b706a93aebbd13ffb2503e10d69e43b9ab712237e6698fccae13472f0cb8135b6c015381ac687c4c20d4d1cb1620ae00 SHA512 465c5381b1b0a472d2ad8e690f0916a5f51713880486c7b94cadcf85ea0a52569e18337ccfee5440869e4a0c76bd2b1bc15c414128c07326b40ecd36ea021466
 DIST paramiko-2.4.1.tar.gz 285151 BLAKE2B 767c4ad11da77c5c6796165057715f318cab417c5bae72cd97b51af94ecbf233316fd4286e35b2f855027e05bcf195c869b45a87f66954bee3bb98ae9d0ef1a9 SHA512 5a580d25e7911937f228ef4a2b89b5a1efd771f576c6c68cf1c36e1abbc38adbc6ad5dc91400de7112238fcf7803f5f26c13fe10be4af8a2a86af9398da7a8de
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
-EBUILD paramiko-2.1.2.ebuild 1126 BLAKE2B b34574e42668a2ae2275ab09bf34207f1dcc81adf7576150060dd6d4c44b2e2682c79262861d14f85bb657d58a4e28e111c5a9701061922a2e7b235f5d269b4f SHA512 dcd0c120cf12e8d6927d772c569c92b0bd67738e6ce71fe7ef8f9bccfec9268e65f61e57f265635f129c9c1fbb8f3581c7d445251960c09c231ae6f74d2e07f6
-EBUILD paramiko-2.4.1.ebuild 1518 BLAKE2B c59af4d2d001f5d565950a93fd462ba01e18fbb3f034b8a21b9833d3a4964477349fe9f1f1cbe22ad4263ea97296b88b180cbc60211f94fb7d17152138627e0e SHA512 4a4a9021b3f76e0340a89d8c8ae6c4973f8481dd2daa0a449f7f7ae8326a9c79bb512811227c1d1c591b62a0f793135480475b17d025b2c4c8df931e0f256f7e
+EBUILD paramiko-2.4.1.ebuild 1517 BLAKE2B 5fb5c4471ea52209dc32829aa4d1b45730de33d73f07a8d3cfdf04d51e782353b054c7ac8bca5bb20f411c5b374d69e6299b06d4f2b58ea864472419d0b844e3 SHA512 d8dae1a8b0e0fb2accc0eb83fb7371c5faabfab31362c0b171d6e98f46803167593978b18e0455c480bccc55c8bc80f729312c873bab18d7b09f67cf50064078
 EBUILD paramiko-2.4.2.ebuild 1672 BLAKE2B 0cf3b93c6ccbd9dc188e0e42fbcf2d810ded48b26cb3399dea710d2307a6bf278c96495ab14b0f83553e916c36727f768443e49cc8bd15fd351c1097bc757c91 SHA512 507a9f2d5b0b166523b23e1ae4881f984d69587c4cdca8611e325cc29fc89bad9ed2094f9eadeb11898811b57bb14928912da527947e94dab12b0c637e775239
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/paramiko-2.1.2.ebuild b/dev-python/paramiko/paramiko-2.1.2.ebuild
deleted file mode 100644
index 0206b406c835..000000000000
--- a/dev-python/paramiko/paramiko-2.1.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/cryptography-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Required for testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.4.1.ebuild b/dev-python/paramiko/paramiko-2.4.1.ebuild
index aba3b71c7215..b7ad77c8a4e4 100644
--- a/dev-python/paramiko/paramiko-2.4.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~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 ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 357d72f54e22..7b5201a513a3 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,5 +1,5 @@
 DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
 DIST pathlib2-2.3.2.tar.gz 33764 BLAKE2B c652069d60f489e482c6d75c0a201c5ac67c6b18b4acd6c8b00f7f12832f7165a45293d93ca7f6c45f1451c842e59931b6b8c45608de1bac91ad822cc3536105 SHA512 46ba0cc8b26006bc4cb914118b7c453dc49cc8a80147ea7a4b3d5a17e97d5538c5d73a3029bd7e5b59f42f256baba30ea273382e57468df1a459ac6f7c237ddc
 EBUILD pathlib2-2.3.0.ebuild 1060 BLAKE2B 936400ce062dae53fed477ce5f201b60e2bc255bed945a8e3bdb9f56d8a91a4e7fc7a53ba8a391ec9e294bdfd3f22732a05e8fdcb937e693ceffcafd53b264e4 SHA512 7d39226f0942a6e513d7053ce397b4e67e73f82621e356a83ca0234906bd93ca82e058ba4d72acdb8abb1b12db29a97ccecf47eda96e8d942ec9e9cd1dfc2fe2
-EBUILD pathlib2-2.3.2.ebuild 864 BLAKE2B 72aa9a0aee91faa5e85720d09146cc77e7ebcd7732008246a1aedb92f9def96b5cf941d73393d3f6e118b39236021a070855a4acef559af446458b88a88e677e SHA512 00be74455f282d5474041a81fe3423bc954fbe13935ad12a67192dac469dee393f4b3cfc8346940f8fdc450bfb78e9df2c4b60d980372d91250dfd014d44b5e4
+EBUILD pathlib2-2.3.2.ebuild 871 BLAKE2B dbea56e09cdd93023740966bd6a6391290d68ca7942d63a95dc884f05fdce3ba845de7e86b33055658213785aaba53a87ba7d4ea8f426b4214e65ca47fb509f9 SHA512 4b3b911c48bc7ba62caf220272d77dfddae36c44d94636111e5ab035643e33a7676737baf6fabf3c9495847fc9d34f82f8d82680aa4f107baf31fe4d905be887
 MISC metadata.xml 439 BLAKE2B a6ff80028323e5e3a48832388ab9d88a6633815784b079543d2fae49a43a5c6aa25ac15453f4d564e570558fb62ce387cd5b3450d552c009e153002e5b43398b SHA512 e1912b7e9c099ac259aed03a38b7bdf27bc817e188901d79b89500bf1d2ddca1881ff55f06310758f6cf6d0fe581cf5ac28f14f64972060fa1d620699cfcbaca
diff --git a/dev-python/pathlib2/pathlib2-2.3.2.ebuild b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
index 8b607de7f01a..9aa254025339 100644
--- a/dev-python/pathlib2/pathlib2-2.3.2.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pep257/Manifest b/dev-python/pep257/Manifest
new file mode 100644
index 000000000000..a0d6abdeb8b7
--- /dev/null
+++ b/dev-python/pep257/Manifest
@@ -0,0 +1,3 @@
+DIST pep257-2.1.1.tar.gz 55760 BLAKE2B e470b006b5db04c4bed5c3145b14b949980c71d1dd91dbe34d49599063aaf1cb1d0842dfb992e5d471436446455bde2d309ee573826c039540fa99adba3f828b SHA512 f23939e0350094c67565613bab4ddf285dda5a7379e6ac2493953d6e60ab75588143fd374715765d2aa0728e7117d02e91312dbbe5a9cad28aa8e8e7f68e3bc4
+EBUILD pep257-2.1.1.ebuild 721 BLAKE2B a836a2c55c622e51d4bdd769b85aab43800c2c94e6a6d15b8b9cfd7eb45bd1e4b46915ecd9178cdf7dc4dd8c7998bfbefefae56d599b16c87d6982228c1c891f SHA512 11bc89b864b408b4337116aa4b0af17c85feae4a93e93a472a2d1f4aa660b8167662335318bcf7011549d3795613b5af00d5c3999b958c3c440bd0777a2e6a6f
+MISC metadata.xml 464 BLAKE2B b427cfba180d91335b6cb1b632d0f5cf2f2d468ffc31917cd1cf03248ccb8baf4359357b2a8f6018a663ee973e8c4c125a5cc19a973b5f017420c1a929a980c3 SHA512 07dfa48f689377623d1a3f0fc969b7b6377d6623937449ad4bd67003583a218a309b229a5815d93adb57bb97edb8a02a90321e29520ae291663e7fb75b9bc2fa
diff --git a/dev-python/pep257/metadata.xml b/dev-python/pep257/metadata.xml
new file mode 100644
index 000000000000..303bad4bb36f
--- /dev/null
+++ b/dev-python/pep257/metadata.xml
@@ -0,0 +1,15 @@
+<?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>Gentoo Python Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+    <name>Patrice Clement</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">PyCQA/pydocstyle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pep257/pep257-2.1.1.ebuild b/dev-python/pep257/pep257-2.1.1.ebuild
new file mode 100644
index 000000000000..38e682f3d835
--- /dev/null
+++ b/dev-python/pep257/pep257-2.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+MY_PN="pydocstyle"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python docstring style checker"
+HOMEPAGE="https://pypi.python.org/pypi/pep257"
+SRC_URI="https://github.com/PyCQA/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index b1691ef7f837..212eeba33a28 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -4,6 +4,6 @@ DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14d
 DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
 DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375 SHA512 0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
-EBUILD pillow-5.2.0.ebuild 2723 BLAKE2B d6ea78cc9c4bcc83d6778397cf441365653bcaa0347ff9392986e5750e186fdfbcd499d53e3dc80f2521008655fc428171fc12301780c63d5b15b358b84602da SHA512 e00fec07dc7fb04064b3de979ccd6ce7cf5f8a96fcba63ccd87dd4b70d09fcd6f4dbdebc2479296d9ad4e1f1b9477922d53267264261e1d01211f865827e41ad
+EBUILD pillow-5.2.0.ebuild 2721 BLAKE2B f4c532446efa2fbaaae11744bcabef21cc192a207d0dc849b2a5bcb03713b8d9b9780d576ea05a738da71ca8bef00c8703a90aa8cfa091d0f3dd1f685445d566 SHA512 58cbb107071732acfe26a2bb797748fd6e5557148cc52ce6f0b4186b0ed98c70feada43924a73928417a9a4a6fbf5792120ab136213df32da2900ec69292c05f
 EBUILD pillow-5.3.0.ebuild 2331 BLAKE2B d453688d152bd345242abd0bc55f51e35ebf8be5fc623cb121287b4ade989021deb10c226a77cfb4dea439df040d1befff2ef176d2ab3511485630d42d640cea SHA512 2799810b31ebf952d513221f81e169b797d774944a539f4a52104e855f3ec9714f7fc1004f6c080664ee26aa0e19ccfb4d459d9277e3bcf172e0936a12613df5
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index 2fe691b736fe..3ca056dab0f6 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 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc 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/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 2ba260b98cdb..bf0a09dd6f1b 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,7 +1,9 @@
 DIST pocketlint-0.15.tar.gz 22334 BLAKE2B f07d41d212192281008173f6314c4868ef993dd7c8220d21e2d45d461cdb5377c61acbd8d5bf7f915928fd007e844cd50f8b5ae9b87d1a6d7eaea97f0529b1b0 SHA512 0d3e3061635c8d88f4e31aa11f3cbb85a1d9acd3064c17b7bd3c50eb90f824f17a903c55bace8033bdecd626d792ffee091b8b5719b2993f475a4321f033c66b
 DIST pocketlint-0.16.tar.gz 22573 BLAKE2B ccf502116d1020f6bde8c0915cd83d88ac5c78c207feeb184ab4f244b23b771b4384fce69d6d562e84bf6ea2ce2a0a0ea6f65be6dfbf9ec26ae6132a86e1116f SHA512 3c7dc76a07e7654ab7bd6bf32b68d296830cab9d6e5c17dcbb5df6af0bdbecd4e86eeff70ea7e857951c9d2f35988263e86a2a559de2cca67c668a864aef431b
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
+DIST pocketlint-0.18.tar.gz 22848 BLAKE2B a5a9abc3543026b1cffa66dcf6204342c5d1ee20219423174daf725688a381a5d58a403b963e95bd6eede629824ccb72bd93161def56778fcaca9ea115e2b6a5 SHA512 02453af8465598053b9591a95d9e62d2cb8e2a218e04ec6903ed166959b7e1eebb5d226b9eeed77c7b94a254808124ec9d2078e102a0bbe9487e0f328a2d3e86
 EBUILD pocketlint-0.15.ebuild 483 BLAKE2B e1275965b450636bbee4414361331eb92e0460b7e207ee50ef242dd8f48c051b002ca22585e3639a57b3add690dfd3e7327a33a79eb2ec681f5b5a4139b6a475 SHA512 8eb83de3bfb057d21ef54fafb82eba92b3c23b37eb115dd844500557f368ee8bb62df0ed541b6284451772aa29e49a56e95925799478e9b7e431231d4c79dd19
 EBUILD pocketlint-0.16.ebuild 490 BLAKE2B 264e5c85b0706695fcd7b23c7c33edb1498ade0dadb70fbed1232d04670f64a3d5036db3367e82f724e572c2c422330e3abe3694beadff76d2db27a104e47540 SHA512 5f3c54df0ff04a6a116aba00d7593088a248c2f8e6cc105af2e316a75f3753d866984db0ce2bb94f0fbb808c4624a8c72fc7f859e220b6cae5c5499c5229c906
-EBUILD pocketlint-0.17.ebuild 489 BLAKE2B a67e8b0a84e9b00694516d2e1258053936faa0a68e67a380e8abae68a3cd028abc31c512063952df43b9c328b70bcc718e98700b52042e3d2597831005084093 SHA512 b006f2bb67cac803b24c12814c49e675e462953200361cbfd8ca522ace6908d18d3808eec8fab5a3627854496cb1ee8d4378d675b7390c2c131e8d451390f08a
+EBUILD pocketlint-0.17.ebuild 484 BLAKE2B 53c73b134365db1b096f4530cb86b9c40e1a9dcb22f438fe7f8504fae4a8699fdf2df38a823399733957bb46cf48c629ed1e2b8dda42e8421ad622994cbb315c SHA512 52ef44009daf6dd1641ed7aa34effa967e64b3de2e61fe8114d2686fc915494692ec3f3084e1e220d72298747bf2727373a6f0fd10edd2236f7cf1f070553230
+EBUILD pocketlint-0.18.ebuild 489 BLAKE2B a67e8b0a84e9b00694516d2e1258053936faa0a68e67a380e8abae68a3cd028abc31c512063952df43b9c328b70bcc718e98700b52042e3d2597831005084093 SHA512 b006f2bb67cac803b24c12814c49e675e462953200361cbfd8ca522ace6908d18d3808eec8fab5a3627854496cb1ee8d4378d675b7390c2c131e8d451390f08a
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.17.ebuild b/dev-python/pocketlint/pocketlint-0.17.ebuild
index 4c9d535328e8..b7e157b6eeab 100644
--- a/dev-python/pocketlint/pocketlint-0.17.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.17.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
diff --git a/dev-python/pocketlint/pocketlint-0.18.ebuild b/dev-python/pocketlint/pocketlint-0.18.ebuild
new file mode 100644
index 000000000000..4c9d535328e8
--- /dev/null
+++ b/dev-python/pocketlint/pocketlint-0.18.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Shared code for running pylint against rhinstaller projects"
+HOMEPAGE="https://github.com/rhinstaller/pocketlint"
+SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index af262dfe9bb1..76790833d926 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -7,5 +7,5 @@ DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94ae
 EBUILD protobuf-python-3.5.1.1.ebuild 1247 BLAKE2B f7566fc24019d971eb0895f5f5dab2f86688e868d86fea4acb211d5d5f48b843b995dbae96c1eba17044db12c83b50ea402b546351a991960f383f79cc4a1153 SHA512 6d96b5827e4a569d60506570bcfa38796b7e240c85db8aaae215f79841968d13df63eebfed451f1aea8f9412267ea491eca64b776034044a64711951deb4b390
 EBUILD protobuf-python-3.5.2-r1.ebuild 1333 BLAKE2B 9c4dc72f815cd109bf397f4c5ac251f54c53d410682e94369b3a2ab62d084bdf6d1a8627c11096dbedcea565d157d96d428f447035766105b7affa1bc5e23a46 SHA512 b84fca10588e8faac8c4bc95e50d7a39a67e919e0c4a28c751f8dba9a7b421435a0b2df77d5989862d4d63441a4625af3b75b6ef59814f3d41d5da2906ea6eb4
 EBUILD protobuf-python-3.6.0.1.ebuild 1345 BLAKE2B 33781333a986e3212e68b01b0858eaf1c814559ddcc32793ef525199cfc4166de4238b1f488a3db6a4c3766d2873f0fd38a1e4ea6e602d25c3b790e616059ad2 SHA512 ccc326eccb38f08ef9f7f314ce0ab62cc6e00019a1869e7f9bc65fcf68bea23ccbc9adfec838f2bbef5daead1811a607903272e367900dfd0cb99c4024e53281
-EBUILD protobuf-python-3.6.1.ebuild 1404 BLAKE2B 4a860891db48d64b9527a508ee07341e75611d6b61b8a6f2fa6d0d77271eb60937796d9bbac8183a0b25b1e416b2498ea71d52a31e793d7c5f76890167ac50fc SHA512 3f66a54d7a3454cfcb0ea891f0b3def6497d7bf1f3bf620be53ed3f52d1110857c6cb0a2d25be6a62a37e67194e7b9b65232352abdbf9b1ce71b51e8a0b7dd65
+EBUILD protobuf-python-3.6.1.ebuild 1400 BLAKE2B 36c94cae04ce83af577493a05e604db9707a91c680b9c1341f40f72bb5c27aaf3282b1224e4072845ae8036e3ed8fd0a82bcb80169a36f5cc5b6b623f6d9a464 SHA512 3f622d60cf98492fd6d2a092c352dad32960246fe139a0556cfb2c156cfde02c34438c7994ed50739d5af9f31416f9d7ecf0126ce31cc3c79afa31267e3280b6
 MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
index 3d8397734fcd..92eb2c7adb9b 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 683b47aab804..76dbd8eea955 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.7.tar.gz 420300 BLAKE2B e096997d22577f90cd6fc6019f2bde8855abda0eb67b496dfb8cc8dbce769e0c7da66524ac6d0c059e7a2d074a1675187af3177d904feab5a76b9b8a72c63853 SHA512 553c6de601d4c4d0c6a9dccc3eb8a449f1b3a18cd71648395ea3b43da3c92aef1565f6ce763872855d68b3de190dbd04c7f5be5ed4a79b0167d737c1825c0e2c
 EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
-EBUILD psutil-5.4.3.ebuild 797 BLAKE2B 0044cb1cc02e6fd6faa6f5608aa718810bd78c891e5794ee9abaff5efec7ec2b9945d562d2360a3f3845b80a2d2c0990a721b8172ee01ce1e78d1e33c9ca2c96 SHA512 b7449a7a99f7e522a24fff8d7c1e236e0870881f23f49de79f1a3f3a33a10fd1c87928828a7a925050609fab0d6daf38e0a2fc4e681b7d4fdfea12d452a00c59
+EBUILD psutil-5.4.3.ebuild 803 BLAKE2B d92861fa2dc7a0ffc2a6c0e8b44ecbc127442f23270ed45960518ca7685daba50e8becc3e82c9917c011ab6d97bc0a95e837670017c3053d4daa68035870f941 SHA512 4ce30f78e60eff643b612747a65c7d5664249659286fcb27ecfc62e761781d8db747a739ed0ce32e28f05c63328e5ef3d969c4c15e0a91ecf5bd011426d1f789
 EBUILD psutil-5.4.7.ebuild 909 BLAKE2B 5d085cf199dc202cd0668f7404c8647c01284b0d20f7545d7dc199caa313381bc66d014db22c7a153ab5c5d5cf535e939b2b31e82f8a26c8a6f26489c422063a SHA512 56ccca156f10670de43c5c20969c4ca8078bc9313a807752faf244c2d9ad58c7f01119bec94b4f32f3ccc9314d6f54196e11e69dacb94df229868353b62fd05e
 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 a72c036d6003..110d80992963 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="alpha 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/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 35654317a040..5ee97871de01 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -3,5 +3,5 @@ AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d8238
 DIST pyalsa-1.0.29.tar.bz2 39481 BLAKE2B 12644bad27c06ce4782ef3396e883bf1aab521a39d813f11d25f910c99d899b14b618f21568bdc1422a3ed448e7421c8b8129dc19c8fcd0f9c0b595f9fbae370 SHA512 cc885094b020ea6e1735391cfc73a11e29f7d59b1e24a766908d57bec0fae4f490616c59f04eb74648f8ee610e76295a9501ab31a2513e921bcd8b4fdb104683
 DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
 EBUILD pyalsa-1.0.29.ebuild 739 BLAKE2B d933094b659c639a6b794026a3ad7b7ce844375ac28d2e2e565c76510131fe57c5b641bf78c27c4fbeacffe346646e6498c5aa567263e79bedc76f39774a581e SHA512 5052d3ce56c90e2ae3c1a8b45daeaeda872db948fd3a20f2011db75bdb3532c7524e0dae9750300e6822f9893c3b18d914b9811159c9800be44abdda8ac2597c
-EBUILD pyalsa-1.1.6.ebuild 617 BLAKE2B 54ba5c6b566859df89b59769a613b31a4c5ddbf634db442f542a5f0a39ff4e32fd165a42cd8b4d0f7453d4fefd7e2411cd1d0d27af267f21127d6cffc499fe68 SHA512 8e0f366591fdec105e7717730c392ede2c67eecfe3a88261fae3a9a5e0c92d8d991d94d9fe7ca9abac28e37447308d371cc5183ff1e4e2e815a4358ea364cc68
+EBUILD pyalsa-1.1.6.ebuild 618 BLAKE2B 1c51cd24d81e5b29bb45adce2659f5c48d6afa905574e65147f436f8bd9280dd89c7e0e297b0524543a99dbf356ac3a8e22336302688c01a70b25c82644e2537 SHA512 36d3996940be532dca31b547ec5e98b350878739d30ab5f32955a6eecbab7fd73dd67de3a5ee09ac7cadbc32a26134db9032c3568fa5a19e53e256dcb665143e
 MISC metadata.xml 349 BLAKE2B 743c640ee72b49353f6b3b19b958609dc420f187753d9e63e292c9cdfcb6c183092953dd16c3cf0f91ee13df04b9f12a2a9893a56cacad2c70535730294d6af1 SHA512 ef94ac2639e61234b2140a6dae1683f99c3c8bf564a37d22e54612340a2d0147037e590ef8f6c639914df05684f3d62ebc96a9e2176cab82ba85e5d87171ec58
diff --git a/dev-python/pyalsa/pyalsa-1.1.6.ebuild b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
index 9f25f2ab8f50..65b4d5242735 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
new file mode 100644
index 000000000000..f4826b437172
--- /dev/null
+++ b/dev-python/pyclipper/Manifest
@@ -0,0 +1,3 @@
+DIST pyclipper-1.1.0.tar.gz 53916 BLAKE2B 53b7b6609d602cdcbd8c8f4ceaed999c97e155747f7daeb630333f18fd2719040d118c8fa3d0e60a1ccd92c20aecb355ec9d4f9c22f66dc07b14a919f981f667 SHA512 53371bc2e0439f72ac4ebf96f833c4451d2b1924d7f9cddcbac79a0a6d6bd95ac1fb3fb08e3ea3fcf3ffe22cd718d31c7c528016605b275a3e80642e58546d74
+EBUILD pyclipper-1.1.0.ebuild 696 BLAKE2B 743ad9c21a3bfb972f968f7ae226d3724ffa3d86a9e1afd4e2b2ed286ce726ae76d9121b104233254cd073647dbcfe6a42b9fdf76fa4081e1084cf941bfc3439 SHA512 5b6d3bbbd2e62f6c9f734f2638020634ca5dbc56673d59b1514a9a880423fca709b2844216c9bbab044865281232eb677dd7efd4e4bdb84d967760213d40d83c
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/pyclipper/metadata.xml b/dev-python/pyclipper/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/pyclipper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyclipper/pyclipper-1.1.0.ebuild b/dev-python/pyclipper/pyclipper-1.1.0.ebuild
new file mode 100644
index 000000000000..e639fa0cf58e
--- /dev/null
+++ b/dev-python/pyclipper/pyclipper-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
+HOMEPAGE="https://github.com/fonttools/pyclipper"
+SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+"
+RDEPEND=""
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 077d1f123e43..09362bf3f1dc 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,5 @@
 DIST pycodestyle-2.3.1.tar.gz 89460 BLAKE2B 0b7e23be13830954277d521262e9504ade8a4d0275a77e6365201ccffae955a8f505a1cd5e739145e1fc5551c3b956ff9a51bb57cede819f2886ee36637f7f9e SHA512 276bc21b4e6898e379be88f3582135a21314460ad20d4b6c3e12825ac1a72082b2c08bb62099e704c3222f879a1098d0b305132fac1095aaa60ca239b9763a2d
 DIST pycodestyle-2.4.0.tar.gz 96665 BLAKE2B 9c847aa9c9ffa1f401595d1c2c3f81f971f69628fb34d4e572ccb99203f8e9abe8101302d61c4ae7d330c03e7d0dd5e252d658065b7ed6660dea186880030529 SHA512 cb35238291fed30f1a4363e65b754165772d01e6006e19ce31769691aed17411cd893899fcd22dfca0455401bee899097fff6f3d63825c7656f186e37b7da3a0
-EBUILD pycodestyle-2.3.1.ebuild 1126 BLAKE2B 38e17bd10ae264d2741decd3ea5ee3a8a98624626c7eaa5db0c315f64cf7090b1c1566eacdb3e7cebce6acd4d6a6abb161604ab15a7f08bf61dc3ba5974825dc SHA512 7392a620d2e206dcee4e2e2807abd4bc47b89f580b2b7f95799f4bde0d40f81eed07d2e6fac6290a97b06d56b3a9256cc184cd1ac746de78dff957c1eab54138
-EBUILD pycodestyle-2.4.0.ebuild 1131 BLAKE2B ff730f7a7ff939a562bedf599962aa408e8dbbb6f4fadeb165c5284f058ebbbb3e2b3375e08db730920df538316f9c67d00a2dd3ca70e69523bd120df26f75ed SHA512 b2246855fa69f010dd86c17fc1d8727bd8c5671c57341bdea728c482c8c30201f2047e663e307a88505bf13cd35d3bb64d5e6333b6a857faad6d643a7d762cff
+EBUILD pycodestyle-2.3.1.ebuild 1128 BLAKE2B a4e4780d696c7c25fba1f67bb24552fc15ca18b30ff0e6217e50a01ac3e206b1d52b5ca6ff9b62314f093319c45066ee05faf94d010386af6c2603d9c83c0a57 SHA512 4a39dea3ff0d0dd163265f73a5733be3ceeed912f43f83d8bd6c506c354da36698ccce9fa344cb8a3de5e9bb07efb34873dadd6865a008649d20bb1ea9f00b34
+EBUILD pycodestyle-2.4.0.ebuild 1134 BLAKE2B 9ad30ab0e04abfbd1c6a2558b77c0a988d808d1ce85353657d7396fa3b985da14ad2a02c603278c751a9f1e53a865eabe8ee743ae82055dfad0560857d0a526f SHA512 2bc421f4d0f273d32f004dcc9a06b1d48d40af9875a862f793724d9b4438c5852822e9f796c6f0a188d9f12cea3c5c6e9904359d7114b170bea63dc0b7a9c944
 MISC metadata.xml 335 BLAKE2B 9ecbe193a8f7aaf12005920847cd3d8a34b868636a943ba30465a4eead591ce46d422bd0b0e777a86f0d5c4efd5ed925a1476f18f659f18e622dfab057df0d8e SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
index 6f1be99b311c..34a76da2d4bf 100644
--- a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild
index 41243bdcb870..49ea4806aee3 100644
--- a/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 1c61717f4e67..5c126b99dff1 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 2529 BLAKE2B 0d2be096e13b7d76c204d7c441a4b2ccf41104066da347538ec458a7a2a4a482166fc59bee47ad65c41311d32bc28cb29ffff067ce37e6b3034da2c34cc866dc SHA512 bf67bfe6733a3f432a81c5c1d68284aec3c69e80fdac90c62381339c765581edb25abc8a01398104bcc5883021161b7aed918d0ad8ea1827f4a5b56cf0b64386
+EBUILD pyftpdlib-1.5.4.ebuild 2535 BLAKE2B 8e3a98907e1804a0c375dae0f7e14506a96b4e53e70c6fe593d123b1c9621ce5500401c3c4bc731d1cefb56391ed58cfbd4e931191fced6e26c87a9d8b549a92 SHA512 88ea8052ba73bba8b4368d7c050d285f8baa69a2fbfc4117033f5707ca64cb22e1879efd7ce3ff7934cb597e7d55ee1d50fd3f19030b448125c977bfb1fec7fb
 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 1633ef26aff6..d5f27bb0cb00 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 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc examples ssl test"
 
 RDEPEND="
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 0321ca322df4..1cce9abcd36c 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,4 +1,8 @@
 AUX pyilmbase-2.2.0-configure-boost_python.patch 782 BLAKE2B eaafa48b991524400c70f9c6c156ae8abb5dc25132dde1f001b8852efc7fc6187fa27aec533c0022d15efd1ba60342c051f071d32582e0675838a8a20c8593dd SHA512 ffbba202eea36a14a9734633a9510632f8859bdf4f9791f72f020c9600a48a1941e58ea74d5f6b2b9b1e03d874f04cb6e9f5e8ef9cbcc5cd604e0b33ce297772
+AUX pyilmbase-2.3.0-fix-build-system.patch 1169 BLAKE2B 6afa0faf264ffb4c863a148684d162ef3154fa2802cffb2802315933e5df4781fc24d9fca23a985627a29d123a53cd4d6815beaa3b56487cace67896a22ae57c SHA512 691cdeec3361954fd41c085b38f8ec3a2a6a024ac174aeecb2b32df83844c3e25dbffcb3905b91e0b516eea6ac4597a067bb9ac794a25f5d1ac8502094b4095a
+AUX pyilmbase-2.3.0-link-pyimath.patch 454 BLAKE2B 5e2bc6d09bb7012f8d0087aa0d76b8a89280349fa978cbf926cd9cbce1b2b611a6862d73da35642e037ba84161e658915831e63ed9aeafac9db5669e38e5c4f4 SHA512 760a217d5af2e8de48f52351bab18370f3a74453135a401d8f5d964d3c445519ddc41a853c989c4f29d492764e42dfbcf4a8bcf839e43164b4bbe3e125e9d1fc
 DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344
+DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
 EBUILD pyilmbase-2.2.0.ebuild 1129 BLAKE2B b3876947d8104e5dca92dc6e02780228b30c5c3b3fcf0975b8a8876b3b48e8f95990d16b1a94101626d439972128e0c4f0d901d847a93468f88592e92f0855bc SHA512 abe726f6a70ee90242eee1a9b70ca8386e09a1c7de32e30372407cf4c49ef653e260f392b15407f7d13d76b737a424699d72d0c35f92793c470bddeedbda3e65
+EBUILD pyilmbase-2.3.0.ebuild 1248 BLAKE2B 41abe6232321ab9a84d0397cd771c9cebf0cfab053a2c1aaca1570f5e2a548b2b5baa616f1f64753442450f8e3742b4250f6ab1a63300350f41e58d81d64124b SHA512 25237d6858103cede2d287d546f119ae546422aac9209091d84f50d4f68ca05a262ca1b9064131e804266ea2843e8e088107e8e67d1b1a3ba11df435c47ad511
 MISC metadata.xml 537 BLAKE2B 88a1d7d89fac2094eefd766ad23b01c12cc49bff080e83f6ad63318294c97b18ecd83c6d908979ae8345a6601898b7a01295d9db886f0de500e460129d9c4a6a SHA512 c685de970979ac4ad5c3392a4b41b23bb523da5d003e3f6757a8d61fbdf0be1ea2bddc1a756176a9887101cc5bd6e19f5ac7e038e9dc9e5976c676a8817b9a87
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch b/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch
new file mode 100644
index 000000000000..bd35f87a0e0f
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch
@@ -0,0 +1,48 @@
+diff --git a/configure.ac b/configure.ac
+index 5cbf273..9e80b48 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,8 +4,7 @@ AC_SUBST(PYILMBASE_VERSION, 2.3.0)
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(PyIex/iexmodule.cpp)
+ AC_CONFIG_HEADER(config/PyIlmBaseConfig.h)
+-AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE
+ dnl static python modules make no sense - disable static
+ AC_DISABLE_STATIC
+ 
+@@ -20,7 +19,7 @@ dnl Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+ 
+ dnl
+@@ -164,22 +163,13 @@ AC_C_CONST
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+ 
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+ dnl Platform-specific stuff
+ case "$host" in
+ *linux*)
+-  AC_DEFINE(HAVE_LINUX_PROCFS)
++  AC_DEFINE([HAVE_LINUX_PROCFS], [1], [define on linux])
+   ;;
+ *darwin*) 
+-  AC_DEFINE(HAVE_DARWIN) 
++  AC_DEFINE([HAVE_DARWIN], [1], [define on OSX]) 
+   ;;
+ esac
+ 
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch b/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch
new file mode 100644
index 000000000000..878c270a885a
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch
@@ -0,0 +1,13 @@
+diff --git a/PyImath/Makefile.am b/PyImath/Makefile.am
+index bf87542..ad69515 100644
+--- a/PyImath/Makefile.am
++++ b/PyImath/Makefile.am
+@@ -82,7 +82,7 @@ imathmodule_la_SOURCES = imathmodule.cpp \
+     PyImathBasicTypes.cpp 
+ 
+ imathmodule_la_LDFLAGS = -avoid-version -module
+-imathmodule_la_LIBADD  = -lPyImath @BOOST_PYTHON_LIBS@
++imathmodule_la_LIBADD  = libPyImath.la @BOOST_PYTHON_LIBS@
+ 
+ noinst_HEADERS = PyImathFun.h \
+     PyImathBasicTypes.h 
diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
new file mode 100644
index 000000000000..fda4c62db801
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="ilmbase Python bindings"
+HOMEPAGE="http://www.openexr.com"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+numpy"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEP}
+	>=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_USEDEP}]
+	~media-libs/ilmbase-${PV}:=
+	numpy? ( >=dev-python/numpy-1.10.4 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEP}
+	>=virtual/pkgconfig-0-r1"
+
+PATCHES=(
+	"${FILESDIR}/${P}-link-pyimath.patch"
+	"${FILESDIR}/${P}-fix-build-system.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-boost-include-dir="${EPREFIX}/usr/include/boost"
+		--with-boost-lib-dir="${EPREFIX}/usr/$(get_libdir)"
+		--with-boost-python-libname="boost_python-${EPYTHON:6}"
+		$(use_with numpy)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	# Fails to install with multiple jobs
+	emake DESTDIR="${D}" -j1 install
+
+	einstalldocs
+
+	# package provides pkg-config files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
new file mode 100644
index 000000000000..d02ee70613bf
--- /dev/null
+++ b/dev-python/pylama/Manifest
@@ -0,0 +1,3 @@
+DIST pylama-7.6.5.tar.gz 33680 BLAKE2B a80d976a6a5e7903f3e4aa6b36777b6a938d52980232d1858bbd602d277bce4b058f8ad404e6dc6692e6950ff36d8e698ff0e3afa44c06334a6bdbe728f15cdd SHA512 0ce2438622cdb3e85fb70d4246cdcc29940181dce82a1a641f6b7900a13f09cba0f871038992019a2e1ccc720dcd6dd5e21786bd8a2df40479a34c500a80fab4
+EBUILD pylama-7.6.5.ebuild 999 BLAKE2B f7fa24e0921f48d75ea85a06e03b968f4b5fb8bfad3b60df44618e594725278a9d80e655b0920361eb135085ab09494740ae01ad6167b8d63fb47622ec567fea SHA512 25e425b5072bdb19a055434ba80334a283d9d44853189b0d711d40b7a54ab6b77be53bdade5ebce669996477d0081dca110e90eaee520257543c82e6ecbcc9bc
+MISC metadata.xml 364 BLAKE2B e25838a0c27434d26117da6629070f6a3af99f5e48bd572812b2dadc979b99d551c3857bc4fa5ef23f7c9f53e16ed8bd2c5b91f1a1cd624047abd292e5fe5399 SHA512 add19bb038ff79b28e6af0aabeb1cd634214a38892533c3a5e4ca2c1ac9761e758dace11d47a276b449f9e895d74829b5532b7566c1b152e6e3b3dab625f36b9
diff --git a/dev-python/pylama/metadata.xml b/dev-python/pylama/metadata.xml
new file mode 100644
index 000000000000..15091e5bdcfa
--- /dev/null
+++ b/dev-python/pylama/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pylama</remote-id>
+		<remote-id type="github">klen/pylama</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pylama/pylama-7.6.5.ebuild b/dev-python/pylama/pylama-7.6.5.ebuild
new file mode 100644
index 000000000000..6b5d0decb02c
--- /dev/null
+++ b/dev-python/pylama/pylama-7.6.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Code audit tool for python"
+HOMEPAGE="https://github.com/klen/pylama"
+SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# pypi tarball excludes unit tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pep257-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-1.5.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/eradicate-0.2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/radon-1.4.2[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v test_pylama.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index e2a9a62887a6..dfe4e433fc20 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -3,5 +3,5 @@ DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 EBUILD pynacl-1.1.2.ebuild 865 BLAKE2B 7f1f6c7a037719c5e94cd46eaf9c32c2949b64f3371af5a2254da8dacdd0633bfb5d0a8fe0f8f131214499d186510f48c89ffd6c9c395ea839d47825477409cc SHA512 57a53e92e4d562a826f8dafbc9691f92beca1aa6c112eec0519dafd46efb51962c0214b7733240aef2657f612d2fd3cd1129fc0c3efc7fb82838e06f4822d523
 EBUILD pynacl-1.2.0.ebuild 861 BLAKE2B 50369302f5b01db8e932ae94c6e41fce814b3c446910fde9aed2ba92e067d10e642cbddfe2e55b79311308b5dc71f98123a5e5926de18a2336b1632226b786cb SHA512 65695f94648eaafb6c163f3f10e221a0c7e1523dba6a15ca831f2387952d13a7b17327840ea2af7283b9ce1d13b2bd9512e72b1bc942d4885b93061c4f204d32
-EBUILD pynacl-1.2.1.ebuild 1000 BLAKE2B f9e2146586401d230c35cb66dd1e44826d764a6e04437905a289576e91cbb15517bad4e76fbaa90dab20e48005a25b325fdbaacaec15edcb282e608a4bdc782a SHA512 179ec01a1d9f2d4bbb72e231de0cb54d69670ac52d587f1616718501928483d9451cd8fd7ddc67589e2996b09721f5f742b5e09d45b9b1c280c34d76389c167d
+EBUILD pynacl-1.2.1.ebuild 999 BLAKE2B 36b332205b3514a87f4b1a1cc46c2ee668d440c8bfb8b1cb0023790ccc3e62a1d1dd39b36d854f8c748e6822a683ab8f87b776868f2967b0071db0ef8bc2c65c SHA512 332a2e93c943e7d0faaf89bc4ea9b7f414ee5d4daf3a26ca5404c6ed0cace5d469678635a4da483fb249c14c89c985c38d1cd9f8688af539fc44764c3335b17e
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index c2cf1214fc3b..0ec46fc711db 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index acba256a9636..5f62db3ce618 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 592 BLAKE2B b0d05af459b4fcafbc41868b19f709df8934191b4e26689669f446c2035a3aa5c316d6f53a0d7bfaa44ffe18260b60eba01ce4247c3f064294e1529e26cb45cf SHA512 40df0045746fe5671631ae47da43e849068daa5cdf83aa4e2e5a590f9a822cdc428cba202041d5a9c2f1a2cf31e794e604c13adebf50b4dc9eafae202707e31b
-EBUILD pysendfile-2.0.1.ebuild 572 BLAKE2B 1679a3bbd2e1bbd2cace62ee8ab786b51ecfbfee9abb54cf5a2c136ed7338b1c104382e9d7d198e68cddfe0db1ae2e86003d18179310c005f8e40f8450d2585c SHA512 47d979b9bfbf1abb86d95a8481b8ffeac5e08a646895d018f806c39cea630ff234d3eb53c1218c1f8f31a441ab9a26c48cdfe1e5ea631eeed40b422e7c1939cd
+EBUILD pysendfile-2.0.1.ebuild 578 BLAKE2B 3a86ed2b905b2882e2dc79416656d9fb07edfefd5c0ebfdcc7b7de20840ba1fce111dac24dd784a2ababa0d805db2fa94e38053936076fa954af9c8911b1bab4 SHA512 f93c141225232c6e721e49434fdf833100ba979146356c6d628418b907b454db8b0c1b2fdd92e8cc8c9ac9d6b275fe3bc7cb07be7d9bdbe9450e14eff77b79e5
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
index d9fe7ec80d17..303ee3a80802 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 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index bd0ae596ddf7..23595bcc59f9 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-forked-0.2.tar.gz 9617 BLAKE2B f306c968447b73ddd606f7929b730d222f30640544ff89f6e3e2171ec3b0e98877e0263fea6564d943789de6daa1c344022f001ef80ca37b2467c1b9c360eed7 SHA512 5e84fcaceed46ee9da8eec051e72acb46f09e2df3458511651604c35d68e3ad06fc41d52578127fd29f0c216dcb5fce1844c614f10501727cbf8fa8f2316f231
-EBUILD pytest-forked-0.2.ebuild 918 BLAKE2B 856335847fe5e28abca710b809abd9946e66ddb45973b803463a284ce21ad615b4f69b7ebab6c132492bbd9be6a76b7610a6b6543a84dd453a3cc225cb919eea SHA512 65635a375c6f0205b2c200e57179de3c6f07077d472cdd0afeb6903bbf450edc1f42a8b0ad8fc23bb000b22ee256c743dc47cc4c431ca7ba1dfd9aee335c03b4
+EBUILD pytest-forked-0.2.ebuild 909 BLAKE2B 51505349cb3d173f3675e2fad008728c459ca2dc188c52c9f073099d07b193621b06f394972fe40c9fbac95facfba057686b5782a4be702421ee40b1d1c754b5 SHA512 988bc183386162aa2fbffcab7d7ed91ca10b8988fd241837616a6bcb2766fd66bee4498c913f4ac2cdd389ddd1ec558628415f70139422981d61dbf91893aaa4
 MISC metadata.xml 380 BLAKE2B 6cb0f7646f94dcda5b7adcd074d83ece86cf7827a69ecbc87adcd273289b777cb12acf856f7068b10b9b3ff7a0eb5746c7cd8f7d8acebbd4cbe9cd1c5efd4ca7 SHA512 9106660bbd3a3197a9beb92d5309d3b1be687cd30f81753364556b2db1aa19e94237c30f2e31a5517097595033fd80b774ceac44cb09c7850a1f6a1eee6325c8
diff --git a/dev-python/pytest-forked/pytest-forked-0.2.ebuild b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
index f073c8b7d42c..c81f511348eb 100644
--- a/dev-python/pytest-forked/pytest-forked-0.2.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index eb25402db011..6b361363ff47 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -2,6 +2,6 @@ DIST pytest-mock-1.10.0.tar.gz 20754 BLAKE2B db60bfe6ee9d6d0a6ee4f0df7f5efa6ef05
 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 1041 BLAKE2B 25bacee77a68d7ee5d4a5796ef3a947a7ce7d2cc19cf2fd2ebcc00dc92104dad75589521d4f410b1f6be699040155e6ae785395daa1ae72f9293f4d8c0f807dd SHA512 c4a5118558659a62fd7e99e3262669361c2edfc34dc5568673654442ae1992fac5fe76f565aaedde9aedf78816ede0db83f2dbd0806ef712f3912a84b38f4254
-EBUILD pytest-mock-1.6.0.ebuild 1075 BLAKE2B 09d374f8f78814ae45b1fb46373184d1f30113489ad48095f992fcc5dd34560b71428f5e328c8042bfe8df10a62a2a87e5a2045da3e5eee958d07bebbf609700 SHA512 64b7e02473459b1e6073471d160d044dec734d02c902f93ec2aa9ca4b94246906c2cfb08fa84d10225d7265a7f1e0cba3f8ec86ce6fa20eae162a83d8150643d
+EBUILD pytest-mock-1.6.0.ebuild 1082 BLAKE2B 490ac538bd264201bf4348ce8825773069354fdc3ab26d6207f1e7ce8a0a0f92d1774101d062796d9078039cc792885edd244137928ca6fc78489e605949ec43 SHA512 b693822c82e774068a10164eb560f0e6f2b4d1e0817afb594a8402934afa91a4cdb483d3c7109290ca7ba2e0e8465362d946584493e841729401e6f650c7891b
 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.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
index 6f2a5058e022..bcf8353206bd 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
index 168b7ff677f2..5ac944e4a821 100644
--- a/dev-python/pytest-relaxed/Manifest
+++ b/dev-python/pytest-relaxed/Manifest
@@ -2,5 +2,5 @@ AUX pytest-relaxed-1.1.4-no-autoload.patch 391 BLAKE2B f4d7e9eb5449bb22e3056136a
 DIST pytest-relaxed-1.1.0.tar.gz 25942 BLAKE2B 6dd34044ec3ae0b5c85f0a76102aaeafe3dad8748c0cf34666dd3550162a2968191efb8415467259a4f072905af062aeabaaaeb475ab68d47aa8d79e3cadd3d0 SHA512 010e37c4d0c63bd00af8851bb50e52af7f8f17769be042e4941e8d8ba451920c24dfa6cdf74cd1b3ca4b3e1c71cd5e1ac34ffae855fc261cf431c212f98cbfff
 DIST pytest-relaxed-1.1.4.tar.gz 26854 BLAKE2B c9b4d7c5c68fb24deaa9b107960eec7b24ab1cfe4ed37f0ffa99b4e5a9d3572be860ff3bc39882f5024fb6aad73f5f976c450294cf713483bba655af56b70245 SHA512 d4e7ed5143ac9f1bff1f911e4ab3aede076d154dcecc28ce96cbc49782d186214893b942a3548da2789faa51df5ddbd43ff41c82b9bb9d0d52f38a2000fc0c6b
 EBUILD pytest-relaxed-1.1.0.ebuild 907 BLAKE2B c599c1b1a8e1f18f7fe0280ed7d5337e201d7fd61839ce151522c2b0316de7b48a048c16424dbea8817afbd3d9cd3ad11b1bedfe1b6942c6582446e259431f13 SHA512 4b9f17644496b1408960f76041ef96c1d311d0c86bb69324465985ea7ca53a5753687716cb7eea65918ff7273b038fd1d64e7aec5b34fd343f5e91479dc32140
-EBUILD pytest-relaxed-1.1.4.ebuild 1396 BLAKE2B 91498a87b1aa4515af5e5841ce3f545d59b6b54ea15d03598079ee72bfff9ccf778da52a2237720041479159cd0aa93731fbb59d125d75c7aec5a46136b582f7 SHA512 683fe0e89d13928e6e4e772a06fd30cc0468c940acbe4c7854c12cd467ab4a64528c13d33d4e1dc86fc678ffc8dd20ec26b3626fc8826af459818b0796871ea4
+EBUILD pytest-relaxed-1.1.4.ebuild 1391 BLAKE2B 40e6178831051fab72fc86f01d93a6e9503811688950c674623467ad47118249bb316d198fd13a1704112ed87ce837b641bc3f6e007e74cfb89716e30d3abb24 SHA512 e333108444f7b4c1b6017eb5525a1fe045cc3232ab23244854ce4e2b9649356396af5f0a139db2679fb720f9777f7a11fa91e87b3ea0837d431b36f6fee03353
 MISC metadata.xml 382 BLAKE2B 858b2e05190a45c6842f93638cc598f3b97b3481a361438789a2f1e4aabfd474da056d5a3396927e555d4395cd1ac13393fbb0682aa3fdc6c734b718c0451ebc SHA512 9a59cb814efe45123a5d8fc8fe8b81d068013c58fb6f4e04bd9c0267c4c5ec1f1b254770ba6f5e43a645093c84a477d903e5d981c89532732c840e2026ba40a0
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
index 683884b4f05d..85094ff0482d 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-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 ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
index cbd6f0d15fe2..586a33764593 100644
--- a/dev-python/pytest-runner/Manifest
+++ b/dev-python/pytest-runner/Manifest
@@ -2,6 +2,6 @@ DIST pytest-runner-2.11.1.tar.gz 9661 BLAKE2B 300b63de61ef36c299a95c60af469b071c
 DIST pytest-runner-2.6.2.tar.gz 6379 BLAKE2B 4f676a4cd59309cdd0e6462c83718482622817781d302ed95a2b7cb9d92a0b0f38b411c1172ecce9003f5781cdb168338bce6f446b1c91069a2024fb75574bfc SHA512 6a993e8729d5e203986f2526d46e96b7ac19e65fc26493a55a98e858304ecde0c47576476864a0ee1817ea1a7b02cfda952fc03f79b84fff249021f140f3d00d
 DIST pytest-runner-4.0.tar.gz 11401 BLAKE2B 3be4527e68b8c1ae7e1bb5bad111367e459a07cf20de1f3b2d8ab993a7e016f9656618075bf515f576fef457aa86f99990f7dcc4c20a04166703bf9272c395c1 SHA512 a7f3defcc698f43b3b6ceec3f59dbd0e00c651167ddc76a9d1a093d722a013c9ffd2bad3438e49170688d503166cb6d8bf55bbaf7bc6f9e6d80eff049c202b08
 EBUILD pytest-runner-2.11.1.ebuild 969 BLAKE2B 462702e2c3b86a37db446b81b537e72cb215c0e6ee7f2302e06243c3072f996183a31775db1a67cc4617ca51a1486e0c2a95b029f81c5b7326812852fc8451dd SHA512 c6b533b5c045ac545ea69979103776d93c06a49a0076dadc49439a2098f3c32f8b924f17277d99838c519078f378358ae2165cdfed43740e5f879e96307f3274
-EBUILD pytest-runner-2.6.2.ebuild 1061 BLAKE2B ae7efc3d2c74b2c4733ca38e781c8e331a95446910c034cb7808f4acc7ec29f490a5abc1b34a1a34f16cfdc193d210519b5f056fb25a40fc70c4e61f1c3f6946 SHA512 e102351f0dc35bc469ac1c3d36c8d79eaa1d8d228e903b0b0a47b14696ccf2a9dee71af6b3131e5062decfc96084cfb1d192e253cfaf116b76ddca16a58df2ed
+EBUILD pytest-runner-2.6.2.ebuild 1057 BLAKE2B 57f40f0d1c2d61fb55a010a3fd5a1a528e42ff257ad1723ac0792c37f987621a7e9a1cc2532c6972665fe9b14540ea07f215b2a085c2f54f54a2cc416f374bbc SHA512 d5d1ca85369869233d95b0e7d2cee32256fad62a83ab13408e7cda631ef606d98d13adf10dac32e69d660f757ea879af4beba2c87d0918b8ac179594baab3a6c
 EBUILD pytest-runner-4.0.ebuild 1043 BLAKE2B 3040e4fc634435c7bc9907abdbd18a94c6119a699a3c71046bb82ccf54842620ef688c11d3e4479a1d480365b139f7520863652bc7a36a55db5b78c97208b4f2 SHA512 204e6f594f59e17d57e460cfa6c5a81211f572afd4285eb1d121e3d61c64d11dc04f248e655b090c814d4c3f619a6b4c0c2697873312059f34b99af9523dbbe9
 MISC metadata.xml 611 BLAKE2B 51a4f30d72bd0b3cf396da6272eb95a2d99fb46387619110afe35eb4a3dbfb9871bbe1ec3c657a8265e77d24aadd34db780099000e4e5bde92a9d2bfac554b8b SHA512 b434e0768011ddd2e6d94bc439a4b487ccbca4c50956b81d8c45cc6aca574d46dfb1c6f9c92dab24160104513ff1e16dcf9c78366bb39465196b7ec8b75f0855
diff --git a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
index 11237d06ad21..5dae9916816d 100644
--- a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-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"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 4a840e577054..8530466eb309 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,7 +2,9 @@ AUX 1.15.0-test_manytests_to_one_import_error.patch 991 BLAKE2B 1562721b00b0b551
 DIST pytest-xdist-1.15.0.tar.gz 87799 BLAKE2B 6990137c02f70a4ce466aeb7692cdc66adce09d475ddf31b7997abdeb54e148770fc74ee872e0f86719749705bb28ca7e56181b58f3906326c99d6051bd46fe6 SHA512 6429bd0c85024a2dcb453e4264f06d4a548637c4dcdeabf73d2b78a112ace70ff61cf0849a4845cc70a7650d10a99e5fe1087d3b7dba4b941ec0a771fc9338ed
 DIST pytest-xdist-1.20.1.tar.gz 57076 BLAKE2B efac9a0d96b2d4e28b078a7a88ba8df197fc122683d25577cc596f840977f4c116b8c7df1c397e03a50edc400265bae4a8b3900c22da388d0662a71858d7f4ec SHA512 f36e02062e946993bfb9bfaca5aa14c138817f1ad8a8013c5a64b416e91abbfb02502a371c4507c4babb15ac54aca2dce5af4ffe72ed0aa167f670bddabd4b3c
 DIST pytest-xdist-1.22.2.tar.gz 57866 BLAKE2B 356f9dccb7d970e6073dc724233013503939d92072c3fab47626e9ed36778ab73499a990a6f50271ae93b82891a09be811843907c18ae64bf93f76510338c29b SHA512 69a0a233fe52ead13cadd46c134c67e4d0fdcd2a77929aea3da2530cd54c283d46c6d416a1450016ba7e9127b30bd85add99b562d9ec0a49bbe1c08b7828df68
+DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
 EBUILD pytest-xdist-1.15.0.ebuild 1238 BLAKE2B f9f17170a8c0f777c86f715ad954de7daaf3f2dd8d3432f561fcb43b92461ed4d374122eec99e636467ecb3f4d376ab5a07c0605e12d50fa663bc26c025c8df2 SHA512 f639099d0f809555acdf77bfbdc783b92985f45608163a30c7ab01a5efc5e16995851a72eeb09b90876ad738e6accc14e69fd852f62e8880cb0900bfaff721bc
 EBUILD pytest-xdist-1.20.1.ebuild 927 BLAKE2B f15b00b5a68556d0a5f725616199d40e130f8cbc6b9250fdfbbf54f1d05b6fd0440b1aa55412c34e564e4acc113172ec140e614907c244aace48d2736de520aa SHA512 4fa357bafcffa5b77bdebbc36b26dbf400ba178bb4d629b56a3a52e080b397438ec66e7fc5f42f31ea95f4d811f8f4e17299a2974f358a5db117389418b81eeb
 EBUILD pytest-xdist-1.22.2.ebuild 1112 BLAKE2B 8bd18da522c4e9460860ead4d2f5662cab9d9da4dd86c762221942781ed02fe3cc6faccc495c394ae36b6a75f30f9198d9c90a8a6e8345182a78e11423e91a83 SHA512 735a2be777d3054f5b3854d27dfb61f57e3490e1e2be8ec5e2a12acc466119ec3056077917a80a762e416428fff11ecc53c1b1b1346379542b3581d9f8bd662f
+EBUILD pytest-xdist-1.23.2.ebuild 943 BLAKE2B 24e3baa9b12f80e0627e6f20f5ec3b4cf8b8c180d4d5cd1538fa73dff3916bd6ee704cc3ac88cc15cbe15dce331bf1e5120def1b03ed44ebd5956c6ba54feba5 SHA512 4366bfb2da2621aff32f0c84b501a9dbe7ab6d2720e73f09f0d5c13509e35485cff47862a09b2b2c2d0932913840aa4420b3a0098faff6f2ea0714926655b9eb
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
new file mode 100644
index 000000000000..90d4f2ef9a3e
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	!!dev-python/pytest-capturelog
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 1e8c2f292ba1..3099442888f6 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -6,6 +6,6 @@ DIST pytest-3.6.3.tar.gz 830949 BLAKE2B 4c0df5d157b8bb0ac6261a793aac2a8074c869b1
 DIST pytest-3.8.2.tar.gz 869668 BLAKE2B 91d75481e4ef36ab06654b340751a33a96b9f6187cdfc65694973e2d4d7ddc5806fe673c87f0aa442c6c657a953b36c22d288eee8f61cc002be4be803bc98111 SHA512 5420de07ff741f64bcb7fce7bf3b5097cf63be2539c2e694c168bd824ba468ca87cb17be801b72b972ab417da98d1b5473f319afd642bf5c6c0270e3a697d016
 EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B 1789686fa508f9629adc37e7fcd26e8a4426214b6335922927bcd8bb37c336792b564ce505c122a729edfaa53af604e4fd1be31f45c5251f0008e14c8cefb06c SHA512 1384082815df0f30e50881c89d81822575509f1333c2d3713b69ff7e3a9113c1a70fa5220d0e10bae0b5f17d844a14501e59af8c944ca4006dfeb9cd0e8616b1
 EBUILD pytest-3.4.2.ebuild 2509 BLAKE2B 23b2f34e9f2923a0eb143a341f4dff40e88d4ff1bf52cd7637d9354192ebadb58c39050feb00911993f0067d60571598864e5a85644b0adb33cab722594f9ebc SHA512 1958df6b0567c547bf70789836e12929caf3e1f17ac16ebad88aac081dce949888a08efceaba04649feb8098d4373548a5d4de511a8b94d6f50eebbd1d5d7b64
-EBUILD pytest-3.6.3.ebuild 2413 BLAKE2B 56d11541e919a95919ad66efa0b4603ccd61116133381fac8c5ff605fc5f3b53792b611b7c40a6428d81890134c0482fba18e13575d2ffc5f3c96e5c982dd3ae SHA512 ac4a4fe08e095f1a9012346fdfae6fb926e5db595defbf1f3f5a15ef96e7325846536e277513cf3f79242dd26dd726622686bc534e9fbe53a98fd2d9c4285cba
-EBUILD pytest-3.8.2.ebuild 2445 BLAKE2B a3b8d228f33317817ddaf3e86091e17647f59279d7ec6ae34bc180c5f12aa43a1a86cc9f832112472237da897b4506daf0b97fe5e74da87028ffdb543b4f0520 SHA512 0c895d526c881e1a20d372833078efdc8ffba3bbe2b8c7d883a670ef4de431296430cf8f47bc6d2d77642b154cc44f346ead8880b891108d7bbe369e5ff1ac35
+EBUILD pytest-3.6.3.ebuild 2423 BLAKE2B 0440c961c535989ba617678c98e34986f856eb04069095f27c8cb6a0d4e4ec85cb32364e2ecad52f8f3b89e41f78a88b02eb9606f9bfe48c94c2e48644410652 SHA512 bf354801416969801698e10dd53c8c9d67d3c4947c072b9e5d99dd762de5214040fad2d150f603ce8e7b9ccec092786133de5dcd697ce60a99e8e79d1adfdfca
+EBUILD pytest-3.8.2.ebuild 2470 BLAKE2B 135acea00df46e33cbd0171542437f3f0960b6741764cf22fbc27e4b49c47ccb92bddfa0270c780893f8401ca0d70869bb0c302549b663feaebd22a280181f53 SHA512 ecf47570715cc7ce28918613c6636c3d412402ccbec280f180d3c2d463299349d88b1356c854b800504bf9efa2ac3d4e9991c58d0db996c426f531be653ddfcd
 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 cc1697642109..24cb5009b0b1 100644
--- a/dev-python/pytest/pytest-3.6.3.ebuild
+++ b/dev-python/pytest/pytest-3.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 # doc apparently requires sphinxcontrib_trio, not yet packaged
 IUSE="test" # doc
 
diff --git a/dev-python/pytest/pytest-3.8.2.ebuild b/dev-python/pytest/pytest-3.8.2.ebuild
index 17be8889de91..9d2d6833cf1f 100644
--- a/dev-python/pytest/pytest-3.8.2.ebuild
+++ b/dev-python/pytest/pytest-3.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 # doc apparently requires sphinxcontrib_trio, not yet packaged
 IUSE="test" # doc
 
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index c20b5e0abe11..d5a079a7ec74 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,5 @@
 DIST python-evdev-0.7.0.tar.gz 80508 BLAKE2B 9c3048d649d41b7fc0dfa1af14239a0bfbb5b85c577a8de0323cf35eff79324703987b0a5ec27c06fd277f6ddf76bdd1c7b0b2e589d03ec205c8a7eb0afcad70 SHA512 9757ce392d08f9de0446963cf5351a66dbc2373426bef26e63d71623df1f7c47d90f6e454649076ded214878e67f321380646da3f76bc0fb57f7eb9bbecd3e7a
+DIST python-evdev-1.1.2.tar.gz 83067 BLAKE2B 6434d5c62e4a072928d555bfc92e94e7f63ef98ebbf9cd95795a92d6ccdf7b5d4b0f3133a4b3f2524083b842f78ccc305a5da13af59052be3724d83ea4039328 SHA512 054b2e5af532079dc52919d90791d12d7caf75cade07d18b94ea519869659413ea059570b16ebb236a715c541b17016db380bea4e3c1cd21f96824c6303b45d6
 EBUILD python-evdev-0.7.0-r1.ebuild 645 BLAKE2B e63ee394c6c0728625f05c9d790de54fa3562d8ae7c278fbf9ce3dffbf50a9d845673e383debdd00655e5416aaf34ad609e71686b78ff7c4e971b866e89539a7 SHA512 60ec8e3d83f4be8fd85980177745e606fe5c4c2dd19a9ea7ee56c815a9b44e633ac20bba09a8b390efe58b8690ede1e25af21830138287e37b54e0aeb75e6294
+EBUILD python-evdev-1.1.2.ebuild 642 BLAKE2B 67b7f8265d7f1707926ff711b89e005667376e79bccc3e0f80a811c89abca41be7c6f6d6955e500f1ccabdc39373fc9b918dfa1ed2070290facc1d1e37b47869 SHA512 a74bf46bfe085d1fb41891aa196e17b1788e89ad9464ec11cb5bdc784e8e9844d3e12b39d5d31a9b3c0a729971b8dbafe5fa980f3bb12cc557681939c4561b16
 MISC metadata.xml 257 BLAKE2B 5c2ca1a3b14d55f8b7d0dd09b0811de8e397c4f748a58c4133f02e86e9084da2b2afabee2c7fb38f38d97d1a301c6de2dc6c4cf8ad4f91fe55c35b8580e6ff0f SHA512 2214f84571910c807983e21889732fb6b9619cd62bafc51a3743786f42b2c6248f1717ec5936685e767a70a052ec725a7a62c602b9c95fbb8e45838472146304
diff --git a/dev-python/python-evdev/python-evdev-1.1.2.ebuild b/dev-python/python-evdev/python-evdev-1.1.2.ebuild
new file mode 100644
index 000000000000..69f32c6049cd
--- /dev/null
+++ b/dev-python/python-evdev/python-evdev-1.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 evdev bindings"
+HOMEPAGE="https://python-evdev.readthedocs.org/"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_compile() {
+	distutils-r1_python_compile build_ecodes \
+		--evdev-headers \
+		"${SYSROOT}"/usr/include/linux/input.h:"${SYSROOT}"/usr/include/linux/input-event-codes.h
+}
diff --git a/dev-python/python-openid/Manifest b/dev-python/python-openid/Manifest
index 953bb6280458..c07a58e1084f 100644
--- a/dev-python/python-openid/Manifest
+++ b/dev-python/python-openid/Manifest
@@ -1,5 +1,5 @@
 AUX python-openid-2.0.0-gentoo-test_fetchers.diff 566 BLAKE2B 01b37542799405072abd96a87f5ac52853c894ca658f6202e2dd8ba528a5e865fa527fcba463338a6685996ad68be51c4993c38accbc961c972de0b70cbcac70 SHA512 60cb8b12312b3727263808647dd592e295ead7cebb384f92a33afe71292267e0ab95196dfdb7a01ac8847c0565c5dc9ad81f3cb95c00d6e4c9d816941b71fa44
 AUX python-openid-2.2.5-tests.patch 321 BLAKE2B fd3d0daf69dc6287191bb1a7dc61523dc13f5ce95adf8e07e7bd17f37a5f27a5984e9c85c15eb5a9f394523f2be97db67583c250a5d276b05530e95eb4dee7b1 SHA512 2d0e65763ee5fa4325e03e524ce179c367a1ba3119ce55bec458ed37bee05bb655c6a4dbc0d57ad4c20ebe22246b87da458cc688eed7d10f2cd1003f0da3f70a
 DIST python-openid-2.2.5.tar.gz 300524 BLAKE2B 9431ba3947dd2d2f7717e3f64ae91e4c014b85d67e6ce9daff5541d107c35869863de79273e6f9ad433193324d44821ccf9aaf885a6541ff7a3636a31c6ee8f5 SHA512 46ffeb07dc0e94c6e1160c824dfafd4a125746a05af1541e112bc2691bf655f75d0431ea273877899abc2956bb1f82369dea75d9b54282f33875f333f5166e7a
-EBUILD python-openid-2.2.5-r1.ebuild 1549 BLAKE2B 1c7c42551a55176cc04e7e71abee2f6fbab0a0994cc12a64a0bcfd909558299b0d9e3d6734273c4da96231ab26f4eaff3f198136e0511148998bfefba0b47766 SHA512 959c5c7335df13084a95271c3ef77b213d49e85e0feb082ecdadebde40cb935e59554a3e4e587d08fe6edd28cbffb1c0315e641c180ba2da669cf750cf1848ab
+EBUILD python-openid-2.2.5-r1.ebuild 1570 BLAKE2B ad108ff49c65f3c6966a9728b4e5b431e5056a7a36c6e16259bfef9c0f994a6f1ce972e4e550e91e60df7b39efbbb1203bfed8a65e0e31b6c62f20bada611fd0 SHA512 c668560dff05a201003b40ff5d787c6af97b4c18737d2391c5513361de4fabebae465e17146ed462eb25e04c90d3f844a651117d8a38b97eb8553a35c652584a
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
index 20929ce8d3ab..895572db7ae6 100644
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,11 +20,12 @@ IUSE="examples mysql postgres sqlite test"
 
 RDEPEND="mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
 	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-python/twill
-		dev-python/pycurl )"
+DEPEND="${RDEPEND}"
 S="${WORKDIR}/openid-python-openid-b666238"
 
+# Tests depend on twill, a broken package. Bug #285169
+RESTRICT="test"
+
 python_prepare_all() {
 	local PATCHES=(
 		# Patch to fix confusion with localhost/127.0.0.1
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index 824cdf1748be..6520c9e1defc 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,4 +1,4 @@
 AUX python-slip-0.6.5-no-selinux.patch 2942 BLAKE2B 87cb1fee6aba70228b78ffc8b8a63b6b3bc0b11aad8f5e38369919e6c5a33780a9f255c2c81cc9220fe02b11b8d6daf24278bdbc495a831af03c92f1f2bd25f1 SHA512 64a742f93a38a2ff15d98e9d22c30a821ecd2044457ac958bf34cd7fd8e333b16a5fd56e80b169cc67c9ab35d13298d0caf418ad7a693372539701bda56f123e
 DIST python-slip-0.6.5.tar.bz2 25996 BLAKE2B f2c512274c35a451aa5a97f8c8b16d117edc34901cb2cc51d7d99314eec9c2e90c95019290ef9a35511b62a822471f40eac8c4228c0094bd72c71bd579bbe0c5 SHA512 84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff
-EBUILD python-slip-0.6.5.ebuild 1196 BLAKE2B 051ad41d882849722c11c3c544151ab625b883d1eac05c6895b5dc389eb5619a791266a89c71d3b4b9bceb9bcecfd6be935b025f192256dedf4181c696ca7330 SHA512 cdc08711a657dd3e0bab568af7aed001794eae7fec5ad4b307f7a6146338b67996b4e3f9e61470812efeb3b17ab89f93f5a853b8838e9eac921a898c4bb5cd09
+EBUILD python-slip-0.6.5.ebuild 1197 BLAKE2B cd08ddbd967fe01ace1f0d2fe7ff91939f1dcb86f815c5c1732a16f625e2d93fe16f53c38e407a48fb54230adc44ecc04590f0c1cbd6e857859c6d0274d1c9ea SHA512 df16c0b876ba1103abb1f75af14eecf032721cd9aeae19390ca0bb45f78cee3fe9f88512d46a3cb580d9ae72a693e9dced6a9ede6cfdd1baad6de194d8eefed9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/python-slip/python-slip-0.6.5.ebuild b/dev-python/python-slip/python-slip-0.6.5.ebuild
index f28da9d99a97..50989cbe320c 100644
--- a/dev-python/python-slip/python-slip-0.6.5.ebuild
+++ b/dev-python/python-slip/python-slip-0.6.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyutil/Manifest b/dev-python/pyutil/Manifest
index 70320291b032..acd5b9811d0f 100644
--- a/dev-python/pyutil/Manifest
+++ b/dev-python/pyutil/Manifest
@@ -1,3 +1,4 @@
 DIST pyutil-2.0.0.tar.gz 125079 BLAKE2B cac7ce94671dbb2b4070aac76da2d9f8b3a48640a2422e8f9fd0dbd6a61eee43636b9b8a003ee3c528ffa7e866baf0254c4a2369ba8038c63aa072e2df9556ac SHA512 3704c028fdc3894ae635dabd2bace1af1e805f4158dc6d67eac0c38fa8e7959cd093ad39cb2f539e59dd74e957947464cc8c7aed727835e127311062ed27e60b
+EBUILD pyutil-2.0.0-r1.ebuild 689 BLAKE2B 3f6d356e13df9d58785f1505e09ef47aee954ca0771168f1bf7e2ad6e7b2cbf9595d7a12401c150c3c6dbe7fe6b810f0d2fef20a59939ecb87f36072daa72d2f SHA512 e5fee0dad5463d923dd71ff2687cd8edfc60c9cbc1432f314a1c4dc38a3568ed5813650780ebcb64b8ec567c6eea303b6c6314bfd1ff10633b5eeb431761abc3
 EBUILD pyutil-2.0.0.ebuild 644 BLAKE2B 47eaca54d26ad3da866e16e369f58de07bd9b206227f5d39f7f42d01fef18c27cccd07c6d772478476a5018c43753139b857788337a50e111c3af172b7f2c228 SHA512 8a6520c84e5f90543f19d4f412fcc3440239747bbb001e43ceedabf0d87f57d472788532ad0e33612d7bfa26258e7fa04b6b9c5f8f9761d6fde4ad2757952d7c
 MISC metadata.xml 744 BLAKE2B 92a7150e6ded208271a22f52fcee0d6402006ee4a71e97236652485aace07d35eaeb4094e6ab9ed6ae197fa91d4f5f6236f4e591ffb1ee3270e22bbbfce1e641 SHA512 a23c7e3e981737b2a5952cf4ae5fb5017e68c68ded1d2e2dc534cfe630aa95dbe8b32c6fc784cb2a5744d66e91131f97a5c201029df04122cb1ac230a0bd0746
diff --git a/dev-python/pyutil/pyutil-2.0.0-r1.ebuild b/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..26c90066e3ac
--- /dev/null
+++ b/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of utilities for Python programmers"
+HOMEPAGE="https://tahoe-lafs.org/trac/pyutil https://pypi.org/project/pyutil/"
+SRC_URI="mirror://pypi/p/pyutil/pyutil-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-core[${PYTHON_USEDEP}] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	rm -rf "${ED%/}"/usr/share/doc/${PN}
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index cc330df8fd47..05cd8824fb47 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c
+DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
 EBUILD qscintilla-python-2.10.4.ebuild 1528 BLAKE2B 45e4c6320d385e1653b710bfff8e085db962365615f5fdd297fa1fde160e8467b47bf5e4fef379094fe2515f885581393c7b6945795e7928e56061e68f2c4601 SHA512 47d56ca71160e66b44e6dd4ffc37cd368b97e1216703fddc30a2628dd03ca89a0507376bf9c566fd71b13f074093ef8c38501827d3cfbf947d042c05e4faa4ed
 EBUILD qscintilla-python-2.10.7.ebuild 1536 BLAKE2B f2c117e60e445d0697e41a7a526065e15dc64ade059b8d21f535f11d889d089428f50ac4358c585cded52c4e9a9ccf1525e9d79558ad4d5463d268cb84e2c865 SHA512 4851048fbc6b630f53c43b9ae4eced755d33068585e0f01ba6daed5cc7c6746ee8432394c58ef0872efc42f29f6a0f35c9349a5baa8204367886345c11d546e1
+EBUILD qscintilla-python-2.10.8.ebuild 1555 BLAKE2B 2175851a7f982fa4895bf71ed9680b02a214bf22fa8a2d0b1d0ed2059a9a42f8813ef321b29bc2762cc436a0c5cba7f94a99897cbf60f1494f23f4fe2b484d15 SHA512 0d754ec573d6e689d4bbb8c036444b5cc66c3f906f1e1cc7849763f154c0e668c4725707fecec29cd7cd1d4422dcca1bce287cd33d818f4ef298ff9acb2b05c5
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
new file mode 100644
index 000000000000..0c917f6bc805
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit python-r1 qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	~x11-libs/qscintilla-${PV}:=
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_prepare() {
+	default
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			configure.py
+			--pyqt=PyQt5
+			--qmake="$(qt5_get_bindir)"/qmake
+			--sip-incdir="$(python_get_includedir)"
+			$(usex debug '--debug --trace' '')
+			--verbose
+			--no-dist-info # causes parallel build failures, reported upstream
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain, build flags, and prevent stripping
+		eqmake5 -recursive
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/ratelimit/Manifest b/dev-python/ratelimit/Manifest
index 637f4e70e462..3350d2236ca2 100644
--- a/dev-python/ratelimit/Manifest
+++ b/dev-python/ratelimit/Manifest
@@ -1,3 +1,3 @@
 DIST ratelimit-1.4.1.tar.gz 10700 BLAKE2B d2fc1b0695c6bdc7653862ca790e9f5ec87b25513a93ec058384f334b47d5080570e3511eb6680b934b345ef5562771a078fc4ced3ceed263a7aafd26af3bfdd SHA512 ab8a2cc95b852f91c614ba5a5a677d2b4b99d5f810ec8a11e69d97af58cef1f67457e1cf686a286073c85b39c2ebbeca0a459382e410c9e8eda12cecdda57f02
-EBUILD ratelimit-1.4.1.ebuild 566 BLAKE2B df2d66c46e4f034f22b058f533d763fe46c16d9675c3e1d5c726ca5985d0b97411b524892063618e67c259fc276dea7d961d17eaaf088fc26c5e63d7de24df61 SHA512 a8445d5d480db02949c0693b1e75ba44dcbaf474a7bfbd7b4aed8644c6ac1204e2278a10944ee9efe809e97cac777ebaa43b06990506669b6a899ab474e33ece
+EBUILD ratelimit-1.4.1.ebuild 598 BLAKE2B 1b5dad627c07655f69354a70114b93faf6b94cad0df5dea39284783d8a90f6f1596e8afc5f482f44ba8de93d581dcdf4ae6520401a89c5237e18ffa39964cc05 SHA512 5dca945ffe22dba01415ba5b3d9992f63d4c5aa5135450921dcc9af52d51f71c5e7a5a12f6d561712288f72058a5688f5ad001387bb1f44518a1d4a38981a451
 MISC metadata.xml 724 BLAKE2B 2ebbc8dbd58619d4978081c22d294e19682a10a159321b143e942e4a4f969400792a411fb6db3670d747fea6747927030d590c45251e753ff5183be3667297e8 SHA512 aec024dc134acf8c02150822fdd1b29ac3042aac96a5a54d5c1876e20bd4bf4bd2211374460b8dd4c19b37be44d063b5cd36ac77f196c30b4529c65bd7c45249
diff --git a/dev-python/ratelimit/ratelimit-1.4.1.ebuild b/dev-python/ratelimit/ratelimit-1.4.1.ebuild
index 3c01b8f2c100..e91d5f08f03e 100644
--- a/dev-python/ratelimit/ratelimit-1.4.1.ebuild
+++ b/dev-python/ratelimit/ratelimit-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,11 +16,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+	# remove --cov args injection
+	rm pytest.ini || die
+}
 
 python_test() {
-	py.test || die
+	pytest || die
 }
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index c5f76a75d499..f6a957c6c770 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,5 +1,7 @@
 DIST recommonmark-0.4.0.tar.gz 7112 BLAKE2B d0e0f95f251e859908523c90b012ef2b162823d72b87192651d08a9cb5217a8bf497caf0320cefd3e724f77d3ad4324db446ddb57de55fd308c7739b78f55c04 SHA512 30d900840093c9ee2c1a322aeaba64c06c6f236e4c86a8d7604edc7d9fb0e78d66387f844619364d9253585db3f38d212242d2798153f343bc01ad281c146c9c
 DIST recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz 22085 BLAKE2B 2225f8854eb92f9c905c5943c3d4db1cb56ccf22826f32101c9e8db6ac1a1658a543d58a71bfdd8650f225229be5c47658a6db9c6f535718eab5361589436d77 SHA512 4b4c3c9354c3de223c7d441b1665879d49a2f9f2328532901c69d10f4f8d90ff84e28aab3d1b4884edecd80071193ec69fbdbce735527ec2edc574b5a3d1fe88
-EBUILD recommonmark-0.4.0.ebuild 551 BLAKE2B ec4d65f0f66bc48f3081728404bb1772b93f7dbdadfd69b879e3efb50c979b6c5a8f94036e4e4b89f857b876e8b84fb7f2b97f2faa0372f7441eca4a4e56d839 SHA512 2cc8185c776395839eee64b6bf1beb7e8a1e8e6a6547c6fcef19d977318fd3b85f3c2a9a3fab2513fb462d905d788b8054ddd6cd5a970e4e6dab21f8f01e5a87
-EBUILD recommonmark-0.5.0_pre20180907.ebuild 931 BLAKE2B 20b3c54fcb6ef496e7e297ca1b3c5e4506797aad33148cf05d08ffcab49639cb8398cd22dcedcce7d38512baa752e1325f7e919b1669e8fc9a4392406ee6a1a6 SHA512 a9b3e620466eabc54db608f141667643b7d1a47eb152dce992fc5f36888d1c09241a1070a9527699cf6c97203d994ca52b1a7284a3758787e98ed99758dfa6ab
+DIST recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz 22249 BLAKE2B 7466fc1448b54c2fd6969fa06e10c11e7bf1f2d772d96d749de9023d60570387a5472c74d660e8bd0722d294dd2ac1dec8d7d6fc49b281eea14b1f9ce423cf94 SHA512 67fa0b13d49d1f6b08e2fa28cf127c6dadb6454329a35e1e1217ff3bc93aff1a1a040740478cfdcab1b72acd939e0a81d7d8638e7ecdcc76e2791ddc33b8f0ac
+EBUILD recommonmark-0.4.0.ebuild 551 BLAKE2B 555de72463a0749dc830a6726750f8697e9e8bbb87adca2cb9c6877964107ede4628fc0fc04943cb47326a49f6c94c680bfc5be7b5863125d959cd85a37d9537 SHA512 65c1bcd475acae52ed68c897c5c6ef0daf9c054591c4e48ed5377474673e8ff3b7ec64354899f495ca2e1532e2007efb571f88e246208f1b30b583cbe329d20d
+EBUILD recommonmark-0.5.0_pre20180907.ebuild 989 BLAKE2B 3984d521869c36ffd02144177c6fc4f2763bbe37731ab38e3c02cbd938d5e29d5febf8b9379f96736cbc72c4f40c5cd07d9e079c5c734818d21be9ee2aada269 SHA512 eb0092326e1c3f7759703b65147d683dcf09b1526701d8a677c4c8744d4f1804cf36fa58b569fb4e54561c0a060323cdb363db6f09a0b2327686ed90f9e6deb6
+EBUILD recommonmark-0.5.0_pre20181012.ebuild 941 BLAKE2B 6b742fbff5ef028531e8a5d68c8a252fb8bfec178ed290a2e178a7fa6904bd6060d27c84bdaedca68885ca9c12ad236dd81b0a37fa8d7d151f018910aacdb833 SHA512 9add07015a2a4bc6b4896ba88753073c33e912b6383c86a3ec09bc733493581185fe35dfaa9848b85b0dbfd19d29706fda5ff2d79e41ff8986d367f6442760ab
 MISC metadata.xml 519 BLAKE2B 8ea8a1e90a05ccb7f78d0de5213fb0ab447a8e8d9ebef7011eb4cb237c909d8bac77319282a76e3db32f58ec0dc6d76f6dfbe3c29c4c71c7f93398d91afffc0c SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e
diff --git a/dev-python/recommonmark/recommonmark-0.4.0.ebuild b/dev-python/recommonmark/recommonmark-0.4.0.ebuild
index 70feb3a9e234..03f40f996221 100644
--- a/dev-python/recommonmark/recommonmark-0.4.0.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.4.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/CommonMark-0.5.4[${PYTHON_USEDEP}]
+	<=dev-python/commonmark-0.5.4[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
index 620a81e57425..1a9da7165cfa 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
@@ -14,12 +14,13 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/CommonMark-0.7.3[${PYTHON_USEDEP}]
+	<dev-python/commonmark-0.8[${PYTHON_USEDEP}]
+	>=dev-python/commonmark-0.7.3[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
new file mode 100644
index 000000000000..504a334376e4
--- /dev/null
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
@@ -0,0 +1,34 @@
+# 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 distutils-r1
+
+EGIT_COMMIT=fdeeda5f6fe3ed8905deb7a067cc5951a477d091
+MY_P=${PN}-${EGIT_COMMIT}
+DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
+HOMEPAGE="https://recommonmark.readthedocs.io/"
+SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/commonmark-0.8[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 96172317a639..360c3c387a23 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,9 +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
 DIST scandir-1.9.0.tar.gz 33315 BLAKE2B 70c0cb0819f205b3cee37f471f84be2bddb565cd7341e5a28b9f1263f3176450cd5f2edacd63130e4f3f38940d0d3e1a01239f4729ac05e5cf5fd0005e712f8d SHA512 41dacf42734ac9a53bb5bd5d783023236d68bb4883c853fb2ee34224206c577a4a277d4a8cf8f9be6fd5a8b59d9b4fe4568a0c815a62ec84ce99ded933961ec3
-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
-EBUILD scandir-1.9.0.ebuild 590 BLAKE2B f47d3adb6f90dabe4e1a53a8fa8932355c5899a50504445b65a5670ee6e6c92122e8a102d3390465bf04120f31791a78fa7f55c9e399bceb6930acc03ce57176 SHA512 85c23ee5f97299a14e26724090dad635cc3635be77026e0fc60b60dae93ea9bd49f599fd84de5c667fce4fb3665efbcb4a67e74b3d4bb03b8568f4b70a860733
+EBUILD scandir-1.9.0.ebuild 597 BLAKE2B a134f9670038c6c6df17215c35652b57278da07cb69007126830e5d40158f621c9d92f292a865a05f95347808f9545763d46cb6121d1453ec3f6511d93c9694b SHA512 b039ba15235ce22e7d23d6d407f39a3a4ee699bf98bb38330cbb40915181b73748d3d05bf947beaabbee2ba9d774942ec1573f3e47db997d37386761ebda933d
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.6.ebuild b/dev-python/scandir/scandir-1.6.ebuild
deleted file mode 100644
index eee1a9dbdbf3..000000000000
--- a/dev-python/scandir/scandir-1.6.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
-
-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 ~arm64 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/scandir/scandir-1.9.0.ebuild b/dev-python/scandir/scandir-1.9.0.ebuild
index 1638006bd12a..0f9236b7bf7b 100644
--- a/dev-python/scandir/scandir-1.9.0.ebuild
+++ b/dev-python/scandir/scandir-1.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
new file mode 100644
index 000000000000..5147947c9299
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -0,0 +1,3 @@
+DIST setuptools_scm_git_archive-1.0.tar.gz 2553 BLAKE2B a5ed592384800585b3f58b40571edc929872908bcb5e2d012cefe34e6cd84ee420a3bbbb9e856ef0fbbb972931abb4913d245b98d54b82aaf659247b92a1303e SHA512 fd1a06c86d1a8394e37b91d374b93dd5902906795360688b49077a4530240fd6be575ee66d51c3f61931bc837711bc3c59491d7c9cd165c34e2ec1f314b4cfbc
+EBUILD setuptools_scm_git_archive-1.0.ebuild 694 BLAKE2B 803bfaec25f7a4faea9e83a10b6b1946e82d69b4bfa52a28523068c77f6559028c1d4c9a05e2ed7062e7e6434a375f2ce914fc692be20d3a5d036e8f7cd9982f SHA512 f110359330f2d953ae4a66da6e43543a019719cad5646b679641127afbfde525fc330ac4d29ac22db7f89abff9b0560a074a640b78331685d124861cda1fb6eb
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/setuptools_scm_git_archive/metadata.xml b/dev-python/setuptools_scm_git_archive/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
new file mode 100644
index 000000000000..350a0c13b3ef
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="A setuptools_scm plugin for git archives"
+HOMEPAGE="https://github.com/Changaco/setuptools_scm_git_archive"
+SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 59fef384a1ce..8506158821f5 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,9 +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.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
-EBUILD sip-4.19.12.ebuild 2779 BLAKE2B c89ad98b6a4fc5c48440c6ce3bbac9ee1f7924b56fd481d4a5d4c092309634a8cf75e36b26b09d2b60d5b9c9dfcb7ba98507d249c3693c404fa9a0b65953e6fa SHA512 89ac3915fae1296533265b373fe554d704280b4f936cf6362f5f4e43f726b01bb057c813e4eceaf91cc2abe684c6c7684144751c74510660c9ab2af084499554
-EBUILD sip-4.19.13.ebuild 2776 BLAKE2B 16ea86519013bd7ba796e2b6c5e785203cf3374802481c65e20b300ec45727c78ac8a0bd298f9d247a8b56beda81d6e2021edab657c5624b85f62c07d11a73d2 SHA512 a401b87abf046d9cbceddc521ba5e91db9abf942e7d69037c272bc070b13fd5d788426fc5d5480066c21993d20e0ab857b8af1b530210fce6014f945e41589d2
-EBUILD sip-4.19.8.ebuild 2770 BLAKE2B a2f0bb2c65e93efb40da64942e4230d35626ac44d7c90240ec1e2ffefa7256bb00073882639d72e87c46876a21cba8334dc3b822e089c149ef6f2df4e8f2b961 SHA512 7f88d918131f92a3d5e0dd34b7c70b80facfc603cf9a504de45c9c69944fb15fe836ca6125d95cab4a8fdbb17d43a729cbe13e1aebde0472843d507d97424075
-EBUILD sip-4.9999.ebuild 2651 BLAKE2B 9d70dd20b5e89a6652fa029e673331ef088d1b19e98a5e958fe453591f4d21420fcbd4ffb103c572b2176359d6cbf76804722983ed9ced2b7c805588af0fa811 SHA512 7157f51e4be926fb6572886f2fafbb0d23ebfaf21233a348a0abdc14400c3f5f52c3fef2e7174664b0a91cf3e33303c0e963b7030f1fb62b56a2550b7f192c57
+EBUILD sip-4.19.13.ebuild 2862 BLAKE2B 75d9a395c0dc7af9816c5952f6c3ba686c5cff2805452169de03509b9fc266fbff1f531ca5fb8a53bee0902d1810175fbf75c590aeb0b514154f883857f06f0d SHA512 1fc425205511259a8d71a9674b75b5d3478044e3a8255fe13d8a1dfcd4a0f33fed13e1c5414438c4867a6d40e566f4545022a58ab80f748151a06adab7ce90bf
+EBUILD sip-4.19.8.ebuild 2853 BLAKE2B a91e020e4e7b94873647ac68916d3a11467eed22e594871c20ccb94b958f8c51a1c00288f3344897b371a55088db1411b6bac74d014743f0ee099de9a74383a4 SHA512 f64b92e9a226f4d15d62c672532ec175b2191efc423d5d29b13dd4187447e9d5d7fdecb5147850bc6d9065c11906236b9cff017d4ee17f78bfbe869fbebc9225
+EBUILD sip-4.9999.ebuild 2734 BLAKE2B b2a2544bde99d02ee2a8d4381969c602338debbee3f1763d4be5f688a0c0a84e981e641e04292765d4338753c826b64f62057680ebeba13a227b1beb361429e2 SHA512 a58f2ff74967dd2eb605d3e99ff0418e419626612fc4d4da18dbdf211f92050dffabdde949aa5b78807efb51ce3c9d33fb9c2da1ac8b2a2f30b3a20f6ba713eb
 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
deleted file mode 100644
index 6707912b3761..000000000000
--- a/dev-python/sip/sip-4.19.12.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,7} )
-
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
-elif [[ ${PV} == *_pre* ]]; then
-	MY_P=${P/_pre/.dev}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-if [[ ${PV} == *9999 ]]; then
-	DEPEND+="
-		sys-devel/bison
-		sys-devel/flex
-		doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-if [[ ${PV} == *9999 ]]; then
-	REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
-fi
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]]; then
-		python_setup 'python2*'
-		"${PYTHON}" build.py prepare || die
-		if use doc; then
-			"${PYTHON}" build.py doc || die
-		fi
-	fi
-
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(usex debug --debug '')
-			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=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
index 728a604c424b..3313a4fac4da 100644
--- a/dev-python/sip/sip-4.19.13.ebuild
+++ b/dev-python/sip/sip-4.19.13.ebuild
@@ -69,6 +69,10 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/sip/sip-4.19.8.ebuild b/dev-python/sip/sip-4.19.8.ebuild
index 973f1ae60a02..bd65f8202bbf 100644
--- a/dev-python/sip/sip-4.19.8.ebuild
+++ b/dev-python/sip/sip-4.19.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -69,6 +69,10 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index 3fe2c1981bd0..4df03eb6f4e8 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -69,6 +69,10 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index 7085777e4e51..a2e90ef11da8 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -3,5 +3,5 @@ DIST sphinx-bootstrap-theme-0.6.0.tar.gz 1232454 BLAKE2B 90fed63a388f71f1d74cc31
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
 EBUILD sphinx-bootstrap-theme-0.4.9.ebuild 538 BLAKE2B 5dd5b20e7f382157d748baf695592c48643e97af2ed8557f565b799578b11356a1785e32cdd98b2dd1a6c29c4468c2111770d8262b84ecd5dd7f7501fde7b415 SHA512 deb99fd8023fe6c8a13f694735828654fd22977b8cd31a427f6b791a45ad6e53d0685761051111e8809547f24eb8ec403bfc5d6b403e2ec0a09795ef021798c1
 EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 542 BLAKE2B 865fd5d6a280bb83e979d8f761541e0d4062a7a53aa97ffb62a8cd2c8484bb161874a44ef21b3b3646bf643cbe2b2714eee1b308c0323bb36609d0a02cbfe7fa SHA512 e20fd1c014a31d6fcb66ae67570f173fcb037a8ab28ff486b37f65f33e859fd5b96d887489d0473c48872ab8a8517dc6f28f2699c774ff59f01f28e311a032a8
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 551 BLAKE2B f2037a2bde3b6b2c0b6900ec49ece40056036d8f2534b6df0152f5459210e86d13f9b3a24efb0d800efbed7b0a9deab27f09e87bbbe806535aebe3f9bc3cba4b SHA512 2b1e543416b8d560910ad2da6158cfc92f90ecb655d365156afb25dd5515705f8280db65bf0d539830209e8129cb8818b951e00ad5ac2e27f3547355567ea20a
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 558 BLAKE2B 84ff9e41b8c4bcc1a708ccc2073409e01370c3f0019c3fee9668a84aa6e859af8f3079a7b55fe5c1ce791f4869489507503d3ad9ec5ec5d6f0bd9eb365b92e67 SHA512 de6aaf5456269efd67bb6cf7589c47fc2a43ecee0b1813a8154a9233f7fdcf8056d610e27a5eb54766ffcbfa1b48707828bdf79a61e75345363d2460faa5c262
 MISC metadata.xml 495 BLAKE2B f1850c5403281533f2edf707dd9db4c1e339e56f4e5677d9189c51376b892f79c084bc987c0b1f28ae2fd09030daf5f249cb42681e8f22787df3b31c422b649f SHA512 c6011ce51a2c8f73d33eb80eb3adfcda50911dc535a1c6f18862eeec7c601245aa76acfdf7a9f6f80f4aed2793ad5ac244ae2e0a893723106a36539cd7d0651b
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
index 0dcbaa7f997e..dbc301b66f2e 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~amd64-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index bfb538339e6f..0890ab19d203 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,18 +1,7 @@
-AUX sphinx-1.5.1-fix-pycode-grammar.patch 525 BLAKE2B 67e574e914162110cb5cd59dd9cfc12abd1d2f35df556b90f163de57f7c1787bcf189b607792cc7002ad0d4d865e39d4739effe69e766954916cfd9ec4d6a8cb SHA512 9aae50a1089fc64fd0bf11890e08cc2d22f14adcb191985925811d819bcb59031fcb91e9281171ed11849644e277aadecf9b98c1b3cc2347e1cb6daa9032e3dd
 DIST Sphinx-1.2.2.tar.gz 3143671 BLAKE2B a21b2a060363ac86832a6a28a623ed410ff0bb39ca3c9c58618ade88f4305996e54c559bb588c518597e31a73fc16e0c37fc57950eb077179f03715dfee72729 SHA512 44073c215f9d0e7f6c7bc91cb85b0508a96e5cfff5f940fef86e2fc6f11281d03b54e87e51e5a99a23e96b470a93f3af86a6a3ab7c317c747406c55b4c37791c
 DIST Sphinx-1.2.3.tar.gz 3200548 BLAKE2B 42033c59e6e38247af12c78cb4f69c73b1dfa883aa8a9e6c180bb74de666b45faef24a55c0bfd3aa1f22bf3e632e0e95016eb1bea54e8b5ebc7df78756763b5c SHA512 00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05
-DIST Sphinx-1.3.1.tar.gz 3469782 BLAKE2B ae2fa602a7873e6ef735decc2dcdd5a2632b848bb8394ee80b4215e21bfe625645fbf905a6661c333ad062e17f15b6f2c39027b44ad827f66c6467a78e8c4490 SHA512 8b92b69c4ced242c5e608ea03a7a061b0d2908f34f3150048ff4ce08b5d56be4a642a6aec13fa249ff8208fa8dd2d38d8a10d37ebbcc68385ee51f527ede0b94
-DIST Sphinx-1.3.5.tar.gz 3679978 BLAKE2B 2a88859bfd4a3de75a7b56fce65086e1239c3c58730280df078b3f76d368028a124aa6d4ca65c40773efa4c1a83dd047ea0d647582057c63bf82dadb5f2549e9 SHA512 90eda9cdbd24575d9f763e5c35e176d9970d1c83dd06dd41e9137f5c6035738fd21c4c57ff98810fc8adf91fa625192e6534bf0bbf70e78cc98f73df59eaabbc
-DIST Sphinx-1.6.3.tar.gz 4674251 BLAKE2B ba13de3d72fbc5cbc3632a1062001ed287798efe5f04064d241b645d6e4c52c9d9c115aaae4ae7b94213bbddf595a93480788d66b3a54eac3c9fb415d007d4ca SHA512 d5aec58e19239db4e61fcd6b103fcc838d97aad5a7aaf9279ff1097791d9cd1ba245989307a2d1049c123058b84ca4e91db192a1672c040d80fafed3907736ae
-DIST Sphinx-1.6.5.tar.gz 4680974 BLAKE2B 97b0cff21985de071d29651824f2954ca4d12c5095fb8049597235c8071bccb00344e89fc4a90ca010fe79a76faf0e5ae2b09ed698f1c5bcfd8f06de64169107 SHA512 c6ba7ba639f9814867d9abaaac48d58daa9d0ea9ceae4495bdbd311856833314eade2d9df7213c0357d5eea53d525c5a1235bc977a07cc7ef82e1ff0ecb51f3d
-DIST Sphinx-1.6.7.tar.gz 4692169 BLAKE2B cde46b6e9dd2c39a592802e57becbb6f61e6d370ed08fdeb41270c8177818f48f68a6e03c174b8d70453ac6f936fa25a4c2bccbf9eb7e84a008027321db93209 SHA512 bc852d4694bf433a8a1d931bc67e4c8bf50789f833be8a338eb934325734b9fbc361c1d203ecd6e28f9c0dff5edb090556372d9403cc55d4972b18bdd4b7bfd4
 DIST Sphinx-1.7.5.tar.gz 4726802 BLAKE2B 8d828dcae1f3ebb813c5f2de8c096a3fac4ab88b424955c27592349c544b775a21703c904a54efa7f86e1967198f4950804904a82a7142a3499f33c5343506e3 SHA512 db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
 EBUILD sphinx-1.2.2-r1.ebuild 3045 BLAKE2B 315adfce3238e7b3c21465cd16e9a682255df98cf1c2289e3611a946f3642a9df204952d15a5947d1db2e4edaf909457bf78fc995e9d2d7b319ed8d82bd4ab17 SHA512 74d6530a5e4db4dc519eda8e4c9958fc54eb0767b00d6a69334a7c9e515bc878781c09b20e4ea5d7a23e55f3aa3093940be58013a42ef4507cf6fa2b3109007c
-EBUILD sphinx-1.2.3-r1.ebuild 3107 BLAKE2B cad89c3205b3987a80905a95798516a9ca8d6769aa3330bb1648b3a795b32c49a90b3bdb63335f4fb35f4ff95437588c863179d4b8817dd9ad83ede7e3a1ec5c SHA512 91fab1a458af03e497be8527a9afaef1fd97a2115eef6b8e549020701460cedb1e75b3c20f4fabc132f40faeb59880b45d13f5a80bd2c709fb949bd4863fc214
-EBUILD sphinx-1.3.1-r2.ebuild 3463 BLAKE2B 58106fef573a7bdb9e90c67a67aab596ffaaf01aa869111d8422c2e58e0a8f8236ba326bbfa6b52652b48166e7208f652ee1330a55b6d1bb9124ecbeebbd3c5a SHA512 cdb919b247a207534a1b27e7727e00b3e8dd0eeb3c3ed3aa63f59493f1a9840277d8b053a3cff4a0db53b687ecb6ba16d0558aa0697534f7adf211887b72479f
-EBUILD sphinx-1.3.5-r1.ebuild 3577 BLAKE2B 2cb4707c8bb3e1dfec094b359cefd4d03fc2aecc626d2d4a9370dcb696ea16ee08970eb2129c11fa601a043bf7bc783a8bca8e52f04c0a3b77fa1d197feef58b SHA512 bf4e5d4d5f96d3e0114fa81cb403081a68892580c651bdd7712e0ad06b96ab7586fadaf14c83bb0fc9e5c36f06c13fee72aa4805e12895cb1eb27fb649f26248
-EBUILD sphinx-1.6.3-r4.ebuild 3426 BLAKE2B 0dcfb96abd86c6b0439250adc8004894fd653c5070a0e3a425cbaf063c6dae7da3a48d0280a2efcbd65a7d17114f2dcff27d4d970b37af8bdd498db2a79822fd SHA512 70209e8e3c8c5b463ff5320e00efd7b1761dd7e270d4991c9e43b9a360dec966a94dd83dd65ea3d0d01eb9289a4658492809109917c4490124f1822ebb7ca217
-EBUILD sphinx-1.6.5-r1.ebuild 3496 BLAKE2B 61d468b87a23ec4d6247a4ee553d3ae94060e77f7fc4caec8b009cf43ec8849cb4cad2ac43b17ea46daa2b0bc313ee16df571660c1f6015b3173cff28c54774f SHA512 bb3cbc542479b8dbd418af82b935e389fac07d19ded44fa64251c17ef26c4e5500c97aedfcac52ad341195fa278d9235874dba18044c0feb1cbe10069a86d149
-EBUILD sphinx-1.6.7-r1.ebuild 3513 BLAKE2B 60d8965d972f777f87a25fc6b458f987da321dec1dd749d8faf7d5d875ae388d00d071d0b00b09f9e5738b5b938640e2a80f0e3ecb078efebd3c9439edf9246d SHA512 a39cfc9fe463d9100c13beefc0025d8d4cdd1f23509571ad5bd867d86cd469342aa7b66a5c350cbbf7904611369868191f31239726b48af5133f7abf31028c9b
+EBUILD sphinx-1.2.3-r1.ebuild 3104 BLAKE2B 5def64661cf250461a510307eface9a79577a19f8a0c347e6c3a2b5c0861bdcb075204d26e56030535fad6a96978344c650907e15aed03a859d4de9f6709252f SHA512 2106fa9b8fd5fb65da085464a9d6133cf07bab371fcce363ed0154fb0a86543047910b571d71f8f28e523a311f6e193cd3e29d777b28d6109681cf2ada1fdd9f
 EBUILD sphinx-1.7.5-r1.ebuild 3300 BLAKE2B 2bc93273d9fc49adfa033126c59f3383754537ef81632e6b47f3707fbcd62895325869078ff6cb5a6f4ade8439ce676585be2954832a4b6d2fda5aee67fa7999 SHA512 e90d2932c53cdb9d0628083441d48cbfd1c1aa3bb215058a55dee6977a1f2d7bfd36ea7e3c220c3b629c03805f0f7327597f8bcf0a87db71228ad639ada188b6
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/files/sphinx-1.5.1-fix-pycode-grammar.patch b/dev-python/sphinx/files/sphinx-1.5.1-fix-pycode-grammar.patch
deleted file mode 100644
index e72d4d45132c..000000000000
--- a/dev-python/sphinx/files/sphinx-1.5.1-fix-pycode-grammar.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-environment.py has been turned into a directory,
-without actually porting the code using it.
-
---- a/sphinx/pycode/__init__.py
-+++ b/sphinx/pycode/__init__.py
-@@ -352,7 +352,7 @@
-     import pprint
-     x0 = time.time()
-     # ma = ModuleAnalyzer.for_file(__file__.rstrip('c'), 'sphinx.builders.html')
--    ma = ModuleAnalyzer.for_file('sphinx/environment.py',
-+    ma = ModuleAnalyzer.for_file('sphinx/environment/__init__.py',
-                                  'sphinx.environment')
-     ma.tokenize()
-     x1 = time.time()
diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
index a3f6c9baf00c..225e80dc9d88 100644
--- a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-python/sphinx/sphinx-1.3.1-r2.ebuild b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
deleted file mode 100644
index 13bb7fcbe9dd..000000000000
--- a/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,134 +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} pypy)
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex test"
-
-RDEPEND="
-	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		app-text/dvipng
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	"${PYTHON}" -m sphinx.pycode.__init__ \
-		|| die "Grammar generation failed."
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if $(python_is_python3); then
-		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests -v \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-replacing_python_eclass() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.1.3-r4 ${pv}; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-pkg_preinst() {
-	if replacing_python_eclass; then
-		# the old python.eclass ebuild will want to remove our pickles...
-		backup_pickle() {
-			# array to enable filename expansion
-			local pickle_name=(
-				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
-			)
-
-			local dest=${ROOT}${pickle_name[0]#${D}}.backup
-
-			eumask_push 022
-			mkdir -p "${dest%/*}" || die
-			eumask_pop
-
-			cp -p -v "${pickle_name[0]}" "${dest}" \
-				|| die "Unable to backup grammar pickle from overwriting"
-		}
-
-		python_foreach_impl backup_pickle
-	fi
-}
-
-pkg_postinst() {
-	if replacing_python_eclass; then
-		local warned
-
-		restore_pickle() {
-			local backup_name=(
-				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
-			)
-			local dest=${backup_name[0]%.backup}
-
-			mv -v "${backup_name[0]}" "${dest}" \
-				|| die "Unable to restore grammar pickle backup"
-		}
-
-		python_foreach_impl restore_pickle
-
-		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.3.5-r1.ebuild b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
deleted file mode 100644
index e6be7b1317a4..000000000000
--- a/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,136 +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} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex test"
-
-RDEPEND="
-	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	!=dev-python/Babel-2.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		app-text/dvipng
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	"${PYTHON}" -m sphinx.pycode.__init__ \
-		|| die "Grammar generation failed."
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if $(python_is_python3); then
-		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests -v \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-replacing_python_eclass() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.1.3-r4 ${pv}; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-pkg_preinst() {
-	if replacing_python_eclass; then
-		# the old python.eclass ebuild will want to remove our pickles...
-		backup_pickle() {
-			# array to enable filename expansion
-			local pickle_name=(
-				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
-			)
-
-			local dest=${ROOT}${pickle_name[0]#${D}}.backup
-
-			eumask_push 022
-			mkdir -p "${dest%/*}" || die
-			eumask_pop
-
-			cp -p -v "${pickle_name[0]}" "${dest}" \
-				|| die "Unable to backup grammar pickle from overwriting"
-		}
-
-		python_foreach_impl backup_pickle
-	fi
-}
-
-pkg_postinst() {
-	if replacing_python_eclass; then
-		local warned
-
-		restore_pickle() {
-			local backup_name=(
-				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
-			)
-			local dest=${backup_name[0]%.backup}
-
-			mv -v "${backup_name[0]}" "${dest}" \
-				|| die "Unable to restore grammar pickle backup"
-		}
-
-		python_foreach_impl restore_pickle
-
-		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.6.3-r4.ebuild b/dev-python/sphinx/sphinx-1.6.3-r4.ebuild
deleted file mode 100644
index 7f1d945977a5..000000000000
--- a/dev-python/sphinx/sphinx-1.6.3-r4.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=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
-)
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
-
-pkg_postinst() {
-	replacing_python_eclass() {
-		local pv
-		for pv in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.1.3-r4 ${pv}; then
-				return 0
-			fi
-		done
-
-		return 1
-	}
-
-	if replacing_python_eclass; then
-		ewarn "Replaced a very old sphinx version. If you are"
-		ewarn "experiencing problems, please re-emerge sphinx."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.6.5-r1.ebuild b/dev-python/sphinx/sphinx-1.6.5-r1.ebuild
deleted file mode 100644
index ad810d050f81..000000000000
--- a/dev-python/sphinx/sphinx-1.6.5-r1.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=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
-)
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
-
-pkg_postinst() {
-	replacing_python_eclass() {
-		local pv
-		for pv in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.1.3-r4 ${pv}; then
-				return 0
-			fi
-		done
-
-		return 1
-	}
-
-	if replacing_python_eclass; then
-		ewarn "Replaced a very old sphinx version. If you are"
-		ewarn "experiencing problems, please re-emerge sphinx."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.6.7-r1.ebuild b/dev-python/sphinx/sphinx-1.6.7-r1.ebuild
deleted file mode 100644
index dbbac7ab54b8..000000000000
--- a/dev-python/sphinx/sphinx-1.6.7-r1.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=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
-)
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
-
-pkg_postinst() {
-	replacing_python_eclass() {
-		local pv
-		for pv in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.1.3-r4 ${pv}; then
-				return 0
-			fi
-		done
-
-		return 1
-	}
-
-	if replacing_python_eclass; then
-		ewarn "Replaced a very old sphinx version. If you are"
-		ewarn "experiencing problems, please re-emerge sphinx."
-	fi
-}
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 4fcc3bec44e2..1e9f7d3682cb 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-websupport-1.0.1.tar.gz 590480 BLAKE2B 1be40595094233ca2ddb1a367039320fe6655b1a6bbf251d7722b60efe0d0cfbe1cdb38455f47f4fb6810500e0e4923f5a9a74df4f79d1544261c4706a59e8fb SHA512 67807b2505e063639163b020f0e62469b0c2838c303516cce9a8d90181cc7b8a10d76532adb1267556d40f95966efc20ec9f8ee1a6731056bda827a6f97f40ec
 DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
 EBUILD sphinxcontrib-websupport-1.0.1-r1.ebuild 1161 BLAKE2B 6841ef437c0e54f5c01ef473178aa3e6af58c331d97343461e9ce5a8f52c2accaf9fca06154232a8d36db404b474b4de2cc2cafe0e0f9417c46a1799d1438d22 SHA512 92ed109f52211a8f0127ca1b82448b49221102a364d601ff31194c8b277ff0b85d7eb59034d74239f351ab16e5fe10e5022564e4608ccafb5b34165ebc49ed02
-EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1168 BLAKE2B 1fb6ff315b60be5878bfbdfc93c3b35c04f556c5e43477f65a58fd3151cda904547443b411805e3ae3b83a3b5d10659835c782824ac5958e8bfff63fe7d62d8e SHA512 971dafa099def45c7ca298ce7898dea6b10b11e98eaa1179340accccd6e788be01d9e7f3c6ab32d42f717f3725b7c8b617856d535d221db1f93bdf1f6bff9112
+EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1167 BLAKE2B 544d34d18d1d074e60adbf614beeeced16ea2e8bd1427462e6cf0630a39b6ce5fe9bbb8fa4ed7766e32ab69b739687fc54ee5e58b794f5f2231e8d5c31e1fd9e SHA512 6d7bc98fdfca0294b18d9445ec91d3873c1d85106f9ccc8ab9da5e181dfe4ed90b3738ea5ca61aec54b3a3de974bfe0387c2e2f321d8f4611cb52c072f0e4d55
 MISC metadata.xml 588 BLAKE2B a7a777dd8df5b09707041ace4566bf80cee826c98aedc1e13b7dd48ddce2201aeaa79f2091ac549a66da2a04449f3ba69c243c8b1a44e0f0b661240b7dc2fbe6 SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
index 1b01a1560b5a..a37ac0142cab 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index e1ee0a5b16f1..2106b7ff021e 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -1,6 +1,8 @@
+AUX sqlalchemy-migrate-0.11-disable-sphinx-exts.patch 550 BLAKE2B e422e483ad5da342bb43f1a3bf3ca68955bb4c809b5f821246963eb5afa56c7425bab0bcb2ecaa3236225ba38a61868f6fe5b2ef75c1f05f30c209dfb87b4e18 SHA512 20266450a59acd595477466df49dd430db17ac4b4010a7b247bd962a880f48e97298efb0617892ff0f45a14b18bdc88a47f6be7460ce6a931e72c85a0baa4e09
 DIST sqlalchemy-migrate-0.11.0.tar.gz 128299 BLAKE2B 1b13890aa38861cbcb6ff57b1169114183d17931890036fa3aa06a66c9f3e5b5cb5c84d752e6a1dc7058fbb9c6581b33a27f74800ab325801e2c318664cfdeb0 SHA512 5ce76f221cab54ca7436f30a907db4a17e7e338af2cc2d324f06e73bfeda99569584227f925f8a078d01c17761878b865af665a9eb7c1de306cbc0f9b8d7a451
 DIST sqlalchemy-migrate-0.7.2.tar.gz 105862 BLAKE2B decba0b4007143c2e98ad0b36880bd92ad6f771cf6b08ce4472cd2c0361658f449cfecdac2c8d5b12b1df8a00940dbdf714ee7d82cd9fb7f429187ec899eb19a SHA512 31c56da755ccccdc0aa5eacddcb097a4bd6431ab72a5b964689b0943b50ae4b23e034ae84d8dad4707d4cf9bea5b538e015ff755318685cc17dd82497a4cb4a9
 DIST sqlalchemy-migrate-0.9.2.tar.gz 124175 BLAKE2B 9c4edbec78074ffcc4be800c952b7c38a919ffd4dd829da34c5f4b3b3b06d8b31bb703e71dd43555bfd68cb7e82bcfbb632a362f9382fa61890a27b1f18c0c22 SHA512 25b218ae97e9a99ad126e4185621bff04da2e9d47d2e47620965974a0b865a9dad161c4d284aaf316f01f0241743d11dd6578942ad6673f2843476fbeaaa4688
+EBUILD sqlalchemy-migrate-0.11.0-r1.ebuild 1457 BLAKE2B 99a4bfe924029484d7b2289a1889afcebba5b7d721b7832cc88781ec5ee47c91a5fd98487694a6fb354286ab3b527c6bf3b9ed0760149346588ea62b7b105e04 SHA512 c83f3ccdfd77879e81dbbfe6fa0d13e0251e2f04e7f146408cfeaee0a02961af2ccb93f396997477b880c46fd3468fa17dee33fd5738b75065bb5279ad16c7ef
 EBUILD sqlalchemy-migrate-0.11.0.ebuild 1644 BLAKE2B 01ba49c80842ca24afb1bb0d72788f0bd6bac0e3dffa6c3b314a2a9e1d70d1e6ec4fdddf3e0f93f10e0ac53a9030a785f947fe2c45abdcf82bb73d22c912aebd SHA512 544ca0e697f2c3c115441be3913ac08c87e123d2a806c8773ec3cda8748230e4fea15e0e4526337195edb9b4c65102537ebaecf115d3217193188e9e99d85d8e
 EBUILD sqlalchemy-migrate-0.7.2-r1.ebuild 703 BLAKE2B 7e9385f0fb1dc023875e821e8a80bc4c64986e5077959a85c6f564a60509275d75418549f94b7187337a5661bb4d45dfbe2395916cc267c8c7529117eb2f32bc SHA512 34de48bf99f44bc001afc6dccec0fd01832ac3f8175e518a6ff6c370f48b8803e337dd5d1dc3cd4c8159702b2dc6300a58b99d255cd1d2d0c664782f8366bd13
 EBUILD sqlalchemy-migrate-0.9.2.ebuild 845 BLAKE2B 95799089253a2bb9403b41c1955aa285f007d771505115af6fb15f7111dd8977de5d4d87782418c7f0a0b8037df1615e90fd1358704115a9b90f954f3de20448 SHA512 889dd37145600cd04e5f701bb88c15e80fd6bed35bfd43a0ec8351798028968c0ddfe13e2a1f8128c9b4840afc2aed7bd023496e6a60d3bc3fa68a036bbf56f1
diff --git a/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.11-disable-sphinx-exts.patch b/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.11-disable-sphinx-exts.patch
new file mode 100644
index 000000000000..afb8ff6dc461
--- /dev/null
+++ b/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.11-disable-sphinx-exts.patch
@@ -0,0 +1,13 @@
+intersphinx: prevent resource downloads at build time\
+issuetracker: broken. see bug #527188
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -28,7 +28,7 @@ sys.path.append(os.path.dirname(os.path.abspath('.')))
+ 
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinxcontrib.issuetracker']
++extensions = ['sphinx.ext.autodoc']
+ 
+ # link to sqlalchemy docs
+ intersphinx_mapping = {
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..0cffbd3cae35
--- /dev/null
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="SQLAlchemy Schema Migration Tools"
+HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+		dev-python/python-sqlparse[${PYTHON_USEDEP}]
+		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]"
+# Testsuite requires a missing dep and errors with poor report output
+
+PATCHES=( "${FILESDIR}/${PN}-0.11-disable-sphinx-exts.patch" )
+
+python_compile_all() {
+	if use doc; then
+		einfo ""; einfo "The build seeks to import modules from an installed state of the package"
+		einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo ""
+		emake -C doc/source html || die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index e38397a00a65..35de9bc2212a 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,3 +1,5 @@
 DIST statsd-3.2.1.tar.gz 166047 BLAKE2B b0bf102823cefb8a698b759881ebb395c7408b8b5fff7cf304aaa0ecbad2fa8381fe05efa3cdd9c36c44c7188e46173235f9fe2cbed9fb940d8d5231f455d6bc SHA512 c5166fabcef2158aeb29b07b9bd1d241bc30847eb0e2c7694ee097b3a262e2590189ee10daecb368807002bd96fed16e749ca744b51b5e946d48fe2931a0d8e8
+DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
 EBUILD statsd-3.2.1.ebuild 614 BLAKE2B 3daf96bf745b084b2ebb1f26baff30b54535271e3d4217983b87aa357b3fe1d48e0a9d45d93b15f7b34afc36ee057972da4d95eb36888c67fd1b0ccad356c6a9 SHA512 235744f449eafed4bbbfa1f16d36aea9e74434e7643c463d3468389211f97e916d98ea07bc0a7e7ad04d2d136861cc45ab87c1cc8e3cbb2ee161d7af85661192
+EBUILD statsd-3.3.0.ebuild 615 BLAKE2B 51904273b99b60e3011f3dade216c8b006c7132fc97d6ee643e92b5ccb2c720d1abebe9c770db9ef44881832e687292544da4d5b5c754abd3938fe3ac3e1feab SHA512 847f6e0eb16eec3a10544408da0722dc1dc2ab4b7e6984b5d1c3973b524b2b34470589acb91222110f1f251fa0813b1fb038cd6957c357977c280ba51fff4903
 MISC metadata.xml 498 BLAKE2B a8ee652db5a3283200bccbd950e8a927442db0d995fbd9181ec3b638c1875614792024b11486450ec60b9554374195c97623b7e2a6bda6e11fee5a77f18386a9 SHA512 02243a16aaec81a9d06a08f0ff1c741d5bcf6f9d8fbf3c2037b03c1752112257c9c357720957871e25f963e84c93121fe4a5ddb69208bcfb2c29937ec7743ebd
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
new file mode 100644
index 000000000000..df10878f5be5
--- /dev/null
+++ b/dev-python/statsd/statsd-3.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,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple statsd client"
+HOMEPAGE="https://github.com/jsocol/pystatsd https://pypi.org/project/statsd"
+
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
new file mode 100644
index 000000000000..f88b4d59e335
--- /dev/null
+++ b/dev-python/svg-path/Manifest
@@ -0,0 +1,3 @@
+DIST svg.path-3.0.tar.gz 17077 BLAKE2B 6fdb51c982575639337d74a6f02f0bb3cc44dac56bd6982dec6493bed52d9caab5ed725ac59bf754f309cc62ef6f77faec462afacc8f93ce9a20b886ef2b5c8e SHA512 73d23f1386bbd4d1c1d805766f7e6fe6f8b7ac731e104020e7d853d7f1b46bc2681f44ef20d9c5343197d9d16b2af49f2c4ef4ba5945f4d25fa0493502203e13
+EBUILD svg-path-3.0.ebuild 634 BLAKE2B 34216103b9da6974fa35995433c17419178f9f1fcf60fe94ccd868f61470fbf45fa1223732c1e88848296ef742a37888103ed54b919e2750ec35a7f5fa903e11 SHA512 bdceccaf0e5bac88b788abf7477605d99668a94f57fc1f194ec71539f2b46cc317e7c67044bc2b97c5ced41237cd327f38e7a14cff7ca4ce66fb67e701b5ae4d
+MISC metadata.xml 710 BLAKE2B e7aca93129d338f2100be70376ad2c995bd03c63d1625e6ebbe033ff69641f0a6d5f31246a71224be6b7fedb10e9523f97dbc2c7e80ea49e6848ddbdf4e70742 SHA512 62231c70791c98f96a2f52c653a2d8f3c80282ce23e445f0a4375fcbb98f797c66dbfc04127f6ffc2d13b6fef4675f83a478ac8d35110950ff21485612c96028
diff --git a/dev-python/svg-path/metadata.xml b/dev-python/svg-path/metadata.xml
new file mode 100644
index 000000000000..e87a1113f92b
--- /dev/null
+++ b/dev-python/svg-path/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>horea.christ@gmail.com</email>
+		<name>Horea Christian</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		The svg.path package provides a collection of Python objects that
+		implement the different path commands in SVG, as well as a parser for
+		SVG path definitions.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">regebro/svg.path</remote-id>
+		<remote-id type="pypi">svg.path</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/svg-path/svg-path-3.0.ebuild b/dev-python/svg-path/svg-path-3.0.ebuild
new file mode 100644
index 000000000000..7856e4825787
--- /dev/null
+++ b/dev-python/svg-path/svg-path-3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+
+MY_PN="svg.path"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SVG path objects and parser"
+HOMEPAGE="https://github.com/regebro/svg.path"
+SRC_URI="https://github.com/regebro/svg.path/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test || die
+}
+
+python_install() {
+	python_domodule src/svg
+}
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index b612c5e1f059..b74af9afdbd7 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 1011 BLAKE2B 4521598f1f69f21bc55b08bb3b41f78147b44452cf37ace367b41d849a2af93e526a94f013507a735b48ec50f0b73e631d33706def20b5cbb4f75ce72b45dbb2 SHA512 33734d9f9a60af07a27f315ae3799bc17f58b6627cf5cbf2d119ab8fd33187f8c1e8e45f4373e12b23ed364862513a4d4425e959116779f42bf986e9a0943d40
+EBUILD tappy-2.4.ebuild 1018 BLAKE2B ed5588894d8b357ff478e6bd29abaf6055c39c560b9e280e8466a046cf83bd36f78290dba4a580b9cc688de985fde4609030956b91c9c3c3b711cb1d3d04fe8e SHA512 1ac5f5508bb6e5e7d4e462c1af6d85f587071f890f4deab7b8b8d8f48e100c0ed5adbf82836a3c29def07583adfb88dc70647c3fd85612b8b09fbf166c01abfb
 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 d11f0ba727b5..05ef10beab85 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
index f5f40efafe69..f38ec1df42e9 100644
--- a/dev-python/testrepository/Manifest
+++ b/dev-python/testrepository/Manifest
@@ -5,5 +5,5 @@ AUX testrepository-0.0.20-test-backport2.patch 2270 BLAKE2B a34bf9c2ca3f0ad81958
 DIST testrepository-0.0.18.tar.gz 84886 BLAKE2B b6c0161c55271722644eddd5d620ea67b67774e92d2de0117f645fc1016c9de209de6a9557862a27e08850a3ade5a2406ea5eaa410a2ce4d44fc26c8121ddecf SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92
 DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6
 EBUILD testrepository-0.0.18-r1.ebuild 1264 BLAKE2B 3c5a2f064654840ca87db24932e4cb5b1bef6e2a485a030d2ce84e21cd444ebb4cc6832c5ad8426c1b373c883e011844910158652be220a51359fff143ca8f68 SHA512 8c6d2b3a20fb4c58a78e466c61a153fbfeb663425978facd849987e6c8b994a9e95c944787cfb40acd88a3f46dde12609ce8610242c790e8e9169e36526c8153
-EBUILD testrepository-0.0.20.ebuild 1311 BLAKE2B 0437e9e974722cf10e76582e1c5c7e3682bb306ffad399a4180f40fc4ce14f1629fef3f29984993b75abba240566e34e6542ae2fec4e96504bdb4a6469e10d5f SHA512 f72503e471b31d583e170e5434c679fe2696d369442ff3b32729cc926388e6f61bc488ba7b6dcde8ed362ef24894deffb9cf8cf0aac6e135176b7df3e396422f
+EBUILD testrepository-0.0.20.ebuild 1307 BLAKE2B 4fa42298a4f974da9aa35b081f162ecf14aa10c86cf52e9f0d4e67a7af2c3a05a870782cd654ac31358d93407526820d9d5bd2f3a626deab3eba115872d74f58 SHA512 3953f876aa7fc1439cd9857e20401ec336d177faf10b1634c7f253a3f8fa7b4b6f766dbe28146765c6754a0c3b2d0e218d53d6d4a3d6a931b8c0dd0cbae6dc10
 MISC metadata.xml 575 BLAKE2B 7a1c9930c814a2bd60788a38d12909871d068def9c39041ac346466bb2d3940a3df3dc771fac6b2bad39e2a85b20f2b4fb8dc269af4e7853f02206eac9044e22 SHA512 36f0681e6b41a80ee0f3cdbac0520640c67a5612e73baae30b0b5917576d343db3327e03a40e20b23f23b0c76ca797d5ccd09d8dd339dfdb5af6029a4f4d79f9
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index 43149204533a..c8ff477776f0 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 1856616b10d5..11d880545a6b 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1,3 @@
 DIST traitlets-4.3.2.tar.gz 88173 BLAKE2B 51848cc4405521872391e2e4e55bb6c32ac939125337118bdc6282f4e7eacb116ddc94ff901fec18c2cf023af5d39aec77e6737bee2f915b28b4032611257860 SHA512 4f3239bc31af224814c8181dd1ac0fe5287160aee48b2b0f54afae841c8a9d7eaed010082044b6d16f91cd970bf0aa1eeba57d4503dd919fc8c4613ac5150ca9
-EBUILD traitlets-4.3.2.ebuild 1239 BLAKE2B f362990652e3cc7fe7b3b255e6fd6d067027c252bc8e9ace289f2f0cc245756dea39da736719f743bbcad309ba95be1e9cd9ef675fbb080ebd85794d9a369530 SHA512 c423fe8f7c4fe555230365e7ae6db68f17d1fd451de8a2782d52b1455dbda246acc50b14fe30a66bebc1901701d176a4a74762b2f79ea0a7709bdd8780048487
+EBUILD traitlets-4.3.2.ebuild 1216 BLAKE2B b5b73ca89ad3aca5ecea9324382f8ea8758120d4adb416084ac9b4a438f4d1ee2e330200d29748afaab360a71eacf8b51d6451c0af2c0859f39dd8bbe7cf5ba1 SHA512 e709552faf511130eede66caaa69deb7c3c9e363793c735ed6070c931151ab231c226e401360c9f24a2e9e8f143bf48de93a5be10d42f5f9daa62fdb21e33762
 MISC metadata.xml 604 BLAKE2B cdae6c5e9ea3e7b98e44d815f1f1865c83c78bf3457e3a26e5132fbb3648ec585e9224faf7197e0736e7ba98f19ef2ae0a3fb32f2b9615a2efa0fcaec80cc37d SHA512 0a7e7a4383b50e9c362a5135315d325f226640255521eb507ff7741a61ffe7a91a8a5896e641596d6ee83c1b70e8727e1820e8b29d53e466239d007b1155e221
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
index 51bc865fd59b..c9a8ea73a32c 100644
--- a/dev-python/traitlets/traitlets-4.3.2.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ DEPEND="
 	)
 	test? (
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		)
 	"
 
@@ -50,5 +50,5 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test --cov traitlets -v traitlets || die
+	pytest -vv traitlets || die
 }
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index eab3bd4d5fa8..4caefd01d423 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -2,9 +2,7 @@ AUX txaio-2.7.1.chained-callback.patch 1297 BLAKE2B 41aea0fac54ef4256e191d7d505d
 AUX txaio-2.7.1.f._result.patch 1140 BLAKE2B 675ffec2a0d4d9bb312492603765e79ddab23c063297f4ab79d3cbb57cace511b92e357cf54a283d0f096de9d3209fca266238282cd3a1e77039332c696ca00e SHA512 bcf4681ca1501dc9b21514dca68fb36d6b50550fe1760b4af00786a698b26c3fb64afebcf29c2404dd0923867da010bfa41afa9501f59f43306b55871d951a29
 AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7daa3cb5f20b88935a2c9dcd0784968edda8586a00ea69552e72ffd04647ce4ef96928059da SHA512 a82754ff4b81cdacd7010cb30065ae1a3408b2ed6e8a47021a2c7066adb614a87cc3d70b7980f10b9a6b063f4087ee44c5df2adab0d23ce90c1beb1368b4a498
 DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
-DIST txaio-2.8.2.tar.gz 43670 BLAKE2B e5238e59964b2ddb3ab400b2e2819c25a9ceed2da7db4c8a6e450f45314818b5c5dbb9f6e9bacbda738cb382a5b63ddc6650278b35734e48aa0e59c5c581b8fa SHA512 8b60a64ebfa1208995bc42e6ccbc87c4c3cd4687cb431435c6450cff31e5d0dba468c3f3494902e666cb2ee6dea84ded458fd8f1b3b9c25421b440dcd3fc5884
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
-EBUILD txaio-2.7.1.ebuild 1951 BLAKE2B 279769adca8634a3db2fcdb2bd8d6a34a2400e69394bb04f8b5b8e9d67e73721f566165871ae0cf85d4c5585901fa09411860c52e1cb800a71293fa7a99a2759 SHA512 4648355ea28264e43599a3b924497b8d6fccc68ed80e4b126aea7e90794a87af76db76b4d3c95feb3406a3e6482bbef88150d0adf26f089d949a9857643b7051
-EBUILD txaio-2.8.2.ebuild 1790 BLAKE2B 1e07b504a86e8189dc4a188980573e0188e134d6b6bb54a11a79d10fa7e2b5b3348ffdb65b3aa40812e845349f72a87f714e98f7c297af9cd9116c9a226f6e10 SHA512 103699f096bb49daf1ffcbb974eb6b3230cb413db178740b86e61133accc3c5b8b11d1aa6e668dd21b65d4a2dd5b8dd7021027c709c533224953f21fc62ca70d
-EBUILD txaio-2.9.0.ebuild 1413 BLAKE2B 5c37bc1d4a532405b952a5cf3137a3de7127e112389aa1b11939545fb4558e8102a731fd5d3a615a84fe03eee1b6af056633cc85db64a970b0360f7f589197fd SHA512 f49b6078a4619a26f02cce30d9df4b9da63c388d748e2aff02b630e99ddf74ae6d910f8130ddb4bf2d19904a404428c1c06b3c8c70055cef918f70aa026d8ac8
+EBUILD txaio-2.7.1.ebuild 1812 BLAKE2B 431e8137eb508b5ff8f6dede4f2340777091225abf8f4bfe0b9977be8e4e4c81d5d402d1db3202f864ca96d5ec43c900b8cdf4cbb2f65f6355006455a85cb736 SHA512 904986b3d0f8c0d4e1de68e7b2515bb36c99a0b611bf18b0a67ac3b0bc30c8077f236c371e204a2e267130f859c457347d93cd1a0651acf55ebbb62a571c15ea
+EBUILD txaio-2.9.0.ebuild 1411 BLAKE2B 6f0eaf570e404f1ed2e6098ff1d3f6ba1df7fc99f9a4f8cef3de8bc09dcccc593e94c4918f148cda0769606ac503b867b9304bd4d36b6b8200a94a7372350fa6 SHA512 b461afe759d5874d5b6bd5e425a3c6696ee82f05a6854d97e15cb4593c37cea449bd2e6403fff19a55a38e7483ac66b9059bdd16f7c8dde0f88d82ae6a62f788
 MISC metadata.xml 565 BLAKE2B 6ac243a37d1d168acb5af08993ea9ebe89003b5d1de5cc123f00f8bb09df9d106164c6b6fef4ab4923ec85b756efc175ad6ec5235bd0985f3af214003b27a33a SHA512 65e8db68004013282e5db56040eb37ec7d1016c5057accc2a1f512b72d66e0de1967cc6ec2ced38cadcd700e21a2c1b2c0206004eb72c26f2bd4b134eda9f77f
diff --git a/dev-python/txaio/txaio-2.7.1.ebuild b/dev-python/txaio/txaio-2.7.1.ebuild
index 0d6b45adb066..b40110804ca1 100644
--- a/dev-python/txaio/txaio-2.7.1.ebuild
+++ b/dev-python/txaio/txaio-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,10 +29,7 @@ DEPEND="app-arch/unzip
 		dev-python/alabaster[${PYTHON_USEDEP}]
 	)
 	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
 		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/tox-2.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
 		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
 	)
 "
@@ -66,6 +63,6 @@ python_test() {
 }
 
 python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
+	use doc && HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/txaio/txaio-2.8.2.ebuild b/dev-python/txaio/txaio-2.8.2.ebuild
deleted file mode 100644
index d75f1ebb10f8..000000000000
--- a/dev-python/txaio/txaio-2.8.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-spelling-2.1.2[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_rtd_theme-0.1.9[${PYTHON_USEDEP}]
-		dev-python/alabaster[${PYTHON_USEDEP}]
-	)
-	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/tox-2.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	default_src_prepare
-	# Take out failing tests known to pass when run manually
-	# we certainly don't need to test "python setup.py sdist" here
-	rm "${S}/test/test_packaging.py" || die
-}
-
-python_prepare() {
-	# https://github.com/tavendo/txaio/issues/3
-	cp -r "${FILESDIR}"/util.py test || die
-
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index eff2bf41f96e..aed5bfe9cfb7 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,6 +48,6 @@ python_test() {
 }
 
 python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
+	use doc && HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/ufoLib/Manifest b/dev-python/ufoLib/Manifest
new file mode 100644
index 000000000000..8eedc868bc1c
--- /dev/null
+++ b/dev-python/ufoLib/Manifest
@@ -0,0 +1,3 @@
+DIST ufoLib-3.0.0.tar.gz 115234 BLAKE2B 0bf7dff335df312252f3ee19a365f26d43531ac2d9b5d526af24038326e6be9d3b21f631ccc85199baaa827e02380b11efbd845efdbac158ba9ee96b947c3bf6 SHA512 c9d833dc51d0b6760d41832704c502ecf114a03999e449976b15c675fca265d2c4a7b396934c89bd7e4d1c0e893c86c713bab77bb9b14c4aff4edacb0089773e
+EBUILD ufoLib-3.0.0.ebuild 641 BLAKE2B fc2cf5a7e8a4a3665e3da752e870b909429800a1bdacf7a3261f65043aa17f7b19268694664b060b0ab8193d509e8e51d76a32b7a4603392e3ecb192247a3379 SHA512 0e8a6d2b507ba39a22c572591165ef484aadd2619ac83edf8db40f6fdb86bb66984967c02ae9418954db4e29720906139443757aacb4c71bca1d5a6390bba253
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/ufoLib/metadata.xml b/dev-python/ufoLib/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/ufoLib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/ufoLib/ufoLib-3.0.0.ebuild b/dev-python/ufoLib/ufoLib-3.0.0.ebuild
new file mode 100644
index 000000000000..d521d5550784
--- /dev/null
+++ b/dev-python/ufoLib/ufoLib-3.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="A low-level UFO reader and writer"
+HOMEPAGE="https://github.com/unified-font-object/ufoLib"
+SRC_URI="https://github.com/unified-font-object/ufoLib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/fs[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	dev-python/fs[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 5eee93ff0290..34d2fdb87a08 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,4 +1,6 @@
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
+DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
 EBUILD watchdog-0.8.3-r1.ebuild 856 BLAKE2B 9c906c5c618f0f2649cffbd79e5b289108ded726af922a3e649d3fe82bf320943409fff5e7dcfee1d0a5028c799bdf41ca6b593019fe02776b1cdcfa08091f02 SHA512 023d639b51945dca4f7b42e439b3f2e4844f1f6d22c49ef91182bc2b899947b133c1703ad0ecfd35f7e519d724ba77cb635102871b8c08514a2ed4cfc23794e8
 EBUILD watchdog-0.8.3-r2.ebuild 858 BLAKE2B dc7e530619d92bfcab4dfe9bc8cf0bc94a765e3f27338821e80f5b21bd913a8cd22fb6858da670457d40ee639f5adef0e6d41e909ad7442bcaf857f4cac6d601 SHA512 6dd41c3cd891db711b7367f16d1d22d03054394b6df014933c46aeb19ac6429997d9145c2f0dfc10ada82ab04a0ba9a1aaeca785a538d0f221761b1f7b63b3d5
+EBUILD watchdog-0.9.0.ebuild 933 BLAKE2B ec70f6fe2655e848b8bb5eaf8f92b2f8a3054591aa09c2bb6af63febabcaa56f3416d5279fde7305a3cbdbbfd92291411415e2140c9f744186cdddc802150bf5 SHA512 f9f75235ea8490d63808a3cdd31d6821881011ea4135b1ec0f4e2fedf21ac65a98f48feb2dc063d8a9a8caa582a775f15312dc7d64e3c897419b5e30af576cc7
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.9.0.ebuild b/dev-python/watchdog/watchdog-0.9.0.ebuild
new file mode 100644
index 000000000000..127d55400038
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/pathtools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	default
+	rm tox.ini || die
+}
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index cadb885485a9..89c80549b9ba 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -2,5 +2,5 @@ AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616e
 DIST Whoosh-2.6.0.zip 1193541 BLAKE2B f5afea36c53a06e3f23e06e3b6f51acd2adafa02488912c52fdda207631a6adb071256d26ed455042de1c4c2a136156ba7c89f4d6773ec60b392b03de3c37da3 SHA512 e50e47ec0d1c65ad3c7d657586f5380a1be748945c1ce964305fa68b99379f0da676faef6f0ca45ef151df7be71150601162ee966f3aaf84047a20bca36f7e37
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
 EBUILD whoosh-2.6.0.ebuild 1257 BLAKE2B 969818795f8a5179b912f79fe4435102ce101f32179a5c9ca3114818c301c86ff9da6fb633a60b556dff7d77bfd293d931fb18fb65464e5907fe0b8639b14484 SHA512 e4925f0060fd414db1555642106bfaa72872cb61ec11c8124ea07df6f78eddac663d1295f9281c347e68b2b2ac78664ce7cb236a71951661a34d48019c484e9c
-EBUILD whoosh-2.7.4.ebuild 1474 BLAKE2B d344258dfde5f4781de87d34976ff3be30d17ff476acafda5418bc21e011460bbb11b954a37f404eab3ba2f538ffdc14b0c5ca985970bbe7850de7ed9bbc449b SHA512 68af7b2d671016eebd7343073133b71d442f9a7c8f4383954ecf0c93fc5c2ecb690cf6cb4e036af8fcc95ff6839432e5f93398ba9183f5c3c81a6c65f3013794
+EBUILD whoosh-2.7.4.ebuild 1476 BLAKE2B ba7fb08eebf254e52fe70a848c6fe5d53c3ba86abb00361afc99b2c6ea03dbfaf5a3e58ffef8fca0c18bd5896b5920031b967cc48e07a63f3a36d1139dbeecab SHA512 7f6b73f0104da45948432da7ed08d61fe7b6a748c2fd767060a0fd0502a89ae5dc5eac3b33a1e185a6613f6ce0fa84ae08db9cad59db8c4714b662492c7c5640
 MISC metadata.xml 817 BLAKE2B dfecf5c1485e029a3614d0a45b78ae77fa7965000e5e9b95d6e7ed21155c4781f23b895f24b7189b1d7fbe7007828dd152d30c4013ea35d93ea1c5dcc985b834 SHA512 b9c1def2c09a31740729aed91c02a3382c9b8f10d9f959c0c80f41ac4822ac5ad3b2c7c998e244f91e64581c17c4d52a7264f679b44a9981587c053bc3b576ed
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4.ebuild
index bebab4dc689a..5e2191b8142a 100644
--- a/dev-python/whoosh/whoosh-2.7.4.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/W/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index f13738d746b0..13eb3243366e 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,3 +1,3 @@
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
-EBUILD zstandard-0.8.1.ebuild 545 BLAKE2B b503b32da86afccb1907dea8a672fa28aeb803c5f5cbf8325b0ea24945b7addce2e30839dff215a1475d0a096ec2299d5e19ad1753a3c0d3e566016f6f218687 SHA512 763315e68624772ca90a35cf70b7995cefeee53af7c2ed6746573446843c6b3c6d998514629084397a36072e3fff8447f7c653c7edf059fa1f21b85ded8162fa
+EBUILD zstandard-0.8.1.ebuild 558 BLAKE2B c3607d9ebb995c3ea7feaab8bd5545daf5cfa55d1a889713ed7c3fbfbd6862cdce61ab1f43efc84f7f78c6f5c8ba3697a2c133be1840314d8689880a081a2fd3 SHA512 5bbdc89ec340d20ee47f8a44266c5fe1dbc1d533e9cf23206a52f2a11957dcc8eaf34194503310085c485eddb7cc3911b9c5c6962d3edecde5bd27cba7e987e9
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index 315469ccdaac..9c888b32c473 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index fcf82558e126..61e0ca15a2a1 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 103a6bc21ee9..474d95902912 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD assistant-5.11.1.ebuild 1205 BLAKE2B f9516972ac2c473ccb5905fc5b87bc7cc4dafd49e200da6c21a340f3b14534371a3dfc1f9edd917846cce07716e5f7efde64cb8a63213859879ebaa1575c48a0 SHA512 c2419c99e7f15b7696d53e5e542c38a32223ff74ff6dea6c3957532a0079fa31e95623a280a6c9788d3d061b00fbffa89e60c9dab6e7624d290c30fbcb7d4a89
+EBUILD assistant-5.11.1.ebuild 1200 BLAKE2B c62aa0e5f3f66f8cb7d29ecc1dc6d778053e95aebe3c887fe6a50d7a222b91fd64250eb2bf78a2933508f799326c37e4bbec60593eab7ee936d2543ea51d466d SHA512 d59f6592d9bb3933520a076f9273593a89ad60a3afcec3a352f079dff628786a7e2a378949f86dc8a6609b8242ea9ec73f687e35764b28bf6507bf255f969d25
+EBUILD assistant-5.11.2.ebuild 1202 BLAKE2B cc09614074320f1227ac9293a25ef81af2996e6335e92c0ca850541b5892cfb391dd0ddc8c3ba800fe64f88fcb8590800457c1dda9faf58084356ce3fada5e50 SHA512 ca60d6235038386dd13708b38915081314f4c7e03de290690ce2870a57da9fd75fa8c9f63b0b88b9a3244378e8cc2d0f19d15d6afcd934d81599ee2fc6fc8661
 EBUILD assistant-5.9.6.ebuild 1195 BLAKE2B 9fd15cfd04a7544046cccdc503169417f53ee3a808aeb58a745063e62acb3deed5d761275c1c9a812c92a38427c447f542a77feb312517556c15b4da7681a2b3 SHA512 9139269fee4450c028b112203655a5917beefe83ef07544c8c129c4efee9815448af5cb59312b53821d0c2fa53214e439f02343b84952207a1f8cb57c3e09ee6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.11.1.ebuild b/dev-qt/assistant/assistant-5.11.1.ebuild
index 5cb6d4e5d07f..d9be38464014 100644
--- a/dev-qt/assistant/assistant-5.11.1.ebuild
+++ b/dev-qt/assistant/assistant-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/assistant/assistant-5.11.2.ebuild b/dev-qt/assistant/assistant-5.11.2.ebuild
new file mode 100644
index 000000000000..dc410213c523
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.11.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qthelp-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/assistant
+)
+
+src_prepare() {
+	qt_use_disable_mod webkit webkitwidgets \
+		src/assistant/assistant/assistant.pro
+
+	qt5-build_src_prepare
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/assistant/assistant/images/assistant.png
+	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 4be6732ab630..b15ab5ad8098 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD designer-5.11.1.ebuild 1244 BLAKE2B ad0534b8270814a5be1fd476da3a03c9eaaacca6c9188a3fe01237e7fa78dccf2734b5fab06e2a7aa40590229ed7cf18df208dbbf3c9a7bcce1ee5bf0cb34e99 SHA512 892e94e9ed8c3d90462f8141a18ae68304b8d096383a6d5d1dbf09ca439480ca6f289f0b59e16734477a845ae1a742235decdcb3b5f6224e2b2d8f65e7cafffc
+EBUILD designer-5.11.1.ebuild 1239 BLAKE2B a54f73feb11a1ea0592079e05377f65960a1810049d9695f639ccfa6f3a13c62a106551ad6da53e045b0e2c728a05595dc64e2c5858889a94189b221f83a4dc6 SHA512 ea9e993ca6b7336992220e833b5ee85c76a38addb93f5dd35e2a62d18e5d57616579c5223d6e61084f1166078ff5154d0ea755796568cd09efaf128d1d2b726f
+EBUILD designer-5.11.2.ebuild 1241 BLAKE2B ea4b6bc4dfffeeb4daa6f183e603cc6451f3c701c2c02be5557367a5f6b203d3afb353e8b75bd5fa0c0282b992017754286f2a39f0e3015d40a2420f6156848b SHA512 f41e4e42ec895afc898822ae247896bf92ede969b596af6606204e475790160f615b462aff04f4e1dbe2017d4c1986b0ab9955da45cc318be30b8b21a6d89720
 EBUILD designer-5.9.6.ebuild 1240 BLAKE2B 4e9a38c065ef1952e11e1aecb64641713a60158fb871366148b2a14e38f37f3bba3dd851af6785c60c4abb724a3f665a4420b04f6b4b94b0d95d0b2de3f57a6c SHA512 ce7311a632c53fac6ef6203136ca190518e5463f47536aa6bf32cfe9f06b8f2984889c23a0452c5f7c95d1f1e70df5ff20f133b9555c4546faf21b3c68be9a23
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.11.1.ebuild b/dev-qt/designer/designer-5.11.1.ebuild
index c561782d0aad..1eaf013f6c18 100644
--- a/dev-qt/designer/designer-5.11.1.ebuild
+++ b/dev-qt/designer/designer-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="declarative webkit"
diff --git a/dev-qt/designer/designer-5.11.2.ebuild b/dev-qt/designer/designer-5.11.2.ebuild
new file mode 100644
index 000000000000..96c6447229bb
--- /dev/null
+++ b/dev-qt/designer/designer-5.11.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE="declarative webkit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
+	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/designer
+)
+
+src_prepare() {
+	qt_use_disable_mod declarative quickwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	qt_use_disable_mod webkit webkitwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	qt5-build_src_prepare
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 128 src/designer/src/designer/images/designer.png
+	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index e66531565e5a..9f078174980a 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD linguist-tools-5.11.1.ebuild 693 BLAKE2B 39864f535257e8a5a878e9e1bada7bf211ca59c25a873bbd719f0f754ea44ca73b6bf60bf40e84956e9ab80c783d4d8f544ff1fe160ad5287fbda01b884e000a SHA512 9fbaa96994c68ba5cf1ad2c50cfde9c5ce1f3aad36a3c7072a8e9104f5e085d4fb6c5698e720a120b8c963c106cb228926499360734f6092a7dc3b301ee80306
+EBUILD linguist-tools-5.11.1.ebuild 688 BLAKE2B 657268b085f466b418e224676edc87ac9a7d0ae8106fed7749b1d7ef8da38c25f72a7ca5668d625351e25a87ee26c0646ca1a72a753e7502d42e17445f6e8881 SHA512 1ff54cc4bba75b670773493ebddc931ddd18679ae21003d5cb89e1ffbda006791b76df6d125c82c8a6ddd9501f2493de5bc87f7fc6e3e5540dfc6db3c1d14a82
+EBUILD linguist-tools-5.11.2.ebuild 690 BLAKE2B b9ec12ad97bf084240372c8c5155d93ebc408a182b79bed5fe65338dc1de285b6a9b24a941aaccf2c34c97fe0be796d3afa99c052e91aafe317147b625cd4589 SHA512 2f266d247b4899f095a059565b625130d8cf299233dbcd6f26dd118a855b5e184f79cc4bb2b424854ed729ecf7e6cefeaf51f0dc9b1f5d90c3633e463996eb2e
 EBUILD linguist-tools-5.9.6.ebuild 696 BLAKE2B 84dc96b8c8b7039af136be737689c68be4878322deb002cc28b59dceafb9b0a27920a7e2d9a79416f64af244e008c4f7e4e35a38755952252c27b17a8a8f4127 SHA512 eef4e1a0302525eab0195fc1f334db7bcbc4ed98ccc12b10504e01713555b69ac9ed83e2c0bd22f24f5bcc94a2578d7c94700d7cdfdc4ab09f3c0ea7333426cb
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild
index 72c04bdc9e06..d9ebbd26a690 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.2.ebuild
new file mode 100644
index 000000000000..f3ca25f77bc5
--- /dev/null
+++ b/dev-qt/linguist-tools/linguist-tools-5.11.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tools for working with Qt translation data files"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtxml-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist
+)
+
+src_prepare() {
+	sed -i -e '/SUBDIRS += linguist/d' \
+		src/linguist/linguist.pro || die
+
+	qt_use_disable_mod qml qmldevtools-private \
+		src/linguist/lupdate/lupdate.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index b3c1c06bbcee..771044cc3df0 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD linguist-5.11.1.ebuild 992 BLAKE2B 5db73329127034e7a71336bb845b7fe68ed45becabbe1206f24972ac1b4302923c504953198389da8d8021d415498460054c8d1191b1f13bf0c9f8685f3feab5 SHA512 25cac8c8a214be7467b58c73543693cd2165e6055516f74ac64fe6e33263da564b64957fa7c801be7d1ccb70c2673752ca4653c12821247dec56d8e7ffa4551d
+EBUILD linguist-5.11.1.ebuild 987 BLAKE2B e5fbc88c480c533ae90dd8611d31fa6e65ca493dccadff92c97121682a4bfafabb4582a83df6d71f8fb7a8d79c9709136656c9739739facdb52084c8ac7ef87c SHA512 900fb74bc8d4fa8dd82e9f6860e731337d9d7a402fbc96f67aedd191455fc39fcb2f6f562730f24805418f4319332403b93440828cf5fc89b2174efb7249f676
+EBUILD linguist-5.11.2.ebuild 989 BLAKE2B 6f6e3671da1f4481e040aa42a134dc9389467eaa165f419e128ec4a66f0b5fbbd9bd42bb648caae8a45c1d286dfe1533b45f5b8460c5cbdf9d0006eabefb68a0 SHA512 4fc12d99f2b6845b10354e33b03d98e6c7de69a5be465fbc2feabaaf8013dc9f1888164c9adad4cb8e4900242cf7acb90b4fe969e5578b4b441cce9c65415a26
 EBUILD linguist-5.9.6.ebuild 989 BLAKE2B d3766d1ec8f65abc86909647bab3e4d28666f8ee11d27aa52138844d0b738bd522154e5f461f6540c856bce00377515caf9cb62035ac67d34e6600f053669be3 SHA512 11a3cad892735e439d1f2851c320bd54e3a2fa89f1b9c4901b0bd445e54709342d4bcb7792e7a14c332326e6e2a6bc1eaf93534298029972e59316735f836a85
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.11.1.ebuild b/dev-qt/linguist/linguist-5.11.1.ebuild
index 38f06fe3f5d8..542fa7affd04 100644
--- a/dev-qt/linguist/linguist-5.11.1.ebuild
+++ b/dev-qt/linguist/linguist-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/linguist/linguist-5.11.2.ebuild b/dev-qt/linguist/linguist-5.11.2.ebuild
new file mode 100644
index 000000000000..4b9deba71e31
--- /dev/null
+++ b/dev-qt/linguist/linguist-5.11.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/designer-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist/linguist
+)
+
+src_install() {
+	qt5-build_src_install
+
+	local size
+	for size in 16 32 48 64 128; do
+		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
+	done
+	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index f9d353b2e012..667863527ca1 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD pixeltool-5.11.1.ebuild 434 BLAKE2B 7731f05f0184bc590629a2d0262ad9ccd2a97e46fda4e1bc0b79a4b275958397d41bde7120eeadd1212c6c3ba3df9ed0052dded5b360fe84ac8d12a48d518da3 SHA512 1d4b3837d72f8357bf2da0e41dc365c495f7e03c38f32781e0d0db328692f94ae0f93cb6709627df656fc40f7e9e897ba5171ba8a3fd2d6b724d13ec44babd1e
+EBUILD pixeltool-5.11.1.ebuild 429 BLAKE2B cc3d4282440bcf328fdaf639db713f8720fd6fe20b8fc54cd34d8bef98e9295700bd3ef566b690caa1450178d70c1957ba25cb20240785db58adb6d3ab18ba3f SHA512 ed774a9ee61c17aea4201baa1e0879e9810622f5bf5a61b9e48f22083314c48468d0ef8048f99f73bafe5528d43287b58c532402558b7dc3eee20bcb27f54005
+EBUILD pixeltool-5.11.2.ebuild 431 BLAKE2B 3c46935beebc3ad40e22c4f30b4fa04f72cfa6bc18d98ee66525a25042285eb3de9b9c4acca49a6295e2c64918469a3153e2203df8a5a88b45ce51b388a49a73 SHA512 c113bf27d7e155232ef941d3adf7969db1d6bf69643f16e9c90671ba4c40a0c57777f3640927521446f312088b5e8922d6d90112bdd54a1fe1120c38a306724e
 EBUILD pixeltool-5.9.6.ebuild 424 BLAKE2B f70a57ed314ef84a525eeadef282b1f8b526ece30980904fe79c5bb5a1b80d9cc0fabb79847e1eef9d70d419076c19ebad0a5d23ecd2b9d1b5832df5ed824721 SHA512 420f8831d949332c2f2f4625019476853f3073228fcd5a6e4173240647f340b80bf845dd0526ee5d0be466352d6faed48df3b18c67f59441cca06b81ed3411af
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.11.1.ebuild b/dev-qt/pixeltool/pixeltool-5.11.1.ebuild
index a008d4e58b9b..057018fa9add 100644
--- a/dev-qt/pixeltool/pixeltool-5.11.1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.11.2.ebuild b/dev-qt/pixeltool/pixeltool-5.11.2.ebuild
new file mode 100644
index 000000000000..96e86adc7ff1
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-5.11.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt screen magnifier"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/pixeltool
+)
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index f094e656e644..4a7fd9b12f92 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qdbus-5.11.1.ebuild 479 BLAKE2B 389c2775be985a7059044a1db31c7fc7679e88872f574d6d5bec61e2d463672469bd14069c493c72ac5f69e35630e91aa525156d6fecd730ca467fa08b4aad81 SHA512 2d5979f90be338e5bb2246a9463a1035e2175cdb0c5d30fc88e2dbad2d5ff868ade80dac28ec0dd359ea741b3d291c82f844278caebfae11882b09f2a636befb
+EBUILD qdbus-5.11.1.ebuild 474 BLAKE2B af1188d1865611a3e3b151e65c69ac177921a24ce2333aae9463075305ebc5cb409721380478caacb3b83daf550601e592c1bd2dd01d93ec024fd9b6ff1d25a1 SHA512 52e5ccb7c5c6b6b21db425000f25b5f1b85d1bd01e277755cd25e2ef863e430db264039071a1cc1a8c902ae69e386c30181fcb6491cdce8775419eeb07b9dc9e
+EBUILD qdbus-5.11.2.ebuild 476 BLAKE2B 98c9ca7b44d275962102406f06d9876e214d1b15e35ab3417c7224a494d0c1560f1663f0143c60bc9ad02eb3767b9ae5b2d69e0a57d9425c19e76096b78c099c SHA512 4477d873ae267d67af06b2edb8093f703b817da33c40d4beefd12d19c1554b1b11561de9003128f771e492c63b636dbbf43b96195ffc8d671413226b9a088964
 EBUILD qdbus-5.9.6.ebuild 469 BLAKE2B 95a5873acaf5b7144802f0d48d6dc5644a4a2d717582572f118f9873aa5e706e71598b6cdae9f76464c9eac9403ad93cacb0871329c5e496742feb14ae300e4b SHA512 d8383e9e3a899ac6f7b13ecc5196bd86d0a1f96144157b6597d6bae265b654fb4362498cf9ba81930bc2118acc50f16cf7db73c290c01dbff71147d6f9c2eb29
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.11.1.ebuild b/dev-qt/qdbus/qdbus-5.11.1.ebuild
index e3dc4f685541..4b848e2b138c 100644
--- a/dev-qt/qdbus/qdbus-5.11.1.ebuild
+++ b/dev-qt/qdbus/qdbus-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.11.2.ebuild b/dev-qt/qdbus/qdbus-5.11.2.ebuild
new file mode 100644
index 000000000000..154680d242f4
--- /dev/null
+++ b/dev-qt/qdbus/qdbus-5.11.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Interface to Qt applications communicating over D-Bus"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	~dev-qt/qtxml-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbus
+)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index b24289728420..f2ded54793f8 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qdbusviewer-5.11.1.ebuild 980 BLAKE2B cbe7affa54c3cf095e16abcf089a770b5c9b077884a8b05c3ec1bd968f2e7474ddd94b64f8266bd200e3737623a7b133edcdcdec4fab3acbab83179741936690 SHA512 70448c4b97151d0c5e7ce6b7a09a5dfe5c9dbbb954c73f9027b362dc8ab6aaea2e634985dfd47ddb7ff6eb25c00e3bdc91eb57882222b1673466d6ad9c2e6e0b
+EBUILD qdbusviewer-5.11.1.ebuild 975 BLAKE2B 36a680737af6f5c9dbc71191cddd19095e34c37422a7ecbe414149b04939e80d0910682f154d0bdba78d01ba8b5ab6a29d00c15ca4dcf3423a7ec7fc2c178840 SHA512 ff32ecc7e867b91a3884be0a59d4021cd72e40c3c79adc92d54337c71fd9eb7b1624304b730fd6bc4a1af8ba3492fdf79482955f743023fe474c8b28733de18e
+EBUILD qdbusviewer-5.11.2.ebuild 977 BLAKE2B 92e399fbec282973b01f57a26ef735095035489b2edad7db43fad47d143a4e88a5f6e977054a676b5a3b9fc91ab41654889293d82d860523da5bb6125228ce2f SHA512 114fb481bd3558fbc087f3aa9a8381cf168894e485c6a3f8acfca4384f274ea11ad45f4e47e8736a443e0b81f5019a51e1e3836d5757cc90280a202582c83055
 EBUILD qdbusviewer-5.9.6.ebuild 970 BLAKE2B ef175f6e87bcee9a13ff081c8501ce41317fe0e2a45cc8489593cf79a3298480a1f0e70cf95b507fa56739f364ba53ccfcb5ab215cce8625d4c2a01b7f3c7648 SHA512 5fecd7efe36d0dd9cf956ffe573b2a395d32323c0096996e0afd153af7224094cc74926c3473ead047ccf3a2ab079e0a9c78c82427ddebfe567ae90e1c79040a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild
index dde7d2df7853..5f17933a39f3 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.11.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.11.2.ebuild
new file mode 100644
index 000000000000..8b6f42e2e593
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.11.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbusviewer
+)
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
+	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 62ab9b1f4e34..8c3858a41bb9 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qdoc-5.11.1.ebuild 753 BLAKE2B a25c8f934982505e93a78e05b8772eb1476e31f4f3e3b315698aa518da2ed8dbec86867491bc5694ec1d6dd16e62869bd7d0b8abd59d39e7b8f9208053b14b4a SHA512 91546d1b9c02e16338186c56875222ac7fee28f99479f320d7cd1734908b96b9af036ea3c8dfe4a0f5d713a0731514bdeafe08e5542ca59ecc97cd51ba2036e1
+EBUILD qdoc-5.11.1.ebuild 748 BLAKE2B 2cfeb0fb1fa9029e0f623bf05fb857bcfc23baedfe63cbe718534cd80c0b80f751db5a8652fe559251acc4819609a284c9f6d90057eafeb79086b83d0ce93cb9 SHA512 d21d49d2f7b3e4f4d74a8c478aa50b5d65a9d071d54b24ee41bd645fecc3104ed5a89ab19be778eaec248105759f111b4c7edd4bc7a6cf268dfa2126a85cdff3
+EBUILD qdoc-5.11.2.ebuild 750 BLAKE2B eb3e07dfd858c8553e5595d9b6258e9e81e07e57efa4fd7f16319fb64b0e3fc2769877ce78eaa9d2286448d6f41490b8a6fb092a7aef6da2a845dde269e080ab SHA512 8e960867e7463571e7e08ba51c145847269311f210bdc6f0151be8c283a745e0ecf59cc76ba9e4584bc57ed6dd5e1cdeaa95dadc1e15103d26a8f4ea2b36420e
 EBUILD qdoc-5.9.6.ebuild 534 BLAKE2B 3817288c91c7c034346c8b9d093d243cbb37229c411117d20efad801fd483730f51de736fffd3f697a081b8be2a083b5e9ee50a1e73d646100aa409306389eb8 SHA512 ab20a092b666c13b4e248c6abe9e2fff6a79d740ee3ea996cd3aecd72b23857e950b9555fb0293908c49b4719f923876b5035247e28210bbd82cf19a99e3c57d
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.11.1.ebuild b/dev-qt/qdoc/qdoc-5.11.1.ebuild
index 4c656e1bf9f6..c54433b0aee2 100644
--- a/dev-qt/qdoc/qdoc-5.11.1.ebuild
+++ b/dev-qt/qdoc/qdoc-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qdoc/qdoc-5.11.2.ebuild b/dev-qt/qdoc/qdoc-5.11.2.ebuild
new file mode 100644
index 000000000000..6e802bc94b9f
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.11.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	sys-devel/clang:=
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdoc
+)
+
+src_prepare() {
+	qt_use_disable_mod qml qmldevtools-private \
+		src/qdoc/qdoc.pro
+
+	export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
+	# this is normally loaded in qttools.pro, so skipped by using
+	# QT_TARGET_SUBDIRS causing build to fail
+	sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index c577ac92ba3e..c8f57c64ba74 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -15,6 +15,6 @@ DIST 5.9.6-0-201806072055qtscripttools-documentation.7z 76289 BLAKE2B 8335287080
 DIST 5.9.6-0-201806072055qtspeech-documentation.7z 148960 BLAKE2B f26ad95fbd75f001805566a0ca7ef58816be90327d6905948bc87e8d3fa2d1c01b519d9b4e3c20ad9e689a4d79cbd93f286db9cc01b7a167230ce6d2f7333699 SHA512 af64dd1a2fdb6b1b7a5049eff67576d8b5a1f1408c771ee1db1f78580325f2da71f4d2e74abe4cfb438a11fe1478e65a6366aeb585ed98769a51bf9d471d747d
 DIST 5.9.6-0-201806072055qtvirtualkeyboard-documentation.7z 449786 BLAKE2B 33a7e07d9b2cbd83bc8a6086172ba4cdbdcc4ad3d89c44b8e48df1a5400e1ae784a3e1742f0732f4dcc73a78008d0d2d9035ad412dc03152cd760a3882c4f014 SHA512 ba9d851e2100c895b6831b7a370a98cc5d43baba893a5861daf77bcb5fe490b9e15d6142315fedce89e0517a2aef90280494216175e2f39a6ac19f34d8852f01
 DIST 5.9.6-0-201806072055qtwebengine-documentation.7z 3382083 BLAKE2B dd2e40fe408a21347931e5c73059fe437ce2377018f431dabd1544828cbeb575eb36671cb0567284d6eee4623b699f8cdb9342ed5307c95edc23978235dc6a92 SHA512 394045b2ee583cd826b9aefd0c8fca94586400115f8fc31354854db3f002007c23c27c25ed19f76ce60a118600287f09d53f81a5b3a3fc07b9d6e2478319e1ca
-EBUILD qt-docs-5.11.1_p201806180847.ebuild 2029 BLAKE2B 4d48f98c7a891124c33ce0a08c1af452725282bc9a2360bd7fc9d06c667bd1b6ec26213c10e756ca329a6ae68c5f18b33b945e45014c65c06dd7f66d9870445f SHA512 9754bf952bb8f9af7b7bded2a58c390730347fa6109f10e2a07227d112e3a1e3ce7a94b7e14f1a96c2ad287ec0b5804f8e115df5e94fd8c2bc44e1f3468a3b94
+EBUILD qt-docs-5.11.1_p201806180847.ebuild 2024 BLAKE2B 2c4bf3175b42df76156adc97f9478624f8b3c3d20dbc994d613952150f42b29e651f76f693729f338802cd92956c0706f19d968271515b57b1eebd8071559cdb SHA512 d6da3044733f2e66c341aecb4f6031ac8964bee37211914bffe3479d49c87b0f98c0289cd84927c6159b7bcb4a092a19ff34eea765ab0b9f44fe41bfc2bc7218
 EBUILD qt-docs-5.9.6_p201806072055.ebuild 2100 BLAKE2B b76b031a1e4a72cf86c2135d7f7f3eed9288ab647e4f4ef6817ef4dc83e5b80764c0e590d072c1ee9dcdd5960f9311e876590a4ce20b0de32eae32aad41ff787 SHA512 a883ade826c6e40e49bb68669c9f4cd3b2daa83cf99e4cc5dcef988f124c9938198780c7f1891a09ebb328fac72d194b3790a4cb9d3f482441a2cc099f17b80e
 MISC metadata.xml 1798 BLAKE2B eeb4fd398c6b8c9422c2be3445149f4745d6658c78d16f3ac92b25bf3b622d7fa0a914f5abcfe9170978853c033c8752eaa3afdbf3c2bc41f66df69f86173de4 SHA512 e8ff00579cbba2f2d0fd2d91a370e0c2f4f83dda0ddd4812850f50f7cae2add0fedde9a8ecad9c2fd7219ee344aebcc64ac85860127fea93e430224d45c6fe1d
diff --git a/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild b/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild
index a475934e374f..8c5bb124afe3 100644
--- a/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
 
 LICENSE="FDL-1.3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
 	multimedia networkauth +qch script sensors virtualkeyboard webengine"
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index af26d282cca0..9759c468e6e7 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,7 @@
 DIST qt3d-everywhere-src-5.11.1.tar.xz 84763568 BLAKE2B 92510ae0cbc4627a9d0517bfe3a17c4efc6538cd04787b3fcbf5b0f381558deecb96a70f488d797719852b625bb47827ad630692934aad5574865e63f77f589a SHA512 d1a07586d6b64ff3b1e85c41c8b3b86f6327e9e63f5f45344a65a6136179f6a8361ca9da80944b244d8edc53d8b0e9f8b646d613f6b42faac6cb724f49573a8a
+DIST qt3d-everywhere-src-5.11.2.tar.xz 84932180 BLAKE2B 90166932d34d30d02b1453ebb5dc6f0b77104c37023e00198246cd646c74d88e0931fea085f7021097a5d7b61255ef1a4a1a73466db244f26315433a53d8d4b6 SHA512 706aa7e9a43d50823e8cd1e4838417a44761d6391ca3f8bae54d371742789ee63ba36e219c0a66ad3957ae0d68ed8e58c13f56a5f151b2d09e2c99e986aea4fe
 DIST qt3d-opensource-src-5.9.6.tar.xz 83722792 BLAKE2B bd101674c83a52a9df7a0aab738cebd9500a6d4aa4b5d2c2d4ab2f049f9e643d81ccd48273f089fb04c6c5d0417f9bcdaca0948ecc73972870d8fea472f38655 SHA512 6a882e79c7e0e36f620f9ee77d5943b8b0b4d3e1ee94ab08b70fc30c0bd4774967c656d38c489d9478f8feb91fc83614f639e13933b756ada3c12d6123c907de
-EBUILD qt3d-5.11.1.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
+EBUILD qt3d-5.11.1.ebuild 636 BLAKE2B 488a2a0915778d7ea337d1d54ce058dd61a94c21d52a48cf1177b1fca282ad43ab1ab20f9c668cf0d6b2d2700dd35554ba35a082377f8f35f72ec1385b0cffa3 SHA512 bedf4da6c6a3ec4e1365042416dacdbe9727679bdbefe122478e33a629f061392d3722bb75e18b6b8021ec353e0de94583af74be24c24c294aba282eb4db0ace
+EBUILD qt3d-5.11.2.ebuild 638 BLAKE2B 5fc0319b01a260a284446d58155f556dfadd8493b7d7f5323ba7a99708ca25f666a0febf16754c4564a5aa5db16726b2f13eb4cab3f72a328457301b6c2c1135 SHA512 fe935e4bc6fa461e5ec41c1c7e3819e909ad7614d1a24dc70ec258e98373454908cc9a740dca3c92704e771de3a70fe164c1b04cde2ab3c0ad8c18eee29a34f4
 EBUILD qt3d-5.9.6.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
 MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
diff --git a/dev-qt/qt3d/qt3d-5.11.1.ebuild b/dev-qt/qt3d/qt3d-5.11.1.ebuild
index e65630904901..344f30dcc2c5 100644
--- a/dev-qt/qt3d/qt3d-5.11.1.ebuild
+++ b/dev-qt/qt3d/qt3d-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="The 3D module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # TODO: gamepad, tools
diff --git a/dev-qt/qt3d/qt3d-5.11.2.ebuild b/dev-qt/qt3d/qt3d-5.11.2.ebuild
new file mode 100644
index 000000000000..40cf9458acc8
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-5.11.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="The 3D module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: gamepad, tools
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	>=media-libs/assimp-4.0.0
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -r src/3rdparty/assimp/{code,contrib,include} || die
+
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index c532b630b31d..895b7f774661 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,5 +1,7 @@
 DIST qtconnectivity-everywhere-src-5.11.1.tar.xz 2734864 BLAKE2B 7bd22542f06f6a46689b176181e83a315569690e3e5ce20f95d473af6d8513c03d47f2c7801cfbce522f49e25e1183e7553e104c7aaa7d071b86719236847438 SHA512 3533b117a6d028ef7bf4fe89b9ee42409b7a6eb62e60bca84e5f1323f6cd9892234d2c9b213ac806cda29cf36c8c6c646dec145933534664d376cda5bff94d8d
+DIST qtconnectivity-everywhere-src-5.11.2.tar.xz 2729556 BLAKE2B 02b7fc6e9caeb55dc518637d3b1f8135074868fcec0743a1c8d82003f77ac4bf382a32afc3c93caaa4f2fd0439455be9fb0b7e6d7aa8f025c425b0182ae9555b SHA512 c6fc77554434abcb2e9b8be75e2d2a5c31b5a92aab8dfd29b94e381da9f423cd2530d31fc0e58b8e101b7101dbcb0e6696abb45423199e2deeac3b9a0b11f5f6
 DIST qtconnectivity-opensource-src-5.9.6.tar.xz 2712048 BLAKE2B 8eec7fcbbb90f147c28de44203e1d584f0aa3efef996a3a9ebfcafbba8bc2d2dbee8779610e44dfb293898c79666a0e82b40707802f76887f8f3f3fdc86beb2f SHA512 6503013cccea89d56ea8f31e3d1c6f8928c101cbbe0311ad8463e7c49421015a731c7f33e41bbac608d5714a8821cc82a4d6e5596db86e00e60c79ba9dac4399
-EBUILD qtbluetooth-5.11.1.ebuild 641 BLAKE2B 922e93e07d44ed1f07466bf8f52af6908c2732894630e3920b8046727b03dfdfebe7841c03e66a5f60aaa69502595691748241d76469ece63250ac3fdc6bca16 SHA512 ea8e27764a21856845dbc2b805136b4f1b9386c60b1859d6782f7dd986591eba6af492887b4f56438599e8fda57c38dd64a04019a42c612aa94d463d0e7cffac
+EBUILD qtbluetooth-5.11.1.ebuild 636 BLAKE2B b4f9856710aec096d0b61ad5c7be8da02af6a4ba87b0629de39e056e185d8c046081a65b35cdcf506092807220e4664a183143696fbc32a73ad1e56d04deda0e SHA512 79b6162387e3b3f052d3ac4bb4aaba5453b1e4803cf2bf5276653d025b14070469ebbd1870fd638bb9d8171dde751c51b6f2e6b20d29baeec3fdf42618568127
+EBUILD qtbluetooth-5.11.2.ebuild 638 BLAKE2B 101107b56b9c9e1374aebcc4b8916ffc2977bf443c359dcba798171978516f16353a7ceeb64d5c808b19b7acb4a3d0c51f2284267e34aba1b2b81474321d334d SHA512 9f67b9d1d42075fe0a4e8fb09bd2b09af12c09d6944783c058eb05415c52772edd71d8c8159a38cbdc8e4de3243dd6e1f6e6bb310962dc4437031ff881032656
 EBUILD qtbluetooth-5.9.6.ebuild 639 BLAKE2B cc1e3489fce5a48b5965d387e34597ff602a15ec1834bc4e4f528700e91b3f171c23cce9134938a83205a938df91442e068b8f4ecea148d85e18fc4f9d39a4ef SHA512 8e4a38ede0f82c8ca87421bb297d2cf0023d863c3da155f11f4c7d8b5fe7e587160e8b93d5ac40db21ebc098c52108b81b212aa2756ee16f4160eda185177857
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild
index 7f4a8b1b3eb7..f67286f91942 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.2.ebuild
new file mode 100644
index 000000000000..b6610fe444f8
--- /dev/null
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.11.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtconnectivity"
+inherit qt5-build
+
+DESCRIPTION="Bluetooth support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	>=net-wireless/bluez-5:=
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+DEPEND="${RDEPEND}
+	~dev-qt/qtnetwork-${PV}
+"
+
+src_prepare() {
+	sed -i -e 's/nfc//' src/src.pro || die
+
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 494b726b84de..0ba874cc7541 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,5 +1,7 @@
 DIST qtcharts-everywhere-src-5.11.1.tar.xz 4245496 BLAKE2B 92c1d9330d2da96524505186cd39c34765fc65ba5e5947d27f0bc7e275bc044112d3cd9fcef0c5455b20d0fb931d3bf15f8961381e47a7d537e47d1dffcbe5ee SHA512 e3c02ea9bd985a8d051e305dd04e58711de3b666128a695011afd65271a2c7bcb11763c18fe201045ce03df96326490ca7322bdc0f77e97988ec59427505886b
+DIST qtcharts-everywhere-src-5.11.2.tar.xz 4239784 BLAKE2B ffb753a133232afa7037fc5c41d27de748e23cdcd567d0f8a993e1323a9ec8a1d2c49624c4ff2a076471227b47cb9225107ab726a4df9ffa9cfa7520f5f570ac SHA512 19a9a0d78cba75d7ed237647c04237797b6002f9c6a4a08f4d4a90426bd44bdbde3f4ffc78dfafab3abb56faaef458a2577f5249200ad89e125e86049aafb85d
 DIST qtcharts-opensource-src-5.9.6.tar.xz 4155980 BLAKE2B 975ed87424954502184c0d09cfd51f19b5908e4f297b47b5cfe5e40c5818816843d5c90c4012340b8731fbb306eeeb1edd6ba94a7db755604bc8ef6e8cedb168 SHA512 6d6ed9eca5611774ec683a85164858acb9071f74a0b2ade6976edd406232f51915e5fc1d144c9ba7ec69d36a4ab4840aa6d542214cd70673b3a3b8e6a0b88d68
 EBUILD qtcharts-5.11.1.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
+EBUILD qtcharts-5.11.2.ebuild 518 BLAKE2B 6b48d374a365faff7e44b4190d3dd1421144f9c8dc3aa030da0f4e7f6111084fab241b9632f5ef2f8b9fee0c397816d2877698c791833aaafeea351264636a10 SHA512 ee27dc7acb7b44744e9ae32e4579e4fa78a7050ebea4a9859214e75c7a95428e05a7df9907acb305d6fef8a04cd68a7efea7151ca6fc9bf8f267b2de910443df
 EBUILD qtcharts-5.9.6.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.11.2.ebuild b/dev-qt/qtcharts/qtcharts-5.11.2.ebuild
new file mode 100644
index 000000000000..75f61952dee3
--- /dev/null
+++ b/dev-qt/qtcharts/qtcharts-5.11.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Chart component library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 425a3354bffc..f11ff0c76222 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtconcurrent-5.11.1.ebuild 458 BLAKE2B f7eaabc0a85b205482a21d03d381d1da5caa1ce243f7b1245cea0c8246f8f1d789e67b759c21f95920612247595d8efde568669691f5d6da1e135f3261ce24ad SHA512 d1ed4c1ea5d7ee9d12800902f43864d6b7b1966f3d0acb95b37664b33f234b053394a5b82d32f24cefe0055e57fded41fd80fba87d4b0985722418e29cd9c194
+EBUILD qtconcurrent-5.11.1.ebuild 453 BLAKE2B 529d48392b61d57f943062af899d19ce0148595ae085c7a5fba0886777dd56f4c40d5ee0bdf84be0baffe2782da4a63d8ca3b57195d4dbf9d46ed10f105403fb SHA512 af8082eae11587eccfc5cd572c303dc087fed5aa374fe60fcab876f1626754b1bab6a1866b3b33e1744b13087ac8c27c2d634e598ec82e3003e41448146397b9
+EBUILD qtconcurrent-5.11.2.ebuild 455 BLAKE2B 436a0f43e4e0a1107173c34d5ecaf573b9166727b95398f5677a6df87273d3d58abdea70a721e3850bfbcdfedfdfb9e0e9f0e046ddd4faa8fa7b496ec66d5a32 SHA512 509fcfc01daa203d0f3f882adb4dea59af534f123d23e7b74fa4b81a930e8b92bdd2f71459a0de42f4534ef2d943b1df14a513e312a29ec0aa7eb4bc60cb40c5
 EBUILD qtconcurrent-5.9.6.ebuild 454 BLAKE2B 4bc4517da2cd438286ff1dfe291ff3c7ce7a1980f7ccf507c58b6c70e2411b39aca015d7a32cdb6b9f9d2099f3f45c0db2af649d7f6a7d3c0f1e014f079978a1 SHA512 09e48863a11d27e7a4424500cc96178546de91570d29804d3284d5195a1fb057b33635469cc4baf7d89a305aa5dc5622c122861d2e7298f807f7729d4f8b274c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild
index fa08dbeb0a26..b63e75f9001e 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.2.ebuild
new file mode 100644
index 000000000000..098a3a793986
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.11.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index dd9b263f07f9..03878fcd7466 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,6 +1,9 @@
+AUX qtcore-5.11.2-export-qt_open64.patch 1215 BLAKE2B 933cd8eeaaaab8cbc0c4ee5caa422d4a0c8b49f8de717786b7dace159c07583fc83875957cb4cc8191fa675de26773e32d7ff05b495991f639cf93eca05896d3 SHA512 60089c900a690c9f6514499ea5b54230736fb89fdddcda0bba6ccfe2cbc424a36f0fab86d7b546b92316d262c5ae31dd351535b4cc7fd4f6fdcfc403cccd7a03
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtcore-5.11.1-r1.ebuild 1504 BLAKE2B 098e1da5ccaa1c453921fa1d50f209cdd67d9ffff8900e8d0c1a5c4ccf49d5788b4c74112931cec1967c86ac9b19a7f1a152bf04f9f6f88099461097cf54a56e SHA512 c52096cd039803fa4a33ef4845925e197938a7543f7e8418516acf4194e8110f7c91eb43572f60cd7c67ca718f8a069ad057376f2a1b6dbf48752f340ffbecbf
+EBUILD qtcore-5.11.1-r1.ebuild 1499 BLAKE2B 801d71a80d202eb5b44d06b3f6add2af5689a068455935ee44a45438ec32308ab22bed8ce3028d56dc68665827dbea0a06804e4a0dae189fd679df30da3e324a SHA512 30b0ec962489979874e14e42ca2f77605f71128b360c44f08e0b1d00f65f43ad363e736c2332504a677d447079da3bfe7e3643f638d291aa5efea44faff9d294
+EBUILD qtcore-5.11.2-r1.ebuild 1570 BLAKE2B 9c029ee97c2d6f132cc95727106b4c07c94789a80d7dc84324852f2fb2ed7fa00773ee86ebf15ad45cba4bb7cb97e0485db91a3bd81766fa44c5a641f7a1bf30 SHA512 74e6de58a624bc8855818d2dc5c3b75e78444f042d073c5d265df92a339f998124035092c5a6370e55cfeeff56a336e22d5b92c876fc917df58f3fef11d01d59
 EBUILD qtcore-5.9.6-r1.ebuild 1504 BLAKE2B 098e1da5ccaa1c453921fa1d50f209cdd67d9ffff8900e8d0c1a5c4ccf49d5788b4c74112931cec1967c86ac9b19a7f1a152bf04f9f6f88099461097cf54a56e SHA512 c52096cd039803fa4a33ef4845925e197938a7543f7e8418516acf4194e8110f7c91eb43572f60cd7c67ca718f8a069ad057376f2a1b6dbf48752f340ffbecbf
 EBUILD qtcore-5.9.6.ebuild 1508 BLAKE2B 34ba4a5cb00b733481fa35cb0e892f6eba653f4693d24e06f8c3dadf436255d6ab33f6327a14614453e7d88a8c4c1c988fdbc16c7690453051012215c0f50b07 SHA512 7c511688ca6323acc9d7f8e97074b69a25548a8203e2dc9c8b68a2b8c0cb6950e4e3c20fd41edc1a9dfbaa59c5394ef8f3611957624179c57ceb27a962559eaa
 MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/files/qtcore-5.11.2-export-qt_open64.patch b/dev-qt/qtcore/files/qtcore-5.11.2-export-qt_open64.patch
new file mode 100644
index 000000000000..a0a6bff9f66a
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.11.2-export-qt_open64.patch
@@ -0,0 +1,31 @@
+From 4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432 Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Fri, 21 Sep 2018 09:04:24 -0700
+Subject: [PATCH] Export qt_open64 from QtCore
+
+Other libs use qcore_unix_p.h.
+
+qopenglprogrambinarycache.cpp:function QOpenGLProgramBinaryCache::load(QByteArray const&, unsigned int): error: undefined reference to 'qt_open64(char const*, int, unsigned int)'
+
+Change-Id: I44e7d800c68141bdaae0fffd155675d15eded2e4
+Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
+Reviewed-by: Eric Lemanissier <eric.lemanissier@gmail.com>
+---
+ src/corelib/kernel/qcore_unix_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
+index cb98bef3476..5a2a29a3273 100644
+--- a/src/corelib/kernel/qcore_unix_p.h
++++ b/src/corelib/kernel/qcore_unix_p.h
+@@ -178,7 +178,7 @@ inline void qt_ignore_sigpipe()
+ 
+ #if defined(Q_PROCESSOR_X86_32) && defined(__GLIBC__)
+ #  if !__GLIBC_PREREQ(2, 22)
+-int qt_open64(const char *pathname, int flags, mode_t);
++Q_CORE_EXPORT int qt_open64(const char *pathname, int flags, mode_t);
+ #    undef QT_OPEN
+ #    define QT_OPEN qt_open64
+ #  endif
+-- 
+2.16.3
diff --git a/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild
index c3da14471f41..beb350110d0f 100644
--- a/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="icu systemd"
diff --git a/dev-qt/qtcore/qtcore-5.11.2-r1.ebuild b/dev-qt/qtcore/qtcore-5.11.2-r1.ebuild
new file mode 100644
index 000000000000..e40ed0f6f4a8
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.11.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	!<dev-qt/qtcore-4.8.7-r4:4
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/qfloat16-tables
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-export-qt_open64.patch" # bug 669010
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+		XCURSOR	XFIXES XKB XRANDR XSYNC ZLIB
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 0f07057df8b9..2c5056404785 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,7 @@
 DIST qtdatavis3d-everywhere-src-5.11.1.tar.xz 5206688 BLAKE2B 2d5de648a9f80085f98902a8b086d5ce59c366c445b3ab80d313a537ae6b3d19924c886e4f2f3c0a219e874e4430c9327fde266e770b6ceb1f45e62f6a67aef4 SHA512 e88f2471fa39fd4f4c7900df5edadc568d000b537eb00f892fadc6cf1d7845987b9fd98adbea4c35c6469c9a9bfce087b26440a6419ca758451dbe3b669d19cd
+DIST qtdatavis3d-everywhere-src-5.11.2.tar.xz 5196328 BLAKE2B 5ef72dc6a91bf8fa34ef07e991d50350b2d315de43ba1b674c1d2ff6950426e5225b50c50ae69dba3f0a5d99587122b892a01e496c4820337e505aeca89f4c82 SHA512 ec5599d95e30a9d6b4fbed53087aed4607a4ad5f8322610ec785c970a0c65b215344ec842c6c21791f27ec015610fca47e6af2608f2682ac2e6d114b0f0b80a8
 DIST qtdatavis3d-opensource-src-5.9.6.tar.xz 5162724 BLAKE2B b6211a06b5484ddcb81fbe0f676fd4866e2e7b586ad3cd732f080c66079a2cd2b9d53eef25c536cb887686363df3ff39272272e4db621faf28c04e68ac011147 SHA512 fc209e704010e8be5fd6600f86eab5e6b45acde16472589da4945a70db320a13cf282db566182cc546191d245d258a3a227d1bdcdebbc7c7ed31ea00b929d495
 EBUILD qtdatavis3d-5.11.1.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
+EBUILD qtdatavis3d-5.11.2.ebuild 622 BLAKE2B 1ccf7676850642c1a0109c5f9c9e2f5ccbd634fe073d16e71c84fb80d5d5cb28b111f4a15257151cdf1c582869a0303f7744fe7c8d280a184762e627fe0edb77 SHA512 664223cdc4b21f5972b1e56e4a9d7d9e9d15a2ac537b86cfa9dd1102e52727cc14d1deb3378797b84ef2d9f0cd4cee663bd32915ccd6e825a3644cd036e77fff
 EBUILD qtdatavis3d-5.9.6.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.2.ebuild
new file mode 100644
index 000000000000..fb629edbad01
--- /dev/null
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="3D data visualization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# eliminate bogus dependency on qtwidgets
+	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
+
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 57eb54649404..e62d9b5173f1 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtdbus-5.11.1.ebuild 702 BLAKE2B de3e2236a5685d935eb20e0b4d1d9a19edaaaf874a2e953dbee4321793df6b79e947d1085067935271416e04a65c8f6ff124f2d81ef153917500ad4a3d6a9a18 SHA512 1616bdec772c779d73b4f4c428d519f8d45ac15ca8a76ce40d01782a326585434e98df62a43fe32b78a9b435be86df701520f6aebe4eaffed85135aec6cf6dec
+EBUILD qtdbus-5.11.1.ebuild 697 BLAKE2B 459b16c7b8148fc98f9b5f8cf0523ef2ab6d94f3eac6b961cf8a6ddebd5ba3a4c1aa37ffbba721b78041609c975ffbf2c6d89a50bdd55cb5ea1d6b6ed7992e62 SHA512 6600892cb8b1d36b12052e1b0b81bec2ae670a7c60714300cda853a6fb9b10224b76fbba8ef4648ba0ab403ae93d084b0508adb217245d0466e0e843330102bc
+EBUILD qtdbus-5.11.2.ebuild 699 BLAKE2B 0e6c2d9c831ffebbe0b4c441438252c847a1a3144473987864d252d4cb3d5167c924756a116f540c07d5656a1989304dbe6932869a2a1c89de803a1dc8a018d0 SHA512 61059da5b1d5be1b5188061fe45a8f5a35d4c95715287ae45fb513a9d159c5199239bfa5ae14e48135770cbb0253f7d94cc084a36a0e64296095683db692d606
 EBUILD qtdbus-5.9.6.ebuild 698 BLAKE2B e36bd662664c15e3f4349f39207655309e74e19cd32cc110dba194869df0e135bb6ada418d3efa5296f54643499b00e6771354f9c1f869b54a03311b384df306 SHA512 f27de442a099e481b51c55cb4cf2e8d6fd46c38229c5e929470e71d59eea47d7c6ad08d16c09646d4f779bf065cfb885a5ab418132b7be726f2e1a923891f3c9
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.11.1.ebuild b/dev-qt/qtdbus/qtdbus-5.11.1.ebuild
index cbd088e08fe4..9898de235fb9 100644
--- a/dev-qt/qtdbus/qtdbus-5.11.1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdbus/qtdbus-5.11.2.ebuild b/dev-qt/qtdbus/qtdbus-5.11.2.ebuild
new file mode 100644
index 000000000000..d5a040659786
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-5.11.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	>=sys-apps/dbus-1.4.20
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/dbus
+	src/tools/qdbusxml2cpp
+	src/tools/qdbuscpp2xml
+)
+
+QT5_GENTOO_CONFIG=(
+	:dbus
+	:dbus-linked:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:dbus
+	:dbus-linked
+)
+
+src_configure() {
+	local myconf=(
+		-dbus-linked
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 2f7113ab84e6..cbd46a4be89d 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,7 +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 qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053
+DIST qtdeclarative-everywhere-src-5.11.2.tar.xz 22217460 BLAKE2B 91a5619aeb09bc98dbe9c9ddc5e00b65d5cc9aac9f2d40f7e4a7001bbd2a1806a640e2a30d7de8698513b54b67d5bd4b551654ea119ecffa27cd91f3dba9327b SHA512 30d3ddfabceaf48666cb5ebc5c3a25318152daeed599b1a0a1b3c2feff353708de4760472babbe55a685582c0640a2789fa2fa239d151d17fe2b36950836f7ee
 DIST qtdeclarative-opensource-src-5.9.6.tar.xz 21417200 BLAKE2B 25d62058d85f845eb8a61ed949f7f3b2af972c0d3e97e4fe24b309fcc9570b5a00716bad012fca4cb8f65858b4aa7afb735181270be32e6a7bbe126d6a5931e4 SHA512 1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39
-EBUILD qtdeclarative-5.11.1.ebuild 1415 BLAKE2B e7d19fe7f65ae602510a2bdf1c3a76ceb0081caedf59f5a9f0bf9ed416c02ac4289c1bf079b84074ee377b6b8dbf8a18389c551710b55845692d4ec7978a08bc SHA512 b627a0c784670d6a4d660160b131b42ad7fb11874965535cd631836e0cc8bdba0ac46d9c790ec3d58e9bd6eb1af27c02d1ec7a2c7991bd8005cd75175befe603
+EBUILD qtdeclarative-5.11.1.ebuild 1410 BLAKE2B e8b8f4709e85a283717b67844724a143529774ef173af538952c162925dc44a5a1e3b7c563d4ebe5b4c3f70a5db5fec2a81767d7ca1fc7acf24fb102a0fa56c7 SHA512 658e20956e049df0fb0e0738cd025e5d0caadf5683f6070c7280e7ab0de37cb0ea6bbb62dd7e6395dc78fe5594d31e8cfacaa4dca68dd2b5486d8d4eb93498f8
+EBUILD qtdeclarative-5.11.2.ebuild 1412 BLAKE2B 45f629e505ef268c5e296edb07694e34598c4f17b935acdc1696a25f95493910760083b3378dec25ad0f3f20b15560a4d9f6c8c90ecba366ef333ea7a4552cc1 SHA512 4ab1b083ed4b9dbcced35d66f81a04792a1342ec8cfefeb61e46591293bf46774d3d3d5c11901a2cd9dfca0a862a761385ed80cf42f84df67619e2bc8c5f6c4a
 EBUILD qtdeclarative-5.9.6.ebuild 1391 BLAKE2B 19044927b073a5f22b05ab071d1c33299503a16532884987a1b7f1ebe42de240cb13d9dde9022e689bbc76a16c7e5797ec4a9f7458f0020fe3235531b4a81bbc SHA512 4af1771d4bc4886fa2361eb65be5711f7133d9e5a1e4f9b9394690f3ddd9b0945042d93b17a08531f64297afe154535c139264300f173d1c75bde8b0c4a5598b
 MISC metadata.xml 811 BLAKE2B aca4ded12a2034fb5964d6c38806edeb1b2b984c182fe6ae5cf26f28db3ffa8cc942e8354971e46d7bd6f8eef600fe52ef3e0cdb5cb2aef7c7fe616fbc81d712 SHA512 0e278f92094bfc3d7a295cf559178ff093f5ff6776f03037cc9cb4e8574c9298c76f6210f84e611c8cf1c6c063cfd78f8d0c478f30798fc775d7bedcc409c711
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild
index 3da293ee8c4e..e9a3916454fe 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2 +jit localstorage +widgets xml"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild
new file mode 100644
index 000000000000..325ae743da16
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE="gles2 +jit localstorage +widgets xml"
+
+# qtgui[gles2=] is needed because of bug 504322
+COMMON_DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qttest-${PV}
+	localstorage? ( ~dev-qt/qtsql-${PV} )
+	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
+	xml? (
+		~dev-qt/qtnetwork-${PV}
+		~dev-qt/qtxmlpatterns-${PV}
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-qt/qtquickcontrols-5.7:5
+"
+
+src_prepare() {
+	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
+
+	qt_use_disable_mod localstorage sql \
+		src/imports/imports.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
+		tools/tools.pro \
+		tools/qmlscene/qmlscene.pro \
+		tools/qml/qml.pro
+
+	qt_use_disable_mod xml xmlpatterns \
+		src/imports/imports.pro \
+		tests/auto/quick/quick.pro \
+		tests/auto/quick/examples/examples.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		-qml-debug
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 2da6d569d2a7..b1637868f1d9 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD qtdiag-5.11.1.ebuild 723 BLAKE2B 4f1e3a9aac15172f8f3c3ed8ac798df59dc4f630f617e7a45e4cd47f9bbdb92f4f0c44f7952fb1a19ddf2dd0a901d29bd4e554499c781eac7aa3fa41747ae0c6 SHA512 d165e299faf51c7cd1ed647c6612e7a28c26ba3885fbd51d43d36490df86e9cc0cec15d506aaad844ea875992bb24935c04f9df88e997665014b868730a3ad22
+EBUILD qtdiag-5.11.2.ebuild 720 BLAKE2B 2d2536796532af24f6cbf3b675a46b250b54625a860741fbd6ebfa1e8420ccdcebb303347b127c52513a6f3837492c513b39e26b23c88041ba952300bac490fa SHA512 441971de1175d6b85b2e366896ccb96784704f3484cd1e3ecea519b28d466cc9cca886174604860b405f7ff3d3548c982e46d1f9b544e6c0001078916fcc8801
 EBUILD qtdiag-5.9.6.ebuild 723 BLAKE2B 4f1e3a9aac15172f8f3c3ed8ac798df59dc4f630f617e7a45e4cd47f9bbdb92f4f0c44f7952fb1a19ddf2dd0a901d29bd4e554499c781eac7aa3fa41747ae0c6 SHA512 d165e299faf51c7cd1ed647c6612e7a28c26ba3885fbd51d43d36490df86e9cc0cec15d506aaad844ea875992bb24935c04f9df88e997665014b868730a3ad22
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.11.2.ebuild b/dev-qt/qtdiag/qtdiag-5.11.2.ebuild
new file mode 100644
index 000000000000..638fe54cee16
--- /dev/null
+++ b/dev-qt/qtdiag/qtdiag-5.11.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="+network +widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtdiag
+)
+
+src_prepare() {
+	qt_use_disable_mod network network \
+		src/qtdiag/qtdiag.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/qtdiag/qtdiag.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index cad2de3e6373..2bf5eed36976 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,7 @@
 DIST qtgraphicaleffects-everywhere-src-5.11.1.tar.xz 14272760 BLAKE2B 079c4c22d222c8aae3e16a9b818ed792652692a6dce4c56afe404ba53a777e6d32afca00b2b03fee84010714d4a94dfa3ff257ab2fbb649fde4ba4a605cd72b0 SHA512 0e79eac7debfd8904063d6b03938f62ed72194b5de164e0700d27bd2aac15e390cbdd337fa9afb62435862972e488fb01ae54f08d2a492719baa21a410272297
+DIST qtgraphicaleffects-everywhere-src-5.11.2.tar.xz 14262460 BLAKE2B a46683c6e755600f80247ea29eed17257e19f5f51e41da1ebbb1ae237d798a678b301f64cc0da74d34d9ffec7ea7efcfecf27ad3c50d3c09a537c2fde1d3314b SHA512 a76bc46e6442fb66d0f99056c527593ff6df1336f24644fc6d265f21c5be3ff9329cdebb8b677b8b29e3a49fc98b90c9a5838a991ae998b81cda21028826071f
 DIST qtgraphicaleffects-opensource-src-5.9.6.tar.xz 14226968 BLAKE2B 1200c65dff266a27178bc9f30ba7717fbdf8d7d29bd25ac7edc2c45f62bfebf5748205933266edc0b3733b382f5596f513298786fb9e8e1f36a8de67ebfb946e SHA512 a319dd594bd9048242512cefddf8db0474677d48a03c7616633d7e3b7dd6637ff2c7cce206d25d3938a6b3f3cc7ffc037630e5923caea0bfa7612e99522e36ea
-EBUILD qtgraphicaleffects-5.11.1.ebuild 451 BLAKE2B b46592374ae4e7fd7c3bb609ec72b9718f62fa502148fb48a83fccf1e702d84c36a41fae24ed7365928545afd8431f28830116ee3a9557bb08321b109153a32b SHA512 ac77df06caaceac667ce524e3d22fe6a5831cf2d0cc9c2d59105e3b67b4983bbc426a6745eb7253effedf5472f1b7a4271679936608327fdccfe0ada5b4aff97
+EBUILD qtgraphicaleffects-5.11.1.ebuild 446 BLAKE2B 181f3d369fa84c369fa8b8a254397810e7cdb4172a091c025255b88e43da04971f5086f81a50986659b6efee2ecbde1124c5d9070811f24f4a1f7b026e5081a2 SHA512 72c5453e96fe6c74b3d7ec53eb3ca9a8549519ef08279fff4f865fb7fcd2cf620a07cf7538e750c16584ee4951c0d8ba295da0c3861909ab1f1b0cf73af350f0
+EBUILD qtgraphicaleffects-5.11.2.ebuild 448 BLAKE2B d73f17137a3f3bfe9a659397b612fdbeb03649758349dfd62c24c0a8d81733912ab5772aaee5aa893fb69bb4974f3ca89b8142411bac715c2f1f0168f88b0b77 SHA512 993675a828f4db55cf7a8ba30e983fcac4962b63ba1d115fd99927702b467cdc2c93eb5840db72d0b65bb5eb975a2e2702abf9be173628afad550e07f99a884f
 EBUILD qtgraphicaleffects-5.9.6.ebuild 454 BLAKE2B 8e69c916a4822f6a3becaed40ee7edc4921d0f8a1ec3be1554970aed72c82ee02e0d10cb002380cbf9b7df535fbca6cd14c1ae23ec2fb18b30371e304184486e SHA512 8e2482b22f22715f03d944afe0d2e75e524499afb3323e1a1e049db2dc64d66fb3f36966dc5fbc0fd94d4e2954a17d89a7883167a15c7efb8fe25656d6d622fe
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild
index 51a225a5a40d..56488b580edf 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.2.ebuild
new file mode 100644
index 000000000000..66e01da425ab
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 8808dcf702da..652c90089d33 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtgui-5.11.1.ebuild 3582 BLAKE2B afd6e3826fd0174918df37a35cc2b302c916e4604d73d2d393bfa22af246f2db6aab41ecf93a5914bac689e28c9030cd964a7f472a5cdcd8596a9f1729f26cc9 SHA512 a2738fa9656b28c7b7de86ef0a08d29746f3fd614b3244e6d19b45d4c9bf5082d8328d19f714859fc050910a575fc31c5dadf522bf2c509f71e652cb394cff79
+EBUILD qtgui-5.11.1.ebuild 3577 BLAKE2B 4debbaadcec2d65932a9de0b88853686916498788edf2f9815b6f7056a6343d185fd4d52f391dddacd85b9783f6e0702493a2cec63d765da72bb738256cb21b9 SHA512 44e0251524ff3e8f50b9a85ba1272f304ae54b90582011faac76d006f59107f85bfce0a4aabeb8cbd6a76f058bdf1581399e38a351de13c6fde7a14cf916bd93
+EBUILD qtgui-5.11.2.ebuild 3579 BLAKE2B 8a184cab738d654a19c9a0b05133bd1682fb7eb5ed7b71fce057d3268d5fb9efa9f3f523213d6f7092b62c5ba5aa4315848a5d2015d2343a5e610d52c32f224f SHA512 60523f34083f85a9f6cc9f1e7544f8c755c71e622c330e071ef110bf00086235c39c38ef7b63f68b7feb18d326269683372df46507f3b64f5fae6bed3beb7edf
 EBUILD qtgui-5.9.6.ebuild 3560 BLAKE2B 8f85331e6c6ae16810f546a993a2b19ac94f358ff84a6610f49eef9184b42329b2c1b096f857bf958ff12c122d72baddfeb00e762a63d4219ecd0e4d601b054a SHA512 ff2e051a60f35b729827e57fbe5ff0d40449536cb3dd2f79658435b747bbc72fa356c4b42e44a9b76b4725483857af90037c0773b8a05d1854aa32bc7137a217
 MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6
diff --git a/dev-qt/qtgui/qtgui-5.11.1.ebuild b/dev-qt/qtgui/qtgui-5.11.1.ebuild
index 3400e890f5bb..8efc3a369b4a 100644
--- a/dev-qt/qtgui/qtgui-5.11.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # TODO: linuxfb
diff --git a/dev-qt/qtgui/qtgui-5.11.2.ebuild b/dev-qt/qtgui/qtgui-5.11.2.ebuild
new file mode 100644
index 000000000000..8495f8faffad
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.11.2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+	jpeg +libinput +png tslib tuio +udev vnc +xcb"
+REQUIRED_USE="
+	|| ( eglfs xcb )
+	accessibility? ( dbus xcb )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	xcb? ( gles2? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.6.0:=
+	>=sys-libs/zlib-1.2.5
+	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	eglfs? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+	)
+	evdev? ( sys-libs/mtdev )
+	gles2? ( media-libs/mesa[gles2] )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		x11-libs/libxkbcommon
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( x11-libs/tslib )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libXi-1.7.5
+		>=x11-libs/libxcb-1.10:=[xkb]
+		>=x11-libs/libxkbcommon-0.4.1[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/qvkgen
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl
+	eglfs
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev
+	evdev:mtdev:
+	:fontconfig
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2::OPENGL_ES
+	gles2:opengles2:OPENGL_ES_2
+	!:no-gui:
+	:system-harfbuzz:HARFBUZZ
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon-evdev:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib
+	udev:libudev:
+	xcb:xcb:
+	xcb:xcb-glx:
+	xcb:xcb-plugin:
+	xcb:xcb-render:
+	xcb:xcb-sm:
+	xcb:xcb-xlib:
+	xcb:xinput2:
+	xcb::XKB
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+src_prepare() {
+	# egl_x11 is activated when both egl and xcb are enabled
+	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(usex eglfs '-gbm -kms' '')
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		-gui
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		$(qt_use libinput xkbcommon-evdev)
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon-x11 system)
+		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index cc1a61d7b915..20181b56dd6c 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qthelp-5.11.1.ebuild 659 BLAKE2B dcb5041a1f0b66ab276795b67c5d3caa9a7561359b6da189eee47250a977a4ce6a1c4b1d2ae52440feead78ff7ed5ce33b57ff35de7cf30e36baf2ca147508ac SHA512 fda8358830dabe3d7141b5be5917e459a8d63bb7d99490dd87c01f7a98224cccfa01cca3f04272d2ff98b5960d3304c6833783a929cf0f60dab199f89c2b09a7
+EBUILD qthelp-5.11.1.ebuild 654 BLAKE2B 496b878927c0a937697f28032d1712245da47e3f5419fded75c922210b637fcbed68dc4c38a1ab9fef0b754218b13ba01d57a36063bcb4e027d6f33b5f6d8ab2 SHA512 d843c0ec1707a613217a0b2127b279c6df7d14cf699e91e54e59dd805ccaba875e37df5d9ae6684520f5cb513eb7119b5c0d722da1334828cded02544040647b
+EBUILD qthelp-5.11.2.ebuild 656 BLAKE2B a4a0f91c8abf515a84c1898167a66fe7b99da75545244cbbee727860b893d3c2335dc5e3c51f5fabfcef354bddd8ee7c1fc4778533d2fbf28276b3a70f2ec9e1 SHA512 e99c4a76a774d8c487359a5f0946eea232c73609cd88620b45ea98fca7948b592f745c8d8ef73cea294ddac0c3f1ed8459e94e2c6fdd0a9788993434f34d0869
 EBUILD qthelp-5.9.6.ebuild 655 BLAKE2B 6c4f16a9090887fa0be0ff0db0f6fe75864368167340b7e4b995f931293b4ebb3334b20b7d8d9628e3aaa8cda3916b6d1910a9302aa1967393e3919cfe7ee82d SHA512 664c1eb25153d8d52b75675846e195cded8775776ddf4554e6587f97352d99bd354cdd7c4347d07eea133ba237db68fd80dbc9314c62ead80149927be8278b9d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.11.1.ebuild b/dev-qt/qthelp/qthelp-5.11.1.ebuild
index cd1204f4d60e..beff0018309c 100644
--- a/dev-qt/qthelp/qthelp-5.11.1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qthelp/qthelp-5.11.2.ebuild b/dev-qt/qthelp/qthelp-5.11.2.ebuild
new file mode 100644
index 000000000000..f010bb274dfa
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.11.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpconverter
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index f6369cf40f27..a6d0494c5291 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,7 @@
 DIST qtimageformats-everywhere-src-5.11.1.tar.xz 2191408 BLAKE2B 7a01c6c607cdb02471c289b71151d8fcba2047778c6d499a54dd66d125a7dac29b944b2b722aa8bf8667f453e92edba20adf10cfe6c580af7ac42c41aebd3a8c SHA512 527bd6d324904d1c7c6d931fe96bfa43575a904d2b94cbda3129c4a883fb79b9bdf6f009b41d2747e8aec2c410a2b23bfa0e94fc4eea698d54a0878bc934514d
+DIST qtimageformats-everywhere-src-5.11.2.tar.xz 2183956 BLAKE2B 02686bc92e179de591c4424abaaa2152018182ff13aa4523034e2eab6f704bd3168183b99c915e14e4cc2d1abc42f1d3f6b7fd426ab357fe91d9085a6f563fcf SHA512 9de3fa9ff8b985a89806ad33ed276454429aada01119d8f36b7d571f01d23c42afd588353fe62d80cf6b9b83b6c91d53ccbf61ed1ec4d66ddc0ce4f5719bdca1
 DIST qtimageformats-opensource-src-5.9.6.tar.xz 2107828 BLAKE2B bbea8e01d7c7e4510c35a6322f72c9b531daa844745e5ea007bdc516f60bf72de48a5aa18e7209b6b25da189362b4db8be5fa3d4e8addc90f407a3879b7cc69d SHA512 c6470c1486ae9b0bc3c846c1de6ffa294810aca20ca90d9d5f40a257a7e339ff58aeafd5f76324e6939d71889044eebc48b8b001f2027dbabd15f7eeb8d8bdf8
-EBUILD qtimageformats-5.11.1.ebuild 610 BLAKE2B 849d8dd2a75b1c8c729f4bc020ed3aa1acc42bd64544ddab790b8efcf438fbe6d617a53c8c83b5cf22a3101a625819f41467df7a1fdb7555febc156a092dd6ad SHA512 7959070fdc4a50c1d64a4be6bac9e4a6e5c3b37fe70b1babe39c6d1ddeee6b02866969937f13948ed9b3bdea208a74f5a5c2cacc3249bb0d12a2dc00128dea29
+EBUILD qtimageformats-5.11.1.ebuild 605 BLAKE2B ab9b770c6a38630aa450bb016886fd4f61c6a0b1a043f97afba9bbc341d7a8b12c631fce61117af8c801de8b9fa5d2a4ff5ef659bc47bafd78e199bf024042a7 SHA512 baf928651a702b5cf204ddd537120096bd033590fee768b1826908f0da5eb9b7d107be760c708ef9549eb27797eae52140425d5f2f05ff3e6dca4410d4a0361d
+EBUILD qtimageformats-5.11.2.ebuild 607 BLAKE2B 0f80de2b7fdc1a3fb490527b757c3bae55d7dd93eee05d0e5875610367d5464fffc12c07dd1a6731dca0d6ad5f1da1127cac36ecbbea118f0bdff24196d02a41 SHA512 0765f575f36491d783607a7ab44a4692c645aa9e85e2864a5418eda74d16a74ca9ce39fa7df4e6b0977e3f024c815979e7edb15e7b1612bc90095b11e07a2962
 EBUILD qtimageformats-5.9.6.ebuild 607 BLAKE2B 46d3b734f62887f3adf36b6fce4f4422b0ad54ef2c134c7a75f3c751a0c47a776a3b967c0c28aa7c3cba8281b17bf2da38fd33c7acd53649905f24dc39b77b7c SHA512 b359b141e85ec32038ba234aa536feb50fff3e39b0738b9021eea2c8b2f7815314b48d89deaa39108feff02c088f7436bf9fc29e71369a5807c59b13560521bc
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
index e4017c170eab..b0b7684b9fab 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE="jpeg2k mng"
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.2.ebuild
new file mode 100644
index 000000000000..89acfc3bcfa8
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.11.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="jpeg2k mng"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	media-libs/libwebp:=
+	media-libs/tiff:0
+	jpeg2k? ( media-libs/jasper:= )
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	qt_use_compile_test jpeg2k jasper
+	qt_use_compile_test mng libmng
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index d7df787583aa..1cc7459f4c9d 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,5 +1,7 @@
 DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
+DIST qtlocation-everywhere-src-5.11.2.tar.xz 5584420 BLAKE2B e7b0cd716edab33d19f1b9ef519a35ea8094ccc85ce015eb7f3e26c61f62bcc7ff9419dd79da5d8ebec9f3b0630cea7c125f237ed39b7ed1917a45408cf7dc51 SHA512 84a52aedac59f1bc4372538dc0810c742f87f04b2ee599e7ed3f8f0cfe0e13d652e80d3cf7de95395bbe1285a60cc15791760e17f0975cf8399527cdadbd7c1b
 DIST qtlocation-opensource-src-5.9.6.tar.xz 5405652 BLAKE2B 001bb5ea4d73ac67a1e1a70e3218c2cd0554b02f84001da88e3109531b8c0f51264a51276edae5c899aa68b5d1ba1bf6d55ef9e3d409b3676f60657cc8deb86c SHA512 63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a
-EBUILD qtlocation-5.11.1.ebuild 924 BLAKE2B 29c9eab14fd35bd299e880fb12d06df88f44c9ffea761f04f92d119224ea5554620cd044c66a9b0ef0f51a9b26162788fd4d48873353680ccbda8a20e17223a0 SHA512 df70b1dd13f3953790803cb768e84a53dfb05d988d4ce135c2c5828b1736f9f9b2a0df710eb2141396e4cb3633025e938ac99d46e1cdb92b3ae82fb3d096adcb
+EBUILD qtlocation-5.11.1.ebuild 919 BLAKE2B 2cac5157ba1cd250468e115409174f7698e677b3155be082389d391b823fde5ca828d8eb92efe1e5337a91397068fdb427035247042ce6cc8cb5734583d34440 SHA512 088d1ddc83eadfc286b904b2e0177dfb1cf119bcfce3044de97a781c6639baa427c154caffaf11d2d44d7246b029b8fb1c4af5d8a9dda4fdeeffb0f4a702ee7a
+EBUILD qtlocation-5.11.2.ebuild 921 BLAKE2B f7c7aafa6a01234b6845e70cfb512e971deaf6c58ac278eb7eecd3bf348d0e44d6ba968848dcf936e44370ac1b102b0bf6b672f8a3a63f69105a366c92104fa2 SHA512 cc7316283c4fdf3e05d0069bf30d9436eb76bce8c8c21416b87760d7cbfe93bed07dfa043f4b980fe7cd2c187741530384585152f3c9649903d67b5cc3e4b9d2
 EBUILD qtlocation-5.9.6.ebuild 922 BLAKE2B cbcea33ab0f866d580839df171c7d85cb75aeeb6c9cfdd27d8983520e38d1757bbecc899123058b18bca2a444562eee62a48d8b111be6703aad90b23ab6c4624 SHA512 26a0f3b6f88c3aebcbfaabc1da94771726c8a3181920a4f78f48770aac9ff119137099ffdc480276beeaacfeb11b375e85112482e0584615cf5bdbb6c92abd88
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.11.1.ebuild b/dev-qt/qtlocation/qtlocation-5.11.1.ebuild
index f791b5b325e3..c16615160746 100644
--- a/dev-qt/qtlocation/qtlocation-5.11.1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="The Location module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtlocation/qtlocation-5.11.2.ebuild b/dev-qt/qtlocation/qtlocation-5.11.2.ebuild
new file mode 100644
index 000000000000..b6f3af24dda4
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-5.11.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="The Location module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtpositioning-${PV}
+	~dev-qt/qtsql-${PV}
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	~dev-qt/qtconcurrent-${PV}
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/3rdparty/mapbox-gl-native
+	src/location
+	src/imports/location
+	src/plugins/geoservices
+)
+
+src_configure() {
+	# src/plugins/geoservices requires files that are only generated when
+	# qmake is run in the root directory. Bug 633776.
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	qt5_qmake "${QT_BUILD_DIR}"
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 3abdb2e4e340..a7b6c9f4db36 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,7 @@
 DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c
+DIST qtmultimedia-everywhere-src-5.11.2.tar.xz 3701832 BLAKE2B 5a2cff609a46d8962de5d32dd3e63c235d7230d414410435385b51ef9c74af8efd617910af6c760ff042275ba5ba8f44761df0a319067ec355f5a02f56545de2 SHA512 f83c57ad35b713118d1d0ba27f78687aefa8f1ccd850be9b78a9c3477e0e9bb5f9a66bf39c2505f81987f0ca7d07dbc3f471d5efb4b9e4c21e41b308fc83040f
 DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f81c9a99e75748dd68112ae4fd534e038d73d1f8fa33b76119824ade231e7b1c283ff109ee2473774d08c67bffa04383e7328437539aadbf SHA512 2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207
-EBUILD qtmultimedia-5.11.1.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
+EBUILD qtmultimedia-5.11.1.ebuild 1445 BLAKE2B 7fe2f8608d8a064624c708c2d7b4cc59f9b1686443aebac7e949d648247ba5371be73d68c62cddb1329bd76ca690159dd3afd7e59870c51fa251df4cb85b2f04 SHA512 484a1214e69cdd519553eb90a6bcf1d0b520b97db01eaa7af8c7a535804f5e70c26368c8a97dba31848e62fd7e28b4ebc4dee3ededaf390cc5cb996b0e25cf86
+EBUILD qtmultimedia-5.11.2.ebuild 1447 BLAKE2B c33d9c5e9bb66baaaee43bebd325bb3c2bcacc1c809e8ce49584f284fee2f5a48a1c5ef4f0073fc4824fffdc8d26f38b1439d3c50c231343db4fff59298d65db SHA512 9aecd484432af6fdc650c3c82e1ca58e87555e6a7b4591eac54d207141c258dc65873ae0156fe0d02d9f45cfa9cc182fb8d44fe10254dadc27a59238a34720f2
 EBUILD qtmultimedia-5.9.6.ebuild 1453 BLAKE2B 27dd7746bfb2175d1836a4b95ee4b5f557116414f2d9cf30cfbe72bd155f5e15f0d6277cff3829bd780c221a225acec999267e2037896565d729810da8ad47a7 SHA512 945f56093cba63af3a044c642f1c80e293b170d895ec6a1ef2dec5937b8461b44b42a1862732337ad2eb082366e7478b09985dd7ab44729668133b33d2b0acc4
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
index 04cc34da1d15..86ff0caa1ee7 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.2.ebuild
new file mode 100644
index 000000000000..acfab89749c7
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		~dev-qt/qtopengl-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	qt_use_disable_mod qml quick \
+		src/src.pro \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 3fe16f4ade71..07d0b0b0205c 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtnetwork-5.11.1.ebuild 1234 BLAKE2B e8fb412c0ac65ed5863cec2645321592af1dbede3000b50b91a635101fb9db0e79af243423dc7304f2fbf33c1a5cb3faacef7be22cc8df3dd88b7d6b401473f6 SHA512 f8b7076c2d22fa2350ae6d96bd6e643f725088897d1497f36b5576eb4d3abc9c4fc9e26300d28b4b6d7e74e7c27ce80bd6d50b4c167a65a6e5f8a32a676e820d
+EBUILD qtnetwork-5.11.1.ebuild 1229 BLAKE2B 8710186e3865824c3983d5eb1125ed57463a90bef975c64af6951a779d3a2aab4573a3242bde2d339c5f19fe3512333e3ced1fc07ce30a7e3131c9960831f624 SHA512 2a60819284f6645f895666de22b76dd5299efac8b92fa1f4d9553030b93c938f82d37ec9e5a943d124125f1265108133d1aedf77c7315f2c80b08d4c3e8056b1
+EBUILD qtnetwork-5.11.2.ebuild 1231 BLAKE2B e9ca316106941bd7c530220118190cc86970d6c619586df2d6fbd4e98d047c0276635ad860b88b3705c21c94b8fea3e19ed4bdff54c43d34abdc438ce1e3be91 SHA512 c67fc0bbba64519cb71232be5cddb1b5bb1a20520a381f6172aaaa3773d46f0e196e025446116a3a8cac70f6b17cc151d52e22cbad792c9c7952aaf1a687d9fe
 EBUILD qtnetwork-5.9.6.ebuild 1294 BLAKE2B f915e4805388cfa15d08d01b8015d0ba839d66978679c2f43d36bddbaac8bad8dd80f30ae8d9f5649d608fa83fc2ae116537f5be0ef2def920941041dcd66f0e SHA512 6a10aac3ce86fd5ba78378e1b2c190b68aaad9842266666ceace907ebf7260080215498baaa15ff6b7a4a854884f2c584d2592b9734a039bff4a8de5b049696a
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
index b88634d343fd..28b505bc74ba 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="bindist connman libproxy networkmanager +ssl"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild
new file mode 100644
index 000000000000..d462c11f736f
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Network abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="bindist connman libproxy networkmanager +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	>=sys-libs/zlib-1.2.5
+	connman? ( ~dev-qt/qtdbus-${PV} )
+	libproxy? ( net-libs/libproxy )
+	networkmanager? ( ~dev-qt/qtdbus-${PV} )
+	ssl? ( dev-libs/openssl:0=[bindist=] )
+"
+RDEPEND="${DEPEND}
+	connman? ( net-misc/connman )
+	networkmanager? ( net-misc/networkmanager )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/network
+	src/plugins/bearer/generic
+)
+
+QT5_GENTOO_CONFIG=(
+	libproxy
+	ssl::SSL
+	ssl::OPENSSL
+	ssl:openssl-linked:LINKED_OPENSSL
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:network
+)
+
+pkg_setup() {
+	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
+	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
+}
+
+src_configure() {
+	local myconf=(
+		$(use connman || use networkmanager && echo -dbus-linked)
+		$(qt_use libproxy)
+		$(usex ssl -openssl-linked '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index be05f2c93ffd..fc6a2c953c7e 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,7 @@
 DIST qtnetworkauth-everywhere-src-5.11.1.tar.xz 140468 BLAKE2B a64cac71f89ae44b0835b8c7d0a492c24ebd51cfbbb5a5074e33292d2e2d0260658e6086a744e21e2bfb993bb1b34b13e093fdec7a21032725b1879228282935 SHA512 1f2b55870d61027f4af00d54507baf4953f162ca63a4e571a9c6f4095daa0235c2a93f67515cac627ff0a6655d94b01a3b3ba759bbbf75f9b108efbf12777c0d
+DIST qtnetworkauth-everywhere-src-5.11.2.tar.xz 135160 BLAKE2B 70f398be8f3e1f187511ca5562321f3f6ba24b61a37405eccb80008be58e749f256bc4940e1bd3d0bdafabca5e20de2bd360518b6d358219cccdd722c58ad7dc SHA512 f723e8af1ab511f090d1830bf42899ec51b4a027a91c58c46179c16c9e635a3c3f51c13faf943936074ad768407824e57161e28d872868daaed6254c15fc852d
 DIST qtnetworkauth-opensource-src-5.9.6.tar.xz 112188 BLAKE2B e8e61071da9e619d250ea09b01e12d8dfa73ae364e2cc3a33327c027916ce4bd807987f09d58c6962ed106eb148fed639788e06a74ff4e855db3f7e2ce98903e SHA512 8badcf8170780fcd18ec38980a7571e911f13efea101852f6c78e99031668cfa481df2a2fe07f46e2e78906ff6b663c27461326e2dad981e03d42cf4f78081c3
 EBUILD qtnetworkauth-5.11.1.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
+EBUILD qtnetworkauth-5.11.2.ebuild 373 BLAKE2B 645d1d2ad1fa800ff3c5411de1bb4a8ead1032d19c20d7ffabbf1fc6a9a5219d721938b195170ac646f8b613388239f5c455122a159029268327531d240c343d SHA512 92e3f6bbaa0bfb4965bfda9532cc251f284f8883965152487460e960309ad450aa5ec3a092af0701fdd0987ba45fd7a86071bc7d2a96d84553780eb346f3b15a
 EBUILD qtnetworkauth-5.9.6.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.11.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.2.ebuild
new file mode 100644
index 000000000000..d4809b78213f
--- /dev/null
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Network authorization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 09554ae4031d..a21feefbe5ac 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtopengl-5.11.1.ebuild 655 BLAKE2B 2e90f74b04e8c9acdf961d05e9bf63257561590c52d393a5545755260f048f1309a8b54bba6232f10ec7d46b0e34ecf64d871225e706b9b016addab13ba89c30 SHA512 f72e009be1ba58455bb633ad684cd6ab53f8338928e94b3401d0accddedf245b57cd464caaee8e14bf08806b5dd4fe72848d23e6ae3ba8c2a278627cc783851a
+EBUILD qtopengl-5.11.1.ebuild 650 BLAKE2B a2c95df8c2e97ebce8092083901ca3e962c0f06012b7593e9fb36234e12fd257f916c461029d747a3d9f5c3833d7d35e17dbe9d334dddfbc37583f10f13bcad4 SHA512 27c68a7c0d84921e5fc0c460c3a36409751a84449e1c47a702b813a879536625a75015091319b4a61c8fd2b59a42365cf0f0f33a3d3a0a6293bfb407a0837d5c
+EBUILD qtopengl-5.11.2.ebuild 652 BLAKE2B 03aafd597eb70c2bac25a7a94af3e68ca9a1ce6f7ddd48502f51606cac3f93573cbf70363de05dc2ace19a1210ac3d6a5e1dd3d69a614bce05c09971acd3a991 SHA512 274faed5132683be0bf18e03d0fb2583dc5bba6f3eefdc14f2ab84dcb8eaf6875321aee9ef5db579143d7bdfd3be1dcdab9d19d788f0b685b146c06556a079ee
 EBUILD qtopengl-5.9.6.ebuild 651 BLAKE2B b79d6c64085dd047dccf34b7c53252c4f57e08550c2a8af368a4b12ded037c9e7f4fdce2d2e171332a356817f12b2e3abf4983cd000b1af4d7defe4788cf7ae0 SHA512 96e941603ea047a3dc4b376c17f98f7aeb3a7e305af8144812c9034a2e6e4ff7862884703f5ea64471acbe17a5b397af4fd1d136a07d592b86d87cda4cd6ab2b
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtopengl/qtopengl-5.11.1.ebuild b/dev-qt/qtopengl/qtopengl-5.11.1.ebuild
index 0675a3aa7efe..eb6fbccd6680 100644
--- a/dev-qt/qtopengl/qtopengl-5.11.1.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2"
diff --git a/dev-qt/qtopengl/qtopengl-5.11.2.ebuild b/dev-qt/qtopengl/qtopengl-5.11.2.ebuild
new file mode 100644
index 000000000000..b6ad72a02f2d
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-5.11.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="gles2"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/opengl
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 1a84399cf734..42cf64402822 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qtpaths-5.11.1.ebuild 416 BLAKE2B 0de2f95c087d7265cdd9f21e5b57cdecacd05ecd5ff1c4fae91c72ca73bf3fd3de7b99c8f6e1ee3689250c22f0fff25b42b4be689ced766dc2e4f2815df7bf64 SHA512 fe8765810ce058ca73f6443beef771f0033d1e01ceef319809bc9747ce264d5b4131944aa46d9a5a31d5bfddb419259546af64b5a092a04e58aa44e0903a7b95
+EBUILD qtpaths-5.11.1.ebuild 411 BLAKE2B 5b4be6527a0d32502c0e420f6d999bcf03ebd40e11640596431734dabf548f89daf41033c1a5cf2d98b29023ba072f4a29275b812c54160bf94c6ca23cd06853 SHA512 740b1fe63a345585b5962e9cde642c0715aa193592888d227a71f26ce2c48616e6b3ca5eff4926cc6b9178fbb9cc817881faa4afe4cdb11a8f6b96850f96b33d
+EBUILD qtpaths-5.11.2.ebuild 413 BLAKE2B 4227ccfb463dcdedec3569d32634a7a7c0d49d25081e5fa2aa12537c1e9d624a3031be39705ca985af928457629db68f62c2ea57d657758037fc97f97aa926fa SHA512 1c98c705b9ea43af3b23023ba6534e38a96df5f6767c1a74dcaa745018af445a5313b4403ee7fad75989fe416c4fa40110e1c19b10972249db87547d578527c2
 EBUILD qtpaths-5.9.6.ebuild 412 BLAKE2B 0dbb0356a7aa2257824ebba6793a8515492d8b97fe7abf58d65a12dd1d28506077dc18a8504a3ce50c8ad6fe5fccd56b9b26edd98217d0cbedca427edf45f4b4 SHA512 cdb226d90c27627f09e4b6a8761c332f0071633c5821e092bf06da8bd8aa004954853a6ade19f6d38bbc6a28b37f6f49d7b5706c2ed4e19feca6972ad38dcff0
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.11.1.ebuild b/dev-qt/qtpaths/qtpaths-5.11.1.ebuild
index 93e4542c31b2..a215db7eca1d 100644
--- a/dev-qt/qtpaths/qtpaths-5.11.1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtpaths/qtpaths-5.11.2.ebuild b/dev-qt/qtpaths/qtpaths-5.11.2.ebuild
new file mode 100644
index 000000000000..3e622fbb156e
--- /dev/null
+++ b/dev-qt/qtpaths/qtpaths-5.11.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Command line client to QStandardPaths"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtpaths
+)
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index faa0508fb17b..02c23e5d180e 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD qtplugininfo-5.11.1.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
+EBUILD qtplugininfo-5.11.2.ebuild 370 BLAKE2B 5f8a61393ef67a56114aacd5d7d9145338487fb83243e12a21856313115b5a4071610030aaa1b8b6a7f92bc6ef32b957526a534bc958faab7aa810a7bd08552b SHA512 083a4c81950dcd4f84c2655c28fe5530adc6ca819f481469f312941e42f2630dc130bbcb104051f233965053add23dcbc1aad4cc12a74af9d11df3d60dda60d5
 EBUILD qtplugininfo-5.9.6.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.11.2.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.11.2.ebuild
new file mode 100644
index 000000000000..5143d73a0c37
--- /dev/null
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.11.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 plugin metadata dumper"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtplugininfo
+)
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index c388eba364f2..b89640adddfc 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,7 @@
 DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
+DIST qtlocation-everywhere-src-5.11.2.tar.xz 5584420 BLAKE2B e7b0cd716edab33d19f1b9ef519a35ea8094ccc85ce015eb7f3e26c61f62bcc7ff9419dd79da5d8ebec9f3b0630cea7c125f237ed39b7ed1917a45408cf7dc51 SHA512 84a52aedac59f1bc4372538dc0810c742f87f04b2ee599e7ed3f8f0cfe0e13d652e80d3cf7de95395bbe1285a60cc15791760e17f0975cf8399527cdadbd7c1b
 DIST qtlocation-opensource-src-5.9.6.tar.xz 5405652 BLAKE2B 001bb5ea4d73ac67a1e1a70e3218c2cd0554b02f84001da88e3109531b8c0f51264a51276edae5c899aa68b5d1ba1bf6d55ef9e3d409b3676f60657cc8deb86c SHA512 63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a
-EBUILD qtpositioning-5.11.1.ebuild 843 BLAKE2B ad120bb0a2cd8a0655d3b5e271037d7a9e5f4e8bd9e99ebb161bcb1c24e1133c87582b0b0e928607bf7b2f9cdbe0c0e260b518755baeaa646304f6ddfd863ebd SHA512 99d5f6f66130cd18819c3ca6f5f57617ea9848ed73519020981c059faa5ceb8c53a5a945cf073c9e5349b78743ff8c8e1190ba424d3f3bad8f6d9aae96c3e922
+EBUILD qtpositioning-5.11.1.ebuild 838 BLAKE2B 70d08d8cc7b986a950c302d17784c6eae194938385ecebdfebbade913c4d0c1e238def46d68cb9f0303a1cc1641637ebb3476c285dc9ddf0afb1decce985bd59 SHA512 c2ce06455609072d1e3b0a9c05d9dfe939bafb2dfe108e87365a4d14c4422ed2525ac041da9efb06e3d43481d9f67e2478abbfe3df13376b7c1b8f0d6351d7a3
+EBUILD qtpositioning-5.11.2.ebuild 840 BLAKE2B 683d9fee3e3108ee1d4e1eb6568a952b741874bed1a53afa3e45fabec7ac2942ca4401ad738f8c4e595bae71e406d1425514e6ca6fe204e8ddc64373d1eae1e2 SHA512 69db7552ea462a63b399a684d0c74fd2b4e9153419e9ea2f48db4caf371ad4bde7d176fc6fb7565680bb7d6af673b44f7260cfe654d291dd6cecf2b247e1fd25
 EBUILD qtpositioning-5.9.6.ebuild 815 BLAKE2B 64d3eac34e9fe8240532dfceb846d67abb1ce2f3ea71c350d20229a274627e3a9a9dd4f527e99f666906e116bb043814521a46ca1d3b822ca7aaead83ad1024e SHA512 b9cd28fd17ccd763741abf8c24b04987e105b2a4126aed7dbbc51af52cb362c6ff827e0ddc8614ccd72feb608772a218d9ad4221464218b54771e874a2839028
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild
index 37f71567e715..5ca83e170722 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 IUSE="geoclue qml"
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.2.ebuild
new file mode 100644
index 000000000000..4e2637ef4795
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-5.11.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtlocation"
+inherit qt5-build
+
+DESCRIPTION="Physical position determination library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="geoclue qml"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	geoclue? ( ~dev-qt/qtdbus-${PV} )
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+	geoclue? ( app-misc/geoclue:0 )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/positioning
+	src/plugins/position/positionpoll
+)
+
+pkg_setup() {
+	use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+	use qml && QT5_TARGET_SUBDIRS+=(
+		src/positioningquick
+		src/imports/positioning
+	)
+}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 1301ee367441..b32b922ed206 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtprintsupport-5.11.1.ebuild 780 BLAKE2B 9bc6b1c82687724c8ec74022d2c3ec1a405de9578667c32ef955e4c0bd92b37819a5de9a22b2df3e81ddad70df030f59584efdc592d935f3bc04fb0c67eba6e7 SHA512 f7d8f87dc41971ceaf4a1bc4a05594a813266ffb611b285309d58182bbfa41c800e1901251e2e33908815966e2f4becd526b6858bd960b296a4ac35fb210e4db
+EBUILD qtprintsupport-5.11.1.ebuild 775 BLAKE2B e5f7cde1cabf1f3e027d9c38e57951ce0f585a286ceb694a63940f18d5e07fa237715f9011a4a4b6e7e1977d3b42577522f5d89cdc0c9f9f8568b5d0a2d94e0e SHA512 57cace1f5369cb2c7198feead227cab0676c5e9097df072429e958537b16c2b701de31d53a9cf562f929aec7c68da4baaca3f73e18224177bafabd06af86246f
+EBUILD qtprintsupport-5.11.2.ebuild 777 BLAKE2B ea90c13d7ceecd077bb6fac0e410a5b992ef8993fbbb9b0c998dafa1255242850c20dfe3b240bb68e32bd0a10862d000894201c31548a50d24d6072b6c89fdb1 SHA512 0928447c4f6e434701cf7327900259e613c7faf6618c444ff6d7a5be6a7cf4cc49a90c884de9d32ffc6479cdcad2b6f9f93989e4523e1288344abc2e6eac1a5d
 EBUILD qtprintsupport-5.9.6.ebuild 776 BLAKE2B 1fee8755df583a6f9534d835cef6275b1c02e3233b9c44f4bdd0525da27212ccb250c409a61fa63b71126aabe7fc79ea5f84d8104dabe697f58cc1883baad0a5 SHA512 dc5c309683e5535f00e979e8085df9745a878f7ddd2f4298e70f32f566894d48aa971634328eb01a58197feac2305a50a7ddcaa6e05231ff09bb7b408d8fd39d
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
index 4b62b0588acf..b9b7af20b52b 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="cups gles2"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.2.ebuild
new file mode 100644
index 000000000000..1d457318cd9c
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Printing support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="cups gles2"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
+	cups? ( >=net-print/cups-1.4 )
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/printsupport
+	src/plugins/printsupport
+)
+
+QT5_GENTOO_CONFIG=(
+	cups
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 2ec64e6d8fb4..5e6133c171d9 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,7 @@
 DIST qtquickcontrols-everywhere-src-5.11.1.tar.xz 6058072 BLAKE2B f49b51c72486a5d514d16faf78ffad883e3597f6337d4103bc4b93d9cbce681853c38563a2f237308f8ea2362d8486284da308d4d815388457b429f3a3eeead0 SHA512 d12cffe5a91f10e37b2ebea435fa147508fa60dc83076a1fb1c26d4ea16666c13ced0c36a5222092b6c4d6c1c723bed5b881fc33557353e09cb9aca068dde26c
+DIST qtquickcontrols-everywhere-src-5.11.2.tar.xz 6047528 BLAKE2B 37dd8ae8c3783e184b25f7f4eb19eadba709fcfc908d997e0dd0b4afd7d3da06d8e211948cc2d922b3e75018dfb8eb4a65bc1d31ab2eb696ba34278f5929caf5 SHA512 621101df5966d74232edfe0ab1130968cf311a73e020604a4b329b412062599ab5a0f4f95a4d4c2bb6c2f91143485cd760dd6efac573dbd74f787361a99d5d25
 DIST qtquickcontrols-opensource-src-5.9.6.tar.xz 6013760 BLAKE2B 5daf7e1cbf94fb6f532528b52c4b30802f27cf789b041251409ed9d730ed1539fab41cf1b94509ed63a21c479dce43c10714eb1b91cf0d2c2613a3890feb5c6a SHA512 1a48ede02a0a0ddca6475ec952684045638a61a0db9f545b8ad8b2115f93f3a5586655a24138545d168196a3990f2c6dbef18530af546c60026e1eac91ca832e
-EBUILD qtquickcontrols-5.11.1.ebuild 751 BLAKE2B ffe5e136301939ea58a170a7382281ba2efe195963e2b0af6c04d6e156e399c108424a606d5fefc7b3cad952f366bcf9dc473fae32bd2448e1569c8ddc1c0077 SHA512 9ad5ed5880f169fbaaa028349a8065e393ab7deaf37e1435b0d5fc76b51049709977436f4ba88c38d1e8e66284881c57bd9e9ce2a942894b4940316a7a2f4026
+EBUILD qtquickcontrols-5.11.1.ebuild 746 BLAKE2B 5b97e14420d32826de199195a13c865f73f932fa2eb65a1bc211a3309d7547dd00c80129cfd0e6f33f48e24e3bdab361c958855e5a6998bfe4deedc40843c9b5 SHA512 f61fc636b451b7c649ad75944cf1f3b99a1a39a50d0890ccd237bbed19b5783c2ae53ca3eaf6dcc6b02ce3f76aa7bdfca59aae50f2d528d8ebb6fe68d98931db
+EBUILD qtquickcontrols-5.11.2.ebuild 748 BLAKE2B a749502ff9aa641bc4bdc079b929c66bd54ebead51c3b053374888c05eabae87f3470ebdc4c4495e4a434a2ea8b9273dfffd2b25efe580d0876a5991248f40a6 SHA512 ffa6719e63d04d37585da6d1571a7849ceaef277176fbaa91c3abd86cfe8115d0953bcc4d0e7a6068fda0d029b32b4c264c2d0ae804bb9f2464f2f24fdf02c48
 EBUILD qtquickcontrols-5.9.6.ebuild 754 BLAKE2B c022ad5571b15140a27f2c24f26d296182d040fb7d312346061e6e19b3fb859fd3b10c6341e67206d9bd0946ccee449310cd6825755444a5699ce32d3d92b7cd SHA512 9e04b2ddae62747a64793e6c946bad58997b5348913e2dafe0b6b550bc2fb5e31971effa58ce4f445500703b20e485aad88c6aa1c9a2355de3c4b181675ab2d0
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild
index e0dc94116163..d845cc003b08 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.2.ebuild
new file mode 100644
index 000000000000..9c557760e183
--- /dev/null
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/controls/Private/private.pri \
+		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
+		tests/auto/controls/controls.pro \
+		tests/auto/testplugin/testplugin.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 93d56bd6f00d..3060d56a61f1 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,7 @@
 DIST qtquickcontrols2-everywhere-src-5.11.1.tar.xz 9032192 BLAKE2B 42ee81bad1cd3888c770d559ad91fa38e8ae57a72a5b6a1faced4cd8c6292e89392ea1fab14f821ed04aae5b7ac997b111f64b9725f0b35bd3b685605d367e61 SHA512 b4d42d5ec5abdd819badfef147492fecc8ed433b88705c418845d75d35ee5880b11afaf70f17e3913855ccaa9aa47b3a9d497350ecb105b4f0672cf29111eb68
+DIST qtquickcontrols2-everywhere-src-5.11.2.tar.xz 9035620 BLAKE2B b064b1733999eb770516dd81afaebdfa31294301792c5f62678b729aa4ccec36bc5ca936367010dd226fc4ef36ce5d561d7836c0ff82a884e4f141c2ee032fd1 SHA512 94e8113feb222b85fa890fc65c59a371e29eb6838c2221b12d795d9809a605478f1c0b35a75b06bc67a02b3827dbb6bc4c4bf3fdd7485ee518cd0e5c409061a6
 DIST qtquickcontrols2-opensource-src-5.9.6.tar.xz 4158180 BLAKE2B dca050d5c0939f51dbb8181d9d644e2e0c6d1e1937cd14146c16cf0452e027666ad8e4f1ba50ca118698ea4cf4afb4b7876dd562394e5f5cbd97de3d5384526a SHA512 46817c31a62de3cce4179869c3080e12d2dcb3859af9020fc476baddc184ef7a7b8dfb0ccd2501c72e689c5d64c3d9135eeb1f7dfc821f06aa124addc4dc4d7d
-EBUILD qtquickcontrols2-5.11.1.ebuild 605 BLAKE2B 386fa9c9e06b1ec5ff1fbbe204c3325a957ddc426c84a1ae2c85cb5943ead40195740a7becfc3054cd36ece82e2e6dbb45ce550138b6eecc9b32fca8e4ad7a52 SHA512 32a3b349c5afcc20162d2c42dfbf147eae4aa12a974fcb89add625f932d50f730ae3134aab0e3db143aea2dff2dfeb71970eae7a5b504f5e90222a8f7cb61a44
+EBUILD qtquickcontrols2-5.11.1.ebuild 600 BLAKE2B e7054d07d92b1b6e28e724cbe49523ab80fd8bbe56f02a3e8809d41c0c7de7837a5e3e9c59e2a6fd3d74e0fe57f09937451f57599b2eb9c52ee283ea6b819e55 SHA512 a7d0276b34bcc3115a56b3e63546dfe40d1216ef7b7de8a93dde85d3acaf9308d1d72fff92536cd1b3347e956de6c71f990a67a3934007854fe7de93f3f103cb
+EBUILD qtquickcontrols2-5.11.2.ebuild 602 BLAKE2B e71ab8708061c407032b8c4bfc5d8dffb331c2b2a597a9f798f0aeaad4e077e9d653a278ad7c7a35e91a3fb412750ac53989d3b4743207257c9ba7797d54d1b5 SHA512 9b7c5a6e7387a598bc535b75f2fcf3d89fb523ff14f6fdb33efc1b69d280f2ba7cc4bdd5a9f16258019a40c542701df526c5eb992e108c068fab05343bb45fb9
 EBUILD qtquickcontrols2-5.9.6.ebuild 603 BLAKE2B 31f03722c98ac29f541c1d8dfe6cee0390aaf5c118920d9bf2a442698790612d808e2ddd64f23065205ab76198df0894671e77a94e95a8fb0322460ff78219bb SHA512 7d8c43914e579c6e096590192c0db4ecd616e57cc18eda59e058aaf5b865f20cc7666211b11ebc1aee4122f8eda48e5ab403504d1e040a865f00cd766804c5d0
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1.ebuild
index aa6bccf51564..36e20ea2d6fd 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.2.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.2.ebuild
new file mode 100644
index 000000000000..d8c91c45bf14
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}
+	~dev-qt/qtgraphicaleffects-${PV}
+"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/imports/platform/platform.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 782a8596f99c..43ec9d505520 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,7 @@
 DIST qtscript-everywhere-src-5.11.1.tar.xz 2671428 BLAKE2B 8cc74db4f5b33e299964f81b00e634965f7471d191726521726a5f2556a8eccf344e7277071f817a9fa0c40856acdb955258e9491966b6f773701e809b73982d SHA512 609ac6675341fb2707ad3b91e955a430846253741931ada2343ab2d1ad27169a60548b1a2621369384043a4c5b983e392c3fafcffd50237563b9f4204123e411
+DIST qtscript-everywhere-src-5.11.2.tar.xz 2661200 BLAKE2B d35cde6e628eaf8987c8dd0afd0c6f9c363a357d787f84b185963f5691de3b62b62b0814f2fd6760ab1fedb58e58f721750ae9ed3abfb9560aa9103510e19dfc SHA512 b0b4badc78cdebb3b42fe91104d112afd3bf9d4ead962c58ececa1db3db7fae6d5368f94d940195e2791ebfd09c5d6d5d892e9c4e48d64ec77dd366eddb1ab00
 DIST qtscript-opensource-src-5.9.6.tar.xz 2607812 BLAKE2B 3f11ae2270b1bdc6ac195a4a398754df16d4599211ba291fd0a5793cc7e586f0034f1f5d63a185541e35c744de1d3c8facf12bef2cbbf98abd94b3c27e40b6ba SHA512 2ddecda376b79edc8cfe9215a531a8f0b1892f3e6b39c298a679903c2600a1df43bb59baeed3392e92fefb476ec2ebdd2ffd351d14918fea00025d2cbd48da46
-EBUILD qtscript-5.11.1.ebuild 693 BLAKE2B c4497f6e0ad5f1b61c02d3ad897a621cf84bc35e915b8e6cd3f0165eff3688ae84edbd99ecf9394827514cc16e7c63c87440472604d7ad15edcbf3589e26fa41 SHA512 71e078d3307b6ab8c7358503eb64371498e05f697a8ab63ea8f9383701ef2cb9903294dc11a1720c71381a9cc75e0897cd894d99783c5d3c7fd2874ec611fa45
+EBUILD qtscript-5.11.1.ebuild 688 BLAKE2B 4a2028b8736797562ad3ee02c42ffe760ba69981a68321802047c9d16f862e75183fe9fff76ff6d8ede5979ab04dea112b310568c73590458156124c2fc16ac1 SHA512 f908c51d558b5cd10146c6e0038e9fad4d36407b3310675508be290e69c7c3820cd808fb98579bd04050a521ff66933225d19ff7be0a8670f089581a1ea7334d
+EBUILD qtscript-5.11.2.ebuild 690 BLAKE2B 33a02e3ce082f083108327860947f4dd5083b8ffcc92d97a3d9de0d8fea8dd281334dccd6d52a1fed39f90d48188002bed2c2bc7ef2b2571bd65a57224c17000 SHA512 4a87beefabae87f1c774941c7f3da0f510b2280c621a7b56968cb0867453858c89fcbcb36bb14d71a80dd4a58e9aec935579ea26d4acb6079ae4add8b35dd805
 EBUILD qtscript-5.9.6.ebuild 689 BLAKE2B 3028a7bd5a9ff47f4cd1e197fc71bb08dcc23d0d51b896cd7ad2d112a7ee28cd55d43b64dd76152a36bebd7ec98ccb10041dadbb6ebd7a5335ff9307e6518388 SHA512 ce0b31049b30c774b682029069e29af0d5cc8612721aa929dfa885c79a3de80a86837dbb43332b19179ade60a41c13face0d2b7ccc3ce635d88b398540c57125
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.11.1.ebuild b/dev-qt/qtscript/qtscript-5.11.1.ebuild
index a4e01b45cf14..4c9fddf031b1 100644
--- a/dev-qt/qtscript/qtscript-5.11.1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtscript/qtscript-5.11.2.ebuild b/dev-qt/qtscript/qtscript-5.11.2.ebuild
new file mode 100644
index 000000000000..bcf1380a584b
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-5.11.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="+jit scripttools"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	scripttools? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod scripttools widgets \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index bc9eb3d62f2b..e3a81e863839 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,7 @@
 DIST qtscxml-everywhere-src-5.11.1.tar.xz 436148 BLAKE2B d26d8e54bc89685110168043ec876fa8bb34c0c23ed31c625d26f71e82283716ed70e3fd71ad02233bd69546ace02cb87549ef3270e3bd43c0758db480db3639 SHA512 d64dba323b009525078e999e0972fd09a16bb806980411ce7cc452aee0951632ee440f71c2b5124cfd6ed5020aa869d8490017aaba374a8d4b83f43c1f0b0689
+DIST qtscxml-everywhere-src-5.11.2.tar.xz 430496 BLAKE2B 7c6ec84440fa2a0c54de24587d17af9cb2b09b7c11056da32c091954c87f21b448f512aa131d9051377a9052f7e8c09f00e259b071a0879ccf244bd3f623c114 SHA512 4175d02224654a6a6b220f52937a22093be8b06e737f5575d4227b9038cb7c227f37eb17b7bb6878c16a34eae342c06e33cb2c356a389137e9f7d15886aa30ab
 DIST qtscxml-opensource-src-5.9.6.tar.xz 414120 BLAKE2B 90458c151e42308d660556871ab4ce4972a2d620d9785d2f39b2c913d0fa35522be5fcc459838f42c93b6ad6d76a0022b85cd3cf367fcdb77004f199091e0d4d SHA512 d649a43b5d9b753c431120972be93a190583315045d724ea5149ba93a73aa65724eef8a8b0d33f48a543418e045961e91af1d068774a923469f871ed3a97d4fe
-EBUILD qtscxml-5.11.1.ebuild 374 BLAKE2B f8297445522e981b840f4aee9e954bdc1f77e10a5bb7a8731f01539d2bbeeb1f7564c5a8df64f5170e2a7221191cc00bae435dd78f51fc8187de474840804b7b SHA512 55bc53954466df3f19a7a1378736538a8156df60f838f9cc783bc833cb91fab8339aea34d344327723efc3a60270a6c2656ca2f7e32f15f090292bdc05596ce6
+EBUILD qtscxml-5.11.1.ebuild 369 BLAKE2B 7f37bc1afa67f7b17232814322013ed3f7c35f0427b490c00ed0d719d1489b9c9a7c3b4ec83c17688c6fe769fe1ccf608f918cbca4692f199c2aba236fc55939 SHA512 e0f7f54fe57ccf4b339bc7981dd321fe991aa48f8b3a4da081a6f60a9de52bbaf329dcf3886b53914878a801673fed5f7c132bfb05945089c5b87725df0e5b9d
+EBUILD qtscxml-5.11.2.ebuild 371 BLAKE2B 4ca727220d9f994410618f6fd83b309a4cc29404f50d63ee30468370e3ac5e122b748103eff82ff45540b93c06d5bd403f726f0a2a21877e2786554ea4ba1724 SHA512 fb150fb168b3630b421899caf5cbb7b44b39210f7c7647327b2f3f5835538007854e0db624e3b0248a1eb4a2e264f5f87395740fa0bf788dece24088953a1279
 EBUILD qtscxml-5.9.6.ebuild 372 BLAKE2B 7c3d91f44fae4d6c6d66a32247299e6ac27be20617c8c4dcdbddbb3f7b53cd7eade1033bb5013e7d3bbdad991f6a4be3ba8a6b0eebaf24d3c7194028f299f77c SHA512 ff3500bb2effa2c6f19bff568c373c461e2fecc48b7ede945abe3c8ec119bc00eacbd2a9c3bf35fd374dcea1fa6a476db859dc3e42aac02366ebc0b193852917
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.11.1.ebuild b/dev-qt/qtscxml/qtscxml-5.11.1.ebuild
index 59b06ef21029..b0ec2d3036f1 100644
--- a/dev-qt/qtscxml/qtscxml-5.11.1.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtscxml/qtscxml-5.11.2.ebuild b/dev-qt/qtscxml/qtscxml-5.11.2.ebuild
new file mode 100644
index 000000000000..3a0e878ad0e3
--- /dev/null
+++ b/dev-qt/qtscxml/qtscxml-5.11.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 74e14c715d35..1467e8d6328e 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,7 @@
 DIST qtsensors-everywhere-src-5.11.1.tar.xz 2033508 BLAKE2B b0b99adafdb96835a019c915f57bdbdc76dd965d32081a2b8d4f1ce60a06fb9d1c450a2949a1ca2475aa303514e99ebe695dbbd0395140c7edba863731b8b32c SHA512 5da90766ec979ee51b3df97f794b1661a1103b80cc57941516171d5102b54c15bdf1cfabde21e5b94ddad324686a6a92171193312e7c6791d5de63832452010d
+DIST qtsensors-everywhere-src-5.11.2.tar.xz 2028412 BLAKE2B 870775982fdc067b55cf172d420077dc67a762a782f1c39a3328d4a3bf99748c22a629359e7ddd155465fad55ccff7cf562bd1b7b24ef92dadc96d4b24fad733 SHA512 561129563cdfb0990539cd04ba1b6f0aee884007a801a4cb0fd4dd46aac2b58245ed919b23fac3d484d01f93ee428be3d4b8896a93af18acbce73e199a58ba80
 DIST qtsensors-opensource-src-5.9.6.tar.xz 1994404 BLAKE2B 38935553d7b765e2de9b9328ecbdca6c141c687742c6981b5174261122e568c5534c44b97d67016b33a1bfa47eafb0f04a89d13c1cc43296ffcb31174290c762 SHA512 1c82b0e02bc45c914fbc620049b2f4e33bdd0ff858c2f3946d134e4e5dc5927358ff53db0b6d9fcbb6811e36d2a816aacf7f852f377ecff47280ca592eaa92c3
-EBUILD qtsensors-5.11.1.ebuild 537 BLAKE2B e560851f2ddb5f429f5d760e1c287f6b6eaeae49013c02ae54c66c13f4ff071ab0665d411a7c53589ca9eaf77a7fa72165730deba2aa2f1617ce2ac831897e22 SHA512 e190d35f102385927cbef9d5b1d685e8261a96cfa3bec1cf7a206ce9405e699af15a31f8437358deeca205acdfadc8821a2e30eedecd20771ffd22d3c4613143
+EBUILD qtsensors-5.11.1.ebuild 532 BLAKE2B 964581b4beae02e6c67b60db7e4cf48cd825922d6a970a4b2e172912f1a1e9aeb4e5e3e9f33fd3da1a159fad5a95d95602bc362864caa92eed3da0704529e74d SHA512 af711d5cee1d2fb6e370d6a9d96eeaf778abb98d71e6472a54fc81c134812bbea344bf5b2f1443f8fa35817e40eeb9b6f58e3fb06ebb461c7542e989332e3054
+EBUILD qtsensors-5.11.2.ebuild 534 BLAKE2B fa1dd46f2530471e88ceacdf6de07448e5b25b65c7f32f293a10e3c236bdf81968348d2fd81a6a8bd419f37f90bb983143b7d705d7d4547557a84cb8f14174b7 SHA512 7e040cb48588c6bf703d5e431f0528ba91c223d4f810db228bb49b648da94558cd9ed81d22762fe1821c50d50ffc73358c47fe2eb875ec1a82bf0ba57f3e2f8b
 EBUILD qtsensors-5.9.6.ebuild 541 BLAKE2B aef09f5bdd62712082d440946a16fe453318b8a1dba16608857cf7f068c64f48b63310998ab30e95e07ce16a358f412b83e1f59482ea311c994c363761e75b00 SHA512 b2e06a87fbaeb95862f37eba18e95151e1b68034297468c3486204c50c3d47fa534bdfee25b44fa6e6751d4c1f6cc8e16f162e56cb3dc5af97c5a3983bdf2598
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.11.1.ebuild b/dev-qt/qtsensors/qtsensors-5.11.1.ebuild
index d0b0c5b6e6de..f1f60f3380e3 100644
--- a/dev-qt/qtsensors/qtsensors-5.11.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtsensors/qtsensors-5.11.2.ebuild b/dev-qt/qtsensors/qtsensors-5.11.2.ebuild
new file mode 100644
index 000000000000..cfd46f98d61d
--- /dev/null
+++ b/dev-qt/qtsensors/qtsensors-5.11.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Hardware sensor access library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+# TODO: simulator
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index a4fd0fa47109..8860d732ff76 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,5 +1,7 @@
 DIST qtserialbus-everywhere-src-5.11.1.tar.xz 320844 BLAKE2B c55bfb9858afaeb875b48f291eeca138e9aa7597eaede14b40235af0db64da4e71fafc1cad840d4717487d6f614305f9ea6f89d105006392e2324bea193ae625 SHA512 9469fe7dc6d334eb2b0737cba62db72b7bd8af56631dca47125edb595a9dbf4a89be2d4658f6daf13d13cbe6b01915d61cbeeb71cd804612825bbd78692fb682
+DIST qtserialbus-everywhere-src-5.11.2.tar.xz 315080 BLAKE2B 4b8280ea6a007e877151d7070fb66aaa2dd8b806cbe394d1d37a268b3c4b484514e1df5ab4a1be6b802ef9c7b7a56fda1ae089600b15afd5b15b7aa93bb42abd SHA512 92b2187f8cd5431cc2a9640016783edcf03fa1ac23e7008abd3007d9e7457e429011f7428e26cdc2b0828c022dcc44184180d6fc97e613d2e06ac03080cecfd4
 DIST qtserialbus-opensource-src-5.9.6.tar.xz 278920 BLAKE2B 34775b4aebaedec3e3a826c8588b8b167d617af2df5918314939d38604e3ef8781efa3e806824b93785eb527b3149fe1a49774d2bee12272e97d040f24ec0f0c SHA512 332edf0da83a20a39e65280c817b591b3b5b50710ae1dcce1bbe284233e20bc239584db634078697e87293a9811d1ad6f9d38b3ca7aa6188b9509cafe6672f6f
 EBUILD qtserialbus-5.11.1.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
+EBUILD qtserialbus-5.11.2.ebuild 372 BLAKE2B 771d10d088c56e91fbf5c3a87699e239438f4028a2514d71ad74ed5ff182646044daeb9c9b612808cdeb053da34ff8cf6c5d2dc3a453b0cac9052bdecf6e6ddf SHA512 9ec97448ba9d1616de5c064b3336bfe2b3b30480787ae7b21a59f50e09133d1a262dcc1444306d62c2bd2083bee70b8b1989dcae635c493bfd7d2f3d1e2707f0
 EBUILD qtserialbus-5.9.6.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.11.2.ebuild b/dev-qt/qtserialbus/qtserialbus-5.11.2.ebuild
new file mode 100644
index 000000000000..687bebc9281a
--- /dev/null
+++ b/dev-qt/qtserialbus/qtserialbus-5.11.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Support for CAN and other serial buses"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtserialport-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index c57790fe278d..a138b135f9cd 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,7 @@
 DIST qtserialport-everywhere-src-5.11.1.tar.xz 301692 BLAKE2B 8d57503dbd16d142ac72dbc496218d57ff92212b44e8a504f3b6ba27b2bdb295061705c1318000d50c2383ce815c8420b056ea66720f62338a1b98785d37c5f4 SHA512 2f13122438dfe91c6885534e4470e119abf1c7134b1d344e9c0700661c002566f483aa2bcdde53e4860df349fff4ff8ef05bfafb0aa1bb4484d3e5d07c989404
+DIST qtserialport-everywhere-src-5.11.2.tar.xz 295876 BLAKE2B b10f33c7956bd62573da46f83129e7191e773316529cfce4897cb5dd34c40eb48f9c7626b23110936b2e464b95a560f0e816b1680011444080c61b633ade912a SHA512 babf89583fc025de511601f608300a01453e06c2eebe51c0d3cad3eb9c8179fa9cf9982690306ffaf7ce0a0abb7174ae0078a1fd36f6a34a2d5277bff9d4ea9d
 DIST qtserialport-opensource-src-5.9.6.tar.xz 268344 BLAKE2B 1aa206d12e508474c7a7aae3d16923d80170ea739e1fed74de363fa42afcd94fbdaf683e85515d5de7086a8bdf901dd03f48ba949e4429e47dd0af176861c36f SHA512 a4f5230c78772aa8899471dea90bab38a1cc021c22737f959e1a6852d18e7faeaadba4d329e49b3c9a3b7ef5fea69febb550e7fb4a9d99902d0e80a144822847
-EBUILD qtserialport-5.11.1.ebuild 554 BLAKE2B 0cf645222636741080c2f3c17e06a8cfb66581831beadb655c1a055452679eb3c82862868008045285535ab27c33f8d44c94bf944f2ac448d3a3d5f570c991f0 SHA512 f4c4acdbda4f511fbd8caaf3c095ae4692fe0db9ea774325ed3c9a43e5c45e7f29a4ec07dbd92538d207bcb44eaa5bb0ca575f4b65ebcd0473a34195ba276580
+EBUILD qtserialport-5.11.1.ebuild 549 BLAKE2B 36ce59fef499bb387e88dbeacc82f60796579d1b1c5afec3a8a1b65dd9b91ee76424cdcedfe64d59d7f4b67ea434ad2544eab3e4bc27467d936ca479f4c582b4 SHA512 dc73488f5cef789dd2453698a24263c44829e47784e6792d643367951a0282a6c9aec72d1a84db04fe2921cff7eca03c370055ce7303e6e9e569b3369a55db48
+EBUILD qtserialport-5.11.2.ebuild 551 BLAKE2B 06cb5c41e8342a618f275352267dd3f521868043a2d8ed32dbb2327270b04c9a152af086ef33a70ef3cb8a564be34079417e6f7a81039629f34f1e0ef9dc0f82 SHA512 8689337c5e2a3ee2e90cceb811a82efe233b0dcec11b17c2200b8bdd5803e3e9cebd5131a6d028de4d62d4dfb38b07c60817666f4db0cafde4d4494803c76a4f
 EBUILD qtserialport-5.9.6.ebuild 550 BLAKE2B a8e99cc63bc703a5534375e984d4da655d52cf4a807bf8be778d46a363412e11066e149fbc0e042f929e18aee59edc23722eeb96208490489f57e37a1d47b730 SHA512 c6301e4b704a20316eba844662109238d921524827380c4092935452eeedc170bf6d04c8085476956363e0e5ec0dcdad1e1d2eaa1e27bffeaf6017462232f321
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.11.1.ebuild b/dev-qt/qtserialport/qtserialport-5.11.1.ebuild
index 576f91e4e53d..375d697f5205 100644
--- a/dev-qt/qtserialport/qtserialport-5.11.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtserialport/qtserialport-5.11.2.ebuild b/dev-qt/qtserialport/qtserialport-5.11.2.ebuild
new file mode 100644
index 000000000000..67478a8b8170
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-5.11.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Serial port abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	virtual/libudev:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# make sure we link against libudev
+	sed -i -e 's/:qtConfig(libudev)//' \
+		src/serialport/serialport-lib.pri || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 1ade226f0b2a..9a4ce548a7af 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,6 +1,8 @@
 AUX qtspeech-5.9.4-nogui.patch 321 BLAKE2B 0b97c282f271a1ba1d7cfa2ba15f75bb2964c3eeaa0a946346ae0725e2a7a9198fd0dce4bf85ad9b0d06e49234dc11203d5a0f52e11e17b879a9dc1712014e91 SHA512 8d2dce3280948bc0451d0f753d415552c556c089d5195172953215c3abdf14100a3284699e9d5cfd0feca83466d1a35945a8bd2a863b325ea5e257b277a0e71f
 DIST qtspeech-everywhere-src-5.11.1.tar.xz 101732 BLAKE2B 2201a78f27851c4ec1d2a7056c6b0b620ff77b73be626940f6fe296baa677c5ee4a8098390be48620af77db10b75b777214b41c8dc3fd9b54f3a3cdf8f613345 SHA512 d17a0ab62083b9a8cef5f458b649b7789b0e3394a660c71f9ea6e6311c5e37edda10b16692817b8e165dd66a38cf34560e37940a63beec99ece3e2ee862adf51
+DIST qtspeech-everywhere-src-5.11.2.tar.xz 96080 BLAKE2B 90f5e519bef440916f962e5886f1bb8e1cf46a806172ce9b8024b4b4c70d581896a9e70bd42d0298803c43798e985cb345bc4c4f8b7c13b4eb1a4921de79bc6f SHA512 b3e433b308c6c3454e40e7e19a075d1bd181a33ecea9c8f970852251488c12d1227e0b92aaeb6f7f75ac0efcb04bbe22c49562c594d8b9773528a2aaf73f8d02
 DIST qtspeech-opensource-src-5.9.6.tar.xz 80716 BLAKE2B dd7b7fc52394cb9b9a9f31de3f08fe9efadc03694604f871f802b465a1bea6753be9ec2bd3843296403939dd2ae0b7e40e910b7fd01e0f8a17f82517531356ea SHA512 0a07c7cf0e58388f4fcd197d6b8f3b6a84a618974d725fc03847ab42b814dfe9e44025e8adcc5c66d9c7bb156e6b6e9457a62c8d2211e45de1ae27d89697e333
-EBUILD qtspeech-5.11.1.ebuild 478 BLAKE2B 258c4717dcc4774fd9fd621b5514fe8d042be51c7042cc2c9a8a17aa471b839a92026886384d5f9a53afa23285e66727c611f832dc60ebb0fedd97dd29680986 SHA512 50a9e1c505337b086db5b9ec4d734acd18559c768732f161aa7b936b3fb5c29866657bcd96995298440431881913892eca7e60447460ca09e64bad9f3155539a
+EBUILD qtspeech-5.11.1.ebuild 473 BLAKE2B 22ee317b691e239705c117a4bc8ead93995e7124d9e0d2400f1c6650bae61c386e09011c5ffc24006a57cba0c460522735f9ec9ebb19a1b4d0a6e7dc54a94f8e SHA512 150110b763642f1ac1a1468cf3e838b4d180f1c3d531dd2ebb79a51fc968688d6a281fc8b143aa7b4dc2f56d3e93c80fb177d1603266d4c200af2d0de11fa0ac
+EBUILD qtspeech-5.11.2.ebuild 475 BLAKE2B 3ddaf11247791abf816972351621425da73804c93130c391c469e37e8be490e0b571fcd48776be35f373f0fcf858a3e59379bed97dae94044ac9ced6fe10ca0b SHA512 1d4fde9ba6306dd994e51be814eb978f04b993844f0956245abad9c935f9ec2f4b6abd6c4503b0859a3f03b40eccee03384b1669f8ef6f532a8e7d7c1a694392
 EBUILD qtspeech-5.9.6.ebuild 476 BLAKE2B cd2475975fd575808f8a4b377a27e1d06a2dad24b116a13151043a4d1d5f7b34e8e0b8f21cc1c05c9495edba49b4b9422aae30b8f34f2465d29d3472620d4388 SHA512 70c6608ebd1f2e986eb55d4a82b7a035a5cd5dee458200e0853833e7afa0926d8fd8f675247ddc38bb89bbf6b626dda226ead53ced0f2ecaa4b240eb204813da
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.11.1.ebuild b/dev-qt/qtspeech/qtspeech-5.11.1.ebuild
index 24627d2b8665..bc7a94c8aced 100644
--- a/dev-qt/qtspeech/qtspeech-5.11.1.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # TODO: flite plugin - needs 2.0.0 (not yet in tree)
diff --git a/dev-qt/qtspeech/qtspeech-5.11.2.ebuild b/dev-qt/qtspeech/qtspeech-5.11.2.ebuild
new file mode 100644
index 000000000000..690b4281a2a8
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-5.11.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Text-to-speech library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: flite plugin - needs 2.0.0 (not yet in tree)
+IUSE=""
+
+RDEPEND="
+	>=app-accessibility/speech-dispatcher-0.8.7
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" )
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index d67db0ba58d9..32494eaf3cc7 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,6 +1,8 @@
 AUX qtsql-5.9.5-mariadb-10.2.patch 1199 BLAKE2B cb5d5079aca9f9adb0343db8691418afc1e1b43c8a425f5c8f52ab24872047c9f9bdadfe48fee9e7c85b5cd1f886951aa3777f55ccada790113150c71a77ca42 SHA512 be4d8c3569ba3007a0b512184295f12043b79e09e948651fae3af5b4a6e7e0ebcf5c5f55c32c321c64a469eefeff16ee7169bbc03d7027ee04d62d384e04288d
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtsql-5.11.1-r1.ebuild 1511 BLAKE2B 3f6739bbf341be963b37c5fd229da3c3500becbc7ce50d142fa96d96bef17787b6affb043d67993ce1e3675ffb6ba785102b6d5765d17b1ab9e78dc667543717 SHA512 64ddb7416cf078ae7768cdbc5dc074970d8da6d22b5c57c1bd6acec6426291c0d96a24bce1fa616cd2cd524fecce97c08c3059684bf403d4c7329c740f86c176
+EBUILD qtsql-5.11.1-r1.ebuild 1506 BLAKE2B 30f185e48e90ef6dcce69ca84af1ce5fdfa509b39c1fac6b7a775d87a35172572274cf802ea7df1c089c6a5ef0e387a9b054fd30139e306c39f0143545469508 SHA512 99cc1aebb01681199cb64410a5f35933beedc12a00c7f9f518f28f12b8c049cfc17f398c014ec66172e865a2728bf1a4a8d4f7f04e4d34f202c4f04323d27027
+EBUILD qtsql-5.11.2.ebuild 1508 BLAKE2B 4190f03f7b604221262e4bb0ded1a7afc3059305acf7c9c7b1560ce7448d870c0f9dc62358e98df69478ff861569d1605ce9906e1adf6ba524d61f474454da2d SHA512 c58b32fd78e9837d632bfe499f43bfd876e83634d0d9a5911a54ba0a71f148a6f835d680d5055889de4a44f108d979443d8a9ce9b7e6176467bb83ed6fad7da7
 EBUILD qtsql-5.9.6-r1.ebuild 1625 BLAKE2B 28b3b4d38223284cb2469d987754c9c7245449d64cfec867b474f935c4135858b1847926eb78d9700c8009615ca4276342fccfe5166193ea8460d7fb479562c3 SHA512 82a76b2e4c180844883edeadfea697bed04d699f35d72e9abf4e7139c087a99d4a9edcdcc60fd783220f7ac508dc2334a8a24d11d72f28c9af7154aefaa3ed5d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
index 2ce2c9a975ad..1641d48345c3 100644
--- a/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsql/qtsql-5.11.2.ebuild b/dev-qt/qtsql/qtsql-5.11.2.ebuild
new file mode 100644
index 000000000000..09b2d08531db
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.11.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/libmysqlclient:= )
+	oci8? ( dev-db/oracle-instantclient-basic )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(usex sqlite -system-sqlite '')
+	)
+
+	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
+	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index f4f0332e1b17..bfe9f99067f7 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,7 @@
 DIST qtsvg-everywhere-src-5.11.1.tar.xz 1843216 BLAKE2B 8e5e94e706872f65189a51f0ea19a69d409de4d60c8cedd376e8e5efe74513370cc0add47d7d158ee386ce96455af27bef6ac3e29efdfc392d00dc7f5e3e7221 SHA512 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39
+DIST qtsvg-everywhere-src-5.11.2.tar.xz 1837076 BLAKE2B 58ad105dabb0c928a3df8d64df5e7f2593b5fc4ee155db45fe89f6a6745097941306aedfafd0800745539249f427b273cfd0133cfd2459041d10a297117fbd03 SHA512 d6b83bc0c4b348f65890fbb4cd4df81828fb1ef88192c13b06dca695fe499d65da6a52ba57ca289aa31f035309f10af90593cd9ee17362219cfd1337cc801c57
 DIST qtsvg-opensource-src-5.9.6.tar.xz 1778688 BLAKE2B 30084cdeaefef6c15f07fbdb9373b9cecb87fdd9676c2d89061a371439ec0c02ace2fe65b0061e518de6a1b75df9edf314adcdb6ffdc03c7be29424c92784d25 SHA512 6e86f050c07621d628f6e9440541be1fd80b3e05b034ba17bb5068afd4775d9ee08d7bf11d2ffdf03da2cb8ca66bfaf2f59b7e5e76acdb1a1e2ec25af25c65b4
-EBUILD qtsvg-5.11.1.ebuild 478 BLAKE2B 36035c3a7280cca642a157ee5792bcf272bcf4b3ad1b4ddf8e09964360e3004bc0d2e3ff86cd50b2bfcb71a071468d88f59ed3d885cc85531855a40b763619aa SHA512 c5306dd98f1c4293edf9499deb15e14af155e287372420198b6556d7b40753a9e4d4fed56964e0d532c78581776fab18d6499bf96192db887032bf5ff85d9925
+EBUILD qtsvg-5.11.1.ebuild 473 BLAKE2B 50d29136ea7071a6768bd6c84d3bd0af9f6d48414b39b429b419e45e341ea632d21f4ebe30c585f06672f31134e4327ab9af66cbab4226689171fb501a0224c8 SHA512 a2da21e976b89c7ab13c43dbf530e3d32d366774ce80e8f65a662eb0884ed2c0438118c1d5b34ae9df78c6d7617f14d5748062cbd3ae5296615c61d84d0a081f
+EBUILD qtsvg-5.11.2.ebuild 475 BLAKE2B b34bc24dae3d91410b8ffbea1ccdc7d88aea2791a622705882514566984a9e6772ac4c5ace1fe7aae13c881d22b0caf81bff1807cdccac597fb6c0c2260ff0e2 SHA512 480196ea541a23a3791637c021d1982009d1d329ce14acf7ba7ac1c4b84eaee3516748b62b652c50fad0ea9aedabce66a8aa58c394b557d47da424f70a6a7096
 EBUILD qtsvg-5.9.6.ebuild 474 BLAKE2B 5914a4da775446e7bf2034f16517e7e57e7d8566d24eaf5aced617be529572d7eda6940f68f76cb1aa3b09869cab541af5ee940c1ea08cd0444e5de66e30a2f8 SHA512 d0a04efed3a5352d70c78f6e4e93059ee2dfb61c1feb064b4e3d1cb6b421b3d08fe1e6d692428b5aa2980ea0c0732d91bceb3928509f6f045558c3ae81d4dc7c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.11.1.ebuild b/dev-qt/qtsvg/qtsvg-5.11.1.ebuild
index 7ee3f3e64cb2..a2342eba7001 100644
--- a/dev-qt/qtsvg/qtsvg-5.11.1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsvg/qtsvg-5.11.2.ebuild b/dev-qt/qtsvg/qtsvg-5.11.2.ebuild
new file mode 100644
index 000000000000..69df6267c770
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.11.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="SVG rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	>=sys-libs/zlib-1.2.5
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtxml-${PV} )
+"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index fa140165ab90..e5378dcce984 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qttest-5.11.1.ebuild 556 BLAKE2B b4129e403c03f101c3b28bd82b0164852c35f2cdb4f919892386c7a2d9836e55c4a9b13d4f6dbbdf5b1f8564d3ee291765061fc20575b250e4b81e6046dc920d SHA512 49e403932475909d751e1a31f5767d0764bb01d639a99c874774bae23232d15243a4e8de32d9e5f78eb74c50c26281829b83edbdb2aa79e099de137b1c1a4089
+EBUILD qttest-5.11.1.ebuild 551 BLAKE2B d9ca198211ad9757ba4627165a5b1c66c2b50e72a710c128bd328793a5594e962e4b09287243b0c495739663f5d7682e78de3fe69ea06d64041d3710ae61c732 SHA512 2736656b4ff369a654896f8c9aac6be440ec956cb538e411e31088887fe7968b95882e28170c93a58fce270850def3f62262a19958741698c749f57fb73a07f8
+EBUILD qttest-5.11.2.ebuild 553 BLAKE2B a01fc5af90ccc8489d58a08e8033fbf6498ffb1aa06b0cedfa2766de13f866850167158d3a02b2dc0e2958e80f901333c36cc66d13d5ae33b0c8ed6214644960 SHA512 776cba34039c9b13bfaf313876249e7fa50d9bfc9e01dec22d729830c7c37092079ddb990ae1b2abf15f14433e4bb232b4fab96f0152175eecb04f1a9459ade5
 EBUILD qttest-5.9.6.ebuild 552 BLAKE2B fe51f031dd97723a5ee0a604ef97d7f8bdeb505f503859ea75eb3e13b21d50b6c17d58aae95c150d13ad69eb00c97c64abb3521f7cce3117ca4dbd61ec9050c1 SHA512 2e6f78f49900c3df26238be8d56dc4174b0df252b9fe55466c6ea1dac13342ccef5db5329404bba9f411a1d39d6ae2729c742283c579fb5197a17350463cc400
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.11.1.ebuild b/dev-qt/qttest/qttest-5.11.1.ebuild
index ee26294df9a4..4400b5253eca 100644
--- a/dev-qt/qttest/qttest-5.11.1.ebuild
+++ b/dev-qt/qttest/qttest-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/qttest-5.11.2.ebuild b/dev-qt/qttest/qttest-5.11.2.ebuild
new file mode 100644
index 000000000000..320e8ceede8d
--- /dev/null
+++ b/dev-qt/qttest/qttest-5.11.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Unit testing library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtxml-${PV}
+	)
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/testlib
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:testlib
+)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index ce8f4f680927..e10e34c4cb5a 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,7 @@
 DIST qttranslations-everywhere-src-5.11.1.tar.xz 1428808 BLAKE2B 55a8813a471ab14f885f95df6a2205c50424c8892d060f3dfb4123d281e55a1a8f0829ad3b8f1b713bac11a1160fc22a977269bcaae877b80c985c4b2c9232ff SHA512 b817b7be585413e352271204e88730c873e0701f65dbba9f5b331f0c3e0ddc1bd2446f038991bf9eabdd79ba440ea0172d0342b5b0d8b1593d9f55ad2a0ebcc0
+DIST qttranslations-everywhere-src-5.11.2.tar.xz 1418228 BLAKE2B 66a6fa0179e9676655b54659cf1bb5fd60579d53e9cf73b6e4b7d32770eb381560a48a11f573f5b1ee5d2ca7085053335f6fcdebb51156b6f35403bfba8e696f SHA512 093733b87d368613fb66a43bc3778f53112897dde061a8178cc94c02dbbdd158428f08015e21a15013edee40b068198bc7ae02ab13eaf4799a068e8a21f0112f
 DIST qttranslations-opensource-src-5.9.6.tar.xz 1376088 BLAKE2B f85611a787fbbc5820bf0b68773ab9be1edc2f659c7861c6d8bc8158c0ca495f882dd2201406315a1f5c3caf7b4dd87b2178362e4ee9d5523112c55f590a6fd8 SHA512 caafa6fb865c73c1c43ca5d78aab21925d5cf836b3e9d8c10ac699a96e7b583e85f12101a79a55102f8d404305764acadac599cf84b97d03582684f3b9bc4ec7
-EBUILD qttranslations-5.11.1.ebuild 379 BLAKE2B 983cfd8e6e4342992f7d945371452484b3208909b390595036f98cac87d1199f82ff53f12c449eabdfad1dc4f4f88538b2a77490c20dbe1ea7f85b85eb28fc06 SHA512 66c2e18d13961fcaae9ca45a04772f13e18a08f1097ae543a4b2828ad9d8d91526259fb978d2476b67804068c8f3b48466ab2f1fd840debeabf43174111201b1
+EBUILD qttranslations-5.11.1.ebuild 374 BLAKE2B 78434aeadbd9e4edc9c95e3558783ceff7eab4f1f0bfb2ce9bbd7d6b97becf7e4df1b3248e41fc643457db74c3fd6a4bd833d923a0fafcdaeeb5305cb799999a SHA512 c8cadc2a696075326234300b9d334cb1aabe0280f0c93e25d744a2d60211e0f1053a9485d3212b08dd87abbb0a129c34cc565a545297f811000062c2a7d7538f
+EBUILD qttranslations-5.11.2.ebuild 376 BLAKE2B d1c640fc1b82c4ea81740accb46b71c16ffb5c8157b9ce5d45d3e491609f81411492b62c71e333187462d25a6444a166dd5e47acfbdb81e9d688a79cdbc7c2f9 SHA512 544542ce2a63cd9dc3137b11d6c28cb362adcaeb5c9e83ea6ae9d116f9618161c5505e9c2c8a1889be79e5b38020b76ede84d37d09b788411d1e6e1ab28727c1
 EBUILD qttranslations-5.9.6.ebuild 382 BLAKE2B e48cd9bfa6760084f270ff2ac59a5e9ffc2ffa8b8987a595e78796c63f55c499bbabc8a24a66a44855554e46f82c89c7e8864b53b602606292a6a706deb278b5 SHA512 09a02e30a4c555daf85a1f361047f90a08d85231ad8bed7b85ae5a18dfeeeb56663f88cf215e46286534d96c2da2e53640169db3dcb43b77f3e16f91880e8c4a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.11.1.ebuild b/dev-qt/qttranslations/qttranslations-5.11.1.ebuild
index 0229115262ce..49c47e4fcc1b 100644
--- a/dev-qt/qttranslations/qttranslations-5.11.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.11.2.ebuild b/dev-qt/qttranslations/qttranslations-5.11.2.ebuild
new file mode 100644
index 000000000000..a79413a78db6
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-5.11.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Translation files for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/linguist-tools-${PV}
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 2e49694e9c04..572de0db8a3c 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,7 @@
 DIST qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz 10648700 BLAKE2B 32ee4cff4951347d8cc6ca9bf34a983017520acd5692322e3409db27fa08aeef2784302eb326b95bb55ea9f23a113f20370bd2d2fc64496919205eb6d9511c13 SHA512 e3010450553cad42850b4cf1b07e157b30e9a6a74b8c551e21ab45a04da76e55e83c08b4421c081eda44e8928c8e0b69f9c8146855a4e02bbf3779f5a0e290d0
+DIST qtvirtualkeyboard-everywhere-src-5.11.2.tar.xz 10690564 BLAKE2B 99df56ad56f1472118a13b16d099de6be992b3d04718ee80b87fdcdb875299aa262afb1fb6c7a11578db1d79ed7c09a2b2edb1b6ee0ca05436999f7862072aca SHA512 1a471a719771c3a07b8d7b524692bdd085eae1787b8e91f523b224c260bc950b514ce88d885bbbe90c1556619bae15c59debfb221ec01042885d71443e046912
 DIST qtvirtualkeyboard-opensource-src-5.9.6.tar.xz 10045984 BLAKE2B 22d15eb3a6bdf8fa490eb6475785ca88a0c9f07f25e37c41d9d0171de9af71e3124567184a41c7b4e25a49edd8f794325a0cf141d8fd7f9491096b7a3bc5245a SHA512 a46dc3c387530f52be0b1f989a9bf9d01e363668d3e57142c40588b72457eda2bca2f3aca765a23db0359d070670bb6583a6c91d960ca7d87b118397ff453e5b
-EBUILD qtvirtualkeyboard-5.11.1.ebuild 1018 BLAKE2B 5d12341e9ad1471f01d690b428e0c197951744a3bc67ca4a5cc0403825b1eec9518eac44d531f511558f63889ae7bce2ae19c3281ee8eb195c3b419620efc109 SHA512 2b63dec804b4583f9bfe66f4babb537b2bc408bd8e09dd25c1f63a67c9d8d6a03e251f56bdcf05a3909a680d0a20c9280d7036de5edf1afc68f5bc8752296905
+EBUILD qtvirtualkeyboard-5.11.1.ebuild 1013 BLAKE2B cd6b395131cd0668314b1ee7dbe5135ea36adaf910931a79f37732e682c6605701296354fe9bc5ad51dd23bd8443fe9b211dd92d54874e68a9e7817a5a916ffd SHA512 1fa008dffca8f53fc510040bc83db15f615210f602617a2d23be946ab18e0aaa7942be482a61076492f8e7d6a1a6f406349ef66f983d376e7e54da8797f76694
+EBUILD qtvirtualkeyboard-5.11.2.ebuild 1015 BLAKE2B 81feb6d047c1bf5acda615b83a277637aa5103506675d7804b79926fc9236a1ac74096df93757d2d41408141428de9e7238882bfd29d2d5e4cf79d9b8b892b64 SHA512 79d7a768ec4ceb0030f8c0f3e1d7d91b046963dfe083bbc7821c61ae78706fc655c23904c8c05ac1c4061d2ec2eb30466a6704c21134cfafb2b8dadfa91d1616
 EBUILD qtvirtualkeyboard-5.9.6.ebuild 1016 BLAKE2B 5260dc083a9159dcb1b3948cdea26e7d0ad6ff17322830876a90352b9955b3514e62412403cd8592e13ec4131ec4ce304b5d19deefbdf1e761fd2deb34020243 SHA512 c546cdcb5d1ffa3bd637558aa16a7147979aeb7a06e3bb49bc34754dbf70c8138d7aed9c08ea2feca4120b495dac880b76c2cdb3b895e3e82750469e19fcffc2
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1.ebuild
index 21fd992d37cf..ef1abb62958d 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd"
 fi
 
 # TODO: unbudle libraries for more layouts
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.2.ebuild
new file mode 100644
index 000000000000..402085ac38f8
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+fi
+
+# TODO: unbudle libraries for more layouts
+IUSE="handwriting +spell +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtsvg-${PV}
+	spell? ( app-text/hunspell:= )
+	xcb? ( x11-libs/libxcb:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myqmakeargs=(
+		$(usex handwriting CONFIG+=lipi-toolkit "")
+		$(usex spell "" CONFIG+=disable-hunspell)
+		$(usex xcb "" CONFIG+=disable-desktop)
+		CONFIG+="lang-ar_AR lang-da_DK lang-de_DE lang-en_GB \
+                        lang-es_ES lang-fa_FA lang-fi_FI lang-fr_FR \
+                        lang-hi_IN lang-it_IT lang-nb_NO lang-pl_PL \
+                        lang-pt_PT lang-ro_RO lang-ru_RU lang-sv_SE"
+	)
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index d7f4f6b310ff..f7fd2d4947b9 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,5 +1,7 @@
 DIST qtwayland-everywhere-src-5.11.1.tar.xz 392200 BLAKE2B 2e65c6bd8c9ea44ae84f608312db6983d540382bfb2a22412fe054f4e7253d70e21f4d0577653b246de5b0266271e40911a7c79fc28b266cc29ff30669df280e SHA512 dc1327ef8cdc9ed9521e9db316da0bcdbe9639b714a2dda7a792c52ba5897ddb75deba1ab89e010bc05cc2a96ede781b9990f5449ce4a2f85e15466a4d6d82ad
+DIST qtwayland-everywhere-src-5.11.2.tar.xz 387644 BLAKE2B e590d0f83e89a2ea33f4782cf295df4fe8ffc5e3767dbcb81ad633a2de35eda714e28a69a9c95263786883fff66a25ce5e9b52dab9929f499a0b8dab90489cc6 SHA512 27aabe18cf876afaf9da9e9fa91c3efa2c024229a6cf4746eefc4f4ea71f125a95ca52f887a42683d7743d3f876efe927001b8ee5580123ba5f4c4d4dea24013
 DIST qtwayland-opensource-src-5.9.6.tar.xz 316152 BLAKE2B a1ebbf98eea9ca36f8229ed0bdfdeb79eb9d1519ff35eb153d7f8b7af2ad9831905e564464ec1faf793a7b11088d43d6dda6dc21b36943fccb569163c119a30a SHA512 7376f76001323d7971cb3be7592086b26c855d8d702184e84f28656b4262a9780b4cc0a0991c97ca011863570b6abd63b006c78021934e1516be65715f82ae4b
-EBUILD qtwayland-5.11.1.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
+EBUILD qtwayland-5.11.1.ebuild 902 BLAKE2B 1349980e1c109b56baee2bd2a0066dd497f8851024f1b90618d6edf67538a29763b779fd42a801781abeaff2180518eb6ba15834c55f871a49ebd58cd3adf241 SHA512 5e25d3b4c2611953f0f266b746c2285456ca3eb418dac9f759346120512583af9cbe8f296273b88da7480015a8b172f7d2cca175981c8c5e2735ffc924d8cf1e
+EBUILD qtwayland-5.11.2.ebuild 904 BLAKE2B 0bd333be3d951b0ae63e2932ed7376d638d4078b33e2fabed721fd7f28460d8308fef85f9618d870fc200165bcbd42b188fbe3bcb724a3705b219239be931fac SHA512 1842b4094dd7ee1004342ac2d50294fc8dd1860df4fb804dfbb6d2d58b39783d431e7947d3cdf853512806feac5ba42f6d472af34c0604569d0b06e3e8c8805b
 EBUILD qtwayland-5.9.6.ebuild 910 BLAKE2B 43718b86e317b59b1940328d13c634fc4283f1c307b16cb06d49a1d0c8a94fb5c7f1e02e99706e2efa403b3ec4d7bff193513669af94f641281849b4d47b8528 SHA512 4085dd400ec562b46b0f1117ad52f269e726ed62e6a8efe9597193074dccc162e9181a9d7b06eb7922e765d8a2ad3bb2c87a3cd24be31f1b4c1b9125d0d6580f
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/qtwayland-5.11.1.ebuild b/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
index 4c3553046dbc..0a6dfec7eea2 100644
--- a/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwayland/qtwayland-5.11.2.ebuild b/dev-qt/qtwayland/qtwayland-5.11.2.ebuild
new file mode 100644
index 000000000000..ff62f71d3a79
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.11.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+libinput xcomposite"
+
+DEPEND="
+	>=dev-libs/wayland-1.6.0
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}[egl,libinput?]
+	media-libs/mesa[egl]
+	>=x11-libs/libxkbcommon-0.2.0
+	xcomposite? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_config libinput xkbcommon-evdev \
+		src/client/client.pro \
+		src/compositor/wayland_wrapper/wayland_wrapper.pri \
+		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+		tests/auto/compositor/compositor/compositor.pro
+
+	use xcomposite || rm -r config.tests/xcomposite || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index e95949d23268..bd05cc47e8e1 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,5 +1,7 @@
 DIST qtwebchannel-everywhere-src-5.11.1.tar.xz 179700 BLAKE2B 05f945110ec743aee4357ee696bee4ac230489c816b8cc630c6cd1344b5c385412470e2d4c6c7ddb2f044a17e2fce70f62d4244accac0e394a97a8ce638f3c72 SHA512 e0a18919cc4fe858eb1a623fc4e79c2936b4ea390d23611a708dd8fc26aac4ecbc262a5b0194f0a4df1fbe69c53568a62183e5847e0bf4c73cbce2122170e0a9
+DIST qtwebchannel-everywhere-src-5.11.2.tar.xz 173956 BLAKE2B 8c19c56960e6c19b84c4959507779b698ebd836679e139bb0978a13b9a14407563cd6d57f6bd7c91616360147762da1b381c1d463920b60e7ca98c059d4fa271 SHA512 16603c52631180f2e84e274e509159c7c817198abc1b48a9e921134f2362aa5ececdab50212b1a1df8ab3feda4b4ec638a26e30397ee05ff27371d598f8cc643
 DIST qtwebchannel-opensource-src-5.9.6.tar.xz 147564 BLAKE2B b94d420e8b694aef37c620ccc2c8dbff31887686e8afd70ff547e7466a6dff21457872b6a2aafc15d676005db85b202fb8260529d94078279e5ec1cd3d9e06be SHA512 f2c4ceb7efba18ffbb2b3bf11b04c158c601ce82eadfcadeccbb81405db0ff2275fe4a5706872adaa6faa6ab2c1f1f6b6fdeeeb09e127e3b9dbfeac5a4eb7ab5
-EBUILD qtwebchannel-5.11.1.ebuild 572 BLAKE2B f1c0e3733716fde195c07c6b5902259a7f036552727a4ac893c683ac6c1ab09b82ded3ca27f1ff5bda111830112fc73c7538f9b015d7c8389bcc8990683891e7 SHA512 f05966782c48702b6523f159d3b5d138b4c85946ee947834c4fba0325c2260d5e633b0fadf5a43c7ad60d678e67864bda3556c35ed5dea8ff16a9ad8d8b6a1b9
+EBUILD qtwebchannel-5.11.1.ebuild 567 BLAKE2B 3611f3d1d0cfdb613288aed79988d1fc55dc676fc93d46a23d9621ff1bc8f5fd706fd405ec64c473b4d619a7bb1b2ad8defd2ca8d9f13163a9e6a852be671e5e SHA512 9ba6d594fc44f92f1b7bafc3c3864f7383f5ce640b67891b11b60e31b140ed6cc59490eff808edeb4e6182e771266ab4e94443e3f84cf6a57591a888412784e3
+EBUILD qtwebchannel-5.11.2.ebuild 569 BLAKE2B 88348471bb15e24e17aa03085db485fcef9c55e434d1e36a49948761885fdb7d30ca319bbb5c681dacde1dbb510e39d908da40c00b419abd4a006dc5b1682e17 SHA512 c2847d58ab9a0219c8a5fefbcbb0577ef36ff4c3438a6a64f6c5943fcf4b16a2b28fe2dbbb5930f586ffcdf3b6ced29655149a962451f326fc69174c05e11304
 EBUILD qtwebchannel-5.9.6.ebuild 569 BLAKE2B 4d7267cc1d6fd82cc808286fde721b94bac1832c90e2068f6881a7d22a5d34a37456874facc9ea2ae9e380ebbd6f4e80dd5966e84a0108725b0dbd4d85c976c6 SHA512 b904499212ae7397168316e94742abe5e8584bbcbd0a5a15f4c1f1a50e874a18baee0ee27c3645cae9f20d55028ecded5f45f28609f9d8c1289537fb33e42409
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild
index 7f4acf242e82..b79ef36e17c1 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.11.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.11.2.ebuild
new file mode 100644
index 000000000000..d08439f261fa
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.11.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick src/src.pro
+	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ebf62e4e43e7..43e49d82bcd5 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,7 +7,9 @@ AUX qtwebengine-5.9.4-jpeg-9-1.patch 2782 BLAKE2B eb52d5ab51ca47603f3cdf684e0d34
 AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b87897e4b8df045b81090524e84a90e259d7824521e71639eec5ef8cfd86c5823302846bd1a05dff3fb39d5b988544bf46b SHA512 57551a4859791431d921fc0f514332d408f43c05ead7919468727069e01b9cf3cfe70f5ca014af57b8842f8ba745d1abe5838fa271d354b775a520ef296bd6a5
 AUX qtwebengine-5.9.6-gcc8.patch 1184 BLAKE2B aea72fb7563517f6c1f0f1330bad21ae71bbadc7b74e13b5c9280074ba5ae642be1df6c6e3014464f4b9aa26dd5620b5c5ef5b7139256c6a48fe58ed911e54e0 SHA512 21e79c6fc1575728d658c31bc68da66a5b9840c6fee7c442218ec8ac6009d5df1436bea931aa56439965987ec1ccdac32afce2b0a246c3d7bb2d0b0536717be5
 DIST qtwebengine-everywhere-src-5.11.1.tar.xz 233633572 BLAKE2B 06fb9d490377ebb4af937e0fa1688cdfeb9bfdadf6c80afeef609d20a76bdb7c4fed6c1042405b762e59b11d7b16369990c66a395ec1b6b48bbb1ea5b8cd47f2 SHA512 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
+DIST qtwebengine-everywhere-src-5.11.2.tar.xz 233642812 BLAKE2B fbf1ac14cec9a515fb9c401f1a04487aec2ebe1b64103db5ec2625791356cae71ff9a0048d3485d7fcbce4e0eb8bc77550f99b19542c7a0f8b56f902df4958cb SHA512 be8db67a9cd46bdff24a4fc3882193dbe2c7bd487822ad7345bf3464f8c21713b6e459867c9e9678bc33e9d14ea7e09cbaa171139799810c131c7b625c742e64
 DIST qtwebengine-opensource-src-5.9.6.tar.xz 216733460 BLAKE2B 6f6f4d89559899b7faa6c8a31187967e5dab357d63f6c096953bdffa9ff8e8299f22f3fe97bc5295093a89200b38f47b4b214ff91765f8da3a992c5058f06e1e SHA512 493e9b4fb7274253eca107bfbb6ff044068c78997299c48b62a504ba5511c4d3e2a7f481d986f34c75d035e4804b18f74bf6a4bf0daf0f6a5778abd8aa7ee68a
-EBUILD qtwebengine-5.11.1.ebuild 3547 BLAKE2B 8447731a8eecedf77413cb0013915491689502a2606578b128397d4cdd20a94d56faaf3616831158b3e256c9f3d05ee22059bb3029b769ec43a17ee0c03c2d5b SHA512 f0110153927e6a9112e143077ea2e52a078367328577586ece5e876eafd0663d9cc3404040f0a5b7a997f5e04161bb45bd3c5d89b29e83924c843d5e4f981e49
+EBUILD qtwebengine-5.11.1.ebuild 3542 BLAKE2B fabdec89cf02dfcfc6d42664d6ee4bb7fe8177e643446cda3ba05d459b96eec894306bda35f4a681ac5ea1ac624dfb80f53b2ecaa3caf78c766906963e1e082b SHA512 834c4c481f1841904bc579bf289b4b62ae6be2817e08e2e1f4cde74864fd428a222244e3ac3d313590c591969633c5435f024c90b803218859cba78c8d56444f
+EBUILD qtwebengine-5.11.2.ebuild 3475 BLAKE2B c672a878286acfaddc9f9ed1618a620631be9ccd26ce1c7149387c27e201b5ec0026a090ee27614376da0c163a3af5d9ff312ee901431543e6098db0706e0788 SHA512 4f58f75f3ff927485c71852ee311184f8afa6bc6166a39db69a12bf14fdb37fd40aa0e07b40da475b1357c45e89c22923bb03e58e52d7e30d42e65b583b59f40
 EBUILD qtwebengine-5.9.6-r1.ebuild 3411 BLAKE2B 146d96022668be866f724a8905c82ed139a517cb68492dd97c554c3389e97b7fa4125afa5b4ca343fe4057bccc9efa25566ebf76d26d9e40b43968838cbaa96e SHA512 6d84cc73e712355e3c0069d753556f0f9e8e64a89a4574bde151bc776fecc67f01923c973af64258163ebe9d5950582c6bb5fd02ced78c121f86e3c6907a7066
-MISC metadata.xml 1096 BLAKE2B a4b3f106b5a3ea4468e6b1b5b458b69f310b0a89b02ab6720d13a6df727686570385f065caf84e782a4043b9027823dbabc5ab67fec209db97139aad64aae1ed SHA512 e3864852c1da88f27b5d384ac2b63b2e93551db73242be03283dd2a23dc27835f05cd7ad8655053b24a06a7d402c3ba1142f49d3ae72a2cdd4cb778b09e8404a
+MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index cd7c273bf4c3..acca7340ba1a 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -10,6 +10,7 @@
 			<pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
 		<flag name="geolocation">Enable physical position determination
 			via <pkg>dev-qt/qtpositioning</pkg></flag>
+		<flag name="jumbo-build">Combine source files to speed up build process.</flag>
 		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 		<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
 			instead of bundled.</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index fc11c5106e8c..ba8cd487b93d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
new file mode 100644
index 000000000000..a057c51763d5
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit multiprocessing pax-utils python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
+	+system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwebchannel-${PV}[qml]
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/re2:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libvpx-1.5:=[svc]
+	media-libs/libwebp:=
+	media-libs/mesa[egl]
+	media-libs/opus
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/libcap
+	sys-libs/zlib[minizip]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libX11
+	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
+	alsa? ( media-libs/alsa-lib )
+	designer? ( ~dev-qt/designer-${PV} )
+	geolocation? ( ~dev-qt/qtpositioning-${PV} )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( media-video/ffmpeg:0= )
+	system-icu? ( >=dev-libs/icu-60.2:= )
+	widgets? (
+		~dev-qt/qtdeclarative-${PV}[widgets]
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	sys-devel/bison
+	pax_kernel? ( sys-apps/elfix )
+"
+
+PATCHES+=(
+	"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
+)
+
+src_prepare() {
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+
+	if ! use jumbo-build; then
+		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+			src/core/config/common.pri || die
+	fi
+
+	# bug 620444 - ensure local headers are used
+	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
+	qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+
+	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
+	qt_use_disable_mod geolocation positioning \
+		mkspecs/features/configure.prf \
+		src/core/core_chromium.pri \
+		src/core/core_common.pri
+
+	qt_use_disable_mod widgets widgets src/src.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	export NINJA_PATH=/usr/bin/ninja
+	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+	local myqmakeargs=(
+		--
+		-opus
+		-printing-and-pdf
+		-webp
+		$(usex alsa '-alsa' '')
+		$(usex bindist '' '-proprietary-codecs')
+		$(usex pulseaudio '-pulseaudio' '')
+		$(usex system-ffmpeg '-ffmpeg' '')
+		$(usex system-icu '-webengine-icu' '')
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	# bug 601472
+	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+	fi
+
+	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 4d19565cc0f1..fafe6277d186 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,4 +1,4 @@
 AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
 DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
-EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3682 BLAKE2B b7927633dff0c5164841ac131e33312da8ef11353ac5cc30f95c1028c61b5d5cf7e5ec1b9c03526e4ef593afee8771fc66eb7cca24e5e86791a9ac8e34f917d0 SHA512 404d039ece1c9865a1b629bb2ab79a497162740878e6aaa8f62975f4ba36193d3962a9c108c06408188cd38b0eef4801f54a572103dcecc5af7e9a3eba94a027
-MISC metadata.xml 1286 BLAKE2B 61122c95e3fa0f411df1923511df20b059237bf11788a1932e8051d63120ef752c3e73a6a6b6a32e260ae8604e317241e024ae82d3c1c9dbe3d0567dc3565e2b SHA512 4f5bb2036a92a35fcd6dffae3bf3ed1b0a1e55c685765c5374659c909261d9f56a0c31f278b9fd151c0e86601dfd4ce91f7ed0b2de3c2a8afcea26efbaec9c03
+EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3712 BLAKE2B f65061c5d552f394d83e7ff08e2d7282d1e9de526b04c528b456b9c98f51e0c5a287702966dbb6e7285b3b543a42642b1bc2a90e7d0ba954554d648f98ce3962 SHA512 3f3e5d90e272de0cbbc73a954c4e833d9fa207d285f2a271831a38410d8dd7bc754b6669099414fe3ead9018e99172586d9c40cbb519ba82edf481476319c984
+MISC metadata.xml 1225 BLAKE2B 29d533721955dea3cd9f1d23494438d3abc079d713cf77d707920a765e3eba4e2160d0f80b05ec2ba8cbcf7999aad51201bbf002e8b59161bb2d0d85cd945e50 SHA512 b382f115f4705a577e210760d499fde421d0091818914674f0c2eb7fc4967d19d5dbf752be19f43f0edb27493ebec58b89e07a65ffa505842a089d06353aa122
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index f76a3bfaff32..342794051c12 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag>
 		<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
-		<flag name="webp">Add support for WebP image format</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
index 3896c99b4599..cee7596f99c8 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -109,6 +109,7 @@ src_configure() {
 		-DENABLE_TOOLS=OFF
 		-DENABLE_GEOLOCATION=$(usex geolocation)
 		-DUSE_GSTREAMER=$(usex gstreamer)
+		-DUSE_LIBHYPHEN=$(usex hyphen)
 		-DENABLE_JIT=$(usex jit)
 		-DUSE_QT_MULTIMEDIA=$(usex multimedia)
 		-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 43f9ce40e546..29712811d0e0 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,7 @@
 DIST qtwebsockets-everywhere-src-5.11.1.tar.xz 231468 BLAKE2B d115bd37e1223fd1333515c7abdacb01a9d2e38c847eb3b655b584ec8ea833634549c74c0483bcca25a5807c650c250301b02bb6b7d05e61bdef44062d95831a SHA512 01eb3fabfa0f46c6ecedc3cd9a05e504fef91926ffeab1f534557e50c15d7fd284edaa553f545d8363343a32c0c3187e77e3e5d6edea8331e9234c05c0e318fc
+DIST qtwebsockets-everywhere-src-5.11.2.tar.xz 225948 BLAKE2B 26d71fc36b544ef90b8f1ad0653b13d362e15e05b233776c1a0810734e693f78736f7a314ed949fc8803c9aa775f1388fcd279724c1f38a6b67a46835ac391d1 SHA512 28fb4442a5e00c1aad8f7d3e9c6828030a76d7e396b1ecc7743925fb3981a2d900df9c25cbeecf3247d8d6a54a11083d979681cff1171bb0b680584e954e8fc3
 DIST qtwebsockets-opensource-src-5.9.6.tar.xz 199624 BLAKE2B 9433758ad1cc8f929baebd4a73ffcaa6130277a9832bc43746ddf999870dee7080dfbe39c75d1311ac90a1aabec5b50e5376b24618f336fd660047558198d101 SHA512 3ecb44b6046d1a57ee85d261107b332f219aaed312712f817127cf0715f22ef3688192bccd86bc2057f79b9b1d69bfbceb3b8cac97ddaa33afc4bb3284b857dd
-EBUILD qtwebsockets-5.11.1.ebuild 539 BLAKE2B ef00dfefc365b70159695f236af006dfe992a50274970b1a93ce1cc5141f891887c75fdd4a99b00d37c85980897e03928d3f006192cf31665abca761f5e29dd5 SHA512 f91f054e63e2db29e3ba473d0a9c8f9c3d183eb878d816cd209438cc9cc2d882aa80c2f6774c43d14a1aff82026f55d403f881ba4be90efb11e73f3cd63969aa
+EBUILD qtwebsockets-5.11.1.ebuild 534 BLAKE2B 9fd30663cbeec04977f7f35ab4615b4e8db153164f4b3f3a6435b3ec49b7839753c87469911b56c048e403f3977948216cc17eb73dfca4a0902c6abd02c8b515 SHA512 91d5b7219e7af9b8275de3e280c06a54e83b56d41a2d769d150de6566db043ffecd8efe810adc760ce7c2b9d12e958bb11c9507d8f7c56360732c0f2375a75ff
+EBUILD qtwebsockets-5.11.2.ebuild 536 BLAKE2B b6d1d38b0fe99e5340be0a2a654575009df7b02bba9f4966594f5993ea95f9ecd2275fe96ca0fb7396e4aed78a82f13287688dabaec973625e020e31a7c91d8d SHA512 aa6de0da74f78d2b002030795f9081b1ad2fa62f3af9861221450f59fa7afb42453bcbf93de9cf0bc531f2bb9ea241908303624a4cb4ce457d51abdc0988f468
 EBUILD qtwebsockets-5.9.6.ebuild 543 BLAKE2B a0b04c917edb5f8ac4a436c5748b1c7edc9086b58db86714f66c2778662e24c8ececafabd1e8adfe723d3e800e17824d622228ce52f8afa87e624f705f7d0ddf SHA512 4d6633d72a3d217b6753ccbeafd5c749cca3ba15ea0884850a1ee3b4bba9061d320db40c94a85e08647db9d2793150a116a43a3c1700a8f31bb22cec8603529a
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild
index 362a0a81c42a..763b5c53a101 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.2.ebuild
new file mode 100644
index 000000000000..5923e0a464d1
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.11.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="qml +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}[ssl=]
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 1b7f35172e13..e1e2a187f395 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,5 +1,7 @@
 DIST qtwebview-everywhere-src-5.11.1.tar.xz 132948 BLAKE2B 7e6fb1544a8cdae2de4cab8d2c42a154eadc79a67a1295311f67c94c19d50d81f578db8749fb02ee741c98ae3461c638b4a8a0cc109a2d95a4670522108e4e6c SHA512 e345d89ee30ed8cc7d087236c63179f887a81f81d41d0db15cf4f838aa38fbcefcaa7b880e82d80de5703610cadf88dd30dad88d44c8b27257980c214a98d2ba
+DIST qtwebview-everywhere-src-5.11.2.tar.xz 127124 BLAKE2B a4cd730deed942779bda655e8d520b85518a7a66679e3983c35ac647bd8f3ddfee6b4b10724ebb418b75374ff10695663dee72edcdb064b1aa5e72bbab02e6de SHA512 e4ff35900a632c048423460219329b5aab8e2808fceb9ac3b981a33c4a52a2b0b371f801fb5c966f830b5d4cb2f21a5046ce61aa85444aa1ee9fc12b30ad435f
 DIST qtwebview-opensource-src-5.9.6.tar.xz 108724 BLAKE2B eaefe9d68bdd0c68f569f9f01bc403a49e36f7bc20859a79225575d13a653eaec741b986917faf91b50188052c811841c85d438104ff0ee9ed5b6a83274b0860 SHA512 dcb3e038737297efb2f58820de386e6ea349d65cf5557116aec34d3115bf7ab2de528365cdefe7433bad6b94ebbf210a282a6018557eb772db5f41909405638b
 EBUILD qtwebview-5.11.1.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
+EBUILD qtwebview-5.11.2.ebuild 431 BLAKE2B 96ff53e5940f693fe9161407bf19f03bda6932a0fe0344dd86018c3ba27310a1d7e7aced3775fe815e7f78f2a447839729690a38f5452911622312316008fd93 SHA512 95bd6ca33bb0e4fda5f55b9ebdb786825ac22ae39ecea9a92aea0c74a0c9a8e0cfe98020a7937fe3d843ad465b2e8e04d5beb53732badbe5729c69d01e073594
 EBUILD qtwebview-5.9.6.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.11.2.ebuild b/dev-qt/qtwebview/qtwebview-5.11.2.ebuild
new file mode 100644
index 000000000000..9d9901e589b1
--- /dev/null
+++ b/dev-qt/qtwebview/qtwebview-5.11.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwebengine-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 357ccf0a3aa7..11f8b1b79058 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,6 +1,8 @@
 AUX qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch 5533 BLAKE2B 1a4db674e9d65134eaa894e13e2acdeb514eb98d841515e5573543387ffcd2ed6eae46c614aabcf61804a224ffdfcf1089d354c630e8c3186496ddbd6130ddcd SHA512 854c1b18627c5a243ededf28279fa3eb8ac208e495b8db54e7768340b25ffde84de0bd9e4b90044d35784a0bc1443071256eda59eafdab71718dc1c15ceaed0c
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtwidgets-5.11.1.ebuild 1070 BLAKE2B e6559941e58f529bb08555dfa7d4452d21c8e98393270fee2fee5ca05b42eb311cf84e393a79cf7a486b082c49feafc01a13e8bcd7688f32a60191464a546518 SHA512 9bc6750a0e51dbc327975c78fe83a0cbac8c58792b2ec05796e1801e10e7c5c30f9311174c48272bb00f1d208e3eb5d8f18f64297aae86330723c26c92e6c9b6
+EBUILD qtwidgets-5.11.1.ebuild 1065 BLAKE2B c38be42d57296d420e751e5b2309b734b20f2b7d6a8c4c2cf1125d74431921b0bf6a3db17a96aac09d715ea98313524e734b2e14982300fc4e2ae0e132fed45d SHA512 1f816bd3138f827bdb261cb2a20627d0859c6db99d5860ada4322a44317fa12890583d0c7a2da0e9029681de672910e084fc87c2bb61a7a1b473611a78752109
+EBUILD qtwidgets-5.11.2.ebuild 1067 BLAKE2B 27b34b38540cfeaa4d2db254872cf17623a4eddf5a82f13eba0975a3ea60623f371628bb56da1b29e9a6a2732b1fdde2da35c5b1e9c05f04242b5fa028f609d6 SHA512 5f55a1d3bf881049845f6bc07031c691861714dff9d27ed985ea3e4ad55be5a1e6f1b433a3bfa42f35815fda22aa5d739ddadd3ee631dc1987799b165b75df45
 EBUILD qtwidgets-5.9.6-r1.ebuild 1140 BLAKE2B 6589dfa19127aee73971a333cc4f3a177624f1adef02b80904d4c164bbca8fbf3fbb2068b4306e725ebbe538f706ec83e8e48af7f2c6a0fcfe2b8a60b975bac1 SHA512 1b12d48f414171a38cff101b2a84215a93cb9cc43602c4a50485aabf830e461aeb3dacb9ac145a382ed7752ac6f77fbae3f73adddf4f6e299db604b64d1a1d62
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
index c386278f6aa6..ae184fd6d395 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.2.ebuild
new file mode 100644
index 000000000000..94499ea10ec4
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 gtk +png +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+	gtk? (
+		~dev-qt/qtgui-${PV}[dbus]
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	gtk:gtk3:
+	::widgets
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon system)
+		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index cd69eb862513..5323bf15087f 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,7 @@
 DIST qtx11extras-everywhere-src-5.11.1.tar.xz 116368 BLAKE2B 49cc0cbc73719186d812b376b0ae02abf68bee2f22b03ca003761681af4585243c9388d13b3ce8a1257ced8b2a0db7b71188ef10925d123327606f2fad94b335 SHA512 a5acd182e06ced304bdb9d86982c3cdb826411ed4c888dfc530e5bf005f34ac9c58812bda3c98dde66eea372c7075f9eedd62a6e36cb8b549a56b8dc7a9b19af
+DIST qtx11extras-everywhere-src-5.11.2.tar.xz 106164 BLAKE2B 6db62fd1a1897f8c3abe389ae2f7cc65b6eeb892d3d2d3940afadd536f8c0b68c5aedf38fc80a9b0116eae05047b11835fb9caefa781a3a1856fd51b96b489dc SHA512 228365bdeb9ed286b65341b2741725bb7e0f25cd569a2deebe1f18dbd7214b6a0b4144d63e09774e729237bb5ea8ba6690f1fd3d7ed0bcee9eb3c0cc6cf8ea75
 DIST qtx11extras-opensource-src-5.9.6.tar.xz 76896 BLAKE2B f8f3d8f642bff43a74ea6e58492a566e87dc0cd6f17061dd95f98fae4e3336703d03a49ba85403ccb85f02f2cfa7fa554985d6fe19b7d5f055f3fccd73ec2536 SHA512 22bb33a40e242f54caca075ef53e1401ed82f094f87526bb24e8c85227ef56364c78b0c8287a173c38aabc7ca3be833d13d5156f3b3553a57bf74ceab1831be1
-EBUILD qtx11extras-5.11.1.ebuild 452 BLAKE2B 03e4b6931467751ff2b42e014bac822559d13a42fe619ecb238bfc94c027ee4dd657dd641e0222f997a9945fd71a945781b19e5bec2dd743cada0f2553987bbf SHA512 31b82272df6a7043a9ca2e35b43250cd9ed2a37bb94575e630c3a88f4019a709cebbdc56347df18d995e62fc172636d9a98d25fe2a8de6f923672a09373738d2
+EBUILD qtx11extras-5.11.1.ebuild 447 BLAKE2B f3f0791b6c34400a73977a4b8da29d0ac6314daad40a684b744005eacc83e8d6062fe9335bfb58439d0d7dde7eeb5ff3594422a1a2569d4367bf0814ef615bb2 SHA512 b2109bed413a98a0e34d2c00fffe26d845043cd52ba8ed84c0d6c5684c3736c791dc52d222f99885d9ed6d5eb1585cffe7ae523d08f749840a2359730fe8b6b7
+EBUILD qtx11extras-5.11.2.ebuild 449 BLAKE2B 5a97daf7b680d785d0bf9c868c8c244072e70a75ab283cfa2e8f0d3dc2c904d7b4bd47a5db6b5431f629dbb4ec51b4a1f098c3ca51d4fd3aff9edbecde75a399 SHA512 af62d5a9d555095caeac03a839c47f47276f53da9105b40419c5d75c7c5ac2e6e1fafac172bdb59c0bad431e3fec8bd1e4031347fa33cd85f37d350ed58730e1
 EBUILD qtx11extras-5.9.6.ebuild 448 BLAKE2B f94c0acb5c29c42356811f9ac229a995600490a07988f07cb9bd9516e7f979d2f757cdca96d44465db8089d8af3e4174df4721023a179d211bfe6778e278a107 SHA512 d306c55ad1e89eb9f257ec16ca8967c84ad07d575565600f8d555a88f49a01d822e8f15ddfc3aeefd3e99f277a269d64a383226ea664638c943319ce377694a2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild
index 9c207c9f415d..e1cfa79e87fb 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.2.ebuild
new file mode 100644
index 000000000000..bd545d306b29
--- /dev/null
+++ b/dev-qt/qtx11extras/qtx11extras-5.11.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[xcb]
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtwidgets-${PV} )
+"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index f9c87084d6bc..095e1ebe7f47 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtxml-5.11.1.ebuild 511 BLAKE2B 0da6673cd01121e0789d9f60caa191d803874fb136084893b246a9f11bd0919a94ff0f2e75c63c5719c804ec0b295c7dc7b9d462b6244cf9139b10b91b0a1f09 SHA512 35c035c4dd3c782166f4cfe9fd3bb76cb8ea0e0e3f95f974b57d9a2a684f924193377b211e8ad2ae30c968aca144197713b311dd19b947681170ffeaf8be1c1b
+EBUILD qtxml-5.11.1.ebuild 506 BLAKE2B d649346a073e35cc6e6a195419e1d4a1ff0adb707b82b26e0cf64c9ffad886a8fc5114bd718243f8ec5fa8fb69303848fb80fa18229426015abd7c147f85b873 SHA512 bfdbaa806ba293e1850e3cb0ffb738ee94922e1663af97765588ec7ea0abc46dcc85181de42076513607f61766453f00e9321121eed5be034afd6dc9de3863c3
+EBUILD qtxml-5.11.2.ebuild 508 BLAKE2B 6a98b92f5c929641f1c86646c13e283dd676653cd66bb7d01444bd9b3f46e2e87870827707c2ad500a65b6f406f59004b356068aec4878b731f781ded0b8c225 SHA512 615135d1fb97e190294c9fb8dc312cb73b2cc7002d2ed8e2dee0a32a1f2df0071f1df4c658932780f727dde4a3b23ffa09159eb982509cdc72cb6c465390b40a
 EBUILD qtxml-5.9.6.ebuild 507 BLAKE2B b572852e82ae20616836d734ecc8be38cb959449de26a8b7e26d695ea77d0f9300a0dc244e813b6df0023b8101fd63ada972d9147a653764d0b52467f661f786 SHA512 a9fddae162b13948179be9c38258a7be6b312b6bb926684eb55ad7c37034f2e47e1e8cca41dbb1e8b36cab730da77d56c60498aaf849861987167e5c95fb7386
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.11.1.ebuild b/dev-qt/qtxml/qtxml-5.11.1.ebuild
index 3a1388512fcb..9989806d0ad0 100644
--- a/dev-qt/qtxml/qtxml-5.11.1.ebuild
+++ b/dev-qt/qtxml/qtxml-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.11.2.ebuild b/dev-qt/qtxml/qtxml-5.11.2.ebuild
new file mode 100644
index 000000000000..409b8fee4ece
--- /dev/null
+++ b/dev-qt/qtxml/qtxml-5.11.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/xml
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:xml
+)
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 4cb06c9a4007..df5dfe4bd018 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,7 @@
 DIST qtxmlpatterns-everywhere-src-5.11.1.tar.xz 1378340 BLAKE2B 53675d44da768d322bd6ba8de30d4ad00f370c79aa871e1a80184df4cc9ce8d45c13f6fb3a808660a42a44c034b14929fa7dbac52878642057a49a4a778d20c9 SHA512 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066
+DIST qtxmlpatterns-everywhere-src-5.11.2.tar.xz 1372836 BLAKE2B be9e825b78dcc027822318a6bce7b6e05c326e070bedff9b7d0c403e4e04b92186a1e1ce8a715acb830c14893edf5ceea119490ed4aa1a1a35369f85caddd146 SHA512 f659de3da93f83a215914a35b32dcd7d585cabae30044e8d512cbf2a29514043b18ad512e18e6de5b99546ddee2475d807f42e51baa46f15488841314372b26f
 DIST qtxmlpatterns-opensource-src-5.9.6.tar.xz 1344204 BLAKE2B 08478bdc81f49fb2e24a57a105f537000b945537b172392b56751614473bc63c8b2cc4d3c279a91b7ef0e68490d01655b6dac7f5771754baf73335fe3117a12a SHA512 c1b7983725cd208b207e366f3fcaedf073768cbe11d6c54c4569b8155e2c97e4af889792600d86769b7e6828409e0333ad7c66b8459d07c5c1a06268d28d6788
-EBUILD qtxmlpatterns-5.11.1.ebuild 434 BLAKE2B d7656992726ff06b9e31b8c6026ea0ab9c94ad945ede3c5fc13e2fe1593b5def96b2095b9d82feaa85e3d52cf5581ca71dd640865bedad6813f2ab84ea4e677b SHA512 c86e7b47f605504322770d3ba3c153b3fe518bfbd60d9ec530da19897689671e524b0a96dad7c01dbd24ec858179d6b54cd6aca4bae2800adda620f53738e942
+EBUILD qtxmlpatterns-5.11.1.ebuild 429 BLAKE2B 09222957a875baaf85078386f4f7527e40d4d75dfa59cbb2b2b3a3a5a0ea472c2146ffe81945b731cf09bcfebff7ba39104b4ee8ca7dc4656c7d7b52959ffde8 SHA512 b7aae68a210d2c7d820a8ad2d91713865c79438e6dc37b7be329737807cd92bc8064ab262571b5e8d3e454884c9e8561b329a033d7f15da7a22ba5d80055ebd9
+EBUILD qtxmlpatterns-5.11.2.ebuild 431 BLAKE2B 46e600148b8fed6de9ae51db40c78b125ccfe6f2b9e286157f44eacb741a96ca1e8c2667f321e9fdef1132e98748b4a0756f7a84dbcbbad08d07fe7a9e72efc2 SHA512 5893a02063dff70b1b0ce327e6bc91108c7024aa67fb45e58fd21e8c12f9bd9a757aa09dd268b71916f3934e635de7b5bf602a847232141b16529af8ee573ab4
 EBUILD qtxmlpatterns-5.9.6.ebuild 430 BLAKE2B b929356d0737c29defd75f5067acd50ced972c1a0b00e23c3eacf0cf4199f0f61bb4ce927d545f2a26319fa93c55d147665d13cb9b172aaa11fd47ecb6ce75f6 SHA512 425b418d24e22e5d98951603b90e24f8e42ec3510fcbd9c9aa7c176a890402865083ae7da9dd66e4dc11636acd916b91083aed6d1bc13e97a7c367b4522dd08a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild
index 56bd007a97fa..45244244e037 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.2.ebuild
new file mode 100644
index 000000000000..cdc8ca0fcc4b
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 34a709736e57..faed2aae7e58 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/combined_robot_hw/Manifest b/dev-ros/combined_robot_hw/Manifest
index 0dd4943e7a04..85aed79ac623 100644
--- a/dev-ros/combined_robot_hw/Manifest
+++ b/dev-ros/combined_robot_hw/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD combined_robot_hw-0.14.2.ebuild 469 BLAKE2B e80681e6738a357fa581c2fd6e05f1063720760dd72a30353390a283c35b52cc458f77642375ebd5904d6c2e807b9db26d90ecd0e238923fea9153ca66f52d5d SHA512 7310b5b0cd485a9afd95ea427e3bade40e4aedfbbaf2ba1fce36bb36a832b3375a8efb5e49f5b5705a2d6b13e3009c63f3bf240b45a8021ef79552134db3efa0
 EBUILD combined_robot_hw-0.15.0.ebuild 469 BLAKE2B 044469c633f200170ddd3d070f98288bdb743e6ecb4c629a50d04a5bdd51508b9eddc1b192e9eb941400e62b6f307f838552c1d3598d292b12cff0eb9b34e0b9 SHA512 f3c945807062eac38f6e83fdcb1431d05f78d1cd88c1907754e205f56ca00a5f046377f747e19d4feb888e30df17675ed2cc3842dbc53ac46cdc61ff61bf8307
+EBUILD combined_robot_hw-0.15.1.ebuild 466 BLAKE2B 70b3d23b6b256ab8ebd4c24df2f77618211758b0df214fb731ed3877f352269d19c74961840996ba86708cb8ed772884dd9451654d7576b626d8884c77db3d4a SHA512 94b74ab03c6db3bd88d0fdc37b656e540075cb9c66604d1555faa2fe14d8ff70381802f0414cff60ac5a2476d852bb3a8a893cfaa398ec8d95300b7e17145a39
 EBUILD combined_robot_hw-9999.ebuild 469 BLAKE2B 044469c633f200170ddd3d070f98288bdb743e6ecb4c629a50d04a5bdd51508b9eddc1b192e9eb941400e62b6f307f838552c1d3598d292b12cff0eb9b34e0b9 SHA512 f3c945807062eac38f6e83fdcb1431d05f78d1cd88c1907754e205f56ca00a5f046377f747e19d4feb888e30df17675ed2cc3842dbc53ac46cdc61ff61bf8307
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.15.1.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.15.1.ebuild
new file mode 100644
index 000000000000..3b7d67c426e0
--- /dev/null
+++ b/dev-ros/combined_robot_hw/combined_robot_hw-0.15.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/hardware_interface-0.15
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw_tests/Manifest b/dev-ros/combined_robot_hw_tests/Manifest
index 5972ec7becf5..25ad1668da61 100644
--- a/dev-ros/combined_robot_hw_tests/Manifest
+++ b/dev-ros/combined_robot_hw_tests/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD combined_robot_hw_tests-0.14.2.ebuild 589 BLAKE2B 4a175543e9901120894ca1f361f683d5e54fd1a22422313e46acbef335b6e6367795ad8805f4ba0313a3febcbd303df21d1c61ed0e1698a5c85f4df6cbb60692 SHA512 b6d58964feaec3d7bc88230a61041362e43baea4de3e2684258a508940fd9473745890074c90de9d02ca8c9bbb06c802e3cf4c44980017f96644e47ef874b173
 EBUILD combined_robot_hw_tests-0.15.0.ebuild 589 BLAKE2B 4a175543e9901120894ca1f361f683d5e54fd1a22422313e46acbef335b6e6367795ad8805f4ba0313a3febcbd303df21d1c61ed0e1698a5c85f4df6cbb60692 SHA512 b6d58964feaec3d7bc88230a61041362e43baea4de3e2684258a508940fd9473745890074c90de9d02ca8c9bbb06c802e3cf4c44980017f96644e47ef874b173
+EBUILD combined_robot_hw_tests-0.15.1.ebuild 586 BLAKE2B db81f31c6d64cc9c70e986d840cb553d9020c769dee49f3739b3c3d24864970f57cb51f27abef12017395b4ba58068e10482a9b31433378bde8564710f4104e1 SHA512 9be8857413fb81279341f3a4c5f77c70b8a947b4b281404c0f639acf2dffddfffaa4178a691be50b4a34767227efddc759cc1b76fe8028a7b311feeca6077350
 EBUILD combined_robot_hw_tests-9999.ebuild 589 BLAKE2B bad2e5cab92497c62e4a0d68b3db266c0e0b943d38ef10061137a3a6dada62e7e900faa4b4668d5632ff560d8153f2ee6d1c6c6948bb6e4b97810903fafbfd58 SHA512 d712002b21634dad8314f7bceeead5210a093fc433aa03ebe22db5d0ccb94f09289b2c78c7c6df143f660ba89a6aafd61f5279bd1c7ba5ffe93034f9b897d3fe
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.1.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.1.ebuild
new file mode 100644
index 000000000000..9c9859bfbe6c
--- /dev/null
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/combined_robot_hw
+	dev-ros/controller_manager
+	dev-ros/controller_manager_tests
+	dev-ros/hardware_interface
+	dev-ros/roscpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/controller_interface/Manifest b/dev-ros/controller_interface/Manifest
index 41098be531ef..51b6686d2f70 100644
--- a/dev-ros/controller_interface/Manifest
+++ b/dev-ros/controller_interface/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD controller_interface-0.14.2.ebuild 408 BLAKE2B ee1309c20ed563389b1480dfac5f10297b1285690c000d83752682afb1c6a7cd448cc92dc799c67f0a1253315acf578d211b833d2438b12c6ccbdec1dab8ed8c SHA512 e629261c89a8acc3c83d7f955b5b93b3df0adc23de7a39023b6e9bce360a9464162873f348ce2f02386cf0a640ceb3daead3f12a040bf646d66d2179d167fdaa
 EBUILD controller_interface-0.15.0.ebuild 408 BLAKE2B ee1309c20ed563389b1480dfac5f10297b1285690c000d83752682afb1c6a7cd448cc92dc799c67f0a1253315acf578d211b833d2438b12c6ccbdec1dab8ed8c SHA512 e629261c89a8acc3c83d7f955b5b93b3df0adc23de7a39023b6e9bce360a9464162873f348ce2f02386cf0a640ceb3daead3f12a040bf646d66d2179d167fdaa
+EBUILD controller_interface-0.15.1.ebuild 405 BLAKE2B b1cba0340f1e729d15b15bfc65c3c37b66b28266390b73a4e2065caa7d0307de58ed815fbcf98ee22ad7f0175687f2eff83d344e8f2a2bd564a1feb2ccd51d5b SHA512 07e6a7656b2beb125db8771ee36fa387bb76bb935d4d8ce7e709a1e442492b9bfa1257ec35247e1119d5f31ced8b329875571740fdb777ba5c74590968ffa6db
 EBUILD controller_interface-9999.ebuild 408 BLAKE2B 97811b917ce93d4db53d5411bbbb03a8f02f07703c4cea04a796570d3308d3a5dda73a7948f1e173584d36c343d472a5c0147429ca975a733b5854983276ccff SHA512 778dbbec3af738e3cb52f818b7b1ff9a190b61f3fea575c2e2e3b0c7de92ae9011a1f8ddc6c7cb10e0f26f3d0e4100f0ba0e8d2b9cc01cf692951ba579fa7519
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_interface/controller_interface-0.15.1.ebuild b/dev-ros/controller_interface/controller_interface-0.15.1.ebuild
new file mode 100644
index 000000000000..d24990956627
--- /dev/null
+++ b/dev-ros/controller_interface/controller_interface-0.15.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface base class for controllers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hardware_interface
+	dev-ros/pluginlib
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager/Manifest b/dev-ros/controller_manager/Manifest
index 06ee58b0ffe7..111c2ea97843 100644
--- a/dev-ros/controller_manager/Manifest
+++ b/dev-ros/controller_manager/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD controller_manager-0.14.2.ebuild 803 BLAKE2B 2f5f1b9769f8683e9e3a6f1cfef75de57a9e27597643c56195842292cec7f93aba06900784290ca57e8251f967bde5c87fa5aaa7c394eede04f05d64b96b68d5 SHA512 8d827c6174ade1dc685037ab86a3de54990a51efef3a6cb24359e9d5019f1acaec5ffe8c4057424553f4e7cf30f3ce298ccfb2f4f433c740416b9ff5b8c8463e
 EBUILD controller_manager-0.15.0.ebuild 810 BLAKE2B b38ba0db00655bd8a15c6da10ff3a6af83c210f4edbc70c0894912d5fb3aa662938282cf4c85e5518181babeea85452dfff40a7daef4df6d795729b80d5a9e2b SHA512 63943aa95b08f1c0eebe21496cd81028a84a0d4fbd353c4119daa92da0ef354306779da6814bfe1bd9ec8cddaa2f23a5980ffcbd7fbd9121d1693a28467b7fbd
+EBUILD controller_manager-0.15.1.ebuild 807 BLAKE2B 42bbac7dd17a30d80741b52178dc6ba14ea15d56b19b976129a199db25cd5f1d2f5dc1dc07c068b9c8a38766653d3ca3aeaf0d40a44001b241ad3ff451a7f7e6 SHA512 267c286781cec7b7039191bed1e8ffbaa95c2779295f66c405ddc3a5723403ba2ce1762be954febdaf09d2864eebc255f5052edb928d468a06c15d8db9269a21
 EBUILD controller_manager-9999.ebuild 810 BLAKE2B b38ba0db00655bd8a15c6da10ff3a6af83c210f4edbc70c0894912d5fb3aa662938282cf4c85e5518181babeea85452dfff40a7daef4df6d795729b80d5a9e2b SHA512 63943aa95b08f1c0eebe21496cd81028a84a0d4fbd353c4119daa92da0ef354306779da6814bfe1bd9ec8cddaa2f23a5980ffcbd7fbd9121d1693a28467b7fbd
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager/controller_manager-0.15.1.ebuild b/dev-ros/controller_manager/controller_manager-0.15.1.ebuild
new file mode 100644
index 000000000000..a6d49e76c54a
--- /dev/null
+++ b/dev-ros/controller_manager/controller_manager-0.15.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="The controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/controller_interface-0.15
+	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/hardware_interface-0.10.0
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/controller_manager_msgs/Manifest b/dev-ros/controller_manager_msgs/Manifest
index 32b10e92164b..ffc049c79cc8 100644
--- a/dev-ros/controller_manager_msgs/Manifest
+++ b/dev-ros/controller_manager_msgs/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD controller_manager_msgs-0.14.2.ebuild 464 BLAKE2B 4f8100aa36c9b5ed5450c51b40791032a1079d7370ca9ed19b84368e1debc3a3aa617e9669eec73c47cceaf32eed781034e17372f7a9fffe34819e609d1c5208 SHA512 7c65d5b107e50dcaae9994af726a343d89c0259ca6bff92e8d5cdefd6185728ba66d14e1e7a457c3643ce5e5650274d5c86c220fee2308cfcf3c85d5a7e89b98
 EBUILD controller_manager_msgs-0.15.0.ebuild 464 BLAKE2B 4f8100aa36c9b5ed5450c51b40791032a1079d7370ca9ed19b84368e1debc3a3aa617e9669eec73c47cceaf32eed781034e17372f7a9fffe34819e609d1c5208 SHA512 7c65d5b107e50dcaae9994af726a343d89c0259ca6bff92e8d5cdefd6185728ba66d14e1e7a457c3643ce5e5650274d5c86c220fee2308cfcf3c85d5a7e89b98
+EBUILD controller_manager_msgs-0.15.1.ebuild 461 BLAKE2B a2c8a19380acc283d95d721522d41d36bd032f84cd3e11bec420fdad9d9a843a0fc8482edf18613171dddfb251376b2a436a6d124e02927e1d50647090eb4399 SHA512 d066c6af5b3a769bd0f761ee7e2b834a6f06f58c47c688dd73b74e89513cd1c9883e8bd0e28ab0cfd4dc178d79ac35a21d0a3244a37b8f31f93db08d8b54f116
 EBUILD controller_manager_msgs-9999.ebuild 464 BLAKE2B db06a2ed1f6f299d1182d20fcff079a682a71cd048788b9a8eb2076211912d72443cd7aa3f6f0022b7432d6b058b231ab1490e29e7fc9bbe10c8744a930d07e4 SHA512 5c147fd4b7e6e64db8d0d804f8110825e41eb2c511da37b49117fb09a898fc271049b7c7d5565684493163dd0012c40442a7f637a39bb1d6e0785fd23b152998
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.1.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.1.ebuild
new file mode 100644
index 000000000000..70b132e01e6b
--- /dev/null
+++ b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="The controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rospy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_tests/Manifest b/dev-ros/controller_manager_tests/Manifest
index 68df539f0f1b..4afe4dd2535f 100644
--- a/dev-ros/controller_manager_tests/Manifest
+++ b/dev-ros/controller_manager_tests/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD controller_manager_tests-0.14.2.ebuild 638 BLAKE2B 9862addeb71f04c83bf900382f2abdaa8dbd20f1d2c5d6cdcc04edfa6ae085b3a9d07459f50b36c29d71ff598e4f4af04ac50a0d958f2a8dc7b07d0b46965f35 SHA512 150ccf5b065c5fda48ccd1f045aa6d90408802fa1fdf24d3bb01141755454fa2a76df2542fb0cba9b0a46962f5ffc3861a66cb7adcf1cbe26ee8606c76d18e5d
 EBUILD controller_manager_tests-0.15.0.ebuild 638 BLAKE2B 9862addeb71f04c83bf900382f2abdaa8dbd20f1d2c5d6cdcc04edfa6ae085b3a9d07459f50b36c29d71ff598e4f4af04ac50a0d958f2a8dc7b07d0b46965f35 SHA512 150ccf5b065c5fda48ccd1f045aa6d90408802fa1fdf24d3bb01141755454fa2a76df2542fb0cba9b0a46962f5ffc3861a66cb7adcf1cbe26ee8606c76d18e5d
+EBUILD controller_manager_tests-0.15.1.ebuild 635 BLAKE2B 16e33d2420cfcfa944e9e17fcd4fd2eddb9b8992eb50d0d398c93fc7a23e102208348d24a205f470605f91dff8fecdff37088e84a0668523a0177a45c73f6e63 SHA512 ed3b16c14ff0dae401ae581fa17958f881cab60aef679fafd3fd4e96916760df35a3dae70cbb54f407931b6b08d798ebd16051a450c9defeb73a9cf5ca2138df
 EBUILD controller_manager_tests-9999.ebuild 638 BLAKE2B c29f7638adef4694e94db2d2b75ee1aae1bd7cbd7be614e506a5dd057645d9c08735d6a799c4aa65d3fa53ca320de05d21a0d4d7546a291b559266ce15592c9d SHA512 f2d2980f53c20872fa638ffa9000b26e98be51f705a81a4483482fc29d28ab4ebddd14ae524c40ac00ae746d9f106eda05821555abc2c5e1225c1c8a9f703d80
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.15.1.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.15.1.ebuild
new file mode 100644
index 000000000000..77cb39291f47
--- /dev/null
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-0.15.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tests for the controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/controller_manager[${PYTHON_USEDEP}]
+	dev-ros/controller_interface
+	dev-ros/control_toolbox
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rosservice[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/hardware_interface/Manifest b/dev-ros/hardware_interface/Manifest
index 0c1adba47b44..3fdf719f2c37 100644
--- a/dev-ros/hardware_interface/Manifest
+++ b/dev-ros/hardware_interface/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD hardware_interface-0.14.2.ebuild 376 BLAKE2B 18e8430dde17dbc3210d2f2ab48b7eabf3a99759bf8188987eb3fe940f74c6f750469d5d44fa0f48c2322ac3cd098a970ddf055e462ffa412ea6b775961bbbcc SHA512 afdcab1d054715913d893114e875cbda28d221a223071fd07e51c203dfe7a7530ef51aa21262868e4c3f4c9cb5da19f416799a9587885ebe063280fd4626a67f
 EBUILD hardware_interface-0.15.0.ebuild 376 BLAKE2B 18e8430dde17dbc3210d2f2ab48b7eabf3a99759bf8188987eb3fe940f74c6f750469d5d44fa0f48c2322ac3cd098a970ddf055e462ffa412ea6b775961bbbcc SHA512 afdcab1d054715913d893114e875cbda28d221a223071fd07e51c203dfe7a7530ef51aa21262868e4c3f4c9cb5da19f416799a9587885ebe063280fd4626a67f
+EBUILD hardware_interface-0.15.1.ebuild 373 BLAKE2B c4797e08466c4708cfea0d9c81a1c39d50cb144f1d82f042ee32fd7358aa2d0997ea2560057c518fbfeb9e18f6308ff4b4b4f945b65055bf6fd8afa422e4162d SHA512 4d683b44c185383dd1aa364d3fb8385af95fb419a79117137f7496b0f3b53c064708041801aed5a4b90ac4196794b038586d647e0d3c0457af0005272232c6a9
 EBUILD hardware_interface-9999.ebuild 376 BLAKE2B 401acb59d859e1d03c60ba7d0772aeb714aac13bdf14b78b833c1ea09aa4e71cab66f89db6476f95749dd19482837de44fcb0f7902d7e237ee2c1a425c42b152 SHA512 c3b42b40faeaf538720e8b3075217a3e251d14e72f8f19895b3a7d47bf1f1ef06d69be1d73586126fa637fbad2b8dfe33aefe28cebaf38074983a3e9de853a6d
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild b/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
new file mode 100644
index 000000000000..474b9e3bcba2
--- /dev/null
+++ b/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Hardware Interface base class"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roscpp"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/joint_limits_interface/Manifest b/dev-ros/joint_limits_interface/Manifest
index ec4dcbd1585d..bac26d96391e 100644
--- a/dev-ros/joint_limits_interface/Manifest
+++ b/dev-ros/joint_limits_interface/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD joint_limits_interface-0.14.2.ebuild 490 BLAKE2B 28b4f9b3a31ad18ce69dd4a22115725cda506148bf8e5095ccc3e9bb81a070742245fef113669e98a4b227c14b35ea8e63c94d7f1c303f50518065f9e67ec9aa SHA512 e578f1fc6e23f69746cd3df192d2b28d5e96024fbef7fa9ffd3aaf538516e5ce62c22e0f7bc84473e3daf4f8aaa0d0e65a940994236e4b6bcb726786367ee114
 EBUILD joint_limits_interface-0.15.0.ebuild 490 BLAKE2B 28b4f9b3a31ad18ce69dd4a22115725cda506148bf8e5095ccc3e9bb81a070742245fef113669e98a4b227c14b35ea8e63c94d7f1c303f50518065f9e67ec9aa SHA512 e578f1fc6e23f69746cd3df192d2b28d5e96024fbef7fa9ffd3aaf538516e5ce62c22e0f7bc84473e3daf4f8aaa0d0e65a940994236e4b6bcb726786367ee114
+EBUILD joint_limits_interface-0.15.1.ebuild 487 BLAKE2B f2b06422bdab4950e663c26b8af1c4d28f1d4f61923a36184ce4741389a2e19c6fac576f04b60e17e1dbf4fc90c0b249157f36b32951dc54b94f7e6415610d1f SHA512 56670bed7d830973ad3c565040bc7743800980d78937137df1ccbe0a44a449fa24fca73130dd9965460895341f8b79a2126605e44eaa744ae6bf8e08f2afcd2c
 EBUILD joint_limits_interface-9999.ebuild 490 BLAKE2B a26744ba31855f5d0cd31e84491a137532818a465b22d9df958d0ad94f97a43b11f8a3046ca124f8a4b93a1dc48aabbdd3428cf1c0c50d9fd59ca9b2a4ff9a03 SHA512 41ca8984579c77512c5aa03228b1326482ae9a2a68c64feec168f9bb06e884e802d49c50073777571f955ec19941de6b60129e96f6ebbade73da03d48936518c
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild
new file mode 100644
index 000000000000..af15ec2bb5cc
--- /dev/null
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Interface for enforcing joint limits"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hardware_interface
+	dev-libs/urdfdom
+	dev-ros/urdf
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest dev-cpp/gtest )"
diff --git a/dev-ros/rqt_controller_manager/Manifest b/dev-ros/rqt_controller_manager/Manifest
index 105707597870..40db017f37fc 100644
--- a/dev-ros/rqt_controller_manager/Manifest
+++ b/dev-ros/rqt_controller_manager/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD rqt_controller_manager-0.14.2.ebuild 444 BLAKE2B 8e17fabd016fe6becd7bea25962f907e2702f8db1665f5d94fae42b57b69f5cfc8bfa171c1dcea860c25c88e330badcdbc3eea2bbf957486b5b772dbee1114c3 SHA512 5852f5b38161ddf68dd2b80e4040cef61208035c29c3d4a5d7474aa769dfdb82b67562ed431bfba2302b0aa73daeb98e0238d0dcf2d0595dc876d695bc9a09a1
 EBUILD rqt_controller_manager-0.15.0.ebuild 444 BLAKE2B 8e17fabd016fe6becd7bea25962f907e2702f8db1665f5d94fae42b57b69f5cfc8bfa171c1dcea860c25c88e330badcdbc3eea2bbf957486b5b772dbee1114c3 SHA512 5852f5b38161ddf68dd2b80e4040cef61208035c29c3d4a5d7474aa769dfdb82b67562ed431bfba2302b0aa73daeb98e0238d0dcf2d0595dc876d695bc9a09a1
+EBUILD rqt_controller_manager-0.15.1.ebuild 441 BLAKE2B aabffe5b4421a3af947eb871694fc1cc89e763cbf03a3db3a7e59b4a7b71b36c70c917a0852096c22ea44c6a1c3f025165e7155c373eab2d0cfb7974028f54da SHA512 ed55e398d6af030542ba6c9b2b67af721fa3c804bb81326834228a5902a31be4eaba9558f36fdc3bb467e9b84670ea789dc47d30e39357bffe1f064d579142c5
 EBUILD rqt_controller_manager-9999.ebuild 444 BLAKE2B 3eed2feed983eb9d243723b27a3fea120d04e36d0c02b394f48f60e0ddbc211cfd3ade6286099419f6f158e077933f0b00d13d50f4eb13a4bcc7cde95a3203f1 SHA512 9ea5d8749c95f19ea690aa1d2bd2cc5d8a07f3cb2986a0b294fc9283ac35a16fb172ad2862d0d089ffab443a15eacb993f94625f7b7e1fb9ef7adec49eb986fa
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.1.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.1.ebuild
new file mode 100644
index 000000000000..c5e66c00d1f2
--- /dev/null
+++ b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="RQT control manager plugin"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/controller_manager[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/transmission_interface/Manifest b/dev-ros/transmission_interface/Manifest
index b5cefd6d5653..73b571a0e254 100644
--- a/dev-ros/transmission_interface/Manifest
+++ b/dev-ros/transmission_interface/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD transmission_interface-0.14.2.ebuild 507 BLAKE2B 5739ed7771c8ffddc445db724a19b9551cf81caead58300cc75ec110e1a2726d1767bbb64bcf31c557a271c2088faf9a70f4c03eb24ba0d6f20c93cbd449b535 SHA512 dae1b33c525e80b6a90d35d191d2067a0cb73c3e8e094cca71205aa92f6523c6a379fe932d5f9999d735d9599ff92d63e2975167d26df3cc172adb9d4d044324
 EBUILD transmission_interface-0.15.0.ebuild 507 BLAKE2B 5739ed7771c8ffddc445db724a19b9551cf81caead58300cc75ec110e1a2726d1767bbb64bcf31c557a271c2088faf9a70f4c03eb24ba0d6f20c93cbd449b535 SHA512 dae1b33c525e80b6a90d35d191d2067a0cb73c3e8e094cca71205aa92f6523c6a379fe932d5f9999d735d9599ff92d63e2975167d26df3cc172adb9d4d044324
+EBUILD transmission_interface-0.15.1.ebuild 504 BLAKE2B fad9bc2b9c61f2ef826f82f3729f61c72becb665490d9f16325c30b883d5d9fd19af44c007ee15c9b0aa6c46319702adf8d83fa64f03670d4e64198c2b2bc2fc SHA512 0e7e1262be759212925fc383cd41d228708159b82a39ae09e9e38f25458a6791fbb58f60dc393d5888601f16cb883911e184a3aea1e91b0c3e5864efd22e95ef
 EBUILD transmission_interface-9999.ebuild 507 BLAKE2B 0251e5c8440b426b21f7d8b0a552bb91003f71a9bb265ee98a1c4e2ee77801d7d70626ad19a64502ef0e7a82ef11c4248902283a24fe9f71b372aba9558bf1b3 SHA512 324c2221c0170e4737cb496c661f02ee93002dab969b5b2ede8c637ceb105d5190f1f945273cf1dc84c76f2d1be85294b3d6a05bc4f884b4453b411b8838bd2d
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/transmission_interface/transmission_interface-0.15.1.ebuild b/dev-ros/transmission_interface/transmission_interface-0.15.1.ebuild
new file mode 100644
index 000000000000..5860da756243
--- /dev/null
+++ b/dev-ros/transmission_interface/transmission_interface-0.15.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transmission Interface"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hardware_interface
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-libs/console_bridge:=
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-libs/tinyxml
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 51c6a0443b8f..3882799d099e 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 725e342e5dc9..8977c5d9d035 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,13 +1,9 @@
 DIST autoprefixer-rails-7.2.6.gem 196608 BLAKE2B 0f9224fbf765877b1b7414c68fc39a6587514d27fb5290e1a623db8dcdcbf6f668b66ddd0133906a97e63e877b8201168a45520a9919dc756021d5a7cffc0d38 SHA512 37b3f245291711f92ab9e264491637e753afb95e52f9fd4e2bda6655cd781b2d031934f3379cabdd5589bdf57b780d0727f2fff1cdf7887ca4cc323d23023396
 DIST autoprefixer-rails-8.6.5.gem 208896 BLAKE2B 50e8b8ef3fec9a0bb8d68afa8950989dbf84b58b79b8822e83bf22873c5172c2c514643c31dca88cfec49bd585563eb9b201c621d3ab6707ed0d49c6cd4c8fc8 SHA512 fddabc4d745ad1b4282622a52ab4e36c377eccec85c4e80b3e8d633ffcc2d1613f4fee9e9f2356c85d251e44b0010418029bb278894987119689435ac885e982
-DIST autoprefixer-rails-9.1.0.gem 204800 BLAKE2B 1aa4befa996db5f5e49637327d464816709cf30f816e1107a4916db272a9c7052a96f8cc3ab2b7259d01a0d9eeffab9fc7fd5a3fd7f6b372b6a18bb7fa1126a1 SHA512 aefa976523c6f71a918620803178b11700c8a5d40c32d2e714b085c090b710cf30a9bf9d45b1b6b16f0cf06c1abe219c99f81a7e5e18291e23ba36da50dbc430
-DIST autoprefixer-rails-9.1.1.gem 205824 BLAKE2B 6843495ec1c26ace2268b750d076612f3cdd0c0d7b6b16b0fab1f16cedb27417675e53d7aef126787d50b2ac69c5358a0011f2a5519036c6bc74aee44f63d577 SHA512 7b4a3a6bda8639dc7a3649fb00ba8b074855f9783f8de93c99c027af6494af62701d96b55d212fd34ab0461be8d7fa96b4769d6e1ce03ca4c40d2cd6b320cabe
-DIST autoprefixer-rails-9.1.3.gem 206336 BLAKE2B 57be8e5177d5ae49e39fd7e8ef0a01ef7af562e3da42c1ee05a6c710dc48fae4ba7ab6c9cab8710363d608dd2b5773625a8f46600ee45debd7fc6669697153c9 SHA512 f31b2480d44d2afc9c5a42521917887c167f9f193c07d6549441558f0ea3eb0e2b8eaa71578fbaa367098a027d46f517772666a03e41f1dc8983f3a7fe8654f2
 DIST autoprefixer-rails-9.1.4.gem 206336 BLAKE2B bea7ed6c4650fc9b5e647e186c1f27b229eb1cdfabe21d5d30abec50636252b87e59fe7fa08499d081508c57302816da589276548c9e90cdfda75e89d0643f50 SHA512 75e4fb7986e6f51f104c39f41fc61c991abb942444a78a7befd060c5e6454c4a1981685f93bfab0bfab8ed374b446eed8adb5279bfc627cee22a6a0c1bc7aa7e
+DIST autoprefixer-rails-9.2.1.gem 208384 BLAKE2B 6f16e02fcde2d90e4cf7da8031cb8898d1acb6ec30e97c8b91f1f2b282a7d0154c848d04916095f7e47010627cf74bc9d07a147fb3266874f732d67549f7ebba SHA512 b2b20ac759a5988e61782d062d0ea6722ad99dc50ca1d02506dacce4168f79aeb0999f4dc558feb73998a79408ffb594ee901687f2e2205a81b3ebd61e6e8bbb
 EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B fd6aef469bd1e07f5100e88ebe523da96383c721dfc2bee9b7babb7d11f3d710bbb6debf4cf9cd57702f81150c8b7c7ef9a0f3de4efc1e6325240fd1bf2e4bf0 SHA512 f17f3e58a7cf0a8d960d683d3cdc6ddae7065ce7d28d3284b45b169210a068a9ec0dafcee100fcbda098aab73c809f455908df069ba72e5536b95aa1ddac7ace
 EBUILD autoprefixer-rails-8.6.5.ebuild 827 BLAKE2B 4bce491c80db4a8eb1d77467167c3c290c0af5311f4395424f5f0c4e2b30e1474fed1746c3dc5127413d48b9e7031f8e782f7b5d1a1987550747c3900d8954cd SHA512 8bd8a32ceb04e688ec4d149a67b98905b2ec975684f3fb2fe3dddcc4ff0d8a04e7556b41a3a804a6b1dd2d4c46d4b5ab45c6ed45f300c7171bf2335f73d42768
-EBUILD autoprefixer-rails-9.1.0.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
-EBUILD autoprefixer-rails-9.1.1.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
-EBUILD autoprefixer-rails-9.1.3.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
 EBUILD autoprefixer-rails-9.1.4.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
+EBUILD autoprefixer-rails-9.2.1.ebuild 845 BLAKE2B 2bab8647d69f3176e8af78d7bbe951165880a21a165a6814f7d31669f7c307e380a2b22d5a7f14735d9d421bb75d6e4ef6d09b013ecb44e89dec3f33df9805de SHA512 9875ab18ac5ad088ac85e7501e7cec51e4a94a546f4dd03d0f962145298e9c2f8f0c934e4d62b664b3129c4327d0ffef0f8033a61ed11dc1096b2b36b50968f5
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.0.ebuild
deleted file mode 100644
index ea1c27226645..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.0.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
-
-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/autoprefixer-rails/autoprefixer-rails-9.1.1.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.1.ebuild
deleted file mode 100644
index ea1c27226645..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.1.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
-
-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/autoprefixer-rails/autoprefixer-rails-9.1.3.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.3.ebuild
deleted file mode 100644
index ea1c27226645..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.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
-
-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/autoprefixer-rails/autoprefixer-rails-9.2.1.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.2.1.ebuild
new file mode 100644
index 000000000000..5c7bdefdb192
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/bundler/Manifest b/dev-ruby/bundler/Manifest
index 6363505473d0..3fb5f7def8a6 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -3,9 +3,11 @@ DIST bundler-1.16.2.gem 352768 BLAKE2B 4ba3729d314aec33a4ce6738a54774d4772714913
 DIST bundler-1.16.3.gem 353792 BLAKE2B 5a36cd3e3a7fed39ea1de8d7bcd27a2f7758e4fd67bcfdbcc877a44c491624b45736e9aa122a14d792f2ff11605d226cdfb5a70c2d6cdadb5e0e4e36d597c96c SHA512 bc6b911a5ad2911c35be1ce4e28d42b7762cfc950bc060cca1527b66f78c5f125ed5524d1fc161f68053f00997742c6354549712be0a49c72877ab32ccbbefe6
 DIST bundler-1.16.4.gem 354304 BLAKE2B ce10e5e158341f0a6411f808f2dbf4f29a3384b23380845cce0c34a5c4440de6147da84955f087c373470870651cadaa1c42d0652de4b3d6b6999da8c2449c07 SHA512 fe55b87bb999759da8b4285bb6cb9edbef41b87e418beb4bb9f450f425fd152d45fac2be99d79e26c0cdcfa4785f2b0e35b7f18492ac61d8f780c01ab662e40d
 DIST bundler-1.16.5.gem 355328 BLAKE2B 684c499abf149fcff4f48881704d96c363f63f004520935767b6e8497f3a06b92c0b4378087383e908256866e29b0f4227a2cec7799d098d74cae896ba2e64db SHA512 d4463d96f6a3b476a3a6f8924a6096ab0efe56807ebae0ddbac897d40e773004ae7d49b1242fc04f77da88e38e879d35022ca4499f4de1ac7b31d5e0fc8a9c31
+DIST bundler-1.16.6.gem 356352 BLAKE2B da6d1d5e7edb5a2a4066cecd7caf33c06d15df2e719aaaa66d9ec9e7ce712eb28612224139f86df016bee28f5f00b767ed683de61dd820c7b40e211e3015a3d2 SHA512 4492786ffd22b86e056dc66c605a943140a1513dbada2334fd3340877f72a3f2138d1bca8f36be3d671f2f9497a69f3a95505db42e938bc30719d15f3896e155
 EBUILD bundler-1.16.1.ebuild 953 BLAKE2B 5244bb0fdc2c0bf5cf5ea33ed4d632b7ad8f831d23506b5572f2344c3babc67e0eafe3f9d3af200e7494a7d98488dbef09c58de45fae5d8ddbe84905d4c7a81f SHA512 86a458781879e76e48d769001e42304dd846a8ea595c92dfeb5d8d984c85294873dc47622de9d4aca27d56e1884f83760150eda18cf52a2684b746f7ab957782
 EBUILD bundler-1.16.2.ebuild 963 BLAKE2B 4ba5577bfb001e257ad44a04e3c7e920f6e809177d2f0f0d6557ea4ed5df1955f009323900e3eb9b7fc03bcb333ad197b80e892a0c58bacfed366c606f0fcc67 SHA512 d08f8706fc972839979d1ecacb8ea2436eda09c9585fb664d150a7251cba665553a7d7641adf545628e7557f5e2b3342287287bbb21106856be078fb12f20021
 EBUILD bundler-1.16.3.ebuild 956 BLAKE2B 16a90a9a7d14d861369b7b0f0f2c3dfaa59bc04e96ee3833aecbcee6070f58ec524758a61bcce3d93690f6ab70579de519bd90d6b816bb0bc93b3773de464cc2 SHA512 aba431908bdaccc5d70c76e0bf1209148c4679ec9eca1073025b89d3c0fb630def82147f7c76f35c0a1a81bdf0017888db7fc3f171adbefe808de8c4091957cf
 EBUILD bundler-1.16.4.ebuild 956 BLAKE2B 16a90a9a7d14d861369b7b0f0f2c3dfaa59bc04e96ee3833aecbcee6070f58ec524758a61bcce3d93690f6ab70579de519bd90d6b816bb0bc93b3773de464cc2 SHA512 aba431908bdaccc5d70c76e0bf1209148c4679ec9eca1073025b89d3c0fb630def82147f7c76f35c0a1a81bdf0017888db7fc3f171adbefe808de8c4091957cf
 EBUILD bundler-1.16.5.ebuild 956 BLAKE2B 16a90a9a7d14d861369b7b0f0f2c3dfaa59bc04e96ee3833aecbcee6070f58ec524758a61bcce3d93690f6ab70579de519bd90d6b816bb0bc93b3773de464cc2 SHA512 aba431908bdaccc5d70c76e0bf1209148c4679ec9eca1073025b89d3c0fb630def82147f7c76f35c0a1a81bdf0017888db7fc3f171adbefe808de8c4091957cf
+EBUILD bundler-1.16.6.ebuild 953 BLAKE2B 07e284987d58e0bb9f7be563a56e747dc0cdd3fcfcd04dab7d005c6260c7cf56029135293e1037098e676930d7b2c8325d66a0d332d8a8c7f59e7b33fb726abe SHA512 f3092a4ea732af1639a2c25cf2763396ddd90d48e4badd62249d9ff34298e7cb7668974b32394bcb7a80615e7a2f0438b5abe04d5796bd70722775ea22a27dd0
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.16.6.ebuild b/dev-ruby/bundler/bundler-1.16.6.ebuild
new file mode 100644
index 000000000000..a42efb0f3a6e
--- /dev/null
+++ b/dev-ruby/bundler/bundler-1.16.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="man"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 4afbf8d64ca6..0f92792eaebe 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -4,10 +4,12 @@ DIST capybara-3.6.0.gem 296448 BLAKE2B 4054aaac6b6e0d5f1f0c1adee1951dcac7fcb3b20
 DIST capybara-3.7.2.gem 299520 BLAKE2B eea9d0bc35483174ccedd9366c04484a5b819e40aa6f0d01ceefad1700b04ded446d2b14de826981296666fd5f7a5440f08dc2ee437ee3db8e7bcd70d6cde636 SHA512 980346ea0fd1c3cb6de2423707d8c8e637f64bde2c1ef48622a08d1fe2177e29eb5d7125a048ebafaf4ca1591c483d34a8b17ed7288985dad783023ed35305e0
 DIST capybara-3.8.0.gem 300544 BLAKE2B 12e6d0f316fdc050380b494dd9d1b35feb14dfcf2e2fca7b439e76538f79e17020774fb02667fe2b576b5fb54fb432fd7a06fbf7147baf71baccfa5d307a337a SHA512 6b8069e1f39d42695bb8f96ddd6f221e1ddcf09ceeeec65588721c89d232497a53fd8e3b8018e65a306eec0a187a15ed26c481a7574a6af7260f86466449c864
 DIST capybara-3.8.1.gem 300544 BLAKE2B 05c22b603bb67d3217fa9c4c87bbd79b2249219d9a62d00c511fb7c8272092d381b7598e82cc03c5080b9c5ec20a9d64602ba37d235eea9717e741232c05c24f SHA512 ee4d2b3226e5233a092d163b4323f02ba84ad682682dc9e17a4343380e4480774eac1bba28e12a83000438c7bc1d2698fe1aabe6162ff729a243fb863f06fffb
+DIST capybara-3.9.0.gem 305664 BLAKE2B ee11e9dede512a49d2b652142976f34a882be2f9e02c0af6b22d4980d1c0e6c1f6f73807fee2062662625ea11e96d533c865cb9f4d25eb4918cabd0b06247bc2 SHA512 da2b9d7809d66b33288a31902ffbbad91da7b306b5035546618b987acfe40bfd99451df4be34e4eac86032e13509ca7baf4a2eef0eb4cff0dd8a265e43cc1a46
 EBUILD capybara-2.18.0.ebuild 1525 BLAKE2B 17327933169f1c330a0f0580b8dfd00be4ae39e0fa94d62e172d6621a8a91189925acfca3730685ed80573e6eb456f731d8072fb1adb2653b6b646714a89bc5b SHA512 a6347a7b9014e3ca1bdeee9eed2a9e22d866dd831041e700086b00c4245d254ea3107c82b019f7550faa273777430898c571c837ac4202cdb2cfdf15068edd47
 EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
 EBUILD capybara-3.6.0.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 EBUILD capybara-3.7.2.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 EBUILD capybara-3.8.0.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 EBUILD capybara-3.8.1.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
+EBUILD capybara-3.9.0.ebuild 1531 BLAKE2B 70f6b8024c6d818d437beee7556f45964e2a18054edaafa845e90fa3fbbf9940a34305d13abf30ca33e0fbeb74edf5d2c5c649825690f54dd95290250b45a490 SHA512 582287a2643283ac9c8b043aba24a441051019897f2ab4b931bb5a16569afea889d00276c447fc86660cd6cb8d294a5c51a924076ae4e4c5154e623906ef0d88
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.9.0.ebuild b/dev-ruby/capybara/capybara-3.9.0.ebuild
new file mode 100644
index 000000000000..fcadf0e01c6c
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.9.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/combustion/Manifest b/dev-ruby/combustion/Manifest
index 4e0de3d60641..ea48224f2f32 100644
--- a/dev-ruby/combustion/Manifest
+++ b/dev-ruby/combustion/Manifest
@@ -1,7 +1,5 @@
-DIST combustion-0.8.0.gem 17920 BLAKE2B f318b2a2a6f1ee2103d396f9da52f5aeecdcd76008a91613118732b7253625ef40994680400ce3b8a3f781b08366c8bc15d9288ff9e8d8bd8af8afceb9af9a28 SHA512 145aa927dbedf0f5e8207538f0c741ce7c9a03ae696ad6a525bfcb0d4a3c89ae6f9f1b4ffc384d6aa82e2fa3ad802902a29db2fee9803e7a05dd69ea59c24419
-DIST combustion-0.9.0.gem 17920 BLAKE2B ac5a1c41b5993614a0101427f0a8d7491736a98b3b7799ed9e638515ae0a9b3098eed5c77a5bbd1c02efe9b613b2d30aac0c446fefb16405c3bfed4d1d15d23f SHA512 6d82f96fe2f42e50065e3de4d0fb8b05fa8da9e63a77b29934db0600594d826eb2a3e36a14e7e18744fed233db769c12a7620b4ec98aa230a6973d07a142a364
 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
+DIST combustion-1.0.0.gem 18432 BLAKE2B 27b082fadcc621a54fdb34fe646760179ebeef2b45cace0ec4ed354b22ca45b61fc66d7900b321f8847bd906fc3dd2c8ded22146d100a71a6d21a399a948d083 SHA512 b006b34a25969ff9a1865f02193b602027f449275f46fa19f6ca57f925b84c552df54e8f35b9ef7ae7cc3008cf384a2618596711d1e700150335474894fd4b4b
 EBUILD combustion-0.9.1.ebuild 509 BLAKE2B aeb8b81737358ad571e882f55087c924a03317235ee6c751fb3199e9e6ba6b250078f6a7e1eb28a006304209d6009d534b2a545bab582cd65d13ce43fa2fb8cc SHA512 bf2acaf0a03184b4f69bfc3947f1a2117cc4a7eb4040182a2f255139e6dff2d390c99ef4015b5538c4422d36ddc1c864443811e557240aa107ab111236a0ce30
+EBUILD combustion-1.0.0.ebuild 506 BLAKE2B 61848f142ddc035ae4ad97759bd29c63f01a7519553f17220522b2120a771c740ff4058b68168175d91fe489f1cfe158aa7236d9344a1d0542fd505d7330e931 SHA512 8876647855e468830492c31596e86f17bb155e9f78225364e86c37748e9f7651961ad154e2f5c34beb06f0560d2454b7bb6cc32fbbc7cecd7410074b6c39dfb1
 MISC metadata.xml 340 BLAKE2B 92307b9df9e0e099c9e38095e3fe14be95374db3313eff5357c57ea1c86cae77276f0a7fe828189402f69e1c29feefa17975d03c94694c59257be999c103a488 SHA512 85ab18259671a4c6f57a305fe992c5a0b078f6bc9f10d88662123def6b378340f5b2f62350a007dd1f62bb66766f1e7b6f3c2546042ff9e52f53332f66ff11bd
diff --git a/dev-ruby/combustion/combustion-0.8.0.ebuild b/dev-ruby/combustion/combustion-0.8.0.ebuild
deleted file mode 100644
index 8ef121db7a55..000000000000
--- a/dev-ruby/combustion/combustion-0.8.0.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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Elegant Rails Engine Testing"
-HOMEPAGE="https://github.com/pat/combustion"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-3.0.0:*
-	>=dev-ruby/railties-3.0.0:*
-	>=dev-ruby/thor-0.14.6
-"
diff --git a/dev-ruby/combustion/combustion-0.9.0.ebuild b/dev-ruby/combustion/combustion-0.9.0.ebuild
deleted file mode 100644
index 8ef121db7a55..000000000000
--- a/dev-ruby/combustion/combustion-0.9.0.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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Elegant Rails Engine Testing"
-HOMEPAGE="https://github.com/pat/combustion"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-3.0.0:*
-	>=dev-ruby/railties-3.0.0:*
-	>=dev-ruby/thor-0.14.6
-"
diff --git a/dev-ruby/combustion/combustion-1.0.0.ebuild b/dev-ruby/combustion/combustion-1.0.0.ebuild
new file mode 100644
index 000000000000..79c9f3a42f82
--- /dev/null
+++ b/dev-ruby/combustion/combustion-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Elegant Rails Engine Testing"
+HOMEPAGE="https://github.com/pat/combustion"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0.0:*
+	>=dev-ruby/railties-3.0.0:*
+	>=dev-ruby/thor-0.14.6
+"
diff --git a/dev-ruby/curses/Manifest b/dev-ruby/curses/Manifest
index 62489ed7a4ea..88e7a1bf5638 100644
--- a/dev-ruby/curses/Manifest
+++ b/dev-ruby/curses/Manifest
@@ -1,3 +1,5 @@
 DIST curses-1.2.4.gem 35328 BLAKE2B ba84d733a663c27a89be200b95c1e7a72063389190b2f90f0fc1b3a2af60025d926c348a08116734b15c2d494a4431c6e2be78e1f5982c03ee13d69bf7edb96e SHA512 bece3833be353ef8db51717dcdbf060667be5d33d00ce78952c44b3a8c3df082c11649b0a2a30072ce99c6578ffde7dce0c0108e109e55022703cfa1c1861bb9
+DIST curses-1.2.5.gem 35840 BLAKE2B 4c45f0ff81b4e4a6e9a305567b57536ae89cd3ced400066b27530461e91f1d1d4e4c30ebb5af67137a831c38bc6bad8f56e86c647abe246a189102f9e6649933 SHA512 eb1d56ecb8f1d55488a9a46d66193efaed1f85c16d0bfe43102d12f6b2e6e8ffe10f1c714d74f31cef4bac1158790764f5da9ca4b60740d3c7a2d2135f1536e4
 EBUILD curses-1.2.4.ebuild 664 BLAKE2B 59cba296e8e3b7eb8ea4b48a8240c5585ccb71d9fddfe316be56115b43b6221880aad309469d11b500b72a8959d1f031358d3983bd5acedb03cebc06316f9fb4 SHA512 1f0a3db6d6614a4d0fd9db72c3de74a2b9e5dc5d63a89c0e880520f7564efe899a6665e6142e0621107caea3182c09730bb6bd16b4dc2e07bbad1c9308257914
+EBUILD curses-1.2.5.ebuild 654 BLAKE2B 69385fe6648e48d26f3aa12cba91b43e2ca6d3b46818596186ead3d909c37c644bd689c055c67a0400b2e14e3ae86cb31dfb2fcd4faaebc86b39ea47087e994d SHA512 6beae7956a45509c364106ad54acd3e44318bcef732e34eafbdaf8e0bdc9fe3d31045275d4cb86224f39ab11d2067314d2dda7e5ca4e179df91fc49f7b81f5a5
 MISC metadata.xml 337 BLAKE2B f68ad5630ff84b55238f101e480a86102303dceaf6b05716d38966d567dfb894f668acdd0f1178ee61ae550e829c053868867d73e9935cde24677b3e14735277 SHA512 3f64366e00d412b476b81e46f0d9d4144d6f698fdc277f59cbefacbce8d9e35bf9fcd2d45dcfd5ba8a386e5972492004f693976f85a90ad69ebbbcf46542971a
diff --git a/dev-ruby/curses/curses-1.2.5.ebuild b/dev-ruby/curses/curses-1.2.5.ebuild
new file mode 100644
index 000000000000..5d1924f51721
--- /dev/null
+++ b/dev-ruby/curses/curses-1.2.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby binding for curses, ncurses, and PDCurses"
+HOMEPAGE="https://github.com/ruby/curses"
+LICENSE="|| ( Ruby BSD-2 )"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="1"
+IUSE=""
+
+DEPEND+=" sys-libs/ncurses:0"
+RDEPEND+=" sys-libs/ncurses:0"
+
+each_ruby_configure() {
+	${RUBY} -Cext/curses extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/curses
+	cp ext/curses/curses.so lib/ || die
+}
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 75613d469830..f3c660e0fc57 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,8 +1,6 @@
 DIST dalli-2.7.6.tar.gz 48481 BLAKE2B 9f83523b75d1c6fa109aba7e288e13924d8c7677c6fa38ffe5ce21dfb22f858f8a3ab8593afceed97e980e5f0172c1f8c58cc96b42f4bde31013f5ffcbb26f8b SHA512 ee2270e719f6ff108654d20dfc560cdc6067808c211ae75304f5ca3f7772561b25a699fddb051e42db744bb202228bdbb904171faf5e1804f1f2bed4341bc258
-DIST dalli-2.7.7.tar.gz 51532 BLAKE2B a625e333130f2c9ec47a9e3aec892a8e0d5f7248b71f6c666461104e2b29d4a384dd415b00dbe70d24fdd44a3b6835fdebdeb75297d4cd6d48506d146f892d4e SHA512 ed2a3f0b41451ae703060fe6197675ed6096531b91e5210a2fbded7a40a9a5717d47f5611081a488931318fd89888f00a539c67bab3dc600cea12676cab289cc
 DIST dalli-2.7.8.tar.gz 51599 BLAKE2B 935fc1b0ffb2c93c0ef8ab6a82e63b4e272c51ae6c2cbd0c670953c0943942c25b4c795ca7953ad4e53284f6b6e35b44be386ec4dba0c96345256e3b3173152d SHA512 5fa48a01db15fdafa179663b71867dd6a9c2ab7b4b94434f650c1ce37bd71caa2bb22efe032a4eed777538cdc341f22a251d14772aaba62f4a6d9d8c33b6a346
 EBUILD dalli-2.7.6.ebuild 1407 BLAKE2B c1a47e18c933355b7cb917582e8342218da00e1755e92691abae96254d09a43e06c0b27ddaf64df66e9831a8eac04c0297d57007ea4509546b9f529a4fa601b5 SHA512 de044b223df4c284be5b981aeccc401365c47143c7f1b33768278e24f51eda5270ffc482f72eadf9af31b8b5b527becfbcafd810c1b9d1e2d2683560156fdadf
-EBUILD dalli-2.7.7.ebuild 1401 BLAKE2B c6119bf16e8b63f85b677507f225b25cccf32c33112dcd2c5374f62d507472d014d7eb0b0445d99de1aa3307f517fa90ab16c6c70478bb954c62868495224a23 SHA512 b898e173732ba03315325018579086522d653d2e3cf7671be74bf762d0789b666e5d0089dc61a3b9511d6e5fc40a246b86f41d0455c0528d51859c3e768894f5
-EBUILD dalli-2.7.8-r1.ebuild 1394 BLAKE2B 2d4ab0d8645dbc28c73283292a230a6996f5c738dbfecb93041b8e5eca91e4da65db955c174d9792dfdb9f81d84edeef72bd9359935daade4d692048ea432552 SHA512 28ba8ae344c0091e8b619a2ca4e6cde828c6f4b46e8798994a46f9cb76ff8bece23576c1b182e2101327ceeda36a80183157da6dd98ec8307a6c705db9a22c93
+EBUILD dalli-2.7.8-r1.ebuild 1390 BLAKE2B fef340fbf6d16192c9173d096f2763ab0e12097b457e0a4249a3c88b5e14f04390a314bee0391c856c14933aa484347f1bc4b32d418e772adf9873e6d0888f01 SHA512 be632a4d5cbb0fa2c5d36a48b67da95ae528e159c48f33bc2f7604e32d513767c939c4ae4d3dac0ea788e7b2665b9d3fa2fce7467802d9006396ee94c0127cc9
 EBUILD dalli-2.7.8.ebuild 1401 BLAKE2B c6119bf16e8b63f85b677507f225b25cccf32c33112dcd2c5374f62d507472d014d7eb0b0445d99de1aa3307f517fa90ab16c6c70478bb954c62868495224a23 SHA512 b898e173732ba03315325018579086522d653d2e3cf7671be74bf762d0789b666e5d0089dc61a3b9511d6e5fc40a246b86f41d0455c0528d51859c3e768894f5
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.7.ebuild b/dev-ruby/dalli/dalli-2.7.7.ebuild
deleted file mode 100644
index 89dc2a156175..000000000000
--- a/dev-ruby/dalli/dalli-2.7.7.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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-HOMEPAGE="https://github.com/petergoldstein/dalli"
-SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:5
-		>=dev-ruby/mocha-0.13
-		dev-ruby/rack
-		>=dev-ruby/activesupport-4.2 <dev-ruby/activesupport-5.2
-		dev-ruby/connection_pool )"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
-
-	sed -i -e '3igem "minitest", "~> 5.0"; gem "activesupport", "< 5.2"' \
-		-e '/bundler/ s:^:#:' test/helper.rb || die
-
-	# Drop rails dependency which is only used to display the version
-	# number, so we only need to depend on activesupport and avoid
-	# complicated circular dependencies.
-	sed -i -e '/rails/I s:^:#:' \
-		-e '14irequire "active_support"' test/helper.rb || die
-}
diff --git a/dev-ruby/dalli/dalli-2.7.8-r1.ebuild b/dev-ruby/dalli/dalli-2.7.8-r1.ebuild
index 840fb8fab589..ad86c5b8fe76 100644
--- a/dev-ruby/dalli/dalli-2.7.8-r1.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 6944f1e4aae3..e811b2b72154 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,5 +1,7 @@
 DIST dbf-3.1.1.gem 126976 BLAKE2B 449b70abaa0bdcdf579ee78facbac46d2f97fb99e983b99ef7487c6a78f5d6f8f1c5257e1a490a169b8cb8e9581fb56827d86844d2d2ee9bc0b3326998206f6e SHA512 88aedb43858702ef2f24a2a751ceaeceba7d75ad58a6abdb314219cbb83551165aa7a1973a68e6b4c0da87c9f35c80b2e0650b25f570a76821bbdccb3dbaafb5
 DIST dbf-3.1.2.gem 127488 BLAKE2B c71089220f7b2d57b99ab27881c5f094a753c1a7c5378074f18d4a9fccba26d4ac7e8e563b84c0556aa50db7f39d03697957c10e6528ddaed8bef812cac662f5 SHA512 1e9c809cc03d4ecadaadd5cc754e4fa85961cf675465f950cda1c084e80c32e0a62223494f76b4ba8e26cde61eea8e43414d1b03c95fd36e8994222c3ffcab11
+DIST dbf-3.1.3.gem 127488 BLAKE2B 6c75d901b0d694266cfe2441567bf5684e5845a95b3c68eaf7bcbd5bc7b9b4748412740d8afce1015d5a84b26fcc30656a7f6dfc57c8a11055ac657b28cd034d SHA512 222957472dede8cfee42971ad9e7de4a08a7fb0ed017930027d4203da75298ce4eb9d222b841c4b051cf54c772b9799b2ee78cd5308452672142303bdf60c9f9
 EBUILD dbf-3.1.1.ebuild 482 BLAKE2B 738e98ccb96a7a99f2debb2dcb04095da1d6358793b6606c30c3e1af9d9b9f2f537e493840eb173700407ce65552b174a1f452cfeb0a90ee1bad11177f8c5b41 SHA512 13bd7c11b6223c133c0081e1dc8b856051cfd8b8faa8952cc6942585238364e1d007fbc27f01635608527b0ae9fdcd903bbcb5ec8c0fcd7d438212d3741af882
 EBUILD dbf-3.1.2.ebuild 491 BLAKE2B 99af868e61c34c2025a82e6b751888cf31505c892804b1f3af8e3675fb37fb57a84bd91ff2132d6cfe54db426299541186d65cc8b28df1f4675a660468605030 SHA512 ffe6b107766e9abfe7eb4cc705836ba3e42d85e7c6d1c54e631b4cb82131026ceee3cc1dfe38ed8f50fd4cd5af7d73872a4229cb7688e704f30f894343ffeb56
+EBUILD dbf-3.1.3.ebuild 481 BLAKE2B edf2f9b62f9b42de84c52500e2ce6dff386b5427923edc9d10d55eab9266ded02b99367000c3f5686b2eb88bf9d01bb566244e67ad7aec6310bfb21f631cb9bc SHA512 47986acc778cc81e1c5921636bdcae7970cc8e7deccd6b7620ece6b49b8f5a159fb1647e056bf0edc61d74d3841cf8e4356fa93241a9ae6b2c16108cd673bb10
 MISC metadata.xml 473 BLAKE2B d563d50bcc5286aec5a86a72bd5224e9a08d3369030fcdaae80fd3380462cd00e93c613d17552aa35ccf23440e5fbb78ed8ceb9c4f9b3b97af8591a514d5ce9d SHA512 5e46d9be66b6236bacb4089909d40de9b2124dc5fd1e026807c4e6fdbb70e25aa32bfc3fd150b92168bfd7764fa8ff74314e48fa3bad897b34276d7f12722f90
diff --git a/dev-ruby/dbf/dbf-3.1.3.ebuild b/dev-ruby/dbf/dbf-3.1.3.ebuild
new file mode 100644
index 000000000000..e177a20ec5bb
--- /dev/null
+++ b/dev-ruby/dbf/dbf-3.1.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 docs/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/ed25519/Manifest b/dev-ruby/ed25519/Manifest
index da585b386c51..5510fb60bbc8 100644
--- a/dev-ruby/ed25519/Manifest
+++ b/dev-ruby/ed25519/Manifest
@@ -1,3 +1,3 @@
 DIST ed25519-1.2.4.tar.gz 136685 BLAKE2B d0fd78f16df2b09f5835fca4b0963cee930e17ece2c4eea2cbf4544ed1a5e30c7dc63525b285f4e1e150e5e70d1e8207ca07ce985c27441a903c69875fd92dee SHA512 cf2de7781848d804f3a279baef26f887846d7d846d225293c74dc3f4e301d18518c9edc8b721f9637fff8f087703e91d2376119f2d8185ef19be5862f99801b3
-EBUILD ed25519-1.2.4.ebuild 795 BLAKE2B a05ba70b7aa57d3a04e6a2423fa9347ccb42573ec82275d91ac7bf979f390dc75c2c17a252ece7c003fda7b92e4ac5b04a34d815bdab8323ac0ba04dd6c620c5 SHA512 470fb9256085683c029b77411277951690e4c09d4fe1561ce29d49911e46e289d444bc35a45b2b4bef7b2fe0fc52b8577d6f22fd78f8254d8424430fe8185045
+EBUILD ed25519-1.2.4.ebuild 802 BLAKE2B e01cc2789ed2891609edd794b6a3c19e8480cca63161f1b9aa02ced879ac29f397cce988ae4f02a94f5068be4cb9d2ced6cbc4e62d3d7ea21aac8226352978bb SHA512 a0fb815ab52183ff24c033a826015d4eaa0f8b274a4e96a09689e392fba8ba124d99b5332ad5ed1d0b494b3b6e9326fe5aaf814a41e1025803f5724b325423e5
 MISC metadata.xml 343 BLAKE2B cda5dfa27c8ad6f26c92ebb6ff29d1d861211716018a37c1b4e5736191b9c9b1805b4f9cb05817345af609f0df7b458e3d223b9a2d79e213098ca08bd7457f5e SHA512 68f441e5fba00bf886e2035f32e1f16522340d762b0872f39783d8d8659044c69e63d6b36f401adf2519c5e160c88aa39fb5bed58ea64dfcd607b2e72d8a6918
diff --git a/dev-ruby/ed25519/ed25519-1.2.4.ebuild b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
index 12c3544c6c08..bac0177a8e52 100644
--- a/dev-ruby/ed25519/ed25519-1.2.4.ebuild
+++ b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/crypto-rb/ed25519/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index e37c126b18fb..5003014844ea 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,13 +1,9 @@
 AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f9391615958b27b842ede98d7a476cb488e249b1dc14258574bf2f77912599fef98fc325914c8f014 SHA512 381973ca23aec0853714495f74b77155f0079e504312dc55e6e22c8a099aeafd2b7bc4a762c95543c3cd9c5fa5f88a6821f4104b7522536aee7b6f5426d9ec2f
 DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a
-DIST facter-3.11.3.tar.gz 384882 BLAKE2B ad6103df38efb6abd68d9f831e53dba2767401e129d55bb94adee4dc3f8bc48c7a969050cc52d395a196883d561317ccb72bfaba2775e003171fd6941935feb8 SHA512 6b2dbc5a0bc1c70739a4c0987311ef0891a27f64ed1b45a46cc20a37e6d1d24fda0481976fbf743f83f10d2014f6e0df0e2b5cc9eba19924e831652e1a8417ef
-DIST facter-3.11.4.tar.gz 388074 BLAKE2B c3105376ba8d74df08e7e19ca7b5291d241d57aebb43a77d0dabe96668a07a62bf70fb18aa3bc3d85011e22f935a711daade17cf60ad867a7503e1b731647c88 SHA512 af58d0592a4b220d8f1d9a6d065da71136b58b7a474587c140021fd2915d920d328bad52178566f26292bd932ca1ac1371a631f88a567876265c7494bb01c518
 DIST facter-3.12.0.tar.gz 390445 BLAKE2B 8c7f2fccd16df3b13df451c18eaeb0cb837d1408b247bbf35f264e3adc2daeb5efaf3008ecf95428433d19067310b2d273a6001e1e151c260d7777dd5185f54b SHA512 2ef78903f62784f86f8d155f9f10ba793c10742f87d80c894c6bd505ae9186b5e875366d9c05899fe5e25f2994cf66b7d73d6c6570a38a7bc6e45ff0d5108c36
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 EBUILD facter-2.4.6.ebuild 1899 BLAKE2B a8e0d7c7a83c42150219a300d4a1a512913deee5d66e3a28a4f285a27d731cfa1937bb4d0d9bd8c80e133f2956ecf17690f5a94d66b385507a4f3740a425872f SHA512 0f4a589cb04567a42181bf366e51f6224d792c63bc2b38d2db3653688844e2cb611223fe148a6ff015d8dd734695214afc33ec0812e1707ac629344a691a396e
-EBUILD facter-3.11.3-r1.ebuild 2418 BLAKE2B 9836f2e1a648b64509f8b20d20e8f3a274186440d4187b13b28355dcf57932a418cd18640b3b544d2b2fbe75e82b6fd07a0ff7d35d9b1e791a8b871df169dd3c SHA512 5d22eadc6b126276f08a5a9a3a44d0ed74634a5f5064081290f7daffb5930995ad15e71e6654efdc340febb6f5ae0053d469fa58c68b9bfe203ce5a78d0041ac
-EBUILD facter-3.11.4.ebuild 2414 BLAKE2B 5cd4badf41ecd15ae4ef397f74e12c426ba25928a94f3fb49415846b2caa204ec180cb88fe1858659fa01ae1fd0112d63cdc39f7c98baac9610025c88079a44f SHA512 ef33f862b72d3397275e3de9a23da38bdcd8eac3e59a7c244beee723162feb4c11dfd1fd1fe387ee0e79795493b27ff999c8f3487a2760181f6bb6db28d2b8d4
-EBUILD facter-3.12.0.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
+EBUILD facter-3.12.0.ebuild 2415 BLAKE2B 1ce025dab7ff9afb6d0fae342e667ea6ff38645b4503baddfe80f2dbd19ad5cde74d74ba6e1d55e7244a23a428a5969f0aefe769661579b776a74cded3190204 SHA512 a820f8b288a3794be22d8de2817224071ec1aa633a6c9a5217235fa8f5700b541b9a9f76c380743e4f756926cf66e695fc09ef22de745407293ce949a06fa52a
 EBUILD facter-3.9.2.ebuild 2106 BLAKE2B efcbbd0cfe6a71b1b1a08bbc1f7abe4b94845c9e13192deae811466211ab2ba533ae10732a4d72635609b9cb419051b7c4a39f248e9b06f7ec751cd893d28852 SHA512 5cfb67a3db8d288302f21bf0092c05ce19b40c8a2f00b4b9b63e3e02cd7d1af3dd20670b744520cb42db2b2ccd52e9153d86c0e1db7a36c4c7854c70d79149dc
 EBUILD facter-9999.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
 MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
diff --git a/dev-ruby/facter/facter-3.11.3-r1.ebuild b/dev-ruby/facter/facter-3.11.3-r1.ebuild
deleted file mode 100644
index 5060a204e2a0..000000000000
--- a/dev-ruby/facter/facter-3.11.3-r1.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
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
-	EGIT_BRANCH="master"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	dev-cpp/cpp-hocon"
-COMMON_DEPEND="
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54:=[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${BDEPEND}
-	${COMMON_DEPEND}"
-
-# restore ${S} and override all phases exported by ruby-ng.eclass
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	# be explicit about the version of rspec we test with
-	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		CMakeLists.txt || die
-	# be more lenient for software versions for tests
-	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
-		-e '/rspec/ s/2.11.0/2.11/' \
-		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
-	# patches
-	default
-	cmake-utils_src_prepare
-}
-
-each_ruby_configure() {
-	# hack for correct calculation of relative path from facter.rb to
-	# libfacter.so
-	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
-}
-
-src_configure() {
-	ruby-ng_src_configure
-
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
-		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.11.4.ebuild b/dev-ruby/facter/facter-3.11.4.ebuild
deleted file mode 100644
index 28bfa5860ac9..000000000000
--- a/dev-ruby/facter/facter-3.11.4.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
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
-	EGIT_BRANCH="master"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
-	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	dev-cpp/cpp-hocon"
-COMMON_DEPEND="
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54:=[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${BDEPEND}
-	${COMMON_DEPEND}"
-
-# restore ${S} and override all phases exported by ruby-ng.eclass
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	# be explicit about the version of rspec we test with
-	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		CMakeLists.txt || die
-	# be more lenient for software versions for tests
-	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
-		-e '/rspec/ s/2.11.0/2.11/' \
-		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
-	# patches
-	default
-	cmake-utils_src_prepare
-}
-
-each_ruby_configure() {
-	# hack for correct calculation of relative path from facter.rb to
-	# libfacter.so
-	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
-}
-
-src_configure() {
-	ruby-ng_src_configure
-
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
-		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.12.0.ebuild b/dev-ruby/facter/facter-3.12.0.ebuild
index 683775e7668d..47277b802f63 100644
--- a/dev-ruby/facter/facter-3.12.0.ebuild
+++ b/dev-ruby/facter/facter-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index 46ce9ecda970..c1c724b3dfd4 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -1,7 +1,5 @@
 DIST gherkin-4.1.3.gem 350208 BLAKE2B 3b0f54124c9f29c9216aaa9810526f1e11f6243b02143443d0ac18209320c14fda67f1c36d3056dbe5adbc18c36f72270054c17a011921eb87f8d21bc3e8c3c9 SHA512 7c113172ddf38ccf7e49eaac19355f3cb991f69d7499dba9189f375b75d3614f349fc6374e584a92c1223b0708cc8944859b4b38e28d79779a5091fa0c775e6e
-DIST gherkin-5.0.0.gem 340992 BLAKE2B a8292fde04c98c409423733791e78b9d6e40a7a60b59a1acd0a0e9c6df0be9185e90f1c5af6ce0ac39f352457c18094c495557fb05323eb7ea5ae8ce27008950 SHA512 cc782e37f5aea4ad0776f5336e6218b77e7fd8d193786acffaa44685de3a2592e4e6f37a3787add807654901afd12bc2d094a782b154bb2be9e2cd16e283df2a
 DIST gherkin-5.1.0.gem 29696 BLAKE2B 2439b82a147a546e8df71e11996f9560a8720580e07795542fc81781449b483a42e54251f3d0dd3482331773b1cada1d61b468bfcec2a9464ee2542eef2ed13e SHA512 d935ccceaec493736f337a4c3db69909858d15f4c41e93ecfc6ca31a30fc48eec1cecbe71d455265e1062006f49f05461c9860c9b3cc4806bb25f42dec6f504e
 EBUILD gherkin-4.1.3.ebuild 576 BLAKE2B d77399ae72a01d8560c19beb62895afe101fa8cb9d3e3b20c2cc58a3f8947ae63d15730601ea3e0b5528b580634085374344ab3bfe550b9041ddcb25be3751b9 SHA512 38aa1134b3056e7485a9e3dc24293fffbb0a2fed1bbc57ccb17df9dbdfb610e6685eddadc98b7be46de29990ebff9680ddcd12832b6807bc98d3a8020607fb11
-EBUILD gherkin-5.0.0.ebuild 570 BLAKE2B 123b9798a8f8798dcebceec2cc45b5d1888c36c9044aba95efc2a70b1e462cb4d769c0bcc373decfae1b683fe85c0b92f3c8da1e42695824f7f7e83212fbce9d SHA512 7ea2209ad7c942b049701d127fdaec66c13357fdf2f4fb4fbaa978bdeac1b1c75fdf50a699378df5cbbccc750c58f1edfb0a4100688f27c489e2a04ac7aba8b2
 EBUILD gherkin-5.1.0.ebuild 570 BLAKE2B 123b9798a8f8798dcebceec2cc45b5d1888c36c9044aba95efc2a70b1e462cb4d769c0bcc373decfae1b683fe85c0b92f3c8da1e42695824f7f7e83212fbce9d SHA512 7ea2209ad7c942b049701d127fdaec66c13357fdf2f4fb4fbaa978bdeac1b1c75fdf50a699378df5cbbccc750c58f1edfb0a4100688f27c489e2a04ac7aba8b2
 MISC metadata.xml 342 BLAKE2B 9a34d41c97eea1996d1fabbee85346c55ab263b0f7087661038b42d2fb25d05f03ec46cf804f8972984200b9891c5ff8b77d26faf5edd8d3d63a76e25ec66b5e SHA512 83d54811e863b8af9f5ba53f081e140d12af0d20ba5ae7273317fd42aea5a5a0fca8f742352794dacbddcdca932dc2ea60e1201f3d6429315210da99578f844e
diff --git a/dev-ruby/gherkin/gherkin-5.0.0.ebuild b/dev-ruby/gherkin/gherkin-5.0.0.ebuild
deleted file mode 100644
index 0d05aa78d10f..000000000000
--- a/dev-ruby/gherkin/gherkin-5.0.0.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
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-# Don't install support scripts to avoid slot collisions.
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast Gherkin lexer and parser"
-HOMEPAGE="https://github.com/cucumber/gherkin"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="5"
-IUSE=""
diff --git a/dev-ruby/google-protobuf/Manifest b/dev-ruby/google-protobuf/Manifest
new file mode 100644
index 000000000000..e96a989e88de
--- /dev/null
+++ b/dev-ruby/google-protobuf/Manifest
@@ -0,0 +1,3 @@
+DIST google-protobuf-3.6.1-ruby.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
+EBUILD google-protobuf-3.6.1.ebuild 905 BLAKE2B b9af584f19a244535574ef187d5b5effd8cd823d96c4706c00cb7ef0c29ef81c258c62e89c5c23975a35ce26ad79abff2bd6ff34444479568525941a134ca830 SHA512 b18c47f7915fe1607568d9dbf0c159afecad4e84b7197cf1748e4ca6ef05e71ad85f001b29e172d8a4ccb4cd3be4103b7f4b2acdc458b02e94b74dff9a497a72
+MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.6.1.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.6.1.ebuild
new file mode 100644
index 000000000000..bc07705fb0cf
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-3.6.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Protocol Buffers are Google's data interchange format"
+HOMEPAGE="https://developers.google.com/protocol-buffers"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
+RUBY_S="protobuf-${PV}/ruby"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" test? ( dev-libs/protobuf )"
+
+each_ruby_prepare() {
+	sed -i -e 's:../src/protoc:protoc: ; /^task :build/ s/:compile,//' Rakefile || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/google/protobuf_c extconf.rb
+}
+
+each_ruby_compile() {
+	emake -Cext/google/protobuf_c V=1
+	cp ext/google/protobuf_c/protobuf_c.so lib/google/ || die
+}
diff --git a/dev-ruby/google-protobuf/metadata.xml b/dev-ruby/google-protobuf/metadata.xml
new file mode 100644
index 000000000000..28ab0c15f206
--- /dev/null
+++ b/dev-ruby/google-protobuf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index 880542489f53..e2faa17f8c14 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -1,13 +1,9 @@
 DIST http-0.9.8.gem 66560 BLAKE2B 15b6cc066d2b04c3c6df604787f69b5079dacd277dc95a74b56832fc26cd84d2b631b60a60baadaf46368e5dfda30152983c335faea636490000bc5153d11736 SHA512 bb89147a3c28ebd75d2453e51c0c422557907e055b9a20a560b803bc64edfcdfe96e997ff225a26c9ca278211b0f70faaccf2d18ce2cdc9fd95bc4048093ef68
 DIST http-1.0.2.gem 62464 BLAKE2B a7801cb8389473f5dee9761fffe510ed2228ecf01d75e61026a110ac8438c9344094a5f50868536f0641740a3663a6aebacdc2f3a8294fa49894549b7a6e3bf0 SHA512 fbfa76f588d46b10dfa0d3b319d0ca1a5a92749575cf27791febaf5d55f2e4458cf34f48d8b9792d4e220c89c702b75b039ca5b66d3c43d31bab982082312113
 DIST http-2.2.2.gem 67072 BLAKE2B d2aa0f155085b60c3a65af6e5cda58632708f1aae000d9d52dcfa5fe3f6880000a4dff749810c7816bd1920597f456f7c9e7c080a4e524d578983944f0d49194 SHA512 9c22f7f4473e5cb0b605b9c8d25c1a93c34e7e440fb7cf4f3690cb9dd9e65ce3619d0575da3d97da6dfcf8e1560113b638bb447340605bebc160f589fb007bed
-DIST http-3.0.0.gem 69632 BLAKE2B e02ddc7e7f2747c2b20fc90b38c1c16c315eda8b800d93148aa0cb1ac0194c2fd5742fa346b18a8f60d4814db7d9e0200ad55c94fd2f8f2cb2bf29d50a22da8e SHA512 ef8c4148b68838e0669d5012c3548d373ef99d9273eb2ea25e7e0237027c766ffdbcdede766eb890f042b7211c2ed953688a372c46b120bf0bbd045c06b8aec3
-DIST http-3.2.0.gem 70656 BLAKE2B 9be294d425169318635db9236b3460e1a863e9e0ade07f1bfd97f6c12e75ea40c4c39ea5eda7c82017b78eb91c1c5703229022a9db20fed709149476a53e5936 SHA512 2766cb33d753ba641d9fc5de5c7e15790c6ce3d00f2065631b4e5006ca90f12b38257d8842c99f46f4dee527434c7b7cab2d99476b757937bd4fcd6d81b6cfb4
 DIST http-3.3.0.gem 70656 BLAKE2B 5c52864168663640389a0f107e1bf8a202654a8b479c92bf5126354d360adcae45a9b4596da7cff2e412fee88ed3622870c4e2bb18eca97466b4ede28baa2a08 SHA512 fcb2549c22974712e129306b472c1a32466c50add85eee9a558582697c7ece26cb7a1db6da6aaceedb8bfd134d1213090c158db510fe53ddbe201bba6bd22c68
 EBUILD http-0.9.8-r2.ebuild 1079 BLAKE2B 0a6e4c30901542b3ca659b19a7308eab8b7dc6aa63dddaa111fe922b14c0db408d1c9c4d22c821038376100b329a3ac2c298e5ed6a036481464bbd49e8d6a715 SHA512 bf9e8e66f026a7fe1a82536fd21d3607d070e58c9d657bee9a3f58ce30b0e3f0aca3ad6445eac61128deafa3eae5a1a2452646cd3d66631769dd64f336172267
 EBUILD http-1.0.2.ebuild 1066 BLAKE2B 8254d2606eefeb6f3088fbcd8a3b40bf5c81f19b8e70c45ae246af3c517ae33041ebda64c7838186842f0ab3146e0d60f7e88abe70a4708dc97ea74eab6ed7c7 SHA512 61835402afb957f5e5d0659edbf7fd7457c2801cd2c9f151e87de4bf3ca57bd0a21729e1ba2ebf0490c8586c472311fe299d54f478d03cc6dfb9ee0f72d67a39
 EBUILD http-2.2.2.ebuild 1232 BLAKE2B c15bb91342baa306872e609cae8546b30ebedaa8c0388859f94c597b3a3fdfb08f50cb60e14cbe8df34cb8c0389a283f60a0beaf303068fc38417e62ef2e7222 SHA512 e24e112a1ab81d744c8046561c1314b57439c67654250542cae7921e7fefbf716610e1bd3775936fdcfe8db0c9c72b56c8b12a4229c5ae342d1a916675c3d3a6
-EBUILD http-3.0.0.ebuild 1228 BLAKE2B 581bea6ff67449d0bacb2eb8038b38405ed97cebae6be2108a8194eec267932ee9f6014743eddfcc9138076bf507a36f0eca4d64577dda7100f83146697d3f52 SHA512 4ab960efe6d5b79b49af267d9a26e233d49d278fb3f839a9c9052ffe74bbfb96976bcdd5c00302b0c7cc4399a78c25867f4c7a548b8ad903c4700387d7ecc97d
-EBUILD http-3.2.0.ebuild 1232 BLAKE2B 09cd0bdc0adc6926e7f82a83886bad44fa04a51b726cf22e9a32a8ec9caae0c7d3e1d3a4007a125e08da6e8cbe6a382a2f391a11e9222d2b16f9de211c5176b7 SHA512 48910a29b81c2c2e3f608076823f3f76cc0eef2b910f36564a5466bf33e69975ac47a0b388fdd9930b2111993bdc1deb0af1e04e98f791990188bd3b8236193e
 EBUILD http-3.3.0.ebuild 1222 BLAKE2B dd511f94e713b5974f0302cc41ab6f430d95e57bb55fd212bd8d8350739f9c4c9448dc0cd7784f01de3ba966a6f7d0c7b2e1a583f46f2456255f5920815fec55 SHA512 edd2b91ce30508a694a4442d603280974c52ef3472cbb013b242568bf6001e7bc31ea61e329dbf386d30bb81693dd8bf64eeee718c4700464ce399a123c9104b
 MISC metadata.xml 339 BLAKE2B 2508769568914caafa01e9e8e6517a7cf9c1733c772b3c605c8dbb056efb8dca3be9525e1ba2ac610bd6d5b5dc02b7625f3569dce0597444240bc2ed8d8449c2 SHA512 9b43a2f61eea32941c251429694bcfe432f284527c332efdaf4187c9ad8c6f53cd924421ca9d56cefce75cbaff104d4f7579790fe09b45a4cced06bedc44d1c1
diff --git a/dev-ruby/http/http-3.0.0.ebuild b/dev-ruby/http/http-3.0.0.ebuild
deleted file mode 100644
index 290fe8f716ff..000000000000
--- a/dev-ruby/http/http-3.0.0.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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy-to-use client library for making requests from Ruby"
-HOMEPAGE="https://github.com/tarcieri/http"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3
-	>=dev-ruby/http-cookie-1.0
-	>=dev-ruby/http-form_data-1.0.1:1.0
-	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/end/ s:^:#:' \
-		-e '1irequire "cgi"' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access
-	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
-		spec/lib/http_spec.rb || die
-	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
-		spec/lib/http/client_spec.rb || die
-
-	# Avoid spec that may fail with a running web server
-	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
-}
diff --git a/dev-ruby/http/http-3.2.0.ebuild b/dev-ruby/http/http-3.2.0.ebuild
deleted file mode 100644
index adc8cb7d3193..000000000000
--- a/dev-ruby/http/http-3.2.0.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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy-to-use client library for making requests from Ruby"
-HOMEPAGE="https://github.com/tarcieri/http"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3:0
-	>=dev-ruby/http-cookie-1.0:0
-	>=dev-ruby/http-form_data-1.0.1:1.0
-	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/end/ s:^:#:' \
-		-e '1irequire "cgi"' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access
-	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
-		spec/lib/http_spec.rb || die
-	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
-		spec/lib/http/client_spec.rb || die
-
-	# Avoid spec that may fail with a running web server
-	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
-}
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index f3fa7110e19d..a7b4a354fcd8 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -6,6 +6,7 @@ DIST i18n-0.9.1.tar.gz 60359 BLAKE2B 98201124b557dd7e77ea56c491a99274f90853eabbd
 DIST i18n-0.9.5.tar.gz 61494 BLAKE2B 2a7bb401d5e75022ba6c40c6ee08809bc8728fe9aa22f308c4d532e6c042df57970b7fbfa574494072d8e5d0e125a01498c1964780d2ad9588b0a57da299a520 SHA512 356ce1290b207ce1b3dbed4d0ae542d027e74c43f453359ebf401755a5a55fd1fd815a2f046a634246e41f54c5360174dac1076be9cb7bf82f893f0dafdbd4bb
 DIST i18n-1.0.1.tar.gz 61536 BLAKE2B d439410004511f90e010beb7ab90029367e9ddb876c2215e101fa9a3385c0420a774586ec626136957dedd66c8c7b3b9ddcc6570e3a7075bbd5a90e3508ddea3 SHA512 1d0e05e04318e31d35d19c1af3b6d3aaef3d45df9b2868b65fef9aa3628c9502c6f8fca4beb52aa8c7c914c46ff159da489bc2ccac69013808459e709358b4ca
 DIST i18n-1.1.0.tar.gz 61628 BLAKE2B bed8a93362659919194de09f5963fcd0129cfdacb7ebe9e08d8a5f8efc46748c02ad39197daa7ac68d8202ea8c81dcbe65d94a3ea1b675e74f93595dbb474235 SHA512 528e3c32d68aefe1ac4b0470249af2aec9a16b76f57f703182b6540d8e18625bf7e50aeda7782b6c64853f1be5561fe49fcb4d641d388371f8066b92d5a27161
+DIST i18n-1.1.1.tar.gz 61797 BLAKE2B 3ba842d195075f02fd46be4e9b69250c93007da0528d88446b662006682130ac31a7d00aaabe6081f2cb1df0b415f1610ae26a3bbeb446029165549f59d87697 SHA512 7fff47ab8aeab3e03546af4c4b7738ccaca2fb3fb7b16e3cb0addd3ec57091c469a95bf4848dd01dbc5f831bee280c4ec15e6d334ce1578e4b3ed27f98077111
 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
@@ -16,4 +17,5 @@ EBUILD i18n-0.9.5.ebuild 1475 BLAKE2B 177aa41b3e8af750c7eaa59f3c1f8bbf0b8cbcff0b
 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
+EBUILD i18n-1.1.1.ebuild 1439 BLAKE2B 4d045839b7f25f38878b3b5c98d45f8c1e37b2b2fb046ca152378e8b5b622ee0a764e0576ba6cbeb8bf6a35f64760770528fb420f5187effdbc7648e6047aa47 SHA512 4451f13217a20a737191bbd72ef5cb469e749629b66eef875334b8a133d4b6c91f67f4c36b037cbe2529b2ab3032bec04b68e178d6d49388440c29589128aa78
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-1.1.1.ebuild b/dev-ruby/i18n/i18n-1.1.1.ebuild
new file mode 100644
index 000000000000..0601ded3a6c8
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/itextomml/Manifest b/dev-ruby/itextomml/Manifest
index 1f443f803883..5cf2ec9d3f28 100644
--- a/dev-ruby/itextomml/Manifest
+++ b/dev-ruby/itextomml/Manifest
@@ -1,5 +1,7 @@
 DIST itextomml-1.5.6.gem 125440 BLAKE2B b0894d26d20e85454c310589509cb0eef371f3c9139450ce8dcd25fac6b83e831557e05ba54b449557422b23d59868ee75f022fe4ba1c205d32926f923986864 SHA512 b74f5a9ca4eb669fee547bdf729e456dfe07b8be4e9ac0d1b7c3ad5d4e99371ae7b5bde565e6472ab07bbcec2754d4ee628ba07a6a7e938ea8a55a6023c2f1fd
 DIST itextomml-1.5.7.gem 125440 BLAKE2B babdfdb7e81415a06875ba72a84da31f910bb0f634e2fd2ea724785b56d84b6d6ca7e544ddfe617a53c91a89314f0e0e8c2ac0f20f0cf8e26c11327f865e423b SHA512 65fbf03096695330e32ac9093e923ca50bb92a3b32a7657bea65e6abf51c7824fc8b650f564352c41d28e846cba62a60ffbd57ca14ad2587e3164e48d7d1043f
+DIST itextomml-1.5.8.gem 125952 BLAKE2B 1fd68b00bed86e8f799d5cffd4de40d50151d18a11dbfbc91dbbc857295959d44c118bf39fcf4e7089e466d07f2ed03ad0d04c16c696fd6b7c4c8d101fd0c0ac SHA512 5fb1776ba7de3f0d09eed64bff8fc04c4a508cb7360d82853d65dc481bd0a43253c0a4edd4c9eaa0df835f9a21d6ed2c2d318f621c5d071b6566709d769c1312
 EBUILD itextomml-1.5.6.ebuild 742 BLAKE2B a3b0c797eb53d82160e9fec01e2c2af41be577d5265cc69f2cdc0d3c25f3a61f3b5764213434f9f88d9b41cca9ef281435de017bbf01a7280a30d3e2efac8ffc SHA512 981eefe3909d3bb29cebc9751026f2d057372a802437ebea804d2a92a184913a1eef279a1a5f78ac1f447dd464ae2117efb08c774ddb3b141e3feb1dfa7e40ef
 EBUILD itextomml-1.5.7.ebuild 742 BLAKE2B a3b0c797eb53d82160e9fec01e2c2af41be577d5265cc69f2cdc0d3c25f3a61f3b5764213434f9f88d9b41cca9ef281435de017bbf01a7280a30d3e2efac8ffc SHA512 981eefe3909d3bb29cebc9751026f2d057372a802437ebea804d2a92a184913a1eef279a1a5f78ac1f447dd464ae2117efb08c774ddb3b141e3feb1dfa7e40ef
+EBUILD itextomml-1.5.8.ebuild 739 BLAKE2B aeaad94739cb92e716df351933a59ee541c32e84172580015bc29cbad57283c6231e36e5ef458989ed69a8d32deed03ffc76fb5a072528f4885b5e96e46b9f98 SHA512 cbe59e5b1172a618652c40e801f1825e6040e04004792239728e9d46058a99717bbfce88a9341243dff919e8098c94e429a4ec62e7bfb452726860437d0552f1
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/itextomml/itextomml-1.5.8.ebuild b/dev-ruby/itextomml/itextomml-1.5.8.ebuild
new file mode 100644
index 000000000000..4e99a8e16369
--- /dev/null
+++ b/dev-ruby/itextomml/itextomml-1.5.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="README"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Native Ruby bindings to itex2MML, which converts itex equations to MathML"
+HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+
+LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+#Tests don't fail here
+RESTRICT="test"
+
+each_ruby_configure() {
+	${RUBY} -Cext extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext
+	cp ext/itex2MML$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/test_itextomml.rb || die
+}
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 997ed35ec181..e4ab53f009ce 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,5 +1,7 @@
 DIST mail-2.6.6-git.tar.gz 964019 BLAKE2B 5480c92c6d338a36ef654ca959959872bb10adb14f06019a059814b4e1ca3b7d9ab45f9ba296549c356bc1c1f327cb4012108b0d1afaa4662bf6a6abe5bb0d00 SHA512 ab97384724bd40603af0a90ab52d8694132dda38837fa77704d857418bfa707244b69f9325405d38231a03f4ad5f213f2f66dee2d89ea72e6df543d3cb2eadfb
 DIST mail-2.7.0-git.tar.gz 620982 BLAKE2B 67ecf6b362d74b265784d6b865eb1b2025e8e0834f46f46eb6d42973e39c2bd38a80f3cd066e58e81c87629f2df73a8afee89436d7020f8ae184587edd1221ff SHA512 13cc4ba3a49ff9ae74691da0fcba41064b3d5af4fbe34c6e83563a6da069fe006707460534f9ee5b0c613039cdf207044272944bc04eeffc5f8834332554ac63
+DIST mail-2.7.1-git.tar.gz 625251 BLAKE2B c1efbb259042155e983c1971fe9821eb0dd850089bd04cb0c74513f6f17dabf8ecc3155d9e5846ae657383f522872323f8fba37d51fba4318ac682d18a6d4c50 SHA512 17c601c86715135331f750048339a11a67a17f34486dbafa3ba7e9af9970d60927a2fa95c72a398418548df1fdf5addb2ed3afe9da7dff1f0bd949438726be1b
 EBUILD mail-2.6.6.ebuild 980 BLAKE2B 4ac5d9b1c8fc5e02f2b2a8f606ad2f51d630341fe03654bf971e10cc03b5dcad8a648d003ff6e27eea5723983a855c0a701a65241221f2e24fd6f036047564ef SHA512 23261b700f9b8e0b052a2cb3e00130a4f23b2378ece7494cbb349f118478f8100a8ddf68fc128ac5946521ace8d59cfba1b5fe177c95b19ec10e9aabeb62ed7f
 EBUILD mail-2.7.0.ebuild 926 BLAKE2B 1934ae4dc2ee3cc5d9ed18c152161f3307443d7f1b3cff21f6d939f22ee7253eb2cd57cfbf834be0cded1eb533a06c920365e5d5f4e62aea02c83860b160fc8b SHA512 e0521b22add7d37a7b7aeacd19f6a77f0e87ee168b6f59e8bcab195cf302795dadcc8fce84d5c5a8970abe57f144d49649ae22821cef57af1f28761c7ad9fbe6
+EBUILD mail-2.7.1.ebuild 901 BLAKE2B 4b4c4ac873a857cb611ab1d887ca41fd8599b552c55d0db7e621d1a85d8b99a57a98b68c65237bca64ebe9570baa99b4beb9aa073434ec2bce157c5a36ce4296 SHA512 834cbf300c02e474c008d45cf3f59323314e0471bc02ec4236737bc234cdb3375550ffa6d13f1eaf1e9aadaf69938e6706d91242fd776aaf47330f3856342083
 MISC metadata.xml 336 BLAKE2B 05720c141d8870f2d762c280717a98dd07ff1d6d3679ab777e69669542b257e1cda8dc845b780d221699b8fcece77fe75f9b5226ee8ecce772bd51af22d7dd68 SHA512 0952e9c85bcf07cc1adc299d0812259156410f487f2b10a77a29f7871128fa35595b605579f85b0868179f60b978585ed27cdc069608094f7fe186b5e15ae1b1
diff --git a/dev-ruby/mail/mail-2.7.1.ebuild b/dev-ruby/mail/mail-2.7.1.ebuild
new file mode 100644
index 000000000000..b157b43d94e3
--- /dev/null
+++ b/dev-ruby/mail/mail-2.7.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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.rdoc README.md"
+
+RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+GITHUB_USER="mikel"
+
+DESCRIPTION="An email handling library"
+HOMEPAGE="https://github.com/mikel/mail"
+SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 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"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/mini_mime-0.1.1"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
+}
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index f998cd00d94c..3fe9843a29bf 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1,5 +1,5 @@
 DIST mustermann-1.0.2.gem 51712 BLAKE2B dedfd8c4f5a2819ffbf3a7f5462e656d7e50e28e773abbd391bf01c984eb0a25274ee1c5080da0ec5c2f9ac88294be4975ab4310502dd83ac74010443ac582a6 SHA512 89f27ebdcb6df3eac82159b77d6fb6b87fe3c0409e14975abbbca01675eb84c6b49c52ccf75ffa779ff0b476b904834eb349ecb416324e6c61a360d583aa16dc
 DIST mustermann-1.0.3.gem 51712 BLAKE2B 03672295ec33dd5320a40a2c5e5f78ca83a055f73e1f2f8b127f13cd04e0ce5f7bf34eba68f49e253c209db4e169b2a51dd21541d86debca0797b3dc2b3670d9 SHA512 776ad3f24e1165155def04a6e1ff18ccaf536606dafc3fa19b8b2c2576cd316eaa9b72cac37bc6ede3c48c7ed6c90e99a4388f60cdeaef0bca461e9caa4bb4f5
-EBUILD mustermann-1.0.2.ebuild 527 BLAKE2B a37a927827b74fa9e8b71053c8c9d2ea40066b79f06c9f4da647d7754d394a0cf1b299fce2c826485aae4a42302a6e0e1e095295d4a78839c6725080cab9e750 SHA512 0c10bdc8fc07946d1e2e3df1a5166ce4e409bc258be696c0ddc44ce3d338e17ef3dce58681e1e33cb3914830b005c5f30e877c9a4aca2afeb31c96b0685f32f7
-EBUILD mustermann-1.0.3.ebuild 520 BLAKE2B a2869f8be5032ae547598abbfa4a6c2b594c185b7adcc07ca82d492d19c3e8d1436a93d6d8a9731acabba1615f7448a6c6252441de2f68ab664c50cc5c207b99 SHA512 912d29301cd7e19ddf55570ce4028abbf29fc557d36856081418c4ab32eaf9554a6776ca72f782ab6f98de819087211ecd792998464aad80df8ad29612441be2
+EBUILD mustermann-1.0.2.ebuild 529 BLAKE2B 4dffdbe6e883d217b62ec93a5ed820c3974ea0bdc6892d3b1d9bf0c2ddd8bd7610dc27ba7712670906ce8177e2bc5e84db2ba19b675f24b8a5a96b5f04d93ce4 SHA512 d12a4c8b8f327295620c9d3dcd1347dc1f271233a9fc3e088901f6876a3fdbb5d6e032d68b44cc65454a5447b08eaa9dbf99516a4d7b9dc00cae7942afb1d240
+EBUILD mustermann-1.0.3.ebuild 522 BLAKE2B c39b347087843ed7e6b83b3a4ea66d9a1113cb41f7f4f6faeee58759424d62d0b2de1bdab49dc41b4a83ad0168ae52f3c71471b31c63e7b7fc32c0bf477f99e0 SHA512 53c2374dd21be7995c989672fea11bb79136ed75d5b51a8887fe5470874b8d810432697023248a217b80e8779f3ac4976461189fccfc13ee015676ac2acb0718
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustermann/mustermann-1.0.2.ebuild b/dev-ruby/mustermann/mustermann-1.0.2.ebuild
index f46ecaa20c88..0ac055342306 100644
--- a/dev-ruby/mustermann/mustermann-1.0.2.ebuild
+++ b/dev-ruby/mustermann/mustermann-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/sinatra/mustermann"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-ruby/mustermann/mustermann-1.0.3.ebuild b/dev-ruby/mustermann/mustermann-1.0.3.ebuild
index fb55411c2230..665219fb4c02 100644
--- a/dev-ruby/mustermann/mustermann-1.0.3.ebuild
+++ b/dev-ruby/mustermann/mustermann-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/sinatra/mustermann"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 50c50a84660c..568c86375300 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -3,5 +3,5 @@ DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e922737
 DIST net-ssh-git-5.0.2.tgz 206757 BLAKE2B ac9a317dc238f7e3e794e4d8fcccc063d5d34dbe2e50a142e701957ad5c754985523624e97ca0b7d5773d2fefc3f10f3d61b2976997abd29511cd3934ea0e0bd SHA512 6e96d4b3cb2f4f14aa046af72b70a5e3b218153db40dc64996ad0061ea89cc9ac0dc0510a4231734c7385c03436d4116dfe4c9ac4b313c9fc5b029fc8a6c04d6
 EBUILD net-ssh-2.10.0.ebuild 858 BLAKE2B c2780b2cdb45c313638ef427dbdfd588e121449df679d5f1b7423dc489964681cb440dd7e1b54bd5cc131eb9f40e8dae05095b82a3a73edb1dda884bec2dad3a SHA512 7b5630727ba7547c4a6f86e89547270064b77ec874eff574bb724ec8347994e3e4f38e01d1f981da67b187942e7cf648c09681d6a046b0a4a27fa623f2381087
 EBUILD net-ssh-4.2.0.ebuild 1102 BLAKE2B 323e79278e37c7ebb2c8620b9edbb5cca0c6a8dd6211d8c7bd6de0533f5d137b59fdaddd525ff431f6cf11d424c3e820212983af2ce330319a7694fdf29bfc05 SHA512 509757362c9077df31219435c98036ed0f731268d5a351d0c46bc1b5142587c0dde339777e0534005bf41cc0cbf62666a6f3d833b4711e07af8aa2cdd6497d04
-EBUILD net-ssh-5.0.2.ebuild 1012 BLAKE2B f4b494eb4597df23eb94c1da35cd15a52af2e3d0dc72fe58900a605c45b248706553a76cdb9476cf0679e1eac6300e1308480f2bc0906733b62024ac4fb1124d SHA512 9a2bf303cd377af5bf33db0a52c2bedd4c35b82de4891122a74f5cd44a0aefbb3cbd0cff8ca66baa881d6561a79c817662262a1033988dff8aa060ce9a5ded1d
+EBUILD net-ssh-5.0.2.ebuild 1019 BLAKE2B 075b59b9cee40c68bbb48e6b640dce85a83d763611b5a17564a754bd1060cdb29dd19c9424054907fe913fc3d98794ec58a09e4d4a2264ff6391e63c64c3d02c SHA512 580194ef8f34474a44d6d5953ddc0ff442a1e110c4682a95110d0a8da57c4a227fcceecdcd1d8e473e6209c17981706c4dd3e95d13f34c99e4af1cb75b3234d6
 MISC metadata.xml 542 BLAKE2B 0afb600fb7668a66e39bfe556157fa6a91eaf67299ba7560a550d041fced876a66ffc83700983fa4f3249a35785e93a7d980ff0940365df1fac626f22189a863 SHA512 f350079143da9f4e43f9da43556d343c01b88782a3d4fe8bdc08a7c901308f352fc9cfd0f998bd4471bed923ccbee0fd1d6112cfe91fa7b71ce9f39a665bcd60
diff --git a/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild b/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
index 6dae9d40dc92..922e6c46fc71 100644
--- a/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="ed25519 test"
 
 ruby_add_rdepend "virtual/ruby-ssl ed25519? ( dev-ruby/ed25519 dev-ruby/bcrypt_pbkdf )"
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index 75fbd442fd6a..51adc43d0495 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,5 +1,7 @@
 DIST oauth2-1.4.0.tar.gz 21299 BLAKE2B 1fe4640b374450279e556477c23972030d3aecac4c96e9174e57458deaccfbfa012e3bb66fe3db5e845a4004b91b763dab6f68b885ed7c1ddb2710cda29a8486 SHA512 2db67cba2403be8ea5d6f88f9818f295c29c08201f8ea5876c55cffe2fa926be465a11061654adffd77d13da9c7e56353ece7e4595cd9501acdcfeb58573b300
+DIST oauth2-1.4.1.tar.gz 27946 BLAKE2B e6edd113db26bdad09697c45efa5490bfb49b5c3fafdb7337c5f5c2b135025cc43fe7de450b3e106c6abfb8acb3afd676181ebd6aa1c18f6c5255597b04006df SHA512 14c039d19bcd177506e2f6189797b1791b54bd3fbe53973ad471c44744e3179c02e2f7a855a0cafe332e66819f1708d86c1dd89cbe57668ad642efa49e924b25
 EBUILD oauth2-1.4.0-r1.ebuild 1213 BLAKE2B 0b368de907181b41fd0c1216de3fa4f4c6fbce26992930730ceffa29874d737a217f8cabff23e70bbb4fd59a51337c325cefb655b4c350c0869e11fc15f04b78 SHA512 b03a27b6f9cf23bb31b24b0b1c70b9db980809774de90bad08373c8bcc5b588e5ec882f73be5a50605ea3b6e208d04804ffeb0bbe169dde1ceafde1f6fb73150
 EBUILD oauth2-1.4.0-r2.ebuild 1393 BLAKE2B 8d85f689841ea25380c6c22cf8aa2b0abadb615e6df260980901790ea77718f11c28055a47863593f4b13f163d2afa15aa0cd6098c896a946f16f6f22b0822aa SHA512 9b68eedf5b6305ec3c87d441c24a43ea0129afc57bfc7547a0a493ccce0e4ff51052a41811b1f5eef946e8683aae8c32002d1a8bf1bf4bccbeda25397ca9a507
 EBUILD oauth2-1.4.0.ebuild 1113 BLAKE2B ef45c62600507cff11b8240c3dba97ce041eeaf419f902a4727cbb74406fb45013fd230d391572e95d926f457d42a9b0c2f809b828bab081302f314ba241c8da SHA512 eb64a82c52fb1df3bbd4ff98a0147a06339119f57540cb62514faad47a28963e79fa37941b668f5f353b6c5461c02e0a827044edec19c471d6f8b1c1c032c255
+EBUILD oauth2-1.4.1.ebuild 1400 BLAKE2B 427fdc4347e838ab791ff9f922b1a92f2cc4f69d01eac9478e097c71e316ee2ade2ce59e92ec2cc8e23a2325add6fe2d50a6d8be79072ab1df061160709fa009 SHA512 51bdf055cf08d326f07c01dea232978625d87e32a8ea431cc908f9f291ae90cb64adee3dbbce75804de2f6434af387fbb555e0d08d8449b58b511530a75b81c0
 MISC metadata.xml 341 BLAKE2B e2896d1d266992c01ed373b489cf71b9c4a7a5f57a2af37899ff63793dad41b9213eee0fd94f269735f630815819f0a08e51e8739b89a7e251b60c2f6894e26c SHA512 33c5be74161557ae3e5888730256536cd02baac6c26913add84d8ce90854c4a3bb57c31fec1287bf560268c681ea3acf2119f2fea3162dd07e3962ee34d74f9e
diff --git a/dev-ruby/oauth2/oauth2-1.4.1.ebuild b/dev-ruby/oauth2/oauth2-1.4.1.ebuild
new file mode 100644
index 000000000000..94d54df71dd8
--- /dev/null
+++ b/dev-ruby/oauth2/oauth2-1.4.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
+HOMEPAGE="https://github.com/intridea/oauth2"
+SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.16
+	|| ( dev-ruby/jwt:2 dev-ruby/jwt:0 )
+	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
+	>=dev-ruby/multi_xml-0.5:0
+	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
+		-e '1irequire "uri"' spec/helper.rb || die
+
+	sed -i -e '/yardstick/,/^end/ s:^:#:' \
+		-e '/bundler/I s:^:#:' Rakefile || die
+
+	# Avoid spec that is too fragile in relation to ENV
+	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
+
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	CI=true ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index cd3f78bc8cb5..a609dfe87a26 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,8 +1,6 @@
 AUX postgresql10-tests.patch 1747 BLAKE2B e0a992461221f31cca1f39453e077a1d04d3f436e0eba3b683ed42092d266a8edb8a46e61933ac41e94ead483bac325833f1c21bfc57cf7ebb160f046d80e1f6 SHA512 89a7937b0791307366fbc97549d48cb7bdf92b66895b1de7dd554a040ad6a08b4af69709bf1318df95cdaf9824415d76b5f6be98be48995b75909fbfeefb6295
-DIST pg-0.18.4.gem 219648 BLAKE2B f6b957551b0b537dda5551bc8974f5bd2f8a4ee4ecf482a5d3dc3ede0ad610507029693fadbfe9d2e2940f63d82da61e535e802919a82f7e5ea23c1165b81847 SHA512 48e792756c7ee205164b59a9515ace6320150f0ce1907293f8c1a736300c62c0b38c1be49e8ad4f1a50f29abc7f72bb43e742a8e63d9606eff4c7d2191a4fb74
 DIST pg-0.21.0.gem 214016 BLAKE2B 9e27646cd85bc97dedfb980f4851b19a1ef2aad17f6a5c60726c1683642af5c4cf87d518b300fb4c894e1580f808f8af6158b57f1ac25971c1fc55818abee6f4 SHA512 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b
 DIST pg-1.0.0.gem 213504 BLAKE2B eecaa632c7903f89c503ad92ccff058bbc6c2c80cbf83d656eeb9a5b919b84bb270671ad4e0fa08f55be1bcfc69eb8e13b815c37c601d300de503383f1ba5908 SHA512 1cac025ab8a95b4429534b98377eedeb1e3f8b2c4a859363c4174d477577caf39557b002cde4e745189fa9a29e9181ff9d564d822f15ff5c4f03f7389b0d0398
-EBUILD pg-0.18.4-r1.ebuild 1799 BLAKE2B 10a47c3c1a31f3c4c343d70e08be471d8e9dc4c7b8f4dd334324c0a3d568523553b07e8e29a20383583b6662db41c706cb55d3d36d632ad2866664d79c50508c SHA512 9bfe8233130cef910421d985ac0f432464613862116194124c0c1f3d214ddb9f56effa4fa8b19c522610f0460342ed4fb0b9571181d66d513f8440c01523b4bb
-EBUILD pg-0.21.0.ebuild 1704 BLAKE2B d77c9188b4139e9596764bc68f388f65e4d1790b9f2847bc57fd1cecfc8ee92285efad93cd27224798dac92636a72d6090a7185af229501f8cd10438c007e2a3 SHA512 32131ef3251bccc66836f41cd5c64dd44c7b6342ec2ae5ea2f8029c6b6967fe9e910ead0437edf3127db96105861561ce0d64f9ccdaff933fa7c2416692ac304
+EBUILD pg-0.21.0.ebuild 1700 BLAKE2B 4878b5181a856488ba4d22cee7866c4082636164ace979e134cc480f9f3daebcac8b752f3f53bff6ca871067f8a7de1777b4d2846b2d806bae1ae6faed10a8a1 SHA512 6e0f539145f8ec93a83dc21f1a3b4185b003d201b13c94821295ef9efd0fa6f2d6ad875418bbeee8b726addbb89e45360cf12684a0b0787f6d6aed9d34f87865
 EBUILD pg-1.0.0.ebuild 1655 BLAKE2B 6427e234010712acd305575b7f08db4740547349823a2661984bcd058e38f461dc0ba4f33f728354108925d31384f9bd503394ad3457acdb3039b64bfd8e8b77 SHA512 277f349b3da11836fca7ddcd2d3961b1c83dcc099bc5c06b3af4fea2352585aae9f25330c3e3507f781800ec3d989bacd9316913dbfa4b578371cc2c596fb10e
 MISC metadata.xml 340 BLAKE2B 8ef2673e4dafd5495e2385e4216ae715d3334c170e81f45f823f8ef6942533ad088115e6f8e3c75b35e2af28cbbf1e3446cfb8b2eb084df7b9a3adc6c869c183 SHA512 76be8c407457ed3f1a8e2caaf5a10949a830d4033d8d18e88830f37d2b62d4ff9675367f123364041ca88f5af972d4d7152c1f2832a5c891b516a83f989e1598
diff --git a/dev-ruby/pg/pg-0.18.4-r1.ebuild b/dev-ruby/pg/pg-0.18.4-r1.ebuild
deleted file mode 100644
index 485cd64b28cd..000000000000
--- a/dev-ruby/pg/pg-0.18.4-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND+=" dev-db/postgresql:*"
-DEPEND+=" dev-db/postgresql
-	test? ( >=dev-db/postgresql-9.4[server,threads] )"
-
-RUBY_PATCHES=( "${FILESDIR}/postgresql10-tests.patch" )
-
-ruby_add_bdepend "
-	doc? (
-		dev-ruby/hoe
-		|| ( >=dev-ruby/yard-0.6.1 dev-ruby/rdoc ) )"
-
-all_ruby_prepare() {
-	# hack the Rakefile to make it sure that it doesn't load
-	# rake-compiler (so that we don't have to depend on it and it
-	# actually works when building with USE=doc).
-	sed -i \
-		-e '/Rakefile.cross/s:^:#:' \
-		-e '/ExtensionTask/,/^end$/ s:^:#:' \
-		Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/*$(get_libname) lib || die
-}
-
-each_ruby_test() {
-	if [[ "${EUID}" -ne "0" ]]; then
-		# Make the rspec call explicit, this way we don't have to depend
-		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
-		# the whole extension from scratch.
-		RSPEC_VERSION=3 ruby-ng_rspec
-	else
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
-	fi
-}
diff --git a/dev-ruby/pg/pg-0.21.0.ebuild b/dev-ruby/pg/pg-0.21.0.ebuild
index bfe07cb527f7..a54007476b16 100644
--- a/dev-ruby/pg/pg-0.21.0.ebuild
+++ b/dev-ruby/pg/pg-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index d5ce0de339f0..e69be3237443 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -1,7 +1,9 @@
 DIST psych-2.2.4.tar.gz 133451 BLAKE2B 665a234b88ff9b5f2dcd6ddc0fb249e2af6a2594b1e3817e68fa47d58556f211568b61d416be3afc91a1cd40237530bd0751d52d49a63ccccf2ff196d7ec4faf SHA512 f56b0e68ba2c6884eaf645f4784dfe56667b8527def29bcd2a36e9f47e11acbdd4a0bb7025988b28cca1413f9f15524ef9fbe61efef3ff295cce4733d3143894
 DIST psych-3.0.1.tar.gz 133120 BLAKE2B 322b44a23bfa5afdfaa7f90681b2c0c4525efc88c30950ae4506e7d990ca117c840491b2bcc0ab1d931a4febe8fe67cab73933ed5265a41cac451746e93a9138 SHA512 7a77b6e0b881428f07c147ff4e4752dc563e4c76f8a3d3f9fdf5ec9b95efd2d2fd8109f131a5f911d905f420f0bdc8631411b80f38f753d91511ca7153937075
 DIST psych-3.0.2.tar.gz 133139 BLAKE2B c337389b9bde02ca6e7d8058a605c1597aa17e5a8b3543e21195c471b29d0e3fc865c29126fb9c58bcb7be47f03483d47437f26f680138033a07f6a670410110 SHA512 158a14added34fc410f6ef46b3c64081a16d22021f99e000fe83e9ee7cef65c4bfbc37d580873794f678f60f8070275d3c7c471d5eb75c6e1fbc5c36655b0d46
+DIST psych-3.0.3.tar.gz 133778 BLAKE2B c28ba4ca2fa8b042bd8f13294330c7704401d861ff082fc2b97c59b7f5ab29001a44184992eadd78fa125ec14ca71c9e79c5e71bafe46471643ed0fd62180165 SHA512 cc2289dcdcaa7f812d03580bd05894fb66c7c3c161535c8f17f790a6a9c35c5623462102276f63c54b884a82d86359b3e0f455b2427db3b6987ac5d71010c8b4
 EBUILD psych-2.2.4.ebuild 1081 BLAKE2B bb889cc8ceb1de707295b79d0c021486bdaa7aad0b3d5dfabb5162f9634a15e6e3cffd4ba670c035a9ee89c3806b35a8f2ec29b6930d562c92640a1a27c849d7 SHA512 f2047f58babbf1893647c28b1a8346f7f3c4b61c229206714aa5185817439766f192c54bddb82b6d14767dc1a0542cc879478c6e3b2abd63f3bca99f99a59b1b
 EBUILD psych-3.0.1.ebuild 1013 BLAKE2B 69fe8adec5070f4f4011922a0b16b378700877dc12a420bf98a81b01f896e04181f297eaa889eeb653d8dc96bef56c16bd17c877f890785da81509c8a2b066c9 SHA512 d6fc28434460057a07598d0ef837b1547cde0e1a64270a226572fd93ef02fda55b70fdcdc66df8c9658e757dc492c66a79186e3bbadbaff492c44e3d4ebfb5df
 EBUILD psych-3.0.2.ebuild 1020 BLAKE2B 36e99c1200816d8a8ab859fcb3756dc8363fabe4bdeeb0f91c2ba7bcf7f78d32a744d2777c1a4679b944032e0fade7b093913cb2a466c802f061fc30572b6c23 SHA512 d6faeafd63a3d25c4e414e818bd56f6c3891bf82aa2904d76ca8262b0a1ca7b9b908d931cd372f53a350f486f5792412f4fcf4fcac1b8904e83ae3ea0bfee356
+EBUILD psych-3.0.3.ebuild 1010 BLAKE2B 0100f53670d57576e83870ca2a72bad6ab38bccdda369ad9b7b0b9d7b56e03946c06106ce50dafa9a91c352131310de55e9c36b597ce9ea9c8b15f203d8a6372 SHA512 8f8ad8c37bc5fb1f083aebbd8a190b7c03f2a00950df394ed458313524fdd76856e42556e482ecea413a899eb5c0defdfb327c08c3b6c62fc87bb951fab5fb05
 MISC metadata.xml 342 BLAKE2B 0ef324da844625ecd5d24a84a61f2845b689deec699669df0fbb6ce980509c10b1597047f917577cdca9121892ceb30fdd777fd2c66892e16ef41bf011b2cf3c SHA512 d1246a904cc4a3185ba2d91dcc6be5230461555cb57d71f1715c163caf5f8954937cbf58ddd71647a0662b65e59e917dc2dcf59d2ce92e9d8e600a3818422ca0
diff --git a/dev-ruby/psych/psych-3.0.3.ebuild b/dev-ruby/psych/psych-3.0.3.ebuild
new file mode 100644
index 000000000000..8d17eb10b18c
--- /dev/null
+++ b/dev-ruby/psych/psych-3.0.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_EXTRADOC="CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A libyaml wrapper for Ruby"
+HOMEPAGE="https://github.com/tenderlove/psych"
+SRC_URI="https://github.com/tenderlove/psych/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" >=dev-libs/libyaml-0.2.1"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "minitest", "~>5.0"' test/psych/helper.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/${PN}$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:test/${PN}:. -e "Dir['test/psych/**/test_*.rb'].each {|f| require f}" || die
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index c8ff954ddc9e..bb608ecb26e1 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -3,5 +3,5 @@ DIST puppetdb-termini_5.2.4-1xenial_all.deb 20538 BLAKE2B aad000bc0e13e3c97f4428
 DIST puppetdb-termini_6.0.0-1stretch_all.deb 20618 BLAKE2B 939f224a25d404e733816af5025258ae676454d565730c5173b9a4ed1b2e96af5a52a2adc2b56706fecb64ee1e20bdee8a3fcc2affe5eed8075d4fe869cdfe6a SHA512 ff9ddfb86dbe6167bc405c184f798b07880090f6b863256a9402f72dad44d95e3b077ead3b87fce69f0c890a6039bdbde174206bf8c7f53d0c200013fad72cf3
 EBUILD puppetdb-termini-5.2.2.ebuild 658 BLAKE2B 94ce86150e8228a994207160c454fa5d2adec923000e3056c8c94af52be9e970ae143e1c5f885adbd0aa2a17fbdb5f59eab9465c9beec94d98949a6eb652284d SHA512 44ad07412a536aaeea6bbc9e73c9beecb68df91e12f5b5818c3a2fcc7f472bca9e08853b2b1f7f6412e91a0c65bcd4da11a81da73471f75c7eb79ca3df8e9757
 EBUILD puppetdb-termini-5.2.4.ebuild 658 BLAKE2B ae9429d33a65439a01c830746c723aa118126782ae587adbd8c2614292309be0e981b117b2057ccdbea1a3a9f545bdfd1722ce43eed7520288a646d4c70e0711 SHA512 ce99726c37ab4e7435b649e74def768077ea61c49dc0971bafe7e9fdf8e0a0a6942ca64c12937ea6625194a0ff8dbabd4181bcbd6b6654b68ab395c4dc62d203
-EBUILD puppetdb-termini-6.0.0.ebuild 661 BLAKE2B a2588af25fa89fd8172e98c7ba808854868d7250447887077d098ea510ce6e8cf126043fb153dcf4ad40ab894e9a7bc658d4811c77af7f1f9d62de18a3996cdd SHA512 6622a2bf9f70088b0bb65c96f0fa933dc3378972f960369f54fa6f47f6bdff8678ef165b71cfdd8a6792d923b3af8e04525188a1d5d2b36c9d801b1df3bb8565
+EBUILD puppetdb-termini-6.0.0.ebuild 655 BLAKE2B 52acdd65134d90870204dd29c32bafd14dd223214696fb488926105a120b3230745eb8cf97341d6b2f2f79c6ba378b88c212b563b2f175ceddaf0d20e7d22242 SHA512 0bdd807d63b4718ae720f5a8d258affba8b4e20bc37b1abd85e3c9353d128e98a651de508539822d19c05cd8c57fbfba0b03db173b845c453c9455fcbc273617
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.0.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.0.0.ebuild
index 6ae20ec51d18..f4e3cec5291a 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.0.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index e03ddddd6801..1f7877279be7 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,13 +1,7 @@
 DIST rack-attack-4.4.1.gem 16896 BLAKE2B 0c7248c3676250a94078c23256d6f33471b619f0f3948bfb8a3d6b00e97e7731ff5d84e94bc4a53eb35f22b5027709ab0d5b04f28716724762683add42a2c669 SHA512 1373cd47fdc06a1d4bfc751f3c8ca7c7394117090d190f5b58c4d7b91ac91babfc7bfed7690961ad6534ccb0ce8918f721d3e1b33902d12e686978c1c459e572
-DIST rack-attack-5.0.1.gem 17408 BLAKE2B 5aaba2c1b4b2c69a02734d082bc18e670c1c7ad8e2ea40945f3f3afa1f136c11bf74a582763d914ed0ef442e26ccfb35fc7328b0d7deaea74110deec9e91c84e SHA512 e5833d8506990d352073573de3b52deff910201f89f31bf9c4ded53644aadf52ee85b63a239f41e38d37baee4fb4c630f4c00abb1f0ea1fca1be78ca56e0e648
-DIST rack-attack-5.2.0.gem 22528 BLAKE2B 474b70dd4a4a949cb295922bdf9d141fd1c8241d9d2179fd43fe38a7d9687c39a712ad7473956302fa8f4f4bcf84cb284475a90e7e264f18f45a1e7228a66659 SHA512 f9d9e07a993e8bd93e7f09110055bb4ba0478019f1d08f44cc9ac497cd0badf1095a512fb5e556dc82ecc8ba3b9ddbe38ae6c8cd3c570bd29237a550788fe0ab
-DIST rack-attack-5.3.0.gem 23040 BLAKE2B 415df5f1d4b07de0a4e80f77acf59330e74893b3abc9863638628f36d8b946dd330ae931f672671f4a9fe1fc4b1f6bb12fda2115e3dec9fea58ed04577676c4f SHA512 4749d4a86c6f91618092614dcf99cbf64722d6de9bb1150208fb89ea83862b980581c543a46355b45b553f0132bab26ef0d16ad2e4a35677d734c4a6449a2d4f
 DIST rack-attack-5.3.2.gem 23040 BLAKE2B 169f14030860b2727a494cbf4770beb6c9f74cfd1fdb9a70fb95e537eeccb08f158d9de74d81061fde39413f66b805d9ace0a586f7232ef5eee9b75b8ab73e77 SHA512 de79fdf59786ee00077ab97566ee75e38d823d4ea1854ba877fa2fdb92ae659c0c1bb6aa6b47754b6e28f1a7dbd6061e57171b0b1626dff95c17178bf4891390
 DIST rack-attack-5.4.0.gem 23040 BLAKE2B 25432eaf1ac92f3c86be7fae803768a9f8c32a61af5af493c00343c44bb0d13ea3b725c5f3016533dc0d685351917441a3d932097fbeec1f681accc9c9bd38f0 SHA512 87ab81165c655dccef0e33234ded9fd1894788c391620ed565b732a4b16d1fea539a4cfef81a0ba4a3a2edd356bbd9963976b3de7d1257c31da863f3e725962a
 EBUILD rack-attack-4.4.1.ebuild 750 BLAKE2B 5a51479a818bee5383233d19e11cc2b865f4a3e8a099dc7f442aa42ee9c71befece48d87f7d109087020301353067dc949e9bf73cdbfa5a59fad6f81307f4b4e SHA512 c144e27e9b68aa0ca675e2016b26d82a216ce4fa1daa781e2580002f45f9c855aa2000bbd24b86146b7f3dac0722f601c46ba7bb265d2d3de3788a5f0bbd5cc5
-EBUILD rack-attack-5.0.1.ebuild 844 BLAKE2B 98dda503f59371bd3268dac391344a203cfbaaea0107511b5229375bb7969b7b9c19cf629bd07c28dceb3cbdd1981b951a739fdf3f3bd9b99988cb3650f96f28 SHA512 cf115c97cd333bedad5e28ac75c905148bc6d2d75b0b82021fc33e185d6e37c361d679803602d26e52bd78f7073acf3c1c6c51fb017bd0155c5b34b4f202a030
-EBUILD rack-attack-5.2.0.ebuild 855 BLAKE2B 0f37b13f9784b107db4cead765db30198f70c6b73f4c28979d5b9f05386651b1d45225692b0047f485e4992fa70a7a9c455bbca5b9117629acf30bdfdbcb1119 SHA512 529d12a160929891b635ce973ea81dc7e523528b132baf2128bd282b651ee27973f8761c728f0c3c8a48ef865c8ba267b6e8e3764c14b37613cf766dc58258d8
-EBUILD rack-attack-5.3.0.ebuild 855 BLAKE2B 0f37b13f9784b107db4cead765db30198f70c6b73f4c28979d5b9f05386651b1d45225692b0047f485e4992fa70a7a9c455bbca5b9117629acf30bdfdbcb1119 SHA512 529d12a160929891b635ce973ea81dc7e523528b132baf2128bd282b651ee27973f8761c728f0c3c8a48ef865c8ba267b6e8e3764c14b37613cf766dc58258d8
 EBUILD rack-attack-5.3.2.ebuild 855 BLAKE2B 0f37b13f9784b107db4cead765db30198f70c6b73f4c28979d5b9f05386651b1d45225692b0047f485e4992fa70a7a9c455bbca5b9117629acf30bdfdbcb1119 SHA512 529d12a160929891b635ce973ea81dc7e523528b132baf2128bd282b651ee27973f8761c728f0c3c8a48ef865c8ba267b6e8e3764c14b37613cf766dc58258d8
 EBUILD rack-attack-5.4.0.ebuild 855 BLAKE2B 0f37b13f9784b107db4cead765db30198f70c6b73f4c28979d5b9f05386651b1d45225692b0047f485e4992fa70a7a9c455bbca5b9117629acf30bdfdbcb1119 SHA512 529d12a160929891b635ce973ea81dc7e523528b132baf2128bd282b651ee27973f8761c728f0c3c8a48ef865c8ba267b6e8e3764c14b37613cf766dc58258d8
 MISC metadata.xml 349 BLAKE2B 5e0852caf34767613f144f3a6680223198c6cad55b7ea30d0778d788ce2293a2586bf0edc698dc0a5edc11d4e1d408576ce9d7c1eb3602e7fe7f10e2be33c1ba SHA512 9584ab20de3f1604d81e9be1baa8b4e355e5a43fba3a0cfc43a3d4f5e67df0d089a906b479b99150f76e54d07310d650ae96171d6ddeb8e3f00a446e2a95a795
diff --git a/dev-ruby/rack-attack/rack-attack-5.0.1.ebuild b/dev-ruby/rack-attack/rack-attack-5.0.1.ebuild
deleted file mode 100644
index d32f356b0f6a..000000000000
--- a/dev-ruby/rack-attack/rack-attack-5.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile spec/spec_helper.rb || die
-	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rack-attack/rack-attack-5.2.0.ebuild b/dev-ruby/rack-attack/rack-attack-5.2.0.ebuild
deleted file mode 100644
index 585b3e58c40c..000000000000
--- a/dev-ruby/rack-attack/rack-attack-5.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
-	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rack-attack/rack-attack-5.3.0.ebuild b/dev-ruby/rack-attack/rack-attack-5.3.0.ebuild
deleted file mode 100644
index 585b3e58c40c..000000000000
--- a/dev-ruby/rack-attack/rack-attack-5.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
-	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 845a13455873..1e69efd3e6b1 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -7,5 +7,5 @@ EBUILD rack-test-0.6.3.ebuild 959 BLAKE2B 97f7f0ba6f376e50991dadf70c745069b295c0
 EBUILD rack-test-0.7.1.ebuild 1059 BLAKE2B 9d13171c4cc3a4f5d991223278d96d194929b8af8dcf3208e624cbf20240cd5147f601beac94a8fbd4f5c1eb2c852b277b085296efbfba7fd24ef7e1bfc9d344 SHA512 f3e08c4654026b85322107f60a21197ff07cc4c67a498e03478f4a168e82fd58bd014fe5f0a176d30c0fbbbeac9033b9b992c4f9c5f6b470a36878bcd12a559c
 EBUILD rack-test-0.8.3-r1.ebuild 1150 BLAKE2B a243633049097f3d7ddb3054a4fe752d3a394dd32350e53de8889fedc158de5ebbd1e9bbcf016a683a6d4636e37a71f277b59f8aff3b8da6fbf85d8fc6455c23 SHA512 4d8d31998f3c42a2c2fe64fcbc1a2c328e0f0b068b5caa75c9a736f1eb2b991fe81ad98ac49d21f09edb97ec51f58d9a78b165bbd6fa1738ee189f152b0841b0
 EBUILD rack-test-1.0.0.ebuild 1143 BLAKE2B 6c2349179b80a907b79dbc7664b3ce7490da9f4a857aaf70a25dcfcc679c702d3cb84f0b2d56d29b6f7d33abd9210dfd77fd5719c28e972495f3a65588a9ace0 SHA512 bad849eee444b4f21b42f85e5d2b8a1bd94d9d42ff1ffc9ae9fe48368f1313e52850bac164e667af57905c44d59a7fbd0dd7e3a2f49702585d5193abbe238708
-EBUILD rack-test-1.1.0.ebuild 872 BLAKE2B a16df31208bd41a126fc3e77753e4419ce6026546c295a45d8f527aaeafdb6f7c0de652a4890f52e699eedc55042251651422e4c2771f2a81faa659aa239ea4f SHA512 f6deb22571261156d141dfee7b6a23c3a5fc85fd2de9ad33f2ba5dc06b952036fc0521d42d388aba734b46ccbd6e8afc82fac6cbd04198f773087ccbdea09f15
+EBUILD rack-test-1.1.0.ebuild 874 BLAKE2B bff54944b6bfdec523f6016c2bbfa745c1057e31d2a9f35ee1ad3b5a7b76cb2f636cac576e285bd4bc4672c5a9f1c9406e91e941a5161e2ced1946dde3122b5d SHA512 75af5863c0693c36c528084cc1aaf003cde596b521252e5813635b51afd82d776828d69f794236882f03a79a91c462c1ed1ec4a6bececfea9da95af34e6cd674
 MISC metadata.xml 343 BLAKE2B 3d64a9d71f8ea0b1af70404e282f27ba4028ccada49dd94cc54f3517a939749d1d98cf1e08c85ce1e4481971b007f88dd40b7bb9609b4879cfcceb55519f97fa SHA512 8f9aa1b7be720aa89aff9ada3782e3b7098edd7181203d78a56fd6576ff3d2cfb812557158a30353eabff9084f6cd148222f4d7cd39b7cf0073c4f9da0aacd0d
diff --git a/dev-ruby/rack-test/rack-test-1.1.0.ebuild b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
index 54410497e145..394d1753192b 100644
--- a/dev-ruby/rack-test/rack-test-1.1.0.ebuild
+++ b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 94591fa9ee53..31179f00a98e 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -4,6 +4,6 @@ DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db
 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.6.0.ebuild 3405 BLAKE2B 9bae8f3c31fb7c77ff882337c2285ed3b2966d0472d256101b7ff01f38c54ce8263189c5b8841164ff4d6e4bed8f12ba86956054597a6143482b5474a3b2dc6c SHA512 31b31d1341539a5a7fe30ba7fb81f756f5b59195984cf0afac96ac60c233646f98edfd0e9d59f53bfb321d845d8a339ba3711add3ac49e755bfbfbc9b8d7c001
-EBUILD rspec-core-3.7.1.ebuild 3411 BLAKE2B 6bd6675bcf39d06a9964858a34b141bb47e6f829f36933aaa0447c9139a2cf1ddcc6c349a001dd17bbd47ed829bf39abcd8d9b1c07f132e02a4664f64229dca2 SHA512 4180de54b38bcd3f9e758d1fafa2f400ab99a54755254f574c8e2fd7c5a6ac64c9ef29f5b354281c2d27daea2772c911b74c8fe0a9175a6a19fbad96a49828b3
+EBUILD rspec-core-3.7.1.ebuild 3409 BLAKE2B 5ff47ed3c921cd9ec7b909c9b8a412b4d5627f2fef531b1cb743f434fb08af1843a2a9d7b2f2ecc07fd6d335c68ca8200de281ccb2833f6ca162c45d22e097e7 SHA512 3f400e182717b0a5f41b82695793c203f93a6c5efcbd50ccd377a4cafb33616d4389ad8805991a9005ff34fdaeb39347be0f67de83b2af82865a989f98928a54
 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.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
index 742e5d4e0e28..b75df1c7b42a 100644
--- a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
@@ -22,7 +22,7 @@ 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"
+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="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 9180b9bcf425..8030d4c22a78 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -4,9 +4,11 @@ DIST rspec-expectations-3.6.0-git.tgz 193897 BLAKE2B f3fc2b06a317e77838e2d483416
 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
+DIST rspec-expectations-3.8.2-git.tgz 198952 BLAKE2B 6952f895251f26f8a1b7746b277fc92b296e78fb23b8f581e90f649ccc28e21e0a695f87b012b4925becfcda8f8876414f74a826c75bdfa5114092849bbfe525 SHA512 d374f7add45d2b6ce607c1a068e3e0970f902a0edf96ec891bd618dd17253878c1e0b625296ff12a6dc35103651bbfbcfd1a1b444f94e08eae2680e32853a198
 EBUILD rspec-expectations-2.99.2.ebuild 1696 BLAKE2B c613aa21e9d76decaf26954bf8be2357a12dc92960ab966ac587883a91d023a79d5c9fd4e8e00ffdec9a647cf2483e2aeda03c3a851e2a43dcf5bb340caa7ec2 SHA512 54646cef1a0b856616797a8c11ae5bc684b3c3d9db2999f2a3e6e78b2254ae7efcbc22a924fa069d4b560c407a4cf010d4db3bfeb10851febb90d23d7f032ef4
 EBUILD rspec-expectations-3.6.0.ebuild 1329 BLAKE2B 4c1367ffe0dac6fe8ef5235cc6a3bc4c36bbae2939f79d4a9febe273a9cf9db60d7867588e6bf4212167720153addcb6577c2a41a8e6982f5481072bbda689af SHA512 4772ad69bad84bad114a1e4f303c7ece91c7b964d097b50d5a02dee5ca855365051b3662071274d64afe7357d1c03d9fa70d52563571bf73c02ee8fe7ecffdec
-EBUILD rspec-expectations-3.7.0.ebuild 1380 BLAKE2B 4a3e988779aa951a26d08b79c8f506e15ce38f3ec104a19879942724139096cf004888c6ef4b6603122f075b4dd9d67877d6dad64dcbef91219488a049b0dcff SHA512 98563d0afa7940edad9977d3ca22aa430320eefec84d22ea439dbec47b1247c41b198ba0b05501f841299a024d635a7a98f9323b75c4c244eced9784c96b8963
+EBUILD rspec-expectations-3.7.0.ebuild 1378 BLAKE2B dd0eba7ee6f0260c2b461e0dcaf07cdee1c3060adb86b9eef86919f97d0be2f070c43668edd00914b941b196849d65af6394d1813d2f2f6713e29f754ebd9517 SHA512 b1eaf25f1de68bdb9e1581cdc983974e9441357effe6701bd9f8868e0fb6fdaa39406592b2fe6ddde461b22a900ba929ae9c5ea6f6b6deb131c2e1c953aead52
 EBUILD rspec-expectations-3.8.0.ebuild 1321 BLAKE2B de7686b018317122fd6b575d036f7f0b65ad316a4d81dc2b9723159fbbc248417c1e7a5a5982b6e83acf80d79e2eb0cd94c20f9fe8d2c1e54423e287cc9bcece SHA512 74518415bcc778e35ec50f414b6dd737703c7b5ba5955de91e60cb12a7c962a589976d4ed69cb35bd6ef37a4e835cab2fce1813508fae88a0a4a2ed01c8434b6
 EBUILD rspec-expectations-3.8.1.ebuild 1321 BLAKE2B de7686b018317122fd6b575d036f7f0b65ad316a4d81dc2b9723159fbbc248417c1e7a5a5982b6e83acf80d79e2eb0cd94c20f9fe8d2c1e54423e287cc9bcece SHA512 74518415bcc778e35ec50f414b6dd737703c7b5ba5955de91e60cb12a7c962a589976d4ed69cb35bd6ef37a4e835cab2fce1813508fae88a0a4a2ed01c8434b6
+EBUILD rspec-expectations-3.8.2.ebuild 1318 BLAKE2B f9ff54fc06a9198c48b0692491b197968b661b4da0d3cd72cd387bf6f27cdffd8640333175a188d2fe8cce47b5d59d1459743c0e8bf0af64294d79df3b07f3e2 SHA512 dfa87a38a039130a47741c61bb7959a35e5ed1db17eb65708422a3a549cb52199ac5dca54bf1a9db15687edc5b04c219aadd77a52bb1b1c7212e2c1d4955a6a5
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
index 563a8f718fe5..86a099902d3f 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
@@ -19,7 +19,7 @@ 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"
+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=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.2.ebuild
new file mode 100644
index 000000000000..f172e8ea6684
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ~sparc ~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 a3c36d7d9fd1..7900d938d653 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -6,6 +6,6 @@ DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac
 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.6.0.ebuild 1353 BLAKE2B 3bab6513a6cfbf127c706826e4f946c6ab76bf3dd3cef0bd21065b197b10a950b840d59bbc58fbd9b7c00335b83548f61f98360fc22ee47f8bc1050830975245 SHA512 b1320a3f762bc5e3aa63d9e3c3aecd93f254b217905eb5e752068c25c43d6679095b2664f833119a42b5b6a5ae1f85770d8386fa5e12dda79b8085f9a07ab6fd
-EBUILD rspec-mocks-3.7.0.ebuild 1440 BLAKE2B 2457623e792d031ffe585f29ae828bcfbadb5c36301991d3a4e033075fe789178394f97545c444c07e99289e17d6fa737b7d15a62d0f35ec98cec47ef5a8d1e6 SHA512 bb9a7c4e226321b115beb39d6eb4581bbb51f0bfca47e380c09ac09615272474cd0fa241ef9f22a6b2219fd15ce480f33da59092c3c0b9466d5c3dc25251a525
+EBUILD rspec-mocks-3.7.0.ebuild 1438 BLAKE2B d8130f73014b411894564fd2cae57ba4f6f7114009ff077b16e9c384e2710b41d4627eb9b7c5daed59c5c085471c8af8c927d98d58727c013d53fb32b0d145d2 SHA512 25106105ee19ee84d88a86c7007aa011e31984919ab83231e5995768eff543d2502456014eae8d705b8eb256aca1f5262c902fb128ce6d84d9a62616be2818b1
 EBUILD rspec-mocks-3.8.0.ebuild 1345 BLAKE2B 3ac475af432a4af5e352ca2be716ee4ce46618ca921728c138f5ac935dacff07f072430adef1c8e84de6425b71b881f89f96446b3d15e0a5745fb84a2a2d5cd7 SHA512 5f4b3415624b24f2ba4ccc969056f2d4d5c7893a40b9cd6abc72be0dc9dc4a2f462932f45ebfeecc9241305c93fcda6ddda0b25aae8a60a7765d1dfac7440f56
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
index 9d6db9e54ca0..860b63ed8d16 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
@@ -17,7 +17,7 @@ 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"
+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=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 98d3f6567cc1..5e03d9774d9e 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -2,6 +2,6 @@ DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 9337da63047a1b33e8534a74a6dd40042
 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.6.0.ebuild 1341 BLAKE2B 2e2368bf2b251859d938df965175f19c08efc9ffc11d3f801352597ad1cd537aad772c2c57b61d1bd627b5a241a413bb8087f041d866cbc29e9f94b453a17f5f SHA512 5a8a476f085a4ed63c67806fd04793b4ab9c6bffc40d09043d533105ed06f3e1a62edd1225b753c68eab39b071e4b02760dae4b35bf5f2d82b1eddd85c12a900
-EBUILD rspec-support-3.7.1.ebuild 1347 BLAKE2B c0b4f180f799c33daa54d33b0139bcab20d6844ecc2dfad616ccdda522c15043dce7e2eb07c2e736713eb032a79aa3901d3692582cdcca038174181a38eff05c SHA512 d2101542fc7a926b8b6c722dcca8cbed1d847654c3ff16f45c3a6a62dd8c0e19f1217ff49adb8a165a8b58b3b16c1630d17d11be2f582e40378f7711cd6c2eef
+EBUILD rspec-support-3.7.1.ebuild 1345 BLAKE2B 1aa69984b92d5ada0a76e75507f4fc6de80d87283a820cef70eece477efa3dc07d0e6bb0e299bd290f467dcc8d0ab295e7b331302d92f23ce78e8262e66bc6f9 SHA512 99b3cf8c57564eb40dc90c91469269b899930a05507ea74570e8d8f10e46f82e9f4134e27cf79f47afe3407899af2cecd2171a779ca8232b2951a9ebc50a778e
 EBUILD rspec-support-3.8.0.ebuild 1351 BLAKE2B 36e3b765c3ffc5a12d2bb2c76754255e19cff7595ac8624ea755fdc13f4a4df1a0c6ef66c4b7ad56feaed83181f4112c14d1b2f8a1dac34cbb8f1bc827a20351 SHA512 5020cfcfd026a57fbfb79bf1856bd9ddaa905381f24701788e3c12a33d66d42f6ad32350189180bcee6ba7da39ee3edd9ceaa342b367d2f39d1e55de27520893
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
index b08db986266c..85252235633f 100644
--- a/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
@@ -19,7 +19,7 @@ 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"
+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=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.7.0:3 dev-ruby/thread_order )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index f7b954757ecb..c9982c011014 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -4,6 +4,6 @@ DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a5
 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.6.0.ebuild 674 BLAKE2B 18851dc284da064fe9225e7cd1ab5bf7cc2cc2c707b78cffa9a11eb1a1eeecc5d4f82220a4d1ffc45876a1f40b4a250d96510e3b96bd807d9c7039624e68b322 SHA512 fb3ee553c56bca5f8b26f7ada3d65d9fdb1c649e6cf269c3c59ab33350e26039f5c61310b1381ede6574e34bb4cd57127dff16a7b610f1136562320f9b72e0ab
-EBUILD rspec-3.7.0.ebuild 680 BLAKE2B 17a6f88b945592f2d479d389a4202cdc68f675d6ffd1c991839af9818c7c93a8eafcd83528a27bada3781377d513b8600d4192d603262c5d824538368a6ba141 SHA512 7ed7d2cd2bcab6acb031daafd5e70e8a6bd76c1ec35f6eda4f4cfa9724e7af37e8d01ef57f182dd8ff16413507622a35a88451200360af62ed43147a9262e137
+EBUILD rspec-3.7.0.ebuild 678 BLAKE2B a71ba7fc053797e220ab7dd9af461d6d4422fb90fb417dfdbb1be5ba130cdae857a71face17d90503bd9964bade851bf16343c5ce159d63b4f46f293d804d0aa SHA512 dc4f074ab096280d9fa3e1aa736b439307b8cb7269d201b99fdf30b7a8059449477c4581e9e7616ce6bf0d3d38d466afa2955d516ecba705811112ddb8509db8
 EBUILD rspec-3.8.0.ebuild 654 BLAKE2B 6f47fa6866e3093488c36d7755a1a32be9ef1fdd2b8b0ac05163b2cd19561d604a5b3ecee868029b3dae4f17e261223fe2fc019401d214f07659e70749ba4054 SHA512 3675490d5c2b0cb218d0edf63c5a104a2baed1b11ff31ad7e0a03aa0b2529ec77dc5db1846b36b44d4a307fa0cd8170c2957325e2e01cb710c4cbbdd12081e23
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.7.0.ebuild b/dev-ruby/rspec/rspec-3.7.0.ebuild
index 526489db1bd5..0a23e1ad7dbf 100644
--- a/dev-ruby/rspec/rspec-3.7.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index ad2e31434d77..afb5db457ec3 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -4,10 +4,12 @@ DIST selenium-webdriver-3.12.0.gem 843264 BLAKE2B f9a2e233658e071144f153f7710ec1
 DIST selenium-webdriver-3.13.0.gem 843264 BLAKE2B cce9be238d5b6480635ed286893f4b72e26166c21fd07ba99e2c008fd7360f0f3744dba24d015aa92612775a8c726616f391b1681d4a37689933a6b9b08d41f3 SHA512 e0b7d521ba748bbb224d659b56b9b4ff9970aab84b827eac1b755d950ad840b70a09567190e5ebafd1a513bb0c4cbfcc25e6a6e4a83051df951237533453ec44
 DIST selenium-webdriver-3.13.1.gem 843776 BLAKE2B 633a6582f9294f008a77d74454a208bb67425f5a790e97a59323b51bbd3d6b9f28c611cbfb72bb922898c353fb35812b99529a75230ebfb1da18683378d36740 SHA512 b372a5af0380adb607e3f9ba24713cc8ef288e1432c2c6ea71426b8f5f96b315aace36283d585cc75546b467572822f0eab3d8217702d1b6d2ec303c59c0b98f
 DIST selenium-webdriver-3.14.0.gem 844288 BLAKE2B 52c4a4cd4f4b939d685efd764a0ede064dd31713804ccbbfbb0b92b51c39c4f3eda7529c46ab795cf1e02b27d8e32309fc89801765d9542cb0df2145fd1a0b86 SHA512 81600fbc8c033e649127c21721431d7c60f17a729f21012355d4e6b866eaa22324514e813b94e9677c49f313f00afaced205fddee14756eb2fa3f1ee68cd992c
+DIST selenium-webdriver-3.14.1.gem 860672 BLAKE2B 83026babf1596fc5c0621da19eb1ae48c3534448a5f4c3b6dbcb6141f2968eb527cbb667b45859a998b4950d8498dbd4a68ddcbbcadbe83fd02dcac46d2f2e4e SHA512 3671bc6446f49945b4484bce90e91178f932d799ac79b93974268eb2b9bc060c62f41c2f25436b7ea49612e1d9b014f1ca4f63dfc74b9781ddcb9c849f3be82d
 EBUILD selenium-webdriver-2.53.4-r1.ebuild 1137 BLAKE2B c1686329733f5253efee815896b641a422b510d00ce379c14d87a68c487556bf64b0771dc73097bc483dd796e3e890c5fe74e6e4fa296e2a20b60ec8eac3ad7b SHA512 fd3f0c87afd1924a40ebf80ef783414cb6fc256db64e710b922e4b2834cefc2974d11e8a6c037b1d426f867459b4cf90a922f2a8c38ce0a1d426ccc990d1d268
 EBUILD selenium-webdriver-3.10.0.ebuild 909 BLAKE2B d2e55036612eec131dc8c2cb72c1c6f0c3a9aff238d1e3a5fe046a4d177ecf5ffbde9515f6a6fec35fa8dc4bb7175e3a095ad876747da479eff1ade787f76d4a SHA512 1b819c22107caeaba16bfd5f6c326dab4e933602ac5f4e5c3546c8a9051d6698594f3af0ed731f3cd163caafc368dda501169a0d95e9d8ba5d2c939d63f130f5
 EBUILD selenium-webdriver-3.12.0.ebuild 909 BLAKE2B 29d6b7d719d0dd9993a821f12a77b5ddb7bf647ddc381c3ec2e71c103debf69c7e773f7e7f8b980ac96d8c7d167dd84f7f0346fcfea5f597064275285929aa9d SHA512 3e7933e17836917a44275e627dd9d445b28a6d10ac3424ff357cc16a368117b527e40c2ad3fccdb2a5bb622a9f91cc5f0e0a85b28cac6ed8a6da25b6537e881c
 EBUILD selenium-webdriver-3.13.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
 EBUILD selenium-webdriver-3.13.1.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
 EBUILD selenium-webdriver-3.14.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
+EBUILD selenium-webdriver-3.14.1.ebuild 909 BLAKE2B 98329f6ab626107413f82b5cbe7fe0fc1d09d94679feaeffcdbcb46c0bdd95866f084456b962c7d0cb45d46b40a0680622263337f9289118c0c2570aa860c9b9 SHA512 da3fa343ff37e891e939f2e17d749b723b6e7186794b5c7d3ac98db3615d443ed2c183a79ad63c0bb2003e1771ea98b67b37254ee5d108de01900e7a750bf401
 MISC metadata.xml 335 BLAKE2B 374e7e6bdf450e60792ad3960c2c0fe8ab87f70c34ca76332bbbc632598354e2a774e4eba46434e9b7c85c7f5eee7086ac85268ae58bddea7d75713d9d2f014a SHA512 94e17dd297f6904f1b70709dba5f5612fcc42e9e0e57695df6d37344cc9a89c13b423e41d142631444990ff39367eb6132d6b070bcdbf256ae00e932cadc67e2
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.14.1.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.14.1.ebuild
new file mode 100644
index 000000000000..e32e7e9125b0
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.14.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
+	>=dev-ruby/rubyzip-1.2.2:1"
diff --git a/dev-ruby/semantic_puppet/Manifest b/dev-ruby/semantic_puppet/Manifest
index 149e3b181e95..ccbf63a9454c 100644
--- a/dev-ruby/semantic_puppet/Manifest
+++ b/dev-ruby/semantic_puppet/Manifest
@@ -1,3 +1,3 @@
 DIST semantic_puppet-1.0.2.gem 31744 BLAKE2B fd80225f799f55fe668c712cec20ad57163c3829ce70f49a30e7b73037883ea1960be0ea8f510e147c30254b7527e64f323fd7f9edb30f934762088ed997a241 SHA512 b059d8c7b13ae96dfe012318e7c6ee483cc09986d5d065c8422167a27a14d8e99433229c90388a7ff9ee425a0f5b6a6a6d5bc55f8b81901490afd8039ea86480
-EBUILD semantic_puppet-1.0.2.ebuild 523 BLAKE2B 18d5991eef74283880ab7f7a1760e3da726c3960da468b51f7c2a952cae34534e8736d131f359a8cdeed79ed49e4784321ed9f58dcd144e171c87ceddbc40a12 SHA512 27430772696b7f457dee2f157abd574b366c3d4399217f35d4aa5461482da051702ff9823594c2628ce0eae17184297e3f3f0abd7a34d3cfe44db260da5e0a40
+EBUILD semantic_puppet-1.0.2.ebuild 515 BLAKE2B 9a4b604f78eabaaaf0abbbf1c655b1f4d7ebdd63e330b9403f946b71911de83d82c4fc0736600ee438650c11ef92c923c3c63ae3603e67df88ad5275e79310b0 SHA512 e5c0583761e5a856ac9a67cae82ab13c4e6f6e2d362241df6598ed9f0bc69b2cffb05c10a20ca6f4a798beb754c10051c427661803277ee507e5a9df6ec6ad20
 MISC metadata.xml 588 BLAKE2B 15525acb9d4d8341a6493929fd74e264fc3ca7652b1af154e34ad07e3ba0a3880648bc0ccc6a7cb8d2d17c4e43846c38c3068ecf8fc0a9f677122ca49da141d9 SHA512 5f54d04ed39dba11a8985b3a943bfd325be25851f0710a3a2f96d43b5c0ecfcf6f6f54632f86f5cf4b285e077b2f4307792c6221b64c2c8d4dd58018ae911dce
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild
index 88d5f19927ab..05bebcb5a74d 100644
--- a/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
 IUSE=""
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index db0fe22f3f24..0fbd9541352d 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -2,6 +2,6 @@ DIST sinatra-1.4.8.gem 369152 BLAKE2B 8a344f85c34dc8736180551690bc55ee615118a243
 DIST sinatra-2.0.3.tar.gz 463315 BLAKE2B 83113189f69714596ca3364ea61b6b8de844002acd32536fec69f7bf05937f1559396242170b0abe2d3028f5145c29adf46805d42969e683d60103013d72b389 SHA512 6188c6e372659522186649ae823f4fd3aa8a5b959cbb856f4cd42dc301e7430b3fad890a572d6f38d72aa99cf37a81e234e0c6ba9d03778a9c5a84b77a1dca76
 DIST sinatra-2.0.4.tar.gz 465074 BLAKE2B 1201ec3f56a7bbeb5c3dab01db8c3d521138587dfe60f36d19d18328ead6b664fdb9de71e9244aa7d37febc6d932f8c2a3a89aed01f23d2fd4e528827aa3804a SHA512 281ae9f6461cc2b2cfaacf05335134dc5b67b6dfa2936a38a7880c7b318ef4190f45f2f24c95a223ce1025a79f95cc6085445c308933244e568cf24cc2d94482
 EBUILD sinatra-1.4.8.ebuild 1326 BLAKE2B 4ad5b768c4cb9b61ce4f04bfb315ae65991d126e6a4ba42da2ed30c2cc77876cf0fc98c3e89f01550fe3ac60c36570c1a52af90ec44ae2acbcf71d90fb627f18 SHA512 7b91176276d8b5db61475df18ea2ede3b0fa197d2c7341e15ad8c71adf1f1d21c36161ab4523f8918f0ee6a71f5628a3e3b8021a1a4761db91fa0de39193f417
-EBUILD sinatra-2.0.3.ebuild 844 BLAKE2B ca1d0aaec1091844d677e93c61ed05045487889f1265dba45c5e81f9f16b8f6228c027c0dce6575dcf3c1dec5a5c4f0448a55dd0ed7d8bfc3c9713654ddee49a SHA512 e87c269a107e402adb3b2bb2c993c570ad73f2439f7cf9326645cfec44cc5decdf0c71a7fbb12524caaedbb5145590dca6f080bfa9171b6eb95fbadabab07302
-EBUILD sinatra-2.0.4.ebuild 844 BLAKE2B f2cd04a67f5b6602d0fcfd468d9537b6410740fc9eac28a02f17c1b553335d7753f07b5bd3c7570c98a7c605b663321db894da5bdd46d1af4d1c5af44fdea90c SHA512 e83cfb72028c4a1258f381ea3c23a5749b51319ee96935832118db1e14265f35bc4c720f1a777bdcf9d2487f322dd5cdb56d3dd93f4fb6e11d8de18acec9e13b
+EBUILD sinatra-2.0.3.ebuild 846 BLAKE2B a98af402a47aa7dc66255d33f04a042aa3f54381e3eca2b234fe706b8bed31278c9d574d7dead235378fe76e14e11985b44587e5f84c229d1df6870f8c393ec8 SHA512 3f57d08250f3d4ddba556b6cdacd71f8777b441836991cebfd7a1b047d9dd6126f30e4db167d4969802e6218b03e3ca87458491ce900f6806c6b5cc40ea701b4
+EBUILD sinatra-2.0.4.ebuild 846 BLAKE2B 4cb4ae07428f1fce1bc69b28b4461063442b50e5a89a0c301a8cbce95060bf8af15437a1f19421374e2b408fc746ca113233135131f2e9d0727ab9f18617bdca SHA512 8305aac1e4d12901ef2105c2504d26afcfc5a9a0301e0197f696854f326c6ccacdd3f66b383bd76e9e80b5e87b11330a5b1e96b89a06c7bd4728ec95704a5175
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-2.0.3.ebuild b/dev-ruby/sinatra/sinatra-2.0.3.ebuild
index f63789e1eeb9..926154e8b595 100644
--- a/dev-ruby/sinatra/sinatra-2.0.3.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/sinatra/sinatra-2.0.4.ebuild b/dev-ruby/sinatra/sinatra-2.0.4.ebuild
index b73d22ceaa40..3f28c215bddd 100644
--- a/dev-ruby/sinatra/sinatra-2.0.4.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 428601fe9abe..146f64e97ae1 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1,5 +1,3 @@
-DIST sqlite3-1.3.11.gem 60928 BLAKE2B c2dd494b2c5870a65588bea59cdf6752506f6389614955ecc0d006ae8a325e5ec45476bfd59fac6861b4db64108af87df4479c32775da014ea7d7306a59f8c9f SHA512 02bef5f8f61d1f04c79d9032d62c9d708dddc2446dd256ad13f932ed4cae256d6c60f742a285bc4015ef5b1fb13e9541738f31fd270fe22320fc176525fe37bb
 DIST sqlite3-1.3.13.gem 64512 BLAKE2B a36e3161e44004a0510297d16bf491df3dc29434432208ad231f5e46ddecb4607add417e105f5ae8472a768f80efef3f74b703b2a441396b4c9b6c9ff90bf31e SHA512 5d3eab7c788cc62c497de179919054324e53595294ec3a9df2a10d23151a406ee9a88f1c3ac945777f138e78cec61018c388b023456b873131d678a6788a505f
-EBUILD sqlite3-1.3.11.ebuild 2392 BLAKE2B 52685bcc7ef730fadb546a63d7af8318734a9f47d99a6802c1ab472aa851b52360f844aca405a33614ede92290fed86db47670f234dc17bdf1b456bbe17824ee SHA512 db96e0d6d0f86123b44ba7d1826bcf11085e2dcef0532134ab0c12ac5206271eabef4b039d8bab73988731c4099551fb70a3c17facd4769edd5f937cb2da9ba4
 EBUILD sqlite3-1.3.13.ebuild 2392 BLAKE2B 4bb2b14028302e172ca63c74e19c4449e272b7738d2682357358f95724c6587d6731a2c0dabdde4bf2a2d64417eb2949ec412fa24e5317653d3a3ce25db2943e SHA512 ca7f5dae865a4e67f020b7e5b85742abc9b4a66a75e66f23909a6f501d2a50c0448bc73d49ac9cd2fe122ec1b4f83f664c0a577b4a9557ef6a84f54636672005
 MISC metadata.xml 342 BLAKE2B 1f46148873c3913fc0beee10dfd433f84a477f2f5ba8b7a8bc97e4cac6765d3c07829dabef7e697791cb42902184fbf034c5701a433717c1516c725c0b5b48e9 SHA512 3272f121743335cd749a606648660e8650664fec4f02aa6499c8f5ebcf0ff727de28619d800fc5cbda350f3076e81dfbd1993ec825cd4ca43163e160813b3f77
diff --git a/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild b/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild
deleted file mode 100644
index fbbe3767cd6a..000000000000
--- a/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC="faq"
-RUBY_FAKEGEM_DOCDIR="doc faq"
-RUBY_FAKEGEM_EXTRADOC="API_CHANGES.rdoc README.rdoc ChangeLog.cvs CHANGELOG.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An extension library to access a SQLite database from Ruby"
-HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE="BSD"
-
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND+=" >=dev-db/sqlite-3.6.16:3"
-DEPEND+=" >=dev-db/sqlite-3.6.16:3"
-
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	dev-ruby/hoe
-	doc? ( dev-ruby/redcloth )
-	test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# We remove the vendor_sqlite3 rake task because it's used to
-	# bundle SQlite3 which we definitely don't want.
-	rm tasks/vendor_sqlite3.rake || die
-
-	# Remove license line from hoe to avoid depending on a newer
-	# version.
-	sed -i -e '/license/d' tasks/gem.rake || die
-
-	sed -i -e 's:, HOE.spec::' -e '/task :test/d' tasks/native.rake || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/sqlite3 extconf.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "${P} Dcoumentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
-	fi
-}
-
-each_ruby_compile() {
-	# TODO: not sure what happens with jruby
-
-	emake -Cext/sqlite3 V=1
-	mv ext/sqlite3/sqlite3_native$(get_modname) lib/sqlite3/ || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# sqlite3 was called sqlite3-ruby before, so add a spec file that
-	# simply loads sqlite3 to make sure that old projects load correctly
-	# we don't even need to create a file to load this: the `require
-	# sqlite3` was already part of sqlite3-ruby requirements.
-	cat - <<EOF > "${T}/sqlite3-ruby.gemspec"
-# generated by ebuild
-# $CATEGORY/$PF
-Gem::Specification.new do |s|
-	s.name = "sqlite3-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load sqlite3"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-	RUBY_FAKEGEM_NAME=sqlite3-ruby \
-		RUBY_FAKEGEM_GEMSPEC="${T}/sqlite3-ruby.gemspec" \
-		ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 7ad52993b747..d337f0170367 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,9 +1,7 @@
-DIST sshkit-1.15.1.gem 147968 BLAKE2B 52bde587de6a358174df6d79df8b8179960811d68ee933655f9df82e20e47481e9f32401276e613d97fc7327fce3891ccc70fe514ab8f5b2a30aff1f640ee139 SHA512 acac745b7ff1cfdd054b683219ca68233e1453430ec0bfc1efc96cb009ad257262c276857d9bc02854a6352a98feda845d728ae63e8b046a09210eebe8661665
-DIST sshkit-1.16.0.gem 147968 BLAKE2B 0d8943cca05c04946fe33bfafb690fffbc7ac19805891d0b7fcc40dda67b8522208b1588947bc0080243fc6bd08e84b918135b4b52e7bdc4f58f23d32a697cdb SHA512 87577469428e9332aa17eadb7d5fc8b5264f7d03db92f40f53e1b75431a1b8e4b381611ea86726272d130d6d2f6150c7cd37bfeaf7fe07e5f5eec77300002349
 DIST sshkit-1.16.1.gem 148480 BLAKE2B 4d33e5258a0a4fb9dd063bf914724d69bb838e6f5a461b1b6b355306e5a99f58021ddd9d8f5bc2074bbfdbab2a823132f491a4d3d76c86b2ee9c9156bef7223d SHA512 3866381a4a4c34ac29199f9eb295fb642af624f7e96971f2c752688a24e36787698a4817943317b1e6735afe0bb035e7d7e3d8b81b49022caed2ef20ee57ec57
 DIST sshkit-1.17.0.gem 149504 BLAKE2B a44b00917eca7a4953f57821518b14b5a5ed4f8d70c9e2b728c22071c705e185da33b63845bffce6fcb2fc35ed8efa3bb3ba5202eb71edae52cfd99c26583874 SHA512 61f531651a76418e157c1affa55927e438ad3eda9dea2b3f0c26f566522df11d1d39eceef84f706aa7733b60c8428dbb3d7da863ada64a24c79567dc4a8c10ad
-EBUILD sshkit-1.15.1.ebuild 1189 BLAKE2B a38368258cb9069dcb50155b70a1f85f9a70e6426d2a6127fb5c4214320025e97c761a7e20a787a934ecc9b351aa55a1bdf85f6ef670971ef03534caf77f67f2 SHA512 934510900389a939ef2d9a8c94ff4d6c7784a798bc91c48d8d6013bf5574149e48a8214497d59566098500daeedfc48ba0c454eabfaa1c69c8015150ab294de8
-EBUILD sshkit-1.16.0.ebuild 1182 BLAKE2B 4fbe7ff4e930cb56f7cb69a04a44d956769aa1695b4cb4bfd84fe4d8a6142f3430fa5168f43afc155da5a4c1d7a7a5432990c0aa8c3f40056606448472e32f24 SHA512 2421e2189070bf5dc8c0151a57a97332ab764e081fd860cdb03a2759e62db2148bf29cce0f9a73ad0eff7ab5827634ffeb0efd32d37b827fda4f2c7ebdd363c6
+DIST sshkit-1.18.0.gem 150016 BLAKE2B 3592bbacf2b9031ce9527f0ecfdcd0ec973239496c842fd659277498ec9a5d815ae77ff7b06afe7dd20d82577dab6ccfcbab79e7514752b41ddb1b80fcfed7cc SHA512 ceff9c7be99155b5e86e1564be221da5946b91b396ffc948aafbbc1a5214928020ee3db97615b780c91f4fefacff2174c4d0a33e54aa2e935552eecedac71bde
 EBUILD sshkit-1.16.1.ebuild 1189 BLAKE2B 2c28fa74d4b9b1f59546b3eb196a7f2c868c8f5889bfd5a5e95e81f3ec54766640f8cd57c4681125a5cb8724436926a90ed66beb376fc42279ae1ff385f9beff SHA512 e315c2d47cf33bd034fde158f21a669e1bbe3e79732657d9c91f3620bb1f921edcbc0d77f55927a4edb15825b02db8eb50f4291756487e5d8b20fdb82e5a462e
 EBUILD sshkit-1.17.0.ebuild 1189 BLAKE2B 2c28fa74d4b9b1f59546b3eb196a7f2c868c8f5889bfd5a5e95e81f3ec54766640f8cd57c4681125a5cb8724436926a90ed66beb376fc42279ae1ff385f9beff SHA512 e315c2d47cf33bd034fde158f21a669e1bbe3e79732657d9c91f3620bb1f921edcbc0d77f55927a4edb15825b02db8eb50f4291756487e5d8b20fdb82e5a462e
+EBUILD sshkit-1.18.0.ebuild 1186 BLAKE2B c8651a8eab3cdc84ff24b4fecd5391cbe44c1b9ca85778f9a36ed355803ec58ed0e382d04b6f2bb21dda2af40c1589e9f77448ca3995df31b558755e1c216c70 SHA512 d262521e035a4490a5c70d79d512dc67ab23555779ba447dfd984d60226c8f589ff3c78dca6c15f52f7216ad33b0bd680c14aebf15f09b082a4416da0139743a
 MISC metadata.xml 343 BLAKE2B 0f8326d45916642aa200df9ede8640367ffbf73022b847f54f8869884a592489bc26a0da45406cd5409973e43290dafa3cb785460e7da61c20de3a796e025a03 SHA512 852971e242c5500cf6ce4fb0c2bc58560b96fdb8cc0f366fa41cac8e066f408330962cb86a35171c08bdea3493be81fbb10bb501ce207f7016a2a1b7c42d263b
diff --git a/dev-ruby/sshkit/sshkit-1.15.1.ebuild b/dev-ruby/sshkit/sshkit-1.15.1.ebuild
deleted file mode 100644
index ddccbb369d5e..000000000000
--- a/dev-ruby/sshkit/sshkit-1.15.1.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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0:*
-	>=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"; require "pathname"' test/helper.rb || die
-
-	# Fix assumption about parent directory name
-	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
-	# Run tests directly to avoid dependencies in the Rakefile
-	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/sshkit/sshkit-1.16.0.ebuild b/dev-ruby/sshkit/sshkit-1.16.0.ebuild
deleted file mode 100644
index e10e7a0497b3..000000000000
--- a/dev-ruby/sshkit/sshkit-1.16.0.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
-USE_RUBY="ruby23 ruby24"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0:*
-	>=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"; require "pathname"' test/helper.rb || die
-
-	# Fix assumption about parent directory name
-	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
-	# Run tests directly to avoid dependencies in the Rakefile
-	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/sshkit/sshkit-1.18.0.ebuild b/dev-ruby/sshkit/sshkit-1.18.0.ebuild
new file mode 100644
index 000000000000..91c7106b40cc
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.18.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/net-ssh-2.8.0:*
+	>=dev-ruby/net-scp-1.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+		-e '1irequire "set"; require "pathname"' test/helper.rb || die
+
+	# Fix assumption about parent directory name
+	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+	# Run tests directly to avoid dependencies in the Rakefile
+	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 1fbda47805f5..b86d3a8cafef 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,5 +1,7 @@
 DIST tins-1.14.0.gem 303616 BLAKE2B 3ead5751b4b9c79bdd366c37fd0d7366246a3f9ba65a87cd032526819e9a44ee5bcef83c97d7657b7de4d9d3918b1d71eac7fada2e98bb5451e3b1ed8c33dca1 SHA512 9bce95b5d6aa663902a8d9fe5badc029db97658d6bf4fe574ebef670e7041ee882ed8b110d906c0f8dbd506bfbeb2092634d607281260db3a40e310881d4154a
 DIST tins-1.16.3.gem 304640 BLAKE2B 5400b1ec1443b1f432c0a18c35a7a3a2175b7327601e2bd106218a119ad930bfd912fa59cf7d1788fe65c9d172e6a7af7385c9e2ef2e4898e490bc838cf119e1 SHA512 f132cd5bdb2ff02805b78856f0340723fdf89437514ef0067f2eabd3742a2282463bb18f4750ea6496124fff48a3e82e73220af3555700839b5270311a1b4ac2
+DIST tins-1.17.0.gem 305152 BLAKE2B af8eec7ab4574bffa9eeca9772417acf2a3bc2582c5afc8313e309733f188301a66669c8954d704c958c2ee97004598d2b058295e5959cbd0982f700706db5da SHA512 abc6bbb534701bd9f4bffb2c0d89ebf63e36b90618e8e45de0ded8787bfa7f9217dffc0983ba683e6463f140199e5e0f73e57de8a8bab4b2dd3812c84a932ab4
 EBUILD tins-1.14.0.ebuild 632 BLAKE2B 441f04010ddf736f421db682cc787c64b4efbeb6b9df81c84722147e27bd44b89b0d682f6acb4867dd3d9135c36e8b12925c7969424abb5a311cbfb73d1d45fe SHA512 7f699acd28e99825416faed2c1d25d03240cbb5607e26b5aa1a9e86b8bdc51de6a3b007c7fd0fda9e1c27b2fca1684006b3da43e178e15f7e1cd5de43d33399f
 EBUILD tins-1.16.3.ebuild 639 BLAKE2B 634a599adf1431d8edc6c63337d2c8fb47ae5c47ff0a1dd62bc4647f8fc4fda1532f412e1ced057534c695cea833ea00b3f2a8d153db55744dcf0646272e88f8 SHA512 9ec1757c4e5983e42bf49108fa9c97d80311c5134eaf839e36d8d9b608321f987b619f7a11306355c930810c5106ed079e97f6342f3fd840f412667fbe87a4ae
+EBUILD tins-1.17.0.ebuild 629 BLAKE2B 9bb5aa47f696559706f4f41e15b782f6b96f20dabd6b2894b838b54c1fe128b20553106a021306425f26a4b60e7485921695aab89df598102f3e66b0c581a2ac SHA512 6a3b1e38ccaa091df2f4f34f0d530d6b12ff4b44408721316f8fcd4c12b8a6dfc1ca29e04ca959694aa38f6068f92f4ff46da5900da68e853f9ec061e0baee11
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.17.0.ebuild b/dev-ruby/tins/tins-1.17.0.ebuild
new file mode 100644
index 000000000000..82e6d4a478a0
--- /dev/null
+++ b/dev-ruby/tins/tins-1.17.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/xpath/Manifest b/dev-ruby/xpath/Manifest
index 8e3233430f6c..0cc9453e8e37 100644
--- a/dev-ruby/xpath/Manifest
+++ b/dev-ruby/xpath/Manifest
@@ -1,7 +1,9 @@
 DIST xpath-2.1.0.gem 16896 BLAKE2B b8dc2b0e207c666446ba5948f6e37c71f410d8a5a027dddd17d5ccb2fa8b0c32f274a34cc144a2380b22266248acad288828114a755d4f04c2a1caeec6ee55e3 SHA512 50d80cac3fd65cbd211d3a87b8844a6607b14c841a1a5609e2370c3624daf719b937a61e526bf31aedee13346802d6bbb721d58bda2bef9c564c187b28bb90e2
 DIST xpath-3.0.0.gem 13824 BLAKE2B 19b41febf466a8bd72cab071fd8e68844c3bf1b2c06ce4aefe6c5a08e4f57ec8f1fd8478c60076a7e6967a85faf49680950f66ab9ebf1d2c47326da40e1f1847 SHA512 fd1e8cfff11e8c14efb1ad2cabb9a0a3bc3d79d40b61264c524ff4524c5e7b9ff86de0746f4530fe7501f5e5e1683cb87c4a479f5e67deb7d8f93ed552ec78d6
 DIST xpath-3.1.0.gem 13824 BLAKE2B 68f8267fe5bd4d5761e24d7950bec321cfdfa82a836337d8f702796e4ff7fdf8dcc0d1d929d58a7595fafe3ca4a1c9e6853b9b4327362befca1b099162f0fa55 SHA512 e9bab0a7555369af412528f56d1fc561119523adcab6555d7b48e88f17166805fda7d73ee2a9ad01f4b87da9ffcafbbe25bc6ac5b87b608eff1b39d31d956b86
+DIST xpath-3.2.0.gem 14336 BLAKE2B a7e1927fe8831669171e4ffa4677d33fb2276820742596d20f7cadc47f0a523b1b438d7568c195119259c8e2f9f49e3bdf1bc224001f7e215a4a02af1e84e142 SHA512 2059938387f4d1656867457a480182bd73e02f265071a394472122aea0b5b4fb0af985ec5be513d2425cf1c341bf18c3cfb67616ba02e30ce6331879964dedc3
 EBUILD xpath-2.1.0.ebuild 576 BLAKE2B f14ebcb7e1a95373f56a134925242da89e2093251e2c9ce9fda24fa32f4fb2b500d43742f7b0da8896929e4e29faa6ec8920310cfed058bf2b131c3ad35cc2e3 SHA512 dccb8ac48d120e6896b9939ce508bce0fa85f71715595f8a65512b8d54ff07f57501188944dadbfbc2da012d37ad3bfc995d6d98119a91e86596864a26acf3a0
 EBUILD xpath-3.0.0.ebuild 576 BLAKE2B b81dc06e58ac0d3fb5dda2bb10c048e481d907187be08f4a0f7eeb9affcdcc7332c9f75b4069a489f7961967bd5e484316db5ffc77a7581e1e965a2845a9f84c SHA512 f6959e194b18020e6478233d5c42ff4de0ad209e01dd2ffcc7d4870bef5e9b19600b88a939afed76c3b96bc0744ad7fc79e0f6a2b08fb608ccf8fedc1a5525b7
 EBUILD xpath-3.1.0.ebuild 576 BLAKE2B b81dc06e58ac0d3fb5dda2bb10c048e481d907187be08f4a0f7eeb9affcdcc7332c9f75b4069a489f7961967bd5e484316db5ffc77a7581e1e965a2845a9f84c SHA512 f6959e194b18020e6478233d5c42ff4de0ad209e01dd2ffcc7d4870bef5e9b19600b88a939afed76c3b96bc0744ad7fc79e0f6a2b08fb608ccf8fedc1a5525b7
+EBUILD xpath-3.2.0.ebuild 573 BLAKE2B 41dc2d741fc9100796dca0af3c90285ee92fbf39a2293657255b2c4bb1b564aac11fe963279bbbf19c3d45884e1221e4c2f9616c21e85016eabfd9551e66cea5 SHA512 2d747cc7917e62967ac4b28ed87337aa1f00316e2ff82c8827f344fe0b5480f0591ad0b70e21000c83700ae3df2e3eb0dcc4804f0263b74731d59c6bbc45b883
 MISC metadata.xml 340 BLAKE2B 6426c5c5b6a61a7df860473b9636c072c43fde9a6bb986f4504a438abe4b86766934ea99eb001d42b308a2af778dabaa24b3edd5d12dde519029758e1609f766 SHA512 6b3fd82cb8cdcb55a98ede899602193acceabde52e93125adb02f0212b646273dc345867cd2c561de43afee480a19fcd4ee9e8a96287d43278877d4dca543e6a
diff --git a/dev-ruby/xpath/xpath-3.2.0.ebuild b/dev-ruby/xpath/xpath-3.2.0.ebuild
new file mode 100644
index 000000000000..e5e5655d1228
--- /dev/null
+++ b/dev-ruby/xpath/xpath-3.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="XPath is a Ruby DSL around a subset of XPath 1.0"
+HOMEPAGE="https://github.com/jnicklas/xpath"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+SLOT="3"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.8:0"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|pry\)/d' spec/spec_helper.rb || die
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index ba72214bac4e..8b33a47a7e66 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
index 381389b0ead3..198b3a0b50cc 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -1,6 +1,6 @@
 AUX 50slib 39 BLAKE2B a7e221f173cfc2b24c72f047130e6b4c289533a22dc7d59fca49a147ed5c9290935f852e8425ac95942da2e8f135713dbd999d6e96521e35c9bce9cf8b6458d2 SHA512 e454fbcd8e4516b363a94055a0dde09f3cd5fa61babb0c6510ba6dcb50ddc123bb89ec8657171cc1d05fa5ebf5a1691b9425d3397c88617c9d2288770ff8a29b
 AUX slib-3.2.5-fix-makefile-guile.patch 882 BLAKE2B 6e9c80b476cafa24477aae5b30e8c35f116cfbd0261f06b15672e39cc94e2ef6cb116104a41e5c0f1ebcb887664d9f43ec6c5b21ab3286d5a33c56d081ca9a4b SHA512 74997578edd5472f084a3b899c4e11b67432a4776bce6a19cbd4300316bf413f38374711a9a5cd3c10cd6cac01cb6d337d6f2ad18236bc4747c0bccf88948e3a
 AUX slib-3.2.5-fix-paths.patch 1627 BLAKE2B bea0c823ca1f4e006953128cb5fe2886f5e84efbcf2d1ee32c801524d3bbbaf65899853c476697b501673501b112e7bd9382f7e372d27745cd190d3fa66a0bd4 SHA512 bdd667f20ca0ef57707a4df379186b58ef5ffab38e61a7e8e4ef697d7a90ebbafa8e4ca1f887d87520290656f2445fe1a9f4bd4e22634587908f70059dde0f30
-DIST slib-3b5.tar.gz 987735 BLAKE2B ad1e6e43885a16277d01f37582db7de068f21da5e10b23e034f5487ac8748303dcc9c12615884ee047dce7c246203f1d0d1cc375794371eae6854199d720c209 SHA512 e5d1210b70cd882cd5e810b3c4102d6060ec82fb2093f472bf31b597f6273e0a02f4d35a82c4b5c8cdc3f8b2c7b9e498fa3e35c7f265fa864cd9dc50e7a874c8
-EBUILD slib-3.2.5-r1.ebuild 2768 BLAKE2B 1a07e6c9e5fe579ca7a1df0914a06612e89e86559e99d484428fa7faa9ba6584a5f1d4ee09a9c504adcb08cb6ff7302f68f8bf019625a826d26e535cc4857103 SHA512 35f5d974cb1f99875f837d432f8fd8dba2061d3b993152275015251d49e1f6c181a2d11a9b81c9af07d561ab7a2138231ec7a3a04a5d2c34c8ef639ee3212e6d
+DIST slib-3b5.zip 1105432 BLAKE2B ae9a6bb34b318875048fad05403a90342b070770013ecd8b022846dc3c43c708511ce6f8ec2be6da2329b01dcc1ed0a641bf68569fd022bb4e2187e20efac0b0 SHA512 f6ebf163fe34498141ab61b6887a9a5db8f2fe0aef1f6c70a7a5783dde6d1268d7e724bc340b73b36189b09013e7079584e0af74f0876e5ebfa46b53d847923e
+EBUILD slib-3.2.5-r1.ebuild 2776 BLAKE2B 40d08dab33058d2df6cff3ae29a767232457ce1c2dbf3ba27eeb9b06c015ebbd6fa07f381123591ba7e795b41e373d5f763336cbb5a303f8362addf24893667c SHA512 efd570885cc6843c37b830a1f02517707e3ee58c4d04f17f49a3cdc15803dffc12d3a1634c32778430ff4625119a862f2f1e36548ef4aa474a4673cb0abbd4a7
 MISC metadata.xml 580 BLAKE2B 64dcf4957037aed50b50ea0648103f9b9f2cc040736751a1bf584464855fed650efe1d3e437ef122356e3f83f7c9b528ddea493193aebe49dc285a7066281d69 SHA512 5b75cfc410ff0ec6a324590f69001ac38410e963df6490695abb85132168cd37ccf685b9281026eea2fc82e59340fccecde58887aa3b64f88003970b979d5807
diff --git a/dev-scheme/slib/slib-3.2.5-r1.ebuild b/dev-scheme/slib/slib-3.2.5-r1.ebuild
index b48f4c3cd153..6723e8acdd1a 100644
--- a/dev-scheme/slib/slib-3.2.5-r1.ebuild
+++ b/dev-scheme/slib/slib-3.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):
 
 DESCRIPTION="Portable Scheme library for all standard Scheme implementations"
 HOMEPAGE="http://people.csail.mit.edu/jaffer/SLIB"
-SRC_URI="http://swiss.csail.mit.edu/ftpdir/scm/${PN}-${MY_PV}.tar.gz"
+SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${PN}-${MY_PV}.zip"
 
 RESTRICT="mirror"
 
@@ -25,7 +25,8 @@ RDEPEND="
 	>=dev-scheme/guile-1.8.8:=
 	gambit? ( dev-scheme/gambit )
 	scm? ( dev-scheme/scm )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
 DOCS=( ANNOUNCE COPYING FAQ README ChangeLog slib.{txt,html} )
 
@@ -34,7 +35,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-makefile-guile.patch"
 )
 
-S=${WORKDIR}/${PN}-${MY_PV}
+S="${WORKDIR}/${PN}"
 
 src_configure() {
 	./configure \
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 3e6e96c52b4a..a61ccd042c07 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index f0208b640da8..1030083097e1 100644
--- a/dev-tcltk/bwidget/Manifest
+++ b/dev-tcltk/bwidget/Manifest
@@ -1,6 +1,8 @@
 AUX bwidget-1.9.8-test.patch 499 BLAKE2B 186ea474d9efbebe4e710ab67a9fb675d3a9d3c892a5363d9f1a31aa00362833e11bf38a0cea353e40021e3717e39333d974d320024ac4b5c5686b6ed3c86c63 SHA512 cea568ef4c932b2b7dff5f8afd0d47e7c000c368d53cd23826f76e9f0446aa789df4391197662e8623d03381fd477928beb5f4bf687ddb48646cfdc9017cb064
+DIST bwidget-1.9.12.tar.gz 254905 BLAKE2B 02b206b9d19ec9580003a8549aa14d2bce230f8dc9834fcd2ba327bee2cf1f90c324f1804e175b89055d5f5f8727253132d186e9230efdc8b29e390e3cf2bf6b SHA512 0e01725ec65041a47a32625f2687e22bc42ccd581a26b3ca7be5a969b0b901c07fd5887a47ff846cc1111767a72cfc6e31f4aa99a1c9040a6f08705d97a5970f
 DIST bwidget-1.9.8.tar.gz 252668 BLAKE2B d7318b3ac932fd0ab9a5fb180e3ca739012e2e6583ba8e3366b6a63c85bfda26ea2f2534540442f9a2047cc27179877658bf492ccfac8106858d049f46f33034 SHA512 437958871809c8ce285cbf4521ff08720d106dca708183ff94234015da2b04ccb3a7b05df13d8e3f46466106c91418607c5983fc4ed8d9c4285ae0a0b1071262
 DIST bwidget-1.9.9.tar.gz 243001 BLAKE2B 31935584e5c6737b143e67113f7d5fb34450ea5bf7852f3c72691abcb1545752f1607945377ac1cb68e5bb256aabc8f92aa193d2a63149ab3de0b74c074409d2 SHA512 6374c9127ab37dd2cc3ede30fc525a7d0f226a995e44f7b1c9751e1c5520090bfbbae5cfcb5cbeec4d1c89eb8f4cd7eb2e453ac055d4ae5ef4b7b77512d2e042
+EBUILD bwidget-1.9.12.ebuild 815 BLAKE2B 9a153519bf18659b6af80a9ada5057a04c91b7135eaa4fa79a5ef02155ec5d3ae5457cba193583947b50e35970f19adffe8a037a81b9e4242987b4d528843e60 SHA512 a693e2b2e051545d392ac53be6e887cfc57dc7c9a6750d05b9029ff75530305de658955b252937d4c5d4bdca1db546044a6cb0154c07c2dd7939ad41aa681546
 EBUILD bwidget-1.9.8.ebuild 806 BLAKE2B 5d0a6379d916f9cc1b9d1eef51c640b632d0e754934aebde09a4cfcb86c1748ef3c994db845826c456056dd770d2154f4b0e6864db55f5eb94d866a270c9d189 SHA512 385c1991d0b8e76dacf9aefbdd92ad3ffcbd3adffdf305db2ea006587ab21aa57f56642c04eae8ccab0590e247f7497dece02183315e5c1326d50780964aad2e
-EBUILD bwidget-1.9.9.ebuild 829 BLAKE2B 0eb7f0623c313d33dd2a9d92cf47e8073f063e230ce0ee4a1e2bc254c681e838696b4ccc06b33dff6a06c61db148b6af95641b951329641b10474c5ab96558c6 SHA512 a7b07e56b344bdc6336e0c7c2ca24c2afe2135838058cab0c1b3c34d71ea2d67b367e294ffcf7bde861b1e23dfa3335fc580cabd78f7bf068db07af6584240d5
+EBUILD bwidget-1.9.9.ebuild 847 BLAKE2B afc55b97460c6af79e3fd0aa4ef9836d59fed913d8982de5a91e6c89e1085145c1fd35b72cc1ef50930fdf045f43ab67ae9291b27c19856f338f520f90f84ded SHA512 355727b31213b1c34a399248683222ae3c5788f213f5efb62e2725de8c38c472dfa436b35892826b54363e5a90c85a8ecd82cd1e010511b2a7553614f599236a
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/bwidget/bwidget-1.9.12.ebuild b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
new file mode 100644
index 000000000000..f13b72b2fa60
--- /dev/null
+++ b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib virtualx
+
+MY_PN=${PN/bw/BW}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="High-level widget set for Tcl/Tk"
+HOMEPAGE="http://tcllib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="dev-lang/tk:0"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.9.8-test.patch )
+
+src_test() {
+	TCLLIBPATH=${S} virtx tclsh tests/entry.test
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${P}
+	doins *.tcl
+	doins -r images lang
+
+	insinto /usr/share/doc/${PF}/
+	doins -r demo
+	dodoc ChangeLog README.txt
+
+	docinto html
+	use doc && dodoc -r BWman/*
+}
diff --git a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
index c7518e156e9c..7b2f79c479ee 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ src_prepare() {
 
 src_test() {
 	VIRTUALX_COMMAND=tclsh
-	virtualmake tests/entry.test
+	TCLLIBPATH="${S}" virtualmake tests/entry.test
 }
 
 src_install() {
diff --git a/dev-tcltk/expect-lite/Manifest b/dev-tcltk/expect-lite/Manifest
index 653d2ae7b2a9..c70497c1cdfe 100644
--- a/dev-tcltk/expect-lite/Manifest
+++ b/dev-tcltk/expect-lite/Manifest
@@ -1,7 +1,9 @@
 DIST expect-lite_4.6.1.tar.gz 142875 BLAKE2B 9e7143d78d68338c4d6ec2858f3a24c5b5330193bfc064c27b190bf6ac7b01e53340e48006f5313cb301b6f6f9f858e818ead8fbe6117ba9ee8c6035b9f9b059 SHA512 a250f34472dad6c44149edf85d35f7ea159e0673aa5619864a71eb78003d0c1a2ec3d25505618f616d12d82d50bda8039a239b443014b43b2387059e6b6eb7d6
 DIST expect-lite_4.7.2.tar.gz 145084 BLAKE2B 053f26ceaa98cde7bfe680f3076cdcd5391cfb6483c6ec0d0c9bcdf1f51e4b53c6429cef50a10915cbb01955fbee77bb6075bde612b6299bfd95357ab88f7408 SHA512 1f635f87fb53624f687477bae41edd37474c5358de368af8065d4222181ed4a5efdb55c8fda47e1f1b4c163fa2a423e7d84a7da8415b17cd250417432ee0fc5b
 DIST expect-lite_4.8.0.tar.gz 148917 BLAKE2B 0aeba8356c41f740807b914941c58a7ed26cc826ce2e297c5275b4f9a8c227437b2120d74f60229274aa56858ce03021245ef218e8d75a64cc6508f43b3afe2b SHA512 b4956dbcdde1e5648a51be99069069be6ff2ae6fb7a67116a35bbbb8786228920e9177bd1b14d0ac3dd0a8ebdd6fa523c62bb7f23c84407ebe73abe3523e43c0
+DIST expect-lite_4.9.0.tar.gz 149560 BLAKE2B 6db5c7f37d996996bcd94ef5e0b7d2d2d592cfd88f56f751c35f53826d3cea473861d332327caf4e9c6950a983b2d907955a7b68e8ea46655e07a8197fbe1f6b SHA512 1a210f5937cf31768a77c9f8d7147be1d8bd3f4e3c68c8941fef7871d22c209c9946aa1f3b2705a0332523439a7e8c9ef7ae3a46d4b5174b5e759bf15dcad4e5
 EBUILD expect-lite-4.6.1.ebuild 626 BLAKE2B dfca655dcbbfc6c05af6f22dd45f7fbc0aada96cb6e6402c98aa4b481c866d5aee41940f17d2b62d2628c36bc7b7e403c52df6ad429c843a9a0793e750abafa3 SHA512 cbeb25d446b9441324b29e41978c4b8cceaffdbf25a365492b676a601046c078dc172941a04ec327d52ce5211e36e125d84863b39bc3d90e452c164f43a5141b
 EBUILD expect-lite-4.7.2.ebuild 628 BLAKE2B 4762755e07d9bbaacb84dc0e6295d864e0c6bd3e3985ffedaee761bc380cf8c7927bf5aaaabcf60dfde5bdbb9fe92e9e0138a023adb34e3c92544ec704a53c5b SHA512 aff36ec455374906e646afb0accbd041dfcbab5397e84c41e77e6597db436894c1299db9b12dfcca746a7067ddaf26b1e6a050cb1ff1ca7eab1a43dc0d5a6687
 EBUILD expect-lite-4.8.0.ebuild 609 BLAKE2B 03e0ccd1544a9c4dff58d7b5e02bef9a5878ddac6e5361725357aded02e4ee164a09a2f08991872ee273302f33ff8251718dd2e744568dd56a81da2c1e017e13 SHA512 659555ec0eb741831fd52046fd335c297046033111102b37591bcc87118a263e1b77649af5ec9fa30db0c81ad32fd74058f7fb50a61e46e4c319ed4acf165b67
+EBUILD expect-lite-4.9.0.ebuild 637 BLAKE2B 7ce4e71b0660132fbb352e10154191bbd3a2b0b5f508fbc7a5471294e81f5e773f8e058b8d10b369b6cc8c906c807ae60f922bde4012c29e7f967e5ad2de7e6b SHA512 cd40e2f9eacbee0bb7bcdbab7dac8e0cb33ccc460346794e9fe093417944b25adff28c00d53d48e14953248b4e038fcbf1b768e6e2d9a6bd17587ed52761782f
 MISC metadata.xml 434 BLAKE2B 7255ecd664e8675ba5728d606b7961ffca2823b680cdc6c2c7cd918abf474563f87a09911cf9e71f82970fe9216c5b91f00dee7b25fcf38fb3296e9695827b8b SHA512 ecdfb3b8fcb84becaf9284a7ca2efdc9d49e662394a6a9a0fb6d8a8ba3249b3c2b622dbbfd41790235be170ee9c64d96b2e5e99cf8dab52ed904ccb18ffbd8bf
diff --git a/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
new file mode 100644
index 000000000000..5f96fcf7d046
--- /dev/null
+++ b/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="quick and easy command line automation tool built on top of expect"
+HOMEPAGE="http://expect-lite.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples"
+
+RDEPEND="dev-tcltk/expect
+	debug? ( dev-tcltk/tclx )"
+
+S=${WORKDIR}/${PN}.proj
+
+DOCS=(
+	bashrc ChangeLog README
+)
+
+src_install() {
+	default
+
+	docinto html
+	dodoc -r Docs/*
+
+	dobin ${PN}
+	doman man/*
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
diff --git a/dev-tcltk/itcl/Manifest b/dev-tcltk/itcl/Manifest
index b557f404a55a..1f148f2b08dd 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -1,5 +1,7 @@
 DIST itcl3.4.1.tar.gz 263316 BLAKE2B ba4a94d2dfe80b095e754d01036b189130918d7f29701f003873d59fa8e75074b1601dd907d94e5a9f680e05b18493d5782d6a4ddbb56d7df9ff85c8d5b17ecf SHA512 288c9b636f1814371bedd33d570a8d46055e136953685a111b76f3b89a6c7aaa1ee9223ceaae1c5ce43198195cb1adc2b178d7c4101d7fd14cb7e756c98bf2b0
 DIST itcl4.0.3.tar.gz 430522 BLAKE2B e1ce0325a501b0227f6ec721927488dff0e2ea323bb8b03b046ce23964b55cdf44d7633f34546b9b0432785e609bb7dddeb3a300cbb2d82a9e4eb70acb1bfd66 SHA512 9736a08f0f33e0afa677a77eb643454908531786435b73314a80d9ee211c06f037eb0de3c2c2608b728253f9ec613a601d76f16f29964eb06b667ecbb3400df4
+DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
 EBUILD itcl-3.4.1.ebuild 1031 BLAKE2B bca3f59f758e7e5aa2924a70ebf30673607c5e4944737c314f9741ca1115849450315d0c64a9ebcc2fdb78bb9e0c83ce2bd1e79da7a0d24b6697daa829e7468d SHA512 43778440a2847a4d59667a132f70efc2dd73108481a20cb6603d43fed0b77eb58940e800acf065ce031102531a236b47d119f957bc05fd30deae682a55d6de78
 EBUILD itcl-4.0.3.ebuild 1726 BLAKE2B 342bed309f2e5bd3d22121d0437216afca28d7fb0060949e61a7d92ab61d4883de83eac923028344c6e6245bd1ba19a8c408d73e36ca14b676531a93cb672142 SHA512 6794f499a6539243e8f899b8de7e39310e30487aaa2b0c8296fa2fe4878d9dccdfbd3f97ebc3f4de2bbe4894a0298712b14ca2db351c7828849748679aa8af0b
+EBUILD itcl-4.1.1.ebuild 1488 BLAKE2B 2619e9a9bcd0914bffea0f6b9d60cf8cc2e84fcf756986fe438d4750eea72d7e0c37535c1210d5061007bb4900413599e6b3300644b064eb14d0a4d62169fd61 SHA512 0e242f7a7cf92520ca2dc5bb7bc18eacdcbe34ac28c75bd79c41e9334c74806c3ac078892e1e59f8c0d866871aacd92b84564c36d87a6d28939ad21a959ef475
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/itcl/itcl-4.1.1.ebuild b/dev-tcltk/itcl/itcl-4.1.1.ebuild
new file mode 100644
index 000000000000..ee7ab36d3f3f
--- /dev/null
+++ b/dev-tcltk/itcl/itcl-4.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%20${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/tcl-8.6:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+# somehow broken
+#RESTRICT=test
+
+src_configure() {
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--disable-rpath
+}
+
+src_compile() {
+	# adjust install_name on darwin
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i \
+			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
+			"${S}"/Makefile || die 'sed failed'
+	fi
+
+	sed 's:-pipe::g' -i Makefile || die
+
+	emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	sed \
+		-e "/BUILD_LIB_SPEC/s:-L${S}::g" \
+		-e "/BUILD_STUB_LIB_SPEC/s:-L${S}::g" \
+		-e "/BUILD_STUB_LIB_PATH/s:${S}:${EPREFIX}/usr/$(get_libdir)/${MY_P}/:g" \
+		-e "/INCLUDE_SPEC/s:${S}/generic:${EPREFIX}/usr/include:g" \
+		-e "s:${S}:${EPREFIX}/usr/$(get_libdir)/${MY_P}/:g" \
+		-i "${ED}"/usr/$(get_libdir)/${MY_P}/itclConfig.sh || die
+
+	cat >> "${T}"/34${PN} <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${MY_P}/"
+	EOF
+	doenvd "${T}"/34${PN}
+}
diff --git a/dev-tcltk/itk/Manifest b/dev-tcltk/itk/Manifest
index 510fba346076..833599aadba7 100644
--- a/dev-tcltk/itk/Manifest
+++ b/dev-tcltk/itk/Manifest
@@ -1,7 +1,9 @@
 DIST itk3.4.1.tar.gz 182311 BLAKE2B e1db1b9f7e6e8c5b93eec5bb29fc24af7e6cc5cb3f209df346f03553d3fe7248614c9bb10e2ababd93ea56c63963c1db4ee65bedbae8c279fbe84b6d0eaad3f9 SHA512 4680db81a0212e695cfe2c40cabe6dceb94520cf3ee06e2e332f12316838726da14c0b925b117ea351aa14fd2d695f361bcb4062743c66099ef783ae31ab37ef
 DIST itk4.0.0.tar.gz 177838 BLAKE2B 6bb975c414d40c81bac4b8651ce89f0d84d712114e6f60e1555071d2079f778850f4de7df1a79254db1d1152e8d43f261e0bf9827737fb69abb2801e72d72d6d SHA512 4fd993e3683376bd2852a19e8ac63ec20a9319f3987737a32f7af78b645ff27416b18572b7e30fc1e41a5e4e06ac064280fd86d979738ca9906e2605069c51f3
 DIST itk4.0.1.tar.gz 182029 BLAKE2B fe3ed0adddf71af9bf795949b18baf7d983edc1e6e95939db18bdf896069083afbc8498935b0c59e2c5f4179fdc6f624e67198afa0755e8183d754c181d50642 SHA512 d64beeb42949e96b384ef2fd571971813697086df8b18af79399cedbb80eba19dc013677957959ea93dc0dcd7cdc4be012b3f9a5f0eedf0bd743550837bd78fc
+DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
 EBUILD itk-3.4.1.ebuild 1330 BLAKE2B 02307199e9565cd87b22ff4e0cc2a5d3e10c035587defed7cd1743fd1d2d7186a01f991c57171e2bdf2ad12b816fe3a37efa279206c732cf1a79e3f1aa159f7d SHA512 07d5a24d0e729ee3f80bf06eb9428da7c2ef7ce838fb7a205db54da28561861b44e2eb4b2fcae9b9c283d1666689a56fb0cb9d0dd8a39c66bf881aef867e9751
 EBUILD itk-4.0.0.ebuild 1467 BLAKE2B 67528687897aca81a858c904d33b1602126a25a4d89e3329dde95e1ef53e7a15850e8571cf45cf4472bab35d6db04f868edc33894b21d5e189f690efe8874839 SHA512 af6ce3adeaaf8da94dae5b9c459c9ab5a13a3f8276127470007ef9ca40147d9727fdcce7db161cf46e8e1a8671aa821118af15c643b8db1454d733a4896ce4fe
 EBUILD itk-4.0.1.ebuild 1468 BLAKE2B 5723a3c973ddbd57fc83e85fd552ec86e12a8d21cf7dc61b9e2239f7b308565d86edf110cf9570dbd03b277d8e50ac73f9aac386d103daad1563bfbe846c7e7d SHA512 0f7947165de490aa43e3902fdea7d2f8d272be30ca43124276f4c6b148a99c96ab5efb0f718acd864676a23e60d388d58803acf22928d26869c427c11ba9c5db
+EBUILD itk-4.1.0.ebuild 1334 BLAKE2B 9b4115c6e2e1843d66856794fca30e50c7d9ab4a33f8a7202dc2e932a0dc05698b1fc8909576833b2946dfb40b419957a6057c17e51ad2909233c3f60231199c SHA512 f261506e22211705a28ae0efebaf7b5af883851de617cfed9f94ee24ea797c6d394d91dd4001e48672967cd5ff315986d0241725cb704f2edbdc6ff85bd50f6e
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/itk/itk-4.1.0.ebuild b/dev-tcltk/itk/itk-4.1.0.ebuild
new file mode 100644
index 000000000000..dacfecf0fd08
--- /dev/null
+++ b/dev-tcltk/itk/itk-4.1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib virtualx
+
+MY_PV=${PV/_beta/b}
+ITCL_VERSION=$(ver_cut 1-2)
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%20${MY_PV}/${PN}${MY_PV}.tar.gz"
+
+IUSE=""
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-lang/tk-8.6:=
+	=dev-tcltk/itcl-${ITCL_VERSION}*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${MY_PV}"
+
+src_prepare() {
+	mv configure.{in,ac} || die
+	AT_M4DIR=.. eautoconf
+	sed 's:-pipe::g' -i configure || die
+	default
+}
+
+src_configure() {
+	source "${EPREFIX}"/usr/$(get_libdir)/itcl${ITCL_VERSION}*/itclConfig.sh || die
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tkinclude="${EPREFIX}"/usr/include \
+		--with-itcl="${ITCL_SRC_DIR}" \
+		--with-x
+}
+
+src_compile() {
+	emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_test() {
+	virtx default
+}
+
+src_install() {
+	default
+
+	dodoc license.terms
+
+	cat >> "${T}"/34${PN} <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}${MY_PV}/"
+	EOF
+	doenvd "${T}"/34${PN}
+}
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index aac1afa066c0..fffc11c21a79 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,10 +1,10 @@
 AUX 4.0.1-path.patch 2352 BLAKE2B 4868024ece21be33bb69f95fe827591b559ca8e3cbd77d2e7f06d60acbf40495cd69fe175e3845305bc2b0cc59ecc5c817c85b8fc3f5be5d26f9e9e95fc54ea6 SHA512 1ca0d44372ee3e559dc47d773dde0dde3e1db4e8d6966c825143694ab20dc857feb52611d81f0c1ff045f947e282596430e5a3b4e0ceb673c57f8985fa11260f
 DIST itcl3.2.1_src.tgz 427026 BLAKE2B f37612bc21916bfad082d60cd216e28f2e427307e0ea80aa0ca1506c1d247471bfcd20be744a16ef57f5e04db0c34fcc436f2fbe53715462417202377a6cf0e4 SHA512 f6b832f20e53bac66c8bcdbf64aa4aad932ee827fb8059ad2e0dca0c61db01affde6b67c1e0acb331a3837eebcb38282fa7bec90f5d6ed4b65799f4424679f3f
-DIST itcl4.0.3.tar.gz 430522 BLAKE2B e1ce0325a501b0227f6ec721927488dff0e2ea323bb8b03b046ce23964b55cdf44d7633f34546b9b0432785e609bb7dddeb3a300cbb2d82a9e4eb70acb1bfd66 SHA512 9736a08f0f33e0afa677a77eb643454908531786435b73314a80d9ee211c06f037eb0de3c2c2608b728253f9ec613a601d76f16f29964eb06b667ecbb3400df4
-DIST itk4.0.1.tar.gz 182029 BLAKE2B fe3ed0adddf71af9bf795949b18baf7d983edc1e6e95939db18bdf896069083afbc8498935b0c59e2c5f4179fdc6f624e67198afa0755e8183d754c181d50642 SHA512 d64beeb42949e96b384ef2fd571971813697086df8b18af79399cedbb80eba19dc013677957959ea93dc0dcd7cdc4be012b3f9a5f0eedf0bd743550837bd78fc
+DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
+DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
 DIST iwidgets-4.1.1.tar.gz 720630 BLAKE2B f276159893b19d7af7cbbe3653f9e406184c76065ae7906c34388545bdfff1b9e427a6e9b1985f349e9229c69c935b5b85ae8a0fd15ef28b0a1312fc4fcec8f4 SHA512 56fd91d832c59426b030bde2ec7136e46751503dac1b650d195251cac7ef1d1a7024adb2d995fe835f1039a0f99eb616db97a9e9c591f827a911eea2c233c305
 DIST iwidgets4.0.1.tar.gz 647960 BLAKE2B 3dafbe73a40e4babff574a82b4bd68546f109a52197f15228877950560f8089f95a44da93c3ff2723e2a40f26bac0e00ca4f34099e716591b93e9aba846e4257 SHA512 61d1980eb8beb2821fbd8333f5d1f6faa8bf59d98392fee8d166eef213b27c6b66121d42b8eef64d151e5249009be56076a8cf8bb6635072ee6ee4075858182e
 EBUILD iwidgets-4.0.1-r3.ebuild 1433 BLAKE2B c866699220a46cbeb18fa09df403e2cea4b8afcfc791f0b2989a035d6fb85c8a19ec7c5ba4c5e0c12dbe71d5a67eeedd651d0252dbe6e4680c23eb49a1eaf422 SHA512 750fd18f58409e9642b7112ea07d23616ba19ce6e2c00df4b7fda62bbf2e7b41c7b4331890c2fb8d10a398c68586f8d6581db206569c13e2f44ec0c81a7af5b0
 EBUILD iwidgets-4.0.1.ebuild 863 BLAKE2B 6d4adbb993dd99a0a0b4e1924c7e8f23296430f17d78fbbb9e122bf58949e62b2bbfbc8915ce327b9a76c2d71b280f1293188a06999839d1948d472c361c2dc6 SHA512 1920f61dd8b29a1b8621aa61f802ed0006983f4b4528233219cfbade9e0a7aa89d634365e112b6925a584e2fea3cf2f84e19d4ad26ad12a55a3b57238262bd14
-EBUILD iwidgets-4.1.1.ebuild 1383 BLAKE2B 7e9a6688a40ab5ce1ea5e0468141271e5ba34d6717f457ce609b8f4b2d762e1cefedf6032e3afcdecca3f17228478888ca0435b3f5e97c49fd77dbcc8e24a631 SHA512 d15d3b1977bc0f2e03fc94c9b3f16c2a8b22633e748a2f6250390232a68d31b11b1603c941d1ee57bbd33ad6afbec3caf68b04fd6fbb3e1ab1ae5b74c5d26688
+EBUILD iwidgets-4.1.1.ebuild 1379 BLAKE2B 9796d27b962e07fc20560d9ba507a9344ace0b78bbf9bfb5f0b2981ef5bde7ea4a72171426a0faca1fa75c730f49be13b5aa85f88d5ccd258937470167658ee1 SHA512 928fde4b1485fddf61144e15dc7f7c54b8037b95a7f7f855f62cac0709952803278065e4e226184d1806cd9771fd1d81dae92ba5a60ab6a54564b466fc3e0441
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild b/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
index 5c4d8362e2ed..728e7f8d1756 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib
+inherit virtualx multilib
 
 BASE_URI_ITCLTK="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source"
-ITCL_VER=4.0.3
-ITK_VER=4.0.1
+ITCL_VER=4.1.1
+ITK_VER=4.1.0
 
 DESCRIPTION="Widget collection for incrTcl/incrTk"
 HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
@@ -26,19 +26,16 @@ DEPEND="
 	>=dev-tcltk/itk-${ITK_VER}"
 RDEPEND="${DEPEND}"
 
-RESTRICT="test"
-
 src_prepare() {
 	default
 	sed \
 		-e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
 		-i Makefile.in || die
-	sed -i \
-		-e "/require/s:Itk:itk:" \
-		iwidgets.tcl.in
 
 	# Bug 115470
 	rm doc/panedwindow.n
+
+	rm tests/hierarchy.test || die
 }
 
 src_configure() {
@@ -54,6 +51,10 @@ src_compile() {
 	:
 }
 
+src_test() {
+	virtx default
+}
+
 src_install() {
 	default
 
diff --git a/dev-tcltk/tablelist/Manifest b/dev-tcltk/tablelist/Manifest
index e3a4d1e0624d..b1462478ad96 100644
--- a/dev-tcltk/tablelist/Manifest
+++ b/dev-tcltk/tablelist/Manifest
@@ -1,3 +1,5 @@
 DIST tablelist5.8.tar.gz 416416 BLAKE2B 04372aab25af72d331da342aa85f49238ee39fe15da3f1f418e5345561b8feb6b6974b3a956f6d8d49063767030d60f01ce5207caa446b8f1936667aaca0155a SHA512 9c8e3577ae0e89291450c7ecccbbb042417d9a24255489e9257eae2b48454cbef4ec759949ddfc8d73123260da3fc506e01acf6c15e113e5112ed15c014d6833
+DIST tablelist6.3.tar.gz 551180 BLAKE2B cb9181e052d5c63bf2ada068e31b1ba637001bb4da6ce9303c8227cff20d1a8df3c2bc59689a86593d1de59e54f3b1de534c049930c4f01ab705d24263a9cdf5 SHA512 4a5331a9e84dcfb1ecb025dceb82a188f33d14dc91f960e7dbdf17a9ad14a3700f56f84a1af0edc3ea912f92b167524946e01c8c52fc053d106536658013bfb0
 EBUILD tablelist-5.8.ebuild 663 BLAKE2B 7a34e883f735ff7b5e8a9c2f77126882e9108a2db6cafd5eb95dbc90aa9c6b810571516eb838616103d325983f3801685b30cdca65e07d47ce7837dfbfaed8d3 SHA512 1e9b61a0ede9169eff9a24e54d782a614c6b738afbfdac623d1fdc1b54c9d306699cc426d3fc4b330793a393ca2f27ba2d99b82c401d99b4e45265a7da441047
+EBUILD tablelist-6.3.ebuild 648 BLAKE2B 96c448a392d883e602c9e9fc535e0078ade649faed35e9c2bdbdcd099218dcb5e0783313e4ae87bef741415e2378b0a163ec865c7d2d280cc7fec6290edf449b SHA512 4a132b23e0ee3db223651d09372997be32b04176a8c14d852d419b3972dce151b32fe41c93da63b5bcf93f38ad9612f361eab2fb9f1008805c27686df75cc101
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-tcltk/tablelist/tablelist-6.3.ebuild b/dev-tcltk/tablelist/tablelist-6.3.ebuild
new file mode 100644
index 000000000000..dc1dcd291151
--- /dev/null
+++ b/dev-tcltk/tablelist/tablelist-6.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Multi-Column Listbox Package"
+HOMEPAGE="http://www.nemethi.de/tablelist/index.html"
+SRC_URI="http://www.nemethi.de/tablelist/${MY_P}.tar.gz"
+
+LICENSE="tablelist"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples doc"
+
+RDEPEND="dev-lang/tcl:0"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/$(get_libdir)/${MY_P}
+	doins -r ${PN}* pkgIndex.tcl scripts
+	use examples && dodoc -r demos
+	use doc && docinto html && dodoc -r doc/*
+	einstalldocs
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 03facfb90aa5..f791328030be 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Orange/Manifest b/dev-util/Orange/Manifest
index f3a8ffc10f00..4a381b57c20d 100644
--- a/dev-util/Orange/Manifest
+++ b/dev-util/Orange/Manifest
@@ -1,5 +1,5 @@
 DIST Orange-3.14.0.tar.gz 22537651 BLAKE2B 253a9bf69856f9167fdc9cf001310982441450a93f3caaa74ed91ae2afbefb421734fda1561aff9e4aa1e3dd786c82c324ced07fcbd97a507197cad28778e27e SHA512 eed1e50826ea0ca7c96ad302eb8fe65f997810786f8c9ad3b3c90e085dd77f61ca75535294b3f0244a237d6ff7fe7d0b4cd9bdbd5bb5f489e45d7b1549ead55f
 DIST Orange-3.4.5.tar.gz 32999331 BLAKE2B a334da0d55096a8b3a6092cab4b79891c085e6faed8ddc738aa720ff97bf4bc70e215814a0770f284f5d34fe6ce58081b916477262ec62cb28dd246a923b589e SHA512 327c99f17b5c6a83c48c1826cf34624aaf620d84a2f566f22e394cfd0f1b9c7863cecde0ea7344f16b706efb6a4581adad90b59872db9f0be355495971aedd58
-EBUILD Orange-3.14.0.ebuild 1741 BLAKE2B b88670da206681d81d10dc055013fd0c029f7c0972fa98daf0f06cf1afb8372ff94870629fba78053332069d9210029e6fd2000732bb2b504f71211273f093e5 SHA512 d39a7cdf3958e278c9c0a73c3770f09bcd9ebe8e0a5cb3c6c93e7942b4994fee695f1d1194560e5d42fd472ea826b4cb9383699ea4fa53b3cedc362534941136
-EBUILD Orange-3.4.5-r3.ebuild 1421 BLAKE2B 665eed5c5520bcdb6ec25eb37de26fd9a5e2f756bd6163690a79b0f580875be91dfaee5c0786e85d8bb5e2ac1e778b4e49ebd23630d25be490a124857af3c9c0 SHA512 19f5394c51a2f05fb60cb85eeeddc8bc51d75b00892b0b27c2ca1c1ed2f35b3b4fa635fa9847d5a8836497c41c03a8b0c4e3a2311c43a0523e6196a9b39863d6
+EBUILD Orange-3.14.0.ebuild 1787 BLAKE2B 12c9af136dcc3ec042809252d47bcd380c3417c8641f7a04ce923e9938763251750548b2f5672a34b752f179dbe6458727e274d7e474cbc27ebc40419d1692c4 SHA512 87263aeae57d2b9eec81ec735043c689ba33e9f0f8f92c37a5a6a696427dd627897e3f9e330b86fcd0c6b54d6d6b7832ebbd5e18f66012e33a1d8930d68499a8
+EBUILD Orange-3.4.5-r3.ebuild 1467 BLAKE2B 19091f97648b4b6d1e29e8ba34c9a5e9ced4178ae723f8d7fbf526a4d05ce7f969fffc7253f1576cac39838ab7c4ae02b9e1f6e1a1cea25a838ca506284a377c SHA512 63bcde7e30ce41ccbcef6c3793da3ce8d2f7fb42f7d0f2f23ba9e15c4edab4f00b6d59bcc3a5149f40f95ed267b169f76fafc6305685082aee08e26e848f3e9c
 MISC metadata.xml 214 BLAKE2B ee4a28a5b07deecdb0f59f382551a5f75712aac4c44a3f1b6086bdc520a5dc1cfaf67982ddeada2044128fcd551b40aba54d463d91142a3c35236cb09e119416 SHA512 e38be8dc636f8d2db14dbf8a5d673224ed83adc030db673cc59ef4c2db90884de5f4e61c3247524d12015486769ee984d1c188acb7488826e659fb36de1b46e6
diff --git a/dev-util/Orange/Orange-3.14.0.ebuild b/dev-util/Orange/Orange-3.14.0.ebuild
index 39ffafd703eb..f4f9db0c5c86 100644
--- a/dev-util/Orange/Orange-3.14.0.ebuild
+++ b/dev-util/Orange/Orange-3.14.0.ebuild
@@ -19,7 +19,8 @@ IUSE="doc postgres"
 RDEPEND="
 	>=dev-python/anyqt-0.0.8[${PYTHON_USEDEP}]
 	>=dev-python/bottleneck-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/CommonMark-0.5.5[${PYTHON_USEDEP}]
+	<dev-python/commonmark-0.8[${PYTHON_USEDEP}]
+	>=dev-python/commonmark-0.5.5[${PYTHON_USEDEP}]
 	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/joblib-0.9.4[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
diff --git a/dev-util/Orange/Orange-3.4.5-r3.ebuild b/dev-util/Orange/Orange-3.4.5-r3.ebuild
index f34690624e02..43ad03b58d54 100644
--- a/dev-util/Orange/Orange-3.4.5-r3.ebuild
+++ b/dev-util/Orange/Orange-3.4.5-r3.ebuild
@@ -19,7 +19,8 @@ IUSE=""
 RDEPEND="
 	dev-python/anyqt[${PYTHON_USEDEP}]
 	>=dev-python/bottleneck-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/CommonMark-0.5.5[${PYTHON_USEDEP}]
+	<dev-python/commonmark-0.8[${PYTHON_USEDEP}]
+	>=dev-python/commonmark-0.5.5[${PYTHON_USEDEP}]
 	dev-python/dill[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/joblib-0.9.4[${PYTHON_USEDEP}]
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 8809096e399b..8331977873ee 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 2399 BLAKE2B f0739bdf63c8a7559f46b2bd0a3be11ec76f123fee5b38e745d028fd12dba54c514c9795da7d1ba38d814a5a9e97a8463c1222ea43860b1064d007c4ad5cbb0d SHA512 03845b6e959eafc6cbdd6f01357b8df7c241883ea961237630d3c2d87dc69998ca993f617264957c9260cb1b2244cc80f146d43f9a31bcecce0773211109a8fd
+EBUILD astyle-3.1-r2.ebuild 2395 BLAKE2B 98f245433e2cb2a59cd6267d2ae1f07fcd333d6998bf8d04cc08b4a55721c808ccea335b1ed59fbd77b7aeda169ce5a51ea9a04a4834440aafc1e56ca22408d9 SHA512 2dc81c012d958dc8fe76a8e8136abe83fa822c145b6d20eb921bc5a964192574eb1334b2c1f59366f2a1ec8e424091af458ee32cec3750155c5f02fe7e80445e
 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 cc2092626326..4e7729f00f84 100644
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/3.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="examples java static-libs"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/autodia/Manifest b/dev-util/autodia/Manifest
index d17fa7b2bae3..ec3b3e38fe71 100644
--- a/dev-util/autodia/Manifest
+++ b/dev-util/autodia/Manifest
@@ -1,4 +1,4 @@
 DIST Autodia-2.14-dbi.patch.gz 343 BLAKE2B fab5420ce032c87ac874ec345289d9d75f5d10d99eb483e8b2f9258dc9ae3b2a6e609098d600dc0dba5fcb4a8f6279bb2e1e51843fcbf98d7203595f581c9cc8 SHA512 2a7c1b4bacfaab3d0c0c16c12362be0a16161db0465ad1b5c4cc955296fd611824aa87b49e7c3672435d10004a383125e2edd3aff640fada2e1694cc02a8abd5
 DIST Autodia-2.14.tar.gz 78070 BLAKE2B cd7d68dd618599b46f59d9304a7c515f6c357a756c9ecaed50e7dfb7e404d4c9810ab5065310d549d5d8c2aede5c7156371c7e4855f73e5ab3893856f39fbd89 SHA512 41cd0d9dd8fc66d70aaf987a8a62ed8b916e9a38263c61cc1cb7994e7bfb24843bbd3440bbdad054fccbf0fbbdaa11ec3a35db2a6f926bc87ba65a5f4ac160ee
-EBUILD autodia-2.140.0-r1.ebuild 782 BLAKE2B 1f4484cf458ae5723d02bd67a7cd8bd3e0ad1d334cb2b7cfc7b31b1dc54c2a3773776a88faf2fb789d8fce9c70f09d62b0b28462170a0b6bc0995f53bc292355 SHA512 0ddb9e5061e30d392e0e41731e1f8e6d61657b1defcaaf6fe36562d13026015c9b9459514658aebcbdbf0f57ad7cab61a1e96aad0cfb8217ba6386c58167c7a8
+EBUILD autodia-2.140.0-r1.ebuild 744 BLAKE2B 5307f034033d6dc37b2b563809192ede57df84ba51dd95ef9987b812a45dc51e2e7f70fdd83a786a966bb7963994fefcee535586977ce887d883f11512890163 SHA512 9b3b1bf623f64456284971cb72bc249c7fb663f33b0974d6af4c56757518ef79bad54c2634340a5bc1fc68f7d4f1cca2c638d93f540baa598ee0cd993ef62fd4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/autodia/autodia-2.140.0-r1.ebuild b/dev-util/autodia/autodia-2.140.0-r1.ebuild
index da836e9aeda0..656e77b1bd87 100644
--- a/dev-util/autodia/autodia-2.140.0-r1.ebuild
+++ b/dev-util/autodia/autodia-2.140.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ inherit perl-app multilib
 
 DESCRIPTION="Parses source code, XML or data and produces an XML document in Dia format"
 HOMEPAGE="http://www.aarontrevena.co.uk/opensource/autodia/ ${HOMEPAGE}"
-SRC_URI+=" https://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${MY_PN}-2.14-dbi.patch.gz"
+SRC_URI+=" mirror://gentoo/${MY_PN}-2.14-dbi.patch.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 03e566fef39b..e92b13b19da7 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,3 +1,5 @@
 DIST bazel-0.17.2-dist.zip 79230155 BLAKE2B 62a60011f9605a1d615e648fdbb98b193561e1d86a7562ccb10fdbb8b6986e17a72c4076dbdbf6baf8a7af83e320af2c4e4b65b5b2101d845597ddd688194ba5 SHA512 0d277e20eac6fc972a31be1c77a750f6585d16beabfe7dd096db4103f0f191958aa83b52203b91d4df5b486ff20004c0b4b22125e58379f64f68abc4a87ac326
+DIST bazel-0.18.0-dist.zip 86890953 BLAKE2B 53da2c2d4467f1f7dd2e613a347acd0ea547bd41fe49fa39cbbcb92c337dca43412ac9b65abf7a3e00c322b8fea075cbdef0da5b064bf4e22aaaa4c545c539de SHA512 128e1041ae0d85be26933bb107b406ca4ab177f00eec2ee1d791ec9089c0cb384857b532498276480d1063b82e7a9a809b9f8a0d0715260534c3e3d202d6cf13
 EBUILD bazel-0.17.2.ebuild 2921 BLAKE2B 4088b739841036045d100e45904d4ca45e8feb466eed72a4732aa69f1ae212ca5d900d6312a04b1bd5c9caa2717f1e3b0741f51010d31c113dda21767e7c0e20 SHA512 53d8207474d7d0b4301484c7d7cb3ef58ba556cbda6436b430714706e69abfb6be6c49d6a3e6d86b55fdf12eda300551f0e6580ed0fb42f1dc3c94de072c71e3
+EBUILD bazel-0.18.0.ebuild 2870 BLAKE2B dca6242ba8027e5c2c62b2cae41f0962db415a11649a0850e9cef1f012e444d94f644734b6ddcfd208f16723c9907130d00e44767efca6b33b47992243964434 SHA512 dae913f3ffa15db53cdc5bcbabfed6a826bd6ff9d7ca8af7526775a5618bb415896b59f90ec10855900ffce264f5feed79c274b1419ef54123f01ca636664370
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.18.0.ebuild b/dev-util/bazel/bazel-0.18.0.ebuild
new file mode 100644
index 000000000000..c1c992cd2cab
--- /dev/null
+++ b/dev-util/bazel/bazel-0.18.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="http://bazel.io/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools zsh-completion"
+# strip corrupts the bazel binary
+RESTRICT="strip"
+RDEPEND="virtual/jdk:1.8"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+QA_FLAGS_IGNORED="usr/bin/bazel"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; 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[*]}"
+}
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	sed -i 's@//src:bazel@//src:bazel_nojdk@' scripts/BUILD || die
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	cat > "${T}/bazelrc" <<-EOF
+	build --verbose_failures
+	build --spawn_strategy=standalone --genrule_strategy=standalone
+
+	build --distdir=${S}/derived/distdir/
+	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+
+	test --verbose_failures --verbose_test_summary
+	test --spawn_strategy=standalone --genrule_strategy=standalone
+	EOF
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
+	VERBOSE=yes ./compile.sh || die
+	output/bazel --bazelrc="${T}/bazelrc" build //scripts:bazel-complete.bash || die
+	output/bazel shutdown
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-bin/scripts/bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh_completion/_bazel
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+	fi
+}
diff --git a/dev-util/bbe/Manifest b/dev-util/bbe/Manifest
index 84eeb217fbbb..e3aa46ca2e16 100644
--- a/dev-util/bbe/Manifest
+++ b/dev-util/bbe/Manifest
@@ -1,3 +1,4 @@
 DIST bbe-0.2.2.tar.gz 211590 BLAKE2B 47eb57d07419342377b9e21f15db6619e2c94ed835c059d50992a8166fa4020c87586cd4085f5cefe044794494b359aa4db5b2a400d638a93e75d9192397133d SHA512 6ac31aa005f18cbfd3fbacfe86b3d81ee61a027764296f574c4180da6ccc23dbf716a835fb013730d30c09c045197a70e28584303f3521afab0e5c63d0cf693f
+EBUILD bbe-0.2.2-r1.ebuild 465 BLAKE2B b8e7b65afc241b1f9bebcd5afe720b6ee1f425bf05321cf307e9de9dbf3257954cc1f753e00f9d54cf7225607896c316edeb41829843d22f0fdf3fc77a04bcfc SHA512 b3e2aa25edda1a5cffac8018dd4a7eaac05f4816f5a8cddf8414282ea7c82076ea33a74e8e0e6dfa9e8fc2ce61f069041ba4b5dfc11f344a57293cadb51f8b3f
 EBUILD bbe-0.2.2.ebuild 532 BLAKE2B 9ffb9cf809fc504b5c771cb43a39a3a3ae91b9e1637080379901d11b0f5c0922a292e4b93462e0d0fbc6c07520acdecfdf743f58ab3667862797be1acb128f8e SHA512 2d68c7af9c3ac3784ceaf9d4c837392cee405c2d9e92645b5707b9e188f221183c98dfc9b130b354e378fdb7d7c3b45e4a80810ede6ac46d3adc1146f8407b34
 MISC metadata.xml 323 BLAKE2B 4bcf6d746791f68582290bf43697ff941344dbfe4e07111b9a164077f0cd2080ac4d477785b2952898e5a75f37cfa3e2081458366d0f6b2180335baf20812fbe SHA512 58f9102a7e5a4c09bd8d16c7e66ba1088cd9e8b6f78998c5ba5930634fb7778d7f06a126e4c6dc33bc1d37574dfda200f71d2b7dc6a471daa3b22e3624462fa0
diff --git a/dev-util/bbe/bbe-0.2.2-r1.ebuild b/dev-util/bbe/bbe-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..b93a74d75c49
--- /dev/null
+++ b/dev-util/bbe/bbe-0.2.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Sed-like editor for binary files"
+HOMEPAGE="https://sourceforge.net/projects/bbe-/"
+SRC_URI="mirror://sourceforge/${PN}-/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+src_prepare() {
+	default
+
+	sed -i -e '/^htmldir/d' doc/Makefile.am || die
+	eaclocal
+	eautoreconf
+}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index c2353c0c82ad..58b71be43646 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -11,6 +11,6 @@ EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e51
 EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
 EBUILD catalyst-3.0.2-r1.ebuild 2034 BLAKE2B 5fff0e99ffae7b322117a045224a9305ed5059c01189a5a0244045099dae8defac9aa18d90dd377bbbba5ed31ba7cd2e8da8cd5af334301d1938b3bf3bbad77a SHA512 245ed691199421fac51c8a612b80f281872b79fb382bd2e4aed91227b6f3c03bd16ef2dabee21cda87454ac1403cadf15728b57bfba7c5283ea198b381765542
 EBUILD catalyst-3.0.2.ebuild 1991 BLAKE2B 320f68ea1cee53ff519006532321a8ecc695c1b547bf4f3d170a564eb336c430f7575effa03e112c086591c2f5fd18f817416e050a76e01769c4e282da1d1ad3 SHA512 a27092e4b8af69f20c08d3ed5f808e16b08a7fa7ebc09ed599e0dc0f3e0d969cdc8093995aeb245439a463a96fa44eeabdfb2031fec96ad442c3b0fb306b567e
-EBUILD catalyst-3.0.3.ebuild 2037 BLAKE2B 7d717869fea553fa5cee9c2a35800eeb9db1b13185e9aa80d691ad82576479d9994b3e698a096d90405cc3b05115b904a7f66971c1f24036d2b529e9214d1200 SHA512 b54354cf0627fb9617dcfef7688f9d0252bffd8505defed0c825e1840463ad4d4f1ab0abdbcb41b60b29743ba6a99ce97eab645af9b22c4e5f0199ed8c006c64
+EBUILD catalyst-3.0.3.ebuild 2034 BLAKE2B 5fff0e99ffae7b322117a045224a9305ed5059c01189a5a0244045099dae8defac9aa18d90dd377bbbba5ed31ba7cd2e8da8cd5af334301d1938b3bf3bbad77a SHA512 245ed691199421fac51c8a612b80f281872b79fb382bd2e4aed91227b6f3c03bd16ef2dabee21cda87454ac1403cadf15728b57bfba7c5283ea198b381765542
 EBUILD catalyst-9999.ebuild 1993 BLAKE2B 53353a2d5d1195b5dd0150fe0d1bd32aedc4de9dcc0579956638623b56644e361fad4a10eda58d7fffc1bb061c8acb5e634c4c495fa055f94353e9aaa46beece SHA512 7a1ecbaef5ace276516aba497339c954cdd8e428809cd1739f5a6ce88dbd1a63e25fc219dfee1cb9d1dbfc2e7be7cf2dc43a77c52947e2c886e406f17cfced10
 MISC metadata.xml 561 BLAKE2B 34d8ab6f5f0a82f20cba329a4f6ece18577bc5de7ea9828a49262cc218a36e2a2d89c9043684daf048f9c1192a6950f652c275deddee5a6d8bc99cb7f61930dc SHA512 2e8a0ea51c2ee0ea20d1ef7be45fc6606a2b0d0f3a9b841227281a5453e79352a12b9f44424aefa6fba1a61113ba6bffb4cea359cd9ce11cf1a8ee4bddf331b8
diff --git a/dev-util/catalyst/catalyst-3.0.3.ebuild b/dev-util/catalyst/catalyst-3.0.3.ebuild
index aa1bef2ffa10..5e5de2a1b169 100644
--- a/dev-util/catalyst/catalyst-3.0.3.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.3.ebuild
@@ -12,7 +12,7 @@ else
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	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"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 5403300103bd..2fe2b34b6b7b 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,11 +1,14 @@
 AUX ccache-3.1.10-size-on-disk.patch 518 BLAKE2B 1f949d0cb0168e3de0a4e142db339f59b1dabda2b06912133e10c536e23f7912e002c7d4cf6ec90654863c0339339bf17baa9b3b107110e4f25e6876ba8fe39b SHA512 bf7a160b091798e7de57748f4f9e0d6f027872c713108e3791cfc82bf64d3ed843607267ff0cca9e0848abf8bbcbbb6c19921560032576849a42f29ecc496212
 AUX ccache-3.3-size-on-disk.patch 514 BLAKE2B 93ce94415da1ac5af7ccf60958908f7b1b75b9a7af2602c1f23113b06dbc15489f797a188103a948cb7dd81ffba11797fa0e525c2ab667b9fb5a2a890097028b SHA512 7e7f01ca602722a1add1615223bb109cecfdf69ab7612a0424732f992331b0addd7b94f684fedb91486f69cbe57fcb1961d1069116a27458f1f5b20a169f2569
 AUX ccache-3.4-size-on-disk.patch 522 BLAKE2B 6ec1f4cdb75d39997e16716caf3195c180ef7796568031b0dcbb92c385034b793fef2ad7afd9d3aaf66c37dd562447fca3bbac8b42909b2fa4e2b2ae1f8008ea SHA512 91757a176c813076d90f1a44b6a605bf1fac30e47caf253883c59e8f9e0e257d6aeceeb3f3f96351fc5c24f413eb7bb08a811e4be0991fe653ae62d68cce565f
+AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
 DIST ccache-3.4.3.tar.xz 328824 BLAKE2B f2ff3276cbadde642a362400b32291f59f60c274861c4c706f0bced801aec7aeeafeeb611331bc23e96fc8790a1d1ffd39df58f24f6a5384d8ddda0da54c9339 SHA512 8a92ef3f3b3688bb4c0b39106bea387ec3065a074327c1fa793e511192acd5cf9aeb5c0065ee8868a944ec63463c2b59fb84edd952102468cd12fcbb1ee16c49
+DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
 EBUILD ccache-3.3.4-r1.ebuild 1907 BLAKE2B eb985796e32759c421dc13c1eed2d42af1b487eaed3a7765ec67ca1c909d9244f5eb14d6d643ba4f357645336ffa69b2e0fef01a6d9c8f20a984b046e541ec4e SHA512 2ee7fa571a5daa9649ee24fb7027da366181d0ca38ff3e2bf61358b5b461742625c80554575a55634f12fcbf515d7745bbf638b9ae38405499eb81039d4d199e
 EBUILD ccache-3.4.3.ebuild 1939 BLAKE2B 66a0eef49b7e59918703df2d1270f421d576858a1cbb37b9c4f285b6208b56e4dabd3fe650f3f7c734c3570e38e1082db18c37745246410cba1106338948de26 SHA512 4c9540d5c8c9d6e2bbabaf78f2656d32318387fb05995adb09584819ad5149e19473f32fe579d761bce7be79cbba9bd9aad0a7dee9852808346287adfa7ed800
+EBUILD ccache-3.5.ebuild 2040 BLAKE2B 17c95227bc87c658f302d4e5e40d02e4b36b5e020aaed72381f3f987347ed3f5f5afdde48b09d84e72196ea1c97aae32f1898a998782c5c348d671acee3a804a SHA512 f5911f3da42149916d375f03e6a0168d28b6ca3e027708a3d1b72800914aef2cdaac90122f6426d4c30ca6bbc278751203b155641fd6c8a941e091d867f9a137
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.5.ebuild b/dev-util/ccache/ccache-3.5.ebuild
new file mode 100644
index 000000000000..e2a525cad94a
--- /dev/null
+++ b/dev-util/ccache/ccache-3.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+)
+
+src_prepare() {
+	default
+
+	# make sure we always use system zlib
+	rm -rf src/zlib || die
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+	default
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<'/usr/lib/ccache/bin'
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/ccache/files/ccache-3.5-nvcc-test.patch b/dev-util/ccache/files/ccache-3.5-nvcc-test.patch
new file mode 100644
index 000000000000..294b22439070
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.5-nvcc-test.patch
@@ -0,0 +1,11 @@
+Disable 'nvcc' tests to avoid test failure
+on system with gcc-7+ enabled by default.
+--- a/test/run
++++ b/test/run
+@@ -425,2 +425,6 @@ else
+ fi
++# Disable nvcc tests in Gentoo as nvcc requires gcc<7.
++# Not a default normally.
++REAL_NVCC=
++REAL_CUOBJDUMP=
+ echo
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 109d0ff4d95e..5b06fb7ff54e 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,8 +1,9 @@
 AUX checkbashisms-2.15.9-command-vV.patch 1269 BLAKE2B 78225d721d72871dd5512f2adc3f2d6e12c6aef55c5b712f925ecd4555eb5ebc26b865f17ee02181f1b01aa22b4cee8ff66afbfbbc69e1b337c7a6bacf129dcc SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995
+AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
 DIST devscripts_2.18.2.tar.xz 729456 BLAKE2B f620edf67f67e84697677117294b9d8bc90db30fe1e228d5043179d1ae1e65f10f7299870bef3ff920312fd7103abd6c5f0296055776318640a3a9535ec006c7 SHA512 a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a
-DIST devscripts_2.18.3.tar.xz 731708 BLAKE2B bbd993b6dac144dd9a9e696133d1613fc88ca7fa31debf8478bb0a8232b811b9c6cdcf0989db29f478958f500c5f885e382700c0ea451675721254cdd4d42797 SHA512 3fcd2ff4eb97fbc8d8f768ca11f03b96de0f2ab0b8824e089556695c65521cf2e8e2d532968c07292818c8cd7ea93adaa508b40aebafbbf744bd6b78d249321b
 DIST devscripts_2.18.4.tar.xz 740128 BLAKE2B c43867b79904ebb72fbe0f65e0c5a49100dfe435f867afc3c3f40b33dabba25a5cb07cd9e27780b0198da4800a17be3f2de6ea8aad504b281b79dd1df59baaed SHA512 91a0ab2fa1f8d884d79f62d5cc8170c885c24af51de321a41f2111fe0fbc0fd8394e5fb3825eeee14d8090968be35761080a40cb55339b09522219d974f63897
+DIST devscripts_2.18.6.tar.xz 756772 BLAKE2B 70bdc87336558a6953fc91408fdb7e639f6fc60f8e698548d34aabd6384c2a1d67b871064f3679842c7629b2f84a3abe8612dfe3924552488a0b3e54ec0ca10c SHA512 6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014
 EBUILD checkbashisms-2.18.2.ebuild 893 BLAKE2B b3c7bc34946290f64a7d4c42ab24f93cb6a3c991baedf308dcee394957f546b8e3ab4d6593c60ce54eb6d66d9fabe499b4a50e772bf8dfd675a04fccc637bcd2 SHA512 22d4192fc8910faab251ac0127eeff9be1a28d42ed849c0a8dc4963d0def30a7b398691016d74f853fdcb785885e4c7beb3c24e8f22441b45394163c405bb1ca
-EBUILD checkbashisms-2.18.3.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
 EBUILD checkbashisms-2.18.4.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
+EBUILD checkbashisms-2.18.6.ebuild 892 BLAKE2B 2f56507c4802ab52e4567abb7c99ffab7170d7ffbcea6668bd875daf6311c5eae18d1b5be5a4fad969f82cba515c0ad3f1a2cb81407fddba7efdf39881c1ef36 SHA512 139b93b4a2e705f0a0ed76cd1a340c29419fb54f41a0e74b5a1604f0254b5088b6fe019b19642ece7e3af13ed6aa2b4baa805d91a223b0ecac9d571901b5548f
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild
deleted file mode 100644
index be58ae776f20..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.18.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
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
new file mode 100644
index 000000000000..16cbdc16f649
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
new file mode 100644
index 000000000000..44455e3097b0
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
@@ -0,0 +1,30 @@
+https://bugs.debian.org/733511
+
+From 9c2109e0d16473a7e80961558b112f8071aa5877 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 9 Oct 2018 14:23:27 +0200
+Subject: [PATCH] checkbashisms: allow `command` to use -v/-V
+
+POSIX permits the -v/-V options:
+http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
+command [-p][-v|-V] command_name
+---
+ scripts/checkbashisms.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
+index 3044634a..60005cd4 100755
+--- a/scripts/checkbashisms.pl
++++ b/scripts/checkbashisms.pl
+@@ -699,7 +699,7 @@ qr'(?:^|\s)(?<func>function\s)?\s*(?:[^<>\(\)\[\]\{\};|\s]*[^<>\(\)\[\]\{\};|\s\
+         $LEADIN . qr'jobs\s'   => q<jobs>,
+  #	$LEADIN . qr'jobs\s+-[^lp]\s' =>  q<'jobs' with option other than -l or -p>,
+         $LEADIN
+-          . qr'command\s+-[^p]\s' => q<'command' with option other than -p>,
++          . qr'command\s+-[^pvV]\s' => q<'command' with option other than -p/-v/-V>,
+         $LEADIN
+           . qr'setvar\s' =>
+           q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
+-- 
+2.19.1
+
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 16ad3b51661c..d083141b9ff1 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,11 +18,13 @@ DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f68592
 DIST cmake-3.12.1.tar.gz 8090272 BLAKE2B 081935b05bca26a0e4d515da9e76b62781d7bdbe00dc37c170b4905e5d3b1cffcb81d7a4ae1d1226034ffae927dc678a718e684a286cefae7278e988db284507 SHA512 7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692
 DIST cmake-3.12.2.tar.gz 8388114 BLAKE2B 2bb28991527287da62d5416dfde3a9ff072534d52b124d1f73a555d7defb16f05300c78e4c258ba2d09d11cef285fe799c3d132cd1bd4e573aea67cb86beb2af SHA512 a2f44b2d77d9a3aa62273dbdeb94ad336c7430f41a31f48b4b395d170577b2b296d598ed9d1d548df95758b3fbf3ced193e1398fd701bc99792580798ec2a99d
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
+DIST cmake-3.13.0-rc1.tar.gz 8587210 BLAKE2B eb9703dee7bedda3a916ed87eed62bcd0e28376e62e7d928db7bf2de5c2ceb21285e34e1f261e9cbdaad84e4be7d3c3eb06e6809b84eabf6202d3f9efd2c305a SHA512 8c98f10d137193d14438e9e2442de017c8df7bc433f0391c0f8b22235dc7718cab428bd877944ed6cb4005d91685cda5009e0f50fcd783d8181ec357f8d9130e
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5850 BLAKE2B ac06e0efaf6b8cf93617c2690ee19313df282e7707c1b313eb69b5a0e0d40d2e1431cb62fca9539281fa15cd63268e84d0f5bece3d9217334724cb9689f98bbe SHA512 721359c13d244b30fa47a9b9c30a91225fe25eab866a5d3b9b7230f4127be30b77749a90bcbbef768ad709ef3bf5b0f13c4ddb862c293207bb534a7f4ba3e87f
 EBUILD cmake-3.11.4-r1.ebuild 6227 BLAKE2B 1ff1b9195e39fda2b03e5dc5d2148a53b959469b19fd7d423d5502e41c72a6791dba00302dab6d241fca639bbe80711d3c0ad77eaea2ff5aea7b621cb72d77e6 SHA512 7896c37bceb3300d554ec654b4500abc2c8d4a08af8b11bc488351e39652aa6b54d02e563f4de01c6d2d73f59b3545810221f3e35ab16883d50574b1bbff0af8
 EBUILD cmake-3.12.1.ebuild 6003 BLAKE2B e16c5457ad5fb9a8ff562258dd6d42426001cbf579a00b7d9af982f43663358c418cf28165836382d63e6a1ddeae7346c7a012501f288c42de67ef2e48a31fc1 SHA512 a6e8eef0d87ddf880ea0c19058f16dd544ded44f198a14fc9dbca05802e5f7d2ec728289424fd498fed63578919c1d8bc5c31c14afd11134ab65abb60f63e6c0
 EBUILD cmake-3.12.2.ebuild 6003 BLAKE2B e16c5457ad5fb9a8ff562258dd6d42426001cbf579a00b7d9af982f43663358c418cf28165836382d63e6a1ddeae7346c7a012501f288c42de67ef2e48a31fc1 SHA512 a6e8eef0d87ddf880ea0c19058f16dd544ded44f198a14fc9dbca05802e5f7d2ec728289424fd498fed63578919c1d8bc5c31c14afd11134ab65abb60f63e6c0
 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947
+EBUILD cmake-3.13.0_rc1.ebuild 6068 BLAKE2B 7297979a288a9b748567d8680748c75d4dd45fc8013d7b206ff56efc0b0806675af7328d90173937c08650a71abb29e81470d1db2177fce3d6fb99093c2679b7 SHA512 e4e83d3910b2f249ffe57e3e2ed175f87d75fdcaae48a7d48e0d647747adae666a808fda9cf4cb172af6b5604a73183bc0d5caeac1d21e10c4044fc78a30b978
 EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.13.0_rc1.ebuild b/dev-util/cmake/cmake-3.13.0_rc1.ebuild
new file mode 100644
index 000000000000..73aee46de553
--- /dev/null
+++ b/dev-util/cmake/cmake-3.13.0_rc1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt5"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	# boost (#660980)
+	"${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index b510d832d4c1..3242fc48b898 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,9 +1,7 @@
 DIST cucumber-expressions-4.0.4.gem 16896 BLAKE2B 5e888f63d4c976db4b10bd99b8f8f4122364fb32c106f6485b3b75e3ade15fd573260cc37aaf4abc3754bdf3ad62ac37b4d78a4abc63099a841e256e12425bd3 SHA512 9a52b866545154c9e7d4e8f08cbbf6b2d0dcee28c24486eb95ad4717a757a25ae8ac844702dd2e0c892fa0406f686d3b4eb024c90fc6e7b90be7a6edd7e2dadc
 DIST cucumber-expressions-5.0.18.gem 18432 BLAKE2B d5728a766ac568a0a2588dc99d45364579213e97517f0ce57a954f58533230e2ac362c2664567ba79ee3404d02d2a7811986dc66e6a8365572978da5832e1a96 SHA512 4016248cf116920512895a874f67331a84f782dfbe560dd4a9d64ef001fa8d66ea2663b96dce8e2fb561fd533e6a8a0d399dcb923cba451cc452f15c571e3288
-DIST cucumber-expressions-6.0.0.gem 18944 BLAKE2B ea7987ff411b00b80683e4ace66d6b3e5b91ef35a93af369a79f19472c6fba3eb0be8453fde3d716eef83ec221e35e7c2d0634e0c941693773fbf174e578f45c SHA512 e47a7099cfa3d49cd17bd6f289e0dd6856990e60d1ed4ed68897a4efd40eb5715bdb1bd2fdc0aa5389cf92cd67402ea544238752e38af6156a7b182cd6ebef4e
 DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
 EBUILD cucumber-expressions-4.0.4.ebuild 486 BLAKE2B 1e32843c530edd3b6c108c2a8d88b6cec0072c5043f32f68ba245be22c8464791a416f4f81f806f7bb6a25cfb510071bd1641d48b236b63885fc73fe31abfad4 SHA512 2ef549ece304bec61447cb885034cdd8b4c654ae418dbf0efa12a151dabe382eb57f99cd7546d4166808754206db30b2797e324c9e4fadd2461c7978b57fbfd7
 EBUILD cucumber-expressions-5.0.18.ebuild 486 BLAKE2B 5c9ef936e8f7695dc4a5f046bcf60de90c3c9fe9b6fa2d0dd6607084a4c0940c5162cdf9bbd14ca4dfd73681851874a33cf6adb36ecceec5c5adc18e4677e0e1 SHA512 8d5ea7734d0bb8a03b6b00c748a20af66075c84191280a0e9ba98236cb11eb900bc6c36977a5936b3ef698b32d34cb6e17db8c616265d10a87fc2b55ccdbd975
-EBUILD cucumber-expressions-6.0.0.ebuild 486 BLAKE2B c7109af9b79771e7247dde370a3929114c88a6b8559c9d5eea3d45177408522628666f4d9f0e78862650067074a61e486a6f495c11c03ed6f5660cf91c1f21be SHA512 b58e1e0d2700d2efe19a9f45eebee2d86be298deced299550c7dc8aa12e30a0ad150ef8ace88305b458a15b48e5ffd03f41ec695f433ab549bad937c9b6cf18a
 EBUILD cucumber-expressions-6.0.1.ebuild 486 BLAKE2B c7109af9b79771e7247dde370a3929114c88a6b8559c9d5eea3d45177408522628666f4d9f0e78862650067074a61e486a6f495c11c03ed6f5660cf91c1f21be SHA512 b58e1e0d2700d2efe19a9f45eebee2d86be298deced299550c7dc8aa12e30a0ad150ef8ace88305b458a15b48e5ffd03f41ec695f433ab549bad937c9b6cf18a
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
deleted file mode 100644
index d7125ec4950d..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.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
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="6.0"
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index 0cd59e6dff41..27e9dc43b927 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,5 +1,5 @@
 DIST CUnit-2.1-2-src.tar.bz2 349037 BLAKE2B 51122ae79f15ebaf3b4a4f46acc8f1e08e918097d1308409b02e722e6eb7e0147d14461dd834dfbdb95ad8bc230076c05b3700348781e2a9b31bf29898c61435 SHA512 c0af37b9f3a00fd7bb971f33e94373699d0380c28fad12f6db860739990a9ffffe0bb0a71c0e3531529b9952128c11248b8f365875d0315c16637a0b7e91642d
 DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
-EBUILD cunit-2.1_p2-r1.ebuild 1373 BLAKE2B df6b3baa7a39d9db5f8dcab29a3956457d14b2d3d03374a93bacb6efe5ff8ab683e92c922155cbcb6a4e56830efd5afa5be69b19a59c728dd5b49a840d9788a0 SHA512 c166a390e38e30e9416cf287c8f29d94e777f65e3375c46056b58f21aba0f923608b7b875100c5cdf175eed07d9d2deb5e0f2ac4364fc49480e612708b5ee7d4
+EBUILD cunit-2.1_p2-r1.ebuild 1369 BLAKE2B 657474b205f655405f4402a16da33a06f383f7593b73f281925d4dba1984aa46df97b51f145d540bcf96792af209f1d7a29fe477d0c425737eab437c6f9a7000 SHA512 103e1cce7157000d66370e883623039068e3734aa96a2c8df59c30415e5610a19865df88d8406aadfe09de60632512b465f03de3f02c2887c91da0eed0a27685
 EBUILD cunit-2.1_p3.ebuild 1384 BLAKE2B 7cbcf32948969a5669c8f17cbf428f19f848bfac875a9230cfa87f0dc703ba2547e97c4451a982320f7c6e0995d221869c076a1863a79bcceceb4e5e81b459f5 SHA512 62a6c3d04d65a41fdb3f9546c0455666411674548d63335be1e427f56471647dc5e956d26ca7116370dca804ddf8dc1e6fc301c7c40017a36c644a324805428a
 MISC metadata.xml 242 BLAKE2B c9bc0f1e188dab4f0b4f1027441888c15919ad52adb639905a71471645438c94957a45ec043038fc19a829a6ec6b236eeb026560728dc231e5aeb484a467177a SHA512 3171a680f18023cbeeb73331a33942ddf076e0b8abc2c40284e4a4cb1803ad7264f8e38ffaf182d1f38ba28ad60e65a0ddf96c66a60e0f9a935aa941c49df87d
diff --git a/dev-util/cunit/cunit-2.1_p2-r1.ebuild b/dev-util/cunit/cunit-2.1_p2-r1.ebuild
index 4b8d7f86d7b4..409c1906eceb 100644
--- a/dev-util/cunit/cunit-2.1_p2-r1.ebuild
+++ b/dev-util/cunit/cunit-2.1_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://cunit.sourceforge.net"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
new file mode 100644
index 000000000000..bb20b50eff25
--- /dev/null
+++ b/dev-util/edi/Manifest
@@ -0,0 +1,3 @@
+DIST edi-0.7.0.tar.gz 733126 BLAKE2B bdf6f3ef37a04af4aa45042216b2661c83f22273777eb6dc9217cf44823948eccfcc9fe300d7d88ed19b051630fda304e5d8cf9bccba135eb0bdfa86fdd15e6c SHA512 a3e99355f17de9f8f5e0b1a4be2e7283147dea386e4a5dfa804df10830d3a43713974c1989c4fc55262bf582131a024a2723a8608035b82503019a6ed97e2b9e
+EBUILD edi-0.7.0.ebuild 1206 BLAKE2B 5d17de99369920e3971c17818ad1bfe73a0c4ff0105546ad00e2f02153ab9b87d7701636117308821669ca3e6c01fe9176de78994dec89ef7b7a8217b9798b71 SHA512 6470040fa7563cbe034144273c4d173b37fc625ab4aed55759182397b86efa8ac1ab66c7a14cb62bcb9df273386d430c160883a0e5908290471d559bd812d250
+MISC metadata.xml 499 BLAKE2B b79205914bede4f3e03ebb98fe231cef58336fd21d5d1b4884b61929af724f6758e8d0aeb1f4099ec9b2fbd4f00f52499272007ed10741e8e21b3a121ce840a5 SHA512 548df114fdb3d83fc0794e745ebdfc8e835a11a75826eb27b4e5da7bfb2fbd790a033905055799b81392b23f3aed41f20900a43331af205875507331e57cf86c
diff --git a/dev-util/edi/edi-0.7.0.ebuild b/dev-util/edi/edi-0.7.0.ebuild
new file mode 100644
index 000000000000..5c046e88d2dc
--- /dev/null
+++ b/dev-util/edi/edi-0.7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit llvm meson xdg-utils
+
+DESCRIPTION="An EFL-based IDE"
+HOMEPAGE="https://www.enlightenment.org/about-edi"
+SRC_URI="https://github.com/Enlightenment/edi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang"
+
+RDEPEND="
+	>=dev-libs/efl-1.21.1[eet,X]
+	clang? ( sys-devel/clang:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/check
+"
+BDEPEND="virtual/pkgconfig"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# fix a QA issue with .desktop file, https://phab.enlightenment.org/T7368
+	sed -i '/Version=/d' data/desktop/edi.desktop* || die
+
+	# fix 'unexpected path' QA warning
+	sed -i 's|share/doc/edi/|share/doc/'${PF}'/|g' doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-D bear=false
+		$(meson_use clang libclang)
+	)
+
+	if use clang; then
+		emesonargs+=(
+			-D libclang-headerdir="$(llvm-config --includedir)"
+			-D libclang-libdir="$(llvm-config --libdir)"
+		)
+	fi
+
+	meson_src_configure
+}
diff --git a/dev-util/edi/metadata.xml b/dev-util/edi/metadata.xml
new file mode 100644
index 000000000000..8b902f0f90c5
--- /dev/null
+++ b/dev-util/edi/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="clang">
+      Provide integration with <pkg>sys-devel/clang</pkg> for autocompletion and inline 
+      errors
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 764a3b11cd78..0be30738c3f8 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,7 +1,10 @@
 AUX gn-gen-r0.patch 2025 BLAKE2B ee95f445ebbf8ba58724aea497d98a2be257708e59c5c5f237f318b3075d5f75135b935defa794cd37ec81aea9ef3c39648e4b92056e9f0746a31ca75e085a4d SHA512 0e281be477d235a15ffc483fa6af03db560bc421392d7c82322c7735c0498ca3e6ea69843ed46bfe7bc562539488c5b6d945e508e66b530d97584e08e154d6d7
 AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356dc7defb42041ce525230fa691d0ead08ec32581aebda188121bd9115985a3d2bda65bff38557cbdd08 SHA512 77ea25769255879903556961446c731cbc609e911288f64f0600dfc364e2a05896251c3e02b241f94072b2a67c4a6fb7541f7bf7f409339a13902446476c2993
+AUX gn-gen-r2.patch 2410 BLAKE2B baec5c55e7fbcb2f98128ec8f43bcbc154b0cd8c5348ccbb964020d8ff36117d83078630ba6b952e6860e7dd7d99a0563a8eb7db39f9fea2b30b11a782c10029 SHA512 ca43a150c8f1902b4ae777a8b015403f2cddd63aa9597dc5f9c527928b6820264e4f9cce9179fedc739e12171e47076b05a8ea686107e7c7c9bf2eab4458bb04
 DIST gn-0.1445.tar.gz 958901 BLAKE2B f50dfa07c621e37d8a9face19ca91f28ca24e14717052218690e85911e25c91b109e6cede8d2be6c8493c0b7b8a305d530db4393123956c42da51cd4812d0300 SHA512 2ca21303aa8709fc4f23f15e01f2eaa8e77e394c27970a21361a22445d5cb29da150b1d05d77b471702ab2da2be04cea2a0d927eb0eb3a1baf3358c6eae15d06
 DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
+DIST gn-0.1479.tar.gz 909494 BLAKE2B 5d7165371337be630b2d8dcfd8cd067358d56d8d82501288a56bc15955674f0528fde27056c13f32a2b908576a9e2f28529dec9cd1f259e964405874ce74e90f SHA512 2be22c95952f9993d3f89e932abc0ed08eb2e99a3659322d90bf953b1f68591303b3490e0e55bf3988b1226fefef0a5b7f5d3039eb9ef76e4fe36a2e538ef94a
 EBUILD gn-0.1445.ebuild 1035 BLAKE2B 4379c5852e60d16e4eb7036abd922bfd80d5116d727725ffc887a3c04f951adfed32826d9e5e4780110e61a7b4e547b9b58e912f8d5712b23f88937ebcbfebe3 SHA512 359cae269e45cfb01ebf43205ac0f1c61639d9c9cf62580394245581e55d7812ec356726135a783c75715f998b9b0402230532b890a155d6864c6901318e0006
 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
+EBUILD gn-0.1479.ebuild 1193 BLAKE2B 5cf36ee7d54534fb7056d5b570b2f4cfa31bb63a4f04ab066f9220038701ddeeb08b2ec4f214e0b3714ea253d62c276f1e4e3f6aa2070d00b8d05148362bba65 SHA512 cf81974ce864715eab1bbb39dc88c4d15e57b326e9ecc46076b9926b1846aaa306919853689b3269495ab5b970069c8e61adfd32c9ed363b811700b64ba4b389
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/files/gn-gen-r2.patch b/dev-util/gn/files/gn-gen-r2.patch
new file mode 100644
index 000000000000..701a317bf023
--- /dev/null
+++ b/dev-util/gn/files/gn-gen-r2.patch
@@ -0,0 +1,70 @@
+From 00e907811ea7fc56de73ad44903946a9179b1c4f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 14 Oct 2018 20:34:07 -0400
+Subject: [PATCH] Remove unwanted cflags/ldflags parameters
+
+---
+ build/gen.py | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/build/gen.py b/build/gen.py
+index 11c92460..b186e3b0 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -326,9 +326,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+     if options.debug:
+       cflags.extend(['-O0', '-g'])
+     else:
+-      cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
+@@ -340,14 +337,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         # Garbage collection is done by default on aix.
+         ldflags.append('-Wl,--gc-sections')
+ 
+-      # Omit all symbol information from the output file.
+-      if platform.is_darwin():
+-        ldflags.append('-Wl,-S')
+-      elif platform.is_aix():
+-        ldflags.append('-Wl,-s')
+-      else:
+-        ldflags.append('-Wl,-strip-all')
+-
+       # Enable identical code-folding.
+       if options.use_icf:
+         ldflags.append('-Wl,--icf=all')
+@@ -356,12 +345,12 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         '-D_FILE_OFFSET_BITS=64',
+         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+         '-pthread',
+-        '-pipe',
+         '-fno-exceptions',
+         '-fno-rtti',
+         '-fdiagnostics-color',
+     ])
+     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
++    ldflags.extend(['-pthread'])
+ 
+     if platform.is_linux():
+       if linux_sysroot:
+@@ -369,14 +358,8 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         cflags.append('--sysroot=' + linux_sysroot)
+         ldflags.append('--sysroot=' + linux_sysroot)
+       ldflags.extend([
+-          '-static-libstdc++',
+           '-Wl,--as-needed',
+       ])
+-      libs.extend([
+-          # These are needed by libc++.
+-          '-ldl',
+-          '-lpthread',
+-      ])
+     elif platform.is_darwin():
+       min_mac_version_flag = '-mmacosx-version-min=10.9'
+       cflags.append(min_mac_version_flag)
+-- 
+2.19.1
+
diff --git a/dev-util/gn/gn-0.1479.ebuild b/dev-util/gn/gn-0.1479.ebuild
new file mode 100644
index 000000000000..fc369d2c0db0
--- /dev/null
+++ b/dev-util/gn/gn-0.1479.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit ninja-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
+HOMEPAGE="https://gn.googlesource.com/"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vim-syntax"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/gn-gen-r2.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	python_setup
+	tc-export AR CC CXX
+	unset CFLAGS
+	set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
+	echo "$@"
+	"$@" || die
+	cat >out/last_commit_position.h <<-EOF || die
+	#ifndef OUT_LAST_COMMIT_POSITION_H_
+	#define OUT_LAST_COMMIT_POSITION_H_
+	#define LAST_COMMIT_POSITION "${PV}"
+	#endif  // OUT_LAST_COMMIT_POSITION_H_
+	EOF
+}
+
+src_compile() {
+	eninja -C out gn
+}
+
+src_test() {
+	eninja -C out gn_unittests
+	out/gn_unittests || die
+}
+
+src_install() {
+	dobin out/gn
+	einstalldocs
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r tools/gn/misc/vim/{autoload,ftdetect,ftplugin,syntax}
+	fi
+}
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 9f675d110be0..75103ba8db92 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,11 +1,7 @@
-AUX gperftools-2.0+glibc-2.16.patch 604 BLAKE2B c7f18515f32a2bcb4d8a0a7217f7d42df8224fd357af43ea691c8a5861318861f26cbc00a3c79225d641504ea8459803e563aefc57384ff4ed99e8cc5ef271a4 SHA512 aa9b94c4712227b6414fc34a47154f416b120004c81704ab181c7985b6dce60bf1d98e4175678fb445cd59bb6c85d4d7bb0a093e186ecc9f115bc841d27cb964
-AUX gperftools-2.0-32bit-barrier.patch 792 BLAKE2B 8efea587a96f4796d55809714ebf2b2a7058f0161431b7b3b404e0709e338f0a981525f74691b923354b622bbd2295ee001b2a2975da0e12a94cdc07ed207c1d SHA512 a39fd183d76a76e5c4cb3915f966e008250b4c72098bd2a9d13f10e01efd8dd1e36a51e0d4ef5f712d20398fa8605aa40e2529af085e80f918a1e227d7c92def
-DIST gperftools-2.0.tar.gz 1261243 BLAKE2B a37c62f6f3c27a29036955c37a58c480e5cc628bd49036e20fe616e610d45b6727b0782605892a543cb477c388093feb5527e6557c5bc8446aaf874e946884f6 SHA512 61bf7a26974058912a4165cbc363351bc735599d36ab569dc7e84a75a690adbc17a4178512a57469fc7c17befaad2a271ef4ea5c29a36b664153938939269926
 DIST gperftools-2.4.tar.gz 890402 BLAKE2B f4893d7c9bbd3a8dc5b4d8a25837039261fa32782e13653991002ab666d6e81de637932a8b46c66df219336adcc395a217a4ce32332e8e1558beeb140ea642f2 SHA512 77198c150ee26579adc8f190be0c4ba90a9e3854b006c3aa9252b5863b1fce317fd690c6aa0ed202c81f0bbcfbe2d5f8a182263e77b7fb4fbc6b3e8bfffc9fb0
 DIST gperftools-2.6.2.tar.gz 911744 BLAKE2B e5798a2f0f2973f02bccabb2550a9df54319e505fc715795cd836ced631b29bfd8e6f8ddf3c7f6dceb0f166523bb0fa55564b1cbc896c8cd8cfd475263c07c39 SHA512 20c3460f806c6425d54e8d1020f15bc8940aacd7bf1367b03a116fb873bbd6c1e1fbb75df1d0ca341eaec813552fec394327175115ea8442a4b7a1ef17f0df2f
-DIST gperftools-2.6.3.tar.gz 911813 BLAKE2B dae223927835f65b819836b25595df2943a0762ac3b6346e3d0186dab486cfa3e4eabc1f5a2ec43314f53ea96a68acb75991b76055591395bc52e78f655630d3 SHA512 6418c382760c8870ef42a535fcb65a623c1a9fd3ab58fcb7cfe2dd5048b2268b434427da36bc0c76beef2c28e13a6926d32d67084d8ca6675b78650a62de77a7
-EBUILD google-perftools-2.0-r2.ebuild 1803 BLAKE2B b81145202e20964c9c5784aa1b7b7afb1bef69659339654375a2019732d7696b2bd6fe0bf0347c7f559146b7c64e4c203ec7ad7626ccd68d3f030b488005a92e SHA512 7fe925ddae89c431f7177c4bc97dc2e5a663452e9fde34d16f28fd5dbfa8e584b961362cc1f65ee726478b54a2d000b15ef3bf81ce4e10c11aee2a78990e3a58
-EBUILD google-perftools-2.4.ebuild 2297 BLAKE2B 7c0dd1e856d745ecf215d3974f1bc2dd057f7ca3381bcc5ca7b8d2ce800b029c831934d27a938056aaa724a500f5799ef792155c2e371ea9fe2be4f0cdec0995 SHA512 026a68d5920847c00fd1af24397ce45575dab9e16f569c9d55b7b0424511cab365be429e33bb7d74ef70a57c38eacc825d3809d44c204678b046c9a76302a460
+DIST gperftools-2.7.tar.gz 916919 BLAKE2B c48882df45415110c1ec39298e84ec9384f6a82851d95e92435649d2b253b9fb8e29664b474e45881599abf3781731c47ead0b6c454c33be9a207a6a2401a97c SHA512 9aa39689bc18603123204f024ab6dc96099b70a3d304e31ef0cc1e9893cc77bd14ee6eb420e597d40e81e487a2a45e77cf1965873646d056fd4b7bee22a4b0bb
+EBUILD google-perftools-2.4.ebuild 2294 BLAKE2B 1aaa5d14010c35af89fbe126a6c9d24a2a6921300e273be96868a7254dbedc97e5012ac5d7353e3555b2777268cb299ca576452c7d406234f597d010e6577926 SHA512 8a0d186e63ee7aed584cee1d0897c02eda37b7a0f980a11c715e38513ae684cc0c78675aaf6c8c5ebcfc77da4b1f88f8fc364f38fc856a61ae7365a52f802750
 EBUILD google-perftools-2.6.2.ebuild 2313 BLAKE2B 76778b92beab5a0c5c9bcca957551ab891e64dfb47db73eb296fffde41608b9c031e6f20f6d480202865e0776f844bf10b046a2cf4d6d7a656afd05be064245e SHA512 dd7328c32fdf020bfbbd35e074f12b43d7d8fb3cb59aadb430d2c0119be6bb08bb2fd7a22c62314b477aad6edff92e6a42c686d203fd9abceb0e3cd8587073db
-EBUILD google-perftools-2.6.3.ebuild 2318 BLAKE2B d33a9b7b8178087d2d4621b5fe19294844e6aeda7e1cbcbdc94184eb1582cc1f97c54b07d689218677b124fdd0e48b15c6315659875b1e1f11b3efc28ac3362b SHA512 4a49fa149ad25f5ce4b533259be598833ba3f99b5899abdcbc7cc6aefaea55dd047c09dfe02be22b12a880d3a57ec3da4dde69acb3d1bae6a3b912b3c8d2c90d
+EBUILD google-perftools-2.7.ebuild 2354 BLAKE2B 984b092a3af6c43f7d80cccb130998f692c0e2715aa4e6b3cab18aa19248588eb3b448b79ee131e4bcef3762a4efa46710064d4c52c6738580d17ac821917bc9 SHA512 271e5d2d1b2b94c6d21c56772a90432f0ae59f0a11cdfc109d61ca1c30bbf8387d00aeaf6ccafc3851d1afbf249bafa66ac5fc762b20afe56f451e610adfb030
 MISC metadata.xml 894 BLAKE2B 1c28c2e2c55af11aa4f2fa160dc63d16f4ab9deee8be2265af431a4594f8dd6a51a5258dd81b125e2f61f8367e26b6d1ce4248820b437f393051a8f036bd0b27 SHA512 8b940221b8eab122bf8579bce312c71c4ff49e6a35982e9b38990ad181ead444b8cb98b8a919fa941f99842fa28be9e5b456eb07954b3b25f4acc4112d98c0d2
diff --git a/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
deleted file mode 100644
index b17e0d57f5fb..000000000000
--- a/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gperftools-2.0/src/base/linuxthreads.cc
-===================================================================
---- gperftools-2.0.orig/src/base/linuxthreads.cc
-+++ gperftools-2.0/src/base/linuxthreads.cc
-@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
- /* Signal handler to help us recover from dying while we are attached to
-  * other threads.
-  */
--static void SignalHandler(int signum, siginfo_t *si, void *data) {
-+static void SignalHandler(int signum, struct siginfo *si, void *data) {
-   if (sig_pids != NULL) {
-     if (signum == SIGABRT) {
-       while (sig_num_threads-- > 0) {
diff --git a/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch b/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch
deleted file mode 100644
index df89a92ed010..000000000000
--- a/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Atomic64 not available on all architectures.
-Use AtomicWord instead.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar gperftools-2.0.orig/src/base/spinlock_internal.cc gperftools-2.0/src/base/spinlock_internal.cc
---- gperftools-2.0.orig/src/base/spinlock_internal.cc	2012-02-02 21:36:23.000000000 +0000
-+++ gperftools-2.0/src/base/spinlock_internal.cc	2013-01-20 23:44:01.629077919 +0000
-@@ -80,7 +80,7 @@
- static int SuggestedDelayNS(int loop) {
-   // Weak pseudo-random number generator to get some spread between threads
-   // when many are spinning.
--  static base::subtle::Atomic64 rand;
-+  static AtomicWord rand;
-   uint64 r = base::subtle::NoBarrier_Load(&rand);
-   r = 0x5deece66dLL * r + 0xb;   // numbers from nrand48()
-   base::subtle::NoBarrier_Store(&rand, r);
diff --git a/dev-util/google-perftools/google-perftools-2.0-r2.ebuild b/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
deleted file mode 100644
index c0b175dcf38d..000000000000
--- a/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="gperftools-${PV}"
-
-inherit toolchain-funcs eutils flag-o-matic autotools-utils
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="largepages +debug minimal test static-libs"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS="doc"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${MY_P}+glibc-2.16.patch"
-	epatch "${FILESDIR}/${MY_P}-32bit-barrier.patch"
-}
-
-src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	local myeconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(use_enable debug debugalloc)
-		$(use_enable minimal)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sanbox is enabled."
-			ewarn "See https://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	autotools-utils_src_test
-}
diff --git a/dev-util/google-perftools/google-perftools-2.4.ebuild b/dev-util/google-perftools/google-perftools-2.4.ebuild
index a2986988f31c..da07048b388b 100644
--- a/dev-util/google-perftools/google-perftools-2.4.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-util/google-perftools/google-perftools-2.6.3.ebuild b/dev-util/google-perftools/google-perftools-2.6.3.ebuild
deleted file mode 100644
index 708d67991674..000000000000
--- a/dev-util/google-perftools/google-perftools-2.6.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="gperftools-${PV}"
-inherit toolchain-funcs flag-o-matic vcs-snapshot autotools multilib-minimal
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="largepages +debug minimal optimisememory test static-libs"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS="docs"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	econf \
-		--htmldir=${EPREFIX}/usr/share/doc/${PF}/html \
-		--docdir=${EPREFIX}/usr/share/doc/${PF} \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug debugalloc) \
-		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sandbox is enabled."
-			ewarn "See https://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	multilib-minimal_src_test
-}
-
-src_install() {
-	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
-		MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/gperftools/heap-checker.h
-			/usr/include/gperftools/heap-profiler.h
-			/usr/include/gperftools/stacktrace.h
-			/usr/include/gperftools/profiler.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
diff --git a/dev-util/google-perftools/google-perftools-2.7.ebuild b/dev-util/google-perftools/google-perftools-2.7.ebuild
new file mode 100644
index 000000000000..79113d00762c
--- /dev/null
+++ b/dev-util/google-perftools/google-perftools-2.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_P="gperftools-${PV}"
+
+inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal
+
+DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
+HOMEPAGE="https://github.com/gperftools/gperftools"
+SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/4"
+# contains ASM code, with support for
+# freebsd x86/amd64
+# linux x86/amd64/ppc/ppc64/arm
+# OSX ppc/amd64
+# AIX ppc/ppc64
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="largepages +debug minimal optimisememory test static-libs"
+
+DEPEND="sys-libs/libunwind"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# set up the make options in here so that we can actually make use
+	# of them on both compile and install.
+
+	# Avoid building the unit testing if we're not going to execute
+	# tests; this trick here allows us to ignore the tests without
+	# touching the build system (and thus without rebuilding
+	# autotools). Keep commented as long as it's restricted.
+	use test || \
+		MAKEOPTS+=" noinst_PROGRAMS= "
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
+	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
+
+	econf \
+		--docdir=${EPREFIX}/usr/share/doc/${PF} \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable debug debugalloc) \
+		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
+}
+
+src_test() {
+	case "${LD_PRELOAD}" in
+		*libsandbox*)
+			ewarn "Unable to run tests when sandbox is enabled."
+			ewarn "See https://bugs.gentoo.org/290249"
+			return 0
+			;;
+	esac
+
+	multilib-minimal_src_test
+}
+
+src_install() {
+	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
+		MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/gperftools/heap-checker.h
+			/usr/include/gperftools/heap-profiler.h
+			/usr/include/gperftools/stacktrace.h
+			/usr/include/gperftools/profiler.h
+		)
+	fi
+
+	multilib-minimal_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index d68d74fb38c8..e50c0138aa9c 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,10 +2,10 @@ AUX jenkins-bin-r1.logrotate 483 BLAKE2B 1fac7c0973a5e2210db1bb5296980456ece0c01
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
-DIST jenkins-bin-2.121.3.war 74764818 BLAKE2B a738a48fa944f6b27c1c36afde46d957bfa7134fce54b6799ef4ee7bc16b68c2c8819a907e54ad90f7713dad9b1df7dc59f4e1751e9c843172f59ab2b2c9e27f SHA512 93460c7623090e55b38da8a009ade40c44943683c64fa5a0528fab3813ffc592b3419856c8b2f175b16455a21db71f6f2e509ab97d793c94e0727f3c73525c41
 DIST jenkins-bin-2.138.1.war 75714886 BLAKE2B 9008f33ee79f99e029333ec9071021bf1bfa1f6984f28f9b99bfb88c88b24466c66e3b4ad85bb847b59c54480ef935007ee0b8dae42ab2a4296ae0fbb03e2de3 SHA512 22d64e1d895b8d8b82430eaa0f760910e299751e7ba3d4d9bdf206e8644dd2536c14ee3844f5baccabdea5e0b1c30937ecc7d7747aca6d9b03d53c4be04ddbd2
-DIST jenkins-bin-2.138.war 75704621 BLAKE2B b9411bcec408eb5b17fb3d1dfbf2b82be2516be07b53b182af543a4c59504a49adbac154caa5f2e67f26268464c5e47da5d3caf7f2a19945600d9f4e31402da9 SHA512 69e0873e265de35d09af26ecc53bda012c486b4b7ad43eefea67ca819e6c38dd3a61f189a94a79a60e6fa5b3279baf3228d41691e26417aceb4db12fd36a5325
-EBUILD jenkins-bin-2.121.3.ebuild 1107 BLAKE2B 5d30a2af07f3aa0e3108519482f0502ac3ae4077717ad237a5d7b25265ee8fa020aef2640e9968dcc2621dd3960f846f81f30f1589a5b05d5016d3a2ffc5661f SHA512 ad530a36e69fc071a35acbd328bd3b8ebbfe2a4aecf8ec94d509f3741995a31b1635a5eaf56adda67378477d7d6fd9e01abebfdf50e815af4614bec0811bac77
+DIST jenkins-bin-2.138.2.war 75728164 BLAKE2B 2f322d05f60d4fac93087cae45f5a2a31af03c386d8c3e8ca392a0897d1bb0342e2ce48f9d4d07bb18e5110966078a47f25fbfdadb857f8339ec6f0e289b8fe6 SHA512 593b08d1aa0021de1698c7c30737be45425b0b956c3a8b62b3ffebcdfaf9971bf65d16544106265a635e2d21df69b3aca38ddfa7ed6a1ebb34e7cffc24591860
+DIST jenkins-bin-2.146.war 75878664 BLAKE2B 9063d66b8113162bcb177e878f679c80201fc5ef6bff3b6b222387c4c4655739b11579fef4ffe5282f4bdae58d407f9903665acfb1743e068a5453fd944ef163 SHA512 7d3fa96a97dd701f438e582dc2840b214e78df725daaa03a4646e846ec9f57ad0544b87d84b6436b8128e0a4a55c74c8c122b8f5ba607c8885f4c23b0b9ab8b9
 EBUILD jenkins-bin-2.138.1.ebuild 1107 BLAKE2B 5d30a2af07f3aa0e3108519482f0502ac3ae4077717ad237a5d7b25265ee8fa020aef2640e9968dcc2621dd3960f846f81f30f1589a5b05d5016d3a2ffc5661f SHA512 ad530a36e69fc071a35acbd328bd3b8ebbfe2a4aecf8ec94d509f3741995a31b1635a5eaf56adda67378477d7d6fd9e01abebfdf50e815af4614bec0811bac77
-EBUILD jenkins-bin-2.138.ebuild 1100 BLAKE2B d2dcdb83fff9aa62fa385b7c9540e5d3ed3f9758fcbda8ef90818f09c6b2033b0527a7eaf2377f3aeae6d73015544640e81474aa2fa78a7cab3bb9da071d1c90 SHA512 4cf21957d3803b439f7b13b612f86ff823435f46112bd9fedf5c225db03a98309dd6361ca9da7a789bbad718de009cba4fc819c0fffae807ac70e3cbb47470b2
+EBUILD jenkins-bin-2.138.2.ebuild 1104 BLAKE2B 52ea4ed811e0bf4fb5fce526c508763611acccf5f423acc32286710eb429457c0b2f512b34d1b53a1e8051279aae7aab09460556d1103ab2857264c41fb8c2e1 SHA512 3b509a6a310a6fb98f2a3eac5fc609840a895ec62db95b88d7ad470fe6f4424c4d98c4c3a8da9a53c98d1e19d31095bfc078bef10c8f38988a7d8ec83449f5d3
+EBUILD jenkins-bin-2.146.ebuild 1097 BLAKE2B 55f6b8ee92dce3c288cc29a976b2f03dff8d4743acd731564d24342d91afe76f17b235ca5fde756171e09ac768a31d1d7e8ad2f7260fa3845fda94058035bce6 SHA512 cc50c489cb9d48522376c1826a3bc0550241f7eea0fbbbf784d76cd80e919affc15f1d253b450fc289a4f97bd28bdc9b546efa2bc1f5b1637a117a94be802df8
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.121.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.121.3.ebuild
deleted file mode 100644
index 3b701c29b1b9..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.121.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.138.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.138.2.ebuild
new file mode 100644
index 000000000000..ff91a974c718
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.138.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.138.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.138.ebuild
deleted file mode 100644
index bd24b8ebc145..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.138.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.146.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.146.ebuild
new file mode 100644
index 000000000000..dfe46af57ae6
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.146.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index c8b46e5788c0..da1b4d710392 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,4 @@
-DIST kdev-php-5.2.3.tar.xz 685364 BLAKE2B 02a00a5565bbb21a00a75231168f27a78cc3c7411430fc46e1c9b796fd378417e65369ff95fdb045a52d8c9aa1207b5b425e7c63de701d0805ee92db343e3ed4 SHA512 43ac063f38ae0f7fd222415f9327b9f738e9a450daa8a1cb6a83a1abe9c4e8adcb03628d8e62d1d93bdc85548ee36123347c39b702e7b44d4513ec54f67a5692
+AUX kdevelop-php-5.2.4-tests-optional.patch 2468 BLAKE2B f30fee2d349b2512a8fb1a02d6d1380ee5b11de43e58187438f8030faad3eaac6cf56b21ef6a7e047efb1bbca0188005092404ef0efed400ff2ad23f4752f4fe SHA512 5ef6d1b86ff63177bd28e4161e4292810aa651163581022be657786391fdfe4017e0ddd1cb94ba0be104153dded411f4b182deeda243987cf5d09f167868ada0
 DIST kdev-php-5.2.4.tar.xz 685356 BLAKE2B d9c9feb1099b5d6b0d57651f2588ad51016e159bde78a7104c3f9b429e75c9ef596329173e27f5010e39388575e23b920af2b7fec72b0801c21370f235f20acf SHA512 3729cf0ea4ade85349778dd05ef9835a6993309aed05c7d7ef7d91c90ddaf09d1c5fad495753aa32f6a93b339dfbd14be9cb4b06b04a10d9d065aa8cfa1fa3cd
-EBUILD kdevelop-php-5.2.3.ebuild 1062 BLAKE2B cdf8d324b3c9cdf1d8242edef0fbcc55becf96c86f5871246beaf55083e1270312535a04ec7d821d39f62205c25b0a976d0a8a1571a2e5c3b0f3ead196d3fb73 SHA512 7415d13081b485f1aba68f71ff1be86673c1c4a396c9dcbd5349707f985e54f07621cb19473f2af4c2795754fa1e843fce197623fc5593302603c9c0a94a16d3
-EBUILD kdevelop-php-5.2.4.ebuild 967 BLAKE2B 8df42002e02e3b78482b74cfd5b1061d867ae9fb85c7a7821836c752680dcd2fe8cd215d12e7bc4cf029594f1ab4dd00ff12892c00a9d34ab2ee0570f8715b49 SHA512 6312ec050c6171c420c01c49a3b3412451c0f81aa5c1d7a235212003dffe3e380d2f5630bb6ad29eee38a55929035fe6d2e7691ddbd5ca5a1f605e66d5a200c6
+EBUILD kdevelop-php-5.2.4-r1.ebuild 1247 BLAKE2B 24daa76c99e3ef06a944f837ff18ac86bd8dc41917d49a4b58681fe677ef504d099b502f14ef7b6503523bd70e3d90e704181cfc712e51bbd47633a623e50965 SHA512 a5e1f1c06b877575eb42054ad2289d19f3f9b04c08c071024500ef612d1c7fff7d924c77643c47ea9a3f0e7e073d32e6092bf3fad8b45255b28fa4063811f43a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
new file mode 100644
index 000000000000..853952f11ac5
--- /dev/null
+++ b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
@@ -0,0 +1,76 @@
+From eb3a484c072f7cc5a319d919d54e6d843cd8c79f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 7 Oct 2018 12:05:45 +0200
+Subject: [PATCH 1/2] Make Qt5Test optional
+
+Test Plan: Builds fine w/o Qt5Test present.
+
+Subscribers: kdevelop-devel
+
+Tags: #kdevelop
+
+Differential Revision: https://phabricator.kde.org/D16012
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c09ca29..c1e25d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,10 @@ include(GenerateExportHeader)
+ include(FeatureSummary)
+ 
+ set(QT_MIN_VERSION "5.5.0")
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Test)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
++if(BUILD_TESTING)
++  find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
+ set(KF5_DEP_VERSION "5.15.0")
+ find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+-- 
+2.19.1
+
+
+From 600c167d742da9f22f6d72f6b5d8c3919de2580b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed, 10 Oct 2018 01:35:19 +0200
+Subject: [PATCH 2/2] Drop unused KF5Archive
+
+---
+ CMakeLists.txt                  | 2 +-
+ completion/tests/CMakeLists.txt | 4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1e25d6..5f1070a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,7 @@ if(BUILD_TESTING)
+   find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
+ endif()
+ set(KF5_DEP_VERSION "5.15.0")
+-find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
++find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS ThreadWeaver TextEditor I18n ItemModels KCMUtils)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+ find_package(KDevelop-PG-Qt REQUIRED)
+ 
+diff --git a/completion/tests/CMakeLists.txt b/completion/tests/CMakeLists.txt
+index dbe37c1..214cc05 100644
+--- a/completion/tests/CMakeLists.txt
++++ b/completion/tests/CMakeLists.txt
+@@ -23,9 +23,5 @@ ecm_add_test(
+         Qt5::Test
+         KDev::Tests
+         KDev::Language
+-
+-        # TODO: KF5: KDevice is forcing us to have this dependency. I'm sure
+-        # we can work-around it :)
+-        KF5::Archive
+ )
+ 
+-- 
+2.19.1
+
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild
deleted file mode 100644
index f7fc8d608f48..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.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
-
-EGIT_BRANCH="5.2"
-KDEBASE="kdevelop"
-KDE_DOC_DIR="docs"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdev-php"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="PHP plugin for KDevelop"
-LICENSE="GPL-2 LGPL-2"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-util/kdevelop-php-docs
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-util/kdevelop:5[test] )
-"
-
-RESTRICT+=" test"
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
new file mode 100644
index 000000000000..ff68ee5e3fd3
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+KDEBASE="kdevelop"
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+KMNAME="kdev-php"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="PHP plugin for KDevelop"
+LICENSE="GPL-2 LGPL-2"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-util/kdevelop-php-docs
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/kdevelop:5[test] )
+"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	kde5_src_test
+}
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
deleted file mode 100644
index bdc85574736b..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.4.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
-
-EGIT_BRANCH="5.2"
-KDEBASE="kdevelop"
-KDE_DOC_DIR="docs"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdev-php"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="PHP plugin for KDevelop"
-LICENSE="GPL-2 LGPL-2"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5
-"
-RDEPEND="${DEPEND}
-	!dev-util/kdevelop-php-docs
-"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 735c68a47f99..8ac6199099fd 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-python-5.2.3.tar.xz 1071116 BLAKE2B 5d271c98d3d516a2fa9dda8995b4f3215dee5803417d95bab1c811a73c18becce779d0d3185584eb2116b1152ce3020a3704d7b71bc801712c35154531447ab6 SHA512 fd869ec93d544f2c16883bf95fb694fe75582dec3bb55d661de3f5fe9dc2d692439ef9cae9039bffb0e1a85d645eef228da869694110323b3ba56d78df2def61
 DIST kdev-python-5.2.4.tar.xz 1073172 BLAKE2B 774ef9853d9304073c5c8ff0657774a546c361d316116c1b09f21dad5f65cc8566948f42d179d5e612b64874ea14087e26794fdc3f3c7a9910569592c064973b SHA512 abf86aeeffba496a51cc6969bb0dd75509b3385332914f8135e3b1ec5e4da592af5a7d07fd98ad231d8c09109c2396037727e3db0a7ce14bd427f87d558fa3b8
-EBUILD kdevelop-python-5.2.3.ebuild 1168 BLAKE2B e6e88767249fd607486ad0bf766caa1305a352c21a5f7c8feea95c2ee017c943c9f316f1c5084fd0c7924ac6d1d523dfc3ec2f198768ac005b218f22d5f0123d SHA512 083555b74b7af5d028a7b690d30a46c202f19125a0a5a519d5237a406c06bfdea76bb28e8e80bb56499f3442fa87da4e078ff22c0595b2b372cc788792aa6a8c
-EBUILD kdevelop-python-5.2.4.ebuild 1170 BLAKE2B b3d26171ff01de428c3bc5f0f805a6e5c83ad02beb368756af08b733dd1f3d226f353e70469ba9f1726bd21ce50cf587c0df66dd362d226c2ba4a15972fb123d SHA512 5ed32d3f49b61ed7812dbba36d519d7c102c6c823dcc36dd623ef60ff8fdce0c938fa03008c3ec7711b478f3c865c818a7a463f52f5e824cc30208913a540584
+EBUILD kdevelop-python-5.2.4.ebuild 1165 BLAKE2B a66030af8d7e71e5cf494e88cb1d1f2d5b843ee7a0e1ce21243e528a9b6daf67dec0033dfb843061133846dae3b25db39149833cce52ff8250c225c9412f98e5 SHA512 7d4113a3e68919132ca8847a9b49cd41379d3d81da5010ba29dea68e1ef7269a25850555b2328dd03b198c1f26c6c9ebf4a8687b20cd8d99eadb64ac10fa116f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild
deleted file mode 100644
index ba7fd2bc14f1..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.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
-
-EGIT_BRANCH="5.2"
-KDE_TEST="forceoptional"
-KDEBASE="kdevelop"
-KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop:5
-"
-RDEPEND="${DEPEND}
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_compile() {
-	pushd "${WORKDIR}"/${P}_build > /dev/null || die
-	emake parser
-	popd > /dev/null || die
-
-	kde5_src_compile
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild
index f62599c11d97..f760c0a47170 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ inherit kde5 python-single-r1
 
 DESCRIPTION="Python plugin for KDevelop"
 IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index eb39580124ea..7585280f7bd6 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d
 DIST kdevelop-5.2.4.tar.xz 6647172 BLAKE2B c3dc301cf16bdef95000aa6cb3ebe615054f49ad29bc67870c31d329cf7bd4df81dad330eb26dd28c19627b2040f62522d755afa4450bb125872350d1f8039e1 SHA512 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
-EBUILD kdevelop-5.2.3.ebuild 3882 BLAKE2B dbf9df8aecef1077e2d9e5c6f466e5313da26cbc76e69f958a7d5f555ae4086f8e9c9c850fd9a124e24a70f52223e3e0e3232c56f2be30fed422786139bf35a3 SHA512 88b0714d803633c796cc643d2731a90e45b9065cd0ac57813c6a31c298a4580141ca33dbd491ba2f4b604ffc2497c734a6ab87b92fd3856c4ff1798aa4156b20
-EBUILD kdevelop-5.2.4.ebuild 3699 BLAKE2B 9d899cad0e65c6ec2becb727f2edcbcaa53021c33491f21a71f0829d356166e8fb2fc71cd65228642fe5041b8ae6fc6d5ec7adddc0cfffa9cf16d658af4e0c63 SHA512 43281a4d9b0a25e12d0316e330c8af8b946dc31cac7302664dc1fb0bae3832a4a08e50e9780f3d17950c38536aafcd7c6894b45ca26a98761818f69293e13785
-MISC metadata.xml 794 BLAKE2B 5436f574309cfb4c014322f1d4c37edd68a6a7e77bfe5ea81e189f1440c4cced6310e01bc65923bb144d62d32349b2f862af18b307b621e347b3a076dc8a8862 SHA512 fdc3da939f866f065c7811ea70ac8a005a01455bd60db64f5f3107276de49d2d5e28c60650ad530636fb5e4a51a3acd69ef30ea5f1c895e9ddf410b5eb287f6a
+EBUILD kdevelop-5.2.4.ebuild 3694 BLAKE2B 7f0e35fe10187cbd8085b16d966340eb13a6df533816169e2a75fb1ad1cd21e1fea14c3bba1a169eebb42b345894bcf0a3ad3e223208279f03334fd2709daf8a SHA512 8961f2ba12d2c1b4a961c1fe93eb366bcad5663960122edd640a40e7e12b21d74763f31b18173612de41bc82f4091b560f9bc605ab60706eb2d36b37e24c1c57
+MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.2.3.ebuild b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
deleted file mode 100644
index 0fbf50234984..000000000000
--- a/dev-util/kdevelop/kdevelop-5.2.3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-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 kdeclarative)
-	$(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 knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(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_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qthelp)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	>=sys-devel/clang-3.8.0:=
-	x11-misc/shared-mime-info
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( kde-frameworks/purpose )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	cvs? ( dev-vcs/cvs )
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop:4
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!dev-util/kdevplatform
-	!<kde-apps/kapptemplate-16.04.0
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_cvs=$(usex cvs)
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KF5Purpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.2.4.ebuild b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
index f07d8b229fdc..f1dff60ee6b6 100644
--- a/dev-util/kdevelop/kdevelop-5.2.4.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ inherit kde5
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
 IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index 9b8c92eb6da3..b3d54d197519 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -11,6 +11,5 @@
 		<flag name="qmake">Enable support for QMake build system</flag>
 		<flag name="reviewboard">Enable reviewboard support</flag>
 		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
-		<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index 11b4da7d5ed3..890f1cf64baa 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1,3 +1,3 @@
 DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
-EBUILD kyua-0.13-r2.ebuild 611 BLAKE2B 4bb3dfc83b81b806a466a551ebebcb2e58471cfe81d1091273271f616feca6424ea7bb3426cc3dbe9fcef790f6e41ac5f24292b21860d54045d37ad2e7533c28 SHA512 45c8f2555acf066585d47b06298d8a9d41f6986cf2246df189c38e037dc94270ac5774bb8cb3f7505637727dac7b6d948b1997937e78b0fefbb724d928572417
+EBUILD kyua-0.13-r2.ebuild 613 BLAKE2B a08e469ae71dd4279c8dd064554699e10a0a2fc80aa2fe5ec38261d48ea41c9746b508495ac228c815d281f5c55c83c8a5ce9540611c738b91d95382890ef1c4 SHA512 1cd1b14b308f05d6b203f2c93412b33587ea31c2d58c8ccc8af8283ea7be8e97e66bc255aa3af8027275cd34cf77dc2810c983430405e2259a8c9d9366a46043
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-util/kyua/kyua-0.13-r2.ebuild b/dev-util/kyua/kyua-0.13-r2.ebuild
index ef98722f052e..a7d31b7d8c33 100644
--- a/dev-util/kyua/kyua-0.13-r2.ebuild
+++ b/dev-util/kyua/kyua-0.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 # Tests fail
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 4758bd88beb4..8694d56150db 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -8,5 +8,5 @@ DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
 EBUILD ltrace-0.7.2.ebuild 870 BLAKE2B d54ab07bc77f0123e1c45045cfdac7211871299520eaa945083febb3e4efddab68450257beb0882467ff3b488c588d03f371bc775575d9270edc20d529765d3d SHA512 4ee1d65ecfd2b2d69a06c4f09e32715b6c4ffd242834bcc683053de28932d6fc94a8a6b176890bac2c5013478c3db29405680b05e51bda9b919f71083e1337a1
 EBUILD ltrace-0.7.3.ebuild 878 BLAKE2B 63d0fc0e772670082d1ee5b36922db061d3bcd13c1d94093c1a520992a13d28fe19d06f88d3774f36075a9a39d6a7d907d7366ed7a0d3bd54847a8b921756fbd SHA512 675739c0dd96d879fe87d66b7711217e7d4070a0d6b5fc2bb3f0b4667e1e27ad521a373bb0030b6bf62344da4db3af0f674a3a5fdd3f1542cc34c5e486d16ad3
-EBUILD ltrace-0.7.3_p4.ebuild 1297 BLAKE2B 3f07e0ff5ee87cb5bf66effc24bd5d1310233ccdcdf60ec4dd330526ff4dd9b1124afdd8843c194d2ac8686acbe0b5431e6e6c3535ee72714cef20958f4cd4c8 SHA512 93f733aa4ddd4cfb5ce00625a9e126ca13c77c9478562d2b6ae49e2167088506afb3bcb3c868f11bb563e77cb196fb1a6f8d20bc4bddb542157ccc5c8680f7c8
+EBUILD ltrace-0.7.3_p4.ebuild 1295 BLAKE2B 68a97e29102da127b6d15fc9b874ba7996dd360699940f66c808878828c255096fba76d49039a00c6ad6a04da1cb766f83e1ab3b358b51f90c5baef0e1625f99 SHA512 9c720324609d28a4331c8b2b8d88e40cd7fee99870605843bad475959691058d27953c6b072c931ce12ad05413c96f02183af7034880d3614c6a2eb1cae976f2
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index 158e5871be76..0b12f5bc4cd4 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug selinux test unwind"
 
 RDEPEND="dev-libs/elfutils
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index db25520fa0d5..b39cdb5cd7b1 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -7,5 +7,5 @@ EBUILD lttng-ust-2.10.1.ebuild 688 BLAKE2B 381ee0fcee4f34f43ec83c472d864d8ce182a
 EBUILD lttng-ust-2.6.5.ebuild 634 BLAKE2B 226de182ce8f0f60ca1ddc385e22b12fc915baca73bfebae55dc54b61e583ac5f5af8239f3e3ba5c4403f4253872cac2981a4b2916a6924d490e3836c0edf3be SHA512 610deadc2813386c71b3449fec096c0793be2e08315085e25d10331b55153bbeeecfd371eb9ba900117c8ff18841085d72a870dd61a96ff821b6284491262a05
 EBUILD lttng-ust-2.7.1.ebuild 632 BLAKE2B f7a3577e36025dd620dc9a29f8e35f90a4d4baa3fd3d214013a81987c73c366fe6f8e0c8fd764a3614706a5bf9c64f77920e72f8f6d0868cea1093d4e0142fe6 SHA512 7848f28030dd7ede00ed14d0924af46d589d549dbd73d5afb83b0a06fd2600ddd01c2e32eebe5ed7aa243225d63fbc1648e2d66f38794c0f85a4e6e9fdadabe7
 EBUILD lttng-ust-2.7.4.ebuild 634 BLAKE2B 226de182ce8f0f60ca1ddc385e22b12fc915baca73bfebae55dc54b61e583ac5f5af8239f3e3ba5c4403f4253872cac2981a4b2916a6924d490e3836c0edf3be SHA512 610deadc2813386c71b3449fec096c0793be2e08315085e25d10331b55153bbeeecfd371eb9ba900117c8ff18841085d72a870dd61a96ff821b6284491262a05
-EBUILD lttng-ust-2.8.1.ebuild 660 BLAKE2B 1e23aacfd12926352eede5fcfc3dc3f1b0f4629671f5153159306ec6f08f9fc5be7b82df946e43660d2826f51013f0a97753b58853c18f112549839984ea611d SHA512 6fc29c3ffacb7783b09919607611a86a73a9fe6033f051befe2390b8aeea6e6f0f4ee33a2afc2f32a419245e02960794285176110e7f90bb8814aa97405e4614
+EBUILD lttng-ust-2.8.1.ebuild 667 BLAKE2B 4343a3356cbacd2a6535f92c8aeedf6f7483cfa3626e3e317e3f1162e01f0921d10f3a5e7da93ab8d6d33d99f47b6ec641873f8710ff9b385c46e8badb5e541e SHA512 6cde2eac5aaba4d03e7b26125485614cb4fc85e65d75696f2729045215d4e46d85f8fbd4523fefc70ca75c6deb0ea4987e6814317f4798f136e3c2ea27b073ce
 MISC metadata.xml 639 BLAKE2B ad4de0ba5be85b4ff9392746a483348d0ff3b365a50d7be270df6408e41f408069d905e458057af8a32a48d43fd2987c9a66e118a6ec044d7d72e23c16846484 SHA512 4887f60d12b32ff0b08ce5457fa2e56fd76aab443df0fc0a610ddcab02c3a85c7a6dc196ac58a725f7dc268c6b8aadbdddfef78c415bbb640f7b1bc0bda7577f
diff --git a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
index 162cd0f3a50b..243c57dca7f7 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples"
 
 DEPEND="dev-libs/userspace-rcu"
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 79b32a72b8c3..d29527394589 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-build-tools-0.2.0.tar.xz 15552 BLAKE2B 558e1c9f43e09e51a720460592309f3f52fb7832a121ae40c8d9945ed135d6220190182a6d2311bfb9e9971f68a60f0ab7d5dcf2055301fa683dfc483170b3c6 SHA512 40349710a20d3f06761c57b5d40aa05cb194fa4b50d1e41e4bd7e6adf1beb5c7209f3d4965869a301369df17ec1d75f55aede7ab0fe88a55d692cd56d72121de
 DIST lxqt-build-tools-0.5.0.tar.xz 23392 BLAKE2B 1f28ae093af772ed2b6f75a7933b76a2c608171bf15e0c8483477d7f3b702dec79f41af70bb38863c3b17ff9d52a8f2acabd4ed2347bb7f421d2074b8767e96c SHA512 6802f3d5e3d622b136cf312ad929353aac1f42355c00ac9e3fb7a9d46c63dba1f87a0a4fd11185289c4e7222d5b0d30b8829dacd38c88de45901ff0559639e90
-EBUILD lxqt-build-tools-0.2.0.ebuild 503 BLAKE2B ce32303742984b29eca6a481df6f1a04e459c73661a6f7432404b5dff43fa83619dd2042ad690b03b333a2731e27e909e3d21c6668983e380d75f0ba4ae7ab30 SHA512 3d19db5002e4c194d0802226b617aee5901580286b298075fd563d9d38c76e83e9364900d8c82e6112939b1f8ea81efb2e050a2758f0b5935a862664311cd3d3
-EBUILD lxqt-build-tools-0.5.0.ebuild 508 BLAKE2B a1dda5bf87ffdeec4218646bc379483205aa5d471bf4c493079ee292297b38253cbdbf0bfae2703cc508a037c62e84e73edcc8d51083901c413887ffb450fb57 SHA512 3149c16f1b24e610e8223c5bc25480dd82ab222ba3ff06d856fbf0feb7b40eae95c55e0e9e27962e2e28477f2ca5eef8f3e0a6c717b8757bb7f1f923881677ee
+EBUILD lxqt-build-tools-0.5.0.ebuild 503 BLAKE2B 79a8b9b8f017d64574c9b27ea37bc5d996bc7a3e9bfffce322fe63bc85690e013664dbeaf79ff2371b060f88c1bf2bb84ca2597fbf93b56b03daed8891453db2 SHA512 d95996271fa9f93b4efe8ffb16498c5431d8d83909ff271fe5783c393fe3506c89bceb997aae0f912ad325d84dcd34f53ff36c569b66dbb22ed8d7e46fc4cc3b
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.ebuild
deleted file mode 100644
index a28ed1dceef5..000000000000
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.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 cmake-utils
-
-DESCRIPTION="LXQt Build tools"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="dev-qt/qtcore:5"
-
-src_configure() {
-	cmake-utils_src_configure
-}
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild
index 97c50c2b4af0..d315bf468a78 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index cd879f0785ff..e73ef706a785 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -4,8 +4,10 @@ AUX test-llvm.patch 872 BLAKE2B f67b6f266a86a4fe72d8a6c39b2b4df07a5f13404f01e8da
 DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98
 DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d1a8f65a38375d13c2c1d93d8e756b2cc2d3528783f18b90598e3f056363822d2400773369457d0801a6e3dd58 SHA512 e5042f0553057eb3a723fd2e17994ff05c2856c0dc22f39f5c5eb68fb56281894a5d13fe9f2e0852b4c934f3f3cbc41e0639ff25db4ab9f352eff95e7d552b8b
 DIST meson-0.48.0.tar.gz 1307251 BLAKE2B cafae408a219a8f31b756cae28178480eeadac877a6a694c1369c7524b68b88e606d51823aacde177410fd97c1ad14793a11a6d1a1a97c131d33b1014ca2d5f9 SHA512 99ba4ca4899a3174803e41fe5a010d4be304cf85d7392107c2a6ad65f03d758382b1b9104a0cc54bf6fdba28e7742ecd2b0c299d43be3a66fb1381b77418036b
+DIST meson-0.48.1.tar.gz 1310408 BLAKE2B e90c5c0b396883ac516eb3a5de04a1caff084a7f018e3f9b7565ec91e520bf4c0e05a72855b3b35e361623c6bf792e471846a7bac13fabd8b42c5256af017703 SHA512 248856cbab0aba959a01a9759261108baf93eef92d454b9ebb7f54edf1aa3e26f6050e389c9889ca23b19321d835617bacd361fc598b7185f6485bc6a403534c
 EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
 EBUILD meson-0.47.1.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
 EBUILD meson-0.48.0-r2.ebuild 1196 BLAKE2B 1e36c78920fa7897f72e497dc68c76e127cffc0d5491fc4ff7a23aa6c1e2a67543683ef753ea1b55957b526ac7c206e64c8f4abd83fc32993573d3cf280e8473 SHA512 f7a6f2ceb491a429a2d03e814bc746c318c766aca488a578bb2424999e56c4f5b9b1afa4734af6f88868eb7863c69a3b5f34a6c9535bc6a1772968aa6be23151
-EBUILD meson-9999.ebuild 1124 BLAKE2B 38282459eddadc22bf10e3ba29373f06003b72930f60d74546aba436c164cdb26394f450b3fa85ec972465e2c171682d7cc2b0cf436ff7249bed50c20e9b82fa SHA512 80a17e57a3547bcf5e2f90ca20924d56beb825c57daf5a180196301bd11d1437439742f720bef8e4325f2517bdad8accc862f7b5fe362629b822281c6179ba0c
+EBUILD meson-0.48.1.ebuild 1130 BLAKE2B 9046928f6f8a61db1b953e68e98335404faa62db738837082a52c063a3d44aff506979062a4695329044028b538374f8c5405bb4789125c5405098539bd0c1b2 SHA512 091bd3265a8444aa24e28dbd0fa43fe96869ba79f4394c6ea7d3b21b6c34c575d409b709f6c608fff208c60ca59bcf9d71ff3dfa2ca32f2a9d62342a8aa828d3
+EBUILD meson-9999.ebuild 1080 BLAKE2B 5348a19505f572d16e6e1650591631efc4ec4ec19040e9cf462e4466d188a6c374f110d7985ae70dc9d313f5261e880816a8ca347a475e9ade130935dd785ff4 SHA512 c3832e217c487ae1e2196d17a009a1602c3b0aa9b216ae0f72d0532d4ca172af5149305371c1940a575398e136ac130e0b9be71b57c19d40363d97f1a62d38c5
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.48.1.ebuild b/dev-util/meson/meson-0.48.1.ebuild
new file mode 100644
index 000000000000..3b76628728cb
--- /dev/null
+++ b/dev-util/meson/meson-0.48.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/0.48.0-multilib.patch
+)
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 0d5b9b4711c3..9e0fbd73864a 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -24,10 +24,6 @@ IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
-PATCHES=(
-	"${FILESDIR}"/test-llvm.patch
-)
-
 python_test() {
 	(
 		# test_meson_installed
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 9747e3627f01..fdf1858cb3a8 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,9 +1,11 @@
 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.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
+DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 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-r1.ebuild 2776 BLAKE2B 439148c196cb3c673b7bbff703de4174d672f462e1f0b7de46c71efbed40554a7e4cb868352a4c2d6fe033b7a916d4978deda47eba3551faf45460996e4798a3 SHA512 3a63f2600977a2a71939f9163c0d54ffc202510d124239aad2642894febae848648aa96d7de0845406b30a3b9c07e2d73ca7dae32317a0d7379bb3e6c1a78580
+EBUILD ninja-1.8.2-r2.ebuild 2776 BLAKE2B 7ddde720c230e5c04a6f1c054cc98d406f4169935fbdd25beb417ecee2000cae3684b6b6fac47ca05411d54dc76d254b6210a1d178bb7faa05e4bae7485a8e6c SHA512 4422d2fcac6143f37d5ef66da08d22c3b345fa727a36cb832b00116ce3a91490a50bcd29191b12085b1c6fa9711505e9c408d9073b30ba86974b4eba3baaf038
 EBUILD ninja-1.8.2.ebuild 2636 BLAKE2B acfea7108a4a6f83b80f67cd6508a38752fa3e482e78eb248aeb20fb0a7c60bae82baea3357d44a2bfe70c1e6c417289ffc477e274394e70fd9274868b637e30 SHA512 9e132040a4d3c39371c38e7533ec4d4718f013b2894f38162b80038284df72bcc8719571d5403311844736fd521dd38d943880fbf9760ab8d1ac1e3a514c0923
 EBUILD ninja-9999.ebuild 2647 BLAKE2B 578d7226bb914c14ee269d249cfd72432f55190c7f31c260182c0fbafd408d5df2f639a24f84b75e3527747945412597b3d675c7191e7085519dd90461c09ff6 SHA512 9e11adf000ea2d8adca7387117a280d803b43cded0437a2056bba1ff61b8aae2580164f2cbe85d391eee1a8acf8ab697a70d888aa5435d586695d1c60f9439fd
 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
index caa2bb8e6460..84c7f67ce665 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
 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"
+	KITWARE_VERSION="1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1"
+	MY_P="ninja-${KITWARE_VERSION}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.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
 
@@ -44,8 +47,6 @@ RDEPEND="
 	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)
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
new file mode 100644
index 000000000000..18d8f1000a72
--- /dev/null
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+	KITWARE_VERSION="1.8.2.g81279.kitware.dyndep-1.jobserver-1"
+	MY_P="ninja-${KITWARE_VERSION}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.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
+
+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/perf/Manifest b/dev-util/perf/Manifest
index 5375956f9d50..9c08e326051f 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -16,6 +16,7 @@ EBUILD perf-3.12.ebuild 5006 BLAKE2B 7eb7939628a49ca9dadf7c4a223184b5e4da478fef6
 EBUILD perf-3.13.1-r1.ebuild 5128 BLAKE2B e34cc28ba57866db83fcf9ab639e95306582c66fd7ce427543b19528d72fa78757721efc0ac1b23c6435973766fa4619e5f6448bfb21a6c50cc01cca2a2c3859 SHA512 f7ce04b5f4a4db657dfeb6b59d70c15cfb012ce661a62620773607ee93d5becfea56912dd9fae88db47a9f42ade6ce0ed0d0ba67a3fc37b086eda0e9e87118ab
 EBUILD perf-3.15.5.ebuild 5143 BLAKE2B 694b1eaa11dde8aa29ab0ac812479869e9e45e47f02cf9201e78a5d6bcb4c18d645ae4bc8e584237ab738a1739f971a2ae62faf950d8bbe9845f02ad878aab84 SHA512 9a56717e87b9bf6bfa27f3d953e41af18c55e92020fbcc14fd01f43835e542bf1c7adb195387400c955706f5ca8a69090e41d6edfb728717910cd19b801d6dfc
 EBUILD perf-4.1.5-r1.ebuild 5269 BLAKE2B 859aff4b3f86bb85187c7a0a7a85cd423ec8ceed0a2c9bba55c711b466216017ed796b976a1b16a03c8aae7292f31b8329e37ee55810c868caa246aa39c38d17 SHA512 1aa7d9fad71cbaf1a28976cfe7dbf74d7e04b4a00f81e5d7e0b96cced0a051bcf9846122caa66bb1466790ef5b7dcea71a1b291b2300056b1846ce4e5531b165
+EBUILD perf-4.14.33-r1.ebuild 5004 BLAKE2B e6083a996ea2d925b498a229d6e1da8ebd781cd032ae13abaf88692f7dd5672412887a658c5324580f0c7eca55c2045bb67aa639c31f04e4663521704c5764b5 SHA512 61cc606b45c4f2a839dfda8e02881885a45c659cdab0ceb3a30b433dfee4180b94b267ce1ba9218559cea862a9890067956dc84e00269b9bca3ed617e6490a8c
 EBUILD perf-4.14.33.ebuild 4957 BLAKE2B 178c3e4dee18e132719f42cf83a209ac866dde793d69a3df3fd1a20585974dbc5a538d3d4dc5638fb20ff19ffae7eaf5a84d44b0b7f9b90ddf50a6794a57e71f SHA512 1c2346b9fd9c507185556e984b4976c55727290717d982b0fd2258e5d2d8dee015a62773de672afc9b7283afcec3820a20244911f44b5496c4bf53f78f34f695
 EBUILD perf-4.4.4.ebuild 5040 BLAKE2B fd6ff983115568989077d1d626b29121b452a11552d982b85a992cb6016b41e7beb7750008c8b87833f6dded0f6f2281275bffe7ad9c61dc773ec69a6f7fa33f SHA512 f39e5397d269f879dbaa62b4cfacebba27dd2f26feb17d70b5b4f60fcf256438c2920df340c27abb45f24404b21ace1c5bab982c7e4a93c2befa382762e76967
 EBUILD perf-4.9.13.ebuild 4925 BLAKE2B 919acbb8b5bc86a8cc0de41f963e87a85f16d7ba3fee026adab0c29ac5a46c8846fd102592576f0efdebb379080bf1580babfb0bc23729ea386ae3cc7ba3d634 SHA512 750501145fd525bf5e973edb7f4645cf0cd94c3449ae859ffcc33896e8963db8e573248893441de971248af2842fa18df9222704b5b92880a356e8656776a597
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
new file mode 100644
index 000000000000..6eb3fa30238f
--- /dev/null
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit bash-completion-r1 eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+	PATCH_VERSION=$(ver_cut 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.xz
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+	# stable-release series
+	LINUX_VER=$(ver_cut 1-2)
+	LINUX_PATCH=patch-${PV}.xz
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+	SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+	demangle? ( sys-libs/binutils-libs:= )
+	gtk? ( x11-libs/gtk+:2 )
+	numa? ( sys-process/numactl )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	slang? ( dev-libs/newt )
+	unwind? ( sys-libs/libunwind )
+	dev-libs/elfutils"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.9
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	local paths=(
+		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+		include lib "arch/*/lib"
+	)
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+			> ${P}.patch || die
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	default
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		cd "${S_K}"
+		eapply "${WORKDIR}"/${P}.patch
+	fi
+
+	# Drop some upstream too-developer-oriented flags and fix the
+	# Makefile in general
+	sed -i \
+		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+		"${S}"/Makefile.perf || die
+	# A few places still use -Werror w/out $(WERROR) protection.
+	sed -i -e 's:-Werror::' \
+		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
+
+	# Avoid the call to make kernelversion
+	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+
+	# The code likes to compile local assembly files which lack ELF markings.
+	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+	# The arch parsing is a bit funky.  The perf tools package is integrated
+	# into the kernel, so it wants an ARCH that looks like the kernel arch,
+	# but it also wants to know about the split value -- i386/x86_64 vs just
+	# x86.  We can get that by telling the func to use an older linux version.
+	# It's kind of a hack, but not that bad ...
+
+	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+	local arch=$(tc-arch-kernel)
+	emake V=1 \
+		CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+		prefix="${EPREFIX}/usr" bindir_relative="bin" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		ARCH="${arch}" \
+		NO_DEMANGLE=$(puse demangle) \
+		NO_GTK2=$(puse gtk) \
+		NO_LIBAUDIT=$(puse audit) \
+		NO_LIBPERL=$(puse perl) \
+		NO_LIBPYTHON=$(puse python) \
+		NO_LIBUNWIND=$(puse unwind) \
+		NO_NEWT=$(puse slang) \
+		NO_LIBNUMA=$(puse numa) \
+		WERROR=0 \
+		LIBDIR="/usr/libexec/perf-core" \
+		"$@"
+}
+
+src_compile() {
+	perf_make -f Makefile.perf
+	use doc && perf_make -C Documentation
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	perf_make -f Makefile.perf install DESTDIR="${D}"
+
+	if use gtk; then
+		mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
+			"${D}"/usr/libexec/perf-core || die
+	fi
+
+	dodoc CREDITS
+
+	dodoc *txt Documentation/*.txt
+	if use doc ; then
+		HTML_DOCS="Documentation/*.html" einstalldocs
+		doman Documentation/*.1
+	fi
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Without the doc USE flag you won't get any documentation nor man pages."
+		elog "And without man pages, you won't get any --help output for perf and its"
+		elog "sub-tools."
+	fi
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index c2779d5b5add..46bfb6330d82 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -3,10 +3,10 @@ DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5
 DIST pkgconf-1.3.90.tar.xz 285036 BLAKE2B e56e3ea3a6552ff190f239bf4d8d7e3d63c0ecc6a771d0a7c33aeacf6da61190abfed1ac2268d28d64efc298bc4b2b3f032eeaf8b2be628bef1d12de4b1aec36 SHA512 8efca947546969fea63e97f23eb1b5af49a1f2378eec66ff4f403fa218bcb3d5fed62a32fd6be70d9ebf39c8024bb9714cd0c2a52e6960c98021cabefc274530
 DIST pkgconf-1.4.2.tar.xz 285548 BLAKE2B ad48bac309e90f2c2958ee19ebbf95ec90c55ebd98a44486f47cc403b8c193131377433a23f16adb64bf97832ff5a0c20e0a3d01da5c6adb2b70483dcf23b9cf SHA512 d9d3bfc7ddc3ceda65f7ad11b1a3c8a48aee0b5ac135aeb54b41091ca1ef0d9a5cda4a5c1ba2470ec12ce870a361eeddd802243eda3c2e2c0f2be3e7fe0ca236
 DIST pkgconf-1.5.1.tar.xz 289616 BLAKE2B 32cd7b3440635cacbc197ac6163c2d0c0a57281d060e27ba097f7845636e41160c25092f42e3d3dacacc0d9f01f6d3468ffaa2a18a82f98ce5fdc8e9f7267137 SHA512 a2e7a675fed6600fd38d90a98fa8295e1b79b4dd018f544ca777caf8cf6687029d0925ef33a08dd7815d5d3cad835bb9b70ab3161b6e083965fa60652661955a
-EBUILD pkgconf-1.3.10.ebuild 1297 BLAKE2B 033585762fe3fb08869fb9264f3ca37717da75061098cef3ab073fee9a63b8856d81a2142874081e9e419c1f07ed285ee16a5620663701fb5bfaa54dc9884068 SHA512 0e3b7a27767b6f2570947dd1cd433cafa0df4936d9925bd4b04b61602c58341073b9c9479a6241d3acbc4a3e701c048e965fae6240b8ad254efab520edaf96ff
-EBUILD pkgconf-1.3.7.ebuild 1288 BLAKE2B 0ab8f8e988a9d412585b6c53cbd06a6be0c71ab09a50fdceffaa2b90615c00de9864af9b8742f047d7b8a0b901844362582d90114728c8802d5a1563e1cb62f9 SHA512 60b22b469624108ba9f3aef81de7d493e7a4fa931f4579e4d909b41fde068c2ecb60283daff61133ac9d3682e326351a05551f265a651f2bfc7ce8e3a3cfd511
-EBUILD pkgconf-1.3.90.ebuild 1310 BLAKE2B d435e51265e2b908a64597396069fb29fa86b5727555db143e871b1ec2543a83565764574016d4707e28299cfdbac74e0577d0986621457e62ca512c57298a6f SHA512 ce6cacadf61a38e1e4e09bcd7a0e3cf17c2c874aec80b1f623c81b055d9e06e92880f109138b7f54cb9bad69c5bd2935cc411cc44f420b9ccdc74fe73e24c1fe
-EBUILD pkgconf-1.4.2.ebuild 1312 BLAKE2B 2caa46df26cd89577f059a03ee802473fb27834de25264217e5604771ff01fc19f37225f5b185ef1a3cc8f4089458a01939074bbd5673ed65388506971252fc2 SHA512 6953ef5f11162a8134f0f7e57840c45138b855dabf21bc8a32458374e71ecb5781fc8d3226c1b7647efe99411005c1a2be8ca839a1f575e6585d47fd07228d52
-EBUILD pkgconf-1.5.1.ebuild 1387 BLAKE2B 477fbd468d2e60da2fce7244c6a0b06843e66f4e04b48c30b799d00577af90f918c411ee9913dc21bcd2f5dbff4acdf68fa6f9fc4d1122afe9a7763d6240ca18 SHA512 5dd802be6405bd51fe2813dd529c48935481a41647b22f8e5b918fce17429cc92a56b9b8524ade824486cf7ef6f5d8b7ee4df730b87e293ed3783272d1d278c4
-EBUILD pkgconf-9999.ebuild 1387 BLAKE2B 477fbd468d2e60da2fce7244c6a0b06843e66f4e04b48c30b799d00577af90f918c411ee9913dc21bcd2f5dbff4acdf68fa6f9fc4d1122afe9a7763d6240ca18 SHA512 5dd802be6405bd51fe2813dd529c48935481a41647b22f8e5b918fce17429cc92a56b9b8524ade824486cf7ef6f5d8b7ee4df730b87e293ed3783272d1d278c4
+EBUILD pkgconf-1.3.10.ebuild 1300 BLAKE2B 1676e818f15a490f6006b24ccc3a9b943a8560d6b273ece690afb8259c76bb1fb65ef01ed9105d46ede0e62ca01a8803e86682e56a535eb8934dd71517f6abd9 SHA512 b1e869feae15b5710f1176d9885f923e8af96fd135ccca1050660af9d5aaebb90fec78dbc82cf854468856f9c1c89254a953c8fc04ed24ea7b524392449ee417
+EBUILD pkgconf-1.3.7.ebuild 1290 BLAKE2B 1b61b0efd185270da76d3be3251fcc9c735adf4d68aa7b900801268ea0558a72753ac19aa4ffc666be3dd577ff110aaa414ae349564799ea09eba53abbd003df SHA512 83835948caac96c0d9e1b0b84fbe5f12a3481b195c28e85f9babbc8803301608be0838f57d5d5079312ada5b47f520415613b36863ccc5c4d65aada059e9f1f8
+EBUILD pkgconf-1.3.90.ebuild 1313 BLAKE2B 41b8ec46f2aa403425fefa659747d7d749853439e928cee51ca5942a32daf85f5c3592b7fdd26ac18a47495ba6d618f9cdae38cd961598401c2308e0e71e8007 SHA512 ea72be69c717fedfc167fce696c1a9dbf549aa5cab4ec6c60b7641cef6ded07877d0847f941865a74ddc4a91f255424f553381203bdf0f1e2ab7242bd792c776
+EBUILD pkgconf-1.4.2.ebuild 1315 BLAKE2B 90e00841c795e7aadd1d5e6c6b064407fc8249d792df74a0433273e48c60024f9ababa9589df4c3f9b3eabd91b77e9a9400376010228aea7b580215606cc0638 SHA512 c0f77fe282688edfb8979c607da32464efb87f2154884e6bcc577b4e9c673087da65399773db06dbecf92d619bb4677dde5ce33a5ede337d1e59376b41db7018
+EBUILD pkgconf-1.5.1.ebuild 1390 BLAKE2B 3bfa7423d6bcba99bbd063281c45aaecc1135df4f9375ba209cd40dc82a53f40392c8f622029fb97771b4fb564f204719283fba3d63124b65c047ccba49e08c5 SHA512 90c99e3bcdd205b8375b7b004acfc9788fb0a8833bff453204caad14238e9b80448e63d80fddc0dc8067cf3ec568aef1e553d2117e66280e400aa7712a68aaf6
+EBUILD pkgconf-9999.ebuild 1390 BLAKE2B 3bfa7423d6bcba99bbd063281c45aaecc1135df4f9375ba209cd40dc82a53f40392c8f622029fb97771b4fb564f204719283fba3d63124b65c047ccba49e08c5 SHA512 90c99e3bcdd205b8375b7b004acfc9788fb0a8833bff453204caad14238e9b80448e63d80fddc0dc8067cf3ec568aef1e553d2117e66280e400aa7712a68aaf6
 MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
diff --git a/dev-util/pkgconf/pkgconf-1.3.10.ebuild b/dev-util/pkgconf/pkgconf-1.3.10.ebuild
index 8e7570f72a8c..9b9f885eb7a4 100644
--- a/dev-util/pkgconf/pkgconf-1.3.10.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit ltprune multilib-minimal
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
index 7382d049d3c8..cbfee8e34330 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 inherit ltprune multilib-minimal
diff --git a/dev-util/pkgconf/pkgconf-1.3.90.ebuild b/dev-util/pkgconf/pkgconf-1.3.90.ebuild
index 86434bc5ebfd..538e513ea99a 100644
--- a/dev-util/pkgconf/pkgconf-1.3.90.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit multilib-minimal
diff --git a/dev-util/pkgconf/pkgconf-1.4.2.ebuild b/dev-util/pkgconf/pkgconf-1.4.2.ebuild
index e2b768e8e572..fe8a931fbf14 100644
--- a/dev-util/pkgconf/pkgconf-1.4.2.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit multilib-minimal
diff --git a/dev-util/pkgconf/pkgconf-1.5.1.ebuild b/dev-util/pkgconf/pkgconf-1.5.1.ebuild
index 1ae23ee0c0d3..5b9170fe2f87 100644
--- a/dev-util/pkgconf/pkgconf-1.5.1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit multilib-minimal
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 1ae23ee0c0d3..5b9170fe2f87 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit multilib-minimal
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index c5957dc95da2..16b7167725b5 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,4 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2018.2.1.tar.gz 260758803 BLAKE2B 735d3e7483b46a9be8bf0a8fa88a51352b1048718aab00b63c133a408666e151947ded527b4ed754ce15aff17a3da9396e10b9194e61286f0ed0534d51f0eabe SHA512 bcae7f579664aa9b071eef6fedc68dad8c9e36078c258cee6877ada1247f9051c4d542657ef2b01dce087e273623b84d86d786ddf1e922d7c6599725f50428bd
+DIST pycharm-community-2018.2.4.tar.gz 260812419 BLAKE2B 2274d8af513535e4c5b3b69619c944f503dd9f2248a43cf3352221b34c40604f409038d85366321e858037e3c9c63dc838c046917c3102a2d536e4aef05c1636 SHA512 aca812b3355552c6a65865385e82c96fbca06f9caa39fd21723710922865f7aeb38de33eb041efb1e3553e161c34de6d8b8ed724d7c91ba16f3a818711ca9468
 EBUILD pycharm-community-2018.2.1.ebuild 1063 BLAKE2B 72a3afd5b6cb81cc3dfc0bdf0fd7e1c052038ae3faf5e7ffed57884040b82cd238172291fc3ea050dab92348a29ebdbbdad75de6b2e4b512eee019b5bbffd093 SHA512 4bdb36f6a983323d44defe031f738953567df7a01f775e02b943336579727808c0ab832e49aa367daa6d26b28eb30edf5a4b110addd172b4e9d898bcc93713f1
+EBUILD pycharm-community-2018.2.4.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild b/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild
new file mode 100644
index 000000000000..c37c85ebc8eb
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 63592b367f77..73a3e6027ee9 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,9 +1,8 @@
-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
+DIST radare2-3.0.0.tar.gz 6638430 BLAKE2B d95404e0f2d86705703119d53de2e1b60f111bcd8d3b05b5d040692e9d9cc4f51fe682892514b47b55d4ff88314b577253a5f2c6ff8cacebd30fd0663c21d1ff SHA512 5ca698123ccad80c54c483f7e2cc678dabfc9c1c172670ff9e1d11512174c9ecc15e81dfdb5de846b42c951cafe23d29ceca6f3824504a2f3dac722c659bb2d4
+DIST radare2-3.0.1.tar.gz 6638512 BLAKE2B 1051e2d948bf312a5d54d03fa20a2fa6954f0ef735416e1c6e95d2042dcc6e1ec46f750d200c84dcb01395d0925ed42a4a1aa3f96b9eafad39d19ee214c91220 SHA512 755cbbf968179d987b1bd11469ef356e9e5b9968983f45a3276e0001c877d13b3b12b71a29dd954e8111c5196284c0e49f26bd79f5b5e037dd4dd27b1f73e380
 EBUILD radare2-2.8.0.ebuild 1128 BLAKE2B 7b86d678bb0af73cad89f9f08b0145516ca053ef26eecc0b74841aec9e9d293d190ad8cb98ebba6885afccc28d90b2352a8fd4a18ced82ae9cb32713506c969d SHA512 37f3f8bbb0c38251772e57e204d66b8f3ad06ae02a7c2b0931ece82a73319ca6a5eeb0b7e635bcefdb5ad2f09b65f963d4a6307ab812b88bb9a70f4d7904a1af
-EBUILD radare2-9999.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
+EBUILD radare2-3.0.0.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
+EBUILD radare2-3.0.1.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
+EBUILD radare2-9999.ebuild 1192 BLAKE2B d6dc77b0fb62846880aa347fc742a8962cd9cfb93596a82bd49c912525d4f5dd4a3a0a9478de900b0c0fa0c2a547796c69b20e9ba1d77577373e4dddf4d8d0ea SHA512 b7af1fb1648b78d52e0d16b99ebba8b70ceef1372ef389e082cf8e4c275e0afc1342f80843e8cc163d3188587cddc4ffd7661769d8c37be1ba50255e62283e75
 MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch b/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
deleted file mode 100644
index 4eb3c053f07a..000000000000
--- a/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3752d992f3140806ea1d513739b6f23addf52df1 Mon Sep 17 00:00:00 2001
-From: cc <longlene@gmail.com>
-Date: Tue, 22 May 2018 12:52:12 +0800
-Subject: [PATCH] fix for build with syscapstone
-
----
- libr/Makefile | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/libr/Makefile b/libr/Makefile
-index 05cb40fec7..0b39b48c02 100644
---- a/libr/Makefile
-+++ b/libr/Makefile
-@@ -84,13 +84,18 @@ E+=../shlr/bochs/lib/libbochs.${EXT_AR}
- #E+=../shlr/sdb/src/libsdb.${EXT_AR}
- #endif
- 
-+ifeq ($(USE_CAPSTONE),1)
-+E+=$(CAPSTONE_LDFLAGS)
-+else
-+E+=../shlr/capstone/libcapstone.${EXT_AR}
-+endif
-+
- libr.${EXT_SO}: .libr
- 	$(CC) -fvisibility=hidden $(MLFLAGS) -shared -dynamiclib -o libr.${EXT_SO}  \
- 		.libr/*.o \
- 		../shlr/gdb/lib/libgdbr.${EXT_AR} ../shlr/java/libr_java.${EXT_AR} \
- 		../shlr/zip/librz.${EXT_AR} \
--		../shlr/libr_shlr.${EXT_AR} $(E)\
--		../shlr/capstone/libcapstone.${EXT_AR}
-+		../shlr/libr_shlr.${EXT_AR} $(E)
- 
- else
- 
diff --git a/dev-util/radare2/radare2-2.6.0.ebuild b/dev-util/radare2/radare2-2.6.0.ebuild
deleted file mode 100644
index 74ac2faaaf52..000000000000
--- a/dev-util/radare2/radare2-2.6.0.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 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 ~x86 ~arm ~arm64"
-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
-"
-
-PATCHES=( "${FILESDIR}/${PN}-fix-syscapstone-2.6.patch" )
-
-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/radare2/radare2-2.7.0.ebuild b/dev-util/radare2/radare2-2.7.0.ebuild
deleted file mode 100644
index 44da1cbab237..000000000000
--- a/dev-util/radare2/radare2-2.7.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
-
-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 ~x86 ~arm ~arm64"
-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/radare2/radare2-3.0.0.ebuild b/dev-util/radare2/radare2-3.0.0.ebuild
new file mode 100644
index 000000000000..ccba9bfa0ed9
--- /dev/null
+++ b/dev-util/radare2/radare2-3.0.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--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/radare2/radare2-3.0.1.ebuild b/dev-util/radare2/radare2-3.0.1.ebuild
new file mode 100644
index 000000000000..ccba9bfa0ed9
--- /dev/null
+++ b/dev-util/radare2/radare2-3.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--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/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index abe520e9a37a..e2ecbd2ce570 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils bash-completion-r1
 
@@ -27,9 +27,8 @@ RDEPEND="
 	)
 	system-capstone? ( dev-libs/capstone:0= )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 8880d18f3f2e..f626f4880a04 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -10,7 +10,7 @@ EBUILD re2c-0.13.5-r1.ebuild 712 BLAKE2B 7dccc9fa372c83c421eb1ee12ceeac59765c37d
 EBUILD re2c-0.16.ebuild 754 BLAKE2B 28913bde66f2630596b289eab49f003eb727f7beb56e45cdbea3ee664b210f0df9aeeda19119d6bd6155e6488fb4dab84e120cd56038dbcf57753169c9bd7950 SHA512 a869252b8c140ead837f6c3eb2fd6b46ef199480ed2e67acf684b9bc1d5fb858e2bed875d8d6eee7b246c3f0e73fa5522a53b11983af98b374b31cc55c8d539b
 EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795f2ff3762b917d45d6976ff29ebbd7da914d76e6ba56cb3e70e352f53b48ef4374743e8ec482fdba24b786 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7
 EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
-EBUILD re2c-1.0.3.ebuild 773 BLAKE2B 9aed71ffcc2750934d67d3469d6ec29ffb87798460946cc195c02cda774875b32e3e8d2f205d5a60ab324c26795f137b8bbe56899a07889f06eceab3063c6f94 SHA512 52b4730121172518d7ec0d1badf5ceae57a30c34a96b8aed6c00be821bb5bd31c59cb2212ef0e187b65e95ea57b76582e3f827020d4d9cd3c1d7fb2fc1dec588
+EBUILD re2c-1.0.3.ebuild 766 BLAKE2B 17750d3d69f2272944e09c049520998ec7fe92ec92bb793beb18514f880fd01652d88846ccb8637dca995bacbc70c01ae8862b4dac56a25b3730fb0368f6974d SHA512 c565b69bbe3302a6f9f30dbc68caba388ddbcfa4f131c5accb3fc2bbef3489b623dcbab741e449486e39974510c2e52381c4cb569fcd77efc1fe3d4f5a0e24d4
 EBUILD re2c-1.1-r1.ebuild 828 BLAKE2B 77af82ac7fe4bb64d21edb1bffea6b9709a50a6d0fbbd17ee930f2a9f224f03adf1dfc2909812f95d0bb5f981e990eef44165f672b81313ee2a9c38f30e7d12e SHA512 a8cfe105c87aa5e5e499e0f9443702bad00bc57a849a817a4b5e5cac294111dd3278deca9e4a415e73be303ad59c7c154f9dbe1e2ac2a35b4183bfea86309a58
 EBUILD re2c-1.1.1.ebuild 782 BLAKE2B b20b14e780a6bdf3f9a09d7b21f67b9d797d403d176b5b25bab866600614a7e0bccc5ce043acee34ca3db5a32f32f47240750c3c91d8c0ea1b00ef48a67affd7 SHA512 829c3ff138da03fd1867869509533a24b964add4594c6115b2df2a042825ac164a3117afff3f2b03f34fa6c10df0e4db42d07ceca52e6489598f2a009dc61bc3
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.0.3.ebuild b/dev-util/re2c/re2c-1.0.3.ebuild
index 8eb9592cd7ac..d24154a91110 100644
--- a/dev-util/re2c/re2c-1.0.3.ebuild
+++ b/dev-util/re2c/re2c-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 511d7a65c4f7..8fe74c2e9830 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-tools-2018.4.tar.gz 1327904 BLAKE2B 1ed01edf0dd5e8c3ac0d1a866d27f2e2ef377e9c082579291f8e755592ff3ea4f44a597e3e7694977500b9434889b0f741e03d566e777bb0f9af5e2e59374d61 SHA512 6b982efb30529e7f7776d7702f563bb4f874b9be3a7b0d838d77a15813f4177da99c152f40f11854fc3d60791ecf4026e006ff25a216bb44194dfd921c50920d
 DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb SHA512 068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad
-EBUILD spirv-tools-2018.4.ebuild 998 BLAKE2B 31de8c7235d648b5494b83160ce36aca43a1268f80de79dfafd8535f852db51bfb001f0b98aa879f8d747db0ac427d5e70e4193e2d7ff276d8a20054004050ff SHA512 017eee1ac06a0bd1a2e7655dc1a69ddb733007790c11b58b790f64e3b3d05459b507e7dbad6e9f0660c97bd1a6ba1bddf50e70e67afd86e610319b3c38c45226
-EBUILD spirv-tools-2018.5.ebuild 998 BLAKE2B d81e30dbc3f04a743833437f60d617343d7422b59b9ea52f652e02e9a889176508704630e84164d413c88a3d82aaaf4e7fb601f0206dcf5a5a2ddc041ee7adf5 SHA512 0b4683be044a495348b3040e7728874e14986f64278fe109f5500bb12dfbbaef03a4482ae59378346949968a9cf122ba22c72ff513e79a9bea6d51bf98d2778a
-EBUILD spirv-tools-9999.ebuild 953 BLAKE2B 25768a92be84719a8de0faedde634c1bddd263836db95eb037ac3d0683f4e8da79bb2604650e9d732e6d477a20cc5a05abff81284bc68286f933494fef8d247a SHA512 d86c4d153fb90eed2db08dcb1c86493e334b7905ac9b25a19bff434e92809269749c5e11874694ba6986f30aa941d3e1c46ff3b880972aa4178b46e1bb67b402
+EBUILD spirv-tools-2018.4.ebuild 1034 BLAKE2B 891188fa617878fd86b7847dc32cefeb69801fa89594763b212891018bd0e251fb64401fed9a4520ab82685843916f3b1f4f94017937fc1adaad4bf8bd847bc5 SHA512 78784487fe26c9a5562d8d7aff69b45e40c13b3850319b1f45b48ab84bfdb1ce90ebab3edcc112935bc3a64b63603e8505c2fc3ee7393d5541c2bc2587c51b0d
+EBUILD spirv-tools-2018.5.ebuild 1034 BLAKE2B 3270c8df1b2cab7bfda4d32d53455e707d5aaa9247f8fd985c2bcae77d3dfd27d51b07ecc984cc8440120b4ad27c98000ae6cf42e7db29ca0642485cb5df29fa SHA512 af8d8c0693873395f030d8fcf2557da979b5732bae9332d2a1ac9269110ad2e31f343ccae1976c0e9f14bdd5132997e787ee90ab36d5b7c56e3eba2ec89b5206
+EBUILD spirv-tools-9999.ebuild 989 BLAKE2B 7eef54cb0af6249e2d86ace4ed2eb5cde0b23f46987c08b04bbf032363f3cdaeda5daf231bc3457282dcd4c3731b9a2190396de481bc492bed8427ac065d8625 SHA512 7c30383d141631e25430f6148d0bc6c816447de8c6b202279b0fb0a276621dae12c0fbfd227d83d2d2b28c33c8eb4ceb83e37fada15165cabc2b640974c5cab9
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild b/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
index 95d38ce604dd..f8f03ba31210 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,13 +24,14 @@ S="${WORKDIR}/SPIRV-Tools-${PV}"
 multilib_src_configure() {
 	local mycmakeargs=(
 		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
 	)
 
 	cmake-utils_src_configure
 }
 
 multilib_src_install() {
-	default
+	cmake-utils_src_install
 	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
 	insinto /usr/include/"${PN}"
 	doins  "${PN}-commit.h"
diff --git a/dev-util/spirv-tools/spirv-tools-2018.5.ebuild b/dev-util/spirv-tools/spirv-tools-2018.5.ebuild
index 23339df56f9a..3e991702fdfa 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.5.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2018.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,13 +24,14 @@ S="${WORKDIR}/SPIRV-Tools-${PV}"
 multilib_src_configure() {
 	local mycmakeargs=(
 		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
 	)
 
 	cmake-utils_src_configure
 }
 
 multilib_src_install() {
-	default
+	cmake-utils_src_install
 	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
 	insinto /usr/include/"${PN}"
 	doins  "${PN}-commit.h"
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 593054a38eb9..20c4b28437af 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,13 +22,14 @@ DEPEND=">=dev-util/spirv-headers-1.3.4_pre20180917"
 multilib_src_configure() {
 	local mycmakeargs=(
 		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
 	)
 
 	cmake-utils_src_configure
 }
 
 multilib_src_install() {
-	default
+	cmake-utils_src_install
 
 	# create a header file with the commit hash of the current revision
 	# vulkan-tools needs this to build
diff --git a/dev-util/squashdelta/Manifest b/dev-util/squashdelta/Manifest
index fbdd655fd08d..cd4645d6c5ac 100644
--- a/dev-util/squashdelta/Manifest
+++ b/dev-util/squashdelta/Manifest
@@ -1,6 +1,4 @@
 DIST squashdelta-0.1.1.tar.bz2 78504 BLAKE2B f9aa13b3af35bd97650b31fac718837763b73c2817548a3fde75841993092d717ea78826a3e29d472290d4f9164f8cfcc9f9999613f199c21251080584dbd9f7 SHA512 efe90831e412ed6627d44390054dc89339e85bcd3be452f16fb32d00989bbdc9480dbefcea624941b4866a686a356b0371c33de31903afa70af26eecbe902844
-DIST squashdelta-0.1.tar.bz2 77702 BLAKE2B c36a90e5bb0c22519fdd6229131039b881ccda82117a8180959e463debf767bc2382cc7e38645003cb23ae8e58492aaed849d1951adaedea56837900fda0025f SHA512 1ce93b59b6c51be49aaaee9576049677c8ba146fa3a17c7d3552440a1c0ebe93fb4d8cbe1182db691e2c9552713ecfeef0e50d95f7e94218c341c51364bf724f
 EBUILD squashdelta-0.1.1.ebuild 783 BLAKE2B 6905a7965dbd483b95770ee99d820dd2a813ff2502e686417d8805ea8e7227da4e52dc4f6cf6af1ae803171367b0d9570800efe440fdae183193db41a755d8d4 SHA512 0c7a13325141e16c869744174c448b4d1a8656dbb9e25f540a6397c69d5e970d400ca5fe7531ddeca8aaaade21fba952b382a16c6fd1bad8bec657da56a06e32
-EBUILD squashdelta-0.1.ebuild 816 BLAKE2B ed9e06f2b254d3907872234733ee3bd18f203efd18668c1072e44c36b571da7d83510131de61d388c4b6c1b5d58b91f6c00f62939f12d351f47b4fd52616a44a SHA512 db8727fd723ce993b06fc4c12f769b412971c9042609d48f14a6e6bfe681511652e4253bcf57c0a8a20a855edd53c0989462974ba15291a50c61f86e64ff359f
 EBUILD squashdelta-9999.ebuild 812 BLAKE2B 87a425b61222a714e4a4868d5c86ca37ef58c1840137214edb349b1fdf3b94175ee65ece4252be5af89f992b5be4675c2f6b3e92b2133e974b0fe0427bea1748 SHA512 d3551e272526a4c105623bce97879012d998fe57d2bf31d795d9051da3427a7900916f0f8b90d5a725e45fbf3e1282413c13eb32c6eb0ba2faf6ad6fcc799ee0
 MISC metadata.xml 617 BLAKE2B 1a732150f235099533beb0b3672648f3d4e501509d754bc54f1cb9093df38b2c411519417433b1b485c922844814923c2925d699881f07cb0512b5edeb5f93a8 SHA512 a08f732876cfc4455ddd980eb04cffbe73b4bd56426d420777782a93b1229277463f85c71f05699f152f2edaa4ee8e029e1e5185b5c7b47204a9e9b9ba5120a2
diff --git a/dev-util/squashdelta/squashdelta-0.1.ebuild b/dev-util/squashdelta/squashdelta-0.1.ebuild
deleted file mode 100644
index 64d107803421..000000000000
--- a/dev-util/squashdelta/squashdelta-0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Efficient (partially uncompressed) SquashFS binary delta tool"
-HOMEPAGE="https://github.com/mgorny/squashdelta/"
-SRC_URI="https://www.github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-# uses public-domain murmurhash3
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lz4 +lzo"
-
-COMMON_DEPEND="
-	lz4? ( app-arch/lz4:0= )
-	lzo? ( dev-libs/lzo:2= )"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/xdelta:3"
-DEPEND=${COMMON_DEPEND}
-
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable lz4)
-		$(use_enable lzo)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index f5a34301aee1..a2f2d1bfb6cc 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -2,7 +2,7 @@ DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44
 DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a8239f8a6665b9f0eebfb7715eb3469d45c2333e4fac9a498ad3b448b1f39716b92cab91b035bc1e4125382eb SHA512 b54df972dc86e27668784ea4619e8c55230816b249e0a7fcca99a37b7f9ec37710742aca08c9e39b508522accb654a83c98207bab9ccac1197bb8e73e51ab116
 DIST strace-4.24.tar.xz 1398252 BLAKE2B ca83adfb3ccd23a55976c2950ce5911203e1ad911147649127e49d815e4899b5fd72459c371c15aea701d0d30e994d0eca2b32aad240fccc4e8d1cecb3f97558 SHA512 69cbf8b2c32c7ea90ebe5955bc71b454316a3494ae6975203fe61ce1f42ec539438cec5ba8ee7f529f89661d964b4aa53656712706aacff6bf018304b7a09813
 EBUILD strace-4.20.ebuild 1927 BLAKE2B d296e1d01f08feef4712decf394dd451dd6fefdeb1bf5b4111c72e4a8c7651a119c176eb9ac0dcb65c7ecfc20ef6f434e4d50c7b44d862451a7afa9977797078 SHA512 55caeb0aee455a8925846313b768ebf7da341be986c9cbad396e469fee9939db3d813d91279eb9d62b9424da28bba9e1e39c4c06dc4f46fa984f30399e0130a4
-EBUILD strace-4.23-r1.ebuild 2256 BLAKE2B b7c7dc1cd0920968aca28cb49ea0469ca6aa368973a8085499c12a0348cbdbfaddc41d1d5ebbc8cf826510095dac0d333fbedd1bcfe8234f1d42b93118eee197 SHA512 607d0e7bd0c335f0751484ed7ed66d3a4c84c752361ec20b3b877a34c045f83eb35647513697442e29059ed3753821d2a3121214e9bfec932e7b96c207c456cd
+EBUILD strace-4.23-r1.ebuild 2250 BLAKE2B 646df74a9667e4855d3e116c96710dc5f5dbe4e183be4a7517707d1644d8bbd9f6cbb7414abd1296f7949bbb96eff265b07df8fa7184902362194b8d15e08c29 SHA512 6491184f507bfb9b39e17a30bfcba0f1677d0d9a9aebade5f70b58b94551e46bcd00ea4eeec0e90a473c0ae3dd5547c891ef4b7ea2f178900e8d701dce356765
 EBUILD strace-4.24.ebuild 2266 BLAKE2B a68da655172bba2180cc259bae15a13f535ebfa46a4050980158bbb700b6c91466b802c07a3a40ad4e426c88111ce7a3d30b59e392917bcbfde44cd96c864125 SHA512 9471fc12e8ea0ea45a82f64d99098eb6d082b9b8b5ee95c681f2e29703cc8bbd3598f37364b776714691bf86a71589ad21fa9e2b091513860d0580ac6e3c64dd
 EBUILD strace-9999.ebuild 2272 BLAKE2B e1f86bbddaacfe0d7c531dd871cd9f0f365d3f02dfce6dee388a4f89b0a5de0963695358ce3716b8c1bba366cd7fa5bff9261524d53975d540be2ad85244139e SHA512 372028d8e3ec29deabee8834187c3730d5fd671caad95246ea09d96030295dd21a4d1085acd6488e8219f0b44a2ef140e46390052eca150031883b233e9f559d
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-4.23-r1.ebuild b/dev-util/strace/strace-4.23-r1.ebuild
index acb8321fc72c..34d307fd4b9f 100644
--- a/dev-util/strace/strace-4.23-r1.ebuild
+++ b/dev-util/strace/strace-4.23-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 6bb49f663979..709d18cd3a94 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,7 +1,3 @@
-DIST sysdig-0.23.1.tar.gz 830420 BLAKE2B 31a8c4cd8b570a308c81b4df53494cff2619d05724e509634671968025ebee0e46c5e59a7c877e6d9f1f1eba86a8a27a0cd9c5b66e75723ec8eec66c6782d4c0 SHA512 059a564a5d31381efae4bc50d2b83f83a1d051f1cfb9fa6bfb75a341305149073a6eb3b9a3ce4da12fa293e75b71f8b30c9021ac8d4c4a2f59a40e35a5ffd482
-DIST sysdig-0.24.0.tar.gz 846171 BLAKE2B fc65c6df7351e1e1f4afd168cf9eaaed8d714539822ede1ce1941ead191b0d6e9898bd1da36a78737d4662b8e47090d63978441ce01fe30f13c504a3fa09eb5c SHA512 ff8162fbd5941a7a5532e8c1d0300acdd2d7ae85044600021f12e76f3752b50c46c894ea2007d0467761927403a784b85cfc000e735004e5fdbd48c31c20071e
 DIST sysdig-0.24.1.tar.gz 846153 BLAKE2B bc64317e02526d9729c9fb3738f2982f4b425cdb43c64f77944938186cde4ed2d8d2649984efe0055bbaed250b08bda4008272805024e1d8993e17bc93509663 SHA512 a89ce82527b47104161668e134387a04f4a6753adcd881df25410b629603b58fc8f675de6941f4911ad2da42ffbfd46b38f9cc9837c0809c559fee9a739a204a
-EBUILD sysdig-0.23.1.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
-EBUILD sysdig-0.24.0.ebuild 1933 BLAKE2B 6dcb3dbf1649629690b257ccb9ead1f44eca5783de68d58e133b0a514d1f052d9e1b2af06f6c5323e87b61a31e2aebe87137116cf66e8522bda39376e28c7342 SHA512 dfc4ddeea7c3f4984a878da9f0a039ca2084232083c94526d9d6be7223acee7a846f39690057a5b31b1c88524d5229cbdbe91ba302fb2ec5b9bc66efa54a6a4e
 EBUILD sysdig-0.24.1.ebuild 1933 BLAKE2B 6dcb3dbf1649629690b257ccb9ead1f44eca5783de68d58e133b0a514d1f052d9e1b2af06f6c5323e87b61a31e2aebe87137116cf66e8522bda39376e28c7342 SHA512 dfc4ddeea7c3f4984a878da9f0a039ca2084232083c94526d9d6be7223acee7a846f39690057a5b31b1c88524d5229cbdbe91ba302fb2ec5b9bc66efa54a6a4e
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.23.1.ebuild b/dev-util/sysdig/sysdig-0.23.1.ebuild
deleted file mode 100644
index e366e6626308..000000000000
--- a/dev-util/sysdig/sysdig-0.23.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.24.0.ebuild b/dev-util/sysdig/sysdig-0.24.0.ebuild
deleted file mode 100644
index 3ba452c42e38..000000000000
--- a/dev-util/sysdig/sysdig-0.24.0.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"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
-	modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-cpp/tbb:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 7f701cc1e3c7..f76cebcc5289 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1,4 +1,8 @@
+AUX trinity-autofs.patch 1688 BLAKE2B 99b068123ff2de6f47569c5286fd12326451be1816f8386ef82fcea97816f7d922cb7496fc8cd356878c1b89434fb033fa345c18d25368dca0f1e1c8973ea229 SHA512 4e8b8fb16d37a8de966ffdc6049743e73c978947b4cbcecd460bc548ea4dc5a2f50e326e5745d7b31c2aeebb53e46026a8504bb26a8d9c2996b375ec2891152d
+AUX trinity-irda.patch 1557 BLAKE2B 23dc97baab847ffe565af9d1b595a01dd2b4355cc265e07eb17a5718630a4b5534b00fc44d828a7186ea565714d94cc6dd49fe9f3e5033390353a25ab8e82e7a SHA512 e84f35f50dbffae42c2986e34f7b13b496d5f44ecadb2b1241682e0281356286cf88868d770fe6ac2a31f91ba2851b0f04970d595463988b44074d90c6babca3
+AUX trinity-memfd.patch 2092 BLAKE2B a29485126afbb6966969284977032bc63634afa0922206d487b1801d017bcae8990ee46f06f7cb63eaea957cb7b469f48a0a222a240efbe73f79fc8923157313 SHA512 ea9b77c5a37d53f329bb185cf6b33c6d26c27c4feead29c7c9e2999818ea5783ef92185ef9aa1676fced1dc24bbf1da9ef3a14056ee56f73baff4886da474bd9
+AUX trinity-net-protocols.patch 449 BLAKE2B ccc3f26e0c27d145a16463cb7573c79c2ebb3b6368b3fb4b63df4e053b8b4edf12e53174b7e967f138e0b8ae4d3c93ca727f8cb18e0ab1a56373550d37b8d93e SHA512 e52a7be4004472ee323e4c51cff65ecbad4464642abc8bee4ec94b588770ac49d814c0db6bce5c932a13fb6bffbe2491c80948d1f2f57835824253ce336319e5
 DIST trinity-1.8.tar.xz 213984 BLAKE2B 56f664023e2bc3648e941e4a3cb20e450cdcad3556289e201513d1755267eb013da2be035e81c87b3f1d1b0b1e12cb041c6bb345f7a84ee4c5c12f20a8e87f55 SHA512 686076dab2346cf9b5d8a20b14db31f460a352fa72eeadbe005a7423941918f5afef08b4987bb68cbbf4218d0cb620adb85f8036294d8df5ab5262e0031a44e4
-EBUILD trinity-1.8.ebuild 824 BLAKE2B d98c9332cbdd60749c0a1bf3dd1277842fa543100e9681b5721f3477b24d4d70f7d9c6dd7e3ced2743a0bb743bf8fbd3f7adda5c41b8e9eb6f3ca907f11a215a SHA512 defbdf6d43dd3458fbf52bf4fbf9fc9b518ef0186f7f6662bea0014240dd0331db45563a9062c8b45adcaa021994ef28f2bada65c2e12c4cf71f6720b5db0f97
-EBUILD trinity-9999.ebuild 804 BLAKE2B 446dab373eaa541bcb57b407e64f737a4117f8ebc130bb83cd11f0e75ee85d9a60fc534208ff60efdee531b89691d5d8ba27d1b7c9d387355e95bad3d1c876fc SHA512 6183f9cba7341792b559fddc183027a7d80fdc7a5531ee26c94aa04ca82663492827b2ee1fb1986d136c69826e1a79183f6c2c6e9ee9b4c018d6af8fdb44c384
+EBUILD trinity-1.8.ebuild 1000 BLAKE2B 10318476f98c42d5239e17ae0f6811d048a9b6a5cffa457b5e5cfeafe235ae9d44225931a46955bd658a1b41d8fe1d7a5cb81508224e268a443acbe47d8ab08a SHA512 0a922df41ffe9246f99b751abc4b19ec2b3592c9aa066ac73cdab125c41e2b895ae0b6a792b3a7a9b9a6427ca9727c9d1585e3dd5b6c08fe97ab01a6f217b79a
+EBUILD trinity-9999.ebuild 800 BLAKE2B dc34511a94c365dc6f49b9e9465effd96da1e685065316cfb4a1eb4e3c7a10096c749fadc5be7ac5942ed13d41e63982deb4c0c72d4415b426a3b88c31493239 SHA512 dcb2c5cfdcffa77b9deb1f9abf85619f5d4d1a2a8b1279748335829b325549ab0a9ce3e5356f67924e003955517b9b877dcc6368f6254b8a5560903c0f6b207a
 MISC metadata.xml 253 BLAKE2B e7d65a21b41d6fee02d2ca3ed68a52450a11debfcdf7e029100f010f6bab26aded65447d29bf374ee41d224f8105b57a8b2b6b0400f8ee4844900e6f2025a5cb SHA512 c6d2490fa32bc6e044a6b051ba21210f47d7545271a7437b9ed16f49924837e1c88dffc33efb94557b818a508e068e1405fae056c881078c37a001e30947aa25
diff --git a/dev-util/trinity/files/trinity-autofs.patch b/dev-util/trinity/files/trinity-autofs.patch
new file mode 100644
index 000000000000..b8a6c9fdbd51
--- /dev/null
+++ b/dev-util/trinity/files/trinity-autofs.patch
@@ -0,0 +1,53 @@
+--- a/configure.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/configure	2017-11-18 14:25:52.095495407 -0700
+@@ -47,6 +47,29 @@ check_header()
+ echo "[*] Checking system headers."
+ 
+ #############################################################################################
++# Does auto_fs4 define AUTOFS_IOC_EXPIRE_(IN)DIRECT?
++echo -n "[*] Checking autofs headers ... "
++rm -f "$TMP" || exit 1
++
++cat >"$TMP.c" << EOF
++#include <linux/auto_fs4.h>
++
++int main()
++{
++	return AUTOFS_IOC_EXPIRE_INDIRECT + AUTOFS_IOC_EXPIRE_DIRECT;
++}
++EOF
++
++${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
++if [ ! -x "$TMP" ]; then
++	echo $RED "[NO]" $COL_RESET
++	MISSING_DEFS=1
++else
++	echo $GREEN "[YES]" $COL_RESET
++	echo "#define USE_AUTOFS_EXPIRE 1" >> $CONFIGH
++fi
++
++#############################################################################################
+ # Are ipv6 headers usable ?
+ [ -z "$IPV6" ] && IPV6=yes
+ if [[ "$IPV6" == "yes" ]]; then
+@@ -290,6 +313,7 @@ fi
+ 
+ #############################################################################################
+ 
++check_header linux/auto_fs4.h USE_AUTOFS_EXPIRE
+ check_header linux/caif/caif_socket.h USE_CAIF
+ check_header linux/fsmap.h USE_FSMAP
+ check_header linux/if_alg.h USE_IF_ALG
+--- a/ioctls/autofs.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/ioctls/autofs.c	2017-11-18 14:21:14.487774564 -0700
+@@ -238,8 +238,10 @@ static const struct ioctl autofs_ioctls[
+ 	IOCTL(AUTOFS_IOC_SETTIMEOUT),
+ 	IOCTL(AUTOFS_IOC_EXPIRE),
+ 	IOCTL(AUTOFS_IOC_EXPIRE_MULTI),
++#ifdef PRE_4_14_KERNEL
+ 	IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT),
+ 	IOCTL(AUTOFS_IOC_EXPIRE_DIRECT),
++#endif
+ 	IOCTL(AUTOFS_IOC_PROTOSUBVER),
+ 	IOCTL(AUTOFS_IOC_ASKUMOUNT),
+ 
diff --git a/dev-util/trinity/files/trinity-irda.patch b/dev-util/trinity/files/trinity-irda.patch
new file mode 100644
index 000000000000..eb298fd99d80
--- /dev/null
+++ b/dev-util/trinity/files/trinity-irda.patch
@@ -0,0 +1,47 @@
+--- a/configure.orig	2017-11-18 14:25:52.095495407 -0700
++++ b/configure	2018-07-21 11:44:59.235072132 -0600
+@@ -317,6 +317,7 @@ check_header linux/auto_fs4.h USE_AUTOFS
+ check_header linux/caif/caif_socket.h USE_CAIF
+ check_header linux/fsmap.h USE_FSMAP
+ check_header linux/if_alg.h USE_IF_ALG
++check_header linux/irda.h USE_IRDA
+ check_header linux/rds.h USE_RDS
+ check_header linux/vfio.h USE_VFIO
+ check_header drm/drm.h USE_DRM
+--- a/net/protocols.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/net/protocols.c	2018-07-21 11:48:09.065940013 -0600
+@@ -26,7 +26,9 @@ const struct protoptr net_protocols[TRIN
+ #ifdef USE_RDS
+ 	[PF_RDS] = { .proto = &proto_rds },
+ #endif
++#ifdef USE_IRDA
+ 	[PF_IRDA] = { .proto = &proto_irda },
++#endif
+ 	[PF_LLC] = { .proto = &proto_llc },
+ 	[PF_CAN] = { .proto = &proto_can },
+ 	[PF_TIPC] = { .proto = &proto_tipc },
+--- a/net/proto-irda.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/net/proto-irda.c	2018-07-21 11:45:34.330047712 -0600
+@@ -4,13 +4,15 @@
+ #include <sys/un.h>
+ /* old irda.h does not include something which defines sa_family_t */
+ #include <netinet/in.h>
+-#include <linux/irda.h>
+ #include <stdlib.h>
+ #include "net.h"
+ #include "random.h"
+ #include "utils.h"	// RAND_ARRAY
+ #include "compat.h"
+ 
++#ifdef USE_IRDA
++#include <linux/irda.h>
++
+ static void irda_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
+ {
+ 	struct sockaddr_irda *irda;
+@@ -53,3 +55,5 @@ const struct netproto proto_irda = {
+ 	.valid_triplets = irda_triplets,
+ 	.nr_triplets = ARRAY_SIZE(irda_triplets),
+ };
++
++#endif
diff --git a/dev-util/trinity/files/trinity-memfd.patch b/dev-util/trinity/files/trinity-memfd.patch
new file mode 100644
index 000000000000..d333aac2941e
--- /dev/null
+++ b/dev-util/trinity/files/trinity-memfd.patch
@@ -0,0 +1,79 @@
+commit c93bb184ce996c4d77eefbae2ab0bf74f396ec45
+Author: Baruch Siach <baruch@tkos.co.il>
+Date:   Tue Mar 13 06:53:06 2018 +0200
+
+    memfd: fix build with glibc 2.27
+    
+    glibc 2.27 added a wrapper for memfd_create(). This causes build
+    failure:
+    
+    fds/memfd.c:19:12: error: static declaration of 'memfd_create' follows non-static declaration
+     static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
+                ^~~~~~~~~~~~
+    
+    Don't use the local definition when the libc provides one.
+    
+    Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+
+diff --git a/configure b/configure
+index dc0a87d8c1ad..c0166af33048 100755
+--- a/configure
++++ b/configure
+@@ -289,6 +289,29 @@ else
+ fi
+ 
+ #############################################################################################
++# Does glibc provide memfd_create() syscall wrapper
++#
++echo -n "[*] Checking if glibc provides memfd_create.. "
++rm -f "$TMP" || exit 1
++
++cat >"$TMP.c" << EOF
++#include <sys/mman.h>
++
++void main()
++{
++	memfd_create();
++}
++EOF
++
++${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
++if [ ! -x "$TMP" ]; then
++	echo $RED "[NO]" $COL_RESET
++else
++	echo $GREEN "[YES]" $COL_RESET
++	echo "#define USE_MEMFD_CREATE 1" >> $CONFIGH
++fi
++
++#############################################################################################
+ 
+ check_header linux/caif/caif_socket.h USE_CAIF
+ check_header linux/fsmap.h USE_FSMAP
+diff --git a/fds/memfd.c b/fds/memfd.c
+index 210678e4571c..aaaac2f78f54 100644
+--- a/fds/memfd.c
++++ b/fds/memfd.c
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <sys/mman.h>
+ 
+ #include "fd.h"
+ #include "memfd.h"
+@@ -16,6 +17,7 @@
+ #include "trinity.h"
+ #include "udp.h"
+ 
++#ifndef USE_MEMFD_CREATE
+ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
+ {
+ #ifdef SYS_memfd_create
+@@ -24,6 +26,7 @@ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int fl
+ 	return -ENOSYS;
+ #endif
+ }
++#endif
+ 
+ static void memfd_destructor(struct object *obj)
+ {
diff --git a/dev-util/trinity/files/trinity-net-protocols.patch b/dev-util/trinity/files/trinity-net-protocols.patch
new file mode 100644
index 000000000000..d2583b56ebd6
--- /dev/null
+++ b/dev-util/trinity/files/trinity-net-protocols.patch
@@ -0,0 +1,11 @@
+--- a/syscalls/setsockopt.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/syscalls/setsockopt.c	2017-11-18 13:44:19.283946230 -0700
+@@ -90,7 +90,7 @@ static void do_random_sso(struct sockopt
+ retry:
+ 	switch (rnd() % 4) {
+ 	case 0:	/* do a random protocol, even if it doesn't match this socket. */
+-		i = rnd() % PF_MAX;
++		i = rnd() % TRINITY_PF_MAX;
+ 		proto = net_protocols[i].proto;
+ 		if (proto != NULL) {
+ 			if (proto->setsockopt != NULL) {
diff --git a/dev-util/trinity/trinity-1.8.ebuild b/dev-util/trinity/trinity-1.8.ebuild
index 1072988366ec..2cb2ae2a86e1 100644
--- a/dev-util/trinity/trinity-1.8.ebuild
+++ b/dev-util/trinity/trinity-1.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="A Linux system call fuzz tester"
@@ -14,9 +14,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 # We need newer headers to avoid compilation failures in the BPF stuff.
-DEPEND="app-arch/xz-utils
+DEPEND="
 	>=sys-kernel/linux-headers-4.8
 "
+RDEPEND=""
+
+PATCHES=(
+	# Fixes from Fedora and Debian
+	"${FILESDIR}"/${PN}-autofs.patch
+	"${FILESDIR}"/${PN}-irda.patch
+	"${FILESDIR}"/${PN}-memfd.patch
+	"${FILESDIR}"/${PN}-net-protocols.patch
+)
 
 src_configure() {
 	tc-export CC
diff --git a/dev-util/trinity/trinity-9999.ebuild b/dev-util/trinity/trinity-9999.ebuild
index 2e263c788cee..4245b613481a 100644
--- a/dev-util/trinity/trinity-9999.ebuild
+++ b/dev-util/trinity/trinity-9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit toolchain-funcs git-r3
 
 EGIT_REPO_URI="https://github.com/kernelslacker/trinity.git"
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 9345ef0ead46..53d86cbc524c 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -6,10 +6,12 @@ AUX valgrind-3.7.0-fno-stack-protector.patch 554 BLAKE2B cd87e1bbf86b82face9dbba
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
 DIST valgrind-3.12.0.tar.bz2 12788556 BLAKE2B aeebf9c29afb3cce683c6448a3dec8f4edb1e44b2043a8e159c57a28c75fee49c5dba144d7ae2d79d23fe5a6c5b2bbf01fc398909bf12eebc027f8a7d4d83009 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be
 DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f528596048bc5d1e9c17539283085dd9accd0c1b3136f9768a62de27d1f1641b450305681a33d9ba9fdfe028a73c0cb99 SHA512 34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009
+DIST valgrind-3.14.0.tar.bz2 16602858 BLAKE2B 00d601593388180cc874cf2f0c78e79f705f145e45ea82996117cb91ba881e7888ef241fb7e45927f82f99666d76ed35cb5d451e9a3ef123c04a0dff233b2269 SHA512 68e548c42df31dc2b883a403e0faff7480c49b3054841870f5d2f742141ba199eca5d83c96bbf283115f0633f2bdb0860161d422f98e3ec720ec65760d250f97
 EBUILD valgrind-3.12.0.ebuild 2854 BLAKE2B 07c651acb3854432137f09513f991cb549b6192a704a26ed9626816f8650acfca0179c7064e772e59058a7657b1c0407a87753ec30b2209cf47aa04d68d908ca SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457
 EBUILD valgrind-3.13.0-r1.ebuild 3428 BLAKE2B 96f18609fe79c997b4d344ecf59be9356aafd5ed7bc4e03b028f06e3e938ee1f00440289f7918ab935ccc42fa2bea2d316bb1d96c43ef40a85374b12e0b5683c SHA512 aa0fe6e76e52d25c6b05a30c46de96aabf539f7166bd369b21b93522d52e01d9fc50c77769170021038b0ec60911cd07bf5afccca86e35ad49828e401ed4d61e
 EBUILD valgrind-3.13.0-r2.ebuild 3879 BLAKE2B 03709383d7167d639ec5f3d461b0990c1d240a5260f5f4533a7dc79ca3b789ae9cfb7f749a11be2dfb410cadf7364ffd13515c63ee3673fee3fcb4d07b8a4b25 SHA512 c2f81be414f2d5d2853350b1e1652f5cc03578962d3a8ed5a31462defe970b1a5b7f4820f02fb76e4a7494ec5377af35149c0c22c9378619e2705247f490268b
 EBUILD valgrind-3.13.0-r3.ebuild 4121 BLAKE2B 0770974a05e87ad0ffec0516521d5954196b0a5ffc62ce2aae925bbe29a2acd076cac3d5751bf92535ce59f554ae51403849b1b7fb4c6f71ade7fcbe0c333554 SHA512 1f0921aba9cdd3a192fdc3ae5a77da773c7c9e485acbb38c9ac8de6208496d44d10edc01126e8488e17231c45cf8a769d3226ab18d8436e7857497a3b07dd2f8
 EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc
+EBUILD valgrind-3.14.0.ebuild 3688 BLAKE2B 7f353909403147180ba335c0d937fc30bf47da0ef99f61bcf7ee20c50de67e21b09ca7665e6c35b2c8151e947af8e930fb621fb990028cf0dabc3142d81b10a0 SHA512 d569eb947d00d9426af8959f8073c6c1b2110deba6be2b639a4b1d306818a5a0d9dfd34feb249614ab45ed8fab69bcad67cada53b423c5b35d5a8ebf7c77d7ee
 EBUILD valgrind-9999.ebuild 3675 BLAKE2B 4405fa37a59f844c3ab8f5ca933408834a7986b4534542f7276214ed9616912f9df22b62f3bd2dcaa8693acaf0c19f09489d67ea8825bc8d2ee6e5d387aca10b SHA512 408fb2dd9e8676dcf117298f03dcedd5dd54f8eb33d75c04f6f890817a82a9035b7387d4a075ef7bebc52c2008ae99c7831eb0e9e7553eae449ccc3f6160a3fa
 MISC metadata.xml 1139 BLAKE2B fef548fc43861a5c031c4db6fcd5a446cb3a33b030916a118de1d99e78fc893991cd20f06d545d7731668e4ad859ded8e8b980e35e383ba27ecb96b704757a95 SHA512 f3ee37b8e5f408c01d5f6308644305fcb945df008e5f708dbde95f73a1e7988f53799e28bd72f75bd5e01765414a0e11b8045f671e723beb46d90a50f5dd1846
diff --git a/dev-util/valgrind/valgrind-3.14.0.ebuild b/dev-util/valgrind/valgrind-3.14.0.ebuild
new file mode 100644
index 000000000000..e111e5fd3e23
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.14.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
+	inherit git-r3
+else
+	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# upstream doesn't support this, but we don't build with
+		# Sun/Oracle ld, we have a GNU toolchain, so get some things
+		# working the Linux/GNU way
+		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
+			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
+		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
+	fi
+
+	# Allow users to test their own patches
+	eapply_user
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
+	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
+	# -fstack-protector-strong See -fstack-protector (bug #620402)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fstack-protector
+	filter-flags -fstack-protector-all
+	filter-flags -fstack-protector-strong
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf+=("--enable-only64bit")
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf+=("--enable-only32bit")
+	use x64-macos && myconf+=("--enable-only64bit")
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf+=("--without-mpicc")
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		# Otherwise FAQ.txt won't exist:
+		emake -C docs FAQ.txt
+		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
+	fi
+
+	dodoc FAQ.txt
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
index c40aab8787aa..e628809df85e 100644
--- a/dev-util/webstorm/Manifest
+++ b/dev-util/webstorm/Manifest
@@ -1,7 +1,3 @@
-DIST WebStorm-10.0.4.tar.gz 130242508 BLAKE2B e41158360fbab65ad90e81661becce4044f7609ff3532a1f45e65443e0e125f39e9d02c9a29f7dece5260738dce641d7342873dc34bc0ef493ac3acb3a8be594 SHA512 2523795dc3cc4395549313584e8e597b2782eb2c6ad577d0aae81b72656f00a2cc2f9bbac77f83f9e1f74350aaa762d8b7ba873558a37af316839784e506c6ec
-DIST WebStorm-2016.2.2.tar.gz 215535491 BLAKE2B 36e87c604f7e7d1d7d2c01ae7cc1872cc264577935c1693e96625bf659d4ad2c59137faa3eacb6b10350bc816fac472e011c617165df68c1a0fbb5cdc7811816 SHA512 84123bd5e169e87490f3b71f7259b6b13a7885b5a66b912957cd6e869b6f985db0f0a0f3a232436b1894096ec8d74c2b907c4162f2fdd212f96cb0a3d5f41f48
 DIST WebStorm-2017.2.4.tar.gz 257748171 BLAKE2B 2b0951e94f92a0d690bf9261573963dd6250d9b896784b7156dde8b39ec3a59f94da023bcd3183b404e4bfa16d27928d3eecedf54f5b9036e856af5237e8c5ed SHA512 283339f7757093affde698cfb751f7ced18d54159db7696c9fe6b4d37751e94ad1ca9f0c54db9d5ca256da35ee24454a3b48ced21d6db434c23ec94b023a4d09
-EBUILD webstorm-10.0.4.141.1550.ebuild 813 BLAKE2B ec251523438f6fdd460d572f4d0a8c5cdda176bf78e6f44b6facb7fc1855273fc550d250f50c2a4f5a4808798cb7cc3be31b767baa9e27fb7911299141c982d9 SHA512 6800b2d9cffc552e2bf2813898b5d03a33a8344bbf8c242a4d778f73a9a739be724a5b23980763d237a4f44ea769a9dd80b34097f8fd46fdec5cbbe247dfe8c3
-EBUILD webstorm-2016.2.2.162.1628.41.ebuild 813 BLAKE2B 490fd1a1fea77a0d6da3cfbd77ac55922c41284229c20167c427343cf30f1d47a7586b5b0493d9b633e326805dbd733218bf05f3746149c6063149376f30cd8d SHA512 a82f4821d479c824947f24f8bcb9d2159c57f9f624f27d4a4de188b05294fd7310e0a847a2d156d4b134eec277234470e314a093e7f25ffb743ce1ca93a83829
-EBUILD webstorm-2017.2.4.172.4155.35.ebuild 867 BLAKE2B 67f797ecb788bdf201e794d6df96487245bbd9c008fe07f8544f85a456a589344fb7bf20a8db51e80e96dffb3a48636e490ab972308eb4be802cea8a2554ca93 SHA512 27673ce1fe7ea8cc047b9bdb3a07852f992dd36461ce022ef050cbf57c5ef23b2c0092c603f881133cd0a4f7ce2246797f99aff85590776f286111c3a042f22a
+EBUILD webstorm-2017.2.4.172.4155.35.ebuild 962 BLAKE2B 4d02ab25da40ac32e7f459000739b4c7790bb8ed668afe4782877316750387634d4a9b26420e7d6ac61caaad164d968e97103b23d4ac77773d204cae8c18db97 SHA512 efa137495db4eeb93f46494bc00f2c5695f31ab58891efc0baa7ad048ce993eb7e3e020c121090cfd23d12ad533ab9216b2bd0b5b9af635a603b918fa9e97c1b
 MISC metadata.xml 353 BLAKE2B 00bc5dc6cf44dbf5b4efecf6f8960fed13737d92ecd2813af24d696a88a3d9fe63789584b4afe8ec6cb2068c77066f5c3260af9dc243dd03b2f85b3cd3bb902b SHA512 141b9620fe7a3839c6fdf2dad646948e413c85c3a9b1ae15aa2582db0af57461f741c038127627873d02c62411262cbbdc7dd21705ea304bc3072ae3491bdcac
diff --git a/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild b/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild
deleted file mode 100644
index d281ef919c9f..000000000000
--- a/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-MY_PV="$(get_version_component_range 4-5)"
-MY_PN="WebStorm"
-
-DESCRIPTION="JavaScript IDE for client- and server-side development with Node.js"
-HOMEPAGE="http://www.jetbrains.com/webstorm"
-SRC_URI="http://download.jetbrains.com/${PN}/${MY_PN}-$(get_version_component_range 1-3).tar.gz"
-
-LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r .
-	fperms 755 ${dir}/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-}
diff --git a/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild b/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild
deleted file mode 100644
index c01948942f74..000000000000
--- a/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-MY_PV="$(get_version_component_range 4-6)"
-MY_PN="WebStorm"
-
-DESCRIPTION="JavaScript IDE for client- and server-side development with Node.js"
-HOMEPAGE="http://www.jetbrains.com/webstorm"
-SRC_URI="http://download.jetbrains.com/${PN}/${MY_PN}-$(get_version_component_range 1-3).tar.gz"
-
-LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r .
-	fperms 755 ${dir}/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-}
diff --git a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
index d7dca526f308..4171a9a4f433 100644
--- a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
+++ b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,10 +10,14 @@ HOMEPAGE="http://www.jetbrains.com/webstorm"
 SRC_URI="http://download.jetbrains.com/${PN}/WebStorm-$(get_version_component_range 1-3).tar.gz"
 
 LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
-SLOT="$(get_major_version)"
+# This package cannot be slotted for now, bug #592636
+#SLOT="$(get_major_version)"
+SLOT="2017"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RESTRICT="splitdebug" #656858
+
 RDEPEND=">=virtual/jdk-1.7"
 
 S="${WORKDIR}/WebStorm-$(get_version_component_range 4-6)"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 5aa530c50bdd..da33438bf049 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index 81b0406d2771..f5ac210c5819 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,5 +1,5 @@
-DIST cvs-fast-export-1.26.tar.gz 668913 BLAKE2B ff2437eb55ae909666f94d79475e3ccf8db0b9491c439094090bc0eda3ef300b99becb7811aa824aced47039686df0d23c9307b3f35ac3d3cad88e78ce93c549 SHA512 81d240ae387b4231415335b4a0d294ae81f6ecbc97077d92a1738aca17642b9a7e7ee3f7806890ceafc5c65c50d4370c39c36ee21c927a4fcd30ebfa3bbe472e
 DIST cvs-fast-export-1.38.tar.gz 396524 BLAKE2B 41e7d5210671aae9063d3fa1da8a61ff581cdbe6745573d158576e495aeba0958d1cf20c9d8435e0c12747428b884eeab3b2d926a93d580589f17db8102ad27e SHA512 ed2aabc417b093c1742ea15bd21855c600a46a5ab72758d15bab24672b6e648531416a6b28c17e6faedd67b4c697b004ba3316cd65cb0ec638566c26878e9428
-EBUILD cvs-fast-export-1.26.ebuild 794 BLAKE2B 5aafa185f36adf6ab5547fc575bde8e55f061e672b4f228aae3fde73e659452350ee380c759b88b64b3acd74d5dad737a5824728d22d9d794e2fb2a40ba5b45c SHA512 e1e355dac05704aae672a3cbd250482583aad85fb6717c4a30ae65341300b2abb4b88377c7de0f35777058abf809f68c0abe7ee7631a5378a47344d020ad6df9
+DIST cvs-fast-export-1.44.tar.gz 512435 BLAKE2B 2dfcd34efbf400c9d9a726933a18504a8d241928646d73f54f1860d1580030fa0328df4aaf5b57f1fbdc4b7b2c0a988ac903c8f9f03384515fdd5241fbf51c06 SHA512 66209589c692d2b0b2e60494386cb4dbae04f5f6676c89733d3ad6e5ce8b76d3cb70d7b03430be643e44eaff5848fdb7413795e10716a9ed8b4f2a4043f822a5
 EBUILD cvs-fast-export-1.38.ebuild 794 BLAKE2B 5aafa185f36adf6ab5547fc575bde8e55f061e672b4f228aae3fde73e659452350ee380c759b88b64b3acd74d5dad737a5824728d22d9d794e2fb2a40ba5b45c SHA512 e1e355dac05704aae672a3cbd250482583aad85fb6717c4a30ae65341300b2abb4b88377c7de0f35777058abf809f68c0abe7ee7631a5378a47344d020ad6df9
+EBUILD cvs-fast-export-1.44.ebuild 936 BLAKE2B 9e127e6c4aeb2990c431cd0730c6d639d3becbadbb89dc879d48763fcf34450b899f6668de986ae5698b62afd80d5c1b0d4e52a8ed8aa76f634592cf407987fa SHA512 613e331d0054271bb3f2f6e67e16bbe2561b2e7e2f202662b71145f08fe4055657fd6621358a953b0772dc04820e86259630014a9f845fbcfb76754cfcb080a9
 MISC metadata.xml 333 BLAKE2B abc76cd8de16656f7017b18c9119941bc5ae73cef7381c664f5580584c1e8e27b4833d6f8e7e514fa0c80470c81b4ae11957fc75dbf735d83fba0307321b3a73 SHA512 d33f6487d5ec4d5b76132cb761ddbba1db898f72502ae8afaf011090bc1bc53ae26f4c8bd335b9faa146dbb703f816c949cdcd35a3384ba03b03069d654b6955
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.26.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.26.ebuild
deleted file mode 100644
index a66e4a649d37..000000000000
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.26.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="fast-export history from a CVS repository or RCS collection"
-HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
-SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-text/asciidoc"
-
-RESTRICT=test # upstream does not ship them in tarball
-
-src_prepare() {
-	tc-export CC
-	export prefix=/usr
-
-	# respect CC, CFLAGS and LDFLAGS. don't install cvssync
-	sed \
-		-e 's/cc /$(CC) $(LDFLAGS) /' \
-		-e 's/^CFLAGS += -O/#&/' \
-		-e 's/CFLAGS=/CFLAGS+=/' \
-		-e 's/$(INSTALL).*cvssync/#&/g' \
-		-i Makefile || die
-}
-
-src_install() {
-	default
-	dodoc README
-}
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.44.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.44.ebuild
new file mode 100644
index 000000000000..37967a3e1452
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.44.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast-export history from a CVS repository or RCS collection"
+HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
+SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-text/asciidoc"
+
+RESTRICT=test # upstream does not ship some tests in tarball
+
+src_prepare() {
+	default
+
+	tc-export CC
+	export prefix=/usr
+
+	# respect CC, CFLAGS and LDFLAGS
+	sed \
+		-e 's/cc /$(CC) $(LDFLAGS) /' \
+		-e 's/^CFLAGS += -O/#&/' \
+		-e 's/CFLAGS=/CFLAGS+=/' \
+		-i Makefile || die
+}
+
+src_compile() {
+	# '.adoc.html' rules can't be executed in parallel
+	# as they reuse the same 'docbook-xsl.css' file name.
+	emake -j1 html
+	# Allow full parallelism for the rest
+	emake
+}
+
+src_install() {
+	default
+	dodoc README
+}
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 2dfeb2f94c6c..b5a2fa166970 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,7 +1,5 @@
-DIST fossil-src-2.4.tar.gz 4919205 BLAKE2B 35009cffc757b6ea153faf89525cae4463a2169dace090183b9dd6955a615a04363576295e4b24652ebec7f20772ef9d83c6b9af29f68bd5695c56b88cbf77cb SHA512 de7f2321677df7f6dc2a3a20e58f456602d938f40125ef33d401f28cdaa93e38d3db10e109547df269bc95a2ac8669ade05b6fd6fad39e6633f15ffdd91c499f
-DIST fossil-src-2.5.tar.gz 5036719 BLAKE2B b25067ee79793343a017dee28d3ee2b5eb257118a1e334932c6413971f83517ea0cfe570008c35ac4318b52982cb1129ab91eb3380a7f491f09c29cac46a756e SHA512 ee5d8708c91457b7b4d4bada15504e27016a096f0527a81c983c493531d226beb8e4b7aa84b0d764a5404342b8fd2c4dc3196426c9fc8b9c612e1940dd8bde1f
 DIST fossil-src-2.6.tar.gz 5083119 BLAKE2B 7d5cbeb072c72574b9f4fcbc87f9aeaa1db7964f961aa206a04bf64d73782bd6d51f2a19973fa4125969c864031cf78790a67acd32c5e8f209fe1211410a6af4 SHA512 a4f3b2ee696a7f156a295672c17e8ec63737a85cee5d47b1f66a9d45a6011006ed0a075082b5e06e5d75d59babef493d1815ec45f8ae99f42ed1a1c7a2447b1c
-EBUILD fossil-2.4.ebuild 1488 BLAKE2B 02539210e2eb47e7aecfd9aa0e46a9b9e6061501d3252e997f5ecef94a50fc54b9b8d2e4e96c33c464e92b419fec5bd07938329f044515cedcf4bfae5bc93d69 SHA512 fb5ec8634fc9e147d962840d8000871d42f93edc58a361253ec5e5d287ba2aa59e99d24cc1555f0eb090e02ee0626233a11b357b90c41ef2b8006d2038db88ef
-EBUILD fossil-2.5.ebuild 1537 BLAKE2B 6f1f97c89e738ec97c41090c366f28eafed84459c6465ef80905e1fca8e4a0f62641d1e328a589ae768a02cda42158fe0be2936c1d3d5f0796cd26ef1417618f SHA512 77eace4a15a198040d85e7b2defdfb38f8cb1c4cc37c678911da6c5db0e425c4ad52ac558ac0923dab485ab126d3ea522032d851c52fda842ca29b752b05d8d9
+DIST fossil-src-2.7.tar.gz 5276161 BLAKE2B 7a8a81515075be6d3fc68dac7a293a1ed6b46c0ed2ecf180269d7215e6cc16d796206b648588ab5b6e04176c553cc89556deb5e47683de1eb26ab7469a8c75c9 SHA512 c1f52209bf14cb1b0a134b03fd02926c123bfd38d9b0d45f39d3137f3df2be13371f38611dc66d1d7df71d95c79baf26e66ccb845c769a57b9568629cdd52672
 EBUILD fossil-2.6.ebuild 1529 BLAKE2B 413e59815f2aeac2d78a80747f35ad135837d304fa65efe9fba934cece7a781d611365e263e96b427c75b656c9b735ccbf11952cbf3d3eab2abe20db983d3bf6 SHA512 06e7f2788aadd5854145427ca7ff5b06639835442deb57c7df23006562269c040d7b23fb3bf27a31677000732743924ae53e61e96583d5acdfa7a46b3cedcf3e
+EBUILD fossil-2.7.ebuild 1537 BLAKE2B 7bb067048913292138858360e19df813604a7fcdafe2e2c295e17a463eff7497321fefe2c95035867b9a73c059837593986c784d4b5a709f619e10b1222acec1 SHA512 69116a763d282c2dd7a49a3d1c1a71eb3550a908a6731ad51c1e10ca0566c8f94fbf7b8b9d58e033e69cbb873dc47e6720806e6e93aef1e4097589054a42821c
 MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.4.ebuild b/dev-vcs/fossil/fossil-2.4.ebuild
deleted file mode 100644
index cd6f4caf4918..000000000000
--- a/dev-vcs/fossil/fossil-2.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="http://www.fossil-scm.org/"
-SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
-	  tcl tcl-stubs -tcl-private-stubs th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-DEPEND="
-	sys-libs/zlib
-	|| ( sys-libs/readline:0 dev-libs/libedit )
-	system-sqlite? ( >=dev-db/sqlite-3.20.0:3 )
-	ssl? ( dev-libs/openssl:0 )
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="${DEPEND}"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug         && myconf+=' --fossil-debug'
-	use json          && myconf+=' --json'
-	use system-sqlite && myconf+=' --disable-internal-sqlite'
-	use static        && myconf+=' --static'
-
-	use fusefs || myconf+=' --disable-fusefs'
-
-	local u useflags
-	useflags=( legacy-mv-rm miniz tcl tcl-stubs tcl-private-stubs
-			   th1-docs th1-hooks )
-	for u in ${useflags[@]} ; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	tc-export CC
-	./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.5.ebuild b/dev-vcs/fossil/fossil-2.5.ebuild
deleted file mode 100644
index dbba71f4ebb5..000000000000
--- a/dev-vcs/fossil/fossil-2.5.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 toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="http://www.fossil-scm.org/"
-SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
-	  tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-DEPEND="
-	sys-libs/zlib
-	|| ( sys-libs/readline:0 dev-libs/libedit )
-	system-sqlite? ( >=dev-db/sqlite-3.22.0:3 )
-	ssl? ( dev-libs/openssl:0 )
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="${DEPEND}"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug         && myconf+=' --fossil-debug'
-	use json          && myconf+=' --json'
-	use system-sqlite && myconf+=' --disable-internal-sqlite'
-	use static        && myconf+=' --static'
-	use tcl           && myconf+=' --with-tcl=1'
-	use fusefs        || myconf+=' --disable-fusefs'
-
-	local u useflags
-	useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
-			   th1-docs th1-hooks )
-	for u in ${useflags[@]} ; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	tc-export CC
-	./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.7.ebuild b/dev-vcs/fossil/fossil-2.7.ebuild
new file mode 100644
index 000000000000..f41e164254ff
--- /dev/null
+++ b/dev-vcs/fossil/fossil-2.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple, high-reliability, source control management, and more"
+HOMEPAGE="http://www.fossil-scm.org/"
+SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
+	  tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
+
+REQUIRED_USE="ssl? ( !miniz )"
+
+DEPEND="
+	sys-libs/zlib
+	|| ( sys-libs/readline:0 dev-libs/libedit )
+	system-sqlite? ( >=dev-db/sqlite-3.25.0:3 )
+	ssl? ( dev-libs/openssl:0 )
+	tcl? ( dev-lang/tcl:0= )
+"
+RDEPEND="${DEPEND}"
+
+# Tests can't be run from the build directory
+RESTRICT="test"
+
+src_configure() {
+	# this is not an autotools situation so don't make it seem like one
+	# --with-tcl: works
+	# --without-tcl: dies
+	local myconf="--with-openssl=$(usex ssl auto none)"
+	use debug         && myconf+=' --fossil-debug'
+	use json          && myconf+=' --json'
+	use system-sqlite && myconf+=' --disable-internal-sqlite'
+	use static        && myconf+=' --static'
+	use tcl           && myconf+=' --with-tcl=1'
+	use fusefs        || myconf+=' --disable-fusefs'
+
+	local u useflags
+	useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
+			   th1-docs th1-hooks )
+	for u in ${useflags[@]} ; do
+		use ${u} &&  myconf+=" --with-${u}"
+	done
+
+	tc-export CC
+	./configure ${myconf} || die
+}
+
+src_install() {
+	dobin fossil
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index dedd77ab2955..d3ae999af097 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -34,7 +34,7 @@ DIST git-manpages-2.19.1.tar.xz 431852 BLAKE2B e15be2e1680a28c3c57e7b6e022173ef4
 EBUILD git-2.16.4.ebuild 19308 BLAKE2B c9b9a129e60c18afca00af335bc8098ee24c7ab767d69b75453d5dc223c1d885f6b199868b0155a961eacb39b79bc7d0d9d918f17c581923fec0a352d3e83004 SHA512 b333154f1ed1d0f568f9ca2de3b2ff27210c14ab7e5a6bcf5893eefd1da22578a75b88b18226fd099a21b7768d629f7f08fe3cda49283c5f3ff99d63c9352019
 EBUILD git-2.16.5.ebuild 19321 BLAKE2B 705159518a346d42653fb45e37e4279d774a64aee81d5171b5c4a66f3f3b7b3cac2c53ca387aa44564d877f78f9c42bc7b3877c6fbac8e700c40df729f889088 SHA512 03336f2ebf3d1d269b2d901eb0d8a6a2465b4a897e633a4a1319ef2344160a0cc3f97e3ef90b89a438f8ab8f406a86e76fe54d3111a2656592deccdb16deec0f
 EBUILD git-2.18.0.ebuild 19285 BLAKE2B b063979032d0f4dbd7b60a83a1e9f911b22dd713ca44f5d3574218e2d8df5688fc7bcab53d879738d2b9f1f904fdf2ba2311aa04737404c0fd46290d3bccaa09 SHA512 e71875cd6015c6a7e38973877e6d5d8856a323577ecbf18c8cebc12e18ae1702044b624e3b4ef2410d1003c4761509e47ae0f93b5bc1a68fcc562c1f7841bcd5
-EBUILD git-2.18.1.ebuild 19292 BLAKE2B 363d21d85e7290ab85390bcf930f4ed6d8e41c0a23eb0eab6cc0477d984915113970790d08b9e504a938e9f0cd5be7430c909a28e7b79527ad85577a664ebeb5 SHA512 9350f9a6b52935a74b6506650387954b64d97626978785e887f14fdf9f0826b8c956468663775a5603fe2a5884c0da021787ac31f216a6da47b19f4012e57a76
+EBUILD git-2.18.1.ebuild 19282 BLAKE2B 4925b4c9f8ef0ecdb58d655a832dae2056e35a3f3f343fadedaab1ea04c3937ed2a6a299990da76013685a6d73891c9687c2128ec24c54ab2cf9ccd43a816eb9 SHA512 66025589d1b8cf81676aa6d12e10b0876ab8f0bbab8d58b4ea42c1168bdcd73ba081d6c2733a8a7517f7233231ae2efe54aa0f8dafdaf6db147a7e04c02c6364
 EBUILD git-2.19.0.ebuild 18970 BLAKE2B 288408e8e20bbb5b16e714d366af4573b88c906a5af70e9f53c5c1f3dd1f80d7682295066aa8a0b8cde5feb12eafc1e292e63786bed2455e33e58770935be849 SHA512 de17312e00f2c9c412b98056a565329a237960a2a80c0769d4a9481fb10bc3b9273b39ad924fafee08b358165aef161208e5e308a13e5c8d9dc1a678247dbb79
 EBUILD git-2.19.1.ebuild 18970 BLAKE2B 288408e8e20bbb5b16e714d366af4573b88c906a5af70e9f53c5c1f3dd1f80d7682295066aa8a0b8cde5feb12eafc1e292e63786bed2455e33e58770935be849 SHA512 de17312e00f2c9c412b98056a565329a237960a2a80c0769d4a9481fb10bc3b9273b39ad924fafee08b358165aef161208e5e308a13e5c8d9dc1a678247dbb79
 EBUILD git-9999-r1.ebuild 18970 BLAKE2B 288408e8e20bbb5b16e714d366af4573b88c906a5af70e9f53c5c1f3dd1f80d7682295066aa8a0b8cde5feb12eafc1e292e63786bed2455e33e58770935be849 SHA512 de17312e00f2c9c412b98056a565329a237960a2a80c0769d4a9481fb10bc3b9273b39ad924fafee08b358165aef161208e5e308a13e5c8d9dc1a678247dbb79
diff --git a/dev-vcs/git/git-2.18.1.ebuild b/dev-vcs/git/git-2.18.1.ebuild
index 2f2de4ae7ec0..41553b31f139 100644
--- a/dev-vcs/git/git-2.18.1.ebuild
+++ b/dev-vcs/git/git-2.18.1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index cc2097113f7b..ba9d608cc05d 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,3 +1,3 @@
 DIST gitg-3.26.0.tar.xz 1551308 BLAKE2B 45a9fd3df8eb891c4e07eefb6cf8f9b517c78dccc63dd08498b4c847614e164472e0605a01c81515ea349366e56c21c99a4558e73b6548b18bb94f578c0fc9bd SHA512 782aa02e2f0f4d8c86ad726045502d545877d835f0449d2ec646d93a78bbfa50f84662d3a437c922eb168b2737c00ec088dc2c73487742f332e3910f041b519d
 EBUILD gitg-3.26.0.ebuild 1927 BLAKE2B 97bb1f4da59bcf28643516ca55e054fe6405765dee0ef2bd70cedf6fc29ec2d422767d4dce420afe5900e5759e4f1b82d0b88b971e4ca59cfee9cbfe1e7b53f2 SHA512 fd96b0f937e1beaba697bd5449f6cf916809d4e121594acf405cdb98a156dae4f640ac2972f768cfb213649455948f3d008218fe7a7e0c052686be43185db217
-MISC metadata.xml 700 BLAKE2B f8330088988ad7eecd0dd8fa3f92fa9a22647e5c3a410051e0623124d2ab2bdc140b5330661124638bb2fe2d7c43b272004f07ce0bc344dd42a563b38ff1c15e SHA512 f5277e8ce7d17576ab50cbc5dd7694a9adcff03340029156915a085ada0bcc34e0366fbefdc9f4de0030694c8ce48d2d1baef62ead4650309c2af2def0309d3e
+MISC metadata.xml 927 BLAKE2B f967c30f2442bbbef782e69c044900db8bd733c5463b2aeff35496225be549827e8e8f9b7d072ae9396500cdcaecc9f7b4902524b5a3768848736d0bab8adc35 SHA512 889733c311b2ab0e35aadc3fff1bcb50c3dad59186293e2f46e81ba4a0041137938e38f12bcfa40d793a04462bbce25aa476bc9241fb5c7a5c4a25611e371d30
diff --git a/dev-vcs/gitg/metadata.xml b/dev-vcs/gitg/metadata.xml
index bebf2c542746..a059337e3d3f 100644
--- a/dev-vcs/gitg/metadata.xml
+++ b/dev-vcs/gitg/metadata.xml
@@ -14,7 +14,10 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<longdescription lang="en">
-		GTK+ based frontend for GIT
+		gitg is a graphical user interface for git. It aims at being a small,
+		fast and convenient tool to visualize the history of git repositories.
+		Besides visualization, gitg also provides several utilities to manage your
+		repository and commit your work.
 	</longdescription>
 	<use>
 		<flag name="glade">Install a glade catalog file</flag>
diff --git a/dev-vcs/guilt/Manifest b/dev-vcs/guilt/Manifest
index 10b7b19397e9..06f21add9946 100644
--- a/dev-vcs/guilt/Manifest
+++ b/dev-vcs/guilt/Manifest
@@ -1,3 +1,5 @@
+AUX guilt-0.36-fix-help.patch 1192 BLAKE2B 1e2802baf7aad902f180a8b477cf163c383cd59033dbe6863f3d8dc83a34effdeb46f6e800fd377605bb4d6f295dcf63dac765eee0ec8315b5a7b8e497b5f447 SHA512 2dcb6db0ee356b1cf4366a25f82abf6c9170b424fe3884d7b3259b6363afb9966c0e33b6b8bf5707feb229dc75f0555b02506ff7b26a8ec3ead206e6fdc8bd6c
 DIST guilt-0.36.tar.gz 64624 BLAKE2B 8514f0fa6c7dd96e3a8c90939046b45b2e3115f2361a428ad58e1c67db0cc73cab1304a1493a45b1fda2928cc8a03b03e2986c845c826bcd7b491d264d3d1333 SHA512 882438d5b9ed4d16e3dfc95ddbef6ec1d76860d82aa6abc78010351577fb65578f919c6fe55f9d7593c82b0eae2d0dd80d577eee906fff84a426391936242652
+EBUILD guilt-0.36-r1.ebuild 1268 BLAKE2B 1f6638707e01445d6f6f65f2f886f1c47d0014d6c334ae4ba6c52efcb531f538a7868b3a52e8f39b2a0c5ac914e4fd164d1ad43d518bfd75b46d3dd173c05791 SHA512 2a60e039768800872b8314f8631518d0cb06d2c5a8db6b3529703af382804f71949ae5360fefc390c91a2ce6a7f7b4879e73f9d6bb05fc63b9c9997a7cd7eede
 EBUILD guilt-0.36.ebuild 1224 BLAKE2B f00929b77ab0b0a48f2f965bc763bcef45ab60d703ea1e6f93204b3befb80f31c7b4b723ee1a564a5da028de405d74dfc899a055a3b2339f13c6dea681081576 SHA512 de51109ca240eed4c23d98fccc088faa4151b7e8064dafdffa9ddc528397c90b0692a02a090703b44ec8a0579d4eda13eedf39ccbeacc8f1c68058aa6f2a2aff
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/guilt/files/guilt-0.36-fix-help.patch b/dev-vcs/guilt/files/guilt-0.36-fix-help.patch
new file mode 100644
index 000000000000..31e81bdb90e2
--- /dev/null
+++ b/dev-vcs/guilt/files/guilt-0.36-fix-help.patch
@@ -0,0 +1,41 @@
+From 53db96dd0c37b2fd299a26a00ba9b6f53cf6224e Mon Sep 17 00:00:00 2001
+Date: Thu, 28 Dec 2017 20:01:08 -0500
+Subject: [PATCH] Fix broken guilt help system
+
+  https://bugs.gentoo.org/642584
+---
+ guilt      | 4 ++--
+ guilt-help | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/guilt b/guilt
+index 35177b9..498dfb6 100755
+--- a/guilt
++++ b/guilt
+@@ -73,8 +73,8 @@ GUILT_PATH="$(dirname "$0")"
+ 
+ guilt_commands()
+ {
+-	find "$GUILT_PATH/../lib/guilt" -maxdepth 1 -name "guilt-*" -type f -perm +111 2> /dev/null | sed -e "s/.*\\/$GUILT-//"
+-	find "$GUILT_PATH" -maxdepth 1 -name "guilt-*" -type f -perm +111 | sed -e "s/.*\\/$GUILT-//"
++	find "$GUILT_PATH/../lib/guilt" -maxdepth 1 -name "guilt-*" -type f -executable 2> /dev/null | sed -e "s/.*\\/$GUILT-//"
++	find "$GUILT_PATH" -maxdepth 1 -name "guilt-*" -type f -executable | sed -e "s/.*\\/$GUILT-//"
+ }
+ 
+ # by default, we shouldn't fail
+diff --git a/guilt-help b/guilt-help
+index 93442a3..b29e059 100755
+--- a/guilt-help
++++ b/guilt-help
+@@ -34,7 +34,7 @@ case $# in
+ 		;;
+ esac
+ 
+-MANDIR=`dirname $0`/../man
++MANDIR=`dirname $0`/../share/man
+ MANDIR=`(cd "$MANDIR"; pwd)`
+ exec man -M "$MANDIR" "$page"
+ 
+-- 
+2.13.5
+
diff --git a/dev-vcs/guilt/guilt-0.36-r1.ebuild b/dev-vcs/guilt/guilt-0.36-r1.ebuild
new file mode 100644
index 000000000000..ab2b064429e9
--- /dev/null
+++ b/dev-vcs/guilt/guilt-0.36-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A series of bash scripts which add a quilt-like interface to git"
+HOMEPAGE="http://repo.or.cz/w/guilt.git"
+SRC_URI="${HOMEPAGE}/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+# Since we need to build the man pages anyway, I don't think it makes
+# much sense to hide the HTML docs behind USE=doc.
+RDEPEND="dev-vcs/git"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	dev-lang/perl
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-22d785d"
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/${P}-fix-help.patch
+
+	# The doc makefile tries to shell out to `git` for the version.
+	sed -i Documentation/Makefile \
+		-e "s/VERSION=.*/VERSION=${PV}/" \
+		|| die 'failed to set VERSION in Documentation/Makefile'
+}
+
+src_compile() {
+	emake -C Documentation all
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	dodoc Documentation/{Contributing,Features,HOWTO,Requirements}
+	emake -C Documentation \
+			  DESTDIR="${D}" \
+			  PREFIX=/usr \
+			  mandir=/usr/share/man \
+			  htmldir="/usr/share/doc/${PF}/html" \
+			  install install-html
+}
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index 9614ef40f788..336aa5a7a557 100644
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -1,6 +1,5 @@
-DIST hgsubversion-1.8.5.tar.gz 179639 BLAKE2B 3fa5dd690e404837ccca7efeef7d873c579f717aaad274bed594aef751338450b347d8e82d3a139d00206e12a6c3979d18355be6c2c3a7ae23d01f51c3be09e8 SHA512 1d3f0824c3b83a2e00485ef3f412767bdb378a5a545f2fcf533eafebb20cbd40becf54cf9a29705200d221d6d6c0eb284fae0692354b1795feb391de2a02ca0c
 DIST hgsubversion-1.8.6.tar.gz 180720 BLAKE2B fc3cb8b3b4298a11eab4e7374615b80c7653449efd39f7ac48663a211988654bf173dce7016d8c40efbb60d55ed8884680a2139461fea1537c459cdcd807c176 SHA512 8431e995a9f2c150936af004527fea6d562a34c653af6d51e69afdb10397528bbe7f230d92b18c3d04e2315c7b0078ecfc1bd619be4c2540bb564d50092566c4
-EBUILD hgsubversion-1.8.5.ebuild 971 BLAKE2B 998c16b40e54cceb14093685f1d4bf19ff743ff686294cc206619735509c15e37d88306cd33317d4f8606bdf336d6ba02c6b5be050697e69c4d2bf387b91a803 SHA512 d6d0e5ca08ad8a16a6491be4eae2efa1a058d66716b7b5c9cc04f0a91df91c0ca680ce29a63262c7cf7bcce5fef984246f836e0f7874c25f29c411d22a0fcd52
+DIST hgsubversion-1.9.2.tar.gz 203801 BLAKE2B dd8f53baf1d12263be1dde75b2a0a9367ea038bc4655322ac8e89c5fafe67cd42ab94f83b2eda2ff28f521b8ef7ecb5034dad0916bb2fdfadeee68e52f75e348 SHA512 e11e0db50702d0fa0c29ac75bde8f943551ff392218656f82672c25635b43ed17d26026af106723875165806577881c268ebb5fb82954add599dcb14b13e4744
 EBUILD hgsubversion-1.8.6.ebuild 971 BLAKE2B 6b2f602f4a6972fada4acadb04488edc2bfaa3951bb84d65a645a5dfcebfd3baf4931bcea716657b1c3c2691872832aed8827b8906d8c0b13dd525b1073503ef SHA512 1c3dcd2b6f6ea852a0b3ed4ff81f1968551a355270809c139522b90b16e9bd93877b9cd70fd4501399af90155f607f3403e3b44f76e4738b3148adc357416351
-EBUILD hgsubversion-9999.ebuild 747 BLAKE2B cea962df0ed0feaa4ae4515df5d44215223f65ae1f679656fe36a49ebb0470f0d3965343c33828d0a9caddde2036c414df2344b9f1c2c4e8a8d0e4fbb96e9fa4 SHA512 cacbb889c5853dc8a9aa17905bd58f5c339bfff94f75f97b9d2d6a90d82f308fd184e95eafaa3fda9cfc822a746d5b3194ee4374e9cc88a054d8fc3645d387f1
+EBUILD hgsubversion-1.9.2.ebuild 937 BLAKE2B 263e28b40a2f8527eeafcc11294122110e18e5d13cf0b5132e8007de2738b47f8e8a96195e476a594e49809fe07426e6cb2c874f74021190326f4271280ab03f SHA512 b8e27d3a61327e5770a667684fc9794fca5c060b1105e17f2d4d64c0ff058d47169f1cb588025eb5370d045e23dd85bf94575341c5ac85f330eb6be2ba9d3a04
 MISC metadata.xml 305 BLAKE2B ae280ffce2435476e46877db066a5967861112aef4cbde989981b8d01919e32706a758691ba0f085015eb681c2a55b2a601313bd9d9d9319497037e689d55bb8 SHA512 a5d7eb8c02ff08bf50591a24a4b0b76a76e799fe5903a27c8a648e1ab839f28135f6f16eac2ba557006936dabadfb08543c203fe0fcb3ff8f89f62e63fdb300f
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
deleted file mode 100644
index a10a7ca95686..000000000000
--- a/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-
-# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
-RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
-	dev-vcs/mercurial[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
-		>=dev-vcs/subversion-1.5[python] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( README )
-
-#python_test() {
-#	"${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
-#}
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild
new file mode 100644
index 000000000000..fdad0a29f398
--- /dev/null
+++ b/dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
+		>=dev-vcs/subversion-1.5[python] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+#	"${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
+	# Upstream is using nose and the other way simply runs no tests
+	LC_ALL=C nosetests --verbose || die
+}
diff --git a/dev-vcs/hgsubversion/hgsubversion-9999.ebuild b/dev-vcs/hgsubversion/hgsubversion-9999.ebuild
deleted file mode 100644
index c3c40ed2703f..000000000000
--- a/dev-vcs/hgsubversion/hgsubversion-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 mercurial
-
-DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/"
-SRC_URI=""
-EHG_REPO_URI="https://bitbucket.org/durin42/hgsubversion"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-
-RDEPEND="dev-vcs/mercurial[${PYTHON_USEDEP}]
-	|| (
-		dev-python/subvertpy[${PYTHON_USEDEP}]
-		>=dev-vcs/subversion-1.5[${PYTHON_USEDEP}]
-	)"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( README )
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 5160608b7ef5..79490384c8ff 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -4,11 +4,11 @@ AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd
 DIST mercurial-4.5.2.tar.gz 5779915 BLAKE2B 9abc5a8bafc43bc8e930bb51aa2e57397cd5858dc7bb31d9a37795a4e2799dc03b57130b23e29f89a07bd7502f136594a03d1a4bd5dfd04e2e968213b50413da SHA512 f70e40cba72b7955f0ecec9c1f53ffffac26f206188617cb182e22ce4f43dc8b970ce46d12c516ef88480c3fa076a59afcddd736dffb642d8e23befaf45b4941
 DIST mercurial-4.6.2.tar.gz 6407989 BLAKE2B 22aa121b2544e3597f2ea4d3a7a80b3b8f5ca6f9de15326dbee555ca3d14b8a552042c4448aae17b1c015b4f302c3512c204f17a834b758f51fbcc2455ed4e6f SHA512 71afb9ed3f62b1b946563c55851dda1fc8b724afe82a4a253c7f4719ae9e1160d5f9644bed7fd27ee3a21d8e682352364fc9f47bafa552cd4cd7fac7c0d42bdd
 DIST mercurial-4.7.1.tar.gz 6480135 BLAKE2B de34cdd34d5fa2a6f4e1f24730c99b5764b9ac15aef21284337924d13bd5b4b14684d729149c4b48bf8fde13679cf661d92da968943c3f04ea065729df42318c SHA512 04d3f97dd4a0f36c6f6d639d8eccc7e4f29b2dc211fa69e7fc17dae0eb954f2ddaaf04f70facc6b968a166db7c07ed80792575d7a27e80bc0c1a43fc38b5e536
-DIST mercurial-4.7.tar.gz 6476268 BLAKE2B e13458729f06a2516e885abf767989e8df7f3cc743f7f57aa44ca41c6c2c4542a28e6172a7e109395fb76057afc04c2318b10f8b21ae90cb5c9efe6188da0483 SHA512 a08dfc4e296b5d162097769ab38ab85b7c5de16710bce0b6dce2a39f56cb517455c0ed634f689d07e9bd082fb7641501b7da51963844aee7ab28233cf721dec8
+DIST mercurial-4.7.2.tar.gz 6481684 BLAKE2B 1006e541b52148f44b14767a738f4add4d03c719bc6f96f3f245f6bfd401223b1e7444216304fba749b88611cd031cb14089d9938a5533477160226286dd401d SHA512 e8742e9555a6b57e96e61091757b4bcb574605c49082874bd4edb9114a70e5cb024c1360a75c24f1a9ae3bca3205316e6a264ae18d3c9946248bc1d2b042ad43
 EBUILD mercurial-4.5.2.ebuild 3536 BLAKE2B 6ad1f105178987b408397b9593ac8c980435363597625402a0e67afdc10d55cc4477ca85dea764d860cecdb8bd68ee13afc66cf6203ae96f1a3b5363b93e0e74 SHA512 766576864da5700f107a530f1a06fbf33d1d593597ad236ad841d3ba59774c4aedf3e43dda00a86b1894f99c03f7af228d8026363d81a2c3b0b8ab98f22c246a
 EBUILD mercurial-4.6.2.ebuild 3537 BLAKE2B 7f4c2e4c579ab768dd629d53b2fdf1062980405242376c727b05a8a474d6bc8afb4db0f82e22252dde24b6909f9ab87d8650ed73600e6dc01ae4ef2fdcfc71cd SHA512 1549175116f2496ae8bac35360b142c9ae95d458b764496648eeb9165fd79fd030bfcb0386df61a568a7d8536f8e846a9b127f22fe2937ccac5982135e89cf14
-EBUILD mercurial-4.7.1-r1.ebuild 3632 BLAKE2B 6b61aea5806ba482aeab755dfd0630113bfbdbed7cf47920d9b82c10a3ee28bae44e1e47736ded7f66350354a449a33ecd01dea1c5a489a318602061de31b2e5 SHA512 9454a4876d4f284a4400e12c4234401a703d00c30753ca771b0f605c948e47267ee98bc95d7c760b9a71d4c0befdd2fdad5f329f78ff26e9919c3ec0247289ef
+EBUILD mercurial-4.7.1-r1.ebuild 3645 BLAKE2B 0a89f10a7205aaedd01be6efc216f7b6e3a9da54d02ff1d32a9f3b7bdfd2eb1491a854c2ac7447f43da71a8d045aaf48f811ac28458208c85a57d8834b72a55f SHA512 06d522f750227739d3f283a3805c92da5f42709cb289a543cdb319e6f386b990439086925015a7ab14b02dfe4e55914446b42de4c89f53e124693cfc2fcb8e91
 EBUILD mercurial-4.7.1.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2
-EBUILD mercurial-4.7.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2
+EBUILD mercurial-4.7.2.ebuild 3719 BLAKE2B 5b0a9f14f75a10b412beab259e34687c88681879b37644bae27c3b5ebab0d85cbaddf3e2da2606a35c52a8b426fc8efba829af6a6feda77b9dae7f6c5011ab7d SHA512 59d23040a87f893a62d35b379d286a6d8d8f0a8262f91842e4a46d165ac6ae9a9bf9f27b8c5e7b817292962e4d92c87b0fb6b22f1ee1a483f23a750f43b0248a
 EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08
 MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1
diff --git a/dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild b/dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild
index b831a8157e2e..17e3450e659a 100644
--- a/dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bugzilla emacs gpg test tk"
 
 RDEPEND="app-misc/ca-certificates
diff --git a/dev-vcs/mercurial/mercurial-4.7.2.ebuild b/dev-vcs/mercurial/mercurial-4.7.2.ebuild
new file mode 100644
index 000000000000..2b7e1bbf0e22
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-4.7.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk"
+
+RDEPEND="app-misc/ca-certificates
+	dev-python/zstandard[${PYTHON_USEDEP}]
+	bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )"
+
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+
+	# Don't use bundled zstandard (#666972)
+	rm -r contrib/python-zstandard || die
+	sed '/contrib\/python-zstandard/d;/setup_zstd/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	strip-flags -ftracer -ftree-vectorize
+	# Note: make it impl-conditional if py3 is supported
+	append-flags -fno-strict-aliasing
+
+	"${PYTHON}" setup.py build_mo || die
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	rm -f doc/*.?.txt
+	dodoc CONTRIBUTORS
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor
+	dobin contrib/hgk
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix plan9 *.el)
+	for f in ${RM_CONTRIB[@]}; do
+		rm -r contrib/$f || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+
+	# symlink to system zstd
+	dosym ../zstd.so $(python_get_sitedir)/${PN}/zstd.so
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	#rm -f test-doctest*		# doctest always fails with python 2.5.x
+	rm -f test-largefiles*		# tends to time out
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/mercurial/mercurial-4.7.ebuild b/dev-vcs/mercurial/mercurial-4.7.ebuild
deleted file mode 100644
index 9446c0956cd6..000000000000
--- a/dev-vcs/mercurial/mercurial-4.7.ebuild
+++ /dev/null
@@ -1,133 +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 elisp-common eutils distutils-r1 flag-o-matic
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="https://www.mercurial-scm.org/"
-SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	app-misc/ca-certificates"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
-
-python_prepare_all() {
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	strip-flags -ftracer -ftree-vectorize
-	# Note: make it impl-conditional if py3 is supported
-	append-flags -fno-strict-aliasing
-
-	"${PYTHON}" setup.py build_mo || die
-}
-
-python_compile_all() {
-	rm -r contrib/win32 || die
-	if use emacs; then
-		cd contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/bash_completion hg
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh_completion _hg
-
-	rm -f doc/*.?.txt
-	dodoc CONTRIBUTORS
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor
-	dobin contrib/hgk
-	python_foreach_impl python_doscript contrib/hg-ssh
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix plan9 *.el)
-	for f in ${RM_CONTRIB[@]}; do
-		rm -r contrib/$f || die
-	done
-
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	doman doc/*.?
-
-	insinto /etc/mercurial/hgrc.d
-	doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-	pushd tests &>/dev/null || die
-	rm -rf *svn*			# Subversion tests fail with 1.5
-	rm -f test-archive*		# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	#rm -f test-doctest*		# doctest always fails with python 2.5.x
-	rm -f test-largefiles*		# tends to time out
-
-	popd &>/dev/null || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local TEST_DIR
-
-	rm -rf "${TMPDIR}"/test
-	distutils_install_for_testing
-	cd tests || die
-	"${PYTHON}" run-tests.py --verbose \
-		--tmpdir="${TMPDIR}"/test \
-		--with-hg="${TEST_DIR}"/scripts/hg \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index b884778151ee..765ff422069c 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -3,12 +3,14 @@ AUX subversion-1.9.7-kf5.patch 9904 BLAKE2B 493c58c6567e2389bc9f33bb60981b22a245
 AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0735b973c0b6c5ff3f7ca0086f9bc852e499b1b9af82f4ee305c8553e114df50e468e9d70fd4655f SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289
 AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
-DIST subversion-1.10.0.tar.bz2 8369823 BLAKE2B a8496959d838f6a0a9046913768e2090d7c46e2ac91f0360c2287a7b91c19e4cf5eae1a4421f79ceb2be4b998ee47735b22f5c22947992ff736a8d743f819556 SHA512 26e49c961d54c4e78067caa202f384c36544e0ce7506abbffe73e59186ac34559a70cbd6c0934ed47dcc5c3580fce0f0cc2ef14b77695c26e8dbbc6358d1ec6a
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.10.2.tar.bz2 8369762 BLAKE2B 1cd9ecf91818172ce60b8a38b1cb0eec0180725af58c09b9b5e62aa70fc2a7266d20b9fcfdafe993cbbb57f118dc9eb77126c199c3f4f2797fd50ef5f59b1f7e SHA512 ccbe860ec93a198745e40620cb7e005a85797e344a99ddbc0e24c32ad846976eae35cf5b3d62ba5751b998f0d40bbebbba72f484d92c92693bbb2112c989b129
+DIST subversion-1.10.3.tar.bz2 8374465 BLAKE2B 48610f0edec52dad43a4fd971098ed5d8b43a5396fcc3fdaa42af6ff7ce4722300f0c32a342521072abcccbc32e1364a87fc644913cb4a3a21658793f5991234 SHA512 e753c76be2c7a7d1e47ef70a417f33ad48a5076ddbe02062b478b0baf8ce063f101aab3a86895e33f6277f273917b87d8c07b002e3e4f9fe3a750a2f8142ef6d
+DIST subversion-1.11.0-rc2.tar.bz2 8493075 BLAKE2B 2db93f106e75efb5545180fa5907b596026574f6bad4e00c631f6d0e17f1aa46ee8161628ed10767acf174774906284ef462c31f98de8db0b4baef1d611f5ca3 SHA512 f37bddb7529f724b5995d1742a9e68eaf994317ff93cc75a99312bfd040ce4f9e46689a4876e987bac008d34ed508eb728d935fb0302e25e965365cf6753e12d
 DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
 DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
-EBUILD subversion-1.10.0.ebuild 15267 BLAKE2B 75507211a3abba7e806d8d4c5a0a0f150f4b9278b04cb695b5eee26df59b36cddbac29f0a3b8b386195a33f9dcdce680b909e9ebc2925aa3836a5714e2448a20 SHA512 4b6e1997e414beb1ddf6359b7fe30eb7e7d45ba44c7d42fe5fb7d5498d73416927ab78d387b45749122013054687dc6906c3cfd1788e0609f04162c02e6412ef
-EBUILD subversion-1.10.2.ebuild 15344 BLAKE2B 568bff7d345423cc0ce9facb859e0bd100f7438e857a920c084ae51561cd433db8459071dbd80a1873f22603d5cdc306a505a53827d7fb6c0ddc5c0a4e21d434 SHA512 841fe3ca4be18b5a7670e6006c209a51161c9feddae3a95761289ebadbbff5dc9b9e3e709d619857d6758d12d75a486e04f23cbab32042c3e3563a0f83352225
+EBUILD subversion-1.10.2.ebuild 15350 BLAKE2B 8299e54f27b9fd44822c32f6be3b6da4fff7b5714b10a794b61479cd4be50ce2ec38c2f480feda0b9a6e6e3fec85c4bef83e31d3588d2c07f69f062cfda2c94a SHA512 cbf3211d203f9b69c841315e7d1043b3a7c76a6a608cf3f17f163e362d316dac3cec93aac71f8a97c6b7aacd420d5e6224937b3acbf1df589412c1cefa020bed
+EBUILD subversion-1.10.3.ebuild 15342 BLAKE2B 0326b66d9bb6a5fb989a08d72dfca1348c14ccb9413c2590c1fd5177d46964d731eef143c95b217b7c0b4cb3a86736bb814ea357b4d05b7bb07445c57307710f SHA512 df833c808d33415fe18dd8b94968278e8b40201ce00acc202f9e9e5dfef36f4818ce684534843400770587db9001b9a1253ce901f2eaf7f2118297142345b6ec
+EBUILD subversion-1.11.0_rc2.ebuild 15335 BLAKE2B 1a370f57d9da2f53cc892f3656d1c15a9f2ca283e6e468d36af908262a2d979e37297b2684a48662221bb5fb3edf59a70583636693b6b4789b206b4983ec91d3 SHA512 42f0e36713135baa87380083395127f9d29d003384882276b27e1b8fedfa5452eb0d067763975a53b3a7ee583fa6e0e67cdd5a79706aa542a7004934a00680e7
 EBUILD subversion-1.9.7-r1.ebuild 15804 BLAKE2B 1231e2ab2ba1b776ef43f3b543b57ff127cf59c52a3eb42e131789b2493388aa93f17f2d9760f110081c86a464dc559cce580ffd1641c146086a426bfe09b623 SHA512 bf0969059cb64b5ddea51c7423e5a8177b5e7ba4a821014799b933eb01f0d10f84d498cb11affd218009fc4e4721aa10f69a8e03dc61aabbfda373511bd143a3
 MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313
diff --git a/dev-vcs/subversion/subversion-1.10.0.ebuild b/dev-vcs/subversion/subversion-1.10.0.ebuild
deleted file mode 100644
index 324c064f3d79..000000000000
--- a/dev-vcs/subversion/subversion-1.10.0.ebuild
+++ /dev/null
@@ -1,524 +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 ruby22 ruby21"
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module ruby-single xdg-utils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion GPL-2"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/lz4
-	>=dev-db/sqlite-3.7.12
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	dev-libs/libutf8proc
-	sys-apps/file
-	sys-libs/zlib
-	berkdb? ( >=sys-libs/db-4.0.14:= )
-	ctypes-python? ( ${PYTHON_DEPS} )
-	gnome-keyring? (
-		dev-libs/glib:2
-		gnome-base/libgnome-keyring
-		sys-apps/dbus
-	)
-	http? ( >=net-libs/serf-1.3.4 )
-	kwallet? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kwallet:5
-		sys-apps/dbus
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-	sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.5 )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( virtual/pkgconfig )
-	http? ( virtual/pkgconfig )
-	java? ( >=virtual/jdk-1.5 )
-	kwallet? (
-		kde-frameworks/kdelibs4support:5
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-	test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="
-	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? (
-		${PYTHON_REQUIRED_USE}
-		!dso
-	)"
-
-want_apache
-
-pkg_setup() {
-	if use berkdb ; then
-		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-			| sed 's:.*b::')"
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-			if [[ -n "${apu_bdb_version}" ]] ; then
-				SVN_BDB_VERSION="${apu_bdb_version}"
-				einfo "Matching db version to apr-util"
-			else
-				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-			fi
-		fi
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-			eerror "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
-	depend.apache_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-
-	if ! use http ; then
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn "Consider enabling \"http\" USE flag"
-		echo -ne "\a"
-	fi
-
-	if use debug ; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
-	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
-	if use ruby ; then
-		local rbslot
-		RB_VER=""
-		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-			if has_version dev-lang/ruby:${rbslot} ;  then
-				RB_VER="${rbslot/.}"
-				break
-			fi
-		done
-		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
-	fi
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/patches"
-	eapply_user
-
-	fperms +x build/transform_libtool_scripts.sh
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	# this bites us in particular on Solaris
-	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-		die "/bin/sh is not POSIX shell!"
-
-	eautoconf
-	elibtoolize
-
-	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-		-i build-outputs.mk || die "sed failed"
-
-	if use python ; then
-		# XXX: make python_copy_sources accept path
-		S=${S}/subversion/bindings/swig/python python_copy_sources
-		rm -r "${S}"/subversion/bindings/swig/python || die
-	fi
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
-		$(use_with apache2 apache-libexecdir)
-		$(use_with apache2 apxs "${APXS}")
-		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
-		$(use_enable dso runtime-module-search)
-		$(use_with gnome-keyring)
-		$(use_enable java javahl)
-		$(use_with java jdk "${JAVA_HOME}")
-		$(use_with kwallet)
-		$(use_enable nls)
-		$(use_with sasl)
-		$(use_with http serf)
-		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
-		--disable-experimental-libtool
-		--without-jikes
-		--disable-mod-activation
-		--disable-static
-	)
-
-	if use python || use perl || use ruby; then
-		myconf+=( --with-swig )
-	else
-		myconf+=( --without-swig )
-	fi
-
-	if use java ; then
-		myconf+=( --without-junit )
-	fi
-
-	case ${CHOST} in
-		*-aix*)
-			# avoid recording immediate path to sharedlibs into executables
-			append-ldflags -Wl,-bnoipath
-		;;
-		*-cygwin*)
-			# no LD_PRELOAD support, no undefined symbols
-			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
-			;;
-		*-interix*)
-			# loader crashes on the LD_PRELOADs...
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-solaris*)
-			# need -lintl to link
-			use nls && append-libs intl
-			# this breaks installation, on x64 echo replacement is 32-bits
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-mint*)
-			myconf+=( --enable-all-static --disable-local-library-preloading )
-		;;
-		*)
-			# inject LD_PRELOAD entries for easy in-tree development
-			myconf+=( --enable-local-library-preloading )
-		;;
-	esac
-
-	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
-	#compile for x86 on amd64, so workaround this issue again
-	#check newer versions, if this is still/again needed
-	myconf+=( --disable-disallowing-of-undefined-references )
-
-	# for build-time scripts
-	if use ctypes-python || use python || use test; then
-		python_setup
-	fi
-
-	if use python && [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_compile="$(tc-getCC)"
-	fi
-
-	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
-	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake local-all
-
-	if use ctypes-python ; then
-		# pre-generate .py files
-		use ctypes-python && emake ctypes-python
-
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_compile() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			python_export PYTHON_INCLUDEDIR
-			emake swig-py \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn"
-		}
-
-		# this will give us proper BUILD_DIR for symlinking
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_compile
-	fi
-
-	if use perl ; then
-		emake swig-pl
-	fi
-
-	if use ruby ; then
-		emake swig-rb
-	fi
-
-	if use java ; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
-	fi
-
-	if use extras ; then
-		emake tools
-	fi
-
-	if use doc ; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl
-		fi
-	fi
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P} ; then
-		default
-
-		if use ctypes-python ; then
-			python_test() {
-				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
-					|| die "ctypes-python tests fail with ${EPYTHON}"
-			}
-
-			distutils-r1_src_test
-		fi
-
-		if use python ; then
-			swig_py_test() {
-				pushd "${BUILD_DIR}" >/dev/null || die
-				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
-				popd >/dev/null || die
-			}
-
-			BUILD_DIR=subversion/bindings/swig/python \
-			python_foreach_impl swig_py_test
-		fi
-	else
-		ewarn "The test suite shows errors when there is an older version of"
-		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
-		ewarn "before running the test suite."
-		ewarn "Test suite skipped."
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install
-
-	if use ctypes-python ; then
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_install() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			emake \
-				DESTDIR="${D}" \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_install
-	fi
-
-	if use perl ; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-		perl_delete_localpod
-		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
-	fi
-
-	if use ruby ; then
-		emake DESTDIR="${D}" install-swig-rb
-	fi
-
-	if use java ; then
-		emake DESTDIR="${D}" install-javahl
-		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
-		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2 ; then
-		keepdir "${APACHE_MODULES_CONFDIR}"
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}/47_mod_dav_svn.conf"
-	fi
-
-	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion svn
-	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-	rm -f tools/client-side/bash_completion
-
-	# Install hot backup script, bug 54304.
-	newbin tools/backup/hot-backup.py svn-hot-backup
-	rm -fr tools/backup
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	#adjust default user and group with disabled apache2 USE flag, bug 381385
-	if ! use apache2 ; then
-		sed -e "s\USER:-apache\USER:-svn\g" \
-			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
-			-i "${ED%/}"/etc/init.d/svnserve || die
-		sed -e "0,/apache/s//svn/" \
-			-e "s:apache:svnusers:" \
-			-i "${ED%/}"/etc/xinetd.d/svnserve || die
-	fi
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install extra files.
-	if use extras ; then
-		cat <<- EOF > 80subversion-extras
-			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-		EOF
-		doenvd 80subversion-extras
-
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
-		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
-		rm -fr tools/client-side/svnmucc
-		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
-		rm -fr tools/{buildbot,dev,diff,po}
-
-		insinto /usr/share/${PN}
-		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
-		doins -r tools
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r doc/doxygen/html/*
-
-		if use java ; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	prune_libtool_files --all
-
-	cd "${ED%/}"/usr/share/locale
-	for i in * ; do
-		if [[ ${i} != *${LINGUAS}* ]] ; then
-			rm -r ${i} || die
-		fi
-	done
-}
-
-pkg_preinst() {
-	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
-		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
-			CHANGED_BDB_VERSION="1"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-		ewarn "You upgraded from an older version of Berkeley DB and may experience"
-		ewarn "problems with your repository. Run the following commands as root to fix it:"
-		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	fi
-
-	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
-	:
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
-		einfo "Setting repository permissions..."
-		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2 ; then
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-		else
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-		fi
-		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
-		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
-		echo "to finish the configuration."
-	fi
-}
diff --git a/dev-vcs/subversion/subversion-1.10.2.ebuild b/dev-vcs/subversion/subversion-1.10.2.ebuild
index 46832f2749cc..6ee1436600be 100644
--- a/dev-vcs/subversion/subversion-1.10.2.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND="
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 	>=dev-libs/apr-1.3:1
 	>=dev-libs/apr-util-1.3:1
 	dev-libs/expat
-	dev-libs/libutf8proc
+	dev-libs/libutf8proc:=
 	sys-apps/file
 	sys-libs/zlib
 	berkdb? ( >=sys-libs/db-4.0.14:= )
diff --git a/dev-vcs/subversion/subversion-1.10.3.ebuild b/dev-vcs/subversion/subversion-1.10.3.ebuild
new file mode 100644
index 000000000000..ef192915090c
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.10.3.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby25 ruby24 ruby23"
+DISTUTILS_OPTIONAL=1
+WANT_AUTOMAKE="none"
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="https://subversion.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Subversion GPL-2"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/lz4
+	>=dev-db/sqlite-3.7.12
+	>=dev-libs/apr-1.3:1
+	>=dev-libs/apr-util-1.3:1
+	dev-libs/expat
+	dev-libs/libutf8proc:=
+	sys-apps/file
+	sys-libs/zlib
+	berkdb? ( >=sys-libs/db-4.0.14:= )
+	ctypes-python? ( ${PYTHON_DEPS} )
+	gnome-keyring? (
+		dev-libs/glib:2
+		gnome-base/libgnome-keyring
+		sys-apps/dbus
+	)
+	http? ( >=net-libs/serf-1.3.4 )
+	kwallet? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kwallet:5
+		sys-apps/dbus
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+	sasl? ( dev-libs/cyrus-sasl )"
+RDEPEND="${COMMON_DEPEND}
+	apache2? ( www-servers/apache[apache2_modules_dav] )
+	java? ( >=virtual/jre-1.5 )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )"
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="${COMMON_DEPEND}
+	!!<sys-apps/sandbox-1.6
+	ctypes-python? ( dev-python/ctypesgen )
+	doc? ( app-doc/doxygen )
+	gnome-keyring? ( virtual/pkgconfig )
+	http? ( virtual/pkgconfig )
+	java? ( >=virtual/jdk-1.5 )
+	kwallet? (
+		kde-frameworks/kdelibs4support:5
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	test? ( ${PYTHON_DEPS} )"
+
+REQUIRED_USE="
+	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? (
+		${PYTHON_REQUIRED_USE}
+		!dso
+	)"
+
+want_apache
+
+pkg_setup() {
+	if use berkdb ; then
+		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
+			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
+			| sed 's:.*b::')"
+		einfo
+		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+			if [[ -n "${apu_bdb_version}" ]] ; then
+				SVN_BDB_VERSION="${apu_bdb_version}"
+				einfo "Matching db version to apr-util"
+			else
+				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+			fi
+		fi
+		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
+		einfo
+
+		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
+			eerror "Aborting to avoid possible run-time crashes."
+			die "Berkeley DB version mismatch"
+		fi
+	fi
+
+	depend.apache_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+
+	if ! use http ; then
+		ewarn "WebDAV support is disabled. You need WebDAV to"
+		ewarn "access repositories through the HTTP protocol."
+		ewarn "Consider enabling \"http\" USE flag"
+		echo -ne "\a"
+	fi
+
+	if use debug ; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
+	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
+
+	# Allow for custom repository locations.
+	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+	if use ruby ; then
+		local rbslot
+		RB_VER=""
+		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
+			if has_version dev-lang/ruby:${rbslot} ;  then
+				RB_VER="${rbslot/.}"
+				break
+			fi
+		done
+		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+	fi
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/patches"
+	eapply_user
+
+	fperms +x build/transform_libtool_scripts.sh
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+	# this bites us in particular on Solaris
+	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
+		die "/bin/sh is not POSIX shell!"
+
+	eautoconf
+	elibtoolize
+
+	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+		-i build-outputs.mk || die "sed failed"
+
+	if use python ; then
+		# XXX: make python_copy_sources accept path
+		S=${S}/subversion/bindings/swig/python python_copy_sources
+		rm -r "${S}"/subversion/bindings/swig/python || die
+	fi
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
+		$(use_with apache2 apache-libexecdir)
+		$(use_with apache2 apxs "${APXS}")
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
+		$(use_enable dso runtime-module-search)
+		$(use_with gnome-keyring)
+		$(use_enable java javahl)
+		$(use_with java jdk "${JAVA_HOME}")
+		$(use_with kwallet)
+		$(use_enable nls)
+		$(use_with sasl)
+		$(use_with http serf)
+		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+		--disable-experimental-libtool
+		--without-jikes
+		--disable-mod-activation
+		--disable-static
+	)
+
+	if use python || use perl || use ruby; then
+		myconf+=( --with-swig )
+	else
+		myconf+=( --without-swig )
+	fi
+
+	if use java ; then
+		myconf+=( --without-junit )
+	fi
+
+	case ${CHOST} in
+		*-aix*)
+			# avoid recording immediate path to sharedlibs into executables
+			append-ldflags -Wl,-bnoipath
+		;;
+		*-cygwin*)
+			# no LD_PRELOAD support, no undefined symbols
+			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
+			;;
+		*-interix*)
+			# loader crashes on the LD_PRELOADs...
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-solaris*)
+			# need -lintl to link
+			use nls && append-libs intl
+			# this breaks installation, on x64 echo replacement is 32-bits
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-mint*)
+			myconf+=( --enable-all-static --disable-local-library-preloading )
+		;;
+		*)
+			# inject LD_PRELOAD entries for easy in-tree development
+			myconf+=( --enable-local-library-preloading )
+		;;
+	esac
+
+	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
+	#compile for x86 on amd64, so workaround this issue again
+	#check newer versions, if this is still/again needed
+	myconf+=( --disable-disallowing-of-undefined-references )
+
+	# for build-time scripts
+	if use ctypes-python || use python || use test; then
+		python_setup
+	fi
+
+	if use python && [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_compile="$(tc-getCC)"
+	fi
+
+	# allow overriding Python include directory
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake local-all
+
+	if use ctypes-python ; then
+		# pre-generate .py files
+		use ctypes-python && emake ctypes-python
+
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+
+	if use python ; then
+		swig_py_compile() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			python_export PYTHON_INCLUDEDIR
+			emake swig-py \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn"
+		}
+
+		# this will give us proper BUILD_DIR for symlinking
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_compile
+	fi
+
+	if use perl ; then
+		emake swig-pl
+	fi
+
+	if use ruby ; then
+		emake swig-rb
+	fi
+
+	if use java ; then
+		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
+	fi
+
+	if use extras ; then
+		emake tools
+	fi
+
+	if use doc ; then
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			emake doc-javahl
+		fi
+	fi
+}
+
+src_test() {
+	if has_version ~${CATEGORY}/${P} ; then
+		default
+
+		if use ctypes-python ; then
+			python_test() {
+				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
+					|| die "ctypes-python tests fail with ${EPYTHON}"
+			}
+
+			distutils-r1_src_test
+		fi
+
+		if use python ; then
+			swig_py_test() {
+				pushd "${BUILD_DIR}" >/dev/null || die
+				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
+				popd >/dev/null || die
+			}
+
+			BUILD_DIR=subversion/bindings/swig/python \
+			python_foreach_impl swig_py_test
+		fi
+	else
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
+		ewarn "before running the test suite."
+		ewarn "Test suite skipped."
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" local-install
+
+	if use ctypes-python ; then
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	if use python ; then
+		swig_py_install() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			emake \
+				DESTDIR="${D}" \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn" \
+				install-swig-py
+		}
+
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_install
+	fi
+
+	if use perl ; then
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
+		perl_delete_localpod
+		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
+	fi
+
+	if use ruby ; then
+		emake DESTDIR="${D}" install-swig-rb
+	fi
+
+	if use java ; then
+		emake DESTDIR="${D}" install-javahl
+		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
+		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install Apache module configuration.
+	if use apache2 ; then
+		keepdir "${APACHE_MODULES_CONFDIR}"
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}/47_mod_dav_svn.conf"
+	fi
+
+	# Install Bash Completion, bug 43179.
+	newbashcomp tools/client-side/bash_completion svn
+	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
+	rm -f tools/client-side/bash_completion
+
+	# Install hot backup script, bug 54304.
+	newbin tools/backup/hot-backup.py svn-hot-backup
+	rm -fr tools/backup
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245.
+	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+	#adjust default user and group with disabled apache2 USE flag, bug 381385
+	if ! use apache2 ; then
+		sed -e "s\USER:-apache\USER:-svn\g" \
+			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
+			-i "${ED%/}"/etc/init.d/svnserve || die
+		sed -e "0,/apache/s//svn/" \
+			-e "s:apache:svnusers:" \
+			-i "${ED%/}"/etc/xinetd.d/svnserve || die
+	fi
+
+	# Install documentation.
+	dodoc CHANGES COMMITTERS README
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	# Install extra files.
+	if use extras ; then
+		cat <<- EOF > 80subversion-extras
+			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+		EOF
+		doenvd 80subversion-extras
+
+		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
+
+		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
+		rm -fr tools/client-side/svnmucc
+		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
+		rm -fr tools/{buildbot,dev,diff,po}
+
+		insinto /usr/share/${PN}
+		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
+		doins -r tools
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/doxygen/html/*
+
+		if use java ; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+
+	prune_libtool_files --all
+
+	cd "${ED%/}"/usr/share/locale
+	for i in * ; do
+		if [[ ${i} != *${LINGUAS}* ]] ; then
+			rm -r ${i} || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB, bug 122877.
+	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
+		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
+			CHANGED_BDB_VERSION="1"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
+		ewarn "You upgraded from an older version of Berkeley DB and may experience"
+		ewarn "problems with your repository. Run the following commands as root to fix it:"
+		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	fi
+
+	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
+}
+
+pkg_postrm() {
+	:
+}
+
+pkg_config() {
+	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+	# already has EPREFIX in it
+	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
+		echo "A Subversion repository already exists and I will not overwrite it."
+		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+	else
+		mkdir -p "${SVN_REPOS_LOC}/conf"
+
+		einfo "Populating repository directory..."
+		# Create initial repository.
+		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+
+		einfo "Setting repository permissions..."
+		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
+		if use apache2 ; then
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+		else
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+		fi
+		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
+		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
+		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
+		echo "to finish the configuration."
+	fi
+}
diff --git a/dev-vcs/subversion/subversion-1.11.0_rc2.ebuild b/dev-vcs/subversion/subversion-1.11.0_rc2.ebuild
new file mode 100644
index 000000000000..df2a5c65a4c6
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.11.0_rc2.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby25 ruby24 ruby23"
+DISTUTILS_OPTIONAL=1
+WANT_AUTOMAKE="none"
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="https://subversion.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Subversion GPL-2"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/lz4
+	>=dev-db/sqlite-3.7.12
+	>=dev-libs/apr-1.3:1
+	>=dev-libs/apr-util-1.3:1
+	dev-libs/expat
+	dev-libs/libutf8proc:=
+	sys-apps/file
+	sys-libs/zlib
+	berkdb? ( >=sys-libs/db-4.0.14:= )
+	ctypes-python? ( ${PYTHON_DEPS} )
+	gnome-keyring? (
+		dev-libs/glib:2
+		gnome-base/libgnome-keyring
+		sys-apps/dbus
+	)
+	http? ( >=net-libs/serf-1.3.4 )
+	kwallet? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kwallet:5
+		sys-apps/dbus
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+	sasl? ( dev-libs/cyrus-sasl )"
+RDEPEND="${COMMON_DEPEND}
+	apache2? ( www-servers/apache[apache2_modules_dav] )
+	java? ( >=virtual/jre-1.5 )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )"
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="${COMMON_DEPEND}
+	!!<sys-apps/sandbox-1.6
+	ctypes-python? ( dev-python/ctypesgen )
+	doc? ( app-doc/doxygen )
+	gnome-keyring? ( virtual/pkgconfig )
+	http? ( virtual/pkgconfig )
+	java? ( >=virtual/jdk-1.5 )
+	kwallet? (
+		kde-frameworks/kdelibs4support:5
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	test? ( ${PYTHON_DEPS} )"
+
+REQUIRED_USE="
+	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? (
+		${PYTHON_REQUIRED_USE}
+		!dso
+	)"
+
+want_apache
+
+pkg_setup() {
+	if use berkdb ; then
+		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
+			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
+			| sed 's:.*b::')"
+		einfo
+		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+			if [[ -n "${apu_bdb_version}" ]] ; then
+				SVN_BDB_VERSION="${apu_bdb_version}"
+				einfo "Matching db version to apr-util"
+			else
+				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+			fi
+		fi
+		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
+		einfo
+
+		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
+			eerror "Aborting to avoid possible run-time crashes."
+			die "Berkeley DB version mismatch"
+		fi
+	fi
+
+	depend.apache_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+
+	if ! use http ; then
+		ewarn "WebDAV support is disabled. You need WebDAV to"
+		ewarn "access repositories through the HTTP protocol."
+		ewarn "Consider enabling \"http\" USE flag"
+		echo -ne "\a"
+	fi
+
+	if use debug ; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
+	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
+
+	# Allow for custom repository locations.
+	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+	if use ruby ; then
+		local rbslot
+		RB_VER=""
+		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
+			if has_version dev-lang/ruby:${rbslot} ;  then
+				RB_VER="${rbslot/.}"
+				break
+			fi
+		done
+		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+	fi
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/patches"
+	eapply_user
+
+	fperms +x build/transform_libtool_scripts.sh
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+	# this bites us in particular on Solaris
+	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
+		die "/bin/sh is not POSIX shell!"
+
+	eautoconf
+	elibtoolize
+
+	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+		-i build-outputs.mk || die "sed failed"
+
+	if use python ; then
+		# XXX: make python_copy_sources accept path
+		S=${S}/subversion/bindings/swig/python python_copy_sources
+		rm -r "${S}"/subversion/bindings/swig/python || die
+	fi
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
+		$(use_with apache2 apache-libexecdir)
+		$(use_with apache2 apxs "${APXS}")
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
+		$(use_enable dso runtime-module-search)
+		$(use_with gnome-keyring)
+		$(use_enable java javahl)
+		$(use_with java jdk "${JAVA_HOME}")
+		$(use_with kwallet)
+		$(use_enable nls)
+		$(use_with sasl)
+		$(use_with http serf)
+		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+		--disable-experimental-libtool
+		--without-jikes
+		--disable-mod-activation
+		--disable-static
+	)
+
+	if use python || use perl || use ruby; then
+		myconf+=( --with-swig )
+	else
+		myconf+=( --without-swig )
+	fi
+
+	if use java ; then
+		myconf+=( --without-junit )
+	fi
+
+	case ${CHOST} in
+		*-aix*)
+			# avoid recording immediate path to sharedlibs into executables
+			append-ldflags -Wl,-bnoipath
+		;;
+		*-cygwin*)
+			# no LD_PRELOAD support, no undefined symbols
+			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
+			;;
+		*-interix*)
+			# loader crashes on the LD_PRELOADs...
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-solaris*)
+			# need -lintl to link
+			use nls && append-libs intl
+			# this breaks installation, on x64 echo replacement is 32-bits
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-mint*)
+			myconf+=( --enable-all-static --disable-local-library-preloading )
+		;;
+		*)
+			# inject LD_PRELOAD entries for easy in-tree development
+			myconf+=( --enable-local-library-preloading )
+		;;
+	esac
+
+	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
+	#compile for x86 on amd64, so workaround this issue again
+	#check newer versions, if this is still/again needed
+	myconf+=( --disable-disallowing-of-undefined-references )
+
+	# for build-time scripts
+	if use ctypes-python || use python || use test; then
+		python_setup
+	fi
+
+	if use python && [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_compile="$(tc-getCC)"
+	fi
+
+	# allow overriding Python include directory
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake local-all
+
+	if use ctypes-python ; then
+		# pre-generate .py files
+		use ctypes-python && emake ctypes-python
+
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+
+	if use python ; then
+		swig_py_compile() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			python_export PYTHON_INCLUDEDIR
+			emake swig-py \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn"
+		}
+
+		# this will give us proper BUILD_DIR for symlinking
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_compile
+	fi
+
+	if use perl ; then
+		emake swig-pl
+	fi
+
+	if use ruby ; then
+		emake swig-rb
+	fi
+
+	if use java ; then
+		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
+	fi
+
+	if use extras ; then
+		emake tools
+	fi
+
+	if use doc ; then
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			emake doc-javahl
+		fi
+	fi
+}
+
+src_test() {
+	if has_version ~${CATEGORY}/${P} ; then
+		default
+
+		if use ctypes-python ; then
+			python_test() {
+				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
+					|| die "ctypes-python tests fail with ${EPYTHON}"
+			}
+
+			distutils-r1_src_test
+		fi
+
+		if use python ; then
+			swig_py_test() {
+				pushd "${BUILD_DIR}" >/dev/null || die
+				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
+				popd >/dev/null || die
+			}
+
+			BUILD_DIR=subversion/bindings/swig/python \
+			python_foreach_impl swig_py_test
+		fi
+	else
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
+		ewarn "before running the test suite."
+		ewarn "Test suite skipped."
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" local-install
+
+	if use ctypes-python ; then
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	if use python ; then
+		swig_py_install() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			emake \
+				DESTDIR="${D}" \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn" \
+				install-swig-py
+		}
+
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_install
+	fi
+
+	if use perl ; then
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
+		perl_delete_localpod
+		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
+	fi
+
+	if use ruby ; then
+		emake DESTDIR="${D}" install-swig-rb
+	fi
+
+	if use java ; then
+		emake DESTDIR="${D}" install-javahl
+		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
+		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install Apache module configuration.
+	if use apache2 ; then
+		keepdir "${APACHE_MODULES_CONFDIR}"
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}/47_mod_dav_svn.conf"
+	fi
+
+	# Install Bash Completion, bug 43179.
+	newbashcomp tools/client-side/bash_completion svn
+	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
+	rm -f tools/client-side/bash_completion
+
+	# Install hot backup script, bug 54304.
+	newbin tools/backup/hot-backup.py svn-hot-backup
+	rm -fr tools/backup
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245.
+	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+	#adjust default user and group with disabled apache2 USE flag, bug 381385
+	if ! use apache2 ; then
+		sed -e "s\USER:-apache\USER:-svn\g" \
+			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
+			-i "${ED%/}"/etc/init.d/svnserve || die
+		sed -e "0,/apache/s//svn/" \
+			-e "s:apache:svnusers:" \
+			-i "${ED%/}"/etc/xinetd.d/svnserve || die
+	fi
+
+	# Install documentation.
+	dodoc CHANGES COMMITTERS README
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	# Install extra files.
+	if use extras ; then
+		cat <<- EOF > 80subversion-extras
+			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+		EOF
+		doenvd 80subversion-extras
+
+		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
+
+		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
+		rm -fr tools/client-side/svnmucc
+		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
+		rm -fr tools/{buildbot,dev,diff,po}
+
+		insinto /usr/share/${PN}
+		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
+		doins -r tools
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/doxygen/html/*
+
+		if use java ; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+
+	prune_libtool_files --all
+
+	cd "${ED%/}"/usr/share/locale
+	for i in * ; do
+		if [[ ${i} != *${LINGUAS}* ]] ; then
+			rm -r ${i} || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB, bug 122877.
+	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
+		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
+			CHANGED_BDB_VERSION="1"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
+		ewarn "You upgraded from an older version of Berkeley DB and may experience"
+		ewarn "problems with your repository. Run the following commands as root to fix it:"
+		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	fi
+
+	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
+}
+
+pkg_postrm() {
+	:
+}
+
+pkg_config() {
+	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+	# already has EPREFIX in it
+	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
+		echo "A Subversion repository already exists and I will not overwrite it."
+		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+	else
+		mkdir -p "${SVN_REPOS_LOC}/conf"
+
+		einfo "Populating repository directory..."
+		# Create initial repository.
+		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+
+		einfo "Setting repository permissions..."
+		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
+		if use apache2 ; then
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+		else
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+		fi
+		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
+		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
+		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
+		echo "to finish the configuration."
+	fi
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 78505268f5e9..8259f09a1e1a 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index bb27aa315ee2..50f7830c51bc 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cargo.eclass
@@ -16,8 +16,8 @@ CARGO_DEPEND=""
 [[ ${CATEGORY}/${PN} != dev-util/cargo ]] && CARGO_DEPEND="virtual/cargo"
 
 case ${EAPI} in
-	6) : DEPEND="${DEPEND} ${CARGO_DEPEND}";;
-	7) : BDEPEND="${BDEPEND} ${CARGO_DEPEND}";;
+	6) DEPEND="${CARGO_DEPEND}";;
+	7) BDEPEND="${CARGO_DEPEND}";;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass
index 1ffb3e3f08f2..7c65e11536b3 100644
--- a/eclass/cmake-multilib.eclass
+++ b/eclass/cmake-multilib.eclass
@@ -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
 
 # @ECLASS: cmake-multilib.eclass
@@ -6,7 +6,7 @@
 # gx86-multilib team <multilib@gentoo.org>
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 6
 # @BLURB: cmake-utils wrapper for multilib builds
 # @DESCRIPTION:
 # The cmake-multilib.eclass provides a glue between cmake-utils.eclass(5)
@@ -19,9 +19,8 @@
 # in multilib-minimal, yet they ought to call appropriate cmake-utils
 # phase rather than 'default'.
 
-# EAPI=5 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
-	5|6) ;;
+	6) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
deleted file mode 100644
index 1de976c32d9c..000000000000
--- a/eclass/enlightenment.eclass
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# Joonas Niilola <juippis@gmail.com> (18 Aug 2018)
-# Outdated, unmaintained, not being used by any package in the tree,
-# has unattended bugs open.
-# Bug: #666460. Removal in ~30 days.
-
-# @ECLASS: enlightenment.eclass
-# @MAINTAINER:
-# maintainer-needed@gentoo.org
-# @BLURB: simplify enlightenment package management
-
-if [[ -z ${_ENLIGHTENMENT_ECLASS} ]]; then
-_ENLIGHTENMENT_ECLASS=1
-
-inherit epatch epunt-cxx libtool
-
-# @ECLASS-VARIABLE: E_PYTHON
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# if defined, the package is based on Python/distutils
-
-# @ECLASS-VARIABLE: E_CYTHON
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# if defined, the package is Cython bindings (implies E_PYTHON)
-
-# @ECLASS-VARIABLE: E_ECONF
-# @DESCRIPTION:
-# Array of flags to pass to econf (obsoletes MY_ECONF)
-E_ECONF=()
-
-# E_STATE's:
-#	release      [default]
-#		SRC_URI  $P.tar.gz
-#		S        $WORKDIR/$P
-#
-#	snap         $PV has .200##### datestamp or .### counter
-#		SRC_URI  $P.tar.bz2
-#		S        $WORKDIR/$P
-#
-#	live         $PV has a 9999 marker
-#		KEYWORDS ""
-#		SRC_URI  git/etc... up
-#		S        $WORKDIR/$E_S_APPEND
-#
-# Overrides:
-#	KEYWORDS    EKEY_STATE
-#	SRC_URI     EURI_STATE
-#	S           EURI_STATE
-
-E_LIVE_SERVER_DEFAULT_GIT="https://git.enlightenment.org"
-
-E_STATE="release"
-if [[ ${PV} == *9999* ]] ; then
-	if [[ ${EGIT_URI_APPEND} ]] ; then
-		E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}}
-		EGIT_URI_APPEND=${EGIT_URI_APPEND:-${PN}}
-		EGIT_PROJECT="enlightenment/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}"
-		EGIT_REPO_URI=${EGIT_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}}/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git
-		E_S_APPEND=${EGIT_URI_APPEND}
-		E_LIVE_SOURCE="git"
-		inherit git-2
-	fi
-	E_STATE="live"
-	WANT_AUTOTOOLS="yes"
-
-elif [[ -n ${E_SNAP_DATE} ]] ; then
-	E_STATE="snap"
-else
-	E_STATE="release"
-fi
-
-# Parse requested python state
-: ${E_PYTHON:=${E_CYTHON}}
-if [[ -n ${E_PYTHON} ]] ; then
-	PYTHON_DEPEND="2"
-
-	inherit python
-fi
-
-if [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then
-	WANT_AUTOCONF=${E_WANT_AUTOCONF:-latest}
-	WANT_AUTOMAKE=${E_WANT_AUTOMAKE:-latest}
-	inherit autotools
-fi
-
-ENLIGHTENMENT_EXPF="src_unpack src_compile src_install"
-case "${EAPI:-0}" in
-2|3|4|5) ENLIGHTENMENT_EXPF+=" src_prepare src_configure" ;;
-*) ;;
-esac
-EXPORT_FUNCTIONS ${ENLIGHTENMENT_EXPF}
-
-DESCRIPTION="An Enlightenment Foundation production"
-HOMEPAGE="https://www.enlightenment.org"
-if [[ -z ${SRC_URI} ]] ; then
-	case ${EURI_STATE:-${E_STATE}} in
-	release) SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz";;
-	snap)    SRC_URI="http://download.enlightenment.org/snapshots/${E_SNAP_DATE}/${P}.tar.bz2";;
-	live)    SRC_URI="";;
-	esac
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="nls doc"
-
-DEPEND="doc? ( app-doc/doxygen )
-	${E_PYTHON:+>=dev-python/setuptools-0.6_rc9}
-	${E_CYTHON:+>=dev-python/cython-0.12.1}"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-case ${EURI_STATE:-${E_STATE}} in
-	release) S=${WORKDIR}/${P};;
-	snap)    S=${WORKDIR}/${P};;
-	live)    S=${WORKDIR}/${E_S_APPEND};;
-esac
-
-enlightenment_src_unpack() {
-	if [[ ${E_STATE} == "live" ]] ; then
-		case ${E_LIVE_SOURCE} in
-			git) git-2_src_unpack;;
-			*)   die "eek!";;
-		esac
-	else
-		unpack ${A}
-	fi
-	if ! has src_prepare ${ENLIGHTENMENT_EXPF} ; then
-		cd "${S}" || die
-		enlightenment_src_prepare
-	fi
-}
-
-enlightenment_src_prepare() {
-	epatch_user
-	[[ -s gendoc ]] && chmod a+rx gendoc
-	if [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then
-		[[ -d po ]] && eautopoint -f
-		# autotools require README, when README.in is around, but README
-		# is created later in configure step
-		[[ -f README.in ]] && touch README
-		eautoreconf
-	fi
-	epunt_cxx
-	elibtoolize
-}
-
-enlightenment_src_configure() {
-	# gstreamer sucks, work around it doing stupid stuff
-	export GST_REGISTRY="${S}/registry.xml"
-	has static-libs ${IUSE} && E_ECONF+=( $(use_enable static-libs static) )
-
-	econf ${MY_ECONF} "${E_ECONF[@]}"
-}
-
-enlightenment_src_compile() {
-	has src_configure ${ENLIGHTENMENT_EXPF} || enlightenment_src_configure
-
-	V=1 emake || die
-
-	if use doc ; then
-		if [[ -x ./gendoc ]] ; then
-			./gendoc || die
-		elif emake -j1 -n doc >&/dev/null ; then
-			V=1 emake doc || die
-		fi
-	fi
-}
-
-enlightenment_src_install() {
-	V=1 emake install DESTDIR="${D}" || die
-	find "${D}" '(' -name CVS -o -name -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null
-	for d in AUTHORS ChangeLog NEWS README TODO ${EDOCS}; do
-		[[ -f ${d} ]] && dodoc ${d}
-	done
-	use doc && [[ -d doc ]] && dohtml -r doc/*
-	if has static-libs ${IUSE} ; then
-		use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
-	fi
-}
-
-fi
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 8994bf8d9732..a42d0c240c5a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,11 +37,15 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if [[ ${PV} = 5.12.5* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.43.0}
-			: ${QT_MINIMAL:=5.9.1}
+		if [[ ${PV} = 5.12* ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.46.0}
+			: ${KDE_APPS_MINIMAL:=17.12.3}
+			: ${QT_MINIMAL:=5.9.4}
+		fi
+		if [[ ${PV} = 5.13.5 ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.46.0}
+			: ${KDE_APPS_MINIMAL:=17.12.3}
 		fi
-		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.4}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
@@ -49,7 +53,6 @@ case ${CATEGORY} in
 		;;
 	kde-apps)
 		[[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0}
-		: ${FRAMEWORKS_MINIMAL:=5.49.0}
 		;;
 esac
 
@@ -61,7 +64,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.46.0}
+: ${FRAMEWORKS_MINIMAL:=5.50.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
@@ -71,7 +74,7 @@ esac
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
-: ${KDE_APPS_MINIMAL:=17.12.3}
+: ${KDE_APPS_MINIMAL:=18.04.3}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
new file mode 100644
index 000000000000..26c803adf007
--- /dev/null
+++ b/eclass/rust-toolchain.eclass
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: rust-toolchain.eclass
+# @MAINTAINER:
+# Rust Project <rust@gentoo.org>
+# @SUPPORTED_EAPIS: 6
+# @BLURB: helps map gentoo arches to rust ABIs
+# @DESCRIPTION:
+# This eclass contains a src_unpack default phase function, and
+# helper functions, to aid in proper rust-ABI handling for various
+# gentoo arches.
+
+case ${EAPI} in
+	6) : ;;
+	7) : ;;
+	*) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
+
+inherit multilib-build
+
+# @ECLASS-VARIABLE: RUST_TOOLCHAIN_BASEURL
+# @DESCRIPTION:
+# This variable specifies the base URL used by the
+# rust_arch_uri and rust_all_arch_uris functions when
+# generating the URI output list.
+: ${RUST_TOOLCHAIN_BASEURL:=https://static.rust-lang.org/dist/}
+
+# @FUNCTION: rust_abi
+# @USAGE: [CHOST-value]
+# @DESCRIPTION:
+# Outputs the Rust ABI name from a CHOST value, uses CHOST in the
+# environment if none is specified.
+
+rust_abi() {
+  local CTARGET=${1:-${CHOST}}
+  case ${CTARGET%%*-} in
+    aarch64*)     echo aarch64-unknown-linux-gnu;;
+    mips64*)      echo mips64-unknown-linux-gnuabi64;;
+    powerpc64le*) echo powerpc64le-unknown-linux-gnu;;
+    powerpc64*)   echo powerpc64-unknown-linux-gnu;;
+    x86_64*)      echo x86_64-unknown-linux-gnu;;
+    armv6j*s*)    echo arm-unknown-linux-gnueabi;;
+    armv6j*h*)    echo arm-unknown-linux-gnueabihf;;
+    armv7a*h*)    echo armv7-unknown-linux-gnueabihf;;
+    i?86*)        echo i686-unknown-linux-gnu;;
+    mipsel*)      echo mipsel-unknown-linux-gnu;;
+    mips*)        echo mips-unknown-linux-gnu;;
+    powerpc*)     echo powerpc-unknown-linux-gnu;;
+    s390x*)       echo s390x-unknown-linux-gnu;;
+    *)            echo ${CTARGET};;
+  esac
+}
+
+# @FUNCTION: rust_all_abis
+# @DESCRIPTION:
+# Outputs a list of all the enabled Rust ABIs
+rust_all_abis() {
+  if use multilib; then
+    local abi
+    local ALL_ABIS=()
+    for abi in $(multilib_get_enabled_abis); do
+      ALL_ABIS+=( $(rust_abi $(get_abi_CHOST ${abi})) )
+    done
+    local abi_list
+    IFS=, eval 'abi_list=${ALL_ABIS[*]}'
+    echo ${abi_list}
+  else
+    rust_abi
+  fi
+}
+
+# @FUNCTION: rust_arch_uri
+# @USAGE: <rust-ABI> <base-uri> [alt-distfile-basename]
+# @DESCRIPTION:
+# Output the URI for use in SRC_URI, combining $RUST_TOOLCHAIN_BASEURL
+# and the URI suffix provided in ARG2 with the rust ABI in ARG1, and
+# optionally renaming to the distfile basename specified in ARG3.
+#
+# @EXAMPLE:
+# SRC_URI="amd64? (
+#    $(rust_arch_uri x86_64-unknown-linux-gnu rustc-${STAGE0_VERSION})
+# )"
+#
+rust_arch_uri() {
+  if [ -n "$3" ]; then
+    echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz -> ${3}-${1}.tar.xz"
+  else
+    echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz"
+  fi
+}
+
+# @FUNCTION: rust_all_arch_uris
+# @USAGE <base-uri> [alt-distfile-basename]
+# @DESCRIPTION:
+# Outputs the URIs for SRC_URI to help fetch dependencies, using a base URI
+# provided as an argument.  Optionally allows for distfile renaming via a specified
+# basename.
+#
+# @EXAMPLE:
+# SRC_URI="$(rust_all_arch_uris rustc-${STAGE0_VERSION})"
+#
+rust_all_arch_uris()
+{
+  local uris=""
+  uris+="amd64? ( $(rust_arch_uri x86_64-unknown-linux-gnu       "$@") ) "
+  uris+="arm?   ( $(rust_arch_uri arm-unknown-linux-gnueabi      "$@")
+                  $(rust_arch_uri arm-unknown-linux-gnueabihf    "$@")
+                  $(rust_arch_uri armv7-unknown-linux-gnueabihf  "$@") ) "
+  uris+="arm64? ( $(rust_arch_uri aarch64-unknown-linux-gnu      "$@") ) "
+  uris+="mips?  ( $(rust_arch_uri mips-unknown-linux-gnu         "$@")
+                  $(rust_arch_uri mipsel-unknown-linux-gnu       "$@")
+                  $(rust_arch_uri mips64-unknown-linux-gnuabi64  "$@") ) "
+  uris+="ppc?   ( $(rust_arch_uri powerpc-unknown-linux-gnu      "$@") ) "
+  uris+="ppc64? ( $(rust_arch_uri powerpc64-unknown-linux-gnu    "$@")
+                  $(rust_arch_uri powerpc64le-unknown-linux-gnu  "$@") ) "
+  uris+="s390?  ( $(rust_arch_uri s390x-unknown-linux-gnu        "$@") ) "
+  uris+="x86?   ( $(rust_arch_uri i686-unknown-linux-gnu         "$@") ) "
+  echo "${uris}"
+}
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 4d02483a927e..878068fc9f4f 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -89,7 +89,7 @@ waf-utils_src_configure() {
 	CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \
 		"--prefix=${EPREFIX}/usr" \
 		"${libdir[@]}" \
-		"$@" \
+		"${@}" \
 		configure || die "configure failed"
 }
 
@@ -102,8 +102,8 @@ waf-utils_src_compile() {
 	[[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose"
 
 	local jobs="--jobs=$(makeopts_jobs)"
-	echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs}"
-	"${WAF_BINARY}" ${_mywafconfig} ${jobs} || die "build failed"
+	echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs} ${*}"
+	"${WAF_BINARY}" ${_mywafconfig} ${jobs} "${@}" || die "build failed"
 }
 
 # @FUNCTION: waf-utils_src_install
@@ -112,8 +112,8 @@ waf-utils_src_compile() {
 waf-utils_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install"
-	"${WAF_BINARY}" --destdir="${D}" install  || die "Make install failed"
+	echo "\"${WAF_BINARY}\" --destdir=\"${D}\" ${*} install"
+	"${WAF_BINARY}" --destdir="${D}" "${@}" install  || die "Make install failed"
 
 	# Manual document installation
 	einstalldocs
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 4f0b1273bcff..15bfd90dbf66 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index 2cfae6c8b535..339897e42729 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -1,9 +1,10 @@
 AUX performous-1.1-gentoo.patch 474 BLAKE2B ff4bdbc43a1129bb4b2d44ac5e818f3f6dccd35ca743345f0934b3cfce66c25c914daf93a4463fa0a30622410737a5983602d1d19fa172bd41e01f3a321ac77a SHA512 b00f13c16dd87645ae3baea80a7430bc0ce46d827ef72ecad21ddac8318f4356bffffd24bd03710a529ca215f20b924f27bc69dd2b3e4870ae19388c8b857338
 AUX performous-1.1-linguas.patch 1033 BLAKE2B b7fd8f8560d9e9dd1fb6120f8d0e72c11529f226fecaf482dc3ae351d28977b196816e8c84db0c9ab1c724b78bc4a757d6b1f854dffbc9ebb3aaea1a05eaaf80 SHA512 d3ca1b7fb271618ea1866328aedb7a49a92ea08b4e3d1d4f3755e0868dc380b97462158cda19c8d1e2e2dd4afb59a6db533a12510699c2082f4e4ff31b069597
+AUX performous-1.1-nomancompress.patch 2368 BLAKE2B e75377ade59604f8dbf2bbe38493d511db8c3b2cae870883881c3108538accc42d42a91334a668b8ab0dd4aa21bf85b024799d4e2edb849cd13f3e21dc4cb460 SHA512 a116b25974426931b3099b502fc8713acac0a5a39f3c0ad12ce76e71d95062970bb05dbd1b01611cb16c3a912e857d668e96b709b4d61f95f38d364fc30d1ad9
 DIST performous-1.1.tar.gz 3965473 BLAKE2B 021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2 SHA512 6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1
 DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed930d6762716b985f35d64b502bcb8c0310ff830384a652bb1b8a72dea5dd08eebbfd89ae047861bd88e2fc983a863d84 SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea
 DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66
 DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8
 DIST ultrastar-songs-shearer-1.zip 50411551 BLAKE2B b91896197b6750dce6998ad309a9aca42aaf11b48c92bd1c30a67befcaf4ac64b6c5207f492e0f8588b986033d297a37bc8c9e505baea809591aa3255034fed4 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b
-EBUILD performous-1.1-r1.ebuild 2474 BLAKE2B eaecbe32cbf0d321090972037a54065d559063b57abe80e5570cbfd74deeffb603d0b25f539fc3b43b207913cae9bcb3a7fa4d1dd0cca61457264981740bbf03 SHA512 cc07a9970af2e12bb8eb4bb0f1279c5213c5937398f5108c89d89a4260ad75e1a608892ea45b418a3fdf20ef7ea1f56335615e3c6f677fa9aa7b4bdba34f82ad
+EBUILD performous-1.1-r1.ebuild 2362 BLAKE2B 0dcf60de7c873015402ea0b9cfd223bead8c8cf442b5825245cce5b1fefcdcad8165a3348b9711a9eee548c99616af7459725b82bc1663d9c4914aa30c2c36ef SHA512 01a3312700f84c7267738c5321044678951fda6c58f00c6cd78910c3a7dbca32a1e4c54a64d29c799d5663123cd111365a5a7dccf193f6f1a9aa25767e938543
 MISC metadata.xml 856 BLAKE2B d467d86270f2f571d310ceac4934aea595a62fa9e234e8897ef0b22871df612cdb335e7e3298a0991db6c98b78ea68b04882de8696150d5acb65944d9ff80c3d SHA512 24da96b0da902a2d54d92e2f74d8c57fdd1e84f35b96d416cb15898485f0387c70f3430e21ba7eebd5bc289f76f02695d246746abe7eb041f9f7e2e0e8e1e4e0
diff --git a/games-arcade/performous/files/performous-1.1-nomancompress.patch b/games-arcade/performous/files/performous-1.1-nomancompress.patch
new file mode 100644
index 000000000000..fd21f9b70343
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.1-nomancompress.patch
@@ -0,0 +1,59 @@
+--- a/docs/man/CMakeLists.txt	2018-10-14 19:57:14.924572577 +0200
++++ b/docs/man/CMakeLists.txt	2018-10-14 20:11:13.250717230 +0200
+@@ -1,14 +1,12 @@
+ find_program(HELP2MAN help2man DOC "Location of the help2man program")
+-find_program(GZIP gzip DOC "Location of the gzip program")
+ mark_as_advanced(HELP2MAN)
+-mark_as_advanced(GZIP)
+-if(HELP2MAN AND GZIP)
+-	set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6.gz)
++if(HELP2MAN)
++	set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6)
+ 	set(H2MFILE ${CMAKE_CURRENT_SOURCE_DIR}/performous.h2m)
+ 	set(PERFORMOUS_EXEC ${CMAKE_BINARY_DIR}/performous)
+ 	add_custom_command(
+ 		OUTPUT ${MANFILE}
+-		COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N | ${GZIP} > ${MANFILE}
++		COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N > ${MANFILE}
+ 		MAIN_DEPENDENCY ${H2MFILE}
+ 		DEPENDS ${PERFORMOUS_EXEC}
+ 		COMMENT "Building Performous man page"
+@@ -17,13 +15,13 @@
+ 	add_custom_target(manpage ALL DEPENDS ${MANFILE})
+ 	iF (APPLE)
+ 	    install(FILES ${MANFILE} DESTINATION Resources/man/man6)
+-	else(APPLE)
++	else()
+     	install(FILES ${MANFILE} DESTINATION share/man/man6)
+ 	endif()
+-else(HELP2MAN AND GZIP)
+-	message("WARNING: One of the following is missing: help2man, gzip; performous man page will not be generated")
+-endif(HELP2MAN AND GZIP)
+-if(ENABLE_TOOLS AND GZIP)
++else()
++	message("WARNING: help2man is missing; performous man page will not be generated")
++endif()
++if(ENABLE_TOOLS)
+ 	set(TOOLS 
+ 		"ss_pak_extract" "ss_extract" "ss_cover_conv"
+ 		"ss_adpcm_decode" "ss_ipu_conv" "ss_chc_decode"
+@@ -31,15 +29,7 @@
+ 	set(MAN_SECTION "1")
+ 	foreach(TOOL ${TOOLS})
+ 		set(TOOL_MANFILE ${CMAKE_CURRENT_SOURCE_DIR}/${TOOL}.${MAN_SECTION})
+-		set(TOOL_MANFILE_GZ ${CMAKE_CURRENT_BINARY_DIR}/${TOOL}.${MAN_SECTION}.gz)
+-		add_custom_command(
+-			OUTPUT ${TOOL_MANFILE_GZ}
+-			COMMAND ${GZIP} -c ${TOOL_MANFILE} > ${TOOL_MANFILE_GZ}
+-			MAIN_DEPENDENCY ${TOOL_MANFILE}
+-			COMMENT "Building ${TOOL} man page"
+-			VERBATIM
+-		)
+-		add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS ${TOOL_MANFILE_GZ})
+-		install(FILES ${TOOL_MANFILE_GZ} DESTINATION share/man/man${MAN_SECTION})
+-	endforeach(TOOL)
+-endif(ENABLE_TOOLS AND GZIP)
++		add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS ${TOOL_MANFILE})
++		install(FILES ${TOOL_MANFILE} DESTINATION share/man/man${MAN_SECTION})
++	endforeach()
++endif()
diff --git a/games-arcade/performous/performous-1.1-r1.ebuild b/games-arcade/performous/performous-1.1-r1.ebuild
index 6b8850506d52..774e839768c3 100644
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ b/games-arcade/performous/performous-1.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 CMAKE_REMOVE_MODULES="yes"
 CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindFreetype FindGettext FindJpeg FindPng FindTiff FindZ"
-
-inherit desktop cmake-utils epatch gnome2-utils
+inherit cmake-utils desktop gnome2-utils
 
 MY_PN="Performous"
 MY_P="${MY_PN}-${PV}"
@@ -13,8 +13,7 @@ SONGS_PN="ultrastar-songs"
 
 DESCRIPTION="SingStar GPL clone"
 HOMEPAGE="https://performous.org/"
-SRC_URI="
-	https://github.com/performous/performous/archive/${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz -> ${P}.tar.gz
 	songs? (
 		mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
 		mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip
@@ -23,12 +22,7 @@ SRC_URI="
 	)
 "
 
-LICENSE="
-	GPL-2
-	songs? (
-		CC-BY-NC-SA-2.5
-		CC-BY-NC-ND-2.5
-	)
+LICENSE="GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )
 "
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -37,24 +31,24 @@ IUSE="midi songs tools webcam"
 RDEPEND="
 	dev-cpp/glibmm:2
 	dev-cpp/libxmlpp:2.6
-	media-libs/portaudio
 	dev-libs/boost[threads(+)]
 	dev-libs/glib:2
 	dev-libs/libxml2:2
 	gnome-base/librsvg:2
 	media-gfx/imagemagick:0=
-	virtual/jpeg:0
+	media-libs/libepoxy
 	media-libs/libpng:0=
 	media-libs/libsdl2[joystick,video]
+	media-libs/portaudio
+	sys-libs/zlib
 	virtual/ffmpeg
-	virtual/opengl
 	virtual/glu
-	sys-libs/zlib
+	virtual/jpeg:0
 	virtual/libintl
+	virtual/opengl
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	x11-libs/pango
-	media-libs/libepoxy
 	midi? ( media-libs/portmidi )
 	webcam? ( media-libs/opencv )
 "
@@ -63,11 +57,17 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
 
+DOCS=( docs/{Authors,instruments}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-linguas.patch
+	"${FILESDIR}"/${P}-nomancompress.patch
+)
+
 src_prepare() {
 	cmake-utils_src_prepare
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-linguas.patch
+
 	sed -i \
 		-e "s:@GENTOO_BINDIR@:/usr/bin:" \
 		-e '/ Z /s/ Z/ ZLIB/g' \
@@ -76,37 +76,27 @@ src_prepare() {
 		-e 's/Jpeg/JPEG/' \
 		-e 's/Png/PNG/' \
 		{game,tools}/CMakeLists.txt || die
-
-	strip-linguas -u lang
 }
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable tools TOOLS)
-		$(cmake-utils_use_enable webcam WEBCAM)
-		$(cmake-utils_use_enable midi MIDI)
+		-DENABLE_TOOLS=$(usex tools)
+		-DENABLE_WEBCAM=$(usex webcam)
+		-DENABLE_MIDI=$(usex midi)
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
 		-DSHARE_INSTALL="/usr/share/${PN}"
 	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 	if use songs ; then
 		insinto "/usr/share/${PN}"
 		doins -r "${WORKDIR}/songs"
 	fi
-	dodoc docs/{Authors,instruments}.txt
-	newicon -s scalable data/themes/default/icon.svg ${PN}.svg
-}
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	newicon -s scalable data/themes/default/icon.svg ${PN}.svg
 }
 
 pkg_postinst() {
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 2f9a2349204e..574fed97422c 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/xgammon/Manifest b/games-board/xgammon/Manifest
index 210027c02da0..b42c73c0c1e4 100644
--- a/games-board/xgammon/Manifest
+++ b/games-board/xgammon/Manifest
@@ -1,6 +1,6 @@
-AUX gcc33.patch 3671 BLAKE2B ed7136e938854cac0571e8d0025e04a4011d66d4a72cbef1ac481b8d663349485f818192c895900101647e584c6629ee5a636ed80afbcdd612b44178e68054f1 SHA512 afebed554856cceddda89a85edc2c8fb327718226a6306273ed1dc74c8809f08cc2a5c510d8af7653f0c2d7713689a693aa586d23ce72ac39378d71fe9821093
-AUX xgammon-0.98-broken.patch 258 BLAKE2B e4c6fbd2e89b5aca345928985d60ba22dec12d78a5ea1478501ed6e014b0081da82d7fd7364c5f98a03ea37ddb304772d3bedb6a86568f4906a2ab5da6fcff39 SHA512 602027d7e3e786932b1452a86f1ab530b8ac7651296b4d78fb466c0d083ecdc5b171af6f18632322c519cc56a018276de1c33f419b04a1d34988d7a6a85f7887
-AUX xgammon-0.98-config.patch 799 BLAKE2B 07ac070806ea0082f609e9b1fbc67c57eea3b6c69564f7fa7968ae1fac974fcf327f2c6a7dcd363ea0148854fd4642ca096b5f484889088082482dc53c1a1616 SHA512 e65dfcc1d12c91fff7cb868b69b28df775c602455a359cb05f33642168c2daf764a410d8180b47bde4bf216dd3cdfc1a5748c85e6a193aa67b7ca2f23648e8a9
+AUX gcc33.patch 3599 BLAKE2B 7004c25311efc2de6ea13068b645608944562ff4a2b88b9531f7bf0744985dc66fad704d7a46a0d5e69d682ab08a7f9b379fb5535010ac39c4d606b71be346e1 SHA512 ad18ff67dd7b7ec0a0cb187e30e6e0f576c5bb0f03a1f5fde28562a673557fb056ab2862ef823e41b61da37461642d40d755ab23e5a1c0fbddbf598a79e77736
+AUX xgammon-0.98-broken.patch 196 BLAKE2B 0005a7f1be80eb8be8b400e0d762cbd8fa83f7508d207f9144e47513be11d1494ce9560a4a3b726a07e557049ff530986a35e591418c0b6ae1f7c9b5b3749575 SHA512 87d6d4250e9a0b3c7276425861f77bbe506fbce6fd5ca5b55a94921ae02a36edebc382eec4eee88ffb33b8fbf41883f63d69dec8c52296e24289640f6ef9ad98
+AUX xgammon-0.98-config.patch 655 BLAKE2B 5ef155a55f75482a0a269451ca09a9e78d21de8bfa96e870bd5d3c5f52faffe04c0639c1a629eec940bca98f802b2400e059b759fd824fff89172807561754a6 SHA512 45478fc0a93bcef9a8d47e615333d9496791e8605a164d4527ff42c8e14fddacccbfabf09a684bfae01d468dfb58adb260c616adad71733fd3650ce6df981e21
 DIST xgammon-0.98a.tar.gz 76415 BLAKE2B 617ca76b8ebe22f753f20f94fc536008c119237e24ad1011a88780416405db95c5155759548e6719c328067387e1cbc052b0ebbbc020ad8e028f564cfcd3c3f1 SHA512 1176146d7cf4d5cbf47e911190de329d87650084044d1a2e5a53ed367d2b90ec63c0e906946c4523c2fb21b68df8b86cf0567527a91058e8db66a76086a02092
 EBUILD xgammon-0.98-r1.ebuild 949 BLAKE2B 724a28818381c487e911cacf0067700f6fe5d16a21a12421e6eec95069074b54dbdfe8c2d0d3c9a20fd9857a781002285ca5f36f743c453a5dd39aa15e669c3c SHA512 a6dc0bec5ba59b94d0649bfdf74ed7cc8e4875104b6cfdcde12c11b7500460305aff3889d8ca3cdd0a4a31ace46b92b3b17b73ce554cb7f6b352854377a3d5ad
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xgammon/files/gcc33.patch b/games-board/xgammon/files/gcc33.patch
index 82dcadd990c7..093eaa1f453b 100644
--- a/games-board/xgammon/files/gcc33.patch
+++ b/games-board/xgammon/files/gcc33.patch
@@ -1,5 +1,5 @@
---- a/xgammon.c	2004-05-07 14:44:07.000000000 -0700
-+++ b/xgammon.c	2004-05-07 14:45:52.000000000 -0700
+--- a/xgammon.c
++++ b/xgammon.c
 @@ -944,31 +944,31 @@
  	for (option=1; option<argc; option++) {
  		if (strcmp (argv[option], "-?") == 0 ||
diff --git a/games-board/xgammon/files/xgammon-0.98-broken.patch b/games-board/xgammon/files/xgammon-0.98-broken.patch
index e94afa0792a1..5e334e83aecb 100644
--- a/games-board/xgammon/files/xgammon-0.98-broken.patch
+++ b/games-board/xgammon/files/xgammon-0.98-broken.patch
@@ -1,5 +1,5 @@
---- xgammon/lib/db.c	Sat Jan  6 12:14:12 2001
-+++ xgammon/lib/db.c	Sat Jan  6 12:13:56 2001
+--- a/lib/db.c
++++ b/lib/db.c
 @@ -259,10 +259,11 @@
      close(fid);
  }
diff --git a/games-board/xgammon/files/xgammon-0.98-config.patch b/games-board/xgammon/files/xgammon-0.98-config.patch
index 1cedd03de3dd..6546cd6f90a3 100644
--- a/games-board/xgammon/files/xgammon-0.98-config.patch
+++ b/games-board/xgammon/files/xgammon-0.98-config.patch
@@ -1,13 +1,13 @@
---- xgammon-0.98/xgammon.ad	Tue Aug 29 01:35:39 1995
-+++ xgammon-0.98/xgammon.ad	Wed Aug 12 18:22:25 1998
+--- a/xgammon.ad
++++ b/xgammon.ad
 @@ -67,4 +67,4 @@
  xgammon.buttonmove:			false
  xgammon.stonesteps:			5
  xgammon.delaytime:			5
 -xgammon.database:			lib/xgammon.db
 +xgammon.database:			/usr/lib/X11/xgammon/xgammon.db
---- xgammon-0.98/Imakefile	Wed Aug 23 15:26:39 1995
-+++ xgammon-0.98/Imakefile	Wed Aug 12 18:42:55 1998
+--- a/Imakefile
++++ b/Imakefile
 @@ -12,9 +12,9 @@
  
  ComplexProgramTarget(xgammon)
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 5d8b17a1b2ba..e1d4b4261c5d 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 1df4b384f4d7..b47961450631 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -4,7 +4,7 @@ AUX 3-odamex-0.7.0-wad-search-path.patch 1758 BLAKE2B a202ea34cf7c219b611d48601a
 AUX 4-odamex-0.7.0-odalauncher-bin-path.patch 1671 BLAKE2B 833c95320ce5567fea90b12eedd7e2703540bff8f1a38e99ec80563ac4556ffe748b946948bb46d12064a08ed46a8c42fac92fbc5d6d408478067650718d92b8 SHA512 4ab5c84d5e3e1465fb02c775fad0208bf177264137d82297515c8f2bf188e9f4ce79a5510e28dfc4811392ecef407b89267e2baf45d37c236fb86cfc066c1ed2
 AUX odamex-0.7.0-gcc6.patch 1149 BLAKE2B e97191c08be8f1987c3374c4920b9016beb1e824e5e7781c8d4ec9088d9eb977e2dbb155ab7930914e3bae295098156c05d0726da7ee2df82a80a90d1ee333a7 SHA512 e34fc554016d67e42d95b9f2e964b69282791a9c07c9976c49990778188bfc1dab5784b29a798e10d6fcd8cc36893bd3416b57c8e2c9f1bd67587a3524c0a422
 AUX odamex-0.7.0-miniupnpc.patch 1144 BLAKE2B feb91380a8f1677f6aae2d29a569f3e452e6464c48962fe7f718a83733ce160b6bf2d4d0c84be78fbdb3f9102862571c13c69a9163a822f003743167d52a564d SHA512 0a805aca36687f183aa168972ecc9bfcd04c117787e42967fbf62b08873943b9f6c5118f15089a70ede43335ce571216255f315e08ce08f89ff23f6859507951
-AUX odamex-0.7.0-miniupnpc20.patch 846 BLAKE2B 3c55c9a761e5abe0de591ce6a53efc915eb7c6a0bdbd308ebff7fc9aa19517d647b882eaeec163a673f071a2f7aab505864ef8e7e64ffb2961682fb024cee190 SHA512 a55e2fea8742bed18765824131d87321e72df293c8e10b6682ade542b7f8feda10f89acbea9dc98749b509c117ae94c070b065ec95434118c73845f74e187664
+AUX odamex-0.7.0-miniupnpc20.patch 850 BLAKE2B 5b3d1efca9a76b64b0783d66f47a3d1f6385963f257cc16c8205d1d5061dc9b7eb0c1b4f3396e6c8e05ed9effdd27e135822dbe7659da9b7ec2584c6d75bdffc SHA512 070a1e93e79485c7e30db95312f5d6cb089fba26acd34f3a1415c311f5753123e967dfe3fc1e4fb8cc3591ed5342387ca7e96daaef2440b759b9b3b4f29e035b
 DIST odamex-src-0.7.0.tar.bz2 8435860 BLAKE2B 9720efdf262047074fed593360b0c38864d5d0f9c076a45d6df9aaf362cba35f41eeafab968338be0911681726872c33e3625934176f75068ca4933655876f7b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b
-EBUILD odamex-0.7.0-r1.ebuild 2680 BLAKE2B 7dab16f3b940503a9710ae254921a28b47c9f4afc27c3ce68080fa266ca2e349a8ee5f66d54e99728b0e69469454a17cc771cb9dd07570e40320d34642cd026c SHA512 45a4c37fe091c908e9aada85da92c508f8eacdc6bddca74e5c3ee4044417fb516e2d4b7ad8e2b7b0e687ebf4918592562c0a09a0e71a5b1fd0a630f9109e9c3d
+EBUILD odamex-0.7.0-r1.ebuild 2441 BLAKE2B 57337f452bef08fd79aa5f1d1ce6a2dfd34fac6456fb9e5069827f9f8a2faafec7b884a4e69e14d209424f4c7eaecf25c15fea85134548ca025a86245f1b7cf8 SHA512 09784c80f0741d80c49659578d1e400298888c76c75e3f33b7b3a1c1e37c9b157fb8c41a652af4d72e92c1459c5908ec274caf2ee92c9aff7ea5678858f94065
 MISC metadata.xml 1467 BLAKE2B 43e3e80b72476360be1f5a345946a96c4ba0b6068209afa8506325a9a8467d56c8f19b62e5713a8d41c6a84cdc24c8218b8dd73453feb7ac621e3338a9421e16 SHA512 386792eba91c781bdb52d0f3d262a516843b3ab17e9522e23506fb7327ca726178ac387d577464faa1608fd396e81b3be813ab2bdac6b92caf10a9133a28332b
diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
index 716a07fe628a..377286220b11 100644
--- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
+++ b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
@@ -1,7 +1,7 @@
 Index: common/i_net.cpp
 ===================================================================
---- common/i_net.cpp	(revision 5459)
-+++ common/i_net.cpp	(working copy)
+--- a/common/i_net.cpp	(revision 5459)
++++ b/common/i_net.cpp	(working copy)
 @@ -151,7 +151,11 @@
  
  	Printf(PRINT_HIGH, "UPnP: Discovering router (max 1 unit supported)\n");
diff --git a/games-engines/odamex/odamex-0.7.0-r1.ebuild b/games-engines/odamex/odamex-0.7.0-r1.ebuild
index 0d2e515d29dc..78af4a724d7e 100644
--- a/games-engines/odamex/odamex-0.7.0-r1.ebuild
+++ b/games-engines/odamex/odamex-0.7.0-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 WX_GTK_VER="3.0"
-inherit cmake-utils eutils gnome2-utils readme.gentoo-r1 wxwidgets
+inherit cmake-utils desktop gnome2-utils readme.gentoo-r1 wxwidgets
 
 MY_P=${PN}-src-${PV}
-DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II"
-HOMEPAGE="http://odamex.net/"
+DESCRIPTION="Online multiplayer, free software engine for Doom and Doom II"
+HOMEPAGE="https://odamex.net/"
 SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dedicated +odalaunch master portmidi server"
+IUSE="dedicated master +odalaunch portmidi server"
 
 RDEPEND="
 	dedicated? ( >=net-libs/miniupnpc-1.8:0= )
@@ -35,23 +36,19 @@ DOC_CONTENTS="
 
 S="${WORKDIR}/src-${PV:2:3}"
 
-pkg_pretend() {
-	if ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags"
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/1-${P}-install-rules.patch
+	"${FILESDIR}"/2-${P}-cmake-options.patch
+	"${FILESDIR}"/3-${P}-wad-search-path.patch
+	"${FILESDIR}"/4-${P}-odalauncher-bin-path.patch
+	"${FILESDIR}"/${P}-miniupnpc.patch
+	"${FILESDIR}"/${P}-miniupnpc20.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/1-${P}-install-rules.patch \
-		"${FILESDIR}"/2-${P}-cmake-options.patch \
-		"${FILESDIR}"/3-${P}-wad-search-path.patch \
-		"${FILESDIR}"/4-${P}-odalauncher-bin-path.patch \
-		"${FILESDIR}"/${P}-miniupnpc.patch \
-		"${FILESDIR}"/${P}-miniupnpc20.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-
-	rm -r libraries/libminiupnpc || die
 	cmake-utils_src_prepare
+	rm -r libraries/libminiupnpc || die
 }
 
 src_configure() {
@@ -59,22 +56,22 @@ src_configure() {
 		-DUSE_INTREE_PORTMIDI=OFF
 		-DCMAKE_INSTALL_BINDIR="/usr/bin"
 		-DCMAKE_INSTALL_DATADIR="/usr/share"
-		$(cmake-utils_use_build master MASTER)
+		-DBUILD_MASTER=$(usex master)
 	)
 
 	if use dedicated ; then
 		mycmakeargs+=(
 			-DBUILD_CLIENT=OFF
 			-DBUILD_ODALAUNCH=OFF
-			-DBUILD_SERVER=ON
 			-DENABLE_PORTMIDI=OFF
+			-DBUILD_SERVER=ON
 		)
 	else
 		mycmakeargs+=(
 			-DBUILD_CLIENT=ON
-			$(cmake-utils_use_build odalaunch ODALAUNCH)
-			$(cmake-utils_use_build server SERVER)
-			$(cmake-utils_use_enable portmidi PORTMIDI)
+			-DBUILD_ODALAUNCH=$(usex odalaunch)
+			-DENABLE_PORTMIDI=$(usex portmidi)
+			-DBUILD_SERVER=$(usex server)
 		)
 	fi
 
@@ -102,10 +99,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	readme.gentoo_print_elog
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 81fe03137040..1a2678f018ee 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 7a892047fcce..13faa76ba6a4 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -9,5 +9,7 @@ DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
 DIST eduke32_src_20180906-6978.tar.xz 14706836 BLAKE2B ed7b3718d73fe633ada5312ffc21feec00bcbcc07844038976efc16c8c91f8d7f3de4f0887a8a5914b33d118bd34b87ccbfce424b3d0803fa89db63fb0bd377b SHA512 6637966c8ace0fe197805a472b46b485dbc759ad7505964a32338c50b806cf269815e773e965cd5c3ddf11b02f3aa2c4e2b27bdb9dda4c909fcd8ac1bef22115
+DIST eduke32_src_20181010-7067.tar.xz 14710088 BLAKE2B 7b2ed7d1c8b81b1b53699d1cb6898525896a534577ac79827b508da33e334dfab3b390323b051a53139c0860ab3ff3b1965015316a81a340d406e66d1d5242ec SHA512 f858d39947dd1f07363c003cefa0289f78f8c37a95019b13e8657769a1bd814399a5b137b0b601aa1330055ebae017dd1bf06db7ec2bb647121628d5187a55dd
 EBUILD eduke32-20180906.6978.ebuild 6078 BLAKE2B ffdd69b00e482624e930d11d9dd040d5c77d185258ef930c86baa66a1960b84d8f9806ce0db4632531388932f82046f6065b786b99386164bde036464fc9aa67 SHA512 46b0c0353bf81b0d66e3edff1a8905b5d0a6779de9fe29cc1308c76cbc537474d1656d1398ff5fa4b868661273ddbc88e416ca1bc36b6b3f578f46a57293c7d4
+EBUILD eduke32-20181010.7067.ebuild 5920 BLAKE2B fdb0f2dac48024488735f9c699a081e574dadef8b7747049cc6dd661e190fd17521ad020f57c3113fe1de97ee4d1e82b4d5be9f7c2f3e334a160917bded42150 SHA512 5191e9a577cdb9889139fcdfb6482d1f4505eca885a6a406914fc64803ad3224df08aed73331b520beed51f85949a29b29cfe7b19039ee7cdffa6ff2f12cb83a
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20181010.7067.ebuild b/games-fps/eduke32/eduke32-20181010.7067.ebuild
new file mode 100644
index 000000000000..07b68e2de18b
--- /dev/null
+++ b/games-fps/eduke32/eduke32-20181010.7067.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit desktop eapi7-ver gnome2-utils toolchain-funcs
+
+MY_BUILD="$(ver_cut 2)"
+MY_DATE="$(ver_cut 1)"
+
+MY_PV_HRP="5.4"
+MY_PV_OFFENSIVE_XXX="1.33"
+MY_PV_OPL="2.01"
+MY_PV_PSX="1.11"
+MY_PV_SC55="4.02"
+MY_PV_VOXELS="1.21"
+
+DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
+HOMEPAGE="http://www.eduke32.com/"
+SRC_URI="http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
+	http://www.eduke32.com/images/eduke32_classic.png
+	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
+	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
+	opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
+	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
+	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
+	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )"
+
+KEYWORDS="~amd64 ~hppa ~x86"
+LICENSE="BUILDLIC GPL-2 HRP"
+SLOT="0"
+IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
+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 )"
+
+S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
+
+MY_DEPEND_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:= )"
+
+RDEPEND="${MY_DEPEND_RDEPEND}
+	cdinstall? ( games-fps/duke3d-data )
+	demo? ( games-fps/duke3d-demodata )"
+
+DEPEND="${MY_DEPEND_RDEPEND}
+	app-arch/unzip
+	x86? ( dev-lang/nasm )"
+
+PATCHES=( "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" )
+
+src_unpack() {
+	# Extract only the eduke32 archive
+	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
+
+	# Unpack only the documentation
+	if use hrp; then
+		unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
+	fi
+	if use offensive; then
+		unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
+	fi
+	if use opl; then
+		unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
+		mv readme.txt opl_readme.txt || die
+	fi
+	if use sc-55; then
+		unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
+	fi
+	if use voxels; then
+		unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
+	fi
+}
+
+src_compile() {
+	local myemakeopts=(
+		ALLOCACHE_AS_MALLOC=0
+		AS=$(tc-getAS)
+		CC=$(tc-getCC)
+		CXX=$(tc-getCXX)
+		CLANG=0
+		CPLUSPLUS=1
+		CUSTOMOPT=""
+		DEBUGANYWAY=0
+		F_JUMP_TABLES=""
+		FORCEDEBUG=0
+		HAVE_FLAC=$(usex flac 1 0)
+		HAVE_GTK2=$(usex gtk 1 0)
+		HAVE_VORBIS=$(usex vorbis 1 0)
+		HAVE_XMP=$(usex xmp 1 0)
+		LINKED_GTK=$(usex gtk 1 0)
+		LTO=1
+		LUNATIC=0
+		KRANDDEBUG=0
+		MEMMAP=0
+		MIXERTYPE=SDL
+		NETCODE=$(usex server 1 0)
+		NOASM=0
+		OPTLEVEL=0
+		OPTOPT=""
+		PACKAGE_REPOSITORY=1
+		POLYMER=$(usex opengl 1 0)
+		PRETTY_OUTPUT=0
+		PROFILER=0
+		RELEASE=1
+		RENDERTYPE=SDL
+		SDL_TARGET=2
+		SIMPLE_MENU=0
+		STRIP=""
+		TANDALONE=0
+		STARTUP_WINDOW=$(usex gtk 1 0)
+		USE_OPENGL=$(usex opengl 1 0)
+		USE_LIBVPX=$(usex vpx 1 0)
+		USE_LIBPNG=$(usex png 1 0)
+		USE_LUAJIT_2_1=0
+		WITHOUT_GTK=$(usex gtk 0 1)
+	)
+
+	emake "${myemakeopts[@]}"
+
+	if use tools; then
+		emake utils "${myemakeopts[@]}"
+	fi
+}
+
+src_test() {
+	# There are no tests
+	# Instead it tries to build a test game, which does not compile
+	:;
+}
+
+src_install() {
+	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
+
+	if use tools; then
+		local tools=(
+			arttool
+			bsuite
+			cacheinfo
+			generateicon
+			givedepth
+			ivfrate
+			kextract
+			kgroup
+			kmd2tool
+			makesdlkeytrans
+			map2stl
+			md2tool
+			mkpalette
+			transpal
+			unpackssi
+			wad2art
+			wad2map
+		)
+
+		dobin "${tools[@]}"
+	fi
+
+	keepdir /usr/share/games/eduke32
+	insinto /usr/share/games/eduke32
+	if use hrp; then
+		doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
+	fi
+	if use offensive; then
+		doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
+	fi
+	if use opl; then
+		doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
+	fi
+	if use psx; then
+		doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
+	fi
+	if use sc-55; then
+		doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
+	fi
+	if use sdk; then
+		doins -r package/sdk
+	fi
+	if use voxels; then
+		doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
+	fi
+
+	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
+
+	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
+	make_desktop_entry mapster32 Mapster32 eduke32 Game
+
+	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt source/duke3d/src/lunatic/doc/*.txt )
+	if use hrp; then
+		DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
+	fi
+	if use offensive; then
+		DOCS+=( "${WORKDIR}"/xxx_readme.txt )
+	fi
+	if use opl; then
+		DOCS+=( "${WORKDIR}"/opl_readme.txt )
+	fi
+	if use sc-55; then
+		DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
+	fi
+	if use voxels; then
+		DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
+	fi
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index d2cc4f1ff165..032a6f57ee44 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,5 +1,4 @@
-AUX urbanterror-4.3-fix-build_system.patch 2774 BLAKE2B d750fab8dcf67e6ac37d6b9e44abf3c7961320bbd51093b198d31e470396dc415219b09ac910a7938a557b6af4d9df39bb7f35cf5e90bb56f97cd334b584db4c SHA512 90d06ee5bb77e13e34923f446c0e8e90fdef5628c6199a4f9508336aa0bb30c0ab273ac794a8eb483c2534e64bf81f76ef449ed90000314f227d39de572809f2
-AUX urbanterror-4.3.3_p20180218-fix-loop.patch 1442 BLAKE2B 045a018bb3476f94b471f62ccf3bacce2b68523de235698b47f2e98979f3a1284b826e9dc74f4fd225ba930057df6d9bed599872568330952fa4ffe0389e2563 SHA512 7a31cded5b99fda6f4c92f5d1ce9ef7606dc87f08a70efc3aea970e6a870e22aeb0a772f63a11d151cd227f68803e028b2f5adee381d8f65c523c585a474b53c
-DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218 SHA512 8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef
-EBUILD urbanterror-4.3.4_p20180627.ebuild 4525 BLAKE2B 66031a89f019f983363ad4d19f2cdaa6a28040234785ff2c873384bfa64070c51c037764f6158dd95d5c046e0b7c820afdf412119c99666bfc5ff64b348189cf SHA512 f67174fe11786d9dca773548c39fed04aa7ec2744d9f9887261253e52fdfa1ac2b03cb1dcc863db59819b87a2a3f055d2b0dd50bdccfc0dbe668df130ec3c52b
-MISC metadata.xml 1109 BLAKE2B 9e9f6a21667badafad0c007a2694a50ceaa467ce28fdc9b3f8838d58dd201f56b0b08c78d3285dfd53dd14db6c5ab26461cb400308abc920ce234048fdc48f8b SHA512 cb55a92c3c03065a17f71e5cfc8151a8c12acbc341389a14f96119960eb23c11613adaa8e9b552946d2db728121118a5130447c892d61a1a909b4dd8b94a5dcc
+AUX urbanterror-4.3.4_p20180708-fix-build_system.patch 2736 BLAKE2B 1feaa3012915877abfc2b10b3ab602f9047d16ae7c69a234558aac286548eb91d9e49dcdc41cd51e7c0c9d28b1545a66e0b54a1cf996a370515bbba811715853 SHA512 9afd32a706d6c5de39b6fc1a7d3831873e2fbaa3e13ae41046b6e7a1e639c22bcfc7e2e61cff8d0fb87094b4dc31157c7f4d6f9ea7b1b97504bf40a61acb0906
+DIST urbanterror-4.3.4_p20180708.tar.gz 6177724 BLAKE2B 36439a1facc83a6151f0f6f28351bd56c196822832abbbab885312a216593b65a359187560c962caf2923b69f5519b17fe901a88c03f61ac576b6998a51ab227 SHA512 97c36d9ebcb4b915d077bb944808f45e88e0f544e6d0261f1e97e5a4bb33f3fd4120cf73d9463ea8da16848e4acb18218afe4042f00d9f759e7481b3e7aecd58
+EBUILD urbanterror-4.3.4_p20180708.ebuild 4472 BLAKE2B 43cdee7cb52cf419d35ce8b6718fb8855004dbc0afd9f953e76bf403232dafdffdb281018ac6eab3554a2881905e1fe7adf204c840ae4229fd123b06f74f4859 SHA512 1e0744d75bc10592a850da07b86e6c64b7da54093fe5d2cbd6ee5d2f22b021bcb94833a1dee6c2a01023dafeb24c0097fb9199cf199674947cb2f37aac5ad7a9
+MISC metadata.xml 1058 BLAKE2B 7e000518ec710f0a6d93d7bdaf28a512e60412bb63bccc7ed9f5d40585eb03ead1515ee26d97068c33dcf41fb45ab15b8296e40ed522fceba1a50958cc488690 SHA512 7bbd3c72cd0fe48c428fd27979289dc8ad68a743cc6e73fdf5c9286007fbfa5d0529e68495af0679c47c6e4b367d3801cec625d07a688ec15269db30d4d51ae2
diff --git a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
deleted file mode 100644
index e0c4eb27f539..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Author: Nils Freydank <holgersson@posteo.de>
-Date:   Fri Nov 17 20:30:00 2017 +0100
-
-Respect CFLAGS, CPPFLAGS etc. This patch is inspired
-by hasufell’s patch.
-
-Edit 2018-03-19: Now with server support!
-
---- a/Makefile	2018-03-19 11:00:00.000000000 +0100
-+++ b/Makefile	2018-03-19 11:00:00.000000001 +0100
-@@ -223,7 +223,7 @@
- ifndef USE_ALTGAMMA
-   # Clearskies - X11-based gamma for Linux
-   USE_ALTGAMMA=1
--endif
-+  endif
- 
- ifndef USE_SKEETMOD
-   USE_SKEETMOD=0
-@@ -306,34 +306,33 @@
- CLIENT_EXTRA_FILES=
- 
- ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
--    -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-+  BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-   CLIENT_CFLAGS += $(SDL_CFLAGS)
- 
--  OPTIMIZEVM = -O3
--  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+  OPTIMIZEVM =
-+  OPTIMIZE = $(OPTIMIZEVM)
- 
-   ifeq ($(ARCH),x86_64)
--    OPTIMIZEVM = -O3
--    OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+    OPTIMIZEVM =
-+    OPTIMIZE = $(OPTIMIZEVM)
-     HAVE_VM_COMPILED = true
-   else
-   ifeq ($(ARCH),x86)
--    OPTIMIZEVM = -O3 -march=i586
--    OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+    OPTIMIZEVM =
-+    OPTIMIZE = $(OPTIMIZEVM)
-     HAVE_VM_COMPILED=true
-   else
-   ifeq ($(ARCH),ppc)
--    BASE_CFLAGS += -maltivec
-+    BASE_CFLAGS +=
-     HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),ppc64)
--    BASE_CFLAGS += -maltivec
-+    BASE_CFLAGS +=
-     HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),sparc)
--    OPTIMIZE += -mtune=ultrasparc3 -mv8plus
--    OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
-+    OPTIMIZE +=
-+    OPTIMIZEVM +=
-     HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),armv7l)
-@@ -1130,12 +1129,12 @@
- 
- define DO_CC
- $(echo_cmd) "CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
- 
- define DO_REF_CC
- $(echo_cmd) "REF_CC $<"
--$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
- 
- define DO_REF_STR
-@@ -1148,7 +1147,7 @@
- 
- define DO_BOT_CC
- $(echo_cmd) "BOT_CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $<
- endef
- 
- ifeq ($(GENERATE_DEPENDENCIES),1)
-@@ -1162,7 +1161,7 @@
- 
- define DO_DED_CC
- $(echo_cmd) "DED_CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
- 
- define DO_WINDRES
-
diff --git a/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch b/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch
deleted file mode 100644
index c34ebe84cedf..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Author: Nils Freydank <holgersson@posteo.de>
-Date:   Wed Mar 14 21:00:00 2017 +0100
-
-Imported patch written by Tom Murphy via github.com:
-
-https://github.com/ioquake/ioq3/pull/356
-
-diff --git a/code/sys/con_tty.c b/code/sys/con_tty.c
-index 2c2b595cf..58f178ade 100644
---- a/code/sys/con_tty.c
-+++ b/code/sys/con_tty.c
-@@ -73,20 +73,6 @@ static int hist_current = -1, hist_count = 0;
- #define TTY_CONSOLE_PROMPT "]"
- #endif
- 
--/*
--==================
--CON_FlushIn
--
--Flush stdin, I suspect some terminals are sending a LOT of shit
--FIXME relevant?
--==================
--*/
--static void CON_FlushIn( void )
--{
--	char key;
--	while (read(STDIN_FILENO, &key, 1)!=-1);
--}
--
- /*
- ==================
- CON_Back
-@@ -441,7 +427,7 @@ char *CON_Input( void )
- 										TTY_con = *history;
- 										CON_Show();
- 									}
--									CON_FlushIn();
-+									tcflush(STDIN_FILENO, TCIFLUSH);
- 									return NULL;
- 									break;
- 								case 'B':
-@@ -455,7 +441,7 @@ char *CON_Input( void )
- 										Field_Clear(&TTY_con);
- 									}
- 									CON_Show();
--									CON_FlushIn();
-+									tcflush(STDIN_FILENO, TCIFLUSH);
- 									return NULL;
- 									break;
- 								case 'C':
-@@ -467,7 +453,7 @@ char *CON_Input( void )
- 					}
- 				}
- 				Com_DPrintf("droping ISCTL sequence: %d, TTY_erase: %d\n", key, TTY_erase);
--				CON_FlushIn();
-+				tcflush(STDIN_FILENO, TCIFLUSH);
- 				return NULL;
- 			}
- 			if (TTY_con.cursor >= sizeof(text) - 1)
diff --git a/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch b/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch
new file mode 100644
index 000000000000..fddd8df5bf37
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch
@@ -0,0 +1,94 @@
+Author: Nils Freydank <holgersson@posteo.de>
+Date:   Fri Nov 17 20:30:00 2017 +0100
+
+Respect CFLAGS, CPPFLAGS etc. This patch is inspired
+by hasufell’s patch.
+
+Edit 2018-03-19: Now with server support!
+Edit 2018-09-01: Update to take Makefile changes into account.
+
+--- a/Makefile	2018-07-08 11:00:00.000000000 +0200
++++ b/Makefile	2018-09-01 11:00:00.000000001 +0200
+@@ -308,34 +308,33 @@
+ CLIENT_EXTRA_FILES=
+ 
+ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+-    -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
++  BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
+   CLIENT_CFLAGS += $(SDL_CFLAGS)
+ 
+-  OPTIMIZEVM = -O3
+-  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++  OPTIMIZEVM =
++  OPTIMIZE = $(OPTIMIZEVM)
+ 
+   ifeq ($(ARCH),x86_64)
+-    OPTIMIZEVM = -O3
+-    OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++    OPTIMIZEVM =
++    OPTIMIZE = $(OPTIMIZEVM)
+     HAVE_VM_COMPILED = true
+   else
+   ifeq ($(ARCH),x86)
+-    OPTIMIZEVM = -O3 -march=i586
+-    OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++    OPTIMIZEVM =
++    OPTIMIZE = $(OPTIMIZEVM)
+     HAVE_VM_COMPILED=true
+   else
+   ifeq ($(ARCH),ppc)
+-    ALTIVEC_CFLAGS = -maltivec
++    ALTIVEC_CFLAGS =
+     HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),ppc64)
+-    ALTIVEC_CFLAGS = -maltivec
++    ALTIVEC_CFLAGS =
+     HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),sparc)
+-    OPTIMIZE += -mtune=ultrasparc3 -mv8plus
+-    OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
++    OPTIMIZE +=
++    OPTIMIZEVM +=
+     HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),armv7l)
+@@ -1143,7 +1142,7 @@
+ 
+ define DO_CC
+ $(echo_cmd) "CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
+ endef
+ 
+ define DO_CC_ALTIVEC
+@@ -1153,7 +1152,7 @@
+ 
+ define DO_REF_CC
+ $(echo_cmd) "REF_CC $<"
+-$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
+ endef
+ 
+ define DO_REF_CC_ALTIVEC
+@@ -1171,7 +1170,7 @@
+ 
+ define DO_BOT_CC
+ $(echo_cmd) "BOT_CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $<
+ endef
+ 
+ ifeq ($(GENERATE_DEPENDENCIES),1)
+@@ -1185,7 +1184,7 @@
+ 
+ define DO_DED_CC
+ $(echo_cmd) "DED_CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
+ endef
+ 
+ define DO_WINDRES
+
diff --git a/games-fps/urbanterror/metadata.xml b/games-fps/urbanterror/metadata.xml
index 38fad51f813c..c57b90db2fc0 100644
--- a/games-fps/urbanterror/metadata.xml
+++ b/games-fps/urbanterror/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="altgamma">Alternative way for gamma setting with modesetting driver</flag>
 		<flag name="client">Build binary for client (includes code for non-dedicated server)</flag>
 		<flag name="mumble">Use Mumble for ingame VoIP (experimental)</flag>
-		<flag name="opus">Use opus as sound codec</flag>
 		<flag name="server">Build binary for dedicated server</flag>
 		<flag name="skeetshootmod">Build support for skeetshoot mod for specific maps</flag>
 		<flag name="voip">Use ioq3 ingame VoIP (experimental)</flag>
diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
deleted file mode 100644
index 04d4459533ea..000000000000
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit desktop eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
-	EGIT_BRANCH="urt"
-else
-	COMMIT_ID="e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64"
-	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ioq3-${COMMIT_ID}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
-REQUIRED_USE="|| ( client server )
-		voip? ( opus )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3-fix-build_system.patch
-	"${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
-)
-
-RDEPEND="
-	client? (
-		media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-		mumble? ( media-sound/mumble:= )
-		openal? ( media-libs/openal:= )
-		opus? ( media-libs/opusfile:= )
-		vorbis? ( media-libs/libvorbis:= )
-	)
-	curl? ( net-misc/curl )
-	~games-fps/urbanterror-data-4.3.4
-	sys-libs/zlib:=[minizip]
-	virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	if use client; then
-		if ! use openal && ! use opus && ! use vorbis; then
-			ewarn
-			ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
-		fi
-	fi
-}
-
-src_configure() {
-	default
-
-	tc-export CC
-}
-
-src_compile() {
-	# Workaround for used zlib macro, which got renamed in Gentoo
-	# wrt bug #449510
-	append-cppflags "-DOF=_Z_OF"
-
-	local myemakeargs=(
-		ARCH=$(usex amd64 "x86_64" "i686" )
-		DEFAULT_BASEDIR="/usr/share/urbanterror"
-		BUILD_CLIENT=$(usex "client" 1 0)
-		BUILD_SERVER=$(usex "server" 1 0)
-		BUILD_BASEGAME=1
-		BUILD_MISSIONPACK=0
-		BUILD_GAME_SO=0
-		BUILD_GAME_QVM=0
-		BUILD_STANDALONE=1
-		SERVERBIN="Quake3-UrT-Ded"
-		CLIENTBIN="Quake3-UrT"
-		USE_RENDERER_DLOPEN=0
-		USE_YACC=0
-		BASEGAME="q3ut4"
-		BASEGAME_CFLAGS="${CFLAGS}"
-		USE_OPENAL=$(usex "openal" 1 0)
-		USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
-		USE_CURL=$(usex "curl" 1 0)
-		USE_CURL_DLOPEN=$(usex "curl" 1 0)
-		USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
-		USE_CODEC_OPUS=$(usex "opus" 1 0)
-		USE_MUMBLE=$(usex "mumble" 1 0)
-		USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
-		USE_VOIP=$(usex "mumble" 1 0)
-		USE_INTERNAL_LIBS=0
-		USE_LOCAL_HEADERS=0
-		USE_ALTGAMMA=$(usex "altgamma" 1 0)
-		$(usex "debug" "debug" "release")
-	)
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myarch=$(usex amd64 "x86_64" "i386")
-	local myreleasetype=$(usex debug "debug" "release")
-
-	if use client; then
-		newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT.${myarch} ${PN}
-		# Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
-		make_desktop_entry ${PN} "UrbanTerror" ${PN}
-	fi
-
-	if use server && ! use client; then
-		# dedicated server only
-		newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT-Ded.${myarch} ${PN}-ded
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use client && xdg_desktop_database_update
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# ^this is a new installation, so:
-		if use openal; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta s_useopenal \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
-		fi
-
-		if use altgamma; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta r_altgamma \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
-			elog "Be aware that altgamme works on a global scale, so external"
-			elog "applications like redshift can cause trouble. Disabling"
-			elog "these while playing is a usable workaround."
-		fi
-
-		if ! use altgamma; then
-			elog ""
-			elog "If you are using a modesetting graphics driver you might"
-			elog "consider setting USE=\"altgamma\"."
-			elog "For details take a look at:"
-			elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
-		fi
-
-		if ! use client; then
-			elog ""
-			elog "You disabled client support. You won't be able to connect"
-			elog "to any servers and play. If you want to do so, enable"
-			elog "USE=\"client\"."
-		fi
-
-		if use skeetshootmod; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta sv_skeetshoot \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	use client && xdg_desktop_database_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild
new file mode 100644
index 000000000000..2eed0405afcc
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
+	EGIT_BRANCH="urt"
+else
+	COMMIT_ID="167cb6b611ad27f30787a2fe204a7c65ec1fa18e"
+	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ioq3-${COMMIT_ID}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
+REQUIRED_USE="|| ( client server )
+		voip? ( opus )"
+
+DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.4_p20180708-fix-build_system.patch
+)
+
+RDEPEND="
+	client? (
+		media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+		mumble? ( media-sound/mumble:= )
+		openal? ( media-libs/openal:= )
+		opus? ( media-libs/opusfile:= )
+		vorbis? ( media-libs/libvorbis:= )
+	)
+	curl? ( net-misc/curl )
+	~games-fps/urbanterror-data-4.3.4
+	sys-libs/zlib:=[minizip]
+	virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	if use client; then
+		if ! use openal && ! use opus && ! use vorbis; then
+			ewarn
+			ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
+		fi
+	fi
+}
+
+src_configure() {
+	default
+
+	tc-export CC
+}
+
+src_compile() {
+	# Workaround for used zlib macro, which got renamed in Gentoo
+	# wrt bug #449510
+	append-cppflags "-DOF=_Z_OF"
+
+	local myemakeargs=(
+		ARCH=$(usex amd64 "x86_64" "i686" )
+		DEFAULT_BASEDIR="/usr/share/urbanterror"
+		BUILD_CLIENT=$(usex "client" 1 0)
+		BUILD_SERVER=$(usex "server" 1 0)
+		BUILD_BASEGAME=1
+		BUILD_MISSIONPACK=0
+		BUILD_GAME_SO=0
+		BUILD_GAME_QVM=0
+		BUILD_STANDALONE=1
+		SERVERBIN="Quake3-UrT-Ded"
+		CLIENTBIN="Quake3-UrT"
+		USE_RENDERER_DLOPEN=0
+		USE_YACC=0
+		BASEGAME="q3ut4"
+		BASEGAME_CFLAGS="${CFLAGS}"
+		USE_OPENAL=$(usex "openal" 1 0)
+		USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
+		USE_CURL=$(usex "curl" 1 0)
+		USE_CURL_DLOPEN=$(usex "curl" 1 0)
+		USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
+		USE_CODEC_OPUS=$(usex "opus" 1 0)
+		USE_MUMBLE=$(usex "mumble" 1 0)
+		USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
+		USE_VOIP=$(usex "mumble" 1 0)
+		USE_INTERNAL_LIBS=0
+		USE_LOCAL_HEADERS=0
+		USE_ALTGAMMA=$(usex "altgamma" 1 0)
+		$(usex "debug" "debug" "release")
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myarch=$(usex amd64 "x86_64" "i386")
+	local myreleasetype=$(usex debug "debug" "release")
+
+	if use client; then
+		newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT.${myarch} ${PN}
+		# Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
+		make_desktop_entry ${PN} "UrbanTerror" ${PN}
+	fi
+
+	if use server && ! use client; then
+		# dedicated server only
+		newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT-Ded.${myarch} ${PN}-ded
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use client && xdg_desktop_database_update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# ^this is a new installation, so:
+		if use openal; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta s_useopenal \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
+		fi
+
+		if use altgamma; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta r_altgamma \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
+			elog "Be aware that altgamme works on a global scale, so external"
+			elog "applications like redshift can cause trouble. Disabling"
+			elog "these while playing is a usable workaround."
+		fi
+
+		if ! use altgamma; then
+			elog ""
+			elog "If you are using a modesetting graphics driver you might"
+			elog "consider setting USE=\"altgamma\"."
+			elog "For details take a look at:"
+			elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
+		fi
+
+		if ! use client; then
+			elog ""
+			elog "You disabled client support. You won't be able to connect"
+			elog "to any servers and play. If you want to do so, enable"
+			elog "USE=\"client\"."
+		fi
+
+		if use skeetshootmod; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta sv_skeetshoot \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	use client && xdg_desktop_database_update
+}
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 26ca77a3e1a7..d2c15dafa48d 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index c8a06f4e783d..0ddd581838b0 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,4 +1,3 @@
-AUX gcompris-15.10-build.patch 2824 BLAKE2B e0d0974e06f344f7d53f37cd88b2e9200e963ede7cf128b6194527358883808a58d80478c2d9a878a7eed0ec594fa2fd87c72f0c3025d275aa5bb445c7d11457 SHA512 521eb3f79424b7b7678984d9175cd4c20ec15c541ac52f012fba426163c284a6c6ccae622f05ef4ef7da0d5bcf16ddfc8cc9b5ad2d48aeca9a7f7a112209929d
-DIST gcompris-15.10.tar.bz2 279959562 BLAKE2B f8c9287a881a98bacf9b057e518597552a2f84f8bb9143684c1f7ba8f7803589c44b383c17af5b21715f4c71c78456540c5334cea4247380d28abd161b5ae756 SHA512 1915a6934f3111e871be2777ed88c8d15a3ddb85f0c16d92333b6ebcba0cbbe526e51e84ecc576021cd807a5d69bb9570dba481ddc925da9d4dd35a0075380fc
-EBUILD gcompris-15.10-r1.ebuild 1991 BLAKE2B e026f977e1dc8d1fdfff89b0921c7581606216ccfd38157985fae43bfd82a5cee6d4429cf01a8254cbae39a51aabb78109cd5953c6b9cc787a3680504c9492ff SHA512 23980183bd8d221af17d61de9ab4471abbd1a64d5f157cb21aef94357d880919c7534f3a97a8565897a9a1019f880ff34d598a3a5398d0ca9c01119cdce49a69
-MISC metadata.xml 259 BLAKE2B de713fcef8fdf70397a1488db3be1d10415e1177b400921c0017b69bcfb1849bb5eaef32ca00118ff25391d52d2071af70c83b6357fbf5199e4745d34e9994e1 SHA512 8516e2364a64325b483a394a14c52e32b029beccd05586623e5dba0b861970722c3709070c8fd4b80a23f0a84b74a475485b0f2b05f44fae6f27f163714aef68
+DIST gcompris-qt-0.91.tar.xz 70681140 BLAKE2B 6f392eb5065afe8239ef99ba12d0fdcdedc9e0bb4ec16fd9acfa17c6597b495cf7153095fc4fb07c0eb9f7e0aae1f51888157c84b846cfd0112ab2a3465e3ecf SHA512 bc4515acc5c58869997e44c0c3c38d2904f34a7a5efede1ee7aefcbd1ae5907fe00b29a3ecf8e5e46396031736d10df64523e280dfffe3bac2df7e34fe9a8eda
+EBUILD gcompris-0.91.ebuild 872 BLAKE2B 62cf0d6619ad3331d6b4664b9e5e174b42d7f1633b2b82aa013b7893bf20d8ebb7198248d5b26fa83cc8f59ffe5df0b294e2d4e3494e2b6a26358bbbc3634477 SHA512 781ef9cd2265b21f8bba65a7fb59aee13d860418746af94eb625f32d519c46992d1f4dc86a958bd5bd481fafa348d601cb209d21e2ce085b2755ccc1c0a18fb4
+MISC metadata.xml 373 BLAKE2B e6b271517e9384b607e1f768c1e8cf6378b58ab96e1be1be147c3f592fd99faee60fa5ed40aae8da80a1e44d890ee382aad028b7218e16b1a230752e60c95a6c SHA512 c06e790af93664b0d322361afc0879311d8d201044c47db404ff752157797132f138382b1399cd1ee14d2b37aa92fb7791b9a218830fd1fe73dd1763147e8dc4
diff --git a/games-kids/gcompris/files/gcompris-15.10-build.patch b/games-kids/gcompris/files/gcompris-15.10-build.patch
deleted file mode 100644
index 077d1f6baf1a..000000000000
--- a/games-kids/gcompris/files/gcompris-15.10-build.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- gcompris-13.11.orig/Makefile.am
-+++ gcompris-13.11/Makefile.am
-@@ -7,7 +7,7 @@
- # endif
- 
- 
--icondir=$(datadir)/pixmaps
-+icondir=/usr/share/pixmaps
- icon_DATA = gcompris.png gcompris-edit.png
- 
- if BUILD_MINGW32
-@@ -15,7 +15,7 @@
- Applications_in_files =
- Applications_DATA =
- else
--Applicationsdir = $(datadir)/applications/
-+Applicationsdir = /usr/share/applications/
- Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
- Applications_DATA = gcompris.desktop gcompris-edit.desktop
- endif
---- gcompris-13.11.orig/configure.ac
-+++ gcompris-13.11/configure.ac
-@@ -57,7 +57,8 @@
-   gtk+-2.0 >= $GTK_REQUIRED \
-   librsvg-2.0 >= $LIBRSVG_REQUIRED \
-   libxml-2.0 >= $LIBXML_REQUIRED \
--  gthread-2.0 )
-+  gthread-2.0 \
-+  gmodule-2.0 )
- 
- AC_SUBST(GCOMPRIS_CFLAGS)
- AC_SUBST(GCOMPRIS_LIBS)
-@@ -204,10 +205,8 @@
-           USE_DEBUG="$enableval", USE_DEBUG="no")
- if test "x$USE_DEBUG" == "xyes" ; then
-     AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
--    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -g"
--else
--    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -O2"
- fi
-+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
- 
- dnl disable activation code
- AC_ARG_ENABLE(disable-activation-code,
-@@ -336,21 +335,21 @@
-   fi
- else
-   dnl Set PACKAGE_LOCALE_DIR in config.h.
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
- 
-   dnl Set PACKAGE_DATA_DIR
-   PACKAGE_DATA_DIR="boards"
-   AC_SUBST(PACKAGE_DATA_DIR)
--  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
- 
-   dnl Plugin Directory
-   my_libdir=`eval echo "${libdir}"`
--  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
-   plugindir=$libdir/gcompris
-   AC_SUBST(plugindir)
- 
-   dnl Python plugin Directory
--  PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
-+  PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
-   AC_SUBST(PYTHON_PLUGIN_DIR)
- 
-   dnl System GCompris config directory
---- gcompris-13.11.orig/src/gcompris/gcompris.c
-+++ gcompris-13.11/src/gcompris/gcompris.c
-@@ -1322,7 +1322,7 @@
-     properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
-     properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
- 							NULL);
--    properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
-+    properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
-     properties->menu_dir = g_strdup(properties->package_data_dir);
-     g_free(pkg_data_dir);
-     g_free(pkg_clib_dir);
diff --git a/games-kids/gcompris/gcompris-0.91.ebuild b/games-kids/gcompris/gcompris-0.91.ebuild
new file mode 100644
index 000000000000..052f974c10bb
--- /dev/null
+++ b/games-kids/gcompris/gcompris-0.91.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop
+
+DESCRIPTION="full featured educational application for children from 2 to 10"
+HOMEPAGE="https://gcompris.net/"
+SRC_URI="http://gcompris.net/download/qt/src/gcompris-qt-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}-qt-${PV}"
+
+RDEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgraphicaleffects
+	dev-qt/qtgui
+	dev-qt/qtmultimedia[qml]
+	dev-qt/qtnetwork
+	dev-qt/qtquickcontrols
+	dev-qt/qtsensors[qml]
+	dev-qt/qtsvg
+	dev-qt/qtxml
+	dev-qt/qtxmlpatterns"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools"
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: add box2d support
+		-DQML_BOX2D_MODULE=disabled
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	domenu org.kde.gcompris.desktop
+}
diff --git a/games-kids/gcompris/gcompris-15.10-r1.ebuild b/games-kids/gcompris/gcompris-15.10-r1.ebuild
deleted file mode 100644
index 6d417a86f543..000000000000
--- a/games-kids/gcompris/gcompris-15.10-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="full featured educational application for children from 2 to 10"
-HOMEPAGE="http://gcompris.net/"
-SRC_URI="http://gcompris.net/download/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="x11-libs/gtk+:2
-	gnome-base/librsvg[gtk(+)]
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-good:0.10
-		media-plugins/gst-plugins-alsa:0.10
-		media-plugins/gst-plugins-ogg:0.10
-		media-plugins/gst-plugins-vorbis:0.10 )
-	!gstreamer? (
-		media-libs/sdl-mixer
-		media-libs/libsdl:0 )
-	dev-db/sqlite:3
-	dev-libs/libxml2
-	dev-libs/popt
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	virtual/libintl
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	dev-perl/XML-Parser
-	gnome-base/gnome-common
-	sys-apps/texinfo
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-gfx/tuxpaint
-	sci-electronics/gnucap"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Drop DEPRECATED flags, bug #387817
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		src/gcompris/Makefile.am || die
-
-	cp /usr/share/gettext/config.rpath .
-	eautoreconf
-
-	sed -i \
-		-e 's#^itlocaledir =.*$#itlocaledir = @localedir@#' \
-		po/Makefile.in.in || die
-
-	# Fix desktop files
-	sed -i \
-		-e '/Encoding/d' \
-		gcompris.desktop.in \
-		gcompris-edit.desktop.in || die
-}
-
-src_configure() {
-	GNUCHESS="/usr/bin/gcompris-gnuchess" \
-	econf \
-		--datarootdir="/usr/share" \
-		--datadir="/usr/share" \
-		--localedir=/usr/share/locale \
-		--infodir=/usr/share/info \
-		--with-python="${PYTHON}" \
-		$(use_enable !gstreamer sdlmixer) \
-		--enable-sqlite \
-		--enable-py-build-only
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/games-kids/gcompris/metadata.xml b/games-kids/gcompris/metadata.xml
index c040f7c7d3e0..d7ee581b071f 100644
--- a/games-kids/gcompris/metadata.xml
+++ b/games-kids/gcompris/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>vdupras@gentoo.org</email>
+    <name>Virgil Dupras</name>
+  </maintainer>
   <maintainer type="project">
     <email>games@gentoo.org</email>
     <name>Gentoo Games Project</name>
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index c35e4f208d3b..ec081acde405 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/arx-fatalis-data/Manifest b/games-rpg/arx-fatalis-data/Manifest
index ee19c2b54f9e..121cb633115c 100644
--- a/games-rpg/arx-fatalis-data/Manifest
+++ b/games-rpg/arx-fatalis-data/Manifest
@@ -1,4 +1,4 @@
 DIST ArxFatalis_1.21_MULTILANG.exe 9064611 BLAKE2B 42a81491ff470843a80bd6f801a1d8d5b1295603c3b6ec759f545d6fed9530b64ca684b772735f92187eb4eb613b12f68ce7d0491a157123578476b835bb40eb SHA512 885260c6173ee5f2d6d6072bcfd14d085f11b997a0ce45cbdee9a347612e96da13477ef7d71b9c015fb02f2e47bdfb968a2aa89b0c92e9327abbd75b724e47c2
 DIST setup_arx_fatalis_2.0.0.7.exe 525046992 BLAKE2B 558bffc8f4a0096761a9b1c8003b8127480bf03b1198b943dfe3c0bc8c6b9642275f86f5f4e9c6bbc2211bf48e38bebef634b24196b48d1d5520abf75254033f SHA512 08be7870d02ed6da8cedceb652906ea169eedcb44497a4517ef6a42d9db37403b5146b9e5a3a628a465f23088b0c09d958719e05454dcbb5ac12225c32d35942
-EBUILD arx-fatalis-data-1.21-r4.ebuild 2744 BLAKE2B ae9e493f0c251a118593bf5df93604f108ab221deb91d5eee16bf50b54d5b36968b437a3fbbf4dc6c76bf3a66cf971d8a5f9b80c2f6e7b8ad64c4195fb81d4d0 SHA512 38259961c0613a2e7eb349f5fecaf9fdb609070cd8613506945c6fcd41c7fabe0b687055404ef50183561398c51a50a576873e5046282d8ecfb725fc0715b810
+EBUILD arx-fatalis-data-1.21-r4.ebuild 2741 BLAKE2B 887dbae5a59653a4f3fa421f083c722d60e420859a385557c45cac109a29c4a4f9397f1b6fda348e12e5886a61bf795411a623068ba4bee6ebe184cf3a179be7 SHA512 9da163c8aab09019b77e40549157d9e72de0b446b5302334c57fdcac729988296c84e87a93fb17231294c5b7e44250d87fc176961fe331005cf687f6bb8abc77
 MISC metadata.xml 568 BLAKE2B df7b3692077bfc0e63f920d5bdb61072498ec1de1de6add84d2756ccf384930f2552aa5f5ee50f1732e7030a9d266c6888ee5bf1fe91098e550cef16e50b970d SHA512 a4fd63f6c3ce3eb957694c1a2e61fa13783a09b7072832371c6ac8dd65490d0cc9206467fb88c494a864ae6e1df1d530a52f38b663df9f601feeeba8df5f0555
diff --git a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
index e8f9d5770890..dc78d66cf81a 100644
--- a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
+++ b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
@@ -8,7 +8,7 @@ inherit eutils cdrom check-reqs
 
 DESCRIPTION="Arx Fatalis data files"
 HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
-SRC_URI="cdinstall? ( http://download.zenimax.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe )
+SRC_URI="cdinstall? ( https://cdn.bethsoft.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe )
 	gog? ( setup_arx_fatalis_2.0.0.7.exe )"
 
 LICENSE="cdinstall? ( ArxFatalis-EULA-JoWooD ) gog? ( GOG-EULA )"
diff --git a/games-rpg/arx-fatalis-demo/Manifest b/games-rpg/arx-fatalis-demo/Manifest
index c39d62a34cdc..d3bc4effa2e7 100644
--- a/games-rpg/arx-fatalis-demo/Manifest
+++ b/games-rpg/arx-fatalis-demo/Manifest
@@ -1,3 +1,3 @@
 DIST arx_demo_english.zip 160545354 BLAKE2B 2693bdd2546c8788eb8c9fc303065f880c3995cfa1d75ca613b8ebb32238a3852dd7eeb20731f7c685521b669c47df45bcf22842772227be5cc3483ec3869c77 SHA512 0cbf0d6da1a373ed29edc49c65ed431117c868ec7bcab04166abd59f5d799460faec506baf191c83fa7c61372888009abb260d8a50e28507a5ec8ab7913a9ad7
-EBUILD arx-fatalis-demo-0.ebuild 1289 BLAKE2B 0936a3355f2ae853783df034db76246b0a953b6315b1e46b173c9337d00609111eccdf43094ec7741444c9e74b32494f94ad1c9e9edc2182454ae738464af955 SHA512 99a20d0f550aff284c062c5c7da2444ec9b713fd0ee610e406d55f9d8eee7f0b2857ddc16e3515a7143daf0538d69b53045044e1695c2ebc26b5833f676a73c5
+EBUILD arx-fatalis-demo-0-r1.ebuild 1248 BLAKE2B 78cf7170451e9372b9aa2cfec8b637bcba76d611ac2b87b23f37ceb1cab32e1333723dee95bc77cd5f8aab6eecfad57fec081558ef01a23012a8bdd241785d89 SHA512 fdebbecd382e1b869840907fcc07df3d596206f656fd77e5c580fab0e19bced5fe206ebdb62075fff70925a66b94dc55c5174da7034aac913393047355efec5a
 MISC metadata.xml 481 BLAKE2B 3200a8ff8937163cf8132a3387d21516b532df01bddcdd377eaf84b3c43ba54b766f2c8def173b2ef4bc32d660b022282295207918809437d3daa85d28b3bf7a SHA512 25957616a3defb79f4ffe4ea925d7eea8f121995bbef149ad8176735eba4597b05d0467457834387ebab951a7b205ff7a1dfd5b272de36aa2ab783553d649e18
diff --git a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0-r1.ebuild b/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0-r1.ebuild
new file mode 100644
index 000000000000..f249e93678b4
--- /dev/null
+++ b/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="Arx Fatalis demo"
+HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
+SRC_URI="arx_demo_english.zip"
+
+LICENSE="ArxFatalisDemo"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="fetch"
+
+RDEPEND="games-rpg/arx-libertatis"
+DEPEND="
+	app-arch/cabextract
+	app-arch/unzip
+"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please find and download ${SRC_URI} and put it into ${DISTDIR}."
+	einfo "There is a list of possible download locations at"
+	einfo "http://wiki.arx-libertatis.org/Getting_the_game_data#Demo"
+}
+
+src_unpack() {
+	unpack ${A}
+	cabextract Setup1.cab || die "cabextract failed"
+	cabextract Setup2.cab || die "cabextract failed"
+	cabextract Setup3.cab || die "cabextract failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r *.pak bin/*.pak
+	insinto /usr/share/${PN}/misc
+	doins bin/Logo.bmp bin/Arx.ttf
+
+	# convert to lowercase
+	cd "${D}"
+	find . -type f -exec sh -c 'echo "${1}"
+	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
+	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
+
+	make_desktop_entry "arx --data-dir=/usr/share/arx-fatalis-demo" \
+		"Arx Fatalis Demo" arx-libertatis
+}
diff --git a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild b/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild
deleted file mode 100644
index b3c07e2abd36..000000000000
--- a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils games
-
-DESCRIPTION="Arx Fatalis demo"
-HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
-SRC_URI="arx_demo_english.zip"
-
-LICENSE="ArxFatalisDemo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch"
-
-RDEPEND="games-rpg/arx-libertatis"
-DEPEND="app-arch/cabextract
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
-	einfo "Please find and download ${SRC_URI} and put it into ${DISTDIR}."
-	einfo "There is a list of possible download locations at"
-	einfo "http://wiki.arx-libertatis.org/Getting_the_game_data#Demo"
-}
-
-src_unpack() {
-	unpack ${A}
-	cabextract Setup1.cab || die "cabextract failed"
-	cabextract Setup2.cab || die "cabextract failed"
-	cabextract Setup3.cab || die "cabextract failed"
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r *.pak bin/*.pak
-	insinto "${GAMES_DATADIR}/${PN}/misc"
-	doins bin/Logo.bmp bin/Arx.ttf
-
-	# convert to lowercase
-	cd "${D}"
-	find . -type f -exec sh -c 'echo "${1}"
-	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-
-	make_desktop_entry "arx --data-dir=${GAMES_DATADIR}/arx-fatalis-demo" \
-		"Arx Fatalis Demo" arx-libertatis
-
-	prepgamesdirs
-}
diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest
index bab50e20be0b..3977511f4c9a 100644
--- a/games-rpg/arx-libertatis/Manifest
+++ b/games-rpg/arx-libertatis/Manifest
@@ -1,4 +1,4 @@
 AUX arx-libertatis-1.1.2-cmake-3.5.patch 888 BLAKE2B 4294247d6ee5f24c7619e9b4cdfafa3efa5d5caf89d5c639a7083b4d408debfa985b95985eb0adfa680d4e2dd49f5afce0f295219eb31fe3762eca8487bff223 SHA512 c1da4981c407bc94ce87b520e2b6288fd6bac437a14dc3b54e8c2c7b01cbda0938b6995581938a2381d1f035ace95df58f3d894e8f7c6070986a5bc43f5e54c2
 DIST arx-libertatis-1.1.2.tar.xz 970608 BLAKE2B 1d4cef400db8223a930d1ff7b3bffbdcd46e47836d99f0c4545ad1bfc575b2b0ed972c9962272c043830be75a54be7992a70429d2692e5811865786370c35d6d SHA512 d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8
-EBUILD arx-libertatis-1.1.2-r1.ebuild 2475 BLAKE2B d97ee646fc453258b83ff90305887e429321cb85c41e8b8b3690afe344a85cb22b9d2cf846d36f30e7088073b1422d74af75ee0e952ee9dd988aa88a395b5797 SHA512 5bd56b938de00f8864194a3575bc7a43afe81315e2728f0e138ccbf273d7a2acafd7f035262c1dbec0912f28b34c542b4841014c360e5073e24be565f0ed51dd
+EBUILD arx-libertatis-1.1.2-r2.ebuild 2043 BLAKE2B 356cd8e6a4b0171dae2ccc17a0291f4daa1945030ecedd577e74f1d7f8afca5619a640554e9fdfc892078f17a91f02122cc2f70ccc164edcbaa3e1e0ddadb7f5 SHA512 b6e13fd1547e48ed7769bffefa92f07611e8c4404ff8ed1734baa1c7ad40a7cd6a7bf531ae87140585df016922a84cc506ca9dd88371173e0b3fce2cbef9d726
 MISC metadata.xml 2564 BLAKE2B 13a668c7bbdb5a7184dbc3334a49d7e342c6400c39af01945ec9fb25ce001faa5267ef874237bafdca399acd38e322ea49f0fcf2a1b5c5eb4089a5be2decb2e3 SHA512 c34718413d4e273abffb224a307075529a3845ac3ceeef7bd38157e16ba0b222c77a2d4b7de2508901a6e0c6602462d907e269d8b83f1554639e97e3dc7133cb
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild
deleted file mode 100644
index 6d505c464f01..000000000000
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_WARN_UNUSED_CLI=yes
-inherit eutils cmake-utils gnome2-utils games
-
-DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
-HOMEPAGE="http://arx-libertatis.org/"
-SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="c++0x debug +unity-build crash-reporter static tools"
-
-COMMON_DEPEND="
-	media-libs/freetype
-	media-libs/libsdl[X,video,opengl]
-	media-libs/openal
-	sys-libs/zlib
-	virtual/opengl
-	crash-reporter? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtwidgets:5
-	)
-	!static? ( media-libs/glew )"
-RDEPEND="${COMMON_DEPEND}
-	crash-reporter? ( sys-devel/gdb )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	static? ( media-libs/glew[static-libs] )"
-
-DOCS=( README.md AUTHORS CHANGELOG )
-
-PATCHES=( "${FILESDIR}"/${P}-cmake-3.5.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# editor does not build
-	local mycmakeargs=(
-		$(cmake-utils_use_build crash-reporter CRASHREPORTER)
-		-DBUILD_EDITOR=OFF
-		$(cmake-utils_use_build tools TOOLS)
-		-DCMAKE_INSTALL_DATAROOTDIR="${GAMES_DATADIR_BASE}"
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		$(cmake-utils_use debug DEBUG)
-		-DGAMESBINDIR="${GAMES_BINDIR}"
-		-DICONDIR=/usr/share/icons/hicolor/128x128/apps
-		-DINSTALL_SCRIPTS=ON
-		-DSET_OPTIMIZATION_FLAGS=OFF
-		-DSTRICT_USE=ON
-		$(cmake-utils_use unity-build UNITY_BUILD)
-		$(cmake-utils_use_use c++0x CXX11)
-		-DUSE_NATIVE_FS=ON
-		-DUSE_OPENAL=ON
-		-DUSE_OPENGL=ON
-		-DUSE_SDL=ON
-		$(usex crash-reporter "-DUSE_QT5=ON" "")
-		$(cmake-utils_use_use static STATIC_LIBS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  games-rpg/arx-fatalis-data (from CD or GOG)"
-	elog "  games-rpg/arx-fatalis-demo (free demo)"
-	elog
-	elog "This package only installs the game binary."
-	elog "You need the demo or full game data. Also see:"
-	elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
-	elog
-	elog "If you have already installed the game or use the STEAM version,"
-	elog "run \"${GAMES_BINDIR}/arx-install-data\""
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r2.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..5d5f2d64dac9
--- /dev/null
+++ b/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_WARN_UNUSED_CLI=yes
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
+HOMEPAGE="https://arx-libertatis.org/"
+SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="c++0x crash-reporter debug static tools +unity-build"
+
+COMMON_DEPEND="
+	media-libs/freetype
+	media-libs/libsdl[X,video,opengl]
+	media-libs/openal
+	sys-libs/zlib
+	virtual/opengl
+	crash-reporter? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtwidgets:5
+	)
+	!static? ( media-libs/glew:= )"
+RDEPEND="${COMMON_DEPEND}
+	crash-reporter? ( sys-devel/gdb )"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	static? ( media-libs/glew[static-libs] )"
+
+DOCS=( README.md AUTHORS CHANGELOG )
+
+PATCHES=( "${FILESDIR}"/${P}-cmake-3.5.patch )
+
+src_configure() {
+	# editor does not build
+	local mycmakeargs=(
+		-DBUILD_EDITOR=OFF
+		-DBUILD_TOOLS=$(usex tools)
+		-DDEBUG=$(usex debug)
+		-DICONDIR=/usr/share/icons/hicolor/128x128/apps
+		-DINSTALL_SCRIPTS=ON
+		-DSET_OPTIMIZATION_FLAGS=OFF
+		-DSTRICT_USE=ON
+		-DUNITY_BUILD=$(usex unity-build)
+		-DUSE_CXX11=$(usex c++0x)
+		-DUSE_NATIVE_FS=ON
+		-DUSE_OPENAL=ON
+		-DUSE_OPENGL=ON
+		-DUSE_SDL=ON
+		-DBUILD_CRASHREPORTER=$(usex crash-reporter)
+		$(usex crash-reporter "-DUSE_QT5=ON" "")
+		-DUSE_STATIC_LIBS=$(usex static)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "optional dependencies:"
+	elog "  games-rpg/arx-fatalis-data (from CD or GOG)"
+	elog "  games-rpg/arx-fatalis-demo (free demo)"
+	elog
+	elog "This package only installs the game binary."
+	elog "You need the demo or full game data. Also see:"
+	elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
+	elog
+	elog "If you have already installed the game or use the STEAM version,"
+	elog "run \"/usr/bin/arx-install-data\""
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 50c9877f3ed5..dbdad6aea917 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/gamemode/Manifest b/games-util/gamemode/Manifest
index 3634b04b348f..ee24a8ec482b 100644
--- a/games-util/gamemode/Manifest
+++ b/games-util/gamemode/Manifest
@@ -1,4 +1,4 @@
 DIST gamemode-1.2.tar.xz 38536 BLAKE2B af39b8c0585c522afa72238b8332a6a5301d36b3c53e50652a78c41788eae9f5cb319cad06eaf6f345c50f934e188df4c78d70efbad919dd6897d3350d14e568 SHA512 233602e5e93b6cfcc742510dafb00dc826000d0c8618a693e9a579dc3b31c546d22c0545084cfb78c6085226e6b0e26c066078bc1871d36d5fb90828cf63cea9
-EBUILD gamemode-1.2.ebuild 3239 BLAKE2B 43f63f18aa08f8206ccf914fabdf19f5e060d7c6da5670cb766b25f8f3338dcd9bbf945105da7e9671e36bbba4094bb71b5f249f1f218e4621680f8dd6d7c375 SHA512 9b0ff9ae1e19779748d88bf1c87431a1484b022d4aab24a5a339ccf848e424aef1cf4fd206616b63f132e4abfe8055c9a51d05a29b3953a5af5b5ae3a08d7aca
-EBUILD gamemode-9999.ebuild 3239 BLAKE2B 43f63f18aa08f8206ccf914fabdf19f5e060d7c6da5670cb766b25f8f3338dcd9bbf945105da7e9671e36bbba4094bb71b5f249f1f218e4621680f8dd6d7c375 SHA512 9b0ff9ae1e19779748d88bf1c87431a1484b022d4aab24a5a339ccf848e424aef1cf4fd206616b63f132e4abfe8055c9a51d05a29b3953a5af5b5ae3a08d7aca
+EBUILD gamemode-1.2.ebuild 3297 BLAKE2B 083dfd5cb67d5b855c0992cf302643b585cf1e2cb7a3ab05dd3626e61b0371572fcdc4f655881752655d8f5a6248e2dcf421600c3285dbfc2f9a892ef6923a6d SHA512 619065fdc7332b2b202e6298769edef14b596a94ba25981488efa585380262c684b48877eeb3fe45fc3a601d0c6c4b82c772b3e9d4f1d19a18ec40c01aee1093
+EBUILD gamemode-9999.ebuild 3297 BLAKE2B 083dfd5cb67d5b855c0992cf302643b585cf1e2cb7a3ab05dd3626e61b0371572fcdc4f655881752655d8f5a6248e2dcf421600c3285dbfc2f9a892ef6923a6d SHA512 619065fdc7332b2b202e6298769edef14b596a94ba25981488efa585380262c684b48877eeb3fe45fc3a601d0c6c4b82c772b3e9d4f1d19a18ec40c01aee1093
 MISC metadata.xml 530 BLAKE2B 14e10e8800bca7ad7e412916ee250a4c9dbc5ed78feb99fbb9ec1feb6cc60cbf96494676eaf48200781f9e25bd330d97e16e7cbd46120df79a3e7affb8361d7e SHA512 6a080b2ec0af531ef9c5d989927a2bef7dd8870c27a5edccc9e61bc9c35cb8bc11c1b781aa003dbca470a2c8172b10f5317be6cca6c6d3d6bef206e91fe7e75c
diff --git a/games-util/gamemode/gamemode-1.2.ebuild b/games-util/gamemode/gamemode-1.2.ebuild
index 6ac471006aa0..45b778ba90e2 100644
--- a/games-util/gamemode/gamemode-1.2.ebuild
+++ b/games-util/gamemode/gamemode-1.2.ebuild
@@ -26,6 +26,7 @@ IUSE=""
 
 RDEPEND="
 	>=sys-apps/systemd-236[${MULTILIB_USEDEP}]
+	sys-auth/polkit
 "
 DEPEND="${RDEPEND}"
 
@@ -79,10 +80,12 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	DESTDIR="${D}" eninja install
-	insinto /etc/security/limits.d
-	newins - 45-gamemode.conf <<-EOF
-		@gamemode - nice -10
-	EOF
+	if multilib_is_native_abi; then
+		insinto /etc/security/limits.d
+		newins - 45-gamemode.conf <<-EOF
+			@gamemode - nice -10
+		EOF
+	fi
 }
 
 pkg_postinst() {
diff --git a/games-util/gamemode/gamemode-9999.ebuild b/games-util/gamemode/gamemode-9999.ebuild
index 6ac471006aa0..45b778ba90e2 100644
--- a/games-util/gamemode/gamemode-9999.ebuild
+++ b/games-util/gamemode/gamemode-9999.ebuild
@@ -26,6 +26,7 @@ IUSE=""
 
 RDEPEND="
 	>=sys-apps/systemd-236[${MULTILIB_USEDEP}]
+	sys-auth/polkit
 "
 DEPEND="${RDEPEND}"
 
@@ -79,10 +80,12 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	DESTDIR="${D}" eninja install
-	insinto /etc/security/limits.d
-	newins - 45-gamemode.conf <<-EOF
-		@gamemode - nice -10
-	EOF
+	if multilib_is_native_abi; then
+		insinto /etc/security/limits.d
+		newins - 45-gamemode.conf <<-EOF
+			@gamemode - nice -10
+		EOF
+	fi
 }
 
 pkg_postinst() {
diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest
index b0a9a90c51cc..aa4960420fa2 100644
--- a/games-util/lgogdownloader/Manifest
+++ b/games-util/lgogdownloader/Manifest
@@ -1,4 +1,4 @@
 DIST lgogdownloader-3.4.tar.gz 86362 BLAKE2B a6f0f7b69fc3707c5788f8c25b0669887fde2f44c585f069cbada40791283e37f01d6adcc216712bb6f283a4a46dc8ebecb4861000b7db58d45be777f5b55a56 SHA512 852a335e21c199e9fc49a1cf07fd218d487cb70ebf4ed2a2c81e46477df7629999bc5c8c33f18fdc754804c459f088c8af9624815eacb054516a060d55ce4583
-EBUILD lgogdownloader-3.4.ebuild 617 BLAKE2B 8499d5fb46d6de4b7e38b47a6ba974c11c94644932dc58fcdc4e889ee93a24ae848247316accb3da7c833c507c18b5456d15f08a29074a8846f0710f78bf19a3 SHA512 15091e8b08dd0c6ea416da746c11b27848d2ecfecf9f87fa41e921956385291d571d05e7d19544bce1a4ce2412eabf91c7865a161b163d04bf8ddb11570be85b
-EBUILD lgogdownloader-9999.ebuild 595 BLAKE2B 6952d20f49e8de4192580f817ed40ed75e9b4b4350ca4386d3ae833d7754ce64229dad443d65c8bbf16e97d5cce5aef9bdcb0e9b78f5e58c26d90f052ac82051 SHA512 96abd62dd1be6f345ea2aeae400c843eff0e68caa38bfed0e38b7fdd09957dfa170b988886a2144066c545e05845604d54af31d05f622ea1346c520f80f048ac
+EBUILD lgogdownloader-3.4.ebuild 600 BLAKE2B 051b7f596ad87b5d8727012b9f394b9430a3a8b720d319be06e583777a5df6365228096c9d0f79400e7cc97970ac7ec3aae936be93fc0c033a806ed70f3ea7b2 SHA512 b4265c0979adffeef02a8e90124ef9cda96432b1ede6df08c01b9456cdfdf1a71beb9a2a7ed2dc8c3f7ed9eacb9ecabd5e7b2247b7ae65af29a355ae945b3eef
+EBUILD lgogdownloader-9999.ebuild 578 BLAKE2B 59f2f116735fe4b1c5a4aa3e2b164f524404d5e7171ee1fe229199845873ad29bd5c8807b57cbf219c1f1dee4894f7240530260762796021c85848ffa31c5e08 SHA512 0ee119d51c0c98f6e20afb79a363eae1c8ef96babfde250bfd286322c92d54c098c9164785cf7e23214808007a10f0fc2380fa43827deebb0dd15a94ec902abd
 MISC metadata.xml 1009 BLAKE2B 4a7828bf14d896ea37cc6091c2d019bb96e4c97e0ae3f2b48045a92aa9ec2a648058fe817b5cc0fc2bb98379365b9d94f9529ba5de1b3f5dca67dcb313f87cb9 SHA512 cc64f740c4b3ab4a5c4d87b60b2146b6b5a64869d19f6283428d365c7a6f79a6697b8bd63bd31c2cad63bb065d32ac751c643ff794adf966edfc8663debdd4af
diff --git a/games-util/lgogdownloader/lgogdownloader-3.4.ebuild b/games-util/lgogdownloader/lgogdownloader-3.4.ebuild
index 213bca2a9420..bcd778da72fe 100644
--- a/games-util/lgogdownloader/lgogdownloader-3.4.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ SRC_URI="https://sites.google.com/site/gogdownloader/${P}.tar.gz"
 LICENSE="WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+debug"
 
 RDEPEND=">=app-crypt/rhash-1.3.3-r2:0=
 	dev-cpp/htmlcxx:0=
diff --git a/games-util/lgogdownloader/lgogdownloader-9999.ebuild b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
index 478ab0eee166..a04e8bc6c49e 100644
--- a/games-util/lgogdownloader/lgogdownloader-9999.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="https://sites.google.com/site/gogdownloader/"
 EGIT_REPO_URI="https://github.com/Sude-/lgogdownloader.git"
 LICENSE="WTFPL-2"
 SLOT="0"
-IUSE="+debug"
 
 RDEPEND=">=app-crypt/rhash-1.3.3-r2:0=
 	dev-cpp/htmlcxx:0=
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 6ea52f84dff9..2dd655189261 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 7b90ff9e248b..4b34fc9fbed7 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -7,6 +7,6 @@ DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143 SHA512 93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
 EBUILD gnome-shell-3.22.3.ebuild 6847 BLAKE2B edb25faf602ece895a316042dd62896d84755f17f26f51a217c748b653e3ca729aae959c8a2fb39d51da654ee9f961855f69f43d15ad9777d1b6b0d22c10b212 SHA512 b0cb683473ec3a3dcffb1dd9fee56a6b9ec4dfe6f311a523c3920cbb690a69d5e4e73643bde1c6eb3faf4f4a6bb8337640d42ce92b2b8fd08b26e39666449ad3
-EBUILD gnome-shell-3.24.3.ebuild 6605 BLAKE2B 4122c4a9ac2bd12ee622393b0d82910de449ffc854c8e3c20c49e512543bc61821cc0f813a868a2f1732165d19b8767fd37ecbf68834227851264a4375d8386a SHA512 7c025fcdecdc2e77888a20b827448f5abaa3335a84d0c04d88bc77dccade30fcd30693a3c8b0c3e377f197a5a85ce52fa07c8b60e58341b4166f794a54813bc1
+EBUILD gnome-shell-3.24.3.ebuild 6612 BLAKE2B 79ec20064d5dd5a4224918b2d7a4b37f7f86d26f3bc1a9bb9637b01c0e2cf6c8067fc16a75667955499b70b56af83673d8719273a7939d8fb95af9fa902abf7b SHA512 69d2e339a772a41d2ee95487597963a202ab5d3d0786a009adaac36df8ce5c1f56f0377e6b31eea5de5d264315048e2592fe81df0e7c953c9beca13290b0db2c
 EBUILD gnome-shell-3.26.2-r4.ebuild 6583 BLAKE2B be471765a8fc69fd3301470accdbbf78b52bd3bcc64bde4956dbef69d42e9b7d7e0a6d44fabc62b3d72ec555e4e68ca430481898d0a61c2cae6d7c570137ee16 SHA512 5c0a6ae0d442504bd34ea1b217579b6307ed8fc25b8d42268a3d32132c6755066848ed65a4c8f90ea1d3fdb73c01dd0ce87753a56dc2084e00c2e3b36cb74708
 MISC metadata.xml 1279 BLAKE2B 4c69dd1979038f6231f4877e5070b7b833377197e5030c97dff5d8d2e36d2dce1510254b97b4d7b9255a64c556d9795c515aea9b21091de3bde6b8499346df9b SHA512 caa5a580e349cfab441bac8f648866618b76528e5bcc0baa6cbe32853bb56786aa0b7cc309ab6515d6a298b5bcdf45ea0360a26c28e64543afb558479ff219c3
diff --git a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
index 7dff8d524124..d163df856f89 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 x86"
 
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 0d45dc1d104b..728f5444b47b 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index d8d75d935716..8d4490cf04ae 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -4,7 +4,7 @@ AUX chrome-gnome-shell-8-metadata-version.patch 1155 BLAKE2B be54db5312bff9f23a6
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
 DIST chrome-gnome-shell-8.tar.xz 143224 BLAKE2B 9dcb94f7dcc263c6cc332c476bd652b0ea62443ffb154f67ba869ddc970e892a28ef96be13732d49dfbf5c3db9c4c8fed18918359f240e6b1b6218fa3a2bd462 SHA512 61acd4b0564892667bd1468430ddfff4c0cfbe92b573d8b7e4c5448c25266bd0ee6e89e9bebe08553de4f9661ceeea46f5af38d980051491c40ed7deb24e3277
 DIST chrome-gnome-shell-9.tar.xz 151984 BLAKE2B 884906a308d864893664f499172c130b6ab7cc3ae7a5746f7430f3d779f43320de723c9757fc4c8a9328704b2b5c40c8a829d74280ac78d4f09e000f593c3805 SHA512 b9b5f913a74bdfa641ce35c62f15aa1ceff37e6e0fef43c127ff8ba31933ba2d9c93ee50809b013336ec63ae1020d4e1cacd56d9a86204e1ba4c0bd1d8ed50cf
-EBUILD chrome-gnome-shell-10.ebuild 1029 BLAKE2B 95861f4deb9861f6bcf0fefa2ecb04f9b273de8bb9e1f40bd5e289cbd887f91de8b44eafd62f71fcadbba4a15f79101c6bd1a4ccdfbe204707d3c705a4c00885 SHA512 9d1aed107c5433bc942500163e0c8ba463429e5e474a24bc74afe52843c14e82d15a415d5ed4584c9f2d500b1c8e72156f275c4f009b092b1d26a6c194880327
+EBUILD chrome-gnome-shell-10.ebuild 1036 BLAKE2B 44910ab3d3f02d93a5c31cb168c60296eafad69842f31650c4bd9401bafe112c0b5e276281b4895b8d5141e5f59359999d107652a74d21020f663710ff018f94 SHA512 406653ec832ff9f51326ceb35ff73d62050598a0999df2872716ee33cb29d01f7d9bad6b8f2c7f4c151268802f8d5888dd91ebbf333cce17d637906c43b675e7
 EBUILD chrome-gnome-shell-8-r1.ebuild 2135 BLAKE2B 2f74d0cce221510f4724d90e23908c67eedd894740bc459ae65cb931091149f49012c0371a2d230dc115660b62369e4d050e66b04d42c6cb230e9be4b42dd6f3 SHA512 a53ddffc9b2a923fcbd3854963d1906166d43db8c5e6df026c006a6a898399d5cb8357df0ec2774e1572096d79fd79998ceeacd5b0d6d0b7adcbc8a00f81d2bf
 EBUILD chrome-gnome-shell-9.ebuild 1868 BLAKE2B 1406711b618d76f8d59957a58575298eed99311788288b7c6fa982d0726698063f388e834e742e477150208fc5b72b7777c6c4cd0e02032181c6c0ff4f0736b5 SHA512 84cbb17759a69935ddadf9386dfc649fa9b00bd6574ec5a346cfe5ead80a94fbda18d0de49b1ecc602c1e12526ff31d53494fa56280a88d36ec74ea7629b2bff
 MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
index a932b4e301dc..3f8d388c2963 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 642e2e471380..4b36215e02a5 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extension-gsconnect-11.tar.gz 1015034 BLAKE2B 470f9247987bf1ec9c37e658276427fb06e5406bbd862e33498935f860b955fa69219dacdbc4ee40cffe7257d74a01ddf018e19a81b0849a8879d997720c11c9 SHA512 134d26b37668e2dcc9fb3e96196cde1b6e17531050d5c91b2b9853bb3ef76e660b230a5ab9c77ded742541a7c871ed50e4d2a2facea9cbb29cd3a546a0a476a4
 DIST gnome-shell-extension-gsconnect-12.tar.gz 1034122 BLAKE2B dc9e4003532bbb500c81d2bd0d2a715f60bb5c70b6bcf3286ebd8b2219d511f51e63c93ef30b0b71ced720531c811462f3b343d9a9eaa07ef4a56a498e5c497f SHA512 3b88aa7ff6e55556a6e438376c578a007d41d266dc91f6d56dfccde217bd0ede7ed40c10b05903582d9bde392f0a375f34b1fbdfd1aae0204f46b9d7e6c246ef
-EBUILD gnome-shell-extension-gsconnect-11-r1.ebuild 1431 BLAKE2B e27863fe0a059ef1a4c7261eb447fc6ddca0719d3376b23c1d5c36a98101fae39ec6e572be1b163ce78bc532b2f88daa05605f7a74f21b64424869f3bed71f86 SHA512 fc92d2010f937f1a188702e74813fe971f2cec0171a00a711fe9cb4acc46406fdd69e18576521494af893f2fd568c520d0728227af16c9661108bc738999706e
-EBUILD gnome-shell-extension-gsconnect-12.ebuild 1443 BLAKE2B 924c6dfecb8240fea26fdc36b62b8c11f96b92bbac3bf7333842469e148211e011471f7f9589b89edb97e5159fba44a2b6c824cf92cb56a22a4a849db0a7bd4f SHA512 0080c3bdf0d197c852823fd17c55d4fc90c6adb0c86c57cf655941df2c7605f939667c6c3787e44c7576c56bc12754ccd1776d2c9905924276f5556d3022ca5c
+EBUILD gnome-shell-extension-gsconnect-12.ebuild 1439 BLAKE2B cc555b929f416f68ca21f16e82f4974ea87ed81e40e6a6f1d0d26d922c9019b3f1d2401ceedb43f5a740bed88908e77e1fb4a92fb220714cfb4f74ca95063447 SHA512 496a23fdb4a1f0b0f617a7b49e7e00faaf78ca06ab86fce24e387b8470f3b6b61fa9e52a1a092875334b986ac024ba33700e34059650e623391a9bf85748e9ef
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-11-r1.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-11-r1.ebuild
deleted file mode 100644
index d2c5002a034e..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-11-r1.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
-inherit gnome2-utils meson readme.gentoo-r1
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.48
-	>=gnome-base/gnome-shell-3.24
-	gnome-base/nautilus[introspection]
-	net-fs/sshfs
-	|| ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks )
-	|| ( media-libs/libcanberra media-libs/gsound )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_install() {
-	meson_src_install
-	# Rule for install is not complete, only ready for install-zip
-	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/schemas || die
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild
index 87cb96883cc0..2dd95cd96429 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/synapse/Manifest b/gnome-extra/synapse/Manifest
index 1504997b46de..cd4166ce4151 100644
--- a/gnome-extra/synapse/Manifest
+++ b/gnome-extra/synapse/Manifest
@@ -1,3 +1,5 @@
 DIST synapse-0.2.99.2.tar.xz 444156 BLAKE2B b1fccaecf6ea0d8623e305852e3ae21bb0f95b38a086152643bfb15f82c59a27fc499487ad9a3dba56378f260eea26a43a76bef11220b9e24b2027b1a1a8f8ca SHA512 e4b6e0399a83fc7880d786e8cff6360850d5ce1ac2eabccb5ce6d3989e4356c42adf1155905b39bb6b10887c02844dad01cdf8d556bc4bd6c7cd11956f8116c7
-EBUILD synapse-0.2.99.2.ebuild 1263 BLAKE2B 8d18247cd27da294cd8feb76b4024073f7fd59f95ee197027cd6d495817644760a3de4ef0dc7256f9d1908628b068f5c0fcbe737841cf0ea3e7be16ac2bee67d SHA512 e25fd7c9374b4055352a125ffc312cbb91728653baffb86dbf3961b7ed08242935bc1cc76f0bc11506666a720b0c7d0eac672c7da82defa98a21e46add407f9a
-MISC metadata.xml 458 BLAKE2B 2202bb6ee7223434586fd946bc1f1b2dc3425e3df8bc4b187eb84318138701306bb572c0ebf4cae2ce2e519c78078f312f874a974d77a4e11a123c387324832b SHA512 e27cf8f714a9c730e6d37ac4e92dd66e080eca58ea2497552233d54e79c55eb0ae4622031b29659bb53d8011ea77b58cab60ce579d89144adf44d4aeac9c8c97
+DIST synapse-0.2.99.4.tar.xz 538476 BLAKE2B 27de41362ca53c06ba70d9b0df728aa64e72f19b726b5e5cb4797c85bf296c43969b58491430c585887e0a74339c49399bbe415c13827fa2b0243e8b1bdd8598 SHA512 d9668fb9dd18d97da89bf5f0a9864f843c629f91751b326b4e97de74c6db64a59dbcd221f1b6ed0fc199a683ed511d86f280756fe4c21195d6169d2977315325
+EBUILD synapse-0.2.99.2.ebuild 1282 BLAKE2B d0d0bfc974526192db4cfeb8a6c7a81a04039646e376e9389dc839a47baf958fc802e347b28dcd89e99f349ae772262ca96e5b02926ea86544491d462e894aa1 SHA512 17b301019a858ba552b442162e9e5d063a771958f83723118c8c2034c6ee7204e7f572d7f2d613e8cd88bc6f838666cb7bd467655fe49c5516c62ed144efa5a1
+EBUILD synapse-0.2.99.4.ebuild 1078 BLAKE2B 1c698eccac59838d62ba234084e94a3669e439140abaedeff0fc74d13c048271788a8e8928a4020681bb2e048235a48b1c3c38416a3124a97f3419130fde986c SHA512 b04e748edff694cadce78815610452bd75e606822113131450a948834a53dc9a8109834aca712095e355727f0e7821d237fd6cf383a1e810edf12457e544cf01
+MISC metadata.xml 560 BLAKE2B ef850f79142061b442fcc219d035da011d7612bc2ce90deb91ebb03f36220a3c208cc2f10999dcf41736315e238e9e852df96d4afcfafb048f7db3fb35a3668a SHA512 acdddee273553a76c960f0774eb777b2ca0aa1fd165a36f1d1b8373bba1b773acbbd9dd28207d892e32e07abe276492d2ba1aa5b67ccee0e1273d938d5ae6be4
diff --git a/gnome-extra/synapse/metadata.xml b/gnome-extra/synapse/metadata.xml
index 52843da2e503..6bc83c1f1619 100644
--- a/gnome-extra/synapse/metadata.xml
+++ b/gnome-extra/synapse/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <use>
-    <flag name="plugins">Build support for plugins using librest</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">synapse-project</remote-id>
-  </upstream>
+<maintainer type="project">
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
+<use>
+<flag name="indicator">Build support for application indicators using <pkg>dev-libs/libappindicator</pkg></flag>
+<flag name="plugins">Build support for plugins using <pkg>net-libs/rest</pkg></flag>
+</use>
+<upstream>
+<remote-id type="launchpad">synapse-project</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/gnome-extra/synapse/synapse-0.2.99.2.ebuild b/gnome-extra/synapse/synapse-0.2.99.2.ebuild
index d2e698782f49..9c6818eff3ba 100644
--- a/gnome-extra/synapse/synapse-0.2.99.2.ebuild
+++ b/gnome-extra/synapse/synapse-0.2.99.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -48,8 +48,9 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--enable-indicator=no
 		$(use_enable plugins librest yes)
+		--disable-zeitgeist
+		--enable-indicator=no
 		)
 	autotools-utils_src_configure
 }
diff --git a/gnome-extra/synapse/synapse-0.2.99.4.ebuild b/gnome-extra/synapse/synapse-0.2.99.4.ebuild
new file mode 100644
index 000000000000..4916165ada37
--- /dev/null
+++ b/gnome-extra/synapse/synapse-0.2.99.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vala
+
+DESCRIPTION="A program launcher in the style of GNOME Do"
+HOMEPAGE="https://launchpad.net/synapse-project/"
+SRC_URI="https://launchpad.net/synapse-project/0.3/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="indicator nls plugins"
+
+RDEPEND="
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.0.0:3
+	dev-libs/json-glib
+	dev-libs/keybinder:3
+	dev-libs/libgee:0.8
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libnotify
+	x11-libs/pango
+	x11-themes/adwaita-icon-theme
+	indicator? ( dev-libs/libappindicator:3 )
+	nls? ( virtual/libintl )
+	plugins? ( >=net-libs/rest-0.7 )
+"
+DEPEND="
+	$(vala_depend)
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
+	vala_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable indicator) \
+		$(use_enable nls) \
+		$(use_enable plugins librest yes) \
+		--disable-zeitgeist
+}
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index fbc690312eab..51f6859eaf8a 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/pikopixel/Manifest b/gnustep-apps/pikopixel/Manifest
index a61442da4321..ff785f41c816 100644
--- a/gnustep-apps/pikopixel/Manifest
+++ b/gnustep-apps/pikopixel/Manifest
@@ -4,4 +4,5 @@ DIST PikoPixel.Sources.1.0-b9c.tar.gz 566871 BLAKE2B 23b1213dcf553db58b65e2e3e3a
 EBUILD pikopixel-1.0_beta9-r1.ebuild 616 BLAKE2B 2540d1ebb0130f488ff4f9a59d1a6853c599bc7651e78d96ed7348e483809b3d33f027c709e491a5759ebacb268ea569845cc085e126f1308c6a3c92663156a7 SHA512 76320aced9fcf4267c029546a725289d0b9f4cc0dd354eaedb7e3a63f8f645555ac520c19865c3c041aedfb1f40751ee7446586ffe799dd3bc266620f469e36f
 EBUILD pikopixel-1.0_beta9-r2.ebuild 616 BLAKE2B 6f9c27545090a0fb8a06345a96bde7576b2a0e01f7fdcbf2662034016ba53365e00c0664265f2bab3d2947fff6e9d2e773f0d1cdf4e0150703c8670a91685af8 SHA512 866512d489ab4d4f7151308dface2354890192b618dfa3930c9508cde43df2b08bb6803a42975bb559ce3261a74e3f829a921101fba08ece98f929da96f3c6a0
 EBUILD pikopixel-1.0_beta9-r3.ebuild 616 BLAKE2B 3db887475e2ade7ba42e6fd810d98029c2e6fc83a3a1c667ab30cf7cf9cdb456496cf5be63c453752cb455c0c6a452c43356e17cbb8c90b838480ee8cb8540ab SHA512 8b49fa449c78bd945ec46539ec2246d5eb4bf866242d871ed7b06a2f58a1263cf87f04fff6945c83a2f12d397b1698b8b8b6bfdba464a682611f55e62876a2d0
+EBUILD pikopixel-1.0_beta9-r4.ebuild 613 BLAKE2B 1c5d575b11fb4b4eb12c85ee4a3187e260c9c0e1f9783c0c1a2b02bce7e6007521a45475413a06d891011031621bec1bcbe9c4bc51824bb064cd2fc7a6a35030 SHA512 3c8f7f3354d29d9dd87f0a08802dbc34772e933a798216fd58a6c3fff485e35558d356361e71daf0b922394bd4a3c68ae1deb36cb714889399eda83ee38edb12
 MISC metadata.xml 353 BLAKE2B 0a11dabc8c8d4cf8ac0cf566d4f8d6347c4fbbdd3a7501cdfa363c71f370b0898384f966664e8c8f9ae9bf4aec32071b068ee74220ad870970369c8eaeac3aa3 SHA512 638af177226e71ff4d13757ad1d909e627283e92e67475a842280525e3b9fa25980a2f4673b6a194a41b5cd08154e666345961bea4a5dce0e292c2ab6a2256f5
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r4.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r4.ebuild
new file mode 100644
index 000000000000..08e8ec013607
--- /dev/null
+++ b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnustep-2
+
+MY_P=${PN//p/P}.Sources.${PV/_beta/-b}c
+DESCRIPTION="a free application for drawing & editing pixel-art images"
+HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
+# Web hosting wants a proper User-Agent
+#SRC_URI="http://twilightedge.com/downloads/${MY_P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/gnustep-back-0.25.0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/${PN//p/P}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index fc0ede92c14b..e0e444f758b1 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 837ef9a28a4c..6b183c04eb99 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-18.04.3.tar.xz 335956 BLAKE2B bc7e59e3065b7e7550aa88d0e0210861cb599a393bfedbc7121a4db93e8c7e1585f82d6542f9b21bbaf61021fc696bd045ddf834efa746db936e93ee36f9a0c1 SHA512 f062222a7accf95611296830ffbc0cb1a6ac1fa48e5eddbb9bcb6b9d8a5969e393308da25ac9a636cc79baf454ee75670713720fce1c5c270d7c1c3ca3e3f26e
-DIST akonadi-calendar-18.08.1.tar.xz 334956 BLAKE2B 31c3a1a1efe5042e35daffb1dd4f6cd7073e6a37d4c1c287b45ccedad3df2f55daba830149f9b9e5e29e5748d80f7c6b3360f3c9b3cc1dcebff49556f6254220 SHA512 94dc08b80ddc2bf4faab373d62ec41225e78b682d3ee2c4eea406c1090dcd23c246ddd8571ed864d8445e16bd5cea51b47843071c830ab382e69f1b74cd035f0
+DIST akonadi-calendar-18.08.2.tar.xz 334900 BLAKE2B a671284aa4ddd472ec3241af5efc080aeed79760cfbb61f30ca646d3f34765bcddf790bf43a5458a78fc100cdccda91ad6fc766aada850fb6b3bf0f32aff20b0 SHA512 92fc4bb754f8eaf3d9f7f7bc9791f028c6562d0090c85f2ceaec855cb233e2034b6d2566568edca029502056e2212b27138984433c7ef930abccba3a3ea413e2
 EBUILD akonadi-calendar-18.04.3.ebuild 1155 BLAKE2B fbd50b9902607eabe6fa5984436aefa4ba2ce15af282718ed1ddb526bf204c2d54c777bd7976aeaf746b8eb399b18b6041212b20a0a3fd2541ed1e4cf77827f9 SHA512 1e419fc8296447fac68f95291156d6e7d12247c6f67d4b1cd8907763b05cda30ad3599ad337a6db3c5d34424fb46994ffa6d1fb93e8b6246c649044c887428f8
-EBUILD akonadi-calendar-18.08.1.ebuild 1157 BLAKE2B 4e2b0e0e13a77f8f22377dc06df05f544552ea2e69467e056f9f93feb9091dda131a937f5e0397db039f5b86cba5ba05e39a215f3f889cb5fa44deabd228318e SHA512 76ce422a144f91b442b90a3351810770d8c81b31903aee03f189d2ed85d949c9b385a4faa768a736ead8c5d4db08d6ce3bcd95ae8180fea3722c7376f402bf49
+EBUILD akonadi-calendar-18.08.2.ebuild 1154 BLAKE2B 26cc1d4f844fa5662260aa5d71d402ddbdc850b6725a93836a566a30870f6e989b92677659723e53fb736f9b8825224ba70353f3b0cc9729899bd4ba6bfbafa2 SHA512 02206b95c7ea95f55dd9c1e9fd66318f352ec4fefc4c6a94f827f418ff1e1a2c05b183f912e052b57c60218d314aaede3ed96f3271e531c6406c217fe1adfb01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.08.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.08.1.ebuild
deleted file mode 100644
index 7d72f8ee9a3f..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-18.08.1.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_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
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.08.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.08.2.ebuild
new file mode 100644
index 000000000000..4bef336b1cb4
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-18.08.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 3d674ba99ade..81d1b4b3fde5 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-18.04.3.tar.xz 392228 BLAKE2B e56204b67cc0918be38c543aee83cb1a239698d3a2e06e3ea1615456029210d8ac06481a0317158b07a0e801babbf68a5b539592ffb10a05779159656cc5e252 SHA512 3334bad8cf9ee9b79253260ec62cab527d8fe823131fdb212f1e2dcc120892715c24aaf0a5d977939a69d47e458034b405e8be4da27a12022b94488332ae7683
-DIST akonadi-contacts-18.08.1.tar.xz 390264 BLAKE2B 4c32aa25f8cf6bb5a7de1e22fee93934b3ea46c1c1fa5456bed955bd97efaa96157412ba8a720427e4b394584a1a3570fbe2a344e5a03bd3044c4feaf2337bb3 SHA512 d27e2acafc5b1395f670683730d6dba59481807dca8c773fcf5ab3de70982b5eff1bd3802a38853bda60331466ecc7aac77eb916effad1e871b24b456533517a
+DIST akonadi-contacts-18.08.2.tar.xz 390372 BLAKE2B f684b92b78883ca5082b083eb8d45a5a591e43e0aab9d78a9a0ac1100a59165003e8a0c6fe826b55207033712073ec447e8a22bf84825608907726f657170cd2 SHA512 a93c609bed48281c6bac7eff49719d3a6e842ea99e8d20b5b2f3adc14b1e96c103abdfde6b1fd05bd2ab8c7c8e3c73117c32c68ba290af4eaaf5f72948547a81
 EBUILD akonadi-contacts-18.04.3.ebuild 1061 BLAKE2B fc6d584e48427474a9434d3d85e0702c6b7f2a5fcc8165d7aa2d875325dfe8fc6615cd34c124e3eed38ccfd6887d1604c65996deea1eae6f7dfa58bb2c27656f SHA512 1d24643b16f55976c3e48c0d6becb2416b07235b3c9ee41ca0c20620d9cad590fea4c602280f4bbc5a93ae3b64d2c33fa040efa6fb88b95b309179d838f87377
-EBUILD akonadi-contacts-18.08.1.ebuild 1063 BLAKE2B 919f870a67faa2401fc885c868e82be4166fc4d56558403b02efd6fbb2729e75ad7ec3de86582d68c635dff7aa4a645005ab950eb86893256076b992a115d38a SHA512 85c70ef918476023c2ea734a9ea341d49060a418ec4c4ae9f638510142d09566946356eaf12813149829a37e6c41c27263f49de08c24929624136b04b69ecac6
+EBUILD akonadi-contacts-18.08.2.ebuild 1060 BLAKE2B 515efe61d74f6a9979b657015761aa6b73337ea0709eaecf7677a2d506d2e502cda991ecd1dd89fd67a47eed0f7450a4c7f4fc348f61a428de0a866214f20679 SHA512 43effded22ba5ff3565f6c47cb47f66b8fd4b082f683b4c956d2c3ae51e9877bd7a413e9ac1482597a4c7608903c536c21c3ba8395b2a0dfa27e2b48ec7fe639
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.08.1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.08.1.ebuild
deleted file mode 100644
index 8e7312d67503..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-18.08.1.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 kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.08.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.08.2.ebuild
new file mode 100644
index 000000000000..c0e5111519df
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-18.08.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 0e8c73dc75ac..7027fec6524b 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-import-wizard-18.04.3.tar.xz 436604 BLAKE2B e490232039c094272152b91e4158a70bc4a999de933ee6f76d85dfdea0eda9f7f011e394f050178b398ce1c5c47378cff0415b0f1ccc1a7b93fb03476161a545 SHA512 ca43762f84f2a8df30818ceec0225c105366a68e4d9c0407897c6d4974ff4e1ea40989a500d7c174f4ce94076766d78784dd11a6c60567998237b1477b9e0750
-DIST akonadi-import-wizard-18.08.1.tar.xz 439496 BLAKE2B 521c8e7ab6bf4878843a5bd76ae7a30f28a2b3c6cd5c3d916377fbbab35b7d42082e9840b3880b45c84c6e9e0754c2d6752b7c109e1bdc570a30dce30c8729f8 SHA512 3cd4ac27f6fce503177f438cb5aed9803f6f7773b1fe818fee1e601c18b7bcc1d36cdaff9db84faf15ed8ec68db10529da94081dfae987aa3f5ff3e3be837fb4
+DIST akonadi-import-wizard-18.08.2.tar.xz 439460 BLAKE2B 639b21b7da0a0d8e9562e24f71442b01df0d5f8e93c27aa4a981322c5725b91332839c53e54a5c49299d50d76de5b86b0494d809f6a8909dccd5ffaae8ea64ef SHA512 f18d15ba96ed846a433ce8fe34be4c7c489de8fff61aaa1671a5cf735c747d49c6f85fb8c6b50564c130c789d81ea3ccedb35c9d08ec71653c61528919d5d400
 EBUILD akonadi-import-wizard-18.04.3.ebuild 1092 BLAKE2B a3c04404c27a3c23943e62c613292d92c84b8b7d5dabd7f29e31000622d41f40cdd722413a48e295b75a656b289be45a8acc25fdf4c06c2a39fe179f379cd352 SHA512 850a96332b61d3054856ba2e35863d128a9ba3422fae734f405f273c7d309bdcabc780f6d201d3fc7824be9c6ecaf8c418e5632417229f7690f3f2d1afaed7f1
-EBUILD akonadi-import-wizard-18.08.1.ebuild 1094 BLAKE2B 6854fefd7b24dda144412d954eb9bcf680d5e4265fbb92a8f1a70c33e49e1433dd4c25d8ebcf6844a1f1b871fc34ab902a43087a36bdf890924adef288512c13 SHA512 f3bd6bebf5a4222f528a889aec9d92afc79b069ab28d024faf9c1b2e6746aef74ac4d80c66a4068ee563e4eb1cfce047dbcecae3a970fff7b0442fef419e702a
+EBUILD akonadi-import-wizard-18.08.2.ebuild 1091 BLAKE2B 7b7bc64204263c682ccf02bc601956f8f41a5c0812e9582d21e687a7b22563a5de341f18c5f8a4893ab957d89919da8ab85a2f75c8b3a33aa982eeb0e0298ab7 SHA512 8405d7f8ebb6cd9862688b79c82873938343c09d8906652dd1c529e67f8b3164f3a19683a0946bdca9f9444f5d55071ccec062f2d64d63fa77a49f965eae5600
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.08.1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.08.1.ebuild
deleted file mode 100644
index 711036b2177b..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.08.1.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-import-wizard/akonadi-import-wizard-18.08.2.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.08.2.ebuild
new file mode 100644
index 000000000000..c2952e662b61
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.08.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 00965b8be4df..38057f859945 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-mime-18.04.3.tar.xz 137320 BLAKE2B b25bbd2e20028924b3cbd1a0ca6196ca34c8edc224cb14b431b58f4a3091423398abcb290bad7206dd929120b6e792eb1d33ae1c1326e05999d220130e55fea6 SHA512 85160394bbf9e6d922148ae3adc9cec1d0204a826b05db3c291e81d076cb08a1c14aed1e7ef031da9e0bbf043524f4d314b7f5f23639717b41911cdc2f1c5de2
-DIST akonadi-mime-18.08.1.tar.xz 136884 BLAKE2B 0d5625c5678e550284200dce4a1b9b1ae620df52f1e4be6d00e9cf937b02c2c1bf674c75b2f1c2b60c494462e5a4e173613823c3d90bd7e87e3239fca9603d08 SHA512 67abb50167b2c8e98126346bcacbd55943d2b199603853125578154c39a390cd6cb8be169e4acb356669730a86a65c2e3fb7d7610d466c2b1dce7f689b39fec1
+DIST akonadi-mime-18.08.2.tar.xz 136864 BLAKE2B ea291449f6adfa69bbd5477fa9fe7810a333212a7a6890cfc0c5d117ff36ba14aafd3eff89fb1b31a25c731e4fb9489e83e2d7e4cf219cb74d918bf66342463d SHA512 790deaca989816dd1b875872eb92d8124b6c2f6b954afb06c33d85fb6de107692f2c77cae5b150bbc4e6a2165799e31f7f8af2f04f3f9c243bdc1b3b1a305e0a
 EBUILD akonadi-mime-18.04.3.ebuild 890 BLAKE2B 6773f862e5404c2d0b76be62be5fd19ba57999bc0ed8926431b4c4a13bb7848a4565041d83a87752aba4aaaae782113df4859d7f90072453f507894e3fe41c14 SHA512 fc86aa337a4295ea96734ace69c925bfd8a9f83bca3e62e4c4b6928d113dd88e22a13cd3cdce41f87907bf28ae03ab1bdaff46dbf04a0f242c7268a4d01e331f
-EBUILD akonadi-mime-18.08.1.ebuild 892 BLAKE2B 965bfda44299d0d7cb434c893ee2d6ba66480cc49ff32a198ed88e1d9f58c50218783c101f6c03af498ccd8a1dd0348fa79d0c132c052a27c5648c9d9dfd9fcf SHA512 0a38fa339efb8d08f336765b185bf87114f0e8c4230e765bbb7321bb541e5b9e4fa8b7073c49ddbf765ff049e65fcf5a4c66ab3140c357a8dce628b88afcf8f7
+EBUILD akonadi-mime-18.08.2.ebuild 889 BLAKE2B ce7502540632a199ed05e749101af526b6efc4acc1ac58b0e63259f5bfa7d2d19d3668772bd35f3a92417126e9aff7ada18b23a89334aa0410e9618b49fd7b49 SHA512 319da26441961be7cdb0773de9a2573b0b5dcb4a5c913d3486ec546b932ea1eee68178ab04bcc10acdd67793aa1a9ec6e05982926f61ca23f61421c04437aa53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.08.1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.08.1.ebuild
deleted file mode 100644
index 1b39beb487f2..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-18.08.1.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="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/kdepim-runtime-18.03.80
-	!kde-apps/kdepimlibs:4
-"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.08.2.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.08.2.ebuild
new file mode 100644
index 000000000000..7c6913370b57
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-18.08.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/kdepim-runtime-18.03.80
+	!kde-apps/kdepimlibs:4
+"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 6fe14db0658a..6017ce6b601e 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-notes-18.04.3.tar.xz 24600 BLAKE2B 4a711c483814e1fc7a7f9931305f472854223e93b931437079c1c11b277d7ac0543827a7403b5bb7c2d10f79e635c5364d24e1a701e0465914b6eb00ebed878a SHA512 0aecf012ae8bc03ffc2ba5ba68893486d4ea91cc2d6efecccc3fc60b7f03a51596475285e0fa2e1b9b025b3b046cdca4f4d248e8aa00fb08c0176269ca067177
-DIST akonadi-notes-18.08.1.tar.xz 24676 BLAKE2B 7846c5cb396807be71e86b90b101d7a1a23087a5048ccfd65103d284393d397ad01a13007d81ee32c0219eed970ea5b675d4d3e7e869688910c4a667c217e693 SHA512 3f844f040262f01ea7bb5df1771cf4dade6dc81c89519c8c20a141643b478f167b25b65594fffdf1f7556b9322e541ed792c621213bbf05aa25fcb08df8bd9c8
+DIST akonadi-notes-18.08.2.tar.xz 24644 BLAKE2B 901c8041875bc2dd4f0af87d9e4de01e566617655b903657c99e4e5b45153e5cc059d352e990913232fa61f3637792507fc9f170e0166f292495d34db5ec8837 SHA512 deab44650bf4e209ec7a7d57a7487e70058690572de2eb05789a7c6fce0ed160c8fc97f776aed0666a0d01a3fbf478d371517171ce01edf1c375632de5739ac0
 EBUILD akonadi-notes-18.04.3.ebuild 565 BLAKE2B 2c4c204454e138dd32186a05beb3fabdc9e52ab2173c3624c7b3b0eedd6cffdb78b6474731a16ae204d542263086c47e31cfea34aff9343714f856b8b76fe6c8 SHA512 2d16befdb5691c46a816b6c0b659d83f3dee26c9f02704870eeed720a1cbf78012690af2172a4e4194cd0929e71679f074bc6ea7f913663fe83cec665ac3dd98
-EBUILD akonadi-notes-18.08.1.ebuild 567 BLAKE2B 6bf6f7d182475533dacf721500c4d2bf0086f6f99c69a8c253a18370073b348e63a220a17964242448c241367b5a4b241d2ed0f28faf474ad9926a6affeed89c SHA512 34371782e6bc37e5c09d0707b177b3fc55513ac6c07ba9d5f4f65236895d511da07196cc34e9e3ddd91e2715062b0599590ecd44675efb143d4e9bf41ac7d8da
+EBUILD akonadi-notes-18.08.2.ebuild 564 BLAKE2B 12494f9f224db7dbcee86f89f4e176884dfd4ac4fd41658c9c2d2539635bfb44649fa02550277883844070ab87eba252f783b2fa10c54ab592432f351974e478 SHA512 1c7d060be8957f01649d689123721d1e7f1cd5838c7335997876a04e116e4a56d946d3f11663f90027557a68ff50a7a1756ad10d81cf8fb3b6124e8dafdf1dc2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-18.08.1.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.08.1.ebuild
deleted file mode 100644
index 0afe6508a57e..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-18.08.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
-
-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-notes/akonadi-notes-18.08.2.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.08.2.ebuild
new file mode 100644
index 000000000000..a0fce16b3b97
--- /dev/null
+++ b/kde-apps/akonadi-notes/akonadi-notes-18.08.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 073d71454ee5..caa60caefe3e 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-search-18.04.3.tar.xz 82440 BLAKE2B 9bd8fb4a8c0e319d8606741efcda247fa4b4bc3c647ecd5dfb2746739bb954e3e2ca68394464fb7c696722eaf5aceeae21e3c68c322c870a1b8af1fd1cc1dcc9 SHA512 5b353542f6e32b9a71ddecf36a358a7e261626e8f58e011d40cdde71afdc7c03abfed5e1b2c047eb7f01a57744b7d2be0af8cf53398f4fabb31413224cb2946e
-DIST akonadi-search-18.08.1.tar.xz 82772 BLAKE2B 28633ed4d4618eecad848f99795a7baa9218424993c8eb8b561d4a0ed6f2cf00283101a268607b70e291036e901c7de4648bbc02cc7bb0695c04cc2eb9cc2567 SHA512 38b22a9d90049c93745f968aa9026e9f27cec840534e71e93c3a9deb16fddb604e6853ead21c50e9a3647a43768afe19fa48477aa2eb777dc7441031387ba3d4
+DIST akonadi-search-18.08.2.tar.xz 82880 BLAKE2B da7f57331af73dcaa278277551f856bb6f0169b26c1af6aa486ce6bb72dd20bdb9f46f9a0fb002b74bad9a0a3147a8584d3267a399290cacff42c631f3024e3e SHA512 2eef48cca484bbf662305b6feb6bfe8c35425e721cc6fc9e0db0a5d256f0729f1e83e4d45ba5f4f82b536e5c8a69cd7e063622b59459d30c9a5249f85d251e25
 EBUILD akonadi-search-18.04.3.ebuild 1073 BLAKE2B 61a3f53f239027c4635498c4c19bc31c70b8d977f01d99d809f82c8a9b349a6ec3bd29e38ed374b2e50cfe7bc77a7c3ef3174c833616a1573ce3e1161c028595 SHA512 2c199dacbba1ae04b6e37aaede09be77e777f2b5e572c961cf840badfe96a46739bb7cb4cb7117e9f770fa0e697978c2318ba1e047772a5bc0239feca1f3311b
-EBUILD akonadi-search-18.08.1.ebuild 1075 BLAKE2B 8d8f3dbf21a8e5cae0ab11bc2eed9e7c2ff3a6838a4f64563772478960589d38948a3c2fdb201ca7823ff91df45b9d714dc446dacd5a829e3df3ae064d9313d9 SHA512 88f73387b8c6975a746a3f7e8629e409f2e9dd8ff707849ab08def3b08010b96aa294c88fda0e2d69b8358e99cc5e20ef588c0caf57c47598747c30946a26b8e
+EBUILD akonadi-search-18.08.2.ebuild 1072 BLAKE2B 8b7b0e171b385c5f09e6a78aed93d5baa566723c379423f7234f4d15a135fc4da6e4511b6c1c7892eeec42933e28c3609a7d409068bfa51357d4cd6d4f7329da SHA512 6f06cc0021e6c3ccd7177ed46848c17cbd7b7e545bb798e9d6362fc05a02b6754a49b1bcae1b1d49e82fbc1bd786f08299b4d2f10554e79cfe86b71afbac8a4a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-18.08.1.ebuild b/kde-apps/akonadi-search/akonadi-search-18.08.1.ebuild
deleted file mode 100644
index 069e1b7eb656..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-18.08.1.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"
-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-search/akonadi-search-18.08.2.ebuild b/kde-apps/akonadi-search/akonadi-search-18.08.2.ebuild
new file mode 100644
index 000000000000..415aae7b1a24
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-18.08.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+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 f8228217f35c..69a40847830a 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,6 @@
 AUX akonadi-17.03.80-mysql56-crash.patch 2064 BLAKE2B a4107b5732d0147e3001484c7c4c5e3bba64909d21656686142cf9d58304d7496dea8d11b72836bbdeee09691d9c1e160445ecf94fc280cca3c35f45c078d969 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7
 DIST akonadi-18.04.3.tar.xz 1526416 BLAKE2B 094195355ee2906e85211bedbeb99eb4064b41a37c43d231ddec4e7295182d73fb5da6142fb123484108de0eddd79fb66c2439326cf0e1c0ea52be7a5c6d6173 SHA512 dc4111d2198c5ac8a11613c60e4cc330b1d337179c917354a059c3f843b218e5c465bb44ae924a9db712f985d0d044625a56634481faa474a0e92888d098e49c
-DIST akonadi-18.08.1.tar.xz 1538372 BLAKE2B c4afbe0628f5ebdd6c6094f37624683f055d2f7102087e629be253d14b02a4266d60d7fa3da130b6e5517fa3521838916e9038138a37b4b8701d7a7f1f596de2 SHA512 50d5711e2b78ed512efa771c4852885c5464dc7cea3563cabd79bcbff7847906f300c453f863b1f1b6d3d3508a060eb2a69e3e94f75d2079eca66a0ff15c581c
+DIST akonadi-18.08.2.tar.xz 1538140 BLAKE2B 31eee608a61bb4712345bda3438a69b21711ce6bb341e8bc36526ad585924fef03a676e32eaac2854ae0326302b9198f6e78272eb23e52653a9888b1f9e8a8d7 SHA512 5a66145f02d1d531d2ca57f7b75a7ddaf4ad74217c39e7680d3f494d1001ef5c2f5e72eb1daaf8a2ec7ede48cea343dfe5af0f7b77345d8b470fef2b519095ed
 EBUILD akonadi-18.04.3.ebuild 2913 BLAKE2B 11de71f1612a4719b972280d9d5c790cba36f5e35ea84d7491518a69793df1d782b61ecc893b395c6b6ba510b2e32f78e361713b400d39784958fdeee8fc3253 SHA512 0dd8a2ba7c8452a00d4d349636b8ab42ade6da7c9fe9dfe0742301ce397a20aa811c6018a0a0c027f4b0a9c8583a616fbbcaf8d09f93fa4570b680cd92935699
-EBUILD akonadi-18.08.1.ebuild 2915 BLAKE2B 8f061eb8ce1bbcc1ef0aa30066ee3b37c902422f0c2f857f425ef4bea6dcfce8d7ddc37245b36d299c64bf41f321a159f4add3eddb5dbb90ccbd504b4bf7749f SHA512 b509bffd7bf710862d48afeaa18b69936800031dadb3a5d22f87559e179305c06e8ed3c4bd21a33346e2984e910d3718384021584d6caeec029e495127aecc21
+EBUILD akonadi-18.08.2.ebuild 2912 BLAKE2B 39f6a54ccc264bf450deaf74063aea4b90efcfde077d9910910ba9ff987e40276c0187750088c3b382f508bd6d6c9bfa8db7b9addc2e00209a3b07b4386d3203 SHA512 64759f5f407f95356387d034adcba3968873697752127281fd93af99aa93ae4713f2e30048b0042737d7e96b40c47a47f41e1db4febc94d4593c58c6fbcac6e4
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-18.08.1.ebuild b/kde-apps/akonadi/akonadi-18.08.1.ebuild
deleted file mode 100644
index 99c2e48ae5e8..000000000000
--- a/kde-apps/akonadi/akonadi-18.08.1.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/akonadi/akonadi-18.08.2.ebuild b/kde-apps/akonadi/akonadi-18.08.2.ebuild
new file mode 100644
index 000000000000..27df4a99621a
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-18.08.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 4bdcd4e227cd..52e47c4ea69c 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
 DIST akonadiconsole-18.04.3.tar.xz 185792 BLAKE2B 7d9a5132a9ada0ff6dd8816e81b26aa21f72ec0a133d64f9d26dd4fe208bf2363477a9cf4c970ac714077c9cbfcbc46a4af6905b854cd5a7edc23d5353738848 SHA512 c413dfc858a6aa496e5533f1f46dc021c9c5e14582924dbc20a696da01035f2d237f30770a238cc33c4e91def9c1a18274e699185fb5bd6fae881c203687c2a4
-DIST akonadiconsole-18.08.1.tar.xz 193812 BLAKE2B 02a2ed6306177af9000821fb525b4b07742c2ffec03b2785e7d0710d4ad8bfc5cfdba448922916531ccf7439c80fc79409d51562f2df4bdb8ee9ada18c23e7f9 SHA512 41672d365d14db221d47306ed4a071dbe50dab2a9aaeeba02377f113b02eaab71ff91ab8bfad5bcaaeb5a9196f412a4781449eea6d7adb00626efdf9f9434e12
+DIST akonadiconsole-18.08.2.tar.xz 193808 BLAKE2B 37fe577d346e99d720c99e0867fd807f77f915efab741e062237952d4d294d676d5932b86db2304cb735e31f4865244ceee7a869750d848accc2dd8731945eff SHA512 5707a92ef67476753e2be6e51350d14b6e34529346ca850d9d6558a8b58a127eafe1379221e98dbd6650ee5ac5b952965606b769cecd7dc28368c91255e5653f
 EBUILD akonadiconsole-18.04.3.ebuild 1224 BLAKE2B da2cafafc1888ded773ab02c76c2418da2afe7c641384d262aba2fc14b6b6f4eb66fca4db394602357ebe383c3c51563f9c6178aa359d20271938b3ba7e72ee0 SHA512 f44f391290590e69a8870be7403864f78b9613c261a5bac3073aaea8d5e921857ff8a70628c3105d34ad97b27f9bad40ff3d1481cc5a5b9f3395048259a962ca
-EBUILD akonadiconsole-18.08.1.ebuild 1226 BLAKE2B 7d3ea8ff8679de8097b08958a3c5f2398c815eea56de8e3a9bdb9f30901fdbe0ce6a38f5110bcd5ef5fda168550476aa53b3a85189449fe1fde2f95ef395fc3c SHA512 944b60428b920f9d89f7c3e84e6bcba02be7b4748fdcbb08d33eb8c00637aebe6b70f804a64a83e228b81198eca3ea237db4d995b4ac27b40280f64765f19137
+EBUILD akonadiconsole-18.08.2.ebuild 1223 BLAKE2B 7ab08c5e23efd9b67af82e25e56759b3e17dab7f41377fa3a330484e0cdf90ae58a391f3e531b2d7b5e811abcba2fdad35e3464824b90796832b41975fcb1ade SHA512 8160c02d1043ba7a1f1cbce083ce81a2a4223c0d366f396e259aba23c48c3e19b5a3326cab6af68f3629afa5beed82f08c392ecabad0db4a8f0dffbc554c10ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-18.08.1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.08.1.ebuild
deleted file mode 100644
index 5943cc52ea5a..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-18.08.1.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="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 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/akonadiconsole/akonadiconsole-18.08.2.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.08.2.ebuild
new file mode 100644
index 000000000000..5f0f8a8085a9
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-18.08.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 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 7b8485e84371..261987020944 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,8 +1,8 @@
 AUX akregator-17.12.2-crashfix.patch 383 BLAKE2B c50546f9897bdccf1bddc00e51d6068282fa4eb04a9ea81f8ef8f566158a013c01ff3607504af2a6bcd1f026415fe8f6274b2268b608caf0a48c8d98b51833ea SHA512 df344cde73e4dd1813214bc3dcd4624661bdd53f2174d8dffb5fd222c10133d83f678f0cac68c84dea21dc09888a8f120cd23b3c6d1f34e320b5af51fa0e3dd1
 AUX akregator-18.04.3-syndication.patch 7231 BLAKE2B 1d204766d0d15653fd56db22ca5400537819521dde933f0dd06db3a430b1943e8b8bd94ba8beb5df9b91a0c548ffc1d39431ce639ed707983446b9eeb4a1d2e6 SHA512 d084138db86daf60116252d57fdfc5988fb18f1bc6a75b7898ff73c6c4164e084806c879ce04513293b1c48644a47b74b3a69e867ce7854777e9b9e24cb21fc0
 DIST akregator-18.04.3.tar.xz 2251168 BLAKE2B 9c57a3e125e5bf191df4fc60b9eacb471942735f5f2890a74f8812a97bbaacdbbf537b070d58f73ca054dee6eb42a575168c3061717c0809e79316b74f80fc2d SHA512 d9f1385c1105be62a7c209510e66b8152ddf3928a55210bff82c679602ef630486f9b7cbbc36d4d28183b7f7667049a5b474d953af38aed0bbbe3c7b00732930
-DIST akregator-18.08.1.tar.xz 2254228 BLAKE2B 23998b34dbd30fecfb144451af41de2cfad0de31f864588c1d974ac5bf7c2ef6c8ebc3066ee1966aeddf43b9315c3d337ebc26b7f7377504908b9135318afc23 SHA512 e8058dede0f67ba1b505374f206cbb29b035208965c267fa47e24875e2a2ac2c36d2e2394b669a116062af5cbd49fec2f927106965a603f1ab5c928cb0fd2d03
-EBUILD akregator-18.04.3-r1.ebuild 1535 BLAKE2B a0e855138d1772db5d993a7d30c8b62eeda5f40927eefa56d82349c0d0ab039a8077e6e1143d79164c57b8409ac2441e456af2e45b63dcff8e70f298663d1d66 SHA512 a9ea79c2de5e68940df9deec8c71897e451abce3736503e8656051011fb5a50f4254f747a27d23c270d54f952bffae0853538ed2a0446fec87ce5e9d0290a094
+DIST akregator-18.08.2.tar.xz 2254248 BLAKE2B c519e958e2cc45051a1c8ed1266b517069a0933d39ea0556a1d2e8a9fef61f50dab0fa8d617e29c6c4c1181e4a45432d58104f33412c94acd4669c64f0388a84 SHA512 2771972bd0a87bb59a0f6503d3b149396f082b8916c0cee2ea5f7a7fe5aa8081dca1973028939a2c472998388c48e12491a98d6dfd0dd88ab6981d16c8c173ca
+EBUILD akregator-18.04.3-r1.ebuild 1533 BLAKE2B fc9286fedfa6300d282276eefd037ecccfd75ed806bfabf45af3198886b0928056533b78f88129139089f24390aca448b13eb0e7756b98fe42ae13c35d0dde9c SHA512 9d3fb0f17debaace9481022773da58c672a45ffa525e74679466836c7a2bbeff36944960bfad2c2dde9df9b5cb75054f28fcf7a1720a0352a9efef76383875a5
 EBUILD akregator-18.04.3.ebuild 1494 BLAKE2B f61953255f5a9da53b9f4f98f24ec9b9b8150f2248c00223c4edc332fb81b326583c686dc057b2badaa131c78adb04a89b511e7caa210484f1c6cb3596569dc0 SHA512 46e4bcb6178e734884715c85d4369dbfdfee7076a520a995c53d06ad89328b0315d12e81474b61dbcde6b1a7c0a163ef700f0593002999b710c9f1e80c21e3c7
-EBUILD akregator-18.08.1.ebuild 1499 BLAKE2B 76a7b2beafdc653da534a410cda6f2119f5e5be1e9d3c14a7505d4da898a74387a2790b12692402a7d8eab955b63ce48000f4c1539517eb67acac7681c849609 SHA512 822f3e15cd1b05dce701cba890bfa484835794397c1045b8b7f8aba7115e3313f7ba55f693d5b4b9c223b4f2bda12b23b8c128f5acb2edda066b4ae66c88df9a
+EBUILD akregator-18.08.2.ebuild 1496 BLAKE2B 2aa275f4140b341c7254464cddf083c7a1a8c43ccf2b4c51e6fbc1f510357438065dc4de06accf02611597628567cbc30db4eac97f0a0aaed230ff6abfce74f8 SHA512 37ae3daa459fd264cd157ba6ca97cdb322fda3944c650e4ecdd1fb6d1ca68011fd836175cecb8946699419d24aafb33009a1576ec4c07059900fb3cc65f812b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-18.04.3-r1.ebuild b/kde-apps/akregator/akregator-18.04.3-r1.ebuild
index 8f0cffe52efc..0458b89e5525 100644
--- a/kde-apps/akregator/akregator-18.04.3-r1.ebuild
+++ b/kde-apps/akregator/akregator-18.04.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="News feed aggregator"
 HOMEPAGE="https://www.kde.org/applications/internet/akregator"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/akregator/akregator-18.08.1.ebuild b/kde-apps/akregator/akregator-18.08.1.ebuild
deleted file mode 100644
index fdfe45c8f237..000000000000
--- a/kde-apps/akregator/akregator-18.08.1.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_frameworks_dep syndication)
-	$(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_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/akregator/akregator-18.08.2.ebuild b/kde-apps/akregator/akregator-18.08.2.ebuild
new file mode 100644
index 000000000000..2f189164e53f
--- /dev/null
+++ b/kde-apps/akregator/akregator-18.08.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_frameworks_dep syndication)
+	$(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_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 e2f1afcea182..bcf1dbf80501 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
 DIST analitza-18.04.3.tar.xz 331744 BLAKE2B 41f2716cc8b4affb63ef38abccf51f46141588d27dd4a4980f185b02003489fa239ac659d5c030640796473e3adbd37f9579575684dc36ff8b3214fda0252bf7 SHA512 1eabdba287830723ad6d6c30299c6bebe902a5d0236c70c0435a9abb83442604010fdea064e91a023e7fc8a85e32c6ffc83dc9ae31d287cc71a828cd77dd83e9
-DIST analitza-18.08.1.tar.xz 331652 BLAKE2B 0ecf176899d6d5d9da0ba77d33187253985cf89fe523c809b79bf146381bddb67d42c84a6023299b66f9dd812f12584809f623987af6ca4254ad58af62d9807c SHA512 b04415ad46919a6c5e53a86218597d25648092058f8029947bf09cb9f0bd174314b76951d998bedf0ecc6e543ead91e14ec752c4a673c567a02ae7badc1450fc
+DIST analitza-18.08.2.tar.xz 331484 BLAKE2B 2cc70c72128c1108bea5100e77637b93f0abd4b65b07f95cb2a25c5354352550efd5ac1d04067276271c447bd2e96b74ef5d0d33d4eaed6a0f0a59457cda7a06 SHA512 7c90f8d738ed6ace4555580e2e29b6bdf3d291a8908b13b294f698811fa5a1c3cd414cab8c0bced3a59083cccc5bfecab5622a446df8572b1b974f6dc8938fed
 EBUILD analitza-18.04.3.ebuild 812 BLAKE2B 266c4304bbf2c641f6c7a920266a96c9b318de14cffefda537d363a1daaa14e841e994ecd0aee5f81a28a4b582cd0d11cf91dde00cf2332e7af5a747ed6d33a5 SHA512 d3605937b54067d575f07d1189730ca18d0df4f6d33d2f011ef691a6a48892ee3340da088e873bbd4c4b2f2dd5fab2eab9ed010ef4603aaca881259464cc3ac1
-EBUILD analitza-18.08.1.ebuild 814 BLAKE2B ab20e18be9ecc2c7f816a21f9847b704a0cf55fc32c63bbb241ac7f0058fd2671e653a4a615e3fa5d688618a5fdddb434db801a5ebedd3cbb00a2ac2930076ec SHA512 267071d595f3cb78d909f9ef0f814d90e31ec54cf783a484ed59f55cf3e8d1ea4cf66b7fbd215873119ce2566d9cbe5000ef70c1b2f3c9f1e67f16553b3010d8
+EBUILD analitza-18.08.2.ebuild 811 BLAKE2B f49dea4e0561473c161de71d3130d95a9f7364acbb23d96bfc2c9cb479c60767ce8756a9e6251a8da33cdc87a112b91a45d722b6e81277c5e69f865d2d89285c SHA512 1e360d8f97c9c750bfece28bad906b24db42fe5ac87a30c6879b8a90211dfe920d663221fc329ed2ac686884ef2f9a6c3004a0e16e1c1f518a40c8b7dfdb8119
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-18.08.1.ebuild b/kde-apps/analitza/analitza-18.08.1.ebuild
deleted file mode 100644
index dc538401ed67..000000000000
--- a/kde-apps/analitza/analitza-18.08.1.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/analitza/analitza-18.08.2.ebuild b/kde-apps/analitza/analitza-18.08.2.ebuild
new file mode 100644
index 000000000000..9abbdf4500fb
--- /dev/null
+++ b/kde-apps/analitza/analitza-18.08.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 be3f00374c89..c4a32e5591a5 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
 DIST ark-18.04.3.tar.xz 1973656 BLAKE2B afa413156233a31a1c7d102799b347b6879453a4c0a870511cb9040c9160c4da4eab30722ad9ec07ec1e9b68e942c137c464e0054738d8ee3632546b49c9dc93 SHA512 39348d3cbd3ed044ecc40a235c3e93dacb638e3ea867f814c722630786fbf7ea48643f967fb46f3358c64966a250306f11ab2a76c9147bc135ba826bcce9d33d
-DIST ark-18.08.1.tar.xz 2580104 BLAKE2B cee3333c426ebd896ed012e1cce4326cae87a5b604d712cb71d6716b485f57149d8ca06fc908e01c00f3e848d0a6f5612031127f1e53ed2fdf6d3e0d9211f516 SHA512 b4daf4f438a084df452063556a1754856a56a9a97db2c8379775d9803bc262447f7fed983c4a04e046f2a5e673ae43e4f3a902854912f79da14b9080c9970eaf
+DIST ark-18.08.2.tar.xz 2580240 BLAKE2B f6e32d518d4c4a278542fee20e8eb717004d51fc61ecd79e1d386c87628783fa1644062aae285e417f709ce79d99574c420ebf9c5b5faea2075de35d8115baa2 SHA512 5522fba835d75e317f6bcec40c2b8faf0fb7793a643637ca37d28698c0cf9cc639892f6dd272272095d74f648b9bfea7f5c67f0b2c41847e99564c9ec5f6954c
 EBUILD ark-18.04.3.ebuild 1942 BLAKE2B 33c6fa57d3e3fca99e18c2cef0c2505ff239ea66f2f5bbc9fb177b293344c2b16360021902046fcbafc5ec6e71496fc47a96a07a849ae0a9cb75085d142bab9e SHA512 05f9578df0799c444409bac6ef1c7ac1824493a7080af68d9f908ef0a7bd6348722d2c2c2fdfd9e1e57296d7b5823416869cf57438def2e58942857db267e78a
-EBUILD ark-18.08.1.ebuild 1944 BLAKE2B 3f014c4d6621f7d41dbc11852b11b513ec6844bf73548e22461e503b7afaa2eba1e00a75a3286b4a355c473bd50c988a039c49b8195da3fbf92a2304fd5bacb4 SHA512 2aa41369da96eb37e926d8e8cced96313e30a9356fb96011aee678c29e4afde5b0e32d62734dd88e57fe6f6b32d9f699dac9429cee34a2333c519e639dd4fab5
+EBUILD ark-18.08.2.ebuild 1941 BLAKE2B 15f26558b916a7cc7254d2c917f897f98b4e194bc508128c89a965ee7165800ee577328126fe5a3abb0f5e1603204ae953e1059ade52e78b18c6b83276293887 SHA512 dc3c27bfa6c0daf9ec1d01bddd9d7ec6fe92ada7eef5cdc9b180bd06285fd315688693fcfd17edfd4cbc27769df20824e05628676fc64c6b5e75709cd04ff56b
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-18.08.1.ebuild b/kde-apps/ark/ark-18.08.1.ebuild
deleted file mode 100644
index 7a5bb558b1c2..000000000000
--- a/kde-apps/ark/ark-18.08.1.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/ark/ark-18.08.2.ebuild b/kde-apps/ark/ark-18.08.2.ebuild
new file mode 100644
index 000000000000..c6f3ec55fd70
--- /dev/null
+++ b/kde-apps/ark/ark-18.08.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 d6bd2072f2ee..9737c749ddac 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
 DIST artikulate-18.04.3.tar.xz 3748684 BLAKE2B ba7c6a78c6e5fb074b610beb60dccbbe3b159a9df90ef2c65e9e7a2d4c44ec6665ef1ca1644043e104624a31c17c4a4e9f8dc9baafb17bb7b9a356d4d6933135 SHA512 4fa7c6d24d0dd13bb3810545426a626d1c84c72b083e410b70524aa4cbe621f577494b8f60c309dbecdab036353cc9fffb6c8fcf71a3607f13469001395f474f
-DIST artikulate-18.08.1.tar.xz 3747624 BLAKE2B 1c6b21d9491c3c54b437a7f303bdbb2c26eba4bb0d2339eec730999a16be79d402ed01ffe8c67714211bcc7877d74d85c9fd4e0c9205d30029db6e0043f4182f SHA512 1f81e5ff112d0424550a7af09fc5bbbb4bc2eb926b7fc791493c34c2fa82f1e27e51d92467eed186ba4bcfa3e0f0bf65ad93b0c4c061067052eaa04a5c0bcc29
+DIST artikulate-18.08.2.tar.xz 3748372 BLAKE2B 05e4fbf0a851c99ff9087b5a522c7a3c3bef852dcb25a7dd03cec5fc598843ab44466dfdc40bc2fa07308e60901c79c49b1f0b5b0197a860e226eb408c7eb896 SHA512 8a45ad103da588b15a23fe8f86b6f8787d0fe62b0407a5490e948671fcd9af4ac4cca41fd674c6feda6b1801f5fe6d18b74fb3c65e90f6cfa3044899c302ed27
 EBUILD artikulate-18.04.3.ebuild 1117 BLAKE2B bdd3c88ff3d484548cca21867c77ce376faddce842e2f6597843b70cf2b1618cdec825309ce1a64ff0d099dcb1943ff9636812a39620d0e2e307041cdb7d85b6 SHA512 4e4eaa3064916cd463b6c296f4e071295496bdd6bfd916ae60f20393cd1673773991b7970c629f19522eafe21086e1c41a45efc20b283a85c3d6cc220ca79a7b
-EBUILD artikulate-18.08.1.ebuild 1119 BLAKE2B 394932d35ece9141d9db95a9544bffa0b86bb114040a05a982d22e365054c05cc7689a29d9a170a79716ab00e79a010e0ddf20a933d24f3e380e397d43ec18f4 SHA512 225511e036aea03d1d495c712cb7f52b42621e803ca3e0bbfccb9e5197a977bdedc8366096d77bf947b210dc25cf50f9bb6c93226100cd58dcd0f77dd831f4f0
+EBUILD artikulate-18.08.2.ebuild 1116 BLAKE2B 2772ae3f5bbf6c1c2a01f74b80dcbaa6656ac9e12090137c83da5fa6d97a99e3d277bd85483ac668e1c41a80da44607802b088d2edc0bd6634553f5899cf0af7 SHA512 6924740313fd6bc588a7c97e611f91f5a912c01ece715abcb79f9072710361d901414be94bdb882241577acdd265c2fe7c6aa90d900d248d6be73c8c6eff31bf
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-18.08.1.ebuild b/kde-apps/artikulate/artikulate-18.08.1.ebuild
deleted file mode 100644
index 9c910d95fd15..000000000000
--- a/kde-apps/artikulate/artikulate-18.08.1.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/artikulate/artikulate-18.08.2.ebuild b/kde-apps/artikulate/artikulate-18.08.2.ebuild
new file mode 100644
index 000000000000..0f9f392da82a
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-18.08.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 c40d1281c245..c101b427cae6 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,5 +1,5 @@
 DIST audiocd-kio-18.04.3.tar.xz 248668 BLAKE2B e4cf5c7f944f6dbed42af6ae749d3c24f48f974086d03494934ec1c9a394304e885177b277bd83ca9a29d07a11cbd53bf79adb7396f4e1d354088382394d4ece SHA512 a7f8a090019420e735471ed0ae7988145701212b453f958f0da3643e85503de236245a3bb24024449bb6fc50883eb475f450cf8674aed2b166a7e4ef4cedf32e
-DIST audiocd-kio-18.08.1.tar.xz 249100 BLAKE2B 11baa3d1cf4fde2416d1718a5cb3054fff44173b93f93f0041f6e332756a8730666ba6812b30b3097663f1417307cc4fc38737da7fd404a1808dda19252aa2c1 SHA512 f47710fc59ba3e630f3a1b9036d9e66e6b0571b72e924995ebc7543287186e5ae9feaa7da81c0a77d27cb54842364169c98a1de09be1e3629517d8d7e7962a92
+DIST audiocd-kio-18.08.2.tar.xz 248904 BLAKE2B 2ba17f4ff6f14d5221699a2818d7615e84fc4a5eeeba40abc72b2b70fa7b9916ad37ca9c28275dd4aa3a91e2795d60486ffcacb66eddcf23d02d262b73970077 SHA512 d425d7ed5151035b467d29c586a24591ed83aade53c1d91da383c58304240ec676d77f7ca60e658dd22f75e3540e602258536bad4aa54b5119b1d3e4031722f3
 EBUILD audiocd-kio-18.04.3.ebuild 918 BLAKE2B 04107dc6d19aa76d37d8d58485141014a54a8615b8e3b86e824a5fba56dd46eafac8282daf3c85ff8a4c7063a75a468a138af2eb18999b66dc2e6b84cde05f94 SHA512 1915e62b9cedc9f91237e26e31a9f16539635181dcf965c5bb72f5fda12b34dd1cf7294bfa99a6a717eb6f26abe8912553b64af7e4af083b3de79468871c9a26
-EBUILD audiocd-kio-18.08.1.ebuild 920 BLAKE2B ecdb36adda2c4ea7c4551405c2f170f7981c17ad04910e3c141ddab9f7db51a6405818c74d66a40110d24b27fc69ffd4cdb010d2d8022a029104b8dc613cd1b7 SHA512 449160c59f5982043e93203e92d8329fbf3aded193adc5d07b55f3b2b5077db596c435c73df58a7cb5123eeffc339fe0ece189c84da48cc868b9345dae195e56
+EBUILD audiocd-kio-18.08.2.ebuild 917 BLAKE2B fd87c7582a5ed2c08146d4421c795e7c526f91d88f64882328a9577e3e9799c5388479ffc5713de47a914d77020a9abc0efb7974faf2ff7dd6c58d68d56bf264 SHA512 627e22c571644df4784b3da7aaa30b670c94cf22f1f92e15276d69b792938c454442d221e2cdefbb3f44dae9b938578ffdd86c7f69c3235f289c4f283eab67b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.08.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.08.1.ebuild
deleted file mode 100644
index 6bd5adfbc365..000000000000
--- a/kde-apps/audiocd-kio/audiocd-kio-18.08.1.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/audiocd-kio/audiocd-kio-18.08.2.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.08.2.ebuild
new file mode 100644
index 000000000000..24722a1c1872
--- /dev/null
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.08.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 69912c021f3f..d39933aadfa2 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-widgets-18.04.3.tar.xz 244960 BLAKE2B d8b9d80e7a84958ead24d5371a582c7de8fbe6adaa05faf49c66a4613c03daabd12acbbf9288df80a922e8ce3a611728cc2059a1814cd03d54a3c3e584d29112 SHA512 d267d43d75a6139f78961f47b12882e2cd4dec17e31a60de5b0d0d133a895a36b12bafa68b121f84b7a15f692ebd1219b055197785183fc1b86e59b754eb5e07
-DIST baloo-widgets-18.08.1.tar.xz 244788 BLAKE2B 0169b0c34b8144d892a4897787716dc3babd52c23e3517e4a0a342bcbd44fd31f56687d3480407ff0a052211ddc61515935a77ceaca9f9c83e08e81aa9cfdafb SHA512 72f89b74e2dbaeff226f156923cd92ce54b8c57ad3ef7283505910d17aed6188648ef0fb5b9c4d1256803c8931f4104999e8603b0f4abdb41c682550c542dc89
+DIST baloo-widgets-18.08.2.tar.xz 244776 BLAKE2B e5891fc47cfb30448d0d1a3ab741a9f7c30cdd07f549add799dc167c33f60a7a52d62fe28f036939686a612135c93dbb91e50ea071229f0da294972c07649d95 SHA512 abd2b703ccedef06e4cf3d12e3581674e9d254bd1d7fdf3e1f448a25d990ae832fb0699cf558f0e4f9d5fd29c5affa5ffcac500759096294fe9611b50e694324
 EBUILD baloo-widgets-18.04.3.ebuild 597 BLAKE2B a074d5793edd74e8ce736898612bb7eac439e782c64f522db5b133b84c7d8c107ad2ac9ea11f7a0a78062940fa802fe3aa94e1e79bfd77c878ad5d80be520343 SHA512 a3905e6ca2dc2ac8a3b4b8f03fa3e335820e9a24639af4cd9ae0586abe4e870223783a027ec525e68cdae9f1de91c8b050bab71c4bd3d49d498924ba7b5550f4
-EBUILD baloo-widgets-18.08.1.ebuild 599 BLAKE2B b4e916fedc42a1a0246c38bd926592d912218660bf1c3ca5bc3656dc7eafa4a2a459e3031e9fe70733a5764bc6cd5808f0c755c24a6b0fbd857bd9ae87aa61aa SHA512 cf7018e39257e5b8748ef58f94b868ea8e57fd2c9cbe46ac0ac232b7e822f2d46462c99bc88304c747ee72d51c0707679afcd3ca85c62d208022017b72faea75
+EBUILD baloo-widgets-18.08.2.ebuild 596 BLAKE2B c2559e23063d6dafcb62bdd255a6baaee079531a02beede7e851dfa00086402b13b47311140879ee2d0e88313ef356bf13fa8cd9270b3d034d85fcb304dfeb1f SHA512 27359ec0005c7f4df7a3c7a0c33e713a73fe9186bc2e02aee7db67a4b0227baa6d8cf5cf123f6d12b29c4b7ebc40b9e43d2ee10a6882af67ea20d87a605617cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-18.08.1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-18.08.1.ebuild
deleted file mode 100644
index 585c9262ec1e..000000000000
--- a/kde-apps/baloo-widgets/baloo-widgets-18.08.1.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/baloo-widgets/baloo-widgets-18.08.2.ebuild b/kde-apps/baloo-widgets/baloo-widgets-18.08.2.ebuild
new file mode 100644
index 000000000000..2938ec7d849f
--- /dev/null
+++ b/kde-apps/baloo-widgets/baloo-widgets-18.08.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 48a2c17993a7..dfed8f5123be 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
 DIST blinken-18.04.3.tar.xz 2507660 BLAKE2B 0b002c616bffba1716837e23aedc31f7401842589d3d8d4f029df5245c81eaa5a0213345619234ac85e0e1ff97091f2daeace65c59b5911f70d35addecb30966 SHA512 55a02b9c1041c8cf554431f338f4117300a25c5976f01c6ba3a3b28e66f0ea9742fb0dcd4fd25cb69a3ba5c41ef3b7633ae1259672a8e8175687ff17130920cc
-DIST blinken-18.08.1.tar.xz 2507716 BLAKE2B 8bed77f0dacd83125d240d318606b203a3280af2a1d5bf02a84e41d4901413fcd6475d6e3e2137d3d89c9ec8ba601549a2c83a6fe53eeb700c265cad82dce566 SHA512 d5bc40e2a2aa9f0d0d350d6aef57456bebb5e91e9f1f512b90eba720bd4d4a58762a3e04378296b06374125c93820f201752939d4ca75cf81cffb023fa8591a7
+DIST blinken-18.08.2.tar.xz 2507632 BLAKE2B 59f4ec3465603222709408e18ae6b2428f0a105d781dcedeab6caa3f5da31d01558be39388b3e2e4318db652d73dc57cdbe973d520c5d4fe129b054d9298ba46 SHA512 0151c57787ad188235fb0b42882a389b2dce698d215f1de30f1aa8c278fee81dbe57c868380d8cd60b8b24ce1e368b4e79e0e2f706407e236f2fcf10f0a0ead2
 EBUILD blinken-18.04.3.ebuild 768 BLAKE2B 02653f2ed7d6bee097378e0afc3e88947aa978bd9027d13bab05aafa1da424e9ef88a4ace0424f134686a207c4a286cc570f708308503ab525c2dbd782940a05 SHA512 9ee30d940c1a3f3cbf398063047ec11fc7406c48751c8e70abd14a54d6fe3febc25118097734ecdc409f80a856274244453e54ec75ec6b6d702ac6fcf923ecdc
-EBUILD blinken-18.08.1.ebuild 770 BLAKE2B aeed4cf2f1b1f9f4a45a0492985ecae692d19c7cac1a618b2bac55165901bdb580cc6d521ed458f997e15168824b5dbe0f006f4fadf73e5f9b9627d8bfec52a6 SHA512 1dfc596d4fc692fd22b70a9ebb1e62dc8f71794b6edb328438852a46f103873f4c98fa196c61f8657981f51ca9de06aac6517120c78d67b740c0184820a70998
+EBUILD blinken-18.08.2.ebuild 767 BLAKE2B ba7929db815a2cc834fb77ffd0e16a5ddf71b8979b17d9f334c20957929a11b342047b10f15f7b44f809ee1cfae87f0a570d3f6fe09c6fec3cb16ed54314687c SHA512 088f1076e8ef48d9bc29f44804a322fcf55e0dde93fe91b38d0ab8db054993eb999772188796b514b042a20b13eeb13781887d7a5ee3e6084ab285645f02d735
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-18.08.1.ebuild b/kde-apps/blinken/blinken-18.08.1.ebuild
deleted file mode 100644
index 691085603aae..000000000000
--- a/kde-apps/blinken/blinken-18.08.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/blinken/blinken-18.08.2.ebuild b/kde-apps/blinken/blinken-18.08.2.ebuild
new file mode 100644
index 000000000000..64c03ecb966e
--- /dev/null
+++ b/kde-apps/blinken/blinken-18.08.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 c6664ce1073e..e4b83709e8ea 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
 DIST bomber-18.04.3.tar.xz 754288 BLAKE2B 5c30c435dee98ce851fec3723148d62db815ebc3aabc7a76aa5f9ed4357cc55fd2a2d695cdeb68f729d2d93132d1804b0df79ab895b00094d6ff2703c9dbc443 SHA512 40297bfa9c3fb543a8f8903a70fe7e7987d9fd5ba063ab1de2cf58801ced0249f4b9019aa7492ee30f027c74cde8c0fe268888835e37ae56b0621dcdf8f30811
-DIST bomber-18.08.1.tar.xz 819452 BLAKE2B c273bf52108e41475ab13be686b407f656c3a85c0ee98fd7f1f363ce445c6d76e21601e5d61549786382109ea084485ce9d1794e000723aa3b13fe400142d975 SHA512 17d09475097ed84a36da0eb769f1b77e2248ab253c4ce774e73b97146a08fbf7864e088af4e63cbafbdb3dd3aba5bb197af9451f9e767643faa5fe35d5cdd22f
+DIST bomber-18.08.2.tar.xz 819384 BLAKE2B 285763201a4b9c239caa316c564bd0afaaf0d4d0e26dd8df5d9c6535915ae57aa865d845e5e2946938a8b0d77f85f360997a7725b8631999878a786c81815b70 SHA512 b4966c070223ef29c99ba31fc93a9a4e3d8da6676c1253be3367fb4c57c7737cef5684bf740e3623df130282adc95a7d1ab7e5e64a9d87f4a9df7240b9eb1c50
 EBUILD bomber-18.04.3.ebuild 685 BLAKE2B b62f0b52aca8404743df8150b990b75228f9b67ce1aae9345f33ae10f53e15c8617df73966be6c880852c1b36dfc4f2522aa986550edca71274973f42fca44b7 SHA512 2858c6a02e8776a651d23bccad7b432bd4f3bb5386840d39bd11275a0154d65ae73aa0fe264a77f5fa1912b8b57898dc69bf68951ce0aaf265e8257188ef29f8
-EBUILD bomber-18.08.1.ebuild 687 BLAKE2B d8b62bfa84ff255f9a0515589a1f0063674340b0ea87486f1a76a1553b0e016dd32928e36799e3608659479a0ee8958783d8a4679e81679055b48a159b68c419 SHA512 9867073869e50018757499d76f4504588b7cdba026763add11849ef309c3e7e197cd5962b67309c7c153b42fa4388551c2425a3c1f655156f5894245c794b5ae
+EBUILD bomber-18.08.2.ebuild 684 BLAKE2B 9dac702b0134a1b757abf7514f4e80bf38f8edd474a9e35c007d858be911adff58af66023b2787d5050fa7f011e0309b405689c98c6d22741c4e983febab38d9 SHA512 122619c0d6e4b1d0c502287d6ac1a78b5782e9f84da3af8ce067e27c19b717cd32242d8b4af8b2a6d0c2c7675fb34ab036809e6d68d9ae3ebd18e113d23465a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-18.08.1.ebuild b/kde-apps/bomber/bomber-18.08.1.ebuild
deleted file mode 100644
index 1131554ae2a1..000000000000
--- a/kde-apps/bomber/bomber-18.08.1.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/bomber/bomber-18.08.2.ebuild b/kde-apps/bomber/bomber-18.08.2.ebuild
new file mode 100644
index 000000000000..1d4bb83a5856
--- /dev/null
+++ b/kde-apps/bomber/bomber-18.08.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 25cac709603e..9287f7d892fe 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
 DIST bovo-18.04.3.tar.xz 186428 BLAKE2B a11d7a44b0d1489c677b1d5fe102ea7e1f5b8680f74c8dfb316c01044e82b87cb6c8acc42529d5948bcad74034f2392a698ebedfb442a0eb040d0ad00ea374a7 SHA512 f2efdb2e1f929febc0c1e7ed896d0067e61b3f8cc08616396718e9b79c60737921ea352d8cd4450358ee7b06d74d7130f5890fa993a4b23ecc35681ca3fcee8c
-DIST bovo-18.08.1.tar.xz 199616 BLAKE2B f58762d75a754eecd3ed272e2ba02f7509115f4a847726643d3a3f21fb24335d56730075526676403f128a7846ad4cd4b9cba3a5dc00415d0e5131ec80db3082 SHA512 fbd38aa34144aa2a7417b751cdc2b9c95aa8ddd1714b5d83e3fac0282f27d99dca32fcbafe493d5e8571268ebcb74142755fdaa56246fbe87eaadfbaa469d1d3
+DIST bovo-18.08.2.tar.xz 199564 BLAKE2B 42c645fdab07edc9b0ddd19a4e560dd47c77a3201271ec7f5143131546a0529a9ab63e588c2d17afb8e78810e017688c96d59dc4ff3845501cf37bde29d84e2a SHA512 5f4ee1ffc6c6894e5f47fa069cd7c491911db7ee8faf03d9761e270d8b29cce07c985bb9f5a1ef0fb38b93c61039f27a27a7dc3c9feed58f231086b060bc6de7
 EBUILD bovo-18.04.3.ebuild 702 BLAKE2B 85a85acba350d651339bf61165f7b0de15cf9bf996f3ae942e6267b0a35ab58a73196f92e5c249ead409f6814f6f16b7de8ac90d451dc3bc0c2f5763e5fc22f7 SHA512 ef0e3d99b0ad580a20be16a3ee18c2316f00cfa8d54c88f2135cbaee3c4c288d10661739afac12f5ca84fa3d77bbeb10896b4d5804e7be3138ceac936b370112
-EBUILD bovo-18.08.1.ebuild 704 BLAKE2B 7abe20171e86fd1c18b0a5ded391057ca3d1e180f60edb47f9daffcc6192412d9b8aceab2458d15cfb7ba20f7bf5f947d7d69ee2433cb4b941751172b2554ba3 SHA512 31fc53db3f3e0fcdf5f240b9e9c935260ea363226881e90b7ad3f59bdd6c3a3cdef2c10d8fbe0be37de10df47bf525e7de58d56a2b4b3e0172d3aa965624bd78
+EBUILD bovo-18.08.2.ebuild 701 BLAKE2B fc6ffa0f20cee0e9238b69fc6d449a295eff6669f173cc2079b942343a0b51d5f13948aa6ec74bd3302a22f19e0cc2dd06bba6735bba8cb95e8ddbfea0fb8187 SHA512 e7731bde5bc60c386771814145abfbea4ff13b9e383f0f21872f8ad362be15d892968e9f0bbc3c731ba2b7a795d99c6118e6b1d6d365df34e1eddca8f3c29452
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-18.08.1.ebuild b/kde-apps/bovo/bovo-18.08.1.ebuild
deleted file mode 100644
index 8f3de523e8a3..000000000000
--- a/kde-apps/bovo/bovo-18.08.1.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/bovo/bovo-18.08.2.ebuild b/kde-apps/bovo/bovo-18.08.2.ebuild
new file mode 100644
index 000000000000..277760acb49a
--- /dev/null
+++ b/kde-apps/bovo/bovo-18.08.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a64c0d3c6097..bf96df14566a 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-18.04.3.tar.xz 221048 BLAKE2B 66dda4fb9e796f12a06a314197d95f33117dfa5c0d962c46edc6cceef225407f4b9ed4acc334ad9927c151f7e4709dcb4deac78d0252b5e62ec78cecc2ae2079 SHA512 25183856d3bc5ee2b1bcff27055479c9694df37db169419d0ef3525adcdebd06dae07134ab7ebadc42afd9d79d7598574b8c5036e6c295b0986af048153b1b9b
-DIST akonadi-calendar-tools-18.08.1.tar.xz 226084 BLAKE2B 26de3d10924f2bb104aef89be3b021f73421ff67f30c0deaae0880ebe9a16ed451f07a80196782d491f6df6cb13a52cd183313dca16a5c41aed7e83f3b5547c5 SHA512 a71cf6a4e00130cf4b5b69448f779aa9f6bccc27a7aed5139b6f21e2be4828b923624487f924ca3694f9732265aaaa75db83f34d7172cedd86e4e4d82414a7d8
+DIST akonadi-calendar-tools-18.08.2.tar.xz 225988 BLAKE2B 76bc913d567b9f64a0272b55ef0814b818909bcdd6e2b077476849fd442b16e2cb22dfc6dc8c929a40258d35fed0ef38131c65edf133f50f4d748e197bb08da1 SHA512 c83991219e200ee1dd310e13ca64ede2d005bc24c4fd1ec40bbfc9d406aa8b83b2959b76e2639e10307bb2eea462a38170cf424e086c67bba70dd4d2e60d3c53
 EBUILD calendarjanitor-18.04.3.ebuild 1029 BLAKE2B 19aac37a01db2716f31fcd2a6082a68eea84f8b8fb7a35d76721d2d72cacec48e49fbd08cbdafbb74f6346ed4a8f1084f3e0c62450f04740a9112568b73cdf94 SHA512 beda41c1e93490da51240a8abb47d028f2f1a3cb5b5daa6a11fdbe7e61b58c70941a9d62ddd577a2d7921199787e1dc29c15bdc6d10859214e199fca1f5de55c
-EBUILD calendarjanitor-18.08.1.ebuild 1031 BLAKE2B 515efde0fe008e2d1625e3a51f4b3ab5ba09fdf0cf10fc40c64e1010456ce13165f30e5443c29fd8a1804a514c41cb7c8080841b776043a49f4572545a9a2779 SHA512 4f2b369eb174348da6ad3cd3958ce363df5efbd3a2d153ac33bcb259db30cd58fe60cd22b2be8e0ee961033c11a6ea94b4eed67284eb72d4041132d4dcbf01ca
+EBUILD calendarjanitor-18.08.2.ebuild 1028 BLAKE2B 9f86cbee0b77d62cb211d579c1c6c8508200303757359d159086ed278f7275c65ba540cb5a2045a7a1d2f1e48a5c9630885615c447a708b04b799b2d679931d2 SHA512 d4194278ea9c4c98c1669e1921170d7104b6c21dd00a9e02904dee4f1454d24a8e209a9b525eb83c32316f5554bd6fb024e287abe232b3159ccf3d8a621e0519
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.08.1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.08.1.ebuild
deleted file mode 100644
index 026dab8a1418..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-18.08.1.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/calendarjanitor/calendarjanitor-18.08.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.08.2.ebuild
new file mode 100644
index 000000000000..140957cdc060
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-18.08.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 c4fdb7536e2f..35f2bc7f75c6 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
 DIST calendarsupport-18.04.3.tar.xz 647108 BLAKE2B 8088fcf42474e9b876e57135dcaccad97fdf4f433f57fd72886c1d94d7086471f1b76a08aff5df24f2cdb9891da041dfcf444951f908837ebb3aa53bc58b332d SHA512 7631d81bfbd3282448d4d78cf05a4714392736a74e23155b4c75f288a906975ea1bd32e3412e03b8ff74778e85560a071a11482c35cf769a738675c4fedd3e6e
-DIST calendarsupport-18.08.1.tar.xz 647596 BLAKE2B bd7805e21f7fc9a7e8707bfa44c51f3742b3ca4915276b2e3ead034179df9678f432608b120b3794bb6f792cd123de91ce1135e402585b93af5aacce9f6217de SHA512 314833f9328ed4af76ab9d50c7a6395f9f3b64f9d40dc459496d04c21018a66e30e44fcff5917b83db0e9d2851c4c3b58bd0f56471b97a55916f50f53a111e42
+DIST calendarsupport-18.08.2.tar.xz 647628 BLAKE2B 8c81843ec05c51efb3115c8d3e3e595ddd4cd870e1be4552d0fc0308a29c36b1174fbd221881fcb57be34ff8da74a90b955729db1613fef271a7c9b738317216 SHA512 4d7cfd13ea2fa1d9fc9577dcf245bfa65a6b6f57a18529f8af588563d836e4b18cbbd1328338019c2cf4665c8977f4b87a4b06890aa0f1594cdefd31d1dfff5f
 EBUILD calendarsupport-18.04.3.ebuild 1099 BLAKE2B 6b8b8e7fb0c51e9820cded52e47369ccf5051aa05b3dd014efbf1536d773db9abc7dab18e9d9e579bdcd5164db30c280452aedeb7def43e6e5a504b6141c8c42 SHA512 5b0abb1569c17da4c776639e006fbe19b52b6080801aa0d4273f48271848d9c4334a2a713b2d08801a64bfe5adb6c47cc635e32629d6fb19b60756eefa927ac9
-EBUILD calendarsupport-18.08.1.ebuild 1101 BLAKE2B 06c987a38a03ce150d785d86eb8a358b82a001501ab1aed6e48bfb8ba139cf82fec277ce8e33d4b158d85a98ef0f4e7c41d5ba0213517b65ff78d5b490cfef02 SHA512 f93a5be882627278bbbb52cb4677308d1999b73d9b08776361ff3d0287d9317173ebf629c3e0e4fd9696ef9c9985414f0317928e5c472a87569b11427cbd653d
+EBUILD calendarsupport-18.08.2.ebuild 1098 BLAKE2B b26c94a84ddf82c6bcca40c702eeb6b13c950224ae2a49d48a9cf460b23f85b724a71c0cdbe043358683a30e079d07f261a950a52ea57e2f30256e25e59ebe3c SHA512 2f257ddff2c9a0980f6695fa11fb00993c2ae390ed6ee9df0ea4ddda9f836c1c2d71cf98baac3cad854d9b03033c0622b01b0e16ca799f779a8b0d91d8cf9b89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-18.08.1.ebuild b/kde-apps/calendarsupport/calendarsupport-18.08.1.ebuild
deleted file mode 100644
index 04abac8577ef..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-18.08.1.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/calendarsupport/calendarsupport-18.08.2.ebuild b/kde-apps/calendarsupport/calendarsupport-18.08.2.ebuild
new file mode 100644
index 000000000000..4a6948a768bd
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-18.08.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 c11d34256103..1a424ff7e5ba 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,5 @@
 DIST cantor-18.04.3.tar.xz 2179372 BLAKE2B 1f6055359d239bd3f49d4a95975a13db710bb7aabb708b3e045aebc2b95ae8d9ab875486ea6735104d8df6bf53bfdccc6349e627e7ab32596bb0cfda83db31a0 SHA512 2493d2570f69d0f27489dd86b48a11fa454c4b0d42b821a52ee6489ed6914af826b94a152098144cda40122ddf98d7b121b03c2e4e4b46dc85db83643873d2bb
-DIST cantor-18.08.1.tar.xz 2179892 BLAKE2B a8961e1e97ee6056e7cdb5271ea1ca2696ec6abf6f985e7d552424950096024a8e31d3e8b08970287dfd71e36f1bb13849994204e14c14c873c1013908ce5b9f SHA512 240c2a1c588cfeeba8ec2fbd048ee2388019b26abb667ddc04b1e7b1dde13443363e99b81b160fc281066993893f8a8bc04541fe8a9461f0d0f58f04e54d9f5d
+DIST cantor-18.08.2.tar.xz 2179900 BLAKE2B d188dab14c6e3880dc1ee3da8a01733fa926740742d072af673a52d6af6eef42613e6a398cbe5a941200d658e1414d98eadc6b33b239dc3fd5ab85baaabd91ee SHA512 39cf171e3eb00b39ff472e4b1734cbd6aa7f0c20bac9cdc9ff8230200b0ccb9fcb7ac2a1cd85f333edcb39b49f4d4a82cdb44958fc66e98ff690d0ef02a58299
 EBUILD cantor-18.04.3.ebuild 3179 BLAKE2B f65cd049ec6997ea90b23d95ceb780f253abba21471f951cf42c1e9f6d5800261743ff40307c754486ce50f976da3ece31acfa28573bd75ad2834dc86002962b SHA512 6f6c02bceb62668e6deae92804f6de12a842234a8bc2597f65b93f202ae756f18fc91ab4fda4bc82d396030bdc9bbe8b76cb425386293a2f09676c5d12740e49
-EBUILD cantor-18.08.1.ebuild 3155 BLAKE2B e327d208a10e05110a3c2292a055a5e663a6519221a144d8c0be818fe1397c4ec4515eb5f44e5626025dc23ba8fc18634c2f18974364fa44c1ab67cf10eb7cae SHA512 b2c10e6b8728d4d50834efc78eb8fe2a9b79ea28bf6ff4be67624f5c0def377199c9bdd7f1f2d543c5a73b2a7e8542ceed66743ca2cc704dc62bb1288e615da6
+EBUILD cantor-18.08.2.ebuild 3152 BLAKE2B fbf3781010d0fd31c56184ff566bb8ad893d83d9191198213ed97d31d465025c148fb59e000e7510a83332b340563b34ebff23d04ed896982040e6d2d47ede96 SHA512 303a109555f83638c17af5871e1abde198dcef4fa10c35ec2695c17e18a8c73ace16255192d855383957c780ac6d8db2133ef7fcb9df2877385e672441e12949
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-18.08.1.ebuild b/kde-apps/cantor/cantor-18.08.1.ebuild
deleted file mode 100644
index 89cadc785da2..000000000000
--- a/kde-apps/cantor/cantor-18.08.1.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
-		elog "You have decided to build ${PN} with no backend."
-		elog "To have this application functional, please enable one of the backends via USE flag:"
-		elog "    analitza, lua, python, qalculate, R"
-		elog "Alternatively, install one of these:"
-		elog "    # emerge sci-mathematics/maxima (bug #619534)"
-		elog "    # emerge sci-mathematics/octave"
-		elog "Experimental available USE flag:"
-		elog "    julia (not stable, bug #613576)"
-		elog
-	fi
-
-	if ! has_version virtual/latex-base; then
-		elog "For LaTeX support:"
-		elog "    # 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/cantor/cantor-18.08.2.ebuild b/kde-apps/cantor/cantor-18.08.2.ebuild
new file mode 100644
index 000000000000..0b8b96cfd68b
--- /dev/null
+++ b/kde-apps/cantor/cantor-18.08.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+		elog "You have decided to build ${PN} with no backend."
+		elog "To have this application functional, please enable one of the backends via USE flag:"
+		elog "    analitza, lua, python, qalculate, R"
+		elog "Alternatively, install one of these:"
+		elog "    # emerge sci-mathematics/maxima (bug #619534)"
+		elog "    # emerge sci-mathematics/octave"
+		elog "Experimental available USE flag:"
+		elog "    julia (not stable, bug #613576)"
+		elog
+	fi
+
+	if ! has_version virtual/latex-base; then
+		elog "For LaTeX support:"
+		elog "    # 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 d2a9464890f0..3c8ab68b1eec 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
 DIST cervisia-18.04.3.tar.xz 1906444 BLAKE2B 3c098bb67c52096edb709ce3dc1e88d812e9b5077feea3cfc3691bc17820353eb82921b9c914bdd168603ecc7274d35f56f2983e06eced6f5a76e6dc938fac5f SHA512 de058407f70e2c7568c925e7ff28ffdd9811065cf9fca9782cddd85650d55652c1a420fe7f89aee99ae01f0373fa52a17759a40f8310496e6af45ae5529b0193
-DIST cervisia-18.08.1.tar.xz 1906612 BLAKE2B e50f25342db18763d4aa776a381546689ab3d87ac9f10763f37d85371aa36724c2c87670613544ca52fa308b4ac4dc1b1e8062affdedde476fb5aca398f36368 SHA512 bc1e6dea6740864294058cb46af8ad41bc82f0807ac0ac3bf430f91871a220723edb13aafbe8276c429c289e31333ee2c6483fb2df179fdd5a6290dcb53129ba
+DIST cervisia-18.08.2.tar.xz 1906572 BLAKE2B 3302c42bfb5d2f22d0a5f4ed9564781097b127f756f23cf8bfcdec080b7412c84ab2943ec893ffcce3e39f78b382ec0659e28578e2aa0f409367e8674c20b2d4 SHA512 1fcdb2eab9a7a0ae4f1b81add0eccfaddb1ccd9cde779008a83378683ada0a1e31658308826a4118085b7750c3e51be278aeec2cd81546b4cd0125b1ac2244a4
 EBUILD cervisia-18.04.3.ebuild 899 BLAKE2B 0c84459c973444f7472abf611c52ba0ad9eaea41757e8313a80d925e14d41e50f7d24237471ed4b671cf685f77ddb72ce4dd4e25f41a8a7ddfc67818485855d2 SHA512 32c8623e3b2c9afcc1589a5335d772d057341b36fc8d51e2b23d65c9d9436f229576e2c015ab24843bb01cc5df22e917031b2b044e7a9f320c45f647c4681bfc
-EBUILD cervisia-18.08.1.ebuild 901 BLAKE2B 02b65ad97b02ffb248a9cc1c42ed5a62133a31c558efc84a3c14db0d146c1c5582d06ce2b1954abe006c9400495ffc37d134d5bef38fa87a5eb11a967bde718e SHA512 8f92984ac5c39c53e755a9cdb48951436b49dbb5f2ebdf23d69bc667c398fea1578eaa99d0a1252f9425334e3d477192bbc19fcfb8355ae5724acb60d12a7f40
+EBUILD cervisia-18.08.2.ebuild 898 BLAKE2B 9c9050b4b74fca45b2c5af541dd02428c0ae3634f31d0688ae2149e8c269e91e3d437b4313f8ccc5a170918510ebd9fbe3e2878cd79032cab7a6720f6aad5324 SHA512 9adc77b7d5c7e922b52af0e480f5e8eca2b0933f9a1bfbdf8137c962d020d34a7a1d57672fdab9d08179a2c524ce175b19ca1f62c1b6386a4d34865e500b2fb3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-18.08.1.ebuild b/kde-apps/cervisia/cervisia-18.08.1.ebuild
deleted file mode 100644
index fe35d7708a72..000000000000
--- a/kde-apps/cervisia/cervisia-18.08.1.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/cervisia/cervisia-18.08.2.ebuild b/kde-apps/cervisia/cervisia-18.08.2.ebuild
new file mode 100644
index 000000000000..b63da5d15e3a
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-18.08.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 db9cef6c60e3..94a4f78799e2 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-18.04.3.tar.xz 191408 BLAKE2B e27bd189d02f922e55fb216bfb80032bf611ec109a3c3f9e3b2cd2466f831e59d548c2d2861a784972e7dcc676e1e7baf28f9a44e8ce7cf1569846da4d6cb86a SHA512 641562f44750bad8ca431be470cf691ea72647ac2b6c5bef7ff83d1d538bc13b7f8d082589c0d2c8c208c14a6007e412f4be8a8e733ebde7132dca6d5724798e
-DIST dolphin-plugins-18.08.1.tar.xz 193248 BLAKE2B ea2d4c9b4bcd2eb36e0bc7515d8f2e98ed8f79fb80fdca6e7088e9974c841f41bc7aba1b38066e2261be4a73a1cfd11cee3bd1dac437c45c088cca73b8dd44ef SHA512 44bf6051e3aa54950e52fcfc65a2ea9b9a110e4dcb773f24b09c6206dec30c0bd6aeea3e463e5cde15d8f86e1803d25fdf1db4b3c6173a35b829ed74d37206fc
+DIST dolphin-plugins-18.08.2.tar.xz 193176 BLAKE2B 481b6995ac9d744c501ad4052533fdab65a8e5582f61f726d6e99398f720f88785fd20b39cb3d5d633d5a22d499137fb9e52f1a04f14296c6c7c40ad5d19d29c SHA512 103351c5c5af14286e116d1a9f1e8420c1c03c0c7aced7546dbfbf9dac0f25bb7d3a2e8512a5e7be63a094073e42d6c2eadd50951be9e699a3ede1a509c77b35
 EBUILD dolphin-plugins-18.04.3.ebuild 1841 BLAKE2B fae91928416caa376bea9ea1fc58d261665e3777f2d4768b1d2741b1059adc61e58dbd32756301035c444fa21f2f197acc1e0e707cebfe19a2fef8bf07b0db52 SHA512 30ca4eb51eaf61d2bdec582227ff29a1d3ea00264b4f99f22ee593b1a052b3187e75a56792177161d88f55dc677d7e19ef913d08b74086b321080b050b220d9c
-EBUILD dolphin-plugins-18.08.1.ebuild 1825 BLAKE2B adafb12d9dc9d645065c9492511943404beb8042873aae47c96c083b5e90eb6b98c6fdb3ef6bc0b7c54a47c206bc78f0cd7384e4eb35003a1bfea3aaa4d99027 SHA512 ec9eb8bcfb1636d806d8cfa4824f0fea3a50c3320e95dc1837d0887a1af43acb37398f8749087b746771581aff63ec2e6fc52500df37acb371c2caed54350ad5
+EBUILD dolphin-plugins-18.08.2.ebuild 1784 BLAKE2B bf31cdf4afde0e12e2b9db2a6588d33aa262f4a717bdd1dc28ff3b71ac511a4b1ccb512439ab31f54307df5ecc6cb711d18fbb1933937b43008f756f0f6bd06c SHA512 9fdb95ab8b2d5dfa977af2ab12498ee7c13cafb246da28c78966d6720d901bcf0c8f129b0ac155e6e4ee5de4c384bf60ef649352d47e43caeeebe9a7bddecfb3
 MISC metadata.xml 532 BLAKE2B f874175daea65b92744c45f776610d0f5964737008bebd51e791dcd308126fa4e943ac51ba20bf8d69ef75c0846d925e4e8e724b6bbc03176c407e09a6d636f1 SHA512 9dda51a623ccbdda9ea7f5eaf24ac67df732bd97f510e524dc23f2cf2785d4c3dd7359f1f208520aa09899f5f049ada99f75ec186f4c89f27a18f4f697a444fb
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-18.08.1.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-18.08.1.ebuild
deleted file mode 100644
index 13dab37812c5..000000000000
--- a/kde-apps/dolphin-plugins/dolphin-plugins-18.08.1.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="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
-		elog "You have disabled all plugin use flags. If you want to have vcs"
-		elog "integration in dolphin, enable those of your needs."
-	fi
-}
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-18.08.2.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-18.08.2.ebuild
new file mode 100644
index 000000000000..d25eed108d74
--- /dev/null
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-18.08.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ktextwidgets)
+	$(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)
+	)
+	mercurial? (
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kservice)
+		$(add_frameworks_dep ktexteditor)
+		$(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
+		elog "You have disabled all plugin use flags. If you want to have vcs"
+		elog "integration in dolphin, enable those of your needs."
+	fi
+}
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 1f779f9405e2..d51e946842d4 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -4,7 +4,7 @@ AUX dolphin-18.04.3-memleak-2.patch 1180 BLAKE2B 4b546aefe5b1c5342522fae2a0bcf7e
 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-18.04.3.tar.xz 4850916 BLAKE2B 1d2a5c4f5e94e2f30055804d96c205eb2c03864ad2b6c245d917549986fbac26686e654818dacf93fcb711f59bfe6e7f3a011e578988f5bf9e6b6cb82fc33876 SHA512 167a35225dd4e75b7ff863771287a471273e0594c247ef058adc718682eb07f014ca84bc373e1c3a846e99711aad3d9a16b12aab8543aa3603e17f944b206b21
-DIST dolphin-18.08.1.tar.xz 4859496 BLAKE2B 0daf6f60580b9981fcd57cc11d5ad6b4071b7d4cb90673bbdcdbb2eccb927e42e49932b0bd5fc466345ed56363f271b7d56edc7dce348dc4afef55bc1a082f34 SHA512 1ad302f332bbae523db78db5048b910b182ef396a4222da0718d5b280be1adb54eba6abeeaa9facc3ecc49353b91e1aa67bb6f7429446589d6b51d0458a726ae
+DIST dolphin-18.08.2.tar.xz 4859700 BLAKE2B b7d16f3e3b8cd459a0089a4b37da86c7d4f095bbc3f8450b709259a820dd8a8fd26dd7a03e2bafbc103bdf588df23436eb2c3dcef5e946a4cc0b054f718fbdee SHA512 44e2a55cfb80c267cd56e5da2af7c1446859adb100a68eda82d052279402cf8f7233e79522ecd8a2d098a8a51a977d3fec37da7d2544cca5f43212d4ef2a61fa
 EBUILD dolphin-18.04.3-r1.ebuild 2395 BLAKE2B b19b63b7c8c21be681ebdbffb31f6393d52deb82e84ec57ac0309eb40940e457f24f327c697433127d7e9987b14f01b76ee719d9781e1210a2d0520aba4d4bb1 SHA512 9b2cb58ed674f4a18580a36b18ba1f7ccde9fe440d759304dec97b66c278e3a69ffe1e63772899add41cbc611742f3539c0caf10a47eb7a801ca60db5decdf7a
-EBUILD dolphin-18.08.1.ebuild 2232 BLAKE2B b4f046f19a528c78bf029e0a7834c4bee8759c053fdafb3c7cc199f527981090eb670b70fcff76854071a7fd656bc30da75b96cc60661724a0a54f0d3774a62f SHA512 d1fe6680f462eb3ee58bd6e12d13d0cf9594dbf14b8a4521d241c62e3a2a7d46e74b9a61120450a5037a9f9c61d349b0a0975c208fa0759e667788d4495b7fa5
+EBUILD dolphin-18.08.2.ebuild 2229 BLAKE2B 007059e142da10de31ed3ee7a2388681ac38c848b05618854eecc057e37476bec1bbb836ee3736b8f9f34fab5ece251a1760e33768686422e6bab82d8da9804e SHA512 c4cefffef55fb7478bf529d6428e88fefc1238a162d60ee977aa5398b373e5565f599d412a1b5d60f3101d380ce285a47285cbfbbcc09e3a6a7f55fdc2b309c5
 MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169
diff --git a/kde-apps/dolphin/dolphin-18.08.1.ebuild b/kde-apps/dolphin/dolphin-18.08.1.ebuild
deleted file mode 100644
index 256cdd947622..000000000000
--- a/kde-apps/dolphin/dolphin-18.08.1.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/dolphin/dolphin-18.08.2.ebuild b/kde-apps/dolphin/dolphin-18.08.2.ebuild
new file mode 100644
index 000000000000..47da3a35d622
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-18.08.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 24718f98224b..81c30d5b946c 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
 DIST dragon-18.04.3.tar.xz 1729144 BLAKE2B 4832bcdc8d01a97f85cf89e928e2bf503d9b7343a5e374a6c2b20fdef82676fd0263e60a8f2e3adad4f18afb071e42dadf42548fa3d81b08152baf6e8b0046f6 SHA512 5dd3a0157cbac092a0bb224c38dab6706545fd78103e98b060860c5465c6454c4c3a2ea4e646a99f4683a61d8c1248e3a7d2c5f5e69f7e711d6f3ac16ab198fd
-DIST dragon-18.08.1.tar.xz 1729556 BLAKE2B 5bcf84a1572faa47dea7b9bdc60cd7781cedaaef470738b9c8c67ffded23fa5d5fb89f318aac170f27c1ac34385c193c6e89dc76c4f2d79879f0141ab384914c SHA512 db226628077572d78622fc891cb201cad1983c4940c0f82f20ec4a578a58cc711ec84e6c31d6372ac8e1da14d43e7501f1eb09416f6f0530f6e4addadfeaf309
+DIST dragon-18.08.2.tar.xz 1729500 BLAKE2B b8b5e70bf851efc2d58814e40e071e5c642ca8d91d393e10e53f6e61ff7d4c8e3935948f6dc1b23c6598696014c225057af651e9b27c79c3d0278d5fed9e0d14 SHA512 0856f9c0b61d53a81391e126ba6cf36339529fb9c6be9d9fcfe2617ff245c96f6814bbabeb06c4ea886ee720d70292b724a98993662d30e0e48cca47c0ff16c9
 EBUILD dragon-18.04.3.ebuild 994 BLAKE2B 6178094991fce897fefa9626c65c630fc62aba9c716096bd77f74eb7177677f421a4cd6055c4d88d7609730398f9b4d5464d593ca5daeb811306664a07c2fb0c SHA512 adad2bc72bbb13147c70f8bd7c7cf8cc73b9980473f6f7691676d448848307c637b13a5895feb06804888b9827e1d4ed4de97de3c729eda20456667af73d1fc7
-EBUILD dragon-18.08.1.ebuild 996 BLAKE2B afbf32c22cf17e0b45aa6b44b60827253d0dda4566ae1095043e1c37f9b7a7478ac12ba8a0f7003cd07fbbc9eb7ec756728c7af77dd9a128bde9fa1ea85d06e8 SHA512 ca172c2c600e8090fc60e5495cbb1bc23857fd3e536122ee6e4de6d6cc505c0691c2139242f58ca42c7e16ad3ad787090147fd516e1ef3a346c6e2d7499cff01
+EBUILD dragon-18.08.2.ebuild 993 BLAKE2B b720c8ce300b399662511ba84e6098a6fd36a88595610e3d9b94278b1e8c64230214b1ea64e27a925aeca5eb5e7eacdad7de495932d573a38da54935f42ad61d SHA512 15ce60f0325f8c7e0ef967297d2bf4f77f8a4005540864a9ecbf48cdae7288d70d1ecbec6e85a0c6504b167cf94422718db4988a70f0a8840d36d95a422cfff8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-18.08.1.ebuild b/kde-apps/dragon/dragon-18.08.1.ebuild
deleted file mode 100644
index e97559abf858..000000000000
--- a/kde-apps/dragon/dragon-18.08.1.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/dragon/dragon-18.08.2.ebuild b/kde-apps/dragon/dragon-18.08.2.ebuild
new file mode 100644
index 000000000000..a371377fcaa0
--- /dev/null
+++ b/kde-apps/dragon/dragon-18.08.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 e4cd9cc368c0..8949d618abac 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
 DIST eventviews-18.04.3.tar.xz 441572 BLAKE2B 1c9fb9c5e6e23c0d068ed4183c5ea90f459ed23b86ada2955477e89e4cf0d86d95b4779cec63dfa8b4d8743198efee520caf665db2d448ea16d5eea54c962680 SHA512 d6a202a31cfe9f4765f5915c6cf5542b9d1e9ffe309eba40dc00690d6281951404d14b6e4e0d7f71c8d1b9a5ad72ef5ca0bed326e462ebe574678317be34c1a1
-DIST eventviews-18.08.1.tar.xz 441932 BLAKE2B feed0bbb220ef1c0e5d2e392e47f41d7f96be529bff86d6ea2050d82bfc8cbc0bfd22cbb355889300aae3882c6efd4c8fe5b2a5d1008cefaec6688fa72c93af3 SHA512 03f786c610c94fbf4f4b23e2890d9aeaf6af327067bb4bcea3969c354bfa70ef4ddfaf3d9e7956dab51895c1d5e086ded5e0676099b243c120eb7c2d3dd27635
+DIST eventviews-18.08.2.tar.xz 441768 BLAKE2B d070672df4c1ccba4f474b5d014ddf80a1982df2a4c7790eb37e820de48bbaf967dfc39398a14e06893aededc31da9d944feb033b04ff475d72a31995339dc65 SHA512 bf1b5c4370d44ea207f3d46cc6f2081a76694f698d974bba7f521fc0f8764f7479dbd0111e0fa08ceba90c0a1217f3464df4544b4ddc611c55524a98a424ffa9
 EBUILD eventviews-18.04.3.ebuild 1028 BLAKE2B 9cf70479a89f325ef19a53ca963c62807f1cb7256be93e36ba22c37f4d2cb00e222152a2c211485303cce829a3f78e700665f2ad3f354b715c9fd68e90d07019 SHA512 d48878283f9480486e99291fe6ac62bde34eff6f51220abb2cda9a25f09e89c85be22692095904feeed1db7e3d3e5ab83ef7fe0a383fa2b76480f65c920a74d2
-EBUILD eventviews-18.08.1.ebuild 1030 BLAKE2B 41627fe735e93e3eb21510097bba83d17b3bf65a9aec177e1df89c4265bc535eb4cb636895d235cf954040748d0abb432b8662334772058ce982bca7046319d3 SHA512 0d47ceae795d0b382eafa7be4a75e6e1a611a36bd94e0cd5a15dc72c698d8d2ab3b81e8f2c5e94fbcad7a0a47921a0f4906f54a48904bb8c8e9d75fa394cbede
+EBUILD eventviews-18.08.2.ebuild 1027 BLAKE2B b51db68a282d9cd7781ef3b97b98ead0eda79d37c55145c84d7316b408f7a054044c85a43b1d9fcfd5062739915a199e330629af63ef90a225b5fab52c34d03f SHA512 d6369f75bd91339740e72b4ac54fdfa433fe2655705fa595230b9f24e4a32c48cccfcdab056d4ac5d8e2290e310b666a063db3f11e9f05f19174f641ddc9aa83
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-18.08.1.ebuild b/kde-apps/eventviews/eventviews-18.08.1.ebuild
deleted file mode 100644
index 8b6b5841912a..000000000000
--- a/kde-apps/eventviews/eventviews-18.08.1.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/eventviews/eventviews-18.08.2.ebuild b/kde-apps/eventviews/eventviews-18.08.2.ebuild
new file mode 100644
index 000000000000..d618d2529733
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-18.08.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 dc758304fb19..80122dcd2cbe 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-18.04.3.tar.xz 21208 BLAKE2B de6b446436f99ab502eb63a897cc4e62403fd88202b7d3a026d8d3a373e30c22bc65b72afaaecc1a37c543b1951ccff2f48a654228bc94be90493c97d3ceacdd SHA512 5ec858f4829bbc0ae480b908520f2f19cfb3dfcde2d3f8d357e3c671a84cb9734f0e4041eb35a625aecb2abe94e54f18e44bfe7e85afdad00c941e4a1065eba3
-DIST ffmpegthumbs-18.08.1.tar.xz 21852 BLAKE2B 6fbadf6ec341298d8818b7bcc071986afdec985db2a2bb326ce37be55753238c11689825ddccb784bdbdc1a2919e491fddc22113981954d254b5790742c36979 SHA512 27dc87fc77f846358822af5bae75db6be4275f38145a5152e86ae5d0a90df506da62de7dd8bbe9acffc0dbf68d7522d27187ff5b2ee48e1c397d42db5248f3a5
+DIST ffmpegthumbs-18.08.2.tar.xz 21836 BLAKE2B 412d365d97befb777b708430dd05b8767ad5481686fc15a480778bd1d04374ae5950e2ceb0ef5a885a17220d85b2f7845697b98a76ffe89ca95290923a3f09a6 SHA512 5c988acefe2ea8d90a79fb2a885d7d8f0f065bc5226c3c5c57e90d6690c2cda1554341f5ac932c7daa4bbd75f9dd67b4f3c1cf1c12f3a86a19b81a00c55d5e95
 EBUILD ffmpegthumbs-18.04.3.ebuild 436 BLAKE2B 1cacb9973f50bbe7d728a2f5cd98e4069db65f49ef979724130fc1c44e9008a400cb963c348763fc43a2d5baaa989ce6874f612a824d98edc45d9e3c155de843 SHA512 036321d6c9cd10f8b118916926aaef81692b73ee07954c6548af423d03ef8c7ee9f6e07bc1cb533e6ea351c4450f798d97b5838b6c07a77dc097ba0d943f31f6
-EBUILD ffmpegthumbs-18.08.1.ebuild 523 BLAKE2B 87129d26747af7bc76999c9f861a08424927256cbd488bc684118c1aee3cbe030f9bbfa29025efc59249de531f8c4e4b64afecd7a6b1cbf322f546be409af332 SHA512 43dbc8b9bcccd28ed390db575b8bbd7a2805e47044dc654d0cb0a45a41280790203a1b41b5375ee4317edc4ec43fcf0f34027d1fa379755f4ad4c1fe7406c859
+EBUILD ffmpegthumbs-18.08.2.ebuild 520 BLAKE2B 04485ae5ae44fdf96fa5650b505be141b9821952ab0de0e0e797425139a2205b76a2376e2942c61d0c88c6e5524339bf20b007960776f369e0fe997646385d50 SHA512 22ea414e3912603fe0f5db8cbf1b6d4c428b8f1ed1d8ee90a801a13226a9029b915bf6c8cdfa5b89e881a2f0c918e83c464126c23a9e22ffe16613666eb7d779
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.08.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.08.1.ebuild
deleted file mode 100644
index 120fb8cd8dcb..000000000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.08.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=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 kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.08.2.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.08.2.ebuild
new file mode 100644
index 000000000000..e0514b8dcdcf
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.08.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	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 49307027e6c4..7ad6650f8c9a 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
 DIST filelight-18.04.3.tar.xz 659376 BLAKE2B db637bfc183a893cb19d802084c490a983d9e6bab6e9fa7bce9896d6e6e24d93f769e3334bdb667ae656882e3658cdb9d7417618a019a3d44c08850e3a549504 SHA512 a938a23b150d0c3caba453e1a9e60532d5da24caeec7bffbd781363a0b79fd5fc8a2a6875b67a42beb5d9bc9598145bd8f58b9718ef39166f5738a9dcb303890
-DIST filelight-18.08.1.tar.xz 659392 BLAKE2B 53d416aa1f22f50a275f8abbb10028d9e52b79e65ca030b10f430fc5a9be94bfe1fc50ca71900b689018cdfc6778b25a812fbbcb8205591f409b34617bce9b33 SHA512 1f1aba992dcd750fb541edda277fda87677be211191b79b5548ea04c37fd6793b675ff22ad6e15f15f8dd39b21f168e0a97e5347915faa66bdd2bad02ae6ebcf
+DIST filelight-18.08.2.tar.xz 659676 BLAKE2B cfc37a708723f298637476dd48b8e68a59389f6b71c5c2d39a9fea77b87d74d7c37514e8447c711d271f3c6a9d6e6b6345124f61f72344f9d0dd5b084a148ed6 SHA512 e6f0516f8e4667eab6cacbcd6a5c891a9824f370b20b130a80dabed2031b9e16591655771c1c4f96ca4366dc6654b94138404dedb9c6e4ad99a4f05838c272a7
 EBUILD filelight-18.04.3.ebuild 697 BLAKE2B 325b5ffebbed3e5cb98173fc20fb6a048d35de8cddb9ec8956823e59fd65fa30cc8a84a49ad8fa1f1fa5335c4c2c52a6a22e403571996babb6607ab356468e49 SHA512 6c9e6f0e094463deeb5d1132bb5c66fe5faaf249a80c11e8b5e09f84e89dfafc6b1b610e329c97beb8f7e06b04f562911474b1e0d22978ec8c6f80a4886eeff6
-EBUILD filelight-18.08.1.ebuild 699 BLAKE2B 6e9b88c7f2f2e90a799caca7ec74a45f4132600c0b0a35a2074e7ffa7e5b9a450b839ac83be89045da2f79f9c4b47443630159117d7847010a817501eb24b7bb SHA512 e1045b8e20af7a4394d171aed98c14f371198e394863bf13e8eb3aecab2ff8e3d653f396c046e06f163a7ef0f687699991a91ed207689670d65d0c9596f0adf0
+EBUILD filelight-18.08.2.ebuild 696 BLAKE2B 7b695029497cb4c20c2ffb26aa1b13dacd690ddb01fed12fcf2a209c87189bc5db2aec4c0b10967464df1bad3ba9a0d4974a4b13fee3c3257eff035156502e7f SHA512 b2edcab20dfbe7f4f3cd7e61a9f1072e93ebd4d91bfb2521af433292d4c9ec8d30c271056b50df8e3bf3fe45efae61c94cf6b5428c30a2bb6dd47512a96f2c22
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-18.08.1.ebuild b/kde-apps/filelight/filelight-18.08.1.ebuild
deleted file mode 100644
index 03b58843a55e..000000000000
--- a/kde-apps/filelight/filelight-18.08.1.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/filelight/filelight-18.08.2.ebuild b/kde-apps/filelight/filelight-18.08.2.ebuild
new file mode 100644
index 000000000000..396d11abd4ae
--- /dev/null
+++ b/kde-apps/filelight/filelight-18.08.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 f145b054273f..ddbcbd43c118 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
 DIST granatier-18.04.3.tar.xz 1961648 BLAKE2B d1a14db7fbb3bc07ec19f4db4a142aab54196e7612a0341873877c6a74f000970e3720f0e2640d3a72cfde6e993058ce9ba0a08c01f2b316f6ba76f323ccd7e8 SHA512 c39fe20c1d88fd8d521e0db91df46535488efbaba27f48faef63e015d9806b3d66a81831edb9b8bb0508954f79822b70ed47b7c3409601a6102c8e7d32304339
-DIST granatier-18.08.1.tar.xz 1943044 BLAKE2B cf00b92337becc755dead6c46817499900496280255220c0f208cfd31c6b3a4d05708673e5801fff1a78e58601a697c719136af93fde2e26b5c5a1b88255cc09 SHA512 94375800f3817158a81de3caf290cd6f0fedca920f42e65f10b573ba1f590ff16870219aafba95233f6862b434b0472e74699dca40b6486134840cf84d1555c6
+DIST granatier-18.08.2.tar.xz 1943100 BLAKE2B f3a70f6e7493593e7eea43a4531e73e299d4fc741cf0d9cbf9c858186fae6f4765456fae41cf0e9f3647e329cb2d235bdb933d7b1ed994d2a1c697a6bc9251e8 SHA512 384cfaf86970f1bfdc061bccb8ddf7be839ff4b28c912f93a6ea1b72aa625a65ab141849bb609d3112286aa5d9f2ab731387cf6723c619a3eebaddfc0420dacd
 EBUILD granatier-18.04.3.ebuild 734 BLAKE2B 317d5bdc8e04ccd6efc3d3133e84967c29bb68ff65c6ad3001e9a7e28a62495f1db35d5b1ad345eb966b37f06fb337e1be2db9d539d4c10d6ee354424c381c6f SHA512 b3c19a91781523d509800563c93531106cb8455eb02bcc4c6a8bd1efbfcec2c9a3ea1c4fc4b622313e8f85ccc4cd3c27ea506fa5fe4c6b6fc0c4dbed72e58904
-EBUILD granatier-18.08.1.ebuild 736 BLAKE2B 8dcc7076fb8e0969030d2221fada5003c4ec9dee303883c19075ea90e2381c51f0eaeaf669c588d9d13ee365723ddd28ec8c9f55909dba8e808af15d7430890a SHA512 07cdcde27cbab58c48e4f68ba9817677e049cc872a6e0223183cceafc29d47f1492e1bb35c77a55c023d6fd396b1fe83c151f0546d318c8d63ae4c0329b8dde2
+EBUILD granatier-18.08.2.ebuild 733 BLAKE2B 42f684cb3b9a7a4cb1998b7b9e752a374376316abbdbab58e0ffad21d2bacfe3f9dd0a3d4106aa353ad29e32fd0dbec2cd7aa55f7406910ccdc5cfd1bcb08438 SHA512 9cb23de5f60c9018325b9b9be03cb732accd599dbb8880e3b7a79fd98eae07f6492ef73bb5cbee4a6858b658b648bdd68bb8927622cdcdc4c1c3274998db83a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-18.08.1.ebuild b/kde-apps/granatier/granatier-18.08.1.ebuild
deleted file mode 100644
index 28cef3517e33..000000000000
--- a/kde-apps/granatier/granatier-18.08.1.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/granatier/granatier-18.08.2.ebuild b/kde-apps/granatier/granatier-18.08.2.ebuild
new file mode 100644
index 000000000000..80660b8c4c0a
--- /dev/null
+++ b/kde-apps/granatier/granatier-18.08.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 9ed584b97f53..4c3ef4777ca8 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
 DIST grantlee-editor-18.04.3.tar.xz 111032 BLAKE2B ac0c177c5f2038d941e172e84155ae4de33183a13a5e522b6ff39eaa402ac41e80fa53cbe2c56351943568fcd33ac2de7eefa59489c68f3ca4663cbe7dad425b SHA512 6eb55fe1632dbee7fd2d632642460a8c6471d801e877be241a519fb1f103154844a01949b0e5db0b833351c6fb496e3dd34998acf1634817c1319b173be15acb
-DIST grantlee-editor-18.08.1.tar.xz 111508 BLAKE2B 215e90d2a512403568e21ae6bdac128daac23405eef4960eedeb0ba6674e34c2f1afcecf165dc4d8deeeb49ef6f57b5d8dfd8f660fd719fc005412a27ed8d40c SHA512 78fb17ef357a8ba1c6b1da0e7093bc5c17e3662aae38042add9f01de0d2ddcbcca8b1c796d70c05de8dbdc7293da8fcb58a23a6904c90560b4b7fe61370975e5
+DIST grantlee-editor-18.08.2.tar.xz 111436 BLAKE2B f13a36ced0c242f5ecf18159e8b346f560dd913ebb05be640732fac7ce0056fa1eac7bfe37eaa8a861230875074845ba514e750a540883ac862e01984924de95 SHA512 b84ece6b90567af907d9b82e488c60fe0209d9bf451942028956b45dbce1fdc4065ac6dc62f0730878f68c9071c7b39352b6f9f827814c5b839781464daaf218
 EBUILD grantlee-editor-18.04.3.ebuild 1166 BLAKE2B 2ee5e6679257691d98d7a03e2972fdf33724487bbb69fc3c6aaa3dd7d2682dcff05cd51452f4f276e13e00a6b37d11c8d6ef0a92dc2f715d23886c63b21be55c SHA512 4ceb795d35dc12eecc2dbd69ccacd361aba00b18461340f9a867a0cc0e67fa7187d83e1800f4a8465e1fc82674401145e09585859b0b3b21d07a03227a1f68a3
-EBUILD grantlee-editor-18.08.1.ebuild 1168 BLAKE2B 4afa0384819169395f10f3744458a899afcbbb4c249e3af665da9f5cb33abc1577fc673702698cb0f6e2aec6ee9fadc3c7d0b8084411b8dbc7eed83a51ead388 SHA512 63f60380af87437f2e2005a896d07712278f3906e703c3a093caf6a703ba40077790dcd112922351feb6d093b4be5c7baf14f0012f10951b66dfe8fec7e623a7
+EBUILD grantlee-editor-18.08.2.ebuild 1165 BLAKE2B e9db0847d50cf3ac5acb9fcba05306adbd08a0f3d3ebb10bfdecb9b2db9e78b4d710aadae344bf7fb1f888ad771666718ac22e12384ebb71c65874ec38f4d28a SHA512 e2aaf9a6a8cd74f924aec7fef5d89bbb9ef6158d3b45b3239f43581c0418c868fe734fad66960a09179b4572b6472237ad0798b950ff5bd4277382771486dfa7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-18.08.1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-18.08.1.ebuild
deleted file mode 100644
index 53bf85082a4f..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-18.08.1.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/grantlee-editor/grantlee-editor-18.08.2.ebuild b/kde-apps/grantlee-editor/grantlee-editor-18.08.2.ebuild
new file mode 100644
index 000000000000..1dbf5cbc2248
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-18.08.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 9d43b0c12c64..4f1a8cf1b514 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-18.04.3.tar.xz 51676 BLAKE2B 97db8d46c7e99d1cf3a3ef61dfc579564adfa80d4d5aa21faa29cd94c332c9f3c6ce8e9845a3c6f1555be5a95c7cd603bd8c5372c69f1cf1296bddc96580ce17 SHA512 5f5ded0dcfba8759101807f2fe2148b9af07043da05a5357be7614e4a26660c9f50b41206bd6dfadd9b659ed08d55f9f76c47e076a1cccb3f595209441de4010
-DIST grantleetheme-18.08.1.tar.xz 51768 BLAKE2B 5a317a0689c994413df1f2f081806345d8d4e1807a88cf927f3abd41c60b63042dbf8cb6a11a8c2b71eee6ce37dc901df42bccccd38144bfa33a771a7236f745 SHA512 1e83eb236856961eee43da212a37f0e58d9fbc1f151303007a27367b04098c813c64f2edb5741988ef4f00bc5053c6cc1b4edc746d8be0a524648cfc8e517e70
+DIST grantleetheme-18.08.2.tar.xz 51768 BLAKE2B dfb5045cf3b2b6d8cf7d5b09a49b8d2bc2ff9d431f10597dc5fec0d4e3158fd1373fc9ef5f97e7398b9ebe673415a17e3b6df9460298f1ded01b9fa7780f8837 SHA512 528237cca7fe9dea589ed6c2c6e6e8e12838f1fb6b9d2439b49e8bf4b38ee36bb13677d08460574bce5bbc43946b1bff24a742b0b80b85b1919acf9954365e98
 EBUILD grantleetheme-18.04.3.ebuild 735 BLAKE2B 01da5ebbc4f0fd762fd77fc496ca81622924d98e60749f366d4ed068ffca33dbc6111433aaf0b057701f6b683eeeba5a3f1a0c552b34fbce741128f4882c427d SHA512 1ea754208f4dca36e52ec2f2ffa5699350b6de9b19106cbfa00dbe655377bbb596aba4d31f2b4a17135bd48673401a4eaafd2a7d6efc3a9a5b46fc8652bcfa0a
-EBUILD grantleetheme-18.08.1.ebuild 737 BLAKE2B 6134740a08dec66d4e42a7ec86acfe10733ba8e26fe5cc86a1592b01bcf5c57329e75229eec68f909f690955fe57bc8e47ddfd1287978ea8f5f939381531c6a4 SHA512 02701da3f71bc003c95b4d9d9487620e83f6fe0d9915c24a9178e6f59433c2be86b809fe5db82d08b17ac795ca59c02ac04c28874816457352c67985167a9866
+EBUILD grantleetheme-18.08.2.ebuild 734 BLAKE2B 11301736cfedc092b6b9b30fde0487fb47e5310d2b1c131f81c64cb2a4e6b6f75abb93dbe3494dccabf836480f82d246d3e442c2b3fd0de21a2dc27f540a5c51 SHA512 d5808504fa3ee116e0ff1f1c29e03b9d2d073995b5a2e3294c3b28d1c7a82bd2ebff0e14de979aa193d6fd8aa657548f6aa9be76cf2303afdecbc53702ec215d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-18.08.1.ebuild b/kde-apps/grantleetheme/grantleetheme-18.08.1.ebuild
deleted file mode 100644
index 605753b034bb..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-18.08.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/grantleetheme/grantleetheme-18.08.2.ebuild b/kde-apps/grantleetheme/grantleetheme-18.08.2.ebuild
new file mode 100644
index 000000000000..b12c371bd9ed
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-18.08.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 aa2ae4a3f444..22d81ad6430c 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,6 +1,6 @@
 AUX gwenview-18.07.90-activities-optional.patch 5078 BLAKE2B 692a743c319a9498de88af97b113e123ec445322f55513fcae58d4c556b29c23f0b2586e292900fb8e233c5cd2b33a7f76cf759b0c0ad119efb7daa7c290263c SHA512 2afd6fe89d1b455723d15f38866a476f8872e45d0548c36432f4b08d6404d02c4c03f78bfa60ec7dbddad022fef32283155b3ce27a9a8b16c4b753246b301106
 DIST gwenview-18.04.3.tar.xz 6055876 BLAKE2B 5202dcfe597ad1da7d5b18124ec357239a26a30c20d83c37bc7258e0ad4232b53081a8e050017850ea6eeb02fe0d88f90b90b0029e364929375d3e09dc8bf7fd SHA512 a1c36a05e4ae3ee9aff74f4a56eb10c2c27aa89e10886d14dd6753e42329653550e8716965156ec5f50915e320224757bf52d1178986ef10d039e3c622c01a7f
-DIST gwenview-18.08.1.tar.xz 6177620 BLAKE2B fc88c4798b931c187413ff8d61fecc537b02412eb42a16a95b0e1f181566475688c7ad6f5733a97d93f6e281fa6d0cd872548a4621275d2021e1e390d4a3dd3e SHA512 6fb57a1c872198fd8c7afdfc1df49be7b01a086d2e890479ded3ac0e0fe48748055c30e2678a9e7ad0141c5b7435db01aa03f8d4f11193a65eff42960474a732
+DIST gwenview-18.08.2.tar.xz 6177924 BLAKE2B 1cded647250edeae58cc2b51031fd875ef4df43ac4800339fc839b2f9678cccb2fd6310001204980c30f79242cb73e51ab4dec3c567b7fbf2f62f92c841ed9e4 SHA512 7af6d664512329f4364a71595ae4c6658380e572fcf9120ced4c6ff089dff6b91c588123aff444b9340b170e36f7d9b467aa32ec215c8b6001e11db5515cda28
 EBUILD gwenview-18.04.3.ebuild 2413 BLAKE2B fec0d82754f8e01f85946c5d9dd3aaeba2d4b7b934327f8bfd37e3c7cc910dd675d3d5583110088a21a07e780e3a25cfa25f03cf4d866a0d0d05b535922b0ddf SHA512 2dc8646d06e47db59f8ca63b89d73a50b70e00ff33e9f8a04043017cf84579ab0406dfc44ca258fc8d722a2e3eb00da00583ac42895985280e380b9322366d64
-EBUILD gwenview-18.08.1.ebuild 2793 BLAKE2B da1ad956c92a27c59455d2855c4fc3e0c388fe42384b28d659b13478e383a8b5d3f75950e1bfbdccdc0da40398c7e881134bd5b60743dc1876b8e2b004db1a60 SHA512 245fa50f796733d1f5bbfc57cc03fdaea39b28acd48df006045f24075e3f463dffdb43f565737d67bc8de78ba477aa39858d2ed65f33e7ab5ec47959a264cdcd
+EBUILD gwenview-18.08.2.ebuild 2790 BLAKE2B bb12f1c92eea28826023841e4601d65b24d392a0d7f93eeca6c930be4b9ac6007512347f00762825e662d2ccb6ec9b72e181071c4c58c602ba7e4fc6f0be765b SHA512 f68422bc89f24b66981061a92efb882effeb2f35c76e4b61c9fe43230d69ffc43a625bf51cb2c98e51e91ed077b1618530e8aafefc87ee96c11f197b77643a97
 MISC metadata.xml 608 BLAKE2B 19b5fd4798750b2efd9d68a6271cb7c0c1c63e82075f2ac68fdf12bf57c5e695d3d9ee08f49d7cc22e0b15931eed086690b3af478486a858c4c233ee23b34ab0 SHA512 bc0c98d5420300aa4f17b0f544bc9cd44d8755ac716c099a5787769705e72eab9aae5d4b9a653434234dc605362f3c0d3d362121ab8c75978cdbde8f5fc774de
diff --git a/kde-apps/gwenview/gwenview-18.08.1.ebuild b/kde-apps/gwenview/gwenview-18.08.1.ebuild
deleted file mode 100644
index 2a5b51186bd8..000000000000
--- a/kde-apps/gwenview/gwenview-18.08.1.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="true"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/graphics/gwenview/
-	https://userbase.kde.org/Gwenview
-"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(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
-	activities? ( $(add_frameworks_dep kactivities) )
-	fits? ( sci-libs/cfitsio )
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	mpris? ( $(add_qt_dep qtdbus) )
-	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)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-18.07.90-activities-optional.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	if ! use mpris; then
-		# FIXME: upstream a better solution
-		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(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/gwenview/gwenview-18.08.2.ebuild b/kde-apps/gwenview/gwenview-18.08.2.ebuild
new file mode 100644
index 000000000000..1d60e093c7e1
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-18.08.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Image viewer by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/graphics/gwenview/
+	https://userbase.kde.org/Gwenview
+"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities fits kipi +mpris raw semantic-desktop X"
+
+# requires running environment
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	$(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
+	activities? ( $(add_frameworks_dep kactivities) )
+	fits? ( sci-libs/cfitsio )
+	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+	mpris? ( $(add_qt_dep qtdbus) )
+	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)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-18.07.90-activities-optional.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+	if ! use mpris; then
+		# FIXME: upstream a better solution
+		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(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 9dc4aa096ae0..79bb45af08a3 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
 DIST incidenceeditor-18.04.3.tar.xz 526824 BLAKE2B 17047dd77fb93c39322cf6c9cf3dd5c3e75bf20fc959ab6594fd6d00c6c7be924027bf0c1964c98ab162b109aeebaf8b738598b76b88e860ddfacb76449d24c0 SHA512 805a0eb76d3047e7520d5915b2210c948474028b6692d19ba74ff32553366bf792133c78a5ebb4d50dc9a5506d53cb5837ba7fb9981f30c3d710e6705fa84fa9
-DIST incidenceeditor-18.08.1.tar.xz 522376 BLAKE2B e059dd2ebdeada221b009865554575ec00535c2a1a39da3351208fff1b601370c8baba86ce34e7c2bc0278ab437ba8e4558b894c38f64396fef9d9c77aee8c7b SHA512 e91a1d0e4ed025de0d9b36a10da514aa139016a5f994d12b571492d1e736ee9aa186a382947038d8ce558a7f08107ad298aa442fdfc9e30b55b27c16d3052a5d
+DIST incidenceeditor-18.08.2.tar.xz 522040 BLAKE2B a53f14083aa049fd03cf6462cadcf1058c34131f1e8c183b79c8d39ec56d966eadddc2823fab48c110557ea167ffd434bac2d1e6fc76ffd64dbbe617b14cdeb1 SHA512 47811e58c09bb97639c1c22fab7a4bbd49aaaf5dc4fcf34b5ee4ec18fdb286fbd778ae3705e779190f438868f3b7fe67bd40e937a9b2c10feb29ad1cb311f7e6
 EBUILD incidenceeditor-18.04.3.ebuild 1393 BLAKE2B 5a1a0e42a5a0b48722407844edf81d56d9ac339aeb509b9d12f37dfd6adcfe9306bbc1bd6ad2ba09cc4418aa5fd40550bb7872c5fead39dc2e3195b55647a7d7 SHA512 244023eee75d28a4cea19b01368bc6fd2d6192cdebc1f71dbaeb029a8d7b0088059084139e80a6361d136828c1553b8a0563c3c6cdcd3158f2d57bedd2ce23ea
-EBUILD incidenceeditor-18.08.1.ebuild 1395 BLAKE2B 1bcc6beb89ab64942a405802b1aa18c079f537e027f51decbff9d491687c9585e25b653d93b9da32c6e4e2697482b0ba5a7cc57efc4c71e282baa384281285b6 SHA512 6fc54dfd46dd7210bdba607ed93a8d22da85eae56aa3e718cb151243c4e373eb69d9afc96d3be12cd9c140c082f590e1eb6578b93bbdc3c1c73da16448f9d6af
+EBUILD incidenceeditor-18.08.2.ebuild 1392 BLAKE2B 5bfea2058f1c5b7126c8dcbc00405adcbc16cb65fc600a849e1ab9f5665ad17f2100e9df13d896246551396334c8d81c9bcb1be2827eb698541fcaac8a3ee8d3 SHA512 688cb04f35d15952337839f8019a87bf26bacc6382142e69b8cd0c217dd7f2cd20200a773e96e0701d01f0452a7fb31ee09923747e4f26c20ee9f1e45e9ac0d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-18.08.1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.08.1.ebuild
deleted file mode 100644
index 8cdf4d1b3dc2..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-18.08.1.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/incidenceeditor/incidenceeditor-18.08.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.08.2.ebuild
new file mode 100644
index 000000000000..b1d1e2fe3489
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-18.08.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 654f9b7f9f50..928bcfe0febc 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
 DIST juk-18.04.3.tar.xz 1872492 BLAKE2B bca7172ddcb8f657d11ee51311b39390c62be31ff996dcdec5557c68f96346b10dddeb9f40d8537a17e4be879861c698b357b6688f3cf2a1220b47108174f778 SHA512 f5492f3edfea4e74f984a1d09d15ec186a96ab536223821795d84f3b5868f45a9b76655121950f69580cd701d1fd6a621e6e4b43a05481c9c05672f02278a35d
-DIST juk-18.08.1.tar.xz 1874100 BLAKE2B c2427a207d91244cd8d932a29c97de7b5b51517ba9ada2b118f94a8448052f1148f26b7c00da7d957b5d227f87013552f63afbf5ad893e19c595b4ad8dab1995 SHA512 4b5cffc92545242543b5184d0b3ddf0858ff8ddfe49e7ca65ee95e02a7a3add3395f0f084cbea44a0493c0535a8ea70b98ab5326d621ccb849501ffa3ee01a18
+DIST juk-18.08.2.tar.xz 1874392 BLAKE2B 581c7dbc3267b7a81f3659f7093beb322640d0169086c7384b91bd54cc0953d73169a117e005e7e30c1f49bc3cbde7cb279cc6da0a2fb9323a13f46957447698 SHA512 5da50b30ed7a459957278b509db05411553a3c6c7677b4821ff5e7686a02069025131003c9877775fda2c9a3f7330436bcd2b5fac11b5441d645a44e5cda53e4
 EBUILD juk-18.04.3.ebuild 1104 BLAKE2B 4158dca7ff9846b19c1d4330752ce8da36159dcee898b83732b56dd258dcb8909001b25db96b77d95d3e08020a47b54394f5c7c30adab7fa4787f58367c835b2 SHA512 3888df6be004639a2e0b32f3bc68952c41b3da0182417511a2623960efc959cb0c12b10c4552a1a75a1ff243b8c70a3e50e2c272a6a70ca10ebff99705691412
-EBUILD juk-18.08.1.ebuild 1106 BLAKE2B b8c9bb34ba9e7b5f2e93b171bcfd425bf88fb11e881029ac2042bf635abd12751b4aa68f9331e39aa6aea969102fdf0229294aa09d7522e5c2c635d749657822 SHA512 f27f6a8d0df3b89d37a18123f42fcb0e16a2ff4bdbbb8d17c4a1cfdaf930e865cefdb4c55604f88d13994c7c72b37da6bca575472870e3fc850120094ba55578
+EBUILD juk-18.08.2.ebuild 1103 BLAKE2B c38f3d58d01b703ebdaf784c4bf66d14338188049e0e2704a05ab8658f9579570516cb4e4c3e58b32835fe3900bf5f159a6ca315d7d9da939b187cf165d50d41 SHA512 19f343725a223d961c08f9ef097adc7e44f6c679d30cf66ae75edd8c8c685f52e83fd5f28a5f8f4aaaee49256c1f249b3cd636a67806752b20a2a497b1b0dc02
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-18.08.1.ebuild b/kde-apps/juk/juk-18.08.1.ebuild
deleted file mode 100644
index b5a9daf6e7f6..000000000000
--- a/kde-apps/juk/juk-18.08.1.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/juk/juk-18.08.2.ebuild b/kde-apps/juk/juk-18.08.2.ebuild
new file mode 100644
index 000000000000..efe3ecdd0833
--- /dev/null
+++ b/kde-apps/juk/juk-18.08.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a42c513a054e..d4ee4e7d13ec 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-18.04.3.tar.xz 10599940 BLAKE2B f5c72ff0ce4fafd15e6c2c954934b7f6e57e8fe31596a0eaa7f0510d919c910882fc8fb5b0d4508a88c43b70d88f22692b34786f9999559be4aa6f334feebcf1 SHA512 744e963537b71d3ac4d529e216a1ece7b858f831e6de5beadcfa42cb690ada80c1d17271080eb5bd753ab3b9325374c382b87449ec9bc816ec32c680b0e7d5ed
-DIST k3b-18.08.1.tar.xz 10598048 BLAKE2B 318db53da3a6df8ced1a3bf554d668498038faa4e6bd6d1800e61e573e46abd77c24aeb03b67d5d581aaf56d2a9ad822e8fa0ac384d520503a86472f94b4ef35 SHA512 892f218821f82d5ba1b1554a4dde3ed05ce85a574f699664207dee8ddf6c8a704b2408a2a3cdeb00eba56acc5aef1c4b24548fb3ff93ac73cac3234034a5ba0f
+DIST k3b-18.08.2.tar.xz 10597972 BLAKE2B 61270de6eeb30ffe1a85024260841634d8f6770754adb02dcbdf8fe77628433e0132364c387244d6e75b592da8af9a5005d6f09f79fc8424ea999f17ad953a29 SHA512 ff1e4925e1371d493e63821f3e36335a4ceb90a5b83e23c65cecf6ab031772c13838ae08304330c63c5578a372f4c1f57255ae6bcd073303850ce83ece6bacf0
 EBUILD k3b-18.04.3.ebuild 3334 BLAKE2B 251c4e4a2a963bad70819c3254a22fc55769635e45d04fbec4bf3bfafc49add2323683a2aa32928ead05075c7d394ee35441a471ce6c3fadd76e3c5a883c1e0b SHA512 eb77b10c097657db00a73a3fbc9cec6709ac4886eb50c538c2d8ee1d7a976ecd6219831c884c7bea49c00fd62ba9a86a9dd9fb6dceb79c421dbad32545876fde
-EBUILD k3b-18.08.1.ebuild 3336 BLAKE2B fe17d3a2c96208ab7b4c2b76f3b4be7d9e306da7117295587b353a0362feb3d004c9e03f166d90d79c691499f488c78e17aa6b671dacdfb2f6eb21f3ab119efd SHA512 5816ea681d2966021098d5f85a5c484d59fef6282093528a9cecc3114845103df157796bd1d9edd8669444b2e995f59b1ebe42ed248a469c6f1666c0441933dd
+EBUILD k3b-18.08.2.ebuild 3333 BLAKE2B a825ede67de538bd3513aefef0258bf07e694ac71b61c190c224fac66ab6e305aa12ad25255410fc9c14ee77bc6fd49bc0b11768980d900c53d499e261cbe992 SHA512 1e1d78ff29c50a1a2f98cb7a2a8addd222fec420e2e0076d9b264af7ee88dfe06f55494cf5fdac8f239f05ebabbe44f1bd88f7be6de8c9cdec13178c38ff1cb5
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-18.08.1.ebuild b/kde-apps/k3b/k3b-18.08.1.ebuild
deleted file mode 100644
index 33ccd3437be8..000000000000
--- a/kde-apps/k3b/k3b-18.08.1.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/k3b/k3b-18.08.2.ebuild b/kde-apps/k3b/k3b-18.08.2.ebuild
new file mode 100644
index 000000000000..ca07f5b8b2f1
--- /dev/null
+++ b/kde-apps/k3b/k3b-18.08.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 8d1037d7a564..8e4b61b4736a 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-integration-18.04.3.tar.xz 71660 BLAKE2B 083248cfd88c7000036351150122bcdb84ca7f340e0a32794a761db3c68f9f18deb8acea86471bbd0402f86846c7e241fd1b8e2c32b668f8f664e6207d592895 SHA512 2b7ff86398f5dfd454be3f8b2792f0abe9ca17cc4cafee9c4f99ad5f4eb63d47a4a7b9a0f43583e1c108d362a5cda52f8428252b0e7f3afef30c67c13b926ba1
-DIST kaccounts-integration-18.08.1.tar.xz 71264 BLAKE2B 8e293ad1e42000c42c6ee731d31c95dc9bf1c7dee567fca2e29277708a9013384f0c8ee3b61102f1d4a75ee1b74ca5071c448d23aeee7367b5ed70399c110dbb SHA512 48b875aab203b3a5ed080249c915ec857691dcdc3cb7e7fb261fb9a5f51677c494c375245e3cbc9e10202f16b310f7c477968768f0e89156f6a5013e4e85a5d0
+DIST kaccounts-integration-18.08.2.tar.xz 71240 BLAKE2B 41230db21a3da9cb7795dccc362ddeb668ebd66e0c56bf8e69fd68d34d3c4392bc7f8eca7dca23709cbcd06517359ef81722c6697a80ae18705bd06e974ee50f SHA512 84bf3aeabb3b3b4a821d540ce9350a051e59ce4d25f3d90c23f60d6bc1fa83d4cd0e89f4780727f5a2df2341bbfa9addaef70151295be14274b02771710d8499
 EBUILD kaccounts-integration-18.04.3.ebuild 898 BLAKE2B 9475ceab418eda41c61d749e0a68f555b7885537a8ea181977a24e45ba2070333db6221f44a3489eb531a0a4b06332e13ba8826feeee7e82369599b1e2c8dc5d SHA512 a0cef7b698fd7a977159f8d9ebc10bd2fa99708846486559bb633d59dbd425fa73bda05efe6e4ff910a2bbcbd25edf3168612d53849461d13ce35eac6195fc55
-EBUILD kaccounts-integration-18.08.1.ebuild 900 BLAKE2B b854b476c9fe33b9c4d3baf1bb9433817e17e29b0b9f4870a4af8fcb24e9ad07eb96e85ef68a5e0c8412c43c0fb94423c02d515f5971b719a6bc8a7bd3b33ea9 SHA512 de398edd8633782c3c32cfc218a29199d5017024f6c417110770db2af2f5bfda5d8a56158bff025694ce4dc16ceaa7cc7b4cb2ca1eac51a5784c786735a867f7
+EBUILD kaccounts-integration-18.08.2-r1.ebuild 956 BLAKE2B 13fbde0b78ec711cd9bab8b257add1dac26c3a02051bd615cb22b2adb2ebab830c09e6f9f9a14324b53f0f52bfd26a719039b5c42576fd70e7a5909a4c8a12bf SHA512 44539d65f6bee11e9a1a49c0b0cc62addc084b3627a9853916a8314720e2a181be9be986b5a22ed26156ccc2a6492531815dad3cda356134182c95d1e4e0de65
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-18.08.1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-18.08.1.ebuild
deleted file mode 100644
index d30f9c20dd11..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-18.08.1.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-integration/kaccounts-integration-18.08.2-r1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-18.08.2-r1.ebuild
new file mode 100644
index 000000000000..0b2e528f3179
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-18.08.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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=""
+
+COMMON_DEPEND="
+	$(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="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_plasma_dep kde-cli-tools)
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+"
+
+# bug #549444
+RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index bdef3bab818f..0afb2e7b6b0d 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-providers-18.04.3.tar.xz 31868 BLAKE2B 3538782c5eb9c07607d258f00f11384521a47fb719fefa47bd98a4d7a73f287ccd2a5e65f395eca81652da1f83aa2a192939c48e7be465be5757675db26a7d79 SHA512 9e37745392c58992994989e1a9d35a692f5e08170073d9fa95e911d89ddde75a6bb2954283e46f5d6c6f8ffd9d37e31646e574f67e5f782b65fea331fdf0f28e
-DIST kaccounts-providers-18.08.1.tar.xz 31928 BLAKE2B 7a160a3b9739fd74e03d73592788429d487a5cafe46daf75a6d551364cba0f7f734b7f02ef526f5ce71d7ce3ace378f053c1e61bf71183b7fb666fb65b212681 SHA512 64290a891c506df36732229fa99e634c23d744ab19a5ab998164b98bf3ff6f907a0507440b41c1728976abf0836c99dca02481cfb82384b8591ae3db9f0274aa
+DIST kaccounts-providers-18.08.2.tar.xz 31876 BLAKE2B 79346b4a5e357de0b43979962b752563bea62d3439acd571df0824f29e70c5dfdb8ab9a975ab37f655016a04816a233ee02aecbc567d911f53c14fda576f54f2 SHA512 7d6901c3188391fd44a5c147580e9b1ec1babe76034e5077d87e8443afb9903ffc7e63f93c8226f8c4e25d099906c5c15ea2d24a2be7f0d6e27d736eeb20b9ee
 EBUILD kaccounts-providers-18.04.3.ebuild 666 BLAKE2B 859261416a66ffe9af1eb12195fb85bf5f63b2171055fd65cb0a2eec94b24071619e58cfec724842fdb3b366576aa46c11fcde9867f06b6c334a8dfc7df3ded0 SHA512 5a2fbf17eb6a9cd3ff593ad6d4507c796198390c0ac552950098ad50991b78ab02e23fa7a722fd96894ce03b0ffd1c2200d9ddfc536e58c3aaee4a98650bdda4
-EBUILD kaccounts-providers-18.08.1.ebuild 668 BLAKE2B f56d4db5a9321690909cb3ea6f960018c914a86f484fb62a17997d6afb7ff2970a4a8607026b9b876db5021d73fef7e2056da516151d20f7eecfc018d61e0217 SHA512 50f2c4f6102995d364559f04e6cd20ab3ec9f5dfbe30c2f04977137b5705efec0435026392d59665e6e5d1410e6a85971738acad7eb1bf3ea457a825aabfb554
+EBUILD kaccounts-providers-18.08.2.ebuild 665 BLAKE2B b8ba9b68ff5f5ab0885d5fbdab33687c7c6440351628b9660af4a6a2d290c648940afed517ee4e4fc85da13aec5526b190a49a23f54e077afef35a3ead2c6e89 SHA512 835b3a56cfa650d0cc58ee3b51692d3e5a509d4a896193c8d6b2baea6e54b2b7354a26400b09f4661095e2ee5204ff6af3bbe08b26b48e43cc89465a2544ef0c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-18.08.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-18.08.1.ebuild
deleted file mode 100644
index da4738ab4dba..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-18.08.1.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/kaccounts-providers/kaccounts-providers-18.08.2.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-18.08.2.ebuild
new file mode 100644
index 000000000000..7d0f6facf465
--- /dev/null
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a4895d469652..2565e9f11a56 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kaddressbook-18.04.3.tar.xz 547988 BLAKE2B 470fc757fbcf30accada18f62916fb21eb2710eddafacbcb6842562238ca74d04ee6b5e1271a1a15d3cc5482bcb9040930f6c1a1185279d784043ccce3395db9 SHA512 5afdfde4319977b31debfe662e2758080f0749229c087179e887272662eb23d69c06b3b634214b240af77b225c91c5b20dae531ea7cd58befa4d019bd28ebcc3
-DIST kaddressbook-18.08.1.tar.xz 538052 BLAKE2B 0d3e38ff7a361f2a8ed8f85c29def3f56fc02273db983ae3592850a56cf35e21e71511ffe1ae29d5fbe68ae430496cf3a8d8570eaceebf253f65b55fd3a8698f SHA512 dc6b8524578c718594ec3c84ecdd4e63c56ccd323be3e5207245f59eb95ad869bd83ad96a1e8a32e80b5b66b6c4b1befaf23f5b332f742aa679b19b1ef09bf57
+DIST kaddressbook-18.08.2.tar.xz 537952 BLAKE2B 55edca04c887d721708430143e4c1e89b6286cb778fbdab4937e54e64e614808b47f3a8c622751a03ef1c3d32fa098b4d21acb546777191bd1dff62abfa1850b SHA512 b67585e3761bab029da61004620017613d91ea8b7fc2a51f6dee92f1aae303c0cdd0cbfeff9248187c7f4f3485542d064f17365c0fc6e487c84b380b3e9be33b
 EBUILD kaddressbook-18.04.3.ebuild 1706 BLAKE2B c6d7559fb3fac56b6d259836e03f72003d4f89921ae5c4116571ccf80e753fb8c07aa3215ef3e2aeec9eb30d13b7bea139c0ae11a9ef15db77162315587e8b33 SHA512 edecd0701d2519f20045375486ce5f16460cf16879c8c1f76403a4a088cae89a6d68fe03c5ae1183753896d496a6c6056dd93a4651088e929faa9ed897913621
-EBUILD kaddressbook-18.08.1.ebuild 1708 BLAKE2B 519004808433bc563ce8368db1e4ddba8955f50cda9173022563ddbe06cfd232c6b2252a62de76bd57d1d15bd088ce29aea8c68efbd949d36d69f4d762fb1dbc SHA512 a04055dd89f4a29df33b1df154b1841518abce13bbd6fa4b228c0110f906f6a215d2502c901cd2c8e546cc1ae217c97c5fdd22581c81fb612a6340f545fb3a50
+EBUILD kaddressbook-18.08.2.ebuild 1705 BLAKE2B 465b79f858b362c598d9e0d6d2792e8ee89f1be381fed5f029d137af4bc21caf1ad0c824e992b18ae9d7329fb286e154956e20f72c12758ea6404029877ea358 SHA512 dc97b17134c4b731017104874bc3979b3b108d5adaee5582e77017c4eb3d78316592a9fc913cfb2e409b40d60b1e69e8c366bbbc529f25babe10a0ed924ca315
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-18.08.1.ebuild b/kde-apps/kaddressbook/kaddressbook-18.08.1.ebuild
deleted file mode 100644
index 23715c549f96..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-18.08.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_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/kaddressbook/kaddressbook-18.08.2.ebuild b/kde-apps/kaddressbook/kaddressbook-18.08.2.ebuild
new file mode 100644
index 000000000000..805063523fdb
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-18.08.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 5d78e8b6df81..638bdadbf40c 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
 DIST kajongg-18.04.3.tar.xz 4241892 BLAKE2B 764d0787917948eb70efca211d3fac59beeec0c1fcd4fb5f4ae7f48ce3235cf490a974b268e56ee4032bb4db0e5e6689ab8067c44cb937f70572d25d9019806b SHA512 ba447ed629b40ec8984d95cd324b06637d5d4131e8868dca36ed10451c6bf95e0126e0548322553b5ea15e8ae82211cb3bccade4cd0bd3f19f6ff4a415eca8f3
-DIST kajongg-18.08.1.tar.xz 4467228 BLAKE2B e582730c15d13f2c4cc80b2fb8ba538157fa82b7056e363671ba0f356c8c3e7784a880added83fce1864347fbb86183f4e04d8237bf997d0b73aca428328cbc3 SHA512 babc4767a24c0d2a2b2e699abc317332ac5b37c1e5fa77481be1340ce887b432b8ad4ac74b950d6c06d0f3209478616447760eb3a810ae7cbb7b0feebd31f6f5
+DIST kajongg-18.08.2.tar.xz 4467160 BLAKE2B 4a7fe3390000bd2ff7f132ac1a77f7f0f00877770dcdd94b6f4cee5f01de771147f1049c023137b0f6641057f1503e81b54d0b7960ccb68f34d7fa7f75ae6aa4 SHA512 d36c288dc5afc86feba6c1518e3955e88e4cab32f6cc0cbb404be0ed313d1a627eb5b0869fa43210cb3675bd800ecc1c31469bf285e7177d6eb52f5fa5d23f8f
 EBUILD kajongg-18.04.3.ebuild 1280 BLAKE2B 1a60ed7e29724456829f6b27689bc3e9f0be2f3433da605a45f55b2e36d9ac1c5436858225d796ba41639d66c71a20f220ea588716942d4644bce613461f10cd SHA512 60c40554e4d71fec23832d1097e568a4727a38b8dd91b4e89210d1c6a7c0b219ca1de171205dd7650b179474e5c277280800d0975d876545a9670b0794b44bf2
-EBUILD kajongg-18.08.1.ebuild 1282 BLAKE2B a2e4042d2ea6c95c2ec2245b43130d69a3edc75be2c280e5cfb8f3282aa02e7008b77a8b069d18e82f24918ba8658d3fab280520ba30319682131e776ab88e72 SHA512 b6fe89aee6537ff838da6682bf2a9ad59218b8fbea752857c54e0552d5fee10fc9501e8405e53b4d7a3316d24051eb20a70e10c98a3506a79ccbe8041c159c1e
+EBUILD kajongg-18.08.2.ebuild 1279 BLAKE2B 0a016a157f77d4c0ef11a55c02f9b230dce198ba955e2a7fdb95c4b3c141eba36b2008f684b36ffefc12556211591628d08be507f789984698cd6af1e86d2568 SHA512 6786caa824fa6441a5c03d2af064931b01f6577949a3183a5addfaa533e0ec54c68c603166dfe9618afb865ae79fbda2624f3d8279ac71dd6b3fdfa950243d51
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-18.08.1.ebuild b/kde-apps/kajongg/kajongg-18.08.1.ebuild
deleted file mode 100644
index 1c531f3048e1..000000000000
--- a/kde-apps/kajongg/kajongg-18.08.1.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/kajongg/kajongg-18.08.2.ebuild b/kde-apps/kajongg/kajongg-18.08.2.ebuild
new file mode 100644
index 000000000000..208d94a67499
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-18.08.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 feb43c6da17d..7e8180ccf175 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kalarm-18.04.3.tar.xz 1796128 BLAKE2B e4bf35dad7997c7f01f0a2e06efd4dcebe7d8c4493cfed7fdd1d49fd8ba3908925a4395478ecbfa8deee6e3241db057c03935ed2e4b6555b46307c550ab0d82e SHA512 05a524214c1b58db1d8d43d996771d37a1e17bdb9efa3e4e4f7475f1b48a984a2f8e28398a8d3d7cac9a5f7ef109fc82b35941bcd217fe2b6dc1a1de2e7924d6
-DIST kalarm-18.08.1.tar.xz 1813428 BLAKE2B 6c794a3bcf6709e5a92906e872bf726b9ad193aa055732c1ff491d7592b683401e895e36d6e520667001a00abc47d5d61aed6bba818bc2ea58eaef997e07ea14 SHA512 ec330089a056c01f265e67bb929bdedd20bc82e96dacf50f2474c3fa92d3cbb7897c01d796c104d8b7b82a2b7921068a70fac0a8f523fa5a70e3e46673e64e96
+DIST kalarm-18.08.2.tar.xz 1813832 BLAKE2B 6577d16443d97299aa15bff8b57d8f3f372825788cc6de9d3f1c20030539a30a141bde811ef5cf535fc2d1ec11aaec3e2eb4e7618f01e4d25c86722a84bf6439 SHA512 ccce30d980d501ea24fceee3b71ddcc2b293feb11173a1430d20475b5975d702f208218d948d4f6f6fbbaa59f61a26789a990ef4c99e46fcb31c99cb1c50f00b
 EBUILD kalarm-18.04.3.ebuild 2062 BLAKE2B 51f37557c4d354d47e423338cd0dae03cda913fc90caf123dfce6cade8e1b68e2f806f4153bfcbe9c4f2099665c42fbb00b7dd78b775b046db31fdcb4886b338 SHA512 b0fe838ed717f8c68454f178a6303c135882e5e82c436a8bcd3570aee33f40ecf2b5b4dd6d457da6f02e30ca4bae491f172b4f9f5f8fa9729f957ad2834e1aa1
-EBUILD kalarm-18.08.1.ebuild 2171 BLAKE2B efe5d3e6195c5ad60799eeb61cbb307905abb792cf0aed5b2c02374e71b25efd6b2c9269fb4642d3d7738b3cf01fa418dffd103290c46f88a4baf44711a8d8e6 SHA512 4174cf6cb3daa959ca963cf64c003fbd84bacf92a5bbe29cd74ac3f9c71960b1dfea4d1192cd0edd19d766b49e42ce23e547c0b42509f05d90ab4390062f89f3
+EBUILD kalarm-18.08.2.ebuild 2168 BLAKE2B e869fddec0dae53c56c6d27ed698ac1537d9d47fd3a8a1c75e12c5caa5f14704b50a242fe888cf7836df39b428f3fbe71258de9b01c230e1835d32992cde19d3 SHA512 a906de64f04c3e69ad3d5732f42898476046da40ab29adbcbeb3adbcb27a36510e70be73feb3df9ebbb5bd66d9965e0e740f613d648c8c3466cf881579b6b3dc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-18.08.1.ebuild b/kde-apps/kalarm/kalarm-18.08.1.ebuild
deleted file mode 100644
index d870e837ae1b..000000000000
--- a/kde-apps/kalarm/kalarm-18.08.1.ebuild
+++ /dev/null
@@ -1,81 +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"
-
-COMMON_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 kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(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)
-	media-libs/phonon[qt5(+)]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-"
-
-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/kalarm/kalarm-18.08.2.ebuild b/kde-apps/kalarm/kalarm-18.08.2.ebuild
new file mode 100644
index 000000000000..dce7276b09f5
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-18.08.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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"
+
+COMMON_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 kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(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)
+	media-libs/phonon[qt5(+)]
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+"
+
+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 7024c37a6126..f9c3862c023a 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
 DIST kalarmcal-18.04.3.tar.xz 548228 BLAKE2B 673a8cb71e1355790864295e3762da3f5c567b08b94b32063a293ce7b156f3a8d6ffc1fb8bf8fdee12d5ee4c3f3c30699f48e563b911f786f4fc4d840f859438 SHA512 d3ff9210cb999d83d108a359e996fcbb187aa0b2bf264331c13f744ac9539a64e678e99b4fac47c19c2edb560c041d07f45450cc3ee56e59c86442755df2c204
-DIST kalarmcal-18.08.1.tar.xz 573540 BLAKE2B c80f34bba5a41a658409f224db8e9da97884dc4b412cc457581345e997b495a87048593fdeb97ce1d39cc0e569dd79c1a87ce26879d5d5c5832aaa0ca78607d7 SHA512 09c82f140d9b883ddf2a81c603ad682ce6866380220cf666c83b8b87aef34864c646bf72950d31613d907b1d9f9799fa9d1f22d347b134bce3cd75c3036f020d
+DIST kalarmcal-18.08.2.tar.xz 573452 BLAKE2B 410ef1af93be949e884f73478f41c9cea8952201f344e289955ee8c8fe0326a9653ca3b7d48ed8d63237762a5cb9ebdbdee26ca0ec2a010a00009008a9dbc5d6 SHA512 c43e8a48e71d3a43f0ff297e54cdefb69d7008b3a2831e3f73e6044ab849f775d9ef51e8c31517a751769423fabb32abd719424d959c67f185ecf13bd52a2cb9
 EBUILD kalarmcal-18.04.3.ebuild 603 BLAKE2B a92cc38762957696e0a01e9cdc9a71c9318673acb9a86c7e22e03903cc5aa3954d6e086b81f3bcf3a39504dc47a56d99dfe74374ce371244ff8fdac812232019 SHA512 32f5bc44b552413d258db0370ff77ce65df8100a46f7e65e2e7e307447de200c1e77fea0707cad3e1e850254690663a77762c41e0a083a7992ae8bd2fc7322ad
-EBUILD kalarmcal-18.08.1.ebuild 686 BLAKE2B 92a37d866f8c72c3230646041b7dc54cc4232bbe2030fd8da27123e3a7fdeda71b2e14756b13c4a18be46dafff93409edd3a8e4776ac7f44d830b7caf73e1583 SHA512 e183b00c540e753550f2a52b7750a14ab9183b1570be0b3f789b74c8030df0952fab57f52d6e1b0b673b5642125545ebcbdc72756d8cf13e8ef5b9837546f0ea
+EBUILD kalarmcal-18.08.2.ebuild 683 BLAKE2B 4adfb48c2d2598218ec7887b030b86b566e636a712fd65a1aab9f0bf2db98865130214fbe68a81f6a42e6aa088494f5f9e854d939ae9c8f0de3a85663eba689b SHA512 ad327e326e0feb09af6e4ca34b7ce11d40ee3c3ea64e27cb28c94983dd9ec80f3fafad626c6fd2bdd3e7fc4b3aec166bda5aacfbbae0fd4e86dcd447c067e4c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-18.08.1.ebuild b/kde-apps/kalarmcal/kalarmcal-18.08.1.ebuild
deleted file mode 100644
index 20592deab44a..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-18.08.1.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="Client library to access and handling of KAlarm calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_qt_dep qtdbus) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
diff --git a/kde-apps/kalarmcal/kalarmcal-18.08.2.ebuild b/kde-apps/kalarmcal/kalarmcal-18.08.2.ebuild
new file mode 100644
index 000000000000..c4abff879e9e
--- /dev/null
+++ b/kde-apps/kalarmcal/kalarmcal-18.08.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Client library to access and handling of KAlarm calendar data"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_qt_dep qtdbus) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 83397dd43a4b..a4b6a3d45b3c 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
 DIST kalgebra-18.04.3.tar.xz 708516 BLAKE2B c3977b66bf126a2e1774401ff1fd4161e9ffb6e82d7cc25b1b43cac4604595f8ebaa2e8ac49ceffc65ee5486a88b4d780edf6196d04e1ee257af38e54787bf8f SHA512 8314e8193a29a611b3566eac8b98e2599e2bfde7ff767a7cf513acf51599e9f42b32f24e8f08bca8e824822260c298f97a64c662882eba1d977ce20ddb92a3f6
-DIST kalgebra-18.08.1.tar.xz 707120 BLAKE2B 53737f4b97e3926555a944e03be9312122ee27bf929a3411107c362e77d9692a5e1c79e17eda7b89fde371f2d37a82ef9fdb8d92afa09d60bc00e6e232290c55 SHA512 ecad3a4b56cca0e017d4a168863a03b464955633b36ba76286ff825ddd6779816d9f5e9d4100fedf8b7d079cd7e75c5e37528eda2ca7715f0f1e2a4026d7614f
+DIST kalgebra-18.08.2.tar.xz 707168 BLAKE2B 1526da331acd42605f55b50b8349afa4fe8fa97a77032c1d1661bbf093db5416cf34f2af06491e0c93989aad2e3b809183238d4217fe7e1b9820647a1f1d4efb SHA512 d569fe79602cfe4dda84014eed58918a71da75f2735d2b736a63070e919213e6e0333fb5eb70cfd7c03e128d0976a1f5b946beea47da495b12dd230abc65979c
 EBUILD kalgebra-18.04.3.ebuild 1007 BLAKE2B 9e112544f4654c52f84734458795bcfa4160f0e571d78be02699ec0e85a8839d130f23ca47d312534c1470dc292dd4cc3c7fa32ce6cafc09985b5a41d1a152fa SHA512 c895f264c4ca7472998cc1890e7b446d8ba05008ca97ad3d572bea333ef6a00030e872b78f487c0a21fd80c42f4f0d54770c706cfe8564e9127ef66654c1081a
-EBUILD kalgebra-18.08.1.ebuild 1009 BLAKE2B 4d7166da92fca274a74aebae0c802c009d8a42573b1e8b2a7f3235c955be49a499fd883e8856f3dfb00e199e41b41a8db7c7af9d1d6ede56b63bacca984fd635 SHA512 7e47687b5b3482e1b147f0c8978c24d9fdd43b3d10764ab5999fe35f0165b33fcf9b8946fe57210431935347534745966bd59859d0f8f6823532e1c0ef7c1fef
+EBUILD kalgebra-18.08.2.ebuild 1006 BLAKE2B 02dbba6b1cc4fc322598629e986b7c2d347807875dcbc229c831be696fdf220ccd9b2290db4804d4f7b295b086600f2e904ce08b74168b30e40f9d17d4704b9c SHA512 664c7fe443fcd7f671b023769061a0106bef7dd44cf098410d088055014058ca247808f58a676b1a204ec8ca575b17ea5110d314299c0ca0a7012ba500274d45
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-18.08.1.ebuild b/kde-apps/kalgebra/kalgebra-18.08.1.ebuild
deleted file mode 100644
index 8cdb5cfa3a59..000000000000
--- a/kde-apps/kalgebra/kalgebra-18.08.1.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/kalgebra/kalgebra-18.08.2.ebuild b/kde-apps/kalgebra/kalgebra-18.08.2.ebuild
new file mode 100644
index 000000000000..e302c62fb0ba
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-18.08.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 055c37446371..94cd30406c32 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,5 @@
 DIST kalzium-18.04.3.tar.xz 24391996 BLAKE2B 54ff86420607eae2cfded6722eb5d12c0305fa5f331b1d8a078eaa62e8c82a4b51e253fcc4138123df33839c02d6e86dbb8fc14fe2ef47f5b6efb65a0576e487 SHA512 1a7a6d6dfc8d210fc29bb77de9b1f59cfe45eb774cec4f1783de367c9d67b4d73c83847ea2c99d2706a47e0d5b2c115decd7d3b9b4b1399bf7ca9d4d69a51cc6
-DIST kalzium-18.08.1.tar.xz 24377360 BLAKE2B b95cb9c27b11462bcf9b985ad2159beb3de76499a3c1f29ceab19d9a9fb7cd396d83b77c2d59cb01031b00c80e5c6ab5d98ad8d7a6c54ca4a82d075e5396f743 SHA512 9d7caa714c3f8b345852539559d143009df7a334a4298fe2ef0d191277d55d8912c2487436cb815bb6e79eb3ac093f943002e09c0e25eb7644ef5d0904b57901
+DIST kalzium-18.08.2.tar.xz 24378012 BLAKE2B debd0c13cf833f70e3e2cfc0f56b31d5103d6e794a1d6fb2c0615b783db966c5d404f2a0cfe577d20330890e9f605fe3ebd9b3ae5952b9f6a453dfcc79e23a06 SHA512 ecd99414627e4771bc0f8af92a451443f0bafd05be273ff47a3b4a41df20a9b3b9b5b4c69dbd60b41547001770b0721dc04a4983b752654e62f12d34b0c92290
 EBUILD kalzium-18.04.3.ebuild 1588 BLAKE2B 12dde3693005357d77b3702ff117eebaf75151399b8bb130173d037805b83029fad3dbd8d7c7da5a493479f98bdafbfdd22a1e512e3edcdeacc7e9896514f27c SHA512 2f7f82bf2cae3daee18f9b7a4a7beef40baf7600e3a9e532eabac674a061a62f76d742f4f17ac44245e121c9246cbad077edb8ea6f9377a25a57470e49ca5e5a
-EBUILD kalzium-18.08.1.ebuild 1590 BLAKE2B 754eec33e98cdc59f42bbd535d644be0db08e26724a8aaf30d32183bd518edd34b375b5ac9d8695626e661f86f33de818808034276c61a8ddd708b4b3970a868 SHA512 b0019a6be3fc2d95074c64f84246d0cdbc9455be0893fc219676b8f7c62909f95fd23bf2f9adf97a0947a31f167a417e7693326c4be08947a59cf1e10199ce6e
+EBUILD kalzium-18.08.2.ebuild 1587 BLAKE2B 5f4c5f40eaf63aa52903c409df32a8d394dd4b3317c1d160180e392f0a7d0878fa63534e3863ec01ea6494e6308094276204b5f758358eb4cabccbc536541cec SHA512 5a7504e125a9cb2069ce201d6c9f9d524e6be60df79618087e8e483a3274dc4fead599b3d724f0d4185d2b7cf736f7dabb1f98090f9e68fd2602338660bd515e
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-18.08.1.ebuild b/kde-apps/kalzium/kalzium-18.08.1.ebuild
deleted file mode 100644
index 6ead311e558b..000000000000
--- a/kde-apps/kalzium/kalzium-18.08.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_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_qt_dep qtopengl)
-		$(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/kalzium/kalzium-18.08.2.ebuild b/kde-apps/kalzium/kalzium-18.08.2.ebuild
new file mode 100644
index 000000000000..4b6cd442ad14
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-18.08.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_qt_dep qtopengl)
+		$(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 ef236cd2af77..bbef691048ea 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
 DIST kamera-18.04.3.tar.xz 97376 BLAKE2B 6368a6f736ce5b8e4af30d5b52f8068e3ada90f6914c6922d9d199f3779dac23884d16887ea29eecbf6187689ebd72f9766cb3d844c0478a475b4650cee97b86 SHA512 f0f85eb94377ab04e2ad8bd973ccdfb4ef5aec6fcaf4046dac021cc466168dcb8c79d8a4da0735dad015bd2a69ff561f243401c7f30ef7b41b2f4fdcc6c80032
-DIST kamera-18.08.1.tar.xz 97624 BLAKE2B 50b005d907956d49f1e4453a6db71bf9495a27caf8516e4e5869d45b64ab562993f3e35ba3b6c208d77333262d2d25d972c8aa4d1e2e3b3062b88ad0f0772d79 SHA512 7660d55043d3bf73da0c45070990e1fb122d3243e56fd10513cbe63e3fa1f90cce86091b5693128e727337cddc1eda9d1bacc6160511284dc5009fa6efcf42dc
+DIST kamera-18.08.2.tar.xz 97544 BLAKE2B f8ff296d9a5f866e464254f556a00e1b908b2f6e37277a881bc89eecbaecfd6754ded41d1ea174f23b689248d4064b40f7cca80efb9d0f2800903b2423f80e4b SHA512 7de2470cdf2df277afa4cc0cbbd88318f754c55877e38d104e62624d01e1dd7917ff295114de3abde1acf779ef930331c5a0c08898ea5540ce88f6cc62a5e64e
 EBUILD kamera-18.04.3.ebuild 633 BLAKE2B d95148be451dbeb507d1032e69357812ccf0e7e4af0c127ef7e97deeff878c441dbaf332ad5f07f9ea472c6d829e54c57dc579f3d4c38dee64af53dad982e55d SHA512 ca69f736ddb956d31ee251b254959e37c924f9f4a79b91218bf2177ec6c681a405885b6d15058517d9e07de6e153e776161e6edd75d173c544f73f411a6cbe67
-EBUILD kamera-18.08.1.ebuild 635 BLAKE2B cbb7cff569e8363c4890f8650d00abc5b0eaf13c99f6c1e6cc2642dccb428e312061d12c51f176bac0e13e18fa089e94dce086f8399d1280b15e124050a8f709 SHA512 07aeb04539362960a5644022defb5ef6693b6e559099fbe13d4e66c278ac84f7afc2cac57130d9498188f735a622d19c33488ed236727e4f943e92ef28d1dec6
+EBUILD kamera-18.08.2.ebuild 632 BLAKE2B 97238f00b05ced99596074e41fe0e502aae61e9a742998cc317a197bb0a625f845727c164c85eaba9cf759486044b08bf163dd70082267f168f723ceb7610547 SHA512 4bf86dc9abb9e2b48dddf43ab1d498430d62d98e011dc13ec1155c0c97e73f2e94d5138330be4e85a21c0c97ada17281100b7466d47af05db68bdb7d02390105
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-18.08.1.ebuild b/kde-apps/kamera/kamera-18.08.1.ebuild
deleted file mode 100644
index 8e527cf2d876..000000000000
--- a/kde-apps/kamera/kamera-18.08.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
-
-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/kamera/kamera-18.08.2.ebuild b/kde-apps/kamera/kamera-18.08.2.ebuild
new file mode 100644
index 000000000000..9d071a39c32e
--- /dev/null
+++ b/kde-apps/kamera/kamera-18.08.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/kamoso/Manifest b/kde-apps/kamoso/Manifest
index c527b61c2b44..c0e0cf6d5832 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,5 @@
 DIST kamoso-18.04.3.tar.xz 185160 BLAKE2B e1fcf8299f8839815208c6d12bb5099c29204db48a66932c6ffdb37c3ce8f22da6c3fc8d5b5722f76d6ed38dbc2f64d80d367da318a8645418f9d53d5ed887c3 SHA512 f6f513b4da9d882104f8c8d8ba4f0aa484fa5430be2cab7fa57a8abca4befd5f4f704b46e83b44ae3cba161e309aa0b36e82361cdd0a197fe0d2c6e51101eab3
-DIST kamoso-18.08.1.tar.xz 183260 BLAKE2B c8ad93b57817db08902c3fc8a8a13aa65e2d01590ebd6295b2f382b5d6fe0f5f7e4b94bf013c3c250d1bdffb48586ed8f307cbf6e7b1ac42bdac90bce2151a0c SHA512 f0d034a8feb1c478f68915794feae65fb42f0551583da6c2107c7f9830691923d504a2aae692a25a71c389f57a8942cdef2e13a6c193b5741c0450bdf62b0efd
+DIST kamoso-18.08.2.tar.xz 183228 BLAKE2B 9580bcd0a014e038c3bf94165ce1fa130ed2eef2ace077fbec3a9a38c191652ba2f43852d2f72926440a36f15655dfc7a250bd67546a3caeb8ed6e21db10c10c SHA512 116f13c2813930d22297fbd2e92283b195f6aebf8182c134fd15eecb233439a52de253fa5988693fc98fe95563ffeb50b7e23de0ddedc265f9bfe485c67df896
 EBUILD kamoso-18.04.3.ebuild 943 BLAKE2B b087f6e8e4945a5a778609386583dfd0819ee11281907ed8b77482facfdf0fef979206f68b3897c64b7c4830ce1deaebeb9a6c388e9120659415b9836f224631 SHA512 57049451dc5a0064971b36e8d821cacc0e50330d65f41df65c802f79d852c5524430daa4f3fb46b450d378d3482e8fabf160d44b9cb0397a9d10221034b57aae
-EBUILD kamoso-18.08.1.ebuild 945 BLAKE2B 0a06fec2ebcc743845bb4c130f86ec09142275b94ac73d42b46ddfa409f730b3518bf858aba0f445c26656cab7e47931c0e790145f5fee00347a19ca287f70c6 SHA512 49b8f6f0d30425b4346d4ce42bb46e951559f052fca7c70178fccc25e6106d887e88600c7001214e43fe22b6f15cca3c776c82f0f6fec3a2e3b6db7271f814c0
+EBUILD kamoso-18.08.2.ebuild 942 BLAKE2B 915b5b3c6bf8f0d00c7f8ae64441d5a3e536fa8a7a83ae9d793341c227f35c8c179c91be49f447ba3189984d8224eeb23cd5a993acf320083ba2cf6f81e741e3 SHA512 fed3a451a39c9f973d1c4ab91bb1a394c084263add44f8be511bfac9e035aeaa71a1b0f32deae5cb844cb7a3b77e112e0ca96404f2604100abffbaf236be08fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-18.08.1.ebuild b/kde-apps/kamoso/kamoso-18.08.1.ebuild
deleted file mode 100644
index 8de5ede297c3..000000000000
--- a/kde-apps/kamoso/kamoso-18.08.1.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"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
-HOMEPAGE="https://userbase.kde.org/Kamoso"
-
-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_frameworks_dep kitemviews)
-	$(add_frameworks_dep purpose)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	media-libs/gst-plugins-base:1.0
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols2)
-	media-plugins/gst-plugins-jpeg:1.0
-	media-plugins/gst-plugins-libpng:1.0
-	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
-"
-
-RESTRICT+=" test" # bug 653674
diff --git a/kde-apps/kamoso/kamoso-18.08.2.ebuild b/kde-apps/kamoso/kamoso-18.08.2.ebuild
new file mode 100644
index 000000000000..663611c787dd
--- /dev/null
+++ b/kde-apps/kamoso/kamoso-18.08.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
+HOMEPAGE="https://userbase.kde.org/Kamoso"
+
+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_frameworks_dep kitemviews)
+	$(add_frameworks_dep purpose)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	media-libs/gst-plugins-base:1.0
+	virtual/opengl
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami)
+	$(add_qt_dep qtquickcontrols2)
+	media-plugins/gst-plugins-jpeg:1.0
+	media-plugins/gst-plugins-libpng:1.0
+	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
+"
+
+RESTRICT+=" test" # bug 653674
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index f25852a869cb..252e34d09e85 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
 DIST kanagram-18.04.3.tar.xz 7431284 BLAKE2B 49704820723996c7326c282cacd14991d8a0bb2b7dd6dddba882b7e3398d359e9cb564328e196a657cfbdf057fa09fc90a5199a6c49ca09e8b70cf97a918aa41 SHA512 a1b65cfecb6274d79fba8fe408d5941e4fbf52a7c5359903416801e246e08083b3a9865a21a570920bfd0e02dc403e36c9f7076a5e66ffda814e1ade4becc8c8
-DIST kanagram-18.08.1.tar.xz 7432164 BLAKE2B 7d0749dd794f2a27ddfeaa0006c0119a923a5ea37bf06caca5485cd9929f579386d0f288aa241378582fc3c8a4c8e5e98b3066e01c9d017f6d18774865d4bc42 SHA512 6595fff9c3ebf8a795e9e57ce74f53b00cc3b15a0d0a1ceb823a969c211ade9348bdecaea7ccd65f504449057c859cdce57c43f580950afbbd84cccef4d614c1
+DIST kanagram-18.08.2.tar.xz 7432104 BLAKE2B 32666397561c3043762c665226e6f0b2251e3826b228b910d9664eead45d8f8d4c761995a0f37e084d6cdfe7493d2e8949f4505d5b3710424cc187cceab93e94 SHA512 510e24af92e901cc4342770f567716850d9a8a525ab932ae99a48dd6c3bb7b1461e4997637fcdea81d9a661043197170938a2a013e2cf9052e12b24077f3610e
 EBUILD kanagram-18.04.3.ebuild 1085 BLAKE2B b55b8f7e63892dc7ee25e80c53d13ab12a7091c260e44c300b0e20de20fa11765c501e83f8af155d4d9469f60ad7578383899a2638cfc538989dfc5dc85faad3 SHA512 de7945997daa902534b2e89c7ee9c2eb089b84329c5aa4c3aa63722d776dce28f8ac8fb26c458dec9c88d0d7d839fc15ad0bff4d62b4675b7f320541b5d4135c
-EBUILD kanagram-18.08.1.ebuild 1087 BLAKE2B 72a439633d7576ff80de9499839fc378c210407e9ee93ea9f1d59af7863b0b78d81d88915be91d70c728886472b2ca1a9a1439fc263293fd3468b5522e8b1301 SHA512 c08816e9005583539f5bbd84d1621a0aec0933ff13089a176a61fa1494690b33f777dcb3edff3ce6e50eb8a189ea4977ebc82fa7870ae4bbd40e3f51b9e59822
+EBUILD kanagram-18.08.2.ebuild 1084 BLAKE2B f4815e7cb79c8568bdedf12428584062e9c76357343b42c7facf0d0c218568d4bae7a586777f9ef8318d54a343ca55d049edd2cdef346c5c3b3073b6d0077975 SHA512 ea0acabc02c6e570d9a8f886c321d82e7bbe07844e9ab131eff805d2800cdfc05cd76fc0ddad880b8adbd62563e0e3c378a89c5be06ec79be5e3ae997740fad6
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-18.08.1.ebuild b/kde-apps/kanagram/kanagram-18.08.1.ebuild
deleted file mode 100644
index 9899faffa5a1..000000000000
--- a/kde-apps/kanagram/kanagram-18.08.1.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/kanagram/kanagram-18.08.2.ebuild b/kde-apps/kanagram/kanagram-18.08.2.ebuild
new file mode 100644
index 000000000000..cb1797d5ef70
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-18.08.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 46385dbc2e61..8d2a5d877006 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
 DIST kapman-18.04.3.tar.xz 2525652 BLAKE2B 6b96e74bc70cadec5ea75f9f95b651cf19a3083b7562849606783ca9e034238f45e0662beb59a316821ec5724178ee30b5fa38fc03b416fd3c89001a707c514f SHA512 80f6f2dce23244e4da3cbef019a97323ec4dfd146fb2844001339d096c1137a5b4b51b9d19c72c1ac5a404bde66cedd4bdd43b1df06a5deda0ef4adf8ebf0b5d
-DIST kapman-18.08.1.tar.xz 2525716 BLAKE2B 54e788e26516350d5b16d0b7516ff85302e62321ea418961402a629881aca3ad00a36f52c7a2b89445095c8a9608787ce43fdf28772b08ffa46136f697ae972c SHA512 bfd3772f86d3a5d3b00aae9a6e5ba423d50ad86765a6bcd7bc7192740c7e341daf869156e65829cd9231c10139d93f5fb357174bdd792a2cce66ba3853e9439f
+DIST kapman-18.08.2.tar.xz 2525656 BLAKE2B 993931dab7edbc38ccd528022de345f473cbd55a5848a7f619a83eccbf39d6762d61d5c64fdd92ae33309d0c1016c624e1e0104ca98f3402015ef33ddafcf30f SHA512 f8369640323a6f8cf319503088158706e59b2ccd87bc948222673012e7bff0431673227c48231aba7e55b484b02a32432b3d35d2a70f112dab829dd5d6990056
 EBUILD kapman-18.04.3.ebuild 700 BLAKE2B c1a3f8e5d562345539feb4ecaf04028c9bbd0b2007750f5d3af30872b35257454e2fb07dcc1b72c1d02232837a40a2f3265f1df9202ead97be532918cf34b2d6 SHA512 1bf1c4c78b22de7300801a9acb3b2fc311881664640bdd06272fb5ba1dcabb5c1319509e2d55b3270e8d3d90eae856a63151e1957d0cb9b747c2bc70c124065a
-EBUILD kapman-18.08.1.ebuild 702 BLAKE2B abea90278a162819302c51909e084e29690a89eac38e9800773d24727de9c058fe6b098d224e5b7f2e027b283d09badc57de20585642be5dcb3c37d6dae92a7b SHA512 326b9e2437f143dbb0505afed2f92aa3466219f49698f378ddedf3e69c66f3948b878027be12e4b64f201b8594016d1e81d03ce5a91b08df68eb06f7cded8eec
+EBUILD kapman-18.08.2.ebuild 699 BLAKE2B 3ccf94268a6afb065058c8f66d3ff189859e1e80acc11c797ecce1af4f39eb9494bb580a99041ae5f55fdc1198a766f029ccab481d0d8a6aa5331498d6998dcc SHA512 52b1174643043ed9a793babbf923565cb6e15ee6c6cb8d1fa27f490a8bbdd5775b206154b67bba1d4548cd7bb518e24e526afc410a436ef840707b8346c9a05c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-18.08.1.ebuild b/kde-apps/kapman/kapman-18.08.1.ebuild
deleted file mode 100644
index 1bb9a2b6f7e2..000000000000
--- a/kde-apps/kapman/kapman-18.08.1.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/kapman/kapman-18.08.2.ebuild b/kde-apps/kapman/kapman-18.08.2.ebuild
new file mode 100644
index 000000000000..d2fb8aa8fc1f
--- /dev/null
+++ b/kde-apps/kapman/kapman-18.08.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 dbc6fe65d2e5..15612c36842a 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
 DIST kapptemplate-18.04.3.tar.xz 316568 BLAKE2B 92bbfeabc7bc3b7d45ab4e805d244404cca8c9a959e27be5e9b5de697bc0f4b8973e12f65198bc675e2977dfa08db07e28304a33b1d786769ac4072a43e2a266 SHA512 35e120bbd5a9dfbfcb9ec9372940ba7420f3e53bf926f2ed77d3facd99343f4edc644bc1ae91a147f73d7a1bcd28730051dc8a1c5990631ceab42113c6c336de
-DIST kapptemplate-18.08.1.tar.xz 317492 BLAKE2B f9ddafb1448f30a4972b8f6d9975e769e76928a39571296084a66727b8eb8d139a6fc6bab7bf80a5b068a88892dc5a562d9fc2a582d00fcaf73a0441940df2d0 SHA512 782b2fceb60efe50a47f03a0c84e82c9001b7e7ff51412ac02ac13200a06f17a28bd81845dfdadb402ac22d55f2df05d1ca43179d4e6b4660ccb6e0c91ba8c33
+DIST kapptemplate-18.08.2.tar.xz 317464 BLAKE2B 9e42d9e4b77541c7143dd0cd82f132e186c83032582253744f0a46da1eaec9b10e54b3bb4f1abe7b8dd020b63a9aa0f48f3d689cc85290187d17609ec8277aa3 SHA512 48d487384f9e105a9bece2ff5306d8442c678da718d000ce97d0e8ada5a5ea2e5c55ebf06338baa22242ae374130726513994bb5dfedc3723963129e094c1458
 EBUILD kapptemplate-18.04.3.ebuild 716 BLAKE2B a463eb5207879e6949c7961f872c177e64c85ae7288987ccdc3245cef428f472624f0d1293cfa8f0ff033417ccdb19d1707d797c8ea718526584ef4b5de6e81a SHA512 54f108f307fdd01e40242592d56da88d6b61ace68f5ab44f18b890339016e8f6dae53b392a6d73d6171fea5ac2cbbfe36509de29e405f219883529bca9db6e38
-EBUILD kapptemplate-18.08.1.ebuild 718 BLAKE2B 23610fc718bdee4457340700b0fff333413814a206c84b89d903715a050b7d3688dad2454f3c28cb37409a60a69cba31d9491ff44045d9b147341b18fe5e3e11 SHA512 4f0b319c78a4ee1f0e2b6a138f16578ed0d366f0063d4b1575d46da47ae06e7b4b3e1d9a6dc27d1a0c887980e36daebbb9b2380974f187ae8abc1547bd2ea5d6
+EBUILD kapptemplate-18.08.2.ebuild 715 BLAKE2B cbb54135c0ddf8c666b98d2f0dd736269b5ce1686bba2b91901354b08ba90ccb234ffee30444641d434f075af26eeb6f30a39bddec955ca917f87d78cab306f4 SHA512 8e812abfb0d73fcf06220f8a1cbd43462415820d8c59b174767407b748c882580a1ecbe5b5b5f911424c6c3b2100065552531e4962ef42b2a9251d53916fe15e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-18.08.1.ebuild b/kde-apps/kapptemplate/kapptemplate-18.08.1.ebuild
deleted file mode 100644
index a1bbc2a3c37a..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-18.08.1.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/kapptemplate/kapptemplate-18.08.2.ebuild b/kde-apps/kapptemplate/kapptemplate-18.08.2.ebuild
new file mode 100644
index 000000000000..35165f143775
--- /dev/null
+++ b/kde-apps/kapptemplate/kapptemplate-18.08.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ea14478e5d60..69b51da7708e 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,6 @@
 AUX kate-18.04.3-root-user.patch 2754 BLAKE2B 98c0edf87332b3cceecc1af326730603adc72088915bd4373799cf8376b22edee536b1d04a97b0f303b2f4563288b48211fed899a363c70d5884d069c41fe122 SHA512 0b4cf0dfddc7060702c19824d4aa9b863a3ff1958e809d8112eec2cc6f3e4f3c594a69ee36390ba20d7067facb87f0c83a2cdee28c643cda7690cc3876aaea2c
 DIST kate-18.04.3.tar.xz 5639892 BLAKE2B 76b36061ec758964e3644fc3893069791e060566646eb03ce0bb6ed04c6c2707f5f48240887078e309128f09e3316ee1bb7076063a8d937d1c4ee67e1dedc906 SHA512 7a41ef21e28e275a448fa80f6d6a7890e221669343c30f946a4522e7f9b4812407ff5b168939508568ce17965fa2dea965aa63062f4fe059a2612021f877694e
-DIST kate-18.08.1.tar.xz 5657336 BLAKE2B f3faa075cccd5da84a544a3bcad1d06dffbbb5d392cfaa18f36c2f2044b64d7791dd490791b5f26eae86e6a31ddad6e774fa76e55d6d6a31bac2b0653e3e6cbc SHA512 cd76272aa540aac13da8fd078ee0d5b020645c51fd16ed341e91383570d3e30d0005bdd7702c2b145538df7252443bee8c927281f93a8473b42166bf964a1b41
+DIST kate-18.08.2.tar.xz 5657696 BLAKE2B df2107ce3797b7d3af388c44c3d8e9abca1cf89958a0c934f5b542d030555350e1aa3e31889c883738af34423ef11fc5fc585b8cebfcc9e042b8789607a2da66 SHA512 c1ab11798d5fc209a2a592a44e7b7b1fa0f2ee1c17c8cbbfa9673810b8e64194a7e402c62eca3914720cd953d656367b9374858f7699a2cec42f9e3978e8b936
 EBUILD kate-18.04.3.ebuild 2166 BLAKE2B d23223dea86c2a770358ba874466ca50b6a14248beac2a17e3d92869f9b532e925b04cdb5fb1022288fd969c565f81ac4fb15a175e4146f88524eead3bf18bd3 SHA512 0730e7eddf12c896a8739f1c356bbe96ff8deb3a4ef68f61ccd089327309a89018ae3d5b3a646371037382f4e979e5e3afc0a070184335a5cd2a1628614bfa09
-EBUILD kate-18.08.1.ebuild 2111 BLAKE2B 7bea7d9d214f5d0b7f2508b565a6b6f71d38783c77ce645d092a2c65dae3a8da5990b18aa2e86f2bc4d76acda143046877aff49fad4142d3c4b7c5e5bbc7d8fd SHA512 ade303f3d9a9ba014a7ec897cf929d1b76c7c7f187159d460a64589db63418fcdcdce02fba2ab47c6ebdbbdb2ca5aa429402cbacbd946554a2e968fa400fe5de
+EBUILD kate-18.08.2.ebuild 2108 BLAKE2B 4c25ff3239dc6912b391b270e16f24aabd5ea634fe7569ec97634fd31438016de30107bb78ac022cd22bbd8d0b847d54749678b03d1fd8aae81e970aec4e426c SHA512 b1a128d1610843a62ebd58eca5af5f9629dede704549647916b188753c838b1bdb7cf70e78d55f50a1bdf70a9bad2de15269d8f2986a96141f4c025337b8c965
 MISC metadata.xml 330 BLAKE2B 2c8081efb3a1a1a6c87988dcdf0ac12e4e3efd85ad5c3965662683891113c9a60caa085a97734ae793bc6d12ac3ae0b8cf5249120b45c98897651ea23c7c3045 SHA512 41ae5a022aca855524ba8c6d4c98e54408853a94398a3ae65afd162200e6e4bb8fb9909ac270a27e99a8dc489a61eb48d732a04a73321113874dfcf605d60e6e
diff --git a/kde-apps/kate/kate-18.08.1.ebuild b/kde-apps/kate/kate-18.08.1.ebuild
deleted file mode 100644
index df641468f081..000000000000
--- a/kde-apps/kate/kate-18.08.1.ebuild
+++ /dev/null
@@ -1,84 +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 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
-"
-
-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
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if use addons; then
-		elog "The functionality of ktexteditorpreview plugin can be extended with:"
-		elog "  kde-misc/kmarkdownwebview"
-		elog "  media-gfx/kgraphviewer"
-	fi
-}
diff --git a/kde-apps/kate/kate-18.08.2.ebuild b/kde-apps/kate/kate-18.08.2.ebuild
new file mode 100644
index 000000000000..451e525f55cb
--- /dev/null
+++ b/kde-apps/kate/kate-18.08.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 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
+"
+
+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
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if use addons; then
+		elog "The functionality of ktexteditorpreview plugin can be extended with:"
+		elog "  kde-misc/kmarkdownwebview"
+		elog "  media-gfx/kgraphviewer"
+	fi
+}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index df1145d91974..92cb5c66bf4c 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
 DIST katomic-18.04.3.tar.xz 1237012 BLAKE2B 3880b39d5a2b2a4d87909d7403bb528b5e287ca48250807f937265e03c2a0109e09f5d5881712c70721c7f4751ea0e62dc0ab04c192811fb498d996bc913bf58 SHA512 0aacb62e4c56bdfcb3a861b2ccca8c856d482bc31b89923a20d6a4a0d928bfbe7028553001a897f27742036856b057157b6ae4a226a8adac6ae73baf2a98b1d9
-DIST katomic-18.08.1.tar.xz 1422872 BLAKE2B 1de390422ad8a37a866855a32f8a8ad17747b32c25eb19e85c4e2d1a444b8cf8a9f585b8dfa13be5d0e9dddf3f8b2d2328f1819b4c15d126d9314aaade2a620f SHA512 669e9b77689853270983e290df6a8ae8690544e589b11d14125a4696c12f34d4197d364d0c03d45407d6a1e69af1a1fbea94e61f16e6b6c9933131df751de32d
+DIST katomic-18.08.2.tar.xz 1422844 BLAKE2B e938eee915ecadd1c951a42b98eda12c55ea62048f22ef25bd123efd2b8f1e045a4c719010e42dbe0c31ac1f4034829ffca8ec78103b83eb495ad507f81b5623 SHA512 9cee37030359f52a9b34072ae88ab6a6697c847fe9ba0122a249f26399e7d08434ccf2a5f7448335aa369a6328eb57eeab2a50701f647a63967bbd506f6e9623
 EBUILD katomic-18.04.3.ebuild 738 BLAKE2B 06d61d0c6e462e9df7f11bd63a69b231948deb734e6d901789f1bd0efdec80496ff5f0f33121342645062e05d75125e8ab402e583d0594fbafaf839805c08b4f SHA512 767d7acf0f646f59ee8f45bb93d85e2f6c78a870747ec2e795663c07edb7595d13effbc343267f9fcae4c096ec19e84c7adad0edde92b0e26e1acb46a1d4e455
-EBUILD katomic-18.08.1.ebuild 740 BLAKE2B 715396c041dc1e0916a87d511e5007e06ac78ae9e50161a0ffeb1d6da6e7a067746afa26ede22a08c9785587ae77d1f427710422968a0221abc4a88b173ba61c SHA512 1e9f2dee9b0a85a9b0d201b537869d9831767b0349417774ddcc6d488c1227b9486bb6e3e12f5ab80d92505cf1b3e74c3911125913ccbf4ef3416916f345fcab
+EBUILD katomic-18.08.2.ebuild 737 BLAKE2B bb7d121652cc950a5b2143356f27d351b2db0afecd404470bc7ff11937378e96a8391df798e634d4e81f2254ededcdf7ca0f05d43a2cf0f0a440e979434e7981 SHA512 abb60853f5b5f2412eb4d10748e86ea595bf59f0673895a2d9d02e16f32ab829dd98df02a046e9aa5aff3c90f515ee66ac7237992a054bfd0216dc4f2508422a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-18.08.1.ebuild b/kde-apps/katomic/katomic-18.08.1.ebuild
deleted file mode 100644
index 8385fb375b83..000000000000
--- a/kde-apps/katomic/katomic-18.08.1.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/katomic/katomic-18.08.2.ebuild b/kde-apps/katomic/katomic-18.08.2.ebuild
new file mode 100644
index 000000000000..bef67483f532
--- /dev/null
+++ b/kde-apps/katomic/katomic-18.08.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/kbackup/Manifest b/kde-apps/kbackup/Manifest
index bbc3c5da1035..2a9e3759562d 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
 DIST kbackup-18.04.3.tar.xz 344572 BLAKE2B 704dd6fbf7558205f28f2242c748f20675f6fc58373b4a1ce1d4ebc5b02834cd137c9049142db766473ed84e1deb6e520fa9e2bfacee476ebb5ea74b2e7cb6a8 SHA512 871efe26475248bb25e5b303c36497607d8e33701fde00756db1962975f78ad81903c8176454ddb274692c774f06e8cddf93d35c248372ebc68e5bb0e7c71c08
-DIST kbackup-18.08.1.tar.xz 351076 BLAKE2B 798f4edb4d88c9db88c173e3d6863184571257a62b8655b789ad10b33ec58d052357bcd84e270e90527de8e74f4c1bfc8d306607e8de8e9cdbf8113626cf480b SHA512 d1bbe2e33a0a9a8e65122fcc10515b4a2cd7d0d6aa96cc7b8f9ac2c672e432333fe7a089136f3547ab4ff656379a5c21bf755936fed2a7060ec1a01e4eb7f934
+DIST kbackup-18.08.2.tar.xz 351324 BLAKE2B 027f5ef889f904999f247842461ef949a42ea2f6ec8f7a7f6b8a3202c34f194677a7749f2eed8913eed91646ee5b71ebe39db514de04150950c603809629ad44 SHA512 e1bef45b22ff67f2bd7e0c72991c05834db5bbdd0b2f8725cf664a570be6326472dc86c5072e78430d2c69f196ce2fe9eabab8ab58c5b69a52b84beb03e02caf
 EBUILD kbackup-18.04.3.ebuild 826 BLAKE2B 8ee7ab8b83800d2b948b9165916bd54419ac806aeed1eb8663fc678f5c39b0b3de8d54d5ed9b1fe10c0d08cc4fb10c27300177a922a4d0e048aa065c0a168e29 SHA512 2e52de424b2508f2b5393a4d689139bc55e21b7df2125d0adaf831f4683bf9fc2d7f177569206f7ae24326ffe716161a1b5e0c1b5cd2b89ea29850a935b4952e
-EBUILD kbackup-18.08.1.ebuild 828 BLAKE2B 33d6d607c19d67833c73ea262c81b64b20f92b5aafbee03253c6ca182a53fd1f3238ba29385c2064f660cb785014aaa662f8dd8412870664f9664604e74d4880 SHA512 812004bd1475c623c92bf7228f395f2c0f286f2c0b96511fa5033bb41b7e949a94e04babe4121bdec141d718451015f92f3064d285476577ba32f89f096529ca
+EBUILD kbackup-18.08.2.ebuild 825 BLAKE2B 2f1e3d4a1808009f7acd4a212f24344c15f5db3b81aa6b1fb94509a97b449f5854a6507fb7db4436c8715eeec85582b2a5992d5defb7d5832ea7ebbd0b02814a SHA512 e4f7c018a674d920b48dc88db95cedd67718f26cbc202824ce151373e3e7f6b3865c22b7189469d0960d84b74b9fd3e19ebc7a4d5a9b87099ba441bcffec728f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-18.08.1.ebuild b/kde-apps/kbackup/kbackup-18.08.1.ebuild
deleted file mode 100644
index cc493cea15d3..000000000000
--- a/kde-apps/kbackup/kbackup-18.08.1.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="Program that lets you back up any directories or files"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	$(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 knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${CDEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${CDEPEND}
-	!app-backup/kbackup:4
-"
diff --git a/kde-apps/kbackup/kbackup-18.08.2.ebuild b/kde-apps/kbackup/kbackup-18.08.2.ebuild
new file mode 100644
index 000000000000..3d5a596c33dd
--- /dev/null
+++ b/kde-apps/kbackup/kbackup-18.08.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program that lets you back up any directories or files"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	$(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 knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${CDEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${CDEPEND}
+	!app-backup/kbackup:4
+"
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index b0cef5928d48..3d08d191af0b 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
 DIST kblackbox-18.04.3.tar.xz 404564 BLAKE2B 2cdb7412327ecc8fffde975178d8ce3e16e3bc7829c9dfb5705719a1943d8a259085db159ef9c6f2895979d3fa28cc39a1566742bacda1166f171df0b7b71eb8 SHA512 1d29e375de5671f3c9752291d793a5576ccc6acc89996ad6257f1bf54f1982f84047d65e9da7f3c633284092d0c19a883eb389579925b49ec7a1464370eec8c1
-DIST kblackbox-18.08.1.tar.xz 444688 BLAKE2B 9101e4abc356dd4786c755088ac669b24d980797d65f6d9e711507c6cd454b1d7887b77878e97deeb757a4025049d6b8baf62f00866782c25800f14d1cfff585 SHA512 ca9092b71a45dddde78da793d6ba4981ba86f909df4aae1a4db8a3517ea433ae2a48046de36d50d921209ded6680ff03a42270723ea8ddf3fdd19c51797824f2
+DIST kblackbox-18.08.2.tar.xz 444624 BLAKE2B 932978e9458ee30985002f3b8a41da95950962256c27dd8037f08f645278276f8d7e91b8aaa02f31d269217f38a819af63872cd1a2b4746f018fee81f8ed75d9 SHA512 97aad679154a757ab66efd292f385cc95f448635e2008f786ad2fb1af7371ed67afca250750012a570c1cfb4fa697f2d5b247523c0f93e62e722eeffdcb1bfb8
 EBUILD kblackbox-18.04.3.ebuild 734 BLAKE2B 3cd04225e1a8a871bad2c2caa8f52c4b23587ca247f78d17b29d3f5d6f03967cab156ca3940ec606f08a42e9fb966ea1ee890af6da5affacce8abcece4f689fb SHA512 30f4e1bfe5f0751145cdfc2be517c02c062474a3241d89397495699e1192a2818614ccd76a3df171d1e3169def087ba0e8a7ffb12c08275e20045677614b94d8
-EBUILD kblackbox-18.08.1.ebuild 736 BLAKE2B 3d98feee0ff07151beab896ce705fa66bd351f4a2b1916b111ad11e1b218b3696d540c0eda5d1dd066da969f30e71f20b0a8cbc26bd4847ec3510cb97633acbf SHA512 cb87ffeabfc2872538ceda0d78c029257f9effeccfb71c9681f087e839676f71ee866044b7c77a5f9994405239b110593fa4aa45a96f45e2ce8d90402c683bb8
+EBUILD kblackbox-18.08.2.ebuild 733 BLAKE2B ba83dea8141e27728d0a8d86a52026250c30dbd05ec5bda293620dd5cbc44474bef0812a0a2bddb0a7cc20d0de5261c1badfe2e3b263da83a561fa3fbc2c64d2 SHA512 2ad8e6a1b222b689a24023baae3a7098750fdf9fe32b20ccc4b3f80669c21317a7708f1addede4db8a6803a00c611dd77ad3b29c7057656c74a0193582911d64
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-18.08.1.ebuild b/kde-apps/kblackbox/kblackbox-18.08.1.ebuild
deleted file mode 100644
index f595a51a7bbc..000000000000
--- a/kde-apps/kblackbox/kblackbox-18.08.1.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/kblackbox/kblackbox-18.08.2.ebuild b/kde-apps/kblackbox/kblackbox-18.08.2.ebuild
new file mode 100644
index 000000000000..32e8f4464f01
--- /dev/null
+++ b/kde-apps/kblackbox/kblackbox-18.08.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 e1ccc0c61161..96682b7777f7 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
 DIST kblocks-18.04.3.tar.xz 1750604 BLAKE2B ea372def9f55992980c32b4eda9f938c7ee7e5c6e8416ef99bdd6c752467658afbc2dd065aef2ccef6690a42dccda9bc3360ffa3c33b28feab76b9b1bbb5bcb4 SHA512 6ed96980cfb78ad0ebf62b9742b768e211689acc667120a390be7a0dcc63a4732c9fb4302b594066de4f9e6ecbe3b7b2409a5c4b56dae13bc7a90249de65f48b
-DIST kblocks-18.08.1.tar.xz 1921816 BLAKE2B 248816e53b3ab8b3b5dfafbe64b51b76d5a6823bce87a10ac183026693f4fbe828ab7bea896241aa59982b7728539f36a06f848180b57605642c66c01af75cf9 SHA512 1c30f91d854de088cbd1fd3b68604d1778e26284fa06f693af599934a9308f0903185369a712143d3f1b3d799a720f54e622caf8af07c08e790d1544157fd6d9
+DIST kblocks-18.08.2.tar.xz 1921040 BLAKE2B 5e815febba78924a9d250b6a5319a118d5dc3cdee01a6e6a4548327e3fc40cc5e698d3e5866478cda34d88b4526c627f2685312ab1215c68839b895b34b45622 SHA512 1516b5795bd091a33339f151e28c9962879f461f257ad5ce468f10d61e87b94276ce5f3d8dcd12a2e65ee35e479f07700c1f7bf35b18497965bfcf333c16f7c6
 EBUILD kblocks-18.04.3.ebuild 686 BLAKE2B 5af8815669b58db0ff6f0cd3641e833a8f70cb792ca2122ae488c34c630dc4244f98a5d1547a9bb9852be31c7787ce664bf973f7be02648ba544e26c56cee5ca SHA512 5701312c7b1fd2389e341f8068cc4c7566930e7f170a623b886cfde6d32a3b16ac29b52bfdea8d4926d2edb0f32a65c8e2b6b6ab98350acdad484e0a76d65032
-EBUILD kblocks-18.08.1.ebuild 688 BLAKE2B b997825b2465fcba231a66f409136b932b7e8a14d6d098efcdb4736b913171f1230cb9827c816fe588e71d0675a58c77467d1469c576ba41100acc9d40f8496e SHA512 a7434eef2ccaf3f52bd5a9ec681959b7c5d8a9519fc7eb4e1183fe607a00f0d3b5d3cd3a9397fa247537bea3dcb34a30672efc858d1eba9031c7ac55688a735d
+EBUILD kblocks-18.08.2.ebuild 685 BLAKE2B bad3689301214b3c3cbe800d3c24ae69676014a7443a13543593944deefd318aa0381d4102b460f77c3e768fceeefa7c8ee04735ec6bbdb14e5dcf8340c4b0cd SHA512 ad14e2c41d1a84d09fc9068ac739d799927c56ea65d09a0c1d1e2787004acdbfacc972c85b91116d1caa9214841fa6fc0005692579c84b995d0cd9a1e188e8dc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-18.08.1.ebuild b/kde-apps/kblocks/kblocks-18.08.1.ebuild
deleted file mode 100644
index 864dc454ad9d..000000000000
--- a/kde-apps/kblocks/kblocks-18.08.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
-
-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/kblocks/kblocks-18.08.2.ebuild b/kde-apps/kblocks/kblocks-18.08.2.ebuild
new file mode 100644
index 000000000000..6a12a96eaca6
--- /dev/null
+++ b/kde-apps/kblocks/kblocks-18.08.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ce0119a149df..b3aad68658df 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,7 +1,7 @@
 AUX kblog-18.04.3-syndication.patch 7655 BLAKE2B a2025972f39d3642eeb9a743f65f9c50865879a54ca3ca9da1a185578343beabb5f09763d96d0bd09ee750f5c925eb141aea2f8aeacd931212815260938c7835 SHA512 867791284a67d41ccdca77c2159a9ea348154455f12e3781138261653e869727aefbb9cc604c246870bd83d85766da1a8dcd134adafb9195001e5a5792a9099e
 DIST kblog-18.04.3.tar.xz 72472 BLAKE2B e4460ad17033afba4be89f29348d5849d98455f4ab479f626cc59b44243932017ed546b0a3851e4615bb892ab33660018d44d8eff38621b62c6ee66fa36fd136 SHA512 c12df99b010a67a3b653a6a0c79209b37b03195b94df27e2bc805ae939f572df99c29e70a182fcce5aee8c792a7b48446e1e6f032493a420896dd39c207cafae
-DIST kblog-18.08.1.tar.xz 73056 BLAKE2B d49c4f3a943610d42469eea2ed05d4d8557e5dc7ebb31985d1477dcd150ef95361240759e7998e1a1c18ff34b71d8a1a8d88d4a2dd3628315863211417bb2ab5 SHA512 ff05e23f5a9cedfccc3fbe611471b5261e49ad71b0a194951bb48091667a0290337d8a209d29e9f8780be58a01cd1690de3b619a04f581ac5ebf3e68a22199f6
-EBUILD kblog-18.04.3-r1.ebuild 582 BLAKE2B 8efc7838ddb4619f778da6124b82593a54fcf69a41d0554479841c09c69072a71a621f330335cb1d38419c50ba663260963c079b40cc4d0761a882a34b0051dc SHA512 941ba72dc431a9a878026d65c6cbad2631f8d38c3e90524761763bf70e17f71fb17a0339d1e73220f169e846aa0615a37f0929a26dd6b94f6569af17ec7ed910
+DIST kblog-18.08.2.tar.xz 73020 BLAKE2B 16265b446647a5b838b9fea08bfbfda47c487c44c73931251cf400dd48132be8921a2ac54f19c976381bc78cc4a80f92b9d2b246bf1c6cb4720f22def85e836e SHA512 238848a040498f3e2f0593bd04c82b11a0da5c8ee859dc7f7cf61676470ae36841bafe25f92da75c09fa6c49b9ce029a911c4e4e742d67c8e40b75f822ff4030
+EBUILD kblog-18.04.3-r1.ebuild 580 BLAKE2B 2d236c586c2506c74d908df6ec23b401befb6a10a648a8517a7ad1492695388c835c0ad8c408df18e2a1e5323b541c16c0c70f8fc3f1e7ee98dc55bd7e8c30b6 SHA512 ec9a8fad568612b466558498175bee5c085523b8b1e36c66e79137d9aae23e374653086572c21dd460ecbfa85e15b7a4837cd8047738be661bdeda75a6a3d745
 EBUILD kblog-18.04.3.ebuild 530 BLAKE2B 2a664bdebe9aed7515df9eb4535c850245632b331a23548c82421b96b592f4ece00334320e731e99ad7bb32e1d44f68e85770efe21805f4525f8989ec197a602 SHA512 cf8f8b2331184ddfd495519c39f2091e87c249c4662a1a0ec1d07bd00ec72b213f6e059821d6f9958545489fdd05764731a9d5aadfd12ed830ec1e2e8f7d3bf4
-EBUILD kblog-18.08.1.ebuild 535 BLAKE2B 79b2ba3af7a09595f9b4a6547f24390d6af2bd17c7d79ea1dfd2d22b52b031c3bc4f98eb92fca826b7bbf9fbf54418c4ea31ebe8e0d843a570e7db01dc5aba06 SHA512 8ff909c9ca6601742874de8654ad85d03137ac5f97d8eb504ac36f7b8451622e34afdaeb176a7c0315eb052f89fb3aeb58a1f497a98af4c5074f5cebe4c67fc1
+EBUILD kblog-18.08.2.ebuild 532 BLAKE2B c14b0879987b0071f2aff503ffb5ce2566247731b6b76ce083ffdadb12f70738c96a4cc063530d09683aa4924db60eee5e1d48a74dd06ca8e93b2ef601c65781 SHA512 c802b0956385989b0cc2a1ef93b2dfe9987f1e6d5de50fc3f828b49a476c7d80ce6c68356c5ab39ad7aa59e6218f134c8bcc3e2b349afa060ea7d26fe17b678b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/kblog-18.04.3-r1.ebuild b/kde-apps/kblog/kblog-18.04.3-r1.ebuild
index 1deda67b9ff6..9c93a45c0d09 100644
--- a/kde-apps/kblog/kblog-18.04.3-r1.ebuild
+++ b/kde-apps/kblog/kblog-18.04.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblog/kblog-18.08.1.ebuild b/kde-apps/kblog/kblog-18.08.1.ebuild
deleted file mode 100644
index 369a034469ce..000000000000
--- a/kde-apps/kblog/kblog-18.08.1.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_frameworks_dep syndication)
-	$(add_kdeapps_dep kcalcore)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kblog/kblog-18.08.2.ebuild b/kde-apps/kblog/kblog-18.08.2.ebuild
new file mode 100644
index 000000000000..205141fef707
--- /dev/null
+++ b/kde-apps/kblog/kblog-18.08.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_frameworks_dep syndication)
+	$(add_kdeapps_dep kcalcore)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 8c88f60f1a71..acf2068a190d 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
 DIST kbounce-18.04.3.tar.xz 3485332 BLAKE2B 15b329c20f77f6d5dec1a77e0eed8e294c4917fcad4e9415dfc08fca23bef14883068365fb144026f2c6d19bb4d2feab49c533b7a07c0d3434c84b7a67f59bf4 SHA512 73dfa5736780cf06d88125af12141ca5e76342923fb1ad9808998742ea147d6fc6b0d3e7815bdc8bc897671da29d50a749a9278db4dd931c21804fb683d48fe7
-DIST kbounce-18.08.1.tar.xz 3465900 BLAKE2B 2e95c3bd71e4393797be86fa2f410760e3281c2fef94cdccba715b0f15c5a25d073b8c99453235292f2dcf1dc04a0648e3c5302c2b56204ab1f7df157aef9616 SHA512 f7c97c133f69a8a8db2cff91eba30d9aad3c4e340145b7e57db9fbe8a85c429896936fd258622158f283cb36b3d670bbd52056b9a249f6db79a27abf83cd293a
+DIST kbounce-18.08.2.tar.xz 3465948 BLAKE2B adc7895b70f5df4dedbe1aa9d93a592509538cbc4768a74015c7561c87cca4939e6944b1a16f432aedc3297515c0559f1de49dc35115999f72128f1e0830b579 SHA512 6b74b150482e4ce8565d596de0f9cd33449cc64abd145aae8d0fb5cb0e42128a6e740d2bf20271aff0cc3a0e7de8b6b99270db6a11012c4334a581b6fc296601
 EBUILD kbounce-18.04.3.ebuild 817 BLAKE2B c1344737ccc3e0884ed0aedde6ea0e70832996761448e02325656d595af247a92983cbb79c68ff6a039fd9c68b139eb997cbef02580b8d5782643a89b23567a7 SHA512 52bc73ca5c7f4e1923c93553e14ddb9e9db8ab8e5d407d2743ae29fc6796bd39c9793f59752ab63c6b42fd1154ac539f1ee4ef675d68bfedf4364983f602fe3b
-EBUILD kbounce-18.08.1.ebuild 819 BLAKE2B 6ca3462e7839a2e970005270fa502924e937e115b6684493af8f5fda8804c3ca4ef032ede4885e18e6d6670b0006f5b323530ed3741f8e2ef0fb550838775d8f SHA512 da01056eb58c0178d1cfe3162f3ffbbb02ace4f6fa97d06086f0a5d3c84a5d61a4280db65125ddfcff7067a691debc7d0c2416de9327a713b532ee5c12b4638f
+EBUILD kbounce-18.08.2.ebuild 816 BLAKE2B e3fdfc22f9a43080926331c34dac9c52fdd310e75d27f2d9312292747bdaeefa6ac007277ba58749e2b04ce96d65a597f88a8e72e3f594c8a65341a6274aa173 SHA512 7c77e5a6165f9377b184f9c0e9f51b2d0aa85b67a9b15d3fe1fda3cd210e10026a3e8c6e4fec5e5481b3aea41535aabdfb6a6cef0cd4372708ec9a2789ec0d46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-18.08.1.ebuild b/kde-apps/kbounce/kbounce-18.08.1.ebuild
deleted file mode 100644
index eccbc67cbbbb..000000000000
--- a/kde-apps/kbounce/kbounce-18.08.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kbounce/kbounce-18.08.2.ebuild b/kde-apps/kbounce/kbounce-18.08.2.ebuild
new file mode 100644
index 000000000000..b9d12510fd03
--- /dev/null
+++ b/kde-apps/kbounce/kbounce-18.08.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 8787ec1efbcc..c955ff5d4790 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
 DIST kbreakout-18.04.3.tar.xz 2023544 BLAKE2B fdab111fbd2364fb135f2e408436f0dbbb25d1ac75e1dd18d199ad72878af047f838b2ec6d267df0c051ed3f239b2b9ea60f4250fdd674f86066efb11d34a424 SHA512 d0296c7a66c7e54c7021bad5624894cd08dc52e6284c102817a43bf6266f5b30165a3c7b1d2f52f23024e6626a83b5e3ac35c4a24b484534f63692a642a1d270
-DIST kbreakout-18.08.1.tar.xz 2274216 BLAKE2B 635d070c4e6464ef9b2be9332fa07ea1bc73bf64ffb9aeb6b7d8bcfd949053ccccc808a31044bccae48061e511afb65e630509f22ac2c9f225f9dcf92c1daab0 SHA512 0a069711dcaf47cdeb91ac07b714bf2fa3400877656a94188e72e25131f4c44462f27cebb0860304b6ab29aaaeba909bde931547c7b431cb95ef4cfd33a559b6
+DIST kbreakout-18.08.2.tar.xz 2274008 BLAKE2B 66b905c4b0eebbdc12e125279a3a50681fed4f92de69c75391988fef476ec558811da056878d9afa5ad6d0ab312fdbe2b586c2f1c8f23d7a61a5f34cfeb62df9 SHA512 c9d6856d3493e69bda92177c48acbc71c8ecd7674da3e1464161899cec90b825c64a0e603cbfb1a17ab479c015312d61e862298938874b207d41e962ee485111
 EBUILD kbreakout-18.04.3.ebuild 766 BLAKE2B d5c1bdfe47144def260c6f124b99ca2c0ac8567067842de0de128f9e7c5df56b26acd049cf9d32cc04201a5b47b50a923829ebd5ef6f88c9685bc78eeb501b72 SHA512 4137190afc45eaef707c4fe2008cef9a06b7f1021fd3051d993ca5a101c989c3f1440feb758d01ecb71a0da068eec3736d53bbc3dd40575bea06091c216b9346
-EBUILD kbreakout-18.08.1.ebuild 768 BLAKE2B fc85517ecc7e80c9f666512a2543624fd415599b1842acbd0d9c0315c8aaaf6106b4d9c332de0fe28be4c7c9d7eb4bdba61f3f4c3c7826a57fb4a1d2811e314c SHA512 11bed8e4809be58b9b273a03df5ac0bc20ce6367008ac09e0c4dd2f3d531b512c8c01a98924ea0ba8ffab695b6e5d0fb4945575ab39233fc68e517010ee73357
+EBUILD kbreakout-18.08.2.ebuild 765 BLAKE2B 7867c46cae46844ecfdf3cf862fe2692d7694cc85f19fbfe07409e04ca6dd7232c66dafdeffc0414a73efe710029c4418152088cf3958f013e74a0ec12def8d8 SHA512 68dcd722d108bd5112308db6850f65b266bf7bee2712341f8a1d4eeae9c0b4b0f35f8eef00373136a39b42dcd1f9cf6b1f672678eceb7f82acc088e7467b7241
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-18.08.1.ebuild b/kde-apps/kbreakout/kbreakout-18.08.1.ebuild
deleted file mode 100644
index df3e421e986d..000000000000
--- a/kde-apps/kbreakout/kbreakout-18.08.1.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/kbreakout/kbreakout-18.08.2.ebuild b/kde-apps/kbreakout/kbreakout-18.08.2.ebuild
new file mode 100644
index 000000000000..dd41dfd9cf90
--- /dev/null
+++ b/kde-apps/kbreakout/kbreakout-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 b71608a2c3bb..6ebde2a17931 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-18.04.3.tar.xz 5604504 BLAKE2B d728f78f55abdeb763c30247483ad1df0dba1a7f5293a1fbd50f85ca5f1f75802733309e9ce6b772ca8a888b5ae2f8e39bfcf645317358fdf9bc21e2dae1e147 SHA512 566111d6b097d9b24e98c5911dccf6058b1f7b848a558d004f977fb82d27cbea102f9c84f53ea67a9f006a2537cf76dcd958474474d2cef1480d223552031cc0
-DIST kbruch-18.08.1.tar.xz 5604072 BLAKE2B 3c749beed2c799e218d38664dfcbe185741751a6f469d6cbf79fd63cecab7365f0f538e7ac648714bc6305428da94805d4dd4efcefadf505358ccac2971eb317 SHA512 8b2ef8a7137a2fa92fe76c3c653f11f641b963e051c6a6d772b9b6285e9d7e6060f6004e80fb5d460471f67db859650cbc2c959ff6db90114b4d82360cee9d8d
+DIST kbruch-18.08.2.tar.xz 5604052 BLAKE2B 368a67eabdd3e395c8eb3b1c53c7785edd43ef71bfb6d9c7a6251fd8d9b72de73ed87e7f0ee0cf9b634bc6da7b57f2e14c847b7b06807979c1f689a8a72c5a7e SHA512 3e5bd7f551d08dfd88fab45454d0ec7e0ba1f096177154d57536efce01233f160b8dd9e908850bd40fec01fc1d03bb8225828a7fcccd6491810c98cabe2d4c71
 EBUILD kbruch-18.04.3.ebuild 630 BLAKE2B 111e2fbbe4ad95c8351455c57ccd531c3390679a9fa5da642c7f14e4d7f6850f510a1429b7c257cd8e151cf7b05b6df67039fdf63b43407b64027ce3eedb9d6f SHA512 53031739e69852f412c0fc32318f46d5c710e1d8dc9b17810fe0f009fa377bf5c13cdcd72db9132f17d50d901f486b34c76d958ae137c0b60359a2fc533d64b0
-EBUILD kbruch-18.08.1.ebuild 632 BLAKE2B 0a6b5ebf28c609236ab86ebc58bf09dcae519f505d6a0d27f44409b2c60ca01e038cff251fc60432e96a76c94f4f52d67bd482f049bf15c00b35ab33b92bdcb6 SHA512 953945f0d5366e10c8f2783cd25e98f4f415ab9dd3e3378788edb835b96a93954be6f3121795c7076bdbf4ab57bdb373e7a3b94433a6b80bf9041a73a42d44f2
+EBUILD kbruch-18.08.2.ebuild 630 BLAKE2B 3a62dedf88da5d6f7c38d819623c67319ed3bf66e71d0c28f1e906be3fd1f479ab0ce365e311ea95a5a04c137b9c33a2741f4b9a94f995724eff60344f324825 SHA512 a5836e8fdc4d58a968da597c8ccf342a936ec5bed8932bf6b521edafb519f076e6b1dee01b23c1296eef319989e47ccece3f1b77394c0590ab0908cf6706b514
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-18.08.1.ebuild b/kde-apps/kbruch/kbruch-18.08.1.ebuild
deleted file mode 100644
index cdaad6a4a6c1..000000000000
--- a/kde-apps/kbruch/kbruch-18.08.1.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/kbruch/kbruch-18.08.2.ebuild b/kde-apps/kbruch/kbruch-18.08.2.ebuild
new file mode 100644
index 000000000000..9cae5742b41a
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-18.08.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 7c2e10412b69..da84c0b3796b 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
 DIST kcachegrind-18.04.3.tar.xz 812516 BLAKE2B 48811c28f5f4a08727d04d7220e1696eee93be88404d0e3c18781169c17af03b4a66ac8b26e656d4fcf176d631469cad7586a7c90c2e47124f14f6da670414e8 SHA512 c82fc6fc980c08acaea40c9ada4489b8ff7864cacd0705ac9842723f9a0d93c718951617efc0bca17acf187f7400115c04aace9c5b0fd9275193449d083dd3c2
-DIST kcachegrind-18.08.1.tar.xz 809864 BLAKE2B dfc36d66416dc27ed80307112678c813b0a2739850a8365e44419a77589d7fa3b73e2f3c92f87e9b850f797e5f28dc79ac82a2285fc454c34bd783e346d37a48 SHA512 d9a1feb60ae76ebda8d08d657fce7b753d62957d4b7726ccc8f15255b0ad3875abc7ea3a17bab6de87c8b0619d22ff7320a9e5e1d044de8452f016759b77dde0
+DIST kcachegrind-18.08.2.tar.xz 809920 BLAKE2B fe0d35c7e06d663e604222f17ee874d85a6a0d11cde0a0530216842020f0ba4285da4cd354049640ec75d6dcea873fa818deff0978f63ff03157627b72a92f83 SHA512 482ddff1031a3b7c532acab40e16f14dcbfb196bc7dd96c251c867b382152b625df5d96e36fa4018a151c74317411059443a201b935d21f43db68fac67b425de
 EBUILD kcachegrind-18.04.3.ebuild 879 BLAKE2B b6a504162dfc611bded522a77895b797dac2d2fdc9dd9cef6ae89746f1a4c9d5157bc589ddcc1d04ac662065b6bb21cab9582aa9da16aa8564029fd7977b98d5 SHA512 cebea211513f766df63d127f369b9a539bf6137f7908e103e862d706c9f64679f791a9808efff89812c690a7da149204f75a9904896706927fdfe12724d44b3c
-EBUILD kcachegrind-18.08.1.ebuild 881 BLAKE2B 0ca911c9cc2beede7e7b59392cb9d6bfe0eaff3b6c98b1be10f896c84cc7fb923293d1fad1f8a7fa9afc835bf1789b34d6f6a7339e1f6fefa2a9602529398a34 SHA512 57fc2642442e1bdc5f4fe3188f84a061d5c2c1cfc8b11e3fda8448d6cc3b9209e49b2c5517680f2c75c684fbbe340e5f41ef51f8d0a1c2f32b9adea51471c4d6
+EBUILD kcachegrind-18.08.2.ebuild 878 BLAKE2B ff8d9b472b3bb7df5c26361dee547d9c7c177db4106165f76e93563136dd4b734629b7467c4225c7d68cabbc5742bade40f4c0d882f51cdd6ce74f9018f2e7ec SHA512 357caa814941f00d71c1d7655f2b58c90234245c1a9d3b2db4d8584f4428bbfbb9066d9bf458e91adb6aa5c8e437f32a76d40737469d9a90197fb43487057b4d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-18.08.1.ebuild b/kde-apps/kcachegrind/kcachegrind-18.08.1.ebuild
deleted file mode 100644
index e373c6a3ab5c..000000000000
--- a/kde-apps/kcachegrind/kcachegrind-18.08.1.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/kcachegrind/kcachegrind-18.08.2.ebuild b/kde-apps/kcachegrind/kcachegrind-18.08.2.ebuild
new file mode 100644
index 000000000000..9f23e9d49621
--- /dev/null
+++ b/kde-apps/kcachegrind/kcachegrind-18.08.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 3e395255d241..a4bd79198c8e 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-18.04.3.tar.xz 362048 BLAKE2B 4e07d5236bb807705c4fc7617c7422269812187255277046911011b801310034ef1783e90273732e1bdef241d5b4fd024d58e42f5c57218e9797c9b7c9afd6b4 SHA512 372f0e2660836108c405e9aa48a07f042a86ec8c66f43a7ba4a64c5ac1da561b3ead94f7c9e496ec270826813c77e21144b12b720f6a3872a3c49859bb637c83
-DIST kcalc-18.08.1.tar.xz 362244 BLAKE2B 580a16e6f49acd08bcdf0250b339b59d031e2081ec208ad7dc497d0437475c4e9d85a4d9412371ff393eafda11921f9ce1ae2656fda0290bfdc4c882da6307a3 SHA512 5d738132b06c9a866a6001007afa7c90d7df7ffade11464ff7378beb656cdc826d7b79e174c1f942f7b9e61edc32348b313dbd4e824dd34de1858b3363540f6f
+DIST kcalc-18.08.2.tar.xz 362128 BLAKE2B e01cfb1fa161a84035ce4b72b4f0bf80b92f352447ac11f692fd586d442ddd31229dabc8c1a60407a9ea5af00dc812b227fcf071a8cbca1c8bf8a1c3d1a6a7f5 SHA512 120d8f96291677648627a6115db53273b2ed35be5d372ecfb9bd7e6f95df476092c81cc8cd4a5d3a9409084a120c78e76b339758b08b74bfebf2db2f49621d02
 EBUILD kcalc-18.04.3.ebuild 771 BLAKE2B c5c8f2f21e376081aefb2763784572876c9541b1221762eb9c43c36b8145a5f172f363b059c7bfa399fc6310182e8b5177593b1d9b36f59d2bcc010430f797bc SHA512 7991e7adec9c5bb4735a755fdb91cb2ff8ecde7c352ad13e1cc98d58970cdd4439621765ca66f8870f54101265af1021aade8a6a4bfe0c3ef02ab5fbf9686c3a
-EBUILD kcalc-18.08.1.ebuild 773 BLAKE2B d4b788d176928f7d3ed49ab3b985439209cc6279e816e2a99ccf0a7d7584484ad7a139845dc6feac14291d0f2059cf45ef19e472313bac7a41db04ed3acc2605 SHA512 db3ad31717a281b74585bcaf1f48d7b739decb4978579c428ad5e1beded5cb269416011d3340a081ca26347304e6610721689a060de7a88802ce59a29e03f33f
+EBUILD kcalc-18.08.2.ebuild 770 BLAKE2B 2845f7f41c61e2f6e18f2d59d70eeb3a2dc28a03204bb2d0f1a34805f6c85a87916ac47dd42e2a3890402516ba78e2806c2f879b4397a0a5ccd7509d02d4bbfd SHA512 0d34ab65b533999a21f39dbf690bfed4ddfce5d891e340fcf6b9c7a6c4f158cdb93bb0a762083b9a785b737264dbef406ebc14c50184d60be3192c4aa2e4d234
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-18.08.1.ebuild b/kde-apps/kcalc/kcalc-18.08.1.ebuild
deleted file mode 100644
index 2877d5cef5ce..000000000000
--- a/kde-apps/kcalc/kcalc-18.08.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
-
-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/kcalc/kcalc-18.08.2.ebuild b/kde-apps/kcalc/kcalc-18.08.2.ebuild
new file mode 100644
index 000000000000..150699d9a9a4
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-18.08.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 fd46341d24ae..b5c05609151c 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalcore-18.04.3.tar.xz 251228 BLAKE2B d1bef3986badffd3e11b15a52619e653a2e8d1ec05fed6fa4244122493bf9947f542403c0dc167267b0fbca92b7569a08b786c908f8216ce5808aaa16a6fe277 SHA512 2da0993ab1d0c6facbf7f02af186f3554ca38408468dd72f57380817ef1f7f0bf236409a8644d7e84b5019d1eb918f2fd6ff1c1190a89a4e825845659ea84a1b
-DIST kcalcore-18.08.1.tar.xz 252396 BLAKE2B 97f5ab3c725b8031b655cd046201f9024bc2ee6c336313813fe8d179e8c0af7a34c7f51f961c0bd0b1399e8dd1ff2b8f00e10c3b5f0810ef61c810b781b6529a SHA512 3573b9b5314085855c7a06c87423474d5e83a3ef4b7200fab2532345774a8984c927940c3e5e26b3c1123cf1e8c944c480ea510b3577da8d7820acfa691915c8
+DIST kcalcore-18.08.2.tar.xz 252088 BLAKE2B 31e4ad8c99379e552126b5c27da61f8735c80477cdb594c9783214dd77a7d0294fe683df7ad0c65f04f382d30a3dad60cc2183ea86e074537223d9b2ca295106 SHA512 25add499d799d89eac2be542e8dcd6a08263a8b815c5223cfe853bffe72f8cbc2b2f08e27569272aae0b166a2e85de7670a4c9019e4637683926e0b8dfc0c651
 EBUILD kcalcore-18.04.3.ebuild 438 BLAKE2B 6d19c4126c628848ba833d0eb807d8221b1e82844646b34fc0e2743b900260d3d647c3f85fb290172e10339efc64e8dad5b3fa6e1a21621e3a06dd29ce214883 SHA512 a8ab920761ef69473ec447e42a108829bd8eb5a9d77e5fa3c814c1c28a8234fae375c33ff25b0597bd41b4b46260464adb47deec7feea401140acf6b7fc23947
-EBUILD kcalcore-18.08.1.ebuild 440 BLAKE2B eaf468e17f97f98ae4ac9f39bb6e159edae27965ab693af16cb79ea82f9eac5716cd561e525012fab7d28e1dbabf7d14e8c7577df1929b62ad4d32a2b014fcfe SHA512 d27034f46a439a58a06002885e255f2a1ec6054c3e2d84581082547a1431e2b0b44470563f295a1ab47a47e7d579dcd7fb04c47d3aa3386746b7850e8ae0eafd
+EBUILD kcalcore-18.08.2.ebuild 437 BLAKE2B 8f8c5079d8b0cfb927940b3af3fb81134184de70944b38cf69c503c2d59bea105ccec85f782d62d9b4a390ba35e54075e559395a69db9d48222db39850b7843b SHA512 68e1c9abd081b9950015b7da0cdb6725b61591a50ad82a9248c3a58b930629ebbca01ca494ed9874a37a1e26fa2b288c60fbcbdc1797401d21b276f8d80e39e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalcore/kcalcore-18.08.1.ebuild b/kde-apps/kcalcore/kcalcore-18.08.1.ebuild
deleted file mode 100644
index 88a4662dc2d7..000000000000
--- a/kde-apps/kcalcore/kcalcore-18.08.1.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/kcalcore/kcalcore-18.08.2.ebuild b/kde-apps/kcalcore/kcalcore-18.08.2.ebuild
new file mode 100644
index 000000000000..5f227c441423
--- /dev/null
+++ b/kde-apps/kcalcore/kcalcore-18.08.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 3e3e13e1bffd..47aba367cd89 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-18.04.3.tar.xz 326484 BLAKE2B 64787af00f304ef03c8bff17fbcd0b861ae061aa3e11fb235d72bcfb7fe60bb407a7299a402cfbd58d1a43db562f8fb3fecc38319bf7ddd5118031fb30d71743 SHA512 8105755af6ee6ff08f072ac58f66ed688bb9c43a6d1947e68234dcbe6e784346b15410fe136d13df822e3ec3f56cef1d1be59dc3ba70a415c1a860f38a0d962a
-DIST kcalutils-18.08.1.tar.xz 325012 BLAKE2B 76b3c6e05ef5d5ccb842b16d7b15b7d42029ee6bf5374db4b6dc802e757bccc875ea95592b8c87368e59deef6d4f288154a5a78fa25032a97be2ef4b380e9a8d SHA512 23a3212e1b55a4b3c56dddc8cc0154c466387ea72ff3d13b99f00bd0e26dd49b0d12440992f2edf4da372a99ae2e643499d98ee4b5e704238ffa6785eb4069a4
+DIST kcalutils-18.08.2.tar.xz 324908 BLAKE2B ad624ebeb388e626a91684f3aeb661bd968fc9a612d7f229f5f73097f039c3d6ad60372ad6a3de5857edc7f5abdb1297d329000daa3a08777421787e94e189c4 SHA512 ae6c5f7cfc4ab88d165f445aa7f2fbf43ccabd8ab4b20ea249549a18575be0ddc940e2f3cb9b0ce6433e22f515b61af51e53f842628c58d37cc7653b778c5a76
 EBUILD kcalutils-18.04.3.ebuild 852 BLAKE2B c66c865ec1692f6a5cae8e1a9da86a0581da30e716b73d29cd4e4dfd651fbdb05f437ea04268c7b2be190af4efb84deaf583aa0d49ffed47b2915414acb43ced SHA512 7af85697ceefc1adf93fc20abd3d2a04c14077dd72e91c7f5751364dfbf2f509ec6165a56431ec8fb062465e89fe6e348ff4e145cae5ce9d8d8290a600b7a9cc
-EBUILD kcalutils-18.08.1.ebuild 854 BLAKE2B e6c381e8acc4dd9938d0b477de3cb7f9be062e196eabc3bf50ddbbb48791c3582b2dfa2cb6809b3f5c8a0f90cd16a38fde1a189119f385ab0da6f8c7b39c688f SHA512 faabe41c35c796ff63747ef96793327e23861b3431e3401de8423310c9c081968c95c0c7819f7b2b06acb9e2b830bd9598e2d21be128ed46bed6a04937e5b21a
+EBUILD kcalutils-18.08.2.ebuild 851 BLAKE2B 62fee68b29bf04b741710bd6aea7699d9b8db38583a5bb1a1165ffe15116faed54e8f8709ae123c5a97c6a0357304b17c7299b7632a393ed1fafb1e07ebc8021 SHA512 5222a5b149c62dc7cbf5b55cb375b870cd20791ed802d31cf331f3e9871b3b8f5d97236a74bc57abbef071d3c2af3910c778f0b72ed4f7965f3daadfc1e9c74f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-18.08.1.ebuild b/kde-apps/kcalutils/kcalutils-18.08.1.ebuild
deleted file mode 100644
index 18b556f6ca0f..000000000000
--- a/kde-apps/kcalutils/kcalutils-18.08.1.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="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
-"
-
-src_test() {
-	# bug 653616
-	local myctestargs=(
-		-E "(kcalutils-testincidenceformatter)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/kcalutils/kcalutils-18.08.2.ebuild b/kde-apps/kcalutils/kcalutils-18.08.2.ebuild
new file mode 100644
index 000000000000..ed19674a46a2
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-18.08.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+"
+
+src_test() {
+	# bug 653616
+	local myctestargs=(
+		-E "(kcalutils-testincidenceformatter)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 3482a9e4e586..8d239780397f 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
 DIST kcharselect-18.04.3.tar.xz 351764 BLAKE2B f3b9d678e89ad1952077e1e42740c0b36356068e5a1740c4b607acd56d8615329691fc43132ad9359d2a3e820d9e833281b462a66c749be798ac2061b254eba6 SHA512 a0ab55769acb4cfbb33f54d5fbdafc48464c306286321ebd2e8f8b932217d5ae42b0b23c3ca3b40156a4770cb6980b832b2f8ae2dd8e7b6ac81d24c141df5140
-DIST kcharselect-18.08.1.tar.xz 355220 BLAKE2B a0ee97b05f73d7b98fe41e03ab49a13f6db51e4fc05a17b1487a95bbf020790309796b0bfc1d4c2aab5091f6391f5c94696fccf5e9cf300bc437a5156589308a SHA512 5b6c5b384747461434f37f870fab85d7cccc33e11505b1b2cf80391378ce9eff051f468875e2a1c3453c2cc5e8ee85b1c622523f1db95f59ce490fe57ec91ffb
+DIST kcharselect-18.08.2.tar.xz 355512 BLAKE2B 4066eb18f7bfbe93210c8432a215c413a2459ffcde03cde7f0e9f60a991d02cbf037e33cbd2d70a3dfd4027a22128ebf9365888eea56773965c83dd55f88a015 SHA512 36c2335e3db03b179b3b0942e38503e68068a3180032aa714cfe67a0f7f8d877163652caad38aefee31f4889b14e524480b16db48140a7fb85f0c49ff172f3ae
 EBUILD kcharselect-18.04.3.ebuild 657 BLAKE2B 02d4eb97328d7a29bc35b38d7fbe1d36adec5bf63917e132ef4d3c73af36f466349e0fb69e8e117bac93e81818f24de79ab219a67863741065b9c48146c05a4f SHA512 1b4ad8686d4943234182a53b25579e0f44e8c1a4b5cd6dd1e3b132461906fd70eae7ec3e48603912813212cc8f82d93dc35f331a2c6717a2d393824ddbfde5f2
-EBUILD kcharselect-18.08.1.ebuild 659 BLAKE2B 770987371ea06f0106bd6c902f80d968cf0122cc4914067f2b7378c93d47b83e850b4e79a63e18c0faa7769baefffa998da9e044deb6efeddb3cbffe7fe59230 SHA512 fead3ce266fd1936720aa135138cfd21fa3f02efa9b1a18339d9f99c155e240962e1d81a81994da3583a261635c5bce505a084c7f39e09cdaacb77140f07c725
+EBUILD kcharselect-18.08.2.ebuild 657 BLAKE2B 1d83cbaee3e4cc7e8969baafc2a03b55ebf3bb5fff3d49d2bbe3e8eca39a191189af2f73a5b9614aae09d82eb74307c1859e4d82d4b023ca5181aaada3fac0aa SHA512 53cdf00b118d8682e889056c74d44d46159dac88371642106d47893262ffab3abe73d840ec532cf8712f0a62c0163e65b86a5a388be01f37215a176469a2b3a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-18.08.1.ebuild b/kde-apps/kcharselect/kcharselect-18.08.1.ebuild
deleted file mode 100644
index d7ccc94ca3cb..000000000000
--- a/kde-apps/kcharselect/kcharselect-18.08.1.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/kcharselect/kcharselect-18.08.2.ebuild b/kde-apps/kcharselect/kcharselect-18.08.2.ebuild
new file mode 100644
index 000000000000..daae6f7715ee
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-18.08.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 fcb7dc0aa396..1efbd609f465 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
 DIST kcolorchooser-18.04.3.tar.xz 16888 BLAKE2B f39573acb38aeeb609cbfc42d5f8961436bd8aff62eb5b1d8316227cd68a88f30415ef8920016599e5ede291fd543a4af0c955a3dd594d97ed43a01a43296853 SHA512 3adbc920566089bc12e83507dfa25d7215a1811c8adac530a059bbcc5d35dabd8fc122143dd0a238a1e1d586fae18fdf32a24b4685ec044f1fee1c3060d0b667
-DIST kcolorchooser-18.08.1.tar.xz 17076 BLAKE2B 6ccff7f37c7ca0a30d6e576990a223e0d7a37412f8f3cd22b1e6d6087acf826b8ea2740317271e78d02cd9f586ee1d8f147a80c8ecd3995660381798e0fb64b5 SHA512 a2a514297dc9930d96f23f153f11b0b0a87d0bae1ecf41940665b89c2bfd3ea6c30bfdb622c47cf108e92f21bf7ac7f428f4c9414b72863b76955f18acb0f7bf
+DIST kcolorchooser-18.08.2.tar.xz 17024 BLAKE2B d295456cc75deda9fefc3fe7cf7e65de0cf8e79b0948c9533bc40ed1afb7d4f146512c1fcb4abe73a1cc7aab2e9ef68edc201fbfa9c98cffd52f28a061513121 SHA512 311501dc30f24c33bcb29eb199cd35c6ebc946340e0e8d07918f3a5e4d2f94e30d99dcde34355ee5860d488ba9b8f14f659fe4196aebe7e47eb782c502abdcb1
 EBUILD kcolorchooser-18.04.3.ebuild 455 BLAKE2B c2b3df4178abef5b4d8d821eb5a598a0d560eb800de0142ef3372189ad9a793d5da46140b669c0f79d4bcba19c9d9ebd78fd597966d12fd80dd3b0eee30529a9 SHA512 6a489f07659676ff90dde300a299efb31711f3eed39bfef10f68a8be4b12c9c2a23a0058dac542b1bbc758bb0161238174f6dd08ef2bd821d0c1b4ed90d09231
-EBUILD kcolorchooser-18.08.1.ebuild 457 BLAKE2B 06ca4df8902e0b76632924fa9c5a26127656cac7939f9eeaea8955c6636f96a45cf3d2e71386fbe6e76d7ee394b52901298a9db5ed02c7b8553c0d63c936c22b SHA512 cd5b9c8296cf2ee12e9fa84afe8a5d65f1171410946fb435522ca8c991d8c4339ec7d34aba1c0109c952ad54dc4a889a0323d55e228c71824906d652530df1d8
+EBUILD kcolorchooser-18.08.2.ebuild 454 BLAKE2B c93d2331c14558e92496ed8cf7891735a4d610b2c0883ca8ee2f8a2cc8d406c8c2ad21b68f4ede42206ad1037d521b4c4f5a295077d051a49901b5309ac9fe1c SHA512 07ffcaab57d4279f840ddc9e6e6ea5e6f8f51ce68a8ef02631e97cea267e853e830f5f4ea20a16efed536d822448b0c14a46f26f9fe0857098f5308c87435345
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-18.08.1.ebuild b/kde-apps/kcolorchooser/kcolorchooser-18.08.1.ebuild
deleted file mode 100644
index fdbb64c54d27..000000000000
--- a/kde-apps/kcolorchooser/kcolorchooser-18.08.1.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/kcolorchooser/kcolorchooser-18.08.2.ebuild b/kde-apps/kcolorchooser/kcolorchooser-18.08.2.ebuild
new file mode 100644
index 000000000000..93c9a19c6587
--- /dev/null
+++ b/kde-apps/kcolorchooser/kcolorchooser-18.08.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 bc0f6cd18b7d..f455cca313c7 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,6 +1,6 @@
 AUX kcontacts-18.04.0-unused-dep.patch 1283 BLAKE2B 20a4b624770a7a578d2e0be5a9f8db252d4ddeea5fe8521122023f13d15470b32dd1c0ae7f3e0b8ab65e0848a7f82e568a712e6af2191600bab97995307d881b SHA512 0aa1bffaf62df622975ff092df911a107aca1ec96376aad37339d5a54ed6e34bc7b0aa07b0b2be573382e2e6cd07208ffd463f0e60e13c4f8d5959dc85fe6acb
 DIST kcontacts-18.04.3.tar.xz 206936 BLAKE2B 00df6e8da4a3d70f7d630b8dd671c6214bca8ed7d938aafc2342dbba97337f077cb77bc9d0bab31a91b7b0b8dd9074f667846120e667a52bcb477ec6b29c20d0 SHA512 bf177c4cf0ecbdb71e75ee32a4e71599f864062524f5663e3c1d4b49a06d58a3abf7b18d2840cf7e70248a426fa6b6367375a2aaea211ba15a697e0dbd27953e
-DIST kcontacts-18.08.1.tar.xz 207388 BLAKE2B 2b49a61b4288d34c23ce24992d0b94769324ce431dc9e2aa3db97dc5ea615b394410fdc3b5eae49d0ccce25a3a66107e37833efa3ca5630231b3da1d728810bd SHA512 a28f004bb7c87206a3d063f66fae54c0147a1489bae94e7b5e5b7756f88518ddf86bd425a590483bcde6f339fbba2f76ee44e2138f595b19b1944718537c5fb2
+DIST kcontacts-18.08.2.tar.xz 207272 BLAKE2B 769ccc453441c7b7c7ecbacdc051d4e99aaa71ac124a3a90b5f4784608bffa8502364a3b3d88d7103eb6ca51b1cfe6389a3b86d1b5ab189f5e3d2c841007f36f SHA512 2ee75088f7b0a05ad6dc308542bacea34289b3ced8284df73531303f623a9b976d0cd86395123f23f1f26f25355edf4fede9ce723d7ec7f0c9191edc961828bc
 EBUILD kcontacts-18.04.3.ebuild 889 BLAKE2B be58d2731e6ad0605817bbcf6e5786c03c7ffc5b49dd9d0e22967bb46d2f20d0d865737a8c0c0cd127201b50ea1d68414dc4c223c0162f74ea5d18da489b79ae SHA512 1d45d48805a52ee73219d1eb8b61dd66ef4f049fc02b25f4f3d63f79c32a6b1a9ddf037a296c28b86112ea2fe82fc95c1ef9f27f086286767c367e90c375fcdb
-EBUILD kcontacts-18.08.1.ebuild 833 BLAKE2B cd17afb2e3393a32c1b350ca776c446e4cedb7ca6e7bb199b78b51754310d376eb7e21ad0a5e37235372f79e19d6be6ddbc3fead189892fcfa67c99bf5cded4b SHA512 722ed566ae98d9e464408ae44c360d3bc0852d365d66d48e502719f1230fe691a8002bed45348c8f647a6095735e6919a35775ef496292237554c9279f8d58c9
+EBUILD kcontacts-18.08.2.ebuild 830 BLAKE2B b93517236b74bbaf059523c2832aef00e01fab902924f54c59e233be03d009ce0c246ebc91a99512331923150f81e991252c4eabc42ae339537a3112864ed143 SHA512 0e3804067ffdcef4c78c9abdbcdfa9c8d67c0439398a7b40865aa76e32179411e45e77af8e112fb19e9bacd01e0840b13d07e7f392c405bfe761677201ea4ce6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcontacts/kcontacts-18.08.1.ebuild b/kde-apps/kcontacts/kcontacts-18.08.1.ebuild
deleted file mode 100644
index 97521a397373..000000000000
--- a/kde-apps/kcontacts/kcontacts-18.08.1.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="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 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/kcontacts/kcontacts-18.08.2.ebuild b/kde-apps/kcontacts/kcontacts-18.08.2.ebuild
new file mode 100644
index 000000000000..43629f6fffa5
--- /dev/null
+++ b/kde-apps/kcontacts/kcontacts-18.08.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 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 781408ec1f65..8789ef6210a4 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
 DIST kcron-18.04.3.tar.xz 1056624 BLAKE2B 2d10df38eccaeac408313480527a40eaabfc1d6ae62122c00add9aa03e644cb1a7c15b8ded9bb7027198550b64e7d840ce274d89805ba123fec1b9f9ac79af07 SHA512 3d0b78135c026b64ac9e08f0e963a6c2e54c00d8039b73fc82c9c305eb1bb766bee4ee06b5cda5756a8e8a816c1d8999304c3295ff941f0ef532843d48699141
-DIST kcron-18.08.1.tar.xz 1056760 BLAKE2B c74d08b8792b59760db553166b78e91517788af36fdac45f1088c89ffd54653204ab7fb9c689d0a893449cd772c8fd9473add86cd453fad83d76b19da69a9e9e SHA512 bfb895419a88f716c3768ff8a928d2889da79182dd5e61ef74d14f054992b8b673d201aa1725a1ba407f89bb1725e1bdf6c7d9deb69d416b2ba8a072d733dbb0
+DIST kcron-18.08.2.tar.xz 1056672 BLAKE2B 033b0f2fecd232103cb1e8beb13e237f6b8be8c6d844023267ba5a6c7519a85348745ad9a5a748ff8f6bcd838ace80248f090e0bd63df75fdd7fa9e2e11dcd87 SHA512 2c75141ae04ad593d82f105c253493c8c68e07e27e12ccf1cf7bbfa496e000dd580790b10d61b5c981e9366ba0f29c6ebdd5d102b9795b0d052e082c27ff07ac
 EBUILD kcron-18.04.3.ebuild 546 BLAKE2B de16dc20e75300dbe368a416d5c5af632e83da1e88fa2dccd81bcc7ee00184aac4a3bdb7cdbe992f12665d19b4bf24996a46ac6965252fbdf3e169ced32ca9a4 SHA512 b214603847e53d62d6463d75302485fa2d1107e8a0598272287cd5b0278af3703aa162cc85b19c950bb57808ccba627f8532334422a71efcacb79093050365df
-EBUILD kcron-18.08.1.ebuild 548 BLAKE2B 37924550a729988bdc1374a8628c288d2f4a6ebd1d903dfefb4cb809c5bec38a7b23fbfd25bb743db05c64312a7093dc53179d469087330f6fd8c1890b97355d SHA512 4b852e90550a0eb1424f742f106a002157c4ad359903176db4aa8175ce09587bf2b32cbd6885b4f0de3385d0ae22ca8d4ef59baea482e9f3a72d43a41d1f7e07
+EBUILD kcron-18.08.2.ebuild 545 BLAKE2B a4569f45675ab967975da79a923940d64a7821a78679736db75cd438e4edfaf85e42144277a45238e3425e5c68e3242fd297f9dfd9a9f60ca21a8bca72fb267b SHA512 bdabc3813c719471c9b7247865f75bafe0fd727296dd337a3da2ae6eea3b1fffde0c92f294c83cb8b77abe8b613bd196893811583f87ee87b464e7b7d44889a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-18.08.1.ebuild b/kde-apps/kcron/kcron-18.08.1.ebuild
deleted file mode 100644
index 42894d06ccc5..000000000000
--- a/kde-apps/kcron/kcron-18.08.1.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}
-	virtual/cron
-"
diff --git a/kde-apps/kcron/kcron-18.08.2.ebuild b/kde-apps/kcron/kcron-18.08.2.ebuild
new file mode 100644
index 000000000000..d82373236177
--- /dev/null
+++ b/kde-apps/kcron/kcron-18.08.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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}
+	virtual/cron
+"
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index a48ea166c19a..a5f98d3b4346 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-18.04.3.tar.xz 49040 BLAKE2B 2c26e92bc83120f194afa9442322d470302d236730c3d7f3d7ba5e3ba317d3de99cb77e250dd539f1c61d1d2fdf3903da7c6626b9a42eba7d850d648551be0a3 SHA512 5b593fd2345cb0d40dae7732d1e82b8eb84a29a3afe6f3fbddaf4269c2b58cffd5ed34690dae3fe92e59de9979129e567acc1cd41085bac14a42eee81b439363
-DIST kdav-18.08.1.tar.xz 49788 BLAKE2B 9dd97412f496136413cb4d3391421af8ad9fa0abf99bf353cc228ca045a0812f1d85c1187296bf8158df74b8634da3497e8042462013127d98e5126570b99f41 SHA512 00df24124763a25ce85fa577401a54fafda5c39efe8c05b280a301733e9e5f79bc28d75b9ffca8a567196941fff8edfcf3036b963cf58eab3e9356d24fd868ba
+DIST kdav-18.08.2.tar.xz 49748 BLAKE2B 194ef3af63d423ec6514c384f198c465cfa76426411ed8a65d1bf92c55de9c4b4fbb77d8d1f2380222672d61b7432916d07ea8146ade7b07c1e55f49264642c0 SHA512 76b84bf854ca1b9a6090790397557f99bfd65c8d75bc039761d92db2bca74ba8c22d25903e209c3b67dc938535220dd9e938711367ffbb4f1571a30d63088bd0
 EBUILD kdav-18.04.3.ebuild 682 BLAKE2B 430f8c8f9b66227c832ab9d7fb986d7c43c9a9f48cef6d93c621ce0b5dc99e2bb70ffd815c2be7710575e3a338229e126bdd8567a64870ae9b0bb22ad7233e7c SHA512 9b3d5ec01c7dc376023b492b032025c533f9c9d0b598ef56da26c4830b92f2dc3ccf9aab5bc5bc820356f8b75be96516ca5d935d3d339d4310eca4ca20c29c59
-EBUILD kdav-18.08.1.ebuild 684 BLAKE2B 8ba6a76ca4da7d62a112a14c35e635d2051884a25ee29622f5dea787aeef95910931b3d9a29e0c92c380c49d5e679b0bdc71e47662eac497ff24cf7abce4cb5f SHA512 4eb0bbd94e9792c6c1c55efd38d8c36e46b7e1712eb7d76ff2858e34cec8cd897ea882d51aa2780e03ce4505ea0dd192a0930bbde75ee2252b3362cb08576c89
+EBUILD kdav-18.08.2.ebuild 681 BLAKE2B 412f7ebe776665f07d61f440a5ca4bad5e877c378c770adbea8a03b0edc43410dcbe42a8a4def6c56a818022d248f0b4ddd06a77719631201c1df4e246e5c88a SHA512 57e48496bee8813e5bb4d5757ada10d3886116f34839aaef7f8e30f66d334078d6a8aff1c8bc7a92a128b424e1644c2bb5cfbb3e8fd9ce80cd49c1e2194b0e98
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-18.08.1.ebuild b/kde-apps/kdav/kdav-18.08.1.ebuild
deleted file mode 100644
index 3fa721f7673c..000000000000
--- a/kde-apps/kdav/kdav-18.08.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-	# bug 653602 - DavItemsListJobTest mimetypes unsupported
-	local myctestargs=(
-		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/kdav/kdav-18.08.2.ebuild b/kde-apps/kdav/kdav-18.08.2.ebuild
new file mode 100644
index 000000000000..b886c0149146
--- /dev/null
+++ b/kde-apps/kdav/kdav-18.08.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+	# bug 653602 - DavItemsListJobTest mimetypes unsupported
+	local myctestargs=(
+		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index f3dfef327c71..879d6b46d78d 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-apps-meta-18.04.3.ebuild 712 BLAKE2B eb22f68f34234dac478d2c68faf184e3d15c1628a2375e8f0195f390559d76372e2af8f71e11bc706ba32232444ddbf71f7dff07a5feb4d80a99a143ba0b41a6 SHA512 68230fba9f71b944ae1f6f5751c56b7d86e9be217a7cff4dc0e35d2f7190d6ead515322f0f4643441f6b46cc3ef06e588869bfe61ea93db7e7a6b8d83a2b1c20
-EBUILD kde-apps-meta-18.08.1.ebuild 714 BLAKE2B 32ffba5e5a2cade7fae5a2ee06ca245f813350412e257eea8517729c06acc1404f4fd50bec458fb5422c352d82e92765d7bf9752b86731f47b82f358cbc5963e SHA512 4840e2c4ac65f5b9688d6dccf69982716c01622179bad74db168bb9f8146efd2e7ba5729d14c7a360744d944394086fdb59315fd6074ae418b6fb530021b546b
+EBUILD kde-apps-meta-18.08.2.ebuild 711 BLAKE2B 87174c54abfa4e40dcf86d36d8b683b0cb8f0effe2d5e2c578945bc6f77950f5eff99be15ca55e85c4271848edd296a07683c0d2fb7daaf3ed5efc6482d37fa4 SHA512 9ea08ae026782bd5519522c99e1f1c5eba37ecb2d9c8e99d4ca8341eb99b3b2baaabd219634792070cbe05ffe9ecc37133d4c7599a80b6a4558a12f8b7c0cf08
 MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.08.1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.08.1.ebuild
deleted file mode 100644
index e528dfd0deda..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-18.08.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=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-apps-meta/kde-apps-meta-18.08.2.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..5d8ad60cd02b
--- /dev/null
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-18.08.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 655b740c6ca1..4561043091e4 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-scripts-18.04.3.tar.xz 377672 BLAKE2B 462e59e9782cb82719354fdfe1133a68aee6b9ae27661eb55fca1b36409b313057c8efc64b6dfe73bd2cfb670990b9abd61cf6d327d4883519a4bca0c1c629fa SHA512 270afbe47f0f03f37acf23046ed1d1c09d25a7b12d8704fab27e5f1c181d42e1609dcb257a28fa55813b1f8ad7196afe67523a188a057bc2e98a080f10b5299c
-DIST kde-dev-scripts-18.08.1.tar.xz 377816 BLAKE2B e38d90f496065d401324d70b8318585a95735bbbaa69e6b4a4896b4059a1dec1b9ae286efaba456a027fd8cea00aef3c1d3338328c084f2be0b67cfdaf8d1751 SHA512 ca784c06004ac2a39db75e245515fb73ee348d138107dbd237b5626099eb3ce68a08e0ab2e4b3399a545165e0f488a67dd5f54f3dbd2c3ab2dfc97ae6248f148
+DIST kde-dev-scripts-18.08.2.tar.xz 377768 BLAKE2B 4e182542122e7651287b58c7794061d5baa7fc0431c671e863d6b904e53d1adbac48febf0ecd740a9be4578715572fba9bb957d78a655c35a1aa5e93f92f87e4 SHA512 07136089c2128da39d6dcb20a074df34a1887b0233d5ce25574dc8c2b14034e0982278a69592e831b1606e797fc2efbf0a1f9b0f59ef832420ce237c8d341369
 EBUILD kde-dev-scripts-18.04.3.ebuild 578 BLAKE2B 9449129c76d4f80488dfebf4536e575c1b29770ab5605ad2f271a0798eed4749f3f773754d881ea4c5234a53eb9f0d5c373696d8b30c2d7a92bcef70c6bcefed SHA512 a7caeff730912bb7805c61987203e5f2fae1b7c994a16271d9bcad01ae741b3579d092309c6a25e334c1801a16711cf4b9e0cf24f40d6039e6e2522e6c39d836
-EBUILD kde-dev-scripts-18.08.1.ebuild 580 BLAKE2B 368809e818a99848f0a705ef0eec0939a7277e0e7a1606ca239b230fc3f629ef5b737089ceefb693a8adc931ea318f2cab4713a49a4629d90563303d4cc6ec9b SHA512 cefe74b979f7a9d9f13b9a2057a7b46a726626968f70845a818c2f7191d327915ff1e016cfb52df598e72b15ecdb48c1910b977c46981f61a135437e89a52d75
+EBUILD kde-dev-scripts-18.08.2.ebuild 577 BLAKE2B be41f93da1f0ffc31d1601e73b1373ecb53e8efe456554a94fb589c65562c7d1aeb4fe741ea34c3acca034637934212432fafd923d98038a5fc2cca8b9a0fa00 SHA512 987f8607fe745bac9d20d464b70750d9c9e7499be3728fea6f9c78768a79f4334873dbc08916f400b5c48753bd39726ce9f67c4bfabc454a2ef70db5d7477a6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.08.1.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.08.1.ebuild
deleted file mode 100644
index 8f878b4fe584..000000000000
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.08.1.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-scripts/kde-dev-scripts-18.08.2.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.08.2.ebuild
new file mode 100644
index 000000000000..695a6b13ea52
--- /dev/null
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.08.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 6121dce70034..e25409512d92 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,6 +1,6 @@
 AUX kde-dev-utils-18.04.3-ki18n-5.48.patch 826 BLAKE2B 7b1bd3b9c427603070592e795b6df82d9ff015c717909c3b464844a4ac14ed6ef42e7865e9113240a95ff56cc6534a554f71e4ad98bdfaac8e094e81a1893b77 SHA512 d5c3206f47a8b94d3bb11bfca15613c3a2d7681c46bea68bda00529cda5ed16ba4dcb6648726459c18a980832c765e6728481e7e8403e89aca4d84ef7cbcb36b
 DIST kde-dev-utils-18.04.3.tar.xz 61300 BLAKE2B 4c5ca2a6e813146390eb65f6a4e78adf9d70873e8b97458a99786aef1892ba86864280f8e9f4db9b68b28ac17f4297362f85f96eae92294b9835094f069e7bc3 SHA512 585c9d4e7bc426fb758bd352eb1e34091bca3051fd7cd2b29f79f05bacee8804d4a794dab1d4e2329dfc3379b01fb449f406589e4010e1f2d1d065c201f81646
-DIST kde-dev-utils-18.08.1.tar.xz 61560 BLAKE2B 58ded9072a3175092c9c194fca74ebc9cb06251c4b182a208840204a67b204fa9508345ea1e4215427f325ad34d91af432018925252b2f10913ddfd293242a5b SHA512 fe132906a6483c686b3e96fa746886442701ec405c98d8528e9a77c9813feff46dc6c44b64c66610ddca91475e095675b1de3ea5b05879fa72928428bb4070cc
+DIST kde-dev-utils-18.08.2.tar.xz 61504 BLAKE2B 9251bb559edcc12d284dbb060f29bc7fb7853dfff03abcaeeaebd48d8b1d250c96f9947c2cd42f15a32ee6a0ef5ebb100c91b6225d73d7be6b29b800a31557f2 SHA512 042be0f652fda77919fe88cc68016b8dac64aa0350188f9e833075445694be804fb972038657c36f5bc170bb9ac07920e87b765a5d5d25ec27e083912cd28cc9
 EBUILD kde-dev-utils-18.04.3.ebuild 695 BLAKE2B c8f18f9772edfeeb0c431ccf00e5db163d0d28d9918696be1ab798f857f42685f18646a81b262b2ff963d146beb83b3065a449c72f55bbf1366a49dbd9404f8a SHA512 c86372cda9db57d9df3c4fb2ae8f3987b330f781e195d5eefe7f44e528eb031db2783af2e33913258dabaa339185638349d9533e585b9f6d58abfac24a3c9542
-EBUILD kde-dev-utils-18.08.1.ebuild 648 BLAKE2B 19217c351ecc0af8fa5caa88cdd12ca5ab246208a3b9a62d6fd414ada8b526da1fe805722096f977ccad904650a88cbe1dd04c0aeb5d8097d0d5c83dfc9f78dd SHA512 855dfc8e3a1cff2a81a73c1e4dc2d346870d1324c16fae618ab05c3b4d9ca1834b2c5cda2498aab16a74bb07d8494fbed2f20445702944abbc1094f50bb3a29b
+EBUILD kde-dev-utils-18.08.2.ebuild 645 BLAKE2B a2b68f68cd1e19f0ce8f8428ebd1e0a918c4559989ca4c6b4b719951ea857061a02c0b452824b6e74248608bcabf83c02eb71a65b98b3b4533752462f8b5268e SHA512 195411898a486328f7aa1d23366b6df62b6676dec27241e84cdbccbe1428bdebd8e9850c8de893ef719c6dbdb8aa5cd6a45c0acac705ee75443a681ef1cb902f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.08.1.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.08.1.ebuild
deleted file mode 100644
index fd428260d4a6..000000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-18.08.1.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-dev-utils/kde-dev-utils-18.08.2.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.08.2.ebuild
new file mode 100644
index 000000000000..7f9d6120b84f
--- /dev/null
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-18.08.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 38575fbb188c..de4a159a2d6d 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-meta-18.04.3.ebuild 323 BLAKE2B 50ad12fb1fa077e45f7d87d15d01ab510e6d41ee4d7686830906784c17fc9b742f75d591f37b6e9271b9de3b79b6d463d1837c0ffb059a1b5612997be88e1e55 SHA512 af6bd77fdcabbe77fd664a4da5cde15c790b1b3459dd04aa747b612f12a6953d2030a9c8a0143f3699d1a029b1b463c54be0b61c5b9268a5735dd3a6ce35e885
-EBUILD kde-meta-18.08.1.ebuild 325 BLAKE2B 7346e974fbc6478b6f5a4d315f22b039c298240fd295d8e2c3bc0dc8ef2588f4f33ebf7297a1dabdb6e13fb827d9c1492bcd92dfe33e801a32f6e20e383c1a53 SHA512 63388dfb92585daa39acb4edd10c0770ede4c944680b18d16b69a4bb0c3ad5faee718f232289ac517da14676780920ebc1a04cd2c3ea443dc4a1a4b6c62ad285
+EBUILD kde-meta-18.08.2.ebuild 322 BLAKE2B 8d2dfceb0082510fcad0c4f7005f36e28cddddb563ae660d1b4ab7e7ffbcebc4f4634435277584e3f229fd33f2cb81a1a8dad441e1078b1c58e8a51627d28aa5 SHA512 670dd6a417aa9a80120bcf3a2a0f7ccb211fa1ba2054025722bbba4eb0e68423965c8b019d199a0dcc1ee93545f6207e446a40007dc18c5b8ed322aaaf057e17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-18.08.1.ebuild b/kde-apps/kde-meta/kde-meta-18.08.1.ebuild
deleted file mode 100644
index e986cfd70609..000000000000
--- a/kde-apps/kde-meta/kde-meta-18.08.1.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/kde-meta/kde-meta-18.08.2.ebuild b/kde-apps/kde-meta/kde-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..f819f9b194dc
--- /dev/null
+++ b/kde-apps/kde-meta/kde-meta-18.08.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 825689f7279c..1ef3f09f756d 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeaccessibility-meta-18.04.3.ebuild 356 BLAKE2B 670b57674d38cd325e3116e6cfb1634827f67526a7a7d43045a4477db227199dff1d21740b19a386a295bdefada351b1320ee969a9ead23bf7431a25f7c6ee9d SHA512 8813797ed8f108a321eddc24c98f2e73834c1aedb4cdfd826b0fc30e66edcb5f55b468b840448be613669777d7223333d22c34d755b44ae31d4a5096099922a4
-EBUILD kdeaccessibility-meta-18.08.1.ebuild 358 BLAKE2B 3985014c80cb5c3bc775e122a8432bb1d2794d837d90178d49123fb6df37fb955f862956be9c41844e163344a317d2d0af46725e0cf5ef67f03daf84b14244ec SHA512 6440329116502f8f4e04a34737579fe3ba91a9fc9fdc8dc45ee37bbab585ba0086876cdde4a326c323ec8b5a791fe6a045bdb349d210d79289507bc6d84b016c
+EBUILD kdeaccessibility-meta-18.08.2.ebuild 355 BLAKE2B 5793feb42d2cb002de4174fc33bbf2dfda111401a4c4447003d5a941f77066ec410c19cd9d59371f86c77a0457c618e0c6f95c9a2deb03dd1dae359b98f8c914 SHA512 80d39f5813108ade4ebdfb9a09d1177afd77f986d362e6e6c62784eccf5cd05becc7311f560cbaa542ff2b8f80a7fb716f74edbcf7b3e8c363f916d675375dd1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.08.1.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.08.1.ebuild
deleted file mode 100644
index f9f04c8582be..000000000000
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.08.1.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/kdeaccessibility-meta/kdeaccessibility-meta-18.08.2.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..8c927204963e
--- /dev/null
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.08.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 c7b003f6a267..e2a33ede7765 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeadmin-meta-18.04.3.ebuild 346 BLAKE2B e02288f4f94c2cfcefad4805143e8256ef440d6227a1e77ed4b338fd11c35b194932e416b9539103fe55ac60408d4fc5bfad953a7bbc550f47877a313f6c562d SHA512 89332ce2348e6105ea23a41ad6299cd91eef4d232add22e98e8bbbfc29c7f28be81e90e56fd14a9f10872fd21a72984eb9ecfd273c663a07f2d36f19bda76aeb
-EBUILD kdeadmin-meta-18.08.1.ebuild 348 BLAKE2B 219e53eaea47534f1da3284a67db0b3b3276d66f17a503e2f63fea13a4488549c0e87d8edf2ac54ee0fe210db5b6f66c3cd1b77695848e674b8707a407d09eea SHA512 2b0e1bb6625ea97eb83d074ffdd7d824a45a3fb8cf5b629447122cf7bc4b3d9e2bf99b56095c75a7df1313588007cf8e273785096efa5f6914b0d2742293cf0e
+EBUILD kdeadmin-meta-18.08.2.ebuild 345 BLAKE2B 5205566bc5f8a6afa98710d9d5ac1cefe8724535420908af0e1e971c46af3ced38c388b1e1d9bb00a1d97fc777a40f2e05aa8c66bb11fd18315b05c5a4868be1 SHA512 e934c11312db226c00831142e4ffbbc21f81c5bc53cb2cc63c0396c2c2f2d4c5686d48c54c6adf057613aef9c395c205bb2f655f9d69e50e1757d0cc55e883ac
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.1.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.1.ebuild
deleted file mode 100644
index d87b170fdc44..000000000000
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.1.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/kdeadmin-meta/kdeadmin-meta-18.08.2.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..0c2139b095f6
--- /dev/null
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 b553153fbf96..29d5159dfa3b 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdebase-meta-18.04.3.ebuild 327 BLAKE2B 279c2650f074343a4ee5c30c3fb2cf145c4e017c0127f4c7e2ffe7046169b565addbb5fc14e7538b38e96a6871d5846b24ae98d0d3cdf153b649d684fb3a30f7 SHA512 c8fbb53ffa1784e26082357b04e3ac25a0a7a93dc490bcdb4e618181a53d545fb7093877b1086933ca0a9a8e3da40f23d1c7c587e793804ef3f23fdbd1367de1
-EBUILD kdebase-meta-18.08.1.ebuild 329 BLAKE2B 304a36e03db7599e610c961bd51291db1a4540ba958c47788201a3a278bf2f3524dec8848e8af4c9d90a55f4150728af9b03d0785fec6642e57ff2f5b5252a20 SHA512 b96417b6b44a56cd3c46ee998588ad7b69ef99893435b7dfb58299c55383381c252541dd8df88ec08caf55cc9ed8878c8f953e5f5440bcb042a2380d54ac208a
+EBUILD kdebase-meta-18.08.2.ebuild 326 BLAKE2B cbf66a1acadac919d8679b19f9033a3b955fceec900dbfc0d964835bf823e649659025040ca781e16d333e746470a764333d4b1dea00d9dd56f6bfb0b4d4b51e SHA512 e98ac5ec608a85e73cb3b67927dfa29d00149d48e948846baae8d9e705ee9f285f81502bae0c150689a77dee10fe5562ab33d70c6ce1e6689dd5bf7b5dea956d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.08.1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.08.1.ebuild
deleted file mode 100644
index 37f06d26788d..000000000000
--- a/kde-apps/kdebase-meta/kdebase-meta-18.08.1.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/kdebase-meta/kdebase-meta-18.08.2.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..07a1b900d353
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-18.08.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ac15beeacc7c..724a26ab1f39 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
 DIST kdebugsettings-18.04.3.tar.xz 51832 BLAKE2B 58254c1a12262674e5d2ead5deb414a8060fe19c68dc004d704d72ec57de5f48e91bd878ce7fa827e251eeb768767c615f5b956454a6a98bf7ddf6dceda2fe18 SHA512 582dde5bff461355ba5a2d2173e5a94b129cfa9fd3db6bd70471f1b8f92a0d03df45231c9b69c8c9eec78865b2e45283a3ffb00f2dfd41c88e57003730430023
-DIST kdebugsettings-18.08.1.tar.xz 52516 BLAKE2B 2bc9c414de742ce9c7863ea634eee217f6438652d36ea10c8ecf031723e9cf768eef1bd2f0079468b06d384589c2864fc0f6adeb9f8dfe6f195db73d425db640 SHA512 4f3e081536415fcf121b3e425935c5db2e8efa6cfc7e25eda91b846ee3b7332e6799afcd779c08bfa46e95934862de569c8e29ca95ba052f14a4b92ab0da7559
+DIST kdebugsettings-18.08.2.tar.xz 52532 BLAKE2B c470a9d144ca382df1abe4a7d9935bd287eb551eee0898123b48bf79b9193a697942c5f450df258f62e45cab6dd7547644402e64490655f80e50407574723abb SHA512 9fcf13caab0edab61820bf844dc2dac67643ca936ba725e4be4513f87a2b06ea7a7e3915a2932771c45c169fc75fec9061e1fdf520abf7432e772e4dfcb43a6c
 EBUILD kdebugsettings-18.04.3.ebuild 595 BLAKE2B 23e604f648131c3c51d620b8133a1494c1466ff0883ce2037b10fdf402f819e2a7f0b0ee236fb2cd0fdfafb47fe9e6f6bc6eb4d96004d4e7eb63a7fad3ef7d04 SHA512 7facddf48cd39adc8910819bac603a5f2ff784a110364affef27c3c0b8944c36ca2ebea2b89de6a96e7736dd494eaf6a3bea9bba43aa0de063d04547ae8e39f0
-EBUILD kdebugsettings-18.08.1.ebuild 597 BLAKE2B 7979b21e081fbc1dbc93f1108c882910f664af089d6190ef64caed247becf80201fa9190e312557a394fa5f75d8bae8d0187ae6c2ca365870476037291de37e1 SHA512 a3a45ae47890268b8249159f501cecec3df5b6764123cd48ecf90d3fcdad9a5f8f62482f5cb5bb8fdad41550bfded040ec829fe710aad5afea3f618e74adfabc
+EBUILD kdebugsettings-18.08.2.ebuild 594 BLAKE2B 420578dc0af5e55c7d2882ea6e3024542aaca5fcb0871d4cf6201e2046534d56ec399e34261c86479cc9cbfdbb6f1ac2f36c7db271bde38f8e5b78dc4cff1c1b SHA512 974b4f36fb6c0ece0f5777bd8d6a247c1c99eaaf8c5a8b55e4679a4fd1d790544a172aed40fd233c16e71cfebf9d5443a864ee90c77318f8ff769354da35dabf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-18.08.1.ebuild b/kde-apps/kdebugsettings/kdebugsettings-18.08.1.ebuild
deleted file mode 100644
index e53b5a97cb69..000000000000
--- a/kde-apps/kdebugsettings/kdebugsettings-18.08.1.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/kdebugsettings/kdebugsettings-18.08.2.ebuild b/kde-apps/kdebugsettings/kdebugsettings-18.08.2.ebuild
new file mode 100644
index 000000000000..8e09d0982935
--- /dev/null
+++ b/kde-apps/kdebugsettings/kdebugsettings-18.08.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 e6af81bf3d3e..2cf7ee7e2b36 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdecore-meta-18.04.3.ebuild 564 BLAKE2B ab892f36312833261e1e698df5d0b79a04f340189169b59d93fcbe9c00f8fe6a50c80af09260675600080669a8c2c444307a946ae934914f8140fd429ad242d5 SHA512 e0a096c7a226d6ebec34759d4cba1b06531be6fdc553bf90fdeacda8f30dd2570fcc0bc112a7acd6c877a7e3a3c44406d1050cb985948ca5ceaaf96af8acdba3
-EBUILD kdecore-meta-18.08.1.ebuild 544 BLAKE2B acc9ed4d7f7794b2783dfa4d11fdaaaed0b1cc0845f681fd2471af779a566dc6db8600e692574db333a3149694d95d7e4dec8db79dbd13f0433b63eac968a016 SHA512 1a8396a52e721455c4fc5411904b86d89204ab0365a1e9b37c4d1f32b6210c9d26ab25eacff5d6203e37481b0bd2dfe84d7c4c6e4112de23818121cee12f6b41
+EBUILD kdecore-meta-18.08.2.ebuild 541 BLAKE2B 1e1dcccc525dc571747f6c51fd5c215c8d9db1adaf1a21faf62a74f3c6a967a4362d001f22c549ca7a46221db9a6bb4264f4459a46653a436bb3b5c1207e3939 SHA512 e3b9b0d3d7df1a7d78617e11c3b67ee88fa2bc6daa40c249e61f15b5a04a466806e552b34e894c59842113dc6baad1d006f8408cfdf6437318caad232af03fe2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.08.1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.08.1.ebuild
deleted file mode 100644
index 562fbced7491..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-18.08.1.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-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
-		$(add_kdeapps_dep konqueror)
-	)
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-"
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.08.2.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..94065acab4a2
--- /dev/null
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.08.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+		$(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 6433283bde4b..7e4cb4bf2449 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
 DIST kdeedu-data-18.04.3.tar.xz 327812 BLAKE2B 7bec203b7f40c6909291a3c31f72b768e46b32a9678106cadfb24c7872670d886c46a85a21c6dc071c009e688012235872c01db9a46d9cfff9c299cbb2763648 SHA512 aec7224798e47c257fd4411a6432689a9a583262a32f875895c6205a276c8af3aa2ee5d57ffcb0b725334a3cef3982d85ad2c61d4b62e6b2f211a7cdfffeda26
-DIST kdeedu-data-18.08.1.tar.xz 327996 BLAKE2B bd0ce4a40617b2623e03d7b27373e3518ed43d8790b1d9017fafa43b11e68d84254e727fdcfe50c8ddfe23fd46033c5af7f2f8ea16884f0b3b0f88e72de181fd SHA512 33f6f981b8a304893fcb8046dad078b51a02cfef57f9d024e170ad469acb7509ce9518061f28d8cea6f971af44a16f0f1a72e5c742f2fd0e154dc8190ac4063e
+DIST kdeedu-data-18.08.2.tar.xz 327856 BLAKE2B d49a74a22dfb695e08c894bc9a144676085986e6792b48abf388c8b1e80b8fd5b56bb037b54f1d252ac0bcea3257566bfc57b17b1da6f124b64fc86b72749546 SHA512 a844a522b1d4ff5fb32bcd9a80f0559a19950a9f488dcaf02664d341e8264eabfe4fdf7b720783792a867ca2db989d490032790c37da073c265372c8af1063a8
 EBUILD kdeedu-data-18.04.3.ebuild 410 BLAKE2B eaa18f5506043dd8df271fed9fbb0745270caf4ab9ca37dddaea6bfd86febe3145e9eda889a1869c0dbb25c276262c81bf4f2f4a7da457a14cc78af7bbda98e7 SHA512 8f1472dc7549a96e75b1d2de05bc4c72c9b908c41c8a7a7fb5decf85b62366914551db39eac1414c2e18c69f134f8067ff086e2d00f47138c2b19877e3656f09
-EBUILD kdeedu-data-18.08.1.ebuild 412 BLAKE2B e3fb9aa2e25a9e485228fc3732618b52bdad72b4929c66c39128f4b3891d30760c95811744dba4fd2656d338201a9a5521e41a222607583fd14112786cad1f18 SHA512 8ab82ea007618d9ace59963319bdcf2cd58ac0e4be9bbbe6027348b357b032ad94f311051e73674931ff27f2f295c9d9b198d2aca6520c0089269c404a0a81b1
+EBUILD kdeedu-data-18.08.2.ebuild 409 BLAKE2B 5ca5853bdc7679fc4e31c3e41ee167e17318aab469a331a5dec685f1d66eaece62214df957035267d63c86f1b7a60bbeefee29811ab34be297fc292edc65921a SHA512 cb85ca0e6f84911f0cfad089dacaeb6cd193c68f54bc6a0c3709acf47bd52b1ecd01b87faf5154a075a3df6005832bfbb8cedb204b7530a45ffa5fd0c566e2e6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-18.08.1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-18.08.1.ebuild
deleted file mode 100644
index 0209c5857d99..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-18.08.1.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-data/kdeedu-data-18.08.2.ebuild b/kde-apps/kdeedu-data/kdeedu-data-18.08.2.ebuild
new file mode 100644
index 000000000000..1e7c7461e834
--- /dev/null
+++ b/kde-apps/kdeedu-data/kdeedu-data-18.08.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a3f72d3ae838..8d4a7cbbc70c 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeedu-meta-18.04.3.ebuild 1044 BLAKE2B 1d20c11f4dbb093f4822dc84c36baba673e4f215dc770d8414654c6298f90d18f8082f4f51865cadc129a3d1d472ba70e64ade7985a28c256984944bdff564c1 SHA512 bc2217d651699fe4306cd9a30eaaaab0cf59a60cfd2da06e4e0494910b54fe520fca5e7141b0a5d325f770a6699cf8b7a3331ce29a967ebce43f17d1ca1926f1
-EBUILD kdeedu-meta-18.08.1.ebuild 1046 BLAKE2B e34a041df367563cb5062901806730bd2e24549810a9c4713e24ffc5f67f66670291f209679384e847e55282a53e30584d05b4fe27abbe61feb238ba8b8c4831 SHA512 e66fc5641a1a77ce3943edcc95e30c640a067354c43091cea852ff30cd0ab6306e0e07419b86e0c3a1da4fdca97d03605deee58043a14fce22e52388cc871b8a
+EBUILD kdeedu-meta-18.08.2.ebuild 1043 BLAKE2B 9cf1afae5546954e78d86e284485dc952ceac81304788f53be65ce0ba779fa8030112afafb1131fe472b3ba207971c9b315db47880eda95d8bfa4799926e7025 SHA512 fb4453aaecfd395e62706d27779d42bfef323761e58d2537fc2eb438820b98def9f94684b1bb985b60f52d59844cbbc6f01b35e4be59a077f635c2a01d01b690
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.08.1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.08.1.ebuild
deleted file mode 100644
index 8c2071918f47..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-18.08.1.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
-
-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="+webengine"
-
-RDEPEND="
-	$(add_kdeapps_dep analitza)
-	$(add_kdeapps_dep artikulate)
-	$(add_kdeapps_dep blinken)
-	$(add_kdeapps_dep cantor)
-	$(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 rocs)
-	$(add_kdeapps_dep step)
-	webengine? (
-		$(add_kdeapps_dep kalgebra)
-		$(add_kdeapps_dep parley)
-	)
-"
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.08.2.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..6f25f9925dd8
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.08.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="+webengine"
+
+RDEPEND="
+	$(add_kdeapps_dep analitza)
+	$(add_kdeapps_dep artikulate)
+	$(add_kdeapps_dep blinken)
+	$(add_kdeapps_dep cantor)
+	$(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 rocs)
+	$(add_kdeapps_dep step)
+	webengine? (
+		$(add_kdeapps_dep kalgebra)
+		$(add_kdeapps_dep parley)
+	)
+"
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index eb642651c59d..2433f83b3e0f 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegames-meta-18.04.3.ebuild 1512 BLAKE2B 3a5f0d6dfb9135330701276aee09b4e5400ffadc4cb6879f1df0934a6c0553ebb52b86850825bf055b212a08de4b66640dfb9970cbfebefbf497c0962d754fde SHA512 dc97ada20d5b222a9bb252ad15e1c6c771a5bd20655b4a7874ca92d7e263db7eced138eedac778992c7bee28f2000dafbbbd3d8cf8b5facaee35b4d61b36d81d
-EBUILD kdegames-meta-18.08.1.ebuild 1525 BLAKE2B 3097d7310ce60cf04f9100948dcfb5995037ed7fdde49739303f65e7cac4f6691315b5b4103f8c259ba9e3990e703bb2bef0dccbdbe4fa356aa758b9ae8cac53 SHA512 bdd4d0a4cfffe202ddcecd66ede7e18ea932c81922474bb8af185a033e3e3cd5c206e2f70026cb06a74db05be0c25e0bf5515cf215a8971745b92fc92b5db8c1
+EBUILD kdegames-meta-18.08.2.ebuild 1522 BLAKE2B 77a5978976e972bbc4f339ac90f81836dde718e4b44bfb25a4d783b2c135f60d36992d056f7f0aa4f5f82b111b1dc5c8aad5b542f4b86cfd4c676ae63d6b2c3b SHA512 905673e74789089bcfb094cd6e33adf7955be582a250b43d7df205d3d1ce06e095ab84b08833b7d6cf6679f4f5b095bc6108c6d2ffa9ca0475904c755326025c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-18.08.1.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.08.1.ebuild
deleted file mode 100644
index faf12c40f39d..000000000000
--- a/kde-apps/kdegames-meta/kdegames-meta-18.08.1.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 '' 18.04.3)
-	$(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/kdegames-meta/kdegames-meta-18.08.2.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..0c65fbfefd9d
--- /dev/null
+++ b/kde-apps/kdegames-meta/kdegames-meta-18.08.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 '' 18.04.3)
+	$(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 381819304c73..015d57412dd7 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegraphics-meta-18.04.3.ebuild 765 BLAKE2B a5a9d2bd8dec75e23280998d581e2359a827ab2b387ab6f2958e1839e62d7c2cf49763099824748b69cc27a894ff349892abcbf492be0d9d4629992bce3b0c9c SHA512 76ff544e418bf64e34d1ecf2034d13ff6ef37c0f107bd92d24d52b85208bef19bfff1c83f90aab64da143845a7438e0223ba52d8eebd1422e55286476f19a2d2
-EBUILD kdegraphics-meta-18.08.1.ebuild 767 BLAKE2B 9164daff434ae0899b3062ddb99474410f11b27ffadecdc0e7b284092f9815ea0fa7a50b114fbcb2e531aa759ccccbeabbc4a4ccc236c00658cf5fa35c1203f1 SHA512 306603582c97ba1add3cba677bc33c58a6e3ba6988f5769c36b63b059f3b3beb98d0267b5e117ddf133d7033900119938300d102858a0478bb9c95def3d0689b
+EBUILD kdegraphics-meta-18.08.2.ebuild 764 BLAKE2B d9808c480b4a60a8ddc5eb743dd46e7f7aa703287a170dd2733dff505cef4dae0b0f05e7fb564bdc2222c6fc0c714e7d3519975e11cf1ea604ffc563a84bdd17 SHA512 5c7f4db47e5f5362ff7ec67830c505a57f490b4a61201e99f2a01463758496d94ec9b99997c6409f4452825d0b6fcbd1007edbea06ce9e341dc60d4295910c49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.08.1.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.08.1.ebuild
deleted file mode 100644
index bff71a679d37..000000000000
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.08.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
-
-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-meta/kdegraphics-meta-18.08.2.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..ed9983919284
--- /dev/null
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.08.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 4a35ca43b6cd..cbeb93beec05 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-mobipocket-18.04.3.tar.xz 13476 BLAKE2B 33b49885314b1e531c690a3d9873272b5f73e8cc23fa23524da07a48917f6e08a32f8fb840270941419b7d8ebc36cef28004b8ffc9e034abbaed8d60df1da98f SHA512 e475c7425bd9be50e5e28409ab0661eec7f33945ebb0a1b5fe9ade06c5b14d02b74a7afd572145049d1412a22a5cda12686039bebeecb25ade4eaa54fa307cf2
-DIST kdegraphics-mobipocket-18.08.1.tar.xz 13472 BLAKE2B bcb986208bf738bd96189bca4c2456217e21cec0b1cbfa6f910bb55932db19407f0baea62b371a2066f84c627b13a23affdb94d64d8962d3f106a28cc265dfe6 SHA512 ef71c98dda104910562de8dc58a8e3e862b5d298e75c8c2cab857b374be23132691a453f9dbdb60f900cad27b075ad10531b8dcea083ef25c7a924616d0e00bf
+DIST kdegraphics-mobipocket-18.08.2.tar.xz 13468 BLAKE2B 3257c864cf2b01c77253ce5364a8c96a10ea9338f27134bbadfbe0e95ebb2a9d69884ebf0fd5427155db7e20e1e0046c8ccff9f753d2975cef048f84e8da5454 SHA512 cc8653a7e2a981ae9dc035fb62ea8dfb8cba06306068a2608a6fee3c790ddaf2e8e3f92aa1b880dfdb1355c6e6267ffb96dee1c1e1c13364cd34e43e0aee7eb1
 EBUILD kdegraphics-mobipocket-18.04.3.ebuild 422 BLAKE2B 6815ff8abcd82d201ccaebe992d7df276ac95c4c2474fb04478bf73092158c0b532157f85275842fd9b5400fd9f10bcbcc32e1c9b9fed2e37613dc453d31bde0 SHA512 b0653f84cf4b6e9a5b5c517268e728f84610939dcd17f5d6ed52f33140aea2e3030394b6584b4437cea46b27019e10f1792a6c35c6eec0641959fb5e4fa1d4c5
-EBUILD kdegraphics-mobipocket-18.08.1.ebuild 424 BLAKE2B 410d921f6cd5cea5db6e26634bb6a07d04c757e4f2497129722b1d4fa910189622fa90d4559aeee5e24bc097d77dc84401a9a307219b66937dd223f684ca67fb SHA512 5b3be652468b0003802063c8f6fe0da42d41dfc4fee9d0fb21ac0d39e346bff441e38b3cfb24b398d58c830fdf5fa6cc9d9aece1bae53cad4c6951316c33d600
+EBUILD kdegraphics-mobipocket-18.08.2.ebuild 421 BLAKE2B 31df842e00d91385b4f3babbe5ffff0845ed6de628988c18fc0663ec22c6fb08f84331a9673716dd141572354c383cf0d1f4f74e8f27932e93799490747b98fa SHA512 5c4ff41f655b7a84db5e54aa0ea38cb5acbfd237696afa3ff71f5809fc5f2d03aaec0c2fe1daee26519c1247e387a82e0cf47b1e27d1bc3dc1dbc78769810a81
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.08.1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.08.1.ebuild
deleted file mode 100644
index ec101c11b41e..000000000000
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.08.1.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/kdegraphics-mobipocket/kdegraphics-mobipocket-18.08.2.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.08.2.ebuild
new file mode 100644
index 000000000000..c8641b807ab3
--- /dev/null
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.08.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a6026f24ee48..990da98ad2d5 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdemultimedia-meta-18.04.3.ebuild 735 BLAKE2B 68ffe03a692837927bb3ad434eb1feddb4d68a0b7b6594777a9c423467995411a6d9f5bf6d5ab020cda3472743a49e07a64b39cc683c0fdf187cd1ccdc8d3fd2 SHA512 df3c03c90679791c85a5c5f05222f1081b4b6245eaea41f7047efc54f08be655fdf9e105295de36a6c5a2d8491422c29fb8708c61b888bbd3636aec5aa77bb5a
-EBUILD kdemultimedia-meta-18.08.1.ebuild 737 BLAKE2B 0dc7c6ad9bcaff2b6bb495b2486ca5951abd42e78cbcfe3c507280f1dc09517b3d8fb9305875a50345be0575a8c166369a97b6ae0e7c4a7ef4dc52cb213b8ccd SHA512 91cb69c63e506fd5c0de38eadcda200fe74cddb2368819c0ed86208f8c5cd4a0d0fbb646426f498f0f2838ba31e5e98a57f96db745a732b8e4f491d39dece0f5
+EBUILD kdemultimedia-meta-18.08.2.ebuild 734 BLAKE2B 25b892104112016c2287ed6df15a5f246c83df2463d358aba64dab584e6a3de89dc4858bf59644e394bd6ef764beccfb844ffa5002fd47f0bc8d34393bbefade SHA512 54e8bb35cd467c5f849517c1aa4462547f3de92a8f561565db288351740b933f68790954f9644158d7e530d7b5047d5435bf3d64e5ecbed0f3a6b8db407ba4af
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.08.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.08.1.ebuild
deleted file mode 100644
index dfa492d4c212..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.08.1.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
-
-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 gstreamer"
-
-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) )
-	gstreamer? ( $(add_kdeapps_dep kamoso) )
-"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.08.2.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..5b7072afa0f4
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.08.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 gstreamer"
+
+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) )
+	gstreamer? ( $(add_kdeapps_dep kamoso) )
+"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index bb1019a5769c..3cd3c6a7f11b 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-18.04.3.tar.xz 324004 BLAKE2B 41470dca8d8a0e9eb092445a5d32c2ef655b9f64e14fcea46b96c848efdcb69471cd184edb321860ae52ad7e222ca81aa8218e5e05d81c523f22834d4910ca9a SHA512 f9672ac750a9b6ae05f0c3b9c3e340966bcacbf906c130ddabae6e7d62f5b67838e5183cc772b676c9a314b866c563d82e079c4e59cdd1339d550a1583a0df5e
-DIST kdenetwork-filesharing-18.08.1.tar.xz 313084 BLAKE2B 2f612b7a13a8b55754073012e272ec082dddde45bf5e6fc22cd105d431679fad598c97983cad0c7e12c5c4976ff6bbed46f72568c339bb614e2e29c59cf8288f SHA512 b1a0b2ac24d05add5b07c742f768476af1164dbcdcfd372e1721754e02f60bf4f90ac0061645454c0dd047c17e2532518f7e83ecddb960bb94844ae3b2736706
+DIST kdenetwork-filesharing-18.08.2.tar.xz 313036 BLAKE2B 122abc9b43703d38fc515130db44999ef4471436ab91e214fd0b5d793f9138ffb54f186f7f15aa26fa1249e35f4040ee8e64d09418b45cac189781f6853c63ce SHA512 57236e661d6181bd81298463d86f55e041808f85d5073488ebca9ad71ee112e92e0d449014bcd2ba142184e72db5d9bb8bbab2ac93701c1496ba83b241e8e08c
 EBUILD kdenetwork-filesharing-18.04.3.ebuild 572 BLAKE2B 38ae6cdaeaafa1047dddc6b3c303098db6343279be551b0f72f51b2cc324afb789e6db3ce575572f7b1b793d1e432654dd44f1b9eb337064c4d569e7389459d8 SHA512 755e810f11580ce3c59b3ee8a215521ff5eb7d97bb9d69ca8f0d6a52ac9d73c7ed7c5f6d1e8f1c2ce30cb07cd8cff0f86f219b00075e58f420a1324220f5b3d2
-EBUILD kdenetwork-filesharing-18.08.1.ebuild 574 BLAKE2B 62863974d57cf0fb799937edaedb2db6df3b483e1d803a7388fb3c24348837e264018608468ec9ef379d937dcf7f7a66476a647c15da43283c0bca9a580c5c43 SHA512 0acb6b4093aa0eaf193db4578e51f94ecad8ebc79ddabe531816c0f80cc245cc74aa51e0347d1c5f33c8db5d6abe9501a0ec51b01b9aab77744e89bdaad265aa
+EBUILD kdenetwork-filesharing-18.08.2.ebuild 571 BLAKE2B 9f9d45ce29c2619704d55d72883bd176d7205f83cbcbc758b84833c99a9eef4de97a2b37b9d3c7c17058f2631ccf1839ec03a695d611899951f2b4e599a831f6 SHA512 7426da52239d81daf34a5f7f2adede95415b9ac345bff541b219ed7bd4d1962f79d062c6c39567bb33fbcd8f0785566085d773d67036bd21f0bc6b499f9aa240
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.08.1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.08.1.ebuild
deleted file mode 100644
index 13f47494f491..000000000000
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.08.1.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-filesharing/kdenetwork-filesharing-18.08.2.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.08.2.ebuild
new file mode 100644
index 000000000000..d59d7bd40bf0
--- /dev/null
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.08.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 1ee41b093b14..e3c6c1280740 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdenetwork-meta-18.04.3.ebuild 511 BLAKE2B 0627b330695a6747c664dd26304985af3675be0cece5e42c9780ec34ca4be767f2d1854eb25f75042b59e2f4ce8f4266e8800f534be3b80b0bd795252ad65b55 SHA512 5b5f2f98f9bc8fc2b47a6b18356c169e3ad631e3aace2f9014b4641664d362d16b3d338cc3c1b27dd58bb7ee256e6966dfa691c3102b7502ac048e107d3a8df9
-EBUILD kdenetwork-meta-18.08.1.ebuild 513 BLAKE2B 6d7213059830c2624b7274aa5a7f68f6c8f68e791e3fb21dcba86fd8a30afc98b342ad7f6741d77f0013ca2d2b892a2ae8bddd8c99357d0adbf56aaf80e88a73 SHA512 b78a7765d1c786383b6c085f1c8f7397beaee2208f2f6950de2e4a861b9443f88a6045748dca1f9a41c51d78281fe1692fd9295aaa3804db0756264d5c0509c7
+EBUILD kdenetwork-meta-18.08.2.ebuild 510 BLAKE2B 7a498a0a179b9b1f22540446b6bc3e4b684c726b773ccf42a520343bd69ab0de6e386b3ceb171e6256f15d51189991b3e148c125ddc77cc16b8549b78f23c148 SHA512 d351396aba161ee1814d16d2acde0238730a768004007d880b59474d94f9e53fc54bf1f1796faabd0e9cc8f99a3d1b14276797bb19c8a75598c79efdce74165a
 MISC metadata.xml 410 BLAKE2B 8d98bd833e50db75f604cdb99878a614b28ad320b4a377b75897b7bcb6d0b95f5b2fa102661fc26474533eeda09e7cd5f8fe2131d0162f85b87c45a8aee9649f SHA512 049780b067ed1159cac1db34a6408997d614c74445b74c01d0fb3bca4beb46185b8bed2e2280f590501b44177fe13a5bf3fa090c21cfb5455b4e7a3a44ef1436
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.1.ebuild
deleted file mode 100644
index fcca5f5440b6..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="~amd64 ~x86"
-IUSE="+telepathy"
-
-RDEPEND="
-	$(add_kdeapps_dep kdenetwork-filesharing)
-	$(add_kdeapps_dep kget)
-	$(add_kdeapps_dep krdc)
-	$(add_kdeapps_dep kopete)
-	$(add_kdeapps_dep krfb)
-	$(add_kdeapps_dep zeroconf-ioslave)
-	telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
-"
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.2.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..53d2827dcc7f
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="+telepathy"
+
+RDEPEND="
+	$(add_kdeapps_dep kdenetwork-filesharing)
+	$(add_kdeapps_dep kget)
+	$(add_kdeapps_dep krdc)
+	$(add_kdeapps_dep kopete)
+	$(add_kdeapps_dep krfb)
+	$(add_kdeapps_dep zeroconf-ioslave)
+	telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
+"
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index fbe0236cf3c2..f495f92c25b9 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,5 @@
 DIST kdenlive-18.04.3.tar.xz 9399136 BLAKE2B 0cb0a172ea301695e5e8f1e11aa25cfe8a6a597c61ef2913691fd834f6c9f021a3f63ede54c3a2d13753e06cd0932681246db84831d979a1355faa94418bf37f SHA512 c4f903a2de7a44b743a87068bd54379f12af1ba56f19aa7a5820db58514bd2c973cdfddc05f89232304ba06da9a8e4437138485eff0d611138e21f4f8af4ed77
-DIST kdenlive-18.08.1.tar.xz 9397052 BLAKE2B 09bfd2fb5164809798a24d3eeca8b36648d8889fff565a0cb000e89e977691432fbff39cffd7c0b2734d901e737579a6725de1a2cc6b052c57f8a2b1e40c4d45 SHA512 737ebbb877c93a064472c82bda2ab6915833bb49442b9f36f3e3833d395dfa8608c7dff7dcea2816b25f7569025fbe810e8dd3c29ba96ee0c872d25ce9314bc6
+DIST kdenlive-18.08.2.tar.xz 9399120 BLAKE2B f371bd3a3ed3774c06e7d690f202f8e9dfba8424e1e2deda73801b9c2bca24907fac03fe0a64686c6719b252d051f159fa74cd1c5e1fd476d6e3560d1dfddd1c SHA512 e6b146ce80570120e5a6545ccf636f1b5e613c350cecb2d8d10c23de3c5943196b9d0dc58b1f8b3d8fc9625368bcf4b2ab8164e5e3572bfac46d330cef613f35
 EBUILD kdenlive-18.04.3-r1.ebuild 2126 BLAKE2B ac074cf0d3c79c1882784256cfe72e8762fb3f39c8a1dcd4b5c953ecdd1ba171ac44a406df7dc1959f4277da5f859a05262e1bd39e0969f1cb05d37a2c8a62a3 SHA512 e17e9a58e359e9d88b85f4f570c4ff13ac511fc36924b76b8607a649e6002c1243490f4d48b352cb4f5026dab5dc1e4c26d5968350146478dcdf2a221b26f41a
-EBUILD kdenlive-18.08.1.ebuild 2217 BLAKE2B 2391c63b82644b211907b734b3e5d0126652bd38aaef9ba3b90415165b058259f03e08211aefe9b5b541bc2d3c7d17f18114a29967a429a1a4fdee5c2e96c8c8 SHA512 a48a5aed341c8d98c78aca4b27617471299e9b32442580788510fbc643f291cef6ea846f5e52f04d58b13e74d8880857878b5ce4f2d8e323fe3acba03805e954
+EBUILD kdenlive-18.08.2.ebuild 2214 BLAKE2B ad3734bba3ef931cc1f2abbf1f8d5a2af682b60246e3bbf2fb1442c0d2d9fd08c86d543b574dd3a13350e48aad72bddedf875cb6154fe6d8749e1c480c55cf84 SHA512 d23d21d7ad9a49ac18ae5dd029818b3b38333c48fee76f66217130c45772fbb2ff18d28efb0a1576095c27056de4226b21a63508b416cd1e22549ee4a152dcc4
 MISC metadata.xml 631 BLAKE2B e31fe832d690c7c842a255697abcc15cf51546023a97ee121e918b2ec990e12555b3fcec1d585563c8bd75750cf84c66bcdab0d570d99c1ff85545753a698a00 SHA512 35e594ff05a23977e5f3944cff530c89404a4807db0f9a5f7454dca69de13b8e7df2cb18ec4a06292f4526fa4b27c0966d129a4c4b3f153de4eb3250ad3ceef9
diff --git a/kde-apps/kdenlive/kdenlive-18.08.1.ebuild b/kde-apps/kdenlive/kdenlive-18.08.1.ebuild
deleted file mode 100644
index 85a4f1b75c9b..000000000000
--- a/kde-apps/kdenlive/kdenlive-18.08.1.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="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 share 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.10.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) )
-	share? ( $(add_frameworks_dep purpose) )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	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 share KF5Purpose)
-		$(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/kdenlive/kdenlive-18.08.2.ebuild b/kde-apps/kdenlive/kdenlive-18.08.2.ebuild
new file mode 100644
index 000000000000..e9815b8f4f03
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-18.08.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 share 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.10.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) )
+	share? ( $(add_frameworks_dep purpose) )
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	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 share KF5Purpose)
+		$(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 0a1e01da3527..5f4be22d2f21 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-18.04.3.tar.xz 2509988 BLAKE2B e52e24cda18808e177b9192c1c69cb4c8c6b8815ab738b3b1e2127c61fa7cbf6007704a1a243824a0bb66e93336bcaa2590a6a83edca594029fb2087cbb5c20b SHA512 af1659a41a128cd6c822c8de089aa447131817c60636803bb809fe637780e312230633156347cadb11546b7b8bcbcfffd730d6176109dd80ee20e7dcc9a7707b
-DIST kdepim-addons-18.08.1.tar.xz 2133692 BLAKE2B 61d55475aa9489dc8921a5ecc5f6427eb527d2666ffe1ac337659929d1ee3a384cb95c005d5d058888947cd765b1e1f088dfe5b0e79094e9a6489bc0d5161e9a SHA512 21b0a9a1e18f2265f79841ff65467acbc63524c07a1e3fe93d81ee922887aaa58b678dd92eafe628c1809f11c0d14c344a705a90189d5d7709d82a4d08257880
+DIST kdepim-addons-18.08.2.tar.xz 2133644 BLAKE2B 9284436eb44863cc444df9d9774f52cf196eb8c0f1f19dc0ca395b23d54be59ff74b3f504e0bea5ac75eb575710249e79f237118bd687030c655ac3c12219e34 SHA512 9e23b855cc09b1142b44437649036b8fa38ca4a2fb4aba5af333293c36fdf746e713a21352ce292664e3fc822d1c534224786250041b90e3eeb631d9a1fc3e83
 EBUILD kdepim-addons-18.04.3.ebuild 2254 BLAKE2B feb95b32a64c8d8ac8e0f7664cff63fbbafabe83263fb9920dce532d3736c49b7db26506799b267ea74c1b8de94a3600768ebdccd62e0843cbd5c2df0f05e1de SHA512 8d0bb5991fefb409d17e1575cc9ab1aee3784693e15df062c77ab3d07c0df403d905db5eb30728353b48c0287eb5d4b33d7d70f64d7186d2e2a991b12225be17
-EBUILD kdepim-addons-18.08.1.ebuild 2315 BLAKE2B 204e98b0dfb60ab7309e3d5ae83155d22b8b35f1e280beb3ec7036f2ec00a2b6bb314047dc6e56353b8bc2c6a00a68e91f18ffa8f0fcfc9a00c1e75b7ba7bcc7 SHA512 dd68f19f7244efab58ecee5221cea073da5383f2ae47ffeee6cf68cc9112c226b2cfd30b4af08ee0902bff065d9ac9b3bf1a947faf90013f18b536a9a959bb7d
+EBUILD kdepim-addons-18.08.2.ebuild 2312 BLAKE2B 8ea3fcfd89840bcc61ffd4014b9d25848e37e337f56ab87a89203ff580ebe4f8ef3371232124f603f3e1cbc376b80e798109265fcca84e413f9f32e52af8aeed SHA512 7c7b4a221a0ffa96ed8c0dee0341d35e2b8e80d8bf6a5810e389a46465fafe8076db9e2e0725b714ef4120073cc3c5c916d5a4f3c5349dc7fb98c2feffa2a753
 MISC metadata.xml 378 BLAKE2B 9ff4bb4cba46c784e2664d026e71aa42bd2bc3336e5107d9476fb13aa57646b06a21890047e2ce763223d1c359c161f701148d58df6c2afc32c18112a6e5942f SHA512 6a36925cdc8648716b5b3c6574f544b5dbe2bcd656a2594930a8d5d9b2600bc3a9c98801221191a2c308c5d05716d48859b381dc6c0343ab6894b8c704280701
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.08.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.08.1.ebuild
deleted file mode 100644
index f732e76cd48d..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-18.08.1.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_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 kitinerary)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpkpass)
-	$(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-addons/kdepim-addons-18.08.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.08.2.ebuild
new file mode 100644
index 000000000000..ec708ef8bb19
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.08.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 kitinerary)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpkpass)
+	$(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 12c281c0c37a..78c34f1623c8 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-apps-libs-18.04.3.tar.xz 73056 BLAKE2B abc67a5d354ffc4ff45b82d4bfb66f5b7b1327c95ed754768b9944c4f87987feca8c7478db1808251ef5939da5c3a3776f0ef6850b9a7f5e7cf873379b91ffb2 SHA512 1531c1f37540de4d0d8910a7f75eb85d5907495e2d65dfecb1dc83577e58f9587b2b3c37c451d4fe7b968c6f930f96e8cafa3c66fc6931c66e6aa5e41a4a8ab4
-DIST kdepim-apps-libs-18.08.1.tar.xz 72904 BLAKE2B b21b41ab628abe12b13c592f14ea659ec5ab699e1f5cf71c2d76be6802a263813a37668dc9848da15f19d5b555a8eaff1d83568860d2d696f161e7ad0db7dfe8 SHA512 f30e3183b5212993a41eafce081f7d6f7e5636ba9996b6ec4af0f6ca69e68d7bc5b53151c03203b556c01e3325ccab01f3742ab3ca54e339187df391b2757b04
+DIST kdepim-apps-libs-18.08.2.tar.xz 80576 BLAKE2B 311f5ebc5532da1a8f55eefa158b7e0dd50802179e1c21b39c8a06b11706332eccd3fa681ebc5a68bd78ac9c97941b7ddc35e783a6584980e056e1005f92ae98 SHA512 804bcb19e6408bec2d396ecc42a1aa6a3dc693ccdef048d154cea7bab0f5b87aac42d3666336472d079d0bc5d1b81a44c081b1dab40066afeaf663db2472d133
 EBUILD kdepim-apps-libs-18.04.3.ebuild 920 BLAKE2B 7f5d44fbc2462713efaac8d6626c0b9a93443b6ab5fc61d2430ffad2bfae7d28df323eb83cd25db915e32df9de55c39e92c0e1003f4a2ffa537775afea24d6ad SHA512 4b0f06a6d396335e9f7d87b6e2d22a4356ae9d4095f4c9a41c865f2fdd50d0e7129b11100c3acaad4e552ee4caaab3fc38461c38bf3f7be2baf03713b3a45a32
-EBUILD kdepim-apps-libs-18.08.1.ebuild 922 BLAKE2B 9023c2146ca7b469d010e479e010ec8671c24fa64ea2ed0a05344c67309ba2a8d069c0f0bafc4d241d561c10144182f65a5addd32badc5c1b6629a95b98b90cd SHA512 974b0ea380d8669d47dd6918c24ab52aa624c47a45e046846f7533936181cb5c57eabf26e07b9332ce3e3cb7706894900918768b9d71be8667b2d9c13b8ff751
+EBUILD kdepim-apps-libs-18.08.2.ebuild 919 BLAKE2B 2799cab2c9e2550c215c852de16c9fcce8fb19ba95b51c7ebfd56de7ef8e22f340296f50b4395061a31a6f1b79b5e8291a4b7a428c8aa6fa2daf462d28c160ba SHA512 6dc7d69decb84474ecee3531eca16347c922df84a038ac9a1a862ad94fe82b61cece6d89c591d512c4249e1d3e19043b68908b4dccaa95865889924670584756
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.08.1.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.08.1.ebuild
deleted file mode 100644
index bdabc1a6ae7a..000000000000
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.08.1.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-apps-libs/kdepim-apps-libs-18.08.2.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.08.2.ebuild
new file mode 100644
index 000000000000..a59eafa15529
--- /dev/null
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.08.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 c8cce196209a..0094e5a26303 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,4 +1,4 @@
-EBUILD kdepim-meta-18.04.3-r1.ebuild 2021 BLAKE2B 5ee762a456e91842594829d0432e64df9bbb6078962f1f927ebd04acaed546f418fef713bbb1915bf55fa77e6dedf825910162a3cad7f884eb2489720ef5d57d SHA512 f6e2b281aa68912f159ae0621838060ae495b3f3efe34a3ceeeb2a538a99d41f917243ea1ee079d214d458e0f44637d57351cccb15b85fb8dec4ab018079deb7
+EBUILD kdepim-meta-18.04.3-r1.ebuild 2019 BLAKE2B f677af1df6174c2d3a687b968178a75ba2116e182971121d2e3a5ca925a7c69bf301f4962714193ab5d11187c5a7dba633faa1df35aad9eb33822b1da530dcf2 SHA512 81b5bd76a47e271222e7ac3cce8502c4f5e90f3cad9d2f8315fdece2b5f1ad6c6831fa93c94043f64abff8f0b6079b1f0e0ca92874a4caeafc93864036ecba74
 EBUILD kdepim-meta-18.04.3.ebuild 2054 BLAKE2B 0859f98049ab023b4b7d9ff3c74c05b3823738572bf9f86444bb5a154894c98a31f4a787bf626bdf771c026922f6297d4b5a3c2f1efc0c093b50227b02b6e19d SHA512 7a810fef22bc3a2f0a1e98ec958676b2aa873b5409f597a95f660d1c31601f7ab6863bdea1513507ef7ba725ca3bc26e46d775198d0c1ecb393b1014f5b32cde
-EBUILD kdepim-meta-18.08.1.ebuild 2083 BLAKE2B 762711b74c8b8a41c23617373b8fbfc0af2e9cdb4947fd6b599c7b8a93108dbd9c87c6394d428bc1b028059162437733683f3fae1a16da3b80b3b38ee69946a9 SHA512 b0d422da28d42092b5af654c284bc37e9ec7d7f457c74e5e26fcbea00a317212ae42c22faf2ba3410446fc74f16e3a4f03e24c398a6118d9d25042b65e613240
+EBUILD kdepim-meta-18.08.2.ebuild 2080 BLAKE2B 1093ab646dd62ac3a7ea2b9c6fe002cce3c3dc997bb336413e9ea8adf0b55834167e53c768ec76e56aa57dc1b9fb36e668c60a891e94cae5d9505cfe374c51b8 SHA512 462c32b638d811cf17a298eb1e69f4bb835780c00ed3a3f13ec304c824057b6546f93accdcd625bf5a02e47172dcce3e5ccb3dbd1757cedd8d87ced55c2814c2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild
index b2ec2973ba6f..30981eb2a39c 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.08.1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.08.1.ebuild
deleted file mode 100644
index f00bc428afd6..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-18.08.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=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_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 kitinerary)
-	$(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 kpkpass)
-	$(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)
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.08.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..34bc562e0bbe
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.08.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_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 kitinerary)
+	$(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 kpkpass)
+	$(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)
+"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index f59113c8638c..8e78faaf4d87 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-runtime-18.04.3.tar.xz 1750516 BLAKE2B 09bbca0580ca2a835d61ab48a004fde691b70d04b03a9da3ccf52abfad16d341e6007ef890d0fda364f679650c6d07e78c2bddd5a4b0dcfb296f24bd0e2c046a SHA512 94770f46d9a100117adf05b03ad75aa3201ae4fc2a6b300bdc3ffc42003e1a54cf8b1275d28c78f32ac764f56e58909dfbc1448b3ab8a9625485d64e8366e68e
-DIST kdepim-runtime-18.08.1.tar.xz 1749284 BLAKE2B bde5353ba5568969f8156b6aaa90decf2fb4cd531a627969652fcbfe64b62308e7ea5e39089037240946ffc5a880535712221b78e73163fda5f5d2903b714aa1 SHA512 16a6babe3a4cd0af0e7998cba9d110cf08d8cc14010b3df3053232ca8d19b584a13266e8b115eab1bec22a09363c6aeaa95e2ec0f3223aef423a6e7e5119f0aa
+DIST kdepim-runtime-18.08.2.tar.xz 1752836 BLAKE2B 25212876324f308d2028f15407472e388c24cd917c56afbadb419fe795483ff07540733dbc29dd42ac5b74e4afc538b1c552bf73480e76c34f32862179ea8fa3 SHA512 1c7b7c17c3386e6a1bc8475de1a138c10c26afd1cf52d1c36144c49f30541e702af9b5aa49cd946de57e366d305ae26bb57c79d69b93d5ff221ba5caabc9bda8
 EBUILD kdepim-runtime-18.04.3.ebuild 2132 BLAKE2B b61017828ea6ef25170f71647111a56828e7a6fe147ed7bbe7a1ba118df8fdaa7c442ef4a2896460294d262959d2e80333ddbe7c6c0e112e086b9fef7a4c65ee SHA512 a7bdf693083cb9a845abd1d8125aad886bd625168d59f46b5df378cc682b51f9067fa19356b244052a592425aa31595b3e4197dcebaf2e5c369a1bc75ff4c519
-EBUILD kdepim-runtime-18.08.1.ebuild 2255 BLAKE2B 1eb851fc1dfd4f25202c05c245c6858e3dcac0977394c8049064cfa2cb9b875cc363a42a90e0122595d40df799f9263f28e1dea48f69362e29ebfd2b5ac35c28 SHA512 9cf339644e849021cda1e525fb2571d21bc5295dc8fb0872f97d132a2441bcb2f23491d0d20c52a25f354a520edc5892387334dafac9d9f7e37e9feb2bcc7f07
+EBUILD kdepim-runtime-18.08.2.ebuild 2252 BLAKE2B 09cb85b9b521edcd18d1b3bb60ed518ca2d0bc701e3557ae9701ec021e06e93aef89320d7b2adbd7d8f07dc3bd1eb0172175275ce995c2d64d5f99675940d3b6 SHA512 ad485b23c4bb71aa3500d683a43165c713efdeee9958f1106c1b9b07890481a796627d21df05ac0c7ee4780e6814026947d3c9d742a2a4900f5fbc1c81d79135
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.08.1.ebuild
deleted file mode 100644
index e0f43fe40e34..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.1.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
-
-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 kholidays)
-	$(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_prepare() {
-	kde5_src_prepare
-	# We don't build kolab, so we can disable this
-	punt_bogus_dep KF5 KDELibs4Support
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.08.2.ebuild
new file mode 100644
index 000000000000..5c59662ac8d2
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.08.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 kholidays)
+	$(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_prepare() {
+	kde5_src_prepare
+	# We don't build kolab, so we can disable this
+	punt_bogus_dep KF5 KDELibs4Support
+}
+
+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 e2afed1bba9b..84a3674cc391 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kioslaves-18.04.3.tar.xz 37460 BLAKE2B 32e1aa9ab46b0eb5697b630488a0bebe0f8ae41e4b52f22960bc60ec140151cd72ba79624bc9c7dd12da5aab5261cc9693818873e8778b9e903b6ce2569de318 SHA512 bce7c3638cc57bd5d0300050d13dad8a3c5508569eea6589023cd9c9fd744f2d24ad0ce52a8fdad59e876a7ab8c9c4856ce61b7d80514175ecf42a7533706038
-DIST kdesdk-kioslaves-18.08.1.tar.xz 37492 BLAKE2B 4b82b74d4bea51383523514635d084b361fa52f88fce7fbb07fca9e6cf513511481c98e6544d2338a56226d1c9611b6b7c3e21bb1285e4a3806174c76cb31f51 SHA512 dd89ca51c0be79ed8453fbaf6d46b451e112ed509209ac15a0336a5a5b0d534017439ae83f49b9eb1726b56ec02487c920db42311c3c0e408590f7e07306b650
+DIST kdesdk-kioslaves-18.08.2.tar.xz 37456 BLAKE2B bcadcc6c82aa140cb0ff961845193cb70e6c09672c4b999aecef3d7494d31afb074187b56b18c2509bd0256339f59b7abbc80ea9fcafd0f977f45d4ed07e14f2 SHA512 f5e76f1aca35ed15507a373cd0a872688f204f7ea6a55f4475d4ea40d2d530ed85f3e531154e06b8b5418e27d0ff3b47bdc9df8066d363ec29a2f56e741079a1
 EBUILD kdesdk-kioslaves-18.04.3.ebuild 375 BLAKE2B 8df34029202846d40886767b498ad131fbfe88c9a002f50c7b7bee550aa2f9d527ccf52d4d3c4ff4772457ebcd6cdae914030cc4428e9740639da9cd2e8d3c94 SHA512 99cd80231159521eff93142152fe52833f8f36d0678f4ccaa9e85522a34dd77f1ae5b1070d527915ee34e99219d55eb61e811e4608dc40a27fe8c77177152488
-EBUILD kdesdk-kioslaves-18.08.1.ebuild 377 BLAKE2B ca74c8f1cd7219bde81271519fa533aac2b4a2be76d5244f6f064178467d8b517db2cdb6f2119b59cc8972b1105c20f24b0219f72318eeed1b950d2f14d7ad34 SHA512 29bb043e718d0472262fd8d4230e2d8fe2953fd8171e3e974df3b92f967c319486ef73724376385c8cb98c8225999d526f7a63bffc69e6089e3a32d0e3063cff
+EBUILD kdesdk-kioslaves-18.08.2.ebuild 374 BLAKE2B c7560aa6350671cdc9935ce0cc240b5ccf37c807f915819f6ffc14a682f7dc648878153796613be13c34c45f6940fd1058b2c57cf931b5b42950a2c4bf420a3f SHA512 b35fb0567a57e687cbf2fa96b9ac1c03584d51454e12068c6bfccf7a414b09c5e076f3bbcc147c8007876f010789eca30509246ecf7c6a9418006daed761b501
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.08.1.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.08.1.ebuild
deleted file mode 100644
index a659366d3db0..000000000000
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.08.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-kioslaves/kdesdk-kioslaves-18.08.2.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.08.2.ebuild
new file mode 100644
index 000000000000..082adced5a34
--- /dev/null
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.08.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 dd5fccc63c1b..53464ab507fa 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdesdk-meta-18.04.3.ebuild 787 BLAKE2B ef971af318c8bbf0bc0831ec896eff1c866e1dfe4366f0b3a046a13930f5ebb6d8bc7091ddaa93516044610ea47d3ba24bb826d485ce84254d1e525ae4868028 SHA512 69534d2fe222ff9a01b50c616d878643c4b8305332b7a78a5494006d2c2bba4d491ead1141627deb8923330ca951d786dfe6bddfe3c5de28d6ed3ae1fd27daf7
-EBUILD kdesdk-meta-18.08.1.ebuild 789 BLAKE2B 8a714726b17b33dc7543e235c16e3ef1c7e2ba5448e2d13c5099b33694e8f8ce3f086517408c00548f84eb8560b9320ed20c25824d11a0aee38105cfa96ba988 SHA512 b47c1cfd369b996ecaaf797b19a29d2b3984992ff0395da2141b192d25dee55fd0f2c2d6fd53c94f7d31b0984926350c6f0ade56acae5284a7a17d97d2515ecf
+EBUILD kdesdk-meta-18.08.2.ebuild 786 BLAKE2B 1b3c8a02144ddd88d4aca50718a011726de7563067fe1fd79ca8c6e6651d42f02aeb0ef8d0bfe019132f96d5b725e1a9d85d5e9516c136543aef6d27af6571a9 SHA512 03e9858afa752895e54efde51cb83c7c53e5f168ddcc6da947b8c81c7f6f81930d5b44f60e73540ad2c89d38bb039d85343825757ea0f3c475399d05f00ac344
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.08.1.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.08.1.ebuild
deleted file mode 100644
index 0759a45c3992..000000000000
--- a/kde-apps/kdesdk-meta/kdesdk-meta-18.08.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
-
-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-meta/kdesdk-meta-18.08.2.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..b3043fb573e3
--- /dev/null
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.08.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 04dbaec85dfe..ed2674784ea9 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-thumbnailers-18.04.3.tar.xz 17140 BLAKE2B 0d25308ec6db0722d971f888fd412677411d223998ba810830e6b20194c055d71f12bbfd48987c1eec677cc00fcdae40db944ec096902250eb087055195d895c SHA512 18e3518fc66fc9d23d49658cfa916ad9080547e0e57899ca66eb4f87874d9e957b0620965464a683912784d6966d8b950f17ea2ac80ec0024e7d7a2c98f509ec
-DIST kdesdk-thumbnailers-18.08.1.tar.xz 17408 BLAKE2B 1cd13c1d048e438d6dcc42b8d439e60d5230916b7b129fafe6aba2fac832e13caa4b747f5624dc9f9f6373f2b729745681f4b540948ee5d8e0a1009f431b16f4 SHA512 a9ffddbca502d1bf3d180cb5c761b0c2f1aa922ec803f87a5605aa3d179e261fd393e00baec634039a5f73e7ecf475ac33efd81670e85e2bb5d257fa6ad872ce
+DIST kdesdk-thumbnailers-18.08.2.tar.xz 17412 BLAKE2B 79d176ae107e64dddf61353e649e25f3491d2c4e9ec0768f26fe33376010fd259f525a126079599c41228c8c90cc622295b6f6db70e96e6936f13784f84eb9f0 SHA512 9bf988c6f1e2ed701765ff11c46e796f8993bc19a85309831d686e1c7a54ee0b718cf926d0568a0903ce465095da43054b1af81b40216b7cdeb599ef48d4c84f
 EBUILD kdesdk-thumbnailers-18.04.3.ebuild 428 BLAKE2B b1487995dfe76b2153c1ce5a8cb91165f9c26b4d92026b662e07c99a792b98dfee71fb2a449cff6170efd6b28eafc35f10e1b66f4fdfe9217fc48c924a96a104 SHA512 0b08e749f42ced5d342bba47dc64a59f5627bd23313b1ddc0ed38f30c6e2804b5827234c6f9335a6f9ae6af61d9e94ea4da5f144719f62addbdaeca2958a3ab8
-EBUILD kdesdk-thumbnailers-18.08.1.ebuild 430 BLAKE2B 925942c8b5354bc3c7e50d06e56501f3b1dc143bf3d37d8e81880130b1638a04b413ccdbb8513ee98c1f5e8838431e63af3ed734cfb71931b80bd32899765ef6 SHA512 a8b1d25f298c26729062444b842d899c65a1923b80e6c72964c0a14dd44eb2963f571610ab221123b23eedbdddc62adae750622d7b2a26ed4cc57a94352e7f6f
+EBUILD kdesdk-thumbnailers-18.08.2.ebuild 427 BLAKE2B 84a4e2dae97eba1ae13ca2dfdd31b5df1c81ce7efca03b9bad96eb45aa3c8d23aad8d27fe0e1f22b278347808d4eaf03eee09073192192fa604521cd454892e6 SHA512 d2860b1280e8a9e78cfa26adfb7f6483ef49547be8c6cf9b9e78a15ecbbb97ca01987c543800469b803588f798f937262bc837c76b2b319a59ea6968541a0c46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.08.1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.08.1.ebuild
deleted file mode 100644
index aa6e30a17640..000000000000
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.08.1.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/kdesdk-thumbnailers/kdesdk-thumbnailers-18.08.2.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.08.2.ebuild
new file mode 100644
index 000000000000..b4204ac9dba7
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.08.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a5bb0d6a7095..cb61b4694365 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeutils-meta-18.04.3.ebuild 808 BLAKE2B db0af0cdceff2e6d3012637829d2cafbb9c931fde649b74d996deb9eb0bdb732a979782b41bec1009b360dde2f5dfb6d480588e347b9b3c920ebad43c09abbf8 SHA512 661a80f10cbc6b4cb249bd077640bcab21419278a11a0ea3f7eb46b6e0b114d0947d542d6d93c4300de31d20a3721b8e8d5e4601d8c43b19f17a9e711c5715ba
-EBUILD kdeutils-meta-18.08.1.ebuild 810 BLAKE2B 254d18dacb012f2eb254911546d48a51132ccd99113b1cf562e12c70207cd9f61b93e2a3c2ed85320a3c3e15b40e0a68feaee7f345a06f574a35904e270cf63f SHA512 26d2a351d77944ef5206636f52eb26162d516c47329d45b8577a5527f6e23fc6088365bf0dcd5ee0623bb588b5c3897435dda26e7328f3657a415e98bee08df1
+EBUILD kdeutils-meta-18.08.2.ebuild 807 BLAKE2B 28d1bc2ecb6cb3c4dd2e05888b2f1ada9c85d416b85dd56e823c2d68a80d6fad2472586848a14165e32e1b0cf7a8e75919cca9209a94610248f9f8b2f1fd1947 SHA512 c0c8359da2dbae62d08a8cc9c3c84a0e29473521e6ecf0a404164686171ea0621402ac572902fde50e2c2fbd820cbcd11a80962f17ab0ecf93d8c52daa84dd30
 MISC metadata.xml 389 BLAKE2B 7f665fc6407ec0455464d44f43b98afba7702a6b7a2e65841d2bd54dc7c229cc5c227cdd47fd81eb7cb97e45b69957c2d4085a61e2e2eecd2e2f8186d896971a SHA512 f991910e5080fab1810b9762700b528556370472cb796e02c5f03fe63058f4e5d665ad39b6de597d49c04c233b09a4b703c80408205a3df175025c14767cf564
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.08.1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.08.1.ebuild
deleted file mode 100644
index d34c1f9cdd38..000000000000
--- a/kde-apps/kdeutils-meta/kdeutils-meta-18.08.1.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="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 kbackup)
-	$(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/kdeutils-meta/kdeutils-meta-18.08.2.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..eee02d6e0745
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.08.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 kbackup)
+	$(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 e06fb10e0f27..aa271e842f09 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
 DIST kdf-18.04.3.tar.xz 531604 BLAKE2B 2fb097444f1bc5eb7e7f1a31e3fc33f68f96b4a37d095640719fe734a6cf7e768e66f609395b3aa3c4d1120506da268d60aa6e56fdd4d0ae6bbfa3b95d4d428a SHA512 60d79b85ea9432561dc2cbd9a5f1ccd986fe8bf6fa8d8d0d722ab3e1316013d4044731ed98756441bdf5e56f91bce46d5496bc53863e74c0b5e456b0412cb3fe
-DIST kdf-18.08.1.tar.xz 556364 BLAKE2B dba9d733f091cad40519ecb18a74d15214f921e9ccbc5ffc5077eeb3779c55288316cf0999532c30536d2e4dcddd2adfcb5bc8e189bcd351a93f57ad507c5857 SHA512 49f91e8d502c624029639ea19ccbd470d6e48da1b5e41e76a95e16ec69a710f448a997916de5496aad01c9039e96374d473c65d410dc2cb31b60d5638a2f913b
+DIST kdf-18.08.2.tar.xz 556560 BLAKE2B ea0c3156748d6e1f0e39b3235e8c7145f4db3c5e82d9546f260cef02a3c8f1db9d32e9b13884244d11fb58bd055e42336765f7e6202713267e08216febad737a SHA512 7ec7f8f791fd9f8a57e0fa25ab795d502bce18b3303f2f42f5ee92b4fb1f21968e0850f416cc3e5cab3f892ef462caa363610d2cd55529e2f1642d1cd7b8e0e5
 EBUILD kdf-18.04.3.ebuild 723 BLAKE2B 2cd42edaa2ee679b03d8557f41d0751eb21363e51383ba705ad10269628fcf602425cecc819004cc22e0635a3f1e0ff71c9807db6109afff199def42e8458be3 SHA512 c3d2ccc31530c8902ec386e9c7e0f91906cde6cce2b9702e44cbb5dd71c3a9b40b13eb679f11da1c90436f5eccb13a7bcde0ba5f14f869858e0979bcb8a38885
-EBUILD kdf-18.08.1.ebuild 725 BLAKE2B b0897058417fce2b6c420dae4a8568151b2a7602e2d7b900353917ec88a21b695f973a8f6b0c3da21a681aedf9bfa2d44c79230c513cdd653ee9aec6e2385724 SHA512 f7c33825bece4ef0b1a4058795947e9a9ce15bcdf47e0021df052406811a9b485e7fcb44de20122e0864e50eb464c1fb7b6e674753961e3b5a405776c779775e
+EBUILD kdf-18.08.2.ebuild 723 BLAKE2B 75dc896d8b37e0bd56213accfb15ff4f4dc87ff5f5772ea472749fd5b24194eb46c45f09657caa0ff5ca71634205e1e7d70a31adb93c5b7f5f04fc779cd093c9 SHA512 75bfa39c7aed33a6251d2e641bb62413f10f64139256b4e42334cfa6224fcf65407d77adcb18636bd079ae944bb3312e3d8cecf7d609187ac6b7233cba1172cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-18.08.1.ebuild b/kde-apps/kdf/kdf-18.08.1.ebuild
deleted file mode 100644
index 3ac87d6ff652..000000000000
--- a/kde-apps/kdf/kdf-18.08.1.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/kdf/kdf-18.08.2.ebuild b/kde-apps/kdf/kdf-18.08.2.ebuild
new file mode 100644
index 000000000000..5d3a9930cdc4
--- /dev/null
+++ b/kde-apps/kdf/kdf-18.08.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 dbec2193e90b..4b93e42213d9 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
 DIST kdialog-18.04.3.tar.xz 96444 BLAKE2B be1a2603dbfe870245ab97f5fcb2c4e59529830a33be9d3fac38bf6e1c1f3c9fc0a6869210a055e89564ba5e8dff46c0ca2c464d6951ac94b4e1bd65bc3b74ce SHA512 a6dc04a0faa75642b919eafc78a67c36a976d98981bb624e39ee6f41e193ca8dd32867e56579caa7f28ae4ce40c32a3191ce357d139df83f13ba2efea74140e6
-DIST kdialog-18.08.1.tar.xz 96820 BLAKE2B 1689ce443f439d0b51ff6fc9754046cb31b6a4e4e1284fdf83c3404a401fdc17d53010bd61b5a2e9ae6454ec18ef1ef6e7448a765e6c5fc2501b9250b32b1469 SHA512 9ec46227894dfb79e4b3a9beccb79f23f3c9035a365df975440ca91b8d945d28121ae55a89bd1bfbb93eb8ea89c992a513330f2db9d7b573b114e7cddb15726d
+DIST kdialog-18.08.2.tar.xz 96780 BLAKE2B 2714ea34160b778c2a07483ded048aab149865edac6b643d7b40cba7185fcf05582929f7d2db634f79094312abfe62f16dd5f40057e01055adf1911b7dcba6e1 SHA512 4c7a1ba6005f901bcbd97f4dc0d63ef6d79597b6aafc3154ff7e0071a2ba5c1c876c3534a7daf336f757c64eb04c8d17572e19b8b371c5eaaf99166897ca7c93
 EBUILD kdialog-18.04.3.ebuild 835 BLAKE2B d1530d890374d6a94b326c053cb83f3bd834e9a1447aae26877096cc997bf4ff4dcca7fa80d2122b32e5a0006e73e8e02c2ae1821af62e7f89aad286e20b2bca SHA512 801f9facb90bcbb670e3c253e4e308b1c46f17435fdc5306170d3a54d744393e8552b9428e313310fdd85ca5b122c99c92b87ec83ad95adca7929b8b0f87a96d
-EBUILD kdialog-18.08.1.ebuild 837 BLAKE2B 699390df60024475a60b5b2f0ab567839357b01ad6db2ffa9987ccb6daba501749181e4b4b9b30dfa1d928e56743545c448ff9f7096ecf92e6ca92b8ab3b1e8a SHA512 e25479d71bb7c8ef910cdbd858489cef9d1c75636b84841edd36861ebd9d0983d09d209ad716b57137d4816bcb4303acfa19562f74702dfcae07ed57d316c49e
+EBUILD kdialog-18.08.2.ebuild 834 BLAKE2B 4d9585b2be852204edcd5fe7e2a7f02ca7af6aabc06a042fb4ad8d04502d7554f60df304461b8f8299ee0f8ff1e7cea47e788dc32b8071a1120acda476983b6d SHA512 9890812767bb4b928f7f38c5ac1256d91d6d67085b680cecf4e2ea2116c84985f91e8b31604ba45279ece081d7a12a51165db156650b166ac996c00ece72a0b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-18.08.1.ebuild b/kde-apps/kdialog/kdialog-18.08.1.ebuild
deleted file mode 100644
index a3f46e46a8fb..000000000000
--- a/kde-apps/kdialog/kdialog-18.08.1.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/kdialog/kdialog-18.08.2.ebuild b/kde-apps/kdialog/kdialog-18.08.2.ebuild
new file mode 100644
index 000000000000..fb1dfdfb4775
--- /dev/null
+++ b/kde-apps/kdialog/kdialog-18.08.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 d8e924b727bb..fea6cb9d4a08 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
 DIST kdiamond-18.04.3.tar.xz 4607668 BLAKE2B 5f0a344297310e7d376730c87750d1d29fbee6d56fa8e2aa3098d14424f66b4a99268ac5a375dbe89e66dc6bd48992eb5d6f373e96673fe51578e2e3b02847e3 SHA512 05798ded8fd034fe4f8829fa1a57ac60b579d8215318ad4707527536cc56d5a0a5634eb7b5634abfab9c070774278efe26ead9a1708f4958690d58c061a4e3bd
-DIST kdiamond-18.08.1.tar.xz 4718832 BLAKE2B cad98c19067c7c2fa201b8faea03bc455ae7b46f8778960974ed63c311d3da6eeaa43f2309d91caf214a0502b50432fb42c4c75e1e6bb300149b054315e605b9 SHA512 ebb91009e6dee64e8e7cc8a3188a3386640398fb55d59b93cb37e029626afe71caf0b29d1e7b8fa1b6936140d07567db7843ca5bf7605105bc2240959b8c9e7e
+DIST kdiamond-18.08.2.tar.xz 4718784 BLAKE2B 5d571220b66a84641ff44a5f8c6c86172fb19cc532d7a9c08c003ceb56b7895f45122edb07b3886e7f8c37861c344de6010b59a75b584b34204f9d36de9b0deb SHA512 9da7b089cf970d73a137b9108bd28a3a9c375b268a804c15533220e896b37d78af52e8c087ce97080e96ba9ca0d95797544d8e2c0b4d4e373d5bf2b9a2295c46
 EBUILD kdiamond-18.04.3.ebuild 789 BLAKE2B d3c9f7a689285fa19ca4a69867de48ec75c3159cf478ea9f6a65fd6fb2f1c411422f6c34548cf3217a3ffdf1b66221f6ea1861527696bf8f0848cc68d15a7793 SHA512 2ac9033bedf4e831528a6998b77f6f02bcbc453648a9dfa2a4d564cc4c6d0bbc9ad108d171d79b722245daeeeb89395bd16860676d74d0561544e24e48cdc47b
-EBUILD kdiamond-18.08.1.ebuild 791 BLAKE2B f8f0d78bad52684bcb399ddddb76929baf952180ff20aacb16e49a4323463a6b241fbd6650a7dae843de84491738a6300538b41abc416712a5732ce3e836c170 SHA512 e9bb4228f2e50537b53d82ef584db97ddacdb96eede82a8034893b106ed9967168b7c716610d41a7931d6fb09ba26f091895024c2a7eaf705cc37ef092919c93
+EBUILD kdiamond-18.08.2.ebuild 788 BLAKE2B fd9ef2ff3a51f66111f077c617906f8a2f11dda350a638704bab6054bf602b0376fe72de33060e33baff55036b90ddf0f86d4b5652a4f56a463ee303a27ddbc8 SHA512 b7c747d82b8bc8e1ccc8603b8197e6106f6a3a1ece136bc7ca62eed596ce1ef0628c6da42014a9dd22628c8dc0f970d27458e4d4f928604349a74e1516ac4566
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-18.08.1.ebuild b/kde-apps/kdiamond/kdiamond-18.08.1.ebuild
deleted file mode 100644
index 111637d702bd..000000000000
--- a/kde-apps/kdiamond/kdiamond-18.08.1.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/kdiamond/kdiamond-18.08.2.ebuild b/kde-apps/kdiamond/kdiamond-18.08.2.ebuild
new file mode 100644
index 000000000000..a71a0d2bf9c5
--- /dev/null
+++ b/kde-apps/kdiamond/kdiamond-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 1afe9d727eaa..507d290f2e96 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST keditbookmarks-18.04.3.tar.xz 183956 BLAKE2B 5baa0c62b32710ccc4047ffe40fddd587c8c2be86e19029410be7d5ea0b6510d929fac32a2e2764527650c2ed3a741ae7a2cf634568da58b7c42994ba3f2d42b SHA512 e9f6b54efbae782ee18ae428cc2c4a797cf95fd92a88c4a8aa610449d6b71864fd226d8e50cb4e3c81309e5048210ace13f55b4a592aa455379aa2f215a7eb55
-DIST keditbookmarks-18.08.1.tar.xz 184080 BLAKE2B 31bfbe83dde689e83d0d43b450802000093eaaf2804a261fba1f27022970e05ef6623217b8c83cd374f3e232cf43c40e9ebeeb554a7433c1d0b08fe2fda60483 SHA512 932c9cb865e93614db7a4fa7d432982cdb117725e1d5dab8098e1fa5f1e92d26815f9cca6b690220486cb3647f3fb7cf92e1a388481e9786dae099d5c94faa3b
+DIST keditbookmarks-18.08.2.tar.xz 184012 BLAKE2B 07715309ceab37f0fba86f7dd5e0067de53653bd03c407b37a24664099cf1f57cc4dedde2249b6093ee472ed1969351fe381df0983b7a519c365115fbb9fc809 SHA512 55772d9e5351a0ad5f74ea09fe6680f7aefbc66d00d222655ddcfd3e70c6e403ba01ad9ffe65e9aa375c885e42af23240886bcdb7d351289cbddb638d0ea927c
 EBUILD keditbookmarks-18.04.3.ebuild 1011 BLAKE2B c7e602a87e3a8c4b2d24670c70fac2603e67ea23dcb7face912e902d968f0fdd8f6fa35b364a20e8736cbe13918a2f3b82685cab68dd5c2a783d8c97ab9914a2 SHA512 62ab8d13685bef04dfaf60adcda07034f10212bfbafc11d27b2161d275e69ef00cc338d4f25eade629da6e7fc3564965e597111d8bdcab2c849675f1b2f14fa6
-EBUILD keditbookmarks-18.08.1.ebuild 1013 BLAKE2B db456d32470eb7a37bca70d4b93bfe8f1fbaaf0dae78e61b026931e33c3599693568ec0b556b576606cc84f3f90e42683f0c90071b4afcb86b4c1fa7f3a98907 SHA512 9837274abaa372edbc12fbb7ddd0c1b7d84d233c983fb2b07930bc270ace635c57474d46939dec628149bfc60daaf80fc43e716269e4beb7f42ac592af516fa0
+EBUILD keditbookmarks-18.08.2.ebuild 1010 BLAKE2B ca450a44c6c2fad2b8164707e9b7fb40a00aa874faa6115093fcfd34ba808c51ad2a26e4dc93e370b8f773f434cc389a2cc7527d223877c8c2e22ff67a138e8b SHA512 04de323e1fa34b5f72a95b7b92b3f579abcc87f339e26cab9f596973d25c9df10d0ea348bced14f7e6afacf5a0a9da9e59bd4112f5db30af2c4f971b549c2d0e
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-18.08.1.ebuild b/kde-apps/keditbookmarks/keditbookmarks-18.08.1.ebuild
deleted file mode 100644
index b048c6a9cf89..000000000000
--- a/kde-apps/keditbookmarks/keditbookmarks-18.08.1.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/keditbookmarks/keditbookmarks-18.08.2.ebuild b/kde-apps/keditbookmarks/keditbookmarks-18.08.2.ebuild
new file mode 100644
index 000000000000..d3dd288fa4ca
--- /dev/null
+++ b/kde-apps/keditbookmarks/keditbookmarks-18.08.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 3d591d8d6cf9..d1753d6fc70b 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
 DIST kfind-18.04.3.tar.xz 210064 BLAKE2B 1d158d79ebb985ce2ac0e0182c01495a0d94cd7c1964aed86330cf8a992a9a000305021b15509a5bf04fb1de67875aa89dfae12de52656df26106c4328d243b1 SHA512 04e055c67256ad3f25b60ce2aec12f11ab5201e92a5d091d9faed6ef395ac129108cf8108c3cb413ffe45104aa4a1f59fd3e89ad6b32f6f8b4107b52aafefb4b
-DIST kfind-18.08.1.tar.xz 210392 BLAKE2B 970af0a30c19054f6c51e0cf066456f6fa2d79c27c5bc13281c1e98bb50d7dcec51b82c02a06c426d454a1ab1c9c365b861877a15b5391d978e0d89c441886d9 SHA512 53c1a34776a6b5b56363d2f40a29252cc5dd7828c97f40917032132883a4b1f50d1972a241a287f7ef086c1bac137d8628ad08e3c21a879fa444c6d7247731a1
+DIST kfind-18.08.2.tar.xz 210268 BLAKE2B 8d9e547f5dd4568f3e90c9cc9dcb3cda666f9810a66fc5483c72f136fec747e21d885fd79e8a6e831b3e5b7ea22924d5928e09b51db446d621dcd96a72347e8e SHA512 83f59443ac4280057a961510ebf4a03fde02fb2fe5990804a59bfe269ead14e2327a3c73f0d796387adcfa9cf138f1d911b68fe1f5ed425c6ef56dd4ae97de70
 EBUILD kfind-18.04.3.ebuild 815 BLAKE2B f29da02864449f73f5813b4725ec8bfd45b44c9a53cc43158414fece8a32de6c676d5fd417a10b25b16d022a9f9635eddd1cef953084076c4a32bb71c3fa4b8f SHA512 cd0320f7875dcd3f0dcb3ebd90145954a3100bfb7de3247e74c18a8df63717696413bddaab1363214e29a43e477e3702543125b58bd98c3f3f455140be8990d7
-EBUILD kfind-18.08.1.ebuild 817 BLAKE2B 84ac05337939e4644b43b80c8805bd53b68ab800d0e1e5594bfec72acc30b5c5e1bd22f0705c226b4b740733ab282e3ba81e2f0edc75ca8fe60da614c23b2384 SHA512 d458b026288e2a6f55626dbba241c328a2c30e67f9a306b3587bba69858a8c5cb373f4c633f0be1e723bd4d5589911aed21c34877dd0123fcde240f92349e82e
+EBUILD kfind-18.08.2.ebuild 814 BLAKE2B d08ceceaf295046b34e7fb346ce64cb01d8025f9937322e651d0d4896ca43bbc1edea1110a49580f2a0d23fa4c7c5b5b1c629045c4435b19e1425a449e91c493 SHA512 896fcaaea9d2191b2c04d421a445b7f6b57a665597b2a4ca6163a46c8a6c1b1244f212657f2bcaa89683155880059f3e931ac37217f4d77d7e9453f4d93c0918
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-18.08.1.ebuild b/kde-apps/kfind/kfind-18.08.1.ebuild
deleted file mode 100644
index 281d188e459e..000000000000
--- a/kde-apps/kfind/kfind-18.08.1.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="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 qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfind/kfind-18.08.2.ebuild b/kde-apps/kfind/kfind-18.08.2.ebuild
new file mode 100644
index 000000000000..e6c4c240594c
--- /dev/null
+++ b/kde-apps/kfind/kfind-18.08.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index c395be785bcc..71ca1452965e 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
 DIST kfloppy-18.04.3.tar.xz 199896 BLAKE2B b71413634da0e4a03d0236573bd973c55edbc10322aa57807c1148138d73f8a121bd481e0e2bb265f871aba9636a6a2b7bb9a249a8e0cde12fdd0c4869fc469b SHA512 4bdc3541bdf3e817840e81b11ab1878d71e96bc7eff2e3fe53d2877b0956588e0ec6cafc41b2661064a676e4e08c0de4c744d97146fee7ae0d3379f6850eb674
-DIST kfloppy-18.08.1.tar.xz 199868 BLAKE2B 2000a76977f34cd41d9cade390382f63053c1e1a6ceddb56d562128d1d92b4601f4467592f807977353666fa0dcd8248fd4a9ff9ffe71d47f7713e95cbe77974 SHA512 e33857c5ff4988a6675461302b53125f54a678f7c4286a8416dc8f569fe1c9d7560567d2884788b912a08cedc66430149747a1d2e5fadd23c3c2c1b8590d586a
+DIST kfloppy-18.08.2.tar.xz 199800 BLAKE2B 1cc5dd64b7d799028174b2381acada4465e8e2e1ab3ee69e8303cbcfbdc716d50dcb526a733582cd750cf41f6ce7a3e2aca8464faad432c26d805c55b2eba83d SHA512 f427cf8a98258c0ef2c0daa30679cc89a26fbe769c19dd78ed6e7586cbfc279d0690983ed9cf07167adcfa6495ea4a3f1cd0e575f70f72dc386b851bf7f595f0
 EBUILD kfloppy-18.04.3.ebuild 751 BLAKE2B 8b20fa977aa4e17b58157a3b469c54c047705a992ddc884f45b3b9954cc678562df906bb7eaafd14d0f3e129988bf586918b2886076adc93180e0f04b134a9c5 SHA512 a4215b6c1d1ef610c17327f070e8a1ef4823855a0cd817e88b9d2974ec9f0acd8b7aa6f83f7bd5b6fdaa1d4d5f9da1495cbfa076410898d192e6e5fa0297c1ab
-EBUILD kfloppy-18.08.1.ebuild 753 BLAKE2B 143df62aaaa9e8af5d022311750a264e7f46c16059d29ab886353b031c594cdee73451d5724bf51fb6cc6f3c893b5708feab56a342513c93de40a3bc26443dc7 SHA512 b418a3eb55fa2fedba1042641cbc8abb18daf064bc50446ace4fa8ba22746bdccb56cb83225b06297130777a209cd9a77ce2550547e6d877d9b7e573a7512725
+EBUILD kfloppy-18.08.2.ebuild 750 BLAKE2B 2aff8323dd982d24403b0b85c8fd57468522a7680c2eccf07646484eb76a80daaed341b03b78c2c403875a2c877dbd611a103ca54ac53f51e54b4ee181cb9739 SHA512 40964453d1b3df90a82fb694893aac569bc28536beee7aeaeb18794b5dd8594e273dbf341f3eea818815bdc48238836a4a292331c2d43d0a5fb8f7e3a17a305d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-18.08.1.ebuild b/kde-apps/kfloppy/kfloppy-18.08.1.ebuild
deleted file mode 100644
index 6bdbc688d3d6..000000000000
--- a/kde-apps/kfloppy/kfloppy-18.08.1.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/kfloppy/kfloppy-18.08.2.ebuild b/kde-apps/kfloppy/kfloppy-18.08.2.ebuild
new file mode 100644
index 000000000000..b9b6a42b4b3b
--- /dev/null
+++ b/kde-apps/kfloppy/kfloppy-18.08.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 d478802bf3ee..d64f5a56a859 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
 DIST kfourinline-18.04.3.tar.xz 573708 BLAKE2B a6a147ba51b2c788e7dd0009f665909310c0ac9e9b296e6485e80c01cbadba98bc9d86a50057473b75ed54216ac1ec7755a53dd626336996973029ef60984284 SHA512 e7333413bb85ce817ea71dd5b12c3af5eb36147d48f2df9bd87fc83f8b975def60a4dfa17fee8836cd3388d5ac6de189f22cd2d35029764569df9773216f0129
-DIST kfourinline-18.08.1.tar.xz 635584 BLAKE2B 685c92b3c65b5a2270ce23438f14977d49e71e02d7bbc68891b737715397fdf88cda5b165bde53964306d3b0b221198f017edeb8901bfe1f8e7c54cd24c2bcee SHA512 b1540e2c3cb1eb3e41dc78836c1341b8afabbf0faa00da596233ecf5768dfffdb6cb20274fb383f8bfe7a35c92eb345873decdf3fe502df374632246f84f4959
+DIST kfourinline-18.08.2.tar.xz 635672 BLAKE2B e7cd1b1bab5b63d953e6f7498bb0fa4b33b43fd0ad188f55d871f10633411c730682cd93c22dd33272c6d6e25cf651e46111850c33301328c64b10ffedf14d35 SHA512 7b36640a65ee644807d9ffc04378f34296e447fd196e80e9e87f19ddf8d7788239754c638a7f119e6b1606accab3f5706b1487e95b0553c75df6491e2eba739a
 EBUILD kfourinline-18.04.3.ebuild 733 BLAKE2B d663c190f21719280e58c0fc51f1f5e28977c9f9ee7804980023dfb57407cd51c1ef548645413ef568197106226d75c88d45deae4e6210f947ad4d56df379be9 SHA512 b158cefe8e92b3561ad8e6cd19f490c6f1397769b6a1cbeccc216667548aa3c4fb38d7add1af2491eafb598ac7a63a562b97c9047879f7bc51ba1e541425113f
-EBUILD kfourinline-18.08.1.ebuild 735 BLAKE2B dea403b189c3d5c834cc37fd44b7b537dd1e260096c88815cd43147a155ae915d88ae364a176a581351f099288d6b0062cba835554b1e7f63551633879693fad SHA512 5605cb8cb86f9ad0acabf4350d35a22cdfa3e082e9956eb6f47d32b8321bb5c1c10e8e27a233b2acfcffe3b462c6c00c1cdb815fd6250e1d3f99a5d61542626d
+EBUILD kfourinline-18.08.2.ebuild 732 BLAKE2B cd0fdcc68db533b72340b8d2909ed18b29796d134fc9caabd19d1a85db9dd78e27bf3a4f06557163b4e07956515c8de451fe2012f22b77839575398dec1a5f1a SHA512 02a8ebd6ec3e4beacb9cf8bde8c760f2f6d4a5871105117a9da7198cdc93e2c65c6075fdf7fe6533d8bb89b0429eef0e170c7a02af154b9ee3b85d98926f9369
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-18.08.1.ebuild b/kde-apps/kfourinline/kfourinline-18.08.1.ebuild
deleted file mode 100644
index 3e6be98491f5..000000000000
--- a/kde-apps/kfourinline/kfourinline-18.08.1.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/kfourinline/kfourinline-18.08.2.ebuild b/kde-apps/kfourinline/kfourinline-18.08.2.ebuild
new file mode 100644
index 000000000000..ace085029e16
--- /dev/null
+++ b/kde-apps/kfourinline/kfourinline-18.08.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 1867cf0be6a4..b1d97ea75dcf 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-18.04.3.tar.xz 10932484 BLAKE2B 1511abc7ade5f212faec31e1ea0afbd134edc9c0757727534a33a51bc29b21328c6bb0973010ac4f1302970e589e87d453cf3dd0c187660eb9919bd27ef1e2cb SHA512 c462a2e3a20fb12bb5583539fbe75d884a4b8f25f018bb3baa15d44054af1c6814d534bb873b66b418927a2009bc3915733828abce8e650c5f3ee752ca3d78d6
-DIST kgeography-18.08.1.tar.xz 10932480 BLAKE2B 63d7ed49e3cceae88e1d3304c9c64c282e19f3244690d54c12504b6e8228f577fa7894e24cb8dc8ca6bf6905a3131111b0ee6158f49c1caa7683def43488e64f SHA512 a2f3573cb281f165fc222304c981b4d88eadd0707b227e5e28580c8dc1ad1b8c9490505a17611b0bcb028e36ec68e473b9947eacd7a8a0834b4ea5b9c60b4abb
+DIST kgeography-18.08.2.tar.xz 10932172 BLAKE2B cca615fc55c592464a3c9a7f08f472ce78ca33490b80839d63aed61c4f249bd396de6b6fea4cd8c8a9b84496a19a44f167318fcf25a560dd53b8e839a37ab2b4 SHA512 87d678d446974d39f449562712bda25777398f6c62088830815850b9959bdbc88e5dbcb9cc8e43141ece256d5db3d31123a24e3e2744cd55ca0f29ec27752589
 EBUILD kgeography-18.04.3.ebuild 743 BLAKE2B eb402c1e0d48c0741540dc47f4490c42b072893c2a916f642714e63f89fd98767ae0e3ce37c88689ebaeb96881a0522f6fa1d5d7159ff0a3c8e6449886662452 SHA512 9b1bab3a408adc8835c0b25fe01358af0ccf897656cacb2be0e39257948eb9259d29477bc50da5e96038ea836e3ba0b49237080ae4331c6488e090a1499b0b55
-EBUILD kgeography-18.08.1.ebuild 745 BLAKE2B 0579dc2b562fd939866d5e772d71cb050043a5d3289e6428b906c9714b388bbc8d4fa6f7dcfe4ff6712201fd1ae1abfe57fe89eb8746c711424eda84a9627210 SHA512 031550e8d91800430084a44b85e735fd01cd0df415e3aa5c8d55c320b5200e06d21a26d22d07b812cf53a28e21346ff368feaa826b6eca43d5329c33fd5b3fe3
+EBUILD kgeography-18.08.2.ebuild 742 BLAKE2B 7a3e6eee9c5b1ef7b677370c1020c43d8bf6ff18fe37339de81ba12cdeb3c2b83c74ebf7d29cc3ae4c6b9406f82948e7ca5d23b86ae48463eaf4b10b9f9145e6 SHA512 18f35102b6f65d82ceccd3fa18cb240d98ac86443a888e98767caf456644c167e7b515ddedf98745b575bf9784065bcf18d6bddc147596a2fbc2c1f987e6d835
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-18.08.1.ebuild b/kde-apps/kgeography/kgeography-18.08.1.ebuild
deleted file mode 100644
index 1a573e6946c7..000000000000
--- a/kde-apps/kgeography/kgeography-18.08.1.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/kgeography/kgeography-18.08.2.ebuild b/kde-apps/kgeography/kgeography-18.08.2.ebuild
new file mode 100644
index 000000000000..8e45af5416a5
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-18.08.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 5f0cd986850e..52e7058f9fae 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
 DIST kget-18.04.3.tar.xz 5213500 BLAKE2B dc9ef5cd626744cfe2aa505887a6046c7da40f4864e3485945fec3cd36b0ffeac974ad1d55a8986f824ea7a512053e82bcab94e5d5af4e35e221cc78a971d320 SHA512 cefc16a3ecd919a6c288e3adf6b63fff55b8dcbb1517b70ebafebea1045044b28ca490bef91a50dcdcd96091523a0a0b79bb5f3c926f719138de29bb29f50489
-DIST kget-18.08.1.tar.xz 5212916 BLAKE2B c18cda82413ae6291f1179bf04ee2c47916f95d76836674e887e4229b3ada563951917f66a0c1d43b9bb2f3c9efeb3aa30cb296abc3689a76d1e3ab2af9665b8 SHA512 c6fb54e4b91952372aaa038c1e3a6ec6fdb82ff0f320dd1f6059fa41118a8399a9369bfd93e7b1db1123c893174469a1479fc7c000c555709d8d6aa80334502d
+DIST kget-18.08.2.tar.xz 5212884 BLAKE2B 40e5dfc7dfc32be9f7aa36f2e886124f8cc652bfc66a24030231f4165f700ba377e47daf756ca691553b51106a1420bf3d11020cc01dda3ee91a740c26b27c92 SHA512 86464ddacea1f139c1fe98abeb4b394fc045897d917ecbf37a986ad90311c7e3423befba1bf8f6dfd0e82c04dc1b9d4f51d11d74c970e031734d5c0541749df3
 EBUILD kget-18.04.3.ebuild 1814 BLAKE2B b72ae45a75d125696f743c0d75e0c539fe6255ac7923c73399e43199179f862fcc6157bea09f8fd88399fb392920d8fc7a819d33eb698fb78a7a0f441accdb14 SHA512 4f986ab160023a00c64afae57b1fdc4a546a07533d9458fecb64f8b4bf08955c2b993afde37b18b8288ebdcd52c3c7c47200284a37fb337044c9f3114c4c0c85
-EBUILD kget-18.08.1.ebuild 1816 BLAKE2B dd04a78374a90ef7a45e828d7741db2207f60fe8e8b8ed79d319fea34c93b547c44fcd7932ed503d520b02c59e6aba416e82fcee9af3c81e2e39fdf1cedd0c36 SHA512 521ded887e48515cf8ee0d870c493584a23efa0e61fb4606873901a7d509f3c864053ffe5ca43f9daff200bd34ed1097278d81043231a2c24216867508ec5f5a
+EBUILD kget-18.08.2.ebuild 1813 BLAKE2B 8e952a72ac548b2f924971f0dc0d145e4321ea43a08e072ff5e7859e3eba4867e1a9dc212263da0fb0ef3691a258f556e0560dea71ec23e8911655d421928a7c SHA512 69015e475ee4433b0ab6debcf8c0d18750bc9e33bcbe364b8bd9665f52abfbe8c7312d20e22c65f66e51956c79916dc5b9a8ee67d44f049bff26dd7aa11b47b7
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-18.08.1.ebuild b/kde-apps/kget/kget-18.08.1.ebuild
deleted file mode 100644
index 314ad8dce43a..000000000000
--- a/kde-apps/kget/kget-18.08.1.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
-
-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 kde 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] )
-	kde? ( $(add_plasma_dep plasma-workspace) )
-	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 kde LibKWorkspace)
-		$(cmake-utils_use_find_package mms LibMms)
-		$(cmake-utils_use_find_package sqlite Sqlite)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kget/kget-18.08.2.ebuild b/kde-apps/kget/kget-18.08.2.ebuild
new file mode 100644
index 000000000000..bd61cb2deafc
--- /dev/null
+++ b/kde-apps/kget/kget-18.08.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 kde 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] )
+	kde? ( $(add_plasma_dep plasma-workspace) )
+	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 kde LibKWorkspace)
+		$(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 eb2f5059d5b3..edbc89be51da 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
 DIST kgoldrunner-18.04.3.tar.xz 4406988 BLAKE2B 9354a0f2abe37b4921b9bbd8c4a496a22a4c8700dcc7acc9927c3660161e1a2eb81dc637aed4ea88bc6ef6205573965069b7ac2a468a1907cb93a1cbca3f1272 SHA512 f920c917322e20fadedfd2b00a93294238f2ea11f7bfcd14110b3feb586958551febc80a729ba5319c77cde08b4e9a68c82df0cf02ee2937472c64c9dc08f482
-DIST kgoldrunner-18.08.1.tar.xz 4406416 BLAKE2B ecd8f9f1cdfdb3e958dbf1f17591e8839443d80457b5b8cd680d5a8d26d03448566a6087e2d6c365b3fb968ddf9963f1654ca436aeb6e30c42812a7217982a9a SHA512 d55d67438f2906cd161f3957d50d35ce9ea7578c0381af39825d65de4701d96230400f41e998be3d2eff65f95bbcddbf8af45769fe5280aafa1d77eff9a9d529
+DIST kgoldrunner-18.08.2.tar.xz 4409132 BLAKE2B 3f85141621dec90b35ec48008451779b5606e926b249da1df5026a2937c48dbe0022ecfa3ecba23a153c715f30467562480f0e2d74709a60a090784b7b03817a SHA512 923fb55d1f70fbe6a1df518ed1c06d31b7360f678247e13988c8b5ca96b65ffe8f35967a387b311d00764c1d035dea7092be1db197447c2da35bb2d3324e4fb5
 EBUILD kgoldrunner-18.04.3.ebuild 863 BLAKE2B 8ad0721fbcae4c372e89fcc4c69c78a22c9fb603d2f2d8779ebb2ba043bb5e98967c24740228440d28f54ba77ddf66d3bb9a466c35f757f208c67109e89d8c5c SHA512 0194780fdc4fa17261a8db7853cb2149f09fd25d6a8a5ca28e97a19eade16e1e41628d93da452c442e351c5bd9d882ba4c18e0947a8e358e30707b30ee8c3dd1
-EBUILD kgoldrunner-18.08.1.ebuild 930 BLAKE2B 94c140584b33809364903b9d4b11f40830698a428f5a7be79cbc2df6e091bb93f823c1564a0c033a5abad63998f894a92c3b579740878deb5c29f14bd8f8ac60 SHA512 d1474c7f5f5648838fe43a9981813d025647b30cdb7aae4041d6abc49e72d54bdcea488fb93583c0f5e86781315038fbb41b4ca93ff05b14469c325cc9953d4b
+EBUILD kgoldrunner-18.08.2.ebuild 883 BLAKE2B e419512e3030d7ff611c5d2bd2fc31d3676ef2e328ece83bd2f3addf5e220b64d640abe674c966054c910dfac376010729d8b58d8146c93ee14605fd0f6e6995 SHA512 f2a86f48d135862150d3eac87336da58def9628dbe6fef7f16ffa3a5612adfb9dbc762f2674ca717c9aec2f298b714ca8a4a98f921b3d3193621f8acb51ce814
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.08.1.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.08.1.ebuild
deleted file mode 100644
index 6c0add2f71c4..000000000000
--- a/kde-apps/kgoldrunner/kgoldrunner-18.08.1.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"
-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
-"
-
-src_prepare() {
-	kde5_src_prepare
-	punt_bogus_dep Phonon 4Qt5
-}
diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.08.2.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.08.2.ebuild
new file mode 100644
index 000000000000..caee6127a924
--- /dev/null
+++ b/kde-apps/kgoldrunner/kgoldrunner-18.08.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+	$(add_qt_dep qtsvg)
+"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 245ae8afdab5..182cd6014f72 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
 DIST kgpg-18.04.3.tar.xz 2822520 BLAKE2B 8ee556bd1ece83cae3b53e8dd2769a3805b7634dc4db9fbe02a51021938c1ff294daeed6d494f40d40c82ff43ea5f2c3d679b2fbbd980b60ebf9daf83f60e50b SHA512 e799244dd28b26cd5738cdc03a07c563eef94a92304d4e045441f9c3104cd37addb240ed2ab1a42b576746b9c02e694111e4a4de8f01da61f95ea940ac69e74c
-DIST kgpg-18.08.1.tar.xz 2857000 BLAKE2B 98b3390e3990bb061833e8fb87fabf90dd8da89143c59aa256323e1dab429ee925c6ab7bc452cfa00760918c336abed7b59ecfb788ab4fa5db7a3ee4cdf19c83 SHA512 339f64bc9be2a644f0c3b4f901c14c19bbe7891996d7a3ba840d9368260e87d75a3860d6bdc78d0ceb2d966f04223a2350a0d86e46b06f7e4a3e665713bafb5e
+DIST kgpg-18.08.2.tar.xz 2857376 BLAKE2B 7c0d250f61a9fcb1299150a1bb3e5ae860b017ea2dfd2fc26f5d7c35b9454ef13e9bfee837eaa506a748a69485b70580fe78ab7b40da95aa9dc61741b281a80c SHA512 5a6c2335d97ed3e4f2d5cce65ec450d7789c31662d1e80d50201a1ef7596791209948bfa4516e2c49e048ebc36dab1316722ba6b0adfa1b3a6a15631da022aca
 EBUILD kgpg-18.04.3.ebuild 1275 BLAKE2B 77b4aa15a4b469e0510d1a30bfd3cb7c5b618ba1085b35f6f1b00c23f03e79a868a32db2191443552eb7f3cb37c56358a0232cbc1eea9601528147d0cd7169ff SHA512 7ba158f0997cd7f36f9944928f3946f5526d0c9b356667e19a263d374e8f9eabc024b1c82eb591cae49c189dd4654339bf85a3c7cc2dd25d1858fcbe263930b7
-EBUILD kgpg-18.08.1.ebuild 1277 BLAKE2B f3f78e4a5b985339c81bec48fc4c8d0de639ee60aaee91d7f2437fb0188f229577d93ef2b21446e94cb4d801eba99a4e1c9c7b8c16a69689e077dc335c2b2e77 SHA512 b2c6c0702e4c46af859b4e13eac465e404ed7f2848b82350603916f5b1030ca3bc62aa103137b337ccbce081077d7f3191199ea4564cdbabefae374f0fae75aa
+EBUILD kgpg-18.08.2.ebuild 1275 BLAKE2B e5e27b8e0e78fce5cce4275c004f04e83529cb08db57423721b320dee7106e7778c04a96228aca42173f0f68c3e1eebd5c5f7aa98df2633cfb95c15fd6f8cc60 SHA512 eeadb86f5c4c0f21c87646a75c1b3da88df68213ce4864f2210c8c6283802da5252c9e59975aeb1c565c169b674a8cc22ff94f880ee52d3fbe3c4f7d8595a8a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-18.08.1.ebuild b/kde-apps/kgpg/kgpg-18.08.1.ebuild
deleted file mode 100644
index 9179f8168592..000000000000
--- a/kde-apps/kgpg/kgpg-18.08.1.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/kgpg/kgpg-18.08.2.ebuild b/kde-apps/kgpg/kgpg-18.08.2.ebuild
new file mode 100644
index 000000000000..d3d800f21a29
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-18.08.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 f614ee20c4d3..d22665f94c10 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
 DIST khangman-18.04.3.tar.xz 7271792 BLAKE2B 1681d7ed248be16ef903814c0d5c1a9c6bd83aaa2ebcd82e2c03b5a98e4f5148b880453c622c76db49d3240891d78e2e1c2512ac191af446e40e68d5db8742fa SHA512 6df84c260f72f925e272f1977bd8b6552ce23b27402e88ac7640cdd4e6a89ef79cae928b11c26c17775c70e424d1934dd7961f2a7f41bb894d9aebd5d950edca
-DIST khangman-18.08.1.tar.xz 7260932 BLAKE2B 421ecefc91c780bac9af642fbc2f6453b242ee7216af44ff61534613ead93212bce13dcfe6ce12285efabf39ee8881787a1384ab7341c09d3197fb31c3ebc39d SHA512 72603208e513a1e7e47b639892f07c57434eaf15d31d3c793efdd7969f365c150f4f05d40652009c5e84e58d92408aa2373f8b70c854d6e3a762bc90aa44f35f
+DIST khangman-18.08.2.tar.xz 7264092 BLAKE2B 88bcb8d29c111f65c53bcc18aa562d01e6133e203a33d441466e80940f6af7f999a06b93cec2cbbed4c54f9418ad218117354490c3b34a6c4f661bb015a13290 SHA512 28db854ae43b5e8613c84a941cc72f9a9399f292383b5f2e6dbb13e86fd4c2459d22b8bb57695a9ecbab7e507bf5a0409582bc92094bf0f67c621b8822389330
 EBUILD khangman-18.04.3.ebuild 1039 BLAKE2B 562fb8187fc5281462879c78a3ea6840a9328cd242557b470d5b099acc8d692f43288068b6e55aefa02d62f75bee5cee1d6819d2b11a39ba706f86973650afeb SHA512 695ea6506d595c25d3cc7b8f3db3a3cbb6e6bf6c7a43938eb0f5d11fd862090efd374b0ccd9c1163527a18fefb38446f1df254bb1594f0950fd2721ae2a278a6
-EBUILD khangman-18.08.1.ebuild 1041 BLAKE2B 9ed11aa400845ca9377bc3a25671f853076e5f6572cc6d8909748677e8a6485790db332c07175e247bd8a7b91606c8d29a33bb8936cd07688aa3541c27b91d20 SHA512 26d8fc36ac7f2e6e18ce909bc89da18f5ec504b2ffb988f08dab7db2a34aec767c550ef4f91220bfe17c3492a132641dcdf5eb0df29c44d0586ce452012db8c4
+EBUILD khangman-18.08.2.ebuild 1039 BLAKE2B 5aaaf1c68894c7e321be18a23578a78b826ab6e9aa91b4ca37237b6acb1d80484cb50c40366bb1661bbcf8f65dfe128cc473113fdd0955253e9deaf7b92d01e1 SHA512 5c2e88d88a03357708dd6e2767a80f99f248a19acd298f4655a0e7af937f7d6a5c2c4f3f4a5c17a25de594d63975b7db26b8f4b3814d195ca58153cb4dbb893f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-18.08.1.ebuild b/kde-apps/khangman/khangman-18.08.1.ebuild
deleted file mode 100644
index cb57c5103efc..000000000000
--- a/kde-apps/khangman/khangman-18.08.1.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/khangman/khangman-18.08.2.ebuild b/kde-apps/khangman/khangman-18.08.2.ebuild
new file mode 100644
index 000000000000..a780506caecd
--- /dev/null
+++ b/kde-apps/khangman/khangman-18.08.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 31430ff56254..d9e45b9e0d85 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-18.04.3.tar.xz 3831256 BLAKE2B fb770d49fa3c98270a41413160a2122caa68a4db796bf722827989973cad5b7779d0a2b008fe1e72dcdd96f6dad2585f5e16602b48799acb3b833aba29c0bdda SHA512 4727de8223af52a9c269d47e59b4de3f7f30a1d06b85cdc71300a6c83eb49ddcc2f32c33db8a9ea7d8d961da6d20550dcf49400df6431fa91c7ec5a2b676dd63
-DIST khelpcenter-18.08.1.tar.xz 3841636 BLAKE2B 60a3b9a3dd65c379c785a6cd46c4a2229300f1ab88d40e57a69d445334ae0fa827e1d29c6cf2a319481bb0ec272f4d4bc6689e7b240a08fb42b3b6ef6e7a3eac SHA512 243ebc119a2e6190a645b9bf0a14a47e14f0bd6ff4dd768ef994b344dbbdbd8242501fa01d28f71453bd34002fff1e119505cfa4f6f7c0ea76e363c84e3be25f
+DIST khelpcenter-18.08.2.tar.xz 3841656 BLAKE2B 6a7eb0c3101a683891660c6e45355dc881eb51cbf95805de410edb2269011b6281057b7bdf0605d7bbad9c7b9608a91f7466008d687e0a8d7dcfbe8a49e0cd37 SHA512 f16f10f9ef9868660eb0bcb92dd34b8acbb1cd1c12932838f79b176bdfae5adb2a104adc673b1583494fbf2fa555204414a59911f8e734c0cb5a19b90b423759
 EBUILD khelpcenter-18.04.3.ebuild 1074 BLAKE2B b8398202280e0f2022e1344b8dad8bd08d265751f6ee1cdae608b0629a636064b1191e2e9c66e034f5639c6b85d5bfbe4f5155c77679227bd3a045b0bad1f58b SHA512 95f51a67a22432bfc25d0885d511405d50573443211e73a4504f3e9c82a9f544493aec6598334371df026ac67f2d5458d5f6224b6d1779c0c4db5dcb9886b4ae
-EBUILD khelpcenter-18.08.1.ebuild 1076 BLAKE2B 486b0db2c0b7c4e56c202eb8a20011af55e91b9e898f843a70442ec051534a092d4ea08504f33c3dd9a2d4732e1ecae20df1f1a1f27bbec56e9e055be95da9e3 SHA512 f3bc0e7f5bf85730e8a81911932ea2280e4c5240e1d63f545a3ef487dac21a8d8ede2cee67119c33915ee1e0a8aa94a7515013a7927bb34493282dbd4404b554
+EBUILD khelpcenter-18.08.2.ebuild 1073 BLAKE2B e77ae6312c8d6b3afa370f82152cc4d7116cee163354c7a4b42377a285f30a145e1a58871bdc6d01cfba11c0e0135df1ea6588dc4dfabbdb08a05bcc64df77e9 SHA512 5d730f094d42b59bbd0507cd6a57a49d1af2f9f61ccd7e8332fad52ba2166b50a6b7572926becb4a834296cee4e87441652f162bb1c46a2d3f6742b26c2401b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-18.08.1.ebuild b/kde-apps/khelpcenter/khelpcenter-18.08.1.ebuild
deleted file mode 100644
index 7a7d14ca377e..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-18.08.1.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/khelpcenter/khelpcenter-18.08.2.ebuild b/kde-apps/khelpcenter/khelpcenter-18.08.2.ebuild
new file mode 100644
index 000000000000..de27ff250f73
--- /dev/null
+++ b/kde-apps/khelpcenter/khelpcenter-18.08.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 4fd0ad86b66a..c705f66c2b90 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
 DIST kidentitymanagement-18.04.3.tar.xz 148148 BLAKE2B 17cf0a0e449c99cfce153f29f5dd5cb8db5769250f4a5cb70fc2c84e6d644fdd7f18721bc55256c357221e54460361f1e1ebf19890ac38f01392d56ced7a8663 SHA512 4e6ad309d18e2bb88a86a1b236bb29782aede0ca18cc5e4ac76926e17030ec6367d80fda50dab4c29fcf5a4475560e027edbb7cc9cdedf2c3d6f9dba7ff6697b
-DIST kidentitymanagement-18.08.1.tar.xz 148236 BLAKE2B 65460c7ba90a0f99e15280f430f5a019a83c8d2cb87f66333f24c66fe342f3bcdad3f3c30293ad04248da4822f13c82fcb7bf57eddbb468cd9d1f1aa94501d75 SHA512 cada5292dbaab54fe41a2bd8967ddc023d1334210c79cf78fc1657bb24c80e1d2232d49a250de98f9092272c122690ad6eb86534aec370a95c93fce19f46b829
+DIST kidentitymanagement-18.08.2.tar.xz 148252 BLAKE2B 49150ff6b31da53c22595aa7294fc0c6540cc0c3f488db2829bfefa609fdddfe22882d9694e4742f5b22e24b5eaf4874ebf65ebc8e9b237e99b27e9eae8dad56 SHA512 97ea596a5cde45f5835a6b3ae29c52a9b9dfc457582fa5ce677af674f2b52a113c2dc37f80bdac56d69a42c9d2d8b2d377ce85a19054b093d75cde395f975825
 EBUILD kidentitymanagement-18.04.3.ebuild 768 BLAKE2B c958331ed3a4f7db3328327f9f42f9e1d52b8b220062f74d787cef3a93a9019f1ea98e0c5f3205a0e9d7f053cced1bbc665d09e1ebbccf93169e45f995121914 SHA512 684a847d7e536f9c19785d0a1cb3bbd473ee3c75bc370b6a492bca0eb4b27769b310f87e3033fd73dad99f292dfd54a891f7145e2ed5af3be6899ca23f5f1b9f
-EBUILD kidentitymanagement-18.08.1.ebuild 770 BLAKE2B 5c57835bf25c9ece4b51ff3f3b728d3f32316c1446c3841432e18b4449cb8e701eaaff6add43f87c3758d0d1d144de9fbb605d31e983244f61861796c4462f9e SHA512 a60c9d8eb988c69225c6db31ce360b7bd096e40e489899f9c0b619591d4dd28fcacd2ec5d325ad76eadb27fe6219eaec317b1cb5d6d388490964271683462dac
+EBUILD kidentitymanagement-18.08.2.ebuild 767 BLAKE2B d0909c28d4601d42be15839f68120bebb0e797dc3c5b19bb943a4a529311787084b32531edea8568c10a5e5d70db9db9718a2682bafb7caa3573e054afc7bba2 SHA512 f2b6361919ac349a1a750e95044d7217aeec69f5ff66392a0df8c9704b96b6eee7e7daa2432bcc09813879ed2c3ffbfdcf000f59234be2d132a40035b2332767
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-18.08.1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-18.08.1.ebuild
deleted file mode 100644
index 9cc840613bb2..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-18.08.1.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/kidentitymanagement/kidentitymanagement-18.08.2.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-18.08.2.ebuild
new file mode 100644
index 000000000000..3c17725c9d10
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-18.08.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 19505853e67d..7d598769e235 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,6 @@
 AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f
 DIST kig-18.04.3.tar.xz 3591984 BLAKE2B 6ac5285f4e9a0fe97a19886a44874f352e96688d0fd2c81bc9ea8119570939654b5eb26f1c874eaa05894d7518b5b199f42093939d20baad898af2d802f55665 SHA512 cb015a7d675cf0854c8f911fe0f9868c3a55c844af9f4337a0ebb67ce14f75146fe86a03248cdb0c7f361dba61d58276d0893fa06b355f26a85faf48423ce377
-DIST kig-18.08.1.tar.xz 3597036 BLAKE2B 8a2ee1ca32565176398057558b7258ede32dea6c9e22ff246d70cd8f27d0276ae81d800095152ff2c08a40d58a2021c85f469e22e156ff5310828c0d1df47f3a SHA512 db82e76ea91bcb263f5bea85a0dc5fb50d6cfe88c37d1acde1f0ec237a666a05a51effac1fea1a5648377eafe265a430838fdcbda64589641699565572aade5e
+DIST kig-18.08.2.tar.xz 3597016 BLAKE2B 02c62257000b8ca1c9fb4b187cfa595dfc2fee18c1521d102fbd235eb88a12077575c030632b04937047a57c2256aa58e11380419a713a4362c318b9ec35fb6e SHA512 4a18a802649598d0a66c4ad459a20e86a4587639cd0ceddfdd0e0a2403b8cbf31b836a53ea520e71b13b3d040cf9e8f2ac13733ebe71afd59c7e54fd416ebca5
 EBUILD kig-18.04.3.ebuild 1499 BLAKE2B 2b4a6e92492c904751cee9d89337a09e6eadcba375167a2c47e8e391b647a7cfda57b9fa9c03673fdc601f7fd636f486d9a752875cf18834d33079ab933ea3c2 SHA512 3f95555910729514ab7534c5017c33396bf1df644ce89961e339997874e859237ff3808846f5b963831f5023e7e86a1248ede3da3af4c9790e1812f94683f432
-EBUILD kig-18.08.1.ebuild 1501 BLAKE2B 4e253b1af7946157292a42f9386d49629901f0c0be646584d75ed70b86e8e323372df58fae69b0b43b4691963de94f9ba12b6e624c1037da13db03311d100b3b SHA512 519374484f25b8b838c0dc2d4b739be2b1e30e6901748dbd96a9a2d560886c1c0a7be4b120a98786e0d1fe56cafb38583689fb221154afb90d4c06088fd2725e
+EBUILD kig-18.08.2.ebuild 1499 BLAKE2B d1d57c75b2f2728d080c37eca45cef0d1c35ad22591558b244c223489adc84126a6be818bec9a2598041269f3b36bb1bff55dde495b016997e5ca36d3eabc246 SHA512 c2b82a7bcd2c5bf0152bffa108dc9397050913e46465fd05a13593f0d8362cb670ac0e5e2ac78893ba28862a802c699b11a99baa1d846aee35ed0c0d9193df0b
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-18.08.1.ebuild b/kde-apps/kig/kig-18.08.1.ebuild
deleted file mode 100644
index 7e2644a1fb74..000000000000
--- a/kde-apps/kig/kig-18.08.1.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/kig/kig-18.08.2.ebuild b/kde-apps/kig/kig-18.08.2.ebuild
new file mode 100644
index 000000000000..4b0627e87696
--- /dev/null
+++ b/kde-apps/kig/kig-18.08.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 0b22c0fbe930..5017492989c6 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
 DIST kigo-18.04.3.tar.xz 5224404 BLAKE2B 32285e811a899cad93ab05ef08b00336d13d04fa1371cdf994ca9ddfbe1a87d2328b9544f5090afcb9d1a720637281b362d722496cf6388cc48a44573edc78d8 SHA512 3e42114294c633985ba527390bf24404086fd5fa0a03f714201af1a93c2e16a6b325b10eaa5459aa11d4f11fb69a88f3fa40c8bf3a0535ae44ad6ce408591c7a
-DIST kigo-18.08.1.tar.xz 5224276 BLAKE2B 971b92bc1153c9f74bb07826667597362906ae692d10df519660a8086d626c5918ab3ae916f60ce88307b5cfaed475ccf97b0a5569b2a22a491460795bc864df SHA512 664b5827f505198cd173020b36ebe45f1721143c0a0ca5867e7ebf576d490f043c09a681cc44403368a88c1f5abf81bc0a4e1c9d1f437740ae7a81f8ec770972
+DIST kigo-18.08.2.tar.xz 5224336 BLAKE2B f59083613ff54e1389a245ff1697c0de01aed35e60f541df8665cc7c15681665ae87b0a652f7e29e24f889a57658c2481837c266ef7e42f6736ad52247d3f267 SHA512 298179d978f41fb92b0e7bff0343355e6c6b7507cf91034038c86ba29b7bc8710f9e351656f73946056a2d4396afe0cad069ac809e2b05e7af57447a688ed610
 EBUILD kigo-18.04.3.ebuild 853 BLAKE2B 317ccf14cb550b706e68ddbcd4ae5f155bb53afcad1421b8455173e7847586a8f192929e41a186c73d5a2b01fe46ee2b273491847b10d36e4f186806850e4089 SHA512 da2004f56ef18d098ca8008a12a320229021fc1809b96f237c61a3b1a88311fabdb927c4c609aaea5a6911f47315caf96578f6995ab3555b8dbe78c70d6ad7f0
-EBUILD kigo-18.08.1.ebuild 855 BLAKE2B b7b6b082300f6584f3156865dd32934aa948593c333a3b9b6b77adda18cb267bebdb09c3237423762f9898bccc1a0be561f7360be9e2e12b4448bb251bb555d3 SHA512 72a0cabf0383e7eae958f0b5812afbc7a9e7e868efb38ff2d81274d1a41311e14e7339c74d84f167929d47adf0147227801addccb0ebf2ab8db89ccba3cbe74c
+EBUILD kigo-18.08.2.ebuild 852 BLAKE2B 40d74f8d077ef174e92532a58e62134bce739a23212505454e834e2b3d0043e3cedb1a2d48157984af16c5311d001a06a3d8f1af0b342a38f7f55d802ed12d1d SHA512 c6510f2fec8c92072dc9eeb1b1d0a669f4577025e59166b07851eeb84a815bb017283a0a6720e80468fe200edd5ddc69d4511e165424ccfe186560cdf3674d36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-18.08.1.ebuild b/kde-apps/kigo/kigo-18.08.1.ebuild
deleted file mode 100644
index 3dd95da49b6c..000000000000
--- a/kde-apps/kigo/kigo-18.08.1.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/kigo/kigo-18.08.2.ebuild b/kde-apps/kigo/kigo-18.08.2.ebuild
new file mode 100644
index 000000000000..09bfb89a580d
--- /dev/null
+++ b/kde-apps/kigo/kigo-18.08.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 b308bfdeb3ad..4eb5f5a3089e 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
 DIST killbots-18.04.3.tar.xz 1165284 BLAKE2B 5d8e7aff2fc2cf670693c1985217277d33d88bc7c9550dcc08fbc9503da218d4551c665da7cf4c914885155f6f1285aac7b9180b5fb677f27d7dad3739a1d705 SHA512 b14103edecedc5b3b8602c56b0291d4a2cb73805098f2380c48dd010b1363901a36adaea3b655d474cb379679932060696cd7dcb3a0cf5d91531778980f9fad3
-DIST killbots-18.08.1.tar.xz 1165252 BLAKE2B a34a48ffdb89bb77caa39608157104de03b176d6d2eb407ac49231273002c1162eeba1e9a6878caa581dfa61524b893b8a4ca55a5fb2b7812ca9b97ed90270fd SHA512 471d20aec8e9e9391c3125f52d34a8e687819838510937180ce51aa5f6ae3bb61b82bf076475a16514a4aec024cac2c52166c25a2c60a16b3327915c3700a45d
+DIST killbots-18.08.2.tar.xz 1165152 BLAKE2B 5696fa00d32effc83d330ec958503ebe29c6cda38848f68361d8d06b68ec90a1635aad0d4d5b82e097744e92c6ef1dd720a5bba78f56bca447260def5438fe07 SHA512 c49768699caa9888d53535fc0a4c13af299062698ee16b5bbb4e52bef99f1a8201cbc1ce06de9ae7d1cce75a0d9c92e8aced01f7a39692e66f71e70dc1b8ad85
 EBUILD killbots-18.04.3.ebuild 715 BLAKE2B e8df4101325f24ec3ee979166690ef2b70ba9c0fc409149f5cf9c4b5d02d3fc68c70c6d896956fe334c1d6870371b46a2de36455e157c82c95b4c7623cc9ab0b SHA512 70888187c4e26ea0e12baedfffb483cf0b2b15c372f8e4241344f2cdeed0448ea1b930867d7928060944fd03132fd29d3aaa1b50b8fefaf8a5dda55ced792e94
-EBUILD killbots-18.08.1.ebuild 717 BLAKE2B dc4b87bdf1ec9849a50259f97d40bba1ce533d5602fad5a0946806e7016c7dc43a6855866d220c44b09fb0e53e746d415964e7a48e899bd655e4b5d9137cabad SHA512 d56d56fe75a815f7eae1c06f02592ca819ea7bfb06fde0cfcadb1d268e0d9b8e58000e7c252794a7be740607f4ecaaff39cb469e2824ee33cfcd3e34ad12efda
+EBUILD killbots-18.08.2.ebuild 714 BLAKE2B 7227670f6c0eb44c35e0eadc038834101eb91b00e622f0b811705fcf3407cf6b408484df8b32f99521e97eb33582f87672097fe2871d8daf1e59bed4b90d77fd SHA512 86c90b90b3b51a5ba4b3595a06e12cf560f2bd78aceca0876f85945aae8dbadc14279d17388fe3e8ecee990b2ac3579293aab3b6685aa6cae1d94d89d7859537
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-18.08.1.ebuild b/kde-apps/killbots/killbots-18.08.1.ebuild
deleted file mode 100644
index eb0d9bdadcb2..000000000000
--- a/kde-apps/killbots/killbots-18.08.1.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/killbots/killbots-18.08.2.ebuild b/kde-apps/killbots/killbots-18.08.2.ebuild
new file mode 100644
index 000000000000..8e9b868cd539
--- /dev/null
+++ b/kde-apps/killbots/killbots-18.08.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 64f8e18617eb..bf16db7d7e59 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
 DIST kimagemapeditor-18.04.3.tar.xz 1056724 BLAKE2B 8391d25f9621b91e17fe7cc251a5f1b3a43b56102acc9b9b1e34dc709e589d7b43b111563bf5d864f33490f3f64e903c3d8e8673a41e33cfc7136e1c04d5b9cc SHA512 ac9e491a8557be0e28fcd2f01fe3a7621043ad343acaf6ab68524fe1cdc1733d55c8e63ab44145b7aaf8feb39d77cf9fdd68549e39f512965342418bde7be872
-DIST kimagemapeditor-18.08.1.tar.xz 1056996 BLAKE2B dc4cc2eb7c1c47acfd816ef91fa5aa5b1233f745d373be16d0b11fdb8814f040195cb01d99832848f20c4dd28e0384fc5c3039a7c1e7f36ebc3dee9db773b8cb SHA512 c4eb81d628b24c7bdb2bbbb42fbbd258f377a51a0346608d422044a9eed510bfd5f676e465411d4256ac56f4de1ddb4510ae5092aa342a3684e5b1fb739e8985
+DIST kimagemapeditor-18.08.2.tar.xz 1056964 BLAKE2B 515e6eb001e9d9eb616d6d7a0a582a389ccbe421c5cb78f82ed61bed5f87143a01aa1749e590f206d65cd76bbb682fa198538662335fc67afe22fd081bafc787 SHA512 b0ac703f95a8ffba6dcf4d4865cd666c108eb816a78d0478b8ffc0bad62128716dc2dfa6b74b5a6cd8a8aa9ab3dc754b52a8736e8825bd409d8499f4b84ac4ca
 EBUILD kimagemapeditor-18.04.3.ebuild 803 BLAKE2B 67094a945e9991e016c3b2be781596040669dfa639ed51e4325be9b413bbec359fb128f069a5e2230f78705f7fc23509545c1f04e66109f85adee60a63ec6b43 SHA512 4377f373dce195b367de3ad344da3c9600f1ab840378eb5c98530b0c3e31763e45dd70d5fad6936f2e4c3034d9a97a342d0147ead10a6267bef1eba87fe081b5
-EBUILD kimagemapeditor-18.08.1.ebuild 805 BLAKE2B fb2f5741989795260a1543150fde839c273dd8c41d33a0b9e20b1cf48078f17dbbac54a3f543720a4a66ba9c12538405f33f234b5bf52c890d6f36ac6d0e1f6a SHA512 09a4ff56d3833b12d11eea326eacab5ddebde43828ca947ee1635655d8efb9d5c0782bd20d78dcef66bba939bf6556074dffce941d37134636df9f5d133896db
+EBUILD kimagemapeditor-18.08.2.ebuild 802 BLAKE2B 8007ca2f632f2720faedc2140c2dc431ccc1b1ccebebabe6ce8204ee27e062fca46a5d6010183d9a3ce4ddc3dee95ef5a8c7070cd010950288f5291e6601b81a SHA512 90733b8a8a08432151015b3337ae4d144d5a3d61928623ab74d4516596924681d2cf29716f37582d969eac7b37e9217e9fbfc4ad951e1034290d9573d5386dd3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-18.08.1.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-18.08.1.ebuild
deleted file mode 100644
index a457413fa6e2..000000000000
--- a/kde-apps/kimagemapeditor/kimagemapeditor-18.08.1.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/kimagemapeditor/kimagemapeditor-18.08.2.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-18.08.2.ebuild
new file mode 100644
index 000000000000..1b577dc05ee2
--- /dev/null
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 916f76a1791e..a4ac9c597e2f 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
 DIST kimap-18.04.3.tar.xz 119332 BLAKE2B f235a3ffc973bdf3ca27eba494b279c4ae2cc9b5eec8bc2b8597667fdc3e2d2fc4f9c97a0437001a13c770f498480e0945f85aedd0f9c00b20aa4b027650dd02 SHA512 a17e4132a3c0d698eda715fa7ebcc5d7d4e16b9ad8aefab25bc3d91a64200504fdfcf034d42929f56c0b26ee90ad8b068e58b7bac1d2a3934ae5757de4c3b966
-DIST kimap-18.08.1.tar.xz 119812 BLAKE2B 83683413a18f272d3942544370cb70df30f1c7a0cfd6370de16175efb3bab5d2e811582014abbbcd1f1c7d5f11e0e7442924907c2a1c2dff164395eb63a53901 SHA512 02a6d16eb921c6bdc5ee30bf92754cdbf2188b222bdc5dd62acff9f9f073cbd8f97207d434ba49538e75024b7fdf036dfb244738b4e64994ab8d78456cead827
+DIST kimap-18.08.2.tar.xz 119868 BLAKE2B 89523dcd41d24b9561161fb9ee94cbec0d4b56f9636a36218661cb7b3f0293adbf80e57fcbd9aa63905d9fd9e0489887395753125f694ce5c2208299dba58dba SHA512 78fe5c2e202ff3e17e5dba2d65391a67a4921f1839db570be668cf249fe9568a61b1e8157a7db450123957f5160d18b1d8dc3884c616415299e987d77849240c
 EBUILD kimap-18.04.3.ebuild 721 BLAKE2B 6cf62bd63ba1cfffc493e50b6ab7310ccfb8559e537315f17fac45891cfddcc67d3b831e4a8e8bacc686cde7898598c873ab70bbe080434e70426e2e4f31b3b5 SHA512 2ff2f8668fdc35bf1771a88c1be2816ecf5bc352d2c93b3d751037ba4f486552f223a1776ba0ecd93da94a2115edbf9ed2af6f5160b3cb35e31248dc0d25127c
-EBUILD kimap-18.08.1.ebuild 723 BLAKE2B ff74601211e0f90b30ce69f1daa4681b583b45f049455cb3fd51d2d704d28bd2eefcf3245ca7577834d366ecf215363ddc8951c6ac3debee0d8de5c180c94537 SHA512 81a73956d8983e4e526fa3ca3256e345a0c6740dcb1939e177a59212d3beb13716be5ffa5d0a788cc4e88f306b3f2c7c9072975dce8d89ec18fc2ae0f2ff8e85
+EBUILD kimap-18.08.2.ebuild 720 BLAKE2B ceacb56e392be478fdea694373ef742d85b29c563201eb006cef0b5a3bdc760b7be2a727efcc37b5389223ca9fa97d08fc5ea58d64d88ae663005d68d6831d34 SHA512 d16ab23f11467af9895fcd125b717fba0174771ccffbf4618968ded5ddc9e3c3a34a4986640255039db594b30dbeea71d5eb4ab3b4044e8d7c3112a06a141f79
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-18.08.1.ebuild b/kde-apps/kimap/kimap-18.08.1.ebuild
deleted file mode 100644
index e7bcd2eec264..000000000000
--- a/kde-apps/kimap/kimap-18.08.1.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/kimap/kimap-18.08.2.ebuild b/kde-apps/kimap/kimap-18.08.2.ebuild
new file mode 100644
index 000000000000..dfd5dd064f0c
--- /dev/null
+++ b/kde-apps/kimap/kimap-18.08.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 e96017078da6..87c4c76ad61c 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,5 @@
 DIST kio-extras-18.04.3.tar.xz 549840 BLAKE2B 7bb03f01fff6930d5b7bc4cdd01e960239d55ede4feb4eeb131db75515763cf924b288811cd99a5d89a79059f2cd5241e872b990799c758431f13f1440eef424 SHA512 49ab5ad8d74831a9ef1636e46abc76d66d3ef7d9e8f1ce793eb8d5c37f9e7ee4205c9643339f5c46657d4f537572e3f8a180ebace8599a1dfcbf8d27470b2f0b
-DIST kio-extras-18.08.1.tar.xz 552308 BLAKE2B a53fa51864e8120c2ab3076701e07a655133da809b01ad4618d641d8c9784d592eefc7e65363116c1886d0ed73dd9ee86be550f41929c22a00a5c639306044da SHA512 152b62c43c81df4b874d68d3504a18891f68b047e74edd2eae37fddcf72302696db9e0c006b037d3ea5a688cf838e69c949fb5a9253dde7c26c8e1ba1cf7f7bf
+DIST kio-extras-18.08.2.tar.xz 552276 BLAKE2B d00b78c40059513bc7a0a9e05e7c28d93ccc97bfad9266a84fd78e28906d7534124978b77da61c11defd0b479b8f65e3b1a0361bdd0ac328edb6870d0bb6a82e SHA512 da2f9f573f993a49fc54efba25c653614b3505cf727205eca360298f88b783505171168931193080bc5e50f5a9e8609b90f5a9a734894e087cd8ed5805f3d905
 EBUILD kio-extras-18.04.3.ebuild 2223 BLAKE2B 0745386e8a162a0b99e88a17e2831f169b2553fce7a2042b5e429b26fe6c4352dc6d39b0c1fe6429f0a1da273153029b8be5313602432bd9d1c08563f4f78c58 SHA512 de06b453a62678f330d13ffa8c2578cb6f6952999d83973d54c86bde7b52b23f511fa67f5e56434483512079d56655886f95f5fa811479ad1c9779a5712821d5
-EBUILD kio-extras-18.08.1.ebuild 2150 BLAKE2B 4c269aa9852038a317ab6c3cdf5133491b6a97e10a07f88822a1c97b2f95fae0413642ef063ade1f9154d1bdad347e8a53d131bce37fd110b484bbfe86e89fa5 SHA512 1e940558cee788f608a01dcadb230b3178dfcf843d8eac0ff78bc3a3ee96964c6d22b0bb64771eb37a1a14d10fd757364887c84cc248fbac4268e44490b1dccc
+EBUILD kio-extras-18.08.2.ebuild 2147 BLAKE2B 9a5ef1879acce76e743dd846d5413e5a0c7544f44347af72f93f07c395184d755667c68656b01e35edbe8fc62bcfafa8f3a84dec518de8745d49fbedd578e7f8 SHA512 d828ff4cb8b7695bd27b69edfb39b50282f76514e60fa549070fa39012c400b78c55e9b27042f9cd1ec68fa89ec01c80d2e974bfabc479aca9026c0bf54b5017
 MISC metadata.xml 765 BLAKE2B dc7954f6adcbf433e73a70b1e352c0522d61a9dbcd09894584407d5bad621788b36eb8e9f5f79c83b923baf11b14dea8372244d06f005220c282549a7d8f3dd6 SHA512 63acedc06b541f4150c89fc289ce05b86fab57de253e33626fbe9b02ca0511e9d34cdc1169c1559945ee1621f46aad09fd526c7fa647ffd1cc04e09509516378
diff --git a/kde-apps/kio-extras/kio-extras-18.08.1.ebuild b/kde-apps/kio-extras/kio-extras-18.08.1.ebuild
deleted file mode 100644
index 0759e6bae538..000000000000
--- a/kde-apps/kio-extras/kio-extras-18.08.1.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"
-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 +man mtp openexr phonon samba +sftp 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)
-	)
-	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] )
-	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=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=ON
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(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 taglib Taglib)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kio-extras/kio-extras-18.08.2.ebuild b/kde-apps/kio-extras/kio-extras-18.08.2.ebuild
new file mode 100644
index 000000000000..842ba65606a4
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-18.08.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 +man mtp openexr phonon samba +sftp 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)
+	)
+	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] )
+	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=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=ON
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(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 taglib Taglib)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 2663c32f60b7..9c9b48313874 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
 DIST kiriki-18.04.3.tar.xz 327092 BLAKE2B f5b2af57eb2a81550f1957e14681c2336ac640783bdc1ab0a1a82193a0b8ae109d43155a596a7ebcf189523c4a7fec52aa5b82916449ba74952d1e2361c40265 SHA512 2d00d7d04768dea1000f5d96d69e069087085f5450cbd60425f686ae7dc177cef67575b45a107ef203c2a7b04e7aa2f9168b683d7c624c04ca8e85465d8b750b
-DIST kiriki-18.08.1.tar.xz 371884 BLAKE2B 821dfcd0c6511a007e6080d0ad03cea6400a934ab42deee8c9b4cea598084e281db019107bd11ee08e416a45faa154540de512c513faa59ac48bb602fc17ae17 SHA512 5e14d301148e9c333bca36753291228337b7b3b00c2ba7946ba7fb0f7bcaf52f6a570825a9d68053e2df5b4b24db237f2fd94198b47a5305662c68a63a5dd64e
+DIST kiriki-18.08.2.tar.xz 371844 BLAKE2B 1fa1788ea2cf41e28cbd1c916010f3fc5698f64c642ce9bc4f4f768950b3ed69f1590e1782e426655654ba567e7e06421462afccf46c4e4e3b13068f6bebddd8 SHA512 ee8fe9774e89d91285550970409689774d426e6da1e9ba734e4570ed346556694a36f51921c4609eb226620d111bc6b49dc797f77c41eee124d315aaf582aebd
 EBUILD kiriki-18.04.3.ebuild 780 BLAKE2B 3ccd5c6a3d359aaea020421a3a9fb70cd37bdbd012fee6e8de431c47b96881e118a826c4b4f481890e705690177116c1cd97265994b56455bc0a42362dd703c9 SHA512 54c9b931af8bc19c85b70736a8d459b8df1d798db8732f7f55fd26e26e8ec30e31e8f4d83dbc02b48a05a635ba9af00f95a9b6be6174392457491f6aa1a7ac46
-EBUILD kiriki-18.08.1.ebuild 782 BLAKE2B d4d941f4735a95ce94622cfa97ffdd8d1528c836f28d6569cc35358fd0195566373a2581686f9793457ec04a1ad61495f2c54c035c9fb699af106fbf391bcd81 SHA512 5a251124e885dba2fd70f11b412af3a060060b8fbb4f06cc65419d5c22c7d1463fa4b4d451cf768f0a34ed556f4730e071eca2ab932629f6a5eeb5dbc9a45b5f
+EBUILD kiriki-18.08.2.ebuild 779 BLAKE2B 70358dec893e2e2509f4d9385e9c2d8073c2e84e37bd96d622cd97c36f41e58a969110c2174748a5afce7f3a02e0f70f5f148a83f5af0fa8bac578d506db4132 SHA512 5e292d722ab3ffcdf450507a7841376b41f1175ab956fbec3ab0a1209a3dfe8cc6e4e1131938e72f051437f90986bcc6c00363a13cec3ffd70082467167232e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-18.08.1.ebuild b/kde-apps/kiriki/kiriki-18.08.1.ebuild
deleted file mode 100644
index b0d97b3b53b7..000000000000
--- a/kde-apps/kiriki/kiriki-18.08.1.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/kiriki/kiriki-18.08.2.ebuild b/kde-apps/kiriki/kiriki-18.08.2.ebuild
new file mode 100644
index 000000000000..d73a6c103d8a
--- /dev/null
+++ b/kde-apps/kiriki/kiriki-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 95f07fc9e810..457d45be698b 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
 DIST kiten-18.04.3.tar.xz 11554812 BLAKE2B 00f1d12ee3e39e83cae4fdc66ca78c99e7db389ae0aa91eb5f43a85a1ca3db3471e2f1f6b911fa94a0f58cf4ff021536c43508e68d2adc76d9663b201a64fa4d SHA512 b377ce0b7f3644c23301d6c3cd3a947e311a8b62e786ab9c1e66a3c2b0675eaee5d90db2023fe15e6c612cdf82d616e9afc13b90a69f3199c442249dbea63541
-DIST kiten-18.08.1.tar.xz 11556344 BLAKE2B 6c76852b9ce067e827a03adf16c78ad02822890ab2894b89350455ae5b6fc959a5a17aac78a75dfc675d85eef9f62ee01d24aac97ce946254e49fb049ce72be1 SHA512 32d542778e8ef63df9da29be94e76ffdf8839b88419906c78733449531a4fb4b62bcb9940e1c49eae09c9da75ad6c35e9d18d426848f6bcabfcd0b6c71da3525
+DIST kiten-18.08.2.tar.xz 11555696 BLAKE2B ff5aff1532d70acba09b3252cac47342fedcf35af07c4ae2b65fabdd9d159ad2ffdf6fa90a3cbfb996c435428d1b5f7093231329ea5a5dc1fc7c9484a274c7fd SHA512 29ec6725d71691543275f8ee0a30bf54ac8795df0498beb1e4981bc4060d44a59dc936e910823470f0fc6ff3b4801d0794edfc58fc9a4c56e33671d2d94abdcd
 EBUILD kiten-18.04.3.ebuild 811 BLAKE2B 4e2610272301095da9b26ef32278393ac8db2affd5bf3b79baac0e335d5907a721a8c74717a02b52b232cabf41f206f54ebd155ae41abcbf4bd5650cc9dd04ce SHA512 c77cf3e29c5437897a144100518da7012531ee7cc3d5cd628481be988b446feab3f193ebc877aa96e7a2263acc1ddc1ef089e1e0286aadd30972f374faf5ca22
-EBUILD kiten-18.08.1.ebuild 813 BLAKE2B 35f2e8a4415df279ec436d66ae69f785107c4f65ce7f8b34cbe06d2938f39c2985599a3ba9aca040ee95a9c6fae7b2b3761ee94d94de3d1616ce343cad141dad SHA512 3829e1ed3036fac31a30e9fac59257db3372191a6186052405d32438ddc5eb1a2e7d0730e638606f18155b3795e7ef36ff1ec276706e0bf16dbd56dd20abfdd2
+EBUILD kiten-18.08.2-r1.ebuild 922 BLAKE2B 0dfd5469b0ec4f20534dd3885e5d9b44e76c293b71c70603bede34f1e8af4afc002c618322e494da6bd9de2f4a000dba022724e09eb5f3a017e56ec0f43bfcd6 SHA512 2c38952ea3d2b408823b1ae3764ddc7406ee8c3057ffe44123332d59c9898575171fa8777f1be535fbba1dd5d770af1bc48a1e1a7be6448fa59be8dad1c9f4c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-18.08.1.ebuild b/kde-apps/kiten/kiten-18.08.1.ebuild
deleted file mode 100644
index 19dcab41571c..000000000000
--- a/kde-apps/kiten/kiten-18.08.1.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/kiten/kiten-18.08.2-r1.ebuild b/kde-apps/kiten/kiten-18.08.2-r1.ebuild
new file mode 100644
index 000000000000..07a0d261f224
--- /dev/null
+++ b/kde-apps/kiten/kiten-18.08.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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}
+	media-fonts/kanjistrokeorders
+"
+
+src_prepare() {
+	kde5_src_prepare
+	cmake_comment_add_subdirectory data/font
+}
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index fddcfed38669..ef0e0a13929d 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,3 +1,3 @@
-DIST kitinerary-18.08.1.tar.xz 622920 BLAKE2B 9f468b818f3807121da445237638d19e935a7fb1f5ef62082e0afae509712c9bdbf3c9469cbc1e722b048dacc39b5a05200e9c1d27746ede1b47834e2c50a795 SHA512 ea4a04f790cf65c98c4eef632f8dc5cab9717f8fd2d5c5688e57616c57549f344ef00d31f4e43361da3c91247c083128b1c29bef717989412d938283457d3298
-EBUILD kitinerary-18.08.1-r1.ebuild 829 BLAKE2B 02d6c0b7f22b566e6c5c359f562247ceb50374d8f6711492c8092e2339b4e830d7c43efee366772ba114206c78106f40ad5d8b7ad0edb229cd9fbd6b18b23b9d SHA512 a3c688e612ff0fb0ee8a1bfbac7df87f78b6b9ded6b76b3fd0d1dff99bd5400723fc890ae804c4d7d45c61b2a137b07c76856c80856c42972117bc6aae0cfb1d
+DIST kitinerary-18.08.2.tar.xz 622880 BLAKE2B 9fc5cfb1c0ff95f2dc1a629cd7cf0022c4f7768c28b34066080d0e3be2e10d910f97462950ec574ae8740e96f017d9d042a562dcf26e012b89440c919d3a7522 SHA512 1658c77abc3cde9172e4f77e8fd291590431628ce45e7041ca6068e5d7dae0925587dd222edccee65421b031479f2514ca209c1973ab442796b64006e6c5184f
+EBUILD kitinerary-18.08.2.ebuild 826 BLAKE2B c5b477ef8c79a6421e16bcc8d7d32dc0ddf503a0859efd9fc217086fad173c122533722e7764511cf32ddd93a3a56d0d72eebe1af28aaf3ce4d80fcc34b0208a SHA512 7de54eb18db30e6e7a890b005151dcc2f3ba9ff59599f99557f658eab0a216e52509c434484217f1848855368b7ad8b92d8a88292610e2def82fc10695128e9c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kitinerary/kitinerary-18.08.1-r1.ebuild b/kde-apps/kitinerary/kitinerary-18.08.1-r1.ebuild
deleted file mode 100644
index 689374d63d43..000000000000
--- a/kde-apps/kitinerary/kitinerary-18.08.1-r1.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="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="pdf"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpkpass)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	sys-libs/zlib
-	pdf? ( app-text/poppler:=[qt5] )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package pdf Poppler)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kitinerary/kitinerary-18.08.2.ebuild b/kde-apps/kitinerary/kitinerary-18.08.2.ebuild
new file mode 100644
index 000000000000..69bc9fa6fd90
--- /dev/null
+++ b/kde-apps/kitinerary/kitinerary-18.08.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="pdf"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpkpass)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	sys-libs/zlib
+	pdf? ( app-text/poppler:=[qt5] )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-18.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pdf Poppler)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 4382bd284af6..98eb91d216b4 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
 DIST kjumpingcube-18.04.3.tar.xz 293940 BLAKE2B fb7610e9f3352954e1df4eeeff2ddd80fc4aac454f19bd1f7406c4131a34126990de633d79bac1569e1e96d1743d8f55efd35a857f63d877600b6333c6b0c5de SHA512 c10548aa970fec60f9306ee351f5129c4892dfd74746d782ef72696d41a6362fd92f6bbcc49abf816b455f1e6d8992b4f66cf9ddf19c6109596ea053dd04d8bf
-DIST kjumpingcube-18.08.1.tar.xz 286756 BLAKE2B 0e81fc3cdc69fc1bf6fa53a210d048fa32c6cf879f8f41e0e7c12ee709fcf363d84516f47b6d8b95ede13bc496479298ea7cc3c75913f524ebd226a28d20aeac SHA512 b50c87a94f5c560e665a145ddd3e62db2ab637149b41f0a5f0fbc726d36eeea90e42615d3fb10b27f65325ae84ad460d0ecbd837e35a4f7a245617202553c338
+DIST kjumpingcube-18.08.2.tar.xz 286776 BLAKE2B a3e636a77f84ddea12325c3b59b1583ebbf591442f8c595bfc60611910287b3c141cb71e01837062ff694a0df8d9247957dc779f93be6578327facffddf8d582 SHA512 232041ad4da40c7802c45eff35c63ab5ec81f73e9fdecf1fefe52f5a67c3ef064d9524ea56a9e1954dc1fba76b6521acbd0f85a329947254d5f661ccd74862a1
 EBUILD kjumpingcube-18.04.3.ebuild 767 BLAKE2B 68f9ca993109e2efda935509a8b4f5f93f6a283a43048b6d5d27fe0deee39961fd5a3210eaa307c0a51fa07a00d5976f4de8d016584aa586f85f1d48a2848803 SHA512 d0940a208cdbf9ab81d93511e2616ccefe4acabe2163b33d6835c732a45a0952f3122081ef6e32686e368384d71d3a3accee538cff583695035b9e12f2607b4b
-EBUILD kjumpingcube-18.08.1.ebuild 769 BLAKE2B a2bd3204739357b90f6f764551ee3a98f89ca63c09bd79e68582d080972591d384adf2e37a882e781e2deb51ad9438ba99115f39287658b4f7579afb7cc52657 SHA512 f94fa9955815fb7fea4b99012e0cfa26b13d4450f4d7bd225067490366f2570d48c026ba18ad5ce62839b145f2a288a7454fb2ea2711cc933ca1999f67323578
+EBUILD kjumpingcube-18.08.2.ebuild 766 BLAKE2B dff0c6d38aa73d603697274fb772860c9e0c3fc40e767d86261c43da3b0344fe43b9c608ea8e4cda9ec24ae49625ec601531e5bea4099443a45bd233d072e2cd SHA512 a07efa663119305eacd51edb5843b7c714a3223ffd337ddd0eafa48cf6ff86f00ba93a1bda5a787dc8e43a91cf81772bf866fb0bb203e4f7318ece74734c6d8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-18.08.1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-18.08.1.ebuild
deleted file mode 100644
index 24ea87a948d0..000000000000
--- a/kde-apps/kjumpingcube/kjumpingcube-18.08.1.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/kjumpingcube/kjumpingcube-18.08.2.ebuild b/kde-apps/kjumpingcube/kjumpingcube-18.08.2.ebuild
new file mode 100644
index 000000000000..f51ea825dff9
--- /dev/null
+++ b/kde-apps/kjumpingcube/kjumpingcube-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 3fd255f29d93..dfe06ff550db 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-18.04.3.tar.xz 154232 BLAKE2B 782e2a727d7fb14c9d844e227f52f700bf13a19d6ded85ec14bf7c6ac6bad9209e14e53743704dbce8d79d09ec9a6b43b4686abf9c1397f06c7f0ece0dbb0dd2 SHA512 7159d5dd37641ef68c37d00e03b47febdcb2967460b51dce318344426077ced9d17095b8449ec82b8f8cd736ddf12f5c71f0737cab9a21811c576f14d63ac9df
-DIST kldap-18.08.1.tar.xz 156548 BLAKE2B a448b4644a29514ce7cd0b56afe467d2ecef359b482066d32be5f267bfb00ff465d2cff8fc7f177228e5efb7ada427be205ec5a6db35ec7dc4c16ff4469fd3e9 SHA512 2055ef5d1950501b41bae76b048cd3b77c19a9969ebc5e5a50f2eae173c6161348d8bc5675dcae827b99a29979acd2f5f165889108f7faefa8dba4b0bf31f47b
+DIST kldap-18.08.2.tar.xz 156488 BLAKE2B 4a781980dd6af51bcaa1aecf79a144f4d3d625cb3b0e258ef6ce565a4af35918e5f3ac02862a13cdb7034fee253202d7124bd93d603d1fb98d88a17aa56f0c1e SHA512 d1f43959abe261591aec1eaa4869d1f436d98cee448befb8222e1c1eb0e3d797172b475c13b3a00a45d1f34044c66225add42e418c3f532c37507fcb7d40b400
 EBUILD kldap-18.04.3.ebuild 760 BLAKE2B f1950ca416e0f20b9dd05e0b3b94a683b3012219e2da5f06d395b1060d26c05ad3df42f9f96432f6f4c6d1de295c16e4bc53c0ccabf8e9c9989ff3bed90e0cb3 SHA512 97040219bf3b380924624e7e7f34b13597ad2d664a0c784ee5ee18367dabd79d4d6f95a3630812fbf0684943da9f99990bd67a454be9190f1e2655315859237c
-EBUILD kldap-18.08.1.ebuild 762 BLAKE2B 70a07add502728cca0387b5e6b9b98c6c422cb40ec8b3f0e57c2041aff3a81bfd1043a602d392d17e88f2e45baef2b97f9ed0ae76fc09f833d1b79dcde5c0b4e SHA512 185da5965001d19497bb0f83a4819b7e505d86bfc1017b8b5227a88ca252fcbfc96934c581afa06f71ea507027e87c6a6bf2c23b65bd8b7b223cda3b9fca90a0
+EBUILD kldap-18.08.2.ebuild 751 BLAKE2B 88797a562ee954a866519acb4639425d26f48cefdbff5cb09be3511f45a38e734fe53f371940ad1bb906d45db35fb4b62a5542df0d65723d439c492b43ca5042 SHA512 f33e270298548cc113a4d2627ec76e0b9bb2dc31d399428cd8c2fd99d6021b42a7691b811efb652671d949e911db0c4b51262026491764987e6ac232e8419c3d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-18.08.1.ebuild b/kde-apps/kldap/kldap-18.08.1.ebuild
deleted file mode 100644
index fd1452bcfd54..000000000000
--- a/kde-apps/kldap/kldap-18.08.1.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/kldap/kldap-18.08.2.ebuild b/kde-apps/kldap/kldap-18.08.2.ebuild
new file mode 100644
index 000000000000..713405e6e0fb
--- /dev/null
+++ b/kde-apps/kldap/kldap-18.08.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 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 8b04a7bd69d9..7c0307607c50 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kleopatra-18.04.3.tar.xz 1902264 BLAKE2B 1571128442689e709ffae97092643195150a870bb90ceb0d18f7f8c6fbd1ad9c1f8e4f3b1424ba13d4181085bb18bf6a3ea8bc02a585858d1a0cac2b3e3fc618 SHA512 6f74ad1d5da2c1e2c22b42212010768af2dbcf108b337dbca9f21e2cb2a88e4899fec692667cc1515a46dbe8e942eef5cb86551a3f605b9d048345fc31277061
-DIST kleopatra-18.08.1.tar.xz 1930564 BLAKE2B 610cc5783152cb8ab002e3833fe234508c791af8f2e8a0c357c23cf15b1992585f0f66ea5426844a1470f473134fd9110ce51e7790d3f57221212c8fae0b8b12 SHA512 dd13d287f645a263e460f91528e7eec5d2e8523702770fe4f7c4f49da5303344d6a6fe2b2124ce39c480546ba126d518921f49ef746d34c66f40c2aa99f85c1c
+DIST kleopatra-18.08.2.tar.xz 1930380 BLAKE2B 1dfd4a7bcd8b50c8ce6054a052dddefe6abe4b837f12a0b4663c76d0f3844c73944c249a98b439243d80d3ba85fa80fabe28ad1be23edafc3aad3cda3811a9bf SHA512 2ff18132c511ae6550852e935333ff69c10db525728426eb06107ec5a3a7f35e2d2878f9c859b2899770ba25fa510001418f7d70a0b2e440220f4b0f3fcea87e
 EBUILD kleopatra-18.04.3.ebuild 1323 BLAKE2B 1aa3bd4a95a6dd7eccbc6ac669c78250343d3c7b99369b443aca92a489019aaebec2408a693b7269350a1b230c6caf399f328b0b7d966cad70d87ffd35aea06d SHA512 b247b69325a3119fa09d7d9e1bcefb121aaa09933578fad290b3ba8c17ccdecc0de7b40a99fbe13f0640c0506670dbe9076e6439f83380824fd7a2ef8f9c3cff
-EBUILD kleopatra-18.08.1.ebuild 1325 BLAKE2B c246da8fa42e95769d488fa8f361fc7767fd9050f2d1609db9860bccf19a9d6ad36e21b466c2619870d6a5c05302110deacb3db75176a41b3b1d802a3ef2c6f5 SHA512 2db9c95924ae4a085a79e26866020b2411e7909c6012d81afb140d5af0db2ac03ec2150fcfa24f3afd1c65756bd2b120e1e8617fac1ad711d61523dce5861f5b
+EBUILD kleopatra-18.08.2.ebuild 1322 BLAKE2B 4f87603e5ec2e85bade2a46623abde5bd329b7cc14aecb9f47eabb96cb07a3d5117125614ba635b72b00b7dcf8d1b3232dc3049f7cc03ac0c187975d6541a128 SHA512 20d75761255d4f06b189cb5528f9b1e7042c30205a3ea42f50371bfa23c6bcfcab8fb9490bd4552c631ad36c9815b29934a60263c8b9c955ec28980b0c15fdab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-18.08.1.ebuild b/kde-apps/kleopatra/kleopatra-18.08.1.ebuild
deleted file mode 100644
index 9526ad8ef1bf..000000000000
--- a/kde-apps/kleopatra/kleopatra-18.08.1.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/kleopatra/kleopatra-18.08.2.ebuild b/kde-apps/kleopatra/kleopatra-18.08.2.ebuild
new file mode 100644
index 000000000000..9d861e8fd9f2
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-18.08.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 6c1cc1d87950..8ca3611b87e9 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
 DIST klettres-18.04.3.tar.xz 21713228 BLAKE2B 09f915c3ae3074544a2cf0e8c67c8b85be63a0aa73abab25df1f02d288fe9b780dd8569896c5848a22c45a19505b9111660396766454a56a7f3a9093abf45c48 SHA512 c579a1421694a1681d68716695210ad88bf0510647a4d0957ffdd4f86ce137ffb0693bb7a0fa7ef5d0a15845ce8ed85a909fb1711597b6dc8302ae43e0435b0a
-DIST klettres-18.08.1.tar.xz 21713488 BLAKE2B eec93417c7d56e3780a5fb8e4fcdf72bdbf1b45b3c11947729037f902463e92edd898492e1a44b0efbd40a5f00d25e0e3ea96bf8a9c082e5beaa0f6f64388f95 SHA512 6e0aadf89c9bae1f06e2318d40830b1793c5410548e706ab66545c26528e7f516c0b3986f36b2cfd083d53fef50a2199b30a110b7149d06a6264ad19f9be74ee
+DIST klettres-18.08.2.tar.xz 21713308 BLAKE2B 40b3db5f5a4589ec19abe7d2d2950ad3b7fef6fc6d167c448af2a0ec2c5add11ee291e53db9296d485c6c136ef0b35e77c6cdadfdd99735ae425b17eb07c2697 SHA512 71e0aeb7e9f4bcc07a5ff1bad484e22c8e43c8bc9ffea08fa3c13564e88d2172cf83b2dd02a40a4e8c20062155810ee42f3de94715ac30668c7c5e4df85e242e
 EBUILD klettres-18.04.3.ebuild 771 BLAKE2B 2def2ad609ebfb87f7352dde75c0b6cf0b5b1939897ed4dbc8badbab50fb711aa106cfb7269a87861c40a56d1af2a41770ffe5b44df5eabff6d3682fc40a8b0f SHA512 ac4b1f7434ff79717f691a88825da9160b47c2e7a173a766b12dc9d8f1c2f95ffa275ea6c3231467d39c4112618d2ddcd268f9b948b0887ad991b6c37098b5df
-EBUILD klettres-18.08.1.ebuild 773 BLAKE2B ebee50fd20662bd100ecf61df3849f12b49608b2d3989e17749a308c958c125f11f65a898ff793f8df38c074b760b72c642a0f9b5163e4b3f766687f17fcd36b SHA512 cd209d6708323c85846b9a789fc024fe118a59bcaab421200ab7b607119c18695f705f6796d05db09ee429a655c83618eb2ed5bb1cfcb11dac4d560c70a8bd60
+EBUILD klettres-18.08.2.ebuild 771 BLAKE2B 0a54d08375ec57e95ec759ef6fe49ac88b4e477b8d7a838aac0cc56f30c631098a331c04eda409d7fd2b5cfec072882c2ed33eb902e6922a2237421ffcb465fc SHA512 2c7d9fbe881b52eab59badf1ac16dab8a6c4841e81c767fa04724ea1988fd25461181c84749c25e280b1098ed3c444b803fe5accfc8ae21f4ebf5fdfe21fb4c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-18.08.1.ebuild b/kde-apps/klettres/klettres-18.08.1.ebuild
deleted file mode 100644
index 5a99090d00ad..000000000000
--- a/kde-apps/klettres/klettres-18.08.1.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/klettres/klettres-18.08.2.ebuild b/kde-apps/klettres/klettres-18.08.2.ebuild
new file mode 100644
index 000000000000..2c3f476d2da7
--- /dev/null
+++ b/kde-apps/klettres/klettres-18.08.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 2143b2a91dfe..8d7fcdc04db3 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
 DIST klickety-18.04.3.tar.xz 1411288 BLAKE2B 318985d5c6c2766ecab4a8118043dd4f9ee4ced035a08c03ce9527f5b0a68db0f6447f950f0482a144d9d171ebe733d90963e13c9ba9cd49591999b6cef99797 SHA512 d7cfefc611ad711c2e2990995e1faf208dcc61f685ed792934ffa001c83958c319c3245a652135f2e460b8d7d160b8ccb357b4fc5283d68978d1449fca6fc8df
-DIST klickety-18.08.1.tar.xz 1388944 BLAKE2B 23669bc390d41f589fbae30cfb21417f9185740e52f723b24a9ebf30620bf57479f37c23f72b33cdf1275ec76c7327eb4d81d346edfb552f1d1f70f580dc7f88 SHA512 2df34e87cdeb9f0edd7516f0ab280eed02ad1beea7b4ad85b9d6ec496c744c0bc15a9661792a09196021aea12754ab7569e3395ab80d98f37193a27cd79f5268
+DIST klickety-18.08.2.tar.xz 1388932 BLAKE2B 95eb7ba791adee3841f3426a671421efc2c64806eeb48be0aa61550e79b88bea2f9ecddd83b012dc1ad88c01c76203ad7344e86f817b3a39734e89c335934393 SHA512 fdee525191095642d8f9d703e139eae65a13f9196a087506ae00980b07dc9e8a53e1c97d181bcc6c219b220f5700ab60522d755e92ddeb798e06e75147bc6c19
 EBUILD klickety-18.04.3.ebuild 777 BLAKE2B 9d0562efe8ed345c19c2038b1d8790c73c08531624a981acafec198470974f6adfd41c079f52dad4ed05e94f9496caf314d7b5d310f2eaafc6500c5d30a1ab6b SHA512 2f5dc2324fc5538e5a58416f58af57edc34ddcf6d3608c24b22d97b1c099c93652f8c89b403302846c30c2edf6f2df047dd286c7dc34d9b1514b920667fae3b8
-EBUILD klickety-18.08.1.ebuild 779 BLAKE2B 823d03b8596084535d467a2359c484000ec6616429b2dd968174f29daca821022b90bdf7011d6e0bad92b5271a00976e90987c5416bf15b996c7cd3a9c8ce642 SHA512 b0795f1815438432719b97f1686354757831b20338ccf4a93fae0d10f5bcd6a049117dcb1fb93ae87ee8b0d4422631bc421ab690ba59828733794a1e74c8f920
+EBUILD klickety-18.08.2.ebuild 776 BLAKE2B 9ce7789ca063686f181623d9b4ca02cb7f0403d5077de787532512b8d126c70d943328ad277378db587f5e2dd8718db46ae22014eb23ace342714ec01e64a083 SHA512 5843787dccabaaabe9d06a9f39cee59ba3e5fb4201ac8b84f9a26f3758f1358008b3aced78fa73eb04fa5bff0801962f4cf1cff3717b540b9fd3678d165c2a25
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-18.08.1.ebuild b/kde-apps/klickety/klickety-18.08.1.ebuild
deleted file mode 100644
index 29d07f818c1b..000000000000
--- a/kde-apps/klickety/klickety-18.08.1.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/klickety/klickety-18.08.2.ebuild b/kde-apps/klickety/klickety-18.08.2.ebuild
new file mode 100644
index 000000000000..f5618bd99460
--- /dev/null
+++ b/kde-apps/klickety/klickety-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 20297bdea052..6bf403ec8beb 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
 DIST klines-18.04.3.tar.xz 1670864 BLAKE2B 88e1a21189d76eb7658b2c89d64a8a6b062ff8efdac07c681e78108110b21f0f7c47f0cf6708a7072e22ab28717175b8830b523d6d8b076c62074d24f9774b25 SHA512 15885ee5afaf863e2cc95aeb8d7877741b12cd2d7e16fa0ddd2fc88b50231e4fee0e29e246017e6507e0e59fbf70616a4251d60ba235539870b6c50f141699a0
-DIST klines-18.08.1.tar.xz 1781760 BLAKE2B 055435ec1abb31ed066d67f8fee557830f587c3ecd6d0cc86f326497c9b0c1d05e2f698fd2fb936dff309f3e85008538de2ea9230ced4ca6450985f06225f52d SHA512 cee1b2d23de590f6449869485d213f8d87b0dd97f376af9f4dbcb7463053b915d6a9b5dbd17b46116e04802ddfb42cfe5413f8e5f92aaa8dc323e71bb786f814
+DIST klines-18.08.2.tar.xz 1781340 BLAKE2B 5503092319586762ddc3c4e065a351e6f7feb21ba2c00aff403a09e9218ce6bca2335c277a052432e5cf63c058cb84b094005a271e309c2229cfc93c5c911fd7 SHA512 9063fbd49e4ee43b8f48934535ea2860074f7f353d7db27bce4599ce0d1dbda38843e7c1a910809d89d06aaea1b82d8df6cee6c24065f7c19eca1b4400e58e03
 EBUILD klines-18.04.3.ebuild 786 BLAKE2B 77bc18df1dc422f77976c3c9d1a0c6d5a9dfe3a3261c18766a1e68ca755c5db1831848b74c6b927e3f1bd7b005ba1998bf2ee1f4025a82f9e4d5659fc8091741 SHA512 87a9781483b04be005d26690868278dced7c776a105b274d38381781f46e25a64c23fc640b3d8cb899282d03518330394cf5cb0d69c1c5226a247a7145f9e216
-EBUILD klines-18.08.1.ebuild 788 BLAKE2B 6ce27fbd68fdc1bb29f99dc59c5c61080f680882d87bebf95eae4009ef221e69256da0e42d27a60bdc83c90010ed310daf9cc1ffdb32691fb63e636895496ef7 SHA512 19f860eefc5c4c6d070ae2652471c87d38aeff1337b50f8df0091b9b5c1c9955c9b3fc300c14f3e83110c89599d8856d75f8ccb1ff8fd94fa43a0bdd8c849f2e
+EBUILD klines-18.08.2.ebuild 785 BLAKE2B 50895440a879607b151bb2dda0a60b5aa6ad452fc0b75d6135d33061e79c6e89e37ca66598fbac08e42211a6ea648e3b1c259d43c2b0c6f5ebcd15d02bc28509 SHA512 306e81266a59b9e628b5207204db7842620ff6e4dc1d657215865e4f5d9b440dd4a0608427df3b9138edc89fa8da7b15f8f50a6027514ff8a6c1ee33a5c0b27f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-18.08.1.ebuild b/kde-apps/klines/klines-18.08.1.ebuild
deleted file mode 100644
index 7d4775b223b4..000000000000
--- a/kde-apps/klines/klines-18.08.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
-
-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/klines/klines-18.08.2.ebuild b/kde-apps/klines/klines-18.08.2.ebuild
new file mode 100644
index 000000000000..b4a2dc21ef9f
--- /dev/null
+++ b/kde-apps/klines/klines-18.08.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 bc463bb83d63..1d7345ee2139 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
 DIST kmag-18.04.3.tar.xz 589340 BLAKE2B f195d8e3c7e4178aa123ee198a673dd4881826ec6c8c9fd488bdac60dc39d4fa2bf0adc1eb42028803e8cf5dcc498f68ddb7c99ecf0d0129669ba2138c4846af SHA512 f3a9890906143824f36e2bd5ea191ddf68aedd7afeabff50c884f00d160c9ad670e96b5563afb1d5b2c9c2ec7842a49c0ee62781ea9337086f40875607b4e09e
-DIST kmag-18.08.1.tar.xz 628548 BLAKE2B dba66729f5914c08de8c191d9fa3cb3066d38aea239d697c2a143275f44788b09d88b0f4b825211fdf13373337613ec4d49effee19986425fcd68cf777d79fc5 SHA512 ca35b13fc309df8b8d2c7ca4af726b57823ad01bd6dc8d307e81294625d8f8f98e4fdb6827260b00b4427f5980de0ec1c3d9664ad89b54699125ca0dfe6a8b18
+DIST kmag-18.08.2.tar.xz 628396 BLAKE2B 11b9585a37485fd623041bb2a0a8000e7fc53b1ab1f85e42bf3c4f3bea56a6ee94917e8a1487a970116e01bbac7fc5f4750687d4034ae14385912a3afaa36303 SHA512 f135fcc94a92e515bc8fbeb01a7385fa89919d1c662628c82f54a064d2f49544ec1b7fb7a0c88b7aa99b9da6a4f980bca7828129eb075976810fc1917ab2e845
 EBUILD kmag-18.04.3.ebuild 857 BLAKE2B e51060f466ca3fb7845575a3fb80fbe46933deb5e19141eb4a4c2024c82a9dbd3b3fb5101e831ee907fef31b49d9c5e1bdcbd8050cb6e10e33af603eb70664cd SHA512 741d51b88c16628b1eedeca0641ab3ca71f8e3c8bb6ddf36cdaec2d35eabd435f60ccd47d021caa5dab16146c9a7d3f3d7cbc6286785a012402ad13d61d491b8
-EBUILD kmag-18.08.1.ebuild 859 BLAKE2B 09eff3061722d92f59307af5037e312404860cf3bc753d0fd2ca874f5ac0a05ee04a5826877a4aae2db42d5915690d1a64c97f69d84f89a837a72104f3936889 SHA512 806fa0da2c4917e98bee7f4a9ddaae977bc0a16d3a4f0466fa434ecfc1b1d5fd00e112756c16eaafbdaf66986f0558e8ab715b645a416c3d2f7dc84c607243a5
+EBUILD kmag-18.08.2.ebuild 856 BLAKE2B c58b8e55b61cd40134aee34d7d7de57e12ee7ad1a1ea003b2398d38bbdf8e4f52a9b707badb48ab6451d2cb046602022b8312333ba817c3db55765777f3b7c4a SHA512 e84ed108b1949c8f3a544916940f26858d50afa1e75de66b47926aab7f7ace32242e6cc31e9086bfcbdd859038b10319a455c26df69ee14defc51ae803800215
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-18.08.1.ebuild b/kde-apps/kmag/kmag-18.08.1.ebuild
deleted file mode 100644
index 78ea685239b2..000000000000
--- a/kde-apps/kmag/kmag-18.08.1.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/kmag/kmag-18.08.2.ebuild b/kde-apps/kmag/kmag-18.08.2.ebuild
new file mode 100644
index 000000000000..73fd726f7036
--- /dev/null
+++ b/kde-apps/kmag/kmag-18.08.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 195da945b659..f8b6993edc0d 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST kmahjongg-18.04.3.tar.xz 4086376 BLAKE2B 2dc6c87c90eb6448ae26526c52fee81012457d56188e77fffe542bca3a2908627f538c37d84c2b2744c2105d2c09b13b938a9860a6f94d58dc00cdca77155ff7 SHA512 ce986e043a1620fc982ad0b6406214a53d4c3d912a36c5468fc9c4c986565fbca83e1f2d42179295fa7ba694ca1190fdd7c740d035c05fe378161c268ff8c0dd
-DIST kmahjongg-18.08.1.tar.xz 4064200 BLAKE2B 733f257fc8d06d5a17b1758de6d9b3674d58782424f90ce357f7964d47c54522dfc9676a5bbfb96c277a7425b5c84b527bedd95a88a2b7880cda7223a9409838 SHA512 2969e334808f396825ab7370a0c76e3836c89deb6ba46841e0355a10257a9daf53beb6675655729c94af225167e78bccbc13deba4f8a331eba50e0213195c27d
+DIST kmahjongg-18.08.2.tar.xz 4064220 BLAKE2B a98ab909940b4169c461a066237b9ee133dc944c3e303054501594888c87df57a0bfeccb7ad5f4a92945c085f1a86f12e3d71cf2fefee65bdc4896491b789244 SHA512 d5cc81e34c0741143270c3c1e8d0975b84fdf991fd0daa9e3f2ae1c9056f507acfebe49c58c1567f4305e3d6a3bf607625fc464027aaf0c2acf393451d7ecee0
 EBUILD kmahjongg-18.04.3.ebuild 919 BLAKE2B 6f6c7d03718a1c1884cd05e759c43cbe6931bef488ef1086032d5e503c9ff63636b0d6e54fa3e38fad15552060bbd50827b9a5a7dcede35c4888046d1d478c4d SHA512 f0f8629356ae75045ea083099e0deec449046034a97a28119708565fae484aa88e1d41b53d519de7d21186dd2a4e730c0b3e93bbbab1f88e584bb36d2e62da31
-EBUILD kmahjongg-18.08.1.ebuild 921 BLAKE2B 305bdb04b2711bb691601ae5f1601802fe5e6aa29da6962f0a72ba8f6bba065157cc1adc77fe31db30570564d83263a8c7266575c2eb5bec87c0a18964fce7ed SHA512 dcb4016864dfa052e5340a8ca81cd32775ad3b4a40ac5ce56b6100df862e4e1a9aa51e326b43c6403c34b1fed15584184766071af5d1f164b2513216c7a925cc
+EBUILD kmahjongg-18.08.2.ebuild 918 BLAKE2B 8e1845f6c5c652e996dae86e3ca50b173e091a02e33699bca7c6b46d607735ab469299f7abfba2961ff6bf255b73b2fa3c4ae42a7db9e194397f8642e6bf44ef SHA512 fa4abc9992b171836559e87e1d567a09e7ca554c2fb930601b86a5a0f2c18b11daf4aaf8841b1560eec9f17133d4ee4ea3fc0bfa04629da0d7d55bbcc28798cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-18.08.1.ebuild b/kde-apps/kmahjongg/kmahjongg-18.08.1.ebuild
deleted file mode 100644
index 7f03c60e0f6e..000000000000
--- a/kde-apps/kmahjongg/kmahjongg-18.08.1.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/kmahjongg/kmahjongg-18.08.2.ebuild b/kde-apps/kmahjongg/kmahjongg-18.08.2.ebuild
new file mode 100644
index 000000000000..d8d0479a3626
--- /dev/null
+++ b/kde-apps/kmahjongg/kmahjongg-18.08.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ec95c6d177fb..9e52a35597c8 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-account-wizard-18.04.3.tar.xz 154896 BLAKE2B a35c47a78da31a280d3f2bb668cd777b1c30d0633ebcbd846381b4927c2a5433dc9bf7b3a5b36402d89b8ceafbbc1888b5dc7ffec11b6325f9713881aec76a70 SHA512 93e05feb39d8e31635ec7bb367ed8bda5fd5ac6ef2912763a080884e4a6dd03183f90e3768f80d97dd03cb25e3f98a2db567efc8b516b8597d52070b4e404745
-DIST kmail-account-wizard-18.08.1.tar.xz 156192 BLAKE2B ac7ecb0f5df3170eca761c49d9dfaa6d29c002c02db6c1a931094152800c1dc0bc6aabbacd64b82d7e895922f15bf008b1b972dae888257a872e9b8be53e7b93 SHA512 5ea620759e566f4e51aa6a31eaf98d7c8ec38af45690d206d36a1e03a3f616e9b78d61f4ab47d20d9395a875d4ca0c7451432089281687798af67e39529bc77f
+DIST kmail-account-wizard-18.08.2.tar.xz 156140 BLAKE2B 978f2f40e50e07bee94dece905979b51e07689395ada81dc6c7dcb3cb9af04beb65c7d0c62915dc5f7f607b12c0ac2091813acf8fa014516fbdac5277bfa92f7 SHA512 33da9c80255db77cef301e2423724b76a58869bdd0c483892fa5d995a0ca8abd134d6fe6c235f2e4eab43b0132d7dad93578eee6f2c43addbd99767dd5cf5b95
 EBUILD kmail-account-wizard-18.04.3.ebuild 1443 BLAKE2B 6007a7862e8aef132649f83be8b139a1202b3c8ecf62b32e63fbce7e8be706ee36e358a03fcbd555cced21d43a5d9ecb57e18eba0c7ea0c0d7d6a885e72bfc6f SHA512 4cdba7be5e9e59617a5f37ec4282e66dca61a13570acaffdc39738ecd5eab0b60ddd1d77e3ee1708832df59985e6d9a15e890ebfe1d02eae53e1e4911354eaa5
-EBUILD kmail-account-wizard-18.08.1.ebuild 1445 BLAKE2B 7926b75b4a9d5f435c4d4d30a5c59cf1ccb137394f0680b831a09a6106011d8850bbe218751d35965300e2ac6fd323f7385e44152d0b7559169c420ca5168962 SHA512 b8007880b6400c349c7491ffd23cb28f873851ca77e39766dfdcb113eaceb9548e936bc1e47c7409031214b4c26f94dda2a467301b494b81267525044abfc188
+EBUILD kmail-account-wizard-18.08.2.ebuild 1442 BLAKE2B bddabc879c6998b82a9605b15b9c99e5b235b38eb287637a1ba96a7a9624efd3017c9afe2f14519b709b4816040497319644112e3833f40250db0d48c5eb32ef SHA512 4991f1c267c1525aa946d822a47a0bb23adbe7dff5204987c72b11bf80195b184339df0969d500a717fe814858b52ab57452c72dc582d97fbfca5aa911cf9613
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.08.1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.08.1.ebuild
deleted file mode 100644
index 1d631b73e888..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.08.1.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-account-wizard/kmail-account-wizard-18.08.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.08.2.ebuild
new file mode 100644
index 000000000000..08cc9666e24d
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.08.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 d15937c1fa84..c93ffffd5f50 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,8 @@
+AUX kmail-18.04.3-no-sync-after-save.patch 2855 BLAKE2B 596c70f83acc4ec9a4468b4de3c27f67b79c900a8c1de292dafd055ca784f5b8d5a02da16ef2779ef0c15a5990d61c7dcea06e7a15884efc815800a1e75deb0e SHA512 7f0e6ddc04ab25a927a1bbca3190a5ba1ae3f31c2183f9052bbc003a5a6a26acd8b16326f23216a6576ff6c85f9fb2ed76f095238a2076eb1f8e6ce86e58f5c5
+AUX kmail-18.04.3-setAutoSaveSettings.patch 1768 BLAKE2B 55517b2e889cea2bbe6729c176f4f32275fd92026bd6c2d55bda68a711b861915ae71a591a541d7fcb90decfea5d1d54ec09d40d6054e6905d3f39043467af2d SHA512 ca4d7636c4913b4a4534cb8975663181968c10c3e93a3ffc78f51a48f3b9a4ed5d007f87473570238e2321b21a6ebbdfa3a29f753d8789ba0f637cffb29b2887
 DIST kmail-18.04.3.tar.xz 4757552 BLAKE2B 281c4e131518dd6efb9172d5db83e6945570943f7942ace28a9d5542130ea9636191894a72043410c641b9d3d8731efdf5b72d0e25ee5058948e6f1bfdd2f3f8 SHA512 216f57078ea32ba4d9cae70e7c2aaa28957c677e9c0eef9f4ed32fd405f63e02881f87b6a44530d9ca65839535c775de4913aad83bec8e253ff6fd01a45f61b1
-DIST kmail-18.08.1.tar.xz 4778308 BLAKE2B 5fa86a8023afbd3a60b62fcc16c70833adf093d7f9fa0fb544dde9490c241d2291167d36e75f808ab251adae01534963103a79a41862fbe83b80234f2d17a133 SHA512 426bbce3fa86e01fd8fa8f62cd68542cbc71206a9110565e5ceba92dc447d3763267791d42d75c95842b1dc1ca140b51615e816b09281016c9adc88b60b106aa
-EBUILD kmail-18.04.3.ebuild 3180 BLAKE2B da8d524844c0f15733102a4ed5a9dc899a016bf301ab686ec0b159a8c0b0d983a53233a00de82438c4b756e4cf9775c17faf1e9350ca003d75ecd292bb3f8e3c SHA512 84a8c96c3e6af5fbdc6258e63af1f218c7991d5e84ac772d2031241cb6de1c2beb93657f948c960854a8f58532b7da3983a5d895036fe29281cdab077b71ae4e
-EBUILD kmail-18.08.1.ebuild 3182 BLAKE2B ca1c1db4d7c158360d8d5f41057d4c35df7b588e3dcd8687ac6be1bccee6e199d9b6cd3a39192045fba959e410ad0bdef24383834a5ea4946160c32d11ab5d7e SHA512 2e653f8da18b09d27bd8e4a25af283860836ffc41136c5c792beb3e6dbc0da95ad8567d320c9c744424071b09d7fdc8b5039ebf360c9a9043fd06efac0ef3dda
+DIST kmail-18.08.2.tar.xz 4777920 BLAKE2B ec9d2b97ca3a7e80bd0e24eab81d2d605460d79d2fb9a8bb809459d8c78a1c650182866d8b49d522fa5cf627f323b9b17caed49ba66b762590dc25dc9808284e SHA512 a8329fcefe7142089f60bce3703bbde79bb0a01d7a748937a665e534695c91edc6f490d7096d2f80d5a16266f3b4cf777d58763220033ce054c3f6c232df32bf
+EBUILD kmail-18.04.3-r1.ebuild 3276 BLAKE2B 25eb03f9eafa05d731a2ccaf2d7e15862db7b4ba97b27c7528c7cd975b48450a39cceaf3554cbba6b084860c78275bf8bb3d22f6b37ede3be0e86a61da5511d2 SHA512 e96071bf6f344e952e42fd4b7e1b9f5ac3d1bb4a97648f294cf070f6a29428861ce5938999fec46ebefdc3cd9fccf9821e55271dda2c59858aa6d63447221e40
+EBUILD kmail-18.04.3.ebuild 3170 BLAKE2B 0959bb4a869f93c30655327319568fa4ba6017e1d83522012f5a463b89e1a31742bda341a40f02f093f118bef807b41276d607bd90404c27b8de0f4378343fe0 SHA512 d32da391c2f2b3a78e82d1405fcecd5967262a26dcd7adfbb7ccc9d9dc10ba5dbdca7a50322a28dc866f69a8bc697b77182a2b84cca87ca6ab69004557181b69
+EBUILD kmail-18.08.2.ebuild 3172 BLAKE2B 1adfcc5906b6209567caf6f9d440de033c9901b0dc810e874f2e159422845321e1279523c892db94a04d6d9580ccabb404d91996ab75e78763b5161b5bf81c7e SHA512 d367827f076b74198c3b4c44f9036e3084e23128f0aa248c23ae20a828a4ba7d41aef7489c89300a0a4d6e27789ceeaf990dc51a53219f7f7e56a79252c0e840
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch b/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch
new file mode 100644
index 000000000000..c770dac239b4
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch
@@ -0,0 +1,90 @@
+From fcd21f9712143afb956dca2f67fb930fffc074fd Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 31 Jul 2018 11:59:24 +0200
+Subject: KMail: don't sync after save, don't reload after last sync
+
+Summary:
+* save() takes care of sync() already, if anything changed.
+* When quitting there's no reason to reload the configuration.
+
+Test Plan: None yet
+
+Reviewers: mlaurent
+
+Reviewed By: mlaurent
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D14509
+---
+ src/kmkernel.cpp | 26 +++++++++++++++-----------
+ src/kmkernel.h   |  1 +
+ 2 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
+index aafb9ee..7af593d 100644
+--- a/src/kmkernel.cpp
++++ b/src/kmkernel.cpp
+@@ -231,7 +231,7 @@ KMKernel::~KMKernel()
+     mMailService = nullptr;
+ 
+     stopAgentInstance();
+-    slotSyncConfig();
++    saveConfig();
+ 
+     delete mAutoCorrection;
+     delete mMailCommonSettings;
+@@ -1172,16 +1172,7 @@ void KMKernel::slotRequestConfigSync()
+ 
+ void KMKernel::slotSyncConfig()
+ {
+-    PimCommon::PimCommonSettings::self()->save();
+-    MessageCore::MessageCoreSettings::self()->save();
+-    MessageViewer::MessageViewerSettings::self()->save();
+-    MessageComposer::MessageComposerSettings::self()->save();
+-    TemplateParser::TemplateParserSettings::self()->save();
+-    MessageList::MessageListSettings::self()->save();
+-    mMailCommonSettings->save();
+-    Gravatar::GravatarSettings::self()->save();
+-    KMailSettings::self()->save();
+-    KMKernel::config()->sync();
++    saveConfig();
+     //Laurent investigate why we need to reload them.
+     PimCommon::PimCommonSettings::self()->load();
+     MessageCore::MessageCoreSettings::self()->load();
+@@ -1195,6 +1186,19 @@ void KMKernel::slotSyncConfig()
+     KMKernel::config()->reparseConfiguration();
+ }
+ 
++void KMKernel::saveConfig()
++{
++    PimCommon::PimCommonSettings::self()->save();
++    MessageCore::MessageCoreSettings::self()->save();
++    MessageViewer::MessageViewerSettings::self()->save();
++    MessageComposer::MessageComposerSettings::self()->save();
++    TemplateParser::TemplateParserSettings::self()->save();
++    MessageList::MessageListSettings::self()->save();
++    mMailCommonSettings->save();
++    Gravatar::GravatarSettings::self()->save();
++    KMailSettings::self()->save();
++}
++
+ void KMKernel::updateConfig()
+ {
+     slotConfigChanged();
+diff --git a/src/kmkernel.h b/src/kmkernel.h
+index e7fc071..f5da22d 100644
+--- a/src/kmkernel.h
++++ b/src/kmkernel.h
+@@ -487,6 +487,7 @@ private:
+     void resourceGoOnLine();
+     void openReader(bool onlyCheck);
+     QSharedPointer<MailCommon::FolderSettings> currentFolderCollection();
++    void saveConfig();
+ 
+     KMail::UndoStack *the_undoStack = nullptr;
+     MessageComposer::AkonadiSender *the_msgSender = nullptr;
+-- 
+cgit v0.11.2
diff --git a/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch b/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch
new file mode 100644
index 000000000000..a7377b61f190
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch
@@ -0,0 +1,52 @@
+From 814f0db2a1ae5b15bf91909ce80a5d6792f9aeed Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 29 Jul 2018 13:05:38 +0200
+Subject: Port to setAutoSaveSettings so that saving happens before hiding.
+
+Summary:
+See d35a882895 in kxmlgui for more complete explanation.
+
+BUG: 396339
+CCBUG: 395988
+
+Test Plan: kmail ; Alt+F4 ; kmail -> now the statusbar and toolbar are visible again
+
+Reviewers: ngraham, elvisangelaccio, broulik, cfeck, mlaurent
+
+Reviewed By: mlaurent
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D14454
+---
+ src/kmmainwin.cpp | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
+index ce3b042..f3550ba 100644
+--- a/src/kmmainwin.cpp
++++ b/src/kmmainwin.cpp
+@@ -76,7 +76,7 @@ KMMainWin::KMMainWin(QWidget *)
+     createGUI(QStringLiteral("kmmainwin.rc"));
+ 
+     //must be after createGUI, otherwise e.g toolbar settings are not loaded
+-    applyMainWindowSettings(KMKernel::self()->config()->group("Main Window"));
++    setAutoSaveSettings(KMKernel::self()->config()->group("Main Window"));
+ 
+     connect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg,
+             this, &KMMainWin::displayStatusMessage);
+@@ -94,10 +94,6 @@ KMMainWin::~KMMainWin()
+     // Avoids a crash if there are any Akonadi jobs running, which may
+     // attempt to display a status message when they are killed.
+     disconnect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg, this, nullptr);
+-
+-    KConfigGroup grp(KMKernel::self()->config()->group("Main Window"));
+-    saveMainWindowSettings(grp);
+-    KMKernel::self()->config()->sync();
+ }
+ 
+ KMMainWidget *KMMainWin::mainKMWidget() const
+-- 
+cgit v0.11.2
diff --git a/kde-apps/kmail/kmail-18.04.3-r1.ebuild b/kde-apps/kmail/kmail-18.04.3-r1.ebuild
new file mode 100644
index 000000000000..80a2769dd4ac
--- /dev/null
+++ b/kde-apps/kmail/kmail-18.04.3-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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)
+	>=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
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-sync-after-save.patch"
+	"${FILESDIR}/${P}-setAutoSaveSettings.patch"
+)
+
+src_prepare() {
+	kde5_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/kmail/kmail-18.04.3.ebuild b/kde-apps/kmail/kmail-18.04.3.ebuild
index 990a482098e6..7edc02c76e08 100644
--- a/kde-apps/kmail/kmail-18.04.3.ebuild
+++ b/kde-apps/kmail/kmail-18.04.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -83,7 +83,7 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test" # bug 616878
 
 src_prepare() {
-	cmake-utils_src_prepare
+	kde5_src_prepare
 
 	if ! use handbook; then
 		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
diff --git a/kde-apps/kmail/kmail-18.08.1.ebuild b/kde-apps/kmail/kmail-18.08.1.ebuild
deleted file mode 100644
index 42818ab48cd1..000000000000
--- a/kde-apps/kmail/kmail-18.08.1.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_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)
-	>=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/kmail/kmail-18.08.2.ebuild b/kde-apps/kmail/kmail-18.08.2.ebuild
new file mode 100644
index 000000000000..56e4cd96e314
--- /dev/null
+++ b/kde-apps/kmail/kmail-18.08.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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)
+	>=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() {
+	kde5_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 41155e964d0e..146dede30bab 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
 DIST kmailtransport-18.04.3.tar.xz 165156 BLAKE2B b303d8435e5df867b9c911f1c580f4a994b45fab9ac763fa58c6072629811f22d978faa10c8c1e6c7eca788187e27368a166210babe0b282084b424076e0acf8 SHA512 c371016a6d660b12feac9d1d705116537797206ff6b01d2fa488247929241f9b179a541dfb1d0da4d0b14e050f4e586b055a8228bc3339ac403f8e72c683626e
-DIST kmailtransport-18.08.1.tar.xz 166024 BLAKE2B 36b4b0b1786ae9a91eb1d64579f22b568786b10797ed807a81fca9ed9e22933d8b0da0050201beefdd928199941369dd58770ba84d5425e7cec2045683d801a3 SHA512 58c8b95cf1948be7f2781c6a4794e16947a6a67344ee1a29230f9d9f06e269a44c8c8634420c923cc60292091fc0caa1691332e796b78e4d38e33b8eda5e8867
+DIST kmailtransport-18.08.2.tar.xz 165992 BLAKE2B 5d1650453e19b8f84da09d381267e2e9fa331cd8a21785e9b14031ccda26fe9087315605f7f2533125cd0e6154d2cfca1392ce66f828417027d987a0e33e16c8 SHA512 27554a65cc9c03c95ac346954c4dc2aabc2d348ac8c75acfd6ffdb14e36bbae745e7160bcb678a315d5f067fd4397170d740268ba4af4893cd75e9d5e8f7ca98
 EBUILD kmailtransport-18.04.3.ebuild 920 BLAKE2B 9b8a7edebb1b54d882fa1857103cf10e0422959f25c720958a16d636a14f181977876d85a30f0fd3de7ae763c21f7d3232d849b4da9bbfa202affd7a74698957 SHA512 3c5681b817d17ce9731b49d6da1194015dc4ac05d383dfc9c7c59fb7f1b36f1dd90c101e1c507a9efa6b6d67085390dc4cf9c3fa0021ed1e61fd239dca280f6c
-EBUILD kmailtransport-18.08.1.ebuild 951 BLAKE2B cee0d64ae3a3cfffb46bd485c8a3474d4c6cc011a4f3698857dd4b290faf4919506e4464003df6ad9bbdba2307892ddb72b4237ebd9208d6adfae489795e940f SHA512 f24a659d11a9b3e885d1963b91e4716af6945dcb7743a7ef655e810674655703a0fe8060806e641e7d68011d0128e8153e22ce89e680ba3fbb56ac9072490fa7
+EBUILD kmailtransport-18.08.2.ebuild 948 BLAKE2B 03802cef2e30c2326d5872f70e2d86b95c866c9d5c555a1f52010bf3aab31f4f27d5ab1e9e1fcd145a2f7230da6be15509dfcdf64bcd690f9b5e6defc821b508 SHA512 7f131a127a7e527f1824c7c9255e3392f5c5750692bc3ccd1a1a9281660bb6c962e2a950a5a4f3afbae908a3866e5c03e4cd7707a4ab97562b7fd27422ba5d03
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-18.08.1.ebuild b/kde-apps/kmailtransport/kmailtransport-18.08.1.ebuild
deleted file mode 100644
index 0b555b3b6602..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-18.08.1.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="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_kdeapps_dep libkgapi)
-	$(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
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kmailtransport/kmailtransport-18.08.2.ebuild b/kde-apps/kmailtransport/kmailtransport-18.08.2.ebuild
new file mode 100644
index 000000000000..650675c741af
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-18.08.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_kdeapps_dep libkgapi)
+	$(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
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 221952880817..461c713a8b61 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
 DIST kmbox-18.04.3.tar.xz 24552 BLAKE2B 26ef3f094ba959fa96a186332306d824367c66ebf2163a2f2f00398f57115540ced120c6a8087c73fba27e3e8f500f2573f9e42cf0aef597a3430c19c5198046 SHA512 72c82f74723f661d486e3c502e028072fd9c7556d73a364384898187e124e596b0eb0f62f4edbd8dc2aafc3ae2fb397545b4c1d04016d30a6232dfac9b16f99f
-DIST kmbox-18.08.1.tar.xz 24576 BLAKE2B fad7fd623722ff1689710e7542da3ca4b1b1b91bd348fef945f4209b91359765fb209684f1f4d41d83245176b368faa7fac64a3c7e28968c5d12440764aae6df SHA512 929f0b075c590a1de4fa7d5dc71e5522f442a5bcd2bf56506685b9b45e6bcf82d12d87c965f3ad401604e36a24cc8c1abbb86e218426798fa0783309c774af94
+DIST kmbox-18.08.2.tar.xz 24572 BLAKE2B db90d69da0eb6f1497bfd073fc09f08e7deba27587e7b8b74ba223c1c953030f7dd18307f8e3112a0c7bd7c615c669207fab22eb384fcee7aabec74aa52003a1 SHA512 9d96e77ac52ea27fdc52b6a5e5e4dfceab8a35449c1957332aec8da5de9ab1f6e11f48ed6c4215aea97cced0bbdf96315a0b3c3282f368aea501dfa614fb0a08
 EBUILD kmbox-18.04.3.ebuild 309 BLAKE2B 455819bdc1f3f68251a13c8449aeb6be5e2b7e54dc73f78a852b6ec3e8c2b2a893adc1ab9f2dcccc016a1e80bfc46b6c1d936d35784ac7da7d2398dc4b623c02 SHA512 20f579addae7175ce34af42be9092340339b17b36562ba819228658a50b5d72f1187c6cb7267e0d7d513237ebe84f152e902807bc1b0392ffa0fe59675db634b
-EBUILD kmbox-18.08.1.ebuild 311 BLAKE2B ec5ab4224dc43c1bcd235f6d56af794f20d976d89064385a35010c554615f4239515304e6278c11a09da0602b9ec6b82f6a26977d0dfbbdcf62ca0a3c903f164 SHA512 b88679b1d6e88f7c8e1834d47b2d0f35acc1221e273856c019c0296b8769617afa0084e1664c47c1314ed6c36e568f4cf2ed422a56535799e7477c82f4ad34dd
+EBUILD kmbox-18.08.2.ebuild 308 BLAKE2B ecc00fe9f0c5682e2302c53cb2e84651e6629a572dbc504ea4068f1794de7547a4cdfe294d96b37ee779d02377993445d286873a9b4dca2b7c2e7067baefca4c SHA512 91cb758945c3c55b43ab9d96fd43c2a620157937afd9f511096cd3e9ec316068e5271e34fce2d130914ec88c8ffe1329d62c71c34ab91c71de1e344789c4581f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-18.08.1.ebuild b/kde-apps/kmbox/kmbox-18.08.1.ebuild
deleted file mode 100644
index aecae880bedf..000000000000
--- a/kde-apps/kmbox/kmbox-18.08.1.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/kmbox/kmbox-18.08.2.ebuild b/kde-apps/kmbox/kmbox-18.08.2.ebuild
new file mode 100644
index 000000000000..e397b6a2bc69
--- /dev/null
+++ b/kde-apps/kmbox/kmbox-18.08.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 28a7b11f67e6..1869cde963e5 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
 DIST kmime-18.04.3.tar.xz 146276 BLAKE2B 41d9ec8feeafac110008de3816b4fe4e921368668ef7fc4813ee76b270106dae2d30dec79ddefcf144b4533574ee7d07e3ec25da0a8a8db1f3a6f19b80970df8 SHA512 274a0835fe429b6d442f287bbfc5953639bb4cae3c24f29bdb11092aa85ccb60d5b555161d778077460014fa5e5362f617bbefd630700696c2160d6013c220cc
-DIST kmime-18.08.1.tar.xz 147016 BLAKE2B b772e4610c60966f395abbe6472c859065c0099c26b4ebc601c2b40b23acc9850a29c6b5756c6ac2911e817640984f41ed71bd2bbf07431b52dcf33c6d330555 SHA512 2a3ab2f7e69e14f8ad86ac9f6a9c33a3fd3da703da82ec7b53d126f6d8c7a51608b4f221a7903d37c2db429b444e643130a8687b1e02d5cc746d5c8d34c151d4
+DIST kmime-18.08.2.tar.xz 146924 BLAKE2B 78c9471a6cc563f34cab297a9d4b1e359177621964f16df9277014ef4e18f3481e50667916f64aa4533aca5753754903c843a1fe909387098b390c633ecdf2f5 SHA512 b10439a1230c97232840a40faaade162e02f5bab5a2e72b76b32fa5334c288dba2db8a8e7d1c1e788259a852940520d7800b77a19d5dad34c3cda579b89dc718
 EBUILD kmime-18.04.3.ebuild 379 BLAKE2B 216ed6d21e1450630791516fc558d407840f4839a29251580707da273b38ee58e7a5ca0f7277e1d76df18be46e4f48582691e7d29b8a08d7fcf66d3fc4cdbab8 SHA512 9a3fd01d1dad25cbb1614bf1beec04bd3f6b2afdd93c9eb78b24992eb0920d2a5dd10259441adc92efd41c3b46307578e7fc8e8bfb78b8bff917abb8c4bcd709
-EBUILD kmime-18.08.1.ebuild 381 BLAKE2B 52d676a1e2fbdb96f54c165253d4a8cbe3d1174a6638b3cbbf86eb37042d073150e82f95c03fbe8465a6161c142969568cdbb74dc42e3d55d64ca974be692e7b SHA512 0011bcbc77462fe44c6ad9ee2534528026077eeae7effc8c50beb7210b7c76057639142bacf7447b7f28277b96f52b57f68fc966b97e8bb3df6f9ab3a1fd0dad
+EBUILD kmime-18.08.2.ebuild 378 BLAKE2B 5468677043f7d82d9c4f78066528e863e71661a0bfaf4c12ad455ac660e6b65febe6f35cb3e69e16e2f6998c9b15e669c891f8e11061d654a8d78d00836db2f6 SHA512 e530ca31acaa9de5326ef7a40349e53c5a2fc21e60161f9a9e1229dfa5d9f98a7812e8daccf68cbf3dbde7ae610d5c7f693101696c400e21239f726a4b197606
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-18.08.1.ebuild b/kde-apps/kmime/kmime-18.08.1.ebuild
deleted file mode 100644
index 18fc8866db0d..000000000000
--- a/kde-apps/kmime/kmime-18.08.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kmime/kmime-18.08.2.ebuild b/kde-apps/kmime/kmime-18.08.2.ebuild
new file mode 100644
index 000000000000..9ac5848c7cb7
--- /dev/null
+++ b/kde-apps/kmime/kmime-18.08.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 eac33a5b854a..980ce4106ef8 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
 DIST kmines-18.04.3.tar.xz 882592 BLAKE2B d8f942a971d4c0944f22f871b7a0861e3ae8329ae51d5745488d9e9715801ec5daa5efa3cc5722cbaa06cdc88585393571ebe29aaf6bd3831043c88e91cc49a8 SHA512 580730e896b70cb7923c34f223026f74c9451096d7cae53ef775c100957e774687e6e9902dee90c49b05f96d25480cc858269e0af462f7873516d9d91ea29374
-DIST kmines-18.08.1.tar.xz 901464 BLAKE2B c8ce774b93af22a717db69561e1842685a6e71e08447053851e6552cd40db17265ca241af794ca048f457ca3d169a00ad6a403626b93c184c805688c53ba4e36 SHA512 b578fba58b776921d8a051dbf5dae02e91f2a41a4fa832543b671b1454a0fc16e108535299be33499f13a01aab0a75675394d43f0d804c96c45ab3cedf3074b2
+DIST kmines-18.08.2.tar.xz 901460 BLAKE2B 81f1df31c910993b55216e43c510423aecbd64f642096b8f0a6c1e87b095c83e529c58155e200c83229f8e2d3c40e222f01a10f8c64f32c68d7f22ae7c5cb14c SHA512 12284e67d2d457bcb74af2a7da8e2918ea3965073260dc9eb33714ca3b64688cc825a49aa0592da992ef82ca8f680ddc3f08c66a319e6f3cfcceecf7f71f57f2
 EBUILD kmines-18.04.3.ebuild 773 BLAKE2B 10d7004524f7f641407361453077250c3069ce28f6dcf2281ed5bfb66bb155c8eb0bffcc4c857914acb960c3c13056dc7fd5c949cde406ffd6468ff6f81473ce SHA512 6fdd7890ce470b3596249de91c0194453fba15b32c7f1bd3fd4dea40ee375e636b80a3f718308daea3d99f1ff6d4b505114423deda6d8037cc04c18ee39aa642
-EBUILD kmines-18.08.1.ebuild 775 BLAKE2B b0d600e715c012424b6f5d13f1293b65b2e2ad7b999808cfca0d3565436377bd4884a7674fcdad38007ccf8326d7d6dd682d012bf1539292fd6cbe103cd5c78e SHA512 c4fc7ff0268222cd745be8f5fa449b7e0577f6811c67a330ff1d2036ffb90fb7d87ad225eaaf1de54210e20349772234eb4c81b988761769c080b39e7501ecb1
+EBUILD kmines-18.08.2.ebuild 772 BLAKE2B 67542fe80e324d819ba087d8fbb3e545db683a6cb5752cef487c3e6ee0a243072128575939f881886e2dc3ea9ad975952e66fd8b8f9e87b2cd402eab545b046e SHA512 2f7a0e09286336c60b55bd3beb46673682ad8f68059d1510352f0236f6212204bc9378c6cc4aee7a24f44c7c79f1ebdae9089e4b853c4d8cbff0d27ba3cd835b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-18.08.1.ebuild b/kde-apps/kmines/kmines-18.08.1.ebuild
deleted file mode 100644
index 517fa32429c5..000000000000
--- a/kde-apps/kmines/kmines-18.08.1.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/kmines/kmines-18.08.2.ebuild b/kde-apps/kmines/kmines-18.08.2.ebuild
new file mode 100644
index 000000000000..2651ed5425e8
--- /dev/null
+++ b/kde-apps/kmines/kmines-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 66b5105ff9ed..ae485347c83b 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
 DIST kmix-18.04.3.tar.xz 1284556 BLAKE2B 7c09365ef0629c55ae8bd88335e2fa2eeba7fd934f18dbae96025b992e94e51083b8293f6ab9dcab2efef099bb4f81a367319d5050253b628409ee5979545594 SHA512 768b787a939e10e045f7af4d8d6a47d216da17dd73c0d8d3d73a93855998bc3f345bc38d6b9298d63e8149523a6d9280ff89467edc01b2c085be8b138b29dad6
-DIST kmix-18.08.1.tar.xz 1072948 BLAKE2B 0607848b8f5fd204add46fd1a3c2aa476ed722b06f0660cf0325ecb3944a3dd945df144209f7230f1895c6fba3c9452b55ea96e17a5615dab09970040e6ba87c SHA512 2e532d9041604e9d7661add070eeedb7fccf85bf9d6c01160f67cd3a2b20d95322afa9813d45938774456eb9cee342e888f742839b423dab327c898bed9b846f
+DIST kmix-18.08.2.tar.xz 1073048 BLAKE2B 22472d670a6156a480be52e12d9612c987b7ce07e8b746ee1d93f66f734aea7fb853e5668ffe67f8cb03601dc652785d4d830a812fb3e0bb35d93759a156ca00 SHA512 560c6610fdce8070eb2f82f01612add104b0f12e394c509281da07101e2cccea4100d45f097c5bffc41849643366d0d854e3f5e226fbe0da40577dc3dfa89ad2
 EBUILD kmix-18.04.3.ebuild 1257 BLAKE2B b6e380cfc5ad9dacfad944abdf8938eedeef0b2fb645ed3b8e9326991468a08d674327cb5bb883084867c13023e20b33ccb98b3b1aee513f005bf3ceaf0fd980 SHA512 a5f8527e8a10eab94ff93b1694a8656c460ae1b6c5bb91f4f6741a2a140bf6e0c98720b2041c69ec9a85ea86b82366075443bdc3c82c6676c418df42b28dddf0
-EBUILD kmix-18.08.1.ebuild 1259 BLAKE2B a6bbc426ed3368d528f398f4d97b9629312bb2f729d9b36f6cf0f5ad6bad3584253638400dfd62b3204078ef36967e0f5d6cf52be6ff5710cda067eee04ec512 SHA512 96c0bcc813d442a7dfbd28b35984008e3836fb19d7ef865d891329d0eab10b4405b170d722c54d5ee1c5469e34c64454330bb951d430a31358ebde56e5db15cf
+EBUILD kmix-18.08.2.ebuild 1256 BLAKE2B 84f8b7c3ebfa2720c3167e042af7a22a12a1fbf6920203c2f2ae01d9804d76a1ade3d4f13ac6ea90e0c67ebdee719f8e072a319c70905ddb7e3c7423f951bffa SHA512 70e4a9356a542573f999bef43686646bace4c1f442be3b326864ed95401508df4bec0a171397da0bcd30919502cedf325c4cb162a471f339539362422dcf6506
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-18.08.1.ebuild b/kde-apps/kmix/kmix-18.08.1.ebuild
deleted file mode 100644
index 768fa6584e01..000000000000
--- a/kde-apps/kmix/kmix-18.08.1.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/kmix/kmix-18.08.2.ebuild b/kde-apps/kmix/kmix-18.08.2.ebuild
new file mode 100644
index 000000000000..9945973078c4
--- /dev/null
+++ b/kde-apps/kmix/kmix-18.08.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 d2f517b27fa1..58456c594696 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
 DIST kmousetool-18.04.3.tar.xz 112816 BLAKE2B fe69bf4c4b5060732e2ec04b4ced3bedcf042a1779285602cdf8c92da6c1c9f21616d91c803fa750006d9eb74b3cad9709dd7a6daf9181c2f7315bfc344e7842 SHA512 46821eaecc616288892226d5f7c9a2eea97b8e2e822d2c98871ad028dd0b9b71404f2b74a6032299266623239d7a57e8ed09dbfeb6b8b54f50e8c747e98564b2
-DIST kmousetool-18.08.1.tar.xz 113064 BLAKE2B 609d098a08e172519d92e05c9f436dce103e64320d46b1e8af0d0cf18c572b7c1bcea5de596b2d0378c14860a8f14895505effc8f5131cc9f411d8a660886518 SHA512 d7ff0284453c39a8c3be8f7937ac0439d17af4313ab56a6903eb39473d8fad06c836fe836ec4e061dd5a96317bef916e9a3ac9771c5a829061d1ad20ef32be08
+DIST kmousetool-18.08.2.tar.xz 113040 BLAKE2B 3c0fe0c036ab080a674186299242253f47c68aea5bef7630bdedce46b7a6dc11f5deea8c0ecc2c4451ded10e27d30d22b847dccfc6078a092de92e999ffe3f11 SHA512 d03538f7bfce62d76c146d88f47f2af3d04b6a409983f4ede72c09e76541943a6525deaea3b0cbf009856fa2b92e4d9ba6ad5e0e8171f571ecb70c13e8333a49
 EBUILD kmousetool-18.04.3.ebuild 819 BLAKE2B 6a2ea6ff7754da477d8ad6811a29fc343cda6f2db8d170c6bbbcf9e84f93a65b475f6b4a069d4e048bd658b1cd6445f5203f07b489253d5fc93280053d22006e SHA512 2dd8c2c3ec5e7851267027ab2c9b3f07e2748ccccd92e839abcd5bc9a776cd8171ba129ef3feeed9347aea1ab5b1953288d752f967c16b472234ad3d21992906
-EBUILD kmousetool-18.08.1.ebuild 821 BLAKE2B f5e6e898ea58477837ce48ca399d62d7795c979701149e3456269a2335db09061f0f46261d425670caec0b37434b0abd4a62fbfee050c3fb64924ebbac94f416 SHA512 a9369b2b459edb1f7c89aaabc36e48f0d62afd3dd073477367b20cedb577d6425162477fe53cb5f0348576c390183c9f85c25fac44ca3b5c1b1fd199586c8954
+EBUILD kmousetool-18.08.2.ebuild 818 BLAKE2B 3fa65c8de4332e55fd4a9175e4c54986a1fa7931c59be856469d26ac38e917733862bde4053447a439f80e698fc2a33d5fbf939ae69f2cf7a41928ede6593d60 SHA512 f4d5b273059e679f215f7a9ee69d9f1daeda650dac5558feff317bfcfb9d9fa362c0b4ac0bf034e9a3a10159d15d019e8bcff584f0c5bcc57e9620d85d742975
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-18.08.1.ebuild b/kde-apps/kmousetool/kmousetool-18.08.1.ebuild
deleted file mode 100644
index 27f3e7583436..000000000000
--- a/kde-apps/kmousetool/kmousetool-18.08.1.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/kmousetool/kmousetool-18.08.2.ebuild b/kde-apps/kmousetool/kmousetool-18.08.2.ebuild
new file mode 100644
index 000000000000..11cdc28ef286
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-18.08.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 47f3534696e8..99139885e7be 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
 DIST kmouth-18.04.3.tar.xz 1766968 BLAKE2B f8145cb2f744228d684355d10ee05edc67030f558c62434dfaa38b82dd916fdddf4d68bdf67caf5b51b4dacf4088c2659ee617aea39dda9a5b2519f3189e407a SHA512 f181bdaed15040feded37576aa8539e42acf61bf06a1406ffc7fe6890ba355f45ecb96b8657629105606c555f1d7b798814987c1060e83855de1a9fc34708cbc
-DIST kmouth-18.08.1.tar.xz 1767208 BLAKE2B 4623ec6eb227c9f786cafb9809e6053bdb77e42b70d8d5ccade7ead7eac2467f146f30fe1593394ee2e7e1edee6b4a84b42e60f992e127d8049fda11f1ac743d SHA512 a32ed8a6eeea3da4ad8eb2dc35cf4bcc1a45a89e947f3cdccd5c6d3fe77323dfe0bc5626efd005534dccb9887be0acfe6c46431b5a104e9ab52088bf80da75cb
+DIST kmouth-18.08.2.tar.xz 1767112 BLAKE2B 75896d4f3f22dba6813dbd3b08702c10fe411dbf4bdd89e3aaefe67fbf346293553d41b7fb86b8057cb91862b9b165a43ace63a9e65397a185ae132c324c97d5 SHA512 8ea55a2b6e0ae047e8b7ff86906f201e12833819af4918f7e616cad1140f366a6833611b3ee06a7a3770c728ee5bed5719705f6ed1607e0ae4a46b08ff5f3042
 EBUILD kmouth-18.04.3.ebuild 770 BLAKE2B 28a86a37b22b5dba01003bf8444da389068e8daf9b7f903a4c4a19a219987afdf9faaad273d765f440d272e219b999b9de3562a148f2729382080cd15b83a1d5 SHA512 db09f5401d25b9e38e440ec9b705b2327f7329f3be9423e22183836654223646de3c63e5f93a4c945abe80a9c9a5c81bfbd4b253f8b984c9de624399b2d2f7a8
-EBUILD kmouth-18.08.1.ebuild 772 BLAKE2B 8b5ca8777554aa552b6451d9eac8f6f9e40d59b39642c344b8f5576a9ea5dec215fece9321ef6bb90aff548766e2c1603425242cfbfd6839fd13840755e99172 SHA512 e5dec01f18741b121eaa940b2c39eac03d61043620dde414eb1bed4dc704b2c279b6b4e4a337050eeedd61ea36cfc6f9ca20f2b6fce4165848a042fe5be86304
+EBUILD kmouth-18.08.2.ebuild 769 BLAKE2B 2a9cdf94b4b6bcfd583e15961d72d5f1bd3d5ddeeef4abdf1eaa0ce5c8b7aa0f1273f3a57df34718fd6807594a950b90a09db124ecb22e5976cd18242375c9db SHA512 ca2e1404ed495a93925ee895885d90440efe99cae0f88a341b70d7d43d9e4b6ac1d2b5c13c55848c673265e623db71b8ca1900c50aef85305a3f9b2fe8293a32
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-18.08.1.ebuild b/kde-apps/kmouth/kmouth-18.08.1.ebuild
deleted file mode 100644
index c648621058fb..000000000000
--- a/kde-apps/kmouth/kmouth-18.08.1.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/kmouth/kmouth-18.08.2.ebuild b/kde-apps/kmouth/kmouth-18.08.2.ebuild
new file mode 100644
index 000000000000..c1f3beb97ade
--- /dev/null
+++ b/kde-apps/kmouth/kmouth-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 44e2fac8fdb9..6b34d1ee8521 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
 DIST kmplot-18.04.3.tar.xz 3028664 BLAKE2B baf384a0104b44d3ddda7657e0a5135c78728dafcaee2c14a7e36a9251dc3e78ed627923b98bddca793b6aeb173c43eba6694cfad72215e8a38342510b620cda SHA512 798ac10e281efc393f111e222641f92a9a5cca94513f740468aa17626cabdc80fd9628a96972748a7297665957d7c5164f43036e51bef35269899e04d779708a
-DIST kmplot-18.08.1.tar.xz 3028852 BLAKE2B c7343030d8bb2fd3db2bc1a0e66cac804e4c9d2d81383f6de1fb94ba6459053abee076b1b0526ae04e067f5707789a47622473259a57942c596867391c942cd3 SHA512 b5e5944875bc49f2bbe55aad41212f68973995e0de1926195a4f16e2b4dbc67f46bf745a577f6bd07d9ad30b7795ff65e853920f6fc3333e46b74f256a1b266a
+DIST kmplot-18.08.2.tar.xz 3028852 BLAKE2B 2b5a0e575fca83b3fa7e1804dfba1c43a0a12513d9faa6a0f575de88b5b19e811d8ca30952d3785e720825cab309b3ef323b5c6961a49ad7e00cd71f7e2edbbc SHA512 7780848750bd337d3051a477649edc34da233da112546e3f53393c3338ca18ca4086f400d5bfd12e875b4f7cd1873979b4b61397ed5550706467c52149f784c9
 EBUILD kmplot-18.04.3.ebuild 930 BLAKE2B efb2b3bd9ea45ca378ecb970201fc6e8b407d27a182b394e0b7c574e81306353977d0b6c0afd61a5a257157e5d5930319b75eba768514cb65818f2a1af0c3a9d SHA512 7f7d9085b96b736c20b7a2281000a0550e9041176b2ed543ef78240f44f649e8994a6f4aa29073313ec1af57422ffbc9df2f1f0b93add0b1ac8f8b27075219da
-EBUILD kmplot-18.08.1.ebuild 932 BLAKE2B 34fd54c966744b264388baa2dd271f98e3170df02333cdac402fd2189d221e9dc9fefc7e70671ad1ef8cad41c3e0b4835a54ecc888ffe02b481801c3096f6692 SHA512 3c10eabb2745eac8c98a436bd1ea9958bfa24a3c75912a5333c5a37dfbf1c8bca69ba3987cfdf1b31ee35f88c15f35c0611d97a14f0aab65fe3ac32220ded28c
+EBUILD kmplot-18.08.2.ebuild 930 BLAKE2B 0c67705d948ac74a49f31ef32336d1dabb1e95e2f7ed7cb89e2fcc142ddb5d5780a45e0717360c45c0a80de86e66a6c4a3c362c1d991d85a9f981cf149d051f9 SHA512 2d79033c9913ea7954b264095cae962df5516213aa90a6077c15367112e9b1a8360fd428e51821056578f68663bebc7ca3e09325b5af2b4117dd5d1185abeaa8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-18.08.1.ebuild b/kde-apps/kmplot/kmplot-18.08.1.ebuild
deleted file mode 100644
index 029f91d4ded4..000000000000
--- a/kde-apps/kmplot/kmplot-18.08.1.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/kmplot/kmplot-18.08.2.ebuild b/kde-apps/kmplot/kmplot-18.08.2.ebuild
new file mode 100644
index 000000000000..875c1b55582f
--- /dev/null
+++ b/kde-apps/kmplot/kmplot-18.08.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 b328757ee3c6..269da998f137 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
 DIST knavalbattle-18.04.3.tar.xz 1221332 BLAKE2B 5e074e09f71628032237a5bc19dd5acd19d3758b9b740511ba7bf2947577f23f0f3ce7fdf8e3083bc864af4c28cf06f423f1a1134dbc5434337c10249ab64aaa SHA512 67b9049d55e975dd5f1dc9f9cb08bd3102d633046c75bf172abf33e12506774f3e6606f63c3af6e1b23e0d42494a1b4945f019b9f2bbed7d7d64df8609cb2931
-DIST knavalbattle-18.08.1.tar.xz 1280332 BLAKE2B f3d9c1282991acf7b98fae5a3531b2fa020f357ffd3426688efdc9c9bb3b4c81fe6f9a8d507c837da27f8ba43508776099b6792eecba99d46d31c4bdcaeaa7ad SHA512 db04fb34e0842281ca9084009215457883582b7d0d99bc64d75f28a447ea735deb4732cad9ebc8d8b82e369b360acb81bc70a79ef0b2a64dfad89a008a49ea0f
+DIST knavalbattle-18.08.2.tar.xz 1280324 BLAKE2B 3f76e7eb2f62fcef1c09572d401b26c75f529082e9bf94a234b9c41e0b5bb86671cd273823a352693612eb7387475671d79200af02a24a78715a926d8f2eb6fc SHA512 5b977bb9d94bc7830e928dd91e33a9f6cd85655bc3efbaea3edf526e5ce9dadf763dfa57050f71315834dcbd6e382e404b23cad9bed683604326e41a054a56c3
 EBUILD knavalbattle-18.04.3.ebuild 872 BLAKE2B 6f45834f266fa08a99416868578f894d12c04cb13fd023b56f5c32c82c19b02af5ed50a38a3fe667a3eff4e49431b2699c426b463c7543c1bad19ba669b31aa4 SHA512 ac29b5cee1b9d45e47167cefaac334fadf27f3d47e493415bb571557fd6a44aff1ce8f8fac623eb25e5899326782363b97cfb68c42756d22d87b26281c67deba
-EBUILD knavalbattle-18.08.1.ebuild 874 BLAKE2B 0a4214d170991f89f402a8ea61dc85a4aff52cb4d9ed54db23cbf63f639d4f1b0eb9ea835673a3888bebb479ad88f6ec0c23caa81dbe30bb14305788f8e6c6ec SHA512 7bd9501435861e85526502a20f16aabb2115c0c805687ba3b7ad759b03cfbfebb2f762954e7476a54206e257af398c76bdc3c780e1444afa41afd579931d4e8c
+EBUILD knavalbattle-18.08.2.ebuild 871 BLAKE2B 57059043c84d1620554b93739e2c9a870f3c86d3c94456ec708a3e6b1a9472b7170b0c788f82573a814bc7a0b22d3b9332124539c3f79efc2eaf66063ce5b0c9 SHA512 1ff94e46b59435ed5ba10b4a46ae0f33240b87475f745e0ffe4b4fe57fd75f063899e5d37e5d3d333994f909f019fb2be7bd5c7c1e072d20657553aba1048822
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-18.08.1.ebuild b/kde-apps/knavalbattle/knavalbattle-18.08.1.ebuild
deleted file mode 100644
index aa760fb43133..000000000000
--- a/kde-apps/knavalbattle/knavalbattle-18.08.1.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/knavalbattle/knavalbattle-18.08.2.ebuild b/kde-apps/knavalbattle/knavalbattle-18.08.2.ebuild
new file mode 100644
index 000000000000..23d70fe88ba8
--- /dev/null
+++ b/kde-apps/knavalbattle/knavalbattle-18.08.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 d12c0bde00eb..059efe9079b4 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
 DIST knetwalk-18.04.3.tar.xz 981328 BLAKE2B bab9922b39d0a8ae7fcbd62812fa2bdc14482e71213335049cfa45ed7af7111ce894d03bc5508751a24e6dc54baed50503a0e529ca45b4999dfba7b5afcf4266 SHA512 1d2d778f170d0ffba2ac9052c53a256ef6682ca82573fbe09b75cf5b00ab6cb4ce0948a3f40ec8bb75b39563c7ef383bde23fb2fca794ce6927e996acfd25e9b
-DIST knetwalk-18.08.1.tar.xz 1036676 BLAKE2B 2bb64b20b7ea6b9811e043d817136e6775f066ff4486f11a7ca2ca9ef1fe60618dd85b82aa15b6f1649bf0ffc1af416e2a21e235eaf9be69d087e9f5696429ab SHA512 2e85f38874c8c8e6929ef84b39cf5498d3b44e924aeb623cf58b55e0c9a213f3e25150aace852ae6082d50414468b90a59a288440860102a06f7e6296d662611
+DIST knetwalk-18.08.2.tar.xz 1036576 BLAKE2B 73ed84e8f1548c4955ba64e15e5acff3e2e9a9a8ac22e8d6f728340ee38b0aeeb811c7d86a1b63539d21425412e770fb6605d4f9adfa2f3da7bf85c724f0ff72 SHA512 c420e83cdaa06c543b99a94cdcb0ea55daa853bbd3e7fae6973140220490f9dc555656576b03d0d8297a5173db4e4d2fe5ce3a1590bf275a09b003817a59863a
 EBUILD knetwalk-18.04.3.ebuild 864 BLAKE2B 0c06b84f708811b29b156ce4adaab1026eaa439538d5f7a599f9d9d0d6da5cddbc30ee13c1f245a6ac489ad23df5cf8f45d35edb8680ccc3842ce3144a7a748f SHA512 adf4cb12f6d2628806e9702f67dd45648fcc78105e0bbb652a6e8c02752740d1e54ad1c63ef953b613d0ed52d950913bc031561341d8608b674ad8e76743eccb
-EBUILD knetwalk-18.08.1.ebuild 866 BLAKE2B 9504fee5cc5ff740aec0f22f3b86e09dd4178c363bb3d3520a485957e1ef76f24760755638fad19a125dada4cc561e079b524daaab674bb48d1029dee1187496 SHA512 078ee1be05e95a9013294b346e0db0b4711d17723922f421f6b928d218ed694e483a59851dc1f9f19507cd92c2e5cdd4999370712a145cfd2564b0473cd82fea
+EBUILD knetwalk-18.08.2.ebuild 863 BLAKE2B 64476569e2f661217c95b216df21e4651e419e1ad65ddb325ff9b115e20ad3a8f8229db5b82d4a65f1add28bd10a7b552268ae57a780b0144757414770f03a30 SHA512 24ee94086c6b1f7fd8b12267a98a392d94164b563cd7689ec94a31f2e36b306f403d1dcb1af7f45d08a84dce462c51c5a6189748de7becefe00d9980e2207a21
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-18.08.1.ebuild b/kde-apps/knetwalk/knetwalk-18.08.1.ebuild
deleted file mode 100644
index cd1421b84e74..000000000000
--- a/kde-apps/knetwalk/knetwalk-18.08.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/knetwalk/knetwalk-18.08.2.ebuild b/kde-apps/knetwalk/knetwalk-18.08.2.ebuild
new file mode 100644
index 000000000000..289adb382ec2
--- /dev/null
+++ b/kde-apps/knetwalk/knetwalk-18.08.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 500488e338f7..65eb9fb673f7 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
 DIST knotes-18.04.3.tar.xz 336096 BLAKE2B dcedf008475796e561e411e7739e58d68dfe0557c8d64a30390299ee46e40c1d5e8e5a8cb34946090ed8d6c8da323a5852a201bb24e34e0ebaede21b9fd0aa6f SHA512 899ea5a22b4e0885acb41ca1d4dfd04a399186c452d29ab9672bd0099acafb1b089e1b82e81bf6af8f803fcd89f504adf9a74ceed7c52ba53e3852235999f0ec
-DIST knotes-18.08.1.tar.xz 338588 BLAKE2B ed78691f4ab225713474f9ee561854d1aee52d2f9ab5760a5f1842ff01fc07b2697bbeeb359d32a5238aa3389d34e6463a0988809e4d524e01998360d3716ffe SHA512 ba509b8a91e5e7c310e6e6350bc3c2ef1765748a46cddfadeca9ac79fd7349d2acdf5d0b08efdae053d5a7885803f55505540d01e567fc9c913384a2cf046957
+DIST knotes-18.08.2.tar.xz 338548 BLAKE2B 35f6bd2df5198689de3263003fde55a9d28bd492774da41225019bfdd88fe04321ddab58c18221a74b8001dd83cee3041442e7b3c2056c612981080839035a4a SHA512 7f416ecca80de62ca5e2c4d5a164e9fc0ce14ce887674887de866e4f9c83161baba8a6adc40d32db8887da33dc0d4512aeed9b3d9eed736e4f06470958711c73
 EBUILD knotes-18.04.3.ebuild 1849 BLAKE2B b3c436a1c3c07292e46de05368258fcd55a914388f01ce7ad8e0dbfacd1ef0276be14fec8934ce0e887a95d677b00bcb736424b4b728b65d7a58725dc91ffaf4 SHA512 cdc0a287ad739d2db30ecef025af186a5fa16c92658f9e66928bfff76fe405f5be44f67b3df494b54e2e31b293086c6bebfdac8a1e071cf95acfa9c0014a5a68
-EBUILD knotes-18.08.1.ebuild 1851 BLAKE2B bada3858e1dc27170d669f330da0ad3b88857e484eaf06119bcab5bdb9900ae05958908412bf53fc701c07769c1de246c3fa227cbe139f9c3fa4d2e3aea5a05e SHA512 4a847cb9b48503bcba01629ab034fe83774d603960eabd8c3317eb2c5de3ddf92998f6a34a5eb10f44b7cc02331c880f1a66593ded255e782fb77f422d0a906f
+EBUILD knotes-18.08.2.ebuild 1848 BLAKE2B ad68d649d60202e35e3bb14cb437a0e09957f2e8be058e23996c433471ff9aa239b9ba0517df6293943a894fe3affbe1de7fbc01757ca6e4e21a2cc3d03a7885 SHA512 ce0fae531e22c73989b5949c8faa2654fd26eb802bad54a61087b4484a88a94b696d1cf6176cfef444260b9163ab8211b72e86d92ee9b41091304e47d1671cbd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-18.08.1.ebuild b/kde-apps/knotes/knotes-18.08.1.ebuild
deleted file mode 100644
index 95df2eeed40a..000000000000
--- a/kde-apps/knotes/knotes-18.08.1.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/knotes/knotes-18.08.2.ebuild b/kde-apps/knotes/knotes-18.08.2.ebuild
new file mode 100644
index 000000000000..70cf933ae6c4
--- /dev/null
+++ b/kde-apps/knotes/knotes-18.08.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 1269ddfbf0cd..4831bd8781d5 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
 DIST kolf-18.04.3.tar.xz 925060 BLAKE2B 6c04a8e60f0d0a12375f782b722f3f9172210f230725c70d26ed9d0b2bf2740d466380b0278c1ef832029ce48017bb0ac1ef889f03e56c16dc401c353c1ad81f SHA512 e14b94419504f531b615c7dcd7918c2ced7b7512d7219b60680533a16e365eeb3bfcf9f7db3d4838672a4fc70494dd7758a9ea409c87544f36018f590e7160a6
-DIST kolf-18.08.1.tar.xz 923492 BLAKE2B 01d975b0a3b7dce975d7951dea5cf0cab2c78ceb0a8e064058a44f70a22670d807bd209b6acb40fb0589637c4e832d82f4d3560ab74535e784c81064a4fddee5 SHA512 ad1b547b9170ccbc74012543ee863155057a80f0b50fade8a5def556c7db2aeec1dae06a896f5a8090dc95f7c0cd98ae7d43988452753714d89442610d98a51d
+DIST kolf-18.08.2.tar.xz 925276 BLAKE2B f5d94a3f95f2625aefa55b230421bc5856b297e64dfaa12695ed08b13c13078b8a89e77beb39068e5ae417cb621e3af1fe1ca80daaa41a9b07ac308afd2144c1 SHA512 2ed3089920e058a9e3cb045368efd68d19aca27c405ebd5105fbcbcaff636dbea91519158240c002eea7434deb7f3970002394e04e53108f744c82617a7815e3
 EBUILD kolf-18.04.3.ebuild 815 BLAKE2B 00ef1d34aa586ff26f65db6fa933b43b20a5b9d483d9f43e1d370b7be06dedef78e7a49dd7d5dff2e244e506f3dce10d9754c714864d1369074d43e2ab1dc7ba SHA512 b3b84088137f392ce0996c59fc630083f1dfa7aac5978d4525adc747da630dfc5c69810aded6f23b4651b9f24ae54cecf42809e0cd517eac8170f7aa0041529c
-EBUILD kolf-18.08.1-r1.ebuild 836 BLAKE2B 5e931e57af0d3a1377052381ff3758fd6a3611b426892aab13e0d0e028c4cd29e98a4ae8b025d4b1214728b634a2a0d3d5f59bc83a7c436d855acc5883cb65e1 SHA512 031945aa6bfe0a01ca34220944725bcabee819324dd890becb295c8d383ac5662927f48d115ba1fbb2a96a0ebdebade6ec3f987a958432a91ae95e24c32303e2
+EBUILD kolf-18.08.2.ebuild 842 BLAKE2B 4a82dddd8df395a0f6ec3054836220663fa20a63907c4505eb8af5749831ef9fe35e9af5668359e23bc6bf2a1a12f88f793a59e08ca4415fd0e440b81c4062aa SHA512 9382cb1cb949e5d2ab490ad83d6b8b6dad958092a514e071e9863c39d1b07a5277e9a861a9e3dd69ba6e8462e2840a151c32a7689a2453bc8f2563c4ffe5dcf7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-18.08.1-r1.ebuild b/kde-apps/kolf/kolf-18.08.1-r1.ebuild
deleted file mode 100644
index c402c887a47d..000000000000
--- a/kde-apps/kolf/kolf-18.08.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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)
-	media-libs/phonon
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/kolf/kolf-18.08.2.ebuild b/kde-apps/kolf/kolf-18.08.2.ebuild
new file mode 100644
index 000000000000..fbb5d8028af3
--- /dev/null
+++ b/kde-apps/kolf/kolf-18.08.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+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)
+	media-libs/phonon
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 2b79640e28d5..2825f2b7a3a8 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
 DIST kollision-18.04.3.tar.xz 272564 BLAKE2B 27ef55f7dc587267b10af8d1db7de418575a8f9cf29bcd651cd093b3a8bd49e1698d79d1099ad7a91ee5a35ccb83f4f4a96b6d9eb634c808aa645796608e9b4b SHA512 c4db5f6a96364e86eed8f344bb378752c9c05e147302d029aedc9a6926a761ae71acaa5b37ae39abe14e6ab7b0e9061ac26e495b5917d6b3cf862516898db58e
-DIST kollision-18.08.1.tar.xz 280712 BLAKE2B 648cfb9325cbaaf746bff6dcf86d691028222155f80c1fb6c5e2895bcd091d69cd4d0c81bb0708d5952c5fd75db9fde802d0f3827a67797d1b4215c2ec420d1f SHA512 ec2c7d2ac4cbbfc9dbb7fae4046984f5acae8ca68c2a2f493dba3edc649a7cd834c9cca23a579f75c704aa76efdd4cd920ae5fc431ff3343ba9d304f5ea3daf9
+DIST kollision-18.08.2.tar.xz 280688 BLAKE2B 71d4dac579e2d480f0f076edd33bff36092ffe9994be5f5d4cd426eca86cae985342954241960189af9d8ca3cae9aa08cf2594d882c130566062ca993a8b27f7 SHA512 99cf479bfd2aeb4b81a1db268ddafd0b011a8dc73da9c8a191a07acdb046b2dbb43feb4d760cf49b87f95d64e9faf899e569da42bbeccb2ab7c50c85062df5f4
 EBUILD kollision-18.04.3.ebuild 677 BLAKE2B 4aa766c5a0d006410dfe46eaaddde0c53297a4f138d6441383a1331169f3bb4a553f3ff3b35a68f12d85c4c1c3462f71bcc1c6d64bc0ac0d63b580b3a80fc118 SHA512 ba86505711ba8223554c71eb569c50319f71653cb92b9e329b82708d543a8c5056a00af6172e91efc1d0d739b7038b098b53844889c9c28f04e6580a2c2f8402
-EBUILD kollision-18.08.1.ebuild 679 BLAKE2B 6c6b183428a7eefcc27771c0a57339e65830ba080e48ed47cbdbe387576f06412926368fc6e730a9dbb692539b86b9437f402c2fc4d650d23d46e15290551328 SHA512 d377731ce231e3e3ac3026fcedd6455cf361bf848d7d26be944dd67827fb33e1c1f728b064848c396abb5eb25f094500ff10bdabed3197fb781ec4a7c8ca5af3
+EBUILD kollision-18.08.2.ebuild 676 BLAKE2B 9f8603e04353b4c342a8bdf2763cecdf7b2a1fb0985dcf6fb4d681004742bc1acae7f516531da23802b998683c9ed8625d09b58d8d17071b2d7b4fc998a644ba SHA512 afa99f2f74ca97fb1e922f06623ef382d3d9eedb95d240fa54c65fbf32985895dceb9ae5eaf367b51c4dffdc0dca8e9e60c90c6d373b17182866bc29ce2cfc7d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-18.08.1.ebuild b/kde-apps/kollision/kollision-18.08.1.ebuild
deleted file mode 100644
index 159531afe066..000000000000
--- a/kde-apps/kollision/kollision-18.08.1.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/kollision/kollision-18.08.2.ebuild b/kde-apps/kollision/kollision-18.08.2.ebuild
new file mode 100644
index 000000000000..f65958c448e3
--- /dev/null
+++ b/kde-apps/kollision/kollision-18.08.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 0b4ae1a746b8..664c04152ffa 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-18.04.3.tar.xz 5548984 BLAKE2B 15017e7bfe7b7a8c82f0340f3cd4e222f3871f476f2530df358ca65e0f1971ec85199f2ed67e1a86a998331b4a5bec1e3ba1ec0b4ad5ef8d3d1c949ea074c216 SHA512 e9e90e16ac93f019327f9987f546ea55999a707e5ac93218a6850669bd729506d80c52e2e1cdc78d5c2d12a3abc696412c7eee07343a2bf726d7c5fadb5ff4e0
-DIST kolourpaint-18.08.1.tar.xz 5548748 BLAKE2B 19e6e074492e801d91352319a47b3e4730373508fc315007e0a76507826606a1e66fc2804e7856b829af4d549e2e8f3eb911aa05bf547ccac2462469300cab6f SHA512 ffd286a272bb0152238f73ab510d9eab006b9362f1d4d4f35b30d3ba9d3335be24f86b6aa71e29a5c5faf87c6d72e96f58ff2b0fbcbcaf1471c94a9fff8949c0
+DIST kolourpaint-18.08.2.tar.xz 5548524 BLAKE2B 6bd80d4740fa9830949f6bb55f69e04e8fbf34f57c249c7b7c6272d85def63475fb1ff1487f3fede5126f45d0a010c3eded04e3ff30aca5a3f977def2a39a6fa SHA512 ccfee1869ada8b61c20e9df322e0811a26f19d028be6f7895cf517c109ae00d72622032ce1117aa2b1573c5c333e63d70f4f444c1c627a4dbc11c499eec934fe
 EBUILD kolourpaint-18.04.3.ebuild 1034 BLAKE2B 6e9776b8a4bc28871147943f6a1be6c0e6abb7f6b94fba18d2fa4d8a98abb00ac20a495c8ffae4315d70f53adf3c57d96f9186def14d067ac15cbd7f14c24f0a SHA512 2a91e2766f47103d893779861492223455289982fc509eba3919aee657f240b984d1daece66659275f5aacdf2543aa833f254c54ed505db591a1d4df5385a921
-EBUILD kolourpaint-18.08.1.ebuild 1033 BLAKE2B f9d0e7a71b6b964f475cea522276593da889f8c9de50727f0d615e78a97e17d28c0fd1b5a34d9bc0675e134488381175aa3bdd2d95bafc2f2ab0eec78212c6d3 SHA512 d72224a9b8d7399bd02ab39f87b1f978ff1dea6a327fdc01de6133f92d57361b49ba0a3fba29cf79055f6e8040a0751a4720f68444aaa75985096359b960211d
+EBUILD kolourpaint-18.08.2.ebuild 1030 BLAKE2B 02782a72e9d8a19bc393d6f2c6c4548e4fd573e02893f32d6c4122bb93308e606c3e63cf70b96b43ff91e86c0e7516d80e9ad3281d1630e8446b4792f17bd21a SHA512 fe2b2b81d1c64c72a9fe1c9da3ef36164fe7942b151528d28477ef9f4fad8e9daf5f47ddc202632d6100266fc38d71169f1af68f8f09e2371aa70829de979625
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-18.08.1.ebuild b/kde-apps/kolourpaint/kolourpaint-18.08.1.ebuild
deleted file mode 100644
index c7b255bf187d..000000000000
--- a/kde-apps/kolourpaint/kolourpaint-18.08.1.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="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 kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(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/kolourpaint/kolourpaint-18.08.2.ebuild b/kde-apps/kolourpaint/kolourpaint-18.08.2.ebuild
new file mode 100644
index 000000000000..cce9441c5950
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-18.08.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+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 kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(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 6c5aa65c60c9..ba5462c3d42c 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
 DIST kompare-18.04.3.tar.xz 712096 BLAKE2B f2aba3342dd778abf88daed69967191dbb34cbce9afd006ad9d73341667d4f3c7270b942ea0d89844fb03b663901b04868ee043d3797a03ef9d0b1ec9447034f SHA512 16cbea4ec5202f073fe7251db2682031915509b888eb5ecd098d72f20438ea23576750976a4811f922bba1863f08e280a5f7045248e97e3060c3d37b81ae1b65
-DIST kompare-18.08.1.tar.xz 802248 BLAKE2B bbaab76a3be8fa02bcd1fa5d59676b3281e7cddb5a2704c37d14d596cee220f0fee1d21cb5b357ad10fdbe85de4d5ef4dd8c97036ee7506e6d54fb6e4773c60e SHA512 dbb5c082d03ddf0d0ad90d388f7650119da210cf51fc03de8c33489bdfe5b761ede47f2e898c48f81532a97e456e933835d1adcb354ca842ba6b8b3522e41ac6
+DIST kompare-18.08.2.tar.xz 802264 BLAKE2B 4cf2c4259867f7e4c52d57dc623890d146e3997a12895576c7f9a3ab350b69eaefab4965bd30164536ff25fe3c3c9046fcdd3d8eb878d7a9598ecdce12d5c473 SHA512 f8a94152cada3d2dd39e1ba01f09005b3e90f9dfdd31c1b6911ccf5bb1cc8de4f78058fe1a0503789b67f7e7dda59973354a7562e0e74e3da2eebc60ba29bb1a
 EBUILD kompare-18.04.3.ebuild 957 BLAKE2B 7b5ebca036dbca4a2306a6c090b758850cb904f34a845b5c74339b3b203b5c9df205a21189707be0d39097603340785456bcf7531986dfc2369bb8ac807449d5 SHA512 3dc0f9aa5b85f173d7150f074130d5b2a25262113c63a735bc14d2998cc2eab5da4a71ae61fbb340d6a8aa0fa6e89cc66c2622d1864d83b0022fe41b93573c4a
-EBUILD kompare-18.08.1.ebuild 959 BLAKE2B 3b70af60469b94895ec7dc93ae77e40aee70bef5cee9fea82c95b6e0f22f4b5515630905ec820a930aade616e7b06b35c3e004db673ce1f279b41347e6fb7d95 SHA512 73c12348fd0005db8f423272c661a3f7e5de65cba7f7732793d94db30ddaf542a39948611f9307cfd155471dcbebef49be8b00ae24f60524482c48a2279cc2a0
+EBUILD kompare-18.08.2.ebuild 957 BLAKE2B b17e132e406909ce60bec69b7a3daa607c84b0a13de6dc983323f19a8adbb230f1b02a0a37c17c64454f65242ce20e9ab1b79d9a9339d7b60ebe35ce54aa7081 SHA512 44f92be083ccfa84ae8ab507a9a0cf4bf6945f34b3abfa545dd12d14bdfc33632543067019e87e818371b9070c3753c90637505f1584f16390e46a1fcdc2959e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-18.08.1.ebuild b/kde-apps/kompare/kompare-18.08.1.ebuild
deleted file mode 100644
index 5c3fbbe779a7..000000000000
--- a/kde-apps/kompare/kompare-18.08.1.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/kompare/kompare-18.08.2.ebuild b/kde-apps/kompare/kompare-18.08.2.ebuild
new file mode 100644
index 000000000000..6648e16e521d
--- /dev/null
+++ b/kde-apps/kompare/kompare-18.08.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 0181a3c92226..c8775ae3f6fa 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
 DIST konqueror-18.04.3.tar.xz 7694900 BLAKE2B fa20f95abee369084796785b622056b759c3acf11f6feee597a0ac788c9d64740283f6bb4e45150b2eb52f4de8689f1e66d3c4f3cf1e8f6d50ead6eae8900e16 SHA512 c55c0bf0f97c5ecaa73c7c56e2fd236642620b9256ef6f7dc3bd922b8d590e33c2524ea154d8308fc9dac9196e5cac3bf08d109565afa756ee6d54264ee4ab3b
-DIST konqueror-18.08.1.tar.xz 7744228 BLAKE2B 5ff180994931ed15a735f0365de0ea02b95de83e9cb2ee249e5833b0bd31e114ba2583978d0c52934b8bfdbbcfb319da2062270a6245ea05bcc5ee40a3740c64 SHA512 75a80482551816a18ba4a3cbf3a21ed2720bdfcc1d9da4b992815df93b66c2afc79bbba2e4079921ce85daf6b3f3057fb70d82b4cf98b719dfeedf86549cdf47
+DIST konqueror-18.08.2.tar.xz 7743608 BLAKE2B 9e5377f99f1d498637bd75517c8550c1005655da8fd766f8071dac63dee2fb62cea24b120e2350a31f368847f3c8e036ebe268ad8e2f7f79c807996c67503f98 SHA512 fcf7154c67ed2d6da3359d1ecf8623961718a346bcdd4b1cdc0dbdd3ab3d889ee2a6722beb967f519073bcf658eeaa48470daa187c5fb8d465518aef8bed7462
 EBUILD konqueror-18.04.3-r1.ebuild 2995 BLAKE2B 4c5f270217b06f782ef1930aa9c14f6bc52b189d860207e7ef0acf86a2edaceca9a581519e1892aba73e438f703e17d629ee7f556fee0a965de77858efe4ed5c SHA512 8b7016e5b2f365b18269c6df9195768f30250a2111072a05791ff9f74b845f7a6e82ebc5cfceb199d55664d119182e6c2e160c815cabf60d2b22a0cf151d9f0b
-EBUILD konqueror-18.08.1.ebuild 2997 BLAKE2B 92f5b7591aadb85d38d63abe260b81699a35712039c4d07c76729ccd149e56d166df05918efb53758b8c65e560e164058c549648b1e8a6b084a3d8a6c09d6c63 SHA512 f618177f0ab09cf0244081e97bd7bb83af9acafc9dae1c3cb1d73b6fdbd43c59b2d9bce6b6f811e92e1b4ab2a27728b9ecb872f5fb6108735739cccb3201fb4c
+EBUILD konqueror-18.08.2.ebuild 2994 BLAKE2B f7476f99c10a5c3e004f868f5ef2b46bbe36ddf26fff9c9eb96a7ee99d17b766829853e2d021862d2ee9a5d34d03253810e55129ef0404365b1c15ae62adc03c SHA512 d679ec7403089a025db446a3c9b738b6f09f60a5f8fda346f209139f43d4c273d82ff05724d93f7a64b3d66b19e0c3351e7bf1af9bc9a84c6e50a75d720dff80
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-18.08.1.ebuild b/kde-apps/konqueror/konqueror-18.08.1.ebuild
deleted file mode 100644
index a1d08e44e67c..000000000000
--- a/kde-apps/konqueror/konqueror-18.08.1.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 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.08.2.ebuild b/kde-apps/konqueror/konqueror-18.08.2.ebuild
new file mode 100644
index 000000000000..9d8010e34005
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-18.08.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/konquest/Manifest b/kde-apps/konquest/Manifest
index ca0a56701cb7..33372dc3f820 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
 DIST konquest-18.04.3.tar.xz 658784 BLAKE2B 89d675c2bf2bbb8a24c1bc337782dd489c4bcc9cee4539fac34f2b92eec5036067138d888a0af48119e25fbdb8b9c00c14a6f916da636df1102193106a7f5c79 SHA512 211830edd3a3bd24f48dafff7a0e60229f3f24296ba91314f93c00d5494400df7f34a54b792dbfffb5d57f5a169135563485839637055f6234590f95cf38e216
-DIST konquest-18.08.1.tar.xz 658704 BLAKE2B 74b93bc394bf8c6c5710d1f693a927c0b0c00df8d539923e3733d4bfedad83f8759bce64295c9f8dd862daae22fe25a2c66e523f60020aa3e1bbde02113494bf SHA512 a3fd61d8b167d9b1cb00771c12a1cbdefc6230484f0e79069647b8c6b104b3993d326bf5c4e202be69ad8794d0c0058b13569bc2cae071aafb352235eccaec44
+DIST konquest-18.08.2.tar.xz 658756 BLAKE2B d8a3cbc57bbc7301ab88fff2de36629963595daf892e175ae72f357d030408e32d1aad5b7473d82ae4da590d8b49a902cf4f4492f469ce5257d394b6c79b8294 SHA512 9da9a24effb27d3bf714112a7976fa1c1381509986937c436740857ed610c9d2ef29d51b0a1ab224e1ce70237d06c5d7afbcd8551522ecdb8b1e593b63d7d0bd
 EBUILD konquest-18.04.3.ebuild 791 BLAKE2B 3f0d7085c9c1c666655799412dc59a7a42eeba0bcae00a63eec0e6b633a7e5108088e30098c0fc962441f3d9e1a666ecfb3c6fcb5986d50e0d8685511d01a921 SHA512 5954afd4c9bed7e21e9b1ed5ab809e0e777e57a06242fbcf6cd87219a2d85d82c496e52186a730d88d8460262700a4ad247878e4f9db2525266007addbb34c2c
-EBUILD konquest-18.08.1.ebuild 793 BLAKE2B 4af4ecc52b869bbfd4b6aee14dadc2ae1e87ecab3cea02b1cdc50e062d6ee09b2085467bc56c3af5adf98df73e2dc78ebd24207d5d3af356b68bf4dc761193c5 SHA512 295bf448bb9e99118d2c8057831c437daf5dc42deb0032bd08416ddbfb8bf435f54ac1cc87b553c9ba7c4087b7d3bc88ad69c6471f4a12c5f16551591df09b92
+EBUILD konquest-18.08.2.ebuild 790 BLAKE2B c84a2891441794ea069c231fc4f31530ce1f06ce731d19a509f4955444a003a2b14adc3df71f3ef97cc09bf71a0a7486411f26cef8e72ecc5a3663008cb8bfa6 SHA512 ea8de0eddb6570343d3937b589fccd5f02b4881d98c8980dc414de5fa1543018cb2addcdb86c3880d9d45e482c4fc0640d9a59afc0f4f6939b0e330898b10375
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-18.08.1.ebuild b/kde-apps/konquest/konquest-18.08.1.ebuild
deleted file mode 100644
index f2519a625009..000000000000
--- a/kde-apps/konquest/konquest-18.08.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/konquest/konquest-18.08.2.ebuild b/kde-apps/konquest/konquest-18.08.2.ebuild
new file mode 100644
index 000000000000..e45c88b6a578
--- /dev/null
+++ b/kde-apps/konquest/konquest-18.08.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 0b775edc1476..947260c54daf 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,5 @@
 DIST konsole-18.04.3.tar.xz 1043452 BLAKE2B 341d589ea00536913d008548affecf301f9c455661eb5630e345481d75c3feb0138e5dff23d25421d0f375381586c4dc72b511042cb4803dc75873a943c20658 SHA512 0809cf4db6e10e672a4a976609045fb88879fe615b48e452f140da0a6c44971f31a7b4606124ed3b7642ee3f3556ace45b31e0b5c466df611fea98a9cf702066
-DIST konsole-18.08.1.tar.xz 1076536 BLAKE2B 5746757d1c63e1b25d4e988e8489da7ec0b84646a09c06b00f3e9a94941f554948ea6c24471ef068d6cf9b1bbda760591a8c11c37c5f84928d887d0b9546b805 SHA512 ec450f0393fece73394d7c77afba0b7adbf4e18d7b0d216de3e135f0e01371c3b5833ebbc79dc356fa102d2d8e3bea3667a5f42695793058b406d38b1f8e81a6
+DIST konsole-18.08.2.tar.xz 1076752 BLAKE2B 0d1152fe5a98df942c11767707133e8d5af4a9184d5d3bf8496fc4bec3e9e8ea2dd2d4abce6a47aa1da6001f8e528c71bb237c718bec0297dbfc4397289aea07 SHA512 a8eae209ec3a60be27b06ba850353b0d85a533cbea691114c2aa2c812f9d884153b2915d8fb52977ae9ed7ce08161e10d3f378d31b0ca166750e7e4584842959
 EBUILD konsole-18.04.3.ebuild 1420 BLAKE2B f940eacd6525caabc7f69e5e89a8cf1b470d255a3334f98ade87b950b5c91ed45bdeec7769cfd274c32d39abf99e0ba9475d4284c5ea042ba546949d78e7f1b8 SHA512 8da1c3cc6e9ae895ba7fc992bad527de09e8355dc6d49fc74d5a925fa18b0b64b79233aaf5fad2617d7ac93ebe56594669a07487ddb1de0c8c825c5ce223fcc2
-EBUILD konsole-18.08.1.ebuild 1422 BLAKE2B 778c8136ecb75be65351a76e148c6623edcaf5c77c2d5c1102330d16636e8451887b0721eda816a89b22505109d19f5f0e0e20ae89f5b2f1715f88dcf396ed24 SHA512 07cba89c64e10561589be711e4e806d91fb6c4cf91c88fcc2033df0d2efd4b7097c20d4849dd78f08f568da8d16676b8c2a25df0dc969bf6f8e07fcb1b0d3879
+EBUILD konsole-18.08.2.ebuild 1419 BLAKE2B 1c787a82f2609f08edcdcbdab31abc8816b6278cc577f9a033620bd736a2740117ff708262eaece4689d45fb3b99958ea3357c6bcb85027e4835a39d65a7dba3 SHA512 d0c8509f9f7ca3cafc8c4dcfc790dc524f1f6dc9227620a6d3617b3324d22d4eaa20a2e3327615c949c8e52b4c14e06016e5e06325fa1bd3cc1f9af8e8f22a84
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-18.08.1.ebuild b/kde-apps/konsole/konsole-18.08.1.ebuild
deleted file mode 100644
index c0b85015b179..000000000000
--- a/kde-apps/konsole/konsole-18.08.1.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="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 knewstuff)
-	$(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}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/konsole/konsole-18.08.2.ebuild b/kde-apps/konsole/konsole-18.08.2.ebuild
new file mode 100644
index 000000000000..87c52af1ea21
--- /dev/null
+++ b/kde-apps/konsole/konsole-18.08.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 knewstuff)
+	$(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}"
+
+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 0b17be619abd..7094b27516a5 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-18.04.3.tar.xz 221048 BLAKE2B 66dda4fb9e796f12a06a314197d95f33117dfa5c0d962c46edc6cceef225407f4b9ed4acc334ad9927c151f7e4709dcb4deac78d0252b5e62ec78cecc2ae2079 SHA512 25183856d3bc5ee2b1bcff27055479c9694df37db169419d0ef3525adcdebd06dae07134ab7ebadc42afd9d79d7598574b8c5036e6c295b0986af048153b1b9b
-DIST akonadi-calendar-tools-18.08.1.tar.xz 226084 BLAKE2B 26de3d10924f2bb104aef89be3b021f73421ff67f30c0deaae0880ebe9a16ed451f07a80196782d491f6df6cb13a52cd183313dca16a5c41aed7e83f3b5547c5 SHA512 a71cf6a4e00130cf4b5b69448f779aa9f6bccc27a7aed5139b6f21e2be4828b923624487f924ca3694f9732265aaaa75db83f34d7172cedd86e4e4d82414a7d8
+DIST akonadi-calendar-tools-18.08.2.tar.xz 225988 BLAKE2B 76bc913d567b9f64a0272b55ef0814b818909bcdd6e2b077476849fd442b16e2cb22dfc6dc8c929a40258d35fed0ef38131c65edf133f50f4d748e197bb08da1 SHA512 c83991219e200ee1dd310e13ca64ede2d005bc24c4fd1ec40bbfc9d406aa8b83b2959b76e2639e10307bb2eea462a38170cf424e086c67bba70dd4d2e60d3c53
 EBUILD konsolekalendar-18.04.3.ebuild 942 BLAKE2B 9488a6d4c482fd997d83dbba4d8a461af2c7594832bc30ca9ccb1de4a804021db5121a659bf1c2da3a23dac63f58d7ce2af33ff63b8906fc66e3915529cdc245 SHA512 944719833fbfcfa708a2f77b840782cd42b5abeb9d06339c07ea98e8f97f30bcf868a6e6c98d9d7230b76ed33e85691ed5f6e48dd0ffdba6c2e8d0acaa0d9a85
-EBUILD konsolekalendar-18.08.1.ebuild 944 BLAKE2B d7ebd61dc165d1b27f594b2ff0e9c8cfd7a7a420708bb818273028cb388338f57bdca34a729e0e078d5a67449d0a54f3842eabf2ac3156eaf8c8a398a28cb43f SHA512 1da4cd1ff978c206ac1123778984679c10801a2b20bb10f5853d83a598f8860470f8d2e22eedb0c015297a947ed809317bd165523f7e7f9e0a69fb4a2aabe199
+EBUILD konsolekalendar-18.08.2.ebuild 941 BLAKE2B e780558a1832530137a7c98f20e4df2230a3996883f0fd8a2aa687fd2864c8c90d6a3c77f3b7fe4a8ae4eb724b29289b8d9e513af63a623b036397c143ada218 SHA512 3c189382d6b13e0ba53599fe4c3f0cccc72a1c702db4f2c37e06ac594106ba62d207d24038bbb10d078910813b095fdc4c3f535f484f12efe2eb31ed78bee593
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.08.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.08.1.ebuild
deleted file mode 100644
index 5e43736100e8..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-18.08.1.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/konsolekalendar/konsolekalendar-18.08.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.08.2.ebuild
new file mode 100644
index 000000000000..7a038070c7e8
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.08.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 dcaba45a9eab..2db06d0910e0 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-18.04.3.tar.xz 862824 BLAKE2B f9bdd0833aa84e971af18894677bb43ea3f7c857fdebd1e2352403599927a90cd80c878a318cad992c6bef15b1da178b836db0eb73d913ddc2bcdeb94147e0c6 SHA512 e902e9089f26d831fd85d91415d13a259cc91866e1df4fc4bc3a25bafbf67d180a44cfe2f18f0f49f94a11efe0e5f43737ab49ba8a761b24948725221f2218c0
-DIST kontact-18.08.1.tar.xz 864416 BLAKE2B 9007c66a38686a6a98f5ce900872d0096a465db14d26902504fa20a4b1a9bf5e9f26a8e5f546b0a10c3dc3f8b13cb3a73fbfcab23721871592b1fc5f9be7ceb8 SHA512 0e647646933971332886e5bae905bf1742952f2b39d456bfb248a589ac70d7746dfbb0194a64f76051145598fd0a296680740c60a40407fbb9f144bfe8427ba2
+DIST kontact-18.08.2.tar.xz 864308 BLAKE2B 1e0578676f54d5ce8460775aee00b8bff6693b98e5a639230017cce53a1c34c8ece1e90bf392b51afc3b0c84bf7ab2ac746cf6fe8331138600a00840e20fa492 SHA512 f056eae386746b6db75936920d6d6a6e777dd4bd688197dce31f5206f09750b0ed2daf5271ff66270b2a832b1bbec5479142633dc5524e0fd95efe5f8c26d9d2
 EBUILD kontact-18.04.3.ebuild 1201 BLAKE2B 25a39047a7b805c48b0e125a9abdd90fd399f4adc01857261370205157d3dd8d92e7858d6be58434770ae0cc29eeed686894c7c8d377ff3bb9a114fb7bc93331 SHA512 8fb6256b7a1e35ab92642cf673ff334281deb9c6e8afde36dea0357d39e942aec77cd602186cc69e1f4e49f758c7fb6b4d995c938b8a230f465de270b4d252a3
-EBUILD kontact-18.08.1.ebuild 1203 BLAKE2B cdef8cba6e3df6aec11b61303dc23fcd1873131a3dc96ee29850bb122e44eb6e3aad6c4bb03d13b42ec956637f9f6d594ef64ff2b7859b3a84f81b4c6a461a35 SHA512 d37fe6a38579456611800285b765b19c957f18b0957fd4321fb93129b4fcb0a74d1ba75a16c634ab0a3f0f897e156b9fbe20fae26729f1f5660e57588033e882
+EBUILD kontact-18.08.2.ebuild 1200 BLAKE2B 55150e69bdc82295562dae9646db00854f15de36efc3270ba23f6c2867169d7e8d1c6782bb60e148088a63390f51b01c559adb67e8ba0838c312d8cf6405addc SHA512 c56cdd26bd62757da6da55f6547da4757176548410d5c724def69fed4da60fa05ee1e18e7eb37d4ac96103fef58032151a9279a1161d53ecdd73634e0d8a23da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-18.08.1.ebuild b/kde-apps/kontact/kontact-18.08.1.ebuild
deleted file mode 100644
index e768a574bfe2..000000000000
--- a/kde-apps/kontact/kontact-18.08.1.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/kontact/kontact-18.08.2.ebuild b/kde-apps/kontact/kontact-18.08.2.ebuild
new file mode 100644
index 000000000000..69556fe33a42
--- /dev/null
+++ b/kde-apps/kontact/kontact-18.08.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 bd813a995f42..55e54ea08269 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-18.04.3.tar.xz 32892 BLAKE2B 984b35cca9863cf21cdf7c19c891a0ad7bfb1b3874fb2657d69f766adf16b8d385a4d1d0837938ef7b1e00ce70f0a12ecf9c1bc153fe039ad48283293c543fb6 SHA512 2c1a0ac71c5222189aa37ab606205cfc7f7fb6506cbae97058c73584b5195547c2d7813b12f05542173853081b6ce54cc9792d4c9d6114e424ba5fe24b3bcfcf
-DIST kontactinterface-18.08.1.tar.xz 32892 BLAKE2B 5787501539fbff3b3dce1ba044195a2411368f8f9bf89c26f470a1252931654fd4e1a39c2af23746b609cd0ac005d93de7fb2effaf3737d7ad200ab9a3a62dc3 SHA512 df98d91e1c3fc332e3c7d51740ca5c2ad8cc6b0a3ffbd3093cb4c5f6168396c68d8f64d60e94884d64576c265957e99bdd0f89ecbc86b2ee353e456668629248
+DIST kontactinterface-18.08.2.tar.xz 33068 BLAKE2B 45699330785a09f98b7077fd19240ac7e06bc3de41e700152da85c687e583085de7c241e3cca8cab8418b059d631ee61243101b8e16c207b48d97b106f11f171 SHA512 e63d8ca356d797f28ad16f49052b7c115d0a71d27347db75b7300885e7c32b3f727ba7cbe52f535c0fd0d7fe45e27ec7b78c8f896bea0fe11aab7afa0fc19dd7
 EBUILD kontactinterface-18.04.3.ebuild 592 BLAKE2B 459a8ab4dc042f07180f7571e3a23d1e99051835e77ba7f60b79b188fa592f0ccab18991ffefa550235d1fe54fbbafa8ca7a2829ea54898051404f28b27fbe52 SHA512 7e8dd97122cb8ad60418dc70f39c153b8cf0f4be05724be1ed4890c87cecea3daede34b6f7df5dd36706699a4adc5da78f5ca34d3a4c96590f6c56681dba94c8
-EBUILD kontactinterface-18.08.1.ebuild 594 BLAKE2B 6dabfaa2233c3fd1fab75a4a8a9c1e2329f94ccdecbcc81d483ec354f27d9abc15e9b4b6ac231ae3e3f3bf562ec7e79239787764ef56eafcfc116287036236a7 SHA512 2f16ac78757ad95fb651605c1d71ce09715ff517fb00e46b7dba71a0281c420d35ef8f1bc45290ed911df7db31760b2a91cb71cc13da40f2365825914efac3c7
+EBUILD kontactinterface-18.08.2.ebuild 591 BLAKE2B 305563996029b4b26068ba099686d2c3ed01dd70dad151c6bb5d2d3be13fa5514948b577add05d326fe3c457c431dba495b56cd6f7dbd85e3cc30b016edd3db5 SHA512 abf6a9887906fe1c3b69babe365a39caa709699d619aa55057c4b56e316da036b89e0e433807dc76f25fd3be8c6d23cb247126c94426ab0a701618d8e970b134
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-18.08.1.ebuild b/kde-apps/kontactinterface/kontactinterface-18.08.1.ebuild
deleted file mode 100644
index 9622e2e660cc..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-18.08.1.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/kontactinterface/kontactinterface-18.08.2.ebuild b/kde-apps/kontactinterface/kontactinterface-18.08.2.ebuild
new file mode 100644
index 000000000000..ec6d4a14ce0f
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-18.08.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/kopete/Manifest b/kde-apps/kopete/Manifest
index 9a226e78a1ca..2054c65830e8 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,5 @@
 DIST kopete-18.04.3.tar.xz 9568508 BLAKE2B c20ffb4ffdde34f94a400a7a42b6c36a3432df8db438b9c94cff50dec5b9a39f03679dbbc1a38151c517d99ee4d8bb4c8b7ad0e79e4947ad1643cc0f7d0064a7 SHA512 568f36895f66df00e4207e893b7a782111df5fee6a875d77aad30a214088589d1c317c0131eb3b21b264224fb8bde239b31af8c9cda4405079990e3f5999edc1
-DIST kopete-18.08.1.tar.xz 9381772 BLAKE2B cac8b75423bb8b25fafdf3c1a6014c6d779c8fd6127217781eab2977be93712779514d5ea053c65f2c6f274866a0a84336cbca1e5e35188003c56aedca8199f6 SHA512 51591ddd07c92f2e7c51e1d483ecfbf2fb42e7936016fb988f63325f8ba228037117f79cd3dec4ea346f8dca25ab56e23c9cc1be813b5d3c86ae2eeb69808fa7
+DIST kopete-18.08.2.tar.xz 9382348 BLAKE2B e9a044bf64164543a83e85419616f9a1c371888650604f1e9ca4a401dc10fa5dfb39e0a89ead1edc5a20d77317f5d058251fb0e5312d2bfa75e637193cc04879 SHA512 7ca56265a5c0586ed9b9e0c59a6a9137bec1b12526524bc1ab6ec8c6c074870cb6ca20239fce1f4612182ffd1dc8f7abf448a8c4e7fa3dca70af2e1e4889cedf
 EBUILD kopete-18.04.3.ebuild 4550 BLAKE2B 801d3a10360bb7ff519aacb7b9a9c1a400509b4ee6b4c98a28f904298e60d98572fc8f28b74477a50601f42a80e7d2d3a1f0b687aea9f6731de075bfa6d43cb7 SHA512 95af3a60c2424f063688ab53b560614e492e4cb65a7aac05ab9a9a7eb2e6cfdc039cc1acf1f62c6be529b4a11db169f81ca43f8d22552f29c706059ec8c853f5
-EBUILD kopete-18.08.1.ebuild 4506 BLAKE2B db8ec6c2331ee7d394de9e89fcc66d564177dc7e3bddea18dd13715f9d9e682f75208188808b48e84553b71f89664edc8eb3e5536d08336bfee92e2d56a1ad8e SHA512 8548f90ae33f98e3440d38b8728f1057fbb0875532421cf7becee9f9226876b78300dd4e6ff944f81447246376db09a6022796d466213f91b4acba4b27ec206d
+EBUILD kopete-18.08.2.ebuild 4512 BLAKE2B a34b186d39677ec5c3bb3df6ca7532f0277deee6cdea1440c98feaa9dc3cbe448f4584d23450da3130b75407a7f8fb67e28ddf0218a1fe4432a81d786ec063fe SHA512 14d6ac96d48a6ab6ba086b517f08d147c6533420cf5f8ca1cb260b84515612008d6696b1691297350d88e4dac7599a0dea6c92b58c4af272968955dfc44a7342
 MISC metadata.xml 2031 BLAKE2B 10d27c95c13f44ac3a3149072350e9434ef5b88c2dc4d493bd628d398e531de6a0d7b25071981246da3d53cd5aaff20d392b32d358da3af3f4238fc76143f6b0 SHA512 790e5f6a88bf63533cc6555b44b1a4fd43fd9697d4dac284b0770d67b5dea6cbaa33d399f8ac653d976bb12a29ae583cacc734f2c2bc63be9363ef4921efc568
diff --git a/kde-apps/kopete/kopete-18.08.1.ebuild b/kde-apps/kopete/kopete-18.08.1.ebuild
deleted file mode 100644
index ad209c213a18..000000000000
--- a/kde-apps/kopete/kopete-18.08.1.ebuild
+++ /dev/null
@@ -1,179 +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="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl v4l"
-
-# tests hang, last checked for 4.2.96
-RESTRICT+=" test"
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
-otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
-
-# Available protocols
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	meanwhile: net-libs/meanwhile
-#	oscar: NO DEPS
-#	telepathy: net-libs/decibel
-#	testbed: NO DEPS
-#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
-
-# disabled protocols
-#	irc: NO DEPS
-#	qq: NO DEPS
-#	telepathy: net-libs/decibel
-#	skype, sms (until fixed)
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMONDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0=
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2[qt5(+)]
-		net-dns/libidn:0=
-		sys-libs/zlib:=
-	)
-	zeroconf? (
-		$(add_frameworks_dep kdnssd)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-"
-RDEPEND="${COMMONDEPEND}
-	!kde-apps/kde4-l10n
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( app-crypt/qca:2[ssl] )
-"
-#	sms? ( app-mobilephone/smssend )
-#	winpopup? ( net-fs/samba )
-DEPEND="${COMMONDEPEND}
-	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
-"
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			jingle) x2=libjingle ;;
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then
-			if ! has_version "app-crypt/qca:2[ssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=ssl."
-			fi
-		fi
-	fi
-}
diff --git a/kde-apps/kopete/kopete-18.08.2.ebuild b/kde-apps/kopete/kopete-18.08.2.ebuild
new file mode 100644
index 000000000000..a35312c6fbb2
--- /dev/null
+++ b/kde-apps/kopete/kopete-18.08.2.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/Kopete https://www.kde.org/applications/internet/kopete"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl v4l"
+
+# tests hang, last checked for 4.2.96
+RESTRICT+=" test"
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
+otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
+
+# Available protocols
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	oscar: NO DEPS
+#	telepathy: net-libs/decibel
+#	testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
+
+# disabled protocols
+#	irc: NO DEPS
+#	qq: NO DEPS
+#	telepathy: net-libs/decibel
+#	skype, sms (until fixed)
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/gpgme[cxx,qt5]
+	dev-libs/libpcre
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2[qt5(+)] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0=
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/libsrtp:=
+		net-libs/ortp:=
+	)
+	meanwhile? ( net-libs/meanwhile )
+	otr? ( >=net-libs/libotr-4.0.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2[qt5(+)]
+		net-dns/libidn:0=
+		sys-libs/zlib:=
+	)
+	zeroconf? (
+		$(add_frameworks_dep kdnssd)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	!kde-apps/kde4-l10n
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+#	sms? ( app-mobilephone/smssend )
+#	winpopup? ( net-fs/samba )
+DEPEND="${COMMONDEPEND}
+	x11-base/xorg-proto
+	jingle? ( dev-libs/jsoncpp )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local mycmakeargs=(
+		-DWITH_qq=OFF
+		$(cmake-utils_use_find_package jingle LiboRTP)
+		$(cmake-utils_use_find_package jingle Mediastreamer)
+		$(cmake-utils_use_find_package jingle Speex)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			jingle) x2=libjingle ;;
+			xmpp) x2=jabber ;;
+			zeroconf) x2=bonjour ;;
+			*) x2=${x/+/} ;;
+		esac
+		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
+	done
+
+	# disable until fixed:
+	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
+	done
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! use ssl; then
+		if use xmpp ; then
+			if ! has_version "app-crypt/qca:2[ssl]" ; then
+				elog "In order to use ssl in xmpp you'll need to"
+				elog "install app-crypt/qca package with USE=ssl."
+			fi
+		fi
+	fi
+}
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index ec690fd651b7..6273feee39bc 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-18.04.3.tar.xz 2267176 BLAKE2B 2731a2660d2eea48e61cacdce4d8f73772bfa8cd6817ff50059ac8a92c31b7aa3b56064f38c88c915dcd3a0a1f96a5a9ba85e9b251aca48edc0d3ed441041aff SHA512 52a777001ab986fd1f1bfc573519b2a19d0b0308f654a4ecfc2a273d88c0feaccdde86a044d1da1617fae4442811d3e9c35628e6199aa776cc8fab61c13bf5aa
-DIST korganizer-18.08.1.tar.xz 2278304 BLAKE2B b416603a50c4701030176eedda515527880d6cafe11a7b3772d16978694dd704b03a36e119226a90071be8183cb4416eed9bc9c4fca10522769a83bcbb39d3d0 SHA512 8be2b3163302fea3764cb95ace152e2b1de5664268da50d47015d17d29ee9e7addc0ff39ea02efda9606ce41280977e117b59873488f34910f64c86efa5df700
+DIST korganizer-18.08.2.tar.xz 2278476 BLAKE2B a4091d018e9925fdf9b427a6e4c71399df8f7e03dc26180d00bd527adc86473e8249076c330faeeea244c3aa20be143d5f6997b18a7d492d6093861e97b69251 SHA512 96014faf0ee82ba764ada5f31cf99ecea53ce6e56b592311d1828bb3f07a86dfecce95f5cfa10f563e9b1b68d8e914e782f7c879eba9d70dbc9f19a353bfae2e
 EBUILD korganizer-18.04.3.ebuild 2394 BLAKE2B 130a1d34ab261ad3cb0f5fba0a9f06db3bdc8d180ee4b18b25ec029986bac66afabc8b893c1db7af3d3dca941d3659d5f4dcb207c9d8b0cfddaad1cdefd6d71e SHA512 b3bbe707942c826c71056e40cd38597650a9ba786d60adbfc9e6ca7a8b826af96a6bb4591efc8ad41c1ce1e1023700a1d246e41851c68043cb6ded615e74478a
-EBUILD korganizer-18.08.1.ebuild 2357 BLAKE2B a8d567da70769d4b49cd3f36ef08f8b1ee44b168ed7ab6cc5f4e04cd8a6311df16353d81da0844a79849b256ef067fbb48767c2804f491e6088d9f2db4bb085e SHA512 1bd1ec8abbeae3ef01cee47b3e9621a5b81e97cfc43db8dfc415e9c04f7378a184fab1fcbb8a6e3193c3d9f547c2fb8130c74c5fb5d2d12e36d34d958a29bc74
+EBUILD korganizer-18.08.2.ebuild 2354 BLAKE2B e856b02125c3a6c4f3507dbb8d42d2ed2fe13da36c97266abbc7f22e76b6302ac9afa48841a2ffdeaecbc9ec102dc5f2ea1a687285a04859c28032da6bc52d36 SHA512 0321bb0669f70ff10b3e1d645c6b9b3cffb03b3207f7f6e0fa17a7e7612b85bcc01017d755fe2624277164e0784bd0bd600a42d79bddcaf5146953c173de9743
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-18.08.1.ebuild b/kde-apps/korganizer/korganizer-18.08.1.ebuild
deleted file mode 100644
index 25a0979dfce3..000000000000
--- a/kde-apps/korganizer/korganizer-18.08.1.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_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 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/korganizer/korganizer-18.08.2.ebuild b/kde-apps/korganizer/korganizer-18.08.2.ebuild
new file mode 100644
index 000000000000..d2c630c1f07b
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-18.08.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 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/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 9e622fd7ebb7..3742e106cdd0 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
 DIST kpimtextedit-18.04.3.tar.xz 142880 BLAKE2B a8ff9679cf54f0445c4fea83ace27774dd801aea2ea11a29031fea906e35f22867cbcffec3e1541d45ec4dbfdc34dde0f508f2bc85d7439707a8b2be0dc0dece SHA512 e8cf0563a2c60bef0b82b0d60a025191c8660c783f262648bc0c9c9c17eb24b5c3c2a0d21159df60009256e920e8a649f06b22815ab051099ba4d6ef145d848e
-DIST kpimtextedit-18.08.1.tar.xz 142980 BLAKE2B f02554e09ae4641f671d20d399dc72d0cfd6e62898fee9cde49f7373957977b4a829f825c83adee48b70a5e0a7be2fd779eb1ed4db0cabb897d40c0ea2cfcfce SHA512 e7830227a74331e399d030dfd8058382329512b85ccd36061d7ddeba2c1eca287d41890847203afb6df254e2d9927fda7974feb4c48ab433f5b037fe48c588f5
+DIST kpimtextedit-18.08.2.tar.xz 142948 BLAKE2B 79a86eff11f0c5534dd9e26880f6ffce0987f93037d48a208b30876fa6380fc42fce7f83cb76009e94554fe82806d0aec4131c12ae602bae9f7c5e0de45b154a SHA512 f99a974170a17d9850f4ad58b8adf010c6089a93e908872cad7f4ed716dcec14beb4a4a276b453135f01202d7970ee56edac84836e46351d58d9f421f9487e04
 EBUILD kpimtextedit-18.04.3.ebuild 1129 BLAKE2B a2e761276a599082c12b2a2567ec078a53bc09f946cd06d57e5d61eb40aa35380202b7f4369a6cf0f6e5e6468cecbd2f674791c9d6002a91293d13c18a44e11f SHA512 1c09e0d93b126047052e1655df2877b5538ab13964eb42a918e1ed08c5c345e6674819f3ff6a578ecd5f386cd98dc7449f7eda6cf1f0f5643af3824919400e52
-EBUILD kpimtextedit-18.08.1.ebuild 1131 BLAKE2B 630c96348004565c7a2f78bfdf5777bdb2ef3d7a527e4c0a1d6414771ce8714e22e1e5b7bf9deefc378af14ebfce7bf6145bfbdad1c1865f6810cb2e49cae785 SHA512 559fbfd7903cdd25c624a262fde1fb9859e151bc4065a80e3eeb82247a13b597bc5b2244df3972b928abcf333c236b6325640e54b01b73e36983d6534913ca52
+EBUILD kpimtextedit-18.08.2.ebuild 1128 BLAKE2B 0420fb6d2cf46ebf1e3aa1c3f2727906f110f30f167a329eb4ac13958fd164884f978879c00f4f4b87e8a0dfb50c9266e511fed5ee88458a28afede45d2c1cb6 SHA512 966fca51657a9c396d646975e9663b0c601cb82d4057e421d2638b345e2a6f4ae1bc37ca6ccc12c8e39d385fc392dc8122c55cd1ef2a56c14565ff46846ae52b
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-apps/kpimtextedit/kpimtextedit-18.08.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.08.1.ebuild
deleted file mode 100644
index 4df08dc9cce6..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-18.08.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=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/kpimtextedit/kpimtextedit-18.08.2.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.08.2.ebuild
new file mode 100644
index 000000000000..3e7c1d30ba2e
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-18.08.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index 2922f774492e..0692cbca074f 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,3 +1,3 @@
-DIST kpkpass-18.08.1.tar.xz 22928 BLAKE2B bc6f03d0faf0f99189ab895ed75e48ca8cb0e0d78bf835034785052fb64d31a8c7d8f39c9031bdf9c2a99fc8fe1ca8eb15377f2f78865d2444ff2187e0337da2 SHA512 19c07f6e38ce7fd9c8cd1ebb138181ebb3e741e8f9c9cd45f0f210b1bd490cabc7a214f795cdc9a32b6f975a67a08df24f351a3801c327f0b98c2580c3364f24
-EBUILD kpkpass-18.08.1.ebuild 472 BLAKE2B 6d070aab6ac828c172363ab8a6165ee1150f16a3a568a165931e7816cfbcb40619ede47d17ba0ad3b6c2335daba35ee5252eaca7086fb99eced6be90eb130bee SHA512 33c7278cc8f086e2c5e5dfec711e4de2d25ac8c020c8312d268e03b0db95873755ef38e2d24f243a9251c383ad47a8d2361ccda7f487defe0aaf199c7f829da2
+DIST kpkpass-18.08.2.tar.xz 22936 BLAKE2B ca5766b6d7401612797d205a0357c0d2e0a4692037483e7fea058ffaefe2eb4bf6f91cd7353aaeb09936189bc14be0979a1c4db28f291b8326996327d6365647 SHA512 67d2e7466a94dba7f34a7595aad361199e3990c02a4c8cbd2b27d060c6767e1f4a8ff53e209669327e7e9aa2345f52cf6191e8721a3fa2559d18be4ffbe188cd
+EBUILD kpkpass-18.08.2.ebuild 469 BLAKE2B b302c2e948dc2ef36e0b0201d476baa53ed8a34c611c2e818582841e4e25bf23a7fd8f121789476a381cf9751946ce470633c59672904e8fc58e6eff42e5e0bc SHA512 d90cfa48b4ee1c433c7d00f1b15a5a0ae2c3868a35caad5dfe3a9e5d5b11c6f0c5fae68e9f1e09523306d2e4a38af18319ad77e436127ed44b75d0c25dcb01be
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-18.08.1.ebuild b/kde-apps/kpkpass/kpkpass-18.08.1.ebuild
deleted file mode 100644
index 9f0058d93267..000000000000
--- a/kde-apps/kpkpass/kpkpass-18.08.1.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="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library to deal with Apple Wallet pass files"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
diff --git a/kde-apps/kpkpass/kpkpass-18.08.2.ebuild b/kde-apps/kpkpass/kpkpass-18.08.2.ebuild
new file mode 100644
index 000000000000..1923f58dfa19
--- /dev/null
+++ b/kde-apps/kpkpass/kpkpass-18.08.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library to deal with Apple Wallet pass files"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-18.07.80
+"
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index d0206e95eb6f..e2128d1a0d5a 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kqtquickcharts-18.04.3.tar.xz 25688 BLAKE2B 617a448edc1f24ea0819f047cb4162f21cd4ce1ccefee9b57787df1879b010b06929b48117298f30c4d7208e278ab55253e028b48413248f9462ccec2d8888a8 SHA512 1569a64fdfa1ba95368976b25793c24b19a796b2a62e50942b0588368e5fab17df3dd6b0aadb774f32b64c1f71705264057781a2ce3b151fa3bf3f6444e2e8df
-DIST kqtquickcharts-18.08.1.tar.xz 25688 BLAKE2B 8f84e694b0e1aed414d9b115d1e6fb85274b55c2766584716b8dc18a1f19482cd966ddda15864407043ea894f794419e08a29a010617ebdef36fe5b55d3a4bb2 SHA512 b34336fc7e23a5712cc5b72695e55ef81ff302b24c62f4ab8fa133b245a154e3d90eb18fc392bf8d419f72b073ff21b402f3885aa6e915ed402e1a55a0df7839
+DIST kqtquickcharts-18.08.2.tar.xz 25688 BLAKE2B 8c614e8c867713d7e4a2940b9bbbc35f2ba77661095bbe50412bd647790a29279c943b2f64b8670e0c516c7ac7629083c27d2fe8499c7f44e0f6e75b65ba526d SHA512 7aa0a7cb9d64ecb558ca7a49239efa0740fd052b448baea3ad4352f25ecc991aec3aadd057bcdaecb8c50f1125af5755db57feb6f40d645ce1b64ae8d81f4dad
 EBUILD kqtquickcharts-18.04.3.ebuild 308 BLAKE2B d7cf5e9111fa6601dacc8c513226c6633e1a9c267522b2ccff1781f5642e845aabe57be692c6ede94aa76496df5907867636d6125eef33e242f7cdc6912c7698 SHA512 d7245eefebe52badffb56eaf5c63e54009ddd6843dbcc130d8eb62d4618d4d418b2e592b5d050c940d70acd139ee688907906edce8fd051b11ea9ee793a73c7f
-EBUILD kqtquickcharts-18.08.1.ebuild 310 BLAKE2B 1a8188f042b79b458a146cd412ac47916cc3884ea6fc9b3ab5a16fca9bdefe2cdd73972705104c3fc5632a91c4511ba7c036d61a84fba059fa8b481e96ae2c67 SHA512 72a31b499061b26e1c41431067a9d6a52a74f111346c2fcb5e1ed5528c848f64077a7dd70e31aa356c3111caed838a596bfd4f26ac675d846f873ccf9eb645e8
+EBUILD kqtquickcharts-18.08.2.ebuild 307 BLAKE2B 1cde0b04e772a71bd2398d5dc437054699d76f821c791ad3f52f161f571a1244d05417a09cb1fdc1790dca48cce0f945b6920ec373a8aca9a2d355f9259d1876 SHA512 c4fbcabcd0b2cef875304ef929417ac31e02af28070fd2fcb5c93fea77e106b30429b60fbf85d8bf9dcb94f470687838f4d1993b8428e8f4761b335beb879590
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-18.08.1.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-18.08.1.ebuild
deleted file mode 100644
index 25309fd1765c..000000000000
--- a/kde-apps/kqtquickcharts/kqtquickcharts-18.08.1.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/kqtquickcharts/kqtquickcharts-18.08.2.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-18.08.2.ebuild
new file mode 100644
index 000000000000..2550e18378ac
--- /dev/null
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-18.08.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 8da04f9155b0..94f7585a0f89 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
 DIST krdc-18.04.3.tar.xz 1553844 BLAKE2B 712f94ece355d7f5f16c2b94f058a93cc7461b1992d04ac54729e6b8ee8774dba86bc84f96563e18867a88c4ca76c57936ecf9b4dad92522000660555b0ebb4e SHA512 ee987c449b76abeaca909a3053ad41eace8a1890eff8cf05f6a2a83faa7707ad60e2c1c18cbd06268d4d9f0452a033574b26c2b38c29f463179c6a9fcde82e30
-DIST krdc-18.08.1.tar.xz 1561256 BLAKE2B 772e93716019e542ca8a2688130f40f69b3bf182f200f55adae8ec7191f187b6ca03f390ead74a9d7553f888f03dda725b9f68a63976007e9f4952d2089444c5 SHA512 9765378af2d792958511f7359a12c7da1c032c1b23abf5859d679c4aab47260b1d4ae208ddaf6a08b69b4de8340b3fc3eafd9bd171b906f088dd80db52f6c032
+DIST krdc-18.08.2.tar.xz 1561220 BLAKE2B 87246e926b22b689e17869e72972eafea224df02b22c09b780566e1f0189392d86f83730b26b44681b525598da169de840dd3b71984394da16d13dbe2812e6d2 SHA512 d9a420a48bac56acf7210f3476c3b9675aeb217a50d973934ec2dcac0ef92536a061e414d7016ad7d7ce9eabd6ee86f5ce1b875789e83dde80257ff9d3da2dd2
 EBUILD krdc-18.04.3.ebuild 1175 BLAKE2B 6206722e0bc1d69af854ae2a41512651cb216e6c4e1db5041785fbd0439c1fda773158f3f3983483cfd7efa1f4264460a50580467ba9512ff0a811f31075e41b SHA512 65e5f03c34946e9c14a7637a075e6bf2a3af3433ccb6197f94a9676b89bdd14bc185109c419e15c085162836c9108ed8fe19ab4b39bc8891c172eae3450c71ed
-EBUILD krdc-18.08.1.ebuild 1177 BLAKE2B d1e1598816451bb7b14f62e6a77d4e3ea8141805793202d381366255b52fd2e4bb3539d0327332cadcaf8a7c40f789b59efa64f0bb701d2a91893300efe9f4b5 SHA512 0bf55091823829480b807e59534214f1d10104c92b437b59450480315255470f50bdb9c6a188ad34debd6663d1a99f2fc927c4f117781f0bbcf4178e604dff17
+EBUILD krdc-18.08.2.ebuild 1174 BLAKE2B 0e5b69b6af85575927b37d3a1ad5825ea3538ca9722a6f76872fc5eb1b35200e9ee4bc87914c460c4a5ffe1accd64003d13bb75610a1eecbeefdf2f82e841012 SHA512 d0f911492c5a5512aa4662b9315626c8f3cc3a5ffa0a03dec568f2131b052d272a6faea3e57b5ae4d234857332e2177ac0fcdf660310f4a48265c5ea2754bb11
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-18.08.1.ebuild b/kde-apps/krdc/krdc-18.08.1.ebuild
deleted file mode 100644
index b2db820336ce..000000000000
--- a/kde-apps/krdc/krdc-18.08.1.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/krdc/krdc-18.08.2.ebuild b/kde-apps/krdc/krdc-18.08.2.ebuild
new file mode 100644
index 000000000000..a4556201d51b
--- /dev/null
+++ b/kde-apps/krdc/krdc-18.08.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 d7c3b2918b42..5b323be4f9ab 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
 DIST kreversi-18.04.3.tar.xz 913708 BLAKE2B c489932a6edb2e7dca4b249109a830d57f54d32e264315410599300c5d7cf6b2b5dcc8519050fc2673934cceafb28455204cc96f3acd28aa5844701ae3c43714 SHA512 b5c104e23b1dc26d3e074b3b1f5863f8a937e5a4c6be3344defbbf5f43226b61a666a1cc7b967dfea36b44386a56e58f8953185477972698c37667d2c583bd21
-DIST kreversi-18.08.1.tar.xz 943456 BLAKE2B f81239150ecd51c037622a07cab918ed65214af5aa6ab3d5556ed17e002b9ffb3972542e00578a291585de966eff446718a70014aa281cad0f76adeb552ed1b0 SHA512 5811bb3cc0aa2e7b9b5a56c0f5cb4c3de2120179878ec06eb387190618951d3315bf06184272b70ccb995c5c06b84b56949ca49d8c3ae6896b5d264aa8d13cca
+DIST kreversi-18.08.2.tar.xz 943440 BLAKE2B 856eb514d15e7bc68750811a81d3aaba0cd0414e58551cab94aa490ead65b398baa94fefcd436e7f11086829f3ba3b730fe516937deed89f3f39e3998c1de4df SHA512 24da03f1be1e545e2ce57df52420b36eef8ecdea4ebea9439fb5e64437d95bcbe399546ed2565d310365b4a2a0b6f48af69f25ee8698f4ef0118380b31cae812
 EBUILD kreversi-18.04.3.ebuild 929 BLAKE2B be265893561a6148a0bbb33c1d2664af84aa002a40f6539a7dc07d3dbb6be2c889094d3ac76a2fc91bdf3fc5b7c54454c9d4f7eaf2e2ea824e8d3a373ad2d491 SHA512 0272785202f8ede0810cef15e8724aff7183e366e00c7cfa63387922d67a2e13a7bc43c3dde9eb638593b19cbea4b2f5978f44b4d16b3ad7db7dc7501594d7c7
-EBUILD kreversi-18.08.1.ebuild 931 BLAKE2B ded588961b76ac18e507125686f38d67dd87682642dc3e9d5278cc81c75c68954b21729420c7cc8469d8c20b75ce5448accc20c9ff5338ebbd8ec727a538303e SHA512 a4fd2df9c133974db526ea85c911293e62c934c5b033f7320b8cf306ce84609b55cc687df0b84636df93c322541d7149a46e6777d171609b8717bb74a35c4cbe
+EBUILD kreversi-18.08.2.ebuild 928 BLAKE2B fb1820f2538450e18d2e46dbf8e25ff51ff6add3b21fab50cd5fa7504283b4c00f168423f2de5e4823a7be45afea5647781a8cd9172fb4f4b0014b0638290887 SHA512 45d19b391d545032329fe9001bebda5a3249ea341036fb8bcb35567a34ad23a40e0d8d59f7a7cbfe0b227b8df1be17d33a2fad0dc56a1e2997aed86ebe2c4f59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-18.08.1.ebuild b/kde-apps/kreversi/kreversi-18.08.1.ebuild
deleted file mode 100644
index a18a0c64d8dc..000000000000
--- a/kde-apps/kreversi/kreversi-18.08.1.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/kreversi/kreversi-18.08.2.ebuild b/kde-apps/kreversi/kreversi-18.08.2.ebuild
new file mode 100644
index 000000000000..37472d2a6294
--- /dev/null
+++ b/kde-apps/kreversi/kreversi-18.08.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 205189400168..ff782d202347 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
 DIST krfb-18.04.3.tar.xz 996132 BLAKE2B 00b13411d52ca0f7b96dddfaf0b0563aa8a89a92c38d0136fc687f6d79bb63e819a610aedeb58ff5c652eacf57effdbe2c538d116474f71b9d2e26e3f2c49198 SHA512 25ddd2a9a71266961a1f55f0e2442e67e6c4ebb45205903981857b3d24f82b1ba5edd34e7386b56b301a7c925a4498cb85213c543d74d5fca522619dcc107e8f
-DIST krfb-18.08.1.tar.xz 994808 BLAKE2B b744ccb998dd0506a278e967b8447a686c0e489d70004019745c0942b8483b939ba97f6735e14918097cb7959ff4ce71d7de4763e7762a1aff8dc65574384643 SHA512 1024222c35f4c73774635ccf6e65109f6ecdf29ddb2d63a9d6ae4821647115b2945320ea3cd4f1d3bb13009e853f5d045dfc7bea7f94d41ebccb42dbaa86433c
+DIST krfb-18.08.2.tar.xz 994796 BLAKE2B 4fc31d7ee62bea466c6f3e1420f7e54bf75bc663a97671405e90e1511b694a76dae3bebe447c8c64070aa62ecf69966e6adb2edfea560e5464632f905e3c2e46 SHA512 7b172469b701023f2eeb71a5ef27a70c5812a09b3e950c53d123d4a2f14d5eb0eba5a6d851b37aba21733aaf2e1669be6e36d9ec76bbb92aa1ed5de31b6c906a
 EBUILD krfb-18.04.3.ebuild 967 BLAKE2B 31a7a97ddf448e04a6647a706fd05e9be0a3cf1abe6b1f95ae0d3560203318f2faec4f0b4d719b2dc995b03acb9de7f2ea9888a2fc5a85755a6331ae5778a9c1 SHA512 9b65eae19b6ba77d51add635b0b7d5f6d987b22a0200e46f1deecdb75059ed69339433c801be23f974a707c5c85526d5b066ac0e326570e632931ba8fec8a9f3
-EBUILD krfb-18.08.1.ebuild 969 BLAKE2B ebd6a5c1d982efc735b1bfe75e758dd5f23b556412ca78396f291ed054526e55752ccf83dfaa4c13be8ddea1bfac53ff3b42dbb8df2719e92ba19323f1dc73da SHA512 039911742a2b627be7e9fbe64085b8182faf73097bd9e34f3f6bf5b4cb41a68c628c208e570de34b4544ff64e07a3bc84b80bdde03ce302d51e0eeb061fd07e9
+EBUILD krfb-18.08.2.ebuild 966 BLAKE2B d52ec5424d6d794d704b29a31017d4923ae444063d81de392f8d669a43b8942be0846b83a1b993102ed445bff3f160b98e978f7f7f47551661efad81b7e14dc0 SHA512 723281d0c797ad397da720162a6474e5d2e86d3510b73f379b32f8903061dae09d54a4507d15dd10a2ae837933349cdf913dbeeb5f56803e54db06a5de63c41b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-18.08.1.ebuild b/kde-apps/krfb/krfb-18.08.1.ebuild
deleted file mode 100644
index 479224e0ac41..000000000000
--- a/kde-apps/krfb/krfb-18.08.1.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/krfb/krfb-18.08.2.ebuild b/kde-apps/krfb/krfb-18.08.2.ebuild
new file mode 100644
index 000000000000..3c2f257cad90
--- /dev/null
+++ b/kde-apps/krfb/krfb-18.08.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 73d60bfef10d..dc23be999c17 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
 DIST kross-interpreters-18.04.3.tar.xz 144832 BLAKE2B e1d32ae2dec8c4ada9c69576cd0feaca79c641c8d50e6772a966c4e766fac1054ac226a6fa3cdd4fa30aa11a0f2b04dba424ed2e4617eead3e49f9e2f11b7104 SHA512 d5ff06870ef0fc7906dfde9e413ceb0321dfe40296ad08f0a7f74ef63b368b91179bb140d12c650e0bbceed0601c5d141d76497eb87c95ac4f1f523b523d1a4d
-DIST kross-interpreters-18.08.1.tar.xz 144836 BLAKE2B aa9e9e21595294c0ef5c79c17993703f7ecb6782eb3b26a36f0aa52b1c14aaf296b193ebff6a0fe3efc12339e6650244049626effc647e71e085f747408be3df SHA512 61987e160e9892678d9aa1dbe7a9f9ed6933dab1f2f01d824517537019f8b240ca6911e132e3b0ba2cb5b67fee22d50e8db52d8a5e6f5e262390051f0120424d
+DIST kross-interpreters-18.08.2.tar.xz 144812 BLAKE2B 2a1b7210ae9a74fe0f6872cb40ae2ec041aed72649178d157d092b90c3c9c31141a04c4a4c9aee4e890f267190714faf47d59c8ae1929ec2abe2b201fae42dd6 SHA512 c9df37deba0d45adbeaa8dab16e1a25efd686e859d6b7f3d59c27b3acaafcc67d60493536b352421727f55565c2bef3e7bbb4a50a63ea5791ee15d7e0c48407b
 EBUILD kross-interpreters-18.04.3.ebuild 852 BLAKE2B a41c05e9e3a4463898168dcf2256903b44cb4710bbe7eef54e38720bd598176158c3e528ed0c11cca9e170f0a55c551103bbcf57f1aceaccf4f334f21b49a403 SHA512 4aa4a2f5a807e6b33317d6033cdaa525702d98341f78962bbbe1487d0557214ba8fb6e919cc78950d08ca11e2677b7b6b11ce153e46a939ae19e730e1c56dd48
-EBUILD kross-interpreters-18.08.1.ebuild 744 BLAKE2B e8e856d15a363a12c9ac3ea170d8a9754925be68c6e65379e47c61a42c5e6f1e5f776559b57ac266c66576c40a633434a07971cf257af1c8cd17199bfc91f96b SHA512 1aa47b44fb8c66a99c935efcef0bd23eaf6c009bc971b9a5ddd796c281b7dd19f07ab92e2be2ca1075b2025beed2038cdec154c90d7957604404df1e60e0f494
+EBUILD kross-interpreters-18.08.2.ebuild 741 BLAKE2B 0b219b4bfd76c133fe7468ddd7e11fc1baff9f8c8b39b3c1f4443bcc5e76d12fd66ae1e39d591a1a9205c71e873eac88976d09e083a14c697af9851e1fbdfc80 SHA512 c09efe698f177ee4dbd90687685beed753e07513d6faea1a54cae4f15fb66374a9f77cc74e54864a0368d4e50d0b66b946a19cc9bd4b1fe7db81e8be712e9742
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-18.08.1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-18.08.1.ebuild
deleted file mode 100644
index f1f7ac570239..000000000000
--- a/kde-apps/kross-interpreters/kross-interpreters-18.08.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( 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_configure() {
-	local mycmakeargs=(
-		-DBUILD_python=$(usex python)
-		-DBUILD_ruby=$(usex ruby)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kross-interpreters/kross-interpreters-18.08.2.ebuild b/kde-apps/kross-interpreters/kross-interpreters-18.08.2.ebuild
new file mode 100644
index 000000000000..4b045bc686e7
--- /dev/null
+++ b/kde-apps/kross-interpreters/kross-interpreters-18.08.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_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 880cc6c6f1cd..48105ce88776 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
 DIST kruler-18.04.3.tar.xz 296084 BLAKE2B 20281feecca79c90970b1452883a3603467fc6cfe3a69203194cf145e94a4adfd1523953d6b71a1122dbbdbe96b42b5a0c1a63c90bcbdcae31021a3b7b466b70 SHA512 0d1ff9656530e4496e18b4382bd73c5750b4b2ecfd677140a57c3e159687e56254790198f406898c140654f01288580fbe48d84531d24c53b629a7d2a87557c0
-DIST kruler-18.08.1.tar.xz 296100 BLAKE2B c9b5e90f728f2ed37874d14ea6368363e1fce1ccb973bbe1a74e0f33ecc6fbf842f4a11f14621a3c4db7cf138f1dc5b83d7e73f6a804bc82a3f39725b55ee707 SHA512 8facbb509eada0762264bef0435d2d4888a5e6a9a102f6c4d5746f4e299a67be888543ff12c4f53970c4371ac85cf4877d307193e9f33d4bf776a6ffd61922dc
+DIST kruler-18.08.2.tar.xz 296088 BLAKE2B ec3a9c1782eb4b6ed8db2d66608b6219df1e3428efdeed51981159d7c3bc5398fc0b3c53b8c4eeff1da9339589edfe9065d3c7259cbc4fb24ef93785babecbcd SHA512 a7e7c0c8184b6e48131fad93b6e6ca326f85c834cbca4caf1217b32197b6a6977b5de135596165e78bcb8da8cf4fcd1a8a7f23b28cd3d12b2741950913e5beee
 EBUILD kruler-18.04.3.ebuild 844 BLAKE2B 2dca8d115cb3241c82e077a2ba890874fd5ea94a09f8a47c99f5b4ae2dd195e5f9770e90a4ffc7e8704423b84358f87c64d00da40bba4a844c188f9fe206ff59 SHA512 6bc2032c25a9c2c903aa305544488269822b689acf312585ead9017318494c0c8bff8ebd87e9298bf5eff5ea9567a5778fd839bb6c89ed6dc19ed2aae429de39
-EBUILD kruler-18.08.1.ebuild 846 BLAKE2B a078943cd2ca7950ea8454e6a6bdc47c7146db0a60188b95f0d9905e946d0f1e3d6710770390643c8c32a8a4aaf3b446a7fb32afb5ba879666a3c3e466117f7a SHA512 c514fd769c844711d89ca0067b28b42b1ac705364c609be198d47768fbc48f1f8151490f994666c50f14bd8a0b9748efdb022f4c07ba9ac7d0192189006d0eee
+EBUILD kruler-18.08.2.ebuild 843 BLAKE2B 562363358514fcf75cbe8773410a79de165329646c6bebaea5995ebba16b8d55f28f0ca2f9b76397e2c558996e691f1e314bb64d25c21348b43e6e46f54e1b9c SHA512 2a226a8c2b4d42f99bea0c370481cc8353f1b09df4c64a62ffb880147e8d97d41d08318beabbd6d1c05cc544428ee59f90086d55e3fe1d19635b490978865e1c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-18.08.1.ebuild b/kde-apps/kruler/kruler-18.08.1.ebuild
deleted file mode 100644
index 77f5502679f9..000000000000
--- a/kde-apps/kruler/kruler-18.08.1.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/kruler/kruler-18.08.2.ebuild b/kde-apps/kruler/kruler-18.08.2.ebuild
new file mode 100644
index 000000000000..41726831f97e
--- /dev/null
+++ b/kde-apps/kruler/kruler-18.08.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 d1725a9987ef..559cd29384d8 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
 DIST kshisen-18.04.3.tar.xz 710776 BLAKE2B e9fc3a3ed41d68c85f1f4b0b0eb1f94521d6aff12158589ff1146642f854d4cf6b64f3944f443bf98843528639e3763a237b1e0da78511d412c6a91b9baf66b6 SHA512 87d7e86ac41fe179735afd20ca5186c659a8eeefa8b4973553f295ee712649a7bf05fa25b051583c4904d2b875816cb0175206b48febc48520f4ec548149081f
-DIST kshisen-18.08.1.tar.xz 821184 BLAKE2B 54d58747f3ea725699b77687b7cd4a81a9abec6e662d52e68a0f1aaef941e7876ecd4d879364f15e839e9c72d36f933985fc06fc0c1b8b12213aaaf8113a3c26 SHA512 aa215ad4b30f91ac262d99657ff093ff9b24529af33c3f1c9ee5a79d3eb7bca5ff6515112430f4b4e70ce06fe75289082ec26ef9092418de2f5d8df291860f28
+DIST kshisen-18.08.2.tar.xz 821112 BLAKE2B ad3024fa039e2dfbd04b82c220de140b148e4aee9b3a787e0bb9468de8c8d0f4b7558e9cbbc8196bc2627779d2a021e5d09f1313e3acbfec6e529d7a39b4723c SHA512 1ca7611260ca04acb763fefdc78988981b48d95418a0b00b1d59a40aa104cc36ff32ec1c9246edd43557e43949e03d269bd7c17f75dbda8d9024e91a1a8d4990
 EBUILD kshisen-18.04.3.ebuild 778 BLAKE2B 287c583e113f4b8dd114318ab6d66bf34171193851d65c02c9cc92a8ea5940823b90fa543ab15deb6030e987e371b9cf26ef6199896ef4d5c68e1b178dbe2824 SHA512 ddcdf43eebd4d156e7df00bbf8eeee016d7c16f72f84d3813996aae88b63e938d94f23f88594dd0d20e6139e06be3c880004d7fde01a1889946c36725aa99c60
-EBUILD kshisen-18.08.1.ebuild 780 BLAKE2B d069380134f5bcbe8c979c5de039a7b5033dd35ff3505c9f5635e06ed0e5aee5a994c3874d24716735a5b84df2f1bc1648150677488e6e88d4ce0d859fdbceff SHA512 0bd4cb9f1f0650a0aae00bab0541f78a4a9f169b59922075e08181c30ae6f4e97b61db444ed86667132d2397284598f5577ec47f1112b17ca1357d198b996f49
+EBUILD kshisen-18.08.2.ebuild 777 BLAKE2B 59e8162a41b7d67eb7e5e0cbbd2054faa8d6c64d47169b92fd72652af4489bafda7a8860706435946808adc77f76c0d9711fcd5cc5003f1459c18df128d63cf7 SHA512 4e8e7592673ea11d0f6f11ebf26b20cfe1f8e7ba291720fb2fa6cf6845238ea485e519c425874ede48ef838a2d1c43bc5bb19214e5f933d901acf362f2b05e6d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-18.08.1.ebuild b/kde-apps/kshisen/kshisen-18.08.1.ebuild
deleted file mode 100644
index 907e49003ece..000000000000
--- a/kde-apps/kshisen/kshisen-18.08.1.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/kshisen/kshisen-18.08.2.ebuild b/kde-apps/kshisen/kshisen-18.08.2.ebuild
new file mode 100644
index 000000000000..4f186338f786
--- /dev/null
+++ b/kde-apps/kshisen/kshisen-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 cdad4206eb69..e001a786f2bf 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
 DIST ksirk-18.04.3.tar.xz 6985888 BLAKE2B 965337f838aed03844fa43fb0b3740fb84f65615d9646757124516974a32248ea77861428dcecba8090c09f16ada6d58e7f401e504e03477d650698da675d268 SHA512 568b5d1abc51ee9b46fc35dfdac0a1e0bdf7e64f4640da751459bf81bb5f2ffabe5efb62462dee36630ef6b6e967bd2f1be822b2af739ba2bfa87b7d6d6013cd
-DIST ksirk-18.08.1.tar.xz 6982328 BLAKE2B bed9a69c7e24429bee23c7883d91829482925630628a6240d93f734c2034ea0e8d61519578aa3b54b97697de9eda9d15b1dbce4f26e9df195c3f2c7fd838db0b SHA512 7fd1716830be610feb78622f47be601c0ae8b8df445e09f6455539802ce1f020c07423f8918895475feaec5f89432fa8e35ded966b22b364cc4defb04f7437a1
+DIST ksirk-18.08.2.tar.xz 6987300 BLAKE2B 4107a51a5cdfb86af011598919e34e128857aa2b44335324dfcd52427f0f4faa90d572c5e0bf149d24fb0c4beb6d2c0219fb99e6e8ee1c97bde0c0e5613f14c8 SHA512 3c826d4d5dd2dec75fec0eb38023c67ca3371c223cb149202863fd8f2dc2e1430e0faff2245afd608fd86002fac1a7603acb54e3854f1a2a683684e753485765
 EBUILD ksirk-18.04.3.ebuild 992 BLAKE2B c23517b1e85f4b12db1417bbd326834aaf1af327883e98a61d3eec720f1e1a18aeb43f5c2aa94a33b14cfaf266996c2e0ee2cce99c428e04cde9b1aaed2f9b44 SHA512 9a40f9bf1d56099ba864c113e828dad9d5543381016970c51a1cd66456cb25b37d02aeba727d524aba1a0e887b2538e51e4f0e4a4b64f1353edd0b956671e1c8
-EBUILD ksirk-18.08.1.ebuild 994 BLAKE2B cd08b8b936d7a93ebe93d00f6844952bc444306c4347df62cccb72b6f9af813e551d8b67730714feae3a1458f9f04461fa2b116190471599f1ad962e52297ac5 SHA512 9137101978c70391a671149bac924352ec42a0245a3167a44f7cbc9ef2aed7710e61ac3a27aeced5ccc9fa75fd46b73eeb6d2ec20a1893ac38b21dddd99bf310
+EBUILD ksirk-18.08.2.ebuild 991 BLAKE2B f488d60906403a681d3ef48e2ab1c1d9d14561817bd2202cb32e15733bff9b2fa8fe052482115b2f6a658e3beab5c3fe6292810407c143557a31314ebebce586 SHA512 93d505d61b8ac6f562b9d0da1e5108df5b74d260ee21e6982705e130f9d1b7d1a6266ec88edf09e34118cc40c96341334167ec3a2423276907a680e1fb83e7a1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-18.08.1.ebuild b/kde-apps/ksirk/ksirk-18.08.1.ebuild
deleted file mode 100644
index e147ac059f48..000000000000
--- a/kde-apps/ksirk/ksirk-18.08.1.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/ksirk/ksirk-18.08.2.ebuild b/kde-apps/ksirk/ksirk-18.08.2.ebuild
new file mode 100644
index 000000000000..81150eed5337
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-18.08.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ae33b3154285..e8f6d3287ff8 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
 DIST ksmtp-18.04.3.tar.xz 38044 BLAKE2B fb35f06e63e05c82e958b0113356ef80cefdb2af19dda511ac4d8a5803dba12d31655080fb3f4ccfb357dd81ec5c88e3a486978c13e9bca705222361d737ea8f SHA512 b4149d8e6805e75f6de1e3e491859ae43aa596fd6ff59909f99d7deeefebe051ad34e1300f9879ea552f78d789e58e70f31f71e83f1aedb2e352ada4be302831
-DIST ksmtp-18.08.1.tar.xz 38948 BLAKE2B 33f767d0dca89fbe8c51ae07e0e821c1857be23bcd02798bbe836ad929079e7cf0e8a5c7d530d7d4b3191fdf3d470f37c44b238979b5b1b1283106ec7338503f SHA512 5f60b200516a0bfa08ea8c51e2f1520d9d6197b0e5848dd42b7ad77671026a0971fc8a6868443e14a6c2a95c31ba48eed57102c562ddafe5c8e3fb13d439a100
+DIST ksmtp-18.08.2.tar.xz 38920 BLAKE2B 23235a148e0de051032becd5ac687f115bb288bbbba712f70c424ac1aa338df877df221ffcaf76104bab17eec061adebbed7206058cf9435b70ab098aec69532 SHA512 d291aa700605fa0311e81b11d05d082bcd0897b5e45167ca99f9811280f16cf512f2bac9ecb75fc74075dc61fbf1e21bfcf1b33ce22ac90e3d1984cc9725a1ea
 EBUILD ksmtp-18.04.3.ebuild 491 BLAKE2B 0d8c11d06da656a119826b39db7a9134334fb0efad3e7c731e4b9b4d435460b2dda02f8340e5864b89c236bf9e669aab0f401f5fdf4e32daeecf425d8605cfcb SHA512 88050509a6d5ab2286bcf680d77be6f781c9eb9936813b5c839bf887b8459d923fe17983504bd461cda3bc251cd8b0608a3c20bfcf50ad5d8511718f4ecdb7f0
-EBUILD ksmtp-18.08.1.ebuild 467 BLAKE2B 37361f86da8bcf031a0339aad39a15ed3604f68b4860cc552641107b4ae08e309d11b71a559fadbad0561468243ebfe95280f7e0a28310d91c85d7eae3d56547 SHA512 29596132b2ae351ec6f4295dba4e254c17d12e55c6dec4c0cba71bba1b8ed2d93d9c564d6906ef7fab551d687e470f65d34b0894edcafb38c55b12ef1b6040d5
+EBUILD ksmtp-18.08.2.ebuild 464 BLAKE2B 51f2d974c5a5e25bbb7fe37e8bf1bd589c312eb08f5d50945bd7ff59622d0a2e75837f0a03134e4d2c5c5e8f5abda57788cd6c6cb4676d910f2a891d5613d70e SHA512 1aceb2f8eee3d5d7b6991c633066d37f5d965474e643e3e82d1bbda38b471851794925849a3eba275bf234d0dd2222daa0be159316ee344b278ed39a7344b5c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-18.08.1.ebuild b/kde-apps/ksmtp/ksmtp-18.08.1.ebuild
deleted file mode 100644
index 770a8e2e2036..000000000000
--- a/kde-apps/ksmtp/ksmtp-18.08.1.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"
-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_qt_dep qtnetwork)
-	dev-libs/cyrus-sasl
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksmtp/ksmtp-18.08.2.ebuild b/kde-apps/ksmtp/ksmtp-18.08.2.ebuild
new file mode 100644
index 000000000000..33ebc23a9dfb
--- /dev/null
+++ b/kde-apps/ksmtp/ksmtp-18.08.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_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 632207494164..63ef383aa48b 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
 DIST ksnakeduel-18.04.3.tar.xz 605444 BLAKE2B 4977fc37e1bb324ffb26c6d78cf537dad14c653b77b23b8ba7caffd613bd1db84392b7fbf648456dde25321b13533b42b925bc940c0c42efc9d9f890e025fe66 SHA512 04ccbba57d99aecbba962d45456f59b35195991653491550115e1f4d9909ca67ad55e2c5d603475334e795d8ee449fd5deb3f3aa60b319602d159af475b5a465
-DIST ksnakeduel-18.08.1.tar.xz 605604 BLAKE2B d726dc74fa28906fd02a73a2c67000a3d777b6ee8dce0e714363584a146e1dbb46b6f59da72337fdd6eeff29cbfec7a75fed1db5e771fb29c8320ca45c157e75 SHA512 ae8ffbc8fa2489ec3aaf2d2ea866b6df5d1a9ea6e24708c584b21db69e93bff659d418bed33063a8a4c36735f6cf0664a3a117f4a55a4fe19e441b71d5c3a4b7
+DIST ksnakeduel-18.08.2.tar.xz 605456 BLAKE2B 2762a4fba2b3aa4003de2104e8c2090a33370d9d5fe336abf1708f45da7d2ebe7cc0a1f8a2be31c69767bda5e5511666f76d948c55d0c9d016c9a9c6dde4923e SHA512 13673dbed2b4266f6a8b4c26b0a63c4dd8e57bc66a8d5085d6434cbae05478afbb99c0371d9a59bba411044a89f2f1fb6a098217dc75f176f2616b00cba8835b
 EBUILD ksnakeduel-18.04.3.ebuild 799 BLAKE2B 49dec31ff6c24dcfcfc3810913d57aca0ffe7b897c65c78336ea245e0bd979dfe8650a0cd6a3f156e9be5f4a209b09d1e28a1bcca7d932f5e35b1ce139de1f39 SHA512 1dbfac43ba40f312124b25bb6b3170f5e85ce5ed7da0b083ecaa023558fc434f40e74fdb7e23290df763178a52c3f15e442b20740a3bb4ba0b194fc40c1c73b3
-EBUILD ksnakeduel-18.08.1.ebuild 801 BLAKE2B 1a611f1d5d84d3bfd30126b7a17b03eb34be062a965805be3a0e4fe47228ac94c6b955f77e448f233b8963cbaf9570ad02715957da0296c4fc8222f2a48a9717 SHA512 86b3777fbf8ddab82b9ad9691cb54ab31612659c124af790b8f1207d5912dc171c8e4afeb66a9b5e5b9b25c7f882f61caef31067addeb606a18ae2a919e862f0
+EBUILD ksnakeduel-18.08.2.ebuild 798 BLAKE2B 873e58c9ca92bb30b4237f625cec4e983f095ffa9acfd4bb3cd58d0784ca17354ba04998e8d7bbba04e6ad8f9ebf25c0c3d116a8d453c60fd4df3c47404337fe SHA512 8e2ac131d94d6d3cbb6317590ea44d3c44eeabc7c768f3bbdaadf77c0ac0015ee9816f8c3ebce83925915a10dcd70775c691ddbfcdbd9a40b6f1fc899e9091a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-18.08.1.ebuild b/kde-apps/ksnakeduel/ksnakeduel-18.08.1.ebuild
deleted file mode 100644
index 7bdccd636b12..000000000000
--- a/kde-apps/ksnakeduel/ksnakeduel-18.08.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
-
-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/ksnakeduel/ksnakeduel-18.08.2.ebuild b/kde-apps/ksnakeduel/ksnakeduel-18.08.2.ebuild
new file mode 100644
index 000000000000..d7d13364f717
--- /dev/null
+++ b/kde-apps/ksnakeduel/ksnakeduel-18.08.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 73c4022ad098..53db19cfbbd6 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
 DIST kspaceduel-18.04.3.tar.xz 611180 BLAKE2B b09aedb33f5d5fd56302459e31bc9d6c44e9c50e846665f0209e08eedfa37e80e653293d8235222d591b5c6c7aebd938d9f2c4902c4a87b466ea039616f3eb63 SHA512 aabed6df0c78ff7cecc2f2d3c8cf7803a4bb2c51cbc9482a964ec537808b016bb4d517d8af628d58a6bad60dac56312ff49c19b5bf1c8149486651c56174ab5f
-DIST kspaceduel-18.08.1.tar.xz 611244 BLAKE2B c71c1df6c8ecf0f499cb2dc0c98b4ba451c9f9c504c83ce2e562327df936e1650c242a59387acdd0641678c5dfd7d23194ebb4b2051e18a40bfcfccc622946d6 SHA512 fef5295090c888f333677beeb37e9c8df696b7da1ba23f9a38c5c536e04d2932b476e95b01e05cedd226132bfa5f04fc5c178e2c9a844a2eaddef2aa465bcbf7
+DIST kspaceduel-18.08.2.tar.xz 611252 BLAKE2B c837bab247042ae76d060c8af2cdf15b0a0d852a0317affe1a4da65f6355c32083c401ad5c28e4781ae306c123fc027d19cdd6a0f7b8992fca5511d173d58f03 SHA512 bc8e41ae17d34f893ed5749626beb491243103de053051a5467c54d810ae343fddaa5927814ca43b16f07fd47c1842caf09d0e655f3b6082dece025ac398fe3c
 EBUILD kspaceduel-18.04.3.ebuild 752 BLAKE2B c4b0dab1f8fe500bd162eda61631e9b155962a7a6c31f292e39c5b21434a86d0bdbc58afb31b94fd06c6f229863bdf16b32f5100fea08fd5db7152d6fbb1ac0c SHA512 4d7187ab554af0e9e8a8bc7b8a9ff64f3f120c10bcdda8f39c6674aa47b07fa48be65357f73e397f218ab93ad8334461eb06bafc3c017dbb6765425b8d9b326a
-EBUILD kspaceduel-18.08.1.ebuild 754 BLAKE2B 3adc0b4f2e5684930df2ce805f4f73747ef54959147ca2f6856ec9be17ad6679a98b3aeca90785bc4e91c74daf137e9ae1eab29453a614e245566c9160cc227d SHA512 a96eb8ae4de358c2b69d52a5eb05faa16dbcfba220cc1f3a378cc6798bfcdd9cc4cce41ff9c2880f05508aeae79f03b5d88d3eafee6806d8c2b68503f15099e7
+EBUILD kspaceduel-18.08.2.ebuild 751 BLAKE2B b2b0b8f7698f1ec0a2ea607bb1dcd6c7187b2d431452d8b6d4ac2640dfc50d50188b39d9b81c75d371199f756c5babba3849e33e3cfeeb52cc5bd7a268c54f52 SHA512 9fa65bea8f6c8a737b401bdc42e9df94363849514659e05e2c6a0f68309bd9df6a551e063dbad5e1e647d86f135cb5d57451e1d9fd2bb36bbb801bdae90ef947
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-18.08.1.ebuild b/kde-apps/kspaceduel/kspaceduel-18.08.1.ebuild
deleted file mode 100644
index f04dfdae0a5e..000000000000
--- a/kde-apps/kspaceduel/kspaceduel-18.08.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
-
-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/kspaceduel/kspaceduel-18.08.2.ebuild b/kde-apps/kspaceduel/kspaceduel-18.08.2.ebuild
new file mode 100644
index 000000000000..c76df004541d
--- /dev/null
+++ b/kde-apps/kspaceduel/kspaceduel-18.08.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 b297e3fe880e..9c8ffa2c6f68 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
 DIST ksquares-18.04.3.tar.xz 216800 BLAKE2B 97d0f6c594bff6046a8faa9369c58466a92ee529f38c39a9732d0af6620b912c31e4b59d2a3c9f726e9dbe03876324dd1f3193692f550759bcf7614bdca545b1 SHA512 58b28c87321ad2380b95d58ca5969f5def22642bf3d073a4774acd036cc9d50489594feb0492d9e53c33744c0c7ffd3fc1243e475e00ac9ec6f96b9bf2c9f646
-DIST ksquares-18.08.1.tar.xz 259040 BLAKE2B c65de7f5db94b59829a8208cd821d01cffc21e45d122e5a79533916a0628ae7364f086797448c03a56314fcce5ff1e1bcaa5e7e99deadf1a90776f153c184b59 SHA512 8c5fbb1e5989adf061571a63a16d86f38b3f68d977162ce8fab4ea2b1b41eb58dee9371cca1f97052497a4a72d101fa4478941ea39022d87e885c23a39aef028
+DIST ksquares-18.08.2.tar.xz 259008 BLAKE2B a1d0672f1bf9b7f05eb773f31c79fdfaf60a5f488f698a051d0a82fc623dc7948d77700acb9159da47d903e785a626842f103c7e789de26598298404ff65265d SHA512 cfdb42579f5702f6eaecb230c2fe0c32501982772385533cbb8868f8174e1797aace26ef3a7553a633bd753950bf550a7b00f534da09836793edb21d64ea9c3c
 EBUILD ksquares-18.04.3.ebuild 753 BLAKE2B 527ea5200d86e94fe946f3ee106694729f0d7517807907d7a5acd3b4403b3b8e36245ac2327b29be254ccd664dfe277c31c2fd9031cea2d65172036ee3dd30e8 SHA512 37bafc3b3251cc6bb4651e13bf4db0c9de0a1fd8fe0f019c33e592e318eb4b8a7f6bb6b1e88f47f839d9c49044b22c5e6b67728287dc3b0aebf9579aa8c69514
-EBUILD ksquares-18.08.1.ebuild 755 BLAKE2B 34666b61861ef5d4cb094c3fb98bdf38ab93f26db755f9346573b9f18c82f08ba79ea6094388fad2d5791a1ee04f8377594f97e5ddc9d024f243fba449a66c41 SHA512 074c44d9b495cebe06681d14ea9a1b1af3cd83c97c0126b37cc2a3d2b3a6f22e845d7eb09cb1fedfa7b786190e0e9487b84a1adbc72798bd38b9c99686ae3679
+EBUILD ksquares-18.08.2.ebuild 752 BLAKE2B 2281dae8912cbc637f330d8acc4953437b96b0bbf53aa6fa867a0f2b56b44bc09dc8ff0d7f9b3bafdd8bf3c8086e6a5aed5129a218fa1302dbcac213c25e27ae SHA512 90509f13a4a869f9b9c8dfdc9f7cdf4c35d6e15c5afdb72bae143fd382704ed31058a22a92b1f5c5e529a9b42514c201fbd3449c242901db1dd807d3125d5e17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-18.08.1.ebuild b/kde-apps/ksquares/ksquares-18.08.1.ebuild
deleted file mode 100644
index 2a05f5517dc7..000000000000
--- a/kde-apps/ksquares/ksquares-18.08.1.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/ksquares/ksquares-18.08.2.ebuild b/kde-apps/ksquares/ksquares-18.08.2.ebuild
new file mode 100644
index 000000000000..d3cda5cf1bb6
--- /dev/null
+++ b/kde-apps/ksquares/ksquares-18.08.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 847299c8857c..342a5eafc2ae 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
 DIST ksudoku-18.04.3.tar.xz 1639068 BLAKE2B 2627851afe3c1ad271f5c835c198cc449a5ec13f532043e9e0b9ee0f7ef3681506783e5ad85bd943730e7990c691f71ee3dcee8fa0d413cfb209031f276ea4bc SHA512 b205523e365c87badaa9c0b47f3228df2c678e89346329215c2a11cc652f92399d0a31edb09db992164e20addf44ba18c31b989b1d5b66b090138c656d4b32c4
-DIST ksudoku-18.08.1.tar.xz 1642964 BLAKE2B b320b63e6332970ddad4031e6289db64239e55b6e2b957edf35f842c29b0c0fd5105752865f8df46c119dcb113cf357942331cfc6e077dfa8987a5e056b814cc SHA512 c310e1ea217e0c7cf56562c6ac5e2d028567031b7f4c710d132ea4149e658577d659689a607c3ae27337f0c09a9674a5d38d229651401fb98cc8b01adc2544de
+DIST ksudoku-18.08.2.tar.xz 1643064 BLAKE2B fee1d3295201eb2d09ecfaeb900050fe7804a9a235880b956b4397c4f7e384771e7ebaa53dec9e74d747c6a3fc5effdac8a48aede82860e9655cd24d38295ca6 SHA512 50b70e276d320821dbdabb161c770315f87d7286e0066fc453d17761e16f9e2e329d13a91d0420650e2de5b3b7e7da2bccd3672ff6055fd80d641a01addc50b7
 EBUILD ksudoku-18.04.3.ebuild 1134 BLAKE2B a3974c852ae75b254b7b6788daad23ddd899df4d163be21c6f4209b779eeba49a7d7fac7274ea323a814231179b6cfb09d016448fd9e0cd787cb9d3c07e59c50 SHA512 bfdd9f816c958358db157ee94f1f22c9bb77d2eb404e505ff2da78481472111fdc255d9b04092d761da064cc479994c024e3fb323e748beb5284f7a25309ccdb
-EBUILD ksudoku-18.08.1.ebuild 1136 BLAKE2B eeae04131cb917f58883f5e8ba326c6f9ea8f581743bc8847d22a1fbccc1d329454b9102e499999ecaa96920ffa4139f2c8107861b89760d91a787ef3bacfa5f SHA512 00123512fde8754b05e13f98ee3b26f1caa4c3a370ab913de29eaead31b4faddbd1f9fb1901f094f15ddf0f9096b7a59a452ec13287793ae7988c662f9c39963
+EBUILD ksudoku-18.08.2.ebuild 1133 BLAKE2B b7a44ff98cd1020f695f16988d794e4e9db8c8273f52ad493f8ac15e5b59398f85f476db2a9f5612c70f7ba738b81ec18dd6718cdf213b01872697faa8eaee94 SHA512 2342c2a07212cea55b56f5813f92d97d8b6fbaa1df0921f666f881fa8fa131a88d3de0a7233fcc462a1fda9123e76fd4d0ffa9efd3b46af2cf895cb86b56773b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-18.08.1.ebuild b/kde-apps/ksudoku/ksudoku-18.08.1.ebuild
deleted file mode 100644
index 816d157b242d..000000000000
--- a/kde-apps/ksudoku/ksudoku-18.08.1.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/ksudoku/ksudoku-18.08.2.ebuild b/kde-apps/ksudoku/ksudoku-18.08.2.ebuild
new file mode 100644
index 000000000000..9e8e4b863a6d
--- /dev/null
+++ b/kde-apps/ksudoku/ksudoku-18.08.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 43678ab864c5..2f13a35d151e 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
 DIST ksystemlog-18.04.3.tar.xz 1784680 BLAKE2B 27f71ffb37ab30311cb638f1ed03a1ff0a78c92117c0452f1797c0b01cc1c816763b6ecb7295f22118747ad85856b64399d04a02447ca4766cde598385ad3ff0 SHA512 f42d7fdabd93f98180077388ff4fc93921db562795edaa1892dd4526a8f8637a2f5ed5c063c0b97f96603a0f0f2f0425336c61b956c9ba933cec565fb2cad827
-DIST ksystemlog-18.08.1.tar.xz 1966736 BLAKE2B 0a913d3bf663078fcacb7709fcc06728ca7dc0ea6269b4815021b92d84457e9357e6e0107db1e5339b7fe60cda18fc8262d8560fa177b9d574fdcc8b766d00a8 SHA512 096c335bc4b461548d7d16dbee738ee06fb5fae91ab3f02869b73af18f1dd8ef4ea27568a265e6a40f3777e7749e9f5a11e9b3402ac5f698836e00475a759308
+DIST ksystemlog-18.08.2.tar.xz 1966492 BLAKE2B 70fc6dd39a8bce7fd1e7c31012c97ac93841705a3ebb1c82db974f4e6547978e48fb54da083c6b8e811dd42f33300e365b65426c298ed44905fd4dde7b041663 SHA512 74f89527757f3c61fb563826a9d5354426fe901c879200f771d4186c20a9ac67d1ce9b6b5fbf694399818d17fc947cdc868940002d059fe52b12dfef5a49cdc5
 EBUILD ksystemlog-18.04.3.ebuild 1564 BLAKE2B 3c90337a6c5caca3d546aeb611e8545be0cb9fc2d840bcb5bb1b41f837b7faaf1dfc8537ce60e3de21bec325173a5e968b3d55612b1d2173f2af69aa65f0fedd SHA512 ef1ae57fd6276bcc9bb529b2a142b3f83774f58fe93f727320c5ec8ca696d1b6d5ff8a2a8f7a7ff4268408516050f989c6467ed623075a84d6db26dbad12a77b
-EBUILD ksystemlog-18.08.1.ebuild 1566 BLAKE2B 4e4b5120e06c4602c24fb80d11749d6d27b4e2830b879680162c47969688baef6db86ac036f807111dacbbf8f68a50b2716d0450108e62c63b6984d57ae39d49 SHA512 f197ce7053e9d69e276f1950b80d5cf47bf4693683fa65fed355efe0b7e3adfec58aa0c2606ffa75caee9843d771d2f435546eb16de98096db31e7e1452ea060
+EBUILD ksystemlog-18.08.2.ebuild 1563 BLAKE2B 7c845a45766eda673347e79a837efe7fb8084cb90f45da14626212c4cd84a912233e5b3c2f22f430ffbe1d711d6640f481c89f15f73cf8d143af1774a98d4963 SHA512 accc43953db180e11d92962e8ea675bd8ed3768fc84db0f4f28fbc394973654f7b6e57d60dea934f3bfd88ed50dc3eb38fb79835049b03f42497fe528603173b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-18.08.1.ebuild b/kde-apps/ksystemlog/ksystemlog-18.08.1.ebuild
deleted file mode 100644
index 613a2eccdf4d..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-18.08.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_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/ksystemlog/ksystemlog-18.08.2.ebuild b/kde-apps/ksystemlog/ksystemlog-18.08.2.ebuild
new file mode 100644
index 000000000000..5392f6e78e42
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-18.08.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 6fa53c84c8de..e84f9757db64 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
 DIST kteatime-18.04.3.tar.xz 297864 BLAKE2B ca37f60362e8b4554bfe12c12e110fca5f1277a86fc2e43371e29cdf884ab3c76ff809ff325fc8ad6d7a2328d11a95370055ba6b8b4bbb80ff5389a881bb870b SHA512 5d6e19eac3687b1ecd0abeec1f6e0e28f69b78fe599e9d2cadca33a5f38b4565fe6a7abefc3877ff5a3b174a12d85c057c020d92318f311b7917466195e72961
-DIST kteatime-18.08.1.tar.xz 298016 BLAKE2B dfea45ffc860d24f68d51cce3a81240e69418a959ea3ad639a77b78deb5783ca11b7d1998c18afde447384a6dc5b970f38de4401511a8619db37e38133f68c36 SHA512 61d0233dc81a492f2fa3caec2a0a028c66a0f9b0ceb18ff1d395dedee3ea184b221dd59bb35886d65ba7c4bd32f84a6ac8aaab0b0ccc61d3989824a5410539c3
+DIST kteatime-18.08.2.tar.xz 298028 BLAKE2B 07381e014ec92605cdf752d3ccabe53ad436dc8e918ac48d9b3295bb111d59945a4f24ac33f2496f0ec74f0dbd3920d802f04b933d4e8058926fad3279c38085 SHA512 065794fdaa956947056da2a2771ebfdcd59f88ae648734e86b4648b41ce3f223e43791ff4868be85e86d0ab4a4f3bfefa553dd838d4df4bb241067922a667ec4
 EBUILD kteatime-18.04.3.ebuild 718 BLAKE2B 06cbb4252bcdc2d843e2f162fff7e915db999203d1e0ce37d3e355587350bc311e838aae0b4069250cc10207d81b8b68e0bf1789cc709960879680686aac268a SHA512 80ee20c830c03c3b364fb562d08e09fe50b33186336a7409b476b5e1d786b8a36c56658954b33a413006ca5bbc5743f11144a67d82693740633d3001e4a80d61
-EBUILD kteatime-18.08.1.ebuild 720 BLAKE2B 7b22415e088d49fac77aa261a0f6e00074826295ef889336e933125e40324410ba48ef681ba6435cb7cf3e4a0cfe5ee671e1d69d2d1274a9a5616cbc8911a586 SHA512 d436ad0d811c8cb6c174a6cfcde05eca6286c51bbb907a255c039960f303278e30db94f170bd382d373c1f04951e158793fafe9e5a7a322e680c074c752c5631
+EBUILD kteatime-18.08.2.ebuild 717 BLAKE2B 6f29ed929dce34aec9ee847dcc7a1fb2a380ffde7e66b7a98e2d65a3a684d490843372e67ef7e4d8a34e8b9527c8d4600caa7e1ff55825dd4f71b11eb2fa8794 SHA512 46129320812a1ecc0401f8b6fab330a5fe95492babd51ee3e44ff327d987540d7e68df928d6504e35da26ba2c76fde3c0e5be374f15fc9b835fde881aa799bd5
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-18.08.1.ebuild b/kde-apps/kteatime/kteatime-18.08.1.ebuild
deleted file mode 100644
index d6175c6546cc..000000000000
--- a/kde-apps/kteatime/kteatime-18.08.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
-
-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/kteatime/kteatime-18.08.2.ebuild b/kde-apps/kteatime/kteatime-18.08.2.ebuild
new file mode 100644
index 000000000000..2a570b268121
--- /dev/null
+++ b/kde-apps/kteatime/kteatime-18.08.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 0a9d8ee8c83c..59fbe99c3b48 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
 DIST ktimer-18.04.3.tar.xz 456116 BLAKE2B 3a37fc65efe73991e30873fdc60a396966ae6e4f94d277b01b5119933d875648ce02121d3f81323c68fabfc8ff16eb7803c71898777030e85d15ba51ace6e2ec SHA512 d964f1751782ee112d91d59c66e8f5836751e41cb607d04d61eff4450c75dee44989a73cd484b651ec31b233e7242ab8ab8a39c29d175d20259a35dc54d02e56
-DIST ktimer-18.08.1.tar.xz 509296 BLAKE2B e94c223c6fb7dab3de05605d445f085b84f7979266cc6d1d8a90dacdb8d2df32a5ad58bf11819682f1ef82a33b377444cd6e8d99be7a02ffc53903f9dc131093 SHA512 54916845190dcf9e80deefbdf1cfa583cfc37c4ab7fca9ba56a0542a934719f98b56bc879768a0f6822d255ead23446edad9bf21886fd341a11f2ad3296f2947
+DIST ktimer-18.08.2.tar.xz 509456 BLAKE2B 27e884de7783bd6034af6e1f68f376e9a36268f23d4cf044a1e3ef578991d93ef02508e2f90ab0bd31b45042541941666ad7a56f0632b532665bec096c19b2ef SHA512 65cb1ee4f2f1402728ef0fcedb403f4015d06383f268f13fd6dd031601083007502373506d1ece514a9c55ff8a7f111a71f31350929d82a2298dab69477d3680
 EBUILD ktimer-18.04.3.ebuild 660 BLAKE2B 37955088d78d5daba9a62a36db829157900185ef1b934d99d2567782185c2397c1826b13c9a7b4ab5c3212ea9c5ed04c2eba48226c3acdbf7d40278545a8961e SHA512 e7b802fc6f09b0bb488546c02891708c4c8a5ff442c68537e8b2ed64c2559bfb749b2c390bd8699adaff7a37dba3e3be270be631dc61ba27ab46584217fcb2cb
-EBUILD ktimer-18.08.1.ebuild 662 BLAKE2B 8318d70484ae17a9e0f41dc423a44f204b535e7c9671301097d68482d313569aa552a7dd1e6142cf52ce0c6c290cb231b727d6d7e769f9c37a5a3bd4e7a1734e SHA512 dd1be55288079829704847d901181329b252ee506732978cb53bc838648b8128e6effb0f9e1a626ef0ab39fd8e37f8e9f5c97e7f63575923ac3602b40e3e0996
+EBUILD ktimer-18.08.2.ebuild 660 BLAKE2B 666531fed8bb8ce7d1a244c43e05020909b8c0113decf428519050ccc6e6844a0a0c90407b83340381d267fb8e0eaeaa46e5efdcad5fbca3378834d669e1fc00 SHA512 5e53df93eeaa1ab07964d32e592771e99fe1782eb5bff23e22335c5de5604d0233731e9365deb4dd29bdfc654d423c4215b75b7e8b5ed837cb0f4cf41b085993
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-18.08.1.ebuild b/kde-apps/ktimer/ktimer-18.08.1.ebuild
deleted file mode 100644
index f21e3aa1385a..000000000000
--- a/kde-apps/ktimer/ktimer-18.08.1.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/ktimer/ktimer-18.08.2.ebuild b/kde-apps/ktimer/ktimer-18.08.2.ebuild
new file mode 100644
index 000000000000..cc6e0c53c5ad
--- /dev/null
+++ b/kde-apps/ktimer/ktimer-18.08.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 16f580ed37dd..e51a9d47bd8f 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
 DIST ktouch-18.04.3.tar.xz 5111132 BLAKE2B 36ded77fc81acc624f4c79aa8d9bce9e7df0718c8ef326ec2d03f8b70730a7629d715a681d96a8614f767649e794dee26a9ab378157cb6ef6dae84beca4a60d8 SHA512 eb27ecb18b9b06b839d56e150248e0ca89e12b89d80c1ba7237f46462e28056cdc423c1e3f3e9282b746f94c265d944dbc2cd4143dff1b145d6bdaf83d2e563d
-DIST ktouch-18.08.1.tar.xz 5105840 BLAKE2B 16bde916795a07c7fe7956b01df754dcf0e3d2064e9eb9042e222de1d3d68b4c4875d23bc13731e340692bb1599501b07cd07f85e64dd9ef7419d40d73d3c321 SHA512 83fb8fefff5a3fbb8124fb7a0d545f5d2edbcf1b2c1e134cf8c9984809bbe1f4b50e566782a9eed78233e9716f8638b86e177f5ed9f1f1304fbe70942abdf3ed
+DIST ktouch-18.08.2.tar.xz 5105364 BLAKE2B 740bc4401a1e7eea771affcfec6b772563867d840554900fedac05895b5407f8896920b0cf9ad356cfb7e39fbe846648ad91374e94420f1811c5d2610935dac1 SHA512 925a7add9c0078eea79e677c0f90acd75ddc17ee88f6c1063c261f8b753d3077003508bca66d4434525715d8df688866237a0d3a051096f2ae657faca8604531
 EBUILD ktouch-18.04.3.ebuild 1111 BLAKE2B 3595076fec0dc3b9e18b41285dd9ec7cc8c2bfd155555a25537d612c2e946b038be06fdfb3b7b86296238a12a58f6dd4e28a0d3697bea836fa2e672575d9d660 SHA512 ba126e96bff53bedb5210766322cee11ae7f5e828aab493a58b42389131e098f65c879b32ca0f3f1f5876d32faa006754ab8d146639302840460e4bc29d8f5db
-EBUILD ktouch-18.08.1.ebuild 1113 BLAKE2B 22f4ddde7dd55145787c72259495d40470a683024092a787e037347c6f2195614e608fe4b433e84221c23b735f4326e9abbfb6dfd77573a1cfa8e50b2356f303 SHA512 5e866834706e18c4d1af4319fbc0d2d135c13cc7b3099b631393addd93bbd777f620ccf97374311f63d349fe13893ef6c34bbb2631d5930c3a2e6f7d0b31dd8c
+EBUILD ktouch-18.08.2.ebuild 1110 BLAKE2B e68ba87d61699481c054f7229310a05dd0390845eb10cbb5c5c1d3a6af03512a05dde7a48901addff9b48d8450348d983cdd5b610d4cbfbd445088e629024677 SHA512 b0333939e268360b9d162efb0d6ff2b8ee2de0ccd06cb18a4f55349b8e6dba74f9e22153ef734f5d1d83b7593e35f196cf2111cd70f4f1771a18f7f2f7d1e4ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-18.08.1.ebuild b/kde-apps/ktouch/ktouch-18.08.1.ebuild
deleted file mode 100644
index 548ca5f0385e..000000000000
--- a/kde-apps/ktouch/ktouch-18.08.1.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/ktouch/ktouch-18.08.2.ebuild b/kde-apps/ktouch/ktouch-18.08.2.ebuild
new file mode 100644
index 000000000000..bcd1ef9192a8
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-18.08.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a0413126fec0..91f17b84c245 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-accounts-kcm-18.04.3.tar.xz 264164 BLAKE2B 39f51d40b275b72e4ed3e38bb317fd9e3ede37c8fa1991c30b412938fb835dade8ff33c51256e3fd5cde4d325f780909f3d11d93420c21b3e20a4d1579c4dcb6 SHA512 410b9cc74abdb11287d633a7188970e7e12c21797da19e2a5595057c00e3311d916e3321475309cdad6492ae2bc6404439bc78b0e83d53702fa39dbdd7c39de7
-DIST ktp-accounts-kcm-18.08.1.tar.xz 264400 BLAKE2B 67dd9a0f98219b6c4d6b604f743676d2294c88bdfc61d61c07a79242a08061eda56d22a00e9912e9c2a5fd092c4ba20e8c2841d40fec2c33aa1e4c2f898b75a2 SHA512 c9c0f8a3325e099100904797fe637325c3f098e763a7603209286f1bbfacb9f5ae9b95e6cf94cc2b154cafe29d18360ba876b576172e61ae4e32cb703e20b5ee
+DIST ktp-accounts-kcm-18.08.2.tar.xz 264216 BLAKE2B 11a07ee9b5e6daa89ebddee6caebdfb6fc0d73a254e30e390139a6e9ed371072145fded9d3b4c43a84bae64f262747d269af2b42535ed158e32d4342d0d2230e SHA512 a7b135404c2a77fc29b281aa914fb953fa92c94db7572d6430247f93d9f03e3a8c3964a6358cca881553ef1851f49165a055a6ae03239be6740d287700aa2060
 EBUILD ktp-accounts-kcm-18.04.3.ebuild 1534 BLAKE2B ec8fb22eabefaaa23f458dd6138f553f2273b30b0c2badcd42ffc424785b526cd91a902d2577814b8c47af93be762e763ae3d22398f4ba90b919f22ea05f844d SHA512 db5a5d131242c33a778fb2884247fb48e82af0a1cc0afbd10e08d8ca5a1011e290c3a655d87f84eec1d9f1b69142ac51f49cdf175377a0512f3a73d222a268b2
-EBUILD ktp-accounts-kcm-18.08.1.ebuild 1536 BLAKE2B 982ada967ab497b18037c33b4292a2fcce6279c31aeb2bcb18a4d385be011e5ec9b95be16327091f5cc2d6400744c65ab7021940d6f81c4a88e5bf768a3e48d9 SHA512 6adf909744fffe199f984f65ea2943af3668b146b2929fc97bd79a776cfe567a7763aed5789ced0295c459d3c3b0160eb489398c83e429fa5c128631b28cac08
+EBUILD ktp-accounts-kcm-18.08.2.ebuild 1533 BLAKE2B af44f3fee12cbe17bfeae8ab14e2e70d0607a7c602216f85c69d14f68727eb9d0b5926ad99d8a2a912835a96fab5dc5b3e6eee7e406eb82b4f8a0f766531138e SHA512 f0195dfce3576756b997378ca53d5c66c5ac6274fb35bf10f39ae11f2c0a2ec4ce1b4307a1b025152c5509f98b440fb0879bdd76f076188373408bb7de08e236
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.08.1.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.08.1.ebuild
deleted file mode 100644
index c3ee1a2c42b1..000000000000
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.08.1.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
-
-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)
-	dev-util/intltool
-	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-accounts-kcm/ktp-accounts-kcm-18.08.2.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.08.2.ebuild
new file mode 100644
index 000000000000..3aef765d210e
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.08.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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)
+	dev-util/intltool
+	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 0bcc95c430d9..9281f3beb174 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-approver-18.04.3.tar.xz 37088 BLAKE2B d3120dee367a2b9f3528a62ceece05d7aeceb824f0b6a9cbd66a255485e5227e424064d1dfdf83595f93f260e57dd8f0954fa086ccf74cf4764488e6f8cca42f SHA512 acc974de146cd6d5f803c34039d9db10c28c9e34775ef8194a65a2ace1da22108fb58756a630bf825e05a48ce43f477f9320ac93a710e69cb52e53f9bed855f2
-DIST ktp-approver-18.08.1.tar.xz 37156 BLAKE2B 1d770d0c627bbf274f8d1de6a424b488ba07af99fa26aa37d3aec05aace5fa8afd677caef9182aa9d803292606a4bbf0de7c8c6f0ebbdb87b7a0a8b46b861049 SHA512 2162372f3b1a579c03b49ed48e4f669e99a751b6c95b9f68212a3512b17e2908c115d6b9c7b90ece9ff4d676e99212b61ec06e8d51100fe98af52d245a77107e
+DIST ktp-approver-18.08.2.tar.xz 37108 BLAKE2B ec7f35d1be4f61208ad9909a3b1301a57494c635d279f6dd0a3a2e015f48a2869c814a190be12a9b886f01b5f25f5f33e3781bceaed00c7d4d7906e122089e3f SHA512 5176a06d33d3387843da9b18d2853f24926f09ed2b2da178e9571a1cf299f184a93def045094b2ddd073ce400532032b2230a054df4c216777b2e186cec6af47
 EBUILD ktp-approver-18.04.3.ebuild 676 BLAKE2B 27dece05da5da88d16f3d81d4824a7eebc02cd9bbfb3cd5a16ff13fda8f1b0528e2ada5f1255c977743a1317eebcb23f081a186b85cb1a103cf477083886b7d7 SHA512 be36ec7dfa033aaf1618172cc4ce9a7a1ffd81fc5bae4e606489b063766a896c0743aba06ef359409f7fe6005fc0a0740e2ad4ced0bf00c0e6e3b40f193ff87c
-EBUILD ktp-approver-18.08.1.ebuild 678 BLAKE2B fc2e7bbe1593511b7f1e6df21cfc923160759e6444f45f511c427dd1b8b748a50adcb6aab1bbc3232aae16083d3e0e8c727c41c0bbe445dfe1b52c789f29a425 SHA512 39a4495a943b4d041cb3b229558272cc0fd8ff17be19af01c47254a2113ebc070ea7fcc6546a9c9368d7c1b1af90dedb4806561b7a92d6353f88dae0757e9297
+EBUILD ktp-approver-18.08.2.ebuild 675 BLAKE2B f0a0427561107961f5498bef2e0f07108648a44a3734c36dd151707147d4106ab6405a72cca6cacb899ac7d260bab2533a61aeb40167f91abed8bfca3c3f8d53 SHA512 edc1598b9c8f6e9a9557e976d4e7507c4112a848ce990b3c261758dfda6cc720d5e255c87064d6f7875303308197c5fe9f1565fc6468003a977648c966fde1a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-18.08.1.ebuild b/kde-apps/ktp-approver/ktp-approver-18.08.1.ebuild
deleted file mode 100644
index 58706d972a41..000000000000
--- a/kde-apps/ktp-approver/ktp-approver-18.08.1.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-approver/ktp-approver-18.08.2.ebuild b/kde-apps/ktp-approver/ktp-approver-18.08.2.ebuild
new file mode 100644
index 000000000000..d7a49cebabc5
--- /dev/null
+++ b/kde-apps/ktp-approver/ktp-approver-18.08.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 b3c967e54ae0..b24c057062ea 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-auth-handler-18.04.3.tar.xz 46356 BLAKE2B ccd7155b4ca8b42f26338d95cd4e8bac926bc1265857f9e7e748fb4ac1e327f1aa75db983bd656b45464a9e269c09f80b2649c74ee9c53660a11459cd91a7320 SHA512 1e674f484e445e244d7c70e43063ef6deccf50b4e75058bd290ca55d3ee792f9ac596ce570c16407a61fb97b87ae58077c5f9352a510541bd95231ed2cdddf52
-DIST ktp-auth-handler-18.08.1.tar.xz 46404 BLAKE2B 14b7dd390de14de98abef277e2b093be5acd87514acb5ff8e6d3e75cb520670fa795f7cde1a4806e5f097bc404cc00a9e3e64d03dc1181f8f514aaab2432265c SHA512 f591cfbc812566c46c6c4e9833673baefac5df17a4573ccef354ec395d66cb7887d457139044541a8b7dd22c7777175aa5c65f77870b0b66eef0417fbdb6e39a
+DIST ktp-auth-handler-18.08.2.tar.xz 46400 BLAKE2B 68075bb3cefd3b457d9de5089f05d4f02af98e611ab6c30e3c4a7bec41113c52efe1aa126d1628aee1b9d4d854740ca2083c85ff9db43cd04bda894c53ab63b5 SHA512 ae8e4ea62d0b929481dc659fcb9f2d85208cc19ed2dcd6d8763e02c0af87de866e3d74ad03e62a1c3d8c56b50b76770f4e5264083f51e579d79297bcbf597859
 EBUILD ktp-auth-handler-18.04.3.ebuild 827 BLAKE2B 237e604a61a6c5ac61a2541a0daa73d1afb77db4ad747305f14a8ea31cad8c443fde4249e3729f77071c95e754750e5875d5d58a5609e9af8796e31a892ca1e4 SHA512 47e2ff24b54a5a88fd2ca27dcb5e7f8f0bc76bbf78e111263a3fbca089b29c72e38c7c42fc0d0a74acbfa0564ddf39ae9ff319804879e7e8c9b8cb24cbd88345
-EBUILD ktp-auth-handler-18.08.1.ebuild 829 BLAKE2B 1e90ee2f5a17492191a56be9bbfc1cb26e394c2bf6d3bc1c57f3f5256708c0fe0e42a0917251cc0c4f4a4644380529cd56a83651923635ec9215e5cfcce15a02 SHA512 bb41447b6482491ee55f860b305d93837a1540b162285ef14a560959439c3ae96c4e01b6b894275cb11ea3beb74236c31389f67b771578a3f718788f9674ab38
+EBUILD ktp-auth-handler-18.08.2.ebuild 826 BLAKE2B 0d135a22ff3e283adf47edf3a5509330a23ac282d2c56addd7cd1f7e97b7a1a3250424212da0cd10b19e66236d05dcd52b6d6a498c42e0473c0e0bb22c222c4d SHA512 4d6f2889d35d44bccb80f93b7ccce7eceb52ac07a52d49ff72652f65907fdc3e0c85b334d0b39e0898aa88d319abe1d5fe4fa9e4622ec01cb4aef55e13acd4ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.08.1.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.08.1.ebuild
deleted file mode 100644
index 2420ddb40f4e..000000000000
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.08.1.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-auth-handler/ktp-auth-handler-18.08.2.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.08.2.ebuild
new file mode 100644
index 000000000000..73d0a5129257
--- /dev/null
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.08.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 d1186c145e03..7053092ccec7 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-call-ui-18.04.3.tar.xz 97288 BLAKE2B e4b33af35f505bd03d4c0ae6509cba9f6c0ca63052b556bbe6dde46c637b8c81b1e2ba84a0337c81de84270b6031ab20754a667d454d6ee81eba04c4c6d308f8 SHA512 837252b0a788064b186423630178aff76e446a1c192b83dd06a70a4e6c22b39894763f524f9489c91767cddd05b61a2f46bc0d2ec48fb6f216cc9c4e6472588f
-DIST ktp-call-ui-18.08.1.tar.xz 97028 BLAKE2B f7eb164e54358269ef8c5537f9289c4f1d8c1d7142fa74b2997351a0824d0494392bc900aad2fefe1a1c05c9af92205c80ca6770517ac19da8bd1ed29ba625fa SHA512 06a5d1f9a5c17ee67e79e52147f3eafa6c0ed3fc7a5a99ffb2dd99d10115afc3d58068eddff688568c5d84cea7bc19a5d9b20837de68d394cb6d6a86c044d95a
+DIST ktp-call-ui-18.08.2.tar.xz 96996 BLAKE2B 3e1d3b2f4410fb5269f4a157a1e0e261248313bb5db53fd20953dd00fb08927f9aea6943ded43c2d92fea46e78160fb65e4b8900fd32d958c61c722817908b49 SHA512 5171d68b68a0d6608ded3a6d0f70a7ec287e66cbcc319150b4f6a537e45f01d9d9b0f1e591ade657f723516ae471ea244ab0b43d4d69dc3c68f1a2e8336bb9a5
 EBUILD ktp-call-ui-18.04.3.ebuild 986 BLAKE2B d96de4faed6b79fc39132c4b39f7f747d3295e6a8e8d6246e7470717b8f1632f35a52e9265857f260c6f3776209b281af8dba8fedef29bb8a3733dbf7fa67fe0 SHA512 d9d93eea87d6b24e113835482a9a48af0e0bb24ce6d6e4ae5aca97bb5506ae932624931df319240a586586eef89bd07c79d0b01b053b1b8d48ef3d4c577ee385
-EBUILD ktp-call-ui-18.08.1.ebuild 1060 BLAKE2B a1800bbd1caab8d972aca1f5752ec1ac7b4d8952940d1f1241cfc2da76f5893ce55f0981913d6c8394d72e9adcf5747c06e14a61c18a72374941bbbbce4f93f1 SHA512 ccbd6bf722b8e2df7c57c2268517fd44d655b5a2f9e3d2a53631c33d8e8d2162b7247addaedfe969b73736db22d8a8c3501e3595c65fc7f033f26b1a2bbdafc6
+EBUILD ktp-call-ui-18.08.2.ebuild 1057 BLAKE2B 9f993daa19f58d2a18752dd167ae1373db6d701f9bc32e7d76bdd568b7dfac8225ed3fd3379727a015b7218118c48a8fd78144eee8e713f12dbaccc899d30ed0 SHA512 98a21dae3b4ee37339ac2dbfa4a14a279164473c2487c6b27203662e43709b8b5dd4019280264547a114e4b5b491136085b58d981d76c3f0e488d6397854c1ce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-18.08.1.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-18.08.1.ebuild
deleted file mode 100644
index cc491cfec10d..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-18.08.1.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
-
-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=""
-
-RDEPEND="
-	$(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 kiconthemes)
-	$(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 qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	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(+)]
-"
-# TODO: dep leak suspect
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kcmutils)
-"
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-18.08.2.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-18.08.2.ebuild
new file mode 100644
index 000000000000..d8cacc85baa5
--- /dev/null
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-18.08.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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=""
+
+RDEPEND="
+	$(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 kiconthemes)
+	$(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 qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	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(+)]
+"
+# TODO: dep leak suspect
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kcmutils)
+"
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index e7f808d209eb..5dae284e89a2 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-common-internals-18.04.3.tar.xz 443664 BLAKE2B 2c66f2a401981675b8b393a2de2928cacaa6f1929b3f5aef5cff681a9b6abc30de8234447c35cf4a33fa51981785241848a4d161a153a98b9db2e300c849f15a SHA512 b405fa103fab1a366497ab19d5fc60bb8d939bde2119e50e43e240fa7066b5cee5647396b1b4ba246c9c82bf5bc876481c8ca586400613a410fae08735b120f9
-DIST ktp-common-internals-18.08.1.tar.xz 443920 BLAKE2B 9626f913e76feb172685dd302482bf4e118f1d500f67e85c80980c196547d40d59ae87f011cd9f6734631b2463d7a03a7e98185473f6b64475bca6c7b22be1a2 SHA512 7f7a21bb37b33a2d98d3795cf5df14ae1f5a25f0cda29f1db1e35038b7017268750ad577c7430391b1cb385fde105f3aeaa8766979a2c33f732a99dd2b11ef27
+DIST ktp-common-internals-18.08.2.tar.xz 443796 BLAKE2B 21e437ffdad06717803c969095632147942ea64afcaa201ec811641a1eaa843db732307cc373ad064484aebad0bafca571db905f87b18ae9f336ac32724ed20a SHA512 6782522053e7439fb6b909b3975a42dba8f17de80fa38db49afcde2009b4c0562c4d5aac1ddb16b2087db5ab151ba43494b9d5c85a9b03725cee6ad76c7b40a0
 EBUILD ktp-common-internals-18.04.3.ebuild 1575 BLAKE2B 40d89f97145068b5b6e27077941ba229f258698a3b05bedde6c966d22ae5ed39801ed4310d6dfbd736578d9f5dc8853b671b73d7dc8d50f65462c88c8e483844 SHA512 11ec9de3d9940f861e4eae9d3dcf1cbe4291d108f414c7a0bac0c1362cfc3d7831cd0ce7cd1ce5ecef8d7f58b01e5245da6e10cbebbde3b3ef568a83d99e3d60
-EBUILD ktp-common-internals-18.08.1.ebuild 1577 BLAKE2B 13d5904f8057dc070c46a30faf664df43a09f0a27aa60bb526cf8c254c97ff4feaa3741531888c54591acd0aebe1670934c08e2f24fc63348e677ddade7f0abe SHA512 883bdb30443d1b8999bb0ac2d984224729f2baa5f572824206da23a247fca8a47d46edfe8987c1dfaf1ba11065062c9b071a2fa825b5ab97a21245448bee9d23
+EBUILD ktp-common-internals-18.08.2.ebuild 1574 BLAKE2B cf172b367094b23634ff8c4fb662e18411bc532fbe33506d991d94711cefcc356e15d098fe04b67029f3f22a5af8c6ad499ad2bf3e390d86949062a436986f1b SHA512 75a8c40eca0b446c91bd543033ef3fb3b8b688aa5d0e3f61670a07ae7dce54d854bc092173b502dba8125a7e02e901550c9435136372b02501871d78eaf1ffb6
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-18.08.1.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-18.08.1.ebuild
deleted file mode 100644
index 6325d2580a18..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-18.08.1.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-common-internals/ktp-common-internals-18.08.2.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-18.08.2.ebuild
new file mode 100644
index 000000000000..847ebb20732a
--- /dev/null
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-18.08.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 59f88b38d01b..f03854ef360b 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-list-18.04.3.tar.xz 146956 BLAKE2B a0eef7d446ec629d3b5c409dce828eae70e248e43013abe22981036698e2695884074fc916366a6fbf23854abf02721be2cca094067eecd0c87e1d19e3de4b5c SHA512 17fb11cea4f20e529f6d9b27c1d79a5d4a876d6fe2a5c240b7aff36793637aec227e23caf3b37ff247017b20244266be2d7a7f67fb4b5bd0dd1e1672ab2276cd
-DIST ktp-contact-list-18.08.1.tar.xz 147024 BLAKE2B c86121073fb17cfb4a3fc491f622df4590e874ba38fc87174893f54168a099cdb3fc85356ca6a033a68c5fd99db0a3e127c6c89471eb719c299bfe2a1cd764db SHA512 9a54ef3b6751756ee289f04b14627ced70ad65f756278583fc19b6de24fafd9aeaa16094fd6c83fdd7ea2eb288eba21a1ac504dcbffafb3d61e82e568cb18e71
+DIST ktp-contact-list-18.08.2.tar.xz 146980 BLAKE2B 5c604eaff598c08e063145059075e25c9cab022aa98a7041725d29601f298dad464730e932283cd252e7ebdd930d41c030944981ce4b7d5696e1d6d6c243065a SHA512 dd0de3b6a4b3a1687738c777ebc18faf172db5800cfa09f504426ac1c15632d939ad598a0a7ac64393f949b189b2ef6eece75f09923c7d44e5fcd7d02c646852
 EBUILD ktp-contact-list-18.04.3.ebuild 1032 BLAKE2B 81c466f9879a9d4cc03c073c74ecc85ee7787a4ec026dc9ada56d75102cee2d026b8c3235d905927fce3c3e62edfb075c46b5053b9482ac064bd45449e22bacf SHA512 914e0ff38721394f9b828072c806a7884c32f9ca93e32196566b0b85025db90d97e4be207b4a805fe7afb0db9ff411fed4aca561a99bbb35ed68191f54751239
-EBUILD ktp-contact-list-18.08.1.ebuild 1034 BLAKE2B 56bc019c2d9917f22c97d7590c00e838b817369bc5c19e3b7fa94a695a5d2e36651b677f6461571a331a9a38e255f606e22d7033a160c3b347cc5a526095d3ad SHA512 7a6442a27d413edd477ae3f4463d300a6eff463df6b5288ed5cd0f16d5840472c10e78679706215a66ba55464049496019fa808e415befe2c885d2c225be7186
+EBUILD ktp-contact-list-18.08.2.ebuild 1031 BLAKE2B 41b86a921f050407a4689aa69340e690f8fa1e60d900decaebf48992a1584f8a4d3deffff3b02e082536cc93b3809ce0dffbe28d1c518b8a5d31fe6d7f83265f SHA512 f3448b6406ccd9ff5bdcd0e743e6ce2674c5c8aaedeb37ea2ce5df8d3be174bf072e527b1961a02279b10ae73cc538bd073b6023b21e1e36747d3f81c773fdd0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-18.08.1.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-18.08.1.ebuild
deleted file mode 100644
index 93ce9c752242..000000000000
--- a/kde-apps/ktp-contact-list/ktp-contact-list-18.08.1.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-list/ktp-contact-list-18.08.2.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-18.08.2.ebuild
new file mode 100644
index 000000000000..23ce063fabda
--- /dev/null
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-18.08.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ad020d0d8746..ba79733780ba 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-runner-18.04.3.tar.xz 42700 BLAKE2B bedc758583266aea0a4ab31b532eb835c0b13cf7eea8b369dfbd7b24b9f76d9bad98e5ba936759d5f3f9e0f653b35e84335d10aa47a82613f1b02e89dd43105f SHA512 7b775570a4179b4a97c162e0e2b3b76f932394d527809ccdbf6bc2a0f1e4d700c2281a768145ed3a90ff7ce25430a267ad1bf4f9d7857a8b1de3d7a94bcea93e
-DIST ktp-contact-runner-18.08.1.tar.xz 42792 BLAKE2B 6b180d172397b0fbc06e990322aa769aa3e347a4746eb5802ece7bfe56f2c5ae78630a76d1d8acaaee36ad0cad7d3ab7b7d7f5f402c9001473eb0d1c4423cc97 SHA512 7b7a9c972d05d6524b1f32b011d3ce775c13a7917672ec988c92d19ccaf219b85dc91490a9c1033812b8d16a3bfba86455cd581f4689d300382fc81acaf2bb87
+DIST ktp-contact-runner-18.08.2.tar.xz 42716 BLAKE2B e0f4dab75eac1d13fc779714cbeac45aeb45377b9caacc1c6df6d183dc556dc2c2adfb400edb20e7d7dfb3633e3bf4282bab61305b66d6ce93f315643c4a1ea8 SHA512 e8f207413a0dc24d6541134c43b6ffad54435981c6a0eeb242d451aa6f69f028359e407e8a6e41ac779cec1285ec876ec9c7a2194fc43cf1cd70000b9a5fae37
 EBUILD ktp-contact-runner-18.04.3.ebuild 602 BLAKE2B e61fc57cf35cb8129dcb9c034316c2ac66fad4b4e91d7055cfc3a9cff345b5a22706678ff35487d660c78f1f861768abe94a079e3ef0cca103be7e1c2ee2b10c SHA512 28eefe0bd03dcffbe5f6707ffc9b54616f795434fe9d6a932c666f203c004973c41bf8e71b0fa57aa2ff1f346027bddf75e61c6246f22af36970c1584ad91288
-EBUILD ktp-contact-runner-18.08.1.ebuild 604 BLAKE2B 6622ba50a4d80fc7b4d1d363ea4c70784959f9a4d7ee0e14d40ab895acffd1d9ee82192723d1aba091c0967cb153efe696835c1c3bf638b2416cb1fd80d839f3 SHA512 5948d7f4be6801e6f4258d79bfce0a59fd87de8a0635a95fb27d717dd8dfcabf99ccf89c90d37c43dfcb7f8a3175b73aeb5dfbbbec9d0b143e28bebdc24675ec
+EBUILD ktp-contact-runner-18.08.2.ebuild 601 BLAKE2B c759075dba061f823e18c15aa6e605d5e05bace225be03954c9dcfefbd1bdf8ccd8184da86fa74886967853197abebd351d706fc13b40f413ce656e21edde1e1 SHA512 e3479869c86a46604368cd3ce642c67bc9d04a4c3588988de8d9736ac254ebc0b1bb62446bc431f542c1f9bccc93a7450a16a0fafb5902623e9e8fe3219e093a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.08.1.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.08.1.ebuild
deleted file mode 100644
index 9aba85ad01ae..000000000000
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.08.1.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-contact-runner/ktp-contact-runner-18.08.2.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.08.2.ebuild
new file mode 100644
index 000000000000..0f5fcea8dfba
--- /dev/null
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.08.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 b502c000a1ce..e2715dfa3518 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-desktop-applets-18.04.3.tar.xz 43124 BLAKE2B 53af20f4e3a1a51aa09b3dd8061b16ad964ddf6efec4bb7982212e7312bd2cc07cdf5265e29e900e7e2aaeb77ba8132031ff331a0b5090f6f20819655a7a8f14 SHA512 865f8f983f7434f32fa8d598c815454ff7cebce935fe9a72e35173b5e560aeb91f380e6cf60441f57eca7251b5fdecf8b5e7d0fceef289136fb91dc01750eeb6
-DIST ktp-desktop-applets-18.08.1.tar.xz 43252 BLAKE2B c05bfac51d02bdd3e0a44d001b10b096b2882c32549059826185aefa571e1eb49520700369a8f05f32d6e3dbf1179751c8c054a48ba33c1ab405fac73e6d251c SHA512 7a7fc25867c944b3c9dbd43e6e35db9ab869a3731ebb35071a5dad9f71d5091ead0f806d1d2b812a9cbe4d14c4b6fc3e177e5d8338f7081129f78d3b0c8a308d
+DIST ktp-desktop-applets-18.08.2.tar.xz 43188 BLAKE2B c2d73eefabbcb4850440e4372d79eff9717ee040e74b88e15a6d568b0c62bc4b5ddf3f7f25a02ad83a52a2df1ab649413c9585d07c59a85f61d2d8c7aa46128c SHA512 c1b222ded0200b08e12104f8230a6bc298c6893ee2afdab7f6ffdf6aa8606d2467430bd195937cc0d3d5f61bf123e979f165e9dfb0d9a71f6a2d63dd48d43304
 EBUILD ktp-desktop-applets-18.04.3.ebuild 572 BLAKE2B e2dd4ee48db45d71f005e75677cde0fb38304368dddfb448870ee5aeca7a68ef017d45fe215a8f6a264390a48747d2c62b93f45527b1e976b2ad0461343c7f68 SHA512 2da8ae5261b2abec7f5286e308e31a048a2d794b6fd40071bc192401dc320ed1d87e78ba865cb7496b8c614063e8f557c7c097abf416a6ca4bfab962636d2eb5
-EBUILD ktp-desktop-applets-18.08.1.ebuild 574 BLAKE2B 1851b413a5b983170f7e860ab060b37e568045536683a592e487b5809d114b88d21034823ea822ca28d23756c6a1b7d84c7aea11e3169b8fe39186511c453b14 SHA512 9be0e929b6e3875531784f3c6e6d396ad5f1d529570f988d11e1e225329765b20ced20117b8e0bcb44dc16347b27843e665010a76d45e23a8c98b26de2639e53
+EBUILD ktp-desktop-applets-18.08.2.ebuild 571 BLAKE2B e205cd27cebed4fb8ce9018ba3283def31ba284baa813fa5c05cbbf1298ee2f17b2879e3e91719c946a45faba42be310fccd1cfa79ae5da91bf9b56ce405c7c7 SHA512 5f46385c411246b3ebd33fc92a2ff7752a41c7fe9f05cc6e73feecd8fea4634484439aa09686a7f771a84ef2b50d2d7f68029f188f984b9c1faa073350995de3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.08.1.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.08.1.ebuild
deleted file mode 100644
index 71c40a130e42..000000000000
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.08.1.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-desktop-applets/ktp-desktop-applets-18.08.2.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.08.2.ebuild
new file mode 100644
index 000000000000..8426d18576cf
--- /dev/null
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.08.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 2234d38c6f42..2b0c212c63cd 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-filetransfer-handler-18.04.3.tar.xz 46224 BLAKE2B e3882799897df59030f3fdc841c5495735c1531cf09ec4e98629e450d77721296c2cd28a4357411b0e13ce2faf2631fcb75c93c2ca2a0bb71899ed68adbbc6b2 SHA512 61410a03d2da650f2d92dc734e35546d47c39818273be6a49057570f2ecfbd06d58b67d05a88f5e8df7ad0b34e608d8dab64d1aec716d7db8d699d68de190204
-DIST ktp-filetransfer-handler-18.08.1.tar.xz 46264 BLAKE2B 3bc34f901719b520b600ab14d17f981d223dcb8e89793be230912e465020658eb911dff2716efff7af94f958482b668c59ea0839f55867419f06123fab2ff7bd SHA512 0ef4dc546ca6a54e6fdaedae3fdfb3241b230d5e0a346239ce5ec913e89052690c5a080f33c1eed1ec3c340e694eb86fc69e27b574c03add21dd62056778d664
+DIST ktp-filetransfer-handler-18.08.2.tar.xz 46220 BLAKE2B 6c58d5dac72d4dafb15db9b852f1b3310e74647db3509e69e72d0f89f3a471f2ca6923bf03a535c9eb860a94cbfc9957bcad1ecce3422777b1649c946a14796b SHA512 f2da1fa3b279578966a2f6e234ad3e815e09b159cdd83612e63ffcca6a832cf3905ff8e7315e7342c9468501c0b89a3be68bed63ae3f740841d832a05c61f897
 EBUILD ktp-filetransfer-handler-18.04.3.ebuild 618 BLAKE2B cf226ea7a2f1f229bc6d48fb99dfb341fc1fc8f3f5fd8fbaac9c21ecf0ce7a39fc1abe20a65e799517036ce2bf158daecd52428b6905d31583ab422cbf46e89a SHA512 f441d634b4b082e5456777422ad0c423d5f5931dd2b7f3af04fccd1fc766989244e4427241bdd1e76841def3a1f32437a6833897d8dfa20de1aaf4343b3266c1
-EBUILD ktp-filetransfer-handler-18.08.1.ebuild 620 BLAKE2B 593dcc7dd236df4297f96770b92fc759329eab0c7e6489961c47e2fe9748eed796380e92a3f47063c0d67b05fc36d042b818938508c8fcb617b23ebeec55b040 SHA512 ff66dba93e4ef81b2d53e34865dba2ecf9f517a814134bc67cdd350e68adface3a82815eeefb5edf2c086da89b71dd87c25969b2c8757e8b3b68f559fe7c366b
+EBUILD ktp-filetransfer-handler-18.08.2.ebuild 617 BLAKE2B 93fd6b3ffc8aa9a720007f9434f40cb2b971ac0cbe33c804db536623135d900ce25e6925c1683a4568b3caa9e8663478d27a6a59baa8c6b64b710e58b1620bc0 SHA512 ae122f3ba295062c8997ef55b251c92a3d15617724220a84cae6d395853914fa5fc20bbc2606d8350a59ba780ea68967f03aaa1adb75c9b4afaad195a19c22e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.08.1.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.08.1.ebuild
deleted file mode 100644
index a8e607bd7257..000000000000
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.08.1.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-filetransfer-handler/ktp-filetransfer-handler-18.08.2.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.08.2.ebuild
new file mode 100644
index 000000000000..5ea88316f8e9
--- /dev/null
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.08.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 7a9b36f7ced6..a210b531f6e7 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-18.04.3.tar.xz 94540 BLAKE2B 7c6119a638ae191407ff6ce8250365e177a7fe3c48edc1a8a20facdc7c8c79f7d10d68d1fe0bd587b433f76ba4a617ada28bbf59d90351553a12267f6cd552e2 SHA512 8fa78a3af4a17e345ec6e4c096ba86646cde8e4b67be847cb61ca3d470fadbfdbabdc24d3c4c61fb4a9f98817ab02c5d963b382b9747c79748110f1e24022fe9
-DIST ktp-kded-module-18.08.1.tar.xz 94700 BLAKE2B 2955279164ede2621e775cab81312ffa1914baff3642b2b056069deb0f1542ca6529e27c7ba365cfa860dfb3bfadce31136c4f78ccfedbda072dac8f1bb1c3f4 SHA512 8b32c6a2da427eecafdf3e361dc1574cacb6410ef5cf7bc86d6d5fd752572a5245c5f2c56c5b9ae668798f0742de6b90736849efd792253494e008a764706c23
+DIST ktp-kded-module-18.08.2.tar.xz 94656 BLAKE2B 7ea995f9687ab8e26ad5569ebeb7e636e9527c572633579c2f591528787097c2ff043587307bec3623270f80b382bc561967a7f8f2536cd92b73e5cb294a7186 SHA512 7b48ef55ece0c0e945b52ded48c81722fb9d1c004409658c32d8bd671e141f4e48c96543ee8a141de795f5a02b532711f205688d6f80bf8c974f371cf305d2ab
 EBUILD ktp-kded-module-18.04.3.ebuild 977 BLAKE2B ff58345e59fac7e503b76fc1a3a290c1447d4c3791a9227296749d90b0e0d23c6ba689e32ff2623298df2f0ea3eae7d83562c6ffdb693b8e19ce94465f660807 SHA512 1a911854ecc01b8955542d1a0c0e416a23cb7455b06d0840371d79a27f3fa29418f82f52b86656a037832b2b09b05797eb8c40a23c5b5e4c7bcde0c2e35e519f
-EBUILD ktp-kded-module-18.08.1.ebuild 979 BLAKE2B 62dac52cf5e965eabb275e915d898a86347509755c7414de327027b249ce23324ce34b5f9c48eb50c23d11b702241c53a8d955f3efa440b2985e5175f8a7eb4d SHA512 23bdc7544d762b335a2f0b41538bd81517338570905d1019a4f2f7d9790f73f44a6b763a8847e592e2cdde9188d0f97839dd683c6df0bc2a7370e8680edeff3d
+EBUILD ktp-kded-module-18.08.2.ebuild 976 BLAKE2B 3cabf1b0da0c9ec4dcb778fd6ad48c303e8f8d19e796500cb54e7baed7b9a0da8108f861fef51a39e1cefd74dfc86466d41b1286aaf368bcb808744d66a7da8c SHA512 dea9c3e29e2b0112fd3687411de553e1d1d454b1d1e472ffb750b4a10d91ff564b79b7e47bb6743b47f00646d2dcc2805463c18315ab9b5f1f4202a27af6d334
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-18.08.1.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-18.08.1.ebuild
deleted file mode 100644
index 6d59197ba41d..000000000000
--- a/kde-apps/ktp-kded-module/ktp-kded-module-18.08.1.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-kded-module/ktp-kded-module-18.08.2.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-18.08.2.ebuild
new file mode 100644
index 000000000000..4bde594adc2b
--- /dev/null
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-18.08.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 cc09ba3a0fed..3f0480b61bad 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-send-file-18.04.3.tar.xz 28800 BLAKE2B 8bc11189a37537c073338c84792374919242e64738440f63cd47ffde61a1b8764c3b8487054e307b810199b62c406ac559717e39661d5a125d88265eb64f94c0 SHA512 a0644f8d0e8bd71ff29a60895f2e28fbf9dd80f82f208930fc816b358c953009bdfb8052359900476446129f1bae4be71b125cd50f335b432c8857b396686fc4
-DIST ktp-send-file-18.08.1.tar.xz 28868 BLAKE2B 1ef39519cfec192938627fe52392e7e6c8cee5142e20c9b914de11cfebcf56462c6e466db5b5ac2c2d2c45bb19a56729e7d5c45f37c51f4139ba419575ca33f9 SHA512 c9b15b94fba01259fcf70e3b05de82dc1d6326581d0e0cc389a6f7d88090d1d1c2fe957aff1d08c6113be98c103d9376e2e4bccef278de889088a479b166ffe1
+DIST ktp-send-file-18.08.2.tar.xz 28816 BLAKE2B 7f8c15e9b77eef8bdd48649ab0b6e2771fe2d7333eab7015e0cea53b4a863e47bb5a0155b9bb0ebee5e966e278bb35bab2e39ae720e3e027370c073d1b4ad35e SHA512 a261db011d16faf35cc9817ea22977cfd118ec75f97d6e31f023ab2949a315a15dcfe4843390fb8198c10781399f8ad5a63da6a6a6c15a8d09da49ea5eca8968
 EBUILD ktp-send-file-18.04.3.ebuild 825 BLAKE2B a70d898988364281be37568053a6177286bb6156b18031a317e0d17514a40f527e3dd3f104ec3fcfea6a3057f300f9942b8ce8e2619cd05d250dcabb103294ca SHA512 93249abba02c9fe9d9b9e9d990b4497d4cea760dc8c41f0eda35ee701c5a64818bfa5ce67f5e0d2ce082309f26cc53556cc79508c84ca9ea6313a8d0700172df
-EBUILD ktp-send-file-18.08.1.ebuild 827 BLAKE2B 7d38262647862837204cdd934c6d57f4982cdb6150814a81d839b8efa2172e680e5c609658a2ad8517c8e21368fc68df5104e51763ec6ba8014d48e103c2e28a SHA512 091f5ff352e87aad765423053b464eacac61cbefde4cbc3b095673a4657292516673fd4bd52634f594ccc25593bf8409b5e1571cf5701265e639c6c34abe2d12
+EBUILD ktp-send-file-18.08.2.ebuild 824 BLAKE2B a662f6b809d1a9ed9b8918db5898486850edf5edf5c4cd93100868e4a6023d36dbad173b0d280189666f06c31dd64f1f7ad33281322e419d416dcdce65a7b03f SHA512 7cdb3e1882102b778267ebfbe93e41be3313874aabddb04d38dd41488cf6c8860e33936567a29cd637b5e077cda507d5112e1f4608429a48c69e4646cde69011
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-18.08.1.ebuild b/kde-apps/ktp-send-file/ktp-send-file-18.08.1.ebuild
deleted file mode 100644
index d297bb178cd7..000000000000
--- a/kde-apps/ktp-send-file/ktp-send-file-18.08.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
-
-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-send-file/ktp-send-file-18.08.2.ebuild b/kde-apps/ktp-send-file/ktp-send-file-18.08.2.ebuild
new file mode 100644
index 000000000000..eb1c70033e4d
--- /dev/null
+++ b/kde-apps/ktp-send-file/ktp-send-file-18.08.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a683a82dcc6c..6cf57875b889 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-text-ui-18.04.3.tar.xz 469688 BLAKE2B c1e43957d1ae541eb3371bbcef1da2d876e00f6db932861ca8154d448c134f05a9a4b2de1fc2efe791bddb7bdb0aab4dcf5409ba7f502fc07540bc4ec05d6d51 SHA512 b4b620d3a25307c027cca61fc3b814bb6f511feb10ae3baab176a9c0f86a4bb7101dc278b278dbaeb0d6556bd6fd7c42db3ac96c64178ee5c6db3ce47740c519
-DIST ktp-text-ui-18.08.1.tar.xz 470236 BLAKE2B 9305e281cefba730dc134c9473dccc92485b84cffb4d8f2e43a7abc60e5e58924f880e21254f2405d3f329299fc90b591ef195e465c26ed04bf7f828d9edf9e9 SHA512 50bf58e1a68b3bf6cc1ae280521dd54bebd2a47ad3f45005e4550bebea2b0d4ac46c25668051c513022bc8964383a89e69f85796392afca4c7eaa5b0b91957ba
+DIST ktp-text-ui-18.08.2.tar.xz 470000 BLAKE2B 130ea1746088ebb007ea6efb964721383626fe996f37c24b902bdc117e37fedf0462f1f4cc7c68c2b81c6ef5635641cc936fc616540a868dece908cf4597fec3 SHA512 8afa9ebab851b29f8b6f443a49a1c3bd82aaf5b927319fbb498ba47bd865baaff2e859b9c8b23d2506c4eddd9f62d144fc1f0852e7dbb6084bd5eb5bb461db7c
 EBUILD ktp-text-ui-18.04.3.ebuild 1487 BLAKE2B cde9527f6ec6e11917ac0e4c0f747658f3f680b313cc969ab4e839682849cd0d93f4419e96067838901bf127b8c114ae2956bf344c872c5e8796d3fdd5b8b4d8 SHA512 562849c9bac6ed0c34bbace3ddeccaa36cfed9c48ec957640d2fdeba30e6ee64ee46a67c9e689ab9100a20dd7a1e00a60ca88c73b3d37550ac1901e19dd32884
-EBUILD ktp-text-ui-18.08.1.ebuild 1489 BLAKE2B c36a18cf0d96100167035bb215b826ec98eb208654a2946cf170123cfd1cbb6c59cea679c5ba1288120d2608308b9809208d4a6d3484dc1c23840d93fa7049ef SHA512 0a64956660b2fe4212400ddf29bd69dda53cc7ad1c708181319d68b283fef21acbd1cf3801b0832ac6eb0e610835afd69651a8aace292c166ea17c6e0f8a5cae
+EBUILD ktp-text-ui-18.08.2.ebuild 1486 BLAKE2B 2224766b83116b4ad06c2a37fce4237739d7eeaf222a31baa0149274e7da3fc75c39f36da3600fab5e694e580b3c6ba2d7e4598ddc7baecc96298aad8d5e5e83 SHA512 4df1063a7b4cf87546f85796c015c115858bf6e13a62912793b79589669d4f23b5d7e16e7fd391043e5078adc1eddab36bdb99a292ddd055698bafca3a50615e
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-18.08.1.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.08.1.ebuild
deleted file mode 100644
index d8d737632890..000000000000
--- a/kde-apps/ktp-text-ui/ktp-text-ui-18.08.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 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/ktp-text-ui/ktp-text-ui-18.08.2.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.08.2.ebuild
new file mode 100644
index 000000000000..81ec19d08b27
--- /dev/null
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-18.08.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 736a1288ee2d..94f817614b39 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
 DIST ktuberling-18.04.3.tar.xz 32797016 BLAKE2B 92d52365bf712d45fd2a6195eb5e9072de5427952ae7b268de352acc85b5cc25509891835c5ded1bbb8d81b743ffcdf589a2dc16956ef68a6854f7c14d0ffac4 SHA512 7f8e26b681389d50194d85c08a88abce6d96acecf8b668e966eb4a61bb9129f9d9ebd667e3021eb83f681bdf5476a0c60fdd4716f083456be5b5d0e24c9a57d6
-DIST ktuberling-18.08.1.tar.xz 32800416 BLAKE2B 5c3eebadc550b477f16868ff57566eccb9be7cfb7150eb811dfcdf7e10109816884976d6ee101ceae2b758da18b2867612f196a9a88d18e0558dc16a89703830 SHA512 71381b04656f15e1c9409bfae15252f4a8ebe8c6de139d432e88ab23f942d8662a07dfb1d93901097c4d83227229e5becdebf1da10935cbb830848dfe8d4b18a
+DIST ktuberling-18.08.2.tar.xz 32798608 BLAKE2B 42d446ed9d17d703aefa22be78c113ac442ba924476d56c7d20ae80177496580583612f9ba052577f88d7d01739d7b5fda35a3000e6da371f5e7313f6cc35a7e SHA512 59d2d6b212973e7006d3dcefac5a6ed776bff2eed1e2f21b694429666c34290256429c964a288e3c03af8b0281f487ce27cb3f6f54b6845c2bea04e6b6ac4e4e
 EBUILD ktuberling-18.04.3.ebuild 975 BLAKE2B ec8f1d47106ecaee3fb5fb1d87a30a65e0015031bd4c0721b7038e9a7546b230e3e68374f856bc6d9e19820290c66cfdc401a4e3187952ab92e05664a9453f49 SHA512 4a8c6fd5a2492d094eaf7dbd351630b8224ba8529d16a026e9f99883f3f0aa4492372c2f14e2d8cf12cf47fefa4a36075c74b49c4ecb5de51e437a490a68dba4
-EBUILD ktuberling-18.08.1.ebuild 977 BLAKE2B 299bffd77102e299e2416972dddd86fd96e627e656162b2621c2505acd3993562868046c11f958cb858baef5f4e833bca0ed2b408042b17eac8c17b3f66ff7ab SHA512 10095f2c1f4d4e021815fd8d72d2dc2c5be57adfa67be12b3153225db93303a0d38263650880a982f436e1a13999b166e5eff28a149c79c830f96c98ec1084b3
+EBUILD ktuberling-18.08.2.ebuild 974 BLAKE2B aa9e6937b13c20af0e96a041133c529692cecda0159006973ca7ab7f6b76d8f05aff3d5c5f5af83446fba559fef5fc15eb25b5e45f29353d7ffde6d14f047ddd SHA512 3746e66f68e4d381a1dc11081276f4d8df9f13ecb3fc0422e0e41dc3d4452bb06fabb3d97aced36850cd8a4e7aceaecacfe9e58b39fc594c453bb78f67b9e21f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-18.08.1.ebuild b/kde-apps/ktuberling/ktuberling-18.08.1.ebuild
deleted file mode 100644
index 6f603a18c561..000000000000
--- a/kde-apps/ktuberling/ktuberling-18.08.1.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/ktuberling/ktuberling-18.08.2.ebuild b/kde-apps/ktuberling/ktuberling-18.08.2.ebuild
new file mode 100644
index 000000000000..2af7e0f064aa
--- /dev/null
+++ b/kde-apps/ktuberling/ktuberling-18.08.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a305e3ffa155..ce0e4e4acb55 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
 DIST kturtle-18.04.3.tar.xz 1608732 BLAKE2B dbf1c0ccf1b4c0efeae57d0c538b9bc43e2ce82b689fa862e7beece84a504276eb3ef7c41c8d8ee46d156dfde537d13cc804438903590490099860e80e5c5b82 SHA512 c4d3a20b7a399f4ffd2e8ed6975df6732fe33fe945694a8eb94410c2d80923f3156d7cae1658edbfb48692ebf86fd19c17040d8fbda877c86d12e939eba98ec6
-DIST kturtle-18.08.1.tar.xz 1608484 BLAKE2B 18ff07c4b6728041cc1bd636fe29c178935d182344013f855102c68f579aa87ada6c1458fde9b2298761a6da3449c8e6280dca9bc30494e07155954f18e1119a SHA512 d33694c95676579a72c4065009f86f9a4aef9576057a4215267b16d5a37ba2b1d57e103bc9b3824dd5691b63d078e964291775a067f85c74d542b3654cd276a7
+DIST kturtle-18.08.2.tar.xz 1608196 BLAKE2B c82b6e538821092e35657c4479739d9139c706cbf0b92f04c27a22ea6ea314d3f089fe60b95238c81505fee2a65e88ea540b3699d24b3957aced5456630aab57 SHA512 d9136d5aeb7c9c32f96b235a1608a2be71c123a9c745e3db5cec53fa647dc70d020bcb3d96692324f9047f7e579357a7aa030791fe6e9d91ddede9a778528870
 EBUILD kturtle-18.04.3.ebuild 843 BLAKE2B 0efee60c3bf185f01be78b64a97e73d630ac9d194c4211b9baba35551de7994e120832f6b4615490c678029b5be3a715378c76d2de1b913ea8c82279a1c496bf SHA512 e61ee8e395c453417cfbfb1cc7f6f1b6fea53b02f3ae2046700f42e3e5129e9cf081cba65526f358c7a43a3133bd3997362a2be5911ffadf1256d59958f0b684
-EBUILD kturtle-18.08.1.ebuild 845 BLAKE2B 0e90bf87697adf33bbaa56b35c9b17d9a6ba93c1cb97426bafd41726539ff3e8770f9864978683c720d59e642b5d3ef47f302d697ae57184fb8b1859018f8db6 SHA512 a4c17a088109a03edaf0f9e951a1dde4025ce91a5bb483c62247787652dc244efbb8d0042ecc7781324240a1808ab5ce540cd7ca8cfdbf1c136b37599ce8a3ca
+EBUILD kturtle-18.08.2.ebuild 843 BLAKE2B f58d4c3b9555683419a3fe6013d0f99d565cb665f8ab9c6edce9831a206ca130c64c124b12030982fa75c4bdad50e19209dccee6b0a39bdd11d6ef71e400c30e SHA512 4e13670832142ab4f62527c83493058b84b2f5c01c20075cad0900e70aa538ef57b602b37620e7129811efd6b7298371f9100ee46bfd5dc1ea6597f0ae95f802
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-18.08.1.ebuild b/kde-apps/kturtle/kturtle-18.08.1.ebuild
deleted file mode 100644
index f1c34975ae1b..000000000000
--- a/kde-apps/kturtle/kturtle-18.08.1.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/kturtle/kturtle-18.08.2.ebuild b/kde-apps/kturtle/kturtle-18.08.2.ebuild
new file mode 100644
index 000000000000..373a6e397356
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-18.08.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 fac1d362b6d9..c88093d506fe 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
 DIST kubrick-18.04.3.tar.xz 308328 BLAKE2B 544061d358993a7f924440b1aa1b33fc53fbcbb331c66072fc44c5a5d8ce7f29c8737cf1f613e43692271b1984a72b236ab53d3f6e942e7f3d991f83cd024e46 SHA512 a2bc2bb76150a60b7e85173899eb112eeddc91748c412bd2f2281d72ca83a6b418edfb693d4468de125ddffff280a9bebd3412bda0a331b17ce494c0b5610d57
-DIST kubrick-18.08.1.tar.xz 308392 BLAKE2B 0a75afadd71b1361323c9791770d8e89625707ebbf79f991d911a60f44414a315569a25bf761958f8aaa89945fb50d1eb1ec9662de56ab773f23e066a0bf27f3 SHA512 37cd3bb1488f3cf0704010a3b9d10ba8861f3e258fbab63703b255e999f326899ddd5c50bf8409598ebced62e532105bfe541f5fe768e9a942fff3dd09cfb443
+DIST kubrick-18.08.2.tar.xz 308544 BLAKE2B d10e5050dbe83e35f79bc57843c2b8f35ee358df0426a7a3fd9df7ee50b357a1a072eb53959f34f83c2fa6ee9cbb84b250b969c3607a552dffb793a6cb491048 SHA512 88aeac983d252b38dfc23552ad00557c80ea0ea8e3ce18f4c9f75de58059422588ee6c900bcb79bc66236c3cda60e47a7298fae9bcbdff6dd9ca29460c03c54d
 EBUILD kubrick-18.04.3.ebuild 749 BLAKE2B da0554f2e3eab3029a90b6d791de0f008d9f16f2d241da6943c3cb526ac3bc620e0ecfb9b96e760d35805ff3e09c121fe0bd71fbb291bb1b79a326da4a5f95a8 SHA512 d0a1c727665ec7b34e12d3970f109d31187a0e54ace76dd7214cc9f1172b9581a61af9791a4f12830c6a5b9714e40aa65611da6032d826771dc18253b5e2b89b
-EBUILD kubrick-18.08.1.ebuild 751 BLAKE2B 6cacf182b70e54fe782431103279e8651a04bd005afa323c309f622b9b74eb16c68b37cd11e5981e5370812c05ac24081521ff91c9843be6efd78b809845765c SHA512 01bbcc27c295fc836dad806987e8a3b3e786762fc7f4be0dd33aeab430a58f644e96adf3973cd444df9cab24a70962e38776afd3dd8818b45bee21ec480bc1bd
+EBUILD kubrick-18.08.2.ebuild 748 BLAKE2B fdc2527330cae88d393c6e6f2331ccbc39a113a40e2c147495a921f76c9e288f7b87911e51cc67a17d158be132ddd51d743dbf482073ea55b510fdf143c0ead3 SHA512 c02aaf9edb61b990e31d8a2c803642f45cca1d2f19e2bd0aa804eb7d22b2592fa81f564a77daa17944fcaacbbbfdeb998a9f13c3e27d287d1e91e3507dbd7c8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-18.08.1.ebuild b/kde-apps/kubrick/kubrick-18.08.1.ebuild
deleted file mode 100644
index 49fdf450e365..000000000000
--- a/kde-apps/kubrick/kubrick-18.08.1.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/kubrick/kubrick-18.08.2.ebuild b/kde-apps/kubrick/kubrick-18.08.2.ebuild
new file mode 100644
index 000000000000..ba7f19dfb475
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 f6128a08140a..cd2e27481b24 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
 DIST kwalletmanager-18.04.3.tar.xz 779004 BLAKE2B 7220e472946cd61e1b7ef882e3e8cc92e285d5fa5696a5d4e9703e5077ff9ee70fc68f78b662a952a1d733ea2ca3a7f7c1d482ed728b6e3ff6d772124bd25917 SHA512 54cc68ad34419703092cc53fdfe19e48ab758377b47feae405d2a094950501195cb8a39ce863d37204b0d2a0019100411ad73164c00bbf1e96bc2662a9a79b44
-DIST kwalletmanager-18.08.1.tar.xz 786812 BLAKE2B 63975f51e1bdf6ad148e10c09e50af3d36cd2ead3536982939df009f84b966f7ea33f2f57cb15150e67e92e1fccb3f1dbb3cf99b2a097edd702683cc45d3385b SHA512 9e5d37f3600dc8f6499e791c92858a0e16afe8cce6b60232af8736e161ad67936f4e4e2ec49cfd413aae410d4b1ef24e27dca42e3c04ab1fc05c61ed39698740
+DIST kwalletmanager-18.08.2.tar.xz 787152 BLAKE2B 2851cbc48c39eebb4eea906d67bfcbc65981ab61f52c3cb1c0e30a1f7594f1ec3cdf014c602183e2d2e6dd92686b413db0c9720b231c829f2bbae50b4c064f97 SHA512 5178cb62df0a96f72a58c203213650cd8b5bc97ff656e6cf096963e044023bf0a6d4ac545fe9d2ba64f23071f74cf7e817146e340939666383fc309854d26f48
 EBUILD kwalletmanager-18.04.3.ebuild 1246 BLAKE2B aac270c42cbeb8fb891dd9d65a8de55d51993e296ad3e56ae59015746f6d19bf3b6fe70e857ca2a575c94b21ae69dba5c1d2b6151457a8027faacfc177e54450 SHA512 18f35758834e8b4d9dc2f32d87d998ce4b36f278c6f24a76dfb9c38501382bd986abbf0181ad68c632b303855c9d882d6b8a09a89535965e9dc7e2779673766c
-EBUILD kwalletmanager-18.08.1.ebuild 1248 BLAKE2B 1c1648ca2ce4e47e83986f21e29f868372e726638d87570e41a71128b1c2bdf8c0928a63e8a29a123004c86a146d5b2732b5201649e69b77b22468e0d46fe9c8 SHA512 03769d48ada6730a20e40906a42aaa80b1fc3bd773003636b27728e70f2e9ac4a77a83ef3f0263ad38a6adfabfd99542f46d14f171f3210e16baca82a6a25054
+EBUILD kwalletmanager-18.08.2.ebuild 1245 BLAKE2B 393f512e1ff092105cf61cfa2009b4372490c8d54fc8cf4857113e53b2924dad004399dda32391d61cbc5b98070aaffed2d3fec978d54ebf32476676d88334c7 SHA512 571bbfabb0397180dcf1ab0e9785b9133dc3e5b6814124d5d5c30205c800c5e2b0528d2d8a6f9bee6bda208611f7e0cce37effef19561f8e477b395eed5f1002
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-18.08.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-18.08.1.ebuild
deleted file mode 100644
index c557ba43034d..000000000000
--- a/kde-apps/kwalletmanager/kwalletmanager-18.08.1.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/kwalletmanager/kwalletmanager-18.08.2.ebuild b/kde-apps/kwalletmanager/kwalletmanager-18.08.2.ebuild
new file mode 100644
index 000000000000..a240ff823f21
--- /dev/null
+++ b/kde-apps/kwalletmanager/kwalletmanager-18.08.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 5097613ba299..2c86186f0fc5 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
 DIST kwave-18.04.3.tar.xz 6186388 BLAKE2B 4c6d4c9d2beeacee09535930e5660cde084105a9bed21ef4df400fbe8f5b0ccbdc5eb0152f08a92bbe60b7eb164b268964f6b386af0740677d99c2f1abe2dc9f SHA512 30fdfdf681bdf2f339a0b8ca91899e4b3e447075a7454f352f897745af2b671a5412c37ff372563a5f80cb3545295a5c4849b3243386ab86831e325867f7ef23
-DIST kwave-18.08.1.tar.xz 6214968 BLAKE2B 26788eb0fa10f78dd121f4bf4baf7eec7030d909feaf5b76541cb62f1ba516fac21f6228b97419cca0b20d7ef68af9fcce95372398d653c190a1ae1e144a63d7 SHA512 5e9abc54dbd3e757ffb287ce68f43eb91c4b7ee8c231fca194139d0c2183f1b1e8acd23f713d15ea40dca6cea03d4567591ac78d58650e554422772cd7a53660
+DIST kwave-18.08.2.tar.xz 6215428 BLAKE2B adb9f160b576ce4c7e7bd99ee5a20a4075812138f1232990967cc0849e48d4bf03972756abd8fdfd9c4bca6ad4d1bc7874d8a79f078c8777de22f8d4e8afc8e9 SHA512 31e971799d79cde4dac118121a8ca4d89910c8599f7b019e26e10bae63a892e53e022386e03a0703ff2a1c03b6121ff1761a89ce59903f49d8da6f23a039a58a
 EBUILD kwave-18.04.3.ebuild 1987 BLAKE2B 9b5d443154717b131c0f807a64f76e16dfc38b993c268003f778ae80d285a4fb63b124b54b0762b81dfa84c8dd69e722df52aebbd218c2f4761363f2890ef612 SHA512 c80dcbd90fa9b0aba14d7d007c940646c477a8be7d3d7f97449bd267628676da6f72d44c0af285220b5d3d64ee6fd958a6239f52e6600e345cee4ef77ad2d7d7
-EBUILD kwave-18.08.1.ebuild 1989 BLAKE2B e8c7647550262f52d7f74f0aeedc8aceef0179c084b845195f7f41eb32b38bba4d67f7fa9ec5ce65d308601ec5cf5ab5c95eb3d9af9d8124395626cd455da6d7 SHA512 728ec4b1fc1ce79f7856f8a28c1566512a132d657c6997b6cbda6f9adb1f8bea02161330e9ca56450806705841e71c3b1c87402467cd74a0b2b3795ff259a08f
-MISC metadata.xml 749 BLAKE2B 860265ca3ab192b9f0eb386b4f8c32d400ffe0d79d9ae52fd1b03e10b6c1955406219641cab9c38cfa3c45de2a7bc2d37525ddb264599922e3359d764add4318 SHA512 ea33dd37159d916ce727354e5183f77e4435553fad594e6f0494419e41137bc29d9f1d7b1035ab88ac982ca4c56a68065783a9336f29a511f681074bf2d772a5
+EBUILD kwave-18.08.2.ebuild 1986 BLAKE2B a656d8ac7de996556c2fe9d1e943e99279b6a7d3cc9108b9da417cd6cbb49b47b16922aca77d561e53e9839bc9d47c10bbb8de7e592a67342f8b794ae645d36a SHA512 e42c034788958290db2d4ccaad5d1c61ee6455460e45402daa1b36b6c4d11436a0e1ad6e67127d893de9346d987289bb6fb93425246cc87f53a1539ee43f8a15
+MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-18.08.1.ebuild b/kde-apps/kwave/kwave-18.08.1.ebuild
deleted file mode 100644
index 5327a15228ed..000000000000
--- a/kde-apps/kwave/kwave-18.08.1.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/kwave/kwave-18.08.2.ebuild b/kde-apps/kwave/kwave-18.08.2.ebuild
new file mode 100644
index 000000000000..5332d69756bd
--- /dev/null
+++ b/kde-apps/kwave/kwave-18.08.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/kwave/metadata.xml b/kde-apps/kwave/metadata.xml
index 61824ce786df..e53b8a3ea814 100644
--- a/kde-apps/kwave/metadata.xml
+++ b/kde-apps/kwave/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<longdescription>With Kwave you can edit many sorts of wav-files including multi-channel files. You are able to alter and play back each channel on its own. Kwave also includes many plugins (most are still under development) to transform the wave-file in several ways and presents a graphical view with a complete zoom- and scroll capability.</longdescription>
 	<use>
-		<flag name="opus">Enable Opus audio codec support</flag>
 		<flag name="qtmedia">Enable playback via Qt5Multimedia</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 7bf47c897055..f65fce620f5c 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
 DIST kwordquiz-18.04.3.tar.xz 4168840 BLAKE2B 4bbdcc0119f31a5645e6c77e2d4c4bb424ff6572dc8e0192cf26972761ceef2b2fcf9d03b3453bd4f254148a77c3157465c7a137ab0d10d8fc1f8a57adc6146f SHA512 9b8fe36ebaecd49bea700fe74338aef430a2d0f9449eef4c3b1ca3ef84915e49e1fa22a8aa4fd72786cbf0631cbb39477170b0b5ba4e5f713722dd591b55fb55
-DIST kwordquiz-18.08.1.tar.xz 4168492 BLAKE2B 0171d5e453a8514d68869a1beacde26ffe4ecef2ad7dea836f6d65280f7f179e3cea0256d51fa5618bc9364d16b388e001b28c440f71219bc70d008efb08ce8e SHA512 40a00ca117b4a4a14921b84c312bd4afc98b83e45d0f7a1cc9cc24d365b57bb5a3a383dae65e8517e835991e02e1841fb5470a215003467c29f93e7e04427a28
+DIST kwordquiz-18.08.2.tar.xz 4168388 BLAKE2B 7b8860a53f9d098bb2a5d593e48fe9be93e1d4ad82a6f154671e2a02bb6e4c37deffb92999713027b605954b5ef4d66444505e49825a52b2721e9b951a5773ef SHA512 85d2de5c354033e7b49cd37cabe249a5fef76ef849daf31187bfc64fefefcac2fb65fc87dd44e217d1bbe13934eb569eeb60d925a9df8a5d892c1c1c8db48dd3
 EBUILD kwordquiz-18.04.3.ebuild 1062 BLAKE2B af1b796b5bdf1ee2b0768e8fc2dc796923f3c7aaeb103237dd2b960b4d122bfa4f6b89fa2a8ea8d56ccbed138b54703119e21131ce289291a120e1e90a4165be SHA512 29d5c304d3074e6f46fb31b8bdfe161d6ffba70793c133f2658d11e3a2af0e41d2fa121b6f9b1cec1769cf375b7a71785c89ea9509d982b364bee0bccc5d92f1
-EBUILD kwordquiz-18.08.1.ebuild 1064 BLAKE2B f56195944503c694f323cf7071299a9cdd136d6888386f8e8d34d6a1650cc247051f7a4ac71dc1d7b6ea79ae1c4afc106ec8da6ae254b0b338a9fc057deb3353 SHA512 b6ad92dbca261e758eabce63c10f59e5666a5ae1405780d71c00e8055c8d0cf1de120ad10c5cc8216d5570489a7b2cded008950dca8da66bda87fa8257b5bf48
+EBUILD kwordquiz-18.08.2.ebuild 1062 BLAKE2B a85c4707685342e6597564efa207fafd8d8dea36b7047d7fae226f93c109a2e71ab60a87fdeee15debfc9dcf778d4eef9ae3cc67aa5f7fbe792e779e3fe4d380 SHA512 012e40ba58b7a0291dbbedfa1e740f0f3ea4c3a9b5ab3874faabbb4b9aab5223e84f3142c2dd5c4c49c1e8f2ee492eaac5f378a6941c5a1c5caf480940d8a0d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-18.08.1.ebuild b/kde-apps/kwordquiz/kwordquiz-18.08.1.ebuild
deleted file mode 100644
index 666208ff0dae..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-18.08.1.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/kwordquiz/kwordquiz-18.08.2.ebuild b/kde-apps/kwordquiz/kwordquiz-18.08.2.ebuild
new file mode 100644
index 000000000000..f2d959eea649
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-18.08.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 e522225cfe3d..77a3ceaa9d43 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,6 +1,6 @@
 AUX kwrite-18.04.3-root-user.patch 2791 BLAKE2B 504d19baecc1a31c00fe32ed25c4f5c42400b33e788a94559a0833dad0dba0600bf5f763dffbfb4868c213d1825d852c988cded0bf2937f8e5614e5edb953b84 SHA512 b8d71b7e609ae671071419d75dcc6fcfb1577e25d4dbea5f62baafe00862fb45d4d91b01e90cb874a849897a9fe4d3ce50b02ff1b7ac7faaf6f5fc5b9ccf3634
 DIST kate-18.04.3.tar.xz 5639892 BLAKE2B 76b36061ec758964e3644fc3893069791e060566646eb03ce0bb6ed04c6c2707f5f48240887078e309128f09e3316ee1bb7076063a8d937d1c4ee67e1dedc906 SHA512 7a41ef21e28e275a448fa80f6d6a7890e221669343c30f946a4522e7f9b4812407ff5b168939508568ce17965fa2dea965aa63062f4fe059a2612021f877694e
-DIST kate-18.08.1.tar.xz 5657336 BLAKE2B f3faa075cccd5da84a544a3bcad1d06dffbbb5d392cfaa18f36c2f2044b64d7791dd490791b5f26eae86e6a31ddad6e774fa76e55d6d6a31bac2b0653e3e6cbc SHA512 cd76272aa540aac13da8fd078ee0d5b020645c51fd16ed341e91383570d3e30d0005bdd7702c2b145538df7252443bee8c927281f93a8473b42166bf964a1b41
+DIST kate-18.08.2.tar.xz 5657696 BLAKE2B df2107ce3797b7d3af388c44c3d8e9abca1cf89958a0c934f5b542d030555350e1aa3e31889c883738af34423ef11fc5fc585b8cebfcc9e042b8789607a2da66 SHA512 c1ab11798d5fc209a2a592a44e7b7b1fa0f2ee1c17c8cbbfa9673810b8e64194a7e402c62eca3914720cd953d656367b9374858f7699a2cec42f9e3978e8b936
 EBUILD kwrite-18.04.3.ebuild 1244 BLAKE2B 560f4a9565e365369c3d03e37ceddf14b15b4676b214fb2b54b30975c3e3f44ea5503336bbaec6f3ed413075bf508767310b6f9c06a47000df5bd00e9cc650c3 SHA512 7f57248d3385701220f03f7a3d5737a388d407cdb5d5913200284822f76e8151d9ab71875cf45838e319ecc2ede69a1cb84ab5174eb9c8aaea8d1c3864864c91
-EBUILD kwrite-18.08.1.ebuild 1189 BLAKE2B d42d84f053107c7d7631f8008515a1022ab162b36c5e55471c9536e6c6b67399c185f6055d6de97f773ecab1481cccec261cfa38c0c2273fdca3ebc616904ce2 SHA512 8dfbabe38a589b0fa4dac0db266d1dd15a276ddf19335352013f5d7f13494cc2f50051d931821a3b180c48c697627382a2014358e9e87c261bdd62b6600c4b7a
+EBUILD kwrite-18.08.2.ebuild 1186 BLAKE2B 1a701254e0f3a90f196da08b9a816e9fa5221b9144259ebbc54985638721a3740c80e159258433774b5f20caed802a786d748184ec955f088da21e673277db21 SHA512 63e9ab92825b3f9fdc65d64fc60d231720443764022200bb2a5823c6096d905dd6172ec5d7582128ebcfed6ae213a9c6b8899a5e62ebdd755a741614a160b22c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwrite/kwrite-18.08.1.ebuild b/kde-apps/kwrite/kwrite-18.08.1.ebuild
deleted file mode 100644
index 40a36cff18e3..000000000000
--- a/kde-apps/kwrite/kwrite-18.08.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=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/kwrite/kwrite-18.08.2.ebuild b/kde-apps/kwrite/kwrite-18.08.2.ebuild
new file mode 100644
index 000000000000..7452e0dfe13b
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-18.08.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a57e376d9bdc..f076b48f48ab 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
 DIST libgravatar-18.04.3.tar.xz 30448 BLAKE2B 1d13632884be127886eef875b8672954d926239f796156a4ec8616a4ff887c3487572c1bd24176ea37ea05c66a00f5906985a31d0193f1bfed78ee78690592db SHA512 ffdf46a77b47287dd6cb761f2885aaa0e8e9426ab721d8e28bd6b4269b4834375643c909400deb19c7e7db2096bb185540a7bc18d06350459fcf2c6fa84db504
-DIST libgravatar-18.08.1.tar.xz 30444 BLAKE2B 81eb0adfd165789e94a07728d4e03382f65ff61722d3bc51e39c6bcf36d36f8340f485024042e67ecc3dfdfd26564fc6802dd210e6f58c6097b52d8d4211d7c5 SHA512 e958509ba0e68a6bcff54e324815264f5c1a5a3b2c166c175fe62cac9e1cea6b24e071d8b49632b36ee8fde7fb7bee42459a9ab6e8c10b5db797a10953d60dd5
+DIST libgravatar-18.08.2.tar.xz 30416 BLAKE2B 264f813c2320fb96e3d2f6a1530bfe36b9edf734cc0cd5bcc2da59863f9453e3cc348f8c6ef8174b991946567bb0027db3dd39dbe7c1217b92cc4b629db9f17f SHA512 fb7e8d441d3e5b97cba62501eef16bb763cda489a456f5db08e588715a536c6bec4a466c5c98acdf1e2728b120a5b2afdd9eca05c38bae4cb95a85928caff9eb
 EBUILD libgravatar-18.04.3.ebuild 723 BLAKE2B 0f5d2a3d1a7011380d42421b390af600d9467276583fb75c8840b83d8841ce32146fe9ffa296245107ec8180b554b9006a6d254f73260134803f139b28b7873c SHA512 bc6df3e5eb4efe3fd4c312ecd077d9e40b291f0c19f280f5074fdb5b46449009cfe95592065f1e95ad2df7a7ee9f3b2a9d867ef7616ec190006fe890e94afc80
-EBUILD libgravatar-18.08.1.ebuild 725 BLAKE2B 0ce98d77067c2fa52d9b36e59961ba0520717cc9f4959b9f05e5498127c78b8984eca411819b04fe22926005d82cdebdabaa1d63ca37a5f2dcec9b0e842cb5fc SHA512 a59206bbb628d9f43f5f058e3d25c7fac8bc21e8328e8c268ac71605e7bae72fb78fb3f609e4c5f1e972d1571dcdb002119428986da5879356199340c12aec54
+EBUILD libgravatar-18.08.2.ebuild 722 BLAKE2B 3b594245d0a45d4630b6773bbfb7fe141daff064992faab0ce5705fabb2e1d126f9ee7b878d2e28a4046073aed29d381a4c271bf908ab80765a54c951171f5c8 SHA512 1fe18961ae422030bc10f1e1bc846d4e73d748e3b24de015b621fe965441da2fb5e2e78b320187fa0059b9168ffed9bc6473f34f153ae8647f2c7619d2f17bfe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-18.08.1.ebuild b/kde-apps/libgravatar/libgravatar-18.08.1.ebuild
deleted file mode 100644
index 06eba7322aa8..000000000000
--- a/kde-apps/libgravatar/libgravatar-18.08.1.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/libgravatar/libgravatar-18.08.2.ebuild b/kde-apps/libgravatar/libgravatar-18.08.2.ebuild
new file mode 100644
index 000000000000..3ea83cb004df
--- /dev/null
+++ b/kde-apps/libgravatar/libgravatar-18.08.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 de27da1c1511..d89e5b764484 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
 DIST libkcddb-18.04.3.tar.xz 426936 BLAKE2B 417919ebddc5e837920921b31c85034bfa89916526cb180fd2a30066ce0c845d9bfa31921bdbdeeb71a07274f65b5d01e6d56e44d204a9bca28a59d0ef7ba109 SHA512 b89db360c2e2abea9a347eb8b3a4dcf9f6d8a4ade689aec7bef7ce674706cb28e078ce73440f320f855b1db80c927c3bd6da71554393a8948ecd5e99537ade8a
-DIST libkcddb-18.08.1.tar.xz 427108 BLAKE2B 6bab47d0db59fb4b36216625ee0ddb8d23ec7d2bdc8bbd16dfb482600b65c83af5392a7344ff540a65d095ccb9a2062a40002cd149d028113091e0620279c5da SHA512 1f5b96c95d5cb3c7035d048f980d103403241a6a1b9f2454870fe30ee43bfea998afc1adaf4a57fec3c66f5f806b682731f22fe7686bfd588bb9b2c7f83a2853
+DIST libkcddb-18.08.2.tar.xz 427004 BLAKE2B ec4ef71b05b81ee01cb9c5630ec44f347a597e60841dc0f6b3bcb324f02652e9d456d734680459d3d2305c15d38e19856d228862592a368cb1dad7242634373f SHA512 052a7a00244a7c36687d47b7c3efb726f78123b2b7e3a21fef782c49c00fe3c7112d627181eb196d52f2093893acb7e34b0602dcebebdbdf89c3eb68c2008033
 EBUILD libkcddb-18.04.3.ebuild 1069 BLAKE2B 0d275ed8bbda299bf0cd8b9178ce2062e2e8a85e1d98b0c01ef93285955c3905caaa4d30a6fce1cf0a7fb1730a68db6b4cafce6b85c53c8b7e3b6ad4c2551da6 SHA512 52eae08f381c5726122a9f41b123dccb1aa39584519962f187f1de2572ab169991e1a8eab62faf08c98a02565d0cd6152b2438d68633466f560b52cdd3a7765c
-EBUILD libkcddb-18.08.1.ebuild 1071 BLAKE2B f2837e7e3fbfd7781481841030ea90fef579df78c782b7e210d8c062c8cdf1e20868d3b948402fd242c452c26574deb7389cab51b4c44254604c32294e55adcb SHA512 9a3a30e3a3268c65916497944b788b8355d0984c6a41fbc0e3c8f82ae9e0c3d5919b205b92f67cf10a1e65ffbc94005ddc695c19b1d3cf2a03c432b1e8af7145
+EBUILD libkcddb-18.08.2.ebuild 1068 BLAKE2B f495d468c5a8b016be366107d59be9c4559179033190db780ca657848d1dc36ff7cc0e215be600e20c57e36421c1f5d97a8e77c2a429d1ae2f9ab68f1cd83a29 SHA512 1fca8b4591693c8fd38653658d72cb2e882c9e2c896856861be124777b9d579835dcb14cb9e46694b92e031031eddbb022d04cd7c29057a5c212505008af3c39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-18.08.1.ebuild b/kde-apps/libkcddb/libkcddb-18.08.1.ebuild
deleted file mode 100644
index 7c3b36bcccd4..000000000000
--- a/kde-apps/libkcddb/libkcddb-18.08.1.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/libkcddb/libkcddb-18.08.2.ebuild b/kde-apps/libkcddb/libkcddb-18.08.2.ebuild
new file mode 100644
index 000000000000..904641d3237b
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-18.08.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 e3526435f36b..d839c8d5f41d 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
 DIST libkcompactdisc-18.04.3.tar.xz 88456 BLAKE2B eab93aef5bf446f0c3dcda58ad06fbe6b3a3c969036f2c344635c3203e42aaf2e4b4a0657221f2a9ac838a5ebf20506329fa3e36c1b01d06e8478a48d4a9229c SHA512 b91212fffa3f977bcaf15476abec544dfeb1af82cd9315d338965e000713a8ef43a41e72f07b9d24932f9aeadc99f08737b300cdb9a5df7ddcb5b6087b9e5410
-DIST libkcompactdisc-18.08.1.tar.xz 88704 BLAKE2B 7da6eccfb74e15d1bf5ef7c9854c807ed38e91945c1460b25fcb8d4e0b8e52a7d6ec487c9ed7eb75882f54e6b78b6ab779b86e39987b8e39e22015d4223a9a5d SHA512 171e623614bbe3da68265cab599db648697b12c37faca14aca4933412c17c83c9de6d093bee1bbc6ecaf21a1e7b7172bb76f9011070048d795ba03c606e0eb35
+DIST libkcompactdisc-18.08.2.tar.xz 88668 BLAKE2B d63a3bdb5149dcc231f7cae1cc257b5dc2bb1e75520c224b4ed73316218939ad511416fbd9e61670b1a54ef28140c90018f13acea89d538db90ec2e7c8ae22c4 SHA512 ec9fc664a8dee47bb4f63b2b1b2f3592b53630126bc9d24480ed634d2a2d8b54aca9b380438e4cb51b0b59823ddc7ce2f3ceb0b7009579ac0f7dd05f02b598d6
 EBUILD libkcompactdisc-18.04.3.ebuild 574 BLAKE2B ae958c84b73a13ccd9041222779ebccc2a0c3bdc95d6a2f3e9e7240e75a957e9692499202364a0c92d6da8df44c6ac3ea17cccd3de0643df32d249e6fda3642c SHA512 9167faf732377f25cc22b616da9f5fd8b41e6e9960cae6635e14bebef73084a5d74a2cd6964f3c8f48855db1451b225d2ab13e6337e82dc72afdac3e736cdbe4
-EBUILD libkcompactdisc-18.08.1.ebuild 576 BLAKE2B cc9c1fe1b60007e8f07343ff96afbedb8762e7f8ae23b9533936d585d17629b8f723d3b20df597785c911362d0b4522832f9aac3a69d56b5fbbec7d52c567d7e SHA512 73e81d8d450aed9a7631f6882e9d3895e3be03d6725edf006242b0312652777c1059cffd5d24d5c3387ac7080305ad0d1b875d7d01cdf3e40ee2da31af4a6739
+EBUILD libkcompactdisc-18.08.2.ebuild 573 BLAKE2B b5ae1bec5e9410ccc1f0687d9daf8026a2b37d4cfc9da576065ed168876723d6576ac60d2ff30da43bf31998b9a876725c4375a6cb251807b97e194aa8660cec SHA512 74d3e063ec9723106dcdf83297758ab3b8efeee2ba8ac183fcba3e13c8b01f8668938b1a0b59943d975e4135e6d0dc004a4d4e3a7e8291a26a74c0c666f668f3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-18.08.1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-18.08.1.ebuild
deleted file mode 100644
index 3c73db683d51..000000000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-18.08.1.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/libkcompactdisc/libkcompactdisc-18.08.2.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-18.08.2.ebuild
new file mode 100644
index 000000000000..5fe56a60fbf7
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-18.08.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 9bd7aca75cf7..b5549b06e001 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
 DIST libkdcraw-18.04.3.tar.xz 42080 BLAKE2B 70d8aed9021c193564152f10016acc327710b2a96abd8f9ceea8ead2e467f51659e68888b8942aa7f2bf7b756515ff4005f5966db0a52add5fb5ee9118b0ccdb SHA512 2544319d3b393e7fb2e21c357f0a602a1a3865f6111d18d301e1eeee5a38b14377e6e3c347eed4af88fdc652122611bacf2c2a32f4debacf7cbef12f270b86d7
-DIST libkdcraw-18.08.1.tar.xz 42196 BLAKE2B f95045f451ef8a7a75863b9d46534e3b7e38d8ae55010071106b9f08088d4594aa27e9f1434c8738c059a0caeb9b706ded6cca83db9d0650693ced7a47cc58c7 SHA512 1f63dc262e7510a81604d287a41ac461c8cb57010855f2fc7273e9c2d459e345e207fa006642d85556d7189d78824720339ed473cde7aec1ec8a355969e7a91e
+DIST libkdcraw-18.08.2.tar.xz 42200 BLAKE2B 67b9c48e7cffad583ad9004dda54864cacefffbe107fc99798a7ba5cc05a35e7bad7e98055f095a49705b81731c427598a217c06d2e5d3ddd8ca8e16ef2da87e SHA512 214b73b1ebb2d72b819287e54315af76ab5434a42fbff8a996c2512a1b8f1d41bfe7f2140f1d4d70b3f0f9655b14c2eb9f887e7b40a32aebe79dc18b8769b60e
 EBUILD libkdcraw-18.04.3.ebuild 335 BLAKE2B ae7616f589ffffed7ca9359049803e5093e7efdd43abe3fa7fa9b3ddd091b303e1199021bd8e981bf8d9b1aec9039e13eda7daf9334a7956b62ef52ebf3e23c3 SHA512 455ff7b3f70c7c8354e83f738f6d442c6331eba752d2079807d01c42c94d8581fa33708c5baa5a800eed348718e2f206628777f8ddf9f9f16a678cf53d442c38
-EBUILD libkdcraw-18.08.1.ebuild 338 BLAKE2B bab16be60be734551f780f9b3b3f43cca133a109eecfc384f5b87212e8526691d5b02772690cd1fc1dc2efc9e82b2ed6ad12eaa70f2233f9d2e16dd19538fdc8 SHA512 2525ed91ff4e820d8bc3a1625421b0267d465e6250ea17b0acfed768ec0f6ea59e7184dfdbf9f559c0828d88905dfe6019f2295be9bf4cf1e19ac62c9c009c0e
+EBUILD libkdcraw-18.08.2.ebuild 335 BLAKE2B da0245514d1b831efaa2dc2b120b800b9fbf5ac836eaa6d720129f7f7f2f1e3858377ecd7f99e07e165fb12aeaee508f7b52527f9e1a395a1002e4a51380ee97 SHA512 066f41bb5dd0e45ca1f42d7b5cfbdeeb6e4010a9b4c90c23d96fe41e0573f6c8acc4e4afd803494820390596bd5e2244c3b99d243247b0e955f1aca48378394f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-18.08.1.ebuild b/kde-apps/libkdcraw/libkdcraw-18.08.1.ebuild
deleted file mode 100644
index 88aa2516004a..000000000000
--- a/kde-apps/libkdcraw/libkdcraw-18.08.1.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.16:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdcraw/libkdcraw-18.08.2.ebuild b/kde-apps/libkdcraw/libkdcraw-18.08.2.ebuild
new file mode 100644
index 000000000000..270d7fc13614
--- /dev/null
+++ b/kde-apps/libkdcraw/libkdcraw-18.08.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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.16:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 77b1b59f979c..d034912599be 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,5 @@
 DIST libkdegames-18.04.3.tar.xz 5950408 BLAKE2B e0f02dff36e4d906c48da59a5b43271bea58aa2606980a31aa1b0f2c11741eae125c3e82a4a75eb391162a8b54248cc7ed687c17ced2a15a2e3f30e3040cb36d SHA512 ac31eb0c7308bfbf9d55f2cbfaea6a50d3f6b1c70420c17e2dcb9269b67831738bb1ddbb254f30bf4c6e34b90272b6c254d2bb5387452d0e6615a87a7be40c46
-DIST libkdegames-18.08.1.tar.xz 5954476 BLAKE2B f4d24c95f81e7c2d4de44772a65e2bce6c157a7bfff1b994de5e34cbf20e4cad35ffddeaa73027c7ea7b9b1182f5b094a1bfc5383cdbcf3a857f1d5496202c34 SHA512 09769549944b42f8c0381ba691b787b9ab00575343047ee1763d8c1a5347e62716d0cada05b0688aee7f160846a6d16aa7d68978d99bdf65c5dc3a21ce5619e1
+DIST libkdegames-18.08.2.tar.xz 6385580 BLAKE2B 5163cb0f790259c1cf5e6b3e3169a676f619fea5b728741e633b1a9992d8ebcf4129b28d3d01412d13efd3e6c4950d87add2bd62cc9698f341ae6c6a3713b31d SHA512 97657fa70aecf0345f6ccba70e1ed2cb652fc220c25d1f89e039f83ab695b0d7576271391197c573f5c53f9e262a7d1ccc163bb67827e5390e9b3aa170ee5e4f
 EBUILD libkdegames-18.04.3.ebuild 1278 BLAKE2B cc571e37412a87bef3391d21cbbecc7a374f56202910e10d59179e7ebb68f61a91b7cee5d19487d5bd56206e8a21e8072f372244ae62f0df80c5f3352b2a8987 SHA512 e8e8cb5dac8db9f01df93954ac12013ae64cd91c30fdeb240ae164613aa7848f9419323b5385ea544616fbf3cfe49377a6454fff04a26061b1b2f2f8cfba3b7b
-EBUILD libkdegames-18.08.1.ebuild 1280 BLAKE2B 8f427db1240dc4e26ef8bd7a343d5dc7b5433a9f6217a2f62c930aa2bdb865a5030830a8b9bf6aad154d90633a8c48ef0cd666a317c978cb352d3c0a56e55604 SHA512 e4010308d83818419622692eac3fc26884f77643b8457e48ec33f085fbfb1ae48b5494e2d7cee7e37def7419412c90b7ec49f4d4370d9cda8168e56be84e2750
+EBUILD libkdegames-18.08.2.ebuild 1277 BLAKE2B 805c1981e95ad4ed0be28cc335de70b5fa86c3c7388a19d37959610c0548cd0f202e833ac8324d3a01c56946a3dcd4beef99c5b6bb399c4e963bfd70b5d6048f SHA512 70cb7d3a2edfa7f5ac6c931b1e98681d2e31cde9187e4f4f8d854852228dcb1f0e22da8cd097c4d3e3e6d755356b0caf7a4689ed29a0cf8fb817c0ca4fc9af05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-18.08.1.ebuild b/kde-apps/libkdegames/libkdegames-18.08.1.ebuild
deleted file mode 100644
index a70604c955d3..000000000000
--- a/kde-apps/libkdegames/libkdegames-18.08.1.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/libkdegames/libkdegames-18.08.2.ebuild b/kde-apps/libkdegames/libkdegames-18.08.2.ebuild
new file mode 100644
index 000000000000..bab24896e647
--- /dev/null
+++ b/kde-apps/libkdegames/libkdegames-18.08.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 4b01bb7709e5..6a46346be08a 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
 DIST libkdepim-18.04.3.tar.xz 341360 BLAKE2B ccb6ee69a1110717be95bd305178f5e4ec017172dff4066779094f3def40d08551f855dad12c794d0c61c6076c1de4a0e1856b579eb687e2688f42779cee9d1d SHA512 0f2cbb71c54ed8477159a2d628222b36e791b9e626c736dcc5318ca9ae2c77a1958efbd3f535ff772fba9606734fe1017c2cfcfb18786694946fa7be40755ed0
-DIST libkdepim-18.08.1.tar.xz 336756 BLAKE2B 4d342b6dcb599190878e44e593adcf1cce4aa002076b1713d9ac1d9a64b1cb1f3e0a1f8d79acf2488dbebfff2e7da7def31609fa17e3f89fc0ae2191356ca0d1 SHA512 541659a7a46def63275e584d20453885f3ee6aa944229740e9d6494568d4a3808020367bd8484083f00694696fb589f077844a2c33265a8ba89ca319b55b5501
+DIST libkdepim-18.08.2.tar.xz 336712 BLAKE2B 6bacc2974a023e09eee176fb9e8f73ef2f8a19d74186c489cc1dc602303b989f842793f7652b3b14f55ae7641a3ecd2450b0e9aede9c94db2c424eb0984f5f10 SHA512 0ca0a12505c7b15ec5a90ac3869d8a9a36bb3f02290cf147905301157c7576001c6beebe69af1ae030ff988137382a9490c5e237bcd02e1a595a6c0b85037416
 EBUILD libkdepim-18.04.3.ebuild 1065 BLAKE2B 81cf1c504eec9b5df7d634929733a64b718ac73fd33f9392e85302259581c4b764c593e03362517a1fba2097ed7a110e66469faa34e80011697b6591e9dfe73e SHA512 6407762a57ee1d30d4d853e93914c59c0c6781a49eba791386de97b1114cb1067b27e919d0cc57c506e35aefe3310b272b9148a0061fa10f0133b0c1965ede99
-EBUILD libkdepim-18.08.1.ebuild 1067 BLAKE2B 45a9feb8824992d1dc25deca216965436eebabde4155a4a97ed4136baeb523afabf5aa948c367129f871c6bd89791f3d363c78187184768e5e2b5aa87789d5b5 SHA512 f52b9a8645c67ecb349717833241c866bff426e52b14a618e6dbabcd5abce266d7f1b9478e729e128c8487fa9eb91359eec0691651b55311ace43bd14a98ed96
+EBUILD libkdepim-18.08.2.ebuild 1064 BLAKE2B a4baed8c32672f8285e68dc6dcf7abc0a7b17d197a4b9e0a252ec7cd757b823d08a5df1221c2f6ca8391c2b5e56b73ed5c14cfddf93b43e66b86f1f16bcf4d95 SHA512 6d1e5326959567997e65e30264f8710c52e9867845f07489105300451b3208afb5f8f8a7653e40e11fa3a1774c2785c7044700de58829a6e0310bee0c5df1df9
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-18.08.1.ebuild b/kde-apps/libkdepim/libkdepim-18.08.1.ebuild
deleted file mode 100644
index 416b05fa49e7..000000000000
--- a/kde-apps/libkdepim/libkdepim-18.08.1.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/libkdepim/libkdepim-18.08.2.ebuild b/kde-apps/libkdepim/libkdepim-18.08.2.ebuild
new file mode 100644
index 000000000000..a97de1a8b4e2
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-18.08.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ef2bb017ee31..1ec7d751040e 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
 DIST libkeduvocdocument-18.04.3.tar.xz 210388 BLAKE2B 5026f210d3fabccb2b980596cbc98e48ddb2a0f26636e35075f414fce131a12c052008603e8683b13ef4ada53b9763744f2f2a08bb51c71425cf4c5bed65fcc4 SHA512 a703357c2444ee20ad38620575e07d6dcd8f49c45bc2e5b5fe464738d829df4d3847fc1f79698d309d88d6a652fe38ebf9776ce4d39dd11ddf774e77ef1dcfdb
-DIST libkeduvocdocument-18.08.1.tar.xz 206752 BLAKE2B f3ea381925c1e359b9b86e4d9d0c40727890d79999df19353c448250c360946a7deb32ac5136d551bf53595e48b095b37bb9efd3f3f577ba9cb4eef0f6bfc429 SHA512 fb71a7c76426a959f25c5bb2d01c8d843bcd31c0b28f4acf37fe860a2dff7a9ee5dfc67e9a51715f137ee5b7c284f885cae0f7941888ef0c75607b03ad90d11c
+DIST libkeduvocdocument-18.08.2.tar.xz 206752 BLAKE2B f038fcf8813e4f7f1cc4f8f67fd6dc4a67f4424cedbe29b1c814e511d84ba3b204967c0acc7e4c3c2bdf94341f0ab8ee59ee891caac2855cd14c7fb79b9fb24f SHA512 c31763aa8f75693be75ae5fb07fa398807dbb9fc940554f01b2d4c11601317e27fdf3e170d7ff439602a6b4bb020bb9cf1a333191e27cb435d4bbc6e4ab80414
 EBUILD libkeduvocdocument-18.04.3.ebuild 599 BLAKE2B 3b0c2e79516e1084349d8088ddc01bede11ef22d9b5e439b5c86e9cd7ba3b7800d1089aab8c9357f0db802ed8bf2f00b509190c226241867567f317bb085d0dd SHA512 5cf55d956909d21739659cc8f2951d93a665e87451e6a30775ccdaa1358cc0302b2c59c3efcfc3c3a27141b05de42dfea553908b68dd22309e11077edecdf26e
-EBUILD libkeduvocdocument-18.08.1.ebuild 601 BLAKE2B 74d7d9eeee13777e79a09e3f315acb4a9df6c126b7b39f3b1f483e4c61101622cdbc5cd73a5acd7b8161442a1a976913f8602c1eb252559eac09055ebf4b00b0 SHA512 cdf8a940df3c45216d0b61d17a419ba34790f61c43fae374e9271ffb938a7b2560303f214bd1ee62fdd8b0b019f8a90093fc0274cf489c18a6aea203a08dad45
+EBUILD libkeduvocdocument-18.08.2.ebuild 598 BLAKE2B d764bf8ecd51113aadad9b692894fe8a4204cb1d2f81f8ed93012a052ac987a96b26388b2e054818bd2b99ea04c8864f10d8e61387cb70bb655aadf653215bc6 SHA512 36f9d326aa27ada8d553237d6233480b10c8726d57d81a91e781218c67ba438fa932bb5ee5dc9265231a057a331385603b5b417c7f04104be663858a317f81bc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.08.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.08.1.ebuild
deleted file mode 100644
index caf1c7213dda..000000000000
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.08.1.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/libkeduvocdocument/libkeduvocdocument-18.08.2.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.08.2.ebuild
new file mode 100644
index 000000000000..247314dcd806
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.08.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 0493974996c4..ad4f6c3c0aa0 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
 DIST libkexiv2-18.04.3.tar.xz 64512 BLAKE2B fbd31c115e7292be62aa656c3b8c3b37a34b1740b1658b8d58f5a725d890abd55e2fca7cc646ea74af2adc30279b077ccca6e55c09ee0cc0a3207c5af6203ce0 SHA512 29c8295510d9b07204ab870ce86f5c9aede03459a906e356e8a1b63a89b24ff4d5f93ef13ea6080e1fb88e91e4694885892d88b3e822cade7cf09435f49d115a
-DIST libkexiv2-18.08.1.tar.xz 64504 BLAKE2B eadfaacf6fd901edd824bc6b427ad97d6138b27e89e8387a4d2ff8d47b2bf8632fadd19f44ee120b23e27b5168e9dc7972cf5134c588d5c02548477d8d5ba8b9 SHA512 af2fefd27e03abca0587184d8b5b85d4c78e16b29cca80b01d14497e421a1f43395c1d40df47c23318a96b6e5c5e5cca4835939616a4ebf31a453cb6a15c42bb
+DIST libkexiv2-18.08.2.tar.xz 64532 BLAKE2B 56345b3b563b85287c337a572d4d1650cb5008e6c882b9767642610a8f9172b94577b1fd33bc79e2aedee915da26964a48b636c817a46676db166755c3814c22 SHA512 a1a27c8bc5ce8521d4d9d62cc359452bd6283e49cf85224f2981f73f30a0b3cb14f0947bcb97216fa5a242bd2abce0253372db0c96d1ed2a6e3e09b4d7557eef
 EBUILD libkexiv2-18.04.3.ebuild 356 BLAKE2B aaca5ff52a0b87eb93324ef09899225558c281b241cf6b11aa08a2d16b57118dc3d94a45a6bb5b0475715e205994c646ad54eccb0aa5fcb8aa779ce803f86a26 SHA512 75fb0fa4f9658956aabe61b4b25a8d2cdcd175c9a42d1d33f1a997c142df35243c49f4a9f1e9e94f10db251da8fcecd8bc11fd85e54dd016f868e9b4e0046c8c
-EBUILD libkexiv2-18.08.1.ebuild 358 BLAKE2B ec256b620c25093496b98d7f3203e7247720a51b3fc6adbabd6670940553a4d810c4fde10b465c9a5c496cb54500178ed6ee5f32a7335bf9cf80cd3fdf6ae653 SHA512 208c67ba5fc4e5ed887725efd846994099f8f914f880865107261b81cc9edfb19f08820e61a2d8a2ad83bf02d4d27390428fd576b3deda3bd2538500f7d013ca
+EBUILD libkexiv2-18.08.2.ebuild 355 BLAKE2B 3111ec03b5f3cf1752e53c68f44b3d035be494acf25711ea1b5a3178fa064e217944ef9d0fbcb88f308c3dd9e861dfd1ade03391e0c3faebe9de652c1f59fb3b SHA512 7242a7128c1b56d3ff203e4cabbf0c64ef9ce93aa105a9e26aa447926b506cb23637e3e9dd12c71330fa257ce64bf1b85a8c5635b51bf5ddca43e65ec88a20c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-18.08.1.ebuild b/kde-apps/libkexiv2/libkexiv2-18.08.1.ebuild
deleted file mode 100644
index 8566db655bed..000000000000
--- a/kde-apps/libkexiv2/libkexiv2-18.08.1.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/libkexiv2/libkexiv2-18.08.2.ebuild b/kde-apps/libkexiv2/libkexiv2-18.08.2.ebuild
new file mode 100644
index 000000000000..d1c1eda8fde7
--- /dev/null
+++ b/kde-apps/libkexiv2/libkexiv2-18.08.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 38049c041a76..eb462722c272 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
 DIST libkgapi-18.04.3.tar.xz 176268 BLAKE2B 2f276af969d20bd22a4e19203499c427cf4d7bdfcaa95165b11449e96f733231dc0d208dcddcf310ca77a8ff380e11dc46d9f0068042d13da44d1e58dce59eaf SHA512 ad60348967b04b050b7809000633585a0a45fc7a8bd6627e5aaa7c62da5b158a6f7c6b46e5144358e7e6e7d427b65b4e6c6e9edf8625fe76f57cee7ed2799817
-DIST libkgapi-18.08.1.tar.xz 215824 BLAKE2B 78fe4a4ad3d716fd6a97500d361405259eeb33ac0c703a5890e4760c01f9b9b4de069649d18e48b58947be5416508d8a0b6019b1e3ad58d2c424bf9f0b347426 SHA512 31c9b1ab3f35ce431bf7ae5004f68b50d517dd2798745ba68bd1907f518edb832406c4ebe39149451161e4fe3f2523060a3c49676221ba254e87f4d5c0edacce
+DIST libkgapi-18.08.2.tar.xz 215828 BLAKE2B 8257f933d50d6c61d6d6d496d8d37ebf30346997c011e3c00d62a558aee12161916ebf5439f1ff414f30c495a16bad97aa7ea60973bc9c4a13f691daa16f8164 SHA512 56c9f8de76c3853b3646a5d0ee37dcdd1cd7083f334596c081a3f62f2ae4351895b2bcfe9b334d826b43a6a43d708c1e9591cf7701ab64cf8a9edb38873b52b0
 EBUILD libkgapi-18.04.3.ebuild 755 BLAKE2B 889eb43fff87414830fb430940bbe90357414780485b0c45d2b9ae39caf3dba7d862c06c45074873acfed8f4556561e17a9c7367bb5da72a9f6b53380abf17cd SHA512 0bbc2a10dba06b6a4d19f32121ef32026f90fd5a50638ef24563409103de7f90b62b639d536dcf6499619357265cd2b48afc1bc3af64b9cd6aef0e845db986a1
-EBUILD libkgapi-18.08.1.ebuild 818 BLAKE2B 4b3fbd4bef6be1c56cf79683d3d6308aeecb125e173537bf07c5e14c3b6aeb116e69fddade3c7571b1c8c57a15ad74e8d411cc1ba559571089eac02e7b042c48 SHA512 3b3666cf7284c721de0fc727583e02d2ea5a10b2f415c37fb9570bd346b68c5d1862171128369b333889adaf33c93e34c68eef63794bd11f50bd3a8ecf028a87
+EBUILD libkgapi-18.08.2.ebuild 815 BLAKE2B 228d2cde63d65286e5958e1fbe627203bd1ad64c0b16d88ca04f2bc2766b147c3c8d77332c0f9f1a234e4925d79cd494f3bd2ac7de02d105022e848f8e20e110 SHA512 cc53e9f8085c359796127cdf343f2de1b9c4a9a7741a58753788acf4647ee45ae01b9049fc4774eb029a20b0b414970f0f184bc1ec4f0becf72febb4cc9d10cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-18.08.1.ebuild b/kde-apps/libkgapi/libkgapi-18.08.1.ebuild
deleted file mode 100644
index a0a49cc12457..000000000000
--- a/kde-apps/libkgapi/libkgapi-18.08.1.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_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)
-	dev-libs/cyrus-sasl:2
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.07.80:5
-"
diff --git a/kde-apps/libkgapi/libkgapi-18.08.2.ebuild b/kde-apps/libkgapi/libkgapi-18.08.2.ebuild
new file mode 100644
index 000000000000..cb1e7727f859
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-18.08.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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)
+	dev-libs/cyrus-sasl:2
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.07.80:5
+"
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index a8ddcb13f5c8..a441f8e9dc43 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,5 +1,5 @@
 DIST libkgeomap-18.04.3.tar.xz 150240 BLAKE2B 08d712df6c6d49eb82b21ef4fdff3b6c601f8b289167029c5c673e379e17fb904aceeb36062d437c1e4c5285e8b73a0df8d5485465e228fd4454847df818c3d9 SHA512 37ef1e70742c11e074cea9dab9d96e398637819ad87f6c422c62fab963bfb128c6fab49422135790fb09d2c2db6e920a9e1fccd5c901b460fb4afb567c65e0c6
-DIST libkgeomap-18.08.1.tar.xz 151032 BLAKE2B f4fb74a4cce4e90303ebfef34c0e2a79996774c969a610f9d759e1dea91197c2511918bd2a0e14a7665efbd1a772be83f43e5d1dd64ca08cc3d79dadde139919 SHA512 9542b696d03e33f440267a17050d4aacd9e83b855ec8f456171f1ceb4717cfebcdc8e031cd5816ae76629efa55f217db62f38e9efa6f51b4a7dab8b7a4b37f94
+DIST libkgeomap-18.08.2.tar.xz 150956 BLAKE2B 111214426d841f37ebda95ee057dc1d068bda7b4a23d0d75c7df0fecf1ed2f91154f3f171d428b5b7f025fb750359f9612e4a44736b4dda915016619cad540c5 SHA512 25f066834bf2f5b1608e96e75a74b6f5b49e8d43f7ccf9533b25a2d965bd0a4e1703f6234cdfd34566058e19706be03e4177d6ddcaf22c8818143eb50de44144
 EBUILD libkgeomap-18.04.3.ebuild 774 BLAKE2B abed07263428ec8dc362d01d70e992a05d9fe46fcca1649c5f279f84aa78cdc8ab14188e6945179449e42c588766c323129f6854e4f1c7310f7858c62dd72c74 SHA512 98576e08eba5a37853eb64bc01c523f615eacbd2a3fa008592cdec9c94c19e06a6e0763b5d3203f490653678d5496407008d2134eb567e630d2cdaef5820f7bc
-EBUILD libkgeomap-18.08.1.ebuild 776 BLAKE2B 6701ec26ccb7b89b13e30655352621824984faf2e962c2fc8b44137db64c073aa9afc996b743c9cda4214a3eec774064fef547e688c5f6f48996656bcd47b376 SHA512 b2f15bcf21166f30c6f2261d8a4c500923ac47d6a9b33b0504dacc50911c3f6472b4342413735424bf2e66a3897dcbfa0b8c4c97cc2993ede7c841367f498f53
+EBUILD libkgeomap-18.08.2.ebuild 773 BLAKE2B 192f6d06d438f986c996eaddebf8e2772e64117628848da2a2ae2bc760341b820c0e964f3af4f371954b0e4d5209f7c2fd1fa279428de1631eb4873e13e3e9fc SHA512 5a43e8063ec37ad0cc9d070a833f87ba06b010cc9bef638fbd7c44a1507091439328a768a7bcebb4513a4c8f46d99632cd358c181c829eabb4700f7c7cc5aa6c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-18.08.1.ebuild b/kde-apps/libkgeomap/libkgeomap-18.08.1.ebuild
deleted file mode 100644
index 5bbaf24dbc0d..000000000000
--- a/kde-apps/libkgeomap/libkgeomap-18.08.1.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/libkgeomap/libkgeomap-18.08.2.ebuild b/kde-apps/libkgeomap/libkgeomap-18.08.2.ebuild
new file mode 100644
index 000000000000..c0d623de9443
--- /dev/null
+++ b/kde-apps/libkgeomap/libkgeomap-18.08.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 8b6b5f693110..e821d6df7da5 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
 DIST libkipi-18.04.3.tar.xz 103600 BLAKE2B a8bcea9d85ee198eff9530d3cca2b5517db6c33d9746a3cea5e21fb651de5b13260e6ae0036f1840633b434c865d28c85cb846dda21e60a777ac3d7262811dd4 SHA512 3fa2fe8bbc5158bb1b06812ba708ce11feacacee9c9e39030bf4ef570177a8ff13962c02fddf33a6253f8db5d60805c2e1a65fc6264c7ca5d62e81abe3b44523
-DIST libkipi-18.08.1.tar.xz 103628 BLAKE2B 982762975a6ad037e603663212b78f7e7ce511a707c9519cac6b0c65bd1354046b100d9463a7a3c12f1104e8bbdc3605c2bf8b41e2d1b0c50263bc2d61b6792a SHA512 d209b81bfe29d41816347d8292fabd572579ad4ba916127ea1fa1a9d247f08347dc6f2f1c91dbe5ba4e8f7e3305b411246a14c8c776e16af9b36fa57d8cd6641
+DIST libkipi-18.08.2.tar.xz 103632 BLAKE2B 4982dc1023eb8b16deab1fe9c7e50cb16e6139b3a3b80997ffbf9cd01002c69614da47e85387d731654f64dad4b904b3547cc0c4c47d655c1e615294d10ca3cb SHA512 435dd7ac92121406ebabc9268dedbb5bd452ad09e60ae7c7877e88a01205da5089414db1104159792177b40e0ad024a9bbb1ee718751a5114154de3c2f31c412
 EBUILD libkipi-18.04.3.ebuild 565 BLAKE2B acee4da04f26efc545d222e1c19f89798033e9490457538e053b9d2d454a705aca5afa45525db0fd9f46bd79a9f5a5acb3c2ab78f47e63904d3e26d94c345886 SHA512 cd81c2e285559058b0cf2f400cca5ce4ed7ee59f95d695ec92d378e5c1c10d69a25dcd3d23ade4f6ee77fb0c31ccfc92bc4ebe1fd401b7cd10fe0cef63995113
-EBUILD libkipi-18.08.1.ebuild 567 BLAKE2B 82932dbb414788179a2e99d71892d55fa392831a5048cea801876c439fab5bfc30c3295d9f04aaa5f26ea5b66cea662d10a7e44a8c84373271aa84d59fad20cf SHA512 f6a8e5b46a04e01c44d6cab1e0317f744a4b3e8306caf7e9c05855cbcf308be9de1fd3d40ffcdf1bc326045789d0281320695a48eb6db9b107b847bd2bebf753
+EBUILD libkipi-18.08.2.ebuild 564 BLAKE2B 90490e716e6b9356b6b7c67199e64c32cf93127ff3ab11e5f12953b5fc0b9d977c70ffad49a85f517fb41e03c6407db0177c9044748024831b8025e4562f125f SHA512 911d8f8ea0b45b6d62fa2add532dc1026b68ff5610083c7edc85eb37b3b8cd12e9e22e4866fd15fab8a69cd967965a010e9686b8a2ff0d77083363dde82e88fd
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-18.08.1.ebuild b/kde-apps/libkipi/libkipi-18.08.1.ebuild
deleted file mode 100644
index a0615d81f262..000000000000
--- a/kde-apps/libkipi/libkipi-18.08.1.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/libkipi/libkipi-18.08.2.ebuild b/kde-apps/libkipi/libkipi-18.08.2.ebuild
new file mode 100644
index 000000000000..8d81c5f0c2d9
--- /dev/null
+++ b/kde-apps/libkipi/libkipi-18.08.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 932f40ffb034..965487651b3d 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
 DIST libkleo-18.04.3.tar.xz 318624 BLAKE2B d6a218e686994a163a3217c5a2d3beb8d471e484eb5ff917cad3d0f0a8d7ff336090a6a26beb1117dd09f7283e368d1bd91395d0a562eccbf128bb96a53ef702 SHA512 678c68fdc249dfea337f6f262da1d4e3b20482ab5c4db859a5fef04b8d544c0709e9dcb59fa33bab89a6de550c81ba14883c3d31122849c83674b3dbca00b545
-DIST libkleo-18.08.1.tar.xz 336156 BLAKE2B 7be0efbd9b57225fd08a4d4dc9f65144ac63bef085a2d53b982bbc1dd50921d0860a919c396299a34f513b85e74be2b8a92123aaa3a40f22c09cd39f765d4800 SHA512 3df1d5236d31636de4811dea600b660d1920613a56c0ec7821fdf3451737d896ba129746f5a838cfb96d106dcd68b3170efdf2616f8e56b562e59cd7ec7ce1ed
+DIST libkleo-18.08.2.tar.xz 336048 BLAKE2B f7cb44471685b0763afa6da706b5f2860cf1d1e65223f1e3acd9fd0525213a211ecf3768c275e0ba9c33b269d520cdb5b4e79861376b32e360ea0c941fed818b SHA512 e1979872da850b359bf02b309e8660452c6c99409b2474589beec8789ad34870dd30b71c806da7f410d1ee9b9671a9c75e6259c6440a32bbf20a70914cf974b0
 EBUILD libkleo-18.04.3.ebuild 736 BLAKE2B 9f3303689ba756680690c9760ba4a506b84dd0e08b868130113a5618fabc45ec2648cf8a3c3081a75f124e76a727dd836b8813de6b0950cc5730252e2b62bf7b SHA512 d1cc5597530ec2f1dc6d986835a67aea42a02cf03e4c60d1c893edd4a68fc253c3a06e9bc155a66d8f2e33862ee4657be279a6560e8a2262364910497b3b2366
-EBUILD libkleo-18.08.1.ebuild 738 BLAKE2B d36242f36d93cf29b4c01df38a358e8c917193f3dc4c97f05cd5d9a1ef6b2df2ac4dbe4eb1f068e58533276f3bd3911c7d20870c73681bac774f1776c92a9fc6 SHA512 86a5a68c07859e2c58222fdf95ea538968ba78afea0a1660d0d3991b440a4bcdfa4789d7476fa6107f411d454a3f1212192f145e01921f3b0ffbf937964abc96
+EBUILD libkleo-18.08.2.ebuild 735 BLAKE2B 00df41060874d558ddc74020b58a49a39e2ab2d96910fc8f5538ef6096f928978012e5a5e30fa549d5e0b33c8d2428e3898ce5d26744aa012e5ca2a811646aca SHA512 0277314949c09a8bfcc190a8846088638f8b35edd9048df8af7a8eb269d42af84e6f84fe5a7785cf6f53a358ff027b8c3395fbc188e9a12e278b26b127bd4463
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkleo/libkleo-18.08.1.ebuild b/kde-apps/libkleo/libkleo-18.08.1.ebuild
deleted file mode 100644
index c7fd42409ee4..000000000000
--- a/kde-apps/libkleo/libkleo-18.08.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
-
-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/libkleo/libkleo-18.08.2.ebuild b/kde-apps/libkleo/libkleo-18.08.2.ebuild
new file mode 100644
index 000000000000..208b8b525845
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-18.08.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 b9253a9b8dbb..2f54a590aece 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST libkmahjongg-18.04.3.tar.xz 1683728 BLAKE2B e821c23da691408b9f6c5fc8ad222317c497a27f221030e830201bfb180ac547269b9a2a4b095b7fe5535aff2ff9fba4c143eb4fd5ddd1ea349870f708b0ffef SHA512 f8ef97f0bf5fbd8c1dd923b26c42138f317a8b87df50261318ee438f29d53a99aceaaf077e24b36ab46e9f564761dcf389160cc657c6bec5ddf1c1ff3eddc87e
-DIST libkmahjongg-18.08.1.tar.xz 1683808 BLAKE2B 79cfdae56cb6fd522d532d45d0e6febd016cce45ed1ebdfda050d323c6a88720f4097f04bd5bffaa37dea897c00ad6c2d1728ea3e39a9fabf8565a8c4269d07a SHA512 bfcae260ec5baef8ff8f881331442448d6e40619321c0034f9d638df91283ea50bd57a1ac90e118b99ab662d4d08c29b9493946119b9f378b1fa6fb823dcdc70
+DIST libkmahjongg-18.08.2.tar.xz 1683996 BLAKE2B 0d447ff7a43c7587f701e2737e73bac1d5bc0014dc6c3b29cbfd59e51d28b17d7f2f12905e400b117f6e8c93e4f24c8f62b8085389287d31eafbf8464bf8648f SHA512 2b1ae525169ab01b99d6b1d3502a66084b0110431485aa0fa1a693e77fa8e55cec1c78fe4b2beac2be314698f3f50f2d7de3f1471115f1caf58f4ace968ed57f
 EBUILD libkmahjongg-18.04.3.ebuild 546 BLAKE2B e57ea6057346bd3e9da580787aa6687cc0a81c075412c2b10d5fb4e6eb06bb5e8158430e71325f0ded62c2bdc14088d6eb4d015e198b6a71e46edf5c9faa10e8 SHA512 d3ff2d9cba4ab97be8ef283af7b2e2c140d86a9a36091806d6723779b7200027e16fa5f9f7dd4a452f8484e800105af77c3cf1c5820d9bf570eb077b2253c9d1
-EBUILD libkmahjongg-18.08.1.ebuild 548 BLAKE2B 41d9fbafa13eac18be62234c1d05d2ade61a9acdbc27008f45d261edcc76a9d975d96b5d553dd778bd1befa69faf5affe0d2aeb9bc197915fd2b26f1dcef7767 SHA512 b4d012f712fb6ca3b46ea181c5191dda4c0dd6914a67e305d69d07146e8e121ff993d822f740ff44951dbfc0a5eb267a6849bf35227fc54aea9f9c7a9077b97a
+EBUILD libkmahjongg-18.08.2.ebuild 545 BLAKE2B ecc3a913147fe120c67f790f6901d04d0ce7f7102c1d4c709f326a77dea7d0a755169a871bdbeb481b5ca1ce3c03f7b50395ab5a5c1f006834433febd8e8e62e SHA512 98ba4acbbb730a24274cb507d85be2d6b00f96292e70d08c3a8958af347b8400bdf4248270315618dc09fddff5b00c42e3df12071f87befecddedda739b5603e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-18.08.1.ebuild b/kde-apps/libkmahjongg/libkmahjongg-18.08.1.ebuild
deleted file mode 100644
index d8054495d76b..000000000000
--- a/kde-apps/libkmahjongg/libkmahjongg-18.08.1.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/libkmahjongg/libkmahjongg-18.08.2.ebuild b/kde-apps/libkmahjongg/libkmahjongg-18.08.2.ebuild
new file mode 100644
index 000000000000..34598d762dda
--- /dev/null
+++ b/kde-apps/libkmahjongg/libkmahjongg-18.08.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 3de330e582c0..2fff4bd25cdb 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
 DIST libkomparediff2-18.04.3.tar.xz 176752 BLAKE2B 7747d0332220f7459b735b2d1def2ca6bbdf80923530164d447795e8a3a1e01673661e1918dcfc11a8b8081ec8157990bdc53758455332c9ad92e6b1cf7cca24 SHA512 ad8772a7f1aa85b3c0d5e6fa7720df1399f7dbcc84a5be23da1a65106e139dcd8006f7c99975e07f8b8b1c8d706a89ac4718f10569f419c15e54835dd8e41931
-DIST libkomparediff2-18.08.1.tar.xz 173720 BLAKE2B 0b67b1161bd6779290fdf4900b923391683ae7e37143ecb7cc2bb2445f04af3781626ebb5582489fea4990602667d21309bdc1a797e1633f08050e0165ef93aa SHA512 37938b181a8f702c619b4b9a48fa7caa3212f46fe68393293ff173ecb6f695c6bc0b9efe8a43520bd78c369bed5fd0cdcc0a808764f7c02b3c2784323f97fdb1
+DIST libkomparediff2-18.08.2.tar.xz 173684 BLAKE2B 6a73097509c6609cf5fc7aad20c41fac579aa975c01241f35566cfa967ed17cffa98eea5e3e2b8374c20a415194ca8f75d8e3d67005ce5f9b5f793110913b821 SHA512 2368e48e108d94d44a9291b9462a67319ca877d807c5f7501eb0a151630e9bc5aec4e9ded8df51e1ee8df05180f24e30a4a66a6afc2a21c74db2087d4e6e4b97
 EBUILD libkomparediff2-18.04.3.ebuild 530 BLAKE2B d8b0ea58712bf6f90fcf89a5cd3a6674c7cfe1639c7abfcf00159fdabdd868679baf6438d03fa6d24811dee5222c11bd195996744a1776e702f71ce2f417902c SHA512 eb1e7e4ffa3bb48746d6032f6b4d08756021609cee91f1fab8aeb81ac3a9135a7bfeea3980ee8bf930813af2e7b8ecb6b9734894b92e9bd000b22627acb43601
-EBUILD libkomparediff2-18.08.1.ebuild 532 BLAKE2B f258ad870b88155127698612a950ffb630846ab4734b29fc274ade0f1c83afff84b91037c0b70c012560f39434a09d2797a01a7d8e370fb93b20dca21e581435 SHA512 5033558286497a0f1036d3a1a28c5e363a949097c408a78353646bbdec694db715ac378c0b2165de3fed0a93d6675645838d8200bb91755f21784324c29ba5c3
+EBUILD libkomparediff2-18.08.2.ebuild 529 BLAKE2B 9d0fe8e96e88b2a0d5c4485e1bf9e61793ac1547fac2d65e493e25650a8d337efce1de43e6948351269879e746a00e49b9de5dd1973343d551d4c19929185216 SHA512 09a81ac4d5c476fd0988b152bf3f3959cda9b9500145d82722ed93e606687519309599b5443e3e2e5ac52dab9f13261da8d797b1890c6cf12e89db8407f98213
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-18.08.1.ebuild b/kde-apps/libkomparediff2/libkomparediff2-18.08.1.ebuild
deleted file mode 100644
index 78b78d3cb9ce..000000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-18.08.1.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/libkomparediff2/libkomparediff2-18.08.2.ebuild b/kde-apps/libkomparediff2/libkomparediff2-18.08.2.ebuild
new file mode 100644
index 000000000000..bb1ae1b7b0f5
--- /dev/null
+++ b/kde-apps/libkomparediff2/libkomparediff2-18.08.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 983ec202eae5..ddb2fefc5f2c 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
 DIST libksane-18.04.3.tar.xz 137444 BLAKE2B c7f08d7de29e4a5672de8fe588e768ac7088b204782528777835adcd5b021cb261bc421a271bcb6a2e2a18918b4c04dd396a395123a6ebd5fc3878849f8d38bb SHA512 1e9dcc5ab7ac5a8df0bd20db589da05f067e6611d19b796208fe8d08e92568661707a7e36a84e9bd361a57231652baba5ce23211aff41a7db69ff0aa3abe200c
-DIST libksane-18.08.1.tar.xz 137660 BLAKE2B 94cf80baacf210191cb458fe8d2319a7c54b5730e6d3d26199a78c1ce638caf0dda10deee32229723117386109f776f06042441d2c31f2dbcd42c96ea3335c53 SHA512 fdd65c8857a31f2d805f12308b6ccb0027c5960b9af5f80553740f6ebe86e84278f2d078d651003c1f95835893794feabb76ce13c516f03783e65eacc82be48d
+DIST libksane-18.08.2.tar.xz 137620 BLAKE2B d904a56603b71546a48b8feb38d175c0e79ecafe73c4ef41446a5eb13bad3a403b8cdd6587e4117215e41a749a8510fa712d55619f1ec41200c1bf814b539437 SHA512 526f97353d281a61eb1fc38c34f95c4a4e3e9d63e269a5c63d553ce8597df5168eefc05d6856439ee409318f3e7c91bccef6004c347635446dd045229929eb0e
 EBUILD libksane-18.04.3.ebuild 710 BLAKE2B cad1599dbabbfcf697b9972b16f897064d05a6a1a4e10936f3680fa3b75b532f2e3bb11aae1a4218f38f9a0c0c2bcd23a9fb5266a190addbc642db8876254df9 SHA512 c141f44b4008aa7f9434431cb3e903943d79363cc62377a24498639f4c4268d342737052168ca6b70af9099c512cc0277519cfa51d88e10c7df3ffc7cf979d29
-EBUILD libksane-18.08.1.ebuild 712 BLAKE2B 37d9440884a7c76bdd73cd78adf0acd1cde2e1e108c932b80fc85d5e11e15eb48c706f7a16570433fd0406dafe97175c7e0b34435e86b5616030ce109a7b218c SHA512 9836b0abeb36f46bf6e0deb8b0b24d1c8b8a60b642ec53cc7d303e7d70b5eabc1fd29d5034622c8800744b4a83d5d17595d1303fb9bc960a0de1e215f757a44e
+EBUILD libksane-18.08.2.ebuild 709 BLAKE2B 96cf0cc91b6903ebd10b7a55cca38365e52d6ee6c2c17bf5f8387c2540a111aac3eb90305dbf47a64c3479bafde88c79658670d92d9859b43b37a22f2d310a94 SHA512 7c0a93a74dcb9981a97aedf849818cc19bf0cb46fe049db02265a867edac9c0bf9e715370eb7800e6b415cc138d2697f20fe70368b2bfb9a6625c9d453f499b1
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-18.08.1.ebuild b/kde-apps/libksane/libksane-18.08.1.ebuild
deleted file mode 100644
index 4e7403dbbfc9..000000000000
--- a/kde-apps/libksane/libksane-18.08.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
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="SANE Library interface based on KDE Frameworks"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="kwallet"
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-gfx/sane-backends
-	kwallet? ( $(add_frameworks_dep kwallet) )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/libksane-15.08.3-r1:4
-	!kde-base/legacy-icons
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/libksane/libksane-18.08.2.ebuild b/kde-apps/libksane/libksane-18.08.2.ebuild
new file mode 100644
index 000000000000..57b2af94de3b
--- /dev/null
+++ b/kde-apps/libksane/libksane-18.08.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="kwallet"
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-gfx/sane-backends
+	kwallet? ( $(add_frameworks_dep kwallet) )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/libksane-15.08.3-r1:4
+	!kde-base/legacy-icons
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 21615d19c566..abdc57645527 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
 DIST libksieve-18.04.3.tar.xz 550564 BLAKE2B 0821a88abe282d7d1d5c250088305ae392f0eedc26d54dd727ca1e3fc42769d1e9d1fd6fbaa22f6ca01a5bc817a39fb9eba983de2463516123cc5d669fb8a4d5 SHA512 65bbf4b13d98f7e0f8f01d4f2a2f7631e8cb72c448f8c46d985d5aed7fcb33bf03dc9f5eb7b7fc57b7e6f092b2360a0ddc8a605b4a130d18a5f73aff3cca93bb
-DIST libksieve-18.08.1.tar.xz 550216 BLAKE2B 128eb9c0fe58629f50b68a00d559be55b6b1fbc02e42b2591634f2501681d1c49dd4c96e3ab45be86c3270e7ccf1e027f06960bf7e10a0dda70e750dcfeedacf SHA512 edbcb2cab96cf0810c6013ee7da077e0cc55eae13ac28d299fd4f5ccefcb5fc0b5c9fcb53d6c11bf3b782521638b1bacf63774e24a970ff0f69dae60fc1c7025
+DIST libksieve-18.08.2.tar.xz 550136 BLAKE2B 905bcc281830e677d0bc683e974893205981853198fe9d0754959616adde2ac86394f09f45dfdb58336b23cd47183b9b11045dc367dd5a3eb36a1ebe241d4de3 SHA512 282c6674d7029f8011bcc3b346423fdde393b41a2c89868cee8b84a909e3b41369c987a0ef0981704f9c8a4fb7d860be93d973c6c039a315c6f4f521e7daf51f
 EBUILD libksieve-18.04.3.ebuild 1464 BLAKE2B 812989087ef5e61c75a37c632fb6a11439d3b444b8fb3403f12310cd46c872b3ba5f6295b340be65717fbe55e91bdcdcd9e63904b057b956935cffbfd63776eb SHA512 27610bb20a24088bf895302ae1e08280ff9ce2681170283247a2420f150ab019f51ad9c742d4391c300533d2bb764e3db6490d2374cf939ed1536a1b109bd049
-EBUILD libksieve-18.08.1.ebuild 1466 BLAKE2B 298be1cdb6d281c4e9c4f835b1e6bcaca255ba52975f908dd49bd6cb898b4912ad485f46577538a1aa8b91af377c3a648ae8da54f5c2cbde937cd3700620a09e SHA512 ecaa71d696c464badfd030cfc31caaad7fcc65b0bdb6381b40157daac905d106a7ceca13a76b90e5357b13c7fa246f3a1ba45cf73ef160409bdf219eaa23b203
+EBUILD libksieve-18.08.2.ebuild 1455 BLAKE2B 98406b5c85a071974185467df266ca4f4becdf4b3d660c244e201850d745973e2ce244749b18af0b4a8fe8c733d99b2bed0ff235d1f8f361a3cc17cf12267e42 SHA512 9b2df81854dea9f19bddb181268ec4cde99ab250b053563050b2c9519e9935bc7a5fde07722c77842d46cfa72c2cf8da3d8226cf425548a794705ac328fbd651
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-18.08.1.ebuild b/kde-apps/libksieve/libksieve-18.08.1.ebuild
deleted file mode 100644
index aed045a2025a..000000000000
--- a/kde-apps/libksieve/libksieve-18.08.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_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/libksieve/libksieve-18.08.2.ebuild b/kde-apps/libksieve/libksieve-18.08.2.ebuild
new file mode 100644
index 000000000000..f4c909585471
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-18.08.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 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 2353235b2fbe..5b1710b89117 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-18.04.3.tar.xz 300348 BLAKE2B f6b0498917e74b102e6996916609e80dc60f3515bb83fdc4ac8730356b47ebb1e97c5dad6b813f72177ccced00b6594c394b5650e0328aa11f0d2745079de1e4 SHA512 532bd7ea26676ca523fa1a0cef924badfef71e7ffe92eb95e8581de250b219a8efe97300dc9b80cb7a4cc777cb8c70f39f0ecb4af850db0f1214c23c87cf5c2b
-DIST ktnef-18.08.1.tar.xz 300444 BLAKE2B 7a8675043951bcb1a9f672d63d3ab15193fcabcc1d03b8c9464a224c98a3e5f0b07ff965536c5dc5960ee4a7e8eff79c6b2c832e05a9ba4a660460cd2cc89182 SHA512 fd65561f6fc87801f216f5b55845036bf33b0f4c661b8c98992cd28d7af7f7ef311ea3bfdaf01396fa786ced70a3b67ea4ff9e88b7beb77540c3e4516d2f0d5c
+DIST ktnef-18.08.2.tar.xz 300396 BLAKE2B 7fcbebd701f5ffc263d0d4e042a19915cc50ebbba26c0b66d704f336b2ddb518f4abd7e3e8e8a2ba21cf9b83f9b0b6ec2e3caf9bd60992d2651cd2e6526a0202 SHA512 d78c919c0a2f4a609b264f92b63bed583abe21ce76e8cf49ff39dfdf4370b56ebbe5aff24c3f06b2694e2a0da096629cdbcce137040ba4f5d20e2a0e1623a681
 EBUILD libktnef-18.04.3.ebuild 451 BLAKE2B b0818698561127b95312c67c06dbf836f350874c1433518ede4a2f26eff96a781e1886fa14291c9e936cb95d8060563f0a30d675a7fd7fcc5db4c971a2e4abd9 SHA512 89d2e17a77c1be864b7dc9f5ae11578046754fd0550ac42668918f2838bcf29a98d7e7d9148cbc458048572b114b517d1cbe9d1adc06da168f7f4dcaaba63ebe
-EBUILD libktnef-18.08.1.ebuild 453 BLAKE2B 17349c18c88369bb03bae390beaa38601028d127362bbbdc4954a4271d3787cfd42f3d9e1a3c56d26cbe9099294428ab36ea140079200b1ec83895ab71fa6e22 SHA512 3ec1b90fb9d308800ceac53827ab9c5376ea0853b6bec07d0955f41515748562ea7383df8c320ae128e28f91e77bd2933fb5309c8863a2b384eae686acfcb86d
+EBUILD libktnef-18.08.2.ebuild 450 BLAKE2B 146ef2620ceb34cea2599ff3aa7ee40715f22ce944b72e60c2b298526609b93b3ad7869b3e1d58ca65190bf9d502ed377376a23b39451282e35a1c6aafdb6121 SHA512 d7695a33956d0e4cd09bc618d6d7edeefe8e42f01004f324b0023830d2d3f2e86fe8019dfa11468da1a7a63938da73658a41aa6e92cfb4d67fe73fc20daa6f63
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-18.08.1.ebuild b/kde-apps/libktnef/libktnef-18.08.1.ebuild
deleted file mode 100644
index bd9497e32c2e..000000000000
--- a/kde-apps/libktnef/libktnef-18.08.1.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/libktnef/libktnef-18.08.2.ebuild b/kde-apps/libktnef/libktnef-18.08.2.ebuild
new file mode 100644
index 000000000000..9faf657d2166
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-18.08.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 2d3652c533da..49dd47ee42d9 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
 DIST lokalize-18.04.3.tar.xz 2862704 BLAKE2B d90e23be2796915baea2ee6b9e40c4bd1c737e80650b15e47d97e55fc70f4b7895478e5929223929e174249f1e2842ab98301223f6be91a4010b1ad591826a48 SHA512 888aad396535c6f81c1d2e0546eeb4033eddde985ad4e956ff95bfb4fa5e197ccaa0337f29e724175794357846efe6e2cdb7cd22ae0860469b01359ad506d757
-DIST lokalize-18.08.1.tar.xz 2893308 BLAKE2B 000cb7a6f37fbb3a16fd093c50709bd05700ec33f3074ef255d2b10c39440e0903cd894ed4c4884b0d287fcc33019b054254dc0e92608b70ba58ef20a7eb034a SHA512 544662f44ea37397fc2f9b141cd2d19fb22b0f7fec243150b5a452e9591675b0c44d2491073e5aa385195175024ba29364f274eb3bbf202e30cbc03acf30d8c2
+DIST lokalize-18.08.2.tar.xz 2893204 BLAKE2B 6d3665bb56b3f779f0f2cd2cb14da8c7213f8b0ded40a4410cc107970e0fb4534e032f147941b7fbff278fd8db7dc33da6bbf09d3c6de9c3400adaf77378023c SHA512 6c17fd9155cf409ecdc58093eaeba3e551ae3aecce07ff0d80fd29625960529effc0e5211b7913b46b3af351d0d93910c05b9768ca7ce0fd819acc46940bcb64
 EBUILD lokalize-18.04.3.ebuild 1553 BLAKE2B 2dbb0cf7df0e481d385543cb1c9ea084cfb4520d464ad67f5e02391a624e0dc159cb9514ecda449a193ee9c20f6f5c580e0ee636762d1760d364e9e3388b1ed1 SHA512 baff4358fef9dca4e62a7fcb37c053a6a792d5a07143995b518049414ed8f162e57eae23378f25fb2bd1ee583a673636efe960fb7ba6cf7b76167735359d553f
-EBUILD lokalize-18.08.1.ebuild 1555 BLAKE2B f2adde8f96a90471c5eb735a6f91ffc2a99c4516930aeada760195a8c865e5f2bead23cf330a419e6fb992b4f506a5128e98c1fa70e4e5833a9c71d75e2bd15a SHA512 e3bd0ff4702724cd52a684bbf5e4aecd47ba58bca814621b7b09bcec29ca8bf4ca3fcf9caf0dcf4590b0ebc07dd971a1ac9180aa9643db29bf66b95e07f658fc
+EBUILD lokalize-18.08.2.ebuild 1553 BLAKE2B 2e52e6597030289ca15a33ad72a2806683ee55dc2c51cb2d25e9213a0677bbf6d4de54339796998147e23449d630e1b07726636eeaeac6bbfe45ca5d028fe73a SHA512 e334949cccddd351700a796a83d8586880ead0a32fdba6b50a68c8e1fdcc2533999c8bac9bb57a865ed37512c07abd323c37fa19d8ef2dcbdedb22aeae33908f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-18.08.1.ebuild b/kde-apps/lokalize/lokalize-18.08.1.ebuild
deleted file mode 100644
index d6566edcfd0c..000000000000
--- a/kde-apps/lokalize/lokalize-18.08.1.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,6} )
-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/lokalize/lokalize-18.08.2.ebuild b/kde-apps/lokalize/lokalize-18.08.2.ebuild
new file mode 100644
index 000000000000..df43c30aacd6
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-18.08.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+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 eaebf8cfa508..5305474776d5 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
 DIST lskat-18.04.3.tar.xz 1217296 BLAKE2B 2a4da1c93a88a1eb9058c110ea33828e463c1f063396768b8f14302f0ab67bab090dafcc7d209c287522225513dc0abdb4660993e5b05b6d8dc2f181fc75b3df SHA512 8951df28673e51f48ef2002049e34315b8102db2099cfde1d3c671fb2a332f4c44691a771ce9dcb23b46942304bb60a6e80371011fb7340e6038d887357048c9
-DIST lskat-18.08.1.tar.xz 1218024 BLAKE2B 52bc03bb705e5e4c03f431d1ff5ac01cefdb097f382627a53fe73764edf1d3ae41d2acda881386338bd7da00c359f85f3eb9d32da323458d466b2e7a037abb2c SHA512 958ca673414a700f253c2b61d3e15502161fa3b3724e16b9ef1a1e3827c0093721a866a4ff00a9056ad027a541ce6873e192421d2b473f5e1dd7d307498c4715
+DIST lskat-18.08.2.tar.xz 1217728 BLAKE2B a6b2ff61b015bed20b4348e5b140e713986f339f64f1243ece93bd62ef7c9b34f74144363b9d42dc920df6ce4deafa720b09c96efd023418d453d8118eea7525 SHA512 25c13bb18da2906987cbf250ad6e300d121db4d04abb2fed48942b513d3ba1c0ed3d31815951a92eba70939d1c8f1423c12d4ed390e41405f06eb83a6046c1a6
 EBUILD lskat-18.04.3.ebuild 796 BLAKE2B 40e1547e786609fe9e352ff783d788e6007c6f53b483f544d1f4593c10c0f0250914d036f8d6850968090f144ea3e2b2869d82fdca94d6456918eb09035b31a2 SHA512 0604573d1451f30f17b9b7a4e3668e710d2e92ccb1f450273ba52d72d4437570c2c5b53cefd08b0222d12dd0d2c5f5a0e3c8d7fe967a7f23e4651a1cd529b28c
-EBUILD lskat-18.08.1.ebuild 798 BLAKE2B 6757af70baf8573d145a8f43e309f41f752c20ebbbd2def38c1831f1f0cd86f71f268f883eb04f5f683676db1431641b95ba3e62562b1168f89b7e6d2c066c0b SHA512 46e99995916be64f69845764cb6f1a2fd604547e1c6fab2da81023ff8d0a09eb3ec5145f4afe96d40c9cce29fe5aac9a3a2a2f6231d2fe04d3fc2292c8b42cfd
+EBUILD lskat-18.08.2.ebuild 730 BLAKE2B bbde7591b902acb01d0db47081476fd59708add0e19add4f5bbf4575f69d4c00b3b13507496cb46480823f4b941ecdbd0424ee763696a36511d908d27b6f6d34 SHA512 729ba8076e8c41629f21c980e6cec7386701fbad4948fa25035c4d9d4be428b69bcb715fdb0fc061a06f6d33c3523098249616a94eebfbeed0dd57550f0bc8c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-18.08.1.ebuild b/kde-apps/lskat/lskat-18.08.1.ebuild
deleted file mode 100644
index 4c0729f8e633..000000000000
--- a/kde-apps/lskat/lskat-18.08.1.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="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
-"
-
-src_prepare() {
-	kde5_src_prepare
-	punt_bogus_dep Phonon 4Qt5
-}
diff --git a/kde-apps/lskat/lskat-18.08.2.ebuild b/kde-apps/lskat/lskat-18.08.2.ebuild
new file mode 100644
index 000000000000..cc6f36064459
--- /dev/null
+++ b/kde-apps/lskat/lskat-18.08.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 463a6745df39..ba7237288cfe 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-18.04.3.tar.xz 692256 BLAKE2B f216b27717513fd034ebc22c392520d24379d317a383a1ede3a7b7be19b163bd104b45daadf75a2986d049d6db3695243c5ff9a5169fe5b75eb525ec20e2fae1 SHA512 0e9a815346ab4fed073b11cac2ee7d9e3612ae494e35937f6c0695e2572f7a07c17a0595274a4f806ee48f79192914506c6c6966811458cdf0b6d7420d8e0bed
-DIST mailcommon-18.08.1.tar.xz 691384 BLAKE2B 9953fa00f374598922ad38287bec1558685cad9e7dca657aad4503e01806f9429db2b6f97effe3b70ec442de5590c362a07e236c55fcb0cc369a8f15e2928071 SHA512 b2be6d39f29d777891237e7ea33439fecaf6870a0279b19890701a760a4757814ab98e49a0a272f604f666c4c4f7f02f0ea47d35473e24c0b77394604d785489
+DIST mailcommon-18.08.2.tar.xz 691252 BLAKE2B c1ae9a5aa4d1c2b0b9aa9587eb6b0ddaa8450d8d9c9611d09ef0b5da9bdd1f96f2277bc4fcfda94a9e143d2422825b0f38d47fd227eae4131982e6e92dffe0b6 SHA512 fbbe70ef9e0b928a93ebaad755f10c1b1c5ab0e0ff57d132524f1cbb4bcdb2cfc4500f7c67eea6e42597d2add28c1b6a88dd57a4cc4a33f2921dee1c2adaea4f
 EBUILD mailcommon-18.04.3.ebuild 1439 BLAKE2B 6afe7626b6cf19240d45ffc4057e3be1eb77b2b15cdba71255b01de6a9c36dcf0f805efde511afa09c38ba1b6562c52f263b12883be15a3fb932608984cd03ab SHA512 9f535e7696aaaf7395ddad6927bfe3e6ebddeceeb6ddbbe37511427a722179850d251646959958e6682055b62f9760d1f803e3bfeeb67a2da0c200b970907667
-EBUILD mailcommon-18.08.1.ebuild 1441 BLAKE2B 49ab94d207419115653979f9992bbb77c37996f6270285c66d1d297b6f01ecf56d4b0d85579b50cf9bccd3010a598fd7452361bf980b8d2ec79732c44ed9d8b2 SHA512 7f8aadc824fcc06f54e90a4cf16e99d732827bc8a3dc00afdc3b828b65f2a31fa9b67882bd9a643c9651b96402a4ad55b73bc2525c94998c1034d962d1c210aa
+EBUILD mailcommon-18.08.2.ebuild 1438 BLAKE2B a13a1853ce23f61a75b0b5fccf5ac93d6205339ea9bf7b7063bcd531454670ef05d7136556067244f3704108ee2569b6905175855699a13e4064df21d9e7d5a0 SHA512 4eca3d74cbd02f1116deda15e9825e611cfa38a30ad31160b8374a8d4200578f9a1f2b1872d506c7f08202299c1fb55729755ef3851f6401f6acfb989c456aea
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-18.08.1.ebuild b/kde-apps/mailcommon/mailcommon-18.08.1.ebuild
deleted file mode 100644
index 22fe87d28fff..000000000000
--- a/kde-apps/mailcommon/mailcommon-18.08.1.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/mailcommon/mailcommon-18.08.2.ebuild b/kde-apps/mailcommon/mailcommon-18.08.2.ebuild
new file mode 100644
index 000000000000..b8bc39886227
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-18.08.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 81017459c5a0..ce90e93db87f 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
 DIST mailimporter-18.04.3.tar.xz 541376 BLAKE2B 7a2bd20c220a529642b73f807e11d703cabc9d8cede9d7234611a1e3b63a8aacbbd80e68bd643658db3df82388b474834ee1bf212fe31a908c0089d91b5a11ee SHA512 43428107fafd7c1888249fb77593d1d4476326c2aa31eff5ec5162d042379f2eb92905acbf829955142b3cf6eb191e0f72e5d34725d29c013488bdb334217fbd
-DIST mailimporter-18.08.1.tar.xz 540772 BLAKE2B 5fe632e7230566c9de5d8279378fd0471baafedfb105520728bcc1c3ce001dd9a126ec198d4987f553daea30f1539c8120bb53e0e1e8760847ef658fd870ce51 SHA512 d5151a6bf8868c43b3b7a6d473f7017665a4f0d651205cef9e331ddbfd313dd1c00f8676e7a79845eed684c260cd637f23f86a6388f0c2e0ce68936fdaa337fe
+DIST mailimporter-18.08.2.tar.xz 540740 BLAKE2B 232f323b43b6b0f1ecf1f8a537529389736b7edb4045f7a8f2040c55c6cba6030bf4d1b0c656e09f5ad72ec3f3e79ffb58fb3a2457bd3dfea3951c491a461f53 SHA512 28fea982cd84341a5f18909ca6c0c4e7704828c413ce98bc6173ccb5d8330676c22e3ffc73baf422bb80925f7bb32bd1f6dfed1055a0671d1ed4b4e702bc75eb
 EBUILD mailimporter-18.04.3.ebuild 652 BLAKE2B aaeaf5851aff5c9785c614f4229218af0597bae46c8ff3071037df37037e9d494981209f7b2ce9a8ebc95260e40097860ffba31f915f0d5edfe82a25a31e57ea SHA512 6f7383f6b8195bd05773c49ebcaf97d6dafcb3241694dc5416b294e5e6659b03b437ed39688c8015ad7766fa85e97a1b4201d6229644c89c17d572be46c62861
-EBUILD mailimporter-18.08.1.ebuild 654 BLAKE2B 9ef5a0b869e5b13e9ea6e51df8fc22effc796235ada13277a9ed4b81d184646b73be1ccdcefe705ee34f78df15ea6c90220dd201c20cbd7608fe80049230f877 SHA512 7b4da4ee77779f525a895ff3752afb86e15b6eb84a79b7b62dd0c0f9ffd72b71a9877a952329b6a4de359630a2011bb5b821fda30a03396cd574ed28749982aa
+EBUILD mailimporter-18.08.2.ebuild 651 BLAKE2B 4a9714114fcf5dfa818b0fd8353339bdc1f8f7b68819d020cdebea6558662d2117f2a4fdb336aafc7217dc02a1e67c1a11416d7c1d0be169db4da25c26ae37e5 SHA512 08a331abce4782555bf77b70e52553dd336a2b125e656b780a48917fdec67f8a0d0b911ecd7282cf62a3808427575b8a1a026b9a48b2bfbdfe9efa88ec56f97a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-18.08.1.ebuild b/kde-apps/mailimporter/mailimporter-18.08.1.ebuild
deleted file mode 100644
index 948285cee867..000000000000
--- a/kde-apps/mailimporter/mailimporter-18.08.1.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/mailimporter/mailimporter-18.08.2.ebuild b/kde-apps/mailimporter/mailimporter-18.08.2.ebuild
new file mode 100644
index 000000000000..fe7ab6f7ccda
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-18.08.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 3367fbd64a7b..f939219d3208 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
 DIST marble-18.04.3.tar.xz 52432816 BLAKE2B 103aadfd9e9e940b6c090f124f29464925c2e5f6adefbeac476ea5f8fc5c5eacf9af4171959f6a17d6d7fd5d287b2db8b246a08d0af045c5529f8eb92b566744 SHA512 26a29e6648516e99c6ae33a6253fa4922271a412eba14212af24cf33dcab8845533eb4c1a8fea11b61f20c0a5c34007ed9e0db8edb3590b01a01404ac4493704
-DIST marble-18.08.1.tar.xz 52419928 BLAKE2B ebed92b4b3d49d78d002adbcd75488b6410bd5fc6c4676820515564fda7fb82f7f75db98f189706cb38a7b36a060e5ec35bff0db04349c56a79adb8bd2389436 SHA512 e6bf16f7b26f8f1ba88448378c1d97506140f87c0d75481f9cc2435f5f7e09a55ae510475397c6ccfecd4252a618287638cb350425895ad216c1d74115f81956
+DIST marble-18.08.2.tar.xz 52420668 BLAKE2B c7224360fc6c36a266cbc28846df2f4badf3275c9952eb1cf1325d277a479780912d6f0b8f78b4c382910d07e68c716d9b204f28ab4616812cc60353d3a46712 SHA512 d1a51b941cd5a9ee9b5500613f6436e2015f81d46df731848015244f11d7558c7a8401663dcebcf8cd9175233f7d4e1d70f8b3474df44f1f5bf5038fca820ef7
 EBUILD marble-18.04.3.ebuild 2246 BLAKE2B 3419d417193227f60d58e636982adef8c5cf42dc0ca0f136a3f349dc4b5f1211709f32eedd042faca10d333e905e879b6bfcaa562f2b97626711aced0007ecf3 SHA512 51b20869705dfcfc4a304da541c3a79eb7e3ae354f103080aded77d0929ca4e8541e3441c85f904be32409438411c4c532ef85ec6088bc3d49672851709a9644
-EBUILD marble-18.08.1.ebuild 2248 BLAKE2B e622a677351777436a7f289a140df55b73d506e66d336d7c8f8234e0a19cb7ff9416cf92e593fa2cf86d7b2514fe1a4249dc436ee7a985ce607729914c796f23 SHA512 e3721957e6ad93db7a0b3730ddec083f78dd83968fe881d314c1ea802c519f4b4faf5a4ef5704cf54f15da53daf182010dad4577705369463091e215d7346c60
+EBUILD marble-18.08.2.ebuild 2245 BLAKE2B 48d674dc5e2ddf57ffa1baa0ca42c6899c9c4caa84daac747db2f4a13fadeda529915dfbe620db3be4172a15fcef29a7898f5c3673b21ca14524e88ddc040736 SHA512 247722856d1efe0f63b0d82040f270dd40b686d58c3556c2c0048812ee252915af7701afb80c45f27b09569156f01340ac3001e9eb8e60500a3b95a1f2b7dabb
 MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef
diff --git a/kde-apps/marble/marble-18.08.1.ebuild b/kde-apps/marble/marble-18.08.1.ebuild
deleted file mode 100644
index 428bed2765e2..000000000000
--- a/kde-apps/marble/marble-18.08.1.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/marble/marble-18.08.2.ebuild b/kde-apps/marble/marble-18.08.2.ebuild
new file mode 100644
index 000000000000..de3a74c8f668
--- /dev/null
+++ b/kde-apps/marble/marble-18.08.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 919c34c55e57..5450d404560c 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
 DIST mbox-importer-18.04.3.tar.xz 33656 BLAKE2B 94febc2a7a72db0a5fb9956247e3debf312b0787765f0712c2ac5f364b85cbce05c970343b5fad2b3fff96b69c2e5ef98068a4565f39a065f482e2a91a371988 SHA512 afe51f226326a9b94e81dd65d6cd0fd9ac6e5dd2a50cc6a8ae2b856bec371c8739b375ebf150fb778a76f1d62f175dc80fa9260655d0a9d964fbbf874d9da241
-DIST mbox-importer-18.08.1.tar.xz 33612 BLAKE2B 3356f2394b904a65be96f885934e18da4629b0892c5a461d13514c1f29917af125e16aadce64b2ea75d611a92a9f9dd1e9e6fc25fcdb3e2b2181588dc3ade52d SHA512 b22e0835f19b5a3c02ee5b921ba258ee8238203116d52858b6cd0621e31c91a6831d31518307a948d570523440883f57ca53d43d5c4138bc28df177af2f68612
+DIST mbox-importer-18.08.2.tar.xz 33584 BLAKE2B 4a07c2b488fdaf66b572d651ed99db366070f97a50f3af3898886dea4f57816b069c4b9c9e505d214c703599787710df64244886643c50b27badc42c4e0c40f1 SHA512 00ab3483f4298e2fc3cf66397c36f9cdde0ae6a96d0a530e77859ee0893824e0c99f02a73064e852f2c66ee8db352acf50c8512b39de4c47442b91f7e7ed5139
 EBUILD mbox-importer-18.04.3.ebuild 825 BLAKE2B 11afb1b2de82dd61e9d11e97ce26ae6bb992e7258a35e54a81af71a0007a377f31e0c26ca4bba99cbba271788b817f911fa4b49806d189527343aaa0e545c592 SHA512 bcef7a6cf789a20310b5de726944689465a4bcc1263b0f65f4c3f8463834ac1e9fee9024745ed1b0a364b05a2edf42c517f687681f6158bcc3a1ad36cc71a8ff
-EBUILD mbox-importer-18.08.1.ebuild 827 BLAKE2B 9a2ece799fd5f1526a24c0501844b31e3933000040e426f1ef466e5f3b4a89384e2ff75ae749a1dae030d9c388ed5c2911f8179474791112e56a8a51aae55314 SHA512 c18b40ec4b237a9acf9f6d84f8bd65fe1fb65a23f3996a45af1399b7378352fcf4bb4cc387fa8b5e4e1e055e73eb0edbc69bc566ea0f6bbc2a9524113207a8c3
+EBUILD mbox-importer-18.08.2.ebuild 824 BLAKE2B c9320465fcf6372c7656e35941e7c8f3cd0dfd45f89a8bf4273495d9941e7f725ac60bde240262711cc0a8369b2e4680824505f397cb6c70e3ca31b421cfbb18 SHA512 1cd3d604e8af9283f22d1b241c44932a1daba54bc779707571ce690422ca42e8a48bc9219dab4a7157e276872b8ff5350683455698efa6cd4f382374db96b263
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-18.08.1.ebuild b/kde-apps/mbox-importer/mbox-importer-18.08.1.ebuild
deleted file mode 100644
index 7e0ab68ff2a9..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-18.08.1.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/mbox-importer/mbox-importer-18.08.2.ebuild b/kde-apps/mbox-importer/mbox-importer-18.08.2.ebuild
new file mode 100644
index 000000000000..126c640f4148
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 b74539e228d9..531956b6aac2 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
 DIST messagelib-18.04.3.tar.xz 10461448 BLAKE2B 812f5679a6bbca72da39c980ce10581b96cc844a7c38b87a9d5ea5eb6b6ec58b26b561fd4abdd782d39012d314aa0a5134683454a604ba28a1cdd301ea53f25a SHA512 4aed5990ccb9f5f1fbe5b6d71a63a2ec2f342a7eee81953417f3ab9537200fe66f95d742ffd6ba4f2a9f794b0b119db2e3f3d0766344c8459e1b23b043f11fce
-DIST messagelib-18.08.1.tar.xz 10449228 BLAKE2B c410000dc2541bdac3f29fef5ef0047a7da5be9ccf48a803d1660ed4712c7079ac691e0d1118bf4c2d5b99e5bae3da1889521a6d943e8b35bb1f9d39bb48cfdf SHA512 1439aa0cd441d65ae65938892e0f4bb97f9323893e083467f1fd595bba47fc6e065d11159eea519d1966535c1944e72c680e47482344811791347bf1d1568496
+DIST messagelib-18.08.2.tar.xz 10423480 BLAKE2B dea423a3b88fd83e8d1071f394ebe3d9ca3113ea53657a663c07becbd883a254dc487287c3a134300a93135ce844a485c947c7065ad93b13bd1c1507b4cd5363 SHA512 4f2a79cd9f4110ccf87fa097a2be4f1afa67c266282ba3db69db3148312f26391656df21ca00f7ed2d07d3a194057b1874140468da6f63f1b269a4c2817bf0ad
 EBUILD messagelib-18.04.3.ebuild 1937 BLAKE2B 2237b3b9c9742e7db917847cb813d8a84ee64de76870e5a3c5cb2400b2faf67fc63e5c08ab68d436b02a4e0500bd847c32e915eb01c1c17914a32907505ea6d4 SHA512 29b95b086b5e8b2a4edb98b10ca1b7b7d88afa8f557496c7a88557631b6fa47c05085e7e7a234a6fc8df2319eb8aba4e9aaaaa405530925564311f54038ddb77
-EBUILD messagelib-18.08.1.ebuild 1902 BLAKE2B 87dace8dc86bdb50a03ff03a549ca60877610350592910f62010ffb9d2f0f81cc3d1a6664387433f7669dc9ccb15a67a88881cd1e8207e2af45fa395574092d7 SHA512 753f52083e1dcd8b37abfbec6a727f9b11a0b8bdd1e1e3695a2df93bb76171667420d9f10bf0afa45c6a1328a8f8160ea25c97be6825f03b009101750383f9ad
+EBUILD messagelib-18.08.2.ebuild 1899 BLAKE2B 29d1da4b1d45a544ed77e9093c9b8c1d23020fd1f9f571f7365fd6aa4b693fafc7c207b38faaad4570ffcad10b7d40345090000cb91c9e35f9cf6635e792f087 SHA512 06af0f8e792867f2267cba4ea79d0b4c99f8f2142832d0af616584c26f2bed2f875ba4a60f7dfe73878a24e0ebf1d80f1b8f4c1d628a69d38dcee19b5a11b38e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-18.08.1.ebuild b/kde-apps/messagelib/messagelib-18.08.1.ebuild
deleted file mode 100644
index 03062a8198ca..000000000000
--- a/kde-apps/messagelib/messagelib-18.08.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=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-common-libs:4
-	!kde-apps/kdepim-l10n
-	!=kde-apps/kmail-4.4*:4
-"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-18.08.2.ebuild b/kde-apps/messagelib/messagelib-18.08.2.ebuild
new file mode 100644
index 000000000000..fd87e77d18be
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-18.08.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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-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 ecf06eeb4345..6d47af475781 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
 DIST minuet-18.04.3.tar.xz 27786944 BLAKE2B 7386bd7a14dcb96225eb7fe070cd914f8a37e0fae5d0f01559cd468bc3d8ff1f26da4ed5b8176e1107b646bb453e5e9a68d4336fe106de46491db4fe880224a7 SHA512 c602b377323b1bc3c115a9297ef042738f25274e5b028756aa307e9b0951dc853771b9e4031d6ee39c868f2db2459ae316f0691a8f5efd291e89bf9c88c5ee19
-DIST minuet-18.08.1.tar.xz 27784912 BLAKE2B f0533d280eee3a312101811c085b36ee3dc37f2b61fc48f6a5f3a7384289b2c5613207cea0647cad13251b7bfa5504e17fb51f9995cc00b39c4cb0ccfd765b3b SHA512 653db86bc761f59df02a8d8ff82e59afeb71ef078a62ba5712d5092b0d9651dde9ddee027d303e622bd143c6aee49b01da1476d8cdc484b89192c08669cc6bef
+DIST minuet-18.08.2.tar.xz 27793352 BLAKE2B c2489d0ac6970a333c233e693d0b2aae9865a37708995ded52333e771409dac706a8e65a71d28ae1a926d2418aa7b906bbf2dac4a45ce1bd8057ed6f49c186a8 SHA512 0869a0e84daf995aca219c063ce38c88b7cc1bf40c0733aad80cffcb0800d67bddc02e3d21dce4940802a5262307b409447242954249e4093a16ce5dc336f369
 EBUILD minuet-18.04.3.ebuild 586 BLAKE2B e62f58a2382c54cf41dbf6f476c22f6e51ad0d93c42fce1718bcccfd91d0a6825b988d2b906d6865d8750b748c1e0005d58a7e60a8debbf809f3db8cf8e1544b SHA512 45d18600f13c35676b18976ebed1cc6d6f447730ac50e80b9b0d4de05b56f31eef1433c8b947999d8d7da724afd4b78bc9481a32d7f254ed65f3863d1bbee730
-EBUILD minuet-18.08.1.ebuild 588 BLAKE2B e9be0a1f2b0971d041ec3cb99dbf250ecd862421adef49d028443d1a94b8861f137683a791b0cae25d194bd9c61414efe428821a5a63e34a15cb4c402173c7af SHA512 9315c52f7b0bba2f2764cffeca373edf4ab5d709b4f5e6238a910f5019f809c430535452cffed512ee0a70bf605773a91f9abc08ee20a74c5bedf0e87fdc63bb
+EBUILD minuet-18.08.2.ebuild 545 BLAKE2B e21c99eaca2af49ea870161f63c54d3abc2458e1e962e0113871e513cbd4218e2412531dbafee55b4cd33009a6dcaf895cad7cb9819abcf019348cb60fa594c1 SHA512 13c2f0861fadfa4d3354a7012101d5f9e5b7e86c4460cf83da2b95343067eeb028282a7fcf9133a55d92c0896fa911a8e6e457a453cbbd33aa943ecee502a06b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-18.08.1.ebuild b/kde-apps/minuet/minuet-18.08.1.ebuild
deleted file mode 100644
index c0bd89a53dfc..000000000000
--- a/kde-apps/minuet/minuet-18.08.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
-
-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/minuet/minuet-18.08.2.ebuild b/kde-apps/minuet/minuet-18.08.2.ebuild
new file mode 100644
index 000000000000..519702b71314
--- /dev/null
+++ b/kde-apps/minuet/minuet-18.08.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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=""
+
+RDEPEND="
+	$(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="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index a0cccdad8318..cc1a9279e800 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,7 @@
 AUX okular-18.04.3-path-traversal-issue.patch 1618 BLAKE2B 7a4339189f98e24e2cd85af6cb34efa7858b1e110e504b7957826944f30e7f0a822764d29a734c258b64b5fdc51c6f1d904c8b6c8ea3d15673b3b850afcedf46 SHA512 35fbc65d941cf83d916ff2c44b220f7f72bc9ee4afac2e35652f4a86ed2e68b260a8316d5960a6537152e33b96675870c0dd0afdad45b921036f42af1cb4a5dc
 AUX okular-18.08.0-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 DIST okular-18.04.3.tar.xz 5784876 BLAKE2B 5f6c28f3825a9dd3f551044d22ec57fbcbb209afd5e2e2b4900d99b6fb4bf74ab4ed9999c4146c27cecf3004469841950b13039690fd31b8c1c757ea10f5920d SHA512 9ee463627089caec1b4fb63263daeb8ab1001d415a053720adb498bfebe44a3572b322841625b9419a34156866302bfc35eac6a68ae123a99fe61b19287c9c0b
-DIST okular-18.08.1.tar.xz 5768144 BLAKE2B 8e4c7be02f92cba12abb34f94c513f72d1fa23cb772d87c002846cfecfe6acd8a7ae50ba9683c51db8688a84c18391fe5dac078aabe9d0fc8bc7121c70d4b399 SHA512 4114c614c3d773de158469a201c976ad36d706a0eb00b238af49d5e5a97fb272ce6033f744101c7e26110a7ac6b9c6cda26e3fc8c9c1bde22277f3ba2c55a375
+DIST okular-18.08.2.tar.xz 5768108 BLAKE2B 8b101320799134928e57854b1f47dcc3eb2e40656b871e52e84d661063708022b6beecedde22b5f463d9468f7038ae2f82e3d18940c710949f2cf1a331dbae20 SHA512 099efe86a99f3c44f00873a01f6b3461bd0b1d0a6099c9954de034bfad9c483647d2b2c5cf87c5fbea4b2f6b4c350344480fb1dc77d9710991f9d7c5300ca8c4
 EBUILD okular-18.04.3-r1.ebuild 2984 BLAKE2B 1932c162cc3533da8f955f6d885b369bba7519a5168745a2cc9cc16ff019589742b312077783bf785ffc10401a1f9bbf132ad43a920d33a41cd4eb2857537b4c SHA512 2ecde3207633e2cb45c79b3bd3a729a4df124ac50b680519204e0ff398ad75a4359d2314518bd7952d1eb8be19c805219b76c514257ff8ecf6bc6ef82f0590c0
-EBUILD okular-18.08.1.ebuild 2940 BLAKE2B 2554f14df7c6d81302faf0de1bb4f9543dc15641fc21aaf6df28306eb059879a36a225e02b486da4384ee077eb739c98439b4eaa14aae880919a3c5685924275 SHA512 c2af85a8888d031e7b853600619e563ebddbdfe21452396ee793e18cec06f7f47e9e799a34418016cd029f7277af4563c918e7a55e7d37b7b7cbffa92c723bfb
+EBUILD okular-18.08.2.ebuild 2937 BLAKE2B db605187758113b5aa9045093cc7e9b01aed1293c6f46ed0e7918a954ab6624967f4700a3cae88c9f484c8515bd9bd5132541f5fa39773a7c22711e0ce76f4b1 SHA512 d44c495e7aca10e3d09ce24a555a093667a92f59b0e10cf950324f10cc70fa156759f6353a7bc26d442f9abf577b196b07bc76da6ba9362fcc3aa52b3d96b0b1
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/okular-18.08.1.ebuild b/kde-apps/okular/okular-18.08.1.ebuild
deleted file mode 100644
index 50de28d6ef9f..000000000000
--- a/kde-apps/okular/okular-18.08.1.ebuild
+++ /dev/null
@@ -1,103 +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 kcrash)
-	$(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}-18.08.0-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/okular/okular-18.08.2.ebuild b/kde-apps/okular/okular-18.08.2.ebuild
new file mode 100644
index 000000000000..eb535ba3bbcb
--- /dev/null
+++ b/kde-apps/okular/okular-18.08.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 kcrash)
+	$(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}-18.08.0-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 b726d423494c..9e7f9a95587f 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
 DIST palapeli-18.04.3.tar.xz 2061768 BLAKE2B eb1b8e499be2af52c9111aefce2ae7d9850a6538bf7e4414eb9265916fe7b2ec3f9ed152c45189e8e7d01fb7cb40152605001bbf4d6bb13e2431de1c17a90b89 SHA512 3da548346452020f398229a1c0c7d82062742fb729ca52e6781d809c59d9e7051e3d697dd156e58a4a6c10af04e5beb81609a5c6d70d139cc90ff5dbf5652604
-DIST palapeli-18.08.1.tar.xz 2061460 BLAKE2B fa3929ea5c6e13af0a31c69723e5cf6964b336364286742aa48e1f9f846768b132af5ff06dc4006fa48496af7f358d35bc9c4231e71ea582ba112366a9a38112 SHA512 13a9dd8eb140f4cf52581adbfe66461a87860ba6b10a0456dea077e4d9d270220c09324a6fed2d9fbd87580bc06181a41792067fac3596a0fe670b12c4da251f
+DIST palapeli-18.08.2.tar.xz 2061676 BLAKE2B 4b25c649d6bdad4255978a6802688399a155e54192d282f11c4c4af7e93c908989a9bdd6073459f8ae6da9232d30699d42dfce2be07e56614c3f62c6295c363c SHA512 b0a5d965d4200f6a2088bc967f3c4d4cbb4ecaaa542564e615f3df293dbc7b3a3186c10731e768130ca4b4ab9820043971fbb74d051529fa5e71a32a17b5e14d
 EBUILD palapeli-18.04.3.ebuild 935 BLAKE2B d6b5a0c2e8e1174f8ad344c1160ef01efc80dbfdd801a2f41521b870b64e4615640c86aefccb24372e620bf6d61dab3ab0ed6a03b6746d0f7794bebcbfd9e079 SHA512 c019e484efbcba665f5a0848132555e341f9447964f2c2d35d963c146b082aa829c98cc87367d00356239a65032a82b48f7bed9a22ba7cac442061cadeca32e6
-EBUILD palapeli-18.08.1.ebuild 937 BLAKE2B 57aef5a7c39f7945679db1f5bca34bff7d08ee04adee1e14197de68ee3fe7ca07989c6e1267018404b418ae0ea6a4b29bc321c0aa14a17727c606ac6d0c5486f SHA512 ce341d56efa545e4ea7f4cf8e71fa17d77e39ab14cadc8e6941d20a2e8c800bfb7b0072847036eddb2b495d34be81738573ee4c428db2bcbc365f8bd919cc4c5
+EBUILD palapeli-18.08.2.ebuild 934 BLAKE2B c000412be2904638139de351947d1d109353eab522d81640cf5559548df97842a07b53b5c9d53ee16a1c20e029ccd7f87f432416f0fa46f1bee69af1335ac44d SHA512 7387926a962935334338ac705ee6184679e01246e0f0b377794746c04981bb414453543750acd0a28fb9e09a5fe7d8851364fd227a076a751ef1a4d5a507f376
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-18.08.1.ebuild b/kde-apps/palapeli/palapeli-18.08.1.ebuild
deleted file mode 100644
index 40ee410a23a5..000000000000
--- a/kde-apps/palapeli/palapeli-18.08.1.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/palapeli/palapeli-18.08.2.ebuild b/kde-apps/palapeli/palapeli-18.08.2.ebuild
new file mode 100644
index 000000000000..818f975ffaee
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-18.08.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 069ee3638056..0af9f10d03ac 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-18.04.3.tar.xz 8829720 BLAKE2B e49cb4d1474a8eb0785b5e868d4cd56cc0c2616e5c8c2f53ebac478e0e561fdae871106c499563c1c3a17f58bd8dfbcf979a4bd4991cfa4fc13934585367e51d SHA512 438648d1b15b170d33c67b5ac3101558da0c6b67b9c8096d5634fcdead737764579276dcfdca6e55d192366b1eaa5536c2f77ae76bc33e760150de401be18fb9
-DIST parley-18.08.1.tar.xz 8825316 BLAKE2B 3c7b8b4069fb1ec2e1c220e40bb7da5d1164d65cc5b4479816ffdab0232c49d856cbd7357dfcdc08343467f934f7ff898ad33bafa1fa50edc8dd9df0cf5d711f SHA512 62313b8c4b6c64a4510a0684b46b72804b5428baaf33401f4b1733bf940c57ac1dd92dfd72909ca3bb243e333b7b46d9acd8118ff239467722228734cf513594
+DIST parley-18.08.2.tar.xz 8825436 BLAKE2B 7662f371152d53cb7f6664c77be539e18414a266ffacb3bc9f36382e6ec506ac7b93e817543f693b373089a4f6e3763f1f7faa9f8282068bf688c831b8956910 SHA512 b4143208f073752c7295da7743dc65e9fe62fb8972bad10a220ba76c6ffb51bb194a762d151e1ee62cff689276b42adbc7b7aaf638f3c833d16ab80dfc37fba9
 EBUILD parley-18.04.3.ebuild 1255 BLAKE2B 2e0d0fedb3759793846d8f2c4e7a25c8a9bca996591a1baf1b38eeca9ab23de3565f6310c85ed404e4b08bf32d22a05e98462cc5af6546a8fb70902f54927520 SHA512 6a1dd8f607503b55fa87cb6b148559f631008a741453703264232268a83f632f5fec0baff9b71c2002defefe5f92594fcaa883867f884f00558ccb9fac6ff952
-EBUILD parley-18.08.1.ebuild 1257 BLAKE2B 094b00436dac68f3c5899f9f70f97433970eddf2d48ff34b90621f3777e77c60ff9b6d1785827dd9075e21bd50c7946bb15a6019d0d931cc519f75d0ae41f8de SHA512 68bf20bcc3ae12d15ab4b3297fc3760af9da33b09de58993db688bda01365301fe958063cb37a1935d3a89efa2fef82082b9f9450f9267e6a0c2377839ca4df3
+EBUILD parley-18.08.2.ebuild 1254 BLAKE2B b37c107190eaf7ed2c707731cee772c72664a9bd38db239a3ded26b5b107d7e94a9aeea34a69ee90b802299721ad6db141a6b0f4ede1120d42ec97ff662bd477 SHA512 86a71771294db1c1ad57239e26b2b8a438d74ab6d30b5e1b26d5c7af7b1b0d7c96305484e9a384afb49849eac08bc6a64c5ebcd30caf65be15d834abefa93f0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-18.08.1.ebuild b/kde-apps/parley/parley-18.08.1.ebuild
deleted file mode 100644
index d059e01c325e..000000000000
--- a/kde-apps/parley/parley-18.08.1.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/parley/parley-18.08.2.ebuild b/kde-apps/parley/parley-18.08.2.ebuild
new file mode 100644
index 000000000000..37357ea9df4c
--- /dev/null
+++ b/kde-apps/parley/parley-18.08.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 09b393796ec1..c3f34b75ecbf 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
 DIST picmi-18.04.3.tar.xz 1146732 BLAKE2B a9f64f79c629c6bdf7bf5b38b5aaf2b3ec8b71bedf7c54cc5f9b9cce862401b6f09def37824c7196d9adf7799a8e1739749cbecb6ce09317c2676aeb938c89f6 SHA512 a9eecd7e746d2f64bb4587c88137208eda644a6c6f23f21e6405135397ed3f562d5ac2a4c33a88c99a7191a56a0568f489ca8cdb9ebc68e5ee7dc6552ab3a4c2
-DIST picmi-18.08.1.tar.xz 1356164 BLAKE2B 47cee0e5ffe5c53e72f3ea319b0f03847478496c717d1489fad2443973b0f2bfb00438f474de4920b384b8b208903e1c740f483a37b5d7582d1b556e2735f972 SHA512 644d6f26ad246ad4babd2a85f59f38f5bc8a068058934186edfb75afda6af710aa660c9b3899894ef4407bdefb703928cae63a1c16f6c13f983e5a5cc8c7142d
+DIST picmi-18.08.2.tar.xz 1356112 BLAKE2B 784b04b6f8c13db874bd0c70d4eb4332c87413b6b06515c7ca37abdf390bacffa1853941c53d0c1b42bd554d6b54c5ff73123feac39b94ec9a609fc872e105f7 SHA512 a7bc38e630c8afccc9ac32f2ab6fa0990f7f8d23abc7e122ab37476e198868d3c0b023284eeaa2adbfda21346d2a16980b4d9f034fe534293de47decc5aea069
 EBUILD picmi-18.04.3.ebuild 845 BLAKE2B 724f2fc96d2c3a5ea5aee9e9f745e2190c7b30d3622f8810ced762021488873373cb33a37675d0c50d22f1c1a2ca6fe9c483773fbf704dfa40a49f667dcf9826 SHA512 3734ac1dad577ca724d2a7136512cf4c5e99be5f998ff2be871169f3d80196b88c6af53a1ca7e9b5efc8983e418211bc604af7eae4b2b24d0087ce29198f5aaa
-EBUILD picmi-18.08.1.ebuild 847 BLAKE2B dd6afeaa9bb3bce256d0cc34cef6ab1f47db8d08e1c79596373de2145614ec107b8fe477abed8966cbd836a25145fd77dbf0dda5e1a4ca4b39616d5f8019594f SHA512 07c00e401719efdc9e9be168aace9dc97521465cbc19b07268a776637f09ee403a58837221fb0bbe1631b02bd7d52a518a3d8110b7a3af09621bfc44094c43bb
+EBUILD picmi-18.08.2.ebuild 844 BLAKE2B ee8948190483de2d69b03f5d543647341fef89255fe2b28bbeed3f9b6bfd0e6d7cf78e065194f47aed590f814ada7b4ef286aeb600f7d3a496291ce2a16ed1a9 SHA512 38ea868ad94a9b17a388d1a97e25d6a2d655742d485076d6d233949a1cf95f53ff245542be1a03de0d1fd62c85a00dfcdbb1af8e80cdde5de8ad43e5ca42e2bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-18.08.1.ebuild b/kde-apps/picmi/picmi-18.08.1.ebuild
deleted file mode 100644
index c25ff58b234c..000000000000
--- a/kde-apps/picmi/picmi-18.08.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/picmi/picmi-18.08.2.ebuild b/kde-apps/picmi/picmi-18.08.2.ebuild
new file mode 100644
index 000000000000..9615ae54b77a
--- /dev/null
+++ b/kde-apps/picmi/picmi-18.08.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 109a04f6766a..74de390f3111 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
 DIST pim-data-exporter-18.04.3.tar.xz 270248 BLAKE2B 27d8545408ba37ff7790e84d02455785b77b0eb865e5b236fc15eacd81e3df99d37f2c84e40d6cbc5ac9296d0b95a290744e5dc9c2e5103ea9deaa987421cb35 SHA512 29550eca64b6026c900b30303fed29a06b31a7c773f7f387c899afbcd7b735a07efe95cf7366ccbb6ba6b4884d1c1491193ff2f817a032f27002bc8234b82301
-DIST pim-data-exporter-18.08.1.tar.xz 269264 BLAKE2B 10b532d6103ed748897ade0ecd47d415aaff17e2a3125b247df767c1f260e4960669affc8bd4e9ba2401e3f956c6d37e95ad538c17a1146ae8e239e390a34dac SHA512 29fc2d609e9d8fb510f90970a99567ed6084b6409cd2463b1131efc931033d2910e613f98486c4df26cd5a7e17ecfb2df08a35a8e5cfc83b0d97d1ad4ae7719b
+DIST pim-data-exporter-18.08.2.tar.xz 269564 BLAKE2B 8a00acc5b5062da769a1577f71f5803eee70f1869b0b82599f8bc25f605ba6e7362e68fa1dab57472a2fd4886e937fe5d526776f0b80dbff1ce75854d110e5eb SHA512 17cd649639402cadedb2450ae0f303ff815508802b009fe50f57b715237eed99b1ad67c6372823f0f197840eba0df249efb2c22c9ef8d9befcfbe59a1cf9b946
 EBUILD pim-data-exporter-18.04.3.ebuild 1212 BLAKE2B 57201c91ac3526453e6a96b73d38eda4237d2dab425dd92d2c87671efca4e3f1b40144942f8f7ea35ce54e23000829d0c390e751127c0441382647b92db685b3 SHA512 52cf0e379b1437ce5fe2d05319c148abce6c019f94ca45aaa83dfa634a47fad91e1ee938c54fe234e0ec0b2d3086068b97688b7b987c7b0a0e4d090d3dd0fb84
-EBUILD pim-data-exporter-18.08.1.ebuild 1214 BLAKE2B ee29f508cf6d59c9df144775e0c690c11363e5e5cbd8f86c69bbdc524da3ff948ae7cf658871f355c0a0950c484bb058a79c00eceec9fd7684e6a4a243176216 SHA512 27af2c79e3b61d5cd352ff791bd6fb5b7f2d7a8451a8de11bbd4ec9fc6664fab6796c8e8fff5fb2fa27dcd930206bc35d438d5a62d855a414e12ce62872684e7
+EBUILD pim-data-exporter-18.08.2.ebuild 1211 BLAKE2B a1af1f770c9303aae9844c71fd3606111ec71b7a87f190d595d59b8e8f29391305a0b14ddb7ff062a135ddede1d2315b00cedc243106ed71721a1e4677fddb75 SHA512 8e2f95f57499c78c59ea809d3f13df7355c6eeb4955ad5a9233d4e047cc6ff8f5dcd72dbba88726ccdafc5fe69beb411158208cf68301e702d9c807906a3c7f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.08.1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.08.1.ebuild
deleted file mode 100644
index d6967027d499..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-18.08.1.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="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)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.08.2.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.08.2.ebuild
new file mode 100644
index 000000000000..7858494a4dd9
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-18.08.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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)
+"
+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 7ad6bd49c998..884d838e2eae 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
 DIST pim-sieve-editor-18.04.3.tar.xz 447160 BLAKE2B cc28510ee0278a691094c42df113f02299b74830c410f74467ee69b59d2b6a60e5b0861300967c1857c5afa57025d93c1909230c085e1f7caf2ad9b30cd79728 SHA512 344ba01e3f67c359e912e8bbb880aaf7ab1c8a77e793614a1ccc358551e3c163eddef7c48b178678f99d40dcac4a8f1b687084d21d37e39caf98fe75ebb88a93
-DIST pim-sieve-editor-18.08.1.tar.xz 447916 BLAKE2B 953fcea495b98d7c11577bb4180fe4cf3f2b704337ed2e53e7e5731232e4e3f550a3ce05aacc0bd87acce829d2aac77900bac751d38544a84c2f9848baa2ad19 SHA512 7449b10cd6191a7049a54773aa0e0c66e52dc867a9e08b21a428e221e27dedf220097eba36bffd1bb695a94469ac6577eab6faebd42e73bb0a32d6e582e4397b
+DIST pim-sieve-editor-18.08.2.tar.xz 448028 BLAKE2B 219ef55ff8bf37dd6e39151baa459a87a1331d06d1726ccc097b664d45f2bddebcb9ac1ba3952d6c5c5a7ed509c9cf8c77f5c3753bd2bce47f491f36396cc560 SHA512 2b43c07b4edde30e5c5601ada7bed0a3f927813730141ff4880aec4013c3fffb31810735258ff41188ca261b8ae4e2e3a387e43295dd64e927de152e68bfa123
 EBUILD pim-sieve-editor-18.04.3.ebuild 1147 BLAKE2B 1d382e5e13a982287274b27772e0250fff48428528e706571632cfa50503ce889b8ba4d26472c4168fdbc8c790228de9c2d7cdf87e9ac84601a94eb9b775d268 SHA512 5e496bc3fc0e16dc80eebcba13bfc3a4b0f69d0a166965bbbffe1eca523eb14619d50d61ee95320a11cf4e15af41187793f691924d00c700c71199c6b9bc7269
-EBUILD pim-sieve-editor-18.08.1.ebuild 1149 BLAKE2B dd7bccd086023a6ae4577ce85173e664cdc9d70c380268355f772e00d45b106d6977f280414e90bb6b13900463469f48e35d00fab154eda674d6f4d99b0a6309 SHA512 2cc007e8ef84d2dddad22bba7ad9316b04e4d90b707d3d55f4d4cf74909bf66d0282c474a03975b28fe299f71b564053a6e4358670ea89ffd37a7b16f167141a
+EBUILD pim-sieve-editor-18.08.2.ebuild 1146 BLAKE2B b3e729a8910c6bb8212716216cefe27147f1ac575f0e562892483a8630e7d2d95e3b5e9f77d24218ed179d1465a58c827e2800ca0d1a47fe00d7e605bb1c603f SHA512 1538ba5757ebc2943838832bdbd82508db79b465312b46d9b63aa53d21e7a27284840c8b4bde66e429fd30d2ae7c51be2e7aa942cb9caad86617cba433fa5a2a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.08.1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.08.1.ebuild
deleted file mode 100644
index 844361049fc3..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.08.1.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/pim-sieve-editor/pim-sieve-editor-18.08.2.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.08.2.ebuild
new file mode 100644
index 000000000000..c57648cf491c
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.08.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 74a06bb802e0..a2bc73da2099 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
 DIST pimcommon-18.04.3.tar.xz 295512 BLAKE2B ce4697b0e850b7375741e5af2a0abca7b2cd8ded341338ef6f1b358df66d724d0c8f01c45b5d13eb042bcfc3f396545ce68798d37a3009c2d00b51be901e2957 SHA512 c933184da3ce1626a28bc20b851c583e0fc21485855414b0e9c161cbc7eadf7ffe1916dfbbaf9e74fb48eafe152436ac73a5082c2ccbab219aa45497c45f4e14
-DIST pimcommon-18.08.1.tar.xz 293316 BLAKE2B 86d553936dee3093f5b8ca35654bae9e31ac76f785e12ff90a8b9048b6e432aa13100a429a942e73a3ef84d8ca49bfda44ef712be5bebf02f1ef9403f70d0c37 SHA512 3a2eede674a8f442e18f9d3d301dbccb3686307e37d1974dc565fd27d75b6560acb1cd6150a996063794dd891c2562bf0e2ee6eb6b13c66783eba019bd93470d
+DIST pimcommon-18.08.2.tar.xz 292792 BLAKE2B 5b26b91999f776b62ac9cd029a5cd14312ede4be942779a114fc8d2c135e208d22f73476d094de3ca8768cb9705855e9fe93c38c623abf584357e4ad84e0d812 SHA512 d911a0196361164bfde015bf2531527bb2e4c40204be0d57a171de358b90ce7eb91c4ee4d3364f753870b0ae6f4caa109081fa59e74de08215863479e37bea1e
 EBUILD pimcommon-18.04.3.ebuild 1504 BLAKE2B 5601b91b70ea6e371d5861dc800ebbeab61213868904d013550849eda59eedb5a595d94c3598a391fa2f3a4a9d54a58d83fc022712b50d05e60dda253a918609 SHA512 a7b3f5b224e75985851bfb105c7ba6e1d1f323049849827a723f13ebd4df06656746106467a072098970c0a0199bb178dcc55d30e62a8bdf4951439d0722557f
-EBUILD pimcommon-18.08.1.ebuild 1506 BLAKE2B 479ace59dfd38a8ad1dbbc9acd18adaf72d2b89ba78adf1cd3ba38f330fbea0aa952b552a17950b80430b3f61a12d1590f174cd839a9642cc4a3c74e35a5acae SHA512 f7e05fee9905e87e615728d0dc31984787fd154bf5d4625dba67d1bdb314f75e54cfe36d0d882254cbc19b2de201a573a6e9c6c185b3ee9d5ce83723624ab955
+EBUILD pimcommon-18.08.2.ebuild 1503 BLAKE2B b03b3cc267e30f8fb41a819de4c0019fa216ff0ea0daf71fc6ae8fce278f3c7ffd7224027fd606f0b3b3a80be2572975c373861fa15d4af7423f9b0b0aee7122 SHA512 c50b1c57cd47f8e29e04cb6c919e8323b34c3c9f79bd3ec7eb5e5ee0ec395b2394756247005dddf745532bd08f6df54d1476b5ec82098c3a82ef113b79ae57bd
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-18.08.1.ebuild b/kde-apps/pimcommon/pimcommon-18.08.1.ebuild
deleted file mode 100644
index c1c707a1725e..000000000000
--- a/kde-apps/pimcommon/pimcommon-18.08.1.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() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/pimcommon/pimcommon-18.08.2.ebuild b/kde-apps/pimcommon/pimcommon-18.08.2.ebuild
new file mode 100644
index 000000000000..e5b1ca723dcc
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-18.08.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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() {
+	# bugs 641730, 661330
+	local myctestargs=(
+		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index 2ac243ee297f..eeffdd3dc301 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-telepathy-meta-18.04.3.ebuild 936 BLAKE2B 8ba54ecd638b9340f9d950f4a2288d975c3cfbebb2fb9bdd1038e36f70f7156346085aa5c8835eca823fa772856ecdfa748e8fa1277df16befde03790c3a3f96 SHA512 7f6648e8285f603c0d3ace3b178262fb3d76a47dfb4dd65e68aa2d31326f785183b4fead521bd410c75ad65161ed94cbb0c0e09583eda6bf27f8075f225fc47d
-EBUILD plasma-telepathy-meta-18.08.1.ebuild 938 BLAKE2B 8db0a9c7f43f15bd87173c274bda17aaf9a8d608e761c786e023e580c3a0e2abbf9366744d6777b3a64fc5152b721b2af31356e7b906a28638c9cdc7755e6b59 SHA512 dc03d147befe8be681fdf9839bcca74e14c7aef11d6e6b371dfea235e57c9ade24245f1205f0119fc4210888a8bd74c487b275104803edba1243886a82db2124
+EBUILD plasma-telepathy-meta-18.08.2.ebuild 935 BLAKE2B 23779b4443b734b3bcd76f49a1feaf6bfdd499db1ebfa8c633d61a9eb5f4829889a994552bdd43a5ffe50b967151f306ca779e6c2dbd2b93104ccf5598022bf1 SHA512 1c0379449a870f9d855be7efe23a1c061e22fae0fd9bc2b8ad9b7b5a5f82beff48291bfe69bdcb8f157e03ffd73221ebee8c3c1d890a0dfd717d440c0e367215
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.08.1.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.08.1.ebuild
deleted file mode 100644
index c133533744d5..000000000000
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.08.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
-
-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/plasma-telepathy-meta/plasma-telepathy-meta-18.08.2.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.08.2.ebuild
new file mode 100644
index 000000000000..8fd4b5101f45
--- /dev/null
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.08.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 37fc4d2ef791..d36d61428048 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
 DIST poxml-18.04.3.tar.xz 43160 BLAKE2B 7d54129aea950d4cfc238ec03b31aa5e7f7c016f871ca7bd675bda46baef19224de429ca1314a2cb029a00279dd8022c8975c754f85614189abc262636e4aa67 SHA512 176af4e57c90354c0809d99ac1d5260ccc44eaf73a670ccb7aa205f4e67966d36ed68f857a9ce62660186b738688d3bd53df1477cab9af623660062e42862b81
-DIST poxml-18.08.1.tar.xz 43216 BLAKE2B 2b2900eee1fffb2d8159a0267a1f8a42a42c4271e02007230ff0236be3ad74c59845750117d1c88c8ba55095302fa318afe866229c017ddc30ebb6982d9fe453 SHA512 f8e9913afb5e3701700f45142dbb3e4a766ad65e3313f985a50f0258f4e1d3316b22cd2c740356ded4d443ec703071958c2397615134ea4775207a7edc250634
+DIST poxml-18.08.2.tar.xz 43156 BLAKE2B 5aca8842afe2e2069cad0b9da45b14217416ee1257d1e4e3604ee416ac807a4caacc22392e189f8efb276db0b6536ee2978c4f4165fb56e2b2d883ffdb70b07e SHA512 61779e149f1405df31e467a44bcbda4b733d3cb80a812be29992a71bf2e62540d6ba6840d1a9ddd30528389d9f545e796987ee82970e24eb803f866336ebd5e8
 EBUILD poxml-18.04.3.ebuild 340 BLAKE2B 3a45ed2f3c9c6d5e8ae2fa23280ccf1e95e347eb220486ece8e9460db877e225f2f31a5906585f732cf4fca44a716f5b46526dd879db9c45cc22725d73987f8f SHA512 4efa4312b7453dfd5a86cfaf8b2ff1866f237be9cac5a28049d09b2a2b473c9061021f82918d9327c4d083a5513cd4e6a1029f92a87badab392d9df8d23cb55d
-EBUILD poxml-18.08.1.ebuild 342 BLAKE2B da47dd0d971b37d1a80e6791ecf18d17aa4b051914edf17404219f16a3f944f1f139d44c97b0375cb6ba57b1ca059b3934df902105e4744f45b8a017dfea6a83 SHA512 8271762279435f773cc4b7565d1afaa4f4a731cbdb4fee1e4e46cf0bb990e7ba6b7ed78a7f5e6ca8cdd28e4c83ada388fc76f60c2cc9a04d9217b22ed2860946
+EBUILD poxml-18.08.2.ebuild 339 BLAKE2B c1c3e6ffeaa626304d53f58cff7df18365400d5e8cc288017bf5d75d5e21ee34ea398416c2a96baaf659d03b306b536fd8447fa2173f546df8a8a1af63c9c79c SHA512 36f49ad16efb6b2ea5f836a13b87f4c3fd4b78b958a5ab40465394aa6de0ede1d7a46ca69a8c0257c079240b960d423315d09fbcd378d89fbf0e6b7da51ed7f1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-18.08.1.ebuild b/kde-apps/poxml/poxml-18.08.1.ebuild
deleted file mode 100644
index 3c605a013f0f..000000000000
--- a/kde-apps/poxml/poxml-18.08.1.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/poxml/poxml-18.08.2.ebuild b/kde-apps/poxml/poxml-18.08.2.ebuild
new file mode 100644
index 000000000000..4ddcd2f7d9a6
--- /dev/null
+++ b/kde-apps/poxml/poxml-18.08.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 7e68139ba3c1..cab36055c627 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
 DIST print-manager-18.04.3.tar.xz 238724 BLAKE2B cd372ce2408287ba5c1eff2b614dcd5eac2d44f7a61aeae9c4376b47fbe7eae786fbd1349ba50a436916c36f8671652776464aff4738ab55c2e91b04052adcbc SHA512 0f3ea85c704a596a299e457b0c73afe844c1f2d14a76952e4abc1f3a90a10ff6e28b380a27f383939c0f9f2412c62c1016be2b63220eb664ef5da5ea627ce6e1
-DIST print-manager-18.08.1.tar.xz 238808 BLAKE2B 99ccd25d6e3c3ff4f7ec9c883311fb37c681f7708c560b9ef8b9270ae5edf1df0b6328c9a8dc7ddeee98340ce77558b816e4eae06bdbc4985e740b53b6135e0a SHA512 cf02a33877703523a6d8c3054d111c519506959aa5a7eeefb39556171827ffd212a578623d9cee27ddf9a2bd55342dd1e1c3cf3614ca8d25d3e9146051340635
+DIST print-manager-18.08.2.tar.xz 238756 BLAKE2B 72a67137ae3b71126e4fbaaaad49136e1cf32d3b3c3d5ff5bc1de39bcd06c6bef453d4e8b791708efcaaf78b34527a1764e8877209ae270a90d77462c501dbe1 SHA512 bbd34bcf4a9b216ff2c694a28def48991e8ab654df92a1fa77343cb114b850d87d4796e7033d9b07a729fec743531a6f58c347f09031b729d9836d58f4adf4ae
 EBUILD print-manager-18.04.3.ebuild 1439 BLAKE2B 81ab868d0134e4530cb5b9a998946c501eba943c17b2193aff153abd2197ff7974b0b1669b1ddf8464b2660bc4e0646ac0ca7692ce2b8bdfcce4a68c0ddae955 SHA512 6b9979f6d7aa30329cc0e272b7c7ad15c17bfeea61ff516ae4cbeb442f7aa3bfd42144ebff0e0219d45f67c72c37a9b552b4d10584b4be0da3ac49cc3e555e8c
-EBUILD print-manager-18.08.1.ebuild 1441 BLAKE2B ae4ce614d01293367cd277e0018874f25901aa90e82904701c3a4b90cc73ef96bf72d9b9804840c35a665f16ba5b5204cab1c82df2fbb45c23fde8a039907e97 SHA512 a47f846b9276a5b9116e2e76e595aba7688292440e7934f05f435c62009b6c6afa16d1212aa54f431db20e9c83f30579fda50fc801fb50af6df51a32edddc820
+EBUILD print-manager-18.08.2.ebuild 1438 BLAKE2B c4dc961bba5245a75843c3b41f16a1ce93b7803ddc7d9967bf9b4482bcfddb0cf421c31eba8f88f23431ec5b8af466593267e7f51369147779819b012d1436b2 SHA512 77e2986a195a6e2cba225df42ec83542ba74b5c3cacf6a1ae4e386bce3654b758c7359f1dacabd0be85dd9ed7d4d99f18393357757fb61302744bc40c18d51e0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-18.08.1.ebuild b/kde-apps/print-manager/print-manager-18.08.1.ebuild
deleted file mode 100644
index e59f9d37adbc..000000000000
--- a/kde-apps/print-manager/print-manager-18.08.1.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/print-manager/print-manager-18.08.2.ebuild b/kde-apps/print-manager/print-manager-18.08.2.ebuild
new file mode 100644
index 000000000000..2339cfc9baff
--- /dev/null
+++ b/kde-apps/print-manager/print-manager-18.08.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 e471f4c2d4f5..46fc5f995f17 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
 DIST rocs-18.04.3.tar.xz 1519052 BLAKE2B 14c2143ff855c2719b311c7824084e5c0597fad0969e7d5850429d48b51bc1629a27f13129afb4cc64e65d00be1a5464923102e4111819d071cc82648ccd669c SHA512 90d7af9934d2eb451882013676dee3d6b9aef421043dc39d17e3bfcc05d03b6c21d1f1836f247cada5e9b78d065d1544828bfc5288df8a1250388e48d26bede5
-DIST rocs-18.08.1.tar.xz 1514132 BLAKE2B 6e4c65da7cedfb96ff95811f15b4ffa827056c17c09fd159731d6814d7c3783e4bf301977a034b03eaae02a7e2b9c25c4ce2351b4d3f61295f856f4e8e4dc66c SHA512 3b850415274bbc9155d56b7ff25dc17467d5947609133fe8d903263311b9a5551080110ee9af6f9a28c8e50c96e7f1a7d28fb5e6f91c94debf6b3ddf6631d45d
+DIST rocs-18.08.2.tar.xz 1513984 BLAKE2B 5cb87adbfc13d3e651cca60ad394eb6f6a6d8223ae8613af7e0f0b0f4280fb6d8933fa2179a3a84c07b907e59cea5ee256955b210b7e825033745289d3cd26d3 SHA512 2f5e51146cb060f7c36d4ee637ef4a9d31e4befcdadd41874b8353951f4eb1e1bee45c84c89a8a1748d4e9c74122d9d8f621391f030c3655666848ee53bf2082
 EBUILD rocs-18.04.3.ebuild 1159 BLAKE2B 26a466581221934abb3f2a63d4a953b1acce35d695b9a0b39cc4f4ac64a78f7b5b7506a9523aaa82c50777051309a24d94ce0f42a7163b5ff50100867ba8024c SHA512 f3d82947fe9726d008005ba100f062e9497e1d5cf714637a44945ba233d991b2c9e45ad9085cfd99ab7fcfaeb2c1c610b6ab770da542a35c8489f96f7f578f2f
-EBUILD rocs-18.08.1.ebuild 1161 BLAKE2B 30882ac451dd49a4fc551be55d678e659417d00bb10663b5a3607eb7dff79b270648dc53e61cab589505e6f6759b289ffc38bc779720de2877e386439aeb4ee5 SHA512 c98f2c0dba40578a6c1927dd3f5f6648c584e6798b834670314f7e668aef0c561d5ac5d082c186801f0caaef3630383618265f2e55dce777cefecc72ca1c91fc
+EBUILD rocs-18.08.2.ebuild 1158 BLAKE2B 81366523db843c1a4a39c81a2a24a8a897e659270f9ef6794f998cad7af3c8b790fe26770f77f2d667c735e7000b1d6ad505f9a1daa8ce4e5ce4f3b37df2cfd1 SHA512 1624e83a8805062cdc835a66b58b74157d6cdbcd55a91ff42c2e9d8abfa3be14ea7060844597dafadee90de6a555d96f6fba74ca5f59aaeb240c70cbe87779d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-18.08.1.ebuild b/kde-apps/rocs/rocs-18.08.1.ebuild
deleted file mode 100644
index e20797a7baff..000000000000
--- a/kde-apps/rocs/rocs-18.08.1.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/rocs/rocs-18.08.2.ebuild b/kde-apps/rocs/rocs-18.08.2.ebuild
new file mode 100644
index 000000000000..49645ed5de4c
--- /dev/null
+++ b/kde-apps/rocs/rocs-18.08.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 b33ab1396b9e..3b94e5b339bd 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
 DIST signon-kwallet-extension-18.04.3.tar.xz 10684 BLAKE2B 66907d002684bc81bb004f156c89e44b9846ee9c877e2d5faaab38a7f9bdcb48d245e9819652485ebd12c00c182c280936bc8a055ba687c567d24903e55df631 SHA512 30e770b5b8fcf58dbb856fb8e187ffeba50aafa6a8e38090c37842fb84dd9d6374dbd064919baf16584f7c3bd41f7224e8f0f4d8eb9e00954faa3265b21acf5b
-DIST signon-kwallet-extension-18.08.1.tar.xz 10628 BLAKE2B 3955dc218a71740f011145eeef0f79c896de2fed681aaa5f679429c9969842776ad08e6dde8fbea357bd1b987a3640a58f310b3eea43275e0413a5cc68d714e5 SHA512 9dd7f90f095dfc64d174835247b5eec908496fe3a0478d837c856f0bfa6043083b1a056d6f4444aec089978d53449367443c8b79e7e4c96afbe6cd326f652b51
+DIST signon-kwallet-extension-18.08.2.tar.xz 10628 BLAKE2B 69991ca502b01f5b3d7065c3cb3a1f2bd71dc4e54731579f92b9c2ee4790b4314304cdcc8dcc0df4a6ec240dacdefb6612a34061789f3a628bcd5febbde95cfd SHA512 c8be511338db36e2cd10ea6a3301519dfa5205652ae74fb4262f1ff3c59117571c738e8df64aab32ded63661c9fec814f6112bcbd317dd7a92fced88bd6aac67
 EBUILD signon-kwallet-extension-18.04.3.ebuild 325 BLAKE2B eb4c69958966690f2a85381a81bd7934ab3cbf95711aa7cd7a3c6ae0eb71cec195087ffa317c1a67e9119d4d23886024474f886ab682363ad5b358c3d0aab948 SHA512 ee754c65c63ccde2b638292aea56815f5877c4adf88a1ae99c2a70f45cc332045bb6237e37faece50e0618c6f141af1fef66c9d3d4ae2deb1577455bb728bda0
-EBUILD signon-kwallet-extension-18.08.1.ebuild 327 BLAKE2B 0a3f7e51e8e27cabcefeb6237fa06c72f2f57be9fa3c64d689589a2cd6526ef09997765b6cedd21e41d7f607f3e80b2f361fa6f4018595212f6a148708f724b9 SHA512 b61412c9e2dbf34b877161d5b6f49509fc9610ba7206a248bb5bb1dd66c3799aea371321fa528258490ca0ec93d34192ae4112fd37bd8ccd0895cbb7ef9e48bd
+EBUILD signon-kwallet-extension-18.08.2.ebuild 324 BLAKE2B d4abdcf0cb633688ee5a498e47f37390e51f3f502351ccc218ea0224f46b899a3c7a4e9a8e090f5c25b3967f6fadd6880a66052fa5ab145db3179e5a83e14332 SHA512 d76f1401a1084d7dde771c2bfffd2a6a2504a52dcd612ed6775f2f24e86c7b4f8de2856e856badf80c74a4e75d0cddb306bec4bdf57b42bd6fc529654bcbc478
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.08.1.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.08.1.ebuild
deleted file mode 100644
index ce5d29586a9f..000000000000
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.08.1.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/signon-kwallet-extension/signon-kwallet-extension-18.08.2.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.08.2.ebuild
new file mode 100644
index 000000000000..9adadd52c0e0
--- /dev/null
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.08.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 c5eb998bf50e..2a5376d7eabb 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
 DIST spectacle-18.04.3.tar.xz 1073120 BLAKE2B d97d463aee43452ce2a4aeed4f016f29282f509e8fdc110c36b5f98bf7c7a751c100491be06df1d350bd060999c158c70771b2abdcf9c692c5305dee174a85b5 SHA512 c7ac9ec521162fc30a32e16597dd9309481bba1644e75df55e66fe385f27d320015f9ac0193ca333ec4dae201d634a8c99060d1145d28a7a0b5bc69f51e57e42
-DIST spectacle-18.08.1.tar.xz 1047920 BLAKE2B 392cb7d104c0967d9147175535f213f9fa7918cdbedbbe7d4d1c9c0a2ff59dac0c5ba6cf2dc23d702af7f5944a2d54cc7acf5646193dc6b118254a4475821cdf SHA512 659cf0f49793437903caea703ab54cc9f6077645dea7a6823830cf803d7fe35a5dfbc66265fecbeacaf1e4b80762b6e54b7f07a6f52a2a0fddfa88aa752d53c6
+DIST spectacle-18.08.2.tar.xz 1048504 BLAKE2B c0cfb134ba9b9fd80f9d615590b743a25c923373112ffa945be2d61b3702ae4f3cffb4eba81bda681987cac00d116fe6eefe57354a4ce005f83ca1ce03882875 SHA512 a50e1a8c92f280ad89a023d2fc841a4bf4c7bec7e27cfdc935e6d425380e9f91665ccfafe036f141ce1791400937d22fdb021f4e5ae61c9ef49f7b25e1dc1cbe
 EBUILD spectacle-18.04.3-r1.ebuild 1365 BLAKE2B 5ef6f18bb70649547bd949478cfc88b50735b3c31287b3820aadff6be4ad7ffedd536dd4911ca878f810574924b92eba7d98dac10b5560b66eff8779229e3dbe SHA512 8b34910025f44c593757088b6a73aae8d3b117850dcebb9eab330293ae952301fe93d0a358b3ba1afc2b7bf0667f300d7b63cd42fbfcfa32ebb3a91da1defe7c
-EBUILD spectacle-18.08.1.ebuild 1367 BLAKE2B df4c7dd53cdd26b2c7f89e3e71fba7b9d7f2a0fc1c03bb861ec37bdce241db28a26738c4bd301c79f6af67fa4a6cf8bee2aa391a17558a4eccaca9079146d46e SHA512 fb03787986dfde65b8182fcd8c2db1a24da4ec0ea6f2b028840d1e7ce320fc3ba37957fe7d36590eada377ad841462e54837298baea78156c9723e321d40cdf4
+EBUILD spectacle-18.08.2.ebuild 1364 BLAKE2B d650c01ea0f134d42e45d8c5f96e5727ab098c1607511abc54de51dfbdb99b9d5da50eb8f9eaa8b0c0ae6cfc0d11fa20be4988b613ba18b5068db517fe318bcd SHA512 e0ae67b59c4871cd4d2cdc79cc7bf5ad0e37c86fc95939fb61bd6e0aaacd31615756d979ce8b379200a967ea165d41da9ea7d092843865d352e45331d7816b7f
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-18.08.1.ebuild b/kde-apps/spectacle/spectacle-18.08.1.ebuild
deleted file mode 100644
index db785ac1f65f..000000000000
--- a/kde-apps/spectacle/spectacle-18.08.1.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_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.08.2.ebuild b/kde-apps/spectacle/spectacle-18.08.2.ebuild
new file mode 100644
index 000000000000..ce91bdc787db
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-18.08.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/step/Manifest b/kde-apps/step/Manifest
index c1b821e79731..b57066b03345 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-18.04.3.tar.xz 862512 BLAKE2B 7638798a10130f04e219c80dd953f4e226331962f56b8c11342d0181b7f42bf02cb3015bdf60a120d0d8de27dd952bc289438a1dd4196481b35da96614fca1ed SHA512 0634a5e00a8a5e631adbc1090fff41892c6846698706f685c3f4b06457b1ef991fce5539937b2eef039c8e8b13d4ddaf39a40806672d57c16f2c83a736838e79
-DIST step-18.08.1.tar.xz 860584 BLAKE2B 875fba4705081bda5054763783bf4ffa92e55dc18d324a6d3265870da4d8e0d4c01e7a6fd47f9ea1a886c33292e205910b6a2e3783f6f96c806345002bae14ab SHA512 7d35e51ccdb388fd56e3c03e2db7404146f0d8fe4294c8c6e21e376d5d09c36c79814a471164e606c664f47c42fa8bb08d4bb759be8a23d3298e976c2fa6c2ed
+DIST step-18.08.2.tar.xz 860376 BLAKE2B c33ea65573b65034e0d09587cc116d98c3cf18fb84930792b23c6761a6337124f21b2e6331468057589837811da423af62db89fc17e4fcdc838ebec119c9797c SHA512 55041ada66bd504151f6355c71c3c29e414b9cb285bea8406626ffa69ea246f41f81961b9cce31e5bf09400bd98e9cfe31f84aff392462979fb4c398968a2edd
 EBUILD step-18.04.3.ebuild 1487 BLAKE2B d162ed0e9feec7a6e3b987fcbd3d756efa7cbce4107a706b2cbd6965ebb938f6f1b1b4ed5a699454761907b1b36e78dc54c417c39e62c33ad95ac2e3e0bfb7c4 SHA512 f062b320c833e096d29f25275d0281cadc5aa32756e41003f4faba2f246bde78f21994854277b506e830e9984c3f835b0a80c594931722f0959a88ba661f3dce
-EBUILD step-18.08.1.ebuild 1489 BLAKE2B b3856e1ce092d3485e1cec6932a64809c17f989fa94673639561fe065c963a6c07a06fd14a2b75b7bc707c37d548dd8c58b1bd817f448531911dc91df0e089cd SHA512 4e42856ed4796035fc4fd318c42310eef2d3fb496ef4a69f3fdc4ef2043a281c4decfedac7095f5cae56a0f7ae9d2ad684d125850359c61228df2efa5e45957d
+EBUILD step-18.08.2.ebuild 1487 BLAKE2B d1ff590eaa110d0846b9417fd1a3420281820dca08acdc398a594385d316ea9919d564f6f1b243e4f67e83e7c59816f539eba8bdc9589612b4d6b8a3c7380b18 SHA512 e689cd49542310fc190680115a7dc335947e4104d0f1dd78e2d666f3159ee5098be6f5452ea0aad5bee891b870efbe26bde5b365900996960c78cc604de3a45f
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-18.08.1.ebuild b/kde-apps/step/step-18.08.1.ebuild
deleted file mode 100644
index c14241e8ebe8..000000000000
--- a/kde-apps/step/step-18.08.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_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 ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(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/step/step-18.08.2.ebuild b/kde-apps/step/step-18.08.2.ebuild
new file mode 100644
index 000000000000..da32123a067f
--- /dev/null
+++ b/kde-apps/step/step-18.08.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(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 e41c8ab61120..e3251419820b 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
 DIST svgpart-18.04.3.tar.xz 20972 BLAKE2B fc2a71498aebaf67966a2edc8129f888b1141520406db99d9e2143e218c2c024ebc5b54a98dcd4f7e923e89aad2c9570922a436e83149f31964057481ecd34c0 SHA512 fad16e4d9841d108cf4450b0de8b616aed3a1525966ed09043d6f83de5822c83496ffd93716c6adaee9387bcc18c95b23b4f8a7553f6d121d0f6587967dc533a
-DIST svgpart-18.08.1.tar.xz 21060 BLAKE2B d24fa61d3a06020cf3c3ad073cc028ddb2a52d3d53abcf4857df8dd645a6ad81a2278d14028923c522203a6473dc44469c3203c7a41238b97eda01218d7e62f2 SHA512 cb60fc9c466c9a9e6da03b19049b29281c170b6325bb7f72c46733e089d98243007b673105b54753a872b23a855f197faf6991c468c4a2aa32026ab72c020fd2
+DIST svgpart-18.08.2.tar.xz 21004 BLAKE2B dee89663486da12c969ff95e0d77e5869c52c71edff7f15e6eadd574ca5718847230786dfc4b6c84ccfc15af5935cf40156255d3ea4c0854ee02de1b09d783b0 SHA512 d7396f112bb565e31b805ec5e5acc90d46d4c7e19109144be2f7d339e8beac59fce96aa08aeea197d950d6136c339cb86d325b4a550394243954e61e5bc9f9a6
 EBUILD svgpart-18.04.3.ebuild 499 BLAKE2B 7ce47fe611520b7e2ce3ab7c3c1d19655b7a255199baa736166dc838e6e007c3501ef95fe6ad20eb73bf7e60ac40529e912586131d038bcd08d1361d35e7e6df SHA512 4ecc4acbd8dad4220fada4b4e3229902df053aa3d858857255174faaaae19d203ad11b1c33e9c105c04a828127086130908fb2eaf93a7d7b126261500b037ee3
-EBUILD svgpart-18.08.1.ebuild 501 BLAKE2B 23f8b66931dc752d8d102a23d5f27ab3901a0f6be8fb80607999e5956bc80616429fb494a003633b161c4e5bafd1929e41cd86442e8561349bed5a785842ae98 SHA512 ab3a934803b623bb17348ae70822fe73d96e04669e94a43d353e1890131d1104125d4ff7d19d20e9b58a79a99973a51e9165c95dd79e9eaed5bb1f15472d5c05
+EBUILD svgpart-18.08.2.ebuild 498 BLAKE2B d5f7812f44875577d2a93cc904092b8820749fe1e8ce5ed9cbe8c7ba2eed114c5704720e944b13db20f59371984fbde2d0ac69c3edadd8bff63394357b361d96 SHA512 8c2da153b396edcddd1c24150b18166020e268eeba0760b8fb9d1dd1c7c1138ada1e6b089f5e7e84ef6306e36884824fde532e6e5a23947a004689eb6dbc1654
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-18.08.1.ebuild b/kde-apps/svgpart/svgpart-18.08.1.ebuild
deleted file mode 100644
index a2929a955b58..000000000000
--- a/kde-apps/svgpart/svgpart-18.08.1.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/svgpart/svgpart-18.08.2.ebuild b/kde-apps/svgpart/svgpart-18.08.2.ebuild
new file mode 100644
index 000000000000..3ff6d7c07710
--- /dev/null
+++ b/kde-apps/svgpart/svgpart-18.08.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 05536a679280..ff13617b3e5a 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
 DIST sweeper-18.04.3.tar.xz 369048 BLAKE2B 4aba6d4403b2e90fda81ef1d79ffce4220ec68f78b2601891a76296f308e42eaabf59beaaac48dc6158ebc00882531f29b2b48df12a785a7736f9b54b43c2ac7 SHA512 d98ed3aca5ea85664c18f6d3a8e5e7055fd1cb12cd17103d75a2261dc81e6b9d4eb54400be3f8b12d2c0109edb8100a7f77353bc8c1597fd0b2a5e3625a21a0d
-DIST sweeper-18.08.1.tar.xz 368312 BLAKE2B a06bdef76c2c7267773a65e71be727bb8ec59d920faef2f5b32fcf208cdd464618bcd56426e59504756a4bc2d4cf3ca7f465a8561a6b8bd0663e93c1d69b5987 SHA512 8785faaad8e1ee911880f20f95b96a8513482cf885e1563b6b8f053263a9cb84df749ae37744fdad67b5f73bf2f853e2c7fa0c57aa6b62ae67e5f9f6ddddcef0
+DIST sweeper-18.08.2.tar.xz 368308 BLAKE2B 9e5c5d0be8f775e3761467175e63393ce16d98c48b5b57cfb710f920c7293e08f1bd6d1a302a292855a866337a2d0da859152db53a5a5c70e450acfa2d3b833f SHA512 7b75c6568c0f2c462c9b57e98dac050af8112f6ad4efb8b2322db8f01272e0f34264ef48e22c00acbafd21eea8c6f6950c1be882ac8e151e8338dd940bd0657e
 EBUILD sweeper-18.04.3.ebuild 880 BLAKE2B 328f32c415952ac91d846bd4dcd71dc18e5afe2345a9b9bcacefefa5a139e69b86bf0829e012fdeb3f1ea19aa3578fa3a0125c617980cb0b16d544f19748c46c SHA512 fa7096464c23a7f51aa6d2341ded2076836b43566aaab5dabb4d7561dc6001ce9c6bf43c09a8641b1b131820c52bb70dcf3c3cbf84293cc1beef09f78acab107
-EBUILD sweeper-18.08.1.ebuild 882 BLAKE2B 19021a1432adcd1efcea32b0967f4ae8189734c615f54bfa602f42ccdc2ed5f0e089d89169d158f1f6cbe5ba7189233806d1afe4291a6b1a3f1444562c9daf4f SHA512 fbb82a22e966acd01aae418831169aa48c5bcbb7b160b0e8edbec8d91900f056ca8e89a40742f6465b03392fb90a8d231240782645699257960aa3e409325ded
+EBUILD sweeper-18.08.2.ebuild 880 BLAKE2B 86a21cb56f0f0846f9277b8084df8de20d2dcb059467cd1d873c47245b01c07c1bbb9d291b01cdf77ef7ad04ce95e5df641792b27484c3f7d08b7f95a1d687b6 SHA512 9c8ae7b4def999030f5ea8e47e06ddb0edfdd7094eafbcf49f67570e15fc9fdf95095f7a66e40404e014716ff8c98c41b61cc8416c4857732877c4b9f19cb1ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-18.08.1.ebuild b/kde-apps/sweeper/sweeper-18.08.1.ebuild
deleted file mode 100644
index 41e32c5dd330..000000000000
--- a/kde-apps/sweeper/sweeper-18.08.1.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/sweeper/sweeper-18.08.2.ebuild b/kde-apps/sweeper/sweeper-18.08.2.ebuild
new file mode 100644
index 000000000000..fd89b50704c1
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-18.08.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index c0cdaab777ec..2284b29eed3b 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-thumbnailers-18.04.3.tar.xz 41316 BLAKE2B 336bebbb51f4b2c2650c693e71fa50ef0b08fda87ae16d7b3a4ff386d2c317ae7284eae776642eb942599e8a2a9bf504896860a704cf0d5191ed4cd68b986743 SHA512 d386f56295fdec11646ea04dfa46ad5f60ecf9c8897d6f9cbea477f95953434ea086784cf848198365701b2fe2efe4285f7a9b37fa9d98ebbca84f0859084735
-DIST kdegraphics-thumbnailers-18.08.1.tar.xz 41268 BLAKE2B 3c36f9be4c0694e704137241fe54959ba76f7169c8d9795ed34ac3644894312549860f72fe27607280b92c317cb34cb55ab33f39df4c7e609e2adb929e14d673 SHA512 76a06e32b3b909c4a5f7884a5f2dfba7fc3c23b4b224540d43171d3c73436c7543a5de296a4ea7a8af8ce65b2c5f8b1c01f1c2a0c874f13ae2ebcec18fea0b4c
+DIST kdegraphics-thumbnailers-18.08.2.tar.xz 41288 BLAKE2B ce135c1e295aeca54aabcd51e1f3e9a99af5df1e823119724ff60f5fffa48b75ebada8356b1db0bd46004ede3ad705767fa45cda26b57de2ead89da8d1250724 SHA512 6fd419c8ee7964dff24d9fa60d2001e3506fed0c432944961683250d1695d280e2c2bfc126995adbb5877ef8e14a0ee341139dcd7c9d22263b6610d5a0f1a3d7
 EBUILD thumbnailers-18.04.3.ebuild 610 BLAKE2B fb61ab186c414471900aeed69873d5c7737d9cdfeb9a82460ca73cea2be4031c0d40f757de7625afc7bb457172b9518433330d28e1b1cd3a8bb1c5225324ac6a SHA512 c45fa2fb6982139f595e19f99421ddd334f97c2f55196e71a7e6c135cd3b94b7b1b6893bf2cf6e159960fb51f40edac12ef3e94326982c2ff9dc8bec7855a403
-EBUILD thumbnailers-18.08.1.ebuild 612 BLAKE2B cb2d75bcd8a1a07288e7c3d4776dba4883079527d0f38e8f147fea9eafefdf657b3fcef66124d46bc58405655839d2127d67d0fb6f84955508158769cd13197d SHA512 4d1dceb5d12f96997ee5df7a2c55f408e230ff232cb5cb05a5eecda7efcabd296fbf83a02c6b3783346dba31844816b350cbb17d612af150ed1172020c4d740c
+EBUILD thumbnailers-18.08.2.ebuild 609 BLAKE2B 5cf3510528fb3ea41e5676a375691271f5c4e7ddeaafc5029e162035dcfb3d62d38792ab593fafe42253d9072fc546f393e6f392e7e693267e835c255f72302c SHA512 4ce1c46a262930935bc7c9815302baf03abe1fed13d7285de61337d80da86b4b1850be1753308dd2357d81962775ab994bbb57ffb8cc82f6909bce86f5c9442e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-18.08.1.ebuild b/kde-apps/thumbnailers/thumbnailers-18.08.1.ebuild
deleted file mode 100644
index ff1362dbc75b..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-18.08.1.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/thumbnailers/thumbnailers-18.08.2.ebuild b/kde-apps/thumbnailers/thumbnailers-18.08.2.ebuild
new file mode 100644
index 000000000000..38bdea3583d8
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-18.08.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 31c81f3e0290..7626bbba52fc 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 DIST umbrello-18.04.3.tar.xz 3019628 BLAKE2B 1c2fe22828bd7716a1d9af42c6c4a2de15633933463fc553d981b0585b0a1ba0a03fe0372e5890c6189652d97084301ed36599e13eae0c39a3e25c892de94276 SHA512 fefecbdb4bc82e84f8174b45be63e195bd2fd769fd91acd6300e6eec8e4fe1c573c3043fb052682caa4772db0c3d73149d40b14cf181fe8c9889e652be03be41
-DIST umbrello-18.08.1.tar.xz 3047172 BLAKE2B 395d7b8d2b91952c1f1d202216e09332502dc429ea27b7f55ed847a134f6aefd0387765e5eb50224f30f9cce82ac5a249d7e0bf7c214e7500e11ae2ddfba526f SHA512 614ad45d95bc7f07eec668b5f2a54e6748be31b4bb0fe60fd86fe35df3df73a7ce6e12b867118674dd6961ed167249824344e2fb2155e8a58b1e07074dec8679
+DIST umbrello-18.08.2.tar.xz 3048412 BLAKE2B 02b16434688810f45f9bcaa58f688c2ef6176b7da3d4b4b1ac042ec4c914edc832003efe5a892ea704936957d75158712d34a192f098f283b896ae99c8d12b86 SHA512 55941afe05b72085aefac3604ac9a9023f46149e5aad0784fa14942907c21009fb20919750a969abb8c398bcb2f99f3e23e3b91eed06f0cb5a8897563aaa52b8
 EBUILD umbrello-18.04.3.ebuild 1372 BLAKE2B 4cf613b6910521a8477356953063c645532760498ce8b54719f3c29e1720ee3eb0ccd7ff1076b2f69ab588ffdf2ca940941438fa948567f4196a125d50b3ce8a SHA512 65168a40a49253b23bb22c1afdc8e5221924073d5dd1bdfafd9575d1c4bb511e8b9605ed09197e1688ffa3b7da7d605355af9a2ce74f0600ac119700835e6fca
-EBUILD umbrello-18.08.1.ebuild 1374 BLAKE2B 1141ee3a928cd4bb47b90c7352cd7b0b9a9ecd4e90ee0765d37b0c66844cd4c2572076de1aa6a5c5b043885f236525466996341ad0ea84431442be851226ff7c SHA512 c6cde8863f1bed8e4bd142095799e9b4c4aa3392a1baa7dbc25707158e429218f270d20a3866c6c31ff5e50e352800b00bdeebcfba5c2eaea3f5507796dd298e
+EBUILD umbrello-18.08.2.ebuild 1371 BLAKE2B 36487844d2cb0f983ca193f001fd31d6a4fc52eabc1dc49adc8cc71bb32785c36b37435d2521be4c4c42b29cedc027b698e6444539120b3999281e008e0ef548 SHA512 25323060435a8ec76d5b7bc8f827f31adce2ce9ed6e123d4ede043e7312084e29d3231646a38c13b52b166c73d818472f7ec56e9cbe0fbe46a0da25f38014d26
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-18.08.1.ebuild b/kde-apps/umbrello/umbrello-18.08.1.ebuild
deleted file mode 100644
index 7b9d3d5c2d81..000000000000
--- a/kde-apps/umbrello/umbrello-18.08.1.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/umbrello/umbrello-18.08.2.ebuild b/kde-apps/umbrello/umbrello-18.08.2.ebuild
new file mode 100644
index 000000000000..4d613c78d05e
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-18.08.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 a2f3ac78a2e5..bec44109e99b 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-ioslave-18.04.3.tar.xz 38980 BLAKE2B d3167ffc83c70dccf2b1a5cb44aaa307a37b05d87f4fb617319c4f7ae1c8e69182cdd1581fa60fb53b67d1b9acb8bfdaa97c8edb9b1f50c78ee768416efa3299 SHA512 f6be3f1ee9fd4300b62a57e8001df76739521a5797b99f8a3a8407f8a8a96180d2e066654f08a73e51ab7d2adbf2311d209dc2f10d2ae2abe85b3efe5e14b79e
-DIST zeroconf-ioslave-18.08.1.tar.xz 39028 BLAKE2B 07df78b341f6ddecb6a5f33626d722aa2af6ca44928d9c0cc73ae6b1fe9e376e16118b275d67c833915e4bf36bcb95244942309a0445b7972e8ebea667da83bd SHA512 86d24b24d0d3bdf520f042fcafcc439e52655f66441fc3eb16d880963b69aa015ff993b78f913229a3d54d44d6ba25a93b305d44ad535c8a359e390442a8a9ea
+DIST zeroconf-ioslave-18.08.2.tar.xz 38976 BLAKE2B cf247344f8099bc79786518e5be8bb4f73f5d802458aa5888615165edeea566811fc571daa23580b0f7a930ebedb116c31d194065fbe19c95e0ecab5b98fb9d7 SHA512 201e21363a6bbbab6accd4d77c45b29dc7df62f3430250d8a0ec96ff36ef8d85da2fc4efafff11331ef33bd77cf84398e742b1d7cf071c41b5730b0626f2c8cf
 EBUILD zeroconf-ioslave-18.04.3.ebuild 480 BLAKE2B 86b9ede6f3a8ea99d360448d161804c2670b1f56a2cc45c779d42066638b4d37a18d3576c6b7977deee7de52742a3fb0c2b57906cbd606108b58571ce22f1ab1 SHA512 c3373cc48130617e01e151179a6d61d973f647b158663b2e514fb1e03cf181c9f5daa661eca4cf3d7ae4017030e2a4ebef5c5eeefe4049c588937ee45ded30bd
-EBUILD zeroconf-ioslave-18.08.1.ebuild 482 BLAKE2B 982c5e9af2f7868325b995b89bbccd8126357095be79b1fcf8164e22139ba36dd4c865e9f1faccf53138db60049162185c954060ccc5006f1d307d7bdf2da67c SHA512 af3773c381108def72974d02c96fa175a5fb5c132a812d333a277ab2b1b6510b119a06b0ad87e7fc82c24cfea3200ff246dc65577c0c74ebd3bb58f803a7f97b
+EBUILD zeroconf-ioslave-18.08.2.ebuild 479 BLAKE2B c82e37f98903de13302e616ce8929732e9787fd65da073e4924e5451eff4d4ef6991e775f94ea788749ce7eeab5805ad37beaf3bf68b8110b412ef376d09c665 SHA512 e3bb87cee8231cf620bc35059816b95b0dea098385d3dbd79142000cf30df2bc13433089bfd23dbd4d1dfb6c8e93dfc45afe3b2a78bf2c6de2cccfeed37c3d11
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.08.1.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.08.1.ebuild
deleted file mode 100644
index 9b485d5e9478..000000000000
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.08.1.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-apps/zeroconf-ioslave/zeroconf-ioslave-18.08.2.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.08.2.ebuild
new file mode 100644
index 000000000000..142acde12fd6
--- /dev/null
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.08.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index d7ba1651dda4..5e7318fd481f 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 2c09931071c2..6136e760c881 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,5 @@
-DIST attica-5.46.0.tar.xz 60576 BLAKE2B d1061c616a881d96ed9b19ad797161370e4a35da6bd487046e480db928f0e8aa66375e2ca36792526d48930d486ff0af301763c0021a6b3dbd62228acaddee4e SHA512 cd5036c5475f3efc502002c4d18f7bddb322095dbc6faaf99958cf76ea6a3e95cb39b3ceaf7d6a5a38b5e6eefd2708463c8023a877e3f96b83642780d942fa98
 DIST attica-5.50.0.tar.xz 62520 BLAKE2B f3b8e1410252cb4f59134c0b061388da380f1bb1baf053dcc3030cbc975c15ca52854190f2aec674ca7d30c8e31c19cc421ffa9a548f716a7ffd940428a2751a SHA512 026fcb7d5de01840dfaa8f28f007cd1fba142af0e1b471b5c4f5ef479e4d5b169108703ddf30998ba3e33c054bd8a833ee3f8bc4ebac25fafdba196f93166b07
-EBUILD attica-5.46.0.ebuild 321 BLAKE2B 8312e6e5eba5e15e3c9a786f539105f002bcf2e111fb4470d2d03e589a0df0c0511e47e2bcd2b8594764f2f49ee2fb560be02c94dd6f96ef88daa7adef149394 SHA512 1930e05f7020fa5e46f4885721312efbf4c3ab7bcbad39d16f342cf15dd06c47efcea0d20e0707937288cc1c66e6498471b23e5ce6f0286036c61e27d77be1c2
-EBUILD attica-5.50.0.ebuild 441 BLAKE2B fa4fa20f1bdaefdfe76c2602b04d236350290dbb1fb593d096015a12bda214a97ac1bcc56bc69bdaab8575b980a6647ee3ade0b98ff88b422d99ae9ca43c01c9 SHA512 8446df20e86657322a88ffce67b699c360a958babdc1877a9cdb9a10e8fdafa97a9a2f1b4944cb817c201eb15801168ff28cafaf92c5b06cde8e135362e06009
+DIST attica-5.51.0.tar.xz 62620 BLAKE2B 58c149e060e92c9614ac2a2759b4bada728858ddc02c93f59e08886a0609e678185e6fea6a2e79eaf0dc72a45861a58ee8fe0d1a635011aa82713d64d69f8c73 SHA512 290cd42ab6081fa827560983830789a89c172327aac802058a34ba977108ead255632131f0d55c83aa99845374f98cd581b29157840b7418d6371b1f4ded5bfc
+EBUILD attica-5.50.0.ebuild 436 BLAKE2B e16f18e00c50f8662711ce7c552b8a82cc1894f46a31588fc6f39ae6b3b353795bef3534d90fa255d0423c60b006ebe89b9a198547b8a369570087e540cb55f4 SHA512 eb17df16c2802d51d6c3b4ce1796c1848a5d248160051443883aad16a9ccd56c37edd8a12b7d572b6803ea2ee0420a09ea68105f8c68e5acd2d2b52a604e11f5
+EBUILD attica-5.51.0.ebuild 438 BLAKE2B 1ef0745c1f36a8663c4464b6c9a407897bfb5405b7e3a0dadab90e149557e26ffd825d2418ba9c85a1172d00ed252db39366cdb530aa7f81801218084fce1cf0 SHA512 c649bc4b04b52d7cb70027c08a3966db6e5ecc1fe319a957079ebff64c1794eac765031f9a3528e729f3bc56f201388fc36684cc1b417642ce52a785125e15a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/attica/attica-5.46.0.ebuild b/kde-frameworks/attica/attica-5.46.0.ebuild
deleted file mode 100644
index 430e1916761d..000000000000
--- a/kde-frameworks/attica/attica-5.46.0.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="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtnetwork)
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/attica/attica-5.50.0.ebuild b/kde-frameworks/attica/attica-5.50.0.ebuild
index 14dfce7de97a..fed7937e5178 100644
--- a/kde-frameworks/attica/attica-5.50.0.ebuild
+++ b/kde-frameworks/attica/attica-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing access to Open Collaboration Services"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/attica/attica-5.51.0.ebuild b/kde-frameworks/attica/attica-5.51.0.ebuild
new file mode 100644
index 000000000000..b92415594650
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.51.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtnetwork)
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	# requires network access, bug #661230
+	local myctestargs=(
+		-E "(providertest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 65c3b48f61d2..5e07d7a2479a 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,5 +1,5 @@
-DIST baloo-5.46.0.tar.xz 227572 BLAKE2B 22dd0f44bdf89ab99b6218fe4bbc48f7a39d3490bef3f4a9544ac7de27ed93d793ab49d15f10a017cd61d9a90a065b02ae315cea9753fb4a206517c2fed34ea8 SHA512 b47a2da7b53aac66fd624955bd222b3dfa2cdb220f80b10abc19a396f69463c38e0a2cb8200700255e2393b3645b2035a19225f27097940ccded5486afb4c96c
 DIST baloo-5.50.0.tar.xz 233260 BLAKE2B a64a466c99ef150f72d11017434f1ec1c8327d63ad96188f190b0f29fcb4dd56dda4435acef46f152af04ee653617b33621d4b008610c485978172e6c6b81026 SHA512 e516ef4361ed24ec4f524bb46e1fd6e62edf2d497a56538c920d07090fe295ca8dd2fb5661a99879cdd47ee2c3037c727026838681525a6f3596ba70669b901d
-EBUILD baloo-5.46.0.ebuild 789 BLAKE2B ba434fbcfd69cf141907fd39332f98553557399a04de363dabfd57a2199d64f438ed3bafa77a1ff23e538a60dcccd31f3759400c2e9888dea6c76b908f3614ea SHA512 9b14fc0050bfd446dee69b1ec6bca3b314d9cf541034d6316cb1316df370e0a6a974aafc604419e38cabb3d4af031545600512e4fdb9a56fa6b4b1fa44222bc4
-EBUILD baloo-5.50.0.ebuild 791 BLAKE2B 396c35df159caf113dce902dc0a252afab6e6661c537c1cbdcbc451e7df32656e246b540cd93f1587dec60dd0e4c0e5c0c71fba932f133291460877cbeeb827e SHA512 2ff91122affc58c8a014d332e685ec93f8ba6d8cfd80dda43c0c35b0e11b0e5972666cdb2ff359c7535188e0aa51c7ac695d705e6a2d529645aaeb98f47b030b
+DIST baloo-5.51.0.tar.xz 234848 BLAKE2B 280b3cc9396335c94e363693812e28e3e8261cfe19a9c3b3bd23b2d9968a3999691caf1a3c6c599b1e5e90f33b0f25357fa2766445682aaac6f13d3c1f60f96e SHA512 1b01842a7c3d8a6226c9b01631b9f42492d15d84284385f2443c68dcf7ccf9c4615f8891c5beda23e425e8155869747410f466dcf6cd0893e1789dd7de34dea3
+EBUILD baloo-5.50.0.ebuild 786 BLAKE2B dc31c80c1c87a12486a5dcfc96d8b5f53dfb38ab2df58b91b498a5bd35f156de9c5cab65142f46bb43b9c74b884577f59a8baef0f47c9b3a8361d32bcfd2eaae SHA512 0b74addc18305e9ea7efcfcbbe0af3e67106406a979d50f3f3e2b949b418c5b177cda664223bed213e245e4648b424a8f2858862f975c1782eb4e765fc756ff4
+EBUILD baloo-5.51.0.ebuild 788 BLAKE2B ccbe022728ecd5e1641d8c842540d6b72007f715b5f71352d167708c18bb8b1cf98ce5a34329361375af8d30b22d18086ea450c9a804f4c749065fac09bc5dfa SHA512 a148dbf51f661bfff25a53d0f19010fba38245c01eae966fa1ac181c221044409647e1f584b5aa583ef9f0660370a374090504af93f3c207e47f26c2d1be0ff5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.46.0.ebuild b/kde-frameworks/baloo/baloo-5.46.0.ebuild
deleted file mode 100644
index 463162432923..000000000000
--- a/kde-frameworks/baloo/baloo-5.46.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for searching and managing metadata"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-db/lmdb-0.9.17
-"
-RDEPEND="${DEPEND}
-	!kde-frameworks/baloo:4[-minimal(+)]
-"
-
-RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/baloo/baloo-5.50.0.ebuild b/kde-frameworks/baloo/baloo-5.50.0.ebuild
index 564ee8abea0d..fa89107c170e 100644
--- a/kde-frameworks/baloo/baloo-5.50.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for searching and managing metadata"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/baloo/baloo-5.51.0.ebuild b/kde-frameworks/baloo/baloo-5.51.0.ebuild
new file mode 100644
index 000000000000..a516a9c930b2
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.51.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for searching and managing metadata"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-db/lmdb-0.9.17
+"
+RDEPEND="${DEPEND}
+	!kde-frameworks/baloo:4[-minimal(+)]
+"
+
+RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 498e3e6e79e2..c52a6733fce9 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
-DIST bluez-qt-5.46.0.tar.xz 74724 BLAKE2B e087b68b4a6355c88d8da746951a145d206132bbf804bbf80077712861d3bd54c98584cf07c73076c3fcdf1b01806a13b8cfd7ed10d343069ed9b0099bbf94b0 SHA512 7bd95dbf0f1481ff5099646feae46d4d8e6a19acc3d1002dc3033943537d6b760711583f990a8fe94d8ce719a7431b6027e3aa24af66e0254f549331a54716b1
 DIST bluez-qt-5.50.0.tar.xz 74812 BLAKE2B 6e7791a72c0020a655f060fe63628442f01a8edc4d52d4f8a1feceb8f5259444729fb6831fc1e0ca1eaacded1f8ce49b068fc968498c73baacf08f81f49f5a09 SHA512 924e87e1f57d5fa0fa9a2c84713ac1117c9615d518fcbcacf2e784d776dab3410faf46cff6af4341a2d37cd288e8f9f3f3e4560605f4f1e1daa689367f8d20cd
-EBUILD bluez-qt-5.46.0.ebuild 557 BLAKE2B 131070f6ecf051a1c4bb98ef3cb06316a1f9685d8a952b8fecb075decabe6ee4ab7c027ad42b4e4e71d6f2e78e9025b2927c9192e546fd200ece580da49dc54f SHA512 6ad6c451a6e79e93a0332dd9237732251f603ab7682870f66c65a809cb4a52cb492b59c019d7e237e78a91ccfdc9343e9b70367138b5dc859f79fffe3ea8e84a
-EBUILD bluez-qt-5.50.0.ebuild 559 BLAKE2B 09d6e4ca6a265de4ae4f04abad0fde059ce6e656acd57c8640e14cfa82d72056e4ed924ea103f5d0872d60b97f5c11f5cbe618a39b484eb92fc01c5c3942a688 SHA512 246d327d235bf3d896bc14dee45889655eb841a30954373927d900a058b8f327def4aecd1dd7357e0f80f4cf11c684f77ed7c8d6a1f78238198e4b97eaa522fe
+DIST bluez-qt-5.51.0.tar.xz 80740 BLAKE2B cb9d44de35776e88b3ef2741e03a767cf0f70788954d8b7f634d3a0550011ac4086918b624dae77cde7c71b0ff43aef8f6d2ee14d1b9a8458212928af2844b7f SHA512 5532879c9f1fa868d0467da4c1c787c7df2482f4681e7c465f7942078b2855ee80a7ba00e47ddb32ec3692f7f14c0895538a61f61b70b322cb2dd51b1deacdc8
+EBUILD bluez-qt-5.50.0.ebuild 629 BLAKE2B f163768e00e7b2cc236278db791bf6e900637a9d075b10bde1ee4a386a94cf30d4390fbc0783bc8641b96f6073018b7cd3ec2147ac79f3b16c98a58d81b8b03c SHA512 2c5605d19be5eb1a4de151add6f51543f2a3f50c3bb5f9e0dd2daed62fa2cad77c79a578d2e39d6f2fb23e66c9b5f9ded18f206d9728e23ba29f9b82fc6a790a
+EBUILD bluez-qt-5.51.0.ebuild 631 BLAKE2B 592a274457d41b2f18223a3df6c75847eb8eb51cdf51e0242ee460b6d1638e9ee535ec11fe60c406fe51481606ad9629e3b0695ba091e616d175f524a4e5d237 SHA512 68d420b23bcad31de27705c417dfbf05c7c40bdfde86fe9556d26e953d98c6aa3171c397fe23d28d5b38024226ea45e31d70b3d2c4977a43bdf088cacd0fee97
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.46.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.46.0.ebuild
deleted file mode 100644
index dcbefb57a0ac..000000000000
--- a/kde-frameworks/bluez-qt/bluez-qt-5.46.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5 udev
-
-DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtnetwork)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# bug: 609248
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.50.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.50.0.ebuild
index adc7a124e0af..7f57fee3b2e5 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.50.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5 udev
 
 DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
@@ -27,8 +27,11 @@ src_configure() {
 }
 
 src_test() {
-	# bug: 609248
-	local myctestargs=( -j1 )
+	# parallel tests fail, bug 609248; managertest hangs, bug 668196
+	local myctestargs=(
+		-j1
+		-E "(managertest)"
+	)
 
 	kde5_src_test
 }
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.51.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.51.0.ebuild
new file mode 100644
index 000000000000..2677999530b1
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.51.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5 udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# parallel tests fail, bug 609248; managertest hangs, bug 668196
+	local myctestargs=(
+		-j1
+		-E "(managertest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 80f19c127411..b96111b7791f 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
-DIST breeze-icons-5.46.0.tar.xz 1543996 BLAKE2B 634622e86a0931aed43aa18fda5ec502f9e9ee3d6443de327cf70b25078ec267080f619511221921a083d162bdb4578cc5e05413fc362829293fde9df33942fa SHA512 ff17523e154692ebc90d21b04758b051e80b5df9cad8ae82baabfaec906d99b9efcb0bfc36d5ce38e5a55698f8284ff73f67c24df9e4b5c35d484e18db9647dc
 DIST breeze-icons-5.50.0.tar.xz 1545996 BLAKE2B 0875bb3aa239bc8bfa5f71b0b0908fca13bcb387dcd558a8f8e750e73f81c07d5f336ea553f0f9207a90d70aec0368f70a713bec2e24dc09a30a4a7ba5098b00 SHA512 b47061154606f60973a2232393aa36bf76d67936883bba6d55bb303450156cd07710c9436d91523cbcf347886e05975fcbb5cd3d7b6f6a30ae18dc89c2eb377c
-EBUILD breeze-icons-rcc-5.46.0.ebuild 658 BLAKE2B abefa1eeda7aec3bcb455c54e81673272e50b22a85ca11f08296dd28815244aacc7113aba76c6e900441c162fd57a5b03cf90a9130f4f16111fb8337cb492d05 SHA512 93637457d4a4140c340c8e9a97b747a29dc737e193b505e6d8904c222332b0cef46dc6904b73dc22e6e589ad308a0b842354a8769b5e93f94002804e8c2fa6da
-EBUILD breeze-icons-rcc-5.50.0.ebuild 660 BLAKE2B 11217b620b6d8009ceed8a38564b961c4bdc11d6a76c268ab836ac8ee124835aaa6911fe2423c370fe3a2493538a2d81f585e1521c6a5670f3fb20c0648cd64a SHA512 8b6e0735eadb1be833ff24f974a7075cd10c13cb4350e7c7276af1568e9f82f74ae5576800786cba2fb535c1c799c800d25c6421097e238ec1c9de4c9f8aae82
+DIST breeze-icons-5.51.0.tar.xz 1547128 BLAKE2B 01407b9b2a99a492d2b469005563862882df3c1b58654fac535767ecdc39b553079593d36c11001ca40408f252ce84e17e13860f35a773fe2a282f04c18601f7 SHA512 986834b17cde074a0513187b011774534a3a41e5256a61ef30f0b729f41415d0e69c9e9a8d5e8807260cf84483639acc0ff0fea522803e0094240b353aa46bd3
+EBUILD breeze-icons-rcc-5.50.0.ebuild 655 BLAKE2B b4fec87fa401045fda540c8d4cca9132229eb13eb68793a9f83212e6757180d89ad05234dd4c1a08159fe911ee91d3c5ca90864eb5e922b3bb034c66953b73a8 SHA512 049f1ce78bc8666fcca9ce09231dc40f899c2f25bca8f8d6513874e90dc19a2134f24edbf45d0be75bfd8a92617d6cf599444fe90e39628e4c4410172aea8ce2
+EBUILD breeze-icons-rcc-5.51.0.ebuild 657 BLAKE2B 43ff1815b06644d73571b46a5eba42587bc816feb2aad727c63f9865eb2e89ffb00d9b0c3916dfc4e6fce890688311cefff804b907ede7d7a69be73a7684d5f9 SHA512 a6a1229f6c55f68c65fe8f04e67f09939d3c8f6486dbc14f1cb28ba33053b608e28790a9a958237ee84714ea659bcbe776f95bf1dc79be17cf2f2ad7e6e3ffe6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild
deleted file mode 100644
index 065b5f58caf5..000000000000
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.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_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KMNAME="breeze-icons"
-inherit kde5
-
-DESCRIPTION="Breeze SVG icon theme binary resource"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	test? (
-		$(add_qt_dep qttest)
-		app-misc/fdupes
-	)
-"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINARY_ICONS_RESOURCE=ON
-		-DSKIP_INSTALL_ICONS=ON
-	)
-	kde5_src_configure
-}
-
-src_test() {
-	# bug: 655586
-	local myctestargs=(
-		-E "(scalable)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.50.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.50.0.ebuild
index 86f1e24841b4..6f0c4ef4767e 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.50.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Breeze SVG icon theme binary resource"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.51.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.51.0.ebuild
new file mode 100644
index 000000000000..75f546a54abc
--- /dev/null
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.51.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KMNAME="breeze-icons"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme binary resource"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=ON
+		-DSKIP_INSTALL_ICONS=ON
+	)
+	kde5_src_configure
+}
+
+src_test() {
+	# bug: 655586
+	local myctestargs=(
+		-E "(scalable)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 34901bdb651d..966201122ef9 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
-DIST breeze-icons-5.46.0.tar.xz 1543996 BLAKE2B 634622e86a0931aed43aa18fda5ec502f9e9ee3d6443de327cf70b25078ec267080f619511221921a083d162bdb4578cc5e05413fc362829293fde9df33942fa SHA512 ff17523e154692ebc90d21b04758b051e80b5df9cad8ae82baabfaec906d99b9efcb0bfc36d5ce38e5a55698f8284ff73f67c24df9e4b5c35d484e18db9647dc
 DIST breeze-icons-5.50.0.tar.xz 1545996 BLAKE2B 0875bb3aa239bc8bfa5f71b0b0908fca13bcb387dcd558a8f8e750e73f81c07d5f336ea553f0f9207a90d70aec0368f70a713bec2e24dc09a30a4a7ba5098b00 SHA512 b47061154606f60973a2232393aa36bf76d67936883bba6d55bb303450156cd07710c9436d91523cbcf347886e05975fcbb5cd3d7b6f6a30ae18dc89c2eb377c
-EBUILD breeze-icons-5.46.0.ebuild 620 BLAKE2B ec8a3f92e3eee1ac836b291d475b94df49d62af5c0ba4dbf2e00d7d44fc76f6d10845ea8064c21cb462a97f82bb6864a191f0e464b8fa6044eb29243ffa2e700 SHA512 d435e419581ffd8f6fa7f4122954852efb498837b2355bf2ee2bbdb947e5a35ac1070ce7fbac6839d723fb9cd7f1343677417c66a5213f6a9255915bf441059c
-EBUILD breeze-icons-5.50.0.ebuild 622 BLAKE2B 2474feab406f40bc12ada0ae7f9e6d4678e25a5d295096c7388380377e45e3b357c2bca77b5203ca01175f4dce46c64356466fa75e4387c3e9d579d69228c7bd SHA512 ea72e1e19649291bb51174b308388ddcf3db0db8341907500292d572e57ef13ab5d6a666af338212212d17a7dd54120878586a31136a400bcc3b80730977f2e3
+DIST breeze-icons-5.51.0.tar.xz 1547128 BLAKE2B 01407b9b2a99a492d2b469005563862882df3c1b58654fac535767ecdc39b553079593d36c11001ca40408f252ce84e17e13860f35a773fe2a282f04c18601f7 SHA512 986834b17cde074a0513187b011774534a3a41e5256a61ef30f0b729f41415d0e69c9e9a8d5e8807260cf84483639acc0ff0fea522803e0094240b353aa46bd3
+EBUILD breeze-icons-5.50.0.ebuild 617 BLAKE2B 670f3b7d39a9de0cf478ebe9a771d895e77fc5ac1abe5c094c4ab3ba1958ce5f8f1969ec5deb0326a732aab717f17d65c6824de982daee6ec238786123d9c3f3 SHA512 4e71518ae71cc2c9dc459afb03d245f40299f17d992b0fe969de56391eacdb6ce8ed4c17aa57b7751027a9baaaf535b2b280174c00a82f3b8d772293096679e3
+EBUILD breeze-icons-5.51.0.ebuild 619 BLAKE2B 2e179540d4eebe3547d0b1eb5be164baf87b86f44bc0d18c123568249a20d50456eab772b6dd6225caad844634ba53789f1ef20fc16f553738c7ceb50e6def70 SHA512 cd21bef02523742aabe38ffeda9afb790f37ba9f64e4b88520b2f7edc47bbad4de6789701bca5f709925352e372d6fcd8ca95680c4b7b2c179d3acea064c4e7b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild
deleted file mode 100644
index 4cefc46eaddd..000000000000
--- a/kde-frameworks/breeze-icons/breeze-icons-5.46.0.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_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Breeze SVG icon theme"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	test? (
-		$(add_qt_dep qttest)
-		app-misc/fdupes
-	)
-"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINARY_ICONS_RESOURCE=OFF
-	)
-	kde5_src_configure
-}
-
-src_test() {
-	# bug: 655586
-	local myctestargs=(
-		-j1
-		-E "(scalable)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.50.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.50.0.ebuild
index fad25ff406bb..475def97c559 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.50.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Breeze SVG icon theme"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.51.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.51.0.ebuild
new file mode 100644
index 000000000000..9ca9013a1622
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.51.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=OFF
+	)
+	kde5_src_configure
+}
+
+src_test() {
+	# bug: 655586
+	local myctestargs=(
+		-j1
+		-E "(scalable)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 5a697912c544..575d53c84d31 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,6 +1,6 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
-DIST extra-cmake-modules-5.46.0.tar.xz 317056 BLAKE2B c67e5a4d207cb5fd3f7ff7d0e2dd16c5a0a44c562c0a9c0b7eac3a54930ae59b6fd8b36d7a464e7d03950c44c101befc57825f8ee2f23b35e3f7ddc792d5267e SHA512 6431ad8e5230bbc0a5e1199037102014c376a682d711211b257359c35c8a3aaddb6128277721ca40cedf43fcca77312a2754f306487a1b3dbea728d643f0ad3a
 DIST extra-cmake-modules-5.50.0.tar.xz 323928 BLAKE2B 79bc97221cda54a51f2f6ff8797f715f4e27b1d5724da852cf06022eaf88b687a6d6aa0afb5eb2abb45b846cb49bd4c2b5e8e863e4d2f1b9b8d4446bc57ccd60 SHA512 0e56b1137a9cd8ff6a25b7790986713fb2358d8ffa1a175ca87054790440e528a37f56e2785190b40a469fd4d32bc731d4d24f55d6557515c8edb311abf3a56c
-EBUILD extra-cmake-modules-5.46.0.ebuild 1275 BLAKE2B 26d0cbbedbb94bdd3a120927ddc53fecade47a421da8a4d0a44e59a35931a577ea20c5eb41da2fc4c2cfbb215b124bc9d7494b6e14941b57b3b77671819ac678 SHA512 617e537fb35c8d79db273839da20dc16bc94aa245a9cc9e292f6a651cc2bd7ba75a9a399e01211613040d785e68720c0a83af80988384898f76d39a13ba2a999
-EBUILD extra-cmake-modules-5.50.0.ebuild 1390 BLAKE2B a2f2d64e306aeac906ec763105e5a0c8593cad9098bbad8b68728cab3d0333e8023f7d990248186e5b785ecb916f2b075af2636d02c3342e008724cf3b982935 SHA512 cd44e0818039d4931d541bf8bcfeaa6271369f002c16bbb69787a39d85a128eac3a4837479a0794a31c1f59c33dc645f04c6ab9370f121629748ea3f8921dd15
+DIST extra-cmake-modules-5.51.0.tar.xz 323936 BLAKE2B aefde21b46b4ea708a61165abdeec6841869c622bc6c955c88d12d714e2420c6fb277f5a06d3dc3d4ffb4e69c6ad1779a4983a80853ada83d53890a1160695ce SHA512 71b809139a844f324054ac52946820db8fe0662a670127d8c71f133b498b8d6bb62f61f115d1f49d06fb34e936a5fa38b465a3bea5b166cfd546a185cc1f1517
+EBUILD extra-cmake-modules-5.50.0.ebuild 1386 BLAKE2B 16f75f82ea521a30e082008d8a0ba30beae0435bf9e43bc3ad0b7da3cce13a8b7a4118b0158bcbc41acb5eceba9e63ae54e3e9ff73d7ec4b58d85d20a1f6c46c SHA512 ecf310790562133f700fabe77de96b98566ecd87c0d9c976a227e027bc9aabb20f2ce6c9ed36273d91e93f897b1f39dc6b62986cce6a73a018e24bc578862951
+EBUILD extra-cmake-modules-5.51.0.ebuild 1390 BLAKE2B a2f2d64e306aeac906ec763105e5a0c8593cad9098bbad8b68728cab3d0333e8023f7d990248186e5b785ecb916f2b075af2636d02c3342e008724cf3b982935 SHA512 cd44e0818039d4931d541bf8bcfeaa6271369f002c16bbb69787a39d85a128eac3a4837479a0794a31c1f59c33dc645f04c6ab9370f121629748ea3f8921dd15
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild
deleted file mode 100644
index a557df1f65c5..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.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
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5 python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-	test? (
-		$(add_qt_dep qtcore)
-		$(add_qt_dep linguist-tools)
-	)
-"
-RDEPEND="
-	app-arch/libarchive[bzip2]
-"
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HTML_DOCS="$(usex doc)"
-		-DBUILD_MAN_DOCS="$(usex doc)"
-		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
-	)
-	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# ECMToolchainAndroidTest passes but then breaks src_install
-	# ECMPoQmToolsTest is broken, bug #627806
-	local myctestargs=(
-		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild
index 4f32e710baca..3b13c99a3559 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.51.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.51.0.ebuild
new file mode 100644
index 000000000000..4f32e710baca
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.51.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+ECM_KDEINSTALLDIRS="false"
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5 python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+DEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+	)
+	test? (
+		$(add_qt_dep qtcore)
+		$(add_qt_dep linguist-tools)
+	)
+"
+RDEPEND="
+	app-arch/libarchive[bzip2]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_QTHELP_DOCS=$(usex doc)
+		-DBUILD_HTML_DOCS=$(usex doc)
+		-DBUILD_MAN_DOCS=$(usex doc)
+		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+	)
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
+
+	kde5_src_configure
+}
+
+src_test() {
+	# ECMToolchainAndroidTest passes but then breaks src_install
+	# ECMPoQmToolsTest is broken, bug #627806
+	local myctestargs=(
+		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index db11edca75b0..414e1501f517 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,5 @@
-DIST frameworkintegration-5.46.0.tar.xz 1753332 BLAKE2B 8ad4b5009096bcbf63a9b4874a353b84733aeadf577fc175ff17265aacda73ef4be543526ce6977756aba1758e56ebf65a3d66d98246ff3424a1540dcc906522 SHA512 34325df3f56d9e659237cb81bae755e2c4dd5b256d7878bcb3b1d3fdf15c749c5b8e2b590d27f93b6d5d31db73e826f63f988ac8c9544801ccd0591117653e12
 DIST frameworkintegration-5.50.0.tar.xz 1753332 BLAKE2B 86590e444da856729b572beeb092abe494c05420e813d6a131eb40861fdeb89719cebb1718a824e214022025bce767b01ecf2e53aa0de7dc355efb95ef8ff93a SHA512 e4efed63fc3fade085e68dd3dcef7c61d68a4fa2945ad4289c96acb1ce369a2fb763242a7d1ee205314560c5f6383018bceb0f7771da7fd2979cc375af22d61f
-EBUILD frameworkintegration-5.46.0.ebuild 1140 BLAKE2B 92740568c9ac6320486ca4d3dba8e64846cc7ff69ace4ec600711becc1115d1f172329e2f9b41cc432ee4b2f0688901c77a8ffa10ec9961924b710b85b48ec16 SHA512 dc77e4df6f245a14b1391bf930939c9dec807d2ae3baa566fe9e41656df3e4cbe314a6bc5186cbbee752f170f0e27ab50c68909540bd5a1c9da54e53bafc58f2
-EBUILD frameworkintegration-5.50.0.ebuild 1142 BLAKE2B d528803f92a758bf3cd512ad02471faf883616675e29874fa60b03da085657f2b788043d97fa786cd64a9c775e90ded45ee880ac2dc1edb77b71e518c669ff9c SHA512 1d19ead18ddc1907524740ce2c7f685b2ed8dbf8c12a25c5a1b5df426c93df013702a44e0d36f09d998fb28d35e8e417ab54ffc9407e385548a8a32082a94cfb
+DIST frameworkintegration-5.51.0.tar.xz 1753440 BLAKE2B ed9e7a17c3f9c637968909d027986feb54bb334a24c6469093b8c99c3310d26799640ad42a5cef16690fbc9001c038cf656e454ea88cfe655ddace1e2ea82cb4 SHA512 fcd29ecdff45ea2733b30a8ce236755962af9a1eab0a7486580cfa1314f6f3eb19d39ecefb47ad72c9e53cc497e0b94784541d8d8d951cd54c58e4f9b12a37d9
+EBUILD frameworkintegration-5.50.0.ebuild 1137 BLAKE2B b5fff549ccf12d8cf0abd5853f760e94a857fde04589e25b837942534171cc1bb7e4a3eb5f0d62d12f841ba8dcebd41d57cdf6db890d27c565b3b07c7ba78c09 SHA512 a989bd795d27a8d6eaf173c49def817a89496aabcae8df464fb65e32a90c9529df0b774f9e8382097183b92b63cc5f665d82cc04245bbf7f7df05ff9ce3912fd
+EBUILD frameworkintegration-5.51.0.ebuild 1139 BLAKE2B c4e7644fd5eb26a00f14322d3b079acd9ce44928acb1783d5e1aa2d48d245ac310638f091384e4079e2270a48fe2a8d32aabe2af27ddd7450640857c0fb0ac6a SHA512 ee76276cb64993b9438594747446833139c6a74417f2f25051949a1a214bfe67d1fd0be3ac3deb41eb5e7a90699c5ea66fe97e6c8f005c42a3de748434027d21
 MISC metadata.xml 339 BLAKE2B 9adff6fc4d48a8e94cd7701e7a3b956963b25af1538793345846c70186d7536597bcd9a1cac92b292220de5d6c2562864b64556c36cd579041b567d970db6828 SHA512 cf6eaaca36d7a193361608ad80cd1a4e79f71952926fb01c8905879422c91d38d6988e473a14960437491e5b43d227497500b79ff3696f0d96cbc1b69f9165c1
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.46.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.46.0.ebuild
deleted file mode 100644
index 04b69ccd307e..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.46.0.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_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="appstream X"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	appstream? (
-		app-admin/packagekit-qt
-		dev-libs/appstream[qt5]
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_prepare() {
-	punt_bogus_dep Qt5 DBus
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package appstream packagekitqt5)
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.50.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.50.0.ebuild
index b6c0da034de8..f471fb1d6e74 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.50.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="appstream X"
 
 RDEPEND="
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.51.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.51.0.ebuild
new file mode 100644
index 000000000000..0d2f4a06aa14
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.51.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	appstream? (
+		app-admin/packagekit-qt
+		dev-libs/appstream[qt5]
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_prepare() {
+	punt_bogus_dep Qt5 DBus
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package appstream packagekitqt5)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 7f850859b00f..ceed4fcd7429 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,5 @@
-DIST kactivities-stats-5.46.0.tar.xz 61008 BLAKE2B 60cc238c8bb5109ec94326980a77a1f69dc5eca6c340bb8cc0554071d3547b497fac16cf78c8c2e16a21daaf01131b205bdcd4288dd6e61c3e4bc120b78a4ec6 SHA512 e861e12f00f91fdabbb5b9bd92c046f80c4f53ba7200344862662df857088e9dd02bdbf64218761e60f1a9d96595dcfb797261c9dc97c94321eb710072c584fb
 DIST kactivities-stats-5.50.0.tar.xz 60968 BLAKE2B 42d663f908f586e4d59e02b6b86a2c64c868d49f0d8fbc19e6a2c5970b79d37f541ab84b9993b0fe5570cdd136e1141204e7063c55f24025236310550e7f08e5 SHA512 0a8e76797333ac0ca29bd734c4c6acb4d2dc07deac0ebe7cfb5e32a2a61ea9537fc9b011dc6aad5c7ad70a6e3cf853d6ce847c612d56559a715b8c8a1378d714
-EBUILD kactivities-stats-5.46.0.ebuild 441 BLAKE2B 06b8aede7e1f329cb16d872d4f5448a477551909ae80bbf67fbe662dc5bef9c8aad1d385c19ea686e4ab97cfed0514612c3976533ed3069da8faedc0e5dea923 SHA512 876b87f986d117d1dde45c70ca71e543be9221018ad87370d987c74e11f62bbbb9831680a4b0b95ae1ca27b015ab6cdff78a86027acc76147150e015dc8a2ada
-EBUILD kactivities-stats-5.50.0.ebuild 443 BLAKE2B f6e568d599bce73a28377cdaa3533d351e6c4de0cbb7ff7dc4b7a1b8a82c2f958f83126212d2ac50c67c5c10bd62f7be42b1fde66b8bdb31b20b81546bf69852 SHA512 cd3aa20166e5103153928d9450ed70aea8ef05f061d453a7a32af8f33b1a8f77f8b39f748df5059615942e209c5c92615362a7553a02a4f20e0847ac14de26ec
+DIST kactivities-stats-5.51.0.tar.xz 61156 BLAKE2B b2e8f3955c62f3b891e72eb3d13ba887a3983edb85113338be183f181ebb61459572ddfce6e938e6e274f33c8fc1d085aa950f766c843cb7cfb001856ad5a108 SHA512 58b42e98bb0ee112974e6ec09b80433aa8536272a8e1c9c81ee509b450957caf108214b3d9e0d0e8c19c1553cd3422d9116d96a1e0cfbd2326e16c8987d6228e
+EBUILD kactivities-stats-5.50.0.ebuild 438 BLAKE2B 74f80777f7d9a26e2f258915a7c5c9ff1f552664c955904817f724f312764d506d2bc3e1a92188dd1b8cf58e7be2834f520310485232aa8af9746acc4f29e103 SHA512 3793094877e7642311a69f82f688c6ffdb28a16036012d782a2592ddd70fb2260dfe091bf1eb34adc11770861d056ac6b85f588c5e9026abdf720cfb216c3eed
+EBUILD kactivities-stats-5.51.0.ebuild 440 BLAKE2B bb8feaa5a19cdbd07819b0383e188798a58c8678cf9470478e74e297b83dcf60cb4a6bd2e8d0d9c9bd9caa073fcbced0042aa479f1eaec727c2d3dc3deb78244 SHA512 2ce45e02d5efec66847e0d1d41db0261048a8f38e93ef5ef21f3fbfe0b04f99ec2d13a8e410734bfd9d7e40cd0c2dd0f31542316e914dd9180bfa76a5721f19b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.46.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.46.0.ebuild
deleted file mode 100644
index 4d022b5365b6..000000000000
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.46.0.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="Framework for getting the usage statistics collected by the activities service"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtsql)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.50.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.50.0.ebuild
index 2c93cf434f2f..3623d103930d 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.50.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.51.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.51.0.ebuild
new file mode 100644
index 000000000000..f71f9a71a64e
--- /dev/null
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.51.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtsql)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 1c6d2061f588..78d4624d127c 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,5 @@
-DIST kactivities-5.46.0.tar.xz 61304 BLAKE2B 771c8ce949c69741b8a53d6e1b8ae2e91993f413055d1b91c64fbe22783931964e20133a89d6cbe44578c823d9b1b2e31c14da396a53b228a55395820e4316a7 SHA512 9a51cc011764a959a82f45b150d05e0171444dcbdcfa1320fe67bfa97a1cdda4faddbdab3e97496485a7025a44536614b359876fd93c976c6289820f7ada285c
 DIST kactivities-5.50.0.tar.xz 61376 BLAKE2B 2bd330de52e78490ad68b95ae4df97bb501dd59c75a385f3ce87d056dc24b5cb13e43f972a536824a69f4fd4cf78612f47996de184d1e06bd15e8201eab94086 SHA512 dde9466f632768664114b791aaea1315dc7535545b66cd874109b83896d29fcb692f9598adefd601687540de5f960d5e238cce4110d484b71b1cc9021fa984c4
-EBUILD kactivities-5.46.0.ebuild 561 BLAKE2B 0d749a275eac73ab4cf9e42a85716b96ecbcb8eee21d86b9165ae84c69d4b6192ed6a45c572e391b3c814c521e1874fdb3283864a30a99e83a2b8f753272bea0 SHA512 e2f1fc1b7f4e608b747a74aeeb655033a810d22387439afaac7aaaf73c09f903e653cf3b0380be9b61308dda2df28d0df12ed4107ed4f4fcd6779dc67d2c2ee5
-EBUILD kactivities-5.50.0.ebuild 563 BLAKE2B 742199041c61534fb38071daff0cd54f104c0304dd2b2b98b82a906645b31f18111bc50a910fa1182636c4abb8921878e482c60b7187864c2adb92b0f2638455 SHA512 73c7961e252f51ff244387fd59b0d4923ea6059cf380ba1f9ea663acd95e9d40696dfaa3f4840f29d81b9b7925deabad8c6d55fdd90e14677ed4337da78a88af
+DIST kactivities-5.51.0.tar.xz 61472 BLAKE2B 7197b0dc90ace291c9bd3af97e0c09a34d00d1198bcb93203a0c6895e49a564d07455e2790ec98ef1c3879887fa38f707205268976c8f902afe7a063f684198b SHA512 ee9d1429fb1333b9ce6607e865085336bc2d3ccef3fbbf386b2ab83a5c71987da67279cfaf5423158f536e04cdacfd0f53d5421e003a9c9c9c1b20e4dc44052d
+EBUILD kactivities-5.50.0.ebuild 558 BLAKE2B a5cfd124d5aab88d5090fd6e24cb43810b778cbcb328c5a2154f4b339387cd277ef83fbda772bff7f956ffd0f8808a34e3d96315de7c4cb3994c71bb4af93d0e SHA512 08820334d70b9fba344438c8528dd70310e5b23b4c83550e0793dfb035fbf904c17a9111af601727d20f478be589450ca5edeb4941b82a1d54e2bc67ff870ca6
+EBUILD kactivities-5.51.0.ebuild 560 BLAKE2B 9ea4d5227a7e9562c265e242a310c2721cd3f39fa00d5eaae6a19c9c512a6d5827970aee707faa06f76f84cd698babebb43d89476a54d8e70e51782ec2a0def2 SHA512 44a337272c458f8f1bcfd73a5c0cdf9a9d52e4df4d3b0dae2867d386ffa63f67ff2b1e86cae792a8a5ecb48738555aa76bd1e9d39fa79da473f677a90a3159fb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities/kactivities-5.46.0.ebuild b/kde-frameworks/kactivities/kactivities-5.46.0.ebuild
deleted file mode 100644
index 36e98fcbd631..000000000000
--- a/kde-frameworks/kactivities/kactivities-5.46.0.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="Framework for working with KDE activities"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative widgets)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kactivitymanagerd)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities/kactivities-5.50.0.ebuild b/kde-frameworks/kactivities/kactivities-5.50.0.ebuild
index 9bc7ca2a1803..d68f0a81c378 100644
--- a/kde-frameworks/kactivities/kactivities-5.50.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for working with KDE activities"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kactivities/kactivities-5.51.0.ebuild b/kde-frameworks/kactivities/kactivities-5.51.0.ebuild
new file mode 100644
index 000000000000..11a7142e0e0a
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.51.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative widgets)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kactivitymanagerd)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index f8f263847143..659fdafbc952 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
-DIST kapidox-5.46.0.tar.xz 396340 BLAKE2B d9fffe5a26fb614833345e13dc619fd795463d42e91002f69bf3be94281e80a8080031d053bb3f5ac688892f479c8ad80b85f356010f73079629269bcc372baf SHA512 e99d0669908c19a66fa202858a49780b12f144e4213aaf9b2dc2e5003bd28b86abb872551d7cd860c64b53755c2b8bba5d7db5c8e8b84b4d59534eb965670089
 DIST kapidox-5.50.0.tar.xz 396788 BLAKE2B 415f227459a38c1b56bdeb052812072b86bc57e1f8e94cb99729481280c60462c7d49af8b6349d775c7d661058d0e4104a622f84b9b63f96d8364318b8d109ab SHA512 be76f8af7f33a6a4012d7d1fced7d50881dea655d68231271c01619ff92e956ccc0691076605112d951ae09e62e6024a71914754e6e5f6e20f82c133a9b9256b
-EBUILD kapidox-5.46.0.ebuild 612 BLAKE2B d1145a0418a7eebec6acf297d94b80c225c7d57b984edf46d295330aca541894dfb01dda7f40c26613f6927221ff41ccd71fbef8fd766bee4e84f3bb21b28f6c SHA512 f6e9c54f9856212b06f231227191b946a93b11326867626d66e1078a6be110d046e1137be5708678bb877ae85bbc904020ca61ee410cf8f285b146547468f96a
-EBUILD kapidox-5.50.0.ebuild 614 BLAKE2B e702f3dfb2f341ae8d628e9a81efa2759644adeb3532aaac4858b7eb049d006d333168170a072e3957ae122878ac99ecabe1d819d6d576280098a334a089775c SHA512 cfef53e48797b9f09c990a7b83a0486562fc4f61e136409bdb45deef19229f81d89c3793638fe051a81e017ff3966da9e9be249938271368eb8a2d88f7e99771
+DIST kapidox-5.51.0.tar.xz 396668 BLAKE2B 367bc6132376f0e7aec29e5c2fce2856de1071bf9bddae17746b0bb82c125b834658ae57dd2148e140c3fbc2159e6f1bda547c0c4ddbe4ef3fa4b0e10b97aaae SHA512 908569e39caf595947b509d455a4ab2f06bfd4c1120f943655055f961ae59b57f4f5f612e01bdb6e093fa29f616214924d32e461b7d39efca8f25360f6350cf1
+EBUILD kapidox-5.50.0.ebuild 609 BLAKE2B 1d26ca8d2bdf15ee2ae35713a5777427248c7f7e09e5f01e133df058a11deafb0c17fe7a4b6d0b1c0a3c77e62c381dca394a127f0c5ae441dbf14aafe00cd7df SHA512 057dd9a54a823501346d4052f81083bbb0698c9e3d09d56ef3fff5a6027df521504d8a56decea93f28cb7463c70e1b1bac1d9a5009426c8b76e1e499d5fec7c0
+EBUILD kapidox-5.51.0.ebuild 611 BLAKE2B 425e77fdd9c16fd97ea5456884063cb1a11b247d3549718f7e7d943bc3d492c5f7f813500d160f55a81bfb2a0a9d1079a7eb2ad4086ae3431ea35923882de4cd SHA512 0d7acc884049ca991a82ece6085e345981495a6f768e940d71d795031f5a2a2328e6acf9deab6e82e309a1c9577367376401d53216385e1f3be80e11b42296a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.46.0.ebuild b/kde-frameworks/kapidox/kapidox-5.46.0.ebuild
deleted file mode 100644
index 973538c40a02..000000000000
--- a/kde-frameworks/kapidox/kapidox-5.46.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
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_TEST="false"
-DISTUTILS_SINGLE_IMPL="true"
-PYTHON_COMPAT=( python2_7 )
-inherit kde5 distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	media-gfx/graphviz[python,${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
diff --git a/kde-frameworks/kapidox/kapidox-5.50.0.ebuild b/kde-frameworks/kapidox/kapidox-5.50.0.ebuild
index c0551adddf60..d95f7c04d01b 100644
--- a/kde-frameworks/kapidox/kapidox-5.50.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ inherit kde5 distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kapidox/kapidox-5.51.0.ebuild b/kde-frameworks/kapidox/kapidox-5.51.0.ebuild
new file mode 100644
index 000000000000..18edb5cc8ece
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.51.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_TEST="false"
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	media-gfx/graphviz[python,${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 51619d2efe32..68c723ae7917 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,5 @@
-DIST karchive-5.46.0.tar.xz 438540 BLAKE2B 46608d9918b110e2c098839c988f12b43f59b5367e9f7c08e9ded31cded909d143e3c6661601a91dde55de4cae79eb61f18f6722942a5df8bb18c082a644dc00 SHA512 ab218a2d629ce7e9847cfe78b7a7c6c329d52e8ad270013a0c8e6bed70c425ad55b18ced015a833b27f8dcd1428e61c63c31d60db85c283f672e1f58a7ffc265
 DIST karchive-5.50.0.tar.xz 439876 BLAKE2B 5d615ac6d18e93e67dbb25c1f2087ef06e32ab28c56090aa4f6f8d05f296c6ec83479a969096570fc687548ec6910957540004ea99cc5d53d1856f29ade59d46 SHA512 8042ef931c8d2c6eeb84f6ea33858fb111f7e08bbc012b333eed33c278eff9269ae263b50110201fb448d5e213598a2afebf542e7d0f6c3fdcdc944ed2ddfaba
-EBUILD karchive-5.46.0.ebuild 569 BLAKE2B f1b51527fd92aed533095d9b95b672e0e1feb748ab2df2e43fbeea36d504af6933ad0ff579de9adad5ccd38b92015ba39dfc0a58b0ab96e3df4390924a5f38eb SHA512 7b9f9ca6942b073e134ff872ee0290170c1383f32d596346a8c62f2dc47a2f7c4565fcbbc54bbd8cf728081f3c1e451ec0f80847722f204f5f12626ed133efa5
-EBUILD karchive-5.50.0.ebuild 571 BLAKE2B c81b66a30d80f76ec822e926ce5f556692b8c7afcd0b75f9248e435f71d02de7cc4faeb1f28291cb211cc931dc1eaa9ef728ce0a562f46405be525e1f4c686bd SHA512 92c08fb5853c5a7af0747c525bc89d0ed7f94f2d3952c69560489bfb51cb6df0c8a1cf6d62b310c447f70d9c535326ca278eeaa4039f5db714ab219ba08da6d0
+DIST karchive-5.51.0.tar.xz 439912 BLAKE2B a2df2ef28b844e9628c22520d93600ce8e53e9f49740c5b592c3a0c7429e1b87ef350ea1f0cf91874ad067574c0741d6964ea3e4d7db434dda4bc2653556215e SHA512 dcd676a5ab7a8a45e79c0b13abf14ac5ab6b37454f5c79838a183956e57b801ce880cbe5cca5fe6f033ec7dcffec9f788e08593509b8a40fd55a1a8da925437e
+EBUILD karchive-5.50.0.ebuild 566 BLAKE2B 6661fe38c5a89c2e216276a0973713fa5cd20c769599c49007967e87b57833786ecfcd54ad0f8ce19307a0c8bbd740c9b6a9f411690217b7587d7c8d06c550b8 SHA512 2036429116579dd827f428d4580e9e4c90caefd2f7a29df7b48e6d29d95a834131372c7dd0482d51796235352a1c94f106ea9970382901d52eae1dd9801b0b95
+EBUILD karchive-5.51.0.ebuild 568 BLAKE2B 47488c073f12ad6a1fb6b1ab993e1cd720f3be3f6673a7703fd5af6a7e635a01efdf48b265d2bc623ecad536c95b03899730926fc286697686d0b1da418e7b4c SHA512 3db5e4974665369701178ef1ae5afc232cecd5646e37bfd282fa335ff2561da230841234b6f24614745f908d7484a84666289d4da8c2c8daf511dccff1f89d94
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.46.0.ebuild b/kde-frameworks/karchive/karchive-5.46.0.ebuild
deleted file mode 100644
index 0eb013504cfc..000000000000
--- a/kde-frameworks/karchive/karchive-5.46.0.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="Framework for reading, creation, and manipulation of various archive formats"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="+bzip2 +lzma"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/karchive/karchive-5.50.0.ebuild b/kde-frameworks/karchive/karchive-5.50.0.ebuild
index 5fb760e1d69d..a47dcfa263f6 100644
--- a/kde-frameworks/karchive/karchive-5.50.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="+bzip2 +lzma"
 
 RDEPEND="
diff --git a/kde-frameworks/karchive/karchive-5.51.0.ebuild b/kde-frameworks/karchive/karchive-5.51.0.ebuild
new file mode 100644
index 000000000000..7980aa4217ca
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.51.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+bzip2 +lzma"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bzip2 BZip2)
+		$(cmake-utils_use_find_package lzma LibLZMA)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index faacfcba6a76..a8e154068c7b 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,5 @@
-DIST kauth-5.46.0.tar.xz 84932 BLAKE2B 10a3e1f612f2569894236da4fd7bd8f02259dd9258364dcdde7685691e49789805d3ba8fffd662779cc64a74881bc2ef5907173416d876fb8a321eb903a7139b SHA512 dd94d8923ea7caa1f420d4a906876e1082c1afc97130731f579e6c3e9b377ec9c1abfa1d489ed60c11fff248da455d87a8cde8a581156d61bf6410b8c19d3401
 DIST kauth-5.50.0.tar.xz 84956 BLAKE2B 7be872586d98d3ec2fe5a1954a96c8b4e6ba9110314081114ec013fe574e96c1466ee8dce85b9005e1619a800623cb89584df926634aefa5a54fb9d7816a9295 SHA512 c31614178529262188ae83815b88cbe4553480e81b9d98ddab0bd6dd1656504930b8df211ab12c3b1510dd616cc0b681697eaf214b426b347b4377311f6d0c00
-EBUILD kauth-5.46.0.ebuild 705 BLAKE2B 8681b590a667cbf3c340ac15a6340b5eff97a61c6715cc40e5df584a11eeb74afc332a04b7c8fb28b056139ee00bd7e21c1ca01791b7fef1dcba96f4fc1c4178 SHA512 4a4d699012ee284e60764f35b0b9f4d1c9f0225416736e91d14c5faf820386ec9711e65e42a55c1b89183ebf9398254b352d503bbe4963ebb8f558924741bed5
-EBUILD kauth-5.50.0.ebuild 707 BLAKE2B ca4e23e1948d087e5c6212679d7b0943a046fa44eefbc1d27e8413f8eca98de0d2002e677cde891f3a724ca3dbd19fe080c7890db65d9526cdddd449516dec47 SHA512 6035e9705c662791c1370b9d5f36a23f0e32ca5f38263d36977841ccb58eccca66226ca68ec40596a438cf4e13a69a73146e47ba19eab999d5dec05bc66db2e1
+DIST kauth-5.51.0.tar.xz 85004 BLAKE2B b94884389dd066dbc660ad755a0523c1b22b755c2069b012a7972f7f591b47b5c0916f15a29a89e487edf24ebbb42d9ee025b9325d4ad612dc7193b42bc10baa SHA512 7d559818acd84b2f24cb72f7c93a1253835f87169acd0b8d54816fa5cdbb327bba2e0d04a3079adf236fca8557fb2d6cfeb17ef32cf1074bbb60e80af8ec3d17
+EBUILD kauth-5.50.0.ebuild 825 BLAKE2B 6d89078d27be4e2780927b4cf9eaa8cd42d1d2ce49d8861bbe7c41b78d852f4e576becc1887115a6138ba19952887260ea65b0a9c7380ac889dd2acda97d8413 SHA512 b79857de24cdc0f1ecaf5d4fe392b6529fea02e4af1717922c1785567961ca6fbd712c6bdd9febe491f71d329793e257e9ebac9ffae666fac65b2318cb9fe276
+EBUILD kauth-5.51.0.ebuild 827 BLAKE2B 82076b8265361a71c06de84b9e8af0360846b67284efc2aa2f548acb7d6487e58ab9f37ed6490527cafdc2e305bd9af10650d278ba64126953e4ef4ce152f63a SHA512 73ce8063d75e563c79e2c7754394a78b65288ab10e9401640153c315910f18ea51ebeffc568573a7349b3390d55fba14afc7a970febe676288f161fbedb46c50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kauth/kauth-5.46.0.ebuild b/kde-frameworks/kauth/kauth-5.46.0.ebuild
deleted file mode 100644
index 68d827a029ea..000000000000
--- a/kde-frameworks/kauth/kauth-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework to let applications perform actions as a privileged user"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls +policykit"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	policykit? ( sys-auth/polkit-qt[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package policykit PolkitQt5-1)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kauth/kauth-5.50.0.ebuild b/kde-frameworks/kauth/kauth-5.50.0.ebuild
index ee6570cb1d6b..9f032195dbef 100644
--- a/kde-frameworks/kauth/kauth-5.50.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework to let applications perform actions as a privileged user"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls +policykit"
 
 RDEPEND="
@@ -30,3 +30,12 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_test() {
+	# KAuthHelperTest test fails, bug 654842
+	local myctestargs=(
+		-E "(KAuthHelperTest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kauth/kauth-5.51.0.ebuild b/kde-frameworks/kauth/kauth-5.51.0.ebuild
new file mode 100644
index 000000000000..da916e906553
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.51.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls +policykit"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	policykit? ( sys-auth/polkit-qt[qt5(+)] )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package policykit PolkitQt5-1)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# KAuthHelperTest test fails, bug 654842
+	local myctestargs=(
+		-E "(KAuthHelperTest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 8b1615cc581b..9e3980eee0d5 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,5 @@
-DIST kbookmarks-5.46.0.tar.xz 118616 BLAKE2B 18f584218b851fda6cbc7db1f26acd550490b51ca53d0e030115430b3dc0e7090bc468cf698811c1ea27e779dc104a7b73f06d142697484a7afe2fbf82b23553 SHA512 8bc05aa4710c9a0148e28fb27fbc75984947a5c42c0c48befe78e510f48646bf2ca71098ea50d251aed888369d573451d6b3ba5afc58d6268fb14efe31df9a5d
 DIST kbookmarks-5.50.0.tar.xz 118792 BLAKE2B 4296c634f54797aab6e2529be53e745cdbf96f1120413cd27cbde872968470452a37249456b09d6121723dd0aad141235a368adddceafbf2ffd838a664d3224d SHA512 03340e18b6c4774e4aa16af9bdadccf102fdda9caae930e92f9afed833ec3f70eae818b9dd5f51c071b52019d7b7566195d2d552cc725af575548a75d7e7575a
-EBUILD kbookmarks-5.46.0.ebuild 687 BLAKE2B a2bda11e497e9e9cf13ae27bf5d831f3b807ff9f52ddbe129aabf38b39f1f2e315ffc585ad62bde0ef54f3946cf2bc1c8daafab77fa92974e09bc00771689650 SHA512 9caa0716422419e2371ce95fd1f79c976e138f3704586a12f316a63796677548c0eb88573a9d96414fc100e07abc1f79e9ef3df86bc694b435bd77d13518c0f9
-EBUILD kbookmarks-5.50.0.ebuild 689 BLAKE2B c11840739a9d33d45eb49ad1c21ed133bd7c6a57b303fef43e4a6c4198013bfa819f262eebd2345b7d3509b0d44667cb83a1a0b99895ea766d365102aa69c5b4 SHA512 df48f821747ba8ede0bc91fd79ecd91d4a49a20e269f9b2cc1fe5a889d7d596e3218333d62fbe432bc50092dcb515c5938c435ab4e43fcb86c250f74fcc4ae00
+DIST kbookmarks-5.51.0.tar.xz 118876 BLAKE2B 4c8fd17d6bc798da0050896799cb597d7637d920b3ba99fc3b2199dba0494151d55f9d96f1079ce9dd957245c8f5fa38c804e2bb1737d916a835af980d8593fc SHA512 ec0ce9eda15cbdd5c16469d23912d6fb8464004c4f7cee1a6ea7be3d1d53cebf5daaa693380972e08fb763eb0f93930a32dfaa2e3213e56a6f50d305ff9acac1
+EBUILD kbookmarks-5.50.0.ebuild 684 BLAKE2B 115eda6af51d29f16237678a9699076ab474be9b68e00a89e97724db3bc5b09847a0e99cefb547025bf6fb96c720269530f8fea13e087bf9d920ccabc30f0e7b SHA512 ba1fa3172567c028da244d5604bc805ad2dde71d0d3f176b3a1cb7dde97f04504370525aa17327719764196034027c17ce5ed0092cb4fd50758e3d7581caacf2
+EBUILD kbookmarks-5.51.0.ebuild 686 BLAKE2B b73b5ada06ebf38a561654cf00f61dda0a33476d70816c26afa60eb904022a11330ac4f2271e5d1be65fd28ed1c12accc6294de47d8ec452d699dd9d2270f54b SHA512 8d9e0e1aa4da7f9b1a59a760f5a8c13d23a658ab7c7ce8986379c1f35ec451d7047b6ad1bb71fb6ade15d0333d24fd0fa7d0bb7737861e2ddd9abc41ed6d135d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.46.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.46.0.ebuild
deleted file mode 100644
index a9abdf2d7f09..000000000000
--- a/kde-frameworks/kbookmarks/kbookmarks-5.46.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=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kconfigwidgets)
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.50.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.50.0.ebuild
index 763576f16e6e..bae9657f64be 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.50.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.51.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.51.0.ebuild
new file mode 100644
index 000000000000..fc00fadf90cf
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.51.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kconfigwidgets)
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index f468845516e0..8624cc187295 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,5 @@
-DIST kcmutils-5.46.0.tar.xz 236796 BLAKE2B 9936a27a8f966612ddc584b88626dfe30cf2c3981b1b9d74ed83212ae830bfb30e001cb0ba5b62807551535a63a8caa6091b47437267c3fb46a13892d7b62546 SHA512 322cbe7dc93320f468c20b683c4a10abb7b19b1250a124e8a16e440571d160f102b709a8ddbbef6087aceacc44ba473b1b348f0055c442b5131c3b46de4ae732
 DIST kcmutils-5.50.0.tar.xz 236768 BLAKE2B 963e0d879a02f64ab8a1fe4c11e8106b43b72e52e0b029e98b5ba36cddb4edc09e39b1e7ca0b0b35ddb9a25441872daafa07c7669cb3d664f8b914339981a98e SHA512 306c7c76c08d1ddfdec6ec0dae8367c531f174f3c1ccece3ea0d32d8650a1106be3c10741bd97d2ddff4d81f05c720e8b98d43b290bdd787a0b1269dd6d71bbb
-EBUILD kcmutils-5.46.0.ebuild 784 BLAKE2B 91aee797615d7dac0d60594856ebdecbbe0a4524651913f58214580a8cacdf4689a7329f97326b39187ea0e378f86fdc909d38a8c4675b3be13afb6f4811d881 SHA512 f14506153713ff0605174b6fec0cd7427340a4f380bd1fb8baf404e5d906c233ddd02d5475ce2ecbe915cd2bb2d3f02214e2be6f6d5e231c410995929d8ee478
-EBUILD kcmutils-5.50.0.ebuild 786 BLAKE2B 7bb7cc7c96a7432a1145dfb4cb3891e8c11fdc05f6bf2f27c6c16c6df546c3e5bca7420b3a5b1f6905732f7cc44fba0700271635bc0152707c7f46232a290a13 SHA512 f493a4d18a82e702964c5e6f6a49dfd2e8f4a042ae05133b02d61a9f0ef9172411a07b054b30b4c46d194971aaefe04a4940ec6f7e0cd70540cc86044869a0e7
+DIST kcmutils-5.51.0.tar.xz 237068 BLAKE2B 8e614acbfdd911abcad4b54a58cf866d2714f69d4b1379a75df5261e06e578d07198c62a650775d4392c055ab4b7062b11e87e42660abf2c9a3671ec441f339d SHA512 e8edf3f80d40d12f5032f34e15f0dff69d67e4c13c643bc0a16855e86e60896add20c95e1d5c3a4c23ea36455dfda239161f77c8157759bec228c4e4653980bd
+EBUILD kcmutils-5.50.0.ebuild 781 BLAKE2B 90d9353190df0de462a798500810e3c5ea7b8d50ea6062b100db71222f73aee768bc4e449b22a089ccbfbe9d8b9944835485145fdcc1c9229a265066ae7f22f6 SHA512 e04535c3f741774ce273ccfa0a52e91f55cdb3506ee014365db6889cec8c0a862a0178333092d069968a7feae63a43b95e6337f30618694ee6300f43b2fea84c
+EBUILD kcmutils-5.51.0.ebuild 783 BLAKE2B 3973b3d0e8c210ad2c1d22c293c6c0a3b399efe45e4ca298373afd89dae97079fd52cfc94b87e3d9320a45b1e47a4445a9720d113fa2ff686ab60ac4b855e4f5 SHA512 5af10d2f91b5c23961cd70ca3359eb13c9e3d21ebfb7082610a885457dc587a385f8bfe74e816447a64a694edfbbcbb9031afb69afbcaf4fec3135dd25100e41
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcmutils/kcmutils-5.46.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.46.0.ebuild
deleted file mode 100644
index 1f44ec43781e..000000000000
--- a/kde-frameworks/kcmutils/kcmutils-5.46.0.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
-
-FRAMEWORK_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework to work with KDE System Settings modules"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcmutils/kcmutils-5.50.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.50.0.ebuild
index e6daae33a2d8..48da12366ca5 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.50.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework to work with KDE System Settings modules"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kcmutils/kcmutils-5.51.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.51.0.ebuild
new file mode 100644
index 000000000000..4ffdb15dce9c
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.51.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FRAMEWORK_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 6d57d401dcaf..5faec33992d5 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,5 @@
-DIST kcodecs-5.46.0.tar.xz 220204 BLAKE2B b63cd9cf858cd2f1b9106fce7bf304a7ccb7cf6dc9f2222586de3521f9951163e37704aae7b3afc6ff539f0d67949bb2fc6e7e3ed232d4566caa1cad57034c53 SHA512 0d95829643c3cb27f408d409668a0336b05ac15046a30f9e067d4448671b3847712419bc7b807858e3be20229446f47923d5e59d0306243f49a0192e8a8f4412
 DIST kcodecs-5.50.0.tar.xz 220020 BLAKE2B c769ad62977f0f3c72f57e7243ab6384569932d360c4c1bc206c47e2fae7a2aac0fbe50556e3fc65f6459b100347f6989e2a75348b9c56e678b05c9d7111f6f2 SHA512 94b8027989f317ae0f4e4563c670c8c91534ae353ca5d8e00d742c6e285d99043fd1cf0197f08408f8f66e64ab7a3c8f21055364ac8e152130c04a21c7d1f221
-EBUILD kcodecs-5.46.0.ebuild 339 BLAKE2B c51e7c0112d92ddd19ea520713ddd1fbc11e1127bb866ab0927f39b34a5ca9bb78f784b8591ec1a783bc3d5172848dab62bdc995cba9efe2176852ea5ce5f03b SHA512 7e3e3391d284b4a2b0bf8740d3b7459443ce266451d9ae8f7bf9e7d660bfe5b5154edc2c086ef394a543edc94a6037ab706cf17ab7cbd069629b203d2d855404
-EBUILD kcodecs-5.50.0.ebuild 341 BLAKE2B 17fc90f2f066b8d24a10598c5f6c302cd32091e372dad98b62a052305777108a457a45a414bb9f4be20cba368e8fd4e23d279685845b614f12340bd8e4c25c84 SHA512 823d251e96c4c9e578b8378b99eb7a8ea264c8ff8a4762159abdd0b07a4a20712b2b57c211282f83b9fc3c060b057201e7fb31f6ab03bc6067b6643a9a61915b
+DIST kcodecs-5.51.0.tar.xz 219924 BLAKE2B d0424f127e04196b84efd35508bc2e7d6690a4e33c7a5e172249bb4be55489a7f414e319c947962f0692411707684afff08f4791045569f16b771449c29adc83 SHA512 18c19e968006d073badacdd94dd6ef45c57cb65cd23f92fc9d183c0d23260c6c8833721fad73c2bdb849ea8d5f109718dc9584dc18ab82853a6743ad8a7bc537
+EBUILD kcodecs-5.50.0.ebuild 336 BLAKE2B e4159228320a10b370c300f4ff11aa25b562f45150b0ed70ecbd87243463522eb4d46e06f3a98534c4982d634ba95453086de2b5132f72ca0c8f795a1238936d SHA512 dbdfc1cf35efc544faa19f11c88140f4df1efeaea27c2979302a7c63187f9f84a6a5ba21e5505b607d5a632593ffa39c37cb8b3e15f776ad310aa9275169854a
+EBUILD kcodecs-5.51.0.ebuild 338 BLAKE2B 81dcea1f963613bb796312f15b00e4861c855763f18ef665b5131a7bc5f5a482fa32e8a0ca3a1daef26c3ad8b27721ada4d7ae84ae42763aec000a325e0ff9bf SHA512 62c2330326b972f81d9e3aaa58a63e2a4506f5a3e9e9f9f94f0d3776a83dea5a764e272ee40741f3cc58b5738a9202235cc219931dcd84f311f4b714489ceb9e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.46.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.46.0.ebuild
deleted file mode 100644
index 092e59a458f7..000000000000
--- a/kde-frameworks/kcodecs/kcodecs-5.46.0.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="Framework for manipulating strings using various encodings"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-DEPEND="
-	dev-util/gperf
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kcodecs/kcodecs-5.50.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.50.0.ebuild
index 729b4e2aa9a3..822ae345ee0a 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.50.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for manipulating strings using various encodings"
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/kde-frameworks/kcodecs/kcodecs-5.51.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.51.0.ebuild
new file mode 100644
index 000000000000..5b29073eacdd
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.51.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+DEPEND="
+	dev-util/gperf
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 17c93f66b71f..2dc5bad5b288 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,5 @@
-DIST kcompletion-5.46.0.tar.xz 115636 BLAKE2B 282461dcd9c29ced94f43ef3c5f3b345669a0c3cb70e0c37b3292146ad9e050e9880aafcd8d33b95dd74abffd1e51597a888842231e24c194e65fa34ad143913 SHA512 7c958ba845a89745472ae8c40c95f43f78fbab420c394b81014335f004d3b40f7c4f44263cd5b99c5a448fde99e3f9da607fe01f539eba18a68a28c88d4b0d27
 DIST kcompletion-5.50.0.tar.xz 115588 BLAKE2B 8bc0bebcf126da6e7b0e3fe4563fff5956e3987d2bbf6bdd4488df1ad46834dcb603ba82de9f45741899b11d7d566c01565afcb7b5ad6fddf6499268eeffdbae SHA512 27db7af56d4cafada863ae8f30a87c4d1974717ee2b3f537b235a6f1353c3976932c27308b4f9fe1a6386b0d395c22ffefb2f4c273a496a0785a34a494451c4c
-EBUILD kcompletion-5.46.0.ebuild 474 BLAKE2B ab2132a691fcfd47d5d684315fe29bf6de629b30100659b32472d60a1992465535b8ece8581a32c86933c96c72e34bddca578ee5421a9313360a51576c84fbfe SHA512 16ba23a01f270b27be167f8aa092e0673fba72d18f0ed93b214be0fa35fea7a9a46a06bf7b53680937df9c74b77ecafe0eb59b8e4180b7e2bed96c59289cd4c5
-EBUILD kcompletion-5.50.0.ebuild 476 BLAKE2B 94c0be2d8e1306f28e3b8467b20075ae88a23da3f0467ed9324ebec6446495e7fb15e6132f04b3acdf6ac4ca2ba211933a141819fdc19c42687ce0648d31840d SHA512 7304e20bb9bf338ba133d25525348b791d9d7f388543a932dd7c16726f57c5cfb53b74ca4d77e699309522f989085b8048065c04065aa365b8026f9d678ac311
+DIST kcompletion-5.51.0.tar.xz 115612 BLAKE2B 800db25858eb3d87fc265b9ed31431c28ee779f0f77fd7d8908aaf76dfb81205a1079ad7594a73a19cba6c434d4844ba2d37f8d384355a5e70073b1b3a770d4d SHA512 b70a3e6bee33a24b5659023c496c2dba0637b4b4a130704cba428f47c63625a847365dd4cb2bebfba94b0897ace9a6361aa536d05f1ed1574f934a56d65e1a83
+EBUILD kcompletion-5.50.0.ebuild 471 BLAKE2B 6abb291d10b93d9613bce21341b98a9c9e92af823657c0c56c9873b96db29dd7b4d7069c5b3b9a9da89e6faded4dbb4791fa12205da5b098eb9c45da5b53f8a3 SHA512 664da2d761fbef653240244419ab2de1e32ca89373d9e38fb61e6f422b81032448621e05912f499eb05f17135ac548497085d0564bba005105f454278645e75c
+EBUILD kcompletion-5.51.0.ebuild 473 BLAKE2B 1a74c4df32a78be26aba04e038a039cb2a0511db87945d36b6dfcddb03773110ddc42c8f59c329b8387d3cbd9eef525946df016ebb9f920b1653150429995b8a SHA512 3414fe3380b7aca40d41fbbe1edb7fe1fa22cda6912d9ff80b00076a4d2645083f7f6244803bae64d3e772994945adb8586f7b0648e43675492d344779c9ce9e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcompletion/kcompletion-5.46.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.46.0.ebuild
deleted file mode 100644
index a2eb19569e49..000000000000
--- a/kde-frameworks/kcompletion/kcompletion-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kcompletion/kcompletion-5.50.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.50.0.ebuild
index 89c636704e5b..eef5243dc7fe 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.50.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/kcompletion/kcompletion-5.51.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.51.0.ebuild
new file mode 100644
index 000000000000..111e8578b542
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.51.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 5d7e9040ff68..7e59f607a535 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,5 @@
-DIST kconfig-5.46.0.tar.xz 235880 BLAKE2B 7bdc96f435f8e1caa7cdb4f57f56ed0d2653525a8d9dfe0803c6e9e6ddd1dd9a590431aa4b4d6c4aa692b9b3ba29aefa3ac8453645871fb9daabdbd170cf7641 SHA512 0dc5234482ca773a7dbabeff983013e4da17c9ea42805e32070c415a51fc878d0918f768315f9db6ee23bce16e445a6f3defe96be256a10568bdee444d8f1a5a
 DIST kconfig-5.50.0.tar.xz 236388 BLAKE2B b48dd333531e969e21f667e9430f0f6235a9baaf5e84b3a6ae1269c7214c85cc6a39480d9433e81c1388a93a3af91b61395fd1488a9a6cf1d28cd11c4a0ddf34 SHA512 282a5cefb3cc1752fbfd450732bb3479751d3a20b65661da5ebe1797968f4e20f093b3e1083b232581ed375ab9314f059f13a7f8a1021c1dbb2c96d33fabe746
-EBUILD kconfig-5.46.0.ebuild 517 BLAKE2B 341840986fd2f04a7b1773c2e48d3ad91cb18447ce16f340368a9e97f2c3c1a621ab050517827f67d14b070a93256b97d2f69c2d49026b6b7077e35f1f7e6b23 SHA512 c4c990532f2f26a59d93b82c47b9a977ef0c2f2fe160932b8b5e3036af2755df620c7c98fb5ec8c933a666e1e52848ae1c366194a3c77233a355f80af2bdfaa8
-EBUILD kconfig-5.50.0.ebuild 519 BLAKE2B 75c292f0deb2722661203e0e6ed992a00efdf2f06dd7067d34373318306cd48a306650dbcc0c01a3751625b773795a48c2ffd4cd490354525ba273022e803b7a SHA512 1cd9142d8005378bb724a927db5f70bcfc0d79e73bbabc34f1eba8133e16fec859647483f8d32f4b5f92ae40f0026a19188359b41c30cd9bbe99f402a8e0c873
+DIST kconfig-5.51.0.tar.xz 236540 BLAKE2B f28fc3c8810f9165345cab8387bfdf7c6665f919db091f43615b1bafb9de5adf4eeadab0392aec3701513f65cfd900021b2eefc622816818d9f2afb76ac8276d SHA512 5362d973e9c679206ef5d02f53a781b6b8c7b9c731c04e790b2bd2731ab44f6c49e51bd94287b1a2bedc7abdca84139219155a3b05914888adff7fbe09e02b02
+EBUILD kconfig-5.50.0.ebuild 514 BLAKE2B 756b865ef6c6f09e1f56777bf89e190b434daa2a76c971062bec023f4d4d64a40126e701ecaf4d9f68051577ed8279a22ca1194b281d00181ee5529bde97fa1f SHA512 f7284257060c82f729e50fbc8a0c07df9fc79c966a932a4d78bf09b2351177abca0317c7e482d81ea139d58e1c2876e9ebcef4dcdd69984c68f752f8cab5192b
+EBUILD kconfig-5.51.0.ebuild 516 BLAKE2B ba66cd5d4228e931a9861250862616713acc23eac69504808924df573d7ecce29776c943dd1875c987283f43ab04eb553a782a4546488c705cd9002c1ac07ad5 SHA512 f95111e1205630d9d49bbf324f5728a6d8b91755bf2a239fe08a3842485587953c67d126255948c9e79d2ab4903a11b61ccd5cd3456bea92753e73835917f346
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kconfig/kconfig-5.46.0.ebuild b/kde-frameworks/kconfig/kconfig-5.46.0.ebuild
deleted file mode 100644
index 026517ddb6e5..000000000000
--- a/kde-frameworks/kconfig/kconfig-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
-
-# bug 560086
-RESTRICT+=" test"
-
-DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfig/kconfig-5.50.0.ebuild b/kde-frameworks/kconfig/kconfig-5.50.0.ebuild
index 9701c9a50636..5a6249ea2003 100644
--- a/kde-frameworks/kconfig/kconfig-5.50.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for reading and writing configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/kconfig/kconfig-5.51.0.ebuild b/kde-frameworks/kconfig/kconfig-5.51.0.ebuild
new file mode 100644
index 000000000000..fb5f9b2dd01f
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.51.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+# bug 560086
+RESTRICT+=" test"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index c0b6fb83dbe3..729082c151c8 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,5 @@
-DIST kconfigwidgets-5.46.0.tar.xz 375360 BLAKE2B c9237863d2a666459310a10e3dcc2d900cb6b74e2946f10cc38077694ace1798b87c8fe6a766ba02879ee56b77c13c95cfbb8abffffa85448b9ae0ceb78494e2 SHA512 09dae334187ee8fbb3ec39d88ef5b92b7f00a43ce7d72a535d3a9a5556083b63990881c1b19c8e3616c786917a5d41cac8fe45eabbd531f8330a05c0e0ba7a85
 DIST kconfigwidgets-5.50.0.tar.xz 375340 BLAKE2B aca03b10a2766c33b2d338fd5ed2f8d2190ae23546db6b7ba6610b1a0cbcda36010fde1e20359cf784924f28cb40753f56c0b02bf56ab14a1263543d47a67a0a SHA512 7129f42ae1e6c80bde763ae0c44ee7913358243b49b2337d42d4aa580ff4135229c5146105a548bbff0e3234ae9990f09827218a7109d932396da2e5a82f5763
-EBUILD kconfigwidgets-5.46.0.ebuild 786 BLAKE2B 820a73685bbb1909a17cd1e60a2883a01a6d7293b4fc95f66da01aa85d62785825195cfc42334da16d10219811e19f6adc670b9e2d8f3f005e2eda2346ed9dd1 SHA512 1da7b074936d3acba4894e6bfc6b96596979267e2c1c5170150f5ba6624502fdd3d2796c82132fed8b030924f9ffc9d46ab66d086fbaa3311d40ee2c70efb106
-EBUILD kconfigwidgets-5.50.0.ebuild 788 BLAKE2B d57e6bf1c8677c3ae022a7fdb965e8653c844cae7770b18667474b3569ec0d05b47eefa7936b4f188bd8c7d42b0564cbb2ae744aa94bb81342c31b6a4a074a4c SHA512 1be37951043db369624882c37ce67bc89f0f6d85dc6381bad17538d762c234d96775093af834cb53b8ae5926c0a354acd1627e10f8f7c71eb716899d568507a4
+DIST kconfigwidgets-5.51.0.tar.xz 375216 BLAKE2B c37fa726238c07c67a96da05e522380eb69cbf80a688429fc802a6774ec4d619af6fb9f5f0c984fbfa352d550c5d0568c564b3b0e02f389c503855cd79852a6a SHA512 7b7f78116d590959dee0917064436cac10eb84ed21650196be416cb84a8d095231ff93cc70fd69ee5cbf327807af84c453956fcc9b1f8f4ccaaf3581b32ae9b6
+EBUILD kconfigwidgets-5.50.0.ebuild 783 BLAKE2B 1f26c1a45fb9af0a2770ccfdd96ec7499f6db4fd4655c33310b7ae30a6f4740baee967294fa71912840b76aaac39da995d15444e789dabb18b2e2a1300a1911e SHA512 3438d3ec12cb64ce6ac77fa17c91944371e11b1cfb7bbc3f08d21ab8ff5e30360c90244b13d0208d2d0f2c9ce5ac53a37d47f74dbf6f64844aadf59ceb6e190b
+EBUILD kconfigwidgets-5.51.0.ebuild 785 BLAKE2B e7cf6775c171dea56236614120d0ef6c3e0065f2a43b330373c6ccfaae3aef682172f7d8bfb762fe301714eb86ba275c33114d50a480f10eff11ce84e78a2a2d SHA512 427f657baed6230ad3378459017b346fb6d7efccacc591c7745dd8be440501ba96dfe9455ddadfd9abff6861a620ee03fddd1db871f9cad52d81a1232a27a94f
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.46.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.46.0.ebuild
deleted file mode 100644
index 651438de3ff8..000000000000
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing an assortment of configuration-related widgets"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+man"
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.50.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.50.0.ebuild
index 1c61d3a252eb..5c2a988d15e7 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.50.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing an assortment of configuration-related widgets"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+man"
 
 RDEPEND="
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.51.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.51.0.ebuild
new file mode 100644
index 000000000000..403cfd35cc4e
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.51.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index a498019fa0ac..9900295a2069 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,6 +1,5 @@
-AUX kcoreaddons-5.46.0-kformattest.patch 3537 BLAKE2B 8f662df8a950c6cd102dc18c67c18628ac1318d1a76a076af08e0e7d6dc7aa92b502196d209b0e544c67ab83bd6cfa6b86098f305b9bbd8f10cd7f6cfdab9d6b SHA512 8cd914a542f5ba35857f8378b28413649fe27761d4a000589972b8ec25d1effda8e4f7d9e07c04f9e168af1d892051b263b8b61da42cb6b7be6a7643c2c31729
-DIST kcoreaddons-5.46.0.tar.xz 350224 BLAKE2B dee0f20b3f35a1f787f263e080a0e4641222b4a9e7f3a8eca736b97a4688ecfa30f26c3040cb655bdb47852381a6810dec712f8a426181bb24b680270a41e6bb SHA512 3c12462729a163fc7ab5a49ea9473b94d44ad4276243d65bcbe10a28fe6c1c4a9996bdf09c4f03b0083b4dff97e1719eb1aaf8b7d8dc882d4f66de61e7ef416a
 DIST kcoreaddons-5.50.0.tar.xz 352664 BLAKE2B 656cbdc21fc97596ab51f23050f3c4eebdb8c73df37fb1799521da19d16ba97c8bd5c31749dc3c881d8064a011028b94ec29dadcb5a367f65523d85294172c5d SHA512 3b8f50b2775425363b83048ab78bb7999dcdfa522a4d8d002292cbaf6975747b5159687c2ce4737b17404b999ec2d6894a3acd23873480ae7376e9134f1ea887
-EBUILD kcoreaddons-5.46.0.ebuild 871 BLAKE2B 65e7ef39d3d460059564b8757c03c5e43e200cf696783302435954938b7c4ec0b168d29444defa00b6828bed0dfd87fed463a1c3088e3db834d14db43554ca45 SHA512 0b49e20f67f15a317fefb60c71fc9934cea5e765ba156f4e2a00ec6a981b4a4d1c9f097f9b42bc2b617a6ec114fe99b334697f9514d888cb9654c3c20fffef6d
-EBUILD kcoreaddons-5.50.0.ebuild 731 BLAKE2B 055f5add0ea3bfd79aa2955aabeb9ea891a82715cf9611884ae07e13ec4ca4f5d8d94e141e91423add3a4d35db2025da22d57b16300b7ca996c20927f28071a3 SHA512 a0559e6e94b565853bba672dbacbdf961fe43f938ad3add4d0dac9b95a6bb5759a2c66bd5e71fb41aa0476bcedfeb6479063e123407d872b6d58b76301776eec
+DIST kcoreaddons-5.51.0.tar.xz 352668 BLAKE2B 03c126ca7a0ca9d7666efe6b9932373beb1cee533c3dc5a0e4b9c58fecd4bd2cb180cd294ad83fb1e730f005bb59984cf57006dfa51795a20b849f07f5d6829d SHA512 3b97ae7d161b8bd2d5d26491a5c0f07664ad238580fff802ad3a283803adf0725b67d5a9a473ed05ef02e5b0a454ac8d089abfe93ad3e8e24bc26ed0028e2f86
+EBUILD kcoreaddons-5.50.0.ebuild 746 BLAKE2B 486f998bf3a1e423bddffe4dd15f232ba1ca41edc3e997bf7bce1fd9128c1b92d18b6d10808cb6fbb6e61def2fe64b453653596e1d2f57c57cd4f77e9d528cc8 SHA512 2f3cd8868518178eb605697e56654d77849aaa5b935ae7ea4c40eb1b435d282080c99d3f357cd55fefc5f775e6003cf51bbc47935a6d001984405f196adfe90e
+EBUILD kcoreaddons-5.51.0.ebuild 748 BLAKE2B 0d4607796a2ac6177cce05f439bb8bbe7425f6adc52383e6d1f4572034f8463662ec2289db7f1220be054cf0079da2999eb9e3360df2a5816ae3f0809a252585 SHA512 ed023f1ec7d019bc3ec03820bc8d9966d41c86ba738f4e5652c45c426124abc13a2459d94c84677305ea29ff44bf45382de600b9e821cd78f9cadf661bc6c17e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch
deleted file mode 100644
index 64031659fdda..000000000000
--- a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Maximiliano Curia <maxy@gnuservers.com.ar>
-Date: Tue, 15 May 2018 13:06:53 +0200
-Subject: fix kformattest plural forms
-
----
- autotests/kformattest.cpp | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/autotests/kformattest.cpp b/autotests/kformattest.cpp
-index 15080be..6cc3c52 100644
---- a/autotests/kformattest.cpp
-+++ b/autotests/kformattest.cpp
-@@ -248,8 +248,8 @@ void KFormatTest::formatDecimalDuration()
- {
-     KFormat format(QLocale::c());
- 
--    QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)"));
--    QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)"));
-+    QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 milliseconds"));
-+    QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 milliseconds"));
-     QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds"));
-     QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds"));
-     QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes"));
-@@ -264,22 +264,22 @@ void KFormatTest::formatSpelloutDuration()
- {
-     KFormat format(QLocale::c());
- 
--    QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)"));
--    QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 second(s)"));
--    QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute(s)"));
--    QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minute(s)"));
--    QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour(s)"));
--    QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hour(s)"));
--    QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute(s) and 15 second(s)"));
-+    QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second"));
-+    QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 seconds"));
-+    QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute"));
-+    QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minutes"));
-+    QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour"));
-+    QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hours"));
-+    QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute and 15 seconds"));
-     // Problematic case #1 (there is a reference to this case on kformat.cpp)
--    QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minute(s)"));
-+    QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minutes"));
-     // This case is strictly 2 hours, 15 minutes and 59 seconds. However, since the range is
-     // pretty high between hours and seconds, formatSpelloutDuration always omits seconds when there
-     // are hours in scene.
--    QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hour(s) and 15 minute(s)"));
-+    QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hours and 15 minutes"));
-     // This case is strictly 1 hour and 10 seconds. For the same reason, formatSpelloutDuration
-     // detects that 10 seconds is just garbage compared to 1 hour, and omits it on the result.
--    QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour(s)"));
-+    QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour"));
- }
- 
- void KFormatTest::formatRelativeDate()
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild
deleted file mode 100644
index 79d94804dd54..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.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
-
-inherit kde5
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="fam nls"
-
-RDEPEND="
-	$(add_qt_dep qtcore 'icu')
-	fam? ( virtual/fam )
-"
-DEPEND="${RDEPEND}
-	x11-misc/shared-mime-info
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_prepare() {
-	# bug 650280
-	has_version '<dev-qt/qtcore-5.10.0:5' && \
-		eapply "${FILESDIR}/${P}-kformattest.patch"
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-D_KDE4_DEFAULT_HOME_POSTFIX=4
-		$(cmake-utils_use_find_package fam FAM)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# bugs: 619656, 632398, 647414
-	local myctestargs=(
-		-j1
-		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild
index 4e70e58a430e..dde9a03ac18f 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="fam nls"
 
 RDEPEND="
@@ -29,10 +29,10 @@ src_configure() {
 }
 
 src_test() {
-	# bugs: 619656, 632398, 647414
+	# bugs: 619656, 632398, 647414, 665682
 	local myctestargs=(
 		-j1
-		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest)"
+		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kformattest)"
 	)
 
 	kde5_src_test
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.51.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.51.0.ebuild
new file mode 100644
index 000000000000..6241035aa32c
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.51.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="fam nls"
+
+RDEPEND="
+	$(add_qt_dep qtcore 'icu')
+	fam? ( virtual/fam )
+"
+DEPEND="${RDEPEND}
+	x11-misc/shared-mime-info
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-D_KDE4_DEFAULT_HOME_POSTFIX=4
+		$(cmake-utils_use_find_package fam FAM)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# bugs: 619656, 632398, 647414, 665682
+	local myctestargs=(
+		-j1
+		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kformattest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 8b229c040782..0458eb8b0558 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
-DIST kcrash-5.46.0.tar.xz 21876 BLAKE2B 31c0a4ebf744ce59f866527c967dfe1784e8b95785f805b1d782eea8bbedc72ffcd13ac6eec135abaa1c5b163dc19833f554917d5f35681ee055ad9e268b1cf6 SHA512 b286e3d396d31c52deffd250d064795166a9ad6b19de63bca3eba1c37d8919bc0e31e2238c30f901403cac19dc956fb6515c8ee5a1a73287a14b79d674048b39
 DIST kcrash-5.50.0.tar.xz 21928 BLAKE2B ceabde1007cb4d5d92dc207ca32d057341cf7f62af3afa240e8fb64b3dccc88c1c968d61f07786a190b1b3449a7a794baaf7735e9223bada74209827885dc31c SHA512 79cec88f7e37901e9758dcc8f69883369dba8db536a563cfa66245038ca46240a5c0c70c4fb4b48c0c1e4b7772ec90d341707add99124b02408fc567a7e64648
-EBUILD kcrash-5.46.0.ebuild 611 BLAKE2B 34afc2ecfd7f8474b32d1c89982471b068e94b083984ac20f21b76abfe3871f8c6ca8fdaf5cf09e039a5088d1985cee075f6064d344d2c8ee4c3261f278248a7 SHA512 d02ad50cb87063c828d86670069df5549f30ab3787cfc980b70343a183eb91862b2881ab8e128e6b4001f8a66f8d97528d86dbb5585966840b28f51520ea716f
-EBUILD kcrash-5.50.0.ebuild 613 BLAKE2B ae233be09d4459a1823a9f43e0e4329a3a7d4ca75669f03e21f261b0b44ea2ef043863d4ae39e4e9187cc194af209fabcc81f87f87d5a8224fda87f2cc60984c SHA512 35b7da8cf5da3ccb40d68e075ce4d302a27ea3851729c59a744ed231c0a2483088224d684281ea05ce2640254f6934ee17610fd642a1152ac83f578363c7ddaa
+DIST kcrash-5.51.0.tar.xz 22004 BLAKE2B bb9fc680e3dde518f5f3f43d69a22b475f0689e7b85de6a3d526c30caa3cf4d745a0cd84f4017c1f5665b88407d3e7ec9eaa2e478b0bb81d324ac5b3ca2b9fd1 SHA512 7945fca845f019f847fbef85de4934556da2183be5a2e48ae3dc0b71f1a0e5aa4e21a65ca9fcdbd7aab02aa36cb125b14768d34b7f3fd49f2666d3d8377d9356
+EBUILD kcrash-5.50.0.ebuild 608 BLAKE2B 3e616f147886720a6119d6c5dd199c0374b0ec4dc7735faf879bfea6bbdb1cbd39a374eef72aaedfaecf9c49b41b3e6b0cc3f3f3c9bf262cf7b2f0304d5411e8 SHA512 1b909d4a3d288026730a0cf4a6f4feb72a4f660cb378b78ac9990964e74eddf3de987a586c7a797eafc7045fcc6975a8804fb175a66c804582c07d87a0204d86
+EBUILD kcrash-5.51.0.ebuild 610 BLAKE2B 216ae8151e3d17b8979d5adee2dc91027a9b1310ea5f7f4c590388c7a4becfdbf8749ffbd1d6f1fd131c821353738660906f8831ba00c645696fd6833467fcdf SHA512 29fba5565f6b6fc8bad226866161256fa131499e5ca6c3cb92a866151e0ddedc901e33f703301441e9e933ccc176804deb40c18350a89bfa8e93791730638895
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcrash/kcrash-5.46.0.ebuild b/kde-frameworks/kcrash/kcrash-5.46.0.ebuild
deleted file mode 100644
index 8401e512743e..000000000000
--- a/kde-frameworks/kcrash/kcrash-5.46.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for intercepting and handling application crashes"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtwidgets) )
-"
diff --git a/kde-frameworks/kcrash/kcrash-5.50.0.ebuild b/kde-frameworks/kcrash/kcrash-5.50.0.ebuild
index 627296fb3f0e..cb6aafdfd442 100644
--- a/kde-frameworks/kcrash/kcrash-5.50.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for intercepting and handling application crashes"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 # requires running kde environment
diff --git a/kde-frameworks/kcrash/kcrash-5.51.0.ebuild b/kde-frameworks/kcrash/kcrash-5.51.0.ebuild
new file mode 100644
index 000000000000..6d3303c4ec4e
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.51.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtwidgets) )
+"
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 587aea63f49b..062e7d9d2c98 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,5 @@
-DIST kdbusaddons-5.46.0.tar.xz 37024 BLAKE2B 97b9a36f4fee6a0ef777dcf4f6715488167e6cfafee3b008cc5860fdd37db3f77bfa9d12fb9be30afdb1d0a25a97e3800b2f9090a3881bf77a210441177108aa SHA512 5362e2f58a7b210f2c3b95311b38aa8b7ce59a1415e7775bdd73f35a7e38389d08df5bac881d523c129c2b039df4d46fcd8b17693bed502034a57662c2a1e3f9
 DIST kdbusaddons-5.50.0.tar.xz 37212 BLAKE2B 04d0d2348268193169f778e584448c39337ba3014eb147b85cbd5dda26463163a5ef834be78f07e929aed75f6a16e3925375c73cdd4c12529e9d0aa6d9bdc03a SHA512 26176685e8aebcdb1c249de9e95d88ba1faf9e0e2ffe67338237df2cfdf8b1a1fabc79c6febabc4a80a774a2e838085e273640d66fbacdbbaf49e00bcbd6d9dd
-EBUILD kdbusaddons-5.46.0.ebuild 554 BLAKE2B 98d5395dcf7393023c2efa39889c1c48ae2d10798fd22110ff99e620b759725fab3d5cd19344ee75419a52ec7005d307e5bc6091441d35fcf6568097c228b73d SHA512 e84306ef38e6f40dfe0001c8a7f0e37f8984e4852857fe6fadaf3bc1a861ebb64067ba8e211c2172451cb59237618ceee919f5f1c6ac6196dfa8c6dcf6409c2f
-EBUILD kdbusaddons-5.50.0.ebuild 556 BLAKE2B db32605b1f65dd47933ec1d56992b083a747e0266a8b141cebea4d329a9810fef15049b1b92c821506143086c1a7bcd6cd5fe54153ff2f311f8c75b926f518f5 SHA512 3f0dc6246596332bf35ce927473d218ba0b633bcb4d593dcf3bc170631000a59c639f5566e3742a58d6195a95ac27707ff82e981f5de1173e0c9b518f43e60dc
+DIST kdbusaddons-5.51.0.tar.xz 37216 BLAKE2B f38cbff6e5f1ec324d3c8c39b1b74b2d80e24b61ccbf82492a5552a3695b61e341a2ba321fda2701e8d098bc72f79bcef64552433960e6b63dc361f330c1e6aa SHA512 19ad0a9750d01db65dfbc2640136ba4984411684af987fd01e010ca58c1ce999c3fc0c615809c5976ca160d8130114cd4a9a2b76cdae536b3205f07c735bae65
+EBUILD kdbusaddons-5.50.0.ebuild 551 BLAKE2B 7350c2d5ec449d02a5f0078d8b043041d924a259cad400daa8daaa6b2484afab9e8ecf78ae367dd7ad21a4260c788d947bef11dcb6956118862d46991105b7df SHA512 54b9ec8ac265be0246a6062a54b0d7a1afe48984424554484c6fdba4e69922deda761b1dd8783e294c1599905ce270c6a00a247d4d1382d392221a863d4cca6a
+EBUILD kdbusaddons-5.51.0.ebuild 553 BLAKE2B 39bbd7ac48314cfca6de13202c4442e22e808a4b755f5ad5b1cbb23eb0169327e606d145755802f2d4126cfe9b2c0df0aae1eaa08c83bccf0758210cac50bb09 SHA512 6f04cca210aeddabb0e58f599a082b4e09adee7fa6c82ee03d1e02ed3a435dcb893943beb2c2e7a6a3e92ed44f5b036f5a971396d8d17b9a633cc3c6f14945db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.46.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.46.0.ebuild
deleted file mode 100644
index 6f9e60af249e..000000000000
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.46.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
-
-VIRTUALDBUS_TEST="true"
-inherit kde5
-
-DESCRIPTION="Framework for registering services and applications per freedesktop standards"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls X"
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.50.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.50.0.ebuild
index 0bc5ed5c0fef..987202bdbad4 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.50.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for registering services and applications per freedesktop standards"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls X"
 
 RDEPEND="
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.51.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.51.0.ebuild
new file mode 100644
index 000000000000..cd4732857d2c
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.51.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index efbbb286a620..0bcbf7a6687f 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,5 @@
-DIST kdeclarative-5.46.0.tar.xz 171896 BLAKE2B 048e4a21997d277e4bc8066082665f315f7d58fc4e05e90e63d635f79ad04881ec766ed6637c8cd1502611ac638e7a0df6ed8fd20872769e4fa75d00defc5fb1 SHA512 43db00d3ddb61be339a341e727f8e83001ffec7e9230f1a7ea9c4e80ae97e4b00621d7eb17efb703dae831fe61683995341881b9230b5850d4adc6e184b89e3c
 DIST kdeclarative-5.50.0.tar.xz 171984 BLAKE2B f702517149b6b2288fa9789a789df7225b7afe42dd0e3f631b9108aab3317fd4379f1315a142ea0e8a71008a4f0e03f7cb0ceaecacce3e683816e620e8f63caf SHA512 ebe13f08a292cd3c1cf92cd242433160f1a2e9a5ea329379dab1d3b26d7c2a026261d77b8dc7b4abd1980a1a3d769b021bee6c2730ad2d4910b758c5b0e135dc
-EBUILD kdeclarative-5.46.0.ebuild 839 BLAKE2B ce6cd076b8ef50ddf3387fd795aa1635fdae9d6280472ff0a5646d1cb3e9efa3ccba64824597b600390b21bfaab342b6fe83f9b0e8752756766c59197820dc5d SHA512 b5811fa0dc19a37a1888040ae72f87058ad5488d87c992b761f9058fdba1fc7c40f7f57848aea60b4a3b7f75321b579781dde377c6d543ba6994e3b144823554
-EBUILD kdeclarative-5.50.0.ebuild 841 BLAKE2B 55061db482006061e0d1d9b8928b03ddf76a7ef2bdf8d6abe82bf31c205e0aad8021c42e2f27ca3a2d1ae6596b86134ae164d10cb7f9734a268c318635e1353e SHA512 3773037f00fd29dd851eedfec0a12b63ccc74c1588cfbc984532684cd55e09c2897e0fca44308b6b5535ee6f704042af555be36b2d15f0819ddbea15e5e50833
+DIST kdeclarative-5.51.0.tar.xz 172012 BLAKE2B 87288031e1b2f69cad1cb4cde7078fa65ed976c53703fc017cf706dba544d54d98fb95b06083782c65f30bc30cbe7e32aaa52ea477c5bb67af69f67dbb62b7c9 SHA512 860441e12d93807e112b8ced239a5890f5ae2dcf6bfcb6b3a3a5ebe7970529d23c932dbc1b8b965f2a3226d915e36c00043c7e040bcdded150d122286bb8e8b1
+EBUILD kdeclarative-5.50.0.ebuild 836 BLAKE2B 76af5733cbed46144b9b1ee65d0c10768a789b755b42cb10acbdbd4813488565697fa2f8437b1542ac1f4939755f72556bb67687df3e8ab4cf03cece37a2eb2c SHA512 1abbc96a42cc1ffb896cfe3e1d0496dca167d439f80f140fe4fbf2f2ce501ba7f0b5d8417abf3a69ed95f5b890bccc3f8268ed87c0a05ddf74f6835a1e3df890
+EBUILD kdeclarative-5.51.0.ebuild 838 BLAKE2B db82cbb0278bf4e755525dd1c57b003f893cb6013bd5d83dd9980ada69c1b5eb4881c6eb4493778f44803c42b13627a24333537b01c3af55e7d50a6c41f54eb9 SHA512 e02d4d2d09ff5f37fc70aa68543ab466d67851e9ef85d3ef3ae1a3b0b18fa7250189e5fa28882c11121d1c4dbea832d1b9531c64d4bfb0d304cc584cebe030ce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.46.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.46.0.ebuild
deleted file mode 100644
index e5a5f30f2d19..000000000000
--- a/kde-frameworks/kdeclarative/kdeclarative-5.46.0.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_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing integration of QML and KDE work spaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.10.0
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdeclarative '' '' '5=')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.50.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.50.0.ebuild
index cb2fdf0f73be..8fccf57f65fa 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.50.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing integration of QML and KDE work spaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 # drop qtdeclarative subslot operator when QT_MINIMAL >= 5.10.0
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.51.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.51.0.ebuild
new file mode 100644
index 000000000000..99edb7f3c320
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.51.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.10.0
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdeclarative '' '' '5=')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 716e849029b9..007c1bdc816d 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,5 +1,5 @@
-DIST kded-5.46.0.tar.xz 37876 BLAKE2B e87e950e6960f6e369ab68db4096d99888d59c83c7842f6e76bf2e2eca3e3969b6ff3be06fa7fd410fb82e4a0f49e35c1416d8004882bf776e9ef6f107fcab49 SHA512 02c584ef4a0b6a295deafa6d6b92b5d9cf90be6bfbfbbb063c735a59b19fcdbf87b7c10735134426720d8fb5f06dde11a549469c313263037cc7babb128f62b8
 DIST kded-5.50.0.tar.xz 37868 BLAKE2B edc3ae31ac2005043b0bead17d52ffa42a5b1a3ce4b4dcd8348da4dd32956cd0db3ed645125d1ae4b7a00a4f9c71f9987ecedd9a084a9278d6ef28bd5876f6c7 SHA512 f5751df6c7b142038e67ca0cd1d59d5afa0b48268e09cd4e691750603258484ae264821cbc400cd4db348083377325d2213ac515aaa6c1aca7bf8a5843a5fc50
-EBUILD kded-5.46.0.ebuild 728 BLAKE2B 6553cf72f119f07eeb34c378f64cb3f7fe2de963c7a4dd49d9956125b83929f4070f57a8ea1aebdb0815b88de49d68a8d81dec3b6960d0e14c9a4762bd3801dd SHA512 7a1a8402e91f301426ce68aebaf990061775eccded170b8b7c2d3f9f75fec87074deef966b71df98ba935baa34adcb5d0788b03591697d9962d8c0603234e397
-EBUILD kded-5.50.0.ebuild 730 BLAKE2B d59c107719ae86761236ff045fda245eed71eaa0593b28e27318f022bc1e2187248d6962a1180977be3bff1a8f7682015fc927070d950818c0f0d5424f2ff8d7 SHA512 a046039d2414126ff57beca58b0bd45f5e2da9c81641aab9b04137114f144c4c337d2a6c0b276ffc6cf20c3a0a125e85ee8ad831905cc5de78f1d8b4f5e84ff8
+DIST kded-5.51.0.tar.xz 37952 BLAKE2B 34bdcb039accb132ebe280f41eb2bf68300d6b183a72b66372755dccbed417420fcc9f511e2d11edc7ad118dc27a6f0e33530276acbd8b0e1bc3bf31f9ed4282 SHA512 1b29459459567354d7e0ac873313e5dfe5627642bb1d41e31795b0ef1ff1fd7bec9b196af7607d6d7c4737321ab12e347b93f61f8a8be4c4ded7456873cac615
+EBUILD kded-5.50.0.ebuild 725 BLAKE2B fd8a803b23113960be281143673c02a01b095a6cebc9ce5c0f82dc47c42fa32d0ca98072a0fc294ab234b71698b1fff2a9864306d1415ef19c966f60db990d07 SHA512 f4dcf27a37f8821a8e03cfb67f3d0c07373dbd7132d43e29c27cae0312d6830cfd7a67fedbdf8c16d8a35710a7fda991dd1d22890f63a78651be7d1490f08ed3
+EBUILD kded-5.51.0.ebuild 727 BLAKE2B 025c75a5d113abc6819480a2bf0606100a2720d971ed14071a1765c186cc1c2aeb085a209800295ec5bef60a4a53ccc56f4fbb375e9143528c70aff1d18efa23 SHA512 6a4aa131d5cde84e76509a66d1cee387afc8d622dba5197367dd695f7659e5500e24ebb312c82025ac3bdb2e0c57fc7b48c5f0e8c4c47b812f15f7c4e6f3b2e1
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kded/kded-5.46.0.ebuild b/kde-frameworks/kded/kded-5.46.0.ebuild
deleted file mode 100644
index e848eb53a358..000000000000
--- a/kde-frameworks/kded/kded-5.46.0.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_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Central daemon of KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+man"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kded/kded-5.50.0.ebuild b/kde-frameworks/kded/kded-5.50.0.ebuild
index 56820aeda550..191b3cd13faf 100644
--- a/kde-frameworks/kded/kded-5.50.0.ebuild
+++ b/kde-frameworks/kded/kded-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Central daemon of KDE workspaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+man"
 
 RDEPEND="
diff --git a/kde-frameworks/kded/kded-5.51.0.ebuild b/kde-frameworks/kded/kded-5.51.0.ebuild
new file mode 100644
index 000000000000..c0efe6e77cf9
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.51.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index a20cadacde49..5b3186d2fb79 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,5 +1,5 @@
-DIST kdelibs4support-5.46.0.tar.xz 3354016 BLAKE2B d5f7b13321c3387e78bcb3ee8d81fc2201e3222eb36dfef8b3d77dba66739867cc56a068687a93df7a1a69be89bd16df2668f3072029d6c9fdc8bdaecdced96c SHA512 b07f89be77ec878d0e52af5d256339631cd1f125af6c8454a50064c50609346c8fe78ec2cd90047d8d5c4cbbdf2d331c38415e444eb91b6279e65d6a89c9d3d2
 DIST kdelibs4support-5.50.0.tar.xz 3354788 BLAKE2B 5a222cd879c70cc9435cc9c158d707620fffd687c585979943f3dd79c51e24cc610013f651a4776bf6214638d33cc64cc5e154373db55d4edce861f27d182dc7 SHA512 1fa3a9bcd2b0af1cd4ec66d6538bfd25bb33a2a5ba6c74bbc4b6709ee71b681d5fea9672245c8a060dcfa493fcaf590af49c6c34a4ec535499a3db9d7007166a
-EBUILD kdelibs4support-5.46.0.ebuild 2075 BLAKE2B 306300f759a9fb175e4bef5b5073e77247047f0a7a24cdd91176f2d778871a856087ba47a66c062b8d8e31d319424e59e0375ce9cd2a290a78ac28e019c9e255 SHA512 5783ffb00093ffc0f59c3ebaf127ff628023ba282f53cd4d1f8f3932f8218fbea1e6aba74116d898fa53f32f378b6bf71a42c403e7b779482be1bdf89d53e603
-EBUILD kdelibs4support-5.50.0.ebuild 2077 BLAKE2B 84e93d1a81fca7baafae57a6c1700673cb54dfbdfc072f42aedc0979b00e56c6d7af76de6209b0ede579c719a145587269c66ad84ecc31bb7012375a4a14d27e SHA512 398d9b9dad066539f67d23960bc3aaa41860fe18e5784719032b6211104bb97cbd01841506d1fd5a3fc1aa6dda5c2a1e843ef1abd230fa0b664d87fdd2a2473e
+DIST kdelibs4support-5.51.0.tar.xz 3354512 BLAKE2B 53ff94b42833fae5e45ffd8f588811db437766b2d426bca294026ef68d8a8cd686bc6b438c098f1af9e7271f3292e247ed87a6f65ddb8150816ae86a62075df0 SHA512 92fdbaa65eddac1b1b2cf27f1f5cd82b8eef1bab3f43cf2ee89ce8d88f9a6a1f3bcfea82a9c1179bae345e64533fb8c94ac7074a67645fc482b5af5ffaf74769
+EBUILD kdelibs4support-5.50.0.ebuild 2072 BLAKE2B 6854251f2a77fcc456022d7c44f1abf82529d397ba9e9979a8ccf9098842df26e8bfd3e597d29652d04a279e5a13539246f8662b154d1cf12e10e64c6e8b081f SHA512 ad4a6360bef45f25f2d0c4001bfb92e7e0f52b8929aee80c7849e136d381af55c91e3e021a0bd02bff3f402ec4d444a11bb67a8f7122b038a51bb5233b1e8f16
+EBUILD kdelibs4support-5.51.0.ebuild 2074 BLAKE2B e2c76151fc594b802593041219476943076d5e322749e488f669d79ea930d3579a73a6f9e7ea9343e92a911f50de8f4d2aea1e2e4a00bdbf543892ea2c1a048d SHA512 c132615315ea1fb0b49af97eda838fbc77c6bdf7b3732dfc044f878710c38c4075eeabb73807249ea73503e1f391e1575b28e40f4e471dd6a033835c3c702805
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.46.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.46.0.ebuild
deleted file mode 100644
index a632a13cf329..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.46.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="libressl X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesignerplugin)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	app-text/docbook-xml-dtd:4.2
-	virtual/libintl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_qt_dep designer)
-	dev-lang/perl
-	dev-perl/URI
-	test? ( $(add_qt_dep qtconcurrent) )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kitemmodels)
-	$(add_qt_dep qtxml)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.50.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.50.0.ebuild
index 9ea67ebedcbb..e417c39b8310 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.50.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="libressl X"
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.51.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.51.0.ebuild
new file mode 100644
index 000000000000..617cf7b57276
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.51.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdesignerplugin)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	app-text/docbook-xml-dtd:4.2
+	virtual/libintl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_qt_dep designer)
+	dev-lang/perl
+	dev-perl/URI
+	test? ( $(add_qt_dep qtconcurrent) )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kitemmodels)
+	$(add_qt_dep qtxml)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index c5abc05beadd..042aca24b59a 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,5 +1,5 @@
-DIST kdesignerplugin-5.46.0.tar.xz 90716 BLAKE2B 6956ddecc72cb13d71ca5a1c1fdf80f657d372ac55b0c4d01ee3a602af004151393d6785482a00d11220b48db4bc19aa16602903f433ee5eade754d11bff09d7 SHA512 58fb75f68c60604f8ccf6a69d899d7c8b48d5c01969149170e0627c8393d4db2377de8d0d0bbf35fd234e11ac86e4b649d917c2635848c071592326935a1ef36
 DIST kdesignerplugin-5.50.0.tar.xz 90876 BLAKE2B a88b5b64e171ddc67904f72ec8550c9fcbc28319f65f5a8c54b4ccd1e5c9508bed26887a3575b734f2292fafc637868b06c858a9b8078856be61d5401b537936 SHA512 6e4b58096559a0568da9618a6644440f1cca7f569118ecadaf5b5fdb07d5a28c6845e075c4745e61812365ccf96ec7e1cea0edfa70afaacf2df4b0ef4ee92b08
-EBUILD kdesignerplugin-5.46.0.ebuild 1431 BLAKE2B 460bd7f09968ccfbcdd2b79b7379812f65f627b59de1932287a8a2aa717833ff25344fddd7d09524bdc42d8543d8a4f52e8a6bfb8e1414c7135af53efffeb873 SHA512 21224e471802412d57a8b3034b04f724d919aecfa99f910700cc7c9e8960aa4b885629ade1c11662492876643816da1f85c892ca14cada27bce68d3ca4d73705
-EBUILD kdesignerplugin-5.50.0.ebuild 1433 BLAKE2B 82037eeede19140a8281b2e3c57cd40cd56ebc32813dfc65772cf388339ca0aff4865ed7deb944165069549889ef5a6428d7800d75aeb0e7b3011a83ed43c16c SHA512 7df8f368a94f1298d213435be879d71e41e4fc5e9b8c74e6cc3626684c42f1023833d92007405b598a999f8e96eea4c51db0a2ee229359d4a7e2df199e586b2b
+DIST kdesignerplugin-5.51.0.tar.xz 90912 BLAKE2B f9de0644bf2a574829876bf7d36cb2682d311a4658d9b4ee09908b44e30af90c5dd6619841aaf70ef1224b60dc7d5bdbe5598a58388f342da897321e217e2551 SHA512 636dfde49067dc2c4d55125a1c6afea4291536daba2d6014ff933d5fb414c39521390a04d59b27ec9ab996da59efd1fdea9a1b23106545c1f116d4eda8c6bf5d
+EBUILD kdesignerplugin-5.50.0.ebuild 1428 BLAKE2B 9a7afe9869153920bf9d586b9d3c20671f07164b338db44d43a1881b879151016dfef394741d464a6ec03efb8e2b6ec14d547ca9ab1ab9c60f4c70c3c4b441ec SHA512 c60c2a564d4941ac82df7e13096bfa8e1567441b606d2ee1a222d06bdf9f1287ea6a6f232d35618b2f93d00a78b42f94d2b2b39c20b9c6a3d0cb919c6593a3cb
+EBUILD kdesignerplugin-5.51.0.ebuild 1430 BLAKE2B 09474668e9fcc5f7220ffd7bc19a83ed032e11d786839034fce73db4dd2b70bb86355fc17eb4d89d2d50d3be64fc1320dbadb5f4fd64053f92c5ddddab6e0421 SHA512 acbc760bd736a34f2d2ba7c3270c3b46c190dc4afd6bc1f8e0700447e026f4485f881a4658f55305522aca74b71a94afae2ad99ef8cd0e620dff1bfa1370749d
 MISC metadata.xml 402 BLAKE2B c6bd347d2ec708beeff1a5e62dd8b6915a884afb3810841adf5bda651d5fa2caca0f3375e63d01e4af4b87fc955b6df0483d569746ece2d8b79948fd3b009b1f SHA512 c53b159358adf3556c50482484c631542f17a968d9b9481b6efb6552ab1244753f86fb3b992bc47119a1f6df3c4dab0f003887ea9c45207cbb1d19878dace05b
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.46.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.46.0.ebuild
deleted file mode 100644
index fdf2d213f9c1..000000000000
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.46.0.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
-
-KDE_HANDBOOK="optional"
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="designer nls webkit"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	designer? (
-		$(add_qt_dep designer)
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kiconthemes)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep kplotting)
-		$(add_frameworks_dep ktextwidgets)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-		$(add_frameworks_dep sonnet)
-	)
-	webkit? (
-		$(add_qt_dep designer)
-		$(add_qt_dep qtgui)
-		$(add_frameworks_dep kdewebkit)
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer KF5IconThemes)
-		$(cmake-utils_use_find_package designer KF5ItemViews)
-		$(cmake-utils_use_find_package designer KF5KIO)
-		$(cmake-utils_use_find_package designer KF5Plotting)
-		$(cmake-utils_use_find_package designer KF5TextWidgets)
-		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
-		$(cmake-utils_use_find_package webkit KF5WebKit)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.50.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.50.0.ebuild
index 6690b0297aba..bbee9bac86dd 100644
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.50.0.ebuild
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="designer nls webkit"
 
 RDEPEND="
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.51.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.51.0.ebuild
new file mode 100644
index 000000000000..0b7f70d00576
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.51.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="designer nls webkit"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	designer? (
+		$(add_qt_dep designer)
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kiconthemes)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kplotting)
+		$(add_frameworks_dep ktextwidgets)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kxmlgui)
+		$(add_frameworks_dep sonnet)
+	)
+	webkit? (
+		$(add_qt_dep designer)
+		$(add_qt_dep qtgui)
+		$(add_frameworks_dep kdewebkit)
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer KF5IconThemes)
+		$(cmake-utils_use_find_package designer KF5ItemViews)
+		$(cmake-utils_use_find_package designer KF5KIO)
+		$(cmake-utils_use_find_package designer KF5Plotting)
+		$(cmake-utils_use_find_package designer KF5TextWidgets)
+		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
+		$(cmake-utils_use_find_package webkit KF5WebKit)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 452daef58c4b..006e14269172 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,5 @@
-DIST kdesu-5.46.0.tar.xz 44800 BLAKE2B af855bd8479979d03463f314a377cc5c4451ed66254419a1fe490ce583be982d83bb0570c904215c5727d7244d239de26d115c1d638edc688a02510bb8776720 SHA512 cf6c1dd50179e1285f2e37663e1e7c365bd171075dc3e249ba74d4109f669de19266af981be317ecdcff5ad4b28548d5f00e524f85960ad2f02e2bee302028b4
 DIST kdesu-5.50.0.tar.xz 44888 BLAKE2B 82b166b62314e5d118b2cac8b0b593d7788b7937eb258efd42cc7a14388f5a9760d77023390ed8ae98997d839d9c9d60651b18e9b5d793322cb7dd44f5677deb SHA512 b8104fc48e36db124f735aad13edde0c6cedde33ad20ec0eaff68e5ea1eaa1a664444b30e6a20b5d20f2c75792c94d0f77a06ad1d7852388a7d987da8298d95b
-EBUILD kdesu-5.46.0.ebuild 606 BLAKE2B 5c630d1f599cfca33338ecc97356090af20eccc0ff707f123d2e0a28e6c81214650d41c3c91607db840d265aa6ca0aa5857628f66033ad0ebbe0c7caf4db9997 SHA512 5225d3d454da884ad30be7bfe9625d989ed9fe09dc2c518b79e1eb6ba5508a48232cac00db7b5c527761cd8c13713c8692516cf8baeba16cdb624094409fc350
-EBUILD kdesu-5.50.0.ebuild 608 BLAKE2B 4b2d5d01e7dd6461a52cd1561177b7b05f32757e130fc87c7eb3f685ff14bcc9773279da3c4fd59f5daaa0e7e7ddb724b3322b4426f0075ff7332fac09a945ce SHA512 2a3ac62f0fca446b9dac303f67de2cb40d5cc69908a527582546e46c44cf00ac8739bcc7d22c28fa507cf5dbe59a817b8705530c071927495aa6f49ea308bf6c
+DIST kdesu-5.51.0.tar.xz 44864 BLAKE2B 5bc4667001da2b689ef831ae2d20a4503502e4da708eb1763246a23a79d1a9d58fd35a1f0cef48e1726c16df06cc46bdbc2d0ac3266b304166c1dd9127605747 SHA512 64825e20d4d4c650ea00c14250bd258245918d06988b56414916c5c67173245f4cdbf4ae3fb92cea4e19132374e591448fea4c2d585ffb4f6a87a8516c5122a7
+EBUILD kdesu-5.50.0.ebuild 603 BLAKE2B 6b2c3f1ddf26cee8d2de0460ccba31f0bc15c57aefedb045a6adda49060e0773121a0b6504a9c25ed09056ceaf939ced9d9980dbe5bfbc075021ac28a70d0669 SHA512 b1c77a802e49955b255cdb930b8876acdcd766a61fc24e9274250cb7a2a8cce6356c15e14173d433d788af21a7ccbb68652bfda4c2ad8d1c06a8a723d01c1d82
+EBUILD kdesu-5.51.0.ebuild 605 BLAKE2B d8090c66f4a316f85f009f8b342bc25a6e38b69b62ab6b8a8af7eb49acf3158056f833d71f0d22a4b76819e9999705e18771909dc3b43545775f32587b0e0986 SHA512 633724aee814b081f59d8d7aaaac1a9465ef12068d5afc1efdd4dd8f307fe858e885e6ebaccbe415254fc8d695763fdfa6308a45a4fa37914ef3ed9aeca262b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesu/kdesu-5.46.0.ebuild b/kde-frameworks/kdesu/kdesu-5.46.0.ebuild
deleted file mode 100644
index c89d506b2ff4..000000000000
--- a/kde-frameworks/kdesu/kdesu-5.46.0.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_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework to handle super user actions"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="X"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesu/kdesu-5.50.0.ebuild b/kde-frameworks/kdesu/kdesu-5.50.0.ebuild
index bdc087918542..2abb14ab52a2 100644
--- a/kde-frameworks/kdesu/kdesu-5.50.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework to handle super user actions"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-frameworks/kdesu/kdesu-5.51.0.ebuild b/kde-frameworks/kdesu/kdesu-5.51.0.ebuild
new file mode 100644
index 000000000000..20e08dddf331
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.51.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to handle super user actions"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index c15105762b80..53891606ab61 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,5 +1,5 @@
-DIST kdewebkit-5.46.0.tar.xz 29284 BLAKE2B 4669e3a35907d9141975857b6a4a7f9a68d95568e16e265882dd4f8cb8fc3f7e9808cad43bb33670daf038f0b2a74e59f6371a7a607d13b3abd571a2303f4434 SHA512 a510e3251607ad4fec7e9e10358ac61f41c7d7b7dc223766742e0924e53372e42a02b10dc200d73fea79179d9c7501911abb3858763e0892dd0684c8361ee80c
 DIST kdewebkit-5.50.0.tar.xz 29336 BLAKE2B 4abdd7c4a8d29e89ec714eb1e5244e72b5ac5c88bb67f041c81b5c4a61d06e7acc2a2bdfd58dcd6ff54f7a34342e6570d8a2c0a5721155bebff1dee21724e1bb SHA512 c2b7e7cc41fbf8632bf1ea751b0a855cab1048ff35320a4ef196e8e248d7f55bcaf0d68e5b1d15db312228762b78421c606c052d11771dc2814e744f963047ed
-EBUILD kdewebkit-5.46.0.ebuild 662 BLAKE2B 744abb8327d427c6feb676d4559c8ee48f5a3510f0556c991a8b604ac69ecf62886ac929423c89dc6cd15c13e88a9ad078539798c23443a10b23b1b8a9b61ebf SHA512 98232d3b0a7ec6b2be0316e4df2da352e8a5efd3d865137e7772cb97b4adbe96e502f5076020c8e574dee18e74fbab21a93d2cab95805d3cf50cef9946446cdb
-EBUILD kdewebkit-5.50.0.ebuild 664 BLAKE2B b9dc7852e095918c65ebbf038521af47c6790d53a1f74bcf8a6034187c5544e7a40fe17eb4440572de2248cb119d7fd724f9907d0fc2f3d937574f069243fe3b SHA512 869bccd6cc304c2c5a07320f4f98049042a95ab39002078b05480e7898ee30f08b959d0d6de68d8309cd5276bf6f60c74af12837a9e25adf91c7cc1f2522e460
+DIST kdewebkit-5.51.0.tar.xz 29300 BLAKE2B c770435c1067f38febce16fec4bf3a949ea470d071765a61e0e522f772a28fc5e47e1f0a0728c08c4b339b411109797c5e478f1624071b55209be4f5a1b7de8c SHA512 166637e3e30b94822e9a10cde59012f04505f564e5a6d69b81dffd9b7d0584f70891eab640dcac3d5ae56bba2e96b8cb2bac5c31b42ac95996a37660e55b90ee
+EBUILD kdewebkit-5.50.0.ebuild 659 BLAKE2B bfaeec639d9f4ce60d37050bcb93f48ebd01b26f07d20c996a573a75f053f270a4a48012242ba4cb3c33129e1d40383798583d539d72a27c714f3459eac30260 SHA512 d0ae314a95cb70546f1007602a9bc8180402dc536defecca7a459093779af3040bb789328ec92e589071aa64b1dee27dc4c14c87f507626e5effe56557309574
+EBUILD kdewebkit-5.51.0.ebuild 661 BLAKE2B e0f2d348a95295d4966873eb09d6055b1425b26036c61ea7f79cdb7dbcf9cf7466bcf6c086b4d33302043e242f1dfab1f2ce83d3dd3a0d7eb66961a81ebba189 SHA512 5db06173d5aa80005e67fbe8b0e8f30f46bff2aeb17ad44a8f66ac55c4292f583a10003b228640388398d92b8241b2f2dc90ad559941856f1444369aef631d62
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.46.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.46.0.ebuild
deleted file mode 100644
index abf50a0ae0ce..000000000000
--- a/kde-frameworks/kdewebkit/kdewebkit-5.46.0.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_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing KDE integration of QtWebKit"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtnetwork)
-"
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.50.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.50.0.ebuild
index 1fb4c4ccfb80..1b164c56c7ff 100644
--- a/kde-frameworks/kdewebkit/kdewebkit-5.50.0.ebuild
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing KDE integration of QtWebKit"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.51.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.51.0.ebuild
new file mode 100644
index 000000000000..d55472d9049c
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.51.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing KDE integration of QtWebKit"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtnetwork)
+"
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index dfdd74b0ba87..90d4d8972e70 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,5 @@
-DIST kdnssd-5.46.0.tar.xz 56700 BLAKE2B 1009e8c4b8bad6e81b34cc29a917bd319190e56ff60cbe41da25b8c6fc9a255940981013a74e6a771164a212707a445a1b24e109da1da12d2acdff6dd2e09bf8 SHA512 294e096704a7ab882f9b04e0ba2d5506be691e83b685f7520ebd4efdbce19c4bd9341be9d61f2ad9984e334b71cec32da37aab51108350bc4f81e6985e3b5425
 DIST kdnssd-5.50.0.tar.xz 56708 BLAKE2B 7df1db74b524abe9cea13a5ea6fb13e7cb5ee373c9b14c709d3f4568cf25d4f2656910bc43d8656bc8bf4dfdac2e5719346b1dd2bf7c6ea3870752b977f2b5dd SHA512 cd49247c02c2cc568d4942e3c08d4bb9b40180a8e096ee978b2d5884e40ba69266ea78b319301cf5106e135f3b648f1adbefd5288fccbf5779dff1e2d1c0d1d4
-EBUILD kdnssd-5.46.0.ebuild 600 BLAKE2B 3020731cb0d57c3f88ac59a0e413b065cb9d4827c12480d380979b727e71318f48e538d2f4bcd56ee0f6b8a327bab821bc66359c0b2f969afc9edb51312caee8 SHA512 3691df7dd5abcd25f4e0629991fb97a0b5086a1bd5a390703b822ce1b0e982caedd0bc786cd38579b17668aeac53339f3d4d5c07add3510859eb3494d48751d0
-EBUILD kdnssd-5.50.0.ebuild 602 BLAKE2B 9b947562cbfc330f5b1d8c1226f6ab6e0e24e95ee2b23d3c2f1e95534caf7d391c381bd9d3a222340267bf1c92426386df07e0bf5cd30ac439e09685c0451d65 SHA512 0f1fd8a29d7fd707e52a39d46e154ec04c1531a4f0ab7c47f7384bffc0bbd8f656156d72fcdadbca9856f36dbb9b35a80de4896a8b4f34bdc624773526256793
+DIST kdnssd-5.51.0.tar.xz 56644 BLAKE2B cf4d8093c0770a6ecd69cd5752deed216adb712c92f4637bbe83cb10e4ae6fe33ed83b11ff396ee8d70be910190feb40481a43c1ea59441a00f65538b5e4166b SHA512 4f3eca1819e865c8afeed8cf0fd771bc129286d170e71939191a1dc064c0b376a8091cea4fd9e67a3c71cdc8ad724f0fdd1f5c8166feafa6afb16ff98c681bd2
+EBUILD kdnssd-5.50.0.ebuild 597 BLAKE2B b7089f40283cc73f7ee5aa83afdb138e2443e9ddf86090edf597d866787f18166a40c3ce1aabba7acffa61fb044d9009f71ed090bde300e0b4ce1411ef260af0 SHA512 917c22360ec0cf58c02a80111e751075b6dd52506b9b276b048a5a3c0d73b69121c67a7f5ff9eb780e883ad89b5fd01b597486d3a685019df4d8f969940b9cef
+EBUILD kdnssd-5.51.0.ebuild 599 BLAKE2B f7ecfcd63869a8d9eadfe4f76f8938279ef351b7a3b2f40ce0073a989f625bde943902d01d25a34bc4d505bf089ca6dc9005816ab42dddc547cc206fea5b1361 SHA512 027718819604858b5dfdc85ede3659ff268340f8f0b61bb4973972d9438d7ba75bb7d007c7aa2e98adbc71097191e382d65a6687570d98dd5e04403cb4e78296
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdnssd/kdnssd-5.46.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.46.0.ebuild
deleted file mode 100644
index f89854f48951..000000000000
--- a/kde-frameworks/kdnssd/kdnssd-5.46.0.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
-
-inherit kde5
-
-DESCRIPTION="Framework for network service discovery using Zeroconf"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls zeroconf"
-
-RDEPEND="
-	$(add_qt_dep qtnetwork)
-	zeroconf? (
-		$(add_qt_dep qtdbus)
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
-		$(cmake-utils_use_find_package zeroconf Avahi)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdnssd/kdnssd-5.50.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.50.0.ebuild
index 4abdda53e524..fa36a769cf0e 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.50.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for network service discovery using Zeroconf"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls zeroconf"
 
 RDEPEND="
diff --git a/kde-frameworks/kdnssd/kdnssd-5.51.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.51.0.ebuild
new file mode 100644
index 000000000000..c3d0b7713c44
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.51.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls zeroconf"
+
+RDEPEND="
+	$(add_qt_dep qtnetwork)
+	zeroconf? (
+		$(add_qt_dep qtdbus)
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+		$(cmake-utils_use_find_package zeroconf Avahi)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index bf65eb85693f..7dd8ea8e065c 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,5 +1,5 @@
-DIST kdoctools-5.46.0.tar.xz 423800 BLAKE2B b8c133a2036866a76abf017a7ec99098da487865222d6ed0acf91c794adbaf4b3be3a73c541a5567539b2dd0bcea8986be9a1aa3174a0adbc0530743b972f87a SHA512 bbba5359bf2ad3c8e321c8142608dec57c577ee7f7418a600f7e15cac853f50b857a846dd1676a349d9b544ff60ab6162bd21819b4be34468a8e3d119a7c32d8
 DIST kdoctools-5.50.0.tar.xz 424484 BLAKE2B af4df5e4935f5c44db2116b29182dafbf756ecdf905322353371d97b58d1a365a7ad0273962ef9569b517f82affc39370e000012b46fdea62dc4656348c49e80 SHA512 cb09a6c0a990b074e66161171e947f18b0036621da075a4f66452fb2a8f5985bee45b371e1e3303cc4afa73d376b89a839ac42e8b479c71911f7f89845422e86
-EBUILD kdoctools-5.46.0.ebuild 507 BLAKE2B 7800be4354848cfeb2071eac73bf1328b3122c1ef5b0d121ec3d039c657dcea302d5a4f5cf4d17757cf80c888f1cd9dca810bffc2816d33e0c3d5b9592747c83 SHA512 1ed9836774ab154ebc9316180e574301608ed72c5dc69fcd64f18514b873e9c26f88a209eb26ae3444fa748117b9ee20a9209161e521dfd6266e96d44f10cd9f
-EBUILD kdoctools-5.50.0.ebuild 509 BLAKE2B ada2440d5d4d13f53ba7cd3bc33fe4c2d4e129eac496d640383b6509492be6c2f0709ca8639fc8a9961e5f16412900f14fd973582872ee9ecd142b7119d675ea SHA512 defea11e426d4388db65acf493fc67b0aae8cf870edf31f9a8bda8f64b7c31d597079cd0990d5d74fd0e4cf78bdd130831895d2858cdee7cc9173a5159491e41
+DIST kdoctools-5.51.0.tar.xz 424328 BLAKE2B c612fd1627901546de0ae27d701d4f25ae6328e2637ab04042b8063ba0fef0a5412f49eddf8720cafe62bc49dfdc65f93127194b34596ed874615c430b01d6ff SHA512 732e7291a0620d3132145f4689449d8932c58e32814cbf7a96bb45e9a3139bf6ae494b0347205193239c6e551d153662562cf40c2bd69b06e750d8ede8d1f6ec
+EBUILD kdoctools-5.50.0.ebuild 601 BLAKE2B 1ce42b848e5abc7320f9af2466c8a1d73a92f768723a9fb6b0bf7dfa1276f19beaa4f14ca1a474e779812a8b2b537c92f73072f2c231b13b41bbe1d5962f4f9c SHA512 2d94ea6f7823aa5aeab9e68bcac60a95038946f61c64ff9fd979e49e6eefb3994ac26edf25df2f4901a6c9ef1f669a4c868973316e50482c55ac9e8e0cf67b03
+EBUILD kdoctools-5.51.0.ebuild 603 BLAKE2B eff4cdd75a767e4148867c0c78d8d6651c553d9fbe0afa5aa347abcf5ffa2dc275954343468e21348545ac641071fb615279ae064604643e6c1016c62bc2b70e SHA512 337990b864c0d739f71e8850f0d93e9b508cea11a61cf15a1b8688d8a3434ef3d31b84dc4be9eb6b2b199c75c9765aba04db1ea59926d0fa0b3ec0af612cd71a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.46.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.46.0.ebuild
deleted file mode 100644
index 8ade10897ebb..000000000000
--- a/kde-frameworks/kdoctools/kdoctools-5.46.0.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
-
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	app-text/sgml-common
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/URI
-"
diff --git a/kde-frameworks/kdoctools/kdoctools-5.50.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.50.0.ebuild
index 02032df43e84..2bbc99fa5366 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.50.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
@@ -23,3 +23,12 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/URI
 "
+
+src_test() {
+	# bug 665622
+	local myctestargs=(
+		-E "(kdoctools_install)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kdoctools/kdoctools-5.51.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.51.0.ebuild
new file mode 100644
index 000000000000..c306724f6ffd
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.51.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	app-text/sgml-common
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-perl/URI
+"
+
+src_test() {
+	# bug 665622
+	local myctestargs=(
+		-E "(kdoctools_install)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 435397308194..b9098e9130cf 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,5 @@
-DIST kemoticons-5.46.0.tar.xz 1695924 BLAKE2B 9310bbca9f95db1f4caf109ab5749c464515c35191dc2f55986bda21857d4d17f70fa0cafc5d8b34902e676043aa3547c5f34d15b708aadd14ddfe39b9f018f3 SHA512 3ba95305efec79d71d06c363d75b42ea1833c3154dc5fadf37ed597af6bc07cbb15339675c385010d87316c08d43f8b632f66a0757d1b1aa24be85e4d429bc47
 DIST kemoticons-5.50.0.tar.xz 1695848 BLAKE2B dc47cbc8c541910f55fc45cfffeabfeeca90c13d35727ddc6915ba07413fa848e88ada527ebc91a7f6cf3801b2b6293b5e015a9f16c6376667d1da956853cd7c SHA512 04c132340be0159514cf46b60f2a9f9ce35c6cd35ad64820463d9d8f929fccbb7d4082337c1920b778e35875b222e4caae4d98c4133b4c9ea365b4e69ab79223
-EBUILD kemoticons-5.46.0.ebuild 580 BLAKE2B ad82795d6c8d69231787b2b6fedc472279f74e42272aa6e423d528ac084bf68b0c381776d796c4bcde572ffbe2cee7af15c83975afa40046e309ef8c95ced9c5 SHA512 8866e823bf74691da6f390d274fb8a7b82de9b4ec16e00137d03067fd2fb880344fe3f5149648be2d7fe748563df83ce39dc6f2a019034e14374a32b425aff8e
-EBUILD kemoticons-5.50.0.ebuild 582 BLAKE2B f7f557358069e8601480b79b5e61ed0427479e3d3e3b6180171042c7ff435e33edb7697652624b6874e1d21537c0eff78921a2e694489bf8797aeb4c2bb3c849 SHA512 bf636755a1b881c8f399f91dbc232577d7427aa5bc108d6d01a4beb1d9e3808e1b95da62484600f76b12c3c384d330026cb02e060801cb6cc86ac85552f1a93d
+DIST kemoticons-5.51.0.tar.xz 1695936 BLAKE2B 2a57296fa890f7d1d89f59c91c6cb67531a79008db267ee78e7d717ef1090bab7ba2d4b2a655c7799dd7a5b4d4639b987c8cf5f878666bcdfd819b32ac83f9f6 SHA512 787682ae466d8fae958d19c029375100c71849fbbdbe90d2576c10ca7bdf86d5424c08941127350e03237814bc2a1bf662eaf831f75b13759e7c3aff34ac6791
+EBUILD kemoticons-5.50.0.ebuild 577 BLAKE2B b4b1b77dc9995cf7800c352d5c48399b23e18d5b4bc31302c441267d9ba9c0bf7016086ddc216c39255daee07b94fea3afc8c6d8f738f0ebe4feda3a3192ee9a SHA512 0da720ccf06ce7e55e781cc0e76883e4b482b736db80c3b108c7df6fb4bc1776872e6d5d553a852a3a0c89391d5550704b04cfc2bc3b340f2857d1382965e667
+EBUILD kemoticons-5.51.0.ebuild 579 BLAKE2B 157103a89d9e7083d76a31504b460fc6391bfcce5e29128d2f83fdaa485073714a12ca1db3318ee7ac048e6ab392a6371df9c81d87cb09ed8b915e6b19fbe760 SHA512 5486c41ebfcf884eba136f5f5658cd6887da037c408dcfbacecdfa09cbf9bdec34abe8783367a8cc3feaeabb19622e1edf574a2d93aa0812efc2d612db8f677a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kemoticons/kemoticons-5.46.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.46.0.ebuild
deleted file mode 100644
index 0632578d588f..000000000000
--- a/kde-frameworks/kemoticons/kemoticons-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for converting text emoticons to graphical representations"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-frameworks/kemoticons/kemoticons-5.50.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.50.0.ebuild
index a3ab980b96f9..a21d618e9368 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.50.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for converting text emoticons to graphical representations"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kemoticons/kemoticons-5.51.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.51.0.ebuild
new file mode 100644
index 000000000000..1e1b266a0b8b
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.51.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index ee9dff5b795c..8ad130bb77c8 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,5 @@
-DIST kfilemetadata-5.46.0.tar.xz 254912 BLAKE2B 4750573a9ee26f3adfbd35ead14c0e1ba892cacab47fcd5691eff5e817cb2367710aa4f6fe813d2828568b3d483f0995891ccc9e40c045dc831226887b9d5ff7 SHA512 c95bf901218ddd8eead9c5581d468884720e4c32a4e5320b24dd0fac4c898c477475a578ebe803e17213df3f0a4f07ed6501a653584547f86a441de793ef6a4e
 DIST kfilemetadata-5.50.0.tar.xz 258444 BLAKE2B 47653d094a6a543294284d9a07119bdd7d3815b90590351748afa6635a8f628773f570da33d1364bd00af09f2e66d82ca4abbd09d8120c3cdfe920cd4b8f9de3 SHA512 9e6d86da7e50e4dc432fc29af366572cc3504301686a38f8f46d44be0041bcd72fc0c8515906995d8ba4a6fb7217767efb9eb151d2578e1104c5a1cb8db9cc4a
-EBUILD kfilemetadata-5.46.0.ebuild 1634 BLAKE2B 157b2f061d7ac73e53a9913140fedad7a19dba1e0e28aa7f1863090a2c9a274aa44cd0f9fb2d5a16c101b38115d5e1e99f4e3b3c468085ec1e92ba0d9c36c09f SHA512 e616fc69261072bc95065f500531a655b46026ff7ae27974c14385836fb8708e126f32e19eb29204014ec4207f332d34b89b251244ae8c79609d92c83a84acb1
-EBUILD kfilemetadata-5.50.0.ebuild 1634 BLAKE2B 6d34092ddef0c49bf7a08f6b86cd8b21adc3c1be9ec80b7417c4d518c0c15a054ff3abe33061f094e8b6c3c69d1bb7d16ea81c78f9e016234583c775a314cff7 SHA512 9b30214fc5da628c122e61286e2e8648cc6c6d458176938b5e907854725bf07a46db7eb97680a8b63f9d60fce2f907ea006fe7f4900561ec935c594bfac211c2
+DIST kfilemetadata-5.51.0.tar.xz 260492 BLAKE2B ed1d029b059dce5d609d9de30664dbbac2d9ab7c1eeae2135b8c69f60263ab9ec7543f2fb22f297d8197998780e84a45f50f9f14676a7edd8565e7ff9bdaf4e6 SHA512 30e93f239ace615af5722156f5b09de86a96a053fd40edf44ce109fb22e22a429795498392044095354e44184be9ac8a64a7be4a3e78c60640f4fb8e9b78d82a
+EBUILD kfilemetadata-5.50.0.ebuild 1629 BLAKE2B fcfcc24660ee4797147052287cf1098d72b2739d57639eb05ed34790ae8389a9e2969f16d17d3c18923278a79d65a7c9c838ad76eef1d1f2c3d64b3597e18d49 SHA512 bb92aaafbb77258dc8129e7268ae1da98db90d92fd11d155d42963f9182e00d2caf96175192edaf5c7225719c28f57b1a412556f44d6febb4eeb36386d6ba854
+EBUILD kfilemetadata-5.51.0.ebuild 1631 BLAKE2B 648c38a0da39798bae1a4c6f271317ce43dd28b6764f0ed67aabe1d50f0f4d28b93099c78bd432ec130b0737a3a5f63c3cf7ad79d429d25f8bd0fc913151bd4c SHA512 e844a45c64fa535166f0438f68e04caa45aa11cdca048730eabe619de03b949ce0f49e47f00f50890325728690e7a69371443b952ab26dc4f7291ee2db5e3092
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.46.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.46.0.ebuild
deleted file mode 100644
index 0a130c94e318..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.46.0.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
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit eutils kde5 python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="epub exif ffmpeg libav office pdf taglib"
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtxml)
-	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2:= )
-	ffmpeg? (
-		libav? ( >=media-video/libav-12.2:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	office? ( $(add_frameworks_dep karchive) )
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-apps/attr )
-	test? ( ${PYTHON_DEPS} )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package exif Exiv2)
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_find_package office KF5Archive)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package taglib Taglib)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
-	local myctestargs=( -E "(usermetadatawritertest)" )
-	kde5_src_test
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
-		elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "indexing of Microsoft Word or Powerpoint files" app-text/catdoc
-		optfeature "indexing of Microsoft Excel files" dev-libs/libxls
-	fi
-}
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.50.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.50.0.ebuild
index 538387f85e09..6b964629de80 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.50.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 inherit kde5 python-any-r1
 
 DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="epub exif ffmpeg kernel_linux libav office pdf taglib"
 
 RDEPEND="
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.51.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.51.0.ebuild
new file mode 100644
index 000000000000..7bbb0cfdd63a
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.51.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit kde5 python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="epub exif ffmpeg kernel_linux libav office pdf taglib"
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtxml)
+	epub? ( app-text/ebook-tools )
+	exif? ( media-gfx/exiv2:= )
+	ffmpeg? (
+		libav? ( >=media-video/libav-12.2:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	office? ( $(add_frameworks_dep karchive) )
+	pdf? ( app-text/poppler[qt5] )
+	taglib? ( media-libs/taglib )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-apps/attr )
+	test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package epub EPub)
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package ffmpeg FFmpeg)
+		$(cmake-utils_use_find_package office KF5Archive)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package taglib Taglib)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
+	local myctestargs=( -E "(usermetadatawritertest)" )
+	kde5_src_test
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
+		elog "To get additional features, optional runtime dependencies may be installed:"
+		elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files"
+		elog "dev-libs/libxls - indexing of Microsoft Excel files"
+	fi
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 71d24a4e7f2e..3ed5f4af677f 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,5 +1,5 @@
-DIST kglobalaccel-5.46.0.tar.xz 83728 BLAKE2B 744539105d6eb673d80f04916f104ea0dcf4c00bdc79f8edeea19d7cf51ef7a19dbb6300361d9835824ec953e349407072573348fc4aa9a502f4ae8001d805c4 SHA512 f35a150016d66539ea9b7d7d12fd6b7e64886ad4c6ed2372eadb045cf572209736f66f8c6372bdb9a4d7e422e365646bec8b850e4e74e93144fc947d0f0d1389
 DIST kglobalaccel-5.50.0.tar.xz 83792 BLAKE2B f509527cb401d2ae4e8fd6629c58108daa4aa08b001be14ca6e61e9fe9d31830258f5fa4e9f0fb7fefbb06e756b5ad32c70d8e6b31e27aeaf2b4318b6869e2e6 SHA512 3cb9530c392c5eeb126a56b6efd81a9f6daa072fd860b79362bfb6ae47c9af3f259a0d3258bbe04a7af34fb1c0ad6000c1e70b7f8075e6cbd10444acee9222eb
-EBUILD kglobalaccel-5.46.0.ebuild 650 BLAKE2B fb42a3e2f060869cdc912ff6f87e9aeb7573c9e1501d059e3da3429f193a7f1bd2c492b26710bf120edd3aef0019547fe9bee6346e478de5c1c403f75be2c3ec SHA512 d64fe35c1ccbf5645efd76fa7a5b8e072f1c19afd0a7b89bb556842592098d08a22695577b75b69d02925de306a1282fc8cbccb9d2703a538321306089adf991
-EBUILD kglobalaccel-5.50.0.ebuild 652 BLAKE2B e76866ad28a82d05aa8aba479c578bbdc637cbd886d40d9b2c431a23a0c3a3ba515cdfeafc77fc18f360f0a66f27eefb50550b922f5b5a087671fc4c55bab12b SHA512 6bf39b923fa8e7acfe2187f4aa79d37eb6760daefb95faec21c92e8fbfdd37957d89bdf5c7d643dda0b2437746c3497042e433b8fbe44a85f3c8e2a2862fac42
+DIST kglobalaccel-5.51.0.tar.xz 83832 BLAKE2B 3b642b692205f226f3b3638bacb803e4246aaeb10db0c9d2fe9588be401632d400a150a79f1399a6cf31036a14d7267853922ebe07501f66c2458014b0c69f59 SHA512 cec1abc2aa5d9465d07aa73ebd83aba6e9009272857e3c22e87928735f0b2a3032e6d94b0a930c75892dbf29479b4e128556a8b3ef452ed3e139a26ef5066867
+EBUILD kglobalaccel-5.50.0.ebuild 647 BLAKE2B c3bd0ee1643506a2340bce3e1bd68c7d2f997e6660da4ccd99007b1e65fb8088bda60e036b91b860fe0a4037b5b581d436f5656dfbc083f2210fd0f5c08f2464 SHA512 f0d8e52128c7f83ba5829daa8203522c996c3207e268ca58b7cb3ec12d5f5ce10e9db852dbf425fb284e5c6d9081a37833b4855a98aa4d427c11c0f4d703cb6d
+EBUILD kglobalaccel-5.51.0.ebuild 649 BLAKE2B c78383a35384f3afa0b116b79dec5358638aa599e6d34249e1357ee9a11e68161e5a698a701dac3c425d0904af974b5646eb60365db748d2cb18dfca14bc2bac SHA512 2154c0d46656715fbca720faef22189e81cdba37659ff9eccd23ede8bca06ee4b2c1f1fcdaea302a7baf42dfa922c926ed9ac10e18aa84181a109dca402ad510
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.46.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.46.0.ebuild
deleted file mode 100644
index 7afcfd51eb72..000000000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.46.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=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-LICENSE="LGPL-2+"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.50.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.50.0.ebuild
index 5e6065dfe91d..f58be2ad93a7 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.50.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 LICENSE="LGPL-2+"
 IUSE="nls"
 
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.51.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.51.0.ebuild
new file mode 100644
index 000000000000..288d09517747
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.51.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to handle global shortcuts"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 0b8c5cb6f331..4b1e7cbd9174 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
-DIST kguiaddons-5.46.0.tar.xz 40160 BLAKE2B c25acfb30233f8d5c85e6b21bd9e133ba9370ca214f9b961a35da7540d117abb8ebd5483f310b968453400be8e06ebf35d1217953e0a53d45f5ebf3a8f39e5ea SHA512 58526523c26d2e2ef6c315cd4c805b3f5826664e3199d4d124ec19223a5a7d24c49febec073675ee00044bdc20c35eda986eb0df9a386f3c8673e956f060741f
 DIST kguiaddons-5.50.0.tar.xz 40188 BLAKE2B 74019d7cb748f6f91f104a0f60ab9fe02c3a2cc265bba3b9e1ef2487381d0c712c3aa30894498a7a2edaaf5933f6791521935ad4a0cf77d3a8ccd8066070ccc9 SHA512 6a7ac22a60a0811aa7f2ce9f2ccb3f16f17e53dcb2352092b10b5d5384251d7e46c575b12549a4733416de88c5bd724670d52d5b96fa47005fb6b8ab847594cd
-EBUILD kguiaddons-5.46.0.ebuild 431 BLAKE2B 066b95b1105bca5d1403d3796b91a901f6c67cd40d9af37d6aed8bd67568f388822a5e1c996002bb21afbbd2f7d5e26b6d3c1ba277656b3b8a2022f9cd10570c SHA512 dfbb3f209da3c655445f3858991e6ff0638df41dde248d70245cf374a47d3b2a8fc1528e41703160ca906845ef73be934a4e9e3a02b666b468dee5ba79b39295
-EBUILD kguiaddons-5.50.0.ebuild 433 BLAKE2B 3f52e464a331e15fb85550494e556001f094aa7b7969a17691860ab4d9a1718f80989e1ea5fbb2a776e94202359c317fe6bb9bc42325360927e4d7f9d6cd6991 SHA512 3002baad169c020b28af8ec9c0f36695956817d3aac956a887593400ec2c5eeed3ed9cdb517a3b913906650b56bd8a0f0cb94e6f9c35266998d62f43041f8332
+DIST kguiaddons-5.51.0.tar.xz 40208 BLAKE2B 6262d2acbc89e4c1a443dde1b3a194fd7688f423ce6176e2ca1b1262b33af65c2bbfd22ed52afce00928c03f6da4441334fce96c6aae74b792ce2e91c693dd95 SHA512 ed5bfa4fe462b014e2238af4c3f5051fdc7a27d3528cb64be0bc9201c7f5314ed2928a2e3377240e0b9f2803206a2bb6a6bbbbd4923781f61142e65274b3b82f
+EBUILD kguiaddons-5.50.0.ebuild 428 BLAKE2B 6490aeec284e16661bcaadd39eea287bed2d95143a2090cb1cddc2b0bf4dd02d77dea8e79ae97e3aa6321c4c2b782a996c57a5cecb79b842d347f462984000e7 SHA512 67deacdd2038a546302f9b2afa62d2fc8e6c773cb81dcc5daf6a34d2151720c60e6fb3d5cf21497b862468292ceb4c4a95c904f5b34c30457afcf051ebd38c06
+EBUILD kguiaddons-5.51.0.ebuild 430 BLAKE2B a44b7e7bf3b8471e8eb97c3dd18ad47bc1964d993a28b3906012b560a187af66863692a4bcd75d103b0082144335dd8130fc0542b818e4808031190b9742ddbe SHA512 1735c0515587801593962bf9df1f294aeb2a0de1ce6c7694babeb10655d84ee2da4503496eb775aa3b905b12477ddf1526f94ca55dc0c6f71ecb175933a6b22e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.46.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.46.0.ebuild
deleted file mode 100644
index 6667aa83019e..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-"
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.50.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.50.0.ebuild
index 123424a3f650..855183b9d20e 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.50.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing assorted high-level user interface components"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.51.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.51.0.ebuild
new file mode 100644
index 000000000000..7a3478bb4614
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.51.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+"
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 4ed823d45a57..41ad9e5e3f72 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,5 @@
-DIST kholidays-5.46.0.tar.xz 199124 BLAKE2B 0b4eab230fe53cb21307b73cee70a9d1b89c5dbc4f1302ae5c048f60569f659c91ab1b7560ae9dd47d125cb1e802dd89d52d91bb8eb069b6bc228baf67c1e80f SHA512 c94bff75cea9df8654407b92d87947204cbf2111925d46d5384e7174f7f47960a226f3b85864f3adbc4b3c3255e439bc139b192b05cf32483b6f1e3de0840df2
 DIST kholidays-5.50.0.tar.xz 201296 BLAKE2B dbc7eee04c15d3c1832605ae0af12f56abc204219a218495499287d982560995187e420b635fcfdf2e2ad7aa296e381d4a274c5dbddf71841fd6d9c002a6b594 SHA512 019c22a2806d73fd726157854a70206c7e91cdfc8ac23a84b5c64cdbdc474fd4a7daaaecf5f0a3636790e85e8ebb86e9e5a9dd1a64a9fbd728c39ae68fe94f9e
-EBUILD kholidays-5.46.0.ebuild 668 BLAKE2B 046e3b683238030503ebf6be077ac139057a0ff676cf80a4cd0a801296c89e0baa106e2563e5f20fbe9830b51978155cecb78caeddb25011c5dc0d685099cbbb SHA512 313514359845f736fc0d3a516221de4e8ecb7fc1e6b9971cd8a859fb243cf71a03b58177de3a3bf18086025f018146f2998351170130f35dfad0c36ad9074749
-EBUILD kholidays-5.50.0.ebuild 670 BLAKE2B aa850acd6bce28b47d064561f1a3e0344baa720921879a38d107de29e62180968f010924c0f8becf8ad41de42c5e6d7437adfffc2014a8ed19cf9c42c206fb6c SHA512 1faa2d177e7748b81fa92464a6b2150aee7ac79feb86dd65a2775d14acaf65b0524b0d3a5eb094be435aa23dd90b1dfac5a6456386ed83ede4dcae8183938ecb
+DIST kholidays-5.51.0.tar.xz 201668 BLAKE2B 65521c5ecd644221757a88fbc571b7ca918e6b240ff2bc210e79b15abe2d3bf576226a33f0bcd11a2fb4d2d3232d9593cb132ea4b192e38d5c8e20f6ae87dd68 SHA512 d2719f670e46c322241226d89322710672c1f7afb2d4e1658ec798966f2e34f0d67434da692801aca35f0cf4899bd911b2083c3cbb5b4570ce043d75013a83b3
+EBUILD kholidays-5.50.0.ebuild 665 BLAKE2B 44892a39412135b55c5c884a04bdb0ff5eaadb9e5319066b58da8759d54c96502a8ccef3f436ed418a2c5870509c6684e7bbbc161674fbae550575a170774021 SHA512 7bf4734a2a61d2a0d6116a9d1b9e9eb32a665f5379d20a671d079d5a0aae814d907a59ab8012f4d566ad0367a1719f7781c1787494c360697129ddc7e7bf3244
+EBUILD kholidays-5.51.0.ebuild 667 BLAKE2B 02d60424c7db2d11db16a956603b94ba88459d3b4abc003780cbf7c5318380f05bcd687b3e5a692077bebbd003ddbaf7ab1e491136bd8db37df2c1337b793c56 SHA512 36e4a7b9f90436c7b395de6cb1f5d655b30ba6bcff0d99025a524097355ef56aafc8e075c5ed6107b1d04d93cb65d34f13f0cbd02263d9a9da93fc7d62d32967
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kholidays/kholidays-5.46.0.ebuild b/kde-frameworks/kholidays/kholidays-5.46.0.ebuild
deleted file mode 100644
index 0a402a07e9cd..000000000000
--- a/kde-frameworks/kholidays/kholidays-5.46.0.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_QTHELP="false"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library to determine holidays and other special events for a geographical region"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdeclarative)
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kholidays:5
-"
-
-src_test() {
-	# bug 624214
-	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
-	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
-	kde5_src_test
-}
diff --git a/kde-frameworks/kholidays/kholidays-5.50.0.ebuild b/kde-frameworks/kholidays/kholidays-5.50.0.ebuild
index 1fbb3b26dce1..fb79f4849786 100644
--- a/kde-frameworks/kholidays/kholidays-5.50.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library to determine holidays and other special events for a geographical region"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kholidays/kholidays-5.51.0.ebuild b/kde-frameworks/kholidays/kholidays-5.51.0.ebuild
new file mode 100644
index 000000000000..73ca6267c0dd
--- /dev/null
+++ b/kde-frameworks/kholidays/kholidays-5.51.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdeclarative)
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kholidays:5
+"
+
+src_test() {
+	# bug 624214
+	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
+	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
+	kde5_src_test
+}
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 76289d240fc7..5e8197718a52 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
-DIST khtml-5.46.0.tar.xz 2080444 BLAKE2B 43978f228216c209019c2abd7901019db1384083f5ebccad02ac29f48c870f72431a437c3c713789a328f61090019e8e0491034fc6842525701612847db75b26 SHA512 c4daad56f9ec40f9ffb902e507e311f912744019a434588beb11bc197a3683845565ce6de6324030d169141ed0f09b96bc3e77001d8942f40a5ffa20809de886
 DIST khtml-5.50.0.tar.xz 2079960 BLAKE2B 94d7158811602980f6ebaac9336e5b41d8c25a6e3d661f333645604ebd8ede5029b29e6c565fa9fcf739cd968cc8c7e0b3f55d29f3c02afc45cae9733f4c1c8a SHA512 b2259a11635ea9a363eb17b73e5112d144f86c6ed258d1c7e7bb3571587a526a852a98c51b503d2dee4c8d3478cd4e3ae28beaab1e4f2e5633709ff5b69508d9
-EBUILD khtml-5.46.0.ebuild 1587 BLAKE2B 04487b34ccd9479afd83ca72dd969f24db42f242e91466d8c59528cd9369346a43abaa7d20a61f83ed8ef9861183a3caf5259f5c6fe3cd178836ab8e1ea7bdfb SHA512 1ecbb710ae2ba874c46d193b9ef0505d41888779b75fe43902ab1eb53f07055eb71fa699cf094b7f9bf7698fb0dd6b3867750e021ed23dd8a122879a7b0fb4ed
-EBUILD khtml-5.50.0.ebuild 1589 BLAKE2B 2611862dad0f8a69b80feb41f0cc3d5185d6e4373c77bcf8b3eeddc1315eaefb1b9820f2446154f9b305e5c4608b83a94facfc3d89980f299a4014eb5390839f SHA512 0815def65779cffdd55ae60fe89c13ce9b1be80e31d8ca63324996fefababa5063e9ff4a35c09ffe69e8988d711ed3b38dd5477af91dd0c415f7ef84956dae55
+DIST khtml-5.51.0.tar.xz 2079884 BLAKE2B c7fa120ea4de134aa3532c1fc43660fe397c4bac2c7db4001fa9ef674bb9226ff483d16574ce82f0e502d5dc1147a6073208168292c26f3aab209a631e348a08 SHA512 0457c71cfd502d17de36dd21fc73a13a381f6c989be66be14c0b8e0dfacdd8a2d317a2cc07e84ccd1f994b9db3929d3625d05f0284c98f4a92e6d5623ff91c77
+EBUILD khtml-5.50.0.ebuild 1584 BLAKE2B f61a16a08550f0f6056689886964a541be9f186d3958fb10255ab4640c18eab041123bd6454e9e3c3cc3ee85bfc6aaa570804e161eab66b1044338406f5e53c1 SHA512 847bc2096301f9018a61691b76feb4627b65072bdec6433188918dc3d4ad607cbe2665a8d0f0bfc4cf257bbcae8c77b005cc83bb0215bd59b52525eabb8427c4
+EBUILD khtml-5.51.0.ebuild 1586 BLAKE2B c0f52dbaa405c2198b425f492c6a1b8a4017ed7bf58ce44edebb598f2f9d196c9556bc52ab7f1cb49970c492862e83461749386d9beec0e5821ea02fbc8c0706 SHA512 8b15f614957698f038688fedbe047db591e8c94378feac3ffb0f01028cc5ab36b68512ddc534f630b38aae1022b069922889532337d9100f8c1a71e8a2efb8c1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.46.0.ebuild b/kde-frameworks/khtml/khtml-5.46.0.ebuild
deleted file mode 100644
index 3763cb087432..000000000000
--- a/kde-frameworks/khtml/khtml-5.46.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="libressl X"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	virtual/jpeg:0
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gperf
-	test? ( $(add_qt_dep qtx11extras) )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/khtml/khtml-5.50.0.ebuild b/kde-frameworks/khtml/khtml-5.50.0.ebuild
index 43e26fa5e421..f3ce8566f07d 100644
--- a/kde-frameworks/khtml/khtml-5.50.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KHTML web rendering engine"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="libressl X"
 
 RDEPEND="
diff --git a/kde-frameworks/khtml/khtml-5.51.0.ebuild b/kde-frameworks/khtml/khtml-5.51.0.ebuild
new file mode 100644
index 000000000000..8ad79494815e
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.51.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl X"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+	virtual/jpeg:0
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/gperf
+	test? ( $(add_qt_dep qtx11extras) )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 44de5ed04a3a..f7ac9ca04f4b 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,5 +1,5 @@
-DIST ki18n-5.46.0.tar.xz 586924 BLAKE2B 490335c7ce812f54c9be935640d4ad767b3dafcdff013292fe6eb85da12f2715b70268acd84c73a78d8075f92ca09a31943d47316be02d4322e169457af407b4 SHA512 d4edabf5708311244ecc02541a0c6f9e90d118a4f0e784cf67d4be906fe890eb56225430ea78926e00da3c2fbf483fd0195f4929e579f1b9e21053696c2bcc17
 DIST ki18n-5.50.0.tar.xz 587076 BLAKE2B 30703039ad09878b534eaf2b4398ea19dcad497522157f03e18d00cd4af92f7d312e1e7ecd9973cc1db78e74e3d1a68fd57700dd093398148dbaf76ff6994bd2 SHA512 4d05eda1f5ab6f08a7aa5617c456c646a7037f1b099f60dbaead1fdabb02ad4579306c3774cf86cc45713c14dcc1b3c12013380150de95ed2e4bb40511aa4e9f
-EBUILD ki18n-5.46.0.ebuild 710 BLAKE2B f4d110a4591f7ca311b23b0193947d1f650b8c5894cee273ad14ab4dfe5567164f9e8c1419813a5cf58e9043d42c41dc743b105f44ea6c13d07812d966f8b836 SHA512 fb115fa7fa77cbd34987672bde366d6ffcf57ff1a4fc0d9b82de2443656dde775178f19e22a187c978391686ce32e2ee3005a2f1a274864c289933c6719dcd34
-EBUILD ki18n-5.50.0.ebuild 684 BLAKE2B 84762b83e1598470f88a3739550256d1e1f469a2b9dbebb569639395e042509d79dcf4be1ab99c0570d0f0425e220070bd3f656fd50b56fdc9afc00a56b32055 SHA512 2783a6b4e10db17c1e35295d4934e9b1df3e3fbfc879763b824e1af7433ee0004e7808def9d2355553d1f4f11005325720e4219e04ea90192fc115577ddf42b4
+DIST ki18n-5.51.0.tar.xz 587032 BLAKE2B e5124f652ddede48d616b5dbb385751b177e6326563e80679d99a300154239569aada80129082b72042338c8ba4f4ecf9a675834bf89149c42e4f58ae69826ae SHA512 ad5b54c3e2825761d236a47a9b9f268cbefe743fd6515e9211443e48a16825ab9913691ae3709e6490f93c2fe9b4c159087e73a00f89b5e19a469ca6548f52ca
+EBUILD ki18n-5.50.0.ebuild 679 BLAKE2B d5535efd59b58297e0a1d1a476aa4bbee2c3616e1aae38688fc81561715e8b1140757de61bdb73dc11d5245d331d44cbed79aeab0e3b252de4d86197dc8ad7ef SHA512 f9b2cf3aa45007b934d30e3dad9362c90142ffed1659c8c8ec89995ec159e34936d27465eac0974fd319f270aab62c5be460310a6a3356842927cf02fbc8fbd7
+EBUILD ki18n-5.51.0.ebuild 681 BLAKE2B d2bc3c0eddffb4b594c34d1b9ee75435626ee0f1cc25555efa11870740a2027c77f9e00651738a9fffcf4f313995b51e43905269b805c55dd231230bfc045e0e SHA512 f45b8922fbb07581f399db049700b532213f359118ff5a4637d996a076929d246fdc9d1f8033128ad6b3bfbf51f1f13aed54e58ba4e9b4725e99a7a8fc376843
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/ki18n/ki18n-5.46.0.ebuild b/kde-frameworks/ki18n/ki18n-5.46.0.ebuild
deleted file mode 100644
index 8c2d96bdc2ed..000000000000
--- a/kde-frameworks/ki18n/ki18n-5.46.0.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
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit kde5 python-single-r1
-
-DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(add_qt_dep qtscript)
-	sys-devel/gettext
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(add_qt_dep qtconcurrent)
-		$(add_qt_dep qtdeclarative)
-	)
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	kde5_src_configure
-}
diff --git a/kde-frameworks/ki18n/ki18n-5.50.0.ebuild b/kde-frameworks/ki18n/ki18n-5.50.0.ebuild
index 947470653889..3a867f3c9d95 100644
--- a/kde-frameworks/ki18n/ki18n-5.50.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5 python-single-r1
 
 DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-frameworks/ki18n/ki18n-5.51.0.ebuild b/kde-frameworks/ki18n/ki18n-5.51.0.ebuild
new file mode 100644
index 000000000000..6e63b66ca3a4
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.51.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(add_qt_dep qtdeclarative)
+	sys-devel/gettext
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 2f946602feae..45f9d99c0b87 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,5 @@
-DIST kiconthemes-5.46.0.tar.xz 206148 BLAKE2B f0d8e67a68d84ea14951ce3b24b071fc99c79d33c4dc62555e5a5d03e21205607ef1be716b451b43cd88cb87c9f5403da91fae4f78a9751bc5c3e05fabc627f7 SHA512 528d525f090cc2b83029bf68b2290a6b33ca9d69a0d74f234b775fcd23fb0558e34b3e270ab676d4acf24a4b0641d4e24b1f32bf9aaac4f70e2182387a4c2415
 DIST kiconthemes-5.50.0.tar.xz 207332 BLAKE2B a68645f27f12bc27af45b663188024ccff7a99a0e0abe5d2ee72de9e787217bd6f73214f8baccfea6b2c6d5f6ee9ee00cdbfb3d83c905c2b508ea0ccae423a31 SHA512 b5fae1e7f8f6881e963ab9afd4d25988f8df98443f3bd526a67e4ca7c390dc4be0be4564e26dfbf6b10c15dcbada70adec60b383463b142dd7f6d2df77b885d9
-EBUILD kiconthemes-5.46.0.ebuild 664 BLAKE2B e4edbcaf3568e250ee001d7d7d5d114f35a29507baddd566964421325bd42d88c940004358bf6703d91a9c0a7ffb0c30b76662bc05be2658501dcba0a7c4864a SHA512 18792de1968e7f6846f913080c095715a4c8ea63544a49d086815e9f7b2e2178b2428b7d2d37489b9663b1a8b51318aa740dbfbfe7c7c1ace1ef13e9ce3fd49e
-EBUILD kiconthemes-5.50.0.ebuild 666 BLAKE2B b81137fc0da34c533d40972777bec6c5bfe5960b0a6b1be72b73e0c4c8cdcd65e388f0e2ca148d6639cc5dc4a1f214a665f321b6c7cf9830a6127241365f2874 SHA512 70ff3a80b3ee5afc0efd42c15c6a4a862c5ed191323eb1b075a4ca1794b6bfdf129de4b4485a580aef52e582fb24c31f615bfbbe24e9a9beb301802ccee0db43
+DIST kiconthemes-5.51.0.tar.xz 207364 BLAKE2B 83852489f43f662b7a7a0c739bcb7be97039ba935de41829a6508585f81d6fe9aab78fbf34e1208ed274e38897f2445618977d5e3e1ba5203aa104394c0d2f22 SHA512 3e71bc474d920eb31b37d8acb5360327e5676686d98e0f55251cfddba33c833547a330961e9479d6d6e1ac86bd631101c61d58ca865fa3f17b5a363ded939847
+EBUILD kiconthemes-5.50.0.ebuild 661 BLAKE2B fc1662b7447771626dc0a4afe325ba2152affee3821fd0263a2251201366933c9b6bf87c603ac92d5aa4ff1384100c9d6f0f755f27491e1148bd90d29eaf9cad SHA512 4395441c932c18ba05d4b2f58202a9f406a1cf1b96189b59e5650e1ed2a6e4a3553024b0ece376a2255475b05a64eab6108f2d9934cb19daa5a08499b7a82f3a
+EBUILD kiconthemes-5.51.0.ebuild 663 BLAKE2B 90140183f4a5284a1da13b6b4c4d130933cb6a8dd0e3ecdd921cb45ef2bbb41327a05d87b4957cc06a0b75646aacb6cbce1b7b23f00a3071d8ba59d5dec06bbd SHA512 7117d5445e6753d4ca7b191a7ae4637a167d91637648b2dd1bfe6442008850b70abcc1d2ae2c298e746c6565d646543b94f46d9cf1d68d865446dd29740976b7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.46.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.46.0.ebuild
deleted file mode 100644
index 5824a175b1a5..000000000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.46.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=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for icon theming and configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT+=" test" # bug 574770
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.50.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.50.0.ebuild
index 56a0ecb3948b..c2328558da2d 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.50.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for icon theming and configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.51.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.51.0.ebuild
new file mode 100644
index 000000000000..da8d2b7f06a4
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.51.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test" # bug 574770
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 5a5e29b0d66a..3abaed8353fc 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,5 @@
-DIST kidletime-5.46.0.tar.xz 26580 BLAKE2B 4d14fde1f56dbb26dfbc3a5cd8920fc44c1ad6fc31e8c987332d24c6815964c8561285f097622378c4fdd5f8bdd949c0298cf3aeaa99c97cd855c1e90bb201fa SHA512 43994cf09ce659d7f5e2b0d77b4b97631e7c7e87a8ded21a626a5e16ba9c3101fd1c9ab120756fea170f7024e5fa5141e583e51f032f4def4674c209fc6b759f
 DIST kidletime-5.50.0.tar.xz 26568 BLAKE2B 805b0b5f7879220a98c6e99db4cb290f9b4c6786909235e8f0139cd51e82eb0c7dad931abc170e2bee1e00cb163e171ef8b3451afe6915318f0c0640b0b7a651 SHA512 825d7b509c8bca1042b453d600165574c72d684a07159e9eea436e37c720ff2f40c165075d7c9d076689f1f25c75d5e20779e25a29b069ed25339fd83e9baef8
-EBUILD kidletime-5.46.0.ebuild 854 BLAKE2B fbc02277a3b48333a7e5347d5eba854403db624b9316fc57c52dc0d866e1f5f6a1ebe770143247a813060f631f5607bd31589c4aa7d6709b3c81bc986bec6c1e SHA512 d18f98adc1454ed1efb0207e69c50067a082c4a969ddbc10401ed8e25556f91627155c1789aca74025d56d8834c07bd7366417ffa7626be8d8c6318dced536d4
-EBUILD kidletime-5.50.0.ebuild 856 BLAKE2B 076ebc288a1213b71be7e0cc9e51affd2b625ab9b8bb652cf1be7c75b152b6196af8adeda80dd63ca0f62a9e58d7b1aadc835612dff96c9d2a291a4836b770db SHA512 3b0eb427def2739b46eac981d09d498e719bf237c7bf78dd5ce42d3112014011c909b80848dafb17c1d2cec9a8350e02359f66207cca0020caf2900a5efe5d85
+DIST kidletime-5.51.0.tar.xz 26584 BLAKE2B 718b537986080b10dbe438d9b47647ecd1f4304e9db6a79ef985705a8177f4c41dfd2f9519b25c182efb5b01f42d7a8c16f2db3b36c1cf2b29dac4a9c58f980f SHA512 5568ca77a774b780aa68ec320ee4d339c5ec4696db8233f5297772259f11967a929028d4a4a0777c68250bdc3c86f31eea627ae56749c9a8201e6dd8cfb0e207
+EBUILD kidletime-5.50.0.ebuild 851 BLAKE2B 1ace47f031eaebb4e6d2718fe3395e2e87d1a14764289c04acfa3f403a009298e3f3b30a6fef028b966332a36653c58c958a676055b1c582718eb6d938649c86 SHA512 024b21592cd134e3a73c5e24c0481d24ca9a7a3eeaa723c871e9e1c664e63e592dcbe9707c8975067f216ddcd02d1f82aaf77869c5151452f5cd40453e82306c
+EBUILD kidletime-5.51.0.ebuild 853 BLAKE2B d487e2a6856324c47991d8c94f2bcd4b7ea484dc32b4f4c0081a74dfd26330ac8e06b3423f4e3beec89f9e0e1652d28abd485e80e4e78d92a1d67c2be3ef11b9 SHA512 b6e1b4bc56ff53fa8a23d00ccd6d526a45233e87006d7e7fa8295b2e43db73327eb34980a146c5a61d3e7f5b720fa160a74cbf3b5e88781285032187b03dc9eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/kidletime-5.46.0.ebuild b/kde-frameworks/kidletime/kidletime-5.46.0.ebuild
deleted file mode 100644
index b125a74775cf..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.46.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=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="X xscreensaver"
-
-REQUIRED_USE="xscreensaver? ( X )"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libXext
-	)
-	xscreensaver? (
-		$(add_qt_dep qtdbus)
-		x11-libs/libXScrnSaver
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-	if ! use xscreensaver; then
-		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kidletime/kidletime-5.50.0.ebuild b/kde-frameworks/kidletime/kidletime-5.50.0.ebuild
index 10865cb9fe0d..c11448ef123f 100644
--- a/kde-frameworks/kidletime/kidletime-5.50.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for detection and notification of device idle time"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"
diff --git a/kde-frameworks/kidletime/kidletime-5.51.0.ebuild b/kde-frameworks/kidletime/kidletime-5.51.0.ebuild
new file mode 100644
index 000000000000..ebd582058694
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.51.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X xscreensaver"
+
+REQUIRED_USE="xscreensaver? ( X )"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXext
+	)
+	xscreensaver? (
+		$(add_qt_dep qtdbus)
+		x11-libs/libXScrnSaver
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+	if ! use xscreensaver; then
+		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index e5041cba31ee..c57baa7c8615 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
-DIST kimageformats-5.46.0.tar.xz 204672 BLAKE2B bf4bd63fab7990e17ee6e189bbd48a184ed7372afacc2ecadda4b47213a38f2ea65c5342215b51d8e81012fb0f392f9eaee833c7835149b08f9eaa417d0413c1 SHA512 89d4463ec202aeb6fbcd36d62db54461e76f1492cc0410ea5f41163c9ddc5b33204ed06ab730a755b92c53d08ef2964d1bbf510a2231bb478e33b6671f61499e
 DIST kimageformats-5.50.0.tar.xz 204420 BLAKE2B 9738f0bd4853e37ff2d15e4cce14c602b36f81fa3cf207fb76ea5b739bc920bac241f45e08adb53e2322eedac35c5cca10a400a1ae8f7dad3ae03c6f74d110b8 SHA512 d72bf03fe11ec3761b31ec4b92ae601de8106b72b9db0c3399fb4f2b2cc97e7d168c5b0aecc87221fc1319e309c1a9055be87989445dd1ee466fba8c4e1e720c
-EBUILD kimageformats-5.46.0.ebuild 821 BLAKE2B 5e7ad4c063c93df8a630afb27c8a4cf9fa2c5a60f2aa1c5b76e7e8461bd7e4a35c84c1d5579899ada8c1a1f3da3400e737967b36696a767adf399b9762e73ffc SHA512 d534c53fd64f9c2bf64875ac55f48cbd76685a5994b107f5c2fa86bdb0c3b8c90113955056b0205425fbcf0f50c07c8604508e3a758fceffa8d0837b9ac7fc34
-EBUILD kimageformats-5.50.0.ebuild 823 BLAKE2B 52f107d523a5282b9fe789a32272bb6f7332de3dfeb6df1049be1e3707b01a9cacf160faa0a5c2f4fa864aea566468e262890f19b0b72b2ab31c4e26b009bc96 SHA512 dffd40ab0d806c60e06d743cbb5ff2529f4bbcee3e17dbfb3053049582de43cf28e2bd861e5d465ba58594d20394de1d619c594eed05ed4167e600f21f7ed2dd
+DIST kimageformats-5.51.0.tar.xz 204524 BLAKE2B 3e1151fd72a7161b67757946d0f2110f6fc606d2891fa76c278cc5d1ba8e1d5a0983c07561e2f43db4b96e4c2ede95a341ec1854ba6bbd0bea03575bf13ccf09 SHA512 a379ee280951af1755dd75e9cf0c7a1c3cf25cad1a2c5e92fdda5cf8c3eef52cd738f2ed3f7073e6fef73c78b14fafb0d642281a8373decbb36bfba02963cbf7
+EBUILD kimageformats-5.50.0.ebuild 818 BLAKE2B 9fee398a8a0e2d7f879c082e1c07605a19dc192fc66b57aaf11c47e93f25d96fd61ed90214cb3a81131d5fd4c3018a0c75b76c78fb9528977e06b4a107e698e6 SHA512 89b6e249386671ffaac0c585b8048e16d916afa7ff69395d16deece4fef74f9b4ea4ca1f77a4569447191ff93fb88aed9125bd0fead120be38dd6b393bfd3191
+EBUILD kimageformats-5.51.0.ebuild 820 BLAKE2B 7696866c627ef34d6abb6f0d91b4f5a499cae9292fe58a81e355523a60424cb20ab2764eb7c9e1074eb417ecde460114b52a050bda9316a9b741a200c0e3b225 SHA512 e8269743c272f006ce2573d230a711c673aeeaa2c5307958a9542017d2332ac33db8dcb275f97699471cb432eaf370069be20b688cb1475d5766d60b8afd3802
 MISC metadata.xml 327 BLAKE2B 830c0a5e6689cfb881f6c878199b45716bf683fabe3ef6cbe51c757efcb057ad253912930b1637d958e26dbe0072ed25fca3051b752084a634dab1d1f34c7e6e SHA512 269908d4ff42e80fcb50a3a3b9ab6caceed1068edb2469f3de5563b5505f8053c14c698299383686c752a3b43097d3eccbfbde7f0d41684e5270bb2281a24d69
diff --git a/kde-frameworks/kimageformats/kimageformats-5.46.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.46.0.ebuild
deleted file mode 100644
index 6ae925735acc..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.46.0.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_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="eps openexr"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_qt_dep qtgui)
-	eps? ( $(add_qt_dep qtprintsupport) )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package eps Qt5PrintSupport)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# bug: 634426
-	local myctestargs=( -E "(kimageformats-read-xcf)" )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kimageformats/kimageformats-5.50.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.50.0.ebuild
index ef8d50d880dc..b5a4f44e78d3 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.50.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="eps openexr"
 
 RDEPEND="
diff --git a/kde-frameworks/kimageformats/kimageformats-5.51.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.51.0.ebuild
new file mode 100644
index 000000000000..cedd0351fb73
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.51.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="eps openexr"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_qt_dep qtgui)
+	eps? ( $(add_qt_dep qtprintsupport) )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package eps Qt5PrintSupport)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# bug: 634426
+	local myctestargs=( -E "(kimageformats-read-xcf)" )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index ba60b80a53a3..2f367b9f39ac 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
-DIST kinit-5.46.0.tar.xz 120444 BLAKE2B 8be3ae4588ac5f940552c231788ff79c06850e24540c5f74fba04a9cabbf50014218138e2502bd44f25a461920cb3ec996d849dd4bd987884da6f2801aa572f5 SHA512 49fae94921ef7492714201951eb18c37a01d53bd4e22a7ce265118f1a1f62fbd6a0768f5f9568e12e67f8d69198969843e93fc79fe406ab35eb91cf45a169832
 DIST kinit-5.50.0.tar.xz 120384 BLAKE2B 47feeb47ba030940e82a8e13a84ca6313b45a47a19c9bde528027869e94773336e051ef0452b76c52142eb2ddcc596fde6e0f5787932aedd3fcaf7c952fab47f SHA512 8b0187f0e7d67b1d6b5d773cd651ae438291ea2a801fb05292811e7b109afee62c4166953b09f6c1c958690c2b9a3c769d005f3ae008513eaf2eac933e1a8a63
-EBUILD kinit-5.46.0.ebuild 1001 BLAKE2B e95522f1dcd5b050eb68bf8483158c131fcd358ebb36a8ef8e7ae388da2d327ce97773e8a547602eb0338f44a3d03a8648fe51462a3e7a43c2071473afffa2ec SHA512 66cac38b67b452797f2febbb8780dc3653faf807feccafa20976edbedadb00e2d797e5c8835a7c6afc342bb74effa2b39415e7432a271bb14a3a857c77fc9b16
-EBUILD kinit-5.50.0.ebuild 1003 BLAKE2B 7ab6732d4dff95d91f1e23426498ab0aa6c8ac27ec7a2b7acba6a35567bda30a9bda4dd45ff86cb090e0cfc1e9603d32a8972330e2a2a92b65a4444d52da0d94 SHA512 7263610a0730c650b5046c908fc4e4680210e69e0774f9e857da283b552b475421c0910873051303dcee9602c0942b7077a67726f194757fb08b4b7e3124f38d
+DIST kinit-5.51.0.tar.xz 120452 BLAKE2B ee9a90e73e60ddca45e7530d1b00a1a5a1e578c09b340f36c2ff4562b78f07a15a66427e1f2633e1ed023afd8a33da1af091a7aed19799c05c07d395b7f190d5 SHA512 b9cdb1181528ef3ed3d497ec7c4a433d60796bb152215859ef950c5294b2bc2586e1d57cd735d01f62ff4c9be6b2b8b965dd0073dfb3f375bcf8902283f79bea
+EBUILD kinit-5.50.0.ebuild 998 BLAKE2B ccd30cf750d176e49f0c7ffaa894be38816c7fd8e11a4487b233067298811d6c46eee18b23d22c946ae64365fa8fc7ab9dea0a26e162c83d3bf074d6713dd933 SHA512 e870751ae3e985a8ba808dc7c94466549bf79846d2b46260373ca80f9205ddcd808e9aafb76fe9d76ce0197b5fe98072f05f2c57ba4088371548b6e9b3df05bd
+EBUILD kinit-5.51.0.ebuild 1000 BLAKE2B 52fe5fb735917df24b803cb897b1d15e8ffc9536342b1f7997eacbfe6185caead4df71aeed4c74666a7334c4937066c1909ea471f41137811e55bd8047567011 SHA512 2dc2d1b033af572991fed2942d4e3e4761b1f5054a11f76b9bb9d63d88bd0e8e4f92faaa31bd732785a6efc956e7d3368f6551f326ac4f31bfe65ce96c801dab
 MISC metadata.xml 412 BLAKE2B 8029572bd77c6a7381c5fdce9d864c05616c1da9144e61385936a6678cc94f2279be1b551c148fcea8b58f98ce704521c0f02f3b7ad0f9b41a4ebd3dd7c469bb SHA512 f5e7eea56365a00dee0fd4983e10b7cb5a0ec42f68eff735778d69f59499f7b5f59289429a59e7ef6e2afa8a830261782f4e86db229224e442c8d83dcc1e635a
diff --git a/kde-frameworks/kinit/kinit-5.46.0.ebuild b/kde-frameworks/kinit/kinit-5.46.0.ebuild
deleted file mode 100644
index 6552f1cc0aaa..000000000000
--- a/kde-frameworks/kinit/kinit-5.46.0.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_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+caps +man X"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	caps? ( sys-libs/libcap )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-		$(cmake-utils_use_find_package man KF5DocTools)
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kinit/kinit-5.50.0.ebuild b/kde-frameworks/kinit/kinit-5.50.0.ebuild
index cad125a89a96..f7fb0b97f5d3 100644
--- a/kde-frameworks/kinit/kinit-5.50.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+caps +man X"
 
 RDEPEND="
diff --git a/kde-frameworks/kinit/kinit-5.51.0.ebuild b/kde-frameworks/kinit/kinit-5.51.0.ebuild
new file mode 100644
index 000000000000..92301f9b5f00
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.51.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+caps +man X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	caps? ( sys-libs/libcap )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+		$(cmake-utils_use_find_package man KF5DocTools)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 62609a87725d..c8afe78dfeb1 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,5 +1,5 @@
-DIST kio-5.46.0.tar.xz 3148600 BLAKE2B 0590d6315fc6fa3a85d016ddd2960925593dde4532de31b6f80b734e1ede2eb0de9292a6097e1d6275cab2623c6816575d1fce3d6893ae433f547f379da2c30c SHA512 64ea3c5cd27990a03f693eb6add5a9d148f16ef5c4b4e4e7118fe841258f2b8d4062697a9922cfabb3ac84d015e1fcc4e342bcce91fc80e55027cc7f8d8c78d9
 DIST kio-5.50.0.tar.xz 3166632 BLAKE2B e8446d91c6e45d9e7f256e54d1208e71244ab4bb37838e22e6c8994fbfe1302d7ca68988fc17e706fdf4dbb897aa2279564f1dc2a9e0ecf06441ec8b58fe94e0 SHA512 18a6e4b1d2fb71b16aa4b08862fe0abea691c4f60d4fccc316c654455786a705cc94232b5bcffdb6ea39917722f237d0de00e9ea22273c26e7c3a0282148244a
-EBUILD kio-5.46.0.ebuild 1926 BLAKE2B 3a206eb2b52652fdbc9601c559a2350b980d8b2fb88062dd2928dff8de7736cd679c4a7a145a05c75ccc3b92c75370918d12422a6b8ff0a7c0747678dece9f35 SHA512 33cb2460205e350c1058732064c53eaf0eed72aaf4aa972b0416c04b2360bce664ab03e4cea60c6ec37c999f90244926943d5d3415e3ea4c97fdfcd94fec5e79
-EBUILD kio-5.50.0.ebuild 1928 BLAKE2B d6dac00f93369929a7d2ea1bb8ecec7ae564918ef4ba8bfcf7cf5aa5a2477f2d518f0adbff76bba0c592d4b7e008338408af8652836f81e0c1292795cdf4f543 SHA512 397e71231fda9f9b855635d962b4cd0277cc7b0b88648455c9960cf15474175725bc47e72aea3cd7cd60800e74d44d1d8bc7745ae52a355f31d19b6f67ad5f83
+DIST kio-5.51.0.tar.xz 3166752 BLAKE2B 488c4af4c026ede3876b41308dc3b19fa2b4286d8e48c20fd74b50ea45498b8602104df504a121b6eda1c80740d37afe171d2f13c18eb7bdc08d9824f1d5dfe8 SHA512 f723030a0d60f9e2532a07a34e9bd1e88230b929464e759d9382011995e3704bf5edbfd47dd929e9029937e4315e887049ce692a299d13c2a8e48e167fd24dd6
+EBUILD kio-5.50.0.ebuild 1923 BLAKE2B ca8f455c856d2561d4c46734342b75dd71e4d439f26395b3358fa8d7c18339406cda4197b27961b39948f4dadd2c322e9c14107f93882dfa4166f5f103c0d59e SHA512 620507ebcac92ee183d18069f021134ceea84729b07cb7a64214556e60e13a2f275b3babf76b7b3f1678b03466e6887a50165d07aab07aaf1f6f0be5ada9a7cd
+EBUILD kio-5.51.0.ebuild 1955 BLAKE2B f1d5fdf44f0a9b845d24f8e49a6817ea34c6328242481900f1ccb3578b3f3cf75e2527cc36d4823b93c9cb043d7e153eaa8dee301130bd0f4f966a2a2619ac90 SHA512 13ca85fe2e6a7e98537ff7c5d781762b96eeb8411e3460b62c48d12fe31ca743012675635ca9319c6eaa5a51ef341fbe6f201eb93e6507ef239af6726b843b7e
 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820
diff --git a/kde-frameworks/kio/kio-5.46.0.ebuild b/kde-frameworks/kio/kio-5.46.0.ebuild
deleted file mode 100644
index 00c5c33ede28..000000000000
--- a/kde-frameworks/kio/kio-5.46.0.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
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing transparent file and data management"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? ( $(add_frameworks_dep kdoctools) )
-	kerberos? ( virtual/krb5 )
-	kwallet? ( $(add_frameworks_dep kwallet) )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	test? ( sys-libs/zlib )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-	)
-"
-PDEPEND="
-	$(add_frameworks_dep kded)
-"
-
-# tests hang
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package acl ACL)
-		$(cmake-utils_use_find_package handbook KF5DocTools)
-		$(cmake-utils_use_find_package kerberos GSSAPI)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kio/kio-5.50.0.ebuild b/kde-frameworks/kio/kio-5.50.0.ebuild
index 1ec1b73cee23..1b1ff7673b16 100644
--- a/kde-frameworks/kio/kio-5.50.0.ebuild
+++ b/kde-frameworks/kio/kio-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 RDEPEND="
diff --git a/kde-frameworks/kio/kio-5.51.0.ebuild b/kde-frameworks/kio/kio-5.51.0.ebuild
new file mode 100644
index 000000000000..4761d3d08623
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.51.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( $(add_frameworks_dep kdoctools) )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( $(add_frameworks_dep kwallet) )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND="
+	$(add_frameworks_dep kded)
+"
+
+# tests hang
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package acl ACL)
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+		$(cmake-utils_use_find_package kerberos GSSAPI)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index bdbc13204840..8e853eeb823f 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,5 @@
-DIST kirigami2-5.46.0.tar.xz 316028 BLAKE2B 89673cce2423d98e9c7d80dbee487aa001de65ef32b984f0394b442f2dcb4ab84ad5e58df76affe47f4dbec6ef165a148d67cc66461e894bea648d4345e15c9b SHA512 06adddbe7db2c734707ba2d121b3fd9f5fb36a9fe38c9af926d051efb52158f7b970eebc06b1f23c8ff7af936a8f8c210b1beb5e384207a29915e872d4a2de8b
 DIST kirigami2-5.50.0.tar.xz 119288 BLAKE2B db181e0a4b8061b3b25505bbe76dc97a642d6c500b5de919b559f45e277fa4b46e171942a7d468d5fbef1d9ff1aedbc539d6ca01af21c1fb0ac102883fe474b2 SHA512 f43b9c0adf35ece8153334cc4f66c3d6e30f5603f9a29b8b54eb358c14f98124838a19a1073b17cd3e00975963782cfff664d811171a7f58238a49c84c7faec8
-EBUILD kirigami-5.46.0-r1.ebuild 933 BLAKE2B 561bd233a9e94d585c5c79f52ffc243a523736dc4b39a26731394039a32197661f9679f95ee7a76076a06247be3d5211ee4386fb55bd84cfb4b58bd54e256f48 SHA512 e937f977fae02bf5091b7760251cb136a05fce439d2149653a533995b46df96707f3c893521f08c667645ae39ae299b1ae5f72f7fa1a26332adfe332c3b911c1
-EBUILD kirigami-5.50.0.ebuild 931 BLAKE2B cce782cfebc87cfd92f988d36f6578f07dc4eeccbbd13b40c2af1bc018e19ec26fc206e9eb179d7e712afbe8e0ba5148f3af4a33ff3e68bdbce954f63e9b5586 SHA512 d912d50311aaec847be7ffdf0f94422248d9ea659938afc57f509a691eeac66bfe20353c724609b340d1eee9d3cb6eb2477f9a75798a912d8366fdca47747846
+DIST kirigami2-5.51.0.tar.xz 120452 BLAKE2B b2d616bffd69d3ce6d23c0761a247061beb73f713747934e11f0dea5e818d260b4f8061f66ce83bb068c499eec2fd31b4680a5506d29ff8b6d60e39cb944195b SHA512 59bcfea4db777440f0892925dfc131f20fe99cfc753f89804933c4865ef0ddbd0e883ed2a547aa626ac7949d77c4b474a78f9cd5fbab2a48eca9d230496cc0dc
+EBUILD kirigami-5.50.0.ebuild 926 BLAKE2B e513bb1b5916895125cf41cb5261829ef11027628c938c3b78ff37c6ad1eb7b62d05d7c83f2672fd8929c13e7ff82429d33c8a5d7ad60b7f3c5877351ab071fe SHA512 c40993cc6f2074c3e5333cc6e3f66ce26039ad46fd26d827386014ecc5ef9dd7973dc3281a6c6d3b048dc3badda83c7a9ebabb0ff82dcf95a9e7721b3a1d7f66
+EBUILD kirigami-5.51.0.ebuild 928 BLAKE2B 4a19edb99a477a9b7b865f2a351c614f6152a1be807e9610552d7559f819e38fcbcb8acc337a1d636e07f396caad45f0fe2a13aa15922acf4fbe617584088095 SHA512 55112ab5c94fdc44b3e4c0637666b785294b667631f71f57205f587dc498c47a16e19f4aa418e05ba3f76c1afbf46bc488fe83d08a6e365fe201bceaaf9fe6c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.46.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.46.0-r1.ebuild
deleted file mode 100644
index a2de592fad5b..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.46.0-r1.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_EXAMPLES="true"
-KDE_QTHELP="false"
-KDE_TEST="optional"
-KMNAME="${PN}2"
-inherit kde5
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.10.0
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative '' '' '5=')
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtsvg)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-# requires package to already be installed
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kirigami/kirigami-5.50.0.ebuild b/kde-frameworks/kirigami/kirigami-5.50.0.ebuild
index ad65ba9e2fa4..2617e0144d6f 100644
--- a/kde-frameworks/kirigami/kirigami-5.50.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 # drop qtdeclarative subslot operator when QT_MINIMAL >= 5.10.0
diff --git a/kde-frameworks/kirigami/kirigami-5.51.0.ebuild b/kde-frameworks/kirigami/kirigami-5.51.0.ebuild
new file mode 100644
index 000000000000..198723f0a0b2
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.51.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_EXAMPLES="true"
+KDE_QTHELP="false"
+KDE_TEST="true"
+KMNAME="${PN}2"
+inherit kde5
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.10.0
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative '' '' '5=')
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qtsvg)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep linguist-tools)
+"
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index cfcee13858eb..f122a7a3b9f8 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,5 @@
-DIST kitemmodels-5.46.0.tar.xz 390168 BLAKE2B 25d67ebc180ee86d5eba9b0aa5e15c48f8ca7b6c2e7de3ae460c36b031ea22a0120372b15eb9023420054758c44d138dd0c54a171e6e5c700311a6f2e1eacd79 SHA512 c6cd3b2a6289bae1599a05ce6fbc478903df1eac28dbac7424f25eb2cbec73d470a3384728279cdb83d0767e5a71122d1a897bdffd21037e67bc17cf368bd38e
 DIST kitemmodels-5.50.0.tar.xz 390184 BLAKE2B 859599d133e2cbcfbe93ee295fb347163826dfbbd9f5f84f0e476e682cedd9a9e7c7cfb1a42d7fe2b0109ebc7e5f0310ed6832a12918a9822273bb3c1a80b579 SHA512 1df3636da596a67255ac460658868d83f42955bff8085586a846f8e37d9a6d7ca29daaa96d03d686b9d2ff0647f40e7188c0619e11af6b93de0df627463de0a1
-EBUILD kitemmodels-5.46.0.ebuild 353 BLAKE2B f5362f9866186814733b0d39da75dff449fa50d5f3314bc62dfd0033f375df6acd74b88b93f868254afb5b686fa453132b079dedfcfe340cd106102d53dfc3d9 SHA512 a6109be5a805a4186086d8b9b09cfbe56904e2cca554e3e6b2ad4ea1615dfb6251452816237f4e4a7f332c09b733e5167b62c7bb58a054e534f7321dc16be1bd
-EBUILD kitemmodels-5.50.0.ebuild 355 BLAKE2B 223b251231dfbfd263a5c841288b1ca009c56d0e33dd8ebc3d58d750bcd0e1caf1c7ad75bd300bb0aed47caf4647e0f9f1cdb8cb2ac51a8fcb6f199cdfa38181 SHA512 d492e9cb63eace2d8618e65df7871a787c66725e982d06160bd466fc20dc2a4011e0b697a86792560f08792f923d712e6b741c7a6c3ee3efeb938aab50d79ba9
+DIST kitemmodels-5.51.0.tar.xz 390244 BLAKE2B 67fdf692416b7a1b233390638b131dc9cbb051a87cfd801e8776a64ce517d1169933ea1dba640c7101c60d8f8b5f861ac1d4e8c5ecbd798edbf3c5bfaf290d5d SHA512 e5b6cdd64e6252fd62c1bdb017f67c27aed29f01effebec0a8e2f98229ffd45f97411001ecbec2f3a36e14957d8c94e568bfbb0b428124f9950c1b83b9032317
+EBUILD kitemmodels-5.50.0.ebuild 350 BLAKE2B a769fd2d0074c18bfa41734dfb5ce0d9a3b1b8eac30bc2f0318b72c37ff892edfae6d59ee45267960c5703f724955f43d92a0bb09badfc51cbfee53147c9517f SHA512 3ad9a064d01a71e7fa34f5c1f454ff181ecd8646c7111225a3ed29c1cc59d3af4dc8596024615c5c7b1c357ee07344b56ba8ef5bd1b3197ff051652059ce137e
+EBUILD kitemmodels-5.51.0.ebuild 352 BLAKE2B 933b7434e51f433f24eebcd4d26567ba83c0c9954123b3f1ac89d46651d38b589a558127ce0d4beb770ff724dfb5e9835e9f83e687625e4a5ee7b78cd0bcae01 SHA512 83319266e1a9ec8dcf5882b288f7682ebec3a1d32ed01b1d698bf59721da1b1223f35b568234e94d8ad669f8b50beb3ca6166106fe272a67fa6486ad06c48eb9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.46.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.46.0.ebuild
deleted file mode 100644
index e5798aaf579c..000000000000
--- a/kde-frameworks/kitemmodels/kitemmodels-5.46.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="test? ( $(add_qt_dep qtwidgets) )"
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.50.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.50.0.ebuild
index 90d5d027232c..357cedf5127c 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.50.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="test? ( $(add_qt_dep qtwidgets) )"
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.51.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.51.0.ebuild
new file mode 100644
index 000000000000..d234c9c9b5bc
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.51.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="test? ( $(add_qt_dep qtwidgets) )"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 8c30f71707f2..47a1b49d2e9d 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,5 @@
-DIST kitemviews-5.46.0.tar.xz 75052 BLAKE2B b8d702859a080c1ec4f6d0b590c34394d0bb0307755761c522a4e85fc76b99922691f4bbeba28660ddb90f7e148388cbe4ae005a42d6da28ccc6b2b8f4da86e4 SHA512 628a3e1c7b5c854a91fd23dc14130d5b430d79af0015181b74f104278c348b55a43622566a28d1bf83345de56c0684a06877211c3956281abec2254b42d03a92
 DIST kitemviews-5.50.0.tar.xz 75184 BLAKE2B 3292717bcce3048936ef34e73c0c601346821396044f0bd35eb57b55467d22e8637cf2c4399c5eb0c811c6e522b32392ddbec8968ce59c7c4284618b40d84f12 SHA512 e2e1fbccde1f7f9aa4cbb6feb175aff3055621cd39e5aed60d6cdbc807cea2763e35847825a70f310276335ee37eacc066ede5d297fe58fe19d33fec094ac121
-EBUILD kitemviews-5.46.0.ebuild 405 BLAKE2B 853e0ae32b2f7cb5b543be947fa5576b81563fb8c7599215feca55e72f01843ebca7471bdf5ee43d7587d29084fec81f875cf7a289b046b9e2a277a326bb1372 SHA512 72304ad4554173575233a80adea88eba8da51f7431ef1d73989263b32501d6fdb62e8d426963bf8f5df43045d11da9380fd08f4a5b4a3a7c4cc27561fc2b7b7b
-EBUILD kitemviews-5.50.0.ebuild 407 BLAKE2B 271b01263fd70e1169e8121a6a90dbde0168290157e2a8767b01587e329293c1efe77ba0d3abeaced58a05390cb56d02ebf8855a1c731a9a0d83e3fe531791e6 SHA512 aee015e8588d94ba13b9782217c95b05d95c416537034ff3b2957b4faceced6206a32e7dba3bf21116782dc4d00e13e6a6b3967dc9fddf8083ac1f3742cb7d80
+DIST kitemviews-5.51.0.tar.xz 75172 BLAKE2B 1e191275a7630f3702f6783388e1d710b86ce136c4172ff0ab520ec3f3c367e502293f3f31a49694361dfbb3f2e917a9cb6eea68751a75e67059d03c8d74e902 SHA512 a73436c9912df2ae6d7947b734805560318ff21fd277a4699fb49b76f2f88100192c7dbe71ec07db0ac2306ea46ecd7d1645bc92905ad0c4c0fbae156d0fe50a
+EBUILD kitemviews-5.50.0.ebuild 402 BLAKE2B 4c953adc32048b7173ae143b6670c91eafb19b8c792980869cf19d720e81c2b1445aa83cca6c2db44dca7ef464c556cfb0053d7c5b150251f4c45fde31bfa4c6 SHA512 1d7a2a44a46a758badb61c0df9a2d134a57282a607e0bb0769e014cca6f60510ebdda6496f09c71509d2cabf1cac83092c4a301fa8c977ef3904101e96eb22e6
+EBUILD kitemviews-5.51.0.ebuild 404 BLAKE2B 28ded3b075c2b1a30f16be601d8f7f5e657c430c2a7c8d2638bbc9f317b343be09b447e7df534493867805c71e47bfc0a7a7736fc68148aa2c54c6da51311351 SHA512 b0da8e4e3954356c72b5fcb8fdeed854250bd943110db59f061a58e440a85e5cb1274b39433c3c75687b7b19919ee71e2aef1d247066ff6ac08d9ffe3db97a02
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kitemviews/kitemviews-5.46.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.46.0.ebuild
deleted file mode 100644
index a24457989834..000000000000
--- a/kde-frameworks/kitemviews/kitemviews-5.46.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing additional widgets for item models"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kitemviews/kitemviews-5.50.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.50.0.ebuild
index 029a533f9ea9..1b272e51fe9b 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.50.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing additional widgets for item models"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/kitemviews/kitemviews-5.51.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.51.0.ebuild
new file mode 100644
index 000000000000..09430fe414a6
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.51.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional widgets for item models"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 8cdca33dbc03..9f0494f06dd9 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
-DIST kjobwidgets-5.46.0.tar.xz 87576 BLAKE2B 478d2f16173894317b924b395eea6ae54505b9ae6c12e9bc74691d9d262632cda1f5ed6f60987958393cdd29317711b8e46ae7cccbeaa42f3f1b3ed43a835478 SHA512 3c9b7812e11daef2857cdd6d32d5db743f1c661261cbc1e5b7b14745c47931f5853a05cf0548df8b154dd07404fe69df40c60af92f9e699fd37ffc62fa5a9daa
 DIST kjobwidgets-5.50.0.tar.xz 87596 BLAKE2B b34922f5df48a12ebcd2c1173e3dae9dc20c72b56fd857e7b2c3dd5bfff41fed4af445a39e2ccf780dd2e7023029e9db7ceb0203bc30209b5f22fd0e8aeaeee3 SHA512 9f8af0073912311fe6572606682f56952736d7cb3218646a6086c5830003dff0aa4f13d3fd59a1617d393d17d14abc6bb4f9762822e423373252cf6b6d0fbc8f
-EBUILD kjobwidgets-5.46.0.ebuild 681 BLAKE2B 9c3f6ad54fcea3ed2acc2aabd0f87b68279abc30ca37d8f7ff19bc6303864256890e3a90ad4f5c3111a7a405de4da8294d199ba35530826055f52d9e60b1351c SHA512 8d962038518a2c610f4c3abc81b2b1556152650272c62763ba60eb57fc5fe0bf6b67d9db30ba0768ec9b496d42890a50941cef1d40eec417bbb2921e8b239af4
-EBUILD kjobwidgets-5.50.0.ebuild 683 BLAKE2B 0b8c1cd8ebb6447f32df846ad1cd06fb46d1e490798f6a1e18eff539d0bb71cf103b4c701a8c515e13145d009a4c611ba49f32fc5b62a09740364dce4889c5ae SHA512 4ddbb98d9a5b0869027be1b8a625dc04bc0d9a44ca85e1fb8b6ef770803f66da5e75d74fbe5760b2a9b8069071c67a4dbdb798f0bef2505e502a5055f91f7fc2
+DIST kjobwidgets-5.51.0.tar.xz 87644 BLAKE2B 3466aaf564f12fae0a4603ac979811917d082542914e6a82930509bb5b0d7907691893cf620d2ee6ff74071e6544e74cec4889b7ff1b4744c7da7baf407a5c5b SHA512 6821f7f120e998d041bf4f6c3524958c3750f1b3213cf6c338994b0c3676a7c5a0ce9a0555cc76a01d47e72fef06ea4daceecaeb59909816d6d16d1613f6278c
+EBUILD kjobwidgets-5.50.0.ebuild 678 BLAKE2B 2d4fb26fb5506096c19f57fa506b69da3f2836693ce1cababadfcf06a75a0d663b88a7677280ff6f57737e0891b382a1e93dc915d19688093b8c5e2eae2befb8 SHA512 bcb87196226008e64da4429b9fc25eb925ac4b640258cc481662978c1185e06a739f877cee831d233fbdff02cbe84cb299367d18aa77aa6265d879301e9ef115
+EBUILD kjobwidgets-5.51.0.ebuild 680 BLAKE2B fad0972ab9ecf804261c3eb23abb86499730b84007fc780eee37e180d02d72a1ad1952e50cbcf5b0a10c15637ffa92a20f531c04e672ba26df5efd41e3330d59 SHA512 97d1732eadd6a7aeb769787c5e97e318a3fecd19725c56a2a80c2832b281174bb5627abffeb8c65cc594525e5578173791dfd7314759fb3d6c5b486cf7f6cb43
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.46.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.46.0.ebuild
deleted file mode 100644
index 51f0a63fd73f..000000000000
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.46.0.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="Framework providing assorted widgets for showing the progress of jobs"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls X"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.50.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.50.0.ebuild
index c5d00ffcdcd3..dc2fe6c11c38 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.50.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls X"
 
 RDEPEND="
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.51.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.51.0.ebuild
new file mode 100644
index 000000000000..ace56c3273f4
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.51.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index ddaea4bcdeb9..98b390242eca 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,5 @@
-DIST kjs-5.46.0.tar.xz 294872 BLAKE2B 1491e6a83129a05bf83598f7775a5239a02595b65d48d52439a2d27f625096cea7ea1821f9651fdadc820614e40fcd1e496b9a625dcf2a153ffe34d09233f5d7 SHA512 d0b322d7195a67d8b04be47c5ac0354689f44b884cc0eb3df5c32f4ce9dae34bf47fb5681d8444de41de86716bc8b89a98ceb6d4a51438209b6e3e0550c6f78b
 DIST kjs-5.50.0.tar.xz 294884 BLAKE2B a7b7490ce835c08c24382b97d40f8ef38e1d0be4f7554e098cdc16d3b24acadd73f4c4707784fa7734753d117b8006f7a857022e696c7779bb55485c1bf4a712 SHA512 698ef596c03b88a35dba48363034223366e14ae94c805e68d34d913ca9944a1f8c67a3db15c0454e6ea726391b6a120a21d24fdec3ba25c7b2d4480f34da3f37
-EBUILD kjs-5.46.0.ebuild 379 BLAKE2B ad37cbea88699f78343b58787f6869ae79387cbba07dd11259ab629a8bb45a88901558c44613e286dd4c359abbbbf6a4111a2c82b1b65a8410d88b2db789a035 SHA512 c114a54ef935ba3e7338e8a73493ae0fbb5ab72d0a2bf68b34c25abffea0ea5391f9ad8100ea0f783aada9ad7122eedbabead44b67d978eb758d05e5861c273e
-EBUILD kjs-5.50.0.ebuild 381 BLAKE2B ed1c941645ba81ce5bf7c6e6791d3bc151161f80837095ccde5ba2f7789eb6e3ddcf92507bc308d9a0ce02e14fafbc348e5103caac8d670116a1994bdef768a9 SHA512 e3a2d57593ec664b137e20a28c0d67fc9c12b510a1cc5b42b692c035be1b3cd3056f7c2983fd1e5ef95638d31e170be2ce76d7048702aa4f308975608681d39c
+DIST kjs-5.51.0.tar.xz 294920 BLAKE2B 80b2e93b5e504a5ee1feaeeeaef62ac179da6e257620b63fd9b0a52d29d70f71e1012f24568f65889b3432a5e002e9f4cf92f155a01514e5eb83442b07f5085d SHA512 34588e1ec6e9a3288ea5738b5a07fa8eb09caecc5ef56c1d830943a37bb6f2c415ad73c612b592e33f0968636eaeacba446b63011d87e9542c651ca328c3c27f
+EBUILD kjs-5.50.0.ebuild 376 BLAKE2B 133f4c9a82bb04f1ff30303aa0dbc475112e61c619ba4fb7e905647b13a70d07fa043bb8999548afe68469172e720b32bc86ae2e3a3dbd26f1ddfa36feb2ac0e SHA512 830cfc834d170fbf71dc1539e6e42b5b049c6b63a2d88c7615e70ea9eb58c4f80f0e932fb9b977a47c6100182aea23f8a43cefc5d6d33495c3bccc76e13e536c
+EBUILD kjs-5.51.0.ebuild 378 BLAKE2B 140ac15ca60dde35af42bcb105feb7ea1cee010bc6d6ad6ab80828f100d225651dfd556f860292aed57f829b2430661c3a9f536ff410998ada992e5bf2d75260 SHA512 e5a8a986a79535b917b62a426ebb7bcbcccea41b8eb57f5a172c1d3bd19715889fe9f0baf981d555cc54e317e4d0931fb239728b1d0638667387395a13764cd9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjs/kjs-5.46.0.ebuild b/kde-frameworks/kjs/kjs-5.46.0.ebuild
deleted file mode 100644
index 914105dfeb21..000000000000
--- a/kde-frameworks/kjs/kjs-5.46.0.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_HANDBOOK="optional"
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="ECMAScipt compatible parser and engine"
-LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-DOCS=( src/README )
diff --git a/kde-frameworks/kjs/kjs-5.50.0.ebuild b/kde-frameworks/kjs/kjs-5.50.0.ebuild
index 2de6494c7ae5..28845063306e 100644
--- a/kde-frameworks/kjs/kjs-5.50.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="ECMAScipt compatible parser and engine"
 LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kjs/kjs-5.51.0.ebuild b/kde-frameworks/kjs/kjs-5.51.0.ebuild
new file mode 100644
index 000000000000..df0418fa2467
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.51.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 233617d4823b..ad3cae9580d4 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,5 +1,5 @@
-DIST kjsembed-5.46.0.tar.xz 170048 BLAKE2B 1d4819c73778ef564c12610e7de47b49ad92374ca59599bf8b3238512967c61cea2e890d65cb75f53710dd1d57b0ce80d9ab387f55cc0610fa22c81ed25c049e SHA512 f3667dda4d02082c4f4aa4ea47332699eb86a02b35da2599ab9b68f8aea5b9d8ab4262979103f7954dcf5fc76f847b3155d3fc18ea6df2cfd124ef833a554024
 DIST kjsembed-5.50.0.tar.xz 170064 BLAKE2B c70336db3aef1dfc2d61d7d90c545b5810a0dda0f9c5e6ef39c04742d8e64e04b97150bf514ba1a95469f016427007f68c3d92dc24eae222b7b0aebd6598fefa SHA512 2b7a86569217304a0b6a5ebfaa03df000b08e6779be0cfeb4109de8861e6d262b5f415863b831d89eb9992e8bf73d8273572e2838ae1c95be61bbbcc65fbd43d
-EBUILD kjsembed-5.46.0.ebuild 514 BLAKE2B 1ee02acd8aeaf014ec3105a29140b8d23111a2c1720b1512338014c8051fecf8fe1c72e91c1f9e1d92ada97c5ed7373f5820f9cfdb544e4d2ee6f14d3cc8f4b5 SHA512 6eb73cb122f03630a18ac5b75d20e6142ee70742ab787c3558216bb8edf85b659af49c57ea68ce3bf5383038f5398fbcf8c0c5d45eb3f8bbcaefaaee0705808d
-EBUILD kjsembed-5.50.0.ebuild 516 BLAKE2B c12bfffe3d0068d52cb085027d78db1958631c1a053735b5b48b1a261e82e23bbf0e623e4d1a413df8995dd522293dbad325b536bd85b723a9171be2bd710d98 SHA512 deb6f72e46eb7ababa8422778f286ad448beafbea1e318d3c61999f7d4c403511226f472f262611ebe49153c6a631114c63ffacb83f4e4763b1fda98031650d0
+DIST kjsembed-5.51.0.tar.xz 170036 BLAKE2B b40b480e95efb63a2e73c4b3d9c5c10d3d0bf5b06013af04a78b026c79712226e6a437cd141aec1400b1878f33a6838518fb3224446a9d1389823a12f5f0adde SHA512 6d2e17343699737aba1f21dbf63aa4e0e163e843a4dae1c6de2d61db6b081674fdd9932d719ed0022cda2466ec3fbfa44d03528c5b1ef7a46e5dea378ecb414d
+EBUILD kjsembed-5.50.0.ebuild 511 BLAKE2B b844dad119dd692174405646e97ccf6bff0318f86ab5ba474bc1805dc3296fd713572ac0e977b5fbf5e56fb2b7286269ecede4f4d8a4d3a4d96de3cc3fcc40e8 SHA512 6d4ec621af84ed0adb504b5d91b754611938757e3c70214994572e71ddc67de0277df6d74e615e411f8e2dcdbada8709b71f441fd294bf7fff43fc3fe1e30558
+EBUILD kjsembed-5.51.0.ebuild 513 BLAKE2B 19f7578ff64ea02c8187788cf080d0b49ef16d8094e30a4b99ef48390753037a2fc0a7d55f6fcdc405e37668e476e3f49992a3a7fce4dc491676ec1cfc2e21a2 SHA512 48abd914b5ed61f60aceb9f52ce6734169df235675908e9addef13063dc438e9fcf4f985c76e9ef46fcaa149adeff24d597c791c55fdd6908cf06a315b2344e1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjsembed/kjsembed-5.46.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.46.0.ebuild
deleted file mode 100644
index 3ffe812f95fa..000000000000
--- a/kde-frameworks/kjsembed/kjsembed-5.46.0.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="optional"
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework binding JavaScript objects to QObjects"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjs)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep designer)
-"
diff --git a/kde-frameworks/kjsembed/kjsembed-5.50.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.50.0.ebuild
index d92227a6ecb1..61f8ee80b984 100644
--- a/kde-frameworks/kjsembed/kjsembed-5.50.0.ebuild
+++ b/kde-frameworks/kjsembed/kjsembed-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Framework binding JavaScript objects to QObjects"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kjsembed/kjsembed-5.51.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.51.0.ebuild
new file mode 100644
index 000000000000..8d69cb023526
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.51.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kjs)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep designer)
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index 20687a19009e..ea5358085907 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,5 +1,5 @@
-DIST kmediaplayer-5.46.0.tar.xz 9508 BLAKE2B e1f16104150ed9dbad02b7bc136448625512f112f09dca246ebdade33220edc63dff51567754e8dde0d34afca9a8db459981f3ab8fcd544b9a91d01af8d4a45d SHA512 caf2e8e578a48c4bac103755aee2bf20a0156cfbe95dce542250b0e5f15fd777a934d3883d6a0e5c53e378f84fe8bf5795dacfa27f6e324a76c965b4b4beb692
 DIST kmediaplayer-5.50.0.tar.xz 9532 BLAKE2B 068bf01ae14cbf93962a4863142207a483268973fe57d9b3b735275e1313ae182ba687588b3246311da5b84d695e8f51a53f4686f4a7f6fbf318bbff7a926c7f SHA512 20307ad83e787cdae856362ffc5cead82ac2cb46ab469de3d27d9c635d2123404c44fe28067c8712fc99cb0be78c755361811816d697d12f4415adffdbbefe2e
-EBUILD kmediaplayer-5.46.0.ebuild 453 BLAKE2B f88f9e24f19df00d8f555762c2ae1b0989ea982f7767deb39d05e82747b653fb64cd50a54af1c0557dc42a93fae8d5de64738fe3964a6c1832c28dfe6a2a6fc5 SHA512 20eb09b62ef2e8bf15e3caa9e46719e76bc398909b2309aa07cba32f1b0e1919441e3deec07926365e627ade7cf0026b99ea1dea81d762369fc6b30118a33e26
-EBUILD kmediaplayer-5.50.0.ebuild 455 BLAKE2B a3aea55a9edef4b08330c8477e5ca73bc8ad92254455392241ca7e993c7d94da212f4b4e75a0c75dcd69f99e7a78da6e8d6e21ba39f537b49218ef062d5b711e SHA512 502f5e9197896ba494ce444e75311500f5681fedf607115ff7d1f144ac080836db8ee2a1e7c4ba076c997cc909d64ef5a4d575ecb2318e712c10328f2709a1ec
+DIST kmediaplayer-5.51.0.tar.xz 9524 BLAKE2B b967af734fd73c539fcd990c27d6d1c27a37914364908067644ad217db761b4b7c487333d0f3cdd21522120d8b3c77e4f73cc578d35d25f20d410406b11bd963 SHA512 d1c2f471a8ecca7c4876015881984118a6df775ca463f1933171323230c70762bed0f706823b4be677d6a5cdfe86f96dcaea1b3bc5975b3cf279f6fc5f8a742f
+EBUILD kmediaplayer-5.50.0.ebuild 450 BLAKE2B 657ddfb30d38d7ead8253011af54887ffcc3025562e8114582cf88060fad4ff2c8e289804ff818f346579511f3bf959033d79245de62ca4143c6406224f0dde2 SHA512 d59b3cf3597f8218ba1009fbebf45fd94e19e2b08a351915763fb307fd3d53d999e96a67bee30eb565a7dd63dc83dde737151aceb022c4b1deecb6027aef4cb0
+EBUILD kmediaplayer-5.51.0.ebuild 452 BLAKE2B 0fac3ae0909c2cfb84df11e34a12c5e5e6c98c66c1174b89badc53a2ec7dfd9379d3ff6588b482171351e0e0413393173555cd70f226864943008a157980dee5 SHA512 ccec284fd53d8595de7887fc855a17f60b4f032b2a8d169b30aea765d1844ee614aec0651f608f0503206fa2b313d5b625dd629ea182a822b6bc1ab32bd87279
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.46.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.46.0.ebuild
deleted file mode 100644
index 3114d4c16a45..000000000000
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.46.0.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_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a common interface for KParts that can play media files"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.50.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.50.0.ebuild
index 9bb5a33e13f1..c16de33fc6cc 100644
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.50.0.ebuild
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing a common interface for KParts that can play media files"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.51.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.51.0.ebuild
new file mode 100644
index 000000000000..249cda1d3c42
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.51.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a common interface for KParts that can play media files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 9bcf58efa2da..e687eadbcbb8 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,5 @@
-DIST knewstuff-5.46.0.tar.xz 1000300 BLAKE2B c4a095566d4543451845c25cd837d2e418ace4be92dc4f8f2593bc0570c8731c21b0ad7d3d237849247e096f6bcb7fc4ecb5cb47eda1e0b8665e074a66c1be9a SHA512 fd18011f28e9dabf66e02504c6756e79c16f47a5e840a3f75419a0d6c4610c3a9723a803d55c3b77a159be28d61d2c45d8673683c77c5053c330307b4a4a78d1
 DIST knewstuff-5.50.0.tar.xz 1001524 BLAKE2B 4bb287a9bfc10d82c9958b44093bca8e2a56221a9633d82ebcca24c80fb2eca235389dd14edb8151dacf8cb2469854c1fa397fe44d8041645d3d8d4dcc6ad5ea SHA512 492adcfe5542c39483f30be026a1d6d69ed438448d57c062aeaf4fb7fe1676c9e91c11a3a29bf2ad738c6581aadc0f45b5c252935a7530bb34e051b207e6af51
-EBUILD knewstuff-5.46.0.ebuild 897 BLAKE2B 38a3b6b156aa57a79d50eb09dccad5a4fdcbe8fd2641c5eb5277cd052b3ef9b5633b318af3449d31f30c2a62f03cae45251677666a77ffb5e76ae7c4fd5f32f8 SHA512 92aeb17a52228b4e579ae81317fe8bc75654f35fc3193596d3a9f74776a90d72373807b401ee753440c7d0718b3dfcfefb9baa470a7e0cbdb9f7a0dd40156877
-EBUILD knewstuff-5.50.0.ebuild 899 BLAKE2B 651db21b676cd76ed69d8fa5f910f9af3827500986043edbcbc12bf2af29a83901cc265ed87cd4eab4aaa079b8a20e65e716db052efee8565768cff90ef1c94e SHA512 5ad2ed5f066f6a23a02925cccb4c07420c16bccb7c7501c637bb0623d0dfc82603c2bd4465c60f48528f18d6a42533a1ab02ae722292a14ec2c9c933803a7dd1
+DIST knewstuff-5.51.0.tar.xz 1008620 BLAKE2B 0381a30593e0ebdc2e794db418ae6cd9a36709748d3c91c1ac2ff42385f2e9ebf4238a04098d896fb2fd2c097ac1987054cac857236743884eb168cd0e023553 SHA512 0ab0548550710ee82ab241ed7c456d7cdf1b3f9135b0c0d1131d614f9848519980f0ea3466cafa8432e027a2daf7920c4feca07d374c6d21b77dc8ad8586e00c
+EBUILD knewstuff-5.50.0.ebuild 894 BLAKE2B a3e8403744604b23c793e2ce1a5064b34a6ab29a94b9a5f04b593b0902aaa6c6844b22533fdc7a76e779df4e83c9b9a23ca7893944e95c025dc5fe51175ae105 SHA512 cbb6c515ab28d0191d517f8a6a63e7701749072b739ebdb3f5ad282c48ebdebd730410aff4f38e5f7f0d46ca78fa394e8a6c10b646d1f727d6d66c99fea5943c
+EBUILD knewstuff-5.51.0.ebuild 896 BLAKE2B 57e3dada573845201cf72f1752a1760134fbcb547c1495ea5f981974a8ca66e435a7437cf7c0cbfd59dbdcce35f2aa67eb3b2be00c3375f1d677832eb83de83a SHA512 6eeb723794f0ffa58fdf22a77e38c4b674caef97a4537ddee3ea6ab229ce1764416abd134beabd3e43dba1a93ab1507406325eec12fef1801dbac79821bc4285
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/knewstuff-5.46.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.46.0.ebuild
deleted file mode 100644
index db28d4e7cd0c..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.46.0.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_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-"
diff --git a/kde-frameworks/knewstuff/knewstuff-5.50.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.50.0.ebuild
index fccd68c14db0..42ea3ca92269 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.50.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for downloading and sharing additional application data"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/knewstuff/knewstuff-5.51.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.51.0.ebuild
new file mode 100644
index 000000000000..fd195a9f1245
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.51.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami)
+"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index ce2584cfbc24..67dd2d18176a 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,5 @@
-DIST knotifications-5.46.0.tar.xz 100756 BLAKE2B 39eb614b73e148388d8983e70e88cacbd0c1cde37471fb7364dfeed81ded8e23492cda65b77f827012baa6ce0eee5509665abad49cdb03c58650b030949207aa SHA512 d8caf9929e8dfd6889bd48721fdb8784737f4e4037e80885a817e89f63c0d165df137a2a5d44de399a586e754f70a19e235f1d58fdaa568c586f242e6755f2ec
 DIST knotifications-5.50.0.tar.xz 102596 BLAKE2B d1d3f09981bc8abeac2f1eefd2617a957227bd6045e8e2aebb7622a92e814442bf48ca995ec01b713fb5bc81e7c4d1f9f96d4fc50afa0dc4410e15b915440d86 SHA512 3128717e747baf8a3fecc3147ebfbd256fe1f330e1199222f276eabd17321c8e63272f0b252bdbf3372f712436046e4f7a725abfcee5345a9c1f823da218ab28
-EBUILD knotifications-5.46.0.ebuild 982 BLAKE2B 553221d8b5e787677a3471394b3ac00becb831f434f6c3c38acb9bafe4ed70f9c1cb48b7bc0cc5d45b2ded57fadb0c6f320325fad2071833194232d5231749bb SHA512 bc6aa4936e3ac9bc2c8b6d0fcfc1955ae5b87301722e8b9608b1ce06f2bb36c521691ef607424fb0c092cde8c87831cfea9b00ce523b3a851e2bee30e2530279
-EBUILD knotifications-5.50.0.ebuild 1091 BLAKE2B cf93a5d7dbe53f9a9f6d12f05b310eabce9486385a85718a64891ed2ea3ac9d734c2d6f49b5a31106ce09520c032ba9adf1c8b91d75c3b86de28fb64c1c13536 SHA512 60a6cb178ee7ae7b31dfb96b2ecd1c09177c40309365dbb3029f5e7dd926c70afcd8453a8193820f962407cf25a4c60f2742a218bb045010a647b532dace64c4
+DIST knotifications-5.51.0.tar.xz 102724 BLAKE2B 83d6090bb361549c3a57b8b5d3fe55e52ffb28b8a71e8ecb1869a02a6e0f38a342fb4eda034c35e57eb3a7d7b130358dadc8bbc5e8530098fde9aad45b86d176 SHA512 bd6da71f7d8788e9c27603e0d1a1f03e638212a5d7127803160e5b03fc91c5f8200f9aa33c63f1884d39561d656be7a34bca7e5039019efb4399f60f72b6427a
+EBUILD knotifications-5.50.0.ebuild 1086 BLAKE2B 0f560daa34aa82e259ab4f332bdabf68282532e38382a190083303d986e6a1c940189d75e96618859d41236b6c12a6576cc01971edb6994a1f16e48335d1c75a SHA512 e2289076be297a5cd7fd723c58c91c797baebe23658fcc069385d87a4345e5e2d87dc391ecc4893ffe9784241d50a54bc94dd3337eacb63afb55020390d99b4f
+EBUILD knotifications-5.51.0.ebuild 1088 BLAKE2B 87d73bb251a23ac0bef8825a516cff1e00e12261ca471e7f1ece8b8c0891cf38d69f1e6df0741540520866a935bc5d2f574a28c5abe3a66af1cdfdc09d52084b SHA512 fdcebae58d6eecfc21084be1ba28743064ffe6bd6f29f3945945ec2acb5aa793428595f888d8b97bb6a64e63b0f61ad9f96d3a0e346db4bc013f4655d36bebaa
 MISC metadata.xml 468 BLAKE2B 372e11b35b4abe5a1505ff086f4368f28d3aa137d38d33334404872068c2ea401e225b7c482be11a314d03e4e7b2aa440ec095d4d6ffd9a9a2ec1beb75af2c7e SHA512 70130ce812a1e3d370ac5858fb946372e93cc63a65f4ae3c34639521250949fcf6b79ce51aeee02a701edcaff36d66ad284b0880c3c15a7f33d2c4e44e6a87af
diff --git a/kde-frameworks/knotifications/knotifications-5.46.0.ebuild b/kde-frameworks/knotifications/knotifications-5.46.0.ebuild
deleted file mode 100644
index 9fe40b872b55..000000000000
--- a/kde-frameworks/knotifications/knotifications-5.46.0.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="Framework for notifying the user of an event"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="dbus nls speech X"
-
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
-	speech? ( $(add_qt_dep qtspeech) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/knotifications/knotifications-5.50.0.ebuild b/kde-frameworks/knotifications/knotifications-5.50.0.ebuild
index 943d10a40bd6..58124a84ebf6 100644
--- a/kde-frameworks/knotifications/knotifications-5.50.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for notifying the user of an event"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dbus nls phonon speech X"
 
 RDEPEND="
diff --git a/kde-frameworks/knotifications/knotifications-5.51.0.ebuild b/kde-frameworks/knotifications/knotifications-5.51.0.ebuild
new file mode 100644
index 000000000000..9489c42823fc
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.51.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dbus nls phonon speech X"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
+	!phonon? ( media-libs/libcanberra )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	speech? ( $(add_qt_dep qtspeech) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package !phonon Canberra)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index ccdb63f2f453..2628aafa626b 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,5 @@
-DIST knotifyconfig-5.46.0.tar.xz 83700 BLAKE2B 979a4f45af07bc2ea69f2011d5263622be0d7eb97a7881c6f7de2bed0bde6f1909e38421289c823077b66710662f47e39eb86f9a6619ae91f64a7021daf71989 SHA512 c5909c3b252416d7d0df52b5d3db2715c899330cb74c6ae63d75bf47103c5f683cff5f86fa6133f9386c7abc3ea56d051b3372355c491b690ad2cfc3238d2093
 DIST knotifyconfig-5.50.0.tar.xz 83784 BLAKE2B 1d56f7f57cbd78ce7f1cc3f3a5dc6db25b525de5b709292ce6c7d81a5bc8645914216ad73b72e04055f41039ef5c98859da4f0ccf6ad0ddbed772fde7c6ccb4d SHA512 1a00c395e2cc52b3215a4e8d87e1b4d376f4b5f4b4ef0a4afd48ec776924314604549d9b6b0d3514e70a090643fdc8f30be405593f108f2cdf05ecd7c9a920c4
-EBUILD knotifyconfig-5.46.0.ebuild 536 BLAKE2B 65930408123331dc2307d0ecb86e4c8f872beef00314ae23339eadb8fcc5d9121bae9bac130f978918241c0c480e85250ef0a81a26fc7456e0a68e250729a915 SHA512 513b8545b4de5ccf1d3c940814fed1a133bb5aed325d4d2722eb9b5376a2377828083b3982196705403f503e5ed80c21ca7c5b2998980c28f5799846403967f4
-EBUILD knotifyconfig-5.50.0.ebuild 538 BLAKE2B 1adaca74de90d83dd8820547a993c4121d371c1ea91af683ab942a9fc63c1f8a70ad7e451799aeacda86a9d52abcae23d747b543f663c5d613b81139861c4666 SHA512 b55318ffb048a8e72564f950dd7dc662a0a97f64d3683281495495de384159611af17423698ddfb40ddacfbbcb5d794fd5f3f19de3519659cbfb8eb3f6f326a0
+DIST knotifyconfig-5.51.0.tar.xz 83800 BLAKE2B ce9fb54cdda6c8dff61dc4f5392465ed45603381c4a5bcd25a2facc2691f47f313f3d6fd318fce2d3a472602b4e5e10b945ab0a219d2f16308b22c22fa2d544d SHA512 72f2e66b0b3b8ba6c6c4c0faef4b7d88f5613eb1ba9e1e669b57fe3d05b5744cbde18522bf077d7f1613e45bcb73831ba60eca46b6257764934676fa0d16266d
+EBUILD knotifyconfig-5.50.0.ebuild 533 BLAKE2B e2263c67ccd2731b3b70951bc65a484b56e946a06a37b650c4a86b31d1eb4229c56f131bbff401d9a155dfe36b9fa26bed2850e9f4526aec46cf9dac6859f42f SHA512 13ba145e32d3ae2f192ac8d62f6eea5b5c1b16ad5a94630efa98659790379b33a558d5473fed38ba6683137a7aeddb9f4387a96a09113aa758efd2d2b9310b23
+EBUILD knotifyconfig-5.51.0.ebuild 535 BLAKE2B cb84fb874b5d14c92934ed8da305bba00a1f874c28a6b7e940ae199e2e2707276bdd04646f13778d2616242ca3571438393fcb5e48150acd713c1cf63cb499c7 SHA512 acc9f0b3efd3981aa993491f207c6802e5b1deff63926bca1a53b26f2d52b2b789476d1d7269a528a58558c4f6dcdc236f5336e7ae4d5833576c021d4d12f139
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.46.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.46.0.ebuild
deleted file mode 100644
index bee7e3a7123c..000000000000
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.46.0.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="false"
-inherit kde5
-
-DESCRIPTION="Framework for configuring desktop notifications"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="phonon"
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	phonon? ( media-libs/phonon[qt5(+)] )
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.50.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.50.0.ebuild
index b8f9b7f9e844..2ac79566cf47 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.50.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for configuring desktop notifications"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="phonon"
 
 RDEPEND="
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.51.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.51.0.ebuild
new file mode 100644
index 000000000000..7c834ad4baff
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.51.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="phonon"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	phonon? ( media-libs/phonon[qt5(+)] )
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 73e3cf88c78b..71fad41fdd6c 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,5 @@
-DIST kpackage-5.46.0.tar.xz 132744 BLAKE2B d4b5621c377e14cd6dc94d2fe0c35fb65bcd0ed6985252124eac4376a9095d1492fe61f12dd885f868865d5f787362cd32aa48353c1ad4a937f6768ea993e288 SHA512 ab02c36c951c1c961263689df84fd8d6e00ef1774e42457ebbbb759b9b4d87384663383208078d1856de52cd7a1bc007e02d8c970260359cb2b12605114fea77
 DIST kpackage-5.50.0.tar.xz 132856 BLAKE2B f74b63061bf299854d118428cc866fa4c9d2e859d92093af61f5614e85cccb2ca1ccb5b6afe37681bda5828565aadb905f26e6221e65e2d16c4ce0b0e500cfd1 SHA512 f56de9577b6de69724967f1ea911097d03d8bf5de8dcfeb10dc040e0fa61504d5db5e3330ceff85c1590899289f1a4b904b1d7cefa9516fa14a635b1da14650a
-EBUILD kpackage-5.46.0.ebuild 656 BLAKE2B a09961665994c9365ae0cfc8651cef81b7aeaf693ae9b3d4c36fc24c56952e1097d4572ef5d901dad3a4d0f7bb13e96daa02f66ca14626dfb95b8cfce4a4930a SHA512 e629ca369de787f2f16d62d719ed63f3423141b8ead7e67d4ffbb241e9f7eeff95d154737be1706843565e6fcee546fbacf840a64774664d2ec3905ffbf42990
-EBUILD kpackage-5.50.0.ebuild 658 BLAKE2B 7b83a71a25c45b09a9b6fcb1250de9553708b73fe4d55ee16a64c84824c409931ac9e0ab6e740743cc613a0b55931aa1b92c81228292dd31f55e8e9496c88eda SHA512 994cf5d262b52d92676c73784647a06dbefae8cb1d42e1c3417cd665d60fb43fa760a4d6bb1d994dd4a2e074facfc031eb238a81990d833b2d06eaf2ea113565
+DIST kpackage-5.51.0.tar.xz 133180 BLAKE2B bcab6732e70e6f2cfa2dd51f946c44c164c79de027e52f6d54478bdfde3951fcb9929111f860c7b2bc67886609c822f6ae34f4e8794b002b7b29bee75bec91d7 SHA512 0ddf65995c3cebbdefea5cdcdb4634b9d5e26a4328e4fe4b180ad69e59a3ea254095d5aca418e6609925b52606e1200f8ac8b0432eb05eca6c324813bf1218c9
+EBUILD kpackage-5.50.0.ebuild 653 BLAKE2B 48288cb2683b34cd139af595d8dfbde0fd25dcbc266ae511d52456933ceb624624255b01db589d565f879eb0c0e636756a21d748eac41fcf38fa34ffb8b5295d SHA512 5046549e33345ce6ef8b795bd703ad76fa0b82b2bc9f40fd513ca4683dd1e15f8cc4961cd9abb0c64cebfa1941d361be8bbdc6c3d8993d8a40e2948c91eb85d5
+EBUILD kpackage-5.51.0.ebuild 655 BLAKE2B fba42929942e88519fdb9f821fb76d6b3f71c0ad6a49bb45286db389149fb0c914a2ea3f29f06e9106107ee9ae36aac239102efb39697e76242a622cf801b63b SHA512 ba786d8746ba3038954c7c3e770a20f150d28f9e60d73746c7d889969caa390b657b1e47852c5b07a6e6d424d88011a7901d6c07c8bd2c5ef186264c02ffa044
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kpackage/kpackage-5.46.0.ebuild b/kde-frameworks/kpackage/kpackage-5.46.0.ebuild
deleted file mode 100644
index ea8bdd9419a7..000000000000
--- a/kde-frameworks/kpackage/kpackage-5.46.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework to install and load packages of non binary content"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="man"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	#bug 650214
-	local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
-	kde5_src_test
-}
diff --git a/kde-frameworks/kpackage/kpackage-5.50.0.ebuild b/kde-frameworks/kpackage/kpackage-5.50.0.ebuild
index 66e8ddd5450f..4640c6abe061 100644
--- a/kde-frameworks/kpackage/kpackage-5.50.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework to install and load packages of non binary content"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="man"
 
 RDEPEND="
diff --git a/kde-frameworks/kpackage/kpackage-5.51.0.ebuild b/kde-frameworks/kpackage/kpackage-5.51.0.ebuild
new file mode 100644
index 000000000000..3819a42051ef
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.51.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="man"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	#bug 650214
+	local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
+	kde5_src_test
+}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index e12017f8cdca..4b00ba07be7d 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,5 @@
-DIST kparts-5.46.0.tar.xz 176020 BLAKE2B 08fa2fdf8ed93a36184b770ad4f190c6b12834b6beb55e8dd142ad67c9c8ef84fc2fc3378732e69a28ac9e97ebc796561bc1f9f75fca2e36f7a26af219e57b4b SHA512 a745c1222106af767fbc577dd876a50b47fb1053682f56a58a56279e66fcb7e4b2f3aaaccf1d77f7bd8aad0fb8c1c87dfb7ca53ef63bd5c719eb97811a015f6c
 DIST kparts-5.50.0.tar.xz 176068 BLAKE2B 61f7bc354b6e3bd09cdd03480a377ce549992eaedf7d21b769d3fe810b722d2731569921fb445d6f8a05c47d675d9a83c18ea56cb86a54b05d60f3324f36e8cc SHA512 c787e7b85cd4053e014eed5610812715b6bfd9a450e86fddc5259f8bbfd5fddb215720cb3ef7a190a345343042712ccda7e55082807e3a2dd168decf30f13fd2
-EBUILD kparts-5.46.0.ebuild 714 BLAKE2B 87297ab9a15870f09705dfc419bacff29dfbe238f238a652200904b19dc6ef475789d8c25ed200045f304865932b005cac9dbe8b533e806aebe1f8de6f20d18e SHA512 c25d214a3f4dff5e9e991f37a950ba0f9115f28009eaabc5b1b7b1cba567ebd7ce17acab5df851b2996cc280ddf89252a8ce13b86ead075430006c4a09588445
-EBUILD kparts-5.50.0.ebuild 716 BLAKE2B f323602c59cd3a56d5c30fb6dc031825562d252e92d5ebe4f63979e1bfa714edee2566f393ceac50f48659b10d69253704dadbca4c7e3a1a43122c6fce49ba26 SHA512 8d56ed0dd59509c7108312d5a207df0b2e37138f916eaea7fc8ebea9a4d689cf1ba0a653969c1c4375b2a72cdbd2764da331ca422c609d09d9d9ec906ee69bbe
+DIST kparts-5.51.0.tar.xz 176164 BLAKE2B b204e0859f62b362af3f5ef32c45c48ba7c28a1e9a8c23a89220e2281ce0ba98fdf4b07ce2e3e242346d9c1391819ca7330a70ba10e4faabbd786c5eab4153a8 SHA512 f0fab6d9fca330636c14f5c18cf1cb71385d44b185a8418f20798f3d3012f32107f9c3b1d84b3acf56038f4c774ac7fb015746339e0bd6e456f8f307332a0c79
+EBUILD kparts-5.50.0.ebuild 711 BLAKE2B 1aeff59ad279e93bcfd057d62e92566dde41086dc28a20f7054f53df1692f9488c071bfbdd4a8d4ec93cf2f11ddd2f1329429efe09610fc2a2f1c3590612bf97 SHA512 b79c8da363eec776ad225b646aea80d09502248817d0a1029ad18a784243c34d75c9f77851b7dc70fe7f940669ac477d97be3a2fbee563e7047f0a812f9282b1
+EBUILD kparts-5.51.0.ebuild 713 BLAKE2B 9e2b6526fa17f0a765547ab3b57ce33652daa3b0f1a819dd092f2fa1cd88290de42e3707f08fbd4efe24cddb62866f2cdc2a0770f0c0fffd024ac91385949caa SHA512 afdc3790d9249c40493212c04708e60fed69fa002280392ccb84c23c141e0956a69b2a94108e21f2c76129a8a1ea0898f68e83af351ee082701b070e16f8d0d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kparts/kparts-5.46.0.ebuild b/kde-frameworks/kparts/kparts-5.46.0.ebuild
deleted file mode 100644
index a151df54de96..000000000000
--- a/kde-frameworks/kparts/kparts-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing elaborate user-interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ktextwidgets)
-"
diff --git a/kde-frameworks/kparts/kparts-5.50.0.ebuild b/kde-frameworks/kparts/kparts-5.50.0.ebuild
index ecd80b16ac31..12b71c73c6d6 100644
--- a/kde-frameworks/kparts/kparts-5.50.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing elaborate user-interface components"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kparts/kparts-5.51.0.ebuild b/kde-frameworks/kparts/kparts-5.51.0.ebuild
new file mode 100644
index 000000000000..f4eeeb2bb678
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.51.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ktextwidgets)
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 61b1dafc2995..f168c47706b6 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
-DIST kpeople-5.46.0.tar.xz 59896 BLAKE2B 5482a8208c72e713965e76b3d3aa1b4e2b94d61f3d326a33e963b65615da2adcd2e589330e6b08813253e4885940e4620ec86e361c9973ecb2454ec85400798f SHA512 6fc4d57b3b339401b59c859a29d0e6e0fa8393281a0aae3362efeb30b497f9f7b29e4bc96900f253a6a9cd0888d2f4aa4ad17c848e35afde3948ad393cf48aa0
 DIST kpeople-5.50.0.tar.xz 59912 BLAKE2B 886564b8a35f83a4861cce84f3007fb47aa2dab018ff8132d09f3fc24ebae5b64777ecf52031fd5fe090d8175f6f1f71c8089a854d7bf2a263001b3613f6af11 SHA512 1e52717038027a0bb7e8e6a4007b095f44ac6932aa8766c947d96046184927946464d56e0253fe231a80a3b95ba4f2980e474b58d1a5261ce0cbedf59e5b737e
-EBUILD kpeople-5.46.0.ebuild 751 BLAKE2B ad0fcd86301aebee082d39f0e0f7dc6ada064dc1f110a739754e7c19bee21804ef3ef42564c164af2b6fb20f2c1e2a81d7dbaf740742b3a22951974f7c46395f SHA512 a9d856343d22fd052c4d059d88a023338f71f1e3dec6c5843333df8ae83a540303ec0c5c62cfcd0e7d2d1f8f665463d5bb46de41e07d0ae873fef3519d2226d1
-EBUILD kpeople-5.50.0.ebuild 753 BLAKE2B d09d215aabee577e17d722b774e0a8cf3bbef30cafa4696ddd9630a24cc447fbb45d5577dd0ebfca3ce40de04eb0a6c0f27d397082e3cf49e37b1d0dd02be157 SHA512 d394b1a87900f3caf570bb60f62b2631db1defc1a595cebc508080443ad35d2f0628b158e9bd424f6f2a826958ab02b9700043009a39a0f9e8f38a768cf6f649
+DIST kpeople-5.51.0.tar.xz 60604 BLAKE2B 216bc26fc940ab4a41218e9d78d69c920374eef87099f40362515bbcefa5ce33122687146263ae0e5a41d23fa5c6d4ad014089bdff99a86d7c312f5a1b5ef242 SHA512 264ecd72fa5bfae1be9ae5b39feba654b27a772c5552c39b71276f886e814627c75880f5ee96cb8de9885d317e56078c850c60f7768282cb6ff069f5c8124d33
+EBUILD kpeople-5.50.0.ebuild 802 BLAKE2B dbe786bdd7aed22fe6e1032ad3982365ff9b5923a68ddd7f8a58d81981f8dcf552f6f198938fc8a24902d20449ac612fccd5ed9525287cb068504fbd90ca6a96 SHA512 1f5dd02876b6a1b71cd401043a91719f9d4d3b3ef075b7eb41f3c573c5ec324e9f873374363370645ef82eadf412e4535715d3ad8b09e9067cca1916cd0093be
+EBUILD kpeople-5.51.0.ebuild 804 BLAKE2B eb758bc585cb94ea6e100e47070a5f39eb733f3ff1cdbddfb923cd97b528a626fc1367135362dcf30db7a3ae1b9e14efe00662b8fe9fa70cb429c1587688f8d4 SHA512 54c0797d4baedc7c463a4218cbc46d476a68ddeaefdc4b2d38013606ebec804a68192a56c8c4e492ffe3c3b8069025c162409da1a47a6b4425443feef52bd2ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.46.0.ebuild b/kde-frameworks/kpeople/kpeople-5.46.0.ebuild
deleted file mode 100644
index bbde41c3b404..000000000000
--- a/kde-frameworks/kpeople/kpeople-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://cgit.kde.org/kpeople.git"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!net-libs/kpeople:5
-"
-
-src_test() {
-	# bug: 612504
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kpeople/kpeople-5.50.0.ebuild b/kde-frameworks/kpeople/kpeople-5.50.0.ebuild
index 9752db2519a4..5561061d271b 100644
--- a/kde-frameworks/kpeople/kpeople-5.50.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="KDE contact person abstraction library"
 HOMEPAGE="https://cgit.kde.org/kpeople.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
@@ -31,8 +31,11 @@ RDEPEND="${DEPEND}
 "
 
 src_test() {
-	# bug: 612504
-	local myctestargs=( -j1 )
+	# personsmodeltest segfaults, bug 668192
+	local myctestargs=(
+		-j1
+		-E "(persondatatest)"
+	)
 
 	kde5_src_test
 }
diff --git a/kde-frameworks/kpeople/kpeople-5.51.0.ebuild b/kde-frameworks/kpeople/kpeople-5.51.0.ebuild
new file mode 100644
index 000000000000..a25b7fe58e9a
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.51.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://cgit.kde.org/kpeople.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!net-libs/kpeople:5
+"
+
+src_test() {
+	# personsmodeltest segfaults, bug 668192
+	local myctestargs=(
+		-j1
+		-E "(persondatatest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 6c20d55ce16f..6bc341afec34 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,5 @@
-DIST kplotting-5.46.0.tar.xz 29776 BLAKE2B 0b15915c3fad4867a0c48fd693b4fdc8b43f50880cc739f513332698cedcd755340ccf1d906d4bb5a54ccee18833d761f73d9d67f2062e812788b4014354860e SHA512 8bfbeec22804d13d074612562a2ceaaab7f18504be1b0627153137fd2d8a5eeca696b07df243704c654af7f78dc8c33a5be27fa06f278d29650246314aa1aa18
 DIST kplotting-5.50.0.tar.xz 29752 BLAKE2B dd786e239cba3709a7cf24f79d8ff37e6ecc43a463b25ff1fe65e794e72eebfa81a6a6d4e63f8f28ddc57d79bc01060b55b0f8664edc19a196323fe224d456ad SHA512 352c424d842ddbe277c7a71acb7fe50fb7cdc78bc750c85ac5a364a6e330bd69344cd5dbdd7922725e1b143bd0d7b1ac1b6d003f5baa67edb33981d27f830838
-EBUILD kplotting-5.46.0.ebuild 356 BLAKE2B f226b5c1cc4f42df52badb988145758bff94498f58ef0d2eb14244d2ea0dbefe78908f3e30a4b385a168a2eb38f14318b1a6697e586840f169ec54e7a3447b78 SHA512 6c06fdabf490a528b904aa467308c651a42c8f0b61679ac197f68a3722435a98ad2b0a36b3b441118c319b4f7ecdb708584b428bf4e3a03823766454a7601ba7
-EBUILD kplotting-5.50.0.ebuild 358 BLAKE2B 62d1f3da0f12de746d9f0f7634c8508836ddbb6bce9c07f56185abd4f31cfaea0b672db28ae490eac9da6c2d37aa27eba5eb399393f06959860b48078b2df7a9 SHA512 35135128bde28c7d7c0ba400a0dc0ec7075baaa56e7930fa80307427c2f6dff38531f4d08837303461c2137012542600c443b1be8f15a77d0600243fd4d114b2
+DIST kplotting-5.51.0.tar.xz 29744 BLAKE2B 72e19c93336474e05a6874262acd13d0e3994a9e07427cb309152a0940173caabb816fee6e20f5f6ed24783fd37681728c9e19d1caa6543e29eb28990c365f30 SHA512 e75a88074b18768b4edf90a5020257c49fe0440fba806f0ef1880182fc1856853211de03f7aca3be3f220fe93ff723009c96799b0c94f237ac7c698247f37666
+EBUILD kplotting-5.50.0.ebuild 353 BLAKE2B 8d842117a6b28dd487da52ff191e0b5faa1448838dc179acb81787199b8ea82bb58e266bd3184bb96e9d0707378d428ac0a188f682fcaa308d8c89f398e14eaa SHA512 62b0d52b2453df950a7d7fe433069d1a360d5d361b625b558662b6e0f47be4e90ad3e5ac24dcf1d94d061eae1fe4cff6e4bb2fdef8ab37c7d4854a1085c073e7
+EBUILD kplotting-5.51.0.ebuild 355 BLAKE2B 9370a128b4b705f1486940ccf733421f5bc7d774583562453dd2e20e5b112b7ae18dc9026247cf0c9bebd2326dcb5ee4d63c1cfd2e9bf672d3f10829dd25e399 SHA512 da5b1f706ae3d19ce28fe02c107ae2ea4d15460e0fd957e27987dec5f4de44af6171665303f6e93afbc7a680cee8194348dae733fa80f0b51df09d997a067458
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kplotting/kplotting-5.46.0.ebuild b/kde-frameworks/kplotting/kplotting-5.46.0.ebuild
deleted file mode 100644
index 974f648029c7..000000000000
--- a/kde-frameworks/kplotting/kplotting-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing easy data-plotting functions"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kplotting/kplotting-5.50.0.ebuild b/kde-frameworks/kplotting/kplotting-5.50.0.ebuild
index af9c36c9cecf..08cf9fab3729 100644
--- a/kde-frameworks/kplotting/kplotting-5.50.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing easy data-plotting functions"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kplotting/kplotting-5.51.0.ebuild b/kde-frameworks/kplotting/kplotting-5.51.0.ebuild
new file mode 100644
index 000000000000..c71702409895
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.51.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index a9f5b588149a..2a305a85e977 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,5 @@
-DIST kpty-5.46.0.tar.xz 58172 BLAKE2B c9babb95378268697f8f63edbfb4a0469033c12ce6c56889d1fad41e525217f4441bf9e876d87d47d6526904a24a6796203a6886db9d9d388af802e3732f4b24 SHA512 7e7aa6ac36feeb77a9b0c4423028c9a209949ddaace14fdab3bef0374a59b231ae9a0b9cb47a9aa74abfff921b0c3a6584f010ef84edbb18fa28450a1f1b0efe
 DIST kpty-5.50.0.tar.xz 58184 BLAKE2B 2db82b4c990b806bcd820b76d6d17065585044c2a3f0c5c75234fa00571eac501c61dd4496c987cb9cef415313f74c8af453526c4c4e0fb5439bef210364a63c SHA512 22b394b8d53ab5aae05a51470a3a9ed209c8533425da6f1d6fdb26c82cc5fc1fec2c6869caa5192f067bb60a819a4ce6c19784c5fb8b7bb1691b507e77aae54d
-EBUILD kpty-5.46.0.ebuild 508 BLAKE2B 2d821a3ae149833dff4c821b2b3adb7779ffac78995b35e37bac9179fceed5e332bf96020184fd18e2b07ebc05c4598ea2c3177d86fbe29b046cadf4baf4c3f3 SHA512 f36d203a683246d093788fb14faaf4d4a39e2a83b9f3928635368ee03c8b5c0e7e65acec3d0bb3f1cb31bda7ab025d97a605d256d4d7f50841344ed91affbee9
-EBUILD kpty-5.50.0.ebuild 510 BLAKE2B 10d16332edee8fb67f9c2ed59affec1e4e30cff441daaaf196bc47049df311cbe16ca9322c52b694d623c43285d9390f36b5d0dfb5a0049627563184e4ce463c SHA512 84ca0ff36d38e2e71d487370102941591ffbcd23c617c9f4066323837986475fac744f6509e6dfc2b0e6d6e6655e050c4f6aa079371fb3f391f407f890d94c89
+DIST kpty-5.51.0.tar.xz 58172 BLAKE2B 8340f973eb3cb647ca7325368f98ad4fd1b91e32aa111bdf65d53f70dfddcfdb3be4f3ee9d81844909a5fef2413afe6ac1c64eca395e05cf257323b24be8e809 SHA512 e43608bbfd342fb4bcdc0376fa16d83c33589f84de4707281d7f6ef8aa19716f85df7b5dff0898a87d525611be3cc6dd9ab3cb349d76b83b6ca2bca733d81350
+EBUILD kpty-5.50.0.ebuild 505 BLAKE2B 840171c707ba9cf323988fefe073f440abc8eeaba03fe72f710bb1bca5ce466aa123593a28b97819b07339c2f24e71afe2099f8cc0c2a5ef365420eac49b11bf SHA512 11dbd09aa09704cf77e12f53fdbd199416428cb3bbb89e20d3f1cf80a6a52b6b8ecfab3d6fcb7de75a34e48b1622d711033d0b2c0730aeb36109a8292d0c7f29
+EBUILD kpty-5.51.0.ebuild 507 BLAKE2B 47d8a5f9597fc16b8d213d5a36c13b23e78ee3c2bcb9c0c51188507c56ef712556c17a8531aa1a4947bc54daa2bf6ccf344b0781f7d0dbd8719bd2cbbdd024f4 SHA512 990fea8abbae2634e2324e3bb92bb011acf45bcde7dba029de6e70325c22738f60a8a1e2a5ffae26f80c531164e3002e960d11ca0d1eb5218fadac6f4e7b1e78
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpty/kpty-5.46.0.ebuild b/kde-frameworks/kpty/kpty-5.46.0.ebuild
deleted file mode 100644
index ccd14fd788d3..000000000000
--- a/kde-frameworks/kpty/kpty-5.46.0.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="Framework for pseudo terminal devices and running child processes"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	sys-libs/libutempter
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kpty/kpty-5.50.0.ebuild b/kde-frameworks/kpty/kpty-5.50.0.ebuild
index 052e41e44cf6..55647b1adf5c 100644
--- a/kde-frameworks/kpty/kpty-5.50.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for pseudo terminal devices and running child processes"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kpty/kpty-5.51.0.ebuild b/kde-frameworks/kpty/kpty-5.51.0.ebuild
new file mode 100644
index 000000000000..6d849595ca20
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.51.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index e0b08f9e53df..c63a7c355d3c 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,5 @@
-DIST kross-5.46.0.tar.xz 127780 BLAKE2B e27f2ffea876d62b961d24654d3f2f09ece75472342f2157e882fc24df60ec06df3c5f2e71fdb5a2a22b6fb5770d5a9629f1dd502fc79972cf574315a494553b SHA512 45f895d0e00fbcaf8f531ae7a7d9634e655bd87539c57d1a7018303a40882fde55c92c9f8e0394788e61aa9135dbc386b79c2b72fdc9f7e285a72867f0cd201c
 DIST kross-5.50.0.tar.xz 127828 BLAKE2B 6072553d1ed034f4bbadc46b27e84bff563e7da9fa22684fd67df31532d903b93b51b48b27ea4512deff0c6131b87747aa34532d464307ba5fa433bbb2c90ebc SHA512 6c1f4062d87bfa691b6323ec6210cb1f321525e012ff8e37a90271f05eb7dde489f64fa36c027d7890b220ac7af89f3571547d267033a451fedb85522d01577b
-EBUILD kross-5.46.0.ebuild 730 BLAKE2B 87fd512d0a9b949277fe3a096255d4ec8015218ccc5cc3ffb147fd10e4c275f3d7d4455f8e4ea5e418cc7edeeb703e153f7ade83ab53a36efb77065eab1163af SHA512 9878ac8eca3d7a920abd4ac92703b64c25b13f03648aba4d1274ba7f0f326b00e35718c726ca434e1c7ad407cef929975e9484ba238138aa4ab1be96b03c571a
-EBUILD kross-5.50.0.ebuild 732 BLAKE2B f08bf1ef282ca397a03c130db1451e73301e45e66b87c0ebb8c86068ed616d44af504e210efeb95f909f69dd3697813c31ebc54db74cd7481214279aa08343c8 SHA512 0b2a02c87ddeae94cd3e161d3098470bc9fe32e93c46c07fc1c8c03eb72b2f0c1f3e7986fb9d5bb1543f1b74faaf31454f19f88bebe7d68719481070d089f557
+DIST kross-5.51.0.tar.xz 127848 BLAKE2B 838d54c3728d7e34903e4db47cb25681390c7ebc05f346abc565d7663c46a4b4655dc452e3a2ba81a1bd789cfa9af385931fb1510ef0cd60b9e785e7bc6cc7ac SHA512 c2b97f2980b04b57b607e526b788982e7a61f6965302c46b8f3036d3683354d66d59a189e3e7c47e8c387543e24f4417baa1896b06ec150e95959f540caac6be
+EBUILD kross-5.50.0.ebuild 727 BLAKE2B 5efd009693e7a41dbc1d67453ab88d9ccc7daf1edfed42917bb48b6b6a42f5eb302d2f5d274ba73db97c18f02af328c29eea71b9dd64605b3d48b82d113ce2a1 SHA512 932d655dc2646701e9f19e534a57c6f99caf4ecbd14f7248be559b3b46d9d977a6f50b60c408485e7ae6aef9173aabb249db61968e9df947ae919e6479b09f23
+EBUILD kross-5.51.0.ebuild 729 BLAKE2B 5d95597fd897093a29618b10fd72a2393683af5a99278dca1d6bc1b06b69f64b4aecf7b2561a070fda709668c207ac312d9d014e69855715e0d6ca47b36782a2 SHA512 3d39df383502137e2fb01239a9b299e94a1c15b2b4a19e756488b2520658f50534c82f78971991ad609037f870b985a9600f2f623b6d5208176110d91c4b4697
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kross/kross-5.46.0.ebuild b/kde-frameworks/kross/kross-5.46.0.ebuild
deleted file mode 100644
index 8c2f413e4f5e..000000000000
--- a/kde-frameworks/kross/kross-5.46.0.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_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for embedding scripting into applications"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep designer)
-"
diff --git a/kde-frameworks/kross/kross-5.50.0.ebuild b/kde-frameworks/kross/kross-5.50.0.ebuild
index 7e5535e1ef1e..b7ffd9747afc 100644
--- a/kde-frameworks/kross/kross-5.50.0.ebuild
+++ b/kde-frameworks/kross/kross-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Framework for embedding scripting into applications"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kross/kross-5.51.0.ebuild b/kde-frameworks/kross/kross-5.51.0.ebuild
new file mode 100644
index 000000000000..caeb6e8c8c25
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.51.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep designer)
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 87e413508533..6ea10cf42af9 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
-DIST krunner-5.46.0.tar.xz 61420 BLAKE2B d266e6fc739b0e6c15aa8a7de888b30332bbd6b910a85ed29759db884d63d20045e332df18a63c78c3b815b05e23e64c04390fda8799da13193e1ca1f121ca9d SHA512 57a461fe3dc035fac5efa7f8ece11c4e9aa374b0838617883f51373f36f1c79910c228c07b8d0e88fea2bbbc147779ceeddddc7c9c00619cf78c5bcd5860abf0
 DIST krunner-5.50.0.tar.xz 61744 BLAKE2B c566d62d779793a726a816b0d09ef83af58d7f626896f7adfe4cbc0ed581d7e401af4654bb992eb2f4a129d59c9227e109c6ff1c607712c5325519465186e1c8 SHA512 c1f14161c39c718f6dd9e3dca818a53d86d05b33d8115e26ce7e76d66dd3d54d22a15ea7b6c1865a5d374bd4175b9bc351db949b373e2b9de1fac8e3efb6542c
-EBUILD krunner-5.46.0.ebuild 781 BLAKE2B 29a65f456702b7dbf25398bcd27cd28e1ac1d6363bcba2db041a0431a6f20ef2ac90e5a8dc723830c42debab162a1cc0a530da5c1882efd8729bdbc93225b8f7 SHA512 077d64431f97c8ac209e46bd02c17d0a047fe56bef8318bee0f056b533307b167655f813e3dfdb6102493e107ba982281d51fcc8358aa2a0f4af19eea4d3c4fe
-EBUILD krunner-5.50.0.ebuild 783 BLAKE2B c90937a5a69bd1b85a66c013a17e37b7d085e3bab36d4d791b5d007dc647b7ad5a779ddc7ebe3e48622247523edaff951d693f86eb7538e4a55e865ea9ebed39 SHA512 df8ca3067d3862724299ea74986d978101b33fe04423d3d25cabd0621ff30d25fc5b893f9e1f77f0f16c48960b0d0afda2cf642a6aacc33ec7a84ef0f533e087
+DIST krunner-5.51.0.tar.xz 61816 BLAKE2B 66a1c74cff7f796d78fc838a2c52b5c94b18ed40bcf33a44f8824bb2e4c678a7ead07297066af4e4c9fcd8ea9f547bdba6ebe4dc9ed7388ca12dbf2c2ad83ebd SHA512 e053b454adaf1982a1b2b3b09aabacfd1b4f293c3d5f9c6b557e32d61049c6aeecb2b9aea547438e091395cc4b45ece38b4c7269ca90121ee0e8918e8573cf29
+EBUILD krunner-5.50.0.ebuild 778 BLAKE2B 1369fca3dbc8c6853b83f99a22180e9b9b9b455d0f4bfb4094f83ea7cacec125f840456b580670eaf0eadb4a5f04af7524883f194fb3b8c850128a839190a20f SHA512 c3fb94a39e46ece3d629e5d6b20f47209cf4e478a8edc4300928918dd562a662dc4c7bde2b4ecfd9ef45423436d4603245b7d44237282b5e5ca3a2e13ae4d4b7
+EBUILD krunner-5.51.0.ebuild 780 BLAKE2B 3a7f2df360a7b9e5fadcb0533a002b6581ca048cbcec1b1d3332f51f2fbfa20a65e84b54ffe38aa5542e7bcdff3c578cc585fbba3ecdda792dbd994564abc89d SHA512 5f88c27fc1eb570da40ea9c263b586684a5ab4f6afbba4447fa4b124cfb13a30ac587c3490f0636287078923f1d6149bc86b6450db2931d385dd937b0f4ab57b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/krunner/krunner-5.46.0.ebuild b/kde-frameworks/krunner/krunner-5.46.0.ebuild
deleted file mode 100644
index 8bb97580a3fd..000000000000
--- a/kde-frameworks/krunner/krunner-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for providing different actions given a string query"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# requires virtual dbus #630672
-	local myctestargs=(
-		-E "(dbusrunnertest)"
-	)
-	kde5_src_test
-}
diff --git a/kde-frameworks/krunner/krunner-5.50.0.ebuild b/kde-frameworks/krunner/krunner-5.50.0.ebuild
index d15b1eb63faf..8dc75d5980d0 100644
--- a/kde-frameworks/krunner/krunner-5.50.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for providing different actions given a string query"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/krunner/krunner-5.51.0.ebuild b/kde-frameworks/krunner/krunner-5.51.0.ebuild
new file mode 100644
index 000000000000..be9a3cc52037
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.51.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# requires virtual dbus #630672
+	local myctestargs=(
+		-E "(dbusrunnertest)"
+	)
+	kde5_src_test
+}
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 84c923935018..ddb495f1e42a 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,5 @@
-DIST kservice-5.46.0.tar.xz 249592 BLAKE2B 307068931193bf0e1565a9bbd83b32b4ae8e61a125e6910eb2681fb6d0a69fec7d95c5a5fb256b0b8037bc25064f411a1087f0057d714910aaf9562dd9a1489c SHA512 2f2b7ef09869b1fac47c52810ec8a70856a94909ac40649239a6d1291ab09cc8e7944d5cfef653215f245ac19fecdb4f6663f46b43acc97b607d4855b6aa063b
 DIST kservice-5.50.0.tar.xz 250884 BLAKE2B b44d67d202f1e1c81cd21cd453dd1b11f4338a451ebce1773221b4696d32691ab44adeccca9915782680301e393bce400a56e402ba8d97ec0c279075862d338e SHA512 d239647335f0c72e1c76f36f4f23dfdd4614467b1f95d75bffc3ffd11c2bcf307dbbbc7f67c0197030a1c27875bf256a751721204f06769d9fdc3f1e49172e87
-EBUILD kservice-5.46.0.ebuild 941 BLAKE2B 785b96b3f2e3b53570364ebd98126d5b6bb6ab6f566e2acf731d7a417891aa5a096ff2359df449036c252f3907232875672bc2b26a4d478cbf58b534fb57e383 SHA512 bd72442a70b6cfd8b49c048ec820d6161cc6b45ec54e1420ac104100f9836bb52a3c15322470e2f61dcabe6095004aafd10cea13f858320b174027b63ec9ff37
-EBUILD kservice-5.50.0.ebuild 943 BLAKE2B d0108d280d361e446986bf451be95d1006724b7383d3f319f6336dc72a42cfaaec553863eda36fdd48153b33481edfe25240cf399a7a4f9858ed492b564b4732 SHA512 0ded01c1f8728ba4f9c90d3771fa82f76b6dea74a6a2cfacd6e41a77f6eb9def5db3d4ca52e7fec3f1e1c69bd0dd0cc2489fb4eaece2f329ae98868f0b443487
+DIST kservice-5.51.0.tar.xz 250964 BLAKE2B bcdd1431a1e6dedb606490e06d6ab14e0ad8b318eab68e40432212a878e4d75e2eb381ab36dce230119c48a5a601d0887887524405d5bf892e0f2b177ce7c78e SHA512 832c189b8fbf9ffca863032dcea513c14fb4823f6706675b8b939b9c6848c383b9f4ace0c7bc6211a9c5398026045fde3f62e38926e934dc6afeeb762fed56c7
+EBUILD kservice-5.50.0.ebuild 938 BLAKE2B 6937daf7ae15ce325ec5b3825d40155bf4c2268b1bb1578c3349b36b9bf2fa673495b7e1bd3339d247fe6295c4c262cab2aa768db93103d113f63c47c9f0635c SHA512 c35ad1eff57752485a6e4bc1d2d2ef98ad7d8f17d10b4a7f12e178feda465679ce22945d9ae6b651d57d84166f28363fd65749e242200e3e4fe4f93edff273fa
+EBUILD kservice-5.51.0.ebuild 940 BLAKE2B 6a386ae460a75735f5aefc1e98e37e436e5a6272b45ebdee569b72eb36d61a048fcfb8f357e7fdc9e7be19115c757c0869c283f4842e90432476803e5a7b5189 SHA512 836adacf0118b40398315d090acbc13b4183812e142b0fb69da9de78c589072026676d3a9232ce5dcf2ca7e1c504cd1c60f87db0f305764cb272b8f9313fb73c
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kservice/kservice-5.46.0.ebuild b/kde-frameworks/kservice/kservice-5.46.0.ebuild
deleted file mode 100644
index 918230e0ce2f..000000000000
--- a/kde-frameworks/kservice/kservice-5.46.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=6
-
-inherit kde5
-
-DESCRIPTION="Advanced plugin and service introspection"
-LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+man"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	man? ( $(add_frameworks_dep kdoctools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# bug 596316
-	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
-}
diff --git a/kde-frameworks/kservice/kservice-5.50.0.ebuild b/kde-frameworks/kservice/kservice-5.50.0.ebuild
index ed1da52d31c6..0fc10a936f6e 100644
--- a/kde-frameworks/kservice/kservice-5.50.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Advanced plugin and service introspection"
 LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+man"
 
 RDEPEND="
diff --git a/kde-frameworks/kservice/kservice-5.51.0.ebuild b/kde-frameworks/kservice/kservice-5.51.0.ebuild
new file mode 100644
index 000000000000..535dc4dc9026
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.51.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Advanced plugin and service introspection"
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	man? ( $(add_frameworks_dep kdoctools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	# bug 596316
+	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
+}
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index f0b98f2f35f3..39fd2eade014 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,6 +1,5 @@
-AUX ktexteditor-5.46.0-CVE-2018-10361.patch 6579 BLAKE2B 9e992f2fc416cf51b30476df46f290069d490c22c09f5f0a7d790789163f1269373c607260ed638c62984cf405944ebd7a36b564ef6d80603827a3f23c4c5662 SHA512 c67557557e8eea7c74426df333301c8e8db6af7d892e7a8aff7e545b450155253b47eabc3a1baeb669e7e34539615d8f8cdf99e4b199204a4decb9962b11b423
-DIST ktexteditor-5.46.0.tar.xz 2296888 BLAKE2B 45572ff487505c38f6dfa23b96bd84ba83292ae1077bf3615fc2d30aaf6aa0347605a7c2ae4df68cc92552c1ecd8060ce1ba44f11bc78cfe736149476d6af5ab SHA512 b0197a82e9489c4093594c68a6c21dc9e204ec78cd17e5a0117d84e501710d90ad06214ed217332279f3b67ae84119d09d6eb19e33b37b7bde2ebb8a07b6a543
 DIST ktexteditor-5.50.0.tar.xz 2247840 BLAKE2B 000f2e9f021d3e6275baafe0e70c7d24ef950e1d6ad13ecfc0ed7dc60ce09840a11401b3b6b00f1cddd3155ad4cde82fe93689a259af32efba1d01e8299509c4 SHA512 ab58d937d7b3e6374f7800fa81d52522a8fe73e67a222402b557b41770f1067348bb6b0e8a4e76cf4c983cc3e2e9df0760bd10791531b6d59cbd438c39e93537
-EBUILD ktexteditor-5.46.0-r1.ebuild 1478 BLAKE2B 1db4a6c3fbdd3149f0494d2d97ff7b6638393e1559df27f4206c10f04ec8dbd41c07d8c540c0cff133c8e1ff9ac7084f3b7cdf95169b8f67d6ddd7825d11b18b SHA512 86a33f3ffb9fbd7f077bed69fd3e1e800a332ac6e239c7b6994d5cb2656b7100db45fa19fb9f9bd6db46a827190c426a853b92dcf4b4b93b383ae3b71651e037
-EBUILD ktexteditor-5.50.0.ebuild 1467 BLAKE2B 1703e79ee198f14c5cd6ece3caca83caf24fb336951c8cc00315a4fa18128405b70b5f056ba5fa3862da0b73291bad3296732cb26edb0085c22d7236195cd914 SHA512 6765fb3da287956365ebfe558c7f04dcf0ed3b94305ada6e1622fea10751f6fcee80556f8b9d8e5364c49412621fc7e12e5c85e10d282621672082e9fe32377f
+DIST ktexteditor-5.51.0.tar.xz 2249636 BLAKE2B 5f537e5a69a6bbe51b9470908e66c027966d0c9cf362362b6c8a05345b7bcea35026ed87378d0a3b44d32cf5504766df176e6299b486cba6ae7d2a16aa618035 SHA512 9da7f51240b9772e03d90438a3e21f29889ef0e69c7af86ffbd702f7a1569cffeda52e1f24f1b4a28739366a5229348a147da994e2ffe32b1a6d5dc17213f0f9
+EBUILD ktexteditor-5.50.0.ebuild 1462 BLAKE2B 2079339d4c9abdba2f9519c0d45e2a3e49fcd0abd8bdeeafefdd78c6fb917988906b759f19d13f8bc9d08f0bab9ebf0cdf17c07d9f7ad225b4cf8b2dbb5d164c SHA512 93d1828f0ae9dc86ccb2551baddd6bf359b13b2e04545df16a5f404b318519c8ca2a969532a05b6f98187ae92292785530b2ca023c1f7ccc3e76372330192e43
+EBUILD ktexteditor-5.51.0.ebuild 1395 BLAKE2B b4be6ac4af75375ed216a680e467b88cb002a803ee3fbe64f2e9d7c69fe8a17cebe9e88ba8fe5ccee276b2e29bbdb4d0a94c57fe9aa98a51ada0911d19302ce1 SHA512 e829402126d57b4794a42e0899735b82e35dc9a2615d2a6eda997ab28c8fd4a1c1bb005488e901bec314bbf5c669bb862ac900acc0fcb9217d6cbd76fc73e6aa
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch
deleted file mode 100644
index d3b9b5d480ac..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From c81af5aa1d4f6e0f8c44b2e85ca007ba2a1e4590 Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Thu, 7 Jun 2018 16:12:25 +0200
-Subject: CVE-2018-10361: privilege escalation
-
-improve handling of temporary file to avoid possible race-condition
-
-Differential Revision: https://phabricator.kde.org/D12513
----
- src/buffer/katesecuretextbuffer.cpp | 99 +++++++++++++++++--------------------
- src/buffer/katesecuretextbuffer_p.h |  4 --
- 2 files changed, 46 insertions(+), 57 deletions(-)
-
-diff --git a/src/buffer/katesecuretextbuffer.cpp b/src/buffer/katesecuretextbuffer.cpp
-index 0647bee..c014608 100644
---- a/src/buffer/katesecuretextbuffer.cpp
-+++ b/src/buffer/katesecuretextbuffer.cpp
-@@ -53,39 +53,37 @@ ActionReply SecureTextBuffer::savefile(const QVariantMap &args)
- bool SecureTextBuffer::saveFileInternal(const QString &sourceFile, const QString &targetFile,
-                                         const QByteArray &checksum, const uint ownerId, const uint groupId)
- {
--    QFileInfo targetFileInfo(targetFile);
--    if (!QDir::setCurrent(targetFileInfo.dir().path())) {
-+    /**
-+     * open source file for reading
-+     * if not possible, signal error
-+     */
-+    QFile readFile(sourceFile);
-+    if (!readFile.open(QIODevice::ReadOnly)) {
-         return false;
-     }
- 
--    // get information about target file
--    const QString targetFileName = targetFileInfo.fileName();
--    targetFileInfo.setFile(targetFileName);
--    const bool newFile = !targetFileInfo.exists();
--
--    // open source and target file
--    QFile readFile(sourceFile);
--    //TODO use QSaveFile for saving contents and automatic atomic move on commit() when QSaveFile's security problem
--    // (default temporary file permissions) is fixed
--    //
--    // We will first generate temporary filename and then use it relatively to prevent an attacker
--    // to trick us to write contents to a different file by changing underlying directory.
--    QTemporaryFile tempFile(targetFileName);
-+    /**
-+     * construct file info for target file
-+     * we need to know things like path/exists/permissions
-+     */
-+    const QFileInfo targetFileInfo(targetFile);
-+
-+    /**
-+     * create temporary file in current directory to be able to later do an atomic rename
-+     * we need to pass full path, else QTemporaryFile uses the temporary directory
-+     * if not possible, signal error, this catches e.g. a non-existing target directory, too
-+     */
-+    QTemporaryFile tempFile(targetFileInfo.absolutePath() + QStringLiteral("/secureXXXXXX"));
-     if (!tempFile.open()) {
-         return false;
-     }
--    tempFile.close();
--    QString tempFileName = QFileInfo(tempFile).fileName();
--    tempFile.setFileName(tempFileName);
--    if (!readFile.open(QIODevice::ReadOnly) || !tempFile.open()) {
--        return false;
--    }
--    const int tempFileDescriptor = tempFile.handle();
- 
--    // prepare checksum maker
-+    /**
-+     * copy contents + do checksumming
-+     * if not possible, signal error
-+     */
-     QCryptographicHash cryptographicHash(checksumAlgorithm);
--
--    // copy contents
-+    const qint64 bufferLength = 4096;
-     char buffer[bufferLength];
-     qint64 read = -1;
-     while ((read = readFile.read(buffer, bufferLength)) > 0) {
-@@ -95,30 +93,43 @@ bool SecureTextBuffer::saveFileInternal(const QString &sourceFile, const QString
-         }
-     }
- 
--    // check that copying was successful and checksum matched
--    QByteArray localChecksum = cryptographicHash.result();
--    if (read == -1 || localChecksum != checksum || !tempFile.flush()) {
-+    /**
-+     * check that copying was successful and checksum matched
-+     * we need to flush the file, as QTemporaryFile keeps the handle open
-+     * and we later do things like renaming of the file!
-+     * if not possible, signal error
-+     */
-+    if ((read == -1) || (cryptographicHash.result() != checksum) || !tempFile.flush()) {
-         return false;
-     }
- 
--    tempFile.close();
--
--    if (newFile) {
-+    /**
-+     * try to preserve the permissions
-+     */
-+    if (!targetFileInfo.exists()) {
-         // ensure new file is readable by anyone
-         tempFile.setPermissions(tempFile.permissions() | QFile::Permission::ReadGroup | QFile::Permission::ReadOther);
-     } else {
-         // ensure the same file permissions
-         tempFile.setPermissions(targetFileInfo.permissions());
-+
-         // ensure file has the same owner and group as before
--        setOwner(tempFileDescriptor, ownerId, groupId);
-+        setOwner(tempFile.handle(), ownerId, groupId);
-     }
- 
--    // rename temporary file to the target file
--    if (moveFile(tempFileName, targetFileName)) {
-+    /**
-+     * try to (atomic) rename temporary file to the target file
-+     */
-+    if (moveFile(tempFile.fileName(), targetFileInfo.filePath())) {
-         // temporary file was renamed, there is nothing to remove anymore
-         tempFile.setAutoRemove(false);
-         return true;
-     }
-+
-+    /**
-+     * we failed
-+     * QTemporaryFile will handle cleanup
-+     */
-     return false;
- }
- 
-@@ -141,28 +152,10 @@ bool SecureTextBuffer::moveFile(const QString &sourceFile, const QString &target
- {
- #if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID)
-     const int result = std::rename(QFile::encodeName(sourceFile).constData(), QFile::encodeName(targetFile).constData());
--    if (result == 0) {
--        syncToDisk(QFile(targetFile).handle());
--        return true;
--    }
--    return false;
-+    return (result == 0);
- #else
-     // use racy fallback for windows
-     QFile::remove(targetFile);
-     return QFile::rename(sourceFile, targetFile);
- #endif
- }
--
--void SecureTextBuffer::syncToDisk(const int fd)
--{
--#ifndef Q_OS_WIN
--#if HAVE_FDATASYNC
--    fdatasync(fd);
--#else
--    fsync(fd);
--#endif
--#else
--    // no-op for windows
--#endif
--}
--
-diff --git a/src/buffer/katesecuretextbuffer_p.h b/src/buffer/katesecuretextbuffer_p.h
-index a38285b..e00721c 100644
---- a/src/buffer/katesecuretextbuffer_p.h
-+++ b/src/buffer/katesecuretextbuffer_p.h
-@@ -56,8 +56,6 @@ public:
-     static const QCryptographicHash::Algorithm checksumAlgorithm = QCryptographicHash::Algorithm::Sha512;
- 
- private:
--    static const qint64 bufferLength = 4096;
--
-     /**
-      * Saves file contents using sets permissions.
-      */
-@@ -66,8 +64,6 @@ private:
- 
-     static bool moveFile(const QString &sourceFile, const QString &targetFile);
- 
--    static void syncToDisk(const int fd);
--
- public Q_SLOTS:
-     /**
-      * KAuth action to perform both prepare or move work based on given parameters.
--- 
-cgit v0.11.2
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild
deleted file mode 100644
index ab7450b249e3..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a full text editor component"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="editorconfig git"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editorconfig? ( app-text/editorconfig-core-c )
-	git? ( dev-libs/libgit2:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	test? ( $(add_frameworks_dep kservice) )
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2018-10361.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package editorconfig EditorConfig)
-		$(cmake-utils_use_find_package git LibGit2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.50.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.50.0.ebuild
index 7894f7bd968c..ad58dd3ca059 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.50.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing a full text editor component"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="editorconfig git"
 
 RDEPEND="
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.51.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.51.0.ebuild
new file mode 100644
index 000000000000..574303e70287
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.51.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+	test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editorconfig EditorConfig)
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index d9afccf0dfcc..160e0a77c0d8 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,5 @@
-DIST ktextwidgets-5.46.0.tar.xz 309064 BLAKE2B be62336a08da98e9ebb087f15c685a37bcd2a6dae3cb41031411ed9c490cfbbbbf4a581b7d80b389aecd514b685854dbf24b5224794781b394b3967a01fe2e92 SHA512 1481e3ebaea1dd8c9917488fea52a26f033933b9a173be95243de9827a253086b9f40948f9879c1eec7366df8d74137c1549fd238bc63abbcc603fa8d3154d6c
 DIST ktextwidgets-5.50.0.tar.xz 308920 BLAKE2B 0982b0b5bdecdc51dad8ec853d94ac32ca3e2d6844590cb2babafdf73925fc2b7d5f6e67bc4a7ee14ee7dc8d9c609b682788d15af39a18d5345baab8260dfbb4 SHA512 bbb886b5f3520d7aba4b2f0fb3b63fcba7df16cf551077bc6827ca402fda4849a6148b21706c3c733cb788042a2ed1870a28104f7cb7227cbf5f3f4e14128db0
-EBUILD ktextwidgets-5.46.0.ebuild 899 BLAKE2B 0c11e1944bcb6289be5f032e874f7cbabf4b9eb698c5dcc7eeace71e563aff39d8ce1b9c4a103e8818a756d71f98045feb3738f7fc9bf2e6b045eb9e9c8fb327 SHA512 15c259873b6beab5393ccef10a2a389c350ba8be18c3374f8a50574cc7c7671d2cad29ab3ebcd4262b1f9a7cffd749b6bb18ef42b418e27f19441464de4a3f6a
-EBUILD ktextwidgets-5.50.0.ebuild 901 BLAKE2B 3a0aac93faa3492308066c10f35abc66f42ed56bd3f1dd1c0bf82e9686167b8f0e12651e3bd2c20c46e25ad1e1e1a87adc3bbebb72007572c7d858af2d29d0be SHA512 90fcc78eab913ca66886bbc4294264ccd32be9a76d25b6e383089d04562802857dfd120f85090a9138af2a37f8c93b2350174ea3cd08a46165366a4a619ba556
+DIST ktextwidgets-5.51.0.tar.xz 309200 BLAKE2B 8ea1a7b1071c388feea928b7654f770cbd61a8cabdf3de45ffa4c86044ebf683edb1512927e6d474e06dedcd42222a321954ae946b614cad37926030ef6cdcd6 SHA512 4a3d56f21d86b03f4097407d44eeaf3915b62148772f8d54a4489a1ac18d5422c44e26e7a2cb52570f0ba6502d5b006093a16fc6783e7682cb878863c4ce0dc7
+EBUILD ktextwidgets-5.50.0.ebuild 896 BLAKE2B c4c0689d5032f8896bd2412ec9779d351d1eef72a227a13b3a1f0b485088609333cf2c2a884ac717948a2827045d82995a5de4d1e168e0227b3b58e8eee23345 SHA512 cd67d350a79129b5850850eaf7b5f0597aadd574da64cd7b24e7c6a36c522466b04f814905e970c04f6cc2b9e6aaed5d557f451fdb7a9682db422a3fd3025ec6
+EBUILD ktextwidgets-5.51.0.ebuild 898 BLAKE2B 5624a11e67d15fd026a1d24a66710b86b3b7d4d8b73d5b0fe40a67ef0f9fb98e4d9fed2d210ddfc038aa8b84d56f5249ab2339bcc7b5a9f351dda59e5071a9c8 SHA512 e7ed6777c18549ffae9cf0d3470b1d2d918f1b510cbd02a75e7f49b71576ad1066f243e02fc3c7e594846bcfa1d5584dc74b7a6437090fa714014d40d15f4aea
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.46.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.46.0.ebuild
deleted file mode 100644
index 62f252324fbd..000000000000
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.46.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="speech"
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	speech? ( $(add_qt_dep qtspeech) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.50.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.50.0.ebuild
index 2bbfa4f065eb..d2ff982a50ae 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.50.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="speech"
 
 RDEPEND="
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.51.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.51.0.ebuild
new file mode 100644
index 000000000000..38985abe2ea2
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.51.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="speech"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	speech? ( $(add_qt_dep qtspeech) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 7c4f8b11cc07..b545681dcc43 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,5 +1,5 @@
-DIST kunitconversion-5.46.0.tar.xz 774004 BLAKE2B 500ecd34a34d5559cbfb10e5dec01d734659a22fa731ee20cdb5443bc7b172df281e5a286b403df7eba79177c5296092c75743e6c2382151ddd2cfa8cd7b561c SHA512 eaad17632a19efb3776ecc81843f5d3a437fdbfeb6bdfef12bffa7fcb3c8b2f1dec8b192c29dfafa1d0de17f6ae9aee9350290eee417d915e180f89ff17d5cfa
 DIST kunitconversion-5.50.0.tar.xz 773332 BLAKE2B 1eb1f0c502a9e2fcde9cb288d697e07591461ca836daf0456d5f7bc587e9374e8de4933f233effcf52df5547e7b8c1bcbd7a1e95adb9973019ea87900db0b173 SHA512 82dc61f9893e6d1f7215226a1bc87404a09d8c29f384dab21fb78a2620ffb3ba45621beb057ef803f95635f2e8b1b0f3e57a9dbcbf815871d45c87f70d53750f
-EBUILD kunitconversion-5.46.0.ebuild 442 BLAKE2B 662656b16527394504e3a8a2be2206dd49aa4682176f7942987641428bc290969cc3f13fe86a4f043024eeacd0414e856a91f24df061cd73c92c23a20f675926 SHA512 b55cfa1fef7d87ba53df4b45ac806dd92c4170c97212f527c5bf490b54c5f152a71b09a8f2848dba66a532184d8e107c0e373272226b5a232e9fc9605b9990de
-EBUILD kunitconversion-5.50.0.ebuild 444 BLAKE2B 635cbf217f3292c2c80edfd0ad8451ed99cb351b9ec8cf6e49fb7cee0940708c60607a008bd9fea3162f3686f5c162c6cfa3569c3016d844f98e3ed19415bcc3 SHA512 2707cf4e5e2cb6721032c31b640a009c2993bee3b264066f9ff2ff77084feb9a2c2719c758f3596213eef2f5309afadabf883e93cf499df50020024a71f71620
+DIST kunitconversion-5.51.0.tar.xz 774332 BLAKE2B 445a736b1baf2f0f93ec51b9946a789c8c6faa98b9b67589fec6a74cbcb94c85b4c60cd8d4b95ed2e02a1d8293cd04fde82be3da6e125ad6f66ce5d340d69cb5 SHA512 d258c3a94392e742391d592e100a9e6e6d89c375306b1fa5a0f35731495e68667f2a8d334472f77d0a584783e1f393cf7eac1bb7ae034f94936cd3fd131b1c3e
+EBUILD kunitconversion-5.50.0.ebuild 439 BLAKE2B fa6559bab3ac907fb7602a75641466bb661e7383169fd7d71a40036a957eab1f150dbfdef9093ace73153e231b24e9a8c283b5f42f6ae4ee940c4922e728a51f SHA512 66361e223b382f238020015f2401ca0997552abe610e935bc43eb3f51c4becb79070d2823680960628e031cecb609caa16a83cfc6c8d6b6533877d17747120b6
+EBUILD kunitconversion-5.51.0.ebuild 441 BLAKE2B 0def497643da74ecb345a060aa183429c678aade63a8587677a0004e6b733ad28b8e1c85e358ca1f0ef47dd92745bb110202ab9ab8ff6c91fa0e455a1f50e5f3 SHA512 ccf85d9169559828bf61c915b0475da4572fe60e9d8966dfadc5d29b03a0c8c51c80e5d2bfb93374051f21d7930e05d31f893857039f9ac7234c335464479eca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.46.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.46.0.ebuild
deleted file mode 100644
index 5ee4c157561c..000000000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.46.0.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="Framework for converting units"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtnetwork)
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	# bug 623938 - needs internet connection
-	local myctestargs=(
-		-E "(convertertest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.50.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.50.0.ebuild
index 8f880d3d8fcd..6d7ce8e31c8c 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.50.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for converting units"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.51.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.51.0.ebuild
new file mode 100644
index 000000000000..d98b3a49d376
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.51.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtnetwork)
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	# bug 623938 - needs internet connection
+	local myctestargs=(
+		-E "(convertertest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 81419499d00a..19187292a5ab 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
-DIST kwallet-5.46.0.tar.xz 307032 BLAKE2B c579c28981ab90048e8ebeffce9d679914441c2bca7f4850f87f6c3fe5af218ebff5645eafb6d52497b54dadbefa5efc5e1f376d87df0775c834023ce8173614 SHA512 244c386d5739752fdc27a3ef9b5a5a90a529ab842e7337b8ef9c539781f230bfd0dac487cda370a75bd9a6c0eda52549c9dda0fd6a27b1d243b373b05cd57d46
 DIST kwallet-5.50.0.tar.xz 308580 BLAKE2B 4e2e8644d40569e62edc2da692fbd719f40462af2929c5f187d4c8bd212343e9788fc9c79714de32767d4c97d411713e69e911bb9a4dc9bcb0fffe5f133b80df SHA512 45d798775898a8781be3341411c55f07df668d2f13806b3085e3c9f77926f564d6dc5ea3425aa3e0fdc42276125f320136725cd988807fb1a29b22ccc1bdccf8
-EBUILD kwallet-5.46.0.ebuild 1574 BLAKE2B 6ed7935defef3c4b7b71aec96c045b78bcd33619d97b9075aab6cc0f7edf88614701804d4652366f09aa582d2365759f504230dd7e0bed162511f31dea44938a SHA512 311077967a4db1d904fb44e212f3347c0fe8daa272c4abeae4e4c7fd0a11f62117bc2b29caf8707ba97dc8af2c485eca9a0f9dc126a920ad6303d911b7119280
-EBUILD kwallet-5.50.0.ebuild 1576 BLAKE2B bea0446006a7d6610c1c06fca0b8df0a7431bb7fdd45d2a8d80cd41fdda8ff2f13f19dcd119859bf6f6b8bcea64948806e53229df5c4064362c30c83280319af SHA512 17c1643b34a2501924da0712ba5b1cef4f9a454b54449515342d95ae074fdba4618fbe844367bcbd1f90111f1d5b45b18d6da3584ae3fb250dca8b89026c5516
+DIST kwallet-5.51.0.tar.xz 308704 BLAKE2B 6a75b6ca04fe94486fefd0c81364134ee28de0e98551aeae6dea1bff03a401c956ea586568c3f95b6a24e55004c0084479462c4f510dc46ab1b3d81f2633224a SHA512 edb4129ad542d1b359c5a6f8ea2d84b400fe314138e22441f560e399b0209c6cd6be216ffc1b9066d6a05a880920ca7ef6969e24de9fe4a355cb291c6c5850ac
+EBUILD kwallet-5.50.0.ebuild 1571 BLAKE2B a3fc8fbf93b2d846048d5dc9746b6956d816247c937e9af2f0c7d8619cbdd13df3c6beeaadbe2e0859fa8cb6d9d85999dcc09debbd44f9c8c56dd870bd33888e SHA512 9881c2a2560f824133ea0b26e7ee9df4f47bab14ae2f25b5df992e55568fa19f8c39f5dfac36b34eafae9881f9eac3c0814a6eee4b557cbcfc016468b313ee38
+EBUILD kwallet-5.51.0.ebuild 1573 BLAKE2B e5bd9dc3cdc27268e52d085ddec6a31307e0bde8174b47b76fc72f0c6d843d1c1c1bd685619ac5c43adf373db8d1f15e4577f2973f2e65999a976f81b27b79d9 SHA512 b65a9a87d9c77cba8e32b7ed01a1775da5e1d7f3eeba38f4e06e6af85dc2bfce02cd15d41923442f272c58091605dae4b7673f99e2f4348c2f006e3b08e03a83
 MISC metadata.xml 433 BLAKE2B f33e8e33f6e8ddc49a85ec7494416546ddaf4db590b02cb3e4ededc7322cd088b7372291777dd836152df31f0ad890b61638b721fb2fa025d007453850d9e2e3 SHA512 c5285c0beb12f4f5c81f89e856c63737a119f9758e4302e3789603fe8daa3c675674698105e38194eb383097c7f57e8ece1e7b845fff1822cd5ff8b0688ff1c4
diff --git a/kde-frameworks/kwallet/kwallet-5.46.0.ebuild b/kde-frameworks/kwallet/kwallet-5.46.0.ebuild
deleted file mode 100644
index 4d88f86436e9..000000000000
--- a/kde-frameworks/kwallet/kwallet-5.46.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
-
-inherit kde5
-
-DESCRIPTION="Framework providing desktop-wide storage for passwords"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gpg +man"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libgcrypt:0=
-	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gpg Gpgmepp)
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
-		elog
-		elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
-		elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
-		elog
-	fi
-	if has_version "kde-apps/kwalletd"; then
-		elog "Starting with 5.34.0-r1, ${PN} is able to serve applications"
-		elog "that still require old kwalletd4. After migration has finished,"
-		elog "kde-apps/kwalletd can be removed."
-	fi
-	elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
-}
diff --git a/kde-frameworks/kwallet/kwallet-5.50.0.ebuild b/kde-frameworks/kwallet/kwallet-5.50.0.ebuild
index 9ebbc724defc..3659cce4e064 100644
--- a/kde-frameworks/kwallet/kwallet-5.50.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing desktop-wide storage for passwords"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gpg +man"
 
 RDEPEND="
diff --git a/kde-frameworks/kwallet/kwallet-5.51.0.ebuild b/kde-frameworks/kwallet/kwallet-5.51.0.ebuild
new file mode 100644
index 000000000000..44c284230462
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.51.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gpg +man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libgcrypt:0=
+	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gpg Gpgmepp)
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
+		elog
+		elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
+		elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
+		elog
+	fi
+	if has_version "kde-apps/kwalletd"; then
+		elog "Starting with 5.34.0-r1, ${PN} is able to serve applications"
+		elog "that still require old kwalletd4. After migration has finished,"
+		elog "kde-apps/kwalletd can be removed."
+	fi
+	elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
+}
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 300179b3a05d..116b742f1c32 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
-DIST kwayland-5.46.0.tar.xz 304260 BLAKE2B 210a092fcf8e323e1042a10c2178a56811b12d110246537d184f126a1cbebb47875dc3e5772fddf183560bdfcd0ef9cee124a9e85424e6ce3b6d33e8b1f0685a SHA512 9713b94ae775abe30e65d6976bf978306640adaf1c3042f7a891e9baf648527ce8fa902a0fc13dcb7d247e7caac6bb645f234db8ec3d62fd7ec67c305772c19a
 DIST kwayland-5.50.0.tar.xz 324064 BLAKE2B 9a38b70ed0253b5052ee3e46d35bd41404a435a0a6e9ca17f7900772945c40ad6f49b40a1bc9ad98268ff8747baeb7baaed2111befb4cdb9eec97a950e3d1a33 SHA512 6698eace0b13d276b24ccb47cf15cb04c6ee473d5e21adcbd8729a02bb481387faf280b4fff5a7e94965671424e8a1be6364f17e738b929d2a5b1d6638c15428
-EBUILD kwayland-5.46.0.ebuild 577 BLAKE2B c38d2f7f505585285b4374e9f020c7d3bc6843ef153f448e0b334d7e6bdd86f13c2070bfe29b0314b36b3bc3e51c58e44c1dc8686b9bf3b7e289442af398ed30 SHA512 8ea7314f46160c49e681e887de5a657ea8cf13208f074e43282afe1879f34352b8afd541cdf52071e3fceca9758ab8bf4c88ecf344f7ddcbaa98865f4fac6ef3
-EBUILD kwayland-5.50.0.ebuild 579 BLAKE2B ad3c16b9cf6424b2ee3d71d51973d78f63229d1c931a2593fd93bafe07322b0cfd92286812b6fc8f18107781171f4a059a7d4a2768205681a43f195e45eef99c SHA512 8c5d7cdf1369f8fe4b66957c30ab5fb976a773cbc3a464a3c728f25d58452a65f0a2f4ad5f898c3d474292f0dd0ac66bf4961169876cd09f149a925179851d1d
+DIST kwayland-5.51.0.tar.xz 324764 BLAKE2B 5b4b23cd9fd2b29758b4dde8e90b09fd0e799b06fefb12323adb9658fee0bd1810fc76aa3e21e70f466dcf84979ab7f17d8d212d940a469f2405bc6ffcc41b76 SHA512 dceb2b39757ee55ffcad88741556925b1467198e3cc66d9af3ee5eb707e3c226bcd2c5f8079754b7163421239a28931f86bddc543a15b47ba35a08acf3a6ddf1
+EBUILD kwayland-5.50.0.ebuild 574 BLAKE2B 378a61cd4fa50ab88b54d6ac93d68bbcee8257f2d5f4b5fe18b3a31aae2b27048cd05d04034fc3759561394fc5afe9368b61a29193f16b1b4934e7a4cfd54026 SHA512 2a737741652c2df67a4f7b322278f62da3d911bc82e3f28d79584ba298f0f7e4bbfb7479ecfb92b2c42eeef8318b5296f4f0d60522944e258de516f48fa9d6a8
+EBUILD kwayland-5.51.0.ebuild 576 BLAKE2B ee3a6ac0598b1d0821de7ba1f18ebe46e783f12f602edc2ce4bbea2dbe0d589c0160d45ec4b8f93d87b35f0dd00bd07d52a5d6adcf3db69221599ae9f5297e1a SHA512 4954ce722238052ef6f485afec845fa015d938224a1d39b6d81d72e8fd31118424f0ef16b36a79089b5741f24cf463c9bb66052ec2c9afa4a3dfe77285ca2701
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.46.0.ebuild b/kde-frameworks/kwayland/kwayland-5.46.0.ebuild
deleted file mode 100644
index 96673a4f2300..000000000000
--- a/kde-frameworks/kwayland/kwayland-5.46.0.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="true"
-inherit kde5
-
-DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
-HOMEPAGE="https://cgit.kde.org/kwayland.git"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui 'egl')
-	>=dev-libs/wayland-1.13.0
-	media-libs/mesa[egl]
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtwayland 'egl(+)')
-"
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
diff --git a/kde-frameworks/kwayland/kwayland-5.50.0.ebuild b/kde-frameworks/kwayland/kwayland-5.50.0.ebuild
index 4bc9d6baa35e..168b66750d5d 100644
--- a/kde-frameworks/kwayland/kwayland-5.50.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
 HOMEPAGE="https://cgit.kde.org/kwayland.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kwayland/kwayland-5.51.0.ebuild b/kde-frameworks/kwayland/kwayland-5.51.0.ebuild
new file mode 100644
index 000000000000..80af696c8761
--- /dev/null
+++ b/kde-frameworks/kwayland/kwayland-5.51.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://cgit.kde.org/kwayland.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui 'egl')
+	>=dev-libs/wayland-1.13.0
+	media-libs/mesa[egl]
+"
+RDEPEND="${DEPEND}
+	$(add_qt_dep qtwayland 'egl(+)')
+"
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 52f9b1f356ad..cee30a88f029 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
-DIST kwidgetsaddons-5.46.0.tar.xz 2183504 BLAKE2B 5f8535b6e0ebb93eed8fd8e5079fc00476278bcdf70cad97b9309026066f0fb7b872210ab5cef21a15f5043ccdc5b73bf74be8083a67bf90be4796f76f1cb621 SHA512 7b5f7ea2d2af4c5d16f4a826031bf452545d55c4041c34610e82ad2d65d28404d4f2bc928dc61ea4a181513d607c6268ea9d9fda93d284396e35f9caa502feaa
 DIST kwidgetsaddons-5.50.0.tar.xz 2188280 BLAKE2B 6bf8e4cf9d63d32a2573a2da7728b099165ced231f97f39eb40cb89307362d3dd0de75582e89c8a2ac8b849d8a9bd8c6ff258ab84108448a98c2a89446f3a312 SHA512 91c4824d1c5b889c11f84fe95f0e48453275451d3e2e7c5b4a5603fa5db4ffbe0ab20dfd48bb3fcec8576c4f1d494a5fcb5d53e84ff11af01ded26b93377cfe7
-EBUILD kwidgetsaddons-5.46.0.ebuild 525 BLAKE2B 84ebfedb8b64ae54a2adbe4b2817da2b8ffd6fcc3c220043aaa22e16bd4319cfcdc50d7b6cc837df5f20626d0fc74cdef171508cda842c54e79840cf0af6550d SHA512 3ecdad985e7af9bb57814024bc29bdaea1b7bf0e1019702e9f27ec5161b697888fef618b3123a2778dbc39c6743019b15e46e88010f15f104f36f7770f1a3af1
-EBUILD kwidgetsaddons-5.50.0.ebuild 527 BLAKE2B 4aa9b42503b70985dfe90ea3a726d568ab272cd52bac59734578589a5339cd1608f43b03074cfbcf6978f363812eeae2813b142595569b92d65c941ef33e36b8 SHA512 1dcdceac3c33cc3d9078c4fb10a61b1c1367cd605242d10cb92a34a88e2f8cc316845c7a7d5368a3573ea8ffec581600457c55dd061c0fd1f24ddeb99156141b
+DIST kwidgetsaddons-5.51.0.tar.xz 2189776 BLAKE2B ccd496e1bf88f61f35c22f13bdf86a9681bdc5ab33279756c80b609628be24582db7331298556683fb29c68f6453c6d3da997a8108d13d79931d4b1577276571 SHA512 01383c3ccbfbbe4fd871aed636d5ba7a2d4df83b08b2f1ede54449f1695756d76116489dc6e32055c658008c2419912426fb1246bd02a0bb0358ca87c2ec9d9b
+EBUILD kwidgetsaddons-5.50.0.ebuild 522 BLAKE2B 0875eb8feea99bfe3e18fc121d3fa3b457ef62351959926c50cd16cf0f9629087c89e7940f56e6c1ed4d446d66db434b37797c76a2992994bd34c81157d0c579 SHA512 d1abbc7350ed8ed8523e14f758bb714d88b83b84d56aa552e02c123c611a9d5a65149420442b80240513dcb9118bc903140eb2179ff884a659bc967dba71710e
+EBUILD kwidgetsaddons-5.51.0.ebuild 524 BLAKE2B b7d714386fa4e7ffb4b082190dd89e0994e2a834d7d39f431afa636dfc336732a798152e8f37630b0d1fe474de37e09b911161c642bdaf52a25e77a24815baec SHA512 7bd844c1c417b292ebd2918e7ba500cab7ff5ba10627207a4f27cc9824145199e56242f573f0a4ddc0695608b6e61144e41aa31a308432821f4daf11e3d6e93e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.ebuild
deleted file mode 100644
index 5f797ed476b2..000000000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_test() {
-	# bug 650216, 653186
-	local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" )
-	kde5_src_test
-}
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.50.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.50.0.ebuild
index 1b30813bfb33..7e921c4c8982 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.50.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="An assortment of high-level widgets for common tasks"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.51.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.51.0.ebuild
new file mode 100644
index 000000000000..24e9525c6d0e
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.51.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_test() {
+	# bug 650216, 653186
+	local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" )
+	kde5_src_test
+}
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 8ffecdce634a..2ca836953014 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,5 @@
-DIST kwindowsystem-5.46.0.tar.xz 169756 BLAKE2B 32421aa4daf9617bf5f2c6fd89b923371932a7a3b9374db2bce847c932449519d5c26285861273b4c4cdefcfebe7d9acc016adc2c728961451c7af1a58547256 SHA512 a7d0b05445c1d5fba74d8e1f9330711c402cfab630d219f3556848020e5ef18517a5e4599c67f761cbf92635a7f30c705234142b94967803e288e49f8036d10c
 DIST kwindowsystem-5.50.0.tar.xz 169768 BLAKE2B 415233449722da8d5b0911420e544a10030873cd687d13774bd686759efd69cde0273760a4f385676a898f05cdea13d1570f5b0d5cc37eb972354adb87e24647 SHA512 7e83e07ab587ef4a0edd58ca22ecba8277f97ca6438f537b6475bf03225559d207e80c2fde4c1ce5ebdb78b5a4c1e04407af9cba0a5dacbbaeacf3d7b14a9ed6
-EBUILD kwindowsystem-5.46.0.ebuild 766 BLAKE2B 314a264be37bc3fc0980d3fea434e47df5c34a1a730cc8899e55418efbb634cee399cfb1718744f1f0f3d26e8c323016cadbd0c0280bbeb2c175b30d25ae88cb SHA512 45c52f7e83d5c8f1bee49ee67b953a8d6e63cea922e23572bbc7e08fa3d7522e9a87690ee6e1944dd29a8ebce125d1d7ad1b2294fedd150e78a69b5942eb11ec
-EBUILD kwindowsystem-5.50.0.ebuild 768 BLAKE2B 479140927b58c3373bab967b27ddfd1c750447d634bb8cf01306bfc016674ed4763f8522a6064502074b5eccc3b7e3333e8af5c14a3ba0a9a4b7c0c3dbe0ca65 SHA512 ed663f56653f6017151bee929089b4c784c99f0e394bdf476cea3bf23c8dff899daa31f4f45fee377d02ccea92731f6b50cface4c67df1dc2012842a0c62361d
+DIST kwindowsystem-5.51.0.tar.xz 169760 BLAKE2B 14d84000224fba88cf9ecc66c19e0a7ad664162a8f5f92393ddee7836aebbfad302eabdc6c8804097e5f3ab3fe2b8f931f7e515bf273175c6f21e443a51a5d12 SHA512 cd2703b1cc87722b6c37d1380004d50f0899c1be508dbd42fb45392440ff8ca77eb1df0f0658a2e096b5cfb50b1bea76dc9226dff692e87ad2c8e81502d75f41
+EBUILD kwindowsystem-5.50.0.ebuild 763 BLAKE2B 73a983e5efe873a42b52449d8078685b66990242b837f054ab874e50fae53ed54338f5a73845aa8039e367b5a7f0733fd1ecfe79b1a1a7373892b5529c8564a5 SHA512 d0dc1cf26f862272a602602ef917e42186ad9d2236d3be3386db69ddc5dee92aa31ea87e10e50ff3ef5fa55f4cadafba444e3b76632d36cd4d99fe15e7bdf3b2
+EBUILD kwindowsystem-5.51.0.ebuild 765 BLAKE2B 2bdb74883bdc0402cc9cf4acb4ac9b9dbc22bd8665b0e145c5defd8ffc9843e60aaa642d9c90b20db9c142934ade738fb7abcfc1adc8f4221964a076b131e01b SHA512 37fa1947e6514924d578d55a3cb5f69e932b6bf98992423655255a853345b5ced2af9811a46262443e70bde6aa01c737122335e53a6e3df243b9b049747d7263
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.46.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.46.0.ebuild
deleted file mode 100644
index 89a0bf846fd0..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing access to properties and features of the window manager"
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="nls X"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-DOCS=( "docs/README.kstartupinfo" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.50.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.50.0.ebuild
index 0c0b8f82e49d..66dd0a12a1d0 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.50.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing access to properties and features of the window manager"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="nls X"
 
 RDEPEND="
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.51.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.51.0.ebuild
new file mode 100644
index 000000000000..56f417f3568d
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.51.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+DOCS=( "docs/README.kstartupinfo" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 3a03e7b8120c..ffdbcbab4f13 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
-DIST kxmlgui-5.46.0.tar.xz 884584 BLAKE2B d3beefcdf8ec6bd3e31d6a4a0b505725d7fbe9964f0d6eeefdbe6403b65ac7fd6e040da619fc4d6d87152ef1b6278a9dde34b7baae81a0835f66ba3a8d7e68ee SHA512 2b1595a83957fa2a9c974ba991fb17a83032e52c06bbb76c7aa0331af0d27efb1509fbbeba66e6c2292f674903b20b82b570aa32ee524b2c3f5d8e76c7d25848
 DIST kxmlgui-5.50.0.tar.xz 872668 BLAKE2B 753f7e3a1a796eb8976226120ad8a6f2350f1339d43b49750475574e35e2b58ed294127206e11bc5a3167870381ae7a09edcb510b7c6375a45afa7b2369120be SHA512 01915037c1709df0a04d9651d0c56f21856448636937188c50ff5785de374f68d87e9bb8a4f553b8247a601e186c4291b1e5ff4ec9bf89dbfd7d975c527e064a
-EBUILD kxmlgui-5.46.0.ebuild 1204 BLAKE2B c536c6bb3c322e51761850249b03bb2eb010455e1c454f0e4aa365475b4d412652ca750c67c1f3dc5a0561cec51ba21f7257388a66ccdcb3e91dfd1ffdc3a656 SHA512 3cd83c1ab8c22a61ad297fb083e58646e6d1f638091642188266405cb0540b6130a1424afb71140abbf6d5a78d22b3adaabdc5ae4f6b04a5f102ed12f5227ee1
-EBUILD kxmlgui-5.50.0.ebuild 1200 BLAKE2B d5e4a352c281b0c379d2b65d23f3a34c24f4eb2c2687cbc2c5a13ca473492d73ee538e7b9930219d3a20674524a826e8928b4d75f6f58dd835e0cd3142a9b34c SHA512 3bdf9d9f0bc900ccb15b37796effe30d38bac165dff0ffeb206253688fc607d96f32f222a846b9c92f89bb95a206cde4bda51b2a75a2834d9199347c75ba92f4
+DIST kxmlgui-5.51.0.tar.xz 872732 BLAKE2B 89f2301dd0a700ca015f7c9c3ef7289aae9ee2486a260ad3257d417a6391d166d1043e33447557b2fa753c17aab724798d6f11ef7b27741cca38e6524e1c25b6 SHA512 2da28eb4b5c53e0cb92fd140f4edf355ae84e8f507f3475540260eaea96149178a16eb2ae9bd1901eb1a04a8e0e2acb5c2b2083e8a3c114e232bdcb5355832bd
+EBUILD kxmlgui-5.50.0.ebuild 1221 BLAKE2B acdaccd9ec7f22fda28b1d27ed9821184a1554a28c0e5df772aa9242203bda66edc342defb7cd60b3a2cc1fb07ddbd46c09930eafdc881d230ef2db710e6e453 SHA512 bac10638129d1cff3b7653bb25a4b4f87bbd0ce43e8dd5f192979da6626134b7cbd95ff08d4f0be364f984054e8fe8260d5f986af28df8e040de3324c29f2d75
+EBUILD kxmlgui-5.51.0.ebuild 1223 BLAKE2B 6653e08ffd32b47bba5e770655b9cf181bc9a4091df2418019a7179d362b65f7b4da47091da92e3b93e84138d2da8be473f5b979358dc760f1b67877c692c45c SHA512 f6e1870e9b39243bada3dea938bcc1f5e875ee85cb508bf7c551f0f6efaa9eba122b88fe60c9128b93c8d7dd09b0461387d47551c9834fa34d16cc5b8582fcce
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.46.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.46.0.ebuild
deleted file mode 100644
index 4fd117b215e1..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-LICENSE="LGPL-2+"
-IUSE="attica"
-
-# slot op: includes QtCore/private/qlocale_p.h
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtcore '' '' '5=')
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	attica? ( $(add_frameworks_dep attica) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package attica KF5Attica)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# Files are missing; whatever. Bug: 650290
-	local myctestargs=(
-		-j1
-		-E "(kxmlgui_unittest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.50.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.50.0.ebuild
index bfcc98e93ddf..5ca8e7cb944d 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.50.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 LICENSE="LGPL-2+"
 IUSE="attica"
 
@@ -43,9 +43,9 @@ src_configure() {
 }
 
 src_test() {
-	# Files are missing; whatever. Bug: 650290
+	# Files are missing; whatever. Bugs 650290, 668198
 	local myctestargs=(
-		-E "(kxmlgui_unittest)"
+		-E "(ktoolbar_unittest|kxmlgui_unittest)"
 	)
 
 	kde5_src_test
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.51.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.51.0.ebuild
new file mode 100644
index 000000000000..e72e5aeba2ee
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.51.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+# slot op: includes QtCore/private/qlocale_p.h
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtcore '' '' '5=')
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	attica? ( $(add_frameworks_dep attica) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# Files are missing; whatever. Bugs 650290, 668198
+	local myctestargs=(
+		-E "(ktoolbar_unittest|kxmlgui_unittest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 0f86deec3468..e48ebe5a277c 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,5 +1,5 @@
-DIST kxmlrpcclient-5.46.0.tar.xz 29520 BLAKE2B 3faa660cb9677235e2128ec246d950821e33ccf2439d68c317e91b60429abbda9be5a16b36f92b0e54b554e34c16bc0c60cee2d534e0e4573b23ce2fe48c1a89 SHA512 7eb714b34131f1f88fda26f0849fc3a420c7e17c3b2a0b04ebebf76e2f509ac68467e3552426adaeb8e2aefe007c8a24d43280ddc707793a9ea29bfd31551904
 DIST kxmlrpcclient-5.50.0.tar.xz 29512 BLAKE2B 72f11c4b3baa7386abafffc1a1650e4973a95d58f50c7355a1623c6bd8dacc1b3dfd59c4644845a90a4280354693c0f1a00c131aa30f65c7d44a81c92c06fab7 SHA512 08c207cc2c0db165ed76ea2c92bfbb1ed9eb49ace49ffb3bfbfb8780a0b335e0938504fe370465dc074ee6bb02f64a4d5f5bce459729215a334bfdbebba4ca98
-EBUILD kxmlrpcclient-5.46.0.ebuild 426 BLAKE2B f9856a6a9c6954c53ce2d4df674eea6c244fbab4a855b7da775403447467120a895747ad6ebbfae15a788508c354172d9bc57f32bf4ed4a4c02a7852d82e3ff0 SHA512 a799ed8b5b4acd2686c44d7b90131b0a934583a7135b8146996f42bedc7035b992d518fde30f6ca0e561912fb501845d758ea15a2b6dd123d99d4cc767cde316
-EBUILD kxmlrpcclient-5.50.0.ebuild 428 BLAKE2B 5d998bf9d6f8d4c3fbeafe073737a7f8c5aa1be1e7df79c01fcd1925590fe158cfcba17ff489d0ff33290692e3ecac6a7b3c7b810611cb4944f474bf6692a3f6 SHA512 b41cfa153cc3802acbb01341daa104fe9fc01f2dd5a5e3c3dd996b063d31a3642de9640016fd930b54ca9c97c399c10e1e39ee6bc83939253488a92b4564d38a
+DIST kxmlrpcclient-5.51.0.tar.xz 29540 BLAKE2B eba24ce0674cf2abdd7d0bc0081c1970141f7f1761fd80a59bc580ffe347bec184dcc719a69fe0688a2dc01c82b57f6e0f9ca9bc1ee47567b35ae0b478d0d4e7 SHA512 149e12d95daea4185c68a254c7c9cdf100a9157018bbaa96367c5ec87863464caeb9aeed1e39d492c12e05edcefdd2c8691cb6fca2fe0e81a95a358a375a43bb
+EBUILD kxmlrpcclient-5.50.0.ebuild 423 BLAKE2B d8d7e89a6d25819415e1bb192702f58c31fd785d606eeed6246ff2661027f18c023e3e924b9cd857af8e0185123c42c62d029b1ab0d853a013d5f785055a09fd SHA512 581a27566b2acde930a48367fcbd323d95f796a669962ece8646b6237bb658b838c33eae263ed3230ae7c31d44c50d01276a049071f45390e6dbc2bfc4f6b391
+EBUILD kxmlrpcclient-5.51.0.ebuild 425 BLAKE2B 4a137ba61febb18a157082f61b65c57a4ce6bf20dc4117bf598c5f09dc1ca3259310352040b442d5eccc771faf6aa4cd5d5d7c1d341f59a4dd12a15f0e033aca SHA512 9f606c3bbeae72cdf322b13525cff2a1c475a62aa6540d07dc7da38a558be8c9c5037e392dd8bedff0d2171e9e3c649d706866f479fafdc3ce4cbd5b8d766dee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.46.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.46.0.ebuild
deleted file mode 100644
index c9574c10aed2..000000000000
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.46.0.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="Framework providing client-side support for the XML-RPC protocol"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.50.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.50.0.ebuild
index d9a11e8ddd03..4b32aa5fcbdc 100644
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.50.0.ebuild
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.51.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.51.0.ebuild
new file mode 100644
index 000000000000..00dfc58f5a4a
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.51.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 34c6a36c8905..e69715c2166a 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
-DIST modemmanager-qt-5.46.0.tar.xz 98336 BLAKE2B c6c4d45ab9ce9d3840ff97343310e769198df16cba1519ee0fcaa94e6931849303729fecb9e1d2e689c8ff693ac8669ed8aa744a568f96af5ea049e3b4f9dcc3 SHA512 01492c143c7521a04840c43425e5f3d4a02023fe59b5cd280313c1f3711f06505be3cba68e9e3c9d5d4386799dcf97a94b9249c43aeb871f9f17e6c507fffe84
 DIST modemmanager-qt-5.50.0.tar.xz 101180 BLAKE2B 9db7a7ba2916b5611dd675d27691a3b475cd4fd7e1f4e434643e4a216f22a7c18b51e07b8be374d990362d755a69404a081b80e4f251bdb6311bf0cd02405b88 SHA512 88d6c8c7b8411f531f7e1a092f304dfbe3e7ec75866153af327e6639b092c99754acc6ee779b299a1a0ba7aff115f2ef3f986fbdd3a8f35524a41a1ac474abe6
-EBUILD modemmanager-qt-5.46.0.ebuild 393 BLAKE2B 47668a424823f97849b48fce28bd1e62d937b1e48ff0ebf88e77b96a63d34c1b7483b8be1ea69848fa922d7d9c7051d7dab785546f67b931d9dfdd615a11eef6 SHA512 cf5cbcb98fad45ef3cb8b56ecb8e2d83bc36bc0aff806614e35d815848d2ce606417d5a1b2ee41bd19d8735a98e5fbc0b1bcb48fb72a066d376bb891ced3b5ac
-EBUILD modemmanager-qt-5.50.0.ebuild 395 BLAKE2B de105df8a4e9a3051e5a9f3db826f40a04dad408f76bf7c523b23eef0421af86e2420df9bd0bd78df301697ff67ef9b44b4c041947a025bf32bbea41cb9c8468 SHA512 5a2e685b48462c723284aaafa72894c7dcb5a1cc832bf275e3b158c19c82b736a4e5a614418b0b0f0f9333af349e1855b5e7eb79811576b1ba46867a9b716af4
+DIST modemmanager-qt-5.51.0.tar.xz 101192 BLAKE2B a792d55dab19d4c12b776aee8f6384ac758ccfcabd0529ec5fe1c15b27a1500bd6d30917b2705637413fe5d1b984b99e2760ca81d042649ccf83af45d9e97029 SHA512 7e4456eabbf9b8921b0b34a61086111c93e8f6018aa6d32d7db0496bdbf5f673f73ddb34672489986f3e3e89156d6d2b0fb8a6350073e3fe052a923162aac346
+EBUILD modemmanager-qt-5.50.0.ebuild 390 BLAKE2B acbe17f0b9db037b2e7b596ad420fab293d73a08b22ad81bdc5ab6f7dd67d1fb25a9df1ddb7012be7172a78632c2c4f00dc9c35e29481a5150ac2053404d0f20 SHA512 bf0384b7fdbe9c3504a8de4bc630012264ad0ed225b6058c4274d79b4dfd21c1506feba38c478656fa83bd4b39d8c1b1c2ce886d2683b434961f2d030e36e9c9
+EBUILD modemmanager-qt-5.51.0.ebuild 392 BLAKE2B 7e714e8ed87d6ea7a60ed91e98588b7cc1b6d41e802abb9dfd818234f271bacf3291426744b8486035443796ef7629c1566ec6952cd001b8e31e541a3cfacb17 SHA512 47330b10690dc1a7d624f593d059d8c2f48cb335516d372993839db6e116a9261738c6322e972d8b441984ea89e93732e4c62cfaa85a79c5d0792f6ab472ef9b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.46.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.46.0.ebuild
deleted file mode 100644
index d20601696a93..000000000000
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.46.0.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
-
-inherit kde5
-
-DESCRIPTION="ModemManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtxml)
-	net-misc/modemmanager
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires running environment
-RESTRICT+=" test"
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.50.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.50.0.ebuild
index 0c4e09a7567f..e27fb5c97321 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.50.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="ModemManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.51.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.51.0.ebuild
new file mode 100644
index 000000000000..1154f73bbae0
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.51.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtxml)
+	net-misc/modemmanager
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# requires running environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 40d21632a81b..3d252d2c83a7 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,5 @@
-DIST networkmanager-qt-5.46.0.tar.xz 162992 BLAKE2B def44b047d624b79ffb3e2c96bd52b5072c9053e487c022afa01335e58962ee24dd306822d8dc7a06fa9eaa337f2ffbdfc40d778b33c40d00ee2593a1552eab8 SHA512 6ea85f44a014fb11f7274d7d81b22bea81d7025d691d56393d6c67732ecc081fb78c5a7b26be8ce6c7edcde23078a4f2e52c68f5ff04fca512b2225a509b63a7
 DIST networkmanager-qt-5.50.0.tar.xz 163628 BLAKE2B a3d456ab171f41ef2d7ae395f11afc7f25919b3ea214cf2bcb33a29d22f508f7a66f15aa0e83d4afe1d988f10b498e93b5acbcda52ef426dea1627f821c666dd SHA512 86dcf7c79f51f4720b5b2d433f7a34b685f38fbacaf5c18ab2872013f2f3bef9e92adb6f11ffa52b24102f3c108a9caa61e888995101578d49e25a4cddc87f86
-EBUILD networkmanager-qt-5.46.0.ebuild 687 BLAKE2B ba61c5b558e83835697e5db9440b5f844333abdbd43ab3e37d312fa852149fa55709b79152772fdd731d61649093cf2ec9cd44bfda245093f27705ad7c486e80 SHA512 06150a496c4eb0d58a022030d4e89c24d0f35b968b1b4e78c662269fb90b25b56e68ccb7e324785d15d64670d507a14be202354cd73770331504cc0922194688
-EBUILD networkmanager-qt-5.50.0.ebuild 689 BLAKE2B 381d4293e75c7f90ab393154bd6222ef1a8c66d1a22be892dd511320ca7a6e87aed918d65cab3890ed06397c0d8a9954e9fb8020bc745b6710d9748d962b8ce7 SHA512 64742eb2066a71672b057ae0fe0a57e1de27c6736ed25cc05395947ac8df69d2c8469df4b343de1219a71309f0bb4a41135d6e0f80ce2bd73553bc39eee53d68
+DIST networkmanager-qt-5.51.0.tar.xz 163568 BLAKE2B ec8798a2f85c91a6047566ffe1c76304cf0e57507fcf8f6f271382e8fe05b2798ab9ad0ef51a5e155d43c20449f365f762649d4cf841ca30f0a3b783c2b6f4c6 SHA512 4837099d8ae72e13ce5cf4d084a4c252a38542ff322c7bb683e2a78b8b80ec202de117185eeec89be7e4fdb51987b261ee0c11c4a5a60e6aaefac13ea57112c2
+EBUILD networkmanager-qt-5.50.0.ebuild 684 BLAKE2B f4d7d1d757cf954d7f7835ffa65ae27ce8cd62817180a995ae019eabd004566d1abac4d2bf824018c8822fddb06e0c2e91a8717c7938e95b035561992544976f SHA512 97a6a6e780512f9689d4eddc9d71f3f5c25ab81066ecb2bcb6ca01f125034f94612cb9ff4e306de0cd78da49cbd9e988fc5567255df8748f822e5a4f7c3f5319
+EBUILD networkmanager-qt-5.51.0.ebuild 686 BLAKE2B 8004f8f454972d024b9dd09af29fc9fd21eddfa8c2f3266f72449952976a9fd3bb943ebfe2866e7802f35ebe877d47576cb467924cd83c6a1d255888e8f3c0b8 SHA512 9c33e4e58392351365266b0f65834898456b065231aebef988009ea12a19733b4a8d23fd58bbdc3705365dc2a542e1773ab8eaff4a72f5a7fcfb89481f8d56f0
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.46.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.46.0.ebuild
deleted file mode 100644
index aeb639341a59..000000000000
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.46.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="NetworkManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="teamd"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtnetwork)
-	|| (
-		>=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=]
-		>=net-misc/networkmanager-1.4.0-r1[elogind,teamd=]
-		>=net-misc/networkmanager-1.4.0-r1[systemd,teamd=]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-libs/libnm-qt:5
-"
-
-src_test() {
-	# bug: 625276
-	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.50.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.50.0.ebuild
index 4bcf5b7443f8..060a8790deb6 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.50.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="NetworkManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="teamd"
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.51.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.51.0.ebuild
new file mode 100644
index 000000000000..4aa371e632a6
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.51.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="teamd"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtnetwork)
+	|| (
+		>=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=]
+		>=net-misc/networkmanager-1.4.0-r1[elogind,teamd=]
+		>=net-misc/networkmanager-1.4.0-r1[systemd,teamd=]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-libs/libnm-qt:5
+"
+
+src_test() {
+	# bug: 625276
+	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 9e29039dc23b..1697445850d9 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,5 @@
-DIST oxygen-icons5-5.46.0.tar.xz 236768840 BLAKE2B a04ca0b1a90cfc19b691e2e7589840e9f0628f4019375f77705738eb27ec18bfe90294fd1d7906aec8f3b6ceff5aa6cef37445a9aad3cf1301d272b0a4717601 SHA512 55bda943a5e9e5d1f1161ceb2abaea0d10bd839097150ee8322fcbc0ef1caf3c71cf9734fe3e7e7ece2213bd53865d10bc9ca8acb136585db4b444b2c386fa82
 DIST oxygen-icons5-5.50.0.tar.xz 236770332 BLAKE2B c6d483079abe7de049d28b48c8f2e7a99309a531194b195dbad08ddb1d474e9750d76b3b773563f008d521e055231aad95957dc60e0e9c524ccd6ab2680fb8bf SHA512 7a2d4b748bc0ad845f0c4371b07695ade3ae69ea0b541e002e13670103952b02c46a5046ffab16290c6031694db7935438f1a6358fcc93ed261f031068dca40a
-EBUILD oxygen-icons-5.46.0.ebuild 533 BLAKE2B d825b76b317edf7a7fd0868b26e17ed62e138af17d6dfdc0902d69f87699c1bfa1ae8b143ca09f6978da3fd10fea890faf80c7a5b318f21ef094fa7a1acc94c0 SHA512 de31a46c6dc1a5314da171d9036cc1ed47b14b53b924944e8c4614ec5b65e7592a81f34727e5df8e03aac50c1a56894e3d5f907e09f994fa18b55e8ba451b24f
-EBUILD oxygen-icons-5.50.0.ebuild 535 BLAKE2B 14ee28425a622b6bb62626a73b50494c0d7afa5d874e6d4fcdfa8384e5eca7883d913bbfacc1ee457a14445855005d634274dc324d9e5916b31c27c1b0afd4e9 SHA512 68808ff06d72a0d4848d97de358d0d724edc03e0632d883e8cded78507bb343d7cff7da0077b4da1a69ea1c5c57e6d825b7f3a4143369c8976bcb16b9155b607
+DIST oxygen-icons5-5.51.0.tar.xz 236773712 BLAKE2B 3b706abd893b2de681c51b90736ef5ac1527039254591768b990b90b7b9b34af0f09c9c18b60a2e92b25e0f30f411d3a9855403f5925fdac3acedd0a1a1ae99d SHA512 7ac19cf040604211a164618c9778db435234a7c05758a4915048308f1d411ee74f827496df238a0246cab6c475cc0b35fd02e42092875c069f048df088cf7b52
+EBUILD oxygen-icons-5.50.0.ebuild 530 BLAKE2B 71442f1aa23ee32624f1febd647fc0dc56d1c706c609a394a20543cb44651c90f71745d1377c8a45d5fdf9963f3315dece3cd3506096376792ec0689d3b8a190 SHA512 04c860f76ac91c67827699d326e05c2331f1d894bbbffa0471ca18de0ebe5d610de7ec3e4d4dacc677c58ac79fd4374b71f83d1e4b5eed09f89af36b5a32c1ab
+EBUILD oxygen-icons-5.51.0.ebuild 532 BLAKE2B 5e6e4cb48dbb7447717ce2e3b734aff3137f9761b6d7a0bd3008cbaf0fb36a1264527e4871c2def92341c0a294d10f712223c01f22141571665d5f98d8d95a4b SHA512 a96e4454c0ca75bb0493c81d1968e30e346354cfc3ad14b05354230b0e5d8a03be5bddee88c695ef1fcf842d559733f3f10549dfc2389fe762690ee8fb09691d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.46.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.46.0.ebuild
deleted file mode 100644
index 312a1528335d..000000000000
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.46.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=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KDE_TEST="true"
-KMNAME="oxygen-icons5"
-inherit kde5
-
-DESCRIPTION="Oxygen SVG icon theme"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	test? (
-		$(add_qt_dep qttest)
-		app-misc/fdupes
-	)
-"
-RDEPEND="
-	!kde-apps/kdepim-icons:4
-	!kde-frameworks/oxygen-icons:4
-"
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.50.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.50.0.ebuild
index 30f0353067e6..97cbd51e3f8d 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.50.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ inherit kde5
 
 DESCRIPTION="Oxygen SVG icon theme"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.51.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.51.0.ebuild
new file mode 100644
index 000000000000..2a85a2b35489
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.51.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KDE_TEST="true"
+KMNAME="oxygen-icons5"
+inherit kde5
+
+DESCRIPTION="Oxygen SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND="
+	!kde-apps/kdepim-icons:4
+	!kde-frameworks/oxygen-icons:4
+"
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 10f3fc97e308..5608d9c3a0b1 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-framework-5.46.0.tar.xz 4619412 BLAKE2B f879c9170a1ce78967623c62d9d54a67c0388b00392a63b5c875677f240dc1ab8d6ebd59f677de7d8ab07a28a1669cdc007c14754c74b6eaafc12c9469a529e7 SHA512 1e6f9c28f7c9a4e2e8004df3cad5d78bbb5234e1dac2e29dccbbe22b4e9c6d8a1d192f7ee2657c9f47ae8c84acb412901c55d806d838fe0378eaef4827dde762
 DIST plasma-framework-5.50.0.tar.xz 4620640 BLAKE2B db30df4fce169103749da4371be28cad4594d77218e1715c1cb9ef3c911094babbf954b4e137f6910d4b63944085d01936e6651a1565709f10d723d14016bd9c SHA512 b0cee3cbca89f5497ea3525b52dafe1c0219fa29086454ba235bc02e9a2870ac1dcbddd3c05f5eb9b0fd2e9a5ac04b9aafcd4d03939f5023b907a5749fb22d87
-EBUILD plasma-5.46.0.ebuild 1651 BLAKE2B 892493a052a8b16985ce406c2b7406e2323b27e59cce766abc0edc513ed2f6e626922903fec5f190a9752c6d135b8d2b7eef55ef9deb3b0d5d99cdcc1fb411dc SHA512 c6bee46702af993842a96f4855649c1d7718ada32e9aaa657afd62d867cf38e2e9727ec217dcd01e1845e41b6b231da1c552ea04ec5d781c16c09a85b74950ec
-EBUILD plasma-5.50.0.ebuild 1653 BLAKE2B 1ab1f41e8efb76dd276bf6d2110c25d8b252b632fc231ebcf8ca052e2d4c2e4f0fe5a867160f9118012a86b38edcceceb298a171dbf97620a129307eae38fbb6 SHA512 b6c88294590b62ed7407262825905dcbf60703a443c644b72cdecb6e4dcc3a184a1c3d94ba122bea1d1e5f35966a5695b1f90a6dbf2229c9bc5a39dd0aaa2528
+DIST plasma-framework-5.51.0.tar.xz 4631400 BLAKE2B 06ccb2b8d1e26755e75c04dce0bde7c414192a627211ab6c1ba888f120b18e160d3340340f8f595975165f5bd34ad5d91d7f635bad19d935054e03f40d04d13c SHA512 5c5949101ce9f3c520f9b2663041292b4f070fc97061678e8aa8ea05b677f15ff5804ad66242cc3ffb11dd32ced50fdfa976c1f36540f0f09dfd6e5df114d800
+EBUILD plasma-5.50.0.ebuild 1648 BLAKE2B 746cb12f267a9487f40d68c7f901484fdae455391809ff25f2e1df27b6fe6fe7fef3976668f05b6d7a344e641f2dd4f33663f22a4bb0cd887468493f089622fe SHA512 c567758a6c38f77750f5ac96409d1e2170448797c384fc64c259e9fe6bce54f152a548b29ad7ef64c36687d04585bd0dcc0942b0c74d56d7d713e68c9b9797f5
+EBUILD plasma-5.51.0.ebuild 1650 BLAKE2B ecbdd2b25170944dfd861eec172c8a48bfad5299f2faa7282542603a7dd6c4088797bee865e3e7ccb18fa381f02fdd60cf50c1d61ec7956d3507a4e813a482e6 SHA512 804255302fa36d6d12e1bb10244f6b4c87f27d7e1ce90f337caaaca85a3a8d202b4605f0176f146ce932606614d73f009f89560cc17853115b1d81b15df78ab7
 MISC metadata.xml 337 BLAKE2B 83b14f1456a141498367a54d2b3b1bd22095d8a2ea5d4b348bcc1b27b6e753900e89d2b2f7f6623a9737c6c6fdf4fdc741fb38fef17b17bc458d182e72be919c SHA512 bd0bffaf1b63f9b0181776335e38b2ad44baef7fd4a1d78752b5e342de444bfcda03b72c795c0b52c87a768e243e9ffdfbd02de745c2dde8f8372fdcfbaf2797
diff --git a/kde-frameworks/plasma/plasma-5.46.0.ebuild b/kde-frameworks/plasma/plasma-5.46.0.ebuild
deleted file mode 100644
index 912c209a152c..000000000000
--- a/kde-frameworks/plasma/plasma-5.46.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=6
-
-KMNAME="${PN}-framework"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma framework"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gles2 wayland X"
-
-RDEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kirigami)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	!gles2? ( virtual/opengl )
-	wayland? (
-		$(add_frameworks_dep kwayland)
-		media-libs/mesa[egl]
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package !gles2 OpenGL)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.50.0.ebuild b/kde-frameworks/plasma/plasma-5.50.0.ebuild
index 3709e2bfcab4..a177167e23e7 100644
--- a/kde-frameworks/plasma/plasma-5.50.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Plasma framework"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gles2 wayland X"
 
 RDEPEND="
diff --git a/kde-frameworks/plasma/plasma-5.51.0.ebuild b/kde-frameworks/plasma/plasma-5.51.0.ebuild
new file mode 100644
index 000000000000..c96310336845
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.51.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gles2 wayland X"
+
+RDEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kirigami)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	!gles2? ( virtual/opengl )
+	wayland? (
+		$(add_frameworks_dep kwayland)
+		media-libs/mesa[egl]
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package !gles2 OpenGL)
+		$(cmake-utils_use_find_package wayland EGL)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 119bef047b3c..de744bc87f13 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,5 @@
-DIST prison-5.46.0.tar.xz 39252 BLAKE2B e973b965dc0e3638a60017d543c1994490fd65c5c6aa6113e2273ffa69b7be2545d3b90fa668ceb692bdbeddbe21d9d026f60f87babc35bc4c074b0d08dd1f0c SHA512 5c801993c5f939adf97c0c6ccd7430ccebebbbe1ff1723da1748a215b85a7ddf43bf969f6463f911b361789dd4b0fde1becdaf960a0c39c243a96ac3f5666d42
 DIST prison-5.50.0.tar.xz 39024 BLAKE2B ca32f63a4cc8d90a111fb2f8152cf4c2edad2d98636bacee51b38ab79ec713dba564481d35f2bacc1e4b02a5a5501187102abbb25c03213717a0f25f954a7468 SHA512 69baa1f0fb3859d7c32e53463e4c81d4f394ddf61ed6b11bd907a9edc98098b1895b01990bfe787359b9f5eae5b214a1c514b4bdacdbd0f7de2a10dfe90163d9
-EBUILD prison-5.46.0.ebuild 533 BLAKE2B 5acec6c5ad4ad0cdf7e8f6677ba53b68a6976e3411728a6ed2050d0730d43db86a1b519d446d8db34005220546b00fb3d88a6f5860aecd608cc690a36f63048a SHA512 d89f3d4891090f2f565252fb35778ca1fb3ddc599a8fe824c7c4bd48e08eb0ee226b7b46f6f32da35de64094aa508672c66a7a316229ab51f52afaf7f11b99e9
-EBUILD prison-5.50.0.ebuild 535 BLAKE2B 66dd322572bafaa8cb120a9b5567d4a94ba53c6defd749e0ea16099332bea4a034c936c33150b8d707e1e5dce01baf6f2346c1c19890e24bad2f9644012895fb SHA512 01bf9fd330908274f3527bc72dc5ac02f403fc18753addd1f7f817cef68ab7c5fc94318d8dfa00e2104b5db76ef1efc780b68ce93db666150df560910b672c9d
+DIST prison-5.51.0.tar.xz 41756 BLAKE2B e018c64011c51d1afb73d4a585a974abb585e83d11f971188843a12c82118dfe1da7e362adf87e1cb0cecac4deb5b14ee995d957b8bec627af1a03ccd1e8d5d1 SHA512 69e6f56d5fac5b2601230f40a8db688bb95ebe476c9cffd5ece4b58cf8697c237b80fb6525f6ff330b9c720553ddcccd87ed6c3241c8c7ea4a59a599b420919a
+EBUILD prison-5.50.0.ebuild 530 BLAKE2B 0f373c9e776c89236655cea0f738d03bae43e0b453cf289fe6492de611cb64b7a41171e060e91017e31aa53d6ddd8a91050c411b1d1d0a030c7b1341508c134f SHA512 830828297d23c07b5978b406b2df45d9ff22061d6d98ffa0c20c1d38be7d966a234d5c9cae6a95388f02504c12db27da45999de0421b2f24f4427d4e27af0cea
+EBUILD prison-5.51.0.ebuild 532 BLAKE2B 0c4ce086acdefb35779043f0869c88dbc51c9775a6b0b66a242bb558f1b37da210c83a78c6d723ba92576fe982bf299164a63bb4def98156a149f3b4470f07f9 SHA512 736c47808b68e4b26558103c848f8f3d905fe7c545977750e2321328f91f6ce17d4b59050437c9642e39c70da834cadc4a65c15ac5d516b3a971757dc45db46e
 MISC metadata.xml 353 BLAKE2B 0131b7b94f9b9f5c0407c2b4d643f397be4308f66a6fd89260861d971c4274b82581f78e7661361cf1ce1800612d0d9fce132c2d9242356a91bdd1e03a04403c SHA512 2068fedd6ea1d72317184bc10ef48574e3795d2e03e9293d0c2bfa685308727a7cffc9429fad89e42a53bddf7e933f6c57ddba56ca00b8a8671707c1a3948473
diff --git a/kde-frameworks/prison/prison-5.46.0.ebuild b/kde-frameworks/prison/prison-5.46.0.ebuild
deleted file mode 100644
index d057379690e7..000000000000
--- a/kde-frameworks/prison/prison-5.46.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=6
-
-inherit kde5
-
-DESCRIPTION="QRCode and data matrix barcode library"
-HOMEPAGE="https://cgit.kde.org/prison.git"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="qml"
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	media-gfx/qrencode:=
-	media-libs/libdmtx
-	qml? ( $(add_qt_dep qtdeclarative) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package qml Qt5Quick)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/prison/prison-5.50.0.ebuild b/kde-frameworks/prison/prison-5.50.0.ebuild
index a48a6c1a0c39..b54051e8da45 100644
--- a/kde-frameworks/prison/prison-5.50.0.ebuild
+++ b/kde-frameworks/prison/prison-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="QRCode and data matrix barcode library"
 HOMEPAGE="https://cgit.kde.org/prison.git"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="qml"
 
 DEPEND="
diff --git a/kde-frameworks/prison/prison-5.51.0.ebuild b/kde-frameworks/prison/prison-5.51.0.ebuild
new file mode 100644
index 000000000000..da7a539ce3cb
--- /dev/null
+++ b/kde-frameworks/prison/prison-5.51.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="QRCode and data matrix barcode library"
+HOMEPAGE="https://cgit.kde.org/prison.git"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="qml"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	media-gfx/qrencode:=
+	media-libs/libdmtx
+	qml? ( $(add_qt_dep qtdeclarative) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package qml Qt5Quick)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index bd1982b1251e..ce52508386d4 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,5 @@
-DIST purpose-5.46.0.tar.xz 119424 BLAKE2B d786255ff0032e5c06414e5f42a06299d604bc76425832646b20f37887e80ed8a75eca0ff551993cb70c761241c317f14336c4e38d9bd9c4c0c971d4e461d044 SHA512 682dff7d8b160203b81bada628637c82822bf020acdd838cfc298b978b2b695ad413a40d955fd76c2bbed3c0debee4ebf17f31e34951ef50a1a75c912725c207
 DIST purpose-5.50.0.tar.xz 139080 BLAKE2B fb669bbd6ea59e4cb8e59e56a8235398c7c37266b9a2cff4ab0b402eadce0e13235e2bdac3c1de43daf87d30abec9a81a98f9d946ba29f41a6f7f9c037744378 SHA512 e56bdf3ac43e21fbb73144e2a1e79c6b29c90a113642784a573ac5c563ce81471027286e3c33ecfd38b17f36b98755b4e70cf965e2a301bdec645f9999939e0c
-EBUILD purpose-5.46.0.ebuild 999 BLAKE2B d2ff7cda23477e99c47733fa0d850b4dd02b4c189969ae913eececb69d9b5c2b81004f24b4361d3e5c1ae19ce8f6e58cdc79138a779d68573dc280fce50b32ab SHA512 b31b8a5fd77d2878727168cd90fa320cc262cdadf290cc2fabcb425443a4922fdc3799f7cf2e7e24ffbe1c116a6dddc72b39b91d0fa85ebb64c7680ad08f6886
-EBUILD purpose-5.50.0.ebuild 1001 BLAKE2B cd573341ee2a21f28dc09652e53a4500cfcdf7a9efd099e158eb1c58e0859cee652ff4d1cf8cfa9d97cacd5b12c28c83e6dc0420c1653919028b37fbd557eb0d SHA512 7b817032800cd139fee5aed9ce85e6f2b0b10f2c84d303930c165136d567218ec8f84fa305c7214cc9d4b3dccc353703c4f7ecb7e0441bcd2198d8b3f478f0d3
+DIST purpose-5.51.0.tar.xz 140124 BLAKE2B 16eb4dc11df1ff70984224fc1092ec5b9e6f7ee9ea5d596fbb092510359265dab9466c266f9f00b4f6ed443e52fdf1c3789834f7f7c846c851f78a41cc0e1ead SHA512 52744aa3c9b593102caa68afa70ca3064854ebb76697a4de7295feb2c7d3cf765adb021efd57bb5ad8873b0e858be5683591dee94811f7d80ca0646e2e662304
+EBUILD purpose-5.50.0.ebuild 996 BLAKE2B eee76ea7e39e4228946ec7e275bea63b556715ae7cc7f96d63c9b88c7cb19fdf7a212cbfd939ad52e43126b1b76a20a5ca757c9fc7173d788c2bb84da2512dfb SHA512 3dccb1964ecd4bed21333d7d5defdffb96179729e508f1711353970a0278c6287fdbd7e0dfa4fd854ee9550cec5647b2c445e7a27cddf3ba3778fc5e86e18d77
+EBUILD purpose-5.51.0.ebuild 998 BLAKE2B 329f98215b13f61e2b5cadc3d36cef8eabb830da988c4c9117eeb7916c01831a5f6d2c4be6404ab04b79cfbd729dc1a2ce61ac0fbf879a228848e41e8b0d1ef9 SHA512 d9d5bcc67fd1e0ad126586e7d315cbd13b6e4a89747bc000fb6d523dc8b69a8886e0fa398f0c1edec8ecb31c86231c2ee2fa6e97b6dbd439d68f1e9df00448d1
 MISC metadata.xml 345 BLAKE2B 0e6eede785554aad84ff8d6703b9ab698439d7c383b26f789ea3d6234014b4e4de329159a6264eb37375581106ffa1588d508d2616aac298af08644d1ad02183 SHA512 cee07f4f8ede80430680300afba2bbbba3f38559fec0b3d0dac805beaadf9605f94d4cc23a0f213bc56f6bd48aa5f4f39f010b87453351211ef1c6d53393f26d
diff --git a/kde-frameworks/purpose/purpose-5.46.0.ebuild b/kde-frameworks/purpose/purpose-5.46.0.ebuild
deleted file mode 100644
index 17acf28baaf1..000000000000
--- a/kde-frameworks/purpose/purpose-5.46.0.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_QTHELP="false"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+kaccounts"
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	kaccounts? (
-		$(add_kdeapps_dep kaccounts-integration)
-		net-libs/accounts-qt
-	)
-"
-RDEPEND="${DEPEND}"
-
-# requires running environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kaccounts KAccounts)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst(){
-	kde5_pkg_postinst
-
-	if ! has_version "kde-misc/kdeconnect[app]" ; then
-		elog "Optional runtime dependency:"
-		elog "kde-misc/kdeconnect[app] (send through KDE Connect)"
-	fi
-}
diff --git a/kde-frameworks/purpose/purpose-5.50.0.ebuild b/kde-frameworks/purpose/purpose-5.50.0.ebuild
index 6ca976f20fe6..782ad7bc5945 100644
--- a/kde-frameworks/purpose/purpose-5.50.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+kaccounts"
 
 DEPEND="
diff --git a/kde-frameworks/purpose/purpose-5.51.0.ebuild b/kde-frameworks/purpose/purpose-5.51.0.ebuild
new file mode 100644
index 000000000000..517e0cc6795b
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.51.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+kaccounts"
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	kaccounts? (
+		$(add_kdeapps_dep kaccounts-integration)
+		net-libs/accounts-qt
+	)
+"
+RDEPEND="${DEPEND}"
+
+# requires running environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kaccounts KAccounts)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst(){
+	kde5_pkg_postinst
+
+	if ! has_version "kde-misc/kdeconnect[app]" ; then
+		elog "Optional runtime dependency:"
+		elog "kde-misc/kdeconnect[app] (send through KDE Connect)"
+	fi
+}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 8565d76d4239..a4d6224281f6 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,5 @@
-DIST qqc2-desktop-style-5.46.2.tar.xz 39368 BLAKE2B 1b72456653dce0f4cc7655c78f37ca14615c59cdf2ca10ba8e4a5d2b0a6994b842938244a100f3306ef2c2e4e98e2efef99cb55b0ea62e1e9288186bf82acaa4 SHA512 068f0668c146e2c9c4905d7357ee7339cb06fa0871fba706437b688cec825d6615e4247136fefb912a8b017d5b79160261a541c284b4d509ceb58466bcb94a71
 DIST qqc2-desktop-style-5.50.0.tar.xz 41084 BLAKE2B 0c392f31871c070f730597a8c1c727875e4ec1a677c632af48d2c63945299dde88689787d5ad117152d0af22440dd910791c579ab658b69d88d7925dbe0a1640 SHA512 c939f9b753848f5e2ea91e33e9886a2ce57466ebb51ce03cf543ac79744dfa8c7f838543ab9b3cbd9db5138f1fc3904e55a9640c4a9b124843a2ef1aa3cecf19
-EBUILD qqc2-desktop-style-5.46.2.ebuild 587 BLAKE2B d05a97a21b86f72ceeeabdb6bb1c217a2a372656e443e4a62b7e04efc38ff6d4340e99a36d2ebd3d1fd92d51ab61623c8954077dd70a372fb38ab6cf090436a6 SHA512 c6726f7bf2a9654895aca3e53e1c97a477f4e4f513d76a49ca2e4114ec154118f2b45d45fd3615a3b6097219a3b25af4c6190119e5613c39c57641e454cf7dbb
-EBUILD qqc2-desktop-style-5.50.0.ebuild 589 BLAKE2B a2b57c417613bc0353e6976223a7310e42a2ea3db2a4fdeb231a4a394a2e815f78caa8bc134280389c352c4f52e0be8cefab444cfd3eb3d5c5482700f9bd9d75 SHA512 1bf95e85f05f7174790ba993311b270f47f0ce5a9fcd3805b4b1d7d1a59a7f7b577295de419fe9f9109174c9e2128be1a4754e82d0fd076c059d64fd3d30a604
+DIST qqc2-desktop-style-5.51.0.tar.xz 41172 BLAKE2B ad0bd437cacdd2539dcb9bcada429c8636063614865aecdcd77bf30d063d8421679752f5e5ef576ebcf85e5880e080f78b6fd6b9ee7ffd54e299f1420569e67f SHA512 3f3590f1bb7154b3f3f30cd27fcac5d25c90c768439c03c3e8eab0c2a309d65012959757ab2372489061c418a49c00f1649689310f2f8a9e5b69a3cff7e9b622
+EBUILD qqc2-desktop-style-5.50.0.ebuild 584 BLAKE2B 3cfe1e3160d20b32913eed192465b028453d7a4769c0a4c44fa292ab8538f6c8ef523b26bc5a9a585d6f62899df52888dfc870734bd6b213ed020585f9c5b8a2 SHA512 3e2ad7325061e0d8e3cab705b14442e3e9fecbd6d147a9a5233d7b7bc2716e4496e192a513d15288545c8cfc5451494c5dfae6519b039afb972659fa807400ae
+EBUILD qqc2-desktop-style-5.51.0.ebuild 586 BLAKE2B 02b41d639466e5b547c9744ade682d730e34ca769b873b83b14343f425c7ae9fdd167ffb628221791ade2c998765dca4123783f91aa613869ab11b0d28d6eacb SHA512 f3ece6269b2059f3f7fe9c390cbb27a98fac1826f333e0290d3dfe462585b9d9de371bc45f872eb3c996843156f0a9dec76b1871beca6b6e88644bca1c138c7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.46.2.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.46.2.ebuild
deleted file mode 100644
index 07a5367a0e04..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.46.2.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
-
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-KEYWORDS="amd64 ~arm x86"
-LICENSE="|| ( GPL-2+ LGPL-3+ )"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtdeclarative '' '' '5=')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtquickcontrols2)
-"
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.50.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.50.0.ebuild
index f250d641152b..4b7f547303f5 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.50.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_QTHELP="false"
 inherit kde5
 
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
 IUSE=""
 
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.51.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.51.0.ebuild
new file mode 100644
index 000000000000..f6b60699027a
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.51.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kirigami)
+	$(add_qt_dep qtdeclarative '' '' '5=')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtquickcontrols2)
+"
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 1e62ab209d3e..d81dd4656b0f 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,6 +1,5 @@
-AUX solid-5.46.0-crash-on-unmount.patch 8078 BLAKE2B b82620b7927d4810050ec3057c090fdbd516ae35f9ee6079966f40f88a5fb7e3a95d29d324c029575001ba9865980faea20a3a246c851d5d6b41b27d4074d0b2 SHA512 01023049c0a3de2e7aa104c6e43c72acc18227e4c361f884ab07f1c5d10538b4e621b3b5e41150b6e5c98e96a0ed26080d2e78c6e36275ab3db2b414af078647
-DIST solid-5.46.0.tar.xz 257668 BLAKE2B 3ec991f4b5b9f68cbf6770663625f7c332f1cbfc3d0ec6b489b464c8c460bd509dc570135075cae45430b2857d9cccbc6df48bf754f4d880858e4484f8fcbb32 SHA512 3b5a62f9723cd164a0ee2504e27a650bfae4a9d6b063db08e95d4a2735242092b39cb5b509d28408ca435adce18bf780c22a0acb4c8bf47749c5273edf6ed46c
 DIST solid-5.50.0.tar.xz 259468 BLAKE2B 3176b3f3b78b3daae088cfad783e8a5fab03a3ee20bdaa122cf0fd33ddf668cd350ec5e91fa0606d9a1e1cb953ce18bc804401464b75135aab0a99a2b2bf8639 SHA512 f51c7bcaed7b2390f1b290791d7e9dc4a86ce8a925a2955c072be66274257c81c7872f76105fa8a03b35c184a8598551aa2bfa74017de487fc5a3521ea49d6a1
-EBUILD solid-5.46.0-r1.ebuild 777 BLAKE2B 9fb8633f7f7265e6be0b16af8f18e402d18028e0c765b44d851deef98ed63e7c89c9a008cdc731c8f323b1ac6955bbe6eb0b295b399b651143ffd9789b805baa SHA512 bfded2998292566bc38df87856c339e1da2febc53fa077cdffa9f913feabe30f709c4176b8a807dbee94a2942303ae4e838d8497892c5b6b429ca7c7a009c396
-EBUILD solid-5.50.0.ebuild 722 BLAKE2B e20ef602b832a4ec4d7898ff16476853c477ada68bccb5e08f9b6c589a7d2269f518b6a73ebb2b38a1750e7ded899d58da4bfc71ab49b009d37d407b6f60a177 SHA512 3779d2d6e90050cba3a10bd368bf5b3bc75efc8a888ce23353d521e916b9c323d374b66d52861b49118805c8b63c59dcce2dab48bf56d1d0abb5e22ecd0015e8
+DIST solid-5.51.0.tar.xz 259544 BLAKE2B 2a0aab119651439fa7aabb4b1b7c24d428dc446fa64361c0088d10b11085d988f44c68f863e46cd23196783d476d8237c7c0f65e6fa528fe677d782ea411a2e4 SHA512 4a57a96f9080734781f4bddc33aa3ebc312fdf784e61cd143f76e0a222cec26bcb62322f68422d770ca8494b64344f0870fa63d66fec17bc3a209511c168d226
+EBUILD solid-5.50.0.ebuild 717 BLAKE2B 685da0d08ad58fdc17a08987991852fc29c842eb9356c1c79a15f442d2258e224bc53ffb57baac1714cbab0b34324647013172c25d36cbb630f19f3b70cb19ff SHA512 1d24c20e390729b7c1d28ba49f8da9e071534b4121cf65212c7261a7a9f7b73b19ab7366e5f3288ec4b6ee43a87725882f59195d255918a1cef0cb54816db72d
+EBUILD solid-5.51.0.ebuild 719 BLAKE2B dd5447b46a1f13c8fbe9c58908b91fbf85fc5b48e829e673c5c8d3cf97efec5aca2898e03114068ec99063f2d100cac9bc610fc5192ff282cc4210e25526c3df SHA512 769fdd74ac0837dc0d527cf509d772badbebe62a7b79790bc34608d44d0864753535963b59868244069a0ecb25f97f37599df6afa1b03737708dd40d47f5761f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/files/solid-5.46.0-crash-on-unmount.patch b/kde-frameworks/solid/files/solid-5.46.0-crash-on-unmount.patch
deleted file mode 100644
index 378890b6b878..000000000000
--- a/kde-frameworks/solid/files/solid-5.46.0-crash-on-unmount.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From 967dc53dc9a5d1c7ba0c9f57fcb9bc640cd9663b Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Wed, 16 May 2018 14:37:33 +0200
-Subject: [FStab Handling] Clean up process running by using lambdas
-
-Encapsulates the QProcess* into the job it's supposed to be doing without storing it as a member and polluting state when multiple
-actions are requested simultaneously.
-
-CCBUG: 388499
-
-Differential Revision: https://phabricator.kde.org/D9653
----
- src/solid/devices/backends/fstab/fstabhandling.cpp | 29 +++++++--------
- src/solid/devices/backends/fstab/fstabhandling.h   |  9 ++---
- .../devices/backends/fstab/fstabstorageaccess.cpp  | 42 ++++++++--------------
- .../devices/backends/fstab/fstabstorageaccess.h    |  3 --
- 4 files changed, 30 insertions(+), 53 deletions(-)
-
-diff --git a/src/solid/devices/backends/fstab/fstabhandling.cpp b/src/solid/devices/backends/fstab/fstabhandling.cpp
-index 9d078dd..e56f55a 100644
---- a/src/solid/devices/backends/fstab/fstabhandling.cpp
-+++ b/src/solid/devices/backends/fstab/fstabhandling.cpp
-@@ -226,34 +226,31 @@ QStringList Solid::Backends::Fstab::FstabHandling::options(const QString &device
-     return options;
- }
- 
--QProcess *Solid::Backends::Fstab::FstabHandling::callSystemCommand(const QString &commandName,
--        const QStringList &args,
--        QObject *obj, const char *slot)
-+bool Solid::Backends::Fstab::FstabHandling::callSystemCommand(const QString &commandName, const QStringList &args,
-+                                                              const QObject *receiver, std::function<void(QProcess *)> callback)
- {
-     QStringList env = QProcess::systemEnvironment();
-     env.replaceInStrings(QRegExp("^PATH=(.*)", Qt::CaseInsensitive), "PATH=/sbin:/bin:/usr/sbin/:/usr/bin");
- 
--    QProcess *process = new QProcess(obj);
-+    QProcess *process = new QProcess();
- 
--    QObject::connect(process, SIGNAL(finished(int,QProcess::ExitStatus)),
--                     obj, slot);
-+    QObject::connect(process, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), receiver,
-+        [process, callback](int exitCode, QProcess::ExitStatus exitStatus) {
-+            Q_UNUSED(exitCode);
-+            Q_UNUSED(exitStatus);
-+            callback(process);
-+            process->deleteLater();
-+    });
- 
-     process->setEnvironment(env);
-     process->start(commandName, args);
- 
-     if (process->waitForStarted()) {
--        return process;
--    } else {
--        delete process;
--        return nullptr;
-+        return true;
-     }
--}
- 
--QProcess *Solid::Backends::Fstab::FstabHandling::callSystemCommand(const QString &commandName,
--        const QString &device,
--        QObject *obj, const char *slot)
--{
--    return callSystemCommand(commandName, QStringList() << device, obj, slot);
-+    delete process;
-+    return false;
- }
- 
- void Solid::Backends::Fstab::FstabHandling::_k_updateMtabMountPointsCache()
-diff --git a/src/solid/devices/backends/fstab/fstabhandling.h b/src/solid/devices/backends/fstab/fstabhandling.h
-index 2b6b9d9..bcd6c33 100644
---- a/src/solid/devices/backends/fstab/fstabhandling.h
-+++ b/src/solid/devices/backends/fstab/fstabhandling.h
-@@ -25,6 +25,8 @@
- #include <QtCore/QString>
- #include <QtCore/QMultiHash>
- 
-+#include <functional>
-+
- class QProcess;
- class QObject;
- 
-@@ -44,12 +46,7 @@ public:
-     static QStringList currentMountPoints(const QString &device);
-     static QStringList mountPoints(const QString &device);
-     static QStringList options(const QString &device);
--    static QProcess *callSystemCommand(const QString &commandName,
--                                       const QStringList &args,
--                                       QObject *obj, const char *slot);
--    static QProcess *callSystemCommand(const QString &commandName,
--                                       const QString &device,
--                                       QObject *obj, const char *slot);
-+    static bool callSystemCommand(const QString &commandName, const QStringList &args, const QObject *recvr, std::function<void(QProcess *)> callback);
-     static void flushMtabCache();
-     static void flushFstabCache();
- 
-diff --git a/src/solid/devices/backends/fstab/fstabstorageaccess.cpp b/src/solid/devices/backends/fstab/fstabstorageaccess.cpp
-index a4063ff..e8fce5b 100644
---- a/src/solid/devices/backends/fstab/fstabstorageaccess.cpp
-+++ b/src/solid/devices/backends/fstab/fstabstorageaccess.cpp
-@@ -91,10 +91,13 @@ bool FstabStorageAccess::setup()
-         return false;
-     }
-     m_fstabDevice->broadcastActionRequested("setup");
--    m_process = FstabHandling::callSystemCommand("mount", filePath(),
--                this, SLOT(slotSetupFinished(int,QProcess::ExitStatus)));
--
--    return m_process != nullptr;
-+    return FstabHandling::callSystemCommand("mount", {filePath()}, this, [this](QProcess *process) {
-+        if (process->exitCode() == 0) {
-+            m_fstabDevice->broadcastActionDone("setup", Solid::NoError, QString());
-+        } else {
-+            m_fstabDevice->broadcastActionDone("setup", Solid::UnauthorizedOperation, process->readAllStandardError());
-+        }
-+    });
- }
- 
- void FstabStorageAccess::slotSetupRequested()
-@@ -108,10 +111,13 @@ bool FstabStorageAccess::teardown()
-         return false;
-     }
-     m_fstabDevice->broadcastActionRequested("teardown");
--    m_process = FstabHandling::callSystemCommand("umount", filePath(),
--                this, SLOT(slotTeardownFinished(int,QProcess::ExitStatus)));
--
--    return m_process != nullptr;
-+    return FstabHandling::callSystemCommand("umount", {filePath()}, this, [this](QProcess *process) {
-+        if (process->exitCode() == 0) {
-+            m_fstabDevice->broadcastActionDone("teardown", Solid::NoError, QString());
-+        } else {
-+            m_fstabDevice->broadcastActionDone("teardown", Solid::UnauthorizedOperation, process->readAllStandardError());
-+        }
-+    });
- }
- 
- void FstabStorageAccess::slotTeardownRequested()
-@@ -119,31 +125,11 @@ void FstabStorageAccess::slotTeardownRequested()
-     emit teardownRequested(m_fstabDevice->udi());
- }
- 
--void FstabStorageAccess::slotSetupFinished(int exitCode, QProcess::ExitStatus /*exitStatus*/)
--{
--    if (exitCode == 0) {
--        m_fstabDevice->broadcastActionDone("setup", Solid::NoError, QString());
--    } else {
--        m_fstabDevice->broadcastActionDone("setup", Solid::UnauthorizedOperation, m_process->readAllStandardError());
--    }
--    delete m_process;
--}
--
- void FstabStorageAccess::slotSetupDone(int error, const QString &errorString)
- {
-     emit setupDone(static_cast<Solid::ErrorType>(error), errorString, m_fstabDevice->udi());
- }
- 
--void FstabStorageAccess::slotTeardownFinished(int exitCode, QProcess::ExitStatus /*exitStatus*/)
--{
--    if (exitCode == 0) {
--        m_fstabDevice->broadcastActionDone("teardown", Solid::NoError, QString());
--    } else {
--        m_fstabDevice->broadcastActionDone("teardown", Solid::UnauthorizedOperation, m_process->readAllStandardError());
--    }
--    delete m_process;
--}
--
- void FstabStorageAccess::slotTeardownDone(int error, const QString &errorString)
- {
-     emit teardownDone(static_cast<Solid::ErrorType>(error), errorString, m_fstabDevice->udi());
-diff --git a/src/solid/devices/backends/fstab/fstabstorageaccess.h b/src/solid/devices/backends/fstab/fstabstorageaccess.h
-index 10ca0a9..61deb88 100644
---- a/src/solid/devices/backends/fstab/fstabstorageaccess.h
-+++ b/src/solid/devices/backends/fstab/fstabstorageaccess.h
-@@ -68,8 +68,6 @@ Q_SIGNALS:
-     void teardownRequested(const QString &udi) Q_DECL_OVERRIDE;
- 
- private Q_SLOTS:
--    void slotSetupFinished(int exitCode, QProcess::ExitStatus exitStatus);
--    void slotTeardownFinished(int exitCode, QProcess::ExitStatus exitStatus);
-     void onMtabChanged(const QString &device);
-     void connectDBusSignals();
- 
-@@ -80,7 +78,6 @@ private Q_SLOTS:
- 
- private:
-     Solid::Backends::Fstab::FstabDevice *m_fstabDevice;
--    QProcess *m_process;
-     QString m_filePath;
-     bool m_isAccessible;
-     bool m_isIgnored;
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/solid/solid-5.46.0-r1.ebuild b/kde-frameworks/solid/solid-5.46.0-r1.ebuild
deleted file mode 100644
index b300aed7ec9b..000000000000
--- a/kde-frameworks/solid/solid-5.46.0-r1.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-fs/udisks:2
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
-
-PATCHES=( "${FILESDIR}/${P}-crash-on-unmount.patch" )
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "app-misc/media-player-info" ; then
-		einfo "For media player support, install app-misc/media-player-info"
-	fi
-}
diff --git a/kde-frameworks/solid/solid-5.50.0.ebuild b/kde-frameworks/solid/solid-5.50.0.ebuild
index 3e36d8d362f1..1a1d84f6be40 100644
--- a/kde-frameworks/solid/solid-5.50.0.ebuild
+++ b/kde-frameworks/solid/solid-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/solid/solid-5.51.0.ebuild b/kde-frameworks/solid/solid-5.51.0.ebuild
new file mode 100644
index 000000000000..a6a149e84acb
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.51.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-fs/udisks:2
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "app-misc/media-player-info" ; then
+		elog "For media player support, install app-misc/media-player-info"
+	fi
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index d2384210ce5c..2f10474d0131 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
-DIST sonnet-5.46.0.tar.xz 286760 BLAKE2B 646dabdd56f405ea521aa7011057d03ec45e1d2902b15ef992ccc285dccf457d8f8dcd7c64a13f67b0dab486a06bfa817081dd5536fa8e6a880a34e7d22068ed SHA512 537a103ae6a15b9f94e317f396bcd3dd791715e596ac094dfaf88fb48e7eca682481fc8b040cc405c0db740d2c1c3edc9b73e96a0ad47925a4a8b6dbf9682880
 DIST sonnet-5.50.0.tar.xz 286156 BLAKE2B f8b71d132c329819fccb22a55953c84e6ba419e04a4a3d79b03503f189c54aade52297cc0d3196ca39b3005858dda96ac3f379098da051d1c50dc653c7b7a673 SHA512 ac0f5a0f729150d305410a4b91e3db7f1ede4148116821364611984eabfe4533fcd0a0ae4fd25f515a1b44b8983156224ef0da9fc4513be04b5b411a4dc62174
-EBUILD sonnet-5.46.0.ebuild 698 BLAKE2B f9c9d504299df631fd865efba41187b4077b411ff881cf94448ce8bd9e523aa2f911974f95601618e2100ef01569546310f7d5e3d7335055ec89203ab86856f3 SHA512 8f94a855e319d5bf6dca21b0aa06ab47867a48ee201903486c664065f1ac852c5f505d3a23c34717f87fe41b266013f2cc0715b0945fe2dded8d6a445006e51f
-EBUILD sonnet-5.50.0.ebuild 700 BLAKE2B becb8bcb31a4271814083734910d63af328cb31dd8302d8d58090b7bffc8fd56a2be2196c63a1f2a1f9dbfc74b82ee1d6f37cd69733fb9dcab6103b215518dc7 SHA512 be5b5906da4ee91f946910577ab7c573e1d57a1c641890d9ecb4f5a733f875e55ffb80d156521549ea87aa3ae49d0b2e4539db6ae367256927d8852be4b49318
+DIST sonnet-5.51.0.tar.xz 286128 BLAKE2B 64b8eaf870b9a67881aa966b7f26b465b2c99b8ed90a41371f6c706bf82b0c028d29e2bc8471ca8d5ac4f1c3f694799a3bd868bffde361532306c590dc27330d SHA512 6854d066ceee7826d058b8b9136cae52428e140237881c1ae80685304b456de8ac410896a9f1f136501cf39f09351f3c4354fe3f5b51bd7bbb6bfef822d2b859
+EBUILD sonnet-5.50.0.ebuild 695 BLAKE2B 235124bbd82cef5408c40a21aa3f87687b12de412d608412c1882ecc5e90285a9841f36ad3dba43fb4ea9784ae75af59d69266fca07abddd0c782a17d959aded SHA512 d313908be9dbcf84a40db0eb215e257eb698dd4f10d537a23ac1c394fea6e28c9cf7cddebee36a788d642ea2d4e351c5d3166990591bc9af5cb8d54848dff355
+EBUILD sonnet-5.51.0.ebuild 697 BLAKE2B 0c8ccd7babbed6b2076fafff9e7ada6095c02fe278ccd39d83b0dc3b9afd994878589e7617bceedf26924ac51d1428a2f49985ac7233fe7db16aa3fdfd72e0f1 SHA512 64f85bbb7d4334f12009610236c341b744cd4fecb161e50b551a75866e73e66838ecc00df7cc1f56dff959ce6e1612245e1fd7026dd17b494c9a01a16596df87
 MISC metadata.xml 426 BLAKE2B ae2511b818ef6c330062e792c4f0bf503fd73d0c42d93965f6b3535d6610a75229c6de627e1be5046e95ffbb055b5c1c07c5cb4eb8e824354d9d3e7ddc6ff8a4 SHA512 d429dde1039230ff5cc0611f0373c22511fe7b9b6b5ece823591b8972a876f3d10b4bf658bffc061f8433b8cf8cacc224db97791f2008c47d9d5e41e0deef8a5
diff --git a/kde-frameworks/sonnet/sonnet-5.46.0.ebuild b/kde-frameworks/sonnet/sonnet-5.46.0.ebuild
deleted file mode 100644
index c2d11637d765..000000000000
--- a/kde-frameworks/sonnet/sonnet-5.46.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="aspell +hunspell nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell:= )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package aspell ASPELL)
-		$(cmake-utils_use_find_package hunspell HUNSPELL)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/sonnet/sonnet-5.50.0.ebuild b/kde-frameworks/sonnet/sonnet-5.50.0.ebuild
index c71996ffd9f6..2daac65e4d40 100644
--- a/kde-frameworks/sonnet/sonnet-5.50.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="aspell +hunspell nls"
 
 RDEPEND="
diff --git a/kde-frameworks/sonnet/sonnet-5.51.0.ebuild b/kde-frameworks/sonnet/sonnet-5.51.0.ebuild
new file mode 100644
index 000000000000..e988ec885f87
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.51.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="aspell +hunspell nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell:= )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aspell ASPELL)
+		$(cmake-utils_use_find_package hunspell HUNSPELL)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index b248d1998e70..85aad0f3f29c 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,3 +1,5 @@
 DIST syndication-5.50.0.tar.xz 158984 BLAKE2B c6fed589e8f868f2dd93ef1566131d205f0c7e2ed36c52e8a564ced0e66e2ca407da1b75ad5cf090ec6b3d0ea1e68472fd97044d2d19e2a3fc68542bbc1ca5e1 SHA512 9a6da19ac8f13422812babefdddf3196f127c9d65189b86610802f7bf2c805949ec8d00cd366e1a4af9d603867ea4b3b5235a5d326f310623d71def6fb438482
-EBUILD syndication-5.50.0.ebuild 461 BLAKE2B 130756a0e51f43ca3740ef8f071f57988af2ba069073aabb5b87b1affd313bc72e564d5f34f63a4dfc2f7801b3fa8bc01b0d82ca96ce07b4353c97311ca8d398 SHA512 57320d315f029657c79e8fb516401335dba27e239909e03b541c278f228c18a2d85eb324e93a358206286442423c3b2cb3ccbbaa66c9f37fb4e3cc0ee787048f
+DIST syndication-5.51.0.tar.xz 159480 BLAKE2B 3672a7c505672aa5a35660265e3b8878c29022367606db9c5c0afe5a36758f5585f217dbfe28e1da7fe13dc74d8be600a768b7df429c6f4e90d320e40d6e9e9c SHA512 c9150eeefea0123ec06607b2ba7e405f9355ecc102dd50e562e724ad042a05fcc5e54647d1bc4c3889b98c1fb13e533af35e97d1126b1a530e4b76b263491aa2
+EBUILD syndication-5.50.0.ebuild 475 BLAKE2B 6abd6bb20d3083e22e31643ec5874b03d339a9ceb92dfedbe81b5a53ad6f43f529f18d71962750a1890854db330904f8ffc9f23b43ac640370ba2d953ba1cb4b SHA512 d39d7941348c75fac8cb22e0f70f464fcd9f497550fb3b92f07ec2d537effaf87f480277a50ec448c3da27c4b148706ccc318a7293978a0487d52ad803c6eed6
+EBUILD syndication-5.51.0.ebuild 477 BLAKE2B 2b75bc6be874d4f1139508611813a8ee78e87f95f02063602eeb94af38de0a9956d5551600d66b14ba126f03be01f20ac56b4e6bd2e1ce7b1a5fca4b0300fe6f SHA512 916c5770af2170d82d3dc8c9d906095fde3bad3ad4a13b57c55bd6fd98e626e00f8e68196da923ba0e800c9b49ad4d7e22d6e4e028b3a4d199262c05c33cf8bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syndication/syndication-5.50.0.ebuild b/kde-frameworks/syndication/syndication-5.50.0.ebuild
index e20edd18c99f..12162878e655 100644
--- a/kde-frameworks/syndication/syndication-5.50.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.50.0.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+KDE_QTHELP="false"
 KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for parsing RSS and Atom feeds"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/syndication/syndication-5.51.0.ebuild b/kde-frameworks/syndication/syndication-5.51.0.ebuild
new file mode 100644
index 000000000000..2764274e2ed8
--- /dev/null
+++ b/kde-frameworks/syndication/syndication-5.51.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for parsing RSS and Atom feeds"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		$(add_qt_dep qtnetwork)
+		$(add_qt_dep qtwidgets)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/syndication
+"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 887cf88df9a2..0a3506a8b490 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,5 +1,5 @@
-DIST syntax-highlighting-5.46.0.tar.xz 1166004 BLAKE2B 5b5f8dbfd53c17b52e9993de5875953eb6a8a436e85b7484cc7a3dc2187f3a5a60d3b0ddc4fbe38b557b2ae732482b28cdf8ab38b12ae4c03bac5f3fcc9b5a15 SHA512 13f7f06ac74a2469620a62a28c325dc8d4997428b0842b506cb9ef287c7e2dc1446b7482ad5f0bef2d743b7bd84794ec28268de30c99515dfac4fecc66c4c41c
 DIST syntax-highlighting-5.50.0.tar.xz 1272712 BLAKE2B 98e8625d01b8cb784615f12664c628516993a34d24c5233a513a359d3a317501067ccda9855c46e9e342229c7f3b3e10431b45e2efb1165800918bb0a7d528a7 SHA512 9f452946747a6f524b299547b608b0903ef359ea736182684f3ea2d7709659604bb4a9c8a474ab88123e9d066a35d81a6a67748e05e4bb9e66d20838113ff874
-EBUILD syntax-highlighting-5.46.0.ebuild 525 BLAKE2B b741482be40398164d44edd2603211692ea01bdcb5803cfcb8dd0e693dee95a5e001f3ba1d0480cc5b41fce98cfb2c51356e5a880d1a4170e468ffe2bd55c212 SHA512 c840c6e81fb43b86651f4e9b1b3c51d85b4d4f28a5063deacb67b8a75e54846a53dfd3c6625ab4fd6cc2966e1838b9fa3548e732e3ac765ae1180c8781671c94
-EBUILD syntax-highlighting-5.50.0.ebuild 527 BLAKE2B 1bb1dca51da1a7f0586a19309ff66fabb3a9c70e85d8f465872725fca1e26924999dcb0c3d7ce97f14351c26c6cd56b075072b93616850c33eda9507ef56d805 SHA512 c073e449ae41fe7d0347bedb0405b71bbb5e80f9834d52a535b4740ea3fb02323869e3ce4b2a49f2fd6f0dfe04eea4321470d666b499b9ae52ed280fde195c8d
+DIST syntax-highlighting-5.51.0.tar.xz 1285616 BLAKE2B b15b81734de0b7685d7d97297d864b2b78f388f8edc8ef488039a235ee4e1b44af6b29c9cb62d9eac17c9c152770014b0ac3189e5939127dfab9e7e2ff309c69 SHA512 929aa7d3e8f323c1618db17d7803bebd7f61a6b024ac6205f570db2ee3d567b4e1c1ae38b7fec0c0d9ba81c4f52c90c9e2660cfee209350e59e9bb301fbb3fba
+EBUILD syntax-highlighting-5.50.0.ebuild 522 BLAKE2B 69b4f0c2977a30606e04e174494d46fe18c7ff4ed9bc1ebe0ddf1e7f87e95b25623f584d343d6d1c494622a9d64ea85f035a3fadbade3f873d7a4e0f04b498b4 SHA512 332834b4e2abc7c502c33ee8f0064e87336897966f93c5beb360d2400b61afebdb86ab025dbdf59fb881068f0a2ab847e3ff670469f7f50cc46794e708059d21
+EBUILD syntax-highlighting-5.51.0.ebuild 524 BLAKE2B ff6ea63252ba2768fb5efaba995340110e220d53def120b6fe53e9715ee972eac7aad79ce72ce930e088bf3ef0cfeb1b96155f75b9bda6d4ca5fe3369ffd95ca SHA512 49687bcf27f8346d41d73375ba8422135e8c4aae2537756efc26ec2a6b2aeb11edc55336dd9e36d8e8737eee7428c1155560d676c107d26a0af0fc3a61abd805
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.46.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.46.0.ebuild
deleted file mode 100644
index 2bbb84dd006e..000000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.46.0.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="Framework for syntax highlighting"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtxmlpatterns)
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_install() {
-	kde5_src_install
-	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
-}
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.50.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.50.0.ebuild
index dcea91c13a70..7c2cdacf55f9 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.50.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for syntax highlighting"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.51.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.51.0.ebuild
new file mode 100644
index 000000000000..4ef544f58d4c
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.51.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Framework for syntax highlighting"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxmlpatterns)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_install() {
+	kde5_src_install
+	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index b05cbc1104d1..3bdd1b31ab81 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,5 @@
-DIST threadweaver-5.46.0.tar.xz 1409620 BLAKE2B 3712a2855e28445400d08b5b8fffe90096933488028b4bb002caec8c5d2150cdfdf5f9416246eb5e82dc2b68e0d0824c1f247cbfba8979b86c728eb79eb59956 SHA512 b07cdf4c8ac955564d6a8e4343b84cc552ab0c9772dd5fc671eb38b55e9a719dfdea99917e71fcc0d7cc127a8e39a25707ed437e3d3231a266effa807f77e4c7
 DIST threadweaver-5.50.0.tar.xz 1409596 BLAKE2B c61eaa62b51ddcecd42f63e3997f20a9fab0e6b941c88f4b1ad492c9b96a4104b23daaedfa8311109cd12294661f63c7162a5e76beb77077c1dc2cccbac3903a SHA512 a452aea4ca141c4964129412b42f8fe6457ca156edbd99770453564960714abeec395d78ab2686f01fa602822938fd50cb706920c25ec909d4446bfd14602175
-EBUILD threadweaver-5.46.0.ebuild 351 BLAKE2B 50bd466fd578d0905f7f2a053309df722ecf0a9e59378be4aaf887a1d0c4a4c34600dae632cc07a7ceb029282d34f7c06bcae45287ae0331a05fef9b0c8475c5 SHA512 6475dd5f1d1da108ca7a2b4df8654f84319f02928ee668d94f458ab0aa40db71d6995d320c9160b190fc262ac6d11fac9b4da9aa9214e69003bb73277415d708
-EBUILD threadweaver-5.50.0.ebuild 353 BLAKE2B 27eab9442775246b176656f368b7de7103fcd7fb809b80521242cdc24cf339e982c46afbc7e64b7e67573be68eb72d0e3e3adfbd1c1c49556f11aaf7d691bae5 SHA512 7e46eb34fd33c32a9bc728b7afe171a2a76c21df0d8f7a0f9ac0ecc466b6c17b98145620f0787f609042acfc0125dfa7d24807592653ab0d5d4f3bc9abc2a403
+DIST threadweaver-5.51.0.tar.xz 1409632 BLAKE2B 4fb6ac896616c4dfbf304c0c65c8c803a13be918cf85bfe0d14deb9f859a15c1221cfcb073889d702b2bf8d328764ced3c3a58381b7d858f007d0596019041bb SHA512 b93ab96ea0033df07aa41fdff8289c75e908dddb5caaa60a288827e8b8a7d3035b3fc9beca63b25a4d785f0cc2622cb6aa83ba9423d5716f0138b8b49531076a
+EBUILD threadweaver-5.50.0.ebuild 348 BLAKE2B a55c8a97b7380aa14fdf59e974ba678c25086dc6d308c5745f8751de157e1451a8f9ea02ec616c92bdcff9ab9eef765f0cced88c5a71a0a9bb17c4833e45884a SHA512 53c19ae2d3571a3a91c1342495236e46c37f7a17a99494727f7b65a805f2ff26eee3c3a051f352949fca5960c5f3666f0d997e44dd19c728d31f1a5933af45f6
+EBUILD threadweaver-5.51.0.ebuild 350 BLAKE2B d7b7bd33894f7ee3ac12718bab35b877059304fe5e3bdc7ff8d1d89b55f8392f12b60d39ddf9b056f4785b45ca073092e299ce9d5bdca89915e6d4592850f929 SHA512 fcb9120e32bdd780174438db65f12545c7fc4d10b56011098ea0057764c6c266b290b6431c15d1ae6ac31869eb175ef2f5e0d6e78c4d42a3efaf306e27336075
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.46.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.46.0.ebuild
deleted file mode 100644
index 39bbc2208fa3..000000000000
--- a/kde-frameworks/threadweaver/threadweaver-5.46.0.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="Framework for managing threads using job and queue-based interfaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-src_prepare() {
-	cmake_comment_add_subdirectory benchmarks
-	kde5_src_prepare
-}
diff --git a/kde-frameworks/threadweaver/threadweaver-5.50.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.50.0.ebuild
index 44bbeff6f8d1..484e207a70b0 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.50.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/kde-frameworks/threadweaver/threadweaver-5.51.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.51.0.ebuild
new file mode 100644
index 000000000000..f7a97da0a0a5
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.51.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+src_prepare() {
+	cmake_comment_add_subdirectory benchmarks
+	kde5_src_prepare
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 29cfc97b69c7..e6fe1dce9f1b 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 2b1b95e97af0..6c076847459a 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,4 +1,6 @@
 AUX kdeconnect-1.3.0-no-wayland.patch 523 BLAKE2B c29b58a3f1f97f09c67270f6b55f8122ccca834b979717bc1c5ad279675106acaa23da1d4a4a08dcc4194b6837cb5fce23ecfd12d5d8d1ed4adb8b4fdd077eae SHA512 68527f15ec3f0af14e33e857567c2fcc622f5dd5fc0652dc0af95e91dc5b96929df9db4961d9aa528be73b87e021877d7f6ee5894a2a195446a7235ca979b664
 DIST kdeconnect-kde-1.3.1.tar.xz 283636 BLAKE2B 8790ff2f411539db6759ddcad6a9401b2769c7c02f7a0465e0141f10eb6b5675fa56ac89bce94ae02326ce6eb13911f0b97684660df05195df596c1848d1f219 SHA512 52157dc7c7c3caec9871e9feb69c7aa8b82738fa5d4e60bb7492a9ded672351fbb6773ebf166281da9e585798583c1b23ac52bfd60927bb606472b19c5dc8538
+DIST kdeconnect-kde-1.3.2.tar.xz 283892 BLAKE2B dcc2b1a4005d21b2165d9b43c78ca68d4109c6ee1ec698cc497f36c0fff482b302fa5c27a2027e58b364c878d1784e508017c36db6057a14d4d0c7a57d775151 SHA512 6ed1a831bf1d6ed8afa875185c54b453c3da9a35f386bfadf494ffe174fc58aa0e3fd1291bd4523bd9c954fc5319527761c249f453f6db879ac46fc185f354ac
 EBUILD kdeconnect-1.3.1.ebuild 2205 BLAKE2B efe4fbd831eb259ea1feda30b17fbe305c3603a4891991e9be78fba96845ada5909856e68001c137f8fc49fabad2928fe860b651bbc38d7163e61c9a60de4d1d SHA512 e42292f167f7fc261249502dab25a9df91cae5123b616d497df872780721eada3d889f99dd17141ec9404e597347a01eedd5ffaf97b3ae90b8ca86c0bdae14f8
+EBUILD kdeconnect-1.3.2.ebuild 2201 BLAKE2B 9cc2f11c70620a0e6ae2ef07ecca2ca44c4ff5bf6292c34b51a9078c19b990e5d1ab3aa2b806f4bd527b17cca15fae706c6ed58264ff36f7e001be00aaaea964 SHA512 0bbe455adcc875079ab167c1e7f536a9dd107a7922c168a2c531fc48834a1f5e94b5f388be2fe6dca896d3f1923cd2ad58606dbb069991f2f75baa0a95aa6146
 MISC metadata.xml 542 BLAKE2B ca880a9dbf862f3b76d30b2fe8bdcf83487606179785fa7060dfc50342df4b73c55a45302b8eb0306559d5da907d958c71ccde0028f23ddf3353465b446a536a SHA512 76c1a4ccab6959be8982ffaab3830fbbe4e3c1c55ad5793bd07fa1c037b1632a2b568d2049bf83f71d437b72f01638d6fe54e17744df95cfe04b2d99828a08bf
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.2.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.2.ebuild
new file mode 100644
index 000000000000..cc8ac394d829
--- /dev/null
+++ b/kde-misc/kdeconnect/kdeconnect-1.3.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+KMNAME="${PN}-kde"
+KDE_SELINUX_MODULE="${PN}"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KMNAME}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
+HOMEPAGE="https://www.kde.org/ https://community.kde.org/KDEConnect"
+LICENSE="GPL-2+"
+IUSE="app bluetooth mousepad wayland"
+
+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_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	>=app-crypt/qca-2.1.0:2[qt5(+),ssl]
+	app? ( $(add_frameworks_dep kdeclarative) )
+	bluetooth? ( $(add_qt_dep qtbluetooth) )
+	mousepad? (
+		x11-libs/libfakekey
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+RDEPEND="${DEPEND}
+	net-fs/sshfs
+	app? ( $(add_frameworks_dep kirigami) )
+	wayland? ( $(add_plasma_dep kwin) )
+	!kde-misc/kdeconnect:4
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-wayland.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed \
+		-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
+		-i daemon/kdeconnectd.desktop.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DEXPERIMENTALAPP_ENABLED=$(usex app)
+		-DBLUETOOTH_ENABLED=$(usex bluetooth)
+		$(cmake-utils_use_find_package mousepad LibFakeKey)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst(){
+	kde5_pkg_postinst
+
+	elog "The Android .apk file is available via"
+	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
+	elog "or via"
+	elog "https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"
+}
diff --git a/kde-misc/kmarkdownwebview/Manifest b/kde-misc/kmarkdownwebview/Manifest
index 9d814152a273..18c08c985c32 100644
--- a/kde-misc/kmarkdownwebview/Manifest
+++ b/kde-misc/kmarkdownwebview/Manifest
@@ -1,5 +1,3 @@
-DIST kmarkdownwebview-0.5.2.tar.xz 60468 BLAKE2B f484d7c9efe370fb56243ce1ffaf04b37f3f45c9a5922045efcf1c6441278256335c98022fee1f78afa4877f5563be764dcbfd2e19f13cf9bbc205384147cc6c SHA512 0e0ff8880ea372c2ee406ebd54a7fd8e19e68bbed7a03096ff39e773d80728220ccc90a5791728d467fe10d8174c5bda46f25577c081cede2690648fe9964b9c
 DIST kmarkdownwebview-0.5.3.tar.xz 62480 BLAKE2B ea8104b084e4be66aa37001cf7b1b159c8f7f03c2a32eb75d69aff2d447c9a57c1a5f0419137bfa790510bd8532a8bd7e171dae901d0bceab0cc193868069d83 SHA512 04864a069b502f0293d7b66c7ecfb4e32048611028f54b4e33cfcef4931fdc6a3947aff8c863975ea639bd2c3b9c8f2fbc27624247864e20862d050b032b6fc2
-EBUILD kmarkdownwebview-0.5.2.ebuild 869 BLAKE2B 9f7fefdb255c10f908a78a9541f6be05bf8eac7dec210f8c5af23c533b1a44fd55d53cdcc7cce77f297feca26a0d8f47d18ea28286f16c023935958722a1ec65 SHA512 ed02c2320731c15c84ddaf84f2b2b67a8f022e7b76ec1431231517658f65ca842e1eef963664c6cb91a5f8a2dca934160ef6675eef7efb7f7eeb6673822d468c
-EBUILD kmarkdownwebview-0.5.3.ebuild 870 BLAKE2B 6e3d20c70c6a966e0bdd99e73485942e50285b629cd59d9366fa72937c92281776695c9c749d786f44b9b2e06d0335c5be6512ecc851d8e648380d515e29db22 SHA512 1b812e6d85c1b10458eec8d94dc2ee584343b8f92c17bfe61dc6e1c502839a7be0923b9b5bf61c47f0562ea7475345094e4ad03eb9ca887e14458cc953cc2b3b
+EBUILD kmarkdownwebview-0.5.3.ebuild 866 BLAKE2B 819f9e7be40b043eb4064639391e284301d51e63dc0d49371be9d5d443f72b2390712172e7de67e01689dfb381c9888f9b6c05dbe12c59179100d7cbd12a99ab SHA512 ddd865171ec2b4397b7fe9e4ad99d27273faf3f259c2d65c9bc0abeeacb1637b17a955224c01f6c9496a7f145236a83d05ea738bdb891677545e6b374e329c16
 MISC metadata.xml 365 BLAKE2B 708304c47cade844b320dbdbe71124d0cdbab506b655095ab9ee703f3cc5f44c0bc1561ccd7dfec9d9b2b14edaae90abf323cbd1ea6cdda1fbc6fa5193c15c81 SHA512 dbb15189ec2a5c3cc0afd100dba5c187a2464c8fd12e048f4d65aa39165c7cc093fbca646792768371f5fb2997c3b721d64524e63542693b44562b6f3bf755f5
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.ebuild
deleted file mode 100644
index e1551634f349..000000000000
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.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="KPart for rendering Markdown content"
-HOMEPAGE="https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="!webkit? ( BSD ) LGPL-2.1+"
-KEYWORDS="amd64"
-IUSE="webkit"
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	webkit? ( $(add_qt_dep qtwebkit) )
-	!webkit? (
-		$(add_qt_dep qtwebchannel)
-		$(add_qt_dep qtwebengine 'widgets')
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QTWEBKIT=$(usex webkit)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.3.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.3.ebuild
index 4a3e6df449f9..e354d42dbbf3 100644
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.3.ebuild
+++ b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="!webkit? ( BSD ) LGPL-2.1+"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="webkit"
 
 DEPEND="
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index e0d8f711927a..b2c61f228c73 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,3 +1,7 @@
+AUX tellico-3.1.3-regexp-filtering.patch 1450 BLAKE2B 0149988de7c468ba089fe61aff7d7d0b111576f894d2f80bf4e2ddec13edf59baf575fec007833baa1d2610f045948dc79a89896d9482927bed62df4c341ad53 SHA512 406d30f13b3f9c7adf884ab71658781ceececa9e3befe05338f7d90bc0955ac93bc6d362c1e03a70452da34fb8640907fd89374f896ef33523bc51bdce3208ec
+AUX tellico-3.1.3-version.patch 586 BLAKE2B a4e6a53891b8418f1abdde2ecd25085c15f7f689e3647be241af605c877798e31a95bc3bd269c6a5103919f13a542cd60a626f7fab4e129b91cacfd80a0bde93 SHA512 72393098706404d200c5c57826ec064db49ace5508577e05d35078f215c204d6cf5921384ee823d4adf0f0d3e3aeb15e29fae214dfe01b21748b36b199e87ed4
 DIST tellico-3.1.2.tar.xz 4591752 BLAKE2B 9601fa35c068d7c961bef1235cb65609b8c148b64a72771817ac16e3662ebdc35ed9b53944fe1d30c62732f2861e5a668907cc3ea9dc9f682c9e2336b12bea22 SHA512 e86966636123db813f33ad90197950e1afb38d4096e15c785a9d9f2b846872d254cbdaeec7528a13627bf8edc63d409a42fbb35172949b9b45d6a4b5c40ac28f
+DIST tellico-3.1.3.tar.xz 4607668 BLAKE2B 4c4fb678b16611c448e0fc77f0b5c9e03f344c76d20e6006c03ee12140b647fefa7a3aba2f5312ea8c36f3722418981fb469a6c199f1e115542c784003854d28 SHA512 9024f423f0685e834ed46e7038c5b95fab5b684aaac00d6298e23493fb4290daeda994faf36a0f04973093a477be5506591e6b0e7f57ef5591fb10953ad8ec5e
 EBUILD tellico-3.1.2.ebuild 2444 BLAKE2B dfec9fcfd4d5aa540754add21046d5b2612c330f2a25532265afe9ee862ef653623088042eb21b159df97afaf1ce564dd1eca3ddaa0632c326e4b74497c0e8f6 SHA512 dd30b2d42880faaa59f42a00a600f4c81f541b8bc69700f8d86f63fe8a774604e7ffba136c6afb0e1e51ad1cc04c54658080249b15eb1555c666da8a3ca91a44
+EBUILD tellico-3.1.3.ebuild 2531 BLAKE2B 1c430392dff83d804b2569f81391a27dac33ba44fe05e2890250161488809d339e7db77c530fb2cb5f6593639702bf14fb6c7e8c9cd770b69be3928a575889be SHA512 74552cda47e9c8a94c02c82ea58aab356e40b3ed402bc05b50456fa2e1b7b03d255d53476e3c71c29b61c5a8ab4b4b67b396a9aa1f42521c50418b5a3b7c3f0d
 MISC metadata.xml 597 BLAKE2B 7b88f7d3e9aa4e5a291eb98034886b61d9f68dd0ef694da227287a6e4892fb553fc3c14a84a087dbbccdfbd5a4291e7708f772e2655ba9e314a8627e77871346 SHA512 3e1196598053c7ba9a29d578f20da3da281d0ed27e371716e66c3311e6dc888baa28f72cbe5af768ff8aed50eff84f541b2ba2a62f5f5fe6ef48ed125e4f8300
diff --git a/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch b/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch
new file mode 100644
index 000000000000..51a4c2b470f6
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch
@@ -0,0 +1,44 @@
+From 47f19fac2fdbbf5c5b5124883043e473f8c44edd Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby@periapsis.org>
+Date: Tue, 2 Oct 2018 21:02:37 -0400
+Subject: Fix bug when using regexp filter for number fields
+
+Only use a QIntValidator when the filter rule is not a regular
+expression.
+
+BUG: 399323
+FIXED-IN: 3.1.4
+FIXED-IN: 3.2
+---
+ ChangeLog                    | 4 ++++
+ src/gui/filterrulewidget.cpp | 3 ++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 879f4d0..3284dc7 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2018-10-02  Robby Stephenson  <robby@periapsis.org>
++
++	* Fixed bug when using a regular expression for filtering in a number field (Bug 399323).
++
+ 2018-09-02  Robby Stephenson  <robby@periapsis.org>
+ 
+ 	* Released Tellico 3.1.3.
+diff --git a/src/gui/filterrulewidget.cpp b/src/gui/filterrulewidget.cpp
+index 8e3d7b1..aa3718d 100644
+--- a/src/gui/filterrulewidget.cpp
++++ b/src/gui/filterrulewidget.cpp
+@@ -169,7 +169,8 @@ void FilterRuleWidget::slotRuleFunctionChanged(int which_) {
+   } else {
+     m_valueStack->setCurrentWidget(m_ruleValue);
+     m_ruleValue->setPlaceholderText(QString());
+-    if(m_ruleType == Number) {
++    if(m_ruleType == Number &&
++      (data != FilterRule::FuncRegExp && data != FilterRule::FuncNotRegExp)) {
+       m_ruleValue->setValidator(new QIntValidator(this));
+     } else {
+       m_ruleValue->setValidator(nullptr);
+-- 
+cgit v0.11.2
diff --git a/kde-misc/tellico/files/tellico-3.1.3-version.patch b/kde-misc/tellico/files/tellico-3.1.3-version.patch
new file mode 100644
index 000000000000..845d08316178
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.3-version.patch
@@ -0,0 +1,24 @@
+From 1aa87a1c1538a0103a1624c663606b8d47566f42 Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby@periapsis.org>
+Date: Mon, 3 Sep 2018 08:39:49 -0400
+Subject: Correctly set version number
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 214e2ca..817750b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+ 
+ project(Tellico)
+-set(TELLICO_VERSION "3.1.2+git")
++set(TELLICO_VERSION "3.1.3")
+ 
+ set(QT_MIN_VERSION "5.4.0")
+ 
+-- 
+cgit v0.11.2
diff --git a/kde-misc/tellico/tellico-3.1.3.ebuild b/kde-misc/tellico/tellico-3.1.3.ebuild
new file mode 100644
index 000000000000..f536c9614b6a
--- /dev/null
+++ b/kde-misc/tellico/tellico-3.1.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="Collection manager based on KDE Frameworks"
+HOMEPAGE="http://tellico-project.org/"
+SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=dev-perl/Text-BibTeX-0.780.0-r1
+	dev-libs/libxml2
+	dev-libs/libxslt
+	cddb? ( $(add_kdeapps_dep libkcddb) )
+	discid? ( dev-libs/libcdio:= )
+	pdf? ( app-text/poppler[qt5] )
+	scanner? ( $(add_kdeapps_dep libksane) )
+	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	taglib? ( >=media-libs/taglib-1.5 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xmp? ( >=media-libs/exempi-2 )
+	yaz? ( >=dev-libs/yaz-2:0 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+# tests need network access
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-version.patch"
+	"${FILESDIR}/${P}-regexp-filtering.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
+		$(cmake-utils_use_find_package cddb KF5Cddb)
+		$(cmake-utils_use_find_package discid CDIO)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package scanner KF5Sane)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake-utils_use_find_package taglib Taglib)
+		-DENABLE_WEBCAM=$(usex v4l)
+		$(cmake-utils_use_find_package xmp Exempi)
+		$(cmake-utils_use_find_package yaz Yaz)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 89b995fc67a9..f7d9313efae3 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index fcf25295399b..e9e31f02c35e 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.7.tar.xz 149616 BLAKE2B a149542050a45509f14e667209002787290fc5b49e4e3cba8448cc1586e12a7d5c218ad1c65ba3d9c499e4d856cee5fc6117abfa675db49fcd87b619b13d9a69 SHA512 618256feca8ba3c64d4381d87a65b3de74a3a8f07327888ab499377008045169c46188c579fa78e3f80953e2f1779759b485cd4c84ecbea903a7a4b0d72da76d
 DIST bluedevil-5.13.5.tar.xz 149356 BLAKE2B 5c56c17c920b5d10ef8e221917a43d78ccbb9c5006dcddff3ef8e14e07e38519eeeb5acbc5272e790c4a4424e4580876343abf1f0cd58f420dbc21b5ee5e85ea SHA512 757d7886225d2d3698fc743fe9b04d833a82c394d28b0d3708867bcb34e06cc6bbc46e6a2f3f2bab83126bcd13293c158cc0b9527b79677d53f389758cd9cdd9
-EBUILD bluedevil-5.12.5.ebuild 1003 BLAKE2B 57d5960097bbd4ac906c8f3e9d276d501c0526a8fb66843b3ceb3f6367142ef44f2a0a49a66eb128a1f71f16b423343ea7f2d31331f621d02c73231cf88dfba1 SHA512 671c68e6b660dd79464865cc0a98a460a5e6db41606d54b95ac232aae44b12e5e11afc6af19f3b7c2b51ba1db5648516dcafebdedfe5c49d93b5639c1a9cc323
+DIST bluedevil-5.14.1.tar.xz 158076 BLAKE2B 56fad7695d317177d3c9ae1e92cd7bbc7dd4230db30c368981897f664ef7ed9b0745c8a248137385864cff22a20e952808a20082522f0e535e01b329b58feef1 SHA512 9059e64f65f3aa01c3df6748ae3b8446b0c534296782fdabc1bd35555e9a666f5360123a6213fd218f00838fc7f3f959f1cf02117c7069f4065983663a08cfcc
 EBUILD bluedevil-5.12.7.ebuild 1002 BLAKE2B b9fa570a7d1466a8d0dbae4375ae14c17f4eb7a2c7d7aa226312eb4ae8359ed93c68fd11e947ff9643434595ed51392637da4cebda53ee31a956647bf92dbdc6 SHA512 751c20afa02eea679c1335a7a03d139cfab691dc5aff7d3dbd5c004414b340c85a0d785b66610b47b1708779148bd0244da740721c252f0ff71fa71e102da89d
-EBUILD bluedevil-5.13.5.ebuild 1005 BLAKE2B 05e9627ba7e5d8d2e26d71106252e1476927ff424f235b15d0a8e45207f7e84cf9151801cbfecf6d574706fd961ce819b02d9c69ffe5533a0e0f7719d9b13f54 SHA512 d3385bfe6564ad077dc3e35882a7f0e77119640b8b1bb2e7c1ecbac4a62126f058ea438c478eefb43cb35fa129cd35be14b24590ccb5390a5ac5d75a47fb6c34
+EBUILD bluedevil-5.13.5.ebuild 1000 BLAKE2B ae24cdb385be828dc093718fca7e665d59705c1bd5c0e68539d805c93312593e1c0faa1450117bf90d67195847103e60809e615a659f99ea5b90e7cf9af0186d SHA512 aff9ebfde627daba4ffd50853d0094ef17ed0daaa67a9a2c9aa8e689faef80a932d9888eb8d5eaf4c46cb35720e018ee1f6adf00ebfb1ee5cb6b4b997b71517c
+EBUILD bluedevil-5.14.1.ebuild 1002 BLAKE2B b9fa570a7d1466a8d0dbae4375ae14c17f4eb7a2c7d7aa226312eb4ae8359ed93c68fd11e947ff9643434595ed51392637da4cebda53ee31a956647bf92dbdc6 SHA512 751c20afa02eea679c1335a7a03d139cfab691dc5aff7d3dbd5c004414b340c85a0d785b66610b47b1708779148bd0244da740721c252f0ff71fa71e102da89d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.12.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.12.5.ebuild
deleted file mode 100644
index d7a9db8d251f..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.12.5.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="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://cgit.kde.org/bluedevil.git"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep bluez-qt)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(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 qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!app-mobilephone/obexd
-	!app-mobilephone/obex-data-server
-	!kde-plasma/bluedevil:4
-"
diff --git a/kde-plasma/bluedevil/bluedevil-5.13.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.13.5.ebuild
index d57eb297ca48..935baed43a56 100644
--- a/kde-plasma/bluedevil/bluedevil-5.13.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Bluetooth stack for KDE Plasma"
 HOMEPAGE="https://cgit.kde.org/bluedevil.git"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/bluedevil/bluedevil-5.14.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.14.1.ebuild
new file mode 100644
index 000000000000..76d93a8664bc
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.14.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://cgit.kde.org/bluedevil.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep bluez-qt)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(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 qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!app-mobilephone/obexd
+	!app-mobilephone/obex-data-server
+	!kde-plasma/bluedevil:4
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 8467975b0755..5f987787e458 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.7.tar.xz 3142328 BLAKE2B 8c57ddcc102d1c0ae5373200a441d4cfacf059edc2a392371a0339e14cd834c8a9786c96328f49eb19cf59fb823612c12cecb1759f27c0c094b12aface28a279 SHA512 80e3a512108189fc211428864ad57c77546a126bbb0f71a1cc5380fa6cb93b433d0d4665145b44f4f8ab5ebcec570e9f03eb53a4cbf2362d2b64f0ae9bd9d140
 DIST breeze-grub-5.13.5.tar.xz 3142644 BLAKE2B 40c0c2327c0a6bbd0c1f3420b6f9ba7e8fe9876263835eb6ba7ff4b443ea40fa72635f9c5a64e91ca291f6faafa8bbc11a0b8a1f79961f8c7cf498861c86f09b SHA512 aebb9e02b40c1d3701c3f279122e5110e62a00b55c6c5a7908ea2828aa49c64afa663950c723fa81433ed6542f74797a39813cf3fdd9fc8ab0e4b39a807b8f51
-EBUILD breeze-grub-5.12.5.ebuild 398 BLAKE2B 34128bcfe78858a3695db8c09bc6666396dab77c982c12bf987c0dc727eda420cfb8b8474e8dc21e0575c4118854bf33f84a81057b52ee619d4b43180f831c50 SHA512 06527001727ebde78101ce6e8672fa30393b4652d706c54d94e463aa1aa062b15ba2ec85adf555fd418465d3802e43b2acba0490fd1279b596e628ca5fd4d353
+DIST breeze-grub-5.14.1.tar.xz 3152752 BLAKE2B 584b0c80bd903d1f8501b410fff82a3c7b5ce098fa76cbe57732f07f352b0d8bb6a562a96f125bd2c1abe3239d39afc1b4ec261d2dd504450104884b800642e5 SHA512 5476d49c1ff600a64c192f689498ec39cf566b27bcbd614b9e02d89aacdad064ea9e9136895a64625af7ad20a2bd06dbdba52cad175d9fc1a4b67374266abd50
 EBUILD breeze-grub-5.12.7.ebuild 397 BLAKE2B 3febab083c865fca1d4f4f0ba3a74c7769abbcc6ff8b1c1937d7b27d1bb68c36c32d83feb5c1b0cba8229b3b752e65c700d0c50c3dbe2e1022e644ae3d0e4717 SHA512 ffae08a1cd3f271958186e2a8d6462f82524282774e25d0ee2be22ed953f988e877b49160c8bec5273c7e1d45cb803ccccf43007b205395b79502e61126146ba
-EBUILD breeze-grub-5.13.5.ebuild 400 BLAKE2B 33e052f2157f317584cf359e91e95e4fb9792527079fc546b13af9cf6c4b476bf62f9c0545a26f3b37d6a2cccc238d1bc3f703324340b4456f9f81e429c8c4be SHA512 68b00d4e69b7282ab2b09bbcfae825302cf4b6e41a87e627b353b3bf11570df6a09bb4ad88f687e0ae7b708a4092e1239b908f9982653679bfb6afeb3bd97723
+EBUILD breeze-grub-5.13.5.ebuild 395 BLAKE2B e2f50203ab90e827b795517cc78687709a4640fa4aebae9393028e034edf020c9f1f733f40d2d8bba25e90de74f1110bbb540ab952bea9c2d3d84f4460110805 SHA512 5a715e8f1cb375aa739abca75fbf6ac04d31ae262397852c9bd9c83deaea273c04cada022b9cbeac12b1e8fabd8f1483d9b0c0fc8aa8be995cffc4bf2b6c4a56
+EBUILD breeze-grub-5.14.1.ebuild 397 BLAKE2B 3febab083c865fca1d4f4f0ba3a74c7769abbcc6ff8b1c1937d7b27d1bb68c36c32d83feb5c1b0cba8229b3b752e65c700d0c50c3dbe2e1022e644ae3d0e4717 SHA512 ffae08a1cd3f271958186e2a8d6462f82524282774e25d0ee2be22ed953f988e877b49160c8bec5273c7e1d45cb803ccccf43007b205395b79502e61126146ba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.12.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.12.5.ebuild
deleted file mode 100644
index 8d76ae6cf10e..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.12.5.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_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for GRUB"
-LICENSE="GPL-3+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/grub/themes
-	doins -r breeze
-}
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.13.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.13.5.ebuild
index 8ef3ef186a85..2b9958e425ab 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.13.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Breeze theme for GRUB"
 LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 src_prepare() {
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.14.1.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.14.1.ebuild
new file mode 100644
index 000000000000..f4acf4be1bf2
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.14.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for GRUB"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/grub/themes
+	doins -r breeze
+}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 1a798a40c0b7..d63c924543d3 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.7.tar.xz 213816 BLAKE2B b5507b4eaaff9e08763dc50ff377dd746f8c87a8dcf4bd6371bb57b09fe8d2b7e50bdd3924db9a99880a5ad0a35c13e6b28f496177b6bb8293dce25b1afd975a SHA512 5be51fc6a884e4f3338b3ad3044b918f7267205c5234b2053edd4773be42b90fb8f665e339a40c1d49d6eea16e90e1e51f58f149002568e2e7ce0be69ee412d9
 DIST breeze-gtk-5.13.5.tar.xz 202192 BLAKE2B ab1ac52e77a43219517659e76917817e845e3a4a6e90e6720f17369fdf10862d5d0c2834b043b07d6800a005c1d497238f9f653474da90c70e97eb045a60edc5 SHA512 6d760e3ccc2f987590c6285736a859ab06e4bbbbdf7a885bbe08b34ef3846d5be34607b25d5ded0f1d7b9af240f2903da6bf053a3d16afeae8fbe0ce28da0087
-EBUILD breeze-gtk-5.12.5.ebuild 296 BLAKE2B f1bbe6e13a0a65a151abc8c8a7cf5ec1e0db57167c3237236d061b500c716fee97e9eb7aa3e20d41d7b5d6b898cebe388914390bd7220e1142ed2a2a8d4e767d SHA512 c6cd9fb98a87e8c9ee53dfb708645cf340182e4bc9b88a830d809e642f3b6c3db300fc377865657240b4d110cc9a206be75af38715007aa22efa38f1825723d7
+DIST breeze-gtk-5.14.1.tar.xz 202404 BLAKE2B 95255a08396d589e00d4fee5b6a7601cfd93811dae5a28e4d47b062fe4f15a973acc87072ca3227e09d22449979ae24f8ebdee55a4b23dab7cc46567ba49f4f8 SHA512 7f65c41b7314851664cb5f05348c42f5844e26f40146ec88edcabb341351b2d9d1b904ce0a4b94f33ac5f63b50784b5bcf808cacae46a1e62ee2a7ae93d9d1bb
 EBUILD breeze-gtk-5.12.7.ebuild 295 BLAKE2B 2b7e92e9b4f94e48e4348d7282f6d5b85a43cc73ab1c9cc251a5c815bce2e02db0d5972625160a7a0be15ca0e4775206b45c01942f47ba54b17158252ef6b292 SHA512 61e384a5273bbd114206c5d97e0d9cb7845c439cfcb6af04387f724db9d0a67470e0baf93a5b6c5772769a8a3d5564b48d38966520b6671cd2fd26ffefc72b5a
-EBUILD breeze-gtk-5.13.5.ebuild 298 BLAKE2B d2afb0d13195a3d1ebe63a0d39451904bb6fe6f21e9ddcab226b8598bd2c1696cb93b017d55192584221d90dc3041d615fd15558ffb65bb33ee4da6c0ba302e8 SHA512 755cbe7501e95f4481c6d13524815dfe81dd84b9af9f5de023563f5ba9d9cf4232b4518dc8181c03432bca30437de3cb8c992ff5233fbd2f12dd8a3b8217bbd4
+EBUILD breeze-gtk-5.13.5.ebuild 293 BLAKE2B d9d54477dfc648beee79f0d3fc8f41ce2f64d2fa7bf543047b274c6438d3acc15333370824b02305854f97c78b8cf01b92208075cb3cf611500bf2d3fccd2a1d SHA512 6060ac57b44200b58c0918b870bb2684db92a8ac27a3d6905ec1d4a03064ccc23274295b16ca4c284f0ec0f0583f79ecb76680ad61d0c9ee593399e48fe1d9ed
+EBUILD breeze-gtk-5.14.1.ebuild 295 BLAKE2B 2b7e92e9b4f94e48e4348d7282f6d5b85a43cc73ab1c9cc251a5c815bce2e02db0d5972625160a7a0be15ca0e4775206b45c01942f47ba54b17158252ef6b292 SHA512 61e384a5273bbd114206c5d97e0d9cb7845c439cfcb6af04387f724db9d0a67470e0baf93a5b6c5772769a8a3d5564b48d38966520b6671cd2fd26ffefc72b5a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.12.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.12.5.ebuild
deleted file mode 100644
index 016965c6d10c..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.12.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.13.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.13.5.ebuild
index ef50e787f58e..f2e16c69db94 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.13.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,5 +8,5 @@ inherit kde5
 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
 HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.14.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.14.1.ebuild
new file mode 100644
index 000000000000..db173c4e00ad
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.14.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
+HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 56f47b782e5d..b21f2871ac2d 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.7.tar.xz 105592 BLAKE2B ebfe4cfaf7656de884b9da62fd682bd65cf6c7ce4ae96154d41ed436f1e189fc7f1b5ea6ee237f4f07318e6b7a1a8872d3e93f22da14f8301e050dc289fa65d2 SHA512 d50158838204fd5fa541fb3e7c8b0d992e43ee06f4e4698ef01c2ecbd22ef1b4e25d634ab6f9864b0f330870ee22f85fe26aff06fb2b4b0472764d62e944cc44
 DIST breeze-plymouth-5.13.5.tar.xz 105628 BLAKE2B 652b09b80dbe45535a7e5ad417c09aa02418ae2117d5a4d612f2bfa1f7a74a207fcea8a83eceeedb422b351b4a205e9be68583edddcc8cd18b22805a00cce5be SHA512 13495b3cdace829fbf8e9b0b6888f9b3e50856209e2f172a29e812705d5df23f983aec04a9b2e0fad7a9a54b255158707df452fd2cd9d5c539ea6318f51969f2
-EBUILD breeze-plymouth-5.12.5.ebuild 459 BLAKE2B 25ab42a671b0dc5b5f299843f8c56d583cf042ad375ba7f57b60d62510eae9760937a50d8b8cd3ca4154e829d4712970df5183cd88d8c7c125aa3cc48285f41c SHA512 e47b0896263d14f388f5f5bb2dbb8635a075bba76046f2a03e77473829d843393dd4b4eddac6869ee03dda7dbb8fd235c1b2bc99655e580cae138865a0d7dcac
+DIST breeze-plymouth-5.14.1.tar.xz 105464 BLAKE2B 248e82027adf2ee0ca5c95609ca9d9d97cc1c04aaf9d4deeefcdccf8ada1ae77c811e5ed27babea0ca57d83b9588febfa928c49f16208d398616fe0979f48cf0 SHA512 1541da02a0637bf0764b9b1f4ba7a47430c4dbacec237162d7ae900adf6878aa966bbcfc487e7508e784910306b405438903625d0df0bc687e495ca5bb719de9
 EBUILD breeze-plymouth-5.12.7.ebuild 458 BLAKE2B a04331117d068ed5010052bc283650d54b440dd5c0c63b2234c4dbd9529f27400c4e0cd2a5c1ac64f99a0b5c4d89f33832394e994a27e906b53d215609a7227a SHA512 afb3957f90e84d46ff625340040710be2cb8ee03641d8e96bb854cdfd2c1a0a4dbb733f2136db52a8e38783250cf978eb911fe5262224d3092409c56cf5d0dfa
-EBUILD breeze-plymouth-5.13.5.ebuild 461 BLAKE2B d00839097b233bc94d276925c7b75caf9f1f783691b76d36c6d767aab9a69ef7274adb99a27793daa2292f6a7eea2cf5629b5c4fe60d43db0edf5b29be22fb09 SHA512 4c225c044e171ffb0797e0a49cb21919d04d01d40fe336ae1aa2b9517a3f8ce2f0741111bb373c9e454ee10a7ca1de4b61b4817188df32d705964bcbe3cbae43
+EBUILD breeze-plymouth-5.13.5.ebuild 456 BLAKE2B 9fa46794fcf92612c6a5d614c3724f8966c8ce621414cb96a3f464134f66d8442eaaf825ae945cff3133c1f693b931838a5bba3ee411188433451b8f70e4015b SHA512 dcf5b7e2ae15564d72743405e82a22444249b2b84363e679a69725943dc8c31d461d4d1c1e6ec043cb398f6738a073814dfeb197e1bb91246b94b710d4f167d5
+EBUILD breeze-plymouth-5.14.1.ebuild 458 BLAKE2B a04331117d068ed5010052bc283650d54b440dd5c0c63b2234c4dbd9529f27400c4e0cd2a5c1ac64f99a0b5c4d89f33832394e994a27e906b53d215609a7227a SHA512 afb3957f90e84d46ff625340040710be2cb8ee03641d8e96bb854cdfd2c1a0a4dbb733f2136db52a8e38783250cf978eb911fe5262224d3092409c56cf5d0dfa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.5.ebuild
deleted file mode 100644
index 864289fc692e..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.5.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_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for Plymouth"
-LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="sys-boot/plymouth"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.13.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.13.5.ebuild
index 7c86b9c8d818..dba684ae49a6 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.13.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Breeze theme for Plymouth"
 LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="sys-boot/plymouth"
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.1.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.1.ebuild
new file mode 100644
index 000000000000..d29fe284129b
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for Plymouth"
+LICENSE="GPL-2+ GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="sys-boot/plymouth"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 6504db5eafe1..a1853ea4b617 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.7.tar.xz 22209420 BLAKE2B 4ccb04778b0dd0681b5d9a13bd58ebc62ed14f96381424c5dc1e495f46e141dd4f0cecb3801326d94eefd9a6d2d5daae43836885c8d2b8e2726e4ad2a2031116 SHA512 c0e564fa6df64c225ea7754271c138d4b4304068c5fcf2e0502f109af3478f37d2781ac13d068b0818c819c8f60d6c4a333ff8940334c3ee5030607f80080b99
 DIST breeze-5.13.5.tar.xz 24781812 BLAKE2B 6e68d26297f958045b1ffde4c08b0b7ba9a927f51c8f62bc30ea29cb79d0f48dc793f7faa1bdef8cce0408beda67165df52896dc94d87c41675d276957d11628 SHA512 7e2ba028070062602314798151320595e81b2bfae47040885939a0f61cf74e6159b646cf91296d0aad092250d90eb3d94cd6b2081e2debcb3b1813b8cca3aad4
-EBUILD breeze-5.12.5.ebuild 1159 BLAKE2B 68fa4833efa841f5aa0d401c2c71651fb4a78b84c0cbcf211e49723534bbea1c0716cc354f21bafa5cfe6ba673e1d457aa54c6fb26cec567c1de0160daa14619 SHA512 8aa3c9f69db433e57a54cb73fbe40e1603a8824fc8fed1a979034504375e5b9ec0a665bcf6d701231fce82d3021c24526e3c796f4cddcd6fbb348045a1ead675
+DIST breeze-5.14.1.tar.xz 24907600 BLAKE2B 0d97459216593c0c8b7bb0325c76c087ec4469c63e8efb08da4b605b8615fd922b5716c6b065294ba0da8c2c732700b4315d18c31524ad5ef55e7ad28e2b21c1 SHA512 34ee4945345d6896cedb5501515e6100759260e945b99c1ac07e2b72764cff85faadb8fe4ff11b33a4e59db11210f2211a53b552fc1ffc2448a1d548fe2e84f1
 EBUILD breeze-5.12.7.ebuild 1158 BLAKE2B 7bc1e8542783f3ff3697534557637b70c083e4372b1262bf789d942c2006896045a575b4871de8e07f8fecb015307d615b5522855b384ebacbc386369b7ce9d8 SHA512 70de39d2a3322a0e40bf87082e4c6ac3fbe9728f0f29c9c9f392ecd7ba974bc7d082af47ad02542412ff3c38a4a1f65bf1e7685970923fb54e63236e134098f0
-EBUILD breeze-5.13.5.ebuild 1133 BLAKE2B 50489146fb3a7879071196814cb2834b29828a7960fe6bd42bf69c3690c3a7df04a0409de3ebe34c2c02abf05e892d758091580b4c48f2c101914d33c8681eac SHA512 680e3ef0a4988a100b06ce77a043fb990e10b611ad715560e8283a34500000e8ac940450cd6f5d8952d930508f3fe7d690bf1210822016803ee3b55b6cc5b0e8
+EBUILD breeze-5.13.5.ebuild 1128 BLAKE2B e2ae86c4a26639f925786ca47f7404fbf46c42268fcd5f9fa00a84615ee92406dee6189cab43a7ee96e5cea9938d16441ea6fa3242d0866a73fa67f8a3ab8623 SHA512 29c7870344d19cb851bf6b757b9b3d6b6eb982fa68e75da70fff53decd267fcd64616ae5abf29c159afbbb9a4584c6ffa52abbd6dc73c85f305d31dfd06135b4
+EBUILD breeze-5.14.1.ebuild 1150 BLAKE2B 55c6d6c280f386e0d212b39cbc08d15fd1770d6e82b39d0467ac35040fe7d13f64149d8e7322f0d74b4750084083c28c1706446bbe3749c5da19bafd3965c595 SHA512 fb3ef1d488ca133055b006667ef2445dced6423cf72010ac9f81fe705be683ef33752ed75dcbbd7a6e820192e0234570bc8da14392e41cb42f58e6b7118e6d17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.12.5.ebuild b/kde-plasma/breeze/breeze-5.12.5.ebuild
deleted file mode 100644
index d02c0fea41ea..000000000000
--- a/kde-plasma/breeze/breeze-5.12.5.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
-
-inherit kde5
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/breeze.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="wayland X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	wayland? ( $(add_frameworks_dep kwayland) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kpackage)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep breeze-icons)
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package X XCB)
-	)
-	kde5_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-5.13.5.ebuild b/kde-plasma/breeze/breeze-5.13.5.ebuild
index 4e014274d742..3ae9ab02eb8f 100644
--- a/kde-plasma/breeze/breeze-5.13.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/breeze.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="wayland X"
 
 RDEPEND="
diff --git a/kde-plasma/breeze/breeze-5.14.1.ebuild b/kde-plasma/breeze/breeze-5.14.1.ebuild
new file mode 100644
index 000000000000..01c8eb140ba2
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.14.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/breeze.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="wayland X"
+
+RDEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	sci-libs/fftw:3.0=
+	wayland? ( $(add_frameworks_dep kwayland) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kpackage)
+"
+PDEPEND="
+	$(add_frameworks_dep breeze-icons)
+	$(add_plasma_dep kde-cli-tools)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X XCB)
+	)
+	kde5_src_configure
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index d126dbd2682d..0a88b6faf187 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.7.tar.xz 737848 BLAKE2B e54f75003464ea55ab2cb4f0d7c55ed26ca1f0afe409d60a93ba017c8ff06fe6fe9b65ef22a7432c0318105081f4b4dd713cbfb3db4e98cf9013f9f2557284cd SHA512 011759e7edc4c7901b2c8f5362f084dbd7e726612a8ecb76ad174c219eb5ae5d09442d7076db856359a1270acc1d438102f1444b41782477352bda6e82c21f7b
 DIST drkonqi-5.13.5.tar.xz 736196 BLAKE2B e7d9eaa299c4988d08dfdb9c95965a3cdd2e9b2a5eb76b46f98083713efd0f29fcf3bacbaedd40fe599e1bbcc1dfa62832b1ab5a2a6c256854f81cc6181dc121 SHA512 2318e82afb2bf776dee5c61b502f7554d796705ae2fc77d3b7166c24b5f577a7a4dc1322ef42e57b085a0b7cb48eeda638da2cb697dca828cc6c8d5c4042861f
-EBUILD drkonqi-5.12.5.ebuild 1364 BLAKE2B 132aad2974408663c60d2d080a448f07a1301f9bfc88d1db88f0dced96a52db6bbc2d3f8d59a6705bf63ecdfced8c213e044cd96bb268590b51a45a2d27d5ff3 SHA512 bac62f1b28b419e68c9c38fd333aced9f4ea3729f9d260f53816c4b54ed5f55cb3f3aa60fb27f5137d363fb5fe9ab0e29c7d0b20fe0a702724c5f6547763b83e
+DIST drkonqi-5.14.1.tar.xz 737640 BLAKE2B c9032671390b5c3a00cdfa85581beb1005c70456b3924074b8887052111e19092b43413e66783573b70341a6488d88cf943f7158f0755521158d137d02b6a2a3 SHA512 136eda356e7db7f8e4d18124a21494880f926e350a6d3353512a8d2ac06bbf2d645e5ca845ecefd88f7bcc3a3468e563a36dc0a87a30b2ea5392012b11ad609d
 EBUILD drkonqi-5.12.7.ebuild 1363 BLAKE2B 454dea4965ff89fba7fc42a371bab4eb7c65d3c2be24780f87de0cef1b140d57de7c4cabc1471eccc95e53d78a95a70f725130acbbdf0be8346d2da2583fa6b0 SHA512 8677d6c97c0e611588555184855662791a8b113f5a421ce5f7cbdda68a953a3687d4c0dd0230433253ff7c118a74b92c51595ebaf0999567790c0680ec87235e
-EBUILD drkonqi-5.13.5.ebuild 1366 BLAKE2B a1e50162598d1f0e60c9dc941ba2c8909f2cc3411c50b01fbe70d148ca20d6be2899f5dc6ed2459dc9d3946881f1994cdbd6150ceb1bf28fe3cb01d65d5c981b SHA512 154578eaa885cc2772f9c8ec239bc880b0e6f10e42bc6c9253dae951251a7f64bc7fb4d0e277cb27a03ff1a2dd642c53d8ac26a19b8fa36c027478029e53fc0d
+EBUILD drkonqi-5.13.5.ebuild 1361 BLAKE2B 52bc9be741dd861148babd2a3f339e5f849965f0e3c56285d6a7a177a8d07b1f735b40d0eef573f45b0238c43494a7914331d404b9b014eab9f7362c50ac3383 SHA512 f7290f14dcdbb839bdf29a32d6bc7e47460f0591088970045e55e4924640621f5da0859c97b66563e487b8bd9b7f62a4c01e30efb96a56b93c737d73d714cd99
+EBUILD drkonqi-5.14.1.ebuild 1363 BLAKE2B 454dea4965ff89fba7fc42a371bab4eb7c65d3c2be24780f87de0cef1b140d57de7c4cabc1471eccc95e53d78a95a70f725130acbbdf0be8346d2da2583fa6b0 SHA512 8677d6c97c0e611588555184855662791a8b113f5a421ce5f7cbdda68a953a3687d4c0dd0230433253ff7c118a74b92c51595ebaf0999567790c0680ec87235e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.12.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.12.5.ebuild
deleted file mode 100644
index e28cb7200839..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.12.5.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="Plasma crash handler, gives the user feedback if a program crashed"
-
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="X"
-
-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 ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/drkonqi:4
-	!<kde-plasma/plasma-workspace-5.10.95:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.13.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.13.5.ebuild
index 08c83e00ef5a..b3bba1ebe52e 100644
--- a/kde-plasma/drkonqi/drkonqi-5.13.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/drkonqi/drkonqi-5.14.1.ebuild b/kde-plasma/drkonqi/drkonqi-5.14.1.ebuild
new file mode 100644
index 000000000000..24237e3982c7
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.14.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+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 ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/drkonqi:4
+	!<kde-plasma/plasma-workspace-5.10.95:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index db005579e351..43419c20c5f8 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.7.tar.xz 85316 BLAKE2B e69f1df2157e21e59bc1db54c4551b99c37e7754393e9e72b531446c300e856890f97cf4cba39364e414c28312d7c4c80c6d5a7481bbb3cd8fdf6818f9f1d63e SHA512 3825a79e9f1092af177606d8eb4acaeb0a7022eecc09a5066d6f8f404319e313bc16c7d5f8c22e34f19cbfbfd1dfabd1e01c8df954f8cbdd147c06492ce67245
 DIST kactivitymanagerd-5.13.5.tar.xz 85412 BLAKE2B 37c74f63c38cfee000ebe293b1b6f2d4fab90184325ed23c25b9affa078ac7a548e46ba88822f4e948d359e92b47372f6b2efeb6832811252f83e69dee96b328 SHA512 e0f0518bdc8397139c445dfd4bc604cb924add54fc00b44b9b9bdce514bb579fd6c600926b213e5f4b4735714a2f402cfe259c17712c9f71be2dc184012d1713
-EBUILD kactivitymanagerd-5.12.5.ebuild 886 BLAKE2B f7585849689d9db572c6157d21e7784fa70efafee71596809db33fcff09f2a76b60eaba7b75ef2becb72ce241f8c28b42fa7fb2c895df887f743e96545a4553e SHA512 f9536e1bf8f5271ea2e833ee3b21d4487e08ff0ab25dd509f4ed4f9cb011cff363ea81b9f5705b3fa6140b80fc36625d3354505e4214bee51259057c1f707de8
+DIST kactivitymanagerd-5.14.1.tar.xz 85848 BLAKE2B 5e20bf3efe4c38301194dfd01dc3a57b475fe883347efdf40e588000c40df985c8c0029c66f9a471d2f2c40554871aeecc2d9b44bf24203dcde69427fcdd3f89 SHA512 68200ded498f9ebdee643355dd6b4d12142e966ca50380aa63dccaee05683b7561e73ab6aeccea7003058adee9b96464b923fa3137f1eeb1f06b330edc70c666
 EBUILD kactivitymanagerd-5.12.7.ebuild 885 BLAKE2B a072e235fe64550e235e74b4f60f080c8c63a435abec8097a087144c095a8084d5a6aa8720805522632dc9d67524373203db9b5793fab9dd5249e2fc79f967ef SHA512 51a9818b6387f63082c3c7045442bef1ccb7b051b837b16c60aa87433282768eb0f9a2e431952facbae40e03e5ab30c651019f0200b6e3b6d8719ca434c94469
-EBUILD kactivitymanagerd-5.13.5.ebuild 876 BLAKE2B afe62a6d95d95e1c8d4e1baafef23dffca366c695655d9d6acdd67d1aaac85ec9204d0e959ee0c51c1d46b444aef90bf7646cfe2152cbf62d0647d09f49055f5 SHA512 86e7d841b47095b7ece127d338c18eb8880a51c89600b836c940d54b6910adda60d96a8e662c15ccd885e1a8495469702e48f5c79d8f9cf897b1ccdd13ee067a
+EBUILD kactivitymanagerd-5.13.5.ebuild 871 BLAKE2B f57fb55ef563b00e44e62a58ed7796bcf83829e80c06c8eb238eba1d22ac952d25436b3740973d5cf6dc01ac716babed5cc885f506b26d6cc14021ed721db3df SHA512 7752de14eb38cd03184b28a835eb129cd03ca5f29f081ffacd95d29ac1a410ec65ebd9d89d291add89438b233f08edc3c64570af3b7c1fd2ba6a6a34d33019a8
+EBUILD kactivitymanagerd-5.14.1.ebuild 873 BLAKE2B cd05bc9772960d90e9a75dd8f5209c3454f4ae19b68fc51a65e830d425180434ab7b0fba2d5ab62ce373958cbe5fa36116364dbbc9268b1a86977cc3fe04c990 SHA512 e50a2ee216569db33bbfbc3292526463a5289d62ade22ea14ce1881d6fb737dbb7c6fa88354e830a8dd745e4cc40b228281e58119ea045759530c871709ec8c1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.5.ebuild
deleted file mode 100644
index 44c92ce623f9..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.5.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="System service to manage user's activities, track the usage patterns etc."
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.54
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-frameworks/kactivities-4.13.3-r2:4
-	!kde-plasma/kactivitymanagerd:4
-	!<kde-plasma/plasma-desktop-5.6.1
-"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.5.ebuild
index b5a7682165a1..d074d48ebce4 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
 LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.1.ebuild
new file mode 100644
index 000000000000..ae81bff8738a
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-frameworks/kactivities-4.13.3-r2:4
+	!kde-plasma/kactivitymanagerd:4
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index e87ad4ca94ee..598afe10a059 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.7.tar.xz 583788 BLAKE2B a813436cb49eacdb30eafd5af968475bed529b6ee36bbf784f8a658a313760ba7eb73ec0d5cf6d48c2a0d2fdaf70fd2ef20c9b4a38f92476c7c57bf80532a5c5 SHA512 44dd8a9b999dd0f4fb9f5953da7b9af805ba0508b18bbcb8420418049318b095d9553b1723e1ddab8b7d3d48ed42ca75fb0ede17043c2a82c95769938130ad77
 DIST kde-cli-tools-5.13.5.tar.xz 585436 BLAKE2B d288e55297428a2535e073fd82509658dda1c9da8e671c70c2bdce080268950ad8d7901cf173b09c0b4978852686e193daba15c9506366bc87a481c2bafe4554 SHA512 88aaa5c5a70da7d7f43f9d1b01d61d68c60e87942556955927cfb8655a8f6219d5220aff0c1a937f00444b3d03877d539bf544488a432108bf74434fc89566d7
-EBUILD kde-cli-tools-5.12.5.ebuild 1415 BLAKE2B 62733ac6b500c63456858a16de37fd9feafe80d9e06c1965f7b5d30e4e659f6f76ddadd54e46c4acd6cc85e4310c3e27e1cf1ee7e3de05acc7e2a97d5cc6a2e5 SHA512 9e97dda7e652e8703e0a74acb425f6949fcb09a11ce0db6cbdc5b48ea7f79223e07fcd6c84f5b29ac1bd574baccfe4c97e01c26b5ef3954ec379ca7b722c1eb2
+DIST kde-cli-tools-5.14.1.tar.xz 584940 BLAKE2B 752a83256460abc9c97ea26c3a66df95284918e4d233578d8cb15b7e3c17afdaf1ccb90cfea03a5d1ade155f23f078c7730e4876b4bb5bb5a49c9181bd186e6f SHA512 a529bc1103304567020df5dabebeec9914855f7ee43a5fddaa902a02505cb65773b910f682c88a3d33ebd3696a81a6483c82315d9920d8481cb30aba7f2003f5
 EBUILD kde-cli-tools-5.12.7.ebuild 1414 BLAKE2B 7b70203341dc76280c8a16b0a833f45340519fd598acf533cdaa392361609018c0ab022ad9ec93fccea09c5d461a00b85ea8ed7ffb1ab84ae5f02016e4e2a5d6 SHA512 63170971c1dc2f529484f7c5b02aebcdf4237c7fe2f8e1caa4e7fb6db1205b0db1d64c1a720a100f80e79453c82d50bdbc81f023016282d67206d897386684b3
-EBUILD kde-cli-tools-5.13.5.ebuild 1515 BLAKE2B 2311f5f34bf0b8814fa722f8f536021c3931e4b8beccd4118742d98a40c65addb92ec62a30e9ababfc00424caeda8b70611a4bb681a13de81aa8b9fc58a156bc SHA512 815b90690d3bd86b61d26a06232048fcaa995a81f8b3dd2667b741e921b37864e6a7a197d0fd81d2c03a1628cf27881859373ee20df8dd9c6da576aaa0038029
+EBUILD kde-cli-tools-5.13.5.ebuild 1510 BLAKE2B 35336b360a206511a00894dc7bf48e718affb9cee6b2ca86a6dbdcae9a3c51073427491df8b0472ef44413550a5e6d3f9005749d705ffa783d91580d541b12af SHA512 34702584266006838d9942008882d95cef687c0642ddc2546e37bd20833cfd5d0efdf3be9b0fe478434edec712a217ecc345305b9a469534fcd3f64e36131e18
+EBUILD kde-cli-tools-5.14.1.ebuild 1512 BLAKE2B a0c22eeac254f22b337fbaeda765286c48a2d88ebb967efda3602dc6b185aee71080b66395d09b87c4dbffc4787c99cbfc119d17637480f037add2d151343283 SHA512 dbcf6ab9fbfec3013a830222218e826cf69d27ac5e057f8c57f3c730089f1390a8a25a15b2421ec74399580380fcd23e22e26bad753b148d6e5b0a8c9e094b5a
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.5.ebuild
deleted file mode 100644
index 11c9af9cc714..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.5.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="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+kdesu X"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(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 kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	kdesu? ( $(add_frameworks_dep kdesu) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdesu
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdesu KF5Su)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.13.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.13.5.ebuild
index 15089440b220..8426f36e7692 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.13.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
 HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+kdesu X"
 
 DEPEND="
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.1.ebuild
new file mode 100644
index 000000000000..42355eaa218d
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+kdesu X"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(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 kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	kdesu? ( $(add_frameworks_dep kdesu) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdesu
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kdesu KF5Su)
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 45af3046856d..c30e81aabf10 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.7.tar.xz 156880 BLAKE2B 40902d816b8559234e5aac73e116538f2bef18bd71203f67e09af57d8f04582da8565657d931083a2c02e1e8435578ddb2b4ca8f1fd9f54c47d7a3d2630bcda7 SHA512 b6698fba63f5a9d3d58112ecd2c198e9edb9b0ad9d6c8a670bef3f0e836fcf0c5f2c5444d6cbdf7370f2bfcfe5ad8a770b513ebb7a693c19624bf52bf9d02056
 DIST kde-gtk-config-5.13.5.tar.xz 156428 BLAKE2B 54461c4e58c9abf6ac7bc96a12e7a92f5615ab0cb00ce76f07bbba1d48dd40e7651643ed3c22af948efea873e5a1a68dde1759f261575a3fa482f4f3efb5da08 SHA512 bc9b75961a0a0efd9824a1913266831c27a9840af1f87fdef46527065321731b3c35b550cff2727f62c360ee72f9495d96cfab3a38c06b661bae9bdf7d739575
-EBUILD kde-gtk-config-5.12.5.ebuild 1251 BLAKE2B 89caef72d7afc767b8e7fe245f01cc87b4b31306c6cee36654a3e9f147d6419a0d3677fd996883e0ab22ef8c8e56496ebacc0900df1f1d6baaf99ac9c3e66aaf SHA512 aaf94b4008e155657afbd6aefe358d4fefcff2c329da066fdd3fdf2897c21bee03b42526c1e3d0496d2b06dd80328c02024ef9b1fb67b40911c86175dcf4fa5e
+DIST kde-gtk-config-5.14.1.tar.xz 157012 BLAKE2B b73ba3d48cb5fcd79853dfa1f6476fb5896850821cc1aaae23ee89c450a324f94c779219c0157132bb0ae8855e5fd95ac37d3abdbe530cd6cd31f48394c9b7c7 SHA512 26149b65a8034278639abda194f3c30137e809b81f8f9537b2585f90880466f9e1b1cd018ebae8d8d9c4e3801c2add59ba96a4e59b6d35681e54f285b7b7f867
 EBUILD kde-gtk-config-5.12.7.ebuild 1250 BLAKE2B cf644941d9c39c06b92c15681c1ccc664348fc9a5b570adb097bc0bfbfde918ba18cf2db9765a00170963953d1c26774e5dfe1dcf83f397c842dcea1accfbb6b SHA512 179a58fb4268b33c4d7e9e06c07cb4f6c17fe4ed2e2f448a680385f4995ee38dfd06783217067ca961a3a8358d835a4724b46a573a9b2f850c718912777c110d
-EBUILD kde-gtk-config-5.13.5.ebuild 1253 BLAKE2B e0bf2aa2633289dddcda686116dff24c52663e032ee939d2677f20d1c5c2bef4f1e3151e435495008ab0d7d816980f7bd2f6af275dd1b1c33a457712f8602992 SHA512 6551166ff3b4b20090b418e1f8b34c894f343df4c6065e09185ae97158bc8a469a221f581f76f42a93e419e6e7776e9eb31012da4629c548f40f773c3930e803
+EBUILD kde-gtk-config-5.13.5.ebuild 1248 BLAKE2B 359c3fc33950aa3404e967a424ca291e6124d6c883f2ac575e47e5a8380dc05756c8ad751ce966a28dd8c6151edd185086b30eb02e817c7628ec6f3815c9d602 SHA512 5677f6138507e3385114b0175a09c7c3dbcde35a4f42c52d5caa6a2640dbf1261145cd726d9e75d1009aa9dda699c2eb9aee3f5ffaed0bb3ab0f1d612ac91e61
+EBUILD kde-gtk-config-5.14.1.ebuild 1250 BLAKE2B cf644941d9c39c06b92c15681c1ccc664348fc9a5b570adb097bc0bfbfde918ba18cf2db9765a00170963953d1c26774e5dfe1dcf83f397c842dcea1accfbb6b SHA512 179a58fb4268b33c4d7e9e06c07cb4f6c17fe4ed2e2f448a680385f4995ee38dfd06783217067ca961a3a8358d835a4724b46a573a9b2f850c718912777c110d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.5.ebuild
deleted file mode 100644
index e43fd2b58da3..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.5.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_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(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_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	gnome-base/gsettings-desktop-schemas
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libXcursor
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kde-gtk-config:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-}
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.13.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.13.5.ebuild
index 13b77b96ddfa..46b9142ea180 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.13.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
 HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.1.ebuild
new file mode 100644
index 000000000000..1539d7482fb2
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(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_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	gnome-base/gsettings-desktop-schemas
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libXcursor
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/kde-gtk-config:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index ec7c2aa35a61..e2ff723d9937 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.7.tar.xz 35576 BLAKE2B 7046ef70d5a9afd87e112e40cd041840db91071e8b5038f68b211db70dd6effb7fd315425c877e02b75ffb462f7b59e59dafc07b8d5fc89347e220e43969cac4 SHA512 acebb17f42e46dfcb57b5f94e2612e0c4f773ad15e911543281c578de4a409b8f65a028b458afd01f578abb69906316b3c6f2b6d6edd4918b302a8a26227ad95
 DIST kdecoration-5.13.5.tar.xz 41808 BLAKE2B 319094f68cfb8ac9f6664f6b0548c60a3961e29571386e0acc22956d83bd8ce6b98aab37b281751c2c35c168c344c906a36d7531a64c5c6616c0c80b3d96683e SHA512 a40dc81dc51fda184253986e2b9e4b9b4e5e0ac543a03ae67c80d7ec6dad07f857d05bfa757fd37a77cbe51ee4c43c7185e52a62ed344ddca6f8f10e54cf4ad8
-EBUILD kdecoration-5.12.5.ebuild 368 BLAKE2B 6926d03e513b21a5d09bf629fda76c1e351709b0ca5e4ce7cba51cab88f9a3eefd2038b269090f16bef9ac78a5724cde7e6880bd8992afb35c5c3d56fed05935 SHA512 940302029114e1ce499159a58a6fa0881cb31f4b5ef61f53eafb726142bfa79d22dfe04970771ca9711bc66ec2cc2fc7058a7a9e845eb322da7e22a60197efa4
+DIST kdecoration-5.14.1.tar.xz 42116 BLAKE2B c47c82039fb1ae677e0923b4ce93986cecbf8ba7a63083bc7fef0207d6f2d22afc3980324d59f133163cc6776e7da318415c712f3eb91394ae9bfe2e18b57215 SHA512 179bdfdf7fb53a2bccdece45665fca7a3cdf27608062af2b04a381b9f3323716c203168caa86b6ec7264ff1d5816ed83816fdffcb1dcb19d619403730b34cacb
 EBUILD kdecoration-5.12.7.ebuild 367 BLAKE2B 30890688d96cf4aa2bb84f1550d7b62a7cb814a6165f4d51e046662cf784d0b5584478a96fbbd4846ef71a8fec5873e57e27540a2d1c35f5c8b5a42deaa18819 SHA512 68c33d58838cc1bae48f44d82bd43481f13e20f74436bde4fb153f5d3118bb6ff02e0162ae0fefd02a4b7ec900938bdaa06d76dbace61355e02c36189e3cd5a7
-EBUILD kdecoration-5.13.5.ebuild 402 BLAKE2B e07c3c63256e2026e35226bd4e6786f9eec514a693df0d7ed2c7f614bf75aac86f5a3aa29dd33dbe87d7f2af22abfa6c7acd315d328042b70adc4b3062714fb1 SHA512 717ac803c99817c12ecaeb496fe8ea00c4cf169088f7c24091d841b52121008ebbf573caebc09e4ef364776d3b7538381633afea113e3c9259fbcff81d84dca9
+EBUILD kdecoration-5.13.5.ebuild 397 BLAKE2B b2f4d2dcb70014e6bc805630f3c8c2f9173560199f3efc1767a79805a6f884a8296798a4b5b305837502eaca00e6bb6828d3a2cb4383c207b8f21b444b9d674d SHA512 23ea27dc54a6edea8002dc4bc746948bd90ffc191caa67b05bee71f6eba82d6f87e00891f7274fc769c04c9f9a6cb352ba397b92b391544f68c8cef9e1ffb7d4
+EBUILD kdecoration-5.14.1.ebuild 399 BLAKE2B a681952fefba3334297db2f9676dccbe07c43cdfcb747b282b5f2d79e66631265d7cea6472f977548cda6fe141a90203a0aac8a3c8809274144476f734e5b61b SHA512 fc1f7a4af711c65d16dedba39aef5eca0028fc18692ccf304b6e3ecd9cbc1e19d761306a8ac8473da952837b2efddab9b278a4c41b08615d759fab602210a7cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.12.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.12.5.ebuild
deleted file mode 100644
index 25ef3325803d..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.12.5.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
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugin based library to create window decorations"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="$(add_qt_dep qtgui)"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.13.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.13.5.ebuild
index bb208109e760..d960122c5180 100644
--- a/kde-plasma/kdecoration/kdecoration-5.13.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Plugin based library to create window decorations"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/kdecoration-5.14.1.ebuild b/kde-plasma/kdecoration/kdecoration-5.14.1.ebuild
new file mode 100644
index 000000000000..70d8cc5af3cc
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.14.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 21883d99d36f..e397f7e0404b 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.7.tar.xz 572624 BLAKE2B c1f5e0442994722297c2989e327825727e2a581209e7c689ae5f46d77f3ead67874cbce8ac857de7c6e3ae278a760e8f94e0a872780a41d750b942ad172a9abc SHA512 7af90cee5605dd1b3548c033216b57128e3ef99043168a165b75d3a97fd54794182ffb97846bac91cf806ba4e1a82365a5d61c58f8537de43364c626de392bc7
 DIST kdeplasma-addons-5.13.5.tar.xz 602896 BLAKE2B 62494961cc1e5c61656a566ac558747378feb44161e26df31692a68c5e1d3154997facbbebd584af437e29e6448c4c4ca1863e0611ff7afc8237c85036217689 SHA512 e7f8f3b5c149519ba49ed3bab49a72995c5c16cd2cb426daa104d52c3eef924f698267d741ecefcdd9455894d19b1d66ab3bc940d5e8137c13ae213b1ef03e85
-EBUILD kdeplasma-addons-5.12.5.ebuild 1578 BLAKE2B a35bf9e74d2e4ab7dd3175984851a5a695d0c4cd039cf9528a6514035367c7cca9065891bf7440d4910bb4fa4f169a6a94191c7877c0dc4490f89dd8fce2a2e9 SHA512 44aa312c5b4b8564ccc57e1338fcb34e087c22ca07076beb7c2e6754ed22b8114157a7b54cf8876d32e426e4720d4e308545951659451ff32a958e8f72328d11
+DIST kdeplasma-addons-5.14.1.tar.xz 602120 BLAKE2B be9ab9fe42db8fe6ee6bee9bf6e8f955e917a4cb345511bffbb172d7bcab18dc8910d6090817724ac49326e75d072c01599c5bf981dc4b144aab0e0d84c53100 SHA512 dbb651adf85e3f190a035111c3ceedb9b423fcccc244a7d94e082dc7817fcf20d7350c8de9c51df345248961c202dddb95d68c1952b3b2127a9459bd84b0e900
 EBUILD kdeplasma-addons-5.12.7.ebuild 1577 BLAKE2B 2806e3e467adda9eb04e055fa4f2e354ebc1c29159b6556ce2fa717e30c16445002dc2b5c12c03254a847263edf9b4563e1018da63f7790c5a5e758770fb9d1b SHA512 c3cf61d0520794e83f535a2d4a0630e43301b201a2482284853b5806fc7f1cd7703dfc2fde0069ba7c6cfa68583f42d2c6cb09a3da59745cb68253323bd88509
-EBUILD kdeplasma-addons-5.13.5.ebuild 1533 BLAKE2B 474f7ef99e4362a875ec60c5a0cfcb95413244b15ad4b00b5283b6671c8434118802bef9cf243cdd40bc46b3e3cb658adb4c1dc6426bee21d082f5f09997ce3c SHA512 453dbd7073db6aaa686ab21ba1aa154fc6e94001b6d9bd56f2c2c41a48b711429ced1df468aced60dd9ffc0b5cbe3cc64c0f60929f693652a614172bddc8d3eb
+EBUILD kdeplasma-addons-5.13.5.ebuild 1528 BLAKE2B 5e362cc1de9a4fc54ef92105ed7ae5948b007f85c79cca6a32cf9bea0fcb502f630cb6e425a7626bf663a2e490b807364ee6d2d60ef9d9540be79f284cfcadb0 SHA512 940e16fd11eea3f95f78748787346348b0018adad101f276bcbbf46ab674dd9fd72ec39d3684dc0fea1bf8dd5b170cf119882d62dec4b781e1caa14d7bd0a1fb
+EBUILD kdeplasma-addons-5.14.1.ebuild 1530 BLAKE2B 443c48a62487aad24e509cffd35884d934a6a2d200135f48ab1fba4c4ca65633960fd6854977db1b27769dc6428234ad94eb5109a9e2d6dee1e9ed484f0fd0ac SHA512 e53859bb48192ec97cf3c3927f6ca61e08a4ff4bf181d75667a3cc03d88bc74832cb6594b7155f5f5afd94cbbb98e5f540c3df14478354acba2ca5fe387cd49d
 MISC metadata.xml 559 BLAKE2B 00a42c97d16a3ef5135cbceb9c57f37ea8ba2d78b9fad893aa2371f5013cf6a566397b51a1c19d2a257eb4f6772d9bef4b1b2725664c5193f0d51d6d3c367288 SHA512 35433c51484bdaff4ab3aee94707dd5dc3810986c5e65cbb00be7a3fa6798909918b4dcb3c89b58b41765311e24eaa7b288546311df0ffd4facb1be8250253c2
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.5.ebuild
deleted file mode 100644
index dbcb15f5cd7b..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.5.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
-
-inherit kde5
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="dictionary share"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dictionary? ( $(add_qt_dep qtwebengine) )
-	share? ( $(add_frameworks_dep purpose) )
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	!kde-plasma/kdeplasma-addons:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package dictionary Qt5WebEngine)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.5.ebuild
index 7dda709291ab..885a4e3c0a42 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Extra Plasma applets and engines"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="share webengine"
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.1.ebuild
new file mode 100644
index 000000000000..6f6b95203db0
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="share webengine"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	share? ( $(add_frameworks_dep purpose) )
+	webengine? ( $(add_qt_dep qtwebengine) )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	!kde-plasma/kdeplasma-addons:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package share KF5Purpose)
+		$(cmake-utils_use_find_package webengine Qt5WebEngine)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index fe920d1bdd2d..fd6272dfbbe0 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.7.tar.xz 60936 BLAKE2B a4d47d0feb18bc1aae87f3a5bd534ffc1e6527ffe7ff15b6b8ae67f823e6bcb85c96c2ca0481a2152d1805ea468a7b6177f2d0f16b33f15167ed62860f74b8dc SHA512 074dffc56a333bf88bb1942b3021c690822a234e26d41ff1b2d3e81f7f86f6ac272cb80f6f2552cbc5098880de520aebb8549f2a004608b824ea0c48f4e01cc6
 DIST kgamma5-5.13.5.tar.xz 79232 BLAKE2B 52542622a30aef92b38d15d38128a2b9fcbfeffcb9624dc2aafdd93814d749f3049adb19ac38047d8dd3c1c3593ecae5a2b3a0577e29c8789934a05b52deb91f SHA512 98f5fa770303f57e548b6110ad8bbc3af75705a9a103b0cb0370e25dcda209d9b405051611f2f21941b95a428760580fd2cafad0af76e1528c0672b8511aba8a
-EBUILD kgamma-5.12.5.ebuild 531 BLAKE2B 2e87de7e198549a0dc3d4e0cff27b72413acb4db6e147b6bbfb33f4aef2d8716c4042b3a9289f560852ec49e12b9bdcb9b4ebf52a76d99fac5844c18cd09d503 SHA512 6ca5e677045e73d737234140d42c814a29683f46aa653dc9a6adcd395824abc9d22409cc1a33a79b00c61df0a11f02d692722f3e1e18755f8839f7e461cfba50
+DIST kgamma5-5.14.1.tar.xz 79136 BLAKE2B 5a25fa5e17c318fa99bf5e47b57c40861ff81b830ce40cf886ff03c28b03ab0a82e1fd89400d56a1eb3934a122eded32ad385e342c4531b240e0eb15e026fd3a SHA512 388f50ac17607d90cbe999aad359bddd07b8ba9c23d40953169a5dc0b65e88bd65e00515d57e386f0a1383d634d38445c283e95725470564135ed642b252ec9f
 EBUILD kgamma-5.12.7.ebuild 530 BLAKE2B 40ad28b4e072728c03eef6b07dd1a7c9a39e1884525e08c5399c47ad5755a01ee530e3a45e2efa775ec0136d6753db053cf0193a6d667fa1b96bc7a173aaaf86 SHA512 c09099806b6d3d11af221713da8c0b9ea3976b1d3c2fe58c2865cf942e75be55ae2ee5a502ade01e04cc494a11502d04114e1e80d7b5edab81d9c3c499f0b53a
-EBUILD kgamma-5.13.5.ebuild 533 BLAKE2B 4d793b79956e5bc887603de5cc96f2232fe46ef532f2e0a54fde1393381321dc89b013898b73df8ceea280d8e6435aaf45ba5f8d36409f55d4a72d35eb114b27 SHA512 a614245bdb6d51a506d38a2570a2aa9c21d07bfa56fec57bf80c2e5c3c1679af7b5277a8ef131f79486ed0d20b12b9b8792a853c336e64667e853a60b7a2d643
+EBUILD kgamma-5.13.5.ebuild 528 BLAKE2B b9f0585c5320e1634e8f84c5af13ce228d52d7f1795260ef68993cf9b50bd77677169ed3849acc25a7a89012db06ca6396397ff517a6a5d8905fa85e065f94b5 SHA512 2d674f16b9bc26b6ec972551d5b0388d93fb4b3a1cdb95354d098f623fb27d8956a1d6f7a168255eeae22f307643d06a4a299041eb41bf3eb286ba0d55cee5b8
+EBUILD kgamma-5.14.1.ebuild 530 BLAKE2B 40ad28b4e072728c03eef6b07dd1a7c9a39e1884525e08c5399c47ad5755a01ee530e3a45e2efa775ec0136d6753db053cf0193a6d667fa1b96bc7a173aaaf86 SHA512 c09099806b6d3d11af221713da8c0b9ea3976b1d3c2fe58c2865cf942e75be55ae2ee5a502ade01e04cc494a11502d04114e1e80d7b5edab81d9c3c499f0b53a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.12.5.ebuild b/kde-plasma/kgamma/kgamma-5.12.5.ebuild
deleted file mode 100644
index a87339fcfba3..000000000000
--- a/kde-plasma/kgamma/kgamma-5.12.5.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"
-KMNAME="${PN}5"
-inherit kde5
-
-DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-plasma/kgamma/kgamma-5.13.5.ebuild b/kde-plasma/kgamma/kgamma-5.13.5.ebuild
index ed2ecec465ed..9094cb7b4fba 100644
--- a/kde-plasma/kgamma/kgamma-5.13.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ KMNAME="${PN}5"
 inherit kde5
 
 DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kgamma/kgamma-5.14.1.ebuild b/kde-plasma/kgamma/kgamma-5.14.1.ebuild
new file mode 100644
index 000000000000..565f164eabb2
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.14.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 605f95ad39b5..3dc77d321186 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.7.tar.xz 1435272 BLAKE2B 1e7388b52a71c9f1d31d89a25724c0cc4d6460da46e080aaa1f9a376b43502e3abd07d8999f497f7f75a18752dd0d6f5bdbeaf5e7437396749a202031910e7f6 SHA512 5cdfb182fc6c5edabc7bd979c86c423243ab390e25981359c68cfb1a258503fdf26b723399f4e3a688212c3a92703aaeb359b7c71ada216657282952dd4092b4
 DIST khotkeys-5.13.5.tar.xz 1381272 BLAKE2B 490ed8a323249a6eacfc10025bb49b4c792f8d1347d35348230e7ef079389da54b17965d544f9b0467bc516dd7bcdae7211bdf24f0604d6894f3ede2005ec638 SHA512 1eb22e42ecc43d2f78d67e0b6c7e86104c484b1597e063e1d78b7ebfb28950d09583c84d60b261791e282cc14fed63c99f0d070690ed0b43eaf2f23a5e01dfa1
-EBUILD khotkeys-5.12.5.ebuild 1125 BLAKE2B 3a64f9bfa2b328ca5aabd46d99244cc6b26a16a64aa47b10ec2178ac13c89f92135358de6f46d9985b37ccc281f632ecf7565eb5f03dfd430cd286f08e91e1dd SHA512 34d8aca0ef5ef2c4d86370d8f05cb38b069c68660ec072eabb9f7a2cfed0a0ba04af47dc59d86b33baa7d5d56227a990df77a4cb8326014f659ff59093150871
+DIST khotkeys-5.14.1.tar.xz 1380516 BLAKE2B abaec5081166cf376aa698fa93724eff8e57a160610f482e2581beb5c55d7c05dea542192d1b79ce1b82931de82302561062a14c1ae6a9ca9fd1c9d24600e90c SHA512 26545ebe80deef3cdd1f46f3ef950493e94abd0b93ad1f7ef67a2f8cae6fd8cd487f0547ea0c457102b3e0d015f9a29128307e97718e910c5dc5c0b6fe9fa87e
 EBUILD khotkeys-5.12.7.ebuild 1124 BLAKE2B 36cc1f14aaacb665b7f43ab345836e4648bef9bba80f9a0dd9abaf97c82def62f14a89195adc5246bb26ed9660dc83cb0e17938c52578dc6760edc2fa9af2649 SHA512 d849be3001d89884b2aa865276672d33751512ce8c6e4d861362154a0775b771b350ce2be37aa963f7777efd3268faf5c5642f1615fd04a2a7a37cebd524f1e1
-EBUILD khotkeys-5.13.5.ebuild 1127 BLAKE2B 500d0ac049cc6045f182b5eae8bfa719b2d28b172a3ff79198a9d75c47ca1e6334502c30b01946aac228c9eae7dc813d503a1330e384432fccbd76d1c2e3561e SHA512 9597fc10fc5e1b1b1574a4bab2cbf6421a4d36679eaea7ef673e2489538b98759a318d2dc795ff59adbc1066babacb33c486a1a18871cdcc6510762ca8e1a639
+EBUILD khotkeys-5.13.5.ebuild 1122 BLAKE2B 6736ba314e4a225c1d4d7b5e8abcacd737d4c4edc206bf44f159c5edad10a595316c28f9243e21e76c40469238837086cf52018446dbed52f366c0321c22c841 SHA512 7195e9a9cc2365140afe76e3964da30d4718715879171b9256db642e4dc132fb411b30fcc754d15c1b745cbc0f4bfbfd1cc335e1a1f8eabc384f52b2f90d4b83
+EBUILD khotkeys-5.14.1.ebuild 1124 BLAKE2B 36cc1f14aaacb665b7f43ab345836e4648bef9bba80f9a0dd9abaf97c82def62f14a89195adc5246bb26ed9660dc83cb0e17938c52578dc6760edc2fa9af2649 SHA512 d849be3001d89884b2aa865276672d33751512ce8c6e4d861362154a0775b771b350ce2be37aa963f7777efd3268faf5c5642f1615fd04a2a7a37cebd524f1e1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.12.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.12.5.ebuild
deleted file mode 100644
index 223821abc5f0..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.12.5.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="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-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 kdelibs4support X)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/khotkeys:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.13.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.13.5.ebuild
index edfaf921288d..b1082fbe3796 100644
--- a/kde-plasma/khotkeys/khotkeys-5.13.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_HANDBOOK="true"
 inherit kde5
 
 DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/khotkeys/khotkeys-5.14.1.ebuild b/kde-plasma/khotkeys/khotkeys-5.14.1.ebuild
new file mode 100644
index 000000000000..753ccaeca611
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.14.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+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 kdelibs4support X)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/khotkeys:4
+	!kde-plasma/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 8cb301c550fd..e829511e1134 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,9 +1,9 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 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.7.tar.xz 1286660 BLAKE2B fd1548666a9f47e6bcb168942ff9071c16dfc1095434bdee4a3626bc04bd64d89b75cb7bcff4e085fb52125b84faf4acd1cd2c7812dfcb18970a462245a1333e SHA512 440e1d9c6be280fee95681148f6f9c069529431f3367fd5938663afa840cd191c85fd995b9a0a4fb6ae143d2c74415cafcfc99e4a7d7e25dc99fdd3820608f9b
 DIST kinfocenter-5.13.5.tar.xz 1286000 BLAKE2B d8e9278f3c7214e13403970e86ac72f5cad3ed2506752c297860d91f26e986b6bce806a7498b78e4517b8d6c8a0ff31e2d2b6f0117babb93839dc8c923cf6bbd SHA512 a54b3ef5df1855f3002965f70c2e627ddc0b1e69eaa36461da1018b9ffd6e033ca61c4890a358ddc22f6f9e66cab5cdbaa1ff5386dda29fe87248f8af5567e50
-EBUILD kinfocenter-5.12.5.ebuild 2509 BLAKE2B 15b97b961dbcff0823c480d5f63757cc88b7d90206b7fa48083c7555067c691a39ef98534bcb94bb1b2f500ca47ae6981d44a887e3b4edc4dab78af26f59fcef SHA512 52f58bed4f004c0b01021ff264a40fbf090c463c56dcc1bb805824b26fc37480abd9cabbf7fba3fa75f3fd56c149f22c5fa30cecf273c6fb6ffc95a668a2210c
+DIST kinfocenter-5.14.1.tar.xz 1323228 BLAKE2B 09432622249083656cb305220b7d9c4256df92e7fdf2bfd6457342add4b4abaaadf225454706de0646b06da8892f7c727b460d02b1254625688b5fe70cceabbe SHA512 994285a66e2a30a2d9850bf3099156ff27669f9d64f8f966bc231f4d0741760650ddc0ed96bfe865c0a46f1a61cdb1e45f467783f94834f0ff441814a6e37431
 EBUILD kinfocenter-5.12.7.ebuild 2455 BLAKE2B d028ed2f3ceac90a7fc5c9fac8465980356d6fb655e0a4ecf635cbf647e6cef749ef7412bca9b7d296277946f8d5cdc16668c9cb06f2c75565c3fe4f8acc515d SHA512 93e2599d146225d551af8ac2e23368a4d6f06aec8d37f1528627246bc45b58e12741a84d08f9553b279311e86754014fcfb93617bd1e99be10e3ce33fa66ae2d
-EBUILD kinfocenter-5.13.5.ebuild 2458 BLAKE2B e3e564c8e41b62b067842aeefe300a974f3f81127365005de950c366c8b87b5580f5b671500bfc8a99689efa020790abbc748457544457722a6e355e18caea45 SHA512 53282c9ab05a2591e6464fa46be5063108ae42a7778f63e9dec406527f9aa9b3a20669a67ac35742582f58ca7a4bac20ed0ed3735293f3ee918fa1df4503496a
+EBUILD kinfocenter-5.13.5.ebuild 2453 BLAKE2B f25ded49a6e6b230af09002afccc09562c98fad9d87ebd7853968325ea9951aa065b1c21358c3b4aad4aa1eca0a18e9a07659bebd78e7c22ac57c528e483a57c SHA512 9547588cfeab947f5f15b26d713b4c3c438de7aaae9c0ff1ac956b68a580a41e7c8efdb30c845311f739e240d8119f3f9ef8cc4cd688bdb6359e8848407841b7
+EBUILD kinfocenter-5.14.1.ebuild 2455 BLAKE2B d028ed2f3ceac90a7fc5c9fac8465980356d6fb655e0a4ecf635cbf647e6cef749ef7412bca9b7d296277946f8d5cdc16668c9cb06f2c75565c3fe4f8acc515d SHA512 93e2599d146225d551af8ac2e23368a4d6f06aec8d37f1528627246bc45b58e12741a84d08f9553b279311e86754014fcfb93617bd1e99be10e3ce33fa66ae2d
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.12.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.12.5.ebuild
deleted file mode 100644
index 9a294aaa46f2..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.12.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
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="A utility that provides information about a computer system"
-HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gles2 ieee1394 +opengl +pci wayland"
-
-REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
-
-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 kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		$(add_qt_dep qtgui 'gles2=')
-		media-libs/mesa[gles2?]
-		!gles2? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	wayland? (
-		$(add_frameworks_dep kwayland)
-		media-libs/mesa[egl]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-apps/kcontrol:4
-	!kde-misc/about-distro
-	!kde-plasma/kinfocenter:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	if has_version "dev-qt/qtgui[gles2]"; then
-		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
-	fi
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	if ! has_version "net-fs/nfs-utils"; then
-		einfo "Installing net-fs/nfs-utils will enable the NFS information module."
-	fi
-	if ! has_version "net-fs/samba" || ! has_version "net-fs/samba[server]"; then
-		einfo "Installing net-fs/samba[server(+)] will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.13.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.13.5.ebuild
index 7a0e2a4a61bc..1c61b8587e8f 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.13.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="A utility that provides information about a computer system"
 HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
 SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gles2 ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.14.1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.1.ebuild
new file mode 100644
index 000000000000..215d99985102
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.14.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="A utility that provides information about a computer system"
+HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gles2 ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
+
+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 kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	x11-libs/libX11
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		$(add_qt_dep qtgui 'gles2=')
+		media-libs/mesa[gles2?]
+		!gles2? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		$(add_frameworks_dep kwayland)
+		media-libs/mesa[egl]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-apps/kcontrol:4
+	!kde-misc/about-distro
+	!kde-plasma/kinfocenter:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ieee1394 RAW1394)
+		$(cmake-utils_use_find_package pci PCIUTILS)
+		$(cmake-utils_use_find_package wayland EGL)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+
+	if has_version "dev-qt/qtgui[gles2]"; then
+		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
+	else
+		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
+	fi
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	if ! has_version "net-fs/nfs-utils"; then
+		elog "Installing net-fs/nfs-utils will enable the NFS information module."
+	fi
+	if ! has_version "net-fs/samba"; then
+		elog "Installing net-fs/samba will enable the Samba status information module."
+	fi
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index acb2d6c7c232..fe8b726e71fb 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.7.tar.xz 817080 BLAKE2B 3c33d99acfef942cb4f36b1827bae3a318d7ef9253e76594f4d5dd2e7ea3e0679e925d86dbea773120e998d86720fe67ceff9dc3358f55b45c5c73998cb27087 SHA512 7bc5df0512b58bcc9e403449a3cafd7889a815d17d7387986750477e1420e71fce4d98980a789a16240ef6d2a7f316df9e0a1525c96b89df193aa601a2571062
 DIST kmenuedit-5.13.5.tar.xz 774524 BLAKE2B 1ae7f9f1b507f719054000a918b7d6ad16eb5b73eb201e3cb4c19b6d6e29333c2fea8a54f6d32fdf94f5fb87d945db8c50eab92fb817dbc50b8471874954b382 SHA512 3289003f986d9e92708e0af49f9425ea71ec679377ece863e6f5411a00854bae56c86f0fb8b4398fa477829074c55474f9ca47f0d92a8ae314bd3701261d08c9
-EBUILD kmenuedit-5.12.5.ebuild 1028 BLAKE2B 61939d330fe0251115207ac560cdce1b00517a31f97c0e176ee335431fa3da77b498b1346fdb668d7120af7a2850e2f02bd80a258fb13dc15527e69b3cc2f46e SHA512 7c150deda5597fe3cf45a74a53e08375b38731b770f09c0836fceeeec1dce0656a347d5d0eb2276f0605217b89570c6ae5b81e6e2560e680d2edd5d4fad265e7
+DIST kmenuedit-5.14.1.tar.xz 771168 BLAKE2B e5d480de12cf3e2994b7b4f94b878e88d2c09783ed2166d6979bd6fbe550a4012b94bf20d017374b47e979eeb56d4feb0b8ce5a8d7015981a9950e6e82e14cf0 SHA512 e703e070b86a338fb7949199a466c4241fc79aafbf5345b8e0eb0aa0112fbe9bc43b25b8aafc02cdd14b6b13754fcf0a86bdc0ef1dfa6112a0c90e9d85203b5a
 EBUILD kmenuedit-5.12.7.ebuild 1027 BLAKE2B 0cfa03cb3f7bfe536e636c1e3f43d298305227fecbdf443c401db668724ff0a1315cfa5f762c9d0d8cc7e7f51fbbc4a054680410fb3c3bfd0811df44759d4228 SHA512 6208a2792d6f45de48ebcce231fb09b48a74da3138ed8714436e0793671531dd85ab0476ffc6c8ff354228f429884448da43ba99f2862366eba7898d8a29407b
-EBUILD kmenuedit-5.13.5.ebuild 1030 BLAKE2B ca866e167ca43334565ec69f02b94b0792d943f99959380c8b76efd25c2f8d44469415ea48865ee45cd9eb5ff37237056bbe10029ad41f90ea20f1d2f5e2b11b SHA512 b6e1aedda37e0b6ec05707c7c98c70d707304f9c8fb80bb20946d260d1ebf3071969d30c20d0d35dbacf2fcab8bc973d6562e62d1426f5a66ca4178f4fafcd76
+EBUILD kmenuedit-5.13.5.ebuild 1025 BLAKE2B bb7485846c010569ecf822b0f10df057f616e023dae401e7a5a96d918b8e0500adcc684b5dd31ae4a6b51a8d0e8e85aac84c53cfd117cc4967f385661a6e231c SHA512 1c73083de7186ca4ad7221de7280c98b6459734f2eea12bf9302b86643ed176f1d31b2ec5403c228bb30a76a5c9f7c6e2304839e30274ad4f910a4dc9ac5a58a
+EBUILD kmenuedit-5.14.1.ebuild 1106 BLAKE2B adde8c530e509d9a7869ae75d0948653e458173755a0427844c5bf9f4399de16b54ed42319ade0b5c749e495dc4a35d2b1eeff9dfd3af0fe34ffb65c63a8c57a SHA512 246dc5915c40881e06722f48b11a54fbd4ba227ea1ebaf55a01109dc94016dd053d79ff96a45450f0dcc93b413e482e72f98edaacb5f4d7a5bc945effdbf2f22
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.12.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.12.5.ebuild
deleted file mode 100644
index f8a9158860f4..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.12.5.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="KDE Plasma menu editor"
-HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+hotkeys"
-
-DEPEND="
-	$(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 kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	hotkeys? ( $(add_plasma_dep khotkeys) )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/kmenuedit:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.13.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.13.5.ebuild
index b504d5a6e14e..c8058a2b2057 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.13.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma menu editor"
 HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+hotkeys"
 
 DEPEND="
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.14.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.14.1.ebuild
new file mode 100644
index 000000000000..80d15906b3b4
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.14.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+hotkeys"
+
+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 kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	hotkeys? ( $(add_plasma_dep khotkeys) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kinit)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/kmenuedit:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 555d37985ca8..7377c15f40db 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.7.tar.xz 118748 BLAKE2B f7790360820f92d2949648f4ca0d30708d7d36c8c027dca14fbcca7b92d0bc1fdbbfe9850f65a38e91e2bcb17326997fbc1297d29a5940a4d1371831559a87c3 SHA512 4967511dfc6ad1444fb51d7f85e8dba42c3c36d490228dac28eef176771b993e1340cdd09a3f38e2abdb835681f4c3435c36b22c0d828487510ce68bba0919ad
 DIST kscreen-5.13.5.tar.xz 112972 BLAKE2B b8c61e651efefd4517d5fa75965d481c21aab9d9f9f3b5c757a80c388114db4fc352c62ccad28c5215cd97b381a31b56b17c47e11d3fd46124c686b6572d9268 SHA512 86e0edbd6f4ad9639fc79198fde74ba7c0872878ee3eddf9edcb9515a4d68e09699777c1dc8cabb77cb2f1360e7b294a15edd84c0bdc32e985faa9cbcb174e37
-EBUILD kscreen-5.12.5.ebuild 893 BLAKE2B 96a21fedd04dd1f65d9400bc67aa2d2324c7b39bbccb2ed937f53c11a42386d1f14f8661d74720228b31007d610ea791f1095c1b5e69f1c602c245c16d367de0 SHA512 806d196ec98ca72aa1e2b81d5ed136cc0e61ca616e2ffed6ab0f08ea46dee62fdbb093bb891c73b473053b11a0abe8a74cd884f36f8c3d657067cd32e8182f5f
+DIST kscreen-5.14.1.tar.xz 122088 BLAKE2B 2e0f352749822d01286febd76598e6bdde78a8f106f79966c16ce9a59cdac1f5cb64785cfbb8df719dd9d45da0a33285b53ed6ed2b709d4bfb553eeb392ff6f0 SHA512 24fb52d68b6845ee9d5f30af02ed131a68bc2c6d15c64eeede2608705da377db74ed7022c233d7aa6f5b26241a8f9aa8315551c2cf9c697c182629b9ebc428d1
 EBUILD kscreen-5.12.7.ebuild 892 BLAKE2B 0c1a67ac9af6f535cb532840e0d2826d941fcb33dd6048dc9dbf53b332825af852c928266fb26c38e016051b2850fe5dbd670cc08d89804c67bd8cd2a4440d21 SHA512 aac6c2661536832b1adab434dd3d4810d8c1e15635413dc6a2df6937646a9f2b7b706ec9617ed1f50e007af4b4989d6e053d0e5868dd0996bde78dec4c08dda8
-EBUILD kscreen-5.13.5.ebuild 966 BLAKE2B 22255fb7cbed18b5cc0aff47ae5cad6d51c06a04683dce95ff53f990aa17d671ad4b6b001ee70c6336828ab831d7992f7b46169435f5e38d5a9a563ef1f62c2b SHA512 69ee43966bbeeaaf01aa8bdabc1a7aa0f267d5fde491931bbd3d515072a173d4d8232779d8184cefaee8a55395b85534dc342488dfce440880dcb5b0cbdcad57
+EBUILD kscreen-5.13.5.ebuild 961 BLAKE2B dcaee56613bc4da6e50b1f361d641f76c5f6cf9d601fd1ab4b10d9baf2f7916cac57b50748515e53e4e1875bcc79d13d2e3b6ea1af8fcf5b22fe07fedc405922 SHA512 4683e05789274ebfeb5b2cb66f12cd765c319750491368c05a5803d563d4339c0bc1e412c1eb298eaf2d45886c739770376034437f0a58cef7b8fea3ee6baf43
+EBUILD kscreen-5.14.1.ebuild 963 BLAKE2B 7086dafd20f9bfee3390329c9794e02d23b2e2b94c43e2b2e0f1b0ca575e802a959f32073b52394abe95268ac5adb418a1db8f5dda4c07dc9d617d4f51832f0e SHA512 a33a2043c80d195a0bba65805d0c2cc754b8bc02eeee634584df42117f9602f00d755295f606ae6a1a91636ad5f0346137cb73287b89f9aa12c7328afc4caf5c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.12.5.ebuild b/kde-plasma/kscreen/kscreen-5.12.5.ebuild
deleted file mode 100644
index 25fbcb5d7729..000000000000
--- a/kde-plasma/kscreen/kscreen-5.12.5.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="KDE Plasma screen management"
-HOMEPAGE="https://cgit.kde.org/kscreen.git"
-
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-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 kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkscreen)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtgraphicaleffects)
-	!kde-plasma/kscreen:4
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreen/kscreen-5.13.5.ebuild b/kde-plasma/kscreen/kscreen-5.13.5.ebuild
index e201e30c3a21..5b4ab6dd03f1 100644
--- a/kde-plasma/kscreen/kscreen-5.13.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="KDE Plasma screen management"
 HOMEPAGE="https://cgit.kde.org/kscreen.git"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kscreen/kscreen-5.14.1.ebuild b/kde-plasma/kscreen/kscreen-5.14.1.ebuild
new file mode 100644
index 000000000000..188f27af4978
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.14.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://cgit.kde.org/kscreen.git"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep libkscreen)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtgraphicaleffects)
+	!kde-plasma/kscreen:4
+"
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 2f9609356c17..3776e3aa6415 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -2,10 +2,10 @@ AUX ck-unlock-session 6159 BLAKE2B e5ef1f55e5082b35a67778e055548a59e15f346cd0aaa
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 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.7.tar.xz 119484 BLAKE2B d8f0e60ec3c3f294d9daf109fc327d895f32e0c9b26841787a1ed20b5b6d3ba8113b30858caec0e8782b56d717d91979f13187466c174f4c2153678e14e7d7f3 SHA512 76554e8ad6872705e903bda5f55f650d859b282b400ca739f346e392ce7961891057c8a8a43b5dcb85c83860e4744252500c338e5d99fd67a33df529a7e040c6
 DIST kscreenlocker-5.13.5.tar.xz 122112 BLAKE2B 4effbfd26b15ca9a0225031b11b892092351a95eddf2bad659b7a97e347db402d5f28415d6d8fb11eb3ad095faa7ad430e949d5f21abaf33da8cc8f47ba8e26e SHA512 c09f55da12893f162fcdc7559e55fa50d48bb642673de84809939e695ee93843e97a5224cfc79cb6bea6a1146ac757c45eab0bd1aa20e36206290c0155d8dfe2
-EBUILD kscreenlocker-5.12.5.ebuild 2231 BLAKE2B 64e6f1fcec4c10f1b132f982885b7e147bd4cc5683dde7db7f6156eb6657bfb28348de634f18c63aee355397527552cc658e26fae2abae217a29de3cedc42544 SHA512 f29c740fd2c2191f64595192ca48c6eb4bfa07eb0739aa157de6b33b96873f27b3368039a18d100cd4af24aa6873b6bb3e65f5b7d8dc368bb7fa03072b556edb
+DIST kscreenlocker-5.14.1.tar.xz 122056 BLAKE2B 890ae3a0e179a0216efd0ca49f6f702df9a7e8c7cb5a27fa25e94c825b218b3df15365625a55b7bb98790dc561e72ba3bdbf006ddb88c23febac85e7e0f40740 SHA512 6097289a4935ed296d7266309aa057031a7e28a2dc4b7c41bb47f1e476fe1d7f9691df7c40812e1215644e540658c743f76c3e377fccb6d17ca1494c5312a0b8
 EBUILD kscreenlocker-5.12.7.ebuild 2252 BLAKE2B 86dcd3c39af729ebe9d12ab2b356a482c5d2613bde23bce1bf05dc7dce2b42f8b049f177c01bc2e126e5ad8536f7108ae04f276a65c8387a35d69d3400c89ef6 SHA512 101c95a11d8df57b0a244e708780cde854bc919668a85d3aaeee50dcee4cb14b5bb92a129aa629130a6b63dbf77378969f877bafc258efcd2e8c42e012376b91
-EBUILD kscreenlocker-5.13.5.ebuild 2127 BLAKE2B 98be7d075d0a12eb2097e0bc70c4fe0bd348b8ca971f8c13b0c51720ddf7fd05f171cc540633b28e7c090796b4971397d65ab9aed58fd2cc96be8454a389cb3f SHA512 8fa4af6398741fcf4cfbb2ab9da4ebe10e50c5cad46bdc2fb7176fa826a1cbe9e05430fd85194663708bdcfea236451ebca9d3aa6cef6a9dc64da73d184650ad
+EBUILD kscreenlocker-5.13.5.ebuild 2122 BLAKE2B 13c6cfe20e6e742cdb837eddfdbfddb1f65190a8c471a537523c3464d54b034cf8b632baad6477e997c5bba2dcc78b2e7f686e4af78b0d563ad50642aefd66c1 SHA512 5bdef92448cc1d024248b3497df0d53bf798b59d6dcc5374399e4425ead6f4d6f20d0f39854253150ad6038abafed1f55ca8216a003e3531227b6385e2a7dec3
+EBUILD kscreenlocker-5.14.1.ebuild 2124 BLAKE2B bc2a3e99d04da5f9b8f29ff892e354d59ba43b985ad104005a3a92f350237c86ea3b5529f3fa4dc37282ac066d8c8a9357c235cf76d1552bfcb4b6b67750bbe3 SHA512 0a845b6ff77e2fd8045d186517344229690d8853dbb3ae75b00ef6aac3e2728059d19e551411006cf753f424fbea75bec1391aabc835793700b3c4664a773dde
 MISC metadata.xml 397 BLAKE2B 0fad03b144a175f0f5f9d8e0c0ba4f75e6cd4f211ba0207e73a7968b7d49bbe0977860324a51ebef324ea0f915eb92dc23978558e000085ff21bd8fdb1d53187 SHA512 1d3749f74eab5cd2e17f73bb44e9f8d7ce03060db8d422a835597f13dce6c39c232eface04d9e74ed3ef66e9a45bb7b4b64c4cd82f6b5aedc62627bd77801c76
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.12.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.12.5.ebuild
deleted file mode 100644
index a28a5f5d6422..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.12.5.ebuild
+++ /dev/null
@@ -1,96 +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 pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="consolekit +pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( virtual/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-plasma/kdebase-pam:0
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	use consolekit && eapply "${FILESDIR}"/${PN}-consolekit-unlock.patch
-
-	use test || sed -i \
-		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	kde5_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake-utils_use_find_package pam PAM)
-		$(cmake-utils_use_find_package seccomp Seccomp)
-	)
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	newpamd "${FILESDIR}/kde.pam" kde
-	newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	use consolekit && dobin "${FILESDIR}"/ck-unlock-session
-
-	if ! use pam; then
-		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.13.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.13.5.ebuild
index 4fcb306fa5a5..509d7ebe22da 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.13.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 pam
 
 DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.14.1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.14.1.ebuild
new file mode 100644
index 000000000000..ab0f95ec9ebe
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.14.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+pam seccomp"
+
+REQUIRED_USE="seccomp? ( pam )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	dev-libs/wayland
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( virtual/pam )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/kcheckpass-4.11.22-r1:4
+	!kde-plasma/kdebase-pam:0
+"
+PDEPEND="
+	$(add_plasma_dep kde-cli-tools)
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	use test || sed -i \
+		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	kde5_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake-utils_use_find_package pam PAM)
+		$(cmake-utils_use_find_package seccomp Seccomp)
+	)
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	use pam && newpamd "${FILESDIR}/kde.pam" kde
+	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	if ! use pam; then
+		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 04660907aac0..65108009e11a 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.7.tar.xz 21332 BLAKE2B bef0308071942b1c964ddb6f53574e46ecf04018636d6aa34c42d7cdc9f7cc51110678746d5debdc4dfe8c2463c3369dc91fd7c3446be897c1ff670ad88a8d9e SHA512 0c613b5263721a510844b24f4311d906f229acdbb72967902973f995b88973f68f13fd098bf702d1281023f17eafb87de388589062da1b58923479e6fe831a7a
 DIST ksshaskpass-5.13.5.tar.xz 21408 BLAKE2B f69798427ca5e4681543580158fc0ded5c4c3d352e31476cbc7832e99844cd30d8134785c460900724fdbd922ef526974dfc28d76ef89369ac309bcbf495e334 SHA512 88712a268710bac6c60bb111d79bf52f5b34e0a7e0f27ea1affb32bc1a18925998a5040e1b96907e4e1648304706ca2c3c2815d98b7807d972fbf8f57f285e96
-EBUILD ksshaskpass-5.12.5.ebuild 1235 BLAKE2B 76ec180a4af4bf1b0f861f3f86e8ba4df59d796a58bfd95dcf1e1dac2dcf9eb7e7682a714fef94cfbe1609518381e8d812b10f6665d2aa2100b6ac337181f5a7 SHA512 02ef5de19976e1b1aaa20ac0c6534bca3094a4befad0da39d557199455ec37d8f058e5aecea2be2a808bb98d5723ca511147ab7148a205fa39515d960d3b41eb
+DIST ksshaskpass-5.14.1.tar.xz 21328 BLAKE2B beeeab0656f4a95e5411dc505fe0c313e553bcbba7edb21f2b3fffd877e822b4f10da957e47860b0eb2be37360c5e2afd9a39cd4778558afa0ebb374d5bba5ea SHA512 95241f59d9015d9cd20ad4c9f98cf8e7d5666a2eb5393a4ef08397e081cc1ce30154dcabd351dfe79a9598f416f3b87823837da3152e3f398a231129301ad307
 EBUILD ksshaskpass-5.12.7.ebuild 1234 BLAKE2B af4b8b990dbdf6859d3ed3c562fddecb9c8f8f1a6c80cfa81761ba25eb3a5723e37acea2cba8d2de7272d8390ff8bf43be32f6d5bd5b8a21c625827ca5ed60e8 SHA512 0bf20c17fd6b2230a83f03c9118f6da22155eea8d5feb9d04dbc5dab04dd1f45fe9df13f7a7dd1f88e32d45724d64ba6cced92e56dd4172968507196677a308a
-EBUILD ksshaskpass-5.13.5.ebuild 1237 BLAKE2B 1c99e53800164ee9b4fc7a1b3f0e455d73731bf4134c4ef564ab87232172821c4f0b21cc6585b71af7260f624fc2e72bf65eb1f464c3cb2306387c41a494eecd SHA512 8dee7f813fb760cabaa932423c2cb099647141f664abdae30996d212226aa9c42f5b683543d021ec2abe48d19086e22a26416806375849c07c0db7900ab5b0ff
+EBUILD ksshaskpass-5.13.5.ebuild 1232 BLAKE2B 9a8faea2a76e168fd052f95f1f02f3c4537691216c86b9273f00166c6ee992fd2fe46f71f142a994bf0cc04b62da14e111af94deb821bb6ced1078adc149d91c SHA512 272d172e50b43ade2fac038ad57abd105f2c111f3f8b9a67053994602f21959fef32151683e94a692acb91424cf546dfd7f38e0d6bd9cbfea2e65099e5945a68
+EBUILD ksshaskpass-5.14.1.ebuild 1234 BLAKE2B af4b8b990dbdf6859d3ed3c562fddecb9c8f8f1a6c80cfa81761ba25eb3a5723e37acea2cba8d2de7272d8390ff8bf43be32f6d5bd5b8a21c625827ca5ed60e8 SHA512 0bf20c17fd6b2230a83f03c9118f6da22155eea8d5feb9d04dbc5dab04dd1f45fe9df13f7a7dd1f88e32d45724d64ba6cced92e56dd4172968507196677a308a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.12.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.12.5.ebuild
deleted file mode 100644
index 0524af98d042..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.12.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="
-	${DEPEND}
-	!kde-plasma/ksshaskpass:4
-"
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	elog ""
-	elog "In order to have ssh-agent start at kde startup,"
-	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
-	elog "the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
-	elog "properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/plasma/startup/05-ksshaskpass.sh"
-	elog ""
-}
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.13.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.13.5.ebuild
index 3009c8d5ff69..289f7a5ba309 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.13.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
 HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.14.1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.14.1.ebuild
new file mode 100644
index 000000000000..058e2fe8d646
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.14.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="
+	${DEPEND}
+	!kde-plasma/ksshaskpass:4
+"
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog ""
+	elog "In order to have ssh-agent start at kde startup,"
+	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
+	elog "the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
+	elog "properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/plasma/startup/05-ksshaskpass.sh"
+	elog ""
+}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 9bffbf768724..7990b7c8b34f 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.7.tar.xz 496904 BLAKE2B da069b522a5f4de685f7b5421fc427026f7bff892e9aee30bad4713717f4864edf0a8314066fc97749fb5e712944c07e29d95ac26afb8f4a05a81104f7844e2f SHA512 745958c74914d9b21373919b0e54cf7d1dd0621769aa8a480bac924862c494c68c86fa36c019fb13d71d8d86c8d923161290ef9a967b98c1182df88da63bbb35
 DIST ksysguard-5.13.5.tar.xz 497776 BLAKE2B 15daec09221993a9c5f39845a3cd168d01ee9a367020312507ac96615722fdf0e5244b3130dd5f09905db8a95b7ddf5df58cdada64a1e291c069f1b58912e684 SHA512 3df272468c6ea1a1211fd9f1e40bab5be8cdff8cb02556999cde8dde81042d6a0d8ad3958faf507323d7770f6dc2631d9ceba7ade796f8927719ce4a8659ca21
-EBUILD ksysguard-5.12.5.ebuild 1143 BLAKE2B bc2409ea028c763c822431abd58fe334cf5f3ab8430b43ec61cd53336e278f4a8bcb518e01d1de86607053fded35b8924bce024ababea2c904bd89159e57a6cc SHA512 3f50f88f16dde5a45742d8012d5a5601955b59c191aa82d0fa410425fa56e13faf3f8370a4f86d2eceda48790d9ffc12aeaf647a1689f5c1310ade072a8037c3
+DIST ksysguard-5.14.1.tar.xz 501576 BLAKE2B 45c38b005d9fedcf9f28561813a15500afd8a0e3014bcd74fd91dc1cb72bc2d73d763b5c46be2f08bb54b9706f518961db00d8aa6c309fdc253e5cad08f4c26d SHA512 be763f76691716cc80c758bbc288f4c857c72dd53d84340f57482149cf2166eff3a941e7048ebe235acd07445031a4cb66853fa197e3768ac71de887307047b7
 EBUILD ksysguard-5.12.7.ebuild 1142 BLAKE2B bdd2327ec79657a1d8bb6588cbf2be24f2ea5f2a2f2c842e30a27225b31d8d72d2ad376140ec7e781b7eff73a22c5e7428e45043246a68e4f5a5955c0f7257e1 SHA512 e85b7acc3d570aaa8c5f33a812dbe094e2dc3e538f3867bbac5887a52c04fa20491908382176342952fde82a29ee41a0fe6637a3f736093a2ff0518f27f00a9a
-EBUILD ksysguard-5.13.5.ebuild 1145 BLAKE2B 46054b5abb67d1b8f049c8bcc974ee3e2bf7c2029c151aa31688cab1b251e2913aa54bc6587361b2b7030ffed33aef8615af3a8d3641f1463458f374f29a635c SHA512 201d5337ec13c6b615401ea9b0ecf478224d454dc6dde1c9defddd9de9a980f9ab9f3b9061e1c3a84a5013cdb0964a7238b4a3b3caf83f741ce8c36fa9247209
+EBUILD ksysguard-5.13.5.ebuild 1140 BLAKE2B d0ed21142b336332db7f7a99217f0ef2798e301cb4de06004bef88f9fa2e33eee6a3266f96d8d7d8c40e32ab60a22988765a171252ca9d6c77d6d2042b6a500f SHA512 1c3e2df3d10e13cb5c8310c0a08e4143d4988a6442e5970a44967babed0ddea0559db1263c61b5779888cf456dca4f6c2fe259bb6dcfa03b9b1f3c279b109ed3
+EBUILD ksysguard-5.14.1.ebuild 1142 BLAKE2B bdd2327ec79657a1d8bb6588cbf2be24f2ea5f2a2f2c842e30a27225b31d8d72d2ad376140ec7e781b7eff73a22c5e7428e45043246a68e4f5a5955c0f7257e1 SHA512 e85b7acc3d570aaa8c5f33a812dbe094e2dc3e538f3867bbac5887a52c04fa20491908382176342952fde82a29ee41a0fe6637a3f736093a2ff0518f27f00a9a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.12.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.12.5.ebuild
deleted file mode 100644
index 71b63220f1fb..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.12.5.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"
-inherit kde5
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="lm_sensors"
-
-DEPEND="
-	$(add_plasma_dep libksysguard '-minimal(-)')
-	$(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 kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(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)
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/ksysguard:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm_sensors Sensors)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/ksysguard/ksysguard-5.13.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.13.5.ebuild
index 5e2260a85627..509a93fd50ad 100644
--- a/kde-plasma/ksysguard/ksysguard-5.13.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Network-enabled task manager and system monitor"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="lm_sensors"
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/ksysguard-5.14.1.ebuild b/kde-plasma/ksysguard/ksysguard-5.14.1.ebuild
new file mode 100644
index 000000000000..4b2349e1b061
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.14.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="lm_sensors"
+
+DEPEND="
+	$(add_plasma_dep libksysguard '-minimal(-)')
+	$(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 kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(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)
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/ksysguard:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package lm_sensors Sensors)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 49f6742e7703..fb7c28148463 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,10 +1,7 @@
-AUX kwallet-pam-5.11.5-CVE-2018-10380-1.patch 8141 BLAKE2B 2e046728d287905cbde172766dc9f0a997f3bbe58cce76603124dcf3aa27ec9eee375916fda9143922d54642674a5770c8bb7a22674abfb437774727b026fa47 SHA512 21783185762e280e8722d1b7926fc5d3725024e4b8a27b8017831b47ffa6fbb5a2a4a54a77a5d972ab497ae01ccfb4c00a8ebb3a0013f2d950731aa9ae422dd4
-AUX kwallet-pam-5.11.5-CVE-2018-10380-2.patch 4704 BLAKE2B f41887afa091c158efcd61427e7fe60b47a9d5730e656c268167f6574517ffa57ab0098d9d3542d5b3d54bad35b66e0e424a0b8488c8a575c7514e4494a17675 SHA512 ee506d752bf0c3db955d4f4bc62a620549bbf7090fff7fc27afd86e87964b203cf919ec727262ffcb08ffeccb9ede4b99ea5eea0fd77ac381ebbe2269d1d230b
-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.7.tar.xz 18728 BLAKE2B 66386c982597a4a1024a9a0e8317106900423959213a543a14ba1d3f3c2cf6aed21ace24b01cffcd2ed0a7acf409111d4488ecb3183a71bb026f606fd76520cf SHA512 7d2c8776f481bd03396056321f8c94f8bcea4b821c3cf58531077cd09922dacbe8896998d56a7856721f0dbaf7b2f7e24188292aed7b17c288d0346e8d14695b
 DIST kwallet-pam-5.13.5.tar.xz 18668 BLAKE2B 4dac7c037fe8ad89be884d5e4c7e850b62d2838161a9086e6f193345d4001860e7ff286e4052009f2010f6517ee30b3f6838c955bef5efc30c9e6999076b231e SHA512 cdd273d13406a927f93ce4f6189484b67d7ad146c5eb42f4d99d85c95938fe457082790453709c3d7129b2321c723e12ef93468e8febb68a19132f6f0fe72f62
-EBUILD kwallet-pam-5.12.5-r1.ebuild 706 BLAKE2B 407beed9615900fac5d8d0c178a582238ad5e6a2cf2135346089b6863e13cb75fddcea965424b7f6c67ade10bcdc81cfd9497857a8a90f82bdc2503a7c765f7b SHA512 8266f8b9d03f6c7e4e08a2c6e657cb6c44ec716e3619cb6dfedaeb3abfa611b439d7b128be21956cbaeda0d3397b57fae35f5c9182ba02125cb6fb7aa4eca5a6
+DIST kwallet-pam-5.14.1.tar.xz 19124 BLAKE2B 8504fed6db74fc03231a9bcf8c49b9fdf95fe2455fac670ee17dcf13f17a482761e4f607ffe6ff926481d46ee6c88f852cdac9974fb6671716ec983176d7a42f SHA512 61807702755d285c42797aa69b8d632e75126bee7c4bb8644e41f258c75f8046e30531f7acaf2e5f57d7d9a06174e5a1cfeeb31403f61871083f39040fd8b292
 EBUILD kwallet-pam-5.12.7.ebuild 636 BLAKE2B fe3125630255c0c44cd930b734bbc5ebc90212da6970b523ab62e630ce647940117dda1352fe56b8b436985b5008c7374e322660018ab99e554f0cc0019ed8ac SHA512 8ca71ade573c03303fd7bbcf99b77cd220d73f467e05837c361dd0f154f68c65d82262ee299acb7378aaab90afce12cf68d2e1d7e647911821964cd6ea2fd4d4
-EBUILD kwallet-pam-5.13.5.ebuild 639 BLAKE2B 2050e8d5536ac921c663db3912957c054a7222ce9428e731972302b50375a5de3dbb4aa6799fde9c6c070fc0c0083791a8f36863c799d6c793ab102685511d55 SHA512 1f2770a2b879c386e35627ca74a4b583e9fdd3dcc7a8468ed1f993c26d8fa0e4eb7c700509841a2d6b434bade703c4bc61523e61f276f3b41d1521c445a33ff9
+EBUILD kwallet-pam-5.13.5.ebuild 634 BLAKE2B 6b5579b199117b038aca09f3dfe63fca5236898afa0cebd1addcfea6c8595f4dd07be70b4b8502365ee1859e51f1b261603d355bbba1a4347203e52bd78f2c11 SHA512 82b08b8ff6f2a7b946079022df4ad79ba4b91a4e90a148e841573d12bea136a0fba23ed103f519201baa2d0edf6a8c506739e74b6e413d0e92559daee182a02a
+EBUILD kwallet-pam-5.14.1.ebuild 636 BLAKE2B fe3125630255c0c44cd930b734bbc5ebc90212da6970b523ab62e630ce647940117dda1352fe56b8b436985b5008c7374e322660018ab99e554f0cc0019ed8ac SHA512 8ca71ade573c03303fd7bbcf99b77cd220d73f467e05837c361dd0f154f68c65d82262ee299acb7378aaab90afce12cf68d2e1d7e647911821964cd6ea2fd4d4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-1.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-1.patch
deleted file mode 100644
index 70ade02a8250..000000000000
--- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-1.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From 2134dec85ce19d6378d03cddfae9e5e464cb24c0 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 1 May 2018 12:29:02 +0200
-Subject: Move salt creation to an unprivileged process
-
-Opening files for writing as root is very tricky since through the power
-of symlinks we can get tricked to write in places we don't want to and
-we don't really need to be root to create the salt file
----
- pam_kwallet.c | 121 ++++++++++++++++++++++++++++++++++------------------------
- 1 file changed, 71 insertions(+), 50 deletions(-)
-
-diff --git a/pam_kwallet.c b/pam_kwallet.c
-index 20d9603..083c9aa 100644
---- a/pam_kwallet.c
-+++ b/pam_kwallet.c
-@@ -82,7 +82,7 @@ const static char *envVar = "PAM_KWALLET_LOGIN";
- 
- static int argumentsParsed = -1;
- 
--int kwallet_hash(const char *passphrase, struct passwd *userInfo, char *key);
-+int kwallet_hash(pam_handle_t *pamh, const char *passphrase, struct passwd *userInfo, char *key);
- 
- static void parseArguments(int argc, const char **argv)
- {
-@@ -325,7 +325,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, cons
-     }
- 
-     char *key = malloc(KWALLET_PAM_KEYSIZE);
--    if (!key || kwallet_hash(password, userInfo, key) != 0) {
-+    if (!key || kwallet_hash(pamh, password, userInfo, key) != 0) {
-         free(key);
-         pam_syslog(pamh, LOG_ERR, "%s: Fail into creating the hash", logPrefix);
-         return PAM_IGNORE;
-@@ -352,6 +352,26 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, cons
-     return PAM_SUCCESS;
- }
- 
-+static int drop_privileges(struct passwd *userInfo)
-+{
-+    /* When dropping privileges from root, the `setgroups` call will
-+    * remove any extraneous groups. If we don't call this, then
-+    * even though our uid has dropped, we may still have groups
-+    * that enable us to do super-user things. This will fail if we
-+    * aren't root, so don't bother checking the return value, this
-+    * is just done as an optimistic privilege dropping function.
-+    */
-+    setgroups(0, NULL);
-+
-+    //Change to the user in case we are not it yet
-+    if (setgid (userInfo->pw_gid) < 0 || setuid (userInfo->pw_uid) < 0 ||
-+        setegid (userInfo->pw_gid) < 0 || seteuid (userInfo->pw_uid) < 0) {
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
- static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], int envSocket)
- {
-     //In the child pam_syslog does not work, using syslog directly
-@@ -366,18 +386,8 @@ static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toW
-     //This is the side of the pipe PAM will send the hash to
-     close (toWalletPipe[1]);
- 
--    /* When dropping privileges from root, the `setgroups` call will
--    * remove any extraneous groups. If we don't call this, then
--    * even though our uid has dropped, we may still have groups
--    * that enable us to do super-user things. This will fail if we
--    * aren't root, so don't bother checking the return value, this
--    * is just done as an optimistic privilege dropping function.
--    */
--    setgroups(0, NULL);
--
-     //Change to the user in case we are not it yet
--    if (setgid (userInfo->pw_gid) < 0 || setuid (userInfo->pw_uid) < 0 ||
--        setegid (userInfo->pw_gid) < 0 || seteuid (userInfo->pw_uid) < 0) {
-+    if (drop_privileges(userInfo) < 0) {
-         syslog(LOG_ERR, "%s: could not set gid/uid/euid/egit for kwalletd", logPrefix);
-         goto cleanup;
-     }
-@@ -619,7 +629,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const c
-     return PAM_SUCCESS;
- }
- 
--int mkpath(char *path, struct passwd *userInfo)
-+static int mkpath(char *path)
- {
-     struct stat sb;
-     char *slash;
-@@ -639,10 +649,6 @@ int mkpath(char *path, struct passwd *userInfo)
-                 errno != EEXIST)) {
-                 syslog(LOG_ERR, "%s: Couldn't create directory: %s because: %d-%s", logPrefix, path, errno, strerror(errno));
-                 return (-1);
--            } else {
--                if (chown(path, userInfo->pw_uid, userInfo->pw_gid) == -1) {
--                    syslog(LOG_INFO, "%s: Couldn't change ownership of: %s", logPrefix, path);
--                }
-             }
-         } else if (!S_ISDIR(sb.st_mode)) {
-             return (-1);
-@@ -654,34 +660,49 @@ int mkpath(char *path, struct passwd *userInfo)
-     return (0);
- }
- 
--static char* createNewSalt(const char *path, struct passwd *userInfo)
-+static void createNewSalt(pam_handle_t *pamh, const char *path, struct passwd *userInfo)
- {
--    unlink(path);//in case the file already exists
-+    const int pid = fork();
-+    if (pid == -1) {
-+        pam_syslog(pamh, LOG_ERR, "%s: Couldn't fork to create salt file", logPrefix);
-+    } else if (pid == 0) {
-+        // Child process
-+        if (drop_privileges(userInfo) < 0) {
-+            syslog(LOG_ERR, "%s: could not set gid/uid/euid/egit for salt file creation", logPrefix);
-+            exit(-1);
-+        }
- 
--    char *dir = strdup(path);
--    dir[strlen(dir) - 14] = '\0';//remove kdewallet.salt
--    mkpath(dir, userInfo);//create the path in case it does not exists
--    free(dir);
-+        unlink(path);//in case the file already exists
- 
--    char *salt = gcry_random_bytes(KWALLET_PAM_SALTSIZE, GCRY_STRONG_RANDOM);
--    FILE *fd = fopen(path, "w");
-+        char *dir = strdup(path);
-+        dir[strlen(dir) - 14] = '\0';//remove kdewallet.salt
-+        mkpath(dir); //create the path in case it does not exists
-+        free(dir);
- 
--    //If the file can't be created
--    if (fd == NULL) {
--        syslog(LOG_ERR, "%s: Couldn't open file: %s because: %d-%s", logPrefix, path, errno, strerror(errno));
--        return NULL;
--    }
-+        char *salt = gcry_random_bytes(KWALLET_PAM_SALTSIZE, GCRY_STRONG_RANDOM);
-+        FILE *fd = fopen(path, "w");
- 
--    fwrite(salt, KWALLET_PAM_SALTSIZE, 1, fd);
--    fclose(fd);
-+        //If the file can't be created
-+        if (fd == NULL) {
-+            syslog(LOG_ERR, "%s: Couldn't open file: %s because: %d-%s", logPrefix, path, errno, strerror(errno));
-+            exit(-2);
-+        }
- 
--    if (chown(path, userInfo->pw_uid, userInfo->pw_gid) == -1) {
--        syslog(LOG_ERR, "%s: Couldn't change ownership of the created salt file", logPrefix);
--    }
-+        fwrite(salt, KWALLET_PAM_SALTSIZE, 1, fd);
-+        fclose(fd);
- 
--    return salt;
-+        exit(0); // success
-+    } else {
-+        // pam process, just wait for child to finish
-+        int status;
-+        waitpid(pid, &status, 0);
-+        if (status != 0) {
-+            pam_syslog(pamh, LOG_ERR, "%s: Couldn't create salt file", logPrefix);
-+        }
-+    }
- }
--int kwallet_hash(const char *passphrase, struct passwd *userInfo, char *key)
-+
-+int kwallet_hash(pam_handle_t *pamh, const char *passphrase, struct passwd *userInfo, char *key)
- {
-     if (!gcry_check_version("1.5.0")) {
-         syslog(LOG_ERR, "%s-kwalletd: libcrypt version is too old", logPrefix);
-@@ -700,19 +721,19 @@ int kwallet_hash(const char *passphrase, struct passwd *userInfo, char *key)
-     struct stat info;
-     char *salt = NULL;
-     if (stat(path, &info) != 0 || info.st_size == 0) {
--        salt = createNewSalt(path, userInfo);
--    } else {
--        FILE *fd = fopen(path, "r");
--        if (fd == NULL) {
--            syslog(LOG_ERR, "%s: Couldn't open file: %s because: %d-%s", logPrefix, path, errno, strerror(errno));
--            free(path);
--            return 1;
--        }
--        salt = (char*) malloc(KWALLET_PAM_SALTSIZE);
--        memset(salt, '\0', KWALLET_PAM_SALTSIZE);
--        fread(salt, KWALLET_PAM_SALTSIZE, 1, fd);
--        fclose(fd);
-+        createNewSalt(pamh, path, userInfo);
-     }
-+
-+    FILE *fd = fopen(path, "r");
-+    if (fd == NULL) {
-+        syslog(LOG_ERR, "%s: Couldn't open file: %s because: %d-%s", logPrefix, path, errno, strerror(errno));
-+        free(path);
-+        return 1;
-+    }
-+    salt = (char*) malloc(KWALLET_PAM_SALTSIZE);
-+    memset(salt, '\0', KWALLET_PAM_SALTSIZE);
-+    fread(salt, KWALLET_PAM_SALTSIZE, 1, fd);
-+    fclose(fd);
-     free(path);
- 
-     if (salt == NULL) {
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-2.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-2.patch
deleted file mode 100644
index 2f88e0c3ceae..000000000000
--- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-2.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 01d4143fda5bddb6dca37b23304dc239a5fb38b5 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 1 May 2018 12:32:24 +0200
-Subject: Move socket creation to unprivileged codepath
-
-We don't need to be creating the socket as root, and doing so,
-specially having a chown is problematic security wise.
----
- pam_kwallet.c | 77 ++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 36 insertions(+), 41 deletions(-)
-
-diff --git a/pam_kwallet.c b/pam_kwallet.c
-index 083c9aa..b9c984a 100644
---- a/pam_kwallet.c
-+++ b/pam_kwallet.c
-@@ -372,13 +372,13 @@ static int drop_privileges(struct passwd *userInfo)
-     return 0;
- }
- 
--static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], int envSocket)
-+static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], char *fullSocket)
- {
-     //In the child pam_syslog does not work, using syslog directly
-     int x = 2;
-     //Close fd that are not of interest of kwallet
-     for (; x < 64; ++x) {
--        if (x != toWalletPipe[0] && x != envSocket) {
-+        if (x != toWalletPipe[0]) {
-             close (x);
-         }
-     }
-@@ -392,6 +392,39 @@ static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toW
-         goto cleanup;
-     }
- 
-+    int envSocket;
-+    if ((envSocket = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
-+        pam_syslog(pamh, LOG_ERR, "%s: couldn't create socket", logPrefix);
-+        return;
-+    }
-+
-+    struct sockaddr_un local;
-+    local.sun_family = AF_UNIX;
-+
-+    if (strlen(fullSocket) > sizeof(local.sun_path)) {
-+        pam_syslog(pamh, LOG_ERR, "%s: socket path %s too long to open",
-+                   logPrefix, fullSocket);
-+        free(fullSocket);
-+        return;
-+    }
-+    strcpy(local.sun_path, fullSocket);
-+    free(fullSocket);
-+    fullSocket = NULL;
-+    unlink(local.sun_path);//Just in case it exists from a previous login
-+
-+    pam_syslog(pamh, LOG_INFO, "%s: final socket path: %s", logPrefix, local.sun_path);
-+
-+    size_t len = strlen(local.sun_path) + sizeof(local.sun_family);
-+    if (bind(envSocket, (struct sockaddr *)&local, len) == -1) {
-+        pam_syslog(pamh, LOG_INFO, "%s-kwalletd: Couldn't bind to local file\n", logPrefix);
-+        return;
-+    }
-+
-+    if (listen(envSocket, 5) == -1) {
-+        pam_syslog(pamh, LOG_INFO, "%s-kwalletd: Couldn't listen in socket\n", logPrefix);
-+        return;
-+    }
-+
-     // Fork twice to daemonize kwallet
-     setsid();
-     pid_t pid = fork();
-@@ -452,12 +485,6 @@ static void start_kwallet(pam_handle_t *pamh, struct passwd *userInfo, const cha
-         pam_syslog(pamh, LOG_ERR, "%s: Couldn't create pipes", logPrefix);
-     }
- 
--    int envSocket;
--    if ((envSocket = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
--        pam_syslog(pamh, LOG_ERR, "%s: couldn't create socket", logPrefix);
--        return;
--    }
--
- #ifdef KWALLET5
-     const char *socketPrefix = "kwallet5";
- #else
-@@ -493,38 +520,6 @@ static void start_kwallet(pam_handle_t *pamh, struct passwd *userInfo, const cha
-         return;
-     }
- 
--    struct sockaddr_un local;
--    local.sun_family = AF_UNIX;
--
--    if (strlen(fullSocket) > sizeof(local.sun_path)) {
--        pam_syslog(pamh, LOG_ERR, "%s: socket path %s too long to open",
--                   logPrefix, fullSocket);
--        free(fullSocket);
--        return;
--    }
--    strcpy(local.sun_path, fullSocket);
--    free(fullSocket);
--    fullSocket = NULL;
--    unlink(local.sun_path);//Just in case it exists from a previous login
--
--    pam_syslog(pamh, LOG_INFO, "%s: final socket path: %s", logPrefix, local.sun_path);
--
--    size_t len = strlen(local.sun_path) + sizeof(local.sun_family);
--    if (bind(envSocket, (struct sockaddr *)&local, len) == -1) {
--        pam_syslog(pamh, LOG_INFO, "%s-kwalletd: Couldn't bind to local file\n", logPrefix);
--        return;
--    }
--
--    if (listen(envSocket, 5) == -1) {
--        pam_syslog(pamh, LOG_INFO, "%s-kwalletd: Couldn't listen in socket\n", logPrefix);
--        return;
--    }
--
--    if (chown(local.sun_path, userInfo->pw_uid, userInfo->pw_gid) == -1) {
--        pam_syslog(pamh, LOG_INFO, "%s: Couldn't change ownership of the socket", logPrefix);
--        return;
--    }
--
-     pid_t pid;
-     int status;
-     switch (pid = fork ()) {
-@@ -534,7 +529,7 @@ static void start_kwallet(pam_handle_t *pamh, struct passwd *userInfo, const cha
- 
-     //Child fork, will contain kwalletd
-     case 0:
--        execute_kwallet(pamh, userInfo, toWalletPipe, envSocket);
-+        execute_kwallet(pamh, userInfo, toWalletPipe, fullSocket);
-         /* Should never be reached */
-         break;
- 
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-3.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-3.patch
deleted file mode 100644
index de882e454536..000000000000
--- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-3.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8da1a47035fc92bc1496059583772bc4bd6e8ba6 Mon Sep 17 00:00:00 2001
-From: Maximiliano Curia <maxy@gnuservers.com.ar>
-Date: Fri, 4 May 2018 22:06:06 +0200
-Subject: Avoid giving an stderr to kwallet
-
-Summary:
-The fixes for CVE-2018-10380 introduced a regression for most users not
-using kde, and some for kde sessions. In particular the reorder of the
-close calls and creating a new socket caused that the socket is always
-assigned the file descriptor 2, aka stderr.
-
-BUG: 393856
-
-Test Plan: It works
-
-Reviewers: #plasma, aacid
-
-Reviewed By: aacid
-
-Subscribers: asturmlechner, rdieter, davidedmundson, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D12702
----
- pam_kwallet.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/pam_kwallet.c b/pam_kwallet.c
-index b9c984a..661ed8d 100644
---- a/pam_kwallet.c
-+++ b/pam_kwallet.c
-@@ -375,7 +375,8 @@ static int drop_privileges(struct passwd *userInfo)
- static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], char *fullSocket)
- {
-     //In the child pam_syslog does not work, using syslog directly
--    int x = 2;
-+    //keep stderr open so socket doesn't returns us that fd
-+    int x = 3;
-     //Close fd that are not of interest of kwallet
-     for (; x < 64; ++x) {
-         if (x != toWalletPipe[0]) {
-@@ -424,6 +425,8 @@ static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toW
-         pam_syslog(pamh, LOG_INFO, "%s-kwalletd: Couldn't listen in socket\n", logPrefix);
-         return;
-     }
-+    //finally close stderr
-+    close(2);
- 
-     // Fork twice to daemonize kwallet
-     setsid();
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.12.5-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.12.5-r1.ebuild
deleted file mode 100644
index a9886b94ab53..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.12.5-r1.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="KWallet PAM module to not enter password again"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	virtual/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.11.5-CVE-2018-10380-{1,2,3}.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		-DKWALLET4=0
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.13.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.13.5.ebuild
index 8c9a7437fc09..d697dd6f9f45 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.13.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.14.1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.14.1.ebuild
new file mode 100644
index 000000000000..810eaac889ae
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.14.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		-DKWALLET4=0
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index e3cf12b849da..e504aa94b4c8 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.7.tar.xz 18592 BLAKE2B 86c7f323491b8fe7c7c239709ada0a1cc7d9835174f844cd32218216e4c19752db5ee2805f60a9278646d44d116f28431a47d82f9d4b59d5ffea673cbcaba486 SHA512 6537b2aad637d0792a1dc056d78f03a59a642e509ef156c9693b68cffccfbba370eea1faa88c8c5aae533c5fcb69d54b54c79deed9cb6a724c202400a51f4414
 DIST kwayland-integration-5.13.5.tar.xz 18512 BLAKE2B 44be32c2a9b233a7abf646234091656a24a0053112e4750b3317fc59fd7a3c6bfaaf4bc92a8c27d6ec2ef95a3e3b04baa971cfd135c4a36dd1ad8db151a271fd SHA512 1347bdc52e53fcc7f2b9dee859836ea232120736834a31b54efb188a6332cca429164d2a2139ab6e578bc3befd056e75e113ef3e72b2c4d15f2bf7d0ede01f16
-EBUILD kwayland-integration-5.12.5.ebuild 503 BLAKE2B 1b4b9be2a97f6051ab0e45da929edd0c106f056f06f8918e2482eeb22087ba790a0eb4a5b3234481f107adc7315d1dc547439cd04c6e82460a9a59707267fe65 SHA512 c21a517a77603c7560c7833cdb53dde7c4599ba5d777c90987e8d606c22ff8a1e4a43378611bbf820f4e65d1238d7f1a5e98f8786f48c8a28dc73512473bf923
+DIST kwayland-integration-5.14.1.tar.xz 18704 BLAKE2B 0a101267bb7bd727e0c57a988f79cf98f5ab483f09f1ac87148fa2e0df52d629f44991377dc7fb5989ecdb9ece63c49281c793b97e8137839fc2364686d99d44 SHA512 01e4764e36dbad8b6d1277929e367af135c73206755581c8068023d12f12aaf8199c09f3a3786ca19fbd22937e40593b1e32182192069b6f0de8971b354a78a0
 EBUILD kwayland-integration-5.12.7.ebuild 502 BLAKE2B 0aa7aaa96883457cf85826e614383eec400900f7354c92d3bb73e0f6152899a40d82d30c1f3204fff18423c1436d29bf82a19b13ac6edf44b9fff4f4289f290d SHA512 2feb937dfc88a9a70da38af070d20d45712854512341fe475d01a9c0537fc1bfd02933a5e018447700457fa7f2f7fff2bbb178eb8d1d4cafda3b71169ec1ab4b
-EBUILD kwayland-integration-5.13.5.ebuild 505 BLAKE2B cbdc8f11c9246ed71cb0e595c35f58ed4c0adc76e7adb195c5840204e5fe1bd2a6648b065d35a0e100d8902c7a310c47f734fda96cf1121869804a02885d15b0 SHA512 57306cf35020b521fd7fde9cd28324fdc23f170c7b56da613a87fd8005e879b3390beb2b262dadd5e3812c520baf58f88605044f33cac081790500b7171dc30c
+EBUILD kwayland-integration-5.13.5.ebuild 500 BLAKE2B 9ea00ca72a89eb48f217fbb4d40305c937ef2df336a85fcbf4c09bea9839a7ac0a7e5e13677a9a97d4308797363b1ce9caff336922a9d43116eeba9909c16df8 SHA512 0a709aa6e495d51509bdbeb926f22bbed44602b626b5e249ff2206faae2e2f2a7852e29f8b2c0941cb5c7b463050a54c98913e59e7a0f173e5f3759b391d3984
+EBUILD kwayland-integration-5.14.1.ebuild 518 BLAKE2B 3865f43317eabffe73bf74ad62f18773672754dedd739c6c43e354fd8b123bcb83f4c8fa7eac9e9787562ed09c415a9cfd4f2f9c01bbfe5e319637fe5d20fdb2 SHA512 62540fe95e30b757907d4544bb562d3719840f3e3ba6ac05c4168d8ce62bf0a156ca284f5a9927f815ea6d9644923e3502511e416a114b97b1898eb629f20695
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.12.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.12.5.ebuild
deleted file mode 100644
index c6abb17c4d7f..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.12.5.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="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.13.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.13.5.ebuild
index a2771a46748b..fdad38b102ba 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.13.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland
 HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.14.1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.14.1.ebuild
new file mode 100644
index 000000000000..5e73d894a726
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.14.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 5e0bad5e0e5a..47aee3a8a189 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,9 +1,9 @@
 AUX kwin-5.10.95-test-optional.patch 1023 BLAKE2B 9e3f9e831a7164ad4041732785f771c4557c65f68dfe8cd5e6dcb55f6f65d5e1d0b220cde0901f56baeb8ffd194c604115f64c6d6496b19be6e9254cf37f567d SHA512 e564dc6c0e28762917713d37aec099d1ff522f64e26aabc906ffbb7dd4056316bbab43b1b3c71e1f55659471e270f17afe8673a76dcd75efa1a5c8e399bdd7f5
 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.7.tar.xz 6521368 BLAKE2B 5cf898b85ead7c7b88017b86ddee2c4c0444637414094c07b972681be45c2eeac43cb4c3ceb167d22b5e3f685216922c065b76e5db555d22fd378faa2b2e7a94 SHA512 acb58cd5681727aa2ebcfb75d2abc3ea636811b490d8b15a4b89e55cfb81ce8aeed9568a52d4d1c3274852f26823ec5301a6721d9be64ba9a2b65e04f6029760
 DIST kwin-5.13.5.tar.xz 6525660 BLAKE2B b159dd8223f018e7a17d8e17296c8f6bd40d95ed666839198a82b6c65c13965e0ba49af45ac13ac579567a4f2e3f088c571f2f300103a4477284327609076272 SHA512 73f2d16403b7972db8ebe228569504d1e6345a633f8b006b6399575b0ed26dc5a3d047be0f476dedfce16acaaba0e3870e62059d96e4f8471fecafca7eee5a14
-EBUILD kwin-5.12.5.ebuild 2661 BLAKE2B 260007308479977f25dddb9c01d014a63e8067901dbd7a9a126074380a6ac36d6290709533a7e051a57dc39dbaede636060971874cc78f57bfe52c3262dbdb7f SHA512 a4ca33fc2c85625ce1c38aed86f8977983e9f307021ada8cf5ec1c2692542dea34a82ad3c3bacc92faebe0062fa13e5e8f88e1c9c1064435fb944cb86a7144ea
+DIST kwin-5.14.1.tar.xz 6569548 BLAKE2B dc2cd037b5b22e25425f2240a92d2c1a8266cb7a50c85e0f0399638901e5ea3bb624bbb275f894978ffe22c48d8a15171babfee3ae3e04793ec2b9bfc564fb88 SHA512 ffe553458ef684060be298df4e2d20c2349d0987fc42746af67d6b08f8cf6f49539ac285c4cf8f788ce2d2f6f81049aaebc70164f45b77678eac2ae5b4a02ece
 EBUILD kwin-5.12.7.ebuild 2619 BLAKE2B 68d90c5bba00288f04507d62226667e9d53d1f226950b7438e9118cdc921454443a0f6b44443d29d4e7ebe6de34f7e1f77a3aaf2a2f0cac556d9aa249de1b388 SHA512 8e322ba5508901d2436a00e09fac55040b04ddd5aa82ed50fffd7a24037c5ddab243474ea1a02f32fb55d78fbdbdac46db9b3ef672c5d2d3aaa3e53f252a9c6d
-EBUILD kwin-5.13.5.ebuild 2665 BLAKE2B dce20fb008d41dd8ba00e3dd66d0876130fe4c1f17ede1be73324d5d0b5f2fa5ce7788b615ef0db09e2c6b56daa80718aa1bf12ec5095fa6870e4f62d06adbc1 SHA512 e12ce093ac4f57f4bbed727f3f07099d877447dce8aa8c420a618b653e75c78720c7db42ab11bcfaf12c87dec514a7ea0abf4361d4916f5e5fe08fb0ece3b6a8
+EBUILD kwin-5.13.5.ebuild 2660 BLAKE2B 2b4ccd708c175999c1d6699b982705aab487fef681dda1df36c7c80b658cf26c4e28bcd2f4c02aca0938fe8f60e2fab6b064b7f18b4b95705c7639c8a66fd34d SHA512 5eb976f750d8b8d0d30f3d454957512f423a2df194e4d626479dfa8a3b2e8af11726682f2e2a35d40a2e0f772e4f4c727e751eabf5c47814bd1f76c74957f99c
+EBUILD kwin-5.14.1.ebuild 2633 BLAKE2B b250135395b592bf38f073284691a62570952393c8e10f7bbabb513f4a12155a65a2d49c35ce9ea22ef02c3ebac645680001b12541cb79cb7666dc936f2db288 SHA512 e6395ce7a4ff1fb1784b2eb34847b36b1c3e890a743f146174c87dedfd3e7663baee2353eb2d2fcec1f9751de90d6726c158e2b8fef04699f5503d2423925e1f
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.12.5.ebuild b/kde-plasma/kwin/kwin-5.12.5.ebuild
deleted file mode 100644
index 2541c24b2488..000000000000
--- a/kde-plasma/kwin/kwin-5.12.5.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
-
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE window manager"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="caps gles2 multimedia"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(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 kdeclarative)
-	$(add_frameworks_dep kglobalaccel '' '' '5=')
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime '' '' '5=')
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kscreenlocker)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=' '' '5=')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsensors)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=dev-libs/libinput-1.5
-	>=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 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtvirtualkeyboard)
-	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
-	!<kde-apps/kdeartwork-meta-15.08.3-r1:4
-	!kde-plasma/kwin:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep qtconcurrent)
-	x11-base/xorg-proto
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-5.10.95-test-optional.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
-
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.13.5.ebuild b/kde-plasma/kwin/kwin-5.13.5.ebuild
index a692b36f42e2..903f56fb309d 100644
--- a/kde-plasma/kwin/kwin-5.13.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE window manager"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="caps gles2 multimedia"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kwin/kwin-5.14.1.ebuild b/kde-plasma/kwin/kwin-5.14.1.ebuild
new file mode 100644
index 000000000000..d144e2c92230
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.14.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE window manager"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="caps gles2 multimedia"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(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 kdeclarative)
+	$(add_frameworks_dep kglobalaccel '' '' '5=')
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime '' '' '5=')
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kscreenlocker)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=' '' '5=')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsensors)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	>=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 )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qtvirtualkeyboard)
+	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
+	!kde-plasma/kwin:4
+	!kde-plasma/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep designer)
+	$(add_qt_dep qtconcurrent)
+	x11-base/xorg-proto
+"
+PDEPEND="
+	$(add_plasma_dep kde-cli-tools)
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
+
+	# Access violations, bug #640432
+	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 06a251ad634f..4826c452f3ae 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.7.tar.xz 20392 BLAKE2B 15925bc4650b6b89fefd57d5b6164f1ebeb881845f164743eaba13069e2e0797cc35a6cfeea48e5a8b12249231ba8d3f6eead7cdb0990a95262329125ecf6070 SHA512 f77d2c068a0b6fb8cf86f6e1444e66b8fcddda386ee319dd138b3c861382a9f9e28cd24003386910cb91390e65691168359062be4ec3c800ec4742232e9dca9a
 DIST kwrited-5.13.5.tar.xz 19796 BLAKE2B 0e0487bd18b6cdccaacc598f544af7f3af8591e59fb753f7351542f453601e8ce7b1544511921ff4e6c2361b38902ddb7e004c35ea8bd5f74e0339f5ff84b985 SHA512 d4d006de0d029ff8103e6b9d7d8771bd5703f6a1b190bafad7b5358e7ad12ecc52fb883947b93a7f3391d28bf063f797d5eca9422c4fb9bd1549ca2c57060388
-EBUILD kwrited-5.12.5.ebuild 501 BLAKE2B 10c4a3455ad22aa30db3d80773b354a1d5db3860625103e325099b06de6f3b45093f74d538f1fbca081f3ea926a4c4b91e738380a9a5abd2b624255ffc9a7c80 SHA512 aa11e4f344edb76da01f6e8ccedb8be4ef3e58eccb1de6de2b39550c8faba29308c8759671ed03d1d720e8dd0fc1787db343349a2885c48bd911600611586e3f
+DIST kwrited-5.14.1.tar.xz 20000 BLAKE2B 3c67e69627cef54375be9837c0a8b43ce08385e696069ed46f1ec2ad145403bad8fe08d6f7e9f70a3d109e9ffa4a18624c185efe3df8db09e3bdf1d6b37bc5b7 SHA512 151d9194b8918e4644390c97601d1b2fc133568678ddbb8bba18aafa265ecde65347ff447b0c6adc1971ffd15dc0ddc36ff06ba474cacda77fe4ecce41e1fc7f
 EBUILD kwrited-5.12.7.ebuild 500 BLAKE2B 5d82763b4852630218501c6b0062cbcf3e5e6bdcc33fb877ea36a21d5c998aa4fe215645b2a1c99e4f6c8f148585f506692730c35c0e50db005e56b1f87952ea SHA512 4c61a3a7bece70118f83fef0e810952e2c2c0f51a18ac9bd3c9ee72e3612bcd2c8cb0c6b7d26e4dff6215cc32bbdcec85d6c3eec547216ffa676293e38b229fd
-EBUILD kwrited-5.13.5.ebuild 503 BLAKE2B 75f08b16b27beeeb0a8997247a7ee1182279a152b3d96ea6ada42cb856ac23e9df8d77f02a4a18595410409070523e6664bd99f1e83c447188c12d154f3d1167 SHA512 2b975e63c0972504c5a1cbcd365ec8acf9bbb2f0ad4c324b53742f70366a4b561659e23964e9389a68704067de7dba5e537ad4368e9e66d6ccdb3f7f7971f736
+EBUILD kwrited-5.13.5.ebuild 498 BLAKE2B 0db3fd21597e047f00139c47ed86fe95edd619297a8978fad6d8fddda42b77ef8fa789703b01a068095e732701ac898a9ba67652335be701bb733901ef23775f SHA512 948320270ed0b36200342fd010548a9d15e6ee9ae36c352f708f2d1c3ed0bcbdc1ce33568d2497e00aec97302ef166b29ca9ce95dabc8cebf644326905ba00e3
+EBUILD kwrited-5.14.1.ebuild 500 BLAKE2B 5d82763b4852630218501c6b0062cbcf3e5e6bdcc33fb877ea36a21d5c998aa4fe215645b2a1c99e4f6c8f148585f506692730c35c0e50db005e56b1f87952ea SHA512 4c61a3a7bece70118f83fef0e810952e2c2c0f51a18ac9bd3c9ee72e3612bcd2c8cb0c6b7d26e4dff6215cc32bbdcec85d6c3eec547216ffa676293e38b229fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.12.5.ebuild b/kde-plasma/kwrited/kwrited-5.12.5.ebuild
deleted file mode 100644
index 562a88d1fb6f..000000000000
--- a/kde-plasma/kwrited/kwrited-5.12.5.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
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpty)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/kwrited:4
-"
diff --git a/kde-plasma/kwrited/kwrited-5.13.5.ebuild b/kde-plasma/kwrited/kwrited-5.13.5.ebuild
index 9e8c97481c25..baaf5642cc7f 100644
--- a/kde-plasma/kwrited/kwrited-5.13.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwrited/kwrited-5.14.1.ebuild b/kde-plasma/kwrited/kwrited-5.14.1.ebuild
new file mode 100644
index 000000000000..96a55b0edb5e
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.14.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpty)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/kwrited:4
+"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 346f6bd87374..2dab83eb96bc 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.7.tar.xz 94840 BLAKE2B 3cefc37380dabda2951962eb7c63961eff0b6da2a0dce49e02f8ad8027f114f41f162728173f46bf436e4dbccccb443325ca6938ff1ed4b48b99fa87a56dae9f SHA512 fb24d0f4f79468d4246e912f4b7e814df398911cdbd475e18263e89502ecca35c9e4974b7f0af92afa8cba3081056f8f27b0f051eb287c682dd37b35568b3c5c
 DIST libkscreen-5.13.5.tar.xz 78380 BLAKE2B 701fd156edacab9941b102a7ce4e36c1038ac6efa1410be5a3317b03771a61bce1c3dede247021b034ffe9a1ab2b9490ccf24bbd0c6e1e21decdfd9a9a2fe97f SHA512 1089eba583490807e87ea02e33e63c89b750585f0c612bc70517b36e88779dc4a3a8d300d4295735967ee04689a7a9361910c67f3f3d5cb2511304e9e05657d2
-EBUILD libkscreen-5.12.5.ebuild 501 BLAKE2B 315265c1c6421fce51b41f6a6d108b5ecac4ff1d43bd8a19a3f87e246b6834b8a54ff4810a0d789424037ea43d67781229daaea1947927b13edeb48a67069448 SHA512 bfd421bd2e8a96688fa0ae0673954f7a115d2443e2aff066ed3d4a4f9cc5b4d5537f80d1fe7f323dfe847303bc65196bd45130d59e25efc9769d35474c06aba5
+DIST libkscreen-5.14.1.tar.xz 80128 BLAKE2B bb9a6a1fae8370a634d9ff56b68eb89c918ea6d0ec1e0c85c41ede96d6e8a5c8f75d8bd7edb2857651147a89387ba32a41e8dfec797212414064753e2409ff5b SHA512 4499d0d51cf17cbd3c5954888e0ecc668dd0baa7d0988faa7873efc7b69a0176e92a998d6ce38f92aba52c4ad0ff605e50255b81b941c43a7ea89e80139965f8
 EBUILD libkscreen-5.12.7.ebuild 500 BLAKE2B 8a567e762d462858fc70693de5d3d8dca4bddb2e7226d891ed01d39934f43d87ffb4686033b99cca771ec2024d2878bb747dbb46fad97942b1d41d212427b352 SHA512 e949b034f05b32438125ffb347a1a101b088f9e03115119a3b1bfa98807d15d8265a20045ee44315edd83f4cf074916cab42dc3aa39d2b389eda4423a4f23f20
-EBUILD libkscreen-5.13.5.ebuild 503 BLAKE2B 9b2e2e3a9ebc3053d147e95be68294c96d76e2d9ae39d25a1b9918f32f3f069b6e520fe97ddeaeba5c2b06c630d286c1051f4099411747be8053784b23e35959 SHA512 fc1115a2e8f49a183e694ba8b468fd4c4f0c327c777e2e0d88bc68405963551c03cfb3838c8a1310e8b7bbf6838b02582a897e098511a3360c572d59da348eeb
+EBUILD libkscreen-5.13.5.ebuild 498 BLAKE2B 2d79952c492d36d7e9167730b59b6778ea3493ebc5a0948700ede3ef74c88bee7fcf6262f0259d74c51a13cac5538d463a9a1a9eff668c56c1f12faeef399cec SHA512 e0aaf973f91b254ff8534b0e7ce323528f364ee8a4f2b45681d9130bc4c6319274cad07672ae82fe925aaaaf0f7ddf27e5ed3338b7ba5fa3beaafb12b2182949
+EBUILD libkscreen-5.14.1.ebuild 518 BLAKE2B 8d12851d9145ffc8cb894e2559fe7f986949a61380086717e2dd578e5b5df96ed1cdd121beb077f1472bb82731d15ca4677a55211d2a1ec80200ad8e2f9d70ca SHA512 418b4cb5a5a7964d4adf6f2907243b234b2c4c540895447461090032a88e13c97e0d5f64482549237cbd01ac9e5bcc1229f80cab02ebec15af299c2ede2e1e68
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.12.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.12.5.ebuild
deleted file mode 100644
index 2b448835024d..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.12.5.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="Plasma screen management library"
-SLOT="5/7"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libkscreen/libkscreen-5.13.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.13.5.ebuild
index 56ac7823247e..1d14737be625 100644
--- a/kde-plasma/libkscreen/libkscreen-5.13.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Plasma screen management library"
 SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libkscreen/libkscreen-5.14.1.ebuild b/kde-plasma/libkscreen/libkscreen-5.14.1.ebuild
new file mode 100644
index 000000000000..f695808b3a3a
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.14.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma screen management library"
+SLOT="5/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kwayland)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"
+
+# requires running session
+RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index d24f00b86ff1..e1d773252712 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.7.tar.xz 572060 BLAKE2B 9eec376f5af64a90554513bd9f714b170987c0f18313b6fe21fbf4647f79b11cc8077d4945095210a234b5c8d31de70c9bc27784304415dc689d56b1bcafffba SHA512 78a063606567632c19a7f1c9d2e7d69634432f3e49bb08a3162805aeb94e0930f2d43e9372207512558b785b8c7e20fdca801de35c055e456ac3cb812bd96efa
 DIST libksysguard-5.13.5.tar.xz 568200 BLAKE2B aafe167cca39ce33eaa56579a228c3d4b9a1a25c55ee268f9e54bfa33162233a242bec0ba9c2adafe238bdaa0b37573d8846c50338e91ec9a1cea797c308a0d9 SHA512 4be616ee2c6e3293f95c3f63ed2722395a6a78510765bcdb3112f37402507a2b7aa9e7bc58fb84bc6d294863e033c1843b228801a3bb534763ca96c1ec729978
-EBUILD libksysguard-5.12.5.ebuild 1244 BLAKE2B c7c06328f314b42982a0ed518fc9283b80dc03db0c4d0eb9744ef6ec47de6c11b3ff71b535f1d8d6c8e208b58ebef3c503023f4e51aa2499f10ed2463c32e797 SHA512 31f4c77e2c5b21ca4f4442f28595faeb50a177c6ef8f67ce48fb7350edfe5bc568099aa97c1e39fe8a0966893db7419637d140c81b879ab90e57418121b61e8f
+DIST libksysguard-5.14.1.tar.xz 575576 BLAKE2B d8e556fd35e224d98fdc6a966131d19254e4fab0667a5c650ea3941eeb5554a2f70637f2ceed8d74d27696df259e2375a76c02d310bfee61a636b8f6ef5482c4 SHA512 c2355e193aab2d3f6db74b28ccf8d6c0c33c7a3d2ba273d9af9b1261cd72081011a9baabbcb25d22eb944c0912528f249bf126a3b554d1b520568dc064311b7c
 EBUILD libksysguard-5.12.7.ebuild 1243 BLAKE2B f4c516f4977e375aef77bd0b91cda8841ab7d4cb2dcba77adea9756c6fe72556ddc092619f2dbce1d13f93c0857caf10570ae2f8a7a9ad446dffc0d5b9103a4c SHA512 ca913804ca6375a85f84ed90e67587a05a1f44c75eb4c073d807e2ce081ac23ba82f6af98acba01d2888192c38af6650010c5c899573ab1f9d089304abf0bea4
-EBUILD libksysguard-5.13.5.ebuild 1246 BLAKE2B 3a0bb57b58da15ca581da93600a1bbd9a3ca33184859c751c620829a36731cb500e91fdabeb3690e110731e4247a1caaa8920589e219df2dffdbb6ad2b2a7e53 SHA512 d2adf30172eea8e7c4ad4d0a4dace307b79459b47b7d5f3e8def80f317a7c47572b22cde2ebcb0f317b59c70ba8a93e259c67ac47dc8abb7291811faa787fd72
+EBUILD libksysguard-5.13.5.ebuild 1241 BLAKE2B 3cfb0a9e47e5f3e51e52f235e6a0acda52486b66e906325d5cb6761727177c75c2335b2a1c4a514a220004d48f31b3cd8a5b90893103537f8d437b5069b5db48 SHA512 96a4f8d8354a239adf1997ec1ba0787fe266f73149f0a7c13423390373dea1093c3b13685a46583043294f03c252f42fabadff3ec58a3e45ecea3b6f92cfc61f
+EBUILD libksysguard-5.14.1.ebuild 1243 BLAKE2B f4c516f4977e375aef77bd0b91cda8841ab7d4cb2dcba77adea9756c6fe72556ddc092619f2dbce1d13f93c0857caf10570ae2f8a7a9ad446dffc0d5b9103a4c SHA512 ca913804ca6375a85f84ed90e67587a05a1f44c75eb4c073d807e2ce081ac23ba82f6af98acba01d2888192c38af6650010c5c899573ab1f9d089304abf0bea4
 MISC metadata.xml 381 BLAKE2B 50486844ab6d038f69a97e298953a1eaef11d9ee011c4b10fd3210deaeaf4298f0d93c514a2227a2ede9227aeeeed3a68b37ae1badd3783a23cf35ab208f8fe6 SHA512 a504dc62874b82d6df35261af6e3875b0af5879be5c90f9e1c2754d6980bb26aa3c75632d825b8347687a9cf48908a671c807afc574f177a12ab7881c7ef8d43
diff --git a/kde-plasma/libksysguard/libksysguard-5.12.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.12.5.ebuild
deleted file mode 100644
index af43768d3159..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.12.5.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="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+detailedmemory minimal X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(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_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	detailedmemory? ( $(add_qt_dep qtwebkit) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/ksysguard:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	!minimal? ( $(add_frameworks_dep plasma) )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package !minimal KF5Plasma)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.13.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.13.5.ebuild
index b85ee65b5d1a..19a09b813056 100644
--- a/kde-plasma/libksysguard/libksysguard-5.13.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+detailedmemory minimal X"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/libksysguard/libksysguard-5.14.1.ebuild b/kde-plasma/libksysguard/libksysguard-5.14.1.ebuild
new file mode 100644
index 000000000000..0baa04a013a4
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.14.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+detailedmemory minimal X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(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_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	sys-libs/zlib
+	detailedmemory? ( $(add_qt_dep qtwebkit) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/ksysguard:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kiconthemes)
+	!minimal? ( $(add_frameworks_dep plasma) )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package !minimal KF5Plasma)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 97b990644d4f..a6c52f270893 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.7.tar.xz 57944 BLAKE2B e813bada0a318243d7f0995eac09b113db562d60424594bfdfe766c127154669a5e77d1854a81f9165e3c5177981d1bcc3625029d7a827de2d60f2a3c54fd6a5 SHA512 e46395992fd53ec9f230790d4e0eccfb91f925729088f0c8d602524828ce4ff2a55bbcab843daa66c57eff20393c291f9e0f860a4b4b11fc834374b386fcfdbd
 DIST milou-5.13.5.tar.xz 57880 BLAKE2B 30501efa72fbe339865b4a2eb82ad8cc5031ec6f698403c5f1930fc45e7c4f4b24c49ad30374a81a4e9b0ab29b86c1dd5272c002a0749811c9629b2be9d42fca SHA512 b03e6568698e510c5069fa5c9e99d2de38abd725c2a78d183957f32a2cd59ae0620d99258736c9c8e46bd005e084fb0f19051a112f6133ef35803ea06867113f
-EBUILD milou-5.12.5.ebuild 692 BLAKE2B 6cf9633673d92a1fe2654f5f0cd4ea60e5db47bf4120ed090ce9cbb691255b5a854ca55d2aa608f4a0751766e0ff0c05018cfbe35bab4782c68fc7d221efe05b SHA512 78fb4c265c8b09fbca47b998191c7fbcaeabf7224d0a43caeebadf942071dd92e3ca088e4de5a5678c85ffd50a140c66914a23654c9e3541e1f67617a81efc73
+DIST milou-5.14.1.tar.xz 57672 BLAKE2B 4c63c870100bc8e9a27a3cda4580c394ac45c5b4e7a0cfd620042176d636b9b122dfde2b99c0cd8ca8de54ccad5790055e073bab43a4242feca5c2b8308cc6ad SHA512 92a411eb2714e07902ae9dd3df482d8cc0a65f11c669feff07d44a9643604db7421eebc1fd060d7302693fd0a8fdfc48c1f8c8c40225f76014cdb543bcbd9a60
 EBUILD milou-5.12.7.ebuild 691 BLAKE2B 4a05bc5bbfbbb85f6efa0dfe88252e94cfb472fa4f40b3833a1f897effbad9bbe15fe2cb6621650d44fda8bed6acee17e5f5dd646257161c940c570220c23ce2 SHA512 b313762669ff6b53c59624010976b3e57208dc2147438defe5b40d6e0de583ef85257b1c93ede443eba1ea053a533c0738b36f5efd05123562c7f25a1470c87e
-EBUILD milou-5.13.5.ebuild 694 BLAKE2B 3e957664f5e86b816f680c716d1b2248cb9126b58f5311c162d916837a29521261f33d1569daf80a2aa60c96b37bd6d4395f014af07017fb8be1278a43d4a13a SHA512 05034f125f1bb8399609d2a50c21408a3d4e1393935ca64819f3dc77ab52b247c1c737d48c689431bdec84509e03ab64ae0580d0570e4a6b4b9bbefffe454b40
+EBUILD milou-5.13.5.ebuild 689 BLAKE2B 9faf782e98a3274aa1fd218ceacaf0e989a8cf664a9ea829d4bbd30f0f9fef519ff8903b3c392f438549e738b4b9f9f8c96a61cb53607c72d2d5a62738814167 SHA512 fe2cbab7a6140410fe09753562da399ee96a8bbbecb45df55d4f5d2a2492246a63696b310247e223ed493846745da5cfc1667289b3c53da7273efca74f397855
+EBUILD milou-5.14.1.ebuild 691 BLAKE2B 4a05bc5bbfbbb85f6efa0dfe88252e94cfb472fa4f40b3833a1f897effbad9bbe15fe2cb6621650d44fda8bed6acee17e5f5dd646257161c940c570220c23ce2 SHA512 b313762669ff6b53c59624010976b3e57208dc2147438defe5b40d6e0de583ef85257b1c93ede443eba1ea053a533c0738b36f5efd05123562c7f25a1470c87e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.12.5.ebuild b/kde-plasma/milou/milou-5.12.5.ebuild
deleted file mode 100644
index 33ffa1f7b990..000000000000
--- a/kde-plasma/milou/milou-5.12.5.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="forceoptional-recursive"
-inherit kde5
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://cgit.kde.org/milou.git"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/milou:4
-"
diff --git a/kde-plasma/milou/milou-5.13.5.ebuild b/kde-plasma/milou/milou-5.13.5.ebuild
index 05a6dae87be6..f4c684bc08f6 100644
--- a/kde-plasma/milou/milou-5.13.5.ebuild
+++ b/kde-plasma/milou/milou-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Dedicated search application built on top of Baloo"
 HOMEPAGE="https://cgit.kde.org/milou.git"
 
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/milou/milou-5.14.1.ebuild b/kde-plasma/milou/milou-5.14.1.ebuild
new file mode 100644
index 000000000000..81a234b2a3d2
--- /dev/null
+++ b/kde-plasma/milou/milou-5.14.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+inherit kde5
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://cgit.kde.org/milou.git"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/milou:4
+"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 6f99a0d870f2..86e5a0f16dea 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,8 +1,8 @@
 AUX oxygen-5.13.5-symlinks.patch 5407 BLAKE2B 9ba3d1b84f3dae54bbf52e6cfddf6bc414d5508ae1a3168e599caafcc1b23ab182007a1bc78f2ff582407f39cc383802d8cea2d3e4d61f79fbefdf9c22142ed5 SHA512 4b67595f546bed1c98b19a9592e9cfebe6cbebd1ab6d5aa3fad17578e099e7b410f2e5849513128019a7026fbb43d302c278db04a9932ec95b239e0c529410cb
-DIST oxygen-5.12.5.tar.xz 4467896 BLAKE2B f9477184cc13553086f6b828ab953dc91e42aa9bd50a85d553ed7347e2e588dfc8b5aaab9eec12481e20121044ebd4412fc728e22d437ede54451c0a2245c6be SHA512 92acb2cc2033a8b07a0ac75772f696f5c1196e0c5a424ba6146d576bc956fcfc172b4a65a79551b2d43be4b56d5289bee091ebb837fe40dc60f076ca7d5898b4
 DIST oxygen-5.12.7.tar.xz 4469308 BLAKE2B 423dee51d6a7ba4c7c33f4aa4641a9ca264ad0a81db5dc7c6e8912967f54f353029d936bca8850057e9a3c5d052476b0d8d82f8e8dc1be4146944d92b1c37006 SHA512 20e448f223c13f60b929d3fe0be4070868ddf9189a1108b2a798ce08ca654db082798c6389e6dbd06dcc72fff061e3178c805c9f1fb595b1649235e0ec5231ff
 DIST oxygen-5.13.5.tar.xz 4468116 BLAKE2B 9e71ca71cfe5acef6b5344e0ab89a63b0ef68119251515534a7841d67ad0d7e5141ed48cfaef828870d9cb0ad9bcfb1188214fae3eaec13f84379ba710a09a5a SHA512 322188223d03b48f09123ef8b8e13dff3b256f190a42d81655707b9fd4707d8ca147a2f859346ba691a54a76b8b3cc5504485aca8f0bd7bd7bf0f13cfba1692e
-EBUILD oxygen-5.12.5.ebuild 1129 BLAKE2B 51f53fbab179d76e4eef5adeca269e10e956954e61a32e2315ed6a62f27b20e7fc81dd1f6b1137a53389aef2b82c9a2b3d7457e27e13baf2300a5447a28804cb SHA512 f5cbb0a73bb9a87f2e64015ad39157191fecf10cfd1598cf4674441123032477b51646f9760fa90d24b8561b63f702b00d8e65f253ed8eef7bc1bb845643c01f
+DIST oxygen-5.14.1.tar.xz 4467600 BLAKE2B fe4b53261b1cb417c2178368b039745573e133484c083d60fa72c3486a927946e9a839fa1a151acdb5a831dfdcbc7ca30b56a4b31837236ca3a5f4042c3d05e8 SHA512 e14d372d2f782b584803e87a6dbea99446e234bf418e2cc5853eeb7ec1a08a2b4d44cc1d4eee7c00670ca9a2d53a57ca40159ca87d17480b45f26b3d1a0c59b3
 EBUILD oxygen-5.12.7.ebuild 1128 BLAKE2B 585a30ac1f1a228eff53a5874984b7bb05cf260120fdfc8ab3e09c8444f9fcb548b88798dc30730dcfb7094e486a2ce9e60dba884ff60a747a84704b5843addc SHA512 a0e4bb462a0541c0ae6f7572a5374f5a28531e0a70e07d5f7b85e15ba09973e8633f538c71014ec9e2db9a2199c248b819ec71e547bf899b4b31423e73431240
-EBUILD oxygen-5.13.5-r1.ebuild 1178 BLAKE2B 66ea157510513a09f926b39e9921689786d293f26560a1e1f4d8cf05b881a480afe7d853c230ab5de5ffcfcb324388df22839adafd84d1ec359f67081e2e74a6 SHA512 4511d39d0254c995e55419f251ae963ce60a0e3b9c22a6832549312743ffd0d7cccb296a2115440c62a45f78e8de40095633da71b3648f7803551d39e6eafb8d
+EBUILD oxygen-5.13.5-r1.ebuild 1173 BLAKE2B 4f445105d66015bf1600ebddb332dc6d5572388531b837a01499face23aa37c7cb3df750e77d4e148e2a349fd53786cf790eb64dfe534a0b718efc5c354d3a0c SHA512 b5746e12ce37a9bc4379a5f88a6ab99dcbdb3a18b9687e75724c05eeb22795f5da57938b1373c690c202cbc6aa59b921e325b561790bc2216fd46bb50ca5245a
+EBUILD oxygen-5.14.1.ebuild 1128 BLAKE2B 585a30ac1f1a228eff53a5874984b7bb05cf260120fdfc8ab3e09c8444f9fcb548b88798dc30730dcfb7094e486a2ce9e60dba884ff60a747a84704b5843addc SHA512 a0e4bb462a0541c0ae6f7572a5374f5a28531e0a70e07d5f7b85e15ba09973e8633f538c71014ec9e2db9a2199c248b819ec71e547bf899b4b31423e73431240
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.12.5.ebuild b/kde-plasma/oxygen/oxygen-5.12.5.ebuild
deleted file mode 100644
index 54ccae1d8d49..000000000000
--- a/kde-plasma/oxygen/oxygen-5.12.5.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
-
-inherit kde5
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="amd64 ~arm x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(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 kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kservice)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kdebase-cursors:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-	kde5_src_configure
-}
diff --git a/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild b/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild
index 607c3ab579a3..008de4748b79 100644
--- a/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Oxygen visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/oxygen/oxygen-5.14.1.ebuild b/kde-plasma/oxygen/oxygen-5.14.1.ebuild
new file mode 100644
index 000000000000..d45e10e9fae1
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.14.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/oxygen.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="wayland"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(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 kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kservice)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/kdebase-cursors:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 852b33106751..9143024d2ef3 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-browser-integration-5.13.5.tar.xz 102032 BLAKE2B c6ad31b940fd2981a5d88c4d9f6d9c1cbdc6fd6753bc92c2a741f81fb8297af81a44c5c534ae1a08541ac8eead544a9be97d5704ada9e4621a586a5dae4f1253 SHA512 ab679c3cd899cec72cc02e878d9a2d1fe1c7c8ab866a140da66049857a7482ffd395da8269106c4d0e699bfe8b7c74a111084f91e70ae3af5279294b23a8001c
-EBUILD plasma-browser-integration-5.13.5.ebuild 788 BLAKE2B b1b40d51830e07e5e60d2ef76edd922401238c3830d5e5365f43c49487b08d53c0aa96d529b53899c01d7d22b1061d7bafa38336885b55cb7869ba86d05ea47f SHA512 d686ddecd04bf6f7dfbc56f34234d74cc00ddeaa796913908b2a8f9484901178d7c993fbbe4f826067021ee74c780617ea46713615f45461d9fcb530e416e3bc
+DIST plasma-browser-integration-5.14.1.tar.xz 108552 BLAKE2B 9bdbf3c38af75f5b6383b907e98f5fc18336ad8626ea58a23f6d1cedd864844b45ccf0cad65e9155fcff3780623f281f231243d132f37e978145811e62323d3f SHA512 9c51f58051d8864ec72a082ebe7f281c6e7dda5ea17e9ad0fe76c6047a81b61a8fcc0f372cba6a55dac8648696d1fe1fd6f06fb266e0b63fd20af3374acdca27
+EBUILD plasma-browser-integration-5.13.5.ebuild 783 BLAKE2B 11695a608f0454350bff1806c6752e4534c512e4cbf180120723ece5ed4e0ea7f069ce03aac284d56459f590561030f9c21b95670e1f554eeaf9e60cfdcf5898 SHA512 d81d285e60124d22f2737e398cb864a8c19a13ce33ccceeca580bb2520c631bf59594123838e3b40087bb049a6be72dd87ba8fab248345c3e0f4cb2631d21e41
+EBUILD plasma-browser-integration-5.14.1.ebuild 785 BLAKE2B 7d0dac4a36f7ce66600d24f8d28a2017332e5ba3972ddd45ef715eeea686c74622de968976a8e02ca220cec17d916be36fa383c497a5e0db364eaa0cf03e60b4 SHA512 519611bbbfa79fd4d7e6c3d61a32455e7f14704b80246976786ff9ac1b6739f2e1892dc9784fef5a8cf643420c3c3cb1a952a23d8c3b68b3b9e68b4668c4079f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.5.ebuild
index 605c95adbc76..35b5bd254775 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.1.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.1.ebuild
new file mode 100644
index 000000000000..997ee820c5c4
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index b942e547de7e..d67d633a9936 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,11 +1,10 @@
-AUX plasma-desktop-5.12.5-submodules-update.patch 1016 BLAKE2B 7ff9a57181b1438027cdf2aaf0e5d6dad25125c79c9cdb349b1d4b271638f1fb77f0742b3d67060ad74f26a820765260796eacd8cd994263fc00fcb13b82ace0 SHA512 c283923a0f5473e6017b1160f3a15f7ec277196cc55b14c03bc77a56188b44c9d58010abfe85d1e6c2c25fdda1f3b35ea3bbe9525bbbd80c8ab82d6e28960a9a
 AUX plasma-desktop-5.13.5-activityswitcher.patch 2194 BLAKE2B 992d63a598b804f380a2d0f893f6d1295bc8e96f4afaff8472566f6c915e388542ed46cf183803687de04889e4d66cf63dc47c45d5ffabfa4b8e57cc7322587e SHA512 4431a3766e9faa6c2026ea73753691bf7f8d8d29c3e8dff67060772a9a2caaafa3bd760b19817874d411f6f4d275ea46abcb437460753b50edaf52dc4718a4a6
 AUX plasma-desktop-5.13.5-kickersearch-nav.patch 3897 BLAKE2B ca412633e3d09f924a03f26b0019e5967fea7a54e03f921c6ba23178cbb91f314094bffae28f97a96800379d723ad3db1e783a557d106a6a0a6e2cd4905e458d SHA512 c5e43ca565aeaa19bb8b5cf7307c60a1fdc2b1600552e4860a79fe261bf681a2954b44a3b34462e2b5164f7848b0f827ba21494022360eaa565a6675c2e6bd45
 AUX plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch 5132 BLAKE2B 5653c5d6e0403fedb314d2cef4c5de20adc9d142cd197fd41b2bbe471e2e3b28cca2a6ca052d1e88c3c07e511b2345ed68ec72108519945da34094ef6f700ae8 SHA512 33d8436643418e8e9806f23862c9c0cbea65dd1360face47f4f21a61b79ecadcbfc3dde93865a76ac76f7591198a7935496260a1c257e0291367c3455a025dc4
-DIST plasma-desktop-5.12.5.tar.xz 8558436 BLAKE2B ecd8a0ce7532dadde5f435e4c620333572b30e50a5003493495784bb31f7e9a4c1b0b1a023290b0443fa90ee7e663fefb9854016bb8eb5a03f82f879d6522fc6 SHA512 d19f8d640304bc1ffa0839e8ba453ddea76710f26fe580789c64e1b97d2a67c151ec62b2d0503fc35ad31cb8da4ef1125f3154e366b7f2bb4b8fb9bb2e0a6abb
 DIST plasma-desktop-5.12.7.tar.xz 9204292 BLAKE2B 90d7e659b2ba25975ae5883f783671cbd661388429bdac4afb9459f4d56771bf535166be75fcdc055a94a3072edc938155502bf1e9c9950c4e18f6ef0858d26d SHA512 671108c3c1c46bc0dfdbc2eb1438654c84ee3bc098c137466ab28d230651f20251894b3008a030a0c3bf2aa4904cca61418c458f41a023042630c6f80d4bf41d
 DIST plasma-desktop-5.13.5.tar.xz 9141164 BLAKE2B f48ab6648cb1c7c289b5a2cce670db774aa53cbd81095cd4aa60414d05a0fac1e460fde115d5d38dd639a7746b1ad83971e38b28841aa430cec3f318e3509930 SHA512 3dd8f27e0127f7568aeee3871ce2f0732267ef50f9659a4a2715eca65bdf8cc5cbd2ca5e39a261cbbf0d1127c9c153f1c2d279729b636184353c6fbb699c4383
-EBUILD plasma-desktop-5.12.5-r1.ebuild 4495 BLAKE2B 51f2671d3e48f65707b28cf6eb29f6ff26e5e444e06e16ec918d40b803d4c247168f226000ad167530852ff27d721331c0a3d4cd6c3c1aee72e7fcb6fe953f41 SHA512 a2d9148faf259057b3e6b7746b804fd1ae6384714adb57b53f306246992541968faaf9d44acc22e4f4ae34c46068310d37ea3fb66457fe0e52a424c32c96f592
-EBUILD plasma-desktop-5.12.7.ebuild 4418 BLAKE2B fe4d17ca74217a6a55aa18b73a4f7d4c4fbc1136c0c25197e6bf84d98dc46ca4025e75241cd4367e332752d1d3480574115186eea8fb03457f5683dfdd2ea87c SHA512 04019f52fe92716dbc401803519e2554c60f14a0097f0bb87ca022938d3fa4b02f89517460f486fd9a1481b11880ff8eaa0c41f67604b3163b2f3f2e7fe1a6ee
-EBUILD plasma-desktop-5.13.5-r2.ebuild 4617 BLAKE2B e7f678cbb95c53d4eb4e3bf14f344bbc1ef362b426fdccde47b73181093ff10a14afa8e508c0fee94fce332c41e86eacf970d154f06bc4b83cd0f82f75a27873 SHA512 f8c4d788f9cf10460a5398ce38264daa2ec8a76cda106847560f0f57e55913fda8100a1281f093418d7043f22d68055a906cd7e48ace07b2a85cef5130b5f6e3
+DIST plasma-desktop-5.14.1.tar.xz 9146976 BLAKE2B 125b3c83efe9496aeabb55530eca1ddb5ee9cd0fd58cd3ab0c2334add1244448284d0c2db7c6239b742c1a33dc11d5e6b101056cedfd8fe375d637cf21c592b9 SHA512 d54f731bb67545cad448ac8b3b94f93aa638bd4051b5f43eeaa0627e54fd2eca072efc8c659191c49be86f44b36762944ee89a17c7146d559d37aff51e9ca1b7
+EBUILD plasma-desktop-5.12.7-r1.ebuild 4421 BLAKE2B 76b1032520762f1c434eae31ef51bad32f045e5a0873beff0cc7a749b8bbcfb87c9117b2705f2bf21f1d74da39a555a9f04174aecb5c52e6c327affcb9f0b81d SHA512 1089db9d0c8a9c40532cea8fe7145680ea45201938492b1b6adab5a165732b50c8811a2964e8f95e4e7d1b8cfddbaa8e7bd27ebb108e281c746120b975a17173
+EBUILD plasma-desktop-5.13.5-r3.ebuild 4618 BLAKE2B 06c0eafa797deaf2e4d7b83d0b538dd9cc4b54b2090abe77f197dbced60bbb0718a70156468e9cf5150650a5ebb03b974e322749ccbcfa73320389cf63a24a26 SHA512 4aefbf759f4026e14ea16cc300df89f64f5ad47f26895c5708e8f558b66e5a67097cd5a8885167f29583c2c18666c2f1b4ee75b960ce0dd23575bff35db85470
+EBUILD plasma-desktop-5.14.1.ebuild 4275 BLAKE2B 3b46e7c89c9d56e9d934339106e009a4c06195764bd55cbd56115d675bb81a249fd43cb41917832cb57d7fb6396ce94fba110be814afde27c95d48a34a3b3207 SHA512 7e2fec62316db2df0ae89d51908bf231c040f16f92a8b0b48b872efa80681d17941648c2c87b5924dc345df792fa09629ff22003d756fdd78621ef5ea4d1dc49
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.12.5-submodules-update.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.12.5-submodules-update.patch
deleted file mode 100644
index ce6c7a8a2791..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.12.5-submodules-update.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c0cd1f8d49e6d63f1988d4749c366a0bef177790 Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein@kde.org>
-Date: Wed, 9 May 2018 16:24:15 +0900
-Subject: Fix submenus not updating when switching between categories of the
- same size
-
-Summary:
-This fixes a regression introduced in 38403268aad3, which forgot to
-handle the branch where the counts are the same.
-
-BUG:394013
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D12774
----
- applets/kicker/plugin/funnelmodel.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/applets/kicker/plugin/funnelmodel.cpp b/applets/kicker/plugin/funnelmodel.cpp
-index 26cad55..165e43d 100644
---- a/applets/kicker/plugin/funnelmodel.cpp
-+++ b/applets/kicker/plugin/funnelmodel.cpp
-@@ -81,6 +81,8 @@ void FunnelModel::setSourceModel(QAbstractItemModel *model)
-             setNewModel();
-             endRemoveRows();
-         }
-+    } else {
-+        setNewModel();
-     }
- 
-     if (newCount > 0) {
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.5-r1.ebuild
deleted file mode 100644
index 604a174344f4..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.5-r1.ebuild
+++ /dev/null
@@ -1,164 +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="KDE Plasma desktop"
-KEYWORDS="amd64 ~arm x86"
-IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(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 kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(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 qtx11extras)
-	$(add_qt_dep qtxml)
-	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? (
-		$(add_qt_dep qtx11extras)
-		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? ( $(add_frameworks_dep baloo) )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-	mouse? (
-		x11-drivers/xf86-input-evdev
-		x11-drivers/xf86-input-libinput
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep qqc2-desktop-style)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	!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
-"
-
-PATCHES=( "${FILESDIR}/${P}-submodules-update.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# needs D-Bus, bug #634166
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts)"
-	)
-
-	kde5_src_test
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if has_version "x11-libs/gtk+:2" && ! has_version "dev-libs/libappindicator:2"; then
-		elog "For GTK+2 applications legacy-systray support, please install dev-libs/libappindicator:2."
-	fi
-	if has_version "x11-libs/gtk+:3" && ! has_version "dev-libs/libappindicator:3"; then
-		elog "For GTK+3 applications legacy-systray support, please install dev-libs/libappindicator:3."
-	fi
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.7-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.7-r1.ebuild
new file mode 100644
index 000000000000..ecd6765a9d7d
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.7-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(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 kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(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 qtx11extras)
+	$(add_qt_dep qtxml)
+	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-0.12.2[qt5] )
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		$(add_qt_dep qtx11extras)
+		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? ( $(add_frameworks_dep baloo) )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+	mouse? (
+		x11-drivers/xf86-input-evdev
+		x11-drivers/xf86-input-libinput
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep qqc2-desktop-style)
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	$(add_qt_dep qtgraphicaleffects)
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+	!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
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package mouse Evdev)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake-utils_use_find_package scim SCIM)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package touchpad Synaptics)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# needs D-Bus, bug #634166
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts)"
+	)
+
+	kde5_src_test
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if has_version "x11-libs/gtk+:2" && ! has_version "dev-libs/libappindicator:2"; then
+		elog "For GTK+2 applications legacy-systray support, please install dev-libs/libappindicator:2."
+	fi
+	if has_version "x11-libs/gtk+:3" && ! has_version "dev-libs/libappindicator:3"; then
+		elog "For GTK+3 applications legacy-systray support, please install dev-libs/libappindicator:3."
+	fi
+}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.7.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.7.ebuild
deleted file mode 100644
index 5afe6f0adf69..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.7.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(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 kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(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 qtx11extras)
-	$(add_qt_dep qtxml)
-	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-0.12.2[qt5] )
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		$(add_qt_dep qtx11extras)
-		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? ( $(add_frameworks_dep baloo) )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-	mouse? (
-		x11-drivers/xf86-input-evdev
-		x11-drivers/xf86-input-libinput
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep qqc2-desktop-style)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	!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
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest hangs, bug #646890
-	# needs D-Bus, bug #634166
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|test_kio_fonts)"
-	)
-
-	kde5_src_test
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if has_version "x11-libs/gtk+:2" && ! has_version "dev-libs/libappindicator:2"; then
-		elog "For GTK+2 applications legacy-systray support, please install dev-libs/libappindicator:2."
-	fi
-	if has_version "x11-libs/gtk+:3" && ! has_version "dev-libs/libappindicator:3"; then
-		elog "For GTK+3 applications legacy-systray support, please install dev-libs/libappindicator:3."
-	fi
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r2.ebuild
deleted file mode 100644
index d771236bad50..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(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 kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(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 qtx11extras)
-	$(add_qt_dep qtxml)
-	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? (
-		$(add_qt_dep qtx11extras)
-		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? ( $(add_frameworks_dep baloo) )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-	mouse? (
-		x11-drivers/xf86-input-evdev
-		x11-drivers/xf86-input-libinput
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep qqc2-desktop-style)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	!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
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-activityswitcher.patch"
-	"${FILESDIR}/${P}-kickersearch-nav.patch"
-	"${FILESDIR}/${P}-libinput-kcm-ignore-touchpads.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package mouse XorgLibinput)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest hangs, bug #646890
-	# needs D-Bus, bug #634166
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|test_kio_fonts)"
-	)
-
-	kde5_src_test
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if has_version "x11-libs/gtk+:2" && ! has_version "dev-libs/libappindicator:2"; then
-		elog "For GTK+2 applications legacy-systray support, please install dev-libs/libappindicator:2."
-	fi
-	if has_version "x11-libs/gtk+:3" && ! has_version "dev-libs/libappindicator:3"; then
-		elog "For GTK+3 applications legacy-systray support, please install dev-libs/libappindicator:3."
-	fi
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r3.ebuild
new file mode 100644
index 000000000000..35a5c34cce6d
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r3.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="KDE Plasma desktop"
+KEYWORDS="amd64 ~arm x86"
+IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(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 kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(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 qtx11extras)
+	$(add_qt_dep qtxml)
+	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? (
+		$(add_qt_dep qtx11extras)
+		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? ( $(add_frameworks_dep baloo) )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+	mouse? (
+		x11-drivers/xf86-input-evdev
+		x11-drivers/xf86-input-libinput
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep qqc2-desktop-style)
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	$(add_qt_dep qtgraphicaleffects)
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+	!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
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-activityswitcher.patch"
+	"${FILESDIR}/${P}-kickersearch-nav.patch"
+	"${FILESDIR}/${P}-libinput-kcm-ignore-touchpads.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package mouse Evdev)
+		$(cmake-utils_use_find_package mouse XorgLibinput)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake-utils_use_find_package scim SCIM)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package touchpad Synaptics)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# needs D-Bus, bug #634166
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts)"
+	)
+
+	kde5_src_test
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if has_version "x11-libs/gtk+:2" && ! has_version "dev-libs/libappindicator:2"; then
+		elog "For GTK+2 applications legacy-systray support, please install dev-libs/libappindicator:2."
+	fi
+	if has_version "x11-libs/gtk+:3" && ! has_version "dev-libs/libappindicator:3"; then
+		elog "For GTK+3 applications legacy-systray support, please install dev-libs/libappindicator:3."
+	fi
+}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.1.ebuild
new file mode 100644
index 000000000000..4cf7463de337
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.14.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(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 kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(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 qtx11extras)
+	$(add_qt_dep qtxml)
+	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-0.12.2[qt5] )
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		$(add_qt_dep qtx11extras)
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+	mouse? (
+		x11-drivers/xf86-input-evdev
+		x11-drivers/xf86-input-libinput
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep qqc2-desktop-style)
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	$(add_qt_dep qtgraphicaleffects)
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	!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
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package mouse Evdev)
+		$(cmake-utils_use_find_package mouse XorgLibinput)
+		$(cmake-utils_use_find_package scim SCIM)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package touchpad Synaptics)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# needs D-Bus, bug #634166
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts)"
+	)
+
+	kde5_src_test
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if has_version "x11-libs/gtk+:2" && ! has_version "dev-libs/libappindicator:2"; then
+		elog "For GTK+2 applications legacy-systray support, please install dev-libs/libappindicator:2."
+	fi
+	if has_version "x11-libs/gtk+:3" && ! has_version "dev-libs/libappindicator:3"; then
+		elog "For GTK+3 applications legacy-systray support, please install dev-libs/libappindicator:3."
+	fi
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index ee69a458c63d..f39bdcf86aea 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.7.tar.xz 53776 BLAKE2B 578d644aed72e7166898db13e8e8209b0285c388fec47b82e0495239a0685e07a848b36991988d42758db2cf02c46962e4cf01335071ec60283e97bc553bfa45 SHA512 b33b1b2d044f36b3dad8bf854acb9a1f94be527c9c9b84d18a58323ab249a63276ee91553b6d92fd77b347a52d6dc4c10c080e0333dd31d4ef1f6058cb557fe0
 DIST plasma-integration-5.13.5.tar.xz 53704 BLAKE2B e3bc607fa7270e8f4c7ea686fc4c44f1c47a476a596fa1db646fd3fa729cdd47adb13ae158f4bb2dcf6fecf4ae9feed982438a80b34cb11b9e9abada40d8d67a SHA512 84fadaadda3d91d0ce9a17a2e52dcbb459925a2b20555891219f878df490a52101591da956a06e6362e427a3298499f503924406c28286b4c1b1594f864a6db2
-EBUILD plasma-integration-5.12.5.ebuild 1062 BLAKE2B 85677c190ba956334daaf097c03844c989a2897cc089b6eab540c346885cd3f895a906b3a42b555093fd83978ad61abdf6913808f4523f745bab4e346d6a763f SHA512 d0c91184d4d21d945e16881f879a80d689281632f4c1c0822fcc3153d02be427198dc6f7e12af76ddd0d26f362f1caef714f21a41685e6bb604534b58b8053a5
+DIST plasma-integration-5.14.1.tar.xz 54196 BLAKE2B 1546af0a058adbdc6d6c9d5369cf656a0eff0bc95e811b73433356f0a5a9f1f9f3063cc9f6143443d90e1e88fc088487456d6c0cb0e0fbd6951a6ee9e2721aaf SHA512 f169c375a61f91d794f52d5fd613d19e57c8a88467517d4053f4bde0386c2882ab587fdab5fc204cb280aaca0ffadafb7b1d1f1b451a8b6ebdabb4ac3b89f503
 EBUILD plasma-integration-5.12.7.ebuild 1061 BLAKE2B 14611b6b1f13dd66ae38b0dd7d4a00eaa73f4a6d91de342d8edc4452db38dab95c57638e578f8e48c3c060e66e83bca5dec909bc1e69c12faca828e2c461d1a3 SHA512 59c7a3a6651bc89eee90be6a5f63f9d12caade04fb947a5e96e838a8058201d8fcd4626150c47c80af70d55d881c179db8d72fdd75022cd83ed6eb1ea134d7d9
-EBUILD plasma-integration-5.13.5.ebuild 1064 BLAKE2B 85c18e1cd9d36aa41e3067524e11b87fd4fff69c6202a436a80660824b3839d34fac188cea374c64e4edcb3df04564986692f84c71247ef5838b93287956551c SHA512 f4fa6d0cb0b11d269643af29ce695b48859adde40ecb56b7ec299b36df4af341da6d3587242a59fbbcd91e162aed2ef23c5d49896a0db7ea96db8dfb26c622b4
+EBUILD plasma-integration-5.13.5.ebuild 1059 BLAKE2B 2d8482f0b2d54b8fea3fba458bd20c5d264c93802ae6f78b52cb66f86bdb4f6e0e735df195f70b5f3c49e02cbaef5c9de156d5783e8af2e720182af99a3226e2 SHA512 a0e0ba1ea30047b4ea7889205682a9ed4bbcade21d839d8819e792f0d44eaf8f7ed26874d38066197b6885aee638d8936d3fc76385c1274c9ea304658c6d6a34
+EBUILD plasma-integration-5.14.1.ebuild 1061 BLAKE2B 14611b6b1f13dd66ae38b0dd7d4a00eaa73f4a6d91de342d8edc4452db38dab95c57638e578f8e48c3c060e66e83bca5dec909bc1e69c12faca828e2c461d1a3 SHA512 59c7a3a6651bc89eee90be6a5f63f9d12caade04fb947a5e96e838a8058201d8fcd4626150c47c80af70d55d881c179db8d72fdd75022cd83ed6eb1ea134d7d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.12.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.12.5.ebuild
deleted file mode 100644
index aed44959768a..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.12.5.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 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 kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep breeze)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui 'dbus' '' '5=')
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.13.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.13.5.ebuild
index 1d60d9295f03..ce019fdac5d4 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.13.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.14.1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.14.1.ebuild
new file mode 100644
index 000000000000..7a6f1d7272c4
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.14.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~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 kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep breeze)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui 'dbus' '' '5=')
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 39f925629881..de1f8879254d 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.7.ebuild 2138 BLAKE2B ac02be282c30a84e688b77358a0ef8ce33782a61dbaf802abdf2838004e1ec4e9b49a471f207efd4db8619c5b3d015108d5ef63ee9a0a19adedfed09c47780a1 SHA512 eece7863d0aeedb5d0d5f0f78d56eeba0e2b62f19faaffedb4a282b176ad303046b511e29bf16becb4a0c4634fc439a669945192b181feab61e113997793e25f
-EBUILD plasma-meta-5.13.5.ebuild 2233 BLAKE2B 77b371fbe460a3dd2ac0db7bf04c7650ffa1fef910f57aaaa87441dd3ca7ea8e803eeffa8c4f24173d752d906659bb2fd7fbc84bb0c22e1003e57e10d1223cd7 SHA512 fa082c43246d02e6da6dfb12dea0c72c68c8757f5d7b2075b7b2858c05f4566ce94cb51f7f885d1fe2d808918b89c297265c6252531b3527d07740371d7cf19e
+EBUILD plasma-meta-5.13.5.ebuild 2228 BLAKE2B 38972e9aa86fcf8757b8a1402d26309aa2b3a05e418663ef0a53281e45005efcdde7922d72e2f757115bcd9bf06243460fa51f6d013682366f42ba56b2956c72 SHA512 ccb7f33bc4ea19344699cda0228a4fbbe07b69e285805f8befe5e20c060828b6eb73a64593c9f1cf74d8173af4427b3c965a67c0b08451a901ec42411af26fe2
+EBUILD plasma-meta-5.14.1.ebuild 2219 BLAKE2B d5f5f901faaa9291ad536885b4c70649fc8c4a114666f61dcaf1dc9d732712a888a11af45422b8f1ed981c18e5aa25437f20ca3e76e2633ad8a79bf376b92a68 SHA512 f106b0276b5aa7378b5342aba079330a1dd68bab35f2f60cd9680eb7bc9ef04e62039e099abbac17d5451b8fd79804f8dc0ce95f7a222290de4a81edb853dc76
 MISC metadata.xml 1304 BLAKE2B 09af233977178dbd8bc6943d87db1b5523e3f94d9f7db522d56788e21de9d7d0a9f9fb9bc38331623619524021cf961b35d033cbb5b3155c365154db6df1642d SHA512 f891053e1f87c4daab4024cdd3631e778c2a1c0d5f39b40aefb9ddb263b7d8cd3ec9adaae416562717837a789fbb76baccfd05b1ef11b491a4782926f66a35e4
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.12.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.12.5.ebuild
deleted file mode 100644
index 529ffa202315..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.12.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-functions
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm x86"
-IUSE="bluetooth crypt +display-manager grub gtk +handbook legacy-systray
-networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
-
-RDEPEND="
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep drkonqi)
-	$(add_plasma_dep kactivitymanagerd)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kdeplasma-addons)
-	$(add_plasma_dep kgamma)
-	$(add_plasma_dep khotkeys)
-	$(add_plasma_dep kinfocenter)
-	$(add_plasma_dep kmenuedit)
-	$(add_plasma_dep kscreen)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep ksshaskpass)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep kwayland-integration)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep kwrited)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep oxygen)
-	$(add_plasma_dep plasma-desktop)
-	$(add_plasma_dep plasma-integration)
-	$(add_plasma_dep plasma-workspace)
-	$(add_plasma_dep polkit-kde-agent)
-	$(add_plasma_dep powerdevil)
-	$(add_plasma_dep systemsettings)
-	$(add_plasma_dep user-manager)
-	bluetooth? ( $(add_plasma_dep bluedevil) )
-	crypt? ( $(add_plasma_dep plasma-vault) )
-	display-manager? (
-		sddm? (
-			$(add_plasma_dep sddm-kcm)
-			x11-misc/sddm
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( $(add_plasma_dep breeze-grub) )
-	gtk? (
-		$(add_plasma_dep breeze-gtk)
-		$(add_plasma_dep kde-gtk-config)
-		legacy-systray? (
-			dev-libs/libappindicator:3
-			dev-libs/libappindicator:2
-		)
-	)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-	networkmanager? ( $(add_plasma_dep plasma-nm) )
-	pam? ( $(add_plasma_dep kwallet-pam) )
-	plymouth? (
-		$(add_plasma_dep breeze-plymouth)
-		$(add_plasma_dep plymouth-kcm)
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa) )
-	sdk? ( $(add_plasma_dep plasma-sdk) )
-	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-"
-
-REQUIRED_USE="legacy-systray? ( gtk )"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.13.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.13.5.ebuild
index 0d1ecf9e0e14..c8c2bda40bcf 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.13.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="bluetooth +browser-integration crypt +display-manager grub gtk +handbook
 legacy-systray networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
 
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.1.ebuild
new file mode 100644
index 000000000000..ee107279046b
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.14.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-functions
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://www.kde.org/plasma-desktop"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bluetooth +browser-integration crypt +display-manager grub gtk +handbook
+legacy-systray networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
+
+RDEPEND="
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep drkonqi)
+	$(add_plasma_dep kactivitymanagerd)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kdeplasma-addons)
+	$(add_plasma_dep kgamma)
+	$(add_plasma_dep khotkeys)
+	$(add_plasma_dep kinfocenter)
+	$(add_plasma_dep kmenuedit)
+	$(add_plasma_dep kscreen)
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep ksshaskpass)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep kwayland-integration)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep kwrited)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep libksysguard)
+	$(add_plasma_dep milou)
+	$(add_plasma_dep oxygen)
+	$(add_plasma_dep plasma-desktop)
+	$(add_plasma_dep plasma-integration)
+	$(add_plasma_dep plasma-workspace)
+	$(add_plasma_dep polkit-kde-agent)
+	$(add_plasma_dep powerdevil)
+	$(add_plasma_dep systemsettings)
+	$(add_plasma_dep user-manager)
+	bluetooth? ( $(add_plasma_dep bluedevil) )
+	browser-integration? ( $(add_plasma_dep plasma-browser-integration) )
+	crypt? ( $(add_plasma_dep plasma-vault) )
+	display-manager? (
+		sddm? (
+			$(add_plasma_dep sddm-kcm)
+			x11-misc/sddm
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	grub? ( $(add_plasma_dep breeze-grub) )
+	gtk? (
+		$(add_plasma_dep breeze-gtk)
+		$(add_plasma_dep kde-gtk-config)
+		legacy-systray? (
+			dev-libs/libappindicator:3
+			dev-libs/libappindicator:2
+		)
+	)
+	handbook? ( $(add_kdeapps_dep khelpcenter) )
+	networkmanager? ( $(add_plasma_dep plasma-nm) )
+	pam? ( $(add_plasma_dep kwallet-pam) )
+	plymouth? (
+		$(add_plasma_dep breeze-plymouth)
+		$(add_plasma_dep plymouth-kcm)
+	)
+	pulseaudio? ( $(add_plasma_dep plasma-pa) )
+	sdk? ( $(add_plasma_dep plasma-sdk) )
+	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
+"
+
+REQUIRED_USE="legacy-systray? ( gtk )"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 1ec7efa5a4a9..ca180c41ff9f 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,8 +1,8 @@
 AUX plasma-nm-5.13.5-iconchange.patch 1138 BLAKE2B 58c30cb23cd8b76be1c7582695a0a770b44791cbdd3b90600cc9703b1a9a7ee3ca12fce1557a7b2818a210bb3b93c725d81b9213016a52d77f63db87e7eeb54a SHA512 1df04d32bd37c06b0ef7817ca7518cef288b84e130da4c62e76252f7338ddc13b5ffe8f005b49cd270d157598844bdc49b683a6cbf2c57a5254e32021201777d
-DIST plasma-nm-5.12.5.tar.xz 703236 BLAKE2B f522d11a182b589beae46a2aae6c59b6964da7d073e8bae14464cd99fb29d9fc0188113a7a00ed568646daf7a22ef2000c3ccaee848361f50caaff6087364c40 SHA512 7c61743d028d27ead7b7c373757f5ea82703808702d31546477558a631607c15d867140624391b803a72f5675c96853e1eea07c7af3001718a96c36d6c3191c6
 DIST plasma-nm-5.12.7.tar.xz 707240 BLAKE2B d6355e2a0ce181144842871c9335a02968d53f95d587f5d7fa982de33e64d6642a2ef450ba98052526f5114777f516daa801b42424e8bd48d65f3a334eca7aa3 SHA512 1727a113c2c48485d2864ca48d4bf7b05cec8fdeaf41bca2c6c0820a8f5665b77530b846eba4512aebe7c13362573154146f94538bee533c268781e70c462e56
 DIST plasma-nm-5.13.5.tar.xz 705984 BLAKE2B 0a00bb3696ebc4ee5f26746cb1c1e9ef14e456abf448faf17d8ddb919f272354a88969ac54447ac626640d260c8bc1c4ffe3a578e3d2683c5efdf80d9b7d9a4b SHA512 13c0c5c27a5d01cf20093f314ff620658688fb10dfa052419b54f37e6de20fc947b120c7c9f3df5b3e8f3d92a1e701674c917456dbfb681c94e06a1da0456ead
-EBUILD plasma-nm-5.12.5.ebuild 2031 BLAKE2B 0b13ba56e88e56e93769b285533f5fb69e1fd955f5d7dddc2d56f97b1ccf621fd8da3d1c40baa3885a17a3f3446326bf2d58d36c904735e33847d7208c6ff205 SHA512 ced1801c4b9382015865ea013a987c63d7c4cb705be46a594ba8d52a09e13c6d3330d5e7b57df26c1f56e43be9a1ab80f39b55ef6b90dccab4d5798c4e101891
+DIST plasma-nm-5.14.1.tar.xz 719588 BLAKE2B 2d0381cbbfcc608665ab5a8a165f7b8144d3367568b0dd51f26eed22638f7328b7b9ead0027396e2fa0c23468f5a092de193e11646f4e181fb45088b9c4181f2 SHA512 65538b5d01e5a247c453612953f549827dff2e094a89ddf0dbd2717b3cee1a53272ed5d3e0395086b0cfd05666b6be6d2ca6ea08ee3775e20b83713589135377
 EBUILD plasma-nm-5.12.7.ebuild 2027 BLAKE2B 9a8e006ce7bf7c6e51ec2b3bf63c1d3bf5e7b1987d55ea3cc2fb6a03c9424f8d4487995a1886c6218f3e3e525453c5377b3ad21ea810a82f30cc7573c638608f SHA512 3965d8ffe71e61d807c27e99a8239e8930feff868e584cd52c2d842518f2cd1ae5a863d840ebecdc95dbee8877e10d520f7c2fe2478ae694af9efa4d3239edfc
-EBUILD plasma-nm-5.13.5-r1.ebuild 2079 BLAKE2B 68b0b9c735f9fac31f7ce80c429d43cd62df8816f89998e11432db65caa1afd032a139841f2593e304452b33cacc07c1e78cbbe85459d824c8d9a4e762b87674 SHA512 fe8d6c557406871a2b865660c8ebf1a6fddd7823ea65e33895eb80a46b2423e9adccbbc6f2453cc7609b4bcd03f045a2bd97a8a3c86d4fe96bd8ac7c418e9767
+EBUILD plasma-nm-5.13.5-r1.ebuild 2074 BLAKE2B 8ed6d4ec6023c4b332b0a9aeb81e3b37f3d4c36272643e450baaa3693bf66ae4e772787105b957122dec16fd214dcf7764ebb6bc3be0355abefd086aac46f7fe SHA512 b7d2a15e12f5e72aaba5b7875bda292b38d1be129b37b2d5f40fbf613593e0be731e7db5ffff646d4f6463c2d0d189fc1c83ab33bf9d171303dad719b771b9f1
+EBUILD plasma-nm-5.14.1.ebuild 1988 BLAKE2B 713c3bc61990bd985d1f2681a0b2e1f7f90272fc1913a901003ab079ea05652e423cc5c49b4596ea8cea814fe0e45866b04fcd59570bd757fdae37c9723e2f01 SHA512 a52d8a25ed14d6f78e3fa1f2250ab086f37eb3b2b047c7bd55c78e311229eb1059e0097ee598f5bd5eb232804d28c72ad77845858076ffc133afc3b104957aff
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild
deleted file mode 100644
index 2cc09fe45490..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.12.5.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
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(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 kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=')
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/qca-2.1.1:2[qt5(+)]
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		$(add_frameworks_dep modemmanager-qt)
-		$(add_qt_dep qtxml)
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		$(add_qt_dep qtxml)
-		net-misc/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/plasma-nm:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		einfo "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		einfo "However, the networkmanagement KCM can be called from either systemsettings"
-		einfo "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild
index 1413d19dc51a..efc32711dc80 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma applet for NetworkManager"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.1.ebuild
new file mode 100644
index 000000000000..86195daf5637
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.14.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(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 kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep networkmanager-qt 'teamd=')
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/qca-2.1.1:2[qt5(+)]
+	net-misc/networkmanager[teamd=]
+	modemmanager? (
+		$(add_frameworks_dep modemmanager-qt)
+		$(add_qt_dep qtxml)
+		net-misc/mobile-broadband-provider-info
+	)
+	openconnect? (
+		$(add_qt_dep qtxml)
+		net-misc/networkmanager-openconnect
+		net-vpn/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/plasma-nm:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake-utils_use_find_package openconnect OpenConnect)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-plasma/plasma-workspace:5"; then
+		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+		elog "However, the networkmanagement KCM can be called from either systemsettings"
+		elog "or manually: $ kcmshell5 kcm_networkmanagement"
+	fi
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index ec01704403ac..62c36f44b2e0 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,8 +1,8 @@
 AUX plasma-pa-5.13.3-automagic_gconf.patch 530 BLAKE2B 49fa6547b997c0f31627941b333c30ce0ba1165910c235a8319e4855fc5b5acb8c8355b47cd87e57aa49d1f320ed9d6b395887376ef55a5098c436bcfa7d4e4a SHA512 5baaeafc2e4426251d445f954ce25b6561e9e5e36064f803068d8d60d6186cecc4d7eb97da20406160c166800bfa4e54543566f21ac4afa398c3cf4588d23546
-DIST plasma-pa-5.12.5.tar.xz 86068 BLAKE2B 5133b667527e083d390b8d0e4352fdbb2d6ccc7abf6676e07b5f141787372bd8c00cb600f08e4fd20707476108fe661c779820645f06e895c53e4aa1411bc3a1 SHA512 7fedeaaeafaba7e2d7568fddcaff1793640979090aaf8ab7131c462b2bc0c2766f76d37cd0133c02c05a23efeb9e11b11350848d59b9869bf7bfcbd55924163e
 DIST plasma-pa-5.12.7.tar.xz 88284 BLAKE2B 34ccb14229716bcd5d74d92fe82852a413606d7f2dd1ed69c00daac3c78f5e4a485e3ea0f4ed57ee3dbfd2340208d62173d68a3311155b648fbfa580e19614e5 SHA512 07d9fb3bca31d737069e3d2f122a3d6a77f2dbf26c4dbd1c5c515da5db5667da1d3305b0a08eab6abc83582825fc9468b185a2f1dcbc733ddab649ad0cbe78d9
 DIST plasma-pa-5.13.5.tar.xz 90692 BLAKE2B 783fcf99ca9547818564370d1745c99b943409d8c0617844462fd74af94e34d00f392765525f422c245429838e75fae846e938e6bb039b7c27a0817ccf821eda SHA512 58667b60b4c9dc8f81d7defe35b7dab23f52b8e6e2bde3ce242b6d3e3f959335d3dadc855a12d2b04fa01da9243bf0408011e87a649bd6132b48c2eec964813f
-EBUILD plasma-pa-5.12.5.ebuild 654 BLAKE2B 92ab0bdf33a2abbeff636da7fd356b4bd94c2c7d3bc73adf0867c3563e6ed06bff4ff1706c49eb5d6730f16667c29b8d234899a24a1016b7af51b98400778ed8 SHA512 7aadaba73defe948c5eaeab2a08810ccc02bdfbc32acdc9b6729185c8c0c1c3f05a6bf93137c46dea46fe2ec2c1fd92388b47dc117f6d3688b211355751a0040
+DIST plasma-pa-5.14.1.tar.xz 94244 BLAKE2B 0e5e40b5e9c47a3c8097fcb13ff789f3eda3e157b4072037b4f76a7f810f07dae91cf4b055e7cd6fdbf197362199cf09d0858f57fd069c8daef0b50708d051b3 SHA512 7e52d429a546968ae965eafeaabeb5e477900e7f263097e432d10b5aba7ca9c2f335c6512394601ff703233ff606a78a422e97a59cd7e1db9e1fa67775b46640
 EBUILD plasma-pa-5.12.7.ebuild 653 BLAKE2B 31e7193783625b80b6f7e2abe127b34a503fe1546c1a48fbc2014f579150c89d8594069056d5b427bf422ef93eb4fa7d34e0a5260488733d32b646ab5f682467 SHA512 dde2ba31a874fc3e1a6899dc7ae6d2418c301bf6ab815b30b93afe15a8e517f64272e7323db0db20c4b058948b208c51ea84db9079043dbb3fab24eb66c7b389
-EBUILD plasma-pa-5.13.5.ebuild 674 BLAKE2B 39fcd057ee15c1957485497e9f368c4e12b8604a893eb9318338b639b311ae461bfaa244e3d02f3e68c43f010e4a17b03f9ea3761cce5164e8f9332dbae8cca0 SHA512 f3e970ad77442d487331848194b2c84b62c195be6ae5cae5ce766474adb2cffb3e1335f89c77690e48f09899b0d5421e9e403d6aa40ac9e89a64939ad064502f
+EBUILD plasma-pa-5.13.5.ebuild 669 BLAKE2B 68f4d9cf4f99b934091ff0acb7ea55eaa873655e414d2a048a35ac70addac92d33395fc5ddc5648b36ad84c6363db9bfd57208e79917482e775d2a0eebc1a69d SHA512 fc13b99dc294a9d93af8406ca8184947daf7ec8ad27e9c8e30f9d5683de816be95c7b1de40c4b6a41b166156b664e8122910d1f6da60a83718dfcb3ea4c58293
+EBUILD plasma-pa-5.14.1.ebuild 671 BLAKE2B 8cec8ca0b78f429fc9166a534ff4a3c766c6044caf4ce675d358098e4e5f20111a5fa540d54c7cd106846dc749a80bba61287e47683ed713e798c0d77ae06c1e SHA512 3230807d48f12604bfb5ab916fc4b41aa253dcb7dc086d69e5f944a01e4c7a339410bc85e76032744592921aaeb37c6391ae0e4728901a45484146ae0fd8e536
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.12.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.12.5.ebuild
deleted file mode 100644
index 3bafce5d10ce..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.12.5.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="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}"
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.5.ebuild
index 3e7504c19b4c..8364d905afb0 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.13.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.14.1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.14.1.ebuild
new file mode 100644
index 000000000000..3977835041a0
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.14.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 dd46a6c2ff4f..1b431f7a2969 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.7.tar.xz 245872 BLAKE2B c96941fb41d6343e631b8c7571e9112432f8b0886332d2e0225c86abaf8d95565e60444139af572e7d906a13736ee51b5a6f76538e606c0cdf9c06a240f116c5 SHA512 a12ed059838e282e72772b9113ebdb8977525dc76a2c3d8c377871e7157c9c78de87d1e11ce704123df0b39c3c0f5e48b533b69404367f917557804c372a8c8c
 DIST plasma-sdk-5.13.5.tar.xz 250032 BLAKE2B 0269457091da4d462450883eeb7a7d7ccc26bb59804a8fe6ce04c131a77f2f0146060717479ace02f2f9b629b77188f44ac8d1217094e2a6d2429a3dc2b86c00 SHA512 bf73297d8d62c5336c1cb8c6c3e5918efce0a2a069c1b76f4e0c2b6d421aa3ee37f427a3f22c17d2b045af9a807a4104ab142d95b5c92f71237a72ffacd709f6
-EBUILD plasma-sdk-5.12.5.ebuild 969 BLAKE2B a4fc74c2bd385e5d6bf936276de015c1616ead4b35df629d19aa7051b69ccb12dcdd968dd8b0250cffd07987a0762d210999a64f235c233bd714ad64be63eabe SHA512 b942f87567b41693f6568bf9975a907af75b4601a5f1b2bb8c024975c4a4223a7ed2e1e1d870103357632369e9da4fa58f4fee2bb8838a7bfe552857b9ac54c1
+DIST plasma-sdk-5.14.1.tar.xz 250128 BLAKE2B 975a274122dfcf7c6213f7b46eb5f3ffade94d165912750fc41c1d5482d28115dc7ec5dc43ee292e6a5ed3858510211e572da5b8bb0814b56cf8fd94f22e2ff0 SHA512 0d9dd6369b9835efd4c0647e087379bd1885ef02484f51f14cb9e160c6b0a2784dca1019bfc1241806141f3eed93ab0780eadeee3129b5e83962346dc80fd347
 EBUILD plasma-sdk-5.12.7.ebuild 968 BLAKE2B 001a3be301ad9a4c3446df888067896509e1e3b1ddd653e787374d43dde7fee60102577e5231bc804e32be58c7d29632f0e6a197261ce2f71767a73b7ffefb49 SHA512 ff9ec61fbd4f90423dd37571b0b7f325ffc68320183e9db21c3f22b32575c61199532eb163329bc48b288c1480c30c7f8dfd2f565d3777bd06b707fb6195559d
-EBUILD plasma-sdk-5.13.5.ebuild 971 BLAKE2B 751a5ebc2e3cb9958f2929b04f3b141dfcc2a0202e40bc9a142abd51d10e4b7640f12a4576cfa51567ee8002cf2a501af02326f9369bfcc1b53ba5f7150cd65a SHA512 bd7f1c21926ec057dfa456a14bca1933ca046a4e9f6b5d0511197dbc6b45ae2961095bfa0de444d4a3ac8b41def52afbd04785aaeeda73eab76ce03ca841dbf1
+EBUILD plasma-sdk-5.13.5.ebuild 966 BLAKE2B 4f97db8570b3c006ca9a2b888ce432cc91a9264338f9c25c0e5172aa13d0903839e8554f897dc52d66e64c47d4d5bbe439ca8b7479ca19836d3e76867d1f2fd8 SHA512 4b970f6dac09c3c6beecb795dc9e3a213a54090b28b7108de33bc33d2c23a2455b206eede7ebb04b5846a7fd0c95261efca969275a045ca100de9df65a103118
+EBUILD plasma-sdk-5.14.1.ebuild 968 BLAKE2B 001a3be301ad9a4c3446df888067896509e1e3b1ddd653e787374d43dde7fee60102577e5231bc804e32be58c7d29632f0e6a197261ce2f71767a73b7ffefb49 SHA512 ff9ec61fbd4f90423dd37571b0b7f325ffc68320183e9db21c3f22b32575c61199532eb163329bc48b288c1480c30c7f8dfd2f565d3777bd06b707fb6195559d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.12.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.12.5.ebuild
deleted file mode 100644
index 6a4aedfcc5d2..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.12.5.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="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="amd64 ~arm 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 kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!dev-util/plasmate
-	$(add_frameworks_dep kirigami)
-"
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.13.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.13.5.ebuild
index 47de95ae2130..d4dacd20e9ad 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.13.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.14.1.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.14.1.ebuild
new file mode 100644
index 000000000000..334020a60fd3
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.14.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Useful applications for Plasma development"
+KEYWORDS="~amd64 ~arm ~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 kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!dev-util/plasmate
+	$(add_frameworks_dep kirigami)
+"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 87a2c32448fa..4d5b04f450e5 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.7.tar.xz 106780 BLAKE2B 75f6ebd3b4f6eaa565e6abc318632577a74488dc0a6e21dfe20df74c2562bb34ef85050ca5b0a18d02f7781c7b10c1588030bfec01b99712212c6ae6c850fdba SHA512 fc628ebaeb7b8ff24ca91290c3a0c27ef47b4245d1ca4766eabbdc5a59010b99375bb6128f36719be97261b7b11283a46759b37bc11211ac60e9dfc0d5c56e47
 DIST plasma-vault-5.13.5.tar.xz 114908 BLAKE2B 8043b46b5f8c0d2b6f22e6afedabc3b8116aadf47a5cdd1ca690ba2a232e5b6b7deb8de3bfd58a3566880f0b6c445e5d8ddec3165a6b74ecbf5d51ee3c981422 SHA512 f6579fd9134039c105f3399818520077e080a603459ad20d08825f00f341930dd84c0e6cb1ced8d722efd941a40751e7025a74098c4c1d4daca3b8f284fe38bd
-EBUILD plasma-vault-5.12.5.ebuild 856 BLAKE2B f7672f6b4868877e27e27c0028176f8f7ba0642c1071f23eda887f3fa174b8373dded2eccc36623e2623ac6de82396d8d9490aa38b72a94fc177c50aafccebeb SHA512 6e64d0bd6b08f47f5f73924cb4dc240a01405148286de6e8e3d01604ca27ff9fd1a24ff772c0dfc5ca5e218ada804e48a6cd9a4400f2f5284fbaa6e2ca52b329
+DIST plasma-vault-5.14.1.tar.xz 120500 BLAKE2B 88e5e171905f2c8bce29e38a62d9f876dc4ee4552001ea697755eddb5b6ac002a752afdd54d7523ce8ab02dd099f17c7406c21dc9d2139ee8499d8c832b87cd7 SHA512 83f01e2542aaec759dacb7500d07a61d72890107849a1468021df5412ba90eb03193550fa8972a666f50493ecccd9198d1a9df3808a14e1191a930cb100a06a7
 EBUILD plasma-vault-5.12.7.ebuild 855 BLAKE2B d2a15f5bc9f325556f42f897e0b781a26a71f1c6a7a74a0005580106042bfafadc0b1984907c874bac63eaa033323ea5217d03697ce6a4caddf4a76820652b3d SHA512 ee1dd5a2817c74c02e8807de26a6a8c8aff796601c1f594721284980b71f73ec564e18257ffb2f95ce1076d1af221c2b70dcdc4231929b70aa90e0193320216a
-EBUILD plasma-vault-5.13.5.ebuild 1137 BLAKE2B 8ad0836a50c02b632047fa67be439aa70aa1b5308624e1e6be93e1d60fe0ed07b599d2f304d66c78be326203434f48014396119185eb5bde7e005353d30fba65 SHA512 ed2ace4ad487ab4a4f53be35c8cfeb68c90ddd87ad09623a253fcd313c3b915a157846724b8bebd0bc96f7713cbcc13a583c38bf7dc393d6aaf7587b0f1047d0
+EBUILD plasma-vault-5.13.5.ebuild 1132 BLAKE2B 312a8ee062aaf47aea7d6e9b1a98ec2aa60316ee8e6c434291d1dbc53ef40e8004b570d1b2801476317338d1652e5ec5cc4820c518a4bb8b80d66bf9dbdb6654 SHA512 5b601579eea03c6e06ed11e29c137bc4e8ed893c74f731b87614149c396c279b519119e8275ac47ad91266c11a7db02674da3482f79ec6c38e7139aca55fc4c0
+EBUILD plasma-vault-5.14.1.ebuild 1073 BLAKE2B 214470e62ad0800c231c907dc29aefee6b3fc34637680e8c57949a0e89810b7076e95eb75e3e98f5c666faef690336485194290bee367c10daff9c8b1e181594 SHA512 023b791cc132616ca2db3cac07d70d7d87c196cf423495a36a6d650bb84792ba4f1393bf3c973a6d13e251828661fb674989311363d860c0ec2754f2ae9f4951
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.12.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.12.5.ebuild
deleted file mode 100644
index 85aaaf650693..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.12.5.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
-
-inherit kde5
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(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 kio)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	|| ( >=sys-fs/encfs-1.9.2 sys-fs/cryfs )
-"
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild
index 2e3dc39df9bb..f536e2a31b4c 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Plasma applet and services for creating encrypted vaults"
 HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.14.1.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.14.1.ebuild
new file mode 100644
index 000000000000..29978f62b899
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.14.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Plasma applet and services for creating encrypted vaults"
+HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(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 kio)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_plasma_dep libksysguard)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
+"
+RDEPEND="${DEPEND}
+	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 2884ff54aea5..beaa0d954a6d 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.7.tar.xz 45917468 BLAKE2B 5becc9cb005942a884add3c0792df5b5fb176f9f32bad1592e1dad1a0b3cc7b45d66e4946f537e6f9e5143c4ba12cdc81a07787797579b8f4bc2c20ffbaf8a0f SHA512 7abda6e4cf223a72222ab2f2b3d8deb631b7ce1e6a415697c367acb53ae5f653fc8dbf6ddd631ff7a1888c2293d102bc0ba1753e50419138f7c9d7d2ea5f08a9
 DIST plasma-workspace-wallpapers-5.13.5.tar.xz 45916196 BLAKE2B e483fcdff5d72867ed0e6a10ba004b748f89b04d71b320910a5654c8dc7ebf3658a97050c619a9115cc5a26fe3fe13baf812cb8f2ab58fa1a9a5f06436c8cb6b SHA512 51010cc3da749dc494bc5677b42efba408149110feb1320175fdc71044b777f13cd700511d1766b7dfdbdb98c29b7bdae6898f08ccd05517bd991de7c83974f3
-EBUILD plasma-workspace-wallpapers-5.12.5.ebuild 395 BLAKE2B 6a3ad24b7176ce43b892681d54bb0a649fc9ed1cdcd8d89dee3232213b57d8174f88acf5703b960b72f648b1f1e7db698bd151ac9584557142550367cce53a73 SHA512 0fa14c8bb2ddb2ef24d50687813feaf8cf69b6834ceb412a2ce8ad8b3292acc62d08b3240fe1af7a259ba24fec96a94369196ef38f642ffba3115833f937499a
+DIST plasma-workspace-wallpapers-5.14.1.tar.xz 45915684 BLAKE2B ba5f7fc9b17bb43f22ab868824f2a7f12158198def57b20b3b4e36f5315be902fb565f35144fa7c46c5913b1357839d68bc85be6b436974a4a5c5568745551b3 SHA512 ac43d416f8cbe38ab296d9e43d63ca80e91d9d9c50bb2af9069e500c844cf047bc46f8f18a6cef472fad3b87c2969820071d0e1882805feb0adcad5e7d84b631
 EBUILD plasma-workspace-wallpapers-5.12.7.ebuild 394 BLAKE2B e434cc17139407eaced371a53c57f7413d42e9a7b424dd372b9e109b957b8d8b941c96c3a8d8b446bb9c715192eb3b788d14916e589bb421b019c15f8567739c SHA512 4f6dc7dc5eaef279f242336e44c98a174db7fd626c787bff1bc89d4a0cca5399534b5d7e4bd65fdc7590d33f5fec63aec08261daa24095b43014a85a5aac25bd
-EBUILD plasma-workspace-wallpapers-5.13.5.ebuild 361 BLAKE2B d63f9366a84c9ff391c7b84bdcdffad7045451ab861ad960128bb09f6d4c707717de3d651186600f2eba838776679cec8728cfe8536041af7342ee082fa212e4 SHA512 e97040d60acebd82171d7b58835afa82e83c6c5a1b588e9cb256891a287a289948ff0ffb8a502bab7ef7c178b77bf5ce3ddd80e5f5c5d181d54a46db2ebda3eb
+EBUILD plasma-workspace-wallpapers-5.13.5.ebuild 356 BLAKE2B 2d7224e97cb39e96d7c66faffe0590d352b088d0db6355249d5924694a2ecb86c7750da8074593371f7e36d931f49e293fdef5d580f292ed76d7486f20947b0d SHA512 c6e72282f36335820a10c7f3994374c390dd6dcdf9cd64e0d058154480917c8d10c007316e2f6aa63176e6f2b970e159266b4acad01e6a4ef031c901053ef287
+EBUILD plasma-workspace-wallpapers-5.14.1.ebuild 358 BLAKE2B ace058f23a929df749c8a4c0b825c49d08358efe9dde431ec44afb59a6e616fd624c3e2472c8c829ce93df49df81f5c9fca7ec2dce162d6b4f22f87989405206 SHA512 ecbedc1bc9f7248b6cd97ad585b259073b2849b81678d2b084a4baca6fe229f8f7b31f23e2915acfae774fbc41270d6f528bee10fe29d4d4d360c3ef5fbd84b7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.5.ebuild
deleted file mode 100644
index 87d59a4589ad..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.5.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_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r2"
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.5.ebuild
index 12fd86d0561a..efa1994e38c2 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ KDE_DEBUG="false"
 inherit kde5
 
 DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.1.ebuild
new file mode 100644
index 000000000000..2155e5536b19
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Additional wallpapers for the Plasma workspace"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND=""
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index aea285dffd17..e35249046e8c 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -5,10 +5,10 @@ AUX plasma-workspace-5.10.4-unused-dep.patch 804 BLAKE2B 7c77a4f64185f718da3e8a6
 AUX plasma-workspace-5.12.80-tests-optional.patch 905 BLAKE2B 02350e6aa907b91c84d50f06efe5ab4acbddc39226747660b21f6b5209a85bb35b023e583a51b583e87f3d75d02c4c59621463992d29ba6150941d464a07ad8c SHA512 df01f4f246d093606a72c8ca018ce829b42073cf6db2db00f9be7b22d7532f3a6fab5218579c666ae8ed6408c0a67912643f2c37e1c13aada49b7ef0c4111044
 AUX plasma-workspace-5.13.5-double-positions.patch 1341 BLAKE2B 9acb1116943cef24641b89be798c234bce784f31f87c2d25c8d37a185a5386a1899238928ce5b25d3c96f3b84519c35e558ccd3361e1dcbbcda9a7172749af32 SHA512 ae92f642177fd43a538e40fc113ca0febe6ee6274e6d9c38d6b21052abd676a5a00a205470fdda06f652d26bc899db89322ce5a059e96b19973a1abcd2a108f1
 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.7.tar.xz 4574632 BLAKE2B 225a63a199f0644e68e25316adc85c11818c0a8e57fbfa64188233a1172f819aa98920b96f9bd1039355651005f4df35f376104e1cdcb511d82ef43eba1eb89c SHA512 e9d4a85b11264eebbce0845eefa5d01818e944c2179d5cbc3e23b720118894d88fbfe96467c68849a3fa89728cecff248cd7f9dfc0ab133e50dad28ecc957623
 DIST plasma-workspace-5.13.5.tar.xz 4577444 BLAKE2B 4aef4cc12762113bb193f62a2a400b6cc53390ec1ff800048bc6f41391ed8a9228e1afd6379425d6e636f1d229d9cc9bb3d976515026c874fa27a3fe29bc0499 SHA512 f30dc3ea83ec3e2a754fb531be24b1f573e743724abcd7df88f83daba07b3bf360f2e6b5c7d2a54a8dd5c15a39e73123d6f2a00730d09f1caed08002c2da24d6
-EBUILD plasma-workspace-5.12.5.ebuild 4705 BLAKE2B d67bf20a99438d4d5c8f0eff9f5b065c567e0f4534b4a44e3a373dcd712278b14bcbf2ece60c2eadb5698156c55a4d8313229bfd84b052c73ed227e2d3d60ac6 SHA512 791629ab4a7f7e62068fb0579598d43c6c382e151d509e8ef946d059c30853c9b2ed2f1f679162dce1d0e3e4da648977d24c840d82a754244ae3ba6c7b6345a6
+DIST plasma-workspace-5.14.1.tar.xz 4571880 BLAKE2B 8d19b65d29cbbbe72df49b9ff9466c5454dec73126cb7a927298838c5a42c326c82e99c9747cec4cad4295d7abffeaec6e60c99749abca79bf5b2924542e32d1 SHA512 917386b278a7179b5f76f4b8bfa9e35b9505d5e7c07dcd448bbf86b75658963465f62dc6e999fe67bfcbb767b0b73921c6787b222d0642ddddd9158f645af18c
 EBUILD plasma-workspace-5.12.7.ebuild 4704 BLAKE2B 2899d0a2f4125ce0869bf7ebc2fc4e208f3f0d10b073205a04b25250e88d78f5ece067ccc4a4c5797af114f9d10363939eae36edae45b6832c5ecf3b82b4b56d SHA512 89019fe7d7ccc84512e2c2730321df635313952d26d45822fe4fa4befcebece515a10c18da97baa0126dcc5bb1885eae90889bb5d457847d0f3da167b43fb377
-EBUILD plasma-workspace-5.13.5-r1.ebuild 4767 BLAKE2B 79c735a10186b8a14b2f8cd1784ce57dccdef067b994311db7c66129e6889ba2d2676072c834b3ea352c76d670e1d55cc89cc4d9d879021cd76d19e9c2dce625 SHA512 eb727fe0b718f7120fc07d736ad7628dc88da9a267c04f49a30bb4b189d328b6abea4b311c0337f6104f31f400e1603751b48914f973267f136a4d9c64a1d9c3
+EBUILD plasma-workspace-5.13.5-r1.ebuild 4762 BLAKE2B 64751a7ddd68056836ca5a11a608e28ee9a4550f966304450b8818f04093cfc46c1f96805d5b762dde3231cddf6af3127c6b65f32ad1d5a9eeab35d196bf0ec2 SHA512 3e2a1c7a6ffa2203e2008c1240f0060eaf85da509d0fa32dace6587d36b32f14637317b4579d1f37a4d210a1f8028b65a29e4673de991b307e78eaede54df32a
+EBUILD plasma-workspace-5.14.1.ebuild 4697 BLAKE2B e7c0021cef1bba71efe7a9508eb7ef41a63feba69035bd86ac1f48f7eab0f809da7ec0ac0a42a12de207c776a04ba1977f9b0af2352c74881deca3b67047a9e7 SHA512 52a717c70d3e081bb215f7e2834396ee8f13cd123e0344b700a646058a7d6b3b5bf4f60f386cb624b4a0ec8072efce483ba78416ab1a8b109b0eb5415a9f1446
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.5.ebuild
deleted file mode 100644
index dc44f14bff6f..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.5.ebuild
+++ /dev/null
@@ -1,171 +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 qmake-utils
-
-DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(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 kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kjsembed)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	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? ( $(add_frameworks_dep kholidays) )
-	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
-	gps? ( sci-geosciences/gpsd )
-	prison? ( $(add_frameworks_dep prison) )
-	qalculate? ( sci-libs/libqalculate:= )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesu)
-	$(add_kdeapps_dep kio-extras)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep plasma-integration)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtpaths)
-	$(add_qt_dep qtquickcontrols '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
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
-	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package prison KF5Prison)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/10-agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/10-agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
index eed111285bb9..2ffee171d828 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
 
 REQUIRED_USE="gps? ( geolocation )"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.1.ebuild
new file mode 100644
index 000000000000..50fc485bdff2
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(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 kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kjsembed)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep libksysguard)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui 'jpeg')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	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? ( $(add_frameworks_dep kholidays) )
+	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+	gps? ( sci-geosciences/gpsd )
+	prison? ( $(add_frameworks_dep prison) )
+	qalculate? ( sci-libs/libqalculate:= )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdesu)
+	$(add_kdeapps_dep kio-extras)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep milou)
+	$(add_plasma_dep plasma-integration)
+	$(add_qt_dep qdbus)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtpaths)
+	$(add_qt_dep qtquickcontrols '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
+"
+PDEPEND="
+	$(add_plasma_dep kde-cli-tools)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
+	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package calendar KF5Holidays)
+		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake-utils_use_find_package prison KF5Prison)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	# startup and shutdown scripts
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/10-agent-startup.sh"
+
+	insinto /etc/plasma/shutdown
+	doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+	kde5_pkg_postinst
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 5197b786757b..85563704917a 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.7.tar.xz 39500 BLAKE2B eb7d9e8ac77b936c9cdd522fe48edf8538b23227f1d01fd715bce7e8c35eeeb8cd1e80215ac2c58f9268bf3516c7e7a0d05a39f082e3819dae83583d134ed754 SHA512 9b1e0456794b26c7630d88f3c6e568c8e13d77bfc70c89bd6631db51f06d82c6a8508a587290400f5be0ba96a5c78c92a9a0cabea40b201283fb8dc6ae2d45e5
 DIST plymouth-kcm-5.13.5.tar.xz 39612 BLAKE2B 7b47ac2c6eccbd423180110b70ee2bd4f68da541ac6538e7ae8c2adbce2d0ceb1170abe6c35a8ee3b15f5c974879364f1249b57c626b9a1be5c76b0a0941fc5e SHA512 4f97e85782454a80d9e08ed472d26b6e25ba4681b44a9a1abb3664a52a1cb11c43dd35f043ed3dfd289becfcccd42ca45be354498b2128d3f2d28fed557854a0
-EBUILD plymouth-kcm-5.12.5.ebuild 796 BLAKE2B 589a5ec6877dc910559b491081dda3c8a2fed924f60b775c248b1e4f6c354ee18790d5bcbd0e2ec30651d567574d8ddb21bbee870efba1d33a53df8f88e7dcc9 SHA512 106d4743791473dc7ef56d39a4a9028e693d83a51018da96d9a8f6846a2929ede3f5403254635e48d252d387fdaa8b62f264ebb4bf97b29bf374738c28567a1e
+DIST plymouth-kcm-5.14.1.tar.xz 39484 BLAKE2B 6267d842fc6206c9c4f2bda96f2492a548eeab4a3b8889441b3d1de667901b4a79a20d9c32928852b30430a4c731f8f1398eb0b4f60a385a7207c0423ade8e18 SHA512 0423c85aa26299afd2087c42c2d26ad2c28ea18bcadf89bf4c4a27abf313b1a6682453694a9593f4f4a1b407281e104ae0c355f622f0e7d9e04803d1f89ea538
 EBUILD plymouth-kcm-5.12.7.ebuild 795 BLAKE2B db3593eb2d5ca72d5a5899a9aa0679e6c66ccc47a8b1a3082414670fa09a4bcd590b629de1091ff125c587fb1b5d6d189b80f7df7f78eccdc0b74e5df7c85a2a SHA512 ffe3a65f9ac30cd8b4bd322db4e3f40e39a235cdf34911a2b5c21d0e2256db003977030b1bc3a7a2442eba7fe43661cf07aa18e3297366aec9a08be535a2f578
-EBUILD plymouth-kcm-5.13.5.ebuild 798 BLAKE2B 57bda54427164cafa92240014189f901650e01abf7ecc073f35af00b88fb1c6233192400e57e47bc293ed36983c5a541cdea5cb25b68521e4a0aa3b981935bd9 SHA512 8d58ab3c4dac137e9cf64326a0ad4481bf5f9e03c27b13d9cbe0cdff24f1b37fdf6363f70ece1f058c585b894acdeeedc8a9457611d795d870fd40435bcde10f
+EBUILD plymouth-kcm-5.13.5.ebuild 793 BLAKE2B e7cb7e051691e704a791840619bb39a76b44e96a49e2a9939e6364dd6b8b519070b8a9be5e6cc43d8887233e09db8ce2ffa9a6c4b479c3528af924ab24c0e046 SHA512 42b399b00bd2e0dafc6660d46f3ce736ca2718075626fa7a0d84fca656da4a5a3b13f9df55b5b6289c990da35bff1b0de88999e095783b9c873f7254db12aa25
+EBUILD plymouth-kcm-5.14.1.ebuild 795 BLAKE2B db3593eb2d5ca72d5a5899a9aa0679e6c66ccc47a8b1a3082414670fa09a4bcd590b629de1091ff125c587fb1b5d6d189b80f7df7f78eccdc0b74e5df7c85a2a SHA512 ffe3a65f9ac30cd8b4bd322db4e3f40e39a235cdf34911a2b5c21d0e2256db003977030b1bc3a7a2442eba7fe43661cf07aa18e3297366aec9a08be535a2f578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.5.ebuild
deleted file mode 100644
index 50b8077c8776..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.5.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
-
-BOGUS=1
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtwidgets)
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.13.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.13.5.ebuild
index b22a94e9b199..34b47920ae2b 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.13.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Plasma control module for Plymouth"
 HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.1.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.1.ebuild
new file mode 100644
index 000000000000..706f828d0e4b
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BOGUS=1
+inherit kde5
+
+DESCRIPTION="KDE Plasma control module for Plymouth"
+HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtwidgets)
+	sys-boot/plymouth
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index cb965afac704..6205756cb86b 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.7.tar.xz 42280 BLAKE2B 99dcda17826ace1099508f7a1a28a7196c3ae5b7e46f082083102f7c1bca765ced37685db9ff0172d313ccdac778c3b0960e098c2922dc204786870eea925f2a SHA512 76fe764b3f0c9b1c1447ca0fe6d594fe19475c0294c0cc655cfc72957559e84d5805e20cb1901cc42bf67385b4aadc7e69f57feb6f2e52aa89f7872d30b7bc93
 DIST polkit-kde-agent-1-5.13.5.tar.xz 42916 BLAKE2B 7ce6b938fe5acba332b565eabc67eef337ba74e6c393768c64cb09288c0273fb8940fe6de1ae0126881e781449e9b8ac24cc8062a1442c77cd8172894568f9ac SHA512 a66c410bf55d64088287de4b29fdc4ee8e41e283df3bd9e49b2403c54a6433d3d4638f7902374b8d2d5e3c0bf6add42c55b80ccc53bf886df3cbda4613902955
-EBUILD polkit-kde-agent-5.12.5.ebuild 719 BLAKE2B e879a3556ff23140c9e997264e5ee347a2ba22fca5ac59eee68ed1e84759edb09465ee4f28d4a9d0a6ac9cb6d6427bffab5767f7594f9f8e09c99854d24e2992 SHA512 558547980ad45e24b1e557bf807484ba05b41f9c3131510f322696d55e3cc6f0a756f84fd63f768c42025342731b10a1d5798c307ae27f9403dd28868a1d00f2
+DIST polkit-kde-agent-1-5.14.1.tar.xz 42632 BLAKE2B ace405e53b1fa50908c293fd8423c46f514ad2fdeb5b3c7a0e690331d32ed17517d5683c79efbecf79caf0f922209e44298f44f69c2c1d6df36beb516dcd5d19 SHA512 259c62ce8b4785eb9cc764de1a28c4571ce6adf53219ef7740bb84e132a78b71bfa6466d5f8242a375723686f4946daf09849582e75db96b8dfd5d1000d7777b
 EBUILD polkit-kde-agent-5.12.7.ebuild 718 BLAKE2B 63dd1d5081f35993a1442ae960a58aacb27d9bb58deb324881963017aeb671680ce6f352ca6a3de7c2e55c1757d945dd7c47e23cb76b80db4cd8e4816ffd8f77 SHA512 6aef96dc797b6b80a451965cc80cd198b073663b21e244e5bec78ce46c15a04b7c33cf1d755e542ebef9ae1d2537e2bfe59c2dec221329e7b14c645356ad974d
-EBUILD polkit-kde-agent-5.13.5.ebuild 721 BLAKE2B 24ea1a19dd4d1dce29e67fe934e4e4e9db207f2fe7dbb4051d0a077d6e69e4bb01b80f20e5227bbf717df8a6417170d54c3a3b02f995c504955620c75a2685a7 SHA512 b842c139b0ea485d20b0a3f49d2a89814f08699a0715e8e70674db428b83f131dc9638d5c7369f5f26363fb8d9885130af16bbd5de67c4456f5dfc623413b096
+EBUILD polkit-kde-agent-5.13.5.ebuild 716 BLAKE2B 175e6017de9f3916f115a6d5efdf0fe8d7d34b7d59bbd6bd5aca4080019b8badb93068163539fb11431d3296334b667ec4ae6faaaf3ec8ff57c730dc137299b7 SHA512 4aaac34629da6450b1ff0b224b56d3cc67c04f84f3b9052b2c391088892e8a9015526fba36e136bf43dba3e966d3697178f2290f75c26d36b4904519c88d45c7
+EBUILD polkit-kde-agent-5.14.1.ebuild 718 BLAKE2B 63dd1d5081f35993a1442ae960a58aacb27d9bb58deb324881963017aeb671680ce6f352ca6a3de7c2e55c1757d945dd7c47e23cb76b80db4cd8e4816ffd8f77 SHA512 6aef96dc797b6b80a451965cc80cd198b073663b21e244e5bec78ce46c15a04b7c33cf1d755e542ebef9ae1d2537e2bfe59c2dec221329e7b14c645356ad974d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.5.ebuild
deleted file mode 100644
index e324bf4c42d2..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.5.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
-
-KMNAME="${PN}-1"
-inherit kde5
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://www.kde.org"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	!sys-auth/polkit-kde-agent:4[-minimal(-)]
-	!sys-auth/polkit-kde-agent:5
-"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.5.ebuild
index d1b6abb46a4e..d88c1e9c3d59 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="PolKit agent module for KDE Plasma"
 HOMEPAGE="https://www.kde.org"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.1.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.1.ebuild
new file mode 100644
index 000000000000..82a821b2fd12
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="${PN}-1"
+inherit kde5
+
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://www.kde.org"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	!sys-auth/polkit-kde-agent:4[-minimal(-)]
+	!sys-auth/polkit-kde-agent:5
+"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index df97e167cc88..46b5c3b996b5 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.7.tar.xz 537708 BLAKE2B f5d85d191b740e11acf718886001ebda997fe1196f53813099a18a35cd4d17f1061269354035296ce8cf5aecfe20181b017f2c97165368a729ee3f6a53908c16 SHA512 e85f93f494d2ce86676269c1bfe49d59a855bbcd5f260bc3205e3b2ef38de5dd17ee47397eca3280e9dcb484c80b79c670a1b2e089891d5090e9ee935504d4c9
 DIST powerdevil-5.13.5.tar.xz 597764 BLAKE2B 910422fb97a732f640800dd786566ab4029fca7b4dabae776ed4fa0fe85eaeb81338f6421607af113fcf509a831170061b92c1352af5fc24d87ca8640dc4a0f1 SHA512 d2ac3196b80297da62872f6078dc65ebaca7805cff3a0325c45127d6e19d4d54f305e5a6b190e03414c2a189bb236bb8e04353fe5403ea38e54077fc7dd2e167
-EBUILD powerdevil-5.12.5.ebuild 1702 BLAKE2B 63d2e9474b231d3d923bb58414dec3f048fc8461764ae4b891e570c3084618f9eecc9993afa22864d757672cba2c902f7babee535309efa2bd53451f8301f2b8 SHA512 ac8dd6ef3412e85e12eb83be8c1767b1e52511a60207dd26deca1e0eac91366e9ec86a724d83d0d80d36f3dc510e893d22c469ad52c172397fee1577075c5fa7
+DIST powerdevil-5.14.1.tar.xz 599704 BLAKE2B 5397899b5c43182c0749bc3650bf946dc32a3a103980b7a8a10f0d87fdea1f2bebb41ec2f604698f7f80922b36663b92b487f440b43256707e214dc8a62e7afd SHA512 02f1988b5f4b3e9269e78829a0a3544b9d8cd0984eed07ff2c602d7a406a6375378b65b4c34d05057fad4c87f5fa2b535732010d8468d3dc470154b4153e624c
 EBUILD powerdevil-5.12.7.ebuild 1701 BLAKE2B 2e990e54c6e3a968d9fd7ccfa11fb1663bcdceb974645166cc89f25bd665fcdb3b21102bc03732bf063854aeb2e9ab30ceb8289c55f2aeb857678cc0fa8e264f SHA512 567df997a25dcec626ba2f575ff996ffc24c501afe0aeaa6bdc6d073c2ef5d47783c98723473ca1a4f3b5de46d99bb7cfed47328da2b93159b0a5890c7a84360
-EBUILD powerdevil-5.13.5.ebuild 1749 BLAKE2B 7d5fffed08896b29781564e5869d2d85f74b6a367e1f720b2293d076d60e3df2f60dae32b28d528204f98ebb5f9cecf9b5e537621bc9e6ea665595f5cbb97bf4 SHA512 37e294a91d51ccb8908ecacbd74ecbe43fe29af3d1b0d226eeaebc2e7fb1d3e2170f4df3e22f5e956329b7549810a1adce852d43d63b94e043b3afcbb78fb039
+EBUILD powerdevil-5.13.5.ebuild 1744 BLAKE2B e57de2c4575e72e82422bed232d643ab3d0a0cabdeb51f24e3fa2a7119fc0f5697ee381f1d4120aab06f654bc0568d49d41294908b497cee3107ca3a7410c68d SHA512 207a9e80bd9615b25fb59d35539f8ef6d738666b8919135d89c62f94d6c940f834ff56841f7bfe0b7382565692d6d90a3314ac0c25af5c04fc43d4b059ddc559
+EBUILD powerdevil-5.14.1.ebuild 1746 BLAKE2B 2ff995c790ceb7c2e0c1f1aa01e35206055a2241902265a3e5910f8603a8fae6ba93835d8c90547f5225f2a4aa39afc6ba5b571954d1a4a093264da60f283bb2 SHA512 013c7df4da3965f09e8123ca959b1cddef25a80b398b988d920675f7dc9e9993b005db45cc4896c5478c3ec1ce1c06ce7a46a7a787312a526d0f8169984a8f93
 MISC metadata.xml 642 BLAKE2B 51a6b9a3c4cd0040241ac6be1b9669d7b7b77bda831ddec18380fb4f2b1af4072d0ede8281d3b05da41a6744db95b588dde3efccd4b339e289aee053645231c1 SHA512 870a09abe650b373cd7a4050308fbcc83da772acaf615c36232701fe53835f8bf9d4d092259da42417f97387ed2b37f19d4f4fffbec31087dfa7188bb8bb7056
diff --git a/kde-plasma/powerdevil/powerdevil-5.12.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.12.5.ebuild
deleted file mode 100644
index 0812677c5f47..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.12.5.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
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://cgit.kde.org/powerdevil.git"
-KEYWORDS="amd64 ~arm x86"
-IUSE="consolekit +wireless"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth policykit)
-	$(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 kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	virtual/libudev:=
-	x11-libs/libxcb
-	wireless? (
-		$(add_frameworks_dep bluez-qt)
-		$(add_frameworks_dep networkmanager-qt)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	>=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]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_DDCUTIL=OFF
-		$(cmake-utils_use_find_package wireless KF5BluezQt)
-		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.13.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.13.5.ebuild
index 6e4e8693a80b..851aaef20a9c 100644
--- a/kde-plasma/powerdevil/powerdevil-5.13.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Power management for KDE Plasma Shell"
 HOMEPAGE="https://cgit.kde.org/powerdevil.git"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="brightness-control consolekit +wireless"
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/powerdevil-5.14.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.14.1.ebuild
new file mode 100644
index 000000000000..a0f05eeca972
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.14.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://cgit.kde.org/powerdevil.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="brightness-control consolekit +wireless"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth policykit)
+	$(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 kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil )
+	wireless? (
+		$(add_frameworks_dep bluez-qt)
+		$(add_frameworks_dep networkmanager-qt)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	>=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]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DDCUTIL=$(usex brightness-control)
+		$(cmake-utils_use_find_package wireless KF5BluezQt)
+		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 300015cd3a0a..e383db63f1e7 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.7.tar.xz 60712 BLAKE2B e6c82d0b43c7038b4c6733e0883974993f338e6b94b2c1b9d4eeda051d48c72e31ced992fda32ba2e772b496fac0bca76b62850020f3fa222e4540d96c1a5eef SHA512 29d7b03378a6d5a3d58a0c2b85f6dbe4d0114785456072f16872cd09e7ce355f4e59149e31cb69fe7fbb35678c6fc075c788a091c3b638661a64a856aa4a145b
 DIST sddm-kcm-5.13.5.tar.xz 60560 BLAKE2B 8a335f49471fc4f763247b1f207eb15eb0d30ca1268dd5fa855301f2cd691319859dc1291c0156ed8053a8910eebea24d8f1f47a270a9106e8ae57fe6959b64f SHA512 b535efa9115bf6c8ce9351f89e09b90f445fb5cbbd931a68af8f7f09633af87f2ffe4545eab53778012c2e45a8214f11383b4e41c5e92724a171e1ab1843c479
-EBUILD sddm-kcm-5.12.5.ebuild 903 BLAKE2B 4d6baf95830ff57b93ab0850cbf15c657ca4636f282dfbbda5b8c6865beccea8bde071100b483ffa7380b63c79be02c77fa859eed76b88298855fc7944db90a8 SHA512 154faf670b577a4af410a3c4dbc5efee5e6cc5ebb02d2dd77b140434fb0d01f4b0fb9440335ea107ca1f46f3ebccec6d9c0622c5f371e0a5bbf7bb97ad1d395b
+DIST sddm-kcm-5.14.1.tar.xz 60960 BLAKE2B 12da275c1a8a4e230a05ae25cf6378faada42c3af6190c99a73acb19874b274c296fb257bdf029160ce57642735cce0ec5e8062b937066f22e03626e5d582156 SHA512 01967f79ce1e25112eba7c71f8428dbf873e89199049835c9b703c13955962e79ec30cbe079e56525fe2a8a22917c641aeee9b308101ad0fc77cf1a84301cb30
 EBUILD sddm-kcm-5.12.7.ebuild 902 BLAKE2B 1d6711b71cf60cdddc3d0526c50a62074030faf5af9b46b723e1636214ea2542ff3d21346f8147842e6e6e3d7bec66a54b541ddc8d8945fa518ad455eae36b74 SHA512 7a8fe09bfd1c865ca5836f3269a6e0a6b48c31d0c49aa7d97243996832ec1980e4e3ce59e2c5f102b5bc41c1df161a480ed321721360485ffc4481fe82b9531e
-EBUILD sddm-kcm-5.13.5.ebuild 905 BLAKE2B fc09dea6d864f6058e4d1f3716816141ecb430e419856e8bb4b35a5c77518157aa41988f9f504aa3e45db03382c157aae443b249567dcfd7bb669b0970a717b2 SHA512 68e1f97fa3f3b80f70d1d514ed4cde4461c10b9a2bc5146506cb9177ddcda25fd048e1a36d16466706ba66fbdc857dc185f9342a3c497791d1f657f3384b120f
+EBUILD sddm-kcm-5.13.5.ebuild 900 BLAKE2B d4d51baed84e1dfec66c30b925b1543341c91ae37afd0952056f9aeef46eb3c7a6817396a77db40d2722c986edc6adf1496910ef83323da8e153c1eaa15e0456 SHA512 cb4409d69fd8582e0af5bb35129fddcdb3915cde289cad4ff149902ceb725d8656fec351609eb634955ef2e97728f2776b60ffd9ab0a2b765fb6ddb2ac385b20
+EBUILD sddm-kcm-5.14.1.ebuild 902 BLAKE2B 1d6711b71cf60cdddc3d0526c50a62074030faf5af9b46b723e1636214ea2542ff3d21346f8147842e6e6e3d7bec66a54b541ddc8d8945fa518ad455eae36b74 SHA512 7a8fe09bfd1c865ca5836f3269a6e0a6b48c31d0c49aa7d97243996832ec1980e4e3ce59e2c5f102b5bc41c1df161a480ed321721360485ffc4481fe82b9531e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.12.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.12.5.ebuild
deleted file mode 100644
index b05ac72c1594..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.12.5.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
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXcursor
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXfixes
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	x11-misc/sddm
-	!kde-misc/sddm-kcm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.13.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.13.5.ebuild
index f2bab93c9538..7e98e6e95434 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.13.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Plasma control module for SDDM"
 HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.14.1.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.14.1.ebuild
new file mode 100644
index 000000000000..f9f397cf9666
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.14.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+	x11-libs/libXcursor
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXfixes
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	x11-misc/sddm
+	!kde-misc/sddm-kcm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 48fc427bf688..e019e34254ea 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.7.tar.xz 178812 BLAKE2B bc2b1679e4b52cc558e0f08265e9514a6e130c2f32fb9f2af2faaeda5daa135095a2afe0f7342090ba375b8f2209ea1cbabc6c6279d3c4b899cf7b3428788757 SHA512 cc8f5cdd2275816f1e7c6af2b5d06a018a35646460a71ce6ec7ab7dda7d286139836b3625239cb45316f2f7dd1f12d260ffdb44064b349948d93929654363735
 DIST systemsettings-5.13.5.tar.xz 179436 BLAKE2B fcbb0983bae9bd29a2e11bfa0083eea6b1275853985c8210d953041d0d82b8bb89af7400dff98fe79092c3b4b6ec03477815206bd153537a53d616501766d0c7 SHA512 cbe254dfff2d9637626586ad4df5da581f01acc16b24883269cc4c11a1ddd6d9dd3fb3e45680729f3b1197ddc30e185f7a2fdb2199f9f696e8eb6ea72ea88d79
-EBUILD systemsettings-5.12.5.ebuild 1318 BLAKE2B 1ec8de344bf654c495b567df6d77d7a8c66cdcfb318893d32b5877535fd21ac7faa2ba5b4e77bd03fe8f3f98bc206ac58a826811035e7974183307345625f49b SHA512 02da22d75b85f23e84646fb0372b331f12f5ca379baf55579d3a4905ed61a0e096f375d7195990e5d07062471ffeb8ddf5fd0936e433eaf68afc359ea203bbde
+DIST systemsettings-5.14.1.tar.xz 179212 BLAKE2B 9298e8573b3744efd6648f389af0180429d075c757092cb4b732585580dbc681b721fcffa223b5b517eeb5ed2c285ab9b159780092f5dc5303f1f8d7c82fe8be SHA512 60f4ddcaea38df8bd7f0a1aca77419f3ea6203d4b5b272241c35b522f5666c487b637e0b13fccdfe44f1058868f950234cee7eaeec636f860e1cc8eb9be13f85
 EBUILD systemsettings-5.12.7.ebuild 1317 BLAKE2B 7e1f31db497b836abaa1b26433aba40e64378d5ebfa7343087ef3a9f8a6ecb919f561059351e4cf2ae1d619c4d44c6f90fe6e51b8b9a45f26e3ecb350865c523 SHA512 9ff18a55922e13d449262b08ba5fec59159867119de67d8f7b3ed4fba66dc28e57aecd5e1672562bcc0c04def6d6a78d26b138ad55bac301302ab8d3e8fa4362
-EBUILD systemsettings-5.13.5.ebuild 1356 BLAKE2B 37a5abfe0604abf74b74d8943d3067f4a76138fb91f5ce2adfab5966d7411401d4c7a47c2b2941218f9b87937f95a9802652a670e0d1c2b19c206af12fb1fae2 SHA512 3e63744ad07a320cf45635c515c240da59adb93acd049fb2213413cdd2bb86f3ecfbfbc737883bb245f203243e0a03c6abee7a86909c2f563f832b1c90cbc3c8
+EBUILD systemsettings-5.13.5.ebuild 1351 BLAKE2B 4035e270b77b2766b61cb811dcce8f08a0bdb60238858826e66e30790276df70671f390a44f38ac75efe7e4c1c68be1775379b2962dd4e89f702dde30882b290 SHA512 dbc263e39fbf7d5a0ecaf46a2da1efd42684a740747b37cb8b4cf0801674e1745cc2042d367e40d3cb043d441c22150891a82770e8dc88a47368be2dad6f6665
+EBUILD systemsettings-5.14.1.ebuild 1353 BLAKE2B 1dc1a687c888ede4ff53300c4b07c33e9c343b7b689d4109adf1f43e32c05b88e65024ac1ae31b1a3c67e1d7680ea907c033db58846b70b0b6fd19347e17acb3 SHA512 a36c077b05dbfac042207e0fad082121e5d65d1e0fdbac00868af09a272dfff331f02a60097cf5c9df6f48957901c4c845274c772328d2f7986061136d659014
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.12.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.12.5.ebuild
deleted file mode 100644
index 9636f4259d08..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.12.5.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="System settings utility"
-KEYWORDS="amd64 ~arm x86"
-IUSE="classic gtk"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kauth)
-	$(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 kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	classic? ( $(add_frameworks_dep khtml) )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/systemsettings:4
-	$(add_frameworks_dep kirigami)
-	gtk? ( $(add_plasma_dep kde-gtk-config) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package classic KF5KHtml)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.13.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.13.5.ebuild
index 92404003beb2..dbc5f5ef932f 100644
--- a/kde-plasma/systemsettings/systemsettings-5.13.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="System settings utility"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="classic gtk"
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/systemsettings-5.14.1.ebuild b/kde-plasma/systemsettings/systemsettings-5.14.1.ebuild
new file mode 100644
index 000000000000..c1a6f3545cbf
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.14.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="System settings utility"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="classic gtk"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep kauth)
+	$(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 kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	classic? ( $(add_frameworks_dep khtml) )
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/systemsettings:4
+	$(add_frameworks_dep kirigami)
+	gtk? ( $(add_plasma_dep kde-gtk-config) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package classic KF5KHtml)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index c24bd9aa7a5f..78695d9e4c83 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,8 +1,7 @@
-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.7.tar.xz 545748 BLAKE2B 3cf734475de842f3fce0a7760495336dd14f21fd2bea72ebf24992e29a7051bd2c2d2235582d8fa4b3a13f9e2852452fc56f2b1931da78fc231065c5ab445fc6 SHA512 286b4adc7ff01c25f1f32bc64e9f119aa693d74e0468e575c792d5357df6066c18de233eb78acd5ed4288518902461ffa7408af8d559e8b5f4081893bdec7f8f
 DIST user-manager-5.13.5.tar.xz 545008 BLAKE2B 47a2e5cf4e2ee26f7337ab89716519ab248422b686be1acaf75306d44044bdbd931b4d032057a10a243fa12e237cc1dae5aaaeba57012b7e09d048c5ec0a1ca2 SHA512 e18902843b7b6079ad712996cc90850c2e662c710b67e1d54dbec7db9194b1c7c640b6ced0bdf51c1f0974ba24edbff691cad347689e202e4478681a194e5172
-EBUILD user-manager-5.12.5-r1.ebuild 728 BLAKE2B 2e699e57889c2585febcea22bfb5c340962dc58ef5ca0af9b8ea5b19d17b3319bce2bb0eb2177d6aada3b7bc21c134a051f09c1a1de80932831c788c5c5adfb3 SHA512 35d5158acde94e6277c18eb3f022b074eb4835f33e119ce63cfd435129cd17014afe673b02a41b3ebab102908cbfa2c29857e9e63733aa75ca2d3ee81360453d
-EBUILD user-manager-5.12.7.ebuild 667 BLAKE2B db3b77457a64a8f3f505899de3847cb67af86f709a4ba8c60dd0765213e098e46cbf200e77cf5de670efc8dffde5283e1eaa7123e0b82657bc15210fc816c6b4 SHA512 8b45bf3cb0c871948f60cbc2f29d79d7b2db897e5ecbcd684dec62a63b7e05b05270578e3abce4db77186e3f180b5b24ef0587812a5fb0f719bfb9c071e9ea37
-EBUILD user-manager-5.13.5.ebuild 670 BLAKE2B 1aafa076398b02922fadbe55f44967398971d0e868f48cb5eae1ccc8ef92a9d4297ea5ad989989cf950acb546af80d35f4d44d3172f88ce1f276009d3402ebf0 SHA512 51ec1c8eb1ec9c686a9be09066524500813f8794c5fe61c8bb95f32e53f69d9426f328b7ccde22e7027fe3ea3591604d2b10b87752560293085aee08bb78ecd0
+DIST user-manager-5.14.1.tar.xz 546200 BLAKE2B 25719d67396211633fa2266755f8ac9b9c09da45e29b6e969676baf577962cb7787f9e724977113a11dc5319ea94d8e867f703991784aa0b15b32a5a478ffe3f SHA512 6687ec4c7dd56e15b4b7dcdc8d9545310af6381f6ccb7e2eb2302adc09563286c0697c4d23e2013262ce143e5e88f2ef37dc12cd7ab8634918acc3eccd22549c
+EBUILD user-manager-5.12.7-r1.ebuild 694 BLAKE2B cef454ae8c7eb463fe520f948942285a3b70975a52b8998161dc909a5a06c74f39934f61af6d3f281a336d6ed2dd6bec518b73a4cc924ecd7c084ab45175514f SHA512 9695f473e4edd249011aab1bbfbb5408dc7dca38aa976ec0336d58d762bc857abcf943effda7161860346e2662cd4e03d7dec4ffb3f5cf60a7ad803952df18ae
+EBUILD user-manager-5.13.5-r1.ebuild 692 BLAKE2B 0a36109e441fc42c07a4046b08afc65a25db0f2b2f47c62b3b4a87ab15d412818ce18777d36adfa1498b99fd83f9461f1ad467b4aeb692f1f7206ff539786b74 SHA512 9926be5b944b20a4cc7a04ac9a39e0788b1a17cfeee0efe4d6d7eb0b1a803ea90292b5f58a0b5c29b4dc1b795828f548e0eb43a7a117322fca4da5c7313aa895
+EBUILD user-manager-5.14.1.ebuild 694 BLAKE2B cef454ae8c7eb463fe520f948942285a3b70975a52b8998161dc909a5a06c74f39934f61af6d3f281a336d6ed2dd6bec518b73a4cc924ecd7c084ab45175514f SHA512 9695f473e4edd249011aab1bbfbb5408dc7dca38aa976ec0336d58d762bc857abcf943effda7161860346e2662cd4e03d7dec4ffb3f5cf60a7ad803952df18ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch b/kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch
deleted file mode 100644
index bc823adf8c9d..000000000000
--- a/kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From ff88e24e4380a341f70f9b005acbce2ae9afa60a Mon Sep 17 00:00:00 2001
-From: Valeriy Malov <jazzvoid@gmail.com>
-Date: Sat, 12 May 2018 18:13:25 +0300
-Subject: Split replaceAccount from addAccountToCache
-
-Summary:
-We were accidentally overwriting first account in the model with
-currently logged in user after polling AccountsService
-
-BUG: 336994
-
-Test Plan: check if kcmshell5 user_manager lists mutliple users on cold boot
-
-Reviewers: #plasma, davidedmundson
-
-Reviewed By: #plasma, davidedmundson
-
-Subscribers: davidedmundson, ngraham, rdieter, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D12837
----
- src/lib/accountmodel.cpp | 26 ++++++++++++++++----------
- src/lib/accountmodel.h   |  1 +
- 2 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/src/lib/accountmodel.cpp b/src/lib/accountmodel.cpp
-index 8ebc4ff..8258810 100644
---- a/src/lib/accountmodel.cpp
-+++ b/src/lib/accountmodel.cpp
-@@ -93,8 +93,8 @@ AccountModel::AccountModel(QObject* parent)
-         addAccount(path.path());
-     }
- 
--    //Adding fake "new user" directly into cache
--    addAccountToCache("new-user", 0);
-+    // Adding fake "new user" directly into cache
-+    addAccountToCache("new-user", nullptr);
- 
-     m_kEmailSettings.setProfile(m_kEmailSettings.defaultProfileName());
- 
-@@ -368,11 +368,7 @@ void AccountModel::addAccount(const QString& path)
- void AccountModel::addAccountToCache(const QString& path, Account* acc, int pos)
- {
-     if (pos > -1) {
--        if (m_userPath.count() > 0) {
--            m_userPath.replace(pos, path);
--        } else {
--            m_userPath.insert(pos, path);
--        }
-+        m_userPath.insert(pos, path);
-     } else {
-         m_userPath.append(path);
-     }
-@@ -381,6 +377,16 @@ void AccountModel::addAccountToCache(const QString& path, Account* acc, int pos)
-     m_loggedAccounts[path] = false;
- }
- 
-+void AccountModel::replaceAccount(const QString &path, OrgFreedesktopAccountsUserInterface *acc, int pos)
-+{
-+    if (pos >= m_userPath.size() || pos < 0) {
-+        return;
-+    }
-+    m_userPath.replace(pos, path);
-+
-+    m_users.insert(path, acc);
-+    m_loggedAccounts[path] = false;
-+}
- 
- void AccountModel::removeAccount(const QString& path)
- {
-@@ -429,13 +435,13 @@ void AccountModel::UserAdded(const QDBusObjectPath& dbusPath)
-     }
-     connect(acc, SIGNAL(Changed()), SLOT(Changed()));
- 
--    //First, we modify "new-user" to become the new created user
-+    // First, we modify "new-user" to become the new created user
-     int row = rowCount();
--    addAccountToCache(path, acc, row - 1);
-+    replaceAccount(path, acc, row - 1);
-     QModelIndex changedIndex = index(row - 1, 0);
-     emit dataChanged(changedIndex, changedIndex);
- 
--    //Then we add new-user again.
-+    // Then we add new-user again.
-     beginInsertRows(QModelIndex(), row, row);
-     addAccountToCache("new-user", 0);
-     endInsertRows();
-diff --git a/src/lib/accountmodel.h b/src/lib/accountmodel.h
-index b666239..f515613 100644
---- a/src/lib/accountmodel.h
-+++ b/src/lib/accountmodel.h
-@@ -79,6 +79,7 @@ class AccountModel : public QAbstractListModel
-         const QString accountPathForUid(uint uid) const;
-         void addAccount(const QString &path);
-         void addAccountToCache(const QString &path, OrgFreedesktopAccountsUserInterface *acc, int pos = -1);
-+        void replaceAccount(const QString &path, OrgFreedesktopAccountsUserInterface *acc, int pos);
-         void removeAccount(const QString &path);
-         bool checkForErrors(QDBusPendingReply <void> reply) const;
-         QString cryptPassword(const QString &password) const;
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/user-manager/user-manager-5.12.5-r1.ebuild b/kde-plasma/user-manager/user-manager-5.12.5-r1.ebuild
deleted file mode 100644
index 203763e4f75f..000000000000
--- a/kde-plasma/user-manager/user-manager-5.12.5-r1.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="Simple system settings module to manage the users of your system"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(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 kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-addAccountToCache.patch" )
diff --git a/kde-plasma/user-manager/user-manager-5.12.7-r1.ebuild b/kde-plasma/user-manager/user-manager-5.12.7-r1.ebuild
new file mode 100644
index 000000000000..69e0ce78d83e
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.12.7-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(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 kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/libpwquality-1.3.0
+"
+RDEPEND="${DEPEND}
+	sys-apps/accountsservice
+"
diff --git a/kde-plasma/user-manager/user-manager-5.12.7.ebuild b/kde-plasma/user-manager/user-manager-5.12.7.ebuild
deleted file mode 100644
index 5e6e28a35fff..000000000000
--- a/kde-plasma/user-manager/user-manager-5.12.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(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 kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/user-manager/user-manager-5.13.5-r1.ebuild b/kde-plasma/user-manager/user-manager-5.13.5-r1.ebuild
new file mode 100644
index 000000000000..c20416d347cb
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.13.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(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 kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/libpwquality-1.3.0
+"
+RDEPEND="${DEPEND}
+	sys-apps/accountsservice
+"
diff --git a/kde-plasma/user-manager/user-manager-5.13.5.ebuild b/kde-plasma/user-manager/user-manager-5.13.5.ebuild
deleted file mode 100644
index 55c31690044b..000000000000
--- a/kde-plasma/user-manager/user-manager-5.13.5.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="Simple system settings module to manage the users of your system"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(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 kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/user-manager/user-manager-5.14.1.ebuild b/kde-plasma/user-manager/user-manager-5.14.1.ebuild
new file mode 100644
index 000000000000..69e0ce78d83e
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.14.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(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 kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/libpwquality-1.3.0
+"
+RDEPEND="${DEPEND}
+	sys-apps/accountsservice
+"
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index d1e0ce697420..0eee84141bb2 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/oracle-java-documentation-11 b/licenses/oracle-java-documentation-11
new file mode 100644
index 000000000000..0b8d6800fd38
--- /dev/null
+++ b/licenses/oracle-java-documentation-11
@@ -0,0 +1,49 @@
+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. PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THE AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY IT, SELECT THE "DECLINE" BUTTON AT THE BOTTOM OF THIS PAGE.
+
+Specification: JSR-384 Java SE 11 (18.9) ("Specification")
+Version: 11
+Status: Final Release
+Specification Lead: Oracle America, Inc. ("Specification Lead")
+Release: September 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/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index c28ffdccfce3..4064be5ff666 100644
--- a/lxqt-base/Manifest.gz
+++ b/lxqt-base/Manifest.gz
diff --git a/lxqt-base/liblxqt/Manifest b/lxqt-base/liblxqt/Manifest
index 31f73ecf8e5c..ad1cc1b18bc9 100644
--- a/lxqt-base/liblxqt/Manifest
+++ b/lxqt-base/liblxqt/Manifest
@@ -1,5 +1,3 @@
-DIST liblxqt-0.11.0.tar.xz 58912 BLAKE2B 1ee7064f3fe9de78890761744655c8d11834439535d64b07fec9709db955d9e70b574dbe437d1f1afa65bf7b008cb1473b99c1eda19840efa4bfae3d43fb13ab SHA512 df2aaba0c0b723975c65a063ef3c6564a60d1ac8662da443e1ff9030b1dd61bc264916e5efac272895048f7219a5cb5413e98aa12c5340b547413ad686f2c9ed
 DIST liblxqt-0.13.0.tar.xz 56896 BLAKE2B aa642fc87991c1768e391908e6444af456cca073223e4f05a2ff95eb7a04a4ab5d4c7d217424ab8d096531095d2dc767be7341b8336410ab46ce6d2e8676c686 SHA512 17d6ab8aa7475e1d2ca90b9c3d8b0a438003f740fa878b09937e0214f0139b6f69eb833e7179e981260ae67079fd70c19423d1a4948a2a18061539fb2191e9ad
-EBUILD liblxqt-0.11.0-r1.ebuild 997 BLAKE2B f0e1ba8faa0354dbffd1c8577e80d1902a260b714095066ae53e2087355747ffcaf08f2e5bd230a2dc296c6db584a1475e7287a75fbf0ee28ca2fc98c2fabd8d SHA512 331143949494e13b548ffcf1b128f719625666811fca9da25e300be8af87775f8d7b692eb08cf2c210c617dffe1eb193aa94d4b922f17e8180ac9f56d7ba9f2a
-EBUILD liblxqt-0.13.0.ebuild 930 BLAKE2B e100262408987d2498883841590f41bd11a319cb7e3e8708d074dd52368eabc71ebae6d526ff286dbade711646e3f62c44f905f9d5d64b04c16dbc2c0ef4cdfe SHA512 8c260a3fcf34efb711d7cc96e5daadf120e635c497a1fb9a29b246c9d74e08b14ee87f67f410928521b5e8b602cd9e6e62c08237ae85cf65417341c8925684ea
+EBUILD liblxqt-0.13.0.ebuild 925 BLAKE2B ce9867b032d01218b81c8e9286abffccc44e53806afe300faf52ebc68878bb05aa9c3ca25889793890381f15f5f0a53119e8b30c24b5f609e3073719583998d8 SHA512 42ecef791fc97efcb6a849f9f775deb4422e1f82cab9120105c7f1cfe3cc2e2b03c8e6b8dfd12a24921f6160efc063e41ac5e14b09fc1514d40e3b2621e00fa4
 MISC metadata.xml 313 BLAKE2B 6eee2dbe392f7cd8b5f033d718e5ef3c4d07b788a09d99d97f06ff7571153366bf9367bec44b18d8c096c9afbd8be76776623b0fcc78bc2507422e78ab197405 SHA512 e3a460c17c69d21bb39bc75a79f36154afdd3b38abe18bac568afb28b5739ffc2ffe5d33607037ae32b7d6925512eebf560562b3e157dcf1e882d3bd9deaff54
diff --git a/lxqt-base/liblxqt/liblxqt-0.11.0-r1.ebuild b/lxqt-base/liblxqt/liblxqt-0.11.0-r1.ebuild
deleted file mode 100644
index 1f4a33b9f2e7..000000000000
--- a/lxqt-base/liblxqt/liblxqt-0.11.0-r1.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
-inherit cmake-utils
-
-DESCRIPTION="Common base library for the LXQt desktop environment"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-RDEPEND=">=dev-libs/libqtxdg-1.3.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5[X]
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		tc-is-gcc && [[ $(gcc-version) < 4.8 ]] && \
-		die 'The active compiler needs to be gcc 4.8 (or newer)'
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
diff --git a/lxqt-base/liblxqt/liblxqt-0.13.0.ebuild b/lxqt-base/liblxqt/liblxqt-0.13.0.ebuild
index b1974c20be93..bddb1fc02b98 100644
--- a/lxqt-base/liblxqt/liblxqt-0.13.0.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+ BSD"
diff --git a/lxqt-base/libsysstat/Manifest b/lxqt-base/libsysstat/Manifest
index e7d39f20a6d3..62598cc2eac9 100644
--- a/lxqt-base/libsysstat/Manifest
+++ b/lxqt-base/libsysstat/Manifest
@@ -1,7 +1,3 @@
-DIST libsysstat-0.3.1.tar.xz 18884 BLAKE2B 3fd26ef8c1b36e9e5fccd722de57d5cd2349f9579aec4fa868838e09719d16483fc92fa6a2c37b38eb83b018af8c8030f95bda35b0c3073588497a2e978c851f SHA512 00413afc6363c38a0c15f5f617c47600711f06d072bc312d5e301f4bb9a8f42effa66f1fb600a4e6147ed30b48c32bee0e3879bbe411c12bef9cc8eaa20f566d
-DIST libsysstat-0.3.2.tar.xz 20344 BLAKE2B 5f3e33291328cb39682a878a158403f7ce4490d55f444b684202155f9af25265a457fa10308d4553a61b8b424beab1974a4911fecff90b4e65cea1715c1d43e1 SHA512 6676f2670b09c1f94f4d17385016e119ce69345377a31d80d4c0b65a0c9d79993ae4d80e6801c5ea40b47ce813530a2819a278243f3c350335bfddb3593befcb
 DIST libsysstat-0.4.1.tar.xz 17304 BLAKE2B 0074ef15eaa9feddaa20123bcd39f0b5da2bd9a968a22d2c1c6465fccefe81f5c01e323657c4e8c637704e8bbe77ccf561cf1322853110e378fe2f03d16deea1 SHA512 e0f6497be9a7205b6053cdae0fcd88d8b4723489ca97f1ed2cf6704cae149abc3f3339c777aca638abb054e171c6e592b5a10c129aff0a1f42083bd91ab11eb5
-EBUILD libsysstat-0.3.1.ebuild 551 BLAKE2B b8d4c0c2cd7b1d26047c370b1e234adee36eaa7b9500647fba63040838351cf36254334f551f3084d87eb37e9ab8b55a4c81a32e3ee21c470649f5c5963ba19b SHA512 e12c96714d0e1939aa229e82a0364e2d6134e02a827d45b8b77f8695c5c373ca3e3468a6347c524507ef4add866602be38c3986e6650ce21c0b7fc675ad13daf
-EBUILD libsysstat-0.3.2.ebuild 543 BLAKE2B 19a30b57e6b88b358f9a4c822d81a0fee1bf4ad16315d73fd023e88f0e0324759206445d6db3af7589c3f4bbb468eeb813b49708bb4aa985104323971becaa7e SHA512 1575f026389a6e4413c650c63ec7ea4c2664ce3964db608fcc9254675d97e1d07d81c3369ba3e6f274a29cf490ffe2d7281f0a61471f86a3ab69351e5e94abb0
-EBUILD libsysstat-0.4.1.ebuild 556 BLAKE2B 13e7a05de01bd4c97c3290e461ba3bc1300a060a78e7c2e3d5bcac0469d809a8d6750d6fa7fe4dac8707ac451c990ab429316127921dfa906f36c1e9e2949072 SHA512 2f66acb9d985bf7e8cabff2c273748e8c75cca9981b9cf233ee9b8890e2324b9c9d2c034dc4149fbf0d0eaf491218d85708024d029d0139fe90b732c706ce40f
+EBUILD libsysstat-0.4.1.ebuild 551 BLAKE2B be68641c9ce482e55cf0bf5b1a7799b2545052e361e6a33b4403187c4860a6957a89c8fc79ff736efd2c1415ed09443175b5a1b594e11294429279c7f3c8a41f SHA512 6779d8281ac21b34e19418e0095996692c405df6fd82f285a0a3b81b99843536069b058681c9da102a902cc52433e7b24cfeb4ffd56acdab18916a1edc0792e6
 MISC metadata.xml 316 BLAKE2B dc4c870d7a406c938756a0a5df097283f0d001d10b7bc9a2beb1730214405578f97faf60d9475fe7ba93b649ed33e8b1dd4bf40eec4091e405fc1eecf8b9e450 SHA512 3f9226fbc9629f0c61468c7bc142904fc2e4087a425d528def9f6432c31f3aead2f77959d49337aa3431975306e8ce3ee1d7d8e5d13ce57d20a62538fc7f4ce4
diff --git a/lxqt-base/libsysstat/libsysstat-0.3.1.ebuild b/lxqt-base/libsysstat/libsysstat-0.3.1.ebuild
deleted file mode 100644
index 99bf9e6e279f..000000000000
--- a/lxqt-base/libsysstat/libsysstat-0.3.1.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
-inherit cmake-utils
-
-DESCRIPTION="A Qt-based interface to system statistics"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	dev-qt/qtcore:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
diff --git a/lxqt-base/libsysstat/libsysstat-0.3.2.ebuild b/lxqt-base/libsysstat/libsysstat-0.3.2.ebuild
deleted file mode 100644
index 94f2c4c2459f..000000000000
--- a/lxqt-base/libsysstat/libsysstat-0.3.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
-inherit cmake-utils
-
-DESCRIPTION="A Qt-based interface to system statistics"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	dev-qt/qtcore:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
diff --git a/lxqt-base/libsysstat/libsysstat-0.4.1.ebuild b/lxqt-base/libsysstat/libsysstat-0.4.1.ebuild
index 8b13efb814f2..be6f719f0b04 100644
--- a/lxqt-base/libsysstat/libsysstat-0.4.1.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/lxqt-base/lxqt-about/Manifest b/lxqt-base/lxqt-about/Manifest
index 32ab2e94d4d5..6f8b5a0d23ae 100644
--- a/lxqt-base/lxqt-about/Manifest
+++ b/lxqt-base/lxqt-about/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-about-0.11.0.tar.xz 21856 BLAKE2B 9904d474e3daa22169fee9b3f6e773f7bb6141d76ff62afd94971d01746d3f8036211ab0713d496479f55368932f0edb60c87e52a4398204755980c7a90adaab SHA512 53d818e036275075f41edef7af4615e5dbdb651cade68a6f502cbea6f75d32d368111536a3987078d3f682187cd6c420d8af827cc8fafa48d247ef4af5e0febf
 DIST lxqt-about-0.13.0.tar.xz 22580 BLAKE2B 9368376520c1fab67ee6e23af4a020de42976a9fb703adb7c53c5c6d2f83075db618c837692df18d5fec2c9d68c313f01cf59c4dfa609a6ad180d56589cee8df SHA512 5ba1106a66115f791597b12173be5b8f340c275e21ee53acd77aa7f10c409ad9b0bb83e24479fba6ff4265e6261ba90dde98ce10331b00fc01e87196fa506214
-EBUILD lxqt-about-0.11.0.ebuild 704 BLAKE2B 8dd5a97641d5f4aae8f76fa13d352c3ea983173dbdce03183152d49b349bf382c9c1a8377ddf4edca7897186f7acedb5ebfcfdee86f7766f0993b171b0076556 SHA512 ef46304333a1a02f3d60d66455e14ad27bbfb1612ec91e0b4704b0fe04f4372134f012eb7bd239681068d352018fdedaf1d51ce51c90dcf4435cb76d855c6596
-EBUILD lxqt-about-0.13.0.ebuild 735 BLAKE2B da688c7bfd3196bceab030d57f694507a2880438594086c199ea36e0d3cb454ddbc533a1cc383644890dfff89f4df0fb47245510da1965e6f6ee0a19534dcbfc SHA512 5d13cb795a41cdfed744f920552c3cad461b3768f3f7c935c45e92f2e432a1aa519f72ab1e1ca7811d022b619f6aea71b9d9cb501310eb2d8fc48bc01254e5f8
+EBUILD lxqt-about-0.13.0.ebuild 730 BLAKE2B 011ee92f41fe43a06e979fb94e235fb9654087abaad6d82a32b3ae2b7e298a3176f183ae65cd405a7c97d684ee17377bd245d6744ac1f928ef7cdafb6fd65a92 SHA512 417d5dc855c1f9f4e441a62ada6052c3a474d5bcd18b72bc6c00920b5b12471671922cd71feca1848b58afe3770755f7600e1f0fe9bb7ce37e7e67c0d9cfb06b
 MISC metadata.xml 316 BLAKE2B 36bfefa13949cfad10150cddaf4d8e2fdbf96632479d9b6a3343f7b9b51e83d34134242b0e5d3a5a0e25a3159030d7a5bc1c97e9ea27d0d85663be67dbadaeff SHA512 b5109f43afacd0a858485db451a587e8dcf9ce2d8f3e146d0c24efcd5a88404265c8e99578aeb7da55ba3429e27c52e27acf6adddc1015eda4f8e57c5f37ef91
diff --git a/lxqt-base/lxqt-about/lxqt-about-0.11.0.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.11.0.ebuild
deleted file mode 100644
index ca73cfe81884..000000000000
--- a/lxqt-base/lxqt-about/lxqt-about-0.11.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt about dialog"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	~lxqt-base/liblxqt-${PV}
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
diff --git a/lxqt-base/lxqt-about/lxqt-about-0.13.0.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.13.0.ebuild
index 2e417b32cac8..d0d198083939 100644
--- a/lxqt-base/lxqt-about/lxqt-about-0.13.0.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-admin/Manifest b/lxqt-base/lxqt-admin/Manifest
index 1aeb5bf6662a..37660515be89 100644
--- a/lxqt-base/lxqt-admin/Manifest
+++ b/lxqt-base/lxqt-admin/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-admin-0.11.0.tar.xz 114720 BLAKE2B 12d660ba616aaea5e96525ea0acc47b36f1285b36fd42b2aa4c79d22c40a7d27dfb190e6cc316d3424815b29a4019b2afac1507b3c7c416984ab98a75a869349 SHA512 cbbd83892c0c181eb996de198f6c5d3b00d0c6a5e185b816ac1237bd5930da0aa8cd272696571bb91d70054e89ea96f4dd9b3aa34dff7534286ff3e529757792
 DIST lxqt-admin-0.13.0.tar.xz 116436 BLAKE2B 9395ea5f762da37ebb810c167c66c069b15b86b6b71e4a679d6923a0deedd9a87da65469b3ad5c934f9898e91776eee7ec7a248996283201287d00459f69e5c0 SHA512 fc84f2cffd28ea87833194b36654016d426c3b0e7a468468568f35153b208129d504200b31c17516298444882bc54ad7e3bc1cbef2b67459515eaac3dc77dea7
-EBUILD lxqt-admin-0.11.0.ebuild 809 BLAKE2B 8868f5d94184a4c1b1e258682f0ef95a72bcb1b63ca0aabb604af833fa3b196a5dc9ce59ce6e2ee09f5c4bb6e64943c5d37b9b9290341ed06ce1e67df0d0b34c SHA512 6436c0a935585be8126d3f342c4cd385852988ec4e9ea5a2e6e25e795dddd886c4ff180ee513adf68dc7fa46fd87bfa0653aa0b2b1c8b81bc96934a0f51cd6f6
-EBUILD lxqt-admin-0.13.0.ebuild 771 BLAKE2B c3669811c7567e5ea77477d4ff88c4a48d4018dccb7b674024e692dbf85e29dbd7cb34342ba1610b8c729c95368245af1899a73dff050137469147f86cc5dfcc SHA512 1345171d4cc27b3a73d3f66c8fbec849db952b7d34ce3d6375bfb14f6c4483661bd885ed3d875d87a2b610077adba173aa427cf22af20491b8f05ec43b079c4a
+EBUILD lxqt-admin-0.13.0.ebuild 766 BLAKE2B bb5559376fb6ac970c69dd679f104f1304b568e456e80104cd62915e5f0b22118ddb628175ac94bb399c82f364d5ff6f1e7fac33050518bfbdc0a521c164ad36 SHA512 4d2444ad1f09440467875cd27d46056fff7c781a605e7f7db91472adb95ac6a5f82920eb29f260f3aa09f54c5d43ce0f25d2926e948b7ec78bfe77778b479348
 MISC metadata.xml 316 BLAKE2B be2bd5cb125c608cd60b791dd173079f9a18b247dd7113dd5ff7b9c893b10bb62678e0463553d3f16b10a92a40e88bfe4aa75aca0d5b3ffca9d4024b8e0c43ca SHA512 4fa962d54db76373af467ffcead4c651b8fc226e8da994c6b574dff81e5e1013ff5609c19bcfdeba669809e42c0141cb135248fd48f151781dd611703c88035e
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.11.0.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.11.0.ebuild
deleted file mode 100644
index f0b2edaac4b4..000000000000
--- a/lxqt-base/lxqt-admin/lxqt-admin-0.11.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt system administration tool"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-DEPEND="dev-libs/glib:2
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	~lxqt-base/liblxqt-${PV}
-	kde-frameworks/kwindowsystem:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.13.0.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.13.0.ebuild
index a85c7c688ddc..fce57a5b74d8 100644
--- a/lxqt-base/lxqt-admin/lxqt-admin-0.13.0.ebuild
+++ b/lxqt-base/lxqt-admin/lxqt-admin-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-common/Manifest b/lxqt-base/lxqt-common/Manifest
deleted file mode 100644
index 711db63a3fc2..000000000000
--- a/lxqt-base/lxqt-common/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lxqt-common-0.11.0.tar.xz 3216520 BLAKE2B 217554dc5b16f3bbc03535440c34191e7ccb85384c63ad13911a6a21ba812b5f93dcd308e3bac7d7bb6b4cda74394069257d589e27261c0c62eaba9dc68fa199 SHA512 5eeaa6ead263a93b58ab9ec536c287fe383b5abade722dd3c7232840bc12c56e2208904bfbbc5ee9092c340d14d939a2ac0dcd37cf2175a0f601bbe050f00a2c
-EBUILD lxqt-common-0.11.0.ebuild 766 BLAKE2B a2486b9b0a476914484c3b2d1587934d991d972cdbd11071643e11da70b0d90d14d5450c88f56ec87de63908ab7d0ec9f39383fc9263644c30fbf4ec6d020dc7 SHA512 aeb7711f871ddcbb4108d8469b223f23feb9dc24aa7e6a2921e1eb8d4f3c308531ea1cb71d6e53d948bf5266aeff7de95930edcaf2669f5335e133ca49dbc350
-MISC metadata.xml 240 BLAKE2B 8dd1dd10c1b3297bf08ebf11d2e047de07700e5233e26788943af60613a3faa71ff392f77a33f0065917eedc487b2f9be91bdc58635c3c51957e5be2738282c0 SHA512 84f77a0e7d17d09eea1157217fcd22ae5fc98e1569879f85b5fc950d2b2ad00168b1ec9d5d8c1f964673c55bc91d509adb2d39b5983de21d83200ef6c58b9652
diff --git a/lxqt-base/lxqt-common/Manifest.gz b/lxqt-base/lxqt-common/Manifest.gz
new file mode 100644
index 000000000000..b89ec4bed2eb
--- /dev/null
+++ b/lxqt-base/lxqt-common/Manifest.gz
diff --git a/lxqt-base/lxqt-common/lxqt-common-0.11.0.ebuild b/lxqt-base/lxqt-common/lxqt-common-0.11.0.ebuild
deleted file mode 100644
index f2d3b2d66aa3..000000000000
--- a/lxqt-base/lxqt-common/lxqt-common-0.11.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt common resources"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-DEPEND=">=lxqt-base/liblxqt-0.11.0"
-RDEPEND="${DEPEND}"
-PDEPEND=">=lxqt-base/lxqt-session-0.11.0"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodir "/etc/X11/Sessions"
-	dosym  "/usr/bin/startlxqt" "/etc/X11/Sessions/lxqt"
-}
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index b5520a4e623b..5aaf86d8b4e6 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -1,7 +1,4 @@
-AUX lxqt-config-0.11.0-cmake-3.8.patch 8137 BLAKE2B 1864b7f2dfe50ff2d9bd0fbcf7b17b11fa997f45843510f5bed8b942e1121cecb4abbf7cf18bb6f986825cdf527d3cad8407df7237621e54e57adddd48496a99 SHA512 4283f50dec924245329a47800987e355d5df8ee17db0f2394ca313faed4bb5e45e6c891619b9d81b55a2d0b083119d49dc4d06cbfe5bab17821a9702fa0d438f
 AUX lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch 1122 BLAKE2B cca7503b2c68300ad1232b7688ceb367801e9454c80d5c2af4a9385d4807b0beedb6ef0b8aa57768d928d420b0d668c22a661971115c93fccf7bb72e4d563407 SHA512 4cdd61471c47e79794054ee58573dd7346e5f88fb869458f8e828d7c1f01af4d73a5d0648b6ad79382bba140ed731c7604f86851f85afa614a1c19cf5a366792
-DIST lxqt-config-0.11.0.tar.xz 197112 BLAKE2B 2b7da999a61922b4a54e7dd6481c54e4e98262340d596f334058ea8e2d235baff96b39a27ddacadf6678a6f283a7ac63d7160747c31e2bb395036a3657b71030 SHA512 20a573ba6cb83ef19b58a31180924e527496f4eb5d5f9bcf1eb37e3883b8b46ea02f08be9fe42a06f12508ffa2a9af5225d3fe00856ee7807704a99adf654795
 DIST lxqt-config-0.13.0.tar.xz 201112 BLAKE2B 6a79c1f07e1cf055da09bb7dd8f7da2426891770b0e757ba3c4e5ef137f715ba3a579b2c05a4f1938c9d76b6dda0643119888be7dace2083a57a7dfe0df93aa5 SHA512 a5102794c4cf18a18e633cbc7d0b89653abf2612bc61e506ec169f4898903092f5201a09a2610642c641a17b59a992a6d6f59366ec61d54763e8b911d5220ca9
-EBUILD lxqt-config-0.11.0.ebuild 1217 BLAKE2B 522f4d4fa54edfb5a4f722efde8b16ba8241070d0725470258410b3b4a086e9de959e67510edff9b192a95428bad3787352e17f22a453ff47d21ef39ae92a83c SHA512 7eed21696eac43fe63c66cba409bcafbdc33117d940dc6200b976013eb9b51c7022ad45259b75a5ffefa3ba2301950d797d35f202f9c1db35c27cf453063c45d
-EBUILD lxqt-config-0.13.0.ebuild 1410 BLAKE2B 91c909bd782e4c191ac1b923e29229371eb74c7420a4dacad36554328948a03bd91421785fa98e3a3e0ca2bd1582d2fa8c7f61b3e5b6e7603ec8544012e3e57d SHA512 1859e1ab9e1e08d70a5592681a431b7e2134801368734c88eb44ea85bc212678e0df4eb51dc9de68baa345260a3cd2b6ec48a9aaa88ebfd4797b4f3496326ad1
+EBUILD lxqt-config-0.13.0.ebuild 1405 BLAKE2B 0e3701718b5b3812bfda4903ddb47011004cf87862997c6adbb43544b4e8f398177fe9c8661ea61fd85197cceb8e2623047a065767c046274a03d358dda3c433 SHA512 c4032c1a2b7f77769bece058a53b6c0010e744d87192c3f7d01cd4b6b941ccf1889559c372c493255f690ede8629a7c6b90fa90b4fc214fe35a2ff95ec435158
 MISC metadata.xml 435 BLAKE2B f2ac19945e50b82b13706f0fc3790e547243f4a30b2abde7f2b333fd29590dee96d3dc2680380d3db905cc26d93273d36529310c4e68a892163b9a5fc1c87e72 SHA512 2d345ec5a53c4293f632ac65ce0f45f4604914a019f31536de00039dd523f95b23ba830b3c783ef1cfff3f7343e7eb343b4501d001fb3322a50f998394556222
diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.11.0-cmake-3.8.patch b/lxqt-base/lxqt-config/files/lxqt-config-0.11.0-cmake-3.8.patch
deleted file mode 100644
index 8088225e30df..000000000000
--- a/lxqt-base/lxqt-config/files/lxqt-config-0.11.0-cmake-3.8.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira@gmail.com>
-Date: Wed, 19 Apr 2017 12:56:45 +0100
-Subject: [PATCH] Fixes a FTBFS with CMake v3.8
-
-CMake v3.8 AUTOUIC changed the directory where the file is generated to:
-<CMAKE_CURRENT_BINARY_DIR>/<TARGETNAME>_autogen/include. The changes makes
-us fail.
-The change is actually just an sympton and not a root cause. We shouldn't
-include a ui generated file in public header.
-
-Closes https://github.com/lxde/lxqt/issues/1277
----
- liblxqt-config-cursor/selectwnd.cpp | 64 ++++++++++++++++++++-----------------
- liblxqt-config-cursor/selectwnd.h   |  9 ++++--
- 2 files changed, 41 insertions(+), 32 deletions(-)
-
-diff --git a/liblxqt-config-cursor/selectwnd.cpp b/liblxqt-config-cursor/selectwnd.cpp
-index e76840b..8a1fa18 100644
---- a/liblxqt-config-cursor/selectwnd.cpp
-+++ b/liblxqt-config-cursor/selectwnd.cpp
-@@ -13,6 +13,7 @@
- #include <QDebug>
- 
- #include "selectwnd.h"
-+#include "ui_selectwnd.h"
- 
- #include <QKeyEvent>
- #include <QMessageBox>
-@@ -37,22 +38,24 @@
- 
- #define HOME_ICON_DIR QDir::homePath() + "/.icons"
- 
--SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent) : QWidget(parent), mSettings(settings)
-+SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent)
-+    : QWidget(parent),
-+      mSettings(settings),
-+      ui(new Ui::SelectWnd)
- {
--    setupUi(this);
--
--    warningLabel->hide();
-+    ui->setupUi(this);
-+    ui->warningLabel->hide();
- 
-     mModel = new XCursorThemeModel(this);
- 
-     int size = style()->pixelMetric(QStyle::PM_LargeIconSize);
--    lbThemes->setModel(mModel);
--    lbThemes->setItemDelegate(new ItemDelegate(this));
--    lbThemes->setIconSize(QSize(size, size));
--    lbThemes->setSelectionMode(QAbstractItemView::SingleSelection);
-+    ui->lbThemes->setModel(mModel);
-+    ui->lbThemes->setItemDelegate(new ItemDelegate(this));
-+    ui->lbThemes->setIconSize(QSize(size, size));
-+    ui->lbThemes->setSelectionMode(QAbstractItemView::SingleSelection);
- 
-     // Make sure we find out about selection changes
--    connect(lbThemes->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
-+    connect(ui->lbThemes->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
-             SLOT(currentChanged(const QModelIndex &, const QModelIndex &)));
-     // display/hide warning label
-     connect(mModel, SIGNAL(modelReset()),
-@@ -62,15 +65,15 @@ SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent) : QWidget(parent
-     connect(mModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
-                     this, SLOT(handleWarning()));
- 
--    connect(warningLabel, SIGNAL(showDirInfo()),
-+    connect(ui->warningLabel, SIGNAL(showDirInfo()),
-                     this, SLOT(showDirInfo()));
- 
-     // Disable the install button if we can't install new themes to ~/.icons,
-     // or Xcursor isn't set up to look for cursor themes there
--    btInstall->setEnabled(mModel->searchPaths().contains(HOME_ICON_DIR) && iconsIsWritable());
-+    ui->btInstall->setEnabled(mModel->searchPaths().contains(HOME_ICON_DIR) && iconsIsWritable());
-     // TODO/FIXME: btInstall functionality
--    btInstall->hide();
--    btRemove->hide();
-+    ui->btInstall->hide();
-+    ui->btRemove->hide();
- 
-     //QTimer::singleShot(0, this, SLOT(setCurrent()));
- 
-@@ -80,11 +83,12 @@ SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent) : QWidget(parent
- 
- SelectWnd::~SelectWnd()
- {
-+    delete ui;
- }
- 
- void SelectWnd::setCurrent()
- {
--    lbThemes->selectionModel()->clear();
-+    ui->lbThemes->selectionModel()->clear();
- 
-     QString ct = getCurrentTheme();
-     mAppliedIndex = mModel->defaultIndex();
-@@ -97,9 +101,9 @@ void SelectWnd::setCurrent()
-         const XCursorThemeData *theme = mModel->theme(mAppliedIndex);
-         // Select the current theme
-         selectRow(mAppliedIndex);
--        lbThemes->scrollTo(mAppliedIndex, QListView::PositionAtCenter);
-+        ui->lbThemes->scrollTo(mAppliedIndex, QListView::PositionAtCenter);
-         // Update the preview widget as well
--        if (theme) preview->setTheme(*theme);// else preview->clearTheme();
-+        if (theme) ui->preview->setTheme(*theme);// else ui->preview->clearTheme();
-     }
- }
- 
-@@ -123,8 +127,8 @@ void SelectWnd::selectRow(int row) const
-     QModelIndex from = mModel->index(row, 0);
-     QModelIndex to = mModel->index(row, mModel->columnCount()-1);
-     QItemSelection selection(from, to);
--    lbThemes->selectionModel()->select(selection, QItemSelectionModel::Select);
--    lbThemes->selectionModel()->setCurrentIndex(mAppliedIndex, QItemSelectionModel::NoUpdate);
-+    ui->lbThemes->selectionModel()->select(selection, QItemSelectionModel::Select);
-+    ui->lbThemes->selectionModel()->setCurrentIndex(mAppliedIndex, QItemSelectionModel::NoUpdate);
- }
- 
- void SelectWnd::currentChanged(const QModelIndex &current, const QModelIndex &previous)
-@@ -133,16 +137,16 @@ void SelectWnd::currentChanged(const QModelIndex &current, const QModelIndex &pr
-     if (current.isValid()) {
-         const XCursorThemeData *theme = mModel->theme(current);
-         if (theme) {
--            preview->setTheme(*theme);
--            btRemove->setEnabled(theme->isWritable());
-+            ui->preview->setTheme(*theme);
-+            ui->btRemove->setEnabled(theme->isWritable());
-         } else {
--            preview->clearTheme();
-+            ui->preview->clearTheme();
-         }
- 
-         // directly apply the current settings
-         applyCurrent();
-     } else {
--        preview->clearTheme();
-+        ui->preview->clearTheme();
-     }
-    //emit changed(mAppliedIndex != current);
- }
-@@ -155,7 +159,7 @@ void SelectWnd::on_btInstall_clicked()
- void SelectWnd::applyCurrent()
- {
-     //qDebug() << "'set' clicked";
--    const XCursorThemeData *theme = mModel->theme(lbThemes->currentIndex());
-+    const XCursorThemeData *theme = mModel->theme(ui->lbThemes->currentIndex());
-     if (!theme) return;
-     applyTheme(*theme);
-     fixXDefaults(theme->name());
-@@ -200,7 +204,7 @@ void SelectWnd::applyCurrent()
- void SelectWnd::on_btRemove_clicked()
- {
-     qDebug() << "'remove' clicked";
--    const XCursorThemeData *theme = mModel->theme(lbThemes->currentIndex());
-+    const XCursorThemeData *theme = mModel->theme(ui->lbThemes->currentIndex());
-     if (!theme) return;
-     QString ct = getCurrentTheme();
-     if (ct == theme->name())
-@@ -210,20 +214,20 @@ void SelectWnd::on_btRemove_clicked()
-         return;
-     }
-     QDir d(theme->path());
--    preview->clearTheme();
--    mModel->removeTheme(lbThemes->currentIndex());
-+    ui->preview->clearTheme();
-+    mModel->removeTheme(ui->lbThemes->currentIndex());
-     removeXCursorTheme(d);
- }
- 
- void SelectWnd::handleWarning()
- {
-         bool empty = mModel->rowCount();
--        warningLabel->setVisible(!empty);
--        preview->setVisible(empty);
--        infoLabel->setVisible(empty);
-+        ui->warningLabel->setVisible(!empty);
-+        ui->preview->setVisible(empty);
-+        ui->infoLabel->setVisible(empty);
- }
- 
- void SelectWnd::showDirInfo()
- {
--        QToolTip::showText(mapToGlobal(warningLabel->buttonPos()), mModel->searchPaths().join("\n"));
-+        QToolTip::showText(mapToGlobal(ui->warningLabel->buttonPos()), mModel->searchPaths().join("\n"));
- }
-diff --git a/liblxqt-config-cursor/selectwnd.h b/liblxqt-config-cursor/selectwnd.h
-index c9bc428..200cfa0 100644
---- a/liblxqt-config-cursor/selectwnd.h
-+++ b/liblxqt-config-cursor/selectwnd.h
-@@ -15,16 +15,20 @@
- 
- #include <QObject>
- #include <QWidget>
-+#include <QPersistentModelIndex>
- #include <lxqtglobals.h>
- 
- namespace LXQt {
-   class Settings;
- }
- 
-+namespace Ui {
-+class SelectWnd;
-+}
-+
- class XCursorThemeModel;
- 
--#include "ui_selectwnd.h"
--class LXQT_API SelectWnd : public QWidget, private Ui_SelectWnd
-+class LXQT_API SelectWnd : public QWidget
- {
-     Q_OBJECT
- 
-@@ -55,6 +59,7 @@ private slots:
-     XCursorThemeModel *mModel;
-     QPersistentModelIndex mAppliedIndex;
-     LXQt::Settings* mSettings;
-+    Ui::SelectWnd *ui;
- };
- 
- #endif
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.11.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.11.0.ebuild
deleted file mode 100644
index 406d90f0f729..000000000000
--- a/lxqt-base/lxqt-config/lxqt-config-0.11.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=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt system configuration control center"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-CDEPEND="
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5
-	kde-plasma/libkscreen:5=
-	~lxqt-base/liblxqt-${PV}
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libxcb:=
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5"
-RDEPEND="${CDEPEND}
-	x11-apps/setxkbmap"
-
-PATCHES=( "${FILESDIR}/${P}-cmake-3.8.patch" )
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1
-}
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
index d3af64823fcc..045498386add 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
diff --git a/lxqt-base/lxqt-globalkeys/Manifest b/lxqt-base/lxqt-globalkeys/Manifest
index 33ac870d8f2f..61f2c7fc5b36 100644
--- a/lxqt-base/lxqt-globalkeys/Manifest
+++ b/lxqt-base/lxqt-globalkeys/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-globalkeys-0.11.0.tar.xz 50480 BLAKE2B 65a4c3039389fab0a2039637317b04c5bb32642e63dae6dfac1a2e445739ec532e730a7f944eb18066d45196ca650fbbff0a5f0d221e1298ad5e3fc3b3e82325 SHA512 165c22d60a0d21cf25e36429be5ef0daab86329b0c10a1be67cf90cda817ebc409c0ac7c383ff10c51e4dd8194e799af8af9b3affd74dea49dcc93d05fb6cb33
 DIST lxqt-globalkeys-0.13.0.tar.xz 53128 BLAKE2B 91a61ac4964fd3d883213038e7544fdb3cf02ebbca2f3a42936123b40b11934bbcb31e14b755910bc1b076fdd2b69d6d78778b8e2aff4e4a1635d5393ef96c70 SHA512 5350e91a03fa6928ecefb935302fe87bfa38e6f61bea564222739f4f2896ffab85304d7c0afe6dbfc78912e944c25f32892f35bfb08a904395fda24b9d58b3ad
-EBUILD lxqt-globalkeys-0.11.0.ebuild 876 BLAKE2B a6a14e98f6e65aecfa2807f7782c3a705b4a36fa55aaaf8817b5de13da6635d0012a8d20e03757b2785aaa94a91bc36dbb11dcfce6ef62294e748eeaae6c8f00 SHA512 863d5cda5510020dc27e36ae5c9375c404777dafbd06443d9f47591bbc210cca3af4181682bdf9f1218e65ac66f07c1023ae6207a2680055eb09e5d0575709cb
-EBUILD lxqt-globalkeys-0.13.0.ebuild 932 BLAKE2B 9d7a2a7f84e5dc0c52ad84c6fc3ea3c30fff57f8488383f1fc5ebe4368440d39b19a3083c38b5f927a56f2a2b2ef9070435a74939c3d9522cb93538015648b22 SHA512 5cb008b22a95a3ba70e1ae925e983d28a6b54c5296408260a5f10badefa514ce1af46394c9f6fd587ca8feecce3d6f737760dd12b18fe81693592da9c6d0e064
+EBUILD lxqt-globalkeys-0.13.0.ebuild 927 BLAKE2B ad3eeabe7130abc1f27a8cf4d7bd5a1f1bc1ef8ecc7184c62ef7aee6df16f9225e460e72f9899b79388d2ca5117715de79224224e0922c39fcf08fc3877960db SHA512 9339ebcc2d33c8fd4393fde8c9789e2707152d1f6ed910d94ad90acb5b570ebaaabc30dc7194440c54e7fa763648e4870022c80bc7d41b60fe18d89dc30f651b
 MISC metadata.xml 321 BLAKE2B e4171574ab9b2b3ce038ad57a140049f2835aaad88c8ff7d372e3f65f2b696d27719c1dc2c1b8e98ad6dc657eae88405fb2e9d0a5c88ba48db772f30b1511e5b SHA512 2ab81bdddeec9b554082577559910d8d7f6def6aece5bc1ede46d5d74e5f1e23f86b6256f4e7b6cd55e88523261dcccda4970f26016a817c922d0249fcc30589
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.0.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.0.ebuild
deleted file mode 100644
index 4322d843551d..000000000000
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	~lxqt-base/liblxqt-${PV}
-	>=dev-libs/libqtxdg-1.0.0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.13.0.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.13.0.ebuild
index 6db9674ba0c9..c2fe783e2012 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.13.0.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-l10n/Manifest b/lxqt-base/lxqt-l10n/Manifest
index 026d0932040d..09f917204237 100644
--- a/lxqt-base/lxqt-l10n/Manifest
+++ b/lxqt-base/lxqt-l10n/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-l10n-0.11.0.tar.xz 513704 BLAKE2B f300b938db282151df1552e13e5530ffab1465d496e89df73b5d339b339442c018521d2eb1d5c3d7a942607596ba8ab98dacd689ba74761ec93e82b42ba85249 SHA512 827a38184d27684ab98234df671c48c8ff7d45bfe4fafafe82fd821786e856eaadade98f8d244cac9729dd0ec1a2d8d295b04397bed4a3375cac8191759ec27e
 DIST lxqt-l10n-0.13.0.tar.xz 758588 BLAKE2B e904f60c50dd389fce027a374536412b9f2947bc4a7b81c313a0457744328158215b520e15044c30c045a022c7119682b05ccbf2534923684cf5daf40d5f7c45 SHA512 cbafc0f1c12a9c14af8ed896f5147d90fcd24786be0cc5de7f8897e31ac012a7308604622635f43709edeb13824395806e6d8e89355a0fd6799227f8d0d8f686
-EBUILD lxqt-l10n-0.11.0.ebuild 517 BLAKE2B 2fa21a32fa6f5c9e067c74ad67e12a03f6b72a991112e78017dc97f9cade0f9c894910b73cab894e27c45a56048c4c2683c3d04c25dae15bd94b66c41f93a1df SHA512 707f35306f949fd24e7c608f555ea82ed8d7a21c6802d75754663c2ea621b84dab72d531db4e6e82b47e7d7a54f120b9722f50dd690514e595db352c7ef32e25
-EBUILD lxqt-l10n-0.13.0.ebuild 579 BLAKE2B f2b91b2175bd048711583a58bedea19e6d280ae81329852f7b0f16c915043e87b8c7ee977252d6063726f194f191fabc68e008ea4da1e5bddb50fb9cda49c1c6 SHA512 ff36ce2b4c0af1f21a3d8a1e484b40ac69c0a82e2301be28900ab22c5176f83cb2971303e9eb6b9163882ae279b06095deba3d6b4e19cede78d1cd710b12c1c6
+EBUILD lxqt-l10n-0.13.0.ebuild 574 BLAKE2B d70fbd4adaa8a0ccb467c86715a9bfe43fc131dc9403a7903cb14f8afcc9377bc5140e764a4fd48fc979ac7700df4ba3340a17bd36dd325a80c833bf76541645 SHA512 1d75fe740a6e1de6e632135b7ef1fb8f90812b1a1aa7492ae00b8fb9925b4a65ea7efb9967756fcc0daeaa9b0b34ebb40c6601cb50c0354422b1b7c4e5ec9f58
 MISC metadata.xml 315 BLAKE2B 50fef7cf54830ce7ddd54aa3eb6a2dccef953f82e466ffb160add28174a6347400a62e2af002fe47276e1d2f6d161e4566300df7cc3223696596a422afeeec85 SHA512 52bd54eb50703636a14daacc56f4433867e2093875819afe70105c6cda3500b91e2791fbce071675a3b667db76ccd797cbe478f6f1c2be7cfda6b55f189a36dc
diff --git a/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.0.ebuild b/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.0.ebuild
deleted file mode 100644
index 27fa16aa85d5..000000000000
--- a/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.0.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 cmake-utils
-
-DESCRIPTION="LXQt localisation package"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-DEPEND="
-	dev-qt/linguist-tools:5
-	~lxqt-base/liblxqt-${PV}
-"
diff --git a/lxqt-base/lxqt-l10n/lxqt-l10n-0.13.0.ebuild b/lxqt-base/lxqt-l10n/lxqt-l10n-0.13.0.ebuild
index 2876d6db2956..2dc87e707dd0 100644
--- a/lxqt-base/lxqt-l10n/lxqt-l10n-0.13.0.ebuild
+++ b/lxqt-base/lxqt-l10n/lxqt-l10n-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 12c5af3e28b1..99584e97199d 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD lxqt-meta-0.11.0.ebuild 1585 BLAKE2B d492e4f81d541fcf70de23b0987d357a12b888e90a450405873ac033f4d3f56f12bc3132688fff7ea8ce512ef7e77c164db66d6c615db117e1313e4dc8dde7d8 SHA512 9ea1fdb61d530ff727f7427b8aec3ebc9f0e85558e061e93da252ed68107ee73367aefff59bb9d53e29a74609909c0ea7f4bebeb1ab5bba311392c6b4005da77
-EBUILD lxqt-meta-0.13.0.ebuild 1690 BLAKE2B 87bedb9e5f83cf6872c2a2179f8c95e2c65fd07361ea6297a718fe7d0a419be42245c3390f16b76fbe4a984cf03d8b0e825a13b5613441022df99041997d0366 SHA512 e23ee9a82b303f33e2d9a3b83b13b6d9e1eba8e2aaf88be289c14d8a1da02792c6ff3c456af6f55a2c32edff521ee07806d90cafb8d5eb684c5bdaf215de3ebf
-MISC metadata.xml 1600 BLAKE2B 198979543b1001dbfae6fdc3f088e752c44a24086a346fdaad24376aed1016ab65953005b40b3a27b05cce07f6ead2ab38ed1d94ff1b2db5632f48a205d779b9 SHA512 cf40f79ab9124952d27ab80736b9ec22c486dcb421ab6ffc3506c1331308fd0156a50ba9bdc7703b7527b98f32294ad88e50d6d02138dc47e59443589f23a9f3
+EBUILD lxqt-meta-0.13.0.ebuild 1695 BLAKE2B 3a8e34a40c873031f02e84ceeeff3b96cb14519e111dbcc12df56164d18f659843c720b74d96855ebddf4c27974a70aac7289b0ef052a0bac18f146b2450849e SHA512 634ec73834ad8479249c7b3fd07ecfac8daad2bf0c4299e79712ff6a6a7245a9c0337719c5b0956ff0a8e64a535bdc5ef1741ac50b06e7ed50a5fc46ef14e87c
+MISC metadata.xml 1302 BLAKE2B ba3ea148f21190737b6d2aa77ab61280efd80018a6fad4b116934c707d4a5c7a895b6a5fc6eec0c0634470f125551e3c0d1f0956df17d203c2d7720b06fe8036 SHA512 e5f9b1a9d4485391920a048a1d75b6a7a2391dcd8914d6dd7e1119cbf01b9f3e75391742c9898b20a4fb1e4f1bc62a2f271a4796c9022087e26217ff53ff69f6
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild
deleted file mode 100644
index f1654fe9f48a..000000000000
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
-HOMEPAGE="https://lxqt.org"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+about admin +filemanager +icons lightdm lximage minimal +oxygen +policykit
-	powermanagement sddm ssh-askpass sudo"
-REQUIRED_USE="oxygen? ( icons )"
-
-RDEPEND="
-	>=lxde-base/lxmenu-data-0.1.2
-	~lxqt-base/lxqt-common-${PV}
-	~lxqt-base/lxqt-config-${PV}
-	~lxqt-base/lxqt-globalkeys-${PV}
-	~lxqt-base/lxqt-notificationd-${PV}
-	~lxqt-base/lxqt-panel-${PV}
-	~lxqt-base/lxqt-qtplugin-${PV}
-	~lxqt-base/lxqt-runner-${PV}
-	~lxqt-base/lxqt-session-${PV}
-	virtual/ttf-fonts
-	about? ( ~lxqt-base/lxqt-about-${PV} )
-	admin? ( ~lxqt-base/lxqt-admin-${PV} )
-	filemanager? ( >=x11-misc/pcmanfm-qt-${PV} )
-	icons? ( oxygen? ( kde-frameworks/oxygen-icons )
-		!oxygen? ( virtual/freedesktop-icon-theme ) )
-	lightdm? ( x11-misc/lightdm )
-	lximage? ( media-gfx/lximage-qt )
-	!minimal? ( x11-wm/openbox
-		x11-misc/obconf-qt )
-	policykit? ( ~lxqt-base/lxqt-policykit-${PV}
-		|| ( sys-auth/consolekit[policykit(-)]
-			sys-apps/systemd[policykit(-)] ) )
-	powermanagement? ( ~lxqt-base/lxqt-powermanagement-${PV} )
-	sddm? ( >=x11-misc/sddm-0.11.0 )
-	ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-${PV} )
-	sudo? ( ~lxqt-base/lxqt-sudo-${PV} )"
-
-# Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial
-# install expects oxygen icons, until the user specifies otherwise (bug 543380)
-
-S="${WORKDIR}"
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild
index 9b17a66af76b..df945a56312d 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,9 @@ HOMEPAGE="https://lxqt.org/"
 MY_PV="$(ver_cut 1-2)*"
 
 if [[ ${PV} = *9999* ]]; then
-	KEYWORDS="-*"
+	KEYWORDS="-* amd64 x86"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="metapackage"
diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index e7895d12a9f3..c68821c7a25d 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -8,28 +8,16 @@
 	<use>
 		<flag name="about">Install <pkg>lxqt-base/lxqt-about</pkg></flag>
 		<flag name="admin">Install <pkg>lxqt-base/lxqt-admin</pkg></flag>
-		<flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>
-			file manager</flag>
-		<flag name="icons">Install an icon theme</flag>
-		<flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>
-			display manager</flag>
-		<flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>
-			image viewer</flag>
-		<flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>
-			window manager</flag>
-		<flag name="oxygen">Prefer <pkg>kde-frameworks/oxygen-icons</pkg> (default)</flag>
-		<flag name="powermanagement" restrict="&gt;=lxqt-base/lxqt-meta-0.13.0">Install
-			<pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
-		<flag name="processviewer">Install
-			<pkg>x11-misc/qps</pkg> package</flag>
-		<flag name="screenshot" restrict="&gt;=lxqt-base/lxqt-meta-0.13.0">Install
-			<pkg>x11-misc/screengrab</pkg> package</flag>
-		<flag name="sddm">Install <pkg>x11-misc/sddm</pkg>
-			display manager</flag>
-		<flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg>
-			user password prompt tool</flag>
+		<flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>file manager</flag>
+		<flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>display manager</flag>
+		<flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>image viewer</flag>
+		<flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>window manager</flag>
+		<flag name="powermanagement">Install <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
+		<flag name="processviewer">Install <pkg>x11-misc/qps</pkg> package</flag>
+		<flag name="screenshot">Install <pkg>x11-misc/screengrab</pkg> package</flag>
+		<flag name="sddm">Install <pkg>x11-misc/sddm</pkg> display manager</flag>
+		<flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg> user password prompt tool</flag>
 		<flag name="sudo">Install <pkg>lxqt-base/lxqt-sudo</pkg></flag>
-		<flag name="terminal" restrict="&gt;=lxqt-base/lxqt-meta-0.13.0">Install
-			<pkg>x11-terms/qterminal</pkg> package</flag>
+		<flag name="terminal">Install <pkg>x11-terms/qterminal</pkg> package</flag>
 	</use>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-notificationd/Manifest b/lxqt-base/lxqt-notificationd/Manifest
index c18442789f69..c149372bebf9 100644
--- a/lxqt-base/lxqt-notificationd/Manifest
+++ b/lxqt-base/lxqt-notificationd/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-notificationd-0.11.0.tar.xz 30592 BLAKE2B d30ddedf7cc66bc951291110d43c458ff8c4b229189a3d1f3b59be29e0e45ad03ae9839a31aa5dd268121bb6a7266e05d30221ee9cb44a39bbb36cd937c85ebd SHA512 f6dd3463ac993d7c7743addd6924dc8f15717f658c576c78ad01e4db361d1f1c98d02f6a2bec0069c191ad923b1ff63d49faf6ff7d564f67030233d6979adec5
 DIST lxqt-notificationd-0.13.0.tar.xz 32364 BLAKE2B c43e57e66e2fdd375f25afd68acc428c6204992e48c2b2bf1a692380bcb2f48663c52b3a5a9b17d01a68d6cb57e6779260da3c9e09873baa0a8c7489dfa9c9a7 SHA512 2bc75b840a666e013d914f08719680cf3af7430a6acfb5072facff8bdc964aeef1d5227c68b5a5c5d8a6d6c572632105e3f2f04c517d8e8669eb40b5a0cf0f4d
-EBUILD lxqt-notificationd-0.11.0.ebuild 844 BLAKE2B 88a320eec4dbede23e76214ffa785cab5b6ed3f0b6fb16233c36393ad7da0f0425fb1fa33bad81d40286c58be16d32399675ca467fb81ac0cc5d3611c3e16020 SHA512 8cf12ce7c1c25a9437a8257d750056d4631093d8c0f7e69dcd06607d265dfad9c47c121a8744fca9a7a85ced84f474eba65798ab1c9240f822c358c4bfba9cca
-EBUILD lxqt-notificationd-0.13.0.ebuild 852 BLAKE2B f5dd0d30255799d945c29fd8c4bb874deff4a9cc8aa815d069208c2eacc1029b23f941dff08767b3a638508b3aaebb17db301edb3bcd1b8a8d89b2e7eb8e2e24 SHA512 558c93cc60cfc716dd86d2fa764c76d57d7b0951b72e4173ca8c13209f3df346daaab0e80295a64ce59ad30591a274a29a9287d8467687e4d7901a3c90e258be
+EBUILD lxqt-notificationd-0.13.0.ebuild 847 BLAKE2B f31c338183d441a391e9a9ae68fc89232b40d8b91321c2bd0d81aee0b3167a9a1630e3d61990a6d4ee95af100d43a2b8baa0295fd3f4a15c5988d6ba27345752 SHA512 a5af9a095db555bd09af0cf2fefd83758e8950dcb7db9429b1138d2e647824eaf4921d235ea070280fdee96f0bd3db95a3379cb60795f2d0b73f13b1f40e9750
 MISC metadata.xml 323 BLAKE2B cc28b17d478bed98b59743c03ceb630cc65495414d1dd5703b917643f54ff606518016358e2b0149cc25082097a1e8dd5cb2ee173c235aa6cc4197d9cc258493 SHA512 3aa6fb296384049f738b51edf21ea16a7a68cad1cf5bc79c6c34f970f12292afdb44eb34bf6b48c8e884903dfad041e1078b7409427aaeaabee48d5ee5c1bc14
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.0.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.0.ebuild
deleted file mode 100644
index b7eae03c514f..000000000000
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt notification daemon and library"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5
-	~lxqt-base/liblxqt-${PV}
-	=lxqt-base/lxqt-common-0.11*"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.13.0.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.13.0.ebuild
index de85f45f010b..60cf446f7c45 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.13.0.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-openssh-askpass/Manifest b/lxqt-base/lxqt-openssh-askpass/Manifest
index e21ae0720b4a..56b3a8b01ed9 100644
--- a/lxqt-base/lxqt-openssh-askpass/Manifest
+++ b/lxqt-base/lxqt-openssh-askpass/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-openssh-askpass-0.11.0.tar.xz 14028 BLAKE2B fb65748f8246fe5783d67aee1b96759a0a8a5be15b4330d2ad3ef2654b3dde59d7a7ca6e993992af5a79deefaff952c1f8f6d42795029c6f200ff2a26e79f6d3 SHA512 746c70677af0d93544de805ec53c8cba3eea81a32d0592cf3a14a350095b26097880d0da70db46161e03957b31b8b1e308e657fd2b04b8646b131e44d984d6d4
 DIST lxqt-openssh-askpass-0.13.0.tar.xz 14336 BLAKE2B c9265f0df40dd4826c08cf3f3cc2bd6304db40770b402c117adcb73afd823b5937df8a40e2deaa67c4d7cd581ffd5cca7cca48f41b4059ffc14e6a6bb66c041c SHA512 2ef92c8a75139d8827e38e0f406f9f9f52717b0918ff511baa376825cfb586f2821186692e1e63bd4c569c441ea4eff63a11f59b89a90f47738ece86a898e761
-EBUILD lxqt-openssh-askpass-0.11.0.ebuild 970 BLAKE2B 94571f561d52434a0085a748e0bda49d62325924095087a68880171b0bd4aabe82b882c27bb241869ead9fe6ba9ff4160f0975440ba0008bce082598d3dcdaed SHA512 b60ee522985ad407653c50c1daed733f3bc347a144250ba7b508318b58edd014ad534bb5b2dcc989e709f1a0ab4c03976bf0ab773aaeadf377d6cb2a9d64fc08
-EBUILD lxqt-openssh-askpass-0.13.0.ebuild 911 BLAKE2B da9e7613c76444bbe8eed649148245199acec13cd3c2c07289e79443d3c4623b6b470cd0517990e9099376b9f0af900743508ed30a44eeb05f21631ec12179c9 SHA512 67f2c6589a4ef6414577eba115dc853fcd542107723c2e5786beedd11885fc77a5e5b062fc5cb0f1f55c7124d5e7ece211d4a357a9a8f9884b582ccd2e7e030e
+EBUILD lxqt-openssh-askpass-0.13.0.ebuild 906 BLAKE2B 2d462266903d2b2bf14dfe56fd7044ed95335075adbac8a36aa9cf22a4f17653c2db02ac6bf53da11fbd3ba61187e7a2e7eb4bd810e0a499a78545054399957b SHA512 c53a254296ac7d53ddf7745e01e1d6523abdbf62a1fc9780768c70250bd51951b4214afdbdb571dfdc3f715bea15b29763d6d04c3494ce90f6941fd48b58b198
 MISC metadata.xml 326 BLAKE2B 1e00f54527db197d3a43db75f66f6f3d7575560895b815593763522c4696dfc15d5293283cbbf2105747d1b367b3da0c15b1ba2d8bd8bb6905899d0ed51641d4 SHA512 b3984c193ce7a1aa091c4bc90c8933245e1479094ba3022fd9c922c89f81c53a2469542606d6e87d5d6ff78b980999a4d4fa42297363cb31daec41ec9bb0a3da
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.11.0.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.11.0.ebuild
deleted file mode 100644
index bf937cff1423..000000000000
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.11.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt OpenSSH user password prompt tool"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	~lxqt-base/liblxqt-${PV}
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	doman man/*.1
-
-	echo "SSH_ASKPASS='${EPREFIX}/usr/bin/lxqt-openssh-askpass'" >> "${T}/99${PN}" \
-		|| die
-	doenvd "${T}/99${PN}"
-}
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.13.0.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.13.0.ebuild
index 148ebcd7b1ab..906aeccedb90 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.13.0.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
index 668de2c96ee1..5f80f8a97cda 100644
--- a/lxqt-base/lxqt-panel/Manifest
+++ b/lxqt-base/lxqt-panel/Manifest
@@ -1,6 +1,3 @@
-AUX lxqt-panel-0.11.0-fix-undef-explicit.patch 1052 BLAKE2B 15ace146aa361659b80188c5061444f413d13812fb1982363a8d28d1d2442318598d3f613494bfce5fa170aa536a686b9b0d945084bf570f16dd7b491bf97dc5 SHA512 e7c29561dac09b90cc6f924f73ff80114e705337f6f40086682c236d6c387a776d733e34ac6421e7af34a0ae77e2debd000ae6b74ebeb2eb967fedcbe6a99a88
-DIST lxqt-panel-0.11.0.tar.xz 262964 BLAKE2B 6cbb741731e89dbe99fefc8ceb983e346128a3122507a6816db848c9bed0b8f4f3b5f08e8f7ccd3a1b72ed7161a0772188836bec55610e248c17425f806dec44 SHA512 875ec28868bb68dff8c4e3be0adb5e5c88213f9ebdeb83eb0df9d5c31a7b4cb70a4d9b347f1ed9526a1eef7adb07f92c36263e12a6455291ec7022901abd100c
 DIST lxqt-panel-0.13.0.tar.xz 273924 BLAKE2B affed55daf1c0a4bf20faeb35278a7d0c7474e514627d24c33469954bcf57ef2c5ee0ac1346918a3edc58f929f07a923e730d0c8ec1d32eeb3d2af41134beced SHA512 f9ea21a24aa8fc0898c756349256a9a84f4e8469743383ce4372f5ab3719170c84ec731d661f7b3355b7501f16fa862ef9d64b7b346e8abd4cbceb547fcb18e3
-EBUILD lxqt-panel-0.11.0.ebuild 2334 BLAKE2B 9b61f77151060636c5e4d656cc1143e455250355d8a2c48a480fc4cfaab556e34f7a1a07616f57119637aeda480c9406d3ab2691dd573254758a1534d775d94e SHA512 8646b36a9d8db271b94b3fd794e913a3942d1ed5f2db8db2d3c11a0c0877097525b57424f3af09ca17d5ccc21e195b81e2077b793da7589748d6865dcd362f70
-EBUILD lxqt-panel-0.13.0.ebuild 2832 BLAKE2B 6b5cbf64a66f10e5838639c5fa1c14402dd10b7eeb07bea12a46552cbfb6f5eef55e20ec34267201fc707839ea48982c600402892ea26b2bb464e8ccd4f43d0b SHA512 e40881e762efce80d2f0926079c0cd93ba7c597d66e3c559c4b5a7afcb2f9fa59a3f1c6a17919a153efd4d0fd3c104f2b041683f9460bdbf714eeaf20566ea03
+EBUILD lxqt-panel-0.13.0.ebuild 2881 BLAKE2B bb9694192d9a3beb262d16faa94fe3fc21bef539bf15d1b267e5ec24594f633e5baca6b8d02566abd29b18be3a47adbee8a55abf576b79ee18de3c25e6a6a9de SHA512 a3c8a76c97111435069c591a7d122c8201604a55676c5e4e002d919379e659a40eb4927b711b9bd7d9e112d500a7f1830d1f7021eca00713b75181b3e0ab8d08
 MISC metadata.xml 1505 BLAKE2B bab5a3343f1b765980b9b59a7a7d2b3d4e9968e9f47c2d9965bd1cc59b9770d69e543ecb2adf0c65bed3324becd988e7388218ddc19039a895ede16713014b80 SHA512 3c4775f11a763645878d24f3f5cf4a6c6b8622ee6bb6ccc8cd28582eedc8092030dcff06734db1c3266f13a076a63e1474d1334c206fb4d0bc55829eb3f9f1b4
diff --git a/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch b/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch
deleted file mode 100644
index c6349c25cba0..000000000000
--- a/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001
-From: Palo Kisa <palo.kisa@gmail.com>
-Date: Mon, 30 Jan 2017 12:21:10 +0100
-Subject: [PATCH] plugin-kbindicator: Undef the "explicit" workaround
-
-..after include and add explanation of the workaround.
-
-closes lxde/lxqt#1251
----
- plugin-kbindicator/src/x11/kbdlayout.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp
-index c4aa4e27..883df074 100644
---- a/plugin-kbindicator/src/x11/kbdlayout.cpp
-+++ b/plugin-kbindicator/src/x11/kbdlayout.cpp
-@@ -33,8 +33,15 @@
- 
- #include <xkbcommon/xkbcommon-x11.h>
- #include <xcb/xcb.h>
-+
-+// Note: We need to override "explicit" as this is a C++ keyword. But it is
-+// used as variable name in xkb.h. This is causing a failure in C++ compile
-+// time.
-+// Similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080
- #define explicit _explicit
- #include <xcb/xkb.h>
-+#undef explicit
-+
- #include "../kbdinfo.h"
- #include "../controls.h"
- 
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild
deleted file mode 100644
index f37be9fee9f2..000000000000
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt desktop panel and plugins"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu
-	+mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop
-	statusnotifier sysstat +taskbar +tray +volume worldclock"
-REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
-
-CDEPEND="
-	dev-libs/glib:2
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kguiaddons:5
-	kde-frameworks/kwindowsystem:5[X]
-	>=lxde-base/menu-cache-0.3.3
-	~lxqt-base/liblxqt-${PV}
-	~lxqt-base/lxqt-globalkeys-${PV}
-	x11-libs/libX11
-	cpuload? ( sys-libs/libstatgrab )
-	kbindicator? ( x11-libs/libxkbcommon )
-	mount? ( kde-frameworks/solid:5 )
-	networkmonitor? ( sys-libs/libstatgrab )
-	sensors? ( sys-apps/lm_sensors )
-	statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] )
-	sysstat? ( =lxqt-base/libsysstat-0.3* )
-	tray? ( x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender )
-	volume? ( alsa? ( media-libs/alsa-lib )
-		pulseaudio? ( media-sound/pulseaudio ) )"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5"
-RDEPEND="${CDEPEND}
-	dev-qt/qtsvg:5
-	>=lxde-base/lxmenu-data-0.1.2"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-undef-explicit.patch
-)
-
-src_configure() {
-	local mycmakeargs i y
-	mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	for i in clock colorpicker cpuload desktopswitch dom kbindicator mainmenu mount \
-		networkmonitor quicklaunch sensors showdesktop statusnotifier \
-		sysstat taskbar tray volume worldclock; do
-		#Switch to ^^ when we switch to EAPI=6.
-		#y=${i^^}
-		y=$(tr '[:lower:]' '[:upper:]' <<< "${i}")
-		mycmakeargs+=( $(cmake-utils_use ${i} ${y}_PLUGIN) )
-	done
-
-	if use volume; then
-		mycmakeargs+=( $(cmake-utils_use alsa VOLUME_USE_ALSA)
-			$(cmake-utils_use pulseaudio VOLUME_USE_PULSEAUDIO) )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	doman panel/man/*.1
-}
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild
index 899778b60714..2a7a81060a7c 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
@@ -23,7 +23,10 @@ SLOT="0"
 IUSE="+alsa clock colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu
 	+mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop
 	+spacer statusnotifier sysstat +taskbar +tray +volume +worldclock"
-REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
+REQUIRED_USE="
+	|| ( desktopswitch mainmenu showdesktop taskbar )
+	volume? ( || ( alsa pulseaudio ) )
+"
 
 RDEPEND="
 	>=dev-libs/libqtxdg-3.0.0
diff --git a/lxqt-base/lxqt-policykit/Manifest b/lxqt-base/lxqt-policykit/Manifest
index 6d3a17456837..9326304872c9 100644
--- a/lxqt-base/lxqt-policykit/Manifest
+++ b/lxqt-base/lxqt-policykit/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-policykit-0.11.0.tar.xz 31336 BLAKE2B d0e562660e3aabb7fa46447dae27d60ef3b1b9429deaa9f21a6e1659032f5bff8d9639e6f6639c13a239c2f6978808f0bf8283612eefce20854cd08ce8d7f00a SHA512 f4c8a154e30df18118444d8caf09bd242aafb17309bba77f1153a6b3db74291d35fe10ffba716293203095bcaa70195414e6b10773f8fe3b48829ab72820e5ae
 DIST lxqt-policykit-0.13.0.tar.xz 33144 BLAKE2B ae9416d9e7c98c67d3d428ccc28e28a97461f6213e58f90968a44654ffe94246f3eb5f8d51617a2626d805a097f5cdc531c2567fbfb6e3cead2f3aae7c3a625e SHA512 c02525ed60c3882b9fc431630a750937425f8ff296fa82112a2e88cb9d5b96767e2a8ff514daeee5d6dded96536cbb4520bc7bccb6c8fbe4e405168435f9f22e
-EBUILD lxqt-policykit-0.11.0.ebuild 900 BLAKE2B 85f4414f84ee78af9f2c197415d3186ac0f016b9d12bf0d5cd38646b485815cb92db84ddfef14ef5b663dbced0e4b9e1d562c31c3574127f5553512c55a64c5d SHA512 5176ec5d3905d901f55f6ed4dd4dc9945e7000315c1a23007626d6d866de97b87fca1b79736ed6f213ca99bd8cb775f54b0cf04063f1dce7ccead2767237b721
-EBUILD lxqt-policykit-0.13.0.ebuild 921 BLAKE2B e2d5744ca076b6331f625b5b1086922b1c100d4e24ea39c3f5e3dc51e1a8399e5115418723cf1f62dda40a669f59d61085dfbf5cecabe3c6bf0012f3e31e5d84 SHA512 061f35c351f5b0a943892c0e8287f2810871f53df8f5714214a80253f4d98b956ebd40ac8e43d41189b3dc6e6a997e1bf4965b0f7c0d9dccbd2df148a6572906
+EBUILD lxqt-policykit-0.13.0.ebuild 916 BLAKE2B b0e4222c40aa15fceed3a5a6ef9d26ab36785b9b51987312b33b3ab222e5e2b0dd2c634a6b6709661410af1883576a46c089966af712b26951454d7d18a1caf6 SHA512 89b844e32ee4a66c96261f857f66b6034e0f604d66b88f8b54824e193723be2ef4366447901eb14deb9684e4d0019c4db27b438b8cce89a3be24e58d2ea68f42
 MISC metadata.xml 320 BLAKE2B 06af6102783b41528cf4a8afd437db1524460cc47ff1004e4e45a8903673019f6c85ff948472d07f053787a767c2d5b3c1986ad20645e0418198e8b7e2d20736 SHA512 24085bd13cb0c25b25737c74a4817ab6a252079c0cd3d29f3caf1ab5e02e85f944653844059ecedf28629b38ec46a02163c806f600bcd044528d4951868e168b
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild
deleted file mode 100644
index 8c93093f15f0..000000000000
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt PolKit authentication agent"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	~lxqt-base/liblxqt-${PV}
-	>=dev-libs/libqtxdg-1.0.0
-	sys-auth/polkit-qt[qt5(+)]"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	doman man/*.1
-}
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.13.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.13.0.ebuild
index 59179a687c14..676f5021871f 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.13.0.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-powermanagement/Manifest b/lxqt-base/lxqt-powermanagement/Manifest
index af5b2e181419..d8b59c02c66c 100644
--- a/lxqt-base/lxqt-powermanagement/Manifest
+++ b/lxqt-base/lxqt-powermanagement/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-powermanagement-0.11.0.tar.xz 29680 BLAKE2B 46242ed3d05f3ab198225baba34c5a651882c2a99da3b44201a55a3204071002d19d59e34f5aca2cb744f6a2e08e926b008c8f1c12fb94d3386b242223580e4e SHA512 8cf90334078e95303f938b180cf21f40624bd150f03d72e5975eb105df96154f7d2703476e95ca40923ce56a0e5be81c1db570033bd9ad5fe17afb081b98f0c0
 DIST lxqt-powermanagement-0.13.0.tar.xz 31488 BLAKE2B 0c236015333c013df791bf86ab9c5f1aa3bb8f50c298d40214cb41517c82e646de77439321b3f7bffcabc56553758979ee449fb6e67a7e7f7981860ccde28401 SHA512 849bcd0739e30b0450d358e23edb9bf800e3804e0929d78d9d08c640355b6eb9351df458025fc381215734690ea902ec1896f5e070fd19ad006520148233d77d
-EBUILD lxqt-powermanagement-0.11.0.ebuild 932 BLAKE2B 795b7d170f031e98b49bb5f7ac8240073be7b7b289478de0ebb346268098f1af2fa18dcc2dc268ad987f1eed4dbc15d888e57a2c8755a7c55781a7f042d214ad SHA512 6d97232cc77a7dd4fe61f21d94e7303165306463784635e7c693f5d793a9d6c1ffbf939a383294f8bf528648c26bfdfb8b81c2dedc3aedf0d15a6e2e13ea432d
-EBUILD lxqt-powermanagement-0.13.0.ebuild 998 BLAKE2B 48682fd5de50f255e3276a3f0e0fbefdd934335227d4e5408e03a475932bcd4ad30bdc6e7e54462fccbe3f8682a5dd97f4e65cc2d368ee2be7ac38827062016b SHA512 c69d477a6b89236a6457858a43a1a9e68ca4911509a92bbe30a457051473bf0355b8089051bba109c7efe7711578c65a5161cbeedbebd87af98a34290396739b
+EBUILD lxqt-powermanagement-0.13.0.ebuild 993 BLAKE2B e8466e6400e4a5a07082fb1ffc5f4c440f29b9caa9faf3f6a3c1f0da9dbec1f85d61c811a49cad475b1b01310ce00090f052839fcf27e7e7fbc6d2098363bf3e SHA512 2914d3f1ea8c2768b9b1c0fe79ad8f33ca833ebb21ec4d5be59b32d03c3a048249b47a7d046e0215a5d977449bd0401395933664d54cf72d2a661b85370fc8b7
 MISC metadata.xml 326 BLAKE2B 488752fea9acddffc106b0d4c60fa02a3999e4fef6fd83e572f980686ae1f0bce317b0195abca851f509a2fa305d1d433471a09a8feb38094e28a1dc7a64f124 SHA512 3ac636dc74e16504678b9e95e32fff32e7338c14603576dfbaa0e6f9d69f8130cd1f78b6c122be0f2e8a8ae3dd1501baf3281b12280852d293012b6ff31ef665
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.11.0.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.11.0.ebuild
deleted file mode 100644
index ba646f46d550..000000000000
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.11.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt daemon for power management and auto-suspend"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-CDEPEND="
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	kde-frameworks/kidletime:5
-	kde-frameworks/solid:5
-	~lxqt-base/liblxqt-${PV}"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	|| ( sys-power/upower sys-power/upower-pm-utils )"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.13.0.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.13.0.ebuild
index 73673765ce2a..b69232cfa9c0 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.13.0.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-qtplugin/Manifest b/lxqt-base/lxqt-qtplugin/Manifest
index a758adf0f5a6..b8de412ea80d 100644
--- a/lxqt-base/lxqt-qtplugin/Manifest
+++ b/lxqt-base/lxqt-qtplugin/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-qtplugin-0.11.0.tar.xz 20764 BLAKE2B b70fcb267c525a30e07cf8146e8267f1125504c4c87197f93256f7563b64b4970fe6980e4472bf60d6a3a670a68dbc0c98bcd94d451ffe0bed1aa403b163ff8d SHA512 2e8d1e26b1b2d28bb874d1eb61a2e6a678e8b3477957016bc8e9783a13c821450746cbfe59954a09142d94e67203ef8a28eab8ff8d3d0798f87b5a920ec80b09
 DIST lxqt-qtplugin-0.13.0.tar.xz 23888 BLAKE2B 564a88cb04416b078e0c415efcb78be7acb7d3fa703bf4c30d75cb0e4aba00b443e021f6d37f9fcc983233824a71cd9b15c45b14579310ce9b3b89a2a1d88c5c SHA512 22f059accdca8216b80af8773eab462c779c489575aa7802e82bb95da4f22a9a0d5a1234b2da4cb39c5050a6e9ded3c2b977068cc37af356ecb09e364633c7d6
-EBUILD lxqt-qtplugin-0.11.0.ebuild 772 BLAKE2B 91bc46573528be02ff190320b323db684aef69f8a24ba0761ca581cfe28fa66af90a7e9360ae84cae4ddc0360ca4e05d24e825d4dc96a802b60b320e1b4050c8 SHA512 6ba5c0ebeb2d307dfdcb891906bf26a3d604a495866a6a3b388b83f70056e735e5d82e1534f02e5999005d997d8d0e3065c8724c4b1757e994a47c901fbf460b
-EBUILD lxqt-qtplugin-0.13.0.ebuild 757 BLAKE2B f08dbbe8c0d95ecb24cf95a675e151ab0da28a3f6969facb3de77fcb51b14f910c57024370a1abfd0d53d8530d6719e05e5d08307d6c3651ef4848f0445e9ebb SHA512 3e21c049cda92302d9ed331ba2f7a3f14e6d989450ce7fca623988f7fdee40eeecb61d1bbe103fe4289308c5a2faf34440ec4952d48d0013734ef2c1795afad8
+EBUILD lxqt-qtplugin-0.13.0.ebuild 752 BLAKE2B 497271f85f75ffa39b368e5d60dfb315c89740360843490de3e3efc02f523c70115007cdf6bcb7f12be71a9ec4a7c198b47c34a46d65ab6799a2de106a74d2bb SHA512 4ae7b825b258bf199180d0ffc020e60590d538e46682a9bd221c851f52f7ee46b750f43397ffbf72969bb359bd76ec64e74ed3dad36ef9de50564e54f469a29a
 MISC metadata.xml 319 BLAKE2B ed7979a51580013c60fc88f432f2d8a0597a4970fe80282c91bac412d9e742d563972b30099fef401a5fa2d9bd66fc94b139e082f9eca9f0be9426a0cb8bf9de SHA512 960097272754abbf37028a661cc950852cc2a5573081acc2eb8f101ee865513d639a18f3dafe720a92b52ec5b8b48f52f4c79823dee88d0ffc59df432e506a78
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.0.ebuild
deleted file mode 100644
index 074dbea50b08..000000000000
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt system integration plugin for Qt"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/libdbusmenu-qt[qt5(+)]
-	>=dev-libs/libqtxdg-2.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	~lxqt-base/liblxqt-${PV}
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.13.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.13.0.ebuild
index 08238df980db..bea10d92ccc8 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.13.0.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-runner/Manifest b/lxqt-base/lxqt-runner/Manifest
index a2af9b6ecc5f..45954504734c 100644
--- a/lxqt-base/lxqt-runner/Manifest
+++ b/lxqt-base/lxqt-runner/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-runner-0.11.0.tar.xz 209040 BLAKE2B eec9d11f06e31b758b46216ed9b52050b6bb3c7cd697af5aee735e01815a67af3b3879cbb8c2a57f9ad340325db48b729fe58a014c09017b240e93bbf7d22385 SHA512 ced1f790a688fc6b167d96fcfc0f32a695c727e6bf3e4eaa43a0b4d1fb1379312788e2d190f77ade8b18fdce2d2993a7546bcb3a0246efd83e7fdb231b421fb5
 DIST lxqt-runner-0.13.0.tar.xz 211776 BLAKE2B bed474f25f485e5c9099b12f65c1b46509427fc6d5d50ac345e83e473d4001679668f19265f9bae442e0c6b196d4f00922b9a38991929f71e30d2b4357c53708 SHA512 fed007134f252f10d215266005a03354f70960cbe77ad37bb00db27e0054b0c508e5dd15a07630525b134c2ecb7db2e36f6304c9cbff60dcf4c3831dd31641c7
-EBUILD lxqt-runner-0.11.0.ebuild 1003 BLAKE2B 617ae207bd655e4b680046f6762058ff8b2a3340ff6c1e0e2983b400ec6e257ebb6e59dd85c6adbd368ad80753ad2af67a200b23f9eb8ffa8901d958a30674f4 SHA512 2c544d92bb8a10188df928e1e3b4a90c435e4cd8896d78414c2efb2bdc13ce41fb7b474f795a0ac8f087aad458430f095f24029cacdf701072ab71ca003e3480
-EBUILD lxqt-runner-0.13.0.ebuild 1024 BLAKE2B 5fae88b713155282a87e07fa507827d308910bb10e94a834e9a4a154eb665b9ce8e5a37ee228b1bcf46ff74595025408184218e60eae396d26f03ccf89733a43 SHA512 2f61dad6242a9658f1e99fe283334e6c38a9df7f6de548b57d043a13220b06ebfb707b848205b0c198cc5395024f9900ab654b7185323183341ebc9f20d0208a
+EBUILD lxqt-runner-0.13.0.ebuild 1019 BLAKE2B c608fa4faff48d7f37656e91771e0d74d3730540248dd523607d2787de985ec1415581e19abffb9199a0735116029f2fbc87e66b3caa8475d77efe9fdec88838 SHA512 5f62cf8098dad8153570ff8524ec3c5fb4ed3e18b5d7ab9306a004d0df4b2df52d39677de68fd0be2c2ef91c4f78d74070d74d3a3c55df5cee5933a0ebf142b3
 MISC metadata.xml 317 BLAKE2B 1407054872d1acf5f80332fe07317c5cd8f8a3bd44bbfb7a74a6dc7738c861a2f925387208ee12ee32e6d8c8578f03a7ae3d07ea05d65bf6ce44361be87b9f87 SHA512 7ac300651df6b6a5cd22ed838779e880ab16717d07cbe084bb7536a8c41bb092168497482688fd3e9208bf2ee6528d62b2e0f7e69c6980d520cce4838b555e77
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.11.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.11.0.ebuild
deleted file mode 100644
index 92c648cc33d5..000000000000
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.11.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt quick launcher"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-RDEPEND=">=dev-cpp/muParser-2.2.3
-	dev-libs/glib:2
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5
-	>=lxde-base/menu-cache-0.5.1
-	~lxqt-base/liblxqt-${PV}
-	~lxqt-base/lxqt-globalkeys-${PV}"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-3.6.2
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	doman man/*.1
-}
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.13.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.13.0.ebuild
index 7afdf29a5631..cc0a2a4b5f2b 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.13.0.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest
index 914811ea4be8..7dbc60ebf2a8 100644
--- a/lxqt-base/lxqt-session/Manifest
+++ b/lxqt-base/lxqt-session/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-session-0.11.0.tar.xz 120680 BLAKE2B c62ab38cc3926666ad4ed2d6ba2fb0f1f1979ef14f53aaba1d213238b16907762d3caa0b170e0580578f482ce37d8cd5365d2711d8f10b5168667f17619736c8 SHA512 3f45d3c8ca2856ab37e88554f5021a7003e2293552532b65b53a84fc886e8b5f4f0fa3e90b1b288d2f866f07a29e3170305dc611c4f31c6112a824886768dab9
 DIST lxqt-session-0.13.0.tar.xz 135240 BLAKE2B 6856b6a14e635408ec86d612ebd549431afba74d990c23977ef8e14cdc043b039888ff5e0a67f265ff4085d936f5fc3d655a4bfcb94f342bef375d597d05de82 SHA512 3ab6161ee75340f823ec82d20ead9eacf7441fd675e2f8a295fc301187e027013c8a2a4e7ca1262795e9b07d3231dbab032363cadde3bf334865260142529316
-EBUILD lxqt-session-0.11.0.ebuild 1050 BLAKE2B 7d86c48ef1e7accf446b35f1979f901944227e6a453d414c7e54e3cd171d54bbd9e2f9aafb6e888e13da490ac5883b1ee787fb8e623deb50f5dd9b0d148a3caf SHA512 e0bdd1e806a1f3195b184e95806706c63cfe92e9f25ca212283f0a3474d496ceb8e01d115385d08b0a6727df9e635775ea4c0f39f4e7040fc4ffa410a7a24bed
-EBUILD lxqt-session-0.13.0.ebuild 1239 BLAKE2B f64a3b40417ddac69e25c0a534727b49b0b632bc5e02cbf1774b88ffa331995826b665454204415004e9c7ad48d08fedbc87ed116b2567a97dfb8b8710080e9d SHA512 6ca4c4b063fbbd1a881aa438468d0b0dfcfc788060b4c7569ad985a965c7d5bd093016250c334eb2e464b479e9ea89eddd33047dd54dad93be1f86d8073011eb
+EBUILD lxqt-session-0.13.0.ebuild 1234 BLAKE2B 6bad907466fac22023d3d4deea7e81c2d74ac5d68bf055ef75719adae96b94ec2d1a69b7bac2eee0da018aca8c2967cfba60af709b9497efe6e4b135f99b0874 SHA512 a860e557407680be7b572e13d2fcd248741d1fd91105765bd5604ec9e36b99d6879ee69b4e0f4177cb168be125ebe86a4bd78bae6b05e6a9d70976bfba9514fc
 MISC metadata.xml 395 BLAKE2B 842bf93924f29beba87d230d19017136a5d8a55d62f68a4448860641b5dc7dff042e947d3075a653baf915a14b266caec30d249d64ac2759bf54d1997223d029 SHA512 c2843aefd069f9f8c8b96137a0962a7e672b566a48960d2a24e0a6020ec01fdaec3319cab3160ac530d3a50d43c06a0f8cb59977c679aa6e072f7fd4000e34da
diff --git a/lxqt-base/lxqt-session/lxqt-session-0.11.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.11.0.ebuild
deleted file mode 100644
index 0965f9eeb740..000000000000
--- a/lxqt-base/lxqt-session/lxqt-session-0.11.0.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 cmake-utils
-
-DESCRIPTION="LXQT session manager"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-CDEPEND="
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5[X]
-	~lxqt-base/liblxqt-${PV}
-	x11-libs/libX11
-	x11-misc/xdg-user-dirs"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	=lxqt-base/lxqt-common-0.11*"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	doman lxqt-config-session/man/*.1 lxqt-session/man/*.1
-}
diff --git a/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild
index 7baa835721a7..5adb5b3bccb9 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="+themes +udev"
diff --git a/lxqt-base/lxqt-sudo/Manifest b/lxqt-base/lxqt-sudo/Manifest
index 965d99a12e2f..7352f7646dfe 100644
--- a/lxqt-base/lxqt-sudo/Manifest
+++ b/lxqt-base/lxqt-sudo/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-sudo-0.11.0.tar.xz 15960 BLAKE2B 5b4c4f8c748f330508665141d02eb62e1a2804c6510f7fc455c2761527436c8a81c2e3d0ac6484511effe3485d712e10a2741fe1019356480e5824cbb97482f1 SHA512 42f8a74898ed4fa81fcff06837e69e0c7cb4f2fb81b21a0167afd5f0557fab48022de0849c83dcb5e04e2f3f3af54cd0c2c8fc27cde15ad380163a7a9fe1724e
 DIST lxqt-sudo-0.13.0.tar.xz 16208 BLAKE2B 83da7ca7fcd4f670e5569ea9869047eafbac68fd43469a3fba1ba51470f9417fbfa7403f1b854b4270aa9b4779475b7a2a97dcb755e02c189b4d87bd969d4b57 SHA512 ea7d8ca093e736e3cf581605598cb9c8ed4e40bc39fb94a4b44334e7f58ae53c489ede0dcfc75de8daf58c115c1a91ae152f676276488df8a16ed53bbf56fc82
-EBUILD lxqt-sudo-0.11.0.ebuild 718 BLAKE2B a8f7967e9c23e1fb52c49a2348bc7044ab07b603ee27b52b029bcf5e71d15d50afeb1b0da959e23e0b87e6bee7545e2a8b9df16b2ebd35f69f0d7a766c4240a4 SHA512 bdd15308cf132967a5d10f380da39bd1711fbe1e40e2577c000f04fa443226fc1c67a4bf3d38dfce53788e33d293eb2e6f9e0fc5a4e1c5739787df51908fc6ca
-EBUILD lxqt-sudo-0.13.0.ebuild 744 BLAKE2B eab7f711b230eac2bc8fd023d97a67f58817d00ca97b0f1913bcce5a8885bddc21a221af03260741e292b1479c02ed9bc8b673524d37ceccbc57b4fb2d21e0aa SHA512 1a8d45838291a20d89e1f4eac45ed63cea5a8b8b30c054677b20d0cde8b6caf4464ccd933adb895c6b8eba2bc02c7bd4580a40123154a33deb8bc1c6282920cb
+EBUILD lxqt-sudo-0.13.0.ebuild 739 BLAKE2B e6878443efe584c7654e09a01140c9fd113eed691905a2173aa696845cccf4036ba7c26b86c214b4e017b06f3e1420711b43738712361e468e3ca797c88de34c SHA512 02648b5a1eb1b8b9ef37c37e0316a4726492e74cd23260413df8f3a16a5eb1807b45afdf65c7b99f06db61140c2839f7bfb67a785ddccadc150f1fe2bf8b619f
 MISC metadata.xml 315 BLAKE2B 7e2dbd32ef59c7cbfdfd23b3dfa490445f4ad5ec7419fa83f3ed657c07580ea97df2e8f5bf54754a028517744a9230fd7d77f187ed0bab29c2822b30f00580c2 SHA512 33e754e42343bad0c2e726604c7dec977f9ae4a902af769fe0599ac8c067a6c0047794c468f30fbf6d2262c2f7830b14b913758d5398e0a57b8a29a0c4e3329e
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.0.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.0.ebuild
deleted file mode 100644
index d6b1fb0285a2..000000000000
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt GUI frontend for sudo"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-DEPEND="app-admin/sudo
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	~lxqt-base/liblxqt-${PV}
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.13.0.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.13.0.ebuild
index 01f913a3df33..32554aee64fc 100644
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.13.0.ebuild
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 8ee3f34d72a1..e20dbb9f3b06 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/kube/Manifest b/mail-client/kube/Manifest
index b11bf77e91df..a294bfd23d38 100644
--- a/mail-client/kube/Manifest
+++ b/mail-client/kube/Manifest
@@ -1,3 +1,3 @@
-DIST kube-0.5.0.tar.gz 990978 BLAKE2B 7bdabbe89e81ab26465f7e3d8ad769b4b07fccb09bdec5a9cd905eec89de7b25a0165ec1f1b916c668cf50d9f2e889f9763bddfe49c4223b167bf69a61bd5658 SHA512 90579ad21b755ff151bfed362f389fdfa66185f92a8fc72b7c9eb4e0108d97a8fdfbbd7a07f81a5c6d6cdcdf79255c3e614bfd43961984863866de8f13a21d28
-EBUILD kube-0.5.0-r2.ebuild 1080 BLAKE2B e874c46c0f836721ce9fe063a2cfccf5b4723aa4a2b68b2b69784abe4a7e914981ff1c761fdb1756d35bc9eb046ae6cca219f4081c28f6ea65ff5b17ff57353a SHA512 0ff88600e4f40c1c4cab8d5ad3ab33add364ce7f857df2cf098e58b25368c789b973fa2a042d71f50a073fdb1879fa4491d4f3d35364c32fd81d35a3deae6ecd
+DIST kube-0.7.0.tar.gz 1073502 BLAKE2B 0636167ed1717b8e3eed8e82b805b3bf2de0131365d5f72a15c85f2eaff7c1fd4c9b27a1afc1ecadcd6276ed9307403533ee335b1b93019efb402f2f0b23d303 SHA512 0399eba9c39b1d35be00c502c84cb7e903ab3f23b0b9dffd154e8fb2c071d8bdfdd16b606c66e5e7d52c5440a60008771d15d8e6abf866df86d2bb3733f34deb
+EBUILD kube-0.7.0.ebuild 1077 BLAKE2B 2ea56fca1614b3171e7d184b11592fa6512a8083b959d34368674fe5262dcbccf64174ea239a908d624dd75a8482143b397271a34a8c3aad82322dcd0f314f18 SHA512 6db13b8aae03768c34f82507fec136fb181a26054e2f6d54660f349e730eabec78b0369c97ae5c0daee13db865b15f438b8daf92d4433af6ded77b5701a5125c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/mail-client/kube/kube-0.5.0-r2.ebuild b/mail-client/kube/kube-0.5.0-r2.ebuild
deleted file mode 100644
index 99eab6a5cbde..000000000000
--- a/mail-client/kube/kube-0.5.0-r2.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_TEST="forceoptional-recursive"
-inherit kde5
-
-DESCRIPTION="A mail client by KDE"
-HOMEPAGE="https://kube.kde.org/"
-SRC_URI="https://github.com/KDE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	$(add_frameworks_dep breeze-icons)
-	$(add_frameworks_dep kcodecs)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1:=[cxx,qt5]
-	dev-libs/kasync
-	>=dev-libs/sink-0.5.0
-"
-DEPEND="${RDEPEND}
-	test? ( $(add_qt_dep qttest) )
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use test; then
-		sed \
-			-e "/Qt5::Test/s/^/#DISABLED/" \
-			-e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \
-			-e "/domain\/modeltest.cpp/s/^/#DISABLED /" \
-			-i framework/src/CMakeLists.txt || die
-	fi
-}
diff --git a/mail-client/kube/kube-0.7.0.ebuild b/mail-client/kube/kube-0.7.0.ebuild
new file mode 100644
index 000000000000..f1a92d59b071
--- /dev/null
+++ b/mail-client/kube/kube-0.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+inherit kde5
+
+DESCRIPTION="A mail client by KDE"
+HOMEPAGE="https://kube.kde.org/"
+SRC_URI="https://github.com/KDE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	$(add_frameworks_dep breeze-icons)
+	$(add_frameworks_dep kcodecs)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1:=[cxx,qt5]
+	dev-libs/kasync
+	>=dev-libs/sink-0.7.0
+"
+DEPEND="${RDEPEND}
+	test? ( $(add_qt_dep qttest) )
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use test; then
+		sed \
+			-e "/Qt5::Test/s/^/#DISABLED/" \
+			-e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \
+			-e "/domain\/modeltest.cpp/s/^/#DISABLED /" \
+			-i framework/src/CMakeLists.txt || die
+	fi
+}
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 2b89ecdb91bd..08b5dde66d6e 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -3,5 +3,5 @@ AUX roundcube-1.3.7-pear-removed-installed.json 6981 BLAKE2B 3caa7d2d18f4fdda2d5
 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
-EBUILD roundcube-1.3.7.ebuild 2415 BLAKE2B bbc201ab399b38498529f6496d10fb8ed712ec5d33bbf003f0fd182bcf8a5c9331ad4d11482608a428d17a8e944ba7fcea2144a754c2dd43f7d96d3cacfdd88e SHA512 36d1daa418cc78ee45d122c4d52429681d82b351352d5a07e3638281401343777d35413696c0ca41d74f00f4e9579f279f00ece67dbba49499be9f9491ba3514
+EBUILD roundcube-1.3.7.ebuild 2409 BLAKE2B 9d5f8706df18aa5dfe4a0efe87d697b09c769f716ddce35f9e7e5e42a839507d16ee2c88cd285997476a0ea2212912995709034d0ab3a9f76be85fbc26fae0ae SHA512 0f70f3dd9eea3b0be6bd75574c8f256f4fb240a5c94c6a08dfe92e483c73115260740cd033a99e64855b30a8eddfab11e7b1bf3f2339e5ec17eee6d18d52f43a
 MISC metadata.xml 955 BLAKE2B ca9dd109384433cdaca59b820aae795a4555459cf36f057b17949d601bd5ece8222dbb59502872ac6a16387e55839f859b91a6c6718523aaf66e4b677d25d33e SHA512 ff1b796f79f002814b038763305a404ee2b65d49346a10b423dc8df982ccd4116548c8159bbcd551ccdcdb5824ef6b0774abf6a6bdc851beb896f6e5ed97bf1a
diff --git a/mail-client/roundcube/roundcube-1.3.7.ebuild b/mail-client/roundcube/roundcube-1.3.7.ebuild
index 034e4959c8ef..bcfc53201e2a 100644
--- a/mail-client/roundcube/roundcube-1.3.7.ebuild
+++ b/mail-client/roundcube/roundcube-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-compl
 # 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"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86"
 
 IUSE="change-password enigma ldap managesieve mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index f8109447764d..bea0d31205ac 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -112,10 +112,66 @@ DIST thunderbird-60.0-uk.xpi 684154 BLAKE2B 03902624a0f40e1c17248bbab31cc585a98b
 DIST thunderbird-60.0-vi.xpi 638422 BLAKE2B fbcf5bf28ef6c090193258d2eb7cf5a3e8f33a87c75413f04ad5fcda6050897d42ca75a709716523c0fe1366d24160f18bd27809259e1889c7bc6729544e6809 SHA512 c7d156ea524ead3ac75dd367f71779a178d2594d37c6ca2fa9e2715810289d07ed170fd49653735a07695ea474791fe26980fcd9fa1e2ec19f97a015199340c1
 DIST thunderbird-60.0-zh-CN.xpi 622464 BLAKE2B 1b06dd9c23a6519561d29b8f5a150d2f15df19a2a897d418deda253b24562f774ea69a18fe1de466f8d7f9f9d11b89d6c2c7a21b9feba8c50e6331ca14f320dc SHA512 759cdf2b1e53597bc3273d97ff119cce4519936ed9424060c857349f701e7a94519a43c1899d4e3e20482b3a4a8eb4c4dba9d09ca6e74422fcf07420b1b0c3a4
 DIST thunderbird-60.0-zh-TW.xpi 626189 BLAKE2B d68803285e6abdc76e8cc61abb72dabe4b47eeb482f59fbf35be105d972218c12360b381ca13b7b9f1a6db4ba8e94a2b3a93293e20077da8d5f14df6a552dcd4 SHA512 8ec61caa32a6f90f2b553dfde6ca0dbbebeb517db827193d73b0c492c6a1bcdd152fbbecbcf501a95ec62bf2ed01d926274f4f69a49ecccfbe401bc1d34f941e
+DIST thunderbird-60.2.1-ar.xpi 627179 BLAKE2B 7c3794cfe13e1c29d44c1cff7c86b0610762de3cb29c2ea8692c3000db22eb3afedb40c092bcdb4244fc7c21970c3bb838c14659ae9e669b7c456d78470da538 SHA512 c41737af99fc3d82547e82784289b6292d0bbcb47be13a785b668a97c0b804d9ce4ed0a7e18f089d36d234d085f72af6c1ad4908c1d335baa83bd0bb591c7538
+DIST thunderbird-60.2.1-ast.xpi 560865 BLAKE2B 550692ec34d6965122fbac0e58352ef503e053eebc2b9c295d354cc19a49c9f1d6e12363c67d1fe74bd0cf078d2613f637bb82655f7404d173005c389375c534 SHA512 e7f4878f5999455cf61f667aec7dfd285b0624a7410feffb9d5fdd0eabd51e988d64bb97288cf601f512c8f42d450d01abf80af10a5055bec8bcecb2d95d28c5
+DIST thunderbird-60.2.1-be.xpi 659077 BLAKE2B 96adeeec268a1a0bf16ea1b9c705417ddc59a401f1ce4cb4d33a007dd6fe1e5c12c5e4d96202c43914f9ca5015ec0401818dd65062a4d5770fa78f43ad738ade SHA512 9d4499e3776f6e93083b44113e14e2899dbfa26cdf19d3eb28a5a87df8bc3fe99edcb9b8c572cde6f0488683f7c1b2f3fc2c24437da712633574aa440e6fdf01
+DIST thunderbird-60.2.1-bg.xpi 665511 BLAKE2B 7a0643b6afd5738b8049bcc955fe1c8089cb077ef2dcea87fa4ef14db64381ab2438829bbeb40657805eefe49920f2ab8eacc0f9d27a72a19fe84c90e12f6e9b SHA512 ef79c6fb8149bd83aba5d18ac05d833caa5fa84c40c6e7df6f7d82b0c4d2053fde8dee10be60c9c0e68213295d98b1226d7f0d7b7e6152249040a85ad8327ed6
+DIST thunderbird-60.2.1-br.xpi 581591 BLAKE2B c47d508ac793f09eeb758b062e2b21ba6fed59e35a3a4698f47d4229407ba347abfef4f590a355c95175d10e0bf9b9bf99f400e7bd1af441c9808cd3dc185c10 SHA512 d54c60f9125aff7ab5a1d188769326324586ba3daab75916d02800680a9ac010b4bb08d84b1afc1345f40b6d52c1d661ad04f8c9b1a8021690516d0631af3b50
+DIST thunderbird-60.2.1-ca.xpi 591970 BLAKE2B db5e0bdcd9ac3dfbee80ed6d691f5c2b8e12cec654edac4441ec4faa724b25892f14f143f4355d9b4a2025e997e1fd0f647e4c60c2306c315b163b449d0e4780 SHA512 483417c228eb084839e15969550c17aac20d28dab770729cd2d9f2b06b5bf3e01b7e9ec4dd5927405464c87f96f86f66791fde646224a200551d1b631d6500b5
+DIST thunderbird-60.2.1-cs.xpi 611201 BLAKE2B a13fe6b452088ac2905656db9600ffbff9e0fe3dc57935108a390f95fedd311e634070f100428e24672e69f4b7a8c697dd97926b66f8375a4c9d533340a546d1 SHA512 f47e917ebd48fe056d775ecd824cf29ee6191223526f124941bc82bc1feca664ee7182cd2c0dabcab0bd7a2171da381c744575179d80936cf65efe3db8874b67
+DIST thunderbird-60.2.1-cy.xpi 582232 BLAKE2B 2978bbfc433c068f7bb724ebed4cda41f5535665b8e36fed0938b21798a8aa954bbe4f90f44b6720de52594d26f2acb6a4e93a1b0305a94a748c2b8a2ade540b SHA512 81a18fb92a01826ea780a97c65f92baa6920eb653f3dbfef792681ee38da1a29ea33946a374630c8e7863337293f4cb648665419938df5b380c7a073102bf5e3
+DIST thunderbird-60.2.1-da.xpi 570805 BLAKE2B c9e56b2a1cc0de4e293531a67f2278814950783b7088a1530dd5c08c55c30ad4566f129c1271fee36df4f5817e9ed1db452a739c182b251c12e9f637c3dce211 SHA512 b8e8a75111deb9ab31b82f7c7d6f9ff70f7a60cdf384dc7a3bb21c893655124bc9a1c31fb22b42b05c546fcbd3e430bd1417f6795b66e43140a21506edca7e4d
+DIST thunderbird-60.2.1-de.xpi 582574 BLAKE2B fa7ee24a23fe150315d96c8a1be7fd3f76054cfa6817f20718c2bfccef8a8adc20ab451e1491441d4c0e85a0ee28b053752d67ff245019d75d9bb5f2aca1effa SHA512 4b7bd57f2bee29b786daaa1331777b2e81bb281a0954bf8ca2b11420cee81a224ed1d993375ff70a97a8fe33543596c52218966b149beae0e78f832c42ae2189
+DIST thunderbird-60.2.1-el.xpi 691053 BLAKE2B 23afc96b887c1b0e37fb0c2121029f9fa0c3437ac21c28b11cbd454b9b6318755480ea157d04f7962cc3b86326d1e2515a0cc65e5146d8e532f7ebaab7c25bf7 SHA512 20a71719c5fb829a22167fbabb1f1c1ad7fab634fb801fcf7784c6a2094808483a17da500342ac93cbf766d3b5f6078f98ed774c7a67d529a4811c0dde4ac3a6
+DIST thunderbird-60.2.1-en-GB.xpi 550353 BLAKE2B 28a870df8627fbaa12a9e909c521350c7033c21e5e53c385e65228dc45dd16938c4c35c77d9de74be0fa3b5884fb0a7717df3e1064dcc7340508dd88846a36bb SHA512 a012c1e40024a006177563e0735e49fed9e5649367e854ed27343f6e7eb52f0a870cb4257f67e76b6fe045f7657f3f5425174d1c955a778f116f781eaef4b9aa
+DIST thunderbird-60.2.1-es-AR.xpi 595047 BLAKE2B 26c0b06b7f75c1292b6cd93a8ffb4cefec164183ac38da4d6635370e73dda3ad248285022af8a85ac8e10e3fa3772606db3d5a0668678cc049b4ff6af80fd5b5 SHA512 e87a68b60f6f24c70241a9e188cdb2f72e9fa29128c480013e0b2fd70a5f75766c985c64618cc96c17bbfc4d7e6595d6e1956438db8e938ee977a39740c14313
+DIST thunderbird-60.2.1-es-ES.xpi 492210 BLAKE2B 0f7c4602b30ac91b21539ceb3e75bbbfaba022bbb8ed195fe30442405916ea000b72a188b85a978449518b4d79ee0d5596afd7dce340adc59a3442e6977a4229 SHA512 4ef1c35fc033e5a1db43aa79ed4f9120fa20f914a2461494c614f9d260086fb8d58cf4e00f425b793630295e45a4c66243c30d7809e3c2596e6f8ce717b93a79
+DIST thunderbird-60.2.1-et.xpi 570866 BLAKE2B 5a718f4a8abd388349cb44f6509bf5a07c2d9641b84599a4ff22df654489afc529dd2940d2a7a3443cda3fa9c04363cf72657ebc377a18c3b42c8c5986b8f82c SHA512 e8b0cab938174f85f2af9936404ff2bc2213e16677dbcd85502b7179794130b01553b6675cd93ca2ef34ab1dc1dfcb9c434eec76c08f68a22ad1acd4b2a74ae8
+DIST thunderbird-60.2.1-eu.xpi 577578 BLAKE2B cf412d1c7be358450a8d17f3000c79aa59dd4de08e6c6d57b089894e3fe81aedc2078d18d69967c4bc47278b4b86a7749c453113a26c1509d8741831f62a4177 SHA512 7bb3a0fd563c5d09ebafc3da6ee312804c8a465574f6b8355ad477e13935b2b6483489f6b039575208ebfa0c8266ce01b3efe6e2fa7e0802eaf0fcbf7dd0b15e
+DIST thunderbird-60.2.1-fi.xpi 575754 BLAKE2B f193f0777ec0576775fd942fd9991ca3fceed4e08894bd84d10c33a0d4235c94ae822c569bc09b2fb0f93092b81c6bf983d986b156ad8d4e598fa4ef92b2ecf4 SHA512 65462fcc19a20d8a404e1511faf3241e26fbf99def1f4e695f4cc920ac872743e119206e0ffa3a3fc42be37d5cfe9ca3d63d95333c94fafc8dfcc073e4b1bbb9
+DIST thunderbird-60.2.1-fr.xpi 608465 BLAKE2B e08725d4fa02c1735c990872f9fa84b70443580cb1bf216fc9dc28b4347cfd9ca70c8f2607e4d6fcc1efd9cdba01902a90db9342e7af6f8ac169c51601803526 SHA512 aae25897c3868d0fc2a42ed79eff8050189e81d2ae2b748f523980cedccc244a182209018b0523b58ac005b941bf84364d7959b4fa403956bb49bd5e46100f47
+DIST thunderbird-60.2.1-fy-NL.xpi 590033 BLAKE2B ab093bfaa1c3a92ab76e2d0d0b1486932833d45c67d86b6332b82b93f150ebce6da39d2882a5d92ecd6043cc9e297327a22c57ff8276a25fb9c29704ccfeb7af SHA512 12d4d8362e59edfd1699fbb65b51334816d9b0ad2f5ed7345b1c3a9a80d1e3e60b0d079e16d1901854fbd2832d56a461beec9cd882ac1571314f81aef763b3e3
+DIST thunderbird-60.2.1-ga-IE.xpi 603505 BLAKE2B d8704f8f2217c0afa3586311eee6cd16430c4680f12c88555c2c02c34caaaf2f767ffaf5939953f8103fd732bae4ea59e94173f3d65e0506e2a5603d60963a36 SHA512 7b8a75797a4e8442db0ca18ba6e331a1bdd9b9c4bea9e247972fdc8ef249d9c6d52202cc4a6537d7c6e648edb120719b88869356d2244e9e85b0f574d2236dac
+DIST thunderbird-60.2.1-gd.xpi 599259 BLAKE2B 88db9ea39c4acf9e5e8ae5e16e7c08c11d574ebab8d7fa1c82416b945c5e07b794a2dc1ec505ff697d51f884f4e6d927d16d5b38d7471b3076e2373e1f184876 SHA512 c055d56d99a79a7bd393f294170b892ceff34dffcb16c5193cbc8b94c3e2aa1a1796ec0146578fece9ba6c4de11c87f379e4818c0960b05927e5e540eabeeb90
+DIST thunderbird-60.2.1-gl.xpi 576546 BLAKE2B 03a21ec2aa4879672675b790a509adb1c231cef47657624ec1a296377b29c35f81b3a9971fd2bd2687205c8853bb0a2a0dc62121c76d986387b59db4b5c4f422 SHA512 5d6c6e769135caeb535f0123c6725eae8fc6fab77e703ca80d6bb1951d14a2f149a1def591968d0c268ad36d409d65d581df1863c5a7d17bae0689d577fe0951
+DIST thunderbird-60.2.1-he.xpi 618364 BLAKE2B 8d45600a325e7bc4694d86841968db2927a42ee0e78786f58c8e234c37f0064d8056ab368a5073e9464903bdcc7ab979af1044f778785d6b8dbd06960a39ae05 SHA512 c5b83a9b8bc3a38904698da2dcc40b21b8a8bce2314edadf671812fc49e8edc699d74f12d38830b54a80d81af38ac168edd101cb7ba0c0d4247620ab5e456f93
+DIST thunderbird-60.2.1-hr.xpi 583459 BLAKE2B 21ead96d533480ece2c935c9697b8c5e69e9565019177a1ee4056471618b647cd67d0e1e12dedb8ff9184fa3c433f3e02a14d8164a974be34188b45f5fa60d4d SHA512 124d68b07766051c71364620e0212956b81e25f1687efd9fd7ea0ed74f6fc3e194f10b82e598aa1f1d8d54a50953202f805b071ea45805e716af73a2115240f8
+DIST thunderbird-60.2.1-hsb.xpi 611322 BLAKE2B 954352b8df8c298e8211403d5866f9c284e98d6d96d2b54f8d349e2b6ad18e1b01f73f4f303e61d337b425d6dd68e55555be7fbda2743d459f681293a3433b80 SHA512 e3d0cc09f4ba43d3b9a63a7b0d9f71101ce636787b2d8d6b94d88455551f6b922c94f0edc310c0cbb7119c8c268bd71ef3d003215d4c74f32359b6cf601b55bd
+DIST thunderbird-60.2.1-hu.xpi 615344 BLAKE2B d1f0965776ced698464519f3cb2f869426b769b4b26105b3478570dfe693ee4c5abfb6389326952865d07366c2f9080ab5559908536ed2c522861ddcaba7c5ee SHA512 06fa03a7bc0e84bed80d2eff93e8729dfbba026fa62552138f69e87177881c0fe07c291e90ce78ca5e8d4debeb5e75fa0df48db605c634a4717cb70a4a2e12d6
+DIST thunderbird-60.2.1-hy-AM.xpi 649712 BLAKE2B a7c01158cde19dca4532321fb47ac83734cc6804ae20b7be2bf8ebd1e5b82c3596c816ddf1aaa8235cbe562baad2a6569ff317a74885d400589f924f46a8780c SHA512 fe15756885a43b882bcc7a94c916fa90ad9b7f7d7846518e446dabedf5df21185f2dae807072402ba7413dd23533bab9ac83c1c6f1488c69b7e42fbf1d6d82ba
+DIST thunderbird-60.2.1-id.xpi 568859 BLAKE2B 7ca1514b2fbb5236449121711013fc26fa1f225c1380f8c6bd58c4831db7696ac73a63df9912b8279da51f119a42adb17e7a49e112390c22123ef1dc5d05c4d9 SHA512 ca6bce5ed8cb66abcbec233941062b01bc18e35d501e796f16609f22a11d40ede0568aa3600a590b6c3bbc073ce74b08095903660371333b8f868867ed2ad6e1
+DIST thunderbird-60.2.1-is.xpi 579045 BLAKE2B 0d5404b555519ebe0dfb101cd132f5b571cbe72cf1f198b672ec25195522b6b139590342e4f1e14cd1ef4e2793da1b83e20aa4411a78a97dcf12a8feb3c69c6a SHA512 1c9578cccc15e64b0fb6985a0d5d9151e90923972150267076d89dc4c16a46848a347f73dfb7a08326fbb8b97f7b51aa6161d995fe0565e30ee67f71940ef712
+DIST thunderbird-60.2.1-it.xpi 477499 BLAKE2B 11aa1ef2c92cf81715c0660408a29dd37da9a8bee8bdcae546adc28a5a23a3a3222e63451aa15648e0256475585dc2e5742bf38b22b8bd75934ea4eb3599df3e SHA512 322e4f05034facbb6bb4e51214e4f95679cc7328846c00b85694a20a8bf4e89c6ce8a6e6e65cddd563169e11ef78b8502a6e9649c890004b5cc371774d125fe5
+DIST thunderbird-60.2.1-ja.xpi 653343 BLAKE2B 981b32dedeaa8176dac5a53a2c856b6f030e145830e38014516cfd3ed4e74f9ec5993659031c1de2479a05ca3daa2c132c69e96724943e970a3754521636b258 SHA512 4952429ba4b73a5357b6d395ffacb7d895ed74900ee21deb3f228fe5623b5bdaeaedceabd1c893c1824c33cf805ee41aae2fc1318a667fc0f9e7ec01ecec4c5c
+DIST thunderbird-60.2.1-ko.xpi 619729 BLAKE2B 971b1143fecbadfa86c13fad4c89eec11951598bebcb7552049b3ed98f3dd5896cf81a315fa497cd7e72b22e3168e62eb252f033862e7ea49897a5f1b7fa6578 SHA512 c060712228441e866e9d4309407a894b7729edde6e135743264d26ee93c0e828a2aabdfacc3be121f53f7c4a47a43d4f6aeaea87034a4652808d9f0a8da77a50
+DIST thunderbird-60.2.1-lt.xpi 605439 BLAKE2B a6f284da627a8ac98a18c7c938b53638de665c7a6f9005a6c200e1da12f6e108ee109c52f9a49d9639378dd695aa2291254283fd0cd6ad042fb9a44d6cb9688f SHA512 440f1d37677ba90f63489fc542b241f570293cccf3a2ab843e9eb8abba664c107e061cb3b14a30bf432459701a51a9b58e6630a220acbd48105fd5a7492da46a
+DIST thunderbird-60.2.1-nb-NO.xpi 578233 BLAKE2B 4a868790ab2391393f646a94d2d5098acfa3d546fdf5c5c823cd9f5768305fc74878c687acfd748a20a2eb4fbb8651dd458a74652b314cf04f7dc53dd3613bc5 SHA512 436ee46a66da118e7a29c2e66bcc5922d486dc6f9bdfc29e025733eac3e1bbc316baf88185bf62ee301273dae95c72b930a4143ee6c1094596714f34404bccbd
+DIST thunderbird-60.2.1-nl.xpi 583912 BLAKE2B 28280d14975769549fdf06f239b51fdbee8f7d915f99d0c64a237dc09f8736f130cd38da15f98ec0f89c9e42b9b08fc1dae5a25cd958baebd553ff8d8e340924 SHA512 0dc2eeb723efcb3af4c3e3f8df3bc07ace232285f65d3cbc2a970673eaee3e6c720dc391a8df0cda3472a3b986fdc92df0b7b4aec0abb2bfb7adbdce475a4c8e
+DIST thunderbird-60.2.1-nn-NO.xpi 577653 BLAKE2B ccf08b3002a04bc231ced93f4b07453f2244de08103d2bf06dabd6553ae72700df6c99c48a69cce8eb7202b12bfe81050110c0107ee4444f04b141c6e57a676c SHA512 340f9704b4d654af42e9cc8bdb85daf16f32af10f2675968f26456c29b788b49d41bc9740c15e52796b74365c1bdc30995e5fffa0ea53abab15d203772c74a78
+DIST thunderbird-60.2.1-pl.xpi 480723 BLAKE2B e9704a151135b13e9d64fe5e2468dd649c118857391d4677b3498813606cb15cbbcdffb08ced37fc3baad4ff3eed4ab83ed3c98818e662475361c2394879433d SHA512 5623ff6b1f322bd44f1826980c0eb459d82ed4ac12a41846e5006eecce1971d2a534aab90ffc6a7b922a412a8828f6bb411f78ef123a727686d4cd08eee7c457
+DIST thunderbird-60.2.1-pt-BR.xpi 585016 BLAKE2B 546684c5086c11bca71a3810c386a90b8e82e54ef20f476d7a94463ab37db2a0038472c333bc44eec9cd46a5478d8b222a52784ae0e31170a47d99a930b49f33 SHA512 ba861f3db1e4a033d66b68ef625220701312d854a50bfea367e6b90bfc15e5dbb994c9eebfd2596da1f4879d0f796ec7826c72a6c659ad205ef7386a4e6052e5
+DIST thunderbird-60.2.1-pt-PT.xpi 593184 BLAKE2B 02fe8b204c3248795aa1218b1e3d84b19e9351520207cded3d05f4db992336d78c54f235b1e53e8eaca0079056755cb4ba905d700d267a8b31e9158d82323bf9 SHA512 82ca4bd6f4d68d187132ab864577e3a16dfe4418bf68796f6ccd477c6eac4bae267054ac06b491df1847cc8e171b373d826f7ece8790908bb9d20ad960db59a7
+DIST thunderbird-60.2.1-rm.xpi 578381 BLAKE2B 4ef395e34f33ea60ff7220879fafbe64dcb153b46fce10fb0782e85cb1e3c05a4912ce4b7b7bdf1fdc20d6912352ed5f7c7dc46f4165f21596ac2200fe481666 SHA512 6f6f8d4116c66ba6cce7b937993c3a188d1f44c2eb0ba178b3efd87236ba71ef390dbe6209f28db7479fc025a2f0a0d6821d1405f2c0045896761d509a90ce1b
+DIST thunderbird-60.2.1-ro.xpi 584307 BLAKE2B a30de1c9acfb3f0b52b316de64d32b2a641fb7166a0a5561052352c97151657fa58dd1b61c91f6e972890cab96555bd32a13f8aa777ccbabffcca682d003dec6 SHA512 24472ac2bc8c09c2c1a35b95891b057abef35d4b420cb6e995e3344340014f89be4fed706747fa4666803a23562f6a8e3f60843ae78a2ae129c154448ff7fbdb
+DIST thunderbird-60.2.1-ru.xpi 694704 BLAKE2B 6c1b51e60190d039b8cd467608f83246ae6aeff3ca513468556d6d351073a1cc67b46084d615c5f35a4341b1e4557abf253eb40d444036c2b1f9380f4bcf39c2 SHA512 9c0d08bc4b9efb53011e50f68ec0250c79b571851f71a3c3b9c6114c3f9abba13aa00d1f7db2b10b0b255d8899b37a868212e909b2eb40037d149154f126eedb
+DIST thunderbird-60.2.1-si.xpi 643790 BLAKE2B b1281a4035549a7c8a2ebbebf2261f0f6f8d2691cc2da9310ecb27b14345f03d3133689d2698e26968f23c313004720f4b80db14000b98ab94a1540271e53a3e SHA512 80aaa375781a60c8ebdbb7eeeb00bc843715e5d4a48762406aac85d5c0d183a9b02eb83392ffd2f0d3e82e2fe9f66a72626fcee9a8e35306ead5499f3538a04c
+DIST thunderbird-60.2.1-sk.xpi 612216 BLAKE2B 5122498248a0958830725573fc231b1c7d7832dcd4028d58a66e4e4da56ae4f2b409ab9e6493da669cb7fb6128c9a2359dbc635544472094aa06429978905e6b SHA512 2bcee77666ffe135925c313482edb8d32c0004f458b33d9b3132b57db664fa56318d8f0b0f83fc2286283a3879fbf1882dc8e9c5562eaa5116400a6f6ffd2565
+DIST thunderbird-60.2.1-sl.xpi 589946 BLAKE2B 51c0a97552420f5c675c3098458b5d48b49a01c411a2715c74770a5387c712aaf9ef0ab9d335f768ab39d6eb1b3678db536adff1dddab2f8183dbe99639c9dfa SHA512 ba4a08a9f1ddeacf2b9c4e46cc13a0c2637eb1a2373baaa9cc4a868d810dea08fb93162206b3b6839fe8d6d500544d785c470dd76cd842c752a8ddc7ddba8cdf
+DIST thunderbird-60.2.1-sq.xpi 593094 BLAKE2B a8503abd814b1db1df6ff6378d2d190f77ffecbf34818d456b67e55832ec8d87b7e68f27b78b09732c147040b0520bee4fc5eca976b0987289f0c870706e618a SHA512 22d2a1c92ce35fa815de772e953b29887a973fcbe3777c54e5ea3b0867c9252c23f9134189345c4578840014fb084c408dad7b753a2f404a50fe762097bea98f
+DIST thunderbird-60.2.1-sr.xpi 637720 BLAKE2B c81d73640c3deb3dc58e3bf1602380393791b5db396d0e689d2560c25a44395c2834ac6028b20f4336ec09466e0958cb61473286e5f8e6c5f02531710bed38f2 SHA512 b5359bd3fed66cc7b112f0a6e529c8c54a033f499fd3b609ef6980676cd43ed7ce972d8f8b81994f5cf1b1ce55a7169990a895549cc671502192cf95eef4fd8e
+DIST thunderbird-60.2.1-sv-SE.xpi 594077 BLAKE2B 3050274155460b06c69ba1494096a18c2df55bcbe36859c2ec2969aad50672e4f73e8a8d75b3674c937e8e84b2217a196ae833834f628240dc5f50fadf8353b6 SHA512 5e634e247a79ffafb62acaf701ee808e1aca91b12f5b6bbcd43625b477440700be6a7bc8d11fe41e68d887550af0c14e8509ef5864aee144e2728255ca1d14be
+DIST thunderbird-60.2.1-tr.xpi 598009 BLAKE2B 92963f4d5ea6f89c38bdc826c3d3b62275be2e667413ef71c37555b1581df89369944a51529cbef459cf177ed1c7c4e85d67e7a3209460e26e4e598d6319cc05 SHA512 ca3e430d82b8b8833e24ea7498d48ee330e4009de9ae145e50ba06ae1072c3a93b1d4e1d1bfa22c3452da8b4b0472b8926d13318a08d6730475057f337f2f39c
+DIST thunderbird-60.2.1-uk.xpi 684153 BLAKE2B c7e2ef3d08e329c1b1eb67e26bb6737d445ff19f2b6f248fbf88c9991af838f6d5118555c0303b11bcee3228a3a2d8a2b866fc630aeb8b384f199383649cdcc1 SHA512 b9ebb7111e88c1d78ceb6b6afbed34b912812c049711721882234b5130bfb2a98351b78c36f462919ca48a26e2d6eb3bcc3b76746f9e98b47ebc907766159ae2
+DIST thunderbird-60.2.1-vi.xpi 638421 BLAKE2B 90d5ba56f7e874d4097968f027ddfbb507fea954442196491c9bf4b72ac3b6f0a2b5d3489dc670e51c01a5657f5dfed62d1c21c192d54db4f78b58154656fc03 SHA512 e2230a2a9a694a9b68f8d1d00f13cfdc4fcd5e880dd5bbf3dc637c88a31f4a02863372e2158759b9a283ee8490c1cd622873213c1c42542b45dd92f8447953a7
+DIST thunderbird-60.2.1-zh-CN.xpi 622464 BLAKE2B 05dfb895f9033a524c91dca56ac691cc6421842e5fb241ee97d3cbdabdbaeb4401c0764788dea1f6f7ced9c6c300ceeea13afd1b48b5d5f388269f690c2a57c7 SHA512 9397bf5942ddf7198bb2bbcc152d4335a47fba602f0dbd0fb8c4b8731ab5a8aa1d5edb4ebac4424e2414fec441b19e337fd5748f21a369d9709e2bae1912d8fb
+DIST thunderbird-60.2.1-zh-TW.xpi 626188 BLAKE2B 02497b01f3f51b1bf918c9e8f03cf943b1777140ea53b8c31a06859ba86345cb136a678961d22f48893265cc8b0f41760493b552b541fb43f3321487993379a0 SHA512 8770a606a67fb0a6dbdcd05e964a949d4e075107d04ebd0d429068f114ae7ccb097e72775ab64e4bd7c158b32a9d859a9d7789e2927e64f661d4d66d511bfe44
 DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
 DIST thunderbird-bin_i686-60.0.tar.bz2 52425890 BLAKE2B 1ac02fcade891d757f6a342ba26d47fdc75f2ce7110c1b72d0dcb39efa118181992d64fff32f02893f0eb0140d1976e32fbb3e55f2a750dcd2543a38561a4e7a SHA512 baf0334ba9803cdb79e1a05a6745f6a87575d52bf86f6169b664903608236eda8ba8965481a58b660fb1edb567c681211f328c3f0b9b298e267b5e572b41f642
+DIST thunderbird-bin_i686-60.2.1.tar.bz2 52490008 BLAKE2B a0da1ff93320f33fe6276d956b8bbfd56cae7c1cc0b04a713c28726772f45418960e65f9da1c17dd850371ad564df87a4e4859e859d1579dc4320e1c3e60311d SHA512 e104e90333fd9ad786cd59cb323a2a87a532b242aa7e6127ba38df00b9d747278cafda32b359258c9e6ade5a945c4a227ad81595e30717b1a06e314c511e975b
 DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
 DIST thunderbird-bin_x86_64-60.0.tar.bz2 50256875 BLAKE2B 7ce356f4ad795dab6377b0baa90a41ed818a73ee1f81d269cf0fba161ccd3998787d236e1a699bdfb9c4bcd93738d30e656be3c960bb8fd734826f5df5c5f8fe SHA512 87be28d46f22885c730e89c0a945ed307b23da11e331a5911b21353a53536587f8e95658de591d44a9bdf617dc3d50099f537bebe85680dbf1b3f25c7f18fdfb
+DIST thunderbird-bin_x86_64-60.2.1.tar.bz2 50355323 BLAKE2B 0cd7b191fbf57ccdf06b7e304778b4db158dc8fdf90d156e8c6bb31e49e1e51fb7503c79306e62f68e03adf3bb2a5a927424fbb455acc14628025beccc554809 SHA512 71308c1d6691894ef60144f7bc119709491eaa3af400197e4fec61f25231266b085e925fe1163d6de8d3d1f3ce34475a299968e9405341a9881c512fbd6e4362
 EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
 EBUILD thunderbird-bin-60.0-r1.ebuild 4718 BLAKE2B b02dc6236364a51663df477a8c3aa5f7c6137141370b9cc4a072336bd32a7fd0921919aa1a82770e9c09f931871d1c6c101cfd2f2e97c40ac3cbaf899cd814ef SHA512 9b74d158940f7870e42077b57fce39d39104b6f4179892f0b437a059afb1120fae294df4868182b98afe87dd414a908dd7db7c66ef7ef290b13354e92ecd0060
+EBUILD thunderbird-bin-60.2.1.ebuild 4715 BLAKE2B d58a8dc7baefed4881854ca8ebdf06d8ab24e2ebd32604139279af4f6b6b14c0ca5b45057ad331ab6dc9a08a0a6dbecaa8811305ca3b59fb068c17bb9814373b SHA512 6c19b79f37a8f69de649acea040231bb6db91fe4675515faa49f1525490732d6fb583755a76a74c8d176340290dad7512998c47d0c7ec5de52f6e8fdd3043bba
 MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-60.2.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-60.2.1.ebuild
new file mode 100644
index 000000000000..122c07965d83
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-60.2.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="6.2"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
+
+inherit eutils multilib pax-utils xdg-utils gnome2-utils nsplugins mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+"
+# the below only works when upstream releases the xpi with all locales bundled
+#	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+
+HOMEPAGE="https://www.thunderbird.net/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="virtual/freedesktop-icon-theme
+	dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10:2
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	crashreporter? ( net-misc/curl )
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	local size sizes icon_path icon name
+	sizes="16 22 24 32 48 128"
+	icon_path="${S}/chrome/icons/default"
+	icon="${PN}-icon"
+	name="Thunderbird"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
+	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/bundles" \
+	mozlinguas_src_install
+
+	# Install language packs for calendar
+	mozlinguas_xpistage_langpacks \
+		"${ED%/}/${MOZILLA_FIVE_HOME%/}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}" \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird-3
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	newins "${FILESDIR}"/thunderbird-gentoo-default-prefs.js all-gentoo.js
+
+	# Plugins dir
+	share_plugins_dir
+
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 42c6957089cc..e01a0f63e641 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -7,9 +7,11 @@ AUX thunderbird-gentoo-default-prefs-1.js-1 426 BLAKE2B 2cade86c23902fe439018a79
 AUX thunderbird-gentoo-default-prefs.js-2 461 BLAKE2B a18e1fdbab7ad81feb41af75e60f48adb960800849630a6f9253b7bebcd3e7db33b2517ad0be6302609545a5464b84bd5c5fc67a07fb2ceab0ca1ad98539bee0 SHA512 db115d89a094c395636e5c008307c7864cb084a0a4ebd024d4ce33cac12963cd4a9ff6833227adc6a098430dc3f7ca9e386e26b87400d46920f4ef15741aefa5
 DIST firefox-52.5-patches-02.tar.xz 15084 BLAKE2B 538dd61dbb7b290add4782b323a62f9ab4dbc57326a9a085710d207752118c504eb030a8741c1eed2e281c8d18e5453210b1905d71439250caa588137bbc37d0 SHA512 b80f9acaf49226cd5c2864714826c5b0e7e918e94c31ec81521b90c47edbb88ea85faa34fc22791efefbcd3867ddc413c563de58ca0f8ce21e10a3858899efce
 DIST firefox-60.0-patches-02.tar.xz 111088 BLAKE2B 9564d55b243c5e759a83b6d48076d3de9060c7bd99498df3ced477077b5ce2e2582452979872f0707ee681633d04a9761e2887282d69cced7e20bf39efc38c2c SHA512 919ffdb0624f1fa68a7e457f5270833e69c8f29e1764a46edfc345056c4e8ada1e85e53de3766fd9a0b2afc1a959c15762e27f43e29f5945176f9ade362407ac
+DIST firefox-60.0-patches-03.tar.xz 111764 BLAKE2B dd6fca1a7dad526cf1bdebb606773fab6bbb18e3cd601252f5b627e3d5ccb50a60bdc3ca228b1ed57d8b2334275fe5ef2669f8c98f8acf278effdb9dc7fc61df SHA512 24a09df0e785cd9ba71ae6baee33ef159c1fc3b580784f7d20a775dc846aaa51d660eca67e284960af72651d245236623a0736695c76be75a8b395e5b69ba1ce
 DIST gdata-provider-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3b2e7d1d1e8861c4e42602cedb02108d28e0bf5e5cd9e31474356b70cb99baa7870e20436bc72e25cd8a8fc1353d14 SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b
 DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
 DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
+DIST lightning-6.2.2.1.tar.xz 1521172 BLAKE2B 0155735fbebfa1d7103281f2d24c41ddd16561a09db3502bdc2e689bf8174a86c414608fcae199e2756eaa93b57332b0389433c7e0d86c454f244b8a50b43a85 SHA512 b9427709022e07741dba48f4933e364c2df15c1f4bcda481f50e05fa5f8f118d47a87e4b5322fab412e9f2f89c0889a5154a369bb6d0b9a1a94a748dc768fb59
 DIST lightning-6.2.tar.xz 1647116 BLAKE2B 88a44c7ee6a1395372e260e8d0a0e00a6b2546398000ca701b74f98f85b73424e4126215c94543534ae1159de6644e81583353d53ae15b0e82592b17bf5fb2da SHA512 d51e56c6b21829dafa59cef086afb23f4afdd7dda5b1fdc1f6ad47ba0945e11dbedc826bb9764f42323275e251a48802eb5af2f0e5da27f3a64c105ee9f0dc4a
 DIST thunderbird-52.9.1-ar.xpi 604235 BLAKE2B 7981734de83b22d428e4b988adb938cf7b0ad0b54142ca14cc7e7bdf38729b57f4c9c56a22c939d322ce03aed55d6f1b726bf6fa23d5f35347602691a2b435e9 SHA512 03d93c275c0e38b07519bfbd893118ace69928eedde0d236e72c6900aafe2137641f76155a0e02fcb4b9185ff8e49c04937022b75b0e85d7ea9de05b90e2d727
 DIST thunderbird-52.9.1-ast.xpi 541173 BLAKE2B 060a8ee63b93bdd230aa49328f37c109458c4caf3b4b719b10f461ec3b9f5141ce61d67d8ac1ac3c83ef098a8d4b6afdcb695cf895fa94e1de23ecdb555f257b SHA512 689911ecf9a92e3dd25eb305fc3d1179b4739f608e3be67c5367da3fdf0508951b816547333e1b2f16dbc20afd0407996b933309b6eaa3bca2340993a6d475a8
@@ -123,6 +125,61 @@ DIST thunderbird-60.0-vi.xpi 638422 BLAKE2B fbcf5bf28ef6c090193258d2eb7cf5a3e8f3
 DIST thunderbird-60.0-zh-CN.xpi 622464 BLAKE2B 1b06dd9c23a6519561d29b8f5a150d2f15df19a2a897d418deda253b24562f774ea69a18fe1de466f8d7f9f9d11b89d6c2c7a21b9feba8c50e6331ca14f320dc SHA512 759cdf2b1e53597bc3273d97ff119cce4519936ed9424060c857349f701e7a94519a43c1899d4e3e20482b3a4a8eb4c4dba9d09ca6e74422fcf07420b1b0c3a4
 DIST thunderbird-60.0-zh-TW.xpi 626189 BLAKE2B d68803285e6abdc76e8cc61abb72dabe4b47eeb482f59fbf35be105d972218c12360b381ca13b7b9f1a6db4ba8e94a2b3a93293e20077da8d5f14df6a552dcd4 SHA512 8ec61caa32a6f90f2b553dfde6ca0dbbebeb517db827193d73b0c492c6a1bcdd152fbbecbcf501a95ec62bf2ed01d926274f4f69a49ecccfbe401bc1d34f941e
 DIST thunderbird-60.0.source.tar.xz 282494428 BLAKE2B cd021d819f62c79c7486eaede35dbd82a3ce1079de3a4f8689994d1f5e1c53a60cab3e343d4ea5ae1480cd6a14bcadb0073ae6df08eab460cce8928bc0893da3 SHA512 ca3346eb4b6e1237a74ffc5c3d483fcad8d2f0d1146f56a4b11f1ab0f83b47b28fb2da8c0344f228bfff8c84b755f46a86a5b44fd7172de387ceb83650b33152
+DIST thunderbird-60.2.1-ar.xpi 627179 BLAKE2B 7c3794cfe13e1c29d44c1cff7c86b0610762de3cb29c2ea8692c3000db22eb3afedb40c092bcdb4244fc7c21970c3bb838c14659ae9e669b7c456d78470da538 SHA512 c41737af99fc3d82547e82784289b6292d0bbcb47be13a785b668a97c0b804d9ce4ed0a7e18f089d36d234d085f72af6c1ad4908c1d335baa83bd0bb591c7538
+DIST thunderbird-60.2.1-ast.xpi 560865 BLAKE2B 550692ec34d6965122fbac0e58352ef503e053eebc2b9c295d354cc19a49c9f1d6e12363c67d1fe74bd0cf078d2613f637bb82655f7404d173005c389375c534 SHA512 e7f4878f5999455cf61f667aec7dfd285b0624a7410feffb9d5fdd0eabd51e988d64bb97288cf601f512c8f42d450d01abf80af10a5055bec8bcecb2d95d28c5
+DIST thunderbird-60.2.1-be.xpi 659077 BLAKE2B 96adeeec268a1a0bf16ea1b9c705417ddc59a401f1ce4cb4d33a007dd6fe1e5c12c5e4d96202c43914f9ca5015ec0401818dd65062a4d5770fa78f43ad738ade SHA512 9d4499e3776f6e93083b44113e14e2899dbfa26cdf19d3eb28a5a87df8bc3fe99edcb9b8c572cde6f0488683f7c1b2f3fc2c24437da712633574aa440e6fdf01
+DIST thunderbird-60.2.1-bg.xpi 665511 BLAKE2B 7a0643b6afd5738b8049bcc955fe1c8089cb077ef2dcea87fa4ef14db64381ab2438829bbeb40657805eefe49920f2ab8eacc0f9d27a72a19fe84c90e12f6e9b SHA512 ef79c6fb8149bd83aba5d18ac05d833caa5fa84c40c6e7df6f7d82b0c4d2053fde8dee10be60c9c0e68213295d98b1226d7f0d7b7e6152249040a85ad8327ed6
+DIST thunderbird-60.2.1-br.xpi 581591 BLAKE2B c47d508ac793f09eeb758b062e2b21ba6fed59e35a3a4698f47d4229407ba347abfef4f590a355c95175d10e0bf9b9bf99f400e7bd1af441c9808cd3dc185c10 SHA512 d54c60f9125aff7ab5a1d188769326324586ba3daab75916d02800680a9ac010b4bb08d84b1afc1345f40b6d52c1d661ad04f8c9b1a8021690516d0631af3b50
+DIST thunderbird-60.2.1-ca.xpi 591970 BLAKE2B db5e0bdcd9ac3dfbee80ed6d691f5c2b8e12cec654edac4441ec4faa724b25892f14f143f4355d9b4a2025e997e1fd0f647e4c60c2306c315b163b449d0e4780 SHA512 483417c228eb084839e15969550c17aac20d28dab770729cd2d9f2b06b5bf3e01b7e9ec4dd5927405464c87f96f86f66791fde646224a200551d1b631d6500b5
+DIST thunderbird-60.2.1-cs.xpi 611201 BLAKE2B a13fe6b452088ac2905656db9600ffbff9e0fe3dc57935108a390f95fedd311e634070f100428e24672e69f4b7a8c697dd97926b66f8375a4c9d533340a546d1 SHA512 f47e917ebd48fe056d775ecd824cf29ee6191223526f124941bc82bc1feca664ee7182cd2c0dabcab0bd7a2171da381c744575179d80936cf65efe3db8874b67
+DIST thunderbird-60.2.1-cy.xpi 582232 BLAKE2B 2978bbfc433c068f7bb724ebed4cda41f5535665b8e36fed0938b21798a8aa954bbe4f90f44b6720de52594d26f2acb6a4e93a1b0305a94a748c2b8a2ade540b SHA512 81a18fb92a01826ea780a97c65f92baa6920eb653f3dbfef792681ee38da1a29ea33946a374630c8e7863337293f4cb648665419938df5b380c7a073102bf5e3
+DIST thunderbird-60.2.1-da.xpi 570805 BLAKE2B c9e56b2a1cc0de4e293531a67f2278814950783b7088a1530dd5c08c55c30ad4566f129c1271fee36df4f5817e9ed1db452a739c182b251c12e9f637c3dce211 SHA512 b8e8a75111deb9ab31b82f7c7d6f9ff70f7a60cdf384dc7a3bb21c893655124bc9a1c31fb22b42b05c546fcbd3e430bd1417f6795b66e43140a21506edca7e4d
+DIST thunderbird-60.2.1-de.xpi 582574 BLAKE2B fa7ee24a23fe150315d96c8a1be7fd3f76054cfa6817f20718c2bfccef8a8adc20ab451e1491441d4c0e85a0ee28b053752d67ff245019d75d9bb5f2aca1effa SHA512 4b7bd57f2bee29b786daaa1331777b2e81bb281a0954bf8ca2b11420cee81a224ed1d993375ff70a97a8fe33543596c52218966b149beae0e78f832c42ae2189
+DIST thunderbird-60.2.1-el.xpi 691053 BLAKE2B 23afc96b887c1b0e37fb0c2121029f9fa0c3437ac21c28b11cbd454b9b6318755480ea157d04f7962cc3b86326d1e2515a0cc65e5146d8e532f7ebaab7c25bf7 SHA512 20a71719c5fb829a22167fbabb1f1c1ad7fab634fb801fcf7784c6a2094808483a17da500342ac93cbf766d3b5f6078f98ed774c7a67d529a4811c0dde4ac3a6
+DIST thunderbird-60.2.1-en-GB.xpi 550353 BLAKE2B 28a870df8627fbaa12a9e909c521350c7033c21e5e53c385e65228dc45dd16938c4c35c77d9de74be0fa3b5884fb0a7717df3e1064dcc7340508dd88846a36bb SHA512 a012c1e40024a006177563e0735e49fed9e5649367e854ed27343f6e7eb52f0a870cb4257f67e76b6fe045f7657f3f5425174d1c955a778f116f781eaef4b9aa
+DIST thunderbird-60.2.1-es-AR.xpi 595047 BLAKE2B 26c0b06b7f75c1292b6cd93a8ffb4cefec164183ac38da4d6635370e73dda3ad248285022af8a85ac8e10e3fa3772606db3d5a0668678cc049b4ff6af80fd5b5 SHA512 e87a68b60f6f24c70241a9e188cdb2f72e9fa29128c480013e0b2fd70a5f75766c985c64618cc96c17bbfc4d7e6595d6e1956438db8e938ee977a39740c14313
+DIST thunderbird-60.2.1-es-ES.xpi 492210 BLAKE2B 0f7c4602b30ac91b21539ceb3e75bbbfaba022bbb8ed195fe30442405916ea000b72a188b85a978449518b4d79ee0d5596afd7dce340adc59a3442e6977a4229 SHA512 4ef1c35fc033e5a1db43aa79ed4f9120fa20f914a2461494c614f9d260086fb8d58cf4e00f425b793630295e45a4c66243c30d7809e3c2596e6f8ce717b93a79
+DIST thunderbird-60.2.1-et.xpi 570866 BLAKE2B 5a718f4a8abd388349cb44f6509bf5a07c2d9641b84599a4ff22df654489afc529dd2940d2a7a3443cda3fa9c04363cf72657ebc377a18c3b42c8c5986b8f82c SHA512 e8b0cab938174f85f2af9936404ff2bc2213e16677dbcd85502b7179794130b01553b6675cd93ca2ef34ab1dc1dfcb9c434eec76c08f68a22ad1acd4b2a74ae8
+DIST thunderbird-60.2.1-eu.xpi 577578 BLAKE2B cf412d1c7be358450a8d17f3000c79aa59dd4de08e6c6d57b089894e3fe81aedc2078d18d69967c4bc47278b4b86a7749c453113a26c1509d8741831f62a4177 SHA512 7bb3a0fd563c5d09ebafc3da6ee312804c8a465574f6b8355ad477e13935b2b6483489f6b039575208ebfa0c8266ce01b3efe6e2fa7e0802eaf0fcbf7dd0b15e
+DIST thunderbird-60.2.1-fi.xpi 575754 BLAKE2B f193f0777ec0576775fd942fd9991ca3fceed4e08894bd84d10c33a0d4235c94ae822c569bc09b2fb0f93092b81c6bf983d986b156ad8d4e598fa4ef92b2ecf4 SHA512 65462fcc19a20d8a404e1511faf3241e26fbf99def1f4e695f4cc920ac872743e119206e0ffa3a3fc42be37d5cfe9ca3d63d95333c94fafc8dfcc073e4b1bbb9
+DIST thunderbird-60.2.1-fr.xpi 608465 BLAKE2B e08725d4fa02c1735c990872f9fa84b70443580cb1bf216fc9dc28b4347cfd9ca70c8f2607e4d6fcc1efd9cdba01902a90db9342e7af6f8ac169c51601803526 SHA512 aae25897c3868d0fc2a42ed79eff8050189e81d2ae2b748f523980cedccc244a182209018b0523b58ac005b941bf84364d7959b4fa403956bb49bd5e46100f47
+DIST thunderbird-60.2.1-fy-NL.xpi 590033 BLAKE2B ab093bfaa1c3a92ab76e2d0d0b1486932833d45c67d86b6332b82b93f150ebce6da39d2882a5d92ecd6043cc9e297327a22c57ff8276a25fb9c29704ccfeb7af SHA512 12d4d8362e59edfd1699fbb65b51334816d9b0ad2f5ed7345b1c3a9a80d1e3e60b0d079e16d1901854fbd2832d56a461beec9cd882ac1571314f81aef763b3e3
+DIST thunderbird-60.2.1-ga-IE.xpi 603505 BLAKE2B d8704f8f2217c0afa3586311eee6cd16430c4680f12c88555c2c02c34caaaf2f767ffaf5939953f8103fd732bae4ea59e94173f3d65e0506e2a5603d60963a36 SHA512 7b8a75797a4e8442db0ca18ba6e331a1bdd9b9c4bea9e247972fdc8ef249d9c6d52202cc4a6537d7c6e648edb120719b88869356d2244e9e85b0f574d2236dac
+DIST thunderbird-60.2.1-gd.xpi 599259 BLAKE2B 88db9ea39c4acf9e5e8ae5e16e7c08c11d574ebab8d7fa1c82416b945c5e07b794a2dc1ec505ff697d51f884f4e6d927d16d5b38d7471b3076e2373e1f184876 SHA512 c055d56d99a79a7bd393f294170b892ceff34dffcb16c5193cbc8b94c3e2aa1a1796ec0146578fece9ba6c4de11c87f379e4818c0960b05927e5e540eabeeb90
+DIST thunderbird-60.2.1-gl.xpi 576546 BLAKE2B 03a21ec2aa4879672675b790a509adb1c231cef47657624ec1a296377b29c35f81b3a9971fd2bd2687205c8853bb0a2a0dc62121c76d986387b59db4b5c4f422 SHA512 5d6c6e769135caeb535f0123c6725eae8fc6fab77e703ca80d6bb1951d14a2f149a1def591968d0c268ad36d409d65d581df1863c5a7d17bae0689d577fe0951
+DIST thunderbird-60.2.1-he.xpi 618364 BLAKE2B 8d45600a325e7bc4694d86841968db2927a42ee0e78786f58c8e234c37f0064d8056ab368a5073e9464903bdcc7ab979af1044f778785d6b8dbd06960a39ae05 SHA512 c5b83a9b8bc3a38904698da2dcc40b21b8a8bce2314edadf671812fc49e8edc699d74f12d38830b54a80d81af38ac168edd101cb7ba0c0d4247620ab5e456f93
+DIST thunderbird-60.2.1-hr.xpi 583459 BLAKE2B 21ead96d533480ece2c935c9697b8c5e69e9565019177a1ee4056471618b647cd67d0e1e12dedb8ff9184fa3c433f3e02a14d8164a974be34188b45f5fa60d4d SHA512 124d68b07766051c71364620e0212956b81e25f1687efd9fd7ea0ed74f6fc3e194f10b82e598aa1f1d8d54a50953202f805b071ea45805e716af73a2115240f8
+DIST thunderbird-60.2.1-hsb.xpi 611322 BLAKE2B 954352b8df8c298e8211403d5866f9c284e98d6d96d2b54f8d349e2b6ad18e1b01f73f4f303e61d337b425d6dd68e55555be7fbda2743d459f681293a3433b80 SHA512 e3d0cc09f4ba43d3b9a63a7b0d9f71101ce636787b2d8d6b94d88455551f6b922c94f0edc310c0cbb7119c8c268bd71ef3d003215d4c74f32359b6cf601b55bd
+DIST thunderbird-60.2.1-hu.xpi 615344 BLAKE2B d1f0965776ced698464519f3cb2f869426b769b4b26105b3478570dfe693ee4c5abfb6389326952865d07366c2f9080ab5559908536ed2c522861ddcaba7c5ee SHA512 06fa03a7bc0e84bed80d2eff93e8729dfbba026fa62552138f69e87177881c0fe07c291e90ce78ca5e8d4debeb5e75fa0df48db605c634a4717cb70a4a2e12d6
+DIST thunderbird-60.2.1-hy-AM.xpi 649712 BLAKE2B a7c01158cde19dca4532321fb47ac83734cc6804ae20b7be2bf8ebd1e5b82c3596c816ddf1aaa8235cbe562baad2a6569ff317a74885d400589f924f46a8780c SHA512 fe15756885a43b882bcc7a94c916fa90ad9b7f7d7846518e446dabedf5df21185f2dae807072402ba7413dd23533bab9ac83c1c6f1488c69b7e42fbf1d6d82ba
+DIST thunderbird-60.2.1-id.xpi 568859 BLAKE2B 7ca1514b2fbb5236449121711013fc26fa1f225c1380f8c6bd58c4831db7696ac73a63df9912b8279da51f119a42adb17e7a49e112390c22123ef1dc5d05c4d9 SHA512 ca6bce5ed8cb66abcbec233941062b01bc18e35d501e796f16609f22a11d40ede0568aa3600a590b6c3bbc073ce74b08095903660371333b8f868867ed2ad6e1
+DIST thunderbird-60.2.1-is.xpi 579045 BLAKE2B 0d5404b555519ebe0dfb101cd132f5b571cbe72cf1f198b672ec25195522b6b139590342e4f1e14cd1ef4e2793da1b83e20aa4411a78a97dcf12a8feb3c69c6a SHA512 1c9578cccc15e64b0fb6985a0d5d9151e90923972150267076d89dc4c16a46848a347f73dfb7a08326fbb8b97f7b51aa6161d995fe0565e30ee67f71940ef712
+DIST thunderbird-60.2.1-it.xpi 477499 BLAKE2B 11aa1ef2c92cf81715c0660408a29dd37da9a8bee8bdcae546adc28a5a23a3a3222e63451aa15648e0256475585dc2e5742bf38b22b8bd75934ea4eb3599df3e SHA512 322e4f05034facbb6bb4e51214e4f95679cc7328846c00b85694a20a8bf4e89c6ce8a6e6e65cddd563169e11ef78b8502a6e9649c890004b5cc371774d125fe5
+DIST thunderbird-60.2.1-ja.xpi 653343 BLAKE2B 981b32dedeaa8176dac5a53a2c856b6f030e145830e38014516cfd3ed4e74f9ec5993659031c1de2479a05ca3daa2c132c69e96724943e970a3754521636b258 SHA512 4952429ba4b73a5357b6d395ffacb7d895ed74900ee21deb3f228fe5623b5bdaeaedceabd1c893c1824c33cf805ee41aae2fc1318a667fc0f9e7ec01ecec4c5c
+DIST thunderbird-60.2.1-ko.xpi 619729 BLAKE2B 971b1143fecbadfa86c13fad4c89eec11951598bebcb7552049b3ed98f3dd5896cf81a315fa497cd7e72b22e3168e62eb252f033862e7ea49897a5f1b7fa6578 SHA512 c060712228441e866e9d4309407a894b7729edde6e135743264d26ee93c0e828a2aabdfacc3be121f53f7c4a47a43d4f6aeaea87034a4652808d9f0a8da77a50
+DIST thunderbird-60.2.1-lt.xpi 605439 BLAKE2B a6f284da627a8ac98a18c7c938b53638de665c7a6f9005a6c200e1da12f6e108ee109c52f9a49d9639378dd695aa2291254283fd0cd6ad042fb9a44d6cb9688f SHA512 440f1d37677ba90f63489fc542b241f570293cccf3a2ab843e9eb8abba664c107e061cb3b14a30bf432459701a51a9b58e6630a220acbd48105fd5a7492da46a
+DIST thunderbird-60.2.1-nb-NO.xpi 578233 BLAKE2B 4a868790ab2391393f646a94d2d5098acfa3d546fdf5c5c823cd9f5768305fc74878c687acfd748a20a2eb4fbb8651dd458a74652b314cf04f7dc53dd3613bc5 SHA512 436ee46a66da118e7a29c2e66bcc5922d486dc6f9bdfc29e025733eac3e1bbc316baf88185bf62ee301273dae95c72b930a4143ee6c1094596714f34404bccbd
+DIST thunderbird-60.2.1-nl.xpi 583912 BLAKE2B 28280d14975769549fdf06f239b51fdbee8f7d915f99d0c64a237dc09f8736f130cd38da15f98ec0f89c9e42b9b08fc1dae5a25cd958baebd553ff8d8e340924 SHA512 0dc2eeb723efcb3af4c3e3f8df3bc07ace232285f65d3cbc2a970673eaee3e6c720dc391a8df0cda3472a3b986fdc92df0b7b4aec0abb2bfb7adbdce475a4c8e
+DIST thunderbird-60.2.1-nn-NO.xpi 577653 BLAKE2B ccf08b3002a04bc231ced93f4b07453f2244de08103d2bf06dabd6553ae72700df6c99c48a69cce8eb7202b12bfe81050110c0107ee4444f04b141c6e57a676c SHA512 340f9704b4d654af42e9cc8bdb85daf16f32af10f2675968f26456c29b788b49d41bc9740c15e52796b74365c1bdc30995e5fffa0ea53abab15d203772c74a78
+DIST thunderbird-60.2.1-pl.xpi 480723 BLAKE2B e9704a151135b13e9d64fe5e2468dd649c118857391d4677b3498813606cb15cbbcdffb08ced37fc3baad4ff3eed4ab83ed3c98818e662475361c2394879433d SHA512 5623ff6b1f322bd44f1826980c0eb459d82ed4ac12a41846e5006eecce1971d2a534aab90ffc6a7b922a412a8828f6bb411f78ef123a727686d4cd08eee7c457
+DIST thunderbird-60.2.1-pt-BR.xpi 585016 BLAKE2B 546684c5086c11bca71a3810c386a90b8e82e54ef20f476d7a94463ab37db2a0038472c333bc44eec9cd46a5478d8b222a52784ae0e31170a47d99a930b49f33 SHA512 ba861f3db1e4a033d66b68ef625220701312d854a50bfea367e6b90bfc15e5dbb994c9eebfd2596da1f4879d0f796ec7826c72a6c659ad205ef7386a4e6052e5
+DIST thunderbird-60.2.1-pt-PT.xpi 593184 BLAKE2B 02fe8b204c3248795aa1218b1e3d84b19e9351520207cded3d05f4db992336d78c54f235b1e53e8eaca0079056755cb4ba905d700d267a8b31e9158d82323bf9 SHA512 82ca4bd6f4d68d187132ab864577e3a16dfe4418bf68796f6ccd477c6eac4bae267054ac06b491df1847cc8e171b373d826f7ece8790908bb9d20ad960db59a7
+DIST thunderbird-60.2.1-rm.xpi 578381 BLAKE2B 4ef395e34f33ea60ff7220879fafbe64dcb153b46fce10fb0782e85cb1e3c05a4912ce4b7b7bdf1fdc20d6912352ed5f7c7dc46f4165f21596ac2200fe481666 SHA512 6f6f8d4116c66ba6cce7b937993c3a188d1f44c2eb0ba178b3efd87236ba71ef390dbe6209f28db7479fc025a2f0a0d6821d1405f2c0045896761d509a90ce1b
+DIST thunderbird-60.2.1-ro.xpi 584307 BLAKE2B a30de1c9acfb3f0b52b316de64d32b2a641fb7166a0a5561052352c97151657fa58dd1b61c91f6e972890cab96555bd32a13f8aa777ccbabffcca682d003dec6 SHA512 24472ac2bc8c09c2c1a35b95891b057abef35d4b420cb6e995e3344340014f89be4fed706747fa4666803a23562f6a8e3f60843ae78a2ae129c154448ff7fbdb
+DIST thunderbird-60.2.1-ru.xpi 694704 BLAKE2B 6c1b51e60190d039b8cd467608f83246ae6aeff3ca513468556d6d351073a1cc67b46084d615c5f35a4341b1e4557abf253eb40d444036c2b1f9380f4bcf39c2 SHA512 9c0d08bc4b9efb53011e50f68ec0250c79b571851f71a3c3b9c6114c3f9abba13aa00d1f7db2b10b0b255d8899b37a868212e909b2eb40037d149154f126eedb
+DIST thunderbird-60.2.1-si.xpi 643790 BLAKE2B b1281a4035549a7c8a2ebbebf2261f0f6f8d2691cc2da9310ecb27b14345f03d3133689d2698e26968f23c313004720f4b80db14000b98ab94a1540271e53a3e SHA512 80aaa375781a60c8ebdbb7eeeb00bc843715e5d4a48762406aac85d5c0d183a9b02eb83392ffd2f0d3e82e2fe9f66a72626fcee9a8e35306ead5499f3538a04c
+DIST thunderbird-60.2.1-sk.xpi 612216 BLAKE2B 5122498248a0958830725573fc231b1c7d7832dcd4028d58a66e4e4da56ae4f2b409ab9e6493da669cb7fb6128c9a2359dbc635544472094aa06429978905e6b SHA512 2bcee77666ffe135925c313482edb8d32c0004f458b33d9b3132b57db664fa56318d8f0b0f83fc2286283a3879fbf1882dc8e9c5562eaa5116400a6f6ffd2565
+DIST thunderbird-60.2.1-sl.xpi 589946 BLAKE2B 51c0a97552420f5c675c3098458b5d48b49a01c411a2715c74770a5387c712aaf9ef0ab9d335f768ab39d6eb1b3678db536adff1dddab2f8183dbe99639c9dfa SHA512 ba4a08a9f1ddeacf2b9c4e46cc13a0c2637eb1a2373baaa9cc4a868d810dea08fb93162206b3b6839fe8d6d500544d785c470dd76cd842c752a8ddc7ddba8cdf
+DIST thunderbird-60.2.1-sq.xpi 593094 BLAKE2B a8503abd814b1db1df6ff6378d2d190f77ffecbf34818d456b67e55832ec8d87b7e68f27b78b09732c147040b0520bee4fc5eca976b0987289f0c870706e618a SHA512 22d2a1c92ce35fa815de772e953b29887a973fcbe3777c54e5ea3b0867c9252c23f9134189345c4578840014fb084c408dad7b753a2f404a50fe762097bea98f
+DIST thunderbird-60.2.1-sr.xpi 637720 BLAKE2B c81d73640c3deb3dc58e3bf1602380393791b5db396d0e689d2560c25a44395c2834ac6028b20f4336ec09466e0958cb61473286e5f8e6c5f02531710bed38f2 SHA512 b5359bd3fed66cc7b112f0a6e529c8c54a033f499fd3b609ef6980676cd43ed7ce972d8f8b81994f5cf1b1ce55a7169990a895549cc671502192cf95eef4fd8e
+DIST thunderbird-60.2.1-sv-SE.xpi 594077 BLAKE2B 3050274155460b06c69ba1494096a18c2df55bcbe36859c2ec2969aad50672e4f73e8a8d75b3674c937e8e84b2217a196ae833834f628240dc5f50fadf8353b6 SHA512 5e634e247a79ffafb62acaf701ee808e1aca91b12f5b6bbcd43625b477440700be6a7bc8d11fe41e68d887550af0c14e8509ef5864aee144e2728255ca1d14be
+DIST thunderbird-60.2.1-tr.xpi 598009 BLAKE2B 92963f4d5ea6f89c38bdc826c3d3b62275be2e667413ef71c37555b1581df89369944a51529cbef459cf177ed1c7c4e85d67e7a3209460e26e4e598d6319cc05 SHA512 ca3e430d82b8b8833e24ea7498d48ee330e4009de9ae145e50ba06ae1072c3a93b1d4e1d1bfa22c3452da8b4b0472b8926d13318a08d6730475057f337f2f39c
+DIST thunderbird-60.2.1-uk.xpi 684153 BLAKE2B c7e2ef3d08e329c1b1eb67e26bb6737d445ff19f2b6f248fbf88c9991af838f6d5118555c0303b11bcee3228a3a2d8a2b866fc630aeb8b384f199383649cdcc1 SHA512 b9ebb7111e88c1d78ceb6b6afbed34b912812c049711721882234b5130bfb2a98351b78c36f462919ca48a26e2d6eb3bcc3b76746f9e98b47ebc907766159ae2
+DIST thunderbird-60.2.1-vi.xpi 638421 BLAKE2B 90d5ba56f7e874d4097968f027ddfbb507fea954442196491c9bf4b72ac3b6f0a2b5d3489dc670e51c01a5657f5dfed62d1c21c192d54db4f78b58154656fc03 SHA512 e2230a2a9a694a9b68f8d1d00f13cfdc4fcd5e880dd5bbf3dc637c88a31f4a02863372e2158759b9a283ee8490c1cd622873213c1c42542b45dd92f8447953a7
+DIST thunderbird-60.2.1-zh-CN.xpi 622464 BLAKE2B 05dfb895f9033a524c91dca56ac691cc6421842e5fb241ee97d3cbdabdbaeb4401c0764788dea1f6f7ced9c6c300ceeea13afd1b48b5d5f388269f690c2a57c7 SHA512 9397bf5942ddf7198bb2bbcc152d4335a47fba602f0dbd0fb8c4b8731ab5a8aa1d5edb4ebac4424e2414fec441b19e337fd5748f21a369d9709e2bae1912d8fb
+DIST thunderbird-60.2.1-zh-TW.xpi 626188 BLAKE2B 02497b01f3f51b1bf918c9e8f03cf943b1777140ea53b8c31a06859ba86345cb136a678961d22f48893265cc8b0f41760493b552b541fb43f3321487993379a0 SHA512 8770a606a67fb0a6dbdcd05e964a949d4e075107d04ebd0d429068f114ae7ccb097e72775ab64e4bd7c158b32a9d859a9d7789e2927e64f661d4d66d511bfe44
+DIST thunderbird-60.2.1.source.tar.xz 284570000 BLAKE2B d551f453dff6ab4e350948efa23ca3432d66b21ad2d5b9ea5691846d581e9c04b0c6341e87b1ef458ddd0e35a33bbb02fae287e11f04bd8052a52b2979b49a9f SHA512 d74da3c90658c5baf09c22760cad31594524c09f2cd5aba81c5b15bb6db64d78f613562cb015d8a725b4902caa4a57a2d1dafce28284533747faed00f8268a02
 EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
 EBUILD thunderbird-60.0-r3.ebuild 17535 BLAKE2B 54471ae7025b588fd96e8cbb106261d28889a07fcc3980538bee52581d47b21ce92f16381e66f0121eb01edf0e7556fdea8eaefef5e6b33624ffe7c02c7a9aa6 SHA512 c16584a4c375e8f91083dc0fb16086aa1615672cbc973943d1dfeeb54183a253354198e4e3df43a4f7d09af68acf13a4f4fbbdc6760c6571898a22c21023c996
-MISC metadata.xml 1979 BLAKE2B c3d4ba5e77d6e9edfc13cfc90e54526e4e157df85f22953caded074dded690a22f323c1097b609c3b21c5b908816b131b2aeffb271c0b6878e49368d3626a75a SHA512 5960ca9793fb094c4c39cb4777c1be4e0078d74a6b9981427f9cc295931e086fbead0ab28d9c1fe409c6b7215c86e950658092783c1668344bb453e77d26146c
+EBUILD thunderbird-60.2.1.ebuild 17562 BLAKE2B f2539d7d2e6587c02043cd02660cf1b47f511b3a4de03657b530f9df9894e7d945a752c0f3b1829702b251d3157676fd003900ea8dffc2e3780bb7ac28b1ab6b SHA512 ed15cdb66e5812b10c1c3865db452acc56f4925175577ce8f500a8284100408867390b179ea07324377523b9d7608e343f26d8a94dae84c1241007d86125b829
+MISC metadata.xml 1922 BLAKE2B ab89f183e54a3b58bd9b4b8df547c1172f264d00e3e8d753869d0d421c413bcc8ff06a24dd0910c28c70fd5b05cbc5154fc73ebfddf26e3db4d58d80e6e7d2c7 SHA512 0bdec29294b4b1aa77b965ecf78e2267ac75821c7ba7600783b5190755bd4380c675afbcfcb718a50a765dc35cb88112b8fa4956d298c467e91d21ec84509101
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 7fdeae0d1242..5216de1435e0 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -16,7 +16,6 @@
 	<flag name="custom-optimization">Build with user-specified compiler optimizations
 		(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 	<flag name="gtk2">Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3</flag>
-	<flag name="jemalloc">Enable or disable jemalloc</flag>
 	<flag name="rust">Enable support for using rust compiler  (experimental)</flag>
 	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
 		instead of bundled.</flag>
diff --git a/mail-client/thunderbird/thunderbird-60.2.1.ebuild b/mail-client/thunderbird/thunderbird-60.2.1.ebuild
new file mode 100644
index 000000000000..dd425c79d897
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-60.2.1.ebuild
@@ -0,0 +1,569 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="6.2.2.1"
+MOZ_LIGHTNING_GDATA_VER="4.4.1"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+
+# Patches
+PATCHTB="thunderbird-60.0-patches-0"
+PATCHFF="firefox-60.0-patches-03"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang dbus debug hardened jack lightning mozdom neon pulseaudio
+	selinux startup-notification system-harfbuzz system-icu system-jpeg
+	system-libevent system-libvpx system-sqlite wifi"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCHTB},${PATCHFF}}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.36.4
+	>=dev-libs/nspr-4.19
+	>=app-text/hunspell-1.5.4:=
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.34:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	dbus? (
+		>=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72
+	)
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=x11-libs/pixman-0.19.2
+	>=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-harfbuzz? (
+		>=media-libs/harfbuzz-1.4.2:0=
+		>=media-gfx/graphite2-1.3.9-r1
+	)
+	system-icu? ( >=dev-libs/icu-59.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] )
+	wifi? (
+		kernel_linux? (
+			>=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	>=sys-devel/llvm-4.0.1
+	>=sys-devel/clang-4.0.1
+	clang? (
+		>=sys-devel/llvm-4.0.1[gold]
+		>=sys-devel/lld-4.0.1
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	elibc_glibc? (
+		virtual/cargo
+		virtual/rust
+	)
+	elibc_musl? (
+		virtual/cargo
+		virtual/rust
+	)
+	amd64? (
+		${ASM_DEPEND}
+		virtual/opengl
+	)
+	x86? (
+		${ASM_DEPEND}
+		virtual/opengl
+	)"
+
+RDEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.9
+		)
+	)
+	selinux? (
+		sec-policy/selinux-mozilla
+		sec-policy/selinux-thunderbird
+	)"
+
+REQUIRED_USE="wifi? ( dbus )"
+
+S="${WORKDIR}/${MOZ_P%b[0-9]*}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patchset from firefox to thunderbird as well
+	rm -f   "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch \
+		"${WORKDIR}"/firefox/2005_ffmpeg4.patch \
+		|| die
+	eapply "${WORKDIR}/firefox"
+	eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
+	eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/comm/mail/installer/Makefile.in || die
+
+	# Apply our Thunderbird patchset
+	pushd "${S}"/comm &>/dev/null || die
+	eapply "${WORKDIR}"/thunderbird
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV})
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
+	popd &>/dev/null || die
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		strip-unsupported-flags
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	# common config components
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--with-system-bz2
+
+	# Must pass release in order to properly select linker
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Avoid auto-magic on linker
+	if use clang ; then
+		# This is upstream's default
+		mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+	elif tc-ld-is-gold ; then
+		mozconfig_annotate "linker is set to gold" --enable-linker=gold
+	else
+		mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	if use hardened; then
+		append-ldflags "-Wl,-z,relro,-z,now"
+		mozconfig_use_enable hardened hardening
+	fi
+
+	# Modifications to better support ARM, bug 553364
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_annotate '' --with-thumb=yes
+			mozconfig_annotate '' --with-thumb-interwork=no
+		fi
+	fi
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	mozconfig_use_enable !bindist official-branding
+	# Enable position independent executables
+	mozconfig_annotate 'enabled by Gentoo' --enable-pie
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+	mozconfig_annotate '' --enable-system-pixman
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+	if use system-libevent; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+
+	# skia has no support for big-endian platforms
+	if [[ $(tc-endian) == "big" ]]; then
+		mozconfig_annotate 'big endian target' --disable-skia
+	else
+		mozconfig_annotate '' --enable-skia
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable dbus
+
+	mozconfig_use_enable wifi necko-wifi
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	mozconfig_annotate '' --enable-ldap
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	mozconfig_annotate '' --enable-calendar
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	# Stylo is only broken on x86 builds
+	use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+
+	# Stylo is horribly broken on arm, renders GUI unusable
+	use arm && mozconfig_annotate 'breaks UI on arm' --disable-stylo
+
+	if use clang ; then
+		# libprldap60.so: terminate called after throwing an instance of 'std::runtime_error', bug 667186
+		mozconfig_annotate 'elf-hack is broken when using clang' --disable-elf-hack
+	elif use arm ; then
+		mozconfig_annotate 'elf-hack is broken on arm' --disable-elf-hack
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	mozlinguas_mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach build --verbose || die
+}
+
+src_install() {
+	declare emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	# dev-db/sqlite does not have FTS3_TOKENIZER support.
+	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
+	if use system-sqlite ; then
+		echo "sticky_pref(\"mailnews.database.global.indexer.enabled\", false);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	cd "${S}" || die
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon
+	if ! use bindist; then
+		icon_path="${S}/comm/mail/branding/thunderbird"
+		icon="${PN}-icon"
+
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		icon_path="${S}/comm/mail/branding/nightly"
+		icon="${PN}-icon-unbranded"
+
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/default48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
+	done
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# thunderbird and thunderbird-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
+	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
+
+	# Required in order to use plugins and even run thunderbird on hardened.
+	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 0f0c8107c4bf..c6c483e51789 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index c661bde39c5c..5cd9a0f4ada9 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,6 +1,4 @@
-AUX bogofilter-1.2.2-gcc34.patch 1393 BLAKE2B e5f1c3fca416ab76114aeaa2da700b4c8cb809279544d3eb477c7ff4d8d63d1889168eb4fb0ab90e2e00abf7a578d7d37e6e2a39181f1c8cdcf71b60974de729 SHA512 7179efbc1a8a4ba79a6710d6324c955dfa255e46fb5d9ac3377b11843f8eb545bf6e9ce5b547a62198d7be4fd989b9a5ea96487d34491df7d42f33a818f02b84
 AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41b45c87b42abbc6f68432eef597eb691609130d57f8723a800da6eaabbf87b87e4eed79539a5cf6f88539803d8f9bc4fb SHA512 c9f08a1af44d3281aff119a821423adbb9533cd49d87986a13d817db8d9446bc48a195b964527940aa0e41f5106bd4d7b2a9684c6c725bafed95adb8d3e87e96
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
-EBUILD bogofilter-1.2.4-r1.ebuild 3739 BLAKE2B 8bdc42c8080fad6a9043a078d418c732f4a2029613ee2dc3ed75e3ac60da9ea1141352022c9d2852bc6b2473b8a1419c85600e001c7e9b7c571ce634a7fff68b SHA512 f82ea953c36071d6b5f25ce645d585712906f7bfe688400ce0e45cb561cdb7cb774243216bd9af090308744c9d6cd8c4f70fd00b69fe85a28c3331a0cc580021
-EBUILD bogofilter-1.2.4-r2.ebuild 3779 BLAKE2B c92a3ef27e359b61fc1f9a27de6c70994796ae59c91560838fdf44f2079ea71ba25aaeba648b94316bae835bb07954b4e6bcf22cb2e58e3d227ee5b00710d9cb SHA512 61b790cca316f76517ae4de404bebd5cf6da3108807db18d15d31fed2e5de18645564316050393ecb995a9ec77af7335c86885cec1f0789afbea2cc295a01b2b
+EBUILD bogofilter-1.2.4-r2.ebuild 3774 BLAKE2B 822e26dc1134281d8a005fda52bd77d53d58cd3a90e9eca9c91d56a637d2857ae4965323386ad6506d23559eed4e84540824fabf6cbc7d9a719677c5372344e6 SHA512 5cbbad8a17c31aafad72f69a0ac8a86a4e1f76f9efcaacc15210965b98695f229c2f42f143aaac4bf31f8f234a453b78891171f5f10303d4de0b8903f2d0fee0
 MISC metadata.xml 681 BLAKE2B 847326098ccdb227a492c2c03c6173e8260db73a91df37ed739511402fc2466476cc7ffb5c356b203b46945524224237bcec8058e2ef19d0436c25a2611003cf SHA512 cce40d35e042c532ccac225225ca6a137a041f9da6f8f0696cfd4b12fa6876662379bf2cc01e36bb91bf32479561be0ca44b20a86a7788448207a35983042277
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild
deleted file mode 100644
index 5ccb2b340a55..000000000000
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools db-use eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed"
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="berkdb sqlite tokyocabinet"
-
-DEPEND="
-	virtual/libiconv
-	berkdb?  ( >=sys-libs/db-3.2:* )
-	!berkdb? (
-		sqlite?  ( >=dev-db/sqlite-3.6.22 )
-		!sqlite? (
-			tokyocabinet? ( dev-db/tokyocabinet )
-			!tokyocabinet? ( >=sys-libs/db-3.2:* )
-		)
-	)
-	sci-libs/gsl:=
-	app-arch/pax"
-# pax needed for bf_tar
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	has_version mail-filter/bogofilter || return 0
-	if  (   use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \
-		( ! use berkdb &&   has_version 'mail-filter/bogofilter[berkdb]' ) || \
-		(   use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \
-		( ! use sqlite &&   has_version 'mail-filter/bogofilter[sqlite]' ) || \
-		( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
-			(   use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \
-			( ! use tokyocabinet &&   has_version 'mail-filter/bogofilter[tokyocabinet]' )
-		) ; then
-		ewarn
-		ewarn "If you want to switch the database backend, you must dump the wordlist"
-		ewarn "with the current version (old use flags) and load it with the new version!"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# bug 445918
-	sed -i -e 's/ -ggdb//' configure.ac || die
-
-	# bug 421747
-	epatch "${FILESDIR}"/${P}-test-env.patch
-	chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id}
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="" berkdb=true
-	myconf="--without-included-gsl"
-
-	# determine backend: berkdb *is* default
-	if use berkdb && use sqlite ; then
-		elog "Both useflags berkdb and sqlite are in USE:"
-		elog "Using berkdb as database backend."
-	elif use berkdb && use tokyocabinet ; then
-		elog "Both useflags berkdb and tokyocabinet are in USE:"
-		elog "Using berkdb as database backend."
-	elif use sqlite && use tokyocabinet ; then
-		elog "Both useflags sqlite and tokyocabinet are in USE:"
-		elog "Using sqlite as database backend."
-		myconf="${myconf} --with-database=sqlite"
-		berkdb=false
-	elif use sqlite ; then
-		myconf="${myconf} --with-database=sqlite"
-		berkdb=false
-	elif use tokyocabinet ; then
-		myconf="${myconf} --with-database=tokyocabinet"
-		berkdb=false
-	elif ! use berkdb ; then
-		elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
-		elog "Using berkdb as database backend."
-	fi
-
-	# Include the right berkdb headers for FreeBSD
-	if ${berkdb} ; then
-		append-cppflags "-I$(db_includedir)"
-	fi
-
-	# bug #324405
-	if [[ $(gcc-version) == "3.4" ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.2.2-gcc34.patch
-	fi
-
-	econf ${myconf}
-}
-
-src_test() {
-	emake -C src/ check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	exeinto /usr/share/${PN}/contrib
-	doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
-		contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
-		contrib/{spamitarium,stripsearch}.pl
-
-	insinto /usr/share/${PN}/contrib
-	doins contrib/{README.*,dot-qmail-bogofilter-default} \
-		contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
-		contrib/vm-bogofilter.el \
-		contrib/{trainbogo,scramble}.sh
-
-	dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
-		doc/integrating-with-* doc/README.{db,sqlite}
-
-	dohtml doc/*.html
-
-	dodir /usr/share/doc/${PF}/samples
-	mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ || die
-	rmdir "${D}"/etc || die
-}
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
index da01b7d26747..f83e1f2d5ab0 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="berkdb sqlite tokyocabinet"
 
 # pax needed for bf_tar
diff --git a/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch b/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch
deleted file mode 100644
index 80e4d787cf87..000000000000
--- a/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN bogofilter-1.2.1-orig/src/Makefile.am bogofilter-1.2.1/src/Makefile.am
---- bogofilter-1.2.1-orig/src/Makefile.am	2009-05-28 22:59:05.000000000 +0200
-+++ bogofilter-1.2.1/src/Makefile.am	2010-06-16 22:52:36.000000000 +0200
-@@ -16,7 +16,7 @@
- AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \
- 	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
- else
--AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \
-+AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I. \
- 	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
- endif
- 
-diff -ruN bogofilter-1.2.1-orig/src/Makefile.in bogofilter-1.2.1/src/Makefile.in
---- bogofilter-1.2.1-orig/src/Makefile.in	2009-08-01 21:00:51.000000000 +0200
-+++ bogofilter-1.2.1/src/Makefile.in	2010-06-16 22:52:23.000000000 +0200
-@@ -483,7 +483,7 @@
- @ENABLE_MEMDEBUG_TRUE@MEMDEBUG_SRC = memdebug.c memdebug.h
- noinst_LIBRARIES = libbogofilter.a $(am__append_3) $(am__append_5) \
- 	$(am__append_10)
--@USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \
-+@USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I. \
- @USE_GCC4_FALSE@	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
- 
- @USE_GCC4_TRUE@AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 523f3cdbc78d..49896df26b6b 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -18,4 +18,4 @@ EBUILD rspamd-1.7.7.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3
 EBUILD rspamd-1.7.8.ebuild 2139 BLAKE2B 0352647a74ab84ba452f37f9c8a971f899dddb4ad61779ae8096794d63ede23729b3723700b28824f270761624230a3da8dbff5a83ccc1b1bda5232ce8ef9414 SHA512 bf624d2c221b4422180a09d4599c91c10e9cc2c204cc26d7fbcb258becbd96b2e1822b45ae65e97cb93db40737400d77e3bdd8e48ed5a9129d9bd6cd70ecacc8
 EBUILD rspamd-1.7.9.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0
 EBUILD rspamd-9999.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0
-MISC metadata.xml 905 BLAKE2B 6a7f5f1473668977870cafbf01b9396324f47cb6b998dbde0fde43d71facf1f818d97b10fc853ff331941f31445202457e9108a46201f5ce5ea6762ac905c829 SHA512 2233d0816b80b113fcf1ec75a0808bd694a83738e7f70d5cbb01dcaa127cfe11253e7f5ca9c9801820b7b21b3cd6a80bec2ea428b026311583a05fda8fc3d815
+MISC metadata.xml 834 BLAKE2B 48979c23212a496c955667b99cfb618da9f682e2269bb42c9b4e4932b94304197422bc2480e7177d73ff6cb246e53a964bd43f5819827e4b6342786c282277db SHA512 c9a2106f419b90885905947aebacfdd15e7d1a66cb9cc6267cb79f487c9069f8ed2cc65c3d6d0ec05b011ade53ed2177df8f11ee49ee1e720dcf6ac365bc28d1
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index 13dc9bdd1539..2b4ad4e2b87e 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -18,7 +18,6 @@
   </upstream>
   <use>
     <flag name="fann">Enable neural network plugin (requires <pkg>sci-mathematics/fann</pkg>).</flag>
-    <flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
     <flag name="pcre2">Use dev-libs/libpcre2</flag>
     <flag name="torch">Enable torch support. This is required for the neural module</flag>
   </use>
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index ea045636795a..314df19ae483 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -12,6 +12,7 @@ AUX spamassassin-3.4.1-bug_7361.patch 16483 BLAKE2B bcb17a9e246bee95e0f5ffcd8b08
 AUX spamassassin-3.4.1-bug_7404.patch 792 BLAKE2B 711c5916827504dd06eebe6138df4bca7e364825c0df601b6bb6542e68f18d8a7546e05f23671b6a8d479f7dc12365217fc8437425b6a342331661f0e4aa644e SHA512 8bc613699872f0358d699f0c151bf9eac6ff80d9dc878d38fca522ac091f4e1348982bf2ce8029c7f241fdbabbf531e1d45f301159f6eddfbeb935252bd577e5
 AUX spamassassin-3.4.1-bug_7462.patch 5836 BLAKE2B 734601071cfff101177d98afa758f15622bd393ea02ab247b20a8fc368c8600a094bb1de04b3ffb3c9d9d9878d332c25587a65e1f4a5cbd01d21eb99f3ee7458 SHA512 68cad4b4ebd46fa186df04c926043fcdcf0099504451ed2b323d35871d142448431777baf2d374082554e1ef914efbf8f89001e1975c10e73e8865f3feff5878
 AUX spamassassin-3.4.1-perl526.patch 484 BLAKE2B eca4a52d15171fe048bfd3f997aa73c1eb0235a50c5b4e61a28ea1c707eddf184a888a0e1c75700cda9ced26ccf693d8a8040cac1bf59f46ea66854f0aa99d37 SHA512 ded5a6079f95bb4a771e23b382af83498f16144eb9ba613b97b365b52d96845255f26ddf561b7d6edaa53c7acad3d62294adb01ce4a8a4157470a5ed92cd1b13
+AUX spamassassin-3.4.2-bug_7632.patch 673 BLAKE2B a819b0817efb745f1dc9d971fa476d9da355b72df41ffc58a7a505a5a2c1588ecee3e1dbe79c3a0d03ba04a6fc2e63bc018b49240da1417bb2a967925ed85e84 SHA512 adf9f78a60a95d16cf918e048c178986ec5543fb80a350d9419800b2bcc8fbcc8669967b77d9a85dfce7b67528fe9d816f5ca9a435444197f9ac1aa83d92fec3
 AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a638bf419135b34f950a036e899ee6d6a129413ab52ca737f18258265cad971a0b84057561b7012fbc390efd7e9 SHA512 35da6ed8baa1cfc13546b409ed65d18334410ee497f9609c89cd4993dc8084ed479ddc7658e72a52a9b79f1a73d4efba42148b7238678c17a2965f9ff6a608e9
 AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365adf515b85bf0d9912d240105579747f3834b7f72402a31b5be9b8ed0faf2545ae0a4ed46ebd3c7a90962f764fb5e8a SHA512 55b93ce1636505beabba21cd208541750ef448e952658b65d6e1447f92cec3a35e3d489d014a0229765117168cc03b4675652709f7ed9973be8fba84c10786dd
 AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
@@ -20,5 +21,5 @@ DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b22241
 EBUILD spamassassin-3.4.1-r19.ebuild 7828 BLAKE2B 2cbf6260632b4fba3e0f25eeb4301be18a321768d6ac77f479d0d0bb7914fb978b59817db61ac35acb19386b2831381f1e6f7784dd8c72f94999c0c9e8cb718c SHA512 822bbd4cefdd73a8174072c2131cd8deead8416192ce7b9373165476cdaa2b3056b589d9143fc84944ad9bd312333852cd510e3ac949afba5310fda9a778b64c
 EBUILD spamassassin-3.4.1-r20.ebuild 7814 BLAKE2B 144d0498236d9f504e252d7dea23910a7ece9739a8df0a2f840be25ae656702f64847f533b5dcbd54761e3fb5e073b49ca117107269b5bc25a36ab64c0d52468 SHA512 3bc999d93244311e074cbecf3b6e4ad7db065b8ddeb1a13f0cd93e654ed7694d8c527b35dc624479efb56bdb050fa46996a5a8bce15fa3968e26970e87552d32
 EBUILD spamassassin-3.4.1-r21.ebuild 7862 BLAKE2B 0d5897de61875e18bc7791ff15b6955be8685caf7ede9bc8294f46b3b7ab1a3f98657f2b1c3769303c4b728e530bf97187430b835c0dfb3b31f2f11951cc37ad SHA512 3d48cb3993e648c59a8073100f03a9f2e7b08c6aa2032374386ea014bc4df1053a6f01110655e8be1d217743f3927c4f183d61735602b09f54ed23eee38b0bbb
-EBUILD spamassassin-3.4.2-r1.ebuild 7559 BLAKE2B 14046d07476558eaef6215efd12a7d7223798f3e636d53a90aacbbc04c4bca7ca5f4165b8e7c2659cd4e646e2063e32c58e5fccdc3c171a7cdb4d9a808579773 SHA512 f5af2334f11841ce5441b7a20edb33b70b582f0bf770006a9fbb96d3016a66ab8cfc4ca29d7c18c2b5858380d9bcb3910b7f60cc7d81b7e2c53775fb8b73f1d0
+EBUILD spamassassin-3.4.2-r2.ebuild 7612 BLAKE2B 03a46239d55d3bd7d780416693a2ed29e8686de5c9b43597408d735d24bc8861ff67bf6bf43b53604b3da6aa3e0b875b17c1b17641450c2be8140185564ec8f1 SHA512 e5ccd3a0e352bd9e018d874209e1ba73198f4dedbfe89ec39282cfc7c598624bfc22bd084bce94a66294d955e81b19ed73786e40e7bffbbbd59438f891f2f0af
 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch
new file mode 100644
index 000000000000..a9a065abd817
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch
@@ -0,0 +1,20 @@
+This upstream fix changes the informational message,
+
+  dns: new_dns_packet: domain is utf8 flagged...
+
+to a debug one. This should prevent it from being spammed in your logs
+a million times a day.
+
+Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7632
+
+--- a/lib/Mail/SpamAssassin/DnsResolver.pm	2018/10/12 06:14:11	1843622
++++ b/lib/Mail/SpamAssassin/DnsResolver.pm	2018/10/12 06:38:56	1843623
+@@ -547,7 +547,7 @@
+   eval {
+ 
+     if (utf8::is_utf8($domain)) {  # since Perl 5.8.1
+-      info("dns: new_dns_packet: domain is utf8 flagged: %s", $domain);
++      dbg("dns: new_dns_packet: domain is utf8 flagged: %s", $domain);
+     }
+ 
+     $domain =~ s/\.*\z/./s;
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild
deleted file mode 100644
index 2fd2d38d2b86..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions systemd toolchain-funcs user
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	dev-perl/Geo-IP
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
-
-	# Upstream bug 7622: this thing needs network access but doesn't
-	# respect the 'run_net_tests' setting.
-	perl_rm_files t/urilocalbl_geoip.t \
-		|| die 'failed to remove urilocalbl_geoip tests'
-}
-
-src_configure() {
-	# This is how and where the perl-module eclass disables the
-	# MakeMaker interactive prompt.
-	export PERL_MM_USE_DEFAULT=1
-
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	emake
-	use qmail && emake spamc/qmail-spamc
-}
-
-src_install () {
-	emake install
-	einstalldocs
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	dosym mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"${ED}/etc/mail/spamassassin/init.pre" \
-		|| die "failed to disable plugins by default"
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
-							 "${PN}.service"
-
-	use postgres && dodoc sql/*_pg.sql
-	use mysql && dodoc sql/*_mysql.sql
-
-	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
-		sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	insinto /etc/mail/spamassassin/
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules.cron" \
-			   update-spamassassin-rules
-	fi
-
-	# Remove perllocal.pod to avoid file collisions (bug #603338).
-	perl_delete_localpod || die "failed to remove perllocal.pod"
-
-	# The perl-module eclass calls three other functions to clean
-	# up in src_install. The first fixes references to ${D} in the
-	# packlist, and is useful to us, too. The other two functions,
-	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
-	# to be needed: there are no empty directories, *.bs files, or
-	# ${D} paths remaining in our installed image.
-	perl_fix_packlist || die "failed to fix paths in packlist"
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_preinst() {
-	# The spamd daemon runs as this user. Use a real home directory so
-	# that it can hold SA configuration.
-	enewuser spamd -1 -1 /home/spamd
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-
-	ewarn 'If this version of SpamAssassin causes permissions issues'
-	ewarn 'with your user configurations or bayes databases, then you'
-	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
-	ewarn 'configuration file, or remove the --username and --groupname'
-	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
-	ewarn 'configuration file.'
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
new file mode 100644
index 000000000000..a0a03b9f2483
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-functions systemd toolchain-funcs user
+
+MY_P="Mail-SpamAssassin-${PV//_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="An extensible mail filter which can identify and tag spam"
+HOMEPAGE="https://spamassassin.apache.org/"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
+
+# The Makefile.PL script checks for dependencies, but only fails if a
+# required (i.e. not optional) dependency is missing. We therefore
+# require most of the optional modules only at runtime.
+REQDEPEND="dev-lang/perl:=
+	dev-perl/HTML-Parser
+	dev-perl/Net-DNS
+	dev-perl/NetAddr-IP
+	virtual/perl-Archive-Tar
+	virtual/perl-Digest-SHA
+	virtual/perl-IO-Zlib
+	virtual/perl-Time-HiRes
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)"
+
+# SpamAssassin doesn't use libwww-perl except as a fallback for when
+# curl/wget are missing, so we depend on one of those instead. Some
+# mirrors use https, so we need those utilities to support SSL.
+#
+# re2c is needed to compile the rules (sa-compile).
+#
+# We still need the old Digest-SHA1 because razor2 has not been ported
+# to Digest-SHA.
+OPTDEPEND="app-crypt/gnupg
+	dev-perl/Digest-SHA1
+	dev-perl/Encode-Detect
+	dev-perl/Geo-IP
+	dev-perl/HTTP-Date
+	dev-perl/Mail-DKIM
+	dev-perl/Mail-SPF
+	dev-perl/Net-Patricia
+	dev-perl/Net-CIDR-Lite
+	dev-util/re2c
+	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
+	virtual/perl-MIME-Base64
+	virtual/perl-Pod-Parser
+	berkdb? ( virtual/perl-DB_File )
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+	ssl? ( dev-perl/IO-Socket-SSL )"
+
+DEPEND="${REQDEPEND}
+	test? (
+		${OPTDEPEND}
+		virtual/perl-Test-Harness
+	)"
+RDEPEND="${REQDEPEND} ${OPTDEPEND}"
+
+PATCHES=( "${FILESDIR}/spamassassin-3.4.2-bug_7632.patch" )
+
+src_prepare() {
+	default
+
+	# The sa_compile test does some weird stuff like hopping around in
+	# the directory tree and calling "make" to create a dist tarball
+	# from ${S}. It fails, and is more trouble than it's worth...
+	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
+
+	# The spamc tests (which need the networked spamd daemon) fail for
+	# irrelevant reasons. It's too hard to disable them (unlike the
+	# spamd tests themselves -- see src_test), so use a crude
+	# workaround.
+	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
+
+	# Upstream bug 7622: this thing needs network access but doesn't
+	# respect the 'run_net_tests' setting.
+	perl_rm_files t/urilocalbl_geoip.t \
+		|| die 'failed to remove urilocalbl_geoip tests'
+}
+
+src_configure() {
+	# This is how and where the perl-module eclass disables the
+	# MakeMaker interactive prompt.
+	export PERL_MM_USE_DEFAULT=1
+
+	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+	# (just to be sure, nobody knows how it could happen in the first place).
+	#
+	# We also set the path to the perl executable explictly. This will be
+	# used to create the initial shebang line in the scripts (bug 62276).
+	perl Makefile.PL \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRS=vendor \
+		SYSCONFDIR="${EPREFIX}/etc" \
+		DATADIR="${EPREFIX}/usr/share/spamassassin" \
+		PERL_BIN="${EPREFIX}/usr/bin/perl" \
+		ENABLE_SSL="$(usex ssl)" \
+		DESTDIR="${D}" \
+		|| die 'failed to create a Makefile using Makefile.PL'
+
+	# Now configure spamc.
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
+}
+
+src_compile() {
+	emake
+	use qmail && emake spamc/qmail-spamc
+}
+
+src_install () {
+	emake install
+	einstalldocs
+
+	# Create the stub dir used by sa-update and friends
+	keepdir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
+
+	if use qmail; then
+		dobin spamc/qmail-spamc
+	fi
+
+	dosym mail/spamassassin /etc/spamassassin
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' \
+		"${ED}/etc/mail/spamassassin/init.pre" \
+		|| die "failed to disable plugins by default"
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
+	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
+							 "${PN}.service"
+
+	use postgres && dodoc sql/*_pg.sql
+	use mysql && dodoc sql/*_mysql.sql
+
+	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
+		sql/README.awl procmailrc.example sample-nonspam.txt \
+		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
+		spamd-apache2/README.apache
+
+	# Rename some files so that they don't clash with others.
+	newdoc spamd/README README.spamd
+	newdoc sql/README README.sql
+	newdoc ldap/README README.ldap
+
+	if use qmail; then
+		dodoc spamc/README.qmail
+	fi
+
+	insinto /etc/mail/spamassassin/
+	insopts -m0400
+	newins "${FILESDIR}"/secrets.cf secrets.cf.example
+
+	# Create the directory where sa-update stores its GPG key (if you
+	# choose to import one). If this directory does not exist, the
+	# import will fail. This is bug 396307. We expect that the import
+	# will be performed as root, and making the directory accessible
+	# only to root prevents a warning on the command-line.
+	diropts -m0700
+	dodir /etc/mail/spamassassin/sa-update-keys
+
+	if use cron; then
+		# Install the cron job if they want it.
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}/update-spamassassin-rules.cron" \
+			   update-spamassassin-rules
+	fi
+
+	# Remove perllocal.pod to avoid file collisions (bug #603338).
+	perl_delete_localpod || die "failed to remove perllocal.pod"
+
+	# The perl-module eclass calls three other functions to clean
+	# up in src_install. The first fixes references to ${D} in the
+	# packlist, and is useful to us, too. The other two functions,
+	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
+	# to be needed: there are no empty directories, *.bs files, or
+	# ${D} paths remaining in our installed image.
+	perl_fix_packlist || die "failed to fix paths in packlist"
+}
+
+src_test() {
+	# Trick the test suite into skipping the spamd tests. Setting
+	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
+	# set in SATest.pm.
+	export SPAMD_HOST=disabled
+	default
+}
+
+pkg_preinst() {
+	# The spamd daemon runs as this user. Use a real home directory so
+	# that it can hold SA configuration.
+	enewuser spamd -1 -1 /home/spamd
+}
+
+pkg_postinst() {
+	elog
+	elog 'No rules are installed by default. You will need to run sa-update'
+	elog 'at least once, and most likely configure SpamAssassin before it'
+	elog 'will work.'
+
+	if ! use cron; then
+		elog
+		elog 'You should consider a cron job for sa-update. One is provided'
+		elog 'for daily updates if you enable the "cron" USE flag.'
+	fi
+	elog
+	elog 'Configuration and update help can be found on the wiki:'
+	elog
+	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
+	elog
+
+	ewarn 'If this version of SpamAssassin causes permissions issues'
+	ewarn 'with your user configurations or bayes databases, then you'
+	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
+	ewarn 'configuration file, or remove the --username and --groupname'
+	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
+	ewarn 'configuration file.'
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 5d01b92e998b..3a92a6e8f8cf 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index f9def9063b09..3fe55b882aa9 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -17,7 +17,7 @@ EBUILD postfix-2.10.9.ebuild 8730 BLAKE2B d10ef4dc24141ad4fd6acc2bffa201d4925260
 EBUILD postfix-3.1.6.ebuild 8661 BLAKE2B 707f1822c7e8359adc8f0884237069cd2092385eb4a55c378d2918ed097b596755a533cdf297895a3651572996b5dce8603e3dce8bea172acee60471cfce32c9 SHA512 6174266e057ca6110d39c76f6bd6d11fa24f40641599a90c143aa9396822d1cc2b3e72b7de94e849c913c5d34bf3dd081f29feedb41b2bfc349a6e567381550d
 EBUILD postfix-3.2.4.ebuild 8659 BLAKE2B d35c9cf049e257ac3c0fb713fc0059001c545e5aace98892a1c19e63774ba76a8f92bd3223e4cecd66b3801423fd67f668eb9644bb0b29dca091fec09b0272a1 SHA512 188a72188418f415701b9718c2302deea0216caf25e998f1ca386dd83368ff508524dbeb60dd198036462fc260015f7e2c179a4b1d77e662ac3c051d447f58d0
 EBUILD postfix-3.2.6.ebuild 8418 BLAKE2B 57b1fb8ab09cac0c4279e395433020080e5e5eea8e5cfc8f3a0ecdfdfc2cc25cb149d6de18e93d0ee3fa5d515283d1c7762a6a7ac514dd7a170955b26ab7d0df SHA512 c00559620978de33368e4241b25e6ebe096a651d3052b7f9a25fa09060c7df8634dc95b6fffda6a983da3ed47190f78c2dd5dd40ae0fdfaaedf10f427b32f459
-EBUILD postfix-3.3.1-r1.ebuild 8409 BLAKE2B 467ac83944650ee6c83fcb5fca5ee630f8871b1df86a46076cc688ae35a218b30bc35f42a34936393a9bdb12ff2f6e6d613fda153a84ff2f2e80719b79652a05 SHA512 c3abf369c4cf975c1b0a4af7bb7e1d274059855e5f055a5104d4edba467bc31104619db59ea61fbc7a2cc4e130e398f64a047623d2454ac062a0089908eed688
+EBUILD postfix-3.3.1-r1.ebuild 8408 BLAKE2B 654ee9c7ac7dd0bcd758deb0bf121d9eccad571c983d4c5c1ea17510aae74cb27a7c452686c9ac9a23bd51702293678c0ececafee5baa62053ee363375d35ee2 SHA512 cf3665dfec8f2e926e5574cc3079d1dc0aaa884f767fe82aea154eb979b6b81fd94fb50f4859fcf8103b03e65610c2a4c4ccf52797e3fad54bc1936feaa0fc6e
 EBUILD postfix-3.3.1.ebuild 8425 BLAKE2B f3d19606dfc65e1cc50ca2c7fd15bb036194fd7e8076a10b1568249da34b8a5c3332a4ca401d7922d7a54a461d74102cdc75c5f32eee6db36dd6cacca78403f2 SHA512 997e9b1a332b686fe51d5ffca62af4c797a7741f2a4e36e2149e55ccd17a4e2a40640ddea00ebc253e8017933ff36626ab20175b2a5006461577e75987572b80
 EBUILD postfix-3.4_pre20180904.ebuild 8342 BLAKE2B 5d1cf06b180435076cbe05beb6691e28b7969fde2b199ece777d3112ddf8a5f20b1c93af30aba03f19c86e7102e6a1e2b487254b487c196513e236e7d3e14bf3 SHA512 ea24bedef571e51ba456e33707fd9279e17c677f0559fe25b2b53027eb6c2c647fd48210217cd00f145a15bf5e3e47491ece7375d46c85f0a177a74891ea145c
 MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d
diff --git a/mail-mta/postfix/postfix-3.3.1-r1.ebuild b/mail-mta/postfix/postfix-3.3.1-r1.ebuild
index 5877435ec85a..afd9a3d4714f 100644
--- a/mail-mta/postfix/postfix-3.3.1-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.3.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 4edd3f66b4ad..d12755aac02d 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 575e19625092..619927b23190 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,3 +1,3 @@
 DIST mate-sensors-applet-1.18.3.tar.xz 385728 BLAKE2B 42a38121db367788af906aec08261512b8aa96ad3782c1aca0d29b8371a598855ee0d7a3c63306929d45e4d58fb01e117efd91b4bd6b104c49790ff8e73c292f SHA512 39e23839eebe460a99d002d6f897d3053a6940cb33a24c923790e976b72be7a260cd06be326abbb3917b85b6b6fa779cc5f1c06dbf9c19c45ec3f1bf6a93a96e
-EBUILD mate-sensors-applet-1.18.3.ebuild 1456 BLAKE2B 82b54b5512e38a9eeea46218b48e84a75b667a7aed23e3babdd3a2e2cdcdcdcbbdf006833ffc7cd14f0ebba84e69882514990f3b4bd65dc9a7fc8166a025fbd6 SHA512 4083091cb8a0b79dc80a9ade6f16c4ca2c6810c04c1b460da42dfdc5aa543b9d4393047f1571b992685e4ff212be52984f25cec251b99c1bc45f5f53214b2ff6
+EBUILD mate-sensors-applet-1.18.3.ebuild 1411 BLAKE2B ef15529ff5db1a8909f6c76d6188b348ad34ddbe7206cbf290810524c12237a667499ce8b37a3d7845735a478635ff790abbcdaaa268fdbd7edfe6b63034c3da SHA512 9ac6a446f48023d70f2f9f2de2a70dc8c865d49a08c9cc8d06538e8f7d0b2815a59b2f60d0d12b88405acaa3a0146325f84f64c5e256e4beaffcb32e581ff51e
 MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.3.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.3.ebuild
index 86472d98d2bd..62ee356d61a6 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.3.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,10 +30,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.36:2
 		!dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) )
 	libnotify? ( >=x11-libs/libnotify-0.7:0 )
 	lm_sensors? ( sys-apps/lm_sensors:0 )
-	video_cards_nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
-		media-video/nvidia-settings:0
-	) )"
+	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] )"
 
 RDEPEND="${COMMON_DEPEND}"
 
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 12ea92b458f3..018b95f39283 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/bitstream-cyberbit/Manifest b/media-fonts/bitstream-cyberbit/Manifest
index 1001a71b646d..dc063a88c6b4 100644
--- a/media-fonts/bitstream-cyberbit/Manifest
+++ b/media-fonts/bitstream-cyberbit/Manifest
@@ -1,3 +1,3 @@
 DIST bitstream-cyberbit-2.0.zip 6427108 BLAKE2B 4d79ea91f478df159ad230300bf94e42d57148cac22d01b2eea653e12651dfc71b667fdfdb92da282bdaf281d45dfb9fbc04eeee806a82b6741a313872a3375d SHA512 39af2720123e7d732e3dffffab37d949221211748594a66ecbd41bafcd387e4582433ece802e42f3d1f0728da9ed0c5bb00465f20fa2ff3687018ed94edf25a1
-EBUILD bitstream-cyberbit-2.0-r2.ebuild 591 BLAKE2B de61523e9d45aded1d58fe6def7f8e966d88eecc03a221981331751f4cdd1c58e46d6623e2d4455b3084f9ff1125a13e2ad5bb3b1db8f7be30b40560830fe3c9 SHA512 fddf2ed46df2bc810c4d59bbb090eaf35b9e3d5d3d5a8b5527759720a3465ffe6316d619a3aafa37ad83104d94233e5b9d8213e34f509609bce7e553e6864d7a
+EBUILD bitstream-cyberbit-2.0-r2.ebuild 627 BLAKE2B 72dd6539f16091833ee7330615058653912810635af4fe52cff3009fab2a836c77e0d67b63f2f01bc54edba7dfde2ad6e38816a1b76bca8c254dc3a6d63d5152 SHA512 32e1d3156b3bdd1f419d8429be7a0e5c88d62931194c549a169be0e6b443bd407c5c9aa9ef4938a43c7fb25deae36ccdd5274252e1bffee025041e0b39d20d64
 MISC metadata.xml 364 BLAKE2B a3ae59e04600fb512fe1e0dd6ebb3d146faee164775446754633c9bf88845f0ea0459fa4a145ce7e232206bde0bf2e72b4ed29420fe667620acfe5b8074d348a SHA512 2b2701e4698f5adc465a1ab038f176e405a0df1528560560831e43ae34421eb74e4332ad3001c6ad2eba43ac976b6856e2ee2690685a03428fd1ae71552017e5
diff --git a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
index 51438253a0f8..dd46e6e5976d 100644
--- a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
+++ b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit font
 
 DESCRIPTION="Cyberbit Unicode (including CJK) font"
 HOMEPAGE="http://www.bitstream.com/"
-SRC_URI="http://ftp.netscape.com/pub/communicator/extras/fonts/windows/Cyberbit.ZIP -> ${P}.zip ftp://ftp.netscape.com.edgesuite.net/pub/communicator/extras/fonts/windows/Cyberbit.ZIP -> ${P}.zip"
+SRC_URI="http://freebsd.nsu.ru/distfiles/cyberbit/Cyberbit.ZIP -> ${P}.zip https://www.minix3.org/distfiles-backup/cyberbit-ttf/Cyberbit.ZIP -> ${P}.zip http://mirror.uni-c.dk/pub/pkgsrc/distfiles/cyberbit-ttf/Cyberbit.ZIP -> ${P}.zip"
 LICENSE="BitstreamCyberbit"
 
 SLOT="0"
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index 8201eba89bb4..6003548b4891 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,4 +1,6 @@
 DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c2d718fc84920b5b23c0a055e46c19916a7ec6b2c0a0adba650161c5a032761d46b303de64bddd81696adf960e3e541 SHA512 2570958b0f4b28ded52327150b67118d693d6bc6f483be3e3147ddda1c5870ab21f1b64938e4abc1030080455976c0d33ae3925b51660fd2c8b5428b5b0f8eb7
 DIST fira-code-1.205.tar.gz 5348822 BLAKE2B 9167765fb986a0b4552387fa43e71ddcfb97371692ad071659cc6a198dd4bee707e15a2f438daac1d5e038b8a4d2ddf4d5e0b94cf182655cd83b5085af3a207a SHA512 cbeb5fe4577ff6de5c4d58247c3b82b7aec4022afa5552394c660846d8caab8cca3a1a44aed8cccd10d03fe8c38e419d97663f5a750bd9d4e11ec4d2e5659bf8
+DIST fira-code-1.206.tar.gz 4679094 BLAKE2B 95a705979db3d96944986b78945734e87de0f7164db50313d9bcec5da3b2a8f6281bc1b1506c65a29358bc8fa65d9ffc2bb76b9e734077f6d487bc3bd63680e2 SHA512 022216fb3b7c553cd0608a51e8e5a2903375a15d3600a694dad68666897a5ed33d7ad6819db55e0ce4b7c58ac1dd3c33d2e05aded62ebf38365ffee8fb7f8ee0
 EBUILD fira-code-1.205.ebuild 618 BLAKE2B 88137715e4430f3807b1c9eb806cb51154235c634cbbc6498d32de302affb95d773de2b0639233ae1cf5cff9ed842a8d2ed3e6a749e46be0e8a5ff24d5151a58 SHA512 f0deec2a27ddbc65cf8dda234c7abbed40286f4dc0143b156cd20104b681b47eeba4b98f078283d3e283e6f7da1c7755e65d1e2f7adb7cf07557d5aa46c013e4
+EBUILD fira-code-1.206.ebuild 619 BLAKE2B d045a58476bf8af3f26150ea578b1e069818869b7a09f9261f12e2a75998bd01f5968312f105ae904af26d3a5476eebedee334f857e68f1428a64e0b6bf9580a SHA512 d3f4eddc634a578252e2d4ea086da45804d00c59589638806cf79317c86eb765a264346c864c109b130e52b42f73ad977322459aca277a7ca4bdec862f6c9bbd
 MISC metadata.xml 430 BLAKE2B 1d5b9b36382478e6ce2e7444cec9513f560e7c642cace9241ec36769b2ac17ba9282151ea321574dc53dfd26e2a98a289b9dd02bea1ea7a4641f8a75046213f2 SHA512 2378c23273f922c0088d9535e4ac94da0c05e59a79ef8119f351911bde62f7e3c8706a4276a888404ae8f18a3e5ad7181358db00c8a9c990a6874dc69f24eac8
diff --git a/media-fonts/fira-code/fira-code-1.206.ebuild b/media-fonts/fira-code/fira-code-1.206.ebuild
new file mode 100644
index 000000000000..73d454e405d4
--- /dev/null
+++ b/media-fonts/fira-code/fira-code-1.206.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+DESCRIPTION="Monospaced font with programming ligatures"
+HOMEPAGE="https://github.com/tonsky/FiraCode"
+SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/FiraCode-${PV}"
+FONT_S="${S}/distr/otf"
+FONT_SUFFIX="otf"
+
+DOCS="README.md"
+
+src_prepare() {
+	default
+	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
+}
diff --git a/media-fonts/kanjistrokeorders/Manifest b/media-fonts/kanjistrokeorders/Manifest
index 0841d0f4d7c6..2ffd7ad6bfd2 100644
--- a/media-fonts/kanjistrokeorders/Manifest
+++ b/media-fonts/kanjistrokeorders/Manifest
@@ -1,5 +1,5 @@
 DIST KanjiStrokeOrders_v2.012.zip 8961316 BLAKE2B 1ddd7ec47668ea0d10700db60a3f07665234c70815e8415a5dca4814d8b13c82ca23534e5278380ca8115ff6fc16ba8c65954022c657c0de3826f5370eb579ff SHA512 352be65ee27275a5093625372a8fb8bc073d8b76b9269e3c211ffe5f18a23134b1b1fff18d2b85cfa70424a74ab4e3a342a4f231b65364cf017985a5e70443c6
 DIST KanjiStrokeOrders_v2.016.zip 8982113 BLAKE2B 940d0ab1c7a0b045a88bec454b3f4dda4cb61d096d0e786884f2e3ea8aa7a21942604585173eded13e5618ae0051d01c975a0b9b45deeae7abff8983c03852a1 SHA512 8551864915f3d5b542df318a1fe1d8474304ec8adb61fd414d4bff132c69a5a875eae0bdccce90819da1f3c68192c589207bf9c997a81896ddd6916d79f363a0
-EBUILD kanjistrokeorders-2.012.ebuild 542 BLAKE2B 8817a7b30124499f194c37ca000b6bdd2441da855786dcab1bff6f1a97af83b2605a368bf4129862e70da0ba96bfc76e0170de31ba279bea34d3d5412fbe8c64 SHA512 f22e4c0973ac90ee8dbf89683d60c626757efab19b758d3ee7fe555541cb66b088727f8797df644079f7b602524f3363c47145aa78e495a8796429d65deb791d
-EBUILD kanjistrokeorders-2.016.ebuild 580 BLAKE2B 35ce6216b48795a80099dc987989eb2528abc52b3282ffd739cfaa52e5294b3bf2a8a21b6761d17b4db50bbc2163cc66590c430aef31c96f15282ba8cf6dfde0 SHA512 90fc44af9cf20e458720ee98c6cf6c34fd21653523a7e5511896c6e1c25ec3e7618725b80e8b2d14048ffbcaa87c2ba66b98f13956da23122dc69c181550e372
+EBUILD kanjistrokeorders-2.012.ebuild 578 BLAKE2B de333a0823903bd5c835001ed3f2f5045d6e7c028c43d8ae2acdad47c09a6f11000ae065e4b51bbc591af2e7b5dfb39c11b41b2c2a6a17d2b57898f75200e9fc SHA512 a86d64e1ad49785b91428feac31334b7d58d35c4d827cac2825d728b8cb0f212bf37c9b3ae4ceec6a1eb74ff95f7ff9e635f4f9d830ea18193afc3c6d10e8fd3
+EBUILD kanjistrokeorders-2.016.ebuild 602 BLAKE2B dca3b4f2e2a8ca0ed965974ee5e34557893b5a58430e17b40d4e20fd6120afce57926e463b46800346a696592db77690903d42aa0f3225663a60b415f8c278b4 SHA512 87a2db8474fab3b2845874d2813fab07227307a75877dc82b5889c81e5e3645dd3176df8fade44339cb61348664295b313bfc77689d0874efdf489d68661f355
 MISC metadata.xml 332 BLAKE2B 58065f27878c71ac52b58b5b3f23c5cba42973338a01bfd7ef85a9dde2c7ec53d66f8094fa5ca38fd96fe22a29f9a6947c4e84131ed2e7aff23f0be2a550053c SHA512 9a9acadc7af90e8d744d4ae3b8e1f31973c9d00dd3843261a578111df0fe0fe24df44a9858a466a265bcd0bcc1d55fecdcc8a699a3d093030236fe0e88b03bd9
diff --git a/media-fonts/kanjistrokeorders/kanjistrokeorders-2.012.ebuild b/media-fonts/kanjistrokeorders/kanjistrokeorders-2.012.ebuild
index fb9b1ee3f63a..ae75eaca3f13 100644
--- a/media-fonts/kanjistrokeorders/kanjistrokeorders-2.012.ebuild
+++ b/media-fonts/kanjistrokeorders/kanjistrokeorders-2.012.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
+RDEPEND="!=kde-apps/kiten-18.08.2-r0"
+
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/kanjistrokeorders/kanjistrokeorders-2.016.ebuild b/media-fonts/kanjistrokeorders/kanjistrokeorders-2.016.ebuild
index 5522c8ae4808..84d25ec5cb47 100644
--- a/media-fonts/kanjistrokeorders/kanjistrokeorders-2.016.ebuild
+++ b/media-fonts/kanjistrokeorders/kanjistrokeorders-2.016.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 inherit font
 
 MY_P="KanjiStrokeOrders_v${PV}"
-DESCRIPTION="font to view stroke order diagrams for Kanji, Kana and etc"
+DESCRIPTION="Font to view stroke order diagrams for Kanji, Kana and etc"
 HOMEPAGE="https://sites.google.com/site/nihilistorguk/"
 SRC_URI="https://sites.google.com/site/nihilistorguk/Home/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Only installs fonts
 RESTRICT="strip binchecks"
 
 DEPEND="app-arch/unzip"
-RDEPEND=""
+RDEPEND="!=kde-apps/kiten-18.08.2-r0"
 
 S="${WORKDIR}"
 FONT_S="${S}"
diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest
index b802d04d0ca2..8aaa7c433c03 100644
--- a/media-fonts/noto-cjk/Manifest
+++ b/media-fonts/noto-cjk/Manifest
@@ -1,3 +1,6 @@
+AUX 70-noto-cjk.conf 3815 BLAKE2B 84c477a84c117fa7fef4922e6b289c4eab4147a291b447a3b6d90a01d513f1f0c64dcd341bdda7b9b9f8efe339ab6781dde49189e84640ff781091f630b4296c SHA512 8f45cd10f17b4cfc2b5d7d253e7ca1dba20eaff206f479377c25ef54f469aaa3346d1ceb422086d7b25bc3ce6b3cf0a43b5967affd1126c020059a4e319e0337
 DIST noto-cjk-20150615.tar.xz 390518224 BLAKE2B 273018f6d0792ae90bc0d9f44a43f300a7fbd2ca2cbdbf71af911e1cfc0d4f0bb30b5d1f2b15d9bf4df279266921d46987f166dd4559ea15e747db7a22494145 SHA512 738bd840d14c3fc3665b9c6e50b1b2d5981ccdc5e660a6498b4611b8019208f0880df062741d9dec8bdcd54234eed46655e1c739cf872d9dfa5fa0523954a7d3
+DIST noto-cjk-20170602.tar.gz 1667938394 BLAKE2B 51ed7c48bccef0dff75ddc5ec108b61f0f5ceedc41608919dc1071a2308f96c3d2883af932935c32db6dd017e067079d45776eb865200560f2f9c6b89e57dd8c SHA512 861431e1eb0c21b8b7b03f9a97ae61c59a2e513314a24f0c50e2953daac3cba78fa418af32cf66ec100a26c88f5e07bd33eb3ed80b533d97a452fefa5a06b4dc
 EBUILD noto-cjk-20150615.ebuild 756 BLAKE2B c1ee13c7340cf90d0dcd9130c3377332e9772828df9948cf8eb5d3df337c77e67bde57d53c2cdd1ad6129e1cceaec8e5e28179535036ef98c970c602ca95b411 SHA512 c8696b1655b25cfcb1004898d80d757e5cd2273fbe71e01cead68b379643259072917b03cd893de3213d9d76f8fab245255f030b48e5cb39b9d1eccdfe81cc14
+EBUILD noto-cjk-20170602.ebuild 652 BLAKE2B c67ffdc7dfa6545993a7b62a440d9e020ad4c758746b0a902c78cdcc4ea63ed50f480ef34ca65e058acc4be511bf2c93b360b81a6c06d317df5459bf35558aaa SHA512 77df04a357d5a3d7ab9e90880e8d426e4921ba5794ef7fd3f24f190bcd1c9f91be533aa7571ddb0ed2cc899e2ccc26e177216b55ae77ae36046e7852c0c9f0bd
 MISC metadata.xml 449 BLAKE2B f30d4df6c9ddc672a839eeb6433bd9583fa4af65c32190b09bca261e1a53e0c9bb396808811a3591c8b90337002fba8433d8eb816af4475f57339c299b8eaa06 SHA512 04d7f718df7e4d83823b778f09f1cb4e78ffceb154030dc1f8980cd9ca9cf8ed0140d0354b44e6523952e6ddae3e4879a467a1855092cfb7052ea97e099c98d4
diff --git a/media-fonts/noto-cjk/files/70-noto-cjk.conf b/media-fonts/noto-cjk/files/70-noto-cjk.conf
new file mode 100644
index 000000000000..c1052bb4c573
--- /dev/null
+++ b/media-fonts/noto-cjk/files/70-noto-cjk.conf
@@ -0,0 +1,147 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+    <match target="pattern">
+        <test name="lang">
+            <string>ja</string>
+        </test>
+        <test name="family">
+            <string>serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Serif CJK JP</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>ko</string>
+        </test>
+        <test name="family">
+            <string>serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Serif CJK KR</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>zh-cn</string>
+        </test>
+        <test name="family">
+            <string>serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Serif CJK SC</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>zh-tw</string>
+        </test>
+        <test name="family">
+            <string>serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Serif CJK TC</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>ja</string>
+        </test>
+        <test name="family">
+            <string>sans-serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans CJK JP</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>ko</string>
+        </test>
+        <test name="family">
+            <string>sans-serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans CJK KR</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>zh-cn</string>
+        </test>
+        <test name="family">
+            <string>sans-serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans CJK SC</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>zh-tw</string>
+        </test>
+        <test name="family">
+            <string>sans-serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans CJK TC</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>ja</string>
+        </test>
+        <test name="family">
+            <string>monospace</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans Mono CJK JP</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>ko</string>
+        </test>
+        <test name="family">
+            <string>monospace</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans Mono CJK KR</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>zh-cn</string>
+        </test>
+        <test name="family">
+            <string>monospace</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans Mono CJK SC</string>
+        </edit>
+    </match>
+
+    <match target="pattern">
+        <test name="lang">
+            <string>zh-tw</string>
+        </test>
+        <test name="family">
+            <string>monospace</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans Mono CJK TC</string>
+        </edit>
+    </match>
+</fontconfig>
diff --git a/media-fonts/noto-cjk/noto-cjk-20170602.ebuild b/media-fonts/noto-cjk/noto-cjk-20170602.ebuild
new file mode 100644
index 000000000000..3e65ff1b5d76
--- /dev/null
+++ b/media-fonts/noto-cjk/noto-cjk-20170602.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit font
+
+DESCRIPTION="Google's CJK font family"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk"
+
+COMMIT="32a5844539f2e348ed36b44e990f9b06d7fb89fe"
+SRC_URI="https://github.com/googlei18n/noto-cjk/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+FONT_S="${S}"
+FONT_SUFFIX="ttc otf"
+FONT_CONF=(
+	# From ArchLinux
+	"${FILESDIR}/70-noto-cjk.conf"
+)
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
new file mode 100644
index 000000000000..13b29caded14
--- /dev/null
+++ b/media-fonts/noto-emoji/Manifest
@@ -0,0 +1,6 @@
+AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
+AUX noto-emoji-use-gm.patch 1488 BLAKE2B 08bb2fa62c79615992c25503093d9ee8296dd3d0103ae50e9376020730c48d8e3eb5da281f066242b25d8e5c6a293cdb013b9d276fb10350021479aade1e78ab SHA512 0719575b7d2c3f0cc15c7e7a314e4a528b0601e14b8a06f0304a784d3d5dcf27cf4f881e4b57bb4647ba0cb36ba7be842bea2df1529de55d6ca16b6326c930d8
+AUX noto-emoji-use-system-pngquant.patch 2118 BLAKE2B 55048756859ead78a013a6ff749500107d9fe02fcfe775582fade153f268c5daa6f074ea1e8ea260bd09af077cc19cd8121b570bac47649b669df196e43d2574 SHA512 6bd4dd9e45aa73d8677c671a5ee3d6f03b3e94004db9b9c715cf76402ab2a641ce79991ec583cfe3a15a6c9803de4bfa863bd30cf16e96e9cb8a4683d6c04807
+DIST noto-emoji-20180814.tar.gz 51709109 BLAKE2B 9678861973b231de48b11dc9267840e4a4a6689c7c26281dfc1d6b0d4c1c1c627b503226d7eeac2f568dc19162c669b54c8dd34f5aa449850797437cf3a2e8cb SHA512 bca0fb73d3897c4ec1ba94173fda17804cdf2dfa365aa4a19bf1d24e9a94806bcdd5e6eb6304eb3e2312b37f37fa917905be6fe11c84510214f0eba70f426ea8
+EBUILD noto-emoji-20180814.ebuild 1111 BLAKE2B 0c7dc7b7689933d5d21a108eb30496e264d17ac8401df48c60dcb87ea3c188edd33510612e86ad4857a2f8c1c53616b3af4f1f5696e208bc7c69e22fb39eca40 SHA512 b465734cfd567ad77fa30c860e0f3ddaed332db9acf0c570d0fffda95316601ad52f0ba1384f14e78a956dbce6fa92b417e72faaae5896a0d1e783ef1a8c0a81
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch b/media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch
new file mode 100644
index 000000000000..564b08a59078
--- /dev/null
+++ b/media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch
@@ -0,0 +1,11 @@
+--- old/Makefile	2018-05-03 20:32:14.000000000 +0200
++++ new/Makefile	2018-05-08 11:48:20.811073447 +0200
+@@ -78,7 +78,7 @@
+ 
+ ALL_FLAGS = $(basename $(notdir $(wildcard $(FLAGS_SRC_DIR)/*.png)))
+ 
+-FLAGS = $(SELECTED_FLAGS)
++FLAGS = $(ALL_FLAGS)
+ 
+ FLAG_NAMES = $(FLAGS:%=%.png)
+ FLAG_FILES = $(addprefix $(FLAGS_DIR)/, $(FLAG_NAMES))
diff --git a/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch b/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch
new file mode 100644
index 000000000000..5710fd53dc5c
--- /dev/null
+++ b/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch
@@ -0,0 +1,30 @@
+Index: noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf/Makefile
+===================================================================
+--- noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf.orig/Makefile
++++ noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf/Makefile
+@@ -20,7 +20,8 @@ LDFLAGS = -lm `pkg-config --libs cairo`
+ PNGQUANT = pngquant
+ PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
+ BODY_DIMENSIONS = 136x128
+-IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
++#IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
++IMOPS = -size 136x128 -background none -gravity center -extent 136x128 -compose copy
+ 
+ # zopflipng is better (about 5-10%) but much slower.  it will be used if
+ # present.  pass ZOPFLIPNG= as an arg to make to use optipng instead.
+@@ -172,13 +173,13 @@ waveflag: waveflag.c
+ # imagemagick packaged with ubuntu trusty (6.7.7-10) by using -composite.
+ 
+ $(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR)
+-	@convert $(IMOPS) "$<" -composite "PNG32:$@"
++	@gm convert $(IMOPS) "$<" "PNG32:$@"
+ 
+ $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag $(PNGQUANT) | $(FLAGS_DIR)
+ 	@./waveflag $(FLAGS_DIR)/ "$<"
+ 
+ $(RESIZED_FLAGS_DIR)/%.png: $(FLAGS_DIR)/%.png | $(RESIZED_FLAGS_DIR)
+-	@convert $(IMOPS) "$<" -composite "PNG32:$@"
++	@gm convert $(IMOPS) "$<" "PNG32:$@"
+ 
+ flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR)
+ 	@$(subst ^, ,                                  \
diff --git a/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch b/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch
new file mode 100644
index 000000000000..ddc6ff881ce1
--- /dev/null
+++ b/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch
@@ -0,0 +1,59 @@
+diff -ru noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5.orig/Makefile noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/Makefile
+--- noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5.orig/Makefile	2018-03-07 09:22:49.670696985 +0100
++++ noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/Makefile	2018-03-07 09:23:06.824506178 +0100
+@@ -15,10 +15,9 @@
+ EMOJI = NotoColorEmoji
+ font: $(EMOJI).ttf
+ 
+-CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
++CFLAGS = $(OPT_CFLAGS) `pkg-config --cflags --libs cairo`
+ LDFLAGS = -lm `pkg-config --libs cairo`
+-PNGQUANTDIR := third_party/pngquant
+-PNGQUANT := $(PNGQUANTDIR)/pngquant
++PNGQUANT = pngquant
+ PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
+ BODY_DIMENSIONS = 136x128
+ IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
+@@ -97,6 +96,12 @@
+ ALL_COMPRESSED_FILES = $(addprefix $(COMPRESSED_DIR)/, $(ALL_NAMES))
+ 
+ # tool checks
++ifeq (,$(shell which $(PNGQUANT)))
++  ifeq (,$(wildcard $(PNGQUANT)))
++    MISSING_PNGQUANT = fail
++  endif
++endif
++
+ ifeq (,$(shell which $(ZOPFLIPNG)))
+   ifeq (,$(wildcard $(ZOPFLIPNG)))
+     MISSING_ZOPFLI = fail
+@@ -126,6 +131,11 @@
+ 
+ compressed: $(ALL_COMPRESSED_FILES)
+ 
++check_quantization_tool:
++ifdef MISSING_PNGQUANT
++	$(error "$(PNGQUANT) is not available")
++endif
++
+ check_compress_tool:
+ ifdef MISSING_ZOPFLI
+   ifdef MISSING_OPTIPNG
+@@ -146,8 +156,7 @@
+ $(EMOJI_DIR) $(FLAGS_DIR) $(RESIZED_FLAGS_DIR) $(RENAMED_FLAGS_DIR) $(QUANTIZED_DIR) $(COMPRESSED_DIR):
+ 	mkdir -p "$@"
+ 
+-$(PNGQUANT):
+-	$(MAKE) -C $(PNGQUANTDIR)
++$(PNGQUANT): check_quantization_tool
+ 
+ waveflag: waveflag.c
+ 	$(CC) $< -o $@ $(CFLAGS) $(LDFLAGS)
+@@ -227,5 +236,5 @@
+ .SECONDARY: $(EMOJI_FILES) $(FLAG_FILES) $(RESIZED_FLAG_FILES) $(RENAMED_FLAG_FILES) \
+   $(ALL_QUANTIZED_FILES) $(ALL_COMPRESSED_FILES)
+ 
+-.PHONY:	clean flags emoji renamed_flags quantized compressed check_compress_tool
++.PHONY:	clean flags emoji renamed_flags quantized compressed check_compress_tool check_quantization_tool
+ 
+noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/ ���存在: Makefile.orig
diff --git a/media-fonts/noto-emoji/metadata.xml b/media-fonts/noto-emoji/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/media-fonts/noto-emoji/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-fonts/noto-emoji/noto-emoji-20180814.ebuild b/media-fonts/noto-emoji/noto-emoji-20180814.ebuild
new file mode 100644
index 000000000000..7dd40de2811e
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20180814.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit font python-any-r1
+
+DESCRIPTION="Google Noto Emoji fonts"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji"
+
+COMMIT="3ffd20ec7504657aa17c84f9aa475ad09b20c362"
+SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	app-arch/zopfli
+	dev-python/fonttools
+	dev-python/nototools
+	media-gfx/pngquant
+	x11-libs/cairo
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick )
+"
+RDEPEND=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
+
+PATCHES=(
+	# From Fedora
+	"${FILESDIR}/${PN}-use-system-pngquant.patch"
+	"${FILESDIR}/${PN}-build-all-flags.patch"
+)
+
+src_prepare() {
+	default
+	# Use system pngquant
+	rm -rf third_party/pngquant
+
+	# Fedora patch to allow graphicsmagick usage
+	if has_version media-gfx/graphicsmagick; then
+		eapply "${FILESDIR}/${PN}-use-gm.patch"
+	fi
+}
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index b5172c37f25b..6a669f7f2bf2 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,3 +1,8 @@
+AUX 66-noto-mono.conf 326 BLAKE2B 5bf5d20d31635e0b84f34d9a619df0de842431d319c283d120bdc060766ee4f2073b485c267206905c4e8095c40a176237c17c315c9a1af5771591ea636c1673 SHA512 91b71d5ee435bf1ee534be6b4461d93b1f57693137d929dc2ca98f4074754ace4ae6e8f05e627af903332c8a63449ab40eebea7a385ec27580fa2a782a3a8fc7
+AUX 66-noto-sans.conf 318 BLAKE2B 42a6036c93c982b2b0eb04a530dafe6d8eceeac0e770411d8dedda2e6ae62a921642f23db1f0849d6d08295ebe44f1b204fd93a27661e3f5ca52e5c6f8bd76cc SHA512 80c15846c014c723830aefb84c6d3069f9addffd1ca227a8a7b17023c64a949254152541f7e81b4afeca690ddeab959f35f390366f7e697e3b7715d692ea7c98
+AUX 66-noto-serif.conf 310 BLAKE2B 804753d2e703ce309e74da15aefdac6d510f52396a312a143c1a9e0e499f0301e5a154f6df48cf4a71834c637b1545953354d0c3518d67a429850135ed2db4da SHA512 c0ade988e2560191098c539de4341dfee29bc67d177f5916c7eb3346586c19c791c32842016db334c3d3689d89a1437220544f2c45934a9c0d74d2f6064aaa69
 DIST noto-20170403.tar.xz 11083152 BLAKE2B 8281cc19a100d1cbf7f57fba9cba077bb0005f7296f58d48247bef6c804b53597ff359dfab7b7d851e42c0294c757f311979b98dc9f1c22e2d3f3fabe4db77e7 SHA512 f8f1414b5b6f793e86ef3cc6a6320c4545f079b337c7672cb8cccc3c50d21d353d81557da4a555cdb6524c79be3e4c167f7d5aac102c38d64926f3b1887ca7f3
+DIST noto-20180905.tar.gz 666633675 BLAKE2B 209e28ba8feb7367381fb3cc1cb0f1109167f9b339c9a18c347592cb95a060e60f9c01fcfd309d029c235e9ac5de3e808f1b70cad6b5482f2252029b5ab4944e SHA512 f4cf75d91c9c6c607bc3a9ea97114ccd2c691505f919e08ae3ad591e1cd211c85a3ef24abe96ec23e6961bdba0a35c1ecba6f87556ef53661e4afcdcd865602c
 EBUILD noto-20170403.ebuild 819 BLAKE2B 3bf921503660437c91da43ac3e7e9e05fff70ff95e9842b1c5d884d005a28286a929cc66772afa8f9c74d919045f9e45218ce8f2bfa0eb9539b1ceea26c8762e SHA512 728276eef93954d03eb649f2772d4cde19b3080e7bdff2da344d70026d992f5dd1d521f6786c50f32f38c1780988288463705fdd522cec298ba4c8d51bd6b8d7
+EBUILD noto-20180905.ebuild 936 BLAKE2B 0829b0a93d2ca1b411394be253a827f1991e646cbae54e0a9a14fb191201636bc357f823241fb62c2863dff878c56f0c0c355f937705a7a71894c6f897f05efe SHA512 2adfde688f314aa472b0774175f303a5510acb6977a35da87f1cd001035616bbad732712012f0070b7eb3b9d0835529e6aab7b23b15f048e7bc325aa2b55d000
 MISC metadata.xml 449 BLAKE2B f30d4df6c9ddc672a839eeb6433bd9583fa4af65c32190b09bca261e1a53e0c9bb396808811a3591c8b90337002fba8433d8eb816af4475f57339c299b8eaa06 SHA512 04d7f718df7e4d83823b778f09f1cb4e78ffceb154030dc1f8980cd9ca9cf8ed0140d0354b44e6523952e6ddae3e4879a467a1855092cfb7052ea97e099c98d4
diff --git a/media-fonts/noto/files/66-noto-mono.conf b/media-fonts/noto/files/66-noto-mono.conf
new file mode 100644
index 000000000000..21d6c364a8e6
--- /dev/null
+++ b/media-fonts/noto/files/66-noto-mono.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Noto Sans Mono</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Noto Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/media-fonts/noto/files/66-noto-sans.conf b/media-fonts/noto/files/66-noto-sans.conf
new file mode 100644
index 000000000000..012aebedf8b3
--- /dev/null
+++ b/media-fonts/noto/files/66-noto-sans.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Noto Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Noto Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/media-fonts/noto/files/66-noto-serif.conf b/media-fonts/noto/files/66-noto-serif.conf
new file mode 100644
index 000000000000..036baf776490
--- /dev/null
+++ b/media-fonts/noto/files/66-noto-serif.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Noto Serif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Noto Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/media-fonts/noto/noto-20180905.ebuild b/media-fonts/noto/noto-20180905.ebuild
new file mode 100644
index 000000000000..1c15cd81cf20
--- /dev/null
+++ b/media-fonts/noto/noto-20180905.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit font
+
+DESCRIPTION="Google's font family that aims to support all the world's languages"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
+
+COMMIT="db5c897c3954ab8dd49bfc3de4f3ef00a7ef6d06"
+SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cjk"
+
+RDEPEND="cjk? ( media-fonts/noto-cjk )"
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-fonts-${COMMIT}"
+
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+	# From ArchLinux
+	"${FILESDIR}/66-noto-serif.conf"
+	"${FILESDIR}/66-noto-mono.conf"
+	"${FILESDIR}/66-noto-sans.conf"
+)
+
+src_install() {
+	# Don't install in separate subdirs
+	FONT_S="${S}/unhinted/" font_src_install
+	FONT_S="${S}/hinted/" font_src_install
+}
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index 25771f588d2a..8c9b23e6f02c 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -1,10 +1,13 @@
 AUX 10.0.06-make.patch 645 BLAKE2B 7aea0a47997233e54f150d4a25f3fb376106378b93e86a68c8623d0c66e3650c6fb4bd4a6c98441f14f2ef176b40bfc23addc4168c78e34797b75b6e17b565cc SHA512 b205457eb2ffe1f4693e82a5597f1a95b95a62744101bd5a73a36060030541a855a62f84fafe255fafaf1e89b7f89c707dace2eccbe7b2746c3059404e7bd38d
+AUX 11.0.02-make.patch 366 BLAKE2B 1d857d76826b5906c6405aa41728121624b345ad1f9bf2e8239691af1e5506dbad7eab1f590bf3bbfea45f174af0e8f8fa9d85b11542ea91edc218cdaa08d13b SHA512 f8a286c4ecd9af7ec32f2f90ba0ae91e2f9f4111cb1f65dbc4cef07dff787eae4ee96aca7e15a61d2ae8930f3537dd6fa77393dc720a4fc91300a2c9a5c1d9ea
 DIST unifont-10.0.04.tar.gz 15651848 BLAKE2B 6308298244c45b51647e7eeb41cf19e085be89677688402b3fa384f423c27cb666ad8254ab98d052a93e5f928f490890d767fd96fe4c963f6f628cf14c3d9983 SHA512 0f9bb622e469ed340cc5ff465f6922b32eed2115014cad3ff445e8b17cedbf7c4c7f0025825e14ec4d046d9a28edb6a90eb9d9e402c38ed22b10303141f473b9
 DIST unifont-10.0.05.tar.gz 15645240 BLAKE2B 2707891d66e7ee71b3bf68aa63ebfb303c6f2f85f39a48fb281484fedccfef02d76b05d9ce5ee5305c39336f26750dbf4b766db700b8f1a87046328be171efd7 SHA512 fa9ee669ecebf8ae86d4b972e66997fa8455ee37c0e95b3528394e7e10046fc0083950fca2fe84b265ae6066bbc9ed02dde1d7795f2fa5f34bdf8ffa47ecc042
 DIST unifont-10.0.06.tar.gz 15651257 BLAKE2B e146ffe9ab591e5d90d399d37e068f0c3002a67699698b3f6b22a14ca91fe0415a507d855b56caae4e50183d97978667edca2fa2095209abbc7d02a4f17c20b8 SHA512 36f1eed24b37aad2f2ef100c8d2be01363a5438e76771e9ae82fa61ce58a4dd51566063b8e7b1265696cfe2335f1017842fecac2a5a801913f82ac9bf24caa54
+DIST unifont-11.0.02.tar.gz 15874967 BLAKE2B ee3c887ae441e70a95aad9a8f11d955ef848a5d4921d9c4c340d2f91a4c795503f2ef514bae93899591978afb797bee9d03bc222801f7d2daed199fb6045769b SHA512 d0dc8ce079feb282f53c444df5819751a7c97788feed480dc5c5b8a239c8cc13ef258876ffe2830994e404c0a6f524481a405b273c7341703ceef5854c12a68d
 DIST unifont-9.0.06.tar.gz 14785468 BLAKE2B 9d2328eb8918e9af82235279b9d01bb3a0487480123f77d8d7a4618742c0938a3f62c33b7b148657ab83c7e6a79209ac959d4875b686083fb15167b254c8fa81 SHA512 767dc107d9a33008116b6939facbf31db6c7942acad257ad52a1a249f04b6215b41da928ef00e8308c2cc19924257cb0219d4eddd2b99502621ebd82e8673988
 EBUILD unifont-10.0.04.ebuild 1145 BLAKE2B ff1d34b3ac507397fc08ec36d5c613f34f4e63de83036684afa03aba8d8a0ecbb13225c433ededeedb18af94a837a85e8eb0ff78cebd8bde991a6c6bacb7aad3 SHA512 30f5ac1eb2114a35da98c5142c48f1b6010cf5ade8168cc0c8cd43ac0af47e22e8881e664138ad4ed0096ed8bf0a469b86facd897733e1e68f4bcdff3f55055e
 EBUILD unifont-10.0.05.ebuild 1145 BLAKE2B ff1d34b3ac507397fc08ec36d5c613f34f4e63de83036684afa03aba8d8a0ecbb13225c433ededeedb18af94a837a85e8eb0ff78cebd8bde991a6c6bacb7aad3 SHA512 30f5ac1eb2114a35da98c5142c48f1b6010cf5ade8168cc0c8cd43ac0af47e22e8881e664138ad4ed0096ed8bf0a469b86facd897733e1e68f4bcdff3f55055e
 EBUILD unifont-10.0.06.ebuild 1177 BLAKE2B baf9869891f6bc5d46ae231e3992fdb808e013a332f64efde4f9d69664993f2eabc8a1cb26de4c4745027cfd7fa8464bd2188e97347c00008b941363c1aa2124 SHA512 ce7c043a011eff4597fe176bf39c5b4ff13eb67cd2c1b5836bc86dbecf665fa55373e1476e941f9c6dde042415821a1a3418bc30bce9351a16e364cc08b17eab
+EBUILD unifont-11.0.02.ebuild 1182 BLAKE2B 79fd51118ec6d98561a06e7f832a875a4f50095eb23189934e4c5647bf3b0d19384510fbef341920283b586a81f7365a603af5ca719001e12264872ae932c432 SHA512 da88e52ad7a36f793bb4c6c291343328a735c932f803cb773e95d41969800247e46e6774a17828022d86948a7a06151d9eccf0afa8c04ba87c2e913e9f7898e1
 EBUILD unifont-9.0.06.ebuild 1137 BLAKE2B 491708c2e1682ae524fb218fe5637ba1b0df37987774565d42281a853da5e04e818848e65e74a8a191b19ba4423d3f2b4db2c2a1fa861cc8949c6ba362d556b3 SHA512 5d61476bd901ae55327df8bce318a99644a25494123dc39780851939f59ac8faaa5b2721c6fa442564ce4299e72e51e6ca7ab8f2674b1b4511dfc2b27e096e26
 MISC metadata.xml 587 BLAKE2B f8ce31f7041e62e483b63f7883239f52fc45b1a91c9c35563df48791a19d2ba354dd4b192520486e11ef4d66eb36dc58f8a309dca5f73a2edb4786632bb06ed5 SHA512 1cbde4c79a99908c900a5283ca99249440477623c557859f1663bed14c8a3513cda8767e50606a38f8f3e2db1f270454a37a4e793f20124922239a61a497fcbc
diff --git a/media-fonts/unifont/files/11.0.02-make.patch b/media-fonts/unifont/files/11.0.02-make.patch
new file mode 100644
index 000000000000..fa4e8aebb674
--- /dev/null
+++ b/media-fonts/unifont/files/11.0.02-make.patch
@@ -0,0 +1,11 @@
+--- a/font/Makefile
++++ b/font/Makefile
+@@ -247,7 +247,7 @@
+ # as a baseline.  Remove the Plane 1 Copyleft glyph from the Plane 0
+ # set of hex files.
+ #
+-coverage:
++coverage: hex
+ 	grep -v "^01F12F" $(COMPILED_DIR)/unifont_csur_lower-$(VERSION).hex \
+ 	   > $(COMPILED_DIR)/unifont_all-$(VERSION).hex
+ 	sort plane0[1-E]/*.hex plane0Fcsur/*.hex | grep -v "^0020:" \
diff --git a/media-fonts/unifont/unifont-11.0.02.ebuild b/media-fonts/unifont/unifont-11.0.02.ebuild
new file mode 100644
index 000000000000..54818db00cf6
--- /dev/null
+++ b/media-fonts/unifont/unifont-11.0.02.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font toolchain-funcs xdg-utils
+
+DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
+HOMEPAGE="http://unifoundry.com/"
+SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="fontforge utils"
+
+DEPEND="
+	fontforge? (
+		app-text/bdf2psf
+		dev-lang/perl
+		dev-perl/GD[png(-)]
+		media-gfx/fontforge
+		x11-apps/bdftopcf
+	)
+"
+RDEPEND="
+	utils? (
+		dev-lang/perl
+		dev-perl/GD[png(-)]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/11.0.02-make.patch
+)
+
+src_prepare() {
+	sed -i -e 's/install -s/install/' src/Makefile || die
+	default
+}
+
+src_compile() {
+	if use fontforge || use utils; then
+		tc-export CC
+		xdg_environment_reset
+		makeargs=(
+			CFLAGS="${CFLAGS}"
+			BUILDFONT=$(usex fontforge 1 '')
+		)
+		emake  "${makeargs[@]}"
+	fi
+}
+
+src_install() {
+	makeargs+=(
+		DESTDIR="${ED%/}"
+		PCFDEST="${ED%/}${FONTDIR}"
+		TTFDEST="${ED%/}${FONTDIR}"
+		USRDIR=usr
+	)
+	use utils || makeargs+=( -C font )
+	emake "${makeargs[@]}" install
+	font_xfont_config
+	font_fontconfig
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index cab6b84edfb3..441a0b41a97a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
new file mode 100644
index 000000000000..fba3b5ad2d21
--- /dev/null
+++ b/media-gfx/ahoviewer/Manifest
@@ -0,0 +1,3 @@
+DIST ahoviewer-1.6.4.tar.gz 227225 BLAKE2B c00c89bf80865ddf60a478a8ad030aa136fbc2735598de2b237ea97bc247337d9a12a1423e402c2e95c77df4e70ad68242ed31d5f8d896c1ae835acd860e7a5f SHA512 5e00f086685b7fd6601758e5ae0e6e7d1d24b56c1bd7c81de0be5c3613404fcfc585b8bf035a72a51171a40c8a25c7ad084fc3a9f7ba038e121fb2b7874b4ebd
+EBUILD ahoviewer-1.6.4.ebuild 1579 BLAKE2B acabb4739b50bf53584157bead036e882154478e413f68d7c85014da3b17aefe7a043b3ec74c8644d113a54e1698cf2a5c2c5844bfefb1eb3837e803e83c4b80 SHA512 1dbe353fcad2f17f4612341e7180ca92a7343f9e566dcf97c410f6383dc444d9fc79a706463bd0e94860d2dee50d7b1c58fb78b29917650f43dd55216fd7d393
+MISC metadata.xml 532 BLAKE2B 03de1e92365b5abb2e277362cd7e4914e798f98eba5c4f7b1d0a3bd238f1bd35357045b41d96fc979f238c746acd31f35a4557e1251c8786e20420b016648fe4 SHA512 f5a47485137a9721ad98a363167214118f92391f83c75ea66b51c87dfddc5d7585162adc20b23147c6d42781be8c830204af5552fd365d317b7572e2f4fdd260
diff --git a/media-gfx/ahoviewer/ahoviewer-1.6.4.ebuild b/media-gfx/ahoviewer/ahoviewer-1.6.4.ebuild
new file mode 100644
index 000000000000..605a1a3cbc46
--- /dev/null
+++ b/media-gfx/ahoviewer/ahoviewer-1.6.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+DESCRIPTION="A GTK2 image viewer, manga reader, and booru browser"
+HOMEPAGE="https://github.com/ahodesuka/ahoviewer"
+SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls +gstreamer libsecret +rar +ssl +zip"
+
+DEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-libs/libconfig[cxx]
+	dev-libs/libxml2:2
+	dev-libs/libsigc++:2
+	net-misc/curl
+	gstreamer? (
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gstreamer:1.0
+	)
+	libsecret? ( app-crypt/libsecret )
+	rar? ( app-arch/unrar )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:=
+			net-misc/curl[curl_ssl_gnutls]
+		)
+		!gnutls? (
+			>=dev-libs/openssl-1.0.0:0=
+			net-misc/curl[curl_ssl_openssl]
+		)
+	)
+	zip? ( dev-libs/libzip )
+"
+RDEPEND="
+	${DEPEND}
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0[X]
+		media-libs/gst-plugins-good:1.0
+		|| (
+			media-plugins/gst-plugins-vpx
+			media-plugins/gst-plugins-libav
+		)
+	)
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable gnutls)
+		$(use_enable gstreamer gst)
+		$(use_enable libsecret)
+		$(use_enable rar)
+		$(use_enable ssl)
+		$(use_enable zip)
+	)
+
+	econf "${myconf[@]}"
+}
+
+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/media-gfx/ahoviewer/metadata.xml b/media-gfx/ahoviewer/metadata.xml
new file mode 100644
index 000000000000..9f11884bf0ed
--- /dev/null
+++ b/media-gfx/ahoviewer/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="libsecret">Support password storing using libsecret</flag>
+    <flag name="rar">Rar archive support</flag>
+    <flag name="zip">Zip archive support</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-gfx/autopano-sift-C/Manifest b/media-gfx/autopano-sift-C/Manifest
index cc5826e745f7..c82d3e65cc00 100644
--- a/media-gfx/autopano-sift-C/Manifest
+++ b/media-gfx/autopano-sift-C/Manifest
@@ -1,4 +1,4 @@
-AUX autopano-sift-C-2.5.1-lm.patch 512 BLAKE2B 2d27dce09f989fca21be647cd028c5601535d98c7987213c0968fd93d8ee1aac6a6b32c08385b0600829b189fcaab6ee84359763fcbfb4a3710b8bd8ba5cc83d SHA512 35eb8d71f770f25a709599528679ac15e9a90c12ca3c34c1cd1411eaba852dbe9e627e4b8d8fb62adda7e2422c0de493538cbcbf14206e408b9921c895761856
+AUX autopano-sift-C-2.5.1-lm.patch 516 BLAKE2B 79fd443c4c2f321aa93982fb08ee7d8c6c9b588286e5f73d55c89ab014d53f569cd1de93f5846543ec33c2f9616dca65e932ce21cae47eec1c28b9a3c5ef56f8 SHA512 6198eaa686ab22a7707f840cc81c2fc68c9b02ce9d7831d28d255543bd0898b318b5d00b4f7bae487a6e4c70f4d0af75bfd61aeb07825cc70475e2988bb39002
 DIST autopano-sift-C-2.5.1.tar.gz 192267 BLAKE2B 552fe33230d322b5b33c31a6298058d30a8dd63110f15b1af25fa53aa762a5d9924a712523b626ba2381692c643c0bec44534bd5d2cc69b00faaf5b7fbd51d91 SHA512 4f3c9e8738c7bc29ff6284033b7b813de61ef440c3d544755be8c4ad715a6e4175801ee4c02642df5e05bac82929c5554d85a5c488a2c27da1e5e81d3cd72931
-EBUILD autopano-sift-C-2.5.1.ebuild 688 BLAKE2B 46c2c123aab689cddde0b101b8b2e8523260f6fb4cc406b281ec94653bc0257a44f3e9f35a2343db4e1a39824ac4eeb28f000200d2077748606857c87d156500 SHA512 ec794565c3c1fb5ad00a232995c3643aa6a963bcd3a1aab245913708f8a6cd99a5464fdd262ba26d441426498930383e90698bf0f8e2bc864b2be354acb1ee21
+EBUILD autopano-sift-C-2.5.1.ebuild 612 BLAKE2B 08678b7085dd0eaed1176d758d6f2ac7b3e89ba37c40da2cd76c1ba99758d2e510cd316fbcc9510adf49b0e705c570e4a3d44b5a8cc95776232f9a6cb047881a SHA512 3523866054244625cc85f3d332d4a8e399a0af284d8c809709680258614a65b72ca3ac0ec31d224ea03230a3040df77ae89bcb29d0e9348c24e5b0d30246fb00
 MISC metadata.xml 472 BLAKE2B b36bfaf7b7c146cb6c5df0b50983bd6ba0e089f75d04bdc38b331fd0b3bef92380140eaef73db1811647cee1e73b955fdba54c27ae19cdfbecd67099618b349f SHA512 28eab06295fba1917784743b7103fca9ce4a54806ac9609172653896426013f0f2b18a6a4428226aeafca8d0a5de6e493e6288985564331cbc3e0a3e3f2fbb6a
diff --git a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
index 3e9405ae1588..6bf149ec6034 100644
--- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
+++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils eutils versionator
+EAPI=6
+
+inherit cmake-utils
 
 DESCRIPTION="SIFT algorithm for automatic panorama creation in C"
 HOMEPAGE="http://hugin.sourceforge.net/ http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
@@ -13,15 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-S=${WORKDIR}/${PN}-"$(get_version_component_range 1-3)"
-
-RDEPEND="!media-gfx/autopano-sift
+DEPEND="
 	dev-libs/libxml2
 	media-libs/libpano13:0=
 	media-libs/libpng:0=
 	media-libs/tiff:0=
 	sys-libs/zlib
 	virtual/jpeg:0"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	!media-gfx/autopano-sift
+"
 
 PATCHES=( "${FILESDIR}"/${P}-lm.patch )
diff --git a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch
index 97619975d9b6..e6141fffc0ae 100644
--- a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch
+++ b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch
@@ -1,8 +1,8 @@
 Link against -lm (mathlib) because ScaleSpace.c (which is part of the internal libsift.a)
 is using the exp() function, see http://bugs.gentoo.org/472150
 
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -121,7 +121,7 @@
  
  ADD_LIBRARY(libsift STATIC ${LIBSIFT_SOURCES})
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 24056c9922b6..2fb920dcc2b1 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -15,4 +15,4 @@ EBUILD blender-2.72b-r4.ebuild 8106 BLAKE2B 32e220cf9afc0219a0b5d4adf14f540f381a
 EBUILD blender-2.79-r1.ebuild 8100 BLAKE2B 7c077c8d3847fa0d7b881b5f5989e42339574b7104bc78869c8e481073b1e6ca062e5a74233f0b96b9ff6b1390f1cc0f203038e733223ddf21b796e696ba508b SHA512 9af0b9f17969a6601c3945fbe3d3d10dc6707df0c88e86e1c2f1617e9b750019a21d05cecab5e726069b9908ba6345d2e190732d3960bbb87674d1f983e311ee
 EBUILD blender-2.79.ebuild 8049 BLAKE2B b4effa99e23ee172e685dff46235c88aecf129a40ab4e01a7b8dd0fb4993e52849c5ebbc712ff63999176644ea9027e572b1f21f4838d31845a525d09d396bbd SHA512 7b660679c69df11a108e58e76cc2e950843bf0285e962cf1f776b3cabf8e7b187ab65984ff6e4bd85120347489d10853ab163d916a4f1c833d890112dd2692c6
 EBUILD blender-2.79b-r1.ebuild 8165 BLAKE2B 8dba69527cd1800c587afd1f5f3369d86eec60ca83a7631df3868ccd17eb42effef1f486a30e8ab772e1baab3cd26f8317bc6c521879fe9cb187525d8894fa3b SHA512 945aceb3481a451ac5ffa54ce8f08605c7d33c34e7de97d5bab0a90d7bfb63d55f739282ced5fa512fd69232c01df9245ab75f5ae5f1d1365b38bb463c30a9a1
-MISC metadata.xml 3599 BLAKE2B fbe6e8d0aca923eb7274eddc7d1bfe5dab20f09acf00479176aed6777788a48bde457f6c0495d86ae17a727e3152919712bfd5de80b394a4e86a9985b736a62c SHA512 1e0ce8315996355a12e9f688cde63f67cd5251cc605b1da32dd4f819c6f9a13cbe2874ab6553e00a426da02802c0de23971d408084ce6025533ac46fc9c5b617
+MISC metadata.xml 3466 BLAKE2B e09a22c7fe5200a7b592c3fda2bdb4ae719ebe614f85d8cb8e9c4c72684fe785575e6b6b4f0e302b1e9beddc7476125e2e443943ff018d35d37f015c1b6414d8 SHA512 0112674420ffeb427dd2ad1cda3ad3e01801e02fa2bbb5dcaec15db21b4582cfff4712d5e587ab875619e94dacab4fa0263d9f635c48e5c94569bc6155577523
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 685687e61af4..9dd73dfe3522 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -56,9 +56,6 @@
 		<flag name="headless" restrict="&gt;=media-gfx/blender-2.77">
 			Build without graphical support (renderfarm, server mode only).
 		</flag>
-		<flag name="jemalloc" restrict="&gt;=media-gfx/blender-2.77">
-			Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.
-		</flag>
 		<flag name="llvm" restrict="&gt;=media-gfx/blender-2.77">
 			Enable features depending on llvm.
 		</flag>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 566616303d76..6fe6e8021c08 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -8,4 +8,4 @@ EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0
 EBUILD darktable-2.4.3.ebuild 3998 BLAKE2B ab0356bea66039573ec818f3f93670cee2728230e71e07e9f4acbb89e369971112ecb8cc9186b0235847619d583dbd61edcf287c03ade0eee484d93df2f817f5 SHA512 3a33ecadd7229bce3c2645fe37ad8673a3c68ac3c071c87173206753701703819f6e1ad2e3ed07f822356fa0b0bcde70b9988a9c8e0f3705749424e7cf878079
 EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
 EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111
-MISC metadata.xml 925 BLAKE2B 5f8855e5d645a30a6a4fdd5049e04f2269df88b042f69321677733d00b56d5e77b9084d996ab7c08340d24f14fdaea3080962465807266d435a954f0f4ca5dbf SHA512 f247ae77eba5dcebc3381cf6fabc68565dc6880c1b3aa5d90311864d78ba9868eb6848a960ead426c006e1e4c5f7d76baee256c948b68ad44785adf45215d09b
+MISC metadata.xml 871 BLAKE2B 5576cc42a46ae48d681043c22cbf206855a0770f112e42138a264950235b1af96751740800f8d9402bf5e00adf725511e557f3b65ec355abbe26de451ad5b70c SHA512 330c5e8b17daee39f3152fbcaed1979814b3b5d0aa205860e5ff309ae068037da0f4190f91672be17c138fcda91890954b2cd310b3725bada6f3916a73cebf1a
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index e363ebddb751..228506baefbe 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="opencl">Enable opencl support</flag>
 		<flag name="pax_kernel">Triggers paxmarking of main darktable binary</flag>
-		<flag name="webp">Enable WebP export support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">darktable-org/darktable</remote-id>
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index aee31a684ace..29dff18aa6e9 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,3 +1,4 @@
+AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-EBUILD engauge-10.6.ebuild 2285 BLAKE2B 458d2526784e58cb6299bea5e0b92616fb496361fdd28ae2bbfd865562a8c87aad73b765c4de0849edf7a5950f267ec14f4c009b102a07f4a5b79672658d9c4f SHA512 860f7cf94e180125c46c943b60f62278d16226a2bcba4a28a810cfc630de704bad701340df7f368d4c445f06e639c32380e42566d86cfbc266f635ef4ba9c9ee
+EBUILD engauge-10.6.ebuild 2324 BLAKE2B 5585f8e4675da09a8b3a3691f387cdd1bf06992f43548712eb58f4e9029e41d31aa70da50c0a762462a26744a1b1bb4b1feffff9089016ce0b8ada00b7619faa SHA512 0cbbe01804a346a606050479e79447616ea35e72536470c3ce5d5140bc779e28789260cb79f8ff97ae18553af899118084aa697715cdb298da36bfb8d2354a4a
 MISC metadata.xml 337 BLAKE2B 8c46cdaadb388ccd12d29c41a075ec60130482855d0735cd468a174e631129964fec7c2e7649994e8f958def8ceb8f4ad0ecb60ab69ce37171c9945696825369 SHA512 41201e69d211283450ef6ff45a23e0978934044e170da84de7e7978360bd5ce1e3b277df4a90e00221cca3f987cd6839ee90fceea232c70cebeb69b5bc7c1c6d
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index ea7530fd0b5f..7d8aba7d2cce 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,8 @@ S=$WORKDIR/engauge-digitizer-$PV
 src_prepare() {
 	eapply_user
 
+	eapply "${FILESDIR}/${P}-qt-5.11.patch"
+
 	# Make sure the documentation is looked for in the proper directory
 	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
 		-i src/Help/HelpWindow.cpp || die
diff --git a/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch b/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch
new file mode 100644
index 000000000000..9070f5223939
--- /dev/null
+++ b/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/662476
+
+From 5eab86bf84dd1e52fc52b427a8f3508780811976 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 23:51:15 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ src/Load/LoadImageFromUrl.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Load/LoadImageFromUrl.cpp b/src/Load/LoadImageFromUrl.cpp
+index 684629bd..1150dad0 100644
+--- a/src/Load/LoadImageFromUrl.cpp
++++ b/src/Load/LoadImageFromUrl.cpp
+@@ -10,6 +10,7 @@
+ #include <QFileInfo>
+ #include <QMessageBox>
+ #include <QtNetwork/QNetworkReply>
++#include <QTextStream>
+ #include <QUrl>
+ #include "Version.h"
+ 
+-- 
+2.18.1
+
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 1314067f0b5b..41d7b630376e 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -11,4 +11,4 @@ EBUILD fbida-2.12.ebuild 2413 BLAKE2B a13d6907d2363749e807b1d18a07ddb43bd0f0fe58
 EBUILD fbida-2.13-r1.ebuild 2396 BLAKE2B 426cfd4ba38a58edb391a4985f37d4e58d018e575b0a128c3506cc7835e5f2a7ca967482e53a9c71139d929ba80bc5d407c55d5ab3f2cd221e489ec3555dfb08 SHA512 163007a96ada9fbbc6937e82a53de1c7dc7d07b20faf68e3b2bfd94baef32541ecf6fa4deb8dc213200e767823950f0625da03c0c058a282e31246481b9ed71c
 EBUILD fbida-2.14.ebuild 2349 BLAKE2B be5d3538f93d23fd806f9a6488e13156907341cb93dad8a180d02bedf1986d6093d76ec55d4fc7a06fe0e60cb14f0638941b893edc592e2d7680f27c537d7e1e SHA512 18228be236b992885dbf5b9d04289cc36a2d8b348319b24735f9868cb0038cafeee508d87fa5a50c33c433a8c3b8c68ac1ebf28b0a8727336ec023762a38cd18
 EBUILD fbida-9999.ebuild 2438 BLAKE2B 4d7d861cb734cc18a4e14c4fa20c57ce423f014e787fed9c3a64af1414bfead1f574650c2f081d675bd9fe34bf8e35b9af37101a457182fec894c77ba2997c9d SHA512 79f044737d5f3f3b1214dab5a8c142cc4138a421bdd9a3d68167469a03f4401c582923309400bb3690551b0d580fb878bca9d8d6233c813ab9234fc341d172ac
-MISC metadata.xml 505 BLAKE2B 2493a8f25224980e0ac358b104a248d522e7b1ab3846dd9d97b722c1a0b8b4a6f131677893092755c31670a162afde5662467d3a7fd660c7af28e39cc2dbca35 SHA512 cbd85cfd39d20a07c679f9f98d487795136ee1611fa69712d0539bc94d354a5a76fa59ea9c1da8b4ea7764e705ed16a4f3f77e0783525001c0ee5467a1af6a2f
+MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58
diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml
index 32d2983868dd..0959fcdd1155 100644
--- a/media-gfx/fbida/metadata.xml
+++ b/media-gfx/fbida/metadata.xml
@@ -8,6 +8,5 @@
 <flag name="fbcon">Install the framebuffer image viewer "fbi"</flag>
 <flag name="ghostscript">Install the framebuffer ghostscript viewer "fbgs"</flag>
 <flag name="X">Install the Motif based image viewer "ida"</flag>
-<flag name="webp">Enable support for the WebP image format</flag>
 </use>
 </pkgmetadata>
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index a2efbecd09af..8c4da5f5e974 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -16,8 +16,8 @@ DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b755
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
 EBUILD gimp-2.10.2.ebuild 5274 BLAKE2B b2ad4c07c37503dd243731b809995d063ec237a63ece2d84a9e84f39171d03a718cb262ad8520b9cc8a976a3a426877c28f7401773f4ff26baf36c1ea1ccee76 SHA512 7a5fb5056250cac3fe0842fd869701e6fb91af8ae99f97d4fdba13ae2fd3ed6b7a37acb5988258a61548bc720867357d5593c147d01997d7da3dd8e789fae281
 EBUILD gimp-2.10.4.ebuild 5274 BLAKE2B 3b3da266805208b6a2931ee06a9c0a4fab9de812283e799b0e76f12a2b7bf02b058dbb5a13654919b7514f4464ddb068e2c1b65280fa9bebb32d3814a10ebb5b SHA512 f9d7a30c93cc898bfc5c6a402cabe95d449315566f28644b5835849d49cfff39ac690a726ccf5a21ea98deba648a66f652eb93273d08baa9add5d6c4cff23c04
-EBUILD gimp-2.10.6-r1.ebuild 5913 BLAKE2B 59a998963e01ec10965cadd57cd7cf0ca10f0455aac4ff45d5df7d71ab8ac407c632ea6ce0288f9cead8ec6fd70ea603c5fdb6b437acfb940f4135f52cd4b559 SHA512 a70f0e04a583a483af0609bb88a62199d28c2088f7fe8ea3f98e2aa5d9be80e1ed7558506c78a8668deeebac308433838a9d7e185adaa7e8e611e0e81c4af7ff
+EBUILD gimp-2.10.6-r1.ebuild 5964 BLAKE2B 4f834599caa6b9a2823dce38a8770d2383f2a63e3844e29b8a22e20485e7b9d6f8031eecd7820933b595f920905664aa878fa86d70c8aae942e4b766407ed151 SHA512 70f741ee3c68006d2488b8064b4e176e260c21a67517a3d6ebed8e2daa13ab1e87f1caa76d2b15d12fed6939bea32ada8e662865ff385508899d8299d74de05d
 EBUILD gimp-2.8.22-r1.ebuild 5175 BLAKE2B 01d76aae6190f14fdc12ad47a22109610a6622b0ee45e2d00ad352ff2a5e1f5b37ee36f15e6bf270cb842ce7f87ec13e92ce386ac908628115a8453706e95bc2 SHA512 f34e4a3d1e7ae474e07b985e5a0c9162bbdb6beec2e65473e0bb421d188e5fae37fe5a2618b9479511b625e3798f29e500f82d0e392b0b820257ebc542cf281c
 EBUILD gimp-2.9.8-r1.ebuild 5712 BLAKE2B f09f553f5d7eb8e8df0af0a316d2d98e9b0a32a204bb43c563927eae5a6dcb3bb4f5ff882bc05ce6ef3f8914939be6296683c382af45bcab877889042c96bc66 SHA512 7474ecdd5a1c785684b79c0007d77f45e475d7220f74960c48e686e7f6b15d82145b154caa802e2774eb34b46b03c5c4a1fc43a8ebc3716fb5f836be4d412886
-EBUILD gimp-9999.ebuild 5803 BLAKE2B 6c8e88e071f145e1377f00cccd35b5d3f19efdf23738f751835f625e0977852093157df6fc24c2ab2e3da7675b9ea8aed17c5c92ac202bd91718130934a362c8 SHA512 7d75bf322a3742e687260eb9e82fd85e187312dd4da31af726927eb628b6f6cfe23b763273b1f268d1940ea4da5248f5267906fffe1bc6e90faf132b11e14a3b
-MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
+EBUILD gimp-9999.ebuild 5857 BLAKE2B 5bd2b47844018e3c8be33b30271781c978e01d8a0fe7a165e3ed58782eb12a020ad1a00f002da782d02a1b1447d9659a167a1e6c845230f4d2152985e0f56152 SHA512 e1d744c2802dbe14e1a70f0b0cc2968100143a27c91cdc5e6afd8d905bc43fc62955c2729aae3335bd123935010628556f23808a08ad99264710d29d07c6930e
+MISC metadata.xml 474 BLAKE2B 7beaaa52a35415b9460b23f5031f71464008417e589105db607f0f86519cb7f19c9621dc77acea9aa9e67a1bf8f5887415761a69a29eb77aa205a89cc8b586ac SHA512 f1a58ab4fc0c7a4257648f35027d0860ee7b088ebd61703dde7622078bcc345168f3b747e79d71206ae36c479334925aac137e96c0d2134413f9e62aa27cee53
diff --git a/media-gfx/gimp/gimp-2.10.6-r1.ebuild b/media-gfx/gimp/gimp-2.10.6-r1.ebuild
index 7d7306ae33f2..88e720cd174d 100644
--- a/media-gfx/gimp/gimp-2.10.6-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SLOT="2"
 KEYWORDS="~amd64 ~x86"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=dev-libs/atk-2.2.0
@@ -47,7 +47,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
 	>=media-libs/lcms-2.8:2
 	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
 	>=app-text/poppler-0.44[cairo]
 	>=app-text/poppler-data-0.4.7
 	>=media-libs/libpng-1.6.25:0=
@@ -66,7 +66,8 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	app-arch/bzip2
 	>=app-arch/xz-utils-5.0.0
 	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
+	udev? ( virtual/libgudev:= )
+	heif? ( >=media-libs/libheif-1.1.0:= )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
@@ -123,7 +124,7 @@ src_configure() {
 		$(use_with mng libmng)
 		$(use_with openexr)
 		$(use_with webp)
-		--without-libheif
+		$(use_with heif libheif)
 		$(use_enable python)
 		$(use_enable smp mp)
 		$(use_enable cpu_flags_x86_sse sse)
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index bce92e6ecef2..ac017892f38c 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -16,7 +16,7 @@ SLOT="2"
 KEYWORDS=""
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=dev-libs/atk-2.2.0
@@ -45,7 +45,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
 	>=media-libs/lcms-2.8:2
 	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
 	>=app-text/poppler-0.44[cairo]
 	>=app-text/poppler-data-0.4.7
 	>=media-libs/libpng-1.6.25:0=
@@ -64,7 +64,8 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	app-arch/bzip2
 	>=app-arch/xz-utils-5.0.0
 	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
+	udev? ( virtual/libgudev:= )
+	heif? ( >=media-libs/libheif-1.1.0:= )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
@@ -121,7 +122,7 @@ src_configure() {
 		$(use_with mng libmng)
 		$(use_with openexr)
 		$(use_with webp)
-		--without-libheif
+		$(use_with heif libheif)
 		$(use_enable python)
 		$(use_enable smp mp)
 		$(use_enable cpu_flags_x86_sse sse)
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 5bb4b5ca8ae9..f16562de25f4 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -11,5 +11,8 @@
 		<flag name="vector-icons">
 			Enable support for vector icons (experimental)
 		</flag>
+		<flag name="heif">
+			Enable support for ISO/IEC 23008-12:2017 HEIF files
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 550e33216e8c..89e8e3a81f3f 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -8,4 +8,4 @@ EBUILD graphicsmagick-1.3.27.ebuild 3324 BLAKE2B 309ac3fb37a14f5aef75015135b678a
 EBUILD graphicsmagick-1.3.28.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
 EBUILD graphicsmagick-1.3.30.ebuild 3251 BLAKE2B 78eecba484d87f81e0ee12d119a84fabc3c052ab7b63b92acff37c0b9b751a4e99fde3c1bd14c6e8dc20a97ecbd94c0f0c558d28a13e4b1523b29c75d61899cd SHA512 165fc7bad883df3be55c9b5714d6a284d9c97e5c06f0e13a08ac783fd946e39b6b929bd9ea17b4284c312830f46edfb536131bf730eec52bd2249c5420569519
 EBUILD graphicsmagick-9999.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
-MISC metadata.xml 1220 BLAKE2B 991045c4a8f2fa2c7d71b585b88af2a0e0d4d260ca64b67131a096f9948272365e2d7303a7fbd5faf6da2bf952645061462ec8d643f14f301d0a12c37dd5f849 SHA512 1bb5a109f05ee51df889358ceb97669aaaa75356390ff85b7ad2ea7659fcc4cf7ad811b2795121ff9957ad58f27fd47dfaf792e0d5afbe31d84cf755158c66fd
+MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 7b04761e284d..f6325c408643 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -19,7 +19,6 @@
     <flag name="modules">Compile graphicsmagick with dynamically loadable modules</flag>
     <flag name="q16">Set storage quantum size to 16 (~2*memory)</flag>
     <flag name="q32">Set storage quantum size to 32 (~5*memory)</flag>
-    <flag name="webp">Enable support for webp image format</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">graphicsmagick</remote-id>
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 2634ca19e9c3..e8126cab3793 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -2,4 +2,4 @@ DIST gthumb-3.4.5.tar.xz 3391492 BLAKE2B 62b3cd9be6954f734f3ae6d9e2d06364350a78b
 DIST gthumb-3.6.1.tar.xz 3415564 BLAKE2B 363c1c927557f69a4dc0980174b31dd414267c0110205b4406f7fbf02953fd9ad00255d327363c6dcab663e10401b42a7aa23bc33796e944540ad21e778db67d SHA512 8b545626b041f91b8a3ad9caa5930aa431529f660c5a705efff667c78ddccd25683e598f7b1fc08f8e73553cedec00f0187387833e6081f504fc67ebd86f7a42
 EBUILD gthumb-3.4.5.ebuild 2289 BLAKE2B 8c98f4b9d534a11cdf789d823626a52e92fb949aaf867ab2caf7a776c2b545bcdb4bab4086911990cb11d2eda8feb2d26f19a81a36856dfb7a1b42ff4238cb91 SHA512 be7f25a32c4f313769a93964e5dbf06c2327ea23bfa755e74a9e9fb7cca3957375ab34f183587f22d7b9df8031fda7ef2a321e88deb8cac4cc8c0cc2de4d30aa
 EBUILD gthumb-3.6.1.ebuild 2579 BLAKE2B f13c9c84ea8466ab95b9dc75e724df532ab19fc967bec165c22619442976ee543da4515d701ee9f1322495d5faebb4ad5f9abd66210d3fab8329cff567814a0d SHA512 4ab95396f427e5daf332e17a8af023ff691b2a9cfee8b0a067add47ff8d8360a4cec0debf1749002990eb97e2e8831ce1951c19611c72886d5f7b9c66e3e7ebf
-MISC metadata.xml 637 BLAKE2B 413b52edeb5c603edf87cddd583bc805fc64bed853f7cbb05f38f26d4583c2a28332b4b6ed1d88e0b16072a4ecbce1f77adb06e9abea88661def2a8e8289e2c4 SHA512 c184a357c96fde1278e991b7ed6a4088481b6fcc3a3943275cd367b8c565006805294df009f0b140c34bb9bce60a059d6b6ce29a245a4ff59e58e7f0369b8bdb
+MISC metadata.xml 573 BLAKE2B 889924db658e5280c09c581c76fe0d90d7306a454f0ad462131d87164cc4791a0002f17a2eb191c11f61959d93539d4ea5dd22b66d8879ceee259f30e0a268c8 SHA512 e9daac77f6276d354005dc123ba92053139c264a19dedbf4b79b6d3df7aea00e95330bb182b960d2606a65f6c8d68e19e82cb699999b9ede4fad1dd8cbaab16e
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 8f93a7caa21c..48b98345a820 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -10,6 +10,5 @@
 		<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
 		<flag name="json">Compile code that uses the libjson-glib library</flag>
 		<flag name="slideshow">Enable slideshow plugin</flag>
-		<flag name="webp">Enable support for webp image format</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index c7d49c618d26..527e3831fbc9 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -10,4 +10,4 @@ EBUILD imagemagick-6.9.10.12.ebuild 6597 BLAKE2B 786a42c5ae37d50041a7c7af163df94
 EBUILD imagemagick-7.0.8.11.ebuild 6639 BLAKE2B bcd16d664b5976253c312714299974e712c8342be9f0fb4cb933944a46d20ac31bffff721ee3f53a2259bc15c3a3da218c188f7938dea8116bfb7f1693648bff SHA512 24ae4050a06bb6c06c1a5a1be43da47155158d7eec8823cb3f1fb67250e428c04fa961498d9217787197908db62f6e30dd15c1bc7d458079edb091c4e5d18b6a
 EBUILD imagemagick-7.0.8.12.ebuild 6719 BLAKE2B 1a21382252a7bbebed69f3903ceb1c3340100172958e9460d482226d1be0f2f4586668278f8c5bb70fc470e29b9b6ea93f6f046e6df33e6bfb224e6d1f7db617 SHA512 4b18be303504204b3cf3ff24ff9718120069bc542d3cc1c18df58d60379b504e62114c300f7a69d213934ea025993ac2893f2941882d8076ed49ffc55a4a626c
 EBUILD imagemagick-9999.ebuild 6722 BLAKE2B 387644c8c74c286dd2b3036646c621737e838dc02686f9def8c40f4e0bcaadfab7a5f7aa91dbab946fc4e73f4440ffe5d01583f7cf41bcc4d8196ccd8ee65fdc SHA512 c885e27422ec79fcba24e1fe6608bb949f4fa1c8e16eeb7779c91896f6ea61ecf063198918f62d461b96b43e0f817d7cec0106880235f378f419cb1f56e47b31
-MISC metadata.xml 1113 BLAKE2B 91aa4c24ab2b2917097f4910aaee88380f11c3a21015e1e094863d8dc4f92a3fec54e811ed72a3896221f12de01ee7e49496a28933eaae0d644e5a77e0d9b9fb SHA512 0d659fe8780e85796901f7369f9d695ad0bd52474626c023d8bba13d244ebda19cbdc7260ed36f655a5d85b5849af730bba7a599aa10fb307a426015647cd190
+MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 1b7f7eecf944..0ca390d487a7 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -15,6 +15,5 @@
     <flag name="pango">Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
     <flag name="q32">Set quantum depth value to 32</flag>
     <flag name="q8">Set quantum depth value to 8</flag>
-    <flag name="webp">Enable webp image format support using <pkg>media-libs/libwebp</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index 57b3b78f01ec..5e7befe93838 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,3 +1,5 @@
 DIST imageworsener-1.3.2.tar.gz 661710 BLAKE2B ac79b9d883be34b93e935dc813e6f1edb4806203a20d1f7663d7cbeec74d62227aa88c92b9e96cb940f2a952e92d9724f98fe69dcbd7d2a9dccc2c0a2e9d19c2 SHA512 99b30ac838f437a85985eb830d0557f22c69bc40ef2dafe3493f145b70a89b72699e134f061719fa0dcc8b585ed2b418a6afc0c2f7ce67e2e9383d48a7b7b668
+DIST imageworsener-1.3.3.tar.gz 662243 BLAKE2B 6b34dc111c5b2dcc25fdc717b7ec8d4268ca1b67c31cca58b5e1983643f1e3b78543a3bdba24b3692a05cb83a887bfcf0e7b09307535994d280056a0047c8b0d SHA512 ebe8a31819cf665d8d8d7e789d873de03206e74e100ea99b2d8dc6ac2590025ff0058066daeb17ebfaa6cf49222e33c8a9efa83f39f5e2b9b49d27a3ee1b027f
 EBUILD imageworsener-1.3.2.ebuild 1007 BLAKE2B 744e74cd7006ba139e8aab9311d44a12201f202129c66d4da7710504e7a1bbcfde3dbcef5ebb08ee38ddb657d80708967a28c7fcbc20f0b58fbc78d3de05d0a5 SHA512 bfe07f2ebb359e3b53cf2f86a7bb766084633b6a5f14a0aba8d8997797f5a36da8e81a30ba62715d73461bdbdf56dea887951663d8891a1514b1dc8c31f398e7
-MISC metadata.xml 317 BLAKE2B 0d213a7f9da3695ae439de34d4672a161d791005e67c8b1e303d58253b375c66992ee27de672ad0c5ed9ee8a6edb708d5913014df6ff82baa60fb53d374673de SHA512 128c5649fb194a4fef505f3445de2e4f114a966ddde1af3ac3ca5af23b260e0c038b743a7f95f7cc5e3268aeebbdfa9afeca7d152b5cb7a297d69c1ad4ef4e6a
+EBUILD imageworsener-1.3.3.ebuild 1006 BLAKE2B ca8a3d560d784f7b20c8877d23ff533441742b4660ae7f13f9b4eef6522260d8cda712d16637ea0833d0bb10bd850079f3928867cd924e4d5779be5bb855cca6 SHA512 2eaddfded3b5fc45a456079543840b321ede9513d8513a9282b27cb9547557ace21cca8e05bd68fe57f3791319ac46a3f301f63fb2fed41c441432a33da6f9cb
+MISC metadata.xml 245 BLAKE2B 72d076c6c3242be9c56106016a71f78c926c6c7fe92ae2d22c9cb5084eb1cf3cb4f930e6439c43b57e12c261fe77ef99c469b5629ecafb052dcedef6e346dc86 SHA512 385f7a990e82a7352c25fdf12ac028a67cc41112a9b5cde2e66140d26fdca910e6187d7965b622c3026843f6064d352a1884d5ff7b36aef0d0fab49d364a8a56
diff --git a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
new file mode 100644
index 000000000000..6ca631010a12
--- /dev/null
+++ b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+MY_P=${PN}-src-${PV}
+MY_PN=imagew
+
+DESCRIPTION="Utility for image scaling and processing"
+HOMEPAGE="http://entropymine.com/imageworsener/"
+SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg png static-libs test webp zlib"
+
+DEPEND="png? ( media-libs/libpng:0 )
+	jpeg? ( virtual/jpeg:0 )
+	webp? ( >=media-libs/libwebp-0.1.3 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="test? ( jpeg png webp zlib )"
+
+src_configure() {
+	local switch=''
+	use test && switch=test
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with ${switch} jpeg) \
+		$(use_with ${switch} png) \
+		$(use_with ${switch} webp) \
+		$(use_with ${switch} zlib)
+}
+
+src_install() {
+	default
+	dodoc {changelog,readme,technical}.txt
+	prune_libtool_files
+}
+
+src_test() {
+	cd "${S}"/tests || die
+	./runtest "${S}"/${MY_PN}
+}
diff --git a/media-gfx/imageworsener/metadata.xml b/media-gfx/imageworsener/metadata.xml
index 41005b6e9c32..ce454a1c5fbd 100644
--- a/media-gfx/imageworsener/metadata.xml
+++ b/media-gfx/imageworsener/metadata.xml
@@ -5,7 +5,4 @@
 	<email>sping@gentoo.org</email>
 	<name>Sebastian Pipping</name>
 </maintainer>
-<use>
-	<flag name="webp">enable webp image format support</flag>
-</use>
 </pkgmetadata>
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 13e68100075e..f76e0da32387 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,4 +1,6 @@
 AUX kphotoalbum-5.3-gcc8.patch 1127 BLAKE2B 6bc06c6b30ef6027199c0ad0dd3bcc539ec191faf71d168afeccf2a019e045508a41190b5b93a735c6cea5a7dcb2052e4b550525707bedbd8973b28e2e090a0f SHA512 1b59fa217efa9f5a784f520d2230785b23825184b89a4e58738c10e41e1a43be2a372fe706ed603e8f42fa15731f4226d4f99cacf460c6d03a1c0437522bdadd
 DIST kphotoalbum-5.3.tar.xz 11378768 BLAKE2B d71a52fdd5b389bb6353596c50ca4c5e1318128a0158048534512528a9315b7974da2b6685dc26fa74edb5b7f0f399c7910ba2ea5c5bbf50f9b15a7a0a8ebed3 SHA512 8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f
+DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc SHA512 d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba
 EBUILD kphotoalbum-5.3.ebuild 1660 BLAKE2B 099b204d845146d55eb25cc914dc48d49e7bc0143e216a0c7313f7e4b6a5de458cdf3153b8ebb19473e8d5214f1b17805357f3fbb4498190d9154c8b3a87bc12 SHA512 47d0fee77e027563d5cf1d7a4838493ec4c7fc0ee48e2df66b0c7fdbd013df11654d687b71a1a5cb302bf0f04c3483af19728ad27614b09e63fc3c3244fa5737
+EBUILD kphotoalbum-5.4.ebuild 1525 BLAKE2B 572b7ef7477fbafdfc31422453073f83787c86b4bfbbeb304588379dfaf100b36bfdf400b018c5285e46f23a250d6e093750f69b98aadfbed59793a00dbfe5e1 SHA512 451454cd62874e151dcb4b5ecc3eb7bb25f1b4bf4e6397fe884202d5e04deeb48cf7d572cad60f093def2d0acd9f013c834c3ec4b8096b82cefbadb23b889a88
 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
new file mode 100644
index 000000000000..ff37b76cc7ca
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+kipi +map +raw"
+
+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 kjobwidgets)
+	$(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 qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-gfx/exiv2:=
+	media-libs/phonon[qt5(+)]
+	virtual/jpeg:0
+	kipi? ( $(add_kdeapps_dep libkipi) )
+	map? ( $(add_kdeapps_dep libkgeomap) )
+	raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+RDEPEND="${DEPEND}
+	|| ( media-video/ffmpeg media-video/mplayer )
+	kipi? ( media-plugins/kipi-plugins:5 )
+	!media-gfx/kphotoalbum:4
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package map KF5KGeoMap)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index ce572e4b0213..c5fe3b5f877c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,7 +1,8 @@
 AUX krita-4.0.3-libraw-0.19.patch 3124 BLAKE2B c84c94b2e0032b4f1f78f1ca944940688775c91a48a0a6449343af36d03f5a754a48749e67365a028314757c0b822db7bda5e9b4e7c7c58796b032306abcd19b SHA512 90e2d40a6d30990b7de7365c06a769e500d2df75281767f3d724b7e5288e131b4cfcfff989a75e66642e374f624bdb8da2e6afe8c12de0ba3282ebd362189140
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
+AUX krita-4.1.5-desktopfile.patch 1587 BLAKE2B 7155223dfa5a9bace62729f71a298953c9c2b9ec426693b539bcab961287ee172d8c6151f028508efdfc4e0983b3a8903affefc8ee1a30eb48a51f807c3545df SHA512 ad2a265d287a8e5de9752a83f697f49470ec9984b69a24dd351708372f7c3f1b5dabbbd671a53e5e0fdfa4dae2a0ab1b90ebfc19e6e8ba745a673f1cff607707
 DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45
-DIST krita-4.1.3.tar.gz 243979838 BLAKE2B 460d7c507b0d86d318b384ad26fd0d2be82d7b60734bd7b1f2016baaf5e0cc3ad91ef7410837aaab207d270745a3a08c1abde11ce3c3543cbf990d922794b606 SHA512 b0d9d8fecdf9f49e6431d0e31fdd6df2f53e654f64e93a05c73afbbdff0625c072a00347e667f1ba87c6d145185fe98d0518df3a4c0c56ccb944216a42d53d5c
+DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
 EBUILD krita-4.0.4.ebuild 3092 BLAKE2B d1fbb96ff445244a35e16411cf49fbcd3e81317a1759965ccde6b492568a7b69d30430582fa74e3239c66238fe80ad070456ae4c7b3fda36d9ddf14c81f90ba3 SHA512 4af6eabe2319395ac019a5679ae4176ae5629722ef57544a12a1c7a6b5c3f7ba108099b13c3e304fc6979a2bf9a7a65748321639cfa49ccc3b212897912dbc7a
-EBUILD krita-4.1.3.ebuild 3131 BLAKE2B f2f64de5571c11861bcff90fe335d47c0ff5caeb3b22554d87a0c636d3b602efd3f3e5d91b0b85d03361162ec0233f68bcc7b4e6f4fdb0671f75a41078553777 SHA512 7ef19e4b4267710942e32e18c333eec5d51d51049ab469af507c2bdcf24278ae2e4d5a8de73b0286cc53e239c8388749987dbae619d5fcedeb6073800888a9d4
+EBUILD krita-4.1.5.ebuild 3170 BLAKE2B 8fc7a641bb7a93f28bc2d2e75c48aae389668591090b47dd12939473011e7c7ed27cae149621408eba4aa2e6ae8cd0889dd17b72444a04a188da693898ef6c87 SHA512 52b3357a184cc2857fc095cde08a8fc7ca52b61de0c13b73d01d8b494720a61ef3973cf2a0d755f406a3446b5043f52532ebcb531ba43e9dee34720ac80c0b0e
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.1.5-desktopfile.patch b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
new file mode 100644
index 000000000000..8721ab8a8a95
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
@@ -0,0 +1,39 @@
+From d267979af9524372f00a0759f02e75c60f604da5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 15 Oct 2018 13:08:09 +0200
+Subject: [PATCH] krita_qimageio.desktop: Fix MimeType separators
+
+Summary:
+desktop file did not pass validation.
+
+/usr/share/applications/krita_qimageio.desktop: error: (will be fatal in the future): value "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" for key
+"MimeType" in group "Desktop Entry" contains value "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" which is an invalid MIME type:
+"image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" contains an invalid character in the subtype
+
+Reviewers: #krita, rempt
+
+Reviewed By: #krita, rempt
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D16222
+---
+ plugins/impex/qimageio/krita_qimageio.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/impex/qimageio/krita_qimageio.desktop b/plugins/impex/qimageio/krita_qimageio.desktop
+index 4d7dabe235..af366fef07 100644
+--- a/plugins/impex/qimageio/krita_qimageio.desktop
++++ b/plugins/impex/qimageio/krita_qimageio.desktop
+@@ -63,7 +63,7 @@ Name[x-test]=xxKritaxx
+ Name[zh_CN]=Krita
+ Name[zh_TW]=Krita
+ Exec=krita %f
+-MimeType=image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon
++MimeType=image/bmp;image/x-xpixmap;image/x-xbitmap;image/webp;image/vnd.microsoft.icon;
+ Type=Application
+ Icon=calligrakrita
+ Categories=Qt;KDE;Office;Graphics;
+-- 
+2.18.0
+
diff --git a/media-gfx/krita/krita-4.1.3.ebuild b/media-gfx/krita/krita-4.1.3.ebuild
deleted file mode 100644
index 1e3252cbd580..000000000000
--- a/media-gfx/krita/krita-4.1.3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(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 kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(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 '-gles2')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package heif HEIF)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-4.1.5.ebuild b/media-gfx/krita/krita-4.1.5.ebuild
new file mode 100644
index 000000000000..24e0eeb67a37
--- /dev/null
+++ b/media-gfx/krita/krita-4.1.5.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(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 kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(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 '-gles2')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_krita]
+	!app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
+	"${FILESDIR}/${P}-desktopfile.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gif GIF)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package heif HEIF)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 39e229cc75f3..471a6ef6c01a 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,3 +1,3 @@
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
-EBUILD libimagequant-2.11.7.ebuild 1187 BLAKE2B a3ad23ae37dc3b52ba7a2695d4c7d8a86c249e8a0b9ce69fff7d84d88ab921dc12bf65dae2b5362a94865b11e24a3f338d1c1c4e5350d731e7e25273cd986044 SHA512 783c40640f7af16427f6a57f892efa7a816c89d9095a8cf2e443fb834cb722ed46b8d25cf2a64fec089beae798bac6111b50f8474555787a8214cd1fb0eb2284
+EBUILD libimagequant-2.11.7.ebuild 1185 BLAKE2B 89fe4eca4607c132955d18f54a116df6000f3c76a3dfa007ddded42bc36a307a77823ae81d64e43e2c5dbe02785de903e72246ad1943909b3d2a225618b2deac SHA512 6434d31f4ad8d4262adc60a93e8e408207e8696fc303761aa7962b8554dff710c7a5713c333c34fae42059a625ca228a061f025305e7ad92f004432f6bbd90f1
 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 e0088b888eaa..092a935042fc 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 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 58f80f0e6d89..a8815fd5bc6b 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,3 @@
-DIST lximage-qt-0.5.0.tar.xz 36068 BLAKE2B 46cf157c1a48cfea8a3149e3177baa79ec493796843e7297371c1d5802df68bee1ac220aeb9d6110a4072ba588585f276be916f886e0d3f6010792a8800e54e1 SHA512 632399781614a9d62429ed1b31515c2a87cdf1c61ab26bfc8d566654a31eccfa66ae069cd18604f380a9fc8d8700aa73a2c71be16bc32775caeef211eb955b21
 DIST lximage-qt-0.7.0.tar.xz 41560 BLAKE2B 32ca95556a696059254a686727f72e1d57d245134b507dc90f83920e9a4a71b9b41aca459db96cd2adceffb6dd6592399c27279d3c3ca9ded6fd61480525dbd1 SHA512 a31185562dec1aa720287ab3f9fb79b9bccfcf0f2069aa404bd469852edbe2507f8c24cf8af0cbe2ef7013e4dab8ca51c00ac7a348254f1bf20458decd3c82b4
-EBUILD lximage-qt-0.5.0.ebuild 917 BLAKE2B 2a5c5950e1f448828f983235e499e39181735a12b62553182d0413df6ce1e1085ed9fde5c603749fcc23b94e50a3141118bb535018341f777ac9a183b7c8a5bd SHA512 f3b23acec23069d152067ca035fce26708db42495f334e886e3bc92885baa512e8d169f1f8c43f587b6eef540fc55c998e7f9b5d26a5c9660d4b512d6c64273a
-EBUILD lximage-qt-0.7.0.ebuild 967 BLAKE2B 2070310901c1bf2f7f4f7ff058f1e52311ec648304ccc8155c5ee537880a6e86d304218cde81407d377297177e435970bec7b09e897e4da5b1fb4c6f1b04d1c1 SHA512 aea35aa3a33a5f5e93d5282cfd03e27219316e1b8329cb14f85dad5e21f26b6b44c814fc12295e9dcbbf1a85eabf7b98050d94a7109c9abc2b00d50a0b728856
+EBUILD lximage-qt-0.7.0.ebuild 962 BLAKE2B ccfd2b0b440910ec1354e14e001823c61ef482d9ce7949cc710a31b0249c34f75678159e566bb6c71695f56af0c37ea638d5597363cb0acb4901670ef2ce9c6c SHA512 6507d2f818a4f6932ef76a380b841e5754137d8e7f65036f9f4ad9742d797276125c8027913ac9a2a41aa5682b9660828dc67e831b221998ff1196d405c6d1c2
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.5.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.5.0.ebuild
deleted file mode 100644
index e2ae8eb30997..000000000000
--- a/media-gfx/lximage-qt/lximage-qt-0.5.0.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
-inherit cmake-utils
-
-DESCRIPTION="LXImage Image Viewer - GPicView replacement"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/libexif
-	>=x11-libs/libfm-1.2:=
-	x11-libs/libfm-qt:=
-	x11-libs/libX11
-	x11-libs/libXfixes"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	lxqt-base/liblxqt
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild
index bbe8f695f42d..5f75efa92135 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 1ac3b220a9f5..654692ef3104 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -2,11 +2,7 @@ AUX mypaint-1.1.0-build-env-vars.patch 1812 BLAKE2B 4af7b90bdcd19dafd712631abe82
 AUX mypaint-1.1.0-desktop.patch 626 BLAKE2B efe635fc8c58d91935be0491c5847a69da1bd78b8a83e9e6ff110d1d69c17dbde91a36f9a2baa5fc97b8a0d81ee47759e040e319a5ca7f43fa6626228a61c425 SHA512 77f267ad6a12b6d18fa955b5b9f8ef3a3eb6fed832745eda4db539d75c49056bb7fd6474ee904e6ac7cab12ae286beb48617e4825b826ca77a439764873e8d75
 AUX mypaint-1.1.0-json-c-0.11.patch 403 BLAKE2B 1608cb7706d85cb84284cc58bb78921c063bf1e1d04d32eb11c7abdc61e3d03eabbe014f66f9c43f13ff8b0a583f900c85fe24fc17bdf4cf3c7ff0ebaccaf37b SHA512 554d0f0cc8c9cb4a48b1f9c57532247461e9705ad819c52f2e264ea238783fe60728af3e51e01667dc0c60883375727624811a48d1603436ad9970282a682605
 DIST mypaint-1.1.0.tar.bz2 37416388 BLAKE2B 4ced9087a51b855ad943d104801d06a03a6f78dfd39eba975cbdeddd304c12ffb0ccd48267fcf31f3608acc069b88bc3f07ed2ab750d77eb31bd64df2f6492a9 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9
-DIST mypaint-1.2.0.tar.xz 37895196 BLAKE2B fa0130a0b8ea6aba14f2994584f990c8c0cb4a784df2cbcec10a2be331c3f831dd0913e5b7d1f343ed90b9976b56fa8d55687c4421e11ea6377d2c87f218d59d SHA512 b4e75393cf6ed9b0c3c5a96979607c848d463987e3ac0f711738940ba97be6922e0cce735c56f91261bfce3e0730d69393dd57a45b3b04824c63c74cf1306790
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
 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
+EBUILD mypaint-1.2.1-r3.ebuild 1840 BLAKE2B 2aa89ddd15eaf1c6a54209d696fff4a6c0b3556cfbbc8e344bdf78cbd8e2a75791af43ae21e3b5fee7b7645f3718bb67a9912b3ab991d071a6212dcb1bc4e66f SHA512 ce3fe70a737dccbbc9274124471192b8fc5e4285207c2d6a6226c614b4caebff86b7044d53ae74d1938553ce4f0fdda6e2b803650aec6a5c3b59e8a17deea960
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild b/media-gfx/mypaint/mypaint-1.2.0.ebuild
deleted file mode 100644
index 0e430db29cc8..000000000000
--- a/media-gfx/mypaint/mypaint-1.2.0.ebuild
+++ /dev/null
@@ -1,80 +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 fdo-mime gnome2-utils multilib 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/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_prepare() {
-	# multilib support
-	sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \
-		SConstruct SConscript || die
-}
-
-src_compile() {
-	#workaround scons bug with locales. Bug #352700
-	export LANG="en_US.UTF-8"
-	tc-export CC CXX
-	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 -rf "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || 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/mypaint/mypaint-1.2.1-r1.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild
deleted file mode 100644
index 8489c3857e41..000000000000
--- a/media-gfx/mypaint/mypaint-1.2.1-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit 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
-	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/mypaint/mypaint-1.2.1-r2.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild
deleted file mode 100644
index 6dc9afe61a5e..000000000000
--- a/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,78 +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 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/mypaint/mypaint-1.2.1-r3.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
new file mode 100644
index 000000000000..43afe4219d73
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic gnome2-utils scons-utils toolchain-funcs python-single-r1 xdg
+
+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=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+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="${PYTHON_DEPS}
+	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
+	sys-libs/libomp
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	virtual/pkgconfig
+"
+
+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() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/mypaint/mypaint-1.2.1.ebuild b/media-gfx/mypaint/mypaint-1.2.1.ebuild
deleted file mode 100644
index b2c2e285156a..000000000000
--- a/media-gfx/mypaint/mypaint-1.2.1.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime gnome2-utils multilib 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_prepare() {
-	default
-
-	# multilib support
-	sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \
-		SConstruct SConscript || die
-}
-
-src_compile() {
-	#workaround scons bug with locales. Bug #352700
-	export LANG="en_US.UTF-8"
-	tc-export CC CXX
-	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/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 17fe1a2078e6..9614dfd57ed0 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,7 @@
+AUX nomacs-3.10.2_fix_move_crop_area_tooltip.patch 1254 BLAKE2B 5dec4f07fc0cdcd1316a61c179da94bdeaf01d56bb8c2d5327261280d176a976dc406c851f2f2b84d6ac5c62df5646ac8be64de1561edf8ad3220a353a95b887 SHA512 2866be24f07534bb34f15374145240580552fcfd3c33c0193236f597d9edaa256809b5a0da88cb58230d7d0efc19ae56bbf5247b789d5b82ae3ae89c489828ed
 AUX nomacs-3.8.1-qt-5.11.patch 4507 BLAKE2B 5473253ebd9405ee31dc8fa230dc3548f15f3b01cbeadf388339f836091c4a0880346a1d06344e1935c79fa1f25d30f76e1bba87363b777235a181c28aba713b SHA512 14495e3f1a93c5559fef6bfa3a141ec8b9b84e11cce09d3f362f1a8f9de1ab2b31b6c3f1407fa3f79f828b79d65f940118a311c69ae0aefee9c19cd87880bb3c
+DIST nomacs-3.10.2.tar.gz 32302506 BLAKE2B 14f9eb9188f74c91cf088bac757a4023f6590bc05687b4809794a70bdd1e2dbcc2b58ad65062db14cfec9f4c639ceb21e64df19f1c1584256ee9586ab588d8af SHA512 977dbe24e09b00001dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
 DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110 SHA512 ff27570bc15096d0e331ad2c871b2f504a414927b8e64166668dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134
+EBUILD nomacs-3.10.2.ebuild 1753 BLAKE2B 83873ae4347c1241de2fe0ff82a25189422e747379dade0a9133dca36ed669b78da12a3c98a49d40db7450893b31c8134072210afeaca9cd7378ec4a9b48dd6a SHA512 0b21878384690aff25570114cc1b9a32cf2024d8c95ba92aee61da1a5abde45698678e75e8a2fd49c75077cdea853b5343c47696042258cf9c718f6bda20b442
 EBUILD nomacs-3.8.1.ebuild 1733 BLAKE2B 52eaaba8455349581f26a583159df4ad8494e68fca503fa1659455dea921a9829145e2ac4302e36325fc33fc77424b6b263191995f7d8be7ab8a9051f9eb7860 SHA512 894b46f2662f472253b281b007018caace584076517bd010908a506533b7b299325a4fd5c43443096b66bcd9a80a976b43a05c2938caca5748cf684b17986ec4
-MISC metadata.xml 588 BLAKE2B 544009f8f7b184b666e5b7bbb88ce395028032bd060a7abe16f2ed096accb11b0819c19b3898ca1fc96c61aacc9cf0bb5960716f711ba77c5f545f040dd31567 SHA512 f681a8f2f1ec2c2902d34829245790edd014eca1829479f2a47b9179f370d3c3d3c562c32dae1918a7616c8f75c7d94b525beec410ad39704b25fd502cefb5fb
+MISC metadata.xml 531 BLAKE2B fc54042c41205b0a44c1b2dcd266e1311b306ee928149b3806e16260be85a65bf0da0716706653f82ff3dc83351fca6a68ca47930a08f3d170d00416515e2eac SHA512 ac9d022d7b0883217b77513e6d913ed816e414402cd4028428f6b239d97c8f5eaab48d709821675529af8a5a3d945105997235dcb63b826fd669f1b5fb2660a4
diff --git a/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch b/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch
new file mode 100644
index 000000000000..ace6f3d51527
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch
@@ -0,0 +1,38 @@
+From e963ab5870945b40055b8fc7eb2708ee11f8d4fd Mon Sep 17 00:00:00 2001
+From: Markus Diem <diemmarkus@gmail.com>
+Date: Fri, 7 Sep 2018 15:11:18 +0200
+Subject: [PATCH] show crop info when moving
+
+- fixes #253
+---
+ ImageLounge/src/DkGui/DkWidgets.cpp | 6 +++---
+ ImageLounge/src/nomacs.rc           | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/ImageLounge/src/DkGui/DkWidgets.cpp b/ImageLounge/src/DkGui/DkWidgets.cpp
+index 61c0c05e..b6a5eadb 100644
+--- a/src/DkGui/DkWidgets.cpp
++++ b/src/DkGui/DkWidgets.cpp
+@@ -1820,7 +1820,7 @@ void DkEditableRect::mouseMoveEvent(QMouseEvent *event) {
+ 		setAngle(angle, false);

+ 	}

+ 

+-	if (event->buttons() == Qt::LeftButton && mState != moving) {

++	if (event->buttons() == Qt::LeftButton) {

+ 

+ 		QPolygonF p = mRect.getPoly();

+ 

+@@ -1833,11 +1833,11 @@ void DkEditableRect::mouseMoveEvent(QMouseEvent *event) {
+ 		QPoint tl;

+ 

+ 		if (sAngle == 0.0f || fabs(sAngle) == 90.0f) {

+-			tl = mRect.getTopLeft().toPoint();

++			tl = mRtform.map(mRect.getTopLeft()).toPoint();

+ 			info += "x: ";

+ 		}

+ 		else {

+-			tl = mRect.getCenter().toPoint();

++			tl = mRtform.map(mRect.getCenter()).toPoint();

+ 			info += "center x: ";

+ 		}

+ 		info += QString::number(tl.x()) + ", y: ";

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 9f062f24a874..b27b6fcfc0e4 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -12,6 +12,5 @@
 	</upstream>
 	<use>
 		<flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
-		<flag name="zip">Build support for zip archives</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/nomacs/nomacs-3.10.2.ebuild b/media-gfx/nomacs/nomacs-3.10.2.ebuild
new file mode 100644
index 000000000000..bd6b71e7f273
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.10.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="https://nomacs.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+jpeg +opencv raw tiff zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg?]
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=media-gfx/exiv2-0.25:=
+	opencv? ( media-libs/opencv:=[-qt4(-)] )
+	raw? ( >=media-libs/libraw-0.14:= )
+	tiff? (
+		dev-qt/qtimageformats:5
+		media-libs/tiff:0
+	)
+	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+DOCS=( src/changelog.txt )
+
+PATCHES=( "${FILESDIR}/${P}_fix_move_crop_area_tooltip.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# fix build with quazip-0.7.2 - bug 598354
+	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
+	sed -e "s/include <quazip/&5/" \
+		-i src/DkCore/DkImageLoader.cpp \
+		-i src/DkCore/DkImageContainer.cpp \
+		-i src/DkCore/DkBasicLoader.cpp \
+		-i src/DkGui/DkDialog.cpp || die
+
+	sed -i -e "/setup_target_for_coverage/s/^/#/" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_RAW=$(usex raw)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_QUAZIP=$(usex zip)
+		-DUSE_SYSTEM_QUAZIP=ON
+		-DENABLE_TRANSLATIONS=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index 9c532977835e..f46cee5c3953 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,10 +1,14 @@
 AUX openexr_viewers-2.0.0-nvidia-automagic.patch 434 BLAKE2B adf9fb0455af68739344527f5119ef31976ce1f078f445900567e9afbb23bf233c3890b669db931d33114bf2e497f4550882747730803147e271441416992e90 SHA512 6c05ec9708822559e8f84f601f8ede89d4e9820cbbe4b49b93ac6d0ba228fa602b699f13540d2169ce16b144ec85db63d06262001bfa391e80f2febfa66ceec7
 AUX openexr_viewers-2.2.0-Remove-nVidia-automagic.patch 869 BLAKE2B 5a3576eaa7c5cc87e885e75fd13e5cf00386be0473fec7655278ddacb8b4084570cbe821097ec32036d9e37f8d8414e391171a8efd511114a6c1c285e236aa93 SHA512 232f990857bfbac7c8417e818e2efe0926a3d5fc20d7392c90a79a4762f26bf3044cc46729feafe407c73c75372ef52af8fa22247d82a4eb982fe538ac71de40
+AUX openexr_viewers-2.3.0-fix-cg-libdir.patch 487 BLAKE2B d9bb262f3e2a3e51cacdcd58acece3da30f797b4f892c9256ea04732092e97b2ea7883d8db17549720e89656bcaf84f99455ddb974d25bb95e790d3424377f40 SHA512 925c7fdd23e6f4855fe8b11ce392f9f616aead6f9f7267b5fe8bfc351c56792bbf68a58799718bfa6f28a4dd44d4d85ea6b8ed93a17dce35167e8cb84f9cbc07
+AUX openexr_viewers-2.3.0-fix-configure.patch 2449 BLAKE2B 226728e4183784337ab684b9245f74110772156fea1b4be8441c7bb14fe2887484691c200e05604f9308204c9221d5b7e7f3c343e5db3cdf0a8896fb13fc5590 SHA512 29a22fee7f88ce1359e74185f8baffa9e734f20555943cced71c198f5c716ab8f8aa5686f11f40e5ebc10911cb82453b784eeac06632f6700d8f4fd3a9ec5e1a
 DIST openexr_viewers-2.0.1.tar.gz 495240 BLAKE2B 4cccdcca362c59f77eb73c03c4300e64d2df9456b0108908fac96e0ae5d5c804525f9fe321ac159043b18c05727addb5e318ed0ba002132c3e2a5728256838a5 SHA512 75af19e4a06d31bbb21217bc75a800852d2817dd9d120b879c377316e8aa64f75c49dccbb0d2a4d11d949f48b8fac40249692d1286a77e4812e43b3e8e303235
 DIST openexr_viewers-2.1.0.tar.gz 497290 BLAKE2B 15d8c23e8a738788f7aeb896b671a42005569a8cf177fbe193d9dbe4df418302be2beabc86344a88137a3a0e6b7b8bbfd66ec213882e52d4df5788157e182163 SHA512 fd3b08ad91b1b2299d01d56c7a17694538fd912302db3472a8d8621b49a699a42604de8d816288399b31207304c7684de198acecd2c8a9825d35b827b8a2ddaf
 DIST openexr_viewers-2.2.0.tar.gz 486235 BLAKE2B db1ebc95dfb7d5b9b1ead3cd3d1eeb4406e4ad5704c90b080d3929c7dea7a2be631e74e2cb597803f55e05783fda43fdb33edc64ba63522d31122f96a4675608 SHA512 ab2f15d0352fa4e9daf76c7317312dad6cfe7b65a86affaf057c8eceb48d2637fc0df58125ea2ec5ad3b7251eed392a8eccff1001cfeced969bbb66fe92284f8
+DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
 EBUILD openexr_viewers-2.0.1.ebuild 1227 BLAKE2B aa225ae704ef4614127f47817b812bb9975435a9b5015a2e5596e9d9aee54f45202d90f3970dba6bde7ca88a97b3d5270d67890d317a437ebfb7ee456f16d962 SHA512 cf7faacc6078a1e6d4f75aec1ce45b55b9811e012a71e4f6c5efda9e689fb35be1935adc078bd43b43aa7042103e9ea2de381f9cfe7fdb49d4fe3f16d166a818
 EBUILD openexr_viewers-2.1.0.ebuild 1220 BLAKE2B d3eece43d3c4c80570fe7a385e5f353d91414d5bfb2573a0f155c7d842e7da23c67633f6d967af1a5b2f2b4486ba8d6491f3ce5bc80f27b6a7da87369f67067b SHA512 f2132a37c732990c3043fdbbc2db64ef46e4fc4b87938233c6c96d95224665c28b6e6171a98eff1b80852717850224a0c042600cbb63beb0054c3a0d49287fce
 EBUILD openexr_viewers-2.2.0-r1.ebuild 1228 BLAKE2B 6406bb6f15b05d1ae4b0a4aeba3eeb149a0860fd371673fbb2ddb8a597b071fb93274aaf361e067ce4c037d7c4d017c4dbfc232b6d0791688832596bfc52e6ff SHA512 5a2f7c5b8978e32e766cf5da6f089db8cdedc5522e44a619faca728d73398fefa11924ab34e3dd7a5eb0b4f6d0595b442d6dcca9e3fc66491bf58cce134cd6ce
 EBUILD openexr_viewers-2.2.0.ebuild 1227 BLAKE2B aa225ae704ef4614127f47817b812bb9975435a9b5015a2e5596e9d9aee54f45202d90f3970dba6bde7ca88a97b3d5270d67890d317a437ebfb7ee456f16d962 SHA512 cf7faacc6078a1e6d4f75aec1ce45b55b9811e012a71e4f6c5efda9e689fb35be1935adc078bd43b43aa7042103e9ea2de381f9cfe7fdb49d4fe3f16d166a818
+EBUILD openexr_viewers-2.3.0.ebuild 1249 BLAKE2B c23c3819d053f5c4df61bf39ae604d2f8b24b074ae6bec9b1a697a007f9f3bf4ba57d4a525129396e24a2ecbc9a03e7e590d809c57ce99d61293608648aa41f4 SHA512 c22b09b03b743dc476376d975cae66d2f21c86aceda0ef0dbbe5a541eaa67e32c6633bd56feecae06d0e8c9afa006ad761c0b08fe17896e8640bf553413c1559
 MISC metadata.xml 379 BLAKE2B 3f58950f3fccc797478abbd2b60325904cc3288586e4a180a366e0b99bb7ffa4a08022138c658b3e0db861a720232b44b7bf4bb2b2bdb7f59856272961e1c6c8 SHA512 97d3ed7e0ee8f419d36df6b6ccc3b3e704445935b76fab412b4287ac1b88688591f775927e1cc333a85a64818cbe1c9c3e760d2ab734215c0f558639ca033b6a
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch
new file mode 100644
index 000000000000..1c3ef1a59234
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch
@@ -0,0 +1,13 @@
+diff --git a/m4/path.cb.m4 b/m4/path.cb.m4
+index 7e38708..832b96c 100644
+--- a/m4/path.cb.m4
++++ b/m4/path.cb.m4
+@@ -12,7 +12,7 @@ AC_ARG_WITH(cg-prefix,[  --with-cg-prefix=PFX  Prefix where Cg is installed (opt
+ 
+   if test x$cg_prefix != x ; then
+     CG_CXXFLAGS="-I$cg_prefix/include"
+-    CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut"
++    CG_LDFLAGS="-L$cg_prefix/lib64 -lGL -lCg -lCgGL -lGLU -lpthread -lglut"
+   else
+     case $host_os in
+       darwin*)
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
new file mode 100644
index 000000000000..f9d51d5045b6
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
@@ -0,0 +1,83 @@
+diff --git a/configure.ac b/configure.ac
+index 0ae7531..f2cdfee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,8 +4,7 @@ AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.3.0)
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(playexr/main.cpp)
+ AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h)
+-AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE
+ 
+ 
+ LIBTOOL_CURRENT=24
+@@ -19,7 +18,7 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+ 
+ dnl
+@@ -124,19 +109,8 @@ AC_ARG_ENABLE(threading,
+               [multithread="${enableval}"], [multithread=yes])
+ 
+ if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
+-    ACX_PTHREAD(
+-    [
+-	AC_DEFINE(HAVE_PTHREAD)
+-	OPENEXR_LIBS="$PTHREAD_LIBS $OPENEXR_LIBS"
+-	OPENEXR_CXXFLAGS="$OPENEXR_CXXFLAGS $PTHREAD_CFLAGS"
+-	OPENEXR_CTL_LIBS="$PTHREAD_LIBS $OPENEXR_CTL_LIBS"
+-	OPENEXR_CTL_CXXFLAGS="$OPENEXR_CTL_CXXFLAGS $PTHREAD_CFLAGS"
+-	CC="$PTHREAD_CC"
+-	
+-	AM_POSIX_SEM()
+-    ],
+-    [AC_MSG_ERROR([POSIX thread support required])])
+-    AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
++    AX_PTHREAD
++	AC_DEFINE([HAVE_PTHREAD], [1], [define if POSIX thread support is available])
+ fi
+ 
+ 
+@@ -233,10 +155,13 @@ AM_PATH_FLTK(have_fltk=yes, have_fltk=no)
+ dnl
+ dnl check for Cg
+ dnl
+-if test "${have_fltk}" = yes; then
++AC_ARG_ENABLE(cg, AS_HELP_STRING([--enable-cg],
++	[enable nvidia cg support [[default: test]]]), [want_cg="${enableval}"], [want_cg=yes])
++
++if test "${have_fltk}" = yes -a "${want_cg}" != no; then
+   AM_PATH_CG(have_cg=yes, have_cg=no)
+   if test "${have_cg}" = yes; then
+-    AC_DEFINE(HAVE_FRAGMENT_SHADERS)
++    AC_DEFINE([HAVE_FRAGMENT_SHADERS], [1], [define if Cg support is available])
+   fi
+ else have_cg=no
+ fi
+@@ -251,20 +176,10 @@ AC_C_CONST
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+ 
+-dnl gcc optimization
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+ dnl Platform-specific stuff
+ case "$host" in
+ *darwin*) 
+-  AC_DEFINE(HAVE_DARWIN) 
++  AC_DEFINE([HAVE_DARWIN], [1], [define if compiling on darwin platform (OSX)]) 
+ 
+   dnl OS X universal binary support, requires --disable-dependency-tracking
+   AC_ARG_ENABLE(osx-universal-binaries,
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
new file mode 100644
index 000000000000..e7eaf9ca0778
--- /dev/null
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="OpenEXR Viewers"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cg"
+
+RDEPEND="
+	~media-libs/ilmbase-${PV}:=
+	~media-libs/openexr-${PV}:=
+	virtual/opengl
+	x11-libs/fltk:1[opengl]
+	cg? ( media-gfx/nvidia-cg-toolkit )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-configure.patch"
+	"${FILESDIR}/${P}-fix-cg-libdir.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-openexrctltest
+		--with-fltk-config="/usr/bin/fltk-config"
+	)
+
+	if use cg; then
+		myeconfargs+=(
+			--enable-cg
+			--with-cg-prefix="/opt/nvidia-cg-toolkit"
+		)
+		append-ldflags "$(no-as-needed)" # binary-only libCg is not properly linked
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF}/pdf \
+		install
+
+	einstalldocs
+}
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index ab77a2471b93..c7cf16e75aeb 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,6 +1,4 @@
-DIST qimgv-0.6.3.tar.gz 238521 BLAKE2B 55da7c0e7b18547e7c2e2ab76f0a535c655c898707641c896469a07040e8f7f1a6e80580143016e24cdc0a7d9e2287c0d081ca8d262337faeea5d02168796a8e SHA512 c18ed0678bc094fedb339cfa227a5ddace6728b724f7640e4b018e52aa49dfb80d18879b372ab25bbf9e8c38497999471ba35a9bea5cd6b18d5ccbf1e55f3301
-DIST qimgv-0.7.tar.gz 273405 BLAKE2B c4f497eb132eeefa161e328f1ce246ff0a369e21b895cf85b68a69aaf446289ae0fc1170be9c424c32fc8659c196d1c7542938813edef30ea30f4e8509f22cfe SHA512 35fb8fbba75e08dad945fcbc679f449894c6eafc01ab0166b1929956dca636ccd25ba261c22c58a4d283aafa0690ca2c1f672092fc40c5b532f41944e4b0a9e3
-EBUILD qimgv-0.6.3.ebuild 725 BLAKE2B a8e13551c1f0105a584ca932c720b22ec84d8877b36af8a3bafb33ebf85f713760ab9461a26f5be0684d1b6f3d2a171d406853d5502b7261739d368aa98a9c10 SHA512 026c66f462c52b63af2273e8b09711d8a27827fc3ef74192ec5d8816798b45e3abaf10304b65816c31103f181914e32aeeb85b675598a4780778871d335dacb0
-EBUILD qimgv-0.7.ebuild 943 BLAKE2B 7d57f7a600040c8924f549eacd6aee23c2709034322a4c108dda1e757d511573f729f7adb101eab31bed570158b69bc555b0fc1c8b5b0725c06d97e5c91b2d37 SHA512 846fc84fb4a00dd929763c33579575b1b3fe55aaa5b9d5c6112ed02a0291f53d1a9fe057bfc5e8748f2bb5d585f916b6153279d6e8551ae099a5aa6d57a1b982
+DIST qimgv-0.7.1.tar.gz 273529 BLAKE2B 60f1f87c3347333f76224046776ca4303a03286593191feb18791dd7065ba714db387a1f8cbf6f16f04cab7190645edee4aba11f13d1ce6c0cb52d9b79042f18 SHA512 dd142377aca7248d00ac51d0732de94106e7471973de45d66e8905c476e5eb5f3543e98b1322390dc54946e7c518c1a8711bcde46fb67c376808e4049b22a630
+EBUILD qimgv-0.7.1.ebuild 1097 BLAKE2B 81a8236b34f9eb6c8d310a198f702f499b7749638797ddba906b114f49785bd19c141a7e4f4bf1e2e1f0485e2231f2e0b90ef4e55b441dbaa82c11198a2ed70c SHA512 d2305d48f4f8985ef5a35c34e3847b24aa82d6b8b3eb85fc7df431cef2216551d5c55b7e06065b2a2ba2578c383670186b9350df0d77d0d63ff963b7093295bf
 EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670
 MISC metadata.xml 454 BLAKE2B bb9012bfbeff8b79f1f3a4de8b7e24bbb664d0137a92c8bde3189612e99ce7f94f4d135b5fcda3a935b8d3b8181e9ca882b073cbe26a6f7ace7d52ac0a57804f SHA512 3f2ec50c29ac720c91d61a5ede051eb62a58771974e8c9591ee9b3a98a8a8d0af2071b29c8e7abb842999559ab330f63b39d7de87c8a1d6fd560002e9bf7d107
diff --git a/media-gfx/qimgv/qimgv-0.6.3.ebuild b/media-gfx/qimgv/qimgv-0.6.3.ebuild
deleted file mode 100644
index 9226ed2e10a9..000000000000
--- a/media-gfx/qimgv/qimgv-0.6.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
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5"
-HOMEPAGE="https://github.com/easymodo/qimgv"
-SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-video/mpv[libmpv]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/qimgv/qimgv-0.7.1.ebuild b/media-gfx/qimgv/qimgv-0.7.1.ebuild
new file mode 100644
index 000000000000..dc7afe79d53d
--- /dev/null
+++ b/media-gfx/qimgv/qimgv-0.7.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5"
+HOMEPAGE="https://github.com/easymodo/qimgv"
+SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde video"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	kde? ( kde-frameworks/kwindowsystem:5 )
+	video? ( media-video/mpv[libmpv] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eapply_user
+	# respect make.conf CXXFLAGS
+	sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3")/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDE_BLUR=$(usex kde)
+		-DVIDEO_SUPPORT=$(usex video)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/qimgv/qimgv-0.7.ebuild b/media-gfx/qimgv/qimgv-0.7.ebuild
deleted file mode 100644
index 7af9daad7bfc..000000000000
--- a/media-gfx/qimgv/qimgv-0.7.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
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5"
-HOMEPAGE="https://github.com/easymodo/qimgv"
-SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kde video"
-
-RDEPEND="
-	>=dev-qt/qtconcurrent-5.10.0
-	>=dev-qt/qtcore-5.10.0
-	>=dev-qt/qtgui-5.10.0
-	>=dev-qt/qtwidgets-5.10.0
-	kde? ( kde-frameworks/kwindowsystem:5 )
-	video? ( media-video/mpv[libmpv] )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDE_BLUR=$(usex kde)
-		-DVIDEO_SUPPORT=$(usex video)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 60022ec46f3d..87d46af656a0 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,5 +1,3 @@
-DIST qrencode-4.0.0.tar.bz2 429244 BLAKE2B 45fe8afe602e7ff20b750b5a0de8a3b52b61340ebf0bbcad2ae00e4a0ff2976077b5add4e2c1358d4ca852f79f4cdb27d9dab8c726bf72ff53964661335b5a0a SHA512 d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
-EBUILD qrencode-4.0.0.ebuild 875 BLAKE2B deccce06b32c442852c73cba09f97d3c59518d49ae63008d1ac46ebc0940da20cbb42ceb502f30942af6392d47796bd91d413fdd68bf634d262ca8411af23f33 SHA512 b59b6c37c8fd489e98a8fc1e14989418a8292a739a74e0422b18ed64e48611c1846d2f6bee15e85d27a1142da2901b668973437955722c19425ee4939eb5a16d
-EBUILD qrencode-4.0.2.ebuild 777 BLAKE2B b75707486a92e5c08a93f0d0dcc1d05a6116243394ed051ee265977a1cb0ec166d1319cff293b03d3f7768900b55e94484a7b484918664335885d30b928baed4 SHA512 cef00008591be4590ab26842079cb771be8f686ac485f3dc6c4eefa58af954e47f2cad1e79da1a0974bd0f0319ac5cd61fb4d571b7a11ef3ed2fb34d873aeaca
+EBUILD qrencode-4.0.2.ebuild 773 BLAKE2B 42d81d58e0ae8d0936f30ebda36ac3870e40c56704d2ea47a7c50c187d6b072f65de012e1e2dc2b64161649785eb71f2c72d311880eba33149e478ab03251ba1 SHA512 37117710fb76538a379f7731bcae7013f63d6066702308d383228a56eeeffb4855d189d0689fd0c4813263b77e93a4bef4f7809f36b22d87f28d4697ecda93c1
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.0.ebuild b/media-gfx/qrencode/qrencode-4.0.0.ebuild
deleted file mode 100644
index d7cd09ed89ae..000000000000
--- a/media-gfx/qrencode/qrencode-4.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="C library for encoding data in a QR Code symbol"
-HOMEPAGE="https://fukuchi.org/works/qrencode/"
-SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0/4"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_with test tests)
-		# TODO: figure out how to make SDL check fail as the SDL test
-		# program is not useful
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	cd tests || die
-	# the configure test checks if reconfiguring works...
-	sed -i -e '/configure/d' test_all.sh || die
-	sh test_all.sh || die
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
index 7209fbbdad1c..14b1fb90df63 100644
--- a/media-gfx/qrencode/qrencode-4.0.2.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="media-libs/libpng:0="
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index f05e02fe9715..ce26a44de0d9 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -2,6 +2,8 @@ AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a
 AUX sane-backends-1.0.27-canon-lide-100.patch 907 BLAKE2B 3e625443b48e2f03d1d095c1d3d2651abf1ea073ca7bbd439ef389906ed683d7f8b43123e7a9cc6360703f1b66886ff2cb6a7428984e4073496b890ed240e9bb SHA512 870dc11926df5ef0c38588336c8d69cfa11ebf9d3355f26eec4e5178fe2dac6e8ffc576980a4b5789cdb7155fbcc97a35300c63ba4e9e1ebbdd0702c563d09f3
 AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d
 AUX sane-backends-1.0.27-network.patch 1022 BLAKE2B bcc929635fe62af4201f474cddd141b95bf1b7520f7279b713771ed9614990b3331ec1b42f309d88e375d6c9cffacb7195e7e3f063e491bb9cd6e4ae39f79eea SHA512 04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d
+AUX sane-backends-1.0.27-revert-samsung.patch 14137 BLAKE2B ec41dcc9862a50f09518207b0db83f37d14f7e3ba6b101800144a8bc7059eb9c0fb5fcbab42dc8ec68001f61b304baa628c3f2ac73be9031b946fe8088e5cf37 SHA512 70e8d86291fbb21c7c9c5fa9ba5df54c808e5e75e3155af33ab9c18c768bc1eaa05890802c52daa3e60619fa8961b7162cac4c51e2dd2dd6c7114986d3a6136f
+AUX sane-backends-1.0.27-uninitialized-variable.patch 902 BLAKE2B 6f2e86d6d79f85f73d564bc1877667c1278108d876f61551cc89abb159dee68e6b454bec190cb44eee61255fa648010293382f5575d208dd7c1e33c1492be3e9 SHA512 b3c5675e5ec3a92345832d081025dae72bcfda9854f79565fc2801e6ea710a83e953a9f075ef9754c6d893fb099544989b4aaabf8a177d5c52b8a4b9c6eac052
 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd
@@ -9,4 +11,5 @@ AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
 EBUILD sane-backends-1.0.27-r1.ebuild 7729 BLAKE2B 99a75ac0aae614e4168b1216ed22c071acc4d1a448eeeee1a6c36991df23bf8e68dfb558d3047e144f8fd32cd4ad766a41238be5a991b4039172872011eed501 SHA512 42689dd5189e9bfba21f016dc63897b0fec6adb18fda2485c64c35764caceff307b18759aa359d7b56fb69aee86ceb769d1c5f5162d30cc9e8576dc3140f70aa
+EBUILD sane-backends-1.0.27-r2.ebuild 8140 BLAKE2B 8637061b459d53e5ea2c46815ffa2ded960825a2b134e52da6063eb8869a577c9fd4b5dfd6d9e000d4a9978ed2d148dfe755355f1eb10d247ce21d54d1ad50cf SHA512 507035bcab7598e62fba58c2323c9ed61c773a3af4b080fe2a9f65db5a89711027ce9881b0f38c8e903e1d577af57b4d9759f9e6007b6f7687e94cb06dcdb5de
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch
new file mode 100644
index 000000000000..af3e141a010c
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch
@@ -0,0 +1,406 @@
+From 9b13d4c18b2424eaed02b72a928e9607921ec265 Mon Sep 17 00:00:00 2001
+From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
+Date: Tue, 17 Apr 2018 22:43:15 +0200
+Subject: [PATCH] Revert "Color scanning for Samsung models, which support JPEG
+ Lossy compression."
+
+This reverts commit 926bfade544de4a4fd5f1a8082b85a97e2443770, leaving
+the new IDs in.
+As tracked in #315876, this breaks scanning with multiple Samsung scanners
+
+Conflicts:
+	backend/xerox_mfp.c
+	backend/xerox_mfp.h
+	doc/descriptions/xerox_mfp.desc
+---
+ backend/Makefile.am             |   2 +-
+ backend/Makefile.in             |   7 +-
+ backend/xerox_mfp.c             | 193 +-------------------------------
+ backend/xerox_mfp.h             |   5 -
+ doc/descriptions/xerox_mfp.desc |  10 +-
+ 5 files changed, 14 insertions(+), 203 deletions(-)
+
+diff --git a/backend/Makefile.am b/backend/Makefile.am
+index 18695a4a..3225b133 100644
+--- a/backend/Makefile.am
++++ b/backend/Makefile.am
+@@ -1086,7 +1086,7 @@ libxerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
+ libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+-libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
++libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+ EXTRA_DIST += xerox_mfp.conf.in
+ 
+ libdll_preload_la_SOURCES =  dll.c
+diff --git a/backend/Makefile.in b/backend/Makefile.in
+index d1dca4a2..2643bb77 100644
+--- a/backend/Makefile.in
++++ b/backend/Makefile.in
+@@ -1430,10 +1430,9 @@ libsane_v4l_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ libsane_xerox_mfp_la_DEPENDENCIES = $(COMMON_LIBS) libxerox_mfp.la \
+ 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
+ 	../sanei/sanei_config.lo sane_strstatus.lo \
+-	$(am__DEPENDENCIES_1) ../sanei/sanei_usb.lo \
+-	../sanei/sanei_tcp.lo $(am__DEPENDENCIES_1) \
++	../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ nodist_libsane_xerox_mfp_la_OBJECTS =  \
+ 	libsane_xerox_mfp_la-xerox_mfp-s.lo
+ libsane_xerox_mfp_la_OBJECTS = $(nodist_libsane_xerox_mfp_la_OBJECTS)
+@@ -2754,7 +2753,7 @@ libxerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
+ libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+-libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
++libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+ libdll_preload_la_SOURCES = dll.c
+ libdll_preload_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll -DENABLE_PRELOAD
+ libdll_la_SOURCES = dll.c
+diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
+index 8b8c8956..d37a6237 100644
+--- a/backend/xerox_mfp.c
++++ b/backend/xerox_mfp.c
+@@ -33,9 +33,6 @@
+ #include "../include/sane/sanei_usb.h"
+ #include "../include/sane/sanei_config.h"
+ #include "../include/sane/sanei_backend.h"
+-#ifdef HAVE_LIBJPEG
+-#include <jpeglib.h>
+-#endif
+ #include "xerox_mfp.h"
+ 
+ #define BACKEND_BUILD 13
+@@ -93,128 +90,6 @@ static char *str_cmd(int cmd)
+ }
+ 
+ #define MAX_DUMP 70
+-const char *encTmpFileName = "/tmp/stmp_enc.tmp";
+-
+-static int decompress(struct device __sane_unused__ *dev,
+-                      const char __sane_unused__ *infilename)
+-{
+-#ifdef HAVE_LIBJPEG
+-    int rc;
+-    int row_stride, width, height, pixel_size;
+-    struct jpeg_decompress_struct cinfo;
+-    struct jpeg_error_mgr jerr;
+-    unsigned long bmp_size = 0;
+-    FILE *pInfile = NULL;
+-    JSAMPARRAY buffer;
+-
+-    if ((pInfile = fopen(infilename, "rb")) == NULL) {
+-        fprintf(stderr, "can't open %s\n", infilename);
+-        return -1;
+-    }
+-
+-    cinfo.err = jpeg_std_error(&jerr);
+-
+-    jpeg_create_decompress(&cinfo);
+-
+-    jpeg_stdio_src(&cinfo, pInfile);
+-
+-    rc = jpeg_read_header(&cinfo, TRUE);
+-    if (rc != 1) {
+-        jpeg_destroy_decompress(&cinfo);
+-        fclose(pInfile);
+-        return -1;
+-    }
+-
+-    jpeg_start_decompress(&cinfo);
+-
+-    width = cinfo.output_width;
+-    height = cinfo.output_height;
+-    pixel_size = cinfo.output_components;
+-    bmp_size = width * height * pixel_size;
+-    dev->decDataSize = bmp_size;
+-
+-    row_stride = width * pixel_size;
+-
+-    buffer = (*cinfo.mem->alloc_sarray)
+-             ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+-
+-    while (cinfo.output_scanline < cinfo.output_height) {
+-        buffer[0] = dev->decData + \
+-                    (cinfo.output_scanline) * row_stride;
+-        jpeg_read_scanlines(&cinfo, buffer, 1);
+-    }
+-    jpeg_finish_decompress(&cinfo);
+-    jpeg_destroy_decompress(&cinfo);
+-    fclose(pInfile);
+-    return 0;
+-#else
+-    return -1;
+-#endif
+-}
+-
+-static int copy_decompress_data(struct device *dev, unsigned char *pDest, int maxlen, int *destLen)
+-{
+-    int data_size = 0;
+-    size_t result = 0, retVal = 0;
+-
+-
+-    if (0 == dev->decDataSize) {
+-        *destLen = 0;
+-        return retVal;
+-    }
+-    data_size = dev->decDataSize - dev->currentDecDataIndex;
+-    if (data_size > maxlen) {
+-        data_size = maxlen;
+-    }
+-    memcpy(pDest, dev->decData+dev->currentDecDataIndex, data_size);
+-    result = data_size;
+-    *destLen = result;
+-    dev->currentDecDataIndex += result;
+-    retVal = result;
+-
+-    if (dev->decDataSize == dev->currentDecDataIndex) {
+-        dev->currentDecDataIndex = 0;
+-        dev->decDataSize = 0;
+-    }
+-
+-    return retVal;
+-}
+-
+-static int decompress_tempfile(struct device *dev)
+-{
+-    decompress(dev, encTmpFileName);
+-    remove(encTmpFileName);
+-    return 0;
+-}
+-
+-static int dump_to_tmp_file(struct device *dev)
+-{
+-    unsigned char *pSrc = dev->data;
+-    int srcLen = dev->datalen;
+-    FILE *pInfile;
+-    if ((pInfile = fopen(encTmpFileName, "a")) == NULL) {
+-        fprintf(stderr, "can't open %s\n", encTmpFileName);
+-        return 0;
+-    }
+-
+-    fwrite(pSrc, 1, srcLen, pInfile);
+-    fclose(pInfile);
+-    return srcLen;
+-}
+-
+-static int isSupportedDevice(struct device __sane_unused__ *dev)
+-{
+-#ifdef HAVE_LIBJPEG
+-    /* Checking device which supports JPEG Lossy compression for color scanning*/
+-    if (dev->compressionTypes & (1 << 6))
+-        return 1;
+-    else
+-        return 0;
+-#else
+-    return 0;
+-#endif
+-}
+-
+ static void dbg_dump(struct device *dev)
+ {
+     int i;
+@@ -639,11 +514,9 @@ static void set_parameters(struct device *dev)
+     dev->para.pixels_per_line = dev->win_width / px_to_len;
+     dev->para.bytes_per_line = dev->para.pixels_per_line;
+ 
+-    if (!isSupportedDevice(dev)) {
+ #if BETTER_BASEDPI
+-        px_to_len = 1213.9 / dev->val[OPT_RESOLUTION].w;
++	px_to_len = 1213.9 / dev->val[OPT_RESOLUTION].w;
+ #endif
+-    }
+     dev->para.lines = dev->win_len / px_to_len;
+     if (dev->composition == MODE_LINEART ||
+         dev->composition == MODE_HALFTONE) {
+@@ -765,13 +638,6 @@ static int dev_set_window(struct device *dev)
+     cmd[0x11] = (SANE_Byte)floor(dev->win_off_y);
+     cmd[0x12] = (SANE_Byte)((dev->win_off_y - floor(dev->win_off_y)) * 100);
+     cmd[0x13] = dev->composition;
+-    /* Set to JPEG Lossy Compression, if mode is color (only for supported model)...
+-     * else go with Uncompressed (For backard compatibility with old models )*/
+-    if (dev->composition == MODE_RGB24) {
+-        if (isSupportedDevice(dev)) {
+-            cmd[0x14] = 0x6;
+-        }
+-    }
+     cmd[0x16] = dev->threshold;
+     cmd[0x17] = dev->doc_source;
+ 
+@@ -843,7 +709,6 @@ dev_inquiry(struct device *dev)
+                       dev->res[0x3e] << 8 |
+                       dev->res[0x3f];
+     dev->line_order = dev->res[0x31];
+-    dev->compressionTypes = dev->res[0x32];
+     dev->doc_loaded = (dev->res[0x35] == 0x02) &&
+                       (dev->res[0x26] & 0x03);
+ 
+@@ -942,10 +807,6 @@ dev_free(struct device *dev)
+         free(UNCONST(dev->sane.type));
+     if (dev->data)
+         free(dev->data);
+-    if (dev->decData) {
+-        free(dev->decData);
+-        dev->decData = NULL;
+-    }
+     memset(dev, 0, sizeof(*dev));
+     free(dev);
+ }
+@@ -1283,19 +1144,6 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
+     /* if there is no data to read or output from buffer */
+     if (!dev->blocklen && dev->datalen <= PADDING_SIZE) {
+ 
+-        /* copying uncompressed data */
+-        if (dev->composition == MODE_RGB24 &&
+-            isSupportedDevice(dev) &&
+-            dev->decDataSize > 0) {
+-            int diff = dev->total_img_size - dev->total_out_size;
+-            int bufLen = (diff < maxlen) ? diff : maxlen;
+-            if (0 < diff &&
+-                0 < copy_decompress_data(dev, buf, bufLen, lenp)) {
+-                dev->total_out_size += *lenp;
+-                return SANE_STATUS_GOOD;
+-            }
+-        }
+-
+         /* and we don't need to acquire next block */
+         if (dev->final_block) {
+             int slack = dev->total_img_size - dev->total_out_size;
+@@ -1311,10 +1159,7 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
+                 /* this will never happen */
+                 DBG(1, "image overflow %d bytes\n", dev->total_img_size - dev->total_out_size);
+             }
+-            if (isSupportedDevice(dev) &&
+-                dev->composition == MODE_RGB24) {
+-                remove(encTmpFileName);
+-            }
++
+             /* that's all */
+             dev_stop(dev);
+             return SANE_STATUS_EOF;
+@@ -1365,18 +1210,9 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
+ 
+         if (buf && lenp) { /* read mode */
+             /* copy will do minimal of valid data */
+-            if (dev->para.format == SANE_FRAME_RGB && dev->line_order) {
+-                if (isSupportedDevice(dev)) {
+-                    clrlen = dump_to_tmp_file(dev);
+-                    /* decompress after reading entire block data*/
+-                    if (0 == dev->blocklen) {
+-                        decompress_tempfile(dev);
+-                    }
+-                    copy_decompress_data(dev, buf, maxlen, &olen);
+-                } else {
+-                    clrlen = copy_mix_bands_trim(dev, buf, maxlen, &olen);
+-                }
+-            } else
++            if (dev->para.format == SANE_FRAME_RGB && dev->line_order)
++				clrlen = copy_mix_bands_trim(dev, buf, maxlen, &olen);
++            else
+                 clrlen = copy_plain_trim(dev, buf, maxlen, &olen);
+ 
+             dev->datalen -= clrlen;
+@@ -1455,9 +1291,6 @@ sane_start(SANE_Handle h)
+     if (!dev->data && !(dev->data = malloc(DATASIZE)))
+         return ret_cancel(dev, SANE_STATUS_NO_MEM);
+ 
+-    if (!dev->decData && !(dev->decData = malloc(POST_DATASIZE)))
+-        return ret_cancel(dev, SANE_STATUS_NO_MEM);
+-
+     if (!dev_acquire(dev))
+         return dev->state;
+ 
+@@ -1479,22 +1312,6 @@ sane_start(SANE_Handle h)
+ 
+     dev->total_img_size = dev->para.bytes_per_line * dev->para.lines;
+ 
+-    if (isSupportedDevice(dev) &&
+-        dev->composition == MODE_RGB24) {
+-	int fd;
+-        remove(encTmpFileName);
+-
+-	/* Precreate temporary file in exclusive mode. */
+-	fd = open(encTmpFileName, O_CREAT|O_EXCL, 0600);
+-	if (fd == -1) {
+-	    DBG(3, "%s: %p, can't create temporary file %s: %s\n", __func__,
+-		(void *)dev, encTmpFileName, strerror(errno));
+-	    return ret_cancel(dev, SANE_STATUS_ACCESS_DENIED);
+-	}
+-	close(fd);
+-    }
+-    dev->currentDecDataIndex = 0;
+-
+     return SANE_STATUS_GOOD;
+ }
+ 
+diff --git a/backend/xerox_mfp.h b/backend/xerox_mfp.h
+index 3d93f06d..ea89dda2 100644
+--- a/backend/xerox_mfp.h
++++ b/backend/xerox_mfp.h
+@@ -74,10 +74,6 @@ struct device {
+ #define DATATAIL(dev) ((dev->dataoff + dev->datalen) & DATAMASK)
+ #define DATAROOM(dev) dataroom(dev)
+ 
+-#define POST_DATASIZE 0xFFFFFF
+-    SANE_Byte *decData;
+-    int decDataSize;
+-    int currentDecDataIndex;
+     /* data from CMD_INQUIRY: */
+     int resolutions;		/* supported resolution bitmask */
+     int compositions;		/* supported image compositions bitmask */
+@@ -102,7 +98,6 @@ struct device {
+     int composition;		/* MODE_ */
+     int doc_source;		/* document source */
+     int threshold;		/* brightness */
+-    int compressionTypes;
+ 
+     /* CMD_READ data. It is per block only, image could be in many blocks */
+     int blocklen;			/* image data block len (padding incl.) */
+diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
+index d21a6be6..67253b38 100644
+--- a/doc/descriptions/xerox_mfp.desc
++++ b/doc/descriptions/xerox_mfp.desc
+@@ -320,7 +320,7 @@
+ 
+ :model "SCX-3405W"
+ :interface "Ethernet"
+-:status :good
++:status :basic
+ 
+ :model "SCX-3400"
+ :interface "USB"
+@@ -335,17 +335,17 @@
+ :model "SCX-4729FD"
+ :interface "USB"
+ :usbid "0x04e8" "0x3453"
+-:status :good
++:status :basic
+ 
+ :model "CLX-6260"
+ :interface "USB"
+ :usbid "0x04e8" "0x3455"
+-:status :good
++:status :minimal
+ 
+ :model "CLX-3300 Series"
+ :interface "USB"
+ :usbid "0x04e8" "0x3456"
+-:status :good
++:status :basic
+ 
+ :model "SCX-470x"
+ :interface "USB"
+@@ -355,7 +355,7 @@
+ :model "CLX-4190"
+ :interface "USB"
+ :usbid "0x04e8" "0x345a"
+-:status :good
++:status :minimal
+ 
+ :model "SCX-4650 4x21S Series"
+ :interface "USB"
+-- 
+2.17.0
+
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-uninitialized-variable.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-uninitialized-variable.patch
new file mode 100644
index 000000000000..0311975c0ce8
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.27-uninitialized-variable.patch
@@ -0,0 +1,25 @@
+From dd61ef1cc84299781e382b9258d97102cee192b4 Mon Sep 17 00:00:00 2001
+From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date: Thu, 3 Aug 2017 18:50:05 +0900
+Subject: [PATCH] genesys: Fix use of uninitialized variable
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869673
+---
+ backend/genesys.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/backend/genesys.c b/backend/genesys.c
+index 1c1bbf4..0b644c4 100644
+--- a/backend/genesys.c
++++ b/backend/genesys.c
+@@ -6237,6 +6237,7 @@ attach (SANE_String_Const devname, Genesys_Device ** devp, SANE_Bool may_wait)
+   dev->model = genesys_usb_device_list[i].model;
+   dev->vendorId = genesys_usb_device_list[i].vendor;
+   dev->productId = genesys_usb_device_list[i].product;
++  dev->usb_mode = 0;            /* i.e. unset */
+   dev->already_initialized = SANE_FALSE;
+ 
+   DBG (DBG_info, "attach: found %s flatbed scanner %s at %s\n",
+-- 
+2.1.4
+
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
new file mode 100644
index 000000000000..4ce3733007d1
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev user
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS="
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp"
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
+
+for backend in ${IUSE_SANE_BACKENDS}; do
+	case ${backend} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm)
+		IUSE+=" -sane_backends_${backend}"
+		;;
+	mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${backend}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${backend}"
+	esac
+done
+
+REQUIRED_USE="
+	sane_backends_mustek_usb2? ( threads )
+	sane_backends_kvs40xx? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+MY_P="${P}"
+FRS_ID="4224"
+SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	snmp? ( net-analyzer/net-snmp )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	>=sys-devel/gettext-0.18.1
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+pkg_setup() {
+	enewgroup scanner
+	enewuser saned -1 -1 -1 scanner
+}
+
+src_prepare() {
+	default
+
+	cat >> backend/dll.conf.in <<-EOF
+	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
+	hpaio
+	# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
+	epkowa
+	EOF
+
+	eapply "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	eapply "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
+
+	# From Arch
+	eapply "${FILESDIR}"/${PN}-1.0.27-network.patch
+
+	# From Fedora
+	# Fix https://bugs.gentoo.org/635348
+	eapply "${FILESDIR}"/${PN}-1.0.27-canon-lide-100.patch
+	# Fix https://bugs.gentoo.org/653300
+	eapply "${FILESDIR}"/${PN}-1.0.27-revert-samsung.patch
+
+	# From Debian
+	eapply "${FILESDIR}"/${PN}-1.0.27-uninitialized-variable.patch
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing # From Fedora
+
+	# if LINGUAS is set, just use the listed and supported localizations.
+	if [[ ${LINGUAS+set} == "set" ]]; then
+		mkdir -p po || die
+		strip-linguas -u po
+		printf '%s\n' ${LINGUAS} > po/LINGUAS
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# the blank is intended - an empty string would result in building ALL backends.
+	local BACKENDS=" "
+
+	use gphoto2 && BACKENDS="gphoto2"
+	use v4l && BACKENDS="${BACKENDS} v4l"
+	for backend in ${IUSE_SANE_BACKENDS}; do
+		if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
+			BACKENDS="${BACKENDS} ${backend}"
+		fi
+	done
+
+	local myconf=(
+		$(use_with usb)
+		$(multilib_native_use_with snmp)
+	)
+
+	# you can only enable this backend, not disable it...
+	if use sane_backends_pnm; then
+		myconf+=( --enable-pnm-backend )
+	fi
+	if use sane_backends_mustek_pp; then
+		myconf+=( --enable-parport-directio )
+	fi
+	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
+		myconf+=( sane_cv_use_libieee1284=no )
+	fi
+
+	# relative path must be used for tests to work properly
+	ECONF_SOURCE=${S} \
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${BACKENDS}" \
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# --without-api-spec to not automagically depend on tons of stuff
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	econf \
+		--disable-locking \
+		--without-api-spec \
+		$(use_with gphoto2) \
+		$(multilib_native_use_with systemd) \
+		$(use_with v4l) \
+		$(use_enable ipv6) \
+		$(use_enable threads pthread) \
+		$(use_enable zeroconf avahi) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake VARTEXFONTS="${T}/fonts"
+
+	if tc-is-cross-compiler; then
+		pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+		# The build system sucks and doesn't handle this properly.
+		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+			-I. -I../include -I"${S}"/include \
+			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+		local dirs=( hal hotplug hotplug-ng udev )
+		local targets=(
+			hal/libsane.fdi
+			hotplug/libsane.usermap
+			hotplug-ng/libsane.db
+			udev/libsane.rules
+		)
+		mkdir -p "${dirs[@]}" || die
+		emake "${targets[@]}"
+
+		popd >/dev/null
+	fi
+
+	if use usb; then
+		sed -i -e '/^$/d' \
+			tools/hotplug/libsane.usermap || die
+	fi
+}
+
+multilib_src_install() {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	if multilib_is_native_abi; then
+		if use usb; then
+			insinto /etc/hotplug/usb
+			doins tools/hotplug/libsane.usermap
+		fi
+
+		udev_newrules tools/udev/libsane.rules 41-libsane.rules
+		insinto "/usr/share/pkgconfig"
+		doins tools/sane-backends.pc
+	fi
+}
+
+multilib_src_install_all() {
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+
+	if use systemd; then
+		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
+	fi
+
+	if use usb; then
+		exeinto /etc/hotplug/usb
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+
+	dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux
+	find "${D}" -name '*.la' -delete || die
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	if use xinetd; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+
+	if ! use systemd; then
+		elog "If you are using a USB scanner, add all users who want"
+		elog "to access your scanner to the \"scanner\" group."
+	fi
+}
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index ba7159fdd53b..a3092ddd5b78 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -1,4 +1,4 @@
 AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef
 DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710
 EBUILD sane-frontends-1.0.14-r3.ebuild 1327 BLAKE2B 15e8425ed7db7301ded095f2652f8214a40f8381f67f90077835dcb9d03c6e024be07de4eb85279a6b8d728865d989c66d238a17d00d685546f05775ef1af251 SHA512 0e7c3cfcd8df0bba6fec4ece1188b3907d33fa57878a0d38265dda4d29c3b295c7128ce84507b55ca21a373926d15bf66d82f91a49a4fea0009c4c9e4d1305ca
-MISC metadata.xml 377 BLAKE2B 83b01e823ed6ad91413a2e23899b9fa78b3b3c6d84d52b0ee122976d1a2de2a21c5089ca0460aceb7a9d28f0cc854d3fc358e97c6f02f4116cc5b75a3ca802fd SHA512 57b14e3a91c20de45448332c24a3e681a48498a27244ac1a05e313a87081cb116f12f3fab170a18dca2b3fc55aca7785fc0713bccdad192ba7683982d83fda22
+MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/media-gfx/sane-frontends/metadata.xml b/media-gfx/sane-frontends/metadata.xml
index 8b40ef0464f3..58f638b2ac3e 100644
--- a/media-gfx/sane-frontends/metadata.xml
+++ b/media-gfx/sane-frontends/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>herb@hlmjr.com</email>
-		<name>Herb Miller Jr. (herbmillerjr)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 </pkgmetadata>
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index bdeef3280660..851f43c63324 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -1,3 +1,3 @@
 DIST viewnior-1.6.tar.gz 168966 BLAKE2B 1a04ec6ee4e05da8d0721115826d2550c7d24b4299c105eb6de7ec3fe74b350b49605dbe5246a5acd93562fd904923053ab99a5741b929abd99ace8b2ad148cc SHA512 4b150078573bfd3b8c5863d73087a51cd3b7ed5781e26c842fab44eec3e67ea9aea3feba064538578878df1ccb386525a6a84362dae7f92315fb7de735ace617
-EBUILD viewnior-1.6.ebuild 910 BLAKE2B 1b1fec4b088a7708c8d9193806406c24572104ed82a5ca7e4fc8e3eed1aeefe9df508d9f9090a7fe9b6bdc52a1ca0267169312c786a29d89edbb498625930690 SHA512 7a258895436c2345bf779e7ec159e18bca3304ca0b02691b579774e5901dda76bd68220d2ece1a9cee0ded34531148fbc4f409728df5920ac5acda6c092f15f3
+EBUILD viewnior-1.6.ebuild 932 BLAKE2B 421cec0425ef6008090cdea7df88f90c45641f0a26355fcedaaf86c9f11f797cdcdcded489c233ca128ed87dd0863f1965013899c6421584f44d6d7e1dbb5d18 SHA512 847f9cd4e8c24460e77df21e99899507f2adf634fdc605bf3884ba0ba317b84e468218ce5f0b46a6d96b8b6c94966c0dd0b170d330cd22ba2c4069bcd4529303
 MISC metadata.xml 223 BLAKE2B db9722a650a3dd6a2457e8cfb4e45c95e4d435077a01d701d9ee8d1bd9f6c162060281a70762e72b57812f6a868eb172ab60b49f21319f1d143bb00ecf59e4f6 SHA512 1cdd15a0170f1ef8245c80abb67291759667b5ff4631b7a172b4797169198cec8fbd10e7226313e99f86ceb01f87d3a5faf010471aadf6c4d1559c63676c84a9
diff --git a/media-gfx/viewnior/viewnior-1.6.ebuild b/media-gfx/viewnior/viewnior-1.6.ebuild
index 1efc547aee7e..501a6fa864c3 100644
--- a/media-gfx/viewnior/viewnior-1.6.ebuild
+++ b/media-gfx/viewnior/viewnior-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,10 +17,13 @@ IUSE=""
 DEPEND="dev-libs/glib:2
 	media-gfx/exiv2
 	>=x11-libs/gtk+-2.20:2
-	x11-misc/shared-mime-info"
-RDEPEND="${DEPEND}"
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+	dev-util/glib-utils
+"
 
-S=${WORKDIR}/${MY_PN}-${P}
+S="${WORKDIR}/${MY_PN}-${P}"
 
 src_prepare() {
 	default
diff --git a/media-gfx/w3mimgfb/Manifest b/media-gfx/w3mimgfb/Manifest
index 80a1656df38a..ae736a03713d 100644
--- a/media-gfx/w3mimgfb/Manifest
+++ b/media-gfx/w3mimgfb/Manifest
@@ -1,3 +1,3 @@
 DIST w3mimgfb-0.9.1.tar.gz 10070 BLAKE2B f64ebad5580647f7e686e654b910f2168419c086d26863f6d34eb58db1cd3f2092ce2c92135391781e4327ba49dadcff11017722e6ff0982e41976b037d1f094 SHA512 6717f922c37b9bbdf539efa95e9fefdd3a14aa0651fea613d6f24a5588537b300c1106ae1fc0435a0b08214682697e1fad59c491908775e08920469439dee628
-EBUILD w3mimgfb-0.9.1.ebuild 653 BLAKE2B 473eeb5f329a18a0ea4ff0210cc16604d1322de54166abab825d23a6f248b7a3632f492de7dce3572e1a8ced96ed8e03ba0d436d1afde593bebe5ab741a4c97d SHA512 e07f65b4b7b94611df4b694e8370c284670b84d14049199528b1d3c50d8e8c8f659b036aaafdc629fa87221cb5dbd1a542df3bf2eaac81bad486e220278e4c73
+EBUILD w3mimgfb-0.9.1.ebuild 720 BLAKE2B bdef846a0596b86df129122b7c07a06f8d3be2a53baf9c5f93c8743ece6f01ca11ac7f5e51d088f819c7932ed17eaebf5cb633816ff5404408c3c8490bcc61f6 SHA512 12e9fc8ae93146ae174c20e02cdfc00be671862ca822b47ce55903165cd00c4574238e7fe12aad2e1fc75f058103946a97767a920aa143e7ecdfeac203f21aca
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild b/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
index aa180059c55b..2aebe771a58b 100644
--- a/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
+++ b/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Image viewer for w3m under frame buffer environment"
@@ -11,18 +10,21 @@ SRC_URI="http://homepage3.nifty.com/slokar/fb/${P}.tar.gz"
 
 LICENSE="w3m BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86 ppc"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="media-libs/stimg"
 RDEPEND="${DEPEND}
-	virtual/w3m"
+	virtual/w3m
+"
 
 src_prepare() {
+	default
 	sed \
 		-e '/^CC/d' \
 		-e '/^CFLAGS/d' \
 		-e '/^LDFLAGS/d' \
+		-e 's/LIBS= -lstimg/LIBS= -lstimg -lpng -ljpeg -ltiff/g' \
 		-i Makefile || die
 	tc-export CC
 }
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index c3bd529a7936..5a548849e25f 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -3,5 +3,5 @@ AUX yafaray-3.3.0-respect-cflags.patch 502 BLAKE2B 1df4f8667e8c2577812c690baf17c
 AUX yafaray-3.3.0-strip-debug-mode.patch 767 BLAKE2B 42351950158441bd328e3fd3265e8e9e0f96ee51cf9aadf427c3dda7b57b77716e022801183271dd7206d9ec58b1e239159736894423ca53885c033a2b7e8e0f SHA512 f139d622162d02bfd1d95d38ffa2fcb29fd32cdd51cc14aec986dc481c00aa3c982e537ead2ae8d1972401312aaf9ef8cd92b81fc1fd3ee819f350eadac5d2d2
 DIST yafaray-blender-exporter-3.3.0.tar.gz 377928 BLAKE2B 7876c78ca6228282648909e566803b33304be0082fab48819340845e3927877b9734f7bc7e09702bf7cbf6477c68932637eb766dc98b9e8e4ab42ca99d2a3595 SHA512 70a1a806d97f6f3b43cdb5d6caac6104f0f63720d5920f6a623078e05e6977d065d2fabca4da1644deb97f09176b88347f0278e4bc699c783d807d3f530421d0
 DIST yafaray-core-3.3.0.tar.gz 1135360 BLAKE2B 67f6956a3866bfe0b4167f30a7c2c7f05ee23556e9fff7041ff3937e90011e4c2538b706ae27e02351ae555d0d05531f3eb711257591d85f779683c9c42ac6f7 SHA512 32efb87872485c4a188483ae1172cac2eca2281e7b9ab29f184c047b94f3986d65da199a74c169d0e2fd6af59cf37b7deb69dcfb1cb4763bb1ebca30d46b5b90
-EBUILD yafaray-3.3.0.ebuild 3372 BLAKE2B 29ec1802d482a60e654fafdf990209fb4faad705c0ef9747f05cbbf744d164c57e70fd527ef37cf64d8130c0ae169aefc7e5dde224f903021cc3d2ac7009e5ed SHA512 928e5a003e822d9e2a282245efebf5cb007852a9101283a3a3178240d04a28378e5e9e99d631ac29084da036f0e5ccdc02fd5435e637abf6fe3d4a976b2793f8
-MISC metadata.xml 1133 BLAKE2B 17e445d385b5d94bcb6eafa02e211423d6a515c8fd6b756a856e312817117e958652a11a223e08ea062aef9fe0df1e23b623b0025f34b6b3b1a53a32cb1cabf6 SHA512 d1d8237a273d994de3f77328ab97bb6c4008ce94c0598d3fa345ecef047bbcaaa6f75b3fe3b05d80f65adbca05be7a30d7759e7ae37034a8e42e52d7483cc981
+EBUILD yafaray-3.3.0-r1.ebuild 3530 BLAKE2B ac21d61171d7f001baa05b1202b93a266eb7df11ec111755392f245e6928b414685189450cce24a5ecac62da035ec085e3f6341e20e3d1e7f9575ce7fb7a0445 SHA512 66a5c653af8ae1dc782d0c7a8595fcf6369372fe1f0ac751729292e5a6f64ea1ac0af25b6c60b08deafb76d0549d6cedb236c57389e18e35ef5542e4557a2fe2
+MISC metadata.xml 921 BLAKE2B 5a08a3398eed624e00d87f11460f0fba597b764c63506cca9c574be77225905bffc47b8d102acba71c40f38c0adc4f269c8af8fe2e74e730c36abff43d8ed7a2 SHA512 da6a25457068362228db88f4285a64472938a0f7fb5d9de0d29ec56afb2825566c105ff73193360caa9b91bea2f339403e503bd5b3745157b9e3e4fc8585a98c
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index cee5f0b787f1..f6cffe698244 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/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>herb@hlmjr.com</email>
-		<name>Herb Miller Jr. (herbmillerjr)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 		YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene.
 		An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay.
diff --git a/media-gfx/yafaray/yafaray-3.3.0-r1.ebuild b/media-gfx/yafaray/yafaray-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..01987b313724
--- /dev/null
+++ b/media-gfx/yafaray/yafaray-3.3.0-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A free open-source montecarlo raytracing engine"
+HOMEPAGE="http://www.yafaray.org"
+SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz
+	https://github.com/YafaRay/Blender-Exporter/archive/v${PV}.tar.gz -> ${PN}-blender-exporter-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2:2
+	sys-libs/zlib
+	blender? ( media-gfx/blender )
+	jpeg? ( virtual/jpeg:0 )
+	opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] )
+	openexr? ( >=media-libs/openexr-2.2.0:= )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} )
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+"
+
+S="${WORKDIR}/Core-${PV}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s/@YAFARAY_BLENDER_EXPORTER_VERSION@/v${PV}/" "${WORKDIR}/Blender-Exporter-${PV}/__init__.py" || die
+
+	eapply "${FILESDIR}/${P}-strip-debug-mode.patch"
+	eapply "${FILESDIR}/${P}-respect-cflags.patch"
+	pushd "${WORKDIR}/Blender-Exporter-${PV}" || die
+	eapply "${FILESDIR}/${P}-blender-exporter-paths.patch"
+	popd || dir
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DYAF_LIB_DIR=$(get_libdir)
+		-DWITH_YAF_PY_BINDINGS=$(usex python)
+		-DYAF_PY_VERSION=${EPYTHON#python}
+		-DWITH_YAF_RUBY_BINDINGS=OFF
+		-DBLENDER_ADDON=OFF # addon is a separate package called blender-exporter
+		-DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem
+		-DFAST_MATH=$(usex fastmath)
+		-DFAST_TRIG=$(usex fasttrig)
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_OpenCV="$(usex opencv)"
+		-DWITH_OpenEXR="$(usex openexr)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_QT=OFF # qt4 only at the moment
+		-DWITH_TIFF="$(usex tiff)"
+		-DWITH_Freetype="$(usex truetype)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py"
+	python_domodule "${BUILD_DIR}/src/bindings/_yafaray_v3_interface.so"
+	rm -v "${D}"usr/$(get_libdir)/{yafaray_v3_interface.py,_yafaray_v3_interface.so} || die
+
+	if use blender; then
+		pushd "${WORKDIR}/Blender-Exporter-${PV}" || die
+		rm README LICENSES INSTALL CHANGELOG .gitignore || die
+		# grab blender version number for plugin directory
+		local blender_plugin_dir=$(best_version media-gfx/blender)
+		blender_plugin_dir=${blender_plugin_dir##*/} # remove category
+		blender_plugin_dir=${blender_plugin_dir#*-}  # remove package name
+		blender_plugin_dir=${blender_plugin_dir%%-*} # remove revision number if exists
+		insinto /usr/share/blender/${blender_plugin_dir}/scripts/addons/yafaray_v3
+		doins -r .
+		popd || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "To confirm your installation is working as expected, run"
+	einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
+	einfo "as an input file, then compare the result to"
+	einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
+	if use blender; then
+		elog
+		elog "To use within Blender, navigate to File -> User Preferences -> Add-ons (tab)"
+		elog "and enable 'Render: YafaRay v3 Exporter'. This will make YafaRay available"
+		elog "in the render engines drop-down."
+	fi
+}
diff --git a/media-gfx/yafaray/yafaray-3.3.0.ebuild b/media-gfx/yafaray/yafaray-3.3.0.ebuild
deleted file mode 100644
index 3b077ecb4aa8..000000000000
--- a/media-gfx/yafaray/yafaray-3.3.0.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
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="A free open-source montecarlo raytracing engine"
-HOMEPAGE="http://www.yafaray.org"
-SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz
-	https://github.com/YafaRay/Blender-Exporter/archive/v${PV}.tar.gz -> ${PN}-blender-exporter-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype"
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/libxml2
-	sys-libs/zlib
-	blender? ( media-gfx/blender )
-	jpeg? ( virtual/jpeg:0 )
-	opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] )
-	openexr? ( >=media-libs/openexr-2.2.0:= )
-	png? ( media-libs/libpng:= )
-	python? ( ${PYTHON_DEPS} )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-
-S="${WORKDIR}/Core-${PV}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e "s/@YAFARAY_BLENDER_EXPORTER_VERSION@/v${PV}/" "${WORKDIR}/Blender-Exporter-${PV}/__init__.py" || die
-
-	eapply "${FILESDIR}/${P}-strip-debug-mode.patch"
-	eapply "${FILESDIR}/${P}-respect-cflags.patch"
-	pushd "${WORKDIR}/Blender-Exporter-${PV}" || die
-	eapply "${FILESDIR}/${P}-blender-exporter-paths.patch"
-	popd || dir
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DYAF_LIB_DIR=$(get_libdir)
-		-DWITH_YAF_PY_BINDINGS=$(usex python)
-		-DWITH_YAF_RUBY_BINDINGS=OFF
-		-DBLENDER_ADDON=OFF # addon is a separate package called blender-exporter
-		-DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem
-		-DFAST_MATH=$(usex fastmath)
-		-DFAST_TRIG=$(usex fasttrig)
-		-DWITH_JPEG="$(usex jpeg)"
-		-DWITH_OpenCV="$(usex opencv)"
-		-DWITH_OpenEXR="$(usex openexr)"
-		-DWITH_PNG="$(usex png)"
-		-DWITH_QT=OFF # qt4 only at the moment
-		-DWITH_TIFF="$(usex tiff)"
-		-DWITH_Freetype="$(usex truetype)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py"
-	python_domodule "${BUILD_DIR}/src/bindings/_yafaray_v3_interface.so"
-	rm -v "${D}"usr/$(get_libdir)/{yafaray_v3_interface.py,_yafaray_v3_interface.so} || die
-
-	if use blender; then
-		pushd "${WORKDIR}/Blender-Exporter-${PV}" || die
-		rm README LICENSES INSTALL CHANGELOG .gitignore || die
-		# grab blender version number for plugin directory
-		local blender_plugin_dir=$(best_version media-gfx/blender)
-		blender_plugin_dir=${blender_plugin_dir##*/} # remove category
-		blender_plugin_dir=${blender_plugin_dir#*-}  # remove package name
-		blender_plugin_dir=${blender_plugin_dir%%-*} # remove revision number if exists
-		insinto /usr/share/blender/${blender_plugin_dir}/scripts/addons/yafaray_v3
-		doins -r .
-		popd || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To confirm your installation is working as expected, run"
-	elog "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
-	elog "as an input file, then compare the result to"
-	elog "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
-	if use blender; then
-		elog
-		elog "To use within Blender, navigate to File -> User Preferences -> Add-ons (tab)"
-		elog "and enable 'Render: YafaRay v3 Exporter'. This will make YafaRay available"
-		elog "in the render engines drop-down."
-	fi
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 58940ef75585..ea9a7391a1b5 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 2dfabecefb21..5b0b87353e9c 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -11,4 +11,4 @@ DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b54
 EBUILD allegro-4.4.2-r1.ebuild 2527 BLAKE2B 232f6a17a76131b75fb9c5251504715a5bb74c084ef23cfe29fdceefe8927a3a5cacb5840f9767139b50b0a8a4842e13ef2a8226afbef096d61b5980cb917508 SHA512 af76323c8fb530e1140dcc20ac37138210634593a416e7dd45090f8641473b2b7e3aaf5cc3e068b5a74c92e8f0ef86aa04a92ed16213aa52486abf7643b9dd47
 EBUILD allegro-5.0.11.ebuild 2397 BLAKE2B 1477ed40dc61ac329d85893dca32fa4d9c805c7dc0254e22fbda6a25c9b84907634bf83a24aebb113fe28f548311b547a60be6a9a54f32560935f2b36927d851 SHA512 a4663c4c33f07b9f5b58ede35e369107d3585b9489150c50c3cc312a6ae61e12e0a023b19208c53c2dea2fbff4fdf285fd7962afa30d6ad1ba5c55b40e760719
 EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
-MISC metadata.xml 1089 BLAKE2B 195c71477c57ae4e873d7abec9ab26e8047e88fc8d0ecc5977a9059f990dabcfdb2ea184f6fe873a96868e684936ee1926ab5a9d15b34a7885e5769c981c23b3 SHA512 55c72ad0b2a1f00004f676e8a603551aba34b8a6cbb491ddfde7938d18093e42e4610d3cf1154196625e92a25f3d08cddca19930a20df312c455d3338fe30a1a
+MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/metadata.xml b/media-libs/allegro/metadata.xml
index 0c51c0b4e8ac..1a6f9338ec6e 100644
--- a/media-libs/allegro/metadata.xml
+++ b/media-libs/allegro/metadata.xml
@@ -16,7 +16,6 @@ and a GUI.
 </longdescription>
   <use>
     <flag name="dumb">Enable <pkg>media-libs/dumb</pkg> module library support</flag>
-    <flag name="opus">Enable Opus codec support</flag>
     <flag name="physfs">Enable physfs support</flag>
     <flag name="vga">Enables the VGA graphics driver</flag>
   </use>
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index d9e39eb7a960..92c5acd7b265 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,10 +1,8 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158ed77cc3878c076f4344e4d8f7b15e9872d3d6635710049ca14199851f2343246e94810fe2a0bb0d1e02915c941e SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
-DIST alsa-lib-1.1.4.1.tar.bz2 974584 BLAKE2B f3221fa55dc11c04f4a1bc3ee90d2a679ca9b8bde65e2801ae5762fa456ef8e45532624efa57bf7d62f82e5c172eaf10f2286f9acace5a47e20123acf5ce04d2 SHA512 7b548c4ee29c4a1230a0edcd5d19219831290f96a214180a6530628acc05278d1348376195287d188f4f44d6be1914391c63994f1b50985c3eee74352da26b0b
-DIST alsa-lib-1.1.5.tar.bz2 979225 BLAKE2B 75683b17bfd51c1e54f1a460ed32a170b07eb227bd6b9ee481d123116464f5c16bbb49f29dfc8d08baaf2f69c5333bf71b70c33b5d420c43e56ae4ace76a6ab0 SHA512 c79ceaa1ebfeda2caf41a0495ea31dd2748a11795989aebc341ae13a5c96d21495e4542571d5590e68b2575ceddd6e84059a950ddb78e6c0b9d94861faee4f58
 DIST alsa-lib-1.1.6.tar.bz2 989316 BLAKE2B 2aec62d262148571cc1b93ac8053002b61266951caf8b2855fc65b699ec928672748a21ba11a25e14e752a4a85f68b2f77b5ad6af9b2f1fc5e9de41313ace54a SHA512 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0
+DIST alsa-lib-1.1.7.tar.bz2 1005257 BLAKE2B 0ee0eb9db057421d75436bbed49e0a0ef560700d480a5dc73bc0e9e6abaa29892dc4e4482c671996fbc9f6bb5f70ba645010bd714f30959fef897e3dc906980f SHA512 7cc81464d876a137e9ac9700420bfff7cd528338bdc6e0bdbe313d45c5b97c81f1a9483df0556fe390d54a9db747fbec62e843b42d2cbc740d5a91b015714f6c
 EBUILD alsa-lib-1.1.2.ebuild 2105 BLAKE2B 2be4af40e69e4b3e06ce8ea954848c143090ed275f19dcbfd49b867d1edd03e497a248a2f16f5ed9181ea409be5ca46864445f729d634174e8376b256b877b8f SHA512 6f02e3234a638ebf9e88f5c6db7f6edca4f6f76acb1e7c09bc120825a6d1c994f83baa22d5c9b6c2f07fc6717a4e32714d7cab13ccddbc653e57ea489b17fdde
-EBUILD alsa-lib-1.1.4.1.ebuild 2114 BLAKE2B c604e7b3ed5eca1882eaa54d511d06644e5a0db18ba4933bba410850c89876e2f9592e71cc121d7b853b00ea1c66bd18b69e67290b0d78b3a2a27b491516220e SHA512 ad3f570a0c87c5e5f41d0183abaca0a8f20595d88748bdfa22ecd5a36730ef74f32c7c8ad5caf9a1accad0da89e44a1519a370dc38b259577977e86e66df42bb
-EBUILD alsa-lib-1.1.5.ebuild 2114 BLAKE2B c604e7b3ed5eca1882eaa54d511d06644e5a0db18ba4933bba410850c89876e2f9592e71cc121d7b853b00ea1c66bd18b69e67290b0d78b3a2a27b491516220e SHA512 ad3f570a0c87c5e5f41d0183abaca0a8f20595d88748bdfa22ecd5a36730ef74f32c7c8ad5caf9a1accad0da89e44a1519a370dc38b259577977e86e66df42bb
-EBUILD alsa-lib-1.1.6-r1.ebuild 2060 BLAKE2B 8a2e25921cba37d8e0e5985faab131ca359d363dae7c347dc9ff9f52b206cb3e5b59eb0ebb2b38487e85184a329eb335e2d4a5860cded27195fe64c6d181b8de SHA512 d46f1d30068df97006f3c3d84623bb16015e28a1f79cf0f8b44e8e78cc6d222ad1a4bae3a6957d6e4f55d29593e7916ca791aceaf42142dd5b33a8dc5bee597e
+EBUILD alsa-lib-1.1.6-r1.ebuild 2054 BLAKE2B 1d6cd5ab6fa0c3fb14d4d5e6b53292773ddff9afccf785b2bbcea2330f5133c56da299b9a794ae1f5d64859f96f08f8fe9c5fdfcd28af58ea6d9aab1690bb7de SHA512 7cb9e6af32582681080e82cc4c8ef45941e9ab3f9288bb9e49c6d22648e021a8d2d200eb8b71d258fea877de5bfe0896d41f394f6e95c8042ce24e49931cb1d3
+EBUILD alsa-lib-1.1.7.ebuild 2063 BLAKE2B b3a5a74cfb2772f4a88699067ba8bad9971de795732450eb704eae5ece252830a3bbb2a06b436a1672043ddf138ed1ea5d855e856afba21a2d20e0409ac4915b SHA512 c868b015979edb7cc8a8b1d59c4f361ddd012ad4753c4597413caae27f4a023787e23786f44ba721de401fc696715a8e2837219c53598dca5e19860358b043ff
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
deleted file mode 100644
index 3cfe8ecf8ff9..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.1.4.1.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
-
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-	# enable Python only on final ABI
-	if multilib_is_native_abi; then
-		myconf="$(use_enable python)"
-	else
-		myconf="--disable-python"
-	fi
-	use elibc_uclibc && myconf+=" --without-versioned"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--enable-shared \
-		--disable-resmgr \
-		--enable-rawmidi \
-		--enable-seq \
-		--enable-aload \
-		$(use_with debug) \
-		$(use_enable alisp) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		fgrep -Zrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
-	docinto ""
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
deleted file mode 100644
index 3cfe8ecf8ff9..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.1.5.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
-
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-	# enable Python only on final ABI
-	if multilib_is_native_abi; then
-		myconf="$(use_enable python)"
-	else
-		myconf="--disable-python"
-	fi
-	use elibc_uclibc && myconf+=" --without-versioned"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--enable-shared \
-		--disable-resmgr \
-		--enable-rawmidi \
-		--enable-seq \
-		--enable-aload \
-		$(use_with debug) \
-		$(use_enable alisp) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		fgrep -Zrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
-	docinto ""
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
index f03ea3f74dac..db2aacef4a4d 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.7.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.7.ebuild
new file mode 100644
index 000000000000..69bf71d7b425
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.1.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 multilib multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.2.6 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# https://bugs.gentoo.org/509886
+	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
+	# https://bugs.gentoo.org/545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		# enable Python only on final ABI
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_enable thread-safety)
+		$(use_with debug)
+		$(usex elibc_uclibc --without-versioned '')
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		grep -FZrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::"
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index ba9c5d7c7b23..4cfa07532154 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -2,5 +2,5 @@ AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595b
 DIST alsa-oss-1.0.28.tar.bz2 291500 BLAKE2B 8884c91809bbdb9a20a7ebad7c076786ac5896d312741abf612598429e3d476530a198d8b4e0adb3abe2aee118b0b4b875b2b99ac636403ec37a583a4e234bcd SHA512 7069b7d4d4c0b840608dcca99a660aae1f81f6ef45dcf48fc66553b05de260d033105aa685c8ca05fd4d157d12d83860746a05afdab4f310919c34fa235ab03e
 DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e549c46ef4df52d49333c039aa285320a179cb632df5dd48f51d56513499e59c71914236c9be1e0ba493d25bbb270 SHA512 f58ece2a5aeb846032a06d372eec0bfa1cde0bd0590b1700d4f7698aa29b10f13c8d53670297ec95a94448955ba6ea9e94a4a79129eb2cd734c8a3658197036d
 EBUILD alsa-oss-1.0.28.ebuild 876 BLAKE2B e322d42d78583a296b49e32e316d4f7e0bc41fd4cc40bbc8873e5bfe0cc47a46c84af4813cfe9f916da8d5cf30a0577e0fe9030f2387f62b99cc8ac2a2a675c5 SHA512 519092dd88cb74fdb8a2fb9e87de716dcbbf9e19c0c75f82245535c2827467f9a1f429f4477f68f23a9804026b90e265fef20b31db48db41396fcfaaf37a417a
-EBUILD alsa-oss-1.1.6.ebuild 925 BLAKE2B 4e23d01b74363145fdf95cf16e9b019bab71360c3361278d6793147e8061d73ce7c5d6798f5b4e2e24b7e8b847ee5ceb54f9a1981654c65079c6379eaffa4e8e SHA512 71698c735292d40c0d1fc70d410bd9037f9db27a31bca76cb999fc9c1f7a1194ab1e1b05f2b60946189d4250ae894722052effbdfe33a162ad7c390a6afdd466
+EBUILD alsa-oss-1.1.6.ebuild 919 BLAKE2B ddbc603c1614cbb0b4a3fe7669f7a41cdbc7ee05e5617148b190b4763b941baa4af6d269f605f750f9446d20a91b399a3e0e3c799c7f7b4eeba5ae2c37abff7d SHA512 79e807c8cea41d42fe7205dbd13677182043290c601cdb5afb4d3d509ff65d5422006b79e1aee94870f181718b9f4bdb9058144e27a4ec1b112cf971774f6fee
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
index 47cd17be6920..0a64bf50eb50 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-libs/aribb24/Manifest b/media-libs/aribb24/Manifest
index 149ee0d61431..07abd5826e26 100644
--- a/media-libs/aribb24/Manifest
+++ b/media-libs/aribb24/Manifest
@@ -1,3 +1,3 @@
 DIST aribb24-1.0.3.tar.gz 57378 BLAKE2B 72d5c56a214d63e477ed0bb77e5f20e79ff69fe3712623f54f1369b041622aef1853909f3dfc31685b346c62ef36ffe205bf7a8d2c9f0a2996ae378b025228b7 SHA512 622cc0c3928fd6db0b5ab3921f27348c956af20f8c0133ad5d9bf4de3d199077d9f23cc86ae149a9f0d13c7ee5906ec95de3fb8388207160cebd1f0c59078c8f
-EBUILD aribb24-1.0.3.ebuild 612 BLAKE2B e228f4f6252d4e63839d55e4be8a444319c237ab9565b1846c28319ee617b7317082f760933603c7363e74ffa55b81eac15bc295c8f7cf564bb685b4a913fdee SHA512 cb0749166023592aa3694717ddd07316c942c303f03ee5a5cdd3e7e0368166aa3fb6e50981e4db1f0ebeee73992959a21be394a98762b090f8ce5df7a12442a3
+EBUILD aribb24-1.0.3.ebuild 612 BLAKE2B 1a27dce5c7fb21cbe9072cee4c55df3297ee6cafc016e732c510c2377445ed2c2ce6e2c622de84de5359b9ca506fad5dff69cc975b7916148c0e5ddb3276e0e6 SHA512 7927773f548aea207b666633c08d66db5d00f96fe3045362ce61a4f25fcee84fe099033909562f0cacfa00ae53b3549cdf1f6733333954151b696dead66adca4
 MISC metadata.xml 362 BLAKE2B a58d2df31cfb55e76bec5b2055ae17cbfed0de0a0cc85d8d604ee5c4442539b00d40500722b9a589861f6de1e49ef9fe171bdae2219325c93fc07b735a349949 SHA512 0266c8f4f74468aca028c09b9bd61817f1358022ba11020c5f1829581113c0510c4f59228304fe4a5e76f4a666c640e0afc6e96385bae7c0de98c5d4b8a64d44
diff --git a/media-libs/aribb24/aribb24-1.0.3.ebuild b/media-libs/aribb24/aribb24-1.0.3.ebuild
index 96f99da4006c..f1a58d491c93 100644
--- a/media-libs/aribb24/aribb24-1.0.3.ebuild
+++ b/media-libs/aribb24/aribb24-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 
 RDEPEND="media-libs/libpng:0="
 DEPEND="${RDEPEND}
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 53d7e67c0c37..b88e78ec5d27 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -5,4 +5,4 @@ DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145
 EBUILD avidemux-plugins-2.6.20.ebuild 4638 BLAKE2B 1ab4804335317d6c12906ec9a000a38cf1665ebcd0223b8dc563ed75f9e23f0631125c5b6521611b96a375a509ad8b54ba82095cb6f626ff122904572a95e692 SHA512 48e038364240357a6c6328b101973b94dd3cc813273ae5e36711aa4b3121b0ac322d2577a0faca8a7455ae6e2063cb4e1b0db3100564f84a77c3a44e4154ddb2
 EBUILD avidemux-plugins-2.7.0.ebuild 4873 BLAKE2B a9a95cea60229f38ac116166cb449f31c9035f6b59b7577d1ade5b19f4218b8977e89292583149284bb727048bb602b47e0a176bf586ca933b3c7c7b13f5c364 SHA512 5d5b7526d4857161530d3c969fed0bbb2eb8b44f073609447e6e62588cb8be137273971038dff24dd44fda8775ca07a0246db9be0c3e0f9661f1ca671096a822
 EBUILD avidemux-plugins-9999.ebuild 4838 BLAKE2B 701319a074861f69f17ea4970006eedf087f5586197f6a9ab158f8120aaed817236f880a4f59d588534c474cf550ef37764f2f44f0f7cff7f0ee3d5c8bda0c3c SHA512 f3b4c8dad3e24a9af37b7593b7a9d6014960eae9ec91bf9422251148bf336a8a7015d72713d4541a8466bf3695707a47731f0373339c4d5343581260dd319b03
-MISC metadata.xml 1406 BLAKE2B 11611c16434167ee45901a059c37d8802c7b605d21cee9f813982cd8e22e98aac1fa0921662178ef532ef060e7d2c61353a2e057caef3b63a9bf5df06fa6f2a6 SHA512 117225570689a4b78a36b18f5e6c50e185d2db2b10ba6d38869105fa5e718d5dc753eb151cba411df8eba48705e0eee29c2acae8c1a491cc343832d9cfa0290c
+MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index 410f705011c7..54c157d3ff2c 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -12,7 +12,6 @@
     <flag name="fdk">Adds support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
     <flag name="fribidi">Enable unicode bidirectional algorithm support via <pkg>dev-libs/fribidi</pkg>.</flag>
     <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
-    <flag name="opus">Adds support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
     <flag name="twolame">Enable TwoLAME support via <pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) encoder.</flag>
     <flag name="vpx">Enable WebM VP8 Codec SDK support via <pkg>media-libs/libvpx</pkg>.</flag>
     <flag name="x265">Enables HEVC support with <pkg>media-libs/x265</pkg>.</flag>
diff --git a/media-libs/celt/Manifest b/media-libs/celt/Manifest
deleted file mode 100644
index c3a39cb0a9e0..000000000000
--- a/media-libs/celt/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST celt-0.11.1.tar.gz 465853 BLAKE2B ca916d03217dfbeda4764d95bd016500cbf482a0a43099c3d3cd2f4f71182b7d12982f426bf784d022db8bde4a2a6c270f6b61a9675281bfd2be134103723747 SHA512 73d17486ae0ef544baf74f7cf7d4b82b7dcba5143f480ffefec2c16ae9aa240d207aac4aa28c6888ba26e925f6d6f5545f71ef157b95906b63d017ce7b7ce842
-DIST celt-0.11.3.tar.gz 465020 BLAKE2B 9f6221edd77c117778eb5ca188c21430905e1e54034816a1e0a17dc949764d6e6eeac87489f98f68fd96962a5fe89046ba52c1c9f98ba064966d2e5382577a82 SHA512 1f7b8c9b0fcb3a31ba81c220f89fb15173f6e7a25f8fa9d6669790cf29cccb5f75fb37a9f41c76bec5e8d8b9de47d65949831d5a843dcffb2f0747801a8c9bde
-DIST celt-0.5.1.3.tar.gz 440772 BLAKE2B 680be58bcca806ef2135a022cd01103c1518c883868abc2aa60a1ff8c555a0646310901cc5bc01d2b330054af8b5729303d8aa6b3ba58395f7272862a5d5a7c9 SHA512 bf5621dc3ec1b0808bdd83f006fd7b88df1b6caffe07e18eb696c268b31c6c7127329ecb4c9582c44e0ecf9577bbe2f3dbe40f15b80f8681bb7f4115f1501921
-EBUILD celt-0.11.1-r1.ebuild 826 BLAKE2B 330e3a87c22bd792be4da505df444c88f3d34f40d1e9ea37a8756ae43f37a0442830b22d402edb6f89c1d76693309eb8502b61e044376ea037c663331ab49e9c SHA512 08e905b2ea0b2ea435faa2f46c09f6d49150140c77a9627c4275db9eef6a175d8f51d0ccc264f1cc271a55dc915157a539c4047b53df539af042f544df27f0b6
-EBUILD celt-0.11.3.ebuild 1080 BLAKE2B e07796888e2471c1db182d5eb76a650b96345de10ef7d8aeaf0e9fc2a80774078810ed93747cdd59d1cb0be8bbc0662ec984940764be06fe5d1f434cf7366358 SHA512 0771df4e2d1223d4b18fa36b704a45d5edaf5464e48b37d24eff49c6c6f4405068d4ce1259ccc1184d7fe5c1049e82fd19a9a4b0f08e19c99a1357a765521233
-EBUILD celt-0.5.1.3.ebuild 692 BLAKE2B 19fb7f2e5acff2cedf7e1ffde9e88c33e7cfa433bc0d308736cf5076bbfc1f5a61e3a20e9ee2f1240431733935930bab8967ae28ee27d67ec0a04d5e92ee2e61 SHA512 490f087ba8a6a857b9c9aa05f6a81663a484ff5d4abf559c8e219e65e8a2795850fc57da5b52219d509a51221e99543ada6c7b65e1a684565bf25712eb6fe575
-MISC metadata.xml 375 BLAKE2B 9d1464b5bbf9fca2dbf6b926da41d7beb3bb6cd0a4fd5f3b887a68e0c953886c74376c3739e041411838c8afd3639a115a0cad1fbd812f58770f9bcfd455afbe SHA512 0e4cadad691e660d7229130c3348b902634c07d0e21100caf352fc1c8578af75c9c4418c30e5e9bb9943c0b72a8b4a18abd056362e07e6d071503330c9443b4d
diff --git a/media-libs/celt/celt-0.11.1-r1.ebuild b/media-libs/celt/celt-0.11.1-r1.ebuild
deleted file mode 100644
index dc9c81bceba2..000000000000
--- a/media-libs/celt/celt-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
-HOMEPAGE="http://www.celt-codec.org/"
-SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="ogg static-libs"
-
-DEPEND="ogg? ( media-libs/libogg )"
-RDEPEND="${DEPEND}"
-DOCS=( README TODO )
-
-multilib_src_configure() {
-	# ogg is for the binaries
-	local myconf="--without-ogg"
-	multilib_is_native_abi && myconf="$(use_with ogg ogg /usr)"
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}
diff --git a/media-libs/celt/celt-0.11.3.ebuild b/media-libs/celt/celt-0.11.3.ebuild
deleted file mode 100644
index 9c9cefa87cb1..000000000000
--- a/media-libs/celt/celt-0.11.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
-HOMEPAGE="http://www.celt-codec.org/"
-SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ogg static-libs test"
-
-DEPEND="ogg? ( media-libs/libogg )"
-RDEPEND="${DEPEND}"
-DOCS=( README TODO )
-
-src_prepare() {
-	default
-
-	if use test ; then
-		# tandem tests fail:
-		# https://thr3ads.net/opus/2012/09/2124778-CELT-0.11.3-tandem-test-fails
-		sed '/^TESTS/s@ tandem-test@@' -i tests/Makefile.am || die
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# ogg is for the binaries
-	local myconf="--without-ogg"
-	multilib_is_native_abi && myconf="$(use_with ogg ogg /usr)"
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}
diff --git a/media-libs/celt/celt-0.5.1.3.ebuild b/media-libs/celt/celt-0.5.1.3.ebuild
deleted file mode 100644
index 8d4ede3a5894..000000000000
--- a/media-libs/celt/celt-0.5.1.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
-
-DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
-HOMEPAGE="http://www.celt-codec.org/"
-SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0.5.1"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
-IUSE="ogg static-libs"
-
-DEPEND="ogg? ( media-libs/libogg )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ogg ogg /usr)
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die "Pruning failed"
-	fi
-}
diff --git a/media-libs/celt/metadata.xml b/media-libs/celt/metadata.xml
deleted file mode 100644
index f399f22368a4..000000000000
--- a/media-libs/celt/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="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<longdescription>
-		CELT is a very low delay audio codec designed for high-quality
-		communications.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 9d2e645b7f8d..022b3451383f 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -3,5 +3,5 @@ DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3
 DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD chromaprint-1.4.2.ebuild 1355 BLAKE2B 266f15e363ba036a702044d0e067e779e9db15cf6874cc1fc8f543f48ed877f56a430f66bd3f04a7898f9f73e6cdae54e3a6a0a6cc2ef24a0ee53c71f35d9f29 SHA512 9619edbec8b7c40e60985a65c7f146f56f2d3c380512b467ef37a0f02fce4c0ef921ea3ded9fc6c730dd9d7350829476ec7964c73cb4f3c0159e661eef9a1036
-EBUILD chromaprint-1.4.3.ebuild 1460 BLAKE2B 5b2c8921ce4a8a6d5d9e17a9a16746ecde239a8c8f6ef9c63c6c2dd2b28baf2d46b1f8a71cb4f87a11469a48d43bf15f602af875b0888ad41fb8f027f424a681 SHA512 9af43db6c8786fe89f8b4457f357ac67328f81975de7d9c382c74c49b18933b4db5cc1a1c675693f64d7d50ed0086266a46209ef53f3b47c401f0d03ce17edf1
+EBUILD chromaprint-1.4.3.ebuild 1456 BLAKE2B 73af00b6ae7346527194ec03525725a491272fc3afdb73b7a9ba44eac1c3087d98a42924281aa794b2dabd1c7470dc3e992ee7289cccae2198a3cf1d9af52b08 SHA512 1c8edc98a94b46d0b2ac4f24b0d5f93ca4635643ba5648d3430ed5753849c2f786e93ca165bcab7ddd655c1bdd5c6be1cc028d53ee3dd5a9a00c2f1f790e3046
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index 09a8c7a88e94..2bf949dc9321 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="libav test tools"
 
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 5ba8aa6a085e..a3072c8a1591 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -6,5 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7
 AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
-EBUILD devil-1.7.8-r2.ebuild 2177 BLAKE2B 7b6ac84bd6c2552a219e5d7362b075e9db03c759ebd89d4fd6ef99fb270b79b0f1cabd5e4110671767d2ff3fa43d9a80f160b6afa1ec0161a86d6877d03df216 SHA512 c36245fb617a4121ec870a1251607ea872e97e17ed5db7c93ed6a51ecc367f40ac0004bde676eff753094e1b1d4d1fa10cce4e52782be0b381745659abff763c
+EBUILD devil-1.7.8-r2.ebuild 2180 BLAKE2B 8b4399b82387d57421092c37ddc56be55c4fda6b2894299ba294e90d7107e826a045520b5b9b3f38380bc749e53cfb45c218523e0d44022de52b92f948ef6ba0 SHA512 6d6acbe25ee6fb929711e8bdb24f2d0c3bcf52547e0e694ab94d529395da9c0850cbb328d8c4b2288f1467255914fb799f27db7a9ce10af223488933d07fef14
 MISC metadata.xml 499 BLAKE2B 44a05534504849bd393e8b60ca5d7ce0e1b7862fea7bf120ca7f1d4f38d21e9d4566b3037fc9dc9d403f7b8732c175693d3594fb1603d53642354f3a07cf8951 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index 4d74269bfece..63a422bed59f 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl static-libs tiff X xpm"
 
 RDEPEND="
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 901896093a9f..1382121933d8 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -10,6 +10,6 @@ DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f78
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 EBUILD fontconfig-2.12.6.ebuild 4914 BLAKE2B 0088f7ef6b497b086c5f90a42330f1727e404e9818b29d25e30340679ddddf3df222cab240ee09021d99660a4fac2a5f16f59faf5b4ff4e56fc6fd6f689aa72b SHA512 7f78420ed60f3b575965e5088cde35c346f6a54ee1ee0ee1321c028a00e60f9df52bf6fcc13b3da53b0c1714209f513e5d49b64e24b5a9a4b4920fa0fadc1e79
-EBUILD fontconfig-2.13.0-r4.ebuild 5185 BLAKE2B ca625b954af37fdd7baf5b763479f07eb455d9bb37bf57c911c548a9a49a42bc9e6b1d06b8bd190f516a2c253f6daa5f46b2128e724bb2913d2ab8835f20b6d8 SHA512 412465dc3d02634e98ee395d300d7fdacc555c1dfeea7ee35819f9f7628962f11b57b6e41750698e6e327fa4077dbb0ca89b6d73b900eefc791a791bd84794ad
+EBUILD fontconfig-2.13.0-r4.ebuild 5181 BLAKE2B d8af0a3e1e4e34392c6559d3a7744d81cef890d71cab8d2de5124fc63c6c5ab8a8f0bb8cbcba01c91012a5ec60fe5b73b9fab324985f7faed429efdcc02d9775 SHA512 20e01258b521acfee63eb1c73b423baad6a7419822ed921b5b8c1c6a39e1c539af55ecd06f5e47637fd603e0f0ffed71ade28c514e69696ee27445f910797153
 EBUILD fontconfig-2.13.1-r2.ebuild 5119 BLAKE2B 4f885e4714892210a8cce5e138ae83a9331df3193e2b72bcfde8c30ba2def370a64435ef63c5ef0a24d09fef9f09845ec14d67dc2893f458b9513b84f8060e10 SHA512 c60092f8fed0fe72dac37e4649945b7e0cd06ed22ef25b1871eb8d113e57e0fca446199368102f2708b61260c1bb020e3932706b7a87722f178a4a2ac7903565
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 490263d1f590..560514f741c6 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-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 ~x86-macos"
+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 ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 8b15ad353e34..71680c981d5d 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,5 +1,5 @@
 AUX gd-2.2.5-CVE-2018-1000222.patch 2491 BLAKE2B 492923989fe07fa6993fd9ac7d234d8777b944e45cbce5f92aaf5bc53bd1502039ff75937e829f1ad6bceac8813bf68704a42d3688401a3b55fdfcd19649a533 SHA512 d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.5-r1.ebuild 2102 BLAKE2B 25f329383efef1c05fdf1e1a22788a0389bfa2f2b843e90bac2029e239529d241ae3e8067f931bac1958871858167a0657c5db2f8c70a8f13bee7f6538c6ba4e SHA512 10c49a0fc8b4fe124882be08fc868f63e0f250ece4ee7aa6b08f9cdde1ed7291b75ea124bf6d7587658a9d2c44e79fac30087b75e9bea2f7886c13fffdb58bf7
+EBUILD gd-2.2.5-r1.ebuild 2100 BLAKE2B d45aa7853c790af65665387d8530493b1fe7aad4bee1e0affccb5124c798ccc47457661eb34076b49bd4c37d8e8666ffd35c1d7ff85a72e033d2a34203c95535 SHA512 280445bad2ae5184b4c9b983c9a7d0bb07a39d4e3d65b20acc5946403e3ace65a569ed298e845dd1692dc61f0e2e4dc81dd2dea73683da7b1e3967e481e819da
 EBUILD gd-2.2.5.ebuild 2036 BLAKE2B 642b02819339f66ece89a28aaaa68d1d07522b3477b36660bfbfe17f922ed67c3f923ae8a13b709f43d317c4ca30d39699482fbf8789408922314c681a9c5ab1 SHA512 88a1002d150a7e4063832ddd1773536355aab8b0f1af8ee3a3d2ec9804fcd6900292d63db467365830d5cded14c7741dce07c04e7038bbfb3712044372a1c02f
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5-r1.ebuild b/media-libs/gd/gd-2.2.5-r1.ebuild
index 55b5475f63bb..9ffef8a09bcd 100644
--- a/media-libs/gd/gd-2.2.5-r1.ebuild
+++ b/media-libs/gd/gd-2.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index b037b0578a9f..3cf1e848fe52 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -29,4 +29,4 @@ EBUILD gegl-0.3.8.ebuild 5221 BLAKE2B 089d15cd1924d3d859055f39b6914c2084536556aa
 EBUILD gegl-0.4.6-r1.ebuild 5389 BLAKE2B 4eba81cf6624d66ceb3d3e27b9bff465f9b5702e53d12abccc6ccf8bf17e1ccbe439dbb5b9842564da374510ac3c01ffaac28be89aa3cc1b6c3b8493744c358a SHA512 4e010197d78a08ecc574975d3069a1fcfd2cb15b0cbc40f28b28494213369fc926c1e7bd082314213f823381a52b687facfc122ed000c3078b409bd406f79ff9
 EBUILD gegl-0.4.8-r1.ebuild 4968 BLAKE2B 3cdb9f610500db2fd90fbb55e64c22bac6fe13cc153d5b42b5f16509e09efba77e50e5cc803b33d0e0845f61f65bc201f4e2bfec5fcdcbfb6d6eeaf4966f8204 SHA512 5cef00dcb12ce6153a0831a129dedf0051c29abb683b06b5f5e4d85467f293c93de28149ed73946fc63bedaaac22150f6ade4b21c679a6a4cd422ea702ec307d
 EBUILD gegl-9999.ebuild 4862 BLAKE2B 2c3826ec126d5dc69f2ea4d7ca2cb2dbb5604a8da8a3e6f18b6fc3fa77526a289e35d03673d392e7742dea39dacccdf09e8eb1e85ee5a63e044590d16547ae23 SHA512 5b0a2a483dbd1014f7378d74796167462444a23c1da0d66372b9659315c9bb0bb19a1e11159d63c1192dda7803a08b42cf72f3ac97330576124af3fe16ddb823
-MISC metadata.xml 472 BLAKE2B e5dbc6beb699846057be74ff6c05e1273bdc2f19910be0ff73c1397b48173526e0c6eda649e7178a9858aaf055628df0285792107cfd49bf5ba4dc9c56f8c835 SHA512 3d4b87f67a5665c0520996c36297afbbbaa1410bfbe244db215286b044a57c030b2a24d4dd9370fba6a7bd148a71b0bf8e2ff85c49ca321441da831ce47b9faf
+MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a
diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml
index bdb2bfafbda2..dd62df7fdb4d 100644
--- a/media-libs/gegl/metadata.xml
+++ b/media-libs/gegl/metadata.xml
@@ -7,6 +7,5 @@
 	<use>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
 		<flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>
-		<flag name="webp">Enable support for <pkg>media-libs/libwebp</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/glyr/Manifest b/media-libs/glyr/Manifest
index 9bb231aea5ee..f77a2434028c 100644
--- a/media-libs/glyr/Manifest
+++ b/media-libs/glyr/Manifest
@@ -1,7 +1,7 @@
 DIST glyr-1.0.10.tar.gz 416414 BLAKE2B 6cc4dbe7f95bb86635c131f37e4a0d0c95cf2027e8d84629e5d2760d9d8baa5194976b119f2759922ad6a3a2986cc22c630260bb85108caf04674d12a43b1406 SHA512 dc5a579c84c321de7c28861e42196d42ef73bbdbe86b5d662d7ace1d79efe8d6d8d0a8086092ed9c32af9651db8cb11bf1678c5582b17192b23e20a66812bb21
 DIST glyr-1.0.5.tar.gz 426382 BLAKE2B c729eb77fac5ab0afc2ab01a83d004678697456f894b72bda45672333068ce0ca24483cd9e60751dfbef9b8ff576fe825c7af9b20afb8201b7d2c2d7d86d3252 SHA512 e630116ae5a673c9b85a0a4f3dfa2a8ede319bdca357225250ab687b7bf08ddf86041316962918d577376d9641ba1128ec95fa24b5784150155acf78959af744
 DIST glyr-1.0.7.tar.gz 425072 BLAKE2B 8d4ac47467232cca06f517a7f60d824c962949fb4226584e3c81e7c65338d28642fc09eb7e691908c1f25a9e225face52f1a565a1454bbd056f686398fee140a SHA512 e6ffe4f1f2630fead1a8593b63e10dacfa3d8d57b241d0f660f5cd35223dd3b2888d6eee8e6089548ed01301326d195e98f50893745ee3567570d498e23b8c1d
-EBUILD glyr-1.0.10.ebuild 741 BLAKE2B c4b7fe3d7efb49f33dd43194c97b2760c1fc6c8ebede35818f7784bdaafa2c646ee8fc052835d61d69a7e8172c0d28acb4492975b67b021162b23af9238d153b SHA512 547cd4687dc28d73739eed0a2c1ac1b6a7a9e4b6cfb5bf53bf7d6f9896e2072f48af3fadcf1b4aa844b06f6cb425ccc511630d3f9f6e8832b97617e6dd60c9ba
+EBUILD glyr-1.0.10.ebuild 749 BLAKE2B 10b60fe5500f077f7f1d9b32692e4facab3489e53c281afd6f738c0b77ca358d6dae4883e282aeb1a67dda5cd01a2e848e79fb354444f82c11be2626bb7a05d6 SHA512 1761a9597c09a5f39e4ad00a3ee3a262c711529fb509ae6bdebca8db84da1cfc8f4e4496b56ee248a5e315a526f1cbe016e9c6519508489523990b3174c32798
 EBUILD glyr-1.0.5.ebuild 738 BLAKE2B 0d9bb1759136ff06a1323a40d1ad26f0f58c6e80c6c5ec7d10e48cf669a951e4fcd968cfde060cdf3f3c34f7ae37c80ec4803c23db5e0379401ff9fb0bb45ac9 SHA512 20a08367b1d539b11089d3c9b602159f13f7486415a815c69ea1081fe2f79565fec8d1c0b7989ce0ec64d51bcca2d39ed826331d164b866c62cc836661fde12a
 EBUILD glyr-1.0.7.ebuild 740 BLAKE2B bc967f1585e495646d1205617fc6f17e4327b23d0c4bde7ff0be25fbb795a19c34a6ecfcc1b40d8eb0ad74464bf3fdc38d6733b4bc5c9398ddf6b1d887aa3b6d SHA512 d31765c40684f756f05360d85add9b9b7df55939463f738252b55050d3be001f720bbe6e7b01a2da5e06a9a85bc8c4cafc51257f9a1c17608a957a896697b5db
 MISC metadata.xml 328 BLAKE2B c97507d3db73635f224a37a2784a491d4fecd0a6f2deca81e1181237722bce07057c9633980e30748367270f248b0a3f90f1649b3a0af070b46806356bf5594c SHA512 7847b18e7a3a1c934df50d022a1807a52ea52617e8edcd4aa03fde59899a15d254148a3dd62460da741142db5e3b3d7ec3cdcdd6d9149d86b4a33d350def84c9
diff --git a/media-libs/glyr/glyr-1.0.10.ebuild b/media-libs/glyr/glyr-1.0.10.ebuild
index c65461f3d9d7..deaae08241b7 100644
--- a/media-libs/glyr/glyr-1.0.10.ebuild
+++ b/media-libs/glyr/glyr-1.0.10.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-utils
 
-DESCRIPTION="A music related metadata searchengine, both with commandline interface and C API"
+DESCRIPTION="Music related metadata searchengine, both with commandline interface and C API"
 HOMEPAGE="https://github.com/sahib/glyr"
 SRC_URI="https://github.com/sahib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+	dev-db/sqlite:3
 	>=dev-libs/glib-2.10:2
-	net-misc/curl"
+	net-misc/curl
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-DOCS="AUTHORS README*" # CHANGELOG is obsolete in favour of git history
+DOCS=( AUTHORS README.textile ) # CHANGELOG is obsolete in favour of git history
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index b31fc8ce073e..fc947b129b18 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,9 +3,13 @@ DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d6981959204
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
 DIST harfbuzz-1.8.8.tar.bz2 3862626 BLAKE2B c5b2b89f6fbefa004927c0ed5dc314d3f8fd4ce8c58918f4020a91247d9e781ff1ffb4ba05b138b4b1aebbdcad2041d749301143523a808f61f013e2efb5efdd SHA512 eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79
 DIST harfbuzz-1.9.0.tar.bz2 3870586 BLAKE2B 53aa631145662fc0fa1bb80e6b438de7d68d5f8f55d163e62a7c6153b250ab2e1c4de327194ba566682a4033e632f0ebc2915250760f721a2a2f2b97e9e6c844 SHA512 fed98e4e67a518a7bee4f3222f8e595bfa529cab12d42707577c639b7bf9a6d771646e63859bd70850bbf93300780e3b0538483e6b73332721e6c2ce5a17a0c2
+DIST harfbuzz-2.0.0.tar.bz2 4320539 BLAKE2B 5a28233a956477754e73b5fb556b7ad4c089dc6f3ebd86060ac2a39cdbf39ac64ed5cfe5b33a1454b9fa5c59ba566d6c69bff8ac0d9d6954e3715fc4739e2381 SHA512 1c782d0b8c0b85f2a3d116d6e41fa688cf8d6c00becde89af6e5f7232a5e272563aea325824d9868f68fdca3f3df4375658234cb7d7198940d6f7e67c33b158f
+DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e639e25ece971646963acbdb10be05b82c4faea33688b1a3edfda4c3fe45b97e5ef87d7ca6d9776268b43ef23a7ee SHA512 4cb605c47617dd06d4a2e8ae01e44969f5addacee47ef5212442645c6229298d5080f85b0aca6a2fbedfd2007c679acad6a4b3e9389df1b3a6232bf6ef961577
 EBUILD harfbuzz-1.7.6.ebuild 3241 BLAKE2B 3886cc3cceb195e62d5dd5b31d4243dbbc8ed218609dc3a65455b9e83f98b5471159039f5fef106d361a240af992257da1f87b43a4ad05a1960f9410dffc051b SHA512 cbc34d68ec264add1f34e9c1c629a0b5351803df370dac7bdfd89da94aabb60b22a3be2202a566d3d31b48e187ef1d7a9bf2dd659c8ed7e203f838eede55645b
 EBUILD harfbuzz-1.8.1.ebuild 3196 BLAKE2B 1e66c1d87d91571ac977a0eb6803a9c710c6d16e3590dfc975cbfedd4924103ad7f1a733ecefaa16003aff0774ef0d31cf2cadd398e35a4faaa89b8fd5e4aa35 SHA512 0741642501ffbf7b14d82c2303b44aac104d17ed74c86ac34f5d1173e10dfef243c81b371600d56bce98eccb0a0ac1c662eba28edea9dbc1d81c23225c5d7a81
 EBUILD harfbuzz-1.8.8.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
-EBUILD harfbuzz-1.9.0.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
-EBUILD harfbuzz-9999.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
+EBUILD harfbuzz-1.9.0.ebuild 3028 BLAKE2B 55735f2884fa899662c2e8737fc1c1e68e388d3943f51775f5d552628ad74164b55821af02f6e10dd24e9e06ee5f41e2a2aa2dece5e18e58ef465afb83df010c SHA512 4c1554d6db2b8942be88de1d498327f0d0aee8d65864c1c914331468545a5a62488dcd53544875ce3cf6c95f741c32bfa6979cac46840e03af03622ea09f6c13
+EBUILD harfbuzz-2.0.0.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
+EBUILD harfbuzz-2.0.2.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
+EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild b/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild
index 243f2a80c86b..ee83fb48ad38 100644
--- a/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.0.0.ebuild
new file mode 100644
index 000000000000..85491d783cd9
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.0.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with fontconfig)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-2.0.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.0.2.ebuild
new file mode 100644
index 000000000000..85491d783cd9
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.0.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with fontconfig)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 243f2a80c86b..85491d783cd9 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -35,9 +35,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
-	virtual/pkgconfig
 	test? ( ${PYTHON_DEPS} )
 "
+BDEPEND="
+	virtual/pkgconfig
+"
 # eautoreconf requires gobject-introspection-common
 # ragel needed if regenerating *.hh files from *.rl
 if [[ ${PV} = 9999 ]] ; then
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index bcffcf40d586..5fc3cab0e467 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -5,9 +5,11 @@ DIST ilmbase-1.0.2.tar.gz 496540 BLAKE2B 1727be15753102f56d7b23bb88c68897006cdba
 DIST ilmbase-2.0.1.tar.gz 555828 BLAKE2B 95cf3019c74c1efd95e1b7ddf2df224f4bcc93bafb9936c408f94ddaa2fa243161c91f8527ec9e67d7d48fb9d41dc84c42a2745d8e75d3a648f66bf0331d41e7 SHA512 0f2341fefd7c661b62bfd42590c9f29e5b58fbf303a4418e17d3bb831c40ebe23848250f360bc755113b84882665eb8c90497ee2f8d77bc5ed8e1fd43182c712
 DIST ilmbase-2.1.0.tar.gz 557552 BLAKE2B f210d47ab886cf9d2d76ca6ef6cc86123f887a0a3971e4063b5451293827861f10a6cc94bbe2399a9fcbacf48492e8d739b216b4baef72cc167bec1f2ed5fd6f SHA512 2d168accc4f4fb8256fa7a4488c1a930bf1f088bda93f6d8272d3ce15219716d3e85dfa1e85dc2766bce10438e8fb38607a232a145c00d5d742cbde6604df342
 DIST ilmbase-2.2.0.tar.gz 525289 BLAKE2B 951f6601075098b5f38e26d47f28a83f923d2689d306c02c855a0e8c846a339dfa589f574c6ffcb70e56ed8d7ff0202fea0709939c65aeaff3978ab9e2d58f4a SHA512 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1
+DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
 EBUILD ilmbase-1.0.2.ebuild 730 BLAKE2B 018474bd4196c2ee89f1c9e14359d2c4cfbf9b8277ae4cf1e5ee4a2be742ff0884881bf9967c28be6cf27b13edcf5e753222e5991be20239ee9604710fd98e8b SHA512 0e746dc823c5ea990a2f05329c45716ebff1c7094097a3095fd513a0a82f8c5a47688b57d37e9c158574a15947aa85426398aec728a89f825a4c5b1ce371407e
 EBUILD ilmbase-2.0.1-r1.ebuild 591 BLAKE2B b196bf67401ac210bc4846e69ddd011281d265227dc5c63e70f7c84d5ea05ac177b416cc37744bc6f5360911ed3d3e112596f14f81aa456cd472682d017efaf2 SHA512 4a5392c5be8b1758dc8c2fc0e59530fafb7d353ca70711060f4e43759a9f22c6524323b3db50774b94d7a40472b4854810d012f5eeee375af8f08b4577eae18e
 EBUILD ilmbase-2.1.0.ebuild 758 BLAKE2B 20825fee87f24bc2e31d4c01e690ed7d6ed4827ea9422dd83354da8a8c85c832f0d8d172ac802193b56a482f0d656f79a5aa483a995ae05e17e91ac8b4e8a202 SHA512 fdb41c8dc58900b21d3dd42e8cd65b99639f343985ae8b99e04a8a4e5eb0b68b13725d03b3bd03776d528d2998f62d0f6496bb6ef13b0cc9dda1d804d84b7e2e
 EBUILD ilmbase-2.2.0-r1.ebuild 970 BLAKE2B 322ac4df65286c9aedaf85b43fc8d1fecbc3816fff231695f59647d55ba978610a3156f072416f7e7f211c59606b4364917d98c93034a6a7a532dab47a401978 SHA512 c3b4313c5f67e0082ec5b0f5d7c793e99be3c1c85f9ce1ef923c784b1307a22ca82c47bb2547dd7db30a4a67a98b729ac34ca32791c0d0b62d66e089ac38db11
 EBUILD ilmbase-2.2.0.ebuild 773 BLAKE2B e2ce76ff50489895805194179dd647ff70f7cfae2e3960689a95c6b9b4d0aa543155c45fa12e461ceaadb6249df80dd75398c7841441adcfdfdbd75b01bc43b2 SHA512 a11bcce9aa6cd8a818ad2d8e9ab391e83b4a2b70155b1524d8b00b0f6c8a726aa1c4ad4f75acec1c8a81cd1d12626e0dd80da7b74a3410c7dc9aa12454b98c58
+EBUILD ilmbase-2.3.0.ebuild 998 BLAKE2B 2160f67f7c9de45bd011b4ef50fe1925c3313798fd7eca4a756fad4eae894bfb099864976b80105ad888d28feeb60a7b4268049b6455bda4463f148a41ff1150 SHA512 7d528e45616c193dbdd60b8dc55adcb2e1bada1e320bd01c423ca6fd9750a92aedfbc12b33a280a755d5af130d7bcefd868b312a04358dce1476f001a05fe151
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
new file mode 100644
index 000000000000..318a31fd3910
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib-minimal
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/24" # based on SONAME
+KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
+
+multilib_src_configure() {
+	# Disable use of ucontext.h wrt #482890
+	if use hppa || use ppc || use ppc64; then
+		export ac_cv_header_ucontext_h=no
+	fi
+
+	ECONF_SOURCE=${S} econf "$(use_enable static-libs static)"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides pkg-config files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/jbig2enc/Manifest b/media-libs/jbig2enc/Manifest
index 20e035743419..cbccbef084de 100644
--- a/media-libs/jbig2enc/Manifest
+++ b/media-libs/jbig2enc/Manifest
@@ -1,4 +1,4 @@
 AUX jbig2enc-0.28-leptonica-1.70.patch 1681 BLAKE2B 78de2dd85258d277114c9fdd60e587bdf833211cb8cbcf12856ad3a26647e20c9b713f77a9dc84f983f0d19e38b59a086bf514a0ee81df186b7bad4760ea669c SHA512 2c9999dde1156df91616e42e051b5e0b81339cb818a9c0fd0592c0d77c4b741c80ac876576a7bc87b990e09af587df5e095c87d8893308100b37188e9640d738
 DIST jbig2enc-0.28.tar.gz 39879 BLAKE2B 08cbb2f2a5277085a592d18a8db529d2e5f79f69eaa5392f2b06b920f7d1651c3c73795ba2e43ae843fd5720a1406633b5429ab0b1fe260a6308da4cf10868b9 SHA512 81d194fb648fe7a866302796fd5e2adbb213d52193a279a94dbc5918ce3480561ea204e8497125eed5d6c6e4c6d089f7f35a89ef98bc484ca753ffde23e444c6
 EBUILD jbig2enc-0.28-r1.ebuild 869 BLAKE2B 37989321c52ae5ecc7a10e4aec1ae8ae2775c5d84fb4ce99e2f9437b2d075c32be9911656a79f08e28cd70f6412d5deded9db1b7485444576fc02bfc53433f04 SHA512 4c24a01da97958fdbf11ad6c14b1d06f96a1726ebe1024bc72f11d814d074ed92d7e51de06684eb7197490f3db54f64a4b02acf9f1c74c6f58f623beeac83380
-MISC metadata.xml 400 BLAKE2B 387b075005d0d70d7510a35eff96dc3cf8a3defa66a4d09520b5ffe9613455f6eb3e1d5f89409e6e6806ca44187db99e505e1421c00295e6c2847efce236cf5c SHA512 ee29408ce12e3ad35d23a835b144cbf428cd25e8953a7a0825cc6673d07e517ac6107caeef66acdbfc7f1bb283bec352717ba4b53f3def394b55f2db8e92db37
+MISC metadata.xml 324 BLAKE2B 6b82651c0b2513c62e014a8fd6f931c7edc95c84ed88dcd9fa18396a8ec59306c3bb4a08914dbae815530b031f3b66c97d909da57ba4a6d13177a44e226345d4 SHA512 6a6bdbd18023007787f6790a5004e782c4fd136c64aeb261655f743fd8619b35d280e74e806540156e3ac75ed15cf7053fefffd298b119a43cf430e57d1384be
diff --git a/media-libs/jbig2enc/metadata.xml b/media-libs/jbig2enc/metadata.xml
index 1782f7f1b303..f930d2767669 100644
--- a/media-libs/jbig2enc/metadata.xml
+++ b/media-libs/jbig2enc/metadata.xml
@@ -5,9 +5,6 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<use>
-		<flag name="webp">Add support for WEBP image format</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">agl/jbig2enc</remote-id>
 	</upstream>
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index e27a500d652e..db569490986d 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -3,4 +3,4 @@ DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455bade
 DIST leptonica-1.76.0.tar.gz 12436958 BLAKE2B 3cbb581340531762090f009393b21252d6f7ecbe3dd7c30043f42e8a437f6ae16d3e95229fedcf6845ca47e4323a35ab3e72e349c6fae35f0587c21b44461ef8 SHA512 83c77bebbf739cecab997ee08f7c9abf3ca884019c559b8f77c292ea2676c464cbf9b6812d7f12aefceef86c19d04bb3bc85119de298647a641b984dcdf3b111
 EBUILD leptonica-1.74.4.ebuild 1714 BLAKE2B 0d6f7f596f2ddda2515ec95966cfdb4e9bc7c059fd88c58700a2c05139529fd550fa7a077b30da8fe0f8abee36a9d5b915ac56b5d86a8573c3e44767c2e13338 SHA512 26fcc48126498ab1d7c80f4aeaa0a263bd443e0fd72ceaefdc00e34543fc9a3a91c7cac6481bd334f58f29b920983b3b175cc9091128ce6a096530a1d808a15e
 EBUILD leptonica-1.76.0.ebuild 1912 BLAKE2B a526eae23b91e0f089db992d80280e192462328ad520831d513dcb7e0f5d025de3e0e786dc935552e53b8529ba997d71dff4fd0f5f5e8fb0519ae9947a5f1037 SHA512 ab4f22f918c8c23275b2d5a343bb9952b00a167522722b63c350effaedad0c6ab0cdbc62e5487a4d16d0cc4d2088e050d3fca139219eaa9c1991e929c79dfd6e
-MISC metadata.xml 584 BLAKE2B 577358c352b0d57e1c73e93ec313eb799a577af32893be3d77b2f68769493e5db075af57a2951541036f0a43b19933e9580fcc147d259462e78fb850bbf90a55 SHA512 be7f1725bd6c5807b12b4ef4f1d602e80e79637262c442d98f828fe8f1615092bdf603b56d72203c23bc32c847a7a35fbf7c331787c1afd86b3cbe051d5bf55b
+MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/metadata.xml b/media-libs/leptonica/metadata.xml
index be92a2a304f8..78be582d1df7 100644
--- a/media-libs/leptonica/metadata.xml
+++ b/media-libs/leptonica/metadata.xml
@@ -6,7 +6,6 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<use>
-		<flag name="webp">Adds support for the WebP image format</flag>
 		<flag name="utils">Install command-line utilities</flag>
 	</use>
 	<longdescription>
diff --git a/media-libs/libbs2b/Manifest b/media-libs/libbs2b/Manifest
index 94ccc4344b33..b6c472e9978a 100644
--- a/media-libs/libbs2b/Manifest
+++ b/media-libs/libbs2b/Manifest
@@ -1,5 +1,5 @@
 AUX 3.1.0-format-security.patch 369 BLAKE2B f64d562fca5b305abbb3abed2c431fab6b3daa961406c83db5bfc39e2316dda288c6d6045e9a4f6fd045f8c05308744f7e01b2616a161a0f22aa5097c7a91c49 SHA512 77a803c030c4b6ce782584c9163299289e8a8cc748d08e5040ae912651ebdff92884be70f1efa1db9df4eba3f0060c77d430062dbe1143682685df3c7e7b1fbf
 DIST libbs2b-3.1.0.tar.bz2 606283 BLAKE2B e70becc06078ff72a4a4fb69d9ad4e906f1ca2062cd770e36fcf1ad2a6c58e6284afa7958fca89573ed83cf9a76b42f0c8367942075eb6c77ab12fa6c2e741b8 SHA512 50cf477ff9ce6adf26fa8a696831c3a4f219c80a21ec4c93be8ec3f67f077447c17abbd9588a9de5eeb3ddacac1564a7138807468fc80e853bc78f193b4afbc4
 EBUILD libbs2b-3.1.0-r1.ebuild 561 BLAKE2B ae75f87395d4f051d433bdeaed25e05b789c1255807850ef2d2d2d05c76ce949899de258de3ab60688410a8ba99dd8e106fb3684056906fbe8ba1993a792c33b SHA512 f200dd9e2e9451276d8f084c18fff9b3d2bb3a0fbecbdfd09c0972205e2e736f3b7f3a3ccf12e1fca8b19c1b7d7e12a768b5b0b5ef186b9f0d5afcea4e12b168
-EBUILD libbs2b-3.1.0-r2.ebuild 633 BLAKE2B c6bf795c185236f888447fb2ed85120c3547eef9dc8e817b395b5f20b99e160a53c1b90d2c32c5361913976186bc4b754a78929f3948956b443bac42524ffd1b SHA512 d550b9798b095e8fbc17619548a2f74ae2840caac3c4b180a549b811574b9cdb989f7e715dd6875e2556a853436fc6f4e088af5af38cc4b043e5596dd0d494a0
+EBUILD libbs2b-3.1.0-r2.ebuild 630 BLAKE2B ae92be979f507748834decee3d3e4b50131c5c8049e6961aded2780c84c57b1b1a7f80aec02e8c84602fee7097a6926aa30eb43406c0c0954a8f458f9595f60f SHA512 96ae6999c39a902f7ccb13c965619a90d5ebdf0369cdf9926265c6351881e0fda8786f40df30d8533a19e894068f224bc064f62e8181c5fe78d76fe7ab51aa8c
 MISC metadata.xml 449 BLAKE2B 05ac186d158a3c9ee695b8af52de5f695170ad925c0136422233df9e94010cdcce5224b8938d8b71ff260f4a468ae93898c7999163c8648d10987cdac17f289e SHA512 f9178657883acf1844ac273eaa5af2380f06fbf23641e76f6a32b08f54b410a5be6d6b0d82888637a51ad4ce13396dcdd04907cb1194eb5539be2e6d3c02e99d
diff --git a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
index 6caaccb7c821..b2dd3a526052 100644
--- a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
+++ b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bs2b/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libsndfile-1.0.25-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 242b6344c23e..fa923e007710 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,7 +1,5 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
 AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e8728ad32b328dfe621957edcada1da351d8aa01f221c7de2bcc6242166a65a1edeef2e3babb1735909bc7d59594d379d5e325b SHA512 d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
-EBUILD libexif-0.6.21-r1.ebuild 1192 BLAKE2B d05e18b15894cc916eeb672b11636dd8f45cef93866a339115fff43b8193ee88d515c063aa31fbbbbda9e812b99509210a8964c31a057316ab5831c4379192f6 SHA512 25bfabdfceafc916f8a1cf162f875741f402a119d0ab4ff3008f805160e2ff5e5e556b4a229689a603546a528b5c7ea02f750fe972adacbb2d5af33c1e979b99
 EBUILD libexif-0.6.21-r2.ebuild 1274 BLAKE2B e6fa22fbb705c7c8492c2c37287f81fbbd3fb3b481cfea9ba3857baa87460aac925800b508b0e5bbef7705da38708aaf9b06666266ec400c19f1e5f2fb06f3de SHA512 1998120c410e70ca42a20fb998bc2db4e931270ae18ef171c4c2df6c9941f08c1eaaca69cff83ea4a1ddcd5dde3e98001a415dd0514ec25ef0502fa116631937
-EBUILD libexif-0.6.21.ebuild 1097 BLAKE2B 5d76f389fcca57a7ba7d1f650c6c268f0e65b3172dbd75a561611e590cd2cf4fda4648402ea6abf386be5d7f16bbd9928f80ecf1df2704094d8f2667c500c697 SHA512 99cf126b1d9b5076d5e835453264f1a9aa906254f84a331b452d5ad0cc62e74b7276370b12cf4f228abd275d0514a7d86ac204b2cbd60ca04f560effcdaca9d1
 MISC metadata.xml 336 BLAKE2B 7f77063db7c0cf51903da446071dff6d4dccf66e552dd1229f01b79ab7716d02adcb146f755971d0fe96c2a04bacbd082f606c4023e6e98f9c502a3f8eda7416 SHA512 8a6e3d7c973692a37f57ce34136c863e6ad14efd064c42ea0be6c14d93beec3c7ae36ed44afd6d2454ab29f4cb633c097a0c3b2ea5c019bf06df4f306dbfced0
diff --git a/media-libs/libexif/libexif-0.6.21-r1.ebuild b/media-libs/libexif/libexif-0.6.21-r1.ebuild
deleted file mode 100644
index 31e267a53de4..000000000000
--- a/media-libs/libexif/libexif-0.6.21-r1.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 eutils libtool multilib-minimal
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="http://libexif.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-ECONF_SOURCE=${S}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
-	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
-	elibtoolize # For *-bsd
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable doc docs) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING}
-}
diff --git a/media-libs/libexif/libexif-0.6.21.ebuild b/media-libs/libexif/libexif-0.6.21.ebuild
deleted file mode 100644
index 61dd1b2d0ac3..000000000000
--- a/media-libs/libexif/libexif-0.6.21.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils libtool
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="http://libexif.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
-	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
-	elibtoolize # For *-bsd
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable doc docs) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING}
-}
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 7cec762e034f..4853f4879045 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,5 +1,7 @@
 AUX libextractor-1.6-CVE-2017-17440.patch 3584 BLAKE2B a50d293c88c95c59d3399a2ca4fee6f6e935bee84d4f7c7a5a85e27f0f1e34edb0713f0e0010491015e0c792de5bbde64c2dc392a01ec3470ecec46ed8691a04 SHA512 defa28c0303028cdb8c2d08d15ff62a56a7548ed57d6b577bc61842e74b69b4da6d82ba48082e89341643db433b7f256423556ab482fd6a61936ecd18637796b
 AUX libextractor-1.6-ffmpeg-4.patch 873 BLAKE2B ebaec46a809c12252c7c6416a9376b86d6af353a74ae4779fb36af93465dee6654c3717a51df0a138ac70aa08ec3a790950e64602547e091eb2dfb3f209ebc7a SHA512 2931a1fe44f3a5d5d5307ef9ae33237e803a4afc6a47df3a465c1f502ed872391957cd81ac5154053cd4d2b6caf690335791b5ed0cede7227291450bb7dd4a9a
 DIST libextractor-1.6.tar.gz 8053454 BLAKE2B cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c SHA512 1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
+DIST libextractor-1.7.tar.gz 8075299 BLAKE2B ce738f8839dded4065f8f8d4241c8ad525930f852492605af75c7031b5204c09763c2d4c7a84df6e062512e66509fa308163bcbfd5b655e071c8e43d4fe48f07 SHA512 00340af0987f58c16824f50a18484e76f110fa2b4a43788b950ea4313e6916b94d5e7f16e1f21c8a54509885d9b44dabdc5be7727547549836ddd8ca7251dbff
 EBUILD libextractor-1.6.ebuild 2903 BLAKE2B 8ede2d00e886629456ff76eff0d9dd0b4186d530eb833670ef4b29145f2428aad33505b1d341dddf1c2e28c64802593ed04fc85d76aa4e95e39bd8c34756f6c5 SHA512 be91cb7483cd04dcbee3b07d638da2b604b499389b355f2a6f43701e3c27b396d2f595ee0986c410e97f855bbbe47cb642a4b2f9a1fd0edbf39d4f07565e847e
+EBUILD libextractor-1.7.ebuild 2756 BLAKE2B e0d8da460333a504cc039d1aa3817b2bbda780603912cac22bc3b74b36d7a46f42437ebc9630f8f8406050cac8860da66abeb55d4c9a3f4a4a0baa410ad223d7 SHA512 8408b9c28324b94a1212e268adc6231b956c611fbf29798ffba84bd54649a6e81be7383dfbaf74b5f756b86bcfd9f75e3f0f70ec28250dcea0e5e183b1fdede3
 MISC metadata.xml 615 BLAKE2B eac56c7364e331eb2a0f0955318cfb0cf7c6fe4a95493899b489f755d18b4c4b1ced0e7f7ea0a7716c996ac7640d04a326cbd2230313e123c4b2de4fefbaccba SHA512 b4a4403dfccc02e61fa15f60a19ed23ce43374cc41d616ebbe385865618ae9392bd663fbdbdf01013f4203de2ee51dcbe1caf0974d720dac1be1f4ea029b4fc0
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild b/media-libs/libextractor/libextractor-1.7.ebuild
new file mode 100644
index 000000000000..74dc8b4f10b7
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to extract metadata from files of arbitrary type"
+HOMEPAGE="https://www.gnu.org/software/libextractor/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
+
+RESTRICT="test"
+
+DEPEND="
+	app-text/iso-codes
+	dev-libs/glib:2
+	media-gfx/exiv2:=
+	sys-devel/libtool
+	virtual/libiconv
+	virtual/libintl
+	apparmor? ( sys-libs/libapparmor )
+	archive? ( app-arch/libarchive:= )
+	bzip2? ( app-arch/bzip2 )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	gif? ( media-libs/giflib:= )
+	gsf? ( gnome-extra/libgsf:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? ( x11-libs/gtk+:3 )
+	jpeg? ( virtual/jpeg:0 )
+	magic? ( sys-apps/file )
+	midi? ( media-libs/libsmf )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpeg? ( media-libs/libmpeg2 )
+	tidy? ( app-text/htmltidy )
+	tiff? ( media-libs/tiff:0 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# test? ( app-forensics/zzuf )
+RDEPEND="${DEPEND}
+	!sci-biology/glimmer
+"
+
+src_prepare() {
+	default
+
+	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
+	sed -i \
+		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
+		-e 's:tidy/tidy.h:tidy.h:' \
+		-e 's:tidy/tidybuffio.h:buffio.h:' \
+		configure src/plugins/html_extractor.c || die
+
+	if ! use tidy; then
+		sed -i -e 's:tidy.h:dIsAbLe&:' configure || die
+	fi
+}
+
+src_configure() {
+	e_ac_cv() {
+		export ac_cv_"$@"
+	}
+
+	e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
+
+	e_ac_cv header_FLAC_all_h=$(usex flac)
+	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac)
+	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac)
+
+	e_ac_cv header_sys_apparmor_h=$(usex apparmor)
+	e_ac_cv header_archive_h=$(usex archive)
+	e_ac_cv header_bzlib_h=$(usex bzip2)
+	e_ac_cv header_gif_lib_h=$(usex gif)
+	e_ac_cv header_jpeglib_h=$(usex jpeg)
+	e_ac_cv header_magic_h=$(usex magic)
+	e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
+	e_ac_cv header_tiffio_h=$(usex tiff)
+	e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
+	e_ac_cv header_zlib_h=$(usex zlib)
+	e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
+	e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
+
+	econf \
+		--disable-static \
+		--enable-experimental \
+		--enable-glib \
+		--disable-gsf-gnome \
+		$(use_enable ffmpeg) \
+		$(use_enable gsf) \
+		$(use_with gstreamer)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index f810a8088365..8a9c1f2c83f3 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,3 +1,4 @@
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
-EBUILD libggi-2.2.2.ebuild 1537 BLAKE2B 53e329bf85c0b48810421a01d0bfe1318b2b359554a2da9cf1db70e0f694f8ef79a27fbbd21438f28123f789e0ef82fd85667b5b4c00d278ef7ee4048999d6fd SHA512 065164ff763594e84626095446fcc2c96fe2913e5412d2d41df8f2839ac27c954960e5097464799b5b75c21b56aebdb644c0b53359c7d08c3dbd752ab77c5485
+EBUILD libggi-2.2.2-r1.ebuild 1388 BLAKE2B 4e1e42a293ee0524caf314c88c5764e30a6faf197978903214ef0a8b0a2e269974fc0167900ef928d6775e8f88022f7e81fcf07705c1f8767e015deab1fde338 SHA512 77c8476e7e94fef937f102c9081037b10b983ec8f05e9de51e0fe2a39d59fbe92fb719a13101c1a2b355394140fd1bb6dc3776567fc3ac46b9c43d496861142b
+EBUILD libggi-2.2.2.ebuild 1529 BLAKE2B 24954c7d8d9f3fc779f6840dd3fda3bda764a3f7eba14466875e91de15040dac99db642f0b0a92cf4f14f5bfb5e19b7af083d9e804be740164657f7af3e561e2 SHA512 3f4e4d5783949f2aaed32037955869910d86c180c662453b0b6c93aeb9da7a050e88f19c560a5526526e5f618126c62a82d2f61ab5c0193559b516d5627e7741
 MISC metadata.xml 386 BLAKE2B 8e5a70d9b2afb8a35826b2742206a4470427ba4daa42159129226374836cc5d3bb254c0e64411208d836aa5bf1e615a987bc93a6d5dd874c7ad309ccd8f7550b SHA512 9ce52c323ecbb57d46f69ecffd48a406b800078e8f67fcdb744dc9b86a3806c30455a1ccf144b139619388668cefb7250e1708581a5954862d695d5f284fe3c4
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..eed2d23eee7e
--- /dev/null
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Provides an opaque interface to the display's acceleration function"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggi.html"
+SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X"
+
+RDEPEND=">=media-libs/libgii-1.0.2
+	aalib? ( >=media-libs/aalib-1.2-r1 )
+	svga? ( >=media-libs/svgalib-1.4.2 )
+	X? (
+		x11-libs/libXt
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README )
+
+src_configure() {
+	local myconf=""
+
+	use svga || myconf="${myconf} --disable-svga --disable-vgagl"
+
+	if use amd64 || use ppc64 || use ia64 ; then
+		myconf="${myconf} --enable-64bitc"
+	else
+		myconf="${myconf} --disable-64bitc"
+	fi
+
+	econf $(use_enable 3dfx glide) \
+		$(use_enable aalib aa) \
+		$(use_enable debug) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable vis) \
+		$(use_with X x) \
+		$(use_enable X x) \
+		$(use_enable fbcon fbdev) \
+		--disable-directfb \
+		--disable-static \
+		${myconf}
+}
+
+src_install(){
+	default
+
+	docinto txt
+	dodoc doc/*.txt
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libggi/libggi-2.2.2.ebuild b/media-libs/libggi/libggi-2.2.2.ebuild
index 49ee65b7e717..521bb6974d00 100644
--- a/media-libs/libggi/libggi-2.2.2.ebuild
+++ b/media-libs/libggi/libggi-2.2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
-DESCRIPTION="Fast and safe graphics and drivers for about any graphics card to the Linux kernel (sometimes)"
-HOMEPAGE="http://www.ggi-project.org"
+DESCRIPTION="Provides an opaque interface to the display's acceleration function"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggi.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
diff --git a/media-libs/libggigcp/Manifest b/media-libs/libggigcp/Manifest
index 9dbbd40c6674..141555607b6e 100644
--- a/media-libs/libggigcp/Manifest
+++ b/media-libs/libggigcp/Manifest
@@ -1,3 +1,4 @@
 DIST libggigcp-1.0.2.src.tar.bz2 365368 BLAKE2B 797b1e739319e3982836ec2a7eb14626ea39c116a593703af4de4486b0f43b4ffad89fb4a5245d50f434a97265651554f450033fa66b086a35c76837227b2d6c SHA512 88187eac6f9cae56a2e4d184c0eed2f46c8e53c8b69143479775330abc3f03b48f463ecc944788daade871e4bedf86948c2dcae714c037f8c1284b1576428b3a
-EBUILD libggigcp-1.0.2.ebuild 497 BLAKE2B 95bed7e2c330f1fe777e53893813e97d31574fb65380c66667d747b35846eaebbe70c2f4ef8f339ca416eef693997d237abf58253ddeca2bd45178fd8c4cf39e SHA512 84df45d7c57cdb272a887dd9d465ffe5cb93e7f5d7ec458b5458178a6c5583b3e786a14a6b4776eddcd4957566441256cdd119d83e9e0b5eeef6212cef2e8de5
+EBUILD libggigcp-1.0.2-r1.ebuild 625 BLAKE2B 0aa3fff7df61e1e3b30cd2ccf0d6c14b3a6699c6a2fa7eae2693b41940cf764bdc194f80e366985c481579a5886d20c00824233dc4582193341092dd7905e377 SHA512 27d0f8807d207c95d735d94de89612f39a798f8c8252153f4797a4d12b8f9b3258385f9bf5a3b2031b3547ed4c41f078f70b31b8c9e27a98f31f78d41f13d435
+EBUILD libggigcp-1.0.2.ebuild 537 BLAKE2B 085097b8c3bb994a0ae8629cf2dfb3970f50aff1b137c01c0f3751e87aa47f968ecd202fcb5f7f1fadd4791cf4a6fdb79d8810701448afe7be6b87765c975364 SHA512 f961d9066175d78b0f5a75b23b14de4871843d7229031cf5f06f6d54de5351889b3cfde234a7bc86f4dd9eb2d1717d38889796ccfe6e824664ca3bb6b84bacd5
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggigcp/libggigcp-1.0.2-r1.ebuild b/media-libs/libggigcp/libggigcp-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..f5f1281c5093
--- /dev/null
+++ b/media-libs/libggigcp/libggigcp-1.0.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Libggi extension for advanced color and palette handling"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggigcp.html"
+SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=media-libs/libggi-2.2.2"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README doc/TODO doc/libggigcp{,-functions,-libraries,-structures}.txt
+	doc/colors{,2}.faq )
+
+src_configure(){
+	econf --disable-static
+}
+
+src_install(){
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libggigcp/libggigcp-1.0.2.ebuild b/media-libs/libggigcp/libggigcp-1.0.2.ebuild
index ae928f370a3d..3ae8950cd253 100644
--- a/media-libs/libggigcp/libggigcp-1.0.2.ebuild
+++ b/media-libs/libggigcp/libggigcp-1.0.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
-DESCRIPTION="Library for General Graphics Interface"
-HOMEPAGE="http://www.ggi-project.org"
+DESCRIPTION="Libggi extension for advanced color and palette handling"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggigcp.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
diff --git a/media-libs/libggimisc/Manifest b/media-libs/libggimisc/Manifest
index 30804c4cc20b..ade83762d3de 100644
--- a/media-libs/libggimisc/Manifest
+++ b/media-libs/libggimisc/Manifest
@@ -1,3 +1,4 @@
 DIST libggimisc-2.2.2.src.tar.bz2 320084 BLAKE2B a63c6f3111fe577be4d75483982c4ea504f649b9ccff01ed10d6b40da3e36a5a6c44801e1dbca9f62fba67551c644607d90be0a009e4bc30a95638d822dff30a SHA512 1b4fcc7260d03a7f5f5b1679adec4904284f370ab428c4f3ce1a6ef9fe73b2c9b86acecbcc90a8375f2c271e82a07622782868a353dea55523b8f6a66ed05ccc
-EBUILD libggimisc-2.2.2.ebuild 768 BLAKE2B d7a1f2c1d195513d8967939bd2e57776fc14e004b2a53403f88f0cba3dbc56900f09662556b54f96aaf7c227e3a1d0333d00eba6b7476d150d09705b56d06de0 SHA512 8a1757b03d771b202e38aa3263438fa60937c8d2e6295873c67a529acb25a641b341701579e0b292c98447cc03f6e2acf99cc44bf74c06eb53d6be4549ebd743
+EBUILD libggimisc-2.2.2-r1.ebuild 860 BLAKE2B 372cd3bc4a36996d576a5894dcb7773d54052ed7b34245e36b4aa686d627844a88d39e2f62905f55af59c8e8003296205942c8d419b4360a66e9480ab1119193 SHA512 99c73c728728af794eb10f12d10863a06a3f901471ed3506d73988d81678b4be62ef6f17c9fc3322cfbb5ea1c2ea456555507b7465eda36f790ac7627646f9d7
+EBUILD libggimisc-2.2.2.ebuild 808 BLAKE2B 923be77909f7339823ef204e9a60ab3bdfc4e299799dff6f4aaf7b2127f7ecf01c3eedaceced3238e2ffff17edeac6a7666c5646b335edd3ae6f6a495ecf37f6 SHA512 4aa4eee8da4473bedd39d47cda9f3f213a8c79100cddf78343f331fd8a5fc0cb5aa17b1cc92ef48e005ac7b0670dab63993005d3c64e5d290d8f140f17718321
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggimisc/libggimisc-2.2.2-r1.ebuild b/media-libs/libggimisc/libggimisc-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..d163051ef487
--- /dev/null
+++ b/media-libs/libggimisc/libggimisc-2.2.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Adds support for some special graphical target features"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggimisc.html"
+SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fbcon svga"
+
+RDEPEND=">=media-libs/libggi-2.2.2
+	svga? ( media-libs/svgalib )"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README TODO doc/ggimisc.txt doc/libggimisc{,-functions,-libraries}.txt
+	doc/retrace.txt )
+
+src_configure() {
+	econf --disable-x --without-x \
+		$(use_enable svga svgalib) \
+		$(use_enable fbcon fbdev) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "X extension for ${PN} has been temporarily disabled for this release."
+}
diff --git a/media-libs/libggimisc/libggimisc-2.2.2.ebuild b/media-libs/libggimisc/libggimisc-2.2.2.ebuild
index 23876dbf158a..abf922bfdd7b 100644
--- a/media-libs/libggimisc/libggimisc-2.2.2.ebuild
+++ b/media-libs/libggimisc/libggimisc-2.2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
-DESCRIPTION="Library for General Graphics Interface"
-HOMEPAGE="http://www.ggi-project.org"
+DESCRIPTION="Adds support for some special graphical target features"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggimisc.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
diff --git a/media-libs/libggiwmh/Manifest b/media-libs/libggiwmh/Manifest
index 304807fa27fe..eac1b8db6c10 100644
--- a/media-libs/libggiwmh/Manifest
+++ b/media-libs/libggiwmh/Manifest
@@ -1,3 +1,4 @@
 DIST libggiwmh-0.3.2.src.tar.bz2 316669 BLAKE2B b14f8df0849bbe6e4a59d2285423238c3409bea3a00ecb066042df095ea8c7c4f75de9c4b3a79f0c1eacd436aae71b67be1e084dd23243dd3cfcaca5dd137077 SHA512 d12a9f158ba76ca8077568cd48f26f0fd8ab561b68cc33e74a8898f7fd594b417cd514806f827a63a4315c546bb35f5b71a5f54f5a2b54562f276e37146224b8
-EBUILD libggiwmh-0.3.2.ebuild 716 BLAKE2B b0f5e1f61d8d9f2d6a1edd20533ea3b03279fe51607f686e64831bf94f24ae98dc36e6d9928c2e981a2e2fc27f94dea5bfa18e09069bd75868f33dc4f5bbb554 SHA512 84aaddc0b71c2563f2794932c9bcfbda310026d50c6500b6db6df0a6a9bac00b5cf3b005f8a3b85d6d1383448d97375894c51fe1db71fd51ea2be0f19dfd09d9
+EBUILD libggiwmh-0.3.2-r1.ebuild 778 BLAKE2B e21c242a10c0c3aa834f1bf40f671331c8f1b0a9db5282dcefb6274c714ba64af60a0a5f42942f001be832c963308c76747475f4032ee9fb321f7b6c42cf3392 SHA512 3cad8908f3b186d14e90dc0726f551a09f44c27987d761b52c5449b613170c6c5e10eddbede34dd65d9403452075a398100466d9eed6e62a4e9e0d3b74307ace
+EBUILD libggiwmh-0.3.2.ebuild 742 BLAKE2B 5619df6c6a13d59149d7b3a6f7f8fd14d81841eaca9fe9794c6f7b9094ef4fc32e2c5494fa7b2e2656707a3fae0cacbd49c75d9f28275d621dfc527005c95391 SHA512 ee93e804304fce560d4dddb8fe05f615ceac8150aeda62b802df02da66125f1efdbe13b77c743f322ca3d2ba673d1abadad2d51d15593f990ea328ce668524fe
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..67cd8c2664dc
--- /dev/null
+++ b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Window manager hints extensions for libggi"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggiwmh.html"
+SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="X"
+
+RDEPEND=">=media-libs/libggi-2.2.2
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
+	)"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README doc/libggiwmh{,-functions,-libraries}.txt )
+
+src_configure() {
+	econf \
+		$(use_enable X x) \
+		$(use_with X x) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild
index 20e6757cda59..ae533a708091 100644
--- a/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild
+++ b/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
-DESCRIPTION="Library for General Graphics Interface"
-HOMEPAGE="http://www.ggi-project.org"
+DESCRIPTION="Window manager hints extensions for libggi"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggiwmh.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index ab27516aa0cc..155210afec40 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -1,6 +1,7 @@
-AUX libgii-0.9.0-linux26-headers.patch 419 BLAKE2B 703063f622eb6c71586a951097dd533b01d69a9865dff71011708d134798038dadb7c4f3bf3832800340fbfeb338b49736230220240ee06008eafa75df6eb96b SHA512 a6f6d04037948fd3f6d5bedcc28f7eb15f705205e204b767d6bdb30bcdcce289067bb54777a9676228db0269b96ee2ff17600a80ed795661680268f9e7fc91e5
+AUX libgii-0.9.0-linux26-headers.patch 422 BLAKE2B 630d1c98cc2e9b5424dbc41d2453eb1e8780ef46c217a38e4907f37c70dea859952114458d74299255b034ba3ca184b4105a850e1ec0ee1fd4229788fea4ebc1 SHA512 3686d3f33c3b40b24a5258d8bec158eae32ee86a14e98a05dfdff918c1c64f5264c87cb7072f4faa943e5630b2e5969fcc6acb2d9245c0f74e3b7194061f9a3a
 AUX libgii-1.0.2-configure-cpuid-pic.patch 451 BLAKE2B 2a19985eda7c5cafaf40d68b20338193996d18cfaa11639e31ea2c38c3e4eda5808c8efbbb39b46dd9ad2570adabf0195b287c9307a603c2e5497e6f5dfb1074 SHA512 94aa2b1996ac7ccc1275853c72bda6a0f050c79010354d87dd551484c8bf3fb8eaa2cbc6b13620cb317bddc9da938c3106af71e2f0da70f9b62db7e27c404743
-AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 376712dfee05976fb9bd14e5fff31ab59318c963422246165bff8ff7d65ccd497e24b618b8d10477a9490b52fb87e5d297f9dd823696e7fd193c777e5ad275e9 SHA512 bae66a72ba24409222e9836baeca654b88398c2ac5df4008787c649e26ca87c6c0ca86cf703cfc5d16f3f55d3ae182afd3d93793e99797d597b464a940170c7a
+AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 32d18ef7cfa6e14be36e8eeccf321a988990b3f48caa422ec07988dd8cde0d4c5c1ae7233700c696e45933b56f7555a1b00efd1062be1f4f5d73074b1695cea7 SHA512 c7c2d3cd91ba91cdc60778f5d599f2ee428c3b41a213193f733c4fe86b8e2a778009f8816d6314ad7519e5732065cf51016441306bb05f7ba669ef4000769312
 DIST libgii-1.0.2.src.tar.bz2 701099 BLAKE2B 29e23c4f0b0045e05dac855bba10d03e5b38cc3b2fdd494892c52954b4c4bbd990148aff98540bef73048ae26bab79db3369e7731707bfa4eab2b39d256681ad SHA512 d45b236e08bb8c6a7a7741ae694650dfc5681712a174f923c9132c41acb388d0d6dbc5589104a7a6bc73c98088f2b5967ee726d83c1f3e913602661c8d30bf07
-EBUILD libgii-1.0.2-r1.ebuild 1165 BLAKE2B 996561072a1f39a91689829d56b439d76cc79627dfd0e83f32625267e3786f276b546ed04a0dedd7c750a23a021ed02a585834739b9be3457721ae09a1c7e5f3 SHA512 9fb1072389744b3b7334e373dd8fc4eaae5388b2eaa786666b2eb53ed0c150cc3bde407fc3cc4668faf95f7a72e1ac15347a9a38daad03aebcb50f6fc026946a
+EBUILD libgii-1.0.2-r1.ebuild 1155 BLAKE2B 4ac207317deab100645039dd0635fd754d85d5a87ca549b96d82f90338aaeb8760da250e623fd12f6a0c8759b498ae812ca7d54fd7a85b15c968054d05116ba3 SHA512 c39b140534146d94c2109dd17896e66e31dd4174deb440e83d2d1415fbe2378aff5d6836c3b2103dbe03e172795839a12c604798f7c6ad08606f9aa3bb412978
+EBUILD libgii-1.0.2-r2.ebuild 1268 BLAKE2B 4fee5252b99104efa4b6c75257b138755feab9e29c8657fe5c7a122d2647400501056406435d7b24a03d0c833919b428a979f8736a584c29f40d84bbbf4832ce SHA512 63040b95731d7f12aa63b0fe3990c5741fbe57e80132aa772c61177b420381d1777e75778c5bc1efab2def608c6d1226a3ddbef75f7a0858ad9fc84d079e6598
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libgii/files/libgii-0.9.0-linux26-headers.patch b/media-libs/libgii/files/libgii-0.9.0-linux26-headers.patch
index ff77c33c4e9e..f46b6ab8cadf 100644
--- a/media-libs/libgii/files/libgii-0.9.0-linux26-headers.patch
+++ b/media-libs/libgii/files/libgii-0.9.0-linux26-headers.patch
@@ -1,5 +1,5 @@
---- input/linux_kbd/linkey.c~	2002-02-23 06:51:05.000000000 +0900
-+++ input/linux_kbd/linkey.c	2005-03-28 12:05:43.000000000 +0900
+--- a/input/linux_kbd/linkey.c	2002-02-23 06:51:05.000000000 +0900
++++ b/input/linux_kbd/linkey.c	2005-03-28 12:05:43.000000000 +0900
 @@ -25,8 +25,8 @@
  ******************************************************************************
  */
diff --git a/media-libs/libgii/files/libgii-1.0.2-libtool_1.5_compat.patch b/media-libs/libgii/files/libgii-1.0.2-libtool_1.5_compat.patch
index 851216540b47..f71add4f510b 100644
--- a/media-libs/libgii/files/libgii-1.0.2-libtool_1.5_compat.patch
+++ b/media-libs/libgii/files/libgii-1.0.2-libtool_1.5_compat.patch
@@ -1,5 +1,5 @@
---- configure.in	2007-01-16 14:52:56.000000000 -0500
-+++ configure.in.new	2008-06-10 15:40:14.000000000 -0400
+--- a/configure.in	2007-01-16 14:52:56.000000000 -0500
++++ b/configure.in	2008-06-10 15:40:14.000000000 -0400
 @@ -12,7 +12,7 @@
  AM_INIT_AUTOMAKE([libgii],[1.0.2],[-])
  
diff --git a/media-libs/libgii/libgii-1.0.2-r1.ebuild b/media-libs/libgii/libgii-1.0.2-r1.ebuild
index 7d9e41b79dbd..043293c47a66 100644
--- a/media-libs/libgii/libgii-1.0.2-r1.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,8 +7,8 @@ AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-multilib
 
-DESCRIPTION="Fast and safe graphics and drivers for about any graphics card to the Linux kernel (sometimes)"
-HOMEPAGE="http://www.ggi-project.org"
+DESCRIPTION="Easy to use, but yet powerful, API for all possible input sources"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libgii.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="LGPL-2"
diff --git a/media-libs/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..6de82d2c8483
--- /dev/null
+++ b/media-libs/libgii/libgii-1.0.2-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Easy to use, but yet powerful, API for all possible input sources"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libgii.html"
+SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="X"
+
+RDEPEND="
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86dga-1.1.4[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0-linux26-headers.patch
+	"${FILESDIR}"/${P}-configure-cpuid-pic.patch
+	"${FILESDIR}"/${P}-libtool_1.5_compat.patch
+)
+
+DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README )
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/ggi/system.h )
+
+src_prepare() {
+	default
+	rm -f acinclude.m4 m4/libtool.m4 m4/lt*.m4
+	AT_M4DIR=m4 eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with X x)
+		$(use_enable X x)
+		--disable-static
+	)
+	econf ${myeconfargs[@]}
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest
index 037fc1536a49..dc5f179f153e 100644
--- a/media-libs/libgroove/Manifest
+++ b/media-libs/libgroove/Manifest
@@ -3,5 +3,5 @@ AUX libgroove-4.3.0_cflags.patch 1872 BLAKE2B 87a696b844394659d29bf586231519064e
 AUX libgroove-4.3.0_ffmpeg4.patch 2037 BLAKE2B 851cf22e93e2e5700b30c023d24b00db0852b36dd30665d655cdb3402c9d0ee1e286bc1a19988f992d8913560f6f943890cb7c993e2fdb798b23df4a1b0801da SHA512 834f760a7c7b51abda55f65d6fad1ce771d293ace9c7e4e39aaf5bfbc6763f9e3750e0aa3e8e6548893593b5c776bce357d557080b946b3425339367f21f2790
 AUX libgroove-4.3.0_sdl2_include_dir.patch 507 BLAKE2B d96df15e5378f8ab7d2f473c0fe05a210959eeb0ec4548bf7b03b3be701cce263d3c5d91c85834b18b2426e1c3de7845abc5eb069e226429a4d7ae67809f156c SHA512 5c9954680369c9e90a5acda70da36a57ea64ce8f44fcb5a0f962636cbf710ddd968c7c7bff18819671b6b89dc68a0b9513b8223ac7ba9bedf8f005b4485272ac
 DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705
-EBUILD libgroove-4.3.0-r1.ebuild 1177 BLAKE2B 65a597cf4f2564f0fb9fb3800d90e82e6fd789e683e95a63fdc0de13b50dad1a7d71b6cdabfc3b79253bb962d4d07435d051b44e04a83675db355201d48dde12 SHA512 b254cab5750412e33291c7c129f8215533bdfc8a44c575d33302d66dd5c8bda55f4bcb5fac83f75e87db99dba3ca3d5cec5cc5cfb8a44dd44a350bc9c3e24618
+EBUILD libgroove-4.3.0-r1.ebuild 1152 BLAKE2B 8999342893cb791a789a1df0e513815700a083c2c91a2f4c4f551d482284b409013cd3896382754d3e8653ced4131a11eefe36b3be6a93b1aed9a2d3bb10a2ed SHA512 ca437c9ffb94c74c1befdd9dc44d2ce3373788f6c43acbc0baa1f454a212449865b737c359ea9c0c066ad2a51b4258f1ec6f6c40f2d21522ae9ca4c7be62aadc
 MISC metadata.xml 1202 BLAKE2B 4949a299d75c9e9d7bd40df94fbe3fd16c608d0110ddad43fb5717751bb0ed174c7be81b1913ad2313b7b7a8627a3c079bc125e5d50a8a0544ea961e7c89b0cf SHA512 1173c515ba13bec73cd60fc78b5b9936d47563c89cf2968ef49eefca4efa8c75badbc1cdb26cf8cea8c7737e7972f9d236009b829ce5fa9f07875bb7db003ed3
diff --git a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
index 9aac876f1dea..f780eb9949c5 100644
--- a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
+++ b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit multilib cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="Streaming audio processing library."
 HOMEPAGE="https://github.com/andrewrk/libgroove"
@@ -14,23 +14,26 @@ SLOT="0/4"
 KEYWORDS="~amd64"
 IUSE="+chromaprint libav +loudness +sound static-libs"
 
-DEPEND="libav? ( media-video/libav )
-	!libav? ( media-video/ffmpeg )
-	chromaprint? ( media-libs/chromaprint )
-	loudness? ( media-libs/libebur128[speex(+)] )
+DEPEND="
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:= )
+	chromaprint? ( media-libs/chromaprint:= )
+	loudness? ( media-libs/libebur128:=[speex(+)] )
 	sound? ( media-libs/libsdl2[sound] )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}_cflags.patch"
+PATCHES=(
+	"${FILESDIR}/${P}_cflags.patch"
 	"${FILESDIR}/${P}_sdl2_include_dir.patch"
 	"${FILESDIR}/${P}_ffmpeg4.patch"
-	"${FILESDIR}/${P}_GNUInstallDirs.patch" )
+	"${FILESDIR}/${P}_GNUInstallDirs.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_disable chromaprint FINGERPRINTER)
-		$(cmake-utils_use_disable loudness LOUDNESS)
-		$(cmake-utils_use_disable sound PLAYER)
+		-DDISABLE_FINGERPRINTER=$(usex !chromaprint)
+		-DDISABLE_LOUDNESS=$(usex !loudness)
+		-DDISABLE_PLAYER=$(usex !sound)
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index c96c35baa398..a1385f74004f 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -5,5 +5,5 @@ AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810
 AUX mad.pc 211 BLAKE2B 3b8678e667461caa6ddc2479687d92a8bab9e7e05be73640e63c9eaf070fcd69d9e26dac1d5e753171795236f5a461c7f59ad46e899ea3227902b9773f9bcfc3 SHA512 ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08
 DIST libmad-0.15.1b.tar.gz 502379 BLAKE2B b00de857a0634d7193f656b74cdd5c0642b674f3ee3303a642f8a6fcb64eebaf2b100c6e09d85d892880b5fc4f224c0a5d1ecf5bd95bc5caf00e959c7beac4a5 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
 EBUILD libmad-0.15.1b-r8.ebuild 2262 BLAKE2B 83fc39bdfc1c0b0da64c42f3e46c2a38d627415c37ee04a587e73b5e6cbbb12bde3209dae4132a8057eba9db16439e92c190b42f2708193638d188c7ff729ff2 SHA512 bbb6344c0e0c5d6644d14d09c3c4cfaa9b8837c37e27a16232cd0d10af8776e099ca90b79939a077c7a4f8e86f17171a17ce323240c7c65a507bccaa9537b052
-EBUILD libmad-0.15.1b-r9.ebuild 2213 BLAKE2B c588af11ea6b22a4ac5f5fbb18f85bfc3bdbbd2e7010945c0697823a9cf6c8d9da86b74fb71a5e2192d2b7a9a85934e6429cacd793515758c6f17885e24b9b35 SHA512 f32f57cca05a0abf2d4a237c05fe5178a21c32dc0d41ea14e295e8ebf6a02d5a4967880cf3e7e4964978592aed682d29adf9aeeb6aafcb9bf7d2f688ff58e079
+EBUILD libmad-0.15.1b-r9.ebuild 2212 BLAKE2B e79813887af626d590a748c39c1da72e529154a6d2eaa1b40d5e65cb04d342d4c4df8fbf77092c2f37b6978edfd0b5dede657d3aab3c1f19afd204107714837d SHA512 450b9c5a877d9440ff61dce7c8730f4618f225959b6b1c68e3aabcd03ad08c97d661ca2bdbe735c44493379e7be1e5576c3d0389c67a96b93c8106cf9bf29a43
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
index 42745664ae16..9d408b7cc86b 100644
--- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 DEPEND=""
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 20574cf16264..132f2efeb894 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,7 +1,9 @@
 DIST libmpdclient-2.13.tar.xz 56964 BLAKE2B fdd393543ac3c15572a6f6d56ec0113dae301c90e852620ef4e17ac6bee1a26eb20580859ea59cb78d6ff7b5b9fc9e5374d407e017c35bf767a824fc7a6612df SHA512 a2aa4e1e4fcb4ab390a0a38e745e59a9764c40bfcd07d449fdc7fef7b0c5fc0c2e795ef545b6fa6d62c00861d306cab41ea43011510ad1e3a60603873a3c1b28
 DIST libmpdclient-2.14.tar.xz 58268 BLAKE2B 0152b34cc29e5c3c96136f00ea5ff3dc1d60f64ab6e8aab2b6ada0fa2d90742b32025be85e12703057a00014d72c035177de03345f9c16e151242a26eee9e314 SHA512 50bf27a739ca784d5f182cc90b24fad4dbc35752e455c1ce7c2fcda78342bac5480927af199c7f790feff136dc1fe16e4eb19803ba5760ec508ba65c9737e13a
 DIST libmpdclient-2.15.tar.xz 59212 BLAKE2B 35ca605681c98d1aa97fb9ef11b8a29244cab7ccb3d5743b5f7e49e4dc3ef28b8c14534ee793af4a76ea5dcb01487804d9f08d6ecaf6d7b80c5b37bf157408db SHA512 244b89f4976b62b41c95263479771162d9c059808aa143efc9fa0a092e110b9be98ce1ab2bb1ae100b15019df826b9a8e510e3819e3fd89f6d664deea3c6260a
+DIST libmpdclient-2.16.tar.xz 60480 BLAKE2B ef7a077195b08f24304e08701a303a6709f71792112b096b0e1741f550f215352936f30e05f4afad29c0f7a5e4340e87de6d7fd8cfcd4c27f34eda91c7d21891 SHA512 520568f61cee447e48c04075d212c46e9640fd3f82604a5b9f4c6ded94eeb4a841e857e44e9f4edad12d93c1052692e7d32d3dbf505d4c0cde6cc217cff0cae5
 EBUILD libmpdclient-2.13.ebuild 1048 BLAKE2B 6339e52139ffea93ff33196139693a87dfa7ed2346dcf8e46be6eb161e77f9da1668f37a748acb0b8ff1004a22d28f917a0ba9f8276b0b1357ff95192b0f0132 SHA512 f72f00afc0e4adf5ce732c58f0da02d13e06b44433746d9b4882e269929ee8bc95484abb12fe0062f625c58931a8d365fbef4c61c7c5e6335798a1efaf703edb
 EBUILD libmpdclient-2.14.ebuild 1054 BLAKE2B afde1ee289bd6bcb7d8ecfee925d2fe1731305d9d6503645aa855c409e0580c3ef69eff7f026a02fe82e2b89389e50a03d17912538e2df01cf966987ebc11736 SHA512 f621f7c78b0127cca2afb53f94fd6a820aadf20f3ac357bd190cc3cda74bd24d647bf710b1ec1afe5f9c49b9cd113cae4efe914ea3d4c80c9d21999c7bb9b4c8
 EBUILD libmpdclient-2.15.ebuild 1054 BLAKE2B afde1ee289bd6bcb7d8ecfee925d2fe1731305d9d6503645aa855c409e0580c3ef69eff7f026a02fe82e2b89389e50a03d17912538e2df01cf966987ebc11736 SHA512 f621f7c78b0127cca2afb53f94fd6a820aadf20f3ac357bd190cc3cda74bd24d647bf710b1ec1afe5f9c49b9cd113cae4efe914ea3d4c80c9d21999c7bb9b4c8
+EBUILD libmpdclient-2.16.ebuild 1051 BLAKE2B afaea12993515d091fbfbef4a35d20ec5297f5912bacf925fe998aaa21a86e44a05fc74f9e6d5fc06427cb7ee5ff6cc4516c11a82ddc5b11ac4875597e274e5c SHA512 afe1c98f8d2c92da1a1f68280955a464a057a5b630049bcf1f9109cb5d1fc84887df8099df85dd0b1522a694b5b132dfd13e1a4acaa4433830d759ac4811cae1
 MISC metadata.xml 348 BLAKE2B 6c3a4f4924ca11d41c0c7fdcf062dbfd43f23f1181a83d4154a4a36a015999786962adb716f751e046127d37d2b88649b2ea9968330a85ae8f9307a96c7d9f96 SHA512 75efcb39f67cb2dfe31846b08e9daa02845a07006fe2002f43feabee680dcc57bd41a0fed3bbfe9e184892a5adad64efd3ed83931a91b924739355ec689f5b00
diff --git a/media-libs/libmpdclient/libmpdclient-2.16.ebuild b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
new file mode 100644
index 000000000000..0b5cef2b9dc9
--- /dev/null
+++ b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples test"
+
+RDEPEND=""
+DEPEND="
+	doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+"
+
+src_prepare() {
+	default
+
+	sed -i "s:@top_srcdir@:.:" doc/doxygen.conf.in || die
+
+	# meson doesn't support setting docdir
+	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+		-e "/^install_data(/s/'COPYING', //" \
+		-i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=$(usex doc true false)
+		-Dtest=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	use examples && dodoc src/example.c
+	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
+}
diff --git a/media-libs/libnsbmp/Manifest b/media-libs/libnsbmp/Manifest
index 572e75e125fc..8fa0ee38e112 100644
--- a/media-libs/libnsbmp/Manifest
+++ b/media-libs/libnsbmp/Manifest
@@ -1,4 +1,4 @@
-DIST libnsbmp-0.1.4-src.tar.gz 462626 BLAKE2B 20e00640f6e693a499adb087443c565ea29e89d6d70afd8ff0755f5d14bd9123e411c9e50c4863b07e43edb254515c5125a0b091585ffaa7be3231e2f42a02bc SHA512 b3ca907ae59e2bbcc8d26f083b5544589d87403116aaa6000c3527e886ae18841b15ae2d6b014d52d6cf2d62ecd67d22bdcdc9d6f4e2732a39ed7d361319c78b
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libnsbmp-0.1.4.ebuild 426 BLAKE2B 8ebef27cc37329a7a77369473e23037ad62136ff1c60627c01ae3f30e1c47c500ffaf3de9c032856ba28600b57e5ab75ff944ce4f04c102b7749e83127720993 SHA512 e3fd8190e2901422db0f7bb4ccb29ec8f71b14f2810cdc9dfc74a8c2fa45cf7572f60476cab2f4df8be9920faeda5b7c9b851442891c77d9ffc910b7289ba287
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libnsbmp-0.1.5-src.tar.gz 463299 BLAKE2B a9aa4f682262c4bfb5007c623e3da324f9ce2ddb732737b8217def899e8507ae41589607a1e0b71b34190542981ad4286f64f87795f0043049626c101001fd85 SHA512 2998de98db05a04fb860fdea258961d66aebc78d58614054311ed4cafa2f265472ad19789ab1e343d39ca293e0a304baee4941bd04948d9cc7c39bdadb0756e6
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libnsbmp-0.1.5.ebuild 514 BLAKE2B 52547b69038b98714b0cee0953a13af5311fbfcefc9efe27c3993c9124a7c5e806355dd9b7182b5a10228bb8778c5529aa5055225e1f09b64e1bce93e38af388 SHA512 ad0e0d1a3659cd55aedf35db47fc5d29029e9ae6b63a8ae6033243cd89f8ff30e71d6e62459b16a61587c975c419fa38fdfad3c59417fbca1e8c34f56e82d8ad
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.4.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.4.ebuild
deleted file mode 100644
index 67fdaa9448e5..000000000000
--- a/media-libs/libnsbmp/libnsbmp-0.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.5.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.5.ebuild
new file mode 100644
index 000000000000..aef68809045d
--- /dev/null
+++ b/media-libs/libnsbmp/libnsbmp-0.1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/media-libs/libnsbmp/metadata.xml b/media-libs/libnsbmp/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/media-libs/libnsbmp/metadata.xml
+++ b/media-libs/libnsbmp/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index d377c53caf09..c04f67aa833c 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,7 +1,4 @@
-DIST libnsgif-0.1.4-src.tar.gz 242078 BLAKE2B b70249caeecf3deb80e16491062a41a70771118179a07e43302203c84dd9bcebbb85ec1dbd3b592141f509d6413e72f86aaf6beaf8a86bc70b97c2f164ad526c SHA512 7b6e57b32d26ebf04cd5c39ebdb9e4dd134caebd7e7e9da9f365250ec320873bcae685b7f1a6099c41ec3ac060ca986d8ebd44fef69a9f726f800d62eb9dbe20
-DIST libnsgif-0.2.0-src.tar.gz 268300 BLAKE2B 21ddbb258113f1b7aead4d5c09dd4a50403bac0e3f12749670d6de64d4505cf53d01f2bde4485036b523b68a1546acd8f7ec67623912ddf2bbe8bba8d666bfc2 SHA512 4c021e91b55c55e9f275c7a2b38de2480a8280853e373cbb6ec19487c5aa711cb5e88c9a244f8656265e25948105740b0032822e0a0c7de1865b6ffb87eb97a7
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libnsgif-0.1.4.ebuild 415 BLAKE2B df8b5f6a6173c0a4ac9ae86053548ecdcbfdeefc63f1a578ad189f3a6ad23dbe63a78d405abf51f311800901240381f14cd64ac57c4e80dc0ed9e50c11b5838c SHA512 faa009d2f31e6d55f60ff98f524f7898fc5f5cae9996b420be6b520fa3f27984e5c5d256ea56f1beb4c583865aec70e2820ab4ad101ae1f4b8756341c6ba9905
-EBUILD libnsgif-0.2.0.ebuild 548 BLAKE2B 023f1ae0a5257597e6ef2d9243857ec90cd54c93f28dcd3d7189c961275b16fa6012113b0ee2e29f9aec00fb8586aff51223542de512a85282b5af0f91af5ea3 SHA512 c206216ab8f1257eb285ac9e190b5f479daf404d5c21bd8a534415a4b735b4d750b280a30dd2a7d10ee0e014644b1da38e339bfc19bc017104656955313d859f
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libnsgif-0.2.1.ebuild 596 BLAKE2B 8bcf454dc04e0a1c68f80dde52b7a486163a3bdde3134ae239a1f1501ee12e1ea65bdf4e181be39680b46586929c1bff271b9548231cd545375a81c99e117818 SHA512 2758805a709be3dde95505a09f89d13838758912c826262607231fcb95101a8c01dbaed2f343f2939f7270d24eb671c3001aa74dcaa7cfb23bda7700f060f252
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libnsgif/libnsgif-0.1.4.ebuild b/media-libs/libnsgif/libnsgif-0.1.4.ebuild
deleted file mode 100644
index 727a4482a0a4..000000000000
--- a/media-libs/libnsgif/libnsgif-0.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="decoding library for the GIF image file format, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
diff --git a/media-libs/libnsgif/libnsgif-0.2.0.ebuild b/media-libs/libnsgif/libnsgif-0.2.0.ebuild
deleted file mode 100644
index 60e45209c367..000000000000
--- a/media-libs/libnsgif/libnsgif-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="decoding library for the GIF image file format, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i src/lzw.c || die
-
-	netsurf_src_prepare
-}
diff --git a/media-libs/libnsgif/libnsgif-0.2.1.ebuild b/media-libs/libnsgif/libnsgif-0.2.1.ebuild
new file mode 100644
index 000000000000..55c0a619874a
--- /dev/null
+++ b/media-libs/libnsgif/libnsgif-0.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="decoding library for the GIF image file format, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+		-i src/lzw.c || die
+
+	multilib_copy_sources
+}
diff --git a/media-libs/libnsgif/metadata.xml b/media-libs/libnsgif/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/media-libs/libnsgif/metadata.xml
+++ b/media-libs/libnsgif/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index 4e351da1bf14..b69964835672 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,7 +1,4 @@
-DIST libnspsl-0.1.0-src.tar.gz 299718 BLAKE2B 77e7cf73aa7c270711d400bfe56db0e8fcfb3dd77466fd1d12a9ddfaf8c6be534f44b13bf80589f7b7e002b46381eb184d3f5905b36f1cee842eeaebad00db83 SHA512 de850ee3d94ebcc243c73ee1f8c80f2bb3ab10459023594157876f9e18a27bf13d16417dc68a68a58f34d412b7b607b5240cc28e78b7bcc3027668e3e99f9b55
-DIST libnspsl-0.1.2-src.tar.gz 305693 BLAKE2B cb4e0bafab35049112823bb95216ff3ba5ebb522eefa4e5b7a97ecbefaee52c2670eaef03fc56055cc57081dc3c952d964e6555e359fc1007e1b378922eae06a SHA512 99910674b8685476fd8be995b3436f966f0b8351596eff4152dc9aa0dd795b634b57ba6d17ee866f8947fbb9002f2237936f29ea9c5d9b4ec6a4c7b07c64de44
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libnspsl-0.1.0.ebuild 417 BLAKE2B 7423cc8c3f7886a3f323b17f6912803336de4256b7f45bf656f7278512c51ff13fc6c361f7651cd9e48bf14332a9462408a79723c2cce83f49282e5c5f9ac70f SHA512 a89db3345f6412704e20ea6c69797d8d3f251f37ad6fd504cd3e55c2bc3aa653ee20bef0ea08a4d9692065704f6994d469338378d7cc6eb46d9a6c802d3c1538
-EBUILD libnspsl-0.1.2.ebuild 417 BLAKE2B 0fda39b9d0b9d9c758072919b8bc60e3e9dc895c6b70349979b6ad0249656650ee85c74b740ffc9d64af53ae28c85a4dbf05d13b0d2b82326233a45803ba2e90 SHA512 68f6e7857abe61c414e9d89dc4916881d933bb317056445c2daa48e286fa20208fcac9cfe165de197873d17f5ba88883adc41ef0074e4630cb6cfd63ab883d29
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libnspsl-0.1.3-src.tar.gz 311065 BLAKE2B ef846482c677e98a9eae646597e893f4e94161a60482127a88440a3786d2f9e3c4458a823ac878c64bc7d1b00080653facc28f408d2a44b571835958966297af SHA512 da4069dee152d126d53e442c8ced1438707db1ccee779bd2abe752a8d1dc30e40036037674e220bb24adad49fe406633e0d07e5d29d209b9fb223107c0e89415
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libnspsl-0.1.3.ebuild 505 BLAKE2B 21a8cf413c9bfec9c96af6f03dd8f858149f7df1bff5a452728b78a4428bc034fa8f480660d76bdbdf311cdc1a3a552703276340b7385b29f427cd8f9774d02a SHA512 c20d17e999d3636b80dfe036aca368e83e45cae4db9e46164878c4c3688ee14a11b57a240223efd46f1f2c716425183dfc337f3e077984c9584212b010ecc2d3
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libnspsl/libnspsl-0.1.0.ebuild b/media-libs/libnspsl/libnspsl-0.1.0.ebuild
deleted file mode 100644
index 84dd9c24e0a2..000000000000
--- a/media-libs/libnspsl/libnspsl-0.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
diff --git a/media-libs/libnspsl/libnspsl-0.1.2.ebuild b/media-libs/libnspsl/libnspsl-0.1.2.ebuild
deleted file mode 100644
index 43ff354386db..000000000000
--- a/media-libs/libnspsl/libnspsl-0.1.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
diff --git a/media-libs/libnspsl/libnspsl-0.1.3.ebuild b/media-libs/libnspsl/libnspsl-0.1.3.ebuild
new file mode 100644
index 000000000000..1ed50ca57f22
--- /dev/null
+++ b/media-libs/libnspsl/libnspsl-0.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/media-libs/libnspsl/metadata.xml b/media-libs/libnspsl/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/media-libs/libnspsl/metadata.xml
+++ b/media-libs/libnspsl/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 514b42e2d353..4be3af3fe327 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,9 +1,7 @@
-AUX libopenshot-0.1.3-fix-tests.patch 1084 BLAKE2B a3bfa594403f36e37e7cf5078d7975384a5e0af3dd4fb1e2cb20b969b4fa5554e5dd6a8a9a55d7f4e76a23cfb5c9e3f04a01786b84c45dd8854a6757fdc35d5a SHA512 412320163c30bc4ee6e9dbedeebae37d6fcb71023c3513171f93d6108c53df2e0dd6e0e31657f9c16f3206356c876ddb9bb84abf3ec7f036997dbdac43139d92
 AUX libopenshot-0.1.8-fix-tests.patch 1073 BLAKE2B 1ee4f19a3251924c688c49059a55510e620df9f2cdfd30bcd23b32e3cd1b4a8b1976e29837322f3ea1bb74e88a69aab60f6fdcf39747ce1e34a8d76654d6539c SHA512 0adaae336fe5d8a8eaf74b5c0b39eeb6845c54d60d506eb6ba24238a1064c536c0d1e903a673175c3d498bb6c1926a4ff1d3fb1d2d1c6d00dd8059bae3dba157
-DIST libopenshot-0.1.3.tar.gz 11019740 BLAKE2B a706889f709024300ef79518406da861111a8445b5ce23364b8492a72e74e7944c88ba9b4a29da356ca21500253d19e8c32abe7b5aaa0ac35bebec85e52ba970 SHA512 d59817505812868db408a88dc1d30b5b1833910f45dd0df03937110b7d4cbd85a270773008e75a1501f4b3b89a09ea798ed9b580755adf3ae79ac24d403f6982
-DIST libopenshot-0.1.7.tar.gz 11022594 BLAKE2B f3e0836ebb6dd89ce42085dc9d18dd3bce9ab3011550958bec41eead2c62b454459d219d2efeece1a43eb0536cb99866eaf9b478205d717da4c173e954772a46 SHA512 4c8871ff30c03a14766e35a64052695768311afd81ecc55598720ad146f53c122ef3b1293467670f7dd48da77bf6cb4f4f14a18c298a649b8827f901ed653709
+AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 DIST libopenshot-0.1.8.tar.gz 11019495 BLAKE2B a86994a09328e24705fe06ec3c47cbedb89815e6ec1440237dc58babfc066655f1c7dacc19257b02b645a9415c63cd4e0c1191fa452b7632cf531d98a1b073c3 SHA512 02630d7ce9fd378ad648d034622d4f971728a2074691d7facc8a36dcd52b87c1372dd5a9588c0ba852589105bdbf78941083fd6b1eb1bcc0a33d4ca49634162c
-EBUILD libopenshot-0.1.3.ebuild 2138 BLAKE2B 97297a5c170ad398c4c9df91ba503493f2c335beadf2414595fa29f2bba80e4ab9e229d7b0bb71271e8ed52b5ecccecb9a49d3c326b22baba82baa38193667fa SHA512 7b6b6ae56d2a89d4fc899a989ae567f91269566e8c979a1763a351bd149747d2e45b93b5ef6b429cef9d57eb09830883d6b45e552d8b479e3f9f692b98ccf73c
-EBUILD libopenshot-0.1.7.ebuild 2139 BLAKE2B 1a68511d4bcfe9d0ee5d55a7ebec2ddc36c7ff6d43e527cfc256ad6af6bd5e26203a7de738d797de17fbea0245f67b104a5360b550fd945d24e7930eef5ba48a SHA512 2d6b2ff9d9818b2b59cb55411ab430fe0bb6b56a03bbfbe671f7dc6455ef787807677545534a3c601ce38a18d0cee46ee8a8bc951c0734f5e75dfc3bf9f40a3d
+DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
 EBUILD libopenshot-0.1.8.ebuild 2185 BLAKE2B 34b9556926c8f76c570a470b34dd66d2e722e712a557536b6d7c01a45493eb5e0401962d03ebb9a4633e232330d3c621ba42718fd968f58d2ce755e76bb42f98 SHA512 1c0d40239e19214ac3a0162f75e07180aebb94bf79da82e6f3752a2d5a9cf794a4babeab17fdd2160899a2a60bf46d36292b3f305502238a954adf4872fcdae5
+EBUILD libopenshot-0.2.2.ebuild 2211 BLAKE2B ed168c1fc226da7f3d237836e5225f992f52011ec92175bb6a88862c436b0c8063f218eb608477e169a3ce0051f678a4534d8160ba446b9bec3b1073530268ad SHA512 e320c0ec38d3bf9414bd5c549ad89b3319a3f2a493ed818e43155caf17f76792ee0a669ff12b4786c2f5415140c06ac97d96864bc8e507342bb44f07c8b150d9
 MISC metadata.xml 374 BLAKE2B cc763fd4cda8c70fc654d85ebaa8a3b748499308a4633c6f70aeef1cbb767f5b5eaad0f6c4402a74862e8ebe392b6862722835e92cb53ef4b88a9cc87b2315db SHA512 2a1810910f38b67624eea2d8778c095bbe884cf8a06ababaf595a295d8fbb904e13a809ccc888b8d5956e87a2ddf1295982133741596a08e713f9cbb6a6347ba
diff --git a/media-libs/libopenshot/files/libopenshot-0.1.3-fix-tests.patch b/media-libs/libopenshot/files/libopenshot-0.1.3-fix-tests.patch
deleted file mode 100644
index 8ed3102b7adc..000000000000
--- a/media-libs/libopenshot/files/libopenshot-0.1.3-fix-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 29fbe45..ff67cb5 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -24,16 +24,19 @@
- # along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
- ################################################################################
- 
-+SET(TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/")
- 
- ################ WINDOWS ##################
- # Set some compiler options for Windows
- # required for libopenshot-audio headers
- IF (WIN32)
--	STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/")
--	add_definitions( -DIGNORE_JUCE_HYPOT=1 -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
-+	STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH TEST_MEDIA_PATH)
-+	add_definitions( -DIGNORE_JUCE_HYPOT=1 )
- 	SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath -std=c++0x")
- ENDIF(WIN32)
- 
-+add_definitions( -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
-+
- ################### UNITTEST++ #####################
- # Find UnitTest++ libraries (used for unit testing)
- FIND_PACKAGE(UnitTest++ REQUIRED)
diff --git a/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch b/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch
new file mode 100644
index 000000000000..bc5f738d7f63
--- /dev/null
+++ b/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch
@@ -0,0 +1,78 @@
+diff -Nru a/include/TextReader.h b/include/TextReader.h
+--- a/include/TextReader.h	2018-09-22 21:47:46.000000000 +0200
++++ b/include/TextReader.h	2018-09-23 16:17:21.212888285 +0200
+@@ -91,7 +91,7 @@
+ 		string text_color;
+ 		string background_color;
+ 		std::shared_ptr<Magick::Image> image;
+-		list<Magick::Drawable> lines;
++		vector<Magick::Drawable> lines;
+ 		bool is_open;
+ 		GravityType gravity;
+ 
+diff -Nru a/src/Frame.cpp b/src/Frame.cpp
+--- a/src/Frame.cpp	2018-09-22 21:47:46.000000000 +0200
++++ b/src/Frame.cpp	2018-09-23 16:21:44.921563711 +0200
+@@ -29,6 +29,9 @@
+ 
+ using namespace std;
+ using namespace openshot;
++#ifdef USE_IMAGEMAGICK
++using namespace Magick;
++#endif
+ 
+ // Constructor - blank frame (300x200 blank image, 48kHz audio silence)
+ Frame::Frame() : number(1), pixel_ratio(1,1), channels(2), width(1), height(1), color("#000000"),
+@@ -904,7 +907,7 @@
+ 	// Give image a transparent background color
+ 	magick_image->backgroundColor(Magick::Color("none"));
+ 	magick_image->virtualPixelMethod(Magick::TransparentVirtualPixelMethod);
+-	magick_image->matte(true);
++	magick_image->alpha(true);
+ 
+ 	return magick_image;
+ }
+@@ -926,13 +929,14 @@
+     // Iterate through the pixel packets, and load our own buffer
+ 	// Each color needs to be scaled to 8 bit (using the ImageMagick built-in ScaleQuantumToChar function)
+ 	int numcopied = 0;
+-    Magick::PixelPacket *pixels = new_image->getPixels(0,0, new_image->columns(), new_image->rows());
++    const Quantum *pixels = new_image->getConstPixels(0,0, new_image->columns(), new_image->rows());
+     for (int n = 0, i = 0; n < new_image->columns() * new_image->rows(); n += 1, i += 4) {
+-    	buffer[i+0] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].red);
+-    	buffer[i+1] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].green);
+-    	buffer[i+2] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].blue);
+-    	buffer[i+3] = 255 - MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].opacity);
++    	buffer[i+0] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelRed(new_image->image(), pixels));
++    	buffer[i+1] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelGreen(new_image->image(), pixels));
++    	buffer[i+2] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelBlue(new_image->image(), pixels));
++    	buffer[i+3] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelAlpha(new_image->image(), pixels));
+     	numcopied+=4;
++    	pixels += MagickCore::GetPixelChannels(new_image->image());
+     }
+ 
+     // Create QImage of frame data
+diff -Nru a/src/ImageReader.cpp b/src/ImageReader.cpp
+--- a/src/ImageReader.cpp	2018-09-22 21:47:46.000000000 +0200
++++ b/src/ImageReader.cpp	2018-09-23 16:22:32.330865516 +0200
+@@ -59,7 +59,7 @@
+ 
+ 			// Give image a transparent background color
+ 			image->backgroundColor(Magick::Color("none"));
+-			image->matte(true);
++			image->alpha(true);
+ 		}
+ 		catch (Magick::Exception e) {
+ 			// raise exception
+diff -Nru a/src/ImageWriter.cpp b/src/ImageWriter.cpp
+--- a/src/ImageWriter.cpp	2018-09-22 21:47:46.000000000 +0200
++++ b/src/ImageWriter.cpp	2018-09-23 16:22:58.380031419 +0200
+@@ -97,7 +97,7 @@
+ 	std::shared_ptr<Magick::Image> frame_image = frame->GetMagickImage();
+ 	frame_image->magick( info.vcodec );
+ 	frame_image->backgroundColor(Magick::Color("none"));
+-	frame_image->matte(true);
++	frame_image->alpha(true);
+ 	frame_image->quality(image_quality);
+ 	frame_image->animationDelay(info.video_timebase.ToFloat() * 100);
+ 	frame_image->animationIterations(number_of_loops);
diff --git a/media-libs/libopenshot/libopenshot-0.1.3.ebuild b/media-libs/libopenshot/libopenshot-0.1.3.ebuild
deleted file mode 100644
index cc13df34d2a1..000000000000
--- a/media-libs/libopenshot/libopenshot-0.1.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit cmake-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Video editing library used by OpenShot"
-HOMEPAGE="http://www.openshotvideo.com/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+imagemagick libav +python test"
-# https://github.com/OpenShot/libopenshot/issues/43
-RESTRICT="test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	net-libs/cppzmq
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	media-libs/libopenshot-audio
-	imagemagick? ( media-gfx/imagemagick:0=[cxx] )
-	libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
-	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	test? ( dev-libs/unittest++ )
-"
-
-# https://github.com/OpenShot/libopenshot/pull/45
-PATCHES=( ${FILESDIR}/${P}-fix-tests.patch )
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
-		eerror "${P} requires a compiler with OpenMP support. Your current"
-		eerror "compiler does not support it. If you use gcc, you can"
-		eerror "re-emerge it with the 'openmp' use flag enabled."
-		die "The current compiler does not support OpenMP"
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://github.com/OpenShot/libopenshot/issues/17
-	use test || cmake_comment_add_subdirectory tests
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_RUBY=OFF # TODO: add ruby support
-		-DENABLE_PYTHON=$(usex python)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick=$(usex !imagemagick)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	emake test
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize
-}
diff --git a/media-libs/libopenshot/libopenshot-0.1.7.ebuild b/media-libs/libopenshot/libopenshot-0.1.7.ebuild
deleted file mode 100644
index 4f9643afa9b0..000000000000
--- a/media-libs/libopenshot/libopenshot-0.1.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Video editing library used by OpenShot"
-HOMEPAGE="http://www.openshotvideo.com/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+imagemagick libav +python test"
-# https://github.com/OpenShot/libopenshot/issues/43
-RESTRICT="test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	net-libs/cppzmq
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	media-libs/libopenshot-audio
-	imagemagick? ( <media-gfx/imagemagick-7:0=[cxx] )
-	libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
-	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	test? ( dev-libs/unittest++ )
-"
-
-# https://github.com/OpenShot/libopenshot/pull/45
-PATCHES=( ${FILESDIR}/${PN}-0.1.3-fix-tests.patch )
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
-		eerror "${P} requires a compiler with OpenMP support. Your current"
-		eerror "compiler does not support it. If you use gcc, you can"
-		eerror "re-emerge it with the 'openmp' use flag enabled."
-		die "The current compiler does not support OpenMP"
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://github.com/OpenShot/libopenshot/issues/17
-	use test || cmake_comment_add_subdirectory tests
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_RUBY=OFF # TODO: add ruby support
-		-DENABLE_PYTHON=$(usex python)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick=$(usex !imagemagick)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make test
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize
-}
diff --git a/media-libs/libopenshot/libopenshot-0.2.2.ebuild b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
new file mode 100644
index 000000000000..4b0aeae13e16
--- /dev/null
+++ b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit cmake-utils python-single-r1 toolchain-funcs versionator
+
+DESCRIPTION="Video editing library used by OpenShot"
+HOMEPAGE="http://www.openshotvideo.com/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+imagemagick libav +python test"
+# https://github.com/OpenShot/libopenshot/issues/43
+RESTRICT="test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	net-libs/cppzmq
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	>=media-libs/libopenshot-audio-0.1.4
+	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
+	libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
+	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	python? ( dev-lang/swig )
+	test? ( dev-libs/unittest++ )
+"
+
+# From Mageia
+# https://github.com/OpenShot/libopenshot/issues/60
+PATCHES=( ${FILESDIR}/${PN}-0.2.2-imagemagick7.patch )
+
+check_compiler() {
+	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
+		eerror "${P} requires a compiler with OpenMP support. Your current"
+		eerror "compiler does not support it. If you use gcc, you can"
+		eerror "re-emerge it with the 'openmp' use flag enabled."
+		die "The current compiler does not support OpenMP"
+	fi
+}
+
+pkg_pretend() {
+	check_compiler
+}
+
+pkg_setup() {
+	check_compiler
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# https://github.com/OpenShot/libopenshot/issues/17
+	use test || cmake_comment_add_subdirectory tests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_RUBY=OFF # TODO: add ruby support
+		-DENABLE_PYTHON=$(usex python)
+		$(cmake-utils_use_find_package imagemagick ImageMagick)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make test
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize
+}
diff --git a/media-libs/libopusenc/Manifest b/media-libs/libopusenc/Manifest
index e8ddb2eb2c0e..0bbf31421700 100644
--- a/media-libs/libopusenc/Manifest
+++ b/media-libs/libopusenc/Manifest
@@ -1,3 +1,3 @@
 DIST libopusenc-0.2.tar.gz 388027 BLAKE2B 5822d09ec56ce9dc0182241e7182b71c9c21def5645a2ef3472af380b25af1b1f8a08311c2cfb8bacdfde845dff81ee426401f1ab098b6598e41e664ccaf9c34 SHA512 82b9a60bf6fa0c8bc485b221bc633456245f8909875fb9e86876076bc37857d53a366bbc66f2e1e331adddcf12c4d5a29f0047e21d0fae2f8bd8a3199bd6f78f
-EBUILD libopusenc-0.2.ebuild 617 BLAKE2B fc97085948053856b22956a8d010c33b2c0b14d8ca025463db0bf61807540d1a9c2db5b795170e9c6ae613b331438db552cfe73785a8029034ef0ebd86d1c0b8 SHA512 e5fb8ca1e3d34e2c1b27189f1880087d67b41e5b0673fe634fdeb401a23bed7b4b036020d16610fd7111ae964244710438afaa3f7989210c8ea931824d4e4e4f
+EBUILD libopusenc-0.2.ebuild 629 BLAKE2B e96df2a2e4f82998005c081c499ab97c94980b89be20521a2a6a296afb2b8896dc4543817139e0a1b613e1461edbe63624598061dc02809fd31bee6da4c3bf5a SHA512 9e387028b5f40c4a0d4423eec21a6542011fdb923a9b27d9309b42874dd257a3a04c63293e965258648040ad8259ff4ce6b003844d9b7cdc3ed104de528c74de
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libopusenc/libopusenc-0.2.ebuild b/media-libs/libopusenc/libopusenc-0.2.ebuild
index 473b64aa39d0..a75cfdebe970 100644
--- a/media-libs/libopusenc/libopusenc-0.2.ebuild
+++ b/media-libs/libopusenc/libopusenc-0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 BDEPEND="
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 3308ea055898..9a5bf0ea0b6e 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -6,5 +6,5 @@ AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
 EBUILD libquicktime-1.2.4-r2.ebuild 3879 BLAKE2B b464fdd272c974633dec17eadd38dc0f295ba81a63f8233d55767b63e31e0bba7670f27a8e04f47ecb8f367702249621834eac6f4a7346b41fa188fd67908d86 SHA512 4c5c9bb52ad4826871f7acb45fb00c90e603465084dd375b85b07a412dd59c43b9aab791350d14579d1dd29476389fa49d4a98fb4a517a595aa396add5e0e529
-EBUILD libquicktime-1.2.4-r3.ebuild 3847 BLAKE2B fabeec02ba29ec31cbfd774438ca4f4821b20259fff311883d3e266695e9e69beeaac99dc4c521bb10c7d62c60a6cb341f845f539004720eee9a57e07d7c44ad SHA512 f43fe852b41829bce1c8d04a1e541c889694c9c9ff46f77923c269bd0a925dfee0c874b85d7189ca4bfe0df1c741c02f97599c308521f28c476e2aefa3ca6563
+EBUILD libquicktime-1.2.4-r3.ebuild 3843 BLAKE2B 20df361f2ac990a3ef8f730e76b68101a27fe6bedc1c1a6f528eef47aa381a424beae2a93498f27f0eba702ea8223c2c03127ec4c61177384b58c008a49da619 SHA512 bbb80c9a5c057bfbcca25c7d2906026696376a4ccfe7cc32d5980900082344518e5596d8029c7d8111a2b5bb25faac93d3ba94442ef7c335b86907431b029812
 MISC metadata.xml 506 BLAKE2B 2b6f16d304beace7cb71ac32cc734ec4bf0e28c2b155068f9c5f83fc9a5a8731056ec1b3743da9f2b6add73f4b82d4fb797dad913451ea255ab5752557f7b2eb SHA512 80ee7f91a4fafe6a9f9380bab5236633672484dea9389ab5b391319fbcbe010607903b21c12c37211575f4e55251f1718c2000225226fd0a63183ac903817ce1
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 93fd2e6a3bd8..27006b45311b 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264"
 
 RDEPEND="
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 6de12efe4bfe..fd0ffb95617c 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,11 +1,7 @@
-DIST LibRaw-0.18.11.tar.gz 1283643 BLAKE2B cd217a0c40d0f30ff95968c5238ad349d32f6ae44aca3847b32c236e8e82e7ff25ba5d6bb0cffe8d73b288239830982d074a306b682160bfe8c73b0df9fcff09 SHA512 4d114bdb589c96d95f646b1d016cfb9546ea7a53b9f23af1dc5d0e38cb4d1b2aa7270f2d4dbe7c6c323fb7f21403914a0bb75afa7b6204d0a99c72ecf0c812c9
-DIST LibRaw-0.18.12.tar.gz 1283491 BLAKE2B a0e23bf58ecf331ef52e529be5dd27acf8458d1a6de700b36df6172b7cfde2da62561e29c197bc360237b12c7a427b1d07a0c64862fe1cead461a6989e488218 SHA512 8fcf1e24295457f09a654a14d77869ca401a21e9f4386d91fb0fd5bc9aa20a882bf490a64c183108e645b5fa70401f97868c83837a057cb707f58fa31a417d44
 DIST LibRaw-0.18.13.tar.gz 1287631 BLAKE2B cb335dd21b897222a80ae7b486d751a080dafe93d9c4ce72ad337bc724707831a70428323027f5f343c4b0ff08820b6f68553436240a85d115eaaa30b6b0c269 SHA512 80e6ca48b00176e7c4dd21d8249c60e71e987c01e719abc3bda8b859645301b9dee4bb365bbcb79cbe0067220d3b966add4757b35d4b6ada0a59bbdb29925254
 DIST LibRaw-0.19.0.tar.gz 1300662 BLAKE2B f182f1fd7d02eaa34f8b8e2336cbc59cd8c3345cddeace2ed305d048d160bf8d6ecdf04129829b3202a16e70d987a5b2a83c036ec95d1b7b6c748dbb5b46271b SHA512 33d0e9a031add901bdd10ffcde6a0f7837a4f4bec0bbbd21ad661e518dadcb1699133f17b3b2f6cd6cefe87ef3017cb7e1b816c4ce3dfebaaf5d9b2ff6b65238
 DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
-EBUILD libraw-0.18.11.ebuild 1843 BLAKE2B fd6d9bd5537532bf7fdb2e2f2665b3cb9915dabf8f07677ead3c44e53418eb3440d1a86fb4983834d436316c25f3a854066511c66e7b7352274e73e0ef1d2fd1 SHA512 d2793037aea9672d99ea1d53f4b8b8a16c62b0a0aa74b8d470b207a1b2a196640ee93bd630a7b987fdfe34b49f9f63f514fb73adc7573764d16145784b9acf46
-EBUILD libraw-0.18.12.ebuild 1850 BLAKE2B 3ac45ea0a2adbd0e593bbe72ce9b2d8ced1a0dcda0bf327114f0a3e7c9d7158928e5de593e2150ce78bbd260d75cfdcf2c18d198ca882ef6516fabca0256813b SHA512 e2aa30b3a5acc40416f04aef1b15f74c9df5c3772e78844bf7f99706c244c6a1dcbc85b7d20895f48a7e12ed3abe47424333bb8dd5f9f19e827b8fa5192a5b1e
-EBUILD libraw-0.18.13.ebuild 1841 BLAKE2B 5c119ff15b7f58f665ffb2dcf150b83ce2b37c8fcf48a4f04b05a5e784445ed755dbd824346b4fed7dad6fb49626ed57cd6a82d67bcd685f54d3632216440d59 SHA512 db2e44241d73c9ec2872fc35a91e6d4954dce90db9d7bb84f21fa0e70221f877319774a04a04b71f9363924ee76863a9bcdbe1da1b6aee8ad09e77361d9c07fc
+EBUILD libraw-0.18.13.ebuild 1840 BLAKE2B 7b86c52d8ae048f2287455ab34ed05a69192ceded8f8a68b97fda2647517afd90983b5b45991809d87cd7d219e11087bc6a506f00749d0a4719d2451ab85b562 SHA512 9681595927e116f9b97815745b097219c3dfac4fa3020ddaf2ff320a9315327d3e02fa2964b468dde2f981035516e2ad49e8e6cdd69221841011f54764dfa90c
 EBUILD libraw-0.19.0.ebuild 1448 BLAKE2B 4506ca95f728795307d7d18673569cf10e809ba4003247f3f017570d16aa8678953c8ff261315bb251d6d31a6e3d687b5f9537e33f404946fa78894365df0711 SHA512 bb628315cc48d486a336213c82a4e959910aa33acd5037dc00fb0f8674fdcd4ac9392759d53f345f13e50ce5eca162961ebb5cbcea9edfb97c601cd9fe613598
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.18.11.ebuild b/media-libs/libraw/libraw-0.18.11.ebuild
deleted file mode 100644
index fa6cf6a88c19..000000000000
--- a/media-libs/libraw/libraw-0.18.11.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV="${PV/_b/-B}"
-MY_P="${MY_PN}-${MY_PV}"
-# demosaic package sometimes doesn't get bumped.
-# Otherwise you can set it to ${PV}.
-DEMOSAIC_PV="0.18.8"
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
-	demosaic? (
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${DEMOSAIC_PV}.tar.gz
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${DEMOSAIC_PV}.tar.gz
-	)"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog.txt README )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable demosaic demosaic-pack-gpl2)
-		$(use_enable demosaic demosaic-pack-gpl3)
-		$(use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
-		$(use_enable lcms)
-		$(use_enable openmp)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libraw/libraw-0.18.12.ebuild b/media-libs/libraw/libraw-0.18.12.ebuild
deleted file mode 100644
index 6412dcbf97cf..000000000000
--- a/media-libs/libraw/libraw-0.18.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV="${PV/_b/-B}"
-MY_P="${MY_PN}-${MY_PV}"
-# demosaic package sometimes doesn't get bumped.
-# Otherwise you can set it to ${PV}.
-DEMOSAIC_PV="0.18.8"
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
-	demosaic? (
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${DEMOSAIC_PV}.tar.gz
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${DEMOSAIC_PV}.tar.gz
-	)"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog.txt README )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable demosaic demosaic-pack-gpl2)
-		$(use_enable demosaic demosaic-pack-gpl3)
-		$(use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
-		$(use_enable lcms)
-		$(use_enable openmp)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libraw/libraw-0.18.13.ebuild b/media-libs/libraw/libraw-0.18.13.ebuild
index ed73dec8a403..1510fc0e5b09 100644
--- a/media-libs/libraw/libraw-0.18.13.ebuild
+++ b/media-libs/libraw/libraw-0.18.13.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
 SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/librosprite/Manifest b/media-libs/librosprite/Manifest
index 29c3b4baa080..8e448b81fbb2 100644
--- a/media-libs/librosprite/Manifest
+++ b/media-libs/librosprite/Manifest
@@ -1,5 +1,5 @@
 AUX librosprite-0.1.2-Werror.patch 393 BLAKE2B dc5794093ac33e7b65ca42a9ab4dd967cc44b9c8e890d404021f995cbaf7fe83be2549377c503dc8d7b3dc692f3a48eeffcd1709d9cad840b4f9522b4b9fab15 SHA512 1f72277eadc2c958ff58c9a23e78bf5a8198c76502cba45e5619413f3dba4243e7a5f8650a11436cc87dd9e63257a874cf8b1805b4dcfe5f3db88733ff08e1fe
-DIST librosprite-0.1.2-src.tar.gz 31146 BLAKE2B d6a949da48e75e0d42187a6875ab9eef019e5d75c09fff5ef362ee84272a12d9025a875e93d83d90903df9b9ed1d855443943fdc4bdce5643ea598f2ea98d3be SHA512 7b668ba618e78604ff6137b202feeb5e191aed11e0781e10cee4d70a218d894ec5d95ac3a2bd0bf3517d0bc1096d2e8e8d021246596ffbe7ab8ad0cebd92eb6c
-DIST netsurf-buildsystem-1.3.tar.gz 37906 BLAKE2B 38612b1cd013baf20da71a6b529252cd1fb5468916cf840463e04b38ecb7766d175a8b030a10987eccb740ff049a8f85990cbe1d3fbc15a97061e9ffe31836c0 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5
-EBUILD librosprite-0.1.2-r1.ebuild 409 BLAKE2B 77dc6660f8f079d432231312ddbb3b0f4167b053d9b9acd4455077e9dc826e78899ad4bf0b8de500981627e459519b4640e4b3c768c62c952e7ad85011a7e533 SHA512 45f8ec8d30f456085fe590d7e99099ab7e08780886059e69a076f39fe795310f84590198fb37557aadfd5990734bfd426f39b7566edfb7bc20640d60543bd695
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST librosprite-0.1.3-src.tar.gz 32816 BLAKE2B 553f5046eac8b7de5940e812103a545ee1d599bcc30d4fd6bb14449e0718364132e76e3992b224d0d2dd3c7582100fe6d9e4d433f245a89b23e3f15542329e0e SHA512 ab039ab12df7f527a86a76247bc5cb70ebe550591f81a1b987abef73fb3c6bd25c9a36afe17bd6717f4f33b1a133d847bb5acad53057aa3c406efe4ebcdc601b
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD librosprite-0.1.3.ebuild 504 BLAKE2B fb4f75e7d876b2f57f90657ff5de5fad63e3390d85a07d62dfe0fc2c7a6b88a371b9159a141c446ffcc218353dbdc0578db085350f1061ef2640e9a578d6c8ff SHA512 d2604e5c4f9ab6744d807e40af1349c01aae3c3eadd27818a4aeae508ac994444f849124bf9cd8e3fa5d9ba0204995d055003554b5efe341bc8f09daadb9ef3e
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/librosprite/librosprite-0.1.2-r1.ebuild b/media-libs/librosprite/librosprite-0.1.2-r1.ebuild
deleted file mode 100644
index e82ee2074a6b..000000000000
--- a/media-libs/librosprite/librosprite-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.3
-inherit netsurf
-
-DESCRIPTION="framebuffer abstraction library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/librosprite/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${P}-Werror.patch )
diff --git a/media-libs/librosprite/librosprite-0.1.3.ebuild b/media-libs/librosprite/librosprite-0.1.3.ebuild
new file mode 100644
index 000000000000..1f18c60fddd5
--- /dev/null
+++ b/media-libs/librosprite/librosprite-0.1.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="framebuffer abstraction library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/librosprite/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.2-Werror.patch )
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/media-libs/librosprite/metadata.xml b/media-libs/librosprite/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/media-libs/librosprite/metadata.xml
+++ b/media-libs/librosprite/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index bc40387608bd..abfaf10a236d 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -3,5 +3,5 @@ AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab
 AUX libsdl2-2.0.8-wayland-headers.patch 1014 BLAKE2B 72070a3710635a3402e9fd5f6fd71b58fb53ff6e5efce8486e5009d05babff6fd5ee46e46bcea7386555bec0078d894fe81e211844fd6a366c855e2d72799932 SHA512 fdb54d6a8ee1fa1596dad2cf16cb389038167e4ccea123f68e54bd096600e90d86de254667c7dfc46f80ca62edae9f0f47fb3307c72bce5c142afb146870a9b1
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 EBUILD libsdl2-2.0.8-r1.ebuild 4742 BLAKE2B 333677b4ed0a69eb34ba2a6d2da4140e23009d9780bfa297e0c85f74da31fa68ae964b68423232bfad67d34c8dffee86ea5de2db88cf3135fd2631d029aa56aa SHA512 99400ab240ec25f85f5b0a549a0d56b6b96d600ad9705e68af99ddb717e542a140eec7211a5435b5a1169772efa169581f32a8f6b1c758cad0a8aa70c7268c24
-EBUILD libsdl2-2.0.8-r2.ebuild 5261 BLAKE2B 373f185ebda59076e6f7a9894304270a2620d0dd761ea5126a720040f20fa83606fc82322b40780e9d19dca33f7354e509f511346418953b1fd2cde069fcfff9 SHA512 14a678416cdf94db65483d4c5023c1ada0cd287a6f4edd679d2180f90ffc363287f74f6ec284f01c2b8e5c9a31aba2b42037af7da101cd46adeef33c2da60e41
+EBUILD libsdl2-2.0.8-r2.ebuild 5260 BLAKE2B 14ec9cbb2e0ef3718139dc4c206dd23ade81bca016150f555a937f5e527b4df9576f98c4834d418ab3c90b30dfd429e2cf9ed1152c39103a59b9001af7c3f05f SHA512 6802c880e54e7b5e961ccc996fd09ce3f9501142c4363097ec17b82dd00f400c312d58db34969307256951146d3c4158dd7a67b002f6d39938bf7fbc5cb4d040
 MISC metadata.xml 1602 BLAKE2B 600168481346aa4a72024f35a35640f8c415aa38f6c337a9995cd61c1f0c438fdd533dcf50b2506c7b3e638f9144295037df69bdcdcb3fcdd0821358caef2984 SHA512 c16d7e97a45a8897c806ef6087242710c95a0602f858947bf68c240075fbdc69ea1ae4c46eed567341f493868b94e1b63160a8b2cb1c1d44da232273c9f46001
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
index adab5ba5df21..27ba581990ae 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 0e0c2874009a..77e4f36a6a95 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -2,9 +2,8 @@ AUX libsfml-2.2-no-docs.patch 432 BLAKE2B 617c83033c6cafc6455937f1a7a149b73e31e0
 AUX libsfml-2.4.2-no-install-extlibs-mingw.patch 3417 BLAKE2B 4619083ec961ba9da52a3db4d77b157c4bdc1f2c08ccdd3c487e729b14551d0043fcbff3e5dad2d63b269b961f315e2930b082afd5f5c0c7aa372e60391a2bf0 SHA512 8239c021143d7e5ce9ae33d3a3c639b8568fceafe900f0b9d70221402a2f38ff7b5c3a297ffdf8aaaebef7d379b1733749d579f831efa3c85ea252b57721e8cf
 AUX libsfml-2.4.2-pkg-config.patch 9244 BLAKE2B 7b5a2bb09d268ad5b5c9686874bb585bb33e11937b3467318fffa89391d1277d21e66d23ebbaf1690f46316fe0569e4b44f84e3d0e884ad2cfa2724e36852c6e SHA512 6937bcee330961ec578947791142012a9fd4147251a603ec0ee0de47e8dd23122fccc437ed191ccf65a81b385ce275e717c5a524003ad56137a8c787d9c91aab
 DIST libsfml-2.4.2.tar.gz 24576150 BLAKE2B 05d1c06cb360aae6ec8a53225666119168075ab61dd87fe86a105f2c104d21b5897c4b35e66f5c0dae7193697437d168a963c018e3d39bd7b8b6bed957a63d94 SHA512 8acfdf320939c953a9a3413398f82d02d68a56a337f1366c2677c14ce032baa8ba059113ac3c91bb6e6fc22eef119369a265be7ef6894526e6a97a01f37e1972
-DIST libsfml-2.5.0.tar.gz 22864874 BLAKE2B 69f3a98e6db2cfbd6208167cd9cfaf92d980a7da878b026a12db646cc3638edd237ce61c123934c8169f7bc204cca64618aec89c51e7667aef03b6c72ee84a63 SHA512 94306dcbed7d68bb7e226cd91e25950a07bcf393988c4bb79f9de3555c18c78cae4573e911235f712e711a7c02a614bf370df32b8d85240d2f08142327e05076
-EBUILD libsfml-2.4.2-r1.ebuild 1634 BLAKE2B 408d034ee53e9af9fb7d8c7aa5c33e8128936a3b0f6bd8e7f817928859540394a742b0f5c6f8e68c2b779e049788fb76d814884931ca679c6c961b551926a11e SHA512 dd31edc609d736d771ce2a192942cbbb1aba37655eec6e2dc9de93e8d8f8c8c6e012420c7ed764ebe4b00b25907a03e4584d74bf438f228cfb47aca4bcfc5add
+DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
 EBUILD libsfml-2.4.2-r2.ebuild 1678 BLAKE2B cff23c8ef3b13eca3cc957cdb0265ba80620e6a33530a2bd82d31dce14181ce6e8ec647c88053bdcdefb507faf0adab52a7f29c5af0fa3e90e8c65b8e54947ab SHA512 e12981574f9a6a9969052333854f00f9639ec76b5f13aaefbad7130d68d6f5f1563c4ecf7ce27eff392e84019d91b7706e549381624c34ce49ef502e28c55b7a
 EBUILD libsfml-2.4.2.ebuild 1488 BLAKE2B 7823ad6b11566f9b2587528851067098d504db7d7862d5efe8fb57018fb56ddfe551e5467b057f8f85f0778e700424379b7cf146d1c516f1528e6999df206c7a SHA512 250f27afd60470dc9667a504da415621a63cb9f71c23ec64557c7407f683871681e5e98b023984425ebca57b61583a405281cbbc343dae1210e33b02051c75ea
-EBUILD libsfml-2.5.0.ebuild 1542 BLAKE2B f01dee0d1f48b22c899c78e447a0bae319c60bd9ccccd1adb27b79741a2cabb82d8113287865593df8bf4fa182bebc71d4706b56063f58e573b3a5b6b6bb6c5d SHA512 b96ffecc688504f0e67e9cc76813413d470940d22e798d8f1539a980d9453e9e3a3d56e6b6724de11b90d2fce1598657d0a2eda8ce23bc6c7d578ef9394be1e9
+EBUILD libsfml-2.5.1.ebuild 1535 BLAKE2B ed68f15a69a922c85b24967aca0a2f97e864dd1d3723b02e397efb725798a1e34e28ffaf01a0008a641d054d4e218fe1362b55ab7a8f94b5efae54f309f77427 SHA512 0db65cf914903dbfee593dc25fb80b7f0315263e670f57e4712d02b8442021239ecdd36c7103456a1076483d2c2f84dd9c5c76e1570100bbbc36a6aba4dd66f0
 MISC metadata.xml 732 BLAKE2B 598678c33da33373a1669f4b9048b95503d9c430730b571b985e4137e034e5104dc509cb0a6605834ef463c6d6438b25bd2bb06ec6ce41d7e1c52fbef7219e3d SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2
diff --git a/media-libs/libsfml/libsfml-2.4.2-r1.ebuild b/media-libs/libsfml/libsfml-2.4.2-r1.ebuild
deleted file mode 100644
index 7057c2f13469..000000000000
--- a/media-libs/libsfml/libsfml-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-MY_P="SFML-${PV}"
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML"
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg:0
-	kernel_linux? (
-		virtual/libudev:0
-	)
-	virtual/opengl
-	!kernel_Winnt? (
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-libs/xcb-util-image
-	)
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=( changelog.txt readme.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-no-docs.patch
-	"${FILESDIR}"/${PN}-2.4.2-no-install-extlibs-mingw.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
-		doc/CMakeLists.txt || die
-
-	find examples -name CMakeLists.txt -delete || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSFML_BUILD_DOC=$(usex doc)
-		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
-	)
-
-	if use kernel_Winnt; then
-		mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE )
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake/Modules/FindSFML.cmake
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/media-libs/libsfml/libsfml-2.5.0.ebuild b/media-libs/libsfml/libsfml-2.5.0.ebuild
deleted file mode 100644
index ad093d203a3b..000000000000
--- a/media-libs/libsfml/libsfml-2.5.0.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
-
-inherit cmake-utils eapi7-ver
-
-MY_P="SFML-${PV}"
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML"
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg:0
-	kernel_linux? (
-		virtual/libudev:0
-	)
-	virtual/opengl
-	!kernel_Winnt? (
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-libs/xcb-util-image
-	)
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=( changelog.md readme.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
-		doc/CMakeLists.txt || die
-
-	find examples -name CMakeLists.txt -delete || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSFML_BUILD_DOC=$(usex doc)
-		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
-	)
-
-	if use kernel_Winnt; then
-		mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE )
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake/SFMLConfig.cmake.in
-	doins cmake/SFMLConfigDependencies.cmake.in
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
new file mode 100644
index 000000000000..d7b28cb87d90
--- /dev/null
+++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eapi7-ver
+
+MY_P="SFML-${PV}"
+
+DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
+HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML"
+SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples"
+
+RDEPEND="
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/openal
+	sys-libs/zlib
+	virtual/jpeg:0
+	kernel_linux? ( virtual/libudev:0 )
+	virtual/opengl
+	!kernel_Winnt? (
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-libs/xcb-util-image
+	)
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( changelog.md readme.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
+		doc/CMakeLists.txt || die
+
+	find examples -name CMakeLists.txt -delete || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSFML_BUILD_DOC=$(usex doc)
+		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
+	)
+
+	if use kernel_Winnt; then
+		mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE )
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/cmake/Modules
+	doins cmake/SFMLConfig.cmake.in
+	doins cmake/SFMLConfigDependencies.cmake.in
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index a2b6864b3bbb..99c49f06a93f 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -8,6 +8,6 @@ AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee
 AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
 EBUILD libsndfile-1.0.28-r3.ebuild 1755 BLAKE2B 84df10cc6ee06a0604c0a764a41c3aec77aa78d8c500f79333b39d1f3948850ef9d508b29d3329927fdd967b74b55f916d59a6be40c9b5a80cd20dc4e0030027 SHA512 827aeb22ee8219e15501b6b5e3695989ec23afc6dbc3655a95369d8ccefb3cb63af36abb46429b6610283cb730b1aefee06225127ece017331cfd3f41ef9ea0d
-EBUILD libsndfile-1.0.28-r4.ebuild 1882 BLAKE2B 8dc9b02cc32ed2f5626a2bcb1f7740e33bef58610e94146d08eb7ed41bc8bee5b8cb73685d59c0a86cc33bc11ce6cfa9ec889b21262bb90641cf4478e0fc8c41 SHA512 8b824843434bdec455fbed944a9fb9ba1b40105b21ca94dd8f29dc8733af981e9f5fbda2ab071f8f812603f23d17199327a88d541bde6135cd8e512234f3f3a5
+EBUILD libsndfile-1.0.28-r4.ebuild 1881 BLAKE2B 20c85cf60b86d6f5c6f049a06b5dca0acb93cba0ab8e71491d37f62d0a88da8bed27d21cbba82439d1722b2195d1880b808f8d1d1bbcf26118e2df3427b1a7c6 SHA512 d786771e152074b4be26d531bf8975f55b210798a6c4688e2c65f7db054d4f1248a1f1f4cc41896d8e3b5536faf9bbdabd29eece6ab4611af2539914dd85cade
 EBUILD libsndfile-9999.ebuild 1772 BLAKE2B ca1c5369618ff9a92681c7899722248dd3c2ac13960838f8e7eae709dcc0ddbe2ab7ee935de136e409c5b96f2899c54959b90512b7d01491b062e66146b33e01 SHA512 82049c5932e75b23d14909128b3d051da1857df7d96059b2035d24940641aad37c6e00a39868bae417114fed754744a1aecd7dcaaa39da9143f97553b6e41814
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index a4b36932a335..c2ff18be5f4e 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa minimal sqlite static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index cd36aa369257..9d4450690694 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,5 +1,5 @@
 AUX libsvgtiny-0.1.3-parallel-build.patch 406 BLAKE2B 1b7ef472490646196af762701b28636fcab2778ff4f77efc1e1c7d0736d73ca41703bf473333ee775e99df8eca24d4845e0bd03e117586e84b4a629af726b417 SHA512 1126b2985293432d9e8849ce85c27055d7fc96948657e9d8a35b41578ce1f014e6352798ccc605079b6ec4a1998899d91a240e7a338e277b092b83b4858d83d6
-DIST libsvgtiny-0.1.6-src.tar.gz 760475 BLAKE2B 69b991e92ad34ce39b40c49ffda88517a737515c6f6f6a3525786e626ec4148c5f66ab2edd09bbd84e38f6a7646ad05f25055a5316f7cf9bab77fc619cf27f84 SHA512 d8c2eaf2bc11b3e054ef2e8181da816aaa1fa45a537574541d174eb9ad23d452e85179c3f2232035f133be1497b080bc0494d080b77da1eb4112c19fbe712928
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libsvgtiny-0.1.6.ebuild 626 BLAKE2B 429ea531638edaaa5edbf91811b2be9067052989d3f48232b87c63b2deaf3d0dbe4c8260f8dd95f1d51d9c71646c39ffe244c266c6439c57777e25c3cfb5b8df SHA512 c2552ab6c41ed2ee105bbde786d579cb9dc2831f8bb67fb85a79e411263ec47d0eacfa88150c0b58599a458c84f61692fc138e7c318580311f2a60f5ba8d4f97
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libsvgtiny-0.1.7-src.tar.gz 760963 BLAKE2B badf14e656e10a178a6b692659265644b636cc103ec92f89026638700293028e0b06b5e051c420911fd6c319a94bab68328b1d9f42cec69dc7926c2d31aeec67 SHA512 c13352325d32b6f41159b09607b12a373517672e9e4da6d26cbca9a7fb1896b6e5730aee53adaa51f0b49c35f7dd9e9ece6b1f0187a7f5494b5cc223acbe64ad
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libsvgtiny-0.1.7.ebuild 714 BLAKE2B ff3ab89b720b2bea1a1d631c49f96546c2fbc585b6b9f81392028e09137092a188bf1001f712e62062f4f18c2c4010d8043174ab4268061c25f074fd3c941dbe SHA512 c7b0453507792fb57b8ac5867580ae5c4e6bdbe261505135e52d3b67f354d25447bf9550fc80dd433e78e7c1dc325941d3a5633365eb91d2862f2255e6d13b7e
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.6.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.6.ebuild
deleted file mode 100644
index d69b7dcc88c1..000000000000
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="framebuffer abstraction library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-RDEPEND=">=net-libs/libdom-0.1.2-r1[xml,static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.2.2-r1[static-libs?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.3-parallel-build.patch )
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7.ebuild
new file mode 100644
index 000000000000..c0ef6c188573
--- /dev/null
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="framebuffer abstraction library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE=""
+
+RDEPEND=">=net-libs/libdom-0.1.2-r1[xml,static-libs?,${MULTILIB_USEDEP}]
+	>=dev-libs/libwapcaplet-0.2.2-r1[static-libs?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.3-parallel-build.patch )
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/media-libs/libsvgtiny/metadata.xml b/media-libs/libsvgtiny/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/media-libs/libsvgtiny/metadata.xml
+++ b/media-libs/libsvgtiny/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index f160a76eb13e..8c51cae798b4 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -4,5 +4,5 @@ AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b4
 AUX libtheora-1.1.1-underlinking.patch 481 BLAKE2B 0939e1789eee97d999d229bb37620fe787b0da17253e15e6fbdf3109dd2c11cf201c6d77133529a779730acdd23806a52bb033d909509a6065ff6ac08db4b4d5 SHA512 9e8219ab32993470a4566b59b544eb04175577f4c82174924aa53b2ef61f0b94496a0de5afa630da291322fc6fbc640978152de8b61edd50231818838a330b0b
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
 EBUILD libtheora-1.1.1-r1.ebuild 2281 BLAKE2B 07dddc9f1faf461c15a81ce1fb8d6026c0de6d103589e7f1baa61370e890b5a5fa5b467667e8e53c87eefbb865e4cf4b09ebdca843e61b1b57e82e5d32e40597 SHA512 931f75c09195a979b830a824b053db327ae5e52bd5bc5da2b23d3b1ed0acd1ec1a862b9a68d0582143e2ef0d4a4b72848454ca365b59f780f6e8bc59f16de1b5
-EBUILD libtheora-1.1.1-r2.ebuild 2376 BLAKE2B eed6fdbb48d80f705b3271e4fe8d5accdbce6f3526938ea3251505eaad06fd0cefd250b6699de47aeeda4c2d7fe8ada671f1cd96bce5d2442bbe7a32b442d2a6 SHA512 7cdd9a27c6813303296eeffd7d837890a2484fde67ad05f70db374d66ef0401ab8dc4aa6397363d01631b7d6c3385db89c401be1e5f979e22166c1214cc0e59f
+EBUILD libtheora-1.1.1-r2.ebuild 2373 BLAKE2B bb8dc1b6f75bb03cddc2851191faaa6c8bd8a9d1bd828d132f0aee4b2cefba82cf6cab568f26bd22176ba6d6c973935ed60d2a4e4575c2627c3a7a7345706ca9 SHA512 1cf38a45eaccf7e9d2150429a7ab8adeb89586496ceb64b8270fb8fac86eb0b40b5e04a8d10b1b3c15635c1b661076adf57bfd8054850590243fe1b86b86078c
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
index 2ca7578d0ec0..c3c7980cada9 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +encode examples static-libs"
 
 REQUIRED_USE="examples? ( encode )" #285895
@@ -78,7 +78,7 @@ multilib_src_install() {
 		docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		install
 
-	if use examples && [[] "${ABI}" = "${DEFAULT_ABI}" ]]; then
+	if use examples && [[ "${ABI}" = "${DEFAULT_ABI}" ]]; then
 		dobin examples/.libs/png2theora
 		for bin in dump_{psnr,video} {encoder,player}_example; do
 			newbin examples/.libs/${bin} theora_${bin}
diff --git a/media-libs/libtxc_dxtn/Manifest b/media-libs/libtxc_dxtn/Manifest
index 0a4c839e9980..425a83073a6f 100644
--- a/media-libs/libtxc_dxtn/Manifest
+++ b/media-libs/libtxc_dxtn/Manifest
@@ -1,4 +1,3 @@
 DIST libtxc_dxtn-1.0.1.tar.bz2 214038 BLAKE2B a342bda7375dcbd4001adb5469c90a043fa039bc2505c9cf717613054b494fea9054136b25ac80b016c62aec248085a60ab5e71190cd5c2d90941bdda6408d16 SHA512 56714a8c947d9b1f47e3ccb23cff9e4e57bd131907a82968de521d094a000275b3aaeecff28e9184bcc4f3932baa1a8bfbbefbc970fcd034ff953d0617148479
-EBUILD libtxc_dxtn-1.0.1-r1.ebuild 888 BLAKE2B 4036b3d209131cb43495b342701142c745d9943ffd008f2a47e9b70bf1a77b3e870768ea98cdba83bcd3d77a9c754f9f3bccaae7d64c4344cac5babd5c2f87f7 SHA512 aa78415fc9c1bc06f8dbda9413dddb1b8d2ba7fc624cdba37e306db49bc87ff3112a06557aead9417f4a26bf9cf37857048165e2a8af6fc5823e341bdc2627a6
-EBUILD libtxc_dxtn-1.0.1-r3.ebuild 970 BLAKE2B 7b461ab1cb74f21fb4eda25ba7826b863d34990184bb3168b4492735b1e67327b1d54d90481a702703645b5c9af049b40b5367897627fb19b15742f3f4c4ceba SHA512 343a4d26aeaf14559810f94c929d8407385c70ae5890c94f06d4ff83541d0b906f9c3fc620c5c2671c1fc386d2ddc49912bcab132d2157dca6466a911ea2a66e
+EBUILD libtxc_dxtn-1.0.1-r4.ebuild 633 BLAKE2B 4358733b08ef1ce6602181a12f308e7b1b2719f2db7e3f07b6fa160c52c4ce207c0c1c7188ee3881a0ad10ba0e3e2d47d91ea23f196425f5dca935fd6ee7b575 SHA512 bfe27812486322690fd926587e69d6d3e7668c30350546f854d3ee982d9961da6ffb9c651b375703db3da9608db2bd607cd5adca78f542438d0321e1ef654c03
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r1.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r1.ebuild
deleted file mode 100644
index 33b3c218982d..000000000000
--- a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="Helper library for	S3TC texture (de)compression"
-HOMEPAGE="https://cgit.freedesktop.org/~mareko/libtxc_dxtn/"
-SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa"
-DEPEND="${RDEPEND}"
-
-RESTRICT="bindist"
-
-src_install() {
-	autotools-multilib_src_install
-
-	# libtxc_dxtn is installed as a module (plugin)
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	ewarn "Depending on where you live, you might need a valid license for s3tc"
-	ewarn "in order to be legally allowed to use the external library."
-	ewarn "Redistribution in binary form might also be problematic."
-	ewarn
-	ewarn "You have been warned. Have a nice day."
-}
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild
deleted file mode 100644
index e44c81b33584..000000000000
--- a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.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
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="Helper library for	S3TC texture (de)compression"
-HOMEPAGE="https://cgit.freedesktop.org/~mareko/libtxc_dxtn/"
-SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-RESTRICT="bindist"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_install_all() {
-	default
-
-	# libtxc_dxtn is installed as a module (plugin)
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	ewarn "Depending on where you live, you might need a valid license for s3tc"
-	ewarn "in order to be legally allowed to use the external library."
-	ewarn "Redistribution in binary form might also be problematic."
-	ewarn
-	ewarn "You have been warned. Have a nice day."
-}
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild
new file mode 100644
index 000000000000..f520acc99906
--- /dev/null
+++ b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Helper library for	S3TC texture (de)compression"
+HOMEPAGE="https://cgit.freedesktop.org/~mareko/libtxc_dxtn/"
+SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="media-libs/mesa"
+RDEPEND=""
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_install_all() {
+	default
+
+	# libtxc_dxtn is installed as a module (plugin)
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 48a2a4a28461..e447d8d29a62 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -6,4 +6,4 @@ AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 BLAKE2B 142852a63e1aaf4166464a3
 AUX mediastreamer-2.9.0-xxd.patch 642 BLAKE2B eba083c86b405da0aa7a96b192e70e87a45d25a98f13cb93d2b13c85d7e9e59ddfcbf59f73aec859d725ed6ee4bff015cde0d22cdcff1325e6893c965a2b29b2 SHA512 763a8d90b278b75574c8a3cd14a780ec069f3bb6267e4ae5425ead390b274662a6c31ca924b418df5454cd7a842929dbadf621acb65e52c5af7835a2bc21bca2
 DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 14db241196f5d98cd7fc06ebe9e59317d47248a6c0ba103c4382ad5a2e48ebf87293f344320215380a0b9ddf76c7d4986db2c27cf114734d883505424c21a6a7 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0
 EBUILD mediastreamer-2.9.0-r2.ebuild 4631 BLAKE2B 25462c1ef45ee9e5aa2aa20a1736ca44a59d5220381ea9adc7c99e1e23c65d3b3b82f8710c0f44cf12e4363d91b484d434769edc297ef6f3817955a0bac14d09 SHA512 096d19166bdd2b0c63786563fc5fc1ecb012e0d12e5a6343dcc6b494486a32c2d20335842edab8bcd3f43a5dee4eaa8086f18d7d0828a6af5e3c6ff22a5a4af3
-MISC metadata.xml 934 BLAKE2B 2e1402da227d8892f2a2e739510ab4b81e2588bb057479976ddfe917a08d4248a3d7c4c286b4a5367b703557b799df57049a42baa46bd6c5fe1058a9466941fe SHA512 8cf01a51dd7bafcbd4ca39c49deacd38104d9640ed26ceab65e3f96ebb9e9be6caed8e8e0a3813946365fd6400141fac0481e3d29d59cef1625f132a81b2eddd
+MISC metadata.xml 881 BLAKE2B 9802cfcae35af83d1ee2da0b0fad0c48b2ffd027605628bb45e1b0ce4126d9e407fae3a6d2e27b5fe52875424414fbf5b850dcea2b1432a330c10b90be81c212 SHA512 0a764a56f797f8294bcc723069ad0d066055594e37cac460d0234ceb1db99a9df8aebb5b19a92771579c0eab4715069d255c4f62e936cda8d7c5091255aa5e70
diff --git a/media-libs/mediastreamer/metadata.xml b/media-libs/mediastreamer/metadata.xml
index f49ee62249f2..4f26788fccdf 100644
--- a/media-libs/mediastreamer/metadata.xml
+++ b/media-libs/mediastreamer/metadata.xml
@@ -13,7 +13,6 @@
 		<flag name="ilbc">Use of iLBC (RFC3951) codec plugin</flag>
 		<flag name="ntp-timestamp">Turn on NTP timestamping on received
 			packet</flag>
-		<flag name="opus">Enable opus codec support</flag>
 		<flag name="ortp">Enable usage of <pkg>net-libs/ortp</pkg></flag>
 		<flag name="pcap">Enable usage of <pkg>net-libs/libpcap</pkg></flag>
 		<flag name="silk">Use silk (skype protocol) codec plugin</flag>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 8528aabad520..2911842add90 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,9 +2,12 @@ DIST mesa-18.1.9.tar.xz 11146188 BLAKE2B 753f0fa3780502d56927f9b0e6124b4728cb5aa
 DIST mesa-18.2.0.tar.xz 11331164 BLAKE2B e4e7c65a0c3c0716451157f7d026df8836399b5a25ca7ce77746b34f82e0c14d0bfcb965732f67c979190c2c2db68f272ffafa51b49613a510f186e9e8a01c93 SHA512 e6e997e166845009f6b97da204384758c797c870b56332652c0a2636734638f9180b7e4dbad144495645308ae4d77981a2493a22d57973723338b658e0655557
 DIST mesa-18.2.1.tar.xz 11374476 BLAKE2B f0f3b766d68550f8c395a1b1d1ffc7a9e532c22ee6b91d698db33a270c152e03ab656d4219301bc2e0e95ba6f0583017c4361add928ad8ab26378a1ec6958f36 SHA512 d249bdf79aad36db9a8d291b3a1a100d283893ac741f58f85ae7e5c90ca25c37f80a5fa6fc57945ffeb0b67b788e7ea146543ec790b22f144578fc4c1525b84d
 DIST mesa-18.2.2.tar.xz 11375608 BLAKE2B 0b2a1b60e72885b2b48335645c04c4d5720c0b426c256781f3e84e22955ac87d9abe19550f996e3ff964befcc2b959e8639dcad585b3ec777dd629f06623e5ec SHA512 35c27f0673abd35d0581db34b6ad646058523dd826ff751df718e1f9d6a996409a0c5b313fbbf177058d9610a53d646f858fb86537e3ea1000df5edbddcf043a
+DIST mesa-18.2.3.tar.xz 11376632 BLAKE2B b693e42918be9980d86fedf136e872d785b92b49272cbd5374907f7c3bc857ef5991852de5cf7da1b4f16420b0cf9926541219d3b1717b78fe6fc6c3cf2c3788 SHA512 20f512b1f3835b1c78b1f05f2e2125dc3437b61b8857e7ec62e0f9ac3be2ccb5b7ebe7e18f444da1117bc100d75e4b03cd2a0180f0f0b1cf760714b43bc7a664
 EBUILD mesa-18.1.9.ebuild 13412 BLAKE2B 976868904cf8b157abafad9d16a3e59bda73a272829e5c74f1d812ace952f77857e4cb3aca17b0fe750e64584119b402a01156b096094249e6cb0bdd136529d7 SHA512 6e2ac62053d96fc7af4311dd6b3dad379726c4c98f585077c31246e4e481e517c8a3a200d0d9b66da26dce08c63c1410c5573490ff74f7313f9f673b9fe78f05
 EBUILD mesa-18.2.0-r1.ebuild 14438 BLAKE2B e684beb2753a05a833dfbf3c1e1d72e6f8df343f38499ad6f225c66b521c54e970c4957b531a5cedb64ef46e3d803c46a9a22d348251e0cfe812f4f9829cd11a SHA512 22b248c80ea9ab171eb21713a8ded77bab938e06876090683a6db4fea34572cbc695ce72fab67a5c9cbad2325551d572326bcf7f31ebdbc67adfb975f4011107
 EBUILD mesa-18.2.1.ebuild 14438 BLAKE2B e684beb2753a05a833dfbf3c1e1d72e6f8df343f38499ad6f225c66b521c54e970c4957b531a5cedb64ef46e3d803c46a9a22d348251e0cfe812f4f9829cd11a SHA512 22b248c80ea9ab171eb21713a8ded77bab938e06876090683a6db4fea34572cbc695ce72fab67a5c9cbad2325551d572326bcf7f31ebdbc67adfb975f4011107
+EBUILD mesa-18.2.2-r1.ebuild 13866 BLAKE2B d855aa91f016cb15b37b93e6eee78908077f77c1ec1011f64086452d34960f577a80f7aef8edde21b854c41850cfd75c4071ae0d4fb1248be5c6ce94e88e2a88 SHA512 0c211170189403117ac8df6e9b120af296977fd4c84fbf416f9849b3858d740c79893519f02467022a5f332a95e2a8cfb793c82dda0e3fd127e4aef1d8dcc3c3
 EBUILD mesa-18.2.2.ebuild 14438 BLAKE2B e684beb2753a05a833dfbf3c1e1d72e6f8df343f38499ad6f225c66b521c54e970c4957b531a5cedb64ef46e3d803c46a9a22d348251e0cfe812f4f9829cd11a SHA512 22b248c80ea9ab171eb21713a8ded77bab938e06876090683a6db4fea34572cbc695ce72fab67a5c9cbad2325551d572326bcf7f31ebdbc67adfb975f4011107
-EBUILD mesa-9999.ebuild 14489 BLAKE2B 10d1551937ff5cc590af4fb3beaa5134f5017ec3cc7b2d6c690af53673fe3015197866a063707011d5ed173c7cd4993d62225958c7750d1908d1444f0432f35f SHA512 5fab6cf4fd2ac64991e15fab63d8dd4827887a915195f597515238b42564d4b2d1eec54c4ad0706575d396ab03428d02c9ed227c73e3fe3cf4a992cd4a119fdc
+EBUILD mesa-18.2.3.ebuild 13866 BLAKE2B d855aa91f016cb15b37b93e6eee78908077f77c1ec1011f64086452d34960f577a80f7aef8edde21b854c41850cfd75c4071ae0d4fb1248be5c6ce94e88e2a88 SHA512 0c211170189403117ac8df6e9b120af296977fd4c84fbf416f9849b3858d740c79893519f02467022a5f332a95e2a8cfb793c82dda0e3fd127e4aef1d8dcc3c3
+EBUILD mesa-9999.ebuild 13917 BLAKE2B c63466b004fb0d38806a65d365774e6425158f0da2069e1264f9a48c239afb0fbcbcba214b22cb7bea8296c54fa389face4147e015490c9c906b749edf9c4be2 SHA512 9b1a635be556b2f173f2985d236362c4c7759b0b6d72e2abce5861a702ab9378613d39bdff5ff5b112ea383e59ce442a725f8286971efdef93829f505e1fac22
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.2.2-r1.ebuild b/media-libs/mesa/mesa-18.2.2-r1.ebuild
new file mode 100644
index 000000000000..7728fa3de19b
--- /dev/null
+++ b/media-libs/mesa/mesa-18.2.2-r1.ebuild
@@ -0,0 +1,526 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
+	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
+	vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	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 )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.93"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="7"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use d3d9; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-18.2.3.ebuild b/media-libs/mesa/mesa-18.2.3.ebuild
new file mode 100644
index 000000000000..7728fa3de19b
--- /dev/null
+++ b/media-libs/mesa/mesa-18.2.3.ebuild
@@ -0,0 +1,526 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
+	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
+	vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	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 )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.93"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="7"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use d3d9; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 2fd5700404f0..c50d8550e51c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -67,7 +67,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.93"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.96"
 RDEPEND="
 	!app-eselect/eselect-mesa
 	>=app-eselect/eselect-opengl-1.3.0
@@ -95,7 +95,7 @@ RDEPEND="
 		)
 		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
-					app-eselect/eselect-opencl
+					dev-libs/ocl-icd[khronos-headers]
 					dev-libs/libclc
 					virtual/libelf:0=[${MULTILIB_USEDEP}]
 				)
@@ -424,14 +424,12 @@ multilib_src_configure() {
 		fi
 
 		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			emesonargs+=(
-				-Dgallium-opencl="$(usex opencl standalone disabled)"
-			)
-		fi
-
 		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
 	fi
 
 	if use vulkan; then
@@ -488,21 +486,6 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	meson_src_install
-
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
 }
 
 multilib_src_install_all() {
@@ -517,11 +500,6 @@ pkg_postinst() {
 	# Switch to the xorg implementation.
 	echo
 	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
 }
 
 # $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 1fefc68ff845..ff4a115a4742 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -39,4 +39,4 @@ EBUILD opencv-3.2.0-r3.ebuild 12120 BLAKE2B ec841b5fb9fef1ea6cd7c61bb693830d9c95
 EBUILD opencv-3.3.0-r5.ebuild 17045 BLAKE2B 61f4d401f71ff70af717cf04be8e672705531183b7641cc0d5b26a2bea3486ecba8db844e34d9bce181f4386d7881ca13cef2cbab0799ca1c8161c5e9250e73a SHA512 1c4a1a1d4a36b0c703422cd803613b087c0b6c07d42daa0a00f16e42ee488cc4650789d627d50e4b641f6981b9ed4e40eca11214b3c1182968715fdbb53e6109
 EBUILD opencv-3.4.1-r2.ebuild 18420 BLAKE2B 1d002a35c093aede94f968fe4a8b5bde8af55508442094813b9e701da87e6eef437b2261caa525cf738c73206c894bc1ac1357844230b162252ff0f2208ce7d7 SHA512 78e79f66d1736b3bda066066ff9a2b8ff7034faf1d855f1c479ac79b6ceba6686c3a27865e4506522646cf40b7179e95cf63a64f0fa9d23d8ee52ca839109d48
 EBUILD opencv-3.4.1-r4.ebuild 18495 BLAKE2B 08a3a897c917669691b1c5fb7d7f39b81cd0b8f23b41a5ca4ef03e8b5d619867420001bd466db2fdcb8bd1d9b4f84d5f9f92b94be262146d2e98db80eebeefc3 SHA512 986839e6f74e608fd6d85077314565412f031d814442faa360a25fad04450164df202dec243f980146d865e1222c29f77213d08678274d29f943cb7e7ff5010d
-MISC metadata.xml 2580 BLAKE2B fa071ec1998c6e3daf2b09feb25f5f4a42ebe4a01e3bfa1ca8c6b9a9bc81f73f27b2916eed81d92e252127ca3fb07513f90bc655fd0976b9acd080d4747f55a4 SHA512 fe025e3adf0f6a8f5e1e1c8db0caacbbf871981217bfbcb43ab1bc2e949e2bfe82c19086dbc76d587fef2c4b53bf880e874861148aab61a525fc23df558f1e05
+MISC metadata.xml 2516 BLAKE2B 7fa4e18b8396fef6f78db6ee7d3b0180735cdd76a33b1e5977b507321b677937e0dfcdb77ee6d515211227916c11f29f58a3adcd2a9172dcb4b0f5a424a91eac SHA512 dd98217f83911b1e30193d00becb2b02fb36f9194c64a963169816299bd907816187bd5120adb5da1e01202095b439c1c009823d88dd1022a02520957195f491
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index edc61febd4c1..8414631c16b0 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -31,7 +31,6 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="tesseract">Use Google's OCR Engine</flag>
 		<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
 		<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
-		<flag name="webp">Enable support for webp image format</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">opencvlibrary</remote-id>
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index f39daae45863..87fa5a85786f 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,4 +1,3 @@
-AUX openexr-1.7.0-gcc43.patch 235 BLAKE2B 050fea24922fcda2eade967e13121c146306ce53f687e49b6b4a299d4bb08e2a002729ee50bf0a5bfdc93d1a6c8761b33933c4ac803c90b018608f91a13e1f52 SHA512 a19adcf1a8dec253f8577f5905775ea56dc5d2de4edc454a71ec86fda8cadd10a31e473db2341a203ee49b22c5bb06d75b010077ad44766cdbaa9f56b5f6859c
 AUX openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch 2871 BLAKE2B dcc0f9feda88f101e039973d4664df32fa9269794fffdb8686d4197b90615d8b75853ad97813d31a3aabd67589951341a45ebe258e7a9431250b90693939d3dd SHA512 c24365be8c645586efacbd8983a7ccaebb1452afd0fbb45b0e12e77e1442b2d27e19bf155745eeb05b214831f7c081c1f5967d7502bc13c4b53e01ea0e0b9e65
 AUX openexr-2.2.0-Fix-typo-in-C-bindings.patch 649 BLAKE2B ded357550fa531da4288c13d0c0a402bf3c73b53dd028474efe5436b5e22393059d94858ebf9b79760e953b93acd597698baec29406be15cc4ed0f666de5ffb4 SHA512 17ce63c9ad2c39606af83886db34fec3baafe2f9816dd2f6f0189e3caab0015910f89f8eb261a49d8ccb495d36b268b148ce09e2172a7b516b4832fdc8e84fea
 AUX openexr-2.2.0-Install-missing-header-files.patch 1929 BLAKE2B 9695d1c5294d312b5551522044d838db8c19e2a46d970b392ebb2d2889ea1c54f765f3195ce9b1df42b9ac7586a6569e9621b039dde5ab562b0bce5b74a9f33b SHA512 b6d1bb5a37bdf2283da8f45b71f3a8830a96437f2459746c5d354cecaaceee5e35ba3e3cf247e3c5c6f7930490233672542d8f7aaa59b79593d209e66eac8421
@@ -6,14 +5,15 @@ AUX openexr-2.2.0-fix-build-system.patch 17897 BLAKE2B 95f44167ce0590ee591a7b7de
 AUX openexr-2.2.0-fix-config.h-collision.patch 1556 BLAKE2B d7366aeae2a4d5b5496815d844de90c381d3a514dde0e37f86d2b2c5a8fe11eb3631aa44a554a5390cd2a43700cc8a36ff88af4a0e894c4774c45edf0129c4c5 SHA512 15d654f9e1546ea32a6175b1cce24ed9d979afe7dd763ca53a17c1020ca8851c31cc3b8fc0e4ef31722ead91557e24a67958ca9ee5fd0fa4e574304c3153be33
 AUX openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch 2536 BLAKE2B 7eb4db8596cd157f30ba7be564f776598cfa0d893dbaf8f729e8041079e851b0272ba595298e10792a5c74c14b21fbea78a4157d9494501f2c1ca5ef946dc6af SHA512 530088a51d97039e951055361526b8afa2c322351971d26302d21ddd6fdf2d21682df0577872be608b8cd0c3d3fc05792d871e7c724546be42bfa439e74bb726
 AUX openexr-2.2.0-use-ull-for-64-bit-literals.patch 1934 BLAKE2B 616f29857b5cd95c21bfba22ed7df51b1fab88476836eecee08a1befea4f82303ce35bc00eab34762d6cbba660851356198420e6a96092b8eb0a630829d3f132 SHA512 b799c5924bf8dba468236f4d43feab8ca7d8a88444595f2355671337f38d2868957d1372385000c36ed7ae74499925060d402ef9a82a352ea85dc7378cde21e2
-DIST openexr-1.7.0.tar.gz 13542910 BLAKE2B f187aa1b7c703bc912bfc87eb6f9d44f1ed08dcfd466cff46845afd1e338c5cd518da54628a9cd96c08dc796aaf6f35d5a4188ac7c3db3d2cdb8bc20a70edaf0 SHA512 1fb033f909961a9778b762241e09946d19c7e75bbade7b5a942bb159eec3af9200afd722c3170165ad4b1fa602d9dbe6938112aad1716e7c7e6b8c37ee3980e0
+AUX openexr-2.3.0-fix-build-system.patch 2381 BLAKE2B 37fd9c6ae5357ffb93fd47344137b4c91110a79ab2b685ac048109192f87e41f01aaa0a0fbee222bfa10ffdc58340d7c803b3068bca8bf99c323dfe46252597d SHA512 36889880813acf75a77d3d34ea3f0a6535ca45194ad491bec17df3701d1eabd2bb03d81c525ba96cf695e91ec67abeb1b2395cfa45ff0767d90b4600d63e768a
 DIST openexr-2.0.1.tar.gz 12609335 BLAKE2B 25adcf5a679a0419a7ff0ddd29d4d1c5f1c28cd3fd6c81b0a5c0cc63d907e741eaea378f4ebaa9a66afce0349edf7231ebd2bb3e493aee484860c89f05f45960 SHA512 b35e3e795496f9d4a56352c907bcffef14ae062b189c4e1df35f3ab08c5e9abf829fa9149db3198d60088fa9633816650011e5f7871e07324801b95549d6695b
 DIST openexr-2.1.0.tar.gz 13680816 BLAKE2B 2d3cb4e0419160b07f1efe9a853f1d5deeb0499da4f79da201fc5eb1f57102891da666e161b2d8ec43a6f0b6ff6f5c7b92c2baae51a808892691182290192992 SHA512 d69924331c3392b8063229391414bb90f16ce317c76cfffe5fe0fcbb25e576f6ace8320b51c2a9987fee912cedd8e69116d4b49ba716b4a5f011131a81815403
 DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de3657eb38295ff96db6ddad240391379a6624483abbe619f80f0979fd9828992d236e55b5014916d4d39d6ff51d0815 SHA512 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a
-EBUILD openexr-1.7.0.ebuild 1181 BLAKE2B 13e1628151f4bdb52e961338990b2fba921fd09570c0763327685a16c80337eb81f029d00d0d064a74337f22e31f99ea56f9e280988965df8bfb44a7faaa6d27 SHA512 69d3ec9b799f7b5c09d5d9df76a234929334a2ca9ea95dc2903b62475b53e5ebe8ed06615c59f0a79885eb18311c4b042d3ff8c384a618a9fae3029e6e91ca34
+DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 EBUILD openexr-2.0.1-r1.ebuild 1255 BLAKE2B 23d26effb4996d82e843a5811fbbf2e609ba93a5383eb3844e4c53253c9748a915a08df1cfcedfa4393d695e000ec201eb92cd022b9fe9d607f3b78ea993dfdf SHA512 e46119eb545d174f1565746600df038e0028340f59f7670e1c0975a9b7a4c4a266a80970dccba054041b0bad31a98763b8aa5d4b9db32f83e65679e3fb0bab83
 EBUILD openexr-2.1.0.ebuild 1256 BLAKE2B 0c8154e2bf910e9d3994c28f9a29f725efc1c677d1a587162e6766d24e6f6ac7d0ab7fd98b46d5ea3103321d12de217678d4de97ab555733af8e99cb1aed97fb SHA512 c5a8158b4ebb432479f7edfb39b41d3742d0bcd3cca4782dac1bfa1b4aaa6191355dc0a4b2a5c643874c19829c2118052ef1841975b6f7c97ee23542dd3063fd
 EBUILD openexr-2.2.0-r1.ebuild 1578 BLAKE2B fd0dc90294f80362a6575e445a6510efa7f218566b97869dbc9f12c6187e3b0be0cfb24aebb2460925b40bced9bdb42b058974a9789d4c775494a6257f16cc2f SHA512 830f0c476b53b59bec9e65e0859c1623425a0b3a5bdd5081c1cf62be9f274b452c373e8ed2e7b4d6b92d8a20c9f477bdac9a80f604d3d8866ccdfac3a924849c
 EBUILD openexr-2.2.0-r2.ebuild 1862 BLAKE2B 2ddcfb899e3213db76211cbacf9fe7afa597ac0fece9ec4655e390fd6501a5cb15f3553d374408d748c2a4364b519f15f71e82af7d93402736b9c1c245b50266 SHA512 028067478c69a1eade6bda177b734f6530de91e6350e9057aadef4028c0a5c3cc5ca8989186fe59c9b9075d9d17e119e7b53d3713acc29228af52100250a9fda
 EBUILD openexr-2.2.0.ebuild 1248 BLAKE2B e4926afffcbf1f64891ed5ebdae8d4ab5895ffde3d79e3a29eeef121d8214c4c1528ccaaef62e35830b09bd1f54d1ceafd0b62d3652cff76160d7ce155e26955 SHA512 1af7a2a6c95ddd32b1688495b65954982974fa5cb3c0374ee16d6f89f049191a14a7e79fd6fdbefc8cf25ba67e0450e684015798325f2258982528909ee2ed9d
+EBUILD openexr-2.3.0.ebuild 1933 BLAKE2B ec44faffda4f70c5a9964dc09d6ec2e3c068fcb6463524d64a3cd0613e48d9f3b8250d3a9b8f7a05414b9df506de67c90df08c24dcc1b71a83306eb4d738180a SHA512 502493e8c7793954b4255b7f6e73835c068a70287ada74f2a21bc42377830258e0420400276808d8c21a0ecb00ac5cdcae1aa4d9cc5747b492e64eb390773add
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/files/openexr-1.7.0-gcc43.patch b/media-libs/openexr/files/openexr-1.7.0-gcc43.patch
deleted file mode 100644
index ab99eb9a19fb..000000000000
--- a/media-libs/openexr/files/openexr-1.7.0-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- exrenvmap/blurImage.cpp
-+++ exrenvmap/blurImage.cpp
-@@ -39,6 +39,8 @@
- //
- //-----------------------------------------------------------------------------
- 
-+#include <cstring>
-+
- #include <blurImage.h>
- 
- #include <resizeImage.h>
diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
new file mode 100644
index 000000000000..811a7af38758
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
@@ -0,0 +1,68 @@
+diff --git a/configure.ac b/configure.ac
+index 067f9d0..fdbe2f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,8 +13,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
+ AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
+-AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE
+ 
+ 
+ LIBTOOL_CURRENT=24
+@@ -28,7 +27,7 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+ 
+ dnl
+@@ -58,8 +57,8 @@ AM_PATH_PKGCONFIG(
+     [ILMBASE])
+ 
+ dnl Define the version string
+-AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string])
+-AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
+@@ -110,16 +109,7 @@ AC_ARG_ENABLE(threading,
+               [multithread="${enableval}"], [multithread=yes])
+ 
+ AS_IF([test "x${multithread}" != xno], [
+-	ACX_PTHREAD(
+-    [
+-      AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD)
+-      ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS"
+-      ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS"
+-      CC="$PTHREAD_CC"
+-
+-      AM_POSIX_SEM()
+-    ],
+-    [AC_MSG_ERROR([POSIX thread support required])])
++	AX_PTHREAD
+ 
+ 	AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
+ 
+@@ -195,15 +185,6 @@ dnl AC_MSG_RESULT($complete_iomanip)
+ dnl AC_LANG_RESTORE
+ AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
+ 
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+ 
+ dnl Check to see if the toolset supports AVX instructions in inline asm
+ AC_ARG_ENABLE([avx],
diff --git a/media-libs/openexr/openexr-1.7.0.ebuild b/media-libs/openexr/openexr-1.7.0.ebuild
deleted file mode 100644
index ac9a2a1e958b..000000000000
--- a/media-libs/openexr/openexr-1.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils libtool
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples static-libs"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/ilmbase-1.0.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "s:/var/tmp/:${T}:" \
-		IlmImfTest/tmpDir.h || die # Fix path for testsuite
-
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable examples imfexamples)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}/pdf" \
-		examplesdir="/usr/share/doc/${PF}/examples" \
-		install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	if use examples; then
-		dobin IlmImfExamples/imfexamples || die
-	else
-		rm -rf "${D}"/usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
new file mode 100644
index 000000000000..99f63d05e1f9
--- /dev/null
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/24" # based on SONAME
+KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx examples static-libs"
+
+RDEPEND="
+	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2016.09.16
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-fix-cpuid-on-abi_x86_32.patch"
+	"${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
+	"${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
+	"${FILESDIR}/${P}-fix-build-system.patch"
+)
+
+src_prepare() {
+	default
+	# Fix path for testsuite
+	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-imffuzztest
+		--disable-imfhugetest
+		--enable-threading
+		$(use_enable cpu_flags_x86_avx avx)
+		$(use_enable examples imfexamples)
+		$(use_enable static-libs static)
+	)
+
+	# TODO: check if this still applies on updates!
+	# internal tool dwaLookup fails to run when linked with gold linker
+	tc-ld-disable-gold
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/openexr_ctl/Manifest b/media-libs/openexr_ctl/Manifest
index 95541198c926..b76963eab676 100644
--- a/media-libs/openexr_ctl/Manifest
+++ b/media-libs/openexr_ctl/Manifest
@@ -4,6 +4,5 @@ AUX openexr_ctl-1.0.1-gcc44.patch 457 BLAKE2B 574e0a606769c996ec8eeb556165a0327b
 AUX openexr_ctl-1.0.1-namespace.patch 348 BLAKE2B 4bb257667565106034c687efd5d142380c5e1bb662c9d552d8abca29f1e5d0bff96ce1fcbbf6aefc205c7921dd930b21e56a33ac1aef54e5868c8e6a838fde82 SHA512 28f3b0964ccb7ee81dfc4c4600f0747e28d11ada1fe3a3b5beec17c56bdd8d66c37f6d4974272d6a0c54a397445665eda06a81f5ada64cfd96f74c2461cb896f
 AUX openexr_ctl-1.0.1-pkgconfig.patch 632 BLAKE2B 2adfca932aed12a83634c917b5af224e5fceb3e404fc0c4aff3fd4ac225c21813d919d2d2d05902193cd9fb47532c7692deb5eb9b4c04a1641416691ce3973cd SHA512 38c683204ded3aa0c0e5d83506a2eb49cdf33dfa7b44f5dce1502783f18aa154f8f4b5357aa4a07932ccacafb3d8cf32b80ce288cbcf0e75ca917adc2ff5e271
 DIST openexr_ctl-1.0.1.tar.gz 362864 BLAKE2B 4ac3daaeeab91bbf9d8b1e23ade7934d5917b69df4e6b717a1b5a2b27a73b68d6e0fe06eb2b420d7fb5fe3e284c1615a56cc46973eb2de3604c2a321c5456cfb SHA512 831a06dc83ac53ae9b520629dbd24d3a7cd24f3ab5f484de37d1b232dd16fcf71392d163a7b9f9059bb8f30ff249f7f5a9fbc35730211ff98c8e13dcf386898a
-EBUILD openexr_ctl-1.0.1-r1.ebuild 819 BLAKE2B 4028585cd2732b5bcb77943a9092d2dc6e8c54f8b1b83d0be22d366baa560c80d6d47d8c16a4f7b4f5af9bb3323baee766fdcf27908b5b04ebcd61188e3fe729 SHA512 c3735a51c956e92301355870d58b5a48ef84df9c2f6a945b1e2e961ad22e462cb33aec57efde77407d359fbb0ad0e47cede9664866873c73881a1e6964a34ff9
 EBUILD openexr_ctl-1.0.1-r2.ebuild 860 BLAKE2B 3102272cfe46534bbf986870e26771fe7003b15e064798fbb05fa4c903ab9ace8b57113a19b50770c2b5f66a7258b53dacda04ae9441d29b75cbf35eee3eaac4 SHA512 a8e703006dd4ee0586ad583c1c7e9948fff4053930728e3a1013434b3975e6e1597293ea936646c136f51e47a1f923491db487bf1d0eaf5b99027fcd0b7df74d
 MISC metadata.xml 301 BLAKE2B 149874bca2d8b5957909f8749f1b274cec115425510904811eebe3cf19b76b28924a060d86f57f3fb6953c8e8ea55da59dfd8c4d4f83fdc8ee0b7f23f9dbf264 SHA512 6df4d1d337a4c00e4a2415c19a46d07d1a151135fbf29a92de300b077de3ae4fb64277b639448edeb0e64bec87d120f67d829f569cce2368388f3b4478dcd1bf
diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild
deleted file mode 100644
index aab8afc2af60..000000000000
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="OpenEXR CTL libraries"
-HOMEPAGE="https://sourceforge.net/projects/ampasctl"
-SRC_URI="mirror://sourceforge/ampasctl/${P}.tar.gz"
-
-LICENSE="AMPAS"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="<media-libs/ilmbase-2.0.0:=
-	<media-libs/openexr-2.0.0:=
-	media-libs/ctl:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-{,configure_}gcc43.patch \
-		"${FILESDIR}"/${P}-pkgconfig.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 6c80989a6f6a..95bd181fd69a 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,6 +1,6 @@
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
-EBUILD openjpeg-1.5.2-r1.ebuild 1950 BLAKE2B 5b4ef91a75eb0f8196c49fc96c8801b41aa56023beef1ade06288a4c0a2e18671c8f3502fea5062fdeb5bd80a4f413c81795866f1560934b376e342207fc46b9 SHA512 37659e14af22aa43470897c3a057c7b7afe445982cac3967bdff0d669ae80420f354482e3b8a1c384665a8b0baa1e5985c136cde8de3337ce0d9bce0753b46fb
-EBUILD openjpeg-2.3.0.ebuild 4071 BLAKE2B 784812951b98f3f4fd114ab22961e10422313202006b2b4ad64fc0104225ccaa7294b1f5718b2e4196da8b33d3fdf3116ec39eb7d4eeec812f4c63d48afe4048 SHA512 70aa6abd0d7be04667f3ec4ee8605637c588a436555dcbfaa63d38406a659810c5d5bb9e4ceafff6714f0d5d64bfd943e41b80f175d4abd78cc211de060460e6
+EBUILD openjpeg-1.5.2-r1.ebuild 1948 BLAKE2B 08ae38cae98a197e1bd980101b9e5938e8d29dc9a37421adb14f421a4df84b5cca4ed216d939d757e519684493b5b58c1f5273922e9fc335ee65a958ee898550 SHA512 8b18759b5eb0ca3e5446453f6f3e550a20519147af5026169b28eae43ff51a94c6522efbc07edc39438e3372b16452fce4f41f32b2ae848ec779a1ea25f6513b
+EBUILD openjpeg-2.3.0.ebuild 4061 BLAKE2B 053eaa5be9d8fea70993aaa213bcd1cb7c295a65f1b0b0d0a486603119c1f68d853e5d54004d99e6b3c73ddb264371aeaa2bb27fd992eb08173d8f8947dd24f9 SHA512 755ce46efd8ea987b1d4cabae47b5d342955454a4a02735e9c504e19b6a0d11324caca8e20e2a97adbaf048c361833991c24cad397e31bb285be237ab2e5e3ff
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index d0044af48162..a12928765e77 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-multilib
 
 DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="http://www.openjpeg.org"
+HOMEPAGE="https://www.openjpeg.org"
 SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
index 44197fb431a5..e447db85d6a1 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit multilib cmake-multilib
+
+inherit cmake-multilib
 
 # Make sure that test data are not newer than release;
 # otherwise we will see "Found-But-No-Test" test failures!
 MY_TESTDATA_COMMIT="c07f38fae1e67adc288c2d6679df5d3652017fbe"
 
 DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="http://www.openjpeg.org"
+HOMEPAGE="https://www.openjpeg.org"
 SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20170814.tar.gz )"
 
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index afdcf3fe2a21..31972a24e359 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,5 +1,5 @@
 AUX portmidi-217-cmake.patch 13124 BLAKE2B ccbc53bd6a740fd87789931869aa29d66c3e4b404851f8f465f713fb0bdad2756ba77267396e5f966ae266c1f05b7972f5abd5559ba7f1358e50cf65e3825e63 SHA512 36392c6e5e9f21d8791866f22345569346e4827bbb3525c119f2a28d8ec1d055988a360c2f53323f1d12f8294896656044c5890cabedd7fb6c2f730f5d72e4cb
 AUX portmidi-217-python.patch 764 BLAKE2B bcf569bab2c105f99b7a3b10c0124fa22b7fb0d9d494024c17c01f3bb6641441f1942b4dae76725835e880c4ed90c03e151f218b4eec78b29fdefc343cc00b30 SHA512 5f5e582d1769c995038d1b073eb603e313f1a49b5d7cb832de9f2aef003dfcf34bcd848337dc180ee23bf87ad631887584d339474c45e57b6a78d179c929ec43
 DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
-EBUILD portmidi-217-r1.ebuild 3087 BLAKE2B e84ba635d7192ed9730012df422bc92dacff710d140544f015934bd8a6c71dcf6b5080fe5b0e18b0f20ab069b4c727aa2e1b29bf0d4f77be17b613f1a4ef0d63 SHA512 24e5420c9569513d85cc7c21face7d6b825b0e97140aec10ae6174b0effdc9a42cde3f8ad6656a40219e2184b310de643b5f74911f032a8740a5a0fbdee5cc84
+EBUILD portmidi-217-r1.ebuild 3067 BLAKE2B da1098e9a9199d82dd3e2f005da51cb5de79b3cd76a45444876bb28046fcdcdb4a8d51170926e67b107af3ba2d7c6bf3cf9b81f0d6c06b3a70847b529cb0d0bd SHA512 43955227cae9c7558f833131c3052ce8119c2c285aa4a10dc5c79ce2a9c4bae14f6e2127d5bbf4dcbd63e4992b869780275c575026bb45e3e7091ad6b0ff4416
 MISC metadata.xml 436 BLAKE2B abc47a4c2597048c3e2037006db7811d99cb1ce5c35d83dec30fc415f6d419344bf283d580c153309bb7934b6a12fae878cd480f6c12be76deb52bd5494e2c5c SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc
diff --git a/media-libs/portmidi/portmidi-217-r1.ebuild b/media-libs/portmidi/portmidi-217-r1.ebuild
index a515367b7ece..0adb4d32f4bc 100644
--- a/media-libs/portmidi/portmidi-217-r1.ebuild
+++ b/media-libs/portmidi/portmidi-217-r1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
+inherit cmake-utils desktop distutils-r1 java-pkg-opt-2
 
-inherit cmake-utils distutils-r1 eutils multilib java-pkg-opt-2
-
-DESCRIPTION="A library for real time MIDI input and output"
+DESCRIPTION="Library for real time MIDI input and output"
 HOMEPAGE="http://portmedia.sourceforge.net/"
 SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
 
@@ -17,25 +16,27 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~sparc x86"
 IUSE="debug doc java python static-libs test-programs"
 
-CDEPEND="media-libs/alsa-lib
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	media-libs/alsa-lib
 	python? ( ${PYTHON_DEPS} )"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.6 )"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
-	java? ( >=virtual/jdk-1.6 )
-	python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
 	doc? (
 		app-doc/doxygen
+		dev-tex/xcolor
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexextra
-		dev-tex/xcolor
 		virtual/latex-base
-	)"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+	)
+	java? ( >=virtual/jdk-1.6 )
+	python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
+"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 PATCHES=(
 	# fix parallel make failures, fix java support, and allow optional
@@ -72,9 +73,9 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		$(cmake-utils_use java PORTMIDI_ENABLE_JAVA)
-		$(cmake-utils_use static-libs PORTMIDI_ENABLE_STATIC)
-		$(cmake-utils_use test-programs PORTMIDI_ENABLE_TEST)
+		-DPORTMIDI_ENABLE_JAVA=$(usex java)
+		-DPORTMIDI_ENABLE_STATIC=$(usex static-libs)
+		-DPORTMIDI_ENABLE_TEST=$(usex test-programs)
 	)
 
 	if use java ; then
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index a9ab8830bcff..31b9417f0197 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -2,5 +2,5 @@ AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc083
 DIST raptor2-2.0.14.tar.gz 1877454 BLAKE2B 9c427d9184951d7fa385c12eaeffa35b504ddfc887a10d2bfb9cffdb34b8d0d16fd56a1033f57de3096a9bfbf72a7933a6dd4859bbbfdebd671386128318a2a0 SHA512 399e23f2c549df8f1d709d67129d3fcf7899a8cdcdd8071c165f2b4106f397cce05fc69a6d7b176857011bf95723c0909b6510eded12f82217f89925bc1ba7c2
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 EBUILD raptor-2.0.14.ebuild 1654 BLAKE2B fc1cc4bdfca9fe92c0db896255cb21e92461b6c05141afc974d35ec03e6cdfc4821ab3dbb9da15de4365416088244b5078f2d349b1dda90e167dbeaa9640f193 SHA512 5ad6857a52489f1703ca5acbdc460d315906cebd955dd98b2135423f79699ccc6034a8acfd83d144b52a9f39938f7e6bd5cdc1b554953d930ae1e1106242ec1c
-EBUILD raptor-2.0.15-r1.ebuild 1581 BLAKE2B 345991be990091a194dd9605a981ec91fdfe60d427a4bd456e55ca6844d1bc39257909d3d9934023b11488962578c5141ddb526ae339684d1b8c592edd911978 SHA512 c30e4b1da375d0951dc3ae4ea34f90a2b7d6c13be3e48131f4ff8421dcea06be7f94adce2f1afef8c63429427315ccef2b86e2355c2758ce83eac0dcc7ae8f47
+EBUILD raptor-2.0.15-r1.ebuild 1580 BLAKE2B c469e05439a8c7c5a3964403089ba42c39bb8497379e1a20aedb3abb43393bee63d5a005dc9e26b36e43804a5bea1043b41ba43220bcc014eed06958d6ce67aa SHA512 36332021d7cd17f86fc4fed7f77aeed96ba76726d14f27f64a63a033600860b2b39d20b9a4cf98ef5f7547cca6678d6676d3c64572cf8ef657c94f6564df046c
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r1.ebuild b/media-libs/raptor/raptor-2.0.15-r1.ebuild
index c9104d26d5aa..f0b6ba1ed110 100644
--- a/media-libs/raptor/raptor-2.0.15-r1.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index e909b619bef5..efd23662402a 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
 EBUILD sdl-image-1.2.12-r2.ebuild 1571 BLAKE2B 92b4f2bc93405c473d994dff82967804a8c88b6ed55df5fd7a5f9ea58cedd9f666480e354e180a88566b8847c0c0ecfdb9a2159c1e150da1cb362db2a886c5ef SHA512 8e1a1ebc29e9bc250c819707afcdc38cbee4ad10f5e79e207db677dc6745529e53456fb34d30de0ea61678fc04d0b17bfc4f17478eb1911f389ad27956edb959
-MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml
index a92c1a1c50db..26079e608bed 100644
--- a/media-libs/sdl-image/metadata.xml
+++ b/media-libs/sdl-image/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="webp">support loading WEBP images</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index fb4170292ca2..740f4098abcc 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -12,6 +12,5 @@ AUX tiff-4.0.9-CVE-2018-5784.patch 4251 BLAKE2B defd555ebc53e178439331cd04f3099c
 DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6d2ec497067761895cb2de7674108e8ca2f35f845dcd2e45801777fe25d234af1c308acf59846c2f5617ab53 SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77
 DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
 EBUILD tiff-3.9.7-r1.ebuild 1941 BLAKE2B 38e7fc7b06adec30d32dce66390c5174fa8ca514d8fdc12d6486ed3b8a78b95ea2efb3e083c959892ea65e46853b4c5b7236508c9812736ff0bebce26961d64f SHA512 659c879ae594501bb3a88dde00797d67fd004cbbefbb4403a2374876a6c909cb38f4a7d56256325c5d53fd7ed107849e7c2862f9de777ab6b6d996ec279fe997
-EBUILD tiff-4.0.9-r3.ebuild 2253 BLAKE2B e22e677bf03b5ff4ee7e3e074bb6a3c8f86aa636f3f0700326fd4a4552c4ea524711f954e32729240b43206fb2bd318de3e91d2217e730bbb85653b286c8a12a SHA512 b32c074d598f94498ee81e59e347e75dcbbf4ea7ef2b456c2e98c219b960f42e8d36cce85f8ee2e71010f8fb260ba3a86b5b993e22c1cef041a9729febc643af
-EBUILD tiff-4.0.9-r4.ebuild 2348 BLAKE2B 2c0710e9996242def120cd22fb5764a125ed97de0f319b1ccb52c1910f811908979931d5f3b424592cf8cd5ecb6e7f962607c938a29958aa5f50a7beeb8aaef4 SHA512 cb99736a791d372161b048b9468be0eb35c516b5d6d750b56c84ac9031957c7e150b0a548ae999afcdcd3125b851e408aea9fde107316a8dd97a0fefa0eb1162
+EBUILD tiff-4.0.9-r4.ebuild 2354 BLAKE2B 272c6c559ca76d81689caefa8dbd66aa22b8e29fd2cf35ba0699abaf2e85fa1f542237c9eb3b85735921617b76790bdbaede55b0c113a7cc2d35b192d3821e85 SHA512 ee3c1ab75d4694bce0e9523394ed0bf9daca1de6bc276199d96b655192a59f72ddc4bbbc7981e26c6f44531da334bbaab94fb9fa72191d6c241e861b71e78e4b
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.9-r3.ebuild b/media-libs/tiff/tiff-4.0.9-r3.ebuild
deleted file mode 100644
index c65a11571722..000000000000
--- a/media-libs/tiff/tiff-4.0.9-r3.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 autotools libtool ltprune multilib-minimal
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
-	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg lzma static-libs test zlib"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( jpeg )" #483132
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${P}-CVE-2017-9935.patch #624696
-	"${FILESDIR}"/${P}-CVE-2017-9935-fix-incorrect-type.patch #624696
-	"${FILESDIR}"/${P}-CVE-2018-5784.patch #645730
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-src_prepare() {
-	default
-
-	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
-	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--without-x
-		$(use_enable cxx)
-		$(use_enable jbig)
-		$(use_enable jpeg)
-		$(use_enable lzma)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ tools//' \
-			-e 's/ contrib//' \
-			-e 's/ man//' \
-			-e 's/ html//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		emake -C tools
-	fi
-	emake check
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -f "${ED%/}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}
diff --git a/media-libs/tiff/tiff-4.0.9-r4.ebuild b/media-libs/tiff/tiff-4.0.9-r4.ebuild
index 306c44a85853..97a274e6ff3e 100644
--- a/media-libs/tiff/tiff-4.0.9-r4.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
 RDEPEND="
@@ -49,7 +49,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--without-x
-		--with-docdir=/usr/share/doc/${PF}
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable cxx)
 		$(use_enable jbig)
 		$(use_enable jpeg)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 3f8f6f5567c3..697b74127e04 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -2,13 +2,16 @@ AUX arm.patch 1188 BLAKE2B 886fd2b177c0e1bc1dbdcb6f6b14219eac807a26dd76e67d57727
 AUX neon.patch 677 BLAKE2B 805177f9d3d3f703699adad93b0ca655065b9d093ecc3776600fa4eb3c565962beac47ebbeb35dcdf6fa3d0d19c734310b4032bcda62aeeea8ddc99debe901f1 SHA512 69e3d7c6d987ccbbaa7111eb8efc1e02c1e02096936a0eedfbe7e9e1c1377bed0f50f7b09aec0768e8de31251b8e3d2191aab56f19259c0e4aeda9684ab55bc6
 AUX non_x86.patch 698 BLAKE2B b565a558e521b32ff67b24abb49a546615f42f009dc12ae9ee00a43df3efa657960601109d3023e07322fc47b5e4d87cd8f4d12efd44888a28f52c9c6784a353 SHA512 444623b91301049175624664de58eef6735c1b86c92792e5a6f1d7154e08f46e861e38f7cec23b5528deaffabcc494ec8754a48ae8cdd9e0f8665bdf96c4cd5b
 AUX ppc64.patch 619 BLAKE2B 17ea28b03ee80af9e73222df7d999138a51d6c8836574d005981426465e328cffdde034753fcc510ae305ee061e2aa278fc1a37c3bf2bc439f7c6f21bf991c99 SHA512 7b23e9bdb3cc634206ffd42fc381bb3b7915b7b788b30567e01592d83b3d8aee8ba794a20587a31e5ead02c837deae9c8f3d9e82b2b05409892dbe6ff37fe822
+AUX x265-2.9-detect512.patch 374 BLAKE2B 7123069c19e85ac5953434eb6c4a80135e60178537f3598e796cf6550cc4efdb5bcd358bc96401d948d26f36676892bb344c097143a310a1e19c8b2a921cd44a SHA512 6be1540b89f0f622476d3511dd01cb3dcc24ff4823cef57d08432e857fd7da3c9810904a02d1583896767a33f97140651d3a4c163952ed459338623999d93e18
 DIST x265_2.2.tar.gz 1203801 BLAKE2B 239b34c45b07c5bea83f0555d2d8f44322bd8fb3164264ff10f3887bb244ce7e605a82c2cb0a2f2ae4f2749e009baac19407109996e599dc41bc970a610ed086 SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef
 DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
 DIST x265_2.7.tar.gz 1282742 BLAKE2B 5f7290a71009f1ba177b2a653c48b62d8067930e8e53e4f9dd149037d3cbc69acbcae9c5364d46e6cc127f7d70e2acaaed2abf3ef065ecae303088132f341757 SHA512 58582ff5c282a8ca6213a98495b95fa941f323fa454924e4751dde6d2a0e87a08d6e8d98012164a3d83523f2b004e7a1420b60b64719fe30f460dd10ec075094
 DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
+DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
 EBUILD x265-2.2.ebuild 5675 BLAKE2B 23cf92f51a8a8fed656a17cf0a59893931d42df5be17357a2873dd0da46bcf12ffd0b6c46d62ccd396566a7f53e8bdca5fbfbfbe72d4ff7d3a6454f1a4272cec SHA512 546d1f76b40c33047ad947c91c698111e8dabccf84562742b8c0142a86ac6148ea1b3efe238952d414f0f27ec24b8f159b76c1d6c53db811e84953ea6cf64ffc
 EBUILD x265-2.6.ebuild 5654 BLAKE2B 6352a49f50d7773b7379be149e650b4721d939e484ed3216ed77c448c226af1e3a66b6da3be6b3b80983224abb78519cc506632728f95e5f01e9fa8374fb8fc4 SHA512 0e75425dc9d4cf7155029aab3f2b522b4556f9fb85df7e845a1a48b56cb302db72c1c3e3b69610eac925b9c3e7daa64982062194a654939632713d7a0fd24d04
 EBUILD x265-2.7.ebuild 5661 BLAKE2B d8c795c3923982eb5a13a290d409c822abd8421b0d1e058202b34204fe79d743c3eee3d4ae579533497595214a7a2de71646ee6e81aec8b4830a287e4c2c1ec9 SHA512 4bad0afbb56a8659ed7ee2d213c59f3c76ffd2a8bc192f083609a53d72e7818c70926293886c9b509e56a11f64b5dc375397bb4feba333355ccd831ba1ef1c46
-EBUILD x265-2.8.ebuild 5683 BLAKE2B a3c6fc5a38d1fcdd6a03848bdff86777ca38adb83643eee6a04d11f14c24d2894b859fb1186b9dc2d9719eca74283afb40df9e43a2946bd535bed2dc05677a90 SHA512 333d2ebc2b136c9ce81c2c364c6a49dc3adc07cdf701c612bd64a7ea4def282d08d2e11af5aeb9df97c4406e0fb3474da00242989adfba9984c295e7db608846
-EBUILD x265-9999.ebuild 5661 BLAKE2B c01180df215de891d5f60dd877a0acba88351efe58586ffd1f022e1b337f0b308cfdd096104b4bae667ad2050566ebf6417955ef4f058a804c1cf8a95c36a01a SHA512 d8a48e121ddb761ceec95f85881d4eb164314440af38cd31aec8875aa3f940539838b796fa34da049ad630e3c9f4fe3e9203c7e558dc86e0d3b490fedae808b1
+EBUILD x265-2.8.ebuild 5680 BLAKE2B 0ee62251a5dc184a5cda01be4d0c779e5101b3f90f1d9a5921c5ba300798fac1acb298e7066d715d6923ce4505292ebafdf005b04745b1e3f615f0d8319fd3a3 SHA512 9e75cf8f636fa69550739f0fa56cb94b564a257d97f776df22e9c90a79adbf3ebcf86a0a62e3cec9e672caeb6798e1ffa639d15edd293b7f2e068fdfb3ac8d98
+EBUILD x265-2.9.ebuild 5699 BLAKE2B 7ee30b5f06d51afdebf6ee278eb0e7ca8908fc703e2fcdb80c0b7095d9ae9edd83393e61c699343a53bc0d0786f1e558431e826a281d8ebd943ae5825e6bfb20 SHA512 cf9da7ce4f15df6afd31915869f426bde0306a381d8a7f1fb05987ccf2a618123d361c553d24d28681382022223e8775342cb575e387df87c28a327c5237f0d6
+EBUILD x265-9999.ebuild 5658 BLAKE2B 8d49a15d453de1f14490127df3a87cb54a6cd5ec537d168f96e14bbf86112c83250b9c628d0716775c822f2d09ccd03f72a14d4e338b951f35e9e3ec658b7edf SHA512 86e7f61a3614e7e40cb2570a0bb613187d419ff7e0551974cd0b2504e6c95ab1b51c462bfb2031b7d68f5cebd80ab79a62fda5c3bcd7f900ae8d21cd011965a2
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/files/x265-2.9-detect512.patch b/media-libs/x265/files/x265-2.9-detect512.patch
new file mode 100644
index 000000000000..8437ed09b884
--- /dev/null
+++ b/media-libs/x265/files/x265-2.9-detect512.patch
@@ -0,0 +1,25 @@
+--- a/source/common/cpu.cpp
++++ b/source/common/cpu.cpp
+@@ -110,6 +110,11 @@
+     { "", 0 },
+ };
+ 
++bool detect512()
++{
++    return(enable512);
++}
++
+ #if X265_ARCH_X86
+ 
+ extern "C" {
+@@ -123,10 +128,6 @@
+ #pragma warning(disable: 4309) // truncation of constant value
+ #endif
+ 
+-bool detect512()
+-{
+-    return(enable512);
+-}
+ uint32_t cpu_detect(bool benableavx512 )
+ {
+ 
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index 5f87da893e5d..c60b19162d5f 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-2.9.ebuild b/media-libs/x265/x265-2.9.ebuild
new file mode 100644
index 000000000000..38316ce55ea2
--- /dev/null
+++ b/media-libs/x265/x265-2.9.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/165"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/arm.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/ppc64.patch"
+	"${FILESDIR}"/${PN}-2.9-detect512.patch
+)
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		mercurial_src_unpack
+		# Can't set it at global scope due to mercurial.eclass limitations...
+		export S=${WORKDIR}/${P}/source
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = ppc64 ]] ; then
+				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = ppc64 ]] ; then
+				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist=""
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake-utils_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	append-cflags -fPIC
+	append-cxxflags -fPIC
+	local myabicmakeargs=(
+		$(cmake-utils_use_enable test TESTS)
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DCPU_POWER8=$(usex power8 ON OFF)
+		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = arm ]] ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index a8bb14b86fa3..b62476a545d0 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/161"
+SLOT="0/165"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index dec88dc7e3ca..8dc9e6e78d65 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 9ff08a838a2c..199cfd7b7814 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -4,12 +4,9 @@ AUX alsa-plugins-1.0.28-libav10.patch 10113 BLAKE2B 880c8e9781ab19afcd724c408c52
 AUX alsa-plugins-1.1.5-optional_plugins.patch 1123 BLAKE2B 453d9455741c118bde8ac697cc3d5b8b1404eb93d842e7a05193175261cdcd30d34e0cc7a8bd90aeb402799c60bce81dd42dcac2bd3b085b3385ba9e06cc2859 SHA512 9659eca8a071cdb2cbae6f1ec6fc0b447a45858a5464023f1dc5c36fda8053572d6a2a8cff629e8c2768b8a61e9f15d6d7cf420ab1aad1b3773084b7ed959c5e
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
 DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6bedbce9253c3e57f04d3093a6cbb1d5b5e9b92566945962b875de20ba3e556e9c1fc4bb4e970502e3c03fc821e5e264fe SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
-DIST alsa-plugins-1.1.4.tar.bz2 366931 BLAKE2B a0a2d91b86be612e830513d08fe34e1f785f772bd698069e002e3eec48236a4ab63d042be0ebaa6b3890d6d6f3ca75500d241542b89b717532eea59188e1aa0c SHA512 edbc9dd762e2500ce6f820d81fcd8d2577506afcea0b33a32cece95f8d6651840f4f8a55664f274d735ab3effa13cdbfc0331690c37a64a9ad050c15dc77cac6
-DIST alsa-plugins-1.1.5.tar.bz2 366999 BLAKE2B 299a21586018788b511d7c9dec588182cc39132aa4f1840eca57e3125f6bbdbcdeabbe4b55a93ed107eab2653a85328aec1c9e6f70c302bb224b3fa50a474c75 SHA512 50a79d9dbcca72b2133aba7dca594302dcd5816eb71afc311a4c2a96aac7632a0a034875faf3100f2c8a44f3fbbede264e5cd9beacf2a07f2fa6786f66edae39
 DIST alsa-plugins-1.1.6.tar.bz2 367485 BLAKE2B efe8b8447db4f68761060e4f48c86c76f821fd7795d8edec0c8f5a03f7406a422f630f012433ac12c3af3222b7b587820a92e937c80dba6bb8766deb854b9706 SHA512 f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b
+DIST alsa-plugins-1.1.7.tar.bz2 369866 BLAKE2B 8305f17a7e72e159f1710168cc3a4f0c7deb870c813a8a48b335911717422ac584b6846b047a29880448bdc0597a80881b87e5df1ff018a1e174aea490d3e9df SHA512 c3bb22ec3c5a167fb246cfc94131d53800e321b486ab743c3395a9d91dee0ff9703f6e4a2feaea5a4ee42a7e486d835d48ab880c784c5c34bb4eb5e9ded06d8e
 EBUILD alsa-plugins-1.1.1-r1.ebuild 2698 BLAKE2B 3fac1377af069760efcc93fe6daa55a3d821742e7ffd5c0976dc0f3a066151ff087d20a65803aa59f253f27f8077d20345da879f92fd3dc28398440e31b3d148 SHA512 9df4f03ae71fe97423bdb37cd28755873a915f210ce92f5f394e15bcecd6662f321acff20b9f212fdb06b63337a7f58d2fb25a6c18eac2be3c5820bc21394860
-EBUILD alsa-plugins-1.1.4-r1.ebuild 2672 BLAKE2B 1a21d319ae4efadb001ea123896b05cdddc7473d2766e85592fc479553e37b70d73a46fefc7652312d061d41c168c5f5d0a7650b25d2fb5abfbb4450bb9a3677 SHA512 49ee6bc2648318263162eae7a5c2b8247714854324f256e354e50a5cd432ed73846cc5192964f551d139e74d81477ba2ce9bfe817eb43c687519e2a5fee6e03d
-EBUILD alsa-plugins-1.1.5-r1.ebuild 2852 BLAKE2B cbaa192f598748b9ae5da84ebd214c82c084f6217d703cc0bf28be6d2ac47b169c30ebe955c0a7008f697cdb8f7116ba9c7c74dc1bc6d0aac5d384ed68f5fbc9 SHA512 245c77ff61ae5076a4409cd8cd89eb6a60584dff64b3008e485a43ae778d3a49e52c942d0411c64559e5399f4a957965294099586110c8fb63bf24fc6b7c1279
-EBUILD alsa-plugins-1.1.5.ebuild 2672 BLAKE2B 1a21d319ae4efadb001ea123896b05cdddc7473d2766e85592fc479553e37b70d73a46fefc7652312d061d41c168c5f5d0a7650b25d2fb5abfbb4450bb9a3677 SHA512 49ee6bc2648318263162eae7a5c2b8247714854324f256e354e50a5cd432ed73846cc5192964f551d139e74d81477ba2ce9bfe817eb43c687519e2a5fee6e03d
-EBUILD alsa-plugins-1.1.6.ebuild 2880 BLAKE2B 6f3e65dafd10a4c8a24bf67ecce6433d2cd0a3376fd66a112a47b3105f3fda3cbd725f9d9be71fd3a5b844ae23d86305bb36dda28205cb3501534232b892d6e6 SHA512 2be039b830a150ff0876ac7b3a2668f67784ebd8a6d3ab8e693b412d0ad16d4a646f21f506c4b5631c152988b58f7757b3049cfe90d54a08c3e34b9160f3f615
+EBUILD alsa-plugins-1.1.6.ebuild 2874 BLAKE2B 11c5a25e23a35fe8c86360b73f5504aec818d58c3ffbe70d2e193dfe57f7f94f7a4a27dbb1e3dcada0183d2e9e0af0f222428a7de0187fd3585aec3f532268a3 SHA512 e9fc6bd33dab5d762f776bc229d7afbb514cba19ea31ea7dec823d221844ad367489c80782f4cd7c60547a45f4af30fbca952d1479f154e63a30888fd7f6e931
+EBUILD alsa-plugins-1.1.7.ebuild 2820 BLAKE2B 7b75a11208b7d17639c95d97c4146482f724f15b4f10faa597bc98e4b92c81315bec24f1732b16786cca8b226a6e130e124405347f1393769d622931f2675a7c SHA512 e99dfe0dd098ffb7debdfaf29eca29688f7a9c0e82c3c05dd2b48a61339b622d53a37bc1fc22dc2dd46cbec12df3155d0cc706517efa3447eae4fb26f14967fd
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.ebuild
deleted file mode 100644
index 5389657ac9c5..000000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.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
-inherit autotools eutils flag-o-matic multilib multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="debug ffmpeg jack libav libsamplerate pulseaudio speex"
-
-RDEPEND="
-	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	speex? (
-		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
-		media-libs/speexdsp[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.23-automagic.patch"
-)
-
-src_prepare() {
-	default
-
-	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
-	# failed assert. As the code works just fine with asserts disabled, for now
-	# disable them waiting for a better solution.
-	sed -i \
-		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		pulse/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	use debug || append-cppflags -DNDEBUG
-
-	local myspeex=no
-	use speex && myspeex=lib
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable ffmpeg avcodec) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable pulseaudio) \
-		--with-speex=${myspeex}
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	cd doc || die
-	dodoc upmix.txt vdownmix.txt README-pcm-oss
-	use jack && dodoc README-jack
-	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavcrate.txt a52.txt
-
-	if use pulseaudio; then
-		dodoc README-pulse
-		# install ALSA configuration files
-		# making PA to be used by alsa clients
-		insinto /usr/share/alsa
-		doins "${FILESDIR}"/pulse-default.conf
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #410261, comment 5+
-		# seems to work fine without any path
-		sed -i \
-			-e "s:/usr/lib/alsa-lib/::" \
-			"${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
-	fi
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use pulseaudio; then
-		einfo "The PulseAudio device is now set as the default device if the"
-		einfo "PulseAudio server is found to be running. Any custom"
-		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
-		einfo "purpose should now be unnecessary."
-	fi
-}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild
deleted file mode 100644
index 3dd0a0e7a970..000000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.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
-inherit autotools flag-o-matic ltprune multilib multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
-
-RDEPEND="
-	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	speex? (
-		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
-		media-libs/speexdsp[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.5-optional_plugins.patch"
-)
-
-src_prepare() {
-	default
-
-	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
-	# failed assert. As the code works just fine with asserts disabled, for now
-	# disable them waiting for a better solution.
-	sed -i \
-		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		pulse/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	use debug || append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		--with-speex="$(usex speex lib no)"
-		$(use_enable arcam_av arcamav)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable jack)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable mix)
-		$(use_enable oss)
-		$(use_enable pulseaudio)
-		$(use_enable speex speexdsp)
-		$(use_enable usb_stream usbstream)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	cd doc || die
-	dodoc upmix.txt vdownmix.txt README-pcm-oss
-	use jack && dodoc README-jack
-	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavcrate.txt a52.txt
-
-	if use pulseaudio; then
-		dodoc README-pulse
-		# install ALSA configuration files
-		# making PA to be used by alsa clients
-		insinto /usr/share/alsa
-		doins "${FILESDIR}"/pulse-default.conf
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #410261, comment 5+
-		# seems to work fine without any path
-		sed -i \
-			-e "s:/usr/lib/alsa-lib/::" \
-			"${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
-	fi
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use pulseaudio; then
-		einfo "The PulseAudio device is now set as the default device if the"
-		einfo "PulseAudio server is found to be running. Any custom"
-		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
-		einfo "purpose should now be unnecessary."
-	fi
-}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild
deleted file mode 100644
index 5389657ac9c5..000000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.5.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
-inherit autotools eutils flag-o-matic multilib multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="debug ffmpeg jack libav libsamplerate pulseaudio speex"
-
-RDEPEND="
-	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	speex? (
-		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
-		media-libs/speexdsp[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.23-automagic.patch"
-)
-
-src_prepare() {
-	default
-
-	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
-	# failed assert. As the code works just fine with asserts disabled, for now
-	# disable them waiting for a better solution.
-	sed -i \
-		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		pulse/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	use debug || append-cppflags -DNDEBUG
-
-	local myspeex=no
-	use speex && myspeex=lib
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable ffmpeg avcodec) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable pulseaudio) \
-		--with-speex=${myspeex}
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	cd doc || die
-	dodoc upmix.txt vdownmix.txt README-pcm-oss
-	use jack && dodoc README-jack
-	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavcrate.txt a52.txt
-
-	if use pulseaudio; then
-		dodoc README-pulse
-		# install ALSA configuration files
-		# making PA to be used by alsa clients
-		insinto /usr/share/alsa
-		doins "${FILESDIR}"/pulse-default.conf
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #410261, comment 5+
-		# seems to work fine without any path
-		sed -i \
-			-e "s:/usr/lib/alsa-lib/::" \
-			"${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
-	fi
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use pulseaudio; then
-		einfo "The PulseAudio device is now set as the default device if the"
-		einfo "PulseAudio server is found to be running. Any custom"
-		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
-		einfo "purpose should now be unnecessary."
-	fi
-}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
index c6fe98a09771..aa07a38f5aeb 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux"
 IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
 
 RDEPEND="
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild
new file mode 100644
index 000000000000..2eff3aacc81b
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic multilib multilib-minimal
+
+DESCRIPTION="ALSA extra plugins"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
+
+RDEPEND="
+	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	speex? (
+		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
+	# failed assert. As the code works just fine with asserts disabled, for now
+	# disable them waiting for a better solution.
+	sed -i \
+		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
+		pulse/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use debug || append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		--with-speex="$(usex speex lib no)"
+		$(use_enable arcam_av arcamav)
+		$(use_enable ffmpeg libav)
+		$(use_enable jack)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable mix)
+		$(use_enable oss)
+		$(use_enable pulseaudio)
+		$(use_enable speex speexdsp)
+		$(use_enable usb_stream usbstream)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	cd doc || die
+	dodoc upmix.txt vdownmix.txt README-pcm-oss
+	use jack && dodoc README-jack
+	use libsamplerate && dodoc samplerate.txt
+	use ffmpeg && dodoc lavrate.txt a52.txt
+
+	if use pulseaudio; then
+		dodoc README-pulse
+		# install ALSA configuration files
+		# making PA to be used by alsa clients
+		insinto /usr/share/alsa
+		doins "${FILESDIR}"/pulse-default.conf
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/51-pulseaudio-probe.conf
+		# bug #410261, comment 5+
+		# seems to work fine without any path
+		sed -i \
+			-e "s:/usr/lib/alsa-lib/::" \
+			"${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	if use pulseaudio; then
+		einfo "The PulseAudio device is now set as the default device if the"
+		einfo "PulseAudio server is found to be running. Any custom"
+		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
+		einfo "purpose should now be unnecessary."
+	fi
+}
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index d973c9c68de9..22a7b96f1a9d 100644
--- a/media-plugins/gst-plugins-chromaprint/Manifest
+++ b/media-plugins/gst-plugins-chromaprint/Manifest
@@ -1,7 +1,7 @@
 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
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
-EBUILD gst-plugins-chromaprint-1.14.1.ebuild 355 BLAKE2B 43b5c80032259f180e1e0bd70fec06052bfeb4a2266aebaa74806622711c5849a39ec117ee6e085092cd58fa913d9696e360c278a8b13f56e9e28470ff5c0ffd SHA512 c08b417cd44888dd3136f5fbadc3949f40482317fa0e1dd0ae74eef2113f8f842a722cf0ecfa0ea880498ac2c01e3b0a466a365ac4c9200b2d8f0e2d3db7d7d3
+EBUILD gst-plugins-chromaprint-1.14.1.ebuild 362 BLAKE2B 26e56e0a72f44fe95e247ecb7a2777895dbbfb6597eb8f2d33c6eefe5b0c26d7aa9a94ee86829b28ba4800df5a587cb866d2ec7a8782dfa4a7f9e155ec37b629 SHA512 84eedc5b9fa1d6ab08dbd56ee58432b539f972e60cca0e4d6a6b6a3deeeb624b24194e3143efeff8b4261dc2fb1c8fc5ac83217bd9199fa0e5424cd1c85b135b
 EBUILD gst-plugins-chromaprint-1.14.2.ebuild 355 BLAKE2B 43b5c80032259f180e1e0bd70fec06052bfeb4a2266aebaa74806622711c5849a39ec117ee6e085092cd58fa913d9696e360c278a8b13f56e9e28470ff5c0ffd SHA512 c08b417cd44888dd3136f5fbadc3949f40482317fa0e1dd0ae74eef2113f8f842a722cf0ecfa0ea880498ac2c01e3b0a466a365ac4c9200b2d8f0e2d3db7d7d3
 EBUILD gst-plugins-chromaprint-1.14.3.ebuild 355 BLAKE2B 43b5c80032259f180e1e0bd70fec06052bfeb4a2266aebaa74806622711c5849a39ec117ee6e085092cd58fa913d9696e360c278a8b13f56e9e28470ff5c0ffd SHA512 c08b417cd44888dd3136f5fbadc3949f40482317fa0e1dd0ae74eef2113f8f842a722cf0ecfa0ea880498ac2c01e3b0a466a365ac4c9200b2d8f0e2d3db7d7d3
 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 d71c5cabac91..6b9d7bf953f7 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 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~x86"
 
 RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 257cc2b99085..ddcfdcbe90a3 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,4 +1,4 @@
 EBUILD gst-plugins-meta-0.10-r11.ebuild 4380 BLAKE2B 90b2d3511987d3a9bc6f8cf6f0a44fc616015280a378ca50ea1fbb1e1531305fc8c0331f3b77da8e3d6a03628cbff879d75664cd569f7755c850a271d01ba83a SHA512 e047adac8d873c0568a59afaba4eeac62ff3e1822309096ac0b9a337e730d2ad8b204a3cce0385ac63c36f922a6181ef22be1ed0a0a4f9b7637ee7f34a14e6e3
 EBUILD gst-plugins-meta-1.14.1.ebuild 3758 BLAKE2B e8ef288159540fc4d4996bc3aac63a5b855c48426001d373f946c08973c354ec24e39ce015de128c29341f9c7305d54f523c55821de47af363aa6f66fb01006a SHA512 c9afdb06895118abfcb7e407b561110bfe8085be682dbc891c3fb0c419c465192241a0be62242fea86c51a673086212c81acd5838895effa546f1ccd8cf6b624
 EBUILD gst-plugins-meta-1.14.3.ebuild 3766 BLAKE2B 8e73e337b7ea18e59ca531b2a385c1c57ede97fae3c223f2ab85bad890f02efd345d126c93fe6707232380a1b61ab22450d71db7d7ec040acf753e0d42fd059d SHA512 d080ef167d49771bb107426ff7afe4bfe004508338b5c9689cf1a550a3066f49d97b2e298bc37a997738f0d0a531f2e0b046edbb7a82bceaf5766896f7dd1df2
-MISC metadata.xml 1054 BLAKE2B f766fa7d1ffda2bdc4523f242deaf22b13cb3e89f979071a90bbe1758785c797eb1d08ff318978b6375d5cbeb7db59bcdbd4d7f27b979b3aabdfe28b01d9b902 SHA512 604995aac26c05be7a4ec9bb1632420f96e930536c344e1c059f70c3eb13a3e1f1c604fbd95a8201b0ff3d727af0830f788ff14edf399b8c3a1d48de93fb490c
+MISC metadata.xml 996 BLAKE2B 1bc83f42a32de2aafdf03808fffb16d603986c19160d2802426ecea7f279e529ff7ad0e2c321671681f80c3575dceaea0064db559dba1212b0a30b826ae8e2a2 SHA512 4d905ac8fb0f07b2ba3c6791d7a84daef638ed552d2fac834a71febb274d1c667abe66735e7cfe77f5ed83c269c01ca7c2761b13d176164cd956e8fadf31fbd0
diff --git a/media-plugins/gst-plugins-meta/metadata.xml b/media-plugins/gst-plugins-meta/metadata.xml
index fb4bd1b0cb8a..b8c8ffd598c6 100644
--- a/media-plugins/gst-plugins-meta/metadata.xml
+++ b/media-plugins/gst-plugins-meta/metadata.xml
@@ -17,7 +17,6 @@ since gstreamer plugins are all run-time dependencies.
 </longdescription>
 <use>
 	<flag name="http">Enable http streaming via <pkg>net-libs/libsoup</pkg></flag>
-	<flag name="opus">Enable Opus audio codec support</flag>
 	<flag name="libvisual">Enable visualization effects via 
 		<pkg>media-libs/libvisual</pkg></flag>
 	<flag name="vpx">Enables vp8 codec support using libvpx, required to
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index 80a033bbb819..a9619c5f21b0 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -2,6 +2,6 @@ DIST gst-plugins-bad-1.14.1.tar.xz 4651852 BLAKE2B 915798f9d07e18b445cae818978de
 DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017ad997c4d0ef136845a7ad34d15745d5f1abf4486dda7a226feb5ff6c7c65c8788cd39eb5e9901f3f15a426d79bf2b81e78c SHA512 7282c8941f1eabf7141362bb8e61097b3b26ef39410ae767712c34d7e40779fc22f6ea97a950009fdb6d62175f9a153d435ead8f663cf66cc6af5aac7f2a73db
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-srtp-1.14.1.ebuild 333 BLAKE2B f6536d5482b6d27fb2a48d2a4c3a0707725bc196e418ba0af3df472b29673d47de54ac2bf61962acfbc3d8009a061ec8a5c5b8218739e9a7cdd32199146bd497 SHA512 c3aa3de4adc659a56fb58f7850f20d393ea1950f0d135bc632911d92f6fa7f07deed5a21878d760c2c5374706d9dc471f163bccaccfdf213c4676de414cf2048
-EBUILD gst-plugins-srtp-1.14.2.ebuild 342 BLAKE2B 63793bc85c330ada752735c7d74361da43e9d5f1d48c137b94855aba79bec83e5513a57a75f3077b5a07989fba0942c360e8e97ddf817ecb96c77960b32e3f69 SHA512 223bc2dbe7dc911714c7e18bc0f97b8b7cdd8fe72555a5f2fadcc948050f8a522dc705a0c8ff6a06e042983d75edfa459293bf28cdace273ec9bad69d76bc93d
-EBUILD gst-plugins-srtp-1.14.3.ebuild 363 BLAKE2B 98f07157e89096880fbc42390c6ac1ffac699b5ac3c3b5b664866fd76c4fa7c01bbaf1e55decb4dee0e372c09b3b5eb725084d669cd4fa829e1852eb391aa8bb SHA512 039bbd3cff362cbbbda0cb5e3bda6c8832560bbe8b006351870cadf8266ebcf29e791ee51dc0cc941c8ef03abc29f5dcb5d32e9de9daef8d41eee081d6e996e8
+EBUILD gst-plugins-srtp-1.14.2.ebuild 351 BLAKE2B e8422c4c8f3077b7ff79b86aa8c03feac2e9f4829838709947e542c02e5141d107586ecd6d23dd53fc7423572c2393777f04b6ed1b5592db7220fbc721f837d8 SHA512 a57db051ebcc6bcae693bfa9da057f4aa398a26a2f78a1bc62f279a538079bcfa87c20438ae23686a599b66071c1870b7cd35cd7faacef7d7e922777754a150f
+EBUILD gst-plugins-srtp-1.14.3.ebuild 365 BLAKE2B a0a829b81f54a9e05d230e5be7100db0a9df50e0901a2a2e1045b71f9791c6917c699f69d5f52e19ef099b5563664eb72477268f81d29fc22a58a6c265dc9aef SHA512 bc5a72a35a819484bb75e9f8a24c3d45f68d6728e7de70fee2d91ef704274cc441563fe4e67805c0f2f46032288c5a3b4e060e0c990f7defa7323d34126f7991
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.2.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.2.ebuild
index ef2426184507..06876bf37446 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.2.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
index 831f7db6f233..305927f63a64 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/vdr-autosort/Manifest b/media-plugins/vdr-autosort/Manifest
deleted file mode 100644
index 1374ccf0e655..000000000000
--- a/media-plugins/vdr-autosort/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vdr-autosort-0.1.3.tgz 37190 BLAKE2B 1c14f1bcd256b13efb8efc71b5e99debf1268b54a584df6aa045421630440643e55da1ef8fbf9bd82bcee0de5e9300daacec2f9d2fa009737044ab0155f0ebbb SHA512 f9d154060ead285e4b775317c403372ecf3d80842d95bca31dd0ba220c3429b51f4be31bf7251222905d5485a0e6f5c1fc80927c386456cb500f1c58a5a9201a
-EBUILD vdr-autosort-0.1.3.ebuild 1077 BLAKE2B 3ff35650573349754d83ed9c81a87631f826d52ea614ce7c976086e2059be29fe2e6980f85429c42c1dc131d4ca9528c43519604d7858fe53cf28e014a2e37fa SHA512 b53fb64c0ae6f817dfda36fc0b56fcc79442e2aa0311851446a2c4e060fe6a3b37718880e253a11f478352a0064ffaafe1b905334db85a4e0c7f12b235b576fa
-MISC metadata.xml 622 BLAKE2B e4ac5cd00c06c55ed68106d71d7ca76095d85c7e715afa39a9352a75ddf34ad5108421578b987cd779c4ceda18492c0dcc7499db453bdbeb6ba504b9e0bda86e SHA512 c35633009aa57b0ecc620bb88c2732c695a192fe58cf87eff0cf6b753d7a0d43b6ef8ed729bfafb44cf4d815d708d12d333c42d78dd9e006bbd6d7ac3b35e2a5
diff --git a/media-plugins/vdr-autosort/metadata.xml b/media-plugins/vdr-autosort/metadata.xml
deleted file mode 100644
index a7e476d255a0..000000000000
--- a/media-plugins/vdr-autosort/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>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		AutoSort Plugin adds the capability to define rules for
-		automatically sorting your channels.conf with every
-		housekeeping thread.
-	</longdescription>
-	<longdescription lang="de">
-		Das AutoSort-Plugin erweitert den VDR um die Fähigkeit, die
-		Kanalliste automatisch nach benutzerspezifischen Kriterien
-		zu sortieren.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-plugins/vdr-autosort/vdr-autosort-0.1.3.ebuild b/media-plugins/vdr-autosort/vdr-autosort-0.1.3.ebuild
deleted file mode 100644
index 34afecce2aca..000000000000
--- a/media-plugins/vdr-autosort/vdr-autosort-0.1.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=7
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: Auto-sort channels.conf"
-HOMEPAGE="http://www.copypointburscheid.de/linux/autosort.htm"
-SRC_URI="http://www.copypointburscheid.de/linux/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.32"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	vdr-plugin-2_src_install
-	insinto /etc/vdr/plugins
-	doins examples/autosort.conf
-}
-
-pkg_preinst() {
-	if [[ ! -L ${ROOT}etc/vdr/channels.conf ]]; then
-		cp "${ROOT}"etc/vdr/channels.conf "${D}"etc/vdr/channels.conf.autosort.bak
-		fowners vdr:vdr /etc/vdr/channels.conf.autosort.bak
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-	echo
-	elog "You will find a backup of your channels.conf in /etc/vdr/channels.conf.autosort.bak"
-	elog "Edit /etc/vdr/plugins/autosort.conf to fit your needs"
-	ewarn "Important:"
-	ewarn "Backup your channels.conf together with autosort.conf"
-	ewarn "before making heavy changes to autosort.conf."
-	echo
-}
diff --git a/media-plugins/vdr-prefermenu/Manifest b/media-plugins/vdr-prefermenu/Manifest
deleted file mode 100644
index 27b4bcd0956d..000000000000
--- a/media-plugins/vdr-prefermenu/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX prefermenu.mk 3190 BLAKE2B bf926ef06ffa11cdfbe4890680c049e53e2446751f5d797057140e9c07ee3383b931394b682a0fa98bf95108e2d10a50779c81d6b00302f33a90e4ead21c74ef SHA512 b015935b165c7564a070dea26ae45b68a288a7a3b8ffe59ca79f374a13c18c359bf6af9c0b5ef254e7c266cd7345a832182b64e29b1218e2373a521a0fb5d891
-AUX vdr-prefermenu-0.6.6-no-static-getfont.diff 2201 BLAKE2B ec74d62d5fbb6584ee917bbabb0a2012504eaf0f2b7507c213e83715555193ed54d8286a72f7ea6a0ceb8e8eebdf8ca9329fedd48944dcd79963787b888dd547 SHA512 e67d5cfe06d30f2c7f38b7be9daca4f9d00e5265b85aaa20a7a5c3dc7184a085c44b1d1210f560bac560176c6f347a93bbc70c93c2773e7a4d79e7bbed953a91
-DIST vdr-prefermenu-0.6.6.tgz 19617 BLAKE2B 67ec25d33049435399b93be67fdce64ee7d225b9fda6d0fe3386d06ed5f85a04a40f1e4320db98e32ffa66b43963012f4d933b2d253e898aef5432d94e8120b6 SHA512 bc5e11757979a60f408c59d4d0f1d713899013d4a3485ff85e7bf139fb8f436ddd80799673c3d7a718a3d9cc0e75c216f73f1eccc3c2350826c5f8d6145157f6
-EBUILD vdr-prefermenu-0.6.6-r2.ebuild 788 BLAKE2B 69fff990303c617793164049e1e96d57e582bdc98d649706411790035925ca1b794776ce9fb7b6e1d14914e2253c41dcfa92ce04e9003dc58540fba53a003ca3 SHA512 207e017adf03d2a035647ea5456d5e7b5297bd03d7ce074000ec2aa7c5a7c183aa3d1fd6e0a165fa05bd64d6dbaec2e23bdc8f86dcf6d4c74e5d6522a84d5f5d
-MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-prefermenu/files/prefermenu.mk b/media-plugins/vdr-prefermenu/files/prefermenu.mk
deleted file mode 100644
index 07940af47fe5..000000000000
--- a/media-plugins/vdr-prefermenu/files/prefermenu.mk
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Makefile for a Video Disk Recorder plugin
-#
-
-# The official name of this plugin.
-# This name will be used in the '-P...' option of VDR to load the plugin.
-# By default the main source file also carries this name.
-
-PLUGIN = prefermenu
-
-### The version number of this plugin (taken from the main source file):
-
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-
-### The directory environment:
-
-# Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(call PKGCFG,libdir)
-LOCDIR = $(call PKGCFG,locdir)
-PLGCFG = $(call PKGCFG,plgcfg)
-#
-TMPDIR ?= /tmp
-
-### The compiler options:
-
-export CFLAGS   = $(call PKGCFG,cflags)
-export CXXFLAGS = $(call PKGCFG,cxxflags)
-
-### The version number of VDR's plugin API:
-
-APIVERSION = $(call PKGCFG,apiversion)
-
-### Allow user defined options to overwrite defaults:
-
--include $(PLGCFG)
-
-### The name of the distribution archive:
-
-ARCHIVE = $(PLUGIN)-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### The name of the shared object file:
-
-SOFILE = libvdr-$(PLUGIN).so
-
-### Includes and Defines (add further entries here):
-
-#INCLUDES +=
-
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o preferosd.o prefersetup.o preferchannel.o
-
-### The main target:
-
-all: $(SOFILE) 
-#i18n
-
-### Implicit rules:
-
-%.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-
-### Dependencies:
-
-MAKEDEP = $(CXX) -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
-	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-
--include $(DEPFILE)
-
-### Internationalization (I18N):
-
-PODIR     = po
-I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-I18Npot   = $(PODIR)/$(PLUGIN).pot
-
-%.mo: %.po
-	msgfmt -c -o $@ $<
-
-$(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
-
-%.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
-	@touch $@
-
-$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	install -D -m644 $< $@
-
-.PHONY: i18n
-i18n: $(I18Nmo) $(I18Npot)
-
-install-i18n: $(I18Nmsgs)
-
-### Targets:
-
-$(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-
-install-lib: $(SOFILE)
-	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
-
-install: install-lib 
-#install-i18n
-
-dist: $(I18Npo) clean
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@mkdir $(TMPDIR)/$(ARCHIVE)
-	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution package created as $(PACKAGE).tgz
-
-clean:
-#	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff b/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff
deleted file mode 100644
index 0c0239d2ac48..000000000000
--- a/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_prefermenu-0.6.6-1.5.3.dpatch by Thomas Günther <tom@toms-cafe.de>
-## http://toms-cafe.de/vdr/download/prefermenu-0.6.6-1.5.3.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.3.
-
-@DPATCH@
---- prefermenu-0.6.6/prefermenu.c
-+++ prefermenu-0.6.6/prefermenu.c
-@@ -75,6 +75,7 @@
-   }
-   // Clean up the file with current VDR channels.conf
-   PreferedChannelsList.Save();
-+  const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
-   config.height= (config.lines * (LINEHEIGHT+BORDERSIZE+2))+BORDERSIZE;
-   return new cPreferOsd;
- }
---- prefermenu-0.6.6/preferosd.c
-+++ prefermenu-0.6.6/preferosd.c
-@@ -60,6 +60,7 @@
-   }
-   osd=cOsdProvider::NewOsd(config.originx, config.originy);
-   if (osd) {
-+    const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
-     tArea Area = { 0, 0, config.width+LINEHEIGHT, config.height-1, 4};
-     osd->SetAreas(&Area, 1);
-     DrawPreferMenu(0,0);
-@@ -168,6 +169,7 @@
- {
-   if (current > 1) {
-     current -= 1;
-+    const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
-     DrawPreferMenu(-LINEHEIGHT,1);
-     DisplayPreferMenu();
-     //DrawPreferMneu(-10,1);
-@@ -181,6 +183,7 @@
- {
-   if (current < number) {
-     current += 1;     
-+    const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
-     DrawPreferMenu(+LINEHEIGHT,-1);
-     DisplayPreferMenu();
-     //DrawPreferMenu(+10,-1);
-@@ -315,6 +318,8 @@
- 
- void cPreferOsd::DrawPreferMenu(int delta, int highlight)
- {
-+  const cFont *font = cFont::GetFont(fontOsd);
-+  const int LINEHEIGHT = font->Height();
-   
-   int middle = int(config.height/2) + config.height%2;
- 
-@@ -390,6 +395,8 @@
- 
- void cPreferOsd::DrawChannelsNames(int delta)
- {
-+  const cFont *font = cFont::GetFont(fontOsd);
-+  const int LINEHEIGHT = font->Height();
- 
-   // XXX The margin is hardcoded for now
-   // TODO: make it more flexible
---- prefermenu-0.6.6/preferosd.h
-+++ prefermenu-0.6.6/preferosd.h
-@@ -4,8 +4,6 @@
- #include <vdr/plugin.h>
- 
- static const int BORDERSIZE = 2;
--static const cFont *font = cFont::GetFont(fontOsd);
--static const int LINEHEIGHT = font->Height();
- 
- 
- class cPreferOsd : public cOsdObject {
diff --git a/media-plugins/vdr-prefermenu/metadata.xml b/media-plugins/vdr-prefermenu/metadata.xml
deleted file mode 100644
index 27f419c289c3..000000000000
--- a/media-plugins/vdr-prefermenu/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>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild
deleted file mode 100644
index 7b3a9b12408f..000000000000
--- a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: presents a favourites channels menu"
-HOMEPAGE="http://www.olivierjacques.com/vdr/prefermenu/"
-SRC_URI="http://famillejacques.free.fr/vdr/prefermenu/vdr-${VDRPLUGIN}-${PV}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.0"
-
-PATCHES=("${FILESDIR}/${P}-no-static-getfont.diff")
-
-src_prepare() {
-	cp "${FILESDIR}/${VDRPLUGIN}.mk" Makefile
-
-	vdr-plugin-2_src_prepare
-
-	sed -e "s:RegisterI18n://RegisterI18n:" -i prefermenu.c
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	touch prefermenu.conf
-
-	insopts -m0644 -gvdr -ovdr
-	insinto /etc/vdr/plugins/prefermenu
-	doins prefermenu.conf
-}
diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest
deleted file mode 100644
index d167fb289608..000000000000
--- a/media-plugins/vdr-text2skin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX vdr-1.7.27.diff 3814 BLAKE2B 3358015edbed3f18a875c7ae5d3996a7cc6c4a1610318f65642dcbf97786218812b7a586609020a79a8fed14f7d8c495a8cf3f2d8ea90c8b74d29a842241189c SHA512 58983f674bd7bbd53437b2dfc92acd3365d20843f85ff67b91cc2f9f177054634804c29849df4f30eb147c3b78c13272d70b5615ecd9203376b4afa4519a7b35
-AUX vdr-text2skin-1.3.2-Makefile.patch 1808 BLAKE2B 37bbf4fd814b89060e0356355e242dba632d2b358bad36b37515fe8ed4d10cd199c6168f48ba26d6bef9b2f9b6321fe2268f74d9ce370da58cbdad761017fd60 SHA512 e726ee9c2a9ff036cda68d44aca4ff11d0423674bfacd8f3e98c6c0bdc4006b9c4aa02deba6952976ff9d6ed0b971b2362bf3dbc8c13e8ffbe6971a294b869d8
-AUX vdr-text2skin-1.3.2_vdr-2.1.2.diff 612 BLAKE2B bc8c23582586a91d1eff32aa1d2ecaded1b1994e80df14555b8d080fb67e0a272b7057bc5ebccd38270886747ce0f76b182d5845dedfb4cfe9c1efa0afee335c SHA512 00f59897c4e31fa23e8da68935775fe738852679430bf476a33e41da309d9d1e6667b34197a91c84ee5f73f7b97a9e72845ac506ec79c154c428ef2c56bb5add
-DIST vdr-text2skin-1.3.2.tgz 94476 BLAKE2B 485e3694acb66d48e2da929f854ad685d18cb7ade326515390dedc365f979badb00b494d14bb4cd30eeff22101ea394ffc37f5de0484a4d33ebebcf71e1040ae SHA512 418339f7132ddf854f1c7fbaa3b11aac5eb7aba0f15d427bb946d4175b6540199ac079fd895f9cebdccb4797dcf96b0681cee4db93a5e4c817abae04a08bdea9
-EBUILD vdr-text2skin-1.3.2-r1.ebuild 1785 BLAKE2B ec00a13000e9e8c765c1b3ddd66e2009e0956a28fede2dd0c198aaa0fc39f64c340bddaeffc1ea6fb9e88d35c376ee0c8f8e0b84f999c898a98981d848f0f085 SHA512 20c981663ea4b099941fb0353d725f8790aa423afd0400e54fe170f9369952e7ed02f073475fa946436915b14992060edd486875b93742f5ec2e7d052feb2784
-MISC metadata.xml 327 BLAKE2B 2408386cc7d6f313607ef7ddc98162ed97ca2a1c8aa6d74334bad7d93e5d53d400214723f30dad151b644fd7724f36909f6da02c1afbe349598a46e99b515793 SHA512 f22d86655f20776f78793a582203a4588353dc9d808ea83bd9d466e23c12762f8ecc626930b05a873d00064dbd92c51c6d0bf94226ec9911fc6259dd282d0f8d
diff --git a/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff b/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff
deleted file mode 100644
index 9d3280cf5849..000000000000
--- a/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -Naur text2skin-1.3.2.orig/display.c text2skin-1.3.2/display.c
---- text2skin-1.3.2.orig/display.c	2012-04-07 20:45:11.000000000 +0200
-+++ text2skin-1.3.2/display.c	2012-04-07 20:45:47.000000000 +0200
-@@ -1233,17 +1233,17 @@
- 
- 	case tRecordingPriority:
- 		return mRecording != NULL
--		       ? (cxType)mRecording->priority
-+		       ? (cxType)mRecording->Priority()
- 		       : (cxType)false;
- 
- 	case tRecordingLifetime:
- 		return mRecording != NULL
--		       ? (cxType)mRecording->lifetime
-+		       ? (cxType)mRecording->Lifetime()
- 		       : (cxType)false;
- 
- 	case tRecordingDateTime:
- 		return mRecording != NULL
--		       ? (cxType)TimeType(mRecording->start, Token.Attrib.Text)
-+		       ? (cxType)TimeType(mRecording->Start(), Token.Attrib.Text)
- 		       : (cxType)false;
- 
- 	case tRecordingTitle:
-diff -Naur text2skin-1.3.2.orig/render.c text2skin-1.3.2/render.c
---- text2skin-1.3.2.orig/render.c	2012-04-07 20:45:11.000000000 +0200
-+++ text2skin-1.3.2/render.c	2012-04-07 20:48:29.000000000 +0200
-@@ -597,14 +597,14 @@
- 		if (Marks) {
- 			bool start = true;
- 			for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
--				txPoint pt(Pos.x + m->position * Size.w / Total, Pos.y);
-+				txPoint pt(Pos.x + m->Position() * Size.w / Total, Pos.y);
- 				if (Selected && start) {
- 					const cMark *m2 = Marks->Next(m);
- 					DrawRectangle(txPoint(pt.x, Pos.y + Size.h / 3), 
--					              txSize(((m2 ? m2->position : Total) - m->position) 
-+					              txSize(((m2 ? m2->Position() : Total) - m->Position()) 
- 					              * Size.w / Total + 1, Size.h - Size.h * 2 / 3 + 1), Selected);
- 				}
--				DrawMark(pt, Size, start, m->position == Current, false, Mark, Cur);
-+				DrawMark(pt, Size, start, m->Position() == Current, false, Mark, Cur);
- 				start = !start;
- 			}
- 		}
-@@ -614,15 +614,15 @@
- 		if (Marks) {
- 			bool start = true;
- 			for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
--				txPoint pt(Pos.x, Pos.y + m->position * Size.h / Total);
-+				txPoint pt(Pos.x, Pos.y + m->Position() * Size.h / Total);
- 				if (Selected && start) {
- 					const cMark *m2 = Marks->Next(m);
- 					DrawRectangle(txPoint(Pos.x + Size.w / 3, pt.y), 
- 					              txSize(Size.w - Size.w * 2 / 3 + 1,
--					              ((m2 ? m2->position : Total) - m->position)
-+					              ((m2 ? m2->Position() : Total) - m->Position())
- 					              * Size.h / Total + 1), Selected);
- 				}
--				DrawMark(pt, Size, start, m->position == Current, true, Mark, Cur);
-+				DrawMark(pt, Size, start, m->Position() == Current, true, Mark, Cur);
- 				start = !start;
- 			}
- 		}
-diff -Naur text2skin-1.3.2.orig/common.c text2skin-1.3.2/common.c
---- text2skin-1.3.2.orig/common.c	2012-04-07 20:54:59.000000000 +0200
-+++ text2skin-1.3.2/common.c	2012-04-07 20:56:00.000000000 +0200
-@@ -255,11 +255,11 @@
- 		int start = 1; // first frame
- 		bool isStart = true;
- 
--		for (cMark *m = marks.First(); m; m = marks.GetNext(m->position)) {
-+		for (cMark *m = marks.First(); m; m = marks.GetNext(m->Position())) {
- 			if (isStart)
--				start = m->position;
-+				start = m->Position();
- 			else
--				length += (double)(m->position - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
-+				length += (double)(m->Position() - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
- 
- 			isStart = !isStart;
- 		}
-diff -Naur text2skin-1.3.2.orig/status.c text2skin-1.3.2/status.c
---- text2skin-1.3.2.orig/status.c	2012-04-07 20:59:39.000000000 +0200
-+++ text2skin-1.3.2/status.c	2012-04-07 21:01:12.000000000 +0200
-@@ -314,7 +314,7 @@
- 
- 	case tReplayDateTime:
- 		return mReplay != NULL
--		       ? (cxType)TimeType(mReplay->start, Token.Attrib.Text)
-+		       ? (cxType)TimeType(mReplay->Start(), Token.Attrib.Text)
- 		       : (cxType)false;
- 
- 	case tReplayShortText:
diff --git a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
deleted file mode 100644
index cce51d79febc..000000000000
--- a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/Makefile b/Makefile
-index daa54d7..1163a8d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -9,6 +9,7 @@ STRIP=strip
- # External image lib to use: imagemagick, graphicsmagick, imlib2 or none
- IMAGELIB = imagemagick
- 
-+#
- 
- # DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU'RE DOING
- # -------------------------------------------------------------
-@@ -29,13 +30,18 @@ VERSION = $(shell grep 'const char \*cText2SkinPlugin::VERSION *=' $(PLUGIN).c |
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -fPIC -Wall -Woverloaded-virtual
-+ifdef DEBUG
-+CXXFLAGS ?= -Wall -Woverloaded-virtual
-+else
-+CXXFLAGS ?= -Wall -Woverloaded-virtual -O3
-+endif
-+CXXFLAGS += -fPIC
- 
- ### The directory environment:
- 
--VDRDIR = ../../..
--LIBDIR = ../../lib
--TMPDIR = /tmp
-+VDRDIR ?= ../../..
-+LIBDIR ?= ../../lib
-+TMPDIR ?= /tmp
- 
- ### Make sure that necessary options are included (VDR >= 1.7.13):
- 
-@@ -88,8 +94,7 @@ endif
- ifdef DEBUG
- 	CXXFLAGS += -g -fno-inline
- 	DEFINES += -DDEBUG
--else
--	CXXFLAGS += -O3
-+	STRIP=
- ifdef BENCH
- 	DEFINES += -DBENCH
- endif
-@@ -118,7 +123,7 @@ $(DEPFILE): Makefile
- -include $(DEPFILE)
- 
- ### Internationalization (I18N):
--
-+#
- PODIR     = po
- LOCALEDIR = $(VDRDIR)/locale
- I18Npo    = $(notdir $(wildcard $(PODIR)/*.po))
-@@ -134,6 +139,7 @@ $(I18Npot): $(wildcard *.c)
- $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.po
- 	@mkdir -p $(dir $@)
- 	msgfmt -c -o $@ $<
-+#
- 
- .PHONY: i18n
- i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
-@@ -143,7 +149,7 @@ i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
- libvdr-$(PLUGIN).so: $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
- 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
--ifndef DEBUG
-+ifdef STRIP
- 	$(STRIP) $(LIBDIR)/$@.$(APIVERSION)
- endif
- 
diff --git a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff
deleted file mode 100644
index 7a4873db751d..000000000000
--- a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur text2skin-1.3.2.orig/render.c text2skin-1.3.2/render.c
---- text2skin-1.3.2.orig/render.c	2013-10-26 22:29:16.000000000 +0200
-+++ text2skin-1.3.2/render.c	2013-10-26 22:33:19.000000000 +0200
-@@ -813,7 +813,11 @@
- 	switch (Token.Type) {
- 	case tFreeDiskSpace: {
- 			int FreeMB;
-+#if APIVERSNUM > 20101
-+			cVideoDirectory::VideoDiskSpace(&FreeMB);
-+#else
- 			VideoDiskSpace(&FreeMB);
-+#endif
- 			Dprintf("FreeMB: %d, attrib type is %d\n", FreeMB,Token.Attrib.Type);
- 			return Token.Attrib.Type == aString && Token.Attrib.Text.length() > 0
- 			       ? (cxType)DurationType(FreeMB * 60 / MB_PER_MINUTE,
diff --git a/media-plugins/vdr-text2skin/metadata.xml b/media-plugins/vdr-text2skin/metadata.xml
deleted file mode 100644
index bd64b5471f53..000000000000
--- a/media-plugins/vdr-text2skin/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>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-	<use>
-		<flag name="contrib">Install user contributed scripts</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild
deleted file mode 100644
index 3ed16ca90fc3..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-VERSION="783" # changes with every version / new file :-(
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-text2skin"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE="contrib doc graphicsmagick +imagemagick imlib"
-
-RDEPEND="
-	>=media-video/vdr-1.6.0
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	)
-	!imagemagick? (
-		imlib? (
-			media-libs/imlib2
-			>=media-video/vdr-1.6.0[-graphtft]
-		)
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-KEEP_I18NOBJECT="yes"
-
-src_prepare() {
-	local imagelib=
-
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-
-	sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#'
-
-	if ! has_version ">=media-video/vdr-1.7.13"; then
-		sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
-	fi
-
-	if use imagemagick; then
-		if use graphicsmagick; then
-			imagelib="graphicsmagick"
-		else
-			imagelib="imagemagick"
-		fi
-	else
-		if use imlib; then
-			imagelib="imlib2"
-		else
-			imagelib="none"
-		fi
-	fi
-
-	sed -i -e "s:\(IMAGELIB[[:space:]]*=\) .*:\1 ${imagelib}:" Makefile || die
-
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-1.7.27"; then
-		epatch "${FILESDIR}/vdr-1.7.27.diff"
-	fi
-
-	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	keepdir "/usr/share/vdr/${VDRPLUGIN}"
-
-	dodoc CONTRIBUTORS
-
-	if use doc; then
-		dodoc Docs/{Reference,Tutorial}.txt
-	fi
-
-	if use contrib; then
-		dodoc -r contrib/
-	fi
-}
diff --git a/media-plugins/vdr-vodcatcher/Manifest b/media-plugins/vdr-vodcatcher/Manifest
deleted file mode 100644
index 527a53df2104..000000000000
--- a/media-plugins/vdr-vodcatcher/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX rc-addon.sh 380 BLAKE2B 4fb448b47a0a66c8b489a4fc7da2e2a65e7ea5d50afbea6c467441ee46447ccfab5f08e01c785b7eff4afd1f8cce04e7a9a8bf8115c36c9f7587dbb4d28c2714 SHA512 11060977d77f29f9f36681c12db92b4fea3cdeae4c7853ef586c71be019202d37790bb20c4a2938059d0c4782004426d247532efb99bf66e5f8ea401b1f7d43a
-AUX vdr-vodcatcher-0.2.2_gcc-4.7.patch 542 BLAKE2B 126faf08c6eeb66309180bf7053f3d38b7566b6d084a63f2f4a46f951b6e344dc9ba53426aa7cfb7169f405b5b789140da94f2208026398cf22dabdede4e8954 SHA512 f04095f4277cdd66eff457215373cd1ecd2bdfb20367c3c73aaa7871bd5545da66e1e72a5f4abbf866368514b75ad4d54391192a40f1e5410a0e77c77e076472
-AUX vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff 1638 BLAKE2B 2fc66689d98c1340fbe0bf896470d3d6568228f84472d6ed07dc66418b6599b3bd869f705d077d2eeca533acbb3c065edc9cb694ab4fbb56be18997d190820a3 SHA512 eddc283a0a98aa6ab54ad4430dbb998ec75b937a87018f60c2d16fb09791c4174de2f97ec5e3fab2d9fcf9553e936f31defe27335b87d1c675cce6553128f6cf
-DIST vdr-vodcatcher-0.2.2.tar.gz 126612 BLAKE2B 61ece27cfda40cebfbe18261015665bf8c2053f38969d1ae9c2dd66b88479bf8de5efb0ed01ac61d2b777e8fc91148deb5c5234d72e615eb44075f6db7e0bd3e SHA512 05a8188888caed5bd656d0ff65b718debdc889e82373b6e00aed4b2ffb942f822f8b6cbff4811d5f4c9b271e1ff8d8ec5874d34081b5ef3c8fc95ac215ce2a22
-EBUILD vdr-vodcatcher-0.2.2.ebuild 1216 BLAKE2B e716719c098f687b75a153e2f31642305a85f7532c7ca79c952325d0a07617bfe3c985de5beee3825591ce65ccf8457c07efd5831b2e7f04f973794a4a7f5ca8 SHA512 fd87eaa00264998b047c6937d72c9cfa26d84f5be2933fdb325391c25a53f1eb5a35d6a105d65e67d3e308f65e3226446979360f6aa95af39d4e4a87bd0156d5
-MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-vodcatcher/files/rc-addon.sh b/media-plugins/vdr-vodcatcher/files/rc-addon.sh
deleted file mode 100644
index bf38de315f66..000000000000
--- a/media-plugins/vdr-vodcatcher/files/rc-addon.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# rc-addon-script for plugin vodcatcher
-#
-# Joerg Bornkessel <hd_brummy@gentoo.org>
-
-VODCATCHER_CACHE_DIR=var/cache/vdr-plugin-vodcatcher
-
-# depends on QA, create paths in /var/cache on the fly at runtime as needed
-init_cache_dir() {
-    if [ ! -d "${VODCATCHER_CACHE_DIR}" ]; then
-        mkdir -p ${VODCATCHER_CACHE_DIR}
-        chown vdr:vdr ${VODCATCHER_CACHE_DIR}
-    fi
-}
diff --git a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_gcc-4.7.patch b/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_gcc-4.7.patch
deleted file mode 100644
index 8472764a8631..000000000000
--- a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_gcc-4.7.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-compilefix for gcc-4.7
-https://bugs.gentoo.org/show_bug.cgi?id=514128
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 22/Jun/2014
-
-diff -Naur vodcatcher-0.2.2.orig/src/LocalFileCache.cc vodcatcher-0.2.2/src/LocalFileCache.cc
---- vodcatcher-0.2.2.orig/src/LocalFileCache.cc	2014-06-22 00:34:55.448489644 +0200
-+++ vodcatcher-0.2.2/src/LocalFileCache.cc	2014-06-22 00:36:11.090546002 +0200
-@@ -24,6 +24,7 @@
- #include "LocalFileCache.h"
- #include "SdbmHashCalculator.h"
- #include <values.h>
-+#include <unistd.h>
- 
- using namespace std;
- 
diff --git a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff b/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff
deleted file mode 100644
index 0f79116cb346..000000000000
--- a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naur vodcatcher-0.2.2.orig/Makefile vodcatcher-0.2.2/Makefile
---- vodcatcher-0.2.2.orig/Makefile	2010-09-22 21:51:06.000000000 +0200
-+++ vodcatcher-0.2.2/Makefile	2010-09-22 21:53:11.000000000 +0200
-@@ -50,8 +50,7 @@
- ### Includes and Defines (add further entries here):
- 
- INCLUDES += -I. -I$(VDRDIR)/include -I$(DVBDIR)/include
--INCLUDES += `curl-config --cflags` 
--INCLUDES += -I./tinyxml
-+INCLUDES += $(shell curl-config --cflags)
- 
- DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
- DEFINES += -DCXXTEST_ABORT_TEST_ON_FAIL 
-@@ -66,7 +65,8 @@
- endif
- 
- # libcurl, libxml, libxml++
--LIBS += `curl-config --libs`
-+LIBS +=  -lcurl
-+LIBS +=  -ltinyxml
- 
- ### The source files (add further files here):
- 
-diff -Naur vodcatcher-0.2.2.orig/sources.mk vodcatcher-0.2.2/sources.mk
---- vodcatcher-0.2.2.orig/sources.mk	2010-09-22 21:51:06.000000000 +0200
-+++ vodcatcher-0.2.2/sources.mk	2010-09-22 21:53:22.000000000 +0200
-@@ -34,11 +34,6 @@
-   src/StreamType.cc \
-   src/SynchedDownloadPool.cc \
-   src/ThreadsafeDownloadPool.cc \
--  tinyxml/tinystr.cpp \
--  tinyxml/tinyxml.cpp \
--  tinyxml/tinyxmlerror.cpp \
--  tinyxml/tinyxmlparser.cpp \
--  
- 
- SRCS_TESTONLY = \
-   src/DownloadCacheMock.cc \
-diff -Naur vodcatcher-0.2.2.orig/src/RssFeedParser.cc vodcatcher-0.2.2/src/RssFeedParser.cc
---- vodcatcher-0.2.2.orig/src/RssFeedParser.cc	2010-09-22 21:51:06.000000000 +0200
-+++ vodcatcher-0.2.2/src/RssFeedParser.cc	2010-09-22 21:53:44.000000000 +0200
-@@ -22,7 +22,7 @@
- #include "HtmlToText.h"
- #include "Feed.h"
- #include "IDownloadCache.h"
--#include "tinyxml.h"
-+#include <tinyxml.h>
- #include "Item.h"
- 
- using namespace std;
diff --git a/media-plugins/vdr-vodcatcher/metadata.xml b/media-plugins/vdr-vodcatcher/metadata.xml
deleted file mode 100644
index 27f419c289c3..000000000000
--- a/media-plugins/vdr-vodcatcher/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>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
deleted file mode 100644
index c62a37bdc414..000000000000
--- a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-vodcatcher"
-SRC_URI="mirror://vdr-developerorg/154/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-misc/curl
-		>=dev-libs/tinyxml-2.6.1[stl]
-		media-video/vdr"
-RDEPEND="${DEPEND}
-		|| ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput )"
-
-PATCHES=( "${FILESDIR}/${P}_unbundle-tinyxml2.diff"
-		 "${FILESDIR}/${P}_gcc-4.7.patch" )
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	sed -e "s:ConfigDirectory():ConfigDirectory( \"vodcatcher\" ):" -i src/VodcatcherPlugin.cc
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/plugins/vodcatcher/
-	doins   examples/vodcatchersources.conf
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	echo
-	elog "! IMPORTEND"
-	elog "In order to allow the MPlayer plug-in to play back the streams passed in by the"
-	elog "Vodcatcher, you must add the following entry to the mplayersources.conf file:"
-	echo
-	elog "/tmp;Vodcatcher;0"
-	echo
-}
diff --git a/media-plugins/vdr-xine/Manifest b/media-plugins/vdr-xine/Manifest
deleted file mode 100644
index bf860850471f..000000000000
--- a/media-plugins/vdr-xine/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX confd 133 BLAKE2B 3ccc03084a9542fa00bf86aa245689d7a1f18ef8ea0aadae8ed274fbf352a6910ef22dee73dd691488ec76c618ef2c16ef27fc96c6fc4b430593c3a0d49bc9e2 SHA512 03943c9eedc46514331d2098c9098093646df184dce237ccd12fc703f1732418836e91685cd5fe660edc6145f215cc5217ef42654d8e7b97b3249b6ebc2b63a2
-AUX vdr-xine-0.9.4-build-system.patch 1507 BLAKE2B 97a4c0e71ad7be6dd0913513c7163f259dd647b1720ff99e7fbf7c4d92a05814f4b9585d323ce176350ac55d91718f9c8f5fc749d81ee5152f34b1b9576639fe SHA512 eec26f65f519dbab6f2cf928d9b8bca3925b87002e9eebd19ae039fd42ddcb90597c15e2ca584d60fafd5692bd5fcb78062d9fa68d77b61c8ce589e45617e2c5
-AUX vdr-xine-0.9.4-gentoo.diff 520 BLAKE2B 733fd62390776d9b3b5b88564605b06694f1afa898b9eda305015e32ee05a3e98b360a87933f71188d837018bbc21d54b8c3a3a687f9ecd3419049a687794d05 SHA512 523cddcd8cfe8020f96cbc070dfb5b7d5bb8e84b1ba2ed6bd82bd1b1fac0846485e8b9801255f13d1dd42c009cfd20a4a61cedf1b8c65abfad5c33f9068a3e3b
-DIST vdr-xine-0.9.4.tgz 339879 BLAKE2B b160e5ad33890d777587e8e3a45e8a27b9ec6a65d7cb0468ca740ff85c63be767de615c55aab8cff038edf18a3e3d350ca032458b9c69c94550e5b0ff35248fc SHA512 0a7bbff21b5a35360aeb68ed62a0ada5fc107453cd63231da2a48d2cc7ea4b6a333cac86164f3e6edcdcda5e9bc73d0e7fd51f6b45c149477a3acb86ffad9ae4
-EBUILD vdr-xine-0.9.4-r1.ebuild 1399 BLAKE2B a74857a2e0b1f986869405fd004b8a572345805c1013a4c27c62e6e7449d2f45725d8f754745e670447c3db7e85fb873c7cc88534cdedaab9cc0964905caf84d SHA512 e70d38d22c9002f84614cec328596bb4789d01447762ffbebbb0e231908c1fec6eeee8902f2b58dc05fa690b6f5ad223b8642f39eb7bbde31484292918479aac
-MISC metadata.xml 286 BLAKE2B be6209e81edb7bde9a3c178c0152e9009c5789b3162595081d5d44af99f1d3c6b747d2b3bf493fa017b6a9843f535173a25ac265b265751cb7ccaeaa42724863 SHA512 a6c26fe54505441ecd74821d1395822b4957614af572578d45446aa8a44dff60928d10ada289bbcb02304006ceafed98156f9410a7187923516fc8ea6962b9fa
diff --git a/media-plugins/vdr-xine/files/confd b/media-plugins/vdr-xine/files/confd
deleted file mode 100644
index d728819e0041..000000000000
--- a/media-plugins/vdr-xine/files/confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/conf.d/vdr.xine:
-
-# Global config file for vdr rc-scripts
-
-# -r:
-#   Enable xine to send keys to vdr-process
-
-_EXTRAOPTS="-r"
diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.9.4-build-system.patch b/media-plugins/vdr-xine/files/vdr-xine-0.9.4-build-system.patch
deleted file mode 100644
index 9ebaffb93c6b..000000000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.9.4-build-system.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 537ad5fa86305cf55f37dd9c87a9ec3260668049 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Tue, 10 Jan 2012 13:58:40 +0100
-Subject: [PATCH] patch 1
-
----
- Makefile |   14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 674f4fb..e1fdba2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -25,9 +25,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 
--VDRDIR = ../../..
--LIBDIR = ../../lib
--TMPDIR = /tmp
-+VDRDIR ?= ../../..
-+LIBDIR ?= ../../lib
-+TMPDIR ?= /tmp
- 
- ### Make sure that necessary options are included:
- 
-@@ -37,7 +37,7 @@ TMPDIR = /tmp
- 
- -include $(VDRDIR)/Make.config
- 
--INCLUDES += `pkg-config --cflags libxine` 
-+INCLUDES += `pkg-config --cflags libxine`
- 
- # where to create fifos (xine expects them at /tmp/vdr-xine)
- VDR_XINE_FIFO_DIR ?= /tmp/vdr-xine
-@@ -114,9 +114,9 @@ $(DEPFILE): Makefile
- -include $(DEPFILE)
- 
- ### Internationalization (I18N):
--
-+ifeq ($(ENABLE_I18N), yes)
- PODIR     = po
--LOCALEDIR = $(VDRDIR)/locale
-+LOCALEDIR = $(DESTDIR)$(VDRDIR)/locale
- I18Npo    = $(wildcard $(PODIR)/*.po)
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot   = $(PODIR)/$(PLUGIN).pot
-@@ -135,6 +135,8 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
- 	@mkdir -p $(dir $@)
- 	cp $< $@
- 
-+endif
-+
- .PHONY: i18n
- i18n: $(I18Nmsgs) $(I18Npot)
- 
--- 
-1.7.3.4
-
diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.9.4-gentoo.diff b/media-plugins/vdr-xine/files/vdr-xine-0.9.4-gentoo.diff
deleted file mode 100644
index 581dba287372..000000000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.9.4-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru xine-0.9.0-orig/xineLib.c xine-0.9.0/xineLib.c
---- xine-0.9.0-orig/xineLib.c	2009-01-18 17:40:13.228935882 +0100
-+++ xine-0.9.0/xineLib.c	2009-01-18 17:41:28.815595331 +0100
-@@ -2118,7 +2118,7 @@
- 
-   bool cXineLib::readNoSignalStream(const int index, const string &suffix)
-   {
--    string noSignalFileName = m_plugin->ConfigDirectory(PLUGIN_NAME_I18N);
-+    string noSignalFileName = "/usr/share/vdr/xine";
- //    noSignalFileName += "/noSignal.pes";
-     noSignalFileName += "/noSignal" + suffix + ".mpg";
- 
diff --git a/media-plugins/vdr-xine/metadata.xml b/media-plugins/vdr-xine/metadata.xml
deleted file mode 100644
index a1831e12ef39..000000000000
--- a/media-plugins/vdr-xine/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-needed -->
-	<use>
-		<flag name="yaepg">Enables support for the plugin vdr-yaepg (showing scaled video besides OSD)</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-plugins/vdr-xine/vdr-xine-0.9.4-r1.ebuild b/media-plugins/vdr-xine/vdr-xine-0.9.4-r1.ebuild
deleted file mode 100644
index 95a73a5b3eeb..000000000000
--- a/media-plugins/vdr-xine/vdr-xine-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: for 'software only' playback using xine"
-HOMEPAGE="http://home.vr-web.de/~rnissl/"
-SRC_URI="http://home.vr-web.de/~rnissl/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="yaepg"
-
-COMMON_DEP=">=media-video/vdr-1.5.7
-	>=media-libs/xine-lib-1.1.8[vdr]"
-DEPEND="${COMMON_DEP}"
-RDEPEND="${COMMON_DEP}
-	>=media-video/mjpegtools-2.1.0
-	media-libs/netpbm"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-	epatch "${FILESDIR}/${P}-build-system.patch"
-
-	use yaepg && sed -i Makefile -e "s:#VDR_XINE_SET_VIDEO_WINDOW:VDR_XINE_SET_VIDEO_WINDOW:"
-
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-1.7.33"; then
-		sed -e "s:pid == patPmtParser.PmtPid():patPmtParser.IsPmtPid(pid):" \
-			-i xineDevice.c
-	fi
-
-	# remove i18n crap
-	sed -e "s:^#include[[:space:]]*\"xineI18n.h\"::" -i xine.c
-
-	BUILD_PARAMS="VDR_XINE_FIFO_DIR=/var/vdr/xine"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dobin xineplayer || die
-
-	insinto /usr/share/vdr/xine
-	doins data/* || die
-
-	dodoc MANUAL
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	if [[ -d ${ROOT}/etc/vdr/plugins/xine ]]; then
-		ewarn "You have a leftover directory of vdr-xine."
-		ewarn "You can safely remove it with:"
-		ewarn "# rm -rf /etc/vdr/plugins/xine"
-	fi
-}
diff --git a/media-plugins/vdr-xvdr/Manifest b/media-plugins/vdr-xvdr/Manifest
deleted file mode 100644
index 874f019b5336..000000000000
--- a/media-plugins/vdr-xvdr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD vdr-xvdr-9999.ebuild 668 BLAKE2B 484576f7e651c60bdf57e031494957aa15571b25c81d3ecda6baa8f97f80d780a114740bbb5134fadac5158b1fac328213835dcaaa76d4a27672f4d797174c3b SHA512 836310d9b3156cd01a38a003cf5678788b47bd8839459cdb23961d339cdeaa500d3a8f639a0edc042b39495a13baf817e4a814ef2e32e652b570477d62b0902a
-MISC metadata.xml 337 BLAKE2B 1732b0660146cb41f61cb8e6d85cb05fffbb884c21d6390daec97735d27f04a9608218a0f1bf4fda11fe8d70933fc3fa6daa791dfd94b5ea2d6949b81da92099 SHA512 063b71c7d44239342a1e900f65493ab6699ca7e811170c18672aba7829042ff61b7a4f87f217928b886413f7715683b1aed77a6b3174d1090cc8ecadbcba7c51
diff --git a/media-plugins/vdr-xvdr/metadata.xml b/media-plugins/vdr-xvdr/metadata.xml
deleted file mode 100644
index 88a3b492d20a..000000000000
--- a/media-plugins/vdr-xvdr/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>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">pipelka/vdr-plugin-xvdr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-plugins/vdr-xvdr/vdr-xvdr-9999.ebuild b/media-plugins/vdr-xvdr/vdr-xvdr-9999.ebuild
deleted file mode 100644
index 94eb4a907f73..000000000000
--- a/media-plugins/vdr-xvdr/vdr-xvdr-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2 git-2
-
-EGIT_REPO_URI="https://github.com/pipelka/vdr-plugin-xvdr.git"
-
-DESCRIPTION="VDR plugin: XVDR Streamserver Plugin"
-HOMEPAGE="https://github.com/pipelka/vdr-plugin-xvdr"
-SRC_URI=""
-KEYWORDS=""
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-plugin
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	fix_vdr_libsi_include "${S}"/src/live/livepatfilter.h
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/plugins/xvdr
-	doins xvdr/*.conf
-	diropts -gvdr -ovdr
-}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index e3d93d57a388..3e6a498e23c5 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 4595c4671269..7f7d877ae1aa 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -3,6 +3,6 @@ DIST fldigi-4.0.16.tar.gz 3727379 BLAKE2B 249516d338d3c70365213673fc4ad3ecd1298f
 DIST fldigi-4.0.17.tar.gz 3757991 BLAKE2B 1203ccbfafcb74cc6a48f22465473acbcbf47485d22d191f4aeb64d51059d8dd9a0dd743e62f10fbea08404567f2551d9b42a47562beb70325dfbc6854a8af2b SHA512 566a424037aa1199da63c44895ddaa3afb51b45f7fb1dfd43992f9b3c8b26dbecf649df6f77d0758f8cc6e35fa94598d3c6e64236621f3a64bfc50897e74f722
 DIST fldigi-4.0.18.tar.gz 3757912 BLAKE2B f50f9233bf077c8d53bafffe153c319778fc0f0efa5123b1c6169bce70f91bb6cd799944486b4c2eb31ecdf0f15e75d9d6b700d6c21f4a256382d947d4e14f68 SHA512 b585845b83b8f108a0aefa108349a73e53378e39c545d426c5846dc451653bcbc13d2239e33e69e6045eaeb605c4ac7dc1ae3e9cc0173962f6e0cb86bc6a4f5c
 EBUILD fldigi-4.0.16.ebuild 963 BLAKE2B 40d3a14326eca2e180f17393928b8a856f419ff8f7c5f5d53c71a11677242f51f109efb51ebedb86dbc36592e11b694398f0537a49d52f2aa49f55de0509f918 SHA512 cd049738e4d063b4a23121e0a7890875b5dc19dc70bc183dcd748063717e03ab143a6c588a7c1383f0a1425517bb8b7b35e9af517567cfde82078456c367cc9d
-EBUILD fldigi-4.0.17.ebuild 1206 BLAKE2B 587365bad93d4c8d41ffda9c0254196dfdf10fe25d3ecd5765f44bedbffb9412bea253d715b58bc583d164a575ef9b183522c119568d1d201a1af6b66b331d5e SHA512 1cc2b416c52744a58b778c079826cc8249911482430828d55c0bfdc3d79ac2d575e2c95d89b0282fadd40e12825556d9d3c2dcaec4d4584bc934e45cfa49b257
-EBUILD fldigi-4.0.18.ebuild 1206 BLAKE2B 587365bad93d4c8d41ffda9c0254196dfdf10fe25d3ecd5765f44bedbffb9412bea253d715b58bc583d164a575ef9b183522c119568d1d201a1af6b66b331d5e SHA512 1cc2b416c52744a58b778c079826cc8249911482430828d55c0bfdc3d79ac2d575e2c95d89b0282fadd40e12825556d9d3c2dcaec4d4584bc934e45cfa49b257
+EBUILD fldigi-4.0.17.ebuild 1290 BLAKE2B fd7e80b6a24c917b069ce86df423f4901eef49ebff53376f624c3948bab8a57696d02498ca729255216be3e0448a3d50bedaf01e3ae4f89120d24d87a87ae66b SHA512 05ac310aade6dd5e55fda3a1d898f809efba3c57e40336bd5f986e9736ee69ea5db6a6185b6474181ffa18a069d1ad020ad7e6bd98fe9595c2699e882178b228
+EBUILD fldigi-4.0.18.ebuild 1290 BLAKE2B fd7e80b6a24c917b069ce86df423f4901eef49ebff53376f624c3948bab8a57696d02498ca729255216be3e0448a3d50bedaf01e3ae4f89120d24d87a87ae66b SHA512 05ac310aade6dd5e55fda3a1d898f809efba3c57e40336bd5f986e9736ee69ea5db6a6185b6474181ffa18a069d1ad020ad7e6bd98fe9595c2699e882178b228
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.0.17.ebuild b/media-radio/fldigi/fldigi-4.0.17.ebuild
index 36c4d891600d..81f8dc09f51c 100644
--- a/media-radio/fldigi/fldigi-4.0.17.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,12 +36,16 @@ DOCS=( AUTHORS ChangeLog NEWS README )
 PATCHES=( "$FILESDIR"/$PN-c++11.patch )
 
 src_configure() {
-	econf --with-sndfile \
+	local myconf=""
+
+	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
+	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
+	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
+
+	econf ${myconf} \
+		--with-sndfile \
 		$(use_with hamlib) \
 		$(use_enable nls) \
 		$(use_with pulseaudio) \
-		$(use_enable cpu_flags_x86_sse optimizations sse) \
-		$(use_enable cpu_flags_x86_sse2 optimizations sse2) \
-		$(use_enable cpu_flags_x86_sse3 optimizations sse3) \
 		--without-asciidoc
 }
diff --git a/media-radio/fldigi/fldigi-4.0.18.ebuild b/media-radio/fldigi/fldigi-4.0.18.ebuild
index 36c4d891600d..81f8dc09f51c 100644
--- a/media-radio/fldigi/fldigi-4.0.18.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,12 +36,16 @@ DOCS=( AUTHORS ChangeLog NEWS README )
 PATCHES=( "$FILESDIR"/$PN-c++11.patch )
 
 src_configure() {
-	econf --with-sndfile \
+	local myconf=""
+
+	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
+	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
+	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
+
+	econf ${myconf} \
+		--with-sndfile \
 		$(use_with hamlib) \
 		$(use_enable nls) \
 		$(use_with pulseaudio) \
-		$(use_enable cpu_flags_x86_sse optimizations sse) \
-		$(use_enable cpu_flags_x86_sse2 optimizations sse2) \
-		$(use_enable cpu_flags_x86_sse3 optimizations sse3) \
 		--without-asciidoc
 }
diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest
new file mode 100644
index 000000000000..7470617aa290
--- /dev/null
+++ b/media-radio/js8call/Manifest
@@ -0,0 +1,4 @@
+AUX 0.7.5-makefile-removesymlink.patch 613 BLAKE2B 9a79e05572ce2f09384c6c94ace1f22714ac5cc46748bbdd724095ef55ddb861157334db8a9bf29a43712dda4b9853b030236946168c21c20c942ac1ae699b69 SHA512 22e8cc74f99a2200ef47ba1c2c3b2abd285a0871ef2cfac87a67e7f22a32ca4943861628e7313fdf6f20246da4c08c1fcbaa69d83960097fdd30a510294542a4
+DIST js8call-0.7.5.tar.bz2 41230267 BLAKE2B 0d49f3d65ce7df501bdfee597ba8a7670dfb80217fec2f5d66859381cceaaf759e940c99b015246d58abe8549114ffe9ba3d67cebdee5122284fc2a221de02bf SHA512 e4e35a086a1443def71fe1bd9d057c3ec38f261b68818c841a90ef858d6c480b2cbb5f721ac26e1651836326b12059b2a01370a2c7c63925a40971d343e9f8e8
+EBUILD js8call-0.7.5.ebuild 1126 BLAKE2B e0fc86bce72d42c6ed0abbac139c9b82fbc74b627e74298d8bde8a1a140c48e21a6f452fb162f44f60693a5de473a7c75d4b59dfac6344aba1b0c9c3665dd47a SHA512 b6f2584cc3fb6305d912017f759b59d853af1d040ad5e5d0cd25578d507468190f0377348a7c7b69f40ecc45d01bd7c36935f4d574db44e8cf3258bb2fdb6241
+MISC metadata.xml 310 BLAKE2B 672d5f3bae07a95f76f3cdeb2407ffe32144f248a056083969d4dfa6a1fd0448382a01b5bd8e6ec4336478052a569d4710328d6a87eefa5c0cc1b53b05ee88ab SHA512 a64340db0f7654cfb3ff0af4508d1ffb83b61fd39877aff3503a7468142c64b8266f12d585e5d6ba3c2a05e6706deeb4c0408e05ed287a49546dee906602d045
diff --git a/media-radio/js8call/files/0.7.5-makefile-removesymlink.patch b/media-radio/js8call/files/0.7.5-makefile-removesymlink.patch
new file mode 100644
index 000000000000..c4c9e040a741
--- /dev/null
+++ b/media-radio/js8call/files/0.7.5-makefile-removesymlink.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt	2018-10-08 10:25:35.183735723 -0400
++++ a/CMakeLists.txt	2018-10-08 10:26:27.626449814 -0400
+@@ -1272,12 +1272,12 @@
+     #COMPONENT runtime
+     )
+ 
+-    execute_process(COMMAND ln -s /opt/js8call/bin/js8call ljs8call)
++#    execute_process(COMMAND ln -s /opt/js8call/bin/js8call ljs8call)
+ 
+-    install(FILES
+-        ${CMAKE_BINARY_DIR}/ljs8call DESTINATION /usr/bin/ RENAME js8call
+-        #COMPONENT runtime
+-    )
++#    install(FILES
++#        ${CMAKE_BINARY_DIR}/ljs8call DESTINATION /usr/bin/ RENAME js8call
++#        #COMPONENT runtime
++#    )
+ endif (NOT WIN32 AND NOT APPLE)
+ 
+ 
diff --git a/media-radio/js8call/js8call-0.7.5.ebuild b/media-radio/js8call/js8call-0.7.5.ebuild
new file mode 100644
index 000000000000..9b2683cd0068
--- /dev/null
+++ b/media-radio/js8call/js8call-0.7.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils vcs-snapshot
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="https://groups.io/g/js8call"
+SRC_URI="https://bitbucket.org/widefido/wsjtx/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+PATCHES="${FILESDIR}/${PV}-makefile-removesymlink.patch"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtserialport:5
+	dev-qt/qtprintsupport:5
+	virtual/libusb:1
+	media-libs/portaudio
+	sci-libs/fftw:3.0[threads,fortran]
+	virtual/fortran
+	app-text/asciidoc
+	media-libs/hamlib
+	doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWSJT_GENERATE_DOCS="$(usex doc)"
+		-DWSJT_DOC_DESTINATION="/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm "${D}"/usr/bin/rigctl{,d}-local || die
+	rm "${D}"/usr/share/doc/JS8Call -R || die
+
+}
diff --git a/media-radio/js8call/metadata.xml b/media-radio/js8call/metadata.xml
new file mode 100644
index 000000000000..c9b47f5666c7
--- /dev/null
+++ b/media-radio/js8call/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>rich0@gentoo.org</email>
+	<name>Rich Freeman</name>
+</maintainer>
+<upstream>
+	<remote-id type="bitbucket">wsjtx</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index a0fe3d8c5b94..3dec917cb652 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -1,3 +1,5 @@
 DIST tlf-1.3.0.tar.gz 643783 BLAKE2B 8de41b3414231cf10256225bcd8e080c1c3b20849f8298dcb5df0f3f094c2fa80d93229bd75d14f5f6f75280215744d43f39460dee94ef768169957f8587ef28 SHA512 c2c1f7ce8ff74b94fe0538fb6cd39d2e1b70d392c0e050ce60a107a085406edc83ee54fd18d42a1dcb688859c53072f9918cba4d8001889189b337eded0374c7
+DIST tlf-1.3.1.tar.gz 689531 BLAKE2B 4c56728776493c1a77f85fdf5f3c2abe456043d07d2106cb08f7f04af31bc317507e4589c3e2ae310d184f8ed6103611d936a69df7d55a9575234420bdf29823 SHA512 aa26b87071a85574f2c08b46a3b0d8e030fb4384a38da4f7c97b6b1fb80c6c63b9f1814cf0eced090219e365d67cfcdabf5b71b2feaa39d281e41333bd5afcdb
 EBUILD tlf-1.3.0.ebuild 643 BLAKE2B a06cc0c5caef73f382a51f1e187035a9dc740512ec2711d3e9b4adb63212240191b96aa5ebd5de4242b07a64438a8245aebf46d0bfd56d05168faa609d94131f SHA512 cec320a9268fa4b4df8eeb4e58155898615a7cd372e27e2864af15ad73d489e501ab1d78c372acc705a9eb9ac2bf69b751f91b4ed8d9d7998275da42d0245a95
+EBUILD tlf-1.3.1.ebuild 659 BLAKE2B c4a4fbde3898698e6de47ac3fa9a58bb8c286571791c61efc610c93345c2c16421ab40b57d73d28e276cfbd493825c062ae383662eb782234f912f6a05efa221 SHA512 23892aea13f9adaa673ac3d2afda7fda30050634fd5317168531353bc71c577a1644cd2ad1361c0a15db26f005bc89ea3a252db522630a29d496d1f4516cd2dd
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/tlf/tlf-1.3.1.ebuild b/media-radio/tlf/tlf-1.3.1.ebuild
new file mode 100644
index 000000000000..6be0473c0593
--- /dev/null
+++ b/media-radio/tlf/tlf-1.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="Console-mode amateur radio contest logger"
+HOMEPAGE="http://home.iae.nl/users/reinc/TLF-0.2.html"
+SRC_URI="http://www.hs-mittweida.de/tb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="sys-libs/ncurses:=
+	dev-libs/glib:2
+	media-libs/hamlib
+	media-sound/sox
+	dev-libs/xmlrpc-c[curl]"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )"
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf --docdir=/usr/share/doc/${PF} --enable-hamlib --enable-fldigi-xmlrpc
+}
diff --git a/media-radio/tqsl/Manifest b/media-radio/tqsl/Manifest
index 23676d3dad89..5d4e78cd2e4a 100644
--- a/media-radio/tqsl/Manifest
+++ b/media-radio/tqsl/Manifest
@@ -1,4 +1,6 @@
 AUX 2.3.1-suffix.patch 639 BLAKE2B 478f9f45bc3151d4b10c1c55ac5507490de56d33dcbc7b39ac0c52ba813a89e28c49628ff551c57c55b52da028c15d1e481508bf13a835dff244759c009cb838 SHA512 a255937915503e5d600141fdee0e85032fe39bd66de0d17d65747ee96441207be987225122bd7eed6eafb5119c93031933add7afc01ac3358b0d2255049c7397
 DIST tqsl-2.3.1.tar.gz 2896807 BLAKE2B f2937950b5328cfb0a13b87797f40594799e01139d5b307199095b8cdbe6f4532e911fd9661ad3b663d8616d9287d8a359f2fefb4364c6450ba4be2505a89c63 SHA512 edaa21b1605bcb38790a66d61e1498a04f41c4f9b3b577908a6e57cd38e1ac2e1724e9c6d5421e0ca4a4ea72d1d5f5d54f08bf5a6c202bf68181ec12f27d4afd
+DIST tqsl-2.4.1.zip 4393331 BLAKE2B e101d8b2c35b820d68f399bbc0917fa92df0111ff9ea9cc6f353fad63911ad5db8e9c06cd00ae479b2726fe5ffbd69b0241b5d7356151e80ce9824cc85e8e2cb SHA512 0a3a092ee5169d5eee3d997e0760ed4c0ed361f27f6b6f6c356efc568bbd737e23c6329bffa6cee3e939555b2adc07fe917a69960f9b38ddaac057614e53b71b
 EBUILD tqsl-2.3.1.ebuild 645 BLAKE2B a7733f2a08b6b579d4dbe9d44022aa85343bc85f425770633f856fc8196ea10f5046640c488bded171a8901e35ac633de453f2ce28da1ade3c357ef2d6d71556 SHA512 2dcdecebc587a754b0d55b3db0513fc3cba810ce47eaf56c9e15fdb1ea4693cb1c3a516dc2a2ec3e597cb5a5f3998de76d26932d8594b0f7bae87d206f3fe9a9
+EBUILD tqsl-2.4.1.ebuild 764 BLAKE2B 0b1322a9e8e516105231ff0cf6b8638228d3ad3b9cec66145015afc1fab5ac7982363c5508ba310c1f71346dbff8db185a6c7a6788fabd8468c7647a65c7c1ce SHA512 0bd167ad9accb7ee96718f50ef44995d3303151af3fa4e0d006252f8946cf41be85d4ddfadb788e375a443b1389abd4df68d6ec85f6d35979d77f0c3321cfd87
 MISC metadata.xml 290 BLAKE2B f7cef55d87602daf43b81563c336871a73782896b4114ef472be770bf6fa28af5672cd6eb846e8a00fd486878d39912f3599fe8b0699683ffd0970727cdbf517 SHA512 77d017e74467e30678cdda40874f4905e78c3589f51d5e0e90952227c10a070ba4132b028d18825134e7bf9a36c98ed7f7b2a19e22324202261c1098db42f7c1
diff --git a/media-radio/tqsl/tqsl-2.4.1.ebuild b/media-radio/tqsl/tqsl-2.4.1.ebuild
new file mode 100644
index 000000000000..a41473bc7e9f
--- /dev/null
+++ b/media-radio/tqsl/tqsl-2.4.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils wxwidgets
+
+DESCRIPTION="ARRL Logbook of the World"
+HOMEPAGE="http://www.arrl.org/tqsl-download"
+SRC_URI="https://sourceforge.net/code-snapshots/git/t/tr/trustedqsl/tqsl.git/trustedqsl-tqsl-fa49d1a6a2a9c06181f72558f732e7960cb3f430.zip -> ${P}.zip"
+
+S=${WORKDIR}/trustedqsl-tqsl-fa49d1a6a2a9c06181f72558f732e7960cb3f430/
+
+LICENSE="LOTW"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/expat:=
+		dev-libs/openssl:=
+		net-misc/curl:=
+		sys-libs/db:=
+		sys-libs/zlib:=
+		x11-libs/wxGTK:3.0="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS.txt INSTALL README )
+HTML_DOCS=( html )
+
+WX_GTK_VER=3.0
+
+pkg_setup() {
+	setup-wxwidgets
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bdd2ab5bf2ea..612be3d5ca7f 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index be3e625fc421..56a420f211b9 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -3,4 +3,4 @@ DIST abcde-2.5.4.tar.gz 104229 BLAKE2B 38244005df80868e24a21d39f3d4cabd6d8b8d6e4
 DIST abcde-2.8.1.tar.gz 149238 BLAKE2B 0adb1ea164e72292ee1e5b7e99c6bd9a92342f9eb5036280b91ad43ab62e5b0ef79652d094a81f38f4052c749d874e12da76eaf74134d07517fc8fac1f0d7e64 SHA512 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
 EBUILD abcde-2.5.4-r1.ebuild 1556 BLAKE2B 1b05caec47b0dd5b10d530641d5fd7963b1746524b6a660bba397e8bbc94cb0468f2a04a7f72f75870c08561626091a32cae871e3832bc16d00e32715a3a084d SHA512 cfae3e23754c1b6a8170d8f4046a4c436ae7247f19e9af3c4397229bc5677f55d935bed731ece8f316edf91f7887e6bf39194d4f094f3810ad9306c7a189e030
 EBUILD abcde-2.8.1.ebuild 1756 BLAKE2B 84baa7f929ae4144ab55b2b470eba21982306ee02afed134de69aec855b3abb23637b0ed1b485047ea00fda2ec2e408bd8c3b52fa5a3d7183a81a5dba870433b SHA512 4010e4bdad8d4b489c6be85a9c8eb96b17a05f51662e6a88d6a888ff05b99f4c0e7060063e7f7a3e7bf8a9fc7830d9ba29e4207d5276b734679a88b0c1cb66c1
-MISC metadata.xml 651 BLAKE2B ca84bde665367b9f55bdd57c3c7783c293b037715cbbec3540142ca1e3b4cf98865cb57a378973c1383bd6d83c263ca4e1520bc49c88ce299b3a92fbbbe04d2f SHA512 9174fb9c065d85ff2cb5312bca39bf33d5798f06caafe2a6d8e5fc239b253df8956a30b920fb0392e6a979328c975718f8393655a7cdaf975a72747de1c67ef5
+MISC metadata.xml 588 BLAKE2B d6639ce0154b4d8b2ad0c7df4d203c7da5650687e24c79ec92977a8e7534539ac62f597b31a3488f976d8f1f11a07f4a77c9b936c56b09ad8e965076e89aa1e8 SHA512 375d7d28e8fb20a86cc92df73927b27e065a975c850aa23575f0f1ea7cc88b46e8eb92013a8b1ff44d5cc150c0082da8142fa41bec49d642c14844ef1a5b1cb1
diff --git a/media-sound/abcde/metadata.xml b/media-sound/abcde/metadata.xml
index 41b01c0f1635..658ab9a36efa 100644
--- a/media-sound/abcde/metadata.xml
+++ b/media-sound/abcde/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="id3tag">Support ID3, ID3v2 tagging of audio files</flag>
 		<flag name="mac">Enable support for Monkey's Audio files</flag>
 		<flag name="normalize">Add support for normalizing audio file volume levels</flag>
-		<flag name="opus">Support opus encoding using opusenc</flag>
 		<flag name="replaygain">Support for Replay Gain metadata, for relative volume adjustment</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 102d134e56c3..15c315f41968 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,10 +1,8 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
 DIST alsa-tools-1.1.0.tar.bz2 1715113 BLAKE2B 9b64f3a78e0cff212663c716c189591cd249e58992e5b403e8948b0fa81c4b3b86cc4872f4dcb7a0fadf9cb313043201549b10f3a36d546911bba18fe9fc3602 SHA512 caabbc9a8b494de6bba0dea6440b335b35e5c7dab4942ac36f127a75c2212ff98e7e38566444666edcf40c6c95e6d9797c421014fb5c5c292bb398780e6c9f87
-DIST alsa-tools-1.1.3.tar.bz2 1715759 BLAKE2B c267c746b1b6e986d65e4f69874eb8432e141e823112037ac21f6c794275c818d66dc8adb680c62eb72621d6d6b0974efaffadcf5b7dd7aea53c4c1528631c14 SHA512 b7c6c7639ea30fd8385c817fcd9dee4e5ed7c5766801d11a61d94f3211db4f99ecc0f00173573b69724ad9a06138605c353f4a40c8631eb4325b9718788bea50
-DIST alsa-tools-1.1.5.tar.bz2 1715977 BLAKE2B a8608d19794f7072959121a5f6ab8a7f676d600706bcf52d7e0ec770947fa85948927c1967d4ed35befd31f3bf1b66633ae107274b11490b4bb4558d434c4f80 SHA512 42463540def2260bda0fdb0b08a665ef336deb817920605ce8f77b4904595eadc7d4774d799385bb2271026e26976cc733a776b228814d2c7d7651c46a45098d
 DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75cb6838c407586b52144963350d51271fb500e627e152d05d1c586c337c70fc839072094e0492a0a1b160d6876ccedeb SHA512 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17
+DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 EBUILD alsa-tools-1.1.0.ebuild 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284
-EBUILD alsa-tools-1.1.3.ebuild 3497 BLAKE2B 247f1a79678b2a6f647da73c5e523a95d62565d66eebce000e5987adaa92995d5066e859c688ed7b7197939bf3e9ecb0b031e33d2c30dece41219d6eacf01459 SHA512 0c9bafd1470f61f189a19de82a7bbcafaeb9c195edb13632f63c846f5a248d755f668592025afd427719ea1d79223baafe994fac24b5b1a3fe6daffa5d81a60e
-EBUILD alsa-tools-1.1.5.ebuild 3497 BLAKE2B 247f1a79678b2a6f647da73c5e523a95d62565d66eebce000e5987adaa92995d5066e859c688ed7b7197939bf3e9ecb0b031e33d2c30dece41219d6eacf01459 SHA512 0c9bafd1470f61f189a19de82a7bbcafaeb9c195edb13632f63c846f5a248d755f668592025afd427719ea1d79223baafe994fac24b5b1a3fe6daffa5d81a60e
-EBUILD alsa-tools-1.1.6.ebuild 3547 BLAKE2B 6c8107c40bfc3927e2e5a4d6eedb4791882dcebb5d3033eec1f4d8d338e9bd01ff422eadca8b32dc569405e5624779d7529a848ab124f2e8103da4440d2b6e57 SHA512 26a4f2338d1714e1a9a0cebf8a731a3b19ee4513fc1738411bd7865e84630c7d83a7f1fefea09c10c1c9b831d9b2e5ac4f10f86a9f0441388eb06aafb54d0a6e
+EBUILD alsa-tools-1.1.6.ebuild 3548 BLAKE2B b6a7fd71fdf79123aed542424f475b42d4d279daa2f33d586c499518aaf20aea4311b9e0d960f0e8d2e67bd77ddb1f0d1039a6c7a5af5be91d51eb5c097c7b84 SHA512 2535753579ebff3dd7fe0f4cca577a4873e2b71c902eae675d7d9cef97aab708cb46a0d02342e9dcebb1ccf8f09ac4f6c80c3965183c1e4a4c637b00d0bba882
+EBUILD alsa-tools-1.1.7.ebuild 3544 BLAKE2B b833cc72f9bd1d45a75f992cd9d0667ba23e94bcda8a22b2d39c2d72fa475bc78fc5e746061dd961fa7a7b83d74af3e7f910ba46ffd5fa8c67f21c5b8d5900ad SHA512 f2f7ed51b00cdd3ae72eae5d22f0185001bb0c96bbba656882c8f562ef962aa8b484b87db45aa2730ad2659c740e9c62621d8c2e4c069610cdda4c5f44055c81
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild
deleted file mode 100644
index 972e14d4b033..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild
+++ /dev/null
@@ -1,144 +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
-
-DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
-alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
-alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
-alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
-
-COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
-	>=dev-python/pyalsa-1.0.26
-	fltk? ( >=x11-libs/fltk-1.3.0:1 )
-	gtk? (
-		>=dev-python/pygtk-2
-		x11-libs/gtk+:2
-		x11-libs/gtk+:3
-		)" #468294
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( media-fonts/font-misc-misc )" #456114
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/envy24control-config-dir.patch
-)
-
-pkg_setup() {
-	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
-
-	if use gtk; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdajackretask"
-		use alsa_cards_ice1712 && \
-			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
-		use alsa_cards_rme32 && use alsa_cards_rme96 && \
-			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
-	fi
-
-	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
-		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
-	fi
-
-	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
-	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
-	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
-	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
-	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
-
-	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
-		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
-
-	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
-	fi
-
-	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer"
-}
-
-src_prepare() {
-	default
-
-	# This block only deals with the tools that still use GTK and the
-	# AM_PATH_GTK macro.
-	for dir in echomixer envy24control rmedigicontrol; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	# This block deals with the tools that are being patched
-	for dir in hdspconf; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	elibtoolize
-}
-
-src_configure() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
-	fi
-
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		case "${f}" in
-			echomixer,envy24control,rmedigicontrol )
-				econf --with-gtk2
-				;;
-			* )
-				econf
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		emake
-	done
-}
-
-src_install() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		# Install the main stuff
-		cd "${S}/${f}"
-		# hotplugdir is for usx2yloader/Makefile.am
-		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
-
-		# Install the text documentation
-		local doc
-		for doc in README TODO ChangeLog AUTHORS; do
-			if [[ -f "${doc}" ]]; then
-				mv "${doc}" "${doc}.$(basename ${f})" || die
-				dodoc "${doc}.$(basename ${f})"
-			fi
-		done
-	done
-
-	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
-	prune_libtool_files
-}
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild
deleted file mode 100644
index 972e14d4b033..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild
+++ /dev/null
@@ -1,144 +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
-
-DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
-alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
-alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
-alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
-
-COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
-	>=dev-python/pyalsa-1.0.26
-	fltk? ( >=x11-libs/fltk-1.3.0:1 )
-	gtk? (
-		>=dev-python/pygtk-2
-		x11-libs/gtk+:2
-		x11-libs/gtk+:3
-		)" #468294
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( media-fonts/font-misc-misc )" #456114
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/envy24control-config-dir.patch
-)
-
-pkg_setup() {
-	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
-
-	if use gtk; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdajackretask"
-		use alsa_cards_ice1712 && \
-			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
-		use alsa_cards_rme32 && use alsa_cards_rme96 && \
-			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
-	fi
-
-	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
-		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
-	fi
-
-	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
-	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
-	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
-	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
-	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
-
-	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
-		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
-
-	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
-	fi
-
-	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer"
-}
-
-src_prepare() {
-	default
-
-	# This block only deals with the tools that still use GTK and the
-	# AM_PATH_GTK macro.
-	for dir in echomixer envy24control rmedigicontrol; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	# This block deals with the tools that are being patched
-	for dir in hdspconf; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	elibtoolize
-}
-
-src_configure() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
-	fi
-
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		case "${f}" in
-			echomixer,envy24control,rmedigicontrol )
-				econf --with-gtk2
-				;;
-			* )
-				econf
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		emake
-	done
-}
-
-src_install() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		# Install the main stuff
-		cd "${S}/${f}"
-		# hotplugdir is for usx2yloader/Makefile.am
-		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
-
-		# Install the text documentation
-		local doc
-		for doc in README TODO ChangeLog AUTHORS; do
-			if [[ -f "${doc}" ]]; then
-				mv "${doc}" "${doc}.$(basename ${f})" || die
-				dodoc "${doc}.$(basename ${f})"
-			fi
-		done
-	done
-
-	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
-	prune_libtool_files
-}
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
index 5f4c7573d32d..b0f1e28d9fa4 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
new file mode 100644
index 000000000000..446f976a0369
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic gnome2-utils xdg-utils
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
+alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
+alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
+alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
+
+COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
+	>=dev-python/pyalsa-1.0.26
+	fltk? ( >=x11-libs/fltk-1.3.0:1 )
+	gtk? (
+		>=dev-python/pygtk-2
+		x11-libs/gtk+:2
+		x11-libs/gtk+:3
+	)" #468294
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( media-fonts/font-misc-misc )" #456114
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/envy24control-config-dir.patch
+)
+
+pkg_setup() {
+	ALSA_TOOLS=(
+		seq/sbiload
+		us428control
+		hwmixvolume
+		hda-verb
+		$(usex alsa_cards_mixart mixartloader '')
+		$(usex alsa_cards_vx222 vxloader '')
+		$(usex alsa_cards_usb-usx2y usx2yloader '')
+		$(usex alsa_cards_pcxhr pcxhr '')
+		$(usex alsa_cards_sscape sscape_ctl '')
+	)
+
+	if use gtk; then
+		ALSA_TOOLS+=(
+			echomixer
+			hdajackretask
+			$(usex alsa_cards_ice1712 envy24control '')
+		)
+		# Perhaps a typo the following && logic?
+		if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
+			ALSA_TOOLS+=( rmedigicontrol )
+		fi
+	fi
+
+	if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
+		ALSA_TOOLS+=(
+			hdsploader
+			$(usex fltk 'hdspconf hdspmixer' '')
+		)
+	fi
+
+	if use alsa_cards_sb16 || use alsa_cards_sbawe ; then
+		ALSA_TOOLS+=( sb16_csp )
+	fi
+
+	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
+		ALSA_TOOLS+=( as10k1 ld10k1 )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# This block only deals with the tools that still use GTK and the
+	# AM_PATH_GTK macro.
+	for dir in echomixer envy24control rmedigicontrol; do
+		has "${dir}" "${ALSA_TOOLS[*]}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	# This block deals with the tools that are being patched
+	for dir in hdspconf; do
+		has "${dir}" "${ALSA_TOOLS[*]}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	elibtoolize
+}
+
+src_configure() {
+	if use fltk; then
+		# hdspmixer requires fltk
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
+	fi
+
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		cd "${S}/${f}" || die
+		case "${f}" in
+			echomixer,envy24control,rmedigicontrol )
+				econf --with-gtk2
+			;;
+			* )
+				econf
+			;;
+		esac
+	done
+}
+
+src_compile() {
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		cd "${S}/${f}" || die
+		emake
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		# Install the main stuff
+		cd "${S}/${f}" || die
+		# hotplugdir is for usx2yloader/Makefile.am
+		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
+
+		# Install the text documentation
+		local doc
+		for doc in README TODO ChangeLog AUTHORS; do
+			if [[ -f "${doc}" ]]; then
+				mv "${doc}" "${doc}.$(basename ${f})" || die
+				dodoc "${doc}.$(basename ${f})"
+			fi
+		done
+	done
+
+	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index cb8d58de0a85..8cac599a2fe8 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -3,11 +3,9 @@ AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893
 AUX alsasound.initd-r6 2189 BLAKE2B f0c4b5b51aae15f5d841b4e2ea8ce6a0631f92868a12b481798c484f6eff54bf8de0352c8c8b01c58d6164ab8de25bbfebb619f87bebb9c50c00610b67eed2e8 SHA512 960e6eff97174004abeb8d36d68c01a9f67e589174743928bb63dc37390f9868551e5b7e11c8386db67889c3d518f5ff4564b258dfee5e3317c164bc52aac04e
 AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4afdc5c5f601e5e7055710474db63ac9c6dd4145a680e94f08f8beff138d43a1ad50e3f24d52ae6bd40b7 SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115
 DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2d4fca63045b7c59b14240d5ad6316c37f1c7d6f4a7fa2cfeb8e5ae561440b9ad689475e006ab1fcaea2065b7c33015 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14
-DIST alsa-utils-1.1.4.tar.bz2 1202047 BLAKE2B 5da3c543ef6056b99ed56975211a0a788e0672160f21b7579e4f9d6d192b655d81a1350f096ff35547f89c7353532523c592d44cf3d5a740cd2189cb9626144d SHA512 96852b3f5b57d7d9078a20881f28311543d446b69c80450179823a225089df7306456991890a7ef37672c1f55e9c386a7731c94e125504dcda2c88a674c8b4c7
-DIST alsa-utils-1.1.5.tar.bz2 1202691 BLAKE2B 2a30079775d7d0abb8e2036f2e2569b392920bd5f60ec5361b9b69d3f1cc1d277225318c7e0c477c6d9608a3c45430cd1e2030069e4cdf1f960a7631985f9eab SHA512 102e9ed34b89219dbad243ad5f61ca65fb8101502566c02f40d4e69abb45baa7a60f24440de1417e0f0e7f55b28db53d365d53a59af11f1ca816e2aa5907153d
 DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58
+DIST alsa-utils-1.1.7.tar.bz2 1205754 BLAKE2B 419fa61fe85750ed26ab2b1dfe87adc7898f8c95dfe082993c0d5ee7755c4cb6563000555f44267608a2138d033e7011e7c67d98b714fdf1884cc03a8fd50ed3 SHA512 5da9b03e219d67634307bd5bb06b76734db5286221bec11658ce9c4dfca8ed639a4155ed90450f1d6c8db322960bb023ced0873e276500ce24f14fab17ceeb65
 EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
-EBUILD alsa-utils-1.1.4-r1.ebuild 2273 BLAKE2B 567cf0b992c725bc555df0c9b437b4985c70679c0ff0768ecbd9086873ab5d3aba25bdd5ba1ed6e1520423659512da68618b6d1e441b80fe8d33379d0550c647 SHA512 170a3d59d02f65d33647eaf70f28f354c725fe11087c640e6917fc9c51a02540ecb2461da224e2c70282010869edadc6399252f04fcc8c70d6faab5be07dfc08
-EBUILD alsa-utils-1.1.5.ebuild 2273 BLAKE2B 567cf0b992c725bc555df0c9b437b4985c70679c0ff0768ecbd9086873ab5d3aba25bdd5ba1ed6e1520423659512da68618b6d1e441b80fe8d33379d0550c647 SHA512 170a3d59d02f65d33647eaf70f28f354c725fe11087c640e6917fc9c51a02540ecb2461da224e2c70282010869edadc6399252f04fcc8c70d6faab5be07dfc08
-EBUILD alsa-utils-1.1.6.ebuild 2260 BLAKE2B 9fb6d1078cfa7b85f4c9edc8fec80778fa61a79c4acae3e401018357a0da7d5d60415ad830de6551f27f0973edd08178dd04c9a211953b8634eaa5f38a2a66de SHA512 bd18ccc3281c5eec232de0a5128e56f4c0508e342af3b226d389421bc2aedf9ea58ba0c6ebdd1fe790c1523b909662715041b63df9e40aded966cef2407e0d3d
+EBUILD alsa-utils-1.1.6.ebuild 2254 BLAKE2B 2977985938945fbf24e34735f5bb07cb44e644c9feeb7c6efab3a02cdb6864ee2a38ca49bf759f9642af7decc763d8b73dedf7cbe8da7799a061c3eb6b6b3bb2 SHA512 6f300503628a3fe5ea5dc570ac04d7c5bdbf52169570c9333f32f5f696527ca685e9b709c4e94dae3e9ee465e58d0edd8eeea705f5d42f8d4229bd27f5bb476a
+EBUILD alsa-utils-1.1.7.ebuild 2266 BLAKE2B 55f1b932f6812fb453d7f5fd2cf432b046297bd90a998c85fa338e0ece9b45f06ce7083988f48876ab481851a5e5e5de94a7291cd602f935b3c89ff3122f0c87 SHA512 6ff5c859af866ce59d46952fc25d1f4f5402ed1aa458ec2798a51647c9cc1a5424f0f3c3a1b0b4327f501f239f8bd25eae9880f7d414a2774581b720a1a207f2
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild
deleted file mode 100644
index acbfd5824ecf..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.1.4-r1.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
-inherit eutils systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_configure() {
-	local myconf
-	use doc || myconf='--disable-xmlto'
-
-	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-	econf \
-		--disable-maintainer-mode \
-		$(use_enable bat) \
-		$(use_enable libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d \
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa \
-		${myconf}
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.5.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.5.ebuild
deleted file mode 100644
index acbfd5824ecf..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.1.5.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
-inherit eutils systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_configure() {
-	local myconf
-	use doc || myconf='--disable-xmlto'
-
-	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-	econf \
-		--disable-maintainer-mode \
-		$(use_enable bat) \
-		$(use_enable libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d \
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa \
-		${myconf}
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
index d27b42e0d67e..a4bef363fabb 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.7.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.7.ebuild
new file mode 100644
index 000000000000..80b674c26780
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.1.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="bat doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+	bat? ( sci-libs/fftw:= )"
+DEPEND="${CDEPEND}
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local myeconfargs=(
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+		--disable-alsaconf
+		--disable-maintainer-mode
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(use_enable bat)
+		$(use_enable libsamplerate alsaloop)
+		$(use_enable ncurses alsamixer)
+		$(use_enable nls)
+		$(usex doc '' --disable-xmlto)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index e9b470b22ae1..162a2214f9a2 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,7 +1,5 @@
 AUX apulse 488 BLAKE2B 20231c1041e1658e993ecc5f0dbd37f1d7e718aa5095b0bcb18b6c78639da5da29d5aa72fe77c774598d199e8284cceaab9fdb9aa07cf734957fb1c2d8d617c0 SHA512 2b1ebb3d574af2469f50a42e324b3367b5e08d3de00076620ce2133226d544ab2507e6d752ff3ed427319978ab5e1a0e73189368666a5c7f5ed61f1294417228
 AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6171e29546af97c374765bed081cdf13827add3d02e5cdb6b30adccaae03318c102dba4cff65 SHA512 f1f743d049c120f3c8d6d1387577b53e9637881d9d5e007c55b4e42feca21b170ee24146c5fb0cc050c3eb1c26659dc6363e673710ae08c76f2844306a1ca01d
-DIST apulse-0.1.10.tar.gz 110272 BLAKE2B 3e05c93de225125ed0de75f5576282da89acd88398d3a5159d09a6f50a7747a3a341e192f35520d3fa79a6739bf287bbcf39fb350116aa5b5a86ca5034a13034 SHA512 e922448095b7e3c8ae5766fadd5912ad39c1d0d68c73954305d17909b6bafe3a95c7e1ad4d63a4824293e0ba1495c253204343f31330c0ddb4fb419fe1f9eb12
 DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7 SHA512 9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
-EBUILD apulse-0.1.10.ebuild 1081 BLAKE2B 372e93e508f668fff85c7d9117ee305bfa47d4685122503e3c6789b4b7423fcdd403c3305f0a719105060703a8640980ede90ba9c4939bc7691352d1810ec85f SHA512 3ba6f8eddad6065760b3d31ad52d306e63992be35595903f57edb4c93bf7b5712ad0d61b21cbb7dc7009b8a80c626b33302d3462661f28ed2944b13a5b573ece
-EBUILD apulse-0.1.12-r4.ebuild 1427 BLAKE2B ec17b7b6e2851c83bc37c5717116b2bdfc29793ef8cd99c8f2e0666424282170e19e7f56d599266ca6dcbb95ce4c54ed15a0b6f353bac753e318f60764fa8be3 SHA512 5394018fc9c5bea858512980a959067b934e662ac8393cd88b60ed77762d77d0eeeba0dd65ded3d4a528713b2cab95b8d2fb5da1199337536a05c1c22630e680
+EBUILD apulse-0.1.12-r4.ebuild 1422 BLAKE2B 2d6285fee007177284ad3e2d0ff06c006ffd31362b8f428db5689c4897044bf9f06855c9c79cb6d48ad93e951d7ba3a6e0def3325e4d767693c5e9f627064e59 SHA512 ed85600610668531916dace2a10abc0d3e39cf7ca353e8c530b930ef8742d99f3b0a5e0928f8a39230b9fd1041630e34e0dd5c62e41382e7a47521386396427c
 MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.10.ebuild b/media-sound/apulse/apulse-0.1.10.ebuild
deleted file mode 100644
index 82fe77ba30c8..000000000000
--- a/media-sound/apulse/apulse-0.1.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib cmake-multilib
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}
-	!!media-plugins/alsa-plugins[pulseaudio]"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure all relevant libdirs are added, to support all ABIs
-	DIRS=
-	_add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
-	multilib_foreach_abi _add_dir
-	sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=("-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse")
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	cmake-utils_src_install
-	einstalldocs
-	dobin "${T}"/apulse
-}
diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild b/media-sound/apulse/apulse-0.1.12-r4.ebuild
index b4e49def9d58..5d0b6c1550a7 100644
--- a/media-sound/apulse/apulse-0.1.12-r4.ebuild
+++ b/media-sound/apulse/apulse-0.1.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug sdk test"
 
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 6d48096bacb2..81d2085090da 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -2,4 +2,4 @@ DIST asunder-2.9.2.tar.bz2 279227 BLAKE2B 7b8e1a54e4577267d7c4b4fa3f3fd5b434bc52
 DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
 EBUILD asunder-2.9.2-r2.ebuild 1043 BLAKE2B b31247afc84f6cabf68b752e49b464470389de98fbcfa7c52fe90080802c16f3b4dfb796c79144713b08987a147db9f8a81e03d4bb40c2f4925e54f363f23583 SHA512 33aeebf7b9062697e34f58d0659fbc3caa306ca53671b218148861a1f5236902c015311ff8dc13fb88379d13ba15b73508e3bfb35a3afeb6718ecbb70b0558d2
 EBUILD asunder-2.9.3-r1.ebuild 1045 BLAKE2B ca487c6e9b44f7ffe47d6245e555a0d66875da1abd3b999d79c315f60d304ecc9e4c56da2603eac25c704e3a9bfa0bf48ad5e730dd4a8a4f69ac6a2fc051651f SHA512 c9b4828e8e907fe02467fc2b10f1d4ec074e10d8b238a73987278f4001177905a1db8127c1dc3f23e01f5260507e9f05fb7085f9463a21b1c9c0896bd4ece2f3
-MISC metadata.xml 407 BLAKE2B 3977485349c4dbb217e3ddcafaf22c7d394b764e6196a21fc63781ccf16a989ffd00faa0d4fbd9ff1c7bd35879d3cfdf586d0b5723b3e09d78fc034bf9736a5b SHA512 504625a32837ff424070b0fa4e691e71b0be4270958289c10d768790750842c581c919332747b26d7c43ada99d007e6517ff181474d668fcedc1ded21ae32f21
+MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/metadata.xml b/media-sound/asunder/metadata.xml
index 06e70988f837..243034768d61 100644
--- a/media-sound/asunder/metadata.xml
+++ b/media-sound/asunder/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<use>
 		<flag name="mac">Support for creation of Monkey's Audio files (APE)</flag>
-		<flag name="opus">Support for creation of Opus files</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 135ab009529b..8096384dc767 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,3 +1,3 @@
 DIST cmus-2.8.0_rc0.tar.gz 315613 BLAKE2B b5f44b724176ecca61376866da20614ba34e741b8295b8d21ba0eb13226024812dd6dfafe98f08ed367fd9454e787da5ba623b238b5944f5ae69fe58b02a224c SHA512 0379f18497d6510fad35a2d905c932d12f2726a5694d3ab272ce139e9ea4520cb4dd1cf3fafe890f6ada8a64285f8c04ef7571647a66c2d44df17e2dca80f869
 EBUILD cmus-2.8.0_rc0.ebuild 3300 BLAKE2B f4af7df639feff9d976cda04f6bcb9b3cdb2592046ca3ce8600845b0200f34b0541042edb0785010698296775864fc9221876e887f4acd1d675c05dbae4002f3 SHA512 306d304bc131a67960188573ad46da113539c86eb40e7bf78762214065fb69c8653f2af8e19ac140499ad199139c0c12a82249e6f6d13d632704fd99cf49d2a8
-MISC metadata.xml 872 BLAKE2B 3d99b417d7f9d1b7b7fcbc79a0fb7124f425fa8d5307ce623d59c0a941e99a0ad62e18b2770ecb320eee4c2c0b98702a5a44c3ee06d533b583d7f4d8e2fad68d SHA512 3d4ef1bf44ff73be65e203c2ba979a782cb64ee821316edf5885b037a4ca89f868bbaa54e65eab8eb315811c976f867678fd3ac22fa021ea494d0e6c08e7760a
+MISC metadata.xml 793 BLAKE2B a7f7b70d43eca969e128e92ce3375b14fcd0d65fae8c744c4ecc3e235dbebf112ee068a98597afa4eb882c6992461ae354d7880303fe7c78950c25af0df5b715 SHA512 4074bc35433dc4c9dec0902c0a792f005fdeddc81b886be2c7ca5191423488182b6159445b5a29ad20a10740539d5e1e1dcc60253d724a1a2e8f80c65b2f5b36
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index b6311fbd0308..f64fa63b73fc 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -10,7 +10,6 @@
     <flag name="cue">enable CUE sheet parsing</flag>
     <flag name="discid">enable reading the ID of the inserted CD</flag>
     <flag name="pidgin">install support script for <pkg>net-im/pidgin</pkg></flag>
-    <flag name="opus">enable support for <pkg>media-libs/opusfile</pkg></flag>
     <flag name="tremor">use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag>
   </use>
   <upstream>
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index f09a2a775675..0acc76d1cf7e 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -3,4 +3,4 @@ DIST darkice-1.2.tar.gz 357026 BLAKE2B 3553711a05631feca198de83387234dc1ca85429e
 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
 EBUILD darkice-1.2.ebuild 1432 BLAKE2B 4b891be0777bdcb207018dc8bae3e4627b8ef6c70b49c7563d27b9c0983ea625ac1f9feeab66bafb0382d51c425a473b8727c746363d58116caa9f8155731968 SHA512 0a5a6eeebbb1bd28dc117939a504981872ccf9ca010123d7b8dee40c3f3343776804bfcc736a231791b83f63c3b149b52de87190ddd2d9b3cddc424f08a7d754
 EBUILD darkice-1.3.ebuild 1309 BLAKE2B 3d29d9e552859c1e9c32cd003b966fea820588d9e92d4fe62ef54c5e73edcb519cb8ce30aafe9b8df30e6b75716e62af32b223c777331dd04f908133c141e833 SHA512 923c2bca3c9d7e166b46c945a771745a874feb3ad8244863fb3857882dd64005dee846164a0628f62f25db15201611c188864a320fc838c0a9fba496ad7f3e4e
-MISC metadata.xml 583 BLAKE2B 748e92c324b0685539a85ae1d2816ad9c7241fc8a6c3b30799a499f74612c4593fcc513b95b1236a188925e63eb2caca859671b7a43247d2737c5c90767a27de SHA512 673e3a01b1a5bd92119ad87e56b85dae309fa3f7a9de66d21908557819887ed3804477566ce0a00c2a919ae760ea7896cf67b2d25e894fa52463110fa0e23ba8
+MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index 456878486386..ca82233e961f 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="aacplus">AAC+ encoding via media-libs/libaacplus</flag>
-		<flag name="opus">Enable Opus audio codec support</flag>
 		<flag name="twolame">Build with twolame support</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
new file mode 100644
index 000000000000..6f0e7c8530f3
--- /dev/null
+++ b/media-sound/denemo/Manifest
@@ -0,0 +1,5 @@
+AUX denemo-2.2.0-find-guile-2.2.patch 1667 BLAKE2B e8a3de848748888c2534d5515ad08945489d482365690b346568b79c1553f04eaf12990bcc32e1c6a955fe342bcd7dec6bd00b906448f1cb8d18c59c2f69bd22 SHA512 09f999ccd4b0729029ba95644c7c9070cbf94dde87b6c85d8c96e5db5f37d248936b9f0d682cf6bd0479b8b869d45ef5b2b91e83203fedc66f4896dc389cccd6
+AUX denemo-2.2.0-no-portaudio-fix.patch 842 BLAKE2B f832666fe59970efee9e8fee090ec8e4d7be20c17d83a6c5143d5e0153b2eb458d7467e4d41b29fb0681480b9261e6cfae62bbaa870c15e1988de00e5bb1c484 SHA512 5327119813e734308e874392297fdf6d9b462be13d34df01f4e97c529c0c4140c3b3ae7ee06c53c2adadf307d4c60e14417a154226176b664fc26bba12028c4c
+DIST denemo-2.2.0.tar.gz 17032009 BLAKE2B 66732fcdaa5d5119ca2a45e5a8c6829e05092a4f0e18e3c8a991bddaaf863ea05889654af47150650d2c67397afa957de0fc3ce0ada86a22be00ae91d4add993 SHA512 74bef7b888abd86db42cee7ecb404e1b9211f9965207366c99980137194acd2afa6ec8b1c18da8a12fe4c6951d8a1bb873b313f5749ea629bb7eaeedf12368ef
+EBUILD denemo-2.2.0.ebuild 2930 BLAKE2B 65c16eb446dbeb906ce8fa5f3190bf3f62c0e4b8647a76937720fb5251028d66d34399cb6b759742895f6979e46ec97703eaedc5d6ee027469886b4487b7b39a SHA512 73ac587a3c715b27bbe04ad2ee6e66c538ec08f6a64c860adb9a102d6fc3627a22184fae20453530b2ea8e5c9a191a97bcdc6a403ad8ca6f5b82280d6b6bc172
+MISC metadata.xml 1587 BLAKE2B b20d6c43ea998e867ac1fbb84faab58cf3901b40700b36485d9de57336b8616117bae28e712b061dc49a80c9b27637b43a6b08d01535597ad7cf4d5a935dc72d SHA512 f14e3e591bc4824b8a9a872e3574a2e5e73a70451a02d85c021ff77eddc9034c6eac1238c968ee637fa5bb9fc4f98d71486be379faede67b462818534b392ecd
diff --git a/media-sound/denemo/denemo-2.2.0.ebuild b/media-sound/denemo/denemo-2.2.0.ebuild
new file mode 100644
index 000000000000..be5092be45e3
--- /dev/null
+++ b/media-sound/denemo/denemo-2.2.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools xdg-utils
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# configure options currently not used:
+# --enable-mem(no) memory debugging: needs Electric fence (efence), which
+#		is not available in portage. See https://github.com/boundarydevices/efence
+# --enable-gtk-doc-pdf(no) doesn't work
+IUSE="alsa +aubio debug +evince doc jack +fluidsynth +gtk3 nls +portaudio
+	+portmidi +rubberband static test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	>=dev-scheme/guile-2:12=
+	gnome-base/librsvg:2
+	media-libs/fontconfig:1.0
+	>=media-libs/libsmf-1.3
+	>=media-libs/libsndfile-1.0.28-r1
+	>=media-sound/lilypond-2.19.54[guile2]
+	alsa? ( >=media-libs/alsa-lib-1.1.2 )
+	aubio? ( >=media-libs/aubio-0.4.1-r1 )
+	evince? ( >=app-text/evince-3.22.1-r1:= )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1 )
+	gtk3? (
+		x11-libs/gtk+:3
+		x11-libs/gtksourceview:3.0=
+	)
+	!gtk3? (
+		x11-libs/gtk+:2
+		x11-libs/gtksourceview:2.0
+	)
+	jack? ( virtual/jack )
+	portaudio? (
+		>=media-libs/portaudio-19_pre20140130
+		sci-libs/fftw:3.0=
+	)
+	portmidi? ( >=media-libs/portmidi-217-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
+"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.51.0-r1
+	>=sys-devel/flex-2.6.1
+	virtual/pkgconfig
+	virtual/yacc
+	doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	nls? ( >=sys-devel/gettext-0.19.8.1 )"
+
+REQUIRED_USE="
+	evince? ( gtk3 )
+"
+
+DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-portaudio-fix.patch"
+	"${FILESDIR}/${P}-find-guile-2.2.patch"
+)
+
+src_prepare() {
+	sed -i -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' pixmaps/denemo.desktop || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--disable-gtk-doc-pdf
+		--disable-installed-tests
+		--disable-mem
+		--disable-rpath
+		--enable-x11
+		$(use_enable alsa)
+		$(use_enable aubio)
+		# --enable-doc does nothing for itself
+		$(use_enable doc)
+		$(use_enable doc gtk-doc)
+		$(use_enable doc gtk-doc-html)
+		$(use_enable evince)
+		$(use_enable fluidsynth)
+		$(use_enable jack)
+		$(use_enable nls)
+		$(use_enable portaudio)
+		$(use_enable portmidi)
+		$(use_enable rubberband)
+		$(use_enable static)
+		$(usex gtk3 --enable-gtk3 --enable-gtk2)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# make check fails if used with parallel builds
+	emake -j1 check
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+	einstalldocs
+
+	# link html documentation installed in /usr/share/denemo
+	dodir /usr/share/doc/${PF}/html
+	local f
+	for f in denemo-manual.html denemo.css images; do
+		dosym ../../../denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
+	done
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch b/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch
new file mode 100644
index 000000000000..d69edb0173d5
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch
@@ -0,0 +1,60 @@
+diff --git a/configure.ac b/configure.ac
+index 4bb3afa..9c146ad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,10 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_YACC
+ AM_PROG_LEX
++GUILE_PKG
+ GUILE_FLAGS
++CFLAGS="$CFLAGS $GUILE_CFLAGS"
++LIBS="$LIBS $GUILE_LIBS"
+ 
+ AC_PROG_LIBTOOL
+ 
+@@ -40,44 +43,6 @@ AS_COMPILER_FLAG([-fdiagnostics-color=auto],
+ 
+ AM_CONDITIONAL(ENABLE_GLIB_TEST, [test "x$enable_glibtest" = "xyes"])
+ 
+-AC_ARG_ENABLE(
+-  guile_1_8,
+-  AS_HELP_STRING([--enable-guile_1_8], [use GUILE_1_8 @<:@default=no@:>@]),
+-  [
+-    if test "x$enableval" != "xno"; then
+-      useguile_1_8=yes
+-      PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
+-      LIBS="$LIBS $GUILE_1_8_LIBS"
+-      CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
+-    fi
+-  ], [ useguile_1_8=no ])
+-
+-AC_ARG_ENABLE(
+-  guile_2_0,
+-  AS_HELP_STRING([--enable-guile_2_0], [use GUILE_2_0 @<:@default=no@:>@]),
+-  [
+-    if test "x$enableval" != "xno"; then
+-      useguile_2_0=yes
+-      PKG_CHECK_MODULES([GUILE_2], [guile-2.0])
+-      LIBS="$LIBS $GUILE_2_LIBS"
+-      CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
+-    fi
+-  ], [ useguile_2_0=no ])
+-
+-if [test "x$useguile_1_8" = "xno"] && [test "x$useguile_2_0" = "xno"]; then
+-  PKG_CHECK_MODULES([GUILE_2], [guile-2.0], useguile_2_0=yes, useguile_2_0=no)
+-  LIBS="$LIBS $GUILE_2_LIBS"
+-  CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
+-  if test "x$useguile_2_0" = "xno"; then
+-    PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
+-    LIBS="$LIBS $GUILE_1_8_LIBS"
+-    CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
+-    useguile_1_8=yes
+-  else
+-    useguile_2_0=yes
+-  fi
+-fi
+-
+ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30])
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
+ LIBS="$LIBS $GLIB_LIBS"
diff --git a/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch b/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch
new file mode 100644
index 000000000000..a4aa60909de2
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch
@@ -0,0 +1,29 @@
+From 2e3c3b974e3e27873841c0ad9a05537a682e85f5 Mon Sep 17 00:00:00 2001 
+From: Richard Shann <richard@rshann.plus.com> 
+Date: Sat, 30 Dec 2017 15:32:35 +0000 
+Subject: [PATCH 1/2] Fix bug #52741: Can't build with --disable-portaudio 
+
+--- 
+src/audio/midi.c | 7 +++++++ 
+1 file changed, 7 insertions(+) 
+
+diff --git a/src/audio/midi.c b/src/audio/midi.c 
+index 55683cfe3..71c5df2cd 100644 
+--- a/src/audio/midi.c 
++++ b/src/audio/midi.c 
+@@ -29,6 +29,13 @@ 
+ 
+ #define SHAVING (0.01) //seconds to shave off a note start time to ensure stopping before noteon is sent, and starting with noteon first note may depend of speed of machine??? FIXME 
+ 
++#ifndef _HAVE_PORTAUDIO_ 
++gdouble get_playback_speed (void) 
++{ 
++ return 1.0; 
++} 
++void set_playback_speed (double speed) {} 
++#endif 
+ 
+ static volatile gboolean playing = FALSE; 
+ 
+-- 
+2.11.0
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
new file mode 100644
index 000000000000..ef9a91fa02d7
--- /dev/null
+++ b/media-sound/denemo/metadata.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>waebbl@gmail.com</email>
+	<name>Bernd Waibel</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>
+	Denemo is a music notation editor which uses
+	<pkg>media-sound/lilypond</pkg> to typeset music notation with LaTeX.
+</longdescription>
+<use>
+	<flag name="alsa">
+		Enable alsa support through <pkg>media-libs/alsa-lib</pkg>
+	</flag>
+	<flag name="aubio">
+		Enable <pkg>media-libs/aubio</pkg> support
+	</flag>
+	<flag name="doc">
+		Use <pkg>dev-util/gtk-doc</pkg> to build documentation in html format
+	</flag>
+	<flag name="evince">
+		Use <pkg>app-text/evince</pkg> document viewer
+	</flag>
+	<flag name="fluidsynth">
+		Enable Fluidsynth MIDI software synthesis using
+		<pkg>media-sound/fluidsynth</pkg>
+	</flag>
+	<flag name="gtk3">
+		Enable support for the GTK+. If enabled uses slot 3 of
+		<pkg>x11-libs/gtk+</pkg>, if disabled it uses slot 2
+	</flag>
+	<flag name="jack">
+		Enable jack support through <pkg>virtual/jack</pkg>
+	</flag>
+	<flag name="portaudio">
+		Enable support for <pkg>media-libs/portaudio</pkg>
+	</flag>
+	<flag name="portmidi">
+		Enable support for the <pkg>media-libs/portmidi</pkg> backend
+	</flag>
+	<flag name="rubberband">
+		Enable support for <pkg>media-libs/rubberband</pkg>
+	</flag>
+</use>
+<upstream>
+	<bugs-to>https://savannah.gnu.org/bugs/?group=denemo&amp;func=additem</bugs-to>
+</upstream>
+</pkgmetadata>
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 71e7635fae9c..fba574a9e7f0 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -6,4 +6,4 @@ DIST easytag-2.1.8.tar.xz 2459496 BLAKE2B 4ba27728071a3a87af72a37cd0337d361ae690
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
 EBUILD easytag-2.1.8.ebuild 1443 BLAKE2B 4e6892fd7c7df21400e032c1863af21ed09106a3aa24498a6da1418a26cccf1ff77de76de2712ea10a2e7724727b7472adbb6336cde5e8417e9a7d96547d8459 SHA512 c55dc94db97b55b0f3f50c1fe0d40749e87ad8620e460a4422dce3cdeabd0ca2c850fb315a40168e0802146ce0f1b6db18152db88183972efd950845c58d5568
 EBUILD easytag-2.4.3.ebuild 1645 BLAKE2B 8ba8ed176a87b9189d6ce6c5ea0cd09cc0b01a3d1e4b5747e5c763f1af5e4bcd241d901470924f3a20518df36f8bfa1b7d6a6a942f7b3fc52970b843d5c2ab80 SHA512 c722d39fd6f08e9999b71914af9e6efe8f263bde9063707a330cfb26c1e200f54e50a2a344f2056d62ad316df8576b00cd5c389078ff7fb26e5771c4cfa12404
-MISC metadata.xml 565 BLAKE2B 74adbab18a112ed8cd165f2947ba5bc6b5bf2cfa231ae3139510db65ecd22dd39fb1f69890c789c51257aa8dabaf96b82edb696a5e9e5e91ccd65d5d26117e6f SHA512 20baf00e8f0315ff490b5379d9c6dc14f66c46837d9d3eea073ff85596370e48356a80534e795f3023b7251a79e749f04a575a1d4e7deaba1e909f6038f7718a
+MISC metadata.xml 423 BLAKE2B 8265687f0456937b9ba2700d2d7078e237b5d0dbc04905eec92ee94364c20f9dd4655321b4a5a5788b128b1771e161f5319d056ffaca350f93a988995eae608d SHA512 6cd8c3b87e91a7b0b6b8f6aa4d8e38ab7400fb53fc3653a6f898eec609cd5ce6cb07bab1e3b67ee0c4e1fb91fcaa6e6fb835ce26dcd38cc7090bea5942e71da0
diff --git a/media-sound/easytag/metadata.xml b/media-sound/easytag/metadata.xml
index 086aae70a896..7636046d6e23 100644
--- a/media-sound/easytag/metadata.xml
+++ b/media-sound/easytag/metadata.xml
@@ -5,8 +5,5 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<use>
-		<flag name="opus">Enable support for <pkg>media-libs/opus</pkg> and <pkg>media-libs/opusfile</pkg> (opus audio codec)</flag>
-	</use>
 	<longdescription>a utility for viewing and editing tags for MP3, MP2, FLAC, AAC, MP4 and OGG files. It features a simple and attractive GTK+ interface</longdescription>
 </pkgmetadata>
diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest
index 2ce667c1d5e4..b56fe322d527 100644
--- a/media-sound/gogglesmm/Manifest
+++ b/media-sound/gogglesmm/Manifest
@@ -1,3 +1,3 @@
 DIST gogglesmm-1.1.9.tar.gz 1419421 BLAKE2B c170da80c46b25e86060376e19cecdfe10ce91ce48d92c370cf9f2b6ccce0afba6f917185286f3226d082dc0d791863595be4ebc0d118dd4f1af7f0699582cde SHA512 54de949b37e272a2235cf2f910890590f18b12c2b3199cb87bbe393ae659a3a9b7bd47f5a5f43ce035e94b87098c07d534efee2a6c17ebabb9bbed3453126e2e
 EBUILD gogglesmm-1.1.9.ebuild 1039 BLAKE2B e423cb8152f2db398ae97c55ebf7bf0c68c538d1a7d6e62f8289eebd95ee14b3b2e866732ddb6dea0ab184848cd93ff60cc9e6fe8bcfa31c0e1c0f64e297c747 SHA512 88c46448dc1fcb2f7afa9180e981f14104088e54cbc946692c293c322d6962d4161d81826eae1b63907561b40325226d9264a09b389abb1de3210ade4b04dcb8
-MISC metadata.xml 520 BLAKE2B 486c672dd41704681329195d583e4a835d7d22152d4eed069ef2e3c42f45095ae2546e620e73bee125b148149f94f7459122e560acbad2393a9786e01354df51 SHA512 6c0291e8eb2cd7844c468793ce152c4e76992e94d13300f9afe776f708e738bc139d8a4922e12a9815b793ae53bdc2553b191ac5b7c50b1ee346c2a75f184a7c
+MISC metadata.xml 448 BLAKE2B 4a31050a18310ba35f5357159e9ada1671feda06dc71635617acf8825073a3a822aa95a3d3110545ff9ccdd809d317ab45000f5aaab5d8f52a8dad0c6133a03a SHA512 349f8b931b5a24ea7b588f63f67b38ac00e752491031cf434802719bd4d4d62aa5c7d277cf5e6a3dee72c570c121606b6a108e080262b1070de538c384552858
diff --git a/media-sound/gogglesmm/metadata.xml b/media-sound/gogglesmm/metadata.xml
index 43eb2ed76959..ed725894ca70 100644
--- a/media-sound/gogglesmm/metadata.xml
+++ b/media-sound/gogglesmm/metadata.xml
@@ -12,7 +12,4 @@
 	<upstream>
 		<remote-id type="github">gogglesmm/gogglesmm</remote-id>
 	</upstream>
-	<use>
-		<flag name="opus">Enable support for opus codec</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 00dd7678b801..5c9a89919c77 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -5,5 +5,5 @@ DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c
 EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
 EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.8.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
-EBUILD grip-3.9.0.ebuild 1223 BLAKE2B 07454e777fa6f14c229603090040b89349da02f0a5aeb38cb76cc2a59ccacf9467120ba4a7fbba2bad48ca6bbb44a59457e55e6f53014be961c01c9175a8855e SHA512 dfc5240ede6b26b2ef026923e7444672cdf3f1bffa98d8920e8f0d84caea2561f9deaf8ed0c5517504b15514fe4bfa7ed7ab6b8692d6eddddbf70ec97f39f230
+EBUILD grip-3.9.0.ebuild 1218 BLAKE2B c6c424d05651474333d322dd1bac779418f3b446c5f28397820fa07ea4c0edca60bfe478d56825fbc5a2a669dd98e4712b191c864a10582bb0d00d2c2f1122a8 SHA512 68f067ef88b5572a6338397e7c8be9a7f200da93b7d3a49d4e2a533082ee7b65c85a8999b8110de8a8e6e69e6d2c925dc132197d9a59459fde9cfc732d323f30
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.9.0.ebuild b/media-sound/grip/grip-3.9.0.ebuild
index 8d544186c922..cd20960d0c8a 100644
--- a/media-sound/grip/grip-3.9.0.ebuild
+++ b/media-sound/grip/grip-3.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 085cfa109efd..4021d690c0b0 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -2,4 +2,4 @@ DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9
 EBUILD jack2-1.9.12-r1.ebuild 2322 BLAKE2B 586c6938eeccdd8304a9f6d93d69eedaa73664a4b8ce6c01d4bca46400f8529083e7cacb1c988e95cebb1d071c06a1b1bfa7178e66bf94535732514c842a6586 SHA512 ed3a07bc3cdad2bed8dd70ac13eca389cd795dfd9421c56146af01f2c00d8408164f7e9e16bc7a5f9eb3bd9fbd824c64d0d0ddc151bdabf5a0a5ff4a34a40e5e
 EBUILD jack2-1.9.12.ebuild 2248 BLAKE2B 11df609c926f433493d6e68b799d12a19ab225e5e7152998a1cae4cd2aab88e91f7f602a27d65cdba3a9a34e3f299f77b226a31e6845c2003e3c82e61becd750 SHA512 cc0daf80bbe50f81e931b4572e219d97b7166fa7ffdd5cf12eda5f1925e4554a750a8fa4cf1c6ead747e5a52eb0c510aeca90c6234af4c5fed75e1952606c792
 EBUILD jack2-9999.ebuild 2265 BLAKE2B d33ab3cddf7396a1f5c8a9888d7337e3aa2f3df55dd4af4e55261b6d6e95bcc9bfbd882b1b8b4de6d0687e7a715bf2dacc17aaf5974ccc2ef4400a6a9f91009f SHA512 06b07335899ddabf08656c8208223c1f7af92fa2e977c061b9ce1fb9437707ae1744f5fa0570a2b7940a57bb5bdedece4e75aa2662974dcd66a1744c8fa44542
-MISC metadata.xml 679 BLAKE2B 9808048dac5d2d936aa7f6a05f66b0a98a428aa81275b5528684ba2312c49a1212ee38afac0d466e5ed87b91c253f8b973670928dd21b13470208bc84a2ff48f SHA512 8c6fc8ce9dc151cdc8adc2092a661a76ef0fd12fc8f2c922be3e7a75215e40ed5b352f8099906ae6a883fd3a3edb674d0a6784831d2cd9b881b474cf6c419152
+MISC metadata.xml 586 BLAKE2B 2caab3f98d8d74d03b85391c12b3432430544379e3379144e3a39cd36ab2335f81779cb3029726dafbff2dfbedec203dde78bc6bbe5678fed44cc6c0fe296ec1 SHA512 92ba1eb5d693bfab1f53b6e4bb2a11fa523681db94dbe92b39847e24144c4fa0181f4c3d7f49bb0738fce348fb87a79bf3f8b927f25aab10e240a021ae50a920
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 5156eca67d7a..73e09bb1a19e 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -7,8 +7,7 @@
   </maintainer>
   <use>
     <flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
-    <flag name="celt">Support CELT low delay audio codec (<pkg>media-libs/celt</pkg>)</flag>
-    <flag name="opus">Support <pkg>media-libs/opus</pkg></flag>
+    <flag name="celt">Support CELT low delay audio codec</flag>
     <flag name="classic">Enable building of jackd</flag>
   </use>
   <upstream>
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 193d0b90b5eb..1f5dcc21d0ca 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,3 +1,3 @@
-DIST lollypop-0.9.601.tar.xz 376712 BLAKE2B d3747a1e994cd8de816eed49d87a8f279394981f14e2de82785203ba5ec0e71604a569f5f3e8e57da55f9bf62066da15232d46a0d117d094c6638b6608491620 SHA512 d13bd50f6b591a0f6491010817833d345a7fe1e63ef0eaab2ebad7c877990cf5e2dfba62911a690d223d912750a150fda40be81ca9a094968ed4796c1ed66f65
-EBUILD lollypop-0.9.601.ebuild 1269 BLAKE2B 98923c79b2abdde170987deec5a8811d4fdd6286f27477df42c0981292cef185c4032e0d535c75a12e2ffaf00f3ba6e3d31606a04dab85495530a966fc2736af SHA512 f674df9851ad36ed5e8d83a586e037825759d4fe66ff3711bb1f886fa53e0a905bd49081b6e643e70f36b86919b99685feb15925a3e1545993bdbb66f36f7324
+DIST lollypop-0.9.605.tar.xz 451556 BLAKE2B 520cb54398839c24bebf3cd53b69de07174d5c674f1e6c72a100949bbd1cb04045b8f87799fd6f118af9191b1a552b9db098c6a72d6af5fdea604ec4970c29ea SHA512 0f377e7f1db1becf2edc7d15a1bae01665e11f87adc693118e778bf85659968de210912db7618f022cf123a458b156fd7fafbfdadbb2cb905dc1049a436d4d96
+EBUILD lollypop-0.9.605-r1.ebuild 1332 BLAKE2B 567e9f9097c2c18f0150ef0f2abbb2248ee6e407a52f13fa6bbaefa7be5ab137d5fc5cbdf2d822980ec80443b8fa9d573c66116d41c34a373dcd52ae50d8dd20 SHA512 1d5d96fe1fa372ea732fe671ee7f6501a19d1711f2ef4fceee7e38f8680795eed7ff7ab8777d3dc6be9f38f1c56d3e409b7dbe46246c5dcbb47445a79ce0d682
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-0.9.601.ebuild b/media-sound/lollypop/lollypop-0.9.601.ebuild
deleted file mode 100644
index 2e53e4c81d53..000000000000
--- a/media-sound/lollypop/lollypop-0.9.601.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-HASH="93d895a6c74c64aaa9d4cdc4d58bd6e6"
-inherit python-r1 gnome2-utils meson xdg-utils
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
-SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/appstream-glib[introspection]
-	dev-libs/glib:2
-	dev-libs/gobject-introspection[cairo]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/gnome-common
-	x11-libs/gtk+:3
-"
-DEPEND="${CDEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	dev-util/intltool
-"
-RDEPEND="${CDEPEND}
-	app-crypt/libsecret
-	dev-libs/totem-pl-parser
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/dbus-python
-	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
-"
-
-RESTRICT="test"
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/lollypop/lollypop-0.9.605-r1.ebuild b/media-sound/lollypop/lollypop-0.9.605-r1.ebuild
new file mode 100644
index 000000000000..16b08b545fe8
--- /dev/null
+++ b/media-sound/lollypop/lollypop-0.9.605-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+HASH="7e56defb7152c6cd7140e9ea98df4ce7"
+inherit python-r1 gnome2-utils meson xdg-utils
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+CDEPEND="${PYTHON_DEPS}
+	dev-libs/appstream-glib[introspection]
+	dev-libs/glib:2
+	dev-libs/gobject-introspection[cairo]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/gnome-common
+	x11-libs/gtk+:3
+"
+DEPEND="${CDEPEND}
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	dev-util/intltool
+"
+RDEPEND="${CDEPEND}
+	app-crypt/libsecret[introspection]
+	dev-libs/totem-pl-parser
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python
+	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
+	media-libs/gst-plugins-base:1.0[introspection]
+"
+
+RESTRICT="test"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index 76d18e32485d..bcfe63eaf1cb 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -1,5 +1,7 @@
 AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb29553427372fa74375c1cf5721f28bd6bbcc6e091cb3703705d773bda93e3cede89725cbe28b8b678307fa3d5eeca1c3a5d SHA512 0439cb133779dd540c5cee6760dd6a8acd23434b60baaba804430883cb6d67ca37151370356e9adec3f031cb02c34d529a8f91618f0f9fca6e58e14a295c3a63
+AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
+EBUILD mac-4.11.4.5.7-r1.ebuild 1350 BLAKE2B e70932c4abccf08d212bbc7f777fc01249f62df8311083a3de8d1dd6f2ec340bfef9de69d946cb8bb7e2183346b29df1e61b01334c6984efb058214d9c1138fb SHA512 9643694bd9a1d97a879bafa1ab2f225c298b4f1d3aa92a2096def0dfef58897ea0e0a838a4157726f3cbab117d7d4c7ad20585888a2f58e485bc7509b9edecc3
 EBUILD mac-4.11.4.5.7.ebuild 1359 BLAKE2B 3a6f2a706bc325d338541547d4d112b221735ab7e08642662c16c9444144d2ddffddd48e03e5439e896974b03e5951dcfc0f072c2d7c6bb2fd4ac87ed1cbedf4 SHA512 a4eb177a493ca9a09272793df96a3a48337b1e2658845eab63c011789206b9be443e0bae341ea47b3cd354c7a067e9694fb7b7e2701152112518ce331aa95d23
 MISC metadata.xml 373 BLAKE2B e341287ecf4d69b3a6401db4ee2a465749e63a57fc0bb462928156eee49c89441eeb9dc2943fb7b0209ecbc966d6df0c6de9cf16a3ae9cb1c0dfa893a540458a SHA512 398ca3b9a13eede72e283f90a215d1e05a518f6b3eee9d8f6a74e3eba1e1f0f501443399906f09771ef1c7441667b5e991f98d9cabd9c6b8395af334312f02a9
diff --git a/media-sound/mac/files/mac-4.11.4.5.7-null.patch b/media-sound/mac/files/mac-4.11.4.5.7-null.patch
new file mode 100644
index 000000000000..fa1f3598ea82
--- /dev/null
+++ b/media-sound/mac/files/mac-4.11.4.5.7-null.patch
@@ -0,0 +1,12 @@
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/Console/Console.cpp monkeys-audio-4.11-u4-b5-s7/src/Console/Console.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/Console/Console.cpp	2017-03-04 17:52:24.154352673 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/Console/Console.cpp	2017-03-04 17:52:31.400352385 +0100
+@@ -51,7 +51,7 @@
+ 
+ _ErrorDesc ErrorList[][2] = {
+   ERROR_EXPLANATION
+-  NULL
++  0
+ };
+ #endif
+ 
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
new file mode 100644
index 000000000000..aa65b9a5e9ee
--- /dev/null
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_PN=monkeys-audio
+MY_PV=$(ver_cut 1-2)-u$(ver_cut 3)-b$(ver_cut 4)-s$(ver_cut 5)
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="Monkey's Audio Codecs"
+HOMEPAGE="http://etree.org/shnutils/shntool/ http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
+SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.tar.gz"
+
+LICENSE="mac"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_mmx static-libs"
+
+RDEPEND=""
+DEPEND="
+	sys-apps/sed
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+"
+
+S=${WORKDIR}/${MY_P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-output.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-null.patch
+)
+
+DOCS=( AUTHORS ChangeLog NEWS TODO README src/History.txt src/Credits.txt ChangeLog.shntool )
+
+RESTRICT="mirror"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-O3::' configure || die
+}
+
+src_configure() {
+	append-cppflags -DSHNTOOL
+	use cpu_flags_x86_mmx && append-ldflags -Wl,-z,noexecstack
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_mmx assembly)
+}
+
+src_install() {
+	default
+
+	insinto /usr/include/${PN}
+	doins src/MACLib/{BitArray,UnBitArrayBase,Prepare}.h #409435
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/mangler/Manifest b/media-sound/mangler/Manifest
index 84a8b5e1f502..a2c631abf840 100644
--- a/media-sound/mangler/Manifest
+++ b/media-sound/mangler/Manifest
@@ -1,3 +1,3 @@
 DIST mangler-1.2.5.tar.bz2 5390985 BLAKE2B b2b61d49683b356be5bcaf111d0e75cc0ff30cbb131b0de360128e2973a415eb87736b55a965fb30651e5d3580a2274754ddb8a44b345c55fc6ba0caa26de0a5 SHA512 e72eb2f408ba925d10563c6821e08406007bd0b7586f9ee054a1de421a6195351140a2df9656a45389f5f568ebf44f53fb719fbf6fb113695f230dd4bad21e38
 EBUILD mangler-1.2.5-r1.ebuild 1295 BLAKE2B 82b4992a98d9a651af33fe66ca105bb6b9933d47aa112a6de4da154df2d0c5cb39e7004c39936f8f446b0f5c7588578aac8a06fc5cb1e646ed30686d1902ec85 SHA512 5e6f290adefc914529f4fcff40f1ddde7a21f511632bf04185dfb28504b5f7b4d352ac2e9bc9db6dfe90ce9b61ef9f2741a4ebb92a5140c938b0417e37f779bb
-MISC metadata.xml 546 BLAKE2B 64c5d482b08f0e362c11b58e47432cd7afa26060d8cfd6c5216227b0526bdc1b9d5e942eebb82f62740509794d65dd811dc5950f92c34c44aac88c202a912343 SHA512 4d2adde453fd4b652d36d293e6b52341a9accd60c853394ddb83db975a644e0df775880d3ebfe8fd25a00238d9c679276f0fcffd288dd9e42de9ae3811f18b54
+MISC metadata.xml 470 BLAKE2B dba7ffdefd9ed484e5397a60c4b13f051879ffd760fc32cf423f51343242cca71578ab6d3d87471250f9b223d0247bd92ba3ee2ff1b5b2d05f92dd4ee89b72f1 SHA512 dec3e027307afb3b5589f56e595371026232d5f328fe9520b6d21282eba626b736dbefa7768cb06c4821e75b45340a04a7252e0a1b1380b618ef1f9d54b1692c
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
index ffc44310f0dc..1ca96e6372cb 100644
--- a/media-sound/mangler/metadata.xml
+++ b/media-sound/mangler/metadata.xml
@@ -4,7 +4,6 @@
   <use>
     <flag name="espeak">Text to speech engine</flag>
     <flag name="g15">Logitech g15 lcd support</flag>
-    <flag name="opus">Codec specialized for speech over the internet</flag>
   </use>
   <maintainer type="person">
     <email>prometheanfire@gentoo.org</email>
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 0c886aa115e0..8158a48ab6ab 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -6,4 +6,4 @@ EBUILD mixxx-2.1.1-r1.ebuild 3004 BLAKE2B a1718363b127fe5515d616bf8daf6a354c9ee4
 EBUILD mixxx-2.1.3.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 EBUILD mixxx-2.1.4.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 EBUILD mixxx-9999.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
-MISC metadata.xml 642 BLAKE2B 125facf06db489fe7e3f4663b1664a4e0c4288cad028b9d0e73db345c8e6a8004383b4efb70e7b5315028fba769fb790cb2b39949980b5adc6f3de2178c0f7c9 SHA512 e336e472a4ee405e18a2521cbd296917a1c555c444eb3794eea602a36ec30f5eab99e9dcad36a08c9852c228253721311d957ef632ae0d14c96391a95ad4dd5e
+MISC metadata.xml 549 BLAKE2B 20dba66bc128eceb037f39f0bd04ee4f4dafda37968f90f09de12d6485b37f1391963d1bcf343755da69a74c3d3f72218e97b9cf13e9e699bae4ea098fbcf9af SHA512 c89877382e9baf90038ca7c6175ef8edc3296950dc7386b00f861a90fcc3296ec4d21df665c8aa62042c1b952cd270af77b85a5959518600f43f963ffce51296
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 3c563007a7bc..4627d1b0b257 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="hid">Enable HID controller support</flag>
-		<flag name="opus">Enable support for opus codec via <pkg>media-libs/opusfile</pkg>.</flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
 	</use>
 	<upstream>
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 7acd6cd777c6..d57def02c9a2 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,13 +1,10 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.20.10-libcdio-2.patch 843 BLAKE2B d0c7eeeedb6065b1e08b1a8b1e6f5237408cd1b747aba72651441f0c203a4d32a39bf4e3c2371ae16fbde2f991c2f60870b15e8340b81bbc793355131ea57f62 SHA512 c9b62e6e0e7408ff3ab1e73c08001e498150c6bda8a9796ef23c35ba4dd0313e243129f7fb1760997f4a226f1ea3de56657eeead41f07bcaafa9affde40cc851
-AUX mpd-0.20.12.logrotate 88 BLAKE2B 2ff692c0c37da35ba3d53c2050653131a0de364094a779eba7ed7b2db3334f1eef7fa261b6a94416cd6a29290fb563a4a15ef70768c2860d2d9c3b7f9fdfbc4d SHA512 6c0ad8341f24633271972a2414e945a8eb14db31b114e1c260bcc0c50e1288bdbc5e3344ff9ef53c3c28d7368985e55a944d53705302b8a3d14eccc9fe2d6b48
 AUX mpd-0.20.21.logrotate 112 BLAKE2B 2fd60db81c39d3b7eb1cd375450b5902d6e31734e3801819dbc9475d84750491780aab6c4db0be00039c88dce2fb25b83abc9374a0c736697d8c1cc1bd4f5b24 SHA512 32da561c59f8641e549ccec6ecf8a678cd1b9c1d7fbbef5ca6a1b1eb0f07948c2ea23366d357a16a221e0a9b96fe079df3a046f18c4410b8ddc4adce63c6d467
 AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75cd08251cc661b4885fe4ca16cc1008b679cb441ce8eb6a309c60b132570b89e4cf8f9560e130e71be SHA512 e9dbbab915e0e84dec9bd084347e608db7802386b281dc35fa1a9401bd3a40652735a02c98a8d51074c061cbe05ff038e0a16f379638c133b6ae8a6a70ca8f39
 AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324
 DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
-DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 EBUILD mpd-0.20.10.ebuild 7285 BLAKE2B 08b8d0afe72f0ad186438441aa1229e71c1c2564250c9e624eac2f7c6ec7596bd9f0ad4b353b4ca37af9acac2bda7b2a59f134265cb9a41be0bdfef64cf384b8 SHA512 82c6c20fbe05137a61ed07daa9bdcd0e7639267d8301e14257978d13e67a6ec9e0581f873c22df14a90a1dffb71dfd47fc456aee49889dc5d67a566ea6326ba4
-EBUILD mpd-0.20.12-r2.ebuild 7361 BLAKE2B 6c257159de263c22984a28331cf6ad9bf17ab34bc6e255901f2871588133f2ddcc99cabe142f14a75e831faaad9cf2588889286cb6183716d9a14bd4e4f74624 SHA512 c5d52149a1ac383c35fdf5f22c756459545f1f0ca630d0ba3a433e6f856c9ad49482e3a39e94abc025c2e094abe2e260e8716fbda78e1ff8280a92957e720a36
-EBUILD mpd-0.20.21-r1.ebuild 7314 BLAKE2B 35d022e4d5a85a88a1bfd944e3b43e9e2117630139bb8b5347fdcdb967be6c1c3a8047d39be64ccb40144a11b1d6bcd9a83bc95d184cfc6cdea30d5050b6d7bc SHA512 1de5b6fda9bc017dd01bda1f8076987416cca0220c6922ff0778125b5585b73a22ffeb04f42d562c4c2561f6fdcb42287fb0665a5aa13498a93baa809dcd7aa6
-MISC metadata.xml 2517 BLAKE2B 1723729d1962eb361c8231e9351164008b3f2e47097846afc6a06d2ae8157a6ef0643f1ddc53f0fd7ca5569eaf1f30ad28ec18079ec2a9f92cf0ad3b287f4798 SHA512 f829d7424245ff87e86d1bdd4c59cd4a102823b8796aa44d202f2b0afdf902f88fa43d478b9cf610c1ffb52595d3bc2d37bc4d67ddd440110009ff9cbcfaad46
+EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
+MISC metadata.xml 2412 BLAKE2B b208c2d3481421794b7fd5328814e9dd340eb820df4972c0bd70626d9d63707dfceb8f7446239a3ca581f46004a1aa5e6438cbb6449700f472c1aa411d848649 SHA512 4cbaa880020239d2fcf6e2f057004569eb86288d3f25dce8e89eddc8d65cbbccf01dd0cfbfc376790297a1147d18aec3148515659fae5aec3bbe215bb94c2f8d
diff --git a/media-sound/mpd/files/mpd-0.20.12.logrotate b/media-sound/mpd/files/mpd-0.20.12.logrotate
deleted file mode 100644
index 738313e9e310..000000000000
--- a/media-sound/mpd/files/mpd-0.20.12.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/lib/mpd/log {
-	missingok
-	postrotate
-		/etc/init.d/mpd --quiet reload
-	endscript
-}
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 422ce7b850ea..d6162fb2c8ad 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -26,7 +26,6 @@
     <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
     <flag name="network">Enables network streaming support</flag>
     <flag name="nfs">Enable support for the Network File System</flag>
-    <flag name="opus">Enable Opus codec support</flag>
     <flag name="pipe">Support writing audio to a pipe</flag>
     <flag name="recorder">Enables output plugin for recording radio streams</flag>
     <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
@@ -36,7 +35,6 @@
     <flag name="twolame">Support twolame MPEG-2 encoding</flag>
     <flag name="webdav">Enable using music from a WebDAV share</flag>
     <flag name="wildmidi">Enable MIDI support via wildmidi</flag>
-    <flag name="zip">Support for ZIP files</flag>
   </use>
   <upstream>
     <remote-id type="github">MusicPlayerDaemon/MPD</remote-id>
diff --git a/media-sound/mpd/mpd-0.20.12-r2.ebuild b/media-sound/mpd/mpd-0.20.12-r2.ebuild
deleted file mode 100644
index 78b954370d78..000000000000
--- a/media-sound/mpd/mpd-0.20.12-r2.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# 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 systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	opus? ( ogg )
-	upnp? ( expat )
-	webdav? ( curl expat )
-"
-
-CDEPEND="
-	adplug? ( media-libs/adplug )
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? ( dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? (
-		>=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) )
-	)
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-4.0.25 )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	upnp? ( net-libs/libupnp:= )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<sys-cluster/mpich2-1.4_rc2
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-	"${FILESDIR}"/${PN}-0.20.10-libcdio-2.patch
-)
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-		sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	if use network; then
-		myeconfargs+=(
-			--enable-shout
-			$(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output
-			$(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)
-		)
-	else
-		myeconfargs+=(
-			--disable-shout
-			--disable-vorbis-encoder
-			--disable-httpd-output
-			--disable-lame-encoder
-			--disable-twolame-encoder
-			--disable-wave-encoder
-		)
-	fi
-
-	if use samba || use upnp; then
-		myeconfargs+=( --enable-neighbor-plugins )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	myeconfargs+=(
-		$(use_enable eventfd)
-		$(use_enable signalfd)
-		$(use_enable libmpdclient)
-		$(use_enable expat)
-		$(use_enable upnp)
-		$(use_enable adplug)
-		$(use_enable alsa)
-		$(use_enable ao)
-		$(use_enable audiofile)
-		$(use_enable zlib)
-		$(use_enable bzip2)
-		$(use_enable cdio cdio-paranoia)
-		$(use_enable curl)
-		$(use_enable samba smbclient)
-		$(use_enable nfs)
-		$(use_enable debug)
-		$(use_enable ffmpeg)
-		$(use_enable fifo)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable gme)
-		$(use_enable id3tag id3)
-		$(use_enable inotify)
-		$(use_enable ipv6)
-		$(use_enable cdio iso9660)
-		$(use_enable jack)
-		$(use_enable soundcloud)
-		$(use_enable tcpd libwrap)
-		$(use_enable libsamplerate lsr)
-		$(use_enable libsoxr soxr)
-		$(use_enable mad)
-		$(use_enable mikmod)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable musepack mpc)
-		$(use_enable mpg123)
-		$(use_enable openal)
-		$(use_enable opus)
-		$(use_enable oss)
-		$(use_enable pipe pipe-output)
-		$(use_enable pulseaudio pulse)
-		$(use_enable recorder recorder-output)
-		$(use_enable sid sidplay)
-		$(use_enable sndfile sndfile)
-		$(use_enable sqlite)
-		$(use_enable systemd systemd_daemon)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_enable wildmidi)
-		$(use_enable zip zzip)
-		$(use_enable icu)
-		$(use_enable webdav)
-		$(use_enable faad aac)
-		$(use_with zeroconf zeroconf avahi)
-		--with-boost="${EPREFIX}"/usr
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.20.12.logrotate ${PN}
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.20.21-r1.ebuild b/media-sound/mpd/mpd-0.20.21-r1.ebuild
index c41cc0ebed29..a4f1962c0a1b 100644
--- a/media-sound/mpd/mpd-0.20.21-r1.ebuild
+++ b/media-sound/mpd/mpd-0.20.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
 	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
 	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 9c4b8dc8395b..eed4e7c2473f 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,2 +1,2 @@
 EBUILD mumble-9999.ebuild 3023 BLAKE2B 16048b08d26ee51dcccacd19c9e6adfc0038e6d50d83a79b4f87f47ca8fa642fbf78cbb46f96c5553d1a6fbd44dc6af3de43a96cb149009cb58a6f8d4693d6fe SHA512 97b35ab609a8b7e7757633a8f80dd4d36697d52d58d5e1aa4ac3e55396ec4aef4df8fbe0a43bad3173ae1975eabb0825778dac127639bdabb06ccee641a1725b
-MISC metadata.xml 843 BLAKE2B 5048f202061b73223ef1d8c7beb20e5fbeb3726c0f1d8039bf4385e111e221dcc52ed309356311f3ba885f306c4d7c074caf9c785c86d8fda924c4ebf69475ae SHA512 0037f9510526f803d2abfe97c2b8712ff626b93d12457d5111f23b20787505168789cd86f9a3b4dad845634f584faa9e30e02777f4d0a7a8bd34f9fc9e1ca40f
+MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 146871bb68ac..760004df57f7 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -10,7 +10,6 @@ Mumble is an open source, low-latency, high quality voice chat software primaril
 	</longdescription>
 	<use>
 		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
-		<flag name="opus">Enable Opus codec support via <pkg>media-libs/opus</pkg>.</flag>
 		<flag name="rnnoise">Enable alternative noise suppression option based on RNNoise.</flag>
 		<flag name="speech">Enable text-to-speech support in Mumble.</flag>
 	</use>
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 3ca4851135ec..1077bf76a536 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -3,6 +3,6 @@ DIST ncmpcpp-0.8.1.tar.bz2 464123 BLAKE2B 0edb57fc3a0527dea085a10736ff2cdca3ea25
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
 EBUILD ncmpcpp-0.7.7.ebuild 1501 BLAKE2B b4fac49d9ebca61da51109aa52b06a14f5005064d4427bb94403d534ad03ff65574ff7cbf0d0708dadc7942c51ddc93bc0260e1741ba5b75a026a2e5c726e674 SHA512 dc3691ec4e4d92f063fcccf219e3566ebc85d8b2b0bdf8134720701172108bce462ba9278b9405c556c8631df846747e5f5a2ccdfaab1b6efad58ec92e9474e1
 EBUILD ncmpcpp-0.8.1.ebuild 1404 BLAKE2B 47db7c4ced708da6b78afa0a410e5938d0a3fc5cf7916adee506ea997b35e3de7d2b004e9d3295b6e36e75af2d042f60603d6d243c2b4a3982279e21202a09dc SHA512 6af5a76e471a154458777d1dc0ebfc298ff927444d01d2b70ebca01a617dc11f5ab6e1baed83cd03a323f835cea76aa1396a307092ecf789d49e0ac29630febb
-EBUILD ncmpcpp-0.8.2.ebuild 1404 BLAKE2B 47db7c4ced708da6b78afa0a410e5938d0a3fc5cf7916adee506ea997b35e3de7d2b004e9d3295b6e36e75af2d042f60603d6d243c2b4a3982279e21202a09dc SHA512 6af5a76e471a154458777d1dc0ebfc298ff927444d01d2b70ebca01a617dc11f5ab6e1baed83cd03a323f835cea76aa1396a307092ecf789d49e0ac29630febb
+EBUILD ncmpcpp-0.8.2.ebuild 1398 BLAKE2B 884dd2b899f971087dd8c8152be1df83928e897e6e34b0d65394bd3771a95e024510ae2efcd02fdf2cce8406ab3b31cd38822a640086c6d757ac9dda5a4bed2b SHA512 478763e7f57d66b1005efa5a81e919bb38a78340f67edf7bcb4212edaf46ea2a2a88b5f6df9a8f287d0553cd588085cf779da6f0b081d38ea0e870d4ef6db622
 EBUILD ncmpcpp-9999.ebuild 1393 BLAKE2B df97f04580a0043cd6bb4dd1dfd9b756f11a98dd14f05058e64f30a50c0a557a5fdab6bef229ff512c07b4b314e99bfbc043a69e16ddf540bea72b7b1b6ba724 SHA512 bb3920892524c4f6969490f0219786bae21f20f9660ed6a78f7b307f46396966679c5aa7368e558336f203d25c344b7509282fd7e77890e1bcea9d96f138d5e0
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild
index bd2f837dbb38..58f8e679616a 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="clock icu outputs taglib visualizer"
 
 RDEPEND="
diff --git a/media-sound/opus-tools/Manifest b/media-sound/opus-tools/Manifest
index 9afa1cc152fe..9bf57c870b3a 100644
--- a/media-sound/opus-tools/Manifest
+++ b/media-sound/opus-tools/Manifest
@@ -1,5 +1,5 @@
 DIST opus-tools-0.1.10.tar.gz 312093 BLAKE2B d96377f3c56990bafef58f0eacdf8795302400eb986e6408b2eb1af67eae59194709b9e1ef86b420b4adab767be329278cc60c1fcc7da4b3f461b532ebf8bdb1 SHA512 4ead97b9fe4658968a4b5cbe4bde5e2d8cbfaaea18dd0d817597cc6b6b11f26937b9eee7358ade63568f0213131aa80ecbed169d1b3885980a556871a4a7fe98
 DIST opus-tools-0.2.tar.gz 457680 BLAKE2B c5896a6303aa1e1626097622e671bc96fd292a0f0c40a56410ef1f7699f8d18540d71e70f1cace6a91bb430886f1ddb07ba08503bdf82aa81758793bcea5b530 SHA512 6fdde8d938e8fadc9391b5d188883dab0aecf8b27d40d00b5d67d8fac9cfd9d5107b1934bfe6310587400f277c99d1db5cabf3d26f340ce2141873dec238e5ce
 EBUILD opus-tools-0.1.10.ebuild 944 BLAKE2B 128013973365bd4de9d4f11cbc536b3868935482cb24a7998b5ec6f73195497d28d5622d6ad9186849ba2850882ee4a0179bb04098f9d8471a1c2ae2fe884d52 SHA512 844133cf0a6077d13cc85eec31dc47af94c25bd3dac6eea41eb396b9a36a27d6b0d67e86be0fc53dea8bd3ea03595ef47aba87d06482f3ddf144bc70466b7c38
-EBUILD opus-tools-0.2.ebuild 995 BLAKE2B 95ccf37fa0a9185de8ed54c0ab6656dafa0c9b15b7b77c32927ad1b6572e28ffe893b5fb426fed2a351621b27eac44ea73119c718f209a0f52ad9603208a28ba SHA512 a14069037a9a2d87b04eafe7ec3f9558ef393cd92e73ec51e6a2bb9e9ff7713a23a3206589665e61bea9d2ae91f3936f941117724542e53570e9845ecbbaecda
+EBUILD opus-tools-0.2.ebuild 1007 BLAKE2B cd9627edd8696f5becfeced83169fe1b724f085cb4ed29a52a6d3718afa248b1b4b166e8b0170a0956b12627712a260645bc689b4550ef117c9d35b5b674522c SHA512 7efa5b8ffba5e62c066438e7582852f357700d1d37bf7f3ade9d29a6e5ec8d2adfd8c898ac30b53fb33e759f2ac5f6d8d5b12151a3f1b3be0b91066ac9db9818
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/opus-tools/opus-tools-0.2.ebuild b/media-sound/opus-tools/opus-tools-0.2.ebuild
index 7d1df1f9f0b4..789bbd1a16dd 100644
--- a/media-sound/opus-tools/opus-tools-0.2.ebuild
+++ b/media-sound/opus-tools/opus-tools-0.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="flac"
 
 RDEPEND="
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index adc179065821..bdd57b3c2c99 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,3 +1,3 @@
 DIST pavucontrol-qt-0.4.0.tar.xz 34916 BLAKE2B f42f560b125e292ae3a8ab76e2020d1a899019e8ed40d6f4d3e90fe1baa0cc044093310fe9ac11c6529f9cc1abc41d475aa2d445de8f19e6f89ed456525aa7d9 SHA512 62e0c909c98acc4605556ba63981e4599d37b592b99ee16301dc0ba154f3066708a31562e158c042b3530c11603cc43de930080770f027bb998cbb6f79f0f3fb
-EBUILD pavucontrol-qt-0.4.0.ebuild 780 BLAKE2B 0169b1a5e0366724d75a036cb83d16e822740d591930dd84221a453e1af6f8980c217f52e0da3b1a5cd2377b89aff2c700680d1372a0ca5751b4144d3872e6c6 SHA512 be6c67498e5398327a943c76e1476b499920b3a14b43b8cc66306b907f9e0ea3509e54d17f7b73f363ddaad966ea134e50a0ae5011112f33547a8b7d490902c2
+EBUILD pavucontrol-qt-0.4.0.ebuild 775 BLAKE2B 6e5b47111723959f49917ff2251d3a617025f0565147648c31d7d4bb35f366a1e8b3670760c22d97cb13c0770971ac30d045286e51b0f7b4d38b571c51340235 SHA512 a777547bb37805a559a89e4aaa488949643f770a6f5ea843d183df50ba2d250dbd5fa4a6449916e9c021099c7287d093a99335f43fcf670dc9f2fb3b7b2b2faf
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.4.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.4.0.ebuild
index 656d182603ab..f5fb52e6913d 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.4.0.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
index d762b770f272..3f5293fc89fa 100644
--- a/media-sound/potamus/Manifest
+++ b/media-sound/potamus/Manifest
@@ -1,4 +1,4 @@
 AUX ffmpeg29.patch 684 BLAKE2B 06808e146419469de9f3d4a98db52e45c284779677b9f7525d108afbf485fb804a8bdf45909fbc53c19546dc6b56ae308348a1616f94af269c9cd1407bb134bd SHA512 3de805c7e4808863ca4fa9fa7c450ce1db6222a69ef6e43016e2d7d687a5461beda75869b3bd5ad6266f00948ce94ff63b15c9fa97104303a56300e0aa2cb475
 DIST potamus-16.tar.gz 144874 BLAKE2B ca18b2a6e948a913f652383a81a9e637265c7cf78126846c6824fe12f8a34ab2902ade69366e036b00da61604780e340671a68588b52576c0e5827f07b1b7ba8 SHA512 e4c87d4166d958d200edc13835c57c894b0803b243fd79fb211480a217a33ca34fbd451622842efc47c0ed1b79bcd0fa4f0258f129f70678f14c373234b1b32d
 EBUILD potamus-16.ebuild 1272 BLAKE2B 4070417acd64772b087e88db609a97762176404f263c60dd919c2348cde4fda3e0cfefd18714061aff376bdd2c1b546555a46bf4c9e95be141940b72c9b86061 SHA512 48b6b50e09ba733c0f12e25d716dc4f34ac97f8882ce62a0dca924fb257fcf293d3338b5d20b4a5b5e7309f269e75a017b3c34b66ecb46c33cfa2466985f6d4c
-MISC metadata.xml 321 BLAKE2B 83b225dbeefaacfa834eb2e2add72bed38dbf5320682d2a50cda1ff0de4c36845501071f416242ec83cbff0144e285ef4bbf4f85e11d4cd42cab1b5b2f21f5d5 SHA512 10c84204031ebaad014bcd3acae8faceaad8f9e589ab6f6429485074e242111a94b41995af7c35f1cbf7b85b2cf76a304b1b6b49d018cffff330f861efd01a3f
+MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/potamus/metadata.xml b/media-sound/potamus/metadata.xml
index 72f0cd7e04cf..c870d0eef0ab 100644
--- a/media-sound/potamus/metadata.xml
+++ b/media-sound/potamus/metadata.xml
@@ -5,7 +5,4 @@
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
-<use>
-	<flag name="opus">Adds support for the Opus codec.</flag>
-</use>
 </pkgmetadata>
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index b37250170e94..adb233e454a0 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,7 +1,7 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.3.7.tar.gz 1021450 BLAKE2B a3d9308056b08dca0737eafa91b18ec9d3d2f2fc3d84ac090d21bac832fc5da91ba5ed1ce595898ca07dfe1684bf4e50668956dcc0f32da5b535ec1b3e9e4f08 SHA512 5ae104bf3359aa1dc4be6fe3afa5bb8f2243b3ef2c9d5abb9a881d025b26e8e75cc80ffa1ee43fafe7fa8d238eaaf2dc933f191694093b10ed8ffe7f7e3fdc53
+DIST pulseeffects-4.3.8.tar.gz 1020024 BLAKE2B 07cc1341a9c829c6e9e4f820337ee993b16e4d014636ad89793952059af5814754682035841b4307a700d2681e49aec5cd4138cdf13fafc79e60557d8087a362 SHA512 3c6537daf2fd3205ecb42ee91cc01ce2a4b28ec2ecfe32c978f70e8334fef667369c684b1ea2dfdd0537fe70d10084a1c758da7757f5473d1dafba6110dc03c7
 EBUILD pulseeffects-3.2.3-r1.ebuild 1568 BLAKE2B b50ff96cee7ea244dc499c46bfd9dc382e3fa22d03b1d74c25614a5fcd9b540521bc4b7c50a42cd11e19286f5f86c82b7ab5cb93c44da0e29a9d87c2bb4157ba SHA512 704a2e5d1bc7abc1ab31d48092cd825a140a571e5ee0034bf4a9041615183c91383fb5b4051275a4b598be35e638b375e63de3d117d0fdbc63fdfb341c57e05e
 EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
-EBUILD pulseeffects-4.3.7.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
+EBUILD pulseeffects-4.3.8.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 EBUILD pulseeffects-9999.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.3.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.3.8.ebuild
index edcf67ece621..edcf67ece621 100644
--- a/media-sound/pulseeffects/pulseeffects-4.3.7.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.3.8.ebuild
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 2ca3a9bc21b7..2bb5cbfb29a1 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -3,4 +3,4 @@ DIST qmmp-1.2.4.tar.bz2 1189587 BLAKE2B eff6d52456a79373434b793fc2303eea2ba42675
 EBUILD qmmp-1.2.3.ebuild 4172 BLAKE2B 9db4f2b3d25b782c9e27eae6ae8d2f64b247634863ee3b58362401746c0004a66d9444f8a21efb86d79841136f5a22a10d40838e98ab83b4bce04ccce5d4dae4 SHA512 911c14441c370ae4494da1e9b0dacc28ad9b469eaab72fb99a5210af73760f2597c63a1ff844c10b0a2d8a17f270f6ec3b9196b0d08ed738ce9c640e061be6e8
 EBUILD qmmp-1.2.4.ebuild 4171 BLAKE2B 83e5f7bf60a315e55491b571bdd7440edd0023b3e3bf61aa2484c6ddb06873606ecbefea24499eaef252ce4fda770b368b2c0804d88801cc43853f36fc8794fb SHA512 fb1c6f1c21b84a6ef507a8dd218ff469172861cff6b6970652bf78538859e1ebf217c21f9e60167296c8bd87dbe40bba36ffbd423708f9cafa0fd6c2d13855b5
 EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
-MISC metadata.xml 1776 BLAKE2B acbe67572cda04be31f68a07539acc2f1124b789bd1986fcd0e17f7688c37d2248236467b9f04c6de04030c4ce59962e78741fad57d9bd993b1a893fcc58ecbc SHA512 92f5f391cadb3f602d950a52ba0c6e3e8b5ec844ed7d6ffd5bc1ac112fcb46f113ac8524676a1d8c482366703966edbd551a4906aba54af54ca0856e20215425
+MISC metadata.xml 1726 BLAKE2B cb094a332efab67fd0171b3f2f2c15928e35f2dc3dbb348eaaee54716e61390549e8506caaa42430df2f03f436b8a28502a7870de2335caf792c3af6ecc2cdc9 SHA512 4c63d06e5c2e08725a1bd3a9172c41ddbba831b88b1ff23749c9702560355b963413540b7261609f1c063d8f4b311b5402dee63e9918628d4c3a90585cece510
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index d6e2ae6cf128..fa31e6172dd3 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -19,7 +19,6 @@
 		<flag name="lyrics">Fetch track lyrics from the web</flag>
 		<flag name="midi">Enable midi support using wildmidi library</flag>
 		<flag name="notifier">Enable qmmps' notifier system</flag>
-		<flag name="opus">Enable the opus plugin</flag>
 		<flag name="projectm">Enable projectm music visualization plugin</flag>
 		<flag name="qsui">Enable QMMP simple UI</flag>
 		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index c64297366034..73ae9c7b27c3 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,5 +1,5 @@
 AUX qtscrobbler-0.11_pre20130123-qt5.11.patch 697 BLAKE2B d60d5da77ab0a30d9ad89d24a10882ce91c85bf9959e5be6019c69b0db95c60d2e6d1c2cbf5a1fdd5494236ce5d78d9b5a5a05b9bea264db750c0f570cda85d0 SHA512 2edf71e6397dfdbb1aaeb38bca5b6a3b2a097b1a25038f62d1052cb5258cf94b12c26181fea76c64506ed60bfdeaa4968429836eb47e874aec273cdb480689ce
 AUX qtscrobbler-0.11_pre20130123-qt5.patch 5444 BLAKE2B 5e8ef860627e3f8a1b5c6d7a845d4b71c2ae473a42c1fd9619d9a6a270b50e7214bec232c51faf918d4d220490ea1273e016280e56c3d4b06075fcb9feb528bd SHA512 716dc1d84d1eddcec15ec4b87c0c7454acda58ebb94ed5e7a1f5a79ec0a04d473c6dc9e7eb6649986346743cf8a673bdc25e714c221fefd0f05e0925a0f5b0c3
 DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646
-EBUILD qtscrobbler-0.11_pre20130123.ebuild 1285 BLAKE2B d6ea8043f5932cc68231731d0ead450f99faed2a5d0e9871c103eedf648004b445320f0c5744c85e26b9ecf6489e84b1dac51dd71f49de58e812693ecde14958 SHA512 e16d66960de5faa44f4426bc38000a1f50bc86ec0807b2f4e088a6d3513b57388d274206b33e06eaa33218fa269e68ffe5e44b74b4ffc150fe005bb0960f6bf7
+EBUILD qtscrobbler-0.11_pre20130123.ebuild 1307 BLAKE2B 699ade962f0728763aaa97f18621d0e0bb365ef5243610391639b3da7a2dbbd4036c6383985ba21b92d325ffe2ffa4df1f485f0ce9472df502aa1e721b946acd SHA512 93d6c9e2bb94f26f0310da87acbb6bb134353274387ed35972b6d3ef08ace9340813639f6cd33a5c2bed311da74f3c85a06ea533ba3dc342dba1ed7b9459df46
 MISC metadata.xml 340 BLAKE2B 350f5459a036f9c55c558bc8f7d9ab02a3b9045eeed136d8ef2963a19c9e3ca281dbff32ac8259333b625ca86ff66a8a747f6e5893baf643f5a1d7318303511d SHA512 67534a9d49ba6af88e23b14129c377309124be860237efbe926ba870f554aac980522cf7c791fe2075da689670994487631760c986a7b11834a2f2f9b48fc317
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
index 3dc54d6064d0..18da2c44154b 100644
--- a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
+++ b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,7 @@ RDEPEND="
 	media-libs/libmtp:=
 	net-misc/curl"
 DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index 13989be0b2ee..8f8a3e4d5624 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -7,8 +7,6 @@ DIST ohnet.1dd641.tar.gz 20831753 BLAKE2B 82724b7f2cd5cd0dcaa54786394a2560b965f5
 DIST ohnetgenerated.e3edb9.tar.gz 1887473 BLAKE2B 1b878dd743f0b45f69c3eb018ddbd64db60285ee8743bb039f9a794a9e0ecdb516e1138ac622fc7cde3462fe5c3cfc006d71d0b22048496c1bc190cc4f34a906 SHA512 9b48d0ff496acfa4313c1efc90e73f1050fee011b1ab301b9268ba4009fca9a47978cbe2f1f0a1d05d7c939f95b4a38560b9f63464305032c20d36af3ade8811
 DIST ohsongcast.3299ea.tar.gz 831313 BLAKE2B aaa5590af288bbf2b358bad613b983418f6648219bba046113a8c712f3a369fee2894c8aa42f96ead16582b96b982d1696b478950e0e3d0ef6c8e3325e5a3214 SHA512 ac1e81166e5b73a943f78c930ef89fc5b71447c7eb8c4cc509c50c686a360a25f75f1651061a653bf995c15377bee4cb98a97665bf27f04f947940a249e12661
 DIST ohtopology.cc09c0.tar.gz 118703 BLAKE2B ef5b560cb2a272586e8755117b5021d67562bda962b0c6240072ad42876ae71f21c81611521d31b01212d2175637244b8513332858aec3d7e713546587111ed0 SHA512 46f1e4ba6b7553b81c939c2ae691ab89e0bf9b565820e8c65b14b6534f3a9240580cb9fd69f46568c5f0c8d105da825b6f9abbf61a64289a4f553a47902b38d4
-DIST sc2mpd-1.1.4.tar.gz 218128 BLAKE2B 71ff5e95d868c40d5c9fc72d65161d97ccc1ed366e7465c038efb646bb4ab581d24dbab7280fb739029bbaec7ff8f5804006a4cdc8a61ad0395acb9da74db95c SHA512 eebd21198ec2a9b0e1122a9b3316eaefd38daa2e6b6aa4c480e8c1fef0a8600a68c386d1957b4cf9203a61bcc63b7842e145073092f30ec2e81cdf1010e9f1ad
 DIST sc2mpd-1.1.5.tar.gz 219031 BLAKE2B ac8a3b4da6caff58db4948c32d643bf9244efa4ad77e29c18aa7e10036715a9a84c9f69478f5a2eabf6769112fb61ea15e1d7e8e613fbae05794cef609f21247 SHA512 8ea47b8bda62b8e97b95b0ddf0ab7979a54ae8bc599c67ef7bdd16ea876254446c8be440fade7355be93742c94c6f20b56e40a5756cc3c0dbe0409612dc3788e
-EBUILD sc2mpd-1.1.4.ebuild 4566 BLAKE2B 7bf45b49fbeb40a971898568a8a704605bce5c500997ce7d24d0fb22a5a299af9fedf271565e2ee20bd01fc8104f6404ee906ccf977cbec1704ce15f19757bad SHA512 a38646d513b604ea0237be131adf7992603090e1cdfa12e4f715b2239a73d7d06440a0ecbfe7622e8a6475eb0df3921dc7f227a977a265398d514bc401be5a6d
-EBUILD sc2mpd-1.1.5.ebuild 4566 BLAKE2B 7bf45b49fbeb40a971898568a8a704605bce5c500997ce7d24d0fb22a5a299af9fedf271565e2ee20bd01fc8104f6404ee906ccf977cbec1704ce15f19757bad SHA512 a38646d513b604ea0237be131adf7992603090e1cdfa12e4f715b2239a73d7d06440a0ecbfe7622e8a6475eb0df3921dc7f227a977a265398d514bc401be5a6d
+EBUILD sc2mpd-1.1.5.ebuild 4562 BLAKE2B fbecb9f945afb3d1ba06e15cdcabefc762cd4a68919208001843fbf6dac4b5b52bd773934b8db7f685f31e9f2508a4d06e4c05223c69fb3658a2a681ceaf3a2a SHA512 c2f91e7fb6b48cda77c204c631d44f6765433d7d9f01872a17a99f588f3fe09dc2827cbc48104b8752defb27b607612dc7bbd20fc478748a9f52fba435c221c8
 MISC metadata.xml 313 BLAKE2B 81be81a3249c77371bf3c159e69a7151fd4763449f1b32cb02de42e774e4e050b45197e0a22dd294b3f9f116c680d18e18c03437bc571952b6739a01f5b04180 SHA512 993a3648e52c72afc8cceb7cf87a3bbf28658f106ca0b12c2e90f098e8d02b6d73f6e1ff728aef86715daae17533a17e6495d8110c59f91e116e84587ef5eddc
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild
deleted file mode 100644
index 90ecdf9ac79c..000000000000
--- a/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-
-sha_net="1dd6411ffbe59fe09517162fb88e2405adb4990f"
-sha_netgenerated="e3edb912410d4c5a4d5323bb1e9c27660a42d78f"
-sha_topology="cc09c09da4be8d3d04adae5b8f0daaf8450906a3"
-sha_songcast="3299eaedfea34993b79e6d30444792d4fb12a110"
-sha_devtools="d3586187dfa5f0a8b0f3e35e3d1dc50d1c34943d"
-
-SRC_URI="
-	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
-	https://codeload.github.com/openhome/ohNet/tar.gz/${sha_net}
-		-> ohnet.${sha_net:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohNetGenerated/tar.gz/${sha_netgenerated}
-		-> ohnetgenerated.${sha_netgenerated:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohTopology/tar.gz/${sha_topology}
-		-> ohtopology.${sha_topology:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohSongcast/tar.gz/${sha_songcast}
-		-> ohsongcast.${sha_songcast:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohdevtools/tar.gz/${sha_devtools}
-		-> ohdevtools.${sha_devtools:0:6}.tar.gz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	media-libs/alsa-lib
-	media-libs/libsamplerate
-	net-libs/libmicrohttpd
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd "${WORKDIR}" || die "Couldn't cd to WORKDIR"
-	mkdir openhome || die "Couldn't mkdir openhome"
-	mv ohNet-${sha_net} openhome/ohNet || die "Couldn't mv ohNet"
-	mv ohNetGenerated-${sha_netgenerated} openhome/ohNetGenerated || die "Couldn't mv ohNetGenerated"
-	mv ohdevtools-${sha_devtools} openhome/ohdevtools || die "Couldn't mv ohdevtools"
-	mv ohTopology-${sha_topology} openhome/ohTopology || die "Couldn't mv ohTopology"
-	mv ohSongcast-${sha_songcast} openhome/ohSongcast || die "Couldn't mv ohSongcast"
-
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	epatch "${FILESDIR}/ohnet.makefile.patch"
-	epatch "${FILESDIR}/ohnet.optionparser.patch"
-	sed -i -e 's/ bundle-after-build//' UserTargets.mak || die "Couldn't patch UserTargets.mak"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	epatch "${FILESDIR}/ohnetgenerated.makefile.patch"
-	epatch "${FILESDIR}/ohnetgenerated.commonmk.patch"
-	sed -i -e 's/ bundle-after-build//' UserTargets.mak \
-		|| die "Couldn't patch generated UserTargets.mak"
-
-	eapply_user
-}
-
-src_configure() {
-	econf "--with-openhome=${WORKDIR}/openhome"
-}
-
-src_compile() {
-	# Begin ohbuild.sh reverse engineer
-
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	make native_only=yes || die "ohnet make failed"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	# TODO: get from environment/make target
-	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
-	mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
-	cd $deps || die "Couldn't cd to deps dir"
-
-	ohnet="${WORKDIR}/openhome/ohNet"
-	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
-		 -exec cp '{}' lib ';' \
-		|| die "Couldn't cp binary libs"
-
-	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
-	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
-	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
-	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
-	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
-	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
-	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
-	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
-	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
-	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
-	make native_only=yes || die "ohnetgenerated make failed"
-
-	cd "Build/Include" || die "Couldn't cd later to include"
-	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
-
-	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
-	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
-	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
-
-	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
-	make release=1 Receiver WavSender || die "Failed to build ohSongcast"
-
-	# End ohbuild.sh reverse engineer
-
-	cd "${S}" || die "Failed to cd to source directory"
-	make || die "Failed to make sc2mpd"
-}
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
index 90ecdf9ac79c..88eb814868c4 100644
--- a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
+++ b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ SRC_URI="
 "
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	media-libs/alsa-lib
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
new file mode 100644
index 000000000000..b9a9bfe5e25b
--- /dev/null
+++ b/media-sound/snapcast/Manifest
@@ -0,0 +1,9 @@
+AUX snapcast-options-for-use-flags.patch 2583 BLAKE2B 4ad94f7c2d796017047645dcc74bd04209817dcf6c96c05cf92a130af2c5239761325f25a0bf8ebd65c6d1221f3ba248b93eb98c22ad278c06bca46c8e27d056 SHA512 84be456467309c2c040526dfa1847e65fdec2c59d7ba917416d10ece0d7173d53ce11c2fed2a566fb3157e58757ea21500464c46abff18e57dfb092c18450932
+AUX snapclient.confd 643 BLAKE2B f15281f607b230b165e61dae2d71e58a9b899329da435caca46aa866a14528246bbfd9abfa1002815270d98fb926e322025095b9955fe84e0381c17149ca0b9c SHA512 34961a219a608aa5447fc4b47d08785923a4a8a5d70f87f03c62dab2f590180d72992f40594772ac9d2c8cfc89281789418eee46c860b1b7c1b826e6660cfc72
+AUX snapclient.initd 378 BLAKE2B a1f2dda0843c541edfefce80e0ad9587af8ef50844fe742d932a1a1d3ea06e8587574ec4c08d403858bb42b4bf3ebcfa67fce59182b2f779e09e2ad53790d0ca SHA512 5d58c9746ba793c59ae1690a97aa5f0c74ffd3fe86a1f9ed5851e3f181e050188f70a96fbc7b8cfe0afe5de784bc332e25b4a4e68873503106b2231c59e8af69
+AUX snapserver.confd 1013 BLAKE2B 205c58e3d42dc12d759c7dd5acbb1a1229ae052a48392731a7cc10cf9ab36250938995a75c4968c33521cf1480396856b5cd8653e90b5b8a3188e1660b1c1257 SHA512 5adcf37ed69ccb09541f7bf7563ddf5a8aaf1bfcabc02f430976ae5b8e418ea68cf0b22216f3f7387a04f7516a8f30cc5b2923f811c1833c7a4208e951fd266e
+AUX snapserver.initd 383 BLAKE2B bd920738ecb98eda76f0045b50b3b0763cd123ab5eb08bbbe2964d7a0556b6df2ecb879dd0b0ff9614b10520008e9934cb278a0f3705539076eb812404f0ba58 SHA512 565084bea18bfefe60c0e33e0fd33929a0b170df9d0cbbfbf794a9ee9055a9bf605a716ff18bf72d2813e890b64815eebc2bc24963f300b4061cf017440a62d6
+DIST snapcast-0.15.0.tar.gz 667452 BLAKE2B 0bf7e28ba52356c8fff8066ded3d741243c2ba88cdc6cefda113c0d6866fe14b2fea6198d7809e564cd61d32a336a2c30ee22f6f5d6ae77368a6f3e254cc5065 SHA512 3751eeaa9be4ffd5c7633b8770f36e87360ab83004f090a8350e377f60a79d9502b92b92c5c9c35f513705e6484d113de9942f0a896824d7c5f806ba0010e84e
+EBUILD snapcast-0.15.0.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
+EBUILD snapcast-9999.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
+MISC metadata.xml 1335 BLAKE2B 6b0e6cfeb32d2fd6c9dfd5404df5795a1c82f1fffb2e12c31ee5c6656e0b7470d41416775c816211847bb37288f620b7f5ffe85641b88d3b5493f21436a43ae6 SHA512 78bc34f1071f7efaf923dded86d6af3761f34612832b29e6ddacf63c7bcbb5c9662e3857a818dfd0328423a7ba3aaa6d383cf425551227b6228d6d58cad4943b
diff --git a/media-sound/snapcast/files/snapcast-options-for-use-flags.patch b/media-sound/snapcast/files/snapcast-options-for-use-flags.patch
new file mode 100644
index 000000000000..956d6299d457
--- /dev/null
+++ b/media-sound/snapcast/files/snapcast-options-for-use-flags.patch
@@ -0,0 +1,90 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 52fec6e..d068db1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,11 @@ option(BUILD_TESTS "Build tests (run tests with make test)" ON)
+ option(BUILD_SERVER "Build Snapserver" ON)
+ option(BUILD_CLIENT "Build Snapclient" ON)
+ 
++option(BUILD_WITH_FLAC "Build with FLAC support" ON)
++option(BUILD_WITH_VORBIS "Build with VORBIS support" ON)
++option(BUILD_WITH_TREMOR "Build with vorbis using TREMOR" ON)
++option(BUILD_WITH_AVAHI "Build with AVAHI support" ON)
++
+ 
+ if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
+     message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
+@@ -109,10 +114,12 @@ else()
+         endif (ALSA_FOUND)
+     endif()
+ 
+-    pkg_search_module(AVAHI avahi-client)
+-    if (AVAHI_FOUND)
+-        add_definitions(-DHAS_AVAHI)
+-    endif (AVAHI_FOUND)
++    if(BUILD_WITH_AVAHI)
++        pkg_search_module(AVAHI avahi-client)
++        if (AVAHI_FOUND)
++            add_definitions(-DHAS_AVAHI)
++        endif (AVAHI_FOUND)
++    endif(BUILD_WITH_AVAHI)
+ 
+     add_definitions(-DHAS_DAEMON)
+ 
+@@ -154,29 +161,39 @@ if(NOT HAS_CXX11_STRING_SUPPORT)
+     add_definitions("-DNO_CPP11_STRING")
+ endif()
+ 
+-pkg_search_module(FLAC flac)
+-if (FLAC_FOUND)
+-    add_definitions("-DHAS_FLAC")
+-endif (FLAC_FOUND)
++if(BUILD_WITH_FLAC)
++    pkg_search_module(FLAC flac)
++    if (FLAC_FOUND)
++        add_definitions("-DHAS_FLAC")
++    endif (FLAC_FOUND)
++endif()
+ 
+-pkg_search_module(OGG ogg)
+-if (OGG_FOUND)
+-    add_definitions("-DHAS_OGG")
+-endif (OGG_FOUND)
++if(BUILD_WITH_VORBIS OR BUILD_WITH_TREMOR)
++    pkg_search_module(OGG ogg)
++    if (OGG_FOUND)
++        add_definitions("-DHAS_OGG")
++    endif (OGG_FOUND)
++endif()
+ 
+-pkg_search_module(VORBIS vorbis)
+-if (VORBIS_FOUND)
+-    add_definitions("-DHAS_VORBIS")
+-endif (VORBIS_FOUND)
++if(BUILD_WITH_VORBIS)
++    pkg_search_module(VORBIS vorbis)
++    if (VORBIS_FOUND)
++        add_definitions("-DHAS_VORBIS")
++    endif (VORBIS_FOUND)
++endif()
+ 
+-pkg_search_module(TREMOR vorbisidec)
+-if (TREMOR_FOUND)
+-    add_definitions("-DHAS_TREMOR")
+-endif (TREMOR_FOUND)
++if(BUILD_WITH_TREMOR)
++    pkg_search_module(TREMOR vorbisidec)
++    if (TREMOR_FOUND)
++        add_definitions("-DHAS_TREMOR")
++    endif (TREMOR_FOUND)
++endif()
+ 
+-pkg_search_module(VORBISENC vorbisenc)
+-if (VORBISENC_FOUND)
+-    add_definitions("-DHAS_VORBISENC")
++if(BUILD_WITH_VORBIS)
++    pkg_search_module(VORBISENC vorbisenc)
++    if (VORBISENC_FOUND)
++        add_definitions("-DHAS_VORBISENC")
++    endif(VORBISENC_FOUND)
+ endif()
diff --git a/media-sound/snapcast/files/snapclient.confd b/media-sound/snapcast/files/snapclient.confd
new file mode 100644
index 000000000000..311cce1c4fa6
--- /dev/null
+++ b/media-sound/snapcast/files/snapclient.confd
@@ -0,0 +1,33 @@
+# conf.d file for snapclient
+
+# Options for running Snapclient as daemon
+#
+#	-s, --soundcard arg (=default)
+#  		Index or name of the soundcard
+#
+#	-h, --host arg
+#		Server hostname or ip address
+#
+#	-p, --port arg (=1704)
+#		Server port
+#
+#	-d, --daemon [=arg(=-3)]
+#		Daemonize, optional process priority [-20..19]
+#
+#	--user arg
+#		The user[:group] to run snapclient as when daemonized
+#
+#	--latency arg (=0)
+#		Latency of the soundcard
+#
+#	-i, --instance arg (=1)
+#		Instance id
+#
+#	--hostID arg
+#		Unique host id
+#
+# For all command line options, please see man snapclient
+
+SNAPCLIENT_USER="--user snapclient:audio"
+
+SNAPCLIENT_OPTS="-d"
diff --git a/media-sound/snapcast/files/snapclient.initd b/media-sound/snapcast/files/snapclient.initd
new file mode 100644
index 000000000000..df69eb2621a0
--- /dev/null
+++ b/media-sound/snapcast/files/snapclient.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name=snapclient
+command="/usr/bin/snapclient"
+command_args="$SNAPCLIENT_USER $SNAPCLIENT_OPTS"
+pidfile="/run/snapclient/pid"
+
+depend() {
+	use avahi-daemon
+}
+
+start_pre() {
+	checkpath --directory --owner snapclient:audio --mode 0775 \
+		/run/snapclient
+}
diff --git a/media-sound/snapcast/files/snapserver.confd b/media-sound/snapcast/files/snapserver.confd
new file mode 100644
index 000000000000..9b12f81ff2ab
--- /dev/null
+++ b/media-sound/snapcast/files/snapserver.confd
@@ -0,0 +1,45 @@
+# conf.d file for snapserver
+
+# Options for running Snapserver as daemon
+#
+#	-p, --port arg (=1704)
+#		Server port
+#
+#	--controlPort arg (=1705)
+#		Remote control port
+#
+#	-s, --stream arg (=pipe:///tmp/snapfifo?name=default)
+#		URI of the PCM input stream.
+#		Format: TYPE://host/path?name=NAME
+#		[&codec=CODEC]
+#		[&sampleformat=SAMPLEFORMAT]
+#
+#	--sampleformat arg (=48000:16:2)
+#		Default sample format
+#
+#	-c, --codec arg (=flac)
+#		Default transport codec
+#		(flac|ogg|pcm)[:options]
+#		Type codec:? to get codec specific options
+#
+#	--streamBuffer arg (=20)
+#		Default stream read buffer [ms]
+#
+#	-b, --buffer arg (=1000)
+#		Buffer [ms]
+#
+#	--sendToMuted
+#		Send audio to muted clients
+#
+#	-d, --daemon [=arg(=0)]
+#		Daemonize
+#		Optional process priority [-20..19]
+#
+#	--user arg
+#		The user[:group] to run snapserver as when daemonized
+#
+# For all command line options, please see man snapserver
+
+SNAPSERVER_USER="--user snapserver:snapserver"
+
+SNAPSERVER_OPTS="-d -s pipe:///tmp/snapfifo?name=default"
diff --git a/media-sound/snapcast/files/snapserver.initd b/media-sound/snapcast/files/snapserver.initd
new file mode 100644
index 000000000000..02762c861b03
--- /dev/null
+++ b/media-sound/snapcast/files/snapserver.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name=snapserver
+command="/usr/bin/snapserver"
+command_args="$SNAPSERVER_USER $SNAPSERVER_OPTS"
+pidfile="/run/snapserver/pid"
+
+depend() {
+	use avahi-daemon
+}
+
+start_pre() {
+	checkpath --directory --owner snapserver:snapserver --mode 0775 \
+		/run/snapserver
+}
diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml
new file mode 100644
index 000000000000..3a92671f3335
--- /dev/null
+++ b/media-sound/snapcast/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cb-gentoo@guya.de</email>
+		<name>Christian Buchinger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="avahi">Build with avahi support</flag>
+		<flag name="client">Build and install Snapcast client component</flag>
+		<flag name="flac">Build with FLAC compression support</flag>
+		<flag name="server">Build and install Snapcast server component</flag>
+		<flag name="tremor">Build with TREMOR version of vorbis</flag>
+		<flag name="vorbis">Build with libvorbis support</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<name>Johannes Pohl</name>
+			<email>github@badaix.de</email>
+		</maintainer>
+		<bugs-to>https://github.com/badaix/snapcast/issues</bugs-to>
+		<remote-id type="github">badaix/snapcast</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Snapcast plays audio streams time sychronized on multiple devices over 
+		network using a server and a client component. The server picks up an 
+		audio stream from a fifo pipe, thus it can be combined with any audio 
+		source that is able to write to a pipe.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/snapcast/snapcast-0.15.0.ebuild b/media-sound/snapcast/snapcast-0.15.0.ebuild
new file mode 100644
index 000000000000..a664ea01e296
--- /dev/null
+++ b/media-sound/snapcast/snapcast-0.15.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Synchronous multi-room audio player"
+HOMEPAGE="https://github.com/badaix/snapcast"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit user cmake-utils git-r3
+
+	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
+	EGIT_BRANCH="develop"
+else
+	inherit user cmake-utils
+
+	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+avahi +client +flac +server static-libs tremor +vorbis"
+
+REQUIRED_USE="|| ( server client )"
+
+RDEPEND="avahi? ( net-dns/avahi[dbus] )
+	client? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	tremor? ( media-libs/tremor )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	>=dev-cpp/aixlog-1.2.1
+	>=dev-cpp/asio-1.12.1
+	>=dev-cpp/popl-1.2.0"
+
+PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" )
+
+pkg_setup() {
+	if use server ; then
+		enewgroup "snapserver"
+		enewuser "snapserver" -1 -1 /var/lib/snapserver snapserver
+	fi
+
+	if use client ; then
+		enewuser "snapclient" -1 -1 /var/lib/snapclient audio
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_AVAHI=$(usex avahi)
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_WITH_FLAC=$(usex flac)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TESTS=no
+		-DBUILD_WITH_TREMOR=$(usex tremor)
+		-DBUILD_WITH_VORBIS=$(usex vorbis)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	for bin in server client ; do
+		if use ${bin} ; then
+			doman "${bin}/snap${bin}.1"
+
+			newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}"
+			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
+		fi
+	done
+
+	if use client ; then
+		keepdir /var/lib/snapclient
+		fowners snapclient:audio /var/lib/snapclient
+		fperms 0770 /var/lib/snapclient
+	fi
+
+	if use server ; then
+		keepdir /var/lib/snapserver
+		fowners snapserver:snapserver /var/lib/snapserver
+		fperms 0770 /var/lib/snapserver
+	fi
+}
diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
new file mode 100644
index 000000000000..a664ea01e296
--- /dev/null
+++ b/media-sound/snapcast/snapcast-9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Synchronous multi-room audio player"
+HOMEPAGE="https://github.com/badaix/snapcast"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit user cmake-utils git-r3
+
+	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
+	EGIT_BRANCH="develop"
+else
+	inherit user cmake-utils
+
+	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+avahi +client +flac +server static-libs tremor +vorbis"
+
+REQUIRED_USE="|| ( server client )"
+
+RDEPEND="avahi? ( net-dns/avahi[dbus] )
+	client? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	tremor? ( media-libs/tremor )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	>=dev-cpp/aixlog-1.2.1
+	>=dev-cpp/asio-1.12.1
+	>=dev-cpp/popl-1.2.0"
+
+PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" )
+
+pkg_setup() {
+	if use server ; then
+		enewgroup "snapserver"
+		enewuser "snapserver" -1 -1 /var/lib/snapserver snapserver
+	fi
+
+	if use client ; then
+		enewuser "snapclient" -1 -1 /var/lib/snapclient audio
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_AVAHI=$(usex avahi)
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_WITH_FLAC=$(usex flac)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TESTS=no
+		-DBUILD_WITH_TREMOR=$(usex tremor)
+		-DBUILD_WITH_VORBIS=$(usex vorbis)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	for bin in server client ; do
+		if use ${bin} ; then
+			doman "${bin}/snap${bin}.1"
+
+			newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}"
+			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
+		fi
+	done
+
+	if use client ; then
+		keepdir /var/lib/snapclient
+		fowners snapclient:audio /var/lib/snapclient
+		fperms 0770 /var/lib/snapclient
+	fi
+
+	if use server ; then
+		keepdir /var/lib/snapserver
+		fowners snapserver:snapserver /var/lib/snapserver
+		fperms 0770 /var/lib/snapserver
+	fi
+}
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 083ca06f46ab..88b9fe6c23c5 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,5 +1,6 @@
 AUX notest.patch 1545 BLAKE2B f0d6f44eed7811ce3a9c12f1044844a806214489787b90d2d27590fc2bff746d2fb8511a75874e3bfbfd5c5563dd642534e904706dd029d057986344c207c900 SHA512 c3e9fbb8f1844d9faa35b318ffebfe6c64672f329ac584a101bf1e3c5736916666e7c100863de7db50f89b8f98b8a2e267e82e4aad457cbbaa875da0322bb0f6
 AUX piper.capnp 19756 BLAKE2B f852a7e9890e8e3fe3742115a10ffaa5d9793f48b37afc3d608f01f4548d799b00c7770186548384e9f5e85378c6b51167693cf25648aa5cdbf1e2ee353cce78 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720
+AUX sonic-visualiser-3.1.1-qt-5.11.patch 262 BLAKE2B 627bedb71bab01fefa7edaee88f1245f19f312eea257904b2d03202b52c975a546fae73985b5cb9be4b42e97da2f41f28a26c13246f34a8c303b30ada0b276d0 SHA512 60ac4c02507c23fd7ebec556770175ddef3132ae54b0ef3136767c476f86e0c01e518ef2939b2ed6ddc044127f4a7393a800cfe70bfa21c2c103e378c8ea5983
 DIST sonic-visualiser-3.1.1.tar.gz 5304359 BLAKE2B 79c9d1d55ea2ec939fdb7abe656ab81aae72862d139eda4e62037e0231c596cf725b4fd5741216e6413bc25e659798dee3b0e06f55063a9ad73f0d9204f76d84 SHA512 e83efffb62179e67a0e5fd7352f63f5a0210102a7fb38c5ad486479a3749f68a44fec2d1843d1c1ca826ba0004bf421811a270a0a50e3f89f71d956dc7a76ae7
-EBUILD sonic-visualiser-3.1.1.ebuild 2678 BLAKE2B 973202ef9f34738c2ede4ffebd589b5c9a75bf8af6609471e60a0d74b163562493fc469273a30575e4c0ee1fcfda0697d3539af7b7f330cd2c8c2915b7afc120 SHA512 2ae7a8242714a67ee0bb6ff2c2438e1ecb584439ce423b974bbe1c7baa85737a8a6e7d27395dbb57e073671e41fe1404bda4a65affb9b522d5f92b05dccb6d61
+EBUILD sonic-visualiser-3.1.1.ebuild 2710 BLAKE2B 66b1f3e8674cba67e4da8da29f5b48d5e18c064baa942f2cedfc640c6871aa2a1b0d1bdb6c5b5a8ca5b943de37ef53614a8b9dc4375a16b39fe96b3494adfb08 SHA512 882b2d59ddbe590fa7e0040d5c7e823b4aab082fcfffdabf9e2246005f77b13f3f0c56005361112f041c5f741e4abc5388dee2048715b5ac3f398db7cdbb179b
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch
new file mode 100644
index 000000000000..5d62677128b4
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/664628
+
+--- a/svapp/audio/AudioCallbackRecordTarget.cpp
++++ b/svapp/audio/AudioCallbackRecordTarget.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include "data/model/WritableWaveFileModel.h"
+ 
++#include <QDateTime>
+ #include <QDir>
+ #include <QTimer>
+ 
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
index feed92ce32e0..264d383f4b8b 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,10 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="|| ( jack pulseaudio portaudio )"
 
-PATCHES=( "${FILESDIR}/notest.patch" )
+PATCHES=(
+	"${FILESDIR}/notest.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+)
 
 sv_disable_opt() {
 	einfo "Disabling $1"
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 7b8e9dc82fe4..3b340ec1ff14 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1,3 @@
 DIST soundconverter-3.0.0.tar.xz 201548 BLAKE2B bdca42d22d2e497b807149dcd5c8f911519b71dc7e836ad359831d0b7cd2241f58f8f9f60fa4580e2f038528e9c249dfa8a811d1681d0c8dead2c53e0f58f7ce SHA512 6f5518711c76e7748447805dbf16ac8622c5041c3f3cac2de6f31968aab4eff43a2fde2da48c47d12093ce1732208923d83d57b6a97ea99fbf882dfef239a62d
 EBUILD soundconverter-3.0.0.ebuild 1799 BLAKE2B 7b962993406c4a58e530afff0aa966308ac3154c64a43b8a4fdb8fe20a2a15e1a21e2bfa4de52b91860fdc0a6fb08db536a9bd1c02c491946ff92cf0f0a9bdaf SHA512 d263c6e6268d769c424b387a58163f5d178b8f52bd2b6c2cf1ee03cd8622584a87218833b1bb1a03205179d991373b683fdbfc86643875f9ac7b56eac69e4075
-MISC metadata.xml 422 BLAKE2B c38fb6712043983aeaccb925b572fe26156e10776ff00ff454fd215ddedb0751d3c5f5a973725da4e765907f3c9d0ffe6f4062650a7afa2e092cd9b6930219b2 SHA512 5dc640470aea1b45a59fbc757c1fc57a287a733c7e924cecec2dfda988caf313aa9863e86bc4a538565d9e574207654e62ec2071d03f647d21ef6dff38d15732
+MISC metadata.xml 348 BLAKE2B ca79913ada8d48522d7f0f593caff90549704f518c13f1ca79f34a1f885ffa1500d498be6fe4f70b301a3ff168235ca9e6a2642ff4c4d5a0565ad3bc8de99050 SHA512 a9daf27ee0eeb8342f28e7089b3ff3fdfafb1e19f517efc0d56f5eaae09f05b5b7309368af53fba1f46b8810349ca1f6f82aa3c14369144b22970f488c6ae1b5
diff --git a/media-sound/soundconverter/metadata.xml b/media-sound/soundconverter/metadata.xml
index 06978decb7f6..15f4ec06414c 100644
--- a/media-sound/soundconverter/metadata.xml
+++ b/media-sound/soundconverter/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gstreamer@gentoo.org</email>
 		<name>GStreamer package maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="opus">Enable Opus audio codec support</flag>
-	</use>
 	<upstream>
 		<remote-id type="launchpad">soundconverter</remote-id>
 	</upstream>
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 9628468dcb33..c1a280bad9c8 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -10,4 +10,4 @@ AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0
 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 2621 BLAKE2B 15db996f6aea42581d1c2d8744c7a06769e08366d4c017ea1683ad50a0b94ddabed7b3d9f47e69dafaf7df662533e3fa1492724dcace92c054f058286f711884 SHA512 b82bd81d5c58f1d56416ea4a0de453831b8a199d99a59fdbbc79934898f2a33b77ed86870ea26091df91df5ae8211c62b410e14ea7f0d30d8a3fdb9dd1f4f87f
-MISC metadata.xml 640 BLAKE2B f02bbb657d1f43a5c9394cca0f74a88d56163cbeabccdc481651e52abfb0ddaa00750c1578a6ff7c697848357c9382a537044a4364c9c5dfc35906f665011bec SHA512 0c7363b16df0333f4496a8e2ecb8c267cd1b23b1d946964fd2ff096a98313384f4f9d94e30791464076fe318d6bf7e5f1d4ef6f6a41a020ef1c197988c811862
+MISC metadata.xml 579 BLAKE2B 9a129ee262f9147b903659d806b5cb7db559a3cd70adbe6cbf0faca60ae3f2d3c5898ea713813b124bdb43fac7b7e4fa9a6702892bc99dfa9fe3271403160077 SHA512 3b09529397d2d31693f701c05e4db73db553177ec6471a28612254fe3117d1b3574bdf3381a024c23c2e8c7efa02925d0c464548ed4105c573266c612595de2f
diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
index 75d285d5cb6a..9f80c9612eac 100644
--- a/media-sound/sox/metadata.xml
+++ b/media-sound/sox/metadata.xml
@@ -8,7 +8,6 @@
   <use>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
-    <flag name="opus">Enables reading Ogg Opus files.</flag>
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
   </use>
   <upstream>
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 2936ddfff824..ca3d3017b1bc 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,5 +1,8 @@
 AUX ts3client-bin 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.2.2.run 76227220 BLAKE2B 86a50064e01a496dd68559a3fa92003bf674cb59e714a45e6d12b2e6c2b33988b6ee7b76f474b35f1c08ae17fe430e8882c271e1751381df74c4dd5f7d552c42 SHA512 3edc003d721494e914fa74ae3d2666c795c5beb7feae7cc3b379d06447acb3e0941d9c5e2495e8bec8c1c1f5e25b5b31767ea214d198b2e320fc6a7925fdc541
+DIST TeamSpeak3-Client-linux_amd64-3.2.3.run 76247769 BLAKE2B 2fc226455bf839811ad82735c30f493ac9800e6f5f2f3af2d34bcbce3abd7478144feff329c3afa31d994a891990ecae5f51aa3fa001fe828d4ae0bba60fc6e9 SHA512 6f2a0e366589a3495be3ecbe3e866e1d05db3578ed1e2bf19195e6d6818acc1ddb44b46915aa88ff64ac6cc150d3b88b3347147bb0cde93e013aa7960c10dfab
 DIST TeamSpeak3-Client-linux_x86-3.2.2.run 75976893 BLAKE2B 0d0396f2fdd0d61c5e1fc1daec9978e6f4ebb82511b80c97bbc86d97bcbf3237e17064666212d8ba2650dc173cef8774acc38027241247c233c14e41ed697807 SHA512 3ca1a8602a9df3ee7669d3f226a44354a92ef5b3f52b720ac7a91dbd50331c609a46a1ae83d39c82dea8f6fc0a5f32245525ab601f7fd329521478ef29909027
+DIST TeamSpeak3-Client-linux_x86-3.2.3.run 75997823 BLAKE2B 03403430d6409ceebcbdfcdb48b54142327a003c300a3bcbd63f9fb6e40c259f50ee9346fe54fbbb3a19143bacb782248f5b61d2a950f893e8227568a2df1839 SHA512 ad6ea2d5f8237585859c5deac11e0f0b6af6018b2a92fe0aab2a04cfdeab0bd57166bf4fec273d48fedd20819203cba2fd58c3a76b59ec3224e867fc10172808
 EBUILD teamspeak-client-3.2.2.ebuild 2382 BLAKE2B 606440299e4aa17d4e85b629db03a06ce0e4a6d8d72977a92e41af654b267266d69b434b78e712784695092a78c67f80ac9f5521e4543d02c6a8282fb4552e07 SHA512 f08583523c4d885e547d3df4b29edc42b58ca782c497dcc78bae0c4131b44a787097b27d75ee76f5bd4a013b7d886cb8fa2967656ad512728b59777d9edfc42b
+EBUILD teamspeak-client-3.2.3.ebuild 2379 BLAKE2B 057d9457649540a24310cbf2e41e00f13a03dbeef8ddf2eacbe0dc5252f83edc70acfa639d85b275c713fb262f382ca111cc8b0f503b092e2274e35e72c2a625 SHA512 6cb276274f2949f09df682d9479e127fb7191da51ed61e42e0fee1f97800b359f8e70390bf6543b4840e4cbcb4523d48e9eed0eaf43b4303d37f9964271f8de9
 MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild
new file mode 100644
index 000000000000..816b907b9fee
--- /dev/null
+++ b/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop unpacker xdg-utils
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="A client software for quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="teamspeak3"
+SLOT="0"
+IUSE="alsa pulseaudio"
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+RDEPEND="
+	app-arch/snappy:0/1
+	<dev-libs/openssl-1.1:0
+	dev-libs/quazip
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[accessibility,dbus,xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5[geolocation,widgets]
+	dev-qt/qtwidgets:5
+	net-libs/libsrtp:0
+	sys-libs/libcxx[libcxxabi]
+	sys-libs/zlib:0/1
+	virtual/udev
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/teamspeak3-client/error_report
+	opt/teamspeak3-client/package_inst
+	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
+	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
+	opt/teamspeak3-client/ts3client
+	opt/teamspeak3-client/update
+"
+
+src_prepare() {
+	default
+
+	if ! use alsa; then
+		rm -f soundbackends/libalsa_linux_*.so || die
+	fi
+	if ! use pulseaudio ; then
+		rm -f soundbackends/libpulseaudio_linux_*.so || die
+	fi
+
+	mv ts3client_linux_* ts3client || die
+}
+
+src_install() {
+	exeinto /opt/teamspeak3-client
+	doexe error_report package_inst ts3client "${FILESDIR}"/ts3client-bin update
+
+	exeinto /opt/teamspeak3-client/soundbackends
+	doexe soundbackends/*.so
+
+	insinto /opt/teamspeak3-client
+	doins -r gfx html resources sound styles translations
+
+	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
+
+	dodir /opt/bin
+	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
+
+	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-sound/tempest_for_eliza/Manifest b/media-sound/tempest_for_eliza/Manifest
index 4cb301276d82..1aaf8aad8cfa 100644
--- a/media-sound/tempest_for_eliza/Manifest
+++ b/media-sound/tempest_for_eliza/Manifest
@@ -1,4 +1,3 @@
 DIST tempest_for_eliza-1.0.5.tar.gz 45046 BLAKE2B 4e5be0142ee7ab7cbee5e5c4bbe6e8c035928c342cc78ba733853a826736fa125bcd20e6230a61574fa6a146500518e644c5c9a7cd4cbc5544e7be0b34e0b56d SHA512 f14aec8427f1f9a7cfe59e2165e2d7b1a5d963c807755ec2299a0fa2f36492b3fb4240b0b4fce54cc9957cf4d3709839bc40035594fcb2568247bcb62b4614f9
-EBUILD tempest_for_eliza-1.0.5-r1.ebuild 795 BLAKE2B 30e58d25b0c02413bf8134ff4064dce867858d7f30ab0d224791f212c02189d79457f258128de70b4baa06d27b7b005c95089dc78ed2f9243f058edd204d232e SHA512 539ed37510b41e3e9105e7db06bd62788f1f2a95c6d669fe3f071b1244334b30e3fd9346dc179cfad8e147c4a00c86d6b63a18a946bdf948dd7d76b9c5866d4d
-EBUILD tempest_for_eliza-1.0.5-r2.ebuild 669 BLAKE2B 777c4a1572c2b76279e337baaede292c37878177d460f335affeaa01aca96ff79d9f1015fbc4e73b7fcf5600704d5f31c477516aa7e4a7195c837e0621c54381 SHA512 1621bd34dd8e2b94114219f719c9256ab43b17f1690ea20194005e6c1e1ff7a3e25864dd4fd7694022a145c6adde78190f236e2b1149bc6b2540acd25387ba60
+EBUILD tempest_for_eliza-1.0.5-r2.ebuild 664 BLAKE2B 39bd8209059503ca3be9ffe18470687e371a68f4228b06e8120581484493ce69f20ac4cc82e05fa6c45792ee16a027dd1e55cbdd38b44ceef79b3032fb5d11b0 SHA512 3e2f7ed6eea7f077fc9ae49c7209f388fe5196d6298b24d65587c2dce4b7d7d8eee131e5e881262661ad3cf443f273e6841f6931db399b0b9b93cdaa811c8765
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r1.ebuild b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r1.ebuild
deleted file mode 100644
index 2ab5ed9d6b60..000000000000
--- a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit toolchain-funcs
-
-DESCRIPTION="listen to music on the radio generated by images on your screen"
-HOMEPAGE="http://www.erikyyy.de/tempest/"
-SRC_URI="http://www.erikyyy.de/tempest/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	tc-export CXX
-	econf \
-		--enable-debug \
-		--enable-nowarnerror
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
-
-	rm songs/Makefile*
-	insinto /usr/share/${PN}
-	doins songs/* || die "doins failed"
-}
diff --git a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
index c1f630a8951e..a08ce37b2515 100644
--- a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
+++ b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.erikyyy.de/tempest/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-libs/libsdl"
 DEPEND="${RDEPEND}"
diff --git a/media-sound/tk707/Manifest b/media-sound/tk707/Manifest
index 9d996aa9d029..0ab04254396f 100644
--- a/media-sound/tk707/Manifest
+++ b/media-sound/tk707/Manifest
@@ -1,6 +1,7 @@
 AUX tk707-0.8-asneeded.patch 644 BLAKE2B 240bb074707a26ea68e3a18b6cfedc5209fcc6b9176f649a4507b6a61cc05f0d5b80f42122362f833499e5463b726fcd94fd9490fa17492a2ab5c007ce80ca1d SHA512 eeb595cec305420eebeb01c10d7ecab8ae5b429e96470004c27da802f28fcd221064efe1d72fd67073f73b7d19238beb5b2619e18d568858d78f5858de0c3431
+AUX tk707-0.8-glibc-2.27.patch 466 BLAKE2B 1fd4c37d9ef1992da969d69a225cac875494ef96080d8cb6e89cb2a4a27e077ad86a5bf5e34f4ac7741d977ac2e7695aba0a14cc5a55b8c2dea55f2437054748 SHA512 b1324d02930325c7a9d22e720a74c28c9e53d29073ffc2a71fc59c1708868ce36158b6a4e8d57f550fda591d458fc4913b77f4348e3a90a664ae0319e5d5cf1e
 AUX tk707-0.8-nostrip.patch 501 BLAKE2B d70bf604b68185c7397429058a77c9b8b2f9a24e0e6446ad40f05b59ca9f072f624b9a31777b476bde94dc16fdf27611379968ffbb85e88e06886e4d243c605c SHA512 bb652d71029a74c3b487e40aeb1dcac66333033235ad4cf60a4ce1e0c515728792528364c35fae0ae6b071e028173c0f42bf794fa36855be1e1531deb02e5915
 DIST tk707-0.8-updated_tcl2c.patch.gz 7368 BLAKE2B 733fc4d30462d347d1583378d9f32786f6f8aa974d4741cdf3b7f903eecbe43b9eb07815dd3bd6a1fdb4a3cfab893dbec10e386b3fee32f5ec9f22eebea62e94 SHA512 b64a0303ad338863591993696bec1e8ad89473d20be5c08b8935ff8f577684af03f9bed46f0873c4a6d7839cfab583b918d0113ab12341e3b662560385720736
 DIST tk707-0.8.tar.gz 404862 BLAKE2B e99879bf504c3be6c450e7352b8977c572333dae378cc1c4ef96854e263e454350986399c8be72aa03cf8f19cdb0a3c204394a60d1ee10dfcacc62322ebe82f2 SHA512 af5a6958d3ae3fe5e53be5251ba2b3038447b898a3ec40e866a7a0c4d025e450effee7adfc528f01a581b3f7186a269480a4cc6104378f5fdff46ebe277c44c6
-EBUILD tk707-0.8-r1.ebuild 748 BLAKE2B 417668caa61e3cbe0000bc7909d385af4bf012b10378202c7184711683a8ba28893c531f7fcd2f57d100cba3ed23f13780dd7b8bbeee9e5decebc2539e44f230 SHA512 9905a6e10cdba3d652a23131113f184d15a7581b88b8901dce72ec07305eb66fddf676ddc2c634b79aa22b991f3471dd817ecd5a7be85b769d8cd70855d65fc3
+EBUILD tk707-0.8-r2.ebuild 861 BLAKE2B f17cb4bf5e185a597c57db2bd01ca3e21937fcba71147c2ec4001ba8e472797635235526837e4bb1d6f97fe2423ffb78a27b81d449b268ca1309c769de3deea8 SHA512 dd8deb44c237b30392e5696e8b74d12cf6db93f99f67e882b79ce661e9a7b08475092e3a94a00810fa23bae05e6db03b335259437b8da7833029b6d568081b9c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/tk707/files/tk707-0.8-glibc-2.27.patch b/media-sound/tk707/files/tk707-0.8-glibc-2.27.patch
new file mode 100644
index 000000000000..5a2c09bb704e
--- /dev/null
+++ b/media-sound/tk707/files/tk707-0.8-glibc-2.27.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/648308
+
+--- a/tk707AppInit.c
++++ b/tk707AppInit.c
+@@ -31,13 +31,6 @@
+ extern int Init_tk707(Tcl_Interp *interp);
+ extern int Init_tk707_Scripts(Tcl_Interp *interp);
+ 
+-/*
+- * The following variable is a special hack that is needed in order for
+- * Sun shared libraries to be used for Tcl.
+- */
+-
+-int *tclDummyMathPtr = (int *) matherr;
+-
+ #ifdef TK_TEST
+ extern int		Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp));
+ #endif /* TK_TEST */
diff --git a/media-sound/tk707/tk707-0.8-r1.ebuild b/media-sound/tk707/tk707-0.8-r1.ebuild
deleted file mode 100644
index 10c5456ac6c5..000000000000
--- a/media-sound/tk707/tk707-0.8-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION=" An \"7x7\" type midi drum sequencer for Linux"
-HOMEPAGE="http://www-lmc.imag.fr/lmc-edp/Pierre.Saramito/tk707"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	mirror://gentoo/${P}-updated_tcl2c.patch.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-RDEPEND=">=media-libs/alsa-lib-0.9.0
-		>=dev-lang/tcl-8.4
-		>=dev-lang/tk-8.4"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_SOURCE=${S} epatch ${P}-*.patch
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/media-sound/tk707/tk707-0.8-r2.ebuild b/media-sound/tk707/tk707-0.8-r2.ebuild
new file mode 100644
index 000000000000..03b31573728b
--- /dev/null
+++ b/media-sound/tk707/tk707-0.8-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION=" An 7x7 type midi drum sequencer for Linux"
+HOMEPAGE="http://www-ljk.imag.fr/membres/Pierre.Saramito/tk707/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/${P}-updated_tcl2c.patch.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND="
+	>=media-libs/alsa-lib-0.9.0
+	>=dev-lang/tcl-8.4:0=
+	>=dev-lang/tk-8.4:0=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}/${P}-updated_tcl2c.patch"
+	"${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-nostrip.patch"
+	"${FILESDIR}/${P}-glibc-2.27.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	HTML_DOCS="tk707.html" default
+	rm -rf "${ED}"/usr/share/html/
+	make_desktop_entry "${PN}"
+}
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index d25785b146f5..a2ce05e9cb71 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,3 +1,3 @@
 DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f SHA512 51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7
 EBUILD tomahawk-0.9.0_pre20180501.ebuild 1585 BLAKE2B 35d70ed1b3c8fbe9e96aaa1d3c901a8c41993145142d870577e858970894fce7f9b9cbae5837eff97be334b72975365b02b0c5214e188a7bd96f226e9bfdb086 SHA512 ddbc08c214ab3f17c8dbeea1da2d026f9825257c0020b29089aa0814e2a95f105dac8c29c4aa7d6a8feda5f681f708f4a7f4c93e80534b9f327a9c0469aabed3
-MISC metadata.xml 469 BLAKE2B f1ce874c2e31f6b88d9c91492d08128d7df704724f7db998f1748e2f92c4a02150cbc46eaf9b01c0ebaefc113e30babb34d0759f15d31d5690bf0c65476a54d1 SHA512 1a6df7c09acd55070789d645b4926da6b93095ea9ceea4c593a48140bf86fd0492df908a81350eeaf323478468c7e6814665e0cf6c76dbeb8ba4fddf7efe0986
+MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index 3bc448c2a0a9..602a023a5bef 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 12365f5a0bfe..10fdfe772c35 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,7 +1,7 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 394 BLAKE2B e2b31b58d2f1edb6a490a7244524572cb89062005a47f463c2df857a9a380a541547c65a0de28bc33945f9bb2762390a186adebb5bc36b633af713b54bff3155 SHA512 49dc040957a0af4b6d2b50eb1ee9e41f6b593358a7acd66ee809b06cc775e330757f9952843499f6d1cac6cedcd73b1907a51f31f6721ca9d3fb7719bc496709
-DIST upmpdcli-1.2.15.tar.gz 401551 BLAKE2B 0ec3fd67d67fd039f5b0ac385ad12a78e3c48b0d2530690eb9aaff66bbdbf7ae7229d64cfe753d9e70e75070ee5bc4d0849d11909813f06377981974733134ee SHA512 4a62aced9fa2395752164332c84bf3dedd7b793e7e37638cfe063e887d52b9ce956c866de2aa1cddb7a4dcad97562050f9588aedd59e49e7d427671179f9258a
 DIST upmpdcli-1.2.16.tar.gz 429958 BLAKE2B d484e98ca7774e6d55e42937152efda9bc2127afd6a222575055c48cd7cf5d61f6b578d80a3eca75d7299570cc9d3acc78b1e0c461f4a064528fdb9cb62eee22 SHA512 1fd5b1939f7140f2e54401967308dd155e0f72406188b82e8ccc9178f5feeb0d37cfcd28dd220dd5437d06f49955cc83d70f0bb7c3659452ccb2e73f8846a226
-EBUILD upmpdcli-1.2.15.ebuild 990 BLAKE2B 671d826f638b7013ac40c94208f6349b1e07267677e77da0c4daa5fa8127d91dccda07fd22a0a6a85e174d1b7d53e51af82c6a410b8f2b68f580cecad7caa703 SHA512 451990bcd180fe710d7016d95636d8532ee781ab28f1517fb119f8639d652a01c4386452bc81e037962d77f934c1fe287fe59ef011c69af6aa693dbb7f8b065b
-EBUILD upmpdcli-1.2.16.ebuild 996 BLAKE2B fd1e2c1cc6cf620119b2b727286c566cadb88bd523c9086e73bda8dfc3ed8c12f3306b68f6cd91cd09c4f188721a0b81309554d1ded99e7b2ec3a6d3532e75ab SHA512 e9425f227ff43313f0d16a46ad66d7b42872dc6c886a50888f103169c545295134f73f8493dd2b9c165a8e0c5f4ea5389692723712dddbe290782c5aca175e2e
+DIST upmpdcli-1.3.6.tar.gz 515712 BLAKE2B 6de6a3af2e474a3f8d12865e3cdd420f31955e88a0eb1c8ffd019809666c4c613631d642b34bb5fa473fceb7207613d90584fdf856b6a49899f9c2aa31b2b471 SHA512 280b02116786c86fd5f1e472fa9070b3a6d846acd670e36d476b150d4a3e91e5a6d1546b7053b1f35a2e0de553c8517640934af010d371d3cbed248592be502d
+EBUILD upmpdcli-1.2.16.ebuild 992 BLAKE2B 55ad9cf6e1ad47cd2e2853db83ff192491689771aeba636f5199dad6fcc5d0d157a7fbaa5528eaa36b962219b34859ac631f3144d9632da94d6e07d1b720d76e SHA512 05a5ee2f3670dcd0ea351d1555a8712b59b712a4074da0211383ca46dd8d39b9e9a45f31b59ae230b02289d14581b220f4c5cbebca79d0fa308630c9925e6fb7
+EBUILD upmpdcli-1.3.6.ebuild 1042 BLAKE2B ac46e84fce1f8ffc7326ff257de334e288c17ef07d2f6778a3629b50c95137fc019d2cee829fdf25d0c09202bee3ecb837ff9c69f1478713ecaab344075e0071 SHA512 ba56672d1a1ef71d34bcd4a92df0a69ab11438a784a31faea1447ce766cd08ddb083e76f695bc502ef0338671243e9907f347b45c98dbf3107e87cced0ef033f
 MISC metadata.xml 424 BLAKE2B 255b763f479850aab6630f6b5c27eb84ea66692004c85cfafd9ad08edbfa9fe08d745c49f02bc27b126dc883ffc8c22c1d3a248cc94d163b88e8946bdb0d9362 SHA512 283c31f284c8789a0e74d8df0c5324add6875b3eb48a7dd91cb036102bda21465df2ea76656c5015ef050651765fd1fd80f66351deff9d31a2462d1009579ecc
diff --git a/media-sound/upmpdcli/upmpdcli-1.2.15.ebuild b/media-sound/upmpdcli/upmpdcli-1.2.15.ebuild
deleted file mode 100644
index d62b00ce8541..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.2.15.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
-
-inherit user
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	net-libs/libupnpp
-"
-RDEPEND="
-	${DEPEND}
-	thirdparty? ( dev-python/requests )
-	media-sound/mpd
-"
-
-pkg_setup() {
-	enewuser "${PN}"
-	enewgroup "${PN}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild b/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild
index e7340ec9f9c4..54eaba576366 100644
--- a/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="thirdparty"
 
 DEPEND="
diff --git a/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild b/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
new file mode 100644
index 000000000000..72972052488f
--- /dev/null
+++ b/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+LICENSE="GPL-2"
+
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="thirdparty"
+
+DEPEND="
+	dev-libs/jsoncpp
+	media-libs/libmpdclient
+	net-libs/libmicrohttpd
+	net-libs/libupnpp
+"
+RDEPEND="
+	${DEPEND}
+	thirdparty? ( dev-python/requests )
+	media-sound/mpd[curl]
+"
+
+pkg_setup() {
+	enewuser "${PN}"
+	enewgroup "${PN}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
+	einfo "detects sc2mpd at run-time, capabilities are added"
+	einfo "including internet radio support.  See upstream docs"
+	einfo "for more information."
+}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index dc7356170b3b..f4accf8f1969 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -9,4 +9,4 @@ DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb70
 EBUILD xmms2-0.8_p20161122-r3.ebuild 7519 BLAKE2B ad7093c0b9af101e3f29ad81b6eda1fac3842cbeaf7dd2322704ed8ff2394038c141d72a9bcc6b4ab14ee12d36d2af3e12b8fc9851fdb2ec17bd5bdb5c107c93 SHA512 3fe26a7e0f1542ef9ec787d87d4ff7ee5c6ad19543c66d1a6c31ceae5d921ad5bd48c20b5d7a546aea69a87b1877e0144d1cdee7ac8c06eba96826185f982185
 EBUILD xmms2-0.8_p20161122-r4.ebuild 7577 BLAKE2B 449e5421e5bd4c1febb2403b1fabf53af35ed8c22a06488805fff23fef27b8691cda0cfd2d7b6fe230160929d3549c081581fb736d9fb34b6ebad4c28325959a SHA512 189a0fe53beb27adac0326c3370d147706c3072f933fb0d09d0bc3503555108b2d8acd8f2046902b59e20a3078c19262632241722bd2e9f1028b42b188941eb6
 EBUILD xmms2-0.8_p20161122.ebuild 7389 BLAKE2B bb82ad9ed821fefab30cb8a3f9a4b77e50ec6cc219b297506e8e2fbe8aba2b347c1da0a1b675d072b8bd97263dd03c47bcb8589daddeea8e3d0e7a85020c44c2 SHA512 2c09816bf4c22b89e885b4c6c64f0bbf42729eba0f77834451d9fc943057aba9a15f0362b81458192d21c48e61918f689d7f9b0fd7dea22e416b96598caa293d
-MISC metadata.xml 2619 BLAKE2B db882bae1912243670ae3f8a075704ac0398f50a66f0ce990b4283b26b0c99846ea4d491375d9d920b320bb49da9ced1209bcfc86dd341f1e4cbc0a3649bd38d SHA512 f4477bdfc7575b104a7852dfcc789178631c0f0b470a968af7b763c8b7d70ab6cea8a4ff739b3b9adea280838cc5d8cb773337d899b20ecc0797a9d16ef38e97
+MISC metadata.xml 2560 BLAKE2B 267abaaa9bf07aa218ef3d2613c4ff94c183f84f5caf2525a1d902dbdecebc724e94bdf84f09bd820cec2579bb293478777459b2a0d801e560f853270746d576 SHA512 f92c04cad82b65f335aa44d0890f133df1f1bbdba97592f1c69bb90e9fa2a8d8827029ff10998cb4fb8ab936dc1f2c9a7402b6259e5000e2644467e89b23b26e
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 551b4bd98e80..a19d3fb9caf9 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -38,7 +38,6 @@
 		<flag name="ices">Icecast source output plugin</flag>
 		<flag name="mac">Support for Monkey's Audio (APE) format with help of <pkg>media-sound/mac</pkg></flag>
 		<flag name="ofa">Support for Open Fingerprint Architecture (OFA)</flag>
-		<flag name="opus">Enable Opus audio codec support</flag>
 		<flag name="phonehome">This client sends anonymous usage-statistics to the xmms2</flag>
 		<flag name="server">Build xmms2 player daemon (otherwise only clients are built)</flag>
 		<flag name="sid">Support for C64 SID</flag>
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index f30584d26582..268acd69b9c9 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 8b92756089b2..1d6bb59f0554 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -9,8 +9,6 @@ DIST ffmpeg-kodi-3.1.6-Krypton.tar.gz 11170735 BLAKE2B b78a1825ea9a85a91bd9244f9
 DIST ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz 12417851 BLAKE2B 5275ca29c926c42f0597d9cc4847d597aca0c1ca3efbf3f64d97bde8040386187fbeab5a482179af85977aa72bfd495aa4ea40a34264e2cf29ace3f281da85ca SHA512 f22dd1bb177c218ed049697f3483bfa19a88d36e99d9bdb6ae423c7ea3b9e8fc6e21827c17109bf4b6e7edee1016c3a24168ac2282da19c91a0f07c6c0af9d55
 DIST kodi-17.3-generated-addons.tar.xz 57548 BLAKE2B 794c20a2e494d02ee21260080ea4363953a44f424113ef92aaa2aa6e55a1ce51ce9fb84dee4acd10a3bf18af53c22e198a785ddcaf900f31f79b3a272bec08e9 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a
 DIST kodi-17.3.tar.gz 58466114 BLAKE2B 5f72f264c139a618802a735f93ecf78ad56bc2b021a8b2e060c32f777fee7ef405544a46cde61951fbfbf886b7f6c93b8b0df53731ec044f23b871f1777cb561 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987
-DIST kodi-17.5-generated-addons.tar.xz 57556 BLAKE2B d162146b5888a5731d4aaf05d45a45fc10fd4e077dde4d18e6a11bf2d5cff64d8b8ba0871da9b15a854f4e1807b0c4db44c4a83976e9240d77d174778cb49ae4 SHA512 c0458c9086ae3df7eb6a17ac9bfe33f1d2b4d9897bdb5831af8bbb01d927263e99ab1dd0f7eb7795dac04d757d04a8ad2346c8b29bfe1faf95b84218792bcb8e
-DIST kodi-17.5.tar.gz 58292301 BLAKE2B a57838754a4fb73ad439dbb8b82284b530ee91790bd8c1e33b8c1ef074b63d6968ce50025e5a4a395acb4739f8ef430c93f3162844ca39f24e17ed61e4ef9cdb SHA512 e47f8a53ccee675031dfb816ffbe338dd2e94c22c944b814f332c1abdab16182304474c6b0d5cd7ad7eb9bc0500de6f5fc97b965dc5828635b58a6c596f82736
 DIST kodi-17.6-generated-addons.tar.xz 57564 BLAKE2B 9b3000ac23a6aab24b703a2b66016dbf0637ff3d615b89435cba3717acb913a4543bb57aaa9ae59a9493891ba62af06414ef2c0cea3a81e9ec32ea60e209330d SHA512 ee1344e859b2871f9dd3e2f2f75f9c0f9f787ac111a6b9ab8f80af6524a786d51baeb4f247a8c5b35001073be49bf4289d1c63e3114625143f3747aa9b1f4be2
 DIST kodi-17.6.tar.gz 58275293 BLAKE2B 538675b7a3400d9182f957da9bbf609ce5ece502c3a7f4a32e26c802bae9795979554204148e06d1923d8e68ba1f06f9d92bf11416f73cf9431381642ca00639 SHA512 1f1ba91e6129ab423f9ad47b63d7bb75775dbf18638a96413a572aaa790f4f0d738ca35486513e158a7f55d501f78f08dd9d68aabe2fbb80a729c6091b264111
 DIST libdvdcss-1.4.1-Leia-Alpha-1.tar.gz 100997 BLAKE2B 2baee62df94c98573a224b97d871f2f7de0fc01a283ceab1a5e9763df6481bc58725d3d3276d6d8ed3c928b220c85fad06b9bb03199022859d51da59c635a4a9 SHA512 e3d3fa59baa0b23121f5a0cd85fa765b0db48fa89d7874a164b37f0be6d52622f2ac76cc1831fcad683fec8e71b47700d2c46cf6a65ab1ccd75e9d1bc509771f
@@ -20,12 +18,8 @@ DIST libdvdnav-6.0.0-Leia-Alpha-1.tar.gz 138014 BLAKE2B dea8723c271fcc58ae61f9eb
 DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 BLAKE2B 37521d50f9983290df5209db417e39ea4f3dcf5c36eafe9f75a8c23689c7302c29c4197e40eebb0f1b35cd16e5264e251a72548a0ce2ec2ba1a3a22c1768adaf SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2
 DIST libdvdread-6.0.0-Leia-Alpha-1.tar.gz 130629 BLAKE2B e7f5c08ed1aca3d35fad178d57b852587196bd250865a47ee7e9e60bca1f21967503e13dd947086a7be357bfceec55982600525c4927dadda72e21f2bf0632b0 SHA512 4fa4c7d6856713ccd10a022e699bb13dacab8682eceb8f0d30ec9266646e493f667000d36246b91330e68f1c59ce5c7cb26c531a123ce4f847678cef9bf32ea9
 EBUILD kodi-17.3-r1.ebuild 8570 BLAKE2B 386a04c9273f1a46e25486ff2ca5b5ac0f5b69e41159a3cfe3dd27c6267ebdc4330954bc76c3ff1f9ab8f85f762e771a3c35bc12d24cb602b02a11cac65ba89e SHA512 7288a31c582db5a7489303c454f5574095a95a1e917d498c6ddd016a48178062e23a67cbfd3b4c3fd339c4337600fce7d3cab2a71fe26550d95cf334f674fe62
-EBUILD kodi-17.5-r1.ebuild 8823 BLAKE2B 7c5a2dd1d57c518bd9e93937e2d5778c102434e0a50128bd2c73fdde6b26d7dc21ba7ba5d7151d79dcf7d9ddcc934abc4b5b9d349433a93ca7a6bdcdc159a15b SHA512 8927a1cc8cba7a34691e14140f7708b70ce1763ffea2ebb27b234b7a943ca8da4b9c4ce3a49cc3a511ac93dbab426b52ad65e9d154beda5bf417d5e6d14e6492
-EBUILD kodi-17.6-r1.ebuild 8734 BLAKE2B 640f2257ce9bee2726d75702598c36d965c6c2380f071bf6918dd55845cacb49ad2db8420a78aced76824317b7fdd8cb266510f77b58c5119055c8406eb6957b SHA512 9c556605d0a9874af18d49e39b98a81ddd254451082dde46a5c7b016ffdf2a4a108ee3ed12a7cb2007d034e2ab8672b56292a1a3b1bae43853f0678e75a55ca7
-EBUILD kodi-17.6-r2.ebuild 8736 BLAKE2B 9d58805c53f24395dcd3cec32931c6ba8953045a91ffe3aaadcd351bef82923ddc1e99b3bc360cd3584cee8ee7dba085b4a97aaf615ecc999e236fe0f693b09e SHA512 2d6c6892e6859baa8ae6e8a7343cfd5717443816a2b76c03538341d87031a3358c434717f7f082c4067373ae950b0a1c7bef03bd79b7339622f20471d0f79feb
-EBUILD kodi-17.6-r3.ebuild 8610 BLAKE2B 1461298593e5f3aca4328828e55bea0e16cd0d314131c88c2327af2f48624db907634fd6ec03563b2021b47c03baaf384e2d9558c97e6665527bb44c48043bc6 SHA512 aedf2163ba4a5896e8314a73b46806510bd18e54782a0310033c23ba105d79f6caec1819ec83006d172090750f1685c714abf0df3aaad4d203f2650c0a7a4156
-EBUILD kodi-17.6-r4.ebuild 8658 BLAKE2B 230910b651bc4ec17bec30ea530eeab087aea23633a8ba115fea186c6c3a448f54eb898baa0512f296ad494a3d11f7e2da0dec8c44a560890cc1854c3c86984d SHA512 69c4924b6991e204e716786cbacf2948c78d715c5802d250d236bbbe34d20eb81d73394e17b1c96d7f33ef52d57275cb638ec7b51ece021b63cf1f02a478605e
-EBUILD kodi-17.6-r5.ebuild 8740 BLAKE2B 4b0a42c0ae63abac42f0e4286c2c363eba1b6f5ccac59f2821a159b735720a11421d57a9d9d3ab9ff015cb19891bda082e36ac48bea788e20a9a126f47d882b0 SHA512 3759c7b3003d848f694cff0b78865199ed0ff6e0e4c80f2d447cebf0f12a17835317999fb82b3e606271d5e7b3286e4e5ae34b0694a379fe95e9ec008f5f33b3
-EBUILD kodi-17.6.ebuild 8738 BLAKE2B 35b8117269f705aede33731fbe580ff4865bdc9223b799e4fb811e57d1f72c64c56859de1c53fc0c5e37126eefef626ee15fa0249f7cf0a19f2129dcfd9a1c72 SHA512 9e15a66af649919c94949e4fbc7d8c310dbc7832de83874d0f014dd0d598cca78445f9401ab1e58f5a55924fc119257ef44c1143525433b7bad23fd48c8b8bf0
-EBUILD kodi-9999.ebuild 8952 BLAKE2B e0dda8bfd123998b5e5ed38b17714712ed374603af87e4ebbf6e95a1fb42e869cccad47fbbc7c01e975b274d956bd4847fb0bb59b2d7ecc9fca5c91edac7a36b SHA512 a797e78a1e8af587be94182fa5e7765ebba9b814bd03948af9b0717959818d2d08c9a2801658a80774fbef6817e24223dbbd1a883f729aa6ccc1867ed12b7966
+EBUILD kodi-17.6-r6.ebuild 8772 BLAKE2B 8f8771eeea3c218b67d7635198f863abe5e7ba8944a7c91dcf25c91896384cf6bd9444c2fd3372e8b4f59406ad824f0756a359607592b9b8bfdb92cb73bd930d SHA512 3191d2243ba596b742e63f81688cb93da8aba2c5d5de3d4afd615084610146e8747cdf0599484f708da85094832858a277151e7f9e8a0f447077307269bed913
+EBUILD kodi-17.6-r7.ebuild 8855 BLAKE2B fee87c48f742bfe531f815521b8427acf78c214a67ee0d4b74271d70bad032b544537397bf93dc3a3dc038737fc792370e0f934e66fea9632b0d6df882b1a99d SHA512 c92db2ae7565fd536365fdfed1c64f9a4ecfcdad9a5cfde05e0b9682355172c4fade5e425a52671aaa12a491547a5fb33631fecab17c940d8c694905629eb843
+EBUILD kodi-17.6.ebuild 8760 BLAKE2B f9103fc6c39d3c0bde68bc6a5299ea05cdde028e7d648f0f478eed4ba7b0d803c3b9bb569c60d9beadf2d97da28840bf4009f70bd3e1e05219d667220fbddea6 SHA512 9cd7660957f0955b720c898622aeefa1722e8c9764421b69cd1cf39123a50085ad666cc5a2707ba8a8f1012a761b19093e6fcc601df460831bc1881893daa6ba
+EBUILD kodi-9999.ebuild 8976 BLAKE2B 13eec3c4a15bdbfeeb193e06830439b981b09d66f2ea78da5e1a1ed24a7a08127cb1c7407b9b097c7a65f39270b09c47aaf79ba338aaef99f2ff66770aab4cce SHA512 09af5cb89e92ffdca854737a44f8041db802e4db771d455038d9ce5f0faeefffb856770e16b73cb59769e20688460ff0133ca3bc1195d1d1670578bb1f674f93
 MISC metadata.xml 1766 BLAKE2B 53c734014a9d366496190b89c31c2988751ab9bb0065b4c98e2e0162a5e2a0431c8e1bc0ef944b74403492e463e879bf0c68c7efad485a60549a2051cffd6aee SHA512 389444c93cd6e15a1773663db5705bc7658e957435ede722f5e3bd6ef2ea9f761ff352e2e06f1baeff21e66bcb63203cb4a5ad47c0544a0577dbaf734d4a1ba8
diff --git a/media-tv/kodi/kodi-17.5-r1.ebuild b/media-tv/kodi/kodi-17.5-r1.ebuild
deleted file mode 100644
index 8400b28a6b0a..000000000000
--- a/media-tv/kodi/kodi-17.5-r1.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
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-network-test-fix.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	gles? ( X )
-	opengl? ( X )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	media-fonts/corefonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	cmake-utils_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/project/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all
-	use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r1.ebuild b/media-tv/kodi/kodi-17.6-r1.ebuild
deleted file mode 100644
index dab7d309d12d..000000000000
--- a/media-tv/kodi/kodi-17.6-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	gles? ( X )
-	opengl? ( X )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	cmake-utils_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/project/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all
-	use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r2.ebuild b/media-tv/kodi/kodi-17.6-r2.ebuild
deleted file mode 100644
index 9087370b60d4..000000000000
--- a/media-tv/kodi/kodi-17.6-r2.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	gles? ( X )
-	opengl? ( X )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	cmake-utils_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/project/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all
-	use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r3.ebuild b/media-tv/kodi/kodi-17.6-r3.ebuild
deleted file mode 100644
index 985b147ad57b..000000000000
--- a/media-tv/kodi/kodi-17.6-r3.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	cmake-utils_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/project/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=ON
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all
-	use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r4.ebuild b/media-tv/kodi/kodi-17.6-r4.ebuild
deleted file mode 100644
index 951c52ca3e96..000000000000
--- a/media-tv/kodi/kodi-17.6-r4.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-nmblookup.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	cmake-utils_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/project/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=ON
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all
-	use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r5.ebuild b/media-tv/kodi/kodi-17.6-r5.ebuild
deleted file mode 100644
index f30a7cb6c054..000000000000
--- a/media-tv/kodi/kodi-17.6-r5.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-nmblookup.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? (
-		!mariadb? ( dev-db/mysql-connector-c:= )
-		mariadb? ( dev-db/mariadb-connector-c:= )
-	)
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	cmake-utils_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/project/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=ON
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all
-	use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r6.ebuild b/media-tv/kodi/kodi-17.6-r6.ebuild
new file mode 100644
index 000000000000..6b505c1116f3
--- /dev/null
+++ b/media-tv/kodi/kodi-17.6-r6.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.11"
+FFMPEG_KODI_VERSION="17.5"
+CODENAME="Krypton"
+PATCHES=(
+	"${FILESDIR}/${P}-nmblookup.patch"
+)
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	?? ( mariadb mysql )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		app-pda/libplist
+		net-libs/shairplay
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-0.7.0 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/fribidi
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	>=dev-libs/yajl-2
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-libs/libcdio
+	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	>=media-fonts/noto-20160531
+	media-fonts/roboto
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
+		<media-video/ffmpeg-3.4
+	)
+	mysql? (
+		!mariadb? ( dev-db/mysql-connector-c:= )
+		mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] )
+	)
+	>=net-misc/curl-7.51.0
+	nfs? ( net-fs/libnfs:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	sftp? ( net-libs/libssh[sftp] )
+	sys-libs/zlib
+	udev? ( virtual/udev )
+	vaapi? ( x11-libs/libva:=[opengl] )
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? (
+		|| ( app-misc/lirc app-misc/inputlircd )
+	)
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? (
+		systemd? ( sys-power/upower )
+		!systemd? (
+			|| ( sys-power/upower-pm-utils sys-power/upower )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/xz-utils
+	app-arch/zip
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	# Force java for latest git version to avoid having to hand maintain the
+	# generated addons package.  #488118
+	DEPEND+="
+		virtual/jre
+		"
+	;;
+*)
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE+=" java"
+	DEPEND+="
+		java? ( virtual/jre )
+		"
+
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+	;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if in_iuse java && use !java; then
+		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+	fi
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/project/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_NONFREE=$(usex nonfree)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPENSSL=ON
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SSH=$(usex sftp)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_X11=ON
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	newicon media/icon48x48.png kodi.png
+
+	# Replace bundled fonts with system ones.
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	local f
+	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+		dosym ../../../../fonts/noto/"${f}" \
+			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+	done
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-17.6-r7.ebuild b/media-tv/kodi/kodi-17.6-r7.ebuild
new file mode 100644
index 000000000000..31259159e9df
--- /dev/null
+++ b/media-tv/kodi/kodi-17.6-r7.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.11"
+FFMPEG_KODI_VERSION="17.5"
+CODENAME="Krypton"
+PATCHES=(
+	"${FILESDIR}/${P}-nmblookup.patch"
+)
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	?? ( mariadb mysql )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		app-pda/libplist
+		net-libs/shairplay
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-0.7.0 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/fribidi
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	>=dev-libs/yajl-2
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-libs/libcdio
+	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	>=media-fonts/noto-20160531
+	media-fonts/roboto
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
+		<media-video/ffmpeg-3.4
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] )
+	>=net-misc/curl-7.51.0
+	nfs? ( net-fs/libnfs:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	sftp? ( net-libs/libssh[sftp] )
+	sys-libs/zlib
+	udev? ( virtual/udev )
+	vaapi? ( x11-libs/libva:=[opengl] )
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? (
+		|| ( app-misc/lirc app-misc/inputlircd )
+	)
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? (
+		systemd? ( sys-power/upower )
+		!systemd? (
+			|| ( sys-power/upower-pm-utils sys-power/upower )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/xz-utils
+	app-arch/zip
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	# Force java for latest git version to avoid having to hand maintain the
+	# generated addons package.  #488118
+	DEPEND+="
+		virtual/jre
+		"
+	;;
+*)
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE+=" java"
+	DEPEND+="
+		java? ( virtual/jre )
+		"
+
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+	;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if in_iuse java && use !java; then
+		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+	fi
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/project/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_NONFREE=$(usex nonfree)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPENSSL=ON
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SSH=$(usex sftp)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_X11=ON
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+	)
+
+	if use mysql || use mariadb ; then
+		mycmakeargs+=( -DENABLE_MYSQLCLIENT="yes" )
+	else
+		mycmakeargs+=( -DENABLE_MYSQLCLIENT="no" )
+	fi
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	newicon media/icon48x48.png kodi.png
+
+	# Replace bundled fonts with system ones.
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	local f
+	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+		dosym ../../../../fonts/noto/"${f}" \
+			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+	done
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-17.6.ebuild b/media-tv/kodi/kodi-17.6.ebuild
index 29aa1545725a..ed06b92fcf63 100644
--- a/media-tv/kodi/kodi-17.6.ebuild
+++ b/media-tv/kodi/kodi-17.6.ebuild
@@ -224,7 +224,7 @@ src_configure() {
 		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRC=$(usex lirc)
 		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_MYSQLCLIENT=$(usex mysql "yes" $(usex mariadb))
 		-DENABLE_NFS=$(usex nfs)
 		-DENABLE_NONFREE=$(usex nonfree)
 		-DENABLE_OPENGLES=$(usex gles)
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 3b98edc8e7e6..ba4213d65c2a 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
 	^^ ( gbm wayland X )
+	?? ( mariadb mysql )
 	udev? ( !libusb )
 	udisks? ( dbus )
 	upower? ( dbus )
@@ -40,7 +41,7 @@ REQUIRED_USE="
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	airplay? (
-		>=app-pda/libplist-2.0.0[python,${PYTHON_USEDEP}]
+		>=app-pda/libplist-2.0.0
 		net-libs/shairplay
 	)
 	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
@@ -77,10 +78,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		libressl? ( media-video/ffmpeg[libressl,-openssl] )
 		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
 	)
-	mysql? (
-		!mariadb? ( dev-db/mysql-connector-c:= )
-		mariadb? ( dev-db/mariadb-connector-c:= )
-	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
 	>=net-misc/curl-7.56.1
 	nfs? ( >=net-fs/libnfs-2.0.0:= )
 	opengl? ( media-libs/glu )
@@ -121,9 +120,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	zeroconf? ( net-dns/avahi[dbus] )
 "
 RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
+	lirc? ( app-misc/lirc )
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:2 )
 	upower? (
@@ -240,6 +237,8 @@ src_configure() {
 		-DENABLE_CAP=$(usex caps)
 		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
 		-DENABLE_MICROHTTPD=$(usex webserver)
 		-DENABLE_MYSQLCLIENT=$(usex mysql)
 		-DENABLE_NFS=$(usex nfs)
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 23de13cb741e..8d78279ba9dc 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -10,5 +10,7 @@ AUX mythtv-29.2-freetype_pkgconfig.patch 973 BLAKE2B 627010fe191eb402b54a0851bb8
 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-0.28.1.tar.gz 104477892 BLAKE2B bdecfc5723ec3495ab6e49c72caaa5c2dc62c75a11ce7524d3fd5cb8daec82b53b415591b6198eab00322bbbcaff2de7d4f1b7a165d449007f4c3742a69d304b SHA512 67a81858cd19b90f519113b234119ecc248366d8545c862d887755f256cddf04d9ca16a7bf67f63e06f7628730e7dbde2a2099ca8aaeb9061b2e55a5a0b7d5e7
+DIST mythtv-29.1.tar.gz 105656634 BLAKE2B 8b9dfc6b1e1178bfd1b35e8d499afe570edeb1f07cefa64fc91c2ed74f8155f5ca00cee49a024848f715c0bb782fc22f3c4d04fd8eac8562d108e105d3a41421 SHA512 c80d84c40c019d093d44487fb4cd07d9ce3174781ff8f24a4709fd10294cb8f6186b3e480dad3a09f7a496835fa0cffcc9eca114f807794b693ffcd57acd4e39
 EBUILD mythtv-0.28.1-r4.ebuild 10250 BLAKE2B dd97bbbdc8881c11287b945940d9bd292db1a304b4337816f92da076b7e0f66c980eea8303f1c6d4cfc29f9528ade59e4428a34fd1f1e8bf59260c8549699807 SHA512 2fe71589d6351bf8d97b2afc421c43811dc822693226d028634457e9509aee748a77a8629d7d39ddc86cd0187a319236035f0dc82f66ae1c570108d11dbd3e0e
+EBUILD mythtv-29.1.ebuild 10160 BLAKE2B 2513a85606e1d54fc34393fa284fa036dd262da0b99883c7fc7eace9417d8f7c55518d94b2654c291d511167b40d2f878ace7968aa9d82b5d896037bfca46bb8 SHA512 cd453ed8c541690f8ef0770cb108d944b96517a7b1ba8473b16cb0c90c8a8014b3b34b914f92895fb4e63cbbb0fd8516d3c39cba16021531398177ecd16f488f
 MISC metadata.xml 2986 BLAKE2B 8bfeb791c20052690820b02f03859a72e1de4ccba6303eee36d05bfee3b04ac204f5dc6ebd24741b39868a0e0b8fcf7875fcfb5aaaf8d855bb06be9a0d03df98 SHA512 a57d539f1f083bb69aaa0e85622862408e5afbc1eb27bfdf13b319b8104909971698ad7f51cc8978b9f5e5e4ab9e9d73b7907c61d65aba7c21867da7bfb36084
diff --git a/media-tv/mythtv/mythtv-29.1.ebuild b/media-tv/mythtv/mythtv-29.1.ebuild
new file mode 100644
index 000000000000..ac2b67ef92b0
--- /dev/null
+++ b/media-tv/mythtv/mythtv-29.1.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+# git diff --relative=mythtv v0.27.6.. > ~/mythtv-0.27.6/patches/mythtv.patch
+BACKPORTS="d8a2db77f5731cf32c6d31127452391c6cf7f91f"
+MY_P=${P%_p*}
+MY_PV=${PV%_p*}
+
+inherit flag-o-matic python-single-r1 qmake-utils user readme.gentoo-r1 systemd vcs-snapshot
+
+MYTHTV_BRANCH="fixes/29"
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="https://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0/${PV}"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE="alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls \
+	ieee1394 jack lcd libass lirc mythlogserver perl pulseaudio python systemd +theora \
+	vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf ${IUSE_INPUT_DEVICES}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluray? ( xml )
+	theora? ( vorbis )
+"
+
+COMMON="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5[mysql]
+	dev-qt/qtopengl:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	media-libs/freetype:2
+	media-libs/taglib
+	>=media-sound/lame-3.93.1
+	sys-libs/zlib
+	virtual/mysql
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXv
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-misc/wmctrl
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	bluray? (
+		dev-libs/libcdio:=
+		media-libs/libbluray:=
+		sys-fs/udisks:2
+	)
+	cec? ( dev-libs/libcec )
+	dvb? (
+		virtual/linuxtv-dvb-headers
+	)
+	dvd? (
+		dev-libs/libcdio:=
+		sys-fs/udisks:2
+	)
+	egl? ( media-libs/mesa[egl] )
+	fftw? ( sci-libs/fftw:3.0= )
+	hls? (
+		<media-libs/libvpx-1.7.0:=
+		>=media-libs/x264-0.0.20111220:=
+	)
+	ieee1394? (
+		>=media-libs/libiec61883-1.0.0
+		>=sys-libs/libavc1394-0.5.3
+		>=sys-libs/libraw1394-1.2.0
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	libass? ( >=media-libs/libass-0.9.11:= )
+	lirc? ( app-misc/lirc )
+	perl? (
+		>=dev-perl/libwww-perl-5
+		dev-perl/DBD-mysql
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		dev-perl/LWP-Protocol-https
+		dev-perl/Net-UPnP
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/lxml
+		dev-python/mysql-python
+		dev-python/urlgrabber
+		dev-python/future
+		dev-python/requests-cache
+	)
+	systemd? ( sys-apps/systemd:= )
+	theora? ( media-libs/libtheora media-libs/libogg )
+	vaapi? ( x11-libs/libva:=[opengl] )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+	zeroconf? (
+		dev-libs/openssl:0=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+RDEPEND="${COMMON}
+	!media-tv/mythtv-bindings
+	!x11-themes/mythtv-themes
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	x11-apps/xinit
+	autostart? (
+		net-dialup/mingetty
+		x11-apps/xset
+		x11-wm/evilwm
+	)
+	dvd? ( media-libs/libdvdcss )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
+"
+DEPEND="${COMMON}
+	dev-lang/yasm
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+S="${WORKDIR}/${PF}/mythtv"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+To have this machine operate as recording host for MythTV,
+mythbackend must be running. Run the following:
+rc-update add mythbackend default
+
+Your recordings folder must be owned 'mythtv'. e.g.
+chown -R mythtv /var/lib/mythtv
+
+Want mythfrontend to start automatically?
+Set USE=autostart. Details can be found at:
+https://dev.gentoo.org/~cardoe/mythtv/autostart.html
+
+Note that the systemd unit now restarts by default and logs
+to journald via the console at the notice verbosity.
+"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	default
+
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/Makefile
+
+	# Fix up the version info since we are using the fixes/${PV} branch
+	echo "SOURCE_VERSION=\"v${MY_PV}\"" > "${S}"/VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
+	echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
+
+	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
+}
+
+src_configure() {
+	local myconf=
+
+	# Setup paths
+	myconf="${myconf} --prefix=${EPREFIX}/usr"
+	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	myconf="${myconf} --libdir-name=$(get_libdir)"
+	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
+
+	# Audio
+	myconf="${myconf} $(use_enable alsa audio-alsa)"
+	myconf="${myconf} $(use_enable jack audio-jack)"
+	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
+
+	use altivec    || myconf="${myconf} --disable-altivec"
+	myconf="${myconf} $(use_enable dvb)"
+	myconf="${myconf} $(use_enable ieee1394 firewire)"
+	myconf="${myconf} $(use_enable lirc)"
+	myconf="${myconf} $(use_enable xvid libxvid)"
+	myconf="${myconf} --dvb-path=/usr/include"
+	myconf="${myconf} --enable-xrandr"
+	myconf="${myconf} --enable-xv"
+	myconf="${myconf} --enable-x11"
+	myconf="${myconf} --enable-nonfree"
+	use cec || myconf="${myconf} --disable-libcec"
+	use zeroconf || myconf="${myconf} --disable-libdns-sd"
+	myconf="${myconf} $(use_enable theora libtheora)"
+	myconf="${myconf} $(use_enable vorbis libvorbis)"
+
+	if use hls; then
+		myconf="${myconf} --enable-libx264"
+		myconf="${myconf} --enable-libvpx"
+	fi
+
+	myconf="${myconf} $(use_enable libass)"
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --without-bindings=python"
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --without-bindings=perl"
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	use python && myconf="${myconf} --python=${EPYTHON}"
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+		#myconf="${myconf} --enable-debug" does nothing per sphery
+		myconf="${myconf} --disable-stripping" # FIXME: does not disable for all files, only for some
+	fi
+
+	# Video
+	myconf="${myconf} $(use_enable vdpau)"
+	myconf="${myconf} $(use_enable vaapi)"
+	myconf="${myconf} $(use_enable crystalhd)"
+
+	# Input
+	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
+
+	# Clean up DSO load times and other compiler bits
+	myconf="${myconf} --enable-symbol-visibility"
+	myconf="${myconf} --enable-pic"
+
+	# CPU settings
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host"
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
+		myconf="${myconf} --cross-prefix=${CHOST}-"
+	fi
+
+	# Build boosters
+	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	myconf="${myconf} $(use_enable systemd systemd_notify)"
+	myconf="${myconf} $(use_enable systemd systemd_journal)"
+	use systemd || myconf="${myconf} $(use_enable mythlogserver)"
+
+	chmod +x ./external/FFmpeg/version.sh
+
+	einfo "Running ./configure ${myconf}"
+	./configure \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--qmake=$(qt5_get_bindir)/qmake \
+		${myconf} || die "configure died"
+}
+
+src_install() {
+	emake STRIP="true" INSTALL_ROOT="${D}" install
+	dodoc AUTHORS UPGRADING README
+	readme.gentoo_create_doc
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
+	systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service
+
+	dodoc keys.txt
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${ED}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${ED}"/var/log/mythtv
+	dodir /var/log/mythtv/old
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	# Ensure we don't install scripts needing the perl bindings (bug #516968)
+	use perl || find contrib/ -name '*.pl' -exec rm -f {} \;
+	# Ensure we don't install scripts needing the python bindings (bug #516968)
+	use python || find contrib/ -name '*.py' -exec rm -f {} \;
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	if use wrapper; then
+		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+	fi
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+		if [[ ! "${file##*/}" = "__init__.py" ]]; then
+			chmod a+x "${file}"
+		fi
+	done
+
+	# Ensure that Python scripts are executed by Python 2
+	python_fix_shebang "${ED}/usr/share/mythtv"
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
+	done
+
+	# Remove empty dir
+	rmdir "${ED}"/var/log/mythtv/old
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+pkg_info() {
+	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
+		"${EROOT}"/usr/bin/mythfrontend --version
+	fi
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+}
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 005b67db041a..f794e2479f9b 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -9,4 +9,4 @@ AUX tvheadend.service 577 BLAKE2B f6762aef0f9370a7ad1e438aa4b35c500c40240bd7d66d
 DIST tvheadend-4.2.6.tar.gz 21528720 BLAKE2B 358373bc19bd4c27ddb597bb14e29e2f451d4a1efd075f40c0324d692b5fdcac0d23f2f626ba9d0ca235f7d0c91930c5bf2438d0b6537af187a9fb3fcf36c419 SHA512 6291b0ba1d9af11d5295bf6804988835e746db2d3ebbd465a22e293a1108225c8c361762b78213c881cd15d7dedd16092f28a97c9e5b38f44920848bfbaf9709
 EBUILD tvheadend-4.2.6.ebuild 3056 BLAKE2B 8fe71e0d2e181038928e5ee51dc530874233d7b61bce63b1832e9357e10cfbfee189d21aefcf8e5eb80a2a5bc27409b83918ba41abc218cb121f6426c48a4b7c SHA512 f878fcb7c437076329d1e2e6184da4c1c21facd7cd3786c22040bab026ed3b31f68ec950d21767c661bfa0efab808202cf7162925aa9bbbd62c0a6924e8a0416
 EBUILD tvheadend-9999.ebuild 3715 BLAKE2B a7477dd7c4417416bd96da0c8662f5c2e719a731beecf2f22341248b0e04e98a8da232a12813af0cc41b1c70326d09d849d7f265dde1dfc631a237484ae66d7e SHA512 fc8659aac79ca96cfe6a582a391e6cff5e1aed8627f05993e7b83385cfae744fcb6d9d6d281c2dab9be013ebf56f19078f22a74b7bac4b0349ad5494eba3a70c
-MISC metadata.xml 1517 BLAKE2B 2024621f2f5dd3eba2f33618a80c8d826163ec917975bd5045e3943c0c79b61b6e03c9870cb0fa89532c23a5017fe1480c2bf3602d5f1d98af2253a21da3fcbb SHA512 ad6ad89c261d482f78b45037777fec796c62dfaff2e76d99c9f7c983989cab56c6671a99b38aa77fadbcf5cdeff96c38a1ed666fbc12b1b4660a85db965039d2
+MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 38bdd61b7f9d..d995e88d8e83 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
 		<flag name="imagecache">Enable support for image caching</flag>
 		<flag name="iptv">Enable support for Internet Protocol TV</flag>
-		<flag name="opus">Enable transcoding with the Opus audio codec</flag>
 		<flag name="satip">Enable support for IP-based Satellite TV</flag>
 		<flag name="timeshift">Enable TimeShift support</flag>
 		<flag name="uriparser">Use <pkg>dev-libs/uriparser</pkg></flag>
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b5205b42cf48..33f5e838e748 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index cdfbabca381b..60e9b6fd9091 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,6 +1,6 @@
 AUX bino.html 658 BLAKE2B 9eab6fd2e14b72928ce0c73c21a61ac26981bb23df9eaf3f89132729debc32a10fa0d703c5f3340aa758d741aa1ac733df3718e5577148609f1ae1e1e5c4e47f SHA512 c4861b4536ebc08fd9a68a9b8d420b323eb16ab057b74a83fd56c5c4e0c1f7c4fc7665a0933eabf58e5eca7c38206597e7b6ddb99722054804a64821950f23be
 DIST bino-1.6.6.tar.xz 822680 BLAKE2B c863e16a4f576bffb3abf3ab03d8e4cd4ab9db0b0cc73ef2c255b18f103294a9f7e2bf382b286bb7d1d3cb9278c06965772cfc6241a7f23d2f4edc0a47059d92 SHA512 43a17f390881fcc8b7721b21ff8524b89992cd7fb0cfc467769bdddd0ad0c0d2536d161475a7fce6d4d3e758e017a38f671648dfaa4a345dc02127b7b192c8c0
 DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
-EBUILD bino-1.6.6.ebuild 1507 BLAKE2B 55990360ab9bcd21f57d631a88c1ebc82cc98fcfd652d17457e55d29dfe06d92817815babe040b689e44035493f196dafdf32c0ed3ca3dffa8b741b7f9a29b1a SHA512 fca8b2961701fbcf1df421cf0f0e65a3cb78dac56d06aea66fdd1f2a961babf6808aee68839ca12f4370afce7cdd89bda101597c9495e099d332c85daf4980a4
+EBUILD bino-1.6.6.ebuild 1469 BLAKE2B 5a37eb68909219a37374989cacde4a7f58925de73c0df6a2985c85fb90913886a409bc5a329990ee9f7c546162e57cb83af0707c3aca8aa60968aed191bb030c SHA512 e5c3a4f551e2e8ef4c94b6c2dc295bc92bcaedd5ed5dd92e51848ea0dd9ea3df5185098a5b3aaba9d3408ef6b0bca05f4216d52ee86b57fcafc5a41a0131ee39
 EBUILD bino-1.6.7.ebuild 1573 BLAKE2B 5fce8361923e30065c970f78f1cbf2c053bba6c84be45f633279373869f9dd40425e8238fc001d61421ccf4d0a3e8ced8f9845800d711fef49021555d5b700ce SHA512 2bd2c283a7983c374263e25b6f46003b3218bdbeb1bc8d26786955c10af6a41587664ccc57cce047a873c55b0412b0b5431d06059f89dcde716a674c791236a7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-video/bino/bino-1.6.6.ebuild b/media-video/bino/bino-1.6.6.ebuild
index e7bb97ed4b2a..b082c236f107 100644
--- a/media-video/bino/bino-1.6.6.ebuild
+++ b/media-video/bino/bino-1.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
 	libav? ( >=media-video/libav-0.7:0= )
 	!libav? ( >=media-video/ffmpeg-0.7:0= )
 	lirc? ( app-misc/lirc )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	virtual/libintl
 "
 DEPEND="${RDEPEND}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 2bd8d7a99abe..7bdc2967c506 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -18,4 +18,4 @@ EBUILD ffmpeg-3.3.8.ebuild 15952 BLAKE2B cb001262d47db1677277959baf4c3f272bdfa1b
 EBUILD ffmpeg-3.4.4.ebuild 15622 BLAKE2B 7daf35a4c6d2ae51a03c9b2c7b7866de02cb6c730387b7725d47994a64807995ebe86fde4673f15d703a09998f4412bac6f3edaaa1bccd297102a1cdd6f50119 SHA512 b5210dda0b6593d2f3317bc6919fa6b91b809e34f4e0f951cfdd0290450837bf77bc89cdc291c9047d77d02d1a13eaabbca6c9d4fd601672379d994e0a5a0664
 EBUILD ffmpeg-4.0.2.ebuild 16472 BLAKE2B fe2c7dc060bad7b5eba2037089b8d3df8e62ce4d4bbf1adeafdc11587e1af4997b16bd79be88eec956ba198a2b739cc0c7dfb881c7cc3d8e61380f416b2b27e1 SHA512 a0bb187d96f6c00b51962a500f91ba1017f6205030971cd968159d0b910314c72e0b259822c6d3fdacdc73d053557322c9551f2da1868f526faebecbbe9aa1fa
 EBUILD ffmpeg-9999.ebuild 16485 BLAKE2B 327840f56de6b23f32c887f8898c69369082486676ed368a66ebeac9e844f4fba4a0201e61cfa0be36a4693e605ae8c4ad500c38e054395225a99a8fb30dea41 SHA512 cd6fee7e89c5f7e29b2837f9f44a12ca3d0aa145f5e3d966242f5bdda3bdae224e010b7d37179dd78765e61dbd0e908f878c7d8d5190985ffdcfbd2c15d37141
-MISC metadata.xml 6059 BLAKE2B c3bd41f2496c42f3f426f9a06e1ed860f8bf7853b17a1854e5e6211a68ec96bc00aeb239f230c1ff10ae65bf2a2fcb7824dccb8836ab7a3b642ac9208b5bb822 SHA512 43469f265ca75b7ad487bc8b54e47fe632e21af8ec331ff87b0423c534c27b3adcdc92ffd98ea08a24ed3f22584c37b2965977ff600166c1700866841293de85
+MISC metadata.xml 5843 BLAKE2B ac661ce6328d1f2aa3f29ca8a0f80822fc9b70a7dda1b2c05986b344e3acbcdf56226e2be982b1c918f4555a9efc3aecdd63de0fe818d9f06098e98acbe2d5b0 SHA512 d4703383f6877460c3174885fe24109ce09d4a21f260277fcd10f3c69a0e77814594a60bb9271dbc643b78be8b2373a556f0c4844b321cd770430a5522ff6c41
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 24bfa8b7c4ab..8f681d0353b5 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -15,7 +15,7 @@
 	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
 	<flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag>
 	<flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
-	<flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
+	<flag name="celt">Adds Xiph CELT audio decoding support</flag>
 	<flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag>
 	<flag name="chromium">Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi.</flag>
 	<flag name="codec2">Enables codec2 low bit rate speech codec support via <pkg>media-libs/codec2</pkg>.</flag>
@@ -47,7 +47,6 @@
 	<flag name="opencl">Enable OpenCL support</flag>
 	<flag name="openh264">Enables H.264 encoding suppoprt via <pkg>media-libs/openh264</pkg>.</flag>
 	<flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
-	<flag name="opus">Adds (decoding) support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
 	<flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
 	<flag name="postproc">Build and install libpostproc.</flag>
 	<flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag>
@@ -57,7 +56,6 @@
 	<flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
 	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
 	<flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
-	<flag name="webp">Enables WebP encoding with <pkg>media-libs/libwebp</pkg>.</flag>
 	<flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
 	<flag name="zeromq">Enables <pkg>net-libs/zeromq</pkg> support with the zmq/azmq filters.</flag>
 	<flag name="zimg">Enables <pkg>media-libs/zimg</pkg> based scale filter.</flag>
diff --git a/media-video/get_flash_videos/Manifest b/media-video/get_flash_videos/Manifest
index 5bfb2414c0b6..3c4e7b4a940b 100644
--- a/media-video/get_flash_videos/Manifest
+++ b/media-video/get_flash_videos/Manifest
@@ -1,5 +1,6 @@
 AUX get_flash_videos-youtubefix.patch 3543 BLAKE2B c38d9de9c4b250cfe7f74648f01ea66974f7f7e3892ee4ab883a7bacad1a621c08dcf4bdd6f408cf6ece5b3660a897751ee15abb58849c125eda264bd0717d1c SHA512 d196f90384ee745e16577b12e74694d439a1e6fc44a4b3803e6872beb77b9f21a4b6b45a4775314056499c0bd2e92c363044f8399e6b51e38f351408f370b223
 DIST get_flash_videos-1.24.tar.gz 86380 BLAKE2B 6a391a3e9c31cbedb76dc0846a601af6c0ad730e1b81bcadab1d1efca80fb87c1bbd0310da962076fd5d166e2d776a77edcfa8ee1076fddf508518bcdd7053f2 SHA512 b966adc381ddf096f9f57ddd3ce0a9a155b3850f345b0624f11b4c553036f1e8881cf7c70e4f789741a43263325e35653f005731563702b6d7a594530558fc48
+DIST get_flash_videos-1.25.94.tar.gz 136922 BLAKE2B c353fd5396a6dcd0a759538d16d8237a1f137308d2cc2bbacdd78f6adfc7542b9603d0b63f7d94203dda2611d4972d8d8699aa64863175d7c8cbb148a622c9d3 SHA512 f7ec42e763aa83d8aaa5ac0481785ef6197f0f34ff3b3b2209e63767eb8116d5fb75f85732fa37c7e56729bc83b7d4d57dcf5cab954d9f439d21ad00badbdacf
 EBUILD get_flash_videos-1.24-r1.ebuild 1389 BLAKE2B 69b36b61d3e72d2b72b425c58c33be78f8d2ca683805c46481b13c489f5cf9b7673b8e44e0a63dfa359416903cdb3e1b82ec9b067f833806b9eb8e79c430be94 SHA512 ca7b80562e51a50c1a352dac432e5d31a8ceecd03cb83b063378ffb4e1a42daeeb82c34bf687c3cacf7b45860add90007059440ee85dd394dd46f5cb8bff4c0f
-EBUILD get_flash_videos-9999.ebuild 1206 BLAKE2B 18a94e201b23cd345c95840ab4052aef8d481d67fee16d0081605794b8b3eddbf6978ee6e7fbcb4b44ed94a866ac8b279164dd2127edbe2e23ab50fcb649696b SHA512 273f691e704638784af6211459beb5f6e519798c3bbadb6998856fe9e981c346b55b1f8bfce9c18183992f66105ea804410d774ddbe50fae69deda04345bf57d
+EBUILD get_flash_videos-1.25.94.ebuild 1343 BLAKE2B c5b647c5b5c1732282461dabc2d280c19c3404383dd410ae47083c18a505fb497906469f5fe85b1e55a022cf652118e7d4d58bce34766b5a5332d1306d2d8679 SHA512 09b2988a3121ef57e6b28d816ab76d47fde7c5883a2973725cbcf0cf222e8475599c10a1da1387951a3224e4f3e12fbc8c1f8fc445b01014fc7deba6bf2ed456
 MISC metadata.xml 253 BLAKE2B 1696360d1dba7af5b1aabccbdd970b59ee70e7f37cdef78f1e9764d5b878c0ae2af2fed0b135b1a4063dc5035c35aeb15e460a6f403d3f86e0453dc45b7a1ff6 SHA512 b88fd545b0e2a472966a72c4a20687b8c1085f10d38fe348747eb551f801b3e89d6ec61a6d576ac05cd9b50eedaa4ba1fa540a4a3452cfb87a82ac2675b64571
diff --git a/media-video/get_flash_videos/get_flash_videos-1.25.94.ebuild b/media-video/get_flash_videos/get_flash_videos-1.25.94.ebuild
new file mode 100644
index 000000000000..06f54954848e
--- /dev/null
+++ b/media-video/get_flash_videos/get_flash_videos-1.25.94.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit perl-module readme.gentoo-r1
+
+DESCRIPTION="Downloads videos from various Flash-based video hosting sites"
+HOMEPAGE="https://github.com/monsieurvideo/get-flash-videos"
+SRC_URI="https://github.com/monsieurvideo/get-flash-videos/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+#RESTRICT="test" # Fail to work for a long time, bug #407381
+
+RDEPEND="
+	dev-perl/HTML-TokeParser-Simple
+	dev-perl/Module-Find
+	dev-perl/Term-ProgressBar
+	dev-perl/WWW-Mechanize
+	virtual/perl-Module-CoreList
+"
+DEPEND="${RDEPEND}
+	dev-perl/UNIVERSAL-require
+	test? ( media-video/rtmpdump
+		dev-perl/Tie-IxHash
+		dev-perl/XML-Simple
+		dev-perl/Crypt-Rijndael
+		dev-perl/Data-AMF
+		virtual/perl-IO-Compress )
+"
+
+S="${WORKDIR}/${P//_/-}"
+
+SRC_TEST="do"
+myinst="DESTDIR=${D}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Downloading videos from RTMP server requires the following packages:
+- media-video/rtmpdump
+- dev-perl/Tie-IxHash
+Other optional dependencies:
+- dev-perl/XML-Simple
+- dev-perl/Crypt-Rijndael
+- dev-perl/Data-AMF
+- virtual/perl-IO-Compress"
+
+src_install() {
+	perl-module_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-video/get_flash_videos/get_flash_videos-9999.ebuild b/media-video/get_flash_videos/get_flash_videos-9999.ebuild
deleted file mode 100644
index b5d0b1057ebf..000000000000
--- a/media-video/get_flash_videos/get_flash_videos-9999.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 eutils perl-module git-2
-
-MY_PN="App-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Downloads videos from various Flash-based video hosting sites"
-HOMEPAGE="https://github.com/monsieurvideo/get-flash-videos"
-EGIT_REPO_URI="https://github.com/monsieurvideo/get-flash-videos.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-
-RDEPEND="dev-perl/WWW-Mechanize
-	virtual/perl-Module-CoreList
-	dev-perl/HTML-TokeParser-Simple
-	dev-perl/Module-Find"
-DEPEND="${RDEPEND}
-	dev-perl/UNIVERSAL-require
-	test? ( media-video/rtmpdump
-		dev-perl/Tie-IxHash
-		dev-perl/XML-Simple
-		dev-perl/Crypt-Rijndael
-		dev-perl/Data-AMF
-		virtual/perl-IO-Compress )"
-
-SRC_TEST="do"
-
-S="${WORKDIR}/${MY_P}"
-SRC_TEST="do"
-myinst="DESTDIR=${D}"
-
-src_prepare() {
-	perl-module_src_prepare
-}
-
-pkg_postinst() {
-	elog "Downloading videos from RTMP server requires the following packages :"
-	elog "	media-video/rtmpdump"
-	elog "	dev-perl/Tie-IxHash"
-	elog "Others optional dependencies :"
-	elog "	dev-perl/XML-Simple"
-	elog "	dev-perl/Crypt-Rijndael"
-	elog "	dev-perl/Data-AMF"
-	elog "	virtual/perl-IO-Compress"
-}
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 3df5f62d2bc3..8979f27ba014 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -12,8 +12,8 @@ DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c1
 EBUILD libav-11.8.ebuild 11090 BLAKE2B bce6ee5af8fb86a4ca1c760fff386b4e3c7c70f4b8353e2d24162c7da9a42ee742b6a230b3e6b84ef57fb1bd957bb83e2d7c340e669ea2de4f98e46c2af8f319 SHA512 6b50605fe7e2d0f9468fa46e8d7b513db03603622ff69559e4517c1f610ea4be8fb8bceada46ab50694cc9bbbf6c0a5d1d2aa35a20046ffda7a60d4991d74037
 EBUILD libav-11.9999.ebuild 10990 BLAKE2B 2bab5e0b48d1d490d35c991fd74f4629a0de5b5375d7f9955c0d49c4f7a35fd6f1cfcc91b09833d89dc8f4fe01a29b0ab9058887c2ab2a299a957c0a6acfd50d SHA512 d5a1a7ecd91dbf0bad318ec8c5705afff4b12fd956da8e2a06ac7de002dd23e3dd8a86b5e162097901617d52ca0bdafd5ccc09b08fec51dc9b249d2169b58d90
 EBUILD libav-12.2.ebuild 11366 BLAKE2B c1f4de539f14e7f9ec9ff590ae245cfa49af199352e39b7f564a50ffa8e378bc6a573003fc9dfe494e7f4981bcf78c9be7baf02d7f9aa4b8c04bfbbbf8581428 SHA512 f90ff7d2052af3332ee626b1bbf73782ee1f1f8f257f342308a775ce35ca7c4d4a30bc445df2b9e7111b33dde8e2c6d577446a3c1bb7a5a509be68b457d63349
-EBUILD libav-12.3.ebuild 11363 BLAKE2B fa78329f11b0dc38fbdd583a3a2319da58c8e4366425fc524363d6cf19a3e07c7d107dd4da0bedb7bca1cc3450f447362fcf726f38cf92e6fb8d9a5fd3c00145 SHA512 65ab897ceb7a20cafd9f5e9b202195f24a5dbd7a4e87f7822594058fb4b0bfbea3553ebf4b5f8a99d4ea3597ac2664cdbbf803b2e82442234623cf968bee8f79
+EBUILD libav-12.3.ebuild 11360 BLAKE2B f4ca07046e206fbb08c4dc0234c5c62c96eef967907fa414957a5fd0efe9746dfd7dc657411c4d4105e30e2e6923d70cdb7e7f23877f790e9502ce68159e4809 SHA512 1edfdfdd26002d2fe2ef54062c65d04a65480637c0b2b3c41f4761b023bf65aea52b9a80eff820aa55f62b03751be292532586ac554c20709f0492e0e76401e9
 EBUILD libav-13_pre20171219.ebuild 10790 BLAKE2B 5a33e384d54549ec4fad1c082022b9d7187c3e3032461c38a1e237683e6e27b400a7bf23bc220fde169b1b2d7fd59b50620dbc4c4d9d2c8b2df195fbd3d4be05 SHA512 764fbebd1a086913e2a85430732a7b56a369a02a0200f10ed6fd7fef552bf76638df65601f7e2afdbc68987dccd777c403ed2799cca096bf606e382ee2681f54
 EBUILD libav-9.17.ebuild 9976 BLAKE2B 053e88c957d482f172b0ad170ed35712e86758d945df08e666640b28743d8970fc2c481b69c0ed74234a2a66e4e0116573f7e660500365f77e6ca3b41b55007e SHA512 0dba0e1cd904a8cacf6d50e6370983bba1dd85d5495e934d83def260a35a4d28fb14876d36d528dc4b2a34442e0d22b22e69a10b2b7d13506c9f175fad3e980a
-EBUILD libav-9999.ebuild 10849 BLAKE2B 1cccc4d2a8e55b9bc0f14d838689a253d52db1e741fe22f8b00bf2d90ab1460b0598e7c1fe9773ed7650af8d20942601698ae86e465272054ec8f5bb28b22936 SHA512 0c41cc11dd22ab4a7afe412e78e07d693a57dfbc97667a4bbe12eb294406f524d287a226ac7911ed3b6a329bf9a5b1b20d08f96d9cdb614fa947c9ef19f10035
-MISC metadata.xml 2959 BLAKE2B abfe1c0bf88198c05a25a629ae4a65829057428362cc35feb02cc9ea9abf718e6478dd605a0b79fbf40e0a41de109765b08c8adff34b3e06dfc1e77d478de2e4 SHA512 ac43516b324f96eb13b2ae4ab511c1dfffddd47293079b9b297ee3f312e92a0dc88561d55bb8d12e6bd89a8ace62670ad30b723a48708046f987cc65244bc628
+EBUILD libav-9999.ebuild 10931 BLAKE2B bc46348d1336751f1b1fea3c8a294d76664db14c6d59358e7a572f668bc296865e9b162fba33df122322c49e3489d9dc810fa5f798d9fd8f1f7ead4a31bdf9bf SHA512 27d47b0442fc8f8511b14d24419666397492eca2264c02abc7931a4ffac07302056e36900954d1356da4637823745da0b96f91b908ac67c9e12a91579e1739f4
+MISC metadata.xml 2876 BLAKE2B 3dc43cf775798c9055ef8083b8c16d0c7ec4843c70520a906cde49fa834ad2705ce81245a1bcee8074f24787ff36f3793a67d3eced843384da6584d54ce5f714 SHA512 a0b2b4dac62aa9d12268458434bffb752f2dec12cb26d0c1446b1d5d60f383c67270792c54804d5c95502636e1cb1b79e9a5eb3b3caa1354827af76d154dd5cf
diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild
index 610966c54b89..b519bf55f1a4 100644
--- a/media-video/libav/libav-12.3.ebuild
+++ b/media-video/libav/libav-12.3.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit flag-o-matic multilib multilib-minimal toolchain-funcs
 
 if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	: ${EGIT_REPO_URI:="https://git.libav.org/libav.git"}
 	if [[ ${PV%9999} != "" ]] ; then
 		: ${EGIT_BRANCH:="release/${PV%.9999}"}
 	fi
@@ -30,7 +30,7 @@ fi
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0/12"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
 	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
@@ -345,5 +345,5 @@ multilib_src_install_all() {
 multilib_src_test() {
 	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
 	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" make -j1 fate V=1
+	LD_LIBRARY_PATH="${_libs}" emake -j1 fate V=1
 }
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index ca54c7a80c29..dc8296df27e5 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs
 
 if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	: ${EGIT_REPO_URI:="https://git.libav.org/libav.git"}
 	if [[ ${PV%9999} != "" ]] ; then
 		: ${EGIT_BRANCH:="release/${PV%.9999}"}
 	fi
@@ -19,17 +19,15 @@ if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
 elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
 	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
 else # Official release
 	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
 fi
-# 9999 does not have fate-*.tar.xz
-[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0/13"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
-~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-~x64-solaris ~x86-solaris"
+[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
 	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
@@ -143,7 +141,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch_user
+	eapply_user
 
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then
@@ -154,6 +152,9 @@ src_prepare() {
 	use zlib && TOOLS+=( cws2fws )
 
 	MAKEOPTS+=" V=1"
+
+	# needed at leasts for tests in live ebuild
+	multilib_copy_sources
 }
 
 multilib_src_configure() {
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index 222399a18306..dc0e04065222 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -32,7 +32,6 @@
 	<flag name="twolame">Enable MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder</flag>
 	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>
 	<flag name="vpx">Enable vp8 encoding support using <pkg>media-libs/libvpx</pkg>.</flag>
-	<flag name="webp">Enable WebP encoding with <pkg>media-libs/libwebp</pkg>.</flag>
 	<flag name="x265">Enable HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
 </use>
 </pkgmetadata>
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 1af81c4a1dc6..6bdd74c21ed1 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -3,4 +3,5 @@ AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
 EBUILD mjpegtools-2.1.0-r3.ebuild 2873 BLAKE2B a40d80911829ee07b60582fb4c964469d522d123d41f16644fc43f3da5e231c60bcf767291663b66a36c6dd600e07e4fd61f17d842673749d9d0c2d4b9471398 SHA512 bc1c60e424c841aaad9538a3bdb038341e560cf98ae2b4f93443c4e2e9cdc8b9325efda3980b34495279f3a0cbb9af1db863422ffdd0d496d9ffafce42d2dd36
+EBUILD mjpegtools-2.1.0-r4.ebuild 2894 BLAKE2B 085bc7df6a9f467219d244ec936098ace0fc87f6d582d54829f55129f552beca18a39ba6ac3d37a4bd24027e570f0df8845faf2293b8cb3fdd5e6fd028efc259 SHA512 9f01a428d20a8489bc79def3bde84494df0687495a0473ca300b9bede8e0d409a4f574c0bc70a24ca5a32ede4947a1f99c50e9bd50910b194bf2f19a302280da
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
new file mode 100644
index 000000000000..3ac82456dab3
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
+REQUIRED_USE="sdlgfx? ( sdl )"
+
+BDEPEND="
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0= )
+	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
+	sdl? (
+		>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		sdlgfx? ( media-libs/sdl-gfx )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-apps/sed-4
+	virtual/awk
+	cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pic.patch
+	# https://sourceforge.net/p/mjpeg/bugs/139/
+	"${FILESDIR}"/${P}-sdl-cflags.patch
+	"${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+	local myconf=(
+		--enable-compile-warnings
+		$(use_enable cpu_flags_x86_mmx simd-accel)
+		$(use_enable static-libs static)
+		--enable-largefile
+
+		$(use_with quicktime libquicktime)
+		$(use_with dv libdv)
+		$(use_with sdl libsdl)
+		--without-v4l
+		$(use_with sdl x)
+
+		# used by tools only
+		$(multilib_native_use_with gtk)
+		$(multilib_native_use_with png libpng)
+		$(multilib_native_use_with sdlgfx)
+
+		# used only in V4LCONF_LIBS that is not used anywhere...
+		--without-dga
+	)
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# avoid building programs
+		emake bin_PROGRAMS=
+	fi
+}
+
+multilib_src_test() {
+	# there are no tests at the moment, so it would just build
+	# all programs in non-native ABIs...
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install \
+			bin_PROGRAMS=
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "mjpegtools installs user contributed scripts which require additional"
+		elog "dependencies not pulled in by the installation."
+		elog "These have to be installed manually."
+		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
+		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
+	fi
+}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 11dd2ae352e8..40442206fc44 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -6,11 +6,11 @@ AUX mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch 1463 BLAKE2B 94343df8eb
 DIST mpv-0.27.2-patches-r0.tar.xz 6564 BLAKE2B c02efea40e0b19d60eaa49520988464fbf4c9221108cbf19021934dc0cb0a975dab148ec1ea03753d81b8035173e3e5bd74b262ab5675d9fc5dce4a0f75ea37c SHA512 d1c955c32082338f5c7f1cd8268471ca0ac6dcd817c5fe39fb82f0e8bd3babf6f2f954d4ce52e9be786e5527df75cc6f4f3de8106a3517c8a1d8e39be1b4ebbd
 DIST mpv-0.27.2.tar.gz 2957191 BLAKE2B 35e316e5a30869ae44ff229e99ae11a88e2f7d55b55946bfb752d5ed2d8212885c0c2abb59c9ff6d23a72daee47d80f44511313d67ee6fb265e6681ba4b89ee1 SHA512 bf74a150b3732b8c233362e0902c54f85fbea9ca1765a2a8f946a6eecd9b37a72ede36a36d0dd98a770539c4f81fe24c8ce26be9db7cd6eddd8514a8f82d9cda
 DIST mpv-0.28.2.tar.gz 2982558 BLAKE2B 5faef4122d456916f43bd603192fc72dee1ad16fa3c842d54a2e53dc8f9db416545549a86af62481fe211dc088821ab13b832c09f82572b36167dd3a73d57f62 SHA512 e6206e8c65dca084e2cfa73ab09278b7113cdfd90b89877d1f75a1068c6379a093ea3955a023857357683edce1aba8c12ee441fd195d887af4d939fc7b66cef4
-DIST mpv-0.29.0.tar.gz 3057997 BLAKE2B 6d72d0f4e10fd4a1b7af624c95dda69035ed3b500788ad84dc7837a62cd1debdd57ebef2fdac9795ccd0d29feef91af6e8aa942bb49ef996c1a4b00f6080af85 SHA512 77204218bd217ae1da4812b09e0509965a3ef102d3de5cd4360f007ccf3779e4cbde5cfd6adae9629ea39062bd365e847429bdf7f9a1ddebd0a67d267492b221
+DIST mpv-0.29.1.tar.gz 3059503 BLAKE2B 231e7c184d441c126c6b6b7199810552981816e5afd59bce4b423c7b4f3739b540f26a4de947cb3cf87a31a7d3ce03a11a6d1247158250afde596f490321a537 SHA512 ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086
 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
 EBUILD mpv-0.27.2.ebuild 10646 BLAKE2B d540c5bf23ccaca0a46462b64e615468d6f3f7f60d834da91f200e1919db3ab5f8624d3545fe583431908bef16e24aa60fe1023cd11b913840590aecf5519906 SHA512 e233419cec44ddc5d2391a3dca4795772f3c0fec57f8f306e05a9abd53c163b29402458fc11b76a5508cfa6c01a0205d6b8a49eec64b4d9b9097bc36523a2b3c
 EBUILD mpv-0.28.2.ebuild 10447 BLAKE2B 2af786cb54863f244f32f0e509593f1c48ed147a92adfa2985dca7e82740c6358f4610b8b2e8a8788985992b66b234d775fafe5ac1c62672c4661a26fe2af9eb SHA512 cc1b2e724d7c8a55caadee3cdfed66ab94e0e146354f2813109ebb47ffdd82aa3181dd8febc9d84500f739b9e4b2fe6e6f74dd9c9f494edadd8508152962ec44
-EBUILD mpv-0.29.0.ebuild 10218 BLAKE2B 733cab5beef84e1683f78649a2a729c4578a6ee2a64f4e21d121bcf6ee6a3834bf9b58cb3b042f5d3cf32f429a7a3e9621ed062fb9b1fcc86f78bcdffbe35849 SHA512 fc3a430715aed3b79ebf0bec8f0fb0b477b7c198f4c7498acc86bf4b895d05be3097591fc92f41bac2728c2be5b443f0abd2d553f7395e7e5ca00dba7c9e85c9
+EBUILD mpv-0.29.1.ebuild 10223 BLAKE2B eb243469d7a854e1b8d2b5e7dea8f80f39d563e6508b6e9c53d73a11f8277ad66088a0b30d019541228cbb22314f2e6b7cd6698fb73bb0d15a7c4cff3a1803b1 SHA512 7b4a790f6058fa7b168b241b86384479b10331ff50ad091b2c7ba6be94e9b3be657f7411d5d02fb0e6778ff17a092fbcd841bd0e7f379611d248aebec484ca52
 EBUILD mpv-9999.ebuild 10226 BLAKE2B 4a673a4e9febbecdd5be0af8965db6bc6ce83f711fa170993f196b3be62fe1bcf5a22c324c9c44c8241e4a5552c79322b4a5a7de6ad019d4bfb101cd09acea7a SHA512 c39b92265226730c7fb36472dcdfb5fe2a0ccaf9859a9f26ba49966ab28b48476f36c1b17c7852e3f9eaab817da1bacfc0cc0efd5083f4d0e9de3ad43f76bdce
 MISC metadata.xml 2434 BLAKE2B 49d49e82a085bc55ca6ace16fe6d90d66988cc5e63837a4c1cc479b14fe0c83aae87478a9dc0a209f28f03a7f17363e42f64753d9d1496b671669a7add3dab2c SHA512 3a14c0d283f6369fcc3ea160d53dbdf44b41fa5ddcc2c5e724040c2d462542f6638b763984e7b47e1d69eab25a4347d5f821b5ebe5bc4bc5471f0f8b7e615af1
diff --git a/media-video/mpv/mpv-0.29.0.ebuild b/media-video/mpv/mpv-0.29.0.ebuild
deleted file mode 100644
index eae5391d95d1..000000000000
--- a/media-video/mpv/mpv-0.29.0.ebuild
+++ /dev/null
@@ -1,362 +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,3_7} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV=2.0.9
-
-inherit eapi7-ver flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-	DOCS=( RELEASE_NOTES )
-else
-	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-	inherit git-r3
-	DOCS=(); SRC_URI=""
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
-	dvd +egl gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua
-	luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
-	selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib
-	zsh-completion"
-
-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_REQUIRED_USE}
-"
-
-COMMON_DEPEND="
-	>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
-	alsa? ( >=media-libs/alsa-lib-1.0.18 )
-	archive? ( >=app-arch/libarchive-3.0.0:= )
-	bluray? ( >=media-libs/libbluray-0.3.0:= )
-	cdda? ( dev-libs/libcdio-paranoia )
-	drm? ( x11-libs/libdrm )
-	dvd? (
-		>=media-libs/libdvdnav-4.2.0
-		>=media-libs/libdvdread-4.1.0
-	)
-	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
-	iconv? (
-		virtual/libiconv
-		uchardet? ( app-i18n/uchardet )
-	)
-	jack? ( virtual/jack )
-	javascript? ( >=dev-lang/mujs-1.0.0 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	libass? (
-		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	lua? (
-		!luajit? ( <dev-lang/lua-5.3:= )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	openal? ( >=media-libs/openal-1.13 )
-	pulseaudio? ( media-sound/pulseaudio )
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	rubberband? ( >=media-libs/rubberband-1.8.0 )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl2[sound,threads,video] )
-	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
-	vdpau? ( x11-libs/libvdpau )
-	vulkan? (
-		media-libs/shaderc
-		media-libs/vulkan-loader[X?,wayland?]
-	)
-	wayland? (
-		>=dev-libs/wayland-1.6.0
-		>=dev-libs/wayland-protocols-1.14
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		opengl? (
-			x11-libs/libXdamage
-			virtual/opengl
-		)
-		xv? ( x11-libs/libXv )
-	)
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-python/docutils
-	virtual/pkgconfig
-	cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 )
-	doc? ( dev-python/rst2pdf )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	test? ( >=dev-util/cmocka-1.0.0 )
-	v4l? ( virtual/os-headers )
-	zsh-completion? ( dev-lang/perl )
-"
-RDEPEND="${COMMON_DEPEND}
-	cuda? ( x11-drivers/nvidia-drivers[X] )
-	selinux? ( sec-policy/selinux-mplayer )
-	tools? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch"
-)
-
-src_prepare() {
-	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
-	chmod +x "${S}"/waf || die
-	default_src_prepare
-}
-
-src_configure() {
-	python_setup
-	tc-export CC PKG_CONFIG AR
-
-	if use raspberry-pi; then
-		append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
-		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
-	fi
-
-	# Prevent access violations from zsh completion generation.
-	# See Gentoo bug 656086.
-	use zsh-completion && addpredict /dev/dri
-
-	local mywafargs=(
-		--confdir="${EPREFIX}/etc/${PN}"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-
-		$(usex cli '' '--disable-cplayer')
-		$(use_enable libmpv libmpv-shared)
-
-		--disable-libmpv-static
-		--disable-static-build
-		# See deep down below for build-date.
-		--disable-optimize # Don't add '-O2' to CFLAGS.
-		--disable-debug-build # Don't add '-g' to CFLAGS.
-		--enable-html-build
-
-		$(use_enable doc pdf-build)
-		$(use_enable cplugins)
-		$(use_enable zsh-completion zsh-comp)
-		$(use_enable test)
-
-		--disable-android
-		$(use_enable iconv)
-		$(use_enable samba libsmbclient)
-		$(use_enable lua)
-		$(usex luajit '--lua=luajit' '')
-		$(use_enable javascript)
-		$(use_enable libass)
-		$(use_enable libass libass-osd)
-		$(use_enable zlib)
-		$(use_enable bluray libbluray)
-		$(use_enable dvd dvdread)
-		$(use_enable dvd dvdnav)
-		$(use_enable cdda)
-		$(use_enable uchardet)
-		$(use_enable rubberband)
-		$(use_enable lcms lcms2)
-		--disable-vapoursynth # Only available in overlays.
-		--disable-vapoursynth-lazy
-		$(use_enable archive libarchive)
-
-		--enable-libavdevice
-
-		# Audio outputs:
-		$(use_enable sdl sdl2) # Listed under audio, but also includes video.
-		$(use_enable oss oss-audio)
-		--disable-rsound # Only available in overlays.
-		--disable-sndio # Only available in overlays.
-		$(use_enable pulseaudio pulse)
-		$(use_enable jack)
-		$(use_enable openal)
-		--disable-opensles
-		$(use_enable alsa)
-		$(use_enable coreaudio)
-
-		# Video outputs:
-		$(use_enable aqua cocoa)
-		$(use_enable drm)
-		$(use_enable gbm)
-		$(use_enable wayland wayland-scanner)
-		$(use_enable wayland wayland-protocols)
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable xv)
-		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
-		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
-		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
-		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
-		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
-		$(use_enable vdpau)
-		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
-		$(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
-		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
-		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
-		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
-		$(use_enable libcaca caca)
-		$(use_enable jpeg)
-		$(use_enable vulkan shaderc)
-		$(use_enable raspberry-pi rpi)
-		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
-		--disable-mali-fbdev # Only available in overlays.
-		$(usex opengl '' '--disable-gl')
-		$(use_enable vulkan)
-
-		# HWaccels:
-		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable cuda cuda-hwaccel)
-
-		# TV features:
-		$(use_enable v4l tv)
-		$(use_enable v4l tv-v4l2)
-		$(use_enable v4l libv4l2)
-		$(use_enable v4l audio-input)
-		$(use_enable dvb dvbin)
-
-		# Miscellaneous features:
-		--disable-apple-remote # Needs testing first. See Gentoo bug 577332.
-	)
-
-	if use vaapi && use X; then
-		mywafargs+=(
-			$(use_enable opengl vaapi-glx)
-			$(use_enable egl vaapi-x-egl)
-		)
-	fi
-
-	# Create reproducible non-live builds.
-	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
-	waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use lua; then
-		insinto /usr/share/${PN}
-		doins -r TOOLS/lua
-	fi
-
-	if use cli && use luajit; then
-		pax-mark -m "${ED}"usr/bin/${PN}
-	fi
-
-	if use tools; then
-		dobin TOOLS/{mpv_identify.sh,umpv}
-		newbin TOOLS/idet.sh mpv_idet.sh
-		python_replicate_script "${ED}"usr/bin/umpv
-	fi
-}
-
-pkg_postinst() {
-	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
-
-	for rv in ${REPLACING_VERSIONS}; do
-		ver_test ${rv} -lt 0.18.1 && softvol_0_18_1=1
-		ver_test ${rv} -lt 0.21.0 && osc_0_21_0=1
-		ver_test ${rv} -lt 0.24.0 && txtsubs_0_24_0=1
-		ver_test ${rv} -lt 0.25.0 && ! use opengl && opengl_0_25_0=1
-	done
-
-	if [[ ${softvol_0_18_1} -eq 1 ]]; then
-		elog "Since version 0.18.1 the software volume control is always enabled."
-		elog "This means that volume controls don't change the system volume,"
-		elog "e.g. per-application volume with PulseAudio."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
-		elog
-	fi
-
-	if [[ ${osc_0_21_0} -eq 1 ]]; then
-		elog "In version 0.21.0 the default OSC layout was changed."
-		elog "If you want to restore the previous layout, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
-		elog
-	fi
-
-	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
-		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
-		elog
-	fi
-
-	if [[ ${opengl_0_25_0} -eq 1 ]]; then
-		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
-		elog "the 'opengl' video output and no longer explicitly requires"
-		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
-	fi
-
-	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
-		elog "If you want to have command-line completion via bash-completion,"
-		elog "please install app-shells/mpv-bash-completion."
-	fi
-
-	if use cli && [[ -n ${REPLACING_VERSIONS} ]] &&
-			has_version 'app-shells/mpv-bash-completion'; then
-		elog "If command-line completion doesn't work after mpv update,"
-		elog "please rebuild app-shells/mpv-bash-completion."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-src_test() {
-	cd "${S}"/build/test || die
-	local test
-	for test in *; do
-		if [[ -x ${test} ]]; then
-			./"${test}" || die "Test suite failed"
-		fi
-	done
-}
diff --git a/media-video/mpv/mpv-0.29.1.ebuild b/media-video/mpv/mpv-0.29.1.ebuild
new file mode 100644
index 000000000000..55c06fc8520b
--- /dev/null
+++ b/media-video/mpv/mpv-0.29.1.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=2.0.9
+
+inherit eapi7-ver flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+	DOCS=(); SRC_URI=""
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+	dvd +egl gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua
+	luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
+	selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib
+	zsh-completion"
+
+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_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+	>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( >=dev-lang/mujs-1.0.0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( <dev-lang/lua-5.3:= )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
+	vdpau? ( x11-libs/libvdpau )
+	vulkan? (
+		media-libs/shaderc
+		media-libs/vulkan-loader[X?,wayland?]
+	)
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=dev-libs/wayland-protocols-1.14
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/docutils
+	virtual/pkgconfig
+	cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 )
+	doc? ( dev-python/rst2pdf )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	test? ( >=dev-util/cmocka-1.0.0 )
+	v4l? ( virtual/os-headers )
+	zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.0-make-ffmpeg-version-check-non-fatal.patch"
+)
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	default_src_prepare
+}
+
+src_configure() {
+	python_setup
+	tc-export CC PKG_CONFIG AR
+
+	if use raspberry-pi; then
+		append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
+		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+	fi
+
+	# Prevent access violations from zsh completion generation.
+	# See Gentoo bug 656086.
+	use zsh-completion && addpredict /dev/dri
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize # Don't add '-O2' to CFLAGS.
+		--disable-debug-build # Don't add '-g' to CFLAGS.
+		--enable-html-build
+
+		$(use_enable doc pdf-build)
+		$(use_enable cplugins)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		--disable-android
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable javascript)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable zlib)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth # Only available in overlays.
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2) # Listed under audio, but also includes video.
+		$(use_enable oss oss-audio)
+		--disable-rsound # Only available in overlays.
+		--disable-sndio # Only available in overlays.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland wayland-scanner)
+		$(use_enable wayland wayland-protocols)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		$(use_enable vulkan shaderc)
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		--disable-mali-fbdev # Only available in overlays.
+		$(usex opengl '' '--disable-gl')
+		$(use_enable vulkan)
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable cuda cuda-hwaccel)
+
+		# TV features:
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		--disable-apple-remote # Needs testing first. See Gentoo bug 577332.
+	)
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"usr/bin/umpv
+	fi
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		ver_test ${rv} -lt 0.18.1 && softvol_0_18_1=1
+		ver_test ${rv} -lt 0.21.0 && osc_0_21_0=1
+		ver_test ${rv} -lt 0.24.0 && txtsubs_0_24_0=1
+		ver_test ${rv} -lt 0.25.0 && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+		elog "If you want to have command-line completion via bash-completion,"
+		elog "please install app-shells/mpv-bash-completion."
+	fi
+
+	if use cli && [[ -n ${REPLACING_VERSIONS} ]] &&
+			has_version 'app-shells/mpv-bash-completion'; then
+		elog "If command-line completion doesn't work after mpv update,"
+		elog "please rebuild app-shells/mpv-bash-completion."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index eccc7b5ea390..17b2e8d53bce 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -2,7 +2,7 @@ AUX obs-studio-21.0.2-qt-5.11.0.patch 1078 BLAKE2B 4681ae50ae11fed00b227966cbac4
 AUX obs-studio-21.1.2-use-less-automagic.patch 5284 BLAKE2B 43e9b7fc9c4699c77037a7e28668137e0ffb24de285b9f560d2ccb6214c54640893a5d34e179087f7b2dfce49a97ea8465df97bbac232ed7c013d580bbb6019a SHA512 00774c36e3437c5828677f71ff33e467fab3957b9622092ba3d2501769796ab5b6e4328b898ee9e92ee32dfef78f9797d03bb602bc68ad294202f180298afb38
 DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938
 DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c SHA512 491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04
-EBUILD obs-studio-21.1.2.ebuild 3029 BLAKE2B cfb1e5a15d0dba8f6eea1db0f9f314c69fdb26bff4a77ef1d4fe9cff6b4d3abfc49db3266b52dd09026f3eb5b5923349ca5808bbc6d2f5ee4796406efde5bf12 SHA512 f95541d0de438d10677d6e09b5ab3e8edeedeb6b6a205d2673d40ad2e9297462f1fc6cfb8d47fbb758ff9d246ceb7541f4687801b4a61c5cda30be56d8db7087
-EBUILD obs-studio-22.0.3.ebuild 2984 BLAKE2B 764a2e4531569baa9970ac73b1967ca6e61ee3ba2c5129ac8cf3d3b5e7c9e0d43c9abbe23fde1f39ddc208ce5729723e0ba96de2abade0f53da0ec2018c71995 SHA512 36df6dc1a1796035722b9e92859e19c1372fbc0c6b5cafde1d661a4edb32b0dc63203581336f4114b0068d63e8c76b7f3922306a16c54f77405dd229fa65265d
-EBUILD obs-studio-9999.ebuild 2913 BLAKE2B ed7c95a02586593b998795c5f53fdd37f14f6e10e2c27c829d46edade5008e6acb9046842b06df7b924c4e9d5f7956e07473c4b8d972680ce44a9ace698cf6ef SHA512 63fe9c288e177a213d7b4689d97a0214500a325848210fa59b5cc6aa340d7711681eb1b999e9db029c494cbb6e04ba49543b6fccf4e26d856558db79ba72fceb
+EBUILD obs-studio-21.1.2.ebuild 3085 BLAKE2B 59a06f60076e037d954588deedcd24556d60d77155337b464187164e028230ab3c182ccf0b656b35d0f06c1b407e883b85c6003de76267ee225eb4e686c3580a SHA512 3db68631d4c70f3951eb879202719fea85be5072f6d4ece7dac369f51e8d0e50f8f04835f7e870e05baee8731c1b12391072ec217f392fb497da750d38afd168
+EBUILD obs-studio-22.0.3.ebuild 3040 BLAKE2B 903c7dc90d554e53603b4fd4c8a9b191927b0c2da06c7a9bd04d37850bb82fc5eca56e30f53c8ab8c30353a3b22b40b8b2ed2ba01c26e8787805f2f22b36cf58 SHA512 b9d96598e55c8d8c4d1d51c52577d11c6b7b9367b003c10d19d9e1b62e6dfea5bd3731a099c0d6b0997aa8e35b1b9fcde92ea10f59adc9d4d18904ac47c8033a
+EBUILD obs-studio-9999.ebuild 2969 BLAKE2B 42cd67c4a1679e1edd366a941b56633aa3e200193f650fa91cf8c07381db079ad6aa2543c0d3f41304264c1eba3356e0a6f2ebb9af6932ab45b54496091dcc7c SHA512 4951dee505c16193835d0609dd9c8a8e7963a698f7efdd7eb951977c46efe68fb193f423664cca1e38c1ab94c54240295170bec9e87fdf4eb7f9601d0d5fe956
 MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f
diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild
index bba5ad05ece0..ca9114ce291b 100644
--- a/media-video/obs-studio/obs-studio-21.1.2.ebuild
+++ b/media-video/obs-studio/obs-studio-21.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -69,6 +69,10 @@ PATCHES=(
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
diff --git a/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-22.0.3.ebuild
index 987d58bb89bf..7bd98fa4213b 100644
--- a/media-video/obs-studio/obs-studio-22.0.3.ebuild
+++ b/media-video/obs-studio/obs-studio-22.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,10 @@ PATCHES=( "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" )
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index d3014eda9ede..a596540a779f 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -64,6 +64,10 @@ RDEPEND="${COMMON_DEPEND}"
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
diff --git a/media-video/recordmydesktop/Manifest b/media-video/recordmydesktop/Manifest
index ba561aecb952..6da817d622ac 100644
--- a/media-video/recordmydesktop/Manifest
+++ b/media-video/recordmydesktop/Manifest
@@ -1,6 +1,5 @@
-AUX 0.3.8.1-fix-libjack-check.patch 518 BLAKE2B b4486cf048577f7d8f527b977d3cd9812929e49c1aff857ddddbbf5c2df0974c9d134ec1387de8ae5e3410006351a6355a47d9996e351a62aa57614aaf66d950 SHA512 f726f82843f190a8d346b3d22709131da2767f4ad4199a6fe848d1339da3ef010b6c55563bb8dc71553003bd2f8246f16ba16a0899baf2fce3dc92ddb02db778
+AUX 0.3.8.1-fix-libjack-check.patch 506 BLAKE2B 690cd66747ca9065245ea041362ecf6aa03af8829d7cf373b73b46e236af0c076eadca1143419a49eb686b47d45c880c096468d6eb7afca38edb555c979dadf0 SHA512 5117f79f35fcaee8a438efd50c619ac2eb73b89402110215e35f61736f0fb4ba35209ef20b15e236c4685a8f0583cae767a6a2fef00a31d8f4936a196aa19a8b
 AUX 0.3.8.1-fix_new_theora.patch 2212 BLAKE2B 260643c7092e44fd040ee3f248f97969e4fc5be2d2b12946ab57b6412cded727676fd8426caacd0ad3e98b456f51a7173a66ebc9f8a95abce802ca65039199e9 SHA512 f504d9c889344be7f44a06b6125acf73fc32573256356afd99093af92ee3268267616b5956c0ada7a8484dcfb9f482ffa9c6c6d6f54b4080bc17a12cd2f21761
 DIST recordmydesktop-0.3.8.1.tar.gz 198732 BLAKE2B d28b8d61e340f100ea0954fef2861c4dd8ec2cdaef5a70b18d727d652579c85b901d35a056af7a81e49c98a602a9fb75ce0b5a302aab53ab735577b0159b95fa SHA512 a32df1257d7d8928123437b38abcbdf623a9a65d313df5bec9bc06ef7229ebe4664a3cbea1fe5f6f1f9b89efb939873adc020f4ac072477f6df9481a37e7c350
-EBUILD recordmydesktop-0.3.8.1-r4.ebuild 1214 BLAKE2B a87fd37e4ec96284509d3955762a59d1eb9aa664c43d0c767b8bd0e344a883d0facd973f800598b3a1861348efe90de80d62997fc3048be54174304123bfd68d SHA512 150babc27790593a51ce03bd446afacfcd9e872449294c85f4d2178edd448f416ebf2b642cf9953300e4fb5ae896d86b8691b74868e9593d1101ecdbea44421d
-EBUILD recordmydesktop-0.3.8.1-r5.ebuild 1204 BLAKE2B 0cb48f0de4f55ea85243ec283b3106890e09151306950ac1c38762bd741d74f6add3f91cdf79d6a77e165901f7f43207f0d6b189c0891009320dd4b2ea24c036 SHA512 ba18156c2bd8478278eee9e192345115ce6b5966713b67b7e84068fd4b7af38451b42fd8eb305a6f0ec292cee13c4eba7845bbf732b6e33f51beeb533aac6415
+EBUILD recordmydesktop-0.3.8.1-r6.ebuild 1078 BLAKE2B 3d0817d14acc56671252f27b05f75d60ea920e665e470ffeb82f71cc2210139870c39ac95a3e4b607bfb835eaf0159ae404025790c5e585c5258b254f748d7ef SHA512 c6c69eac2b4642866c359a93acca7269e6db238184384fb547f8079c72eb3b18c350b9215245fa3d86e4b3b50659dc6dc3cb20d7feb22ab8598a6aab17d0d9c3
 MISC metadata.xml 316 BLAKE2B 1742ad6dfbf9b34550898774321b339ebe6e6b5205650a9cf5f9ffb73b0e37ddccec560ccfc3657c8b21fd539367c3a14b7d6ecac87037a600290a16900f8856 SHA512 b2b2172a9a6fe5c1b1677138e045a24ec1922838e0ed7c2a958b41b73864c8a35f4dc6717468f0d2231763521b9b067d5123c930ec48c51789a7ea962629e1a8
diff --git a/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch b/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch
index cb8a3b473484..ee23087c8104 100644
--- a/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch
+++ b/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch
@@ -1,5 +1,5 @@
---- trunk/recordmydesktop/configure.ac	2008/12/13 17:46:41	584
-+++ trunk/recordmydesktop/configure.ac	2009/01/10 11:35:06	587
+--- recordmydesktop/configure.ac	2008/12/13 17:46:41	584
++++ recordmydesktop/configure.ac	2009/01/10 11:35:06	587
 @@ -95,7 +95,10 @@
               AC_MSG_ERROR([Can't find libpthread]))
  
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
deleted file mode 100644
index fba38e965e18..000000000000
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils autotools
-
-DESCRIPTION="A desktop session recorder producing Ogg video/audio files"
-HOMEPAGE="http://recordmydesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa jack"
-
-RDEPEND="sys-libs/zlib
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXdamage
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libtheora[encode]
-	x11-libs/libICE
-	x11-libs/libSM
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	sed -i \
-		-e 's:shmstr.h:shmproto.h:g' \
-		src/rmd_{getzpixmap.c,update_image.c} || die
-
-	# fix weird Framerates with new libtheora
-	epatch "${FILESDIR}/${PV}-fix_new_theora.patch"
-
-	# fix check for jack support
-	epatch "${FILESDIR}/${PV}-fix-libjack-check.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-dependency-tracking \
-		$(use_enable !alsa oss) \
-		$(use_enable jack)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README || die
-}
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
deleted file mode 100644
index 4dedc005322c..000000000000
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.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 eutils autotools
-
-DESCRIPTION="A desktop session recorder producing Ogg video/audio files"
-HOMEPAGE="http://recordmydesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE="alsa jack"
-
-RDEPEND="sys-libs/zlib
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXdamage
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libtheora[encode]
-	x11-libs/libICE
-	x11-libs/libSM
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	sed -i \
-		-e 's:shmstr.h:shmproto.h:g' \
-		src/rmd_{getzpixmap.c,update_image.c} || die
-
-	# fix weird Framerates with new libtheora
-	epatch "${FILESDIR}/${PV}-fix_new_theora.patch"
-
-	# fix check for jack support
-	epatch "${FILESDIR}/${PV}-fix-libjack-check.patch"
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-dependency-tracking \
-		$(use_enable !alsa oss) \
-		$(use_enable jack)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README || die
-}
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r6.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r6.ebuild
new file mode 100644
index 000000000000..940e02981cd0
--- /dev/null
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A desktop session recorder producing Ogg video/audio files"
+HOMEPAGE="http://recordmydesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="alsa jack"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXdamage
+	media-libs/libvorbis
+	media-libs/libogg
+	media-libs/libtheora[encode]
+	x11-libs/libICE
+	x11-libs/libSM
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:shmstr.h:shmproto.h:g' \
+		src/rmd_{getzpixmap.c,update_image.c} || die
+
+	# fix weird Framerates with new libtheora
+	eapply "${FILESDIR}/${PV}-fix_new_theora.patch"
+
+	# fix check for jack support
+	eapply "${FILESDIR}/${PV}-fix-libjack-check.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-dependency-tracking \
+		$(use_enable !alsa oss) \
+		$(use_enable jack)
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index cb020df2c936..7de1b5a084c5 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,7 +9,7 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc
 DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
 DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271
 EBUILD vlc-3.0.3-r1.ebuild 13450 BLAKE2B 90c0942f1018dc8bae1bc15c4417bb7555aede9e6ec7d3a87ddd048af03d816855cc3f96e1042a2f6c0d2949ca76dd8b9d80b240509413af3bb61e212ffd11ad SHA512 072af5095c8fda41fe7c29d4254a4147687b64a8593b117d37466dc8012d1c64bb7291ecf6a5ef0f806f6de0522dd90eb796568f73201cd1a327d85efd3f7218
-EBUILD vlc-3.0.4.ebuild 13226 BLAKE2B 612c0e25b550e63fe14d871d95737b7d7f7388feb22db02685419a7ff86effc30e6a8591b267650154a3807b33a4a347a09510b778303324b7199ebb5d41c96d SHA512 5a619b52dc28b8aab14519c274483e44d1b71d2f26d8740fd4e757b7759899ec2ec123f0811ca6a353a4d1009c91f0f7403097806475f041cfed8752c4d2f4f2
+EBUILD vlc-3.0.4.ebuild 13221 BLAKE2B 65f35cbb37b2da5bf91ceea246a32f70980c96eae0a30dd816dd43c26eba4326682b8a8a5b52b351eb666b6c107352498f1918f59b47edb34d0c13054f7af95f SHA512 3698903d40c16dee702bfedd47888b465d11a5a7d93442ceb758a92d8c14c93710a349a4e83943e39cdf9c8aa5fcd6e879dd1bca9fb71b06faf5a93cebc5266e
 EBUILD vlc-3.0.9999.ebuild 13226 BLAKE2B 612c0e25b550e63fe14d871d95737b7d7f7388feb22db02685419a7ff86effc30e6a8591b267650154a3807b33a4a347a09510b778303324b7199ebb5d41c96d SHA512 5a619b52dc28b8aab14519c274483e44d1b71d2f26d8740fd4e757b7759899ec2ec123f0811ca6a353a4d1009c91f0f7403097806475f041cfed8752c4d2f4f2
 EBUILD vlc-9999.ebuild 13209 BLAKE2B 47add64565abb5e7f4fc44729f67de84d6bfe7bc025819d3f986d9497207bdb12c4a27462d917ae18197fe31899a252eed8aaf3efd80a0350e7c2c32d21e7706 SHA512 86bfd49188514a5ccd813590f8ec8eff9bd55d751b8c2f6057d250031bbcbe3dade0a18a55bfaba07ea7b11f42208d431fe04dc7c79a500679268a9cdf4fc49b
-MISC metadata.xml 5187 BLAKE2B 43c8474284bb05268e6846e646ff382a1cb0f3ffa1a9ee65aa5beb95c157c427cef3df82abdaafa60f3ede953506987342de284a06fad2fcf83b5fc3b7054ca2 SHA512 c518a431a420a40e0f627e0cc713980b660db1acfb837bf20bf80220df1773bdea325998e5b8270dc7d4ad2af6290bdefb45c30a1ed07f62c73c99d57a5ca77a
+MISC metadata.xml 5126 BLAKE2B 107f372c830ec4bdb8ee0ca64dedb7259b08c5ee0832e9a371bf62f0a2908a76fda48cb0738e3c406090824a0c4840784004878c4364307ad76dc997e5425517 SHA512 39e2ddb1ff53603585b54410d04c783077f681b93be2f00ad91b418f029a6fb432671efb5ae3eede535d4c7b45bf43d7e5ce5cb8649064401e11eef6b025cd7a
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 63d4baba876d..3897b001c10d 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -37,7 +37,6 @@
 		<flag name="omxil">Enable OpenMAX Integration Layer codec module</flag>
 		<flag name="opencv">Enable OpenCV (computer vision) filter module</flag>
 		<flag name="optimisememory">Enable optimisation for memory rather than performance</flag>
-		<flag name="opus">Support opus decoding via libopus</flag>
 		<flag name="postproc">Enable image post-processing via libpostproc (part of FFmpeg)</flag>
 		<flag name="projectm">Enable the projectM visualization plugin</flag>
 		<flag name="rtsp">Enable real audio and RTSP modules</flag>
diff --git a/media-video/vlc/vlc-3.0.4.ebuild b/media-video/vlc/vlc-3.0.4.ebuild
index b2e1f771823a..21bbaf080711 100644
--- a/media-video/vlc/vlc-3.0.4.ebuild
+++ b/media-video/vlc/vlc-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs virtualx xdg-utils ${SCM}
 
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index f4b859a22bab..4bdf2036dad3 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -2,6 +2,6 @@ AUX xine-ui-0.99.10-desktop.patch 996 BLAKE2B 3ea4d4f4c3a9c3fd93f211c949694abef9
 AUX xine-ui-0.99.10-libcaca.patch 977 BLAKE2B f91dd8813b549ea00db0028e6a86d04ff7a27575f749509e27e331cfa9d76ac50349e52bc74ebdf4b7ae9b357209e5da292f2eee24c0a79204202417adfa9c98 SHA512 edde19d900c19ca6530877041a0d78d9a0d7fad44d3ec62f76e5907c8907ffe338434161d1c59066ddce132b61ee6072981ef00899588bb6adebbdb461d0d2ce
 DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
 DIST xine-ui-0.99.9.tar.xz 1759568 BLAKE2B 5e8d94c64d254f52c0e5f6926b5c0e8cc7ba065f00363e728e48d6dafb26e2cd5496fb20e3d81a1c4f5bf6165b6f13ed2b28eea31e6efd4f9e9256bed5bafc49 SHA512 575b20a19c5740ba0336af9dea0a1bc15d23b7471379b9d72aeb585e23f95b336368b96a28d4804726507f059dc431cc3f9adfd8b615b08c0e67b65287c2b6c7
-EBUILD xine-ui-0.99.10.ebuild 2041 BLAKE2B 1ce636d83db52cd0796592a8d9f133c30f134fbff8ba4c4118c219a6bc21d70648b2ebfe58083f18bfb1b564c211e4612252944ff2b4cbead78bf18da51bc497 SHA512 599c3110ca5f4b7f03758850be900814229a0d9b24b39084f3393f6aa183b4a349ac8b752cd82fc38e6ee504a238a7c3f7b67971f0e79d54f43bb6c0be81394d
+EBUILD xine-ui-0.99.10.ebuild 2038 BLAKE2B 8d5ca5a102dff2b51d5dd1185897d5025ba5715fcd395de1793c3fe9d8c2e05d33a751e00f7fffe89473dd6322d7acb8270f23cabc34208418c38536b16a797e SHA512 e2c630d90fa484047d1cd4e19956d81d583ad042c69d21b1ea9bd5c943b5ca337dfa6bf31d178afdb46c8b0eb2446acfe25fb33a00bba5d21bf2df2edbd5e939
 EBUILD xine-ui-0.99.9.ebuild 1896 BLAKE2B 06d87ab48f19bf0fdfee3cecac3f1961fa10ea7bcf2bbdc21fd598a82d97be8cb8742174a7ac1324184cf469b8dea1322e08e40133b986983ef5f7c196942da2 SHA512 ae3d41e072d4c65f50721d0ef22b75dac11db5f5a8e432b4f625a32c6c16a73665dbe3e79fa9804dbda58018fe8a3679fd4c7738fe14263cca578a39ad6053df
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
index ae016e03898e..c78d44375ed9 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-fbsd"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
 RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 2b04cfed20f3..f7c58dca1b2d 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4b5c84dd0035..4c320b721ab4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 07 Oct 2018 09:08:36 +0000
+Mon, 22 Oct 2018 09:08:36 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 8c5348102f55..21a2754291d4 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 428688 BLAKE2B ad7b0e93dc8d25ffce2b6b151e2b2f9d3f4644e2e0bd01b04b2cf32db642d1d55604ebfba538d50e5bffd72012f36cafeebb5fa8b059c51e9495a17ed7d24e61 SHA512 38eef2b8a964d52745f651dc5c44cb508b253654c94f1704d61e63093636d75a72c2f7e2db78f40261fe9fecdede9dacd2401b62f42b01813651f01c9fe87245
-TIMESTAMP 2018-10-07T09:08:39Z
+MANIFEST Manifest.files.gz 428694 BLAKE2B dabc73e7c83c08ff4414f8dfe425db9d08d60f1de16c53a7c98425dd351f75aef67c86f4f46fa49d9af0f986df502dbf33d34aadd4caf3fe51750483097dd276 SHA512 b2b7dd8ffb3bb5a6c89e9fdde743f3194735a002d556d9fb28adce939bf73e893fe8f97076dafbaf7704e3774b68ba08d842b8b20bfd7e9173e3cbc864b40bae
+TIMESTAMP 2018-10-22T09:08:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu5zRdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlvNk5hfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAvZhAArNAbUYnMpMArimd1S2hFpCTziOUiqu1V9fc4XSwsfgo0Ho05PKzJaA+i
-AA6FZwaN8QJPxuXZDCci2Yf2nXTtYHUDr+PPL2ETb/P9iDdsnWIpgy3/zW5vdEJK
-Ad2C8a6Hdcad0hhE5h1xkHx2FwTcOyjyl97/p726W464sTeLCrMs2SIRjFbPzTrs
-mT5MEaUm3ChYYcGWhPqWfqKA+OPpJ9U85+xg4HVGDDEzI5s5jjSfMex4lMiPdtBq
-q7St1k276FTc5GYKeQA+f+fvtzKcTajD/heVR9ZEBS6mRzA154d7U+tMAGth6CvU
-boNW7Bl21PQejpYlpCpz3W1n3xZxAG/atSfODLxeP55JuSLFuizgxQJQy4BHkWrA
-P6IEI0lVTXWg378PFrcOmq6cWoi9YfKPjJ/lkNbBg8XBFjQlcwhK6IGcnL9+XEeZ
-TAf2+Adi+Nj/aM7B+37LNVmVrsTe/Ncl3NqFlrjjT/mC1rfHW19T+ijrJQwqwFhH
-9t+M0OKr7EXAzaOtLtgyiwOvr39GAIl/c3OD4KlVwY7Grr8gMUTlzpPcS+1aycJw
-DUMMsKZ2FFmRpEO0TMsbrR8bOmc2xoIwGVrgkuxIecodppGFjkGW4VNtN7h5tHtb
-8CeyFCiZQHF/XqfGSBdII9QSg7JkNe1zvmY+4zUlvSp3Ar6pxu0=
-=edFR
+klAJUQ//T3J/q8MaaE0pgL/CwQtbONlbTQisPZRRpJzVBSJJVVsleAPfCa91e4ML
+udirpoC+EXKj/EvK2d6U7ML/Vh5XgFW2toxpcvD5MsGftAGdA1UlrMQH1re2HJuA
+hJlp15SfmuyIunrm85debKpvtta96HvL8oFSC1bez2Ygq6yYiBM77c0mP/Xv/oIG
+ILXP9oaP0OgE6f9sNpS5owGsUZxMNTpOuE2ZTl1bvBj4410IbiCFaOCsQrKN6Vzw
+rEkC3TGk1X/jC4txH6qY9sPBqauc7krv14Yo17X4N0gVrztO0Otm58COOAHvWqOU
+bzFhxeScZwmmJ8LQJeSRMz7J1erdHQAP0+5Hkrt2PbcthEreU513TC1qJYUXtuLk
+M4fOYV+sBdpQgyngdXKXBGkI/ZjYYPaPnxRcEqFzWM73mlxFS6RBWuCgsC/I9enx
+keVz4kcl8ajwu5qrFGncMZjMbiGk4EYhPj7cPEy02cFmsmF4KKpQqrk/XOotzWyV
+45U734bF+obZkzSlEh2aZTj4FngH2UWW4zKF4Fshr6rUQXbg0g/Uz2pUfBjYWhxI
+rCZGTZJiMemWJxsGx5emZ6IBJ/JCgG/Q/Jrsw5PFOueXbQKG2re4nED19/daRah1
+A89NqN6YJjDu2MH3CdIsWwXCbOWdoWTjdU0poFk9P0NKZL9Airw=
+=UVO/
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index aab66931c134..a7c025fba987 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-201808-02.xml b/metadata/glsa/glsa-201808-02.xml
index efe6722f6acb..77b6971a058b 100644
--- a/metadata/glsa/glsa-201808-02.xml
+++ b/metadata/glsa/glsa-201808-02.xml
@@ -7,13 +7,13 @@
   </synopsis>
   <product type="ebuild">lxc</product>
   <announced>2018-08-22</announced>
-  <revised count="2">2018-08-22</revised>
+  <revised count="3">2018-10-17</revised>
   <bug>662780</bug>
   <access>local</access>
   <affected>
     <package name="app-emulation/lxc" auto="yes" arch="*">
-      <unaffected range="ge">3.0.1-r1</unaffected>
-      <vulnerable range="lt">3.0.1-r1</vulnerable>
+      <unaffected range="ge">2.1.1-r1</unaffected>
+      <vulnerable range="lt">2.1.1-r1</vulnerable>
     </package>
   </affected>
   <background>
@@ -39,7 +39,7 @@
     
     <code>
       # emerge --sync
-      # emerge --ask --oneshot --verbose "&gt;=app-emulation/lxc-3.0.1-r1"
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/lxc-2.1.1-r1"
     </code>
     
   </resolution>
@@ -47,5 +47,5 @@
     <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-6556">CVE-2018-6556</uri>
   </references>
   <metadata tag="requester" timestamp="2018-08-13T17:16:02Z">irishluck83</metadata>
-  <metadata tag="submitter" timestamp="2018-08-22T21:31:58Z">Zlogene</metadata>
+  <metadata tag="submitter" timestamp="2018-10-17T23:09:04Z">Zlogene</metadata>
 </glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4b5c84dd0035..4c320b721ab4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 07 Oct 2018 09:08:36 +0000
+Mon, 22 Oct 2018 09:08:36 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 6add75c1308d..99c3f6f2fa78 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-b914ac7ce64b6f61d701c5cf4173dd03fafdca0e 1538845801 2018-10-06T17:10:01+00:00
+5788e60d7bd138f44ae3b948a0da0c8ddfc7359a 1539817877 2018-10-17T23:11:17+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1d174fb86520..8c116d1788ee 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 6ee04ef3bc65..4bfa460392eb 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/simon-9999 b/metadata/md5-cache/app-accessibility/simon-9999
index 43166745725f..b148ef1b03cb 100644
--- a/metadata/md5-cache/app-accessibility/simon-9999
+++ b/metadata/md5-cache/app-accessibility/simon-9999
@@ -1,11 +1,11 @@
 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/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/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/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/okular-17.12.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 media-libs/alsa-lib media-libs/libqaccessibilityclient:5 x11-libs/libX11 x11-libs/libXtst x11-libs/qwt:6=[qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] >=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
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/okular-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 media-libs/alsa-lib media-libs/libqaccessibilityclient:5 x11-libs/libX11 x11-libs/libXtst x11-libs/qwt:6=[qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils
 DESCRIPTION=Open-source speech recognition program for replacing mouse and keyboard
 EAPI=6
 HOMEPAGE=http://simon-listens.org/
 IUSE=libsamplerate opencv pim sphinx debug +handbook test
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kdelibs4support-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/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/okular-17.12.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 media-libs/alsa-lib media-libs/libqaccessibilityclient:5 x11-libs/libX11 x11-libs/libXtst x11-libs/qwt:6=[qt5] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/okular-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 media-libs/alsa-lib media-libs/libqaccessibilityclient:5 x11-libs/libX11 x11-libs/libXtst x11-libs/qwt:6=[qt5] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=61b42c57cadead483bba8a6a8d8e05cb
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index afd51cd1965d..ae78c78cb27d 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-2.5.10 b/metadata/md5-cache/app-admin/ansible-2.5.10
index 1d866f496876..d6d26b855c75 100644
--- a/metadata/md5-cache/app-admin/ansible-2.5.10
+++ b/metadata/md5-cache/app-admin/ansible-2.5.10
@@ -5,7 +5,7 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=7
 HOMEPAGE=https://ansible.com/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[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/jinja[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/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(-)] dev-python/cryptography[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/httplib2[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/netaddr[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(-)] net-misc/sshpass virtual/ssh 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 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible/ansible-2.5.10.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5f23081b11c995c53655a450a33e6eaa
+_md5_=a8be47549828b4807ed79305c17d0018
diff --git a/metadata/md5-cache/app-admin/ansible-2.5.9 b/metadata/md5-cache/app-admin/ansible-2.5.9
deleted file mode 100644
index fef96466b270..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.5.9
+++ /dev/null
@@ -1,16 +0,0 @@
-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(-)] >=dev-python/packaging-16.6[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(-)] doc? ( 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(-)] ) test? ( dev-python/paramiko[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/jinja[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/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(-)] dev-python/cryptography[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/httplib2[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/netaddr[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(-)] net-misc/sshpass virtual/ssh dev-python/nose[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/mock-1.0.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/passlib[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/coverage[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/unittest2[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/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[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/jinja[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/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(-)] dev-python/cryptography[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/httplib2[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/netaddr[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(-)] net-misc/sshpass virtual/ssh 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.5.9.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=79915a7d0e55cfd014474730cab980cf
diff --git a/metadata/md5-cache/app-admin/ansible-2.6.3 b/metadata/md5-cache/app-admin/ansible-2.6.3
deleted file mode 100644
index d67c62ddee44..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.6.3
+++ /dev/null
@@ -1,16 +0,0 @@
-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(-)] >=dev-python/packaging-16.6[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(-)] doc? ( 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(-)] ) test? ( dev-python/paramiko[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/jinja[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/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(-)] dev-python/cryptography[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/httplib2[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/netaddr[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(-)] net-misc/sshpass virtual/ssh dev-python/nose[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/mock-1.0.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/passlib[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/coverage[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/unittest2[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/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[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/jinja[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/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(-)] dev-python/cryptography[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/httplib2[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/netaddr[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(-)] net-misc/sshpass virtual/ssh 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.6.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e2d43bb161dde65a96d7d2eea8fb02cb
diff --git a/metadata/md5-cache/app-admin/ansible-2.6.4 b/metadata/md5-cache/app-admin/ansible-2.6.4
deleted file mode 100644
index 4716281e1deb..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.6.4
+++ /dev/null
@@ -1,16 +0,0 @@
-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(-)] >=dev-python/packaging-16.6[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(-)] doc? ( 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(-)] ) test? ( dev-python/paramiko[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/jinja[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/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(-)] dev-python/cryptography[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/httplib2[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/netaddr[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(-)] net-misc/sshpass virtual/ssh dev-python/nose[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/mock-1.0.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/passlib[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/coverage[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/unittest2[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/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[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/jinja[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/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(-)] dev-python/cryptography[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/httplib2[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/netaddr[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(-)] net-misc/sshpass virtual/ssh 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.6.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a8be47549828b4807ed79305c17d0018
diff --git a/metadata/md5-cache/app-admin/ansible-2.6.5 b/metadata/md5-cache/app-admin/ansible-2.6.5
index fde225e539dc..e3de83305f62 100644
--- a/metadata/md5-cache/app-admin/ansible-2.6.5
+++ b/metadata/md5-cache/app-admin/ansible-2.6.5
@@ -5,7 +5,7 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=7
 HOMEPAGE=https://ansible.com/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[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/jinja[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/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(-)] dev-python/cryptography[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/httplib2[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/netaddr[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(-)] net-misc/sshpass virtual/ssh 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 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible/ansible-2.6.5.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5f23081b11c995c53655a450a33e6eaa
+_md5_=a8be47549828b4807ed79305c17d0018
diff --git a/metadata/md5-cache/app-admin/ansible-2.6.6 b/metadata/md5-cache/app-admin/ansible-2.6.6
new file mode 100644
index 000000000000..1c05e0e3cc4f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.6.6
@@ -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 ) >=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(-)] >=dev-python/packaging-16.6[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(-)] doc? ( 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(-)] ) test? ( dev-python/paramiko[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/jinja[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/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(-)] dev-python/cryptography[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/httplib2[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/netaddr[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(-)] net-misc/sshpass virtual/ssh dev-python/nose[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/mock-1.0.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/passlib[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/coverage[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/unittest2[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/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[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/jinja[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/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(-)] dev-python/cryptography[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/httplib2[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/netaddr[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(-)] net-misc/sshpass virtual/ssh 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.6.6.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5f23081b11c995c53655a450a33e6eaa
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.13 b/metadata/md5-cache/app-admin/calamares-3.1.13
index f1693b7fe09c..1ef0db4b3b1a 100644
--- a/metadata/md5-cache/app-admin/calamares-3.1.13
+++ b/metadata/md5-cache/app-admin/calamares-3.1.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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(-)] >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[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(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-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(-)] ) 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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=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(-)] >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[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(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-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(-)] ) 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Distribution-independent installer framework
 EAPI=6
 HOMEPAGE=https://calamares.io
 IUSE=+networkmanager pythonqt +upower debug python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[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(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-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(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[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(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-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(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.13/calamares-3.1.13.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b73d36acc242736d1449d358cc28fed0
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.2 b/metadata/md5-cache/app-admin/calamares-3.2.2
index af98c45ee1f2..f77af50dc40f 100644
--- a/metadata/md5-cache/app-admin/calamares-3.2.2
+++ b/metadata/md5-cache/app-admin/calamares-3.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=dev-qt/linguist-tools-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/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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 >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=dev-qt/linguist-tools-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/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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 >=kde-frameworks/extra-cmake-modules-5.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Distribution-independent installer framework
 EAPI=6
 HOMEPAGE=https://calamares.io
 IUSE=+networkmanager pythonqt +upower debug python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=dev-qt/linguist-tools-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/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=dev-qt/linguist-tools-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/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.2/calamares-3.2.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98b1165e5e6e8ef86d4effd1a9c3943f
diff --git a/metadata/md5-cache/app-admin/ccze-0.2.1-r4 b/metadata/md5-cache/app-admin/ccze-0.2.1-r4
index 3dd459d723ed..1c0da520a7a8 100644
--- a/metadata/md5-cache/app-admin/ccze-0.2.1-r4
+++ b/metadata/md5-cache/app-admin/ccze-0.2.1-r4
@@ -2,7 +2,7 @@ DEFINED_PHASES=prepare
 DEPEND=dev-libs/libpcre sys-libs/ncurses:0= >=sys-apps/sed-4 >=app-portage/elt-patches-20170815 !<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 flexible and fast logfile colorizer
 EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~joker/ccze/ccze.txt
+HOMEPAGE=https://github.com/madhouse/ccze/releases
 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre sys-libs/ncurses:0=
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/ccze-0.2.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e0943994b86160abc7a8afe6135ffe6
+_md5_=9224bab864ce06817582a166121dfdff
diff --git a/metadata/md5-cache/app-admin/checksec-1.9.0 b/metadata/md5-cache/app-admin/checksec-1.9.0
new file mode 100644
index 000000000000..8777ac22a93b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/checksec-1.9.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
+EAPI=7
+HOMEPAGE=https://github.com/slimm609/checksec.sh
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.9.0.tar.gz -> checksec-1.9.0.tar.gz
+_md5_=4423db08480f9340e80b29752d5af3cc
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r3 b/metadata/md5-cache/app-admin/conky-1.10.8-r3
new file mode 100644
index 000000000000..bb3260a5e7c8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 app-text/docbook2X sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An advanced, highly configurable system monitor for X
+EAPI=6
+HOMEPAGE=https://github.com/brndnmtthws/conky
+IUSE=apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar weather-xoap webserver wifi X xmms2 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD LGPL-2.1 MIT
+RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+SLOT=0
+SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2a5ba747b1b547f7c09bc00e1dec3ed5
diff --git a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7 b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
index 1e7457ade095..ccb5c51a5e93 100644
--- a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
+++ b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst prepare
 DEPEND=app-arch/unzip
 DESCRIPTION=Command-line tools that serve as client interface to the Amazon EC2 web service
 EAPI=6
-HOMEPAGE=http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88
+HOMEPAGE=https://aws.amazon.com/en/tools/
 KEYWORDS=~amd64 ~x86
 LICENSE=Amazon || ( Ruby GPL-2 )
 RDEPEND=|| ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems virtual/ruby-ssl net-misc/rsync net-misc/curl
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools-1.5.7.zip
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=702057d13f2574567374494b5077069e
+_md5_=5247befaedbd66fd890b498f27fa8e51
diff --git a/metadata/md5-cache/app-admin/elektra-0.8.16 b/metadata/md5-cache/app-admin/elektra-0.8.16
index 3fd267ca1b8d..aee7efcdb120 100644
--- a/metadata/md5-cache/app-admin/elektra-0.8.16
+++ b/metadata/md5-cache/app-admin/elektra-0.8.16
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 RESTRICT=test
 SLOT=0/0.8.16
 SRC_URI=ftp://ftp.markus-raab.org/elektra/releases/elektra-0.8.16.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf469409a8f579d8804f55da7e6330d2
diff --git a/metadata/md5-cache/app-admin/elektra-0.8.20 b/metadata/md5-cache/app-admin/elektra-0.8.20
index 061e2215fe93..80b423bed97c 100644
--- a/metadata/md5-cache/app-admin/elektra-0.8.20
+++ b/metadata/md5-cache/app-admin/elektra-0.8.20
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 RESTRICT=test
 SLOT=0/0.8.20
 SRC_URI=https://www.libelektra.org/ftp/elektra/releases/elektra-0.8.20.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f3d8b00a3f8859cb52c4be963b9cefc
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.20 b/metadata/md5-cache/app-admin/gixy-0.1.20
new file mode 100644
index 000000000000..5b2dea8eb7dd
--- /dev/null
+++ b/metadata/md5-cache/app-admin/gixy-0.1.20
@@ -0,0 +1,14 @@
+BDEPEND=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/nose[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/pyparsing-1.5.5[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/cached-property-1.2.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/configargparse-0.11.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/jinja-2.8[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-1.1.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_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
+DESCRIPTION=Nginx configuration static analyzer
+EAPI=7
+HOMEPAGE=https://github.com/yandex/gixy
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/pyparsing-1.5.5[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/cached-property-1.2.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/configargparse-0.11.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/jinja-2.8[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-1.1.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_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://github.com/yandex/gixy/archive/v0.1.20.tar.gz -> gixy-0.1.20.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9768aef0bf0cc4b917769cb86d0f7071
diff --git a/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823 b/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
index fd5bfe98bbff..c97bc5dfb4c8 100644
--- a/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
+++ b/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A system information and benchmark tool for Linux systems
-EAPI=5
-HOMEPAGE=http://hardinfo.org/
+DESCRIPTION=System information and benchmark tool for Linux systems
+EAPI=6
+HOMEPAGE=https://github.com/lpereira/hardinfo
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/hardinfo-0.5.2_pre20130823.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=46c76cb0926af77de0d38248afe47e02
+_md5_=b47af2b4573f4ad575e1a753df2fdf00
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27
new file mode 100644
index 000000000000..1165b6fc9b23
--- /dev/null
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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
+DEFINED_PHASES=config configure install postinst prepare
+DESCRIPTION=A simple utility to read the temperature of SMART capable hard drives
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/hddtemp/
+IUSE=network-cron nls selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-hddtemp )
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2 mirror://debian/pool/main/h/hddtemp/hddtemp_0.3-beta15-53.diff.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=20b46cebada7164c6d9e2bb783ca4f2f
diff --git a/metadata/md5-cache/app-admin/packagekit-qt-1.0.0 b/metadata/md5-cache/app-admin/packagekit-qt-1.0.0
deleted file mode 100644
index 324c15c5439c..000000000000
--- a/metadata/md5-cache/app-admin/packagekit-qt-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-admin/packagekit-base-0.9 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-libs/libxslt virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt PackageKit backend library
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-admin/packagekit-base-0.9 dev-qt/qtcore:5 dev-qt/qtdbus:5
-SLOT=0/1
-SRC_URI=https://github.com/hughsie/PackageKit-Qt/archive/v1.0.0.tar.gz -> packagekit-qt-1.0.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=10178129970797c789e89ce615db9593
diff --git a/metadata/md5-cache/app-admin/puppetdb-5.2.2 b/metadata/md5-cache/app-admin/puppetdb-5.2.2
deleted file mode 100644
index 636b96be4aa3..000000000000
--- a/metadata/md5-cache/app-admin/puppetdb-5.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=PuppetDB collects data generated by Puppet.
-EAPI=6
-HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.7.0
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-5.2.2.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=09671bf19447d8e42efb550690c1a103
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.0.0 b/metadata/md5-cache/app-admin/puppetdb-6.0.0
index 876498ab0dc9..d6b70d678b19 100644
--- a/metadata/md5-cache/app-admin/puppetdb-6.0.0
+++ b/metadata/md5-cache/app-admin/puppetdb-6.0.0
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=PuppetDB collects data generated by Puppet.
 EAPI=6
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.0.0.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=16e9467f2a7e8d4a29fa3002bbb29723
+_md5_=d160057e956f6f316eb2e2d1b3188653
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.14.1 b/metadata/md5-cache/app-admin/syslog-ng-3.14.1
index 1fcb50b7d7fc..32602012c16b 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.14.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.14.1
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.14.1/syslog-ng-3.14.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=dfdd019de167e97eb2bad4cf9a39cee1
+_md5_=612188d12393be0f926777b962183f2d
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.15.1 b/metadata/md5-cache/app-admin/syslog-ng-3.15.1
index 87113aba62eb..3782a25e2fb2 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.15.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.15.1
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.15.1/syslog-ng-3.15.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=64939ad0db6ecba3baf560aabb807d46
+_md5_=3523af8b6dbcea7426b7c6630e51b43d
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.16.1 b/metadata/md5-cache/app-admin/syslog-ng-3.16.1
index 58fb63fb56f4..0dedfd6fd918 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.16.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.16.1
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.3 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.16.1/syslog-ng-3.16.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=15b30cefbc341736c54d95f5d6c3a07c
+_md5_=75186e67a104f6ce59f65644c90f2c5c
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.17.2 b/metadata/md5-cache/app-admin/syslog-ng-3.17.2
index 877164c7d49b..b14aff6ebd65 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.17.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.17.2
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.3 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.17.2/syslog-ng-3.17.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7d7d665797a73279590acb567c75b435
+_md5_=5cf1c89639515d59860b0ddfe0cd2f73
diff --git a/metadata/md5-cache/app-admin/syslog-summary-1.14-r2 b/metadata/md5-cache/app-admin/syslog-summary-1.14-r2
new file mode 100644
index 000000000000..0054d889975b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/syslog-summary-1.14-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DESCRIPTION=Summarizes the contents of a syslog log file
+EAPI=6
+HOMEPAGE=https://github.com/dpaleino/syslog-summary
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://github/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2d9a07834669bd1a9d74ac9c09885acf
diff --git a/metadata/md5-cache/app-admin/sysstat-11.6.4 b/metadata/md5-cache/app-admin/sysstat-11.6.4
deleted file mode 100644
index 75fcc8075aeb..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-11.6.4
+++ /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.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	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
deleted file mode 100644
index a3fcee85b058..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-11.6.5
+++ /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.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/metadata/md5-cache/app-admin/sysstat-12.0.2 b/metadata/md5-cache/app-admin/sysstat-12.0.2
new file mode 100644
index 000000000000..5bebb4731310
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-12.0.2
@@ -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.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9583eb9ed8d3f48241dffebcc7283645
diff --git a/metadata/md5-cache/app-admin/sysstat-12.1.1 b/metadata/md5-cache/app-admin/sysstat-12.1.1
new file mode 100644
index 000000000000..f4c20499d319
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-12.1.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.1.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9583eb9ed8d3f48241dffebcc7283645
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.5.11 b/metadata/md5-cache/app-admin/system-config-printer-1.5.11
new file mode 100644
index 000000000000..5d32618ccc9f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/system-config-printer-1.5.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=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(+)?] dev-libs/glib:2 dev-libs/libxml2[python,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/dbus-python[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/pycairo[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/pycups-1.9.60[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/pycurl[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/pygobject:3[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(+)?] net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( >=sys-auth/polkit-0.104-r1 ) app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-python/epydoc ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Graphical user interface for CUPS administration
+EAPI=6
+HOMEPAGE=https://github.com/zdohnal/system-config-printer
+IUSE=doc gnome-keyring policykit python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=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(+)?] dev-libs/glib:2 dev-libs/libxml2[python,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/dbus-python[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/pycairo[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/pycups-1.9.60[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/pycurl[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/pygobject:3[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(+)?] net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( >=sys-auth/polkit-0.104-r1 )
+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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zdohnal/system-config-printer/releases/download/1.5.11/system-config-printer-1.5.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/system-config-printer-1.5.11-patchset-01.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=780866e1989b9c0767dae3e80d6319e7
diff --git a/metadata/md5-cache/app-admin/systemdgenie-0.99.0 b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
index ce6c0792eee6..478a72103422 100644
--- a/metadata/md5-cache/app-admin/systemdgenie-0.99.0
+++ b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
@@ -1,13 +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/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/kwidgetsaddons-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 sys-apps/systemd 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.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/systemd 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=systemd managment utility
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/systemdgenie.git
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kauth-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/kwidgetsaddons-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 sys-apps/systemd >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/systemd >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/systemdgenie/systemdgenie-0.99.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97be443413edb83c2e757af010023e96
diff --git a/metadata/md5-cache/app-admin/systemrescuecd-x86-5.3.1 b/metadata/md5-cache/app-admin/systemrescuecd-x86-5.3.1
index ee66e562db82..4f93e1df2af9 100644
--- a/metadata/md5-cache/app-admin/systemrescuecd-x86-5.3.1
+++ b/metadata/md5-cache/app-admin/systemrescuecd-x86-5.3.1
@@ -4,8 +4,8 @@ DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
 EAPI=6
 HOMEPAGE=http://www.sysresccd.org/
 IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=5.3.1
 SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.3.1/systemrescuecd-x86-5.3.1.iso
-_md5_=b1199bbecf4da8961eb1e01c5c78ddda
+_md5_=b587ae2acb9edd502759fc26afd92ac1
diff --git a/metadata/md5-cache/app-admin/testdisk-7.1_pre20180922 b/metadata/md5-cache/app-admin/testdisk-7.1_pre20180922
index 3c3f2aae0722..a0a1dd4750d8 100644
--- a/metadata/md5-cache/app-admin/testdisk-7.1_pre20180922
+++ b/metadata/md5-cache/app-admin/testdisk-7.1_pre20180922
@@ -4,11 +4,11 @@ DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based recovery
 EAPI=6
 HOMEPAGE=https://www.cgsecurity.org/wiki/TestDisk
 IUSE=ewf jpeg ntfs qt5 reiserfs static zlib
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] sys-libs/ncurses:0[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g:=[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) ) !static? ( sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses:0= jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) zlib? ( sys-libs/zlib ) !arm? ( ewf? ( app-forensics/libewf:= ) ) ) )
 REQUIRED_USE=static? ( !qt5 )
 SLOT=0
 SRC_URI=https://git.cgsecurity.org/cgit/testdisk/snapshot/testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1e6a3e029dd5e141edfd37aa1c2f5db2
+_md5_=0bdfb121fae0c61b9af81ed4bcf9695f
diff --git a/metadata/md5-cache/app-admin/watchfolder-0.3.3-r1 b/metadata/md5-cache/app-admin/watchfolder-0.3.3-r1
index 7dea4e6f9201..257a177db0d4 100644
--- a/metadata/md5-cache/app-admin/watchfolder-0.3.3-r1
+++ b/metadata/md5-cache/app-admin/watchfolder-0.3.3-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=watches directories and processes files
 EAPI=6
-HOMEPAGE=http://freshmeat.net/projects/watchd/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://dstunrea.sdf-eu.org/files/watchfolder-0.3.3.tar.gz
+SRC_URI=mirror://gentoo/watchfolder-0.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=052afb0d019400e74512353798e1c3af
+_md5_=222901895c02947248bb8e7ba5f05889
diff --git a/metadata/md5-cache/app-admin/webmin-1.791 b/metadata/md5-cache/app-admin/webmin-1.791
deleted file mode 100644
index fc032b7c82a8..000000000000
--- a/metadata/md5-cache/app-admin/webmin-1.791
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst postrm preinst prepare prerm
-DEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long >=net-dns/dnssec-tools-1.13 !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
-DESCRIPTION=A web-based Unix systems administration interface
-EAPI=5
-HOMEPAGE=http://www.webmin.com/
-IUSE=minimal +ssl mysql postgres ldap ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2
-RDEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long >=net-dns/dnssec-tools-1.13 !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser )
-REQUIRED_USE=minimal? ( !mysql !postgres !ldap )
-SLOT=0
-SRC_URI=minimal? ( mirror://sourceforge/webadmin/webmin-1.791-minimal.tar.gz ) !minimal? ( mirror://sourceforge/webadmin/webmin-1.791.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68ad03a4c8d08f463cdfc3d6e2b30d98
diff --git a/metadata/md5-cache/app-admin/webmin-1.881 b/metadata/md5-cache/app-admin/webmin-1.881
new file mode 100644
index 000000000000..7419c3625454
--- /dev/null
+++ b/metadata/md5-cache/app-admin/webmin-1.881
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config install postinst postrm preinst prepare prerm
+DEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long >=net-dns/dnssec-tools-1.13 !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
+DESCRIPTION=A web-based Unix systems administration interface
+EAPI=6
+HOMEPAGE=http://www.webmin.com/
+IUSE=minimal +ssl mysql postgres ldap ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long >=net-dns/dnssec-tools-1.13 !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser )
+REQUIRED_USE=minimal? ( !mysql !postgres !ldap )
+SLOT=0
+SRC_URI=minimal? ( mirror://sourceforge/webadmin/webmin-1.881-minimal.tar.gz ) !minimal? ( mirror://sourceforge/webadmin/webmin-1.881.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d645894985011f8a9c3fd58f8d56db84
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 64c2fdb74c1d..3e0876201282 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.100.0 b/metadata/md5-cache/app-antivirus/clamav-0.100.0
index 55d0a74495fd..45b352c16747 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.100.0
+++ b/metadata/md5-cache/app-antivirus/clamav-0.100.0
@@ -4,10 +4,10 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=6
 HOMEPAGE=https://www.clamav.net/
 IUSE=bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) system-libmspack? ( dev-libs/libmspack ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.100.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f9dc4cb8cf3551c623c4f246d62ce41
+_md5_=720ab4e6e8b97a0a41d904414bb1eb4a
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.100.1 b/metadata/md5-cache/app-antivirus/clamav-0.100.1
index 9cb60be1e08e..93e9b60b0965 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.100.1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.100.1
@@ -4,10 +4,10 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=6
 HOMEPAGE=https://www.clamav.net/
 IUSE=bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc
-KEYWORDS=amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) system-libmspack? ( dev-libs/libmspack ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.100.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a6e5f8724111c64673a610aed876392
+_md5_=c1c1a1bff550bb2e46dfdc3146d2b4fe
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.100.1-r1 b/metadata/md5-cache/app-antivirus/clamav-0.100.1-r1
new file mode 100644
index 000000000000..9cb60be1e08e
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.100.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) system-libmspack? ( dev-libs/libmspack ) !!<app-antivirus/clamav-0.99 virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 !<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=Clam Anti-Virus Scanner
+EAPI=6
+HOMEPAGE=https://www.clamav.net/
+IUSE=bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc
+KEYWORDS=amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) system-libmspack? ( dev-libs/libmspack ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.100.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8a6e5f8724111c64673a610aed876392
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.99.4-r2 b/metadata/md5-cache/app-antivirus/clamav-0.99.4-r2
new file mode 100644
index 000000000000..da51dda4f28b
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.99.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) !!<app-antivirus/clamav-0.99 virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 !<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=Clam Anti-Virus Scanner
+EAPI=6
+HOMEPAGE=https://www.clamav.net/
+IUSE=bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.99.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0b00ba553b250ae64d79156073d594af
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 8f2c5162c1af..8505b491f462 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/afio-2.5.1-r2 b/metadata/md5-cache/app-arch/afio-2.5.1-r2
new file mode 100644
index 000000000000..bf91d517c5df
--- /dev/null
+++ b/metadata/md5-cache/app-arch/afio-2.5.1-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Afio creates cpio-format archives.
+EAPI=7
+HOMEPAGE=http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=Artistic LGPL-2
+SLOT=0
+SRC_URI=http://members.chello.nl/k.holtman/afio-2.5.1.tgz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1ab6610c0e7aab35c639801dca791e10
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.6-r1 b/metadata/md5-cache/app-arch/brotli-1.0.6-r1
index 7303de39728f..692c1c8f3d7b 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.6-r1
+++ b/metadata/md5-cache/app-arch/brotli-1.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_py
 REQUIRED_USE=python? ( || ( 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/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.6.tar.gz -> brotli-1.0.6.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db9bdefd42bc760eeab39355f1fb4871
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index b654a6d3589a..ab5d04287b6b 100644
--- a/metadata/md5-cache/app-arch/brotli-9999
+++ b/metadata/md5-cache/app-arch/brotli-9999
@@ -8,5 +8,5 @@ LICENSE=MIT python? ( Apache-2.0 )
 RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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=python? ( || ( 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/9999
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db9bdefd42bc760eeab39355f1fb4871
diff --git a/metadata/md5-cache/app-arch/cabextract-1.8 b/metadata/md5-cache/app-arch/cabextract-1.8
new file mode 100644
index 000000000000..c91ddceb2614
--- /dev/null
+++ b/metadata/md5-cache/app-arch/cabextract-1.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Extracts files from Microsoft cabinet archive files
+EAPI=7
+HOMEPAGE=https://www.cabextract.org.uk/
+IUSE=extras
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=extras? ( dev-lang/perl )
+SLOT=0
+SRC_URI=https://www.cabextract.org.uk/cabextract-1.8.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d6c8178193eac21baba999125f9d5f50
diff --git a/metadata/md5-cache/app-arch/dpkg-1.19.1 b/metadata/md5-cache/app-arch/dpkg-1.19.1
index fdf28f87b12d..9c911580d49e 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.19.1
+++ b/metadata/md5-cache/app-arch/dpkg-1.19.1
@@ -4,10 +4,10 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=6
 HOMEPAGE=https://packages.qa.debian.org/dpkg
 IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.19.1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b6236cbf2b8ab15e68b265c7a324cb8
+_md5_=12217c2fe89db2af12c0a1cdd44a82af
diff --git a/metadata/md5-cache/app-arch/dpkg-1.19.2 b/metadata/md5-cache/app-arch/dpkg-1.19.2
new file mode 100644
index 000000000000..2fb7aebaef7c
--- /dev/null
+++ b/metadata/md5-cache/app-arch/dpkg-1.19.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) app-arch/xz-utils sys-devel/flex virtual/pkgconfig nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness ) >=app-portage/elt-patches-20170815 !<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=Package maintenance system for Debian
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/dpkg
+IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.19.2.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4cdcdb4b4a2008a88d5fbe4ead697ef0
diff --git a/metadata/md5-cache/app-arch/gzip-1.9 b/metadata/md5-cache/app-arch/gzip-1.9
index 0b8c76335054..bc1d36382873 100644
--- a/metadata/md5-cache/app-arch/gzip-1.9
+++ b/metadata/md5-cache/app-arch/gzip-1.9
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.9.tar.xz mirror://gnu-alpha/gzip/gzip-1.9.tar.xz mirror://gentoo/gzip-1.9.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cfb5101541b2eefd497f36a8b12db27e
+_md5_=3ee127509e4460c776f95137aacd339d
diff --git a/metadata/md5-cache/app-arch/lrzip-0.630 b/metadata/md5-cache/app-arch/lrzip-0.630
deleted file mode 100644
index 04384a27d38f..000000000000
--- a/metadata/md5-cache/app-arch/lrzip-0.630
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib x86? ( dev-lang/nasm ) virtual/perl-Pod-Parser
-DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
-EAPI=6
-HOMEPAGE=https://github.com/ckolivas/lrzip
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
-SLOT=0
-SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.630.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e0bed2e91ceeefc29bf0ca08cb07a47
diff --git a/metadata/md5-cache/app-arch/lrzip-0.631 b/metadata/md5-cache/app-arch/lrzip-0.631
deleted file mode 100644
index 0aa3973a0977..000000000000
--- a/metadata/md5-cache/app-arch/lrzip-0.631
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib x86? ( dev-lang/nasm ) virtual/perl-Pod-Parser
-DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
-EAPI=6
-HOMEPAGE=https://github.com/ckolivas/lrzip
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
-SLOT=0
-SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.631.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=00eb59665fa4753c5964cf49f865db8a
diff --git a/metadata/md5-cache/app-arch/lrzip-0.631-r1 b/metadata/md5-cache/app-arch/lrzip-0.631-r1
new file mode 100644
index 000000000000..500897047af5
--- /dev/null
+++ b/metadata/md5-cache/app-arch/lrzip-0.631-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib x86? ( dev-lang/nasm ) virtual/perl-Pod-Parser
+DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
+EAPI=7
+HOMEPAGE=https://github.com/ckolivas/lrzip
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
+SLOT=0
+SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.631.tar.bz2
+_md5_=b07500fbbb698cffc2966d8fd4c2ba50
diff --git a/metadata/md5-cache/app-arch/lz4-1.8.0 b/metadata/md5-cache/app-arch/lz4-1.8.0
deleted file mode 100644
index b3286dbcd052..000000000000
--- a/metadata/md5-cache/app-arch/lz4-1.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=6
-HOMEPAGE=https://github.com/lz4/lz4
-IUSE=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 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD-2 GPL-2
-SLOT=0/r131
-SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.8.0.tar.gz -> lz4-1.8.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7f5eae4a4ac663aa29dba6c785b27b12
diff --git a/metadata/md5-cache/app-arch/lz4-1.8.2 b/metadata/md5-cache/app-arch/lz4-1.8.2
index c6b186460a26..138a63dd8f30 100644
--- a/metadata/md5-cache/app-arch/lz4-1.8.2
+++ b/metadata/md5-cache/app-arch/lz4-1.8.2
@@ -4,9 +4,9 @@ DESCRIPTION=Extremely Fast Compression algorithm
 EAPI=6
 HOMEPAGE=https://github.com/lz4/lz4
 IUSE=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 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD-2 GPL-2
 SLOT=0/r131
 SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.8.2.tar.gz -> lz4-1.8.2.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ded53d58dd0d90102c8068a082e10376
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=12bb1bb31b6cae368677dec9c6a288d4
diff --git a/metadata/md5-cache/app-arch/lz4-1.8.3 b/metadata/md5-cache/app-arch/lz4-1.8.3
index a0396d8bb49d..c4cd5702412a 100644
--- a/metadata/md5-cache/app-arch/lz4-1.8.3
+++ b/metadata/md5-cache/app-arch/lz4-1.8.3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD-2 GPL-2
 SLOT=0/r131
 SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.8.3.tar.gz -> lz4-1.8.3.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b036bd236133e6e27282633b7d81c32d
diff --git a/metadata/md5-cache/app-arch/lz4-9999 b/metadata/md5-cache/app-arch/lz4-9999
index fc5b2089760e..b0d73f3f38fb 100644
--- a/metadata/md5-cache/app-arch/lz4-9999
+++ b/metadata/md5-cache/app-arch/lz4-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/lz4/lz4
 IUSE=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=BSD-2 GPL-2
 SLOT=0/r131
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6cc3706f403e6c0c8351a065e42b6449
diff --git a/metadata/md5-cache/app-arch/rpm-4.11.0.1 b/metadata/md5-cache/app-arch/rpm-4.11.0.1
deleted file mode 100644
index 02c13ec07953..000000000000
--- a/metadata/md5-cache/app-arch/rpm-4.11.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!app-arch/rpm5 >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss 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(+)] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<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 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Red Hat Package Management Utils
-EAPI=5
-HOMEPAGE=http://www.rpm.org
-IUSE=nls python doc caps lua acl selinux python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!app-arch/rpm5 >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss 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(+)] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=[-build(-)]
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://rpm.org/releases/rpm-4.11.x/rpm-4.11.0.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=61070d94dfe0b301cc8a4e99eb4bb615
diff --git a/metadata/md5-cache/app-arch/rpm-4.12.0.1 b/metadata/md5-cache/app-arch/rpm-4.12.0.1
deleted file mode 100644
index f6ea3babf3ec..000000000000
--- a/metadata/md5-cache/app-arch/rpm-4.12.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss 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(+)] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Red Hat Package Management Utils
-EAPI=5
-HOMEPAGE=http://www.rpm.org
-IUSE=nls python doc caps lua acl selinux python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss 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(+)] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=[-build(-)]
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://rpm.org/releases/rpm-4.12.x/rpm-4.12.0.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b09557c26675054dcc4b03b4e9ccbfbd
diff --git a/metadata/md5-cache/app-arch/rpm-4.14.1 b/metadata/md5-cache/app-arch/rpm-4.14.1
index 520ecbb20394..306f4ad52230 100644
--- a/metadata/md5-cache/app-arch/rpm-4.14.1
+++ b/metadata/md5-cache/app-arch/rpm-4.14.1
@@ -4,7 +4,7 @@ DESCRIPTION=Red Hat Package Management Utils
 EAPI=6
 HOMEPAGE=http://www.rpm.org https://github.com/rpm-software-management/rpm
 IUSE=acl caps doc lua nls python selinux test 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
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=567ea0f7d948dc2b831eb9a12ce86f4c
+_md5_=2c417341daadd40acc11bd5503932ae0
diff --git a/metadata/md5-cache/app-arch/rpm-4.14.1-r1 b/metadata/md5-cache/app-arch/rpm-4.14.1-r1
index b81838f24d46..81c47e36b503 100644
--- a/metadata/md5-cache/app-arch/rpm-4.14.1-r1
+++ b/metadata/md5-cache/app-arch/rpm-4.14.1-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cfe96ca89f3fe64dd885de02ec5da092
+_md5_=6703c3e09d45646d03f99075e90def93
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.7 b/metadata/md5-cache/app-arch/snappy-1.1.7
index 14e6d23e349a..b38f4461da94 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.7
+++ b/metadata/md5-cache/app-arch/snappy-1.1.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 REQUIRED_USE=!static-libs
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97541846d934c7f4f59f7d38eb841000
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.5 b/metadata/md5-cache/app-arch/unrar-5.6.5
deleted file mode 100644
index e10aa7061f2e..000000000000
--- a/metadata/md5-cache/app-arch/unrar-5.6.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=6
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=unRAR
-RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
-SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.5.tar.gz -> unrar-5.6.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9222129d67579d3b385bf2aa10ad0136
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.6 b/metadata/md5-cache/app-arch/unrar-5.6.6
index dc66fe46b42b..395560ab208a 100644
--- a/metadata/md5-cache/app-arch/unrar-5.6.6
+++ b/metadata/md5-cache/app-arch/unrar-5.6.6
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Uncompress rar files
 EAPI=6
 HOMEPAGE=https://www.rarlab.com/rar_add.htm
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0/5
 SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.6.tar.gz -> unrar-5.6.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d1c10dbcaab79811dd69de7dc129496
+_md5_=4addf7e3ea5ac9b21e88f30ef614e5f9
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.7 b/metadata/md5-cache/app-arch/unrar-5.6.7
deleted file mode 100644
index 5665bbd845df..000000000000
--- a/metadata/md5-cache/app-arch/unrar-5.6.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=6
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=unRAR
-RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
-SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.7.tar.gz -> unrar-5.6.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6fcceb0d7914e0853aedf51e41e2ca4
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.8 b/metadata/md5-cache/app-arch/unrar-5.6.8
new file mode 100644
index 000000000000..8cc0d67fd376
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-5.6.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=6
+HOMEPAGE=https://www.rarlab.com/rar_add.htm
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=unRAR
+RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
+SLOT=0/5
+SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.8.tar.gz -> unrar-5.6.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e6fcceb0d7914e0853aedf51e41e2ca4
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.4-r1 b/metadata/md5-cache/app-arch/zstd-1.3.4-r1
index 9203eb6544cc..380c06123f11 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.4-r1
+++ b/metadata/md5-cache/app-arch/zstd-1.3.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=6
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.3.4.tar.gz -> zstd-1.3.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8f59b177ecbaa86ee776460a10583674
+_md5_=ef4ab2a7def808c120ea3eb3e1de1269
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 4a7880664eee..5afa72acde4e 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/btrbk-0.27.0 b/metadata/md5-cache/app-backup/btrbk-0.27.0
new file mode 100644
index 000000000000..774f217d77ac
--- /dev/null
+++ b/metadata/md5-cache/app-backup/btrbk-0.27.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst preinst
+DEPEND=>=app-text/asciidoc-8.6.0 app-text/xmlto
+DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
+EAPI=7
+HOMEPAGE=https://digint.ch/btrbk/
+IUSE=+pv
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
+SLOT=0
+SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.27.0.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a634d633c1588707bb79c0e23c4f3170
diff --git a/metadata/md5-cache/app-backup/btrbk-9999 b/metadata/md5-cache/app-backup/btrbk-9999
index b2d4a38b3ea3..698a2006ffe7 100644
--- a/metadata/md5-cache/app-backup/btrbk-9999
+++ b/metadata/md5-cache/app-backup/btrbk-9999
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst preinst unpack
-DEPEND=>=app-text/asciidoc-8.6.0 app-text/xmlto virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=app-text/asciidoc-8.6.0 app-text/xmlto
 DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=6
+EAPI=7
 HOMEPAGE=https://digint.ch/btrbk/
 IUSE=+pv
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d84c0089ee1d686a83ecc197f7743377
+_md5_=3e29ea1be0813ec5033521fe2ae1596a
diff --git a/metadata/md5-cache/app-backup/kfoldersync-3.4.1 b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
index 8ffc8de92e18..34258eb3715a 100644
--- a/metadata/md5-cache/app-backup/kfoldersync-3.4.1
+++ b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend 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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Folder synchronization and backup tool based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/p/1127677/
 IUSE=debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
-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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1485353737/kfoldersync-3.4.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=385cf950f892f1ef07dbe0557526c425
diff --git a/metadata/md5-cache/app-backup/rdedup-1.0.2 b/metadata/md5-cache/app-backup/rdedup-1.0.2
index c4b9d3cb8e89..c3d814f676b0 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
+DEPEND=>=dev-libs/libsodium-1.0.11 virtual/cargo
 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	da08619f6c16047185d20223904c8aef	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=958dc843c0bb13509bff3a0c563d4bea
diff --git a/metadata/md5-cache/app-backup/rear-2.4 b/metadata/md5-cache/app-backup/rear-2.4
new file mode 100644
index 000000000000..bcb08b0b56ab
--- /dev/null
+++ b/metadata/md5-cache/app-backup/rear-2.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Relax-and-Recover is a setup-and-forget bare metal disaster recovery solution
+EAPI=6
+HOMEPAGE=http://relax-and-recover.org/
+IUSE=libressl udev samba
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) samba? ( net-fs/cifs-utils ) udev? ( virtual/udev )
+SLOT=0
+SRC_URI=https://github.com/rear/rear/archive/2.4.tar.gz -> rear-2.4.tar.gz
+_md5_=d530de456773b61eb131eb9ec1683e4a
diff --git a/metadata/md5-cache/app-backup/restic-0.9.3 b/metadata/md5-cache/app-backup/restic-0.9.3
new file mode 100644
index 000000000000..1b50c48895cb
--- /dev/null
+++ b/metadata/md5-cache/app-backup/restic-0.9.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=sys-fs/fuse:0 >=dev-lang/go-1.9
+DESCRIPTION=A backup program that is fast, efficient and secure
+EAPI=6
+HOMEPAGE=https://restic.github.io/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD-2
+RDEPEND=sys-fs/fuse:0
+SLOT=0
+SRC_URI=https://github.com/restic/restic/archive/v0.9.3.tar.gz -> restic-0.9.3.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7e2dbdbf792732e212edaf20ad8cc9aa
diff --git a/metadata/md5-cache/app-backup/snapper-0.5.6 b/metadata/md5-cache/app-backup/snapper-0.5.6
index c17c3e417b93..56fa2674ffda 100644
--- a/metadata/md5-cache/app-backup/snapper-0.5.6
+++ b/metadata/md5-cache/app-backup/snapper-0.5.6
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line program for btrfs and lvm snapshot management
 EAPI=6
 HOMEPAGE=http://snapper.io/
 IUSE=lvm pam xattr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/snapper/snapper-0.5.6.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=272fdcff17ab16c69823aa0124de84bc
+_md5_=3865174f44e13f8e76ac54a6bcc7b2f0
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index d998b73abbec..ce1e404a8a76 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r1 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r1
new file mode 100644
index 000000000000..3933e804145b
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r1
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=sys-devel/gettext-0.18.1.1 )
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit x11-misc/makedepend filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig
+DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/cdrtools/
+IUSE=acl caps nls unicode +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
+RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
+SLOT=0
+SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a09.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=bfa7eab0a14cb747c416d61bc35f60af
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r2 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r2
new file mode 100644
index 000000000000..a2737486908c
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r2
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=sys-devel/gettext-0.18.1.1 )
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit selinux? ( sec-policy/selinux-cdrecord ) x11-misc/makedepend filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig
+DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/cdrtools/
+IUSE=acl caps nls unicode selinux +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
+RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit selinux? ( sec-policy/selinux-cdrecord )
+SLOT=0
+SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a09.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4a2d80fdf5f3f04fe420f745af25612f
diff --git a/metadata/md5-cache/app-cdr/dumpet-2.1 b/metadata/md5-cache/app-cdr/dumpet-2.1
index 5ebf998f1bdb..57bbc8c156d5 100644
--- a/metadata/md5-cache/app-cdr/dumpet-2.1
+++ b/metadata/md5-cache/app-cdr/dumpet-2.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=prepare setup unpack
 DEPEND=dev-libs/libxml2 dev-libs/popt virtual/pkgconfig >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=A tool to dump and debug bootable CD-like images
 EAPI=6
-HOMEPAGE=https://fedora.pkgs.org/rawhide/fedora-x86_64/dumpet-2.1-15.fc27.x86_64.rpm.html
+HOMEPAGE=https://github.com/rhboot/dumpet
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/popt
 SLOT=0
 SRC_URI=http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/source/tree/Packages/d/dumpet-2.1-15.fc27.src.rpm
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=35f14e42439fa45a7aabd1e49c2ef756
+_md5_=a5aed4a0aa6e8e6abc6f8ad978f2d413
diff --git a/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601 b/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601
new file mode 100644
index 000000000000..736e565f3d28
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile prepare setup unpack
+DEPEND=dev-libs/libxml2 dev-libs/popt virtual/pkgconfig >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=A tool to dump and debug bootable CD-like images
+EAPI=6
+HOMEPAGE=https://github.com/rhboot/dumpet
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 dev-libs/popt
+SLOT=0
+SRC_URI=https://github.com/rhboot/dumpet/archive/8f47670dd582c96ad1b6dd3c9b9da0acebded5d8.tar.gz -> dumpet-2.1_p20140601.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_md5_=eaca2125d4f377a4cc1e1795b4087a1e
diff --git a/metadata/md5-cache/app-cdr/dvdisaster-0.79.5 b/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
index 7f43520f9f09..123b53386f0f 100644
--- a/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
+++ b/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for creating error correction data (ecc) for optical media (DVD
 EAPI=6
 HOMEPAGE=http://dvdisaster.net/
 IUSE=debug nls l10n_cs l10n_de l10n_it l10n_pt-BR l10n_ru l10n_sv
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.32:2 nls? ( virtual/libintl ) >=x11-libs/gtk+-2.6:2 x11-libs/gdk-pixbuf
 SLOT=0
 SRC_URI=http://dvdisaster.net/downloads/dvdisaster-0.79.5.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d9800e3fbb9716b7c630425f74ca2020
+_md5_=e9542d58fd6072ddf14ab41e851c9613
diff --git a/metadata/md5-cache/app-cdr/isoimagewriter-0.2 b/metadata/md5-cache/app-cdr/isoimagewriter-0.2
index 9589f6ce620b..4d15be5be172 100644
--- a/metadata/md5-cache/app-cdr/isoimagewriter-0.2
+++ b/metadata/md5-cache/app-cdr/isoimagewriter-0.2
@@ -1,13 +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/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gpgme[cxx,qt5] virtual/libudev:= 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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gpgme[cxx,qt5] virtual/libudev:= 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Write hybrid ISO files onto a USB disk
 EAPI=6
 HOMEPAGE=http://wiki.rosalab.com/en/index.php/Blog:ROSA_Planet/ROSA_Image_Writer
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gpgme[cxx,qt5] virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gpgme[cxx,qt5] virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/isoimagewriter/0.2/isoimagewriter-0.2.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c5d00f83d2e0c7e7e80c4c6e9e8ea1b
diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.7.2 b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
index 754b5398ad4f..9eff4d6af3a4 100644
--- a/metadata/md5-cache/app-cdr/kcdemu-0.7.2
+++ b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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 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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Frontend to cdemu daemon based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/p/998461/
 IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=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/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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 >=app-cdr/cdemu-2.0.0[cdemu-daemon] !app-cdr/kcdemu:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-cdr/cdemu-2.0.0[cdemu-daemon] !app-cdr/kcdemu:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1481242372/kde_cdemu-0.7.2.tar.bz2 -> kcdemu-0.7.2.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dbdbdd49b9d5072e2d3840475d87d785
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index ded0285c3a06..8366596389c4 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/acme-sh-2.7.9 b/metadata/md5-cache/app-crypt/acme-sh-2.7.9
new file mode 100644
index 000000000000..9a8200d91c34
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-sh-2.7.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=An ACME Shell script
+EAPI=7
+HOMEPAGE=https://github.com/Neilpang/acme.sh
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-misc/curl || ( dev-libs/libressl dev-libs/openssl:0 ) || ( net-analyzer/netcat6 net-analyzer/openbsd-netcat ) || ( net-misc/socat www-servers/apache:2 www-servers/nginx:0 ) virtual/cron
+SLOT=0
+SRC_URI=https://github.com/Neilpang/acme.sh/archive/2.7.9.tar.gz -> acme.sh-2.7.9.tar.gz
+_md5_=721401a96fe70ae9f2387dc9fecaaa48
diff --git a/metadata/md5-cache/app-crypt/acme-sh-9999 b/metadata/md5-cache/app-crypt/acme-sh-9999
new file mode 100644
index 000000000000..14de674934ea
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-sh-9999
@@ -0,0 +1,10 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install unpack
+DESCRIPTION=An ACME Shell script
+EAPI=7
+HOMEPAGE=https://github.com/Neilpang/acme.sh
+LICENSE=GPL-3
+RDEPEND=net-misc/curl || ( dev-libs/libressl dev-libs/openssl:0 ) || ( net-analyzer/netcat6 net-analyzer/openbsd-netcat ) || ( net-misc/socat www-servers/apache:2 www-servers/nginx:0 ) virtual/cron
+SLOT=0
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9
+_md5_=1d79a607dc8b8177c191b6747cb82aca
diff --git a/metadata/md5-cache/app-crypt/argon2-20171227 b/metadata/md5-cache/app-crypt/argon2-20171227
index 11ff512754c7..0122ecd49f74 100644
--- a/metadata/md5-cache/app-crypt/argon2-20171227
+++ b/metadata/md5-cache/app-crypt/argon2-20171227
@@ -3,8 +3,8 @@ DESCRIPTION=Password hashing software that won the Password Hashing Competition
 EAPI=6
 HOMEPAGE=https://github.com/P-H-C/phc-winner-argon2
 IUSE=static-libs
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( Apache-2.0 CC0-1.0 )
 SLOT=0/1
 SRC_URI=https://github.com/P-H-C/phc-winner-argon2/archive/20171227.tar.gz -> argon2-20171227.tar.gz
-_md5_=c1af3556b0750795aa3fd2d45c5fa4fc
+_md5_=1502624dee1970e302049a5ac152e2f3
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.30 b/metadata/md5-cache/app-crypt/ccid-1.4.30
new file mode 100644
index 000000000000..fbd381853fe1
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.30
@@ -0,0 +1,14 @@
+BDEPEND=kernel_linux? ( virtual/pkgconfig ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
+DESCRIPTION=CCID free software driver
+EAPI=7
+HOMEPAGE=https://ccid.apdu.fr/
+IUSE=twinserial kobil-midentity +usb
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+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.30.tar.bz2
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=319693d76f03ea2b6489d971b1c0b306
diff --git a/metadata/md5-cache/app-crypt/eid-mw-4.3.6 b/metadata/md5-cache/app-crypt/eid-mw-4.3.6
deleted file mode 100644
index 26b5bfabafe5..000000000000
--- a/metadata/md5-cache/app-crypt/eid-mw-4.3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
-EAPI=6
-HOMEPAGE=https://eid.belgium.be
-IUSE=+dialogs +gtk p11-kit +xpi
-KEYWORDS=~x86 ~amd64 ~arm
-LICENSE=LGPL-3
-RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) )
-REQUIRED_USE=dialogs? ( gtk )
-SLOT=0
-SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.3.6 -> eid-mw-4.3.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=24ed6fa7f47d75595f0a7690fa94ee51
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.10 b/metadata/md5-cache/app-crypt/gnupg-2.2.10
index 0dba50d1bc18..9dad2ace02a7 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.10
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.10
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.10.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1bdff56ce887de2e7ef6c8bc2fa988e0
+_md5_=696a0824f038cebd6e0de7c612f090f8
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.10-r1 b/metadata/md5-cache/app-crypt/gnupg-2.2.10-r1
deleted file mode 100644
index 7fd48441a94a..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=!app-crypt/dirmngr >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=7
-HOMEPAGE=http://www.gnupg.org/
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!app-crypt/dirmngr >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.10.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3f2aa379b01559764a3119ba5b2527fe
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.10-r2 b/metadata/md5-cache/app-crypt/gnupg-2.2.10-r2
new file mode 100644
index 000000000000..3a8abf00a643
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.10-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=!app-crypt/dirmngr >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta
+DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
+EAPI=7
+HOMEPAGE=http://www.gnupg.org/
+IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!app-crypt/dirmngr >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.10.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3c57f44dd9f6fd2b5f1b97d07c9d0a92
diff --git a/metadata/md5-cache/app-crypt/gpa-0.10.0 b/metadata/md5-cache/app-crypt/gpa-0.10.0
new file mode 100644
index 000000000000..01826325331a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gpa-0.10.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure prepare
+DEPEND=>=app-crypt/gnupg-2:= >=app-crypt/gpgme-1.11.1:= >=dev-libs/libassuan-1.1.0:= >=dev-libs/libgpg-error-1.4:= >=x11-libs/gtk+-2.10.0:2=
+DESCRIPTION=The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG
+EAPI=7
+HOMEPAGE=http://gpa.wald.intevation.org
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-crypt/gnupg-2:= >=app-crypt/gpgme-1.11.1:= >=dev-libs/libassuan-1.1.0:= >=dev-libs/libgpg-error-1.4:= >=x11-libs/gtk+-2.10.0:2=
+SLOT=0
+SRC_URI=mirror://gnupg/gpa/gpa-0.10.0.tar.bz2
+_md5_=b7fa36a0d0cda94b1aca5b001dda0575
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.12.0 b/metadata/md5-cache/app-crypt/gpgme-1.12.0
new file mode 100644
index 000000000000..e1e218d37450
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gpgme-1.12.0
@@ -0,0 +1,15 @@
+BDEPEND=python? ( dev-lang/swig ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error-1.29:= 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(-)] ) qt5? ( dev-qt/qtcore:5 ) qt5? ( dev-qt/qttest:5 )
+DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
+EAPI=7
+HOMEPAGE=http://www.gnupg.org/related_software/gpgme
+IUSE=common-lisp static-libs cxx python qt5 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error-1.29:= 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(-)] ) qt5? ( dev-qt/qtcore:5 ) cxx? ( !<kde-apps/gpgmepp-4.14.11_pre20160611:4 !kde-apps/gpgmepp:5 !<kde-apps/kdepimlibs-4.14.10_p20160611:4 !=kde-apps/kdepimlibs-4.14.11_pre20160211*:4 )
+REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=1/11
+SRC_URI=mirror://gnupg/gpgme/gpgme-1.12.0.tar.bz2
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=655805ddb67a14701c6bb46d428a02d7
diff --git a/metadata/md5-cache/app-crypt/keybase-2.7.3 b/metadata/md5-cache/app-crypt/keybase-2.7.3
new file mode 100644
index 000000000000..969c2c50c317
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/keybase-2.7.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=~app-crypt/kbfs-2.6.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.7.3.tar.gz -> keybase-2.7.3.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6566000d1382d2fad0a78a22c7436bc0
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.0-r1 b/metadata/md5-cache/app-crypt/libmd-1.0.0-r1
index f4f58aca5f87..0cfd97c2711c 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.0-r1
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Message Digest functions from BSD systems
 EAPI=6
 HOMEPAGE=https://www.hadrons.org/software/libmd/
 IUSE=static-libs
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 SLOT=0
 SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.0.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3545f1abfcbe0546266c80a918497ab4
+_md5_=2375d94bb719deddc8252a52e8d4cacb
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2 b/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2
index 798de6bcb974..589cb8d05dbd 100644
--- a/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2
+++ b/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
 EAPI=6
 HOMEPAGE=https://gnupg.org/aegypten2/index.html
 IUSE=caps emacs gnome-keyring fltk gtk ncurses qt5 static
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) fltk? ( x11-libs/fltk ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) gnome-keyring? ( app-crypt/gcr )
 REQUIRED_USE=gtk? ( !static ) qt5? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74aeb1f6131a894a30350fa4c3edc8b3
+_md5_=dfa9b78a1ea5eb6b8de28d90f49c8077
diff --git a/metadata/md5-cache/app-crypt/ssdeep-2.13 b/metadata/md5-cache/app-crypt/ssdeep-2.13
deleted file mode 100644
index c706f00687dd..000000000000
--- a/metadata/md5-cache/app-crypt/ssdeep-2.13
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install prepare test
-DESCRIPTION=Computes context triggered piecewise hashes (fuzzy hashes)
-EAPI=7
-HOMEPAGE=http://ssdeep.sourceforge.net/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/ssdeep/ssdeep-2.13.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b977f814004b0f0c500b35c8231a01b9
diff --git a/metadata/md5-cache/app-crypt/ssdeep-2.14.1 b/metadata/md5-cache/app-crypt/ssdeep-2.14.1
new file mode 100644
index 000000000000..5d13b75bb3c1
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/ssdeep-2.14.1
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install prepare test
+DESCRIPTION=Computes context triggered piecewise hashes (fuzzy hashes)
+EAPI=7
+HOMEPAGE=http://ssdeep.sourceforge.net/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/ssdeep-project/ssdeep/releases/download/release-2.14.1/ssdeep-2.14.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5e87554a3b2970956766edabc3130d43
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 6b0c076d0532..12294fdaa875 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/dikt-2s_p1 b/metadata/md5-cache/app-dicts/dikt-2s_p1
index 1eb567937b97..145f5492274d 100644
--- a/metadata/md5-cache/app-dicts/dikt-2s_p1
+++ b/metadata/md5-cache/app-dicts/dikt-2s_p1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A dictionary application that implements the Dict protocol
 EAPI=6
 HOMEPAGE=https://www.dikt.tv/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=>=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/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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-dicts/dikt:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-dicts/dikt:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://bitbucket.org/dikt/code/downloads/dikt-2s1.txz -> dikt-2s1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4efbd95f33a9395d2ab4da70f8b13e7
diff --git a/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1 b/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1
index a581efe91ba0..5fda74568ac6 100644
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1
+++ b/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.42:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.21.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.42:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.21.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) >=dev-util/gtk-doc-am-1.15 dev-util/glib-utils >=dev-util/intltool-0.40 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Dictionary utility for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Dictionary
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.42:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.21.1:3 x
 SLOT=0/10
 SRC_URI=mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=85a031dfce3bbd92255dc793a96bfd63
+_md5_=115ee5d8c5aa40ef6e7070fc97fccfb8
diff --git a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1 b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
new file mode 100644
index 000000000000..0185f4f68850
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Dutch dictionaries for myspell/hunspell
+EAPI=7
+HOMEPAGE=https://www.opentaal.org
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD-2 CC-BY-3.0
+SLOT=0
+SRC_URI=https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-210g-voor-openofficeorg-3?bid=20&agree=1 -> myspell-nl-2.10g.oxt https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> myspell-nl-2.10g_thes.oxt
+_eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
+_md5_=40b004da631f5b702cf3570295d522dc
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 732e73779d53..bbb54156378f 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.0 b/metadata/md5-cache/app-doc/gnucash-docs-3.0
deleted file mode 100644
index 7e0aa03623fb..000000000000
--- a/metadata/md5-cache/app-doc/gnucash-docs-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=!<=app-office/gnucash-2.2.1 >=dev-libs/libxml2-2.5.10:2 dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 app-text/rarian test? ( app-text/docbook-xml-dtd:4.4 ) >=app-portage/elt-patches-20170815 !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Documentation package for GnuCash
-EAPI=6
-HOMEPAGE=http://www.gnucash.org/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 FDL-1.1
-RDEPEND=!<=app-office/gnucash-2.2.1
-SLOT=0
-SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.0.tar.gz -> gnucash-docs-3.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3ce21f8f1e82eca88cb9511a79f320c3
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.1 b/metadata/md5-cache/app-doc/gnucash-docs-3.1
deleted file mode 100644
index 0f38f8d1a3fe..000000000000
--- a/metadata/md5-cache/app-doc/gnucash-docs-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=!<=app-office/gnucash-2.2.1 >=dev-libs/libxml2-2.5.10:2 dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 app-text/rarian test? ( app-text/docbook-xml-dtd:4.4 ) >=app-portage/elt-patches-20170815 !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Documentation package for GnuCash
-EAPI=6
-HOMEPAGE=http://www.gnucash.org/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 FDL-1.1
-RDEPEND=!<=app-office/gnucash-2.2.1
-SLOT=0
-SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.1.tar.gz -> gnucash-docs-3.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3ce21f8f1e82eca88cb9511a79f320c3
diff --git a/metadata/md5-cache/app-doc/single-unix-specification-3 b/metadata/md5-cache/app-doc/single-unix-specification-3
deleted file mode 100644
index 77a8ed889b23..000000000000
--- a/metadata/md5-cache/app-doc/single-unix-specification-3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=The Single UNIX Specification, Version 3, 2004 Edition (8 Volumes)
-EAPI=0
-HOMEPAGE=http://www.opengroup.org/bookstore/catalog/t041.htm
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=sus3-copyright
-RESTRICT=mirror
-SLOT=3
-SRC_URI=http://www.opengroup.org/onlinepubs/009695399/download/susv3.tar.bz2
-_md5_=f23234f6827a93955c6735189a561410
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index fc3cb380f336..f901d61f9e91 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/bvi-1.4.0 b/metadata/md5-cache/app-editors/bvi-1.4.0
new file mode 100644
index 000000000000..32f2bbbaf78f
--- /dev/null
+++ b/metadata/md5-cache/app-editors/bvi-1.4.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Display-oriented editor for binary files, based on the vi texteditor
+EAPI=7
+HOMEPAGE=http://bvi.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/bvi/bvi-1.4.0.src.tar.gz
+_md5_=00bd8450ef0c00ffa2428b6a1d33135b
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r7 b/metadata/md5-cache/app-editors/emacs-24.5-r7
index 6c5551b7cae4..176a5e41880c 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r7
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r7
@@ -5,11 +5,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr 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 m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !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 ) ) ) ) ) !<app-editors/emacs-vcs-24.5
 REQUIRED_USE=?? ( aqua X )
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1ba785c15a44f4ff372b98ae72f4f542
+_md5_=5e2dac89e268612900109c0eb73d26fe
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r6 b/metadata/md5-cache/app-editors/emacs-25.3-r6
index ba9cda352b73..ec1314a6a5b2 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r6
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r6
@@ -5,11 +5,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 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 gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/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? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !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 ) ) ) ) ) !<app-editors/emacs-vcs-25.3
 REQUIRED_USE=?? ( aqua X )
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=61cb2022993d1378c4dcfa13614bd75d
+_md5_=fdd40d60fc5ea1654ba1855a981e43a7
diff --git a/metadata/md5-cache/app-editors/emacs-26.1-r3 b/metadata/md5-cache/app-editors/emacs-26.1-r3
index 4fd419d0eac5..560912ba7695 100644
--- a/metadata/md5-cache/app-editors/emacs-26.1-r3
+++ b/metadata/md5-cache/app-editors/emacs-26.1-r3
@@ -5,11 +5,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 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 gtk2 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
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 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? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !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 ) ) ) ) ) !<app-editors/emacs-vcs-26.1
 REQUIRED_USE=?? ( aqua X )
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.1-patches-2.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=350952edf8de9ea8586068810c32e682
+_md5_=49c67faa90c3ebedf2b464a0d37638a0
diff --git a/metadata/md5-cache/app-editors/focuswriter-1.6.13 b/metadata/md5-cache/app-editors/focuswriter-1.6.13
index 95c4bba9ff2b..0ba3b5660fc1 100644
--- a/metadata/md5-cache/app-editors/focuswriter-1.6.13
+++ b/metadata/md5-cache/app-editors/focuswriter-1.6.13
@@ -3,10 +3,10 @@ DEPEND=app-text/hunspell:= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtmultimedia:5
 DESCRIPTION=A fullscreen and distraction-free word processor
 EAPI=6
 HOMEPAGE=https://gottcode.org/focuswriter/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3 GPL-3
 RDEPEND=app-text/hunspell:= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 sys-libs/zlib
 SLOT=0
 SRC_URI=https://gottcode.org/focuswriter/focuswriter-1.6.13-src.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9fd6c7967edc2c7ce0780a8810b9d697
+_md5_=dd21106aca5e02ddf6e28eae9c08c957
diff --git a/metadata/md5-cache/app-editors/gedit-3.28.1 b/metadata/md5-cache/app-editors/gedit-3.28.1
index 9901fcd0134b..a7ab0ceaf243 100644
--- a/metadata/md5-cache/app-editors/gedit-3.28.1
+++ b/metadata/md5-cache/app-editors/gedit-3.28.1
@@ -1,5 +1,5 @@
 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-20170815 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 )
+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/glib-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.50.1 >=sys-devel/gettext-0.18 virtual/pkgconfig >=app-portage/elt-patches-20170815 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
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_4 python_
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/3.28/gedit-3.28.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9168b8d12be95c1dfcc6de062e539183
+_md5_=47e1c6aea2682f54a7eee970a97f78f8
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-3.28.1 b/metadata/md5-cache/app-editors/gedit-plugins-3.28.1
new file mode 100644
index 000000000000..85c76dcd38bb
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gedit-plugins-3.28.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=app-editors/gedit-3.16 >=dev-libs/glib-2.32:2 >=dev-libs/libpeas-1.7.0[gtk] >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-3.21.3:3.0 python? ( python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=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(+)?] >=app-editors/gedit-3.16[introspection,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-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(+)?] >=dev-python/dbus-python-0.82[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[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(+)?] >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6 ) terminal? ( x11-libs/vte:2.91[introspection] ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) app-text/yelp-tools >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official plugins for gedit
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins
+IUSE=+python charmap git terminal 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
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/gedit-3.16 >=dev-libs/glib-2.32:2 >=dev-libs/libpeas-1.7.0[gtk] >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-3.21.3:3.0 python? ( python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=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(+)?] >=app-editors/gedit-3.16[introspection,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-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(+)?] >=dev-python/dbus-python-0.82[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[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(+)?] >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6 ) terminal? ( x11-libs/vte:2.91[introspection] ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) )
+REQUIRED_USE=charmap? ( python ) git? ( python ) 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 ) ) terminal? ( python )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gedit-plugins/3.28/gedit-plugins-3.28.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2312fb8ad65c5ca991e9068590b27bca
diff --git a/metadata/md5-cache/app-editors/ghex-3.18.3 b/metadata/md5-cache/app-editors/ghex-3.18.3
index 4616aac30b2f..09f27d0dcc1e 100644
--- a/metadata/md5-cache/app-editors/ghex-3.18.3
+++ b/metadata/md5-cache/app-editors/ghex-3.18.3
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 >=dev-
 DESCRIPTION=GNOME hexadecimal editor
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
-KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/ghex/3.18/ghex-3.18.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=42459be406004710e9857c1f361c117d
+_md5_=7392f17596cb5974f94700a13803a309
diff --git a/metadata/md5-cache/app-editors/kile-2.9.92 b/metadata/md5-cache/app-editors/kile-2.9.92
index 30e96f40928d..374925e88aa7 100644
--- a/metadata/md5-cache/app-editors/kile-2.9.92
+++ b/metadata/md5-cache/app-editors/kile-2.9.92
@@ -1,13 +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/kdoctools-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/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/okular-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 pdf? ( app-text/poppler[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 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdoctools-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/okular-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 pdf? ( app-text/poppler[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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Latex Editor and TeX shell based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://kile.sourceforge.io/
 IUSE=+pdf +png debug +handbook
 KEYWORDS=amd64 x86
 LICENSE=FDL-1.2 GPL-2
-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/kdoctools-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/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/okular-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-17.12.3:5 >=kde-apps/okular-17.12.3:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( >=app-text/texlive-core-2014 app-text/ghostscript-gpl ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdoctools-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/okular-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-18.04.3:5 >=kde-apps/okular-18.04.3:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( >=app-text/texlive-core-2014 app-text/ghostscript-gpl ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kile/kile-2.9.92.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f1ba6770546e81551f08d66e4e1478bd
diff --git a/metadata/md5-cache/app-editors/leafpad-0.8.18.1-r1 b/metadata/md5-cache/app-editors/leafpad-0.8.18.1-r1
new file mode 100644
index 000000000000..8759b4eaf556
--- /dev/null
+++ b/metadata/md5-cache/app-editors/leafpad-0.8.18.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=virtual/libintl x11-libs/gtk+:2 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A simple GTK2 text editor
+EAPI=6
+HOMEPAGE=http://tarot.freeshell.org/leafpad/
+IUSE=emacs
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=virtual/libintl x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://nongnu/leafpad/leafpad-0.8.18.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=500470335603847c7a243d8d4f7579dd
diff --git a/metadata/md5-cache/app-editors/nano-2.8.7 b/metadata/md5-cache/app-editors/nano-2.8.7
deleted file mode 100644
index f98537d4b89c..000000000000
--- a/metadata/md5-cache/app-editors/nano-2.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=6
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v2.8/nano-2.8.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca9f404e4c3faf8bb1cb281ec270c7a8
diff --git a/metadata/md5-cache/app-editors/nano-2.9.8 b/metadata/md5-cache/app-editors/nano-2.9.8
index de0de802c582..736e75837348 100644
--- a/metadata/md5-cache/app-editors/nano-2.9.8
+++ b/metadata/md5-cache/app-editors/nano-2.9.8
@@ -4,10 +4,10 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=6
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v2.9/nano-2.9.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a7fd5f0221cbfbcbf8eed89607efe1f
+_md5_=6a5f67703c3271bf15d92ae73065dd07
diff --git a/metadata/md5-cache/app-editors/nano-3.0-r1 b/metadata/md5-cache/app-editors/nano-3.0-r1
deleted file mode 100644
index 2306a5915796..000000000000
--- a/metadata/md5-cache/app-editors/nano-3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=7
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v3/nano-3.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ee3c615ea09d559edb5c869a25796fcf
diff --git a/metadata/md5-cache/app-editors/notepadqq-1.4.8 b/metadata/md5-cache/app-editors/notepadqq-1.4.8
index 0c5d4be1b6bf..43f42fa0e205 100644
--- a/metadata/md5-cache/app-editors/notepadqq-1.4.8
+++ b/metadata/md5-cache/app-editors/notepadqq-1.4.8
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:
 SLOT=0
 SRC_URI=https://github.com/notepadqq/notepadqq/archive/v1.4.8.tar.gz -> notepadqq-1.4.8.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4cb6e74b023c28d5f18ee658e48bdfab
+_md5_=b9ff35146d267841c60a239f8b3fe5cd
diff --git a/metadata/md5-cache/app-editors/notepadqq-9999 b/metadata/md5-cache/app-editors/notepadqq-9999
index f5611e39be35..8329c651c46a 100644
--- a/metadata/md5-cache/app-editors/notepadqq-9999
+++ b/metadata/md5-cache/app-editors/notepadqq-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cf6957556d844213174afe26cf4e3a55
+_md5_=f037e3fd36fb9db7075797653e6b2ac6
diff --git a/metadata/md5-cache/app-editors/okteta-0.25.3 b/metadata/md5-cache/app-editors/okteta-0.25.3
index 656968f5670f..e7e4aa681a1b 100644
--- a/metadata/md5-cache/app-editors/okteta-0.25.3
+++ b/metadata/md5-cache/app-editors/okteta-0.25.3
@@ -1,13 +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
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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
+RDEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/okteta/0.25.3/src/okteta-0.25.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=549e9a674434a8fa767882c285a33e4a
diff --git a/metadata/md5-cache/app-editors/okteta-0.25.4 b/metadata/md5-cache/app-editors/okteta-0.25.4
new file mode 100644
index 000000000000..b92352d4a86b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/okteta-0.25.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/okteta/0.25.4/src/okteta-0.25.4.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=edf9f3143fa3cd03fa9a7521c909fbb4
diff --git a/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3 b/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3
deleted file mode 100644
index a655238cb8dd..000000000000
--- a/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-text/aspell dev-libs/libxml2 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre !aqua? ( x11-libs/wxGTK:3.0[X] ) aqua? ( x11-libs/wxGTK:3.0[aqua] ) dev-libs/boost dev-util/intltool >=app-portage/elt-patches-20170815 !<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=XML Copy Editor is a fast, free, validating XML editor
-EAPI=5
-HOMEPAGE=http://xml-copy-editor.sourceforge.net/
-IUSE=aqua nls
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=app-text/aspell dev-libs/libxml2 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre !aqua? ( x11-libs/wxGTK:3.0[X] ) aqua? ( x11-libs/wxGTK:3.0[aqua] )
-SLOT=0
-SRC_URI=mirror://sourceforge/xml-copy-editor/xmlcopyeditor-1.2.1.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=ed968e6bb368acd08d13e9d1b0eea240
diff --git a/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3-r1 b/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3-r1
new file mode 100644
index 000000000000..6559c99188fa
--- /dev/null
+++ b/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=app-text/aspell dev-libs/libxml2 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre !aqua? ( x11-libs/wxGTK:3.0[X] ) aqua? ( x11-libs/wxGTK:3.0[aqua] ) dev-libs/boost dev-util/intltool >=app-portage/elt-patches-20170815 !<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=XML Copy Editor is a fast, free, validating XML editor
+EAPI=6
+HOMEPAGE=http://xml-copy-editor.sourceforge.net/
+IUSE=aqua nls
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=app-text/aspell dev-libs/libxml2 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre !aqua? ( x11-libs/wxGTK:3.0[X] ) aqua? ( x11-libs/wxGTK:3.0[aqua] )
+SLOT=0
+SRC_URI=mirror://sourceforge/xml-copy-editor/xmlcopyeditor-1.2.1.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
+_md5_=f1ee3143c5aab38e42ff53e1d76ada7a
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index dd2237f95d4e..35220a8e9abc 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728 b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
new file mode 100644
index 000000000000..02f4cc714737
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=java? ( app-emacs/jde )
+DESCRIPTION=Source code browser for Emacs
+EAPI=7
+HOMEPAGE=http://ecb.sourceforge.net/
+IUSE=java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=java? ( app-emacs/jde ) >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ecb-2.50_pre20170728.tar.xz
+_eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=04260adf29af0d2919a190e7da4e09b6
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 11f12a8190b4..f7cbffa71f35 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/fuse-1.5.3 b/metadata/md5-cache/app-emulation/fuse-1.5.3
deleted file mode 100644
index 835858561e0d..000000000000
--- a/metadata/md5-cache/app-emulation/fuse-1.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure test
-DEPEND=>=app-emulation/libspectrum-1.4.2 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-sdl? ( media-libs/libsdl ) backend-svga? ( media-libs/svgalib ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 ) backend-fbcon? ( virtual/linux-sources ) dev-lang/perl virtual/pkgconfig
-DESCRIPTION=Free Unix Spectrum Emulator by Philip Kendall
-EAPI=6
-HOMEPAGE=http://fuse-emulator.sourceforge.net
-IUSE=alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-emulation/libspectrum-1.4.2 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-sdl? ( media-libs/libsdl ) backend-svga? ( media-libs/svgalib ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 )
-REQUIRED_USE=?? ( backend-fbcon backend-sdl backend-svga backend-X )
-SLOT=0
-SRC_URI=mirror://sourceforge/fuse-emulator/fuse-1.5.3.tar.gz
-_md5_=561d1457b2fd659c1f15c6a7b23c6f0a
diff --git a/metadata/md5-cache/app-emulation/fuse-1.5.6 b/metadata/md5-cache/app-emulation/fuse-1.5.6
new file mode 100644
index 000000000000..b8c9ee7fa3e6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/fuse-1.5.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure test
+DEPEND=>=app-emulation/libspectrum-1.4.4 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-sdl? ( media-libs/libsdl ) backend-svga? ( media-libs/svgalib ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 ) backend-fbcon? ( virtual/linux-sources ) dev-lang/perl virtual/pkgconfig
+DESCRIPTION=Free Unix Spectrum Emulator by Philip Kendall
+EAPI=6
+HOMEPAGE=http://fuse-emulator.sourceforge.net
+IUSE=alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-emulation/libspectrum-1.4.4 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-sdl? ( media-libs/libsdl ) backend-svga? ( media-libs/svgalib ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 )
+REQUIRED_USE=?? ( backend-fbcon backend-sdl backend-svga backend-X )
+SLOT=0
+SRC_URI=mirror://sourceforge/fuse-emulator/fuse-1.5.6.tar.gz
+_md5_=0e6787cbb98c9f28cf285151e9013a92
diff --git a/metadata/md5-cache/app-emulation/genymotion-bin-2.11.0 b/metadata/md5-cache/app-emulation/genymotion-bin-2.11.0
deleted file mode 100644
index b879e3fe8975..000000000000
--- a/metadata/md5-cache/app-emulation/genymotion-bin-2.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch postinst prepare unpack
-DESCRIPTION=Complete set of tools that provide a virtual environment for Android
-EAPI=6
-HOMEPAGE=https://genymotion.com
-KEYWORDS=-* ~amd64
-LICENSE=genymotion
-RDEPEND=|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 ) virtual/opengl dev-libs/openssl dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwebsockets:5 dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtquickcontrols:5 dev-qt/qtconcurrent:5 dev-qt/qtgraphicaleffects:5 sys-apps/util-linux media-libs/gst-plugins-base:0.10
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=genymotion-2.11.0-linux_x64.bin
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d64c69f90e116b93de5d1c7952e5237b
diff --git a/metadata/md5-cache/app-emulation/genymotion-bin-2.12.2 b/metadata/md5-cache/app-emulation/genymotion-bin-2.12.2
new file mode 100644
index 000000000000..a647bc6730be
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/genymotion-bin-2.12.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch postinst prepare unpack
+DESCRIPTION=Complete set of tools that provide a virtual environment for Android
+EAPI=6
+HOMEPAGE=https://genymotion.com
+KEYWORDS=-* ~amd64
+LICENSE=genymotion
+RDEPEND=|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 ) app-arch/snappy virtual/opengl dev-libs/openssl dev-libs/hiredis media-gfx/graphite2 sys-apps/util-linux media-libs/gst-plugins-base:0.10
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=genymotion-2.12.2-linux_x64.bin
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fd2a8847822cb7deaad8904650525b0d
diff --git a/metadata/md5-cache/app-emulation/libcacard-2.6.0 b/metadata/md5-cache/app-emulation/libcacard-2.6.0
index 43802d203bd8..9749df78846a 100644
--- a/metadata/md5-cache/app-emulation/libcacard-2.6.0
+++ b/metadata/md5-cache/app-emulation/libcacard-2.6.0
@@ -4,9 +4,9 @@ DESCRIPTION=virtual Common Access Card (CAC) library emulator
 EAPI=6
 HOMEPAGE=https://www.spice-space.org/
 IUSE=+passthrough static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/nss-3.13 >=dev-libs/glib-2.22 passthrough? ( >=sys-apps/pcsc-lite-1.8 )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/libcacard/libcacard-2.6.0.tar.xz
-_md5_=91046b8fc0e567f52ba49ab9b1cbaca9
+_md5_=34ea417204513a4703d9faf6b6553d14
diff --git a/metadata/md5-cache/app-emulation/lxd-3.3 b/metadata/md5-cache/app-emulation/lxd-3.3
deleted file mode 100644
index 360277dbf3d7..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=>=dev-lang/go-1.9.4 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq net-misc/curl sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=Fast, dense and secure container management
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
-IUSE=+daemon +ipv6 +dnsmasq nls test kernel_linux
-KEYWORDS=amd64
-LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
-RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/squashfs-tools virtual/acl )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7a97ba420b268356ee08387dcac3622a
diff --git a/metadata/md5-cache/app-emulation/lxd-3.4 b/metadata/md5-cache/app-emulation/lxd-3.4
deleted file mode 100644
index 2ceeef47283f..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-lang/tcl >=dev-lang/go-1.9.4 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq net-misc/curl sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<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=Fast, dense and secure container management
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
-IUSE=+daemon +ipv6 +dnsmasq nls test tools kernel_linux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
-RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/lzo dev-util/xdelta:3 dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-firewall/ebtables net-firewall/iptables[ipv6?] net-libs/libnfnetlink net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/fuse sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=041b15c7205ae285ed4e3b65aba0d380
diff --git a/metadata/md5-cache/app-emulation/lxd-3.4-r1 b/metadata/md5-cache/app-emulation/lxd-3.4-r1
deleted file mode 100644
index e9181d383197..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-3.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-lang/tcl >=dev-lang/go-1.9.4 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq net-misc/curl sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<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=Fast, dense and secure container management
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
-IUSE=+daemon +ipv6 +dnsmasq nls test tools kernel_linux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
-RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/libuv dev-libs/lzo dev-util/xdelta:3 dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-firewall/ebtables net-firewall/iptables[ipv6?] net-libs/libnfnetlink net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/fuse sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=731a86f6c0eba5108c239ecb380a0289
diff --git a/metadata/md5-cache/app-emulation/lxd-3.5 b/metadata/md5-cache/app-emulation/lxd-3.5
index beca9fab661d..c3c6de7ac8b8 100644
--- a/metadata/md5-cache/app-emulation/lxd-3.5
+++ b/metadata/md5-cache/app-emulation/lxd-3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Fast, dense and secure container management
 EAPI=6
 HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
 IUSE=+daemon +ipv6 +dnsmasq nls test tools kernel_linux
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
 RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/libuv dev-libs/lzo dev-util/xdelta:3 dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-firewall/ebtables net-firewall/iptables[ipv6?] net-libs/libnfnetlink net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/fuse sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=96cfe178ff882624e20ceaacd46f38c5
+_md5_=f2ee7cbe8ff5e6a782509e812257b7ff
diff --git a/metadata/md5-cache/app-emulation/lxd-3.6 b/metadata/md5-cache/app-emulation/lxd-3.6
new file mode 100644
index 000000000000..6b8f0867c448
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxd-3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-lang/tcl >=dev-lang/go-1.9.4 dev-libs/libuv dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq net-misc/curl sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<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=Fast, dense and secure container management
+EAPI=6
+HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
+IUSE=+daemon +ipv6 +dnsmasq nls test tools kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
+RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/libuv dev-libs/lzo dev-util/xdelta:3 dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-firewall/ebtables net-firewall/iptables[ipv6?] net-libs/libnfnetlink net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/fuse sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl )
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.6.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=de709f2bb4c9005d3fc8f349ea6ccb5a
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
deleted file mode 100644
index 0c71e7122b2b..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=dev-libs/glib x11-libs/pixman || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
-EAPI=6
-HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=72a81c64958338949bbcce342fbf506f
diff --git a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011 b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011
new file mode 100644
index 000000000000..25c3a4870bb9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Simple virtual machine manager for Linux (QEMU/KVM)
+EAPI=6
+HOMEPAGE=https://github.com/rafaelmartins/simplevirt
+IUSE=kernel_linux
+LICENSE=BSD
+RDEPEND=virtual/logger app-emulation/qemu
+SLOT=0
+SRC_URI=https://github.com/rafaelmartins/simplevirt/archive/2427500bce5bf9b365dc601790704694cd6c772e.tar.gz -> simplevirt-0.0_p20181011.tar.gz https://github.com/inconshreveable/mousetrap/archive/v1.0.0.tar.gz -> github.com-inconshreveable-mousetrap-v1.0.0.tar.gz https://github.com/spf13/cobra/archive/v0.0.3.tar.gz -> github.com-spf13-cobra-v0.0.3.tar.gz https://github.com/spf13/pflag/archive/v1.0.2.tar.gz -> github.com-spf13-pflag-v1.0.2.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.1.tar.gz -> github.com-go-yaml-yaml-v2.2.1.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a325c84a5962b6054211f030baa8fa95
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index 611ec9ff9eda..474991442e5b 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -9,4 +9,4 @@ RDEPEND=!app-emulation/virtinst python_single_target_python3_4? ( dev-lang/pytho
 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
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0abf623914d5896e39957d49440d7063
+_md5_=75a1f4553195ebb8cc103b1583c7a4e5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-5.1.36
deleted file mode 100644
index da02775e2ac2..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.36
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.36 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998_pre20131130-r1 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_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(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.36 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4d8b6f9f1373a10da6bf7b63b2eefeea
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.38 b/metadata/md5-cache/app-emulation/virtualbox-5.1.38
deleted file mode 100644
index 05a4d476809a..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.38
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.38 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998_pre20131130-r1 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_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(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.38 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ca6583917c24fd507005d48884e92946
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.16 b/metadata/md5-cache/app-emulation/virtualbox-5.2.16
deleted file mode 100644
index c4c21ba2815e..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.16 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_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(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.16 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=78ed3706e6a1523751423f22b2becca1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.20 b/metadata/md5-cache/app-emulation/virtualbox-5.2.20
new file mode 100644
index 000000000000..3f003a57cd36
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.20 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_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(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.20 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.20/VirtualBox-5.2.20.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b93276fe776609d4784061d23e619c45
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.36-r1 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.36-r1
deleted file mode 100644
index 09ffd2f98bf6..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.36-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.1.36/VBoxGuestAdditions_5.1.36.iso
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=22c051e04d61f4ef11068257ba6096a1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.38 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.38
deleted file mode 100644
index 3540b4e2a569..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.38
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.1.38/VBoxGuestAdditions_5.1.38.iso
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=378cc9e89df1e573943eb52f7caab439
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.16 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.16
deleted file mode 100644
index b6c2d7766f3c..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.2.16/VBoxGuestAdditions_5.2.16.iso
-_md5_=70aae409f8f86cd224c19e3ecd2126ea
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.20 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.20
new file mode 100644
index 000000000000..719aa35c2efe
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.20
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.20/VBoxGuestAdditions_5.2.20.iso
+_md5_=162348d056219d1eacc55a82afc997d6
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
deleted file mode 100644
index a530a5343588..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-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(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=5
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.1.36 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_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
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_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
deleted file mode 100644
index 1a9ebda9d1ea..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.38.122592
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-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(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=5
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.1.38 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_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
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6040cbe2623647c024ca24a36c9701dc
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
deleted file mode 100644
index a5f7af7df81b..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-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(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.2.16 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_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
-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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=42d5dd5d7511d69dda21fc60b81c5eaf
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.20.125813 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.20.125813
new file mode 100644
index 000000000000..8d2d47ea372f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.20.125813
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+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(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.2.20 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_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
+SLOT=0
+SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.20/VirtualBox-5.2.20-125813-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.20/VirtualBox-5.2.20-125813-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.20/Oracle_VM_VirtualBox_Extension_Pack-5.2.20-125813.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.20-125813.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.20/VirtualBoxSDK-5.2.20-125813.zip )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7d07681c4e896ea30a5d5eb037642107
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.36.122089 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.36.122089
deleted file mode 100644
index b527f7af739b..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.36.122089
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.1.36
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=56ac2b741b877335842940f5d0b0f2cc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.38.122592 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.38.122592
deleted file mode 100644
index 0a6e01b9d7d9..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.38.122592
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.1.38
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=53ce8063968f6913ed36edc5034ac601
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.16.123759 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.16.123759
deleted file mode 100644
index 1cfc2c27042a..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.16.123759
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.2.16
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=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
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=af08d1c9280ee23cfbea5662b65d7675
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.20.125813 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.20.125813
new file mode 100644
index 000000000000..6284b79fac67
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.20.125813
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=~app-emulation/virtualbox-5.2.20
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.20/Oracle_VM_VirtualBox_Extension_Pack-5.2.20-125813.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.20-125813.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2d850bedac9d08eb9a68080a9ccbf71c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
deleted file mode 100644
index 84a97038e281..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=X kernel_linux kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.36 )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=065caf200910a92fcdf4fc774f3a67ed
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.38 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.38
deleted file mode 100644
index b0816bb7ff9f..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.38
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=X kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.38 )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1798e3815715f86de668caf1b34e68c4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.14 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.14
index afc11a2979eb..8540403b203d 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.14
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
 DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
@@ -7,8 +7,8 @@ IUSE=X kernel_linux kernel_linux
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( virtual/modutils )
 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2452c2deba9788d255c79fbeb3d6a50a
+_md5_=c87a2079623023298a338d2ef94b1faf
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.16 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.16
deleted file mode 100644
index cfad35149a83..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=X kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
-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-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee5a0f8b4dc2cd29d5c9d97fe16ffa22
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.18 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.18
index 5417922ada7d..b096f457f81a 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
 DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
@@ -7,8 +7,8 @@ IUSE=X kernel_linux kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.18/VirtualBox-5.2.18.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee5a0f8b4dc2cd29d5c9d97fe16ffa22
+_md5_=88341bb62f81f09e018e3e7a4ba9f733
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.20 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.20
new file mode 100644
index 000000000000..cf809392addf
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.20
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=X kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.20/VirtualBox-5.2.20.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=87b9b297d43c6216132968a5a7b7746b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.36
deleted file mode 100644
index abb45e33829f..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.36
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.1.36.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=092ed3811d7173296ffd18fe11072256
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.38 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.38
deleted file mode 100644
index b092055fc4b2..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.38
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.1.38.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab5f806e303c5e41086eded326594630
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16
deleted file mode 100644
index 763068c91a40..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.2.16.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bccf9dfb12387664d9fd8ca9af9f9601
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.20 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.20
new file mode 100644
index 000000000000..70d499a61291
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=pax_kernel kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.2.20.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b7ac9587694d3bcdaacfad9b62012173
diff --git a/metadata/md5-cache/app-emulation/wine-any-3.14 b/metadata/md5-cache/app-emulation/wine-any-3.14
deleted file mode 100644
index bd44df4ea636..000000000000
--- a/metadata/md5-cache/app-emulation/wine-any-3.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) d3d9? ( media-libs/mesa[d3d9,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(-)?] 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/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( 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(-)?] 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[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(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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=Free implementation of Windows(tm) on Unix, with optional external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) d3d9? ( media-libs/mesa[d3d9,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(-)?] 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/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( 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(-)?] 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[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(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=3.14
-SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.14.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.14.tar.gz -> wine-staging-3.14.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.14.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5f465ddd16dba9306b4d6af72d03a751
diff --git a/metadata/md5-cache/app-emulation/wine-any-3.18 b/metadata/md5-cache/app-emulation/wine-any-3.18
new file mode 100644
index 000000000000..088cd8c0f47b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-any-3.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) d3d9? ( media-libs/mesa[d3d9,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(-)?] 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/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( 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(-)?] 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[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(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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=Free implementation of Windows(tm) on Unix, with optional external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) d3d9? ( media-libs/mesa[d3d9,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(-)?] 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/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( 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(-)?] 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[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(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=3.18
+SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.18.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.18.tar.gz -> wine-staging-3.18.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.18.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0dfd84c73a83139362aebe9132dff33d
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-3.14 b/metadata/md5-cache/app-emulation/wine-d3d9-3.14
deleted file mode 100644
index fd6b4a57bc85..000000000000
--- a/metadata/md5-cache/app-emulation/wine-d3d9-3.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) d3d9? ( media-libs/mesa[d3d9,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(-)?] 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/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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=Free implementation of Windows(tm) on Unix, with Gallium Nine patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) d3d9? ( media-libs/mesa[d3d9,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(-)?] 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/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=3.14
-SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.14.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.14.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=db32ff685a7acc2ecb3afee0fe8db1e2
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-3.18 b/metadata/md5-cache/app-emulation/wine-d3d9-3.18
new file mode 100644
index 000000000000..7306d5e8db61
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-3.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) d3d9? ( media-libs/mesa[d3d9,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(-)?] 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/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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=Free implementation of Windows(tm) on Unix, with Gallium Nine patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) d3d9? ( media-libs/mesa[d3d9,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(-)?] 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/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=3.18
+SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.18.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.18.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=af63c1b23c0f3bbe8648de1e897ee172
diff --git a/metadata/md5-cache/app-emulation/wine-staging-3.14 b/metadata/md5-cache/app-emulation/wine-staging-3.14
deleted file mode 100644
index dd04c1155613..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-3.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ffmpeg? ( >=media-video/ffmpeg-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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( 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(-)?] 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[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(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ffmpeg? ( >=media-video/ffmpeg-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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( 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(-)?] 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[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(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=3.14
-SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.14.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.14.tar.gz -> wine-staging-3.14.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7bb7c87fb60617d5368dc9b26ef0bcb7
diff --git a/metadata/md5-cache/app-emulation/wine-staging-3.18 b/metadata/md5-cache/app-emulation/wine-staging-3.18
new file mode 100644
index 000000000000..5c612eccaeb3
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-3.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ffmpeg? ( >=media-video/ffmpeg-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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( 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(-)?] 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[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(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ffmpeg? ( >=media-video/ffmpeg-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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( 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(-)?] 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[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(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=3.18
+SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.18.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.18.tar.gz -> wine-staging-3.18.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bd817e97ab0d6f95473bbf5978c9b5df
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.0.3 b/metadata/md5-cache/app-emulation/wine-vanilla-3.0.3
index 355bf84268c1..74fcd1079687 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.0.3
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchse
 EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.1 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=3.0.3
 SRC_URI=https://dl.winehq.org/wine/source/3.0/wine-3.0.3.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e76a30cbe37e3ade2e61a5575f892cbc
+_md5_=49e8454876fd39430921a9d56c87d9c2
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.14 b/metadata/md5-cache/app-emulation/wine-vanilla-3.14
deleted file mode 100644
index 593b0bbed179..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=3.14
-SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.14.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3ae5ec1eb7f0d6d9dbd6b78d102821a3
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.18 b/metadata/md5-cache/app-emulation/wine-vanilla-3.18
new file mode 100644
index 000000000000..8bbc3863db38
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,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-plugins/gst-plugins-meta: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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=3.18
+SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.18.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cab2fd9a54658f561071f19db451c2b7
diff --git a/metadata/md5-cache/app-emulation/x48-0.6.4 b/metadata/md5-cache/app-emulation/x48-0.6.4
deleted file mode 100644
index 36af5c480150..000000000000
--- a/metadata/md5-cache/app-emulation/x48-0.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext readline? ( sys-libs/readline ) virtual/pkgconfig x11-libs/libXt >=app-portage/elt-patches-20170815 !<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=HP48 Calculator Emulator
-EAPI=4
-HOMEPAGE=http://x48.berlios.de/
-IUSE=readline
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 x11-libs/libXext readline? ( sys-libs/readline )
-SLOT=0
-SRC_URI=mirror://sourceforge/x48.berlios/x48-0.6.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=711269cc19c73c92b1c04d2a58401a44
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index c8a8f53d143d..1c4a960af9d1 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-repository-6 b/metadata/md5-cache/app-eselect/eselect-repository-6
new file mode 100644
index 000000000000..94fd77a1650b
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-repository-6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup
+DESCRIPTION=Manage repos.conf via eselect
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/eselect-repository
+IUSE=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=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD-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(+)?] app-admin/eselect dev-python/lxml[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(+)?] net-misc/wget
+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/mgorny/eselect-repository/archive/v6.tar.gz -> eselect-repository-6.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=fded510f62b14130d4fcd45338ffbdbe
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 955befcfcd5a..5a66db817e5f 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/foremost-1.5.7-r2 b/metadata/md5-cache/app-forensics/foremost-1.5.7-r2
deleted file mode 100644
index e3d04fbc41a3..000000000000
--- a/metadata/md5-cache/app-forensics/foremost-1.5.7-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A console program to recover files based on their headers and footers
-EAPI=4
-HOMEPAGE=http://foremost.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://foremost.sourceforge.net/pkg/foremost-1.5.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f47d9d0e8360c67c70fca4bd2004c11e
diff --git a/metadata/md5-cache/app-forensics/foremost-1.5.7-r3 b/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
index c1702715210b..f015e6172d9f 100644
--- a/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
+++ b/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A console program to recover files based on their headers and footers
 EAPI=6
 HOMEPAGE=http://foremost.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://foremost.sourceforge.net/pkg/foremost-1.5.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=65c3b46e2b536ad4411ed7a982e2404e
+_md5_=9723a05ecb5d9f875701f6c54788a9be
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 21c0b816f6cd..0c6fa1dec42f 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/fcitx-4.2.9.6 b/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
index b720daa138f6..dfdbe3888d89 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
+++ b/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) xml? ( app-text/iso-codes dev-libs/libxml2 ) kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) xml? ( app-text/iso-codes dev-libs/libxml2 ) dev-util/glib-utils kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx
@@ -11,4 +11,4 @@ REQUIRED_USE=cairo? ( X ) pango? ( cairo )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx/fcitx-4.2.9.6_dict.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f6d9d4d3d73664f694519b6f719fb1e7
+_md5_=edd5538cf3b85db45c590a72b7648444
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.9999 b/metadata/md5-cache/app-i18n/fcitx-4.9999
index a34b6cbf7921..cad07d339431 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-4.9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) xml? ( app-text/iso-codes dev-libs/libxml2 ) kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) xml? ( app-text/iso-codes dev-libs/libxml2 ) dev-util/glib-utils kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx
@@ -10,4 +10,4 @@ REQUIRED_USE=cairo? ( X ) pango? ( cairo )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=29bf0260dc1396ed040ccc9e990ca5a5
+_md5_=7920a1fd046d369fc52477fc474b99a3
diff --git a/metadata/md5-cache/app-i18n/imsettings-1.7.2 b/metadata/md5-cache/app-i18n/imsettings-1.7.2
index 15788fe6b9b7..104c6d3fcbfa 100644
--- a/metadata/md5-cache/app-i18n/imsettings-1.7.2
+++ b/metadata/md5-cache/app-i18n/imsettings-1.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify gconf? ( gnome-base/gconf ) gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf ) dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify gconf? ( gnome-base/gconf ) gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf ) dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Delivery framework for general Input Method configuration
 EAPI=6
 HOMEPAGE=https://tagoh.bitbucket.io/imsettings
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/libX11 x11-libs/l
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/imsettings/downloads/imsettings-1.7.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=118ca0587cc40d0c02576ae25d099e81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=91825db3251d29d20dea416e6d7f8371
diff --git a/metadata/md5-cache/app-i18n/libpinyin-2.2.1 b/metadata/md5-cache/app-i18n/libpinyin-2.2.1
new file mode 100644
index 000000000000..56e02576a2b0
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/libpinyin-2.2.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 unpack
+DEPEND=dev-libs/glib:2 sys-libs/db:=
+DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
+EAPI=7
+HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 sys-libs/db:=
+SLOT=0/13
+SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.2.1.tar.gz -> libpinyin-2.2.1.tar.gz mirror://sourceforge/libpinyin/models/model15.text.tar.gz -> libpinyin-model15.text.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9b6d7024dd4a1ed620cf5f50325cb46c
diff --git a/metadata/md5-cache/app-i18n/libpinyin-9999 b/metadata/md5-cache/app-i18n/libpinyin-9999
index d22b10535731..898c81a860ab 100644
--- a/metadata/md5-cache/app-i18n/libpinyin-9999
+++ b/metadata/md5-cache/app-i18n/libpinyin-9999
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/glib:2 sys-libs/db:=
 DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 sys-libs/db:=
 SLOT=0/13
 SRC_URI=mirror://sourceforge/libpinyin/models/model15.text.tar.gz -> libpinyin-model15.text.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2eeb230e407139ae0ee45c2b1b2605b6
+_md5_=b42f39bed1d2dc0ad871eeedd0d5b133
diff --git a/metadata/md5-cache/app-i18n/man-pages-de-2.5 b/metadata/md5-cache/app-i18n/man-pages-de-2.5
new file mode 100644
index 000000000000..e0b42885db20
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/man-pages-de-2.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=app-text/po4a >=app-portage/elt-patches-20170815 !<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 somewhat comprehensive collection of Linux german man page translations
+EAPI=6
+HOMEPAGE=https://salsa.debian.org/manpages-de-team/manpages-de
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-3+ man-pages GPL-2+ GPL-2 BSD
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v2.5/manpages-de-v2.5.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=12e54ce595efc71ea6f4d3d89c9d30c3
diff --git a/metadata/md5-cache/app-i18n/opencc-1.0.5 b/metadata/md5-cache/app-i18n/opencc-1.0.5
index 6333390c7865..113e71bcee6a 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.0.5
+++ b/metadata/md5-cache/app-i18n/opencc-1.0.5
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0
 SLOT=0/2
 SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.0.5.tar.gz -> opencc-1.0.5.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ce02d42ae115179839356c5ca41ec4de
+_md5_=19410e069dcd2e4bc1c990ed32be3e4a
diff --git a/metadata/md5-cache/app-i18n/opencc-9999 b/metadata/md5-cache/app-i18n/opencc-9999
index d913cbbcc870..09496f15e206 100644
--- a/metadata/md5-cache/app-i18n/opencc-9999
+++ b/metadata/md5-cache/app-i18n/opencc-9999
@@ -7,4 +7,4 @@ IUSE=doc test
 LICENSE=Apache-2.0
 SLOT=0/2
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=037cba180239e999ecc2a1f4205eb017
+_md5_=06b743a469c00234fea9cb5f94cc57bd
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8 b/metadata/md5-cache/app-i18n/uim-1.8.8
index 20c0e5da5d0e..f4bf5452aee9 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.8
+++ b/metadata/md5-cache/app-i18n/uim-1.8.8
@@ -4,7 +4,7 @@ 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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=60d364ae6ca892d639795545d82844f1
+_md5_=51e3e4731f6b62562722301f161e2ace
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 644e402d2524..50384eb52cbf 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0 b/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0
new file mode 100644
index 000000000000..2631b7d8b658
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.9
+DESCRIPTION=Prometheus exporter for MySQL server metrics
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/mysqld_exporter
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/prometheus/mysqld_exporter/archive/v0.11.0.tar.gz -> mysqld_exporter-0.11.0.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c5c62816160f2cdb0f4d05c66d4d5e25
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 82cdaf4711e0..52d6ca803b97 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/carbon-c-relay-3.1-r1 b/metadata/md5-cache/app-misc/carbon-c-relay-3.1-r1
deleted file mode 100644
index 178911f0e204..000000000000
--- a/metadata/md5-cache/app-misc/carbon-c-relay-3.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install preinst
-DESCRIPTION=Enhanced C version of Carbon relay, aggregator and rewriter
-EAPI=6
-HOMEPAGE=https://github.com/grobian/carbon-c-relay
-KEYWORDS=~amd64 ~arm ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.1/carbon-c-relay-3.1.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ae5aea70ef79558f43f5520cf96f819d
diff --git a/metadata/md5-cache/app-misc/carbon-c-relay-3.4 b/metadata/md5-cache/app-misc/carbon-c-relay-3.4
new file mode 100644
index 000000000000..d852f46fd8ae
--- /dev/null
+++ b/metadata/md5-cache/app-misc/carbon-c-relay-3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install preinst
+DEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip ) ssl? ( dev-libs/openssl:0 ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma )
+DESCRIPTION=Enhanced C version of Carbon relay, aggregator and rewriter
+EAPI=6
+HOMEPAGE=https://github.com/grobian/carbon-c-relay
+IUSE=lz4 snappy zlib ssl pcre pcre2 +oniguruma
+KEYWORDS=~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip ) ssl? ( dev-libs/openssl:0 ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma )
+REQUIRED_USE=pcre2? ( !oniguruma ) oniguruma? ( !pcre2 )
+SLOT=0
+SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.4/carbon-c-relay-3.4.tar.gz
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=dc3ef382aa6c47c0cd677862a9ad3d5a
diff --git a/metadata/md5-cache/app-misc/cdircmp-0.3-r2 b/metadata/md5-cache/app-misc/cdircmp-0.3-r2
index 581d5edff5d6..f8337a190022 100644
--- a/metadata/md5-cache/app-misc/cdircmp-0.3-r2
+++ b/metadata/md5-cache/app-misc/cdircmp-0.3-r2
@@ -1,4 +1,5 @@
 DEFINED_PHASES=compile install prepare
+DEPEND=>=sys-libs/ncurses-5.4:0= virtual/pkgconfig
 DESCRIPTION=Compare directories and select files to copy
 EAPI=7
 HOMEPAGE=http://home.hccnet.nl/paul.schuurmans/
@@ -8,4 +9,4 @@ RDEPEND=>=sys-libs/ncurses-5.4:0=
 SLOT=0
 SRC_URI=http://home.hccnet.nl/paul.schuurmans/linux/download/cdircmp-0.3.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=236cefe818d544498177ebc7ddc79694
+_md5_=c221bebbd9b665b21459aec1d59afa2e
diff --git a/metadata/md5-cache/app-misc/cdspeed-0.4-r1 b/metadata/md5-cache/app-misc/cdspeed-0.4-r1
deleted file mode 100644
index ed7defcfa575..000000000000
--- a/metadata/md5-cache/app-misc/cdspeed-0.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Change the speed of your CD drive
-EAPI=2
-HOMEPAGE=http://linuxfocus.org/~guido/
-KEYWORDS=alpha amd64 ~hppa ~mips ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://linuxfocus.org/~guido/cdspeed-0.4.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8556149cb2bdd6ca65830c5a517b3373
diff --git a/metadata/md5-cache/app-misc/cdspeed-0.4-r2 b/metadata/md5-cache/app-misc/cdspeed-0.4-r2
index 9582383739f6..b89edcf66a68 100644
--- a/metadata/md5-cache/app-misc/cdspeed-0.4-r2
+++ b/metadata/md5-cache/app-misc/cdspeed-0.4-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Change the speed of your CD drive
 EAPI=7
 HOMEPAGE=http://linuxfocus.org/~guido/
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~x86
+KEYWORDS=alpha amd64 ~hppa ~mips ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linuxfocus.org/~guido/cdspeed-0.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ca0d178514970a38c0d6824711517bcd
+_md5_=182083a7afc670fe8ba6afe5b975af00
diff --git a/metadata/md5-cache/app-misc/fhem-5.9 b/metadata/md5-cache/app-misc/fhem-5.9
new file mode 100644
index 000000000000..e5e97db39c9e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/fhem-5.9
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup
+DEPEND=media-gfx/pngcrush
+DESCRIPTION=A GPL'd perl server for house automation
+EAPI=7
+HOMEPAGE=https://www.fhem.de/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-perl/Crypt-CBC dev-perl/Device-SerialPort dev-perl/Digest-CRC dev-perl/JSON
+SLOT=0
+SRC_URI=https://www.fhem.de/fhem-5.9.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=ce3043964a9b68db17063b12542d27a3
diff --git a/metadata/md5-cache/app-misc/gnutu-2.5-r1 b/metadata/md5-cache/app-misc/gnutu-2.5-r1
index 996fe6b04ccb..63aafe444cc7 100644
--- a/metadata/md5-cache/app-misc/gnutu-2.5-r1
+++ b/metadata/md5-cache/app-misc/gnutu-2.5-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=-
 DEPEND=>=dev-lang/mono-1.2.5.1-r1 >=dev-dotnet/gtk-sharp-2.12.21 sys-devel/gettext
 DESCRIPTION=GNU Student's Timetable for polish users
 EAPI=6
-HOMEPAGE=http://gnutu.devnull.pl/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/mono-1.2.5.1-r1 >=dev-dotnet/gtk-sharp-2.12.21
 SLOT=0
-SRC_URI=http://gnutu.devnull.pl/download/sources/gnutu-2.5.tar.gz
-_md5_=42f58d869dbdb80c8a61a739c76a270e
+SRC_URI=mirror://gentoo/gnutu-2.5.tar.gz
+_md5_=498c40dc2311bdac20afa8db2b2fce4b
diff --git a/metadata/md5-cache/app-misc/gramps-5.0.0 b/metadata/md5-cache/app-misc/gramps-5.0.0
new file mode 100644
index 000000000000..de7ced77e061
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gramps-5.0.0
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_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_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(+)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=Genealogical Research and Analysis Management Programming System
+EAPI=7
+HOMEPAGE=https://gramps-project.org/
+IUSE=+rcs +reports exif geo postscript spell 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-python/bsddb3[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.12: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-python/pyicu[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/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) exif? ( >=media-libs/gexiv2-0.5[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(+)?,introspection] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_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_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(+)?]
+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/gramps-project/gramps/archive/v5.0.0.tar.gz -> gramps-5.0.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=98445ca1f87754368a07a61f7a1ec305
diff --git a/metadata/md5-cache/app-misc/jq-1.5-r3 b/metadata/md5-cache/app-misc/jq-1.5-r3
index 91900c4a6aef..2c4d483b59ec 100644
--- a/metadata/md5-cache/app-misc/jq-1.5-r3
+++ b/metadata/md5-cache/app-misc/jq-1.5-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight and flexible command-line JSON processor
 EAPI=6
 HOMEPAGE=https://stedolan.github.com/jq/
 IUSE=oniguruma static-libs
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=MIT CC-BY-3.0
 RDEPEND=!static-libs? ( oniguruma? ( dev-libs/oniguruma[static-libs?] ) )
 SLOT=0
 SRC_URI=https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3385d3be9841efa45cfd30fa4f0ed33a
+_md5_=7f42d729bbaa54b5d57f4db9571fa2ed
diff --git a/metadata/md5-cache/app-misc/lcd4linux-0.10.1_rc2-r4 b/metadata/md5-cache/app-misc/lcd4linux-0.10.1_rc2-r4
index ccfc8cc85a38..96e697e6c1b2 100644
--- a/metadata/md5-cache/app-misc/lcd4linux-0.10.1_rc2-r4
+++ b/metadata/md5-cache/app-misc/lcd4linux-0.10.1_rc2-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Shows system and ISDN information on an external display or in a X11
 EAPI=5
 HOMEPAGE=https://lcd4linux.bulix.org/
 IUSE=mysql python iconv mpd lcd_devices_beckmannegle lcd_devices_bwct lcd_devices_cfontz lcd_devices_ncurses lcd_devices_cwlinux lcd_devices_ea232 lcd_devices_g15 lcd_devices_hd44780 lcd_devices_hd44780i2c lcd_devices_lcd2usb lcd_devices_lcdlinux lcd_devices_lcdterm lcd_devices_ledmatrix lcd_devices_lph7508 lcd_devices_m50530 lcd_devices_mtxorb lcd_devices_milfordbpk lcd_devices_noritake lcd_devices_null lcd_devices_picolcd lcd_devices_png lcd_devices_ppm lcd_devices_routerboard lcd_devices_serdisplib lcd_devices_simplelcd lcd_devices_t6963 lcd_devices_trefon lcd_devices_usbhub lcd_devices_usblcd lcd_devices_wincor lcd_devices_X lcd_devices_luise python_targets_python2_7
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) iconv? ( virtual/libiconv ) mpd? ( media-libs/libmpd ) lcd_devices_bwct? ( =virtual/libusb-0* ) lcd_devices_g15? ( =virtual/libusb-0* ) lcd_devices_lcd2usb? ( =virtual/libusb-0* ) lcd_devices_picolcd? ( =virtual/libusb-0* ) lcd_devices_trefon? ( =virtual/libusb-0* ) lcd_devices_usbhub? ( =virtual/libusb-0* ) lcd_devices_usblcd? ( =virtual/libusb-0* ) lcd_devices_luise? ( dev-libs/luise-bin ) lcd_devices_ncurses? ( sys-libs/ncurses:0= ) lcd_devices_noritake? ( media-libs/gd ) lcd_devices_t6963? ( media-libs/gd ) lcd_devices_png? ( media-libs/libpng:0= media-libs/gd ) lcd_devices_X? ( x11-libs/libX11 media-libs/gd ) lcd_devices_serdisplib? ( dev-libs/serdisplib media-libs/gd ) 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_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/lcd4linux-0.10.1-RC2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6f5180ece959cb236dec3751d73f4dd
+_md5_=88f7522310b3b7372efe868d866fa491
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1 b/metadata/md5-cache/app-misc/lirc-0.10.1
index 6ade7d7bbe30..8cd03ff30d04 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3010a8063b04d0dfd66ba9b65378e32e
+_md5_=1675bcba3256bf19ea514a3e1e6f4150
diff --git a/metadata/md5-cache/app-misc/lirc-0.9.0-r6 b/metadata/md5-cache/app-misc/lirc-0.9.0-r6
deleted file mode 100644
index c016a481a40e..000000000000
--- a/metadata/md5-cache/app-misc/lirc-0.9.0-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_all? ( virtual/libusb:0 ) lirc_devices_atilibusb? ( virtual/libusb:0 ) lirc_devices_awlibusb? ( virtual/libusb:0 ) lirc_devices_sasem? ( virtual/libusb:0 ) lirc_devices_igorplugusb? ( virtual/libusb:0 ) lirc_devices_imon? ( virtual/libusb:0 ) lirc_devices_imon_lcd? ( virtual/libusb:0 ) lirc_devices_imon_pad? ( virtual/libusb:0 ) lirc_devices_imon_rsc? ( virtual/libusb:0 ) lirc_devices_streamzap? ( virtual/libusb:0 ) lirc_devices_xboxusb? ( virtual/libusb:0 ) lirc_devices_irlink? ( virtual/libusb:0 ) lirc_devices_commandir? ( virtual/libusb:0 ) virtual/linux-sources lirc_devices_ftdi? ( dev-embedded/libftdi:0 ) lirc_devices_all? ( dev-embedded/libftdi:0 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=decode and send infra-red signals of many commonly used remote controls
-EAPI=4
-HOMEPAGE=http://www.lirc.org/
-IUSE=debug doc hardware-carrier transmitter static-libs X lirc_devices_all lirc_devices_userspace lirc_devices_accent lirc_devices_act200l lirc_devices_act220l lirc_devices_adaptec lirc_devices_alsa_usb lirc_devices_animax lirc_devices_asusdh lirc_devices_atilibusb lirc_devices_atiusb lirc_devices_audio lirc_devices_audio_alsa lirc_devices_avermedia lirc_devices_avermedia_vdomate lirc_devices_avermedia98 lirc_devices_awlibusb lirc_devices_bestbuy lirc_devices_bestbuy2 lirc_devices_breakoutbox lirc_devices_bte lirc_devices_bw6130 lirc_devices_caraca lirc_devices_chronos lirc_devices_commandir lirc_devices_cph06x lirc_devices_creative lirc_devices_creative_infracd lirc_devices_devinput lirc_devices_digimatrix lirc_devices_dsp lirc_devices_dvico lirc_devices_ea65 lirc_devices_ene0100 lirc_devices_exaudio lirc_devices_flyvideo lirc_devices_ftdi lirc_devices_gvbctv5pci lirc_devices_hauppauge lirc_devices_hauppauge_dvb lirc_devices_hercules_smarttv_stereo lirc_devices_i2cuser lirc_devices_igorplugusb lirc_devices_iguanaIR lirc_devices_imon lirc_devices_imon_24g lirc_devices_imon_knob lirc_devices_imon_lcd lirc_devices_imon_pad lirc_devices_imon_rsc lirc_devices_irdeo lirc_devices_irdeo_remote lirc_devices_irlink lirc_devices_irman lirc_devices_irreal lirc_devices_it87 lirc_devices_ite8709 lirc_devices_knc_one lirc_devices_kworld lirc_devices_leadtek_0007 lirc_devices_leadtek_0010 lirc_devices_leadtek_pvr2000 lirc_devices_livedrive_midi lirc_devices_livedrive_seq lirc_devices_logitech lirc_devices_macmini lirc_devices_mediafocusI lirc_devices_mouseremote lirc_devices_mouseremote_ps2 lirc_devices_mp3anywhere lirc_devices_mplay lirc_devices_nslu2 lirc_devices_packard_bell lirc_devices_parallel lirc_devices_pcmak lirc_devices_pcmak_usb lirc_devices_pctv lirc_devices_pixelview_bt878 lirc_devices_pixelview_pak lirc_devices_pixelview_pro lirc_devices_provideo lirc_devices_realmagic lirc_devices_remotemaster lirc_devices_sa1100 lirc_devices_samsung lirc_devices_sasem lirc_devices_sb0540 lirc_devices_serial lirc_devices_silitek lirc_devices_sir lirc_devices_slinke lirc_devices_streamzap lirc_devices_tekram lirc_devices_tekram_bt829 lirc_devices_tira lirc_devices_ttusbir lirc_devices_tuxbox lirc_devices_tvbox lirc_devices_udp lirc_devices_uirt2 lirc_devices_uirt2_raw lirc_devices_usb_uirt_raw lirc_devices_usbx lirc_devices_wpc8769l lirc_devices_zotac lirc_devices_serial_igor_cesko lirc_devices_remote_wonder_plus lirc_devices_xboxusb lirc_devices_inputlirc kernel_linux kernel_linux kernel_linux
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_inputlirc? ( app-misc/inputlircd ) lirc_devices_iguanaIR? ( app-misc/iguanaIR ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=lirc_devices_all? ( !lirc_devices_userspace !lirc_devices_accent !lirc_devices_act200l !lirc_devices_act220l !lirc_devices_adaptec !lirc_devices_alsa_usb !lirc_devices_animax !lirc_devices_asusdh !lirc_devices_atilibusb !lirc_devices_atiusb !lirc_devices_audio !lirc_devices_audio_alsa !lirc_devices_avermedia !lirc_devices_avermedia_vdomate !lirc_devices_avermedia98 !lirc_devices_awlibusb !lirc_devices_bestbuy !lirc_devices_bestbuy2 !lirc_devices_breakoutbox !lirc_devices_bte !lirc_devices_bw6130 !lirc_devices_caraca !lirc_devices_chronos !lirc_devices_commandir !lirc_devices_cph06x !lirc_devices_creative !lirc_devices_creative_infracd !lirc_devices_devinput !lirc_devices_digimatrix !lirc_devices_dsp !lirc_devices_dvico !lirc_devices_ea65 !lirc_devices_ene0100 !lirc_devices_exaudio !lirc_devices_flyvideo !lirc_devices_ftdi !lirc_devices_gvbctv5pci !lirc_devices_hauppauge !lirc_devices_hauppauge_dvb !lirc_devices_hercules_smarttv_stereo !lirc_devices_i2cuser !lirc_devices_igorplugusb !lirc_devices_iguanaIR !lirc_devices_imon !lirc_devices_imon_24g !lirc_devices_imon_knob !lirc_devices_imon_lcd !lirc_devices_imon_pad !lirc_devices_imon_rsc !lirc_devices_irdeo !lirc_devices_irdeo_remote !lirc_devices_irlink !lirc_devices_irman !lirc_devices_irreal !lirc_devices_it87 !lirc_devices_ite8709 !lirc_devices_knc_one !lirc_devices_kworld !lirc_devices_leadtek_0007 !lirc_devices_leadtek_0010 !lirc_devices_leadtek_pvr2000 !lirc_devices_livedrive_midi !lirc_devices_livedrive_seq !lirc_devices_logitech !lirc_devices_macmini !lirc_devices_mediafocusI !lirc_devices_mouseremote !lirc_devices_mouseremote_ps2 !lirc_devices_mp3anywhere !lirc_devices_mplay !lirc_devices_nslu2 !lirc_devices_packard_bell !lirc_devices_parallel !lirc_devices_pcmak !lirc_devices_pcmak_usb !lirc_devices_pctv !lirc_devices_pixelview_bt878 !lirc_devices_pixelview_pak !lirc_devices_pixelview_pro !lirc_devices_provideo !lirc_devices_realmagic !lirc_devices_remotemaster !lirc_devices_sa1100 !lirc_devices_samsung !lirc_devices_sasem !lirc_devices_sb0540 !lirc_devices_serial !lirc_devices_silitek !lirc_devices_sir !lirc_devices_slinke !lirc_devices_streamzap !lirc_devices_tekram !lirc_devices_tekram_bt829 !lirc_devices_tira !lirc_devices_ttusbir !lirc_devices_tuxbox !lirc_devices_tvbox !lirc_devices_udp !lirc_devices_uirt2 !lirc_devices_uirt2_raw !lirc_devices_usb_uirt_raw !lirc_devices_usbx !lirc_devices_wpc8769l !lirc_devices_zotac !lirc_devices_serial_igor_cesko !lirc_devices_remote_wonder_plus !lirc_devices_xboxusb !lirc_devices_inputlirc )
-SLOT=0
-SRC_URI=mirror://sourceforge/lirc/lirc-0.9.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=89e7379ad02cd047360fe27d7e4cbcc5
diff --git a/metadata/md5-cache/app-misc/mosquitto-1.4.14-r1 b/metadata/md5-cache/app-misc/mosquitto-1.4.14-r1
deleted file mode 100644
index ece9ded38e58..000000000000
--- a/metadata/md5-cache/app-misc/mosquitto-1.4.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) srv? ( net-dns/c-ares ) websockets? ( net-libs/libwebsockets ) virtual/pkgconfig
-DESCRIPTION=An Open Source MQTT v3 Broker
-EAPI=6
-HOMEPAGE=http://mosquitto.org/
-IUSE=bridge examples +persistence +srv ssl tcpd websockets
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=EPL-1.0
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=http://mosquitto.org/files/source/mosquitto-1.4.14.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d1bd263567d77e7baa3207c176c3ca0c
diff --git a/metadata/md5-cache/app-misc/mosquitto-1.4.15 b/metadata/md5-cache/app-misc/mosquitto-1.4.15
deleted file mode 100644
index 640aab881c30..000000000000
--- a/metadata/md5-cache/app-misc/mosquitto-1.4.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) srv? ( net-dns/c-ares ) websockets? ( net-libs/libwebsockets ) virtual/pkgconfig
-DESCRIPTION=An Open Source MQTT v3 Broker
-EAPI=6
-HOMEPAGE=http://mosquitto.org/
-IUSE=bridge examples +persistence +srv ssl tcpd test websockets
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=EPL-1.0
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=test? ( bridge )
-SLOT=0
-SRC_URI=http://mosquitto.org/files/source/mosquitto-1.4.15.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=80b35e0c35164f8388586fb0ee320a4a
diff --git a/metadata/md5-cache/app-misc/mosquitto-1.4.15-r2 b/metadata/md5-cache/app-misc/mosquitto-1.4.15-r2
deleted file mode 100644
index 2d2cb1086afe..000000000000
--- a/metadata/md5-cache/app-misc/mosquitto-1.4.15-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) srv? ( net-dns/c-ares ) websockets? ( net-libs/libwebsockets ) virtual/pkgconfig
-DESCRIPTION=An Open Source MQTT v3 Broker
-EAPI=6
-HOMEPAGE=https://mosquitto.org/
-IUSE=bridge examples +persistence +srv ssl tcpd test websockets
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=EPL-1.0
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=test? ( bridge )
-SLOT=0
-SRC_URI=https://mosquitto.org/files/source/mosquitto-1.4.15.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=06d01440237f7fcfe0af237ad4ccd5df
diff --git a/metadata/md5-cache/app-misc/mosquitto-1.5 b/metadata/md5-cache/app-misc/mosquitto-1.5
new file mode 100644
index 000000000000..adb1d4a2738e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mosquitto-1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) srv? ( net-dns/c-ares ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) websockets? ( net-libs/libwebsockets ) virtual/pkgconfig
+DESCRIPTION=An Open Source MQTT v3 Broker
+EAPI=6
+HOMEPAGE=https://mosquitto.org/
+IUSE=bridge examples +persistence +srv ssl tcpd test websockets
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=EPL-1.0
+RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) srv? ( net-dns/c-ares ) ssl? ( dev-libs/openssl:0= )
+REQUIRED_USE=test? ( bridge )
+SLOT=0
+SRC_URI=https://mosquitto.org/files/source/mosquitto-1.5.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=362c44b04da6e8a8b8b5337d74787f65
diff --git a/metadata/md5-cache/app-misc/neofetch-3.4.0 b/metadata/md5-cache/app-misc/neofetch-3.4.0
deleted file mode 100644
index 8a2bb5743e97..000000000000
--- a/metadata/md5-cache/app-misc/neofetch-3.4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Simple information system script
-EAPI=6
-HOMEPAGE=https://github.com/dylanaraps/neofetch
-IUSE=X
-KEYWORDS=amd64 x86 ~amd64-fbsd
-LICENSE=MIT-with-advertising
-RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
-SLOT=0
-SRC_URI=https://github.com/dylanaraps/neofetch/archive/3.4.0/neofetch-3.4.0.tar.gz
-_md5_=5ab7648dd2ef56a9e936d591d46928d9
diff --git a/metadata/md5-cache/app-misc/neofetch-4.0.2 b/metadata/md5-cache/app-misc/neofetch-4.0.2
deleted file mode 100644
index d544b8ab6485..000000000000
--- a/metadata/md5-cache/app-misc/neofetch-4.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Simple information system script
-EAPI=7
-HOMEPAGE=https://github.com/dylanaraps/neofetch
-IUSE=X
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd
-LICENSE=MIT-with-advertising
-RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
-SLOT=0
-SRC_URI=https://github.com/dylanaraps/neofetch/archive/4.0.2/neofetch-4.0.2.tar.gz
-_md5_=f853e59744382d9b09b33a96ee6ac38b
diff --git a/metadata/md5-cache/app-misc/neofetch-5.0.0 b/metadata/md5-cache/app-misc/neofetch-5.0.0
index 0e617986fa3f..eb7d58a12036 100644
--- a/metadata/md5-cache/app-misc/neofetch-5.0.0
+++ b/metadata/md5-cache/app-misc/neofetch-5.0.0
@@ -3,9 +3,9 @@ DESCRIPTION=Simple information system script
 EAPI=7
 HOMEPAGE=https://github.com/dylanaraps/neofetch
 IUSE=X
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 x86 ~amd64-fbsd
 LICENSE=MIT-with-advertising
 RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
 SLOT=0
 SRC_URI=https://github.com/dylanaraps/neofetch/archive/5.0.0/neofetch-5.0.0.tar.gz
-_md5_=17af3c2dcb0af21798eac933d3a62058
+_md5_=d34bc1d5a0fcc5b7ec6d74c7a5344af2
diff --git a/metadata/md5-cache/app-misc/rq-0.10.4 b/metadata/md5-cache/app-misc/rq-0.10.4
index c04efee55a87..fbbe4e5e9bb8 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
+DEPEND=sys-devel/clang virtual/cargo
 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	da08619f6c16047185d20223904c8aef	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=c7c9f90ed7ffdff91bdb5ba8e4d8c42b
diff --git a/metadata/md5-cache/app-misc/screenfetch-3.8.0 b/metadata/md5-cache/app-misc/screenfetch-3.8.0
deleted file mode 100644
index 963154eaa9b4..000000000000
--- a/metadata/md5-cache/app-misc/screenfetch-3.8.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Bash Screenshot Information Tool
-EAPI=6
-HOMEPAGE=https://github.com/KittyKatt/screenFetch
-IUSE=curl X
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=curl? ( net-misc/curl ) X? ( media-gfx/scrot x11-apps/xdpyinfo )
-SLOT=0
-SRC_URI=https://github.com/KittyKatt/screenFetch/archive/v3.8.0.tar.gz -> screenfetch-3.8.0.tar.gz
-_md5_=485f50a37043d0f131d3dea853e2794a
diff --git a/metadata/md5-cache/app-misc/screenfetch-3.8.0-r1 b/metadata/md5-cache/app-misc/screenfetch-3.8.0-r1
index a1d7c94a341a..7eb90f5bdb90 100644
--- a/metadata/md5-cache/app-misc/screenfetch-3.8.0-r1
+++ b/metadata/md5-cache/app-misc/screenfetch-3.8.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Bash Screenshot Information Tool
 EAPI=7
 HOMEPAGE=https://github.com/KittyKatt/screenFetch
 IUSE=curl X
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=curl? ( net-misc/curl ) X? ( media-gfx/scrot x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=https://github.com/KittyKatt/screenFetch/archive/v3.8.0.tar.gz -> screenfetch-3.8.0.tar.gz
-_md5_=ea8c3afac38be58aca1be9f29ac27f24
+_md5_=7246e9b9a16089b961c6f23d73fa5cb3
diff --git a/metadata/md5-cache/app-misc/skim-0.3.2 b/metadata/md5-cache/app-misc/skim-0.3.2
index 51225c465ee0..aae10294043c 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
+DEPEND=virtual/rust virtual/cargo
 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	da08619f6c16047185d20223904c8aef	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	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 fddd370c5d66..61ac200f4fef 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
+DEPEND=virtual/rust virtual/cargo
 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	da08619f6c16047185d20223904c8aef	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=6893e78fc0b934fa2ff3d2165dd15715
diff --git a/metadata/md5-cache/app-misc/tmux-2.7 b/metadata/md5-cache/app-misc/tmux-2.7
index 79bc0c1a22bc..3c2fc081891d 100644
--- a/metadata/md5-cache/app-misc/tmux-2.7
+++ b/metadata/md5-cache/app-misc/tmux-2.7
@@ -4,10 +4,10 @@ DESCRIPTION=Terminal multiplexer
 EAPI=6
 HOMEPAGE=https://tmux.github.io/
 IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ISC
 RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/tmux/tmux/releases/download/2.7/tmux-2.7.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=64f6d683ea38b7a23a81b825af46bec6
+_md5_=23769a9315f49690d9e0129b3dd883c6
diff --git a/metadata/md5-cache/app-misc/ttyload-0.5.3 b/metadata/md5-cache/app-misc/ttyload-0.5.3
index f022ae803520..db9aaf8abc89 100644
--- a/metadata/md5-cache/app-misc/ttyload-0.5.3
+++ b/metadata/md5-cache/app-misc/ttyload-0.5.3
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=color-coded graph of load averages over time
 EAPI=6
 HOMEPAGE=http://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.daveltd.com/src/util/ttyload/ttyload-0.5.3.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=29f67ff335ecbb1087f0b11f03b5c612
+_md5_=1d3136054bd09d2a2c174284620a3228
diff --git a/metadata/md5-cache/app-misc/vcontrold-0.98.6 b/metadata/md5-cache/app-misc/vcontrold-0.98.6
new file mode 100644
index 000000000000..fcd548aef450
--- /dev/null
+++ b/metadata/md5-cache/app-misc/vcontrold-0.98.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libxml2 man? ( dev-python/docutils ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Daemon for communication with Viessmann Vito heatings
+EAPI=6
+HOMEPAGE=https://github.com/openv/vcontrold/
+IUSE=+man +vclient vsim
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/libxml2
+SLOT=0
+SRC_URI=https://github.com/openv/vcontrold/archive/v0.98.6.tar.gz -> vcontrold-0.98.6.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ae368259e364d751ea40d2a118e13ff4
diff --git a/metadata/md5-cache/app-misc/zisofs-tools-1.0.8 b/metadata/md5-cache/app-misc/zisofs-tools-1.0.8
index 03649c2d25e1..fc9a4dcc59b7 100644
--- a/metadata/md5-cache/app-misc/zisofs-tools-1.0.8
+++ b/metadata/md5-cache/app-misc/zisofs-tools-1.0.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.1.4
+DEPEND=>=sys-libs/zlib-1.1.4:0=
 DESCRIPTION=User utilities for zisofs
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/zisofs/
 IUSE=static
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.1.4
+RDEPEND=>=sys-libs/zlib-1.1.4:0=
 SLOT=0
-SRC_URI=mirror://kernel/linux/utils/fs/zisofs/zisofs-tools-1.0.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1c5b61efc16eb5f150de325daef6d9a
+SRC_URI=mirror://gentoo/zisofs-tools-1.0.8.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=371d3b6d57b1bf5fa7f2cc76c27e189c
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 4b57cb045e73..1bd5a0be3456 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/calligra-3.1.0-r2 b/metadata/md5-cache/app-office/calligra-3.1.0-r2
index f46d838cdb5f..e94b0c9f44fe 100644
--- a/metadata/md5-cache/app-office/calligra-3.1.0-r2
+++ b/metadata/md5-cache/app-office/calligra-3.1.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-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/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/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/ktextwidgets-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/sonnet-5.46.0:5 >=dev-qt/designer-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/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.46.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.9.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.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 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/designer-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/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.50.0:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.50.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.9.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=KDE Office Suite
 EAPI=6
 HOMEPAGE=https://www.calligra.org/
 IUSE=activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf phonon pim spacenav +truetype X calligra_features_karbon calligra_features_plan calligra_features_sheets calligra_features_words calligra_experimental_features_stage debug +handbook test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.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/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/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/ktextwidgets-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/sonnet-5.46.0:5 >=dev-qt/designer-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/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.46.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.9.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/designer-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/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.50.0:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.50.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.9.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.1.0/calligra-3.1.0.tar.xz calligra_features_plan? ( mirror://kde/stable/calligra/3.1.0/calligraplan-3.1.0.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=497357cd86107413c6617ee8dd31efe4
diff --git a/metadata/md5-cache/app-office/gnucash-2.7.4-r1 b/metadata/md5-cache/app-office/gnucash-2.7.4-r1
deleted file mode 100644
index 0912874f213e..000000000000
--- a/metadata/md5-cache/app-office/gnucash-2.7.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2.0.0:12=[regex] >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-3.14.0:3 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) 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(+)] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) ~dev-cpp/gtest-1.8.0 dev-lang/perl dev-perl/XML-Parser dev-util/intltool gnome-base/gnome-common sys-devel/libtool virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A personal finance manager
-EAPI=6
-HOMEPAGE=http://www.gnucash.org/
-IUSE=aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres python quotes -register2 sqlite python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2.0.0:12=[regex] >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-3.14.0:3 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) 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(+)] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] )
-REQUIRED_USE=chipcard? ( aqbanking ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnucash/gnucash-2.7.4.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6d94bc226f9f1e24b8bab7cbdc83bfe1
diff --git a/metadata/md5-cache/app-office/gnucash-3.2 b/metadata/md5-cache/app-office/gnucash-3.2
deleted file mode 100644
index 9d8102dd9cde..000000000000
--- a/metadata/md5-cache/app-office/gnucash-3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2.0.0:12=[regex] >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-3.14.0:3 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) 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(+)?] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) ~dev-cpp/gtest-1.8.0 >=sys-devel/gettext-0.19.6 dev-lang/perl dev-perl/XML-Parser gnome-base/gnome-common sys-devel/libtool virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A personal finance manager
-EAPI=6
-HOMEPAGE=http://www.gnucash.org/
-IUSE=aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres python quotes -register2 sqlite 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 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=doc? ( ~app-doc/gnucash-docs-3.2 gnome-extra/yelp )
-RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2.0.0:12=[regex] >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-3.14.0:3 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) 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(+)?] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] )
-REQUIRED_USE=chipcard? ( aqbanking ) 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=https://github.com/Gnucash/gnucash/releases/download/3.2/gnucash-3.2.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e8c2f4136dc88ab8f6af32174908307f
diff --git a/metadata/md5-cache/app-office/kexi-3.1.0 b/metadata/md5-cache/app-office/kexi-3.1.0
index b586ba4b5951..8b2d1f25f7d5 100644
--- a/metadata/md5-cache/app-office/kexi-3.1.0
+++ b/metadata/md5-cache/app-office/kexi-3.1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/breeze-icons-rcc-5.46.0:5 >=kde-frameworks/karchive-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/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/kitemviews-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/designer-5.8.0:5 >=dev-qt/qtgui-5.8.0:5 >=dev-qt/qtnetwork-5.8.0:5 >=dev-qt/qtprintsupport-5.8.0:5 >=dev-qt/qtwidgets-5.8.0:5 >=dev-qt/qtxml-5.8.0:5 >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] marble? ( >=kde-apps/marble-17.12.3:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.8.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.46.0:5 test? ( >=dev-qt/qttest-5.8.0:5 ) >=dev-qt/qtcore-5.8.0:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/breeze-icons-rcc-5.50.0:5 >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/designer-5.8.0:5 >=dev-qt/qtgui-5.8.0:5 >=dev-qt/qtnetwork-5.8.0:5 >=dev-qt/qtprintsupport-5.8.0:5 >=dev-qt/qtwidgets-5.8.0:5 >=dev-qt/qtxml-5.8.0:5 >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] marble? ( >=kde-apps/marble-18.04.3:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.8.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.50.0:5 test? ( >=dev-qt/qttest-5.8.0:5 ) >=dev-qt/qtcore-5.8.0:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Visual database applications creator
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/
 IUSE=debug experimental marble mdb mysql postgres sqlite webkit debug test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/breeze-icons-rcc-5.46.0:5 >=kde-frameworks/karchive-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/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/kitemviews-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/designer-5.8.0:5 >=dev-qt/qtgui-5.8.0:5 >=dev-qt/qtnetwork-5.8.0:5 >=dev-qt/qtprintsupport-5.8.0:5 >=dev-qt/qtwidgets-5.8.0:5 >=dev-qt/qtxml-5.8.0:5 >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] marble? ( >=kde-apps/marble-17.12.3:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.8.0:5 ) !app-office/calligra:4[calligra_features_kexi] !app-office/calligra-l10n:4[calligra_features_kexi(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.8.0:5
+RDEPEND=>=kde-frameworks/breeze-icons-rcc-5.50.0:5 >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/designer-5.8.0:5 >=dev-qt/qtgui-5.8.0:5 >=dev-qt/qtnetwork-5.8.0:5 >=dev-qt/qtprintsupport-5.8.0:5 >=dev-qt/qtwidgets-5.8.0:5 >=dev-qt/qtxml-5.8.0:5 >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] marble? ( >=kde-apps/marble-18.04.3:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.8.0:5 ) !app-office/calligra:4[calligra_features_kexi] !app-office/calligra-l10n:4[calligra_features_kexi(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.8.0:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kexi/src/kexi-3.1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44f5287ccf13cf4ccb9c129a06feb94f
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.1-r2 b/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
index 8c9065ae0d89..e0c16b242862 100644
--- a/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-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/kdewebkit-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kiconthemes-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/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-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.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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) addressbook? ( >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.6.5 >=sys-libs/gwenhywfar-4.15.3-r1[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.46.0:5 ) ofx? ( dev-libs/libofx ) weboob? ( python_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/qtconcurrent-5.9.4:5 www-client/weboob[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 virtual/pkgconfig 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
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.50.0:5 ) addressbook? ( >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.6.5 >=sys-libs/gwenhywfar-4.15.3-r1[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.50.0:5 ) ofx? ( dev-libs/libofx ) weboob? ( python_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/qtconcurrent-5.9.4:5 www-client/weboob[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 virtual/pkgconfig 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Personal finance manager based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://kmymoney.org
 IUSE=activities addressbook calendar hbci holidays ofx quotes weboob test debug +handbook test python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-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/kdewebkit-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kiconthemes-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/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-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.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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) addressbook? ( >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.6.5 >=sys-libs/gwenhywfar-4.15.3-r1[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.46.0:5 ) ofx? ( dev-libs/libofx ) weboob? ( python_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/qtconcurrent-5.9.4:5 www-client/weboob[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(+)] ) !app-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.50.0:5 ) addressbook? ( >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.6.5 >=sys-libs/gwenhywfar-4.15.3-r1[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.50.0:5 ) ofx? ( dev-libs/libofx ) weboob? ( python_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/qtconcurrent-5.9.4:5 www-client/weboob[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(+)] ) !app-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=weboob? ( python_targets_python2_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/kmymoney/5.0.1/src/kmymoney-5.0.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9cdf06ea896ec55483f15c445cdcfc47
diff --git a/metadata/md5-cache/app-office/kraft-0.80 b/metadata/md5-cache/app-office/kraft-0.80
index 6972b37f0e5c..61b65713abff 100644
--- a/metadata/md5-cache/app-office/kraft-0.80
+++ b/metadata/md5-cache/app-office/kraft-0.80
@@ -1,13 +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 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/kcontacts-17.12.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-cpp/ctemplate pim? ( >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-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.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
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-cpp/ctemplate pim? ( >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Software to manage quotes and invoices in small enterprises
 EAPI=6
 HOMEPAGE=http://www.volle-kraft-voraus.de/
 IUSE=pim debug +handbook
 KEYWORDS=~amd64 ~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 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/kcontacts-17.12.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-cpp/ctemplate pim? ( >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 ) !app-office/kraft:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-cpp/ctemplate pim? ( >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 ) !app-office/kraft:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/dragotin/kraft/archive/v0.80.tar.gz -> kraft-0.80.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f72f3ca8fcbdd92efd7038a51af61f3e
diff --git a/metadata/md5-cache/app-office/libalkimia-7.0.1 b/metadata/md5-cache/app-office/libalkimia-7.0.1
deleted file mode 100644
index 74d3c600e461..000000000000
--- a/metadata/md5-cache/app-office/libalkimia-7.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 dev-libs/gmp:0=[cxx] virtual/pkgconfig doc? ( app-doc/doxygen ) 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.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library with common classes and functionality used by KDE finance applications
-EAPI=6
-HOMEPAGE=https://www.linux-apps.com/content/show.php/libalkimia?content=137323
-IUSE=doc debug test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 dev-libs/gmp:0=[cxx] >=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=0/7
-SRC_URI=mirror://kde/stable/alkimia/7.0.1/src/alkimia-7.0.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b382a80b4b160577bbd6e898bdc97580
diff --git a/metadata/md5-cache/app-office/libalkimia-7.0.2 b/metadata/md5-cache/app-office/libalkimia-7.0.2
index 9f5046d527ce..e6a41efc8bd8 100644
--- a/metadata/md5-cache/app-office/libalkimia-7.0.2
+++ b/metadata/md5-cache/app-office/libalkimia-7.0.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 dev-libs/gmp:0=[cxx] virtual/pkgconfig doc? ( app-doc/doxygen ) 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.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 dev-libs/gmp:0=[cxx] virtual/pkgconfig doc? ( app-doc/doxygen ) 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.50.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=Library with common classes and functionality used by KDE finance applications
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/content/show.php/libalkimia?content=137323
 IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 dev-libs/gmp:0=[cxx] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 dev-libs/gmp:0=[cxx] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=0/7
 SRC_URI=mirror://kde/stable/alkimia/7.0.2/alkimia-7.0.2.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d433c75e4e351dab6a44ad36ec23132e
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a8fe5bc7d8b147741e7da3478b72ef4f
diff --git a/metadata/md5-cache/app-office/skrooge-2.14.0 b/metadata/md5-cache/app-office/skrooge-2.14.0
index 2f475667a614..bdee7f4292c9 100644
--- a/metadata/md5-cache/app-office/skrooge-2.14.0
+++ b/metadata/md5-cache/app-office/skrooge-2.14.0
@@ -1,15 +1,15 @@
 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/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/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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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[widgets] >=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 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) kde? ( >=kde-frameworks/krunner-5.46.0:5 ) ofx? ( dev-libs/libofx ) >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 dev-libs/libxslt virtual/pkgconfig x11-misc/shared-mime-info designer? ( >=kde-frameworks/kdesignerplugin-5.46.0:5 >=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
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=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 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.50.0:5 ) kde? ( >=kde-frameworks/krunner-5.50.0:5 ) ofx? ( dev-libs/libofx ) >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 dev-libs/libxslt virtual/pkgconfig x11-misc/shared-mime-info designer? ( >=kde-frameworks/kdesignerplugin-5.50.0:5 >=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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Personal finances manager, aiming at being simple and intuitive
 EAPI=6
 HOMEPAGE=https://skrooge.org/
 IUSE=activities designer kde ofx test debug +handbook test
 KEYWORDS=amd64 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/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/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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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[widgets] >=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 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) kde? ( >=kde-frameworks/krunner-5.46.0:5 ) ofx? ( dev-libs/libofx ) !app-office/skrooge:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=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 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.50.0:5 ) kde? ( >=kde-frameworks/krunner-5.50.0:5 ) ofx? ( dev-libs/libofx ) !app-office/skrooge:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=test? ( designer )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.14.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19f351653ebef48fe2b6cd10003e9135
diff --git a/metadata/md5-cache/app-office/skrooge-2.15.0 b/metadata/md5-cache/app-office/skrooge-2.15.0
index 607dd6125415..78be1e8d812b 100644
--- a/metadata/md5-cache/app-office/skrooge-2.15.0
+++ b/metadata/md5-cache/app-office/skrooge-2.15.0
@@ -1,15 +1,15 @@
 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/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/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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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[widgets] >=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 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) kde? ( >=kde-frameworks/krunner-5.46.0:5 ) ofx? ( dev-libs/libofx ) >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 dev-libs/libxslt virtual/pkgconfig x11-misc/shared-mime-info designer? ( >=kde-frameworks/kdesignerplugin-5.46.0:5 >=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
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=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 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.50.0:5 ) kde? ( >=kde-frameworks/krunner-5.50.0:5 ) ofx? ( dev-libs/libofx ) >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 dev-libs/libxslt virtual/pkgconfig x11-misc/shared-mime-info designer? ( >=kde-frameworks/kdesignerplugin-5.50.0:5 >=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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Personal finances manager, aiming at being simple and intuitive
 EAPI=6
 HOMEPAGE=https://skrooge.org/
 IUSE=activities designer kde ofx test debug +handbook test
 KEYWORDS=~amd64 ~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/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/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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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[widgets] >=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 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) kde? ( >=kde-frameworks/krunner-5.46.0:5 ) ofx? ( dev-libs/libofx ) !app-office/skrooge:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=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 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.50.0:5 ) kde? ( >=kde-frameworks/krunner-5.50.0:5 ) ofx? ( dev-libs/libofx ) !app-office/skrooge:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=test? ( designer )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.15.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=46817ab68c0a515834359160559c0743
diff --git a/metadata/md5-cache/app-office/upwork-4.1.134 b/metadata/md5-cache/app-office/upwork-4.1.134
deleted file mode 100644
index 6e00f450e5bd..000000000000
--- a/metadata/md5-cache/app-office/upwork-4.1.134
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Project collaboration and tracking software for upwork.com
-EAPI=5
-HOMEPAGE=https://www.upwork.com/
-KEYWORDS=~amd64 ~x86
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	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
deleted file mode 100644
index d00abb91eeee..000000000000
--- a/metadata/md5-cache/app-office/upwork-4.2.153
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-util/patchelf >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Project collaboration and tracking software for upwork.com
-EAPI=6
-HOMEPAGE=https://www.upwork.com/
-KEYWORDS=~amd64 ~x86
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=28d555a1a78e67b9894a61367300ba16
diff --git a/metadata/md5-cache/app-office/upwork-5.1.0.562 b/metadata/md5-cache/app-office/upwork-5.1.0.562
new file mode 100644
index 000000000000..cd5557811a24
--- /dev/null
+++ b/metadata/md5-cache/app-office/upwork-5.1.0.562
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DEPEND=dev-util/patchelf >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Project collaboration and tracking software for upwork.com
+EAPI=6
+HOMEPAGE=https://www.upwork.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ODESK
+RDEPEND=dev-libs/expat dev-libs/nspr dev-libs/nss gnome-base/gconf media-libs/alsa-lib media-libs/freetype sys-apps/dbus sys-libs/libcap x11-libs/gtk+:2[cups] x11-libs/gtkglext
+SLOT=0
+SRC_URI=amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_1_0_562_f3wgs5ljinabm69t/upwork-5.1.0.562-1fc24.x86_64.rpm -> upwork-5.1.0.562_x86_64.rpm ) x86? ( https://updates-desktopapp.upwork.com/binaries/v5_1_0_562_f3wgs5ljinabm69t/upwork-5.1.0.562-1fc24.i386.rpm -> upwork-5.1.0.562_i386.rpm )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6261a4a5ff9f12a23f9064ba0d59af27
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index dca1c1989628..0fa80e4bd660 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/pilot-link-0.12.5-r2 b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
new file mode 100644
index 000000000000..c9c15da0dd54
--- /dev/null
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7:0= >=sys-libs/readline-6:0= virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jdk-1.4 ) >=app-portage/elt-patches-20170815 !<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 python_targets_python2_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-lang/perl:= java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Suite of tools for moving data between a Palm device and a desktop
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=bluetooth debug java perl png python static-libs threads usb python_targets_python2_7 elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 LGPL-2 )
+RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7:0= >=sys-libs/readline-6:0= virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jre-1.4 ) python_targets_python2_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-lang/perl:= java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/pilot-link-0.12.5.tar.bz2 https://dev.gentoo.org/~mgorny/dist/pilot-link-0.12.5-gentoo-patchset.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=281139909e9bf542ad34685cca4f05f0
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 12ecf5f08042..f695345ad4e2 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/g-sorcery-0.2.1-r1 b/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
index 89e2f9fdc18c..4f1c9efc6205 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=framework for ebuild generators
 EAPI=6
 HOMEPAGE=https://github.com/jauhien/g-sorcery
 IUSE=bson git python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 PDEPEND=>=app-portage/layman-2.2.0[g-sorcery(-),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) git? ( dev-vcs/git ) sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/jauhien/g-sorcery/archive/0.2.1.tar.gz -> g-sorcery-0.2.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=39940e76384e9845b65fd6594f574f6f
+_md5_=eb1b2c7d36cc2e27b020e2327dcbea1c
diff --git a/metadata/md5-cache/app-portage/layman-2.4.2-r1 b/metadata/md5-cache/app-portage/layman-2.4.2-r1
index 6d72c45cad31..3df4829d6e74 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.2-r1
+++ b/metadata/md5-cache/app-portage/layman-2.4.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to manage Gentoo overlays
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Layman
 IUSE=bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test python_targets_pypy 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 sparc x86 ~ppc-aix ~x64-cygwin ~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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) gpg? ( >=dev-python/pyGPG-0.2 ) sync-plugin-portage? ( || ( >=sys-apps/portage-2.2.16[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(-)] sys-apps/portage-mgorny[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(-)] ) ) !sync-plugin-portage? ( || ( 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(-)] sys-apps/portage-mgorny[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/ssl-fetch-0.4[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(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),sqlite?] ) >=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://sourceforge/layman/layman-2.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=624bb28380dea726148c3a6648003f25
+_md5_=13dd8547774bd6099bca01952383dfba
diff --git a/metadata/md5-cache/app-portage/pfl-3.0-r2 b/metadata/md5-cache/app-portage/pfl-3.0-r2
new file mode 100644
index 000000000000..c04d80538772
--- /dev/null
+++ b/metadata/md5-cache/app-portage/pfl-3.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Searchable online file/package database for Gentoo
+EAPI=7
+HOMEPAGE=http://www.portagefilelist.de
+IUSE=+network-cron python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2
+RDEPEND=net-misc/curl || ( sys-apps/portage[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/ssl-fetch-0.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://files.portagefilelist.de/pfl-3.0.tar.bz2
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=520327c64387762a800602f864b7189a
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.10 b/metadata/md5-cache/app-portage/repoman-2.3.10
index 098030ce01d8..f46a670b0cd1 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.10
+++ b/metadata/md5-cache/app-portage/repoman-2.3.10
@@ -4,11 +4,11 @@ DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.3.43[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/lxml-3.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(-)] 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[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) >=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=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.10.tar.bz2
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5803888c658877cfe64d2901329e1e07
+_md5_=7c4e546d76b46d243d719f930d28f263
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.11 b/metadata/md5-cache/app-portage/repoman-2.3.11
index bee34def1f5d..93da0efee897 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.11
+++ b/metadata/md5-cache/app-portage/repoman-2.3.11
@@ -4,11 +4,11 @@ DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.3.43[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/lxml-3.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(-)] 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[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) >=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=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.11.tar.bz2
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c937caca96ef589f9703bfe12309d533
+_md5_=ca249a45747ccd0dfe3f6a1dd7b2bc3d
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index d850828416c9..78bec04d9c37 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/loksh-6.4 b/metadata/md5-cache/app-shells/loksh-6.4
new file mode 100644
index 000000000000..fc57a927e3cf
--- /dev/null
+++ b/metadata/md5-cache/app-shells/loksh-6.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Linux port of OpenBSD's ksh
+EAPI=7
+HOMEPAGE=https://github.com/dimkr/loksh
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=sys-libs/ncurses:0= !app-shells/ksh
+SLOT=0
+SRC_URI=https://github.com/dimkr/loksh/archive/6.4.tar.gz -> loksh-6.4.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2e6f3277cebf3d5207d1d96999f049cb
diff --git a/metadata/md5-cache/app-shells/posh-0.13.2 b/metadata/md5-cache/app-shells/posh-0.13.2
new file mode 100644
index 000000000000..2e0edf3fc601
--- /dev/null
+++ b/metadata/md5-cache/app-shells/posh-0.13.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Reimplementation of Bourne shell based on pdksh
+EAPI=7
+HOMEPAGE=https://salsa.debian.org/clint/posh
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+ BSD public-domain
+SLOT=0
+SRC_URI=mirror://debian/pool/main/p/posh/posh_0.13.2.tar.xz
+_md5_=940b9b87a19d7c3aab517789dc14e995
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index e5cd6dcfc806..97b30c5d2f94 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/discount-2.1.8a-r1 b/metadata/md5-cache/app-text/discount-2.1.8a-r1
deleted file mode 100644
index 11fbbe37d458..000000000000
--- a/metadata/md5-cache/app-text/discount-2.1.8a-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DESCRIPTION=An implementation of John Gruber's Markdown text to html language written in C
-EAPI=5
-HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
-IUSE=minimal
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.1.8a.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73386c671f5e2783ae4324fa0cfbf20d
diff --git a/metadata/md5-cache/app-text/discount-2.2.2 b/metadata/md5-cache/app-text/discount-2.2.2
deleted file mode 100644
index 1ae27d1a85c9..000000000000
--- a/metadata/md5-cache/app-text/discount-2.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DESCRIPTION=A Markdown-to HTML translator written in C
-EAPI=6
-HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
-IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.2.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3499ee42a3e9750ca64cc5f8acdbee63
diff --git a/metadata/md5-cache/app-text/discount-2.2.3a b/metadata/md5-cache/app-text/discount-2.2.3a
deleted file mode 100644
index a1ab163b00df..000000000000
--- a/metadata/md5-cache/app-text/discount-2.2.3a
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DESCRIPTION=A Markdown-to HTML translator written in C
-EAPI=6
-HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
-IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.3a.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=cdd4c379d7b7bcd1f5ed257e4d539a7a
diff --git a/metadata/md5-cache/app-text/discount-2.2.4 b/metadata/md5-cache/app-text/discount-2.2.4
index fb48784d97c4..98505b6ea67f 100644
--- a/metadata/md5-cache/app-text/discount-2.2.4
+++ b/metadata/md5-cache/app-text/discount-2.2.4
@@ -3,9 +3,9 @@ DESCRIPTION=A Markdown-to HTML translator written in C
 EAPI=6
 HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
 IUSE=minimal test
-KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.4.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3f7e35b975c7fc84a20559958a6eeec7
+_md5_=fc94a491a37a5bd05d107f0946097f6c
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5
index 334d08465fc7..e112f5524f0d 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook SGML DTD 4.5
 EAPI=5
 HOMEPAGE=https://docbook.org/sgml/
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=docbook
 RDEPEND=app-text/sgml-common
 SLOT=4.5
 SRC_URI=https://www.docbook.org/sgml/4.5/docbook-4.5.zip
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25427dcdd1d9d00b3049db90ef416214
+_md5_=11adcfee48f0d4b3c74330b77b42a13f
diff --git a/metadata/md5-cache/app-text/dvisvgm-2.5 b/metadata/md5-cache/app-text/dvisvgm-2.5
index 691a421a3e18..5179183fad7a 100644
--- a/metadata/md5-cache/app-text/dvisvgm-2.5
+++ b/metadata/md5-cache/app-text/dvisvgm-2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Converts DVI files to SVG
 EAPI=6
 HOMEPAGE=http://dvisvgm.bplaced.net/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4916632da1f5d8a2fe3e0471b9a26da7
+_md5_=258cb7e40a81f03404c7ef1c52ad2a54
diff --git a/metadata/md5-cache/app-text/dvisvgm-2.6 b/metadata/md5-cache/app-text/dvisvgm-2.6
index cc36faffb678..3bd6b9679b9f 100644
--- a/metadata/md5-cache/app-text/dvisvgm-2.6
+++ b/metadata/md5-cache/app-text/dvisvgm-2.6
@@ -4,11 +4,11 @@ DESCRIPTION=Converts DVI files to SVG
 EAPI=6
 HOMEPAGE=http://dvisvgm.bplaced.net/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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.6/dvisvgm-2.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4916632da1f5d8a2fe3e0471b9a26da7
+_md5_=258cb7e40a81f03404c7ef1c52ad2a54
diff --git a/metadata/md5-cache/app-text/dvisvgm-2.6.1 b/metadata/md5-cache/app-text/dvisvgm-2.6.1
new file mode 100644
index 000000000000..997994f90724
--- /dev/null
+++ b/metadata/md5-cache/app-text/dvisvgm-2.6.1
@@ -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=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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.6.1/dvisvgm-2.6.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=258cb7e40a81f03404c7ef1c52ad2a54
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.25 b/metadata/md5-cache/app-text/ghostscript-gpl-9.25
index 10b13b35b63d..50882563ac6c 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.25
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.25
@@ -4,10 +4,10 @@ DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PD
 EAPI=6
 HOMEPAGE=https://ghostscript.com/
 IUSE=cups dbus gtk l10n_de static-libs tiff unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= media-libs/jbig2dec >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=sys-libs/zlib-1.2.7:= virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:= ) tiff? ( >=media-libs/tiff-4.0.1:0= ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.5-r1 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other !<net-print/cups-filters-1.0.36-r2
 SLOT=0
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs925/ghostscript-9.25.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/ghostscript-gpl-9.25-patchset-1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=930b5279eb956f33bbdc366f861171f9
+_md5_=bba174155e4248dbbc7fb29af6b1b8f3
diff --git a/metadata/md5-cache/app-text/html2text-1.3.2a-r2 b/metadata/md5-cache/app-text/html2text-1.3.2a-r2
new file mode 100644
index 000000000000..4f76a99d5f8d
--- /dev/null
+++ b/metadata/md5-cache/app-text/html2text-1.3.2a-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=HTML to text converter
+EAPI=7
+HOMEPAGE=http://www.mbayer.de/html2text/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz http://www.mbayer.de/html2text/downloads/patch-utf8-html2text-1.3.2a.diff http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=df012acc099017dd3f9f96b9c46e5347
diff --git a/metadata/md5-cache/app-text/htp-1.19 b/metadata/md5-cache/app-text/htp-1.19
new file mode 100644
index 000000000000..3c630d1c1f43
--- /dev/null
+++ b/metadata/md5-cache/app-text/htp-1.19
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=An HTML preprocessor
+EAPI=6
+HOMEPAGE=http://htp.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=Clarified-Artistic
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/htp/htp-1.19.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=df582a96b4237d4908b12d2f3157316e
diff --git a/metadata/md5-cache/app-text/kbibtex-0.8.1 b/metadata/md5-cache/app-text/kbibtex-0.8.1
index d452eb094533..49388ff987f0 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.8.1
+++ b/metadata/md5-cache/app-text/kbibtex-0.8.1
@@ -1,15 +1,15 @@
 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/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/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth: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
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=BibTeX editor to edit bibliographies used with LaTeX
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/KBibTeX
 IUSE=webengine webkit zotero test debug +handbook test
 KEYWORDS=amd64 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/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/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) !app-text/kbibtex:4 dev-tex/bibtex2html x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) !app-text/kbibtex:4 dev-tex/bibtex2html x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=?? ( webengine webkit )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/KBibTeX/0.8.1/kbibtex-0.8.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e7220f431cd892d071f14a8af5650f5
diff --git a/metadata/md5-cache/app-text/libnumbertext-1.0.5 b/metadata/md5-cache/app-text/libnumbertext-1.0.5
new file mode 100644
index 000000000000..ec62bcd0a233
--- /dev/null
+++ b/metadata/md5-cache/app-text/libnumbertext-1.0.5
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Number to number name and money text conversion libraries
+EAPI=7
+HOMEPAGE=https://github.com/Numbertext/libnumbertext
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3+
+SLOT=0
+SRC_URI=https://github.com/Numbertext/libnumbertext/releases/download/1.0.5/libnumbertext-1.0.5.tar.xz
+_md5_=308595eb4862b29ac506b2bc1b7343c5
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.8 b/metadata/md5-cache/app-text/libspectre-0.2.8
index 70d5540e0c23..11a9159addbd 100644
--- a/metadata/md5-cache/app-text/libspectre-0.2.8
+++ b/metadata/md5-cache/app-text/libspectre-0.2.8
@@ -4,11 +4,11 @@ DESCRIPTION=A library for rendering Postscript documents
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libspectre
 IUSE=debug doc static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/ghostscript-gpl-8.62
 RESTRICT=test
 SLOT=0
 SRC_URI=https://libspectre.freedesktop.org/releases/libspectre-0.2.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=148180a07b582dfeff1dc30544cc8acd
+_md5_=2f465656aba12628d37e95aeec0ec28c
diff --git a/metadata/md5-cache/app-text/lv-4.51-r4 b/metadata/md5-cache/app-text/lv-4.51-r4
index 0f2a1bcc0409..cba0c7addd25 100644
--- a/metadata/md5-cache/app-text/lv-4.51-r4
+++ b/metadata/md5-cache/app-text/lv-4.51-r4
@@ -3,10 +3,10 @@ DEPEND=!app-editors/levee sys-libs/ncurses:0= dev-lang/perl >=app-portage/elt-pa
 DESCRIPTION=Powerful Multilingual File Viewer
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ~arm ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=!app-editors/levee sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/lv451.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=752b759e2e2268574ddcdbd05341b759
+_md5_=b791863fe28821dd77ef0b283f4f223a
diff --git a/metadata/md5-cache/app-text/mupdf-1.13.0 b/metadata/md5-cache/app-text/mupdf-1.13.0
index 82dbfcc48e96..fcdbf13dd0b8 100644
--- a/metadata/md5-cache/app-text/mupdf-1.13.0
+++ b/metadata/md5-cache/app-text/mupdf-1.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
 EAPI=6
 HOMEPAGE=https://mupdf.com/
 IUSE=X +curl javascript lcms libressl opengl +openssl static static-libs vanilla
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 RDEPEND=!libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/freeglut-3.0.0:= )
 REQUIRED_USE=opengl? ( !static !static-libs )
 SLOT=0/1.13.0
 SRC_URI=https://mupdf.com/downloads/mupdf-1.13.0-source.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7f6208af03cd661b0629693fcf80d15d
+_md5_=78cdd96e6f85d2b3acc0277809191e3c
diff --git a/metadata/md5-cache/app-text/mupdf-1.13.0-r1 b/metadata/md5-cache/app-text/mupdf-1.13.0-r1
index 7cfae62fe6f9..afc0005ff040 100644
--- a/metadata/md5-cache/app-text/mupdf-1.13.0-r1
+++ b/metadata/md5-cache/app-text/mupdf-1.13.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
 EAPI=6
 HOMEPAGE=https://mupdf.com/
 IUSE=X +curl javascript lcms libressl opengl +openssl static static-libs vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 RDEPEND=!libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/freeglut-3.0.0:= )
 REQUIRED_USE=opengl? ( !static !static-libs )
 SLOT=0/1.13.0
 SRC_URI=https://mupdf.com/downloads/mupdf-1.13.0-source.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d5f52c494790bb056db3d5b0170fba7d
+_md5_=d13bba1bc96193dceaa0f3dd0ab1443f
diff --git a/metadata/md5-cache/app-text/mupdf-1.14.0-r2 b/metadata/md5-cache/app-text/mupdf-1.14.0-r2
new file mode 100644
index 000000000000..5dab55ea206d
--- /dev/null
+++ b/metadata/md5-cache/app-text/mupdf-1.14.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=>=dev-lang/mujs-1.0.4 media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] virtual/jpeg[static-libs?] curl? ( net-misc/curl[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) opengl? ( >=media-libs/freeglut-3.0.0:= ) X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
+EAPI=6
+HOMEPAGE=https://mupdf.com/
+IUSE=X curl +javascript libressl opengl +openssl static-libs +vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=AGPL-3
+RDEPEND=>=dev-lang/mujs-1.0.4 media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] virtual/jpeg[static-libs?] curl? ( net-misc/curl[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) opengl? ( >=media-libs/freeglut-3.0.0:= ) X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
+REQUIRED_USE=opengl? ( !static-libs ) curl? ( X )
+SLOT=0/1.14.0
+SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.14.0-source.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7f3c15f5891ff466b75a5e60b089da5c
diff --git a/metadata/md5-cache/app-text/pytextile-2.1.8 b/metadata/md5-cache/app-text/pytextile-2.1.8
deleted file mode 100644
index f8eee9542234..000000000000
--- a/metadata/md5-cache/app-text/pytextile-2.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A Python port of Textile, A humane web text generator
-EAPI=5
-HOMEPAGE=https://github.com/ikirudennis/python-textile
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/t/textile/textile-2.1.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9708e32e671759a49dc8a192478564b5
diff --git a/metadata/md5-cache/app-text/pytextile-2.3.3 b/metadata/md5-cache/app-text/pytextile-2.3.3
index de6a6cf900b4..447bc218d5c6 100644
--- a/metadata/md5-cache/app-text/pytextile-2.3.3
+++ b/metadata/md5-cache/app-text/pytextile-2.3.3
@@ -1,5 +1,5 @@
 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(-)] dev-python/pytest-runner[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[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(-)]
+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(-)] dev-python/pytest-runner[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A Python port of Textile, A humane web text generator
 EAPI=5
 HOMEPAGE=https://github.com/textile/python-textile
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/2.3.3.tar.gz -> pytextile-2.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5d24c26c94fc16f127cf9ffe79badbdf
+_md5_=b5e9dd50fbeacd9ff803c2fa540d4cb7
diff --git a/metadata/md5-cache/app-text/pytextile-3.0.3 b/metadata/md5-cache/app-text/pytextile-3.0.3
new file mode 100644
index 000000000000..7f99239f6928
--- /dev/null
+++ b/metadata/md5-cache/app-text/pytextile-3.0.3
@@ -0,0 +1,15 @@
+BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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(-)]
+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_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(-)] test? ( dev-python/html5lib[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-python/regex[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-python/six[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-python/pytest[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=A Python port of Textile, A humane web text generator
+EAPI=7
+HOMEPAGE=https://github.com/textile/python-textile
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/html5lib[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-python/regex[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-python/six[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= ) 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_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=|| ( 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=https://github.com/textile/python-textile/archive/3.0.3.tar.gz -> pytextile-3.0.3.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2be15dd820bdb410f437b9eebdfcc0a1
diff --git a/metadata/md5-cache/app-text/sword-1.8.0 b/metadata/md5-cache/app-text/sword-1.8.0
deleted file mode 100644
index 92d14b7e2066..000000000000
--- a/metadata/md5-cache/app-text/sword-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? ( dev-cpp/clucene ) virtual/pkgconfig
-DESCRIPTION=Library for Bible reading software
-EAPI=7
-HOMEPAGE=http://www.crosswire.org/sword/
-IUSE=clucene curl debug doc icu static-libs
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? ( dev-cpp/clucene )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-1.8.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=10e8bdb05503552c697cf19d30b26f2d
diff --git a/metadata/md5-cache/app-text/sword-1.8.1-r1 b/metadata/md5-cache/app-text/sword-1.8.1-r1
new file mode 100644
index 000000000000..64b38a136deb
--- /dev/null
+++ b/metadata/md5-cache/app-text/sword-1.8.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? ( dev-cpp/clucene ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Library for Bible reading software
+EAPI=6
+HOMEPAGE=http://www.crosswire.org/sword/
+IUSE=clucene curl debug doc icu static-libs
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? ( dev-cpp/clucene )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-1.8.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1c19aaee28d23a15bb6d724f92d39be9
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r3 b/metadata/md5-cache/app-text/texlive-core-2017-r3
index 86ad4ad5d77e..29d2432a0bfd 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r3
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=https://tug.org/texlive/
 IUSE=cjk X doc source tk +luajittex xetex
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= <app-text/poppler-0.64.0 >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	9a9339b2c296eb12e91ef1d8e9a4c6d3	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c6442251859c778eb676e4db3c5de0a0
+_md5_=56d98e6cb61589ef0dc6648b441cba5e
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r4 b/metadata/md5-cache/app-text/texlive-core-2017-r4
index a1533369d905..4ce2bf52dbbf 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r4
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=https://tug.org/texlive/
 IUSE=cjk X doc source tk +luajittex xetex
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive-20170524-source-freetype.patch.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	9a9339b2c296eb12e91ef1d8e9a4c6d3	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b9123066821cd575cc3af5ac0afa1a8
+_md5_=3b3011236b83c68a79a42430c821953f
diff --git a/metadata/md5-cache/app-text/uudeview-0.5.20-r2 b/metadata/md5-cache/app-text/uudeview-0.5.20-r2
index b112876d1acb..5973a129c7f1 100644
--- a/metadata/md5-cache/app-text/uudeview-0.5.20-r2
+++ b/metadata/md5-cache/app-text/uudeview-0.5.20-r2
@@ -1,13 +1,11 @@
 DEFINED_PHASES=configure prepare
-DEPEND=tk? ( dev-lang/tk:0 ) >=app-portage/elt-patches-20170815 !<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=>=app-portage/elt-patches-20170815 !<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=uu, xx, base64, binhex decoder
 EAPI=5
 HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
-IUSE=tk
 KEYWORDS=alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=tk? ( dev-lang/tk:0 )
 SLOT=0
 SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0538ef15ce6045c8d9a1ad128bf4d01d
+_md5_=b047a58f6bebd0b0770e3e343eb131d8
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03-r1 b/metadata/md5-cache/app-text/xdvik-22.87.03-r1
index 8c6283f42f79..15ac3450b156 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.03-r1
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea
+DEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( virtual/emacs ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea
 DESCRIPTION=DVI previewer for X Window System
 EAPI=5
 HOMEPAGE=http://xdvi.sourceforge.net/
 IUSE=motif neXt Xaw3d emacs
 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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
+RDEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( virtual/emacs ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a571386384a537f42b1d2dc85a2b139a
+_md5_=d1a6017fa5ebd0ddc2ad897a63c54aa1
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03-r2 b/metadata/md5-cache/app-text/xdvik-22.87.03-r2
new file mode 100644
index 000000000000..08b7b307028e
--- /dev/null
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig >=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( virtual/emacs ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea >=app-portage/elt-patches-20170815 !<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=DVI previewer for X Window System
+EAPI=6
+HOMEPAGE=http://xdvi.sourceforge.net/
+IUSE=motif neXt Xaw3d emacs
+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 ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( virtual/emacs ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
+SLOT=0
+SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ce2b31d03fe7e7bcebb80b7e0d675c87
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r1 b/metadata/md5-cache/app-text/xmlto-0.0.28-r1
index 77a9a6615e2e..5ee5e87bfc60 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r1
+++ b/metadata/md5-cache/app-text/xmlto-0.0.28-r1
@@ -4,10 +4,10 @@ DESCRIPTION=script for converting XML and DocBook documents to a variety of outp
 EAPI=5
 HOMEPAGE=https://pagure.io/xmlto
 IUSE=latex text
-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 ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
 SLOT=0
 SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b9eac9c7336387accf6ef2fdde22b9dc
+_md5_=a15fa02f6e9647e6dc61896a7adca5fb
diff --git a/metadata/md5-cache/app-text/zathura-0.3.7 b/metadata/md5-cache/app-text/zathura-0.3.7
deleted file mode 100644
index 7f4ae67005ef..000000000000
--- a/metadata/md5-cache/app-text/zathura-0.3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A highly customizable and functional document viewer
-EAPI=5
-HOMEPAGE=http://pwmt.org/projects/zathura/
-IUSE=+magic sqlite synctex test test
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
-SLOT=0
-SRC_URI=http://pwmt.org/projects/zathura/download/zathura-0.3.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=715e8a2205306fb36400601406467377
diff --git a/metadata/md5-cache/app-text/zathura-0.3.8 b/metadata/md5-cache/app-text/zathura-0.3.8
index 53c875d72800..f6cc77a8c8fd 100644
--- a/metadata/md5-cache/app-text/zathura-0.3.8
+++ b/metadata/md5-cache/app-text/zathura-0.3.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/girara-0.2.8:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/girara-0.2.8:= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=6
 HOMEPAGE=http://pwmt.org/projects/zathura/
 IUSE=+magic sqlite synctex test test
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
-RDEPEND=>=dev-libs/girara-0.2.8:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
+RDEPEND=>=dev-libs/girara-0.2.8:= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/download/zathura-0.3.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=04b7280c24d30477e203210953ee9d1e
+_md5_=7be6c0b45eb39bf6440f66363043bc07
diff --git a/metadata/md5-cache/app-text/zathura-0.4.1 b/metadata/md5-cache/app-text/zathura-0.4.1
new file mode 100644
index 000000000000..220e0f8b5256
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=dev-libs/appstream >=dev-libs/girara-0.3.1 >=dev-libs/glib-2.50:2 dev-util/desktop-file-utils dev-python/sphinx x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core ) test? ( dev-libs/check ) >=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=A highly customizable and functional document viewer
+EAPI=6
+HOMEPAGE=http://pwmt.org/projects/zathura/
+IUSE=+magic seccomp sqlite synctex test test
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=ZLIB
+RDEPEND=dev-libs/appstream >=dev-libs/girara-0.3.1 >=dev-libs/glib-2.50:2 dev-util/desktop-file-utils dev-python/sphinx x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+SLOT=0
+SRC_URI=https://pwmt.org/projects/zathura/download/zathura-0.4.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4b96f6b6ae70954eb857a4ab1421bace
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index c66b06313436..ccf4375bc648 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/girara-0.2.7:= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=5
 HOMEPAGE=http://pwmt.org/projects/zathura/
 IUSE=+magic sqlite synctex test test
 LICENSE=ZLIB
-RDEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
+RDEPEND=>=dev-libs/girara-0.2.7:= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4cacf5402117e8be231f5fd755815b48
+_md5_=573dfe2e676a054fc4497f2a77e9a76a
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.6 b/metadata/md5-cache/app-text/zathura-djvu-0.2.6
deleted file mode 100644
index b982a5724068..000000000000
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.1 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig
-DESCRIPTION=DjVu plug-in for zathura
-EAPI=5
-HOMEPAGE=http://pwmt.org/projects/zathura/
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.1 dev-libs/glib:2= x11-libs/cairo:=
-SLOT=0
-SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-djvu-0.2.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f66a5feea566e211d4c1d06af56b9b15
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.8 b/metadata/md5-cache/app-text/zathura-djvu-0.2.8
new file mode 100644
index 000000000000..bca6de04cc40
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=DjVu plug-in for zathura
+EAPI=6
+HOMEPAGE=https://pwmt.org/projects/zathura-djvu/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ZLIB
+RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+SLOT=0
+SRC_URI=https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.8.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6d2e07420725cfbf2c9ea4d1f5c6383f
diff --git a/metadata/md5-cache/app-text/zathura-meta-0 b/metadata/md5-cache/app-text/zathura-meta-0
index e83368705a57..18c4035ae136 100644
--- a/metadata/md5-cache/app-text/zathura-meta-0
+++ b/metadata/md5-cache/app-text/zathura-meta-0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Meta package for app-text/zathura plugins
-EAPI=5
+EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura/
 IUSE=cb djvu +pdf postscript
 KEYWORDS=amd64 ~arm x86
 LICENSE=metapackage
 RDEPEND=app-text/zathura cb? ( app-text/zathura-cb ) djvu? ( app-text/zathura-djvu ) pdf? ( || ( app-text/zathura-pdf-poppler app-text/zathura-pdf-mupdf ) ) postscript? ( app-text/zathura-ps )
 SLOT=0
-_md5_=09626ba2f19ba208a2dd8add9f8dfdc3
+_md5_=718247c7153a0471a2f49799cc6400a9
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4
new file mode 100644
index 000000000000..f983af0fb628
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DEPEND=app-text/mupdf >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+DESCRIPTION=PDF plug-in for zathura
+EAPI=7
+HOMEPAGE=https://pwmt.org/projects/zathura-pdf-mupdf/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ZLIB
+RDEPEND=app-text/mupdf >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+SLOT=0
+SRC_URI=https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-0.3.4.tar.xz
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=8604e824d519c2ec9dca11b02bf2fc1b
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
deleted file mode 100644
index 440953a14f01..000000000000
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:= virtual/pkgconfig
-DESCRIPTION=PDF plug-in for zathura
-EAPI=5
-HOMEPAGE=http://pwmt.org/projects/zathura/
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:=
-SLOT=0
-SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=866e8559904ce1781322b5b18ace1996
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
new file mode 100644
index 000000000000..d9fa3f06a4f0
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
+DESCRIPTION=PDF plug-in for zathura
+EAPI=7
+HOMEPAGE=https://pwmt.org/projects/zathura-pdf-poppler
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ZLIB
+RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
+SLOT=0
+SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.9.tar.xz
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=59468750cee85eef2335e0a86adb72f7
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.4 b/metadata/md5-cache/app-text/zathura-ps-0.2.4
deleted file mode 100644
index ac912a9ca64b..000000000000
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig
-DESCRIPTION=PostScript plug-in for zathura
-EAPI=5
-HOMEPAGE=https://pwmt.org/projects/zathura/
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x11-libs/cairo:=
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a918978cb6447ccd08bcc83c95de0f09
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.6 b/metadata/md5-cache/app-text/zathura-ps-0.2.6
new file mode 100644
index 000000000000..6697e8786b8e
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.6
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+DESCRIPTION=PostScript plug-in for zathura
+EAPI=7
+HOMEPAGE=https://pwmt.org/projects/zathura-ps/download/
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+SLOT=0
+SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.6.tar.xz
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=23eded9e6ab99fd32afef7120403d7ad
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index ab3c0748ce82..39550ac757f8 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/airline-themes-0_pre20181021 b/metadata/md5-cache/app-vim/airline-themes-0_pre20181021
new file mode 100644
index 000000000000..58853b227d17
--- /dev/null
+++ b/metadata/md5-cache/app-vim/airline-themes-0_pre20181021
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a collection of themes for vim-airline
+EAPI=7
+HOMEPAGE=https://github.com/vim-airline/vim-airline-themes
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/app-vim/airline-themes/airline-themes-0_pre20181021.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=ca4f7c31f08c604763cedda8552aef02
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20160530 b/metadata/md5-cache/app-vim/gentoo-syntax-20160530
deleted file mode 100644
index 79bca94a09da..000000000000
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20160530
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
-EAPI=6
-HOMEPAGE=https://github.com/gentoo/gentoo-syntax
-IUSE=ignore-glep31
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/gentoo/gentoo-syntax/archive/20160530.tar.gz -> gentoo-syntax-20160530.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=79c7dbb9cf5374a586a3fc292eb90e05
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20170225 b/metadata/md5-cache/app-vim/gentoo-syntax-20170225
deleted file mode 100644
index f54639c97e94..000000000000
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20170225
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
-EAPI=6
-HOMEPAGE=https://github.com/gentoo/gentoo-syntax
-IUSE=ignore-glep31
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/gentoo/gentoo-syntax/archive/20170225.tar.gz -> gentoo-syntax-20170225.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=0a6045f239efc3bf4660e41c1dda0a95
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20180821 b/metadata/md5-cache/app-vim/gentoo-syntax-20180821
index c2c0f4f0f08b..a505e76dbbb3 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20180821
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20180821
@@ -4,10 +4,10 @@ DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
 IUSE=ignore-glep31
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-20180821.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=57a93cd2ac3c5935d98a39d76378f0e7
+_md5_=330ebf7f9096d62b379125f748326c1c
diff --git a/metadata/md5-cache/app-vim/python-mode-0.6.18-r3 b/metadata/md5-cache/app-vim/python-mode-0.6.18-r3
deleted file mode 100644
index d491678d3c89..000000000000
--- a/metadata/md5-cache/app-vim/python-mode-0.6.18-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Provide python code looking for bugs, refactoring and other useful things
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=dev-python/astng dev-python/autopep8 dev-python/pyflakes dev-python/pylint dev-python/rope dev-python/ropemode || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/klen/python-mode/archive/0.6.18.tar.gz -> python-mode-0.6.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=06e72119d3229e607e574ccaa44a5ec8
diff --git a/metadata/md5-cache/app-vim/python-mode-0.6.18-r4 b/metadata/md5-cache/app-vim/python-mode-0.6.18-r4
deleted file mode 100644
index efabdd0b09df..000000000000
--- a/metadata/md5-cache/app-vim/python-mode-0.6.18-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Provide python code looking for bugs, refactoring and other useful things
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( app-editors/vim[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(+)] app-editors/gvim[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-python/astng[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/autopep8[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/pyflakes[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/pylint[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/rope[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/ropemode[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(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/klen/python-mode/archive/0.6.18.tar.gz -> python-mode-0.6.18.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=1446bd2bb8667da2f2e9d47c1900023c
diff --git a/metadata/md5-cache/app-vim/python-mode-0.9.0 b/metadata/md5-cache/app-vim/python-mode-0.9.0
deleted file mode 100644
index ea83ff72527f..000000000000
--- a/metadata/md5-cache/app-vim/python-mode-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Provide python code looking for bugs, refactoring and other useful things
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-python/rope dev-python/astng dev-python/pylint dev-python/pyflakes dev-python/autopep8 dev-python/ropemode || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/klen/python-mode/archive/0.9.0.tar.gz -> python-mode-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=a84124956eb480308b6680dd35f1ab20
diff --git a/metadata/md5-cache/app-vim/python-mode-0.9.0-r1 b/metadata/md5-cache/app-vim/python-mode-0.9.0-r1
deleted file mode 100644
index f047f50d15d2..000000000000
--- a/metadata/md5-cache/app-vim/python-mode-0.9.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Provide python code looking for bugs, refactoring and other useful things
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/rope[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/astng[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/pylint[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/pyflakes[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/autopep8[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/ropemode[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(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/klen/python-mode/archive/0.9.0.tar.gz -> python-mode-0.9.0.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=283f660fcba34dd5c1955d7b784d8c17
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 5bbdc6a9234c..1577d714a27d 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
index f3eafb0a2f22..cfea6aa9baa9 100644
--- a/metadata/md5-cache/app-xemacs/ada-1.16
+++ b/metadata/md5-cache/app-xemacs/ada-1.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Ada language support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=bf000819286a0776e86475a4c43becb0
diff --git a/metadata/md5-cache/app-xemacs/apel-1.36 b/metadata/md5-cache/app-xemacs/apel-1.36
index aca4bf590c63..faef6e882562 100644
--- a/metadata/md5-cache/app-xemacs/apel-1.36
+++ b/metadata/md5-cache/app-xemacs/apel-1.36
@@ -2,10 +2,10 @@ 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
+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
+_md5_=401b7a4242c447188d7961118e45136d
diff --git a/metadata/md5-cache/app-xemacs/auctex-1.58 b/metadata/md5-cache/app-xemacs/auctex-1.58
index a6a9bd700c82..7bf116e8e46d 100644
--- a/metadata/md5-cache/app-xemacs/auctex-1.58
+++ b/metadata/md5-cache/app-xemacs/auctex-1.58
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Basic TeX/LaTeX support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=edc9aabb6e75aacae405a5da8d5abcc1
diff --git a/metadata/md5-cache/app-xemacs/bbdb-1.34 b/metadata/md5-cache/app-xemacs/bbdb-1.34
index 4d4bafcab2f9..4c150653524d 100644
--- a/metadata/md5-cache/app-xemacs/bbdb-1.34
+++ b/metadata/md5-cache/app-xemacs/bbdb-1.34
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=The Big Brother Data Base
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=6af7a4d9f185ab18abc06848c3c9a0d1
diff --git a/metadata/md5-cache/app-xemacs/build-1.18 b/metadata/md5-cache/app-xemacs/build-1.18
index 14654b5bfb38..49209ca009af 100644
--- a/metadata/md5-cache/app-xemacs/build-1.18
+++ b/metadata/md5-cache/app-xemacs/build-1.18
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Build XEmacs from within (UNIX, Windows)
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=776bc0bcc9d3cf13e14b60d4673ddec8
diff --git a/metadata/md5-cache/app-xemacs/c-support-1.24 b/metadata/md5-cache/app-xemacs/c-support-1.24
index 41d74975a974..6a902e43e30d 100644
--- a/metadata/md5-cache/app-xemacs/c-support-1.24
+++ b/metadata/md5-cache/app-xemacs/c-support-1.24
@@ -2,10 +2,10 @@ 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
+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
+_md5_=21646fd5fe3081cfc160e4502625b80f
diff --git a/metadata/md5-cache/app-xemacs/calc-1.28 b/metadata/md5-cache/app-xemacs/calc-1.28
index 911cef1a5246..895e58fd5391 100644
--- a/metadata/md5-cache/app-xemacs/calc-1.28
+++ b/metadata/md5-cache/app-xemacs/calc-1.28
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Emacs calculator
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=23b03e2d6cdf63b204d579f74b60458d
diff --git a/metadata/md5-cache/app-xemacs/calendar-1.42 b/metadata/md5-cache/app-xemacs/calendar-1.42
index ef3c877f2006..11a61e130bda 100644
--- a/metadata/md5-cache/app-xemacs/calendar-1.42
+++ b/metadata/md5-cache/app-xemacs/calendar-1.42
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Calendar and diary support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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.42-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e9eed6175569210eece0e12feab7aeb8
+_md5_=07b8a0349893d8e267f5f483b5753ed4
diff --git a/metadata/md5-cache/app-xemacs/cc-mode-1.99 b/metadata/md5-cache/app-xemacs/cc-mode-1.99
index ca5d1fb32708..df05afe2f4c7 100644
--- a/metadata/md5-cache/app-xemacs/cc-mode-1.99
+++ b/metadata/md5-cache/app-xemacs/cc-mode-1.99
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=C, C++ and Java language support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=a7252c6c951fb8ec31afb03cb0119a41
diff --git a/metadata/md5-cache/app-xemacs/cedet-common-1.03 b/metadata/md5-cache/app-xemacs/cedet-common-1.03
index f09d3f4f2b1f..405734fcbce8 100644
--- a/metadata/md5-cache/app-xemacs/cedet-common-1.03
+++ b/metadata/md5-cache/app-xemacs/cedet-common-1.03
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Common files for CEDET development environment
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=d6fc008c64b547ff75aa6d349690c45d
diff --git a/metadata/md5-cache/app-xemacs/clearcase-1.12 b/metadata/md5-cache/app-xemacs/clearcase-1.12
index 27d88c0a1e72..3b4e48275699 100644
--- a/metadata/md5-cache/app-xemacs/clearcase-1.12
+++ b/metadata/md5-cache/app-xemacs/clearcase-1.12
@@ -2,10 +2,10 @@ 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
+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
+_md5_=e00430ac33a6a88aacc667efa39d9453
diff --git a/metadata/md5-cache/app-xemacs/cogre-1.04 b/metadata/md5-cache/app-xemacs/cogre-1.04
index e83cc5a478df..2ed2660524e8 100644
--- a/metadata/md5-cache/app-xemacs/cogre-1.04
+++ b/metadata/md5-cache/app-xemacs/cogre-1.04
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Graph editing mode
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=e6095b2946220f2aed7abb66c9f0a50b
diff --git a/metadata/md5-cache/app-xemacs/cookie-1.17 b/metadata/md5-cache/app-xemacs/cookie-1.17
index 0e6a2f9e3c2d..37daa547e06c 100644
--- a/metadata/md5-cache/app-xemacs/cookie-1.17
+++ b/metadata/md5-cache/app-xemacs/cookie-1.17
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Spook and Yow (Zippy quotes)
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=25823732536a2e6bff36e880a3bd4ea3
diff --git a/metadata/md5-cache/app-xemacs/crisp-1.17 b/metadata/md5-cache/app-xemacs/crisp-1.17
index d4fc6bdef454..e67c56b7f5dc 100644
--- a/metadata/md5-cache/app-xemacs/crisp-1.17
+++ b/metadata/md5-cache/app-xemacs/crisp-1.17
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Crisp/Brief emulation
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=3ec1d9c7f201857bfe6c9f4bb0eb6f85
diff --git a/metadata/md5-cache/app-xemacs/debug-1.20 b/metadata/md5-cache/app-xemacs/debug-1.20
index 7cf0f2ee4093..5980387b7126 100644
--- a/metadata/md5-cache/app-xemacs/debug-1.20
+++ b/metadata/md5-cache/app-xemacs/debug-1.20
@@ -2,10 +2,10 @@ 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
+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
+_md5_=1846235d0cd1a04e8ed36c3be3bfb61f
diff --git a/metadata/md5-cache/app-xemacs/dictionary-1.18 b/metadata/md5-cache/app-xemacs/dictionary-1.18
index e8c169a0797b..95f98d8ec142 100644
--- a/metadata/md5-cache/app-xemacs/dictionary-1.18
+++ b/metadata/md5-cache/app-xemacs/dictionary-1.18
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Interface to RFC2229 dictionary servers
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=b9a37ee5dea114a04be941b469fbcdf4
diff --git a/metadata/md5-cache/app-xemacs/dired-1.22 b/metadata/md5-cache/app-xemacs/dired-1.22
index 3f93b0c96724..8d80a6ec34f8 100644
--- a/metadata/md5-cache/app-xemacs/dired-1.22
+++ b/metadata/md5-cache/app-xemacs/dired-1.22
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Manage file systems
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=e9ba7182a260c9b49ad7c007d080bd70
diff --git a/metadata/md5-cache/app-xemacs/docbookide-0.10 b/metadata/md5-cache/app-xemacs/docbookide-0.10
index daff7d4d049c..84f9252156a9 100644
--- a/metadata/md5-cache/app-xemacs/docbookide-0.10
+++ b/metadata/md5-cache/app-xemacs/docbookide-0.10
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=DocBook editing support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=75db6a0788e3aa723662de11ca526406
diff --git a/metadata/md5-cache/app-xemacs/easypg-1.05 b/metadata/md5-cache/app-xemacs/easypg-1.05
index a39ad0e67038..66ae7e97c14a 100644
--- a/metadata/md5-cache/app-xemacs/easypg-1.05
+++ b/metadata/md5-cache/app-xemacs/easypg-1.05
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=GnuPG interface for Emacs
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=4f6d28234e1bfdfb2c2c3820bc2cd754
diff --git a/metadata/md5-cache/app-xemacs/ecb-1.25 b/metadata/md5-cache/app-xemacs/ecb-1.25
index 2a4d790e7e53..e992798b47b2 100644
--- a/metadata/md5-cache/app-xemacs/ecb-1.25
+++ b/metadata/md5-cache/app-xemacs/ecb-1.25
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Emacs source code browser
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=9f4a54be5afa954be8bc0bad5848a75a
diff --git a/metadata/md5-cache/app-xemacs/ecrypto-0.23 b/metadata/md5-cache/app-xemacs/ecrypto-0.23
index cf612e694f14..a06e6a4463e6 100644
--- a/metadata/md5-cache/app-xemacs/ecrypto-0.23
+++ b/metadata/md5-cache/app-xemacs/ecrypto-0.23
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Crypto functionality in Emacs Lisp
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=b90771b268e040971e4e668250c6dbe6
diff --git a/metadata/md5-cache/app-xemacs/ede-1.07 b/metadata/md5-cache/app-xemacs/ede-1.07
index 693fd6123693..ffa7a3bb1c93 100644
--- a/metadata/md5-cache/app-xemacs/ede-1.07
+++ b/metadata/md5-cache/app-xemacs/ede-1.07
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Emacs Development Environment
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=a70b7947d7bc56ea2802b8cd84d0831d
diff --git a/metadata/md5-cache/app-xemacs/edebug-1.24 b/metadata/md5-cache/app-xemacs/edebug-1.24
index 45a58e58013b..4d8d04255d5a 100644
--- a/metadata/md5-cache/app-xemacs/edebug-1.24
+++ b/metadata/md5-cache/app-xemacs/edebug-1.24
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=An Emacs Lisp debugger
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=e3d06c17cc0087b018b1659a0cf25d80
diff --git a/metadata/md5-cache/app-xemacs/edict-1.19 b/metadata/md5-cache/app-xemacs/edict-1.19
index 33306fc88fcf..91468cdf5538 100644
--- a/metadata/md5-cache/app-xemacs/edict-1.19
+++ b/metadata/md5-cache/app-xemacs/edict-1.19
@@ -2,10 +2,10 @@ 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
+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
+_md5_=8a73c585940b3fc96955e98b2d56903c
diff --git a/metadata/md5-cache/app-xemacs/ediff-1.84 b/metadata/md5-cache/app-xemacs/ediff-1.84
index dd2b4da23a01..6b1ec3d254d3 100644
--- a/metadata/md5-cache/app-xemacs/ediff-1.84
+++ b/metadata/md5-cache/app-xemacs/ediff-1.84
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Interface over GNU patch
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=b7c6b53e127b35d8af44a2f2ab32290c
diff --git a/metadata/md5-cache/app-xemacs/edit-utils-2.58 b/metadata/md5-cache/app-xemacs/edit-utils-2.58
index fe044bae86db..fb8ae431e67f 100644
--- a/metadata/md5-cache/app-xemacs/edit-utils-2.58
+++ b/metadata/md5-cache/app-xemacs/edit-utils-2.58
@@ -2,10 +2,10 @@ 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
+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
+_md5_=1dd53eb08e758777535a091b0897ee0b
diff --git a/metadata/md5-cache/app-xemacs/edt-1.16 b/metadata/md5-cache/app-xemacs/edt-1.16
index 513e2375ae40..283e9409a76b 100644
--- a/metadata/md5-cache/app-xemacs/edt-1.16
+++ b/metadata/md5-cache/app-xemacs/edt-1.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=DEC EDIT/EDT emulation
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=d5f239e5353e8a29c8637e4e36069910
diff --git a/metadata/md5-cache/app-xemacs/efs-1.37 b/metadata/md5-cache/app-xemacs/efs-1.37
index 7f50fb85124f..e2a46ac070c4 100644
--- a/metadata/md5-cache/app-xemacs/efs-1.37
+++ b/metadata/md5-cache/app-xemacs/efs-1.37
@@ -2,10 +2,10 @@ 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
+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
+_md5_=87a3e1f3a26c4616c8b9c6660037edde
diff --git a/metadata/md5-cache/app-xemacs/egg-its-1.29 b/metadata/md5-cache/app-xemacs/egg-its-1.29
index 19db13920d69..fdfa92057856 100644
--- a/metadata/md5-cache/app-xemacs/egg-its-1.29
+++ b/metadata/md5-cache/app-xemacs/egg-its-1.29
@@ -2,10 +2,10 @@ 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
+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
+_md5_=3e33b864d7096c5d91fab79ab52b2cd9
diff --git a/metadata/md5-cache/app-xemacs/eieio-1.10 b/metadata/md5-cache/app-xemacs/eieio-1.10
index a5d2ee451fed..c3f67c651095 100644
--- a/metadata/md5-cache/app-xemacs/eieio-1.10
+++ b/metadata/md5-cache/app-xemacs/eieio-1.10
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Enhanced Implementation of Emacs Interpreted Objects
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=e005d1367102be3316e452cb9d0e9358
diff --git a/metadata/md5-cache/app-xemacs/elib-1.15 b/metadata/md5-cache/app-xemacs/elib-1.15
index 7ae719f1b2b6..a9e76fd54e85 100644
--- a/metadata/md5-cache/app-xemacs/elib-1.15
+++ b/metadata/md5-cache/app-xemacs/elib-1.15
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Portable Emacs Lisp utilities library
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=d05c65e4197a1cd86c159b30f3201acd
diff --git a/metadata/md5-cache/app-xemacs/emerge-1.13 b/metadata/md5-cache/app-xemacs/emerge-1.13
index a5d80716aa04..013c5f8e1dbe 100644
--- a/metadata/md5-cache/app-xemacs/emerge-1.13
+++ b/metadata/md5-cache/app-xemacs/emerge-1.13
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Another interface over GNU patch
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=a5ec7c30660f5ec48d34e305e7e9beba
diff --git a/metadata/md5-cache/app-xemacs/erc-0.26 b/metadata/md5-cache/app-xemacs/erc-0.26
index a771ddd187f8..cf6027215ac1 100644
--- a/metadata/md5-cache/app-xemacs/erc-0.26
+++ b/metadata/md5-cache/app-xemacs/erc-0.26
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=ERC - The Emacs IRC Client
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=962dd039d477e33141c0df025d499487
diff --git a/metadata/md5-cache/app-xemacs/escreen-1.03 b/metadata/md5-cache/app-xemacs/escreen-1.03
index a6de03662b33..9e726969ffdb 100644
--- a/metadata/md5-cache/app-xemacs/escreen-1.03
+++ b/metadata/md5-cache/app-xemacs/escreen-1.03
@@ -2,10 +2,10 @@ 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
+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
+_md5_=1dc6645502bd384d04ba51668e7b21c3
diff --git a/metadata/md5-cache/app-xemacs/eshell-1.21 b/metadata/md5-cache/app-xemacs/eshell-1.21
index ae26bd60b13a..43f651ec34d1 100644
--- a/metadata/md5-cache/app-xemacs/eshell-1.21
+++ b/metadata/md5-cache/app-xemacs/eshell-1.21
@@ -2,10 +2,10 @@ 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
+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
+_md5_=232dbdcea1f47120d42373024a3d79b4
diff --git a/metadata/md5-cache/app-xemacs/eudc-1.43 b/metadata/md5-cache/app-xemacs/eudc-1.43
index e6713a700606..2e7f32fe8c82 100644
--- a/metadata/md5-cache/app-xemacs/eudc-1.43
+++ b/metadata/md5-cache/app-xemacs/eudc-1.43
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Emacs Unified Directory Client (LDAP, PH)
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=6318e13cf6f8d85254e21e72be39fea0
diff --git a/metadata/md5-cache/app-xemacs/footnote-1.18 b/metadata/md5-cache/app-xemacs/footnote-1.18
index 28bae74dcb1b..6451cf92aaca 100644
--- a/metadata/md5-cache/app-xemacs/footnote-1.18
+++ b/metadata/md5-cache/app-xemacs/footnote-1.18
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Footnoting in mail message editing modes
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/footnote-1.18-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b0247c7447f75100fec8c12785d72724
+_md5_=23a6f8d91d70586038ada23c30313ffa
diff --git a/metadata/md5-cache/app-xemacs/forms-1.17 b/metadata/md5-cache/app-xemacs/forms-1.17
index 65e1f85425e0..6f2ca34413f9 100644
--- a/metadata/md5-cache/app-xemacs/forms-1.17
+++ b/metadata/md5-cache/app-xemacs/forms-1.17
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Forms editing support (obsolete, use Widget instead)
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/forms-1.17-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=28bf46b7f7e2e44e2123c30259e84c83
+_md5_=16eb58d60088a66686e4a0fd3a0b0cf3
diff --git a/metadata/md5-cache/app-xemacs/fortran-modes-1.07 b/metadata/md5-cache/app-xemacs/fortran-modes-1.07
index 831ba5251c6b..dd7f13ce1b62 100644
--- a/metadata/md5-cache/app-xemacs/fortran-modes-1.07
+++ b/metadata/md5-cache/app-xemacs/fortran-modes-1.07
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Fortran support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/fortran-modes-1.07-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=645d580aa58af8fe65a1974914b6d62a
+_md5_=893fcc09edd968c3b937ce6138ce5380
diff --git a/metadata/md5-cache/app-xemacs/frame-icon-1.13 b/metadata/md5-cache/app-xemacs/frame-icon-1.13
index 0a3d6c5219fa..002de61e6901 100644
--- a/metadata/md5-cache/app-xemacs/frame-icon-1.13
+++ b/metadata/md5-cache/app-xemacs/frame-icon-1.13
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Set up mode-specific icons for each frame under XEmacs
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/frame-icon-1.13-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ab3b809bbd2d04925ebcb74adc53c2c0
+_md5_=67a6dc32d2a4ee58ccdc4914e5439b01
diff --git a/metadata/md5-cache/app-xemacs/fsf-compat-1.24 b/metadata/md5-cache/app-xemacs/fsf-compat-1.24
index afb52801d0ee..bf9ffaba7e18 100644
--- a/metadata/md5-cache/app-xemacs/fsf-compat-1.24
+++ b/metadata/md5-cache/app-xemacs/fsf-compat-1.24
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=FSF Emacs compatibility files
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+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/fsf-compat-1.24-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e034867196dba80f468f747224660ebf
+_md5_=6e793dd84ca577ff2ea93cc1338c9f2f
diff --git a/metadata/md5-cache/app-xemacs/games-1.23 b/metadata/md5-cache/app-xemacs/games-1.23
index af3fe74d9b82..f85a7765c06a 100644
--- a/metadata/md5-cache/app-xemacs/games-1.23
+++ b/metadata/md5-cache/app-xemacs/games-1.23
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Tetris, Sokoban, and Snake
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/games-1.23-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4836bb5901ecabde9e583433b77a2992
+_md5_=2e91df73f3e5581231b17fbdc04fe4aa
diff --git a/metadata/md5-cache/app-xemacs/general-docs-1.10 b/metadata/md5-cache/app-xemacs/general-docs-1.10
index d29ee08cd8e2..bd98aee81b6c 100644
--- a/metadata/md5-cache/app-xemacs/general-docs-1.10
+++ b/metadata/md5-cache/app-xemacs/general-docs-1.10
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=General XEmacs documentation
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/general-docs-1.10-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1640505a4c57039c72675422eb37cdfa
+_md5_=aab1eaff64f0b0a2f23f02e73934e04f
diff --git a/metadata/md5-cache/app-xemacs/gnats-1.19 b/metadata/md5-cache/app-xemacs/gnats-1.19
index 7f5076ced77c..8dfc505cb7b8 100644
--- a/metadata/md5-cache/app-xemacs/gnats-1.19
+++ b/metadata/md5-cache/app-xemacs/gnats-1.19
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=XEmacs bug reports
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/gnats-1.19-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=d465d958ee3564ce3af58c0fa612953c
+_md5_=728eb27cab3f2b337269a58ecb30075b
diff --git a/metadata/md5-cache/app-xemacs/gnus-2.04 b/metadata/md5-cache/app-xemacs/gnus-2.04
index 438f0841134a..c28f97a59afd 100644
--- a/metadata/md5-cache/app-xemacs/gnus-2.04
+++ b/metadata/md5-cache/app-xemacs/gnus-2.04
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=The Gnus Newsreader and Mailreader
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/os-utils app-xemacs/dired app-xemacs/mh-e app-xemacs/sieve app-xemacs/ps-print app-xemacs/w3 app-xemacs/pgg app-xemacs/mailcrypt app-xemacs/ecrypto app-xemacs/sasl app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/gnus-2.04-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b834074d892343da4ecb3386775898cf
+_md5_=0c6d88ff6a6a20202b089ce93803d1a7
diff --git a/metadata/md5-cache/app-xemacs/haskell-mode-1.14 b/metadata/md5-cache/app-xemacs/haskell-mode-1.14
index 261b94c1f850..d004e1c21fa5 100644
--- a/metadata/md5-cache/app-xemacs/haskell-mode-1.14
+++ b/metadata/md5-cache/app-xemacs/haskell-mode-1.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Haskell editing support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/dired app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/edit-utils app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/haskell-mode-1.14-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=0092450f94d9f41154b3bbfc17974c71
+_md5_=6b4561d4e1393b3de1df0dc0004e9532
diff --git a/metadata/md5-cache/app-xemacs/hm-html-menus-1.26 b/metadata/md5-cache/app-xemacs/hm-html-menus-1.26
index bd9715b65dcf..70f397ece34a 100644
--- a/metadata/md5-cache/app-xemacs/hm-html-menus-1.26
+++ b/metadata/md5-cache/app-xemacs/hm-html-menus-1.26
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=HTML editing
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/hm--html-menus-1.26-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=96d2e5696f61526ca2bf7b657c5ec410
+_md5_=c42da3c259ff3461fb659fdf89d5c16f
diff --git a/metadata/md5-cache/app-xemacs/hyperbole-1.22 b/metadata/md5-cache/app-xemacs/hyperbole-1.22
index 216400fff3d1..7473c6d255ba 100644
--- a/metadata/md5-cache/app-xemacs/hyperbole-1.22
+++ b/metadata/md5-cache/app-xemacs/hyperbole-1.22
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Hyperbole: The Everyday Info Manager
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/calendar app-xemacs/vm app-xemacs/text-modes app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/apel app-xemacs/tm 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/hyperbole-1.22-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c0994705df45a5733dd6bebeb9b245fd
+_md5_=0d8efc95287aa9c969f594b5211cc7ce
diff --git a/metadata/md5-cache/app-xemacs/ibuffer-1.12 b/metadata/md5-cache/app-xemacs/ibuffer-1.12
index 1881d956a0a3..d2a9a6156eb2 100644
--- a/metadata/md5-cache/app-xemacs/ibuffer-1.12
+++ b/metadata/md5-cache/app-xemacs/ibuffer-1.12
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Advanced replacement for buffer-menu
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/ibuffer-1.12-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b37a20ae365d96367e222f4f1c578a3f
+_md5_=95a75200467b16eae91d513f60fa55a8
diff --git a/metadata/md5-cache/app-xemacs/idlwave-1.34 b/metadata/md5-cache/app-xemacs/idlwave-1.34
index 030299e04722..f7b6f7cd9d3c 100644
--- a/metadata/md5-cache/app-xemacs/idlwave-1.34
+++ b/metadata/md5-cache/app-xemacs/idlwave-1.34
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Editing and Shell mode for the Interactive Data Language
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/mail-lib app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/idlwave-1.34-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=abc903be511b968e97f53f86b6b46d04
+_md5_=49e4e286f7f12be2a226240f152ba0d1
diff --git a/metadata/md5-cache/app-xemacs/igrep-1.18 b/metadata/md5-cache/app-xemacs/igrep-1.18
index 63ba9a11443a..38d85301f7c1 100644
--- a/metadata/md5-cache/app-xemacs/igrep-1.18
+++ b/metadata/md5-cache/app-xemacs/igrep-1.18
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Enhanced front-end for Grep
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-xemacs/efs app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/igrep-1.18-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=067ffe0846b8b945d844e1a927dde0ea
+_md5_=9e8828a69151003c8ade9b4f524176fb
diff --git a/metadata/md5-cache/app-xemacs/ilisp-1.38 b/metadata/md5-cache/app-xemacs/ilisp-1.38
index 08aad1659019..e01065bc91c3 100644
--- a/metadata/md5-cache/app-xemacs/ilisp-1.38
+++ b/metadata/md5-cache/app-xemacs/ilisp-1.38
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Front-end for Inferior Lisp
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ilisp-1.38-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2b59d0c2bac7c26a3414f181f6b4f1d0
+_md5_=fcfb047d5336cdb9f7f2079cf62da508
diff --git a/metadata/md5-cache/app-xemacs/jde-1.54 b/metadata/md5-cache/app-xemacs/jde-1.54
index 9596b323eb25..d735ad02e1ee 100644
--- a/metadata/md5-cache/app-xemacs/jde-1.54
+++ b/metadata/md5-cache/app-xemacs/jde-1.54
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Integrated Development Environment for Java
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=3bec78584dc0c04cf6934520b8a76b29
diff --git a/metadata/md5-cache/app-xemacs/latin-euro-standards-1.11 b/metadata/md5-cache/app-xemacs/latin-euro-standards-1.11
index 734c4c846dc2..5f87e7255da3 100644
--- a/metadata/md5-cache/app-xemacs/latin-euro-standards-1.11
+++ b/metadata/md5-cache/app-xemacs/latin-euro-standards-1.11
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=MULE: Support for the Latin{7,8,9,10} character sets & coding systems
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mule-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/latin-euro-standards-1.11-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=36ebfba8e4737de2cd08aeded9812c85
+_md5_=ecbad0c501a221f694e9b2e5f86a471d
diff --git a/metadata/md5-cache/app-xemacs/latin-unity-1.23 b/metadata/md5-cache/app-xemacs/latin-unity-1.23
index 87dd193ed893..758b123349d4 100644
--- a/metadata/md5-cache/app-xemacs/latin-unity-1.23
+++ b/metadata/md5-cache/app-xemacs/latin-unity-1.23
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=MULE: find single ISO 8859 character set to encode a buffer
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mule-base app-xemacs/latin-euro-standards app-xemacs/mule-ucs app-xemacs/leim app-xemacs/fsf-compat app-xemacs/dired app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/latin-unity-1.23-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=6699a87455312b619c5ef06b01dbdac1
+_md5_=998d51ff8d0254614a67aa431ab85728
diff --git a/metadata/md5-cache/app-xemacs/leim-1.39 b/metadata/md5-cache/app-xemacs/leim-1.39
index 43a9277c60a5..1330585e70fa 100644
--- a/metadata/md5-cache/app-xemacs/leim-1.39
+++ b/metadata/md5-cache/app-xemacs/leim-1.39
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=MULE: Quail. All non-English and non-Japanese language support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mule-base app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/latin-euro-standards app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/leim-1.39-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=8e4ef361f222f720ce2217279b28e419
+_md5_=5b6b5f83d6fae7651b295a06847b3653
diff --git a/metadata/md5-cache/app-xemacs/locale-1.30 b/metadata/md5-cache/app-xemacs/locale-1.30
index c25bc0653f17..3f7001171fb6 100644
--- a/metadata/md5-cache/app-xemacs/locale-1.30
+++ b/metadata/md5-cache/app-xemacs/locale-1.30
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=MULE: Localized menubars and localized splash screens
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mule-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/locale-1.30-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=0ef63b3a34a85ee96541834ad8b4f9bf
+_md5_=bb83e04f9e639c7988d3ca31794be81c
diff --git a/metadata/md5-cache/app-xemacs/lookup-1.17 b/metadata/md5-cache/app-xemacs/lookup-1.17
index d4d7eb72b283..3380fb8fb62b 100644
--- a/metadata/md5-cache/app-xemacs/lookup-1.17
+++ b/metadata/md5-cache/app-xemacs/lookup-1.17
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=MULE: Dictionary support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mule-base app-xemacs/cookie app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/lookup-1.17-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f9c965f448c9875e5f12928c375d9f3e
+_md5_=e1669ef78ee71e9e6413e5af0354cde9
diff --git a/metadata/md5-cache/app-xemacs/mail-lib-1.84 b/metadata/md5-cache/app-xemacs/mail-lib-1.84
index c187ad85aa8a..373e541a4143 100644
--- a/metadata/md5-cache/app-xemacs/mail-lib-1.84
+++ b/metadata/md5-cache/app-xemacs/mail-lib-1.84
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Fundamental lisp files for providing email support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-eterm app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/sh-script app-xemacs/ecrypto app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mail-lib-1.84-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=95fb4f385332a89a4a04de19d30ff10f
+_md5_=82a6cc810c6d7d9cbdc2d2e9d8744e07
diff --git a/metadata/md5-cache/app-xemacs/mailcrypt-2.16 b/metadata/md5-cache/app-xemacs/mailcrypt-2.16
index 4adfbc8c3305..098509a07def 100644
--- a/metadata/md5-cache/app-xemacs/mailcrypt-2.16
+++ b/metadata/md5-cache/app-xemacs/mailcrypt-2.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Support for messaging encryption with PGP
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/cookie app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/vm app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mailcrypt-2.16-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2936d5dc2e037ad075ee43893e10e31b
+_md5_=a72aab4bbe8939e41c5e3d1d77d893e1
diff --git a/metadata/md5-cache/app-xemacs/mew-1.22 b/metadata/md5-cache/app-xemacs/mew-1.22
index 5490f96a68ff..ca3cf630abab 100644
--- a/metadata/md5-cache/app-xemacs/mew-1.22
+++ b/metadata/md5-cache/app-xemacs/mew-1.22
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Messaging in an Emacs World
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/w3 app-xemacs/efs app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/fsf-compat app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mew-1.22-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=3ee6ffb06cd08d487af1d4d2ae824edd
+_md5_=68a2a30b7a9cbc98eaf8f87548bdf630
diff --git a/metadata/md5-cache/app-xemacs/mh-e-1.35 b/metadata/md5-cache/app-xemacs/mh-e-1.35
index 1b7045d34ae1..65ca7f529a4e 100644
--- a/metadata/md5-cache/app-xemacs/mh-e-1.35
+++ b/metadata/md5-cache/app-xemacs/mh-e-1.35
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Front end support for MH
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/gnus app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/xemacs-devel app-xemacs/net-utils app-xemacs/xemacs-eterm app-xemacs/os-utils app-xemacs/ecrypto app-xemacs/cedet-common app-xemacs/speedbar app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mh-e-1.35-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=982b647cb76e327c45386c30ecdcb404
+_md5_=68904b708d7dc31878d2a4e7334ec074
diff --git a/metadata/md5-cache/app-xemacs/mine-1.18 b/metadata/md5-cache/app-xemacs/mine-1.18
index 112286f0f7f3..9413daa39380 100644
--- a/metadata/md5-cache/app-xemacs/mine-1.18
+++ b/metadata/md5-cache/app-xemacs/mine-1.18
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Minehunt Game
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/mine-1.18-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=44f335d4b17b8a84012f2e39ae20b07a
+_md5_=135c09dfc14e061df0f8890c3d7c0dac
diff --git a/metadata/md5-cache/app-xemacs/misc-games-1.25 b/metadata/md5-cache/app-xemacs/misc-games-1.25
index e5dd62fbafbd..beddd8df1bbc 100644
--- a/metadata/md5-cache/app-xemacs/misc-games-1.25
+++ b/metadata/md5-cache/app-xemacs/misc-games-1.25
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Other amusements and diversions
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/misc-games-1.25-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=7afacdccf3fda88e8ccd410d07550aca
+_md5_=1b200992b53772ddefe10ef61469038e
diff --git a/metadata/md5-cache/app-xemacs/mmm-mode-1.08 b/metadata/md5-cache/app-xemacs/mmm-mode-1.08
index e79d44fb24ea..3cbb5c8bd74a 100644
--- a/metadata/md5-cache/app-xemacs/mmm-mode-1.08
+++ b/metadata/md5-cache/app-xemacs/mmm-mode-1.08
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Multiple major modes in a single buffer
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/mmm-mode-1.08-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ea4aa85c04f4baafadef39cef7e922e4
+_md5_=d00f4e02dffd05b79d2bf79eb797abd6
diff --git a/metadata/md5-cache/app-xemacs/mule-base-1.60 b/metadata/md5-cache/app-xemacs/mule-base-1.60
index fa51a5df3da0..43c8ea65a1eb 100644
--- a/metadata/md5-cache/app-xemacs/mule-base-1.60
+++ b/metadata/md5-cache/app-xemacs/mule-base-1.60
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=MULE: Basic Mule support, required for building with Mule
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/apel app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mule-base-1.60-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=8a58554e1c7b206a18ec0b727aa8af85
+_md5_=ee1a9c1e17433b2ed0b7b170cfe1c917
diff --git a/metadata/md5-cache/app-xemacs/mule-ucs-1.21 b/metadata/md5-cache/app-xemacs/mule-ucs-1.21
index 82d3fa99c194..e8ec97ae1976 100644
--- a/metadata/md5-cache/app-xemacs/mule-ucs-1.21
+++ b/metadata/md5-cache/app-xemacs/mule-ucs-1.21
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=MULE: Extended coding systems (including Unicode) for XEmacs
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mule-base app-xemacs/latin-euro-standards app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mule-ucs-1.21-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1ddce77a1a9c7a0d573859bc5151713d
+_md5_=bab98fc3799b671db0ec4cfabc451a6e
diff --git a/metadata/md5-cache/app-xemacs/net-utils-1.61 b/metadata/md5-cache/app-xemacs/net-utils-1.61
index f28b5c86845f..149f1d84137a 100644
--- a/metadata/md5-cache/app-xemacs/net-utils-1.61
+++ b/metadata/md5-cache/app-xemacs/net-utils-1.61
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Miscellaneous Networking Utilities
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mail-lib app-xemacs/gnus app-xemacs/bbdb app-xemacs/xemacs-base app-xemacs/efs app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/net-utils-1.61-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=91396cbe5a0620b0d95461e13604c335
+_md5_=227d9c02c261340c1e6da76352c1763c
diff --git a/metadata/md5-cache/app-xemacs/ocaml-0.10 b/metadata/md5-cache/app-xemacs/ocaml-0.10
index 0458171ab148..e421f0b0c14e 100644
--- a/metadata/md5-cache/app-xemacs/ocaml-0.10
+++ b/metadata/md5-cache/app-xemacs/ocaml-0.10
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Objective Caml editing support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 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/ocaml-0.10-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=520a9c0d7deba37c05f052b66add9847
+_md5_=41de7e17a217bba18a599a2ba3c7c936
diff --git a/metadata/md5-cache/app-xemacs/oo-browser-1.07 b/metadata/md5-cache/app-xemacs/oo-browser-1.07
index 5fe1b45c6b28..8284511216f7 100644
--- a/metadata/md5-cache/app-xemacs/oo-browser-1.07
+++ b/metadata/md5-cache/app-xemacs/oo-browser-1.07
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=The Multi-Language Object-Oriented Code Browser
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/hyperbole app-xemacs/gnus app-xemacs/sh-script app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/oo-browser-1.07-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=486a67fbbbe58214e48065190322d355
+_md5_=747cc269e00e3b3f8ecc2fa6f25fd78c
diff --git a/metadata/md5-cache/app-xemacs/os-utils-1.44 b/metadata/md5-cache/app-xemacs/os-utils-1.44
index 885ce23d1235..a67857a0cbaf 100644
--- a/metadata/md5-cache/app-xemacs/os-utils-1.44
+++ b/metadata/md5-cache/app-xemacs/os-utils-1.44
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Miscellaneous O/S utilities
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/os-utils-1.44-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e7676f63d80def98fead6446c49f3f53
+_md5_=77af27bc6c4bd4bd36365e92fae2b58d
diff --git a/metadata/md5-cache/app-xemacs/pc-1.30 b/metadata/md5-cache/app-xemacs/pc-1.30
index 1137045fab02..4d6ad6ae1adf 100644
--- a/metadata/md5-cache/app-xemacs/pc-1.30
+++ b/metadata/md5-cache/app-xemacs/pc-1.30
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=PC style interface emulation
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/pc-1.30-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=bcc11ffb8b4e884ebe14c0b7c5aca1f7
+_md5_=9fb03342eb84e9a59b0828e02e716ab1
diff --git a/metadata/md5-cache/app-xemacs/pcl-cvs-1.73 b/metadata/md5-cache/app-xemacs/pcl-cvs-1.73
index 4cbfc7c39e06..989a90e02075 100644
--- a/metadata/md5-cache/app-xemacs/pcl-cvs-1.73
+++ b/metadata/md5-cache/app-xemacs/pcl-cvs-1.73
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=CVS frontend
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/elib app-xemacs/vc app-xemacs/dired app-xemacs/edebug app-xemacs/ediff app-xemacs/edit-utils app-xemacs/mail-lib app-xemacs/prog-modes app-xemacs/tramp app-xemacs/gnus app-xemacs/sh-script app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/pcl-cvs-1.73-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=8c257838e5fc8410ea6bafc732717ed3
+_md5_=8a644eff093dbbaaec8ad0a70d513aa9
diff --git a/metadata/md5-cache/app-xemacs/pcomplete-1.08 b/metadata/md5-cache/app-xemacs/pcomplete-1.08
index 8e5c2146aa0e..d6642831b679 100644
--- a/metadata/md5-cache/app-xemacs/pcomplete-1.08
+++ b/metadata/md5-cache/app-xemacs/pcomplete-1.08
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Provides programmatic completion
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/sh-script app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/pcomplete-1.08-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=7425ab0ce4a93100f1d8271298122494
+_md5_=e440628a1b42487d641e94112888687b
diff --git a/metadata/md5-cache/app-xemacs/perl-modes-1.16 b/metadata/md5-cache/app-xemacs/perl-modes-1.16
index 3315b9a1e7cc..ae6ab00db8e2 100644
--- a/metadata/md5-cache/app-xemacs/perl-modes-1.16
+++ b/metadata/md5-cache/app-xemacs/perl-modes-1.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Perl support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-ispell app-xemacs/ps-print app-xemacs/edit-utils app-xemacs/fsf-compat app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/perl-modes-1.16-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1d2cf7d259fa58dd70c0a7430abaaddb
+_md5_=8735f451f3657f7a2628e147407c4bcc
diff --git a/metadata/md5-cache/app-xemacs/pgg-1.10 b/metadata/md5-cache/app-xemacs/pgg-1.10
index f2f01f62a356..3522305e840c 100644
--- a/metadata/md5-cache/app-xemacs/pgg-1.10
+++ b/metadata/md5-cache/app-xemacs/pgg-1.10
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Emacs interface to various PGP implementations
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/edebug app-xemacs/ecrypto app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/pgg-1.10-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=9ff0cda13caa5a60b241851512fa3f7e
+_md5_=0eb683a3e6c06df1b9beffdd5a3a713c
diff --git a/metadata/md5-cache/app-xemacs/prog-modes-2.33 b/metadata/md5-cache/app-xemacs/prog-modes-2.33
index aae6e5c60733..444701dcc5f5 100644
--- a/metadata/md5-cache/app-xemacs/prog-modes-2.33
+++ b/metadata/md5-cache/app-xemacs/prog-modes-2.33
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Support for various programming languages
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-devel app-xemacs/xemacs-base app-xemacs/cc-mode app-xemacs/fsf-compat app-xemacs/edit-utils app-xemacs/ediff app-xemacs/emerge app-xemacs/efs app-xemacs/vc app-xemacs/speedbar app-xemacs/dired app-xemacs/ilisp app-xemacs/sh-script app-xemacs/cedet-common app-xemacs/w3 app-xemacs/gnus app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/prog-modes-2.33-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=83e23d9680a0c85a78c0d4cfa704b809
+_md5_=9f67a42efdb27e5c607797c666175114
diff --git a/metadata/md5-cache/app-xemacs/ps-print-1.14 b/metadata/md5-cache/app-xemacs/ps-print-1.14
index 0983c13799c5..f2a904b616dd 100644
--- a/metadata/md5-cache/app-xemacs/ps-print-1.14
+++ b/metadata/md5-cache/app-xemacs/ps-print-1.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Printing functions and utilities
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/text-modes app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ps-print-1.14-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ab8efbcacd016b0bcc75dca9246cfff1
+_md5_=957118d658fe5d51eaf7570334c9e264
diff --git a/metadata/md5-cache/app-xemacs/psgml-1.50 b/metadata/md5-cache/app-xemacs/psgml-1.50
index f90dc619ec82..9e000054561a 100644
--- a/metadata/md5-cache/app-xemacs/psgml-1.50
+++ b/metadata/md5-cache/app-xemacs/psgml-1.50
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Validated HTML/SGML editing
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/edit-utils app-xemacs/edebug app-xemacs/xemacs-devel app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/ps-print app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/psgml-1.50-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c2a6bfdd1c1c2094a29a9ddeacf3bdb9
+_md5_=030158534023c8ad6c34408f3d48b236
diff --git a/metadata/md5-cache/app-xemacs/psgml-dtds-1.05 b/metadata/md5-cache/app-xemacs/psgml-dtds-1.05
index 6ecdb50702b6..30391d5662a4 100644
--- a/metadata/md5-cache/app-xemacs/psgml-dtds-1.05
+++ b/metadata/md5-cache/app-xemacs/psgml-dtds-1.05
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Deprecated collection of DTDs for psgml
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/psgml app-xemacs/edit-utils app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/psgml-dtds-1.05-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=dd4cf4d42af2e0d7ecfa86a80aad7584
+_md5_=268b733b067b64062f3eae9b2fb40c85
diff --git a/metadata/md5-cache/app-xemacs/python-modes-1.16 b/metadata/md5-cache/app-xemacs/python-modes-1.16
index 0f55968a6de5..6ccc4324e289 100644
--- a/metadata/md5-cache/app-xemacs/python-modes-1.16
+++ b/metadata/md5-cache/app-xemacs/python-modes-1.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Python support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/edit-utils app-xemacs/fsf-compat app-xemacs/text-modes app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/python-modes-1.16-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ba1563691de6448e4339c5696840a9a5
+_md5_=f5f9a70368b0125e2275f8ea27b10002
diff --git a/metadata/md5-cache/app-xemacs/re-builder-1.07 b/metadata/md5-cache/app-xemacs/re-builder-1.07
index c9e2b4a5c8cb..05f1e793521f 100644
--- a/metadata/md5-cache/app-xemacs/re-builder-1.07
+++ b/metadata/md5-cache/app-xemacs/re-builder-1.07
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Interactive development tool for regular expressions
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/re-builder-1.07-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=8c2d1342b5a26a17cb56dea4e8022a09
+_md5_=e0a0217f9438e36f7412c67dc46a257f
diff --git a/metadata/md5-cache/app-xemacs/reftex-1.36 b/metadata/md5-cache/app-xemacs/reftex-1.36
index cb37be38b7b0..1d7cbb464202 100644
--- a/metadata/md5-cache/app-xemacs/reftex-1.36
+++ b/metadata/md5-cache/app-xemacs/reftex-1.36
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Emacs support for LaTeX cross-references, citations..
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/reftex-1.36-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=46c360692db269a78be701ef9e44f5c9
+_md5_=8743cd4bef15d31e7276dbc691d364e3
diff --git a/metadata/md5-cache/app-xemacs/riece-1.26 b/metadata/md5-cache/app-xemacs/riece-1.26
index 20f5931dd9a9..a2597734eefe 100644
--- a/metadata/md5-cache/app-xemacs/riece-1.26
+++ b/metadata/md5-cache/app-xemacs/riece-1.26
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=IRC client for Emacs
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/bbdb app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/riece-1.26-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=db9598b53ed2102189bcbdeb47b77a35
+_md5_=63239c33a4b83f749c0251e0935ad953
diff --git a/metadata/md5-cache/app-xemacs/rmail-1.16 b/metadata/md5-cache/app-xemacs/rmail-1.16
index aaf9411c9272..9cb36ff73319 100644
--- a/metadata/md5-cache/app-xemacs/rmail-1.16
+++ b/metadata/md5-cache/app-xemacs/rmail-1.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=An obsolete Emacs mailer
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/tm app-xemacs/apel app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/rmail-1.16-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2b6a6938a6c5084fc2db28c149e6ed00
+_md5_=0dd3df88422b93a371ce6f54506587c3
diff --git a/metadata/md5-cache/app-xemacs/ruby-modes-1.07 b/metadata/md5-cache/app-xemacs/ruby-modes-1.07
index 3d8be5c93dbd..52c2a69d4b59 100644
--- a/metadata/md5-cache/app-xemacs/ruby-modes-1.07
+++ b/metadata/md5-cache/app-xemacs/ruby-modes-1.07
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Ruby support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/debug app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ruby-modes-1.07-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=6fccff8d98e7e441a4ea12af78221f90
+_md5_=c7767095f8a16415367dbfb312cb49ba
diff --git a/metadata/md5-cache/app-xemacs/sasl-1.18 b/metadata/md5-cache/app-xemacs/sasl-1.18
index 27c91ef52324..a7d8839a8873 100644
--- a/metadata/md5-cache/app-xemacs/sasl-1.18
+++ b/metadata/md5-cache/app-xemacs/sasl-1.18
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Simple Authentication and Security Layer (SASL) library
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/ecrypto app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sasl-1.18-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=62cbb3d2c0f92c90ab0393f76ee629f9
+_md5_=ae9d6c2a83b681b5ad0faf8982744a72
diff --git a/metadata/md5-cache/app-xemacs/scheme-1.22 b/metadata/md5-cache/app-xemacs/scheme-1.22
index 6d7c6e1c577b..bfeffd71f5c6 100644
--- a/metadata/md5-cache/app-xemacs/scheme-1.22
+++ b/metadata/md5-cache/app-xemacs/scheme-1.22
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Front-end support for Inferior Scheme
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/scheme-1.22-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=15502c225d92bbc2bcc223269676e18a
+_md5_=f47eb756a1664191938d7f69a0db6525
diff --git a/metadata/md5-cache/app-xemacs/semantic-1.23 b/metadata/md5-cache/app-xemacs/semantic-1.23
index 5ab934ef6b31..d08553a48383 100644
--- a/metadata/md5-cache/app-xemacs/semantic-1.23
+++ b/metadata/md5-cache/app-xemacs/semantic-1.23
@@ -2,10 +2,10 @@ 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
+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
+_md5_=c9376cd12e0e5493ec779e3922f19b2b
diff --git a/metadata/md5-cache/app-xemacs/sgml-1.13 b/metadata/md5-cache/app-xemacs/sgml-1.13
index 965f4366ae54..92a10bdfb98e 100644
--- a/metadata/md5-cache/app-xemacs/sgml-1.13
+++ b/metadata/md5-cache/app-xemacs/sgml-1.13
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=SGML/Linuxdoc-SGML editing
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/sgml-1.13-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=cfc0ae4b9072e4f7655412570fa6e6fe
+_md5_=4f03c4ba76f3476bb489bfaf48cfe1c5
diff --git a/metadata/md5-cache/app-xemacs/sh-script-1.26 b/metadata/md5-cache/app-xemacs/sh-script-1.26
index 15e8b8dedf20..2041fc26005b 100644
--- a/metadata/md5-cache/app-xemacs/sh-script-1.26
+++ b/metadata/md5-cache/app-xemacs/sh-script-1.26
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Support for editing shell scripts
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~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/sh-script-1.26-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=39a0ea035795c0de55b1e1d3f14d797a
+_md5_=53defa493551f0399f8dfd74ea7c1319
diff --git a/metadata/md5-cache/app-xemacs/sieve-1.20 b/metadata/md5-cache/app-xemacs/sieve-1.20
index fea70e492075..e071eca982e5 100644
--- a/metadata/md5-cache/app-xemacs/sieve-1.20
+++ b/metadata/md5-cache/app-xemacs/sieve-1.20
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Manage Sieve email filtering scripts
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/cc-mode app-xemacs/sasl app-xemacs/ecrypto app-xemacs/sh-script app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sieve-1.20-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=569f1786f1938e4517447b35fe0af648
+_md5_=8a556ed54e53c1b787216038d522ec61
diff --git a/metadata/md5-cache/app-xemacs/skk-1.27 b/metadata/md5-cache/app-xemacs/skk-1.27
index 0bd0250f4c6d..e4c621d073c8 100644
--- a/metadata/md5-cache/app-xemacs/skk-1.27
+++ b/metadata/md5-cache/app-xemacs/skk-1.27
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=MULE: Japanese Language Input Method
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/viper app-xemacs/mule-base app-xemacs/elib app-xemacs/xemacs-base app-xemacs/apel app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/skk-1.27-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4c1dfe6438282815b1061cdcf98640b5
+_md5_=a1b5d4108ac5e321e7c3a0d499c16e66
diff --git a/metadata/md5-cache/app-xemacs/slider-1.18 b/metadata/md5-cache/app-xemacs/slider-1.18
index 284c5523cba0..76c5d311e644 100644
--- a/metadata/md5-cache/app-xemacs/slider-1.18
+++ b/metadata/md5-cache/app-xemacs/slider-1.18
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=User interface tool
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/slider-1.18-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=7880628014a7efc84e6d5533883e619f
+_md5_=ffd875e402c85fcbf1325b5afbc9836d
diff --git a/metadata/md5-cache/app-xemacs/sml-mode-0.14 b/metadata/md5-cache/app-xemacs/sml-mode-0.14
index e4d2ec09ea60..e1ef63e8f0a8 100644
--- a/metadata/md5-cache/app-xemacs/sml-mode-0.14
+++ b/metadata/md5-cache/app-xemacs/sml-mode-0.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=SML editing support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/fsf-compat app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sml-mode-0.14-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1a295099f18f30c4dd10a51f226f83df
+_md5_=8a1632af07b1d22b4956210b60fa2d4b
diff --git a/metadata/md5-cache/app-xemacs/sounds-au-1.14 b/metadata/md5-cache/app-xemacs/sounds-au-1.14
index 3e8349773eb4..ccb57ee45eb1 100644
--- a/metadata/md5-cache/app-xemacs/sounds-au-1.14
+++ b/metadata/md5-cache/app-xemacs/sounds-au-1.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=XEmacs Sun sound files
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/sounds-au-1.14-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=3589b6ba553347f4fd37edb09dfbb8b2
+_md5_=7f09793fc1b2ac8ecd6683177c7f6f5d
diff --git a/metadata/md5-cache/app-xemacs/sounds-wav-1.14 b/metadata/md5-cache/app-xemacs/sounds-wav-1.14
index 00ad4d8b9b73..38a8d9f5fa11 100644
--- a/metadata/md5-cache/app-xemacs/sounds-wav-1.14
+++ b/metadata/md5-cache/app-xemacs/sounds-wav-1.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=XEmacs Microsoft sound files
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/sounds-wav-1.14-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=af416eeba87755466c7f8414bc5b8e5d
+_md5_=c3e266dc4e130a28e04bf8a1bdddfe15
diff --git a/metadata/md5-cache/app-xemacs/speedbar-1.32 b/metadata/md5-cache/app-xemacs/speedbar-1.32
index 183bee0802e3..48042cd87527 100644
--- a/metadata/md5-cache/app-xemacs/speedbar-1.32
+++ b/metadata/md5-cache/app-xemacs/speedbar-1.32
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Provides a separate frame with convenient references
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/cedet-common app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/speedbar-1.32-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=3c7c00fbeef30cf60c30845a3b84939d
+_md5_=f3b8c6a94d23a3a39809a3ba58276914
diff --git a/metadata/md5-cache/app-xemacs/strokes-1.12 b/metadata/md5-cache/app-xemacs/strokes-1.12
index b28ea2dd676d..9c13261989e4 100644
--- a/metadata/md5-cache/app-xemacs/strokes-1.12
+++ b/metadata/md5-cache/app-xemacs/strokes-1.12
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Mouse enhancement utility
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/text-modes app-xemacs/edit-utils app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/strokes-1.12-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=0ae47853777654ee1b95fae68b077a0e
+_md5_=90a62ffcfdd70710cf37f3386323f00f
diff --git a/metadata/md5-cache/app-xemacs/sun-1.19 b/metadata/md5-cache/app-xemacs/sun-1.19
index c1e4e0616233..81069e218618 100644
--- a/metadata/md5-cache/app-xemacs/sun-1.19
+++ b/metadata/md5-cache/app-xemacs/sun-1.19
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Support for Sparcworks..
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/Sun-1.19-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e236534beda427b904c1d45e555401a8
+_md5_=227a80ce80fed55e8562e96578b731ca
diff --git a/metadata/md5-cache/app-xemacs/supercite-1.23 b/metadata/md5-cache/app-xemacs/supercite-1.23
index 5c88e7bae6bc..18f507a0feff 100644
--- a/metadata/md5-cache/app-xemacs/supercite-1.23
+++ b/metadata/md5-cache/app-xemacs/supercite-1.23
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=An Emacs citation tool for News & Mail messages
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/supercite-1.23-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4c6ee38d6ce02481e4b6336db8dc3b92
+_md5_=ee5324892ccc0be91ef2a6fc12121170
diff --git a/metadata/md5-cache/app-xemacs/texinfo-1.32 b/metadata/md5-cache/app-xemacs/texinfo-1.32
index 2e322240ecaa..246ab425cb9e 100644
--- a/metadata/md5-cache/app-xemacs/texinfo-1.32
+++ b/metadata/md5-cache/app-xemacs/texinfo-1.32
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=XEmacs TeXinfo support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/text-modes app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/texinfo-1.32-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4c34d8a0cc31d6911d5acbf2f83f3320
+_md5_=c1a86f0d19624b439965d840b6b72bd6
diff --git a/metadata/md5-cache/app-xemacs/text-modes-2.06 b/metadata/md5-cache/app-xemacs/text-modes-2.06
index e8c8abe7ed63..6ddcf1b88e21 100644
--- a/metadata/md5-cache/app-xemacs/text-modes-2.06
+++ b/metadata/md5-cache/app-xemacs/text-modes-2.06
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Miscellaneous support for editing text files
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-ispell app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/text-modes-2.06-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e9932bea3f9df98bb19c114e6fdfe05b
+_md5_=6252e1b0b5ae1bb21589a852b9120a46
diff --git a/metadata/md5-cache/app-xemacs/textools-1.17 b/metadata/md5-cache/app-xemacs/textools-1.17
index e391c671d997..bebbbcf24e6a 100644
--- a/metadata/md5-cache/app-xemacs/textools-1.17
+++ b/metadata/md5-cache/app-xemacs/textools-1.17
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Miscellaneous TeX support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/textools-1.17-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ed9fa929f6e6ad00076072ad80051ad8
+_md5_=daf6d028300843d291a6b7492e737207
diff --git a/metadata/md5-cache/app-xemacs/time-1.17 b/metadata/md5-cache/app-xemacs/time-1.17
index b99be9aeb110..7278fdb7eb37 100644
--- a/metadata/md5-cache/app-xemacs/time-1.17
+++ b/metadata/md5-cache/app-xemacs/time-1.17
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Display time & date on the modeline
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/time-1.17-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a02edd6d0a4fbc7ebcbac135141ca9c7
+_md5_=a41145a4f327e820b486033456a79e82
diff --git a/metadata/md5-cache/app-xemacs/tm-1.42 b/metadata/md5-cache/app-xemacs/tm-1.42
index 74186317dc49..0b3cd7c99e70 100644
--- a/metadata/md5-cache/app-xemacs/tm-1.42
+++ b/metadata/md5-cache/app-xemacs/tm-1.42
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Emacs MIME support. Not needed for gnus >= 5.8.0
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/vm app-xemacs/mailcrypt app-xemacs/mail-lib app-xemacs/apel app-xemacs/xemacs-base app-xemacs/fsf-compat 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/tm-1.42-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e8abda6b0a1fb0e43e119194b769088c
+_md5_=aa10b1dd193cf9e0622fa62c85e98e92
diff --git a/metadata/md5-cache/app-xemacs/tooltalk-1.17 b/metadata/md5-cache/app-xemacs/tooltalk-1.17
index 3e56b8b2465b..c2f3d2d889d2 100644
--- a/metadata/md5-cache/app-xemacs/tooltalk-1.17
+++ b/metadata/md5-cache/app-xemacs/tooltalk-1.17
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Support for building with Tooltalk
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/tooltalk-1.17-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=40ee37af5900e770a665de3489b912af
+_md5_=1a4d5df94fa9c4e2f529a518ec197871
diff --git a/metadata/md5-cache/app-xemacs/tpu-1.16 b/metadata/md5-cache/app-xemacs/tpu-1.16
index 56e51b8a7e68..cd41abe1707e 100644
--- a/metadata/md5-cache/app-xemacs/tpu-1.16
+++ b/metadata/md5-cache/app-xemacs/tpu-1.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=DEC EDIT/TPU support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/tpu-1.16-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=076e323b2fabbbb48227bd569093d10c
+_md5_=df3e560eb5ba3d0be862346349175ae8
diff --git a/metadata/md5-cache/app-xemacs/tramp-1.57 b/metadata/md5-cache/app-xemacs/tramp-1.57
index 05beca995c35..61e343ea2a92 100644
--- a/metadata/md5-cache/app-xemacs/tramp-1.57
+++ b/metadata/md5-cache/app-xemacs/tramp-1.57
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Remote shell-based file editing
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/vc app-xemacs/efs app-xemacs/dired app-xemacs/mail-lib app-xemacs/gnus app-xemacs/ediff app-xemacs/sh-script app-xemacs/edebug app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/tramp-1.57-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=3817f2282274c4e2b7f6f5fd5f0d72e4
+_md5_=38ccda43d78e5aa626a70edaf8050dc6
diff --git a/metadata/md5-cache/app-xemacs/vc-1.50 b/metadata/md5-cache/app-xemacs/vc-1.50
index f626d6b727e3..ad5668f4559c 100644
--- a/metadata/md5-cache/app-xemacs/vc-1.50
+++ b/metadata/md5-cache/app-xemacs/vc-1.50
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Version Control for Free systems
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/ediff app-xemacs/sh-script app-xemacs/pcl-cvs app-xemacs/tramp app-xemacs/prog-modes app-xemacs/elib app-xemacs/edebug app-xemacs/gnus app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/vc-1.50-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=324bcfda9ad057c13aa295cfd38d71fa
+_md5_=3c9f7ce29e49fcfe24097c9d7d743b64
diff --git a/metadata/md5-cache/app-xemacs/vc-cc-1.24 b/metadata/md5-cache/app-xemacs/vc-cc-1.24
index 8fec0a103c3e..4bc1962a13ca 100644
--- a/metadata/md5-cache/app-xemacs/vc-cc-1.24
+++ b/metadata/md5-cache/app-xemacs/vc-cc-1.24
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Version Control for ClearCase (UnFree) systems
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/vc-cc-1.24-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=7778a36367acede6d8592845986b01ae
+_md5_=2e5e59c49e2b89058654fa7f3f7c40c2
diff --git a/metadata/md5-cache/app-xemacs/vhdl-1.24 b/metadata/md5-cache/app-xemacs/vhdl-1.24
index b75a81f31acd..72c97c673211 100644
--- a/metadata/md5-cache/app-xemacs/vhdl-1.24
+++ b/metadata/md5-cache/app-xemacs/vhdl-1.24
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Support for VHDL
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/edit-utils app-xemacs/c-support app-xemacs/speedbar app-xemacs/ps-print app-xemacs/os-utils app-xemacs/cedet-common app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/vhdl-1.24-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=69606e6ee8c987f75012efb2e526dcf7
+_md5_=bdc3877b29171adf275801e1dab9f094
diff --git a/metadata/md5-cache/app-xemacs/view-process-1.15 b/metadata/md5-cache/app-xemacs/view-process-1.15
index 973cd046d65d..39cce03ff08b 100644
--- a/metadata/md5-cache/app-xemacs/view-process-1.15
+++ b/metadata/md5-cache/app-xemacs/view-process-1.15
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A Unix process browsing tool
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/view-process-1.15-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=146311b73814d2607e5cd970df41675d
+_md5_=8e4a772cd86f895b1305206a20593c42
diff --git a/metadata/md5-cache/app-xemacs/viper-1.69 b/metadata/md5-cache/app-xemacs/viper-1.69
index 6f37cb788a72..e4169cb96a05 100644
--- a/metadata/md5-cache/app-xemacs/viper-1.69
+++ b/metadata/md5-cache/app-xemacs/viper-1.69
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=VI emulation support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/viper-1.69-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=6a54e8539f9cfde8b19b5b408d387c82
+_md5_=aacf2c682a140e0591d47601a7c7eea3
diff --git a/metadata/md5-cache/app-xemacs/vm-8.11 b/metadata/md5-cache/app-xemacs/vm-8.11
index bb5097d45e3f..ef4e97cae053 100644
--- a/metadata/md5-cache/app-xemacs/vm-8.11
+++ b/metadata/md5-cache/app-xemacs/vm-8.11
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=An Emacs mailer
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/gnus app-xemacs/pgg app-xemacs/ecrypto app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ps-print app-xemacs/os-utils app-xemacs/bbdb app-xemacs/fsf-compat app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/vm-8.11-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=11cf1f5ceea8c514ee04734cd6ede1bc
+_md5_=f2376cc766b77ffd3d0f543196e590bc
diff --git a/metadata/md5-cache/app-xemacs/w3-1.41 b/metadata/md5-cache/app-xemacs/w3-1.41
index 1fb95d91d27d..6c89504ee2fb 100644
--- a/metadata/md5-cache/app-xemacs/w3-1.41
+++ b/metadata/md5-cache/app-xemacs/w3-1.41
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A Web browser
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/ecrypto app-xemacs/gnus app-xemacs/net-utils app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/w3-1.41-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=bdb03053ee4b941752c2b808a4b69fcf
+_md5_=fe7a251c5c01e575392aacd3eb82561c
diff --git a/metadata/md5-cache/app-xemacs/x-symbol-1.16 b/metadata/md5-cache/app-xemacs/x-symbol-1.16
index 612052bb736e..ac3926a25896 100644
--- a/metadata/md5-cache/app-xemacs/x-symbol-1.16
+++ b/metadata/md5-cache/app-xemacs/x-symbol-1.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/auctex app-xemacs/mail-lib app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/x-symbol-1.16-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e2d5bf009ecd0cc0a478de793826c07a
+_md5_=7272aaeb28e00c758bcf5ab56ea944db
diff --git a/metadata/md5-cache/app-xemacs/xemacs-base-2.46 b/metadata/md5-cache/app-xemacs/xemacs-base-2.46
index 2a97405322de..bd1479485d8a 100644
--- a/metadata/md5-cache/app-xemacs/xemacs-base-2.46
+++ b/metadata/md5-cache/app-xemacs/xemacs-base-2.46
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Fundamental XEmacs support, you almost certainly need this
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2+
 RDEPEND=app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xemacs-base-2.46-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=436364ac6785cbaf83cd603c6550b11a
+_md5_=b38e0b58a9bde8c2adaa0d4114550570
diff --git a/metadata/md5-cache/app-xemacs/xemacs-devel-1.84 b/metadata/md5-cache/app-xemacs/xemacs-devel-1.84
index c9f23bbf9ee5..0cf569523023 100644
--- a/metadata/md5-cache/app-xemacs/xemacs-devel-1.84
+++ b/metadata/md5-cache/app-xemacs/xemacs-devel-1.84
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Emacs Lisp developer support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-ispell app-xemacs/mail-lib app-xemacs/gnus app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/sh-script app-xemacs/net-utils app-xemacs/xemacs-eterm app-xemacs/ecrypto app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xemacs-devel-1.84-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b434bae5dc149f41abc80500c71bed2c
+_md5_=30af398cf40ac12da984f2a78893bbf4
diff --git a/metadata/md5-cache/app-xemacs/xemacs-eterm-1.20 b/metadata/md5-cache/app-xemacs/xemacs-eterm-1.20
index 682598e2cbf4..1775de0f53a7 100644
--- a/metadata/md5-cache/app-xemacs/xemacs-eterm-1.20
+++ b/metadata/md5-cache/app-xemacs/xemacs-eterm-1.20
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Terminal emulation
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/eterm-1.20-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=5e27cb8075d81807271cd933df4ebf9e
+_md5_=f5c101a729ed5c936e90a00467ec7d5c
diff --git a/metadata/md5-cache/app-xemacs/xemacs-ispell-1.37 b/metadata/md5-cache/app-xemacs/xemacs-ispell-1.37
index cd2af6fd4862..88117a33b37d 100644
--- a/metadata/md5-cache/app-xemacs/xemacs-ispell-1.37
+++ b/metadata/md5-cache/app-xemacs/xemacs-ispell-1.37
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Spell-checking with GNU ispell
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ispell-1.37-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=31ef1217fc2156699887a59e487565dc
+_md5_=fc0374a29abd5994a46f9acca815ecfd
diff --git a/metadata/md5-cache/app-xemacs/xemacs-packages-all-2018.08.11 b/metadata/md5-cache/app-xemacs/xemacs-packages-all-2018.08.11
new file mode 100644
index 000000000000..934f1afb4dda
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/xemacs-packages-all-2018.08.11
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for XEmacs elisp packages, similar to the sumo archives
+EAPI=6
+HOMEPAGE=http://www.xemacs.org/
+IUSE=mule
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=metapackage
+RDEPEND=>=app-xemacs/ada-1.16 >=app-xemacs/apel-1.36 >=app-xemacs/auctex-1.58 >=app-xemacs/bbdb-1.34 >=app-xemacs/build-1.18 >=app-xemacs/c-support-1.24 >=app-xemacs/calc-1.28 >=app-xemacs/calendar-1.42 >=app-xemacs/cc-mode-1.99 >=app-xemacs/cedet-common-1.03 >=app-xemacs/clearcase-1.12 >=app-xemacs/cogre-1.04 >=app-xemacs/cookie-1.17 >=app-xemacs/crisp-1.17 >=app-xemacs/debug-1.20 >=app-xemacs/dictionary-1.18 >=app-xemacs/dired-1.22 >=app-xemacs/docbookide-0.10 >=app-xemacs/easypg-1.05 >=app-xemacs/ecb-1.25 >=app-xemacs/ecrypto-0.23 >=app-xemacs/ede-1.07 >=app-xemacs/edebug-1.24 >=app-xemacs/ediff-1.84 >=app-xemacs/edit-utils-2.58 >=app-xemacs/edt-1.16 >=app-xemacs/efs-1.37 >=app-xemacs/eieio-1.10 >=app-xemacs/elib-1.15 >=app-xemacs/emerge-1.13 >=app-xemacs/erc-0.26 >=app-xemacs/escreen-1.03 >=app-xemacs/eshell-1.21 >=app-xemacs/eudc-1.43 >=app-xemacs/footnote-1.18 >=app-xemacs/forms-1.17 >=app-xemacs/fortran-modes-1.07 >=app-xemacs/frame-icon-1.13 >=app-xemacs/fsf-compat-1.24 >=app-xemacs/games-1.23 >=app-xemacs/general-docs-1.10 >=app-xemacs/gnats-1.19 >=app-xemacs/gnus-2.04 >=app-xemacs/haskell-mode-1.14 >=app-xemacs/hm-html-menus-1.26 >=app-xemacs/hyperbole-1.22 >=app-xemacs/ibuffer-1.12 >=app-xemacs/idlwave-1.34 >=app-xemacs/igrep-1.18 >=app-xemacs/ilisp-1.38 >=app-xemacs/jde-1.54 >=app-xemacs/mail-lib-1.84 >=app-xemacs/mailcrypt-2.16 >=app-xemacs/mew-1.22 >=app-xemacs/mh-e-1.35 >=app-xemacs/mine-1.18 >=app-xemacs/misc-games-1.25 >=app-xemacs/mmm-mode-1.08 >=app-xemacs/net-utils-1.61 >=app-xemacs/ocaml-0.10 >=app-xemacs/oo-browser-1.07 >=app-xemacs/os-utils-1.44 >=app-xemacs/pc-1.30 >=app-xemacs/pcl-cvs-1.73 >=app-xemacs/pcomplete-1.08 >=app-xemacs/perl-modes-1.16 >=app-xemacs/pgg-1.10 >=app-xemacs/prog-modes-2.33 >=app-xemacs/ps-print-1.14 >=app-xemacs/psgml-1.50 >=app-xemacs/psgml-dtds-1.05 >=app-xemacs/python-modes-1.16 >=app-xemacs/re-builder-1.07 >=app-xemacs/reftex-1.36 >=app-xemacs/riece-1.26 >=app-xemacs/rmail-1.16 >=app-xemacs/ruby-modes-1.07 >=app-xemacs/sasl-1.18 >=app-xemacs/scheme-1.22 >=app-xemacs/semantic-1.23 >=app-xemacs/sgml-1.13 >=app-xemacs/sh-script-1.26 >=app-xemacs/sieve-1.20 >=app-xemacs/slider-1.18 >=app-xemacs/sml-mode-0.14 >=app-xemacs/sounds-au-1.14 >=app-xemacs/sounds-wav-1.14 >=app-xemacs/speedbar-1.32 >=app-xemacs/strokes-1.12 >=app-xemacs/sun-1.19 >=app-xemacs/supercite-1.23 >=app-xemacs/texinfo-1.32 >=app-xemacs/text-modes-2.06 >=app-xemacs/textools-1.17 >=app-xemacs/time-1.17 >=app-xemacs/tm-1.42 >=app-xemacs/tooltalk-1.17 >=app-xemacs/tpu-1.16 >=app-xemacs/tramp-1.57 >=app-xemacs/vc-1.50 >=app-xemacs/vc-cc-1.24 >=app-xemacs/vhdl-1.24 >=app-xemacs/view-process-1.15 >=app-xemacs/viper-1.69 >=app-xemacs/vm-8.11 >=app-xemacs/w3-1.41 >=app-xemacs/x-symbol-1.16 >=app-xemacs/xemacs-base-2.46 >=app-xemacs/xemacs-devel-1.84 >=app-xemacs/xemacs-eterm-1.20 >=app-xemacs/xemacs-ispell-1.37 >=app-xemacs/xetla-1.04 >=app-xemacs/xlib-1.16 >=app-xemacs/xslide-1.11 >=app-xemacs/xslt-process-1.14 >=app-xemacs/xwem-1.26 >=app-xemacs/zenirc-1.18 mule? ( >=app-xemacs/edict-1.19 >=app-xemacs/egg-its-1.29 >=app-xemacs/latin-euro-standards-1.11 >=app-xemacs/latin-unity-1.23 >=app-xemacs/leim-1.38 >=app-xemacs/locale-1.30 >=app-xemacs/lookup-1.17 >=app-xemacs/mule-base-1.60 >=app-xemacs/mule-ucs-1.21 >=app-xemacs/skk-1.27 )
+SLOT=0
+_md5_=d804433adc945ebb36877ffb3c79db10
diff --git a/metadata/md5-cache/app-xemacs/xetla-1.04 b/metadata/md5-cache/app-xemacs/xetla-1.04
index 7049a3cab475..4e57b1d24afa 100644
--- a/metadata/md5-cache/app-xemacs/xetla-1.04
+++ b/metadata/md5-cache/app-xemacs/xetla-1.04
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Arch (tla) interface for XEmacs
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=a6d5e7677a7873e11fd919bfd8c67f2d
diff --git a/metadata/md5-cache/app-xemacs/xlib-1.16 b/metadata/md5-cache/app-xemacs/xlib-1.16
index 45e27f5c8a40..70bb80445e7e 100644
--- a/metadata/md5-cache/app-xemacs/xlib-1.16
+++ b/metadata/md5-cache/app-xemacs/xlib-1.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Emacs interface to X server
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/xlib-1.16-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4f4e64fcaf7494273fc03b8daf333b7d
+_md5_=efff0ff966db27003247403f555f6694
diff --git a/metadata/md5-cache/app-xemacs/xslide-1.11 b/metadata/md5-cache/app-xemacs/xslide-1.11
index e35cdb1d299e..d236ceaa6794 100644
--- a/metadata/md5-cache/app-xemacs/xslide-1.11
+++ b/metadata/md5-cache/app-xemacs/xslide-1.11
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=XSL editing support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-ispell app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xslide-1.11-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=6b914c611b1164aa77d33d8e9f0cbb19
+_md5_=16d638f63bad966206f23bbe1365341b
diff --git a/metadata/md5-cache/app-xemacs/xslt-process-1.14 b/metadata/md5-cache/app-xemacs/xslt-process-1.14
index 2e509d3612ba..cd7f526ad2af 100644
--- a/metadata/md5-cache/app-xemacs/xslt-process-1.14
+++ b/metadata/md5-cache/app-xemacs/xslt-process-1.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=XSLT processing support
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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
+_md5_=40dea5d307036e8c3194fa76a46db49c
diff --git a/metadata/md5-cache/app-xemacs/xwem-1.26 b/metadata/md5-cache/app-xemacs/xwem-1.26
index 91fe7e744514..9fe1869c8396 100644
--- a/metadata/md5-cache/app-xemacs/xwem-1.26
+++ b/metadata/md5-cache/app-xemacs/xwem-1.26
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=X Emacs Window Manager
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/xlib app-xemacs/strokes app-xemacs/edit-utils app-xemacs/text-modes app-xemacs/time app-xemacs/slider app-xemacs/elib app-xemacs/ilisp app-xemacs/mail-lib app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xwem-1.26-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=644903c34bff838658931f36386c7aee
+_md5_=41a727d675aad384244d9363e2183fca
diff --git a/metadata/md5-cache/app-xemacs/zenirc-1.18 b/metadata/md5-cache/app-xemacs/zenirc-1.18
index ea0c617b9896..50749bfb4598 100644
--- a/metadata/md5-cache/app-xemacs/zenirc-1.18
+++ b/metadata/md5-cache/app-xemacs/zenirc-1.18
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=ZENIRC IRC Client
 EAPI=6
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+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/zenirc-1.18-pkg.tar.gz
 _eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2306584336fa4c36b8775bcaf6032bda
+_md5_=d726e68f0015b0e812eb860374a7623f
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index ed242195c62e..5941f3597641 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/gprbuild-2018 b/metadata/md5-cache/dev-ada/gprbuild-2018
deleted file mode 100644
index 237f6a4f12ba..000000000000
--- a/metadata/md5-cache/dev-ada/gprbuild-2018
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
-DESCRIPTION=Multi-Language Management
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/
-IUSE=gnat_2016 gnat_2017 +gnat_2018
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
-REQUIRED_USE=!gnat_2016 ^^ ( gnat_2017 gnat_2018 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> gprbuild-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 -> xmlada-gpl-2018-src.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b770c4df82020da6eef65f8de0b7969e
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2018-r3 b/metadata/md5-cache/dev-ada/gprbuild-2018-r3
new file mode 100644
index 000000000000..d3ec1781bdfc
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gprbuild-2018-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
+DESCRIPTION=Multi-Language Management
+EAPI=6
+HOMEPAGE=http://libre.adacore.com/
+IUSE=gnat_2016 gnat_2017 +gnat_2018
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
+REQUIRED_USE=!gnat_2016 ^^ ( gnat_2017 gnat_2018 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> gprbuild-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 -> xmlada-gpl-2018-src.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ef50a2bef200c9e93bf9eccfd86feccd
diff --git a/metadata/md5-cache/dev-ada/libgpr-2018 b/metadata/md5-cache/dev-ada/libgpr-2018
index 3577979063b8..453c80d17031 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2018
+++ b/metadata/md5-cache/dev-ada/libgpr-2018
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-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(-)?]
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=] !net-libs/grpc >=dev-ada/gprbuild-2018[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
@@ -10,4 +10,4 @@ RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_201
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> gprbuild-gpl-2018-src.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b680752bf425627a7cf2ac8d318547c8
+_md5_=7903bd15d19de34bc1edb52704963f1a
diff --git a/metadata/md5-cache/dev-ada/xmlada-2018 b/metadata/md5-cache/dev-ada/xmlada-2018
index e9d0190415e8..af4e3a210bb2 100644
--- a/metadata/md5-cache/dev-ada/xmlada-2018
+++ b/metadata/md5-cache/dev-ada/xmlada-2018
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( gnat_2016 gnat_2017 gnat_
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 -> xmlada-gpl-2018-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=038c3470934e5336010387525364215b
+_md5_=92d9ff9a4200753cf890a9f68dc54e43
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 77a4728ac2a7..011562be0dde 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/aixlog-1.2.1 b/metadata/md5-cache/dev-cpp/aixlog-1.2.1
new file mode 100644
index 000000000000..6671a5e9a767
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/aixlog-1.2.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Header-only C++ logging library
+EAPI=6
+HOMEPAGE=https://github.com/badaix/aixlog
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/badaix/aixlog/archive/v1.2.1.tar.gz -> aixlog-1.2.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5573bf316752db2312901624452734cd
diff --git a/metadata/md5-cache/dev-cpp/aixlog-9999 b/metadata/md5-cache/dev-cpp/aixlog-9999
new file mode 100644
index 000000000000..e4420e9a18f7
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/aixlog-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Header-only C++ logging library
+EAPI=6
+HOMEPAGE=https://github.com/badaix/aixlog
+LICENSE=MIT
+SLOT=0
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5573bf316752db2312901624452734cd
diff --git a/metadata/md5-cache/dev-cpp/catch-2.3.0 b/metadata/md5-cache/dev-cpp/catch-2.3.0
index 72362202d686..220575acedcd 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.3.0
+++ b/metadata/md5-cache/dev-cpp/catch-2.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=6
 HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v2.3.0.tar.gz -> Catch2-2.3.0.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e03fb1aa438718ea08d0935e196f87cd
+_md5_=112ef17af33b649f249821f895f08cc0
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.0 b/metadata/md5-cache/dev-cpp/gflags-2.2.0
index 5c638396aac1..efcea3551859 100644
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.0
+++ b/metadata/md5-cache/dev-cpp/gflags-2.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sp
 LICENSE=BSD
 SLOT=0/2.2
 SRC_URI=https://github.com/gflags/gflags/archive/v2.2.0.tar.gz -> gflags-2.2.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a223537406dbd8b487957086e65f917b
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.1 b/metadata/md5-cache/dev-cpp/gflags-2.2.1
index e1b75a854ee7..04b938c54c60 100644
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.1
+++ b/metadata/md5-cache/dev-cpp/gflags-2.2.1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 SLOT=0/2.2
 SRC_URI=https://github.com/gflags/gflags/archive/v2.2.1.tar.gz -> gflags-2.2.1.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73cd89372f1f6349670580170790163c
diff --git a/metadata/md5-cache/dev-cpp/gflags-9999 b/metadata/md5-cache/dev-cpp/gflags-9999
index 2518ed77fb10..aa7b1bb60e35 100644
--- a/metadata/md5-cache/dev-cpp/gflags-9999
+++ b/metadata/md5-cache/dev-cpp/gflags-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://gflags.github.io/gflags/
 IUSE=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
 LICENSE=BSD
 SLOT=0/2.2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73cd89372f1f6349670580170790163c
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.0 b/metadata/md5-cache/dev-cpp/gtest-1.8.0
index 2f71a84bfc75..b75b1cfefde8 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.0
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e999c3c5eab274bd6450f9f79d4782d
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1 b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
index c53276a72d0f..29cad15029ad 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a6df9af7a1497930e9d40d54edc3c623
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.1 b/metadata/md5-cache/dev-cpp/gtest-1.8.1
index ab0260cea88e..b5d1b3302a8e 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/release-1.8.1.tar.gz -> gtest-1.8.1.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9210763b863d6c43f582001d2652d6ad
diff --git a/metadata/md5-cache/dev-cpp/gtest-9999 b/metadata/md5-cache/dev-cpp/gtest-9999
index 64baf976e01a..89d261edb17a 100644
--- a/metadata/md5-cache/dev-cpp/gtest-9999
+++ b/metadata/md5-cache/dev-cpp/gtest-9999
@@ -7,5 +7,5 @@ IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9210763b863d6c43f582001d2652d6ad
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0 b/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0
new file mode 100644
index 000000000000..cd8691f56c49
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( ~dev-cpp/catch-1.11.0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Guideline Support Library implementation by Microsoft
+EAPI=6
+HOMEPAGE=https://github.com/Microsoft/GSL
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/Microsoft/GSL/archive/v2.0.0.tar.gz -> ms-gsl-2.0.0.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=80197917cfaad5b5a4a1bdd54345cf13
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-9999 b/metadata/md5-cache/dev-cpp/ms-gsl-9999
new file mode 100644
index 000000000000..6d15e80e6a95
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( ~dev-cpp/catch-1.11.0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Guideline Support Library implementation by Microsoft
+EAPI=6
+HOMEPAGE=https://github.com/Microsoft/GSL
+IUSE=test
+LICENSE=MIT
+SLOT=0
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=56d879477d92d4db474e0c85aa90fc49
diff --git a/metadata/md5-cache/dev-cpp/popl-1.2.0 b/metadata/md5-cache/dev-cpp/popl-1.2.0
new file mode 100644
index 000000000000..950087abb771
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/popl-1.2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Header-only C++ program options parser library
+EAPI=6
+HOMEPAGE=https://github.com/badaix/popl
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/badaix/popl/archive/v1.2.0.tar.gz -> popl-1.2.0.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e99e27487bfd469c8acb483f38700305
diff --git a/metadata/md5-cache/dev-cpp/popl-9999 b/metadata/md5-cache/dev-cpp/popl-9999
new file mode 100644
index 000000000000..b59981872f02
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/popl-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Header-only C++ program options parser library
+EAPI=6
+HOMEPAGE=https://github.com/badaix/popl
+LICENSE=MIT
+SLOT=0
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e99e27487bfd469c8acb483f38700305
diff --git a/metadata/md5-cache/dev-cpp/websocketpp-0.7.0-r2 b/metadata/md5-cache/dev-cpp/websocketpp-0.7.0-r2
deleted file mode 100644
index 4d47ee01e369..000000000000
--- a/metadata/md5-cache/dev-cpp/websocketpp-0.7.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C++/Boost Asio based websocket client/server library
-EAPI=6
-HOMEPAGE=https://www.zaphoyd.com/websocketpp
-IUSE=boost examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=boost? ( dev-libs/boost )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/zaphoyd/websocketpp/archive/0.7.0.tar.gz -> websocketpp-0.7.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=62b98efe889ac781cef843257268bbef
diff --git a/metadata/md5-cache/dev-cpp/websocketpp-0.8.1 b/metadata/md5-cache/dev-cpp/websocketpp-0.8.1
index 16ebc92bd413..de1cf39625e8 100644
--- a/metadata/md5-cache/dev-cpp/websocketpp-0.8.1
+++ b/metadata/md5-cache/dev-cpp/websocketpp-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=C++/Boost Asio based websocket client/server library
 EAPI=6
 HOMEPAGE=https://www.zaphoyd.com/websocketpp
 IUSE=boost examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=boost? ( dev-libs/boost )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zaphoyd/websocketpp/archive/0.8.1.tar.gz -> websocketpp-0.8.1.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=60819754d0caf2ff3db64531e043ea8b
+_md5_=ca1ddfdda514ffba57038d9b128b2194
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2
index 654caa0858d3..2c55fd071217 100644
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0/0.6
 SRC_URI=https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.2.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c00472685ea70831bc6d85e968740d0e
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 24bc91eccdc5..260082b7e698 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/etcd-3.3.10 b/metadata/md5-cache/dev-db/etcd-3.3.10
new file mode 100644
index 000000000000..ee4fc4b0be6d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.3.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.9
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/coreos/etcd
+IUSE=doc +server
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.3.10.tar.gz -> etcd-3.3.10.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c8ae5cf90fffe1ecf79541f02bad9473
diff --git a/metadata/md5-cache/dev-db/freetds-1.00.341-r1 b/metadata/md5-cache/dev-db/freetds-1.00.341-r1
new file mode 100644
index 000000000000..b67805cb5714
--- /dev/null
+++ b/metadata/md5-cache/dev-db/freetds-1.00.341-r1
@@ -0,0 +1,14 @@
+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=7
+HOMEPAGE=http://www.freetds.org/
+IUSE=debug 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: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_=2c02db40a56075c75d76241deafdf635
diff --git a/metadata/md5-cache/dev-db/kdb-3.1.0-r1 b/metadata/md5-cache/dev-db/kdb-3.1.0-r1
index 250ece5bb2d5..e76e48b7669f 100644
--- a/metadata/md5-cache/dev-db/kdb-3.1.0-r1
+++ b/metadata/md5-cache/dev-db/kdb-3.1.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/icu:= mysql? ( virtual/mysql ) postgres? ( >=dev-qt/qtnetwork-5.9.4:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-qt/linguist-tools: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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/icu:= mysql? ( virtual/mysql ) postgres? ( >=dev-qt/qtnetwork-5.9.4:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-qt/linguist-tools: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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Database connectivity and creation framework for various vendors
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug mysql postgres sqlite debug
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/icu:= mysql? ( virtual/mysql ) postgres? ( >=dev-qt/qtnetwork-5.9.4:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/icu:= mysql? ( virtual/mysql ) postgres? ( >=dev-qt/qtnetwork-5.9.4:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a7b9627b648659c1a4fadc9fd84954e
diff --git a/metadata/md5-cache/dev-db/kdb-3.1.0-r2 b/metadata/md5-cache/dev-db/kdb-3.1.0-r2
index 32b8eb873b17..6d8397c74d82 100644
--- a/metadata/md5-cache/dev-db/kdb-3.1.0-r2
+++ b/metadata/md5-cache/dev-db/kdb-3.1.0-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/icu:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( >=dev-qt/qtnetwork-5.9.4:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-qt/linguist-tools: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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/icu:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( >=dev-qt/qtnetwork-5.9.4:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-qt/linguist-tools: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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Database connectivity and creation framework for various vendors
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug mysql postgres sqlite debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/icu:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( >=dev-qt/qtnetwork-5.9.4:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/icu:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( >=dev-qt/qtnetwork-5.9.4:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e73e351975a232bc21385a77f0a4b6a
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.17 b/metadata/md5-cache/dev-db/mariadb-10.2.17
index 7440f945edc9..22111e926331 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.17
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.17
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.17/source/mariadb-10.2.17.tar.gz mirror://gentoo/mysql-extras-20180809-1700Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180809-1700Z.tar.bz2
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=33aa39bab48ada4b9b44b298b94432e3
+_md5_=58dbc5116a528a4e43774d9a82f55f67
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.8 b/metadata/md5-cache/dev-db/mariadb-10.3.8
index d9b2596efa8a..ee57225e273a 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.8
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.8
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.8/source/mariadb-10.3.8.tar.gz mirror://gentoo/mysql-extras-20180809-1700Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180809-1700Z.tar.bz2
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cce62a51087c84e2a126039910588f9f
+_md5_=97a73a5cf227a8beb4edcc40809b50f8
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.9 b/metadata/md5-cache/dev-db/mariadb-10.3.9
index 64e525a56db0..e3a015e8d310 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.9
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.9
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.9/source/mariadb-10.3.9.tar.gz mirror://gentoo/mysql-extras-20180809-1700Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180809-1700Z.tar.bz2
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d6f55f71e7f2d58186e52ee794c30e47
+_md5_=c06164bc244ed488d59f55374069fcf3
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.3-r1 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.3-r1
deleted file mode 100644
index 3d64c2c77f43..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.3-r1
+++ /dev/null
@@ -1,13 +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(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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? ( 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(-)?] ) !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(-)?] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C client library for MariaDB/MySQL
-EAPI=6
-HOMEPAGE=https://mariadb.org/
-IUSE=+curl gnutls kerberos libressl mysqlcompat +ssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1
-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(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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? ( 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(-)?] ) !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(-)?] ) ) ) mysqlcompat? ( !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)] !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)]
-SLOT=0/3
-SRC_URI=https://downloads.mariadb.org/f/connector-c-3.0.3/mariadb-connector-c-3.0.3-src.tar.gz?serve -> mariadb-connector-c-3.0.3-src.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=690a4650d636e5382068e4933752ed65
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.4-r1 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.4-r1
deleted file mode 100644
index 0969b1effb89..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.4-r1
+++ /dev/null
@@ -1,13 +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(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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? ( 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(-)?] ) !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(-)?] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C client library for MariaDB/MySQL
-EAPI=6
-HOMEPAGE=https://mariadb.org/
-IUSE=+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1
-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(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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? ( 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(-)?] ) !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(-)?] ) ) ) mysqlcompat? ( !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)] !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)]
-SLOT=0/3
-SRC_URI=https://downloads.mariadb.org/f/connector-c-3.0.4/mariadb-connector-c-3.0.4-src.tar.gz?serve -> mariadb-connector-c-3.0.4-src.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c98e4774aa96242298ade13ef43286eb
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6
deleted file mode 100644
index 0c93bad4ea16..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6
+++ /dev/null
@@ -1,13 +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(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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? ( 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(-)?] ) !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(-)?] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C client library for MariaDB/MySQL
-EAPI=6
-HOMEPAGE=https://mariadb.org/
-IUSE=+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1
-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(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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? ( 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(-)?] ) !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(-)?] ) ) ) mysqlcompat? ( !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)] !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)]
-SLOT=0/3
-SRC_URI=https://downloads.mariadb.org/f/connector-c-3.0.6/mariadb-connector-c-3.0.6-src.tar.gz?serve -> mariadb-connector-c-3.0.6-src.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c98e4774aa96242298ade13ef43286eb
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
new file mode 100644
index 000000000000..8d43d34d28d6
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
@@ -0,0 +1,13 @@
+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(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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? ( 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(-)?] ) !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(-)?] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=C client library for MariaDB/MySQL
+EAPI=6
+HOMEPAGE=https://mariadb.org/
+IUSE=+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ~arm ~arm64 hppa ia64 ppc64 s390 sparc x86
+LICENSE=LGPL-2.1
+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(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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? ( 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(-)?] ) !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(-)?] ) ) ) mysqlcompat? ( !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)] !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)]
+SLOT=0/3
+SRC_URI=https://downloads.mariadb.org/f/connector-c-3.0.6/mariadb-connector-c-3.0.6-src.tar.gz?serve -> mariadb-connector-c-3.0.6-src.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4313786c6d911fb4baf7ac43bf15f5ef
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-9999 b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
index 0b392de658cc..cf7aa56f2bbe 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-9999
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 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(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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? ( 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(-)?] ) !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(-)?] ) ) ) mysqlcompat? ( !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)] !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)]
 SLOT=0/3
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c98e4774aa96242298ade13ef43286eb
+_md5_=02b1611e8f3dbb3bfbc6c810c871048f
diff --git a/metadata/md5-cache/dev-db/myodbc-5.2.7-r1 b/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
deleted file mode 100644
index d9f8bf4fe1fb..000000000000
--- a/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~virtual/libmysqlclient-18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=ODBC driver for MySQL
-EAPI=5
-HOMEPAGE=http://www.mysql.com/products/myodbc/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~virtual/libmysqlclient-18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=primaryuri
-SLOT=5.2
-SRC_URI=mirror://mysql/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-5.2.7-src.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ceab3ae8edb78036173da3626abf33e4
diff --git a/metadata/md5-cache/dev-db/myodbc-5.2.7-r3 b/metadata/md5-cache/dev-db/myodbc-5.2.7-r3
deleted file mode 100644
index 1d7b9c36b153..000000000000
--- a/metadata/md5-cache/dev-db/myodbc-5.2.7-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~virtual/libmysqlclient-18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-db/mysql-connector-c !>=dev-db/mariadb-10.2.0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=ODBC driver for MySQL
-EAPI=6
-HOMEPAGE=http://www.mysql.com/products/myodbc/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~virtual/libmysqlclient-18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-db/mysql-connector-c !>=dev-db/mariadb-10.2.0
-RESTRICT=primaryuri
-SLOT=5.2
-SRC_URI=mirror://mysql/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-5.2.7-src.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0065e5f49fa0b2d602d19e7f1073e17b
diff --git a/metadata/md5-cache/dev-db/myodbc-5.3.10-r2 b/metadata/md5-cache/dev-db/myodbc-5.3.10-r2
index 4841d7244314..ddbd95c33e39 100644
--- a/metadata/md5-cache/dev-db/myodbc-5.3.10-r2
+++ b/metadata/md5-cache/dev-db/myodbc-5.3.10-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~virtual/libmysqlclient-18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !>=dev-db/mariadb-10.2.0[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat(-)]
 SLOT=5.3
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-ODBC/5.3/mysql-connector-odbc-5.3.10-src.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a8c490ff61251092aea2fff5cfd5a95
diff --git a/metadata/md5-cache/dev-db/mysql++-3.2.3 b/metadata/md5-cache/dev-db/mysql++-3.2.3
index e08f10379e36..6f5415d7f0b0 100644
--- a/metadata/md5-cache/dev-db/mysql++-3.2.3
+++ b/metadata/md5-cache/dev-db/mysql++-3.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=C++ API interface to the MySQL database
 EAPI=6
 HOMEPAGE=http://tangentsoft.net/mysql++/
 IUSE=doc
-KEYWORDS=~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2
 RDEPEND=virtual/libmysqlclient:=
 SLOT=0/3
 SRC_URI=http://www.tangentsoft.net/mysqlpp/releases/mysql++-3.2.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45ae73aa3b31c3555914e62de22cb411
+_md5_=cf16b995a6617144f8a1326466401165
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.23 b/metadata/md5-cache/dev-db/mysql-5.7.23
deleted file mode 100644
index 60469b00ccd9..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.7.23
+++ /dev/null
@@ -1,16 +0,0 @@
-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	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2e61ef572f17d01560fe8db7fd37619b
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.23-r2 b/metadata/md5-cache/dev-db/mysql-5.7.23-r2
new file mode 100644
index 000000000000..13c822c5b562
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.7.23-r2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses: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? ( 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-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools: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= ) ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) dev-libs/protobuf virtual/yacc server? ( dev-libs/libevent experimental? ( net-libs/rpcsvc-proto ) ) static? ( sys-libs/ncurses[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=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl 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 ~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=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses: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? ( 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-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools: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= ) ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=https://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-20181017-2201Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20181017-2201Z.tar.bz2
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f0e247b2c86758732a7d72d592eda848
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11 b/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11
index 8d437e627c91..6df142aa9467 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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(-)?] ssl? ( 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(-)?] ) !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)]
 SLOT=0/18
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-6.1.11-src.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06246503d50f35295e829a06e1196fea
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11-r1
index f9d90cddd804..e65022efc28e 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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(-)?] ssl? ( 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(-)?] ) !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(-)?] ) ) !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)]
 SLOT=0/18
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-6.1.11-src.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d25cc4d6efc93576090b810a6d74e0e7
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0
new file mode 100644
index 000000000000..c5f236de9e70
--- /dev/null
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare test unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Oracle 18c Instant Client with SDK
+EAPI=7
+HOMEPAGE=https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html
+IUSE=jdbc odbc precomp +sdk +sqlplus tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=OTN
+RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,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/oracle-instantclient-basic-12 !<dev-db/oracle-instantclient-odbc-12 !<dev-db/oracle-instantclient-jdbc-12 !<dev-db/oracle-instantclient-sqlplus-12
+REQUIRED_USE=precomp? ( sdk )
+RESTRICT=fetch splitdebug
+SLOT=0/18.1
+SRC_URI=abi_x86_32? ( instantclient-basic-linux-18.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux-18.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux-18.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux-18.3.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-18.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux-18.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux-18.3.0.0.0dbru.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-18.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-18.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-18.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-18.3.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-18.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-18.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-18.3.0.0.0dbru.zip ) )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=51770523fa1dc710903f6e4d0a3e6fa6
diff --git a/metadata/md5-cache/dev-db/percona-server-5.7.23.23-r1 b/metadata/md5-cache/dev-db/percona-server-5.7.23.23-r1
new file mode 100644
index 000000000000..4e1d591ea9f5
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-server-5.7.23.23-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses: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? ( 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-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) pam? ( virtual/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools: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= ) ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) dev-libs/protobuf virtual/yacc server? ( dev-libs/libevent experimental? ( net-libs/rpcsvc-proto ) ) static? ( sys-libs/ncurses[static-libs] ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-perl/JSON ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=6
+HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server
+IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa pam +perl profiling rocksdb selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin yassl 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 ~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=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses: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? ( 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-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) pam? ( virtual/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools: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= ) ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.23-23/source/tarball/percona-server-5.7.23-23.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20181017-2201Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20181017-2201Z.tar.bz2
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8670b06bda3a22b635333f34e478bdb2
diff --git a/metadata/md5-cache/dev-db/pgadmin4-3.3 b/metadata/md5-cache/dev-db/pgadmin4-3.3
deleted file mode 100644
index c3ab5b5f9f02..000000000000
--- a/metadata/md5-cache/dev-db/pgadmin4-3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_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_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-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] doc? ( dev-python/sphinx[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(+)?] )
-DESCRIPTION=GUI administration and development platform for PostgreSQL
-EAPI=6
-HOMEPAGE=https://www.pgadmin.org/
-IUSE=doc 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=POSTGRESQL
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_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_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-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] >=app-text/htmlmin-0.1.12[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/Babel-2.3.4[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/beautifulsoup-4.4.1[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/blinker-1.4[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/click-6.6[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/extras-1.0.0[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/fixtures-3.0.0[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/flask-1.0.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/flask-babel-0.11.1[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/flask-babelex-0.9.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(+)?] >=dev-python/flask-gravatar-0.5.0[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/flask-htmlmin-1.3.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/flask-login-0.3.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/flask-mail-0.9.1[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/flask-migrate-2.1.1[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/flask-paranoid-0.2.0[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/flask-principal-0.4.0[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/flask-security-3.0.0[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/flask-sqlalchemy-2.3.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/flask-wtf-0.14.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/html5lib-1.0.1[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/itsdangerous-0.24[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/jinja-2.7.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(+)?] >=dev-python/linecache2-1.0.0[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/markupsafe-0.23[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/mimeparse-1.6.0[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/passlib-1.7.1[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/pbr-3.1.1[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/psycopg-2.7.4[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/pycrypto-2.6.1[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/pyrsistent-0.14.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/python-dateutil-2.7.1[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/python-sqlparse-0.2.4[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/pytz-2018.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(+)?] >=dev-python/simplejson-3.13.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/six-1.11.0[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/speaklater-1.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(+)?] >=dev-python/sqlalchemy-1.2.5[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/sshtunnel-0.1.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(+)?] >=dev-python/werkzeug-0.9.6[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/wtforms-2.1[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(+)?]
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://postgresql/pgadmin/pgadmin4/v3.3/source/pgadmin4-3.3.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f16ae1c080deede6aca25fd48d5c6e73
diff --git a/metadata/md5-cache/dev-db/pgadmin4-3.4-r1 b/metadata/md5-cache/dev-db/pgadmin4-3.4-r1
new file mode 100644
index 000000000000..6743915bed24
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgadmin4-3.4-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_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_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-qt/qtnetwork:5 dev-qt/qtwidgets:5 doc? ( dev-python/sphinx[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(+)?] )
+DESCRIPTION=GUI administration and development platform for PostgreSQL
+EAPI=6
+HOMEPAGE=https://www.pgadmin.org/
+IUSE=doc 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=POSTGRESQL
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_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_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-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=app-text/htmlmin-0.1.12[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/Babel-2.3.4[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/beautifulsoup-4.4.1[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/blinker-1.4[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/click-6.6[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/extras-1.0.0[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/fixtures-3.0.0[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/flask-1.0.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/flask-babel-0.11.1[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/flask-babelex-0.9.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(+)?] >=dev-python/flask-gravatar-0.5.0[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/flask-htmlmin-1.3.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/flask-login-0.3.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/flask-mail-0.9.1[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/flask-migrate-2.1.1[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/flask-paranoid-0.2.0[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/flask-principal-0.4.0[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/flask-security-3.0.0[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/flask-sqlalchemy-2.3.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/flask-wtf-0.14.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/html5lib-1.0.1[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/itsdangerous-0.24[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/jinja-2.7.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(+)?] >=dev-python/linecache2-1.0.0[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/markupsafe-0.23[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/mimeparse-1.6.0[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/passlib-1.7.1[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/pbr-3.1.1[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/psycopg-2.7.4[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/pycrypto-2.6.1[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/pyrsistent-0.14.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/python-dateutil-2.7.1[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/python-sqlparse-0.2.4[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/pytz-2018.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(+)?] >=dev-python/simplejson-3.13.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/six-1.11.0[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/speaklater-1.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(+)?] >=dev-python/sqlalchemy-1.2.5[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/sshtunnel-0.1.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(+)?] >=dev-python/werkzeug-0.9.6[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/wtforms-2.1[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(+)?]
+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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://postgresql/pgadmin/pgadmin4/v3.4/source/pgadmin4-3.4.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=652e6614847280eca361e82df5b17756
diff --git a/metadata/md5-cache/dev-db/pgbadger-10.0 b/metadata/md5-cache/dev-db/pgbadger-10.0
index effa3cb59aa3..87c2fa67f1c5 100644
--- a/metadata/md5-cache/dev-db/pgbadger-10.0
+++ b/metadata/md5-cache/dev-db/pgbadger-10.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl:=
 DESCRIPTION=pgBadger is a PostgreSQL log analyzer.
 EAPI=6
-HOMEPAGE=http://dalibo.github.io/pgbadger/
-KEYWORDS=~amd64
+HOMEPAGE=https://pgbadger.darold.net/
+KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/darold/pgbadger/archive/v10.0.tar.gz -> pgbadger-10.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=2b3c2d9697f583682f1d49ca9efb534a
+_md5_=e02e0a5594595ccb9d46b954933d7d4e
diff --git a/metadata/md5-cache/dev-db/pgbadger-9.2 b/metadata/md5-cache/dev-db/pgbadger-9.2
deleted file mode 100644
index e6020c3f39d0..000000000000
--- a/metadata/md5-cache/dev-db/pgbadger-9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl:=
-DESCRIPTION=pgBadger is a PostgreSQL log analyzer.
-EAPI=6
-HOMEPAGE=http://dalibo.github.io/pgbadger/
-KEYWORDS=amd64
-LICENSE=BSD
-RDEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl:=
-SLOT=0
-SRC_URI=https://github.com/dalibo/pgbadger/archive/v9.2.tar.gz -> pgbadger-9.2.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=36a00f224179a16b06a7836fd47b0f9d
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.8.2 b/metadata/md5-cache/dev-db/phpmyadmin-4.8.2
deleted file mode 100644
index bbc3e01aa34f..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.8.2
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.8.2/phpMyAdmin-4.8.2-all-languages.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=cbb7141d8c95de096c713f7540ade3cc
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.8.3-r1 b/metadata/md5-cache/dev-db/phpmyadmin-4.8.3-r1
new file mode 100644
index 000000000000..8604c06d6d48
--- /dev/null
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.8.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web-based administration for MySQL database in PHP
+EAPI=6
+HOMEPAGE=https://www.phpmyadmin.net/
+IUSE=setup vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
+SLOT=4.8.3-r1
+SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.8.3/phpMyAdmin-4.8.3-all-languages.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=87835fd12e6f6796080c0e8a2a58c4f1
diff --git a/metadata/md5-cache/dev-db/postgresql-11.0 b/metadata/md5-cache/dev-db/postgresql-11.0
new file mode 100644
index 000000000000..7aff1c87170d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-11.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=6
+HOMEPAGE=http://www.postgresql.org/
+IUSE=doc kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=11
+SRC_URI=mirror://postgresql/source/v11.0/postgresql-11.0.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=b0d497c6749e7848f06c824a78d3b2a0
diff --git a/metadata/md5-cache/dev-db/postgresql-11_beta3 b/metadata/md5-cache/dev-db/postgresql-11_beta3
deleted file mode 100644
index 4549146331c9..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-11_beta3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=6
-HOMEPAGE=http://www.postgresql.org/
-IUSE=doc kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=11
-SRC_URI=mirror://postgresql/source/v11beta3/postgresql-11beta3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7e6ce288528026cc5821e63de334a22f
diff --git a/metadata/md5-cache/dev-db/postgresql-11_beta4 b/metadata/md5-cache/dev-db/postgresql-11_beta4
deleted file mode 100644
index 171cb9b3f8e9..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-11_beta4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=6
-HOMEPAGE=http://www.postgresql.org/
-IUSE=doc kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=11
-SRC_URI=mirror://postgresql/source/v11beta4/postgresql-11beta4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7e6ce288528026cc5821e63de334a22f
diff --git a/metadata/md5-cache/dev-db/sqlitestudio-3.0.7 b/metadata/md5-cache/dev-db/sqlitestudio-3.0.7
index 1b90c479583b..e85a5f6ea510 100644
--- a/metadata/md5-cache/dev-db/sqlitestudio-3.0.7
+++ b/metadata/md5-cache/dev-db/sqlitestudio-3.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/designer-5.9.4:5 cups? ( >=dev-qt/qtprintsupport-5.9.4:5 ) cli? ( sys-libs/readline:= ) tcl? ( dev-lang/tcl:= )
 SLOT=0
 SRC_URI=http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/sqlitestudio-3.0.7.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	kde5-functions	5976508bb4b803af7b28e66822122b26	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=fc2f77dbbe74577381921ae89a30e315
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index ac7b53c82271..16b8d70d230c 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/arduino-1.8.5-r2 b/metadata/md5-cache/dev-embedded/arduino-1.8.5-r2
index 191fed9ef501..6b6a15ee9e69 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.8.5-r2
+++ b/metadata/md5-cache/dev-embedded/arduino-1.8.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=An open-source AVR electronics prototyping platform
 EAPI=6
 HOMEPAGE=https://arduino.cc/ https://github.com/arduino/
 IUSE=doc elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
 RDEPEND=dev-embedded/arduino-builder >=dev-util/astyle-3.1[java] dev-embedded/arduino-listserialportsc >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/arduino/Arduino/archive/1.8.5.tar.gz -> arduino-1.8.5.tar.gz https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip -> arduino-1.8.5-Firmata-2.5.6.zip https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip -> arduino-1.8.5-Bridge-1.6.3.zip https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip -> arduino-1.8.5-Robot_Control-1.0.4.zip https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3.zip -> arduino-1.8.5-Robot_Motor-1.0.3.zip https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip -> arduino-1.8.5-RobotIRremote-2.0.0.zip https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip -> arduino-1.8.5-SpacebrewYun-1.0.1.zip https://github.com/arduino-libraries/Temboo/archive/1.2.1.zip -> arduino-1.8.5-Temboo-1.2.1.zip https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip -> arduino-1.8.5-Esplora-1.0.4.zip https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip -> arduino-1.8.5-Mouse-1.0.1.zip https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip -> arduino-1.8.5-Keyboard-1.0.1.zip https://github.com/arduino-libraries/SD/archive/1.1.1.zip -> arduino-1.8.5-SD-1.1.1.zip https://github.com/arduino-libraries/Servo/archive/1.1.2.zip -> arduino-1.8.5-Servo-1.1.2.zip https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip -> arduino-1.8.5-LiquidCrystal-1.0.7.zip https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip -> arduino-1.8.5-Adafruit_CircuitPlayground-1.6.8.zip https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip -> arduino-1.8.5-WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip doc? ( https://downloads.arduino.cc/reference-1.6.6-3.zip -> arduino-1.8.5-reference-1.6.6-3.zip https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip -> arduino-1.8.5-Galileo_help_files-1.6.2.zip https://downloads.arduino.cc/Edison_help_files-1.6.2.zip -> arduino-1.8.5-Edison_help_files-1.6.2.zip )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=677927acf53d70daa66ad4aff6793cfb
+_md5_=e798a23633f6d8d2bc68ae512a66633d
diff --git a/metadata/md5-cache/dev-embedded/arduino-builder-1.3.25 b/metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
index 23c7c1bc90e0..cb58e1f292dd 100644
--- a/metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
+++ b/metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/go-1.9.2 >=dev-lang/go-1.9
 DESCRIPTION=A command line tool for compiling Arduino sketches
 EAPI=6
 HOMEPAGE=https://github.com/arduino/arduino-builder
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/crossdev dev-embedded/avrdude dev-embedded/arduino-ctags
 SLOT=0
 SRC_URI=https://github.com/arduino/arduino-builder/archive/1.3.25.tar.gz -> arduino-builder-1.3.25.tar.gz https://github.com/go-errors/errors/archive/a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz -> github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz https://github.com/jstemmer/go-junit-report/archive/833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz -> github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz https://github.com/stretchr/testify/archive/1661650f989674e3e5bcdcb805536e5d31481526.tar.gz -> github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz
 _eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=3118c3cec4fa668f6a82354803185d84
+_md5_=e0cd179b25db8b775a69be1ae9e61665
diff --git a/metadata/md5-cache/dev-embedded/arduino-builder-1.4.1 b/metadata/md5-cache/dev-embedded/arduino-builder-1.4.1
new file mode 100644
index 000000000000..db2827b23686
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/arduino-builder-1.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=>=dev-lang/go-1.9.2 dev-go/go-net dev-go/go-text >=dev-lang/go-1.9
+DESCRIPTION=A command line tool for compiling Arduino sketches
+EAPI=6
+HOMEPAGE=https://github.com/arduino/arduino-builder
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/crossdev dev-embedded/avrdude dev-embedded/arduino-ctags
+SLOT=0
+SRC_URI=https://github.com/arduino/arduino-builder/archive/1.4.1.tar.gz -> arduino-builder-1.4.1.tar.gz https://github.com/arduino/go-properties-map/archive/ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41.tar.gz -> github.com-arduino-go-properties-map-ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41.tar.gz https://github.com/arduino/go-timeutils/archive/d1dd9e313b1bfede35fe0bbf46d612e16a50e04e.tar.gz -> github.com-arduino-go-timeutils-d1dd9e313b1bfede35fe0bbf46d612e16a50e04e.tar.gz https://github.com/arduino/go-paths-helper/archive/751652ddd9f0a98650e681673c2c73937002e889.tar.gz -> github.com-arduino-go-paths-helper-751652ddd9f0a98650e681673c2c73937002e889.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/go-errors/errors/archive/a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz -> github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz https://github.com/golang/protobuf/archive/aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz -> github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz https://github.com/jstemmer/go-junit-report/archive/833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz -> github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz https://github.com/stretchr/testify/archive/1661650f989674e3e5bcdcb805536e5d31481526.tar.gz -> github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz https://github.com/grpc/grpc-go/archive/8dea3dc473e90c8179e519d91302d0597c0ca1d1.tar.gz -> github.com-grpc-grpc-go-8dea3dc473e90c8179e519d91302d0597c0ca1d1.tar.gz https://github.com/google/go-genproto/archive/af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz -> github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=13e5350cc21c31a96f493c8a34d15c17
diff --git a/metadata/md5-cache/dev-embedded/arduino-ctags-20161123 b/metadata/md5-cache/dev-embedded/arduino-ctags-20161123
index 14471c1fba1e..56adb170defe 100644
--- a/metadata/md5-cache/dev-embedded/arduino-ctags-20161123
+++ b/metadata/md5-cache/dev-embedded/arduino-ctags-20161123
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Arduino private fork of dev-util/ctags
 EAPI=6
 HOMEPAGE=https://github.com/arduino/ctags
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/arduino/ctags/archive/abc8fca7499f44c725122881cd380a88c37abe0e.tar.gz -> arduino-ctags-20161123.tar.gz
-_md5_=25a5d810c60674bc5ee00adc36783f59
+_md5_=90aa4490a79593272ad623207afc8d21
diff --git a/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0 b/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0
index 7197a5a99a03..8bb37b9df0aa 100644
--- a/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0
+++ b/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Arduino helper library to list serial ports
 EAPI=6
 HOMEPAGE=https://github.com/arduino/listSerialPortsC
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-libs/libserialport-0.1.1 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/arduino/listSerialPortsC/archive/1.4.0.tar.gz -> arduino-listserialportsc-1.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d18b7687d6a94f1abf7f65ef4a3ac92b
+_md5_=51436bd4cfbcebafef7ba4e3e8c8ffc4
diff --git a/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10 b/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10
index ab51c22e8924..1a3b4bd9267c 100644
--- a/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10
+++ b/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-embedded/sdcc-2.5[mcs51] >=app-doc/doxygen-1.7 >=dev-util/indent-2.2 >=app-text/hunspell-1.3 >=dev-tcltk/bwidget-1.8 >dev-tcltk/itcl-3.3 >=dev-lang/tcl-8.5.9:* >=dev-tcltk/tdom-0.8 >=dev-tcltk/tcllib-1.11 >=dev-lang/tk-8.5.9:* >=dev-tcltk/tkimg-1.4 >=dev-tcltk/tclx-8.4 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Graphical IDE for microcontrollers based on 8051.
 EAPI=6
-HOMEPAGE=http://www.moravia-microsystems.com/mcu-8051-ide/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64
 LICENSE=GPL-2+
 RDEPEND=>=dev-embedded/sdcc-2.5[mcs51] >=app-doc/doxygen-1.7 >=dev-util/indent-2.2 >=app-text/hunspell-1.3 >=dev-tcltk/bwidget-1.8 >dev-tcltk/itcl-3.3 >=dev-lang/tcl-8.5.9:* >=dev-tcltk/tdom-0.8 >=dev-tcltk/tcllib-1.11 >=dev-lang/tk-8.5.9:* >=dev-tcltk/tkimg-1.4 >=dev-tcltk/tclx-8.4
 SLOT=0
-SRC_URI=http://www.moravia-microsystems.com/download/mcu8051ide/mcu8051ide/1.4.10/mcu8051ide-1.4.10.tar.gz
+SRC_URI=mirror://gentoo/mcu8051ide-1.4.10.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f9288bf0f528218cc7dc097e1f8eb596
+_md5_=fc8928b5a0b33124375a6373eb571064
diff --git a/metadata/md5-cache/dev-embedded/parapin-1.5.0 b/metadata/md5-cache/dev-embedded/parapin-1.5.0
new file mode 100644
index 000000000000..3ca54eccac31
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/parapin-1.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=doc? ( dev-tex/latex2html )
+DESCRIPTION=A parallel port pin programming library
+EAPI=7
+HOMEPAGE=http://parapin.sourceforge.net/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/parapin/parapin-1.5.0.tgz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ba71857dd3d029b17e3012ea2e795d79
diff --git a/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1 b/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1
new file mode 100644
index 000000000000..5a5f32725f16
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=doc? ( dev-tex/latex2html )
+DESCRIPTION=A parallel port pin programming library
+EAPI=7
+HOMEPAGE=http://parapin.sourceforge.net/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/parapin/parapin-1.5.1-beta1.tgz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c3b8d3823640b64068ea3793d6f3d7e5
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index a83dd17a640e..5712bdc2ded6 100644
--- a/metadata/md5-cache/dev-erlang/Manifest.gz
+++ b/metadata/md5-cache/dev-erlang/Manifest.gz
diff --git a/metadata/md5-cache/dev-erlang/base64url-1.0 b/metadata/md5-cache/dev-erlang/base64url-1.0
new file mode 100644
index 000000000000..342d0f5d9792
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/base64url-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=URL safe base64-compatible codec
+EAPI=6
+HOMEPAGE=https://github.com/dvv/base64url
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/dvv/base64url/archive/v1.0.tar.gz -> base64url-1.0.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=e817fa061f44d23e1cde8c5bc0d201a1
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.16 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.16
new file mode 100644
index 000000000000..232e44f0f324
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/cache_tab-1.0.16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=In-memory cache Erlang and Elixir library
+EAPI=6
+HOMEPAGE=https://github.com/processone/cache_tab
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/cache_tab/archive/1.0.16.tar.gz -> cache_tab-1.0.16.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=aaa521e701941d1ddf312b9182103dd2
diff --git a/metadata/md5-cache/dev-erlang/eimp-1.0.9 b/metadata/md5-cache/dev-erlang/eimp-1.0.9
new file mode 100644
index 000000000000..dc43eaa6ad0e
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/eimp-1.0.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 media-libs/gd[png,jpeg,webp] dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Erlang Image Manipulation Process
+EAPI=6
+HOMEPAGE=https://github.com/processone/eimp
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 media-libs/gd[png,jpeg,webp] dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/eimp/archive/1.0.9.tar.gz -> eimp-1.0.9.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=f54db1c3c65f290914aef6327e7d6e0c
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.4 b/metadata/md5-cache/dev-erlang/epam-1.0.4
new file mode 100644
index 000000000000..83942dc2cf1c
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/epam-1.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=epam for ejabberd to help with PAM authentication support
+EAPI=6
+HOMEPAGE=https://github.com/processone/epam
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/epam/archive/1.0.4.tar.gz -> epam-1.0.4.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=8fcb4b9f71de8a340645b0e0e2171c8b
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.26 b/metadata/md5-cache/dev-erlang/esip-1.0.26
new file mode 100644
index 000000000000..4018f6e298b2
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.26
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/fast_tls-1.0.25 >=dev-erlang/stun-1.0.25 >=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=ProcessOne SIP server component
+EAPI=6
+HOMEPAGE=https://github.com/processone/esip
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/fast_tls-1.0.25 >=dev-erlang/stun-1.0.25 >=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/esip/archive/1.0.26.tar.gz -> esip-1.0.26.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=3f05060321cc9dc6a3516d0751138342
diff --git a/metadata/md5-cache/dev-erlang/ezlib-1.0.4 b/metadata/md5-cache/dev-erlang/ezlib-1.0.4
new file mode 100644
index 000000000000..b353f6921e6c
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/ezlib-1.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 sys-libs/zlib dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Native zlib driver for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/ezlib
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 sys-libs/zlib dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/ezlib/archive/1.0.4.tar.gz -> ezlib-1.0.4.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=47a69b1426ddd5444a836c64d93c1805
diff --git a/metadata/md5-cache/dev-erlang/fast_tls-1.0.25 b/metadata/md5-cache/dev-erlang/fast_tls-1.0.25
new file mode 100644
index 000000000000..cac5d3bd340b
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_tls-1.0.25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=TLS/SSL native driver for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/fast_tls
+IUSE=libressl
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/fast_tls/archive/1.0.25.tar.gz -> fast_tls-1.0.25.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=f40ad50d81c85b89c04e564dbbcb965e
diff --git a/metadata/md5-cache/dev-erlang/fast_xml-1.1.34 b/metadata/md5-cache/dev-erlang/fast_xml-1.1.34
new file mode 100644
index 000000000000..f9ceaecebc43
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_xml-1.1.34
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-libs/expat test? ( >=dev-lang/elixir-1.1 ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Fast Expat based Erlang XML parsing library
+EAPI=6
+HOMEPAGE=https://github.com/processone/fast_xml
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-libs/expat dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/fast_xml/archive/1.1.34.tar.gz -> fast_xml-1.1.34.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=60a34c270a95b8a778f4dc44e9cd45e5
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.17 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.17
new file mode 100644
index 000000000000..3c1347002f99
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Fast Yaml native library for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/fast_yaml
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.17.tar.gz -> fast_yaml-1.0.17.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=b326b841067d69356e159e118bd5b525
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.10 b/metadata/md5-cache/dev-erlang/iconv-1.0.10
new file mode 100644
index 000000000000..a1983170f938
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/iconv-1.0.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/iconv
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/iconv/archive/1.0.10.tar.gz -> iconv-1.0.10.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=2cebfd8717b9777fd6ddd807c318382f
diff --git a/metadata/md5-cache/dev-erlang/jose-1.8.4 b/metadata/md5-cache/dev-erlang/jose-1.8.4
new file mode 100644
index 000000000000..d3a9ddf1fe26
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/jose-1.8.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/base64url-0.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=JSON Object Signing and Encryption (JOSE) for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/potatosalad/erlang-jose
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/base64url-0.1 dev-lang/erlang
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/potatosalad/erlang-jose/archive/1.8.4.tar.gz -> erlang-jose-1.8.4.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=d859315693e7c9a0ade1d7b4f8bc6ae6
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.13 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.13
new file mode 100644
index 000000000000..5b0e9c73209f
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Erlang utility modules from ProcessOne
+EAPI=6
+HOMEPAGE=https://github.com/processone/p1_utils
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/p1_utils/archive/1.0.13.tar.gz -> p1_utils-1.0.13.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=99c2acdf9c16224ae8853c0c2dccf45a
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.25 b/metadata/md5-cache/dev-erlang/stun-1.0.25
new file mode 100644
index 000000000000..b2d98307b229
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/stun-1.0.25
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/fast_tls-1.0.25 >=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=STUN and TURN library for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/stun
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-erlang/fast_tls-1.0.25 >=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/stun/archive/1.0.25.tar.gz -> stun-1.0.25.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=e5ef89301c4a81918aa76e181f07fa0b
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index a5216e1b5645..0af69a408b11 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/ogre-1.11.2 b/metadata/md5-cache/dev-games/ogre-1.11.2
new file mode 100644
index 000000000000..ba2d9f15eb09
--- /dev/null
+++ b/metadata/md5-cache/dev-games/ogre-1.11.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-games/ois dev-libs/zziplib media-libs/freetype:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt cg? ( media-gfx/nvidia-cg-toolkit ) egl? ( media-libs/mesa[egl] ) freeimage? ( media-libs/freeimage ) gles2? ( media-libs/mesa[gles2] ) json? ( dev-libs/rapidjson ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/glu virtual/opengl ) tools? ( dev-libs/tinyxml[stl] ) virtual/pkgconfig x11-base/xorg-proto doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Object-oriented Graphics Rendering Engine
+EAPI=6
+HOMEPAGE=https://www.ogre3d.org/
+IUSE=+cache cg debug doc double-precision egl examples experimental +freeimage gles2 json openexr +opengl pch profile resman-pedantic resman-strict tools
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT public-domain
+RDEPEND=dev-games/ois dev-libs/zziplib media-libs/freetype:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt cg? ( media-gfx/nvidia-cg-toolkit ) egl? ( media-libs/mesa[egl] ) freeimage? ( media-libs/freeimage ) gles2? ( media-libs/mesa[gles2] ) json? ( dev-libs/rapidjson ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/glu virtual/opengl ) tools? ( dev-libs/tinyxml[stl] )
+REQUIRED_USE=|| ( gles2 opengl ) ?? ( resman-pedantic resman-strict )
+RESTRICT=test
+SLOT=0/1.11
+SRC_URI=https://github.com/OGRECave/ogre/archive/v1.11.2.zip -> ogre-1.11.2.zip
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f79120bdbbb505b100e2340e73ac20b6
diff --git a/metadata/md5-cache/dev-games/ogre-2.1_pre20180901 b/metadata/md5-cache/dev-games/ogre-2.1_pre20180901
new file mode 100644
index 000000000000..65c09098b9b9
--- /dev/null
+++ b/metadata/md5-cache/dev-games/ogre-2.1_pre20180901
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-games/ois dev-libs/zziplib media-libs/freetype:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt egl? ( media-libs/mesa[egl] ) freeimage? ( media-libs/freeimage ) gles2? ( media-libs/mesa[gles2] ) json? ( dev-libs/rapidjson ) opengl? ( virtual/glu virtual/opengl ) tools? ( dev-libs/tinyxml[stl] ) virtual/pkgconfig x11-base/xorg-proto doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Object-oriented Graphics Rendering Engine
+EAPI=6
+HOMEPAGE=https://www.ogre3d.org/
+IUSE=+cache debug doc egl examples +freeimage gles2 json +legacy-animations mobile +opengl profile tools
+LICENSE=MIT public-domain
+RDEPEND=dev-games/ois dev-libs/zziplib media-libs/freetype:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt egl? ( media-libs/mesa[egl] ) freeimage? ( media-libs/freeimage ) gles2? ( media-libs/mesa[gles2] ) json? ( dev-libs/rapidjson ) opengl? ( virtual/glu virtual/opengl ) tools? ( dev-libs/tinyxml[stl] )
+REQUIRED_USE=|| ( gles2 opengl ) mobile? ( egl gles2 !opengl )
+RESTRICT=test
+SLOT=0/2.1
+SRC_URI=https://bitbucket.org/sinbad/ogre/get/35b083cba64a.tar.bz2 -> ogre-2.1_pre20180901.tar.bz2
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=44f7653b5d816306947aeb552f9c0e0a
diff --git a/metadata/md5-cache/dev-games/physfs-2.0.3-r2 b/metadata/md5-cache/dev-games/physfs-2.0.3-r2
index 50f4a19a87a4..4b72b37f025b 100644
--- a/metadata/md5-cache/dev-games/physfs-2.0.3-r2
+++ b/metadata/md5-cache/dev-games/physfs-2.0.3-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ppc64 x86 ~x86-fbsd
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=http://icculus.org/physfs/downloads/physfs-2.0.3.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f92cbb7d89ab2f3cd651c30359c469a
diff --git a/metadata/md5-cache/dev-games/physfs-3.0.1 b/metadata/md5-cache/dev-games/physfs-3.0.1
index ce6fc67dfa49..a41a9fd094a6 100644
--- a/metadata/md5-cache/dev-games/physfs-3.0.1
+++ b/metadata/md5-cache/dev-games/physfs-3.0.1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=http://icculus.org/physfs/downloads/physfs-3.0.1.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c508d3e0ccaa1a793f42fdc4febcdd24
diff --git a/metadata/md5-cache/dev-games/physfs-3.0.1-r1 b/metadata/md5-cache/dev-games/physfs-3.0.1-r1
index c007cba53e19..79d506947c7c 100644
--- a/metadata/md5-cache/dev-games/physfs-3.0.1-r1
+++ b/metadata/md5-cache/dev-games/physfs-3.0.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=http://icculus.org/physfs/downloads/physfs-3.0.1.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aa9169b947530461f7b87150c851f405
diff --git a/metadata/md5-cache/dev-games/physfs-9999 b/metadata/md5-cache/dev-games/physfs-9999
index 4e83c1e2b231..b6a2245af23e 100644
--- a/metadata/md5-cache/dev-games/physfs-9999
+++ b/metadata/md5-cache/dev-games/physfs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://icculus.org/physfs/
 IUSE=7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip abi_x86_32 abi_x86_64 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=ZLIB
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f69c386eb258a184729f4d6f202b16b2
diff --git a/metadata/md5-cache/dev-games/tiled-1.2.0 b/metadata/md5-cache/dev-games/tiled-1.2.0
index 82a52c8dc5ed..9a879033cb47 100644
--- a/metadata/md5-cache/dev-games/tiled-1.2.0
+++ b/metadata/md5-cache/dev-games/tiled-1.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/bjorn/tiled/archive/v1.2.0/tiled-1.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b09b9f092f84f5842761b8c198950109
+_md5_=e6dec06529f10a3a6a4edc72f08cc883
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index afb75c88ca77..e4a14bff4d48 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/go-bindata-0_pre20151023 b/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
index 31415cad7fa1..29117b98ec44 100644
--- a/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
+++ b/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
@@ -8,4 +8,4 @@ LICENSE=CC-PD
 SLOT=0/0_pre20151023
 SRC_URI=https://github.com/jteeuwen/go-bindata/archive/a0ff2567cfb70903282db057e799fd826784d41d.tar.gz -> go-bindata-0_pre20151023.tar.gz
 _eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=dc973713e115fe7a023c8e5e5e6f9033
+_md5_=5e775fd76963f34e331c4eb7415f7cee
diff --git a/metadata/md5-cache/dev-go/go-protobuf-0_pre20150809 b/metadata/md5-cache/dev-go/go-protobuf-0_pre20150809
deleted file mode 100644
index 9ff4c71b53bd..000000000000
--- a/metadata/md5-cache/dev-go/go-protobuf-0_pre20150809
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go support for Google's protocol buffers
-EAPI=5
-HOMEPAGE=https://github.com/golang/protobuf
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20150809
-SRC_URI=https://github.com/golang/protobuf/archive/68c687dc49948540b356a6b47931c9be4fcd0245.tar.gz -> go-protobuf-0_pre20150809.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=596fbdbf7f9d0dca8e81152306ae5607
diff --git a/metadata/md5-cache/dev-go/go-protobuf-1.2.0 b/metadata/md5-cache/dev-go/go-protobuf-1.2.0
new file mode 100644
index 000000000000..dedff15550b1
--- /dev/null
+++ b/metadata/md5-cache/dev-go/go-protobuf-1.2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Go support for Google's protocol buffers
+EAPI=6
+HOMEPAGE=https://github.com/golang/protobuf
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0/1.2.0
+SRC_URI=https://github.com/golang/protobuf/archive/v1.2.0.tar.gz -> go-protobuf-1.2.0.tar.gz https://github.com/google/go-genproto/archive/af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz -> github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz https://github.com/golang/net/archive/aaf60122140d3fcf75376d319f0554393160eb50.tar.gz -> github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=ce300bcad70c14debe31ef11f5cbe465
diff --git a/metadata/md5-cache/dev-go/go-protobuf-9999 b/metadata/md5-cache/dev-go/go-protobuf-9999
deleted file mode 100644
index d9c073b80b8e..000000000000
--- a/metadata/md5-cache/dev-go/go-protobuf-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go support for Google's protocol buffers
-EAPI=5
-HOMEPAGE=https://github.com/golang/protobuf
-LICENSE=BSD
-SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b86c0abc73ac22be7e987960fa0cdd40
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index b52c7b5f98df..55e3d7ce05b9 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/boot-bin-2.6.0 b/metadata/md5-cache/dev-java/boot-bin-2.6.0
deleted file mode 100644
index 9779a678e493..000000000000
--- a/metadata/md5-cache/dev-java/boot-bin-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Build tooling for Clojure
-EAPI=6
-HOMEPAGE=http://boot-clj.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/boot-clj/boot/releases/download/2.6.0/boot.jar -> boot-2.6.0.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b7f9292d3a3d3c966bdc5dfaa4c3d724
diff --git a/metadata/md5-cache/dev-java/boot-bin-2.7.0 b/metadata/md5-cache/dev-java/boot-bin-2.7.0
deleted file mode 100644
index 1418d98950bd..000000000000
--- a/metadata/md5-cache/dev-java/boot-bin-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Build tooling for Clojure
-EAPI=6
-HOMEPAGE=http://boot-clj.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/boot-clj/boot/releases/download/2.7.0/boot.jar -> boot-2.7.0.jar https://raw.githubusercontent.com/boot-clj/boot/2.7.0/README.md -> boot-2.7.0-README.md https://raw.githubusercontent.com/boot-clj/boot/2.7.0/CHANGES.md -> boot-2.7.0-CHANGES.md
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bf5c6287ab05c255ad014c094743796c
diff --git a/metadata/md5-cache/dev-java/boot-bin-2.7.1 b/metadata/md5-cache/dev-java/boot-bin-2.7.1
index f94bdbaa1a90..25d1959e21ae 100644
--- a/metadata/md5-cache/dev-java/boot-bin-2.7.1
+++ b/metadata/md5-cache/dev-java/boot-bin-2.7.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
+DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Build tooling for Clojure
 EAPI=6
 HOMEPAGE=http://boot-clj.com/
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=EPL-1.0
-RDEPEND=>=virtual/jdk-1.7:* >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/boot-clj/boot/releases/download/2.7.1/boot.jar -> boot-2.7.1.jar https://raw.githubusercontent.com/boot-clj/boot/2.7.1/README.md -> boot-2.7.1-README.md https://raw.githubusercontent.com/boot-clj/boot/2.7.1/CHANGES.md -> boot-2.7.1-CHANGES.md
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bf5c6287ab05c255ad014c094743796c
+_md5_=45bb8a800b80fc38436c1df18902999c
diff --git a/metadata/md5-cache/dev-java/classmate-1.2.0 b/metadata/md5-cache/dev-java/classmate-1.2.0
new file mode 100644
index 000000000000..d33d92a67888
--- /dev/null
+++ b/metadata/md5-cache/dev-java/classmate-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Zero-dependency Java library for accurately introspecting type information
+EAPI=6
+HOMEPAGE=https://github.com/cowtowncoder/java-classmate/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/cowtowncoder/java-classmate/archive/classmate-1.2.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f4d98403e4df9389474129423cc458af
diff --git a/metadata/md5-cache/dev-java/commons-math-3.6.1 b/metadata/md5-cache/dev-java/commons-math-3.6.1
new file mode 100644
index 000000000000..75de1760f266
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-math-3.6.1
@@ -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=Lightweight, self-contained mathematics and statistics components
+EAPI=6
+HOMEPAGE=https://commons.apache.org/math/
+IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar -> commons-math3-3.6.1.jar
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=b1cd8fc462e9ec08a548bfd86600a306
diff --git a/metadata/md5-cache/dev-java/commons-net-3.6 b/metadata/md5-cache/dev-java/commons-net-3.6
new file mode 100644
index 000000000000..f41290543f23
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-net-3.6
@@ -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=Client-oriented Java library to implement many Internet protocols
+EAPI=6
+HOMEPAGE=https://commons.apache.org/net/
+IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/commons-net/commons-net/3.6/commons-net-3.6-sources.jar -> commons-net-3.6.jar
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ccefed754766f4b03751d2702915bf14
diff --git a/metadata/md5-cache/dev-java/icedtea-3.8.0 b/metadata/md5-cache/dev-java/icedtea-3.8.0
deleted file mode 100644
index 2be0b98d6745..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-3.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/icedtea-bin:8 dev-java/icedtea:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +sunec +system-lcms test +webstart zero elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) system-lcms? ( >=media-libs/lcms-2.9:2= ) !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 virtual/ttf-fonts alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) !headless-awt? ( >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.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	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	java-vm-2	8e35974e63a8fdd757a751760871e3db	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e94f5dcab16c51db23304bba9d973985
diff --git a/metadata/md5-cache/dev-java/icedtea-3.9.0 b/metadata/md5-cache/dev-java/icedtea-3.9.0
new file mode 100644
index 000000000000..7885fc696ced
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-3.9.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/icedtea-bin:8 dev-java/icedtea:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
+EAPI=6
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +sunec +system-lcms test +webstart zero elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) system-lcms? ( >=media-libs/lcms-2.9:2= ) !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 virtual/ttf-fonts alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) !headless-awt? ( >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+REQUIRED_USE=gtk? ( !headless-awt )
+SLOT=8
+SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.9.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.9.0/openjdk.tar.xz -> icedtea-3.9-openjdk-3b2d372838b9.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.9.0/corba.tar.xz -> icedtea-3.9-corba-c120c4fb7b31.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.9.0/jaxp.tar.xz -> icedtea-3.9-jaxp-55420c5cc9f3.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.9.0/jaxws.tar.xz -> icedtea-3.9-jaxws-f824de94c42e.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.9.0/jdk.tar.xz -> icedtea-3.9-jdk-7b289a33ab97.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.9.0/hotspot.tar.xz -> icedtea-3.9-hotspot-d78088224b98.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.9.0/nashorn.tar.xz -> icedtea-3.9-nashorn-79a2c8e2babc.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.9.0/langtools.tar.xz -> icedtea-3.9-langtools-8496472630c5.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.9.0/shenandoah.tar.xz -> icedtea-3.9-shenandoah-b8b742251e42.tar.xz ) arm? ( http://icedtea.classpath.org/download/drops/icedtea8/3.9.0/aarch32.tar.xz -> icedtea-3.9-aarch32-891d70e93fb0.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	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	java-vm-2	8e35974e63a8fdd757a751760871e3db	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5ec4f7ef1ad306de661e1df539870394
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.7.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.7.0
deleted file mode 100644
index d81bd2dfbce4..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~arm ~arm64 ppc64 x86
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=sys-devel/gcc-6.4.0[multilib?] >=sys-libs/glibc-2.25[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42: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/fontconfig-2.11: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/freetype-2.5.5: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/lcms-2.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(-)?] >=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:62[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.16.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-1.14.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: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/gtk+-2.24: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/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-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/libX11-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/libXcomposite-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(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.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(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.6:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-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	8e35974e63a8fdd757a751760871e3db	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6ed40bbe2cf4bf3dc8ebc7dcadcc1d56
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.9.0-r1 b/metadata/md5-cache/dev-java/icedtea-bin-3.9.0-r1
new file mode 100644
index 000000000000..c951eb6d9bbf
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.9.0-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=6
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=sys-devel/gcc-6.4.0[multilib?] >=sys-libs/glibc-2.26[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42: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/fontconfig-2.11: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/freetype-2.5.5: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/lcms-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.16.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-1.14.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: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/gtk+-2.24: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/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-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/libX11-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/libXcomposite-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(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.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(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.9:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+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.9.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.9.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.9.0-r1-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.9.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.9.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.9.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.9.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.9.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.9.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.9.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.9.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.9.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.9.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.9.0-r1-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.9.0-r1-x86.tar.xz ) )
+_eclasses_=java-vm-2	8e35974e63a8fdd757a751760871e3db	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b4ff404a2c4cae40a3e37b044edd294b
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.181 b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.181
deleted file mode 100644
index 05e163d7d63a..000000000000
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.181
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
-EAPI=7
-HOMEPAGE=http://download.oracle.com/javase/8/docs/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=oracle-java-documentation-8
-RESTRICT=fetch
-SLOT=1.8
-SRC_URI=jdk-8u181-docs-all.zip
-_md5_=245a6668966e0aae0bf629cb49d89a96
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.192 b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.192
new file mode 100644
index 000000000000..64a960d88cf1
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.192
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install nofetch prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
+EAPI=7
+HOMEPAGE=http://download.oracle.com/javase/8/docs/
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=oracle-java-documentation-8
+RESTRICT=fetch
+SLOT=1.8
+SRC_URI=jdk-8u192-docs-all.zip
+_md5_=c8c855ccd3e922a9d6cea52c4c7e7b82
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-11.0.1 b/metadata/md5-cache/dev-java/java-sdk-docs-11.0.1
new file mode 100644
index 000000000000..cdd705be7ffe
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-11.0.1
@@ -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/11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=oracle-java-documentation-11
+RESTRICT=fetch
+SLOT=11
+SRC_URI=jdk-11.0.1_doc-all.zip
+_md5_=cc69212f0bbb0c32bcc5fad82c3a02ac
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.19 b/metadata/md5-cache/dev-java/jcifs-1.3.19
new file mode 100644
index 000000000000..9c7c171832ff
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=java-virtuals/servlet-api:3.0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Library that implements the CIFS/SMB networking protocol in Java
+EAPI=6
+HOMEPAGE=https://jcifs.samba.org/
+IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=1.1
+SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.19.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0fb3ac7966e267766b9c8efca05f60b1
diff --git a/metadata/md5-cache/dev-java/json-20150729 b/metadata/md5-cache/dev-java/json-20150729
index 1bb6ce2f4542..815ea6e213bd 100644
--- a/metadata/md5-cache/dev-java/json-20150729
+++ b/metadata/md5-cache/dev-java/json-20150729
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Java implementation of the JavaScript Object Notation
 EAPI=5
-HOMEPAGE=http://www.json.org/java/
+HOMEPAGE=https://github.com/douglascrockford/JSON-java
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/douglascrockford/JSON-java/archive/20150729.zip -> json-20150729.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=70c357639f39155156577646dacba1a0
+_md5_=9f93d6dfcd6f722167821b38f9329f21
diff --git a/metadata/md5-cache/dev-java/json-20160212 b/metadata/md5-cache/dev-java/json-20160212
index e34f61f5d165..7652527f87a5 100644
--- a/metadata/md5-cache/dev-java/json-20160212
+++ b/metadata/md5-cache/dev-java/json-20160212
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Java implementation of the JavaScript Object Notation
 EAPI=5
-HOMEPAGE=http://www.json.org/java/
+HOMEPAGE=https://github.com/douglascrockford/JSON-java
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/douglascrockford/JSON-java/archive/20160212.zip -> json-20160212.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9291fcb7446082c2c161eb3479e9bbb4
+_md5_=0b3a70761ff52ddadea416058a500908
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11_p28 b/metadata/md5-cache/dev-java/openjdk-bin-11_p28
new file mode 100644
index 000000000000..ac1232ae8600
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11_p28
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prerm setup
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
+EAPI=6
+HOMEPAGE=https://adoptopenjdk.net
+IUSE=alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:11 ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RESTRICT=preserve-libs
+SLOT=11
+SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11+28/OpenJDK11-jdk_x64_linux_hotspot_11_28.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11+28/OpenJDK11-jdk_aarch64_linux_hotspot_11_28.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11+28/OpenJDK11-jdk_ppc64le_linux_hotspot_11_28.tar.gz )
+_eclasses_=java-vm-2	8e35974e63a8fdd757a751760871e3db	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8d03c4ced71bcc1e507a09db9e565d96
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.192 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.192
new file mode 100644
index 000000000000..be0e0393afc5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.192
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare prerm setup unpack
+DEPEND=app-arch/zip examples? ( x64-macos? ( app-arch/unzip ) ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Oracle's Java SE Development Kit
+EAPI=6
+HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
+IUSE=alsa commercial cups doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm
+KEYWORDS=-* amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
+RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:1.8 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+REQUIRED_USE=javafx? ( alsa fontconfig )
+RESTRICT=fetch preserve-libs strip
+SLOT=1.8
+SRC_URI=amd64? ( jdk-8u192-linux-x64.tar.gz examples? ( jdk-8u192-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u192-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u192-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u192-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u192-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u192-linux-i586.tar.gz examples? ( jdk-8u192-linux-i586-demos.tar.gz ) ) x64-macos? ( jdk-8u192-macosx-x64.dmg examples? ( jdk-8u192-macosx-x86_64-demos.zip ) ) sparc64-solaris? ( jdk-8u192-solaris-sparcv9.tar.gz examples? ( jdk-8u192-solaris-sparcv9-demos.tar.gz ) ) x64-solaris? ( jdk-8u192-solaris-x64.tar.gz examples? ( jdk-8u192-solaris-x64-demos.tar.gz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-vm-2	8e35974e63a8fdd757a751760871e3db	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7d33963b8929c4cdd7149f9396881a79
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.192 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.192
new file mode 100644
index 000000000000..b9b85e1819e3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.192
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare prerm setup
+DEPEND=app-arch/zip >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Oracle's Java SE Runtime Environment
+EAPI=6
+HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
+IUSE=alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux
+KEYWORDS=-* amd64 ~x86
+LICENSE=Oracle-BCLA-JavaSE
+RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RESTRICT=fetch preserve-libs strip
+SLOT=1.8
+SRC_URI=amd64? ( jre-8u192-linux-x64.tar.gz ) x86? ( jre-8u192-linux-i586.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-vm-2	8e35974e63a8fdd757a751760871e3db	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=02f2fd794eb2da8f33769602bbce5b97
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.6.1 b/metadata/md5-cache/dev-java/protobuf-java-3.6.1
index 784a4a455377..cee8f660e4e8 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.6.1
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=6
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/17
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.6.1.tar.gz -> protobuf-3.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=59fcb3af83967d169295c74cb1409b6c
+_md5_=052630f3e2d14ec08e591f5bde757e86
diff --git a/metadata/md5-cache/dev-java/trove-3.0.3 b/metadata/md5-cache/dev-java/trove-3.0.3
new file mode 100644
index 000000000000..7b77bc8c0fa5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/trove-3.0.3
@@ -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=GNU Trove: High performance collections for Java
+EAPI=6
+HOMEPAGE=http://trove4j.sourceforge.net
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/net/sf/trove4j/trove4j/3.0.3/trove4j-3.0.3-sources.jar -> trove-3.0.3.jar
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=756cd488faac51bb2ea1dcb23b9e8156
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 44c9a0c206b2..703373701c0f 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/R-3.2.2 b/metadata/md5-cache/dev-lang/R-3.2.2
index cd7dd3fef8f5..24de7a95bd07 100644
--- a/metadata/md5-cache/dev-lang/R-3.2.2
+++ b/metadata/md5-cache/dev-lang/R-3.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=5
 HOMEPAGE=http://www.r-project.org/
 IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X
-KEYWORDS=amd64 hppa ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) >=sys-libs/zlib-1.2.5.1-r2:0[minizip] java? ( >=virtual/jre-1.5 ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
@@ -12,4 +12,4 @@ RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.2.2.tar.gz https://dev.gentoo.org/~bicatali/distfiles/R-20130129.bash_completion.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ed771303603859acb9d0fadfd77072c2
+_md5_=362c8e45c8ab702edaef28df9ff5cbc5
diff --git a/metadata/md5-cache/dev-lang/R-3.3.2 b/metadata/md5-cache/dev-lang/R-3.3.2
index dc1049c6e62c..be78b93f8975 100644
--- a/metadata/md5-cache/dev-lang/R-3.3.2
+++ b/metadata/md5-cache/dev-lang/R-3.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=5
 HOMEPAGE=http://www.r-project.org/
 IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X
-KEYWORDS=~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~amd64 ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) >=sys-libs/zlib-1.2.5.1-r2:0[minizip] java? ( >=virtual/jre-1.5 ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
@@ -12,4 +12,4 @@ RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.3.2.tar.gz https://dev.gentoo.org/~bicatali/distfiles/R-20130129.bash_completion.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=79b9e1c0f796bd1b1d95d3a9db8d9abd
+_md5_=862477efbc89e189a5843b4b4f62f654
diff --git a/metadata/md5-cache/dev-lang/R-3.4.1 b/metadata/md5-cache/dev-lang/R-3.4.1
index 9552f934a924..bbf44fd32a50 100644
--- a/metadata/md5-cache/dev-lang/R-3.4.1
+++ b/metadata/md5-cache/dev-lang/R-3.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=6
 HOMEPAGE=http://www.r-project.org/
 IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X
-KEYWORDS=amd64 ~hppa ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= net-misc/curl virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) >=sys-libs/zlib-1.2.5.1-r2:0[minizip] java? ( >=virtual/jre-1.5 ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
@@ -12,4 +12,4 @@ RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.4.1.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0f648eea7296e28303dfceed30df3bcc
+_md5_=0a6317247213114be76465557c979ea1
diff --git a/metadata/md5-cache/dev-lang/R-3.5.1 b/metadata/md5-cache/dev-lang/R-3.5.1
index c28efbcec6e9..c73ea29361a6 100644
--- a/metadata/md5-cache/dev-lang/R-3.5.1
+++ b/metadata/md5-cache/dev-lang/R-3.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=6
 HOMEPAGE=http://www.r-project.org/
 IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X
-KEYWORDS=~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~amd64 ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= net-misc/curl virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) >=sys-libs/zlib-1.2.5.1-r2:0[minizip] java? ( >=virtual/jre-1.5 ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
@@ -12,4 +12,4 @@ RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.5.1.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e7c69491d2d4cd0a74ed920f154c5230
+_md5_=2265fe1ba9d20f6f6e442d31c179464f
diff --git a/metadata/md5-cache/dev-lang/execline-2.5.0.1 b/metadata/md5-cache/dev-lang/execline-2.5.0.1
new file mode 100644
index 000000000000..8fb31127ca47
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/execline-2.5.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.7.0.0[static-libs?]
+DESCRIPTION=a non-interactive scripting language
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/execline/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.7.0.0:= )
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/2.5
+SRC_URI=https://www.skarnet.org/software/execline/execline-2.5.0.1.tar.gz
+_md5_=1f31d8adc44e537744fced9bba822065
diff --git a/metadata/md5-cache/dev-lang/ferite-1.1.17-r1 b/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
index 8a48cb89805f..bcf65b8c045f 100644
--- a/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
+++ b/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
@@ -1,12 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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-libs/libpcre-5 dev-libs/libxml2 >=app-portage/elt-patches-20170815 !<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=dev-libs/boehm-gc[threads] >=dev-libs/libpcre-5:3 dev-libs/libxml2:2
 DESCRIPTION=A clean, lightweight, object oriented scripting language
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.ferite.org/
 KEYWORDS=~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
-RDEPEND=>=dev-libs/libpcre-5 dev-libs/libxml2
+RDEPEND=dev-libs/boehm-gc[threads] >=dev-libs/libpcre-5:3 dev-libs/libxml2:2
 SLOT=1
 SRC_URI=mirror://sourceforge/ferite/ferite-1.1.17.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a805a71638c16f72cfb84be11102c35
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d72f26865623c5567107b978b2bd62a8
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r1
new file mode 100644
index 000000000000..b4d4a02778e3
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=!sys-devel/gcc:4.9.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DESCRIPTION=GNAT Ada Compiler - GPL version
+EAPI=5
+HOMEPAGE=http://libre.adacore.com/
+IUSE=bootstrap regression-test vanilla altivec debug nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv +nls +nptl +cxx +fortran +openmp +sanitize
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
+RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= )
+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 ) 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	79f371777ed8aea7eccf4c6b9134e9a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=d735ba1505bb6d965d4ff87a7a546fc4
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r1
new file mode 100644
index 000000000000..2197e49860f7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=!sys-devel/gcc:7.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DESCRIPTION=GNAT Ada Compiler - GPL version
+EAPI=5
+HOMEPAGE=http://libre.adacore.com/
+IUSE=+bootstrap regression-test vanilla altivec debug doc hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
+RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=strip
+SLOT=7.3.1
+SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.6.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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	79f371777ed8aea7eccf4c6b9134e9a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=aa294c17f9c0fb99532179c85b0fa69b
diff --git a/metadata/md5-cache/dev-lang/go-1.11.1 b/metadata/md5-cache/dev-lang/go-1.11.1
new file mode 100644
index 000000000000..27ea7d1b49e4
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install pretend test unpack
+DEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=6
+HOMEPAGE=https://golang.org
+IUSE=gccgo
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=test strip
+SLOT=0/1.11.1
+SRC_URI=https://storage.googleapis.com/golang/go1.11.1.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=69f85a0843f7b100054cd8f1d427291d
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
deleted file mode 100644
index 5901b8319813..000000000000
--- a/metadata/md5-cache/dev-lang/mono-4.6.1.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix )
-DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
-EAPI=6
-HOMEPAGE=https://www.mono-project.com/Main_Page
-IUSE=nls minimal pax_kernel xen doc 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 ~ppc ~ppc64 ~x86 ~amd64-linux
-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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c5234fa44e5f2588ae17d5700c8ae8b4
diff --git a/metadata/md5-cache/dev-lang/mono-5.12.0.226 b/metadata/md5-cache/dev-lang/mono-5.12.0.226
deleted file mode 100644
index a7fa7c1dbb65..000000000000
--- a/metadata/md5-cache/dev-lang/mono-5.12.0.226
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<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=Mono runtime and class libraries, a C# compiler/interpreter
-EAPI=6
-HOMEPAGE=http://www.mono-project.com/Main_Page
-IUSE=nls minimal pax_kernel xen doc 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64
-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 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://download.mono-project.com/sources/mono/mono-5.12.0.226.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7845c344e9c8eea2821f3341df119230
diff --git a/metadata/md5-cache/dev-lang/mono-5.14.0.177 b/metadata/md5-cache/dev-lang/mono-5.14.0.177
index f112af1013b7..2c7e843fe437 100644
--- a/metadata/md5-cache/dev-lang/mono-5.14.0.177
+++ b/metadata/md5-cache/dev-lang/mono-5.14.0.177
@@ -4,11 +4,11 @@ DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
 EAPI=6
 HOMEPAGE=http://www.mono-project.com/Main_Page
 IUSE=nls minimal pax_kernel xen doc 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 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 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-5.14.0.177.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7845c344e9c8eea2821f3341df119230
+_md5_=47870d4f8e96c6fac0b34df09c37e21c
diff --git a/metadata/md5-cache/dev-lang/mono-5.16.0.179-r1 b/metadata/md5-cache/dev-lang/mono-5.16.0.179-r1
new file mode 100644
index 000000000000..8b91ca611cdf
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mono-5.16.0.179-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<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=Mono runtime and class libraries, a C# compiler/interpreter
+EAPI=6
+HOMEPAGE=http://www.mono-project.com/Main_Page
+IUSE=nls minimal pax_kernel xen doc 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 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+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 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://download.mono-project.com/sources/mono/mono-5.16.0.179.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e4d82e7b666bb4efd958a274c1022796
diff --git a/metadata/md5-cache/dev-lang/mono-5.4.1.6 b/metadata/md5-cache/dev-lang/mono-5.4.1.6
deleted file mode 100644
index 5a22c5cfc884..000000000000
--- a/metadata/md5-cache/dev-lang/mono-5.4.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<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=Mono runtime and class libraries, a C# compiler/interpreter
-EAPI=6
-HOMEPAGE=https://www.mono-project.com/Main_Page
-IUSE=nls minimal pax_kernel xen doc 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64
-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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=97da6929f62ec503eed8fc3e81ed55f2
diff --git a/metadata/md5-cache/dev-lang/mono-basic-4.6-r2 b/metadata/md5-cache/dev-lang/mono-basic-4.6-r2
new file mode 100644
index 000000000000..64e9617c5d35
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mono-basic-4.6-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=setup
+DEPEND=dev-lang/mono
+DESCRIPTION=Visual Basic Compiler and Runtime
+EAPI=7
+HOMEPAGE=https://www.mono-project.com/docs/about-mono/languages/visualbasic/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2 MIT
+RDEPEND=dev-lang/mono
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.mono-project.com/sources/mono-basic/mono-basic-4.6.tar.bz2
+_eclasses_=mono-env	1f24c032c78290b0d9a07d5b343051a7
+_md5_=5fe595373970fa960aa07093921ef780
diff --git a/metadata/md5-cache/dev-lang/mono-basic-4.7-r1 b/metadata/md5-cache/dev-lang/mono-basic-4.7-r1
new file mode 100644
index 000000000000..a87e6d60844b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mono-basic-4.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=setup
+DEPEND=dev-lang/mono
+DESCRIPTION=Visual Basic Compiler and Runtime
+EAPI=7
+HOMEPAGE=https://www.mono-project.com/docs/about-mono/languages/visualbasic/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2 MIT
+RDEPEND=dev-lang/mono
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.mono-project.com/sources/mono-basic/mono-basic-4.7.tar.bz2
+_eclasses_=mono-env	1f24c032c78290b0d9a07d5b343051a7
+_md5_=5fe595373970fa960aa07093921ef780
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.4 b/metadata/md5-cache/dev-lang/mujs-1.0.4
index f13393788dd8..6194d89a8ea6 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.4
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.4
@@ -3,9 +3,9 @@ DESCRIPTION=lightweight Javascript interpreter
 EAPI=7
 HOMEPAGE=http://mujs.com/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 SLOT=0
 SRC_URI=https://mujs.com/downloads/mujs-1.0.4.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b6cf04b5a54199603ba1cd3d20aeb9a6
+_md5_=16488a8500e69ccef0ea65ce9a43f596
diff --git a/metadata/md5-cache/dev-lang/php-5.6.36 b/metadata/md5-cache/dev-lang/php-5.6.36
deleted file mode 100644
index c3f53c9dd36d..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.6.36
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 >=app-portage/elt-patches-20170815 !<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=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
-SLOT=5.6
-SRC_URI=https://php.net/distributions/php-5.6.36.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=df61e62eae025b6addf7b321a8449a2f
diff --git a/metadata/md5-cache/dev-lang/php-5.6.38 b/metadata/md5-cache/dev-lang/php-5.6.38
index 4d96c36477ed..04f56ea005fb 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.38
+++ b/metadata/md5-cache/dev-lang/php-5.6.38
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( <dev-libs/icu-61.1:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
 SLOT=5.6
 SRC_URI=https://php.net/distributions/php-5.6.38.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a397e384379dcd97d530860cfe5794e
+_md5_=d425ef7013ae71e9bdeb28f51d087b18
diff --git a/metadata/md5-cache/dev-lang/php-7.0.30 b/metadata/md5-cache/dev-lang/php-7.0.30
deleted file mode 100644
index 92e48e914ce3..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.0.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
-SLOT=7.0
-SRC_URI=https://secure.php.net/distributions/php-7.0.30.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c541e28e1f602e2caf4a29196f246c0
diff --git a/metadata/md5-cache/dev-lang/php-7.0.32 b/metadata/md5-cache/dev-lang/php-7.0.32
index fb5a7050ec9b..9591e452dddc 100644
--- a/metadata/md5-cache/dev-lang/php-7.0.32
+++ b/metadata/md5-cache/dev-lang/php-7.0.32
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( <dev-libs/icu-61.1:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.0
 SRC_URI=https://secure.php.net/distributions/php-7.0.32.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd4fd186b41791ea1a4a91086f041828
+_md5_=b193f877f50e643dae2f7127fc65554e
diff --git a/metadata/md5-cache/dev-lang/php-7.1.18 b/metadata/md5-cache/dev-lang/php-7.1.18
deleted file mode 100644
index 213fedfff463..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.1.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) )
-SLOT=7.1
-SRC_URI=https://secure.php.net/distributions/php-7.1.18.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3c814c8c7a0555165074eb478ec6c49
diff --git a/metadata/md5-cache/dev-lang/php-7.1.22 b/metadata/md5-cache/dev-lang/php-7.1.22
index be23b6566e50..d5d72bdbb0fb 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.22
+++ b/metadata/md5-cache/dev-lang/php-7.1.22
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
 SLOT=7.1
 SRC_URI=https://secure.php.net/distributions/php-7.1.22.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d806935d99abb6deba3671117f25b479
+_md5_=613c44ebbda8e7a18a74c07dc58c9e93
diff --git a/metadata/md5-cache/dev-lang/php-7.1.23 b/metadata/md5-cache/dev-lang/php-7.1.23
new file mode 100644
index 000000000000..8c88132f6cd1
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.1.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
+SLOT=7.1
+SRC_URI=https://secure.php.net/distributions/php-7.1.23.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4ef5a4cf226ca5dba2c08d6ce7b23bfa
diff --git a/metadata/md5-cache/dev-lang/php-7.2.10 b/metadata/md5-cache/dev-lang/php-7.2.10
index a55a13583bf4..d19047140502 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.10
+++ b/metadata/md5-cache/dev-lang/php-7.2.10
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
 SLOT=7.2
 SRC_URI=https://secure.php.net/distributions/php-7.2.10.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=116151c1070c2e413afca3af0cd23b55
+_md5_=9fe96fcf80cee9224ce84fd97a2e8958
diff --git a/metadata/md5-cache/dev-lang/php-7.2.11 b/metadata/md5-cache/dev-lang/php-7.2.11
new file mode 100644
index 000000000000..1e02b53a8950
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.2.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
+SLOT=7.2
+SRC_URI=https://secure.php.net/distributions/php-7.2.11.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7bb6c96a57ab271e1d5d56a477a6bbc4
diff --git a/metadata/md5-cache/dev-lang/php-7.3.0_rc3 b/metadata/md5-cache/dev-lang/php-7.3.0_rc3
new file mode 100644
index 000000000000..e6cfb8853300
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.3.0_rc3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+SLOT=7.3
+SRC_URI=https://downloads.php.net/~cmb/php-7.3.0RC3.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f8afb88e994005d073c01300cd74343d
diff --git a/metadata/md5-cache/dev-lang/python-2.7.15 b/metadata/md5-cache/dev-lang/python-2.7.15
index 433448ae21a8..5e2357290253 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.15
+++ b/metadata/md5-cache/dev-lang/python-2.7.15
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
 IUSE=-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 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.1 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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=763b004925932f414db730c31e446351
+_md5_=4220683be7c15cfa26cb554bc6ae51ed
diff --git a/metadata/md5-cache/dev-lang/ruby-2.3.8 b/metadata/md5-cache/dev-lang/ruby-2.3.8
new file mode 100644
index 000000000000..b32cdf84bc0d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-2.3.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 >=app-portage/elt-patches-20170815 !<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 object-oriented scripting language
+EAPI=5
+HOMEPAGE=https://www.ruby-lang.org/
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23] >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23] >=dev-ruby/rake-10.4.2[ruby_targets_ruby23] >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] >=dev-ruby/json-1.8.3[ruby_targets_ruby23] rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+SLOT=2.3
+SRC_URI=mirror://ruby/2.3/ruby-2.3.8.tar.xz https://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.3.8.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ae679625774116063635e1e89b48ca5a
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.5 b/metadata/md5-cache/dev-lang/ruby-2.4.5
new file mode 100644
index 000000000000..b63d1650f595
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-2.4.5
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+DESCRIPTION=An object-oriented scripting language
+EAPI=7
+HOMEPAGE=https://www.ruby-lang.org/
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+SLOT=2.4
+SRC_URI=mirror://ruby/2.4/ruby-2.4.5.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ee0a086d3c5dd41279cd220a5ec7c6ba
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.3 b/metadata/md5-cache/dev-lang/ruby-2.5.3
new file mode 100644
index 000000000000..7d4b9c5a2285
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-2.5.3
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+DESCRIPTION=An object-oriented scripting language
+EAPI=7
+HOMEPAGE=https://www.ruby-lang.org/
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] virtual/rubygems[ruby_targets_ruby25] >=dev-ruby/json-2.0.2[ruby_targets_ruby25] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby25] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+SLOT=2.5
+SRC_URI=mirror://ruby/2.5/ruby-2.5.3.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b1755770f9e13bfb5742994c398de50c
diff --git a/metadata/md5-cache/dev-lang/rust-1.29.2 b/metadata/md5-cache/dev-lang/rust-1.29.2
new file mode 100644
index 000000000000..b3a0008fb4b8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.29.2
@@ -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 clippy cpu_flags_x86_sse2 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.30.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 ) x86? ( cpu_flags_x86_sse2 )
+SLOT=stable/1.29
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.29.2-src.tar.xz -> rustc-1.29.2-src.tar.xz 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 ) mips? ( https://static.rust-lang.org/dist/rust-1.28.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.28.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.28.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.28.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.28.0-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	rust-toolchain	f9b504d977266122e1891048638138c6	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=eb750f7b38019f793a96ce5793a8db2c
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.29.2 b/metadata/md5-cache/dev-lang/rust-bin-1.29.2
new file mode 100644
index 000000000000..ba44797d6836
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.29.2
@@ -0,0 +1,15 @@
+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 clippy cpu_flags_x86_sse2 doc libressl rustfmt abi_x86_32 abi_x86_64 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.30.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-misc/curl[ssl] )
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.29.2-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.29.2-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.29.2-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.29.2-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.29.2-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.29.2-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.29.2-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.29.2-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	f9b504d977266122e1891048638138c6	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=8653d8e4874a6d9273527445fee16ccb
diff --git a/metadata/md5-cache/dev-lang/solidity-0.4.18 b/metadata/md5-cache/dev-lang/solidity-0.4.18
deleted file mode 100644
index 5d24d56e6aa4..000000000000
--- a/metadata/md5-cache/dev-lang/solidity-0.4.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/jsoncpp-1.8.1:= >=dev-libs/boost-1.54:= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=The Solidity Contract-Oriented Programming Language
-EAPI=6
-HOMEPAGE=https://github.com/ethereum/solidity
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND==dev-libs/jsoncpp-1.8.1:= >=dev-libs/boost-1.54:=
-SLOT=0
-SRC_URI=https://github.com/ethereum/solidity/releases/download/v0.4.18/solidity_0.4.18.tar.gz -> solidity-0.4.18.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d741cbf9c3779b5300c0b97762273e4a
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.17-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.17-r1
new file mode 100644
index 000000000000..b876260cc2c1
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.17-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+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(-)?] >=app-portage/elt-patches-20170815 !<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 Command Language
+EAPI=5
+HOMEPAGE=http://www.tcl.tk/
+IUSE=debug threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=tcltk
+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(-)?]
+SLOT=0/8.5
+SRC_URI=mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=3920a217cd6ac20ea554dde262638ec5
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.17-r101 b/metadata/md5-cache/dev-lang/tcl-8.5.17-r101
new file mode 100644
index 000000000000..b617d939adb4
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.17-r101
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+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(-)?] !=dev-lang/tcl-8.5*:0 >=app-portage/elt-patches-20170815 !<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 Command Language
+EAPI=5
+HOMEPAGE=http://www.tcl.tk/
+IUSE=debug threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=tcltk
+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(-)?] !=dev-lang/tcl-8.5*:0
+SLOT=8.5
+SRC_URI=mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=c22f7eca9872fc6508441e228306804b
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.5 b/metadata/md5-cache/dev-lang/tcl-8.6.5
deleted file mode 100644
index 2f400ba23db5..000000000000
--- a/metadata/md5-cache/dev-lang/tcl-8.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-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(-)?] >=app-portage/elt-patches-20170815 !<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 Command Language
-EAPI=6
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=tcltk
-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(-)?]
-SLOT=0/8.6
-SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.5-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ffa68cb41887f90b190427d7b34c48eb
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.6 b/metadata/md5-cache/dev-lang/tcl-8.6.6
deleted file mode 100644
index 9e78493fc2e3..000000000000
--- a/metadata/md5-cache/dev-lang/tcl-8.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-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(-)?] >=app-portage/elt-patches-20170815 !<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 Command Language
-EAPI=6
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=tcltk
-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(-)?]
-RESTRICT=test
-SLOT=0/8.6
-SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.6-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=80e0480f3a73dd7accce09ea27f1ed22
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.7 b/metadata/md5-cache/dev-lang/tcl-8.6.7
deleted file mode 100644
index f905cbe25bad..000000000000
--- a/metadata/md5-cache/dev-lang/tcl-8.6.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-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(-)?] >=app-portage/elt-patches-20170815 !<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 Command Language
-EAPI=6
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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=tcltk
-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(-)?]
-SLOT=0/8.6
-SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.7-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6f8bbfbe7dbc57ea0c90a793f904f9a9
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.8 b/metadata/md5-cache/dev-lang/tcl-8.6.8
index 1d309f5701e4..caba95da626f 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.8
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.8
@@ -4,10 +4,10 @@ DESCRIPTION=Tool Command Language
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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=tcltk
 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(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.8-src.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=295137492b8dce97deb82213c941d481
+_md5_=af81d65c1601e2fb55fcb49410d557ae
diff --git a/metadata/md5-cache/dev-lang/tk-8.5.17-r1 b/metadata/md5-cache/dev-lang/tk-8.5.17-r1
new file mode 100644
index 000000000000..0e69a6b14662
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/tk-8.5.17-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:0= !aqua? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Tk Widget Set
+EAPI=5
+HOMEPAGE=http://www.tcl.tk/
+IUSE=debug threads truetype aqua xscreensaver test
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=tcltk
+RDEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:0=
+SLOT=0/8.5
+SRC_URI=mirror://sourceforge/tcl/tk8.5.17-src.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=8d5660780f7978afd6733ce49db95f81
diff --git a/metadata/md5-cache/dev-lang/tk-8.5.17-r101 b/metadata/md5-cache/dev-lang/tk-8.5.17-r101
new file mode 100644
index 000000000000..33b36982abe6
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/tk-8.5.17-r101
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:8.5= !=dev-lang/tk-8.5:0 !aqua? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Tk Widget Set
+EAPI=5
+HOMEPAGE=http://www.tcl.tk/
+IUSE=debug threads truetype aqua xscreensaver test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=tcltk
+RDEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:8.5= !=dev-lang/tk-8.5:0
+SLOT=8.5
+SRC_URI=mirror://sourceforge/tcl/tk8.5.17-src.tar.gz mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=1dde756f7b6c64d0fbabcd37fee4a0bb
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.5 b/metadata/md5-cache/dev-lang/tk-8.6.5
deleted file mode 100644
index b9c65295ff8c..000000000000
--- a/metadata/md5-cache/dev-lang/tk-8.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Tk Widget Set
-EAPI=6
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug +threads truetype aqua xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=tcltk
-RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/8.6
-SRC_URI=mirror://sourceforge/tcl/tk8.6.5-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=b80ff4b86e0177ab67274e2655f4c198
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.5-r1 b/metadata/md5-cache/dev-lang/tk-8.6.5-r1
deleted file mode 100644
index e385621a4399..000000000000
--- a/metadata/md5-cache/dev-lang/tk-8.6.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Tk Widget Set
-EAPI=6
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug +threads truetype aqua xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=tcltk
-RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/8.6
-SRC_URI=mirror://sourceforge/tcl/tk8.6.5-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=be3a369bfe9f5e3306e6d0b75c32fe0c
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.6 b/metadata/md5-cache/dev-lang/tk-8.6.6
deleted file mode 100644
index 840e467b399a..000000000000
--- a/metadata/md5-cache/dev-lang/tk-8.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Tk Widget Set
-EAPI=6
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug +threads truetype aqua xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-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=tcltk
-RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/8.6
-SRC_URI=mirror://sourceforge/tcl/tk8.6.6-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=104769f489f1395780a88cb696f92130
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.7 b/metadata/md5-cache/dev-lang/tk-8.6.7
deleted file mode 100644
index 6767e0231c1b..000000000000
--- a/metadata/md5-cache/dev-lang/tk-8.6.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.7: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-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Tk Widget Set
-EAPI=6
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug +threads truetype aqua xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-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=tcltk
-RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.7: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=0/8.6
-SRC_URI=mirror://sourceforge/tcl/tk8.6.7-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=1f7a481587db6d996272d81352194a9e
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.8 b/metadata/md5-cache/dev-lang/tk-8.6.8
index e9bf973e0144..d0c5db82d9af 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.8
+++ b/metadata/md5-cache/dev-lang/tk-8.6.8
@@ -4,10 +4,10 @@ DESCRIPTION=Tk Widget Set
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug +threads truetype aqua xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=tcltk
 RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) ~dev-lang/tcl-8.6.8: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=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.8-src.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=2f0f54438d01bace2d0304e6b47a7eda
+_md5_=7197eab77e3538200c544775c34eeca6
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4f119dff2b89..9e24a8ef66af 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/actor-framework-0.13.2 b/metadata/md5-cache/dev-libs/actor-framework-0.13.2
index f07dd3d77776..a070ecc300cd 100644
--- a/metadata/md5-cache/dev-libs/actor-framework-0.13.2
+++ b/metadata/md5-cache/dev-libs/actor-framework-0.13.2
@@ -10,5 +10,5 @@ RDEPEND=boost? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=cash? ( riac )
 SLOT=0/13.2
 SRC_URI=https://github.com/actor-framework/actor-framework/archive/0.13.2.tar.gz -> actor-framework-0.13.2.tar.gz benchmarks? ( https://github.com/actor-framework/benchmarks/archive/78c746269bb53ff0b2026e7b1a8fe11fabc69e64.tar.gz -> CAF_0.13.2-benchmarks.tar.gz ) cash? ( https://github.com/actor-framework/cash/archive/847edfb18afa6b755a91a203872bcd66bbeb5868.tar.gz -> CAF_0.13.2-cash.tar.gz https://github.com/Neverlord/sash/archive/9da5a40793d77e7f6d3afb504cf02c0acb59d35c.tar.gz -> CAF_0.13.2-sash_cash.tar.gz ) nexus? ( https://github.com/actor-framework/nexus/archive/90d42335ff3a2fe67ac4ae41a844f0b245bb123c.tar.gz -> CAF_0.13.2-nexus.tar.gz ) opencl? ( https://github.com/actor-framework/opencl/archive/91ebbda2986f3f32a873d02ca5eb550f26c6b70d.tar.gz -> CAF_0.13.2-opencl.tar.gz ) riac? ( https://github.com/actor-framework/riac/archive/855e725739b7688290f66f592f858149c92375c5.tar.gz -> CAF_0.13.2-riac.tar.gz )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=95ce4375d04d40d3a96f881899e08a5d
diff --git a/metadata/md5-cache/dev-libs/actor-framework-0.14.5 b/metadata/md5-cache/dev-libs/actor-framework-0.14.5
index f4c6c955e654..8230bbe1dad7 100644
--- a/metadata/md5-cache/dev-libs/actor-framework-0.14.5
+++ b/metadata/md5-cache/dev-libs/actor-framework-0.14.5
@@ -10,5 +10,5 @@ RDEPEND=boost? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=cash? ( riac )
 SLOT=0/14.5
 SRC_URI=https://github.com/actor-framework/actor-framework/archive/0.14.5.tar.gz -> actor-framework-0.14.5.tar.gz benchmarks? ( https://github.com/actor-framework/benchmarks/archive/2c45d8c1c2b934e062baf378809201ac66d169a7.tar.gz -> CAF_0.14.5-benchmarks.tar.gz ) cash? ( https://github.com/actor-framework/cash/archive/38bcdedf7df5536899dd4373969e6653380d2a86.tar.gz -> CAF_0.14.5-cash.tar.gz https://github.com/Neverlord/sash/archive/75e68c37ccafbcb7b7da8c0afe564d59bcf10594.tar.gz -> CAF_0.14.5-sash_cash.tar.gz ) nexus? ( https://github.com/actor-framework/nexus/archive/254fbf76f83bb06e6001943b78838644345211a4.tar.gz -> CAF_0.14.5-nexus.tar.gz ) opencl? ( https://github.com/actor-framework/opencl/archive/200eb3f43fb243515d0652324e6d606dede3f676.tar.gz -> CAF_0.14.5-opencl.tar.gz ) riac? ( https://github.com/actor-framework/riac/archive/83de14803c841a7113c4b13c94624a55f3eec984.tar.gz -> CAF_0.14.5-riac.tar.gz )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d5ba0b8c4e6df30a3f1e5a9dceb73bf
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.6.13 b/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
index e1bd0c3a9649..b22acb25fb70 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
@@ -4,10 +4,10 @@ DESCRIPTION=Provides GObjects and helper methods to read and write AppStream met
 EAPI=6
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
 IUSE=+introspection nls stemmer
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-arch/gcab app-arch/libarchive dev-db/sqlite:3 >=dev-libs/glib-2.45.8:2 >=dev-libs/json-glib-1.1.1 dev-libs/libyaml >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.4:2 >=net-libs/libsoup-2.51.92:2.4 sys-apps/util-linux >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] x11-libs/gtk+:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) stemmer? ( dev-libs/snowball-stemmer ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.6.13.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b44a06bf60b5d3ac0eec917dce88c0e3
+_md5_=16e3f3763117520a45c7e6371a53def0
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.9 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
index ca03170f1fcc..95d212843dfd 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
@@ -4,10 +4,10 @@ DESCRIPTION=Provides GObjects and helper methods to read and write AppStream met
 EAPI=6
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
 IUSE=doc +introspection stemmer
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] app-arch/gcab x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.9.tar.xz
 _eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=82ab10f4755fac4a44e0761f8945e5d2
+_md5_=47ef755c85543f1a6da474e3cff1aadf
diff --git a/metadata/md5-cache/dev-libs/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0
index cbd3fc983bce..163a0fc3d30a 100644
--- a/metadata/md5-cache/dev-libs/atcore-1.0.0
+++ b/metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 gui? ( >=dev-qt/qtcharts-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 ) >=kde-frameworks/extra-cmake-modules-5.46.0 >=dev-qt/linguist-tools-5.9.4:5 doc? ( app-doc/doxygen[dot] ) test? ( >=dev-qt/qttest-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 gui? ( >=dev-qt/qtcharts-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 ) >=kde-frameworks/extra-cmake-modules-5.50.0 >=dev-qt/linguist-tools-5.9.4:5 doc? ( app-doc/doxygen[dot] ) test? ( >=dev-qt/qttest-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=API to manage the serial connection between the computer and 3D Printers
 EAPI=6
 HOMEPAGE=https://atelier.kde.org/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ )
 RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 gui? ( >=dev-qt/qtcharts-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 )
 SLOT=0
 SRC_URI=mirror://kde/stable/atcore/1.0.0/atcore-1.0.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0421301772e3d1e0621937ae8a9493b2
diff --git a/metadata/md5-cache/dev-libs/atf-0.21-r2 b/metadata/md5-cache/dev-libs/atf-0.21-r2
index 638d364b4658..4da78df38918 100644
--- a/metadata/md5-cache/dev-libs/atf-0.21-r2
+++ b/metadata/md5-cache/dev-libs/atf-0.21-r2
@@ -3,8 +3,8 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Libraries to write tests in C, C++ and shell
 EAPI=6
 HOMEPAGE=https://github.com/jmmv/atf
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=https://github.com/jmmv/atf/releases/download/atf-0.21/atf-0.21.tar.gz
-_md5_=c2c0f96f8c90482a14705eb5a64e57c6
+_md5_=b732ef3a4316fbbb5b71010a5bfe3aa5
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r5 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r5
index a8ddbde38027..2a2dadb65425 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r5
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r5
@@ -4,11 +4,11 @@ DESCRIPTION=General-purpose cryptography library
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/beecrypt/
 IUSE=+threads java cxx python static-libs doc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-6.1:= ) 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(+)] ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cxx? ( threads ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=15b358bf6d5aec25c3eef7d3cc204c58
+_md5_=24b119648fb3cde9d99302490a359154
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2 b/metadata/md5-cache/dev-libs/beignet-1.3.2
index d3783c733517..d4443c480710 100644
--- a/metadata/md5-cache/dev-libs/beignet-1.3.2
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-devel/clang-6.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-eselect/eselect-opencl
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bc54ea18c207c69648bbba7cc3b7f68b
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 4716d7af261d..74d838e6c620 100644
--- a/metadata/md5-cache/dev-libs/beignet-1.3.2-r1
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-devel/clang-6.0.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-eselect/eselect-opencl
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=deebe6931d12aafc2f49f4f2e148576a
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2-r2 b/metadata/md5-cache/dev-libs/beignet-1.3.2-r2
index 20f2dbfef3ca..547ac2292fbc 100644
--- a/metadata/md5-cache/dev-libs/beignet-1.3.2-r2
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.2-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=app-eselect/eselect-opencl media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-devel/clang-6.0.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ocl-icd? ( dev-libs/ocl-icd )
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac07311900560eaf74d5bee29a87e346
diff --git a/metadata/md5-cache/dev-libs/beignet-9999 b/metadata/md5-cache/dev-libs/beignet-9999
index 3ceb7edb99a9..8b2e79de010b 100644
--- a/metadata/md5-cache/dev-libs/beignet-9999
+++ b/metadata/md5-cache/dev-libs/beignet-9999
@@ -7,5 +7,5 @@ IUSE=ocl-icd ocl20 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 a
 LICENSE=LGPL-2.1+
 RDEPEND=media-libs/mesa sys-devel/clang:= sys-devel/llvm:= >=x11-libs/libdrm-2.4.70[video_cards_intel] x11-libs/libXext x11-libs/libXfixes app-eselect/eselect-opencl
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e90fdbc23a2131ab6144c2864d9000fe
diff --git a/metadata/md5-cache/dev-libs/botan-2.8.0 b/metadata/md5-cache/dev-libs/botan-2.8.0
new file mode 100644
index 000000000000..bae693d1a98c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/botan-2.8.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/python:* doc? ( dev-python/sphinx )
+DEFINED_PHASES=configure install test
+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 ) 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 C++ crypto library
+EAPI=7
+HOMEPAGE=https://botan.randombit.net/
+IUSE=bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+LICENSE=BSD
+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 ) 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(-)] ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) zlib? ( >=sys-libs/zlib-1.2.3:= ) boost? ( >=dev-libs/boost-1.48:= ) lzma? ( app-arch/xz-utils:= ) sqlite? ( dev-db/sqlite:3= ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=2/2.8
+SRC_URI=https://botan.randombit.net/releases/Botan-2.8.0.tgz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5ba561c5eb0cd37784258b36e6ab7a4e
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.110 b/metadata/md5-cache/dev-libs/dbus-glib-0.110
index 994dfa22392b..65e09cda1145 100644
--- a/metadata/md5-cache/dev-libs/dbus-glib-0.110
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.110
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus bindings for glib
 EAPI=6
 HOMEPAGE=https://dbus.freedesktop.org/
 IUSE=debug static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 AFL-2.1 )
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40: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.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a77ee91777e82297347acaee204d6765
+_md5_=28a45982d498b6efa14116b0ddbf3f11
diff --git a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.3 b/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.3
index b121f77dec0e..24d41ee363e6 100644
--- a/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.3
+++ b/metadata/md5-cache/dev-libs/device-atlas-api-c-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 RESTRICT=fetch mirror bindist
 SLOT=0
 SRC_URI=deviceatlas-enterprise-c-2.1.3.tgz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=213f9c18c1eed9dd8dd58e052c22b565
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 62b12c1ed7e1..7478209ec5b9 100644
--- a/metadata/md5-cache/dev-libs/efl-1.20.7-r1
+++ b/metadata/md5-cache/dev-libs/efl-1.20.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=6
 HOMEPAGE=https://www.enlightenment.org/
 IUSE=avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
 RDEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( >=media-video/vlc-3.0.0 ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) !media-libs/elementary !media-plugins/emotion_generic_players !media-plugins/evas_generic_loaders
 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=19896ac0bcb4f1f9b60148bea6d9bc5c
+_md5_=5e46368af31bf295127d2bc74c51c268
diff --git a/metadata/md5-cache/dev-libs/efl-1.21.0 b/metadata/md5-cache/dev-libs/efl-1.21.0
deleted file mode 100644
index b63bbcb1665d..000000000000
--- a/metadata/md5-cache/dev-libs/efl-1.21.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
-EAPI=6
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=avahi +bmp dds connman debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) !media-libs/elementary !media-plugins/emotion_generic_players !media-plugins/evas_generic_loaders
-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.21.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4f8468f0c9065f50dd2a81af175b94a5
diff --git a/metadata/md5-cache/dev-libs/efl-1.21.1 b/metadata/md5-cache/dev-libs/efl-1.21.1
index c36c2b747e6c..6ab8bf49a857 100644
--- a/metadata/md5-cache/dev-libs/efl-1.21.1
+++ b/metadata/md5-cache/dev-libs/efl-1.21.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig >=sys-apps/sed-4
+DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) virtual/pkgconfig >=sys-apps/sed-4
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=6
 HOMEPAGE=https://www.enlightenment.org
 IUSE=avahi +bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm )
-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 )
+RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent )
+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 ) xpresent? ( X )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.21.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b9388b73dc4fc279a176620bc28b02c2
+_md5_=21ef4105bc10d283a1d5fe444ed179b3
diff --git a/metadata/md5-cache/dev-libs/ell-0.11 b/metadata/md5-cache/dev-libs/ell-0.11
new file mode 100644
index 000000000000..fa2e36e94a22
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ell-0.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=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(-)?] )
+DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
+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 ~arm ~ppc ~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.11.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=66aa166e0b59f09664b963228aadb539
diff --git a/metadata/md5-cache/dev-libs/ell-0.5 b/metadata/md5-cache/dev-libs/ell-0.5
deleted file mode 100644
index bb6ca8d0b59d..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=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(-)?] )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-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 ~arm ~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.5.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=97cc590f47e66263418a39574b8cb481
diff --git a/metadata/md5-cache/dev-libs/ell-0.6-r1 b/metadata/md5-cache/dev-libs/ell-0.6-r1
deleted file mode 100644
index 96a621521fc4..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=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(-)?] )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-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 ~ppc ~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	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6a7d0b0e66b4dabdc1964e8315903ece
diff --git a/metadata/md5-cache/dev-libs/ell-0.9 b/metadata/md5-cache/dev-libs/ell-0.9
index 84482df95bb4..75d43cc6c880 100644
--- a/metadata/md5-cache/dev-libs/ell-0.9
+++ b/metadata/md5-cache/dev-libs/ell-0.9
@@ -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 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~ppc ~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.9.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=facfd4bf85b287c381530ab24f80e0f1
+_md5_=a8ba9c920b5d7178e75adceedcdcc3d7
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.8.0-r1 b/metadata/md5-cache/dev-libs/flatbuffers-1.8.0-r1
deleted file mode 100644
index 74649eaf96fe..000000000000
--- a/metadata/md5-cache/dev-libs/flatbuffers-1.8.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Memory efficient serialization library
-EAPI=6
-HOMEPAGE=https://google.github.io/flatbuffers/
-IUSE=static-libs test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/google/flatbuffers/archive/v1.8.0.tar.gz -> flatbuffers-1.8.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d468bbbb50e8f14a77e5554d3a1a09e5
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.9.0 b/metadata/md5-cache/dev-libs/flatbuffers-1.9.0
deleted file mode 100644
index a55db29f22eb..000000000000
--- a/metadata/md5-cache/dev-libs/flatbuffers-1.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Memory efficient serialization library
-EAPI=6
-HOMEPAGE=https://google.github.io/flatbuffers/
-IUSE=static-libs test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz -> flatbuffers-1.9.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d468bbbb50e8f14a77e5554d3a1a09e5
diff --git a/metadata/md5-cache/dev-libs/girara-0.2.7 b/metadata/md5-cache/dev-libs/girara-0.2.7
deleted file mode 100644
index 630fd325ce48..000000000000
--- a/metadata/md5-cache/dev-libs/girara-0.2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=>=dev-libs/glib-2.28 >=x11-libs/gtk+-3.4:3 dev-libs/json-c !<dev-libs/girara-0.1.6 libnotify? ( >=x11-libs/libnotify-0.7 ) sys-devel/gettext virtual/pkgconfig test? ( x11-apps/xhost dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=UI library that focuses on simplicity and minimalism
-EAPI=5
-HOMEPAGE=https://pwmt.org/projects/girara/
-IUSE=libnotify static-libs test test
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=>=dev-libs/glib-2.28 >=x11-libs/gtk+-3.4:3 dev-libs/json-c !<dev-libs/girara-0.1.6 libnotify? ( >=x11-libs/libnotify-0.7 )
-SLOT=3
-SRC_URI=https://pwmt.org/projects/girara/download/girara-0.2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=0508bbe32919f5ed844c058b5cf9c691
diff --git a/metadata/md5-cache/dev-libs/girara-0.2.8 b/metadata/md5-cache/dev-libs/girara-0.2.8
index 1da4acade671..bb16c897f5e8 100644
--- a/metadata/md5-cache/dev-libs/girara-0.2.8
+++ b/metadata/md5-cache/dev-libs/girara-0.2.8
@@ -7,7 +7,7 @@ IUSE=libnotify static-libs test test
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=>=dev-libs/glib-2.28 >=x11-libs/gtk+-3.4:3 dev-libs/json-c !<dev-libs/girara-0.1.6 libnotify? ( >=x11-libs/libnotify-0.7 )
-SLOT=3
+SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.2.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=0508bbe32919f5ed844c058b5cf9c691
+_md5_=6b04730dd544a51f4c0e19419e32d051
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.1 b/metadata/md5-cache/dev-libs/girara-0.3.1
new file mode 100644
index 000000000000..1624860159cb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/girara-0.3.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify ) doc? ( app-doc/doxygen ) test? ( dev-libs/check )
+DESCRIPTION=UI library that focuses on simplicity and minimalism
+EAPI=7
+HOMEPAGE=https://pwmt.org/projects/girara/
+IUSE=doc libnotify test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ZLIB
+RDEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
+SLOT=0
+SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.1.tar.xz
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=203ac9a4b50e74e01fe64130087dcca9
diff --git a/metadata/md5-cache/dev-libs/girara-9999 b/metadata/md5-cache/dev-libs/girara-9999
index e0718a1c44f0..260f2a923392 100644
--- a/metadata/md5-cache/dev-libs/girara-9999
+++ b/metadata/md5-cache/dev-libs/girara-9999
@@ -6,6 +6,6 @@ HOMEPAGE=https://pwmt.org/projects/girara/
 IUSE=libnotify static-libs test test
 LICENSE=ZLIB
 RDEPEND=>=dev-libs/glib-2.28 >=x11-libs/gtk+-3.4:3 !<dev-libs/girara-0.1.6 libnotify? ( >=x11-libs/libnotify-0.7 )
-SLOT=3
+SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=cd0d10ad6560e1146a2513396c141ca5
+_md5_=ab17e8d1252c5accf3d56f1463d31e37
diff --git a/metadata/md5-cache/dev-libs/icu-61.1 b/metadata/md5-cache/dev-libs/icu-61.1
deleted file mode 100644
index 6f3d49787f9a..000000000000
--- a/metadata/md5-cache/dev-libs/icu-61.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170815 !<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=International Components for Unicode
-EAPI=6
-HOMEPAGE=http://www.icu-project.org/
-IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=BSD
-SLOT=0/61.1
-SRC_URI=http://download.icu-project.org/files/icu4c/61.1/icu4c-61_1-src.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=115a1c21c6dab1dd958d06a3d4f89a33
diff --git a/metadata/md5-cache/dev-libs/icu-63.1 b/metadata/md5-cache/dev-libs/icu-63.1
new file mode 100644
index 000000000000..77a25e9dfc79
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icu-63.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=compile configure install prepare pretend test
+DEPEND=doc? ( app-doc/doxygen[dot] )
+DESCRIPTION=International Components for Unicode
+EAPI=7
+HOMEPAGE=http://www.icu-project.org/
+IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=BSD
+SLOT=0/63.1
+SRC_URI=http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=985a85fcf2e8480a1aac234c3fa97901
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-61.1 b/metadata/md5-cache/dev-libs/icu-layoutex-61.1
deleted file mode 100644
index 507cad88a6ec..000000000000
--- a/metadata/md5-cache/dev-libs/icu-layoutex-61.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] ~dev-libs/icu-61.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 !<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=External layout part of International Components for Unicode
-EAPI=6
-HOMEPAGE=http://www.icu-project.org/
-IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=~dev-libs/icu-61.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/61.1
-SRC_URI=http://download.icu-project.org/files/icu4c/61.1/icu4c-61_1-src.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=325b55e0976d5434ee613d642f3710a6
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-63.1 b/metadata/md5-cache/dev-libs/icu-layoutex-63.1
new file mode 100644
index 000000000000..d3ec24ab60f3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-63.1
@@ -0,0 +1,14 @@
+BDEPEND=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-20170815 !<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=compile configure install prepare test
+DEPEND=~dev-libs/icu-63.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=External layout part of International Components for Unicode
+EAPI=7
+HOMEPAGE=http://www.icu-project.org/
+IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=~dev-libs/icu-63.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/63.1
+SRC_URI=http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=cd303efe9555e45f8a17418e5656b12b
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.2 b/metadata/md5-cache/dev-libs/ivykis-0.42.2
index ad721ad496d7..5f3caa69696e 100644
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.2
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Library for asynchronous I/O readiness notification
 EAPI=6
 HOMEPAGE=https://github.com/buytenh/ivykis
-KEYWORDS=amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.2.tar.gz -> ivykis-0.42.2.tar.gz
-_md5_=9883528ca7ee9c0b04bc94bbbd9b338c
+_md5_=32f378dbdfcfe9bd96f874290321ca0b
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1 b/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
index 53fb9a01694e..85901511d846 100644
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Library for asynchronous I/O readiness notification
 EAPI=6
 HOMEPAGE=https://github.com/buytenh/ivykis
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.3.tar.gz -> ivykis-0.42.3.tar.gz
-_md5_=f80f28ccd83febb3ac6ab77b5e430b22
+_md5_=df3a7d4d7128d3c6a14b17a52a18342e
diff --git a/metadata/md5-cache/dev-libs/jthread-1.3.3 b/metadata/md5-cache/dev-libs/jthread-1.3.3
index 62c4c329aa5d..d822a453ce68 100644
--- a/metadata/md5-cache/dev-libs/jthread-1.3.3
+++ b/metadata/md5-cache/dev-libs/jthread-1.3.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0/1.3.3
 SRC_URI=http://research.edm.uhasselt.be/jori/jthread/jthread-1.3.3.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c75a7a699120e1a5d96e615f4f026a2c
diff --git a/metadata/md5-cache/dev-libs/kasync-0.2.0 b/metadata/md5-cache/dev-libs/kasync-0.2.0
index 439579192d6d..3f8253ad3e92 100644
--- a/metadata/md5-cache/dev-libs/kasync-0.2.0
+++ b/metadata/md5-cache/dev-libs/kasync-0.2.0
@@ -1,13 +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 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+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.50.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=C++ library for controlling asynchronous tasks
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kasync/0.2.0/src/kasync-0.2.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82624b9e928c29220ad8738c147c1973
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.6.0 b/metadata/md5-cache/dev-libs/kdiagram-2.6.0
deleted file mode 100644
index 48a80398bfc7..000000000000
--- a/metadata/md5-cache/dev-libs/kdiagram-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/linguist-tools-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 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=Powerful libraries (KChart, KGantt) for creating business diagrams
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug examples test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-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
-REQUIRED_USE=test? ( examples )
-SLOT=5
-SRC_URI=mirror://kde/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8ff524b4f8ceb51cd1f15e9d6400bac5
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.6.1 b/metadata/md5-cache/dev-libs/kdiagram-2.6.1
index b115137d64ad..3af7398840f6 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.6.1
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.6.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/linguist-tools-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 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/linguist-tools-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.50.0:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Powerful libraries (KChart, KGantt) for creating business diagrams
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug examples doc test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-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 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 REQUIRED_USE=test? ( examples )
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiagram/2.6.1/kdiagram-2.6.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ffd77dadac8c3eff66b94196247591d7
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=388ef3e3915e27dc258da749bb334c3b
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.1.0 b/metadata/md5-cache/dev-libs/kproperty-3.1.0
index 215e4c32225e..57a011bf8f75 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.1.0
+++ b/metadata/md5-cache/dev-libs/kproperty-3.1.0
@@ -1,14 +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/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.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=Property editing framework with editor widget similar to Qt Designer
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f9623d6404f02769ee4f8b5e67e861d
diff --git a/metadata/md5-cache/dev-libs/kreport-3.1.0 b/metadata/md5-cache/dev-libs/kreport-3.1.0
index 212b5a63ba16..c61c6481d932 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.1.0
+++ b/metadata/md5-cache/dev-libs/kreport-3.1.0
@@ -1,14 +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/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-libs/kproperty-3.1.0:5= marble? ( >=kde-apps/marble-17.12.3:5= ) scripting? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) 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.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-libs/kproperty-3.1.0:5= marble? ( >=kde-apps/marble-18.04.3:5= ) scripting? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) 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.50.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=Framework for creation and generation of reports in multiple formats
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=marble +scripting webkit test debug test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-libs/kproperty-3.1.0:5= marble? ( >=kde-apps/marble-17.12.3:5= ) scripting? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1: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
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-libs/kproperty-3.1.0:5= marble? ( >=kde-apps/marble-18.04.3:5= ) scripting? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=65681b5946185d651f2744c1f610c5c2
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.4.2-r1 b/metadata/md5-cache/dev-libs/leatherman-1.4.2-r1
deleted file mode 100644
index 2e03187ed35d..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.4.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.54:=[nls] net-misc/curl >=sys-devel/gcc-4.8:* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A C++ toolkit
-EAPI=6
-HOMEPAGE=https://github.com/puppetlabs/leatherman
-IUSE=debug static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=net-misc/curl
-SLOT=0/1.4.2
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.4.2.tar.gz -> leatherman-1.4.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=790a8789cae6d26f55edf324a352bc1d
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.4.3 b/metadata/md5-cache/dev-libs/leatherman-1.4.3
deleted file mode 100644
index c6e3ddd3ee9e..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.54:=[nls] net-misc/curl >=sys-devel/gcc-4.8:* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A C++ toolkit
-EAPI=6
-HOMEPAGE=https://github.com/puppetlabs/leatherman
-IUSE=debug static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=net-misc/curl
-SLOT=0/1.4.3
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.4.3.tar.gz -> leatherman-1.4.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=aa656fff1548aabbe7783b154a2f6bb3
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.4.4 b/metadata/md5-cache/dev-libs/leatherman-1.4.4
new file mode 100644
index 000000000000..72ac35f69590
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/leatherman-1.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/boost-1.54:=[nls] net-misc/curl >=sys-devel/gcc-4.8:* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A C++ toolkit
+EAPI=6
+HOMEPAGE=https://github.com/puppetlabs/leatherman
+IUSE=debug static-libs test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=net-misc/curl
+SLOT=0/1.4.4
+SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.4.4.tar.gz -> leatherman-1.4.4.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=aa656fff1548aabbe7783b154a2f6bb3
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.5.1 b/metadata/md5-cache/dev-libs/leatherman-1.5.1
deleted file mode 100644
index ce870f1fb4bb..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.54:=[nls] net-misc/curl >=sys-devel/gcc-4.8:* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A C++ toolkit
-EAPI=6
-HOMEPAGE=https://github.com/puppetlabs/leatherman
-IUSE=debug static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=net-misc/curl
-SLOT=0/1.5.1
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.5.1.tar.gz -> leatherman-1.5.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=aa656fff1548aabbe7783b154a2f6bb3
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.5.2 b/metadata/md5-cache/dev-libs/leatherman-1.5.2
new file mode 100644
index 000000000000..972dde8a1b42
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/leatherman-1.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/boost-1.54:=[nls] net-misc/curl >=sys-devel/gcc-4.8:* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A C++ toolkit
+EAPI=6
+HOMEPAGE=https://github.com/puppetlabs/leatherman
+IUSE=debug static-libs test
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
+LICENSE=Apache-2.0
+RDEPEND=net-misc/curl
+SLOT=0/1.5.2
+SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.5.2.tar.gz -> leatherman-1.5.2.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c02fe143683c0c3f2e4585ca060cc6c7
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r201 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r201
index 87bbd7db03f7..2ad0c91e3105 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r201
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r201
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b567929979f8cea5d3d8478aa0569043
+_md5_=da5b16e9448aa5fc814e1d512b963543
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
index c7b9a25e0f5b..390d22028b6b 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
@@ -4,10 +4,10 @@ DESCRIPTION=A library to allow applications to export a menu into the Unity Menu
 EAPI=6
 HOMEPAGE=https://launchpad.net/libappindicator
 IUSE=+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
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,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.26: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/libdbusmenu-0.6.2[gtk3,abi_x86_32(-)?,abi_x86_64(-)?,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/libindicator-12.10.0: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/gtk+-3.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(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=3
 SRC_URI=https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e8c33045ef5de7ed009cab0576453b39
+_md5_=6eef13a60b7a791756f2e2c12b993d1e
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.6 b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.6
index d9a709a4a16a..ac33e6bf1733 100644
--- a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.6
+++ b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.6
@@ -3,9 +3,9 @@ DESCRIPTION=Implementation for atomic memory update operations
 EAPI=6
 HOMEPAGE=https://github.com/ivmai/libatomic_ops/
 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT boehm-gc GPL-2+
 SLOT=0
 SRC_URI=https://github.com/ivmai/libatomic_ops/releases/download/v7.6.6/libatomic_ops-7.6.6.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3782129203a9072901f515e1744bec1a
+_md5_=944c1724d4ba900ba5fe2b7d1353cd6d
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.9.1 b/metadata/md5-cache/dev-libs/libbsd-0.9.1
index 45d24d256a10..4aba4b2ad8cc 100644
--- a/metadata/md5-cache/dev-libs/libbsd-0.9.1
+++ b/metadata/md5-cache/dev-libs/libbsd-0.9.1
@@ -4,9 +4,9 @@ DESCRIPTION=An library to provide useful functions commonly found on BSD systems
 EAPI=6
 HOMEPAGE=https://libbsd.freedesktop.org/wiki/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 BSD-4 ISC
 SLOT=0
 SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.9.1.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=763941135190e6e9e139310b0c13cae7
+_md5_=03680fb7db0a508865aa85b42147e274
diff --git a/metadata/md5-cache/dev-libs/libburn-1.5.0 b/metadata/md5-cache/dev-libs/libburn-1.5.0
new file mode 100644
index 000000000000..9e5f7916f615
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libburn-1.5.0
@@ -0,0 +1,11 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DESCRIPTION=Open-source library for reading, mastering and writing optical discs
+EAPI=7
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+IUSE=debug static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://files.libburnia-project.org/releases/libburn-1.5.0.tar.gz
+_md5_=32e1bb92aa8dca3b10970f9c5c3d90aa
diff --git a/metadata/md5-cache/dev-libs/libcss-0.6.1 b/metadata/md5-cache/dev-libs/libcss-0.6.1
deleted file mode 100644
index c7ee857046f9..000000000000
--- a/metadata/md5-cache/dev-libs/libcss-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.4.0[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(-)?] virtual/pkgconfig test? ( dev-lang/perl ) virtual/pkgconfig
-DESCRIPTION=CSS parser and selection engine, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libcss/
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.4.0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/0.6.1
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libcss-0.6.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e4d4424a24bfbd958aa4c67dacc9f5b
diff --git a/metadata/md5-cache/dev-libs/libcss-0.7.0 b/metadata/md5-cache/dev-libs/libcss-0.7.0
deleted file mode 100644
index d8dc688a680b..000000000000
--- a/metadata/md5-cache/dev-libs/libcss-0.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.4.0[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(-)?] virtual/pkgconfig test? ( dev-lang/perl ) virtual/pkgconfig
-DESCRIPTION=CSS parser and selection engine, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libcss/
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.4.0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/0.7.0
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libcss-0.7.0-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.6.tar.gz -> netsurf-buildsystem-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b9826379e9388609121f44c5f34e028d
diff --git a/metadata/md5-cache/dev-libs/libcss-0.8.0 b/metadata/md5-cache/dev-libs/libcss-0.8.0
new file mode 100644
index 000000000000..dfe7b8b9a978
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcss-0.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.4.0[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(-)?] virtual/pkgconfig test? ( dev-lang/perl ) virtual/pkgconfig
+DESCRIPTION=CSS parser and selection engine, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/libcss/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
+LICENSE=MIT
+RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.4.0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/0.8.0
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libcss-0.8.0-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6a04e29aa83f68556fbdab988a818bdc
diff --git a/metadata/md5-cache/dev-libs/libcxml-0.15.1 b/metadata/md5-cache/dev-libs/libcxml-0.15.1
index 5592a963f106..72a7ca10f097 100644
--- a/metadata/md5-cache/dev-libs/libcxml-0.15.1
+++ b/metadata/md5-cache/dev-libs/libcxml-0.15.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/libxmlpp:2.6 dev-libs/boost
 SLOT=0
 SRC_URI=http://carlh.net/downloads/libcxml/libcxml-0.15.1.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=f0d53ccc7d9b495bcfc20eb494003a2b
diff --git a/metadata/md5-cache/dev-libs/libcxml-0.15.4 b/metadata/md5-cache/dev-libs/libcxml-0.15.4
index 3349245d58f7..a685d7954012 100644
--- a/metadata/md5-cache/dev-libs/libcxml-0.15.4
+++ b/metadata/md5-cache/dev-libs/libcxml-0.15.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/libxmlpp:2.6 dev-libs/boost dev-libs/locked_sstream
 SLOT=0
 SRC_URI=http://carlh.net/downloads/libcxml/libcxml-0.15.4.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=3a6d257d725dfd4ec2460cba15e80b21
diff --git a/metadata/md5-cache/dev-libs/libcxml-0.15.5 b/metadata/md5-cache/dev-libs/libcxml-0.15.5
index 17e227b355f6..6fb830d37262 100644
--- a/metadata/md5-cache/dev-libs/libcxml-0.15.5
+++ b/metadata/md5-cache/dev-libs/libcxml-0.15.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/libxmlpp:2.6 dev-libs/boost dev-libs/locked_sstream
 SLOT=0
 SRC_URI=http://carlh.net/downloads/libcxml/libcxml-0.15.5.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=33f4e8d2dd1971f96a41d06ec76ad113
diff --git a/metadata/md5-cache/dev-libs/libcxml-9999 b/metadata/md5-cache/dev-libs/libcxml-9999
index 5765499c03f4..a81065db8d82 100644
--- a/metadata/md5-cache/dev-libs/libcxml-9999
+++ b/metadata/md5-cache/dev-libs/libcxml-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://carlh.net/libcxml
 LICENSE=GPL-2
 RDEPEND=dev-cpp/libxmlpp:2.6 dev-libs/boost dev-libs/locked_sstream
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=be99cd1efdad97dc15c007cfd1d7980e
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.28.5 b/metadata/md5-cache/dev-libs/libdazzle-3.28.5
index 7b66a1e47ea1..e179c9aaec6d 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.28.5
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.28.5
@@ -4,7 +4,7 @@ DESCRIPTION=Experimental new features for GTK+ and GLib
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libdazzle
 IUSE=gtk-doc +introspection test vala test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56.0:2 x11-libs/gtk+:3[introspection?] introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libdazzle/3.28/libdazzle-3.28.5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cea107dff59bbd1a1e3b061d8f6e2b6e
+_md5_=52478519908611a5a689c1fe111fcfd6
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0 b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0
index 3bb80118cf26..664a50fb164a 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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.35.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(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_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(+)] gtk? ( x11-libs/gtk+:2[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(-)?] ) gtk3? ( >=x11-libs/gtk+-3.2:3[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200 app-text/gnome-doc-utils dev-util/intltool sys-devel/gettext 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(-)?] introspection? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) test? ( >=dev-libs/json-glib-0.13.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(-)?] >=dev-util/dbus-test-runner-15.04.0_p100 gtk? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) gtk3? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170815 !<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=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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.35.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(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_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(+)] gtk? ( x11-libs/gtk+:2[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(-)?] ) gtk3? ( >=x11-libs/gtk+-3.2:3[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200 app-text/gnome-doc-utils dev-util/glib-utils dev-util/intltool sys-devel/gettext 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(-)?] introspection? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) test? ( >=dev-libs/json-glib-0.13.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(-)?] >=dev-util/dbus-test-runner-15.04.0_p100 gtk? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) gtk3? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170815 !<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=Library to pass menu structure across DBus
 EAPI=6
 HOMEPAGE=https://launchpad.net/dbusmenu
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://launchpad.net/dbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c462aa04e1c5c8a5acdf9d29d62344c6
+_md5_=f0598622eb4ee924e3c556b555f45878
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.5.9-r1 b/metadata/md5-cache/dev-libs/libevdev-1.5.9-r1
index 57718143d6dc..0b9d506821d1 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.5.9-r1
+++ b/metadata/md5-cache/dev-libs/libevdev-1.5.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Handler library for evdev events
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.5.9.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b58c25f62dc4a2a09bc99ed4ddb25f4e
+_md5_=42110eb1fd089463f68ccf7c590653fb
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.13.1 b/metadata/md5-cache/dev-libs/libfilezilla-0.13.1
deleted file mode 100644
index fe09407ad2a7..000000000000
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.13.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=pretend
-DEPEND=test? ( dev-util/cppunit )
-DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=7
-HOMEPAGE=https://lib.filezilla-project.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://sourceforge/filezilla/libfilezilla-0.13.1.tar.bz2 http://download.filezilla-project.org/libfilezilla/libfilezilla-0.13.1.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=212e8a4b817ee8bcaa831ec209fa90a4
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.14.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.14.0
new file mode 100644
index 000000000000..6e8d5cb42046
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.14.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=pretend
+DEPEND=test? ( dev-util/cppunit )
+DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
+EAPI=7
+HOMEPAGE=https://lib.filezilla-project.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/filezilla/libfilezilla-0.14.0.tar.bz2 http://download.filezilla-project.org/libfilezilla/libfilezilla-0.14.0.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=68a140f71ae0870353a6e3c658ed6b79
diff --git a/metadata/md5-cache/dev-libs/libfmt-4.1.0 b/metadata/md5-cache/dev-libs/libfmt-4.1.0
index d2ec3dbe4712..7e9062911d89 100644
--- a/metadata/md5-cache/dev-libs/libfmt-4.1.0
+++ b/metadata/md5-cache/dev-libs/libfmt-4.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0/4
 SRC_URI=https://github.com/fmtlib/fmt/archive/4.1.0.tar.gz -> libfmt-4.1.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=30f4d4d6ca77de549fb5ec5343d42283
diff --git a/metadata/md5-cache/dev-libs/libfmt-5.1.0 b/metadata/md5-cache/dev-libs/libfmt-5.1.0
index ca39ebc1acd7..a35d2ddb2696 100644
--- a/metadata/md5-cache/dev-libs/libfmt-5.1.0
+++ b/metadata/md5-cache/dev-libs/libfmt-5.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0/5
 SRC_URI=https://github.com/fmtlib/fmt/archive/5.1.0.tar.gz -> libfmt-5.1.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=30f4d4d6ca77de549fb5ec5343d42283
diff --git a/metadata/md5-cache/dev-libs/libfmt-5.2.0 b/metadata/md5-cache/dev-libs/libfmt-5.2.0
index 1a4d3fef2827..48a4d66a0530 100644
--- a/metadata/md5-cache/dev-libs/libfmt-5.2.0
+++ b/metadata/md5-cache/dev-libs/libfmt-5.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0/5
 SRC_URI=https://github.com/fmtlib/fmt/archive/5.2.0.tar.gz -> libfmt-5.2.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c0f819bb4757b52f724ca1090a18356f
diff --git a/metadata/md5-cache/dev-libs/libfmt-5.2.1 b/metadata/md5-cache/dev-libs/libfmt-5.2.1
index 5f7e0d868946..e4e8fa7af614 100644
--- a/metadata/md5-cache/dev-libs/libfmt-5.2.1
+++ b/metadata/md5-cache/dev-libs/libfmt-5.2.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0/5
 SRC_URI=https://github.com/fmtlib/fmt/archive/5.2.1.tar.gz -> libfmt-5.2.1.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c0f819bb4757b52f724ca1090a18356f
diff --git a/metadata/md5-cache/dev-libs/libfmt-9999 b/metadata/md5-cache/dev-libs/libfmt-9999
index 7fc460ae1aa9..be0cf20f5560 100644
--- a/metadata/md5-cache/dev-libs/libfmt-9999
+++ b/metadata/md5-cache/dev-libs/libfmt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/fmtlib/fmt
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=BSD-2
 SLOT=0/9999
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c0f819bb4757b52f724ca1090a18356f
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r2 b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r2
deleted file mode 100644
index 75e6cfa0ce4a..000000000000
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2[introspection?] dev-libs/libxml2 gtk? ( dev-libs/libdbusmenu[gtk3] >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201 dev-util/gtk-doc-am gnome-base/gnome-common || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) app-text/gnome-doc-utils virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 library to raise flags on DBus for other components of the desktop
-EAPI=5
-HOMEPAGE=https://launchpad.net/libindicate
-IUSE=gtk +introspection
-KEYWORDS=alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1 LGPL-3
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2[introspection?] dev-libs/libxml2 gtk? ( dev-libs/libdbusmenu[gtk3] >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201
-RESTRICT=test
-SLOT=3
-SRC_URI=https://launchpad.net/libindicate/12.10/12.10.1/+download/libindicate-12.10.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3f608822ae141e16032db2c2a9ec59ff
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3 b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
index 110ea32e48cc..4278fb8c97c5 100644
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Library to raise flags on DBus for other components of the desktop
 EAPI=6
 HOMEPAGE=https://launchpad.net/libindicate
 IUSE=gtk +introspection
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libdbusmenu[introspection?] dev-libs/libxml2 gtk? ( dev-libs/libdbusmenu[gtk3] x11-libs/gtk+:3 ) introspection? ( >=dev-libs/gobject-introspection-1 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://launchpad.net/libindicate/12.10/12.10.1/+download/libindicate-12.10.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=32fbeaa6c7f58e7dedc94db1d50f6fbb
+_md5_=ff2bf9e094b47caad5b2162367ea66b6
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
index 88425699ca78..20e5c7dc554a 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] 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(-)?] test? ( dev-util/dbus-test-runner ) >=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] dev-util/glib-utils 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(-)?] test? ( dev-util/dbus-test-runner ) >=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A set of symbols and convience functions that all indicators would like to use
 EAPI=5
 HOMEPAGE=https://launchpad.net/libindicator
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 SLOT=0
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=3ad787e638afbe1ae0439ddff991a991
+_md5_=af7fde7ed5b88029728ec895a2699443
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
index 29637ecb84b5..2cf10eee0d23 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] 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(-)?] test? ( dev-util/dbus-test-runner ) >=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] dev-util/glib-utils 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(-)?] test? ( dev-util/dbus-test-runner ) >=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A set of symbols and convience functions that all indicators would like to use
 EAPI=5
 HOMEPAGE=https://launchpad.net/libindicator
 IUSE=test 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 ~arm ~arm64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?]
 SLOT=3
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=58314f72ea39f99a3010ca1cf8ab0583
+_md5_=874166ad3b05582de537f52db64711ef
diff --git a/metadata/md5-cache/dev-libs/libinput-1.12.0 b/metadata/md5-cache/dev-libs/libinput-1.12.0
deleted file mode 100644
index 4328425bae2a..000000000000
--- a/metadata/md5-cache/dev-libs/libinput-1.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev virtual/pkgconfig doc? ( >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
-DESCRIPTION=Library to handle input devices in Wayland
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
-IUSE=doc input_devices_wacom
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
-RESTRICT=test
-SLOT=0/10
-SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.12.0.tar.xz
-_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=403f7d3c985a1d2aac54b5faa1db202f
diff --git a/metadata/md5-cache/dev-libs/libinput-1.12.1 b/metadata/md5-cache/dev-libs/libinput-1.12.1
index 9db29169b5e0..9d4b2fe28b2a 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.12.1
+++ b/metadata/md5-cache/dev-libs/libinput-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst test
-DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev virtual/pkgconfig doc? ( >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev virtual/pkgconfig doc? ( dev-python/sphinx >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
 DESCRIPTION=Library to handle input devices in Wayland
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.12.1.tar.xz
 _eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=a2febf4591d5731d3548a09d29f8f48f
+_md5_=be0f1dc649b1e71941a40584f23cd383
diff --git a/metadata/md5-cache/dev-libs/libinput-1.12.1-r1 b/metadata/md5-cache/dev-libs/libinput-1.12.1-r1
new file mode 100644
index 000000000000..6a4ccdc7a2c2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.12.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/commonmark[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/recommonmark[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/commonmark[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/recommonmark[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/commonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
+IUSE=doc input_devices_wacom
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.12.1.tar.xz
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=32daa4681181ed2fb3cd1f698e31c547
diff --git a/metadata/md5-cache/dev-libs/libisoburn-1.5.0 b/metadata/md5-cache/dev-libs/libisoburn-1.5.0
new file mode 100644
index 000000000000..da366b1d1a4f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libisoburn-1.5.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/libburn-1.5.0 >=dev-libs/libisofs-1.5.0 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
+DESCRIPTION=Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn
+EAPI=7
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+IUSE=acl debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=>=dev-libs/libburn-1.5.0 >=dev-libs/libisofs-1.5.0 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
+REQUIRED_USE=frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )
+SLOT=0
+SRC_URI=http://files.libburnia-project.org/releases/libisoburn-1.5.0.tar.gz
+_md5_=c62566504033b609442ff319bd430b66
diff --git a/metadata/md5-cache/dev-libs/libisofs-1.5.0 b/metadata/md5-cache/dev-libs/libisofs-1.5.0
new file mode 100644
index 000000000000..a4f737449ba2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libisofs-1.5.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Open-source library for reading, mastering and writing optical discs
+EAPI=7
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+IUSE=acl debug static-libs verbose-debug xattr zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://files.libburnia-project.org/releases/libisofs-1.5.0.tar.gz
+_md5_=02693d7d04e6fb21a21ad669f32f73a3
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.6_alpha b/metadata/md5-cache/dev-libs/libmspack-0.6_alpha
index ac4fe6f99d6f..bd92159f40c3 100644
--- a/metadata/md5-cache/dev-libs/libmspack-0.6_alpha
+++ b/metadata/md5-cache/dev-libs/libmspack-0.6_alpha
@@ -3,10 +3,10 @@ DESCRIPTION=A library for Microsoft compression formats
 EAPI=6
 HOMEPAGE=https://www.cabextract.org.uk/libmspack/
 IUSE=debug doc static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=utils? ( !app-arch/mscompress )
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.6alpha.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f91306870d954a241444159954978ab
+_md5_=6afc67220c35aac1acfec5693e4a2980
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.7.1_alpha b/metadata/md5-cache/dev-libs/libmspack-0.7.1_alpha
index b7d4b439a3ca..2fa6bd6d0b14 100644
--- a/metadata/md5-cache/dev-libs/libmspack-0.7.1_alpha
+++ b/metadata/md5-cache/dev-libs/libmspack-0.7.1_alpha
@@ -1,12 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install prepare test
 DESCRIPTION=A library for Microsoft compression formats
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/libmspack/
 IUSE=debug doc static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=utils? ( !app-arch/mscompress )
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.7.1alpha.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4a275cd9571d2c245908c4d40bd69720
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=866eb0bf75f270590a08cef87b2af14a
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.1.5 b/metadata/md5-cache/dev-libs/libnsfb-0.1.5
deleted file mode 100644
index 04cae4f9d9ba..000000000000
--- a/metadata/md5-cache/dev-libs/libnsfb-0.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4[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(-)?] ) vnc? ( >=net-libs/libvncserver-0.9.9-r2[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
-DESCRIPTION=framebuffer abstraction library, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libnsfb/
-IUSE=sdl test vnc wayland xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=MIT
-RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4[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(-)?] ) vnc? ( >=net-libs/libvncserver-0.9.9-r2[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/0.1.5
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsfb-0.1.5-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.4.tar.gz -> netsurf-buildsystem-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b3c06981b484369ec42e9920a9f2414
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.1.6 b/metadata/md5-cache/dev-libs/libnsfb-0.1.6
deleted file mode 100644
index 3078789c419a..000000000000
--- a/metadata/md5-cache/dev-libs/libnsfb-0.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4[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(-)?] ) vnc? ( >=net-libs/libvncserver-0.9.9-r2[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
-DESCRIPTION=framebuffer abstraction library, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libnsfb/
-IUSE=sdl test vnc wayland xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=MIT
-RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4[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(-)?] ) vnc? ( >=net-libs/libvncserver-0.9.9-r2[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/0.1.6
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsfb-0.1.6-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.6.tar.gz -> netsurf-buildsystem-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c7dd0976649adc6711f51eb0df20077
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.2.0 b/metadata/md5-cache/dev-libs/libnsfb-0.2.0
new file mode 100644
index 000000000000..13ee04b624e7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libnsfb-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4[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(-)?] ) vnc? ( >=net-libs/libvncserver-0.9.9-r2[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
+DESCRIPTION=framebuffer abstraction library, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/libnsfb/
+IUSE=sdl test vnc wayland xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc
+LICENSE=MIT
+RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4[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(-)?] ) vnc? ( >=net-libs/libvncserver-0.9.9-r2[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/0.2.0
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsfb-0.2.0-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e38abf621d5c98367e9c6d33f1ca6380
diff --git a/metadata/md5-cache/dev-libs/libnsutils-0.0.3 b/metadata/md5-cache/dev-libs/libnsutils-0.0.3
deleted file mode 100644
index 086e4cd9be52..000000000000
--- a/metadata/md5-cache/dev-libs/libnsutils-0.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig
-DESCRIPTION=base64 and time library, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.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 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=MIT
-SLOT=0/0.0.3
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsutils-0.0.3-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0b0bf467231cd144cf895967194c3c3d
diff --git a/metadata/md5-cache/dev-libs/libnsutils-0.0.5 b/metadata/md5-cache/dev-libs/libnsutils-0.0.5
new file mode 100644
index 000000000000..c265f966ad66
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libnsutils-0.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig
+DESCRIPTION=base64 and time library, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.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 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc
+LICENSE=MIT
+SLOT=0/0.0.5
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsutils-0.0.5-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=797bdee1c14aa21313c44206e8c47fb7
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4
new file mode 100644
index 000000000000..973201b7f49c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-lang/perl ) virtual/pkgconfig
+DESCRIPTION=library for building efficient parsers, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
+IUSE=iconv 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 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~m68k-mint
+LICENSE=MIT
+SLOT=0/0.2.4
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=18f5860b9145f95da47c6a61963e8aac
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1
index e0d107143a9f..181fd7835d27 100644
--- a/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Pthread functions stubs for platforms missing them
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c78ef8ef52b3019472e8c6780e2909a9
+_md5_=05cfec7fcd18b103c4328de78ad1a985
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-2.0.0 b/metadata/md5-cache/dev-libs/libqtxdg-2.0.0
deleted file mode 100644
index cf41aa765ce0..000000000000
--- a/metadata/md5-cache/dev-libs/libqtxdg-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A Qt implementation of XDG standards
-EAPI=5
-HOMEPAGE=https://lxqt.org/
-IUSE=test test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/libqtxdg/2.0.0/libqtxdg-2.0.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bc2336147d4581e3fa4ba18c5a78a1db
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.2.0 b/metadata/md5-cache/dev-libs/libqtxdg-3.2.0
index c5a4582acd63..827fcdd6f8b0 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.2.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Qt implementation of XDG standards
 EAPI=6
 HOMEPAGE=https://lxqt.org/
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/libqtxdg/3.2.0/libqtxdg-3.2.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c9d5131f47540d7ff22a0b21302c1256
+_md5_=395d09648eeec4b9eeb94ddee4f7628b
diff --git a/metadata/md5-cache/dev-libs/libressl-2.8.1 b/metadata/md5-cache/dev-libs/libressl-2.8.1
new file mode 100644
index 000000000000..e9d6cc6b3940
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libressl-2.8.1
@@ -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/46
+SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.1.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=eab5df233501d90f93109b3cb0639aee
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.16-r2 b/metadata/md5-cache/dev-libs/libsodium-1.0.16-r2
index 5cefb84f2403..4c7fd3a12d89 100644
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.16-r2
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.16-r2
@@ -4,9 +4,9 @@ DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
 EAPI=6
 HOMEPAGE=https://github.com/jedisct1/libsodium
 IUSE=+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=ISC
 SLOT=0/23
 SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.16.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=05fa85e2e34e57880295d98b53af7b2a
+_md5_=483ffad262e0d479dfc46319c39d01d5
diff --git a/metadata/md5-cache/dev-libs/libuev-2.2.0 b/metadata/md5-cache/dev-libs/libuev-2.2.0
new file mode 100644
index 000000000000..8d77b72e32d6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuev-2.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Lightweight event loop library for Linux
+EAPI=6
+HOMEPAGE=https://github.com/troglobit/libuev
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/troglobit/libuev/releases/download/v2.2.0/libuev-2.2.0.tar.xz
+_md5_=a8d41a78f719b343fed7091e9bc8d5a7
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.20 b/metadata/md5-cache/dev-libs/libusb-1.0.20
deleted file mode 100644
index bb48f945b57c..000000000000
--- a/metadata/md5-cache/dev-libs/libusb-1.0.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,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?] ) doc? ( app-doc/doxygen ) !udev? ( virtual/os-headers )
-DESCRIPTION=Userspace access to USB devices
-EAPI=6
-HOMEPAGE=https://libusb.info/ https://github.com/libusb/libusb
-IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 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 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,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?] )
-SLOT=1
-SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.20/libusb-1.0.20.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b7866d5726ac8336b22ff1d65438224c
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-1.3.1_p2-r1 b/metadata/md5-cache/dev-libs/libutf8proc-1.3.1_p2-r1
deleted file mode 100644
index 1d029ae86a63..000000000000
--- a/metadata/md5-cache/dev-libs/libutf8proc-1.3.1_p2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig
-DESCRIPTION=mapping tool for UTF-8 strings
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.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 debug static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~ppc
-LICENSE=MIT
-SLOT=0/1.3.1_p2
-SRC_URI=http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz http://download.netsurf-browser.org/libs/releases/libutf8proc-1.3.1-2-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2eb1052d38f31ddef82dc92a92944434
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-1.3.1_p3 b/metadata/md5-cache/dev-libs/libutf8proc-1.3.1_p3
deleted file mode 100644
index 9aec3ddae29f..000000000000
--- a/metadata/md5-cache/dev-libs/libutf8proc-1.3.1_p3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig
-DESCRIPTION=mapping tool for UTF-8 strings
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.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 debug static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-SLOT=0/1.3.1_p3
-SRC_URI=http://download.netsurf-browser.org/libs/releases/buildsystem-1.6.tar.gz -> netsurf-buildsystem-1.6.tar.gz http://download.netsurf-browser.org/libs/releases/libutf8proc-1.3.1-3-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=be9094ea72255cae0ed32727c7f567b4
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1 b/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1
new file mode 100644
index 000000000000..19c42e34b7da
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig
+DESCRIPTION=mapping tool for UTF-8 strings
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.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 debug static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+SLOT=0/2.2.0_p1
+SRC_URI=http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz http://download.netsurf-browser.org/libs/releases/libutf8proc-2.2.0-1-src.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8621ea02c00840876405ef80da1aba47
diff --git a/metadata/md5-cache/dev-libs/libuv-1.23.2 b/metadata/md5-cache/dev-libs/libuv-1.23.2
new file mode 100644
index 000000000000..3644b3bc14b7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuv-1.23.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/libtool 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-20170815 !<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=Cross-platform asychronous I/O
+EAPI=6
+HOMEPAGE=https://github.com/libuv/libuv
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 BSD-2 ISC MIT
+RESTRICT=test
+SLOT=0/1
+SRC_URI=https://github.com/libuv/libuv/archive/v1.23.2.tar.gz -> libuv-1.23.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1517e5a9e657e55ae6b074a28cef7070
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.25 b/metadata/md5-cache/dev-libs/libwacom-0.25
deleted file mode 100644
index 23495743c89e..000000000000
--- a/metadata/md5-cache/dev-libs/libwacom-0.25
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 virtual/libgudev:= virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig
-DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
-EAPI=6
-HOMEPAGE=http://linuxwacom.sourceforge.net/
-IUSE=doc static-libs
-KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 virtual/libgudev:=
-SLOT=0
-SRC_URI=mirror://sourceforge/linuxwacom/libwacom/libwacom-0.25.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2833ceb77256d6e0e17f05661f661588
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.30 b/metadata/md5-cache/dev-libs/libwacom-0.30
index a202fd37f906..a47440c3acf1 100644
--- a/metadata/md5-cache/dev-libs/libwacom-0.30
+++ b/metadata/md5-cache/dev-libs/libwacom-0.30
@@ -4,10 +4,10 @@ DESCRIPTION=Library for identifying Wacom tablets and their model-specific featu
 EAPI=6
 HOMEPAGE=https://github.com/linuxwacom/libwacom
 IUSE=doc static-libs
-KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=caeb6d3f3e22b317ef11287a1103daa2
+_md5_=27aaeb3025103c6134e32df9b69c819d
diff --git a/metadata/md5-cache/dev-libs/libwapcaplet-0.4.0 b/metadata/md5-cache/dev-libs/libwapcaplet-0.4.0
deleted file mode 100644
index 5993e84eb8b0..000000000000
--- a/metadata/md5-cache/dev-libs/libwapcaplet-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,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
-DESCRIPTION=string internment library, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libwapcaplet/
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-SLOT=0/0.4.0
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.4.0-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=15080457345841d1bb8df96fc063f467
diff --git a/metadata/md5-cache/dev-libs/libwapcaplet-0.4.1 b/metadata/md5-cache/dev-libs/libwapcaplet-0.4.1
new file mode 100644
index 000000000000..956fc5d5d71b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libwapcaplet-0.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,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
+DESCRIPTION=string internment library, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/libwapcaplet/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
+LICENSE=MIT
+SLOT=0/0.4.1
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.4.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9380f6e76cdea7a6030f60c716fd2022
diff --git a/metadata/md5-cache/dev-libs/libzia-4.14 b/metadata/md5-cache/dev-libs/libzia-4.14
index 585e2ff81d78..c13a13465786 100644
--- a/metadata/md5-cache/dev-libs/libzia-4.14
+++ b/metadata/md5-cache/dev-libs/libzia-4.14
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ft
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/libzia-4.14.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=594741180ad1b5d11717b21e352ce876
+_md5_=0667ed682a2efd9adcfb508881b03226
diff --git a/metadata/md5-cache/dev-libs/locked_sstream-0.0.5 b/metadata/md5-cache/dev-libs/locked_sstream-0.0.5
index 584cbf189de2..1289c2e3b501 100644
--- a/metadata/md5-cache/dev-libs/locked_sstream-0.0.5
+++ b/metadata/md5-cache/dev-libs/locked_sstream-0.0.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://carlh.net/downloads/locked_sstream/locked_sstream-0.0.5.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=2d703fb383213133a6f6af4a40446516
diff --git a/metadata/md5-cache/dev-libs/msgpack-1.1.0 b/metadata/md5-cache/dev-libs/msgpack-1.1.0
index 9ab256a590d7..d8125a9c748f 100644
--- a/metadata/md5-cache/dev-libs/msgpack-1.1.0
+++ b/metadata/md5-cache/dev-libs/msgpack-1.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-1.1.0/msgpack-1.1.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=56457b7f6ad1f8fd7a1154c44424edf8
diff --git a/metadata/md5-cache/dev-libs/msgpack-1.4.2 b/metadata/md5-cache/dev-libs/msgpack-1.4.2
index 0e0b1ad59b3d..6961324732c1 100644
--- a/metadata/md5-cache/dev-libs/msgpack-1.4.2
+++ b/metadata/md5-cache/dev-libs/msgpack-1.4.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-1.4.2/msgpack-1.4.2.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3e6e660f7d5ab2f7a5a8ec39146199c1
diff --git a/metadata/md5-cache/dev-libs/msgpack-2.0.0 b/metadata/md5-cache/dev-libs/msgpack-2.0.0
index b713629a9d4f..7bf483b1e93c 100644
--- a/metadata/md5-cache/dev-libs/msgpack-2.0.0
+++ b/metadata/md5-cache/dev-libs/msgpack-2.0.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-2.0.0/msgpack-2.0.0.tar.gz https://dev.gentoo.org/~monsieurp/dist/msgpack-2.0.0-patchset.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7800ee84bad1f73109ec72810d42bad5
diff --git a/metadata/md5-cache/dev-libs/msgpack-2.1.1 b/metadata/md5-cache/dev-libs/msgpack-2.1.1
index ccdc6cd466dc..d1c2a14fad02 100644
--- a/metadata/md5-cache/dev-libs/msgpack-2.1.1
+++ b/metadata/md5-cache/dev-libs/msgpack-2.1.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-2.1.1/msgpack-2.1.1.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=faaa18e48c8a68f5ba0f0af147d0cf07
diff --git a/metadata/md5-cache/dev-libs/nanomsg-1.1.4 b/metadata/md5-cache/dev-libs/nanomsg-1.1.4
index 2e759d57e60f..d669c7e0398c 100644
--- a/metadata/md5-cache/dev-libs/nanomsg-1.1.4
+++ b/metadata/md5-cache/dev-libs/nanomsg-1.1.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 SLOT=0/5.0.0
 SRC_URI=https://github.com/nanomsg/nanomsg/archive/1.1.4.tar.gz -> nanomsg-1.1.4.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aae17416b878094bd758753ebc236056
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.20 b/metadata/md5-cache/dev-libs/newt-0.52.20
index f75674b8331f..ab223439eb91 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.20
+++ b/metadata/md5-cache/dev-libs/newt-0.52.20
@@ -4,11 +4,11 @@ DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=6
 HOMEPAGE=https://pagure.io/newt
 IUSE=gpm nls tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 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 ) >=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/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://releases.pagure.org/newt/newt-0.52.20.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=651093b3907d34dda918c126b1d036b4
+_md5_=88a2e5b3848c4190d20c9af397a97c94
diff --git a/metadata/md5-cache/dev-libs/nsgenbind-0.4 b/metadata/md5-cache/dev-libs/nsgenbind-0.4
deleted file mode 100644
index f2a3d8ea9051..000000000000
--- a/metadata/md5-cache/dev-libs/nsgenbind-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/yacc virtual/pkgconfig
-DESCRIPTION=generate javascript to dom bindings from w3c webidl files
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.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 debug
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=MIT
-SLOT=0/0.4
-SRC_URI=http://download.netsurf-browser.org/libs/releases/nsgenbind-0.4-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0b0bca1bf1581c4e44b1ca5a9571a40b
diff --git a/metadata/md5-cache/dev-libs/nsgenbind-0.5 b/metadata/md5-cache/dev-libs/nsgenbind-0.5
deleted file mode 100644
index 9cbf8701d7f4..000000000000
--- a/metadata/md5-cache/dev-libs/nsgenbind-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/yacc virtual/pkgconfig
-DESCRIPTION=generate javascript to dom bindings from w3c webidl files
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.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 debug
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=MIT
-SLOT=0/0.5
-SRC_URI=http://download.netsurf-browser.org/libs/releases/nsgenbind-0.5-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.6.tar.gz -> netsurf-buildsystem-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c82336a190fd994d493307d62d62f44
diff --git a/metadata/md5-cache/dev-libs/nsgenbind-0.6 b/metadata/md5-cache/dev-libs/nsgenbind-0.6
new file mode 100644
index 000000000000..b53ae7e8114b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nsgenbind-0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/yacc virtual/pkgconfig
+DESCRIPTION=generate javascript to dom bindings from w3c webidl files
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.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 debug
+KEYWORDS=~amd64 ~arm ~ppc
+LICENSE=MIT
+SLOT=0/0.6
+SRC_URI=http://download.netsurf-browser.org/libs/releases/nsgenbind-0.6-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4d823ee703bd73b933ce6acdfa6364c7
diff --git a/metadata/md5-cache/dev-libs/nsync-1.20.1 b/metadata/md5-cache/dev-libs/nsync-1.20.1
index 49ef71b5f494..950ee1c7eaab 100644
--- a/metadata/md5-cache/dev-libs/nsync-1.20.1
+++ b/metadata/md5-cache/dev-libs/nsync-1.20.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/google/nsync/archive/1.20.1.tar.gz -> nsync-1.20.1.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=347a6f8271d55c9359566dda823bbc13
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.1.3 b/metadata/md5-cache/dev-libs/ocl-icd-2.1.3
deleted file mode 100644
index 66b6555dce14..000000000000
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/ruby
-DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
-EAPI=5
-HOMEPAGE=http://forge.imag.fr/projects/ocl-icd/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-eselect/eselect-opencl
-SLOT=0
-SRC_URI=https://forge.imag.fr/frs/download.php/524/ocl-icd-2.1.3.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=168b36aa40761c5ca9fb52879bb4fd56
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.2.12 b/metadata/md5-cache/dev-libs/ocl-icd-2.2.12
new file mode 100644
index 000000000000..02e50a2345c3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ocl-icd-2.2.12
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install postinst prepare test
+DEPEND=|| ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems
+DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
+EAPI=7
+HOMEPAGE=https://github.com/OCL-dev/ocl-icd
+IUSE=+khronos-headers abi_x86_32 abi_x86_64 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
+LICENSE=BSD-2
+RDEPEND=app-eselect/eselect-opencl
+SLOT=0
+SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.2.12.tar.gz -> ocl-icd-2.2.12.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=02fa3a099ca9fc0af1c331a87a941bb2
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.2.3 b/metadata/md5-cache/dev-libs/ocl-icd-2.2.3
deleted file mode 100644
index cdbb0ea2f830..000000000000
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/ruby dev-ruby/rubygems
-DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
-EAPI=5
-HOMEPAGE=http://forge.imag.fr/projects/ocl-icd/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-eselect/eselect-opencl
-SLOT=0
-SRC_URI=https://forge.imag.fr/frs/download.php/598/ocl-icd-2.2.3.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3f6b4089c849014cf1d8c2b3bb0ced97
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.2.8 b/metadata/md5-cache/dev-libs/ocl-icd-2.2.8
deleted file mode 100644
index 88940a8b0f44..000000000000
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/ruby dev-ruby/rubygems
-DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
-EAPI=5
-HOMEPAGE=http://forge.imag.fr/projects/ocl-icd/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-eselect/eselect-opencl
-SLOT=0
-SRC_URI=https://forge.imag.fr/frs/download.php/698/ocl-icd-2.2.8.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7e88c4bc3943388ce0c30c0fdd7e7dfb
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.7.1 b/metadata/md5-cache/dev-libs/oniguruma-6.7.1
deleted file mode 100644
index c4c8bbc68747..000000000000
--- a/metadata/md5-cache/dev-libs/oniguruma-6.7.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=Regular expression library for different character encodings
-EAPI=6
-HOMEPAGE=https://github.com/kkos/oniguruma
-IUSE=combination-explosion-check crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=BSD-2
-SLOT=0/4
-SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.7.1/onig-6.7.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a8ebd5ffc7fc8c7b4829d72105198382
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.8.1 b/metadata/md5-cache/dev-libs/oniguruma-6.8.1
deleted file mode 100644
index 3f3b15ea5a8c..000000000000
--- a/metadata/md5-cache/dev-libs/oniguruma-6.8.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=Regular expression library for different character encodings
-EAPI=6
-HOMEPAGE=https://github.com/kkos/oniguruma
-IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=BSD-2
-SLOT=0/5
-SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.8.1/onig-6.8.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=75d9f1aa28de830dbf3110e95f2a49ca
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.9.0 b/metadata/md5-cache/dev-libs/oniguruma-6.9.0
new file mode 100644
index 000000000000..0c36431a5e8a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.9.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=Regular expression library for different character encodings
+EAPI=7
+HOMEPAGE=https://github.com/kkos/oniguruma
+IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=BSD-2
+SLOT=0/5
+SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.0/onig-6.9.0.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9460788d5b9454a65205657cbe74c3c4
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1 b/metadata/md5-cache/dev-libs/openssl-1.1.1
index ab9c6389dff5..f1dd52969328 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8e7218f414a40aa52c967ecbb7745146
+_md5_=306688751c8c0ec8a0ee413415e0d70b
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.6.1 b/metadata/md5-cache/dev-libs/protobuf-3.6.1
index 0a7715044d41..6e3bed1234a8 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.6.1
+++ b/metadata/md5-cache/dev-libs/protobuf-3.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing str
 EAPI=6
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=emacs? ( virtual/emacs ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/17
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.6.1.tar.gz -> protobuf-3.6.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2cfa8c3239b9e9d08b15ac45b2386f88
+_md5_=afa7f4deb0f854ba4aa9e0ad7a7ea4b5
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.8.0 b/metadata/md5-cache/dev-libs/qtkeychain-0.8.0
deleted file mode 100644
index a8ca51f6d043..000000000000
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/linguist-tools:5 gnome-keyring? ( gnome-base/libgnome-keyring ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt API for storing passwords securely
-EAPI=6
-HOMEPAGE=https://github.com/frankosterfeld/qtkeychain
-IUSE=gnome-keyring
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5
-SLOT=0/1
-SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.8.0.tar.gz -> qtkeychain-0.8.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=21129e4f4f553365349de89068a77c32
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.9.0 b/metadata/md5-cache/dev-libs/qtkeychain-0.9.0
index 99ed1b5129db..a93ca1ec0714 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.9.0
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=Qt API for storing passwords securely
 EAPI=6
 HOMEPAGE=https://github.com/frankosterfeld/qtkeychain
 IUSE=gnome-keyring
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 gnome-keyring? ( dev-libs/glib:2 )
 SLOT=0/1
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.9.0.tar.gz -> qtkeychain-0.9.0.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c6fb14dc86bd599d4454b59d903b3961
+_md5_=56a21358623344020ec2c0f9c2398094
diff --git a/metadata/md5-cache/dev-libs/sdformat-5.2.0 b/metadata/md5-cache/dev-libs/sdformat-5.2.0
deleted file mode 100644
index 7dbffd976141..000000000000
--- a/metadata/md5-cache/dev-libs/sdformat-5.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:3= dev-lang/ruby:* virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Simulation Description Format (SDF) parser
-EAPI=5
-HOMEPAGE=http://sdformat.org/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:3=
-SLOT=0/5
-SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-5.2.0.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f86acb7e8c4addb2c5a1013936db6e30
diff --git a/metadata/md5-cache/dev-libs/sdformat-5.3.0 b/metadata/md5-cache/dev-libs/sdformat-5.3.0
deleted file mode 100644
index 6373a690ea20..000000000000
--- a/metadata/md5-cache/dev-libs/sdformat-5.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:3= dev-lang/ruby:* virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Simulation Description Format (SDF) parser
-EAPI=5
-HOMEPAGE=http://sdformat.org/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:3=
-SLOT=0/5
-SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-5.3.0.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f86acb7e8c4addb2c5a1013936db6e30
diff --git a/metadata/md5-cache/dev-libs/sdformat-6.1.0 b/metadata/md5-cache/dev-libs/sdformat-6.1.0
new file mode 100644
index 000000000000..14f0e150a92c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/sdformat-6.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:4= dev-lang/ruby:* virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Simulation Description Format (SDF) parser
+EAPI=5
+HOMEPAGE=http://sdformat.org/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:4=
+SLOT=0/6
+SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-6.1.0.tar.bz2
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f336b72655e41c6a15ae1b45035bda18
diff --git a/metadata/md5-cache/dev-libs/serd-0.28.0-r1 b/metadata/md5-cache/dev-libs/serd-0.28.0-r1
index f5518c14e558..ed44103da42b 100644
--- a/metadata/md5-cache/dev-libs/serd-0.28.0-r1
+++ b/metadata/md5-cache/dev-libs/serd-0.28.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.28.0.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=acdec04f56484abe985e82bcc054c89f
diff --git a/metadata/md5-cache/dev-libs/sink-0.5.0 b/metadata/md5-cache/dev-libs/sink-0.5.0
deleted file mode 100644
index 1b35b166d41a..000000000000
--- a/metadata/md5-cache/dev-libs/sink-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 dev-db/lmdb:= dev-libs/flatbuffers dev-libs/kasync net-libs/kdav2 net-libs/kimap2 net-misc/curl sys-libs/readline:0= >=dev-qt/qtconcurrent-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A data access layer handling synchronization, caching and indexing
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 dev-db/lmdb:= dev-libs/flatbuffers dev-libs/kasync net-libs/kdav2 net-libs/kimap2 net-misc/curl sys-libs/readline:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=https://github.com/KDE/sink/archive/v0.5.0.tar.gz -> sink-0.5.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0e93fbaa81a863394a665231816ed474
diff --git a/metadata/md5-cache/dev-libs/sink-0.7.0 b/metadata/md5-cache/dev-libs/sink-0.7.0
new file mode 100644
index 000000000000..65457314f97d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/sink-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 dev-db/lmdb:= dev-libs/flatbuffers dev-libs/kasync >=dev-libs/xapian-1.4.4:0= net-libs/kdav2 net-libs/kimap2 net-misc/curl sys-libs/readline:0= >=dev-qt/qtconcurrent-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A data access layer handling synchronization, caching and indexing
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 dev-db/lmdb:= dev-libs/flatbuffers dev-libs/kasync >=dev-libs/xapian-1.4.4:0= net-libs/kdav2 net-libs/kimap2 net-misc/curl sys-libs/readline:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=https://github.com/KDE/sink/archive/v0.7.0.tar.gz -> sink-0.7.0.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=61d2e4625c96eedb70450e819baf066a
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.7.0.0 b/metadata/md5-cache/dev-libs/skalibs-2.7.0.0
new file mode 100644
index 000000000000..cbba9c64d627
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/skalibs-2.7.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure prepare
+DESCRIPTION=skarnet.org general-purpose libraries
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/skalibs/
+IUSE=doc ipv6 static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+SLOT=0/2.7
+SRC_URI=https://www.skarnet.org/software/skalibs/skalibs-2.7.0.0.tar.gz
+_md5_=98e610ad2ba297dfcb231fdd9380be84
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.5.0 b/metadata/md5-cache/dev-libs/softhsm-2.5.0
new file mode 100644
index 000000000000..7e4b55e831b9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/softhsm-2.5.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gcc:=[cxx] test? ( dev-util/cppunit )
+DEFINED_PHASES=configure install
+DEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
+DESCRIPTION=A software PKCS#11 implementation
+EAPI=7
+HOMEPAGE=https://www.opendnssec.org/
+IUSE=bindist libressl migration-tool test
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
+SLOT=2
+SRC_URI=https://www.opendnssec.org/files/source/softhsm-2.5.0.tar.gz
+_md5_=7d6538f059d134fa26ebe42adf7afc19
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.0-r1 b/metadata/md5-cache/dev-libs/sord-0.16.0-r1
index cfbe017b16a0..e015cf98264e 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.0-r1
+++ b/metadata/md5-cache/dev-libs/sord-0.16.0-r1
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=dev-libs/serd-0.28.0-r1
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.0.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=63daa82da7cc86f32899ad61e618c0a6
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.2.1 b/metadata/md5-cache/dev-libs/spdlog-1.2.1
new file mode 100644
index 000000000000..4181b877aba9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/spdlog-1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libfmt-5.0.0 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Very fast, header only, C++ logging library
+EAPI=6
+HOMEPAGE=https://github.com/gabime/spdlog
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-libs/libfmt-5.0.0
+SLOT=0/1
+SRC_URI=https://github.com/gabime/spdlog/archive/v1.2.1.tar.gz -> spdlog-1.2.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3e19701d31dd851be9b55d243c0de35a
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-6.2.0 b/metadata/md5-cache/dev-libs/tinyxml2-6.2.0
index 4cf39157c43b..5d40ade5ec66 100644
--- a/metadata/md5-cache/dev-libs/tinyxml2-6.2.0
+++ b/metadata/md5-cache/dev-libs/tinyxml2-6.2.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 hppa ~ppc64 sparc x86
 LICENSE=ZLIB
 SLOT=0/6
 SRC_URI=https://github.com/leethomason/tinyxml2/archive/6.2.0.tar.gz -> tinyxml2-6.2.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=87a714701ec0fd2eda946541c2d411f8
diff --git a/metadata/md5-cache/dev-libs/tut-2013.12.18 b/metadata/md5-cache/dev-libs/tut-2013.12.18
index eab80318ab91..61189c5b723d 100644
--- a/metadata/md5-cache/dev-libs/tut-2013.12.18
+++ b/metadata/md5-cache/dev-libs/tut-2013.12.18
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/mrzechonek/tut-framework/archive/2013-12-18.tar.gz -> tut-2013.12.18.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=d3a969d340c41a619274c83d75c524df
diff --git a/metadata/md5-cache/dev-libs/tut-2016.12.19 b/metadata/md5-cache/dev-libs/tut-2016.12.19
index 4a73b4d50bb7..60bece91a328 100644
--- a/metadata/md5-cache/dev-libs/tut-2016.12.19
+++ b/metadata/md5-cache/dev-libs/tut-2016.12.19
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/mrzechonek/tut-framework/archive/2016-12-19.tar.gz -> tut-2016.12.19.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=d3a969d340c41a619274c83d75c524df
diff --git a/metadata/md5-cache/dev-libs/ucommon-6.1.10 b/metadata/md5-cache/dev-libs/ucommon-6.1.10
deleted file mode 100644
index 214b933a806e..000000000000
--- a/metadata/md5-cache/dev-libs/ucommon-6.1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) >=app-portage/elt-patches-20170815 !<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=Portable C++ runtime for threads and sockets
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/commoncpp
-IUSE=doc static-libs socks +cxx debug libressl ssl gnutls
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=LGPL-3
-RDEPEND=ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
-SLOT=0/6
-SRC_URI=mirror://gnu/commoncpp/ucommon-6.1.10.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=240efe15e2ba48bb502e1a61c170c904
diff --git a/metadata/md5-cache/dev-libs/ucommon-6.3.1 b/metadata/md5-cache/dev-libs/ucommon-6.3.1
deleted file mode 100644
index 165a7e046123..000000000000
--- a/metadata/md5-cache/dev-libs/ucommon-6.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) >=app-portage/elt-patches-20170815 !<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=Portable C++ runtime for threads and sockets
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/commoncpp
-IUSE=doc static-libs socks +cxx debug libressl ssl gnutls
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=LGPL-3
-RDEPEND=ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
-SLOT=0/6
-SRC_URI=mirror://gnu/commoncpp/ucommon-6.3.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34e4cb137d650b94c9681534a97048a6
diff --git a/metadata/md5-cache/dev-libs/ucommon-6.5.2 b/metadata/md5-cache/dev-libs/ucommon-6.5.2
deleted file mode 100644
index edd15362776a..000000000000
--- a/metadata/md5-cache/dev-libs/ucommon-6.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) >=app-portage/elt-patches-20170815 !<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=Portable C++ runtime for threads and sockets
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/commoncpp
-IUSE=doc static-libs socks +cxx debug libressl ssl gnutls
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=LGPL-3
-RDEPEND=ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
-SLOT=0/6
-SRC_URI=mirror://gnu/commoncpp/ucommon-6.5.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2016db65c7ce2062e0a016620eb8f9b
diff --git a/metadata/md5-cache/dev-libs/ucommon-7.0.0 b/metadata/md5-cache/dev-libs/ucommon-7.0.0
new file mode 100644
index 000000000000..6923bd8196dc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ucommon-7.0.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install prepare
+DEPEND=ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Portable C++ runtime for threads and sockets
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/commoncpp
+IUSE=doc static-libs +cxx debug libressl ssl gnutls
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=LGPL-3
+RDEPEND=ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+SLOT=0/8
+SRC_URI=mirror://gnu/commoncpp/ucommon-7.0.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=784a105ff11cb7e1fab9bd69abb1942f
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1 b/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1
index 5b87dddc025e..b73227659ce9 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1
@@ -4,8 +4,8 @@ DESCRIPTION=userspace RCU (read-copy-update) library
 EAPI=6
 HOMEPAGE=http://lttng.org/urcu
 IUSE=static-libs regression-test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 SLOT=0/6
 SRC_URI=http://lttng.org/files/urcu/userspace-rcu-0.10.1.tar.bz2
-_md5_=624d38b85eecdaa86381059710921d5f
+_md5_=728b2e9705b8ded8b184ec4e77661160
diff --git a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1 b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
index afbc05ceb79d..8c5a8b2aac4f 100644
--- a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
+++ b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Library that supports Base64 (MIME), uuencode, xxencode and binhex coding
 EAPI=5
 HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=60b83a76fa049ae9e8230ff78813907b
+_md5_=7cc470eea02a16f97764e8e4fc5f9093
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.11 b/metadata/md5-cache/dev-libs/volume_key-0.3.11
index 7673e5b849e8..8af7d571ffe2 100644
--- a/metadata/md5-cache/dev-libs/volume_key-0.3.11
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.11
@@ -4,11 +4,11 @@ DESCRIPTION=Library for manipulating and storing storage volume encryption keys
 EAPI=7
 HOMEPAGE=https://pagure.io/volume_key
 IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:=
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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=0
 SRC_URI=http://releases.pagure.org/volume_key/volume_key-0.3.11.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5bb729e79ef95fde7b78318a9d665261
+_md5_=89f18e9551968d8c3ac203b2b4f39686
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.12 b/metadata/md5-cache/dev-libs/volume_key-0.3.12
new file mode 100644
index 000000000000..067d2f5dc14e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install setup
+DEPEND=app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:= sys-devel/gettext test? ( dev-libs/nss[utils] )
+DESCRIPTION=Library for manipulating and storing storage volume encryption keys
+EAPI=7
+HOMEPAGE=https://pagure.io/volume_key
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:=
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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=0
+SRC_URI=http://releases.pagure.org/volume_key/volume_key-0.3.12.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5c0eb163d5ad032a55dffec4d5369022
diff --git a/metadata/md5-cache/dev-libs/wayland-1.16.0 b/metadata/md5-cache/dev-libs/wayland-1.16.0
new file mode 100644
index 000000000000..68162b6c2090
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/wayland-1.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= !<media-libs/mesa-18.1.1-r1 doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 sys-apps/grep[pcre] ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Wayland protocol libraries
+EAPI=6
+HOMEPAGE=https://wayland.freedesktop.org/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= !<media-libs/mesa-18.1.1-r1
+SLOT=0
+SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.16.0.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=873132835ed5bce8a217333041f987a1
diff --git a/metadata/md5-cache/dev-libs/wayland-9999 b/metadata/md5-cache/dev-libs/wayland-9999
index fe77712cd658..10fff2e503d6 100644
--- a/metadata/md5-cache/dev-libs/wayland-9999
+++ b/metadata/md5-cache/dev-libs/wayland-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= !!<media-libs/mesa-18.1.1-r1 doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 sys-apps/grep[pcre] ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= !<media-libs/mesa-18.1.1-r1 doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 sys-apps/grep[pcre] ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Wayland protocol libraries
 EAPI=6
 HOMEPAGE=https://wayland.freedesktop.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= !!<media-libs/mesa-18.1.1-r1
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= !<media-libs/mesa-18.1.1-r1
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=393dbe28d6087733959bab80b31531b9
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=873132835ed5bce8a217333041f987a1
diff --git a/metadata/md5-cache/dev-libs/xbyak-5.73 b/metadata/md5-cache/dev-libs/xbyak-5.73
new file mode 100644
index 000000000000..ec09aeae7de2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xbyak-5.73
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=JIT assembler for x86(IA-32)/x64(AMD64, x86-64)
+EAPI=7
+HOMEPAGE=https://github.com/herumi/xbyak
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/herumi/xbyak/archive/v5.73.tar.gz -> xbyak-5.73.tar.gz
+_md5_=249e2610e33ba7242f817586eb468927
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.6.5 b/metadata/md5-cache/dev-libs/xxhash-0.6.5
index 358934148066..dd2917bb05f2 100644
--- a/metadata/md5-cache/dev-libs/xxhash-0.6.5
+++ b/metadata/md5-cache/dev-libs/xxhash-0.6.5
@@ -3,9 +3,9 @@ DESCRIPTION=Extremely fast non-cryptographic hash algorithm
 EAPI=6
 HOMEPAGE=http://www.xxhash.com
 IUSE=static-libs
-KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos
 LICENSE=BSD-2 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/xxHash/archive/v0.6.5.tar.gz -> xxhash-0.6.5.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=cd45e34c74bcecb085584c6c0a94234b
+_md5_=2f46b8b61aa8de6eae6a990d6cfe9832
diff --git a/metadata/md5-cache/dev-libs/yajl-2.1.0-r1 b/metadata/md5-cache/dev-libs/yajl-2.1.0-r1
index 3deef0dbb3f2..4e476d33a23f 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.1.0-r1
+++ b/metadata/md5-cache/dev-libs/yajl-2.1.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-
 LICENSE=ISC
 SLOT=0/2
 SRC_URI=https://github.com/lloyd/yajl/tarball/2.1.0 -> yajl-2.1.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20a23737bea3947c24f3d339bc89b528
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 70aa9ce44a59..4db2154fbea5 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/clisp-2.49.90 b/metadata/md5-cache/dev-lisp/clisp-2.49.90
index a89dca7238a6..226009e4e896 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.49.90
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49.90
@@ -4,10 +4,10 @@ DESCRIPTION=A portable, bytecode-compiled implementation of Common Lisp
 EAPI=6
 HOMEPAGE=https://clisp.sourceforge.io/
 IUSE=hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 )
 SLOT=2/8
 SRC_URI=https://haible.de/bruno/gnu/clisp-2.49.90.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6c6f672e50eb1d01fe6e5219d17ea514
+_md5_=2cc073405e2b1ea023e8a75ed4d6bf97
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 9645eb7abe1f..3debcad09ae1 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/lutok-0.4-r1 b/metadata/md5-cache/dev-lua/lutok-0.4-r1
index c9233975ee8d..054b9b87563d 100644
--- a/metadata/md5-cache/dev-lua/lutok-0.4-r1
+++ b/metadata/md5-cache/dev-lua/lutok-0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight C++ API library for Lua
 EAPI=6
 HOMEPAGE=https://github.com/jmmv/lutok
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-lang/lua:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmmv/lutok/releases/download/lutok-0.4/lutok-0.4.tar.gz
 _eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5566091e31df971efb42908b76b6f75a
+_md5_=6df718cedbedac003bda49dc02c68af6
diff --git a/metadata/md5-cache/dev-lua/luvit-0.7.0 b/metadata/md5-cache/dev-lua/luvit-0.7.0
index aba41cc48190..175fe7223245 100644
--- a/metadata/md5-cache/dev-lua/luvit-0.7.0
+++ b/metadata/md5-cache/dev-lua/luvit-0.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/openssl:0 sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser ) virtual/pkgconfig
+DEPEND=dev-libs/openssl:0 sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser:= ) virtual/pkgconfig
 DESCRIPTION=Takes node.js' architecture and dependencies and fits it in the Lua language
 EAPI=5
 HOMEPAGE=https://luvit.io/
 IUSE=bundled-libs examples
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0 bundled-libs? ( BSD MIT )
-RDEPEND=dev-libs/openssl:0 sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser )
+RDEPEND=dev-libs/openssl:0 sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://luvit.io/dist/latest/luvit-0.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3e3b3eb39438879978d8b5c7eaf4ccb
+_md5_=71dfa5eeb0f58b056197c36d55bff9fa
diff --git a/metadata/md5-cache/dev-lua/luvit-0.8.2 b/metadata/md5-cache/dev-lua/luvit-0.8.2
index 1c894f4419c2..9ae8f82bae91 100644
--- a/metadata/md5-cache/dev-lua/luvit-0.8.2
+++ b/metadata/md5-cache/dev-lua/luvit-0.8.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser ) virtual/pkgconfig
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser:= ) virtual/pkgconfig
 DESCRIPTION=Takes node.js' architecture and dependencies and fits it in the Lua language
 EAPI=5
 HOMEPAGE=https://luvit.io/
 IUSE=bundled-libs examples libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 bundled-libs? ( BSD MIT )
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://luvit.io/dist/latest/luvit-0.8.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae8e805e383456c7ee63bd558fd2b2b2
+_md5_=5210c760b5fe82dc5f1bebd049dbd73e
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index beb1ca35b3b5..49d93e9ec31a 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/yojson-1.4.0 b/metadata/md5-cache/dev-ml/yojson-1.4.0
index 80c41a28eab4..43e061de4ce1 100644
--- a/metadata/md5-cache/dev-ml/yojson-1.4.0
+++ b/metadata/md5-cache/dev-ml/yojson-1.4.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=install
 DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-ml/biniou-1.2:=[ocamlopt] dev-ml/cppo dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=JSON parsing and pretty-printing library for OCaml
 EAPI=5
-HOMEPAGE=http://mjambon.com/yojson.html https://github.com/mjambon/yojson
+HOMEPAGE=https://github.com/mjambon/yojson
 IUSE=examples
 KEYWORDS=~amd64
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-m
 SLOT=0/1.4.0
 SRC_URI=https://github.com/mjambon/yojson/archive/v1.4.0.tar.gz -> yojson-1.4.0.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	14f75966224f5922dd3bc77f7bd61338
-_md5_=790517d7ae78040c627038e589b18e59
+_md5_=fb6b0c3afce29897340daa4af070bbf4
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300 b/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300
index cda7300f2975..4d4be3924e75 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300
+++ b/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
 DESCRIPTION=Compute intelligent differences between two files / lists
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Algorithm-Diff
-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
+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=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=705e4f6f061cddcc8304e59f399c8be8
+_md5_=18c1ab3154efe6a1714bdd11fee6bad2
diff --git a/metadata/md5-cache/dev-perl/App-pwhich-1.150.0 b/metadata/md5-cache/dev-perl/App-pwhich-1.150.0
index 27e746bf689d..ee9f5ac94b65 100644
--- a/metadata/md5-cache/dev-perl/App-pwhich-1.150.0
+++ b/metadata/md5-cache/dev-perl/App-pwhich-1.150.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl-only 'which'
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/App-pwhich
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Which-1.140.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/App-pwhich-1.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=5b1c9a2aad7c88a34a6a815dbc4095a3
+_md5_=01f5de36d8d62fd3ccfc893b4d883c27
diff --git a/metadata/md5-cache/dev-perl/AppConfig-1.710.0 b/metadata/md5-cache/dev-perl/AppConfig-1.710.0
index 902217599975..5ec635d3ae97 100644
--- a/metadata/md5-cache/dev-perl/AppConfig-1.710.0
+++ b/metadata/md5-cache/dev-perl/AppConfig-1.710.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl5 module for reading configuration files and parsing command lin
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/AppConfig
 IUSE=test
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-HomeDir-0.57 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/AppConfig-1.71.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b401677e21f728b97aa42f1b8630768b
+_md5_=1984e7b3dd4bdac2dc5ee44404390f51
diff --git a/metadata/md5-cache/dev-perl/Archive-Zip-1.640.0 b/metadata/md5-cache/dev-perl/Archive-Zip-1.640.0
index 6b3b5e3b5f8b..35eda6b144cb 100644
--- a/metadata/md5-cache/dev-perl/Archive-Zip-1.640.0
+++ b/metadata/md5-cache/dev-perl/Archive-Zip-1.640.0
@@ -4,10 +4,10 @@ DESCRIPTION=A wrapper that lets you read Zip archive members as if they were fil
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Archive-Zip
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.17.0 virtual/perl-Encode virtual/perl-File-Path >=virtual/perl-File-Spec-0.800.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.64.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=8de40302ffc5c8acdabb4c0935177840
+_md5_=efbc90b2ae32045b92cce96d2f5eb983
diff --git a/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1 b/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1
index f4114c952552..a987fa676081 100644
--- a/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Set up array elements as aliases
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Array-RefElem
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Array-RefElem-1.00.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f84bfd8927e8cdc0c9db0b77cf9088fb
+_md5_=4d52876bbdea41be0193bed91a9895cb
diff --git a/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1 b/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
index 1a348f3f5aef..8fb810034c32 100644
--- a/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An NTLM authentication module
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/NTLM
 IUSE=test
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-3.00 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-1.09.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2db961c256cc3e4fb894a2b7a4e943c
+_md5_=683c5b429e46e18a83fc6f73f67dba89
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0 b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
index 1b139e1ab150..7e723eed85a8 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
+++ b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
@@ -4,10 +4,10 @@ DESCRIPTION=Execute code after a scope finished compilation
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/B-Hooks-EndOfScope
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Module-Implementation-0.50.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-Progressive-0.1.6 >=dev-perl/Variable-Magic-0.480.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=8763b43dda48b366fdcb8d761b5558c9
+_md5_=cb392462df820c79c14860638fa978b5
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0 b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0
index 24ce9591b0da..294f257aa6f0 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0
+++ b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0
@@ -4,10 +4,10 @@ DESCRIPTION=Wrap OP check callbacks
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/B-Hooks-OP-Check
 IUSE=test
-KEYWORDS=amd64 hppa ppc x86
+KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=5d5bf6bfb7be6fb21d439655e055b9ee
+_md5_=3e23c54837debc7b5670f4d06af81e7e
diff --git a/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0 b/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0
index 227f91ef4113..82f426f0bad8 100644
--- a/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0
+++ b/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Carp-Clan-5.300.0 >=virtual/perl-Storable-2.210.0 virtual/perl
 DESCRIPTION=Efficient bit vector, set of integers and big int math library
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Bit-Vector
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Carp-Clan-5.300.0 >=virtual/perl-Storable-2.210.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6786476ff6ba16d6c5a5f779a38f4aa5
+_md5_=1852c3ccfe2566af42990dd0f4a02dd4
diff --git a/metadata/md5-cache/dev-perl/CGI-4.400.0 b/metadata/md5-cache/dev-perl/CGI-4.400.0
index 16cdad430885..74b75cd38f67 100644
--- a/metadata/md5-cache/dev-perl/CGI-4.400.0
+++ b/metadata/md5-cache/dev-perl/CGI-4.400.0
@@ -4,10 +4,10 @@ DESCRIPTION=Simple Common Gateway Interface Class
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/CGI
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.170.0 >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.40.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=82c1ea8c950db076bf8d3c904a0d4fe5
+_md5_=9d01114747b4f3530aca13e9ca5d2675
diff --git a/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0 b/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0
index 3bfd3edd62cc..eca1dc1f10ff 100644
--- a/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0
+++ b/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0
@@ -4,10 +4,10 @@ DESCRIPTION=CGI Interface for Fast CGI
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/CGI-Fast
 IUSE=test
-KEYWORDS=amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CGI-4 virtual/perl-Carp >=dev-perl/FCGI-0.670.0 virtual/perl-if dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a1d500fdfc008d199060628218ff3fdb
+_md5_=36b6d07c9f7491ab2072cbd63d80de3f
diff --git a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2 b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
index 6e0bc5559a6c..959264e20de2 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
+++ b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
@@ -4,10 +4,10 @@ DESCRIPTION=Read and write Changes files
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/CPAN-Changes
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Text-Tabs+Wrap-0.3.0 >=virtual/perl-version-0.990.600 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13396656f43193782a55a5569a0b06a6
+_md5_=a3d06c8c98a4fce63758f74994a9c21c
diff --git a/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0 b/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0
index 39200a5495c0..5ae28b3852d2 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0
+++ b/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0
@@ -4,10 +4,10 @@ DESCRIPTION=Write a CHECKSUMS file for a directory as on CPAN
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/CPAN-Checksums
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Compress-Bzip2 dev-perl/Data-Compare virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.360.0 virtual/perl-Digest-SHA virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO virtual/perl-IO-Compress virtual/perl-Safe dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e7bf5a00b59dddd6def1bd3355168460
+_md5_=7127f64d75ba2ad683cc4b1da6f45fbb
diff --git a/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2 b/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2
index c08bed4efc65..937fc2823770 100644
--- a/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2
+++ b/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Extract distribution name and version from a distribution filename
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/CPAN-DistnameInfo
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=fc8cfc2dae2febaa151dcb1b41f340da
+_md5_=668d05949682e13eb4b1e4432f5e368a
diff --git a/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0 b/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
index 99da4be67f39..8cdb02e4a1a1 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
+++ b/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
@@ -4,10 +4,10 @@ DESCRIPTION=Verify requirements in a CPAN::Meta object
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/CPAN-Meta-Check
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-2.132.830 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 virtual/perl-Exporter >=virtual/perl-Module-Metadata-1.0.23 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=3e458a1981e9ad412d79acf312aa0590
+_md5_=1c8b621835969fc3b5f90ddc00c3f9b4
diff --git a/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0 b/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0
index cb1c9f665dd7..f948a37bf942 100644
--- a/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0
+++ b/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Canary to check perl compatibility for schmorp's modules
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Canary-Stability
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2012.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=650811c8c1f74a98c8a2145dd0da54e0
+_md5_=aa59efc827dca42012a5d290e641c920
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0
index 8f09e6344069..101a2555af12 100644
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0
+++ b/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0
@@ -4,10 +4,10 @@ DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Capture-Tiny
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a120dac1237a71f4795427754a63d175
+_md5_=4ee1f9b00741630ab57f7dbab8b041d7
diff --git a/metadata/md5-cache/dev-perl/Carp-Always-0.130.0 b/metadata/md5-cache/dev-perl/Carp-Always-0.130.0
index 800716c83a48..3f6cd9e945c1 100644
--- a/metadata/md5-cache/dev-perl/Carp-Always-0.130.0
+++ b/metadata/md5-cache/dev-perl/Carp-Always-0.130.0
@@ -4,10 +4,10 @@ DESCRIPTION=Warns and dies noisily with stack backtraces
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Carp-Always
 IUSE=test
-KEYWORDS=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Carp-Always-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=c0d38c5426095a7244cb317af6e4e6e5
+_md5_=14b248dd7d7d0b7344be9121f58aa696
diff --git a/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0 b/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0
index bab5f4af20f0..5ec2632cca34 100644
--- a/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0
+++ b/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=Report errors from perspective of caller of a clan of modules
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Carp-Clan
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Carp-Clan-6.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=fc88fe1e4c03d45bc17f9da527f9ac8f
+_md5_=7b6e0325a4d16250101f7267de927a97
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1 b/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
index 4d85df913e32..279ba9ddfd16 100644
--- a/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Sub-Name dev-lang/perl:=[-build(-)]
 DESCRIPTION=Automated accessor generation
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Class-Accessor
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sub-Name dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a59e086c745aaf146718726890b3810c
+_md5_=4924ba21aea064d267deb8e10af6f940
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r2 b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r2
index 4ced73e22375..d5a97296149c 100644
--- a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r2
+++ b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=Inheritable, overridable class data
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Class-Data-Inheritable
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=c2c0f57816f96e3be2938b361d41b2c5
+_md5_=badee2b424f9405017bea452153feafe
diff --git a/metadata/md5-cache/dev-perl/Class-Inspector-1.320.0 b/metadata/md5-cache/dev-perl/Class-Inspector-1.320.0
index ef67ef24d4a2..c73f342dabb1 100644
--- a/metadata/md5-cache/dev-perl/Class-Inspector-1.320.0
+++ b/metadata/md5-cache/dev-perl/Class-Inspector-1.320.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provides information about Classes
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Class-Inspector
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=5a707dfbdcd6e0c9dd381723a1c43197
+_md5_=0c38a6b4a1657b702a6e8d919a060735
diff --git a/metadata/md5-cache/dev-perl/Class-Load-0.240.0 b/metadata/md5-cache/dev-perl/Class-Load-0.240.0
index c83c4bd2bcd9..e301ce2fe4fd 100644
--- a/metadata/md5-cache/dev-perl/Class-Load-0.240.0
+++ b/metadata/md5-cache/dev-perl/Class-Load-0.240.0
@@ -4,10 +4,10 @@ DESCRIPTION=A working (require q{Class::Name}) and more
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Class-Load
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-OptList virtual/perl-Exporter >=dev-perl/Module-Implementation-0.40.0 >=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=8d77735987d6e878da0cf563280b583e
+_md5_=f02cdd897acb26de1417edced7fa1eed
diff --git a/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0 b/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0
index 15a53b445858..63b736b94bf0 100644
--- a/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0
+++ b/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0
@@ -4,10 +4,10 @@ DESCRIPTION=XS implementation of parts of Class::Load
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Class-Load-XS
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos
+KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Class-Load-0.200.0 virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Load-XS-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=5eb8fbe65f990c152941aa47d45ad4a2
+_md5_=44fecd9a4dde1e3c78a39dd773075f65
diff --git a/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.120.0 b/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.120.0
index 4699adc71e9c..b0ae1c42cfc6 100644
--- a/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.120.0
+++ b/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.120.0
@@ -4,10 +4,10 @@ DESCRIPTION=provides Moose-like method modifiers
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Class-Method-Modifiers
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=c89dcaa1a15e5f13dd033fbb9f367fc4
+_md5_=3d0eadd11f5fb6c41360e07cd8b4a0bb
diff --git a/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0 b/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0
index 22d5a6e38bba..41b9415a7d84 100644
--- a/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0
+++ b/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
 DESCRIPTION=Implementation of a Singleton class
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Class-Singleton
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=472d1ae404744f8e8720aee089feed0a
+_md5_=0f48403159b7c276f665e01a8074fa71
diff --git a/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0 b/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0
index 3fd06b236434..0362a56628a5 100644
--- a/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0
+++ b/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Minimalist class construction
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Class-Tiny
 IUSE=test minimal
-KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=5ff114ee7c37622438b2a4f0c9848f45
+_md5_=5c54824fa51be41153ea1e247d9a38e3
diff --git a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1 b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
index 4135228fac88..d2d53aca141d 100644
--- a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
+++ b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An easy-to-use and comprehensive named-color library
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Color-Library
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3f72496256ffabb298d99ac890e6f5a
+_md5_=5f02bdba9dd35042a00c745d173ef316
diff --git a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0 b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
index 2a17a9df375e..0dbe38354fce 100644
--- a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
+++ b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
@@ -4,10 +4,10 @@ DESCRIPTION=Interface to Bzip2 compression library
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Compress-Bzip2
 IUSE=test
-KEYWORDS=amd64 ia64 ~mips sparc x86 ~ppc-aix
+KEYWORDS=amd64 ia64 ~mips sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-arch/bzip2 virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=8f7a22bc949ab1e90533d71d44342c1d
+_md5_=4c581409cbdcaa2935bbd88dbb959a81
diff --git a/metadata/md5-cache/dev-perl/Config-General-2.630.0 b/metadata/md5-cache/dev-perl/Config-General-2.630.0
index a78fab2299ec..3fc56924d044 100644
--- a/metadata/md5-cache/dev-perl/Config-General-2.630.0
+++ b/metadata/md5-cache/dev-perl/Config-General-2.630.0
@@ -4,10 +4,10 @@ DESCRIPTION=Config file parser module
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Config-General
 IUSE=examples
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=9c4bb8f403632e7eb29266084e909eb4
+_md5_=2c44b243f8b8155dc67b6e31e9af1402
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
index 9bf11fa639b2..03a781b71517 100644
--- a/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
+++ b/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
@@ -4,10 +4,10 @@ DESCRIPTION=Read/Write .ini style files with as little code as possible
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Config-Tiny
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.23.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2ec096f676e4807a445092e63d2c09b
+_md5_=0a8b392f1440e9b40dd7ceae4bc32b7d
diff --git a/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1 b/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1
index a5a46736f289..3cec9e4f2800 100644
--- a/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl interface to the uulib library
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Convert-UUlib
 IUSE=system-uulib test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-uulib? ( >=dev-libs/uulib-0.5.20-r1 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Convert-UUlib-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e36b2c6f9eb82ce6c600e08ecb6c298
+_md5_=97687d3ca267c9157d1b0d0a5d1292f4
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
index 6ff4f7fb116f..e28483bb7176 100644
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
@@ -4,10 +4,10 @@ DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Cpanel-JSON-XS
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-3.0239.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=d8d3b810917e490967bb8d3070010310
+_md5_=375c5fcc588638f41fbe855f1e9e14d9
diff --git a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
index d5d61b2a4d26..4c54c579ff09 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Crypt::Blowfish module for perl
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Crypt-Blowfish
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=57e9b42267e3ffcbb458fd8d41c0b793
+_md5_=88a652ce86bc56d3a7a130068233cdc7
diff --git a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
index e0ef5572bf3a..acc69d02dda9 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Encrypt Data with Cipher Block Chaining Mode
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Crypt-CBC
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic
 RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a53fb4026798ad666413423b9af5c54a
+_md5_=c9fb0ecdbe0543a0cfcd1dc203dfc174
diff --git a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1 b/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
index 63bf2d8d5349..5dcbd38d4c39 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl DES encryption module
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Crypt-DES
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=DES
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=c691c5ba40fa981162aaa47d0d0287c0
+_md5_=78711b7b90a0ac4c084efad1a2f6f8d4
diff --git a/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0 b/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0
index a431ec250bbe..d9e567f89c29 100644
--- a/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0
+++ b/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Parse and save PGP packet streams
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Crypt-IDEA
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Crypt-IDEA
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9289a49f2e544460ee60f860024cde61
+_md5_=51c31c8470db457952908846fcde48f1
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0
index c3d517367b33..039bcfe3afe6 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=OpenSSL's multiprecision integer arithmetic
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Crypt-OpenSSL-Bignum
 IUSE=libressl
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=b0bf6f5e8be5ed43e16959bcfa5d6755
+_md5_=8b629095530a2d8654c747975e23348d
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0
index 7c45bf7226da..8c4ec8f7733d 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=OpenSSL/LibreSSL pseudo-random number generator access
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Crypt-OpenSSL-Random
 IUSE=libressl
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=73c91a0b1e6e16d5979ae7344fe7d05c
+_md5_=129426f4564485cfd7415bda70312e81
diff --git a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0 b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
index 92b4335b6be9..1851eb426b9e 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
@@ -4,10 +4,10 @@ DESCRIPTION=Crypt::CBC compliant Rijndael encryption module
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Crypt-Rijndael
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95a3d462a70ed14cf282cf445c85b8ff
+_md5_=3c2438e0f7ee770514046ac8a35529f9
diff --git a/metadata/md5-cache/dev-perl/DBD-Pg-3.7.0 b/metadata/md5-cache/dev-perl/DBD-Pg-3.7.0
index aff8e7630929..d49a37253173 100644
--- a/metadata/md5-cache/dev-perl/DBD-Pg-3.7.0
+++ b/metadata/md5-cache/dev-perl/DBD-Pg-3.7.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* virtual/p
 DESCRIPTION=PostgreSQL database driver for the DBI module
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DBD-Pg
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.7.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=36a878c5a5a3ae3f1f9e19840b5dc968
+_md5_=96ff4d94e4e4b13caf12fec49906b4fc
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0
index 37bf5b7efa16..e635510897a5 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0
@@ -4,10 +4,10 @@ DESCRIPTION=Self Contained RDBMS in a DBI Driver
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DBD-SQLite
 IUSE=test system-sqlite
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.21.0[extensions(+)] ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.58.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=2c5f83e6a9eeaedb0fc59aceedf5a1d7
+_md5_=235e4d60227a34cab446257c0f8bbb7a
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0
index bd63caef5163..1b8ec883d5d3 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0
@@ -4,10 +4,10 @@ DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DBD-mysql
 IUSE=test +ssl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.044.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95888836f343fd9bd09f8f0fbe1ebcde
+_md5_=f8760ee06ded121a8897e591adc34cdd
diff --git a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0 b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
index bae49ada315f..966c175b75ed 100644
--- a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
+++ b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compare perl data structures
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Data-Compare
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 hppa ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 hppa ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Find-Rule-0.100.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4695b5507d8bba24e9f795090ce7abf9
+_md5_=c9ad1a48538d76192b50884d8a9aaea2
diff --git a/metadata/md5-cache/dev-perl/Data-Dump-1.230.0 b/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
index d90b14978592..43a27c0a811f 100644
--- a/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
+++ b/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Pretty printing of data structures
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Data-Dump
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8363c90ae03aa9d8d1546f21f08b4112
+_md5_=ac0f801edb60f5278dd96b43452eb4c3
diff --git a/metadata/md5-cache/dev-perl/Data-OptList-0.110.0 b/metadata/md5-cache/dev-perl/Data-OptList-0.110.0
index 115ed7d74304..719f12b9f143 100644
--- a/metadata/md5-cache/dev-perl/Data-OptList-0.110.0
+++ b/metadata/md5-cache/dev-perl/Data-OptList-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=parse and validate simple name/value option pairs
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Data-OptList
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Install-0.921.0 dev-perl/Params-Util virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=4b65129fdb33cb1e69f706728d655b9b
+_md5_=c3d932b0d45ca5f2304ba22e15e3036c
diff --git a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1 b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
index f4bb01339e0e..eba7341af531 100644
--- a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
+++ b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Base classes wrapping fundamental Perl data types
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Data-Perl
 IUSE=test
-KEYWORDS=amd64 hppa ppc x86 ~ppc-macos
+KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-parent dev-perl/strictures dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTP/Data-Perl-0.002009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=beb1d0f1fcb38bdbfe505ad841d4427a
+_md5_=ada49cb21e4533976978fdcf74227722
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0 b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
index ab65e5c95838..cef013fb232b 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight IPv4 and IPv6 validation module
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Data-Validate-IP
 IUSE=test examples
-KEYWORDS=amd64 hppa sparc x86
+KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=dev-perl/NetAddr-IP-4 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=f7084374c14f9e1fdca4abfe050a8e2b
+_md5_=1a60904ddf0946c545c9235672bb79bf
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.440.0 b/metadata/md5-cache/dev-perl/DateTime-1.440.0
index d5d341852f02..74711bbec520 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.440.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.440.0
@@ -4,10 +4,10 @@ DESCRIPTION=A date and time object
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DateTime
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=!<=dev-perl/DateTime-Format-Mail-0.402.0 virtual/perl-Carp >=dev-perl/DateTime-Locale-1.60.0 >=dev-perl/DateTime-TimeZone-2.20.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Params-ValidationCompiler-0.130.0 virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.180.0 dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/namespace-autoclean-0.190.0 virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.44.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=225bcc2dec65a61d8ab8227d55923298
+_md5_=67ddbf395afc2898523e9e1e36ad133d
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
index ab9a379c2b39..b056ba454864 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
@@ -4,10 +4,10 @@ DESCRIPTION=Convert between DateTime and RFC2822/822 formats
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DateTime-Format-Mail
 IUSE=test
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.40.0 dev-perl/Params-Validate dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=6ddbc0a8b323408de8b822d08655bc4f
+_md5_=fb1d12ecdd52d8ace2628c816ca51b5c
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
index 0f5df21e4c7e..dc317c5f0f27 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parse and Format DateTimes using Strptime
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DateTime-Format-Strptime
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1 >=dev-perl/DateTime-Locale-1.50.0 >=dev-perl/DateTime-TimeZone-2.90.0 virtual/perl-Exporter >=dev-perl/Package-DeprecationManager-0.150.0 dev-perl/Params-ValidationCompiler >=dev-perl/Specio-0.330.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.74.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=b5c031aadc529349f1cd286fa63fe360
+_md5_=60dcacba68dab7e662344fa455bdb460
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.70.0 b/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.70.0
index 27564022cbc1..6bd98e7e2dc2 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.70.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.70.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parse and format W3CDTF datetime strings
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DateTime-Format-W3CDTF
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=3a90c5182590fc8531718cdaeb137061
+_md5_=9123b505e8b769607c268ce4d1dd65f9
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.160.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.160.0
index 3b1a2326f8aa..c9b8d12289a5 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-1.160.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.160.0
@@ -4,10 +4,10 @@ DESCRIPTION=Localization support for DateTime
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DateTime-Locale
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-2+ ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/File-ShareDir >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Specio-0.150.0 >=dev-perl/namespace-autoclean-0.190.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=1347e4d717e1f6d8d7b1e033746eeb3b
+_md5_=1d0722825820fedd54644d2024cd03ee
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.50.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.50.0
index 02323e1cfe55..99cc1d9c7c64 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-1.50.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Localization support for DateTime
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DateTime-Locale
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-2+ ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/Params-Validate >=virtual/perl-Scalar-List-Utils-1.450.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=efa01aa91a05c0a87a66dd407c4481c0
+_md5_=185c7df42d4fb76bfc9ec83eed508ee7
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.130.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.130.0
index 99eb26a99a58..7f84b9cda21d 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.130.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.130.0
@@ -4,10 +4,10 @@ DESCRIPTION=Time zone object base class and factory
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DateTime-TimeZone
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec dev-perl/Module-Runtime >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Specio-0.150.0 dev-perl/Try-Tiny dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=edd74d7cbddd890a47e7172cf411fc06
+_md5_=b8c83df7345a2973f68c9dbfc4ba61f2
diff --git a/metadata/md5-cache/dev-perl/Devel-CallChecker-0.8.0 b/metadata/md5-cache/dev-perl/Devel-CallChecker-0.8.0
index 541a6e86070f..448b0a527a5b 100644
--- a/metadata/md5-cache/dev-perl/Devel-CallChecker-0.8.0
+++ b/metadata/md5-cache/dev-perl/Devel-CallChecker-0.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Custom OP checking attached to subroutines
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Devel-CallChecker
 IUSE=test
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DynaLoader-Functions-0.1.0 virtual/perl-Exporter virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Devel-CallChecker-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a229ae7c4b5b6ad064933381a8c985e6
+_md5_=13670b3091b0ebe73d1aadb2d9ba1600
diff --git a/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0 b/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
index ea2695e0fa7b..39b94bd681e7 100644
--- a/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
+++ b/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/PadWalker dev-lang/perl:=[-build(-)]
 DESCRIPTION=Meatier versions of caller
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Devel-Caller
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PadWalker dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f6a6f18b7c4c113d69444d09e3fb1b8
+_md5_=1839a9f886383e1c20867aad5cd3c0c6
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0 b/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
index e9429bfbffb1..d62f00140dab 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
@@ -4,10 +4,10 @@ DESCRIPTION=check that a command is available
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Devel-CheckBin
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.520.0 virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=58cdafc2136e92a3ecf08f1a44f0261a
+_md5_=9db7a9862bcb1e1d45e7fb5cad31b83f
diff --git a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0 b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
index 0ac69dae95d3..905e60355cc8 100644
--- a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
+++ b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
@@ -4,10 +4,10 @@ DESCRIPTION=Find memory cycles in objects
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Devel-Cycle
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1befb760c239424d1fa0e05acaf83304
+_md5_=7219ac50a96e40e1cec4a53d298d5c28
diff --git a/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.140.0 b/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.140.0
index 0fa11574d880..f119e8e92409 100644
--- a/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.140.0
+++ b/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.140.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Sub-Exporter-Progressive-0.1.11 virtual/perl-ExtUtils-MakeMake
 DESCRIPTION=Returns the equivalent of ${^GLOBAL_PHASE} eq DESTRUCT for older perls
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Devel-GlobalDestruction
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Exporter-Progressive-0.1.11 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=0c9b5cfd2baeed9fd4d8403fb359837f
+_md5_=b10b96918423b0b90093513a9115f46b
diff --git a/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0 b/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
index 8d15285e02b7..926241d9a69a 100644
--- a/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
+++ b/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Devel-Caller-2.03 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Alias lexical variables
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Devel-LexAlias
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Devel-Caller-2.03 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Devel-LexAlias-0.05.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=60a95a997e2e1fcb826e1ba7ee020177
+_md5_=33fb815ce9574397a7612b4389977e94
diff --git a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.4.0 b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.4.0
index 788821c030a7..a81f5bf2509c 100644
--- a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.4.0
+++ b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Introspect overloaded operators
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Devel-OverloadInfo
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-perl/MRO-Compat >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=2c7cbe2a49997ee78394202b27ca84cc
+_md5_=745d9728cb43e3d74332778536829676
diff --git a/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0 b/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0
index df29db9fea4b..e55aa22bc778 100644
--- a/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0
+++ b/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0
@@ -4,10 +4,10 @@ DESCRIPTION=An object representing a stack trace
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Devel-StackTrace
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=c72b8da59c88a82822d6979687c2f213
+_md5_=f19bee0486c63b65e70be68962efe987
diff --git a/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0 b/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0
index 64ed7a561d2a..3b579b96d349 100644
--- a/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0
+++ b/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0
@@ -4,10 +4,10 @@ DESCRIPTION=Dump symbol names or the symbol table
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Devel-Symdump
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/Devel-Symdump-2.18.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fe24eb3899662a5b65539ee2eb729ebc
+_md5_=6997223bab9e0d828de37d7ebeeda9ec
diff --git a/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1 b/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
index b21c263cf6e2..d3df2cf841e6 100644
--- a/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Create bubble-babble fingerprints
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Digest-BubbleBabble
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Digest-BubbleBabble-0.02.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=130d4ef5c55e9c4ad507387a5d62080c
+_md5_=e51f84f3102cb917f2ae9fee54396639
diff --git a/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0-r1 b/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0-r1
index 556b747c5c28..db46c8f0bd0b 100644
--- a/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl interface to the GOST R 34.11-94 digest algorithm
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Digest-GOST
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRAY/Digest-GOST-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=09b33969a335aa898323c1c0619024d3
+_md5_=89b8f11788993ca617959ff96da43637
diff --git a/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0 b/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
index d54fdb6a19c2..50d455a8be26 100644
--- a/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
+++ b/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=Declare version conflicts for your dist
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Dist-CheckConflicts
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Module-Runtime-0.9.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=49ca5e10d90fb122227c522beea0f57b
+_md5_=e8bdbcc843fb8c742ed7688d078c3099
diff --git a/metadata/md5-cache/dev-perl/Dist-Metadata-0.927.0 b/metadata/md5-cache/dev-perl/Dist-Metadata-0.927.0
index 60cbdcebc994..bf50597870ec 100644
--- a/metadata/md5-cache/dev-perl/Dist-Metadata-0.927.0
+++ b/metadata/md5-cache/dev-perl/Dist-Metadata-0.927.0
@@ -4,10 +4,10 @@ DESCRIPTION=Information about a perl module distribution
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Dist-Metadata
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Archive-Tar-1.0.0 >=dev-perl/Archive-Zip-1.300.0 >=dev-perl/CPAN-DistnameInfo-0.120.0 >=virtual/perl-CPAN-Meta-2.100.0 virtual/perl-Carp >=virtual/perl-Digest-1.30.0 >=virtual/perl-Digest-MD5-2.0.0 >=virtual/perl-Digest-SHA-5.0.0 >=dev-perl/File-Spec-Native-1.2.0 >=virtual/perl-File-Temp-0.190.0 virtual/perl-Module-Metadata >=dev-perl/Path-Class-0.240.0 virtual/perl-Scalar-List-Utils >=dev-perl/Try-Tiny-0.90.0 virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/Dist-Metadata-0.927.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=753d4c125b08c25b7ae0ba242c37ebaf
+_md5_=b07de4987d9a770d6fdbf18828fb0a2d
diff --git a/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0 b/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0
index c371c650ac2e..59afdc782daa 100644
--- a/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0
+++ b/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Deconstructed Dynamic C Library Loading
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DynaLoader-Functions
 IUSE=test
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/DynaLoader-Functions-0.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=5d818f5cf66118e4900e05c6d0a80c3f
+_md5_=bab8cbeb54ac7272a22a9a1796a484b7
diff --git a/metadata/md5-cache/dev-perl/Email-Address-1.908.0 b/metadata/md5-cache/dev-perl/Email-Address-1.908.0
index 987de96ab610..af50c658ce16 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-1.908.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-1.908.0
@@ -4,10 +4,10 @@ DESCRIPTION=RFC 2822 Address Parsing and Creation
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Email-Address
 IUSE=test
-KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.908.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=25e0c82aed89b90b1ea7e5d1c0190a94
+_md5_=b44f166d3adb4c6fdb67ee1112aa4093
diff --git a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1 b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
index 193fb9c2db3d..d5a5b499d7fa 100644
--- a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/MailTools dev-perl/Email-Valid virtual/perl-Test-Simple dev-lang
 DESCRIPTION=Find RFC 822 email addresses in plain text
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Email-Find
-KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86 ~x86-linux
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MailTools dev-perl/Email-Valid virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Find-0.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f89c575efe481354b341aa89373c118c
+_md5_=ad0e2ad0406829e81a405b94d4c79fc9
diff --git a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0 b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
index 8bdc0e7bff64..8ba530858e7c 100644
--- a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
+++ b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
@@ -4,10 +4,10 @@ DESCRIPTION=Check validity of Internet email addresses
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Email-Valid
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86 ~x86-linux
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-perl/IO-CaptureOutput virtual/perl-IO dev-perl/MailTools dev-perl/Net-DNS >=dev-perl/Net-Domain-TLD-1.650.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=85323fa0d26b94ecf814423a3c86b2ab
+_md5_=72a59b1fbf3ff0a7fbb2ea90edb6e76c
diff --git a/metadata/md5-cache/dev-perl/Encode-EUCJPASCII-0.30.0 b/metadata/md5-cache/dev-perl/Encode-EUCJPASCII-0.30.0
index c670f09c2ddd..070b466aec85 100644
--- a/metadata/md5-cache/dev-perl/Encode-EUCJPASCII-0.30.0
+++ b/metadata/md5-cache/dev-perl/Encode-EUCJPASCII-0.30.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-Encode-1.140.0 virtual/perl-ExtUtils-MakeMaker dev-lang/pe
 DESCRIPTION=An eucJP-open mapping
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Encode-EUCJPASCII
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Encode-1.140.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=62797858008f77cbd97fad4beb876c06
+_md5_=1c7634ce9eeba3ebc3a0343f13c6b517
diff --git a/metadata/md5-cache/dev-perl/Encode-HanExtra-0.230.0-r2 b/metadata/md5-cache/dev-perl/Encode-HanExtra-0.230.0-r2
index c5bc0d5b7d4d..a3a0e409cb72 100644
--- a/metadata/md5-cache/dev-perl/Encode-HanExtra-0.230.0-r2
+++ b/metadata/md5-cache/dev-perl/Encode-HanExtra-0.230.0-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Encode dev-lang/perl:=
 DESCRIPTION=Extra sets of Chinese encodings
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Encode-HanExtra
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=virtual/perl-Encode dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=4fdb610930e0e13049ae161be10acfee
+_md5_=277e7da3017869845a9f7fd25238d02e
diff --git a/metadata/md5-cache/dev-perl/Error-0.170.250 b/metadata/md5-cache/dev-perl/Error-0.170.250
index 53683c566822..3284948668fd 100644
--- a/metadata/md5-cache/dev-perl/Error-0.170.250
+++ b/metadata/md5-cache/dev-perl/Error-0.170.250
@@ -4,10 +4,10 @@ DESCRIPTION=Error/exception handling in an OO-ish way
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Error
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) MIT
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17025.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=91241e1e8e012751f2928a9abadeacdb
+_md5_=959830649ba3b79aa5d1040a8bb86feb
diff --git a/metadata/md5-cache/dev-perl/Eval-Closure-0.140.0 b/metadata/md5-cache/dev-perl/Eval-Closure-0.140.0
index 67aa6d2e0d29..642fac2b6c87 100644
--- a/metadata/md5-cache/dev-perl/Eval-Closure-0.140.0
+++ b/metadata/md5-cache/dev-perl/Eval-Closure-0.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=safely and cleanly create closures via string eval
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Eval-Closure
 IUSE=test minimal
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny !minimal? ( >=dev-perl/Devel-LexAlias-0.50.0 dev-perl/Perl-Tidy ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=12071097e4ff762c1d9d3950e939134f
+_md5_=149797816b625693b22994e76bcf749c
diff --git a/metadata/md5-cache/dev-perl/Exception-Class-1.430.0 b/metadata/md5-cache/dev-perl/Exception-Class-1.430.0
index a506d88ebcdc..ec4609bc9ff4 100644
--- a/metadata/md5-cache/dev-perl/Exception-Class-1.430.0
+++ b/metadata/md5-cache/dev-perl/Exception-Class-1.430.0
@@ -4,10 +4,10 @@ DESCRIPTION=A module that allows you to declare real exception classes in Perl
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Exception-Class
 IUSE=test examples
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-2.0.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.43.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=2b1cb961756824c54d2dbbf751db6ccf
+_md5_=7f23249d5e9e26569ea44d804f60d682
diff --git a/metadata/md5-cache/dev-perl/Expect-1.350.0 b/metadata/md5-cache/dev-perl/Expect-1.350.0
index 7d0185c7aa94..1356f39e373f 100644
--- a/metadata/md5-cache/dev-perl/Expect-1.350.0
+++ b/metadata/md5-cache/dev-perl/Expect-1.350.0
@@ -4,10 +4,10 @@ DESCRIPTION=Expect for Perl
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Expect
 IUSE=test minimal examples
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-IO >=dev-perl/IO-Tty-1.110.0 !minimal? ( dev-perl/IO-Stty ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JACOBY/Expect-1.35.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=58b78d4f5c40ae0c85dfaa0078e5a5dc
+_md5_=78410112bc1db0a4597d7cc785b238a6
diff --git a/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.1 b/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.1
index fe671254de3f..4cac951836c0 100644
--- a/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.1
+++ b/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=An exporter with the features of Sub::Exporter but only core depende
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Exporter-Tiny
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=63bb8b2d68135c7e263fa30b4cc44753
+_md5_=63417c2c160783b7748c95f8dc3dc6ca
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.8.0 b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.8.0
index a6cc41c3f638..3358803f47e6 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.8.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=A wrapper for perl's configuration
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/ExtUtils-Config
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=9fa77c39ba259ade6fbb93ae87771c8f
+_md5_=f7ab880f1bb47c78eb6f75b49ffccf33
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0 b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0
index c74655346a29..35f5289b8a51 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0
@@ -4,10 +4,10 @@ DESCRIPTION=Easily build XS extensions that depend on XS extensions
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/ExtUtils-Depends
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.405.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=59fd7e2ea384f86955698111983c259f
+_md5_=550fabd07a7ad5d3517f14b34fa190e0
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.200.0-r1 b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.200.0-r1
index 393aa5da43c4..3d95c525637c 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.200.0-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-File-Spec virtual/fortran virtual/perl-ExtUtils-MakeMaker de
 DESCRIPTION=Facilitate use of FORTRAN from Perl/XS code
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/ExtUtils-F77
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/fortran dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHM/ExtUtils-F77-1.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=62924508a8f738bb5c1cc092b96067d7
+_md5_=ac2df9f429d2efa609de7da467185519
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.26.0 b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.26.0
index d3ddbf45cb9f..62a2a2cca7e9 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.26.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.26.0
@@ -4,10 +4,10 @@ DESCRIPTION=Various portability utilities for module builders
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/ExtUtils-Helpers
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=virtual/perl-Text-ParseWords-3.240.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=14475251dcd56363057e4c1b58d7f08a
+_md5_=4a81f917c008e5aae889ccf57a9d6e72
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.11.0 b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.11.0
index e5e5113aa9c5..7b908eecc8a9 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.11.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.11.0
@@ -4,10 +4,10 @@ DESCRIPTION=Build.PL install path logic made easy
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/ExtUtils-InstallPaths
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/ExtUtils-Config-0.2.0 virtual/perl-File-Spec dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=d1d8115f0f9e0096f3d0926309350106
+_md5_=d4307eb5ef670121dcaf4ce91d34572e
diff --git a/metadata/md5-cache/dev-perl/FCGI-0.780.0 b/metadata/md5-cache/dev-perl/FCGI-0.780.0
index 51739d0c9116..d6a46b0e940f 100644
--- a/metadata/md5-cache/dev-perl/FCGI-0.780.0
+++ b/metadata/md5-cache/dev-perl/FCGI-0.780.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Fast CGI module
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/FCGI
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 s390 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=FastCGI
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.78.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=2b462b86d2aaf9259cdb74e63df1bbbc
+_md5_=5e73796ea20488da6fa8252b5429fe29
diff --git a/metadata/md5-cache/dev-perl/File-BaseDir-0.70.0 b/metadata/md5-cache/dev-perl/File-BaseDir-0.70.0
index 0f541b0cc3b7..fae6af833558 100644
--- a/metadata/md5-cache/dev-perl/File-BaseDir-0.70.0
+++ b/metadata/md5-cache/dev-perl/File-BaseDir-0.70.0
@@ -4,10 +4,10 @@ DESCRIPTION=Use the Freedesktop.org base directory specification
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-BaseDir
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
+KEYWORDS=alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec dev-perl/IPC-System-Simple dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=b812278789254a648a2158bfd3145311
+_md5_=f0b0bd0b6cabcaa6c734c30b5f322588
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1 b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
index 8231b5e790d3..f31b7d373435 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=uses File::Copy to recursively copy dirs
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/File-Copy-Recursive
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.38.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=034269ee87f47f44460048cb65ef69e0
+_md5_=0d4f739120268ee054c880b2d8810f6e
diff --git a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0 b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
index f0a248b2b99e..341e06603461 100644
--- a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
+++ b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
@@ -4,10 +4,10 @@ DESCRIPTION=Object to handle .desktop files
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-DesktopEntry
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
+KEYWORDS=alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode >=dev-perl/File-BaseDir-0.30.0 virtual/perl-File-Path virtual/perl-File-Spec dev-perl/URI dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=40293645d3057804b9a86cbe0a38dc4a
+_md5_=dd243e9bedb72a58526612da4efdf070
diff --git a/metadata/md5-cache/dev-perl/File-Find-Rule-0.340.0 b/metadata/md5-cache/dev-perl/File-Find-Rule-0.340.0
index e45092247ee0..476b01af0047 100644
--- a/metadata/md5-cache/dev-perl/File-Find-Rule-0.340.0
+++ b/metadata/md5-cache/dev-perl/File-Find-Rule-0.340.0
@@ -4,10 +4,10 @@ DESCRIPTION=Alternative interface to File::Find
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-Find-Rule
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-perl/Number-Compare dev-perl/Text-Glob dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=b542ecd3863dff1527d2a71508f5e013
+_md5_=cf98c1689e547c74018789182444369c
diff --git a/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0 b/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
index 0bae9ee8c32f..1a005c3effbf 100644
--- a/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
+++ b/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Get home directory for self or other user
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-HomeDir
 IUSE=+xdg test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-File-Path-2.10.0 >=virtual/perl-File-Spec-3 >=virtual/perl-File-Temp-0.190.0 >=dev-perl/File-Which-0.50.0 xdg? ( x11-misc/xdg-user-dirs ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=696187e0a6e8a0c4adfd73668b8cd492
+_md5_=3302e68fe6dfa1e0dee740d84f998b57
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0 b/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0
index a22c0122ae96..0d30cb99ce62 100644
--- a/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0
+++ b/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0
@@ -4,10 +4,10 @@ DESCRIPTION=Locate per-dist and per-module shared files
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-ShareDir
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-Inspector-1.120.0 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.104.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=1108cd4a5d817077fb53ba1436d0d438
+_md5_=63b457a19b8a9311cd3940aab4ec1fd3
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.110.0 b/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.110.0
index e7255c7ad245..4457a28db4cb 100644
--- a/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.110.0
+++ b/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=Install shared files
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-ShareDir-Install
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=dd9f95b270146f4df22bb4f143d034ae
+_md5_=145a45ec1d9d179d87f865791047676e
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1 b/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1
index 9624f34c162d..c8e97270cb90 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Efficient Reading/Writing of Complete Files
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/File-Slurp
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UR/URI/File-Slurp-9999.19.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95bbfd52d51b9e722c18010c125ab072
+_md5_=3f03c796ad659032376ba89fbdb129fe
diff --git a/metadata/md5-cache/dev-perl/File-Slurper-0.10.0 b/metadata/md5-cache/dev-perl/File-Slurper-0.10.0
index 9fda1d334933..1c6ea6bbcf9c 100644
--- a/metadata/md5-cache/dev-perl/File-Slurper-0.10.0
+++ b/metadata/md5-cache/dev-perl/File-Slurper-0.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=A simple, sane and efficient module to slurp a file
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-Slurper
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PerlIO-utf8_strict virtual/perl-Carp virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.010.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=0074744b795428ef923136f7df033800
+_md5_=b1d0e625b5d6f086e0b075abc3903c18
diff --git a/metadata/md5-cache/dev-perl/File-Spec-Native-1.4.0 b/metadata/md5-cache/dev-perl/File-Spec-Native-1.4.0
index c100c2fd7422..e27a34807ec8 100644
--- a/metadata/md5-cache/dev-perl/File-Spec-Native-1.4.0
+++ b/metadata/md5-cache/dev-perl/File-Spec-Native-1.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Use native OS implementation of File::Spec from a subclass
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-Spec-Native
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/File-Spec-Native-1.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=d4b5f9c864fe1459bb24b735bf5723c9
+_md5_=b829007e784be93499d87bf6ca895cc8
diff --git a/metadata/md5-cache/dev-perl/File-Which-1.220.0 b/metadata/md5-cache/dev-perl/File-Which-1.220.0
index 8c6be9f5be9e..f8ce9fab33bc 100644
--- a/metadata/md5-cache/dev-perl/File-Which-1.220.0
+++ b/metadata/md5-cache/dev-perl/File-Which-1.220.0
@@ -4,11 +4,11 @@ DESCRIPTION=Perl module implementing 'which' internally
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-Which
 IUSE=test +pwhich
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=pwhich? ( dev-perl/App-pwhich )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=ed5c3f860ba9167d17e21ffdb2520fb2
+_md5_=9234591cf5df6fa03cf20122aa2d39c4
diff --git a/metadata/md5-cache/dev-perl/File-chmod-0.420.0 b/metadata/md5-cache/dev-perl/File-chmod-0.420.0
index ac27e582036a..d23fd8e5c055 100644
--- a/metadata/md5-cache/dev-perl/File-chmod-0.420.0
+++ b/metadata/md5-cache/dev-perl/File-chmod-0.420.0
@@ -4,10 +4,10 @@ DESCRIPTION=Implements symbolic and ls chmod modes
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/File-chmod
 IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XE/XENO/File-chmod-0.42.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7cadcd57b912b8fdd804d05443ccf0e4
+_md5_=9f43be4b0fb6a9ebdf67693212d9c02a
diff --git a/metadata/md5-cache/dev-perl/File-pushd-1.14.0 b/metadata/md5-cache/dev-perl/File-pushd-1.14.0
index 3854af3e7427..d5d3fca63978 100644
--- a/metadata/md5-cache/dev-perl/File-pushd-1.14.0
+++ b/metadata/md5-cache/dev-perl/File-pushd-1.14.0
@@ -4,10 +4,10 @@ DESCRIPTION=Change directory temporarily for a limited scope
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-pushd
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.014.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=50653a0f6c9977a11bb471a0229cfd1f
+_md5_=77d653f6d924c3de28dbb7efb261b873
diff --git a/metadata/md5-cache/dev-perl/File-pushd-1.9.0 b/metadata/md5-cache/dev-perl/File-pushd-1.9.0
index 495274e75956..348d7d2478ba 100644
--- a/metadata/md5-cache/dev-perl/File-pushd-1.9.0
+++ b/metadata/md5-cache/dev-perl/File-pushd-1.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=Change directory temporarily for a limited scope
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-pushd
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=1a70e8fd0b637a4354692e57c99a912b
+_md5_=b81e9797f077ca63d367fd7a76931993
diff --git a/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.103.0 b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.103.0
index d40494736fa4..8ba63dfacc2a 100644
--- a/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.103.0
+++ b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.103.0
@@ -4,10 +4,10 @@ DESCRIPTION=Getopt::Long with usage text
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Getopt-Long-Descriptive
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/MooseX-Getopt-0.660.0 virtual/perl-Carp >=virtual/perl-Getopt-Long-2.330.0 >=dev-perl/Params-Validate-0.970.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.972.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.103.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=9c699cc2703fca2b0dfa184681d971da
+_md5_=60d4770bedb270dbeba96f041783b42d
diff --git a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0 b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
index 2e0edd8b574b..f4830629eb10 100644
--- a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
@@ -4,10 +4,10 @@ DESCRIPTION=Convert plain text to HTML
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/HTML-FromText
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ~mips ppc x86
+KEYWORDS=amd64 ~arm hppa ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Find-0.90.0 >=virtual/perl-Exporter-5.58 >=dev-perl/HTML-Parser-1.260.0 >=virtual/perl-Scalar-List-Utils-1.120.0 >=virtual/perl-Text-Tabs+Wrap-98.112.800 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/HTML-FromText-2.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=fa6f07c267534599d277434d27ae9577
+_md5_=5707ad61531a550a423b310d2684dd6c
diff --git a/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0 b/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0
index 9add3a920f7f..0c22df6cd080 100644
--- a/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0
+++ b/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parse <HEAD> section of HTML documents
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/HTML-Parser
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Tagset-3.03 virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=8611554eafd2d1858571caaec18e0d1f
+_md5_=075561b849d457686f245474eb49d0f5
diff --git a/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1 b/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
index c05cad0a4e48..5a0dc2a54ad1 100644
--- a/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Data tables useful in parsing HTML
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/HTML-Tagset
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c187780df86f834a11e9e700a03511c
+_md5_=f86303aa78ee299c85ee484fdb2b0e7e
diff --git a/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0 b/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0
index 815211a8b7aa..39b1bcf79d19 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight HTTP Server
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/HTTP-Server-Simple
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CGI >=virtual/perl-Socket-1.940.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=2ff7330b2f3e54a2cd789dd70e3680b6
+_md5_=bbc389ba280f2db4763c897cb4abb410
diff --git a/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0 b/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0
index 9c8d8a165930..a7d809d77344 100644
--- a/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0
+++ b/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight field hash for inside-out objects
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Hash-FieldHash
 IUSE=test examples
-KEYWORDS=amd64 hppa ppc x86
+KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-XSLoader-0.20.0 >=virtual/perl-parent-0.221.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Hash-FieldHash-0.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=9d3857f4f2e7f0f74efb2be038f133f3
+_md5_=23ac0313833e8184f9a62d79e744ea79
diff --git a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1 b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1
index bca9dd4e9fde..eacd163eafdf 100644
--- a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1
+++ b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Capture STDOUT and STDERR from Perl code, subprocesses or XS
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/IO-CaptureOutput
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Temp-0.160.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1104.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=383bb7b43c0abaa66db333c1d0fae691
+_md5_=3e744075f4d91840da79a17fdbf0fde9
diff --git a/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r1 b/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r1
index c00a3c1ace24..69283868b1b3 100644
--- a/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-IO virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Manage IO on many file handles
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/IO-Multiplex
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=46cb8ae47ad361081ce7b4d31b7a08d1
+_md5_=da068db39d1cdec5958d3a16becf4a3a
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0-r1 b/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0-r1
index df604b6787c5..4b4aeed9d5c5 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Socket6 dev-perl/Module-Build dev-lang/perl:=
 DESCRIPTION=Work with IO sockets in ipv6
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/IO-Socket-INET6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Socket6 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=1a7f1de2bfee372035c7308fbb366a1f
+_md5_=2a00d651491e5d4ab218b235f8ea11d6
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.52.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.52.0
index 312459ad71a8..995724c55e9b 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.52.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.52.0
@@ -4,10 +4,10 @@ DESCRIPTION=Nearly transparent SSL encapsulation for IO::Socket::INET
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/IO-Socket-SSL
 IUSE=idn examples
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.052.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=2f14c07ccf5b3e4245dc7b813b071926
+_md5_=faa7af222ae4d646f1895ca4d46ec1bc
diff --git a/metadata/md5-cache/dev-perl/IO-Tty-1.120.0 b/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
index ef0db9332861..f3578e8adec7 100644
--- a/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
+++ b/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=IO::Tty and IO::Pty modules for Perl
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/IO-Tty
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f017a452853b5d9acc84bcc0bbe509f7
+_md5_=446c6b59fc4c18a8411fbba5bfdb60e6
diff --git a/metadata/md5-cache/dev-perl/IPC-Run-0.960.0 b/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
index b5fbfb40250d..3b1121dc1c12 100644
--- a/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
+++ b/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
@@ -4,10 +4,10 @@ DESCRIPTION=system() and background procs w/ piping, redirs, ptys
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/IPC-Run
 IUSE=test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/IO-Tty-1.80.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.96.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=ad2764c024b8b9230761cd52d7eb6ff8
+_md5_=f7eff4b37b1716473d59eef679865d18
diff --git a/metadata/md5-cache/dev-perl/IPC-Run3-0.48.0 b/metadata/md5-cache/dev-perl/IPC-Run3-0.48.0
index 161de1fc1d03..008a5f05ca2e 100644
--- a/metadata/md5-cache/dev-perl/IPC-Run3-0.48.0
+++ b/metadata/md5-cache/dev-perl/IPC-Run3-0.48.0
@@ -4,10 +4,10 @@ DESCRIPTION=Run a subprocess in batch mode (a la system)
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/IPC-Run3
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+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=|| ( BSD-2 Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-HiRes dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/IPC-Run3-0.048.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=7a986ad389936f79044e37938544a85d
+_md5_=24263f4dd57f58806a9fef72550bc6b4
diff --git a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0 b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
index b9c50c84b333..484f4e49275f 100644
--- a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
+++ b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
@@ -4,10 +4,10 @@ DESCRIPTION=Run commands simply, with detailed diagnostics
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/IPC-System-Simple
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJF/IPC-System-Simple-1.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=451b2bb57b49df6ac5f33e3f5c3ea330
+_md5_=cac2f66164539de2d35428ef0130e9b6
diff --git a/metadata/md5-cache/dev-perl/Importer-0.24.0 b/metadata/md5-cache/dev-perl/Importer-0.24.0
index ce6db2d2e124..abd35f098409 100644
--- a/metadata/md5-cache/dev-perl/Importer-0.24.0
+++ b/metadata/md5-cache/dev-perl/Importer-0.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=Alternative interface to modules that export symbols
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Importer
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.024.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=2dbe6d96fcfb095d1cdb9b80c22f7e52
+_md5_=b4e680b8fde6e4904272385491cb272f
diff --git a/metadata/md5-cache/dev-perl/JSON-2.940.0 b/metadata/md5-cache/dev-perl/JSON-2.940.0
index 4973250c6099..4183319058f6 100644
--- a/metadata/md5-cache/dev-perl/JSON-2.940.0
+++ b/metadata/md5-cache/dev-perl/JSON-2.940.0
@@ -4,10 +4,10 @@ DESCRIPTION=JSON (JavaScript Object Notation) encoder/decoder
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/JSON
 IUSE=test +xs examples
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=xs? ( >=dev-perl/JSON-XS-2.340.0 ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-2.94.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=83dd75df7409bbe26e1149873e71af25
+_md5_=5d2938ce7094284602204ddb9ee1931b
diff --git a/metadata/md5-cache/dev-perl/JSON-Any-1.390.0 b/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
index 459b6eb58bf3..dd3c2daaf5c7 100644
--- a/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
+++ b/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
@@ -4,10 +4,10 @@ DESCRIPTION=Wrapper Class for the various JSON classes (DEPRECATED)
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/JSON-Any
 IUSE=test
-KEYWORDS=~amd64 ~mips ~x86 ~x64-macos ~x86-solaris
+KEYWORDS=~amd64 ~mips ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp || ( >=dev-perl/JSON-XS-2.3 virtual/perl-JSON-PP dev-perl/JSON ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=365f2b7dde9c723d9b1da37ca19d124f
+_md5_=f7d055d9494fba67ae3c9fe80c64b592
diff --git a/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9 b/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
index f72a696747f6..d91bfc148429 100644
--- a/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
+++ b/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
@@ -4,10 +4,10 @@ DESCRIPTION=Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/JSON-MaybeXS
 IUSE=test +xs
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-JSON-PP-2.273.0 virtual/perl-Scalar-List-Utils xs? ( || ( >=dev-perl/Cpanel-JSON-XS-2.331.0 >=dev-perl/JSON-XS-3.0.0 ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.003009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=40310dc524a3f27d296300a46ff3622c
+_md5_=e2e029d21dc077e08961ff29dde3115c
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-3.40.0 b/metadata/md5-cache/dev-perl/JSON-XS-3.40.0
index 64a4741585c9..62cd038b285f 100644
--- a/metadata/md5-cache/dev-perl/JSON-XS-3.40.0
+++ b/metadata/md5-cache/dev-perl/JSON-XS-3.40.0
@@ -4,10 +4,10 @@ DESCRIPTION=JSON::XS - JSON serialising/deserialising, done correctly and fast
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/JSON-XS
 IUSE=test examples
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Types-Serialiser dev-perl/common-sense !<dev-perl/JSON-2.900.0 !<dev-perl/JSON-Any-1.310.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-3.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=ae3a47a91d724f55d270c2a5f033caf4
+_md5_=794223a4a517887cab2399db26802f12
diff --git a/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1 b/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
index 2a7153ef9cb3..67230c58930f 100644
--- a/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-MIME-Base64-2.1 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Japanese transcoding module for Perl
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Jcode
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2.1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Jcode-2.07.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d609256f0e19dee0e283fe1bdce881bc
+_md5_=908b2515462eb1f575d506efd725b972
diff --git a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2 b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
index 0a59b1babd85..2e65a687727f 100644
--- a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
+++ b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Does your process have access to the web
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/LWP-Online
 IUSE=test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libwww-perl-5.805.0 >=dev-perl/URI-1.350.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/LWP-Online-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=d109eb46d94ce9c2cb03db7b0265f43f
+_md5_=5b4a44d71058c4204962b74c60b7c3df
diff --git a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.70.0 b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.70.0
index b12e5c67a43c..03d0d4fcedbb 100644
--- a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.70.0
+++ b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.70.0
@@ -4,10 +4,10 @@ DESCRIPTION=Provide https support for LWP::UserAgent
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/LWP-Protocol-https
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-misc/ca-certificates >=dev-perl/IO-Socket-SSL-1.540.0 >=dev-perl/libwww-perl-6.60.0 >=dev-perl/Net-HTTP-6 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=9a1b50f83e73acf997f30ab242076f06
+_md5_=ea06fdae3ae4432c0652fa860b6159b5
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2 b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2
index ea9e540dd360..8560fe7201ce 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2
+++ b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2
@@ -4,10 +4,10 @@ DESCRIPTION=Perl encapsulation of invoking the Latex programs
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/LaTeX-Driver
 IUSE=test
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Readonly virtual/perl-parent virtual/latex-base dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Driver-0.300.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=54b47694e108ef07880a781944249723
+_md5_=320968903988ae4b6590ef00309daede
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.92.0 b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.92.0
index 338d0219bda8..c398a356f356 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.92.0
+++ b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.92.0
@@ -4,10 +4,10 @@ DESCRIPTION=Encode characters for LaTeX formatting
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/LaTeX-Encode
 IUSE=test
-KEYWORDS=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Getopt-Long dev-perl/HTML-Parser dev-perl/Pod-LaTeX dev-perl/Readonly dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Encode-0.092.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a41d2c74be82d662a054fd03809895cf
+_md5_=7cc161c1624f8a6a2d8c7d601347687f
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6-r1 b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6-r1
index 6251a9c2cc39..865f2bf14063 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6-r1
+++ b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for the automatic generation of LaTeX tables
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/LaTeX-Table
 IUSE=test examples
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Carp dev-perl/Module-Pluggable dev-perl/Moose dev-perl/MooseX-FollowPBP virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit virtual/perl-version dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LI/LIMAONE/LaTeX-Table-v1.0.6.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=12b22069db5d9ca1320e7311900b5229
+_md5_=b1ded97217ccee1c92b2195d1d8fe70f
diff --git a/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0 b/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
index 904226fcf4e9..006c17b1c187 100644
--- a/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
+++ b/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
@@ -4,10 +4,10 @@ DESCRIPTION=Prevent leakage of lexical hints
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Lexical-SealRequireHints
 IUSE=test
-KEYWORDS=amd64 hppa ppc x86
+KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/B-Hooks-OP-Check-0.190.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Lexical-SealRequireHints-0.011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e0dc3c4bc6137f752e2babba5b5d1d79
+_md5_=5395fd83f54c98f5840245cfdcee38c1
diff --git a/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0 b/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
index d4a5e338a223..a2b56595408e 100644
--- a/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
+++ b/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lets you build groups of accessors
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/MRO-Compat
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a1a10d0b994b8b555201f86333fe025e
+_md5_=2e933327972089d7ace26d04a9145586
diff --git a/metadata/md5-cache/dev-perl/MailTools-2.190.0 b/metadata/md5-cache/dev-perl/MailTools-2.190.0
index e8c50b0e821d..4a855f13b7f7 100644
--- a/metadata/md5-cache/dev-perl/MailTools-2.190.0
+++ b/metadata/md5-cache/dev-perl/MailTools-2.190.0
@@ -4,10 +4,10 @@ DESCRIPTION=Manipulation of electronic mail addresses
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/MailTools
 IUSE=test examples
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate virtual/perl-IO >=virtual/perl-libnet-1.50.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=c72c9e0765ecfdd0006a917d49445bbf
+_md5_=5002caa39f94293979119f36fea9f459
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index a6e17aceecb2..cd21c5cf877f 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0 b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
index 6905aa5eca97..8a8641a762a9 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
@@ -4,10 +4,10 @@ DESCRIPTION=A tiny replacement for Module::Build
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Module-Build-Tiny
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-CPAN-Meta >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-CBuilder >=dev-perl/ExtUtils-Config-0.3.0 >=dev-perl/ExtUtils-Helpers-0.20.0 virtual/perl-ExtUtils-Install >=dev-perl/ExtUtils-InstallPaths-0.2.0 virtual/perl-ExtUtils-ParseXS virtual/perl-File-Path virtual/perl-File-Spec >=virtual/perl-Getopt-Long-2.360.0 >=virtual/perl-JSON-PP-2.0.0 virtual/perl-podlators virtual/perl-Test-Harness dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=324f6db940966bf3429b5a0877ad2981
+_md5_=62ce8b1d8efeacc3bc2a4753c5b56e6c
diff --git a/metadata/md5-cache/dev-perl/Module-Implementation-0.90.0 b/metadata/md5-cache/dev-perl/Module-Implementation-0.90.0
index 67bee7759687..79be1ece9773 100644
--- a/metadata/md5-cache/dev-perl/Module-Implementation-0.90.0
+++ b/metadata/md5-cache/dev-perl/Module-Implementation-0.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=Loads one of several alternate underlying implementations for a modu
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Module-Implementation
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/Module-Runtime-0.12.0 dev-perl/Try-Tiny dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=fb5e945cfe1768f3ceb6646a166402e6
+_md5_=4503428c70b55e43ea0ff6c0d8ec6ddf
diff --git a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0 b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
index 55c49b880b0a..9e952697773c 100644
--- a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
+++ b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
@@ -4,10 +4,10 @@ DESCRIPTION=Automatically give your module the ability to have plugins
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Module-Pluggable
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-3 virtual/perl-if dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db8b04f833e0722db0931eec5018b81f
+_md5_=97a7f0e3f2675b29b5f1e43d35cfd3b3
diff --git a/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0 b/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
index 8b4767cab75b..415cdbce42de 100644
--- a/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
+++ b/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
@@ -4,10 +4,10 @@ DESCRIPTION=Runtime module handling
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Module-Runtime
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=747914415cdb4d450edcbc2306dfccab
+_md5_=75e6c41201bc10e62f73c85140f957cc
diff --git a/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.3.0 b/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.3.0
index b5b4999ec00e..3a2949d319ab 100644
--- a/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.3.0
+++ b/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Provide information on conflicts for Module::Runtime
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Module-Runtime-Conflicts
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Dist-CheckConflicts dev-perl/Module-Runtime dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=2d7e8d320f594d4a31e0c487b220e14a
+_md5_=6ca32d7cc24d3fa9ad403f4604d9bad9
diff --git a/metadata/md5-cache/dev-perl/Moo-2.3.3 b/metadata/md5-cache/dev-perl/Moo-2.3.3
index 3e117422371c..9349f21d1fc2 100644
--- a/metadata/md5-cache/dev-perl/Moo-2.3.3
+++ b/metadata/md5-cache/dev-perl/Moo-2.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=Minimalist Object Orientation (with Moose compatiblity)
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Moo
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Method-Modifiers-1.100.0 >=dev-perl/Devel-GlobalDestruction-0.110.0 >=virtual/perl-Exporter-5.570.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Role-Tiny-2.0.4 >=dev-perl/Sub-Quote-2.3.1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=3a1519d27da409e3aae543edbd411b16
+_md5_=63d82116f2ba9e484a486739b8695a52
diff --git a/metadata/md5-cache/dev-perl/Moose-2.200.700 b/metadata/md5-cache/dev-perl/Moose-2.200.700
index 31e9dabeaad3..a0658cd9c4c8 100644
--- a/metadata/md5-cache/dev-perl/Moose-2.200.700
+++ b/metadata/md5-cache/dev-perl/Moose-2.200.700
@@ -4,10 +4,10 @@ DESCRIPTION=A postmodern object system for Perl 5
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Moose
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/Catalyst-5.900.499.990 !<=dev-perl/Config-MVP-2.200.4 !<=dev-perl/Devel-REPL-1.3.20 !<=dev-perl/Dist-Zilla-5.43.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.16.0 !<=dev-perl/Fey-0.360.0 !<=dev-perl/Fey-ORM-0.420.0 !<=dev-perl/File-ChangeNotify-0.150.0 !<=dev-perl/HTTP-Throwable-0.17.0 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160.0 !<=dev-perl/Mason-2.180.0 !<=dev-perl/Moose-Autobox-0.150.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80.0 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-App-1.220.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.3 !<=dev-perl/MooseX-Attribute-Prototype-0.100.0 !<=dev-perl/MooseX-AttributeHelpers-0.220.0 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20.0 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.260.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.21.0 !<=dev-perl/MooseX-Declare-0.350.0 !<=dev-perl/MooseX-FollowPBP-0.20.0 !<=dev-perl/MooseX-Getopt-0.560.0 !<=dev-perl/MooseX-InstanceTracking-0.40.0 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Method-Signatures-0.440.0 !<=dev-perl/MooseX-MethodAttributes-0.220.0 !<=dev-perl/MooseX-NonMoose-0.240.0 !<=dev-perl/MooseX-Object-Pluggable-0.1.100 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50.0 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60.0 !<=dev-perl/MooseX-Role-Parameterized-1.0.0 !<=dev-perl/MooseX-Role-WithOverloading-0.140.0 !<=dev-perl/MooseX-Runnable-0.30.0 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.473 !<=dev-perl/MooseX-Singleton-0.250.0 !<=dev-perl/MooseX-SlurpyConstructor-1.100.0 !<=dev-perl/MooseX-Storage-0.420.0 !<=dev-perl/MooseX-StrictConstructor-0.120.0 !<=dev-perl/MooseX-Traits-0.110.0 !<=dev-perl/MooseX-Types-0.190.0 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Set-Object-0.30.0 !<=dev-perl/MooseX-Types-Signal-1.101.930 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Pod-Weaver-3.101.638 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/Test-CleanNamespaces-0.30.0 !<=dev-perl/Test-Moose-More-0.22.0 !<=dev-perl/Test-TempDir-0.50.0 !<=dev-perl/Throwable-0.102.80 !<=dev-perl/namespace-autoclean-0.80.0 >=virtual/perl-Carp-1.220.0 >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Devel-OverloadInfo-0.4.0 >=dev-perl/Devel-StackTrace-1.330.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/MRO-Compat-0.50.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Module-Runtime-Conflicts-0.2.0 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Sub-Exporter-0.980.0 dev-perl/Sub-Identify >=dev-perl/Sub-Name-0.200.0 >=dev-perl/Try-Tiny-0.170.0 >=virtual/perl-parent-0.223.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=771216846364d24feba7d9c0fc50c4f2
+_md5_=63921a9e97ecb29d26521f66e31e7150
diff --git a/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1 b/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1
index eaaab72ca870..12b4c19017d0 100644
--- a/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Name your accessors get_foo() and set_foo(), whatever that may mean
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/MooseX-FollowPBP
 IUSE=test
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Moose-1.160.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-FollowPBP-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=0b648b771ee1a8c1c01e73764ff31b4a
+_md5_=e99c8604a578136d155673630b5d7071
diff --git a/metadata/md5-cache/dev-perl/Net-DBus-1.1.0 b/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
index bd502c5c0579..00cf5c5b4fe2 100644
--- a/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
+++ b/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for the DBus message system
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-DBus
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-apps/dbus virtual/perl-Time-HiRes dev-perl/XML-Twig dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.1.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=54ca965fad9374eca1bcf95533186cc0
+_md5_=8050731442a1de7ca36c5658d3f23fc4
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.30.0 b/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.30.0
index 72fd6395c0a8..f28fa2447723 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.30.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.30.0
@@ -4,10 +4,10 @@ DESCRIPTION=DNSSEC extensions to Net::DNS
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-DNS-SEC
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-perl/Crypt-OpenSSL-Bignum-0.50.0 >=dev-perl/Crypt-OpenSSL-RSA-0.280.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=dev-perl/Net-DNS-1.10.0 >=virtual/perl-Digest-SHA-5.230.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-1.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=4db4e7de063d4e07a048e12b80af2e39
+_md5_=0dd1ff77e6824eef961290a0e994244b
diff --git a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0 b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0
index 433c5fbd494b..833763fff7b9 100644
--- a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0
+++ b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Carp virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker d
 DESCRIPTION=Current top level domain names including new ICANN additions and ccTLDs
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-Domain-TLD
-KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Storable dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.75.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=47bf331df7f05e20a42b19381d15143d
+_md5_=cf573f1deb2b675fcc6ef9933476fa07
diff --git a/metadata/md5-cache/dev-perl/Net-HTTP-6.170.0 b/metadata/md5-cache/dev-perl/Net-HTTP-6.170.0
index 72adf8e3a3d9..3132870e38cb 100644
--- a/metadata/md5-cache/dev-perl/Net-HTTP-6.170.0
+++ b/metadata/md5-cache/dev-perl/Net-HTTP-6.170.0
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level HTTP connection (client)
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-HTTP
 IUSE=minimal test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( virtual/perl-IO-Socket-IP dev-perl/IO-Socket-INET6 >=dev-perl/IO-Socket-SSL-2.12.0 ) virtual/perl-Carp !<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib virtual/perl-IO virtual/perl-IO-Compress dev-perl/URI dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a17d256e5614d320de3f170d6127825d
+_md5_=641b427d8d47f3bd3712f213f06f8710
diff --git a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0 b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
index 44621d9a0b63..e16e753ba7c5 100644
--- a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
+++ b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalizing Domain Names in Applications (IDNA)
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-IDN-Encode
 IUSE=test examples
-KEYWORDS=amd64 ~ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Unicode-Normalize dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=36e8b9c40014f08e065763d5c4e58c29
+_md5_=5378161b59b40e43adc3426a38a85ea9
diff --git a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1 b/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
index bde0529b1f39..65a069007fa2 100644
--- a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Numeric comparisons
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Number-Compare
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17b452d5f433f2fb05c9e197a9e887c4
+_md5_=c5f5b4e944f0795a9e963b4bdf82e7f8
diff --git a/metadata/md5-cache/dev-perl/PPI-1.236.0 b/metadata/md5-cache/dev-perl/PPI-1.236.0
index 9a0bc50ea06d..79d5cb27b550 100644
--- a/metadata/md5-cache/dev-perl/PPI-1.236.0
+++ b/metadata/md5-cache/dev-perl/PPI-1.236.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parse, Analyze and Manipulate Perl (without perl)
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/PPI
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha ~amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Clone-0.300.0 >=virtual/perl-Digest-MD5-2.350.0 >=virtual/perl-File-Spec-3.270.100 >=dev-perl/IO-String-1.70.0 >=dev-perl/List-MoreUtils-0.160.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Params-Util-1.000.0 >=virtual/perl-Storable-2.170.0 dev-perl/Task-Weaken dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.236.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e38281c18bc04d655531b2cef2376463
+_md5_=85cc6bbb52b667c0d42a0a364bb365fd
diff --git a/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0 b/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0
index 5718a7abfac9..2ef72ffdb825 100644
--- a/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0
+++ b/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0
@@ -4,10 +4,10 @@ DESCRIPTION=Manage deprecation warnings for your distribution
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Package-DeprecationManager
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Package-Stash dev-perl/Params-Util dev-perl/Sub-Install dev-perl/Sub-Name dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e671e3f2602b7f9df764bdd8b6f3cd59
+_md5_=451b3dc63388508e99bbe322fe678e15
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-0.370.0 b/metadata/md5-cache/dev-perl/Package-Stash-0.370.0
index e56401400120..5a89c1b99bb8 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-0.370.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-0.370.0
@@ -4,10 +4,10 @@ DESCRIPTION=Routines for manipulating stashes
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Package-Stash
 IUSE=test minimal
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Getopt-Long >=dev-perl/Module-Implementation-0.60.0 virtual/perl-Scalar-List-Utils !minimal? ( >=dev-perl/Package-Stash-XS-0.260.0 ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=19f0d86c99a8643ef34201f2a7696c66
+_md5_=e15b513755006000f4b0b7f2f44b752c
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0 b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
index 90d511e29c68..caf7e133f53a 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
@@ -4,10 +4,10 @@ DESCRIPTION=Faster and more correct implementation of the Package::Stash API
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Package-Stash-XS
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5350e92a102302f8d1d0870a3310a37e
+_md5_=f80d080382e715adbdb6642368b9c978
diff --git a/metadata/md5-cache/dev-perl/PadWalker-2.300.0 b/metadata/md5-cache/dev-perl/PadWalker-2.300.0
index bc65ecb731ce..cd15221eb7f2 100644
--- a/metadata/md5-cache/dev-perl/PadWalker-2.300.0
+++ b/metadata/md5-cache/dev-perl/PadWalker-2.300.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=play with other peoples' lexical variables
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/PadWalker
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.3.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=d39a18054aba143f327b5471664ac02f
+_md5_=efcc7249f3e2687c1d0c288d98b4fadc
diff --git a/metadata/md5-cache/dev-perl/Params-Classify-0.15.0 b/metadata/md5-cache/dev-perl/Params-Classify-0.15.0
index 31e259c72c6a..c93ffd0646f3 100644
--- a/metadata/md5-cache/dev-perl/Params-Classify-0.15.0
+++ b/metadata/md5-cache/dev-perl/Params-Classify-0.15.0
@@ -4,10 +4,10 @@ DESCRIPTION=Argument type classification
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Params-Classify
 IUSE=test
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Devel-CallChecker-0.3.0 virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.10.0 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=96627de31c440f6a0640a808f9abffa9
+_md5_=4c18edad3496a0799d23e45c744dca8b
diff --git a/metadata/md5-cache/dev-perl/Params-Util-1.70.0 b/metadata/md5-cache/dev-perl/Params-Util-1.70.0
index 310daea6ad15..874c59171228 100644
--- a/metadata/md5-cache/dev-perl/Params-Util-1.70.0
+++ b/metadata/md5-cache/dev-perl/Params-Util-1.70.0
@@ -4,10 +4,10 @@ DESCRIPTION=Utility functions to aid in parameter checking
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Params-Util
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.180.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=527acd935a081abd5c6462c3ce61f4c5
+_md5_=5ede261f443517dcb0ca7deeb491839b
diff --git a/metadata/md5-cache/dev-perl/Params-Validate-1.290.0 b/metadata/md5-cache/dev-perl/Params-Validate-1.290.0
index 8867c06c4796..31d87af046bf 100644
--- a/metadata/md5-cache/dev-perl/Params-Validate-1.290.0
+++ b/metadata/md5-cache/dev-perl/Params-Validate-1.290.0
@@ -4,10 +4,10 @@ DESCRIPTION=Flexible system for validation of method/function call parameters
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Params-Validate
 IUSE=test examples
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/Module-Implementation >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=55b7d539b86633ef36efb0950fce3619
+_md5_=4fd4296bedc27de9f6d094380aed52dc
diff --git a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.260.0 b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.260.0
index 3d0c87ee48e0..65d5d1e24dc8 100644
--- a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.260.0
+++ b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.260.0
@@ -4,10 +4,10 @@ DESCRIPTION=Build an optimized subroutine parameter validator once, use it forev
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Params-ValidationCompiler
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Eval-Closure dev-perl/Exception-Class virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.400.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=70bf252a079c54735287065d3c735148
+_md5_=e9bbacf665cf87ab5ea017e2fd230f23
diff --git a/metadata/md5-cache/dev-perl/Path-Class-0.370.0 b/metadata/md5-cache/dev-perl/Path-Class-0.370.0
index 3fd48260515f..5ac35fd4f7c7 100644
--- a/metadata/md5-cache/dev-perl/Path-Class-0.370.0
+++ b/metadata/md5-cache/dev-perl/Path-Class-0.370.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cross-platform path specification manipulation
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Path-Class
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Path >=virtual/perl-File-Spec-3.260.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Perl-OSType virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=64a4c0cf590b65e93fa6c8100cb8db0d
+_md5_=e359b236c5288d9cf27215e1255058b0
diff --git a/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0 b/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0
index 6ea9142a457f..dae5999e5962 100644
--- a/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0
+++ b/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0
@@ -4,10 +4,10 @@ DESCRIPTION=File path utility
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Path-Tiny
 IUSE=test minimal
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
 LICENSE=Apache-2.0
 RDEPEND=!minimal? ( >=dev-perl/Unicode-UTF8-0.580.0 ) virtual/perl-Carp >=virtual/perl-Digest-1.30.0 >=virtual/perl-Digest-SHA-5.450.0 >=virtual/perl-Exporter-5.570.0 >=virtual/perl-File-Path-2.70.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-File-Temp-0.190.0 virtual/perl-if dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.104.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=edb65571e5c758f54db1b212cbb19363
+_md5_=a4557bf0e31a4aa6b4643782ff27f128
diff --git a/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0 b/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0
index 953c58c5e867..91590f849624 100644
--- a/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0
+++ b/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl script indenter and beautifier
 EAPI=6
 HOMEPAGE=http://perltidy.sourceforge.net/ http://metacpan.org/release/Perl-Tidy
 IUSE=examples
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20171214.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=78c6b4fc437e2adbfca0a1e73af5206d
+_md5_=632b53a6cf8358db9b1a7e6df3ed53fe
diff --git a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0 b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
index 36fc2552a7e9..12850a48a0f8 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=Fast and correct UTF-8 IO
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/PerlIO-utf8_strict
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=2c10ec9ff5d728a0dbab964508fcb7f3
+_md5_=319fb346122467bf963b78f6d90d5845
diff --git a/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0 b/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0
index 489bd93f74c7..a9fe89ce2532 100644
--- a/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0
+++ b/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0
@@ -4,10 +4,10 @@ DESCRIPTION=Information about the currently running perl
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Probe-Perl
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+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=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/Probe-Perl-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=531c0ef238e4f5f89e18e57512c53085
+_md5_=80284d6fff1d87dc91a86c624d32c177
diff --git a/metadata/md5-cache/dev-perl/Readonly-2.50.0 b/metadata/md5-cache/dev-perl/Readonly-2.50.0
index a6740d80bdfc..afed3a03b82d 100644
--- a/metadata/md5-cache/dev-perl/Readonly-2.50.0
+++ b/metadata/md5-cache/dev-perl/Readonly-2.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Facility for creating read-only scalars, arrays, hashes
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Readonly
 IUSE=test
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=6e44f8112d2d25f7c9c418aae33e5153
+_md5_=6eae3dc5f7428af8639ccacee06c466b
diff --git a/metadata/md5-cache/dev-perl/Role-Tiny-2.0.6 b/metadata/md5-cache/dev-perl/Role-Tiny-2.0.6
index 98921b10b2e6..0e9c33e6e053 100644
--- a/metadata/md5-cache/dev-perl/Role-Tiny-2.0.6
+++ b/metadata/md5-cache/dev-perl/Role-Tiny-2.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=Roles. Like a nouvelle cuisine portion size slice of Moose
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Role-Tiny
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 !<dev-perl/Moo-0.9.14 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.000006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=32560bb26f0c2612880d60b8a0a44a52
+_md5_=9f85c9e047dd7747119ab8eb53ad25a9
diff --git a/metadata/md5-cache/dev-perl/SUPER-1.201.411.170 b/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
index 5dbc786a2e96..353aa0aa1430 100644
--- a/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
+++ b/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
@@ -4,10 +4,10 @@ DESCRIPTION=control superclass method dispatch
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/SUPER
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=185de7f49fd6cecb0196d4cc1b293ac9
+_md5_=73511313ea899ef6da46d75d14e0d354
diff --git a/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0 b/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
index f64bbd9b990c..70c0e9d5633f 100644
--- a/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
+++ b/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lexically scoped resource management
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Scope-Guard
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=d7e58b07c2c8bb96b2bfb68f81deba0d
+_md5_=6a1084e6cf8bd92b4934c61d7e38ffe3
diff --git a/metadata/md5-cache/dev-perl/Socket6-0.280.0 b/metadata/md5-cache/dev-perl/Socket6-0.280.0
index 89c098aa77b6..3922d1070039 100644
--- a/metadata/md5-cache/dev-perl/Socket6-0.280.0
+++ b/metadata/md5-cache/dev-perl/Socket6-0.280.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=IPv6 related part of the C socket.h defines and structure manipulators
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Socket6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.28.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=30e0a1e2b422bf0779b2fc3aaaf5521d
+_md5_=de29dde6cfee595bd666abe338a80c90
diff --git a/metadata/md5-cache/dev-perl/Specio-0.420.0 b/metadata/md5-cache/dev-perl/Specio-0.420.0
index 779c38d97192..908e9d2e2830 100644
--- a/metadata/md5-cache/dev-perl/Specio-0.420.0
+++ b/metadata/md5-cache/dev-perl/Specio-0.420.0
@@ -4,10 +4,10 @@ DESCRIPTION=Type constraints and coercions for Perl
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Specio
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/Ref-Util-0.112.0 ) virtual/perl-Carp dev-perl/Devel-StackTrace dev-perl/Eval-Closure virtual/perl-Exporter virtual/perl-IO dev-perl/MRO-Compat dev-perl/Module-Runtime >=dev-perl/Role-Tiny-1.3.3 >=virtual/perl-Scalar-List-Utils-1.330.0 virtual/perl-Storable dev-perl/Sub-Quote dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Try-Tiny virtual/perl-parent >=virtual/perl-version-0.830.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.42.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=1de3b26c0911671e8e4a8cabba38c0b8
+_md5_=08e5fdda0c6e3fcf5d9c67a2112b7e52
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0 b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
index 637d37d8fb68..52b5d2277910 100644
--- a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-File-Temp dev-perl/Parse-RecDescent >=dev-perl/OLE-StorageLi
 DESCRIPTION=Write cross-platform Excel binary file
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Spreadsheet-WriteExcel
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp dev-perl/Parse-RecDescent >=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=012aa2d21ef956e326dce7f0f93604b4
+_md5_=da1922419c41d46c9409ec738de2af3b
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0 b/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
index 1236d197ee52..907e6f4b35bd 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Sub-Install-0.920.0 >=dev-perl/Data-OptList-0.100.0 >=dev-perl
 DESCRIPTION=A sophisticated exporter for custom-built routines
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Sub-Exporter
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Install-0.920.0 >=dev-perl/Data-OptList-0.100.0 >=dev-perl/Params-Util-0.140.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b5085d1aaaf1ed4d28491dddb39703d
+_md5_=e702f6bba55f4094b8de8e4f6202e37f
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.13 b/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.13
index a5c699409d1d..bedb41f0b028 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.13
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.13
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Sub-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/
 DESCRIPTION=Only use Sub::Exporter if you need it
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Sub-Exporter-Progressive
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sub-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=78e43cc1960d5df2f092a5d65c2a9d70
+_md5_=d900105adb4ce8e8389026bac9ee32d6
diff --git a/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0 b/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0
index 8ac7f867565f..42876e84f616 100644
--- a/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0
+++ b/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=Retrieve names of code references
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Sub-Identify
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e2ad0fb01a0fc83adbfaa8062f51d779
+_md5_=cca5b69974947622dd93ef54be685299
diff --git a/metadata/md5-cache/dev-perl/Sub-Install-0.928.0 b/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
index 4218a402b839..e0f291fae752 100644
--- a/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
+++ b/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
@@ -4,10 +4,10 @@ DESCRIPTION=Install subroutines into packages easily
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Sub-Install
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c978c7458e69769a88bfaacc355d0f2
+_md5_=c5a49f4cd932a6f6903108d674481fa8
diff --git a/metadata/md5-cache/dev-perl/Sub-Name-0.210.0 b/metadata/md5-cache/dev-perl/Sub-Name-0.210.0
index 0674351263a0..9814bf61fdcb 100644
--- a/metadata/md5-cache/dev-perl/Sub-Name-0.210.0
+++ b/metadata/md5-cache/dev-perl/Sub-Name-0.210.0
@@ -4,10 +4,10 @@ DESCRIPTION=(Re)name a sub
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Sub-Name
 IUSE=test suggested
-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
+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=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=3316a9aa66504808acdb61c7aeb719ee
+_md5_=79967e9490eae5a25a7815a6cf5da2e6
diff --git a/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0 b/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
index e7a3d06f2864..dfa0e3738daa 100644
--- a/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
+++ b/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Efficient generation of subroutines via string eval
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Sub-Quote
 IUSE=test minimal
-KEYWORDS=amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Moo-2.3.0 !minimal? ( >=dev-perl/Sub-Name-0.80.0 ) virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.004000.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=76bced0c6f8c1d304966319dd7c591b9
+_md5_=cb59acbd9b2b4d6e43b993237430c547
diff --git a/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1 b/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
index 83f3b4a7109c..5a13c83d32f3 100644
--- a/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Runtime enable taint checking
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Taint-Runtime
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Taint-Runtime-0.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=803d3525ea76c1d0f8fead9d218821b8
+_md5_=4a18cceb025d0a2ab30da1cbba4d1695
diff --git a/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1 b/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
index e3d47777d208..d3c3edb757a5 100644
--- a/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Template Toolkit
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Template-Toolkit
 IUSE=xml gd mysql postgres latex vim-syntax test
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=dev-perl/Text-Autoformat vim-syntax? ( app-vim/tt2-syntax ) xml? ( dev-perl/Template-XML ) gd? ( dev-perl/Template-GD ) mysql? ( dev-perl/Template-DBI ) latex? ( dev-perl/Template-Plugin-Latex ) postgres? ( dev-perl/Template-DBI )
 RDEPEND=dev-perl/Text-Autoformat mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) >=dev-perl/AppConfig-1.56 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=754c573da720a53f70b649d2eb690de0
+_md5_=83e13a148ff987f3e3def0773f9b473f
diff --git a/metadata/md5-cache/dev-perl/TermReadKey-2.370.0 b/metadata/md5-cache/dev-perl/TermReadKey-2.370.0
index 3e34ffcf9ca5..b26449ccb340 100644
--- a/metadata/md5-cache/dev-perl/TermReadKey-2.370.0
+++ b/metadata/md5-cache/dev-perl/TermReadKey-2.370.0
@@ -4,10 +4,10 @@ DESCRIPTION=Change terminal modes, and perform non-blocking reads
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/TermReadKey
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=bf283624b94d5df347865cef821343bc
+_md5_=1a8e2f43b378d21b45f0e1c67e05bec7
diff --git a/metadata/md5-cache/dev-perl/Test-Deep-1.127.0 b/metadata/md5-cache/dev-perl/Test-Deep-1.127.0
index d8051462be61..a452dbe60bff 100644
--- a/metadata/md5-cache/dev-perl/Test-Deep-1.127.0
+++ b/metadata/md5-cache/dev-perl/Test-Deep-1.127.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extremely flexible deep comparison testing
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-Deep
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.90.0 virtual/perl-Test-Simple dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.127.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=73dbf37149812ff26a6cef04638dd18b
+_md5_=e10a77cd6e5dff1d9da8902c8b159bf0
diff --git a/metadata/md5-cache/dev-perl/Test-Exception-0.430.0 b/metadata/md5-cache/dev-perl/Test-Exception-0.430.0
index ae8aae723c1d..2fd107c1d672 100644
--- a/metadata/md5-cache/dev-perl/Test-Exception-0.430.0
+++ b/metadata/md5-cache/dev-perl/Test-Exception-0.430.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Sub-Uplevel-0.180.0 vi
 DESCRIPTION=Test functions for exception based code
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-Exception
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Sub-Uplevel-0.180.0 virtual/perl-Test-Simple >=virtual/perl-Test-Harness-2.30.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a3c113b0fac0568ba191bb9db5a4c7c3
+_md5_=93729ae9657bad82d0bd660c92a15d5b
diff --git a/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1 b/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1
index ee56819b8cd1..58af55c890ca 100644
--- a/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Add test failures if warnings are caught
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-FailWarnings
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.860.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=cec2bf04819391b2c65fd2047d334986
+_md5_=929886701f3d4928baf333a4eaf674ca
diff --git a/metadata/md5-cache/dev-perl/Test-Fatal-0.14.0 b/metadata/md5-cache/dev-perl/Test-Fatal-0.14.0
index 8fb79a00ca34..a1e2b15c6b98 100644
--- a/metadata/md5-cache/dev-perl/Test-Fatal-0.14.0
+++ b/metadata/md5-cache/dev-perl/Test-Fatal-0.14.0
@@ -4,10 +4,10 @@ DESCRIPTION=Incredibly simple helpers for testing code with exceptions
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-Fatal
 IUSE=test examples
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Test-Simple >=dev-perl/Try-Tiny-0.70.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=5a9b8df6e0cfc401e86168e1fc43b852
+_md5_=d0938feea7b4f3748e43fcb08b7237be
diff --git a/metadata/md5-cache/dev-perl/Test-File-ShareDir-1.1.2 b/metadata/md5-cache/dev-perl/Test-File-ShareDir-1.1.2
index 94b0e78794c9..a3554f2cd670 100644
--- a/metadata/md5-cache/dev-perl/Test-File-ShareDir-1.1.2
+++ b/metadata/md5-cache/dev-perl/Test-File-ShareDir-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Create a Fake ShareDir for your modules for testing.
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-File-ShareDir
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-Tiny >=virtual/perl-Exporter-5.570.0 dev-perl/File-Copy-Recursive >=dev-perl/File-ShareDir-1.0.0 >=dev-perl/Path-Tiny-0.18.0 dev-perl/Scope-Guard virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=de88990cd3e8de5e47e80ce89f175f18
+_md5_=db49ab03b68b75f0152d60a7ff8063ed
diff --git a/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0 b/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0
index c776850fd01e..7f2792918831 100644
--- a/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0
+++ b/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0
@@ -4,10 +4,10 @@ DESCRIPTION=Override subroutines in a module for unit testing
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-MockModule
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/SUPER virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=435afbdc6df2ef6e2fcf267af0384961
+_md5_=722e075c4e56e14f9d0f99555853f3c3
diff --git a/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0 b/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0
index c745cd35af56..695f7254bc6f 100644
--- a/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0
+++ b/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=Replaces random number generation with non-random number generation
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-MockRandom
 IUSE=test minimal examples
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-MockRandom-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=acf6750b742cb0924b4d771735bfe3fe
+_md5_=b7b09c0d561526e1fa87486b627641ec
diff --git a/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3 b/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
index 230187b5d0cc..9881023354e4 100644
--- a/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
+++ b/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 DESCRIPTION=Make sure you didn't emit any warnings while testing
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Test-NoWarnings
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+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=LGPL-2.1
 RDEPEND=virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e0a99128e896d81a94b085a36aab969
+_md5_=e8fb7360155b44aaf762832cb9814000
diff --git a/metadata/md5-cache/dev-perl/Test-Requires-0.100.0 b/metadata/md5-cache/dev-perl/Test-Requires-0.100.0
index 3f4e869e88de..72fba9ce92a3 100644
--- a/metadata/md5-cache/dev-perl/Test-Requires-0.100.0
+++ b/metadata/md5-cache/dev-perl/Test-Requires-0.100.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-Test-Simple-0.470.0 >=virtual/perl-ExtUtils-MakeMaker-6.64
 DESCRIPTION=Checks to see if the module can be loaded
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-Requires
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Test-Simple-0.470.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=c5790de99deb00461b827707f8552dee
+_md5_=8a8de84d6248fa2e352ff1f76b55a6e2
diff --git a/metadata/md5-cache/dev-perl/Test-Script-1.230.0 b/metadata/md5-cache/dev-perl/Test-Script-1.230.0
index 021367e571ab..04ad2d789a50 100644
--- a/metadata/md5-cache/dev-perl/Test-Script-1.230.0
+++ b/metadata/md5-cache/dev-perl/Test-Script-1.230.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cross-platform basic tests for scripts
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-Script
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+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=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny >=virtual/perl-File-Spec-0.800.0 virtual/perl-IO >=dev-perl/Probe-Perl-0.10.0 >=virtual/perl-Test-Simple-1.302.15 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=c1835b18b033e99d0b22e426cc717f22
+_md5_=423167e18d0655f8dd088beaf3ccae27
diff --git a/metadata/md5-cache/dev-perl/Test-Warn-0.320.0 b/metadata/md5-cache/dev-perl/Test-Warn-0.320.0
index 721843decda1..827b1743186e 100644
--- a/metadata/md5-cache/dev-perl/Test-Warn-0.320.0
+++ b/metadata/md5-cache/dev-perl/Test-Warn-0.320.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension to test methods for warnings
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-Warn
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Carp-1.220.0 >=dev-perl/Sub-Uplevel-0.120.0 >=virtual/perl-Test-Simple-0.880.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=8837c239409c919ccbd85a8ff043e0ff
+_md5_=7195f098260cb792de9f0f6ed0880017
diff --git a/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0 b/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0
index 8879f326ace5..fdd992b6f808 100644
--- a/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0
+++ b/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0
@@ -4,10 +4,10 @@ DESCRIPTION=Test fallback behaviour in absence of modules
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-Without-Module
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=65e5ea66993e37a923dfaca507aa39bb
+_md5_=cff9d26f54c57ccfe5ff031d7d0ffa81
diff --git a/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.60.0 b/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.60.0
index b5c738b97d70..b5eb67e3c4dd 100644
--- a/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.60.0
+++ b/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=Fail if tests warn
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test2-Plugin-NoWarnings
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Test-Simple-1.302.15 virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=5546a404db4de913f64803a016a632cc
+_md5_=4238a762a3fae0442dc75836a2cfdc2e
diff --git a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77 b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
index adff4790304b..f464840d0033 100644
--- a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
+++ b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
@@ -4,10 +4,10 @@ DESCRIPTION=A rich set of tools built upon the Test2 framework
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test2-Suite
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Info-0.1.0 >=dev-perl/Term-Table-0.2.0 >=virtual/perl-Test-Simple-1.302.73 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000077.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=99179cf0b176884e5c776b2ed9ce5344
+_md5_=e0bb1a9e29ca4dafd1689f26d906213b
diff --git a/metadata/md5-cache/dev-perl/Text-Autoformat-1.740.0 b/metadata/md5-cache/dev-perl/Text-Autoformat-1.740.0
index f3080b5a0dd3..8f1250fbad61 100644
--- a/metadata/md5-cache/dev-perl/Text-Autoformat-1.740.0
+++ b/metadata/md5-cache/dev-perl/Text-Autoformat-1.740.0
@@ -4,10 +4,10 @@ DESCRIPTION=Automatic text wrapping and reformatting
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Text-Autoformat
 IUSE=test examples
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/Text-Reform virtual/perl-Text-Tabs+Wrap dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.74.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=947980887aea078bf49db8797db07b2c
+_md5_=ef683456badb3494ec42ca1f39254483
diff --git a/metadata/md5-cache/dev-perl/Text-Glob-0.110.0 b/metadata/md5-cache/dev-perl/Text-Glob-0.110.0
index 832bd45f2a87..6cf97eb424af 100644
--- a/metadata/md5-cache/dev-perl/Text-Glob-0.110.0
+++ b/metadata/md5-cache/dev-perl/Text-Glob-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=Match globbing patterns against text
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Text-Glob
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=1df362408d126ccec905e9cad16332d5
+_md5_=25056008684e046bcf96ae21ba8b8580
diff --git a/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r2 b/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r2
index cb6032d73ed6..ebdcba8c87ce 100644
--- a/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r2
+++ b/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/libiconv dev-lang/perl:=
 DESCRIPTION=A Perl interface to the iconv() codeset conversion function
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Text-Iconv
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/libiconv dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=d5383c1f1367a88c1561e0980da49d5d
+_md5_=7f7a326433faea112e0fb992ee111c6e
diff --git a/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1 b/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
index 0b9414674ad1..a39889ed2c29 100644
--- a/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Manual text wrapping and reformatting
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Text-Reform
 IUSE=test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2bb634da6643d8a2c7a32b2153f43022
+_md5_=1dfdae017cc14e717894987d6f515c43
diff --git a/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0 b/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
index 26b37e4ae090..5233f4df5bd7 100644
--- a/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
+++ b/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
@@ -4,10 +4,10 @@ DESCRIPTION=Minimal try/catch with proper localization of $@
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Try-Tiny
 IUSE=test minimal
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<=dev-perl/Try-Tiny-Except-0.10.0 !minimal? ( || ( >=virtual/perl-Scalar-List-Utils-1.400.0 dev-perl/Sub-Name ) ) virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=9c5f7aa12b78aea8d1b70669d0004343
+_md5_=917fc3800b0ed800c0f1baabe871eaaf
diff --git a/metadata/md5-cache/dev-perl/Types-Serialiser-1.0.0-r1 b/metadata/md5-cache/dev-perl/Types-Serialiser-1.0.0-r1
index 5377e5ca9029..1d991910a3cf 100644
--- a/metadata/md5-cache/dev-perl/Types-Serialiser-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Types-Serialiser-1.0.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/common-sense virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=simple data types for common serialisation formats
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Types-Serialiser
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/common-sense dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=0c35e527fc8d1ece9a317d2e87de3ca1
+_md5_=2437582f3e0ca128cf23988c674461de
diff --git a/metadata/md5-cache/dev-perl/URI-1.730.0 b/metadata/md5-cache/dev-perl/URI-1.730.0
index 65f02c7cd62f..62e2ea3c36ad 100644
--- a/metadata/md5-cache/dev-perl/URI-1.730.0
+++ b/metadata/md5-cache/dev-perl/URI-1.730.0
@@ -4,10 +4,10 @@ DESCRIPTION=Uniform Resource Identifiers (absolute and relative)
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/URI
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=virtual/perl-MIME-Base64-2 virtual/perl-Scalar-List-Utils virtual/perl-libnet virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/URI-1.73.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=b44111f19d12733d02772ae98e9c78fd
+_md5_=955c754842ae5e14ec7bb0ff7b0ee18e
diff --git a/metadata/md5-cache/dev-perl/Unicode-MapUTF8-1.110.0-r2 b/metadata/md5-cache/dev-perl/Unicode-MapUTF8-1.110.0-r2
index deddb67c2668..666fd8636fc0 100644
--- a/metadata/md5-cache/dev-perl/Unicode-MapUTF8-1.110.0-r2
+++ b/metadata/md5-cache/dev-perl/Unicode-MapUTF8-1.110.0-r2
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Unicode-Map dev-perl/Unicode-Map8 dev-perl/Unicode-String dev-pe
 DESCRIPTION=Conversions to and from arbitrary character sets and UTF8
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Unicode-MapUTF8
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Unicode-Map dev-perl/Unicode-Map8 dev-perl/Unicode-String dev-perl/Jcode dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SN/SNOWHARE/Unicode-MapUTF8-1.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=fd729e5af67918d043c4a82403445175
+_md5_=6ff73f3c6fab8e58b773ee57749297b0
diff --git a/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0 b/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0
index 2019be3242e6..31c3a04c39c1 100644
--- a/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0
+++ b/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0
@@ -4,10 +4,10 @@ DESCRIPTION=Encoding and decoding of UTF-8 encoding form
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Unicode-UTF8
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Unicode-UTF8-0.62.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=50597ac333d7fd99b29d95046b165c98
+_md5_=a49e8ff4f87fc06366558d801f352cb3
diff --git a/metadata/md5-cache/dev-perl/Variable-Magic-0.620.0 b/metadata/md5-cache/dev-perl/Variable-Magic-0.620.0
index bcbee7e52b01..48277ee4eae1 100644
--- a/metadata/md5-cache/dev-perl/Variable-Magic-0.620.0
+++ b/metadata/md5-cache/dev-perl/Variable-Magic-0.620.0
@@ -4,10 +4,10 @@ DESCRIPTION=Associate user-defined magic to variables from Perl
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Variable-Magic
 IUSE=test examples
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=cfce93a1d69cb36f459344509e5959de
+_md5_=3607cf3eba85908d8129c88fa93dc20e
diff --git a/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r2 b/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r2
index 29bfcd1fe566..6059748426e6 100644
--- a/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r2
+++ b/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/libxml-perl-0.07-r1 dev-lang/perl:=
 DESCRIPTION=A Perl module providing a simple API to parsed XML instances
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/XML-Handler-YAWriter
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-perl/libxml-perl-0.07-r1 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRAEHE/XML-Handler-YAWriter-0.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a40df599f4ad247471e08a9c7b18a8a3
+_md5_=1577d53814509dda38fff616ffc5553a
diff --git a/metadata/md5-cache/dev-perl/XML-Twig-3.520.0 b/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
index 333286c158db..0115971faa23 100644
--- a/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
+++ b/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
@@ -4,10 +4,10 @@ DESCRIPTION=Process huge XML documents in tree mode
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/XML-Twig
 IUSE=nls test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.31 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Encode-2.240.100_rc >=dev-libs/expat-1.95.5 dev-perl/Tie-IxHash dev-perl/XML-XPath >=dev-perl/libwww-perl-6.40.0 >=dev-perl/HTML-Parser-3.690.0 nls? ( >=dev-perl/Text-Iconv-1.2-r1 ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=909c3d7818d5c9ba66cc89bffcae1677
+_md5_=c1723c932aec4cec314ab602222ecd2c
diff --git a/metadata/md5-cache/dev-perl/XML-XPath-1.130.0-r1 b/metadata/md5-cache/dev-perl/XML-XPath-1.130.0-r1
index 80389638db2d..6a3943339ac0 100644
--- a/metadata/md5-cache/dev-perl/XML-XPath-1.130.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XPath-1.130.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/XML-Parser-2.30 dev-lang/perl:=[-build(-)]
 DESCRIPTION=A XPath Perl Module
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/XML-XPath
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.30 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSERGEANT/XML-XPath-1.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e748fb1ffee0351d77888ee234df0214
+_md5_=4d83893a0aeee9fbb510eb4e51802ed4
diff --git a/metadata/md5-cache/dev-perl/XML-XPath-1.370.0 b/metadata/md5-cache/dev-perl/XML-XPath-1.370.0
index d037137069d2..1df3f73afbaa 100644
--- a/metadata/md5-cache/dev-perl/XML-XPath-1.370.0
+++ b/metadata/md5-cache/dev-perl/XML-XPath-1.370.0
@@ -4,10 +4,10 @@ DESCRIPTION=A XPath Perl Module
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/XML-XPath
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~s390 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.230.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=28a838004f65eedfa2d0e6a61d4c6110
+_md5_=95c0b6eb5324d67d49ac68ccafd840eb
diff --git a/metadata/md5-cache/dev-perl/XML-XPath-1.420.0 b/metadata/md5-cache/dev-perl/XML-XPath-1.420.0
index 13c2e1be3b5c..b45e998e0c60 100644
--- a/metadata/md5-cache/dev-perl/XML-XPath-1.420.0
+++ b/metadata/md5-cache/dev-perl/XML-XPath-1.420.0
@@ -4,10 +4,10 @@ DESCRIPTION=A XPath Perl Module
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/XML-XPath
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.230.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.42.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=ea305668a44b6416480c27525622fb49
+_md5_=60606b2064ef793b7a1b3d38c5f45b57
diff --git a/metadata/md5-cache/dev-perl/bareword-filehandles-0.6.0 b/metadata/md5-cache/dev-perl/bareword-filehandles-0.6.0
index ac11af6a28ac..dbf120b02d02 100644
--- a/metadata/md5-cache/dev-perl/bareword-filehandles-0.6.0
+++ b/metadata/md5-cache/dev-perl/bareword-filehandles-0.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Disables bareword filehandles
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/bareword-filehandles
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/B-Hooks-OP-Check virtual/perl-if virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/bareword-filehandles-0.006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=ae706d9db8e24cf3319821b4b4065cbb
+_md5_=226f7a7194973cbc4dea4bcc03688dba
diff --git a/metadata/md5-cache/dev-perl/common-sense-3.740.0-r1 b/metadata/md5-cache/dev-perl/common-sense-3.740.0-r1
index 47254ff47a51..d5115c0092de 100644
--- a/metadata/md5-cache/dev-perl/common-sense-3.740.0-r1
+++ b/metadata/md5-cache/dev-perl/common-sense-3.740.0-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Save a tree AND a kitten, use common::sense!
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/common-sense
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=007ad2fdb62ed575c37c12edfbc2240f
+_md5_=fa678f265fbd213c55393dcc64d7860c
diff --git a/metadata/md5-cache/dev-perl/indirect-0.370.0 b/metadata/md5-cache/dev-perl/indirect-0.370.0
index a1a011c7103c..c6bb6d2aa0cb 100644
--- a/metadata/md5-cache/dev-perl/indirect-0.370.0
+++ b/metadata/md5-cache/dev-perl/indirect-0.370.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lexically warn about using the indirect method call syntax
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/indirect
 IUSE=test
-KEYWORDS=amd64 hppa ppc x86
+KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/indirect-0.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=8af58cb8e783083282e681958d84a8e7
+_md5_=3ff8f6ea158c2a50340a8095eade7e5e
diff --git a/metadata/md5-cache/dev-perl/libwww-perl-6.270.0 b/metadata/md5-cache/dev-perl/libwww-perl-6.270.0
index dfd5775f5f42..cb3ff45d91c0 100644
--- a/metadata/md5-cache/dev-perl/libwww-perl-6.270.0
+++ b/metadata/md5-cache/dev-perl/libwww-perl-6.270.0
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of Perl Modules for the WWW
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/libwww-perl
 IUSE=ssl test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=ssl? ( >=dev-perl/LWP-Protocol-https-6.20.0 )
 RDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-Encode-2.120.0 dev-perl/Encode-Locale >=dev-perl/File-Listing-6.0.0 >=dev-perl/HTML-Parser-3.340.0 >=dev-perl/HTTP-Cookies-6.0.0 >=dev-perl/HTTP-Daemon-6.0.0 >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Negotiate-6.0.0 >=dev-perl/HTTP-Message-6.0.0 virtual/perl-IO >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-MIME-Base64-2.120.0 >=dev-perl/Net-HTTP-6.70.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny >=dev-perl/URI-1.100.0 >=dev-perl/WWW-RobotRules-6.0.0 >=virtual/perl-libnet-1.220.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=7823ae452c7e35e59249806dc13355f1
+_md5_=40df63df665dc9d66eec660a02b9d869
diff --git a/metadata/md5-cache/dev-perl/multidimensional-0.13.0 b/metadata/md5-cache/dev-perl/multidimensional-0.13.0
index 7dba42d62052..08d0f13bdbc1 100644
--- a/metadata/md5-cache/dev-perl/multidimensional-0.13.0
+++ b/metadata/md5-cache/dev-perl/multidimensional-0.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=disables multidimensional array emulation
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/multidimensional
 IUSE=test
-KEYWORDS=amd64 hppa ppc x86
+KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-OP-Check-0.190.0 >=dev-perl/Lexical-SealRequireHints-0.5.0 virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/multidimensional-0.013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e183da9a3c572c2162f34ffe69482a41
+_md5_=fe2eb88ba84f541df03fc6f4e99a0f8d
diff --git a/metadata/md5-cache/dev-perl/namespace-autoclean-0.280.0 b/metadata/md5-cache/dev-perl/namespace-autoclean-0.280.0
index 136721ee0bf6..d9e23818fa94 100644
--- a/metadata/md5-cache/dev-perl/namespace-autoclean-0.280.0
+++ b/metadata/md5-cache/dev-perl/namespace-autoclean-0.280.0
@@ -4,10 +4,10 @@ DESCRIPTION=Keep imports out of your namespace
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/namespace-autoclean
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify >=dev-perl/namespace-clean-0.200.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.28.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=813cc048408da4c86bb5c147c83c46bf
+_md5_=d789d51a83a21ba41d212f8143dc83e0
diff --git a/metadata/md5-cache/dev-perl/namespace-clean-0.270.0 b/metadata/md5-cache/dev-perl/namespace-clean-0.270.0
index 06d55feeb6a5..2cf2643f9049 100644
--- a/metadata/md5-cache/dev-perl/namespace-clean-0.270.0
+++ b/metadata/md5-cache/dev-perl/namespace-clean-0.270.0
@@ -4,10 +4,10 @@ DESCRIPTION=Keep imports and functions out of your namespace
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/namespace-clean
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 >=dev-perl/Package-Stash-0.230.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a18c53bf2a688cda3e5de787c46c23a8
+_md5_=871d99d785edc79df7d6eaa040cf686b
diff --git a/metadata/md5-cache/dev-perl/strictures-2.0.3 b/metadata/md5-cache/dev-perl/strictures-2.0.3
index 9c89c6352a2e..64c4ccc8e246 100644
--- a/metadata/md5-cache/dev-perl/strictures-2.0.3
+++ b/metadata/md5-cache/dev-perl/strictures-2.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Turn on strict and make most warnings fatal
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/strictures
 IUSE=test minimal
-KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/bareword-filehandles dev-perl/indirect dev-perl/multidimensional ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=7401261d472fef67cd339a031471f9e4
+_md5_=ddcfb3e6f53f510fd919821ae148a6d8
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 4c6db68c5968..e6327155e8e6 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/ming-php-0.4.8 b/metadata/md5-cache/dev-php/ming-php-0.4.8
index 92747c75c11e..d800bb7bbdeb 100644
--- a/metadata/md5-cache/dev-php/ming-php-0.4.8
+++ b/metadata/md5-cache/dev-php/ming-php-0.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=PHP extension for the ming Flash movie generation library
 EAPI=6
 HOMEPAGE=http://ming.sourceforge.net/
 IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/ming php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=0
 SRC_URI=https://github.com/libming/libming/archive/ming-0_4_8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc926512da80177076f6098baca0d1e3
+_md5_=7fbe167c5900abc744a8afc44ca9b7f7
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.12 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.12
index bfe453c5f3ce..0fea398f6add 100644
--- a/metadata/md5-cache/dev-php/pecl-apcu-5.1.12
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.12
@@ -4,11 +4,11 @@ DESCRIPTION=Stripped down version of APC supporting only user cache
 EAPI=6
 HOMEPAGE=https://pecl.php.net/apcu
 IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=PHP-3.01
 RDEPEND=php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
 REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/apcu-5.1.12.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2934fb8cd22b02bd3d19c601f53b4964
+_md5_=9736416f446380a0170e753c1005eb7e
diff --git a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4 b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4
index 0c1116682362..08a397099a60 100644
--- a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4
+++ b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Provides APC backwards compatibility functions via APCu
 EAPI=6
 HOMEPAGE=https://pecl.php.net/apcu_bc
 IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=PHP-3.01
 RDEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
 REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/apcu_bc-1.0.4.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=44a10f36382e3adf278467380d0efd75
+_md5_=dc52dbd04058aed87d741be26ad0f01d
diff --git a/metadata/md5-cache/dev-php/pecl-crack-0.4-r7 b/metadata/md5-cache/dev-php/pecl-crack-0.4-r7
index 1213c70bac2a..dcc6dc305cc6 100644
--- a/metadata/md5-cache/dev-php/pecl-crack-0.4-r7
+++ b/metadata/md5-cache/dev-php/pecl-crack-0.4-r7
@@ -4,11 +4,11 @@ DESCRIPTION=PHP interface to the cracklib libraries
 EAPI=6
 HOMEPAGE=https://pecl.php.net/crack
 IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=PHP-3 CRACKLIB
 RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/crack-0.4.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a935b2cfe806184c567216efd5a27b31
+_md5_=9b3d8fa3a7c1c1fe1159bca2a36138a7
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1 b/metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1
index bfd99367873b..1a6ff0041485 100644
--- a/metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PHP extension for parsing and working with RFC822 and MIME compliant
 EAPI=6
 HOMEPAGE=https://pecl.php.net/mailparse
 IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php5-6 php_targets_php7-2
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=PHP-3.01
 RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-2? ( dev-lang/php:7.2 )
 REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php5-6 php_targets_php7-2 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/mailparse-3.0.2.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=359b8dc287bb57679a657c9707ae953c
+_md5_=ee3b03c59f48a01b055f6198f4e4a78f
diff --git a/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.1 b/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.1
new file mode 100644
index 000000000000..9f16ba2be20e
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libmcrypt >=app-portage/elt-patches-20170815 !<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/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=Bindings for the libmcrypt library
+EAPI=6
+HOMEPAGE=https://pecl.php.net/mcrypt
+IUSE=php_targets_php7-2
+KEYWORDS=~amd64
+LICENSE=PHP-3.01
+RDEPEND=dev-libs/libmcrypt php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php7-2 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/mcrypt-1.0.1.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6da29739ebcff5810e01a109906b3831
diff --git a/metadata/md5-cache/dev-php/recaptcha-1.2.1 b/metadata/md5-cache/dev-php/recaptcha-1.2.1
new file mode 100644
index 000000000000..cebc548eb002
--- /dev/null
+++ b/metadata/md5-cache/dev-php/recaptcha-1.2.1
@@ -0,0 +1,12 @@
+BDEPEND=test? ( dev-lang/php dev-php/phpunit )
+DEFINED_PHASES=install postinst test
+DESCRIPTION=PHP client library for Google's reCAPTCHA service
+EAPI=7
+HOMEPAGE=https://github.com/google/recaptcha
+IUSE=examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/php
+SLOT=0
+SRC_URI=https://github.com/google/recaptcha/archive/1.2.1.tar.gz -> recaptcha-1.2.1.tar.gz
+_md5_=3b7d646d6973cf57e53dd9511270fc1d
diff --git a/metadata/md5-cache/dev-php/xdebug-2.6.1 b/metadata/md5-cache/dev-php/xdebug-2.6.1
index 0d7d208c6a6d..9773e879ca6d 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.6.1
+++ b/metadata/md5-cache/dev-php/xdebug-2.6.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170815 !<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/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+DEPEND=>=app-portage/elt-patches-20170815 !<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/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
 DESCRIPTION=A PHP debugging and profiling extension
 EAPI=6
 HOMEPAGE=http://www.xdebug.org/
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
+IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Xdebug
-RDEPEND=~dev-php/xdebug-client-2.6.1 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+RDEPEND=~dev-php/xdebug-client-2.6.1 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.6.1.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ae66c4f425751e5d412c131418ed69ae
+_md5_=88234fa4f34a484074255373aa3e6217
diff --git a/metadata/md5-cache/dev-python/CommonMark-0.5.4 b/metadata/md5-cache/dev-python/CommonMark-0.5.4
deleted file mode 100644
index 802848c597f7..000000000000
--- a/metadata/md5-cache/dev-python/CommonMark-0.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/hypothesis[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python parser for the CommonMark Markdown spec
-EAPI=6
-HOMEPAGE=https://github.com/rtfd/CommonMark-py
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/C/CommonMark/CommonMark-0.5.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f757bc54129199ea24b19e136420155e
diff --git a/metadata/md5-cache/dev-python/CommonMark-0.7.3 b/metadata/md5-cache/dev-python/CommonMark-0.7.3
deleted file mode 100644
index e7d392ea30d6..000000000000
--- a/metadata/md5-cache/dev-python/CommonMark-0.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/hypothesis[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python parser for the CommonMark Markdown spec
-EAPI=6
-HOMEPAGE=https://github.com/rtfd/CommonMark-py
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/C/CommonMark/CommonMark-0.7.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=865fde2aec2595d9f5a94b368b85018a
diff --git a/metadata/md5-cache/dev-python/CommonMark-0.7.4 b/metadata/md5-cache/dev-python/CommonMark-0.7.4
deleted file mode 100644
index 50caa3be0370..000000000000
--- a/metadata/md5-cache/dev-python/CommonMark-0.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/flake8-3.4.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/hypothesis-3.7.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/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=Python parser for the CommonMark Markdown spec
-EAPI=6
-HOMEPAGE=https://github.com/rtfd/CommonMark-py
-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=BSD
-RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/C/CommonMark/CommonMark-0.7.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c6a2b2f9fc048d25dbc5555f9daa671d
diff --git a/metadata/md5-cache/dev-python/CommonMark-0.7.5 b/metadata/md5-cache/dev-python/CommonMark-0.7.5
deleted file mode 100644
index 57c8b50f87f6..000000000000
--- a/metadata/md5-cache/dev-python/CommonMark-0.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/future[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/hypothesis-3.7.1[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/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(-)] 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 parser for the CommonMark Markdown spec
-EAPI=6
-HOMEPAGE=https://github.com/rtfd/CommonMark-py
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/future[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 )
-SLOT=0
-SRC_URI=mirror://pypi/C/CommonMark/CommonMark-0.7.5.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=86b55b28beb460f06210a7aaa8d8db2d
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 4583b684682b..1164b6a7547c 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/PyQt5-5.11.3 b/metadata/md5-cache/dev-python/PyQt5-5.11.3
new file mode 100644
index 000000000000..ccb526f35746
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt5-5.11.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure 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(-)] >=dev-python/sip-4.19.11:=[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-qt/qtcore-5.9.6:5 >=dev-qt/qtxml-5.9.6:5 virtual/python-enum34[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(-)] bluetooth? ( >=dev-qt/qtbluetooth-5.9.6:5 ) dbus? ( dev-python/dbus-python[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-qt/qtdbus-5.9.6:5 ) declarative? ( >=dev-qt/qtdeclarative-5.9.6:5[widgets?] ) designer? ( >=dev-qt/designer-5.9.6:5 ) gui? ( >=dev-qt/qtgui-5.9.6:5[gles2=] ) help? ( >=dev-qt/qthelp-5.9.6:5 ) location? ( >=dev-qt/qtlocation-5.9.6:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.9.6:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.9.6:5 ) opengl? ( >=dev-qt/qtopengl-5.9.6:5 ) positioning? ( >=dev-qt/qtpositioning-5.9.6:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.6:5 ) sensors? ( >=dev-qt/qtsensors-5.9.6:5 ) serialport? ( >=dev-qt/qtserialport-5.9.6:5 ) sql? ( >=dev-qt/qtsql-5.9.6:5 ) svg? ( >=dev-qt/qtsvg-5.9.6:5 ) testlib? ( >=dev-qt/qttest-5.9.6:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.9.6:5 ) webengine? ( >=dev-qt/qtwebengine-5.9.6:5[widgets?] ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.9.6:5 ) widgets? ( >=dev-qt/qtwidgets-5.9.6:5 ) x11extras? ( >=dev-qt/qtx11extras-5.9.6:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.9.6:5 ) dbus? ( virtual/pkgconfig )
+DESCRIPTION=Python bindings for the Qt framework
+EAPI=7
+HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
+IUSE=bluetooth dbus debug declarative designer examples gles2 gui help location multimedia network opengl positioning printsupport sensors serialport sql svg testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+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 ) 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-python/sip-4.19.11:=[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-qt/qtcore-5.9.6:5 >=dev-qt/qtxml-5.9.6:5 virtual/python-enum34[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(-)] bluetooth? ( >=dev-qt/qtbluetooth-5.9.6:5 ) dbus? ( dev-python/dbus-python[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-qt/qtdbus-5.9.6:5 ) declarative? ( >=dev-qt/qtdeclarative-5.9.6:5[widgets?] ) designer? ( >=dev-qt/designer-5.9.6:5 ) gui? ( >=dev-qt/qtgui-5.9.6:5[gles2=] ) help? ( >=dev-qt/qthelp-5.9.6:5 ) location? ( >=dev-qt/qtlocation-5.9.6:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.9.6:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.9.6:5 ) opengl? ( >=dev-qt/qtopengl-5.9.6:5 ) positioning? ( >=dev-qt/qtpositioning-5.9.6:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.6:5 ) sensors? ( >=dev-qt/qtsensors-5.9.6:5 ) serialport? ( >=dev-qt/qtserialport-5.9.6:5 ) sql? ( >=dev-qt/qtsql-5.9.6:5 ) svg? ( >=dev-qt/qtsvg-5.9.6:5 ) testlib? ( >=dev-qt/qttest-5.9.6:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.9.6:5 ) webengine? ( >=dev-qt/qtwebengine-5.9.6:5[widgets?] ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.9.6:5 ) widgets? ( >=dev-qt/qtwidgets-5.9.6:5 ) x11extras? ( >=dev-qt/qtx11extras-5.9.6:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.9.6:5 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webengine? ( network widgets? ( printsupport webchannel ) ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
+SLOT=0
+SRC_URI=mirror://sourceforge/pyqt/PyQt5_gpl-5.11.3.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0a2a226be210ba121c8dac8adea57e9b
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.9 b/metadata/md5-cache/dev-python/alabaster-0.7.9
index c1599be9c323..a70fb4f67923 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.9
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.9
@@ -4,11 +4,11 @@ DESCRIPTION=A configurable sidebar-enabled Sphinx theme
 EAPI=6
 HOMEPAGE=https://github.com/bitprophet/alabaster
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_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_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/a/alabaster/alabaster-0.7.9.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=350143cfc9aff3248dda4cef47c2924e
+_md5_=9b26e778f3284086576eb4fad7a0dd22
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.5.1 b/metadata/md5-cache/dev-python/ansi2html-1.5.1
new file mode 100644
index 000000000000..3390bbc03b77
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ansi2html-1.5.1
@@ -0,0 +1,15 @@
+BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/setuptools[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-python/six-1.7.3[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-python/nose[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? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/setuptools[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=Convert text with ANSI color codes to HTML
+EAPI=7
+HOMEPAGE=https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-python/setuptools[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-python/six-1.7.3[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= ) 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_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=|| ( 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://pypi/a/ansi2html/ansi2html-1.5.1.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7fa9f05a5231d26faad00608546c357f
diff --git a/metadata/md5-cache/dev-python/argon2_cffi-18.3.0 b/metadata/md5-cache/dev-python/argon2_cffi-18.3.0
new file mode 100644
index 000000000000..ed12af2b4b9c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/argon2_cffi-18.3.0
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~app-crypt/argon2-20171227:= dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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-cffi[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-enum34[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(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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/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/pytest-3.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(-)] )
+DESCRIPTION=CFFI bindings to the Argon2 password hashing library
+EAPI=7
+HOMEPAGE=https://github.com/hynek/argon2_cffi
+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 ~x86
+LICENSE=MIT
+RDEPEND=~app-crypt/argon2-20171227:= dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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-cffi[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-enum34[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/a/argon2_cffi/argon2_cffi-18.3.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=376c0fd12dc9e6cb60bd433077e4389c
diff --git a/metadata/md5-cache/dev-python/astng-0.24.3 b/metadata/md5-cache/dev-python/astng-0.24.3
deleted file mode 100644
index 51a2f6525ce3..000000000000
--- a/metadata/md5-cache/dev-python/astng-0.24.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/logilab-common-0.59.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/egenix-mx-base-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Abstract Syntax Tree for logilab packages
-EAPI=5
-HOMEPAGE=https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng/
-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 ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/logilab-common-0.59.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=ftp://ftp.logilab.org/pub/astng/logilab-astng-0.24.3.tar.gz mirror://pypi/l/logilab-astng/logilab-astng-0.24.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5513da38471f80d2c91650f878766ce7
diff --git a/metadata/md5-cache/dev-python/astng-0.24.3-r1 b/metadata/md5-cache/dev-python/astng-0.24.3-r1
deleted file mode 100644
index 8588d9c26922..000000000000
--- a/metadata/md5-cache/dev-python/astng-0.24.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/logilab-common-1.2.2-r1[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/egenix-mx-base-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Abstract Syntax Tree for logilab packages
-EAPI=5
-HOMEPAGE=https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng/
-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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/logilab-common-1.2.2-r1[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=ftp://ftp.logilab.org/pub/astng/logilab-astng-0.24.3.tar.gz mirror://pypi/l/logilab-astng/logilab-astng-0.24.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ed35750a1e7e9b5532f22be8be070495
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 4131c067042c..e5c6df33c353 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 ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~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	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c37cb656619e07102dd817a108606517
+_md5_=b2b0009de600c4d8f5ee695af4cc7f65
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.2.1 b/metadata/md5-cache/dev-python/atomicwrites-1.2.1
index 3f568456afc0..da9794a537ad 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.2.1
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.2.1
@@ -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 ~ia64 ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.2.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=165a790d080a0ad56968e3dc5d3e2b7d
+_md5_=40a9e24b20461f536e413ba89822d699
diff --git a/metadata/md5-cache/dev-python/backports-os-0.1.1 b/metadata/md5-cache/dev-python/backports-os-0.1.1
new file mode 100644
index 000000000000..b0c21683492c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/backports-os-0.1.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Backport of new features in Python's os module
+EAPI=7
+HOMEPAGE=https://github.com/pjdelport/backports.os
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=PYTHON
+RDEPEND=dev-python/backports[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-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_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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/pjdelport/backports.os/archive/v0.1.1.tar.gz -> backports-os-0.1.1.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=43c04d7b2b5a8f89f1214e9ebe800bb0
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.6.3 b/metadata/md5-cache/dev-python/beautifulsoup-4.6.3
index 115012ff6fd8..7bba2733bbde 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.6.3
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.6.3
@@ -5,11 +5,11 @@ DESCRIPTION=Pythonic idioms for iterating, searching, and modifying an HTML/XML
 EAPI=7
 HOMEPAGE=https://www.crummy.com/software/BeautifulSoup/bs4/
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( dev-python/html5lib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/html5lib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.6.3.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=11607d00a213d6ef2a13ff9764c550c0
+_md5_=d9e799b828c4aa78633e3fd7545a4266
diff --git a/metadata/md5-cache/dev-python/bleach-3.0.0 b/metadata/md5-cache/dev-python/bleach-3.0.0
deleted file mode 100644
index da6ca4b4581b..000000000000
--- a/metadata/md5-cache/dev-python/bleach-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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(-)] test? ( 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? ( >=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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=an easy whitelist-based HTML-sanitizing tool
-EAPI=7
-HOMEPAGE=https://github.com/mozilla/bleach https://pypi.org/project/bleach/
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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/webencodings[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/b/bleach/bleach-3.0.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ef4bb9e4cfaba5c1cc258abb4003ccfb
diff --git a/metadata/md5-cache/dev-python/bleach-3.0.1 b/metadata/md5-cache/dev-python/bleach-3.0.1
new file mode 100644
index 000000000000..138dc1d0e2fc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bleach-3.0.1
@@ -0,0 +1,14 @@
+BDEPEND=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(-)] test? ( 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? ( >=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=an easy whitelist-based HTML-sanitizing tool
+EAPI=7
+HOMEPAGE=https://github.com/mozilla/bleach https://pypi.org/project/bleach/
+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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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/webencodings[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/b/bleach/bleach-3.0.1.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ef4bb9e4cfaba5c1cc258abb4003ccfb
diff --git a/metadata/md5-cache/dev-python/booleanOperations-0.8.0 b/metadata/md5-cache/dev-python/booleanOperations-0.8.0
new file mode 100644
index 000000000000..e1b28cc6faef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/booleanOperations-0.8.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Boolean operations on paths
+EAPI=7
+HOMEPAGE=https://github.com/typemytype/booleanOperations
+IUSE=python_targets_python2_7 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/fonttools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyclipper[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/ufoLib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/typemytype/booleanOperations/archive/0.8.0.tar.gz -> booleanOperations-0.8.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ed567208dcf58acfddb2d28fe7a4ddc9
diff --git a/metadata/md5-cache/dev-python/clang-python-7.0.0 b/metadata/md5-cache/dev-python/clang-python-7.0.0
index d9b9873dddfc..8b4f51f11fc2 100644
--- a/metadata/md5-cache/dev-python/clang-python-7.0.0
+++ b/metadata/md5-cache/dev-python/clang-python-7.0.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.0.0/cfe-7.0.0.src.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=54c7009e179bf9d27c74bd9b92d23849
+_md5_=b083caea96a0a1bcc39f8dee7d7f9039
diff --git a/metadata/md5-cache/dev-python/clang-python-7.0.9999 b/metadata/md5-cache/dev-python/clang-python-7.0.9999
index be6ee4b520c7..d6ba832fbc5c 100644
--- a/metadata/md5-cache/dev-python/clang-python-7.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-7.0.9999
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e72077477cc778c8846d9d72be3e8637
+_md5_=c3505707614b85da38f43dbb78133318
diff --git a/metadata/md5-cache/dev-python/clang-python-9999 b/metadata/md5-cache/dev-python/clang-python-9999
index 549e11a226ac..31b0c9cf5632 100644
--- a/metadata/md5-cache/dev-python/clang-python-9999
+++ b/metadata/md5-cache/dev-python/clang-python-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=20f63eccaf913bb434d0aaab5e0352dc
+_md5_=0486e90ea60cc425b6632a043fd8bd81
diff --git a/metadata/md5-cache/dev-python/click-7.0 b/metadata/md5-cache/dev-python/click-7.0
new file mode 100644
index 000000000000..7f99b2beb67e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/click-7.0
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+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(-)] test? ( 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(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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/pallets-sphinx-themes[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=A Python package for creating beautiful command line interfaces
+EAPI=7
+HOMEPAGE=http://click.pocoo.org/ https://pypi.org/project/click/
+IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+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 ) 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=https://github.com/pallets/click/archive/7.0.tar.gz -> click-7.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=35dee25cd2eefb13018876ed17dceb45
diff --git a/metadata/md5-cache/dev-python/commonmark-0.5.4 b/metadata/md5-cache/dev-python/commonmark-0.5.4
new file mode 100644
index 000000000000..ffc5338b28d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/commonmark-0.5.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/hypothesis[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python parser for the CommonMark Markdown spec
+EAPI=6
+HOMEPAGE=https://github.com/rtfd/CommonMark-py
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/C/CommonMark/CommonMark-0.5.4.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c74d601e38759d7d76c5fa1246e028ac
diff --git a/metadata/md5-cache/dev-python/commonmark-0.7.5 b/metadata/md5-cache/dev-python/commonmark-0.7.5
new file mode 100644
index 000000000000..3a972ce20d99
--- /dev/null
+++ b/metadata/md5-cache/dev-python/commonmark-0.7.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/future[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/hypothesis-3.7.1[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/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(-)] 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 parser for the CommonMark Markdown spec
+EAPI=6
+HOMEPAGE=https://github.com/rtfd/CommonMark-py
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/future[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 )
+SLOT=0
+SRC_URI=mirror://pypi/C/CommonMark/CommonMark-0.7.5.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=40d96d14e69b822e71fa3903fd9141cd
diff --git a/metadata/md5-cache/dev-python/commonmark-0.8.1 b/metadata/md5-cache/dev-python/commonmark-0.8.1
new file mode 100644
index 000000000000..32fe3f07e085
--- /dev/null
+++ b/metadata/md5-cache/dev-python/commonmark-0.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/future[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/hypothesis-3.7.1[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/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(-)] 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 parser for the CommonMark Markdown spec
+EAPI=6
+HOMEPAGE=https://github.com/rtfd/CommonMark-py
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/future[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 )
+SLOT=0
+SRC_URI=mirror://pypi/c/commonmark/commonmark-0.8.1.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5d96b07792d61faaf304769cd00bb4cc
diff --git a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1 b/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
index c8ee063257f4..216f22a04e4d 100644
--- a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
+++ b/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python wrapper generator for ctypes
 EAPI=5
 HOMEPAGE=https://github.com/davidjamesca/ctypesgen
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=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://gentoo/ctypesgen-0_p72.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cc1b5d00e9d9c5957aa33e0dc1d559a0
+_md5_=394b1e658d7c78084f7372451ae3364d
diff --git a/metadata/md5-cache/dev-python/daemonize-2.4.7 b/metadata/md5-cache/dev-python/daemonize-2.4.7
index 1de8cc9e2f77..5398ba9ce0e6 100644
--- a/metadata/md5-cache/dev-python/daemonize-2.4.7
+++ b/metadata/md5-cache/dev-python/daemonize-2.4.7
@@ -1,15 +1,15 @@
-BDEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+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=Library for writing system daemons in Python
 EAPI=7
 HOMEPAGE=https://github.com/thesharp/daemonize
-IUSE=python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( 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_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://github.com/thesharp/daemonize/archive/v2.4.7.tar.gz -> daemonize-2.4.7.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f2e263476770856e77d90f64537036f6
+_md5_=42774ecb8a4f1f6ed219eb1d03963d07
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 f2796453e53a..e5b123a43fc4 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 ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7ac5703505927ec8285521e37c5ea6aa
+_md5_=de54c6cdb3060d595e47020b1eb395af
diff --git a/metadata/md5-cache/dev-python/defcon-0.5.3 b/metadata/md5-cache/dev-python/defcon-0.5.3
new file mode 100644
index 000000000000..444b831f02c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/defcon-0.5.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/fonttools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/ufoLib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A set of UFO based objects for use in font editing applications
+EAPI=7
+HOMEPAGE=https://github.com/typesupply/defcon
+IUSE=python_targets_python2_7 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/fonttools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/ufoLib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/typesupply/defcon/archive/0.5.3.tar.gz -> defcon-0.5.3.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c6ba7b7276be2d811e3c6f8fb7a25ea2
diff --git a/metadata/md5-cache/dev-python/denonavr-0.7.4 b/metadata/md5-cache/dev-python/denonavr-0.7.4
deleted file mode 100644
index a6ea64621a23..000000000000
--- a/metadata/md5-cache/dev-python/denonavr-0.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/requests[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(-)] dev-python/pytest[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(-)] dev-python/requests-mock[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(-)] dev-python/testtools[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(-)] )
-DESCRIPTION=Automation Library for Denon AVR receivers
-EAPI=7
-HOMEPAGE=https://github.com/scarface-4711/denonavr
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/requests[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(-)] python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[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(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=160c50527f3865ffd7341b7dd9f21acb
diff --git a/metadata/md5-cache/dev-python/denonavr-0.7.6 b/metadata/md5-cache/dev-python/denonavr-0.7.6
new file mode 100644
index 000000000000..11f6205bcc45
--- /dev/null
+++ b/metadata/md5-cache/dev-python/denonavr-0.7.6
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[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(-)] test? ( dev-python/requests[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(-)] dev-python/pytest[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(-)] dev-python/requests-mock[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(-)] dev-python/testtools[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(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automation Library for Denon AVR receivers
+EAPI=7
+HOMEPAGE=https://github.com/scarface-4711/denonavr
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/requests[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(-)] python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[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(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.6.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ba1a586c6bfe06e2ebb94fd500b4b0bf
diff --git a/metadata/md5-cache/dev-python/dnspython-1.16.0_pre20180731 b/metadata/md5-cache/dev-python/dnspython-1.16.0_pre20180731
index 216e2e681b87..875d5ea13eef 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.16.0_pre20180731
+++ b/metadata/md5-cache/dev-python/dnspython-1.16.0_pre20180731
@@ -1,14 +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(-)]
+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(-)] 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=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
+IUSE=examples 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 ~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 )
+RDEPEND=dev-python/pycryptodome[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/ecdsa-0.13[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/idna-2.1[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/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 ) 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=https://github.com/rthalley/dnspython/archive/be7e71e54a6edc87ead1b15af8981b8921e0e83d.tar.gz -> dnspython-1.16.0_pre20180731.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=482dc4d1711c208997970ed55db1919b
+_md5_=754f050f3da3b5707a205b3887c1a1ae
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 da0502591eed..a4eda75a4ef3 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 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha 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	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=832ce7329589832559586fb55dfa1c15
+_md5_=800f46d0c0a7fdf1c8add66bb314cd93
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.10 b/metadata/md5-cache/dev-python/ebuildtester-0.1.10
deleted file mode 100644
index 5a39f92ed56b..000000000000
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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 dockerized approach to test a Gentoo package within a clean stage3 container
-EAPI=6
-HOMEPAGE=http://ebuildtester.readthedocs.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=app-emulation/docker 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/e/ebuildtester/ebuildtester-0.1.10.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=233a1cedf3e0c9f5e146e988a07d809a
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.14 b/metadata/md5-cache/dev-python/ebuildtester-0.1.14
new file mode 100644
index 000000000000..356bbced0461
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.14
@@ -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(-)] 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(-)]
+DESCRIPTION=A dockerized approach to test a Gentoo package within a clean stage3 container
+EAPI=6
+HOMEPAGE=http://ebuildtester.readthedocs.io/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-emulation/docker 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/e/ebuildtester/ebuildtester-0.1.14.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b6510d44b1ca877ccf11d6515a3dc3ee
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.6 b/metadata/md5-cache/dev-python/ebuildtester-0.1.6
deleted file mode 100644
index 103b5db7925e..000000000000
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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 dockerized approach to test a Gentoo package within a clean stage3
-EAPI=6
-HOMEPAGE=http://ebuildtester.readthedocs.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=app-emulation/docker 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/e/ebuildtester/ebuildtester-0.1.6.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=54d8009388ad2d735850603e07af11b1
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.6-r1 b/metadata/md5-cache/dev-python/ebuildtester-0.1.6-r1
deleted file mode 100644
index 3a9a072c15ed..000000000000
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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 dockerized approach to test a Gentoo package within a clean stage3
-EAPI=6
-HOMEPAGE=http://ebuildtester.readthedocs.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=app-emulation/docker 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/e/ebuildtester/ebuildtester-0.1.6.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6f3dc8e0bb9c516254191829b65e2a26
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.7 b/metadata/md5-cache/dev-python/ebuildtester-0.1.7
deleted file mode 100644
index b89b2ae94192..000000000000
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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 dockerized approach to test a Gentoo package within a clean stage3
-EAPI=6
-HOMEPAGE=http://ebuildtester.readthedocs.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=app-emulation/docker 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/e/ebuildtester/ebuildtester-0.1.7.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6f3dc8e0bb9c516254191829b65e2a26
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.13 b/metadata/md5-cache/dev-python/ecdsa-0.13
index 9226dd84f73c..5b1b2bc8a652 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.13
+++ b/metadata/md5-cache/dev-python/ecdsa-0.13
@@ -1,14 +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(-)]
+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=ECDSA cryptographic signature library in pure Python
 EAPI=6
 HOMEPAGE=https://github.com/warner/python-ecdsa
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint
 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 )
+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/e/ecdsa/ecdsa-0.13.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7ca936c4f8265de6ea4635e71dcfbfd3
+_md5_=ddf8180fd94cf4ec4159e0beb970982c
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.1.2 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.1.2
deleted file mode 100644
index 638324954264..000000000000
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.1.2
+++ /dev/null
@@ -1,15 +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(-)] 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/pyyaml-3.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(-)] test? ( >=dev-python/elasticsearch-py-5.4.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/elasticsearch-py-6.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/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/certifi-2017.4.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/voluptuous-0.9.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(-)] virtual/jre:1.8 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/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/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/nosexcover[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Tending time-series indices in Elasticsearch
-EAPI=6
-HOMEPAGE=https://github.com/elasticsearch/curator
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/elasticsearch-py-5.4.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/elasticsearch-py-6.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/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/certifi-2017.4.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/voluptuous-0.9.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(-)] 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=https://github.com/elasticsearch/curator/archive/v5.1.2.tar.gz -> elasticsearch-curator-5.1.2.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.5.1.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b742718ae5b4b4f9daeb466f511de501
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.1 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.1
deleted file mode 100644
index 80440999e1de..000000000000
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.1
+++ /dev/null
@@ -1,15 +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(-)] 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/pyyaml-3.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(-)] test? ( >=dev-python/elasticsearch-py-5.4.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/elasticsearch-py-7.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/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/certifi-2018.01.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/voluptuous-0.9.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(-)] virtual/jre:1.8 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/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/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/nosexcover[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Tending time-series indices in Elasticsearch
-EAPI=6
-HOMEPAGE=https://github.com/elasticsearch/curator
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/elasticsearch-py-5.4.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/elasticsearch-py-7.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/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/certifi-2018.01.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/voluptuous-0.9.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(-)] 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=https://github.com/elasticsearch/curator/archive/v5.5.1.tar.gz -> elasticsearch-curator-5.5.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.4.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=aac520230d59433a7256dc30eeaf3014
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4
deleted file mode 100644
index db4b3b3c1498..000000000000
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4
+++ /dev/null
@@ -1,15 +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(-)] >=dev-python/six-1.11.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/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/pyyaml-3.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(-)] test? ( >=dev-python/elasticsearch-py-5.5.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/elasticsearch-py-7.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/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/certifi-2018.04.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/voluptuous-0.9.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(-)] virtual/jre:1.8 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/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/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/nosexcover[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Tending time-series indices in Elasticsearch
-EAPI=6
-HOMEPAGE=https://github.com/elasticsearch/curator
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/elasticsearch-py-5.5.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/elasticsearch-py-7.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/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/certifi-2018.04.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/voluptuous-0.9.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(-)] 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=https://github.com/elasticsearch/curator/archive/v5.5.4.tar.gz -> elasticsearch-curator-5.5.4.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.3.1.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bc7a7e829788d49685d034bdc671a098
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4-r1 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4-r1
new file mode 100644
index 000000000000..580a78a82a63
--- /dev/null
+++ b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4-r1
@@ -0,0 +1,15 @@
+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(-)] >=dev-python/six-1.11.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/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/pyyaml-3.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(-)] test? ( >=dev-python/elasticsearch-py-6.1.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/elasticsearch-py-7.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/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/click-7.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/certifi-2018.04.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/voluptuous-0.9.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(-)] virtual/jre:1.8 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/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/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/nosexcover[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Tending time-series indices in Elasticsearch
+EAPI=6
+HOMEPAGE=https://github.com/elasticsearch/curator
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/elasticsearch-py-6.1.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/elasticsearch-py-7.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/click-6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/click-7.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/certifi-2018.04.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/voluptuous-0.9.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(-)] 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=https://github.com/elasticsearch/curator/archive/v5.5.4.tar.gz -> elasticsearch-curator-5.5.4.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.3.2.tar.gz )
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f83e43c360daf6acc912b2c5b2d62528
diff --git a/metadata/md5-cache/dev-python/eradicate-0.2.1 b/metadata/md5-cache/dev-python/eradicate-0.2.1
new file mode 100644
index 000000000000..317aaca12a67
--- /dev/null
+++ b/metadata/md5-cache/dev-python/eradicate-0.2.1
@@ -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=Removes commented-out code from Python files
+EAPI=6
+HOMEPAGE=https://github.com/myint/eradicate
+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
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/e/eradicate/eradicate-0.2.1.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c557d8efc758bc7fb8deaa728d500e3c
diff --git a/metadata/md5-cache/dev-python/et_xmlfile-1.0.1 b/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
index 9e5674b7e7ba..095c2e51cb1b 100644
--- a/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
+++ b/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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/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(-)] ) 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=dev-python/lxml[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/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(-)] ) 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=An implementation of lxml.xmlfile for the standard library
 EAPI=5
 HOMEPAGE=https://pypi.org/project/et_xmlfile/ https://bitbucket.org/openpyxl/et_xmlfile
-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/lxml[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 )
 SLOT=0
 SRC_URI=mirror://pypi/e/et_xmlfile/et_xmlfile-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5d96235d17c0c736b2cef0cab02c1b6e
+_md5_=8596009c93e5c298f5fbade4aaabf811
diff --git a/metadata/md5-cache/dev-python/eventlet-0.24.1 b/metadata/md5-cache/dev-python/eventlet-0.24.1
new file mode 100644
index 000000000000..fcda90c57553
--- /dev/null
+++ b/metadata/md5-cache/dev-python/eventlet-0.24.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=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/python-docs-2.7.6-r1:2.7 ) test? ( >=dev-python/dnspython-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] 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(-)] )
+DESCRIPTION=Highly concurrent networking library
+EAPI=7
+HOMEPAGE=https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/e/eventlet/eventlet-0.24.1.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=bb77fff102d5ea7987aa9071f6e8a590
diff --git a/metadata/md5-cache/dev-python/flake8-import-order-0.18 b/metadata/md5-cache/dev-python/flake8-import-order-0.18
new file mode 100644
index 000000000000..6563c5ecce0f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flake8-import-order-0.18
@@ -0,0 +1,15 @@
+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(-)] 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(-)] 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(-)] test? ( 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/flake8[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/pylama[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=Flake8 plugin that checks import order against various Python Style Guides
+EAPI=6
+HOMEPAGE=https://github.com/PyCQA/flake8-import-order
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=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(-)] 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(-)] 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(-)] 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/flake8-import-order/flake8-import-order-0.18.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b8992128a1dea2508e57e1adb9751ee7
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.14.2 b/metadata/md5-cache/dev-python/flask-wtf-0.14.2
deleted file mode 100644
index f8c58c333cc5..000000000000
--- a/metadata/md5-cache/dev-python/flask-wtf-0.14.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/wtforms-1.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-testing[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-uploads[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/speaklater[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-babel[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/werkzeug[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Simple integration of Flask and WTForms
-EAPI=6
-HOMEPAGE=https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/wtforms-1.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/F/Flask-WTF/Flask-WTF-0.14.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6fdab713bdd8a3ab0bbd8fe5a4893dff
diff --git a/metadata/md5-cache/dev-python/foolscap-0.13.1 b/metadata/md5-cache/dev-python/foolscap-0.13.1
new file mode 100644
index 000000000000..1b5a009723ef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/foolscap-0.13.1
@@ -0,0 +1,16 @@
+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=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/twisted-16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
+DESCRIPTION=RPC protocol for Twisted
+EAPI=7
+HOMEPAGE=http://foolscap.lothar.com/trac https://pypi.org/project/foolscap/
+IUSE=doc +ssl test python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/twisted-16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ssl? ( dev-python/pyopenssl[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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/f/foolscap/foolscap-0.13.1.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e7271de4b0c26a6861d868dc159f0760
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.10 b/metadata/md5-cache/dev-python/freezegun-0.3.10
index 4bad2fe10fe9..a2a94b9f8ac6 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.10
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.10
@@ -4,11 +4,11 @@ DESCRIPTION=Let your Python tests travel through time
 EAPI=6
 HOMEPAGE=https://github.com/spulec/freezegun
 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=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/python-dateutil-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/six[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/f/freezegun/freezegun-0.3.10.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ec9075a311225ebf78ccb9b220e65950
+_md5_=543b000c88bd6cd1c5766da2b6abb189
diff --git a/metadata/md5-cache/dev-python/fuse-python-0.2.1-r1 b/metadata/md5-cache/dev-python/fuse-python-0.2.1-r1
index 1ae4a5314bbb..8719e25fd6dd 100644
--- a/metadata/md5-cache/dev-python/fuse-python-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/fuse-python-0.2.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-fs/fuse-2.0 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 DESCRIPTION=Python FUSE bindings
 EAPI=5
-HOMEPAGE=http://fuse.sourceforge.net/wiki/index.php/FusePython
+HOMEPAGE=https://github.com/libfuse/python-fuse
 IUSE=python_targets_pypy python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fuse/fuse-python-0.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5bff6866b304ee4976f953d0a4508380
+_md5_=885d5c3202fe1f4b182535db16334458
diff --git a/metadata/md5-cache/dev-python/future-0.16.0-r1 b/metadata/md5-cache/dev-python/future-0.16.0-r1
index 8d40f51552f5..263c984d7836 100644
--- a/metadata/md5-cache/dev-python/future-0.16.0-r1
+++ b/metadata/md5-cache/dev-python/future-0.16.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Easy, clean, reliable Python 2/3 compatibility
 EAPI=7
 HOMEPAGE=http://python-future.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~amd64-fbsd ~x86-linux
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~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 ) 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/f/future/future-0.16.0.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e290b2add365d34888f40fc0fbd22423
+_md5_=d7a4f4cb061ec90194fe3d55f5d53bb2
diff --git a/metadata/md5-cache/dev-python/genty-1.3.2 b/metadata/md5-cache/dev-python/genty-1.3.2
index df6cffbdcbee..eff44d226b99 100644
--- a/metadata/md5-cache/dev-python/genty-1.3.2
+++ b/metadata/md5-cache/dev-python/genty-1.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Allows you to run a test with multiple data sets
 EAPI=5
 HOMEPAGE=https://pypi.org/project/genty/ https://github.com/box/genty
 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=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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/g/genty/genty-1.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8793862c6ebb65afc4a2844208878c44
+_md5_=2d7bf8f96f92860d1920cd731a56e596
diff --git a/metadata/md5-cache/dev-python/gevent-1.3.7 b/metadata/md5-cache/dev-python/gevent-1.3.7
new file mode 100644
index 000000000000..7b3936d16632
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gevent-1.3.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libev-4.23 >=net-dns/c-ares-1.12 >=dev-python/greenlet-0.4.14 virtual/python-greenlet[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-python/setuptools[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(-)] doc? ( dev-python/sphinx[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=[ssl(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),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=Coroutine-based network library
+EAPI=6
+HOMEPAGE=http://gevent.org/ https://pypi.org/project/gevent/
+IUSE=doc examples python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/libev-4.23 >=net-dns/c-ares-1.12 >=dev-python/greenlet-0.4.14 virtual/python-greenlet[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=[ssl(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),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=|| ( python_targets_pypy 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=mirror://pypi/g/gevent/gevent-1.3.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1b703939a97f679618ec3d9f539ad797
diff --git a/metadata/md5-cache/dev-python/git-python-2.1.11 b/metadata/md5-cache/dev-python/git-python-2.1.11
new file mode 100644
index 000000000000..cfac6e7c542e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/git-python-2.1.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-vcs/git >=dev-python/gitdb2-2.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(-)] test? ( >=dev-python/ddt-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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(-)]
+DESCRIPTION=Library used to interact with Git repositories
+EAPI=6
+HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-vcs/git >=dev-python/gitdb2-2.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(-)] 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/G/GitPython/GitPython-2.1.11.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f2566360277ec6462669fa6927a0b4b3
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.15 b/metadata/md5-cache/dev-python/greenlet-0.4.15
new file mode 100644
index 000000000000..3dcd942f2f94
--- /dev/null
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.15
@@ -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_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(-)] doc? ( dev-python/sphinx[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(-)]
+DESCRIPTION=Lightweight in-process concurrent programming
+EAPI=6
+HOMEPAGE=https://pypi.org/project/greenlet/
+IUSE=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 ~mips ~ppc ~ppc64 ~sparc ~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 ) 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/g/greenlet/greenlet-0.4.15.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=58f3a2e386b62762201949481bad7862
diff --git a/metadata/md5-cache/dev-python/hypothesis-3.59.1 b/metadata/md5-cache/dev-python/hypothesis-3.59.1
index 88ab579a20ed..017f2f80f39f 100644
--- a/metadata/md5-cache/dev-python/hypothesis-3.59.1
+++ b/metadata/md5-cache/dev-python/hypothesis-3.59.1
@@ -4,11 +4,11 @@ DESCRIPTION=A library for property based testing
 EAPI=6
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
 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 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
 LICENSE=MPL-2.0
 RDEPEND=dev-python/attrs[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/coverage[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/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),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_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+),sqlite] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+),sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+),sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) >=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=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-3.59.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3c20b2b3b9f76fe77d2073b3131d0fc8
+_md5_=e32245bc1601c56a81cfa9943112e8d4
diff --git a/metadata/md5-cache/dev-python/hypothesis-3.74.3 b/metadata/md5-cache/dev-python/hypothesis-3.74.3
new file mode 100644
index 000000000000..e5e966b3bb57
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-3.74.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+),sqlite] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+),sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+),sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) >=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(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/attrs-16.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(-)] python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),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_python2_7(-)?,-python_single_target_python2_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(-)] test? ( dev-python/flaky[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/mock[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[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-xdist[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=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-16.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(-)] python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),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_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+),sqlite] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+),sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+),sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) >=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=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-3.74.3.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=8488362563233113a4c308b56137d94a
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-0.8.7 b/metadata/md5-cache/dev-python/indexed_gzip-0.8.7
new file mode 100644
index 000000000000..19e1ced7c74f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/indexed_gzip-0.8.7
@@ -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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] test? ( dev-python/numpy[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/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(-)] )
+DESCRIPTION=Fast random access of gzip files in Python
+EAPI=7
+HOMEPAGE=https://github.com/pauldmccarthy/indexed_gzip
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v0.8.7.tar.gz -> indexed_gzip-0.8.7.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=27496224f64c34b280aa8262c745d860
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-1.5 b/metadata/md5-cache/dev-python/jaraco-collections-1.5
deleted file mode 100644
index 29a634942a25..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-collections-1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/rst-linker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/jaraco-classes[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Models and classes to supplement the stdlib collections module
-EAPI=5
-HOMEPAGE=https://github.com/jaraco/jaraco.collections
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=MIT
-PDEPEND=dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-RDEPEND=dev-python/jaraco-classes[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=184c80ff98fa1406439e36f44517edad
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-1.6.0 b/metadata/md5-cache/dev-python/jaraco-collections-1.6.0
new file mode 100644
index 000000000000..393e8b4de340
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-collections-1.6.0
@@ -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(-)] >=dev-python/setuptools_scm-1.15.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(-)] doc? ( >=dev-python/jaraco-packaging-3.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-python/rst-linker-1.9[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/sphinx[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/jaraco-text[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/namespace-jaraco[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/jaraco-classes[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/six-1.7.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(-)] >=dev-python/pytest-2.8[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=Models and classes to supplement the stdlib collections module
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.collections
+IUSE=doc 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=MIT
+PDEPEND=dev-python/jaraco-text[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(-)]
+RDEPEND=dev-python/namespace-jaraco[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/jaraco-classes[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/six-1.7.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 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-1.6.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e175cdf9dbf206bdd086778ebb152e49
diff --git a/metadata/md5-cache/dev-python/jdcal-1.4 b/metadata/md5-cache/dev-python/jdcal-1.4
new file mode 100644
index 000000000000..054c03ad06f7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jdcal-1.4
@@ -0,0 +1,16 @@
+BDEPEND=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(-)]
+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(-)] test? ( 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(-)] )
+DESCRIPTION=Julian dates from proleptic Gregorian and Julian calendars
+EAPI=7
+HOMEPAGE=https://github.com/phn/jdcal
+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-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 ) 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jdcal/jdcal-1.4.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0baba181eb25a65a4aeeb29754b3da91
diff --git a/metadata/md5-cache/dev-python/logilab-common-1.2.2 b/metadata/md5-cache/dev-python/logilab-common-1.2.2
deleted file mode 100644
index 3361c7ea0a8c..000000000000
--- a/metadata/md5-cache/dev-python/logilab-common-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.4.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( python_targets_python2_7? ( dev-python/egenix-mx-base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Useful miscellaneous modules used by Logilab projects
-EAPI=6
-HOMEPAGE=https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common/
-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 ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/six-1.4.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=ftp://ftp.logilab.org/pub/common/logilab-common-1.2.2.tar.gz mirror://pypi/l/logilab-common/logilab-common-1.2.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7144869db5da01072ab9188f2c18398f
diff --git a/metadata/md5-cache/dev-python/logilab-common-1.4.1 b/metadata/md5-cache/dev-python/logilab-common-1.4.1
deleted file mode 100644
index 9560488c7dc9..000000000000
--- a/metadata/md5-cache/dev-python/logilab-common-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.4.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( python_targets_python2_7? ( dev-python/egenix-mx-base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Useful miscellaneous modules used by Logilab projects
-EAPI=6
-HOMEPAGE=https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common/
-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 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/six-1.4.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=ftp://ftp.logilab.org/pub/common/logilab-common-1.4.1.tar.gz mirror://pypi/l/logilab-common/logilab-common-1.4.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=63bd6ecafcf121918f5046776fbe3aed
diff --git a/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r1 b/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r1
deleted file mode 100644
index 7457ae4994f8..000000000000
--- a/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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=A finite domain constraints solver written in 100% pure Python
-EAPI=5
-HOMEPAGE=https://www.logilab.org/project/logilab-constraint
-IUSE=doc examples python_targets_python2_7
-KEYWORDS=amd64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/logilab-common[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=ftp://ftp.logilab.org/pub/constraint/logilab-constraint-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=af21001046c8b4609cc9f4fcd3d6f46f
diff --git a/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r2 b/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r2
deleted file mode 100644
index c4f15286de8c..000000000000
--- a/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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=A finite domain constraints solver written in 100% pure Python
-EAPI=5
-HOMEPAGE=https://www.logilab.org/project/logilab-constraint
-IUSE=doc examples python_targets_python2_7
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/logilab-common-1.2.2-r1[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=ftp://ftp.logilab.org/pub/constraint/logilab-constraint-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2fe116905e8672ddbd3c5a0dc5772467
diff --git a/metadata/md5-cache/dev-python/lxc-python2-0.1 b/metadata/md5-cache/dev-python/lxc-python2-0.1
new file mode 100644
index 000000000000..2a57a9ed41f9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lxc-python2-0.1
@@ -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-emulation/lxc-3.0 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python bindings for LXC
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxc/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=LGPL-3
+RDEPEND=>=app-emulation/lxc-3.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=mirror://pypi/l/lxc-python2/lxc-python2-0.1.zip
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3b5e48a90c78766cd1230d8251b3dbcb
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222 b/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222
deleted file mode 100644
index d96e79bff991..000000000000
--- a/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/miniupnpc-2.0.20180222:0= 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=Python bindings for UPnP client library
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-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 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=>=net-libs/miniupnpc-2.0.20180222: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 ) >=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://miniupnp.free.fr/files/miniupnpc-2.0.20180222.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=af90a99cfc6ab20b4c2c02af409db498
diff --git a/metadata/md5-cache/dev-python/mockldap-0.3.0 b/metadata/md5-cache/dev-python/mockldap-0.3.0
new file mode 100644
index 000000000000..915c06749532
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mockldap-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=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[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(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=~dev-python/funcparserlib-0.3.6[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-unittest-mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-ldap-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A simple mock implementation of python-ldap
+EAPI=7
+HOMEPAGE=https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap/
+IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=~dev-python/funcparserlib-0.3.6[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-unittest-mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-ldap-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/m/mockldap/mockldap-0.3.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b8be7743f877f7af89447514630edbea
diff --git a/metadata/md5-cache/dev-python/monotonic-1.5 b/metadata/md5-cache/dev-python/monotonic-1.5
new file mode 100644
index 000000000000..c94874c4ce8a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/monotonic-1.5
@@ -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_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= ) 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_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=An implementation of time.monotonic() for Python 2 & < 3.3
+EAPI=5
+HOMEPAGE=https://github.com/atdt/monotonic
+IUSE=python_targets_pypy 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
+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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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=|| ( 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://pypi/m/monotonic/monotonic-1.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=47c96db3d445951cc14fb8411b176424
diff --git a/metadata/md5-cache/dev-python/more-itertools-3.0.0 b/metadata/md5-cache/dev-python/more-itertools-3.0.0
index 1497fcd7e8cf..d0b6fdacf475 100644
--- a/metadata/md5-cache/dev-python/more-itertools-3.0.0
+++ b/metadata/md5-cache/dev-python/more-itertools-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=More routines for operating on iterables, beyond itertools
 EAPI=6
 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
-KEYWORDS=amd64 ~arm ~ia64 ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc x86
 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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-3.0.0.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6d21863dc26d4a2bf2c290e5d042934f
+_md5_=c3563030311117939d5fd440b2060605
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 1f618dc9c3c6..2bb4d0bdc5a3 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 ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc 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	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=68216fd96b9b9c4bfff55022d532578d
+_md5_=090a21cacebdba4123cf62ac32a519c1
diff --git a/metadata/md5-cache/dev-python/more-itertools-4.3.0 b/metadata/md5-cache/dev-python/more-itertools-4.3.0
new file mode 100644
index 000000000000..0d95af77eb40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/more-itertools-4.3.0
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+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(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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/sphinx_rtd_theme[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/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(-)] )
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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.3.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7c3d4b2622c932a20df4857b7f404a5d
diff --git a/metadata/md5-cache/dev-python/namespace-paste-1 b/metadata/md5-cache/dev-python/namespace-paste-1
index 765af83e4b4c..26a31b0b045f 100644
--- a/metadata/md5-cache/dev-python/namespace-paste-1
+++ b/metadata/md5-cache/dev-python/namespace-paste-1
@@ -4,10 +4,10 @@ DESCRIPTION=Namespace package declaration for paste
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~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
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=92b917bf4731559f7adca16ce0fd4174
+_md5_=2fc5e7337a963d377c40ecbeaa5b4c72
diff --git a/metadata/md5-cache/dev-python/notify2-0.3 b/metadata/md5-cache/dev-python/notify2-0.3
index 378733e4097a..5dc86e8668db 100644
--- a/metadata/md5-cache/dev-python/notify2-0.3
+++ b/metadata/md5-cache/dev-python/notify2-0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to DBus notifications.
 EAPI=6
 HOMEPAGE=https://bitbucket.org/takluyver/pynotify2
 IUSE=examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/notify2/notify2-0.3.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f14e600c48b1d21aa4722581fd095cda
+_md5_=4550fd057ef1a4ce9c6870d9de1d64de
diff --git a/metadata/md5-cache/dev-python/nototools-20180827 b/metadata/md5-cache/dev-python/nototools-20180827
new file mode 100644
index 000000000000..3f450e4603b5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nototools-20180827
@@ -0,0 +1,14 @@
+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
+DESCRIPTION=Noto fonts support tools and scripts plus web site generation
+EAPI=7
+HOMEPAGE=https://github.com/googlei18n/nototools
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 OFL-1.1
+RDEPEND=dev-python/backports-os[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/booleanOperations[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/defcon[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/fonttools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-typing[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/googlei18n/nototools/archive/40aa4936022295cf851bb62f09a070f63fc8f5ae.tar.gz#/nototools-40aa4936022295cf851bb62f09a070f63fc8f5ae.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c15ab72411c5f543b77aca5f048457aa
diff --git a/metadata/md5-cache/dev-python/olefile-0.44 b/metadata/md5-cache/dev-python/olefile-0.44
index 326026358d32..b7269305aa1c 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 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc 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	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f31e661618f37815064cbcd6d9e3895e
+_md5_=cc9a825cf9c043fbb5c9fde61ef53963
diff --git a/metadata/md5-cache/dev-python/paho-mqtt-1.4.0 b/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
new file mode 100644
index 000000000000..7ac26e48835c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
@@ -0,0 +1,15 @@
+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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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 client class with support for both MQTT v3.1 and v3.1.1
+EAPI=6
+HOMEPAGE=https://www.eclipse.org/paho/clients/python/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=EPL-1.0
+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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/eclipse/paho.mqtt.python/archive/v1.4.0.tar.gz -> paho-mqtt-1.4.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a5a7106cee9829dbe9bfc43e281d1934
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
new file mode 100644
index 000000000000..67f289581fd0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+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(-)]
+DESCRIPTION=Sphinx themes for Pallets and related projects
+EAPI=7
+HOMEPAGE=https://github.com/pallets/pallets-sphinx-themes
+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 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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=https://github.com/pallets/pallets-sphinx-themes/archive/1.1.2.tar.gz -> pallets-sphinx-themes-1.1.2.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c9310190a5eb5919ef4c505e13189b24
diff --git a/metadata/md5-cache/dev-python/paramiko-2.1.2 b/metadata/md5-cache/dev-python/paramiko-2.1.2
deleted file mode 100644
index 354844bb4d54..000000000000
--- a/metadata/md5-cache/dev-python/paramiko-2.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/cryptography-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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[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(-)]
-DESCRIPTION=SSH2 protocol library
-EAPI=6
-HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/cryptography-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/paramiko/paramiko-2.1.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=993ee626f30812471addbfae482b3d5f
diff --git a/metadata/md5-cache/dev-python/paramiko-2.4.1 b/metadata/md5-cache/dev-python/paramiko-2.4.1
index 1b76f08580b0..4c0b27863478 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.4.1
+++ b/metadata/md5-cache/dev-python/paramiko-2.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=SSH2 protocol library
 EAPI=6
 HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/
 IUSE=doc 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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
+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 ~m68k-mint ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/paramiko/paramiko/archive/2.4.1.tar.gz -> paramiko-2.4.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=045e7ebd942386832dddcd174a285bfc
+_md5_=4133f94e1830199d5c64eed3c2c57c53
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.2 b/metadata/md5-cache/dev-python/pathlib2-2.3.2
index c7f508a11055..67fe968d4f74 100644
--- a/metadata/md5-cache/dev-python/pathlib2-2.3.2
+++ b/metadata/md5-cache/dev-python/pathlib2-2.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=Fork of pathlib aiming to support the full stdlib Python API
 EAPI=7
 HOMEPAGE=https://github.com/mcmtroffaes/pathlib2
 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 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( dev-python/scandir[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/scandir[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/six[python_targets_pypy(-)?,python_targets_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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib2/pathlib2-2.3.2.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f05c25f5d51d231e14dc8f08ad62c771
+_md5_=676618350aae430a2aef47ede0138bda
diff --git a/metadata/md5-cache/dev-python/pep257-2.1.1 b/metadata/md5-cache/dev-python/pep257-2.1.1
new file mode 100644
index 000000000000..684a93cf5556
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pep257-2.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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/mock[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(-)]
+DESCRIPTION=Python docstring style checker
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/pep257
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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/PyCQA/pydocstyle/archive/2.1.1.tar.gz -> pep257-2.1.1.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e0bd7723f2bf9997f92e4641d8d6c917
diff --git a/metadata/md5-cache/dev-python/pillow-5.2.0 b/metadata/md5-cache/dev-python/pillow-5.2.0
index 9d70a3952d9d..46d22e525fff 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_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=dev-python/olefile[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(-)] 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_pypy? ( >=virtual/pypy-5:0=[tk?,threads(+)] ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,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=test? ( jpeg tiff ) || ( 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://pypi/P/Pillow/Pillow-5.2.0.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c81ebc8e8d9ac6a734e75364380cd7d2
+_md5_=a7a581a470971b5f98e3a8bd0baa0fa6
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.17 b/metadata/md5-cache/dev-python/pocketlint-0.17
index e4f90c9412bb..4b688480db4c 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.17
+++ b/metadata/md5-cache/dev-python/pocketlint-0.17
@@ -4,11 +4,11 @@ DESCRIPTION=Shared code for running pylint against rhinstaller projects
 EAPI=7
 HOMEPAGE=https://github.com/rhinstaller/pocketlint
 IUSE=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
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_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_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.17.tar.gz -> pocketlint-0.17.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=52bec55260cd4d1f42a4bb8ebe76d57d
+_md5_=41796cd4a3ca2219ceef2caecbb9111d
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.18 b/metadata/md5-cache/dev-python/pocketlint-0.18
new file mode 100644
index 000000000000..a1e6bddb7149
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pocketlint-0.18
@@ -0,0 +1,14 @@
+BDEPEND=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_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Shared code for running pylint against rhinstaller projects
+EAPI=7
+HOMEPAGE=https://github.com/rhinstaller/pocketlint
+IUSE=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=GPL-2
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_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_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.18.tar.gz -> pocketlint-0.18.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=52bec55260cd4d1f42a4bb8ebe76d57d
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.6.1 b/metadata/md5-cache/dev-python/protobuf-python-3.6.1
index 624e4a216ef4..f8f5d4eb7d2b 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.6.1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=6
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 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 ) 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/protobuf-3.6.1 dev-python/namespace-google[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/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(-)] dev-python/six[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/protobuf-3[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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/17
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.6.1.tar.gz -> protobuf-3.6.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=db21a670b30588851396e2856e742068
+_md5_=b2a127ad67a48ef6525790d7819bfdfa
diff --git a/metadata/md5-cache/dev-python/psutil-5.4.3 b/metadata/md5-cache/dev-python/psutil-5.4.3
index f8c32e945e84..b81fbed53035 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=alpha 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	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bb185409ad12601ab538a8269c874b4d
+_md5_=5603fa50dc1924f4f7ba12fc8b8ca8d1
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.1.6 b/metadata/md5-cache/dev-python/pyalsa-1.1.6
index c6ae7ae924c1..1888b095652d 100644
--- a/metadata/md5-cache/dev-python/pyalsa-1.1.6
+++ b/metadata/md5-cache/dev-python/pyalsa-1.1.6
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for ALSA library
 EAPI=6
 HOMEPAGE=https://alsa-project.org/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib 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://alsaproject/pyalsa/pyalsa-1.1.6.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=84b0e6872da63650eb48f35c08d88cdd
+_md5_=bc5d930150e24ad5303150fc3849bfa7
diff --git a/metadata/md5-cache/dev-python/pyclipper-1.1.0 b/metadata/md5-cache/dev-python/pyclipper-1.1.0
new file mode 100644
index 000000000000..9dd9c47cca45
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyclipper-1.1.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools-git[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm_git_archive[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Cython wrapper for the C++ translation of the Angus Johnson's Clipper library
+EAPI=7
+HOMEPAGE=https://github.com/fonttools/pyclipper
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/fonttools/pyclipper/archive/1.1.0.tar.gz -> pyclipper-1.1.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c089fe528e39f68f9c7203f656118636
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.3.1 b/metadata/md5-cache/dev-python/pycodestyle-2.3.1
index 9c9758a5d877..3de575d7778c 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.3.1
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python style guide checker (fka pep8)
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pycodestyle/
 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=alpha amd64 arm ~arm64 hppa ia64 ~mips 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=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/pycodestyle/pycodestyle-2.3.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0478b054b18643470d52aa941539f1c8
+_md5_=8482731a4e5a28bb702abf6d01ca3029
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.4.0 b/metadata/md5-cache/dev-python/pycodestyle-2.4.0
index f4203eaef4b1..af0d7cbe196c 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.4.0
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python style guide checker (fka pep8)
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pycodestyle/
 IUSE=doc 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 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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/p/pycodestyle/pycodestyle-2.4.0.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c90261846f1f0f71c82ea73f990629c7
+_md5_=e33f2cc93df2f5edc2e6c68230bd86b3
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
index a03a4586208d..f780b455de34 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 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2bd9de7d4eb86968b9fe982fe62533f8
+_md5_=d693caa37e5dc004d08734d6837cd3a7
diff --git a/metadata/md5-cache/dev-python/pyilmbase-2.3.0 b/metadata/md5-cache/dev-python/pyilmbase-2.3.0
new file mode 100644
index 000000000000..81762b855a96
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyilmbase-2.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=dev-libs/boost-1.62.0-r1[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(+)] ~media-libs/ilmbase-2.3.0:= numpy? ( >=dev-python/numpy-1.10.4 ) >=virtual/pkgconfig-0-r1 >=app-portage/elt-patches-20170815 !<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=ilmbase Python bindings
+EAPI=6
+HOMEPAGE=http://www.openexr.com
+IUSE=+numpy python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/boost-1.62.0-r1[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(+)] ~media-libs/ilmbase-2.3.0:= numpy? ( >=dev-python/numpy-1.10.4 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/openexr/openexr/releases/download/v2.3.0/pyilmbase-2.3.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=879fdaa680ffbcca4df841c5e44121bf
diff --git a/metadata/md5-cache/dev-python/pylama-7.6.5 b/metadata/md5-cache/dev-python/pylama-7.6.5
new file mode 100644
index 000000000000..bebd1ecb2002
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylama-7.6.5
@@ -0,0 +1,15 @@
+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(-)] >=dev-python/mccabe-0.5.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/pycodestyle-2.3.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/pep257-2.0.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/pyflakes-1.5.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(-)] test? ( >=dev-python/eradicate-0.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/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/radon-1.4.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(-)] ) 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=Code audit tool for python
+EAPI=6
+HOMEPAGE=https://github.com/klen/pylama
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=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(-)] >=dev-python/mccabe-0.5.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/pycodestyle-2.3.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/pep257-2.0.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/pyflakes-1.5.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_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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/klen/pylama/archive/7.6.5.tar.gz -> pylama-7.6.5.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=95fc34db785cd79a0600443d3fdee23f
diff --git a/metadata/md5-cache/dev-python/pynacl-1.2.1 b/metadata/md5-cache/dev-python/pynacl-1.2.1
index 2a79589537a4..93f330502c3c 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.2.1
+++ b/metadata/md5-cache/dev-python/pynacl-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
 EAPI=6
 HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-fbsd
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.2.1.tar.gz -> pynacl-1.2.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ef900ccaa9b6550c07f5263cbd710042
+_md5_=95d5e1baea571170f77daf41e62093f4
diff --git a/metadata/md5-cache/dev-python/pysendfile-2.0.1 b/metadata/md5-cache/dev-python/pysendfile-2.0.1
index 4cadd325377a..9572c6856585 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 ppc ppc64 ~s390 sparc x86
+KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 ~s390 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	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=99969b85a30bd2ab1461a05be8fa7b07
+_md5_=fef98fabac8b83a9d7462b9fce039c9b
diff --git a/metadata/md5-cache/dev-python/pytest-3.6.3 b/metadata/md5-cache/dev-python/pytest-3.6.3
index 39018acf894f..90045058d049 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 ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~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	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=662770fa9ab801b56262113b99834c95
+_md5_=68ff19a659f223992c3b49c9d6979fe0
diff --git a/metadata/md5-cache/dev-python/pytest-3.8.2 b/metadata/md5-cache/dev-python/pytest-3.8.2
index 82bdd8cdb094..28ae9d3ba782 100644
--- a/metadata/md5-cache/dev-python/pytest-3.8.2
+++ b/metadata/md5-cache/dev-python/pytest-3.8.2
@@ -5,11 +5,11 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 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 ~mips ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~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.4.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(-)] python_targets_python2_7? ( dev-python/pathlib2[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/pathlib2[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/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) >=dev-python/pluggy-0.7[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(-)] 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.8.2.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7b741c879eaa31370b92effb21baf1ec
+_md5_=423ed20f10ae30e774f86cdc1f750713
diff --git a/metadata/md5-cache/dev-python/pytest-forked-0.2 b/metadata/md5-cache/dev-python/pytest-forked-0.2
index 8dc99a396d02..27da50ecfa8b 100644
--- a/metadata/md5-cache/dev-python/pytest-forked-0.2
+++ b/metadata/md5-cache/dev-python/pytest-forked-0.2
@@ -4,11 +4,11 @@ DESCRIPTION=run tests in isolated forked subprocesses
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-2.6.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/p/pytest-forked/pytest-forked-0.2.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=27a934e374550b61a40ad8a15d4bcd23
+_md5_=21d498e0f87505886ce70582dd1eb1c4
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 addf6b5a45fc..86d1958bd999 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 ~ppc64 x86
+KEYWORDS=~alpha 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	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3e269281f1a3a6d5066cb17d24156fe2
+_md5_=b6ea4ae2ab72eaf24981c26800e7e2db
diff --git a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4 b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4
index a18c67d79834..f8cd47d9ebf3 100644
--- a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4
+++ b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4
@@ -4,7 +4,7 @@ DESCRIPTION=py.test plugin for relaxed test discovery and organization
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-relaxed/ https://github.com/bitprophet/pytest-relaxed
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
 LICENSE=BSD-2
 RDEPEND=>=dev-python/pytest-3[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-3.3 >=dev-python/six-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/decorator-4[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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-relaxed/pytest-relaxed-1.1.4.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6c0fc3a15fbf9847a00cdbd065c21d84
+_md5_=d5d4afc93fae22e0e9967375d8060fb6
diff --git a/metadata/md5-cache/dev-python/pytest-runner-2.6.2 b/metadata/md5-cache/dev-python/pytest-runner-2.6.2
index ad1083228153..7b956276e721 100644
--- a/metadata/md5-cache/dev-python/pytest-runner-2.6.2
+++ b/metadata/md5-cache/dev-python/pytest-runner-2.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=Adds support for tests during installation of setup.py files
 EAPI=5
 HOMEPAGE=https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner
 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=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-runner/pytest-runner-2.6.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2d84ae0a2ceb5232a0d4f3ed35d1a2b8
+_md5_=60639ce2ce7ddaea0584070b698bd48f
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.23.2 b/metadata/md5-cache/dev-python/pytest-xdist-1.23.2
new file mode 100644
index 000000000000..1f87c7735a62
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.23.2
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/execnet-1.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/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(-)] dev-python/pytest-forked[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[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-capturelog 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/setuptools_scm[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=Distributed testing and loop-on-failing modes
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
+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=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
+LICENSE=MIT
+RDEPEND=>=dev-python/execnet-1.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/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(-)] dev-python/pytest-forked[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[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/p/pytest-xdist/pytest-xdist-1.23.2.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=aceb6efb3bc885dcc9281da0d449a59a
diff --git a/metadata/md5-cache/dev-python/python-evdev-1.1.2 b/metadata/md5-cache/dev-python/python-evdev-1.1.2
new file mode 100644
index 000000000000..37f4b56de29d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-evdev-1.1.2
@@ -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(-)]
+DESCRIPTION=Python library for evdev bindings
+EAPI=7
+HOMEPAGE=https://python-evdev.readthedocs.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~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=https://github.com/gvalkov/python-evdev/archive/v1.1.2.tar.gz -> python-evdev-1.1.2.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e83c6ade041fef32177cf5e828a37ad6
diff --git a/metadata/md5-cache/dev-python/python-openid-2.2.5-r1 b/metadata/md5-cache/dev-python/python-openid-2.2.5-r1
index a4cdfdadc4f5..36f715676ba9 100644
--- a/metadata/md5-cache/dev-python/python-openid-2.2.5-r1
+++ b/metadata/md5-cache/dev-python/python-openid-2.2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=mysql? ( >=dev-python/mysql-python-1.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/twill dev-python/pycurl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=mysql? ( >=dev-python/mysql-python-1.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=OpenID support for servers and consumers
 EAPI=5
 HOMEPAGE=http://www.openidenabled.com/openid/libraries/python/ https://pypi.org/project/python-openid/
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=mysql? ( >=dev-python/mysql-python-1.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/python-openid-2.2.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=18e9c7c0530b4d339317215af1608ae5
+_md5_=c3055d8d3e2489e46cf963a727eb19c1
diff --git a/metadata/md5-cache/dev-python/python-slip-0.6.5 b/metadata/md5-cache/dev-python/python-slip-0.6.5
index 47719ce41aab..f638ec17d39a 100644
--- a/metadata/md5-cache/dev-python/python-slip-0.6.5
+++ b/metadata/md5-cache/dev-python/python-slip-0.6.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=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=Miscellaneous convenience, extension and workaround code for Python
 EAPI=5
 HOMEPAGE=https://github.com/nphilipp/python-slip
-IUSE=dbus selinux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=dbus selinux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
-RDEPEND=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-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(-)] 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(-)] sys-auth/polkit ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=dbus? ( dev-python/dbus-python[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/pygobject:3[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/six[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-auth/polkit ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=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=https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.5/python-slip-0.6.5.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d5b9e094983b5bac517bd1c450699aa6
+_md5_=766a4581ae7e783998722685908eeb00
diff --git a/metadata/md5-cache/dev-python/pyutil-2.0.0-r1 b/metadata/md5-cache/dev-python/pyutil-2.0.0-r1
new file mode 100644
index 000000000000..01bfb1002996
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyutil-2.0.0-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=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A collection of utilities for Python programmers
+EAPI=7
+HOMEPAGE=https://tahoe-lafs.org/trac/pyutil https://pypi.org/project/pyutil/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyutil/pyutil-2.0.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a02e07184e7fc28a72bcc0c0a9dcfef2
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.10.8 b/metadata/md5-cache/dev-python/qscintilla-python-2.10.8
new file mode 100644
index 000000000000..a0c9dc553647
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.10.8
@@ -0,0 +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 ) 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-python/sip-4.19:=[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/PyQt5[gui,printsupport,widgets,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-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.10.8:=
+DESCRIPTION=Python bindings for QScintilla
+EAPI=7
+HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
+IUSE=debug python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~ppc64 ~x86
+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 ) 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-python/sip-4.19:=[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/PyQt5[gui,printsupport,widgets,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-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.10.8:=
+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://sourceforge/pyqt/QScintilla_gpl-2.10.8.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=16fada9d84d0480d93a5995f8784fe37
diff --git a/metadata/md5-cache/dev-python/ratelimit-1.4.1 b/metadata/md5-cache/dev-python/ratelimit-1.4.1
index 6ce359892abf..e8f86118fb26 100644
--- a/metadata/md5-cache/dev-python/ratelimit-1.4.1
+++ b/metadata/md5-cache/dev-python/ratelimit-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/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=An API rate limit decorator for Python
 EAPI=6
 HOMEPAGE=https://github.com/tomasbasham/ratelimit
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/tomasbasham/ratelimit/archive/v1.4.1.tar.gz -> ratelimit-1.4.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=40ea629e3cf3190810fa22184627e2ec
+_md5_=8d72f2ddf2f78f4dacaa4d241fb52695
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.4.0 b/metadata/md5-cache/dev-python/recommonmark-0.4.0
index e206be22bb91..40807e9f2cfd 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.4.0
+++ b/metadata/md5-cache/dev-python/recommonmark-0.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/CommonMark-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/commonmark-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python docutils-compatibility bridge to CommonMark
 EAPI=6
 HOMEPAGE=https://recommonmark.readthedocs.io/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/CommonMark-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/commonmark-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/recommonmark/recommonmark-0.4.0.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8dcb36e9f8ef03c05618f440f8873d91
+_md5_=afc92391a9ae90bb031216ae744479c6
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20180907 b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20180907
index 4843ca297308..9ceb62f12750 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20180907
+++ b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20180907
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/CommonMark-0.7.3[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/docutils[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/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(-)] >=dev-python/sphinx-1.3.1[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(-)] ) 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(-)]
+DEPEND=<dev-python/commonmark-0.8[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/commonmark-0.7.3[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/docutils[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/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(-)] >=dev-python/sphinx-1.3.1[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(-)] ) 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 docutils-compatibility bridge to CommonMark
 EAPI=6
 HOMEPAGE=https://recommonmark.readthedocs.io/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/CommonMark-0.7.3[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/docutils[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/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(-)] >=dev-python/sphinx-1.3.1[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(-)]
+RDEPEND=<dev-python/commonmark-0.8[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/commonmark-0.7.3[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/docutils[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/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(-)] >=dev-python/sphinx-1.3.1[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=https://github.com/rtfd/recommonmark/archive/33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz -> recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d174a6d28c31a27a6a411af7c3db04ad
+_md5_=e16b7f36cc1001a4df5f7d292f686eb9
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012 b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012
new file mode 100644
index 000000000000..3d5ef0636083
--- /dev/null
+++ b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/commonmark-0.8[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/docutils[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/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(-)] >=dev-python/sphinx-1.3.1[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(-)] ) 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 docutils-compatibility bridge to CommonMark
+EAPI=6
+HOMEPAGE=https://recommonmark.readthedocs.io/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/commonmark-0.8[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/docutils[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/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(-)] >=dev-python/sphinx-1.3.1[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=https://github.com/rtfd/recommonmark/archive/fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz -> recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b21538ebbb0917888631244636b368de
diff --git a/metadata/md5-cache/dev-python/scandir-1.6 b/metadata/md5-cache/dev-python/scandir-1.6
deleted file mode 100644
index 3f53cf8bee29..000000000000
--- a/metadata/md5-cache/dev-python/scandir-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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 ~arm64 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.6.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c5f15b86d85080bbf22e7f25910d8a30
diff --git a/metadata/md5-cache/dev-python/scandir-1.9.0 b/metadata/md5-cache/dev-python/scandir-1.9.0
index 8889f006afaa..1aaafdd1757b 100644
--- a/metadata/md5-cache/dev-python/scandir-1.9.0
+++ b/metadata/md5-cache/dev-python/scandir-1.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=A better directory iterator and faster os.walk()
 EAPI=6
 HOMEPAGE=https://github.com/benhoyt/scandir
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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.9.0.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6036cbe1bc9a54bb7b940ddebc09e249
+_md5_=07da1cb6a320aad16c334404dd7f52f7
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
new file mode 100644
index 000000000000..24bb936ded77
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A setuptools_scm plugin for git archives
+EAPI=7
+HOMEPAGE=https://github.com/Changaco/setuptools_scm_git_archive
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-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_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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/Changaco/setuptools_scm_git_archive/archive/1.0.tar.gz -> setuptools_scm_git_archive-1.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=12c917071c236dcd9ba6ea3276bea834
diff --git a/metadata/md5-cache/dev-python/sip-4.19.12 b/metadata/md5-cache/dev-python/sip-4.19.12
deleted file mode 100644
index c52dba16999a..000000000000
--- a/metadata/md5-cache/dev-python/sip-4.19.12
+++ /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 ) 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 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 ) 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	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=065a15bde73e10778fa414a880850d2b
diff --git a/metadata/md5-cache/dev-python/sip-4.19.13 b/metadata/md5-cache/dev-python/sip-4.19.13
index 066bef265ecb..ddfcf7027e17 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.13
+++ b/metadata/md5-cache/dev-python/sip-4.19.13
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0/12
 SRC_URI=mirror://sourceforge/pyqt/sip-4.19.13.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d6c1d3368ec2c20fd4d0f0e20c6bce14
+_md5_=0f35a6db9efbeff1defd2b72a06afe69
diff --git a/metadata/md5-cache/dev-python/sip-4.19.8 b/metadata/md5-cache/dev-python/sip-4.19.8
index 84ddafa3d0ef..3c42a6f77c9f 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.8
+++ b/metadata/md5-cache/dev-python/sip-4.19.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0/12
 SRC_URI=mirror://sourceforge/pyqt/sip-4.19.8.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=88c332585e173a4f09268d30ff93ac51
+_md5_=662b1e350d7502f17419590248da45b9
diff --git a/metadata/md5-cache/dev-python/sip-4.9999 b/metadata/md5-cache/dev-python/sip-4.9999
index 64b95dc39d96..3620fd5e9c34 100644
--- a/metadata/md5-cache/dev-python/sip-4.9999
+++ b/metadata/md5-cache/dev-python/sip-4.9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a4f11e71cafcada386ab81439625452e
+_md5_=2e76eb0d8ecdee7bac901b81e573976e
diff --git a/metadata/md5-cache/dev-python/sphinx-1.2.3-r1 b/metadata/md5-cache/dev-python/sphinx-1.2.3-r1
index 262ab0df8dfe..d7eadf9c9316 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/sphinx-1.2.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=af3440e6ee9efcb3fd0c0a143e157d81
+_md5_=2ba792ac55df557475dc5f48fcda88ce
diff --git a/metadata/md5-cache/dev-python/sphinx-1.3.1-r2 b/metadata/md5-cache/dev-python/sphinx-1.3.1-r2
deleted file mode 100644
index a5bcbf4d3af2..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.3.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND==dev-python/alabaster-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(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docutils-0.13[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/jinja-2.3[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/pygments-2.0.1-r1[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-1.4[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/Babel-1.3[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/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[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(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[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? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python documentation generator
-EAPI=5
-HOMEPAGE=http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/
-IUSE=doc latex test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND==dev-python/alabaster-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(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docutils-0.13[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/jinja-2.3[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/pygments-2.0.1-r1[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-1.4[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/Babel-1.3[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/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[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(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=250317de00a2dafde0672b7fe50fb15c
diff --git a/metadata/md5-cache/dev-python/sphinx-1.3.5-r1 b/metadata/md5-cache/dev-python/sphinx-1.3.5-r1
deleted file mode 100644
index b136a00592fd..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.3.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND==dev-python/alabaster-0.7*[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docutils-0.13[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-1.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/Babel-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) 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(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_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(+)] ) >=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=Python documentation generator
-EAPI=5
-HOMEPAGE=http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/
-IUSE=doc latex test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND==dev-python/alabaster-0.7*[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docutils-0.13[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-1.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/Babel-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=03f93e67872b06859c7c0a0b38683df9
diff --git a/metadata/md5-cache/dev-python/sphinx-1.6.3-r4 b/metadata/md5-cache/dev-python/sphinx-1.6.3-r4
deleted file mode 100644
index 7695ebd1bdbb..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.6.3-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[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(-)] virtual/python-typing[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(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/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(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python documentation generator
-EAPI=6
-HOMEPAGE=http://www.sphinx-doc.org/
-IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=BSD
-RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[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(-)] virtual/python-typing[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(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.6.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e955d435c7481fc7b256e07a3733e8fb
diff --git a/metadata/md5-cache/dev-python/sphinx-1.6.5-r1 b/metadata/md5-cache/dev-python/sphinx-1.6.5-r1
deleted file mode 100644
index 9b7a98911290..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.6.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[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(-)] virtual/python-typing[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(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/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(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python documentation generator
-EAPI=6
-HOMEPAGE=http://www.sphinx-doc.org/
-IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[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(-)] virtual/python-typing[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(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.6.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f416d6bc4d1f6aa95278fd67cd72c74f
diff --git a/metadata/md5-cache/dev-python/sphinx-1.6.7-r1 b/metadata/md5-cache/dev-python/sphinx-1.6.7-r1
deleted file mode 100644
index 133b83aed250..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.6.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[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(-)] virtual/python-typing[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(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/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(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python documentation generator
-EAPI=6
-HOMEPAGE=http://www.sphinx-doc.org/
-IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[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(-)] virtual/python-typing[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(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.6.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ba4d95cf1f4b72d7d014873a9b22d5bb
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
index 9a5f64bc4c57..b158ceb3ce10 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx theme integrates the Bootstrap CSS / JavaScript framework
 EAPI=7
 HOMEPAGE=https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html
 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~amd64-fbsd ~x86-linux
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=caaf2c6ff5b6cf5b2b644a913cd1aedd
+_md5_=16dbceaf83ef5f5a8295656df7df5384
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0 b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
index 89a16fa2e320..45a98c2d7061 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx websupport extension
 EAPI=6
 HOMEPAGE=http://www.sphinx-doc.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=alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=BSD-2
 PDEPEND=>=dev-python/sphinx-1.5.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(-)]
 RDEPEND=>=dev-python/sqlalchemy-0.9[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/whoosh-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/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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/namespace-sphinxcontrib[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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5faff0d9e6f6b033e8819a9893230b50
+_md5_=6da40b387b0b4f5c5f43d9d066f5f94d
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0-r1 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0-r1
new file mode 100644
index 000000000000..42babd891fbc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0-r1
@@ -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/pbr-1.8.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(-)] 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(-)] )
+DESCRIPTION=SQLAlchemy Schema Migration Tools
+EAPI=7
+HOMEPAGE=https://pypi.org/project/sqlalchemy-migrate/
+IUSE=doc 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
+LICENSE=MIT
+RDEPEND=>=dev-python/sqlalchemy-0.7.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-0.9.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.7.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/python-sqlparse[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/tempita-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=fa030b165aa8ecce2eacea7cb601f46a
diff --git a/metadata/md5-cache/dev-python/statsd-3.3.0 b/metadata/md5-cache/dev-python/statsd-3.3.0
new file mode 100644
index 000000000000..cf147983bed0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/statsd-3.3.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(-)] test? ( dev-python/nose[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 statsd client
+EAPI=6
+HOMEPAGE=https://github.com/jsocol/pystatsd https://pypi.org/project/statsd
+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 ~arm64 ~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 )
+SLOT=0
+SRC_URI=mirror://pypi/s/statsd/statsd-3.3.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0a9539111d6b61fed15b35718df10c9d
diff --git a/metadata/md5-cache/dev-python/svg-path-3.0 b/metadata/md5-cache/dev-python/svg-path-3.0
new file mode 100644
index 000000000000..a9e77e2d671d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/svg-path-3.0
@@ -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(-)]
+DESCRIPTION=SVG path objects and parser
+EAPI=7
+HOMEPAGE=https://github.com/regebro/svg.path
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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(-)] 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=https://github.com/regebro/svg.path/archive/3.0.tar.gz -> svg.path-3.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=62488bbb4d62d3d88f59c16fab460d6a
diff --git a/metadata/md5-cache/dev-python/tappy-2.4 b/metadata/md5-cache/dev-python/tappy-2.4
index 9314a6d639b6..d287f35cfb3c 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 ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 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	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b1ad9b0c6c2b45fc1ebf2337f3fa85fb
+_md5_=93f00a02f6357e3812dbda2ea1c04c76
diff --git a/metadata/md5-cache/dev-python/testrepository-0.0.20 b/metadata/md5-cache/dev-python/testrepository-0.0.20
index 5822e0677058..33f4f2d48623 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.20
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.20
@@ -4,11 +4,11 @@ DESCRIPTION=A repository of test results
 EAPI=5
 HOMEPAGE=https://launchpad.net/testscenarios
 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=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/subunit-0.0.18[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/testtools-0.9.30[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/fixtures[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/t/testrepository/testrepository-0.0.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=44ebcd491b2a1fb6c96818e7652afb2d
+_md5_=b60b217a55848552274eae3a24b4fe0b
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.2 b/metadata/md5-cache/dev-python/traitlets-4.3.2
index 0976173c27f5..dc2fe98515dd 100644
--- a/metadata/md5-cache/dev-python/traitlets-4.3.2
+++ b/metadata/md5-cache/dev-python/traitlets-4.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] ) test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=doc? ( dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] ) test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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=A configuration system for Python applications
 EAPI=6
 HOMEPAGE=https://github.com/ipython/traitlets
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-4.3.2.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e0ccb1d8d96ced533ca5a1f4292e2dbd
+_md5_=85aa6712e949ad3aca36b9a4a7526552
diff --git a/metadata/md5-cache/dev-python/txaio-2.7.1 b/metadata/md5-cache/dev-python/txaio-2.7.1
index 02c06d03b714..3b89a382718b 100644
--- a/metadata/md5-cache/dev-python/txaio-2.7.1
+++ b/metadata/md5-cache/dev-python/txaio-2.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinxcontrib-spelling-2.1.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/sphinx_rtd_theme-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/alabaster[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-cov-1.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/mock-1.3.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/tox-2.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.6.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinxcontrib-spelling-2.1.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/sphinx_rtd_theme-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/alabaster[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/mock-1.3.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/pyenchant-1.6.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Compatibility API between asyncio/Twisted/Trollius
 EAPI=6
 HOMEPAGE=https://github.com/crossbario/txaio https://pypi.org/project/txaio/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/txaio/txaio-2.7.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c5edd5c4d75eddd6ba7ab18a2086a153
+_md5_=34198a372f4b0d72379f63c0049d2708
diff --git a/metadata/md5-cache/dev-python/txaio-2.8.2 b/metadata/md5-cache/dev-python/txaio-2.8.2
deleted file mode 100644
index a45531974e6d..000000000000
--- a/metadata/md5-cache/dev-python/txaio-2.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinxcontrib-spelling-2.1.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/sphinx_rtd_theme-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/alabaster[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-cov-1.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.3.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/tox-2.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.6.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Compatibility API between asyncio/Twisted/Trollius
-EAPI=6
-HOMEPAGE=https://github.com/crossbario/txaio https://pypi.org/project/txaio/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.3[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 )
-SLOT=0
-SRC_URI=mirror://pypi/t/txaio/txaio-2.8.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7dacb68dd71f8fd1c76b1c96d8047459
diff --git a/metadata/md5-cache/dev-python/txaio-2.9.0 b/metadata/md5-cache/dev-python/txaio-2.9.0
index 0bbcdf3437fb..d5d526c77781 100644
--- a/metadata/md5-cache/dev-python/txaio-2.9.0
+++ b/metadata/md5-cache/dev-python/txaio-2.9.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/txaio/txaio-2.9.0.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8654f57cb28fec8f58905273cc9f4f23
+_md5_=6fdc763206ddf458afd50915b3eab084
diff --git a/metadata/md5-cache/dev-python/ufoLib-3.0.0 b/metadata/md5-cache/dev-python/ufoLib-3.0.0
new file mode 100644
index 000000000000..7b44fd2058bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ufoLib-3.0.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/fs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=A low-level UFO reader and writer
+EAPI=7
+HOMEPAGE=https://github.com/unified-font-object/ufoLib
+IUSE=test python_targets_python2_7 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/fonttools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/fs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/unified-font-object/ufoLib/archive/v3.0.0.tar.gz -> ufoLib-3.0.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ae385b916c5aaf459f1615b7916d7f1b
diff --git a/metadata/md5-cache/dev-python/watchdog-0.9.0 b/metadata/md5-cache/dev-python/watchdog-0.9.0
new file mode 100644
index 000000000000..8ae234892b49
--- /dev/null
+++ b/metadata/md5-cache/dev-python/watchdog-0.9.0
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=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(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-timeout-0.3[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 API and shell utilities to monitor file system events
+EAPI=7
+HOMEPAGE=https://github.com/gorakhargosh/watchdog
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=Apache-2.0
+RDEPEND=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/argh[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/pathtools[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=https://github.com/gorakhargosh/watchdog/archive/v0.9.0.tar.gz -> watchdog-0.9.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=39f7044df7af69ca9da3e058e278c074
diff --git a/metadata/md5-cache/dev-python/whoosh-2.7.4 b/metadata/md5-cache/dev-python/whoosh-2.7.4
index afe61774702e..0c898787d5e0 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.7.4
+++ b/metadata/md5-cache/dev-python/whoosh-2.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=Fast, pure-Python full text indexing, search and spell checking libr
 EAPI=6
 HOMEPAGE=https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.org/project/Whoosh/
 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=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-solaris
 LICENSE=BSD-2
 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/W/Whoosh/Whoosh-2.7.4.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=77655ce57c412688e461c72a9267753f
+_md5_=201cab9febe74e8a34a806670b8f3a87
diff --git a/metadata/md5-cache/dev-python/zstandard-0.8.1 b/metadata/md5-cache/dev-python/zstandard-0.8.1
index c927cd00b19d..6264fadd32bc 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.8.1
+++ b/metadata/md5-cache/dev-python/zstandard-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Zstandard Bindings for Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/z/zstandard/zstandard-0.8.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1aebb5a353df40b3fdb1595c5edf8237
+_md5_=34f85d1e2b840af7229dc49e9480edd9
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index cde253e86e00..d0b009dc5d18 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-5.11.1 b/metadata/md5-cache/dev-qt/assistant-5.11.1
index 481a0aace9a7..d0379da774f0 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.11.1
+++ b/metadata/md5-cache/dev-qt/assistant-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=webkit debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qthelp-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtsql-5.11.1[sqlite] ~dev-qt/qtwidgets-5.11.1 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1da2201a8f1ca531701b16ed1f32c99b
+_md5_=1846df02664fb324fc8c1e75408cfa47
diff --git a/metadata/md5-cache/dev-qt/assistant-5.11.2 b/metadata/md5-cache/dev-qt/assistant-5.11.2
new file mode 100644
index 000000000000..98cdb3180ba9
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/assistant-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qthelp-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtprintsupport-5.11.2 ~dev-qt/qtsql-5.11.2[sqlite] ~dev-qt/qtwidgets-5.11.2 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=webkit debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qthelp-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtprintsupport-5.11.2 ~dev-qt/qtsql-5.11.2[sqlite] ~dev-qt/qtwidgets-5.11.2 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6e6e46d3e2ef5adb3c3f24f1c26581c4
diff --git a/metadata/md5-cache/dev-qt/designer-5.11.1 b/metadata/md5-cache/dev-qt/designer-5.11.1
index b042bba8a0ef..f9f7338eabc6 100644
--- a/metadata/md5-cache/dev-qt/designer-5.11.1
+++ b/metadata/md5-cache/dev-qt/designer-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=declarative webkit debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwidgets-5.11.1 ~dev-qt/qtxml-5.11.1 declarative? ( ~dev-qt/qtdeclarative-5.11.1[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6e457aa12152d0587b8e92634117361b
+_md5_=02834c1249ebdba6b9ca93def5600078
diff --git a/metadata/md5-cache/dev-qt/designer-5.11.2 b/metadata/md5-cache/dev-qt/designer-5.11.2
new file mode 100644
index 000000000000..81c9637a43c2
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/designer-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtprintsupport-5.11.2 ~dev-qt/qtwidgets-5.11.2 ~dev-qt/qtxml-5.11.2 declarative? ( ~dev-qt/qtdeclarative-5.11.2[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=declarative webkit debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtprintsupport-5.11.2 ~dev-qt/qtwidgets-5.11.2 ~dev-qt/qtxml-5.11.2 declarative? ( ~dev-qt/qtdeclarative-5.11.2[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c10fcb59880c452a85529bdeaf8f6343
diff --git a/metadata/md5-cache/dev-qt/linguist-5.11.1 b/metadata/md5-cache/dev-qt/linguist-5.11.1
index 6a7acfd70ff2..bf31fbec5bef 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.11.1
+++ b/metadata/md5-cache/dev-qt/linguist-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-5.11.1 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwidgets-5.11.1 ~dev-qt/qtxml-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1eab028f7652bdd056fd000f222db821
+_md5_=28dba36434826aa79e083b54cd6ad2e9
diff --git a/metadata/md5-cache/dev-qt/linguist-5.11.2 b/metadata/md5-cache/dev-qt/linguist-5.11.2
new file mode 100644
index 000000000000..0839f41e8342
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/linguist-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/designer-5.11.2 ~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtprintsupport-5.11.2 ~dev-qt/qtwidgets-5.11.2 ~dev-qt/qtxml-5.11.2 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Graphical tool for translating Qt applications
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/designer-5.11.2 ~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtprintsupport-5.11.2 ~dev-qt/qtwidgets-5.11.2 ~dev-qt/qtxml-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=709a02013460a0ea45f5810c361da473
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.11.1 b/metadata/md5-cache/dev-qt/linguist-tools-5.11.1
index 91127a02eefe..19e40cd98425 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.11.1
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Tools for working with Qt translation data files
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtxml-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=b2c6081cee5a28bad10428d856bfe6ad
+_md5_=dfd998a02b647c349ba46dda0988fa56
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.11.2 b/metadata/md5-cache/dev-qt/linguist-tools-5.11.2
new file mode 100644
index 000000000000..4471b7ecaf2a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtxml-5.11.2 qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Tools for working with Qt translation data files
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtxml-5.11.2 qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=166c237c42829d14ac164fac1c8a98a3
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.11.1 b/metadata/md5-cache/dev-qt/pixeltool-5.11.1
index c3b2401fd33b..5b53ae009d15 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.11.1
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Qt screen magnifier
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=766e2fe7eae194ecd05799ac188926b5
+_md5_=b3854f46b92a6cfe19984d340d1ee4de
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.11.2 b/metadata/md5-cache/dev-qt/pixeltool-5.11.2
new file mode 100644
index 000000000000..bebe77a13b48
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwidgets-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Qt screen magnifier
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwidgets-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=fcf5825ba210bd96f9b6510548b2fba3
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.11.1 b/metadata/md5-cache/dev-qt/qdbus-5.11.1
index db6289920d4f..fca88f114ba1 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.11.1
+++ b/metadata/md5-cache/dev-qt/qdbus-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 ~dev-qt/qtxml-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=fff116fc2d0ef8a22411f62d39682bfd
+_md5_=65346bf891cb01924d50c931cf458d0a
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.11.2 b/metadata/md5-cache/dev-qt/qdbus-5.11.2
new file mode 100644
index 000000000000..93d148494c36
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdbus-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdbus-5.11.2 ~dev-qt/qtxml-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Interface to Qt applications communicating over D-Bus
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdbus-5.11.2 ~dev-qt/qtxml-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=cea7bd8dfa7b792119abecf939f0f1da
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.1
index 83f478cadd6e..9573760fa843 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.1
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 ~dev-qt/qtxml-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b20a08ee7225556b2921a7f2def0f209
+_md5_=61d9caadf07d434b6b53cf957410c7f1
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.2 b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.2
new file mode 100644
index 000000000000..79100f2e43c1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdbus-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwidgets-5.11.2 ~dev-qt/qtxml-5.11.2 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdbus-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwidgets-5.11.2 ~dev-qt/qtxml-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1fd93588be5354499eeec35d1d3e2d06
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.11.1 b/metadata/md5-cache/dev-qt/qdoc-5.11.1
index b603c6441d8d..3412580d12a9 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.11.1
+++ b/metadata/md5-cache/dev-qt/qdoc-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Qt documentation generator
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=db4b33b5f5ac0c0dd6253ca9ff138949
+_md5_=97679b9cb8341aa747b7854947ac5117
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.11.2 b/metadata/md5-cache/dev-qt/qdoc-5.11.2
new file mode 100644
index 000000000000..918e2b4aa0a4
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdoc-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Qt documentation generator
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=ec23bb1ad6292207a3985a3a34b32ef6
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.11.1_p201806180847 b/metadata/md5-cache/dev-qt/qt-docs-5.11.1_p201806180847
index 83894af938f0..29fda7676434 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-5.11.1_p201806180847
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.11.1_p201806180847
@@ -4,10 +4,10 @@ DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
 EAPI=6
 HOMEPAGE=https://doc.qt.io/
 IUSE=3d bluetooth charts datavis declarative graphicaleffects +html location multimedia networkauth +qch script sensors virtualkeyboard webengine
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=FDL-1.3
 REQUIRED_USE=|| ( html qch )
 SLOT=5
 SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc/5.11.1-0-201806180847qt-everywhere-documentation.7z charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtcharts/5.11.1-0-201806180847qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtdatavis3d/5.11.1-0-201806180847qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtnetworkauth/5.11.1-0-201806180847qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtscript/5.11.1-0-201806180847qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtscript/5.11.1-0-201806180847qtscripttools-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtvirtualkeyboard/5.11.1-0-201806180847qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtwebengine/5.11.1-0-201806180847qtwebengine-documentation.7z )
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=44261e6876b5f9313772438f2053e128
+_md5_=d2d86473687f073170aa8d6c9ca9ac25
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.11.1 b/metadata/md5-cache/dev-qt/qt3d-5.11.1
index bd6af4b7c69f..26ae7ec7997b 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.11.1
+++ b/metadata/md5-cache/dev-qt/qt3d-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=The 3D module for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.11.1 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.11.1[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qt3d-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=b0f27108666b914c013a885990a9cdd1
+_md5_=1b1c70fd2c32b33489bef5d5f4eb9eff
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.11.2 b/metadata/md5-cache/dev-qt/qt3d-5.11.2
new file mode 100644
index 000000000000..16e538e19333
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt3d-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtconcurrent-5.11.2 ~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtnetwork-5.11.2 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.11.2[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=The 3D module for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtconcurrent-5.11.2 ~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtnetwork-5.11.2 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.11.2[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qt3d-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=c36b428f22c38a3d70b499d70d2e0618
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.11.1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.1
index 836143b34b25..1226574ddb7a 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.11.1 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtconnectivity-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=884eb2a940b9d9bdb48ff10e8cc7ef0c
+_md5_=72d6395dbb91b8c2766d281f2af4b4cb
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.11.2 b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.2
new file mode 100644
index 000000000000..23bd21cbfba3
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtconcurrent-5.11.2 ~dev-qt/qtcore-5.11.2 ~dev-qt/qtdbus-5.11.2 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.11.2 ) ~dev-qt/qtnetwork-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Bluetooth support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtconcurrent-5.11.2 ~dev-qt/qtcore-5.11.2 ~dev-qt/qtdbus-5.11.2 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtconnectivity-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=2ee69290b6221429c299011ecfff39f0
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.11.2 b/metadata/md5-cache/dev-qt/qtcharts-5.11.2
new file mode 100644
index 000000000000..34bc87661850
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwidgets-5.11.2 qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Chart component library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwidgets-5.11.2 qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtcharts-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=6d4eda0df150c5a961fbe95253f9e9b5
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.11.1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.1
index 73dcbc1ebe7a..4ecf4f74e398 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=6d74398a85332833a220bf292095bb0d
+_md5_=276b5999ebd1897e58e277e6db6e27a8
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.11.2 b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.2
new file mode 100644
index 000000000000..da696efe9ee3
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=a128516f5f87a478f2ad1483c19d77d4
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.11.1-r1 b/metadata/md5-cache/dev-qt/qtcore-5.11.1-r1
index 79a8ada726e4..4bef6cd71357 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.11.1-r1
+++ b/metadata/md5-cache/dev-qt/qtcore-5.11.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=icu systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=cd5176d944d01554622f555e32bc26d0
+_md5_=5ab2c0152b766ba043eb8278860131d1
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.11.2-r1 b/metadata/md5-cache/dev-qt/qtcore-5.11.2-r1
new file mode 100644
index 000000000000..b15119ce6fbf
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-5.11.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Cross-platform application development framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=icu systemd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=13c885deb0ac708624d7e898750577cd
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.2 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.2
new file mode 100644
index 000000000000..7a630cb2dc8f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=] qml? ( ~dev-qt/qtdeclarative-5.11.2[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=3D data visualization library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=] qml? ( ~dev-qt/qtdeclarative-5.11.2[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtdatavis3d-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=28a8bbfd6ca73a62bb1a9e4cc119284f
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.11.1 b/metadata/md5-cache/dev-qt/qtdbus-5.11.1
index 9a301d724c6c..4e640659e8e5 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=4f38d244b820763b7b16316e30ff6256
+_md5_=8bef9465064708776c26cdadcb3a8d05
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.11.2 b/metadata/md5-cache/dev-qt/qtdbus-5.11.2
new file mode 100644
index 000000000000..dea83f6c4857
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 >=sys-apps/dbus-1.4.20 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=1cd1fa41a9f8b37a084cc5c6bdf4fe9d
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.11.1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.1
index 88deeec44b64..9513b3c107c2 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 +jit localstorage +widgets xml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qttest-5.11.1 localstorage? ( ~dev-qt/qtsql-5.11.1 ) widgets? ( ~dev-qt/qtwidgets-5.11.1[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtxmlpatterns-5.11.1 ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtdeclarative-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=f7e14083a7092837d217d585263d2e0c
+_md5_=3dd18a8133ae02d75e1daa451be23703
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.11.2 b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.2
new file mode 100644
index 000000000000..6dcf8eb516a1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=] ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qttest-5.11.2 localstorage? ( ~dev-qt/qtsql-5.11.2 ) widgets? ( ~dev-qt/qtwidgets-5.11.2[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtxmlpatterns-5.11.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 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=The QML and Quick modules for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 +jit localstorage +widgets xml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=] ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qttest-5.11.2 localstorage? ( ~dev-qt/qtsql-5.11.2 ) widgets? ( ~dev-qt/qtwidgets-5.11.2[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtxmlpatterns-5.11.2 ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtdeclarative-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=c8276e5280cec9afb3185869c445d7d4
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.11.2 b/metadata/md5-cache/dev-qt/qtdiag-5.11.2
new file mode 100644
index 000000000000..000fecd261dd
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 network? ( ~dev-qt/qtnetwork-5.11.2[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+network +widgets debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 network? ( ~dev-qt/qtnetwork-5.11.2[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=287f344c2171bd4144a1f0889440c749
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.1
index 97dff3c8a84c..14170b9a4579 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Set of QML types for adding visual effects to user interfaces
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtgraphicaleffects-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=379988901174bbbe1ecd1dae36bb81f9
+_md5_=c2f88195000f8dbb83b3833231e4133a
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.2 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.2
new file mode 100644
index 000000000000..ff0c47aa79a7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Set of QML types for adding visual effects to user interfaces
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtgraphicaleffects-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=12b3d728252eeaa8945c4b1663360854
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.11.1 b/metadata/md5-cache/dev-qt/qtgui-5.11.1
index dd41bbfe019e..3aa66f536e96 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.11.1
@@ -4,7 +4,7 @@ DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus )
 RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.11.1 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.11.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.11.1 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.11.1 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=598b529c2cd16c737935fd7d712bb719
+_md5_=395782c4057dbc5d31d10a11eb5f4860
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.11.2 b/metadata/md5-cache/dev-qt/qtgui-5.11.2
new file mode 100644
index 000000000000..6f7c1f776fb4
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.11.2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.11.2 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.11.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.11.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.11.2 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus )
+RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.11.2 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.11.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.11.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.11.2 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
+REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=487c91f7e00119808b2fc56882b00733
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.11.1 b/metadata/md5-cache/dev-qt/qthelp-5.11.1
index 5c7feed52eca..caa3a018496c 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.11.1
+++ b/metadata/md5-cache/dev-qt/qthelp-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating online documentation into applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtsql-5.11.1[sqlite] ~dev-qt/qtwidgets-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=073b7a09e2c31546ad9372bb60c4f8a9
+_md5_=e0d221c55f3f51837164114490f4e589
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.11.2 b/metadata/md5-cache/dev-qt/qthelp-5.11.2
new file mode 100644
index 000000000000..f39f0d77fd25
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qthelp-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtsql-5.11.2[sqlite] ~dev-qt/qtwidgets-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Qt5 module for integrating online documentation into applications
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtsql-5.11.2[sqlite] ~dev-qt/qtwidgets-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=0718425463c65cdd9377a65916934d45
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.11.1 b/metadata/md5-cache/dev-qt/qtimageformats-5.11.1
index a5d35fa3f47a..091ac4da7733 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=jpeg2k mng debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtimageformats-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=6cb2079ae313b80c9f69c43314b43bc8
+_md5_=e581338b6616fd40cf6ae24394dee44e
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.11.2 b/metadata/md5-cache/dev-qt/qtimageformats-5.11.2
new file mode 100644
index 000000000000..ca445e73a288
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Additional format plugins for the Qt image I/O system
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=jpeg2k mng debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtimageformats-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=72374f8cb886bcb8bd61a63633c3f931
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.11.1 b/metadata/md5-cache/dev-qt/qtlocation-5.11.1
index a23d08369d14..6e45f4894290 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=The Location module for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtpositioning-5.11.1 ~dev-qt/qtsql-5.11.1 sys-libs/zlib dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c7083a2d84f0b31591195e3020bada06
+_md5_=30fe2014bb11a7fcd466bcd430aaa1b3
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.11.2 b/metadata/md5-cache/dev-qt/qtlocation-5.11.2
new file mode 100644
index 000000000000..8ae7f1aa5317
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtpositioning-5.11.2 ~dev-qt/qtsql-5.11.2 sys-libs/zlib ~dev-qt/qtconcurrent-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=The Location module for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtpositioning-5.11.2 ~dev-qt/qtsql-5.11.2 sys-libs/zlib dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtlocation-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=ba9b8fc65ed14bf407d382247e970c28
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.11.1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.1
index 33ad48c551b9..da48c271b693 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framewo
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtnetwork-5.11.1 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.11.1 gles2? ( ~dev-qt/qtgui-5.11.1[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.11.1 ~dev-qt/qtwidgets-5.11.1[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtmultimedia-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=111db119313cc09d011437430a162f6d
+_md5_=bc3c4543c6aa8662d27796076a1de17d
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.11.2 b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.2
new file mode 100644
index 000000000000..2a822951f7c2
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=] ~dev-qt/qtnetwork-5.11.2 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.11.2 gles2? ( ~dev-qt/qtgui-5.11.2[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.11.2 ~dev-qt/qtwidgets-5.11.2[gles2=] ) gstreamer? ( x11-base/xorg-proto ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=] ~dev-qt/qtnetwork-5.11.2 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.11.2 gles2? ( ~dev-qt/qtgui-5.11.2[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.11.2 ~dev-qt/qtwidgets-5.11.2[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtmultimedia-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=5e811b37d50b42ee94d15df49a8b3f86
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.11.1 b/metadata/md5-cache/dev-qt/qtnetwork-5.11.1
index 19af773c33e1..b6d6b35ddf8d 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=bindist connman libproxy networkmanager +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.11.1 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.11.1 ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=72322e9b5a2d903360405b216b50ee01
+_md5_=36b0f537faf07e5c024aaccd7537ebbe
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.11.2 b/metadata/md5-cache/dev-qt/qtnetwork-5.11.2
new file mode 100644
index 000000000000..556fba3e948f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.11.2 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.11.2 ) ssl? ( dev-libs/openssl:0=[bindist=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Network abstraction library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=bindist connman libproxy networkmanager +ssl debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.11.2 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.11.2 ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=b3659f10bb081f2eaafdd78da13425d8
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.2 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.2
new file mode 100644
index 000000000000..76932e2e000c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtnetwork-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Network authorization library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtnetwork-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtnetworkauth-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=0cc74f0855e79d9a2ca960e58d565fab
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.11.1 b/metadata/md5-cache/dev-qt/qtopengl-5.11.1
index 5e06e1b7aa69..d8d772170197 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtwidgets-5.11.1[gles2=] virtual/opengl dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=24df9280a51681e6eda46b07a3a018ad
+_md5_=4ee28bfa07dfb42d3a355bff10051f1b
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.11.2 b/metadata/md5-cache/dev-qt/qtopengl-5.11.2
new file mode 100644
index 000000000000..536a154a96e5
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=] ~dev-qt/qtwidgets-5.11.2[gles2=] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=] ~dev-qt/qtwidgets-5.11.2[gles2=] virtual/opengl dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=b044c8190d71765447af9d9fb393acce
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.11.1 b/metadata/md5-cache/dev-qt/qtpaths-5.11.1
index 13b84b086861..20b5539a2fdc 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Command line client to QStandardPaths
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c34f3e92c5dba96e8a1de35321aaf59d
+_md5_=c848df1e9d43b7f05749f01914a14830
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.11.2 b/metadata/md5-cache/dev-qt/qtpaths-5.11.2
new file mode 100644
index 000000000000..b247e3665210
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Command line client to QStandardPaths
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=7d5883d4a1d1d9c044695501c28235d2
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.11.2 b/metadata/md5-cache/dev-qt/qtplugininfo-5.11.2
new file mode 100644
index 000000000000..9c06521376a0
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Qt5 plugin metadata dumper
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=d1eb1ef7824fc56787216926732c38ea
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.11.1 b/metadata/md5-cache/dev-qt/qtpositioning-5.11.1
index 3449c679e3ee..0be7b3e7c7c1 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.11.1
@@ -4,7 +4,7 @@ DESCRIPTION=Physical position determination library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=geoclue qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:0 )
 RDEPEND=~dev-qt/qtcore-5.11.1 geoclue? ( ~dev-qt/qtdbus-5.11.1 ) qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=ff7dec693fe4321f72cca7b352d8bc43
+_md5_=e3e3224f09bdefe702f7d272e2ba7087
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.11.2 b/metadata/md5-cache/dev-qt/qtpositioning-5.11.2
new file mode 100644
index 000000000000..b863e781a80c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.11.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 geoclue? ( ~dev-qt/qtdbus-5.11.2 ) qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Physical position determination library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=geoclue qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=geoclue? ( app-misc/geoclue:0 )
+RDEPEND=~dev-qt/qtcore-5.11.2 geoclue? ( ~dev-qt/qtdbus-5.11.2 ) qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtlocation-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=910697890ef160dc4fc332b1f78feddb
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.11.1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.1
index 683ecd4e0fbb..9c07cf41c4c0 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Printing support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=cups gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtwidgets-5.11.1[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d74ef661ea428e1e55d695b054c34439
+_md5_=edf8d419ea5416a90c87731e99720e56
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.11.2 b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.2
new file mode 100644
index 000000000000..53504798ab07
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=] ~dev-qt/qtwidgets-5.11.2[gles2=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.11.2 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Printing support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=cups gles2 test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=] ~dev-qt/qtwidgets-5.11.2[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=dc2ee3b58f7214f2006b80082fa7053b
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.1
index c24e81401354..e0f916929e1d 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 widgets? ( ~dev-qt/qtwidgets-5.11.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=06cac9e9f94c9abfa93ddd7c99a5870d
+_md5_=edc88c5b0d0eb7df766ce92f6c325649
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.2 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.2
new file mode 100644
index 000000000000..242d56d2e0f1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 widgets? ( ~dev-qt/qtwidgets-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 widgets? ( ~dev-qt/qtwidgets-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtquickcontrols-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=19448e68a4d66b40f3b3fa8b3867dc3d
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.1 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.1
index d6e7e5be0862..b1148a976a2f 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 widgets? ( ~dev-qt/qtwidgets-5.11.1 ) ~dev-qt/qtgraphicaleffects-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols2-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d78d95cfdc208b9988ce7cb49267f1b0
+_md5_=92497269d84e4378357c64c2529b6e5f
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.2 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.2
new file mode 100644
index 000000000000..35f274dffa10
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 widgets? ( ~dev-qt/qtwidgets-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 widgets? ( ~dev-qt/qtwidgets-5.11.2 ) ~dev-qt/qtgraphicaleffects-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtquickcontrols2-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=94816705778df36c1aef3ab3083d3f0d
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.11.1 b/metadata/md5-cache/dev-qt/qtscript-5.11.1
index ef5544e94c24..773ccc050d67 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtscript-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+jit scripttools debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 scripttools? ( ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtscript-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=55f76df32c33b07b323d585d41502919
+_md5_=9050581de157d147d7e3b8034e4ca0fd
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.11.2 b/metadata/md5-cache/dev-qt/qtscript-5.11.2
new file mode 100644
index 000000000000..7d49e274d2ad
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtscript-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 scripttools? ( ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwidgets-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+jit scripttools debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 scripttools? ( ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwidgets-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtscript-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=3d0a295a62ddc5244cf00cc7d02aeb69
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.11.1 b/metadata/md5-cache/dev-qt/qtscxml-5.11.1
index 8fd90ff8f8c3..581f4f89866a 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtscxml-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=931899ecf2935db1b1545f4395bf26e6
+_md5_=47b9b2872bba41ca3b9f7c260d1baf3f
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.11.2 b/metadata/md5-cache/dev-qt/qtscxml-5.11.2
new file mode 100644
index 000000000000..9a2807c28825
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtscxml-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=5ea63038fdcb8d0be50a69809afb4efe
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.11.1 b/metadata/md5-cache/dev-qt/qtsensors-5.11.1
index d9a67c71b335..8adb4613910e 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtsensors-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=19cc27a106594683e75febf31b99bd56
+_md5_=781b36d9695062fe793c345d86575dd1
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.11.2 b/metadata/md5-cache/dev-qt/qtsensors-5.11.2
new file mode 100644
index 000000000000..f70918da2878
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdbus-5.11.2 qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Hardware sensor access library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdbus-5.11.2 qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtsensors-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=623ed2320541cf90eec2449516fac584
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.11.2 b/metadata/md5-cache/dev-qt/qtserialbus-5.11.2
new file mode 100644
index 000000000000..7f79a31298de
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtserialport-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Support for CAN and other serial buses
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtserialport-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtserialbus-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=06701ed2c813e1071598dc8a25fac437
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.11.1 b/metadata/md5-cache/dev-qt/qtserialport-5.11.1
index 55d894c5604c..5f00a2d7792d 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtserialport-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=27122db2888160760d4b606fa275208f
+_md5_=85627c9842f898a06144fb22348bb075
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.11.2 b/metadata/md5-cache/dev-qt/qtserialport-5.11.2
new file mode 100644
index 000000000000..1ece5c28ba2e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 virtual/libudev:= dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Serial port abstraction library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 virtual/libudev:= dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtserialport-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=9bbb3e0bb57494c16c77c1a60115e379
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.11.1 b/metadata/md5-cache/dev-qt/qtspeech-5.11.1
index b7f4813af0e3..7188de001dde 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Text-to-speech library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtspeech-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=41b54d0a49e3b7726e1fdabb1cc165b9
+_md5_=5c65704c7813706215e6f5ff0c4c7124
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.11.2 b/metadata/md5-cache/dev-qt/qtspeech-5.11.2
new file mode 100644
index 000000000000..a916b8632099
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Text-to-speech library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtspeech-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=99822ee6b774f57292e05027916d64c8
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.11.1-r1 b/metadata/md5-cache/dev-qt/qtsql-5.11.1-r1
index fe175ffb5cbc..13210eb8a43b 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.11.1-r1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.11.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=SQL abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.11.1
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=99de2b1ad2403047b3c1bedf6be60ffb
+_md5_=69f428a85d6b4e13ea30e0cd3aa50fdb
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.11.2 b/metadata/md5-cache/dev-qt/qtsql-5.11.2
new file mode 100644
index 000000000000..9b82da94c636
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsql-5.11.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=SQL abstraction library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
+REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
+RESTRICT=test
+SLOT=5/5.11.2
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=d4d41a663333e2a5a44b26ab0312bdc7
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.11.1 b/metadata/md5-cache/dev-qt/qtsvg-5.11.1
index 10fe2c40afad..4ae17112838b 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtsvg-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=3b7c93b77e513eb672a0f12cdf6ab6ee
+_md5_=6fc9eedee93e797372352a546ec800a1
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.11.2 b/metadata/md5-cache/dev-qt/qtsvg-5.11.2
new file mode 100644
index 000000000000..b5864ae0af4a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwidgets-5.11.2 >=sys-libs/zlib-1.2.5 test? ( ~dev-qt/qtxml-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=SVG rendering library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwidgets-5.11.2 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtsvg-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=e9e18def06e0ad44b2761b6aa6a10046
diff --git a/metadata/md5-cache/dev-qt/qttest-5.11.1 b/metadata/md5-cache/dev-qt/qttest-5.11.1
index eca76e6906a7..30a7e7067cd3 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.11.1
+++ b/metadata/md5-cache/dev-qt/qttest-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Unit testing library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=145e566cf200e3d21b89febd3860742d
+_md5_=1233cb0208044bfc6cbeb277ca6873e6
diff --git a/metadata/md5-cache/dev-qt/qttest-5.11.2 b/metadata/md5-cache/dev-qt/qttest-5.11.2
new file mode 100644
index 000000000000..28d3d20f7d92
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttest-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 test? ( ~dev-qt/qtgui-5.11.2 ~dev-qt/qtxml-5.11.2 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DESCRIPTION=Unit testing library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=36b5ab578c2f87cd885aa210ca01b18f
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.11.1 b/metadata/md5-cache/dev-qt/qttranslations-5.11.1
index 19b7f9ff7e56..a5393982c984 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.11.1
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Translation files for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttranslations-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=858222fbe161b7533a8b336a10464ee4
+_md5_=0229ffe5dd10dc99efc6b3c03ce304f0
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.11.2 b/metadata/md5-cache/dev-qt/qttranslations-5.11.2
new file mode 100644
index 000000000000..287ff9f98da6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/linguist-tools-5.11.2 ~dev-qt/qtcore-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Translation files for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttranslations-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=2b1c19d6f796963a776debbe958081c8
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.1 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.1
index ed541ef6b54f..c5d42382715c 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Virtual keyboard plugin for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=handwriting +spell +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtsvg-5.11.1 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=1b9964e67e1af6c4c9ba75ce140ca939
+_md5_=1c28c9e400966aee4b12a3439225f3e7
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.2 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.2
new file mode 100644
index 000000000000..87f55ec0c44e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtsvg-5.11.2 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Virtual keyboard plugin for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=handwriting +spell +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtsvg-5.11.2 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtvirtualkeyboard-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=18f460bc8514e01e752603b17851f80a
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.11.1 b/metadata/md5-cache/dev-qt/qtwayland-5.11.1
index 857c3eb326bc..fcf6fefa70fd 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Wayland platform plugin for Qt
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+libinput xcomposite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwayland-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=f8203b85ce0071070b9ba8613f5fe48c
+_md5_=a1910e98ddb5328b268bc7cef3794f24
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.11.2 b/metadata/md5-cache/dev-qt/qtwayland-5.11.2
new file mode 100644
index 000000000000..69d0b8526148
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+libinput xcomposite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtwayland-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=b5f8afa960ac1befc5a6b44905fecc42
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.1 b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.1
index 2a1675c2b22f..abaf1740105f 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaSc
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebchannel-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=6e7a90249ca184cf597c8976510d7c84
+_md5_=e0368cee1b5a6d5362078991b477929d
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.2 b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.2
new file mode 100644
index 000000000000..be7e4dc726b5
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtwebchannel-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=11f26c476eed35f2a16c32254f87c8f7
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.11.1 b/metadata/md5-cache/dev-qt/qtwebengine-5.11.1
index 180ad019513a..ad125d9d33cd 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.11.1
@@ -4,7 +4,7 @@ DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applica
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwebchannel-5.11.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 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 alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.1 ) geolocation? ( ~dev-qt/qtpositioning-5.11.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.1[widgets] ~dev-qt/qtwidgets-5.11.1 ) dev-qt/qtchooser
 REQUIRED_USE=designer? ( widgets )
@@ -12,4 +12,4 @@ 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=b9deefd5b4da07669e3c2773288a30bb
+_md5_=de1e975cb276082a797e3cd2794dd3ef
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.11.2 b/metadata/md5-cache/dev-qt/qtwebengine-5.11.2
new file mode 100644
index 000000000000..e2c51aabde9e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.11.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtprintsupport-5.11.2 ~dev-qt/qtwebchannel-5.11.2[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 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 alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.2 ) geolocation? ( ~dev-qt/qtpositioning-5.11.2 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.2[widgets] ~dev-qt/qtwidgets-5.11.2 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtnetwork-5.11.2 ~dev-qt/qtprintsupport-5.11.2 ~dev-qt/qtwebchannel-5.11.2[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 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 alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.2 ) geolocation? ( ~dev-qt/qtpositioning-5.11.2 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.2[widgets] ~dev-qt/qtwidgets-5.11.2 ) dev-qt/qtchooser
+REQUIRED_USE=designer? ( widgets )
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtwebengine-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=3a3b6b26e8cd4396cf45bd7611eb0e95
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120 b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
index 6d8bc2538451..edbd2b71f9b9 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
@@ -11,4 +11,4 @@ REQUIRED_USE=nsplugin? ( X ) qml? ( opengl ) ?? ( gstreamer multimedia )
 SLOT=5/5.212
 SRC_URI=mirror://gentoo/qtwebkit-5.212.0_pre20180120.tar.gz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1c749ed8fbb2482dd24412d043302e9f
+_md5_=371d5cbd41699f76c282ae59f7e47583
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.1 b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.1
index ca8a670b3c43..e41cb04f5bec 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtnetwork-5.11.1[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebsockets-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=f67277cf03526b83968e7d2fb842ef08
+_md5_=be4b39e8d16adb7cb234feec339d6642
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.2 b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.2
new file mode 100644
index 000000000000..d9d9ed694300
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtnetwork-5.11.2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml +ssl debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtnetwork-5.11.2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.2 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtwebsockets-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=dbdd0ccac4269a8f6ca5643d5d5973aa
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.11.2 b/metadata/md5-cache/dev-qt/qtwebview-5.11.2
new file mode 100644
index 000000000000..95bae363c2bc
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwebengine-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtdeclarative-5.11.2 ~dev-qt/qtgui-5.11.2 ~dev-qt/qtwebengine-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtwebview-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=ef6a6dde3bffb10cfcc18e36d4521f7f
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.11.1 b/metadata/md5-cache/dev-qt/qtwidgets-5.11.1
index 76fd1d817af2..f5afcc176de4 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 gtk +png +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.11.1[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=614665b3bb41c39464167c4815945ed7
+_md5_=a12456ac3b4f3ea0fbebad638f0491c6
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.11.2 b/metadata/md5-cache/dev-qt/qtwidgets-5.11.2
new file mode 100644
index 000000000000..278227dee3f1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.11.2[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 gtk +png +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.11.2[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=0140b3ad0f825df8f9c44b797c4bc42b
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.11.1 b/metadata/md5-cache/dev-qt/qtx11extras-5.11.1
index dc07a6514003..37c2231519a6 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtx11extras-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=428651da7f8ecedbd25957ce24509873
+_md5_=c9404c855afe145a02a561bf582dff6c
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.11.2 b/metadata/md5-cache/dev-qt/qtx11extras-5.11.2
new file mode 100644
index 000000000000..f78b3752d4f6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[xcb] test? ( ~dev-qt/qtwidgets-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtgui-5.11.2[xcb] dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtx11extras-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=927906309fe6a8fa6f89a0367b6ad834
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.11.1 b/metadata/md5-cache/dev-qt/qtxml-5.11.1
index 3aec7929e9db..03dacff7cae6 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtxml-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=6314bfb3e3a76ebcf2bba2fae967c252
+_md5_=5d19bc0103039ff35517272f9f1d1d21
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.11.2 b/metadata/md5-cache/dev-qt/qtxml-5.11.2
new file mode 100644
index 000000000000..030155f5f91c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtxml-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 test? ( ~dev-qt/qtnetwork-5.11.2 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=83104c218d2d09b33b8509e03fea8d8b
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.1
index 787a756377f9..da56e047f6c2 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 f
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtnetwork-5.11.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtxmlpatterns-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=e4741ce2d7bde18ed7fae27f8096de0b
+_md5_=dac95f77b8551234a8e3ba37b4881d2c
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.2 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.2
new file mode 100644
index 000000000000..37f293f2e02f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtnetwork-5.11.2 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.2 )
+DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.2 ~dev-qt/qtnetwork-5.11.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtxmlpatterns-everywhere-src-5.11.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=39c2b5cbe759d9004c9f052f013d130c
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 21e29b00e43c..95d1c6c9ee59 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/combined_robot_hw-0.15.1 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.1
new file mode 100644
index 000000000000..50833d023067
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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=Combined Robot HW class
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3c2295c71da4332cff29f48bf75bde2c
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.1 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.1
new file mode 100644
index 000000000000..5f9803869a61
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= 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=Combined Robot HW class tests
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c6571999b5491f15f59e7c515c7df3db
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.15.1 b/metadata/md5-cache/dev-ros/controller_interface-0.15.1
new file mode 100644
index 000000000000..0b9655e292ea
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib 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=Interface base class for controllers
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib python_targets_python2_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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=43d10508354380fb7dce4bcbe5aa318b
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.15.1 b/metadata/md5-cache/dev-ros/controller_manager-0.15.1
new file mode 100644
index 000000000000..4fc370daffca
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= 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=The controller manager
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=adea21c6d9523d14d9b64b1feda31781
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.1 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.1
new file mode 100644
index 000000000000..51fcf089a487
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rospy[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=The controller manager
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=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(-)] 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=81cc2bcdcf348a73792336db28c674ca
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.1 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.1
new file mode 100644
index 000000000000..19d1e0e2b6e2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= 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(-)] dev-ros/rosservice[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=Tests for the controller manager
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=abca84ac9db0820dffa733f55f32d629
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.15.1 b/metadata/md5-cache/dev-ros/hardware_interface-0.15.1
new file mode 100644
index 000000000000..a5dcbc558635
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.15.1
@@ -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=Hardware Interface base class
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=875b1167a68c0830f66150253c920874
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.1 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.1
new file mode 100644
index 000000000000..d6520e1eb317
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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=Interface for enforcing joint limits
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_targets_python2_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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0074f340462e4a11375b2dcfb8618aa1
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.1 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.1
new file mode 100644
index 000000000000..8c49adedf4e4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[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=RQT control manager plugin
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9a57115510b307ed0f410559b3dca257
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.15.1 b/metadata/md5-cache/dev-ros/transmission_interface-0.15.1
new file mode 100644
index 000000000000..d781ea04b1f3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= 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=Transmission Interface
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7821c1182b554840febbe48e3adad6a1
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index e6bf4231366a..6d544caaea75 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/autoprefixer-rails-9.1.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.0
deleted file mode 100644
index 9b98871e1609..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=541d241f7a680c8ad89cce1f3a8da3dc
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.1
deleted file mode 100644
index 1551cc15fe02..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=541d241f7a680c8ad89cce1f3a8da3dc
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.3 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.3
deleted file mode 100644
index a2d42d8f3f77..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-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.3.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=541d241f7a680c8ad89cce1f3a8da3dc
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.2.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.2.1
new file mode 100644
index 000000000000..4d990cf445da
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.2.1
@@ -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.2.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=56b358c190906a1751585ebe00c9866b
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.16.6 b/metadata/md5-cache/dev-ruby/bundler-1.16.6
new file mode 100644
index 000000000000..93c302cfc51b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bundler-1.16.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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] ) ) 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=An easy way to vendor gem dependencies
+EAPI=6
+HOMEPAGE=https://github.com/carlhuda/bundler
+IUSE=+doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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=MIT
+RDEPEND=ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) dev-vcs/git 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/bundler-1.16.6.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=6d94132585a69525799443b11b0bec4b
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.9.0 b/metadata/md5-cache/dev-ruby/capybara-3.9.0
new file mode 100644
index 000000000000..b7944967332a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-3.9.0
@@ -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.9.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=beb1181ff44f392a9fc18f6da069230a
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.8.0 b/metadata/md5-cache/dev-ruby/combustion-0.8.0
deleted file mode 100644
index 5317d3c154ac..000000000000
--- a/metadata/md5-cache/dev-ruby/combustion-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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? ( 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=Elegant Rails Engine Testing
-EAPI=6
-HOMEPAGE=https://github.com/pat/combustion
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 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 )
-SLOT=0
-SRC_URI=mirror://rubygems/combustion-0.8.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=90cb3e4ac6f133513cb5206a234111c0
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.9.0 b/metadata/md5-cache/dev-ruby/combustion-0.9.0
deleted file mode 100644
index ff22dfea43f8..000000000000
--- a/metadata/md5-cache/dev-ruby/combustion-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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? ( 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=Elegant Rails Engine Testing
-EAPI=6
-HOMEPAGE=https://github.com/pat/combustion
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 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 )
-SLOT=0
-SRC_URI=mirror://rubygems/combustion-0.9.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=90cb3e4ac6f133513cb5206a234111c0
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.0.0 b/metadata/md5-cache/dev-ruby/combustion-1.0.0
new file mode 100644
index 000000000000..7f241ef1ecc3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/combustion-1.0.0
@@ -0,0 +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_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 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_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-1.0.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=1a2d241f549cda35e846f2656f20027f
diff --git a/metadata/md5-cache/dev-ruby/curses-1.2.5 b/metadata/md5-cache/dev-ruby/curses-1.2.5
new file mode 100644
index 000000000000..0ab42c9f50a4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/curses-1.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/ncurses:0 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=Ruby binding for curses, ncurses, and PDCurses
+EAPI=6
+HOMEPAGE=https://github.com/ruby/curses
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Ruby BSD-2 )
+RDEPEND=sys-libs/ncurses:0 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=mirror://rubygems/curses-1.2.5.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=8e1a95405d3572a669e1f0ad2db45e59
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.7 b/metadata/md5-cache/dev-ruby/dalli-2.7.7
deleted file mode 100644
index 775330dca748..000000000000
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=net-misc/memcached-1.4.0 ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] <dev-ruby/activesupport-5.2[ruby_targets_ruby23] dev-ruby/connection_pool[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] <dev-ruby/activesupport-5.2[ruby_targets_ruby24] dev-ruby/connection_pool[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/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[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] ) )
-DESCRIPTION=A high performance pure Ruby client for accessing memcached servers
-EAPI=6
-HOMEPAGE=https://github.com/petergoldstein/dalli
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-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=0
-SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.7.tar.gz -> dalli-2.7.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ab67543594f2e051ce490c1e1e3c4794
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.8-r1 b/metadata/md5-cache/dev-ruby/dalli-2.7.8-r1
index ea1b089a1383..6cbc9ed765d5 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.8-r1
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A high performance pure Ruby client for accessing memcached servers
 EAPI=6
 HOMEPAGE=https://github.com/petergoldstein/dalli
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~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=https://github.com/petergoldstein/dalli/archive/v2.7.8.tar.gz -> dalli-2.7.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cbb8c76dea1555ab2477695502c3b3e0
+_md5_=ce9cb6ddfbb97981a780c78e5ade6636
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.1.3 b/metadata/md5-cache/dev-ruby/dbf-3.1.3
new file mode 100644
index 000000000000..c5c28b27a125
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dbf-3.1.3
@@ -0,0 +1,14 @@
+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_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 small fast library for reading dBase, xBase, Clipper and FoxPro database files
+EAPI=6
+HOMEPAGE=https://github.com/infused/dbf
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~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/dbf-3.1.3.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=8a9f962802e292745bab26cee0f6fb16
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.2.4 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
index bbac0f0aca99..58bd1bb12597 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.2.4
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library for the Ed25519 public-key signature system
 EAPI=6
 HOMEPAGE=https://github.com/crypto-rb/ed25519
 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=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/crypto-rb/ed25519/archive/v1.2.4.tar.gz -> ed25519-1.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=385530115cafd7d9666f4eac4c1647db
+_md5_=5a1415f20f9d680a9b81235d20401c41
diff --git a/metadata/md5-cache/dev-ruby/facter-3.11.3-r1 b/metadata/md5-cache/dev-ruby/facter-3.11.3-r1
deleted file mode 100644
index 98075a1cbd7b..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.11.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=6
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.11.3.tar.gz -> facter-3.11.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dd69656ded9b33a096b71fb2ad32e65d
diff --git a/metadata/md5-cache/dev-ruby/facter-3.11.4 b/metadata/md5-cache/dev-ruby/facter-3.11.4
deleted file mode 100644
index c1b8a604232b..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.11.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=6
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-KEYWORDS=amd64 ~arm hppa ppc ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.11.4.tar.gz -> facter-3.11.4.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4b5a862ef9de18c5f7d9251fceea70fb
diff --git a/metadata/md5-cache/dev-ruby/facter-3.12.0 b/metadata/md5-cache/dev-ruby/facter-3.12.0
index 959a9199c35f..6961ff81c2df 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.12.0
+++ b/metadata/md5-cache/dev-ruby/facter-3.12.0
@@ -4,11 +4,11 @@ DESCRIPTION=A cross-platform ruby library for retrieving facts from operating sy
 EAPI=6
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.12.0.tar.gz -> facter-3.12.0.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=db52d6b57bb22edaa027290fa6a054f2
+_md5_=08d41edc9972f335aa9e03d29dc78606
diff --git a/metadata/md5-cache/dev-ruby/gherkin-5.0.0 b/metadata/md5-cache/dev-ruby/gherkin-5.0.0
deleted file mode 100644
index f5a45859a027..000000000000
--- a/metadata/md5-cache/dev-ruby/gherkin-5.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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_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=Fast Gherkin lexer and parser
-EAPI=6
-HOMEPAGE=https://github.com/cucumber/gherkin
-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
-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=5
-SRC_URI=mirror://rubygems/gherkin-5.0.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=537f25fde8af634341b651a4d59282d4
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.6.1 b/metadata/md5-cache/dev-ruby/google-protobuf-3.6.1
new file mode 100644
index 000000000000..f72b629fa25c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-libs/protobuf ) 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=Protocol Buffers are Google's data interchange format
+EAPI=6
+HOMEPAGE=https://developers.google.com/protocol-buffers
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64
+LICENSE=BSD
+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/protocolbuffers/protobuf/archive/v3.6.1.tar.gz -> google-protobuf-3.6.1-ruby.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=6fcadbc81c04be0553dd2ae28f343455
diff --git a/metadata/md5-cache/dev-ruby/http-3.0.0 b/metadata/md5-cache/dev-ruby/http-3.0.0
deleted file mode 100644
index 66abfb51c4d7..000000000000
--- a/metadata/md5-cache/dev-ruby/http-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby24] dev-ruby/rspec-its[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=An easy-to-use client library for making requests from Ruby
-EAPI=6
-HOMEPAGE=https://github.com/tarcieri/http
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.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 )
-SLOT=3
-SRC_URI=mirror://rubygems/http-3.0.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=531145236798f245267e2614fed3e575
diff --git a/metadata/md5-cache/dev-ruby/http-3.2.0 b/metadata/md5-cache/dev-ruby/http-3.2.0
deleted file mode 100644
index ba2de7473703..000000000000
--- a/metadata/md5-cache/dev-ruby/http-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby24] dev-ruby/rspec-its[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=An easy-to-use client library for making requests from Ruby
-EAPI=6
-HOMEPAGE=https://github.com/tarcieri/http
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.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 )
-SLOT=3
-SRC_URI=mirror://rubygems/http-3.2.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=db723ff09cd8825905b71d5dc18fde2a
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.1.1 b/metadata/md5-cache/dev-ruby/i18n-1.1.1
new file mode 100644
index 000000000000..0ab08133da72
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/i18n-1.1.1
@@ -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.1.tar.gz -> i18n-1.1.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=6ca336d08c479cf5fc90d5e60f403ec5
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.5.8 b/metadata/md5-cache/dev-ruby/itextomml-1.5.8
new file mode 100644
index 000000000000..e5564b8440db
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.5.8
@@ -0,0 +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_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=Native Ruby bindings to itex2MML, which converts itex equations to MathML
+EAPI=6
+HOMEPAGE=https://golem.ph.utexas.edu/~distler/blog/itex2MML.html
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
+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/itextomml-1.5.8.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=42d79a0040524da8f2bc5f3a619597cb
diff --git a/metadata/md5-cache/dev-ruby/mail-2.7.1 b/metadata/md5-cache/dev-ruby/mail-2.7.1
new file mode 100644
index 000000000000..47cf8be9d786
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mail-2.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mini_mime-0.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? ( 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=An email handling library
+EAPI=6
+HOMEPAGE=https://github.com/mikel/mail
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mini_mime-0.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=2.7
+SRC_URI=https://github.com/mikel/mail/archive/2.7.1.tar.gz -> mail-2.7.1-git.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=5c08f03e92c9a9abd74fc51264249e79
diff --git a/metadata/md5-cache/dev-ruby/mustermann-1.0.2 b/metadata/md5-cache/dev-ruby/mustermann-1.0.2
index 103041253414..d05e7fc7398b 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-1.0.2
+++ b/metadata/md5-cache/dev-ruby/mustermann-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=A library implementing patterns that behave like regular expressions
 EAPI=6
 HOMEPAGE=https://github.com/sinatra/mustermann
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~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=1
 SRC_URI=mirror://rubygems/mustermann-1.0.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1bd57cc5cb233015b15f526a2e5e450e
+_md5_=3adb77715d78088877d713925da19ea6
diff --git a/metadata/md5-cache/dev-ruby/mustermann-1.0.3 b/metadata/md5-cache/dev-ruby/mustermann-1.0.3
index 890f7dbd1057..769347e952f7 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-1.0.3
+++ b/metadata/md5-cache/dev-ruby/mustermann-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A library implementing patterns that behave like regular expressions
 EAPI=6
 HOMEPAGE=https://github.com/sinatra/mustermann
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~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=1
 SRC_URI=mirror://rubygems/mustermann-1.0.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3c3dcde84516c73485e2700deab90f86
+_md5_=a5ad46581ebee867c8bea2496593980a
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-5.0.2 b/metadata/md5-cache/dev-ruby/net-ssh-5.0.2
index 3c06e266012e..60b704a6aa1b 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-5.0.2
+++ b/metadata/md5-cache/dev-ruby/net-ssh-5.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Non-interactive SSH processing in pure Ruby
 EAPI=6
 HOMEPAGE=https://github.com/net-ssh/net-ssh
 IUSE=ed25519 test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby23] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby25] dev-ruby/bcrypt_pbkdf[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
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v5.0.2.tar.gz -> net-ssh-git-5.0.2.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d4e546f66ea72d4d57d2592f36d57e9f
+_md5_=256c6ecafbb932a317ba544e3c9762fa
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.1 b/metadata/md5-cache/dev-ruby/oauth2-1.4.1
new file mode 100644
index 000000000000..ac6d97289595
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.16[ruby_targets_ruby23] || ( dev-ruby/jwt:2[ruby_targets_ruby23] dev-ruby/jwt:0[ruby_targets_ruby23] ) >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby24] <dev-ruby/faraday-0.16[ruby_targets_ruby24] || ( dev-ruby/jwt:2[ruby_targets_ruby24] dev-ruby/jwt:0[ruby_targets_ruby24] ) >=dev-ruby/multi_json-1.3[ruby_targets_ruby24] =dev-ruby/multi_json-1*[ruby_targets_ruby24] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby24] >=dev-ruby/rack-1.2:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby25] <dev-ruby/faraday-0.16[ruby_targets_ruby25] || ( dev-ruby/jwt:2[ruby_targets_ruby25] dev-ruby/jwt:0[ruby_targets_ruby25] ) >=dev-ruby/multi_json-1.3[ruby_targets_ruby25] =dev-ruby/multi_json-1*[ruby_targets_ruby25] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby25] >=dev-ruby/rack-1.2:*[ruby_targets_ruby25] <dev-ruby/rack-3:*[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? ( 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=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
+EAPI=6
+HOMEPAGE=https://github.com/intridea/oauth2
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.16[ruby_targets_ruby23] || ( dev-ruby/jwt:2[ruby_targets_ruby23] dev-ruby/jwt:0[ruby_targets_ruby23] ) >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby24] <dev-ruby/faraday-0.16[ruby_targets_ruby24] || ( dev-ruby/jwt:2[ruby_targets_ruby24] dev-ruby/jwt:0[ruby_targets_ruby24] ) >=dev-ruby/multi_json-1.3[ruby_targets_ruby24] =dev-ruby/multi_json-1*[ruby_targets_ruby24] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby24] >=dev-ruby/rack-1.2:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby25] <dev-ruby/faraday-0.16[ruby_targets_ruby25] || ( dev-ruby/jwt:2[ruby_targets_ruby25] dev-ruby/jwt:0[ruby_targets_ruby25] ) >=dev-ruby/multi_json-1.3[ruby_targets_ruby25] =dev-ruby/multi_json-1*[ruby_targets_ruby25] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby25] >=dev-ruby/rack-1.2:*[ruby_targets_ruby25] <dev-ruby/rack-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/intridea/oauth2/archive/v1.4.1.tar.gz -> oauth2-1.4.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9e04eeeef29e2b023b1117111a3bd7f8
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.4-r1 b/metadata/md5-cache/dev-ruby/pg-0.18.4-r1
deleted file mode 100644
index 23a0fe7a4dc8..000000000000
--- a/metadata/md5-cache/dev-ruby/pg-0.18.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Ruby extension library providing an API to PostgreSQL
-EAPI=5
-HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-db/postgresql:* ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/pg-0.18.4.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=11cfcfac288603a41e4f3cd0e9a04e8f
diff --git a/metadata/md5-cache/dev-ruby/pg-0.21.0 b/metadata/md5-cache/dev-ruby/pg-0.21.0
index 1b0def3f7e69..c6063e4539f3 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.21.0
+++ b/metadata/md5-cache/dev-ruby/pg-0.21.0
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby extension library providing an API to PostgreSQL
 EAPI=6
 HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
 RDEPEND=dev-db/postgresql:* 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/pg-0.21.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=144d45286acd259055ea071932980bd7
+_md5_=a04561d485237f2623c46986c2635ff3
diff --git a/metadata/md5-cache/dev-ruby/psych-3.0.3 b/metadata/md5-cache/dev-ruby/psych-3.0.3
new file mode 100644
index 000000000000..887f0ad3e08c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/psych-3.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/libyaml-0.2.1 ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest: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? ( 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 libyaml wrapper for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/tenderlove/psych
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+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=https://github.com/tenderlove/psych/archive/v3.0.3.tar.gz -> psych-3.0.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=42297c9b78d32b75d8d2cc53ef973250
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.0.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.0.0
index f9602c965a0a..2504c5d31972 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.0.0
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Library needed to connect puppet to puppetdb
 EAPI=5
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_6.0.0-1stretch_all.deb
 _eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=f8343ad3eb522c479412121fe53535bd
+_md5_=4f2fe8c1551d699146f5ae67518844ea
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-5.0.1 b/metadata/md5-cache/dev-ruby/rack-attack-5.0.1
deleted file mode 100644
index 065683347f74..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-attack-5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/actionpack[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/actionpack[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/minitest[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] ) )
-DESCRIPTION=A DSL for blocking & throttling abusive clients
-EAPI=6
-HOMEPAGE=https://github.com/kickstarter/rack-attack
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[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=5
-SRC_URI=mirror://rubygems/rack-attack-5.0.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=43f58a4ff418de4a229f6882f3de0378
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-5.2.0 b/metadata/md5-cache/dev-ruby/rack-attack-5.2.0
deleted file mode 100644
index e5a05d303784..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-attack-5.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/actionpack[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/actionpack[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/actionpack[ruby_targets_ruby25] dev-ruby/activesupport[ruby_targets_ruby25] dev-ruby/rack-test[ruby_targets_ruby25] dev-ruby/minitest[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 DSL for blocking & throttling abusive clients
-EAPI=6
-HOMEPAGE=https://github.com/kickstarter/rack-attack
-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/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[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
-SRC_URI=mirror://rubygems/rack-attack-5.2.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fc65027f454ad60625b8bb64364c69fe
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-5.3.0 b/metadata/md5-cache/dev-ruby/rack-attack-5.3.0
deleted file mode 100644
index ab519faadfe7..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-attack-5.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/actionpack[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/actionpack[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/actionpack[ruby_targets_ruby25] dev-ruby/activesupport[ruby_targets_ruby25] dev-ruby/rack-test[ruby_targets_ruby25] dev-ruby/minitest[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 DSL for blocking & throttling abusive clients
-EAPI=6
-HOMEPAGE=https://github.com/kickstarter/rack-attack
-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/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[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
-SRC_URI=mirror://rubygems/rack-attack-5.3.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fc65027f454ad60625b8bb64364c69fe
diff --git a/metadata/md5-cache/dev-ruby/rack-test-1.1.0 b/metadata/md5-cache/dev-ruby/rack-test-1.1.0
index 785308c60259..b4d3926f1416 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rack-test-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Rack::Test is a small, simple testing API for Rack apps
 EAPI=6
 HOMEPAGE=https://github.com/rack-test/rack-test
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby25] <dev-ruby/rack-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=1.0
 SRC_URI=https://github.com/rack-test/rack-test/archive/v1.1.0.tar.gz -> rack-test-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3dae2678ceef49a7762add36a178d128
+_md5_=7e3ee6c201a48b9ac2f15bc19ab8c6ae
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.7.0 b/metadata/md5-cache/dev-ruby/rspec-3.7.0
index bf948f6db014..436c5c114b0b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.7.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.7.0
@@ -4,11 +4,11 @@ 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 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.7*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.7*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.7*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.7*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.7*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.7*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.7*[ruby_targets_ruby25] =dev-ruby/rspec-expectations-3.7*[ruby_targets_ruby25] =dev-ruby/rspec-mocks-3.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? ( 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.7.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6aaaf63a326527db249761360642a87e
+_md5_=fa530327749f7292dd917e1ca17ab423
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.7.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.7.1
index 3e632c8bd099..3978f2163a51 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.7.1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.7.1
@@ -4,11 +4,11 @@ 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
+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.7*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.7*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.7*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.0.9[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.7.1.tar.gz -> rspec-core-3.7.1-git.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a07c67ead530f49df0a11639ad7cb174
+_md5_=93b96543787e2e318088bae7fb74df0c
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.7.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.7.0
index b72efa9818c2..c625f6487826 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.7.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.7.0
@@ -4,11 +4,11 @@ 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~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/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.7*[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.7*[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.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? ( 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.7.0.tar.gz -> rspec-expectations-3.7.0-git.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=871fa6edaf89b15a51daaf24fcec7ec7
+_md5_=949c4bde9eede17e5302df095794db4c
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2
new file mode 100644
index 000000000000..0002cf1134ba
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2
@@ -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 ~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/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.2.tar.gz -> rspec-expectations-3.8.2-git.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=e2c584f265a259b204cf033320d3c0c5
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.7.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.7.0
index dd62c1e8cbf0..439a21c319c7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.7.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.7.0
@@ -4,11 +4,11 @@ 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~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.7*[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.7*[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.7*[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.7.0.tar.gz -> rspec-mocks-3.7.0-git.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c32ab7675c3a78e8a1d69e477bfeb8e2
+_md5_=aca427ab3bb95bdbb4b8d3fabd82633b
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.7.1 b/metadata/md5-cache/dev-ruby/rspec-support-3.7.1
index 74262c366ec5..0e08ac60934a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.7.1
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.7.1
@@ -4,11 +4,11 @@ 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~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-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.7.1.tar.gz -> rspec-support-3.7.1-git.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6fef3df006752965a5a06bcefb2370e7
+_md5_=6a1b22daa84f782df33b7306a65da252
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.14.1 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.14.1
new file mode 100644
index 000000000000..61ce090a97ab
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2.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] ) 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=This gem provides Ruby bindings for WebDriver
+EAPI=6
+HOMEPAGE=https://github.com/seleniumhq/selenium
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2.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=3
+SRC_URI=mirror://rubygems/selenium-webdriver-3.14.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=3d0d9d70cae78938f44faf86a14f99f4
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
index d28b9aa0fd76..93af702d7ab8 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Library of tools for working with Semantic Versions and module depen
 EAPI=6
 HOMEPAGE=https://github.com/puppetlabs/semantic_puppet
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm hppa ppc ppc64 x86
 LICENSE=Apache-2.0
 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/semantic_puppet-1.0.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=761e073fd8fa3ef8f7d7be6b5050043b
+_md5_=c0fb61a43118f7cb307c9c2a70f1c521
diff --git a/metadata/md5-cache/dev-ruby/sinatra-2.0.3 b/metadata/md5-cache/dev-ruby/sinatra-2.0.3
index 0af28bdab125..f08dd9dab6ef 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-2.0.3
+++ b/metadata/md5-cache/dev-ruby/sinatra-2.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A DSL for quickly creating web applications in Ruby with minimal eff
 EAPI=6
 HOMEPAGE=http://www.sinatrarb.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-ruby/mustermann:1[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] =dev-ruby/rack-protection-2.0.3[ruby_targets_ruby23] dev-ruby/tilt:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/mustermann:1[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] =dev-ruby/rack-protection-2.0.3[ruby_targets_ruby24] dev-ruby/tilt:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/mustermann:1[ruby_targets_ruby25] dev-ruby/rack:2.0[ruby_targets_ruby25] =dev-ruby/rack-protection-2.0.3[ruby_targets_ruby25] dev-ruby/tilt: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=2
 SRC_URI=https://github.com/sinatra/sinatra/archive/v2.0.3.tar.gz -> sinatra-2.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d63717c9a46aea326c4e4cff17486380
+_md5_=788f5574b8d2c5ba662bd3e45637d219
diff --git a/metadata/md5-cache/dev-ruby/sinatra-2.0.4 b/metadata/md5-cache/dev-ruby/sinatra-2.0.4
index 8778d854bc81..c25fb61f7d12 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-2.0.4
+++ b/metadata/md5-cache/dev-ruby/sinatra-2.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=A DSL for quickly creating web applications in Ruby with minimal eff
 EAPI=6
 HOMEPAGE=http://www.sinatrarb.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-ruby/mustermann:1[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] ~dev-ruby/rack-protection-2.0.4[ruby_targets_ruby23] dev-ruby/tilt:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/mustermann:1[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] ~dev-ruby/rack-protection-2.0.4[ruby_targets_ruby24] dev-ruby/tilt:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/mustermann:1[ruby_targets_ruby25] dev-ruby/rack:2.0[ruby_targets_ruby25] ~dev-ruby/rack-protection-2.0.4[ruby_targets_ruby25] dev-ruby/tilt: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=2
 SRC_URI=https://github.com/sinatra/sinatra/archive/v2.0.4.tar.gz -> sinatra-2.0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e8d8352f5a6188ff31cff06838b8f49a
+_md5_=77abcb3e670e9a66cdc2f9c14b0d9c8c
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
deleted file mode 100644
index abefec5618ab..000000000000
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby23? ( dev-ruby/rake-compiler[ruby_targets_ruby23] dev-ruby/hoe[ruby_targets_ruby23] doc? ( dev-ruby/redcloth[ruby_targets_ruby23] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=An extension library to access a SQLite database from Ruby
-EAPI=5
-HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=amd64 ~arm ~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=BSD
-RDEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/sqlite3-1.3.11.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=849f68c48096e00dffb169116918cc6d
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.15.1 b/metadata/md5-cache/dev-ruby/sshkit-1.15.1
deleted file mode 100644
index 23a8ceccf94f..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkit-1.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[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/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] ) )
-DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
-EAPI=6
-HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24] >=dev-ruby/net-scp-1.1.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/sshkit-1.15.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=33eada0890844efa534d212c1a48f080
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.16.0 b/metadata/md5-cache/dev-ruby/sshkit-1.16.0
deleted file mode 100644
index ac9930022826..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkit-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[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/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] ) )
-DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
-EAPI=6
-HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24] >=dev-ruby/net-scp-1.1.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/sshkit-1.16.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=46554a8c74be1a839ad912170473c669
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.18.0 b/metadata/md5-cache/dev-ruby/sshkit-1.18.0
new file mode 100644
index 000000000000..834cae005bb6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.18.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby25] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[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=SSHKit makes it easy to write structured, testable SSH commands in Ruby
+EAPI=6
+HOMEPAGE=https://github.com/capistrano/sshkit
+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/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby25] >=dev-ruby/net-scp-1.1.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/sshkit-1.18.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ebde4580e2612643f9ccccb9e6b9d5c3
diff --git a/metadata/md5-cache/dev-ruby/tins-1.17.0 b/metadata/md5-cache/dev-ruby/tins-1.17.0
new file mode 100644
index 000000000000..7a2dd5402dbd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tins-1.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[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=All the stuff that isn't good enough for a real library
+EAPI=6
+HOMEPAGE=https://github.com/flori/tins
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/tins-1.17.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=a63f259fe772c57a5107806cb382eaa5
diff --git a/metadata/md5-cache/dev-ruby/xpath-3.2.0 b/metadata/md5-cache/dev-ruby/xpath-3.2.0
new file mode 100644
index 000000000000..d405adc61b5d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/xpath-3.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.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=XPath is a Ruby DSL around a subset of XPath 1.0
+EAPI=6
+HOMEPAGE=https://github.com/jnicklas/xpath
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.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? ( 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/xpath-3.2.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=29fe2b03c7d98220ee1e73d7e441bfd4
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index d27f9987afc4..968e9c6a80c9 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/slib-3.2.5-r1 b/metadata/md5-cache/dev-scheme/slib-3.2.5-r1
index 961a292a97db..6ca693284802 100644
--- a/metadata/md5-cache/dev-scheme/slib-3.2.5-r1
+++ b/metadata/md5-cache/dev-scheme/slib-3.2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=>=sys-apps/texinfo-5.0 >=dev-scheme/guile-1.8.8:= gambit? ( dev-scheme/gambit ) scm? ( dev-scheme/scm )
+DEPEND=>=sys-apps/texinfo-5.0 >=dev-scheme/guile-1.8.8:= gambit? ( dev-scheme/gambit ) scm? ( dev-scheme/scm ) app-arch/unzip
 DESCRIPTION=Portable Scheme library for all standard Scheme implementations
 EAPI=6
 HOMEPAGE=http://people.csail.mit.edu/jaffer/SLIB
@@ -9,6 +9,6 @@ LICENSE=public-domain BSD
 RDEPEND=>=sys-apps/texinfo-5.0 >=dev-scheme/guile-1.8.8:= gambit? ( dev-scheme/gambit ) scm? ( dev-scheme/scm )
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://swiss.csail.mit.edu/ftpdir/scm/slib-3b5.tar.gz
+SRC_URI=http://groups.csail.mit.edu/mac/ftpdir/scm/slib-3b5.zip
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4896158dbe6060f0133a972dfdee7bc1
+_md5_=136316968f8357f0c5813783eb99ed72
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index c18f99bba00c..aff26177b700 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/bwidget-1.9.12 b/metadata/md5-cache/dev-tcltk/bwidget-1.9.12
new file mode 100644
index 000000000000..6a0dd721d09a
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/bwidget-1.9.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install test
+DEPEND=dev-lang/tk:0 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=High-level widget set for Tcl/Tk
+EAPI=6
+HOMEPAGE=http://tcllib.sourceforge.net/
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=tcltk
+RDEPEND=dev-lang/tk:0
+SLOT=0
+SRC_URI=mirror://sourceforge/tcllib/BWidget/1.9.12/bwidget-1.9.12.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=fcaf857f894d78e0440480ad2dda466b
diff --git a/metadata/md5-cache/dev-tcltk/bwidget-1.9.9 b/metadata/md5-cache/dev-tcltk/bwidget-1.9.9
index 870129a5af8f..4dd8e0429fff 100644
--- a/metadata/md5-cache/dev-tcltk/bwidget-1.9.9
+++ b/metadata/md5-cache/dev-tcltk/bwidget-1.9.9
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/tk:0
 SLOT=0
 SRC_URI=mirror://sourceforge/project/tcllib/BWidget/1.9.9/bwidget-1.9.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=666d5f727cf1be214a7f4e3255c4fb4f
+_md5_=fc16ff48b720773ac3b0cf0b5505771e
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.9.0 b/metadata/md5-cache/dev-tcltk/expect-lite-4.9.0
new file mode 100644
index 000000000000..58be5e5c4f2a
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/expect-lite-4.9.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=quick and easy command line automation tool built on top of expect
+EAPI=6
+HOMEPAGE=http://expect-lite.sourceforge.net/
+IUSE=debug examples
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
+SLOT=0
+SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.9.0.tar.gz
+_md5_=d0e2962cd23fa82d9ee42014400dc55f
diff --git a/metadata/md5-cache/dev-tcltk/itcl-4.1.1 b/metadata/md5-cache/dev-tcltk/itcl-4.1.1
new file mode 100644
index 000000000000..bb89ce4c1485
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/itcl-4.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/tcl-8.6:0=
+DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
+EAPI=7
+HOMEPAGE=http://incrtcl.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/tcl-8.6:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%204.1.1/itcl4.1.1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a83794fbc358642848e27724c807c22b
diff --git a/metadata/md5-cache/dev-tcltk/itk-4.1.0 b/metadata/md5-cache/dev-tcltk/itk-4.1.0
new file mode 100644
index 000000000000..0ffb6d38c647
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/itk-4.1.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-lang/tk-8.6:= =dev-tcltk/itcl-4.1*
+DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
+EAPI=7
+HOMEPAGE=http://incrtcl.sourceforge.net/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/tk-8.6:= =dev-tcltk/itcl-4.1*
+SLOT=0
+SRC_URI=mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%204.1.0/itk4.1.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=d148e13c5b78ba7b1320e9296576fb66
diff --git a/metadata/md5-cache/dev-tcltk/iwidgets-4.1.1 b/metadata/md5-cache/dev-tcltk/iwidgets-4.1.1
index 3bfa320e4b93..77858c6817c3 100644
--- a/metadata/md5-cache/dev-tcltk/iwidgets-4.1.1
+++ b/metadata/md5-cache/dev-tcltk/iwidgets-4.1.1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-tcltk/itcl-4.0.3 >=dev-tcltk/itk-4.0.1
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-tcltk/itcl-4.1.1 >=dev-tcltk/itk-4.1.0 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Widget collection for incrTcl/incrTk
 EAPI=6
 HOMEPAGE=http://incrtcl.sourceforge.net/itcl/
+IUSE=test
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=HPND Old-MIT tcltk
-RDEPEND=>=dev-tcltk/itcl-4.0.3 >=dev-tcltk/itk-4.0.1
-RESTRICT=test
+RDEPEND=>=dev-tcltk/itcl-4.1.1 >=dev-tcltk/itk-4.1.0
 SLOT=0
-SRC_URI=mirror://sourceforge/incrtcl/%5BIncr%20Widgets%5D/4.1.1/iwidgets-4.1.1.tar.gz mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source/itcl%204.0.3/itcl4.0.3.tar.gz mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source/itk%204.0.1/itk4.0.1.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=61ae45f224997d91d3de0e0844be2b67
+SRC_URI=mirror://sourceforge/incrtcl/%5BIncr%20Widgets%5D/4.1.1/iwidgets-4.1.1.tar.gz mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source/itcl%204.1.1/itcl4.1.1.tar.gz mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source/itk%204.1.0/itk4.1.0.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=1c962db539acb5c58270f58e9f04bbaa
diff --git a/metadata/md5-cache/dev-tcltk/tablelist-6.3 b/metadata/md5-cache/dev-tcltk/tablelist-6.3
new file mode 100644
index 000000000000..cb7c15881a40
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/tablelist-6.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Multi-Column Listbox Package
+EAPI=6
+HOMEPAGE=http://www.nemethi.de/tablelist/index.html
+IUSE=examples doc
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=tablelist
+RDEPEND=dev-lang/tcl:0
+SLOT=0
+SRC_URI=http://www.nemethi.de/tablelist/tablelist6.3.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=f63d0ba7c0d1df8189af3541b29401ac
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 29c1e03cc630..4aa1c29c7bc8 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/Orange-3.14.0 b/metadata/md5-cache/dev-util/Orange-3.14.0
index ead14cb923b9..a6d5f12f11a6 100644
--- a/metadata/md5-cache/dev-util/Orange-3.14.0
+++ b/metadata/md5-cache/dev-util/Orange-3.14.0
@@ -1,15 +1,15 @@
 BDEPEND=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(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/anyqt-0.0.8[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/bottleneck-1.0.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/CommonMark-0.5.5[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/chardet-3.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/joblib-0.9.4[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/keyring[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/keyrings_alt[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/pandas[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/pip-9.0.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/pylint[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/pyqtgraph-0.10.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/PyQt5[webengine,svg,testlib,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/radon[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/serverfiles[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/xlrd-0.9.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(-)] >=sci-libs/scipy-0.16.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(-)] >=sci-libs/scikits_learn-0.18.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/setuptools-36.3[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/numpy-1.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(-)] doc? ( dev-python/beautifulsoup:4[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/docutils[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/numpydoc[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/recommonmark[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/sphinx-1.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(-)] ) postgres? ( dev-python/psycopg: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(-)] )
+DEPEND=>=dev-python/anyqt-0.0.8[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/bottleneck-1.0.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/commonmark-0.8[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/commonmark-0.5.5[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/chardet-3.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/joblib-0.9.4[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/keyring[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/keyrings_alt[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/pandas[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/pip-9.0.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/pylint[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/pyqtgraph-0.10.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/PyQt5[webengine,svg,testlib,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/radon[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/serverfiles[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/xlrd-0.9.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(-)] >=sci-libs/scipy-0.16.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(-)] >=sci-libs/scikits_learn-0.18.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/setuptools-36.3[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/numpy-1.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(-)] doc? ( dev-python/beautifulsoup:4[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/docutils[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/numpydoc[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/recommonmark[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/sphinx-1.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(-)] ) postgres? ( dev-python/psycopg:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 DESCRIPTION=Open source data visualization and analysis for novice and experts.
 EAPI=7
 HOMEPAGE=https://orange.biolab.si/
 IUSE=doc postgres python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=>=dev-python/anyqt-0.0.8[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/bottleneck-1.0.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/CommonMark-0.5.5[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/chardet-3.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/joblib-0.9.4[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/keyring[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/keyrings_alt[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/pandas[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/pip-9.0.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/pylint[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/pyqtgraph-0.10.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/PyQt5[webengine,svg,testlib,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/radon[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/serverfiles[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/xlrd-0.9.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(-)] >=sci-libs/scipy-0.16.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(-)] >=sci-libs/scikits_learn-0.18.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(-)] 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(-)]
+RDEPEND=>=dev-python/anyqt-0.0.8[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/bottleneck-1.0.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/commonmark-0.8[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/commonmark-0.5.5[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/chardet-3.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/joblib-0.9.4[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/keyring[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/keyrings_alt[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/pandas[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/pip-9.0.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/pylint[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/pyqtgraph-0.10.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/PyQt5[webengine,svg,testlib,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/radon[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/serverfiles[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/xlrd-0.9.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(-)] >=sci-libs/scipy-0.16.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(-)] >=sci-libs/scikits_learn-0.18.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(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/biolab/orange3/archive/3.14.0.tar.gz -> Orange-3.14.0.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3bcd43096ce0bbb1f5ada07393e1cb52
+_md5_=4b4758649e82d2ff2bca64fe5af5a6de
diff --git a/metadata/md5-cache/dev-util/Orange-3.4.5-r3 b/metadata/md5-cache/dev-util/Orange-3.4.5-r3
index 887fd627cf1a..373edb7aa70a 100644
--- a/metadata/md5-cache/dev-util/Orange-3.4.5-r3
+++ b/metadata/md5-cache/dev-util/Orange-3.4.5-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/anyqt[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/bottleneck-1.0.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/CommonMark-0.5.5[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/dill[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/chardet-2.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/joblib-0.9.4[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/keyring[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/keyrings_alt[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/pylint[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/pip-9.0.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/pyqtgraph-0.10.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/PyQt5[webkit,svg,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/radon[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(-)] virtual/python-typing[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/xlrd-0.9.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(-)] >=sci-libs/scipy-0.11.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(-)] >=sci-libs/scikits_learn-0.18.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/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/numpy-1.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(-)] 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(-)]
+DEPEND=dev-python/anyqt[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/bottleneck-1.0.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/commonmark-0.8[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/commonmark-0.5.5[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/dill[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/chardet-2.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/joblib-0.9.4[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/keyring[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/keyrings_alt[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/pylint[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/pip-9.0.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/pyqtgraph-0.10.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/PyQt5[webkit,svg,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/radon[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(-)] virtual/python-typing[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/xlrd-0.9.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(-)] >=sci-libs/scipy-0.11.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(-)] >=sci-libs/scikits_learn-0.18.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/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/numpy-1.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(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Open source data visualization and analysis for novice and experts.
 EAPI=6
 HOMEPAGE=https://orange.biolab.si/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-python/anyqt[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/bottleneck-1.0.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/CommonMark-0.5.5[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/dill[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/chardet-2.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/joblib-0.9.4[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/keyring[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/keyrings_alt[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/pylint[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/pip-9.0.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/pyqtgraph-0.10.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/PyQt5[webkit,svg,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/radon[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(-)] virtual/python-typing[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/xlrd-0.9.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(-)] >=sci-libs/scipy-0.11.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(-)] >=sci-libs/scikits_learn-0.18.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(-)] 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(-)]
+RDEPEND=dev-python/anyqt[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/bottleneck-1.0.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/commonmark-0.8[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/commonmark-0.5.5[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/dill[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/chardet-2.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/joblib-0.9.4[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/keyring[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/keyrings_alt[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/pylint[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/pip-9.0.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/pyqtgraph-0.10.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/PyQt5[webkit,svg,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/radon[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(-)] virtual/python-typing[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/xlrd-0.9.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(-)] >=sci-libs/scipy-0.11.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(-)] >=sci-libs/scikits_learn-0.18.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(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/biolab/orange3/archive/3.4.5.tar.gz -> Orange-3.4.5.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d95c69e88de34d20ac2e8a8f8149aeb2
+_md5_=e68387c651bd5f28a0ddf0ecf418e403
diff --git a/metadata/md5-cache/dev-util/apitrace-7.1-r1 b/metadata/md5-cache/dev-util/apitrace-7.1-r1
index 20857cb2570e..e986db6b82d7 100644
--- a/metadata/md5-cache/dev-util/apitrace-7.1-r1
+++ b/metadata/md5-cache/dev-util/apitrace-7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/archive/7.1.tar.gz -> apitrace-7.1.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36bd35a6f76e87dd90c9133ddf85d655
diff --git a/metadata/md5-cache/dev-util/astyle-3.1-r2 b/metadata/md5-cache/dev-util/astyle-3.1-r2
index 8320bbbcb3f7..0b09a4f53f64 100644
--- a/metadata/md5-cache/dev-util/astyle-3.1-r2
+++ b/metadata/md5-cache/dev-util/astyle-3.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Artistic Style is a re-indenter and reformatter for C++, C and Java
 EAPI=6
 HOMEPAGE=http://astyle.sourceforge.net/
 IUSE=examples java static-libs elibc_FreeBSD java
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/3.1
 SRC_URI=mirror://sourceforge/astyle/astyle_3.1_linux.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=310b351c3369e043eab3592464bc2d8d
+_md5_=a32a1625e8159b522fc14b0723d25ad7
diff --git a/metadata/md5-cache/dev-util/autodia-2.140.0-r1 b/metadata/md5-cache/dev-util/autodia-2.140.0-r1
index 549577318d29..b7a79c4a6312 100644
--- a/metadata/md5-cache/dev-util/autodia-2.140.0-r1
+++ b/metadata/md5-cache/dev-util/autodia-2.140.0-r1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Template-Toolkit dev-perl/XML-Simple graphviz? ( dev-perl/GraphViz ) dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz https://dev.gentoo.org/~tove/distfiles/dev-util/Autodia-2.14-dbi.patch.gz
+SRC_URI=mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz mirror://gentoo/Autodia-2.14-dbi.patch.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b3d04551b30fe197cd09a0e45467bb6
+_md5_=3a0426f7d162028958aa6ff6cb6f768a
diff --git a/metadata/md5-cache/dev-util/bazel-0.18.0 b/metadata/md5-cache/dev-util/bazel-0.18.0
new file mode 100644
index 000000000000..5cc5ba59e709
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bazel-0.18.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=virtual/jdk:1.8 app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=6
+HOMEPAGE=http://bazel.io/
+IUSE=examples tools zsh-completion elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.18.0/bazel-0.18.0-dist.zip
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=39d95e8a6e99e7f083d17f7b75731f6d
diff --git a/metadata/md5-cache/dev-util/bbe-0.2.2-r1 b/metadata/md5-cache/dev-util/bbe-0.2.2-r1
new file mode 100644
index 000000000000..b370358d0a54
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bbe-0.2.2-r1
@@ -0,0 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=prepare
+DESCRIPTION=Sed-like editor for binary files
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/bbe-/
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/bbe-/bbe-0.2.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d02c31b7827f23ecfaff722d6339fa31
diff --git a/metadata/md5-cache/dev-util/cargo-0.30.0 b/metadata/md5-cache/dev-util/cargo-0.30.0
index 9422df1d0eda..39a0b7ece712 100644
--- a/metadata/md5-cache/dev-util/cargo-0.30.0
+++ b/metadata/md5-cache/dev-util/cargo-0.30.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.30.0.tar.gz -> cargo-0.30.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.8/download -> aho-corasick-0.6.8.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/arrayvec/0.4.7/download -> arrayvec-0.4.7.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.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.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.30.0/download -> cargo-0.30.0.crate https://crates.io/api/v1/crates/cc/1.0.25/download -> cc-1.0.25.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.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/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.18.0/download -> crates-io-0.18.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.2.6/download -> crossbeam-channel-0.2.6.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.6.0/download -> crossbeam-epoch-0.6.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.5.0/download -> crossbeam-utils-0.5.0.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.17/download -> curl-0.4.17.crate https://crates.io/api/v1/crates/curl-sys/0.4.12/download -> curl-sys-0.4.12.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.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.2/download -> globset-0.4.2.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.4/download -> ignore-0.4.4.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.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.1.0/download -> lazy_static-1.1.0.crate https://crates.io/api/v1/crates/lazycell/1.2.0/download -> lazycell-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.8/download -> libgit2-sys-0.7.8.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.11/download -> libssh2-sys-0.2.11.crate https://crates.io/api/v1/crates/libz-sys/1.0.22/download -> libz-sys-1.0.22.crate https://crates.io/api/v1/crates/lock_api/0.1.3/download -> lock_api-0.1.3.crate https://crates.io/api/v1/crates/log/0.4.5/download -> log-0.4.5.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.1.0/download -> memchr-2.1.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.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.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.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.12/download -> openssl-0.10.12.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-src/110.0.7+1.1.0i/download -> openssl-src-110.0.7+1.1.0i.crate https://crates.io/api/v1/crates/openssl-sys/0.9.36/download -> openssl-sys-0.9.36.crate https://crates.io/api/v1/crates/owning_ref/0.3.3/download -> owning_ref-0.3.3.crate https://crates.io/api/v1/crates/parking_lot/0.6.4/download -> parking_lot-0.6.4.crate https://crates.io/api/v1/crates/parking_lot_core/0.3.1/download -> parking_lot_core-0.3.1.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.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/proc-macro2/0.4.19/download -> proc-macro2-0.4.19.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.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.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.5/download -> regex-1.0.5.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/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustfix/0.4.2/download -> rustfix-0.4.2.crate https://crates.io/api/v1/crates/ryu/0.2.6/download -> ryu-0.2.6.crate https://crates.io/api/v1/crates/same-file/1.0.3/download -> same-file-1.0.3.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.79/download -> serde-1.0.79.crate https://crates.io/api/v1/crates/serde_derive/1.0.79/download -> serde_derive-1.0.79.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.28/download -> serde_json-1.0.28.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/smallvec/0.6.5/download -> smallvec-0.6.5.crate https://crates.io/api/v1/crates/socket2/0.3.8/download -> socket2-0.3.8.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.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.9/download -> syn-0.14.9.crate https://crates.io/api/v1/crates/syn/0.15.4/download -> syn-0.15.4.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.4/download -> tempfile-3.0.4.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.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.6/download -> thread_local-0.3.6.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.1/download -> utf8-ranges-1.0.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.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/version_check/0.1.4/download -> version_check-0.1.4.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.2.5/download -> walkdir-2.2.5.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-util/0.1.1/download -> winapi-util-0.1.1.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.1/download -> wincolor-1.0.1.crate x86? ( https://static.rust-lang.org/dist/cargo-0.29.0-i686-unknown-linux-gnu.tar.xz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/cargo-0.29.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.29.0-aarch64-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	da08619f6c16047185d20223904c8aef	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=63964c9600678e031b9d7793707f4231
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.3 b/metadata/md5-cache/dev-util/catalyst-3.0.3
index 993b69a07279..8b8bb620c4b0 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.3
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
 IUSE=ccache doc kernel_linux system-bootloader 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=GPL-2
 PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
 RDEPEND=app-arch/lbzip2 app-crypt/shash >=dev-python/pydecomp-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/snakeoil-0.6.5[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(-)] sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=mirror://gentoo/catalyst-3.0.3.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.3.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.3.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.3.tar.bz2
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5d251dd6465b5c48807c2f5473366579
+_md5_=4fb06b7b5a6fa5893799333e6ad89686
diff --git a/metadata/md5-cache/dev-util/ccache-3.5 b/metadata/md5-cache/dev-util/ccache-3.5
new file mode 100644
index 000000000000..cae157fbf8b9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ccache-3.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare prerm test
+DEPEND=app-arch/xz-utils sys-libs/zlib
+DESCRIPTION=fast compiler cache
+EAPI=7
+HOMEPAGE=https://ccache.samba.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-3
+RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.5.tar.xz
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=5fa0bde911c699b6be1bd03fa9c7fad6
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.18.3 b/metadata/md5-cache/dev-util/checkbashisms-2.18.3
deleted file mode 100644
index fd807a479803..000000000000
--- a/metadata/md5-cache/dev-util/checkbashisms-2.18.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
-EAPI=6
-HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.18.3.tar.xz
-_md5_=e699215e3a300f6440f6a125c805af82
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.18.6 b/metadata/md5-cache/dev-util/checkbashisms-2.18.6
new file mode 100644
index 000000000000..de7d74846c54
--- /dev/null
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.18.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
+EAPI=6
+HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.18.6.tar.xz
+_md5_=ccc73d6e1ad2cc717122d64e12a84353
diff --git a/metadata/md5-cache/dev-util/cmake-3.13.0_rc1 b/metadata/md5-cache/dev-util/cmake-3.13.0_rc1
new file mode 100644
index 000000000000..4a0af56fa0da
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.13.0_rc1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/requests dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DESCRIPTION=Cross platform Make
+EAPI=6
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs system-jsoncpp ncurses qt5 test
+LICENSE=CMake
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.13/cmake-3.13.0-rc1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2a62ca11cc650f7d4e163f153ced9cd1
diff --git a/metadata/md5-cache/dev-util/cmocka-1.1.1 b/metadata/md5-cache/dev-util/cmocka-1.1.1
index c8aac134f569..bdd41af510b9 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.1.1
+++ b/metadata/md5-cache/dev-util/cmocka-1.1.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd6
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://cmocka.org/files/1.1/cmocka-1.1.1.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d1413e90bac25e9b0c2679443edeb061
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.0 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.0
deleted file mode 100644
index b08e9320e4ed..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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_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 simpler alternative to Regular Expressions
-EAPI=6
-HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~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=6.0
-SRC_URI=mirror://rubygems/cucumber-expressions-6.0.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	b71c34d64e24dcf087f9d6a84bb32dbe	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fb4381ed80cd25037da69cf0bd87fa09
diff --git a/metadata/md5-cache/dev-util/cunit-2.1_p2-r1 b/metadata/md5-cache/dev-util/cunit-2.1_p2-r1
index c9f02b67d623..488ebf950b3a 100644
--- a/metadata/md5-cache/dev-util/cunit-2.1_p2-r1
+++ b/metadata/md5-cache/dev-util/cunit-2.1_p2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=CUnit - C Unit Test Framework
 EAPI=5
 HOMEPAGE=http://cunit.sourceforge.net
 IUSE=ncurses static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-2-src.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4d31d6cc3b6a7f7f37e8d943d5eac574
+_md5_=d507f9e7a7474bc614c8bf51f3a58056
diff --git a/metadata/md5-cache/dev-util/edi-0.7.0 b/metadata/md5-cache/dev-util/edi-0.7.0
new file mode 100644
index 000000000000..9d0e06dd82fd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/edi-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/efl-1.21.1[eet,X] clang? ( sys-devel/clang:= ) dev-libs/check >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=An EFL-based IDE
+EAPI=6
+HOMEPAGE=https://www.enlightenment.org/about-edi
+IUSE=clang
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-libs/efl-1.21.1[eet,X] clang? ( sys-devel/clang:= )
+SLOT=0
+SRC_URI=https://github.com/Enlightenment/edi/archive/v0.7.0.tar.gz -> edi-0.7.0.tar.gz
+_eclasses_=llvm	01fccd3367b527770b74bfbf59d616c6	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3a450eb398709063e4ab64b7544008c1
diff --git a/metadata/md5-cache/dev-util/glslang-6.2.2596 b/metadata/md5-cache/dev-util/glslang-6.2.2596
index 4743f38f62d4..7ae79911b7dd 100644
--- a/metadata/md5-cache/dev-util/glslang-6.2.2596
+++ b/metadata/md5-cache/dev-util/glslang-6.2.2596
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/glslang/archive/6.2.2596.tar.gz -> glslang-6.2.2596.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c333c4707ab0d100a191bb4d6aa2a18c
diff --git a/metadata/md5-cache/dev-util/glslang-7.9.2888 b/metadata/md5-cache/dev-util/glslang-7.9.2888
index d4629fd27fdf..f448c146343a 100644
--- a/metadata/md5-cache/dev-util/glslang-7.9.2888
+++ b/metadata/md5-cache/dev-util/glslang-7.9.2888
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/glslang/archive/7.9.2888.tar.gz -> glslang-7.9.2888.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0e8b409221203417b977693b4c1a743
diff --git a/metadata/md5-cache/dev-util/glslang-9999 b/metadata/md5-cache/dev-util/glslang-9999
index 00d3e9d2427b..19d00ded59d6 100644
--- a/metadata/md5-cache/dev-util/glslang-9999
+++ b/metadata/md5-cache/dev-util/glslang-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=BSD
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9378b5f7e3da41762c0e09824c0bf9f
diff --git a/metadata/md5-cache/dev-util/gn-0.1479 b/metadata/md5-cache/dev-util/gn-0.1479
new file mode 100644
index 000000000000..809bd3f3b0b5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gn-0.1479
@@ -0,0 +1,12 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja
+DEFINED_PHASES=compile configure install setup test
+DESCRIPTION=GN is a meta-build system that generates build files for Ninja
+EAPI=7
+HOMEPAGE=https://gn.googlesource.com/
+IUSE=vim-syntax
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~floppym/dist/gn-0.1479.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=71e5be405aae483fd527c2821504ab9f
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.0-r2 b/metadata/md5-cache/dev-util/google-perftools-2.0-r2
deleted file mode 100644
index a70e6ab2b357..000000000000
--- a/metadata/md5-cache/dev-util/google-perftools-2.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/libunwind >=app-portage/elt-patches-20170815
-DESCRIPTION=Fast, multi-threaded malloc() and nifty performance analysis tools
-EAPI=5
-HOMEPAGE=https://github.com/gperftools/gperftools
-IUSE=largepages +debug minimal test static-libs
-KEYWORDS=-* amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=sys-libs/libunwind
-SLOT=0/4
-SRC_URI=https://github.com/gperftools/gperftools/archive/gperftools-2.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c1b8c5b208911b119727b03ea69decf
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.4 b/metadata/md5-cache/dev-util/google-perftools-2.4
index 6164ba5662ff..100d4544f042 100644
--- a/metadata/md5-cache/dev-util/google-perftools-2.4
+++ b/metadata/md5-cache/dev-util/google-perftools-2.4
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/libunwind
 SLOT=0/4
 SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.4 -> gperftools-2.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=41d391b072b5b737a3c12a8563a5d9e6
+_md5_=b0ae0c7e5de6a4bc7b714cbe799eeb28
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.6.3 b/metadata/md5-cache/dev-util/google-perftools-2.6.3
deleted file mode 100644
index 7c76e0374544..000000000000
--- a/metadata/md5-cache/dev-util/google-perftools-2.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-libs/libunwind >=app-portage/elt-patches-20170815 !<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=Fast, multi-threaded malloc() and nifty performance analysis tools
-EAPI=6
-HOMEPAGE=https://github.com/gperftools/gperftools
-IUSE=largepages +debug minimal optimisememory test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=sys-libs/libunwind
-SLOT=0/4
-SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.6.3 -> gperftools-2.6.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=fad3549bc582155ab552bb6efd85463d
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.7 b/metadata/md5-cache/dev-util/google-perftools-2.7
new file mode 100644
index 000000000000..6f49d995e96a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/google-perftools-2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/libunwind >=app-portage/elt-patches-20170815 !<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=Fast, multi-threaded malloc() and nifty performance analysis tools
+EAPI=6
+HOMEPAGE=https://github.com/gperftools/gperftools
+IUSE=largepages +debug minimal optimisememory test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=sys-libs/libunwind
+SLOT=0/4
+SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.7 -> gperftools-2.7.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_md5_=b98d47017057d44eebaae652e1ca8081
diff --git a/metadata/md5-cache/dev-util/heaptrack-9999 b/metadata/md5-cache/dev-util/heaptrack-9999
index df11e45e352a..c1af53b48218 100644
--- a/metadata/md5-cache/dev-util/heaptrack-9999
+++ b/metadata/md5-cache/dev-util/heaptrack-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kitemmodels-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/threadweaver-5.46.0 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 ) zstd? ( app-arch/zstd:= ) >=kde-frameworks/extra-cmake-modules-5.46.0 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] test? ( >=dev-qt/qttest-5.9.4:5 ) dev-util/desktop-file-utils
+DEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kitemmodels-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/threadweaver-5.50.0 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 ) zstd? ( app-arch/zstd:= ) >=kde-frameworks/extra-cmake-modules-5.50.0 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] test? ( >=dev-qt/qttest-5.9.4:5 ) dev-util/desktop-file-utils
 DESCRIPTION=A fast heap memory profiler
 EAPI=6
 HOMEPAGE=http://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux
 IUSE=+qt5 zstd debug test
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kitemmodels-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/threadweaver-5.46.0 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 ) zstd? ( app-arch/zstd:= ) qt5? ( >=kde-frameworks/kf-env-4 )
+RDEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kitemmodels-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/threadweaver-5.50.0 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 ) zstd? ( app-arch/zstd:= ) qt5? ( >=kde-frameworks/kf-env-4 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b856227d68d1ca4b6b116ba46d936a2
diff --git a/metadata/md5-cache/dev-util/ignition-cmake-0.2.0 b/metadata/md5-cache/dev-util/ignition-cmake-0.2.0
index 943070f1513f..7d4429ee0b4c 100644
--- a/metadata/md5-cache/dev-util/ignition-cmake-0.2.0
+++ b/metadata/md5-cache/dev-util/ignition-cmake-0.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/ignition-cmake-0.2.0.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a57037bbc779008f86219a96780df6c
diff --git a/metadata/md5-cache/dev-util/ignition-cmake-0.4.0 b/metadata/md5-cache/dev-util/ignition-cmake-0.4.0
index b68c047abe67..90d1e89c2c7d 100644
--- a/metadata/md5-cache/dev-util/ignition-cmake-0.4.0
+++ b/metadata/md5-cache/dev-util/ignition-cmake-0.4.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/ignition-cmake-0.4.0.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a57037bbc779008f86219a96780df6c
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.121.3 b/metadata/md5-cache/dev-util/jenkins-bin-2.121.3
deleted file mode 100644
index 4c9483f27498..000000000000
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.121.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Extensible continuous integration server
-EAPI=6
-HOMEPAGE=https://jenkins.io/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
-RESTRICT=mirror
-SLOT=lts
-SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.121.3/jenkins.war -> jenkins-bin-2.121.3.war
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8b505e4c04eabe885a882230112b7138
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.138 b/metadata/md5-cache/dev-util/jenkins-bin-2.138
deleted file mode 100644
index a6e5b0ff929a..000000000000
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.138
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Extensible continuous integration server
-EAPI=6
-HOMEPAGE=https://jenkins.io/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://mirrors.jenkins-ci.org/war/2.138/jenkins.war -> jenkins-bin-2.138.war
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8a679d505f14359882d230334721aebf
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.138.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.138.2
new file mode 100644
index 000000000000..f89f0f053ecb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.138.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Extensible continuous integration server
+EAPI=7
+HOMEPAGE=https://jenkins.io/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.138.2/jenkins.war -> jenkins-bin-2.138.2.war
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b1ccf2ce49941da0a7fb09efbc64467d
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.146 b/metadata/md5-cache/dev-util/jenkins-bin-2.146
new file mode 100644
index 000000000000..fa451c2593b9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.146
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Extensible continuous integration server
+EAPI=7
+HOMEPAGE=https://jenkins.io/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.146/jenkins.war -> jenkins-bin-2.146.war
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=f26738792f8f0cc35f147863313d2aba
diff --git a/metadata/md5-cache/dev-util/kdbg-3.0.0 b/metadata/md5-cache/dev-util/kdbg-3.0.0
index 3a69e94337bf..d3b2224c06a5 100644
--- a/metadata/md5-cache/dev-util/kdbg-3.0.0
+++ b/metadata/md5-cache/dev-util/kdbg-3.0.0
@@ -1,13 +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 >=kde-frameworks/kiconthemes-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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Graphical debugger interface
 EAPI=6
 HOMEPAGE=http://www.kdbg.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~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 >=kde-frameworks/kiconthemes-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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !dev-util/kdbg:4 sys-devel/gdb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !dev-util/kdbg:4 sys-devel/gdb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kdbg/kdbg-3.0.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a6c9e90d0910fc1b871655af1cba7cc8
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.2.3 b/metadata/md5-cache/dev-util/kdevelop-5.2.3
deleted file mode 100644
index d00cd1ad5962..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-5.2.3
+++ /dev/null
@@ -1,15 +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/kdeclarative-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/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-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-frameworks/sonnet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( kde-frameworks/purpose ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) welcomepage? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) dev-libs/boost >=dev-qt/qtconcurrent-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=Integrated Development Environment, supporting KF5/Qt, C/C++ and much more
-EAPI=6
-HOMEPAGE=https://www.kdevelop.org/
-IUSE=cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-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/kdeclarative-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/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-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-frameworks/sonnet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( kde-frameworks/purpose ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) welcomepage? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) >=kde-apps/kapptemplate-17.12.3:5 >=kde-apps/kio-extras-17.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] cvs? ( dev-vcs/cvs ) reviewboard? ( >=kde-apps/ktp-accounts-kcm-17.12.3:5 ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang !dev-util/kdevelop-cppcheck !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs !dev-util/kdevplatform !<kde-apps/kapptemplate-16.04.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=test? ( welcomepage )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/kdevelop/5.2.3/src/kdevelop-5.2.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6166ab39e2cd2b9eeaa96c47a2dbe228
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.2.4 b/metadata/md5-cache/dev-util/kdevelop-5.2.4
index ce173c5416b3..55d065237891 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.2.4
+++ b/metadata/md5-cache/dev-util/kdevelop-5.2.4
@@ -1,14 +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/kdeclarative-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/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-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-frameworks/sonnet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.46.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) dev-libs/boost >=dev-qt/qtconcurrent-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
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-frameworks/threadweaver-5.50.0:5 >=kde-apps/libkomparediff2-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.50.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) dev-libs/boost >=dev-qt/qtconcurrent-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Integrated Development Environment, supporting KF5/Qt, C/C++ and much more
 EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=cvs +gdbui hex +plasma +qmake reviewboard subversion webkit test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-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/kdeclarative-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/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-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-frameworks/sonnet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.46.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) >=kde-apps/kapptemplate-17.12.3:5 >=kde-apps/kio-extras-17.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] cvs? ( dev-vcs/cvs ) reviewboard? ( >=kde-apps/ktp-accounts-kcm-17.12.3:5 ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang !dev-util/kdevelop-cppcheck !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs !dev-util/kdevplatform >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-frameworks/threadweaver-5.50.0:5 >=kde-apps/libkomparediff2-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.50.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) >=kde-apps/kapptemplate-18.04.3:5 >=kde-apps/kio-extras-18.04.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] cvs? ( dev-vcs/cvs ) reviewboard? ( >=kde-apps/ktp-accounts-kcm-18.04.3:5 ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang !dev-util/kdevelop-cppcheck !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs !dev-util/kdevplatform >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.4/src/kdevelop-5.2.4.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dfbb42743e658b489239dc4c8c2be985
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1de836dbc0959a6983bd8bcb2fe7ddfe
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
index 04ec9b641140..e67a8b082e5f 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/bison sys-devel/flex 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.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=sys-devel/bison sys-devel/flex 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.50.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=LL(1) parser generator used mainly by KDevelop language plugins
 EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=debug test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=!dev-util/kdevelop-pg-qt:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=!dev-util/kdevelop-pg-qt:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.1.0/src/kdevelop-pg-qt-2.1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c335e45dfeb97d6c7f311c8d7454a57
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.2.3 b/metadata/md5-cache/dev-util/kdevelop-php-5.2.3
deleted file mode 100644
index 7cd8a8740b9b..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.2.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/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/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 test? ( dev-util/kdevelop: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.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=PHP plugin for KDevelop
-EAPI=6
-HOMEPAGE=https://www.kdevelop.org/
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 !dev-util/kdevelop-php-docs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/kdevelop/5.2.3/src/kdev-php-5.2.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=612fb440ef06b9ce58f2aea560655ad9
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.2.4 b/metadata/md5-cache/dev-util/kdevelop-php-5.2.4
deleted file mode 100644
index 6f825d2ce859..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.2.4
+++ /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/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/kitemmodels-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop: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=PHP plugin for KDevelop
-EAPI=6
-HOMEPAGE=https://www.kdevelop.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 !dev-util/kdevelop-php-docs >=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/kdevelop/5.2.4/src/kdev-php-5.2.4.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=764c9d419561ebbc6aa3064521cd10ca
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.2.4-r1 b/metadata/md5-cache/dev-util/kdevelop-php-5.2.4-r1
new file mode 100644
index 000000000000..8e8b7317790a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.2.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/threadweaver-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 test? ( dev-util/kdevelop: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=PHP plugin for KDevelop
+EAPI=6
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=test debug +handbook test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/threadweaver-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 !dev-util/kdevelop-php-docs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.2.4/src/kdev-php-5.2.4.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7e1f159542402d556a7ec998c6494806
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.2.3 b/metadata/md5-cache/dev-util/kdevelop-python-5.2.3
deleted file mode 100644
index d76f66673997..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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(+)?] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-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/kitemmodels-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop: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.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Python plugin for KDevelop
-EAPI=6
-HOMEPAGE=https://www.kdevelop.org/
-IUSE=debug test 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=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(+)?] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-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/kitemmodels-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop:5 dev-python/pycodestyle[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(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-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 )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/kdevelop/5.2.3/src/kdev-python-5.2.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f4a6cdd4ae0cc3c0f1e60dfdcd0dff4f
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.2.4 b/metadata/md5-cache/dev-util/kdevelop-python-5.2.4
index 78f537b322d8..93d61fadf334 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.2.4
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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(+)?] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-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/kitemmodels-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop: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.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=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(+)?] >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/threadweaver-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop: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.50.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=Python plugin for KDevelop
 EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=debug test 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
+KEYWORDS=amd64 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 ) >=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(+)?] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-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/kitemmodels-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop:5 dev-python/pycodestyle[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(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+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 ) >=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(+)?] >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/threadweaver-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop:5 dev-python/pycodestyle[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(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 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 )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.4/src/kdev-python-5.2.4.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ab0be6239c615956b347922097152790
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5dc465d3e0ef8b1714f3e78e13eadfc8
diff --git a/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3 b/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3
index 3979cc153dba..f3ba02f7298f 100644
--- a/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3
+++ b/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5
 SLOT=0
 SRC_URI=https://github.com/KDAB/KDStateMachineEditor/releases/download/v1.2.3/kdstatemachineeditor-1.2.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=16e80ca7855fb5cfdde295eb67573867
diff --git a/metadata/md5-cache/dev-util/kdstatemachineeditor-9999 b/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
index 08fee54ee80c..ddecf2c93782 100644
--- a/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
+++ b/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
@@ -7,5 +7,5 @@ IUSE=doc test
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=990ed621d1169f8fdf9f8e6ad805bdd5
diff --git a/metadata/md5-cache/dev-util/kyua-0.13-r2 b/metadata/md5-cache/dev-util/kyua-0.13-r2
index 24d803a4abd1..ec09aaa44544 100644
--- a/metadata/md5-cache/dev-util/kyua-0.13-r2
+++ b/metadata/md5-cache/dev-util/kyua-0.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Testing framework for infrastructure software
 EAPI=6
 HOMEPAGE=https://github.com/jmmv/kyua
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-db/sqlite:3 dev-libs/atf dev-lua/lutok
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jmmv/kyua/releases/download/kyua-0.13/kyua-0.13.tar.gz
-_md5_=1c57f3a1871abf5786adc875540e99bb
+_md5_=ad9e87f45c6a65e7c67c7b0fc2b01b36
diff --git a/metadata/md5-cache/dev-util/ltrace-0.7.3_p4 b/metadata/md5-cache/dev-util/ltrace-0.7.3_p4
index 8af10287e458..41e63fc672cc 100644
--- a/metadata/md5-cache/dev-util/ltrace-0.7.3_p4
+++ b/metadata/md5-cache/dev-util/ltrace-0.7.3_p4
@@ -4,10 +4,10 @@ DESCRIPTION=trace library calls made at runtime
 EAPI=5
 HOMEPAGE=https://www.ltrace.org/
 IUSE=debug selinux test unwind
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/libunwind )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2 mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-4.debian.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9950486994f9cd97d9e6cb7ab9c8414
+_md5_=a8fc7beee531c1eedc1589467d51bd4c
diff --git a/metadata/md5-cache/dev-util/lttng-ust-2.8.1 b/metadata/md5-cache/dev-util/lttng-ust-2.8.1
index a680793fd306..22316743c0bb 100644
--- a/metadata/md5-cache/dev-util/lttng-ust-2.8.1
+++ b/metadata/md5-cache/dev-util/lttng-ust-2.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Linux Trace Toolkit - UST library
 EAPI=5
 HOMEPAGE=http://lttng.org
 IUSE=examples
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu
 SLOT=0/2.8
 SRC_URI=http://lttng.org/files/lttng-ust/lttng-ust-2.8.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ffc1cba7ce6bc718905fec44be402f99
+_md5_=77bcfce3835c9618077d92facfce548b
diff --git a/metadata/md5-cache/dev-util/lxqt-build-tools-0.2.0 b/metadata/md5-cache/dev-util/lxqt-build-tools-0.2.0
deleted file mode 100644
index 20832274124f..000000000000
--- a/metadata/md5-cache/dev-util/lxqt-build-tools-0.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt Build tools
-EAPI=6
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-build-tools/0.2.0/lxqt-build-tools-0.2.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=567da0e474ef98a83a60e4d93759dfd7
diff --git a/metadata/md5-cache/dev-util/lxqt-build-tools-0.5.0 b/metadata/md5-cache/dev-util/lxqt-build-tools-0.5.0
index ee8208718f6f..c3a683048005 100644
--- a/metadata/md5-cache/dev-util/lxqt-build-tools-0.5.0
+++ b/metadata/md5-cache/dev-util/lxqt-build-tools-0.5.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5 sys-devel/make >=dev-util/cmake-3.
 DESCRIPTION=LXQt Build tools
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-build-tools/0.5.0/lxqt-build-tools-0.5.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e117978ca7998be569a5eebac5fd8e0a
+_md5_=5b5e157eefe6415d9c71fbf412fa7e9f
diff --git a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0 b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
index c53a92490168..8aea605e2d93 100644
--- a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
+++ b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
@@ -1,13 +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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 callgraph? ( media-gfx/kgraphviewer:5 ) >=dev-qt/qtxmlpatterns-5.9.4: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 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 callgraph? ( media-gfx/kgraphviewer:5 ) >=dev-qt/qtxmlpatterns-5.9.4: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.50.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=Tool visualising massif data
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/content/show.php/Massif+Visualizer?content=122409
 IUSE=+callgraph debug test
 KEYWORDS=~amd64
 LICENSE=|| ( GPL-2 GPL-3 )
-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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 callgraph? ( media-gfx/kgraphviewer: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
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 callgraph? ( media-gfx/kgraphviewer:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/massif-visualizer/0.7.0/src/massif-visualizer-0.7.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab153fd91110f43cc0d34f46fa749cfb
diff --git a/metadata/md5-cache/dev-util/meson-0.48.1 b/metadata/md5-cache/dev-util/meson-0.48.1
new file mode 100644
index 000000000000..9d693f066427
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-0.48.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Open source build system
+EAPI=6
+HOMEPAGE=http://mesonbuild.com/
+IUSE=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 ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.48.1.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2ffb9328c25bc5552e8b674612b35e63
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index 755faf3fa035..39e0b01f114d 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=537ba9add7eefa964abc821417fb38fb
+_md5_=a1602200bb1ca67db05ec77ac164c0b8
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2-r1 b/metadata/md5-cache/dev-util/ninja-1.8.2-r1
index e43842f0a6a0..df6358753e79 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2-r1
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install postinst postrm setup test unpack
+DEFINED_PHASES=compile install postinst postrm setup test
 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
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 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	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=b5a2502f1ff666039bb8b15f1c6f1506
+SRC_URI=https://github.com/Kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=205b76184b8b881ba02c6099ed590e71
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2-r2 b/metadata/md5-cache/dev-util/ninja-1.8.2-r2
new file mode 100644
index 000000000000..779c08b381f7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm setup test
+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.g81279.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=18f0757597bf7a8dbd09d218b8f972f7
diff --git a/metadata/md5-cache/dev-util/perf-4.14.33-r1 b/metadata/md5-cache/dev-util/perf-4.14.33-r1
new file mode 100644
index 000000000000..17ff6b1ed6d1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/perf-4.14.33-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils >=sys-kernel/linux-headers-4.9 dev-util/patchutils sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+DESCRIPTION=Userland tools for Linux Performance Counters
+EAPI=7
+HOMEPAGE=https://perf.wiki.kernel.org/
+IUSE=audit debug +demangle +doc gtk numa perl python slang unwind python_targets_python2_7 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.33.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=83674039c57afaff56908c952fd33c4b
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.3.10 b/metadata/md5-cache/dev-util/pkgconf-1.3.10
index c0e31e7b9587..e6c12509a2bc 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.3.10
+++ b/metadata/md5-cache/dev-util/pkgconf-1.3.10
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=6
 HOMEPAGE=https://github.com/pkgconf/pkgconf
 IUSE=+pkg-config 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.3.10.tar.xz
 _eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3f818b1e7f8aaa788b495b3813cb0d7c
+_md5_=7ddec159af98374a4a237c93e439e621
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.3.7 b/metadata/md5-cache/dev-util/pkgconf-1.3.7
index 9725ab36f798..262676efb3c7 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.3.7
+++ b/metadata/md5-cache/dev-util/pkgconf-1.3.7
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=6
 HOMEPAGE=https://github.com/pkgconf/pkgconf
 IUSE=+pkg-config 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
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.3.7.tar.xz
 _eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1e24e18e5840e67af0352f3ab9c3f4a1
+_md5_=d6c1c5f83089afab8f3800343e5d3770
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.3.90 b/metadata/md5-cache/dev-util/pkgconf-1.3.90
index e95c080fb817..34824cd239c8 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.3.90
+++ b/metadata/md5-cache/dev-util/pkgconf-1.3.90
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=6
 HOMEPAGE=https://github.com/pkgconf/pkgconf
 IUSE=+pkg-config 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.3.90.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5207e95ba194b0dd5cbad6c98dcad214
+_md5_=4495c06c730f14b07ed642480c8023f1
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.4.2 b/metadata/md5-cache/dev-util/pkgconf-1.4.2
index 81a3d2a709cc..0a370d81cd93 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.4.2
+++ b/metadata/md5-cache/dev-util/pkgconf-1.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=6
 HOMEPAGE=https://github.com/pkgconf/pkgconf
 IUSE=+pkg-config 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.4.2.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5786b0dca04f070c9a7f1056ab519486
+_md5_=82ce144863bf1ad9888a9a582771c766
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.5.1 b/metadata/md5-cache/dev-util/pkgconf-1.5.1
index 845e7709a2b5..6a67b5c09e14 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.5.1
+++ b/metadata/md5-cache/dev-util/pkgconf-1.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=6
 HOMEPAGE=https://github.com/pkgconf/pkgconf
 IUSE=+pkg-config 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.5.1.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=df512cb449d7220099d9438005ab3ffd
+_md5_=1948aa63911c57d7c670523cdcd17aa5
diff --git a/metadata/md5-cache/dev-util/pkgconf-9999 b/metadata/md5-cache/dev-util/pkgconf-9999
index 3901b4a31d2e..677fabe20949 100644
--- a/metadata/md5-cache/dev-util/pkgconf-9999
+++ b/metadata/md5-cache/dev-util/pkgconf-9999
@@ -9,4 +9,4 @@ RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pk
 RESTRICT=!test? ( test )
 SLOT=0/3
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=df512cb449d7220099d9438005ab3ffd
+_md5_=1948aa63911c57d7c670523cdcd17aa5
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2018.2.4 b/metadata/md5-cache/dev-util/pycharm-community-2018.2.4
new file mode 100644
index 000000000000..9d66adee419d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-community-2018.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2018.2.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b4d26318673ea6320117067e95f57da5
diff --git a/metadata/md5-cache/dev-util/radare2-2.6.0 b/metadata/md5-cache/dev-util/radare2-2.6.0
deleted file mode 100644
index 2d06254a2ac2..000000000000
--- a/metadata/md5-cache/dev-util/radare2-2.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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 ~x86 ~arm ~arm64
-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.6.0.tar.gz -> radare2-2.6.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=30e0ae7494cb68796826b3344e84b5ec
diff --git a/metadata/md5-cache/dev-util/radare2-2.7.0 b/metadata/md5-cache/dev-util/radare2-2.7.0
deleted file mode 100644
index 24783aea56be..000000000000
--- a/metadata/md5-cache/dev-util/radare2-2.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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 ~x86 ~arm ~arm64
-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.7.0.tar.gz -> radare2-2.7.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=696da5a1e64914a0124604a83a76e9ff
diff --git a/metadata/md5-cache/dev-util/radare2-3.0.0 b/metadata/md5-cache/dev-util/radare2-3.0.0
new file mode 100644
index 000000000000..e1ab7ce56004
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-3.0.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=7
+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/3.0.0.tar.gz -> radare2-3.0.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0b9fbd1ccdae37bb924c92028dd7a373
diff --git a/metadata/md5-cache/dev-util/radare2-3.0.1 b/metadata/md5-cache/dev-util/radare2-3.0.1
new file mode 100644
index 000000000000..58f4486dce1d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-3.0.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=7
+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/3.0.1.tar.gz -> radare2-3.0.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0b9fbd1ccdae37bb924c92028dd7a373
diff --git a/metadata/md5-cache/dev-util/radare2-9999 b/metadata/md5-cache/dev-util/radare2-9999
index 467f5adfb0ba..b05f659372e4 100644
--- a/metadata/md5-cache/dev-util/radare2-9999
+++ b/metadata/md5-cache/dev-util/radare2-9999
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install unpack
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-capstone? ( dev-libs/capstone:0= ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-capstone? ( dev-libs/capstone:0= )
 DESCRIPTION=unix-like reverse engineering framework and commandline tools
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.radare.org
 IUSE=ssl libressl +system-capstone
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-capstone? ( dev-libs/capstone:0= )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c955d70dd15626dd5691dbccbf3d7ee
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=700506a4b00b9d11fce8c6be8f264e99
diff --git a/metadata/md5-cache/dev-util/re2c-1.0.3 b/metadata/md5-cache/dev-util/re2c-1.0.3
index ae32edfe697f..e443720ed67a 100644
--- a/metadata/md5-cache/dev-util/re2c-1.0.3
+++ b/metadata/md5-cache/dev-util/re2c-1.0.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=tool for generating C-based recognizers from regular expressions
 EAPI=6
 HOMEPAGE=http://re2c.org/
-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 ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/skvadrik/re2c/releases/download/1.0.3/re2c-1.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cc4ee9ee1c27e505bf5a79d98e09770
+_md5_=533694047807f458f2356cfe5edbee4c
diff --git a/metadata/md5-cache/dev-util/rustfmt-0.8.6 b/metadata/md5-cache/dev-util/rustfmt-0.8.6
index fe869647746e..67d3eaa6df03 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
+DEPEND=>=dev-lang/rust-1.8.0 virtual/cargo
 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	da08619f6c16047185d20223904c8aef	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=11e063e6ef6c1bbc9f53047fcc5cf7da
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2018.4 b/metadata/md5-cache/dev-util/spirv-tools-2018.4
index 9cb4a93ced70..9273df1f6528 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-2018.4
+++ b/metadata/md5-cache/dev-util/spirv-tools-2018.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2018.4.tar.gz -> spirv-tools-2018.4.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5d430708c302c66d066488274ff9dc8c
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e63bd8fe0463a39e1ac4e464387dbaca
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2018.5 b/metadata/md5-cache/dev-util/spirv-tools-2018.5
index b1bf1411c13e..bd8819124b4d 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-2018.5
+++ b/metadata/md5-cache/dev-util/spirv-tools-2018.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2018.5.tar.gz -> spirv-tools-2018.5.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=25ed55b9ff066615c1a5d80222e91024
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ebdf73b80f5a3b70e82bdd5405aae65a
diff --git a/metadata/md5-cache/dev-util/spirv-tools-9999 b/metadata/md5-cache/dev-util/spirv-tools-9999
index 3b1b7c635090..b3d44439a48f 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-9999
+++ b/metadata/md5-cache/dev-util/spirv-tools-9999
@@ -7,5 +7,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=54310063b3cd50cca416fae568844fc0
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1da728ef6a8b737fa4bbb89e3236adcb
diff --git a/metadata/md5-cache/dev-util/squashdelta-0.1 b/metadata/md5-cache/dev-util/squashdelta-0.1
deleted file mode 100644
index e06bd9e4819c..000000000000
--- a/metadata/md5-cache/dev-util/squashdelta-0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=lz4? ( app-arch/lz4:0= ) lzo? ( dev-libs/lzo:2= ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Efficient (partially uncompressed) SquashFS binary delta tool
-EAPI=5
-HOMEPAGE=https://github.com/mgorny/squashdelta/
-IUSE=lz4 +lzo
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD public-domain
-RDEPEND=lz4? ( app-arch/lz4:0= ) lzo? ( dev-libs/lzo:2= ) dev-util/xdelta:3
-REQUIRED_USE=|| ( lz4 lzo )
-SLOT=0
-SRC_URI=https://www.github.com/mgorny/squashdelta/releases/download/v0.1/squashdelta-0.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95a15d3d19d1ee717274f97f15566265
diff --git a/metadata/md5-cache/dev-util/strace-4.23-r1 b/metadata/md5-cache/dev-util/strace-4.23-r1
index 0efe8079bf92..5743cb1a469b 100644
--- a/metadata/md5-cache/dev-util/strace-4.23-r1
+++ b/metadata/md5-cache/dev-util/strace-4.23-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=6
 HOMEPAGE=https://strace.io/
 IUSE=aio perl static unwind elfutils
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v4.23/strace-4.23.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0fdadeb064cceaf833324c62cf4a6c54
+_md5_=63e84bb771ee7cbc2f5d80a33bdeb4f7
diff --git a/metadata/md5-cache/dev-util/sysdig-0.23.1 b/metadata/md5-cache/dev-util/sysdig-0.23.1
deleted file mode 100644
index 822439c1901a..000000000000
--- a/metadata/md5-cache/dev-util/sysdig-0.23.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=app-misc/jq:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=A system exploration and troubleshooting tool
-EAPI=6
-HOMEPAGE=https://www.sysdig.org/
-IUSE=libressl +modules kernel_linux kernel_linux modules
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/jq:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=https://github.com/draios/sysdig/archive/0.23.1.tar.gz -> sysdig-0.23.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d004f38055e6bfdc9a162fd348936d3
diff --git a/metadata/md5-cache/dev-util/sysdig-0.24.0 b/metadata/md5-cache/dev-util/sysdig-0.24.0
deleted file mode 100644
index 471fd3bfdbe4..000000000000
--- a/metadata/md5-cache/dev-util/sysdig-0.24.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=A system exploration and troubleshooting tool
-EAPI=6
-HOMEPAGE=https://www.sysdig.org/
-IUSE=libressl +modules kernel_linux kernel_linux modules
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 modules? ( || ( MIT GPL-2 ) )
-RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=https://github.com/draios/sysdig/archive/0.24.0.tar.gz -> sysdig-0.24.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0f7945b6609aaa7b0c534c302fbcc027
diff --git a/metadata/md5-cache/dev-util/trinity-1.8 b/metadata/md5-cache/dev-util/trinity-1.8
index 7da5080fe234..0c750394670a 100644
--- a/metadata/md5-cache/dev-util/trinity-1.8
+++ b/metadata/md5-cache/dev-util/trinity-1.8
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install
-DEPEND=app-arch/xz-utils >=sys-kernel/linux-headers-4.8
+DEPEND=>=sys-kernel/linux-headers-4.8
 DESCRIPTION=A Linux system call fuzz tester
-EAPI=6
+EAPI=7
 HOMEPAGE=http://codemonkey.org.uk/projects/trinity/
 IUSE=examples
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://codemonkey.org.uk/projects/trinity/trinity-1.8.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=14e26b0795f71e2f62b205debbe46dc0
+_md5_=8755f434e4b58a102a01afe1f9372e49
diff --git a/metadata/md5-cache/dev-util/trinity-9999 b/metadata/md5-cache/dev-util/trinity-9999
index 619062cabaa3..3ed98d4d6c4a 100644
--- a/metadata/md5-cache/dev-util/trinity-9999
+++ b/metadata/md5-cache/dev-util/trinity-9999
@@ -1,10 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=sys-kernel/linux-headers >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=sys-kernel/linux-headers
 DESCRIPTION=A Linux system call fuzz tester
-EAPI=6
+EAPI=7
 HOMEPAGE=http://codemonkey.org.uk/projects/trinity/ https://github.com/kernelslacker/trinity/
 IUSE=examples
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=cd7efeea84f6cdfcabc40c8fd61e139c
+_md5_=21d5d2e0a3642e4be74c0cde55ed7f5a
diff --git a/metadata/md5-cache/dev-util/valgrind-3.14.0 b/metadata/md5-cache/dev-util/valgrind-3.14.0
new file mode 100644
index 000000000000..b83bf9e0e1d7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/valgrind-3.14.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=mpi? ( virtual/mpi ) >=app-portage/elt-patches-20170815 !<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 open-source memory debugger for GNU/Linux
+EAPI=6
+HOMEPAGE=http://www.valgrind.org
+IUSE=mpi
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.14.0.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=767d7745d1bf30c060993e83865a24d7
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.1.77.0-r2 b/metadata/md5-cache/dev-util/vulkan-tools-1.1.77.0-r2
index f09f1b1c40de..96e4dce10936 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.1.77.0-r2
+++ b/metadata/md5-cache/dev-util/vulkan-tools-1.1.77.0-r2
@@ -10,5 +10,5 @@ RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 REQUIRED_USE=|| ( X wayland ) vulkaninfo? ( X )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/384fff68c802a10b5d7f4f352a4bb43b3efe5f23.tar.gz -> vulkan-tools-1.1.77.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fbf0f256f5f8d01174f719dd22df935e
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.1.82.0 b/metadata/md5-cache/dev-util/vulkan-tools-1.1.82.0
index c2d858790ddb..6fd6b2a504a0 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.1.82.0
+++ b/metadata/md5-cache/dev-util/vulkan-tools-1.1.82.0
@@ -10,5 +10,5 @@ RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 REQUIRED_USE=|| ( X wayland ) vulkaninfo? ( X )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/2cfddd146d666efe0ed06ef1d2bc5565821df144.tar.gz -> vulkan-tools-1.1.82.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b48d20d7dfd576c9a58792a40c1d811
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-9999 b/metadata/md5-cache/dev-util/vulkan-tools-9999
index 124a37e68e2f..9dc31efc472c 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-9999
+++ b/metadata/md5-cache/dev-util/vulkan-tools-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 REQUIRED_USE=|| ( X wayland ) vulkaninfo? ( X )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b48d20d7dfd576c9a58792a40c1d811
diff --git a/metadata/md5-cache/dev-util/webstorm-10.0.4.141.1550 b/metadata/md5-cache/dev-util/webstorm-10.0.4.141.1550
deleted file mode 100644
index 9830efd20806..000000000000
--- a/metadata/md5-cache/dev-util/webstorm-10.0.4.141.1550
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=JavaScript IDE for client- and server-side development with Node.js
-EAPI=5
-HOMEPAGE=http://www.jetbrains.com/webstorm
-KEYWORDS=~amd64 ~x86
-LICENSE=WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal
-RDEPEND=>=virtual/jdk-1.7
-SLOT=10
-SRC_URI=http://download.jetbrains.com/webstorm/WebStorm-10.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=60c12d345bc2bb0c2873b90e8979b443
diff --git a/metadata/md5-cache/dev-util/webstorm-2016.2.2.162.1628.41 b/metadata/md5-cache/dev-util/webstorm-2016.2.2.162.1628.41
deleted file mode 100644
index 3d4453a2370b..000000000000
--- a/metadata/md5-cache/dev-util/webstorm-2016.2.2.162.1628.41
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=JavaScript IDE for client- and server-side development with Node.js
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/webstorm
-KEYWORDS=~amd64 ~x86
-LICENSE=WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal
-RDEPEND=>=virtual/jdk-1.7
-SLOT=2016
-SRC_URI=http://download.jetbrains.com/webstorm/WebStorm-2016.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c405e381d84de01a79f0c48bbe6bb333
diff --git a/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35 b/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35
index 0c324a59b1da..878314542250 100644
--- a/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35
+++ b/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35
@@ -5,7 +5,8 @@ HOMEPAGE=http://www.jetbrains.com/webstorm
 KEYWORDS=~amd64 ~x86
 LICENSE=WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal
 RDEPEND=>=virtual/jdk-1.7
+RESTRICT=splitdebug
 SLOT=2017
 SRC_URI=http://download.jetbrains.com/webstorm/WebStorm-2017.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=53e70f6d86c77f59936239036c24bdaf
+_md5_=92004403e72e361f21b66fd1faf3b601
diff --git a/metadata/md5-cache/dev-util/wsta-0.5.0 b/metadata/md5-cache/dev-util/wsta-0.5.0
index e031123d657b..b33eb7ac3b19 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
+DEPEND=dev-libs/openssl:* virtual/rust virtual/cargo
 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	da08619f6c16047185d20223904c8aef	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=3f1d4bd47139b20a9acf60d5bcef8958
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 7133939f24d3..cf838551b1f0 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/cvs-fast-export-1.26 b/metadata/md5-cache/dev-vcs/cvs-fast-export-1.26
deleted file mode 100644
index 072c7f0102e5..000000000000
--- a/metadata/md5-cache/dev-vcs/cvs-fast-export-1.26
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-text/asciidoc
-DESCRIPTION=fast-export history from a CVS repository or RCS collection
-EAPI=5
-HOMEPAGE=http://www.catb.org/~esr/cvs-fast-export/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.26.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9d98f3570033e2bc5160694c1c4da990
diff --git a/metadata/md5-cache/dev-vcs/cvs-fast-export-1.44 b/metadata/md5-cache/dev-vcs/cvs-fast-export-1.44
new file mode 100644
index 000000000000..b21ad4e1730b
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/cvs-fast-export-1.44
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-text/asciidoc
+DESCRIPTION=fast-export history from a CVS repository or RCS collection
+EAPI=7
+HOMEPAGE=http://www.catb.org/~esr/cvs-fast-export/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.44.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6ee3676ee4c2d600239e6c0f28aaa801
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.4 b/metadata/md5-cache/dev-vcs/fossil-2.4
deleted file mode 100644
index f3bbe0a587f8..000000000000
--- a/metadata/md5-cache/dev-vcs/fossil-2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.20.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
-DESCRIPTION=Simple, high-reliability, source control management, and more
-EAPI=6
-HOMEPAGE=http://www.fossil-scm.org/
-IUSE=debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static tcl tcl-stubs -tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.20.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=ssl? ( !miniz )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.fossil-scm.org/index.html/uv/fossil-src-2.4.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a1c76db9a7d50900bd07cddf8309a859
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.5 b/metadata/md5-cache/dev-vcs/fossil-2.5
deleted file mode 100644
index 27e19862bb69..000000000000
--- a/metadata/md5-cache/dev-vcs/fossil-2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.22.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
-DESCRIPTION=Simple, high-reliability, source control management, and more
-EAPI=6
-HOMEPAGE=http://www.fossil-scm.org/
-IUSE=debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.22.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=ssl? ( !miniz )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.fossil-scm.org/index.html/uv/fossil-src-2.5.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5f96f0a10049d077b6dfb23262443def
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.7 b/metadata/md5-cache/dev-vcs/fossil-2.7
new file mode 100644
index 000000000000..d38a85a1c237
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/fossil-2.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.25.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
+DESCRIPTION=Simple, high-reliability, source control management, and more
+EAPI=6
+HOMEPAGE=http://www.fossil-scm.org/
+IUSE=debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.25.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=ssl? ( !miniz )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.fossil-scm.org/index.html/uv/fossil-src-2.7.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=66e6b1320f6de692738c64a8f767e030
diff --git a/metadata/md5-cache/dev-vcs/git-2.18.1 b/metadata/md5-cache/dev-vcs/git-2.18.1
index 34cb5209664c..04832c7f9b3c 100644
--- a/metadata/md5-cache/dev-vcs/git-2.18.1
+++ b/metadata/md5-cache/dev-vcs/git-2.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.18.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.18.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.18.1.tar.xz )
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ee3dc0022660be32d881668422755f4
+_md5_=eb46a8ea0fd84eb8cc442e48a7a109e0
diff --git a/metadata/md5-cache/dev-vcs/guilt-0.36-r1 b/metadata/md5-cache/dev-vcs/guilt-0.36-r1
new file mode 100644
index 000000000000..9e3ba429a7dd
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/guilt-0.36-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-vcs/git app-text/asciidoc app-text/xmlto dev-lang/perl
+DESCRIPTION=A series of bash scripts which add a quilt-like interface to git
+EAPI=7
+HOMEPAGE=http://repo.or.cz/w/guilt.git
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-vcs/git
+RESTRICT=test
+SLOT=0
+SRC_URI=http://repo.or.cz/w/guilt.git/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz -> guilt-0.36.tar.gz
+_md5_=c0fd856fd14e8c5cb1e720d26a3d2a22
diff --git a/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5 b/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5
deleted file mode 100644
index 9b3ad5deb173..000000000000
--- a/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[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=hgsubversion is a Mercurial extension for working with Subversion repositories
-EAPI=5
-HOMEPAGE=https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/subvertpy-0.7.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/subversion-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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgsubversion/hgsubversion-1.8.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6e0012e822edba461d789de4f11af00e
diff --git a/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2 b/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2
new file mode 100644
index 000000000000..665c3f1ec107
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2
@@ -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=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=hgsubversion is a Mercurial extension for working with Subversion repositories
+EAPI=7
+HOMEPAGE=https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/subvertpy-0.7.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/subversion-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_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hgsubversion/hgsubversion-1.9.2.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e47cbbb870558cb71e91ae31ec76a69c
diff --git a/metadata/md5-cache/dev-vcs/hgsubversion-9999 b/metadata/md5-cache/dev-vcs/hgsubversion-9999
deleted file mode 100644
index 7f3e2e90067f..000000000000
--- a/metadata/md5-cache/dev-vcs/hgsubversion-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[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(-)] dev-vcs/mercurial
-DESCRIPTION=hgsubversion is a Mercurial extension for working with Subversion repositories
-EAPI=5
-HOMEPAGE=https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/
-IUSE=test python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/subvertpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/subversion-1.5[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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4224c9039e85ced2ca3b171f5a7e41ba
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
index b932350622fd..3aaa92aaac19 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
+++ b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
@@ -1,13 +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/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/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/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion 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
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A frontend to the subversion vcs
 EAPI=6
 HOMEPAGE=https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git
 IUSE=+man debug +handbook
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-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/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/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion !dev-vcs/kdesvn:4 !kde-apps/kdesdk-kioslaves:4[subversion(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion !dev-vcs/kdesvn:4 !kde-apps/kdesdk-kioslaves:4[subversion(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdesvn/2.0.0/kdesvn-2.0.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa68c1865ae469db6efb3c7a90da5a02
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.7 b/metadata/md5-cache/dev-vcs/mercurial-4.7
deleted file mode 100644
index 2bc36274f09b..000000000000
--- a/metadata/md5-cache/dev-vcs/mercurial-4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Scalable distributed SCM
-EAPI=6
-HOMEPAGE=https://www.mercurial-scm.org/
-IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.7.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c356aa3c4f8373bfb62cc5616b6d5b72
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.7.1-r1 b/metadata/md5-cache/dev-vcs/mercurial-4.7.1-r1
index 8dd1ab45cf02..7712d04834b6 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.7.1-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable distributed SCM
 EAPI=6
 HOMEPAGE=https://www.mercurial-scm.org/
 IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~mips ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.7.1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=607673b7045597b1f4d0175ff6c1b3dc
+_md5_=0c1311887f25f222f60464135e45f46f
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.7.2 b/metadata/md5-cache/dev-vcs/mercurial-4.7.2
new file mode 100644
index 000000000000..c1cd84e7076c
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Scalable distributed SCM
+EAPI=6
+HOMEPAGE=https://www.mercurial-scm.org/
+IUSE=bugzilla emacs gpg test tk python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~ia64 ~mips ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.7.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fea98c0464fe365cf0475f0195284ed7
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.10.0 b/metadata/md5-cache/dev-vcs/subversion-1.10.0
deleted file mode 100644
index 9e1697db0d66..000000000000
--- a/metadata/md5-cache/dev-vcs/subversion-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Advanced version control system
-EAPI=6
-HOMEPAGE=https://subversion.apache.org/
-IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
-SLOT=0
-SRC_URI=mirror://apache/subversion/subversion-1.10.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ffa3f1368904a645138310c99c5f08c4
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.10.2 b/metadata/md5-cache/dev-vcs/subversion-1.10.2
index b8b9e2cb4b72..1fb008a96d88 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.10.2
+++ b/metadata/md5-cache/dev-vcs/subversion-1.10.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Advanced version control system
 EAPI=6
 HOMEPAGE=https://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.10.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c053e33fb5efba0a1ba8ded9f90ce1b1
+_md5_=0085aabbbdef8693034da64720ec54f3
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.10.3 b/metadata/md5-cache/dev-vcs/subversion-1.10.3
new file mode 100644
index 000000000000..b3eeb66a5611
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/subversion-1.10.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Advanced version control system
+EAPI=6
+HOMEPAGE=https://subversion.apache.org/
+IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Subversion GPL-2
+RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
+SLOT=0
+SRC_URI=mirror://apache/subversion/subversion-1.10.3.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=58c1c08c12391a19a309282cf2286045
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.11.0_rc2 b/metadata/md5-cache/dev-vcs/subversion-1.11.0_rc2
new file mode 100644
index 000000000000..b42b3708e6b1
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/subversion-1.11.0_rc2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Advanced version control system
+EAPI=6
+HOMEPAGE=https://subversion.apache.org/
+IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
+LICENSE=Subversion GPL-2
+RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
+SLOT=0
+SRC_URI=mirror://apache/subversion/subversion-1.11.0-rc2.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c98501c5fbd3e95b91a396ccb62d6592
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 1be3e3715bd6..70fa4ec03732 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/performous-1.1-r1 b/metadata/md5-cache/games-arcade/performous-1.1-r1
index 9220bbc059db..1ac0fa231343 100644
--- a/metadata/md5-cache/games-arcade/performous-1.1-r1
+++ b/metadata/md5-cache/games-arcade/performous-1.1-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 media-libs/portaudio dev-libs/boost[threads(+)] dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/imagemagick:0= virtual/jpeg:0 media-libs/libpng:0= media-libs/libsdl2[joystick,video] virtual/ffmpeg virtual/opengl virtual/glu sys-libs/zlib virtual/libintl x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango media-libs/libepoxy midi? ( media-libs/portmidi ) webcam? ( media-libs/opencv ) sys-apps/help2man sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost[threads(+)] dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/imagemagick:0= media-libs/libepoxy media-libs/libpng:0= media-libs/libsdl2[joystick,video] media-libs/portaudio sys-libs/zlib virtual/ffmpeg virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango midi? ( media-libs/portmidi ) webcam? ( media-libs/opencv ) sys-apps/help2man sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=SingStar GPL clone
-EAPI=5
+EAPI=6
 HOMEPAGE=https://performous.org/
 IUSE=midi songs tools webcam
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 media-libs/portaudio dev-libs/boost[threads(+)] dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/imagemagick:0= virtual/jpeg:0 media-libs/libpng:0= media-libs/libsdl2[joystick,video] virtual/ffmpeg virtual/opengl virtual/glu sys-libs/zlib virtual/libintl x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango media-libs/libepoxy midi? ( media-libs/portmidi ) webcam? ( media-libs/opencv )
+RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost[threads(+)] dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/imagemagick:0= media-libs/libepoxy media-libs/libpng:0= media-libs/libsdl2[joystick,video] media-libs/portaudio sys-libs/zlib virtual/ffmpeg virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango midi? ( media-libs/portmidi ) webcam? ( media-libs/opencv )
 SLOT=0
 SRC_URI=https://github.com/performous/performous/archive/1.1.tar.gz -> performous-1.1.tar.gz songs? ( mirror://sourceforge/performous/ultrastar-songs-restricted-3.zip mirror://sourceforge/performous/ultrastar-songs-jc-1.zip mirror://sourceforge/performous/ultrastar-songs-libre-3.zip mirror://sourceforge/performous/ultrastar-songs-shearer-1.zip )
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b31decb7328166c2b60f0cfc2acf01c0
+_md5_=90a6cc262d11359e5fde6e163d4935a1
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index dc165bc09b4c..12c83e644ebe 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/knights-2.6.0_pre20180415 b/metadata/md5-cache/games-board/knights-2.6.0_pre20180415
index ea6b904354a5..0429ad18056d 100644
--- a/metadata/md5-cache/games-board/knights-2.6.0_pre20180415
+++ b/metadata/md5-cache/games-board/knights-2.6.0_pre20180415
@@ -1,13 +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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-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-apps/libkdegames-17.12.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-5.9.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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kplotting-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Simple chess board based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/content/show.php/Knights?content=122046
 IUSE=speech debug +handbook selinux
 KEYWORDS=~amd64 ~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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-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-apps/libkdegames-17.12.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !games-board/knights:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kplotting-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !games-board/knights:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/KDE/knights/archive/56762d582d8a8543f50c293ff54d5ac5e546c2d9.tar.gz -> knights-2.6.0_pre20180415.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=99bcd6afb3a63fe5d4ca0691ff7321f4
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 09d61a92f9c4..47d78c2229bf 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/odamex-0.7.0-r1 b/metadata/md5-cache/games-engines/odamex-0.7.0-r1
index 8e932122bde7..3c9ee7a66fff 100644
--- a/metadata/md5-cache/games-engines/odamex-0.7.0-r1
+++ b/metadata/md5-cache/games-engines/odamex-0.7.0-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dedicated? ( >=net-libs/miniupnpc-1.8:0= ) !dedicated? ( media-libs/libpng:0= >=media-libs/libsdl-1.2.9[X,sound,joystick,video] >=media-libs/sdl-mixer-1.2.6 odalaunch? ( x11-libs/wxGTK:3.0[X] ) portmidi? ( media-libs/portmidi ) server? ( >=net-libs/miniupnpc-1.8:0= ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=An online multiplayer, free software engine for Doom and Doom II
-EAPI=5
-HOMEPAGE=http://odamex.net/
-IUSE=dedicated +odalaunch master portmidi server
+DESCRIPTION=Online multiplayer, free software engine for Doom and Doom II
+EAPI=6
+HOMEPAGE=https://odamex.net/
+IUSE=dedicated master +odalaunch portmidi server
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dedicated? ( >=net-libs/miniupnpc-1.8:0= ) !dedicated? ( media-libs/libpng:0= >=media-libs/libsdl-1.2.9[X,sound,joystick,video] >=media-libs/sdl-mixer-1.2.6 odalaunch? ( x11-libs/wxGTK:3.0[X] ) portmidi? ( media-libs/portmidi ) server? ( >=net-libs/miniupnpc-1.8:0= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/odamex/Odamex/0.7.0/odamex-src-0.7.0.tar.bz2
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=87c82efad1861e7139cf1eba90da1366
+_md5_=3ceb448226a3e8112e2917e054d95d1b
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index f176408afbf8..c130dc946d1e 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-20181010.7067 b/metadata/md5-cache/games-fps/eduke32-20181010.7067
new file mode 100644
index 000000000000..35abf4d981f9
--- /dev/null
+++ b/metadata/md5-cache/games-fps/eduke32-20181010.7067
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm test 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/20181010-7067/eduke32_src_20181010-7067.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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cc41d08587b86dd70f017ba154a08a77
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180627 b/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180627
deleted file mode 100644
index ae64a4d73e8f..000000000000
--- a/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180627
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm pretend
-DEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.4 sys-libs/zlib:=[minizip] virtual/jpeg:0
-DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
-EAPI=6
-HOMEPAGE=https://urbanterror.info https://github.com/mickael9/ioq3
-IUSE=+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.4 sys-libs/zlib:=[minizip] virtual/jpeg:0
-REQUIRED_USE=|| ( client server ) voip? ( opus )
-SLOT=0
-SRC_URI=https://github.com/mickael9/ioq3/archive/e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64.tar.gz -> urbanterror-4.3.4_p20180627.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=79e7cf19aff009c8eb61bec007ad93e8
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180708 b/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180708
new file mode 100644
index 000000000000..d146ae62d6b4
--- /dev/null
+++ b/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180708
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm pretend
+DEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.4 sys-libs/zlib:=[minizip] virtual/jpeg:0
+DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
+EAPI=7
+HOMEPAGE=https://urbanterror.info https://github.com/mickael9/ioq3
+IUSE=+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.4 sys-libs/zlib:=[minizip] virtual/jpeg:0
+REQUIRED_USE=|| ( client server ) voip? ( opus )
+SLOT=0
+SRC_URI=https://github.com/mickael9/ioq3/archive/167cb6b611ad27f30787a2fe204a7c65ec1fa18e.tar.gz -> urbanterror-4.3.4_p20180708.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0c47d665b85040bbf4328f6ac8d3da16
diff --git a/metadata/md5-cache/games-kids/Manifest.gz b/metadata/md5-cache/games-kids/Manifest.gz
index 0f77fe50a3bc..991171265ad9 100644
--- a/metadata/md5-cache/games-kids/Manifest.gz
+++ b/metadata/md5-cache/games-kids/Manifest.gz
diff --git a/metadata/md5-cache/games-kids/gcompris-0.91 b/metadata/md5-cache/games-kids/gcompris-0.91
new file mode 100644
index 000000000000..b8aba0aefb9c
--- /dev/null
+++ b/metadata/md5-cache/games-kids/gcompris-0.91
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore dev-qt/qtgraphicaleffects dev-qt/qtgui dev-qt/qtmultimedia[qml] dev-qt/qtnetwork dev-qt/qtquickcontrols dev-qt/qtsensors[qml] dev-qt/qtsvg dev-qt/qtxml dev-qt/qtxmlpatterns dev-qt/linguist-tools sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=full featured educational application for children from 2 to 10
+EAPI=6
+HOMEPAGE=https://gcompris.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore dev-qt/qtgraphicaleffects dev-qt/qtgui dev-qt/qtmultimedia[qml] dev-qt/qtnetwork dev-qt/qtquickcontrols dev-qt/qtsensors[qml] dev-qt/qtsvg dev-qt/qtxml dev-qt/qtxmlpatterns
+SLOT=0
+SRC_URI=http://gcompris.net/download/qt/src/gcompris-qt-0.91.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ee9cb7393975d955700a138f5d037273
diff --git a/metadata/md5-cache/games-kids/gcompris-15.10-r1 b/metadata/md5-cache/games-kids/gcompris-15.10-r1
deleted file mode 100644
index e42610e5c81c..000000000000
--- a/metadata/md5-cache/games-kids/gcompris-15.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk(+)] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) !gstreamer? ( media-libs/sdl-mixer media-libs/libsdl:0 ) dev-db/sqlite:3 dev-libs/libxml2 dev-libs/popt dev-python/pygtk[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(+)] virtual/libintl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,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(+)] app-text/texi2html dev-perl/XML-Parser gnome-base/gnome-common sys-apps/texinfo sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=full featured educational application for children from 2 to 10
-EAPI=6
-HOMEPAGE=http://gcompris.net/
-IUSE=gstreamer python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk(+)] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) !gstreamer? ( media-libs/sdl-mixer media-libs/libsdl:0 ) dev-db/sqlite:3 dev-libs/libxml2 dev-libs/popt dev-python/pygtk[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(+)] virtual/libintl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,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(+)] media-gfx/tuxpaint sci-electronics/gnucap
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://gcompris.net/download/gcompris-15.10.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9fa68d659683d60fc44dd84bcdb3772e
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 4c25fe48f349..45e98d88eede 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/ksokoban-0.5.0_pre20170827 b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20170827
index c742c7c768f0..c8d62a9c16b2 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20170827
+++ b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20170827
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=The japanese warehouse keeper game
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/ksokoban.git
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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
+RDEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=0
 SRC_URI=https://github.com/KDE/ksokoban/archive/048b42324ef6dac807af4351174065cda2f32f44.tar.gz -> ksokoban-0.5.0_pre20170827.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a0641f5c81a35102f210b8c1bc6e0492
diff --git a/metadata/md5-cache/games-puzzle/ksokoban-9999 b/metadata/md5-cache/games-puzzle/ksokoban-9999
index e3e2cccd287f..3b41eb40ef77 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-9999
+++ b/metadata/md5-cache/games-puzzle/ksokoban-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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 >=dev-vcs/git-1.8.2.1[curl] >=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
+DEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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 >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils
 DESCRIPTION=The japanese warehouse keeper game
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/ksokoban.git
 IUSE=debug +handbook
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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
+RDEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0cad6e6b2cf80cfe9e8f451bb3b0105c
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index a5969361147a..d7bdcd3e812c 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/arx-fatalis-data-1.21-r4 b/metadata/md5-cache/games-rpg/arx-fatalis-data-1.21-r4
index f8727d18c982..76084b325139 100644
--- a/metadata/md5-cache/games-rpg/arx-fatalis-data-1.21-r4
+++ b/metadata/md5-cache/games-rpg/arx-fatalis-data-1.21-r4
@@ -11,6 +11,6 @@ RDEPEND=games-rpg/arx-libertatis
 REQUIRED_USE=^^ ( cdinstall gog )
 RESTRICT=binchecks mirror gog? ( fetch )
 SLOT=0
-SRC_URI=cdinstall? ( http://download.zenimax.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe ) gog? ( setup_arx_fatalis_2.0.0.7.exe )
+SRC_URI=cdinstall? ( https://cdn.bethsoft.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe ) gog? ( setup_arx_fatalis_2.0.0.7.exe )
 _eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=58ce7c26e30b70096fffb5dc61ffa0ee
+_md5_=8a9f8053f97950ecf06f839511d311d3
diff --git a/metadata/md5-cache/games-rpg/arx-fatalis-demo-0 b/metadata/md5-cache/games-rpg/arx-fatalis-demo-0
deleted file mode 100644
index 4be801339269..000000000000
--- a/metadata/md5-cache/games-rpg/arx-fatalis-demo-0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DEPEND=app-arch/cabextract app-arch/unzip
-DESCRIPTION=Arx Fatalis demo
-EAPI=4
-HOMEPAGE=https://www.arkane-studios.com/uk/arx.php
-KEYWORDS=~amd64 ~x86
-LICENSE=ArxFatalisDemo
-RDEPEND=games-rpg/arx-libertatis games-misc/games-envd
-RESTRICT=fetch
-SLOT=0
-SRC_URI=arx_demo_english.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c4e62dc54be25cd597cd6cabb75b6dcd
diff --git a/metadata/md5-cache/games-rpg/arx-fatalis-demo-0-r1 b/metadata/md5-cache/games-rpg/arx-fatalis-demo-0-r1
new file mode 100644
index 000000000000..fee7bedb60ac
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/arx-fatalis-demo-0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DEPEND=app-arch/cabextract app-arch/unzip
+DESCRIPTION=Arx Fatalis demo
+EAPI=7
+HOMEPAGE=https://www.arkane-studios.com/uk/arx.php
+KEYWORDS=~amd64 ~x86
+LICENSE=ArxFatalisDemo
+RDEPEND=games-rpg/arx-libertatis
+RESTRICT=fetch
+SLOT=0
+SRC_URI=arx_demo_english.zip
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d
+_md5_=c17c2e97869693dc7aace5233643b790
diff --git a/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r1 b/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r1
deleted file mode 100644
index e811a2578c01..000000000000
--- a/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 ) !static? ( media-libs/glew ) dev-libs/boost virtual/pkgconfig static? ( media-libs/glew[static-libs] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Cross-platform port of Arx Fatalis, a first-person role-playing game
-EAPI=5
-HOMEPAGE=http://arx-libertatis.org/
-IUSE=c++0x debug +unity-build crash-reporter static tools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 ) !static? ( media-libs/glew ) crash-reporter? ( sys-devel/gdb ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/arx/arx-libertatis-1.1.2/arx-libertatis-1.1.2.tar.xz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0c5ab8bdff03c9405726e7029f35a503
diff --git a/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r2 b/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r2
new file mode 100644
index 000000000000..eb40a6274e9f
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 ) !static? ( media-libs/glew:= ) dev-libs/boost virtual/pkgconfig static? ( media-libs/glew[static-libs] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Cross-platform port of Arx Fatalis, a first-person role-playing game
+EAPI=6
+HOMEPAGE=https://arx-libertatis.org/
+IUSE=c++0x crash-reporter debug static tools +unity-build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 ) !static? ( media-libs/glew:= ) crash-reporter? ( sys-devel/gdb )
+SLOT=0
+SRC_URI=mirror://sourceforge/arx/arx-libertatis-1.1.2/arx-libertatis-1.1.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9469a36d366006c245541700c6184e52
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 0d29dbf2d629..063c9f374cc2 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/gamemode-1.2 b/metadata/md5-cache/games-util/gamemode-1.2
index 40eb62e5e81d..4885a0df419b 100644
--- a/metadata/md5-cache/games-util/gamemode-1.2
+++ b/metadata/md5-cache/games-util/gamemode-1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst pretend test
-DEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
 DESCRIPTION=Optimise Linux system performance on demand
 EAPI=6
 HOMEPAGE=https://github.com/FeralInteractive/gamemode
 IUSE=abi_x86_32 abi_x86_64
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?]
+RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/FeralInteractive/gamemode/releases/download/1.2/gamemode-1.2.tar.xz
 _eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5a42f94cea49e37d5e5074af0d90e02d
+_md5_=5f90faf8204f60e1c27e14533d03a2a0
diff --git a/metadata/md5-cache/games-util/gamemode-9999 b/metadata/md5-cache/games-util/gamemode-9999
index 9d9bc3879a67..b6ce9f78fb83 100644
--- a/metadata/md5-cache/games-util/gamemode-9999
+++ b/metadata/md5-cache/games-util/gamemode-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst pretend test unpack
-DEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Optimise Linux system performance on demand
 EAPI=6
 HOMEPAGE=https://github.com/FeralInteractive/gamemode
 IUSE=abi_x86_32 abi_x86_64
 LICENSE=BSD
-RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?]
+RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5a42f94cea49e37d5e5074af0d90e02d
+_md5_=5f90faf8204f60e1c27e14533d03a2a0
diff --git a/metadata/md5-cache/games-util/lgogdownloader-3.4 b/metadata/md5-cache/games-util/lgogdownloader-3.4
index 9c18974a3fc2..0d226be25339 100644
--- a/metadata/md5-cache/games-util/lgogdownloader-3.4
+++ b/metadata/md5-cache/games-util/lgogdownloader-3.4
@@ -3,11 +3,10 @@ DEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-
 DESCRIPTION=Unofficial GOG.com downloader for Linux
 EAPI=6
 HOMEPAGE=https://sites.google.com/site/gogdownloader/
-IUSE=+debug
 KEYWORDS=~amd64 ~x86
 LICENSE=WTFPL-2
 RDEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl]
 SLOT=0
 SRC_URI=https://sites.google.com/site/gogdownloader/lgogdownloader-3.4.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3cf1de5cb4e9cfd04f0b336007996085
+_md5_=6f25fad2582b2cbe8922e03def246003
diff --git a/metadata/md5-cache/games-util/lgogdownloader-9999 b/metadata/md5-cache/games-util/lgogdownloader-9999
index d3be378e9a2e..2a11f7ba8740 100644
--- a/metadata/md5-cache/games-util/lgogdownloader-9999
+++ b/metadata/md5-cache/games-util/lgogdownloader-9999
@@ -3,9 +3,8 @@ DEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-
 DESCRIPTION=Unofficial GOG.com downloader for Linux
 EAPI=6
 HOMEPAGE=https://sites.google.com/site/gogdownloader/
-IUSE=+debug
 LICENSE=WTFPL-2
 RDEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl]
 SLOT=0
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=01ee3567b780393911de683735f53d35
+_md5_=987a466c616fb39b1443a9d64affef13
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 1a2f2190c6cc..227423b86406 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/gnome-shell-3.24.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
index d5d1f21b6eb3..68036b39dcaa 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
@@ -4,7 +4,7 @@ DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 IUSE=+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
 RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.47.0 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.24.0:0/0[introspection] >=x11-libs/startup-notification-0.11 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(-)] dev-python/pygobject:3[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-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 dev-libs/libgweather:2[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu >=x11-themes/adwaita-icon-theme-3.19.90 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8f4a23f62fa7b5948a97a9d719b5756d
+_md5_=dd575713021f07a50e1e4f739fe8ede9
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index e421da3921e7..94a765d7a65d 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/chrome-gnome-shell-10 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10
index fe84cd05c183..29ed2c9bd885 100644
--- a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10
+++ b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
 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 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-3+
 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/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(+)?] dev-python/requests[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(+)?] gnome-base/gnome-shell
 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/chrome-gnome-shell/10/chrome-gnome-shell-10.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b746dd79307f2a5ae4d7a67c3dffbed9
+_md5_=b54d5b1f8a2a56e0a0641adaae6ed71a
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-11-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-11-r1
deleted file mode 100644
index be2547d35c07..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=dev-libs/glib:2 virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
-DESCRIPTION=KDE Connect implementation for Gnome Shell
-EAPI=6
-HOMEPAGE=https://github.com/andyholmes/gnome-shell-extension-gsconnect
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 >=gnome-base/gnome-shell-3.24 gnome-base/nautilus[introspection] net-fs/sshfs || ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks ) || ( media-libs/libcanberra media-libs/gsound )
-SLOT=0
-SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v11.tar.gz -> gnome-shell-extension-gsconnect-11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b978a22bc8fb3071708aa4ec37d1c9b0
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12
index 2cacd855cb4c..fd5e6599502c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/meson-0.45.
 DESCRIPTION=KDE Connect implementation for Gnome Shell
 EAPI=6
 HOMEPAGE=https://github.com/andyholmes/gnome-shell-extension-gsconnect
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 >=gnome-base/gnome-shell-3.24 gnome-base/nautilus[introspection] net-fs/sshfs || ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks ) || ( media-libs/libcanberra media-libs/gsound )
 SLOT=0
 SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v12.tar.gz -> gnome-shell-extension-gsconnect-12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9737d14601c929aca834c5e80602a11f
+_md5_=60be2c54253172aeabf39a23e3639277
diff --git a/metadata/md5-cache/gnome-extra/synapse-0.2.99.2 b/metadata/md5-cache/gnome-extra/synapse-0.2.99.2
index fbfee9412134..3052ddd3b2dd 100644
--- a/metadata/md5-cache/gnome-extra/synapse-0.2.99.2
+++ b/metadata/md5-cache/gnome-extra/synapse-0.2.99.2
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libgee:0.8 >=dev-libs/glib-2.28.0:2 dev-libs/json-glib dev-libs
 SLOT=0
 SRC_URI=https://launchpad.net/synapse-project/0.3/0.2.99.2/+download/synapse-0.2.99.2.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=29b7c15a3cd872cdb1941fbb3bb8b71e
+_md5_=850d1e5006ea44d7b357a1d55e8418ac
diff --git a/metadata/md5-cache/gnome-extra/synapse-0.2.99.4 b/metadata/md5-cache/gnome-extra/synapse-0.2.99.4
new file mode 100644
index 000000000000..45e70303d028
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/synapse-0.2.99.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=|| ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.0:3 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme indicator? ( dev-libs/libappindicator:3 ) nls? ( virtual/libintl ) plugins? ( >=net-libs/rest-0.7 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=A program launcher in the style of GNOME Do
+EAPI=6
+HOMEPAGE=https://launchpad.net/synapse-project/
+IUSE=indicator nls plugins
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.0:3 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme indicator? ( dev-libs/libappindicator:3 ) nls? ( virtual/libintl ) plugins? ( >=net-libs/rest-0.7 )
+SLOT=0
+SRC_URI=https://launchpad.net/synapse-project/0.3/0.2.99.4/+download/synapse-0.2.99.4.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d2bc94553fc4e8eee4743a4697af4c5c
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index d9b5eca4968c..88762b69afd5 100644
--- a/metadata/md5-cache/gnustep-apps/Manifest.gz
+++ b/metadata/md5-cache/gnustep-apps/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r4 b/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r4
new file mode 100644
index 000000000000..36526bc5d306
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a free application for drawing & editing pixel-art images
+EAPI=7
+HOMEPAGE=http://twilightedge.com/mac/pikopixel/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9c.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnustep-2	836726825908137cacbf1063f76adb4c	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=474c8ee2a28f497cafac72e92a29eb36
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 3bc8ac3a21aa..4b562ab21eed 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-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-18.04.3
index a99a3133a850..feed2524ed03 100644
--- a/metadata/md5-cache/kde-apps/akonadi-18.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-18.04.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d1662857a64bd827b0e822df0a3e2937
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.08.1 b/metadata/md5-cache/kde-apps/akonadi-18.08.1
deleted file mode 100644
index d5ac3323181b..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-18.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.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.4:5
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akonadi-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.08.2 b/metadata/md5-cache/kde-apps/akonadi-18.08.2
new file mode 100644
index 000000000000..8c0190590816
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-18.08.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.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.4:5
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akonadi-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8ad7e23cb6b054e55f9f765f23f52b52
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.3
index 7cb110218ab2..b2046ca9d889 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-calendar-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e4b40bac490fc7072466ec8964a87d01
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.1
deleted file mode 100644
index 33537e1d74be..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akonadi-calendar-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c50928731851ce14a084e12975333797
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.2 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.2
new file mode 100644
index 000000000000..6574656a0920
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akonadi-calendar-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=21a084e0e669fa665dfd84b3748c6c3d
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.3
index f921b7b1b73e..a8c815f90fb2 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-contacts-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ade248fb8fef8bd199cf53f682a3237
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.1
deleted file mode 100644
index a60208736149..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/prison-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/prison-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akonadi-contacts-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7aaad4610b1b4d0cae66f4a559db7af2
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.2 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.2
new file mode 100644
index 000000000000..ef3150e7d2dd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/prison-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/prison-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akonadi-contacts-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a1ea6376341b1e9cc7f739fd132034cc
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.3
index 85551a31cdc1..e567afdb6c24 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=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/ki18n-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/mailimporter-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-import-wizard-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f57b135c6ee16070c0ff81c4e398e559
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.1
deleted file mode 100644
index 77b28eef165f..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/mailimporter-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/mailimporter-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akonadi-import-wizard-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.2 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.2
new file mode 100644
index 000000000000..bf43e8099ac5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/mailimporter-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/mailimporter-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akonadi-import-wizard-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6019c6eef8bd8dc7c32561aa00cc1df2
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.3
index f22560a4e9b2..f5905cf87a72 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-mime-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4cc9f54331e2d01d608444d56e19702
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.08.1 b/metadata/md5-cache/kde-apps/akonadi-mime-18.08.1
deleted file mode 100644
index 9c69c9bce423..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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=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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akonadi-mime-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8ec7321744d40f46ed40df82a5b5dfc9
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.08.2 b/metadata/md5-cache/kde-apps/akonadi-mime-18.08.2
new file mode 100644
index 000000000000..49209063813d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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=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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akonadi-mime-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d8baaed7916f41dfcca1c8367838b1bc
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.3
index d177d3c13b71..e7ad48199d22 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-notes-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=43d1cdb3f16b94f42a942fef0cdfedce
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.08.1 b/metadata/md5-cache/kde-apps/akonadi-notes-18.08.1
deleted file mode 100644
index b8d3cdd040ac..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-apps/akonadi-18.08.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.49.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=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.49.0:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akonadi-notes-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.08.2 b/metadata/md5-cache/kde-apps/akonadi-notes-18.08.2
new file mode 100644
index 000000000000..7e2e8b880c43
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-apps/akonadi-18.08.2: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.50.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=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.50.0:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akonadi-notes-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d9165a8ec7796b576f09c6896c7181a1
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-search-18.04.3
index c1090083567f..fa1acc019071 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-18.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-search-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-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/kio-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-search-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=09e2c7fd99efb54d970f1f84977d9881
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.08.1 b/metadata/md5-cache/kde-apps/akonadi-search-18.08.1
deleted file mode 100644
index 80947047cee7..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/krunner-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-18.08.1: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.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/krunner-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akonadi-search-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d6a1a367d5ebfa724134134b3c62e845
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.08.2 b/metadata/md5-cache/kde-apps/akonadi-search-18.08.2
new file mode 100644
index 000000000000..f4ce03de446f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-search-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-18.08.2: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.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akonadi-search-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=87b11df9f67e4afaf8475982647129b9
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.3 b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.3
index d005b7fe78ab..ab2f89c107d8 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.3
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.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/kdbusaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadiconsole-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e88300d10bbdfe6cf12544643813a4ac
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.08.1 b/metadata/md5-cache/kde-apps/akonadiconsole-18.08.1
deleted file mode 100644
index 2214c5f5db35..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akonadiconsole-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fcc0069b67079c12d2b96580aee9d23f
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.08.2 b/metadata/md5-cache/kde-apps/akonadiconsole-18.08.2
new file mode 100644
index 000000000000..6c0dbd41e15a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akonadiconsole-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5f270b584b22c96fc757695f82b0a6a6
diff --git a/metadata/md5-cache/kde-apps/akregator-18.04.3 b/metadata/md5-cache/kde-apps/akregator-18.04.3
index 0fcd60734727..65e6c5cb5624 100644
--- a/metadata/md5-cache/kde-apps/akregator-18.04.3
+++ b/metadata/md5-cache/kde-apps/akregator-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=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/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/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-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/kxmlgui-5.46.0:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=kde-apps/syndication-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akregator-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=edf9d8f2080dba19cc49ab9b2fbc9be1
diff --git a/metadata/md5-cache/kde-apps/akregator-18.04.3-r1 b/metadata/md5-cache/kde-apps/akregator-18.04.3-r1
index 05fd5c439b0c..0b63fe5c9d55 100644
--- a/metadata/md5-cache/kde-apps/akregator-18.04.3-r1
+++ b/metadata/md5-cache/kde-apps/akregator-18.04.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=News feed aggregator
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/internet/akregator
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=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/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/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-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/kxmlgui-5.46.0:5 >=kde-frameworks/syndication-5.46.0:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akregator-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d085475d0b1c80c1651b88262c992cad
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e9e7dd400bd327886bfe1286b19e4526
diff --git a/metadata/md5-cache/kde-apps/akregator-18.08.1 b/metadata/md5-cache/kde-apps/akregator-18.08.1
deleted file mode 100644
index 475e53a37918..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/syndication-5.49.0:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/syndication-5.49.0:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akregator-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dd3ceaf1c874cb5df76e6fb55fb0281a
diff --git a/metadata/md5-cache/kde-apps/akregator-18.08.2 b/metadata/md5-cache/kde-apps/akregator-18.08.2
new file mode 100644
index 000000000000..d9ea8d22ba74
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/syndication-5.50.0:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/syndication-5.50.0:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akregator-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3401014199c4f0258ffed2319fa0a0d0
diff --git a/metadata/md5-cache/kde-apps/analitza-18.04.3 b/metadata/md5-cache/kde-apps/analitza-18.04.3
index f96766bea9f9..386c91baedc1 100644
--- a/metadata/md5-cache/kde-apps/analitza-18.04.3
+++ b/metadata/md5-cache/kde-apps/analitza-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/analitza-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=877641783e6e7b8f75eeda0057fd87ad
diff --git a/metadata/md5-cache/kde-apps/analitza-18.08.1 b/metadata/md5-cache/kde-apps/analitza-18.08.1
deleted file mode 100644
index 1b63f2d67e32..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-18.08.1
+++ /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.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-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.49.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=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.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/analitza-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/analitza-18.08.2 b/metadata/md5-cache/kde-apps/analitza-18.08.2
new file mode 100644
index 000000000000..2aecd64727b3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/analitza-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-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.50.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=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.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/analitza-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=823fa2381d67957d68e21e0d3d771cf3
diff --git a/metadata/md5-cache/kde-apps/ark-18.04.3 b/metadata/md5-cache/kde-apps/ark-18.04.3
index a63033915aab..a5bd9e8cd46c 100644
--- a/metadata/md5-cache/kde-apps/ark-18.04.3
+++ b/metadata/md5-cache/kde-apps/ark-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ark-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee9253b597bcf939ff69d2fcaa0d369b
diff --git a/metadata/md5-cache/kde-apps/ark-18.08.1 b/metadata/md5-cache/kde-apps/ark-18.08.1
deleted file mode 100644
index 1ee89f362745..000000000000
--- a/metadata/md5-cache/kde-apps/ark-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpty-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpty-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ark-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e4d9e7790a7de94a5d1eccb833b3c368
diff --git a/metadata/md5-cache/kde-apps/ark-18.08.2 b/metadata/md5-cache/kde-apps/ark-18.08.2
new file mode 100644
index 000000000000..734d8e3c9296
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpty-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpty-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ark-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ddd5e1dbe100790d1390ee33d14b7b5d
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.04.3 b/metadata/md5-cache/kde-apps/artikulate-18.04.3
index f34d72d0deb2..a89048f50ba4 100644
--- a/metadata/md5-cache/kde-apps/artikulate-18.04.3
+++ b/metadata/md5-cache/kde-apps/artikulate-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=k
 REQUIRED_USE=|| ( gstreamer qtmedia )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/artikulate-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78b21b5b2276ac003ae477ba0a9d05da
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.08.1 b/metadata/md5-cache/kde-apps/artikulate-18.08.1
deleted file mode 100644
index 171e2adac3de..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-REQUIRED_USE=|| ( gstreamer qtmedia )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/artikulate-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.08.2 b/metadata/md5-cache/kde-apps/artikulate-18.08.2
new file mode 100644
index 000000000000..ad70c7ea9315
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/artikulate-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+REQUIRED_USE=|| ( gstreamer qtmedia )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/artikulate-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6ef59bd04a7d05b3575950a63c50859c
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.3 b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.3
index 00af7a9916d0..522b933422fe 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.3
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.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/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/libkcddb-18.04.3:5 >=kde-apps/libkcompactdisc-18.04.3:5 >=dev-qt/qtwidgets-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/audiocd-kio-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=87270f26f86e4bd643d4318c3eae05d6
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.08.1 b/metadata/md5-cache/kde-apps/audiocd-kio-18.08.1
deleted file mode 100644
index fab337e8e2a6..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-apps/libkcddb-18.08.1:5 >=kde-apps/libkcompactdisc-18.08.1:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-apps/libkcddb-18.08.1:5 >=kde-apps/libkcompactdisc-18.08.1:5 >=dev-qt/qtwidgets-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/audiocd-kio-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.08.2 b/metadata/md5-cache/kde-apps/audiocd-kio-18.08.2
new file mode 100644
index 000000000000..2d5d4067d385
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-apps/libkcddb-18.08.2:5 >=kde-apps/libkcompactdisc-18.08.2:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-apps/libkcddb-18.08.2:5 >=kde-apps/libkcompactdisc-18.08.2:5 >=dev-qt/qtwidgets-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/audiocd-kio-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=aaaacfafe767bab70e170e9850c4f778
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.3 b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.3
index 521a54ce654b..c50a184cd4f7 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.3
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/baloo-widgets-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=39ff0c9aa5ad956c827e7366b6bbf649
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.08.1 b/metadata/md5-cache/kde-apps/baloo-widgets-18.08.1
deleted file mode 100644
index d9647dedd874..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kfilemetadata-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kfilemetadata-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/baloo-widgets-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.08.2 b/metadata/md5-cache/kde-apps/baloo-widgets-18.08.2
new file mode 100644
index 000000000000..295ecaeb917a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/baloo-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/baloo-widgets-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f4c2553d0b6e9c49efdbc7969e1864d4
diff --git a/metadata/md5-cache/kde-apps/blinken-18.04.3 b/metadata/md5-cache/kde-apps/blinken-18.04.3
index 569061fb441a..78f228733d0a 100644
--- a/metadata/md5-cache/kde-apps/blinken-18.04.3
+++ b/metadata/md5-cache/kde-apps/blinken-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/blinken-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1accc6c87f3d1c860f1d767807dd9be1
diff --git a/metadata/md5-cache/kde-apps/blinken-18.08.1 b/metadata/md5-cache/kde-apps/blinken-18.08.1
deleted file mode 100644
index f7dc56c06fd7..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/blinken-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/blinken-18.08.2 b/metadata/md5-cache/kde-apps/blinken-18.08.2
new file mode 100644
index 000000000000..db9933d4e397
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/blinken-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/blinken-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1abe86e944c428b0494340398e4b5cb6
diff --git a/metadata/md5-cache/kde-apps/bomber-18.04.3 b/metadata/md5-cache/kde-apps/bomber-18.04.3
index 7c32d8977edb..d005fa2524c8 100644
--- a/metadata/md5-cache/kde-apps/bomber-18.04.3
+++ b/metadata/md5-cache/kde-apps/bomber-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/bomber-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb4a130a977f6fc79197786e329c6eb9
diff --git a/metadata/md5-cache/kde-apps/bomber-18.08.1 b/metadata/md5-cache/kde-apps/bomber-18.08.1
deleted file mode 100644
index 499dd66752a7..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/bomber-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bomber-18.08.2 b/metadata/md5-cache/kde-apps/bomber-18.08.2
new file mode 100644
index 000000000000..b00ad0cf8c4b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bomber-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/bomber-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d060584d3205f054e110b70c24223343
diff --git a/metadata/md5-cache/kde-apps/bovo-18.04.3 b/metadata/md5-cache/kde-apps/bovo-18.04.3
index 8ccfadda0d65..6819416f085b 100644
--- a/metadata/md5-cache/kde-apps/bovo-18.04.3
+++ b/metadata/md5-cache/kde-apps/bovo-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/bovo-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7b3a789b91e994385d3b6abfd006ea92
diff --git a/metadata/md5-cache/kde-apps/bovo-18.08.1 b/metadata/md5-cache/kde-apps/bovo-18.08.1
deleted file mode 100644
index 694c9ca50261..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/bovo-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/bovo-18.08.2 b/metadata/md5-cache/kde-apps/bovo-18.08.2
new file mode 100644
index 000000000000..b4853566bd98
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bovo-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/bovo-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=624d7eecd8ed7242f9858f673deeb7a1
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.3 b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.3
index 5eec9c9c2cf1..d1887928b40d 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.3
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-calendar-tools-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8515b6b2811d74b61d96c38ff443aa46
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.08.1 b/metadata/md5-cache/kde-apps/calendarjanitor-18.08.1
deleted file mode 100644
index b53f50a9e525..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akonadi-calendar-tools-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.08.2 b/metadata/md5-cache/kde-apps/calendarjanitor-18.08.2
new file mode 100644
index 000000000000..acfe2ed5ea0e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akonadi-calendar-tools-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=93aeefe9890ab93ebded37ec0f2fae82
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.04.3 b/metadata/md5-cache/kde-apps/calendarsupport-18.04.3
index cdcd170d1b2a..089c44b1aeee 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-18.04.3
+++ b/metadata/md5-cache/kde-apps/calendarsupport-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-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/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/designer-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-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/calendarsupport-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=11f0cc5ba8a737466af94b60f06f6af4
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.08.1 b/metadata/md5-cache/kde-apps/calendarsupport-18.08.1
deleted file mode 100644
index 74772e7d8af0..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/kholidays-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/designer-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-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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/kholidays-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/designer-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-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/calendarsupport-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e62040446efa9635fb2a3ead5b42a78f
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.08.2 b/metadata/md5-cache/kde-apps/calendarsupport-18.08.2
new file mode 100644
index 000000000000..25ba4ce6fdd0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarsupport-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/designer-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-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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/designer-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-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/calendarsupport-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=eaa92f35e4f1a6389419439b143838f8
diff --git a/metadata/md5-cache/kde-apps/cantor-18.04.3 b/metadata/md5-cache/kde-apps/cantor-18.04.3
index 20e272cef3bc..de169682adb0 100644
--- a/metadata/md5-cache/kde-apps/cantor-18.04.3
+++ b/metadata/md5-cache/kde-apps/cantor-18.04.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/cantor-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5aba2106c0aebb2d930542002ef096bf
diff --git a/metadata/md5-cache/kde-apps/cantor-18.08.1 b/metadata/md5-cache/kde-apps/cantor-18.08.1
deleted file mode 100644
index 6cea2814e727..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-18.08.1
+++ /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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpty-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.08.1: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpty-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.08.1: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.49.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.4:5
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/cantor-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b39f08506e6b39e74261368f5e3b646f
diff --git a/metadata/md5-cache/kde-apps/cantor-18.08.2 b/metadata/md5-cache/kde-apps/cantor-18.08.2
new file mode 100644
index 000000000000..3bc4e64fc512
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cantor-18.08.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpty-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.08.2: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpty-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.08.2: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.50.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.4:5
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/cantor-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1dd11a6e514b02c8791043a265c419cd
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.04.3 b/metadata/md5-cache/kde-apps/cervisia-18.04.3
index 9f9869680c0a..7952e3f11524 100644
--- a/metadata/md5-cache/kde-apps/cervisia-18.04.3
+++ b/metadata/md5-cache/kde-apps/cervisia-18.04.3
@@ -9,5 +9,5 @@ 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/kdesu-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/knotifications-5.46.0:5 >=kde-frameworks/kparts-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/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-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/cervisia-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14ede4987e78de20196d54cce73e29cd
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.08.1 b/metadata/md5-cache/kde-apps/cervisia-18.08.1
deleted file mode 100644
index e69b16034f66..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdesu-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kinit-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdesu-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kinit-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/cervisia-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.08.2 b/metadata/md5-cache/kde-apps/cervisia-18.08.2
new file mode 100644
index 000000000000..031885b50f2e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cervisia-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdesu-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdesu-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/cervisia-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c40cdcdc1b6f5ed0f2b19a924b47f331
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.04.3-r1 b/metadata/md5-cache/kde-apps/dolphin-18.04.3-r1
index 47378ba6afa2..0d1771af85df 100644
--- a/metadata/md5-cache/kde-apps/dolphin-18.04.3-r1
+++ b/metadata/md5-cache/kde-apps/dolphin-18.04.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/dolphin-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f00a92a70f4ebc08269e5e647ca55724
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.08.1 b/metadata/md5-cache/kde-apps/dolphin-18.08.1
deleted file mode 100644
index 33cf9b4aa1d9..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kinit-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtconcurrent-5.9.4: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 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.49.0:5 >=kde-frameworks/kfilemetadata-5.49.0:5 >=kde-apps/baloo-widgets-18.08.1:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.49.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kinit-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtconcurrent-5.9.4: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 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.49.0:5 >=kde-frameworks/kfilemetadata-5.49.0:5 >=kde-apps/baloo-widgets-18.08.1:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.49.0:5 ) >=kde-apps/kio-extras-18.08.1:5 thumbnail? ( >=kde-apps/ffmpegthumbs-18.08.1:5 >=kde-apps/thumbnailers-18.08.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/dolphin-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=69c5b07614cb0863b9d7f2441feb4ae7
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.08.2 b/metadata/md5-cache/kde-apps/dolphin-18.08.2
new file mode 100644
index 000000000000..997d4baef863
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4: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 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 >=kde-apps/baloo-widgets-18.08.2:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4: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 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 >=kde-apps/baloo-widgets-18.08.2:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.50.0:5 ) >=kde-apps/kio-extras-18.08.2:5 thumbnail? ( >=kde-apps/ffmpegthumbs-18.08.2:5 >=kde-apps/thumbnailers-18.08.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/dolphin-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=52bb9f178df4e143c5d2d92824e99d0a
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.3
index e65e1214752f..4ed962221658 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/dolphin-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-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/kwidgetsaddons-5.46.0:5 ) >=kde-apps/kompare-18.04.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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/dolphin-plugins-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db481be3bab07bc0304a2fa90c254fc3
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.1
deleted file mode 100644
index 34225bf9b947..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/dolphin-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/dolphin-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 ) >=kde-apps/kompare-18.08.1: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/dolphin-plugins-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=44d16fd4811a70766ca904fe68b0710a
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.2
new file mode 100644
index 000000000000..bdc962f492c5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/dolphin-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/dolphin-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 ) >=kde-apps/kompare-18.08.2: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/dolphin-plugins-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=10e00b9f658cd6b8a4449e812c17b088
diff --git a/metadata/md5-cache/kde-apps/dragon-18.04.3 b/metadata/md5-cache/kde-apps/dragon-18.04.3
index 81b9386b3a6f..fd43fac72e67 100644
--- a/metadata/md5-cache/kde-apps/dragon-18.04.3
+++ b/metadata/md5-cache/kde-apps/dragon-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.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/kcrash-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/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-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/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-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 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/dragon-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9b29c8b6930a059928eef3e4451a236d
diff --git a/metadata/md5-cache/kde-apps/dragon-18.08.1 b/metadata/md5-cache/kde-apps/dragon-18.08.1
deleted file mode 100644
index e4b1189be141..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/dragon-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/dragon-18.08.2 b/metadata/md5-cache/kde-apps/dragon-18.08.2
new file mode 100644
index 000000000000..f9ca036cdeb3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dragon-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/dragon-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=808cba69b895b1eb4d3c7ad69f2f2724
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.04.3 b/metadata/md5-cache/kde-apps/eventviews-18.04.3
index e24005ae8465..e36e65054f36 100644
--- a/metadata/md5-cache/kde-apps/eventviews-18.04.3
+++ b/metadata/md5-cache/kde-apps/eventviews-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=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/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/eventviews-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dd44629452f4859391a6e46b987c2416
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.08.1 b/metadata/md5-cache/kde-apps/eventviews-18.08.1
deleted file mode 100644
index 531921f2e920..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/eventviews-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.08.2 b/metadata/md5-cache/kde-apps/eventviews-18.08.2
new file mode 100644
index 000000000000..f4ff8c4c0e22
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/eventviews-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/eventviews-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=52bbd9b441c15695939f17df2c49e7f5
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.3
index 18f855b2ff14..07a1381cc7c8 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.3
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ffmpegthumbs-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9b680f88056ff147711f4aa86058f183
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.1
deleted file mode 100644
index 0f707cc54c9b..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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/kconfig-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ffmpegthumbs-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=482e9b9fa002e8fd3385c5d32435bb72
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.2 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.2
new file mode 100644
index 000000000000..a260361843f0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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/kconfig-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ffmpegthumbs-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0dccf634947f6bc4ee780f0539761fc3
diff --git a/metadata/md5-cache/kde-apps/filelight-18.04.3 b/metadata/md5-cache/kde-apps/filelight-18.04.3
index 42c7e5ddd024..e4b17730e179 100644
--- a/metadata/md5-cache/kde-apps/filelight-18.04.3
+++ b/metadata/md5-cache/kde-apps/filelight-18.04.3
@@ -9,5 +9,5 @@ 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/ki18n-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 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/filelight-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f4380af917815f769646be4bbe5677af
diff --git a/metadata/md5-cache/kde-apps/filelight-18.08.1 b/metadata/md5-cache/kde-apps/filelight-18.08.1
deleted file mode 100644
index 29882cdb1765..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/filelight-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/filelight-18.08.2 b/metadata/md5-cache/kde-apps/filelight-18.08.2
new file mode 100644
index 000000000000..477ad0a14134
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/filelight-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/filelight-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ff4c383865ef20fb5a0bb3a4a539fcd4
diff --git a/metadata/md5-cache/kde-apps/granatier-18.04.3 b/metadata/md5-cache/kde-apps/granatier-18.04.3
index 29f9a83fec66..6c1f92205d9d 100644
--- a/metadata/md5-cache/kde-apps/granatier-18.04.3
+++ b/metadata/md5-cache/kde-apps/granatier-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/granatier-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c9d26b49f215399e273dbec7e5849e4
diff --git a/metadata/md5-cache/kde-apps/granatier-18.08.1 b/metadata/md5-cache/kde-apps/granatier-18.08.1
deleted file mode 100644
index 7be60f7f0502..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/granatier-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/granatier-18.08.2 b/metadata/md5-cache/kde-apps/granatier-18.08.2
new file mode 100644
index 000000000000..3cceb488ff6f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/granatier-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/granatier-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b26034eb7ddb73f5f2841b31b41d5825
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.3 b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.3
index c97c9a1af760..c482238cd4de 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.3
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.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/kcrash-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/knewstuff-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/grantlee-editor-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d286ef1fe8fe59b41e80cc5985c27a47
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.08.1 b/metadata/md5-cache/kde-apps/grantlee-editor-18.08.1
deleted file mode 100644
index ec0e04bfa5b4..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/grantlee-editor-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.08.2 b/metadata/md5-cache/kde-apps/grantlee-editor-18.08.2
new file mode 100644
index 000000000000..db9eec8c6616
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/grantlee-editor-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1cb815eb5e6d9a7945af286ac0dc1337
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.04.3 b/metadata/md5-cache/kde-apps/grantleetheme-18.04.3
index 37364a9fdbf9..02ecc83340f4 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-18.04.3
+++ b/metadata/md5-cache/kde-apps/grantleetheme-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/grantleetheme-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ddc87bfaedbf2e9d4270a061f94c281c
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.08.1 b/metadata/md5-cache/kde-apps/grantleetheme-18.08.1
deleted file mode 100644
index 1f0a0ea62723..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.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.49.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=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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/grantleetheme-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.08.2 b/metadata/md5-cache/kde-apps/grantleetheme-18.08.2
new file mode 100644
index 000000000000..2a5afb7b5e85
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantleetheme-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.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.50.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=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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/grantleetheme-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=754f56c0fd5bad526bffe35edf71bcc1
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.04.3 b/metadata/md5-cache/kde-apps/gwenview-18.04.3
index 280ebb61cd58..600743207c5f 100644
--- a/metadata/md5-cache/kde-apps/gwenview-18.04.3
+++ b/metadata/md5-cache/kde-apps/gwenview-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcompletion-5.46.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/gwenview-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b8a8cbb3e9464669707065457390e36
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.08.1 b/metadata/md5-cache/kde-apps/gwenview-18.08.1
deleted file mode 100644
index 6679db7f9226..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.49.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.08.1:5= ) mpris? ( >=dev-qt/qtdbus-5.9.4:5 ) raw? ( >=kde-apps/libkdcraw-18.08.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.49.0:5 >=kde-frameworks/kfilemetadata-5.49.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.49.0:5 >=dev-qt/qtconcurrent-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=Image viewer by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
-IUSE=activities fits kipi +mpris raw semantic-desktop X debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.49.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.08.1:5= ) mpris? ( >=dev-qt/qtdbus-5.9.4:5 ) raw? ( >=kde-apps/libkdcraw-18.08.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.49.0:5 >=kde-frameworks/kfilemetadata-5.49.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.49.0:5 >=dev-qt/qtimageformats-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/gwenview-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=372e0167f14d97d78451cfef97c67b05
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.08.2 b/metadata/md5-cache/kde-apps/gwenview-18.08.2
new file mode 100644
index 000000000000..dfeccd6762a2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/gwenview-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.50.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.08.2:5= ) mpris? ( >=dev-qt/qtdbus-5.9.4:5 ) raw? ( >=kde-apps/libkdcraw-18.08.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtconcurrent-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Image viewer by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
+IUSE=activities fits kipi +mpris raw semantic-desktop X debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.50.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.08.2:5= ) mpris? ( >=dev-qt/qtdbus-5.9.4:5 ) raw? ( >=kde-apps/libkdcraw-18.08.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.50.0:5 >=dev-qt/qtimageformats-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/gwenview-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=72edcbac2d8d942b4b18663efbdb8d32
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.3 b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.3
index b7a1104a40ee..7051260206c8 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.3
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=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/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/kjobwidgets-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/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/eventviews-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/incidenceeditor-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f4eed089370e7d277140697a72906b9a
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.08.1 b/metadata/md5-cache/kde-apps/incidenceeditor-18.08.1
deleted file mode 100644
index 304b966f9b71..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/eventviews-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kldap-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/eventviews-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kldap-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/incidenceeditor-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.08.2 b/metadata/md5-cache/kde-apps/incidenceeditor-18.08.2
new file mode 100644
index 000000000000..811e17cfd199
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/eventviews-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kldap-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/eventviews-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kldap-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/incidenceeditor-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c900ea47d596d61c080bfdcdf5427685
diff --git a/metadata/md5-cache/kde-apps/juk-18.04.3 b/metadata/md5-cache/kde-apps/juk-18.04.3
index 315eaa36784e..72cf2df9a89d 100644
--- a/metadata/md5-cache/kde-apps/juk-18.04.3
+++ b/metadata/md5-cache/kde-apps/juk-18.04.3
@@ -9,5 +9,5 @@ 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/kglobalaccel-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/ktextwidgets-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/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/juk-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e59e959fc395e4a909680f5c704d2b0a
diff --git a/metadata/md5-cache/kde-apps/juk-18.08.1 b/metadata/md5-cache/kde-apps/juk-18.08.1
deleted file mode 100644
index 34e9b706ede1..000000000000
--- a/metadata/md5-cache/kde-apps/juk-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kglobalaccel-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kglobalaccel-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/juk-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/juk-18.08.2 b/metadata/md5-cache/kde-apps/juk-18.08.2
new file mode 100644
index 000000000000..5685c327f580
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/juk-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/juk-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=50cf806ce039e4fc7461eabf5a4b6661
diff --git a/metadata/md5-cache/kde-apps/k3b-18.04.3 b/metadata/md5-cache/kde-apps/k3b-18.04.3
index 39e44605ae19..7882dfb0ac97 100644
--- a/metadata/md5-cache/kde-apps/k3b-18.04.3
+++ b/metadata/md5-cache/kde-apps/k3b-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5
 REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/k3b-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df9b98222d6db74c913a3c095d2c61dc
diff --git a/metadata/md5-cache/kde-apps/k3b-18.08.1 b/metadata/md5-cache/kde-apps/k3b-18.08.1
deleted file mode 100644
index 849e07fda0a4..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kfilemetadata-5.49.0:5[taglib?] >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=kde-apps/libkcddb-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kfilemetadata-5.49.0:5[taglib?] >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=kde-apps/libkcddb-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.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.4:5
-REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/k3b-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/k3b-18.08.2 b/metadata/md5-cache/kde-apps/k3b-18.08.2
new file mode 100644
index 000000000000..8223a1f1f9b5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/k3b-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5[taglib?] >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-apps/libkcddb-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5[taglib?] >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-apps/libkcddb-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.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.4:5
+REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/k3b-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=377053037c37f8f55b277041a0d1ed4e
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.3
index 527fd2ee64b9..3ecbb6c180d9 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kaccounts-integration-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4da966d49c35da73a6a52a26bdf18acf
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.1
deleted file mode 100644
index 619e1859d753..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.49.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.49.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=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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kaccounts-integration-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.2-r1 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.2-r1
new file mode 100644
index 000000000000..fcbc6a176a82
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.50.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.50.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=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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond dev-util/intltool >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kaccounts-integration-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e780f13337133157ae258efb0160ef9d
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.3
index 5f266d94a739..74a2f58e89fa 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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/kpackage-5.46.0:5 >=kde-apps/kaccounts-integration-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kaccounts-providers-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0a9ad0714a7d0512886e781e17f82fd0
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.1
deleted file mode 100644
index 87b7bfdc3690..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kpackage-5.49.0:5 >=kde-apps/kaccounts-integration-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kpackage-5.49.0:5 >=kde-apps/kaccounts-integration-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kaccounts-providers-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.2 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.2
new file mode 100644
index 000000000000..389718402a3a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-apps/kaccounts-integration-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-apps/kaccounts-integration-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kaccounts-providers-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6130dbd829da82220254aa0a30b2ba4c
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.04.3 b/metadata/md5-cache/kde-apps/kaddressbook-18.04.3
index b77b2333d3d3..a1a8b7dc0f43 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-18.04.3
+++ b/metadata/md5-cache/kde-apps/kaddressbook-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=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/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/kjobwidgets-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 >=kde-frameworks/prison-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/libgravatar-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-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 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kaddressbook-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9d1ed949062064d68c47fbb558911ab
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.08.1 b/metadata/md5-cache/kde-apps/kaddressbook-18.08.1
deleted file mode 100644
index bdfec826ca44..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/prison-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/libgravatar-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-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 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-18.08.1: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/prison-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/libgravatar-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-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 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kaddressbook-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.08.2 b/metadata/md5-cache/kde-apps/kaddressbook-18.08.2
new file mode 100644
index 000000000000..244b3addf9f4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaddressbook-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/prison-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/libgravatar-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-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 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-18.08.2: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/prison-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/libgravatar-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-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 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kaddressbook-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a5fbfb29f05c274bdc9c8865c38068af
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.04.3 b/metadata/md5-cache/kde-apps/kajongg-18.04.3
index 8cbdd0f8c29b..b4e5903511da 100644
--- a/metadata/md5-cache/kde-apps/kajongg-18.04.3
+++ b/metadata/md5-cache/kde-apps/kajongg-18.04.3
@@ -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 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kajongg-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33b6a8996129bfbcace21ea507f4efa1
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.08.1 b/metadata/md5-cache/kde-apps/kajongg-18.08.1
deleted file mode 100644
index 3004344bace9..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-18.08.1
+++ /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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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-18.08.1: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/18.08.1/src/kajongg-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.08.2 b/metadata/md5-cache/kde-apps/kajongg-18.08.2
new file mode 100644
index 000000000000..621319120d7c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kajongg-18.08.2
@@ -0,0 +1,14 @@
+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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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-18.08.2: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/18.08.2/src/kajongg-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a59bc30e51b44ac6b40eab22fcfd65cd
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.04.3 b/metadata/md5-cache/kde-apps/kalarm-18.04.3
index 2290ddb8355d..0ae5ea8af69a 100644
--- a/metadata/md5-cache/kde-apps/kalarm-18.04.3
+++ b/metadata/md5-cache/kde-apps/kalarm-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kauth-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/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-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/kitemmodels-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/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-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kalarmcal-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kalarm-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c4048f7111051a3e96776a7a8640434
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.08.1 b/metadata/md5-cache/kde-apps/kalarm-18.08.1
deleted file mode 100644
index eb626c225a61..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kglobalaccel-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/kholidays-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kalarmcal-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) 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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kglobalaccel-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/kholidays-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kalarmcal-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kalarm-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e1ba95d4e07e1608ee2ef3621138d99d
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.08.2 b/metadata/md5-cache/kde-apps/kalarm-18.08.2
new file mode 100644
index 000000000000..18ab6d50702b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarm-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kalarmcal-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kalarmcal-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kalarm-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=585e458993553c325d7c675c97768605
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.04.3 b/metadata/md5-cache/kde-apps/kalarmcal-18.04.3
index 215ef5d0b308..4a6406e64cf1 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-18.04.3
+++ b/metadata/md5-cache/kde-apps/kalarmcal-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kalarmcal-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bf3a5b0cc460f66c5cf8183ce6797401
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.08.1 b/metadata/md5-cache/kde-apps/kalarmcal-18.08.1
deleted file mode 100644
index 031b0f67f6e9..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kholidays-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 test? ( >=dev-qt/qtdbus-5.9.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.49.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=Client library to access and handling of KAlarm calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kholidays-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kalarmcal-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=da0da817044c2ee56596debd53d3f3be
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.08.2 b/metadata/md5-cache/kde-apps/kalarmcal-18.08.2
new file mode 100644
index 000000000000..9579eeb7cf70
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarmcal-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 test? ( >=dev-qt/qtdbus-5.9.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.50.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=Client library to access and handling of KAlarm calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kalarmcal-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7f4203084f95394255ceb9539abee2d6
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.04.3 b/metadata/md5-cache/kde-apps/kalgebra-18.04.3
index 024795e072e8..9379c578d2a9 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-18.04.3
+++ b/metadata/md5-cache/kde-apps/kalgebra-18.04.3
@@ -9,5 +9,5 @@ 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 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/analitza-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.46.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kalgebra-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c535bc4bc38f65a9f37717be18ecd534
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.08.1 b/metadata/md5-cache/kde-apps/kalgebra-18.08.1
deleted file mode 100644
index 1d161d9097cf..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/analitza-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/analitza-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.49.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kalgebra-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.08.2 b/metadata/md5-cache/kde-apps/kalgebra-18.08.2
new file mode 100644
index 000000000000..e675670d0fa7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalgebra-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/analitza-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/analitza-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.50.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kalgebra-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5bbc9005dcf9d682b860e4252e1791b3
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.04.3 b/metadata/md5-cache/kde-apps/kalzium-18.04.3
index 33fcb039c11c..cd80bd6dffc8 100644
--- a/metadata/md5-cache/kde-apps/kalzium-18.04.3
+++ b/metadata/md5-cache/kde-apps/kalzium-18.04.3
@@ -9,5 +9,5 @@ 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/kdelibs4support-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kunitconversion-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.46.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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kalzium-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee97915f364c7b44bbb0cbffd58272f2
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.08.1 b/metadata/md5-cache/kde-apps/kalzium-18.08.1
deleted file mode 100644
index 301d0ceee8a8..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kplotting-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kunitconversion-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.49.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kplotting-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kunitconversion-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.49.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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kalzium-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bc3707ebf2a891099a3c0771d1cbe181
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.08.2 b/metadata/md5-cache/kde-apps/kalzium-18.08.2
new file mode 100644
index 000000000000..a8172d6f01b6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kplotting-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kunitconversion-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kplotting-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kunitconversion-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.50.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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kalzium-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ed1871883030a04304659d2ec9c73ba1
diff --git a/metadata/md5-cache/kde-apps/kamera-18.04.3 b/metadata/md5-cache/kde-apps/kamera-18.04.3
index 1e4b31c9142a..74e1b3960e4a 100644
--- a/metadata/md5-cache/kde-apps/kamera-18.04.3
+++ b/metadata/md5-cache/kde-apps/kamera-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.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/kxmlgui-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kamera-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5465e4588c79a2452170e24d1d90f0e2
diff --git a/metadata/md5-cache/kde-apps/kamera-18.08.1 b/metadata/md5-cache/kde-apps/kamera-18.08.1
deleted file mode 100644
index 700b170983c2..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kamera-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kamera-18.08.2 b/metadata/md5-cache/kde-apps/kamera-18.08.2
new file mode 100644
index 000000000000..f2f19d0ffbd9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamera-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kamera-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9f91e7d24f20764f0c7d3bca8403d589
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.04.3 b/metadata/md5-cache/kde-apps/kamoso-18.04.3
index c597f60100f8..62df04a6a024 100644
--- a/metadata/md5-cache/kde-apps/kamoso-18.04.3
+++ b/metadata/md5-cache/kde-apps/kamoso-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kamoso-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aea10efa56c65d3edac2c9a9cbf333fb
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.08.1 b/metadata/md5-cache/kde-apps/kamoso-18.08.1
deleted file mode 100644
index 00460b4f0d6a..000000000000
--- a/metadata/md5-cache/kde-apps/kamoso-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/purpose-5.49.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl 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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to take pictures and videos from your webcam by KDE
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/Kamoso
-IUSE=test debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/purpose-5.49.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.49.0:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamoso: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.08.1/src/kamoso-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=871eb858c12212f809730dbfca88c676
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.08.2 b/metadata/md5-cache/kde-apps/kamoso-18.08.2
new file mode 100644
index 000000000000..945ec5259868
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamoso-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/purpose-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to take pictures and videos from your webcam by KDE
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/Kamoso
+IUSE=test debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/purpose-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.50.0:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamoso: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.08.2/src/kamoso-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3bd7ac03c909dd72243c9c92262fc100
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.04.3 b/metadata/md5-cache/kde-apps/kanagram-18.04.3
index 83d93d90b875..29d78f4f8a80 100644
--- a/metadata/md5-cache/kde-apps/kanagram-18.04.3
+++ b/metadata/md5-cache/kde-apps/kanagram-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-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 >=kde-apps/libkeduvocdocument-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/kdeedu-data-18.04.3:5 >=dev-qt/qtmultimedia-5.9.4:5[qml] >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kanagram-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=950b84705055c7f275d2348f68b51575
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.08.1 b/metadata/md5-cache/kde-apps/kanagram-18.08.1
deleted file mode 100644
index 24fe418c524b..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-apps/libkeduvocdocument-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-apps/libkeduvocdocument-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/kdeedu-data-18.08.1:5 >=dev-qt/qtmultimedia-5.9.4:5[qml] >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kanagram-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.08.2 b/metadata/md5-cache/kde-apps/kanagram-18.08.2
new file mode 100644
index 000000000000..a04d314ddd70
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kanagram-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-apps/libkeduvocdocument-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-apps/libkeduvocdocument-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/kdeedu-data-18.08.2:5 >=dev-qt/qtmultimedia-5.9.4:5[qml] >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kanagram-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1359d4eaa6b9082d8788faf515b07662
diff --git a/metadata/md5-cache/kde-apps/kapman-18.04.3 b/metadata/md5-cache/kde-apps/kapman-18.04.3
index 21632ed3f490..4c02c237a4c9 100644
--- a/metadata/md5-cache/kde-apps/kapman-18.04.3
+++ b/metadata/md5-cache/kde-apps/kapman-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kapman-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=586759bd2c8f685cab958fe42236e19f
diff --git a/metadata/md5-cache/kde-apps/kapman-18.08.1 b/metadata/md5-cache/kde-apps/kapman-18.08.1
deleted file mode 100644
index e328160b3f30..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kapman-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapman-18.08.2 b/metadata/md5-cache/kde-apps/kapman-18.08.2
new file mode 100644
index 000000000000..e09f593a0dfd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapman-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kapman-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c0ae4e62ae04773a04f64da4dd333967
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.04.3 b/metadata/md5-cache/kde-apps/kapptemplate-18.04.3
index 0c839e4d6991..cdf093433e4d 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-18.04.3
+++ b/metadata/md5-cache/kde-apps/kapptemplate-18.04.3
@@ -9,5 +9,5 @@ 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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kapptemplate-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d8cae8acfb66064ccf580494f015efca
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.08.1 b/metadata/md5-cache/kde-apps/kapptemplate-18.08.1
deleted file mode 100644
index 68dccff39dc7..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kapptemplate-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.08.2 b/metadata/md5-cache/kde-apps/kapptemplate-18.08.2
new file mode 100644
index 000000000000..020d2f3258c0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapptemplate-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kapptemplate-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3808b5978d7ac4040e4fe39eeebd2a18
diff --git a/metadata/md5-cache/kde-apps/kate-18.04.3 b/metadata/md5-cache/kde-apps/kate-18.04.3
index 36a1a0ae62f3..26a2de72fe88 100644
--- a/metadata/md5-cache/kde-apps/kate-18.04.3
+++ b/metadata/md5-cache/kde-apps/kate-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-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/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/kparts-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/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 addons? ( >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtsql-5.9.4:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kate-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f81e138a14a488c25d0e311e4bbdbf0f
diff --git a/metadata/md5-cache/kde-apps/kate-18.08.1 b/metadata/md5-cache/kde-apps/kate-18.08.1
deleted file mode 100644
index 9cb39d6c3846..000000000000
--- a/metadata/md5-cache/kde-apps/kate-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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 addons? ( >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/plasma-5.49.0:5 >=kde-frameworks/threadweaver-5.49.0:5 >=dev-qt/qtsql-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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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 addons? ( >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/plasma-5.49.0:5 >=kde-frameworks/threadweaver-5.49.0:5 >=dev-qt/qtsql-5.9.4:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kate-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bfaae2d0cb2cfd1e2a96c6e28042bb03
diff --git a/metadata/md5-cache/kde-apps/kate-18.08.2 b/metadata/md5-cache/kde-apps/kate-18.08.2
new file mode 100644
index 000000000000..367c8865bea8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kate-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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 addons? ( >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/threadweaver-5.50.0:5 >=dev-qt/qtsql-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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 addons? ( >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/threadweaver-5.50.0:5 >=dev-qt/qtsql-5.9.4:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kate-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d3d45415e84a475cb66b087e51a45c0c
diff --git a/metadata/md5-cache/kde-apps/katomic-18.04.3 b/metadata/md5-cache/kde-apps/katomic-18.04.3
index ba9fe63963fe..6b3e28297314 100644
--- a/metadata/md5-cache/kde-apps/katomic-18.04.3
+++ b/metadata/md5-cache/kde-apps/katomic-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/katomic-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=30ad7cb39d41cdde2158c3a5092a8667
diff --git a/metadata/md5-cache/kde-apps/katomic-18.08.1 b/metadata/md5-cache/kde-apps/katomic-18.08.1
deleted file mode 100644
index e27d457bc09e..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/katomic-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/katomic-18.08.2 b/metadata/md5-cache/kde-apps/katomic-18.08.2
new file mode 100644
index 000000000000..cc616d0eedec
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/katomic-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/katomic-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=73bcc03126dd9b6249e01d7e6c932549
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.04.3 b/metadata/md5-cache/kde-apps/kbackup-18.04.3
index 139b4f25a2a9..a69b302ebce8 100644
--- a/metadata/md5-cache/kde-apps/kbackup-18.04.3
+++ b/metadata/md5-cache/kde-apps/kbackup-18.04.3
@@ -9,5 +9,5 @@ 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/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/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup: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/kbackup-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51a31af332a0dd87e82d166e160390cd
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.08.1 b/metadata/md5-cache/kde-apps/kbackup-18.08.1
deleted file mode 100644
index 0eec76e34ac5..000000000000
--- a/metadata/md5-cache/kde-apps/kbackup-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that lets you back up any directories or files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup: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.08.1/src/kbackup-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=993ec9361abad4d3a7639df6412f173a
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.08.2 b/metadata/md5-cache/kde-apps/kbackup-18.08.2
new file mode 100644
index 000000000000..34eeba2bcca4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbackup-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that lets you back up any directories or files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup: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.08.2/src/kbackup-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9f0352c191cdc89827665718ef2feb07
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.04.3 b/metadata/md5-cache/kde-apps/kblackbox-18.04.3
index 9e7273860418..217f8a703689 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-18.04.3
+++ b/metadata/md5-cache/kde-apps/kblackbox-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-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/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/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kblackbox-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9ced47c4135ce7ebc8768260713161dc
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.08.1 b/metadata/md5-cache/kde-apps/kblackbox-18.08.1
deleted file mode 100644
index fe62c5d9ef8d..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kblackbox-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.08.2 b/metadata/md5-cache/kde-apps/kblackbox-18.08.2
new file mode 100644
index 000000000000..e6014849011c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblackbox-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kblackbox-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a008ef002746888719e8005123f83a0b
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.04.3 b/metadata/md5-cache/kde-apps/kblocks-18.04.3
index f6812bf8f777..ed684e0fa9f7 100644
--- a/metadata/md5-cache/kde-apps/kblocks-18.04.3
+++ b/metadata/md5-cache/kde-apps/kblocks-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kblocks-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6c7a965b8437e71e47720b819d93b8f
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.08.1 b/metadata/md5-cache/kde-apps/kblocks-18.08.1
deleted file mode 100644
index d2998eb78692..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kblocks-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.08.2 b/metadata/md5-cache/kde-apps/kblocks-18.08.2
new file mode 100644
index 000000000000..5d16fa1070a8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblocks-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kblocks-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f0491e68b8429c74be805b885026912b
diff --git a/metadata/md5-cache/kde-apps/kblog-18.04.3 b/metadata/md5-cache/kde-apps/kblog-18.04.3
index ae22625e5bba..6fa5892bdf0b 100644
--- a/metadata/md5-cache/kde-apps/kblog-18.04.3
+++ b/metadata/md5-cache/kde-apps/kblog-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kxmlrpcclient-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/syndication-18.04.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kblog-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=69827f55f43dbadd66f7ad38e4425220
diff --git a/metadata/md5-cache/kde-apps/kblog-18.04.3-r1 b/metadata/md5-cache/kde-apps/kblog-18.04.3-r1
index 124aa994a223..fa8b40c6f72e 100644
--- a/metadata/md5-cache/kde-apps/kblog-18.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kblog-18.04.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing client-side support for web application remote blo
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kxmlrpcclient-5.46.0:5 >=kde-frameworks/syndication-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kblog-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ec62190b7a990b5cae8531ee71387fbe
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4dd4d173516f35dad6db9c791cf60f4d
diff --git a/metadata/md5-cache/kde-apps/kblog-18.08.1 b/metadata/md5-cache/kde-apps/kblog-18.08.1
deleted file mode 100644
index 833910b1ec3f..000000000000
--- a/metadata/md5-cache/kde-apps/kblog-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kxmlrpcclient-5.49.0:5 >=kde-frameworks/syndication-5.49.0:5 >=kde-apps/kcalcore-18.08.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.49.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=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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kxmlrpcclient-5.49.0:5 >=kde-frameworks/syndication-5.49.0:5 >=kde-apps/kcalcore-18.08.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kblog-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=72022b76d1a7a4fe68b5724c6d078ce1
diff --git a/metadata/md5-cache/kde-apps/kblog-18.08.2 b/metadata/md5-cache/kde-apps/kblog-18.08.2
new file mode 100644
index 000000000000..a1a1a2229e66
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblog-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kxmlrpcclient-5.50.0:5 >=kde-frameworks/syndication-5.50.0:5 >=kde-apps/kcalcore-18.08.2: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.50.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=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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kxmlrpcclient-5.50.0:5 >=kde-frameworks/syndication-5.50.0:5 >=kde-apps/kcalcore-18.08.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kblog-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=14a2d7a5d9addfa254c78613ee8f3b60
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.04.3 b/metadata/md5-cache/kde-apps/kbounce-18.04.3
index afdbb5560a8a..f8d173eafcaf 100644
--- a/metadata/md5-cache/kde-apps/kbounce-18.04.3
+++ b/metadata/md5-cache/kde-apps/kbounce-18.04.3
@@ -9,5 +9,5 @@ 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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kbounce-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3e9eea7ec2eeefa8292d6463093fe6a3
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.08.1 b/metadata/md5-cache/kde-apps/kbounce-18.08.1
deleted file mode 100644
index 296d3f976b3c..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kbounce-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.08.2 b/metadata/md5-cache/kde-apps/kbounce-18.08.2
new file mode 100644
index 000000000000..4a6419f2a9f1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbounce-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kbounce-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=791356c5445733b8f6378d5337a17019
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.04.3 b/metadata/md5-cache/kde-apps/kbreakout-18.04.3
index c9cf3a0c4b29..b84fa9a1592a 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-18.04.3
+++ b/metadata/md5-cache/kde-apps/kbreakout-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kbreakout-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f6608ff0068faa12ea4cb53ee937b97
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.08.1 b/metadata/md5-cache/kde-apps/kbreakout-18.08.1
deleted file mode 100644
index 288e2c3e906d..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtdeclarative-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-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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtdeclarative-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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kbreakout-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.08.2 b/metadata/md5-cache/kde-apps/kbreakout-18.08.2
new file mode 100644
index 000000000000..8c2ab7fa5b25
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbreakout-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtdeclarative-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-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtdeclarative-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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kbreakout-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1541d154c0fffb6b88379a25233b3062
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.04.3 b/metadata/md5-cache/kde-apps/kbruch-18.04.3
index 4ad8ab5150d4..fbb1c21a18f7 100644
--- a/metadata/md5-cache/kde-apps/kbruch-18.04.3
+++ b/metadata/md5-cache/kde-apps/kbruch-18.04.3
@@ -9,5 +9,5 @@ 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 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kbruch-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0198a951b20af2bbf374476ae95371b3
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.08.1 b/metadata/md5-cache/kde-apps/kbruch-18.08.1
deleted file mode 100644
index 112de766b1b0..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kbruch-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.08.2 b/metadata/md5-cache/kde-apps/kbruch-18.08.2
new file mode 100644
index 000000000000..85fc81bbe67b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbruch-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kbruch-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6fcee72a8b16192ab6f249b1c31b2fc2
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.04.3 b/metadata/md5-cache/kde-apps/kcachegrind-18.04.3
index b1b8e3a12c72..e521aba557cf 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-18.04.3
+++ b/metadata/md5-cache/kde-apps/kcachegrind-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-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/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcachegrind-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f56459c85d0f0f4bc7e486b4fb22eea
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.08.1 b/metadata/md5-cache/kde-apps/kcachegrind-18.08.1
deleted file mode 100644
index 7bbfa2ab8521..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kcachegrind-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.08.2 b/metadata/md5-cache/kde-apps/kcachegrind-18.08.2
new file mode 100644
index 000000000000..321b29720aaf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcachegrind-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kcachegrind-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cb452002de89ae76acf89efe386bc96c
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.04.3 b/metadata/md5-cache/kde-apps/kcalc-18.04.3
index 769c3c65e173..f7db7845dcb5 100644
--- a/metadata/md5-cache/kde-apps/kcalc-18.04.3
+++ b/metadata/md5-cache/kde-apps/kcalc-18.04.3
@@ -9,5 +9,5 @@ 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/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcalc-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=93f503820c608c53df594b31ed2f064e
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.08.1 b/metadata/md5-cache/kde-apps/kcalc-18.08.1
deleted file mode 100644
index 3233bca3119f..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kinit-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kinit-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kcalc-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.08.2 b/metadata/md5-cache/kde-apps/kcalc-18.08.2
new file mode 100644
index 000000000000..62bb1102763a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalc-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kcalc-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0af8be7de4c4af4fbf06d2ac703c7d7b
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.04.3 b/metadata/md5-cache/kde-apps/kcalcore-18.04.3
index cd754ef5cfa9..c117cddeb13c 100644
--- a/metadata/md5-cache/kde-apps/kcalcore-18.04.3
+++ b/metadata/md5-cache/kde-apps/kcalcore-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || (
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcalcore-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2eecaadfa72f110a4ea0ea227ea009ad
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.08.1 b/metadata/md5-cache/kde-apps/kcalcore-18.08.1
deleted file mode 100644
index 65f4781b6698..000000000000
--- a/metadata/md5-cache/kde-apps/kcalcore-18.08.1
+++ /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.4: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.49.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=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.4:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kcalcore-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.08.2 b/metadata/md5-cache/kde-apps/kcalcore-18.08.2
new file mode 100644
index 000000000000..b5fc113511c3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalcore-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4: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.50.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=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.4:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kcalcore-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=14f5c5f9127fd2890aabba3b09a65665
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.04.3 b/metadata/md5-cache/kde-apps/kcalutils-18.04.3
index 7fa0ae2a59a8..362362536315 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-18.04.3
+++ b/metadata/md5-cache/kde-apps/kcalutils-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcalutils-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b6429a7eb95541252986d865adc3e96
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.08.1 b/metadata/md5-cache/kde-apps/kcalutils-18.08.1
deleted file mode 100644
index a1256bc7daf0..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kcalutils-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a5422c33c6e9e93a2ecab6ecf80d051d
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.08.2 b/metadata/md5-cache/kde-apps/kcalutils-18.08.2
new file mode 100644
index 000000000000..4df3e985b311
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalutils-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kcalutils-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=499b457abedff45d05fec6e044918270
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.04.3 b/metadata/md5-cache/kde-apps/kcharselect-18.04.3
index 44f69b87ab1a..e0661cca8358 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-18.04.3
+++ b/metadata/md5-cache/kde-apps/kcharselect-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-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/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcharselect-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2067d25f6c7c5828c88ed80b1612c5e0
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.08.1 b/metadata/md5-cache/kde-apps/kcharselect-18.08.1
deleted file mode 100644
index b2d8e3e5e069..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kcharselect-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.08.2 b/metadata/md5-cache/kde-apps/kcharselect-18.08.2
new file mode 100644
index 000000000000..20a759867d59
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcharselect-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kcharselect-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fcfb1481d19978aa6b15898851c94c4b
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.3 b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.3
index 650ee761abe4..de7aa174861b 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.3
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcolorchooser-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4cb674a0f6cd9ab0b4b5cf46086e4e31
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.08.1 b/metadata/md5-cache/kde-apps/kcolorchooser-18.08.1
deleted file mode 100644
index 3fe5ed0ccf42..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kcolorchooser-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.08.2 b/metadata/md5-cache/kde-apps/kcolorchooser-18.08.2
new file mode 100644
index 000000000000..98d7f1ce930f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kcolorchooser-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=70bb0978143b875dad6d4d1fdf842be9
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.04.3 b/metadata/md5-cache/kde-apps/kcontacts-18.04.3
index d8867aabb326..4adc6b2f1565 100644
--- a/metadata/md5-cache/kde-apps/kcontacts-18.04.3
+++ b/metadata/md5-cache/kde-apps/kcontacts-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcontacts-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db9a1bb20ba88f4721dbe79f7e049a45
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.08.1 b/metadata/md5-cache/kde-apps/kcontacts-18.08.1
deleted file mode 100644
index ca77df27f73a..000000000000
--- a/metadata/md5-cache/kde-apps/kcontacts-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=dev-qt/qtgui-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.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kcontacts-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a6779ecd121787c716bc4a75febc5b79
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.08.2 b/metadata/md5-cache/kde-apps/kcontacts-18.08.2
new file mode 100644
index 000000000000..da7758759b21
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcontacts-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=dev-qt/qtgui-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.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kcontacts-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1d597293764e85cb57080e39e06628d8
diff --git a/metadata/md5-cache/kde-apps/kcron-18.04.3 b/metadata/md5-cache/kde-apps/kcron-18.04.3
index 65e69173019c..f7f866c24750 100644
--- a/metadata/md5-cache/kde-apps/kcron-18.04.3
+++ b/metadata/md5-cache/kde-apps/kcron-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/cron >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcron-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=667308eb480460d90ef3b3b89efe201c
diff --git a/metadata/md5-cache/kde-apps/kcron-18.08.1 b/metadata/md5-cache/kde-apps/kcron-18.08.1
deleted file mode 100644
index 5c87e6e8dd51..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/cron >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kcron-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=17702ace70463c5f6dbefc33d0f1cbcc
diff --git a/metadata/md5-cache/kde-apps/kcron-18.08.2 b/metadata/md5-cache/kde-apps/kcron-18.08.2
new file mode 100644
index 000000000000..20af1f357610
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcron-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/cron >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kcron-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=733643aeb5aa224e6a2c9221fa890c99
diff --git a/metadata/md5-cache/kde-apps/kdav-18.04.3 b/metadata/md5-cache/kde-apps/kdav-18.04.3
index 7a7f3f35e8d3..dee3efa1b0a7 100644
--- a/metadata/md5-cache/kde-apps/kdav-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdav-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdav-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0970b6f8d3666dc60d5239f4461f5ff0
diff --git a/metadata/md5-cache/kde-apps/kdav-18.08.1 b/metadata/md5-cache/kde-apps/kdav-18.08.1
deleted file mode 100644
index 1672a402532b..000000000000
--- a/metadata/md5-cache/kde-apps/kdav-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-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.49.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=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.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdav-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=44e73001c713055bc279da510b2d5c0b
diff --git a/metadata/md5-cache/kde-apps/kdav-18.08.2 b/metadata/md5-cache/kde-apps/kdav-18.08.2
new file mode 100644
index 000000000000..b00dc277e768
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdav-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-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.50.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=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.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdav-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=504377b966fb9841a75d66ef2d0f3ff5
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.3 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.3
index 51f2f82174b9..c07e40121e3b 100644
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kate-18.04.3 >=kde-apps/kdeadmin-meta-18.04.3 >=kde-apps/kdecore-meta-18.04.3 >=kde-apps/kdeedu-meta-18.04.3 >=kde-apps/kdegames-meta-18.04.3 >=kde-apps/kdegraphics-meta-18.04.3 >=kde-apps/kdemultimedia-meta-18.04.3 >=kde-apps/kdenetwork-meta-18.04.3 >=kde-apps/kdeutils-meta-18.04.3 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.04.3 ) pim? ( >=kde-apps/kdepim-meta-18.04.3 ) sdk? ( >=kde-apps/kdesdk-meta-18.04.3 ) !kde-apps/kde-apps-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1a7e45f3a14a4bba759702155e71f47c
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.08.1 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.08.1
deleted file mode 100644
index 4a1808b119bc..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-18.08.1
+++ /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-18.08.1 >=kde-apps/kdeadmin-meta-18.08.1 >=kde-apps/kdecore-meta-18.08.1 >=kde-apps/kdeedu-meta-18.08.1 >=kde-apps/kdegames-meta-18.08.1 >=kde-apps/kdegraphics-meta-18.08.1 >=kde-apps/kdemultimedia-meta-18.08.1 >=kde-apps/kdenetwork-meta-18.08.1 >=kde-apps/kdeutils-meta-18.08.1 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.08.1 ) pim? ( >=kde-apps/kdepim-meta-18.08.1 ) sdk? ( >=kde-apps/kdesdk-meta-18.08.1 ) !kde-apps/kde-apps-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.08.2 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.08.2
new file mode 100644
index 000000000000..0d46b6c45310
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-18.08.2
@@ -0,0 +1,11 @@
+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-18.08.2 >=kde-apps/kdeadmin-meta-18.08.2 >=kde-apps/kdecore-meta-18.08.2 >=kde-apps/kdeedu-meta-18.08.2 >=kde-apps/kdegames-meta-18.08.2 >=kde-apps/kdegraphics-meta-18.08.2 >=kde-apps/kdemultimedia-meta-18.08.2 >=kde-apps/kdenetwork-meta-18.08.2 >=kde-apps/kdeutils-meta-18.08.2 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.08.2 ) pim? ( >=kde-apps/kdepim-meta-18.08.2 ) sdk? ( >=kde-apps/kdesdk-meta-18.08.2 ) !kde-apps/kde-apps-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2d8ea975c66e51f2c00eeb9d2a733542
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.3
index f751a97faa9a..44e994cc230a 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.3
@@ -9,5 +9,5 @@ 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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kde-dev-scripts-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=249bf20236a2f762edc4f99d2286a49b
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.1
deleted file mode 100644
index 41121fff83f1..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kdoctools-5.49.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kde-dev-scripts-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.2 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.2
new file mode 100644
index 000000000000..78f116a01430
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kdoctools-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kde-dev-scripts-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=13622f19b98f06a2cc0a278efaa0da37
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.3
index 74ba59bdb973..ce3cc2dae99d 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.3
@@ -9,5 +9,5 @@ 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 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kde-dev-utils-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bc424a21e1108b1d87c9d1b61cea4974
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.1
deleted file mode 100644
index 80ba3914022c..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kde-dev-utils-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.2 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.2
new file mode 100644
index 000000000000..2553097f4446
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kde-dev-utils-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8574fec233f2d4acdabff393c8c8a126
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.04.3 b/metadata/md5-cache/kde-apps/kde-meta-18.04.3
index 5f2f98791cc6..cb0b79f8e30d 100644
--- a/metadata/md5-cache/kde-apps/kde-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kde-meta-18.04.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kde-apps-meta-18.04.3 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kde-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=ecc4e6890aadabb83c55aa18afe1154a
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.08.1 b/metadata/md5-cache/kde-apps/kde-meta-18.08.1
deleted file mode 100644
index 6aa20320a594..000000000000
--- a/metadata/md5-cache/kde-apps/kde-meta-18.08.1
+++ /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-18.08.1 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kde-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.08.2 b/metadata/md5-cache/kde-apps/kde-meta-18.08.2
new file mode 100644
index 000000000000..ed831e56f4df
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-meta-18.08.2
@@ -0,0 +1,10 @@
+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-18.08.2 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kde-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e4d0a54e3e70409ef0b15dff3a6be454
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.3
index 9e557b0dd3cf..72ca2e99c030 100644
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kmag-18.04.3 >=kde-apps/kmousetool-18.04.3 >=kde-apps/kmouth-18.04.3 !kde-apps/kdeaccessibility-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e93f28138a29be6eea210ffb91ddf750
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.08.1
deleted file mode 100644
index 161bb36b2f19..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.08.1
+++ /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-18.08.1 >=kde-apps/kmousetool-18.08.1 >=kde-apps/kmouth-18.08.1 !kde-apps/kdeaccessibility-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.08.2
new file mode 100644
index 000000000000..980410f07c2d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.08.2
@@ -0,0 +1,10 @@
+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-18.08.2 >=kde-apps/kmousetool-18.08.2 >=kde-apps/kmouth-18.08.2 !kde-apps/kdeaccessibility-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=81a5836ace6e8dbf6e23c6e0aadbfdc9
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.3
index 17303d6e12d3..638259e55867 100644
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ksystemlog-18.04.3 cron? ( >=kde-apps/kcron-18.04.3 ) !kde-apps/kdeadmin-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e5c199615be39f0ae707784167301c1c
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.08.1
deleted file mode 100644
index 033091dee0db..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.08.1
+++ /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-18.08.1 cron? ( >=kde-apps/kcron-18.08.1 ) !kde-apps/kdeadmin-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.08.2
new file mode 100644
index 000000000000..4526f7e1dcc6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.08.2
@@ -0,0 +1,11 @@
+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-18.08.2 cron? ( >=kde-apps/kcron-18.08.2 ) !kde-apps/kdeadmin-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=35e77c0905c985e2ecdab97490e6a4e2
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.3
index 57b754967f65..c552b33a1bd3 100644
--- a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdecore-meta-18.04.3 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kdebase-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=98f90848a91ccd5dea7df67309563b49
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdebase-meta-18.08.1
deleted file mode 100644
index 08271f16c13e..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-18.08.1
+++ /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-18.08.1 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kdebase-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdebase-meta-18.08.2
new file mode 100644
index 000000000000..a03e24c9284e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-18.08.2
@@ -0,0 +1,10 @@
+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-18.08.2 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kdebase-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1c10f36225771f94f9e871e7489d9cb0
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.3 b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.3
index 66335e116261..23d309fc15b9 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdebugsettings-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d7b7155f9a415a5f5d4fa1d8a402e8f
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.08.1 b/metadata/md5-cache/kde-apps/kdebugsettings-18.08.1
deleted file mode 100644
index 678e1273d13c..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdebugsettings-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.08.2 b/metadata/md5-cache/kde-apps/kdebugsettings-18.08.2
new file mode 100644
index 000000000000..e821093557ce
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdebugsettings-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f537a8dc4d8f874316a6353ed7088627
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.3
index bac37fe443ce..bf787e93bb3d 100644
--- a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-18.04.3 >=kde-apps/kdialog-18.04.3 >=kde-apps/keditbookmarks-18.04.3 >=kde-apps/kfind-18.04.3 || ( www-client/falkon www-client/qupzilla >=kde-apps/konqueror-18.04.3 ) >=kde-apps/konsole-18.04.3 >=kde-apps/kwrite-18.04.3 handbook? ( >=kde-apps/khelpcenter-18.04.3 ) !kde-apps/kdecore-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d661fc93f72ad7d7b3671ac54adac8c8
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdecore-meta-18.08.1
deleted file mode 100644
index 6291d3442b16..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-18.08.1
+++ /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-18.08.1 >=kde-apps/kdialog-18.08.1 >=kde-apps/keditbookmarks-18.08.1 >=kde-apps/kfind-18.08.1 || ( www-client/falkon >=kde-apps/konqueror-18.08.1 ) >=kde-apps/konsole-18.08.1 >=kde-apps/kwrite-18.08.1 handbook? ( >=kde-apps/khelpcenter-18.08.1 ) !kde-apps/kdecore-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=72031df01fdda062705b127cbd84b9fd
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdecore-meta-18.08.2
new file mode 100644
index 000000000000..2a4ce4b30fab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-18.08.2
@@ -0,0 +1,11 @@
+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-18.08.2 >=kde-apps/kdialog-18.08.2 >=kde-apps/keditbookmarks-18.08.2 >=kde-apps/kfind-18.08.2 || ( www-client/falkon >=kde-apps/konqueror-18.08.2 ) >=kde-apps/konsole-18.08.2 >=kde-apps/kwrite-18.08.2 handbook? ( >=kde-apps/khelpcenter-18.08.2 ) !kde-apps/kdecore-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9bea34f18e4ebdd7f0d2f456a7f82eee
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.3 b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.3
index af73b8a0366f..7924c19b1b53 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdeedu-data-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d1c545e25ab09e49303b337932bd6bd1
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.08.1 b/metadata/md5-cache/kde-apps/kdeedu-data-18.08.1
deleted file mode 100644
index 386b69a86c74..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-18.08.1
+++ /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.49.0:5 >=dev-qt/qtcore-5.9.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 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/18.08.1/src/kdeedu-data-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.08.2 b/metadata/md5-cache/kde-apps/kdeedu-data-18.08.2
new file mode 100644
index 000000000000..e3e7a47ed0b1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-18.08.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0:5 >=dev-qt/qtcore-5.9.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 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/18.08.2/src/kdeedu-data-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=89240f2089ef44933a202dd6e923f79d
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.3
index 5c6b96679fe7..c5dcc25b9793 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/analitza-18.04.3 >=kde-apps/artikulate-18.04.3 >=kde-apps/blinken-18.04.3 >=kde-apps/cantor-18.04.3 >=kde-apps/kalzium-18.04.3 >=kde-apps/kanagram-18.04.3 >=kde-apps/kbruch-18.04.3 >=kde-apps/kdeedu-data-18.04.3 >=kde-apps/kgeography-18.04.3 >=kde-apps/khangman-18.04.3 >=kde-apps/kig-18.04.3 >=kde-apps/kiten-18.04.3 >=kde-apps/klettres-18.04.3 >=kde-apps/kmplot-18.04.3 >=kde-apps/kqtquickcharts-18.04.3 >=kde-apps/ktouch-18.04.3 >=kde-apps/kturtle-18.04.3 >=kde-apps/kwordquiz-18.04.3 >=kde-apps/libkeduvocdocument-18.04.3 >=kde-apps/marble-18.04.3 >=kde-apps/minuet-18.04.3 >=kde-apps/rocs-18.04.3 >=kde-apps/step-18.04.3 webengine? ( >=kde-apps/kalgebra-18.04.3 >=kde-apps/parley-18.04.3 ) !kde-apps/kdeedu-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d874106c216b3aa0f847101ed0eb6c11
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.08.1
deleted file mode 100644
index ec6d2c8e130d..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-18.08.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
-EAPI=6
-HOMEPAGE=https://edu.kde.org
-IUSE=+webengine
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/analitza-18.08.1 >=kde-apps/artikulate-18.08.1 >=kde-apps/blinken-18.08.1 >=kde-apps/cantor-18.08.1 >=kde-apps/kalzium-18.08.1 >=kde-apps/kanagram-18.08.1 >=kde-apps/kbruch-18.08.1 >=kde-apps/kdeedu-data-18.08.1 >=kde-apps/kgeography-18.08.1 >=kde-apps/khangman-18.08.1 >=kde-apps/kig-18.08.1 >=kde-apps/kiten-18.08.1 >=kde-apps/klettres-18.08.1 >=kde-apps/kmplot-18.08.1 >=kde-apps/kqtquickcharts-18.08.1 >=kde-apps/ktouch-18.08.1 >=kde-apps/kturtle-18.08.1 >=kde-apps/kwordquiz-18.08.1 >=kde-apps/libkeduvocdocument-18.08.1 >=kde-apps/marble-18.08.1 >=kde-apps/minuet-18.08.1 >=kde-apps/rocs-18.08.1 >=kde-apps/step-18.08.1 webengine? ( >=kde-apps/kalgebra-18.08.1 >=kde-apps/parley-18.08.1 ) !kde-apps/kdeedu-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=916f4ff673e41d1868eff4da4ada06e0
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.08.2
new file mode 100644
index 000000000000..a0b4750f6f27
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-18.08.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
+EAPI=6
+HOMEPAGE=https://edu.kde.org
+IUSE=+webengine
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/analitza-18.08.2 >=kde-apps/artikulate-18.08.2 >=kde-apps/blinken-18.08.2 >=kde-apps/cantor-18.08.2 >=kde-apps/kalzium-18.08.2 >=kde-apps/kanagram-18.08.2 >=kde-apps/kbruch-18.08.2 >=kde-apps/kdeedu-data-18.08.2 >=kde-apps/kgeography-18.08.2 >=kde-apps/khangman-18.08.2 >=kde-apps/kig-18.08.2 >=kde-apps/kiten-18.08.2 >=kde-apps/klettres-18.08.2 >=kde-apps/kmplot-18.08.2 >=kde-apps/kqtquickcharts-18.08.2 >=kde-apps/ktouch-18.08.2 >=kde-apps/kturtle-18.08.2 >=kde-apps/kwordquiz-18.08.2 >=kde-apps/libkeduvocdocument-18.08.2 >=kde-apps/marble-18.08.2 >=kde-apps/minuet-18.08.2 >=kde-apps/rocs-18.08.2 >=kde-apps/step-18.08.2 webengine? ( >=kde-apps/kalgebra-18.08.2 >=kde-apps/parley-18.08.2 ) !kde-apps/kdeedu-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2f54643f3bfd0d9673a60a0a720c83a0
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.3
index 8a307e6d17a2..4906c318a2ca 100644
--- a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/bomber-18.04.3 >=kde-apps/bovo-18.04.3 >=kde-apps/granatier-18.04.3 >=kde-apps/kapman-18.04.3 >=kde-apps/katomic-18.04.3 >=kde-apps/kblackbox-18.04.3 >=kde-apps/kblocks-18.04.3 >=kde-apps/kbounce-18.04.3 >=kde-apps/kbreakout-18.04.3 >=kde-apps/kdiamond-18.04.3 >=kde-apps/kfourinline-18.04.3 >=kde-apps/kgoldrunner-18.04.3 >=kde-apps/kigo-18.04.3 >=kde-apps/killbots-18.04.3 >=kde-apps/kiriki-18.04.3 >=kde-apps/kjumpingcube-18.04.3 >=kde-apps/klickety-18.04.3 >=kde-apps/klines-18.04.3 >=kde-apps/kmahjongg-18.04.3 >=kde-apps/kmines-18.04.3 >=kde-apps/knavalbattle-18.04.3 >=kde-apps/knetwalk-18.04.3 >=kde-apps/kolf-18.04.3 >=kde-apps/kollision-18.04.3 >=kde-apps/konquest-18.04.3 >=kde-apps/kpat-18.04.3 >=kde-apps/kreversi-18.04.3 >=kde-apps/kshisen-18.04.3 >=kde-apps/ksirk-18.04.3 >=kde-apps/ksnakeduel-18.04.3 >=kde-apps/kspaceduel-18.04.3 >=kde-apps/ksquares-18.04.3 >=kde-apps/ktuberling-18.04.3 >=kde-apps/libkdegames-18.04.3 >=kde-apps/libkmahjongg-18.04.3 >=kde-apps/lskat-18.04.3 >=kde-apps/palapeli-18.04.3 >=kde-apps/picmi-18.04.3 opengl? ( >=kde-apps/ksudoku-18.04.3 >=kde-apps/kubrick-18.04.3 ) python? ( >=kde-apps/kajongg-18.04.3 ) !kde-apps/kdegames-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=851480dcb41008ab004d6d9dd2224060
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdegames-meta-18.08.1
deleted file mode 100644
index 018e48d97419..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-18.08.1
+++ /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-18.08.1 >=kde-apps/bovo-18.08.1 >=kde-apps/granatier-18.08.1 >=kde-apps/kapman-18.08.1 >=kde-apps/katomic-18.08.1 >=kde-apps/kblackbox-18.08.1 >=kde-apps/kblocks-18.08.1 >=kde-apps/kbounce-18.08.1 >=kde-apps/kbreakout-18.08.1 >=kde-apps/kdiamond-18.08.1 >=kde-apps/kfourinline-18.08.1 >=kde-apps/kgoldrunner-18.08.1 >=kde-apps/kigo-18.08.1 >=kde-apps/killbots-18.08.1 >=kde-apps/kiriki-18.08.1 >=kde-apps/kjumpingcube-18.08.1 >=kde-apps/klickety-18.08.1 >=kde-apps/klines-18.08.1 >=kde-apps/kmahjongg-18.08.1 >=kde-apps/kmines-18.08.1 >=kde-apps/knavalbattle-18.08.1 >=kde-apps/knetwalk-18.08.1 >=kde-apps/kolf-18.08.1 >=kde-apps/kollision-18.08.1 >=kde-apps/konquest-18.08.1 >=kde-apps/kpat-18.04.3 >=kde-apps/kreversi-18.08.1 >=kde-apps/kshisen-18.08.1 >=kde-apps/ksirk-18.08.1 >=kde-apps/ksnakeduel-18.08.1 >=kde-apps/kspaceduel-18.08.1 >=kde-apps/ksquares-18.08.1 >=kde-apps/ktuberling-18.08.1 >=kde-apps/libkdegames-18.08.1 >=kde-apps/libkmahjongg-18.08.1 >=kde-apps/lskat-18.08.1 >=kde-apps/palapeli-18.08.1 >=kde-apps/picmi-18.08.1 opengl? ( >=kde-apps/ksudoku-18.08.1 >=kde-apps/kubrick-18.08.1 ) python? ( >=kde-apps/kajongg-18.08.1 ) !kde-apps/kdegames-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a2db926d80e3a4a8d52f030093ab0a1b
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdegames-meta-18.08.2
new file mode 100644
index 000000000000..60d930909159
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-18.08.2
@@ -0,0 +1,11 @@
+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-18.08.2 >=kde-apps/bovo-18.08.2 >=kde-apps/granatier-18.08.2 >=kde-apps/kapman-18.08.2 >=kde-apps/katomic-18.08.2 >=kde-apps/kblackbox-18.08.2 >=kde-apps/kblocks-18.08.2 >=kde-apps/kbounce-18.08.2 >=kde-apps/kbreakout-18.08.2 >=kde-apps/kdiamond-18.08.2 >=kde-apps/kfourinline-18.08.2 >=kde-apps/kgoldrunner-18.08.2 >=kde-apps/kigo-18.08.2 >=kde-apps/killbots-18.08.2 >=kde-apps/kiriki-18.08.2 >=kde-apps/kjumpingcube-18.08.2 >=kde-apps/klickety-18.08.2 >=kde-apps/klines-18.08.2 >=kde-apps/kmahjongg-18.08.2 >=kde-apps/kmines-18.08.2 >=kde-apps/knavalbattle-18.08.2 >=kde-apps/knetwalk-18.08.2 >=kde-apps/kolf-18.08.2 >=kde-apps/kollision-18.08.2 >=kde-apps/konquest-18.08.2 >=kde-apps/kpat-18.04.3 >=kde-apps/kreversi-18.08.2 >=kde-apps/kshisen-18.08.2 >=kde-apps/ksirk-18.08.2 >=kde-apps/ksnakeduel-18.08.2 >=kde-apps/kspaceduel-18.08.2 >=kde-apps/ksquares-18.08.2 >=kde-apps/ktuberling-18.08.2 >=kde-apps/libkdegames-18.08.2 >=kde-apps/libkmahjongg-18.08.2 >=kde-apps/lskat-18.08.2 >=kde-apps/palapeli-18.08.2 >=kde-apps/picmi-18.08.2 opengl? ( >=kde-apps/ksudoku-18.08.2 >=kde-apps/kubrick-18.08.2 ) python? ( >=kde-apps/kajongg-18.08.2 ) !kde-apps/kdegames-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4938e5b158e613f5ee880fd363aaef2e
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.3
index c3cc41fe991b..ce0d3e1b3fb4 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/gwenview-18.04.3 >=kde-apps/kamera-18.04.3 >=kde-apps/kcolorchooser-18.04.3 >=kde-apps/kdegraphics-mobipocket-18.04.3 >=kde-apps/kolourpaint-18.04.3 >=kde-apps/kruler-18.04.3 >=kde-apps/libkdcraw-18.04.3 >=kde-apps/libkexiv2-18.04.3 >=kde-apps/libkipi-18.04.3 >=kde-apps/okular-18.04.3 >=kde-apps/spectacle-18.04.3 >=kde-apps/svgpart-18.04.3 >=kde-apps/thumbnailers-18.04.3 scanner? ( >=kde-apps/libksane-18.04.3 ) !kde-apps/kdegraphics-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=bb8ed734e5a0a2ff6331ccb1008ada71
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.08.1
deleted file mode 100644
index 5eb5de586da6..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.08.1
+++ /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-18.08.1 >=kde-apps/kamera-18.08.1 >=kde-apps/kcolorchooser-18.08.1 >=kde-apps/kdegraphics-mobipocket-18.08.1 >=kde-apps/kolourpaint-18.08.1 >=kde-apps/kruler-18.08.1 >=kde-apps/libkdcraw-18.08.1 >=kde-apps/libkexiv2-18.08.1 >=kde-apps/libkipi-18.08.1 >=kde-apps/okular-18.08.1 >=kde-apps/spectacle-18.08.1 >=kde-apps/svgpart-18.08.1 >=kde-apps/thumbnailers-18.08.1 scanner? ( >=kde-apps/libksane-18.08.1 ) !kde-apps/kdegraphics-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.08.2
new file mode 100644
index 000000000000..7c87c3069503
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.08.2
@@ -0,0 +1,11 @@
+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-18.08.2 >=kde-apps/kamera-18.08.2 >=kde-apps/kcolorchooser-18.08.2 >=kde-apps/kdegraphics-mobipocket-18.08.2 >=kde-apps/kolourpaint-18.08.2 >=kde-apps/kruler-18.08.2 >=kde-apps/libkdcraw-18.08.2 >=kde-apps/libkexiv2-18.08.2 >=kde-apps/libkipi-18.08.2 >=kde-apps/okular-18.08.2 >=kde-apps/spectacle-18.08.2 >=kde-apps/svgpart-18.08.2 >=kde-apps/thumbnailers-18.08.2 scanner? ( >=kde-apps/libksane-18.08.2 ) !kde-apps/kdegraphics-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3bd999721808f964459231a3a80443f2
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.3
index 5f31dfeca2e2..ad83edc59512 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.46.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdegraphics-mobipocket-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e233ca9040255226596502f44ed301e3
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.1
deleted file mode 100644
index 378b4590049e..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.49.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.4:5 thumbnail? ( >=kde-frameworks/kio-5.49.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdegraphics-mobipocket-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.2 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.2
new file mode 100644
index 000000000000..a8a2f2d090a4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.4:5 thumbnail? ( >=kde-frameworks/kio-5.50.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdegraphics-mobipocket-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=25155f75fb8b07c768bdbc3ae5e8c9d5
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.3
index dfdf6ffb807f..21cf2a10eb6a 100644
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dragon-18.04.3 >=kde-apps/juk-18.04.3 >=kde-apps/kdenlive-18.04.3 >=kde-apps/kmix-18.04.3 >=kde-apps/kwave-18.04.3 >=kde-apps/libkcddb-18.04.3 cdrom? ( >=kde-apps/audiocd-kio-18.04.3 >=kde-apps/k3b-18.04.3 >=kde-apps/libkcompactdisc-18.04.3 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.04.3 ) gstreamer? ( >=kde-apps/kamoso-18.04.3 ) !kde-apps/kdemultimedia-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=577d243047ba7785a36c52e9e12c27ce
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.08.1
deleted file mode 100644
index bb2b83210c20..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.08.1
+++ /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 gstreamer
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dragon-18.08.1 >=kde-apps/juk-18.08.1 >=kde-apps/kdenlive-18.08.1 >=kde-apps/kmix-18.08.1 >=kde-apps/kwave-18.08.1 >=kde-apps/libkcddb-18.08.1 cdrom? ( >=kde-apps/audiocd-kio-18.08.1 >=kde-apps/k3b-18.08.1 >=kde-apps/libkcompactdisc-18.08.1 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.08.1 ) gstreamer? ( >=kde-apps/kamoso-18.08.1 ) !kde-apps/kdemultimedia-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=19533069cf8a831929fa766cdc8d0381
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.08.2
new file mode 100644
index 000000000000..3c6a2ff8407c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.08.2
@@ -0,0 +1,11 @@
+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 gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dragon-18.08.2 >=kde-apps/juk-18.08.2 >=kde-apps/kdenlive-18.08.2 >=kde-apps/kmix-18.08.2 >=kde-apps/kwave-18.08.2 >=kde-apps/libkcddb-18.08.2 cdrom? ( >=kde-apps/audiocd-kio-18.08.2 >=kde-apps/k3b-18.08.2 >=kde-apps/libkcompactdisc-18.08.2 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.08.2 ) gstreamer? ( >=kde-apps/kamoso-18.08.2 ) !kde-apps/kdemultimedia-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9c5db0cc48b21e632d9219ef3a9e9e6c
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.3
index 23df8c7eff38..cdf806e39ce6 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-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/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdenetwork-filesharing-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=26b94e0c50648369b567ecb7a129470d
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.1
deleted file mode 100644
index b86d39ee5e78..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdenetwork-filesharing-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.2 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.2
new file mode 100644
index 000000000000..4047b74d3e3c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdenetwork-filesharing-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b84b778f694e0b9b17345cbe3e66fb2c
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.3
index 76c244f351ff..82bd78e073e7 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdenetwork-filesharing-18.04.3 >=kde-apps/kget-18.04.3 >=kde-apps/krdc-18.04.3 >=kde-apps/kopete-18.04.3 >=kde-apps/krfb-18.04.3 >=kde-apps/zeroconf-ioslave-18.04.3 telepathy? ( >=kde-apps/plasma-telepathy-meta-18.04.3 ) !kde-apps/kdenetwork-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=372075be5e1bb6c96a277f56a74c4f55
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.08.1
deleted file mode 100644
index ad89782f1df0..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.08.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+telepathy
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdenetwork-filesharing-18.08.1 >=kde-apps/kget-18.08.1 >=kde-apps/krdc-18.08.1 >=kde-apps/kopete-18.08.1 >=kde-apps/krfb-18.08.1 >=kde-apps/zeroconf-ioslave-18.08.1 telepathy? ( >=kde-apps/plasma-telepathy-meta-18.08.1 ) !kde-apps/kdenetwork-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=65b9dc7995b65aef238a474de1947348
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.08.2
new file mode 100644
index 000000000000..85ad7c72a266
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.08.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+telepathy
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdenetwork-filesharing-18.08.2 >=kde-apps/kget-18.08.2 >=kde-apps/krdc-18.08.2 >=kde-apps/kopete-18.08.2 >=kde-apps/krfb-18.08.2 >=kde-apps/zeroconf-ioslave-18.08.2 telepathy? ( >=kde-apps/plasma-telepathy-meta-18.08.2 ) !kde-apps/kdenetwork-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=98904c6895530df111f3f30e1e14adc6
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.04.3-r1 b/metadata/md5-cache/kde-apps/kdenlive-18.04.3-r1
index b147236aa4a3..586c79b0afa9 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-18.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kdenlive-18.04.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-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/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/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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-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.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.6.0-r1[ffmpeg,kdenlive,melt,qt5,sdl,sdl2(+),xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdenlive-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d5112be553729994200ed85bc04ac0b
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.08.1 b/metadata/md5-cache/kde-apps/kdenlive-18.08.1
deleted file mode 100644
index fd8153d7b658..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.10.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.49.0:5 ) share? ( >=kde-frameworks/purpose-5.49.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtconcurrent-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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 share v4l debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.10.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.49.0:5 ) share? ( >=kde-frameworks/purpose-5.49.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdenlive-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=61024c5af05fe3f868907905b597081b
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.08.2 b/metadata/md5-cache/kde-apps/kdenlive-18.08.2
new file mode 100644
index 000000000000..5d42b710d083
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenlive-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.10.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.50.0:5 ) share? ( >=kde-frameworks/purpose-5.50.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtconcurrent-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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 share v4l debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.10.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.50.0:5 ) share? ( >=kde-frameworks/purpose-5.50.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdenlive-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=232014ba2d564cfd0d90936d0ad365e1
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.3 b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.3
index 3773627b4a86..566609711f95 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdepim-addons-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae25d4a87bea6e93ea726b6f3c926fba
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.08.1 b/metadata/md5-cache/kde-apps/kdepim-addons-18.08.1
deleted file mode 100644
index d2af340bd3bc..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/prison-5.49.0:5 >=kde-frameworks/syntax-highlighting-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-notes-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/eventviews-18.08.1:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/incidenceeditor-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kimap-18.08.1:5 >=kde-apps/kitinerary-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpkpass-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=kde-apps/libksieve-18.08.1:5 >=kde-apps/libktnef-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.08.1: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.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/prison-5.49.0:5 >=kde-frameworks/syntax-highlighting-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-notes-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/eventviews-18.08.1:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/incidenceeditor-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kimap-18.08.1:5 >=kde-apps/kitinerary-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpkpass-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=kde-apps/libksieve-18.08.1:5 >=kde-apps/libktnef-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.08.1:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdepim-addons-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ec2b479bae1fddc1ec5249a7a24ba18c
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.08.2 b/metadata/md5-cache/kde-apps/kdepim-addons-18.08.2
new file mode 100644
index 000000000000..cd55ae93e104
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/prison-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-notes-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/eventviews-18.08.2:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/incidenceeditor-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kimap-18.08.2:5 >=kde-apps/kitinerary-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpkpass-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=kde-apps/libksieve-18.08.2:5 >=kde-apps/libktnef-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.08.2: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.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/prison-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-notes-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/eventviews-18.08.2:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/incidenceeditor-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kimap-18.08.2:5 >=kde-apps/kitinerary-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpkpass-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=kde-apps/libksieve-18.08.2:5 >=kde-apps/libktnef-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.08.2:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdepim-addons-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f5a5721cb1a9f6201e527b885c2dc0bd
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.3
index 1fb97ed98693..56ff74b79956 100644
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 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 >=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/prison-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdepim-apps-libs-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fbcb637d0c5141c18a78b27da5c5ac8
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.1
deleted file mode 100644
index db171ea941d8..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/prison-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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=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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/prison-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdepim-apps-libs-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.2 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.2
new file mode 100644
index 000000000000..dd7e085089bd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/prison-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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=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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/prison-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdepim-apps-libs-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1c404615eaf454e0ea81eb3050dcac8b
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3
index cf6870cdb9c9..70dab21a7cc6 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/akonadi-18.04.3 >=kde-apps/akonadiconsole-18.04.3 >=kde-apps/akonadi-calendar-18.04.3 >=kde-apps/akonadi-contacts-18.04.3 >=kde-apps/akonadi-import-wizard-18.04.3 >=kde-apps/akonadi-mime-18.04.3 >=kde-apps/akonadi-notes-18.04.3 >=kde-apps/akonadi-search-18.04.3 >=kde-apps/akregator-18.04.3 >=kde-apps/calendarjanitor-18.04.3 >=kde-apps/calendarsupport-18.04.3 >=kde-apps/eventviews-18.04.3 >=kde-apps/grantlee-editor-18.04.3 >=kde-apps/grantleetheme-18.04.3 >=kde-apps/incidenceeditor-18.04.3 >=kde-apps/kaddressbook-18.04.3 >=kde-apps/kalarm-18.04.3 >=kde-apps/kalarmcal-18.04.3 >=kde-apps/kcalcore-18.04.3 >=kde-apps/kcalutils-18.04.3 >=kde-apps/kcontacts-18.04.3 >=kde-apps/kdepim-addons-18.04.3 >=kde-apps/kdepim-apps-libs-18.04.3 >=kde-apps/kdepim-runtime-18.04.3 >=kde-apps/kidentitymanagement-18.04.3 >=kde-apps/kimap-18.04.3 >=kde-apps/kldap-18.04.3 >=kde-apps/kleopatra-18.04.3 >=kde-apps/kmail-18.04.3 >=kde-apps/kmail-account-wizard-18.04.3 >=kde-apps/kmailtransport-18.04.3 >=kde-apps/kmbox-18.04.3 >=kde-apps/kmime-18.04.3 >=kde-apps/knotes-18.04.3 >=kde-apps/konsolekalendar-18.04.3 >=kde-apps/kontact-18.04.3 >=kde-apps/kontactinterface-18.04.3 >=kde-apps/korganizer-18.04.3 >=kde-apps/kpimtextedit-18.04.3 >=kde-apps/ksmtp-18.04.3 >=kde-apps/libgravatar-18.04.3 >=kde-apps/libkdepim-18.04.3 >=kde-apps/libkgapi-18.04.3 >=kde-apps/libkleo-18.04.3 >=kde-apps/libksieve-18.04.3 >=kde-apps/libktnef-18.04.3 >=kde-apps/mailcommon-18.04.3 >=kde-apps/mailimporter-18.04.3 >=kde-apps/mbox-importer-18.04.3 >=kde-apps/messagelib-18.04.3 >=kde-apps/pim-data-exporter-18.04.3 >=kde-apps/pim-sieve-editor-18.04.3 >=kde-apps/pimcommon-18.04.3 >=kde-apps/syndication-18.04.3 !kde-apps/kdepim-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=af0905bd85bddb7a4219cdf2d068c6d9
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3-r1 b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3-r1
index 0cd4a621fb1c..1a89ce8dc9e1 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3-r1
@@ -2,9 +2,9 @@ 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
+KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/akonadi-18.04.3 >=kde-apps/akonadiconsole-18.04.3 >=kde-apps/akonadi-calendar-18.04.3 >=kde-apps/akonadi-contacts-18.04.3 >=kde-apps/akonadi-import-wizard-18.04.3 >=kde-apps/akonadi-mime-18.04.3 >=kde-apps/akonadi-notes-18.04.3 >=kde-apps/akonadi-search-18.04.3 >=kde-apps/akregator-18.04.3 >=kde-apps/calendarjanitor-18.04.3 >=kde-apps/calendarsupport-18.04.3 >=kde-apps/eventviews-18.04.3 >=kde-apps/grantlee-editor-18.04.3 >=kde-apps/grantleetheme-18.04.3 >=kde-apps/incidenceeditor-18.04.3 >=kde-apps/kaddressbook-18.04.3 >=kde-apps/kalarm-18.04.3 >=kde-apps/kalarmcal-18.04.3 >=kde-apps/kcalcore-18.04.3 >=kde-apps/kcalutils-18.04.3 >=kde-apps/kcontacts-18.04.3 >=kde-apps/kdepim-addons-18.04.3 >=kde-apps/kdepim-apps-libs-18.04.3 >=kde-apps/kdepim-runtime-18.04.3 >=kde-apps/kidentitymanagement-18.04.3 >=kde-apps/kimap-18.04.3 >=kde-apps/kldap-18.04.3 >=kde-apps/kleopatra-18.04.3 >=kde-apps/kmail-18.04.3 >=kde-apps/kmail-account-wizard-18.04.3 >=kde-apps/kmailtransport-18.04.3 >=kde-apps/kmbox-18.04.3 >=kde-apps/kmime-18.04.3 >=kde-apps/knotes-18.04.3 >=kde-apps/konsolekalendar-18.04.3 >=kde-apps/kontact-18.04.3 >=kde-apps/kontactinterface-18.04.3 >=kde-apps/korganizer-18.04.3 >=kde-apps/kpimtextedit-18.04.3 >=kde-apps/ksmtp-18.04.3 >=kde-apps/libgravatar-18.04.3 >=kde-apps/libkdepim-18.04.3 >=kde-apps/libkgapi-18.04.3 >=kde-apps/libkleo-18.04.3 >=kde-apps/libksieve-18.04.3 >=kde-apps/libktnef-18.04.3 >=kde-apps/mailcommon-18.04.3 >=kde-apps/mailimporter-18.04.3 >=kde-apps/mbox-importer-18.04.3 >=kde-apps/messagelib-18.04.3 >=kde-apps/pim-data-exporter-18.04.3 >=kde-apps/pim-sieve-editor-18.04.3 >=kde-apps/pimcommon-18.04.3 !kde-apps/kdepim-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=887d2cf16c4bbd2396fbb909760b4465
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d026bfd18c25908c3da4ca43149d5a72
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdepim-meta-18.08.1
deleted file mode 100644
index 424160ea1c5f..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-18.08.1
+++ /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-apps/akonadi-18.08.1 >=kde-apps/akonadiconsole-18.08.1 >=kde-apps/akonadi-calendar-18.08.1 >=kde-apps/akonadi-contacts-18.08.1 >=kde-apps/akonadi-import-wizard-18.08.1 >=kde-apps/akonadi-mime-18.08.1 >=kde-apps/akonadi-notes-18.08.1 >=kde-apps/akonadi-search-18.08.1 >=kde-apps/akregator-18.08.1 >=kde-apps/calendarjanitor-18.08.1 >=kde-apps/calendarsupport-18.08.1 >=kde-apps/eventviews-18.08.1 >=kde-apps/grantlee-editor-18.08.1 >=kde-apps/grantleetheme-18.08.1 >=kde-apps/incidenceeditor-18.08.1 >=kde-apps/kaddressbook-18.08.1 >=kde-apps/kalarm-18.08.1 >=kde-apps/kalarmcal-18.08.1 >=kde-apps/kcalcore-18.08.1 >=kde-apps/kcalutils-18.08.1 >=kde-apps/kcontacts-18.08.1 >=kde-apps/kdepim-addons-18.08.1 >=kde-apps/kdepim-apps-libs-18.08.1 >=kde-apps/kdepim-runtime-18.08.1 >=kde-apps/kidentitymanagement-18.08.1 >=kde-apps/kimap-18.08.1 >=kde-apps/kitinerary-18.08.1 >=kde-apps/kldap-18.08.1 >=kde-apps/kleopatra-18.08.1 >=kde-apps/kmail-18.08.1 >=kde-apps/kmail-account-wizard-18.08.1 >=kde-apps/kmailtransport-18.08.1 >=kde-apps/kmbox-18.08.1 >=kde-apps/kmime-18.08.1 >=kde-apps/knotes-18.08.1 >=kde-apps/konsolekalendar-18.08.1 >=kde-apps/kontact-18.08.1 >=kde-apps/kontactinterface-18.08.1 >=kde-apps/korganizer-18.08.1 >=kde-apps/kpimtextedit-18.08.1 >=kde-apps/kpkpass-18.08.1 >=kde-apps/ksmtp-18.08.1 >=kde-apps/libgravatar-18.08.1 >=kde-apps/libkdepim-18.08.1 >=kde-apps/libkgapi-18.08.1 >=kde-apps/libkleo-18.08.1 >=kde-apps/libksieve-18.08.1 >=kde-apps/libktnef-18.08.1 >=kde-apps/mailcommon-18.08.1 >=kde-apps/mailimporter-18.08.1 >=kde-apps/mbox-importer-18.08.1 >=kde-apps/messagelib-18.08.1 >=kde-apps/pim-data-exporter-18.08.1 >=kde-apps/pim-sieve-editor-18.08.1 >=kde-apps/pimcommon-18.08.1 !kde-apps/kdepim-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=69af1fb27e56b9931fac8ee459a12356
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdepim-meta-18.08.2
new file mode 100644
index 000000000000..450ca6ecc33c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-18.08.2
@@ -0,0 +1,10 @@
+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-apps/akonadi-18.08.2 >=kde-apps/akonadiconsole-18.08.2 >=kde-apps/akonadi-calendar-18.08.2 >=kde-apps/akonadi-contacts-18.08.2 >=kde-apps/akonadi-import-wizard-18.08.2 >=kde-apps/akonadi-mime-18.08.2 >=kde-apps/akonadi-notes-18.08.2 >=kde-apps/akonadi-search-18.08.2 >=kde-apps/akregator-18.08.2 >=kde-apps/calendarjanitor-18.08.2 >=kde-apps/calendarsupport-18.08.2 >=kde-apps/eventviews-18.08.2 >=kde-apps/grantlee-editor-18.08.2 >=kde-apps/grantleetheme-18.08.2 >=kde-apps/incidenceeditor-18.08.2 >=kde-apps/kaddressbook-18.08.2 >=kde-apps/kalarm-18.08.2 >=kde-apps/kalarmcal-18.08.2 >=kde-apps/kcalcore-18.08.2 >=kde-apps/kcalutils-18.08.2 >=kde-apps/kcontacts-18.08.2 >=kde-apps/kdepim-addons-18.08.2 >=kde-apps/kdepim-apps-libs-18.08.2 >=kde-apps/kdepim-runtime-18.08.2 >=kde-apps/kidentitymanagement-18.08.2 >=kde-apps/kimap-18.08.2 >=kde-apps/kitinerary-18.08.2 >=kde-apps/kldap-18.08.2 >=kde-apps/kleopatra-18.08.2 >=kde-apps/kmail-18.08.2 >=kde-apps/kmail-account-wizard-18.08.2 >=kde-apps/kmailtransport-18.08.2 >=kde-apps/kmbox-18.08.2 >=kde-apps/kmime-18.08.2 >=kde-apps/knotes-18.08.2 >=kde-apps/konsolekalendar-18.08.2 >=kde-apps/kontact-18.08.2 >=kde-apps/kontactinterface-18.08.2 >=kde-apps/korganizer-18.08.2 >=kde-apps/kpimtextedit-18.08.2 >=kde-apps/kpkpass-18.08.2 >=kde-apps/ksmtp-18.08.2 >=kde-apps/libgravatar-18.08.2 >=kde-apps/libkdepim-18.08.2 >=kde-apps/libkgapi-18.08.2 >=kde-apps/libkleo-18.08.2 >=kde-apps/libksieve-18.08.2 >=kde-apps/libktnef-18.08.2 >=kde-apps/mailcommon-18.08.2 >=kde-apps/mailimporter-18.08.2 >=kde-apps/mbox-importer-18.08.2 >=kde-apps/messagelib-18.08.2 >=kde-apps/pim-data-exporter-18.08.2 >=kde-apps/pim-sieve-editor-18.08.2 >=kde-apps/pimcommon-18.08.2 !kde-apps/kdepim-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1a97feb4e37e4afb7081ceae8cf17b7c
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.3 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.3
index cce77d05f999..8820c5019ea0 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdepim-runtime-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=69cbeeeedbc4070e9241b941db8b8145
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.1 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.1
deleted file mode 100644
index 3b77522bd368..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kholidays-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/akonadi-notes-18.08.1:5 >=kde-apps/kalarmcal-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdav-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kimap-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmbox-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkgapi-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/libxslt test? ( >=kde-apps/kimap-18.08.1: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kholidays-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/akonadi-notes-18.08.1:5 >=kde-apps/kalarmcal-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdav-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kimap-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmbox-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkgapi-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.49.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdepim-runtime-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bb2bc8e4f3f5caf2df0b7d90e9de6394
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.2 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.2
new file mode 100644
index 000000000000..ea01f7346215
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/akonadi-notes-18.08.2:5 >=kde-apps/kalarmcal-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdav-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kimap-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmbox-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkgapi-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/libxslt test? ( >=kde-apps/kimap-18.08.2: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/akonadi-notes-18.08.2:5 >=kde-apps/kalarmcal-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdav-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kimap-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmbox-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkgapi-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.50.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdepim-runtime-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e8f1c01742b00cd271b45e451d62bf09
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.3
index ea56376d8240..420895b85e5a 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdesdk-kioslaves-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3c15e0450a1bd4ec54eecf3ecd4b08d
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.1
deleted file mode 100644
index c4c6bab6e6e9..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdesdk-kioslaves-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.2 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.2
new file mode 100644
index 000000000000..06879fa5a503
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdesdk-kioslaves-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c851296ef545255ce2a545dbb1fcffe0
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.3
index 7b7e13ac4619..4b35da4ff1d2 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-plugins-18.04.3 >=kde-apps/kapptemplate-18.04.3 >=kde-apps/kcachegrind-18.04.3 >=kde-apps/kde-dev-scripts-18.04.3 >=kde-apps/kde-dev-utils-18.04.3 >=kde-apps/kdesdk-kioslaves-18.04.3 >=kde-apps/kdesdk-thumbnailers-18.04.3 >=kde-apps/kompare-18.04.3 >=kde-apps/kross-interpreters-18.04.3 >=kde-apps/libkomparediff2-18.04.3 >=kde-apps/lokalize-18.04.3 >=kde-apps/poxml-18.04.3 >=kde-apps/umbrello-18.04.3 cvs? ( >=kde-apps/cervisia-18.04.3 ) !kde-apps/kdesdk-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c80888ec990040efd2f8a98ef6e69ebe
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.08.1
deleted file mode 100644
index 36a5f1cf094e..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-18.08.1
+++ /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-18.08.1 >=kde-apps/kapptemplate-18.08.1 >=kde-apps/kcachegrind-18.08.1 >=kde-apps/kde-dev-scripts-18.08.1 >=kde-apps/kde-dev-utils-18.08.1 >=kde-apps/kdesdk-kioslaves-18.08.1 >=kde-apps/kdesdk-thumbnailers-18.08.1 >=kde-apps/kompare-18.08.1 >=kde-apps/kross-interpreters-18.08.1 >=kde-apps/libkomparediff2-18.08.1 >=kde-apps/lokalize-18.08.1 >=kde-apps/poxml-18.08.1 >=kde-apps/umbrello-18.08.1 cvs? ( >=kde-apps/cervisia-18.08.1 ) !kde-apps/kdesdk-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ecdbdfbfef966e8bf2000c3e1d12667e
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.08.2
new file mode 100644
index 000000000000..299610a2206a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-18.08.2
@@ -0,0 +1,11 @@
+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-18.08.2 >=kde-apps/kapptemplate-18.08.2 >=kde-apps/kcachegrind-18.08.2 >=kde-apps/kde-dev-scripts-18.08.2 >=kde-apps/kde-dev-utils-18.08.2 >=kde-apps/kdesdk-kioslaves-18.08.2 >=kde-apps/kdesdk-thumbnailers-18.08.2 >=kde-apps/kompare-18.08.2 >=kde-apps/kross-interpreters-18.08.2 >=kde-apps/libkomparediff2-18.08.2 >=kde-apps/lokalize-18.08.2 >=kde-apps/poxml-18.08.2 >=kde-apps/umbrello-18.08.2 cvs? ( >=kde-apps/cervisia-18.08.2 ) !kde-apps/kdesdk-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=8b18a68aa6ed05a1a4e7acb134760013
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.3
index ee2fb0415894..a5310da26092 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdesdk-thumbnailers-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c76569bd603747f8c7430c392dd9799f
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.1
deleted file mode 100644
index 7606a4e3e542..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdesdk-thumbnailers-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.2 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.2
new file mode 100644
index 000000000000..a047cd8b3073
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdesdk-thumbnailers-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6168aa1022343dd7d182c9f642ec051a
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.3
index 26c6fb568672..5c76555e0833 100644
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ark-18.04.3 >=kde-apps/filelight-18.04.3 >=kde-apps/kbackup-18.04.3 >=kde-apps/kcalc-18.04.3 >=kde-apps/kcharselect-18.04.3 >=kde-apps/kdebugsettings-18.04.3 >=kde-apps/kdf-18.04.3 >=kde-apps/kgpg-18.04.3 >=kde-apps/kimagemapeditor-18.04.3 >=kde-apps/kteatime-18.04.3 >=kde-apps/ktimer-18.04.3 >=kde-apps/kwalletmanager-18.04.3 >=kde-apps/sweeper-18.04.3 cups? ( >=kde-apps/print-manager-18.04.3 ) floppy? ( >=kde-apps/kfloppy-18.04.3 ) !kde-apps/kdeutils-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=016bb9c960387aa9309067571b31823a
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.08.1 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.08.1
deleted file mode 100644
index 415766e978df..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-18.08.1
+++ /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-18.08.1 >=kde-apps/filelight-18.08.1 >=kde-apps/kbackup-18.08.1 >=kde-apps/kcalc-18.08.1 >=kde-apps/kcharselect-18.08.1 >=kde-apps/kdebugsettings-18.08.1 >=kde-apps/kdf-18.08.1 >=kde-apps/kgpg-18.08.1 >=kde-apps/kimagemapeditor-18.08.1 >=kde-apps/kteatime-18.08.1 >=kde-apps/ktimer-18.08.1 >=kde-apps/kwalletmanager-18.08.1 >=kde-apps/sweeper-18.08.1 cups? ( >=kde-apps/print-manager-18.08.1 ) floppy? ( >=kde-apps/kfloppy-18.08.1 ) !kde-apps/kdeutils-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=43fac0da81f9d8d20e482aa8d349d94c
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.08.2 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.08.2
new file mode 100644
index 000000000000..cc21d7de0101
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-18.08.2
@@ -0,0 +1,11 @@
+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-18.08.2 >=kde-apps/filelight-18.08.2 >=kde-apps/kbackup-18.08.2 >=kde-apps/kcalc-18.08.2 >=kde-apps/kcharselect-18.08.2 >=kde-apps/kdebugsettings-18.08.2 >=kde-apps/kdf-18.08.2 >=kde-apps/kgpg-18.08.2 >=kde-apps/kimagemapeditor-18.08.2 >=kde-apps/kteatime-18.08.2 >=kde-apps/ktimer-18.08.2 >=kde-apps/kwalletmanager-18.08.2 >=kde-apps/sweeper-18.08.2 cups? ( >=kde-apps/print-manager-18.08.2 ) floppy? ( >=kde-apps/kfloppy-18.08.2 ) !kde-apps/kdeutils-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b3ffe3df1e32164b51be6976fb30460f
diff --git a/metadata/md5-cache/kde-apps/kdf-18.04.3 b/metadata/md5-cache/kde-apps/kdf-18.04.3
index 6a08b1d5fba0..ddf8ff55a0bf 100644
--- a/metadata/md5-cache/kde-apps/kdf-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdf-18.04.3
@@ -9,5 +9,5 @@ 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/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/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdf-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24c2dfc62cdb446ff315880a995b4d1f
diff --git a/metadata/md5-cache/kde-apps/kdf-18.08.1 b/metadata/md5-cache/kde-apps/kdf-18.08.1
deleted file mode 100644
index d00bad48ffb1..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdf-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdf-18.08.2 b/metadata/md5-cache/kde-apps/kdf-18.08.2
new file mode 100644
index 000000000000..1d9ade3a93e3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdf-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdf-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=92b640b5ed280a1e109d84821a16e509
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.04.3 b/metadata/md5-cache/kde-apps/kdialog-18.04.3
index 02a8aec15ce1..0ea52eee0eff 100644
--- a/metadata/md5-cache/kde-apps/kdialog-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdialog-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-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/knotifications-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 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdialog-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aa335a44faa9a7e3d0d2a7f7d58bb41d
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.08.1 b/metadata/md5-cache/kde-apps/kdialog-18.08.1
deleted file mode 100644
index 6c24f0f1cbd6..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdialog-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.08.2 b/metadata/md5-cache/kde-apps/kdialog-18.08.2
new file mode 100644
index 000000000000..d855a2e887fa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdialog-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdialog-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fdd0af5e8850792d2e0de563f90d5156
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.04.3 b/metadata/md5-cache/kde-apps/kdiamond-18.04.3
index ccbe10d5dd02..944dad887ce8 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-18.04.3
+++ b/metadata/md5-cache/kde-apps/kdiamond-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-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/knotifyconfig-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdiamond-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=358634852ab7cab926d16c2255029ebe
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.08.1 b/metadata/md5-cache/kde-apps/kdiamond-18.08.1
deleted file mode 100644
index 64732bf6825d..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdiamond-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.08.2 b/metadata/md5-cache/kde-apps/kdiamond-18.08.2
new file mode 100644
index 000000000000..1eb6fc8d0feb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdiamond-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdiamond-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=867b26fc13a8a987e51f07e537a56591
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.3 b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.3
index f1fbd679450b..f32090ede887 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.3
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-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/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 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/keditbookmarks-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=853e5fbb7e0e5e2516b1478df5211f31
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.08.1 b/metadata/md5-cache/kde-apps/keditbookmarks-18.08.1
deleted file mode 100644
index bf1122b2d1f5..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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-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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/keditbookmarks-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.08.2 b/metadata/md5-cache/kde-apps/keditbookmarks-18.08.2
new file mode 100644
index 000000000000..ab292a557128
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/keditbookmarks-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ec8dc827f29871bff356f910fda1c1ad
diff --git a/metadata/md5-cache/kde-apps/kfind-18.04.3 b/metadata/md5-cache/kde-apps/kfind-18.04.3
index 97b0ca77f6cd..f6dad0490ccf 100644
--- a/metadata/md5-cache/kde-apps/kfind-18.04.3
+++ b/metadata/md5-cache/kde-apps/kfind-18.04.3
@@ -9,5 +9,5 @@ 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/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-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/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kfind-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8fd8925dbfd5415de38fb78a977859a3
diff --git a/metadata/md5-cache/kde-apps/kfind-18.08.1 b/metadata/md5-cache/kde-apps/kfind-18.08.1
deleted file mode 100644
index b78bded87add..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kfind-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cdf5b5647d714aae0431751f0704625d
diff --git a/metadata/md5-cache/kde-apps/kfind-18.08.2 b/metadata/md5-cache/kde-apps/kfind-18.08.2
new file mode 100644
index 000000000000..635094077710
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfind-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kfind-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1626d4c2f3197192bf0e550d238ce78e
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.04.3 b/metadata/md5-cache/kde-apps/kfloppy-18.04.3
index d71858aa202e..62ce7b6d46d2 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-18.04.3
+++ b/metadata/md5-cache/kde-apps/kfloppy-18.04.3
@@ -9,5 +9,5 @@ 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/kwidgetsaddons-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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kfloppy-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18f96e7e8b0f4ac29ae570ab2a04741f
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.08.1 b/metadata/md5-cache/kde-apps/kfloppy-18.08.1
deleted file mode 100644
index 6349f89da3e5..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kfloppy-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.08.2 b/metadata/md5-cache/kde-apps/kfloppy-18.08.2
new file mode 100644
index 000000000000..03dbd371cab2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfloppy-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kfloppy-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=37b6a484b71ae2159115ae351c168c6b
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.04.3 b/metadata/md5-cache/kde-apps/kfourinline-18.04.3
index ecfca66a2fea..51ef528c3281 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-18.04.3
+++ b/metadata/md5-cache/kde-apps/kfourinline-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kfourinline-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=93c9068f0a40b2159ba1fce5afb178a7
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.08.1 b/metadata/md5-cache/kde-apps/kfourinline-18.08.1
deleted file mode 100644
index d95824c0e468..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kfourinline-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.08.2 b/metadata/md5-cache/kde-apps/kfourinline-18.08.2
new file mode 100644
index 000000000000..00d39452f35c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfourinline-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kfourinline-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6aff357b115bf24096a0b51831d755b0
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.04.3 b/metadata/md5-cache/kde-apps/kgeography-18.04.3
index 0d3ba7a79cf6..0ed214ee5f0b 100644
--- a/metadata/md5-cache/kde-apps/kgeography-18.04.3
+++ b/metadata/md5-cache/kde-apps/kgeography-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kgeography-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c9cae67b18c69be60a16c73ead27f9c
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.08.1 b/metadata/md5-cache/kde-apps/kgeography-18.08.1
deleted file mode 100644
index 624d2f452efe..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kgeography-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.08.2 b/metadata/md5-cache/kde-apps/kgeography-18.08.2
new file mode 100644
index 000000000000..8a2fd8e450c4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgeography-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kgeography-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0a54b5322c70d3ba3a8b2086aeb86b12
diff --git a/metadata/md5-cache/kde-apps/kget-18.04.3 b/metadata/md5-cache/kde-apps/kget-18.04.3
index 2b63d81f6edc..67c3417aabee 100644
--- a/metadata/md5-cache/kde-apps/kget-18.04.3
+++ b/metadata/md5-cache/kde-apps/kget-18.04.3
@@ -9,5 +9,5 @@ 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/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/kitemviews-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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-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/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kget-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db3c3c55388799034e89834cad00e957
diff --git a/metadata/md5-cache/kde-apps/kget-18.08.1 b/metadata/md5-cache/kde-apps/kget-18.08.1
deleted file mode 100644
index f61b9b0d1b0b..000000000000
--- a/metadata/md5-cache/kde-apps/kget-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) 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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=Advanced download manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kget/
-IUSE=bittorrent gpg kde mms sqlite debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kget-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7392a0cf28ee9e04f8dbaead57cb8ebe
diff --git a/metadata/md5-cache/kde-apps/kget-18.08.2 b/metadata/md5-cache/kde-apps/kget-18.08.2
new file mode 100644
index 000000000000..28cf385c05cd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kget-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Advanced download manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kget/
+IUSE=bittorrent gpg kde mms sqlite debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kget-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=caabf0c10f1b96132398eee7cd4763ac
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.3 b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.3
index 5e566315d282..3186ec3a121e 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.3
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kgoldrunner-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=863558ed57928af9f80585fd91f00899
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.08.1 b/metadata/md5-cache/kde-apps/kgoldrunner-18.08.1
deleted file mode 100644
index e72ed2f4ad35..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kgoldrunner-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=96865c0555166daef74de5917d9332f0
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.08.2 b/metadata/md5-cache/kde-apps/kgoldrunner-18.08.2
new file mode 100644
index 000000000000..3b2dc4491b6f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=dev-qt/qtsvg-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kgoldrunner-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c904ee0cbf569003c59658c7a5e46fb5
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.04.3 b/metadata/md5-cache/kde-apps/kgpg-18.04.3
index d2393f225137..cc08fb00935e 100644
--- a/metadata/md5-cache/kde-apps/kgpg-18.04.3
+++ b/metadata/md5-cache/kde-apps/kgpg-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-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/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/knotifications-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-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kgpg-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=943309f987a6f5b260289452f9af288b
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.08.1 b/metadata/md5-cache/kde-apps/kgpg-18.08.1
deleted file mode 100644
index aab927f60499..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kgpg-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.08.2 b/metadata/md5-cache/kde-apps/kgpg-18.08.2
new file mode 100644
index 000000000000..622d0f07c551
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgpg-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kgpg-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d3f50f4d8e5dff31a52af638a125eec9
diff --git a/metadata/md5-cache/kde-apps/khangman-18.04.3 b/metadata/md5-cache/kde-apps/khangman-18.04.3
index e069cc4cb54f..41fd64b7b1d3 100644
--- a/metadata/md5-cache/kde-apps/khangman-18.04.3
+++ b/metadata/md5-cache/kde-apps/khangman-18.04.3
@@ -9,5 +9,5 @@ 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/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-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/kxmlgui-5.46.0:5 >=kde-apps/libkeduvocdocument-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.04.3:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/khangman-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=99568731204c67092a57ab0ecce41cbc
diff --git a/metadata/md5-cache/kde-apps/khangman-18.08.1 b/metadata/md5-cache/kde-apps/khangman-18.08.1
deleted file mode 100644
index b9a3b0029a82..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkeduvocdocument-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkeduvocdocument-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.08.1:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/khangman-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khangman-18.08.2 b/metadata/md5-cache/kde-apps/khangman-18.08.2
new file mode 100644
index 000000000000..aca23f781a3a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khangman-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkeduvocdocument-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkeduvocdocument-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.08.2:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/khangman-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bcb6301ccb5c5b1fd193f647403b6b5d
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.04.3 b/metadata/md5-cache/kde-apps/khelpcenter-18.04.3
index f3a43afd99b2..15a943f3fb91 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-18.04.3
+++ b/metadata/md5-cache/kde-apps/khelpcenter-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-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/kdoctools-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-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/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 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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/khelpcenter-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2e773979b239950d46878e87641d784
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.08.1 b/metadata/md5-cache/kde-apps/khelpcenter-18.08.1
deleted file mode 100644
index 56e9819d8fae..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdoctools-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kinit-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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 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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdoctools-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kinit-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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 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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/khelpcenter-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.08.2 b/metadata/md5-cache/kde-apps/khelpcenter-18.08.2
new file mode 100644
index 000000000000..706673e13581
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khelpcenter-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdoctools-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdoctools-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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 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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/khelpcenter-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=125894c2279331061ec5355fb77320b7
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.3
index f6d129f5f45e..f5b1f0055a47 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.3
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kidentitymanagement-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8aa238e1eb8806504f2c4c035d961246
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.1
deleted file mode 100644
index a873187f27c4..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/kpimtextedit-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-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.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/kpimtextedit-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kidentitymanagement-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.2 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.2
new file mode 100644
index 000000000000..f211eedb7b2a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/kpimtextedit-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-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.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/kpimtextedit-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kidentitymanagement-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=246053800d80cb885b14722ec6d4f0a2
diff --git a/metadata/md5-cache/kde-apps/kig-18.04.3 b/metadata/md5-cache/kde-apps/kig-18.04.3
index e2a90b0988f6..b34c55e2b6cd 100644
--- a/metadata/md5-cache/kde-apps/kig-18.04.3
+++ b/metadata/md5-cache/kde-apps/kig-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kig-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f42dc61c650b2f4d4092aae104f23d1c
diff --git a/metadata/md5-cache/kde-apps/kig-18.08.1 b/metadata/md5-cache/kde-apps/kig-18.08.1
deleted file mode 100644
index 9cd9995a5a7f..000000000000
--- a/metadata/md5-cache/kde-apps/kig-18.08.1
+++ /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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4: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.49.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4: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.49.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.4:5
-REQUIRED_USE=python_targets_python2_7
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kig-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kig-18.08.2 b/metadata/md5-cache/kde-apps/kig-18.08.2
new file mode 100644
index 000000000000..21b38d54ee82
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-18.08.2
@@ -0,0 +1,14 @@
+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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4: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.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4: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.50.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.4:5
+REQUIRED_USE=python_targets_python2_7
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kig-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=97ef030c05ed5d8d6640cc27da875da5
diff --git a/metadata/md5-cache/kde-apps/kigo-18.04.3 b/metadata/md5-cache/kde-apps/kigo-18.04.3
index 55643d76aff6..fd5b0d01c4c6 100644
--- a/metadata/md5-cache/kde-apps/kigo-18.04.3
+++ b/metadata/md5-cache/kde-apps/kigo-18.04.3
@@ -9,5 +9,5 @@ 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/kdbusaddons-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/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kigo-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f4dc19d078fb2f08d7347394bee1361b
diff --git a/metadata/md5-cache/kde-apps/kigo-18.08.1 b/metadata/md5-cache/kde-apps/kigo-18.08.1
deleted file mode 100644
index ede47c2c0883..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kigo-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/kigo-18.08.2 b/metadata/md5-cache/kde-apps/kigo-18.08.2
new file mode 100644
index 000000000000..c673592af518
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kigo-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kigo-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d54d24be6f221f67825e015738c401e4
diff --git a/metadata/md5-cache/kde-apps/killbots-18.04.3 b/metadata/md5-cache/kde-apps/killbots-18.04.3
index 106ac9c19b3c..1d4b573ba079 100644
--- a/metadata/md5-cache/kde-apps/killbots-18.04.3
+++ b/metadata/md5-cache/kde-apps/killbots-18.04.3
@@ -9,5 +9,5 @@ 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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/killbots-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=043bb115a5e04e27931ba966b6c34a32
diff --git a/metadata/md5-cache/kde-apps/killbots-18.08.1 b/metadata/md5-cache/kde-apps/killbots-18.08.1
deleted file mode 100644
index 42ee8a142ec2..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/killbots-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/killbots-18.08.2 b/metadata/md5-cache/kde-apps/killbots-18.08.2
new file mode 100644
index 000000000000..c303b11d3b0d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/killbots-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/killbots-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=26e4c7f282248075834473e1468de0ce
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.3
index 934bd5412737..a3d77c944953 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.3
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-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/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kimagemapeditor-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5ff23deac4d4969cb68645846bf26815
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.1 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.1
deleted file mode 100644
index f55dca763ae8..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kimagemapeditor-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.2 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.2
new file mode 100644
index 000000000000..09306fa61b2b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kimagemapeditor-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5a4656764c1d1500e8188b1ac0388d46
diff --git a/metadata/md5-cache/kde-apps/kimap-18.04.3 b/metadata/md5-cache/kde-apps/kimap-18.04.3
index 80e0498b87ca..4c0e9e7d8f81 100644
--- a/metadata/md5-cache/kde-apps/kimap-18.04.3
+++ b/metadata/md5-cache/kde-apps/kimap-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-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-apps/kmime-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kimap-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3bf227dac15e3a95b4027b5d853ae297
diff --git a/metadata/md5-cache/kde-apps/kimap-18.08.1 b/metadata/md5-cache/kde-apps/kimap-18.08.1
deleted file mode 100644
index 4e95b86d5e3a..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.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.49.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=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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kimap-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kimap-18.08.2 b/metadata/md5-cache/kde-apps/kimap-18.08.2
new file mode 100644
index 000000000000..ec96510873f1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimap-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.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.50.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=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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-apps/kmime-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kimap-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6269bce1a8f7a53b11b6bddfce65aed2
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.04.3 b/metadata/md5-cache/kde-apps/kio-extras-18.04.3
index 7a68db3c310d..700ec6b0a79e 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-18.04.3
+++ b/metadata/md5-cache/kde-apps/kio-extras-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kio-extras-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=64a7c364f9c879d65b469906df5ff044
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.08.1 b/metadata/md5-cache/kde-apps/kio-extras-18.08.1
deleted file mode 100644
index 1b1d3957dcdc..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpty-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.49.0:5 >=dev-qt/qtsql-5.9.4:5 ) man? ( >=kde-frameworks/khtml-5.49.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] ) 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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kio-extras.git
-IUSE=activities +man mtp openexr phonon samba +sftp taglib test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.49.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpty-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.49.0:5 >=dev-qt/qtsql-5.9.4:5 ) man? ( >=kde-frameworks/khtml-5.49.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] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.49.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kio-extras-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=31c5a7abe9b58bbbc95b14dd649070c8
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.08.2 b/metadata/md5-cache/kde-apps/kio-extras-18.08.2
new file mode 100644
index 000000000000..71e1bd36f500
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpty-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.50.0:5 >=dev-qt/qtsql-5.9.4:5 ) man? ( >=kde-frameworks/khtml-5.50.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] ) 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=KIO plugins present a filesystem-like view of arbitrary data
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kio-extras.git
+IUSE=activities +man mtp openexr phonon samba +sftp taglib test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpty-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.50.0:5 >=dev-qt/qtsql-5.9.4:5 ) man? ( >=kde-frameworks/khtml-5.50.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] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.50.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kio-extras-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=74da70e7d4ed0670e782b553d809c6c7
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.04.3 b/metadata/md5-cache/kde-apps/kiriki-18.04.3
index 357932705fe9..a519109453d1 100644
--- a/metadata/md5-cache/kde-apps/kiriki-18.04.3
+++ b/metadata/md5-cache/kde-apps/kiriki-18.04.3
@@ -9,5 +9,5 @@ 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/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/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kiriki-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d320eacbb07cbf207de86e0a2b624f5f
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.08.1 b/metadata/md5-cache/kde-apps/kiriki-18.08.1
deleted file mode 100644
index a27e22a73260..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kiriki-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.08.2 b/metadata/md5-cache/kde-apps/kiriki-18.08.2
new file mode 100644
index 000000000000..b4c129bf1482
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiriki-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kiriki-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f1101837a5b2b3ce485584dce22b9797
diff --git a/metadata/md5-cache/kde-apps/kiten-18.04.3 b/metadata/md5-cache/kde-apps/kiten-18.04.3
index fe22fbbf0eb0..4f1183f2feda 100644
--- a/metadata/md5-cache/kde-apps/kiten-18.04.3
+++ b/metadata/md5-cache/kde-apps/kiten-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kiten-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1b71ac487e773ecb0498566eebc80df
diff --git a/metadata/md5-cache/kde-apps/kiten-18.08.1 b/metadata/md5-cache/kde-apps/kiten-18.08.1
deleted file mode 100644
index b9a9257ed6bc..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kiten-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kiten-18.08.2-r1 b/metadata/md5-cache/kde-apps/kiten-18.08.2-r1
new file mode 100644
index 000000000000..560eb2f32f19
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiten-18.08.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-fonts/kanjistrokeorders >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kiten-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0944e844c20b8d5a7db0b87a1158ab92
diff --git a/metadata/md5-cache/kde-apps/kitinerary-18.08.1-r1 b/metadata/md5-cache/kde-apps/kitinerary-18.08.1-r1
deleted file mode 100644
index 5e4695b54cfd..000000000000
--- a/metadata/md5-cache/kde-apps/kitinerary-18.08.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpkpass-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 sys-libs/zlib pdf? ( app-text/poppler:=[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.49.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=Data Model and Extraction System for Travel Reservation information
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=pdf test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpkpass-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 sys-libs/zlib pdf? ( app-text/poppler:=[qt5] ) !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kitinerary: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.08.1/src/kitinerary-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9b9b70abf669fa33c2ccc0933de31ef5
diff --git a/metadata/md5-cache/kde-apps/kitinerary-18.08.2 b/metadata/md5-cache/kde-apps/kitinerary-18.08.2
new file mode 100644
index 000000000000..a0606eafe935
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kitinerary-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpkpass-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 sys-libs/zlib pdf? ( app-text/poppler:=[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.50.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=Data Model and Extraction System for Travel Reservation information
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kontact/
+IUSE=pdf test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpkpass-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 sys-libs/zlib pdf? ( app-text/poppler:=[qt5] ) !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kitinerary: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.08.2/src/kitinerary-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1ade7430e19793430b4dbbc216c9cd46
diff --git a/metadata/md5-cache/kde-apps/kjots-5.0.2 b/metadata/md5-cache/kde-apps/kjots-5.0.2
index 82e94be5b20f..4787d6cf4286 100644
--- a/metadata/md5-cache/kde-apps/kjots-5.0.2
+++ b/metadata/md5-cache/kde-apps/kjots-5.0.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-5.0.2:5 >=kde-apps/akonadi-notes-5.0.2:5 >=kde-apps/kmime-5.0.2:5 >=kde-apps/kontactinterface-5.0.2:5 >=kde-apps/kpimtextedit-5.0.2:5 >=dev-qt/qtdbus-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-libs/grantlee:5 dev-libs/libxslt 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.49.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-5.0.2:5 >=kde-apps/akonadi-notes-5.0.2:5 >=kde-apps/kmime-5.0.2:5 >=kde-apps/kontactinterface-5.0.2:5 >=kde-apps/kpimtextedit-5.0.2:5 >=dev-qt/qtdbus-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-libs/grantlee:5 dev-libs/libxslt 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Note taking utility by KDE
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/utilities/kjots/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-5.0.2:5 >=kde-apps/akonadi-notes-5.0.2:5 >=kde-apps/kmime-5.0.2:5 >=kde-apps/kontactinterface-5.0.2:5 >=kde-apps/kpimtextedit-5.0.2:5 >=dev-qt/qtdbus-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-libs/grantlee:5 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjots: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
+RDEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-5.0.2:5 >=kde-apps/akonadi-notes-5.0.2:5 >=kde-apps/kmime-5.0.2:5 >=kde-apps/kontactinterface-5.0.2:5 >=kde-apps/kpimtextedit-5.0.2:5 >=dev-qt/qtdbus-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-libs/grantlee:5 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjots: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/kjots/5.0.2/kjots-5.0.2.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab2c8ee88eb9582f64cf5919f5779e9e
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.3 b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.3
index 59880108bcf5..bf9a219089e7 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.3
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kjumpingcube-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7002a69a747faee4ca103dcead3738dd
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.08.1 b/metadata/md5-cache/kde-apps/kjumpingcube-18.08.1
deleted file mode 100644
index 5003e573192b..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kjumpingcube-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.08.2 b/metadata/md5-cache/kde-apps/kjumpingcube-18.08.2
new file mode 100644
index 000000000000..7a8fed2d51f6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kjumpingcube-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2f5d3a95099f19b6f30c2eb4beed5554
diff --git a/metadata/md5-cache/kde-apps/kldap-18.04.3 b/metadata/md5-cache/kde-apps/kldap-18.04.3
index 129578652994..acad9c5a0115 100644
--- a/metadata/md5-cache/kde-apps/kldap-18.04.3
+++ b/metadata/md5-cache/kde-apps/kldap-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kldap-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b0dc73f10e541d86502e2666b45b8fc6
diff --git a/metadata/md5-cache/kde-apps/kldap-18.08.1 b/metadata/md5-cache/kde-apps/kldap-18.08.1
deleted file mode 100644
index 61d08dac2358..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kldap-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kldap-18.08.2 b/metadata/md5-cache/kde-apps/kldap-18.08.2
new file mode 100644
index 000000000000..d329b26a6aad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kldap-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kldap-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1db5941b06af0dcb8e68cdc4dec1d661
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.04.3 b/metadata/md5-cache/kde-apps/kleopatra-18.04.3
index 6f0f901b0a32..81930aec666f 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-18.04.3
+++ b/metadata/md5-cache/kde-apps/kleopatra-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kleopatra-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b706c2135448e93f9aa129af4485c1a9
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.08.1 b/metadata/md5-cache/kde-apps/kleopatra-18.08.1
deleted file mode 100644
index 31e1c0e3471f..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4: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.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kleopatra-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5203a10deaadbee4f2f03fd4b89ecfb2
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.08.2 b/metadata/md5-cache/kde-apps/kleopatra-18.08.2
new file mode 100644
index 000000000000..89c26bbc7fe1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kleopatra-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4: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.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kleopatra-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=01d3d3dfc5b10e1bb99ca15e11218a95
diff --git a/metadata/md5-cache/kde-apps/klettres-18.04.3 b/metadata/md5-cache/kde-apps/klettres-18.04.3
index 13b7cc9778ae..429988f570e2 100644
--- a/metadata/md5-cache/kde-apps/klettres-18.04.3
+++ b/metadata/md5-cache/kde-apps/klettres-18.04.3
@@ -9,5 +9,5 @@ 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/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/klettres-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5579e138193d7b1162751e78d421a2e7
diff --git a/metadata/md5-cache/kde-apps/klettres-18.08.1 b/metadata/md5-cache/kde-apps/klettres-18.08.1
deleted file mode 100644
index e5d3bd6b8bb4..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/klettres-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klettres-18.08.2 b/metadata/md5-cache/kde-apps/klettres-18.08.2
new file mode 100644
index 000000000000..8628e5413527
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klettres-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/klettres-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=15f94db89a8885f4f0d6705ff2e18ba8
diff --git a/metadata/md5-cache/kde-apps/klickety-18.04.3 b/metadata/md5-cache/kde-apps/klickety-18.04.3
index a48f89dc007b..2da3143ccfa3 100644
--- a/metadata/md5-cache/kde-apps/klickety-18.04.3
+++ b/metadata/md5-cache/kde-apps/klickety-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-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/knotifyconfig-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/klickety-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5aecf78928a8a55413b5d371b4bf1e5d
diff --git a/metadata/md5-cache/kde-apps/klickety-18.08.1 b/metadata/md5-cache/kde-apps/klickety-18.08.1
deleted file mode 100644
index 32b89273c938..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/klickety-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klickety-18.08.2 b/metadata/md5-cache/kde-apps/klickety-18.08.2
new file mode 100644
index 000000000000..ff9c1f50e515
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klickety-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/klickety-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fe64c44eb1612b51bd7d4168a30b08c8
diff --git a/metadata/md5-cache/kde-apps/klines-18.04.3 b/metadata/md5-cache/kde-apps/klines-18.04.3
index 07cb900e9582..5049a9b9a486 100644
--- a/metadata/md5-cache/kde-apps/klines-18.04.3
+++ b/metadata/md5-cache/kde-apps/klines-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/klines-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=26c2f26b1ad47b77801df898361609a7
diff --git a/metadata/md5-cache/kde-apps/klines-18.08.1 b/metadata/md5-cache/kde-apps/klines-18.08.1
deleted file mode 100644
index aef8ea9e0097..000000000000
--- a/metadata/md5-cache/kde-apps/klines-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/klines-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/klines-18.08.2 b/metadata/md5-cache/kde-apps/klines-18.08.2
new file mode 100644
index 000000000000..aff898bcc375
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klines-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/klines-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=35307f16d1b7daf99d64c1e53ffbbbe5
diff --git a/metadata/md5-cache/kde-apps/kmag-18.04.3 b/metadata/md5-cache/kde-apps/kmag-18.04.3
index 2bd3a2ee4067..8c5700110389 100644
--- a/metadata/md5-cache/kde-apps/kmag-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmag-18.04.3
@@ -9,5 +9,5 @@ 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 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmag-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=129fffd871dc8f571da468bc866a7f0a
diff --git a/metadata/md5-cache/kde-apps/kmag-18.08.1 b/metadata/md5-cache/kde-apps/kmag-18.08.1
deleted file mode 100644
index 2c239ccdb0a3..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmag-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmag-18.08.2 b/metadata/md5-cache/kde-apps/kmag-18.08.2
new file mode 100644
index 000000000000..4e9b53bdb848
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmag-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmag-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c0e97bed944aed362480c5c02611d7bd
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.04.3 b/metadata/md5-cache/kde-apps/kmahjongg-18.04.3
index ad32d4c3bfb5..8a372e37b038 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmahjongg-18.04.3
@@ -9,5 +9,5 @@ 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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=kde-apps/libkmahjongg-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmahjongg-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=abbbaa709afa9e93f0c77b710d0bda8d
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.08.1 b/metadata/md5-cache/kde-apps/kmahjongg-18.08.1
deleted file mode 100644
index b7fad2c92dcd..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=kde-apps/libkmahjongg-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=kde-apps/libkmahjongg-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmahjongg-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.08.2 b/metadata/md5-cache/kde-apps/kmahjongg-18.08.2
new file mode 100644
index 000000000000..3df446420353
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmahjongg-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=kde-apps/libkmahjongg-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=kde-apps/libkmahjongg-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmahjongg-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2650833e371c191e2385b174d7ad3a64
diff --git a/metadata/md5-cache/kde-apps/kmail-18.04.3 b/metadata/md5-cache/kde-apps/kmail-18.04.3
index d079f4c15693..d7d3a93bebe0 100644
--- a/metadata/md5-cache/kde-apps/kmail-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmail-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmail-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f561f33be72542c59bce1c38c66b0a0b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=af91df5e85fe34477524ee5dba49a5ec
diff --git a/metadata/md5-cache/kde-apps/kmail-18.04.3-r1 b/metadata/md5-cache/kde-apps/kmail-18.04.3-r1
new file mode 100644
index 000000000000..e712c58c088a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-18.04.3-r1
@@ -0,0 +1,14 @@
+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/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-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/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-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-frameworks/sonnet-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libgravatar-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/libksieve-18.04.3:5 >=kde-apps/libktnef-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kldap-18.04.3:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.04.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.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=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.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/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-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/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-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-frameworks/sonnet-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libgravatar-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/libksieve-18.04.3:5 >=kde-apps/libktnef-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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-18.04.3:5 >=kde-apps/kmail-account-wizard-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmail-18.04.3.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6362114301420163ba5ee4ed0cad756e
diff --git a/metadata/md5-cache/kde-apps/kmail-18.08.1 b/metadata/md5-cache/kde-apps/kmail-18.08.1
deleted file mode 100644
index 203fe448fee3..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libgravatar-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=kde-apps/libksieve-18.08.1:5 >=kde-apps/libktnef-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kldap-18.08.1:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.08.1: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libgravatar-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=kde-apps/libksieve-18.08.1:5 >=kde-apps/libktnef-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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-18.08.1:5 >=kde-apps/kmail-account-wizard-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmail-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=09eb9f1e5bc1c02edc857e32049a277a
diff --git a/metadata/md5-cache/kde-apps/kmail-18.08.2 b/metadata/md5-cache/kde-apps/kmail-18.08.2
new file mode 100644
index 000000000000..5559a046cb93
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libgravatar-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=kde-apps/libksieve-18.08.2:5 >=kde-apps/libktnef-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kldap-18.08.2:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.08.2: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libgravatar-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=kde-apps/libksieve-18.08.2:5 >=kde-apps/libktnef-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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-18.08.2:5 >=kde-apps/kmail-account-wizard-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmail-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c9c1311afeecc2460067e8835447f7d3
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.3 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.3
index 16bd78aaa32b..17dbb6e78958 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=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/ki18n-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/knotifyconfig-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/pimcommon-18.04.3: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 !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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmail-account-wizard-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b3cefd8d1d14ed51cfa838a13538d7d9
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.1
deleted file mode 100644
index 57c30afc5879..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kross-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kldap-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=kde-apps/pimcommon-18.08.1: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-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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kross-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kldap-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=kde-apps/pimcommon-18.08.1: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 !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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmail-account-wizard-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.2 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.2
new file mode 100644
index 000000000000..a16cd56f386e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kldap-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=kde-apps/pimcommon-18.08.2: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-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kldap-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=kde-apps/pimcommon-18.08.2: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 !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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmail-account-wizard-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a2c975708c9a5e76c2b594feb879c1cd
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.04.3 b/metadata/md5-cache/kde-apps/kmailtransport-18.04.3
index 4a20a19145b6..7cb07643eaa2 100644
--- a/metadata/md5-cache/kde-apps/kmailtransport-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmailtransport-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmailtransport-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5758dd7dbe5b49aa21e6bc427d0675d
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.08.1 b/metadata/md5-cache/kde-apps/kmailtransport-18.08.1
deleted file mode 100644
index 1eae85be000a..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/ksmtp-18.08.1:5 >=kde-apps/libkgapi-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 test? ( >=kde-frameworks/ktextwidgets-5.49.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.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/ksmtp-18.08.1:5 >=kde-apps/libkgapi-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmailtransport-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d8dd15e2b916777c17b64a4a5e07ee66
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.08.2 b/metadata/md5-cache/kde-apps/kmailtransport-18.08.2
new file mode 100644
index 000000000000..cbe7c06d0410
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmailtransport-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/ksmtp-18.08.2:5 >=kde-apps/libkgapi-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 test? ( >=kde-frameworks/ktextwidgets-5.50.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.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/ksmtp-18.08.2:5 >=kde-apps/libkgapi-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmailtransport-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=74526b77b28f3e4841baf837a9184fb6
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.04.3 b/metadata/md5-cache/kde-apps/kmbox-18.04.3
index bcaf246c7741..10acbb20f871 100644
--- a/metadata/md5-cache/kde-apps/kmbox-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmbox-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-apps/kmime-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmbox-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8e8f16a3e8f2b9fcae8a53a6a2e23439
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.08.1 b/metadata/md5-cache/kde-apps/kmbox-18.08.1
deleted file mode 100644
index e02ff6d24990..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-18.08.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.49.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=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-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmbox-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.08.2 b/metadata/md5-cache/kde-apps/kmbox-18.08.2
new file mode 100644
index 000000000000..fefbad0a5d43
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmbox-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/kmime-18.08.2: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.50.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=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-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmbox-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=885f5e37971b421e413081fdd8c895f5
diff --git a/metadata/md5-cache/kde-apps/kmime-18.04.3 b/metadata/md5-cache/kde-apps/kmime-18.04.3
index 371cff8a9dec..53eef359b41b 100644
--- a/metadata/md5-cache/kde-apps/kmime-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmime-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmime-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f66ab2b6f0262acbd6535ec0f0ef705f
diff --git a/metadata/md5-cache/kde-apps/kmime-18.08.1 b/metadata/md5-cache/kde-apps/kmime-18.08.1
deleted file mode 100644
index 07c797fbe294..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/ki18n-5.49.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.49.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=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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmime-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmime-18.08.2 b/metadata/md5-cache/kde-apps/kmime-18.08.2
new file mode 100644
index 000000000000..a6309ba8ccc6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmime-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/ki18n-5.50.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.50.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=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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmime-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c2ae29e7091bcf3e2b6fa62fc4b789ad
diff --git a/metadata/md5-cache/kde-apps/kmines-18.04.3 b/metadata/md5-cache/kde-apps/kmines-18.04.3
index 257bb90fb221..e5e35f64f7f0 100644
--- a/metadata/md5-cache/kde-apps/kmines-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmines-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmines-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=add6601a4b12edf66c3b431bb7879225
diff --git a/metadata/md5-cache/kde-apps/kmines-18.08.1 b/metadata/md5-cache/kde-apps/kmines-18.08.1
deleted file mode 100644
index 60dba6b836b3..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmines-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmines-18.08.2 b/metadata/md5-cache/kde-apps/kmines-18.08.2
new file mode 100644
index 000000000000..070e353fd304
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmines-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmines-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=51c3532653a1a2490a1746a51d833d02
diff --git a/metadata/md5-cache/kde-apps/kmix-18.04.3 b/metadata/md5-cache/kde-apps/kmix-18.04.3
index a5e47c1ea452..00bc270bbd91 100644
--- a/metadata/md5-cache/kde-apps/kmix-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmix-18.04.3
@@ -9,5 +9,5 @@ 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/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/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 >=kde-frameworks/plasma-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 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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmix-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cdad326ecafae640bc25e8b1fc6f2e46
diff --git a/metadata/md5-cache/kde-apps/kmix-18.08.1 b/metadata/md5-cache/kde-apps/kmix-18.08.1
deleted file mode 100644
index 507cc2a58d8c..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kglobalaccel-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/plasma-5.49.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 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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kglobalaccel-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/plasma-5.49.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 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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmix-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmix-18.08.2 b/metadata/md5-cache/kde-apps/kmix-18.08.2
new file mode 100644
index 000000000000..1a33cd8df3c4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmix-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.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 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.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 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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmix-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=18db26379f4046aacf6083c1e3392109
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.04.3 b/metadata/md5-cache/kde-apps/kmousetool-18.04.3
index 847bebbc8b1b..3a6a732ce0ff 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmousetool-18.04.3
@@ -9,5 +9,5 @@ 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/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmousetool-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d96f48431d3eed74d62d2c6864ac4738
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.08.1 b/metadata/md5-cache/kde-apps/kmousetool-18.08.1
deleted file mode 100644
index 12c3eb887773..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmousetool-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3fa056f331b3d4cfc01afb0ad49ad9bc
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.08.2 b/metadata/md5-cache/kde-apps/kmousetool-18.08.2
new file mode 100644
index 000000000000..ebc9548fc7e2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmousetool-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmousetool-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bf0a4cac639a8c1bacc3e1e3dbc16770
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.04.3 b/metadata/md5-cache/kde-apps/kmouth-18.04.3
index 483977346bb0..dcad124f7216 100644
--- a/metadata/md5-cache/kde-apps/kmouth-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmouth-18.04.3
@@ -9,5 +9,5 @@ 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/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmouth-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b58707faeff0f8a54dd8487f82806c82
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.08.1 b/metadata/md5-cache/kde-apps/kmouth-18.08.1
deleted file mode 100644
index 73db9c5b5974..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmouth-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.08.2 b/metadata/md5-cache/kde-apps/kmouth-18.08.2
new file mode 100644
index 000000000000..6d3d06447fdd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmouth-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmouth-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f2aca76235e22cebd4e00185bf49dbb7
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.04.3 b/metadata/md5-cache/kde-apps/kmplot-18.04.3
index 99337f41cf3e..c7b75b170491 100644
--- a/metadata/md5-cache/kde-apps/kmplot-18.04.3
+++ b/metadata/md5-cache/kde-apps/kmplot-18.04.3
@@ -9,5 +9,5 @@ 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/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kparts-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/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmplot-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c8a6dfafb545ef74311793b81df8a11c
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.08.1 b/metadata/md5-cache/kde-apps/kmplot-18.08.1
deleted file mode 100644
index b318199cf842..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kmplot-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.08.2 b/metadata/md5-cache/kde-apps/kmplot-18.08.2
new file mode 100644
index 000000000000..33e564cd6c53
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmplot-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kmplot-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5c7f0054b447edffec1898e5668f830e
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.04.3 b/metadata/md5-cache/kde-apps/knavalbattle-18.04.3
index 1d33a8d63a38..72c3d978e283 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-18.04.3
+++ b/metadata/md5-cache/kde-apps/knavalbattle-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=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/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/knavalbattle-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b862d0a0850111b39d62f10200b3abe4
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.08.1 b/metadata/md5-cache/kde-apps/knavalbattle-18.08.1
deleted file mode 100644
index 0504b7a631f4..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/knavalbattle-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.08.2 b/metadata/md5-cache/kde-apps/knavalbattle-18.08.2
new file mode 100644
index 000000000000..7d43f7a7ca77
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knavalbattle-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/knavalbattle-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=427658de13697ae81206eda5b6adfcea
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.04.3 b/metadata/md5-cache/kde-apps/knetwalk-18.04.3
index 615a21f3aae2..6d353c75872c 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-18.04.3
+++ b/metadata/md5-cache/kde-apps/knetwalk-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/knetwalk-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1be9ac0b30672497177adef3fc7293cb
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.08.1 b/metadata/md5-cache/kde-apps/knetwalk-18.08.1
deleted file mode 100644
index 04c734deed26..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/knetwalk-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.08.2 b/metadata/md5-cache/kde-apps/knetwalk-18.08.2
new file mode 100644
index 000000000000..f6976efd78c8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knetwalk-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/knetwalk-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7e85b9a4c2e1cfe64e4a6f1a7fb1dd8d
diff --git a/metadata/md5-cache/kde-apps/knotes-18.04.3 b/metadata/md5-cache/kde-apps/knotes-18.04.3
index a562e7cf6d85..a309a3b93a94 100644
--- a/metadata/md5-cache/kde-apps/knotes-18.04.3
+++ b/metadata/md5-cache/kde-apps/knotes-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.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/kdelibs4support-5.46.0:5 >=kde-frameworks/kdnssd-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/kitemmodels-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/kparts-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-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-notes-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-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 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/knotes-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=79506e94430279d2b052839b54c05e36
diff --git a/metadata/md5-cache/kde-apps/knotes-18.08.1 b/metadata/md5-cache/kde-apps/knotes-18.08.1
deleted file mode 100644
index fe21bf8c5d56..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/kglobalaccel-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-notes-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-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 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/kglobalaccel-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-notes-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-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 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/knotes-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/knotes-18.08.2 b/metadata/md5-cache/kde-apps/knotes-18.08.2
new file mode 100644
index 000000000000..1a1170d4f074
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knotes-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-notes-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-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 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-notes-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-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 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/knotes-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0dce6b2fe49270d548b091b2c96e35b1
diff --git a/metadata/md5-cache/kde-apps/kolf-18.04.3 b/metadata/md5-cache/kde-apps/kolf-18.04.3
index e642a793bfd7..ee1976d9cd15 100644
--- a/metadata/md5-cache/kde-apps/kolf-18.04.3
+++ b/metadata/md5-cache/kde-apps/kolf-18.04.3
@@ -9,5 +9,5 @@ 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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kolf-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e36468cfb24c502d84fe8f39bc39eac
diff --git a/metadata/md5-cache/kde-apps/kolf-18.08.1-r1 b/metadata/md5-cache/kde-apps/kolf-18.08.1-r1
deleted file mode 100644
index 0adb6e41b48a..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-18.08.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon 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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kolf-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=acf4cb07c590464b5dbeec5ad8f95cf9
diff --git a/metadata/md5-cache/kde-apps/kolf-18.08.2 b/metadata/md5-cache/kde-apps/kolf-18.08.2
new file mode 100644
index 000000000000..f2b6cf35acfc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolf-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kolf-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7b7e2e0b63dea14d5e510429cfbc351d
diff --git a/metadata/md5-cache/kde-apps/kollision-18.04.3 b/metadata/md5-cache/kde-apps/kollision-18.04.3
index 131b01be6456..073c9868e2f8 100644
--- a/metadata/md5-cache/kde-apps/kollision-18.04.3
+++ b/metadata/md5-cache/kde-apps/kollision-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kollision-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d9bc9b6d74aeb70394e6256f4761f60
diff --git a/metadata/md5-cache/kde-apps/kollision-18.08.1 b/metadata/md5-cache/kde-apps/kollision-18.08.1
deleted file mode 100644
index 440d1e64dee4..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kollision-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kollision-18.08.2 b/metadata/md5-cache/kde-apps/kollision-18.08.2
new file mode 100644
index 000000000000..0aca3f70068f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kollision-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kollision-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b5cbebc6d909ce16f69a0590a3653d4d
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.04.3 b/metadata/md5-cache/kde-apps/kolourpaint-18.04.3
index e59e83837e64..f21314c021b4 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-18.04.3
+++ b/metadata/md5-cache/kde-apps/kolourpaint-18.04.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.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/kdelibs4support-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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kolourpaint-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=908d268ec6960f3169c4cf31cbc79308
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.08.1 b/metadata/md5-cache/kde-apps/kolourpaint-18.08.1
deleted file mode 100644
index f8a341197e3b..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.08.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.08.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kolourpaint-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a846904dd745cf2bbcc5c3167f723c82
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.08.2 b/metadata/md5-cache/kde-apps/kolourpaint-18.08.2
new file mode 100644
index 000000000000..0ad25a9506b9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolourpaint-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.08.2: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.08.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kolourpaint-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e4d478feaa57cb19fc013e802d7e1bd1
diff --git a/metadata/md5-cache/kde-apps/kompare-18.04.3 b/metadata/md5-cache/kde-apps/kompare-18.04.3
index 39f5973c7395..8fda29a77822 100644
--- a/metadata/md5-cache/kde-apps/kompare-18.04.3
+++ b/metadata/md5-cache/kde-apps/kompare-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-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/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/kparts-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/kxmlgui-5.46.0:5 >=kde-apps/libkomparediff2-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kompare-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ba865e973b9da25d08c0bdd42874464
diff --git a/metadata/md5-cache/kde-apps/kompare-18.08.1 b/metadata/md5-cache/kde-apps/kompare-18.08.1
deleted file mode 100644
index 11a5ce2bb251..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkomparediff2-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkomparediff2-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kompare-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/kompare-18.08.2 b/metadata/md5-cache/kde-apps/kompare-18.08.2
new file mode 100644
index 000000000000..fd7f542ad3d1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kompare-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkomparediff2-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkomparediff2-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kompare-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e6641f3b1a60d1973a0756e8e7a214b2
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.04.3-r1 b/metadata/md5-cache/kde-apps/konqueror-18.04.3-r1
index 2bec8438cc60..acf3ff0be48d 100644
--- a/metadata/md5-cache/kde-apps/konqueror-18.04.3-r1
+++ b/metadata/md5-cache/kde-apps/konqueror-18.04.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/konqueror-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e04259f888a3fcefda21ba06131c9b1a
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.08.1 b/metadata/md5-cache/kde-apps/konqueror-18.08.1
deleted file mode 100644
index 52fbed34671b..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kdesu-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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.49.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kdesu-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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.08.1: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.49.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.08.1/src/konqueror-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ec5e6d07a578357350516e273ec72bbc
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.08.2 b/metadata/md5-cache/kde-apps/konqueror-18.08.2
new file mode 100644
index 000000000000..414d2cc525ef
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kdesu-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kdesu-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.08.2: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.50.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.08.2/src/konqueror-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f3b3023208192aaf5a24ac2cf7dc25f2
diff --git a/metadata/md5-cache/kde-apps/konquest-18.04.3 b/metadata/md5-cache/kde-apps/konquest-18.04.3
index 80de46adb022..463b4d829d2c 100644
--- a/metadata/md5-cache/kde-apps/konquest-18.04.3
+++ b/metadata/md5-cache/kde-apps/konquest-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/konquest-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=328a4f3c3d060f3e505755b9363eab0b
diff --git a/metadata/md5-cache/kde-apps/konquest-18.08.1 b/metadata/md5-cache/kde-apps/konquest-18.08.1
deleted file mode 100644
index 7de2b4ef19c3..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/konquest-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konquest-18.08.2 b/metadata/md5-cache/kde-apps/konquest-18.08.2
new file mode 100644
index 000000000000..ac681b4a56a1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konquest-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/konquest-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=49cd0241f0aff023e04d9bd48e2c419c
diff --git a/metadata/md5-cache/kde-apps/konsole-18.04.3 b/metadata/md5-cache/kde-apps/konsole-18.04.3
index 33d8e270aa93..c54046afc0bf 100644
--- a/metadata/md5-cache/kde-apps/konsole-18.04.3
+++ b/metadata/md5-cache/kde-apps/konsole-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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/kguiaddons-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kinit-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/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-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 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/konsole-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4093a1ef58e400f8b429174ad3209ef3
diff --git a/metadata/md5-cache/kde-apps/konsole-18.08.1 b/metadata/md5-cache/kde-apps/konsole-18.08.1
deleted file mode 100644
index 11c3d84f830e..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kinit-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpty-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kinit-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpty-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/konsole-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0540bff7faa536bab397e34be690a6c8
diff --git a/metadata/md5-cache/kde-apps/konsole-18.08.2 b/metadata/md5-cache/kde-apps/konsole-18.08.2
new file mode 100644
index 000000000000..75f1a68446f4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpty-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpty-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/konsole-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b89111d8856597f0604eb95bf7ea93bd
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.3 b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.3
index 81c24cbe2a24..b8762df3a737 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.3
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-calendar-tools-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94169ee0b1afe2ca8327137183b3f019
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.08.1 b/metadata/md5-cache/kde-apps/konsolekalendar-18.08.1
deleted file mode 100644
index 6e046ae42edf..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/akonadi-calendar-tools-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.08.2 b/metadata/md5-cache/kde-apps/konsolekalendar-18.08.2
new file mode 100644
index 000000000000..54c4bce3b3f5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/akonadi-calendar-tools-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bb9d7f53d3d6c330fb459e4f3e123964
diff --git a/metadata/md5-cache/kde-apps/kontact-18.04.3 b/metadata/md5-cache/kde-apps/kontact-18.04.3
index 25653d41911e..b855eb187491 100644
--- a/metadata/md5-cache/kde-apps/kontact-18.04.3
+++ b/metadata/md5-cache/kde-apps/kontact-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-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/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kontact-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5f6e06ffd7c65f8ed5c505f3eb2c9b5
diff --git a/metadata/md5-cache/kde-apps/kontact-18.08.1 b/metadata/md5-cache/kde-apps/kontact-18.08.1
deleted file mode 100644
index 6f32d77ff698..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kontact-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontact-18.08.2 b/metadata/md5-cache/kde-apps/kontact-18.08.2
new file mode 100644
index 000000000000..00e42f4a0f70
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontact-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kontact-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d6ed1ee6bae7394ebd0beb335622ddce
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.04.3 b/metadata/md5-cache/kde-apps/kontactinterface-18.04.3
index 8c6901c05c39..89742995b88c 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-18.04.3
+++ b/metadata/md5-cache/kde-apps/kontactinterface-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-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 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kontactinterface-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b8b5f18956d4053790ae487998490ca
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.08.1 b/metadata/md5-cache/kde-apps/kontactinterface-18.08.1
deleted file mode 100644
index b1675dfdfe55..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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-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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kontactinterface-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.08.2 b/metadata/md5-cache/kde-apps/kontactinterface-18.08.2
new file mode 100644
index 000000000000..2ae5472d391e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontactinterface-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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-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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kontactinterface-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c1c6f1cbad1c4ca48c3ba52b24d3e58a
diff --git a/metadata/md5-cache/kde-apps/kopete-18.04.3 b/metadata/md5-cache/kde-apps/kopete-18.04.3
index f643a2511109..3f43d05bb7b5 100644
--- a/metadata/md5-cache/kde-apps/kopete-18.04.3
+++ b/metadata/md5-cache/kde-apps/kopete-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kopete-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3443b00dca316f541df070e9831ae3ce
diff --git a/metadata/md5-cache/kde-apps/kopete-18.08.1 b/metadata/md5-cache/kde-apps/kopete-18.08.1
deleted file mode 100644
index b0ecf85b2a63..000000000000
--- a/metadata/md5-cache/kde-apps/kopete-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kemoticons-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib:= ) zeroconf? ( >=kde-frameworks/kdnssd-5.49.0:5 >=kde-apps/kidentitymanagement-18.08.1:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) 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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=Multi-protocol IM client based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://kopete.kde.org https://www.kde.org/applications/internet/kopete
-IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kemoticons-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib:= ) zeroconf? ( >=kde-frameworks/kdnssd-5.49.0:5 >=kde-apps/kidentitymanagement-18.08.1:5 ) !kde-apps/kde4-l10n latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete: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.08.1/src/kopete-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=605ffffb3bb108459a4ecdf5031813ee
diff --git a/metadata/md5-cache/kde-apps/kopete-18.08.2 b/metadata/md5-cache/kde-apps/kopete-18.08.2
new file mode 100644
index 000000000000..ad9792b33562
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kopete-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib:= ) zeroconf? ( >=kde-frameworks/kdnssd-5.50.0:5 >=kde-apps/kidentitymanagement-18.08.2:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Multi-protocol IM client based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/Kopete https://www.kde.org/applications/internet/kopete
+IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib:= ) zeroconf? ( >=kde-frameworks/kdnssd-5.50.0:5 >=kde-apps/kidentitymanagement-18.08.2:5 ) !kde-apps/kde4-l10n latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete: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.08.2/src/kopete-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=89c9da0ebabc76de86c4cbce834a0378
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.04.3 b/metadata/md5-cache/kde-apps/korganizer-18.04.3
index 1580c1313d29..ee3996ef3fd7 100644
--- a/metadata/md5-cache/kde-apps/korganizer-18.04.3
+++ b/metadata/md5-cache/kde-apps/korganizer-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=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/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/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/kparts-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-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/akonadi-notes-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/eventviews-18.04.3:5 >=kde-apps/incidenceeditor-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/korganizer-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b686b68f5d817fc0b4876d93ec2bcb07
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.08.1 b/metadata/md5-cache/kde-apps/korganizer-18.08.1
deleted file mode 100644
index 3e9581500da1..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kholidays-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/akonadi-notes-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/eventviews-18.08.1:5 >=kde-apps/incidenceeditor-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-apps/kldap-18.08.1:5 >=dev-qt/designer-5.9.4:5 test? ( >=kde-apps/akonadi-18.08.1: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kholidays-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-calendar-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/akonadi-notes-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/eventviews-18.08.1:5 >=kde-apps/incidenceeditor-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kontactinterface-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/korganizer-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a87ca9f45bb123880b3be57b552cbed3
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.08.2 b/metadata/md5-cache/kde-apps/korganizer-18.08.2
new file mode 100644
index 000000000000..0d619876999f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/korganizer-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/akonadi-notes-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/eventviews-18.08.2:5 >=kde-apps/incidenceeditor-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-apps/kldap-18.08.2:5 >=dev-qt/designer-5.9.4:5 test? ( >=kde-apps/akonadi-18.08.2: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-calendar-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/akonadi-notes-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/eventviews-18.08.2:5 >=kde-apps/incidenceeditor-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kontactinterface-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/korganizer-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=234b7e4a43686710ba7edf82547bb2d2
diff --git a/metadata/md5-cache/kde-apps/kpat-18.04.3 b/metadata/md5-cache/kde-apps/kpat-18.04.3
index e5d02175a469..39c2099a4390 100644
--- a/metadata/md5-cache/kde-apps/kpat-18.04.3
+++ b/metadata/md5-cache/kde-apps/kpat-18.04.3
@@ -9,5 +9,5 @@ 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/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-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 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kpat-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=604ed984c7ef18cead0038134b01ec37
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.3 b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.3
index 80fc258ae387..a748fd283470 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.3
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kpimtextedit-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ddf83a7053a182df9388624e625e8f47
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.08.1 b/metadata/md5-cache/kde-apps/kpimtextedit-18.08.1
deleted file mode 100644
index 5d7cc366d0e1..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kemoticons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-frameworks/syntax-highlighting-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) test? ( >=kde-frameworks/ktextwidgets-5.49.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.49.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kemoticons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-frameworks/syntax-highlighting-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kpimtextedit-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.08.2 b/metadata/md5-cache/kde-apps/kpimtextedit-18.08.2
new file mode 100644
index 000000000000..daebcf4d7156
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) test? ( >=kde-frameworks/ktextwidgets-5.50.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.50.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kpimtextedit-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4ce1d7434b0c28b8f2dd808367a5dd9c
diff --git a/metadata/md5-cache/kde-apps/kpkpass-18.08.1 b/metadata/md5-cache/kde-apps/kpkpass-18.08.1
deleted file mode 100644
index 8dcd4aab31ca..000000000000
--- a/metadata/md5-cache/kde-apps/kpkpass-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=dev-qt/qtgui-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.49.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=Library to deal with Apple Wallet pass files
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpkpass: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.08.1/src/kpkpass-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=778ceb95997df89b09e53b3383bfde15
diff --git a/metadata/md5-cache/kde-apps/kpkpass-18.08.2 b/metadata/md5-cache/kde-apps/kpkpass-18.08.2
new file mode 100644
index 000000000000..929e3d60e3c1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpkpass-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=dev-qt/qtgui-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.50.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=Library to deal with Apple Wallet pass files
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kontact/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpkpass: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.08.2/src/kpkpass-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b98a917ce770492230890b43b98eb9cb
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.3
index 4d7c76cf7992..225e049edcfa 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.3
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kqtquickcharts-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a503349903246748e14c7c47e3a83bc6
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.1
deleted file mode 100644
index be9004f86cb1..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.1
+++ /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.4:5 >=dev-qt/qtgui-5.9.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kqtquickcharts-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.2 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.2
new file mode 100644
index 000000000000..fdb2474b93c7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kqtquickcharts-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e02e372e05390aed3c65bd77da092d7b
diff --git a/metadata/md5-cache/kde-apps/krdc-18.04.3 b/metadata/md5-cache/kde-apps/krdc-18.04.3
index 1cf471069863..0d9e9ec97eee 100644
--- a/metadata/md5-cache/kde-apps/krdc-18.04.3
+++ b/metadata/md5-cache/kde-apps/krdc-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-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/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-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/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/krdc-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7828422a94ad659e366e6963d063b4a5
diff --git a/metadata/md5-cache/kde-apps/krdc-18.08.1 b/metadata/md5-cache/kde-apps/krdc-18.08.1
deleted file mode 100644
index fbb4f2d2a0e9..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/krdc-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/krdc-18.08.2 b/metadata/md5-cache/kde-apps/krdc-18.08.2
new file mode 100644
index 000000000000..5d11c8969fdf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krdc-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/krdc-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=43317076c676326cd3df1ee15bc44cbc
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.04.3 b/metadata/md5-cache/kde-apps/kreversi-18.04.3
index 467b5799787d..a3ca00140755 100644
--- a/metadata/md5-cache/kde-apps/kreversi-18.04.3
+++ b/metadata/md5-cache/kde-apps/kreversi-18.04.3
@@ -9,5 +9,5 @@ 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/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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kreversi-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28ad69a2c9942c60b40906520eeff604
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.08.1 b/metadata/md5-cache/kde-apps/kreversi-18.08.1
deleted file mode 100644
index a25aaf1374cb..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kreversi-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.08.2 b/metadata/md5-cache/kde-apps/kreversi-18.08.2
new file mode 100644
index 000000000000..ee2f44677d81
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kreversi-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kreversi-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2aef2f570e9b6fbaabbe01c01b56b1f9
diff --git a/metadata/md5-cache/kde-apps/krfb-18.04.3 b/metadata/md5-cache/kde-apps/krfb-18.04.3
index 114de5dca95d..4be3515983e7 100644
--- a/metadata/md5-cache/kde-apps/krfb-18.04.3
+++ b/metadata/md5-cache/kde-apps/krfb-18.04.3
@@ -9,5 +9,5 @@ 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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/krfb-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5109c9f711b7a7b126d29da1aba93692
diff --git a/metadata/md5-cache/kde-apps/krfb-18.08.1 b/metadata/md5-cache/kde-apps/krfb-18.08.1
deleted file mode 100644
index 5acd500ae259..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/krfb-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/krfb-18.08.2 b/metadata/md5-cache/kde-apps/krfb-18.08.2
new file mode 100644
index 000000000000..0df19b59db09
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krfb-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/krfb-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=92d987cca7753f4505a3cade5f8ae1de
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.3 b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.3
index 461ae5ff2bbd..e72e86b146ff 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.3
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kross-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidget
 REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kross-interpreters-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ceace77089e73a62c146ef8e0b20bcf
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.08.1 b/metadata/md5-cache/kde-apps/kross-interpreters-18.08.1
deleted file mode 100644
index ede847cfcd8b..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kross-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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.4:5
-REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kross-interpreters-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c92157cfe30e039372b41236ed7fd1a6
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.08.2 b/metadata/md5-cache/kde-apps/kross-interpreters-18.08.2
new file mode 100644
index 000000000000..e2610121ffd5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kross-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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.4:5
+REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kross-interpreters-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1469d269cfc312d1209e66a369f0e6bc
diff --git a/metadata/md5-cache/kde-apps/kruler-18.04.3 b/metadata/md5-cache/kde-apps/kruler-18.04.3
index 6b83b90c6216..64dca42230d8 100644
--- a/metadata/md5-cache/kde-apps/kruler-18.04.3
+++ b/metadata/md5-cache/kde-apps/kruler-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.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 >=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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kruler-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=85772097201743f22dd5efc1181c3ee4
diff --git a/metadata/md5-cache/kde-apps/kruler-18.08.1 b/metadata/md5-cache/kde-apps/kruler-18.08.1
deleted file mode 100644
index a18477ccb3be..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kruler-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kruler-18.08.2 b/metadata/md5-cache/kde-apps/kruler-18.08.2
new file mode 100644
index 000000000000..75d37ae8cc47
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kruler-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kruler-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4c15bd5ed60297294f714b08f2366a19
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.04.3 b/metadata/md5-cache/kde-apps/kshisen-18.04.3
index 843f3d5d7847..abfbe0788d4f 100644
--- a/metadata/md5-cache/kde-apps/kshisen-18.04.3
+++ b/metadata/md5-cache/kde-apps/kshisen-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=kde-apps/libkmahjongg-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kshisen-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e9a6b4515d862af244614266d726b5ed
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.08.1 b/metadata/md5-cache/kde-apps/kshisen-18.08.1
deleted file mode 100644
index 71c9053980aa..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=kde-apps/libkmahjongg-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=kde-apps/libkmahjongg-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kshisen-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.08.2 b/metadata/md5-cache/kde-apps/kshisen-18.08.2
new file mode 100644
index 000000000000..7230c8634ef6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kshisen-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=kde-apps/libkmahjongg-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=kde-apps/libkmahjongg-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kshisen-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e35190fa5ed239571fde710db746bd33
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.04.3 b/metadata/md5-cache/kde-apps/ksirk-18.04.3
index 1498cbcf49f9..5947580de02d 100644
--- a/metadata/md5-cache/kde-apps/ksirk-18.04.3
+++ b/metadata/md5-cache/kde-apps/ksirk-18.04.3
@@ -9,5 +9,5 @@ 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/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksirk-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c24b09c9a0077a560a175176f329f7ee
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.08.1 b/metadata/md5-cache/kde-apps/ksirk-18.08.1
deleted file mode 100644
index 93a9d9429f8f..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ksirk-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=60a888a869dd513e1502869a2d5d0786
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.08.2 b/metadata/md5-cache/kde-apps/ksirk-18.08.2
new file mode 100644
index 000000000000..7396d07429b7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksirk-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ksirk-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f898dd31bf7ff61ecbd4d94bed392635
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.04.3 b/metadata/md5-cache/kde-apps/ksmtp-18.04.3
index 466ad461e71b..5ac92468018c 100644
--- a/metadata/md5-cache/kde-apps/ksmtp-18.04.3
+++ b/metadata/md5-cache/kde-apps/ksmtp-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksmtp-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f5df7ab4fd82830f00d6531d8ef6bdd
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.08.1 b/metadata/md5-cache/kde-apps/ksmtp-18.08.1
deleted file mode 100644
index e87555f102bc..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtnetwork-5.9.4: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.49.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=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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtnetwork-5.9.4:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ksmtp-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2ffdc2c57e6bb91eea2f16c0fb6c8dc8
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.08.2 b/metadata/md5-cache/kde-apps/ksmtp-18.08.2
new file mode 100644
index 000000000000..72a7b156d1a5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksmtp-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtnetwork-5.9.4: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.50.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=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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtnetwork-5.9.4:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ksmtp-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cb6bbebab8b022ec82dfdf8b6b7d041f
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.3 b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.3
index d4629e97e322..0b30bdcbdfc8 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.3
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.3
@@ -9,5 +9,5 @@ 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/kdbusaddons-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/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksnakeduel-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9191a3216b550925f10a78e2a15ed1a2
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.08.1 b/metadata/md5-cache/kde-apps/ksnakeduel-18.08.1
deleted file mode 100644
index 7858316f4824..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ksnakeduel-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.08.2 b/metadata/md5-cache/kde-apps/ksnakeduel-18.08.2
new file mode 100644
index 000000000000..5df6736f5798
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ksnakeduel-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=989293264910295ee52638742d634780
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.04.3 b/metadata/md5-cache/kde-apps/kspaceduel-18.04.3
index 288a3fe5567b..74b6c393c267 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-18.04.3
+++ b/metadata/md5-cache/kde-apps/kspaceduel-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kspaceduel-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a342ef06b5d3bf226688f7466b24682c
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.08.1 b/metadata/md5-cache/kde-apps/kspaceduel-18.08.1
deleted file mode 100644
index 8aadbd4d72c9..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kspaceduel-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.08.2 b/metadata/md5-cache/kde-apps/kspaceduel-18.08.2
new file mode 100644
index 000000000000..480179656b1b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kspaceduel-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kspaceduel-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a02f9f524ab0b41122ba096c55d3bd91
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.04.3 b/metadata/md5-cache/kde-apps/ksquares-18.04.3
index b4cfad95fc04..250cd2cde5e2 100644
--- a/metadata/md5-cache/kde-apps/ksquares-18.04.3
+++ b/metadata/md5-cache/kde-apps/ksquares-18.04.3
@@ -9,5 +9,5 @@ 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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksquares-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd13b90659191abdeb84cebb8481a12f
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.08.1 b/metadata/md5-cache/kde-apps/ksquares-18.08.1
deleted file mode 100644
index 989d08511be2..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ksquares-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.08.2 b/metadata/md5-cache/kde-apps/ksquares-18.08.2
new file mode 100644
index 000000000000..0930a8a0bb0b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksquares-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ksquares-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=145a2205d4eb0d2047b9a147cc9305de
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.04.3 b/metadata/md5-cache/kde-apps/ksudoku-18.04.3
index 976ca32ba051..3d5a0e17d932 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-18.04.3
+++ b/metadata/md5-cache/kde-apps/ksudoku-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-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/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-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/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksudoku-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c21615738dd644b33d7b5e81c5d9723
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.08.1 b/metadata/md5-cache/kde-apps/ksudoku-18.08.1
deleted file mode 100644
index 388a11ae5d7e..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ksudoku-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.08.2 b/metadata/md5-cache/kde-apps/ksudoku-18.08.2
new file mode 100644
index 000000000000..f78ce068daf2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksudoku-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ksudoku-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e8dcd0501f0dd3680372f9bddfad5c06
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.04.3 b/metadata/md5-cache/kde-apps/ksystemlog-18.04.3
index c4df07c653ad..5ba040745575 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-18.04.3
+++ b/metadata/md5-cache/kde-apps/ksystemlog-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksystemlog-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3516164bfb24ac6d539aba94fbb8b2e4
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.08.1 b/metadata/md5-cache/kde-apps/ksystemlog-18.08.1
deleted file mode 100644
index e817140aab5d..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ksystemlog-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9948f9339dc7458897ce8f3e7a134a64
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.08.2 b/metadata/md5-cache/kde-apps/ksystemlog-18.08.2
new file mode 100644
index 000000000000..965a628c591e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksystemlog-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ksystemlog-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d6e649a6a3cf127b6454cf1463e58e56
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.04.3 b/metadata/md5-cache/kde-apps/kteatime-18.04.3
index 271f76fb5ac3..823caf49da51 100644
--- a/metadata/md5-cache/kde-apps/kteatime-18.04.3
+++ b/metadata/md5-cache/kde-apps/kteatime-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kteatime-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75e4defc2eb4d55924954cae9d54ee31
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.08.1 b/metadata/md5-cache/kde-apps/kteatime-18.08.1
deleted file mode 100644
index f358c0cfee18..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kteatime-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.08.2 b/metadata/md5-cache/kde-apps/kteatime-18.08.2
new file mode 100644
index 000000000000..9565a5745715
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kteatime-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kteatime-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2da424d605554a8037266a5b9ebd6f7d
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.04.3 b/metadata/md5-cache/kde-apps/ktimer-18.04.3
index 729f2f993b90..d837d637226f 100644
--- a/metadata/md5-cache/kde-apps/ktimer-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktimer-18.04.3
@@ -9,5 +9,5 @@ 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/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/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktimer-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ccc65679639130ffdc0603fd03c2b333
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.08.1 b/metadata/md5-cache/kde-apps/ktimer-18.08.1
deleted file mode 100644
index 09f1626288df..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktimer-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.08.2 b/metadata/md5-cache/kde-apps/ktimer-18.08.2
new file mode 100644
index 000000000000..e256c820edb7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktimer-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktimer-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3ff837512aa21121884769acbd1d3205
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.04.3 b/metadata/md5-cache/kde-apps/ktouch-18.04.3
index 99d61978a926..eec5705c2801 100644
--- a/metadata/md5-cache/kde-apps/ktouch-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktouch-18.04.3
@@ -9,5 +9,5 @@ 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/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemviews-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/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktouch-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ff6cf761ab22c980ad553c954dcbc7bb
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.08.1 b/metadata/md5-cache/kde-apps/ktouch-18.08.1
deleted file mode 100644
index 613a8a1c0465..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.49.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktouch-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.08.2 b/metadata/md5-cache/kde-apps/ktouch-18.08.2
new file mode 100644
index 000000000000..e26062d292a3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktouch-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktouch-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1679ff3d11fecffee1ee165a89a390f3
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.3
index 49f35f224ed1..d26b91a0d918 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-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/kitemviews-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-apps/kaccounts-integration-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.04.3:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-accounts-kcm-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=703f7e72c84491e2f61f949db4e07235
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.1
deleted file mode 100644
index f11f1b10e38e..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/kaccounts-integration-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 dev-util/intltool 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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/kaccounts-integration-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.08.1:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-accounts-kcm-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e3422cd549ae8e2b24860e5f4cc7b1f2
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.2 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.2
new file mode 100644
index 000000000000..52dc84126fc3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/kaccounts-integration-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 dev-util/intltool 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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/kaccounts-integration-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.08.2:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-accounts-kcm-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5487941316b7de4e8f6bb1a686c70489
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.04.3 b/metadata/md5-cache/kde-apps/ktp-approver-18.04.3
index 04c10d1e3cb0..cb38a3090c13 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-approver-18.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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/knotifications-5.46.0:5 >=kde-frameworks/kservice-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 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-approver-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d42418d9f52d0ca958c8e0213b19b86a
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.08.1 b/metadata/md5-cache/kde-apps/ktp-approver-18.08.1
deleted file mode 100644
index 1509f1336eb9..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-approver-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.08.2 b/metadata/md5-cache/kde-apps/ktp-approver-18.08.2
new file mode 100644
index 000000000000..ce91e739cad2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-approver-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-approver-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f760834c4d391193533701b01117cc6a
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.3
index 53e90ea60ddc..35de3e279b9f 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-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/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/kaccounts-integration-18.04.3:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-auth-handler-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=05f84129c296a910a24709c4e930bf7b
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.1
deleted file mode 100644
index 752e0f290576..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/kaccounts-integration-18.08.1:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/kaccounts-integration-18.08.1:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-auth-handler-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3ff45856fe8e0cdf15f0959283ba2da0
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.2 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.2
new file mode 100644
index 000000000000..c8814dabc94c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/kaccounts-integration-18.08.2:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/kaccounts-integration-18.08.2:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-auth-handler-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1e1babf247771560b4da8133fdbbd1fc
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.3 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.3
index 3a05656a96a7..429475165475 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.3
@@ -9,5 +9,5 @@ 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/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-call-ui-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=798de42727ce04a299c27c47eb8cce7f
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.1
deleted file mode 100644
index 4ba41935d768..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 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/kcmutils-5.49.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.49.0:5 >=dev-qt/qtcore-5.9.4: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/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-call-ui-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0049804f24f174c4538188cdf2acb9ba
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.2 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.2
new file mode 100644
index 000000000000..98cfaf180d8b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 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/kcmutils-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4: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/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-call-ui-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0b08d9c3038bdf773b46a53e6bec0ecc
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.3
index 879dee0b304e..e4500fb49c14 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-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/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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-18.04.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-common-internals-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ddfc3e0dd761aa540705545190fad3c4
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.1
deleted file mode 100644
index 4445ea174e3e..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpeople-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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-18.08.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtnetwork-5.9.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.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpeople-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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-18.08.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-common-internals-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.2 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.2
new file mode 100644
index 000000000000..b2cbfb4739d0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpeople-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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-18.08.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtnetwork-5.9.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.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpeople-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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-18.08.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-common-internals-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=308c69ad5c592d28f59132027f53e8d0
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.3
index f91c60f14cfa..a166914e0ec9 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.3
@@ -9,5 +9,5 @@ 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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpeople-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-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-contact-list-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80fbb773475ff7e322765d76b658d2b5
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.1
deleted file mode 100644
index 10f5da9c5a8c..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kpeople-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=dev-qt/qtxml-5.9.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kpeople-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-contact-list-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.2 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.2
new file mode 100644
index 000000000000..3639ba296ad9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kpeople-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=dev-qt/qtxml-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kpeople-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-contact-list-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8589f887f5bbe20244a8b7aaf27579e1
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.3
index f63f8d570953..7c0d1e005f18 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-contact-runner-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3d87c2f1f6cb9efb54c358ac7c82709b
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.1
deleted file mode 100644
index 3264ce1343d2..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/krunner-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.49.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/krunner-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-contact-runner-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.2 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.2
new file mode 100644
index 000000000000..87e97c24ce77
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-contact-runner-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0eb269d76161b4bdd2fb2477df2089c5
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.3
index 5a15f0925b56..41a8425617db 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.3
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-desktop-applets-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1293624f6bd53098a8e4573f049ca5e2
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.1
deleted file mode 100644
index 8e338e8aefaa..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/plasma-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/ki18n-5.49.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/plasma-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-desktop-applets-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.2 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.2
new file mode 100644
index 000000000000..ac9686294fd0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/ki18n-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-desktop-applets-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4b59dc336052edef6ec4e9404aeb9e52
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.3
index ee141139fb04..ddf3393a6eea 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-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-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-filetransfer-handler-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0a931ef7f8393f572beb07d5b92b6dec
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.1
deleted file mode 100644
index f429f3b7fcc4..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-filetransfer-handler-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.2 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.2
new file mode 100644
index 000000000000..8d3c28d94564
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-filetransfer-handler-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d6c365ba713f2b8bde72e20148f16ca1
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.3
index 8d286f83c052..bd24b88276e8 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 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/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-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-kded-module-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=edcf310594e835e817cdaef12ef0fe7b
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.1
deleted file mode 100644
index 1c5a307bbe86..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kidletime-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kidletime-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-kded-module-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.2 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.2
new file mode 100644
index 000000000000..6a3c3c551792
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-kded-module-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fe5f6f761c95cb3d9f11dc6db5ccffa1
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.3 b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.3
index f173097f0e78..aa1c282d5550 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=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 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.04.3:5 >=kde-apps/ktp-filetransfer-handler-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-send-file-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=29e5aeb6b2aee651d009b27a225f4087
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.08.1 b/metadata/md5-cache/kde-apps/ktp-send-file-18.08.1
deleted file mode 100644
index 26a38eea28eb..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.49.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.08.1:5 >=kde-apps/ktp-filetransfer-handler-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-send-file-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.08.2 b/metadata/md5-cache/kde-apps/ktp-send-file-18.08.2
new file mode 100644
index 000000000000..2259221bb20e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.08.2:5 >=kde-apps/ktp-filetransfer-handler-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-send-file-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ef59a63635f23576fa24082136dd0dc0
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.3
index e6ca91f76e08..8405b1aff233 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=kde-frameworks/karchive-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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdewebkit-5.46.0:5 >=kde-frameworks/kemoticons-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/knotifyconfig-5.46.0:5 >=kde-frameworks/kpeople-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-frameworks/sonnet-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/ktp-contact-list-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-text-ui-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ad080daed6383ce856c975abf975154
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.1
deleted file mode 100644
index 9dddb621ef3a..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdewebkit-5.49.0:5 >=kde-frameworks/kemoticons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kpeople-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdewebkit-5.49.0:5 >=kde-frameworks/kemoticons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kpeople-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-apps/ktp-common-internals-18.08.1:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/ktp-contact-list-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktp-text-ui-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.2 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.2
new file mode 100644
index 000000000000..4cd7d4433b38
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kpeople-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kpeople-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-apps/ktp-common-internals-18.08.2:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/ktp-contact-list-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktp-text-ui-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1115e9bf110e3417901d3a104126b36f
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.04.3 b/metadata/md5-cache/kde-apps/ktuberling-18.04.3
index b2e0e6585487..86392959b2d9 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-18.04.3
+++ b/metadata/md5-cache/kde-apps/ktuberling-18.04.3
@@ -9,5 +9,5 @@ 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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktuberling-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d91a227f6f59832cc1ce10f54f27a935
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.08.1 b/metadata/md5-cache/kde-apps/ktuberling-18.08.1
deleted file mode 100644
index b42644cada0d..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktuberling-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.08.2 b/metadata/md5-cache/kde-apps/ktuberling-18.08.2
new file mode 100644
index 000000000000..58e5015b87ff
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktuberling-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktuberling-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1b7793b51f528b1c2677ce88080c1c36
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.04.3 b/metadata/md5-cache/kde-apps/kturtle-18.04.3
index 3be07921693c..b63488a075b5 100644
--- a/metadata/md5-cache/kde-apps/kturtle-18.04.3
+++ b/metadata/md5-cache/kde-apps/kturtle-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-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/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kturtle-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0695cfa1eac7b3da9bc15d7b43ecf403
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.08.1 b/metadata/md5-cache/kde-apps/kturtle-18.08.1
deleted file mode 100644
index eb29f7806aa7..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kturtle-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.08.2 b/metadata/md5-cache/kde-apps/kturtle-18.08.2
new file mode 100644
index 000000000000..f4842e1279d7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kturtle-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kturtle-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ad2f44a28bf6d70e66da9bb98dae774f
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.04.3 b/metadata/md5-cache/kde-apps/kubrick-18.04.3
index 667ad59aaf2b..c011fe616715 100644
--- a/metadata/md5-cache/kde-apps/kubrick-18.04.3
+++ b/metadata/md5-cache/kde-apps/kubrick-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kubrick-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a5251b75ac1dad649883199c6603ab4
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.08.1 b/metadata/md5-cache/kde-apps/kubrick-18.08.1
deleted file mode 100644
index c696d0c039ef..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kubrick-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.08.2 b/metadata/md5-cache/kde-apps/kubrick-18.08.2
new file mode 100644
index 000000000000..384ee4000367
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kubrick-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kubrick-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2111c9f396b037edda0fd64681c2dc45
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.3 b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.3
index 9cb9d5027f23..0c1aa0a0d07f 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.3
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-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/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/knotifications-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-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 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kwalletmanager-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b9456ebb01315d5e78573555e372f8d9
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.08.1 b/metadata/md5-cache/kde-apps/kwalletmanager-18.08.1
deleted file mode 100644
index a2ca790abe24..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kauth-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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-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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kauth-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kwalletmanager-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.08.2 b/metadata/md5-cache/kde-apps/kwalletmanager-18.08.2
new file mode 100644
index 000000000000..9492c0c8aeb0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kwalletmanager-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=405d4b3c0f120ef1b4c913e8af7dcd54
diff --git a/metadata/md5-cache/kde-apps/kwave-18.04.3 b/metadata/md5-cache/kde-apps/kwave-18.04.3
index fbbc054c389a..86a8bfd72686 100644
--- a/metadata/md5-cache/kde-apps/kwave-18.04.3
+++ b/metadata/md5-cache/kde-apps/kwave-18.04.3
@@ -9,5 +9,5 @@ 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.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/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kwave-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51c92ce6a8e0d3da6b0c198b334f4e66
diff --git a/metadata/md5-cache/kde-apps/kwave-18.08.1 b/metadata/md5-cache/kde-apps/kwave-18.08.1
deleted file mode 100644
index df85642778b7..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.4:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-18.08.1:5 >=dev-qt/qtconcurrent-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kwave-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwave-18.08.2 b/metadata/md5-cache/kde-apps/kwave-18.08.2
new file mode 100644
index 000000000000..bf4e797f0185
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwave-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.4:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-18.08.2:5 >=dev-qt/qtconcurrent-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kwave-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=aa10d0def8ca4837066ecb2e6c2d06bf
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.04.3 b/metadata/md5-cache/kde-apps/kwordquiz-18.04.3
index fce2584ad7e4..e52dfe5141cf 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-18.04.3
+++ b/metadata/md5-cache/kde-apps/kwordquiz-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/kdelibs4support-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/kitemviews-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkeduvocdocument-18.04.3:5 >=dev-qt/qtdbus-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 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kwordquiz-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9ed510323e20e824df18f4781257aba
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.08.1 b/metadata/md5-cache/kde-apps/kwordquiz-18.08.1
deleted file mode 100644
index 44bcde3e75ba..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkeduvocdocument-18.08.1:5 >=dev-qt/qtdbus-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 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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/knotifyconfig-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkeduvocdocument-18.08.1:5 >=dev-qt/qtdbus-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 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kwordquiz-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.08.2 b/metadata/md5-cache/kde-apps/kwordquiz-18.08.2
new file mode 100644
index 000000000000..035f625a1a4d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwordquiz-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkeduvocdocument-18.08.2:5 >=dev-qt/qtdbus-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 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkeduvocdocument-18.08.2:5 >=dev-qt/qtdbus-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 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kwordquiz-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8b7befef441c060e2a5bf6d35b87f8b9
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.04.3 b/metadata/md5-cache/kde-apps/kwrite-18.04.3
index 47caf9ac49e1..c76890af0a22 100644
--- a/metadata/md5-cache/kde-apps/kwrite-18.04.3
+++ b/metadata/md5-cache/kde-apps/kwrite-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-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/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kate-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d62ce9c318436c1d43aa603cfce3034c
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.08.1 b/metadata/md5-cache/kde-apps/kwrite-18.08.1
deleted file mode 100644
index 443d6eab9d78..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kate-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1ec19493095d035321afda652edd6c04
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.08.2 b/metadata/md5-cache/kde-apps/kwrite-18.08.2
new file mode 100644
index 000000000000..ff707d5a0731
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwrite-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kate-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=69187c07d86fc3912144059be0371a0f
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.04.3 b/metadata/md5-cache/kde-apps/libgravatar-18.04.3
index ee8f771b283e..ae793f9fe9b6 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-18.04.3
+++ b/metadata/md5-cache/kde-apps/libgravatar-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libgravatar-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2ae34e54e05359c2f12f1bd5a46dc7e
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.08.1 b/metadata/md5-cache/kde-apps/libgravatar-18.08.1
deleted file mode 100644
index 0d56caef05b8..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-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.49.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=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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libgravatar-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.08.2 b/metadata/md5-cache/kde-apps/libgravatar-18.08.2
new file mode 100644
index 000000000000..3eda1a58b5db
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libgravatar-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-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.50.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=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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libgravatar-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fec58762bdad35c9cc18e3379fd46d9a
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.04.3 b/metadata/md5-cache/kde-apps/libkcddb-18.04.3
index 2fe5b677bd08..3b7c8f3d7460 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkcddb-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkcddb-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f1a229bf15d6a242bcb17474179919b
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.08.1 b/metadata/md5-cache/kde-apps/libkcddb-18.08.1
deleted file mode 100644
index 9a6959e9954e..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkcddb-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.08.2 b/metadata/md5-cache/kde-apps/libkcddb-18.08.2
new file mode 100644
index 000000000000..c33414c92a4d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcddb-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkcddb-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c74cd2760721b54b2de65016b304aaf0
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.3
index 25c731cf96dd..af7524518d98 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkcompactdisc-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3405524251ba92ccb870682afc75e2ce
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.1
deleted file mode 100644
index a35be1426531..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtdbus-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/solid-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkcompactdisc-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.2 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.2
new file mode 100644
index 000000000000..36abfc7ddeeb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkcompactdisc-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bb7caf0c726aa3db5f9c2e1cfbfb5a88
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.04.3 b/metadata/md5-cache/kde-apps/libkdcraw-18.04.3
index 8de1c24574bb..2096a02ca16e 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkdcraw-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 <media-libs/libraw-0.19:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkdcraw-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=594d410b60f865d69e52b4a1d78ecdd5
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.08.1 b/metadata/md5-cache/kde-apps/libkdcraw-18.08.1
deleted file mode 100644
index 4b1bf29c0a85..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-libs/libraw-0.16:= 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.49.0:5 >=dev-qt/qtcore-5.9.4: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.4:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkdcraw-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ac56850989ddf7ea772cef4d6b83c126
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.08.2 b/metadata/md5-cache/kde-apps/libkdcraw-18.08.2
new file mode 100644
index 000000000000..ef43e9a0d76a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdcraw-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-libs/libraw-0.16:= 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.50.0:5 >=dev-qt/qtcore-5.9.4: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.4:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkdcraw-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=41988dc3700967185ab64ed0ea8c7428
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.04.3 b/metadata/md5-cache/kde-apps/libkdegames-18.04.3
index 776bf5226bbd..ebcea2595976 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkdegames-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-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/kdeclarative-5.46.0:5 >=kde-frameworks/kdnssd-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/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-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/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkdegames-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14fe3e55ef9d698d468f040b1e876166
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.08.1 b/metadata/md5-cache/kde-apps/libkdegames-18.08.1
deleted file mode 100644
index f28ccbb839e3..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/kglobalaccel-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.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=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.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/kglobalaccel-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkdegames-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.08.2 b/metadata/md5-cache/kde-apps/libkdegames-18.08.2
new file mode 100644
index 000000000000..0154bc198961
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdegames-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.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=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.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkdegames-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d0f8c45a5760625c317d7575ef87d130
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.04.3 b/metadata/md5-cache/kde-apps/libkdepim-18.04.3
index 37243a3dc352..e77aec857f0b 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkdepim-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=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/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/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkdepim-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e104cb8c154a752f9d9fb000c383a56
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.08.1 b/metadata/md5-cache/kde-apps/libkdepim-18.08.1
deleted file mode 100644
index b626640dd165..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kldap-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-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.49.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-search-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kldap-18.08.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkdepim-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.08.2 b/metadata/md5-cache/kde-apps/libkdepim-18.08.2
new file mode 100644
index 000000000000..4ed9017c3f82
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdepim-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kldap-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-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.50.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-search-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kldap-18.08.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkdepim-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c2d10ca26b4658fb85de413b872c1063
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.3
index 86694c3f0489..2debafff0917 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-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 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkeduvocdocument-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f53c2620ffb667c7189d86a4b93fad8
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.1
deleted file mode 100644
index efcf771b7b2a..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtxml-5.9.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.49.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=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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkeduvocdocument-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.2 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.2
new file mode 100644
index 000000000000..447bfc62dabc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtxml-5.9.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.50.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=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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkeduvocdocument-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3f73d8b378ef011ea1f385731d45c7ac
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.04.3 b/metadata/md5-cache/kde-apps/libkexiv2-18.04.3
index fd598b147df6..f1748174a6c3 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkexiv2-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkexiv2-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4e053e1f0bee3abd270171a88f874a84
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.08.1 b/metadata/md5-cache/kde-apps/libkexiv2-18.08.1
deleted file mode 100644
index 8e184016fa21..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.4:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkexiv2-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.08.2 b/metadata/md5-cache/kde-apps/libkexiv2-18.08.2
new file mode 100644
index 000000000000..9226a971453a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkexiv2-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.4:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkexiv2-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=01c86f0f47aad45445c8e0c322343982
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.04.3 b/metadata/md5-cache/kde-apps/libkgapi-18.04.3
index be813c3c6d2d..0c3275dfbc17 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkgapi-18.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkgapi-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5c4f6491f70bcb0e46d3b169eaab34c9
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.08.1 b/metadata/md5-cache/kde-apps/libkgapi-18.08.1
deleted file mode 100644
index 6b7746264b0d..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 nls? ( >=dev-qt/linguist-tools-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.49.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=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.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.07.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkgapi-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=588f2856852db80f18b95d3b8b265818
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.08.2 b/metadata/md5-cache/kde-apps/libkgapi-18.08.2
new file mode 100644
index 000000000000..99687a1758f4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgapi-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 nls? ( >=dev-qt/linguist-tools-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.50.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=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.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.07.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkgapi-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=638375cca2fb561cfbce4a67acd28792
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.04.3 b/metadata/md5-cache/kde-apps/libkgeomap-18.04.3
index 219824274608..3ef125099576 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkgeomap-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-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-apps/marble-18.04.3:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkgeomap-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b34d9283458a17ef95c979067648d0ac
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.08.1 b/metadata/md5-cache/kde-apps/libkgeomap-18.08.1
deleted file mode 100644
index ce856688c58e..000000000000
--- a/metadata/md5-cache/kde-apps/libkgeomap-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-apps/marble-18.08.1:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-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.49.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=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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-apps/marble-18.08.1:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkgeomap-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.08.2 b/metadata/md5-cache/kde-apps/libkgeomap-18.08.2
new file mode 100644
index 000000000000..17a19643f06c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgeomap-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-apps/marble-18.08.2:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-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.50.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=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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-apps/marble-18.08.2:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkgeomap-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2bd887b3ceec9458e4ca300043e47ddc
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.04.3 b/metadata/md5-cache/kde-apps/libkipi-18.04.3
index 4a4bc0b0bd61..15091fafde95 100644
--- a/metadata/md5-cache/kde-apps/libkipi-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkipi-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5/32
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkipi-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5bf4ec6dc6f65005f4ea46207e8f426c
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.08.1 b/metadata/md5-cache/kde-apps/libkipi-18.08.1
deleted file mode 100644
index eee3226824a0..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5/32
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkipi-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.08.2 b/metadata/md5-cache/kde-apps/libkipi-18.08.2
new file mode 100644
index 000000000000..2aeffe690434
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkipi-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5/32
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkipi-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f5a32329bde9cf41cdcf54853d504e52
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.04.3 b/metadata/md5-cache/kde-apps/libkleo-18.04.3
index 20be27d68030..4f307ebf7206 100644
--- a/metadata/md5-cache/kde-apps/libkleo-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkleo-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-apps/kpimtextedit-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkleo-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bde39a2f16bbc248b29fd64040ba38fc
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.08.1 b/metadata/md5-cache/kde-apps/libkleo-18.08.1
deleted file mode 100644
index ba1463ef5856..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-apps/kpimtextedit-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-apps/kpimtextedit-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkleo-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.08.2 b/metadata/md5-cache/kde-apps/libkleo-18.08.2
new file mode 100644
index 000000000000..69f618e878f9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkleo-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-apps/kpimtextedit-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-apps/kpimtextedit-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkleo-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ab0f3a3c03c57a9a6ae01151a0e081b2
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.3 b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.3
index 543f7233b85c..1aa198ee499f 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.3
@@ -9,5 +9,5 @@ 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/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkmahjongg-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=87c76059509d5be161c55116f3eeef25
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.08.1 b/metadata/md5-cache/kde-apps/libkmahjongg-18.08.1
deleted file mode 100644
index 1a485c876f28..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkmahjongg-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.08.2 b/metadata/md5-cache/kde-apps/libkmahjongg-18.08.2
new file mode 100644
index 000000000000..89c257bfc9fd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkmahjongg-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c67e20016d427600326fadaafcb42790
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.3 b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.3
index 043bbe270516..c240891261e0 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.3
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkomparediff2-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=070686400b5185aa470d1dd14384e2ae
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.08.1 b/metadata/md5-cache/kde-apps/libkomparediff2-18.08.1
deleted file mode 100644
index 55a02dd6d4cc..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libkomparediff2-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.08.2 b/metadata/md5-cache/kde-apps/libkomparediff2-18.08.2
new file mode 100644
index 000000000000..beac7523a158
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libkomparediff2-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=dc6d2054ac6a10a6daabeb7876f6911d
diff --git a/metadata/md5-cache/kde-apps/libksane-18.04.3 b/metadata/md5-cache/kde-apps/libksane-18.04.3
index e7f215b2edb4..4e35131a11fc 100644
--- a/metadata/md5-cache/kde-apps/libksane-18.04.3
+++ b/metadata/md5-cache/kde-apps/libksane-18.04.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.46.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libksane-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de9777944b80856edbc2d5a0fd422339
diff --git a/metadata/md5-cache/kde-apps/libksane-18.08.1 b/metadata/md5-cache/kde-apps/libksane-18.08.1
deleted file mode 100644
index 99474c2d548e..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.49.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.49.0:5 >=dev-qt/qtcore-5.9.4: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=kwallet debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.49.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libksane-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=664e3e3594d4876781098b28c1af630a
diff --git a/metadata/md5-cache/kde-apps/libksane-18.08.2 b/metadata/md5-cache/kde-apps/libksane-18.08.2
new file mode 100644
index 000000000000..850ff490588a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksane-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4: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=kwallet debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.50.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libksane-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=db60c1ad16b3fb724c3e11d9471c1ff4
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.04.3 b/metadata/md5-cache/kde-apps/libksieve-18.04.3
index 5e90cb866ad0..83ed6181a5f3 100644
--- a/metadata/md5-cache/kde-apps/libksieve-18.04.3
+++ b/metadata/md5-cache/kde-apps/libksieve-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/libksieve-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b63b0638da8bf42ce2f97d1e5aea96a9
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.08.1 b/metadata/md5-cache/kde-apps/libksieve-18.08.1
deleted file mode 100644
index 920899616e12..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-frameworks/syntax-highlighting-5.49.0:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-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/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl >=kde-apps/kimap-18.08.1:5 >=kde-apps/kmailtransport-18.08.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-frameworks/syntax-highlighting-5.49.0:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtdbus-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/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/libksieve-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.08.2 b/metadata/md5-cache/kde-apps/libksieve-18.08.2
new file mode 100644
index 000000000000..26d1deed0d83
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksieve-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-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/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl >=kde-apps/kimap-18.08.2:5 >=kde-apps/kmailtransport-18.08.2: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtdbus-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/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/libksieve-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f098085c37483b8402c48ac41203e4ca
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.04.3 b/metadata/md5-cache/kde-apps/libktnef-18.04.3
index 327f7ae8c31f..2c58541cbbac 100644
--- a/metadata/md5-cache/kde-apps/libktnef-18.04.3
+++ b/metadata/md5-cache/kde-apps/libktnef-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktnef-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3fb6cf52fe9fc17da9fbd53d2413fd8b
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.08.1 b/metadata/md5-cache/kde-apps/libktnef-18.08.1
deleted file mode 100644
index ee60404cf6da..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=dev-qt/qtwidgets-5.9.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.49.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=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.49.0:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcalutils-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/ktnef-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.08.2 b/metadata/md5-cache/kde-apps/libktnef-18.08.2
new file mode 100644
index 000000000000..9e0973710bfd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libktnef-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=dev-qt/qtwidgets-5.9.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.50.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=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.50.0:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcalutils-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/ktnef-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=12a7afb3b0c3c1b604a2742eeaf391be
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.04.3 b/metadata/md5-cache/kde-apps/lokalize-18.04.3
index 52893fb7e834..0f686a67a4f3 100644
--- a/metadata/md5-cache/kde-apps/lokalize-18.04.3
+++ b/metadata/md5-cache/kde-apps/lokalize-18.04.3
@@ -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=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/lokalize-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8a45228333f5b4d84e4bb333fc8957f5
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.08.1 b/metadata/md5-cache/kde-apps/lokalize-18.08.1
deleted file mode 100644
index 6bd1afcf0d02..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kross-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 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 ) 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(+)?] >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kross-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[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(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/lokalize-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bd242b06ce6914d100a89abe5ee4b707
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.08.2 b/metadata/md5-cache/kde-apps/lokalize-18.08.2
new file mode 100644
index 000000000000..7d85963aef89
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 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 ) 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(+)?] >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[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(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/lokalize-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6de9cb3ff642bc7e0806f36d91837802
diff --git a/metadata/md5-cache/kde-apps/lskat-18.04.3 b/metadata/md5-cache/kde-apps/lskat-18.04.3
index 38936952fcb7..51399ad4ff16 100644
--- a/metadata/md5-cache/kde-apps/lskat-18.04.3
+++ b/metadata/md5-cache/kde-apps/lskat-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-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/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/lskat-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4d206eaa8cb723c62ddecc08493df561
diff --git a/metadata/md5-cache/kde-apps/lskat-18.08.1 b/metadata/md5-cache/kde-apps/lskat-18.08.1
deleted file mode 100644
index a09b994c67d7..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kguiaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/lskat-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fab25b37aac762df1227487546549eff
diff --git a/metadata/md5-cache/kde-apps/lskat-18.08.2 b/metadata/md5-cache/kde-apps/lskat-18.08.2
new file mode 100644
index 000000000000..a690e3d62370
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lskat-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/lskat-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a621ab7cba7ffb2eec01510fecf92ae1
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.04.3 b/metadata/md5-cache/kde-apps/mailcommon-18.04.3
index b5e09f5f1972..3beb022131d2 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-18.04.3
+++ b/metadata/md5-cache/kde-apps/mailcommon-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/mailcommon-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=268293d932414f207e635e5f8bc803c8
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.08.1 b/metadata/md5-cache/kde-apps/mailcommon-18.08.1
deleted file mode 100644
index acc2a6c62b4e..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/syntax-highlighting-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/mailimporter-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1: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 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.49.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/syntax-highlighting-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/mailimporter-18.08.1:5 >=kde-apps/messagelib-18.08.1:5 >=kde-apps/pimcommon-18.08.1: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 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/mailcommon-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.08.2 b/metadata/md5-cache/kde-apps/mailcommon-18.08.2
new file mode 100644
index 000000000000..2c67da7208e8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailcommon-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/mailimporter-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2: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 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.50.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/mailimporter-18.08.2:5 >=kde-apps/messagelib-18.08.2:5 >=kde-apps/pimcommon-18.08.2: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 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/mailcommon-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9ee093bc173aee7b4e1b2f5117e1b3c2
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.04.3 b/metadata/md5-cache/kde-apps/mailimporter-18.04.3
index 358a3d75559a..647db4a01b6e 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-18.04.3
+++ b/metadata/md5-cache/kde-apps/mailimporter-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/mailimporter-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ce0c68806952e83a5ccab58e8aab991
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.08.1 b/metadata/md5-cache/kde-apps/mailimporter-18.08.1
deleted file mode 100644
index 2211be8a441a..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-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.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/mailimporter-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.08.2 b/metadata/md5-cache/kde-apps/mailimporter-18.08.2
new file mode 100644
index 000000000000..4e8a87ae9e47
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailimporter-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-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.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/mailimporter-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8f26b51e5e21872d377327264bd3c484
diff --git a/metadata/md5-cache/kde-apps/marble-18.04.3 b/metadata/md5-cache/kde-apps/marble-18.04.3
index e66efb822495..7c2cfa1b611e 100644
--- a/metadata/md5-cache/kde-apps/marble-18.04.3
+++ b/metadata/md5-cache/kde-apps/marble-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qt
 RESTRICT=test
 SLOT=5/18.04
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/marble-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2282d34cec47684ade8f83bfdad534bb
diff --git a/metadata/md5-cache/kde-apps/marble-18.08.1 b/metadata/md5-cache/kde-apps/marble-18.08.1
deleted file mode 100644
index 44d7e77e4469..000000000000
--- a/metadata/md5-cache/kde-apps/marble-18.08.1
+++ /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.4: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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/krunner-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwallet-5.49.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.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.4: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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/krunner-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwallet-5.49.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.49.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.4:5
-RESTRICT=test
-SLOT=5/18.08
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/marble-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/marble-18.08.2 b/metadata/md5-cache/kde-apps/marble-18.08.2
new file mode 100644
index 000000000000..09d436fc5f24
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/marble-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.9.4: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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.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.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.4: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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.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.50.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.4:5
+RESTRICT=test
+SLOT=5/18.08
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/marble-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bd00def0912fe17f3e5d9e24745fb53d
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.04.3 b/metadata/md5-cache/kde-apps/mbox-importer-18.04.3
index 40e0200552da..1eeb1aa49104 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-18.04.3
+++ b/metadata/md5-cache/kde-apps/mbox-importer-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 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/ki18n-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/mailimporter-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/mbox-importer-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4461e6ef9dbf65080d38c22a9f285846
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.08.1 b/metadata/md5-cache/kde-apps/mbox-importer-18.08.1
deleted file mode 100644
index 14f8a1891f25..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/mailimporter-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/mailimporter-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/mbox-importer-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.08.2 b/metadata/md5-cache/kde-apps/mbox-importer-18.08.2
new file mode 100644
index 000000000000..ba100ac6e689
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mbox-importer-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/mailimporter-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/mailimporter-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/mbox-importer-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5138006779f39cb07fc7ea592a317901
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.04.3 b/metadata/md5-cache/kde-apps/messagelib-18.04.3
index 4ba598c164cd..7b4c5f6baa70 100644
--- a/metadata/md5-cache/kde-apps/messagelib-18.04.3
+++ b/metadata/md5-cache/kde-apps/messagelib-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/messagelib-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ffd5aa2c784b1bb28001d001dac75cbc
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.08.1 b/metadata/md5-cache/kde-apps/messagelib-18.08.1
deleted file mode 100644
index 21ac2fdc57a5..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-frameworks/syntax-highlighting-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/incidenceeditor-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kldap-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmbox-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libgravatar-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=kde-frameworks/syntax-highlighting-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/grantleetheme-18.08.1:5 >=kde-apps/incidenceeditor-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kdepim-apps-libs-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kldap-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmbox-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libgravatar-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/libkleo-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0: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.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/messagelib-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7841b49b3d1ecdffd4b53b5aa6fb2070
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.08.2 b/metadata/md5-cache/kde-apps/messagelib-18.08.2
new file mode 100644
index 000000000000..abd51fc1190b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/messagelib-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/incidenceeditor-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kldap-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmbox-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libgravatar-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/grantleetheme-18.08.2:5 >=kde-apps/incidenceeditor-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kdepim-apps-libs-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kldap-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmbox-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libgravatar-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/libkleo-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0: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.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/messagelib-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2d10166c850349dacc3338ad2ad4415c
diff --git a/metadata/md5-cache/kde-apps/minuet-18.04.3 b/metadata/md5-cache/kde-apps/minuet-18.04.3
index e3e37206fc99..4499ebca516e 100644
--- a/metadata/md5-cache/kde-apps/minuet-18.04.3
+++ b/metadata/md5-cache/kde-apps/minuet-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/minuet-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=55724ebb5c14ef34821fce2dfef99780
diff --git a/metadata/md5-cache/kde-apps/minuet-18.08.1 b/metadata/md5-cache/kde-apps/minuet-18.08.1
deleted file mode 100644
index 8dc831e75823..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/minuet-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/minuet-18.08.2 b/metadata/md5-cache/kde-apps/minuet-18.08.2
new file mode 100644
index 000000000000..e07433922e8c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/minuet-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/minuet-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bdc41893acf844656b7b5cefd59075eb
diff --git a/metadata/md5-cache/kde-apps/okular-18.04.3-r1 b/metadata/md5-cache/kde-apps/okular-18.04.3-r1
index fa3c4fca68ef..414e75ea0042 100644
--- a/metadata/md5-cache/kde-apps/okular-18.04.3-r1
+++ b/metadata/md5-cache/kde-apps/okular-18.04.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/karchive-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/kio-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.46.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-18.04.3:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.3:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.46.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.46.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.46.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/okular-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0dae645cb250f21427149790fcf6c25
diff --git a/metadata/md5-cache/kde-apps/okular-18.08.1 b/metadata/md5-cache/kde-apps/okular-18.08.1
deleted file mode 100644
index daa03a2ea3e5..000000000000
--- a/metadata/md5-cache/kde-apps/okular-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.49.0:5 >=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjs-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpty-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/threadweaver-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib:= chm? ( >=kde-frameworks/khtml-5.49.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-18.08.1:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.08.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.49.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjs-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kpty-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/threadweaver-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib:= chm? ( >=kde-frameworks/khtml-5.49.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-18.08.1:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.08.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.49.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.49.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.49.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/okular-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=63cd75a97c140801d5ac1a9bb904d4e8
diff --git a/metadata/md5-cache/kde-apps/okular-18.08.2 b/metadata/md5-cache/kde-apps/okular-18.08.2
new file mode 100644
index 000000000000..7e88d857be53
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okular-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjs-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpty-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/threadweaver-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib:= chm? ( >=kde-frameworks/khtml-5.50.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-18.08.2:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.08.2:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.50.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjs-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpty-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/threadweaver-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib:= chm? ( >=kde-frameworks/khtml-5.50.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-18.08.2:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.08.2:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.50.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.50.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.50.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/okular-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=adb38f6a3a16d9b20c15108feb1626fe
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.04.3 b/metadata/md5-cache/kde-apps/palapeli-18.04.3
index b4302a13e1f9..3f7e554199c2 100644
--- a/metadata/md5-cache/kde-apps/palapeli-18.04.3
+++ b/metadata/md5-cache/kde-apps/palapeli-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-5.46.0:5 >=kde-frameworks/ki18n-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/palapeli-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7b6e27a5c3c2641acd0279230072806
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.08.1 b/metadata/md5-cache/kde-apps/palapeli-18.08.1
deleted file mode 100644
index 03eaadc9eda4..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtconcurrent-5.9.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/palapeli-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.08.2 b/metadata/md5-cache/kde-apps/palapeli-18.08.2
new file mode 100644
index 000000000000..1da1c94a7a47
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/palapeli-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtconcurrent-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/palapeli-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ac133a7bdd28ccfd29a9593f79a6d345
diff --git a/metadata/md5-cache/kde-apps/parley-18.04.3 b/metadata/md5-cache/kde-apps/parley-18.04.3
index 259b71571564..6870d9a59904 100644
--- a/metadata/md5-cache/kde-apps/parley-18.04.3
+++ b/metadata/md5-cache/kde-apps/parley-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkeduvocdocument-18.04.3: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/khtml-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/kross-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/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/parley-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c969aa0a2bdfdb6a243c223a1fea5130
diff --git a/metadata/md5-cache/kde-apps/parley-18.08.1 b/metadata/md5-cache/kde-apps/parley-18.08.1
deleted file mode 100644
index 94dfc702359e..000000000000
--- a/metadata/md5-cache/kde-apps/parley-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/libkeduvocdocument-18.08.1:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kross-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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-18.08.1:5 >=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kross-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-frameworks/sonnet-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/parley-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/parley-18.08.2 b/metadata/md5-cache/kde-apps/parley-18.08.2
new file mode 100644
index 000000000000..0c5bf0619bf5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/parley-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/libkeduvocdocument-18.08.2:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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-18.08.2:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.08.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/parley-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4943c958272186275491f5ecf280f48d
diff --git a/metadata/md5-cache/kde-apps/picmi-18.04.3 b/metadata/md5-cache/kde-apps/picmi-18.04.3
index 4c108510412d..5586dc359510 100644
--- a/metadata/md5-cache/kde-apps/picmi-18.04.3
+++ b/metadata/md5-cache/kde-apps/picmi-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/picmi-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d58896f3f78188ee5dda28fe0eab6eb3
diff --git a/metadata/md5-cache/kde-apps/picmi-18.08.1 b/metadata/md5-cache/kde-apps/picmi-18.08.1
deleted file mode 100644
index 0d434cf015ad..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/libkdegames-18.08.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/picmi-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/picmi-18.08.2 b/metadata/md5-cache/kde-apps/picmi-18.08.2
new file mode 100644
index 000000000000..6119cac3b4e2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/picmi-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkdegames-18.08.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/picmi-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=868338d6eb69207a98830bd093e24f3a
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.3
index 1b3c0d796789..20a193bcfc3f 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.3
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.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/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/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/pim-data-exporter-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4aa5541725e20a5eaf413f4670b2c88
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.1
deleted file mode 100644
index 6f0f400f32e6..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kidentitymanagement-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/kmime-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=kde-apps/mailcommon-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/pim-data-exporter-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d079eec90f0277247561f36175046cf0
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.2 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.2
new file mode 100644
index 000000000000..700f642b43bb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kidentitymanagement-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/kmime-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=kde-apps/mailcommon-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/pim-data-exporter-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1b6604a446279e9ac181b2a128bf89ee
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.3
index 5a7e9050c772..9a3d807167af 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.3
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kbookmarks-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/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/libksieve-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/pim-sieve-editor-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=477d864931db079a5bde724eb23f5bca
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.1
deleted file mode 100644
index fe92002c98fb..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/libksieve-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kwallet-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/akonadi-mime-18.08.1:5 >=kde-apps/calendarsupport-18.08.1:5 >=kde-apps/kcalcore-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kmailtransport-18.08.1:5 >=kde-apps/libksieve-18.08.1:5 >=kde-apps/pimcommon-18.08.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/pim-sieve-editor-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.2 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.2
new file mode 100644
index 000000000000..a15338e2552e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/libksieve-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/akonadi-mime-18.08.2:5 >=kde-apps/calendarsupport-18.08.2:5 >=kde-apps/kcalcore-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kmailtransport-18.08.2:5 >=kde-apps/libksieve-18.08.2:5 >=kde-apps/pimcommon-18.08.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/pim-sieve-editor-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=08dd2d55d47bb74cfb473ea151a62abf
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.04.3 b/metadata/md5-cache/kde-apps/pimcommon-18.04.3
index a0ca96b6d245..9850ac06e554 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-18.04.3
+++ b/metadata/md5-cache/kde-apps/pimcommon-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-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-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kimap-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/pimcommon-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f3a54960db63209c6c5533986ea5e13
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.08.1 b/metadata/md5-cache/kde-apps/pimcommon-18.08.1
deleted file mode 100644
index 0bb1c62c83c0..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kimap-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.49.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-18.08.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.49.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.49.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=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.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kitemmodels-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=kde-apps/akonadi-18.08.1:5 >=kde-apps/akonadi-contacts-18.08.1:5 >=kde-apps/kcontacts-18.08.1:5 >=kde-apps/kimap-18.08.1:5 >=kde-apps/kpimtextedit-18.08.1:5 >=kde-apps/libkdepim-18.08.1:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/pimcommon-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=49f79ab940b9801cc271341186db420d
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.08.2 b/metadata/md5-cache/kde-apps/pimcommon-18.08.2
new file mode 100644
index 000000000000..443955645317
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pimcommon-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kimap-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.50.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-18.08.2: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.50.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.50.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=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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-18.08.2:5 >=kde-apps/akonadi-contacts-18.08.2:5 >=kde-apps/kcontacts-18.08.2:5 >=kde-apps/kimap-18.08.2:5 >=kde-apps/kpimtextedit-18.08.2:5 >=kde-apps/libkdepim-18.08.2:5 >=dev-qt/qtdbus-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/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/pimcommon-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bebca19a98a64bbe1d50f6c11a47d9d6
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.3 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.3
index 6124e97cc7ac..74fc8457e0fb 100644
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.3
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
 RDEPEND=>=kde-apps/ktp-accounts-kcm-18.04.3 >=kde-apps/ktp-approver-18.04.3 >=kde-apps/ktp-auth-handler-18.04.3 >=kde-apps/ktp-common-internals-18.04.3 >=kde-apps/ktp-contact-list-18.04.3 >=kde-apps/ktp-contact-runner-18.04.3 >=kde-apps/ktp-desktop-applets-18.04.3 >=kde-apps/ktp-filetransfer-handler-18.04.3 >=kde-apps/ktp-kded-module-18.04.3 >=kde-apps/ktp-send-file-18.04.3 >=kde-apps/ktp-text-ui-18.04.3 gstreamer? ( >=kde-apps/ktp-call-ui-18.04.3 ) !kde-apps/plasma-telepathy-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=22ea1ac7212aae774b8691d0973813ff
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.08.1 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.08.1
deleted file mode 100644
index 57f3c9657470..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.08.1
+++ /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-18.08.1 >=kde-apps/ktp-approver-18.08.1 >=kde-apps/ktp-auth-handler-18.08.1 >=kde-apps/ktp-common-internals-18.08.1 >=kde-apps/ktp-contact-list-18.08.1 >=kde-apps/ktp-contact-runner-18.08.1 >=kde-apps/ktp-desktop-applets-18.08.1 >=kde-apps/ktp-filetransfer-handler-18.08.1 >=kde-apps/ktp-kded-module-18.08.1 >=kde-apps/ktp-send-file-18.08.1 >=kde-apps/ktp-text-ui-18.08.1 gstreamer? ( >=kde-apps/ktp-call-ui-18.08.1 ) !kde-apps/plasma-telepathy-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.08.2 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.08.2
new file mode 100644
index 000000000000..e6a955fab48d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.08.2
@@ -0,0 +1,11 @@
+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-18.08.2 >=kde-apps/ktp-approver-18.08.2 >=kde-apps/ktp-auth-handler-18.08.2 >=kde-apps/ktp-common-internals-18.08.2 >=kde-apps/ktp-contact-list-18.08.2 >=kde-apps/ktp-contact-runner-18.08.2 >=kde-apps/ktp-desktop-applets-18.08.2 >=kde-apps/ktp-filetransfer-handler-18.08.2 >=kde-apps/ktp-kded-module-18.08.2 >=kde-apps/ktp-send-file-18.08.2 >=kde-apps/ktp-text-ui-18.08.2 gstreamer? ( >=kde-apps/ktp-call-ui-18.08.2 ) !kde-apps/plasma-telepathy-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=896d8b1839e50140a4a5f93b4ee2d561
diff --git a/metadata/md5-cache/kde-apps/poxml-18.04.3 b/metadata/md5-cache/kde-apps/poxml-18.04.3
index f9f2857b2a3c..4fdf0eb2adab 100644
--- a/metadata/md5-cache/kde-apps/poxml-18.04.3
+++ b/metadata/md5-cache/kde-apps/poxml-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/poxml-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=11faf6e7ec534acbf7efa0ad12605277
diff --git a/metadata/md5-cache/kde-apps/poxml-18.08.1 b/metadata/md5-cache/kde-apps/poxml-18.08.1
deleted file mode 100644
index 5c4e22e31b24..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-18.08.1
+++ /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.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/poxml-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/poxml-18.08.2 b/metadata/md5-cache/kde-apps/poxml-18.08.2
new file mode 100644
index 000000000000..5a66335da293
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/poxml-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/poxml-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fb48998d32b568189280f834cdaa939e
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.04.3 b/metadata/md5-cache/kde-apps/print-manager-18.04.3
index 863fbcc6ccc9..03ea9728ddf5 100644
--- a/metadata/md5-cache/kde-apps/print-manager-18.04.3
+++ b/metadata/md5-cache/kde-apps/print-manager-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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/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/kservice-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.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/print-manager-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=803cf78c5b02802ce8a8cce53137f846
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.08.1 b/metadata/md5-cache/kde-apps/print-manager-18.08.1
deleted file mode 100644
index d47902e505c3..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/plasma-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/plasma-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/print-manager-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.08.2 b/metadata/md5-cache/kde-apps/print-manager-18.08.2
new file mode 100644
index 000000000000..8ca51cf0378d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/print-manager-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/print-manager-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c706dc5641eca3912997fb0e04743d8d
diff --git a/metadata/md5-cache/kde-apps/rocs-18.04.3 b/metadata/md5-cache/kde-apps/rocs-18.04.3
index fc3c28ade4b4..265ec87fda5e 100644
--- a/metadata/md5-cache/kde-apps/rocs-18.04.3
+++ b/metadata/md5-cache/kde-apps/rocs-18.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/rocs-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d087b3c10be79da7587ee2870a2d25ad
diff --git a/metadata/md5-cache/kde-apps/rocs-18.08.1 b/metadata/md5-cache/kde-apps/rocs-18.08.1
deleted file mode 100644
index 1bceb932cc1c..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-18.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4: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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kitemviews-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/rocs-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/rocs-18.08.2 b/metadata/md5-cache/kde-apps/rocs-18.08.2
new file mode 100644
index 000000000000..324aaeaa99a1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/rocs-18.08.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/rocs-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8edcff8e2fabbd0568003183089328c3
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.3
index d1f10109a6a0..779afe854d05 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.3
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.46.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/signon-kwallet-extension-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2b30ed8a0a4c09b96614e8ffee0265c
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.1
deleted file mode 100644
index 8b13e5fcd1fe..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.49.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/signon-kwallet-extension-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.2 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.2
new file mode 100644
index 000000000000..44a9daac96f6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/signon-kwallet-extension-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d1eb7b2424a74826a5b694128ddb7082
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.04.3-r1 b/metadata/md5-cache/kde-apps/spectacle-18.04.3-r1
index 4b2912c9bec7..e4998e4678e6 100644
--- a/metadata/md5-cache/kde-apps/spectacle-18.04.3-r1
+++ b/metadata/md5-cache/kde-apps/spectacle-18.04.3-r1
@@ -9,5 +9,5 @@ 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	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c6e562cb2d5cfc9731033806b4b1a985
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.08.1 b/metadata/md5-cache/kde-apps/spectacle-18.08.1
deleted file mode 100644
index b22eb0bdc019..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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.08.1:5= ) share? ( >=kde-frameworks/purpose-5.49.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdeclarative-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/knotifications-5.49.0:5 >=kde-frameworks/kservice-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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.08.1:5= ) share? ( >=kde-frameworks/purpose-5.49.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.08.1/src/spectacle-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d885283e56a3a6f683d022d0f12d861
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.08.2 b/metadata/md5-cache/kde-apps/spectacle-18.08.2
new file mode 100644
index 000000000000..e21ac9ce4b87
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/spectacle-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.08.2:5= ) share? ( >=kde-frameworks/purpose-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.08.2:5= ) share? ( >=kde-frameworks/purpose-5.50.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.08.2/src/spectacle-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=dde25736b1ae0c9ef6d9ae49928072b7
diff --git a/metadata/md5-cache/kde-apps/step-18.04.3 b/metadata/md5-cache/kde-apps/step-18.04.3
index c9c81685d654..b5e7a470a2a7 100644
--- a/metadata/md5-cache/kde-apps/step-18.04.3
+++ b/metadata/md5-cache/kde-apps/step-18.04.3
@@ -9,5 +9,5 @@ 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/kdelibs4support-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/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/step-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=71d58042bd0bf4a45ea5e60254f212ae
diff --git a/metadata/md5-cache/kde-apps/step-18.08.1 b/metadata/md5-cache/kde-apps/step-18.08.1
deleted file mode 100644
index ee680a774621..000000000000
--- a/metadata/md5-cache/kde-apps/step-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kplotting-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/kdelibs4support-5.49.0:5 >=kde-frameworks/khtml-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/knewstuff-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kplotting-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/step-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e3daf02a171516c0be2aa1791d7e620d
diff --git a/metadata/md5-cache/kde-apps/step-18.08.2 b/metadata/md5-cache/kde-apps/step-18.08.2
new file mode 100644
index 000000000000..bbeb7ab8ceb6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/step-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kplotting-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kplotting-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/step-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e6c4bc321a5e30f88d4f7411ec1ee2ca
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.04.3 b/metadata/md5-cache/kde-apps/svgpart-18.04.3
index b33366caa513..be16d5aac4a0 100644
--- a/metadata/md5-cache/kde-apps/svgpart-18.04.3
+++ b/metadata/md5-cache/kde-apps/svgpart-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/svgpart-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=677ce5614775805d841af919bbe3f623
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.08.1 b/metadata/md5-cache/kde-apps/svgpart-18.08.1
deleted file mode 100644
index a5a257011c28..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kparts-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/svgpart-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.08.2 b/metadata/md5-cache/kde-apps/svgpart-18.08.2
new file mode 100644
index 000000000000..62bc6a05c9f1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/svgpart-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/svgpart-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ae359f4c4c800fbeadec3e539b69a20c
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.04.3 b/metadata/md5-cache/kde-apps/sweeper-18.04.3
index 32177f986644..371347e15828 100644
--- a/metadata/md5-cache/kde-apps/sweeper-18.04.3
+++ b/metadata/md5-cache/kde-apps/sweeper-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kbookmarks-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/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/sweeper-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a2f71cea398a1568d822674945eb1fb
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.08.1 b/metadata/md5-cache/kde-apps/sweeper-18.08.1
deleted file mode 100644
index b1652b199c69..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-18.08.1
+++ /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.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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-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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.0:5 ) >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.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 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/sweeper-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.08.2 b/metadata/md5-cache/kde-apps/sweeper-18.08.2
new file mode 100644
index 000000000000..467fbb7c34c0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/sweeper-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-stats-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/sweeper-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4f079f2d3cab9fb4dd586c7c8dda2607
diff --git a/metadata/md5-cache/kde-apps/syndication-18.04.3 b/metadata/md5-cache/kde-apps/syndication-18.04.3
index e0f8ef7d9dab..1ad60eed81f4 100644
--- a/metadata/md5-cache/kde-apps/syndication-18.04.3
+++ b/metadata/md5-cache/kde-apps/syndication-18.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/syndication-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=89e0ce4951588133aa55235b1e39fcc3
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.04.3 b/metadata/md5-cache/kde-apps/thumbnailers-18.04.3
index 0ae6ad43acce..57516f3ceade 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-18.04.3
+++ b/metadata/md5-cache/kde-apps/thumbnailers-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.04.3:5 >=kde-apps/libkexiv2-18.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdegraphics-thumbnailers-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=759e6a4fab5711cfa0a1fd54f797ef33
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.08.1 b/metadata/md5-cache/kde-apps/thumbnailers-18.08.1
deleted file mode 100644
index 416ffed9b880..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.08.1:5 >=kde-apps/libkexiv2-18.08.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.08.1:5 >=kde-apps/libkexiv2-18.08.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/kdegraphics-thumbnailers-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.08.2 b/metadata/md5-cache/kde-apps/thumbnailers-18.08.2
new file mode 100644
index 000000000000..d223a02cfd7b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/thumbnailers-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.08.2:5 >=kde-apps/libkexiv2-18.08.2: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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.08.2:5 >=kde-apps/libkexiv2-18.08.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/kdegraphics-thumbnailers-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d1742492809b7e66dd92c287187f754e
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.04.3 b/metadata/md5-cache/kde-apps/umbrello-18.04.3
index fe535bc52702..f80a3e56f41f 100644
--- a/metadata/md5-cache/kde-apps/umbrello-18.04.3
+++ b/metadata/md5-cache/kde-apps/umbrello-18.04.3
@@ -9,5 +9,5 @@ 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/kcrash-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/ktexteditor-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 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/umbrello-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2975812936e6d4a2063673068f14b6d1
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.08.1 b/metadata/md5-cache/kde-apps/umbrello-18.08.1
deleted file mode 100644
index b82d763954b6..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.49.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.49.0:5 handbook? ( >=kde-frameworks/kdoctools-5.49.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=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.49.0:5 >=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kcrash-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kiconthemes-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=kde-frameworks/kjobwidgets-5.49.0:5 >=kde-frameworks/ktexteditor-5.49.0:5 >=kde-frameworks/ktextwidgets-5.49.0:5 >=kde-frameworks/kwidgetsaddons-5.49.0:5 >=kde-frameworks/kwindowsystem-5.49.0:5 >=kde-frameworks/kxmlgui-5.49.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/umbrello-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.08.2 b/metadata/md5-cache/kde-apps/umbrello-18.08.2
new file mode 100644
index 000000000000..24639734990b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/umbrello-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/umbrello-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=adc8dd5d5ea3bd7c7e6a2bde2a28d945
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.3
index d549aa0a34dc..80b75911fd05 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.3
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.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.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/zeroconf-ioslave-18.04.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7bb128b499f9de2610fe2bd8fe494880
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.1 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.1
deleted file mode 100644
index 1d6dbc9819b5..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtdbus-5.9.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.49.0:5 >=dev-qt/qtcore-5.9.4: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.49.0:5 >=kde-frameworks/kdbusaddons-5.49.0:5 >=kde-frameworks/kdnssd-5.49.0:5 >=kde-frameworks/ki18n-5.49.0:5 >=kde-frameworks/kio-5.49.0:5 >=dev-qt/qtdbus-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.49.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.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.1/src/zeroconf-ioslave-18.08.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c98ee44fd9f62859ab908c4b17e25234
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.2 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.2
new file mode 100644
index 000000000000..094d62e8b6d2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtdbus-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4: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.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdnssd-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.2/src/zeroconf-ioslave-18.08.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=76ca742a60616c3a7ee9fbed2b2979da
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index b406d01a4555..0dda5b26af6e 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/attica-5.46.0 b/metadata/md5-cache/kde-frameworks/attica-5.46.0
deleted file mode 100644
index c78f0b6a6a72..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.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/attica-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a5c50eeedf02087a24bf4f22c17f5609
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.50.0 b/metadata/md5-cache/kde-frameworks/attica-5.50.0
index 34ba707a087a..4307f81425e8 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing access to Open Collaboration Services
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/attica-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=315f2320671d60844b02f17e3f88ebf8
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=61cfb359a2dde1e894c1aeea175ce364
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.51.0 b/metadata/md5-cache/kde-frameworks/attica-5.51.0
new file mode 100644
index 000000000000..20fdfb287bbd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing access to Open Collaboration Services
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/attica-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8eaa2479c018315d9e4653e25e2b2637
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.46.0 b/metadata/md5-cache/kde-frameworks/baloo-5.46.0
deleted file mode 100644
index 7ca142f89cb2..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/kfilemetadata-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kidletime-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/solid-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-db/lmdb-0.9.17 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/kfilemetadata-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kidletime-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/solid-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/baloo-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8261ac2ddf11389e001fd9a426cf4055
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.50.0 b/metadata/md5-cache/kde-frameworks/baloo-5.50.0
index 2b79c755ad38..97f9faac74c6 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for searching and managing metadata
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kcrash-5.50:5 >=kde-frameworks/kdbusaddons-5.50:5 >=kde-frameworks/kfilemetadata-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kidletime-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/solid-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/baloo-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f9b8077a67c432cf8490d98bdd92f2e2
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=52adbf44bbf9a87e75dc690c3c8c757c
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.51.0 b/metadata/md5-cache/kde-frameworks/baloo-5.51.0
new file mode 100644
index 000000000000..0f713f4e2265
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/kfilemetadata-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kidletime-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/solid-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-db/lmdb-0.9.17 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/kfilemetadata-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kidletime-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/solid-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/baloo-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2376a16af205432bf5c31d4ac55958ab
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0
deleted file mode 100644
index 0b09a9402ac6..000000000000
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtnetwork-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=Qt wrapper for Bluez 5 DBus API
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.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	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b9652fe9b29a726d59d2ae7c1dd76aa9
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.50.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.50.0
index 240d9d4073bf..d6d63d7499a6 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Qt wrapper for Bluez 5 DBus API
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.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.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/bluez-qt-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c56161d95ba41891363e8e9a5fa8cc78
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c37978196f846d4b15683aff6106dc27
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.51.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.51.0
new file mode 100644
index 000000000000..6fa2be5e2047
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtnetwork-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.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.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/bluez-qt-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9620604abc192788429dfb4337d3f652
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0
deleted file mode 100644
index 8bbbf15a52b4..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.46:5 >=dev-qt/qtcore-5.9.4:5 test? ( >=dev-qt/qttest-5.9.4:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze SVG icon theme
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-3
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/breeze-icons-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b40a0d5462b5b10ebc25bb2a057e56ad
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.50.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.50.0
index 41f1a75cedf8..abac91b7c613 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.50.0
@@ -4,9 +4,9 @@ DESCRIPTION=Breeze SVG icon theme
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-3
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/breeze-icons-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ea6334f0f7c09082d60e2d2abc43d2f2
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d6cd7ab8c2dd6e5cdbf07331a51af198
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.51.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.51.0
new file mode 100644
index 000000000000..2773c6b0c1eb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.51.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.51:5 >=dev-qt/qtcore-5.9.4:5 test? ( >=dev-qt/qttest-5.9.4:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze SVG icon theme
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/breeze-icons-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d6200f01b112ff48e5070dea14acb334
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.46.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.46.0
deleted file mode 100644
index ad9074fdd895..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.46.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.46:5 >=dev-qt/qtcore-5.9.4:5 test? ( >=dev-qt/qttest-5.9.4:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze SVG icon theme binary resource
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/breeze-icons-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1c4a22ad4ad25aa9667831ab858f5473
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.50.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.50.0
index dd3d0a6bb0a3..e51e677d6c5c 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.50.0
@@ -4,9 +4,9 @@ DESCRIPTION=Breeze SVG icon theme binary resource
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/breeze-icons-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c3fb699ecfc8263366a5bd7df11f76c0
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f944ea0d92fa52c4fe664dcf3f9147c3
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.51.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.51.0
new file mode 100644
index 000000000000..ff0e43f89589
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.51.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.51:5 >=dev-qt/qtcore-5.9.4:5 test? ( >=dev-qt/qttest-5.9.4:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze SVG icon theme binary resource
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/breeze-icons-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8202cd5b10f2bcec3acab881b4424f58
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.46.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.46.0
deleted file mode 100644
index 6959fdded441..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( >=dev-qt/qtcore-5.9.4:5 >=dev-qt/linguist-tools-5.9.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 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
-IUSE=doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=BSD
-RDEPEND=app-arch/libarchive[bzip2]
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/extra-cmake-modules-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1ef90a365a495f5ee87792692a562d92
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.50.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.50.0
index 32f12da9fd95..de4a63129321 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extra modules and scripts for CMake
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
 IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
 LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/extra-cmake-modules-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=40a1e0db81e1f45ce73eced34ca84297
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b6efd0f6950e249ad639615939c91514
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.51.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.51.0
new file mode 100644
index 000000000000..938b906ff432
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=doc? ( || ( 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 ) || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( >=dev-qt/qtcore-5.9.4:5 >=dev-qt/linguist-tools-5.9.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 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/extra-cmake-modules-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=40a1e0db81e1f45ce73eced34ca84297
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.46.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.46.0
deleted file mode 100644
index 379dce45d15c..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/knewstuff-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kpackage-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.9.4: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: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=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/knewstuff-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kpackage-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/frameworkintegration-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=23a028ff2db0886e5a931e2fc6c10d8b
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.50.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.50.0
index 23fd136920e9..01d424775c35 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=appstream X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/knewstuff-5.50:5 >=kde-frameworks/knotifications-5.50:5 >=kde-frameworks/kpackage-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/frameworkintegration-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9f1f403c964b89e911af28ff738c6383
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=83e518da5c209e1d3494c432e7f19878
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.51.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.51.0
new file mode 100644
index 000000000000..c5ddd6eb64d8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/knewstuff-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kpackage-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.9.4: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.51: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=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=appstream X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/knewstuff-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kpackage-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/frameworkintegration-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=27725462914cc48577572f0264c580a2
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.46.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.46.0
deleted file mode 100644
index d65c53237a09..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-libs/boost-1.54 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for working with KDE activities
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=kde-plasma/kactivitymanagerd-5.12.5: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/kactivities-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bb2c03e141000ba98aeeca5c0cff7bdf
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.50.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.50.0
index 8e1443b2c9bf..c6a76113db40 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for working with KDE activities
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=kde-plasma/kactivitymanagerd-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kactivities-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=82cae55a50b20bae514b9aaa04cdbf21
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=42385673290978b4e27ff183eb5696ca
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.51.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.51.0
new file mode 100644
index 000000000000..0b18bf59b1c2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-libs/boost-1.54 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for working with KDE activities
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=kde-plasma/kactivitymanagerd-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kactivities-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f129728d15f3b6072e44ad2d1b11f946
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.46.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.46.0
deleted file mode 100644
index bbb79033328c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=kde-frameworks/kactivities-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=dev-libs/boost-1.54 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for getting the usage statistics collected by the activities service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=kde-frameworks/kactivities-5.46:5 >=kde-frameworks/kconfig-5.46: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/kactivities-stats-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ef2e6406a19e564b01928504fb9a67dd
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.50.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.50.0
index 23eef470e2a8..b7e358c73c3d 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for getting the usage statistics collected by the activiti
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=kde-frameworks/kactivities-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kactivities-stats-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b2ddec7aa68aeebcc57c2a0ebfd14059
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=65b22e264e474a3c99d404c3c5e98763
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.51.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.51.0
new file mode 100644
index 000000000000..f16e0c18d22c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=kde-frameworks/kactivities-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=dev-libs/boost-1.54 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for getting the usage statistics collected by the activities service
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=kde-frameworks/kactivities-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kactivities-stats-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d8d9f99cccdf821cdc474704142cfdce
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.46.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.46.0
deleted file mode 100644
index 685b42316349..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/graphviz[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( >=dev-qt/qt-docs-5.9.4:5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kapidox-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5a7da2e3fc6054869382aa14ef8aebbc
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.50.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.50.0
index a0045f5bdbaf..08bdd09ce1c5 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for building KDE API documentation in a standard format an
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/graphviz[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( >=dev-qt/qt-docs-5.9.4:5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kapidox-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ee816bab864f6aaa71d809765351e6d7
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d242fcd4fdb0323fca04464af05193f3
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.51.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.51.0
new file mode 100644
index 000000000000..881734a510a7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.51.0
@@ -0,0 +1,14 @@
+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 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/graphviz[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( >=dev-qt/qt-docs-5.9.4:5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kapidox-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6100289353f9b71ae0dbafc7ad261d8f
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.46.0 b/metadata/md5-cache/kde-frameworks/karchive-5.46.0
deleted file mode 100644
index 414ba440cab0..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+bzip2 +lzma debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.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/karchive-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a0931019efa3e8b15478670522942dce
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.50.0 b/metadata/md5-cache/kde-frameworks/karchive-5.50.0
index fda79991f7e7..b2879feeacd4 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for reading, creation, and manipulation of various archive
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+bzip2 +lzma debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/karchive-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d3d8e1ff6e050dff4a53b6df2eb4acb3
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e57eec7a149b2e7172222ddef6fd1ec2
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.51.0 b/metadata/md5-cache/kde-frameworks/karchive-5.51.0
new file mode 100644
index 000000000000..4b415baf7c34
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+bzip2 +lzma debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/karchive-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6c89e0d069c3622deefa108d29b60dfc
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.46.0 b/metadata/md5-cache/kde-frameworks/kauth-5.46.0
deleted file mode 100644
index b0466513f21e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) nls? ( >=dev-qt/linguist-tools-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls +policykit test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=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/kauth-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=73aec7d0dd4e0f9430e944cf39801b73
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.50.0 b/metadata/md5-cache/kde-frameworks/kauth-5.50.0
index 374ba16c1be4..f7175cd0bcf2 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework to let applications perform actions as a privileged user
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls +policykit test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kauth-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fe50ece8f6beeafc36c9c61e5270309b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4f9e423320c8700e40315861f9e030ce
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.51.0 b/metadata/md5-cache/kde-frameworks/kauth-5.51.0
new file mode 100644
index 000000000000..d43f28cfb215
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) nls? ( >=dev-qt/linguist-tools-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to let applications perform actions as a privileged user
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls +policykit test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kauth-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c18a504d8ba98d4a1ef720b7760b8205
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.46.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.46.0
deleted file mode 100644
index d05f102156f1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46: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 >=kde-frameworks/kconfigwidgets-5.46:5 nls? ( >=dev-qt/linguist-tools-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46: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 >=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/kbookmarks-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6d9dbcf9e9e96581daa29a19e7163fa7
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.50.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.50.0
index 3ef3f3b83384..ddcc1d7154ae 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for managing bookmarks stored in XBEL format
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kxmlgui-5.50: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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kbookmarks-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=926c456bc2cbb34aab6679a18f2ed263
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e0efbc28e9b8fded2b473a67168b2db5
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.51.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.51.0
new file mode 100644
index 000000000000..1f76fdb65949
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51: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 >=kde-frameworks/kconfigwidgets-5.51:5 nls? ( >=dev-qt/linguist-tools-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51: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 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kbookmarks-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0811a286f09e35006d1505b42702cc9c
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.46.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.46.0
deleted file mode 100644
index 930de479e27c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kdeclarative-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kdeclarative-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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/kcmutils-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ff884ea67a4764e834dd9ecf30ef1260
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.50.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.50.0
index 5445917e6b58..845d65c334e3 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework to work with KDE System Settings modules
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kdeclarative-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kitemviews-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kcmutils-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6574dc65babe4d2e33ab65354d2c20ea
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=34ed22db4062ae834813d9f0048ed31b
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.51.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.51.0
new file mode 100644
index 000000000000..89b89e150b9a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kdeclarative-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/kauth-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kdeclarative-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kcmutils-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=98ff15c6d5d0d99e445f5e3bcbc06d83
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.46.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.46.0
deleted file mode 100644
index 151474c533d9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.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/kcodecs-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8ad926bea6f793780f0f1d789e9f38b9
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.50.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.50.0
index 234a2c231533..d843335d6312 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for manipulating strings using various encodings
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kcodecs-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=29c583fbd11bc2a05b074b0de71abf27
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=612380367f923af6dc517f3941923610
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.51.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.51.0
new file mode 100644
index 000000000000..aebd85244abf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for manipulating strings using various encodings
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kcodecs-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9eb17a5f586fcf7a3f0e3eeb519260e4
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.46.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.46.0
deleted file mode 100644
index 730dca88bbec..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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/kcompletion-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fa6dcd0eb98361cf357429d74f650935
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.50.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.50.0
index ba123c2dc02e..2fcd67eec5f0 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for common completion tasks such as filename or URL comple
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kcompletion-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4347ba04c17e9850ba88833444f285b7
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=110fe2dc2d229e5e5e226b87482618f7
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.51.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.51.0
new file mode 100644
index 000000000000..5d9c827618b9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for common completion tasks such as filename or URL completion
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kcompletion-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f2db568f1802754dd643b3c010b0e3f4
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.46.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.46.0
deleted file mode 100644
index c3466006f919..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) test? ( >=dev-qt/qtconcurrent-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kconfig-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a8aca26c93288664256f35954215b876
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.50.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.50.0
index 5f7622996f60..bc0be45a5e4b 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for reading and writing configuration
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kconfig-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=89fbfaff3a52eb554c80a85c9c3c210a
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c457e948730af70c71ea35b44557d05d
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.51.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.51.0
new file mode 100644
index 000000000000..aa48eb2652fd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) test? ( >=dev-qt/qtconcurrent-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for reading and writing configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kconfig-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2b162aaa6d57e6a6388c46168179485e
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.46.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.46.0
deleted file mode 100644
index d03d39bdbe6d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kguiaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 man? ( >=kde-frameworks/kdoctools-5.46: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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kguiaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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/kconfigwidgets-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=583c03061bbd0151c34341efb41ced25
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.50.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.50.0
index 43512f906d69..5336454508bc 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing an assortment of configuration-related widgets
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+man test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.50:5 >=kde-frameworks/kcodecs-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kguiaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kconfigwidgets-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=834fdfa0193b33716aa57c0a101ec642
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=faef50a00b80cb06bf5d26c599423c73
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.51.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.51.0
new file mode 100644
index 000000000000..5a860bab595d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.51:5 >=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kguiaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 man? ( >=kde-frameworks/kdoctools-5.51: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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.51:5 >=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kguiaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kconfigwidgets-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c1f78789ddf4001f8f1727d90cbff9f2
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0
deleted file mode 100644
index 3727a35dd1c4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.9.4:5[icu] fam? ( virtual/fam ) x11-misc/shared-mime-info nls? ( >=dev-qt/linguist-tools-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=fam nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.9.4:5[icu] fam? ( virtual/fam ) >=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/kcoreaddons-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d3bfebf764116b47eb78cb24112affcf
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.50.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.50.0
index 0a792c3cf2cb..a35b8287e703 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for solving common problems such as caching, randomisation
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=fam nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.9.4:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kcoreaddons-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3ba2cc372c57a11be136c3a842492075
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8ef2577bff185bcdc39d59e625d53830
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.51.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.51.0
new file mode 100644
index 000000000000..d0f8cef99c78
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.9.4:5[icu] fam? ( virtual/fam ) x11-misc/shared-mime-info nls? ( >=dev-qt/linguist-tools-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=fam nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.9.4:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kcoreaddons-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a0b6714acf67db452f0aa69922dd6d5a
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.46.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.46.0
deleted file mode 100644
index 6f8d91022abb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-base/xorg-proto nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) test? ( >=dev-qt/qtwidgets-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 >=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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kcrash-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c2195bf4d4589e98b880d8082c9cff6a
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.50.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.50.0
index 3ad2c89274cb..57b86fc81f2f 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for intercepting and handling application crashes
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kcrash-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c71fdc63e09621ffabe55d480746970c
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ab570f4e7f90fd84f5af8a21382e0847
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.51.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.51.0
new file mode 100644
index 000000000000..d8626d5400bf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-base/xorg-proto nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) test? ( >=dev-qt/qtwidgets-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for intercepting and handling application crashes
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kcrash-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1770dc75834c8fec79aa3617852bdab0
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.46.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.46.0
deleted file mode 100644
index 0c6436d30a39..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 ) nls? ( >=dev-qt/linguist-tools-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for registering services and applications per freedesktop standards
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 X? ( >=dev-qt/qtx11extras-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/kdbusaddons-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d1e27c7e9700695fa6f11e900a76e500
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.50.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.50.0
index 72674f555ddb..328ef48e0e2e 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for registering services and applications per freedesktop
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kdbusaddons-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6f4e636614f777f3c2fbb33761d2d4ff
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1d32dc1c5b6b0448d30193081be4554c
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.51.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.51.0
new file mode 100644
index 000000000000..14428cbd92e0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 ) nls? ( >=dev-qt/linguist-tools-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for registering services and applications per freedesktop standards
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kdbusaddons-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4201197dee6a0e19847cd2eeab108541
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.46.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.46.0
deleted file mode 100644
index 7e669bec3114..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kglobalaccel-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kpackage-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libepoxy 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kglobalaccel-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kpackage-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libepoxy >=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/kdeclarative-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9c60230a2435f31dcb7bf589ff19c23f
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.50.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.50.0
index 6c1fb9f69a49..4e557e055e37 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing integration of QML and KDE work spaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kglobalaccel-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kpackage-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kdeclarative-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bef8487aed4534c02d2c163797e6ada0
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b168e6e73e662b7e26a235682a851803
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.51.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.51.0
new file mode 100644
index 000000000000..b251a176d61f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kglobalaccel-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kpackage-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libepoxy 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kglobalaccel-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kpackage-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kdeclarative-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=eeb52a0e7f3f47320901d3e1e0a0b1ea
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.46.0 b/metadata/md5-cache/kde-frameworks/kded-5.46.0
deleted file mode 100644
index ed220b439eba..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/kinit-5.46:5 >=kde-frameworks/kservice-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 man? ( >=kde-frameworks/kdoctools-5.46: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:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/kinit-5.46:5 >=kde-frameworks/kservice-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kded-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=374eae1b98b27201c1f584424c6d68c9
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.50.0 b/metadata/md5-cache/kde-frameworks/kded-5.50.0
index 90aafacb2b06..8a17531ebf6a 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Central daemon of KDE workspaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kcrash-5.50:5 >=kde-frameworks/kdbusaddons-5.50:5 >=kde-frameworks/kinit-5.50:5 >=kde-frameworks/kservice-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kded-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6d18366b668bf05e5736e0ccebd0cf63
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=65cd9ba0d388d9b79a1cbadf6121625e
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.51.0 b/metadata/md5-cache/kde-frameworks/kded-5.51.0
new file mode 100644
index 000000000000..7517ee4f4b0f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/kinit-5.51:5 >=kde-frameworks/kservice-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 man? ( >=kde-frameworks/kdoctools-5.51: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.51:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/kinit-5.51:5 >=kde-frameworks/kservice-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kded-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0836429d1046be54c8de182b81e85e5c
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.46.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.46.0
deleted file mode 100644
index 495f208f9307..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/kded-5.46:5 >=kde-frameworks/kdesignerplugin-5.46:5 >=kde-frameworks/kemoticons-5.46:5 >=kde-frameworks/kglobalaccel-5.46:5 >=kde-frameworks/kguiaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kunitconversion-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/solid-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.46:5 >=dev-qt/designer-5.9.4:5 dev-lang/perl dev-perl/URI test? ( >=dev-qt/qtconcurrent-5.9.4: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: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=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libressl X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/kded-5.46:5 >=kde-frameworks/kdesignerplugin-5.46:5 >=kde-frameworks/kemoticons-5.46:5 >=kde-frameworks/kglobalaccel-5.46:5 >=kde-frameworks/kguiaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kunitconversion-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/solid-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.46:5 >=kde-frameworks/kinit-5.46:5 >=kde-frameworks/kitemmodels-5.46:5 >=dev-qt/qtxml-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
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/portingAids/kdelibs4support-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7b89ce9374fd2e1ee7879e596d15335e
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.50.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.50.0
index e9ca745d2f1e..d4b4686521e7 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.50:5 >=kde-frameworks/kcodecs-5.50:5 >=kde-frameworks/kcompletion-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kcrash-5.50:5 >=kde-frameworks/kdbusaddons-5.50:5 >=kde-frameworks/kded-5.50:5 >=kde-frameworks/kdesignerplugin-5.50:5 >=kde-frameworks/kemoticons-5.50:5 >=kde-frameworks/kglobalaccel-5.50:5 >=kde-frameworks/kguiaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kitemviews-5.50:5 >=kde-frameworks/kjobwidgets-5.50:5 >=kde-frameworks/knotifications-5.50:5 >=kde-frameworks/kparts-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/ktextwidgets-5.50:5 >=kde-frameworks/kunitconversion-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=kde-frameworks/solid-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.50:5 >=kde-frameworks/kinit-5.50:5 >=kde-frameworks/kitemmodels-5.50:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/portingAids/kdelibs4support-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b058d4711f090ce684b180b773ab4649
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c2402b191eea9d2900edb363d5a9395e
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.51.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.51.0
new file mode 100644
index 000000000000..5503668319eb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.51:5 >=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/kded-5.51:5 >=kde-frameworks/kdesignerplugin-5.51:5 >=kde-frameworks/kemoticons-5.51:5 >=kde-frameworks/kglobalaccel-5.51:5 >=kde-frameworks/kguiaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kparts-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kunitconversion-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=kde-frameworks/solid-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.51:5 >=dev-qt/designer-5.9.4:5 dev-lang/perl dev-perl/URI test? ( >=dev-qt/qtconcurrent-5.9.4: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.51: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=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.51:5 >=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/kded-5.51:5 >=kde-frameworks/kdesignerplugin-5.51:5 >=kde-frameworks/kemoticons-5.51:5 >=kde-frameworks/kglobalaccel-5.51:5 >=kde-frameworks/kguiaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kparts-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kunitconversion-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=kde-frameworks/solid-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.51:5 >=kde-frameworks/kinit-5.51:5 >=kde-frameworks/kitemmodels-5.51:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/portingAids/kdelibs4support-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0813f1da9da3255987089ea638a1cdfb
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.46.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.46.0
deleted file mode 100644
index 9f6bfee3a3b0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 designer? ( >=dev-qt/designer-5.9.4:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kplotting-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/sonnet-5.46:5 ) webkit? ( >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kdewebkit-5.46:5 ) nls? ( >=dev-qt/linguist-tools-5.9.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:5 handbook? ( >=kde-frameworks/kdoctools-5.46:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=designer nls webkit debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 designer? ( >=dev-qt/designer-5.9.4:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kplotting-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/sonnet-5.46:5 ) webkit? ( >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kdewebkit-5.46:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kdesignerplugin-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b738def363c26cbd37ea5dcec38672c6
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.50.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.50.0
index dd2e79c02f25..cef8ed423b78 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesig
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=designer nls webkit debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 designer? ( >=dev-qt/designer-5.9.4:5 >=kde-frameworks/kcompletion-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kitemviews-5.50:5 >=kde-frameworks/kplotting-5.50:5 >=kde-frameworks/ktextwidgets-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=kde-frameworks/sonnet-5.50:5 ) webkit? ( >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kdewebkit-5.50:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kdesignerplugin-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3009839ebc22f6a6bae366fffbd7431e
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2c7852e66fc66a70abe81cb221c8ae46
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.51.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.51.0
new file mode 100644
index 000000000000..f00982debf8c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 designer? ( >=dev-qt/designer-5.9.4:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kplotting-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=kde-frameworks/sonnet-5.51:5 ) webkit? ( >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kdewebkit-5.51:5 ) nls? ( >=dev-qt/linguist-tools-5.9.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.51:5 handbook? ( >=kde-frameworks/kdoctools-5.51:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=designer nls webkit debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 designer? ( >=dev-qt/designer-5.9.4:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kplotting-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=kde-frameworks/sonnet-5.51:5 ) webkit? ( >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kdewebkit-5.51:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kdesignerplugin-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=94975963e82e789c40d73354b856d6cc
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.46.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.46.0
deleted file mode 100644
index 738fac21e65f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kpty-5.46:5 >=kde-frameworks/kservice-5.46:5 X? ( x11-libs/libX11 ) X? ( 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to handle super user actions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kpty-5.46:5 >=kde-frameworks/kservice-5.46:5 X? ( x11-libs/libX11 ) >=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/kdesu-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2851b813d76ad1a544031a02a886e5ad
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.50.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.50.0
index a8de30ffe0a8..b665b7cf3022 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework to handle super user actions
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kpty-5.50:5 >=kde-frameworks/kservice-5.50:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kdesu-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3a6d3e34b97d75cea6a63cffbd8335a5
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=39e4233917b52136211c4e6ad316035c
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.51.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.51.0
new file mode 100644
index 000000000000..9878958877b8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kpty-5.51:5 >=kde-frameworks/kservice-5.51:5 X? ( x11-libs/libX11 ) X? ( 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to handle super user actions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kpty-5.51:5 >=kde-frameworks/kservice-5.51:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kdesu-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4997c8d742bf4b4b072a831177a217c6
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.46.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.46.0
deleted file mode 100644
index f2d855c684d6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwallet-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtnetwork-5.9.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:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing KDE integration of QtWebKit
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwallet-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-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
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kdewebkit-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d2affb345e3bd2268482dc4d71e43198
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.50.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.50.0
index a1826f04a275..4c556193e806 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing KDE integration of QtWebKit
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kjobwidgets-5.50:5 >=kde-frameworks/kparts-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/kwallet-5.50:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kdewebkit-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6495c0bb2421c1d46acbc29cf9903f3e
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a62b70b33961f64fab55d954e3c3c678
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.51.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.51.0
new file mode 100644
index 000000000000..2483d6d4655b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/kparts-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwallet-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtnetwork-5.9.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.51:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing KDE integration of QtWebKit
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/kparts-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwallet-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kdewebkit-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a0ab6cb6b04c4b11dfa7491d4f03e3a1
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.46.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.46.0
deleted file mode 100644
index 1f5f7cabb1b8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.9.4:5 zeroconf? ( >=dev-qt/qtdbus-5.9.4:5 net-dns/avahi[mdnsresponder-compat] ) nls? ( >=dev-qt/linguist-tools-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for network service discovery using Zeroconf
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls zeroconf debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.9.4:5 zeroconf? ( >=dev-qt/qtdbus-5.9.4:5 net-dns/avahi[mdnsresponder-compat] ) >=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/kdnssd-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c91de21e64cc84a1291b2b6fc03cd82b
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.50.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.50.0
index 293c9161d03d..c55cb3079781 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for network service discovery using Zeroconf
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls zeroconf debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.9.4:5 zeroconf? ( >=dev-qt/qtdbus-5.9.4:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kdnssd-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b67e5dd15c0ab39f99031131c64e63cf
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6a4842894eed001c5413b5fd2b0e95dd
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.51.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.51.0
new file mode 100644
index 000000000000..e5e9bb0eebb7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.9.4:5 zeroconf? ( >=dev-qt/qtdbus-5.9.4:5 net-dns/avahi[mdnsresponder-compat] ) nls? ( >=dev-qt/linguist-tools-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for network service discovery using Zeroconf
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls zeroconf debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.9.4:5 zeroconf? ( >=dev-qt/qtdbus-5.9.4:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kdnssd-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8b0866458f6dc910fc19a9e58d7a8d0c
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.46.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.46.0
deleted file mode 100644
index ab9e5b184716..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt dev-lang/perl dev-perl/URI sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46: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=Tools to generate documentation in various formats from DocBook files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/karchive-5.46:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kdoctools-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dbe05b42041ca360f4046f227edb71fd
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.50.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.50.0
index ddde21ba440c..39534b510e37 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tools to generate documentation in various formats from DocBook file
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.50:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kdoctools-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=05683a71c581dcfae46ddbcb15c3e22a
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=07d62d3fe30ec9f141b01796659b1342
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.51.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.51.0
new file mode 100644
index 000000000000..4a0188869a9e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.51:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt dev-lang/perl dev-perl/URI sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.51: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=Tools to generate documentation in various formats from DocBook files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/karchive-5.51:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kdoctools-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8a2522805168bc80e9c19d3dd247185c
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.46.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.46.0
deleted file mode 100644
index 66e0ab983acc..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kservice-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kservice-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kemoticons-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a0623008271cb2545cf54ff530f15619
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.50.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.50.0
index 4dbad0f3b666..b2392920363d 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for converting text emoticons to graphical representations
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kservice-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kemoticons-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=13039e88219306a131435b9ae69930ff
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=45458ecf64b753861b0b0b7d0a464df0
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.51.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.51.0
new file mode 100644
index 000000000000..562fd8a8ce70
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kservice-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kservice-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kemoticons-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=47514a30ec49c18a827150f0d3ccd08c
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.46.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.46.0
deleted file mode 100644
index a03d56631006..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.46:5 >=dev-qt/qtxml-5.9.4:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.46:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for extracting file metadata
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=epub exif ffmpeg libav office pdf taglib debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/ki18n-5.46:5 >=dev-qt/qtxml-5.9.4:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.46:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=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/kfilemetadata-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=177041f2da63647daeab164a23238cbc
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.50.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.50.0
index 13cc49b2327e..0c3a532190b1 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for extracting file metadata
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=epub exif ffmpeg kernel_linux libav office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/ki18n-5.50:5 >=dev-qt/qtxml-5.9.4:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.50:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kfilemetadata-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f15e4720ac2d05f532c6008808809abe
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8007af83a67512c6aa60322af5eed7a6
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.51.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.51.0
new file mode 100644
index 000000000000..0c70b31316e2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.51:5 >=dev-qt/qtxml-5.9.4:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.51:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( || ( 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 ) ) 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for extracting file metadata
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=epub exif ffmpeg kernel_linux libav office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/ki18n-5.51:5 >=dev-qt/qtxml-5.9.4:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.51:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kfilemetadata-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=809f6167283cde6f86bf49d2b2e4de2d
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.46.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.46.0
deleted file mode 100644
index 09aa10603435..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-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-keysyms nls? ( >=dev-qt/linguist-tools-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-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-keysyms >=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/kglobalaccel-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=073d3331056004a10834a8a7b9f66a5f
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.50.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.50.0
index 523af320ddf6..ba2a54124f67 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework to handle global shortcuts
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kcrash-5.50:5 >=kde-frameworks/kdbusaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-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-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kglobalaccel-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d6e15eae3a51ac1c5b30f9a9de24b553
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=86fc5d71baabe372e361158d79def57d
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.51.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.51.0
new file mode 100644
index 000000000000..e2623b68fe58
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-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-keysyms nls? ( >=dev-qt/linguist-tools-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to handle global shortcuts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-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-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kglobalaccel-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=837c32c8443de892e6f7000ab670c6f3
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.46.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.46.0
deleted file mode 100644
index a7d25c3fdbc8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-base/xorg-proto 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 >=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/kguiaddons-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3d8482fe62980c5f384b52edcb2872d5
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.50.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.50.0
index a4b837e4014a..f5b6b44bb782 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing assorted high-level user interface components
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kguiaddons-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b3d8c0512f0de3e39ef2d0839a932bed
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=69ed19307483f69794b8b42f7e5653a2
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.51.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.51.0
new file mode 100644
index 000000000000..f757d86d5298
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-base/xorg-proto 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing assorted high-level user interface components
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kguiaddons-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d516be6def9b7d3dc01d0fc0ba9b39ac
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.46.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.46.0
deleted file mode 100644
index 72f30f52d83e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.46.0
+++ /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.4:5 nls? ( >=dev-qt/linguist-tools-5.9.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: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=Library to determine holidays and other special events for a geographical region
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kholidays-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fe0b428fa5c51099ef6eff8144397143
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.50.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.50.0
index 9bd4a9aa1449..a49e783301c5 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library to determine holidays and other special events for a geograp
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kholidays-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0fd5f358beb7af39243799c0b063bcf7
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5353ad1136f34df24ea7c45cf4cac4a8
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.51.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.51.0
new file mode 100644
index 000000000000..008a87a19f9e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.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.51: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=Library to determine holidays and other special events for a geographical region
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kholidays-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8446d4837923b7ef36314ab9caafd9db
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.46.0 b/metadata/md5-cache/kde-frameworks/khtml-5.46.0
deleted file mode 100644
index 994a7d881287..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kglobalaccel-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/kjs-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwallet-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/sonnet-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) dev-lang/perl dev-util/gperf test? ( >=dev-qt/qtx11extras-5.9.4: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: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=KHTML web rendering engine
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libressl X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kglobalaccel-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/kjs-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwallet-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/sonnet-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/portingAids/khtml-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0d05263668553aeb3b2e9ea38f802567
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.50.0 b/metadata/md5-cache/kde-frameworks/khtml-5.50.0
index 0df7ad5f5539..8a9cb8c3bd52 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=KHTML web rendering engine
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kcodecs-5.50:5 >=kde-frameworks/kcompletion-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kglobalaccel-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kjobwidgets-5.50:5 >=kde-frameworks/kjs-5.50:5 >=kde-frameworks/knotifications-5.50:5 >=kde-frameworks/kparts-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/ktextwidgets-5.50:5 >=kde-frameworks/kwallet-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=kde-frameworks/sonnet-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/portingAids/khtml-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a702b500a1ae1ad72367ba1fac44a873
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f64c7805e636ecc4255384d3a20f7a54
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.51.0 b/metadata/md5-cache/kde-frameworks/khtml-5.51.0
new file mode 100644
index 000000000000..a562910a3fac
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kglobalaccel-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/kjs-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kparts-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwallet-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=kde-frameworks/sonnet-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) dev-lang/perl dev-util/gperf test? ( >=dev-qt/qtx11extras-5.9.4: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.51: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=KHTML web rendering engine
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kglobalaccel-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/kjs-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kparts-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwallet-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=kde-frameworks/sonnet-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/portingAids/khtml-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bb200bdc0c712d307e00f5038511f22a
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.46.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.46.0
deleted file mode 100644
index e06f34000f0d..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.9.4:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.9.4:5 sys-devel/gettext virtual/libintl >=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 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/ki18n-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0a8bf2547ab251acad9f9d64efb569b0
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.50.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.50.0
index af04438c9046..3e61dd17c427 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework based on Gettext for internationalizing user interface tex
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_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
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) 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(+)?] >=dev-qt/qtdeclarative-5.9.4:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_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 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/ki18n-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b3ae7f8ef82b27433e5167920a409434
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7b94480ef5e78983cb83652fdee0a063
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.51.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.51.0
new file mode 100644
index 000000000000..8a10e95f48c6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) 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(+)?] >=dev-qt/qtdeclarative-5.9.4:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_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
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) 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(+)?] >=dev-qt/qtdeclarative-5.9.4:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_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 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/ki18n-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b47c946e4e67376f694c03e9c78f87d3
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.46.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.46.0
deleted file mode 100644
index 1a2aac7119f8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kiconthemes-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0ff71258ea01de844c4416a5d02885b2
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.50.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.50.0
index eee6d9682333..8e738d45152e 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for icon theming and configuration
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kitemviews-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kiconthemes-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f948676d4a0e93e4cd834e8b1d2df661
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f55a8b2cd77c12a511f639332d4fe320
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.51.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.51.0
new file mode 100644
index 000000000000..3225bfbf8181
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for icon theming and configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kiconthemes-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5da420ed90867cb55ce4d11abd86f980
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.46.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.46.0
deleted file mode 100644
index 2c2d7eb2a034..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.9.4:5 x11-libs/libXScrnSaver ) 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X xscreensaver debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.9.4:5 x11-libs/libXScrnSaver ) >=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 )
-REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kidletime-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eee535bbb8e0998d21df992504be1fe3
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.50.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.50.0
index e0511e64c527..244e11d3577f 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for detection and notification of device idle time
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=X xscreensaver debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.9.4:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kidletime-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b3001b01746d7369d1b12cf0596d6215
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2c236efaf3c2cb323f137553e9d72cf5
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.51.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.51.0
new file mode 100644
index 000000000000..65a933babe23
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.9.4:5 x11-libs/libXScrnSaver ) 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for detection and notification of device idle time
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X xscreensaver debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.9.4:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kidletime-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=892c86314a59184fad3f3b741313c004
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.46.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.46.0
deleted file mode 100644
index 9907a02ff1f7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46:5 >=dev-qt/qtgui-5.9.4:5 eps? ( >=dev-qt/qtprintsupport-5.9.4:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) 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: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=Framework providing additional format plugins for Qt's image I/O system
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=eps openexr test debug test
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46:5 >=dev-qt/qtgui-5.9.4:5 eps? ( >=dev-qt/qtprintsupport-5.9.4:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kimageformats-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8007ba2eae1c1048ba668812d45c72d0
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.50.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.50.0
index fb7577fca159..e580474c69b1 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing additional format plugins for Qt's image I/O sys
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=eps openexr test debug test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.50:5 >=dev-qt/qtgui-5.9.4:5 eps? ( >=dev-qt/qtprintsupport-5.9.4:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kimageformats-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=29a5e8fbcc99a19d1e91899a55c8fe55
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ca9614ac85e3d70c63cfae73f575ee1c
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.51.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.51.0
new file mode 100644
index 000000000000..66b8b15eb838
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.51:5 >=dev-qt/qtgui-5.9.4:5 eps? ( >=dev-qt/qtprintsupport-5.9.4:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) 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.51: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=Framework providing additional format plugins for Qt's image I/O system
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=eps openexr test debug test
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.51:5 >=dev-qt/qtgui-5.9.4:5 eps? ( >=dev-qt/qtprintsupport-5.9.4:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kimageformats-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a36f37a31bd9c5ec59f293f484fa32c7
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.46.0 b/metadata/md5-cache/kde-frameworks/kinit-5.46.0
deleted file mode 100644
index 333661088473..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) man? ( >=kde-frameworks/kdoctools-5.46:5 ) X? ( 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:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+caps +man X debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kinit-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4b23b9d577bc16fe3826f034272d3b0d
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.50.0 b/metadata/md5-cache/kde-frameworks/kinit-5.50.0
index ff28d1720f8f..5d5bc57364a1 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kcrash-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kinit-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=70b14ff4a73b72865a1ddb5857a166a1
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0f2d4f9fe8c30bc5695bf4ef0656da94
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.51.0 b/metadata/md5-cache/kde-frameworks/kinit-5.51.0
new file mode 100644
index 000000000000..c8480ca77c3d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) man? ( >=kde-frameworks/kdoctools-5.51:5 ) X? ( 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.51:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+caps +man X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kinit-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3971e544e4e41bf6e5757cbc07bec108
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.46.0 b/metadata/md5-cache/kde-frameworks/kio-5.46.0
deleted file mode 100644
index c61485810b62..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.46.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.46:5 >=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kbookmarks-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/solid-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.46:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.46:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) >=dev-qt/qtconcurrent-5.9.4:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=acl +handbook kerberos +kwallet X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.46:5
-RDEPEND=>=kde-frameworks/kauth-5.46:5 >=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kbookmarks-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/solid-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.46:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.46:5 ) X? ( >=dev-qt/qtx11extras-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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kio-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f077a33cee87dec424dd050f0355bfbf
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.50.0 b/metadata/md5-cache/kde-frameworks/kio-5.50.0
index cacd3c9dd1d8..be468e00f020 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.50.0
@@ -4,12 +4,12 @@ DESCRIPTION=Framework providing transparent file and data management
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=acl +handbook kerberos +kwallet X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 PDEPEND=>=kde-frameworks/kded-5.50:5
 RDEPEND=>=kde-frameworks/kauth-5.50:5 >=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kbookmarks-5.50:5 >=kde-frameworks/kcodecs-5.50:5 >=kde-frameworks/kcompletion-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kdbusaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kitemviews-5.50:5 >=kde-frameworks/kjobwidgets-5.50:5 >=kde-frameworks/knotifications-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/ktextwidgets-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=kde-frameworks/solid-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.50:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.50:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kio-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=86ae7ef715cd44038f96abc99d6af576
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c68a32bfa6f8fd01b546ed2ade632ae7
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.51.0 b/metadata/md5-cache/kde-frameworks/kio-5.51.0
new file mode 100644
index 000000000000..69fe20b86cc5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.51.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.51:5 >=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kbookmarks-5.51:5 >=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=kde-frameworks/solid-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.51:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.51:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) >=dev-qt/qtconcurrent-5.9.4:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=acl +handbook kerberos +kwallet X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.51:5
+RDEPEND=>=kde-frameworks/kauth-5.51:5 >=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kbookmarks-5.51:5 >=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=kde-frameworks/solid-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.51:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.51:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kio-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0432531006edb151e0cff1be06344a77
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.46.0-r1 b/metadata/md5-cache/kde-frameworks/kirigami-5.46.0-r1
deleted file mode 100644
index b74734cd1193..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.46.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/linguist-tools-5.9.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: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=Lightweight user interface framework for mobile and convergent applications
-EAPI=6
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=debug examples test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qtsvg-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
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kirigami2-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=466c181b04273b41ebf6a786f4d71f6d
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.50.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.50.0
index 7b1c43ebb0f8..662f9dc8b3d0 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight user interface framework for mobile and convergent appli
 EAPI=6
 HOMEPAGE=https://techbase.kde.org/Kirigami
 IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kirigami2-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=62dd1e932c55463b271ac79ef168ae2c
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=97b7105f66fad0f6d052e7c889656f4c
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.51.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.51.0
new file mode 100644
index 000000000000..969e55eba10d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/linguist-tools-5.9.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.51: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=Lightweight user interface framework for mobile and convergent applications
+EAPI=6
+HOMEPAGE=https://techbase.kde.org/Kirigami
+IUSE=debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kirigami2-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d6637373171cdeb7431aac03b08fc373
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.46.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.46.0
deleted file mode 100644
index 5af0f4d9a94c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( >=dev-qt/qtwidgets-5.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.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/kitemmodels-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9b4b355f8d91c83c6bd5c9c51f2e9e07
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.50.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.50.0
index 5b4873e1f7ed..6462500d331e 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing data models to help with tasks such as sorting a
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kitemmodels-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9b5029d136591559f64bc120f87a932b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6c2ef00ddef49ef55395436f9f97557e
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.51.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.51.0
new file mode 100644
index 000000000000..b294463cf89c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( >=dev-qt/qtwidgets-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kitemmodels-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2e6b7172bc5385781d4846304dde33c0
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.46.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.46.0
deleted file mode 100644
index d00c828dc887..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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/kitemviews-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0d2a5dda6174882c33cf2e8a7857942a
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.50.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.50.0
index 413644505aaf..f190ab339a24 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing additional widgets for item models
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kitemviews-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=df6df54cdad36b07e198ea497615813e
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=248f870d2353dd4c1b870f427b0644f9
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.51.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.51.0
new file mode 100644
index 000000000000..28486371f577
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kitemviews-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f678ca3501cc0e52da6a0609a3849bd6
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.46.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.46.0
deleted file mode 100644
index e50208304c6f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) X? ( x11-base/xorg-proto 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.46:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-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/kjobwidgets-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cd5dea9dccc5056b1f6c620d3436c53a
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.50.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.50.0
index 66baf35a34ee..aa85ac9c33d6 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing assorted widgets for showing the progress of job
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kjobwidgets-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=427e8b13b23cdc1dc941acaf64156ddc
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d45b84a29fe3da66ecbd1f13ee8e14f3
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.51.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.51.0
new file mode 100644
index 000000000000..01c7e7fc1f11
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) X? ( x11-base/xorg-proto 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kjobwidgets-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e0e1394745976f49df6737e1c75ef274
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.46.0 b/metadata/md5-cache/kde-frameworks/kjs-5.46.0
deleted file mode 100644
index 356a278aa3c2..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libpcre 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.46:5 handbook? ( >=kde-frameworks/kdoctools-5.46: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=ECMAScipt compatible parser and engine
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/portingAids/kjs-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=90e15957c5d0cd4cc3f7a2fd5da15445
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.50.0 b/metadata/md5-cache/kde-frameworks/kjs-5.50.0
index 625a8e8a0dcc..79a1eb29365b 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=ECMAScipt compatible parser and engine
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/portingAids/kjs-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=81ce71e8a02e918a6a0f8ba9f543ad5d
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9258f93700d34f210cb6ed2f646a68af
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.51.0 b/metadata/md5-cache/kde-frameworks/kjs-5.51.0
new file mode 100644
index 000000000000..9dd58fc2410e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libpcre 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.51:5 handbook? ( >=kde-frameworks/kdoctools-5.51: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=ECMAScipt compatible parser and engine
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2 LGPL-2+
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/portingAids/kjs-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d15d944aa8c7e9c074ae70332d4a16ee
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.46.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.46.0
deleted file mode 100644
index 9376e86d269d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kjs-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/designer-5.9.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:5 handbook? ( >=kde-frameworks/kdoctools-5.46:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework binding JavaScript objects to QObjects
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kjs-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-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
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/portingAids/kjsembed-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=30e1f1a9d0acd3ec304bdfc7bd218c7a
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.50.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.50.0
index e5dbfa096db8..12fc162786e6 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework binding JavaScript objects to QObjects
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kjs-5.50:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/portingAids/kjsembed-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0a3ee0e99ad67b6eee24cdcc04816c71
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c357da774d2aeacc453a0dda1900c58d
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.51.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.51.0
new file mode 100644
index 000000000000..853bcc71554e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kjs-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/designer-5.9.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.51:5 handbook? ( >=kde-frameworks/kdoctools-5.51:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework binding JavaScript objects to QObjects
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kjs-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/portingAids/kjsembed-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=75dec70514ac5b094a285c35d1c6117b
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.46.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.46.0
deleted file mode 100644
index 3da7274b5b0f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kparts-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtwidgets-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: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=Framework providing a common interface for KParts that can play media files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kparts-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtwidgets-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
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/portingAids/kmediaplayer-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9627bef6f942114571e08d337aaf5703
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.50.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.50.0
index bdd249f48fc4..840e2b3b0d5a 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing a common interface for KParts that can play medi
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/portingAids/kmediaplayer-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4efa5c076abee87bedc1b748e3053551
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=afe8e4239752174598a25d9af47ca6d9
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.51.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.51.0
new file mode 100644
index 000000000000..a4c09d6fd4c5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kparts-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtwidgets-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.51: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=Framework providing a common interface for KParts that can play media files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kparts-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/portingAids/kmediaplayer-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=efb5706daa4e1fee715408be94f47a3f
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.46.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.46.0
deleted file mode 100644
index 1307d20a0c91..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.46:5 >=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/attica-5.46:5 >=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kirigami-5.46: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/knewstuff-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=86a85a82b09406bc05e3deba47ebd325
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.50.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.50.0
index 2c1a06b26f6f..58fdda3e7d13 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for downloading and sharing additional application data
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.50:5 >=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kcompletion-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kitemviews-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/ktextwidgets-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kirigami-5.50:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/knewstuff-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dcf9fd98c448de261ca8933f47ad2d6a
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=743dcb813b5e1c0dc1fd0c2036f6e79a
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.51.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.51.0
new file mode 100644
index 000000000000..48a9865247b8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.51:5 >=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/attica-5.51:5 >=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kirigami-5.51:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/knewstuff-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=13b6aba08768dc7bcfa23a04d2de732a
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.46.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.46.0
deleted file mode 100644
index ae2d78658690..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXtst ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) X? ( 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for notifying the user of an event
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=dbus nls speech X debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXtst ) >=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/knotifications-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=efa030fd8b77f1856e12a0085fe0af0b
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.50.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.50.0
index b5e84ac043ab..d0db02eb9180 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for notifying the user of an event
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=dbus nls phonon speech X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/knotifications-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=475797bffe95c747eccd8012d8d7497b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=699b3039719e4629cddcf4d6d68138b7
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.51.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.51.0
new file mode 100644
index 000000000000..a3d14ef947f7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXtst ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) X? ( 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for notifying the user of an event
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=dbus nls phonon speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/knotifications-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=53f62ff074a7a74261d12728929a3b13
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.46.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.46.0
deleted file mode 100644
index 1b9d50228866..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kio-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 phonon? ( 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.46:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=phonon debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kio-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 phonon? ( media-libs/phonon[qt5(+)] ) >=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/knotifyconfig-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=68996a23aae0b601e2e9d597b8b64511
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.50.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.50.0
index 867391fd01af..44c98ab13e5a 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for configuring desktop notifications
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kio-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/knotifyconfig-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f58337ebde2970d4c869483a52b0f5d9
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=345fd65da73b5e59f6bf4ea5c39b4ecc
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.51.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.51.0
new file mode 100644
index 000000000000..4b8845e6877c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kio-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 phonon? ( 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kio-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/knotifyconfig-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d8f769e475a8b13043d840378a7e01d1
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.46.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.46.0
deleted file mode 100644
index 289f6b5a0e3a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 man? ( >=kde-frameworks/kdoctools-5.46: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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46: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/kpackage-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=69d8147b4e3ad0276b003e9d5554ba86
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.50.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.50.0
index 722915f0a889..1033d327b017 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework to install and load packages of non binary content
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kpackage-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f50b94583416bd376f646c51c96ed315
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f57637e9dfa2eec913c6ea81547b2012
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.51.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.51.0
new file mode 100644
index 000000000000..b5b3b944f8e6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 man? ( >=kde-frameworks/kdoctools-5.51: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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kpackage-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=dd1ba46da2190506deb7bb8cf20128f2
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.46.0 b/metadata/md5-cache/kde-frameworks/kparts-5.46.0
deleted file mode 100644
index 07130eaf1113..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/ktextwidgets-5.46: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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-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/kparts-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=04bf6d8033f2178684897d4380482ab5
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.50.0 b/metadata/md5-cache/kde-frameworks/kparts-5.50.0
index cffe8387ae03..a5db83c2074c 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing elaborate user-interface components
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kjobwidgets-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kparts-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f577175f51edf0e6fbd6ac8abb4422b1
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=97d1e5da0338009ac3d8bdba264a68f0
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.51.0 b/metadata/md5-cache/kde-frameworks/kparts-5.51.0
new file mode 100644
index 000000000000..893d2ca7d316
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/ktextwidgets-5.51: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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kparts-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c063e83f093c6603ecc3d169945f4b7d
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.46.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.46.0
deleted file mode 100644
index c1b649b7d845..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE contact person abstraction library
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kpeople.git
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !net-libs/kpeople: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/kpeople-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7297d37bc635c52c6873188b433d9e14
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.50.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.50.0
index 3b46aa992ab2..7afeae873995 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE contact person abstraction library
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kpeople.git
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kitemviews-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kpeople-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=76d9365d1f09489bea1598e7e1969f1a
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=be501b97c3c86db5d4f267fbe68ff301
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.51.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.51.0
new file mode 100644
index 000000000000..2778c605d870
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE contact person abstraction library
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kpeople.git
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kpeople-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7a6e7cdb8f8172a4cde7572bf4a3f398
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.46.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.46.0
deleted file mode 100644
index 31df93bf76c1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing easy data-plotting functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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/kplotting-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b738744ad22daa36ae762c204bcb7c5a
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.50.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.50.0
index b6fec5847d4e..4b4a7d844bb7 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing easy data-plotting functions
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kplotting-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=930c75e3328e1cb8986e561664a8e618
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ec2fae61897520aeca57289826379b73
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.51.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.51.0
new file mode 100644
index 000000000000..abc2873b58da
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing easy data-plotting functions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kplotting-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=79c4af6c44ef03f54427354111e103c7
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.46.0 b/metadata/md5-cache/kde-frameworks/kpty-5.46.0
deleted file mode 100644
index 044dce7e5f65..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 sys-libs/libutempter 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 sys-libs/libutempter >=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/kpty-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=14ec178de06155ed00de72085ee334c2
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.50.0 b/metadata/md5-cache/kde-frameworks/kpty-5.50.0
index 7ab4ca9f2a28..41a34c4ba1c1 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for pseudo terminal devices and running child processes
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kpty-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=20f7a6cd39ac8c27e3f4d21c0b437450
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cb635835fa9eb4687d7e6dc1ae14c79e
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.51.0 b/metadata/md5-cache/kde-frameworks/kpty-5.51.0
new file mode 100644
index 000000000000..78ed8a6cde6d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 sys-libs/libutempter 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kpty-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b1fe4c8b718fe880462594f5cfdc944e
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.46.0 b/metadata/md5-cache/kde-frameworks/kross-5.46.0
deleted file mode 100644
index 28a30a86f00e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=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:5 handbook? ( >=kde-frameworks/kdoctools-5.46: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=Framework for embedding scripting into applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-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
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/portingAids/kross-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c164d35ab284fa9fef1bfc8923505b4f
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.50.0 b/metadata/md5-cache/kde-frameworks/kross-5.50.0
index 5d7e8c953a37..d792250daeb8 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for embedding scripting into applications
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kparts-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/portingAids/kross-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3e9e2abc22b2f434a5f31b30f5104643
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f292ec9b2a772e55bb0701d15afd7c3c
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.51.0 b/metadata/md5-cache/kde-frameworks/kross-5.51.0
new file mode 100644
index 000000000000..5b82c4a681b6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kparts-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=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.51:5 handbook? ( >=kde-frameworks/kdoctools-5.51: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=Framework for embedding scripting into applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kparts-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/portingAids/kross-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b29fc092eb0d62907ae6472b7768de28
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.46.0 b/metadata/md5-cache/kde-frameworks/krunner-5.46.0
deleted file mode 100644
index 28611d33a835..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/plasma-5.46:5 >=kde-frameworks/solid-5.46:5 >=kde-frameworks/threadweaver-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/plasma-5.46:5 >=kde-frameworks/solid-5.46:5 >=kde-frameworks/threadweaver-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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/krunner-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d53de54569c51264722f133bcd471a39
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.50.0 b/metadata/md5-cache/kde-frameworks/krunner-5.50.0
index 96bccd42558d..7c75f29274c2 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for providing different actions given a string query
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/plasma-5.50:5 >=kde-frameworks/solid-5.50:5 >=kde-frameworks/threadweaver-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/krunner-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e072d08ad99dcce618650c3171ffbc99
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ed619a05c8b3c8bcee2eb35b94e19a6a
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.51.0 b/metadata/md5-cache/kde-frameworks/krunner-5.51.0
new file mode 100644
index 000000000000..ae625ef62968
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/plasma-5.51:5 >=kde-frameworks/solid-5.51:5 >=kde-frameworks/threadweaver-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/plasma-5.51:5 >=kde-frameworks/solid-5.51:5 >=kde-frameworks/threadweaver-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/krunner-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=db9d6a663cbb1c8c3af500a5e8e00895
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.46.0 b/metadata/md5-cache/kde-frameworks/kservice-5.46.0
deleted file mode 100644
index c6f4f70b01c5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.46:5 ) test? ( >=dev-qt/qtconcurrent-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kcrash-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kservice-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bfe8aaeae91de5af2cb80716d0e469d2
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.50.0 b/metadata/md5-cache/kde-frameworks/kservice-5.50.0
index c6d41b1fed36..fbbd03627754 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced plugin and service introspection
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2 LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kcrash-5.50:5 >=kde-frameworks/kdbusaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kservice-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d1255b02fd8e236b943893db5d2ce6ef
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=85d955d7c63446866fb366a5bcf377f7
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.51.0 b/metadata/md5-cache/kde-frameworks/kservice-5.51.0
new file mode 100644
index 000000000000..5862c84f0029
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.51:5 ) test? ( >=dev-qt/qtconcurrent-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kcrash-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kservice-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=09975be7cb9f44871238ddafac810f2a
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.46.0-r1 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.46.0-r1
deleted file mode 100644
index cec0283c61ac..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.46.0-r1
+++ /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:5 >=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kguiaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/sonnet-5.46:5 >=kde-frameworks/syntax-highlighting-5.46: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/qtxml-5.9.4:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtxmlpatterns-5.9.4:5 test? ( >=kde-frameworks/kservice-5.46: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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing a full text editor component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=editorconfig git test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kguiaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/sonnet-5.46:5 >=kde-frameworks/syntax-highlighting-5.46: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/qtxml-5.9.4:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/ktexteditor-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7247492c028c8edda95f2a56b814f82c
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.50.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.50.0
index 6af8f65d7406..cdb5a2620cb3 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework providing a full text editor component
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kauth-5.50:5 >=kde-frameworks/kcodecs-5.50:5 >=kde-frameworks/kcompletion-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kguiaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kitemviews-5.50:5 >=kde-frameworks/kjobwidgets-5.50:5 >=kde-frameworks/kparts-5.50:5 >=kde-frameworks/ktextwidgets-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=kde-frameworks/sonnet-5.50:5 >=kde-frameworks/syntax-highlighting-5.50: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/qtxml-5.9.4:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/ktexteditor-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=11b8a733daf835bcc6ca0d0ed37e78f7
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b5782b63b6e22f1737be3f637443ba94
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.51.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.51.0
new file mode 100644
index 000000000000..a0237584a501
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kauth-5.51:5 >=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kguiaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/kparts-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=kde-frameworks/sonnet-5.51:5 >=kde-frameworks/syntax-highlighting-5.51: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/qtxml-5.9.4:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( >=kde-frameworks/kservice-5.51: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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing a full text editor component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kauth-5.51:5 >=kde-frameworks/kcodecs-5.51:5 >=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kguiaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/kjobwidgets-5.51:5 >=kde-frameworks/kparts-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=kde-frameworks/sonnet-5.51:5 >=kde-frameworks/syntax-highlighting-5.51: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/qtxml-5.9.4:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/ktexteditor-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=097d1c4488d46d2ec863bf66b03df433
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.46.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.46.0
deleted file mode 100644
index 1e1ada086176..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=kde-frameworks/sonnet-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=kde-frameworks/sonnet-5.46:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-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/ktextwidgets-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=af1df9f90ba781008dcafa275ef90e31
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.50.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.50.0
index dc03b03529e8..9bcb5619ed2f 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing an assortment of widgets for displaying and edit
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=speech test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=kde-frameworks/sonnet-5.50:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/ktextwidgets-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2c8beff7f9dd6799faa5ec0d82ff2ab7
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8c8c5811d14e0ba553986be31678d735
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.51.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.51.0
new file mode 100644
index 000000000000..86c90d703380
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=kde-frameworks/sonnet-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=kde-frameworks/sonnet-5.51:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/ktextwidgets-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6fabad070d346f56432eb25333080d5d
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.46.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.46.0
deleted file mode 100644
index 65b994fe16ea..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.46:5 >=dev-qt/qtnetwork-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for converting units
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.46: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/kunitconversion-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6403378b7f449ec097b02b350ad249a5
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.50.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.50.0
index 6822a610614f..a039462adfe0 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for converting units
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.50:5 >=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kunitconversion-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f9e929dd914f69e47c3f7846070e055e
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=08fd68ecb16d38ae8df6738f8a245440
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.51.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.51.0
new file mode 100644
index 000000000000..ab2610e2b60a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.51:5 >=dev-qt/qtnetwork-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for converting units
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.51:5 >=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kunitconversion-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9f07e965ef526a2d97bea58899350dbd
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.46.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.46.0
deleted file mode 100644
index e81b2c051be0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) man? ( >=kde-frameworks/kdoctools-5.46: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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=gpg +man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kdbusaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=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/kwallet-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b024640560ab2279e22ff8061abf91c1
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.50.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.50.0
index 8ce3a587c5f7..ea82dd63cbd6 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing desktop-wide storage for passwords
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kdbusaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/knotifications-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kwallet-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f360dcfe404c371306515fe702d401ca
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cd834142ef7f34c421fc4f580ce1e8e8
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.51.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.51.0
new file mode 100644
index 000000000000..88d08a92a278
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) man? ( >=kde-frameworks/kdoctools-5.51: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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kdbusaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kwallet-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fa843abe470192f37ab9237dd0d463dc
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.46.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.46.0
deleted file mode 100644
index 72f162d0cdb1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] 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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kwayland.git
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.9.4:5[egl(+)] >=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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kwayland-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9692300eb957bcd1f7699d5b44cf761c
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.50.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.50.0
index 4b7aa998a5fa..05d581b026c1 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kwayland.git
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.9.4:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kwayland-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1399ddbc69f9a9500c90f8e33d457dc6
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8887ad6b2d77b51cc2fc4f8b5f6cfb59
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.51.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.51.0
new file mode 100644
index 000000000000..1466fde08f9a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kwayland.git
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.9.4:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kwayland-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=dd2723ac63a6febc4008c0d90f087e4c
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0
deleted file mode 100644
index 31210ade82aa..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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/kwidgetsaddons-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=54c62f0f355f1ed9d07fb4993ead5a3a
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.50.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.50.0
index 6f06f3cfeebf..8447c4e40cb7 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=An assortment of high-level widgets for common tasks
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kwidgetsaddons-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6081a7d623bdcf24f93f175f8b10a66e
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9cc04caba7eac2a1d8dfdf390716c5b9
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.51.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.51.0
new file mode 100644
index 000000000000..3b6802c75185
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kwidgetsaddons-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d0bb3c925152d79554ae51d8147cce52
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.46.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.46.0
deleted file mode 100644
index feda6d7d2be1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) nls? ( >=dev-qt/linguist-tools-5.9.4: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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/kwindowsystem-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9ce7f037839db3ddb4ee7b4bbc64fe6e
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.50.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.50.0
index 91b6369505e4..93502ef9468d 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework providing access to properties and features of the window
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kwindowsystem-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=01984eb1758fa13ee2e7ed09faff462d
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c971f57aa8ace80bd57c8ad9505183f6
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.51.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.51.0
new file mode 100644
index 000000000000..91fa1e8d2424
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) nls? ( >=dev-qt/linguist-tools-5.9.4: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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing access to properties and features of the window manager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kwindowsystem-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ccb981e945cf209d808f5540e962a8ab
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0
deleted file mode 100644
index 51a8f60b477f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kglobalaccel-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtcore-5.9.4:5= >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 attica? ( >=kde-frameworks/attica-5.46: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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=attica test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kglobalaccel-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=dev-qt/qtcore-5.9.4:5= >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 attica? ( >=kde-frameworks/attica-5.46: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/kxmlgui-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f8e6d814e3d57e427b6273bbc0c6e6e5
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.50.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.50.0
index 2d9aac23cb1d..7ecdcd23dd0a 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=attica test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kglobalaccel-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kitemviews-5.50:5 >=kde-frameworks/ktextwidgets-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=dev-qt/qtcore-5.9.4:5= >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 attica? ( >=kde-frameworks/attica-5.50:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kxmlgui-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=48fca0507c48c900f0602a8bc37e307a
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bcd89f3488df5cc3d80de05505d2a042
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.51.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.51.0
new file mode 100644
index 000000000000..5f9cbb3c6368
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kglobalaccel-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtcore-5.9.4:5= >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 attica? ( >=kde-frameworks/attica-5.51: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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=attica test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kglobalaccel-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kitemviews-5.51:5 >=kde-frameworks/ktextwidgets-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=dev-qt/qtcore-5.9.4:5= >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 attica? ( >=kde-frameworks/attica-5.51:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kxmlgui-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=656c7f252593bf703cf05a7be3f4cbd9
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.46.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.46.0
deleted file mode 100644
index 1caf5e112b0b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kio-5.46:5 >=dev-qt/qtxml-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kio-5.46:5 >=dev-qt/qtxml-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/kxmlrpcclient-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d8a68283a2786df61fd6cecf8bb24f33
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.50.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.50.0
index 0dd0ed69ef1f..081b0367738d 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kio-5.50:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/kxmlrpcclient-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=208fa3b6f20be2c9355fc68099887bfc
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e6d0a77273d94b9c255dddfb4a6116de
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.51.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.51.0
new file mode 100644
index 000000000000..4a29e62259b9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kio-5.51:5 >=dev-qt/qtxml-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kio-5.51:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/kxmlrpcclient-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=96056b6cc40ae1c2a8a6d224970c9d84
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.46.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.46.0
deleted file mode 100644
index e75179d13ffb..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-misc/modemmanager 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.46:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-misc/modemmanager >=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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/modemmanager-qt-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b68d80d33221836fe86d6592d317a559
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.50.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.50.0
index 6f966021b933..d445c5fb799c 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=ModemManager bindings for Qt
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/modemmanager-qt-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cc321998618f4f378721f1a1ebcfb6ac
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9eadc8ddf1a7bfc9ab146665a39f252f
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.51.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.51.0
new file mode 100644
index 000000000000..08df50bb7f7e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-misc/modemmanager 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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=ModemManager bindings for Qt
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/modemmanager-qt-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5c525a7fd0b231bf4488f28d19b85179
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.46.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.46.0
deleted file mode 100644
index 143f172f403b..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=teamd debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.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/networkmanager-qt-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9b02e9850512b54bfb1a9c43e8a0a140
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.50.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.50.0
index a12350764df0..98e8ff097b81 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager bindings for Qt
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/networkmanager-qt-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=679e0792d08c99645434029b55fdc61d
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fcc1b2d1183d0691afa239c5b670467e
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.51.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.51.0
new file mode 100644
index 000000000000..47ab289e5853
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/networkmanager-qt-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6109b29f8bc1ad01986e9ef7a48a6734
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.46.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.46.0
deleted file mode 100644
index 197aa242e030..000000000000
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.46:5 >=dev-qt/qtcore-5.9.4:5 test? ( >=dev-qt/qttest-5.9.4:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Oxygen SVG icon theme
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/oxygen-icons5-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d8ad8d51b8cdc4169342ad0f8201dd83
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.50.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.50.0
index caa81d7e889c..8223f731c434 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Oxygen SVG icon theme
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/oxygen-icons5-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d91700002f32b0d14db54bde5b3d00e4
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f658227f44d58a074d36ab947fcee345
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.51.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.51.0
new file mode 100644
index 000000000000..7a978f79dc07
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.51:5 >=dev-qt/qtcore-5.9.4:5 test? ( >=dev-qt/qttest-5.9.4:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Oxygen SVG icon theme
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/oxygen-icons5-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=69018f9197a81921458af12e06b340cf
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.46.0 b/metadata/md5-cache/kde-frameworks/plasma-5.46.0
deleted file mode 100644
index f4e9eb0526d8..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46:5 >=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kdeclarative-5.46:5 >=kde-frameworks/kglobalaccel-5.46:5 >=kde-frameworks/kguiaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kirigami-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kpackage-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.46:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.46: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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma framework
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=gles2 wayland X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.46:5 >=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kdeclarative-5.46:5 >=kde-frameworks/kglobalaccel-5.46:5 >=kde-frameworks/kguiaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kirigami-5.46:5 >=kde-frameworks/knotifications-5.46:5 >=kde-frameworks/kpackage-5.46:5 >=kde-frameworks/kservice-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.46:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libxcb ) >=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 )
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/plasma-framework-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0d16d10e9781b628abdde17377594a94
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.50.0 b/metadata/md5-cache/kde-frameworks/plasma-5.50.0
index 0228bf39f24b..c128b8971543 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Plasma framework
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=gles2 wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kactivities-5.50:5 >=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kdeclarative-5.50:5 >=kde-frameworks/kglobalaccel-5.50:5 >=kde-frameworks/kguiaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kio-5.50:5 >=kde-frameworks/kirigami-5.50:5 >=kde-frameworks/knotifications-5.50:5 >=kde-frameworks/kpackage-5.50:5 >=kde-frameworks/kservice-5.50:5 >=kde-frameworks/kwidgetsaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:5 >=kde-frameworks/kxmlgui-5.50:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.50:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/plasma-framework-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=448519e1f44c6fd9288bb054b53e4ffb
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1868e34996c69ba0235afb9f57256237
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.51.0 b/metadata/md5-cache/kde-frameworks/plasma-5.51.0
new file mode 100644
index 000000000000..8f69c7890d4a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.51:5 >=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kdeclarative-5.51:5 >=kde-frameworks/kglobalaccel-5.51:5 >=kde-frameworks/kguiaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kirigami-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kpackage-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.51:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.51: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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma framework
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gles2 wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kactivities-5.51:5 >=kde-frameworks/karchive-5.51:5 >=kde-frameworks/kconfig-5.51:5 >=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/kdeclarative-5.51:5 >=kde-frameworks/kglobalaccel-5.51:5 >=kde-frameworks/kguiaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kio-5.51:5 >=kde-frameworks/kirigami-5.51:5 >=kde-frameworks/knotifications-5.51:5 >=kde-frameworks/kpackage-5.51:5 >=kde-frameworks/kservice-5.51:5 >=kde-frameworks/kwidgetsaddons-5.51:5 >=kde-frameworks/kwindowsystem-5.51:5 >=kde-frameworks/kxmlgui-5.51:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.51:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/plasma-framework-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=00c134fc2939c4a6898edbd88bdf1439
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.46.0 b/metadata/md5-cache/kde-frameworks/prison-5.46.0
deleted file mode 100644
index 9cb0967ece30..000000000000
--- a/metadata/md5-cache/kde-frameworks/prison-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=QRCode and data matrix barcode library
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/prison.git
-IUSE=qml debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-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/prison-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ef35b552365fdf07ab48cb37ad8081ae
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.50.0 b/metadata/md5-cache/kde-frameworks/prison-5.50.0
index d94e55dd183f..e0d49bda83c1 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=QRCode and data matrix barcode library
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/prison.git
 IUSE=qml debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/prison-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4870da82af2355b39fe364f2be81ec44
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=af22358c6454441abd0590bc2b8ffec8
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.51.0 b/metadata/md5-cache/kde-frameworks/prison-5.51.0
new file mode 100644
index 000000000000..9cc6d3768aaf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=QRCode and data matrix barcode library
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/prison.git
+IUSE=qml debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/prison-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=368e5ab917a3dfcfa7e8973b7d80defd
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.46.0 b/metadata/md5-cache/kde-frameworks/purpose-5.46.0
deleted file mode 100644
index abe646409190..000000000000
--- a/metadata/md5-cache/kde-frameworks/purpose-5.46.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kio-5.46:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.12.3:5 net-libs/accounts-qt ) 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: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=Library for providing abstractions to get the developer's purposes fulfilled
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+kaccounts debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kio-5.46:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.12.3:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/purpose-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a9c37b49f4a8d1b8b79d22a4b14ac8d8
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.50.0 b/metadata/md5-cache/kde-frameworks/purpose-5.50.0
index 25c1fcadbfc0..7d35975d803d 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.50.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kio-5.50:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.12.3:5 net-libs/accounts-qt ) 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.50: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
+DEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kio-5.50:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-18.04.3:5 net-libs/accounts-qt ) 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.50: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=Library for providing abstractions to get the developer's purposes fulfilled
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+kaccounts debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kio-5.50:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.12.3:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-frameworks/kio-5.50:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-18.04.3:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/purpose-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4a4ff61d70ba4958706149137e3434aa
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5366ecf3f5acc56636a96fb9b6bedd5e
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.51.0 b/metadata/md5-cache/kde-frameworks/purpose-5.51.0
new file mode 100644
index 000000000000..575875d57910
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.51.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kio-5.51:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-18.04.3:5 net-libs/accounts-qt ) 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.51: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=Library for providing abstractions to get the developer's purposes fulfilled
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+kaccounts debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.51:5 >=kde-frameworks/ki18n-5.51:5 >=kde-frameworks/kio-5.51:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-18.04.3:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/purpose-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9f50e40871ea8765f9875effb067a7d5
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.46.2 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.46.2
deleted file mode 100644
index fda75aad8375..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.46.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kirigami-5.46:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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: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=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kirigami-5.46:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtquickcontrols2-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
-SLOT=5/5.46
-SRC_URI=mirror://kde/stable/frameworks/5.46/qqc2-desktop-style-5.46.2.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9eddb63f4c0344b3a091ab017d778407
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.50.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.50.0
index df947633204a..d6bac15c990f 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( GPL-2+ LGPL-3+ )
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.50:5 >=kde-frameworks/kiconthemes-5.50:5 >=kde-frameworks/kirigami-5.50:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/qqc2-desktop-style-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=acded89c3ab26253b9d1d8f28c596ea7
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7463a822f3b0be7c01d39b9cd446db44
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.51.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.51.0
new file mode 100644
index 000000000000..0cdd44cc0648
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kirigami-5.51:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.51: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=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( GPL-2+ LGPL-3+ )
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.51:5 >=kde-frameworks/kiconthemes-5.51:5 >=kde-frameworks/kirigami-5.51:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/qqc2-desktop-style-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ee6ae5981312f168d01b523ef58edd20
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.46.0-r1 b/metadata/md5-cache/kde-frameworks/solid-5.46.0-r1
deleted file mode 100644
index 32f6164b165e..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.46.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-fs/udisks:2 virtual/udev nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) test? ( >=dev-qt/qtconcurrent-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-fs/udisks:2 virtual/udev >=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/solid-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=86816c19d64661ce8498c07204360917
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.50.0 b/metadata/md5-cache/kde-frameworks/solid-5.50.0
index 61a8ec73d72a..105d2f65c4e0 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Provider for platform independent hardware discovery, abstraction an
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/solid-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=db0296d3761600631568aaddaa6092b3
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7c380571bfc6f76d5673100b7a67b83d
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.51.0 b/metadata/md5-cache/kde-frameworks/solid-5.51.0
new file mode 100644
index 000000000000..267555d30181
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-fs/udisks:2 virtual/udev nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) test? ( >=dev-qt/qtconcurrent-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/solid-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d9e311cd2439e4e03270d1b692c7563c
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.46.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.46.0
deleted file mode 100644
index 50b840ce643a..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) nls? ( >=dev-qt/linguist-tools-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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=aspell +hunspell nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=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/sonnet-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=88ec049d8122b9b203d102456a938b85
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.50.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.50.0
index de6d8a8e2d74..50b80270985d 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for providing spell-checking through abstraction of popula
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=aspell +hunspell nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/sonnet-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7c97c2e7e52e71919526b811000495c2
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4339118eab597b1cd4b0836d556c9e96
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.51.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.51.0
new file mode 100644
index 000000000000..30f06846caf9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) nls? ( >=dev-qt/linguist-tools-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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=aspell +hunspell nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/sonnet-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b19fc5dc93002d5706752fc34f2e8359
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.50.0 b/metadata/md5-cache/kde-frameworks/syndication-5.50.0
index da59cc169113..c6b0ff7957f5 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.50.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.50:5 >=dev-qt/qtxml-5.9.4:5 test? ( >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcodecs-5.50:5 >=dev-qt/qtxml-5.9.4:5 test? ( >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50: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=Library for parsing RSS and Atom feeds
 EAPI=6
 HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~x86
+IUSE=debug test
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.50:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RDEPEND=>=kde-frameworks/kcodecs-5.50:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/syndication-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ea11fb0a44873951e70a8c770ef9485d
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=55dc8b3b12db3279af0aea8890b55cba
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.51.0 b/metadata/md5-cache/kde-frameworks/syndication-5.51.0
new file mode 100644
index 000000000000..5bc086ea6c12
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.51:5 >=dev-qt/qtxml-5.9.4:5 test? ( >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.51: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=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.51:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/syndication-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2e93fe354883b1aa7ecebf2ea83b78fc
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.46.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.46.0
deleted file mode 100644
index 756bd4094744..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.9.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:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for syntax highlighting
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxmlpatterns-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/syntax-highlighting-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=81019a335daade353d710977e45a7c4f
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.50.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.50.0
index 7e27dbdc0152..f77ed2f3d450 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for syntax highlighting
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/syntax-highlighting-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=686451df65c3fb0001e601d838eb9ecd
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d01d3961fe87882ea21fa26b2c85ccbb
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.51.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.51.0
new file mode 100644
index 000000000000..f94118ab7928
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.51.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.9.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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for syntax highlighting
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/syntax-highlighting-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=18cb61996279b6d7496657de55f83c88
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.46.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.46.0
deleted file mode 100644
index 42f51a844039..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.46.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.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/threadweaver-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e8f0c5661f782189d36028bc04ccddbc
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.50.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.50.0
index 078a830286a1..f97ecd423d4a 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for managing threads using job and queue-based interfaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.50
 SRC_URI=mirror://kde/stable/frameworks/5.50/threadweaver-5.50.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=49f13ae000e6a4f83cc62b324e4c5ae9
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=994bcff139c4bcb69047df0c51fb12c9
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.51.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.51.0
new file mode 100644
index 000000000000..228b5713b565
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.51.0
@@ -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.51:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing threads using job and queue-based interfaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.51:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+SLOT=5/5.51
+SRC_URI=mirror://kde/stable/frameworks/5.51/threadweaver-5.51.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9a3e71c6bbb866186bbdc79500a6d2b2
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index beb37f328b31..373373147668 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1 b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
index 57a229b4f399..ab8608fbddf2 100644
--- a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
+++ b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
@@ -1,13 +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/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/kfilemetadata-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/knotifications-5.46.0:5 >=kde-frameworks/kparts-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 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme:= ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtconcurrent-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
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme:= ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtconcurrent-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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=A DropDrawers clone. Multiple information organizer
 EAPI=6
 HOMEPAGE=https://github.com/basket-notepads/basket
 IUSE=crypt git test debug +handbook test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kfilemetadata-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/knotifications-5.46.0:5 >=kde-frameworks/kparts-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 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme:= ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme:= ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/basket-notepads/basket/archive/8de0345d99f3eb08d9406bd07e88b31afe46f315.tar.gz -> basket-2.49a_p20170225.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8982d4e29d534e36286aeefe1164d73
diff --git a/metadata/md5-cache/kde-misc/colord-kde-0.5.0 b/metadata/md5-cache/kde-misc/colord-kde-0.5.0
index 563572c96952..e83d707cc3cb 100644
--- a/metadata/md5-cache/kde-misc/colord-kde-0.5.0
+++ b/metadata/md5-cache/kde-misc/colord-kde-0.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtx11extras-5.9.4:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr >=kde-frameworks/kwindowsystem-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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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/qtx11extras-5.9.4:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr >=kde-frameworks/kwindowsystem-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Provides interfaces and session daemon to colord
 EAPI=6
 HOMEPAGE=http://projects.kde.org/projects/playground/graphics/colord-kde
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcmutils-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/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtx11extras-5.9.4:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr >=kde-plasma/kde-cli-tools-5.12.5:5 x11-misc/colord >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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/qtx11extras-5.9.4:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr >=kde-plasma/kde-cli-tools-5.12.5:5 x11-misc/colord >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/colord-kde/0.5.0/src/colord-kde-0.5.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2fd46f95b05b884bfae4ec67f75a982a
diff --git a/metadata/md5-cache/kde-misc/gmailfeed-1.1 b/metadata/md5-cache/kde-misc/gmailfeed-1.1
index 0539b056b588..288f48011e9b 100644
--- a/metadata/md5-cache/kde-misc/gmailfeed-1.1
+++ b/metadata/md5-cache/kde-misc/gmailfeed-1.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5[xml] >=dev-qt/qtnetwork-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5[xml] >=dev-qt/qtnetwork-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma 5 applet providing a list of unread emails from your Gmail inbox
 EAPI=6
 HOMEPAGE=https://store.kde.org/p/998911/ https://github.com/anthon38/gmailfeed
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-3+
-RDEPEND=>=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5[xml] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-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
+RDEPEND=>=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5[xml] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/anthon38/gmailfeed/archive/v1.1.tar.gz -> gmailfeed-1.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d77da5f98b14f5fc04066adf9edb000d
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.3.1 b/metadata/md5-cache/kde-misc/kdeconnect-1.3.1
index cf996bca0a65..46444c2ea417 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.3.1
+++ b/metadata/md5-cache/kde-misc/kdeconnect-1.3.1
@@ -1,14 +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/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/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 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] app? ( >=kde-frameworks/kdeclarative-5.46.0:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) wayland? ( >=kde-frameworks/kwayland-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 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] app? ( >=kde-frameworks/kdeclarative-5.50.0:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) wayland? ( >=kde-frameworks/kwayland-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Adds communication between KDE Plasma and your smartphone
 EAPI=6
 HOMEPAGE=https://www.kde.org/ https://community.kde.org/KDEConnect
 IUSE=app mousepad wayland debug +handbook test selinux
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-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/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/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] app? ( >=kde-frameworks/kdeclarative-5.46.0:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) app? ( >=kde-frameworks/kirigami-5.46.0:5 ) wayland? ( >=kde-plasma/kwin-5.12.5:5 ) !kde-misc/kdeconnect:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-kdeconnect ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] app? ( >=kde-frameworks/kdeclarative-5.50.0:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) wayland? ( >=kde-frameworks/kwayland-5.50.0:5 ) app? ( >=kde-frameworks/kirigami-5.50.0:5 ) wayland? ( >=kde-plasma/kwin-5.12.5:5 ) !kde-misc/kdeconnect:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-kdeconnect ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdeconnect/1.3.1/src/kdeconnect-kde-1.3.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f00412fafeec2a36ed119ef43ced77d
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.3.2 b/metadata/md5-cache/kde-misc/kdeconnect-1.3.2
new file mode 100644
index 000000000000..cdfb47ab292d
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kdeconnect-1.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] app? ( >=kde-frameworks/kdeclarative-5.50.0:5 ) bluetooth? ( >=dev-qt/qtbluetooth-5.9.4:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) wayland? ( >=kde-frameworks/kwayland-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Adds communication between KDE Plasma and your smartphone
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://community.kde.org/KDEConnect
+IUSE=app bluetooth mousepad wayland debug +handbook test selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] app? ( >=kde-frameworks/kdeclarative-5.50.0:5 ) bluetooth? ( >=dev-qt/qtbluetooth-5.9.4:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) wayland? ( >=kde-frameworks/kwayland-5.50.0:5 ) net-fs/sshfs app? ( >=kde-frameworks/kirigami-5.50.0:5 ) wayland? ( >=kde-plasma/kwin-5.12.5:5 ) !kde-misc/kdeconnect:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-kdeconnect ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdeconnect/1.3.2/src/kdeconnect-kde-1.3.2.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fffc5e4eb3825d8d1758c78662b7f67f
diff --git a/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1 b/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
index 15b640695e11..453f9f17cbea 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
+++ b/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
@@ -1,13 +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/kcrash-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/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Frontend to diff3 based on Qt/KF5
 EAPI=6
 HOMEPAGE=http://kdiff3.sourceforge.net/ https://cgit.kde.org/scratch/thomasfischer/kdiff3.git/log/?h=kf5
 IUSE=debug
 KEYWORDS=amd64 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/kcrash-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/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-misc/kdiff3:4 sys-apps/diffutils >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-misc/kdiff3:4 sys-apps/diffutils >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kdiff3-0.9.98_p20170219.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d1f7176d2822696bc90adda083530ae
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.1.3 b/metadata/md5-cache/kde-misc/kdirstat-3.1.3
index edc8aa5a0f45..61cec16e81bb 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.1.3
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.1.3
@@ -1,13 +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 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib 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.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
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=GUI equivalent to the du command based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://bitbucket.org/jeromerobert/k4dirstat/
 IUSE=debug +handbook
 KEYWORDS=amd64 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 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-3.1.3.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fe247d1b7bc6ce9f946a58d58fbf2e2
diff --git a/metadata/md5-cache/kde-misc/kimtoy-1.91 b/metadata/md5-cache/kde-misc/kimtoy-1.91
index 80b76f442325..c78841030670 100644
--- a/metadata/md5-cache/kde-misc/kimtoy-1.91
+++ b/metadata/md5-cache/kde-misc/kimtoy-1.91
@@ -1,13 +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/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/kio-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 >=kde-frameworks/plasma-5.46.0:5 app-i18n/ibus dev-libs/glib:2 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libpng:0=[apng] x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) scim? ( >=app-i18n/scim-1.4.9 dev-libs/dbus-c++ ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0: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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 app-i18n/ibus dev-libs/glib:2 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libpng:0=[apng] x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) scim? ( >=app-i18n/scim-1.4.9 dev-libs/dbus-c++ ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.50.0: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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=An input method frontend for Plasma
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/content/show.php?content=140967
 IUSE=libressl scim semantic-desktop debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-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/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/kio-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 >=kde-frameworks/plasma-5.46.0:5 app-i18n/ibus dev-libs/glib:2 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libpng:0=[apng] x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) scim? ( >=app-i18n/scim-1.4.9 dev-libs/dbus-c++ ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0:5 ) !kde-misc/kimtoy:4 >=app-i18n/fcitx-4.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 app-i18n/ibus dev-libs/glib:2 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libpng:0=[apng] x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) scim? ( >=app-i18n/scim-1.4.9 dev-libs/dbus-c++ ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.50.0:5 ) !kde-misc/kimtoy:4 >=app-i18n/fcitx-4.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1466629206/140967-kimtoy-1.91.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=377c8497e26837ca5966326ca75c39a9
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.4 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.4
index 55b25caead2b..dc21d22ab876 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.4
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.4
@@ -1,13 +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/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-apps/libkgapi-17.12.3:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.12.3:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4: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.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
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-apps/libkgapi-18.04.3:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-18.04.3:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=KIO Slave for Google Drive service
 EAPI=6
 HOMEPAGE=https://phabricator.kde.org/project/profile/72/
 IUSE=+kaccounts debug +handbook test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-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-apps/libkgapi-17.12.3:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.12.3:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) kaccounts? ( >=kde-apps/kaccounts-providers-17.12.3: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
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-apps/libkgapi-18.04.3:5 >=dev-qt/qtwidgets-5.9.4:5 kaccounts? ( >=kde-apps/kaccounts-integration-18.04.3:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) kaccounts? ( >=kde-apps/kaccounts-providers-18.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-gdrive/1.2.4/src/kio-gdrive-1.2.4.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7e7d6b1353463c72ddf06278da8bb8a
diff --git a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99 b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
index 554d038da656..3fe8f8e380b2 100644
--- a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
+++ b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-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 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
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Gopher Kioslave for Konqueror
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/Kio_gopher
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcodecs-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-misc/kio-gopher:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 !kde-misc/kio-gopher:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kio-gopher/kio-gopher-0.1.99.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f3b37bbdc9039ad1700326e33dd763a
diff --git a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1 b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
index a8ae28d83006..b08a2b8a3c80 100644
--- a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
+++ b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
@@ -1,13 +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/kdelibs4support-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtwidgets-5.9.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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Locate KIO slave
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/content/show.php/kio-locate?content=120965
 IUSE=debug debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-misc/kio-locate:4 sys-apps/mlocate >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-misc/kio-locate:4 sys-apps/mlocate >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1460972255/120965-kio-locate-0.5.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4d37fb33026958d67b43584597c64b1c
diff --git a/metadata/md5-cache/kde-misc/kio-stash-1.0 b/metadata/md5-cache/kde-misc/kio-stash-1.0
index e2e4e11b577a..40d3ca43ea10 100644
--- a/metadata/md5-cache/kde-misc/kio-stash-1.0
+++ b/metadata/md5-cache/kde-misc/kio-stash-1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdbusaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kio-5.46.0 >=dev-qt/qtdbus-5.9.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 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdbusaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kio-5.50.0 >=dev-qt/qtdbus-5.9.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.50.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=KIO Slave and daemon to stash discontinuous file selections
 EAPI=6
 HOMEPAGE=http://arnavdhamija.com/blog/kio-stash-release.html https://cgit.kde.org/kio-stash.git
 IUSE=debug test
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdbusaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kio-5.46.0 >=dev-qt/qtdbus-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
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdbusaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kio-5.50.0 >=dev-qt/qtdbus-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kde/stable/kio-stash/kio-stash-1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=babeb3280ff120275ff295b43295384d
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.2 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.2
deleted file mode 100644
index f60feee6435f..000000000000
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kparts-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] ) 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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KPart for rendering Markdown content
-EAPI=6
-HOMEPAGE=https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/
-IUSE=webkit debug
-KEYWORDS=amd64
-LICENSE=!webkit? ( BSD ) LGPL-2.1+
-RDEPEND=>=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/kparts-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] ) >=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/kmarkdownwebview/0.5.2/src/kmarkdownwebview-0.5.2.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f515837293d08233052ce0455d764d57
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3
index 1262c1127048..db0086d0394b 100644
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kparts-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] ) 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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] ) 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KPart for rendering Markdown content
 EAPI=6
 HOMEPAGE=https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/
 IUSE=webkit debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=!webkit? ( BSD ) LGPL-2.1+
-RDEPEND=>=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/kparts-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmarkdownwebview/0.5.3/src/kmarkdownwebview-0.5.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bf0efb0fadbf910899d63d911342c972
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=19c26b2efccd46574cdfe509dd9a542d
diff --git a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0 b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
index 2295261ae4ce..957be340f302 100644
--- a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
+++ b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/synnefo media-libs/libXcm >=media-libs/oyranos-0.9.6 x11-libs/libXrandr 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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/synnefo media-libs/libXcm >=media-libs/oyranos-0.9.6 x11-libs/libXrandr 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KControl module for Oyranos CMS cross desktop settings
 EAPI=6
 HOMEPAGE=http://www.oyranos.org/kolormanager
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/synnefo media-libs/libXcm >=media-libs/oyranos-0.9.6 x11-libs/libXrandr >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/synnefo media-libs/libXcm >=media-libs/oyranos-0.9.6 x11-libs/libXrandr >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/KDE/kolor-manager/archive/1.1.0.tar.gz -> kolor-manager-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b7b719c4eec81f3b6638bddbe90337b1
diff --git a/metadata/md5-cache/kde-misc/krename-5.0.0 b/metadata/md5-cache/kde-misc/krename-5.0.0
index a52a7e1d4654..4ed094b7e2a3 100644
--- a/metadata/md5-cache/kde-misc/krename-5.0.0
+++ b/metadata/md5-cache/kde-misc/krename-5.0.0
@@ -1,13 +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/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-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/kjs-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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.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.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kjs-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.50.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=Powerful batch file renamer
 EAPI=6
 HOMEPAGE=http://www.krename.net/
 IUSE=exif pdf taglib truetype debug test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-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/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/kjs-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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) !kde-misc/krename:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kjs-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) !kde-misc/krename:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krename/5.0.0/src/krename-5.0.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ca89b639c2f9332f18ad08638cdd51e
diff --git a/metadata/md5-cache/kde-misc/krusader-2.7.1 b/metadata/md5-cache/kde-misc/krusader-2.7.1
index ff00ec58d8c2..5e332ac84764 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.7.1
+++ b/metadata/md5-cache/kde-misc/krusader-2.7.1
@@ -1,13 +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/kbookmarks-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/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/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/ktextwidgets-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/solid-5.46.0:5 >=dev-qt/qtdbus-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/qtxml-5.9.4:5 sys-apps/acl sys-libs/zlib >=kde-frameworks/knotifications-5.46.0:5 >=dev-qt/qtconcurrent-5.9.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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-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/qtxml-5.9.4:5 sys-apps/acl sys-libs/zlib >=kde-frameworks/knotifications-5.50.0:5 >=dev-qt/qtconcurrent-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Advanced twin-panel (commander-style) file-manager with many extras
 EAPI=6
 HOMEPAGE=https://krusader.org/
 IUSE=debug +handbook
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-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/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/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/ktextwidgets-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/solid-5.46.0:5 >=dev-qt/qtdbus-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/qtxml-5.9.4:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-17.12.3:5 !kde-misc/krusader:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-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/qtxml-5.9.4:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-18.04.3:5 !kde-misc/krusader:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krusader/2.7.1/krusader-2.7.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed0393454ea9664088112753d6d933a1
diff --git a/metadata/md5-cache/kde-misc/kshutdown-4.2 b/metadata/md5-cache/kde-misc/kshutdown-4.2
index 8fbd2c4ee1c5..007428795b82 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-4.2
+++ b/metadata/md5-cache/kde-misc/kshutdown-4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdbusaddons:5 kde-frameworks/kglobalaccel:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) !kde-misc/kshutdown:4
 SLOT=5
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-4.2.zip
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0dbe65a0dba747c0566dc800e17ed99
diff --git a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1 b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
index c37517139453..420d6efc1e6a 100644
--- a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
+++ b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
@@ -1,13 +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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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 net-libs/libmnl 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.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/libmnl 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Function key (FN) monitoring for Toshiba laptops
 EAPI=6
 HOMEPAGE=http://ktoshiba.sourceforge.net/
 IUSE=debug
 KEYWORDS=~amd64
 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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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 net-libs/libmnl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/libmnl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=http://prdownloads.sourceforge.net/ktoshiba/ktoshiba-5.3.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a9db043b0c2a5f7e2000f0cf98025f8
diff --git a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20180406 b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20180406
index 270668103546..48fe19246cb8 100644
--- a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20180406
+++ b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20180406
@@ -1,13 +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/kdewebkit-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/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 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-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/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-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/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=WebKit KPart for Konqueror
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kwebkitpart.git
 IUSE=debug
 KEYWORDS=amd64 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/kdewebkit-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/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 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-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/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-misc/kwebkitpart:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-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/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-misc/kwebkitpart:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/KDE/kwebkitpart/archive/ed6b8c87fabeb563109a093c1f79eeb03867b053.tar.gz -> kwebkitpart-1.4.0_pre20180406.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b4b0a94022d326177db6482488df1e9f
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.7.5 b/metadata/md5-cache/kde-misc/latte-dock-0.7.5
index 331256935f0d..2d0a34fbc0c5 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.7.5
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.7.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kcrash-5.46.0 >=kde-frameworks/kdbusaddons-5.46.0 >=kde-frameworks/kdeclarative-5.46.0 >=kde-frameworks/kglobalaccel-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/knewstuff-5.46.0 >=kde-frameworks/knotifications-5.46.0 >=kde-frameworks/kpackage-5.46.0 >=kde-frameworks/kwayland-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=kde-frameworks/plasma-5.46.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 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.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kcrash-5.50.0 >=kde-frameworks/kdbusaddons-5.50.0 >=kde-frameworks/kdeclarative-5.50.0 >=kde-frameworks/kglobalaccel-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/knewstuff-5.50.0 >=kde-frameworks/knotifications-5.50.0 >=kde-frameworks/kpackage-5.50.0 >=kde-frameworks/kwayland-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=kde-frameworks/plasma-5.50.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Elegant dock, based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://store.kde.org/p/1169519/ https://github.com/psifidotos/Latte-Dock
 IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kcrash-5.46.0 >=kde-frameworks/kdbusaddons-5.46.0 >=kde-frameworks/kdeclarative-5.46.0 >=kde-frameworks/kglobalaccel-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/knewstuff-5.46.0 >=kde-frameworks/knotifications-5.46.0 >=kde-frameworks/kpackage-5.46.0 >=kde-frameworks/kwayland-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=kde-frameworks/plasma-5.46.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kcrash-5.50.0 >=kde-frameworks/kdbusaddons-5.50.0 >=kde-frameworks/kdeclarative-5.50.0 >=kde-frameworks/kglobalaccel-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/knewstuff-5.50.0 >=kde-frameworks/knotifications-5.50.0 >=kde-frameworks/kpackage-5.50.0 >=kde-frameworks/kwayland-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=kde-frameworks/plasma-5.50.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=0
 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.7.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7be24b37e903988b37e983abfb027e4
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.8.0 b/metadata/md5-cache/kde-misc/latte-dock-0.8.0
index 3bca405a1de7..f4be83c0d645 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.8.0
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.8.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kcrash-5.46.0 >=kde-frameworks/kdbusaddons-5.46.0 >=kde-frameworks/kdeclarative-5.46.0 >=kde-frameworks/kglobalaccel-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/knewstuff-5.46.0 >=kde-frameworks/knotifications-5.46.0 >=kde-frameworks/kpackage-5.46.0 >=kde-frameworks/kwayland-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=kde-frameworks/plasma-5.46.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 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.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kcrash-5.50.0 >=kde-frameworks/kdbusaddons-5.50.0 >=kde-frameworks/kdeclarative-5.50.0 >=kde-frameworks/kglobalaccel-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/knewstuff-5.50.0 >=kde-frameworks/knotifications-5.50.0 >=kde-frameworks/kpackage-5.50.0 >=kde-frameworks/kwayland-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=kde-frameworks/plasma-5.50.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Elegant dock, based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://store.kde.org/p/1169519/ https://github.com/psifidotos/Latte-Dock
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kcrash-5.46.0 >=kde-frameworks/kdbusaddons-5.46.0 >=kde-frameworks/kdeclarative-5.46.0 >=kde-frameworks/kglobalaccel-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/knewstuff-5.46.0 >=kde-frameworks/knotifications-5.46.0 >=kde-frameworks/kpackage-5.46.0 >=kde-frameworks/kwayland-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=kde-frameworks/plasma-5.46.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kcrash-5.50.0 >=kde-frameworks/kdbusaddons-5.50.0 >=kde-frameworks/kdeclarative-5.50.0 >=kde-frameworks/kglobalaccel-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/knewstuff-5.50.0 >=kde-frameworks/knotifications-5.50.0 >=kde-frameworks/kpackage-5.50.0 >=kde-frameworks/kwayland-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=kde-frameworks/plasma-5.50.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=0
 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.8.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8e1aaa8c56fbd621f0bf60abc87c22f6
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.8.1 b/metadata/md5-cache/kde-misc/latte-dock-0.8.1
index 99fdfceb3d23..7133e50015c9 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.8.1
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.8.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kcrash-5.46.0 >=kde-frameworks/kdbusaddons-5.46.0 >=kde-frameworks/kdeclarative-5.46.0 >=kde-frameworks/kglobalaccel-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/knewstuff-5.46.0 >=kde-frameworks/knotifications-5.46.0 >=kde-frameworks/kpackage-5.46.0 >=kde-frameworks/kwayland-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=kde-frameworks/plasma-5.46.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 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.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kcrash-5.50.0 >=kde-frameworks/kdbusaddons-5.50.0 >=kde-frameworks/kdeclarative-5.50.0 >=kde-frameworks/kglobalaccel-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/knewstuff-5.50.0 >=kde-frameworks/knotifications-5.50.0 >=kde-frameworks/kpackage-5.50.0 >=kde-frameworks/kwayland-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=kde-frameworks/plasma-5.50.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Elegant dock, based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://store.kde.org/p/1169519/ https://github.com/psifidotos/Latte-Dock
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kcrash-5.46.0 >=kde-frameworks/kdbusaddons-5.46.0 >=kde-frameworks/kdeclarative-5.46.0 >=kde-frameworks/kglobalaccel-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/knewstuff-5.46.0 >=kde-frameworks/knotifications-5.46.0 >=kde-frameworks/kpackage-5.46.0 >=kde-frameworks/kwayland-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=kde-frameworks/plasma-5.46.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kcrash-5.50.0 >=kde-frameworks/kdbusaddons-5.50.0 >=kde-frameworks/kdeclarative-5.50.0 >=kde-frameworks/kglobalaccel-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/knewstuff-5.50.0 >=kde-frameworks/knotifications-5.50.0 >=kde-frameworks/kpackage-5.50.0 >=kde-frameworks/kwayland-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=kde-frameworks/plasma-5.50.0[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[xcb] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=0
 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.8.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a224b1b6903afeb0575b5c841854a71
diff --git a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500 b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
index 0a69d80064f7..11589a9d9adb 100644
--- a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
+++ b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
@@ -1,13 +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/kio-5.46.0:5 >=dev-qt/qtgui-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtgui-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE thumbnail-plugin that generates thumbnails for ODF files
 EAPI=6
 HOMEPAGE=https://www.kde-apps.org/content/show.php?content=110864
 IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtgui-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
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=64aea936676d9345c4c9bd0c9c284420
diff --git a/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3 b/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3
index cbbea5b951be..ce9ff91b0628 100644
--- a/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3
+++ b/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5[X] >=dev-qt/qtcore-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/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=kde-frameworks/extra-cmake-modules-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5[X] >=dev-qt/qtcore-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/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=kde-frameworks/extra-cmake-modules-5.50.0:5 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Plasma 5 applet for controlling currently active window
 EAPI=6
 HOMEPAGE=https://store.kde.org/p/998910/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5[X] >=dev-qt/qtcore-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/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5[X] >=dev-qt/qtcore-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/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-active-window-control/archive/v1.7.3.tar.gz -> plasma-active-window-control-1.7.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=95bcfabf50a8d1f81713d6360e412ab8
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3 b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
index 8def9a32ab56..a480c70411bd 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
+++ b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/plasma-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma 5 applet for monitoring active network connections
 EAPI=6
 HOMEPAGE=https://store.kde.org/content/show.php/Network+Monitor?content=169377 https://github.com/kotelnik/plasma-applet-network-monitor
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/plasma-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.9.4:5
+RDEPEND=>=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-network-monitor/archive/v1.7.3.tar.gz -> plasma-applet-network-monitor-1.7.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ba449d9805823486baca5cdc2923d26
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10 b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10
index adfbc59061b6..94826e78a3b3 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10
+++ b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5[xml] 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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5[xml] 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma 5 applet for weather forecasts
 EAPI=6
 HOMEPAGE=https://store.kde.org/content/show.php/Weather+Widget?content=169572 https://github.com/kotelnik/plasma-applet-weather-widget
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5[xml] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdeclarative-5.9.4:5[xml] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-weather-widget/archive/v1.6.10.tar.gz -> plasma-applet-weather-widget-1.6.10.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1329fd6b2c797c242c1ae8f62a2ae77
diff --git a/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18 b/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18
index e9875d186d03..ebe0e7434776 100644
--- a/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18
+++ b/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/plasma-5.50.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma 5 applet for controlling redshift
 EAPI=6
 HOMEPAGE=https://store.kde.org/p/998916/
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/plasma-5.46.0:5 x11-misc/redshift >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/plasma-5.50.0:5 x11-misc/redshift >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-redshift-control/archive/v1.0.18.tar.gz -> plasma-applet-redshift-control-1.0.18.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ffd82e970a489cafb9044c42595c68f0
diff --git a/metadata/md5-cache/kde-misc/playbar2-2.5 b/metadata/md5-cache/kde-misc/playbar2-2.5
index baa36b794eaf..a08844919793 100644
--- a/metadata/md5-cache/kde-misc/playbar2-2.5
+++ b/metadata/md5-cache/kde-misc/playbar2-2.5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdoctools-5.46.0 >=kde-frameworks/kglobalaccel-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=kde-frameworks/plasma-5.46.0 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdoctools-5.50.0 >=kde-frameworks/kglobalaccel-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=kde-frameworks/plasma-5.50.0 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=MPRIS2 client, written in QML for Plasma 5
 EAPI=6
 HOMEPAGE=https://github.com/audoban/PlayBar2
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/extra-cmake-modules-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdoctools-5.46.0 >=kde-frameworks/kglobalaccel-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=kde-frameworks/plasma-5.46.0 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5
+RDEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdoctools-5.50.0 >=kde-frameworks/kglobalaccel-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=kde-frameworks/plasma-5.50.0 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5
 SLOT=0
 SRC_URI=https://github.com/audoban/PlayBar2/archive/v2.5.tar.gz -> playbar2-2.5.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=81026cba98434a3ab9adb283c3d9e6ae
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.8 b/metadata/md5-cache/kde-misc/rsibreak-0.12.8
index 93acd2246720..ea16a86ea92c 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.8
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.8
@@ -1,13 +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/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/kidletime-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-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 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.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
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Small utility which bothers you at certain intervals
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/RSIBreak
 IUSE=test debug +handbook
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.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/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/kidletime-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-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 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/frameworkintegration-5.46.0:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/frameworkintegration-5.50.0:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.8.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9fbfa31036a248ab824cbea87fda964
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1 b/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
index 48ccde46a24c..3f7fd0bc691c 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
+++ b/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
@@ -1,13 +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 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libksane-17.12.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libpng: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 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
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libksane-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libpng: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=KDE image scanning application
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/graphics/skanlite
 IUSE=debug +handbook test
 KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.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 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libksane-17.12.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libpng:0= !kde-misc/skanlite:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libksane-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libpng:0= !kde-misc/skanlite:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/skanlite/2.1/skanlite-2.1.0.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=15f11a9cbc29f2e9e6a52e991fa0973c
diff --git a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1 b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
index 034c61b7cc02..811a387b5cbb 100644
--- a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
+++ b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
@@ -1,13 +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/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/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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 sys-apps/systemd 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.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/systemd 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma control module for systemd
 EAPI=6
 HOMEPAGE=https://projects.kde.org/projects/playground/sysadmin/systemd-kcm
 IUSE=debug
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kauth-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/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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 sys-apps/systemd !kde-misc/kcmsystemd:4 !kde-misc/systemd-kcm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/systemd !kde-misc/kcmsystemd:4 !kde-misc/systemd-kcm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/systemd-kcm/systemd-kcm-1.2.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3aadcf4ec2190f0d3da95e229e382cca
diff --git a/metadata/md5-cache/kde-misc/tellico-3.1.2 b/metadata/md5-cache/kde-misc/tellico-3.1.2
index 2ea340013408..08c528a0d47e 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.1.2
+++ b/metadata/md5-cache/kde-misc/tellico-3.1.2
@@ -1,14 +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/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/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kio-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/ktextwidgets-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/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-17.12.3:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-17.12.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.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
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-18.04.3:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-18.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.50.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=A collection manager based on KDE Frameworks
 EAPI=6
 HOMEPAGE=http://tellico-project.org/
 IUSE=cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz test debug +handbook test
 KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/karchive-5.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/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kio-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/ktextwidgets-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/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-17.12.3:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-17.12.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-18.04.3:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-18.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.50.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5
 SRC_URI=http://tellico-project.org/files/tellico-3.1.2.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=daefdec973d4ebb4e5c001620279042d
diff --git a/metadata/md5-cache/kde-misc/tellico-3.1.3 b/metadata/md5-cache/kde-misc/tellico-3.1.3
new file mode 100644
index 000000000000..c32d65ed6acc
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/tellico-3.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-18.04.3:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-18.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.50.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Collection manager based on KDE Frameworks
+EAPI=6
+HOMEPAGE=http://tellico-project.org/
+IUSE=cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/khtml-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-18.04.3:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-18.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.50.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=http://tellico-project.org/files/tellico-3.1.3.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ad7ee4da7285323b3b321d0cc8d71430
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.1.0 b/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
index 39e2ca53bab5..1fb0bb16872a 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
@@ -1,13 +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/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-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 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb sys-devel/gettext x11-base/xorg-proto 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 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb sys-devel/gettext x11-base/xorg-proto 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KControl module for Wacom tablets
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/content/show.php?action=content&content=114856
 IUSE=test debug +handbook
 KEYWORDS=amd64 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/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-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 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/wacomtablet/3.1.0/wacomtablet-3.1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa7b1dc0f5f01abd6c83b77c0f48ec09
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.5 b/metadata/md5-cache/kde-misc/yakuake-3.0.5
index 2c88e7563e8f..4dd0bda254de 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.5
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.5
@@ -1,13 +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/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/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/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-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/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/konsole-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4: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.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/konsole-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4: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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Quake-style terminal emulator based on konsole
 EAPI=6
 HOMEPAGE=https://yakuake.kde.org/
 IUSE=debug
 KEYWORDS=amd64 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/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/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/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-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/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/konsole-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/konsole-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.5/src/yakuake-3.0.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9c2079b7dc18d7e96e668dd51e9c2027
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.5.0 b/metadata/md5-cache/kde-misc/zanshin-0.5.0
index 0a86e79aceb3..e2fee71549c1 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.5.0
+++ b/metadata/md5-cache/kde-misc/zanshin-0.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-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/kparts-5.46.0:5 >=kde-frameworks/krunner-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-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/boost test? ( >=kde-apps/akonadi-17.12.0:5[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.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
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/boost test? ( >=kde-apps/akonadi-17.12.0:5[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.50.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=Getting things done application by KDE
 EAPI=6
 HOMEPAGE=https://zanshin.kde.org/
 IUSE=test debug test
 KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=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/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-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/kparts-5.46.0:5 >=kde-frameworks/krunner-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-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-misc/zanshin:4 >=kde-apps/kdepim-runtime-17.12.0: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
+RDEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-misc/zanshin:4 >=kde-apps/kdepim-runtime-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/zanshin/zanshin-0.5.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f4a30809cd69d11747b27212f703598
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index babc1dcd0eef..b76bbf36b2e0 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.12.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.12.5
deleted file mode 100644
index f9708e7fc227..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.12.5
+++ /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.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/kded-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/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/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 >=dev-qt/qtcore-5.9.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.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/kded-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/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/qtwidgets-5.9.1:5 >=kde-plasma/kde-cli-tools-5.12.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/bluedevil-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9e611aa8581de821c70f9c37d92e7281
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.12.7 b/metadata/md5-cache/kde-plasma/bluedevil-5.12.7
index 167f42ce501a..db2ed829e621 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.12.7
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-plasma/kde-cli-tools-5.12.7: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/bluedevil-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ef9ad17a6c2125555e663f78dc41419
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.13.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.13.5
index 38ca92ecb5f5..61ccc85ec82c 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.13.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=Bluetooth stack for KDE Plasma
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/bluedevil.git
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+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.5: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.5/bluedevil-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=327fe4aaf6cfe0f35575ffa20c84c8f0
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fdc821b6e611d7391692f142471a4700
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.14.1 b/metadata/md5-cache/kde-plasma/bluedevil-5.14.1
new file mode 100644
index 000000000000..746b62a9d83e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/bluez-qt-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kded-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.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.50.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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kded-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.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.14.1:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/bluedevil-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2ef9ad17a6c2125555e663f78dc41419
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.12.5 b/metadata/md5-cache/kde-plasma/breeze-5.12.5
deleted file mode 100644
index b9b2ffc11e46..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.12.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-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/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-plasma/kdecoration-5.12.5: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 wayland? ( >=kde-frameworks/kwayland-5.43.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-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=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
-RDEPEND=>=kde-frameworks/frameworkintegration-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/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-plasma/kdecoration-5.12.5: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 wayland? ( >=kde-frameworks/kwayland-5.43.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/breeze-icons-5.43.0:5 >=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:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/breeze-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=011f13c0a3146ec48ac13a99ca9e24d8
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.12.7 b/metadata/md5-cache/kde-plasma/breeze-5.12.7
index f500f1f3dc70..a2e6f9714752 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.12.7
+++ b/metadata/md5-cache/kde-plasma/breeze-5.12.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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.12.7:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/breeze-icons-5.46.0:5 >=kde-plasma/kde-cli-tools-5.12.7: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/plasma/5.12.7/breeze-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=250dc97bc92ee89a5c6783eba6427f4c
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.13.5 b/metadata/md5-cache/kde-plasma/breeze-5.13.5
index 781add94937a..6beb59c4367d 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.13.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.13.5
@@ -4,11 +4,11 @@ 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
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-frameworks/breeze-icons-5.46.0:5 >=kde-plasma/kde-cli-tools-5.13.5: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.5: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.5/breeze-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=76478bfdc7579004b37923992e0c9bd3
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=90e921e08198afa78567259d4871a41b
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.14.1 b/metadata/md5-cache/kde-plasma/breeze-5.14.1
new file mode 100644
index 000000000000..8b045ff91828
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-plasma/kdecoration-5.14.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/qtwidgets-5.11.1:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.50.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.50.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.50.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.50.0:5 >=kde-plasma/kde-cli-tools-5.14.1:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-plasma/kdecoration-5.14.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/qtwidgets-5.11.1:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.50.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/breeze-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0897a37d05e07f18a352830eccfd020a
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.12.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.12.5
deleted file mode 100644
index e34ec5b3af8c..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.12.5
+++ /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.12.5/breeze-grub-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=07c2627e376682a0134d9b87afbce3ce
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.12.7 b/metadata/md5-cache/kde-plasma/breeze-grub-5.12.7
index 94a2b82c1d9e..081c6ba6980b 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.12.7
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.12.7
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/breeze-grub-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2843877d873fbe10977506d4b1b641af
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.13.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.13.5
index 638186790ea8..993095739fa4 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.13.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.13.5
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-f
 DESCRIPTION=Breeze theme for GRUB
 EAPI=6
 HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.13.5/breeze-grub-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6fdf18bfe569ca5ec4b257cbf248a838
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b0eade5c4f90f4589cf675f124323039
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.14.1 b/metadata/md5-cache/kde-plasma/breeze-grub-5.14.1
new file mode 100644
index 000000000000..e8d7fe8100ff
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.14.1
@@ -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.14.1/breeze-grub-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2843877d873fbe10977506d4b1b641af
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.5
deleted file mode 100644
index 34f04d77e159..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.5
+++ /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.43.0:5 >=dev-qt/qtcore-5.9.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.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/breeze-gtk-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e98bce4ea2b1b8371335813393aa37e3
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.7 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.7
index ae896e03eb38..28fb2bc4cd09 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.7
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/breeze-gtk-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=65175df20adedd3db395a796d40bd0dd
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.5
index 9d48ea5f5fa1..a8cf0692cccb 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.5
@@ -4,10 +4,10 @@ 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
+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.5/breeze-gtk-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=aa4e75ba1788ac8e8c89c738a570dca9
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=567dd53c5b6e5818fe8028b2f8de28a9
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.1 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.1
new file mode 100644
index 000000000000..4a47e218a8e1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.1
@@ -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.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/breeze-gtk-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=65175df20adedd3db395a796d40bd0dd
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.5
deleted file mode 100644
index e4e9fe7b2f8a..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.5
+++ /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.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 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.12.5/breeze-plymouth-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7fa5224e633744a12988da39b6de4a5c
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.7 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.7
index cf5d43ab4066..7f5a4655ffe5 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.7
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/breeze-plymouth-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d102931c9f4e4795da06b19287a087d
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.5
index e3e114eab531..a8c5c71010a8 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=Breeze theme for Plymouth
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.13.5/breeze-plymouth-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=71cd4b752982067f0bf4291ced279e2e
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=92f1a7ab28c1c2c252b358457b87d757
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.1 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.1
new file mode 100644
index 000000000000..afbf806358cc
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.1
@@ -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.50.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.14.1/breeze-plymouth-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5d102931c9f4e4795da06b19287a087d
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.12.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.12.5
deleted file mode 100644
index f37d4923a313..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.12.5
+++ /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/kidletime-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/kwallet-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlrpcclient-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 X? ( >=dev-qt/qtx11extras-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 >=dev-qt/qtcore-5.9.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.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/kidletime-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/kwallet-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlrpcclient-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 X? ( >=dev-qt/qtx11extras-5.9.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/drkonqi-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c07644b27d4d067ee43904f56d845643
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.12.7 b/metadata/md5-cache/kde-plasma/drkonqi-5.12.7
index 653db5aba92c..c6ba19c4b95f 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.12.7
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/drkonqi-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=89bd870e1df9ea5dd1e7d719ff0a1529
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.13.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.13.5
index 55b1936a8c5a..ae12aa8dd3b0 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.13.5
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.13.5
@@ -4,10 +4,10 @@ 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
+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.5/drkonqi-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9e2c7f630747e5e7d1a55a324f24fe66
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=30ff2ee3f3f6858390e8465a45db526b
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.14.1 b/metadata/md5-cache/kde-plasma/drkonqi-5.14.1
new file mode 100644
index 000000000000..33b9ba2b75dc
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlrpcclient-5.50.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.50.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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlrpcclient-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/drkonqi-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=89bd870e1df9ea5dd1e7d719ff0a1529
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.5
deleted file mode 100644
index a9cc026867bf..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.5
+++ /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/kglobalaccel-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/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/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/boost-1.54 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=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.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/kio-5.43.0:5 >=kde-frameworks/kservice-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/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kactivitymanagerd-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=db4e1b708667a97efa911ea2215940ca
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.7 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.7
index 7c326f22bc5e..6a455ee869a9 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.7
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=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/plasma/5.12.7/kactivitymanagerd-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2144ae99ab93b23392929f60275edb39
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.5
index 03d49a26384b..c032028cb108 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=System service to manage user's activities, track the usage patterns
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+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.5/kactivitymanagerd-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2c84087786f761af2f2f91291fef6658
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=43a2537f951274ea25b6ebcf6c27bea9
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.1 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.1
new file mode 100644
index 000000000000..871dd0965140
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.50.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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kactivitymanagerd-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b8cc09e9a044dd8b8207385fec579691
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.5
deleted file mode 100644
index b4bc4ecc87e2..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.5
+++ /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/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/kservice-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/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 kdesu? ( >=kde-frameworks/kdesu-5.43.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.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.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=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.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/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/kwindowsystem-5.43.0:5 >=dev-qt/qtdbus-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 kdesu? ( >=kde-frameworks/kdesu-5.43.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kde-cli-tools-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=16b13ee80d26dc9ab37032498e8543ea
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.7 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.7
index d89cf3868334..287f7325545d 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kde-cli-tools-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9342719b33bce9a1edc9e0999154c3a2
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.5
index 82c55c0061f5..6fb8ce879dc1 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.5
@@ -4,11 +4,11 @@ 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
+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.5: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.5/kde-cli-tools-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7766ef7426560bed48a8528cda42b03a
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4c2263b71058303a8ea60834080babcd
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.1
new file mode 100644
index 000000000000..a426917467c7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-plasma/plasma-workspace-5.14.1: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.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-plasma/plasma-workspace-5.14.1: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.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kde-cli-tools-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=69f660f095e69f0aa7a760a538dcac5d
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.5
deleted file mode 100644
index 2517e0c03d5b..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.5
+++ /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/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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.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 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.43.0:5 >=kde-frameworks/kcmutils-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.12.5:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kde-gtk-config-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=40cbec3293e4696bc9f967ce8fa4f87b
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.7 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.7
index 3e4759c1d1b5..80eefabe4bf3 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.12.7: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kde-gtk-config-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a91d3e260e0d8f0ec5c728efbdd3714e
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.5
index f59380e827d5..54114018efb7 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.5
@@ -4,10 +4,10 @@ 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
+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.5: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.5/kde-gtk-config-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4615265b593490c44a10248e0671c5f0
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8d3581bc4127a9a3e65a23e56beca8b1
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.1 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.1
new file mode 100644
index 000000000000..fa599da319e9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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.50.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.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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.14.1:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kde-gtk-config-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a91d3e260e0d8f0ec5c728efbdd3714e
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.12.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.12.5
deleted file mode 100644
index 93a699856baf..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.12.5
+++ /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 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=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=>=dev-qt/qtgui-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kdecoration-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=aab77c3ffff40121280f802e90db8890
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.12.7 b/metadata/md5-cache/kde-plasma/kdecoration-5.12.7
index 44c82dbdb480..1fe28a79b9c5 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.12.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-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/plasma/5.12.7/kdecoration-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7006fc79ad4182a0178ffa89a77544df
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.13.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.13.5
index 9f72d687f3d3..da319f078f9c 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=Plugin based library to create window decorations
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+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.5/kdecoration-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1f930e6e4a11e943d9c208acbe1d17d0
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7f0aec1217bd15b32de4e262d875842f
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.14.1 b/metadata/md5-cache/kde-plasma/kdecoration-5.14.1
new file mode 100644
index 000000000000..c093aa17d9e4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.50.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.50.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.50.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kdecoration-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=94360e2407eb22a96a0e597498495b84
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.5
deleted file mode 100644
index 7bc8c6a94eb0..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.5
+++ /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/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-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/kiconthemes-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/kpackage-5.43.0:5 >=kde-frameworks/kross-5.43.0:5 >=kde-frameworks/krunner-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kunitconversion-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 >=kde-frameworks/sonnet-5.43.0:5 >=kde-plasma/plasma-workspace-5.12.5: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 >=dev-qt/qtx11extras-5.9.1:5 dictionary? ( >=dev-qt/qtwebengine-5.9.1: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 >=dev-qt/qtcore-5.9.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=dictionary share debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-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/kiconthemes-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/kpackage-5.43.0:5 >=kde-frameworks/kross-5.43.0:5 >=kde-frameworks/krunner-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kunitconversion-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 >=kde-frameworks/sonnet-5.43.0:5 >=kde-plasma/plasma-workspace-5.12.5: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 >=dev-qt/qtx11extras-5.9.1:5 dictionary? ( >=dev-qt/qtwebengine-5.9.1:5 ) share? ( >=kde-frameworks/purpose-5.43.0:5 ) >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kdeplasma-addons-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=19457b37b0783b70518af49e76aa924c
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.7 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.7
index 44bb1cc0c518..5dcffdf4afa7 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=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/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/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 >=kde-plasma/plasma-workspace-5.12.7:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 dictionary? ( >=dev-qt/qtwebengine-5.9.4:5 ) share? ( >=kde-frameworks/purpose-5.46.0:5 ) >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kdeplasma-addons-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a66a7845f77518771846229cab5cf477
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.5
index 865e8c065e08..df31cc370a47 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=Extra Plasma applets and engines
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=share webengine debug
-KEYWORDS=~amd64 ~arm ~x86
+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.5: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.5/kdeplasma-addons-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=643b80ca8bc9361c1adeeb577c8559d1
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=eb0cab385259613b80431ca832bf2c19
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.1
new file mode 100644
index 000000000000..9eadd85b8636
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kunitconversion-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/sonnet-5.50.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.50.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.50.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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kholidays-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kunitconversion-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/sonnet-5.50.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.50.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.14.1: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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kdeplasma-addons-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0edd6196cfd7cda858b7d9adfb4ea9ad
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.12.5 b/metadata/md5-cache/kde-plasma/kgamma-5.12.5
deleted file mode 100644
index 096e7d97517c..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.12.5
+++ /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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.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 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.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kgamma5-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b13631215f57c745ce1b36299aed31a1
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.12.7 b/metadata/md5-cache/kde-plasma/kgamma-5.12.7
index 7e630bb8a616..caf059a4f681 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kgamma5-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1bd4cddad05e1cdc13efaf4808f9ff64
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.13.5 b/metadata/md5-cache/kde-plasma/kgamma-5.13.5
index 2494b7d598b3..40d855b80197 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=Screen gamma values kcontrol module
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+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.5/kgamma5-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=71795ef780600c9b60f785d8c08261e7
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c2826ece0ecda44de13340606da2a917
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.14.1 b/metadata/md5-cache/kde-plasma/kgamma-5.14.1
new file mode 100644
index 000000000000..fc3e24a625d2
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kgamma5-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1bd4cddad05e1cdc13efaf4808f9ff64
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.12.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.12.5
deleted file mode 100644
index 0c64650408f6..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.12.5
+++ /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/kdelibs4support-5.43.0:5[X] >=kde-frameworks/kglobalaccel-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/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.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.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 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.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[X] >=kde-frameworks/kglobalaccel-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/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.43.0:5 >=kde-plasma/kde-cli-tools-5.12.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/khotkeys-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f5b571df6c386a30824c46b204fc7435
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.12.7 b/metadata/md5-cache/kde-plasma/khotkeys-5.12.7
index 26dc44de492b..7a953d7a39e7 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.12.7
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.12.7
@@ -9,5 +9,5 @@ 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.12.7:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.46.0:5 >=kde-plasma/kde-cli-tools-5.12.7: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/khotkeys-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21cc54934e83a2b665aaa9f2438e6052
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.13.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.13.5
index 93eda0c14a58..65467170d2dd 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.13.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma workspace hotkey module
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+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.5: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.5: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.5/khotkeys-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6904c3c4af1d547e44c11ad829adad24
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1a0ccc09e140fa0079696febbf8d09f1
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.14.1 b/metadata/md5-cache/kde-plasma/khotkeys-5.14.1
new file mode 100644
index 000000000000..2e7042fe47cd
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5[X] >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-plasma/plasma-workspace-5.14.1: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5[X] >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-plasma/plasma-workspace-5.14.1: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.50.0:5 >=kde-plasma/kde-cli-tools-5.14.1:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/khotkeys-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=21cc54934e83a2b665aaa9f2438e6052
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.12.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.12.5
deleted file mode 100644
index 61b3586c5a10..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.12.5
+++ /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/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/kpackage-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/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 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.43.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-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=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.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/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kpackage-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/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 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.43.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.12.5:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kinfocenter-5.12.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cdf9f040290d1c7e1c39ba7f5b2509ed
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.12.7 b/metadata/md5-cache/kde-plasma/kinfocenter-5.12.7
index bf27ea1122f3..995c9815c455 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.12.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5
 REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kinfocenter-5.12.7.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=55854594338769a9ea82a98712aa8d74
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.13.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.13.5
index 70bc0768d942..5ed7108362b1 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.13.5
@@ -4,11 +4,11 @@ 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
+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.5: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.5/kinfocenter-5.13.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8c8ba906da974d727243c54ca4ffe47a
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f9d20cbf7a3209e4ebaf75778ef5db72
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.1 b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.1
new file mode 100644
index 000000000000..34adb8c7a903
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.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.50.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.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.50.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.14.1:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.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.14.1/kinfocenter-5.14.1.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=55854594338769a9ea82a98712aa8d74
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.12.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.12.5
deleted file mode 100644
index e43d8794aaef..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.12.5
+++ /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/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/kservice-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/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.12.5: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 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.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/kservice-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/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.12.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kmenuedit-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6617550733a123aac522d0254479c841
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.12.7 b/metadata/md5-cache/kde-plasma/kmenuedit-5.12.7
index a40f262d724a..e36533746d6e 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 hotkeys? ( >=kde-plasma/khotkeys-5.12.7: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kmenuedit-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=215bcc79279a41801e2079a2f53e7f4e
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.13.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.13.5
index a159378328ab..2734fad1892e 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma menu editor
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kmenuedit.git
 IUSE=+hotkeys debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+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.5: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.5/kmenuedit-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=79dd695df3d092cb71cb68fa0a40922e
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=790d037398920848bdd327302f1babeb
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.14.1 b/metadata/md5-cache/kde-plasma/kmenuedit-5.14.1
new file mode 100644
index 000000000000..55114a7b45b4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.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.14.1:5 ) >=kde-frameworks/kinit-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.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.14.1:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kmenuedit-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=01c93b30a0501457a0b8f2c0b3eace29
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.12.5 b/metadata/md5-cache/kde-plasma/kscreen-5.12.5
deleted file mode 100644
index 19e76194e22e..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.12.5
+++ /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/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/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-plasma/libkscreen-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=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 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.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/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-plasma/libkscreen-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/plasma-5.43.0:5 >=kde-plasma/kde-cli-tools-5.12.5:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kscreen-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e2413296a59f74df58cdae68e3572593
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.12.7 b/metadata/md5-cache/kde-plasma/kscreen-5.12.7
index 50aea92efec3..b7769fb4ff92 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.12.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kscreen-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ccf6eeb890e6b9138ab9cfc949787ea4
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.13.5 b/metadata/md5-cache/kde-plasma/kscreen-5.13.5
index 81fc7746b576..fd0664eebde9 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.13.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE Plasma screen management
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kscreen.git
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
+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.5: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.5: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.5/kscreen-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=115ed4bc0c1b07387834e50e1c40a24a
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f5fb705bf4a7112c6e638806753e215e
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.14.1 b/metadata/md5-cache/kde-plasma/kscreen-5.14.1
new file mode 100644
index 000000000000..dbf5f658f594
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-plasma/libkscreen-5.14.1: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.50.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.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-plasma/libkscreen-5.14.1: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.14.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kscreen-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ecac89479ea101cc1b7cda83445f4a40
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.5
deleted file mode 100644
index 01c36ad73424..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.5
+++ /dev/null
@@ -1,15 +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/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kidletime-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kpackage-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwayland-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/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/qtx11extras-5.9.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.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 and components for secure lock screen architecture
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=consolekit +pam seccomp test debug test
-KEYWORDS=amd64 ~arm ~arm64 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/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kidletime-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kpackage-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwayland-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/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/qtx11extras-5.9.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/kde-cli-tools-5.12.5:5 !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=seccomp? ( pam )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kscreenlocker-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=806fe8fa47db64e2eac180b2ddd9591e
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.7 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.7
index cf0fa3b74e91..7f16a04befb0 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.7
@@ -11,5 +11,5 @@ REQUIRED_USE=seccomp? ( pam )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kscreenlocker-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be35fa6fda5b756ca24010777300dd1b
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.5
index 725f06ab85d0..93c5e89db66d 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.5
@@ -4,7 +4,7 @@ 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
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.13.5: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
@@ -12,5 +12,5 @@ REQUIRED_USE=seccomp? ( pam )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.13.5/kscreenlocker-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=88661cc25861daf2570bc8defeeb0fb8
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7f68532172195d2ef30979a1c6de52fa
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.1
new file mode 100644
index 000000000000..19abc0173d92
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.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.50.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.14.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.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.50.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.14.1/kscreenlocker-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e55f2379eacce4847143a6673f097513
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.5
deleted file mode 100644
index 958e6140aed9..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.5
+++ /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/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0: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 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.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/ksshaskpass-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=31619acf3c12cb57e0fd19a46e6f5f24
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.7 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.7
index 0d55b74b5f26..7918deacb5fb 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.7
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.7
@@ -9,5 +9,5 @@ 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.9.4: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/ksshaskpass-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=57696c74fca0a1cdd34dd7bb780a2f04
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.5
index 234e212be4de..e22eb6ba70ca 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+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.5/ksshaskpass-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=49a7fbc618003d798a48ed7a5583f88a
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b2cab7d5e3a16f8fb552673402e7520f
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.1
new file mode 100644
index 000000000000..2fa51d9f48c8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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.50.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.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/ksshaskpass-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=57696c74fca0a1cdd34dd7bb780a2f04
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.12.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.12.5
deleted file mode 100644
index 4d4dcc29f757..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.12.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.12.5:5[-minimal(-)] >=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/kinit-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/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 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.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=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.12.5:5[-minimal(-)] >=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/kinit-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/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 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/ksysguard-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=45ea5552819c9153b10478fa669f4f2c
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.12.7 b/metadata/md5-cache/kde-plasma/ksysguard-5.12.7
index 6f6f82eec570..456c32e42643 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.12.7
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.12.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-plasma/libksysguard-5.12.7: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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/ksysguard-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=227517199b7033dec01ff9ae8d331a62
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.13.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.13.5
index fafeaa0633f8..23ab66c3bc28 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.13.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.13.5
@@ -4,10 +4,10 @@ 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
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-plasma/libksysguard-5.13.5: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.5/ksysguard-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=422e45360735caf62d25b7cc991f0c4b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2e324500741b0e00a925f53ada4bc4e2
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.14.1 b/metadata/md5-cache/kde-plasma/ksysguard-5.14.1
new file mode 100644
index 000000000000..4b8b56c014f2
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-plasma/libksysguard-5.14.1:5[-minimal(-)] >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.14.1:5[-minimal(-)] >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/ksysguard-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=227517199b7033dec01ff9ae8d331a62
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.5-r1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.5-r1
deleted file mode 100644
index a72e0a461de0..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.5-r1
+++ /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.43.0:5 >=dev-qt/qtcore-5.9.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.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kwallet-pam-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1d9982904eb8e444f3e811aab45775f8
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.7 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.7
index bfda03cc2cb3..a2bc1810bbba 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kwallet-pam-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a169502c6b7ab2f5254431b880bde23a
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.5
index b2eca6890c41..2c0940c4c434 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=KWallet PAM module to not enter password again
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+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.5/kwallet-pam-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=08268d68786c887fb10c1371dbf55a14
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=821a97e560f8126eedd1b35e6902f0ed
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.1
new file mode 100644
index 000000000000..ea62d8ce5122
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.1
@@ -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.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kwallet-pam-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a169502c6b7ab2f5254431b880bde23a
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.5
deleted file mode 100644
index 5b62e376c2dc..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwindowsystem-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=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.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwindowsystem-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:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kwayland-integration-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e7bb1cd9e7a6b418f4a9a9be42962296
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.7 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.7
index 640f4317f233..ffd3ee1fe536 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtwidgets-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/plasma/5.12.7/kwayland-integration-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ec072a27769087ee7937af46e4f0c797
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.5
index a67bea34711f..2f827bdfb627 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.5
@@ -4,10 +4,10 @@ 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
+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.5/kwayland-integration-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b16aa1be100a377eab4994c0259dfc82
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4693b62f1505d33365b156ff3fcd4f84
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.1 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.1
new file mode 100644
index 000000000000..7d0cdecb3987
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.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.50.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=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kwayland-integration-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f068988de26cca5d5425947f6a66ca1a
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.12.5 b/metadata/md5-cache/kde-plasma/kwin-5.12.5
deleted file mode 100644
index 0bae037dff33..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.12.5
+++ /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/kauth-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/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-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/kidletime-5.43.0:5= >=kde-frameworks/kinit-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/kpackage-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5[X] >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=kde-plasma/breeze-5.12.5:5 >=kde-plasma/kdecoration-5.12.5:5 >=kde-plasma/kscreenlocker-5.12.5: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/qtscript-5.9.1:5 >=dev-qt/qtsensors-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-libs/libinput-1.5 >=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.9.1:5 >=dev-qt/qtconcurrent-5.9.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.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 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+
-RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kauth-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/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-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/kidletime-5.43.0:5= >=kde-frameworks/kinit-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/kpackage-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwayland-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5[X] >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=kde-plasma/breeze-5.12.5:5 >=kde-plasma/kdecoration-5.12.5:5 >=kde-plasma/kscreenlocker-5.12.5: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/qtscript-5.9.1:5 >=dev-qt/qtsensors-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-libs/libinput-1.5 >=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 ) >=kde-plasma/kde-cli-tools-5.12.5:5 >=dev-qt/qtvirtualkeyboard-5.9.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[gstreamer,qml] ) !<kde-apps/kdeartwork-meta-15.08.3-r1:4 !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kwin-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=505bbffa40fbfebd44494664efcf025e
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.12.7 b/metadata/md5-cache/kde-plasma/kwin-5.12.7
index bf28f5078ee5..012edfdeba9e 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kwin-5.12.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kwin-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=57f182979727edc535e2deb132a5a9e6
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.13.5 b/metadata/md5-cache/kde-plasma/kwin-5.13.5
index b3bb2c8cf49c..455539a1645b 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.13.5
@@ -4,12 +4,12 @@ DESCRIPTION=KDE window manager
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=caps gles2 multimedia test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 PDEPEND=>=kde-plasma/kde-cli-tools-5.13.5: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.5:5 >=kde-plasma/kdecoration-5.13.5:5 >=kde-plasma/kscreenlocker-5.13.5: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/qtquickcontrols-5.11.1:5 >=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.5/kwin-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=05365068d1c0e091e2e54b097683f007
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bb5b0022a1d6d10d40994bc5c0368f63
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.14.1 b/metadata/md5-cache/kde-plasma/kwin-5.14.1
new file mode 100644
index 000000000000..2ed6570cf65b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.14.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5= >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5= >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5[X] >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-plasma/breeze-5.14.1:5 >=kde-plasma/kdecoration-5.14.1:5 >=kde-plasma/kscreenlocker-5.14.1: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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.14.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5= >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5= >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5[X] >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-plasma/breeze-5.14.1:5 >=kde-plasma/kdecoration-5.14.1:5 >=kde-plasma/kscreenlocker-5.14.1: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/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kwin-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f88140cb24eee302bc483ccc0a12b516
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.12.5 b/metadata/md5-cache/kde-plasma/kwrited-5.12.5
deleted file mode 100644
index 523f6187471b..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.12.5
+++ /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/knotifications-5.43.0:5 >=kde-frameworks/kpty-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 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.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/kpty-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/kwrited-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ed82477d1cdd353e2ad526c30a010065
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.12.7 b/metadata/md5-cache/kde-plasma/kwrited-5.12.7
index 3149f7527175..804d15a4747c 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.12.7
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/kwrited-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c5c671b1578c36220d2ba1b007f536e2
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.13.5 b/metadata/md5-cache/kde-plasma/kwrited-5.13.5
index aebcd7a2a080..f1ecaf91d278 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma daemon listening for wall and write messages
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+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.5/kwrited-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=941469a5fbde947061e37aea560400cf
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e956e498b17186cd7fdb98821c040d57
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.14.1 b/metadata/md5-cache/kde-plasma/kwrited-5.14.1
new file mode 100644
index 000000000000..5f26b0e15cc5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kpty-5.50.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.50.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.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kpty-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/kwrited-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c5c671b1578c36220d2ba1b007f536e2
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.12.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.12.5
deleted file mode 100644
index 5c434bd23818..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.12.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwayland-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtx11extras-5.9.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.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 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.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.12.5/libkscreen-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c9e7fee8180322de70d92539eae13df4
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.12.7 b/metadata/md5-cache/kde-plasma/libkscreen-5.12.7
index 37ece31196d7..0dae7475c359 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.12.7
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.12.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kwayland-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.12.7/libkscreen-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b456e5ab4332a9077d65053a1ee2ce4d
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.13.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.13.5
index 199cca730245..67d51bb8bb27 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.13.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.13.5
@@ -4,11 +4,11 @@ DESCRIPTION=Plasma screen management library
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+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.5/libkscreen-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0cbd0b147bc072fa9c56d5e7406a806d
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3bf92c466aca5fec53e04a146015521a
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.14.1 b/metadata/md5-cache/kde-plasma/libkscreen-5.14.1
new file mode 100644
index 000000000000..4a5aff90a5bf
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwayland-5.50.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.50.0:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-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 doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kwayland-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.14.1/libkscreen-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=633396aabb517472b527a9aaab23656f
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.12.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.12.5
deleted file mode 100644
index 1c331ae50f5b..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.12.5
+++ /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/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 >=kde-frameworks/kwindowsystem-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 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.43.0:5 !minimal? ( >=kde-frameworks/plasma-5.43.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.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=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.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/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/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/libksysguard-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=565380e5ef021326cb08e7b5268b4e0d
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.12.7 b/metadata/md5-cache/kde-plasma/libksysguard-5.12.7
index bbd8b91a09b5..b4c6ebe7017b 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.12.7
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.9.4: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/libksysguard-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d6cb363ea9fb8418b1a10c4cddd75296
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.13.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.13.5
index 5aa17f0d4f93..beeefbdbad3f 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.13.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.13.5
@@ -4,10 +4,10 @@ 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
+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.5/libksysguard-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d1df790fea6be84d5725f1b6abfa61d8
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8e0f6456abdcdf8c0553ba0ca24b3a97
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.14.1 b/metadata/md5-cache/kde-plasma/libksysguard-5.14.1
new file mode 100644
index 000000000000..a286edd94dd1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.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.50.0:5 !minimal? ( >=kde-frameworks/plasma-5.50.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.50.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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/libksysguard-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d6cb363ea9fb8418b1a10c4cddd75296
diff --git a/metadata/md5-cache/kde-plasma/milou-5.12.5 b/metadata/md5-cache/kde-plasma/milou-5.12.5
deleted file mode 100644
index d149196308eb..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.12.5
+++ /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/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/krunner-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/plasma-5.43.0: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 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=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.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/krunner-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/milou-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c50c8b558dc61e9da3e37452ca3c9d98
diff --git a/metadata/md5-cache/kde-plasma/milou-5.12.7 b/metadata/md5-cache/kde-plasma/milou-5.12.7
index 6ee44b4b9fc9..e5d785e5b0ee 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.12.7
+++ b/metadata/md5-cache/kde-plasma/milou-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/milou-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d48acb23864c1c6c957d0880103358f5
diff --git a/metadata/md5-cache/kde-plasma/milou-5.13.5 b/metadata/md5-cache/kde-plasma/milou-5.13.5
index 367e02adcb9e..ea4a24998d8c 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.13.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.13.5
@@ -4,10 +4,10 @@ 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
+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.5/milou-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=71cb10636550c1dd4c981ad9f34d9512
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0cbdce19d8ad308d78a3eb4256f915b9
diff --git a/metadata/md5-cache/kde-plasma/milou-5.14.1 b/metadata/md5-cache/kde-plasma/milou-5.14.1
new file mode 100644
index 000000000000..a89168e27285
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/plasma-5.50.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.50.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.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/plasma-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/milou-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d48acb23864c1c6c957d0880103358f5
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.12.5 b/metadata/md5-cache/kde-plasma/oxygen-5.12.5
deleted file mode 100644
index f021b5394727..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.12.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-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/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-plasma/kdecoration-5.12.5: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 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.43.0:5 ) >=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=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.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/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-plasma/kdecoration-5.12.5: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 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.43.0:5 ) >=kde-plasma/kde-cli-tools-5.12.5:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/oxygen-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7a060171890f90538b6c4f476b98310d
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.12.7 b/metadata/md5-cache/kde-plasma/oxygen-5.12.7
index 37f0b113f504..efc2d655cf80 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.12.7
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.12.7
@@ -9,5 +9,5 @@ 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.12.7:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) >=kde-plasma/kde-cli-tools-5.12.7: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/oxygen-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=29b549706562609aa5fa4e053f6dc80d
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.13.5-r1 b/metadata/md5-cache/kde-plasma/oxygen-5.13.5-r1
index 919ff7b64d7a..a9eb54317c62 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.13.5-r1
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.13.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Oxygen visual style for the Plasma desktop
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/oxygen.git
 IUSE=wayland debug
-KEYWORDS=~amd64 ~arm ~x86
+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.5: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.5: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.5/oxygen-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=66c1cf17ec408e46d80070f921fadb55
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4235c6065627d57d3f5f8db4767de606
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.14.1 b/metadata/md5-cache/kde-plasma/oxygen-5.14.1
new file mode 100644
index 000000000000..2e152c1b7b8e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-plasma/kdecoration-5.14.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/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.50.0:5 ) >=kde-frameworks/kservice-5.50.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.50.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.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-plasma/kdecoration-5.14.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/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.50.0:5 ) >=kde-plasma/kde-cli-tools-5.14.1:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/oxygen-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=29b549706562609aa5fa4e053f6dc80d
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.5
index d30ba2a5d301..c75dc7209268 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensio
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+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.5/plasma-browser-integration-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5ba4283e4817210af2858a2ff7992a5c
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c92cf829701d74d47d7a62f2ab00ee16
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.1 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.1
new file mode 100644
index 000000000000..ee69b0c6921d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.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.50.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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/plasma-browser-integration-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=986e4c0c8e7ca2f056d4bd424b4dc29a
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.5-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.5-r1
deleted file mode 100644
index ad38aa009759..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.43.0:5 >=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kactivities-stats-5.43.0:5 >=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kauth-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/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kded-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kemoticons-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/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/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpeople-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 >=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 >=kde-frameworks/solid-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-plasma/kwin-5.12.5:5 >=kde-plasma/plasma-workspace-5.12.5: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/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/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.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.43.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.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 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.43.0:5 >=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kactivities-stats-5.43.0:5 >=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kauth-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/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kded-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kemoticons-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/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/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpeople-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 >=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 >=kde-frameworks/solid-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-plasma/kwin-5.12.5:5 >=kde-plasma/plasma-workspace-5.12.5: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/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/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.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.43.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.43.0:5 >=kde-plasma/breeze-5.12.5:5 >=kde-plasma/kde-cli-tools-5.12.5:5 >=kde-plasma/oxygen-5.12.5:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap pulseaudio? ( >=kde-plasma/plasma-pa-5.12.5: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.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/plasma-desktop-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0130ff13ce6353131dd5aa8ce3c3613d
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.7 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.7
deleted file mode 100644
index 2305fb6abd2d..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.7
+++ /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.12.7:5 >=kde-plasma/plasma-workspace-5.12.7: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/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4: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-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.9.4: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.9.4:5 ) >=dev-qt/qtcore-5.9.4: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.12.7:5 >=kde-plasma/plasma-workspace-5.12.7: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/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4: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-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.9.4: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.12.7:5 >=kde-plasma/kde-cli-tools-5.12.7:5 >=kde-plasma/oxygen-5.12.7:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap pulseaudio? ( >=kde-plasma/plasma-pa-5.12.7: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.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.7/plasma-desktop-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4c1ff7d7c467137331280677594c34e3
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.7-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.7-r1
new file mode 100644
index 000000000000..b9cf390d6cd7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.7-r1
@@ -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.12.7:5 >=kde-plasma/plasma-workspace-5.12.7: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/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4: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-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.9.4: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.9.4:5 ) >=dev-qt/qtcore-5.9.4: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.12.7:5 >=kde-plasma/plasma-workspace-5.12.7: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/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4: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-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.9.4: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.12.7:5 >=kde-plasma/kde-cli-tools-5.12.7:5 >=kde-plasma/oxygen-5.12.7:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 sys-apps/util-linux x11-apps/setxkbmap pulseaudio? ( >=kde-plasma/plasma-pa-5.12.7: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.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.7/plasma-desktop-5.12.7.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=670d93239b6c928466166af0e99f7f05
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5-r2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5-r2
deleted file mode 100644
index da36e12e3815..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5-r2
+++ /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.5:5 >=kde-plasma/plasma-workspace-5.13.5: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.5:5 >=kde-plasma/plasma-workspace-5.13.5: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.5:5 >=kde-plasma/kde-cli-tools-5.13.5:5 >=kde-plasma/oxygen-5.13.5: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.5: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.5/plasma-desktop-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e7974ac9c7fe2a795488944aa294cdd9
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5-r3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5-r3
new file mode 100644
index 000000000000..32ea8ada3a8e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5-r3
@@ -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.5:5 >=kde-plasma/plasma-workspace-5.13.5: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.5:5 >=kde-plasma/plasma-workspace-5.13.5: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.5:5 >=kde-plasma/kde-cli-tools-5.13.5:5 >=kde-plasma/oxygen-5.13.5:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 sys-apps/util-linux x11-apps/setxkbmap pulseaudio? ( >=kde-plasma/plasma-pa-5.13.5: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.5/plasma-desktop-5.13.5.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bab61e9f8579a2f9628efe1616317b0c
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.1
new file mode 100644
index 000000000000..22763dccada0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.50.0:5 >=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kactivities-stats-5.50.0:5 >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kded-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpeople-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-plasma/kwin-5.14.1:5 >=kde-plasma/plasma-workspace-5.14.1: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-0.12.2[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 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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 scim +semantic-desktop touchpad test debug +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/attica-5.50.0:5 >=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kactivities-stats-5.50.0:5 >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kded-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kpeople-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=kde-plasma/kwin-5.14.1:5 >=kde-plasma/plasma-workspace-5.14.1: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-0.12.2[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 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.50.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.50.0:5 >=kde-plasma/breeze-5.14.1:5 >=kde-plasma/kde-cli-tools-5.14.1:5 >=kde-plasma/oxygen-5.14.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 sys-apps/util-linux x11-apps/setxkbmap !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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/plasma-desktop-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=76e99c42a1ee6f81d69b519016d279c8
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.12.5
deleted file mode 100644
index 5327a5c61ea8..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.12.5
+++ /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/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/kwayland-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-plasma/breeze-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.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.43.0:5 >=dev-qt/qtcore-5.9.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.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/knotifications-5.43.0:5 >=kde-frameworks/kwayland-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-plasma/breeze-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/plasma-integration-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ade42b1d683b9d7dcec33db1f67d149d
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.12.7 b/metadata/md5-cache/kde-plasma/plasma-integration-5.12.7
index 38baafc58665..83bff4ec8770 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.12.7
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.12.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/plasma-integration-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=83c605c676641a7925529b63e868f593
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.13.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.13.5
index a76609c27ebc..117683fe1fd5 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.13.5
@@ -4,11 +4,11 @@ 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
+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.5: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.5/plasma-integration-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=49567c5d3af294f6eda67b114d1c7794
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=acabfc6e9fc7e3c4be31611c78d5c0c3
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.14.1 b/metadata/md5-cache/kde-plasma/plasma-integration-5.14.1
new file mode 100644
index 000000000000..8007baaf1770
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-plasma/breeze-5.14.1: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.50.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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-plasma/breeze-5.14.1: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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/plasma-integration-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=83c605c676641a7925529b63e868f593
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.12.5
deleted file mode 100644
index dcf1d1228d21..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.12.5
+++ /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 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.12.5:5 >=kde-plasma/drkonqi-5.12.5:5 >=kde-plasma/kactivitymanagerd-5.12.5:5 >=kde-plasma/kde-cli-tools-5.12.5:5 >=kde-plasma/kdecoration-5.12.5:5 >=kde-plasma/kdeplasma-addons-5.12.5:5 >=kde-plasma/kgamma-5.12.5:5 >=kde-plasma/khotkeys-5.12.5:5 >=kde-plasma/kinfocenter-5.12.5:5 >=kde-plasma/kmenuedit-5.12.5:5 >=kde-plasma/kscreen-5.12.5:5 >=kde-plasma/kscreenlocker-5.12.5:5 >=kde-plasma/ksshaskpass-5.12.5:5 >=kde-plasma/ksysguard-5.12.5:5 >=kde-plasma/kwayland-integration-5.12.5:5 >=kde-plasma/kwin-5.12.5:5 >=kde-plasma/kwrited-5.12.5:5 >=kde-plasma/libkscreen-5.12.5:5 >=kde-plasma/libksysguard-5.12.5:5 >=kde-plasma/milou-5.12.5:5 >=kde-plasma/oxygen-5.12.5:5 >=kde-plasma/plasma-desktop-5.12.5:5 >=kde-plasma/plasma-integration-5.12.5:5 >=kde-plasma/plasma-workspace-5.12.5:5 >=kde-plasma/polkit-kde-agent-5.12.5:5 >=kde-plasma/powerdevil-5.12.5:5 >=kde-plasma/systemsettings-5.12.5:5 >=kde-plasma/user-manager-5.12.5:5 bluetooth? ( >=kde-plasma/bluedevil-5.12.5:5 ) crypt? ( >=kde-plasma/plasma-vault-5.12.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.12.5:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.12.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.12.5:5 >=kde-plasma/kde-gtk-config-5.12.5: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.12.5:5 ) pam? ( >=kde-plasma/kwallet-pam-5.12.5:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.12.5:5 >=kde-plasma/plymouth-kcm-5.12.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.12.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.12.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.12.5:5 )
-REQUIRED_USE=legacy-systray? ( gtk )
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=da48830feda220cf32272c1e6808bdd0
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.12.7 b/metadata/md5-cache/kde-plasma/plasma-meta-5.12.7
index 248c260dc72a..5e4218a410ac 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.12.7
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.12.7
@@ -8,5 +8,5 @@ LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.12.7:5 >=kde-plasma/drkonqi-5.12.7:5 >=kde-plasma/kactivitymanagerd-5.12.7:5 >=kde-plasma/kde-cli-tools-5.12.7:5 >=kde-plasma/kdecoration-5.12.7:5 >=kde-plasma/kdeplasma-addons-5.12.7:5 >=kde-plasma/kgamma-5.12.7:5 >=kde-plasma/khotkeys-5.12.7:5 >=kde-plasma/kinfocenter-5.12.7:5 >=kde-plasma/kmenuedit-5.12.7:5 >=kde-plasma/kscreen-5.12.7:5 >=kde-plasma/kscreenlocker-5.12.7:5 >=kde-plasma/ksshaskpass-5.12.7:5 >=kde-plasma/ksysguard-5.12.7:5 >=kde-plasma/kwayland-integration-5.12.7:5 >=kde-plasma/kwin-5.12.7:5 >=kde-plasma/kwrited-5.12.7:5 >=kde-plasma/libkscreen-5.12.7:5 >=kde-plasma/libksysguard-5.12.7:5 >=kde-plasma/milou-5.12.7:5 >=kde-plasma/oxygen-5.12.7:5 >=kde-plasma/plasma-desktop-5.12.7:5 >=kde-plasma/plasma-integration-5.12.7:5 >=kde-plasma/plasma-workspace-5.12.7:5 >=kde-plasma/polkit-kde-agent-5.12.7:5 >=kde-plasma/powerdevil-5.12.7:5 >=kde-plasma/systemsettings-5.12.7:5 >=kde-plasma/user-manager-5.12.7:5 bluetooth? ( >=kde-plasma/bluedevil-5.12.7:5 ) crypt? ( >=kde-plasma/plasma-vault-5.12.7:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.12.7:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.12.7:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.12.7:5 >=kde-plasma/kde-gtk-config-5.12.7: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.12.7:5 ) pam? ( >=kde-plasma/kwallet-pam-5.12.7:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.12.7:5 >=kde-plasma/plymouth-kcm-5.12.7:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.12.7:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.12.7:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.12.7:5 )
 REQUIRED_USE=legacy-systray? ( gtk )
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e100a238da52fc5829fab575a80791d3
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.13.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.13.5
index 82336f1d1d82..28eba507425b 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.13.5
@@ -3,10 +3,10 @@ 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
+KEYWORDS=amd64 ~arm x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.13.5:5 >=kde-plasma/drkonqi-5.13.5:5 >=kde-plasma/kactivitymanagerd-5.13.5:5 >=kde-plasma/kde-cli-tools-5.13.5:5 >=kde-plasma/kdecoration-5.13.5:5 >=kde-plasma/kdeplasma-addons-5.13.5:5 >=kde-plasma/kgamma-5.13.5:5 >=kde-plasma/khotkeys-5.13.5:5 >=kde-plasma/kinfocenter-5.13.5:5 >=kde-plasma/kmenuedit-5.13.5:5 >=kde-plasma/kscreen-5.13.5:5 >=kde-plasma/kscreenlocker-5.13.5:5 >=kde-plasma/ksshaskpass-5.13.5:5 >=kde-plasma/ksysguard-5.13.5:5 >=kde-plasma/kwayland-integration-5.13.5:5 >=kde-plasma/kwin-5.13.5:5 >=kde-plasma/kwrited-5.13.5:5 >=kde-plasma/libkscreen-5.13.5:5 >=kde-plasma/libksysguard-5.13.5:5 >=kde-plasma/milou-5.13.5:5 >=kde-plasma/oxygen-5.13.5:5 >=kde-plasma/plasma-desktop-5.13.5:5 >=kde-plasma/plasma-integration-5.13.5:5 >=kde-plasma/plasma-workspace-5.13.5:5 >=kde-plasma/polkit-kde-agent-5.13.5:5 >=kde-plasma/powerdevil-5.13.5:5 >=kde-plasma/systemsettings-5.13.5:5 >=kde-plasma/user-manager-5.13.5:5 bluetooth? ( >=kde-plasma/bluedevil-5.13.5:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.13.5:5 ) crypt? ( >=kde-plasma/plasma-vault-5.13.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.13.5:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.13.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.13.5:5 >=kde-plasma/kde-gtk-config-5.13.5: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.5:5 ) pam? ( >=kde-plasma/kwallet-pam-5.13.5:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.13.5:5 >=kde-plasma/plymouth-kcm-5.13.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.13.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.13.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.13.5:5 )
 REQUIRED_USE=legacy-systray? ( gtk )
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	5976508bb4b803af7b28e66822122b26	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=29deb41a52a2338f6aa32aa945599041
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4a9cd5a968eb8224b72f291629a3d59a
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.14.1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.14.1
new file mode 100644
index 000000000000..30870c24a85c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.14.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/plasma-desktop
+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.14.1:5 >=kde-plasma/drkonqi-5.14.1:5 >=kde-plasma/kactivitymanagerd-5.14.1:5 >=kde-plasma/kde-cli-tools-5.14.1:5 >=kde-plasma/kdecoration-5.14.1:5 >=kde-plasma/kdeplasma-addons-5.14.1:5 >=kde-plasma/kgamma-5.14.1:5 >=kde-plasma/khotkeys-5.14.1:5 >=kde-plasma/kinfocenter-5.14.1:5 >=kde-plasma/kmenuedit-5.14.1:5 >=kde-plasma/kscreen-5.14.1:5 >=kde-plasma/kscreenlocker-5.14.1:5 >=kde-plasma/ksshaskpass-5.14.1:5 >=kde-plasma/ksysguard-5.14.1:5 >=kde-plasma/kwayland-integration-5.14.1:5 >=kde-plasma/kwin-5.14.1:5 >=kde-plasma/kwrited-5.14.1:5 >=kde-plasma/libkscreen-5.14.1:5 >=kde-plasma/libksysguard-5.14.1:5 >=kde-plasma/milou-5.14.1:5 >=kde-plasma/oxygen-5.14.1:5 >=kde-plasma/plasma-desktop-5.14.1:5 >=kde-plasma/plasma-integration-5.14.1:5 >=kde-plasma/plasma-workspace-5.14.1:5 >=kde-plasma/polkit-kde-agent-5.14.1:5 >=kde-plasma/powerdevil-5.14.1:5 >=kde-plasma/systemsettings-5.14.1:5 >=kde-plasma/user-manager-5.14.1:5 bluetooth? ( >=kde-plasma/bluedevil-5.14.1:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.14.1:5 ) crypt? ( >=kde-plasma/plasma-vault-5.14.1:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.14.1:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.14.1:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.14.1:5 >=kde-plasma/kde-gtk-config-5.14.1:5 legacy-systray? ( dev-libs/libappindicator:3 dev-libs/libappindicator:2 ) ) handbook? ( >=kde-apps/khelpcenter-18.04.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.14.1:5 ) pam? ( >=kde-plasma/kwallet-pam-5.14.1:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.14.1:5 >=kde-plasma/plymouth-kcm-5.14.1:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.14.1:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.14.1:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.14.1:5 )
+REQUIRED_USE=legacy-systray? ( gtk )
+SLOT=5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e5cc2520aae6b020f9b66a8ec6fb5596
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.12.5
deleted file mode 100644
index f8bb5ef20c03..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.12.5
+++ /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/kdeclarative-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/kservice-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/networkmanager-qt-5.43.0:5[teamd=] >=kde-frameworks/plasma-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 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.43.0:5 >=dev-qt/qtxml-5.9.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.9.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.43.0:5 >=dev-qt/qtcore-5.9.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.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/kdeclarative-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/kservice-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/networkmanager-qt-5.43.0:5[teamd=] >=kde-frameworks/plasma-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 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.43.0:5 >=dev-qt/qtxml-5.9.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.9.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.12.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/plasma-nm-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=918d528afeddc07e590c6b885731b4fb
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.12.7 b/metadata/md5-cache/kde-plasma/plasma-nm-5.12.7
index 82bcfeef0050..db7067d8f4fa 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.12.7
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.9.4:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.9.4:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.12.7: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/plasma-nm-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8c0a40a25295b3c694b0c6b488133a3
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.13.5-r1 b/metadata/md5-cache/kde-plasma/plasma-nm-5.13.5-r1
index e17919971536..6aa5e76eefda 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.13.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.13.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
-KEYWORDS=~amd64 ~arm ~x86
+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.5: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.5/plasma-nm-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=54c626806a82a8a7a9876c7aa91257da
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=953afa8711303093cf418a4e01169d39
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.14.1 b/metadata/md5-cache/kde-plasma/plasma-nm-5.14.1
new file mode 100644
index 000000000000..9e45b02b23ae
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/networkmanager-qt-5.50.0:5[teamd=] >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/solid-5.50.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.50.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.50.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.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/networkmanager-qt-5.50.0:5[teamd=] >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/solid-5.50.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.50.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.14.1:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/plasma-nm-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ea57f22e55761d17b1bbefa6c4800acc
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.12.5
deleted file mode 100644
index 560464bd9129..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.12.5
+++ /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/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-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/qtwidgets-5.9.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.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 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.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-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/qtwidgets-5.9.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.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/plasma-pa-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1e318bf2bf2808f3569edb5d75c8624e
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.12.7 b/metadata/md5-cache/kde-plasma/plasma-pa-5.12.7
index 08a1a2c9ee7e..d58d15e7c4dc 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.12.7
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/plasma-pa-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86b9673b1e15efc0adc4f77ab6569018
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.13.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.13.5
index bfaa99e23bfb..92dbfca24366 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=Plasma applet for audio volume management using PulseAudio
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+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.5/plasma-pa-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=986ec51422ba10c20a205fd16660f794
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b6a6dd992491c2d52293de85055d635d
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.14.1 b/metadata/md5-cache/kde-plasma/plasma-pa-5.14.1
new file mode 100644
index 000000000000..2c4e9e8228b3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/plasma-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/plasma-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/plasma-pa-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8c5af4161057396a6d81a2658c2d57f1
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.5
deleted file mode 100644
index 2bbf01a16b94..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.5
+++ /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/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/kpackage-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/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/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=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.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/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/kpackage-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/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/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.43.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/plasma-sdk-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=53ae8643a5c3981b29790e0d33dec3f0
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.7 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.7
index 816d959a5fa1..f33e5b45f8b8 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.7
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtdeclarative-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 !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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/plasma-sdk-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4be6b9e0ded434dfb6aac01b3b8b2ecc
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.5
index 5d5091c25b90..af532b1075d7 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=Useful applications for Plasma development
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
+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.5/plasma-sdk-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1912402c18a065c9290e91bbcae8aa35
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=96dc08b4e8e334caf9d58e6e931a905d
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.1 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.1
new file mode 100644
index 000000000000..d111ebd39c99
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/plasma-5.50.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.50.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.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/plasma-5.50.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.50.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/plasma-sdk-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4be6b9e0ded434dfb6aac01b3b8b2ecc
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.12.5
deleted file mode 100644
index bb99e2c7d4db..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.12.5
+++ /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/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/plasma-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-plasma/libksysguard-5.12.5: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 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=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=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kactivities-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/kio-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-plasma/libksysguard-5.12.5: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 || ( >=sys-fs/encfs-1.9.2 sys-fs/cryfs ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/plasma-vault-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5f66bd02bc2e8d3786bb5db22f2061af
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.12.7 b/metadata/md5-cache/kde-plasma/plasma-vault-5.12.7
index 33cd0b071620..ecc6c39e9a34 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.12.7
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.12.7
@@ -9,5 +9,5 @@ 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.12.7:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 || ( >=sys-fs/encfs-1.9.2 sys-fs/cryfs ) >=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/plasma/5.12.7/plasma-vault-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1a4345cd4fbe1cc8ab1ea09ee11fd1b
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.13.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.13.5
index bf6d144a05e0..efb5940edd08 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.13.5
@@ -4,10 +4,10 @@ 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
+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.5: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.5/plasma-vault-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=51140a239b643c5b7478c7d671ec9a8f
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f0055b813ba9c6d078adf3f99c43f0d7
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.14.1 b/metadata/md5-cache/kde-plasma/plasma-vault-5.14.1
new file mode 100644
index 000000000000..d7bdfae93b45
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-plasma/libksysguard-5.14.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/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.50.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.50.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.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-plasma/libksysguard-5.14.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/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.50.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/plasma-vault-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d4da43d0c72e132d8c3bf55b3ddddbde
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.5
deleted file mode 100644
index ecc367439273..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.5
+++ /dev/null
@@ -1,15 +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/kauth-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/kdeclarative-5.43.0:5 >=kde-frameworks/kdelibs4support-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/kidletime-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/kjs-5.43.0:5 >=kde-frameworks/kjsembed-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/kpackage-5.43.0:5 >=kde-frameworks/krunner-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/kwallet-5.43.0:5 >=kde-frameworks/kwayland-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 >=kde-frameworks/solid-5.43.0:5 >=kde-plasma/kscreenlocker-5.12.5:5 >=kde-plasma/kwin-5.12.5:5 >=kde-plasma/libksysguard-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5[jpeg] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtscript-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 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.43.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.43.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.43.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.43.0:5 ) >=dev-qt/qtconcurrent-5.9.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.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 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
-RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kauth-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/kdeclarative-5.43.0:5 >=kde-frameworks/kdelibs4support-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/kidletime-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/kjs-5.43.0:5 >=kde-frameworks/kjsembed-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/kpackage-5.43.0:5 >=kde-frameworks/krunner-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/kwallet-5.43.0:5 >=kde-frameworks/kwayland-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 >=kde-frameworks/solid-5.43.0:5 >=kde-plasma/kscreenlocker-5.12.5:5 >=kde-plasma/kwin-5.12.5:5 >=kde-plasma/libksysguard-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5[jpeg] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtscript-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 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.43.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.43.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.43.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.43.0:5 ) >=kde-frameworks/kded-5.43.0:5 >=kde-frameworks/kdesu-5.43.0:5 >=kde-apps/kio-extras-17.12.3:5 >=kde-plasma/kde-cli-tools-5.12.5:5 >=kde-plasma/ksysguard-5.12.5:5 >=kde-plasma/milou-5.12.5:5 >=kde-plasma/plasma-integration-5.12.5:5 >=dev-qt/qdbus-5.9.1:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 >=dev-qt/qtpaths-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.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.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/plasma-workspace-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6cb1439ebe74cae5ab1258ccf058a424
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.7 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.7
index 3c0c8c8b7035..1b3f2b3c6e43 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.7
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.7
@@ -11,5 +11,5 @@ REQUIRED_USE=gps? ( geolocation )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/plasma-workspace-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2717c360c29e804268cfad300b72b585
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.5-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.5-r1
index 81a57b71ea6a..2e2b3fdb5a88 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.5-r1
@@ -4,7 +4,7 @@ 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
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.13.5: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.5:5 >=kde-plasma/kwin-5.13.5:5 >=kde-plasma/libksysguard-5.13.5: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.5:5 >=kde-plasma/milou-5.13.5:5 >=kde-plasma/plasma-integration-5.13.5: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
@@ -12,5 +12,5 @@ REQUIRED_USE=gps? ( geolocation )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-workspace-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=27ab00f0fb0dda126a9636baf898ce06
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a3f8fc13114126a20956d131be914ec9
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.1
new file mode 100644
index 000000000000..cd8a25665779
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kjs-5.50.0:5 >=kde-frameworks/kjsembed-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-plasma/kscreenlocker-5.14.1:5 >=kde-plasma/kwin-5.14.1:5 >=kde-plasma/libksysguard-5.14.1: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/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.50.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.50.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.50.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.14.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kjs-5.50.0:5 >=kde-frameworks/kjsembed-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/krunner-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-plasma/kscreenlocker-5.14.1:5 >=kde-plasma/kwin-5.14.1:5 >=kde-plasma/libksysguard-5.14.1: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/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.50.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.50.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.50.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.50.0:5 ) >=kde-frameworks/kded-5.50.0:5 >=kde-frameworks/kdesu-5.50.0:5 >=kde-apps/kio-extras-18.04.3:5 >=kde-plasma/ksysguard-5.14.1:5 >=kde-plasma/milou-5.14.1:5 >=kde-plasma/plasma-integration-5.14.1: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.50.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.14.1/plasma-workspace-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fe9bb5447d39ef2858f21180a6a878f6
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.5
deleted file mode 100644
index 00d54cbed190..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.5
+++ /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=Additional wallpapers for the Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/plasma-workspace-wallpapers-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f5fe283cd8d2cfc71ecf867f093978ad
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.7 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.7
index 063de58219a1..a4d99e87fc14 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.7
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/plasma-workspace-wallpapers-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8992d0fbdfdf9a74ae51a14a27c8cbb
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.5
index 84655bd1898f..f8e6cd15dd8b 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.5
@@ -3,9 +3,9 @@ DEPEND=>=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 sy
 DESCRIPTION=Additional wallpapers for the Plasma workspace
 EAPI=6
 HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-workspace-wallpapers-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=189842381304d5baa13bc42dfdb0ddb1
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=004a6bfdaf458783d87040aeb8d93e2f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.1
new file mode 100644
index 000000000000..79403ab138a3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.50.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.14.1/plasma-workspace-wallpapers-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=58895646f1527d364e6fbe90b08803a7
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.5
deleted file mode 100644
index dad216c5f97b..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.5
+++ /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/kconfig-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/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.43.0:5 >=dev-qt/qtcore-5.9.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.43.0:5 >=kde-frameworks/kauth-5.43.0:5 >=kde-frameworks/kconfig-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/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-boot/plymouth >=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:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/plymouth-kcm-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8a0853c5be679d396556688a8c86a690
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.7 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.7
index b6138569de22..49bfda12d3ac 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.7
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.12.7: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/plasma/5.12.7/plymouth-kcm-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f2842bc5580fe678f13503aa9774d18
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.5
index 2cd58d0d72da..2b4cc0974c30 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma control module for Plymouth
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+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.5: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.5/plymouth-kcm-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=80e3cae09e6e4b2b7c840ce4dd99cc81
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1e76a3183e2f0ccc2d96af6e65a8815d
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.1 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.1
new file mode 100644
index 000000000000..3d69e9ef3881
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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.50.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.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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.14.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/plymouth-kcm-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6f2842bc5580fe678f13503aa9774d18
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.5
deleted file mode 100644
index 5bb5c06dcb92..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.5
+++ /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/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/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 >=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.43.0:5 >=dev-qt/qtcore-5.9.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.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/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 >=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.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/polkit-kde-agent-1-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4ae7cca1418a040a65c70899edcc64e1
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.7 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.7
index 3f4f9502d271..4fda1c25e323 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.7
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/polkit-kde-agent-1-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=689cefa3683c9b893663ae3defd7e55d
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.5
index 5169da410375..445db2b29f54 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=PolKit agent module for KDE Plasma
 EAPI=6
 HOMEPAGE=https://www.kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+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.5/polkit-kde-agent-1-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=baccf1318cfd16b51009d71874e36a4f
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d9443800d0c0adf359dbf6812003c49c
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.1 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.1
new file mode 100644
index 000000000000..d8a5e83b842d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.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.50.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.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/polkit-kde-agent-1-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=689cefa3683c9b893663ae3defd7e55d
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.12.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.12.5
deleted file mode 100644
index c3b1322b5340..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.12.5
+++ /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/kauth-5.43.0:5[policykit] >=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/kglobalaccel-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-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwayland-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-plasma/libkscreen-5.12.5:5 >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.43.0:5 >=kde-frameworks/networkmanager-qt-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=Power management for KDE Plasma Shell
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/powerdevil.git
-IUSE=consolekit +wireless debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kauth-5.43.0:5[policykit] >=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/kglobalaccel-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-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwayland-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-plasma/libkscreen-5.12.5:5 >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.43.0:5 >=kde-frameworks/networkmanager-qt-5.43.0:5 ) >=kde-plasma/kde-cli-tools-5.12.5: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.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/powerdevil-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=31ae106f60215b37a5027a52c5e5dd39
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.12.7 b/metadata/md5-cache/kde-plasma/powerdevil-5.12.7
index dce53291e273..a609c5215092 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.12.7
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.12.7
@@ -9,5 +9,5 @@ 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.12.7:5 >=kde-plasma/plasma-workspace-5.12.7:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5 ) >=kde-plasma/kde-cli-tools-5.12.7: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/powerdevil-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b9a991b6b831a1cbbd13d9c71a8525e2
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.13.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.13.5
index 6caba61d6fbe..3df2b492459b 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.13.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.13.5
@@ -4,10 +4,10 @@ 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
+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/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.5:5 >=kde-plasma/plasma-workspace-5.13.5: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.5: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.5/powerdevil-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a28e422ebbc2ec9cd2c211312f0e6b93
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=24dd62f651a8351335393b8810b2ea83
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.14.1 b/metadata/md5-cache/kde-plasma/powerdevil-5.14.1
new file mode 100644
index 000000000000..11abfc581a8a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5[policykit] >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-plasma/libkscreen-5.14.1:5 >=kde-plasma/plasma-workspace-5.14.1: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.50.0:5 >=kde-frameworks/networkmanager-qt-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kauth-5.50.0:5[policykit] >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwayland-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-plasma/libkscreen-5.14.1:5 >=kde-plasma/plasma-workspace-5.14.1: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.50.0:5 >=kde-frameworks/networkmanager-qt-5.50.0:5 ) >=kde-plasma/kde-cli-tools-5.14.1: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.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/powerdevil-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ae2d6727a44e38dd8428faa3f3e461e9
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.5
deleted file mode 100644
index 1ff6c0be67be..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.5
+++ /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/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/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.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.43.0:5 >=dev-qt/qtcore-5.9.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.43.0:5 >=kde-frameworks/kauth-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/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.12.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/sddm-kcm-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=571533f6ec93874592e18b45194ab179
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.7 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.7
index e454d7b086fa..04543a6138ac 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.7
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.7
@@ -9,5 +9,5 @@ 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.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.12.7: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.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.12.7/sddm-kcm-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e413f9bbe64e5204207dc246824563fc
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.5
index 02c7aba29ab2..6c069649787e 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma control module for SDDM
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+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.5: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.5/sddm-kcm-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ea6912c8a78f1d0f346c2a08f71d50dc
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=36aa83b648f88f8808d4cb5aebd693f7
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.1 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.1
new file mode 100644
index 000000000000..3a9f80030c9f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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.50.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.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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.14.1:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/sddm-kcm-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e413f9bbe64e5204207dc246824563fc
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.12.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.12.5
deleted file mode 100644
index 7d55590a31cb..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.12.5
+++ /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/kactivities-stats-5.43.0:5 >=kde-frameworks/kauth-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/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/kitemviews-5.43.0:5 >=kde-frameworks/kpackage-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/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 classic? ( >=kde-frameworks/khtml-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=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.43.0:5 >=kde-frameworks/kactivities-stats-5.43.0:5 >=kde-frameworks/kauth-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/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/kitemviews-5.43.0:5 >=kde-frameworks/kpackage-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/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 classic? ( >=kde-frameworks/khtml-5.43.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.43.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.12.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/systemsettings-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=18495ea2d32420a07c41e65ac8315ec4
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.12.7 b/metadata/md5-cache/kde-plasma/systemsettings-5.12.7
index f42bd7356cf8..cbff98ddd48e 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.12.7
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.12.7
@@ -9,5 +9,5 @@ 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 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.12.7: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/plasma/5.12.7/systemsettings-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=64770fc4b89b3705e9cbcf00d87d08c9
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.13.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.13.5
index 9a72a7c5fdf0..153155a3fbc4 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.13.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=System settings utility
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=classic gtk debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+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.5: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.5: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.5/systemsettings-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=acef3411943f0cdf3d4c0209314283af
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=69d18e00958324ede7ff0702a2696fc0
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.14.1 b/metadata/md5-cache/kde-plasma/systemsettings-5.14.1
new file mode 100644
index 000000000000..e31331d57dfe
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kactivities-stats-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-plasma/plasma-workspace-5.14.1: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.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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.50.0:5 >=kde-frameworks/kactivities-stats-5.50.0:5 >=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kpackage-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-plasma/plasma-workspace-5.14.1: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.50.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.50.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.14.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/systemsettings-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f2103af1ef6e4329b05e2137ed790415
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.12.5-r1 b/metadata/md5-cache/kde-plasma/user-manager-5.12.5-r1
deleted file mode 100644
index 53488ebab465..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.12.5-r1
+++ /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/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/kwidgetsaddons-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-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.43.0:5 >=dev-qt/qtcore-5.9.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.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/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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.5/user-manager-5.12.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0e2bc54868eb01065c1b28a3567a893f
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.12.7 b/metadata/md5-cache/kde-plasma/user-manager-5.12.7
deleted file mode 100644
index 03078899ca68..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.12.7
+++ /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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.9.4: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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.7/user-manager-5.12.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=901e41d5383bf60ee144dc5edbbdde80
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.12.7-r1 b/metadata/md5-cache/kde-plasma/user-manager-5.12.7-r1
new file mode 100644
index 000000000000..7c77ff4289ba
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.12.7-r1
@@ -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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.9.4: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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice >=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/plasma/5.12.7/user-manager-5.12.7.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e74878eebc2e1be555c56f6bb252522b
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.13.5 b/metadata/md5-cache/kde-plasma/user-manager-5.13.5
deleted file mode 100644
index ee4aee59ea63..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.13.5
+++ /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.5/user-manager-5.13.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5303ae307bcec7f95030e927dfe2d521
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.13.5-r1 b/metadata/md5-cache/kde-plasma/user-manager-5.13.5-r1
new file mode 100644
index 000000000000..f4a1a62b3dc0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.13.5-r1
@@ -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 sys-apps/accountsservice >=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.5/user-manager-5.13.5.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e8e8e67ac7a1f9d8988baae18ee50b09
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.14.1 b/metadata/md5-cache/kde-plasma/user-manager-5.14.1
new file mode 100644
index 000000000000..6648e3f4c05a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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.50.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.50.0:5 >=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.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-apps/accountsservice >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.1/user-manager-5.14.1.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e74878eebc2e1be555c56f6bb252522b
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index 9ceec22e26d5..5052c10ad39b 100644
--- a/metadata/md5-cache/lxqt-base/Manifest.gz
+++ b/metadata/md5-cache/lxqt-base/Manifest.gz
diff --git a/metadata/md5-cache/lxqt-base/liblxqt-0.11.0-r1 b/metadata/md5-cache/lxqt-base/liblxqt-0.11.0-r1
deleted file mode 100644
index a44a66016607..000000000000
--- a/metadata/md5-cache/lxqt-base/liblxqt-0.11.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=>=dev-libs/libqtxdg-1.3.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libXScrnSaver dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Common base library for the LXQt desktop environment
-EAPI=6
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-1.3.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libXScrnSaver
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/liblxqt/0.11.0/liblxqt-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fb67f6566faf5df7aefe108f490e7d38
diff --git a/metadata/md5-cache/lxqt-base/liblxqt-0.13.0 b/metadata/md5-cache/lxqt-base/liblxqt-0.13.0
index 01bfbc8743b3..be75a57ec6d2 100644
--- a/metadata/md5-cache/lxqt-base/liblxqt-0.13.0
+++ b/metadata/md5-cache/lxqt-base/liblxqt-0.13.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=Common base library for the LXQt desktop environment
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libX11 x11-libs/libXScrnSaver
 SLOT=0/0.13
 SRC_URI=https://downloads.lxqt.org/downloads/liblxqt/0.13.0/liblxqt-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ce63d67035da477b3e963e45ab9e2127
+_md5_=1b5c292941e299b988c5e67222a27a20
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.3.1 b/metadata/md5-cache/lxqt-base/libsysstat-0.3.1
deleted file mode 100644
index 7ac4cd8fd0a0..000000000000
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A Qt-based interface to system statistics
-EAPI=5
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1+
-RDEPEND=dev-qt/qtcore:5
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/libsysstat/0.3.1/libsysstat-0.3.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f7015e12dd8d48a3050e192958456b45
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.3.2 b/metadata/md5-cache/lxqt-base/libsysstat-0.3.2
deleted file mode 100644
index 2687acac7c18..000000000000
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A Qt-based interface to system statistics
-EAPI=5
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-qt/qtcore:5
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/libsysstat/0.3.2/libsysstat-0.3.2.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5255c4803c995f27d062b1cdfb9131e6
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.4.1 b/metadata/md5-cache/lxqt-base/libsysstat-0.4.1
index eedcec610e18..6a6b4b1d4b0a 100644
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.4.1
+++ b/metadata/md5-cache/lxqt-base/libsysstat-0.4.1
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 >=dev-util/lxqt-build-tools-0.5.0 sys-devel/make >=dev-ut
 DESCRIPTION=A Qt-based interface to system statistics
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/libsysstat/0.4.1/libsysstat-0.4.1.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5b1ca48159415e90d60b16d1a3442aac
+_md5_=1c039f971509111852b9d90ee06a96f9
diff --git a/metadata/md5-cache/lxqt-base/lxqt-about-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-about-0.11.0
deleted file mode 100644
index aca781adbe94..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-about-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.11.0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt about dialog
-EAPI=5
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.11.0
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-about/0.11.0/lxqt-about-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e89b53fce783b5e2e512456ccfc7af6a
diff --git a/metadata/md5-cache/lxqt-base/lxqt-about-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-about-0.13.0
index 8683b85dac00..a20e00ef229c 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-about-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-about-0.13.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets
 DESCRIPTION=LXQt about dialog
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.13*
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-about/0.13.0/lxqt-about-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e5fbab699bac78231b5c9f24d9ccacd1
+_md5_=ef86a7f708a17bfe867c880a1916fb1f
diff --git a/metadata/md5-cache/lxqt-base/lxqt-admin-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-admin-0.11.0
deleted file mode 100644
index 7aa228dc76c2..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-admin-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.11.0 kde-frameworks/kwindowsystem:5 x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt system administration tool
-EAPI=5
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.11.0 kde-frameworks/kwindowsystem:5 x11-libs/libX11
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-admin/0.11.0/lxqt-admin-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=631dace4cd52760f7f283c432cead85a
diff --git a/metadata/md5-cache/lxqt-base/lxqt-admin-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-admin-0.13.0
index b9e742c0570b..eb25614ea2a4 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-admin-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-admin-0.13.0
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-b
 DESCRIPTION=LXQt system administration tool
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.13* kde-frameworks/kwindowsystem:5
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-admin/0.13.0/lxqt-admin-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=72ce9054a28f70a293bbd4af72a6cfd8
+_md5_=6634f6455fa325a9ee3be10c01ae06b7
diff --git a/metadata/md5-cache/lxqt-base/lxqt-common-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-common-0.11.0
deleted file mode 100644
index 26ca6a06887d..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-common-0.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=lxqt-base/liblxqt-0.11.0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt common resources
-EAPI=5
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-PDEPEND=>=lxqt-base/lxqt-session-0.11.0
-RDEPEND=>=lxqt-base/liblxqt-0.11.0
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-common/0.11.0/lxqt-common-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=62a7c55fb7c13576d9ca640bdaf1474b
diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-config-0.11.0
deleted file mode 100644
index bb628845af43..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-config-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-1.0.0 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 kde-plasma/libkscreen:5= ~lxqt-base/liblxqt-0.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt system configuration control center
-EAPI=5
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-1.0.0 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 kde-plasma/libkscreen:5= ~lxqt-base/liblxqt-0.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-apps/setxkbmap
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-config/0.11.0/lxqt-config-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cf4ffde834ccd68f6e8d346e48a81f56
diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-config-0.13.0
index 2796d38e71ee..b7bbd043b99d 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-config-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-config-0.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=LXQt system configuration control center
 EAPI=6
 HOMEPAGE=https://lxqt.org/
 IUSE=+monitor
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2
 RDEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.13* sys-libs/zlib:= x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes monitor? ( kde-plasma/libkscreen:5= )
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-config/0.13.0/lxqt-config-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c0e1d53d3e4fa3feef5b2aaf2d45f676
+_md5_=b975ba2e71725a2547c77b414a7f6518
diff --git a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.11.0
deleted file mode 100644
index 4cfb488ba361..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.11.0 >=dev-libs/libqtxdg-1.0.0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Daemon and library for global keyboard shortcuts registration
-EAPI=5
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.11.0 >=dev-libs/libqtxdg-1.0.0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-globalkeys/0.11.0/lxqt-globalkeys-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0cf034317dc8f5b69ec50823940edcd2
diff --git a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.13.0
index e699aa897ee2..da8238121c52 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.13.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=Daemon and library for global keyboard shortcuts registration
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 =lxqt-base/liblxqt-0.13* kde-frameworks/kwindowsystem:5 x11-libs/libX11 !lxqt-base/lxqt-common
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-globalkeys/0.13.0/lxqt-globalkeys-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6d634b6a977c78b65db02d03e4cbff22
+_md5_=1683fbe0b5d56d4b1665471b3ce43b95
diff --git a/metadata/md5-cache/lxqt-base/lxqt-l10n-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-l10n-0.11.0
deleted file mode 100644
index 9c26c698a7ad..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-l10n-0.11.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/linguist-tools:5 ~lxqt-base/liblxqt-0.11.0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt localisation package
-EAPI=6
-HOMEPAGE=https://lxqt.org
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-l10n/0.11.0/lxqt-l10n-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1197647027c216d34259c2902ed1a07c
diff --git a/metadata/md5-cache/lxqt-base/lxqt-l10n-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-l10n-0.13.0
index 151e2477addb..890e7cef570f 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-l10n-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-l10n-0.13.0
@@ -3,10 +3,10 @@ DEPEND=!~x11-misc/obconf-qt-0.9.0_p20150729 dev-qt/linguist-tools:5 >=dev-util/l
 DESCRIPTION=LXQt localisation package
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=!~x11-misc/obconf-qt-0.9.0_p20150729
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-l10n/0.13.0/lxqt-l10n-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0386831a209bafc8de54c0e9e118e40b
+_md5_=98e8b3e0713d59d71bc246c3f81087d5
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-meta-0.11.0
deleted file mode 100644
index 2938a660f9bb..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-0.11.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta ebuild for LXQt, the Lightweight Desktop Environment
-EAPI=5
-HOMEPAGE=https://lxqt.org
-IUSE=+about admin +filemanager +icons lightdm lximage minimal +oxygen +policykit powermanagement sddm ssh-askpass sudo
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=metapackage
-RDEPEND=>=lxde-base/lxmenu-data-0.1.2 ~lxqt-base/lxqt-common-0.11.0 ~lxqt-base/lxqt-config-0.11.0 ~lxqt-base/lxqt-globalkeys-0.11.0 ~lxqt-base/lxqt-notificationd-0.11.0 ~lxqt-base/lxqt-panel-0.11.0 ~lxqt-base/lxqt-qtplugin-0.11.0 ~lxqt-base/lxqt-runner-0.11.0 ~lxqt-base/lxqt-session-0.11.0 virtual/ttf-fonts about? ( ~lxqt-base/lxqt-about-0.11.0 ) admin? ( ~lxqt-base/lxqt-admin-0.11.0 ) filemanager? ( >=x11-misc/pcmanfm-qt-0.11.0 ) icons? ( oxygen? ( kde-frameworks/oxygen-icons ) !oxygen? ( virtual/freedesktop-icon-theme ) ) lightdm? ( x11-misc/lightdm ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox x11-misc/obconf-qt ) policykit? ( ~lxqt-base/lxqt-policykit-0.11.0 || ( sys-auth/consolekit[policykit(-)] sys-apps/systemd[policykit(-)] ) ) powermanagement? ( ~lxqt-base/lxqt-powermanagement-0.11.0 ) sddm? ( >=x11-misc/sddm-0.11.0 ) ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-0.11.0 ) sudo? ( ~lxqt-base/lxqt-sudo-0.11.0 )
-REQUIRED_USE=oxygen? ( icons )
-SLOT=0
-_md5_=1321f5a0dc96a2ff9326f9081de5cddb
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-meta-0.13.0
index d743b6e3466c..ec3570492e13 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-meta-0.13.0
@@ -3,9 +3,9 @@ DESCRIPTION=Meta ebuild for LXQt, the Lightweight Desktop Environment
 EAPI=6
 HOMEPAGE=https://lxqt.org/
 IUSE=+about admin +filemanager lightdm lximage minimal nls powermanagement processviewer screenshot sddm ssh-askpass sudo terminal
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=metapackage
 RDEPEND=kde-frameworks/oxygen-icons >=lxde-base/lxmenu-data-0.1.5 =lxqt-base/lxqt-config-0.13* =lxqt-base/lxqt-globalkeys-0.13* =lxqt-base/lxqt-notificationd-0.13* =lxqt-base/lxqt-panel-0.13* =lxqt-base/lxqt-policykit-0.13* =lxqt-base/lxqt-qtplugin-0.13* =lxqt-base/lxqt-runner-0.13* =lxqt-base/lxqt-session-0.13* virtual/ttf-fonts =x11-themes/lxqt-themes-0.13* about? ( =lxqt-base/lxqt-about-0.13* ) admin? ( =lxqt-base/lxqt-admin-0.13* ) filemanager? ( =x11-misc/pcmanfm-qt-0.13* ) lightdm? ( x11-misc/lightdm ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox x11-misc/obconf-qt ) nls? ( =lxqt-base/lxqt-l10n-0.13* ) powermanagement? ( =lxqt-base/lxqt-powermanagement-0.13* ) processviewer? ( x11-misc/qps:0 ) screenshot? ( x11-misc/screengrab:0 ) sddm? ( >=x11-misc/sddm-0.11.0 ) ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-0.13* ) sudo? ( =lxqt-base/lxqt-sudo-0.13* ) terminal? ( x11-terms/qterminal:0 )
 SLOT=0
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446
-_md5_=db78a717d91f9a7bd2e5463ccb70fafa
+_md5_=1832ab66b87606293ca7818b18cec6d7
diff --git a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.11.0
deleted file mode 100644
index 0a62899a4283..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 ~lxqt-base/liblxqt-0.11.0 =lxqt-base/lxqt-common-0.11* dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt notification daemon and library
-EAPI=5
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 ~lxqt-base/liblxqt-0.11.0 =lxqt-base/lxqt-common-0.11*
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-notificationd/0.11.0/lxqt-notificationd-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cc6700b447de010c4174a4682842bea8
diff --git a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.13.0
index 85e254e9b3af..2826ad3c72b9 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.13.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt notification daemon and library
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.13* !lxqt-base/lxqt-common
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-notificationd/0.13.0/lxqt-notificationd-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9e4802c1f5af6c8b934dfcf7efd115df
+_md5_=f4004fecab4fbe717d87d19aaf12510a
diff --git a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.11.0
deleted file mode 100644
index 307d75698be6..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.11.0 x11-libs/libX11 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt OpenSSH user password prompt tool
-EAPI=5
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.11.0 x11-libs/libX11
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-openssh-askpass/0.11.0/lxqt-openssh-askpass-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5baf1d15a107a119ba94efee681000bc
diff --git a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.13.0
index 9274fbf88e60..a9ee862f281a 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.13.0
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.13* dev-qt/lingui
 DESCRIPTION=LXQt OpenSSH user password prompt tool
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.13*
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-openssh-askpass/0.13.0/lxqt-openssh-askpass-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3620c88dea316276d4155839716d118d
+_md5_=405c601e6ac271ccff19d98e546cb947
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.11.0
deleted file mode 100644
index def21177b1d5..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-0.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kguiaddons:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/menu-cache-0.3.3 ~lxqt-base/liblxqt-0.11.0 ~lxqt-base/lxqt-globalkeys-0.11.0 x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( =lxqt-base/libsysstat-0.3* ) tray? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt desktop panel and plugins
-EAPI=5
-HOMEPAGE=https://lxqt.org
-IUSE=+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop statusnotifier sysstat +taskbar +tray +volume worldclock
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kguiaddons:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/menu-cache-0.3.3 ~lxqt-base/liblxqt-0.11.0 ~lxqt-base/lxqt-globalkeys-0.11.0 x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( =lxqt-base/libsysstat-0.3* ) tray? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) dev-qt/qtsvg:5 >=lxde-base/lxmenu-data-0.1.2
-REQUIRED_USE=volume? ( || ( alsa pulseaudio ) )
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-panel/0.11.0/lxqt-panel-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2d7f53f9e144e3911a20d6488e964fd5
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.13.0
index 6b05fd260fdd..770f70450520 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-0.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=LXQt desktop panel and plugins
 EAPI=6
 HOMEPAGE=https://lxqt.org/
 IUSE=+alsa clock colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop +spacer statusnotifier sysstat +taskbar +tray +volume +worldclock
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-0.13* =lxqt-base/lxqt-globalkeys-0.13* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) ) !lxqt-base/lxqt-common
-REQUIRED_USE=volume? ( || ( alsa pulseaudio ) )
+REQUIRED_USE=|| ( desktopswitch mainmenu showdesktop taskbar ) volume? ( || ( alsa pulseaudio ) )
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-panel/0.13.0/lxqt-panel-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3104393f3a49779f62f14cdb92579fe3
+_md5_=5fb99f93b9b7eea8fc34ae2092b1618d
diff --git a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.11.0
deleted file mode 100644
index dbda92518c8c..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.11.0 >=dev-libs/libqtxdg-1.0.0 sys-auth/polkit-qt[qt5(+)] dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt PolKit authentication agent
-EAPI=5
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ~lxqt-base/liblxqt-0.11.0 >=dev-libs/libqtxdg-1.0.0 sys-auth/polkit-qt[qt5(+)]
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-policykit/0.11.0/lxqt-policykit-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1971a24c07ebe5d32ee5bc659c733bd8
diff --git a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.13.0
index 1019d7d9453b..5c9406a2cd6e 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.13.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt PolKit authentication agent
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.13* sys-auth/polkit-qt[qt5(+)] !lxqt-base/lxqt-common
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-policykit/0.13.0/lxqt-policykit-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d4f591f93f6b9779486049a87c29ddf6
+_md5_=7e843c0ac3371b16e6f6d761e7470e9e
diff --git a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.11.0
deleted file mode 100644
index 121856a8f89d..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 ~lxqt-base/liblxqt-0.11.0 dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt daemon for power management and auto-suspend
-EAPI=5
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 ~lxqt-base/liblxqt-0.11.0 || ( sys-power/upower sys-power/upower-pm-utils )
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-powermanagement/0.11.0/lxqt-powermanagement-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8deb53e1058a9527d26a228eb11ae254
diff --git a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.13.0
index 3137029e3af0..1f603e3d6633 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.13.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt daemon for power management and auto-suspend
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 =lxqt-base/liblxqt-0.13* || ( sys-power/upower sys-power/upower-pm-utils ) !lxqt-base/lxqt-common
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-powermanagement/0.13.0/lxqt-powermanagement-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=460f1dc5f3a3df9d00426aa54243bdc6
+_md5_=915b90958e619b3cc778f7094b935f76
diff --git a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.11.0
deleted file mode 100644
index 883374e9558d..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libdbusmenu-qt[qt5(+)] >=dev-libs/libqtxdg-2.0.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ~lxqt-base/liblxqt-0.11.0 x11-libs/libX11 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt system integration plugin for Qt
-EAPI=5
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/libdbusmenu-qt[qt5(+)] >=dev-libs/libqtxdg-2.0.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ~lxqt-base/liblxqt-0.11.0 x11-libs/libX11
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-qtplugin/0.11.0/lxqt-qtplugin-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=af4989a31ed89143e0fcf29d26cf20ba
diff --git a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.13.0
index 690f3967b5ea..41e49d2ac727 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.13.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore
 DESCRIPTION=LXQt system integration plugin for Qt
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.13*
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-qtplugin/0.13.0/lxqt-qtplugin-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e2c1d34e0c31b510818d877087472464
+_md5_=c057a53ab449ca3d1f6a93496d76cb22
diff --git a/metadata/md5-cache/lxqt-base/lxqt-runner-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-runner-0.11.0
deleted file mode 100644
index 9e84967f8565..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-cpp/muParser-2.2.3 dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 >=lxde-base/menu-cache-0.5.1 ~lxqt-base/liblxqt-0.11.0 ~lxqt-base/lxqt-globalkeys-0.11.0 >=dev-util/cmake-3.6.2 dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt quick launcher
-EAPI=5
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1+
-RDEPEND=>=dev-cpp/muParser-2.2.3 dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 >=lxde-base/menu-cache-0.5.1 ~lxqt-base/liblxqt-0.11.0 ~lxqt-base/lxqt-globalkeys-0.11.0
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-runner/0.11.0/lxqt-runner-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6d7dc9de26a44791a0fbaa6330ed9861
diff --git a/metadata/md5-cache/lxqt-base/lxqt-runner-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-runner-0.13.0
index 38f164799a20..8fa3ed24ebab 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-runner-0.13.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-
 DESCRIPTION=LXQt quick launcher
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 >=lxde-base/menu-cache-0.5.1 =lxqt-base/liblxqt-0.13* =lxqt-base/lxqt-globalkeys-0.13* !lxqt-base/lxqt-common
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-runner/0.13.0/lxqt-runner-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f2af954d24887ab0f7d6bbe56f99c912
+_md5_=149885a015a578f58c6309a0d0814a7c
diff --git a/metadata/md5-cache/lxqt-base/lxqt-session-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-session-0.11.0
deleted file mode 100644
index 90267d667450..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-session-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] ~lxqt-base/liblxqt-0.11.0 x11-libs/libX11 x11-misc/xdg-user-dirs dev-qt/linguist-tools:5 dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQT session manager
-EAPI=5
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] ~lxqt-base/liblxqt-0.11.0 x11-libs/libX11 x11-misc/xdg-user-dirs =lxqt-base/lxqt-common-0.11*
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-session/0.11.0/lxqt-session-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fd24f1beaed4d96632176cf47bed452e
diff --git a/metadata/md5-cache/lxqt-base/lxqt-session-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-session-0.13.0
index d12f4c610728..9622ccf8e6b4 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-session-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-session-0.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=LXQT session manager
 EAPI=6
 HOMEPAGE=https://lxqt.org/
 IUSE=+themes +udev
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5[X] =lxqt-base/liblxqt-0.13* x11-libs/libX11 x11-misc/xdg-user-dirs themes? ( =x11-themes/lxqt-themes-0.13* ) udev? ( virtual/libudev ) !lxqt-base/lxqt-common
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-session/0.13.0/lxqt-session-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=418965f1bf9825557fbe76034aaade61
+_md5_=43b065fc57e813b2b00051a59b10c800
diff --git a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.11.0
deleted file mode 100644
index 05bf525db2a3..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-admin/sudo >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ~lxqt-base/liblxqt-0.11.0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXQt GUI frontend for sudo
-EAPI=5
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-admin/sudo >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ~lxqt-base/liblxqt-0.11.0
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lxqt-sudo/0.11.0/lxqt-sudo-0.11.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8fe1612732d61a4e79b6b23fb1579848
diff --git a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.13.0 b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.13.0
index 7ed101006897..a5a5f87b7d3d 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.13.0
@@ -3,10 +3,10 @@ DEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtwidgets
 DESCRIPTION=LXQt GUI frontend for sudo
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.13*
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-sudo/0.13.0/lxqt-sudo-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=44f0f957b405bdf9b463ecf2b3762231
+_md5_=a04a1d738642fef05f0e6b6e90cc2162
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index d4c3ee8d415a..fc5aad133456 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/kube-0.5.0-r2 b/metadata/md5-cache/mail-client/kube-0.5.0-r2
deleted file mode 100644
index daa0eba1f260..000000000000
--- a/metadata/md5-cache/mail-client/kube-0.5.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/breeze-icons-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync >=dev-libs/sink-0.5.0 test? ( >=dev-qt/qttest-5.9.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 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=A mail client by KDE
-EAPI=6
-HOMEPAGE=https://kube.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/breeze-icons-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync >=dev-libs/sink-0.5.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=https://github.com/KDE/kube/archive/v0.5.0.tar.gz -> kube-0.5.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e13a823fd983109b3cce65f5ffa689d5
diff --git a/metadata/md5-cache/mail-client/kube-0.7.0 b/metadata/md5-cache/mail-client/kube-0.7.0
new file mode 100644
index 000000000000..5822d67da360
--- /dev/null
+++ b/metadata/md5-cache/mail-client/kube-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/breeze-icons-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync >=dev-libs/sink-0.7.0 test? ( >=dev-qt/qttest-5.9.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.50.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=A mail client by KDE
+EAPI=6
+HOMEPAGE=https://kube.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/breeze-icons-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync >=dev-libs/sink-0.7.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=https://github.com/KDE/kube/archive/v0.7.0.tar.gz -> kube-0.7.0.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e58660ab6331e43cf18cb0b092102de2
diff --git a/metadata/md5-cache/mail-client/roundcube-1.3.7 b/metadata/md5-cache/mail-client/roundcube-1.3.7
index 96dd0a5ddd00..de5128ec89c9 100644
--- a/metadata/md5-cache/mail-client/roundcube-1.3.7
+++ b/metadata/md5-cache/mail-client/roundcube-1.3.7
@@ -4,11 +4,11 @@ DESCRIPTION=A browser-based multilingual IMAP client with an application-like us
 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
+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_=b0ac30106c6e362de6188493ed7b82ba
+_md5_=75f9aeb3dae82bab26d0c06d5702f0c5
diff --git a/metadata/md5-cache/mail-client/thunderbird-60.2.1 b/metadata/md5-cache/mail-client/thunderbird-60.2.1
new file mode 100644
index 000000000000..b25770070eea
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-60.2.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.36.4 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=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-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 clang? ( >=sys-devel/llvm-4.0.1[gold] >=sys-devel/lld-4.0.1 ) pulseaudio? ( media-sound/pulseaudio ) elibc_glibc? ( virtual/cargo virtual/rust ) elibc_musl? ( virtual/cargo virtual/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<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.13 >=sys-devel/libtool-2.4 app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/thunderbird
+IUSE=bindist clang dbus debug hardened jack lightning mozdom neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-sqlite wifi custom-cflags custom-optimization l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.36.4 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=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-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla sec-policy/selinux-thunderbird )
+REQUIRED_USE=wifi? ( dbus )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ar.xpi -> thunderbird-60.2.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ast.xpi -> thunderbird-60.2.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/be.xpi -> thunderbird-60.2.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/bg.xpi -> thunderbird-60.2.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/br.xpi -> thunderbird-60.2.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ca.xpi -> thunderbird-60.2.1-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/cs.xpi -> thunderbird-60.2.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/cy.xpi -> thunderbird-60.2.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/da.xpi -> thunderbird-60.2.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/de.xpi -> thunderbird-60.2.1-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/el.xpi -> thunderbird-60.2.1-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/en-GB.xpi -> thunderbird-60.2.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/es-AR.xpi -> thunderbird-60.2.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/es-ES.xpi -> thunderbird-60.2.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/et.xpi -> thunderbird-60.2.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/eu.xpi -> thunderbird-60.2.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/fi.xpi -> thunderbird-60.2.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/fr.xpi -> thunderbird-60.2.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.2.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.2.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/gd.xpi -> thunderbird-60.2.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/gl.xpi -> thunderbird-60.2.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/he.xpi -> thunderbird-60.2.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/hr.xpi -> thunderbird-60.2.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/hsb.xpi -> thunderbird-60.2.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/hu.xpi -> thunderbird-60.2.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.2.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/id.xpi -> thunderbird-60.2.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/is.xpi -> thunderbird-60.2.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/it.xpi -> thunderbird-60.2.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ja.xpi -> thunderbird-60.2.1-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ko.xpi -> thunderbird-60.2.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/lt.xpi -> thunderbird-60.2.1-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.2.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/nl.xpi -> thunderbird-60.2.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.2.1-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/pl.xpi -> thunderbird-60.2.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.2.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.2.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/rm.xpi -> thunderbird-60.2.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ro.xpi -> thunderbird-60.2.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ru.xpi -> thunderbird-60.2.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/si.xpi -> thunderbird-60.2.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/sk.xpi -> thunderbird-60.2.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/sl.xpi -> thunderbird-60.2.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/sq.xpi -> thunderbird-60.2.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/sr.xpi -> thunderbird-60.2.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.2.1-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/tr.xpi -> thunderbird-60.2.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/uk.xpi -> thunderbird-60.2.1-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/vi.xpi -> thunderbird-60.2.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.2.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.2.1-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/source/thunderbird-60.2.1.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.2.1.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.0-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.0-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.0-patches-03.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozcoreconf-v6	1139e0e37e324d9066382d5f359f574a	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=23e0feef423508b210d53bdb200bc172
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-60.2.1 b/metadata/md5-cache/mail-client/thunderbird-bin-60.2.1
new file mode 100644
index 000000000000..e9dc075d7665
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-60.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=https://www.thunderbird.net/
+IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ar.xpi -> thunderbird-60.2.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ast.xpi -> thunderbird-60.2.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/be.xpi -> thunderbird-60.2.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/bg.xpi -> thunderbird-60.2.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/br.xpi -> thunderbird-60.2.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ca.xpi -> thunderbird-60.2.1-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/cs.xpi -> thunderbird-60.2.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/cy.xpi -> thunderbird-60.2.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/da.xpi -> thunderbird-60.2.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/de.xpi -> thunderbird-60.2.1-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/el.xpi -> thunderbird-60.2.1-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/en-GB.xpi -> thunderbird-60.2.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/es-AR.xpi -> thunderbird-60.2.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/es-ES.xpi -> thunderbird-60.2.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/et.xpi -> thunderbird-60.2.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/eu.xpi -> thunderbird-60.2.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/fi.xpi -> thunderbird-60.2.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/fr.xpi -> thunderbird-60.2.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.2.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.2.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/gd.xpi -> thunderbird-60.2.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/gl.xpi -> thunderbird-60.2.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/he.xpi -> thunderbird-60.2.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/hr.xpi -> thunderbird-60.2.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/hsb.xpi -> thunderbird-60.2.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/hu.xpi -> thunderbird-60.2.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.2.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/id.xpi -> thunderbird-60.2.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/is.xpi -> thunderbird-60.2.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/it.xpi -> thunderbird-60.2.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ja.xpi -> thunderbird-60.2.1-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ko.xpi -> thunderbird-60.2.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/lt.xpi -> thunderbird-60.2.1-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.2.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/nl.xpi -> thunderbird-60.2.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.2.1-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/pl.xpi -> thunderbird-60.2.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.2.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.2.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/rm.xpi -> thunderbird-60.2.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ro.xpi -> thunderbird-60.2.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/ru.xpi -> thunderbird-60.2.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/si.xpi -> thunderbird-60.2.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/sk.xpi -> thunderbird-60.2.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/sl.xpi -> thunderbird-60.2.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/sq.xpi -> thunderbird-60.2.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/sr.xpi -> thunderbird-60.2.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.2.1-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/tr.xpi -> thunderbird-60.2.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/uk.xpi -> thunderbird-60.2.1-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/vi.xpi -> thunderbird-60.2.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.2.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.2.1-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-US/thunderbird-60.2.1.tar.bz2 -> thunderbird-bin_x86_64-60.2.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-US/thunderbird-60.2.1.tar.bz2 -> thunderbird-bin_i686-60.2.1.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-6.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3aece2e8043d9ddc37bd2ad4eb13ee90
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 1b768440b09f..034c29c4edfd 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/bogofilter-1.2.4-r1 b/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r1
deleted file mode 100644
index 6bc31a50a893..000000000000
--- a/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=virtual/libiconv berkdb? ( >=sys-libs/db-3.2:* ) !berkdb? ( sqlite? ( >=dev-db/sqlite-3.6.22 ) !sqlite? ( tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( >=sys-libs/db-3.2:* ) ) ) sci-libs/gsl:= app-arch/pax >=app-portage/elt-patches-20170815 !<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=Bayesian spam filter designed with fast algorithms, and tuned for speed
-EAPI=5
-HOMEPAGE=http://bogofilter.sourceforge.net/
-IUSE=berkdb sqlite tokyocabinet
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=virtual/libiconv berkdb? ( >=sys-libs/db-3.2:* ) !berkdb? ( sqlite? ( >=dev-db/sqlite-3.6.22 ) !sqlite? ( tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( >=sys-libs/db-3.2:* ) ) ) sci-libs/gsl:= app-arch/pax
-SLOT=0
-SRC_URI=mirror://sourceforge/bogofilter/bogofilter-1.2.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5d80e1aee75156f2a22656ca134ffbd9
diff --git a/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r2 b/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r2
index 62c86f8f86ff..0c0cbd104b3d 100644
--- a/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r2
+++ b/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Bayesian spam filter designed with fast algorithms, and tuned for sp
 EAPI=6
 HOMEPAGE=http://bogofilter.sourceforge.net/
 IUSE=berkdb sqlite tokyocabinet
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=app-arch/pax sci-libs/gsl:= virtual/libiconv berkdb? ( >=sys-libs/db-3.2:* ) !berkdb? ( sqlite? ( >=dev-db/sqlite-3.6.22 ) !sqlite? ( tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( >=sys-libs/db-3.2:* ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/bogofilter/bogofilter-1.2.4.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=40b7df18fc24818d414ec64dd672c35c
+_md5_=398b6074b7a0a6ab320f435d4bd4ea7e
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r1 b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r1
deleted file mode 100644
index 0cf0e6d653de..000000000000
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) test? ( app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-Test-Harness ) virtual/pkgconfig
-DESCRIPTION=An extensible mail filter which can identify and tag spam
-EAPI=6
-HOMEPAGE=https://spamassassin.apache.org/
-IUSE=berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
-SLOT=0
-SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.2.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=83b00fdedfd1edcbe8ea4db04dd4ecde
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2 b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2
new file mode 100644
index 000000000000..526267e7ad44
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) test? ( app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-Test-Harness ) virtual/pkgconfig
+DESCRIPTION=An extensible mail filter which can identify and tag spam
+EAPI=6
+HOMEPAGE=https://spamassassin.apache.org/
+IUSE=berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
+SLOT=0
+SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.2.tar.bz2
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=28c971ad4565897571d9da0a120e330a
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 4fc45c1849ad..fa2ca97eb80f 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/postfix-3.3.1-r1 b/metadata/md5-cache/mail-mta/postfix-3.3.1-r1
index 71b700888e93..f540ea3ebf66 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.3.1-r1
+++ b/metadata/md5-cache/mail-mta/postfix-3.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=842ec8c87c057756ed0b6652a7ee6795
+_md5_=0efd0b4da8a1a043d7f3ed01c695c34e
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 55d32577fbcb..c027690eaf04 100644
--- a/metadata/md5-cache/mate-extra/Manifest.gz
+++ b/metadata/md5-cache/mate-extra/Manifest.gz
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.18.3 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.18.3
index c0efa6078a1b..b27584ab1a46 100644
--- a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.18.3
+++ b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.18.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 virtual/libintl:0 hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] media-video/nvidia-settings:0 ) ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
+DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 virtual/libintl:0 hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
 DESCRIPTION=MATE panel applet to display readings from hardware sensors
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
@@ -7,8 +7,8 @@ IUSE=+dbus hddtemp libnotify lm_sensors video_cards_nvidia
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 PDEPEND=hddtemp? ( dbus? ( sys-fs/udisks:0 ) )
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 virtual/libintl:0 hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] media-video/nvidia-settings:0 ) )
+RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 virtual/libintl:0 hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-sensors-applet-1.18.3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=70ad62bdfeee8cdaaee7d9d7128b5fde
+_md5_=141e2b18ab97797a51dadaa224bcff5c
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 4935ab350bc4..51b579ef7f8a 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/bitstream-cyberbit-2.0-r2 b/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
index 0bc216bb19db..864c4b9abe34 100644
--- a/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
+++ b/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=BitstreamCyberbit
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=http://ftp.netscape.com/pub/communicator/extras/fonts/windows/Cyberbit.ZIP -> bitstream-cyberbit-2.0.zip ftp://ftp.netscape.com.edgesuite.net/pub/communicator/extras/fonts/windows/Cyberbit.ZIP -> bitstream-cyberbit-2.0.zip
+SRC_URI=http://freebsd.nsu.ru/distfiles/cyberbit/Cyberbit.ZIP -> bitstream-cyberbit-2.0.zip https://www.minix3.org/distfiles-backup/cyberbit-ttf/Cyberbit.ZIP -> bitstream-cyberbit-2.0.zip http://mirror.uni-c.dk/pub/pkgsrc/distfiles/cyberbit-ttf/Cyberbit.ZIP -> bitstream-cyberbit-2.0.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ab5e58d274eb24075d6e51c95eb7f36
+_md5_=b78033ca9707073b142d8bdff457a7be
diff --git a/metadata/md5-cache/media-fonts/fira-code-1.206 b/metadata/md5-cache/media-fonts/fira-code-1.206
new file mode 100644
index 000000000000..b1e61b646057
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/fira-code-1.206
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=Monospaced font with programming ligatures
+EAPI=6
+HOMEPAGE=https://github.com/tonsky/FiraCode
+IUSE=X
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=OFL-1.1
+SLOT=0
+SRC_URI=https://github.com/tonsky/FiraCode/archive/1.206.tar.gz -> fira-code-1.206.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9331d9be6f53241dbc30276291795fb4
diff --git a/metadata/md5-cache/media-fonts/kanjistrokeorders-2.012 b/metadata/md5-cache/media-fonts/kanjistrokeorders-2.012
index f80be5ccad6f..189dc5570cab 100644
--- a/metadata/md5-cache/media-fonts/kanjistrokeorders-2.012
+++ b/metadata/md5-cache/media-fonts/kanjistrokeorders-2.012
@@ -6,8 +6,9 @@ HOMEPAGE=https://sites.google.com/site/nihilistorguk/
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=BSD
+RDEPEND=!=kde-apps/kiten-18.08.2-r0
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=https://sites.google.com/site/nihilistorguk/Home/KanjiStrokeOrders_v2.012.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ea63a14760411132ce5da8b0e5a0693
+_md5_=24b86fb57c59b5d63a67fcd06936408c
diff --git a/metadata/md5-cache/media-fonts/kanjistrokeorders-2.016 b/metadata/md5-cache/media-fonts/kanjistrokeorders-2.016
index ba09a93b85e8..9b0d59d0a763 100644
--- a/metadata/md5-cache/media-fonts/kanjistrokeorders-2.016
+++ b/metadata/md5-cache/media-fonts/kanjistrokeorders-2.016
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=font to view stroke order diagrams for Kanji, Kana and etc
-EAPI=0
+DESCRIPTION=Font to view stroke order diagrams for Kanji, Kana and etc
+EAPI=6
 HOMEPAGE=https://sites.google.com/site/nihilistorguk/
 IUSE=X
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
+RDEPEND=!=kde-apps/kiten-18.08.2-r0
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=https://sites.google.com/site/nihilistorguk/Home/KanjiStrokeOrders_v2.016.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc93d3e1bed1f0a4138038661731a7b4
+_md5_=db3be7ffece53f8aa20810c7946365ae
diff --git a/metadata/md5-cache/media-fonts/noto-20180905 b/metadata/md5-cache/media-fonts/noto-20180905
new file mode 100644
index 000000000000..4a3c5a298414
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/noto-20180905
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=Google's font family that aims to support all the world's languages
+EAPI=6
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts
+IUSE=cjk X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=OFL-1.1
+RDEPEND=cjk? ( media-fonts/noto-cjk )
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/googlei18n/noto-fonts/archive/db5c897c3954ab8dd49bfc3de4f3ef00a7ef6d06.tar.gz -> noto-20180905.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a3e0af47f5ae1449a907b3a14918d2d2
diff --git a/metadata/md5-cache/media-fonts/noto-cjk-20170602 b/metadata/md5-cache/media-fonts/noto-cjk-20170602
new file mode 100644
index 000000000000..46dfcb91f938
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/noto-cjk-20170602
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=Google's CJK font family
+EAPI=6
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=OFL-1.1
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/googlei18n/noto-cjk/archive/32a5844539f2e348ed36b44e990f9b06d7fb89fe.tar.gz -> noto-cjk-20170602.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f1179f332fc8fd0621fafaecde0cba4b
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20180814 b/metadata/md5-cache/media-fonts/noto-emoji-20180814
new file mode 100644
index 000000000000..f5e38e93c097
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/noto-emoji-20180814
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zopfli dev-python/fonttools dev-python/nototools media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick media-gfx/graphicsmagick ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=Google Noto Emoji fonts
+EAPI=6
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji
+IUSE=X
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/googlei18n/noto-emoji/archive/3ffd20ec7504657aa17c84f9aa475ad09b20c362.tar.gz -> noto-emoji-20180814.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a040a2c7b8b5afa450388fdf17a6d746
diff --git a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3 b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
index f2d1e5265576..4d1dc17bbcf2 100644
--- a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
+++ b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
@@ -1,5 +1,5 @@
 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.9.4:5 media-gfx/fontforge 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 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0:5 >=dev-qt/qtcore-5.9.4:5 media-gfx/fontforge 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 X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=Desktop/GUI font family for integrated use with the KDE Plasma desktop
 EAPI=6
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen-fonts
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=OFL-1.1
 SLOT=5
 SRC_URI=mirror://kde/unstable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	font	773ed921fdd08bed71cb1103c45748a0	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	font	773ed921fdd08bed71cb1103c45748a0	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c893d7400b2a58e8d303cf58232f583f
diff --git a/metadata/md5-cache/media-fonts/unifont-11.0.02 b/metadata/md5-cache/media-fonts/unifont-11.0.02
new file mode 100644
index 000000000000..bcf1ceeb3976
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/unifont-11.0.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
+EAPI=6
+HOMEPAGE=http://unifoundry.com/
+IUSE=fontforge utils X
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
+SLOT=0
+SRC_URI=mirror://gnu/unifont/unifont-11.0.02/unifont-11.0.02.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3ed77d66f2ef1bb3d6be3baafe125543
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 43878652abd5..f0cfeb1289a2 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/ahoviewer-1.6.4 b/metadata/md5-cache/media-gfx/ahoviewer-1.6.4
new file mode 100644
index 000000000000..e9faf1c2cbbd
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ahoviewer-1.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libconfig[cxx] dev-libs/libxml2:2 dev-libs/libsigc++:2 net-misc/curl gstreamer? ( media-libs/gst-plugins-bad:1.0 media-libs/gstreamer:1.0 ) libsecret? ( app-crypt/libsecret ) rar? ( app-arch/unrar ) ssl? ( gnutls? ( net-libs/gnutls:= net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( >=dev-libs/openssl-1.0.0:0= net-misc/curl[curl_ssl_openssl] ) ) zip? ( dev-libs/libzip ) >=app-portage/elt-patches-20170815 !<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=A GTK2 image viewer, manga reader, and booru browser
+EAPI=6
+HOMEPAGE=https://github.com/ahodesuka/ahoviewer
+IUSE=gnutls +gstreamer libsecret +rar +ssl +zip
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libconfig[cxx] dev-libs/libxml2:2 dev-libs/libsigc++:2 net-misc/curl gstreamer? ( media-libs/gst-plugins-bad:1.0 media-libs/gstreamer:1.0 ) libsecret? ( app-crypt/libsecret ) rar? ( app-arch/unrar ) ssl? ( gnutls? ( net-libs/gnutls:= net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( >=dev-libs/openssl-1.0.0:0= net-misc/curl[curl_ssl_openssl] ) ) zip? ( dev-libs/libzip ) gstreamer? ( media-libs/gst-plugins-base:1.0[X] media-libs/gst-plugins-good:1.0 || ( media-plugins/gst-plugins-vpx media-plugins/gst-plugins-libav ) )
+SLOT=0
+SRC_URI=https://github.com/ahodesuka/ahoviewer/archive/1.6.4.tar.gz -> ahoviewer-1.6.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c818c7bf23252696e602cb5e39e8054e
diff --git a/metadata/md5-cache/media-gfx/autopano-sift-C-2.5.1 b/metadata/md5-cache/media-gfx/autopano-sift-C-2.5.1
index f6c22a66fff5..3f46688797b8 100644
--- a/metadata/md5-cache/media-gfx/autopano-sift-C-2.5.1
+++ b/metadata/md5-cache/media-gfx/autopano-sift-C-2.5.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!media-gfx/autopano-sift dev-libs/libxml2 media-libs/libpano13:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib virtual/jpeg:0 sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/libxml2 media-libs/libpano13:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib virtual/jpeg:0 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=SIFT algorithm for automatic panorama creation in C
-EAPI=5
+EAPI=6
 HOMEPAGE=http://hugin.sourceforge.net/ http://user.cs.tu-berlin.de/~nowozin/autopano-sift/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=!media-gfx/autopano-sift dev-libs/libxml2 media-libs/libpano13:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib virtual/jpeg:0
+RDEPEND=dev-libs/libxml2 media-libs/libpano13:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib virtual/jpeg:0 !media-gfx/autopano-sift
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d524de97748bd106b9034cb4c054ed0c
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=feac4e5da5e1957dad343ca56335e96a
diff --git a/metadata/md5-cache/media-gfx/digikam-5.9.0 b/metadata/md5-cache/media-gfx/digikam-5.9.0
index 07d9e7c56114..9e3a8d79c2a8 100644
--- a/metadata/md5-cache/media-gfx/digikam-5.9.0
+++ b/metadata/md5-cache/media-gfx/digikam-5.9.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend 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 >=kde-frameworks/kiconthemes-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/kwidgetsaddons-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/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?] >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= media-libs/opencv:=[-qt4(-)] || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 ) media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) calendar? ( >=kde-apps/kcalcore-17.12.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) jpeg2k? ( media-libs/jasper:= ) kipi? ( >=kde-apps/libkipi-16.03.80:5 ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-apps/marble-17.12.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 ) mediaplayer? ( media-libs/qtav[opengl] ) opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.46.0:5 ) scanner? ( >=kde-apps/libksane-17.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) dev-cpp/eigen:3 dev-libs/boost[threads] sys-devel/gettext panorama? ( sys-devel/bison sys-devel/flex ) 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 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?] >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= media-libs/opencv:=[-qt4(-)] || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 ) media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) calendar? ( >=kde-apps/kcalcore-17.12.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) jpeg2k? ( media-libs/jasper:= ) kipi? ( >=kde-apps/libkipi-16.03.80:5 ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-apps/marble-17.12.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 ) mediaplayer? ( media-libs/qtav[opengl] ) opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.50.0:5 ) scanner? ( >=kde-apps/libksane-17.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.50.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) dev-cpp/eigen:3 dev-libs/boost[threads] sys-devel/gettext panorama? ( sys-devel/bison sys-devel/flex ) 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Digital photo management application
 EAPI=6
 HOMEPAGE=https://www.digikam.org/
 IUSE=addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X debug +handbook test
 KEYWORDS=amd64 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 >=kde-frameworks/kiconthemes-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/kwidgetsaddons-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/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?] >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= media-libs/opencv:=[-qt4(-)] || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 ) media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) calendar? ( >=kde-apps/kcalcore-17.12.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) jpeg2k? ( media-libs/jasper:= ) kipi? ( >=kde-apps/libkipi-16.03.80:5 ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-apps/marble-17.12.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 ) mediaplayer? ( media-libs/qtav[opengl] ) opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.46.0:5 ) scanner? ( >=kde-apps/libksane-17.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) media-plugins/kipi-plugins:5 mysql? ( virtual/mysql[server] ) panorama? ( media-gfx/hugin ) !media-gfx/digikam:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?] >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= media-libs/opencv:=[-qt4(-)] || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 ) media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) calendar? ( >=kde-apps/kcalcore-17.12.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) jpeg2k? ( media-libs/jasper:= ) kipi? ( >=kde-apps/libkipi-16.03.80:5 ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-apps/marble-17.12.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 ) mediaplayer? ( media-libs/qtav[opengl] ) opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.50.0:5 ) scanner? ( >=kde-apps/libksane-17.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.50.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) media-plugins/kipi-plugins:5 mysql? ( virtual/mysql[server] ) panorama? ( media-gfx/hugin ) !media-gfx/digikam:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.9.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4ffa69948fff8148ded432c0023afb7
diff --git a/metadata/md5-cache/media-gfx/engauge-10.6 b/metadata/md5-cache/media-gfx/engauge-10.6
index 8303ea00d4a5..6a0653b02aea 100644
--- a/metadata/md5-cache/media-gfx/engauge-10.6
+++ b/metadata/md5-cache/media-gfx/engauge-10.6
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:
 SLOT=0
 SRC_URI=https://github.com/markummitchell/engauge-digitizer/archive/v10.6.tar.gz -> engauge-digitizer-10.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e7396c696d25bfb4cdb2aa906c58eab3
+_md5_=bfa03f66bf998f416d4d8bea10cc643b
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.26_p20180319 b/metadata/md5-cache/media-gfx/exiv2-0.26_p20180319
index a977ed77ce05..14877a0ac486 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.26_p20180319
+++ b/metadata/md5-cache/media-gfx/exiv2-0.26_p20180319
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=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(-)?] ) webready? ( net-libs/libssh[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/26
 SRC_URI=https://github.com/Exiv2/exiv2/tarball/876b1314ab892cbfa6672b6b94adbeb90db4211f -> exiv2-0.26_p20180319.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b85fe07c2a5ee400ac28909b7948ff4
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.26_p20180811-r3 b/metadata/md5-cache/media-gfx/exiv2-0.26_p20180811-r3
index cc13439e9917..5125623dbc26 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.26_p20180811-r3
+++ b/metadata/md5-cache/media-gfx/exiv2-0.26_p20180811-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=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(-)?] ) webready? ( net-libs/libssh[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/26
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/exiv2-0.26_p20180811d.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dd05115205b3a7157d534bee065138f6
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.6-r1 b/metadata/md5-cache/media-gfx/gimp-2.10.6-r1
index 6db4817a8f6b..f2f1611e989c 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.10.6-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/fontconfig-2.12.4 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.56 >=media-libs/gegl-0.4.8:0.4[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 >=media-libs/libpng-1.6.25:0= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.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(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/fontconfig-2.12.4 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.56 >=media-libs/gegl-0.4.8:0.4[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 >=media-libs/libpng-1.6.25:0= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.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(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) heif? ( >=media-libs/libheif-1.1.0:= ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=6
 HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm test python_targets_python2_7
+IUSE=alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm test python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/fontconfig-2.12.4 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.56 >=media-libs/gegl-0.4.8:0.4[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 >=media-libs/libpng-1.6.25:0= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.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(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/fontconfig-2.12.4 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.56 >=media-libs/gegl-0.4.8:0.4[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 >=media-libs/libpng-1.6.25:0= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.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(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) heif? ( >=media-libs/libheif-1.1.0:= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.10/gimp-2.10.6.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6d95ab0938d1d7f325ff5014db6125c6
+_md5_=97dc3ed6f78301b086aee2b2e4db0bc0
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index d28f4375c5ad..53b43b790865 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/fontconfig-2.12.4 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.56 >=media-libs/gegl-0.4.8:0.4[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 >=media-libs/libpng-1.6.25:0= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.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(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/gtk-update-icon-cache sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/fontconfig-2.12.4 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.56 >=media-libs/gegl-0.4.8:0.4[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 >=media-libs/libpng-1.6.25:0= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.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(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) heif? ( >=media-libs/libheif-1.1.0:= ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/gtk-update-icon-cache sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=6
 HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm test python_targets_python2_7
+IUSE=alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm test python_targets_python2_7
 LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/fontconfig-2.12.4 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.56 >=media-libs/gegl-0.4.8:0.4[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 >=media-libs/libpng-1.6.25:0= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.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(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/fontconfig-2.12.4 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.56 >=media-libs/gegl-0.4.8:0.4[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 >=media-libs/libpng-1.6.25:0= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.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(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) heif? ( >=media-libs/libheif-1.1.0:= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7963ba3e89616463d28ddf1cbc83673c
+_md5_=74efaebfd5c14d6016e3cd6b016ffd52
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.10 b/metadata/md5-cache/media-gfx/graphite2-1.3.10
index 62d00f9f629c..328d7f902fba 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.10
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.10
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.10.tgz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=318f65238624f9a4fc4d994e25267863
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.11-r1 b/metadata/md5-cache/media-gfx/graphite2-1.3.11-r1
index d39af0099e40..d7d4b5dce96a 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.11-r1
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.11-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.11.tgz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b6d5a72cf72b1d67e056ceda41d60ae
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.12-r1 b/metadata/md5-cache/media-gfx/graphite2-1.3.12-r1
index a6514fb98597..20af6cac01b9 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.12-r1
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.12-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.12.tgz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b6d5a72cf72b1d67e056ceda41d60ae
diff --git a/metadata/md5-cache/media-gfx/imageworsener-1.3.3 b/metadata/md5-cache/media-gfx/imageworsener-1.3.3
new file mode 100644
index 000000000000..fe37ae06cfe2
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imageworsener-1.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install test
+DEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg:0 ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Utility for image scaling and processing
+EAPI=7
+HOMEPAGE=http://entropymine.com/imageworsener/
+IUSE=jpeg png static-libs test webp zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT-with-advertising
+RDEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg:0 ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=test? ( jpeg png webp zlib )
+SLOT=0
+SRC_URI=http://entropymine.com/imageworsener/imageworsener-1.3.3.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8
+_md5_=dca664dee8a7b12fedb44cd81f0fc85f
diff --git a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121 b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121
index 35d9a7470e64..2093cd1cdf7b 100644
--- a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121
+++ b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kcompletion-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdelibs4support-5.46.0 >=kde-frameworks/kguiaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/ktextwidgets-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/kcompletion-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdelibs4support-5.50.0 >=kde-frameworks/kguiaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/ktextwidgets-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Tool for editing color palettes
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/KColorEdit
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kcompletion-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdelibs4support-5.46.0 >=kde-frameworks/kguiaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/ktextwidgets-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !media-gfx/kcoloredit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kactivities-5.50.0 >=kde-frameworks/kcompletion-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdelibs4support-5.50.0 >=kde-frameworks/kguiaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/ktextwidgets-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !media-gfx/kcoloredit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=0
 SRC_URI=https://github.com/KDE/kcoloredit/archive/50ac0509891343bc01a0aeffda5a44a1e65d9d04.tar.gz -> kcoloredit-2.0.0_p20171121.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=26065694f81a2a0048ed593d292f2098
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
index 343b2ea90b6e..6ff328d4b2bf 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
@@ -1,13 +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 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=media-gfx/graphviz-2.30 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 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=media-gfx/graphviz-2.30 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Graphviz dot graph file viewer
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/graphics/kgraphviewer/
 IUSE=debug +handbook
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.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 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kgraphviewer/2.4.2/kgraphviewer-2.4.2.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=daace99338c9887ce9bf1dc66dbc8409
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3
index 955ca8f87ac2..456893e00b8a 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3
@@ -1,13 +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 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=media-gfx/graphviz-2.30 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 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=media-gfx/graphviz-2.30 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Graphviz dot graph file viewer
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/graphics/kgraphviewer/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.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 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kgraphviewer/2.4.3/kgraphviewer-2.4.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f90bac4ba4154aba14a059449d018bf4
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.3 b/metadata/md5-cache/media-gfx/kphotoalbum-5.3
index e5b71d6cfb21..64ce2d2a4ed0 100644
--- a/metadata/md5-cache/media-gfx/kphotoalbum-5.3
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.3
@@ -1,13 +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/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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-17.12.3:5 ) map? ( >=kde-apps/libkgeomap-17.12.3:5 ) raw? ( >=kde-apps/libkdcraw-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.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
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-18.04.3:5 ) map? ( >=kde-apps/libkgeomap-18.04.3:5 ) raw? ( >=kde-apps/libkdcraw-18.04.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Tool for indexing, searching, and viewing images
 EAPI=6
 HOMEPAGE=https://www.kphotoalbum.org/
 IUSE=+kipi +map +raw debug +handbook
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ FDL-1.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/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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-17.12.3:5 ) map? ( >=kde-apps/libkgeomap-17.12.3:5 ) raw? ( >=kde-apps/libkdcraw-17.12.3:5 ) media-video/mplayer kipi? ( media-plugins/kipi-plugins:5 ) !media-gfx/kphotoalbum:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-18.04.3:5 ) map? ( >=kde-apps/libkgeomap-18.04.3:5 ) raw? ( >=kde-apps/libkdcraw-18.04.3:5 ) media-video/mplayer kipi? ( media-plugins/kipi-plugins:5 ) !media-gfx/kphotoalbum:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kphotoalbum/5.3/kphotoalbum-5.3.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=089372d3a0e490b3588d55e51e48a53b
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.4 b/metadata/md5-cache/media-gfx/kphotoalbum-5.4
new file mode 100644
index 000000000000..47e7f432250c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-18.04.3:5 ) map? ( >=kde-apps/libkgeomap-18.04.3:5 ) raw? ( >=kde-apps/libkdcraw-18.04.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tool for indexing, searching, and viewing images
+EAPI=6
+HOMEPAGE=https://www.kphotoalbum.org/
+IUSE=+kipi +map +raw debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ FDL-1.2
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-18.04.3:5 ) map? ( >=kde-apps/libkgeomap-18.04.3:5 ) raw? ( >=kde-apps/libkdcraw-18.04.3:5 ) || ( media-video/ffmpeg media-video/mplayer ) kipi? ( media-plugins/kipi-plugins:5 ) !media-gfx/kphotoalbum:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kphotoalbum/5.4/kphotoalbum-5.4.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c97d7bd98423e5fd459cd6d77c9b449b
diff --git a/metadata/md5-cache/media-gfx/krita-4.0.4 b/metadata/md5-cache/media-gfx/krita-4.0.4
index fe1fb003ad4b..2587f68d326c 100644
--- a/metadata/md5-cache/media-gfx/krita-4.0.4
+++ b/metadata/md5-cache/media-gfx/krita-4.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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(+)?] >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-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/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[-gles2] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/boost:= dev-python/PyQt5[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/sip[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(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext vc? ( >=dev-libs/vc-1.1.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.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
+DEPEND=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(+)?] >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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[-gles2] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/boost:= dev-python/PyQt5[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/sip[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(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext vc? ( >=dev-libs/vc-1.1.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.50.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=Free digital painting application. Digital Painting, Creative Freedom!
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/graphics/krita/ https://krita.org/
 IUSE=color-management fftw gif +gsl +jpeg openexr pdf qtmedia +raw tiff vc test debug test 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-3
-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 ) >=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(+)?] >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-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/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[-gles2] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/boost:= dev-python/PyQt5[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/sip[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(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+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 ) >=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(+)?] >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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[-gles2] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/boost:= dev-python/PyQt5[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/sip[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(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 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 )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/4.0.4/krita-4.0.4.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0802af67ac615041a72517bd820f5407
diff --git a/metadata/md5-cache/media-gfx/krita-4.1.3 b/metadata/md5-cache/media-gfx/krita-4.1.3
deleted file mode 100644
index 2c6597cb4353..000000000000
--- a/metadata/md5-cache/media-gfx/krita-4.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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(+)?] >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-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/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[-gles2] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/boost:= dev-python/PyQt5[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/sip[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(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext vc? ( >=dev-libs/vc-1.1.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.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=Free digital painting application. Digital Painting, Creative Freedom!
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/krita/ https://krita.org/
-IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test 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-3
-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 ) >=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(+)?] >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-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/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[-gles2] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/boost:= dev-python/PyQt5[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/sip[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(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-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 )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/krita/4.1.3/krita-4.1.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=477bf0a95b5a3875323175825ca7d6b4
diff --git a/metadata/md5-cache/media-gfx/krita-4.1.5 b/metadata/md5-cache/media-gfx/krita-4.1.5
new file mode 100644
index 000000000000..8e4365aeff2c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-4.1.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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(+)?] >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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[-gles2] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/boost:= dev-python/PyQt5[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/sip[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(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext vc? ( >=dev-libs/vc-1.1.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.50.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=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/krita/ https://krita.org/
+IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test 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-3
+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 ) >=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(+)?] >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemmodels-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.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[-gles2] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/boost:= dev-python/PyQt5[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/sip[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(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+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 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/4.1.5/krita-4.1.5.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ad72eb46495b21027e17dd4882bca768
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1 b/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1
index d9c2056e79a3..fce59d7c90f9 100644
--- a/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1
@@ -1,13 +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/kdelibs4support-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/kjobwidgets-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/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 media-libs/imlib 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.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
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0: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 media-libs/imlib 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Image viewer based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/KuickShow
 IUSE=debug debug +handbook
 KEYWORDS=~amd64 ~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/kdelibs4support-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/kjobwidgets-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/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 media-libs/imlib x11-libs/libX11 !media-gfx/kuickshow:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kinit-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0: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 media-libs/imlib x11-libs/libX11 !media-gfx/kuickshow:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kuickshow/0.10.0/kuickshow-0.10.0.tar.xz -> kuickshow-0.10.0-r1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c56a3c3dd8fc6f17dd2af1984d0d30a
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.1.1 b/metadata/md5-cache/media-gfx/kxstitch-2.1.1
index 011ab04da2c5..00778eecc5d8 100644
--- a/metadata/md5-cache/media-gfx/kxstitch-2.1.1
+++ b/metadata/md5-cache/media-gfx/kxstitch-2.1.1
@@ -1,13 +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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0: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 >=dev-qt/qtxml-5.9.4:5 media-gfx/imagemagick[cxx] x11-libs/libX11 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.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
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0: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 >=dev-qt/qtxml-5.9.4:5 media-gfx/imagemagick[cxx] x11-libs/libX11 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Program to create cross stitch patterns
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/KXStitch
 IUSE=debug +handbook
 KEYWORDS=~amd64
 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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0: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 >=dev-qt/qtxml-5.9.4:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0: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 >=dev-qt/qtxml-5.9.4:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kxstitch/2.1.1/kxstitch-2.1.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4c941c0f7464f48647844dfe1969a221
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.11.7 b/metadata/md5-cache/media-gfx/libimagequant-2.11.7
index 9bbba1a74532..fb6a1489563f 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 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc 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	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5af358e727f62309697776d16e4123d6
+_md5_=4baae8c3b44267971cdd203e8dd71a42
diff --git a/metadata/md5-cache/media-gfx/lximage-qt-0.5.0 b/metadata/md5-cache/media-gfx/lximage-qt-0.5.0
deleted file mode 100644
index 071f937521a4..000000000000
--- a/metadata/md5-cache/media-gfx/lximage-qt-0.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libexif >=x11-libs/libfm-1.2:= x11-libs/libfm-qt:= x11-libs/libX11 x11-libs/libXfixes dev-qt/linguist-tools:5 lxqt-base/liblxqt virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=LXImage Image Viewer - GPicView replacement
-EAPI=6
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libexif >=x11-libs/libfm-1.2:= x11-libs/libfm-qt:= x11-libs/libX11 x11-libs/libXfixes
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/lximage-qt/0.5.0/lximage-qt-0.5.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0096073edeb0f7f255fa55d8af07643d
diff --git a/metadata/md5-cache/media-gfx/lximage-qt-0.7.0 b/metadata/md5-cache/media-gfx/lximage-qt-0.7.0
index 59f66b01e0d1..3a7a57cdb9c8 100644
--- a/metadata/md5-cache/media-gfx/lximage-qt-0.7.0
+++ b/metadata/md5-cache/media-gfx/lximage-qt-0.7.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtn
 DESCRIPTION=LXImage Image Viewer - GPicView replacement
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libexif >=x11-libs/libfm-1.2:= >=x11-libs/libfm-qt-0.12.0:= x11-libs/libX11 x11-libs/libXfixes
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lximage-qt/0.7.0/lximage-qt-0.7.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=64e8bce1c167cf30d1cba7f546a7b7bc
+_md5_=b3d6475ded2522496e78945dadd33a00
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.0 b/metadata/md5-cache/media-gfx/mypaint-1.2.0
deleted file mode 100644
index c649089c1b70..000000000000
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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/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=5
-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/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.0/mypaint-1.2.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=11033f81fa41e2a58a92c7b0e02d18d0
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.1 b/metadata/md5-cache/media-gfx/mypaint-1.2.1
deleted file mode 100644
index 79d79d17b641..000000000000
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c706102fe94be95892e4cbf1177c562c
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r1 b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r1
deleted file mode 100644
index 48cb43260124..000000000000
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f522a115314b2db3e2710f9e22e48115
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r2 b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r2
deleted file mode 100644
index d9e2e5bb885c..000000000000
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f33f471bcdf75639597f5a047ab6c413
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r3 b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r3
new file mode 100644
index 000000000000..394181274c27
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm 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(+)] 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 sys-libs/libomp x11-libs/gtk+:3 dev-lang/swig virtual/pkgconfig >=sys-apps/sed-4 dev-util/scons[python_targets_python2_7] dev-util/desktop-file-utils x11-misc/shared-mime-info
+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=python_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/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 sys-libs/libomp x11-libs/gtk+:3
+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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5ec03fc6a00489e9b47b6ae1f9b92a82
diff --git a/metadata/md5-cache/media-gfx/nomacs-3.10.2 b/metadata/md5-cache/media-gfx/nomacs-3.10.2
new file mode 100644
index 000000000000..69857b4bf56b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/nomacs-3.10.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/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff:0 ) zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Qt-based image viewer
+EAPI=6
+HOMEPAGE=https://nomacs.org/
+IUSE=+jpeg +opencv raw tiff zip
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff:0 ) zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
+REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
+SLOT=0
+SRC_URI=https://github.com/nomacs/nomacs/archive/3.10.2.tar.gz -> nomacs-3.10.2.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a7c7b67afe068b3942799d4912b74b19
diff --git a/metadata/md5-cache/media-gfx/openexr_viewers-2.3.0 b/metadata/md5-cache/media-gfx/openexr_viewers-2.3.0
new file mode 100644
index 000000000000..c8df5312f0ba
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/openexr_viewers-2.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=~media-libs/ilmbase-2.3.0:= ~media-libs/openexr-2.3.0:= virtual/opengl x11-libs/fltk:1[opengl] cg? ( media-gfx/nvidia-cg-toolkit ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=OpenEXR Viewers
+EAPI=6
+HOMEPAGE=http://openexr.com/
+IUSE=cg
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=~media-libs/ilmbase-2.3.0:= ~media-libs/openexr-2.3.0:= virtual/opengl x11-libs/fltk:1[opengl] cg? ( media-gfx/nvidia-cg-toolkit )
+SLOT=0
+SRC_URI=https://github.com/openexr/openexr/releases/download/v2.3.0/openexr_viewers-2.3.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0bc0da931b9f4b4b53f81774e5b3a173
diff --git a/metadata/md5-cache/media-gfx/qimgv-0.6.3 b/metadata/md5-cache/media-gfx/qimgv-0.6.3
deleted file mode 100644
index 2325d99632e2..000000000000
--- a/metadata/md5-cache/media-gfx/qimgv-0.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-video/mpv[libmpv] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A cross-platform image viewer with webm support. Written in qt5
-EAPI=6
-HOMEPAGE=https://github.com/easymodo/qimgv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-video/mpv[libmpv]
-SLOT=0
-SRC_URI=https://github.com/easymodo/qimgv/archive/v0.6.3.tar.gz -> qimgv-0.6.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=802b8f53b76d793b58dbb377ced80152
diff --git a/metadata/md5-cache/media-gfx/qimgv-0.7 b/metadata/md5-cache/media-gfx/qimgv-0.7
deleted file mode 100644
index 8bbc7e345b79..000000000000
--- a/metadata/md5-cache/media-gfx/qimgv-0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-qt/qtconcurrent-5.10.0 >=dev-qt/qtcore-5.10.0 >=dev-qt/qtgui-5.10.0 >=dev-qt/qtwidgets-5.10.0 kde? ( kde-frameworks/kwindowsystem:5 ) video? ( media-video/mpv[libmpv] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A cross-platform image viewer with webm support. Written in qt5
-EAPI=6
-HOMEPAGE=https://github.com/easymodo/qimgv
-IUSE=kde video
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtconcurrent-5.10.0 >=dev-qt/qtcore-5.10.0 >=dev-qt/qtgui-5.10.0 >=dev-qt/qtwidgets-5.10.0 kde? ( kde-frameworks/kwindowsystem:5 ) video? ( media-video/mpv[libmpv] )
-SLOT=0
-SRC_URI=https://github.com/easymodo/qimgv/archive/v0.7.tar.gz -> qimgv-0.7.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7d5a3fcf54884a7c417ffe467ed88542
diff --git a/metadata/md5-cache/media-gfx/qimgv-0.7.1 b/metadata/md5-cache/media-gfx/qimgv-0.7.1
new file mode 100644
index 000000000000..13e704487d3a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/qimgv-0.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kwindowsystem:5 ) video? ( media-video/mpv[libmpv] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A cross-platform image viewer with webm support. Written in qt5
+EAPI=6
+HOMEPAGE=https://github.com/easymodo/qimgv
+IUSE=kde video
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kwindowsystem:5 ) video? ( media-video/mpv[libmpv] )
+SLOT=0
+SRC_URI=https://github.com/easymodo/qimgv/archive/v0.7.1.tar.gz -> qimgv-0.7.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a543bad326b3eb2f85ec50b8f13390de
diff --git a/metadata/md5-cache/media-gfx/qrencode-4.0.0 b/metadata/md5-cache/media-gfx/qrencode-4.0.0
deleted file mode 100644
index 27c2a6fef5dc..000000000000
--- a/metadata/md5-cache/media-gfx/qrencode-4.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=media-libs/libpng:0= virtual/pkgconfig
-DESCRIPTION=C library for encoding data in a QR Code symbol
-EAPI=6
-HOMEPAGE=https://fukuchi.org/works/qrencode/
-IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=LGPL-2
-RDEPEND=media-libs/libpng:0=
-SLOT=0/4
-SRC_URI=https://fukuchi.org/works/qrencode/qrencode-4.0.0.tar.bz2
-_md5_=5e5fffe4562aa5c63f1d17db0d61cbbf
diff --git a/metadata/md5-cache/media-gfx/qrencode-4.0.2 b/metadata/md5-cache/media-gfx/qrencode-4.0.2
index 7f7fdb0c1d41..6fdad4650eae 100644
--- a/metadata/md5-cache/media-gfx/qrencode-4.0.2
+++ b/metadata/md5-cache/media-gfx/qrencode-4.0.2
@@ -4,9 +4,9 @@ DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=6
 HOMEPAGE=https://fukuchi.org/works/qrencode/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=media-libs/libpng:0=
 SLOT=0/4
 SRC_URI=https://fukuchi.org/works/qrencode/qrencode-4.0.2.tar.bz2
-_md5_=ac975df9d4816a7b25d3dacb8a5366e8
+_md5_=ffadd1d44ce64a47acae2bc803a588b0
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2 b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2
new file mode 100644
index 000000000000..15a63fc4a29a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sane_backends_dc210? ( >=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(-)?] ) sane_backends_dc240? ( >=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(-)?] ) sane_backends_dell1600n_net? ( >=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(-)?] >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( >=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(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-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(-)?] ) v4l? ( sys-kernel/linux-headers ) >=sys-devel/gettext-0.18.1 >=virtual/pkgconfig-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(-)?]
+DESCRIPTION=Scanner Access Now Easy - Backends
+EAPI=7
+HOMEPAGE=http://www.sane-project.org/
+IUSE=gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr -sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 -sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek -sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp abi_x86_32 abi_x86_64 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 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2 public-domain
+RDEPEND=sane_backends_dc210? ( >=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(-)?] ) sane_backends_dc240? ( >=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(-)?] ) sane_backends_dell1600n_net? ( >=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(-)?] >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( >=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(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-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(-)?] )
+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_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=43f0f64296d02f33a4d9ec1c5c4ff00c
diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.0.0 b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
index 8e34123602c2..11c3a667b725 100644
--- a/metadata/md5-cache/media-gfx/symboleditor-2.0.0
+++ b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
@@ -1,13 +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 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext 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 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Application to create libraries of QPainterPath objects with redering hints
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/SymbolEditor
 IUSE=debug +handbook
 KEYWORDS=amd64
 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 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !media-gfx/symboleditor:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !media-gfx/symboleditor:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/symboleditor/2.0.0/src/SymbolEditor-2.0.0.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=096fa8c2f08cd4a870cc12b9e93ba8b5
diff --git a/metadata/md5-cache/media-gfx/viewnior-1.6 b/metadata/md5-cache/media-gfx/viewnior-1.6
index e39d7206a516..1e3800f7c808 100644
--- a/metadata/md5-cache/media-gfx/viewnior-1.6
+++ b/metadata/md5-cache/media-gfx/viewnior-1.6
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://siyanpanayotov.com/project/viewnior/ https://github.com/hellosiyan/Viewnior
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 media-gfx/exiv2 >=x11-libs/gtk+-2.20:2 x11-misc/shared-mime-info
+RDEPEND=dev-libs/glib:2 media-gfx/exiv2 >=x11-libs/gtk+-2.20:2 x11-misc/shared-mime-info dev-util/glib-utils
 SLOT=0
 SRC_URI=https://github.com/hellosiyan/Viewnior/archive/viewnior-1.6.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=19722c7dfcec7f3a500865bd623ba90c
+_md5_=4850436353981f189d8539a489a5680c
diff --git a/metadata/md5-cache/media-gfx/w3mimgfb-0.9.1 b/metadata/md5-cache/media-gfx/w3mimgfb-0.9.1
index 2e946d3ec265..3ad5735c83ec 100644
--- a/metadata/md5-cache/media-gfx/w3mimgfb-0.9.1
+++ b/metadata/md5-cache/media-gfx/w3mimgfb-0.9.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare
 DEPEND=media-libs/stimg
 DESCRIPTION=Image viewer for w3m under frame buffer environment
-EAPI=4
+EAPI=7
 HOMEPAGE=http://homepage3.nifty.com/slokar/fb/w3mimg.html
-KEYWORDS=~amd64 x86 ppc
+KEYWORDS=~amd64 ppc x86
 LICENSE=w3m BSD
 RDEPEND=media-libs/stimg virtual/w3m
 SLOT=0
 SRC_URI=http://homepage3.nifty.com/slokar/fb/w3mimgfb-0.9.1.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=be213c91fbb429f12dd4815a144acd98
+_md5_=a9b06c93d107cf8b2a0e70a13b80ea2c
diff --git a/metadata/md5-cache/media-gfx/yafaray-3.3.0 b/metadata/md5-cache/media-gfx/yafaray-3.3.0
deleted file mode 100644
index 6c89b20cdd9b..000000000000
--- a/metadata/md5-cache/media-gfx/yafaray-3.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/boost:= dev-libs/libxml2 sys-libs/zlib blender? ( media-gfx/blender ) jpeg? ( virtual/jpeg:0 ) opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] ) openexr? ( >=media-libs/openexr-2.2.0:= ) png? ( media-libs/libpng:= ) python? ( 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(+)?] ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype ) dev-lang/swig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A free open-source montecarlo raytracing engine
-EAPI=6
-HOMEPAGE=http://www.yafaray.org
-IUSE=+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/boost:= dev-libs/libxml2 sys-libs/zlib blender? ( media-gfx/blender ) jpeg? ( virtual/jpeg:0 ) opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] ) openexr? ( >=media-libs/openexr-2.2.0:= ) png? ( media-libs/libpng:= ) python? ( 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(+)?] ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype )
-SLOT=0
-SRC_URI=https://github.com/YafaRay/Core/archive/v3.3.0.tar.gz -> yafaray-core-3.3.0.tar.gz https://github.com/YafaRay/Blender-Exporter/archive/v3.3.0.tar.gz -> yafaray-blender-exporter-3.3.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1e501e4bb95f9340302c82d7232ad6f0
diff --git a/metadata/md5-cache/media-gfx/yafaray-3.3.0-r1 b/metadata/md5-cache/media-gfx/yafaray-3.3.0-r1
new file mode 100644
index 000000000000..15ad688c0c2b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/yafaray-3.3.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/boost:= dev-libs/libxml2:2 sys-libs/zlib blender? ( media-gfx/blender ) jpeg? ( virtual/jpeg:0 ) opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] ) openexr? ( >=media-libs/openexr-2.2.0:= ) png? ( media-libs/libpng:0= ) python? ( 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_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(+)?] ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) dev-lang/swig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A free open-source montecarlo raytracing engine
+EAPI=6
+HOMEPAGE=http://www.yafaray.org
+IUSE=+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/boost:= dev-libs/libxml2:2 sys-libs/zlib blender? ( media-gfx/blender ) jpeg? ( virtual/jpeg:0 ) opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] ) openexr? ( >=media-libs/openexr-2.2.0:= ) png? ( media-libs/libpng:0= ) python? ( 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_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(+)?] ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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=0
+SRC_URI=https://github.com/YafaRay/Core/archive/v3.3.0.tar.gz -> yafaray-core-3.3.0.tar.gz https://github.com/YafaRay/Blender-Exporter/archive/v3.3.0.tar.gz -> yafaray-blender-exporter-3.3.0.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6abd67f41331233ba11ce0818e38292f
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 8a87a8cf0ed3..0b7d6f7252c2 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/allegro-5.0.11 b/metadata/md5-cache/media-libs/allegro-5.0.11
index fd24b30b9781..75c6a8ec7f0b 100644
--- a/metadata/md5-cache/media-libs/allegro-5.0.11
+++ b/metadata/md5-cache/media-libs/allegro-5.0.11
@@ -9,5 +9,5 @@ LICENSE=BSD ZLIB
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,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.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ) dumb? ( >=media-libs/dumb-0.9.3-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(-)?] ) flac? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,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+-2.24.23: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(-)?] ) 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(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) physfs? ( >=dev-games/physfs-2.0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.5.18: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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=5
 SRC_URI=mirror://sourceforge/alleg/allegro-5.0.11.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fc8420f8dcfc5f743641168594af22b9
diff --git a/metadata/md5-cache/media-libs/allegro-5.2.4.0 b/metadata/md5-cache/media-libs/allegro-5.2.4.0
index c4561562ebd7..0790c2dcd19c 100644
--- a/metadata/md5-cache/media-libs/allegro-5.2.4.0
+++ b/metadata/md5-cache/media-libs/allegro-5.2.4.0
@@ -10,5 +10,5 @@ RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi
 REQUIRED_USE=X? ( opengl ) xinerama? ( X )
 SLOT=5
 SRC_URI=https://github.com/liballeg/allegro5/releases/download/5.2.4.0/allegro-5.2.4.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=922151bcac7fa669398965f68e8e6142
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.1.4.1 b/metadata/md5-cache/media-libs/alsa-lib-1.1.4.1
deleted file mode 100644
index 2919e3f3146a..000000000000
--- a/metadata/md5-cache/media-libs/alsa-lib-1.1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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(+)] ) doc? ( >=app-doc/doxygen-1.2.6 ) >=app-portage/elt-patches-20170815 !<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=Advanced Linux Sound Architecture Library
-EAPI=6
-HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-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(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://alsaproject/lib/alsa-lib-1.1.4.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2b41bb0d178c04397d596051ac7bfc66
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.1.5 b/metadata/md5-cache/media-libs/alsa-lib-1.1.5
deleted file mode 100644
index 04f90e5a4b6c..000000000000
--- a/metadata/md5-cache/media-libs/alsa-lib-1.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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(+)] ) doc? ( >=app-doc/doxygen-1.2.6 ) >=app-portage/elt-patches-20170815 !<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=Advanced Linux Sound Architecture Library
-EAPI=6
-HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-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(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://alsaproject/lib/alsa-lib-1.1.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2b41bb0d178c04397d596051ac7bfc66
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.1.6-r1 b/metadata/md5-cache/media-libs/alsa-lib-1.1.6-r1
index d70039449ed4..f03884476a6c 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.1.6-r1
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.1.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=6
 HOMEPAGE=https://alsa-project.org/
 IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 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 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=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(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.1.6.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0c1f55beb3ae23b320bff03ce9523211
+_md5_=c7dc702cd40cd5220e6851b67e0277a5
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.1.7 b/metadata/md5-cache/media-libs/alsa-lib-1.1.7
new file mode 100644
index 000000000000..4810017bb75f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.1.7
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install prepare setup test
+DEPEND=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(+)?] ) doc? ( >=app-doc/doxygen-1.2.6 )
+DESCRIPTION=Advanced Linux Sound Architecture Library
+EAPI=7
+HOMEPAGE=https://alsa-project.org/
+IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 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 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=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=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 ) )
+SLOT=0
+SRC_URI=mirror://alsaproject/lib/alsa-lib-1.1.7.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6e5a75e9260df652cbd98c60c336c27f
diff --git a/metadata/md5-cache/media-libs/alsa-oss-1.1.6 b/metadata/md5-cache/media-libs/alsa-oss-1.1.6
index aa0a9eb17aeb..36e986c1e3c3 100644
--- a/metadata/md5-cache/media-libs/alsa-oss-1.1.6
+++ b/metadata/md5-cache/media-libs/alsa-oss-1.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced Linux Sound Architecture OSS compatibility layer
 EAPI=6
 HOMEPAGE=https://alsa-project.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.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(-)?]
 SLOT=0
 SRC_URI=mirror://alsaproject/oss-lib/alsa-oss-1.1.6.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1e5c2626246ea26273e4777181688b0e
+_md5_=c98c7926d6605c571f31b4975650505e
diff --git a/metadata/md5-cache/media-libs/aribb24-1.0.3 b/metadata/md5-cache/media-libs/aribb24-1.0.3
index 6d0c2a0fd9d6..a61e36f96804 100644
--- a/metadata/md5-cache/media-libs/aribb24-1.0.3
+++ b/metadata/md5-cache/media-libs/aribb24-1.0.3
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng:0= virtual/pkgconfig >=app-portage/elt-patches-20170815
 DESCRIPTION=Library for decoding ARIB STD-B24 subtitles
 EAPI=6
 HOMEPAGE=https://github.com/nkoriyama/aribb24
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=media-libs/libpng:0=
 SLOT=0
 SRC_URI=https://github.com/nkoriyama/aribb24/archive/v1.0.3.tar.gz -> aribb24-1.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=357888572a017a5bf997aedb26960fea
+_md5_=26c0588b2ee6133279b6704a73d69048
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.7 b/metadata/md5-cache/media-libs/aubio-0.4.7
index dd3003d95cec..966a24ca05c7 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.7
+++ b/metadata/md5-cache/media-libs/aubio-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video
 REQUIRED_USE=|| ( python_targets_python2_7 ) ?? ( double-precision libsamplerate )
 SLOT=0/5
 SRC_URI=https://aubio.org/pub/aubio-0.4.7.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3162370198f08353c9344dcd2041bb24
diff --git a/metadata/md5-cache/media-libs/celt-0.11.1-r1 b/metadata/md5-cache/media-libs/celt-0.11.1-r1
deleted file mode 100644
index d0da2a71efad..000000000000
--- a/metadata/md5-cache/media-libs/celt-0.11.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=ogg? ( media-libs/libogg )
-DESCRIPTION=CELT is a very low delay audio codec designed for high-quality communications
-EAPI=5
-HOMEPAGE=http://www.celt-codec.org/
-IUSE=ogg static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86
-LICENSE=BSD-2
-RDEPEND=ogg? ( media-libs/libogg )
-SLOT=0
-SRC_URI=http://downloads.us.xiph.org/releases/celt/celt-0.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f13d6f06f1c52d4cfbd5fecdbaf1d7de
diff --git a/metadata/md5-cache/media-libs/celt-0.11.3 b/metadata/md5-cache/media-libs/celt-0.11.3
deleted file mode 100644
index cda98b2c8465..000000000000
--- a/metadata/md5-cache/media-libs/celt-0.11.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ogg? ( media-libs/libogg ) >=app-portage/elt-patches-20170815 !<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=CELT is a very low delay audio codec designed for high-quality communications
-EAPI=6
-HOMEPAGE=http://www.celt-codec.org/
-IUSE=ogg 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 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD-2
-RDEPEND=ogg? ( media-libs/libogg )
-SLOT=0
-SRC_URI=http://downloads.us.xiph.org/releases/celt/celt-0.11.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf912303da621c9230908b82710130ba
diff --git a/metadata/md5-cache/media-libs/celt-0.5.1.3 b/metadata/md5-cache/media-libs/celt-0.5.1.3
deleted file mode 100644
index 845daf9c7db3..000000000000
--- a/metadata/md5-cache/media-libs/celt-0.5.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=ogg? ( media-libs/libogg )
-DESCRIPTION=CELT is a very low delay audio codec designed for high-quality communications
-EAPI=6
-HOMEPAGE=http://www.celt-codec.org/
-IUSE=ogg static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=ogg? ( media-libs/libogg )
-SLOT=0.5.1
-SRC_URI=http://downloads.us.xiph.org/releases/celt/celt-0.5.1.3.tar.gz
-_md5_=50851f4a2ac610fb0ebce81cdb1925d1
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.4.2 b/metadata/md5-cache/media-libs/chromaprint-1.4.2
index df690910e51c..faaeea1f7758 100644
--- a/metadata/md5-cache/media-libs/chromaprint-1.4.2
+++ b/metadata/md5-cache/media-libs/chromaprint-1.4.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=libav? ( >=media-video/libav-11:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( >=media-video/ffmpeg-2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1
 SRC_URI=https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-1.4.2.tar.gz test? ( https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f93da75d05b39b25828788e3a528ae9
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.4.3 b/metadata/md5-cache/media-libs/chromaprint-1.4.3
index 4e353b296fc6..3c7a4d4c4a9b 100644
--- a/metadata/md5-cache/media-libs/chromaprint-1.4.3
+++ b/metadata/md5-cache/media-libs/chromaprint-1.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=A client-side library that implements a custom algorithm for extract
 EAPI=6
 HOMEPAGE=https://acoustid.org/chromaprint
 IUSE=libav test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=libav? ( >=media-video/libav-11:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( >=media-video/ffmpeg-2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1
 SRC_URI=https://github.com/acoustid/chromaprint/releases/download/v1.4.3/chromaprint-1.4.3.tar.gz test? ( https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8b5639e62676fce41533d3f47fee3178
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2b18fd1881212dc7b0e52298bc8be483
diff --git a/metadata/md5-cache/media-libs/codec2-0.7 b/metadata/md5-cache/media-libs/codec2-0.7
index 552baaf91596..248fa832fc0b 100644
--- a/metadata/md5-cache/media-libs/codec2-0.7
+++ b/metadata/md5-cache/media-libs/codec2-0.7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ia64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://freedv.com/wp-content/uploads/sites/8/2017/10/codec2-0.7.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=519debfd4719859f8873333e9940efc4
diff --git a/metadata/md5-cache/media-libs/codec2-0.8.1 b/metadata/md5-cache/media-libs/codec2-0.8.1
index 0861774e3ecc..84d7d0534762 100644
--- a/metadata/md5-cache/media-libs/codec2-0.8.1
+++ b/metadata/md5-cache/media-libs/codec2-0.8.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://hobbes1069.fedorapeople.org/freetel/codec2/codec2-0.8.1.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd0f03ba2ad6f81058f7a9f56379c29b
diff --git a/metadata/md5-cache/media-libs/devil-1.7.8-r2 b/metadata/md5-cache/media-libs/devil-1.7.8-r2
index e4637fa3353e..8fe01b6cc9e9 100644
--- a/metadata/md5-cache/media-libs/devil-1.7.8-r2
+++ b/metadata/md5-cache/media-libs/devil-1.7.8-r2
@@ -4,10 +4,10 @@ DESCRIPTION=DevIL image library
 EAPI=6
 HOMEPAGE=http://openil.sourceforge.net/
 IUSE=allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl static-libs tiff X xpm
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib:= ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://sourceforge/openil/DevIL-1.7.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ade809f4c51946c30b8841f06a877377
+_md5_=8dfbe728f66c6f15540aed49011fc615
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.13.0-r4 b/metadata/md5-cache/media-libs/fontconfig-2.13.0-r4
index 83a4231c304c..a067bb667d4e 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.13.0-r4
+++ b/metadata/md5-cache/media-libs/fontconfig-2.13.0-r4
@@ -4,11 +4,11 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=6
 HOMEPAGE=https://fontconfig.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9[abi_x86_32(-)?,abi_x86_64(-)?,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_Darwin? ( sys-apps/util-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(-)?] ) elibc_Darwin? ( sys-libs/native-uuid ) virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,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://fontconfig.org/release/fontconfig-2.13.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=72deaea816264888828b5bcd0197c119
+_md5_=0231c2f1211fd7bcc7dc259f55866b7a
diff --git a/metadata/md5-cache/media-libs/freeglut-3.0.0 b/metadata/md5-cache/media-libs/freeglut-3.0.0
index d57391f93efe..542a4d7686fd 100644
--- a/metadata/md5-cache/media-libs/freeglut-3.0.0
+++ b/metadata/md5-cache/media-libs/freeglut-3.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/freeglut/freeglut-3.0.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4804309adbba5a79d9c8c588d1dfd702
diff --git a/metadata/md5-cache/media-libs/game-music-emu-0.6.2 b/metadata/md5-cache/media-libs/game-music-emu-0.6.2
index 7ee749fb8f97..507d8f11a798 100644
--- a/metadata/md5-cache/media-libs/game-music-emu-0.6.2
+++ b/metadata/md5-cache/media-libs/game-music-emu-0.6.2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.2.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4faf055c8d9dc85aa57d320e42d0c3e0
diff --git a/metadata/md5-cache/media-libs/ganv-1.4.2 b/metadata/md5-cache/media-libs/ganv-1.4.2
index b4632d926161..2f872d8c7708 100644
--- a/metadata/md5-cache/media-libs/ganv-1.4.2
+++ b/metadata/md5-cache/media-libs/ganv-1.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 x11-libs/gtk+:2 graphviz? ( media-gfx/graphviz[gtk] ) introspection? ( app-text/yelp-tools dev-libs/gobject-introspection:=[doctool] )
 SLOT=0
 SRC_URI=http://download.drobilla.net/ganv-1.4.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=bb67a3efd7356891501b070e4d3fb709
diff --git a/metadata/md5-cache/media-libs/gd-2.2.5-r1 b/metadata/md5-cache/media-libs/gd-2.2.5-r1
index 90ff068ec560..d8f598e2cab1 100644
--- a/metadata/md5-cache/media-libs/gd-2.2.5-r1
+++ b/metadata/md5-cache/media-libs/gd-2.2.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Graphics library for fast image creation
 EAPI=6
 HOMEPAGE=https://libgd.org/ https://www.boutell.com/gd/
 IUSE=fontconfig jpeg png static-libs tiff truetype webp xpm zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gd IJG HPND BSD
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.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(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=prefix? ( fontconfig )
 SLOT=2/3
 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.5/libgd-2.2.5.tar.xz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=164a4cf95c1f6eedbb03c26f5301a02a
+_md5_=523c715c1412c00299d76ffd2fa55386
diff --git a/metadata/md5-cache/media-libs/glpng-1.46-r1 b/metadata/md5-cache/media-libs/glpng-1.46-r1
index 2002465fb402..767aa11ad4d8 100644
--- a/metadata/md5-cache/media-libs/glpng-1.46-r1
+++ b/metadata/md5-cache/media-libs/glpng-1.46-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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=http://repo.or.cz/w/glpng.git/snapshot/v1.46.tar.gz -> glpng-1.46.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a88413d177c536b61f676f33a63b62da
diff --git a/metadata/md5-cache/media-libs/glyr-1.0.10 b/metadata/md5-cache/media-libs/glyr-1.0.10
index 7cb2fbd8552e..1389688a7ec9 100644
--- a/metadata/md5-cache/media-libs/glyr-1.0.10
+++ b/metadata/md5-cache/media-libs/glyr-1.0.10
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.10:2 net-misc/curl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A music related metadata searchengine, both with commandline interface and C API
-EAPI=5
+DESCRIPTION=Music related metadata searchengine, both with commandline interface and C API
+EAPI=6
 HOMEPAGE=https://github.com/sahib/glyr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.10:2 net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/sahib/glyr/archive/1.0.10.tar.gz -> glyr-1.0.10.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=858e64f6e1d74d77f8fe3c328a6cc419
+_md5_=fe92049f9567193c87417f4c4115cc16
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.9.0 b/metadata/md5-cache/media-libs/harfbuzz-1.9.0
index 7ac231afcd81..4004b3d688d5 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.9.0
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.9.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a94e810dce4883587582719e23a6a3d3
+_md5_=b0a4932332bac2345895f8df6f2418ec
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.0.0 b/metadata/md5-cache/media-libs/harfbuzz-2.0.0
new file mode 100644
index 000000000000..3ea7c0c8e12a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.0.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=An OpenType text shaping engine
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.0.0.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ef88ad43881b6f124cb4d9fe5a03665c
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.0.2 b/metadata/md5-cache/media-libs/harfbuzz-2.0.2
new file mode 100644
index 000000000000..60d0b4faec44
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=An OpenType text shaping engine
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.0.2.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ef88ad43881b6f124cb4d9fe5a03665c
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index a8b74802253a..867006881551 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] !<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=compile configure install prepare setup test unpack
-DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=dev-libs/gobject-introspection-common-1.34 dev-util/ragel >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] !<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=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=dev-libs/gobject-introspection-common-1.34 dev-util/ragel
 DESCRIPTION=An OpenType text shaping engine
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a94e810dce4883587582719e23a6a3d3
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ef88ad43881b6f124cb4d9fe5a03665c
diff --git a/metadata/md5-cache/media-libs/ilmbase-2.3.0 b/metadata/md5-cache/media-libs/ilmbase-2.3.0
new file mode 100644
index 000000000000..c7c370e77950
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ilmbase-2.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=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=OpenEXR ILM Base libraries
+EAPI=6
+HOMEPAGE=http://openexr.com/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 -arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=BSD
+SLOT=0/24
+SRC_URI=https://github.com/openexr/openexr/releases/download/v2.3.0/ilmbase-2.3.0.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=64fed41d663f60cd5274a56b65ceb137
diff --git a/metadata/md5-cache/media-libs/jasper-2.0.14 b/metadata/md5-cache/media-libs/jasper-2.0.14
index d281be1f4af6..4c4176849b3c 100644
--- a/metadata/md5-cache/media-libs/jasper-2.0.14
+++ b/metadata/md5-cache/media-libs/jasper-2.0.14
@@ -9,5 +9,5 @@ LICENSE=JasPer2.0
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.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(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/4
 SRC_URI=https://github.com/mdadams/jasper/archive/version-2.0.14.tar.gz -> jasper-2.0.14.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb2ee37e13abf94cb1e6b9a2b6d0df0c
diff --git a/metadata/md5-cache/media-libs/jasper-9999 b/metadata/md5-cache/media-libs/jasper-9999
index 78f285b1da24..cd495301b784 100644
--- a/metadata/md5-cache/media-libs/jasper-9999
+++ b/metadata/md5-cache/media-libs/jasper-9999
@@ -7,5 +7,5 @@ IUSE=doc jpeg opengl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 LICENSE=JasPer2.0
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.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(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,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
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e62c23723feb90e01c6a6cee7efb38e0
diff --git a/metadata/md5-cache/media-libs/libaom-1.0.0 b/metadata/md5-cache/media-libs/libaom-1.0.0
index 2f32de2867b1..0ba029bb53fc 100644
--- a/metadata/md5-cache/media-libs/libaom-1.0.0
+++ b/metadata/md5-cache/media-libs/libaom-1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/0
 SRC_URI=mirror://gentoo/libaom-1.0.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd9a02b7640c7e284825d2ed5cc8cb0f
diff --git a/metadata/md5-cache/media-libs/libaom-9999 b/metadata/md5-cache/media-libs/libaom-9999
index 93b9bbb21966..30c8a4bac51b 100644
--- a/metadata/md5-cache/media-libs/libaom-9999
+++ b/metadata/md5-cache/media-libs/libaom-9999
@@ -7,5 +7,5 @@ IUSE=doc examples cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_fla
 LICENSE=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9f9468a28f609a3fd87771868a612d4
diff --git a/metadata/md5-cache/media-libs/libasdcp-cth-0.1.2 b/metadata/md5-cache/media-libs/libasdcp-cth-0.1.2
index 4cfb46c9470e..7b10f9d8dc7b 100644
--- a/metadata/md5-cache/media-libs/libasdcp-cth-0.1.2
+++ b/metadata/md5-cache/media-libs/libasdcp-cth-0.1.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://carlh.net/downloads/libasdcp-cth/libasdcp-cth-0.1.2.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=d7526a96f02c8ead2c2970810dfed096
diff --git a/metadata/md5-cache/media-libs/libasdcp-cth-0.1.3 b/metadata/md5-cache/media-libs/libasdcp-cth-0.1.3
index 419b7762cddb..cb60509cf9ce 100644
--- a/metadata/md5-cache/media-libs/libasdcp-cth-0.1.3
+++ b/metadata/md5-cache/media-libs/libasdcp-cth-0.1.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://carlh.net/downloads/libasdcp-cth/libasdcp-cth-0.1.3.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=d7526a96f02c8ead2c2970810dfed096
diff --git a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2 b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
index fc38d879e6f9..a357f1126b28 100644
--- a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
+++ b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Bauer stereophonic-to-binaural DSP library
 EAPI=7
 HOMEPAGE=http://bs2b.sourceforge.net/
 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 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=media-libs/libsndfile-1.0.25-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/bs2b/libbs2b-3.1.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d7c5288a1fc17b92612f2cdb1e39f2fa
+_md5_=f9be77361e87d090cd1a1dccaadd967a
diff --git a/metadata/md5-cache/media-libs/libcuefile-477-r1 b/metadata/md5-cache/media-libs/libcuefile-477-r1
index 52ce7668b628..32615d7e7940 100644
--- a/metadata/md5-cache/media-libs/libcuefile-477-r1
+++ b/metadata/md5-cache/media-libs/libcuefile-477-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/libcuefile-477.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=585f325d0fd9227243ab8885d6e6235e
diff --git a/metadata/md5-cache/media-libs/libdcp-1.3.4 b/metadata/md5-cache/media-libs/libdcp-1.3.4
index d360f6dc32da..ad77f6c28bfe 100644
--- a/metadata/md5-cache/media-libs/libdcp-1.3.4
+++ b/metadata/md5-cache/media-libs/libdcp-1.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 >=dev-libs/boost-1.61.0 <dev-libs/libcxml-0.15.4 dev-libs/libsigc++:2 dev-libs/libxml2 dev-libs/openssl:0 dev-libs/xmlsec media-libs/libasdcp-cth media-libs/openjpeg:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick )
 SLOT=1.0
 SRC_URI=http://carlh.net/downloads/libdcp/libdcp-1.3.4.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=3153bebaa025421f8590bdc9085248da
diff --git a/metadata/md5-cache/media-libs/libdcp-1.4.4 b/metadata/md5-cache/media-libs/libdcp-1.4.4
index 8311f0196ca3..cb102dfc6427 100644
--- a/metadata/md5-cache/media-libs/libdcp-1.4.4
+++ b/metadata/md5-cache/media-libs/libdcp-1.4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 >=dev-libs/boost-1.61.0 >=dev-libs/libcxml-0.15.4 dev-libs/libsigc++:2 dev-libs/libxml2 dev-libs/openssl:0 dev-libs/xmlsec >=media-libs/libasdcp-cth-0.1.3 media-libs/openjpeg:2 || ( media-gfx/graphicsmagick media-gfx/imagemagick )
 SLOT=1.0
 SRC_URI=http://carlh.net/downloads/libdcp/libdcp-1.4.4.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=58754467a3c55d203b469d873b60c32b
diff --git a/metadata/md5-cache/media-libs/libdcp-1.5.2 b/metadata/md5-cache/media-libs/libdcp-1.5.2
index f32e6a81f7f4..608a19432420 100644
--- a/metadata/md5-cache/media-libs/libdcp-1.5.2
+++ b/metadata/md5-cache/media-libs/libdcp-1.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 >=dev-libs/boost-1.61.0 >=dev-libs/libcxml-0.15.4 dev-libs/libsigc++:2 dev-libs/libxml2 dev-libs/openssl:0 dev-libs/xmlsec >=media-libs/libasdcp-cth-0.1.3 media-libs/openjpeg:2 || ( media-gfx/graphicsmagick media-gfx/imagemagick )
 SLOT=1.0
 SRC_URI=http://carlh.net/downloads/libdcp/libdcp-1.5.2.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=94b4c0992a31beab554e8af1be949d3b
diff --git a/metadata/md5-cache/media-libs/libdcp-9999 b/metadata/md5-cache/media-libs/libdcp-9999
index 04d55b401e57..3ab660e803c9 100644
--- a/metadata/md5-cache/media-libs/libdcp-9999
+++ b/metadata/md5-cache/media-libs/libdcp-9999
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 >=dev-libs/boost-1.61.0 >=dev-libs/libcxml-0.15.4 dev-libs/libsigc++:2 dev-libs/libxml2 dev-libs/openssl:0 dev-libs/xmlsec >=media-libs/libasdcp-cth-0.1.3 media-libs/openjpeg:2 || ( media-gfx/graphicsmagick media-gfx/imagemagick )
 SLOT=1.0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=8847bec163243fe4d131f9efc797c402
diff --git a/metadata/md5-cache/media-libs/libebur128-1.2.3 b/metadata/md5-cache/media-libs/libebur128-1.2.3
index 1532f0d2227a..e13aa14267b7 100644
--- a/metadata/md5-cache/media-libs/libebur128-1.2.3
+++ b/metadata/md5-cache/media-libs/libebur128-1.2.3
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.2.3.tar.gz -> libebur128-1.2.3.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bb585889cb0ada3db2e3997aa433c753
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.21 b/metadata/md5-cache/media-libs/libexif-0.6.21
deleted file mode 100644
index 4dd67498d7b7..000000000000
--- a/metadata/md5-cache/media-libs/libexif-0.6.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Library for parsing, editing, and saving EXIF data
-EAPI=4
-HOMEPAGE=http://libexif.sourceforge.net/
-IUSE=doc nls static-libs
-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 ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/libexif/libexif-0.6.21.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48a9840585e21b0900394c511dcd3101
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.21-r1 b/metadata/md5-cache/media-libs/libexif-0.6.21-r1
deleted file mode 100644
index 24a22c517e06..000000000000
--- a/metadata/md5-cache/media-libs/libexif-0.6.21-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=nls? ( virtual/libintl ) virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Library for parsing, editing, and saving EXIF data
-EAPI=5
-HOMEPAGE=http://libexif.sourceforge.net/
-IUSE=doc 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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/libexif/libexif-0.6.21.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b2577d86f67da8742d8d48c6f369438
diff --git a/metadata/md5-cache/media-libs/libextractor-1.7 b/metadata/md5-cache/media-libs/libextractor-1.7
new file mode 100644
index 000000000000..8b3c9585ae3a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libextractor-1.7
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/iso-codes dev-libs/glib:2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/htmltidy ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Library to extract metadata from files of arbitrary type
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libextractor/
+IUSE=apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-text/iso-codes dev-libs/glib:2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/htmltidy ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) !sci-biology/glimmer
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu/libextractor/libextractor-1.7.tar.gz
+_md5_=85cb0c2add0acf48115ff81247822296
diff --git a/metadata/md5-cache/media-libs/libggi-2.2.2 b/metadata/md5-cache/media-libs/libggi-2.2.2
index cc952be62ae4..d7bdacfdce82 100644
--- a/metadata/md5-cache/media-libs/libggi-2.2.2
+++ b/metadata/md5-cache/media-libs/libggi-2.2.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
 DEPEND=>=media-libs/libgii-1.0.2 X? ( x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm x11-libs/libXt ) svga? ( >=media-libs/svgalib-1.4.2 ) aalib? ( >=media-libs/aalib-1.2-r1 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=Fast and safe graphics and drivers for about any graphics card to the Linux kernel (sometimes)
+DESCRIPTION=Provides an opaque interface to the display's acceleration function
 EAPI=0
-HOMEPAGE=http://www.ggi-project.org
+HOMEPAGE=https://ibiblio.org/ggicore/packages/libggi.html
 IUSE=X aalib svga fbcon directfb 3dfx debug cpu_flags_x86_mmx vis
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=media-libs/libgii-1.0.2 X? ( x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm x11-libs/libXt ) svga? ( >=media-libs/svgalib-1.4.2 ) aalib? ( >=media-libs/aalib-1.2-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ggi/libggi-2.2.2.src.tar.bz2
-_md5_=0830bce31fb448d194ccf1c2fc88bb8f
+_md5_=2546befba1fe584b8e4afc726e9a1fc6
diff --git a/metadata/md5-cache/media-libs/libggi-2.2.2-r1 b/metadata/md5-cache/media-libs/libggi-2.2.2-r1
new file mode 100644
index 000000000000..484c3911a078
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libggi-2.2.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=media-libs/libgii-1.0.2 aalib? ( >=media-libs/aalib-1.2-r1 ) svga? ( >=media-libs/svgalib-1.4.2 ) X? ( x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm ) X? ( x11-base/xorg-proto )
+DESCRIPTION=Provides an opaque interface to the display's acceleration function
+EAPI=7
+HOMEPAGE=https://ibiblio.org/ggicore/packages/libggi.html
+IUSE=3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=MIT
+RDEPEND=>=media-libs/libgii-1.0.2 aalib? ( >=media-libs/aalib-1.2-r1 ) svga? ( >=media-libs/svgalib-1.4.2 ) X? ( x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm )
+SLOT=0
+SRC_URI=mirror://sourceforge/ggi/libggi-2.2.2.src.tar.bz2
+_md5_=47fe537218491142c33b8d8f20a99079
diff --git a/metadata/md5-cache/media-libs/libggigcp-1.0.2 b/metadata/md5-cache/media-libs/libggigcp-1.0.2
index 15d7e5e816c0..1c9d64ec4d93 100644
--- a/metadata/md5-cache/media-libs/libggigcp-1.0.2
+++ b/metadata/md5-cache/media-libs/libggigcp-1.0.2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DEPEND=>=media-libs/libggi-2.2.2
-DESCRIPTION=Library for General Graphics Interface
+DESCRIPTION=Libggi extension for advanced color and palette handling
 EAPI=0
-HOMEPAGE=http://www.ggi-project.org
+HOMEPAGE=https://ibiblio.org/ggicore/packages/libggigcp.html
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=media-libs/libggi-2.2.2
 SLOT=0
 SRC_URI=mirror://sourceforge/ggi/libggigcp-1.0.2.src.tar.bz2
-_md5_=632e1263b94c79a7388e8be232cc86f1
+_md5_=d9aa05c49c824d556b981d2a215d117a
diff --git a/metadata/md5-cache/media-libs/libggigcp-1.0.2-r1 b/metadata/md5-cache/media-libs/libggigcp-1.0.2-r1
new file mode 100644
index 000000000000..30dd77b53e38
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libggigcp-1.0.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DEPEND=>=media-libs/libggi-2.2.2
+DESCRIPTION=Libggi extension for advanced color and palette handling
+EAPI=7
+HOMEPAGE=https://ibiblio.org/ggicore/packages/libggigcp.html
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=media-libs/libggi-2.2.2
+SLOT=0
+SRC_URI=mirror://sourceforge/ggi/libggigcp-1.0.2.src.tar.bz2
+_md5_=a4495e89a027d3d06bda52d48ca97c1e
diff --git a/metadata/md5-cache/media-libs/libggimisc-2.2.2 b/metadata/md5-cache/media-libs/libggimisc-2.2.2
index a7c72a9f92e8..a72c01f4d61b 100644
--- a/metadata/md5-cache/media-libs/libggimisc-2.2.2
+++ b/metadata/md5-cache/media-libs/libggimisc-2.2.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst
 DEPEND=>=media-libs/libggi-2.2.2 svga? ( media-libs/svgalib )
-DESCRIPTION=Library for General Graphics Interface
+DESCRIPTION=Adds support for some special graphical target features
 EAPI=0
-HOMEPAGE=http://www.ggi-project.org
+HOMEPAGE=https://ibiblio.org/ggicore/packages/libggimisc.html
 IUSE=fbcon svga
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=media-libs/libggi-2.2.2 svga? ( media-libs/svgalib )
 SLOT=0
 SRC_URI=mirror://sourceforge/ggi/libggimisc-2.2.2.src.tar.bz2
-_md5_=b05b8fbf78dd6fd65bff5be21ccb6382
+_md5_=820b28e5dd0ec0719179928a9904294e
diff --git a/metadata/md5-cache/media-libs/libggimisc-2.2.2-r1 b/metadata/md5-cache/media-libs/libggimisc-2.2.2-r1
new file mode 100644
index 000000000000..2bff33aea0e2
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libggimisc-2.2.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=>=media-libs/libggi-2.2.2 svga? ( media-libs/svgalib )
+DESCRIPTION=Adds support for some special graphical target features
+EAPI=7
+HOMEPAGE=https://ibiblio.org/ggicore/packages/libggimisc.html
+IUSE=fbcon svga
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=media-libs/libggi-2.2.2 svga? ( media-libs/svgalib )
+SLOT=0
+SRC_URI=mirror://sourceforge/ggi/libggimisc-2.2.2.src.tar.bz2
+_md5_=120617dea6b727f7e0fef700e93678d6
diff --git a/metadata/md5-cache/media-libs/libggiwmh-0.3.2 b/metadata/md5-cache/media-libs/libggiwmh-0.3.2
index 3cf45201d7dd..211058b2fc7e 100644
--- a/metadata/md5-cache/media-libs/libggiwmh-0.3.2
+++ b/metadata/md5-cache/media-libs/libggiwmh-0.3.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
 DEPEND=>=media-libs/libggi-2.2.2 X? ( x11-libs/libXxf86vm x11-libs/libXxf86dga x11-libs/libXext x11-libs/libX11 )
-DESCRIPTION=Library for General Graphics Interface
+DESCRIPTION=Window manager hints extensions for libggi
 EAPI=0
-HOMEPAGE=http://www.ggi-project.org
+HOMEPAGE=https://ibiblio.org/ggicore/packages/libggiwmh.html
 IUSE=X
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=media-libs/libggi-2.2.2 X? ( x11-libs/libXxf86vm x11-libs/libXxf86dga x11-libs/libXext x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ggi/libggiwmh-0.3.2.src.tar.bz2
-_md5_=b68fbfb1a0ff5e0e553f70ce22209d23
+_md5_=1d57787de2da04938e61cab871e0dd21
diff --git a/metadata/md5-cache/media-libs/libggiwmh-0.3.2-r1 b/metadata/md5-cache/media-libs/libggiwmh-0.3.2-r1
new file mode 100644
index 000000000000..9676b583cc07
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libggiwmh-0.3.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=media-libs/libggi-2.2.2 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm )
+DESCRIPTION=Window manager hints extensions for libggi
+EAPI=7
+HOMEPAGE=https://ibiblio.org/ggicore/packages/libggiwmh.html
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=MIT
+RDEPEND=>=media-libs/libggi-2.2.2 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm )
+SLOT=0
+SRC_URI=mirror://sourceforge/ggi/libggiwmh-0.3.2.src.tar.bz2
+_md5_=895e82f299b966573c81109ec74abcf9
diff --git a/metadata/md5-cache/media-libs/libgii-1.0.2-r1 b/metadata/md5-cache/media-libs/libgii-1.0.2-r1
index 97524d0b707f..1c1e2d2f17c1 100644
--- a/metadata/md5-cache/media-libs/libgii-1.0.2-r1
+++ b/metadata/md5-cache/media-libs/libgii-1.0.2-r1
@@ -1,8 +1,8 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=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/libXxf86dga-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 ) >=app-portage/elt-patches-20170815 !<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=Fast and safe graphics and drivers for about any graphics card to the Linux kernel (sometimes)
+DESCRIPTION=Easy to use, but yet powerful, API for all possible input sources
 EAPI=5
-HOMEPAGE=http://www.ggi-project.org
+HOMEPAGE=https://ibiblio.org/ggicore/packages/libgii.html
 IUSE=X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2
@@ -10,4 +10,4 @@ RDEPEND=X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 SLOT=0
 SRC_URI=mirror://sourceforge/ggi/libgii-1.0.2.src.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1f60de83fde7a580eb39b54810d3c25
+_md5_=980318e5ea15941bab4487600bd2ad60
diff --git a/metadata/md5-cache/media-libs/libgii-1.0.2-r2 b/metadata/md5-cache/media-libs/libgii-1.0.2-r2
new file mode 100644
index 000000000000..6ca98066074d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libgii-1.0.2-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install prepare test
+DEPEND=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/libXxf86dga-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 )
+DESCRIPTION=Easy to use, but yet powerful, API for all possible input sources
+EAPI=7
+HOMEPAGE=https://ibiblio.org/ggicore/packages/libgii.html
+IUSE=X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=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/libXxf86dga-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=mirror://sourceforge/ggi/libgii-1.0.2.src.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a2def0080ffbc4108d89d5c00d2f51ec
diff --git a/metadata/md5-cache/media-libs/libgroove-4.3.0-r1 b/metadata/md5-cache/media-libs/libgroove-4.3.0-r1
index 0a1b5df8599a..16e3bd2551f4 100644
--- a/metadata/md5-cache/media-libs/libgroove-4.3.0-r1
+++ b/metadata/md5-cache/media-libs/libgroove-4.3.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=libav? ( media-video/libav ) !libav? ( media-video/ffmpeg ) chromaprint? ( media-libs/chromaprint ) loudness? ( media-libs/libebur128[speex(+)] ) sound? ( media-libs/libsdl2[sound] ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) chromaprint? ( media-libs/chromaprint:= ) loudness? ( media-libs/libebur128:=[speex(+)] ) sound? ( media-libs/libsdl2[sound] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Streaming audio processing library.
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/andrewrk/libgroove
 IUSE=+chromaprint libav +loudness +sound static-libs
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=libav? ( media-video/libav ) !libav? ( media-video/ffmpeg ) chromaprint? ( media-libs/chromaprint ) loudness? ( media-libs/libebur128[speex(+)] ) sound? ( media-libs/libsdl2[sound] )
+RDEPEND=libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) chromaprint? ( media-libs/chromaprint:= ) loudness? ( media-libs/libebur128:=[speex(+)] ) sound? ( media-libs/libsdl2[sound] )
 SLOT=0/4
 SRC_URI=https://github.com/andrewrk/libgroove/archive/4.3.0.tar.gz -> libgroove-4.3.0.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=780d05665ef303fa5e5b08439d309419
+_md5_=8fc8d2108a6fb8cde9bf78f190a0b10a
diff --git a/metadata/md5-cache/media-libs/libharu-2.3.0-r2 b/metadata/md5-cache/media-libs/libharu-2.3.0-r2
index dd6b85b8c941..ceeb67fa906d 100644
--- a/metadata/md5-cache/media-libs/libharu-2.3.0-r2
+++ b/metadata/md5-cache/media-libs/libharu-2.3.0-r2
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=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(-)?]
 SLOT=0/2.3.0
 SRC_URI=https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz -> libharu-2.3.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e1e3bf3e1407b1c373b3f11fd4a5664c
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.0 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.0
index 7d90c3cb434b..b85c3027c03f 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.0
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.0.0.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb8d73679b4379de25750c61830688a0
diff --git a/metadata/md5-cache/media-libs/libmad-0.15.1b-r9 b/metadata/md5-cache/media-libs/libmad-0.15.1b-r9
index c2d6986916af..f8fa1fc0930c 100644
--- a/metadata/md5-cache/media-libs/libmad-0.15.1b-r9
+++ b/metadata/md5-cache/media-libs/libmad-0.15.1b-r9
@@ -4,9 +4,9 @@ DESCRIPTION="M"peg "A"udio "D"ecoder library
 EAPI=7
 HOMEPAGE=http://mad.sourceforge.net
 IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mad/libmad-0.15.1b.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=56ab94e90a506b802be595b38686f494
+_md5_=4de0315e8aaa75ea762299b1cbe51db6
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.16 b/metadata/md5-cache/media-libs/libmpdclient-2.16
new file mode 100644
index 000000000000..a06ee2fc43f3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen ) test? ( dev-libs/check ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=A library for interfacing Music Player Daemon (media-sound/mpd)
+EAPI=6
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient
+IUSE=doc examples test
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.16.tar.xz
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d6e734e6b0bd2afad46c7a1bed588e2b
diff --git a/metadata/md5-cache/media-libs/libnsbmp-0.1.4 b/metadata/md5-cache/media-libs/libnsbmp-0.1.4
deleted file mode 100644
index 20300f6551cb..000000000000
--- a/metadata/md5-cache/media-libs/libnsbmp-0.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=decoding library for BMP and ICO image file formats, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libnsbmp/
-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 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-SLOT=0/0.1.4
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsbmp-0.1.4-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d6d0c6f57bf239c080a7287df5080ab3
diff --git a/metadata/md5-cache/media-libs/libnsbmp-0.1.5 b/metadata/md5-cache/media-libs/libnsbmp-0.1.5
new file mode 100644
index 000000000000..745b5bbfa532
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libnsbmp-0.1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=decoding library for BMP and ICO image file formats, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/libnsbmp/
+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 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
+LICENSE=MIT
+SLOT=0/0.1.5
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsbmp-0.1.5-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e81be17e2fcdd03bdc136885808a3222
diff --git a/metadata/md5-cache/media-libs/libnsgif-0.1.4 b/metadata/md5-cache/media-libs/libnsgif-0.1.4
deleted file mode 100644
index 11b5ad35b768..000000000000
--- a/metadata/md5-cache/media-libs/libnsgif-0.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=decoding library for the GIF image file format, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libnsgif/
-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 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsgif-0.1.4-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f2484ed17a1de9683a2652b2ad667a7
diff --git a/metadata/md5-cache/media-libs/libnsgif-0.2.0 b/metadata/md5-cache/media-libs/libnsgif-0.2.0
deleted file mode 100644
index e25c7222a531..000000000000
--- a/metadata/md5-cache/media-libs/libnsgif-0.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=decoding library for the GIF image file format, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libnsgif/
-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 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsgif-0.2.0-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.6.tar.gz -> netsurf-buildsystem-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8e4f2b7c9b01d4983d615ccf6a8f8d1d
diff --git a/metadata/md5-cache/media-libs/libnsgif-0.2.1 b/metadata/md5-cache/media-libs/libnsgif-0.2.1
new file mode 100644
index 000000000000..192221437676
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libnsgif-0.2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=decoding library for the GIF image file format, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/libnsgif/
+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 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsgif-0.2.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=769d8140a94b3aef7d3136bb9aa2e1a7
diff --git a/metadata/md5-cache/media-libs/libnspsl-0.1.0 b/metadata/md5-cache/media-libs/libnspsl-0.1.0
deleted file mode 100644
index b729aca2959b..000000000000
--- a/metadata/md5-cache/media-libs/libnspsl-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=decoding library for BMP and ICO image file formats, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/
-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 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-SLOT=0/0.1.0
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libnspsl-0.1.0-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d46380aa8c0e2d06d3daf96af2c2943f
diff --git a/metadata/md5-cache/media-libs/libnspsl-0.1.2 b/metadata/md5-cache/media-libs/libnspsl-0.1.2
deleted file mode 100644
index c746ae068cbf..000000000000
--- a/metadata/md5-cache/media-libs/libnspsl-0.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=decoding library for BMP and ICO image file formats, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/
-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 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-SLOT=0/0.1.2
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libnspsl-0.1.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.6.tar.gz -> netsurf-buildsystem-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d382fc45530ca54c346959323721f04b
diff --git a/metadata/md5-cache/media-libs/libnspsl-0.1.3 b/metadata/md5-cache/media-libs/libnspsl-0.1.3
new file mode 100644
index 000000000000..3577d277a8f9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libnspsl-0.1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=decoding library for BMP and ICO image file formats, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/
+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 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
+LICENSE=MIT
+SLOT=0/0.1.3
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libnspsl-0.1.3-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3dea866a23ea32600adce202058339a9
diff --git a/metadata/md5-cache/media-libs/libopenglrecorder-0.1.0 b/metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
index 6b1b511dc5c9..ed6a44bb6ef3 100644
--- a/metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
+++ b/metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] openh264? ( media-libs/openh264[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,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-sound/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(-)?] ) vpx? ( media-libs/libvpx: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=0
 SRC_URI=https://github.com/Benau/libopenglrecorder/archive/v0.1.0.tar.gz -> libopenglrecorder-0.1.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8a05ef9f9b36070229fd79cd6b5dd0b
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.1.3 b/metadata/md5-cache/media-libs/libopenshot-0.1.3
deleted file mode 100644
index 6ee2f2b5b0d8..000000000000
--- a/metadata/md5-cache/media-libs/libopenshot-0.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] media-libs/libopenshot-audio imagemagick? ( media-gfx/imagemagick:0=[cxx] ) libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) python? ( 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python? ( dev-lang/swig ) test? ( dev-libs/unittest++ ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Video editing library used by OpenShot
-EAPI=6
-HOMEPAGE=http://www.openshotvideo.com/
-IUSE=+imagemagick libav +python test python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] media-libs/libopenshot-audio imagemagick? ( media-gfx/imagemagick:0=[cxx] ) libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) python? ( 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.1.3.tar.gz -> libopenshot-0.1.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e4918c0ee92a34c98c3f85707c297f01
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.1.7 b/metadata/md5-cache/media-libs/libopenshot-0.1.7
deleted file mode 100644
index 43f8284ab859..000000000000
--- a/metadata/md5-cache/media-libs/libopenshot-0.1.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] media-libs/libopenshot-audio imagemagick? ( <media-gfx/imagemagick-7:0=[cxx] ) libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) 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(+)?] ) python? ( dev-lang/swig ) test? ( dev-libs/unittest++ ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Video editing library used by OpenShot
-EAPI=6
-HOMEPAGE=http://www.openshotvideo.com/
-IUSE=+imagemagick libav +python test 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-3
-RDEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] media-libs/libopenshot-audio imagemagick? ( <media-gfx/imagemagick-7:0=[cxx] ) libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) 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(+)?] )
-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
-SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.1.7.tar.gz -> libopenshot-0.1.7.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=71abbe35cb2cafcf734d02a8b9c072cd
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.2.2 b/metadata/md5-cache/media-libs/libopenshot-0.2.2
new file mode 100644
index 000000000000..7da32e6186c6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libopenshot-0.2.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.1.4 imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) 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(+)?] ) python? ( dev-lang/swig ) test? ( dev-libs/unittest++ ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Video editing library used by OpenShot
+EAPI=6
+HOMEPAGE=http://www.openshotvideo.com/
+IUSE=+imagemagick libav +python test 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-3
+RDEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.1.4 imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) 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(+)?] )
+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
+SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.2.2.tar.gz -> libopenshot-0.2.2.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e47f34622dde659ac3613e2450d395b7
diff --git a/metadata/md5-cache/media-libs/libopusenc-0.2 b/metadata/md5-cache/media-libs/libopusenc-0.2
index 3f80f84f58af..944c0f5103f9 100644
--- a/metadata/md5-cache/media-libs/libopusenc-0.2
+++ b/metadata/md5-cache/media-libs/libopusenc-0.2
@@ -5,9 +5,9 @@ DESCRIPTION=High-level API for encoding .opus files
 EAPI=7
 HOMEPAGE=https://www.opus-codec.org/
 IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=media-libs/opus-1.1
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/opus/libopusenc-0.2.tar.gz
-_md5_=0e2e4b79612428fd8a8859e79a0a5afc
+_md5_=6b5c9bf1530e31cd418584f520ec2cc3
diff --git a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0 b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
index 5288d3252da3..613fb404ee38 100644
--- a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
+++ b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Library for writing accessibility clients such as screen readers
 EAPI=6
 HOMEPAGE=https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityclient.git
 IUSE=debug examples
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-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
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/libqaccessibilityclient/libqaccessibilityclient-0.2.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c7e8936093a6f374d30ba182fafd283
diff --git a/metadata/md5-cache/media-libs/libquicktime-1.2.4-r3 b/metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
index 4f3147307135..5a33d696ac45 100644
--- a/metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
+++ b/metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
@@ -5,11 +5,11 @@ DESCRIPTION=An enhanced version of the quicktime4linux library
 EAPI=7
 HOMEPAGE=http://libquicktime.sourceforge.net/
 IUSE=aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aac? ( >=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] encode? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) dv? ( >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( libav? ( >=media-video/libav-12: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(-)?] ) !libav? ( >=media-video/ffmpeg-3.2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gtk? ( x11-libs/gtk+:2 ) 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(-)?] ) lame? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=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(-)?] >=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 x11-libs/libXaw x11-libs/libXext x11-libs/libXt x11-libs/libXv ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/libquicktime/libquicktime-1.2.4.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=683129e206c71f67f155856bb331e65d
+_md5_=b921fdca4e9924818f8b7949c728f7ff
diff --git a/metadata/md5-cache/media-libs/libraw-0.18.11 b/metadata/md5-cache/media-libs/libraw-0.18.11
deleted file mode 100644
index 7fdf5709a2d1..000000000000
--- a/metadata/md5-cache/media-libs/libraw-0.18.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=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(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5: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(-)?] ) virtual/pkgconfig
-DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
-EAPI=6
-HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
-IUSE=demosaic examples jpeg jpeg2k +lcms openmp abi_x86_32 abi_x86_64 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-linux ~x86-linux
-LICENSE=LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )
-RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5: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/16
-SRC_URI=https://www.libraw.org/data/LibRaw-0.18.11.tar.gz demosaic? ( https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz )
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=fe1789854d24d2bdf186ebcdfaa2af14
diff --git a/metadata/md5-cache/media-libs/libraw-0.18.12 b/metadata/md5-cache/media-libs/libraw-0.18.12
deleted file mode 100644
index 791229c59da4..000000000000
--- a/metadata/md5-cache/media-libs/libraw-0.18.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=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(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5: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(-)?] ) virtual/pkgconfig
-DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
-EAPI=7
-HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
-IUSE=demosaic examples jpeg jpeg2k +lcms openmp abi_x86_32 abi_x86_64 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-linux ~x86-linux
-LICENSE=LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )
-RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5: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/16
-SRC_URI=https://www.libraw.org/data/LibRaw-0.18.12.tar.gz demosaic? ( https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz )
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0b9a17be79df6fd580cd1cede041a044
diff --git a/metadata/md5-cache/media-libs/libraw-0.18.13 b/metadata/md5-cache/media-libs/libraw-0.18.13
index 28de383f317c..503bf4fa82ff 100644
--- a/metadata/md5-cache/media-libs/libraw-0.18.13
+++ b/metadata/md5-cache/media-libs/libraw-0.18.13
@@ -4,10 +4,10 @@ DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital phot
 EAPI=7
 HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
 IUSE=demosaic examples jpeg jpeg2k +lcms openmp abi_x86_32 abi_x86_64 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-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5: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/16
 SRC_URI=https://www.libraw.org/data/LibRaw-0.18.13.tar.gz demosaic? ( https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz )
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=96397b59827231a7c3a6799ba13eabca
+_md5_=3f2e21cd0dbf091f79400fb1c715e6b6
diff --git a/metadata/md5-cache/media-libs/libreplaygain-477-r1 b/metadata/md5-cache/media-libs/libreplaygain-477-r1
index d9e68fbd2adf..256f8605b12b 100644
--- a/metadata/md5-cache/media-libs/libreplaygain-477-r1
+++ b/metadata/md5-cache/media-libs/libreplaygain-477-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/libreplaygain-477.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5197438bd502b3e2ee5152f578fad051
diff --git a/metadata/md5-cache/media-libs/librosprite-0.1.2-r1 b/metadata/md5-cache/media-libs/librosprite-0.1.2-r1
deleted file mode 100644
index 5950d3b50dbd..000000000000
--- a/metadata/md5-cache/media-libs/librosprite-0.1.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig
-DESCRIPTION=framebuffer abstraction library, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/librosprite/
-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 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://download.netsurf-browser.org/libs/releases/librosprite-0.1.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=82806ab74d6c2cd2e6d342ec1f667e8f
diff --git a/metadata/md5-cache/media-libs/librosprite-0.1.3 b/metadata/md5-cache/media-libs/librosprite-0.1.3
new file mode 100644
index 000000000000..19152a97b4ae
--- /dev/null
+++ b/metadata/md5-cache/media-libs/librosprite-0.1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig
+DESCRIPTION=framebuffer abstraction library, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/librosprite/
+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 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://download.netsurf-browser.org/libs/releases/librosprite-0.1.3-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e0699950a96cdd88d8d81c3adefd2696
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.8-r2 b/metadata/md5-cache/media-libs/libsdl2-2.0.8-r2
index b4545bc2d740..bf36c2f0a5cc 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.8-r2
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.8-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=6
 HOMEPAGE=http://www.libsdl.org
 IUSE=cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 wayland X xinerama xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) gles? ( >=media-libs/mesa-9.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(-)?,gles2] ) kms? ( >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,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/mesa-9.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gbm] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.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(-)?] >=media-libs/mesa-9.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(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-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/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) )
 REQUIRED_USE=alsa? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) wayland? ( gles ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=01fb94babefcc64d8f29c9a4dcb6dd4f
+_md5_=a024d664f7032d249cdf348edcba27c9
diff --git a/metadata/md5-cache/media-libs/libsfml-2.4.2-r1 b/metadata/md5-cache/media-libs/libsfml-2.4.2-r1
deleted file mode 100644
index a0211aace232..000000000000
--- a/metadata/md5-cache/media-libs/libsfml-2.4.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/flac media-libs/freetype:2 media-libs/libpng:0= media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 kernel_linux? ( virtual/libudev:0 ) virtual/opengl !kernel_Winnt? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Simple and Fast Multimedia Library (SFML)
-EAPI=6
-HOMEPAGE=http://www.sfml-dev.org/ https://github.com/SFML/SFML
-IUSE=debug doc examples
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=media-libs/flac media-libs/freetype:2 media-libs/libpng:0= media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 kernel_linux? ( virtual/libudev:0 ) virtual/opengl !kernel_Winnt? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image )
-SLOT=0/2.4
-SRC_URI=https://github.com/SFML/SFML/archive/2.4.2.tar.gz -> libsfml-2.4.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=94bef337b2b741fb0300ce6a74c5fb04
diff --git a/metadata/md5-cache/media-libs/libsfml-2.5.0 b/metadata/md5-cache/media-libs/libsfml-2.5.0
deleted file mode 100644
index bfaa81d2b189..000000000000
--- a/metadata/md5-cache/media-libs/libsfml-2.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/flac media-libs/freetype:2 media-libs/libpng:0= media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 kernel_linux? ( virtual/libudev:0 ) virtual/opengl !kernel_Winnt? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Simple and Fast Multimedia Library (SFML)
-EAPI=6
-HOMEPAGE=http://www.sfml-dev.org/ https://github.com/SFML/SFML
-IUSE=debug doc examples
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=media-libs/flac media-libs/freetype:2 media-libs/libpng:0= media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 kernel_linux? ( virtual/libudev:0 ) virtual/opengl !kernel_Winnt? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image )
-SLOT=0/2.5
-SRC_URI=https://github.com/SFML/SFML/archive/2.5.0.tar.gz -> libsfml-2.5.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=29a829d25987179d555c039c5a0238b5
diff --git a/metadata/md5-cache/media-libs/libsfml-2.5.1 b/metadata/md5-cache/media-libs/libsfml-2.5.1
new file mode 100644
index 000000000000..ce613590884c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsfml-2.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/flac media-libs/freetype:2 media-libs/libpng:0= media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 kernel_linux? ( virtual/libudev:0 ) virtual/opengl !kernel_Winnt? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Simple and Fast Multimedia Library (SFML)
+EAPI=6
+HOMEPAGE=http://www.sfml-dev.org/ https://github.com/SFML/SFML
+IUSE=debug doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=media-libs/flac media-libs/freetype:2 media-libs/libpng:0= media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 kernel_linux? ( virtual/libudev:0 ) virtual/opengl !kernel_Winnt? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image )
+SLOT=0/2.5
+SRC_URI=https://github.com/SFML/SFML/archive/2.5.1.tar.gz -> libsfml-2.5.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=717c05d2a9b2c114f5db49e6c5361eff
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4 b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
index e84f8387e859..d687bd903835 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
@@ -5,10 +5,10 @@ DESCRIPTION=C library for reading and writing files containing sampled sound
 EAPI=7
 HOMEPAGE=http://www.mega-nerd.com/libsndfile
 IUSE=alsa minimal sqlite 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 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!minimal? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] ) alsa? ( media-libs/alsa-lib ) sqlite? ( >=dev-db/sqlite-3.2 )
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.28.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=145d2410f9bea56c9d03136600ca4dd3
+_md5_=80118466470ee09d489732a7b19886c7
diff --git a/metadata/md5-cache/media-libs/libsoundio-1.1.0-r1 b/metadata/md5-cache/media-libs/libsoundio-1.1.0-r1
index 8f5cb90c22ce..05f98b193f42 100644
--- a/metadata/md5-cache/media-libs/libsoundio-1.1.0-r1
+++ b/metadata/md5-cache/media-libs/libsoundio-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=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(-)?] ) jack? ( || ( >=media-sound/jack-audio-connection-kit-0.125.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-sound/jack2-1.9.11_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(-)?] ) ) pulseaudio? ( media-sound/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(-)?] )
 SLOT=0/1
 SRC_URI=http://libsound.io/release/libsoundio-1.1.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=11c0d6617198eda3680e11e01a8899a9
diff --git a/metadata/md5-cache/media-libs/libsub-1.1.13 b/metadata/md5-cache/media-libs/libsub-1.1.13
index b2e29f561d6b..6b60e42e8256 100644
--- a/metadata/md5-cache/media-libs/libsub-1.1.13
+++ b/metadata/md5-cache/media-libs/libsub-1.1.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost:= <dev-libs/libcxml-0.15.4 dev-libs/openssl:0 media-libs/libasdcp-cth
 SLOT=1.0
 SRC_URI=http://carlh.net/downloads/libsub/libsub-1.1.13.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=49788254b4c0c6557205c33258f45ac4
diff --git a/metadata/md5-cache/media-libs/libsub-1.2.4 b/metadata/md5-cache/media-libs/libsub-1.2.4
index e86df24d9f49..b7026e9bcb4b 100644
--- a/metadata/md5-cache/media-libs/libsub-1.2.4
+++ b/metadata/md5-cache/media-libs/libsub-1.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost:= >=dev-libs/libcxml-0.15.4 dev-libs/openssl:0 >=media-libs/libasdcp-cth-0.1.3
 SLOT=1.0
 SRC_URI=http://carlh.net/downloads/libsub/libsub-1.2.4.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=00a1d86b3a86c9702708cdca53814f9c
diff --git a/metadata/md5-cache/media-libs/libsub-1.3.1 b/metadata/md5-cache/media-libs/libsub-1.3.1
index 7b1116eac160..0a7ebf7e30f5 100644
--- a/metadata/md5-cache/media-libs/libsub-1.3.1
+++ b/metadata/md5-cache/media-libs/libsub-1.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost:= >=dev-libs/libcxml-0.15.4 dev-libs/openssl:0 >=media-libs/libasdcp-cth-0.1.3
 SLOT=1.0
 SRC_URI=http://carlh.net/downloads/libsub/libsub-1.3.1.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=980b552d0f0f76389a6be4b6cb816a22
diff --git a/metadata/md5-cache/media-libs/libsub-9999 b/metadata/md5-cache/media-libs/libsub-9999
index 764eba7b514a..078dca6652d2 100644
--- a/metadata/md5-cache/media-libs/libsub-9999
+++ b/metadata/md5-cache/media-libs/libsub-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://carlh.net/libsub
 LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost:= >=dev-libs/libcxml-0.15.4 dev-libs/openssl:0 >=media-libs/libasdcp-cth-0.1.3
 SLOT=1.0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=1174f1fb00e98810fa9b29b86d46686c
diff --git a/metadata/md5-cache/media-libs/libsvgtiny-0.1.6 b/metadata/md5-cache/media-libs/libsvgtiny-0.1.6
deleted file mode 100644
index 565ccb65412a..000000000000
--- a/metadata/md5-cache/media-libs/libsvgtiny-0.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/libdom-0.1.2-r1[xml,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(-)?] >=dev-libs/libwapcaplet-0.2.2-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/gperf virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=framebuffer abstraction library, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libsvgtiny/
-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 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-RDEPEND=>=net-libs/libdom-0.1.2-r1[xml,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(-)?] >=dev-libs/libwapcaplet-0.2.2-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/0.1.6
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libsvgtiny-0.1.6-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.6.tar.gz -> netsurf-buildsystem-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aac0b8ebd1f6c91f774324970fd7493b
diff --git a/metadata/md5-cache/media-libs/libsvgtiny-0.1.7 b/metadata/md5-cache/media-libs/libsvgtiny-0.1.7
new file mode 100644
index 000000000000..6bc51e2cc716
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsvgtiny-0.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-libs/libdom-0.1.2-r1[xml,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(-)?] >=dev-libs/libwapcaplet-0.2.2-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/gperf virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=framebuffer abstraction library, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/libsvgtiny/
+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 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
+LICENSE=MIT
+RDEPEND=>=net-libs/libdom-0.1.2-r1[xml,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(-)?] >=dev-libs/libwapcaplet-0.2.2-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/0.1.7
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libsvgtiny-0.1.7-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=162045998a73f3a3d3164eaaa69aff5d
diff --git a/metadata/md5-cache/media-libs/libtheora-1.1.1-r2 b/metadata/md5-cache/media-libs/libtheora-1.1.1-r2
index 79f6b3c4f81a..ddd0b711a2e6 100644
--- a/metadata/md5-cache/media-libs/libtheora-1.1.1-r2
+++ b/metadata/md5-cache/media-libs/libtheora-1.1.1-r2
@@ -5,11 +5,11 @@ DESCRIPTION=The Theora Video Compression Codec
 EAPI=7
 HOMEPAGE=https://www.theora.org
 IUSE=doc +encode examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=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(-)?] encode? ( >=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(-)?] ) examples? ( media-libs/libpng:0= >=media-libs/libsdl-0.11.0 media-libs/libvorbis:= )
 REQUIRED_USE=examples? ( encode )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=71e02e3f38917877a61e523286ee3e0e
+_md5_=a68f06e7cb509e7edf17be9bb368cd7c
diff --git a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1 b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
deleted file mode 100644
index 3d4d24bdd271..000000000000
--- a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=media-libs/mesa >=app-portage/elt-patches-20170815
-DESCRIPTION=Helper library for S3TC texture (de)compression
-EAPI=5
-HOMEPAGE=https://cgit.freedesktop.org/~mareko/libtxc_dxtn/
-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 ~arm ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=media-libs/mesa
-RESTRICT=bindist
-SLOT=0
-SRC_URI=https://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39655b0b1a24791fb7d50c0d62ebcc01
diff --git a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r3 b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r3
deleted file mode 100644
index 4cd5a49e7912..000000000000
--- a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Helper library for S3TC texture (de)compression
-EAPI=6
-HOMEPAGE=https://cgit.freedesktop.org/~mareko/libtxc_dxtn/
-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 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=bindist
-SLOT=0
-SRC_URI=https://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2
-_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d1cc5e80f1c340d5e40fc56ca4a59074
diff --git a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r4 b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r4
new file mode 100644
index 000000000000..79297bd39be3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/mesa
+DESCRIPTION=Helper library for S3TC texture (de)compression
+EAPI=7
+HOMEPAGE=https://cgit.freedesktop.org/~mareko/libtxc_dxtn/
+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 ~arm ~arm64 ~ppc ~ppc64 x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d6c50359537ee7595fc8e8de1ef3b1b1
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.2-r2 b/metadata/md5-cache/media-libs/lilv-0.24.2-r2
index 8a62ad3206e4..cf18ec724f80 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.2-r2
+++ b/metadata/md5-cache/media-libs/lilv-0.24.2-r2
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.14.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(-)?] >=media-libs/sratom-0.6.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-libs/serd-0.28.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-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.2.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=adad5aab28f512fe71737454c649f938
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.2-r3 b/metadata/md5-cache/media-libs/lilv-0.24.2-r3
index 047be5504585..60d8bebd6060 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.2-r3
+++ b/metadata/md5-cache/media-libs/lilv-0.24.2-r3
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.14.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(-)?] >=media-libs/sratom-0.6.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-libs/serd-0.28.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-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.2.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=3769ce48ad2b3f0df8a3f997ffdd5f22
diff --git a/metadata/md5-cache/media-libs/lv2-1.14.0-r1 b/metadata/md5-cache/media-libs/lv2-1.14.0-r1
index 55b8af664db3..9f36c2b1c8b2 100644
--- a/metadata/md5-cache/media-libs/lv2-1.14.0-r1
+++ b/metadata/md5-cache/media-libs/lv2-1.14.0-r1
@@ -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 )
 SLOT=0
 SRC_URI=http://lv2plug.in/spec/lv2-1.14.0.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=cd65e7fae291fa80241951c637fbc50f
diff --git a/metadata/md5-cache/media-libs/lvtk-1.2.0 b/metadata/md5-cache/media-libs/lvtk-1.2.0
index c04fc32be4af..87e3e3471d7f 100644
--- a/metadata/md5-cache/media-libs/lvtk-1.2.0
+++ b/metadata/md5-cache/media-libs/lvtk-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=media-libs/lv2 >=dev-libs/boost-1.40.0 python_targets_python2_7? ( >=dev
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/lvtk/lvtk/archive/1.2.0.tar.gz -> lvtk-1.2.0.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=fb0de1af5a6764eb256e853a3e726130
diff --git a/metadata/md5-cache/media-libs/mesa-18.2.2-r1 b/metadata/md5-cache/media-libs/mesa-18.2.2-r1
new file mode 100644
index 000000000000..e7e59311dcbf
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-18.2.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.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/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.93[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang: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(-)?] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm: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(-)?] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.8.0[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=6
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.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/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.93[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang: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(-)?] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm: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(-)?] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) 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
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.2.2.tar.xz
+_eclasses_=llvm	01fccd3367b527770b74bfbf59d616c6	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b5f5b6a0eab9c6aca1476b4d52f6ceb9
diff --git a/metadata/md5-cache/media-libs/mesa-18.2.3 b/metadata/md5-cache/media-libs/mesa-18.2.3
new file mode 100644
index 000000000000..d34bb97cbd75
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-18.2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.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/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.93[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang: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(-)?] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm: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(-)?] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.8.0[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=6
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.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/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.93[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang: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(-)?] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm: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(-)?] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) 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
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.2.3.tar.xz
+_eclasses_=llvm	01fccd3367b527770b74bfbf59d616c6	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b5f5b6a0eab9c6aca1476b4d52f6ceb9
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 5bce80fb9c8e..48547c3c8379 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst pretend setup test unpack
-DEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.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/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.93[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang: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(-)?] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm: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(-)?] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 >=dev-python/mako-0.8.0[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.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/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.96[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.96[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.96[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.96[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang: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(-)?] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm: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(-)?] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 >=dev-python/mako-0.8.0[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=6
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan wayland xa xvmc abi_x86_32 abi_x86_64 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=MIT
-RDEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.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/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.93[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.93[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.93[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang: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(-)?] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm: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(-)?] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+RDEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.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/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.96[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.96[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.96[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.96[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.96[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang: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(-)?] sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm: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(-)?] sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
 REQUIRED_USE=d3d9? ( dri3 ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) 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	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=31396941e92b23a7c24cd1ca4a15d743
+_md5_=aa60436d3fc786ce43ccfd6746f7e35b
diff --git a/metadata/md5-cache/media-libs/openal-1.18.2-r1 b/metadata/md5-cache/media-libs/openal-1.18.2-r1
index fd3fb9495de4..5c501b6c9a89 100644
--- a/metadata/md5-cache/media-libs/openal-1.18.2-r1
+++ b/metadata/md5-cache/media-libs/openal-1.18.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.2.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2843db6501e947870658b8f28e1fe3c3
diff --git a/metadata/md5-cache/media-libs/openal-1.19.0 b/metadata/md5-cache/media-libs/openal-1.19.0
index 3bbf9f13c69b..8c744de5c017 100644
--- a/metadata/md5-cache/media-libs/openal-1.19.0
+++ b/metadata/md5-cache/media-libs/openal-1.19.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2 )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.19.0.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a68dcfe81c1c7334a9513d5db9bb278f
diff --git a/metadata/md5-cache/media-libs/opencv-3.2.0-r3 b/metadata/md5-cache/media-libs/opencv-3.2.0-r3
index bd5301831dd5..99f3f2ab01a9 100644
--- a/metadata/md5-cache/media-libs/opencv-3.2.0-r3
+++ b/metadata/md5-cache/media-libs/opencv-3.2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) tesseract? ( contrib )
 SLOT=0/3.2
 SRC_URI=https://github.com/opencv/opencv/archive/3.2.0.tar.gz -> opencv-3.2.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/3.2.0.tar.gz -> opencv-3.2.0_contrib.tar.gz contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36287bd5fe543300fffd3ac62aaa8060
diff --git a/metadata/md5-cache/media-libs/opencv-3.3.0-r5 b/metadata/md5-cache/media-libs/opencv-3.3.0-r5
index b3e5b1c45132..583cf5a39a66 100644
--- a/metadata/md5-cache/media-libs/opencv-3.3.0-r5
+++ b/metadata/md5-cache/media-libs/opencv-3.3.0-r5
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_dnn? ( contrib ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tesseract? ( contrib )
 SLOT=0/3.3
 SRC_URI=https://github.com/opencv/opencv/archive/3.3.0.tar.gz -> opencv-3.3.0.tar.gz https://dev.gentoo.org/~amynka/snap/imgcodecs-opencv-3.3.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/3.3.0.tar.gz -> opencv-3.3.0_contrib.tar.gz contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz -> tiny-dnn-1.0.0a3.tar.gz ) contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c393d6d4ca192e92b01dc5f61b889550
diff --git a/metadata/md5-cache/media-libs/opencv-3.4.1-r2 b/metadata/md5-cache/media-libs/opencv-3.4.1-r2
index e2e5046243e1..602ae828944e 100644
--- a/metadata/md5-cache/media-libs/opencv-3.4.1-r2
+++ b/metadata/md5-cache/media-libs/opencv-3.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnn_samples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_dnn? ( contrib ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tesseract? ( contrib )
 SLOT=0/3.4.1
 SRC_URI=https://github.com/opencv/opencv/archive/3.4.1.tar.gz -> opencv-3.4.1.tar.gz dnn_samples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/3.4.1.tar.gz -> opencv-3.4.1_contrib.tar.gz contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz -> tiny-dnn-1.0.0a3.tar.gz https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=55bdf0c4f001e0dec7f610ea05e54724
diff --git a/metadata/md5-cache/media-libs/opencv-3.4.1-r4 b/metadata/md5-cache/media-libs/opencv-3.4.1-r4
index 2fac425c1034..9d3f518b4aec 100644
--- a/metadata/md5-cache/media-libs/opencv-3.4.1-r4
+++ b/metadata/md5-cache/media-libs/opencv-3.4.1-r4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnn_samples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_dnn? ( contrib ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tesseract? ( contrib )
 SLOT=0/3.4.1
 SRC_URI=https://github.com/opencv/opencv/archive/3.4.1.tar.gz -> opencv-3.4.1.tar.gz dnn_samples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/3.4.1.tar.gz -> opencv-3.4.1_contrib.tar.gz contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz -> tiny-dnn-1.0.0a3.tar.gz https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb9987435041d7861d305dfa8e112490
diff --git a/metadata/md5-cache/media-libs/openexr-1.7.0 b/metadata/md5-cache/media-libs/openexr-1.7.0
deleted file mode 100644
index 5d88355426f6..000000000000
--- a/metadata/md5-cache/media-libs/openexr-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib >=media-libs/ilmbase-1.0.2 virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
-EAPI=2
-HOMEPAGE=http://openexr.com/
-IUSE=examples static-libs
-KEYWORDS=amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND=sys-libs/zlib >=media-libs/ilmbase-1.0.2
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/openexr/openexr-1.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a19ce60e6ac65e1696f1d8ff8245df1f
diff --git a/metadata/md5-cache/media-libs/openexr-2.3.0 b/metadata/md5-cache/media-libs/openexr-2.3.0
new file mode 100644
index 000000000000..54f1dd1a41c5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openexr-2.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/ilmbase-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(-)?] 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/autoconf-archive-2016.09.16 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-20170815 !<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=ILM's OpenEXR high dynamic-range image file format libraries
+EAPI=6
+HOMEPAGE=http://openexr.com/
+IUSE=cpu_flags_x86_avx examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=media-libs/ilmbase-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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/24
+SRC_URI=https://github.com/openexr/openexr/releases/download/v2.3.0/openexr-2.3.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f31ad6b2785fd42c906fec9f8a5ab9c4
diff --git a/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r1 b/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r1
deleted file mode 100644
index 7008318283aa..000000000000
--- a/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=<media-libs/ilmbase-2.0.0:= <media-libs/openexr-2.0.0:= media-libs/ctl:= virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=OpenEXR CTL libraries
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/ampasctl
-IUSE=static-libs
-KEYWORDS=amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=AMPAS
-RDEPEND=<media-libs/ilmbase-2.0.0:= <media-libs/openexr-2.0.0:= media-libs/ctl:=
-SLOT=0
-SRC_URI=mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4092677f039a057794cfa1c7243d9adf
diff --git a/metadata/md5-cache/media-libs/openicc-0.1.0 b/metadata/md5-cache/media-libs/openicc-0.1.0
index 07920af433c3..348c5df24dbe 100644
--- a/metadata/md5-cache/media-libs/openicc-0.1.0
+++ b/metadata/md5-cache/media-libs/openicc-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/yajl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32
 REQUIRED_USE=test? ( static-libs )
 SLOT=0
 SRC_URI=https://github.com/OpenICC/config/archive/0.1.0.tar.gz -> openicc-0.1.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=755d66cf981c1081cf232bf08a1c119a
diff --git a/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1 b/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
index bd464650cba8..758960d1391b 100644
--- a/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=An open-source JPEG 2000 library
 EAPI=6
-HOMEPAGE=http://www.openjpeg.org
+HOMEPAGE=https://www.openjpeg.org
 IUSE=doc 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib
 RESTRICT=test
 SLOT=0/5
 SRC_URI=mirror://sourceforge/openjpeg.mirror/openjpeg-1.5.2.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ce41410571ba3a7a70288c79533e0fc3
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=faecf7a6ec0921f7a93e381e09608e69
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.0 b/metadata/md5-cache/media-libs/openjpeg-2.3.0
index 8e2278669a9b..15e9c089ff5e 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.0
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=An open-source JPEG 2000 library
 EAPI=6
-HOMEPAGE=http://www.openjpeg.org
+HOMEPAGE=https://www.openjpeg.org
 IUSE=doc 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 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz -> openjpeg-2.3.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/c07f38fae1e67adc288c2d6679df5d3652017fbe.tar.gz -> openjpeg-data_20170814.tar.gz )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cc19eb0f02aa576cac94909d81cb0dd5
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e1df17f484a56b44e552b3211a523d4c
diff --git a/metadata/md5-cache/media-libs/oyranos-0.9.6 b/metadata/md5-cache/media-libs/oyranos-0.9.6
index f558cf92359c..36ee79276a72 100644
--- a/metadata/md5-cache/media-libs/oyranos-0.9.6
+++ b/metadata/md5-cache/media-libs/oyranos-0.9.6
@@ -11,5 +11,5 @@ REQUIRED_USE=qt5? ( X ) test? ( static-libs )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/oyranos-cms/oyranos/archive/0.9.6.tar.gz -> oyranos-0.9.6.tar.gz https://dev.gentoo.org/~asturm/oyranos-0.9.6-patches.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e15206b790ed1a1994273a6c9ba15aee
diff --git a/metadata/md5-cache/media-libs/oyranos-9999 b/metadata/md5-cache/media-libs/oyranos-9999
index bb427e4b6860..9e630898e9b4 100644
--- a/metadata/md5-cache/media-libs/oyranos-9999
+++ b/metadata/md5-cache/media-libs/oyranos-9999
@@ -9,5 +9,5 @@ RDEPEND=>=app-admin/elektra-0.8.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 REQUIRED_USE=qt5? ( X ) test? ( static-libs )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=116bfb27bcdd6ee71db91ff770344788
diff --git a/metadata/md5-cache/media-libs/portmidi-217-r1 b/metadata/md5-cache/media-libs/portmidi-217-r1
index cc554706a7c1..9ff1f8f4e304 100644
--- a/metadata/md5-cache/media-libs/portmidi-217-r1
+++ b/metadata/md5-cache/media-libs/portmidi-217-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=media-libs/alsa-lib 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(-)] ) app-arch/unzip java? ( >=virtual/jdk-1.6 ) python? ( >=dev-python/cython-0.12.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( app-doc/doxygen dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-tex/xcolor virtual/latex-base ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A library for real time MIDI input and output
-EAPI=5
+DEPEND=media-libs/alsa-lib 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(-)] ) app-arch/unzip doc? ( app-doc/doxygen dev-tex/xcolor dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra virtual/latex-base ) java? ( >=virtual/jdk-1.6 ) python? ( >=dev-python/cython-0.12.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Library for real time MIDI input and output
+EAPI=6
 HOMEPAGE=http://portmedia.sourceforge.net/
 IUSE=debug doc java python static-libs test-programs python_targets_python2_7 elibc_FreeBSD java
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~sparc x86
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e77bed1333a55180285b221e877b8503
+_md5_=e79bb3b7418a94ae2897cb6e99bc40fb
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.15-r1 b/metadata/md5-cache/media-libs/raptor-2.0.15-r1
index e5b662174433..18f00f56cd0e 100644
--- a/metadata/md5-cache/media-libs/raptor-2.0.15-r1
+++ b/metadata/md5-cache/media-libs/raptor-2.0.15-r1
@@ -5,10 +5,10 @@ DESCRIPTION=The RDF Parser Toolkit
 EAPI=7
 HOMEPAGE=http://librdf.org/raptor/
 IUSE=+curl debug json static-libs unicode
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt curl? ( net-misc/curl ) json? ( dev-libs/yajl ) unicode? ( dev-libs/icu:= ) !media-libs/raptor:0
 SLOT=2
 SRC_URI=http://download.librdf.org/source/raptor2-2.0.15.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=72d4e80342600a1b2b905ac78924f9b9
+_md5_=179ce6e619d09c7fbe4d22fd810eb0f9
diff --git a/metadata/md5-cache/media-libs/raul-0.8.0-r1 b/metadata/md5-cache/media-libs/raul-0.8.0-r1
index 18c951b0129b..ff1e5488c8a8 100644
--- a/metadata/md5-cache/media-libs/raul-0.8.0-r1
+++ b/metadata/md5-cache/media-libs/raul-0.8.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost >=dev-libs/glib-2.14.0
 SLOT=0
 SRC_URI=http://download.drobilla.net/raul-0.8.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=de14abe454af6be660db73c1177ebe11
diff --git a/metadata/md5-cache/media-libs/shaderc-2017.2 b/metadata/md5-cache/media-libs/shaderc-2017.2
index 9395feca259a..e4b68f78affd 100644
--- a/metadata/md5-cache/media-libs/shaderc-2017.2
+++ b/metadata/md5-cache/media-libs/shaderc-2017.2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/glslang[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/shaderc/archive/7a23a01742b88329fb2260eda007172135ba25d4.tar.gz -> shaderc-7a23a01742b88329fb2260eda007172135ba25d4.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5e603850e96510e6d8c9e6713270477
diff --git a/metadata/md5-cache/media-libs/shaderc-9999 b/metadata/md5-cache/media-libs/shaderc-9999
index dd14047e0242..cc610ae72e12 100644
--- a/metadata/md5-cache/media-libs/shaderc-9999
+++ b/metadata/md5-cache/media-libs/shaderc-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=~dev-util/glslang-9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-util/spirv-tools-9999[abi_x86_32(-)?,abi_x86_64(-)?,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
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=921f8bc6ad90d2bac6da5af50b6389fd
diff --git a/metadata/md5-cache/media-libs/slv2-0.6.6-r2 b/metadata/md5-cache/media-libs/slv2-0.6.6-r2
index 94549f0b48f8..bf9a378243f3 100644
--- a/metadata/md5-cache/media-libs/slv2-0.6.6-r2
+++ b/metadata/md5-cache/media-libs/slv2-0.6.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/redland-1.0.6 jack? ( virtual/jack ) media-libs/lv2
 SLOT=0
 SRC_URI=http://download.drobilla.net/slv2-0.6.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=1b32509297949b388ea4c0234e2de6df
diff --git a/metadata/md5-cache/media-libs/soxr-0.1.3-r1 b/metadata/md5-cache/media-libs/soxr-0.1.3-r1
index 8de1f04b8995..80114b991faa 100644
--- a/metadata/md5-cache/media-libs/soxr-0.1.3-r1
+++ b/metadata/md5-cache/media-libs/soxr-0.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 REQUIRED_USE=test? ( examples )
 SLOT=0
 SRC_URI=mirror://sourceforge/soxr/soxr-0.1.3-Source.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=745c6756b486402cfd85025be653bb6b
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.0-r1 b/metadata/md5-cache/media-libs/sratom-0.6.0-r1
index 4077448763c3..1d9ac7e5f7a2 100644
--- a/metadata/md5-cache/media-libs/sratom-0.6.0-r1
+++ b/metadata/md5-cache/media-libs/sratom-0.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.14.0-r1 >=dev-libs/serd-0.28.0-r1 >=dev-libs/sord-0.16.0-r1
 SLOT=0
 SRC_URI=http://download.drobilla.net/sratom-0.6.0.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=6e3ad88836af46f42887617d2ed9ae83
diff --git a/metadata/md5-cache/media-libs/suil-0.10.0 b/metadata/md5-cache/media-libs/suil-0.10.0
index fe46d9682e20..4c6707f41a2f 100644
--- a/metadata/md5-cache/media-libs/suil-0.10.0
+++ b/metadata/md5-cache/media-libs/suil-0.10.0
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.12.0 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
 SLOT=0
 SRC_URI=http://download.drobilla.net/suil-0.10.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=66840644042f5fa1fb94b89e19ac35b0
diff --git a/metadata/md5-cache/media-libs/taglib-1.11.1-r1 b/metadata/md5-cache/media-libs/taglib-1.11.1-r1
index 969400e2de66..e4fb7a07e456 100644
--- a/metadata/md5-cache/media-libs/taglib-1.11.1-r1
+++ b/metadata/md5-cache/media-libs/taglib-1.11.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MPL-1.1
 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(-)?] boost? ( dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/taglib/taglib/archive/v1.11.1.tar.gz -> taglib-1.11.1.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d0bf5fd38b335f1643c9ce49365f32cd
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.9-r3 b/metadata/md5-cache/media-libs/tiff-4.0.9-r3
deleted file mode 100644
index 54746e73c4cc..000000000000
--- a/metadata/md5-cache/media-libs/tiff-4.0.9-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 !<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=Tag Image File Format (TIFF) library
-EAPI=6
-HOMEPAGE=http://libtiff.maptools.org
-IUSE=+cxx jbig jpeg lzma static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=libtiff
-RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( jpeg )
-SLOT=0
-SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.9.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=396ce242898af9c3a2470a04c1f4f5aa
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.9-r4 b/metadata/md5-cache/media-libs/tiff-4.0.9-r4
index 0685f7d08950..fa97e6c7e107 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.9-r4
+++ b/metadata/md5-cache/media-libs/tiff-4.0.9-r4
@@ -5,11 +5,11 @@ DESCRIPTION=Tag Image File Format (TIFF) library
 EAPI=7
 HOMEPAGE=http://libtiff.maptools.org
 IUSE=+cxx jbig jpeg lzma static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=libtiff
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( jpeg )
 SLOT=0
 SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.9.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d3e8cffb6bd27a4784d14dcf80fe68c6
+_md5_=c3d90c5f057bba8928bcd215c2b1fde8
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.1.77.0 b/metadata/md5-cache/media-libs/vulkan-layers-1.1.77.0
index bf2c193fb6d1..3978f8cb1106 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.1.77.0
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.1.77.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/0ec7ce985fba34d5303f84f09fab79cd2b9874a8.tar.gz -> vulkan-layers-1.1.77.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7e8a81f599a0a6105bcb151b92220969
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.1.82.0 b/metadata/md5-cache/media-libs/vulkan-layers-1.1.82.0
index 1e11206fa4a5..328dc4923d6e 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.1.82.0
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.1.82.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/89bbac497742d48c3d483f78b1bba99101784746.tar.gz -> vulkan-layers-1.1.82.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98d913c65f3305e56065913a0d29c8d9
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-9999 b/metadata/md5-cache/media-libs/vulkan-layers-9999
index 3643c4d3be83..408dd84c1e18 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-9999
+++ b/metadata/md5-cache/media-libs/vulkan-layers-9999
@@ -7,5 +7,5 @@ IUSE=X wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_m
 LICENSE=Apache-2.0
 RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98d913c65f3305e56065913a0d29c8d9
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.1.77.0 b/metadata/md5-cache/media-libs/vulkan-loader-1.1.77.0
index 1b26a08a2755..c83b45e38f20 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.1.77.0
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.1.77.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,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://github.com/KhronosGroup/Vulkan-Loader/archive/c71d5027a9d7fe4b170c0ff69bad67efd1d530cf.tar.gz -> vulkan-loader-1.1.77.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1fe596d208aab87d1bb28de716fb4d8b
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.1.82.0 b/metadata/md5-cache/media-libs/vulkan-loader-1.1.82.0
index 18d2757dc5f3..346bf2b7a84a 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.1.82.0
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.1.82.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,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://github.com/KhronosGroup/Vulkan-Loader/archive/979f925d939e4daa3c823bd2b9d46ca479481fe9.tar.gz -> vulkan-loader-1.1.82.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc02c477b34848957629a8dadcf7e6d4
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-9999 b/metadata/md5-cache/media-libs/vulkan-loader-9999
index 18e36e167912..1ef74b42e521 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-9999
+++ b/metadata/md5-cache/media-libs/vulkan-loader-9999
@@ -7,5 +7,5 @@ IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n6
 LICENSE=Apache-2.0
 PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,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
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc02c477b34848957629a8dadcf7e6d4
diff --git a/metadata/md5-cache/media-libs/waffle-1.5.2 b/metadata/md5-cache/media-libs/waffle-1.5.2
index b1f6318c6926..ad0b218aadb5 100644
--- a/metadata/md5-cache/media-libs/waffle-1.5.2
+++ b/metadata/md5-cache/media-libs/waffle-1.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.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(-)?] )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~chadversary/waffle/files/release/waffle-1.5.2/waffle-1.5.2.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed952d74907c69be7bffedc55f05cb23
diff --git a/metadata/md5-cache/media-libs/waffle-9999 b/metadata/md5-cache/media-libs/waffle-9999
index b4e6e6ba31e1..361bedbffe96 100644
--- a/metadata/md5-cache/media-libs/waffle-9999
+++ b/metadata/md5-cache/media-libs/waffle-9999
@@ -7,5 +7,5 @@ IUSE=doc egl gbm test wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi
 LICENSE=BSD-2
 RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.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(-)?] )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dbcac2d768e2e0a0bef13ee56c4e17e9
diff --git a/metadata/md5-cache/media-libs/x265-2.8 b/metadata/md5-cache/media-libs/x265-2.8
index 1aa3f8613223..72b4cffd0d2c 100644
--- a/metadata/md5-cache/media-libs/x265-2.8
+++ b/metadata/md5-cache/media-libs/x265-2.8
@@ -4,10 +4,10 @@ DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
 EAPI=5
 HOMEPAGE=http://x265.org/
 IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 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 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=numa? ( >=sys-process/numactl-2.0.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(-)?] )
 SLOT=0/160
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_2.8.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e5a91b4742f5bfe3ba9ac820728c6d09
+_md5_=654beebcee007d09d44f2436f4436f6c
diff --git a/metadata/md5-cache/media-libs/x265-2.9 b/metadata/md5-cache/media-libs/x265-2.9
new file mode 100644
index 000000000000..cfe17f4f3283
--- /dev/null
+++ b/metadata/md5-cache/media-libs/x265-2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=numa? ( >=sys-process/numactl-2.0.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(-)?] ) abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
+EAPI=5
+HOMEPAGE=http://x265.org/
+IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=numa? ( >=sys-process/numactl-2.0.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(-)?] )
+SLOT=0/165
+SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_2.9.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1c105df2462fc5d10848ead8b7751f58
diff --git a/metadata/md5-cache/media-libs/x265-9999 b/metadata/md5-cache/media-libs/x265-9999
index 13d1eda67501..8b2e31650c04 100644
--- a/metadata/md5-cache/media-libs/x265-9999
+++ b/metadata/md5-cache/media-libs/x265-9999
@@ -6,6 +6,6 @@ HOMEPAGE=http://x265.org/
 IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 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
 LICENSE=GPL-2
 RDEPEND=numa? ( >=sys-process/numactl-2.0.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(-)?] )
-SLOT=0/161
+SLOT=0/165
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d0a8dc29b05b0df6d6208505830e1fcc
+_md5_=15ca4fa89210eaa9c629fe22364c5f03
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index f434dd14a24c..7f52ddf4634f 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/alsa-plugins-1.1.4-r1 b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.4-r1
deleted file mode 100644
index 1724392d0270..000000000000
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/alsa-lib-1.1.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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 >=app-portage/elt-patches-20170815 !<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=ALSA extra plugins
-EAPI=6
-HOMEPAGE=http://www.alsa-project.org/
-IUSE=debug ffmpeg jack libav libsamplerate pulseaudio speex abi_x86_32 abi_x86_64 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-linux
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=media-libs/alsa-lib-1.1.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.1.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=084509069a5b38a0f7750c84ec4100d8
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.5 b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.5
deleted file mode 100644
index b4bc276151a0..000000000000
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/alsa-lib-1.1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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 >=app-portage/elt-patches-20170815 !<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=ALSA extra plugins
-EAPI=6
-HOMEPAGE=http://www.alsa-project.org/
-IUSE=debug ffmpeg jack libav libsamplerate pulseaudio speex abi_x86_32 abi_x86_64 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-linux
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=media-libs/alsa-lib-1.1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.1.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=084509069a5b38a0f7750c84ec4100d8
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.5-r1 b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.5-r1
deleted file mode 100644
index 4a1f632dc647..000000000000
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/alsa-lib-1.1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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 >=app-portage/elt-patches-20170815 !<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=ALSA extra plugins
-EAPI=6
-HOMEPAGE=http://www.alsa-project.org/
-IUSE=arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 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-linux
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=media-libs/alsa-lib-1.1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.1.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e36703547b120c7db83376df392685d
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.6 b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.6
index ec80a6ec316b..2c9cb96b4326 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.6
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=ALSA extra plugins
 EAPI=6
 HOMEPAGE=http://www.alsa-project.org/
 IUSE=arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 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-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.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(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.1.6.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5a424b452d44f303b7c7561e968d41c
+_md5_=cacdf34c4d2b42ae2e6baff07a424da0
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.7 b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.7
new file mode 100644
index 000000000000..320e4c049a2f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.7
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=compile configure install postinst prepare test
+DEPEND=>=media-libs/alsa-lib-1.1.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(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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=ALSA extra plugins
+EAPI=7
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 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-linux
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=media-libs/alsa-lib-1.1.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(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.1.7.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1bf773f1b5505315410d52a84165b6cf
diff --git a/metadata/md5-cache/media-plugins/ams-lv2-1.1.0 b/metadata/md5-cache/media-plugins/ams-lv2-1.1.0
index b2267dc8ec9d..0633768ea6f8 100644
--- a/metadata/md5-cache/media-plugins/ams-lv2-1.1.0
+++ b/metadata/md5-cache/media-plugins/ams-lv2-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/gtkmm-2.24.0:2.4 >=media-libs/lv2-1.10.0 >=media-libs/lvtk-1.2.0[gtk2] >=media-sound/jack-audio-connection-kit-0.120 >=sci-libs/fftw-3.3.3:3.0 >=x11-libs/cairo-1.10.0 >=x11-libs/gtk+-2.24:2
 SLOT=0
 SRC_URI=https://github.com/blablack/ams-lv2/archive/v1.1.0.tar.gz -> ams-lv2-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=faad54c5a8d41d168fa221e0b00c63fd
diff --git a/metadata/md5-cache/media-plugins/ams-lv2-1.2.1 b/metadata/md5-cache/media-plugins/ams-lv2-1.2.1
index 47db922ee269..fddbd25674b0 100644
--- a/metadata/md5-cache/media-plugins/ams-lv2-1.2.1
+++ b/metadata/md5-cache/media-plugins/ams-lv2-1.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/gtkmm-2.24.0:2.4 >=media-libs/lv2-1.10.0 >=media-libs/lvtk-1.2.0[gtk2] >=sci-libs/fftw-3.3.3:3.0 >=x11-libs/cairo-1.10.0 >=x11-libs/gtk+-2.24:2 virtual/jack
 SLOT=0
 SRC_URI=https://github.com/blablack/ams-lv2/archive/1.2.1.tar.gz -> ams-lv2-1.2.1.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=ef7d3f2e9d2828f3416b506b94ad028b
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 a18b14cb21d7..1d662a52811f 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 ~ia64 ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=62e42024524ce924b3f4c3c13573995a
+_md5_=5bb30dbc358a9f5696b017057dd0e2a8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.2
index e5d2086e04eb..d6165fd6ad5a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.2
@@ -4,11 +4,11 @@ DESCRIPTION=SRTP encoder/decoder plugin 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 ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ea1e571ab1d504cb3df516e2ca74deab
+_md5_=b14225f3945b7b4c794fd6956d6b9088
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3
index 9f64559f31d0..7c66fb9e3610 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=SRTP encoder/decoder plugin 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 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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.3: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.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e98f3b141987b306ca9c7766d1f18cbe
+_md5_=b91f858de87b05dae40f007b85195148
diff --git a/metadata/md5-cache/media-plugins/kipi-plugins-5.9.0 b/metadata/md5-cache/media-plugins/kipi-plugins-5.9.0
index 36c5fd9d783a..1204cba3d648 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-5.9.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-5.9.0
@@ -1,13 +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/ki18n-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkipi-17.12.3:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 flashexport? ( >=kde-frameworks/karchive-5.46.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.46.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) >=dev-qt/qtconcurrent-5.9.4: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.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
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkipi-18.04.3:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 flashexport? ( >=kde-frameworks/karchive-5.50.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.50.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) >=dev-qt/qtconcurrent-5.9.4: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.50.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=Plugins for the KDE Image Plugin Interface
 EAPI=6
 HOMEPAGE=https://www.digikam.org/
 IUSE=flashexport mediawiki +remotestorage vkontakte debug test
 KEYWORDS=amd64 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/ki18n-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkipi-17.12.3:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 flashexport? ( >=kde-frameworks/karchive-5.46.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.46.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !media-plugins/kipi-plugins:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-apps/libkipi-18.04.3:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 flashexport? ( >=kde-frameworks/karchive-5.50.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.50.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !media-plugins/kipi-plugins:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.9.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3ac1fab866c9c284e0d528869c4dcbd
diff --git a/metadata/md5-cache/media-plugins/mda-lv2-1.0.0 b/metadata/md5-cache/media-plugins/mda-lv2-1.0.0
index 3e12da2752ec..e35dc013741d 100644
--- a/metadata/md5-cache/media-plugins/mda-lv2-1.0.0
+++ b/metadata/md5-cache/media-plugins/mda-lv2-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/lv2
 SLOT=0
 SRC_URI=http://download.drobilla.net/mda-lv2-1.0.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=9328a6579a9ecaedf50684a91c7e5042
diff --git a/metadata/md5-cache/media-plugins/mda-lv2-1.2.2 b/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
index f7a2eec516a2..49ec3c40ed0a 100644
--- a/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
+++ b/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/lv2
 SLOT=0
 SRC_URI=http://download.drobilla.net/mda-lv2-1.2.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=ed21f62ab9717a12925ab83853bde461
diff --git a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1 b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1
index 26c84a257e9b..c9285f4963a9 100644
--- a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1
+++ b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3*
 SLOT=0
 SRC_URI=https://aubio.org/pub/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=6108deca976560f516fe38cc53e11ddc
diff --git a/metadata/md5-cache/media-plugins/vdr-autosort-0.1.3 b/metadata/md5-cache/media-plugins/vdr-autosort-0.1.3
deleted file mode 100644
index 9241d2c43c1f..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-autosort-0.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm preinst prepare setup unpack
-DEPEND=>=media-video/vdr-1.3.32 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR plugin: Auto-sort channels.conf
-EAPI=7
-HOMEPAGE=http://www.copypointburscheid.de/linux/autosort.htm
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.3.32 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.copypointburscheid.de/linux/vdr-autosort-0.1.3.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
-_md5_=871c87bb895363a647a1b480c01e7109
diff --git a/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6-r2 b/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6-r2
deleted file mode 100644
index 2d927931e58d..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: presents a favourites channels menu
-EAPI=5
-HOMEPAGE=http://www.olivierjacques.com/vdr/prefermenu/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://famillejacques.free.fr/vdr/prefermenu/vdr-prefermenu-0.6.6.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
-_md5_=6e72e8da3e4d66a7492a5edc592eba6f
diff --git a/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2-r1 b/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2-r1
deleted file mode 100644
index e234bfafbb92..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 imagemagick? ( graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) ) !imagemagick? ( imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] ) ) sys-devel/gettext virtual/pkgconfig >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR text2skin PlugIn
-EAPI=5
-HOMEPAGE=https://projects.vdr-developer.org/projects/plg-text2skin
-IUSE=contrib doc graphicsmagick +imagemagick imlib
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6.0 imagemagick? ( graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) ) !imagemagick? ( imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] ) ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/783/vdr-text2skin-1.3.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
-_md5_=99c5fa4c9ea2be0dd6b8b9a4e528f552
diff --git a/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2 b/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2
deleted file mode 100644
index 080a74280b28..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=net-misc/curl >=dev-libs/tinyxml-2.6.1[stl] media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin
-EAPI=5
-HOMEPAGE=https://projects.vdr-developer.org/projects/plg-vodcatcher
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-misc/curl >=dev-libs/tinyxml-2.6.1[stl] media-video/vdr || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/154/vdr-vodcatcher-0.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
-_md5_=b8149b2428aa1a4159a605ad827c8975
diff --git a/metadata/md5-cache/media-plugins/vdr-xine-0.9.4-r1 b/metadata/md5-cache/media-plugins/vdr-xine-0.9.4-r1
deleted file mode 100644
index 82ab0cb97635..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-xine-0.9.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.7 >=media-libs/xine-lib-1.1.8[vdr] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR plugin: for 'software only' playback using xine
-EAPI=5
-HOMEPAGE=http://home.vr-web.de/~rnissl/
-IUSE=yaepg
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.5.7 >=media-libs/xine-lib-1.1.8[vdr] >=media-video/mjpegtools-2.1.0 media-libs/netpbm >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://home.vr-web.de/~rnissl/vdr-xine-0.9.4.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
-_md5_=bc5dad2f8f32480b340cbb0037c447bd
diff --git a/metadata/md5-cache/media-plugins/vdr-xvdr-9999 b/metadata/md5-cache/media-plugins/vdr-xvdr-9999
deleted file mode 100644
index 21d49af6bef8..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-xvdr-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers dev-vcs/git
-DESCRIPTION=VDR plugin: XVDR Streamserver Plugin
-EAPI=5
-HOMEPAGE=https://github.com/pipelka/vdr-plugin-xvdr
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
-_md5_=3e745e0b35e22c4343542a1968f4a094
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 5922f1b3c1b0..f228a43ecafb 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/fldigi-4.0.17 b/metadata/md5-cache/media-radio/fldigi-4.0.17
index 0de9c4c49158..51358aaea184 100644
--- a/metadata/md5-cache/media-radio/fldigi-4.0.17
+++ b/metadata/md5-cache/media-radio/fldigi-4.0.17
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl || ( media-libs/portaudio[oss] media-libs/portaudio[alsa] ) hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/fldigi-4.0.17.tar.gz
-_md5_=327e7b46aef125fa31f2cee2918a94ad
+_md5_=ffd5c14629100dc7d295d676c81ff23c
diff --git a/metadata/md5-cache/media-radio/fldigi-4.0.18 b/metadata/md5-cache/media-radio/fldigi-4.0.18
index 2f20b97bb7b5..eed3c85a7895 100644
--- a/metadata/md5-cache/media-radio/fldigi-4.0.18
+++ b/metadata/md5-cache/media-radio/fldigi-4.0.18
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl || ( media-libs/portaudio[oss] media-libs/portaudio[alsa] ) hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/fldigi-4.0.18.tar.gz
-_md5_=327e7b46aef125fa31f2cee2918a94ad
+_md5_=ffd5c14629100dc7d295d676c81ff23c
diff --git a/metadata/md5-cache/media-radio/js8call-0.7.5 b/metadata/md5-cache/media-radio/js8call-0.7.5
new file mode 100644
index 000000000000..ac0a2a349d91
--- /dev/null
+++ b/metadata/md5-cache/media-radio/js8call-0.7.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Weak signal ham radio communication
+EAPI=6
+HOMEPAGE=https://groups.io/g/js8call
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor )
+SLOT=0
+SRC_URI=https://bitbucket.org/widefido/wsjtx/get/v0.7.5.tar.bz2 -> js8call-0.7.5.tar.bz2
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=22975d4eb5f6884cebd8562beca74afe
diff --git a/metadata/md5-cache/media-radio/tlf-1.3.1 b/metadata/md5-cache/media-radio/tlf-1.3.1
new file mode 100644
index 000000000000..a5e992d7adb1
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tlf-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=sys-libs/ncurses:= dev-libs/glib:2 media-libs/hamlib media-sound/sox dev-libs/xmlrpc-c[curl] test? ( dev-util/cmocka )
+DESCRIPTION=Console-mode amateur radio contest logger
+EAPI=7
+HOMEPAGE=http://home.iae.nl/users/reinc/TLF-0.2.html
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= dev-libs/glib:2 media-libs/hamlib media-sound/sox dev-libs/xmlrpc-c[curl]
+SLOT=0
+SRC_URI=http://www.hs-mittweida.de/tb/tlf-1.3.1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=32e98d99306225a6eb207d47653d3778
diff --git a/metadata/md5-cache/media-radio/tqsl-2.4.1 b/metadata/md5-cache/media-radio/tqsl-2.4.1
new file mode 100644
index 000000000000..d8999622c5d4
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tqsl-2.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/expat:= dev-libs/openssl:= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=ARRL Logbook of the World
+EAPI=6
+HOMEPAGE=http://www.arrl.org/tqsl-download
+KEYWORDS=~amd64 ~x86
+LICENSE=LOTW
+RDEPEND=dev-libs/expat:= dev-libs/openssl:= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0=
+SLOT=0
+SRC_URI=https://sourceforge.net/code-snapshots/git/t/tr/trustedqsl/tqsl.git/trustedqsl-tqsl-fa49d1a6a2a9c06181f72558f732e7960cb3f430.zip -> tqsl-2.4.1.zip
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cad845c99980a6fe419600692904ad06
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 69d34266a8d7..6e37a27fb5c2 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/a2jmidid-8-r2 b/metadata/md5-cache/media-sound/a2jmidid-8-r2
index af858fcb7e17..f6dd55a22785 100644
--- a/metadata/md5-cache/media-sound/a2jmidid-8-r2
+++ b/metadata/md5-cache/media-sound/a2jmidid-8-r2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/alsa-lib virtual/jack dbus? ( sys-apps/dbus ) python_targets_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.gna.org/a2jmidid/a2jmidid-8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=6e35504db33843956516a505c983660c
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.1.3 b/metadata/md5-cache/media-sound/alsa-tools-1.1.3
deleted file mode 100644
index f9500903b094..000000000000
--- a/metadata/md5-cache/media-sound/alsa-tools-1.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=media-libs/alsa-lib-1.1.3 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Advanced Linux Sound Architecture tools
-EAPI=6
-HOMEPAGE=https://alsa-project.org/
-IUSE=fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/alsa-lib-1.1.3 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) gtk? ( media-fonts/font-misc-misc )
-SLOT=0.9
-SRC_URI=mirror://alsaproject/tools/alsa-tools-1.1.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2386af42d7eb48d651b654c19d7ad97c
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.1.5 b/metadata/md5-cache/media-sound/alsa-tools-1.1.5
deleted file mode 100644
index 6922455563f4..000000000000
--- a/metadata/md5-cache/media-sound/alsa-tools-1.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=media-libs/alsa-lib-1.1.5 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Advanced Linux Sound Architecture tools
-EAPI=6
-HOMEPAGE=https://alsa-project.org/
-IUSE=fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/alsa-lib-1.1.5 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) gtk? ( media-fonts/font-misc-misc )
-SLOT=0.9
-SRC_URI=mirror://alsaproject/tools/alsa-tools-1.1.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2386af42d7eb48d651b654c19d7ad97c
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.1.6 b/metadata/md5-cache/media-sound/alsa-tools-1.1.6
index bd6d725f4932..c3d31fe22d15 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.1.6
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced Linux Sound Architecture tools
 EAPI=6
 HOMEPAGE=https://alsa-project.org/
 IUSE=fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.6 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) gtk? ( media-fonts/font-misc-misc )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/tools/alsa-tools-1.1.6.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3a1e1924c7846e02d84d7199c46b4755
+_md5_=2da326e70a839b84e47edecaa132200a
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.1.7 b/metadata/md5-cache/media-sound/alsa-tools-1.1.7
new file mode 100644
index 000000000000..6b3a84319df2
--- /dev/null
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=media-libs/alsa-lib-1.1.7 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Advanced Linux Sound Architecture tools
+EAPI=6
+HOMEPAGE=https://alsa-project.org/
+IUSE=fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/alsa-lib-1.1.7 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) gtk? ( media-fonts/font-misc-misc )
+SLOT=0.9
+SRC_URI=mirror://alsaproject/tools/alsa-tools-1.1.7.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=81c48fe138ea14aeec70051ef2fc4582
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
deleted file mode 100644
index e7aefc422981..000000000000
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=media-libs/alsa-lib-1.1.4 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) virtual/pkgconfig doc? ( app-text/xmlto ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
-EAPI=6
-HOMEPAGE=https://alsa-project.org/
-IUSE=bat doc +libsamplerate +ncurses nls selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index b0a4151fcc59..000000000000
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=media-libs/alsa-lib-1.1.5 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) virtual/pkgconfig doc? ( app-text/xmlto ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
-EAPI=6
-HOMEPAGE=https://alsa-project.org/
-IUSE=bat doc +libsamplerate +ncurses nls selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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 34beea2c7246..29a285187df2 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.6
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
 EAPI=6
 HOMEPAGE=https://alsa-project.org/
 IUSE=bat doc +libsamplerate +ncurses nls selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 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	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=fe071f9b46dc42dedcfdf36185756ce3
+_md5_=b8854d9bb13a2139e204557b433ffa04
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.1.7 b/metadata/md5-cache/media-sound/alsa-utils-1.1.7
new file mode 100644
index 000000000000..a87f12dda64d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.7
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=>=media-libs/alsa-lib-1.1.7 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) doc? ( app-text/xmlto )
+DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
+EAPI=7
+HOMEPAGE=https://alsa-project.org/
+IUSE=bat doc +libsamplerate +ncurses nls selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/alsa-lib-1.1.7 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.7.tar.bz2
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=0fd917ce05370020443e205a5bf2e8bd
diff --git a/metadata/md5-cache/media-sound/apulse-0.1.10 b/metadata/md5-cache/media-sound/apulse-0.1.10
deleted file mode 100644
index 6fee0d28d103..000000000000
--- a/metadata/md5-cache/media-sound/apulse-0.1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] 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(-)?] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PulseAudio emulation for ALSA
-EAPI=6
-HOMEPAGE=https://github.com/i-rinat/apulse
-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
-LICENSE=MIT LGPL-2.1
-RDEPEND=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(-)?] 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(-)?] !!media-plugins/alsa-plugins[pulseaudio]
-SLOT=0
-SRC_URI=https://github.com/i-rinat/apulse/archive/v0.1.10.tar.gz -> apulse-0.1.10.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9ebef4e8d21a399a75e9dc301aa5db67
diff --git a/metadata/md5-cache/media-sound/apulse-0.1.12-r4 b/metadata/md5-cache/media-sound/apulse-0.1.12-r4
index b63539f72d23..11c856bd1ce6 100644
--- a/metadata/md5-cache/media-sound/apulse-0.1.12-r4
+++ b/metadata/md5-cache/media-sound/apulse-0.1.12-r4
@@ -4,10 +4,10 @@ DESCRIPTION=PulseAudio emulation for ALSA
 EAPI=6
 HOMEPAGE=https://github.com/i-rinat/apulse
 IUSE=debug sdk test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT LGPL-2.1
 RDEPEND=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(-)?] 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(-)?] sdk? ( !media-sound/pulseaudio ) !!media-plugins/alsa-plugins[pulseaudio]
 SLOT=0
 SRC_URI=https://github.com/i-rinat/apulse/archive/v0.1.12.tar.gz -> apulse-0.1.12.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fcc1e6229e6e84b1de7a2a2f1d949c3d
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1a26060cd3d90954c129244dcac9e3c4
diff --git a/metadata/md5-cache/media-sound/ardour-5.12 b/metadata/md5-cache/media-sound/ardour-5.12
index d742c7527137..ca522d6275b6 100644
--- a/metadata/md5-cache/media-sound/ardour-5.12
+++ b/metadata/md5-cache/media-sound/ardour-5.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/glibmm-2.32.0 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 dev-libs/boost:= >=dev-libs/glib-2.10.1:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2.6:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo >=media-libs/liblrdf-0.4.0-r20 >=media-libs/libsamplerate-0.1 >=media-libs/libsndfile-1.0.18 >=media-libs/libsoundtouch-1.6.0 media-libs/raptor:2 >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:0 x11-libs/cairo >=x11-libs/gtk+-2.8.1:2 x11-libs/pango jack? ( virtual/jack ) >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0
 SLOT=5
 SRC_URI=mirror://gentoo/Ardour-5.12.0.tar.bz2 -> ardour-5.12.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=bc90ce70ab73e730bdc6924f24e3fbb5
diff --git a/metadata/md5-cache/media-sound/ardour-9999 b/metadata/md5-cache/media-sound/ardour-9999
index 91689ac06183..35a20c87f5d3 100644
--- a/metadata/md5-cache/media-sound/ardour-9999
+++ b/metadata/md5-cache/media-sound/ardour-9999
@@ -7,5 +7,5 @@ IUSE=altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/glibmm-2.32.0 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 dev-libs/boost:= >=dev-libs/glib-2.10.1:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2.6:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo >=media-libs/liblrdf-0.4.0-r20 >=media-libs/libsamplerate-0.1 >=media-libs/libsndfile-1.0.18 >=media-libs/libsoundtouch-1.6.0 media-libs/raptor:2 >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:0 x11-libs/cairo >=x11-libs/gtk+-2.8.1:2 x11-libs/pango jack? ( virtual/jack ) >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0
 SLOT=6
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=c902c8a3e1fbd0c588c12cfdbaa7f2c7
diff --git a/metadata/md5-cache/media-sound/audex-0.95_pre20170727 b/metadata/md5-cache/media-sound/audex-0.95_pre20170727
index c5fb4ab71137..bee3d49e0a1f 100644
--- a/metadata/md5-cache/media-sound/audex-0.95_pre20170727
+++ b/metadata/md5-cache/media-sound/audex-0.95_pre20170727
@@ -1,13 +1,13 @@
 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/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/ktextwidgets-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-apps/libkcddb-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-sound/cdparanoia 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.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-apps/libkcddb-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-sound/cdparanoia 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.50.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=Tool for ripping compact discs
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/Audex
 IUSE=debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-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/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/ktextwidgets-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-apps/libkcddb-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-sound/cdparanoia !media-sound/audex:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-apps/libkcddb-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-sound/cdparanoia !media-sound/audex:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/audex-0.95_pre20170727.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6e1204b0330f02df081a493aacd3e07
diff --git a/metadata/md5-cache/media-sound/denemo-2.2.0 b/metadata/md5-cache/media-sound/denemo-2.2.0
new file mode 100644
index 000000000000..aeba299c4cbd
--- /dev/null
+++ b/metadata/md5-cache/media-sound/denemo-2.2.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm prepare test
+DEPEND=dev-libs/libxml2:2 >=dev-scheme/guile-2:12= gnome-base/librsvg:2 media-libs/fontconfig:1.0 >=media-libs/libsmf-1.3 >=media-libs/libsndfile-1.0.28-r1 >=media-sound/lilypond-2.19.54[guile2] alsa? ( >=media-libs/alsa-lib-1.1.2 ) aubio? ( >=media-libs/aubio-0.4.1-r1 ) evince? ( >=app-text/evince-3.22.1-r1:= ) fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1 ) gtk3? ( x11-libs/gtk+:3 x11-libs/gtksourceview:3.0= ) !gtk3? ( x11-libs/gtk+:2 x11-libs/gtksourceview:2.0 ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre20140130 sci-libs/fftw:3.0= ) portmidi? ( >=media-libs/portmidi-217-r1 ) rubberband? ( >=media-libs/rubberband-1.8.1-r1 ) >=dev-util/intltool-0.51.0-r1 >=sys-devel/flex-2.6.1 virtual/pkgconfig virtual/yacc doc? ( >=dev-util/gtk-doc-1.25-r1 ) nls? ( >=sys-devel/gettext-0.19.8.1 ) >=app-portage/elt-patches-20170815 !<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 music notation editor
+EAPI=6
+HOMEPAGE=http://www.denemo.org/
+IUSE=alsa +aubio debug +evince doc jack +fluidsynth +gtk3 nls +portaudio +portmidi +rubberband static test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ OFL-1.1
+RDEPEND=dev-libs/libxml2:2 >=dev-scheme/guile-2:12= gnome-base/librsvg:2 media-libs/fontconfig:1.0 >=media-libs/libsmf-1.3 >=media-libs/libsndfile-1.0.28-r1 >=media-sound/lilypond-2.19.54[guile2] alsa? ( >=media-libs/alsa-lib-1.1.2 ) aubio? ( >=media-libs/aubio-0.4.1-r1 ) evince? ( >=app-text/evince-3.22.1-r1:= ) fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1 ) gtk3? ( x11-libs/gtk+:3 x11-libs/gtksourceview:3.0= ) !gtk3? ( x11-libs/gtk+:2 x11-libs/gtksourceview:2.0 ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre20140130 sci-libs/fftw:3.0= ) portmidi? ( >=media-libs/portmidi-217-r1 ) rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
+REQUIRED_USE=evince? ( gtk3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/denemo/denemo-2.2.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=260158fbecdc8c7b7f785ae9a562bc47
diff --git a/metadata/md5-cache/media-sound/elisa-0.2.1-r1 b/metadata/md5-cache/media-sound/elisa-0.2.1-r1
index f82063b253c4..68ac63990438 100644
--- a/metadata/md5-cache/media-sound/elisa-0.2.1-r1
+++ b/metadata/md5-cache/media-sound/elisa-0.2.1-r1
@@ -1,14 +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/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/kfilemetadata-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5[gstreamer] >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 mpris? ( >=kde-frameworks/kdbusaddons-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.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.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
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5[gstreamer] >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 mpris? ( >=kde-frameworks/kdbusaddons-5.50.0:5 >=dev-qt/qtdbus-5.11.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.50.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Simple music player by KDE
 EAPI=6
 HOMEPAGE=https://community.kde.org/Elisa
 IUSE=mpris semantic-desktop debug +handbook test
 KEYWORDS=~amd64
 LICENSE=LGPL-3+
-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/kfilemetadata-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5[gstreamer] >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 mpris? ( >=kde-frameworks/kdbusaddons-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-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
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5[gstreamer] >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 mpris? ( >=kde-frameworks/kdbusaddons-5.50.0:5 >=dev-qt/qtdbus-5.11.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.50.0:5 ) >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/elisa/0.2.1/elisa-0.2.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba0c909edbc27b1c09023a1e09864db2
diff --git a/metadata/md5-cache/media-sound/fluidsynth-1.1.11 b/metadata/md5-cache/media-sound/fluidsynth-1.1.11
index 8bef64b6c768..5dd4c4950463 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-1.1.11
+++ b/metadata/md5-cache/media-sound/fluidsynth-1.1.11
@@ -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(-)?] 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(-)?] lash? ( >=media-sound/lash-0.5.4-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(-)?] ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( >=media-libs/ladspa-cmt-1.16-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/ladspa-sdk-1.13-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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( >=media-libs/libsndfile-1.0.25[abi_x86_32(-)?,abi_x86_64(-)?,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://github.com/FluidSynth/fluidsynth/archive/v1.1.11.tar.gz -> fluidsynth-1.1.11.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe9582db9b0523decbc4bc8962df54ea
diff --git a/metadata/md5-cache/media-sound/grip-3.9.0 b/metadata/md5-cache/media-sound/grip-3.9.0
index 1a47a76cf4e2..d356d05ebdc3 100644
--- a/metadata/md5-cache/media-sound/grip-3.9.0
+++ b/metadata/md5-cache/media-sound/grip-3.9.0
@@ -5,10 +5,10 @@ DESCRIPTION=GTK+ based Audio CD Player/Ripper
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/grip/
 IUSE=vorbis
-KEYWORDS=alpha amd64 ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/grip/grip-3.9.0.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=45fe9531856e26f3e7e9383f839e31e5
+_md5_=175b2818ea14425a48e4b5e53e905987
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.12 b/metadata/md5-cache/media-sound/jack2-1.9.12
index 7d4480d75e38..02fdc697e731 100644
--- a/metadata/md5-cache/media-sound/jack2-1.9.12
+++ b/metadata/md5-cache/media-sound/jack2-1.9.12
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= pyth
 REQUIRED_USE=python_targets_python2_7 || ( classic dbus )
 SLOT=2
 SRC_URI=https://github.com/jackaudio/jack2/releases/download/v1.9.12/jack2-1.9.12.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=4729cc321a4df559d068a815d9c681c4
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.12-r1 b/metadata/md5-cache/media-sound/jack2-1.9.12-r1
index c7acb87f893a..660e2cb40709 100644
--- a/metadata/md5-cache/media-sound/jack2-1.9.12-r1
+++ b/metadata/md5-cache/media-sound/jack2-1.9.12-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
 REQUIRED_USE=python_targets_python2_7 || ( classic dbus )
 SLOT=2
 SRC_URI=https://github.com/jackaudio/jack2/releases/download/v1.9.12/jack2-1.9.12.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=88399b9bfec5b17b7573732d51624292
diff --git a/metadata/md5-cache/media-sound/jack2-9999 b/metadata/md5-cache/media-sound/jack2-9999
index 93a701aff640..c81a8b787af8 100644
--- a/metadata/md5-cache/media-sound/jack2-9999
+++ b/metadata/md5-cache/media-sound/jack2-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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(+)] media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= 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(-)?] ) dbus? ( 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(-)?] 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(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,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-python/dbus-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(+)] ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
 REQUIRED_USE=python_targets_python2_7 || ( classic dbus )
 SLOT=2
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=780b610b099c61feadb20bbc3a177cec
diff --git a/metadata/md5-cache/media-sound/jalv-1.6.0-r2 b/metadata/md5-cache/media-sound/jalv-1.6.0-r2
index 4e70f83ace44..3e1bdc946840 100644
--- a/metadata/md5-cache/media-sound/jalv-1.6.0-r2
+++ b/metadata/md5-cache/media-sound/jalv-1.6.0-r2
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=dev-libs/serd-0.14.0 >=dev-libs/sord-0.12.0 >=media-libs/lilv-0.24.0 >=media-libs/lv2-1.6.0 >=media-libs/sratom-0.6.0 >=media-libs/suil-0.10.0 gtk? ( >=x11-libs/gtk+-3.0.0:3 ) gtk2? ( >=x11-libs/gtk+-2.18.0:2 ) gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 ) portaudio? ( media-libs/portaudio ) !portaudio? ( virtual/jack ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://download.drobilla.net/jalv-1.6.0.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=1ff722cd232b5b6618539856abd31dec
diff --git a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806 b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
index 3b748bc49e01..a1f4b7709255 100644
--- a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
+++ b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
@@ -1,13 +1,13 @@
 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/kdelibs4support-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/knotifyconfig-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/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-apps/libkcddb-17.12.3:5 >=kde-apps/libkcompactdisc-17.12.3:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libdiscid media-libs/phonon[qt5(+)] >=media-libs/taglib-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.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-apps/libkcddb-18.04.3:5 >=kde-apps/libkcompactdisc-18.04.3:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libdiscid media-libs/phonon[qt5(+)] >=media-libs/taglib-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.50.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=CD ripper and audio encoder frontend based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://www.kde-apps.org/content/show.php?content=107645
 IUSE=debug test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 FDL-1.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/kdelibs4support-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/knotifyconfig-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/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-apps/libkcddb-17.12.3:5 >=kde-apps/libkcompactdisc-17.12.3:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libdiscid media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 >=kde-apps/audiocd-kio-17.12.3:5 !media-sound/kaudiocreator:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-apps/libkcddb-18.04.3:5 >=kde-apps/libkcompactdisc-18.04.3:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libdiscid media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 >=kde-apps/audiocd-kio-18.04.3:5 !media-sound/kaudiocreator:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kaudiocreator-1.3_p20170806.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f12a736d7616b5183467851f98c2eae2
diff --git a/metadata/md5-cache/media-sound/kid3-3.6.1 b/metadata/md5-cache/media-sound/kid3-3.6.1
index 4d5861cd3eb1..43d77055af36 100644
--- a/metadata/md5-cache/media-sound/kid3-3.6.1
+++ b/metadata/md5-cache/media-sound/kid3-3.6.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=dev-qt/linguist-tools-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=dev-qt/linguist-tools-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Simple tag editor based on Qt
 EAPI=6
 HOMEPAGE=https://kid3.sourceforge.io/
 IUSE=acoustid flac kde mp3 mp4 +taglib vorbis debug
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kid3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kid3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.6.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c9acb6ed82800dd6bc6371dcd670a015
diff --git a/metadata/md5-cache/media-sound/kid3-3.6.2 b/metadata/md5-cache/media-sound/kid3-3.6.2
index 8c2f3b02cf07..db26424a1c70 100644
--- a/metadata/md5-cache/media-sound/kid3-3.6.2
+++ b/metadata/md5-cache/media-sound/kid3-3.6.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=dev-qt/linguist-tools-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=dev-qt/linguist-tools-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Simple tag editor based on Qt
 EAPI=6
 HOMEPAGE=https://kid3.sourceforge.io/
 IUSE=acoustid flac kde mp3 mp4 +taglib vorbis debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kid3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kid3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.6.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a75b23c8d5330ada09ede12622f7301
diff --git a/metadata/md5-cache/media-sound/lollypop-0.9.601 b/metadata/md5-cache/media-sound/lollypop-0.9.601
deleted file mode 100644
index 54a697a00a56..000000000000
--- a/metadata/md5-cache/media-sound/lollypop-0.9.601
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3 dev-python/pkgconfig[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/desktop-file-utils dev-util/itstool dev-util/intltool >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
-DESCRIPTION=Modern music player for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Lollypop
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3 app-crypt/libsecret dev-libs/totem-pl-parser dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/dbus-python >=dev-python/pylast-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.gnome.org/World/lollypop/uploads/93d895a6c74c64aaa9d4cdc4d58bd6e6/lollypop-0.9.601.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=27330c28e0ab7b209ed5cc4364404588
diff --git a/metadata/md5-cache/media-sound/lollypop-0.9.605-r1 b/metadata/md5-cache/media-sound/lollypop-0.9.605-r1
new file mode 100644
index 000000000000..f46abc18ee7b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lollypop-0.9.605-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3 dev-python/pkgconfig[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/desktop-file-utils dev-util/itstool dev-util/intltool >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=Modern music player for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Lollypop
+IUSE=python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3 app-crypt/libsecret[introspection] dev-libs/totem-pl-parser dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/dbus-python >=dev-python/pylast-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/gst-plugins-base:1.0[introspection]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.gnome.org/World/lollypop/uploads/7e56defb7152c6cd7140e9ea98df4ce7/lollypop-0.9.605.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d25511524a6aad2a8943f1932f58f3c8
diff --git a/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1 b/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
new file mode 100644
index 000000000000..4925966d1fe3
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-apps/sed cpu_flags_x86_mmx? ( dev-lang/yasm )
+DESCRIPTION=Monkey's Audio Codecs
+EAPI=7
+HOMEPAGE=http://etree.org/shnutils/shntool/ http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php
+IUSE=cpu_flags_x86_mmx static-libs
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=mac
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_4.11-u4-b5-s7.orig.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=428a62d7ac72f81bd1e01e2ed5d962ba
diff --git a/metadata/md5-cache/media-sound/mpd-0.20.12-r2 b/metadata/md5-cache/media-sound/mpd-0.20.12-r2
deleted file mode 100644
index af47cf0381c9..000000000000
--- a/metadata/md5-cache/media-sound/mpd-0.20.12-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) dev-libs/boost virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=The Music Player Daemon (mpd)
-EAPI=6
-HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
-IUSE=adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad +fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
-LICENSE=GPL-2
-RDEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) !<sys-cluster/mpich2-1.4_rc2 selinux? ( sec-policy/selinux-mpd )
-REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) opus? ( ogg ) upnp? ( expat ) webdav? ( curl expat )
-SLOT=0
-SRC_URI=https://www.musicpd.org/download/mpd/0.20/mpd-0.20.12.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73c16456847c94c2ac3a1c8aacbec382
diff --git a/metadata/md5-cache/media-sound/mpd-0.20.21-r1 b/metadata/md5-cache/media-sound/mpd-0.20.21-r1
index c25ac380f9e8..9c596beb289f 100644
--- a/metadata/md5-cache/media-sound/mpd-0.20.21-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.20.21-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=6
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
 IUSE=adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad +fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RDEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) !<sys-cluster/mpich2-1.4_rc2 selinux? ( sec-policy/selinux-mpd )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) opus? ( ogg ) upnp? ( expat ) webdav? ( curl expat )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.20/mpd-0.20.21.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20402aed3edc692ba52d2e413f6508d0
+_md5_=a99ebc931618265b6d353e8d9d48d8db
diff --git a/metadata/md5-cache/media-sound/musepack-tools-465-r1 b/metadata/md5-cache/media-sound/musepack-tools-465-r1
index 18be357a2214..6e667a001aca 100644
--- a/metadata/md5-cache/media-sound/musepack-tools-465-r1
+++ b/metadata/md5-cache/media-sound/musepack-tools-465-r1
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=>=media-libs/libcuefile-465[abi_x86_32(-)?,abi_x86_64(-)?,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/libreplaygain-465[abi_x86_32(-)?,abi_x86_64(-)?,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/libmpcdec !media-libs/libmpcdecsv7
 SLOT=0
 SRC_URI=mirror://gentoo/musepack-tools-465.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fdd5960481cf1cbc68593fefd82ca451
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.8.2 b/metadata/md5-cache/media-sound/ncmpcpp-0.8.2
index f376162bbadd..ece642d0a476 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.8.2
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.8.2
@@ -4,9 +4,9 @@ DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
 EAPI=6
 HOMEPAGE=https://rybczak.net/ncmpcpp/
 IUSE=clock icu outputs taglib visualizer
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu?,nls,threads] net-misc/curl sys-libs/ncurses:= sys-libs/readline:* icu? ( dev-libs/icu ) taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
 SLOT=0
 SRC_URI=https://rybczak.net/ncmpcpp/stable/ncmpcpp-0.8.2.tar.bz2
-_md5_=414b587af854cfe5e794836752c431c6
+_md5_=eb1f22d9d223beec615749568ab845b8
diff --git a/metadata/md5-cache/media-sound/opus-tools-0.2 b/metadata/md5-cache/media-sound/opus-tools-0.2
index 03449997c42b..5a815740405f 100644
--- a/metadata/md5-cache/media-sound/opus-tools-0.2
+++ b/metadata/md5-cache/media-sound/opus-tools-0.2
@@ -5,10 +5,10 @@ DESCRIPTION=Royalty-free, highly versatile audio codec
 EAPI=7
 HOMEPAGE=https://opus-codec.org/
 IUSE=flac
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=media-libs/libogg-1.3.0 >=media-libs/libopusenc-0.2 >=media-libs/opus-1.1 >=media-libs/opusfile-0.5 flac? ( >=media-libs/flac-1.1.3 )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/opus/opus-tools-0.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5e27421f75bacfd566af18377cc684b4
+_md5_=1e337d5261d7b4ec5dae13c356ec7466
diff --git a/metadata/md5-cache/media-sound/patchage-0.5.0-r1 b/metadata/md5-cache/media-sound/patchage-0.5.0-r1
index 284fa435607b..2241996c2ed9 100644
--- a/metadata/md5-cache/media-sound/patchage-0.5.0-r1
+++ b/metadata/md5-cache/media-sound/patchage-0.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/raul-0.7.0 >=x11-libs/flowcanvas-0.7.1 >=dev-cpp/gtkmm-2.11.12:2.4 >=dev-cpp/glibmm-2.14:2 >=dev-cpp/libglademm-2.6.0:2.4 dev-cpp/libgnomecanvasmm:2.6 virtual/jack alsa? ( media-libs/alsa-lib ) lash? ( dev-libs/dbus-glib )
 SLOT=0
 SRC_URI=http://download.drobilla.net/patchage-0.5.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=30424991c71d0c57d269c41725a1ebb5
diff --git a/metadata/md5-cache/media-sound/patchage-0.5.0-r2 b/metadata/md5-cache/media-sound/patchage-0.5.0-r2
index 287504aef2d5..ac3e55b0c06c 100644
--- a/metadata/md5-cache/media-sound/patchage-0.5.0-r2
+++ b/metadata/md5-cache/media-sound/patchage-0.5.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/raul-0.7.0 >=x11-libs/flowcanvas-0.7.1 >=dev-cpp/gtkmm-2.11.12:2.4 >=dev-cpp/glibmm-2.14:2 >=dev-cpp/libglademm-2.6.0:2.4 dev-cpp/libgnomecanvasmm:2.6 virtual/jack alsa? ( media-libs/alsa-lib ) lash? ( dev-libs/dbus-glib )
 SLOT=0
 SRC_URI=http://download.drobilla.net/patchage-0.5.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=272abdaa63f35668ba617275ec92369c
diff --git a/metadata/md5-cache/media-sound/patchage-1.0.0 b/metadata/md5-cache/media-sound/patchage-1.0.0
index 82eeeb2d10d1..78fbd65373a6 100644
--- a/metadata/md5-cache/media-sound/patchage-1.0.0
+++ b/metadata/md5-cache/media-sound/patchage-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.11.12:2.4 >=dev-cpp/libglademm-2.6.0:2.4 dev-cpp/libgnomecanvasmm:2.6 >=media-libs/ganv-1.4.0 virtual/jack alsa? ( media-libs/alsa-lib ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus )
 SLOT=0
 SRC_URI=http://download.drobilla.net/patchage-1.0.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=af561c8315ab36ab5b2e902f5209338f
diff --git a/metadata/md5-cache/media-sound/patchage-1.0.0-r1 b/metadata/md5-cache/media-sound/patchage-1.0.0-r1
index 02c14e6f1360..61db47e2ff38 100644
--- a/metadata/md5-cache/media-sound/patchage-1.0.0-r1
+++ b/metadata/md5-cache/media-sound/patchage-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.11.12:2.4 >=dev-cpp/libglademm-2.6.0:2.4 dev-cpp/libgnomecanvasmm:2.6 >=media-libs/ganv-1.4.0 virtual/jack alsa? ( media-libs/alsa-lib ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus )
 SLOT=0
 SRC_URI=http://download.drobilla.net/patchage-1.0.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ff9a33309cb632997f9f5e24014c7518
diff --git a/metadata/md5-cache/media-sound/pavucontrol-qt-0.4.0 b/metadata/md5-cache/media-sound/pavucontrol-qt-0.4.0
index f7bd7ed87a6f..e72f4009bae5 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-qt-0.4.0
+++ b/metadata/md5-cache/media-sound/pavucontrol-qt-0.4.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-
 DESCRIPTION=A Pulseaudio mixer in Qt (port of pavucontrol)
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-sound/pulseaudio[glib]
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/pavucontrol-qt/0.4.0/pavucontrol-qt-0.4.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b9e7829c2c5272e35f8c8d7a656251af
+_md5_=fb7e99b83caa6d22f97e356835fa313d
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.3.7 b/metadata/md5-cache/media-sound/pulseeffects-4.3.7
deleted file mode 100644
index e9d6e27ed277..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-4.3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm 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 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus virtual/pkgconfig dev-libs/appstream-glib sys-devel/gettext >=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
-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 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.3.7.tar.gz -> pulseeffects-4.3.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f611889b2a10f1d219121ae1f1c18252
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.3.8 b/metadata/md5-cache/media-sound/pulseeffects-4.3.8
new file mode 100644
index 000000000000..decd53ab312c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.3.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm 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 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus virtual/pkgconfig dev-libs/appstream-glib sys-devel/gettext >=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
+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 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
+SLOT=0
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.3.8.tar.gz -> pulseeffects-4.3.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f611889b2a10f1d219121ae1f1c18252
diff --git a/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123 b/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
index abe48296133c..664a99999a83 100644
--- a/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
+++ b/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/libmtp:= net-misc/curl virtual/pkgconfig >=sys-apps/sed-4
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/libmtp:= net-misc/curl dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
 DESCRIPTION=Updates last.fm profiles using information from supported portable music players
 EAPI=6
 HOMEPAGE=http://qtscrob.sourceforge.net/
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/
 SLOT=0
 SRC_URI=https://sourceforge.net/code-snapshots/git/q/qt/qtscrob/code.git/qtscrob-code-33ed278b9b543554fd6a556fd391eb4c78faab07.zip -> qtscrobbler-0.11_pre20130123.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=46ead4c444815e6b9c963c6910abdca8
+_md5_=62c6406459dd4e6c3570989784af405d
diff --git a/metadata/md5-cache/media-sound/sc2mpd-1.1.4 b/metadata/md5-cache/media-sound/sc2mpd-1.1.4
deleted file mode 100644
index 5fa7565b34df..000000000000
--- a/metadata/md5-cache/media-sound/sc2mpd-1.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=media-libs/alsa-lib media-libs/libsamplerate net-libs/libmicrohttpd
-DESCRIPTION=Implements the SongCast protocol for use by upmpdcli and mpd
-EAPI=6
-HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli/index.html
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib media-libs/libsamplerate net-libs/libmicrohttpd
-SLOT=0
-SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/sc2mpd-1.1.4.tar.gz https://codeload.github.com/openhome/ohNet/tar.gz/1dd6411ffbe59fe09517162fb88e2405adb4990f -> ohnet.1dd641.tar.gz https://codeload.github.com/openhome/ohNetGenerated/tar.gz/e3edb912410d4c5a4d5323bb1e9c27660a42d78f -> ohnetgenerated.e3edb9.tar.gz https://codeload.github.com/openhome/ohTopology/tar.gz/cc09c09da4be8d3d04adae5b8f0daaf8450906a3 -> ohtopology.cc09c0.tar.gz https://codeload.github.com/openhome/ohSongcast/tar.gz/3299eaedfea34993b79e6d30444792d4fb12a110 -> ohsongcast.3299ea.tar.gz https://codeload.github.com/openhome/ohdevtools/tar.gz/d3586187dfa5f0a8b0f3e35e3d1dc50d1c34943d -> ohdevtools.d35861.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c359703848623c51d4aa78c31647a70
diff --git a/metadata/md5-cache/media-sound/sc2mpd-1.1.5 b/metadata/md5-cache/media-sound/sc2mpd-1.1.5
index e2148d2eb16d..a7f0f98afe43 100644
--- a/metadata/md5-cache/media-sound/sc2mpd-1.1.5
+++ b/metadata/md5-cache/media-sound/sc2mpd-1.1.5
@@ -3,10 +3,10 @@ DEPEND=media-libs/alsa-lib media-libs/libsamplerate net-libs/libmicrohttpd
 DESCRIPTION=Implements the SongCast protocol for use by upmpdcli and mpd
 EAPI=6
 HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli/index.html
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-libs/libsamplerate net-libs/libmicrohttpd
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/sc2mpd-1.1.5.tar.gz https://codeload.github.com/openhome/ohNet/tar.gz/1dd6411ffbe59fe09517162fb88e2405adb4990f -> ohnet.1dd641.tar.gz https://codeload.github.com/openhome/ohNetGenerated/tar.gz/e3edb912410d4c5a4d5323bb1e9c27660a42d78f -> ohnetgenerated.e3edb9.tar.gz https://codeload.github.com/openhome/ohTopology/tar.gz/cc09c09da4be8d3d04adae5b8f0daaf8450906a3 -> ohtopology.cc09c0.tar.gz https://codeload.github.com/openhome/ohSongcast/tar.gz/3299eaedfea34993b79e6d30444792d4fb12a110 -> ohsongcast.3299ea.tar.gz https://codeload.github.com/openhome/ohdevtools/tar.gz/d3586187dfa5f0a8b0f3e35e3d1dc50d1c34943d -> ohdevtools.d35861.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c359703848623c51d4aa78c31647a70
+_md5_=19530c3b4048513bece2ebc0fc62b924
diff --git a/metadata/md5-cache/media-sound/snapcast-0.15.0 b/metadata/md5-cache/media-sound/snapcast-0.15.0
new file mode 100644
index 000000000000..8932552d1bb7
--- /dev/null
+++ b/metadata/md5-cache/media-sound/snapcast-0.15.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=avahi? ( net-dns/avahi[dbus] ) client? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) tremor? ( media-libs/tremor ) vorbis? ( media-libs/libvorbis ) >=dev-cpp/aixlog-1.2.1 >=dev-cpp/asio-1.12.1 >=dev-cpp/popl-1.2.0 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Synchronous multi-room audio player
+EAPI=6
+HOMEPAGE=https://github.com/badaix/snapcast
+IUSE=+avahi +client +flac +server static-libs tremor +vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=avahi? ( net-dns/avahi[dbus] ) client? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) tremor? ( media-libs/tremor ) vorbis? ( media-libs/libvorbis )
+REQUIRED_USE=|| ( server client )
+SLOT=0
+SRC_URI=https://github.com/badaix/snapcast/archive/v0.15.0.tar.gz -> snapcast-0.15.0.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4440961ff7ce448df11d7698530d3313
diff --git a/metadata/md5-cache/media-sound/snapcast-9999 b/metadata/md5-cache/media-sound/snapcast-9999
new file mode 100644
index 000000000000..eb115e86ec86
--- /dev/null
+++ b/metadata/md5-cache/media-sound/snapcast-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=avahi? ( net-dns/avahi[dbus] ) client? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) tremor? ( media-libs/tremor ) vorbis? ( media-libs/libvorbis ) >=dev-cpp/aixlog-1.2.1 >=dev-cpp/asio-1.12.1 >=dev-cpp/popl-1.2.0 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Synchronous multi-room audio player
+EAPI=6
+HOMEPAGE=https://github.com/badaix/snapcast
+IUSE=+avahi +client +flac +server static-libs tremor +vorbis
+LICENSE=GPL-3+
+RDEPEND=avahi? ( net-dns/avahi[dbus] ) client? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) tremor? ( media-libs/tremor ) vorbis? ( media-libs/libvorbis )
+REQUIRED_USE=|| ( server client )
+SLOT=0
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4440961ff7ce448df11d7698530d3313
diff --git a/metadata/md5-cache/media-sound/sonic-visualiser-3.1.1 b/metadata/md5-cache/media-sound/sonic-visualiser-3.1.1
index 63385d2b2965..a331311fbff3 100644
--- a/metadata/md5-cache/media-sound/sonic-visualiser-3.1.1
+++ b/metadata/md5-cache/media-sound/sonic-visualiser-3.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( jack pulseaudio portaudio )
 SLOT=0
 SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/2391/sonic-visualiser-3.1.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3dfd9f4750ae6abb8f5dfe70bce72d91
+_md5_=a6411a26da2ced7e3739e1bb38c7db92
diff --git a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r1 b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r1
index 768f0bb7e90e..cbb30c801450 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r1
+++ b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r1
@@ -1,13 +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/kdelibs4support-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/ktextwidgets-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-apps/libkcddb-17.12.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.10 media-sound/cdparanoia 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.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-apps/libkcddb-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.10 media-sound/cdparanoia 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Frontend to various audio converters
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/search?projectSearchText=soundKonverter https://github.com/dfaust/soundkonverter
 IUSE=debug
 KEYWORDS=~amd64 ~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/kdelibs4support-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/ktextwidgets-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-apps/libkcddb-17.12.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.10 media-sound/cdparanoia !media-sound/soundkonverter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=kde-apps/libkcddb-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.10 media-sound/cdparanoia !media-sound/soundkonverter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/dfaust/soundkonverter/archive/v3.0.1.tar.gz -> soundkonverter-3.0.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=31746966f4ad40eada64ad04dd2b727c
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-3.2.3 b/metadata/md5-cache/media-sound/teamspeak-client-3.2.3
new file mode 100644
index 000000000000..0a046c81229c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/teamspeak-client-3.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DESCRIPTION=A client software for quality voice communication via the internet
+EAPI=7
+HOMEPAGE=https://www.teamspeak.com/
+IUSE=alsa pulseaudio
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=teamspeak3
+RDEPEND=app-arch/snappy:0/1 <dev-libs/openssl-1.1:0 dev-libs/quazip dev-qt/qtcore:5 dev-qt/qtgui:5[accessibility,dbus,xcb] dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[geolocation,widgets] dev-qt/qtwidgets:5 net-libs/libsrtp:0 sys-libs/libcxx[libcxxabi] sys-libs/zlib:0/1 virtual/udev alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=|| ( alsa pulseaudio )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.2.3/TeamSpeak3-Client-linux_amd64-3.2.3.run ) x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.2.3/TeamSpeak3-Client-linux_x86-3.2.3.run )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	ee2f5086cd7e7b747b061f58db14d89e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=dadf37cc33d9d330a7d2f27404b6668f
diff --git a/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r1 b/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r1
deleted file mode 100644
index 729e7943a8bb..000000000000
--- a/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=media-libs/libsdl
-DESCRIPTION=listen to music on the radio generated by images on your screen
-EAPI=2
-HOMEPAGE=http://www.erikyyy.de/tempest/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl
-SLOT=0
-SRC_URI=http://www.erikyyy.de/tempest/tempest_for_eliza-1.0.5.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e70af598c0373d8bd2f14d0b167a4c2a
diff --git a/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r2 b/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r2
index 145769cde210..8fb149103d93 100644
--- a/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r2
+++ b/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r2
@@ -3,10 +3,10 @@ DEPEND=media-libs/libsdl
 DESCRIPTION=Listen to music on the radio generated by images on your screen
 EAPI=7
 HOMEPAGE=http://www.erikyyy.de/tempest/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl
 SLOT=0
 SRC_URI=http://www.erikyyy.de/tempest/tempest_for_eliza-1.0.5.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1bcbac185a6ae9c7350ee41f1fec87c3
+_md5_=bb51dc4006a114b232832b7f4919dee5
diff --git a/metadata/md5-cache/media-sound/tk707-0.8-r1 b/metadata/md5-cache/media-sound/tk707-0.8-r1
deleted file mode 100644
index 68f04b4a7b57..000000000000
--- a/metadata/md5-cache/media-sound/tk707-0.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=media-libs/alsa-lib-0.9.0 >=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An "7x7" type midi drum sequencer for Linux
-EAPI=0
-HOMEPAGE=http://www-lmc.imag.fr/lmc-edp/Pierre.Saramito/tk707
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/alsa-lib-0.9.0 >=dev-lang/tcl-8.4 >=dev-lang/tk-8.4
-SLOT=0
-SRC_URI=mirror://gentoo/tk707-0.8.tar.gz mirror://gentoo/tk707-0.8-updated_tcl2c.patch.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ecfada61b89fdd4ffce88ccbba2fd925
diff --git a/metadata/md5-cache/media-sound/tk707-0.8-r2 b/metadata/md5-cache/media-sound/tk707-0.8-r2
new file mode 100644
index 000000000000..cbde128d38d1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/tk707-0.8-r2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=install prepare
+DEPEND=>=media-libs/alsa-lib-0.9.0 >=dev-lang/tcl-8.4:0= >=dev-lang/tk-8.4:0=
+DESCRIPTION=An 7x7 type midi drum sequencer for Linux
+EAPI=7
+HOMEPAGE=http://www-ljk.imag.fr/membres/Pierre.Saramito/tk707/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/alsa-lib-0.9.0 >=dev-lang/tcl-8.4:0= >=dev-lang/tk-8.4:0=
+SLOT=0
+SRC_URI=mirror://gentoo/tk707-0.8.tar.gz mirror://gentoo/tk707-0.8-updated_tcl2c.patch.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=45439ad8cec49f951b73cada94b8a5ad
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20180501 b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20180501
index a921e6cb39db..4ae0b94d4203 100644
--- a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20180501
+++ b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20180501
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.46.0 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5(+)] >=media-libs/liblastfm-1.1.0_pre20150206 >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] ) xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] ) >=dev-qt/designer-5.9.4:5 >=dev-qt/linguist-tools-5.9.4:5 >=dev-qt/qtconcurrent-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/attica-5.50.0 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5(+)] >=media-libs/liblastfm-1.1.0_pre20150206 >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] ) xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] ) >=dev-qt/designer-5.9.4:5 >=dev-qt/linguist-tools-5.9.4:5 >=dev-qt/qtconcurrent-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Multi-source social music player
 EAPI=6
 HOMEPAGE=https://www.tomahawk-player.org/
 IUSE=telepathy xmpp debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 BSD
-RDEPEND=>=kde-frameworks/attica-5.46.0 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5(+)] >=media-libs/liblastfm-1.1.0_pre20150206 >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] ) xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] ) app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/attica-5.50.0 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5(+)] >=media-libs/liblastfm-1.1.0_pre20150206 >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] ) xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] ) app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=0
 SRC_URI=https://github.com/tomahawk-player/tomahawk/archive/34c1f88171f00a3e9fae57250799f3d3623b5f74.tar.gz -> tomahawk-0.9.0_pre20180501.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a8bc1564314299220877142029fbd70
diff --git a/metadata/md5-cache/media-sound/upmpdcli-1.2.15 b/metadata/md5-cache/media-sound/upmpdcli-1.2.15
deleted file mode 100644
index 3e661db73bfe..000000000000
--- a/metadata/md5-cache/media-sound/upmpdcli-1.2.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd net-libs/libupnpp
-DESCRIPTION=UPnP Media Renderer front-end for MPD, the Music Player Daemon
-EAPI=6
-HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli/index.html
-IUSE=thirdparty
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd net-libs/libupnpp thirdparty? ( dev-python/requests ) media-sound/mpd
-SLOT=0
-SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.15.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=76e009f29f5e24218894211ff35ca999
diff --git a/metadata/md5-cache/media-sound/upmpdcli-1.2.16 b/metadata/md5-cache/media-sound/upmpdcli-1.2.16
index d8f31114737b..45c0d67c2c82 100644
--- a/metadata/md5-cache/media-sound/upmpdcli-1.2.16
+++ b/metadata/md5-cache/media-sound/upmpdcli-1.2.16
@@ -4,10 +4,10 @@ DESCRIPTION=UPnP Media Renderer front-end for MPD, the Music Player Daemon
 EAPI=6
 HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli/index.html
 IUSE=thirdparty
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd net-libs/libupnpp thirdparty? ( dev-python/requests ) media-sound/mpd[curl]
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.16.tar.gz
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=70856863380fe9d09e3c2547ab912293
+_md5_=a5c27a99b4f702ff68758e07b0b9b78d
diff --git a/metadata/md5-cache/media-sound/upmpdcli-1.3.6 b/metadata/md5-cache/media-sound/upmpdcli-1.3.6
new file mode 100644
index 000000000000..d014e4e90719
--- /dev/null
+++ b/metadata/md5-cache/media-sound/upmpdcli-1.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst setup
+DEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd net-libs/libupnpp virtual/pkgconfig
+DESCRIPTION=UPnP Media Renderer front-end for MPD, the Music Player Daemon
+EAPI=6
+HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli/index.html
+IUSE=thirdparty
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd net-libs/libupnpp thirdparty? ( dev-python/requests ) media-sound/mpd[curl]
+SLOT=0
+SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.3.6.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b72ecc9b27fe7e35a75db38f6644604c
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 961fe3c61d0e..618e109c8ef0 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.5-r1 b/metadata/md5-cache/media-tv/kodi-17.5-r1
deleted file mode 100644
index bb1e0ba3475e..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<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
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=6
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf java kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
-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	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4fcb3ce7f2f7473dc171a78fa2f24883
diff --git a/metadata/md5-cache/media-tv/kodi-17.6 b/metadata/md5-cache/media-tv/kodi-17.6
index f30801c70349..1427ac076976 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6
+++ b/metadata/md5-cache/media-tv/kodi-17.6
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X
 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	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fa4e827be31da1bb1f7ab8a2d245be65
+_md5_=41c086892326704ba70234b86866c086
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r1 b/metadata/md5-cache/media-tv/kodi-17.6-r1
deleted file mode 100644
index 79c9240a0a75..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<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
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=6
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf java kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
-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	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=561946b5803ee3b9cf022373de5bd65b
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r2 b/metadata/md5-cache/media-tv/kodi-17.6-r2
deleted file mode 100644
index 4693fdd1d39e..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<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
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=6
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf java kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
-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	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=41b87dc0fab64b81d33dcd03710bd5a3
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r3 b/metadata/md5-cache/media-tv/kodi-17.6-r3
deleted file mode 100644
index 3e8e73829ba7..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<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
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=6
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
-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	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b63994d355575d5c140b296512e5042a
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r4 b/metadata/md5-cache/media-tv/kodi-17.6-r4
deleted file mode 100644
index dd8f04539b55..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<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
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=6
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
-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	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3cecf11cc0511471d5c54c9b95f9506f
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r5 b/metadata/md5-cache/media-tv/kodi-17.6-r5
deleted file mode 100644
index 6830cdc3ad6a..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<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
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=6
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
-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	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=afd335dd173fe92e8c6557bf41f40ad8
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r6 b/metadata/md5-cache/media-tv/kodi-17.6-r6
new file mode 100644
index 000000000000..3da769eadbdc
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r6
@@ -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[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<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
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=6
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
+REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ?? ( mariadb mysql ) 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	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4ac33c5f9c3498760e0fc2ca5a85707c
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r7 b/metadata/md5-cache/media-tv/kodi-17.6-r7
new file mode 100644
index 000000000000..412dbef3cd35
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r7
@@ -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[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<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
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=6
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[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/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
+REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ?? ( mariadb mysql ) 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	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b48f12fec99b8dbcd3779e8e0184fa12
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 1ee0149745b1..3093092345d6 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( >=app-pda/libplist-2.0.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[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/libcdio-0.94 dev-libs/libfmt dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) ) >=net-misc/curl-7.56.1 nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) virtual/jre >=app-portage/elt-patches-20170815 !<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 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[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/libcdio-0.94 dev-libs/libfmt dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1 nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) virtual/jre >=app-portage/elt-patches-20170815 !<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 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=6
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
 IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_targets_python2_7
 LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( >=app-pda/libplist-2.0.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[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/libcdio-0.94 dev-libs/libfmt dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) ) >=net-misc/curl-7.56.1 nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ^^ ( gbm wayland X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[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/libcdio-0.94 dev-libs/libfmt dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1 nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
+REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ^^ ( gbm wayland X ) ?? ( mariadb mysql ) 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	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bfc903e40820319f6ee64d51b8c41c8b
+_md5_=90f403901d1e96ca9c11959dc284f8d1
diff --git a/metadata/md5-cache/media-tv/mythtv-29.1 b/metadata/md5-cache/media-tv/mythtv-29.1
new file mode 100644
index 000000000000..5a8c4cd312e8
--- /dev/null
+++ b/metadata/md5-cache/media-tv/mythtv-29.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure info install postinst preinst prepare setup unpack
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) 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-python/lxml dev-python/mysql-python dev-python/urlgrabber dev-python/future dev-python/requests-cache ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm virtual/pkgconfig x11-base/xorg-proto virtual/pkgconfig
+DESCRIPTION=Homebrew PVR project
+EAPI=6
+HOMEPAGE=https://www.mythtv.org
+IUSE=alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls ieee1394 jack lcd libass lirc mythlogserver perl pulseaudio python systemd +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf input_devices_joystick python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) 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-python/lxml dev-python/mysql-python dev-python/urlgrabber dev-python/future dev-python/requests-cache ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) dvd? ( media-libs/libdvdcss ) xmltv? ( >=media-tv/xmltv-0.5.43 )
+REQUIRED_USE=python_targets_python2_7 bluray? ( xml ) theora? ( vorbis )
+SLOT=0/29.1
+SRC_URI=https://github.com/MythTV/mythtv/archive/d8a2db77f5731cf32c6d31127452391c6cf7f91f.tar.gz -> mythtv-29.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_md5_=a4cf67b57ea73df8512224580df881b9
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 4206b450cb7a..528021dd4e7b 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/bino-1.6.6 b/metadata/md5-cache/media-video/bino-1.6.6
index eed271eca6e5..ebe95d593911 100644
--- a/metadata/md5-cache/media-video/bino-1.6.6
+++ b/metadata/md5-cache/media-video/bino-1.6.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=>=media-libs/glew-1.6.0:0= >=media-libs/openal-1.15.1 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 >=media-libs/libass-0.9.9 libav? ( >=media-video/libav-0.7:0= ) !libav? ( >=media-video/ffmpeg-0.7:0= ) lirc? ( app-misc/lirc ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) virtual/libintl sys-devel/gettext virtual/pkgconfig
+DEPEND=>=media-libs/glew-1.6.0:0= >=media-libs/openal-1.15.1 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 >=media-libs/libass-0.9.9 libav? ( >=media-video/libav-0.7:0= ) !libav? ( >=media-video/ffmpeg-0.7:0= ) lirc? ( app-misc/lirc ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) virtual/libintl sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Stereoscopic and multi-display media player
 EAPI=6
 HOMEPAGE=http://bino3d.org/
 IUSE=debug doc libav lirc video_cards_nvidia
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=media-libs/glew-1.6.0:0= >=media-libs/openal-1.15.1 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 >=media-libs/libass-0.9.9 libav? ( >=media-video/libav-0.7:0= ) !libav? ( >=media-video/ffmpeg-0.7:0= ) lirc? ( app-misc/lirc ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) virtual/libintl
+RDEPEND=>=media-libs/glew-1.6.0:0= >=media-libs/openal-1.15.1 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 >=media-libs/libass-0.9.9 libav? ( >=media-video/libav-0.7:0= ) !libav? ( >=media-video/ffmpeg-0.7:0= ) lirc? ( app-misc/lirc ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) virtual/libintl
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/bino/bino-1.6.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=96ebe7d4f9cd882ba63e3861215b73da
+_md5_=0e950364f70774120164535bb5432077
diff --git a/metadata/md5-cache/media-video/dcpomatic-2.10.2 b/metadata/md5-cache/media-video/dcpomatic-2.10.2
index fe1d43f3d187..2ad1d3d034fe 100644
--- a/metadata/md5-cache/media-video/dcpomatic-2.10.2
+++ b/metadata/md5-cache/media-video/dcpomatic-2.10.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-libs/boost dev-libs/glib:2 dev-libs/icu dev-libs/libcxml dev-libs/libzip dev-libs/openssl:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) media-libs/fontconfig:1.0 >=media-libs/libdcp-1.4.1:1.0 media-libs/libsamplerate media-libs/libsndfile >=media-libs/libsub-1.2.1:1.0 >=media-video/ffmpeg-3:= net-libs/libssh net-misc/curl gtk? ( x11-libs/gtk+:2 x11-libs/wxGTK:3.0 )
 SLOT=0
 SRC_URI=http://dcpomatic.com/downloads/2.10.2/dcpomatic-2.10.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	wxwidgets	ed63935305b6de2210ae97a407719d89
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	wxwidgets	ed63935305b6de2210ae97a407719d89
 _md5_=794c7c7edfb3f485be2aa54f8acc1aa5
diff --git a/metadata/md5-cache/media-video/dcpomatic-2.10.5 b/metadata/md5-cache/media-video/dcpomatic-2.10.5
index b438e4d53c82..8bb715011d49 100644
--- a/metadata/md5-cache/media-video/dcpomatic-2.10.5
+++ b/metadata/md5-cache/media-video/dcpomatic-2.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-libs/boost dev-libs/glib:2 dev-libs/icu dev-libs/libcxml dev-libs/libzip dev-libs/openssl:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) media-libs/fontconfig:1.0 >=media-libs/libdcp-1.4.1:1.0 media-libs/libsamplerate media-libs/libsndfile >=media-libs/libsub-1.2.1:1.0 >=media-video/ffmpeg-3:= net-libs/libssh net-misc/curl gtk? ( x11-libs/gtk+:2 x11-libs/wxGTK:3.0 )
 SLOT=0
 SRC_URI=http://dcpomatic.com/downloads/2.10.5/dcpomatic-2.10.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	wxwidgets	ed63935305b6de2210ae97a407719d89
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	wxwidgets	ed63935305b6de2210ae97a407719d89
 _md5_=71d2d872e095911fc4484437f37a292d
diff --git a/metadata/md5-cache/media-video/dcpomatic-2.11.7 b/metadata/md5-cache/media-video/dcpomatic-2.11.7
index ca59c02e55dd..cd63c2e22e49 100644
--- a/metadata/md5-cache/media-video/dcpomatic-2.11.7
+++ b/metadata/md5-cache/media-video/dcpomatic-2.11.7
@@ -9,5 +9,5 @@ RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.
 REQUIRED_USE=^^ ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=http://dcpomatic.com/downloads/2.11.7/dcpomatic-2.11.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	wxwidgets	ed63935305b6de2210ae97a407719d89
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	wxwidgets	ed63935305b6de2210ae97a407719d89
 _md5_=b3b7767f298ce96dd0724a32a71e74cd
diff --git a/metadata/md5-cache/media-video/dcpomatic-2.12.4 b/metadata/md5-cache/media-video/dcpomatic-2.12.4
index 15be7accb68c..b0ccfa623500 100644
--- a/metadata/md5-cache/media-video/dcpomatic-2.12.4
+++ b/metadata/md5-cache/media-video/dcpomatic-2.12.4
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.
 REQUIRED_USE=^^ ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=https://dcpomatic.com/dl.php?id=source&version=2.12.4 -> dcpomatic-2.12.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7da77d5cc4b5ec86561a66ac1b3e4d4e
diff --git a/metadata/md5-cache/media-video/dcpomatic-9999 b/metadata/md5-cache/media-video/dcpomatic-9999
index 976800762950..e25d7231a447 100644
--- a/metadata/md5-cache/media-video/dcpomatic-9999
+++ b/metadata/md5-cache/media-video/dcpomatic-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-libs/boost dev-libs/glib:2 dev-libs/icu >dev-libs/libcxml-1.15.4 dev-libs/libzip dev-libs/openssl:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) media-libs/fontconfig:1.0 >media-libs/libdcp-1.4.4:1.0 media-libs/libsamplerate media-libs/libsndfile >=media-libs/libsub-1.2.1:1.0 media-libs/rtaudio[alsa?,jack?,pulseaudio?] >=media-video/ffmpeg-3:= net-libs/libssh net-misc/curl gtk? ( x11-libs/gtk+:2 x11-libs/wxGTK:3.0 )
 REQUIRED_USE=^^ ( alsa jack pulseaudio )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98ff8b33660ad81ed7ea6f10abc9e7ed
diff --git a/metadata/md5-cache/media-video/get_flash_videos-1.25.94 b/metadata/md5-cache/media-video/get_flash_videos-1.25.94
new file mode 100644
index 000000000000..a19b64ae5e1f
--- /dev/null
+++ b/metadata/md5-cache/media-video/get_flash_videos-1.25.94
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-perl/HTML-TokeParser-Simple dev-perl/Module-Find dev-perl/Term-ProgressBar dev-perl/WWW-Mechanize virtual/perl-Module-CoreList dev-perl/UNIVERSAL-require test? ( media-video/rtmpdump dev-perl/Tie-IxHash dev-perl/XML-Simple dev-perl/Crypt-Rijndael dev-perl/Data-AMF virtual/perl-IO-Compress ) dev-lang/perl:=
+DESCRIPTION=Downloads videos from various Flash-based video hosting sites
+EAPI=6
+HOMEPAGE=https://github.com/monsieurvideo/get-flash-videos
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-perl/HTML-TokeParser-Simple dev-perl/Module-Find dev-perl/Term-ProgressBar dev-perl/WWW-Mechanize virtual/perl-Module-CoreList dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/monsieurvideo/get-flash-videos/archive/1.25.94.tar.gz -> get_flash_videos-1.25.94.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=3e68c7cf6a2a61b905e9449e839440d9
diff --git a/metadata/md5-cache/media-video/get_flash_videos-9999 b/metadata/md5-cache/media-video/get_flash_videos-9999
deleted file mode 100644
index fcc005c12699..000000000000
--- a/metadata/md5-cache/media-video/get_flash_videos-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-perl/WWW-Mechanize virtual/perl-Module-CoreList dev-perl/HTML-TokeParser-Simple dev-perl/Module-Find dev-perl/UNIVERSAL-require test? ( media-video/rtmpdump dev-perl/Tie-IxHash dev-perl/XML-Simple dev-perl/Crypt-Rijndael dev-perl/Data-AMF virtual/perl-IO-Compress ) dev-lang/perl:=[-build(-)] dev-vcs/git
-DESCRIPTION=Downloads videos from various Flash-based video hosting sites
-EAPI=5
-HOMEPAGE=https://github.com/monsieurvideo/get-flash-videos
-IUSE=test
-LICENSE=Apache-2.0
-RDEPEND=dev-perl/WWW-Mechanize virtual/perl-Module-CoreList dev-perl/HTML-TokeParser-Simple dev-perl/Module-Find dev-lang/perl:=[-build(-)]
-SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b30ac9321af079b970c2b77205c75495
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.15 b/metadata/md5-cache/media-video/kaffeine-2.0.15
index 9d9119a0759f..c88d6a22467c 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.15
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.15
@@ -1,13 +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/ki18n-5.46.0:5 >=kde-frameworks/kio-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/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) sys-devel/gettext 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.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
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) sys-devel/gettext 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Media player with digital TV support by KDE
 EAPI=6
 HOMEPAGE=https://kaffeine.kde.org/
 IUSE=dvb debug +handbook
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.3 )
-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/ki18n-5.46.0:5 >=kde-frameworks/kio-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/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) !media-video/kaffeine:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) !media-video/kaffeine:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.15.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94cf46b1752ca5d57d0b31b118b01c64
diff --git a/metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1 b/metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1
index 7c84cf475bf6..c0b01d2e48e9 100644
--- a/metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1
+++ b/metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdeclarative-5.46.0 >=kde-frameworks/kdelibs4support-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/knotifications-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libv4l media-libs/phonon[qt5(+)] >=media-libs/qimageblitz-0.0.6_p20131029[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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdeclarative-5.50.0 >=kde-frameworks/kdelibs4support-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/knotifications-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libv4l media-libs/phonon[qt5(+)] >=media-libs/qimageblitz-0.0.6_p20131029[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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Simple photo taking application with fancy animated interface
 EAPI=6
 HOMEPAGE=https://dos1.github.io/kamerka/ https://github.com/dos1/kamerka
 IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdeclarative-5.46.0 >=kde-frameworks/kdelibs4support-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/knotifications-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libv4l media-libs/phonon[qt5(+)] >=media-libs/qimageblitz-0.0.6_p20131029[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdeclarative-5.50.0 >=kde-frameworks/kdelibs4support-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/knotifications-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libv4l media-libs/phonon[qt5(+)] >=media-libs/qimageblitz-0.0.6_p20131029[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=0
 SRC_URI=https://github.com/dos1/kamerka/archive/a201df47a0849a09a20617fedfee26a407dc847c.tar.gz -> kamerka-0.12_p20161002.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7eda9be7aac8329396db4044acf75b3
diff --git a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r1 b/metadata/md5-cache/media-video/kmplayer-0.12.0b-r1
index 6471acac3b78..ddfb6b9ad1d0 100644
--- a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r1
+++ b/metadata/md5-cache/media-video/kmplayer-0.12.0b-r1
@@ -1,13 +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/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/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/kmediaplayer-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[xcb] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) 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.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
+DEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kmediaplayer-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[xcb] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Video player plugin for Konqueror and basic MPlayer frontend
 EAPI=6
 HOMEPAGE=https://kmplayer.kde.org
 IUSE=cairo npp debug +handbook
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 FDL-1.2 LGPL-2.1
-RDEPEND=>=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/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/kmediaplayer-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[xcb] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) media-video/mplayer !media-video/kmplayer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kmediaplayer-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[xcb] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) media-video/mplayer !media-video/kmplayer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmplayer//kmplayer-0.12.0b.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f54b69cd1c7143adc2f3454c6590992
diff --git a/metadata/md5-cache/media-video/libav-12.3 b/metadata/md5-cache/media-video/libav-12.3
index c619bfe68b79..ee61fd7c670b 100644
--- a/metadata/md5-cache/media-video/libav-12.3
+++ b/metadata/md5-cache/media-video/libav-12.3
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video
 EAPI=6
 HOMEPAGE=https://libav.org/
 IUSE=aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 +network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X wavpack webp x264 x265 xvid +zlib altivec armv5te armv6 armv6t2 armvfp neon cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_xop cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_avx2 abi_x86_32 abi_x86_64 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 gpl? ( GPL-3 )
 RDEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nvidia? ( media-video/nvidia-video-codec ) fdk? ( >=media-libs/fdk-aac-0.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !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(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,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/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl ) test? ( encode zlib ) fontconfig? ( truetype )
@@ -12,4 +12,4 @@ RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindi
 SLOT=0/12
 SRC_URI=https://libav.org/releases/libav-12.3.tar.xz test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ba4688cdffb4d0f33cf246ff9d761c3
+_md5_=7157ed386463a24c98b01d42dc2a52da
diff --git a/metadata/md5-cache/media-video/libav-9999 b/metadata/md5-cache/media-video/libav-9999
index 48bdddacc7ab..1cb68a311a4b 100644
--- a/metadata/md5-cache/media-video/libav-9999
+++ b/metadata/md5-cache/media-video/libav-9999
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( openssl? ( !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(-)?] ) ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,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/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( >=virtual/pkgconfig-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(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/nasm-2.13 ) rtmp? ( >=virtual/pkgconfig-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(-)?] ) schroedinger? ( >=virtual/pkgconfig-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(-)?] ) ssl? ( >=virtual/pkgconfig-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(-)?] ) test? ( sys-devel/bc ) truetype? ( >=virtual/pkgconfig-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(-)?] ) fontconfig? ( >=virtual/pkgconfig-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(-)?] ) v4l? ( sys-kernel/linux-headers ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Complete solution to record, convert and stream audio and video
-EAPI=5
+EAPI=6
 HOMEPAGE=https://libav.org/
 IUSE=aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X wavpack webp x264 x265 xvid +zlib altivec armv5te armv6 armv6t2 armvfp neon cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_xop cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_avx2 abi_x86_32 abi_x86_64 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=LGPL-2.1 gpl? ( GPL-3 )
@@ -10,4 +10,4 @@ REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( g
 RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
 SLOT=0/13
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=267bbea6c8fae56b23b096322d91a74a
+_md5_=208478e01907010232c872ebebe47541
diff --git a/metadata/md5-cache/media-video/mjpegtools-2.1.0-r4 b/metadata/md5-cache/media-video/mjpegtools-2.1.0-r4
new file mode 100644
index 000000000000..9d1013bb226e
--- /dev/null
+++ b/metadata/md5-cache/media-video/mjpegtools-2.1.0-r4
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815 !<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=compile configure install postinst prepare test
+DEPEND=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(-)?] dv? ( >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-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(-)?] >=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(-)?] sdlgfx? ( media-libs/sdl-gfx ) ) >=sys-apps/sed-4 virtual/awk cpu_flags_x86_mmx? ( dev-lang/nasm )
+DESCRIPTION=Tools for MJPEG video
+EAPI=7
+HOMEPAGE=http://mjpeg.sourceforge.net/
+IUSE=cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=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(-)?] dv? ( >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-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(-)?] >=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(-)?] sdlgfx? ( media-libs/sdl-gfx ) )
+REQUIRED_USE=sdlgfx? ( sdl )
+SLOT=1
+SRC_URI=mirror://sourceforge/mjpeg/mjpegtools-2.1.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=403da2b109e505bfc342d7834575348c
diff --git a/metadata/md5-cache/media-video/mpv-0.27.2 b/metadata/md5-cache/media-video/mpv-0.27.2
index 48b7b24616ae..4146b3fcde74 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _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 9f5fe1f9d6cb..b3ec670f440c 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=469d8909e26be670e97ecfc2d1ff8b83
diff --git a/metadata/md5-cache/media-video/mpv-0.29.0 b/metadata/md5-cache/media-video/mpv-0.29.0
deleted file mode 100644
index dfc5f0ff40ca..000000000000
--- a/metadata/md5-cache/media-video/mpv-0.29.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( >=dev-libs/wayland-1.6.0 >=dev-libs/wayland-protocols-1.14 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) 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(-)] dev-python/docutils virtual/pkgconfig cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 ) doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) v4l? ( virtual/os-headers ) zsh-completion? ( dev-lang/perl ) >=sys-apps/sed-4
-DESCRIPTION=Media player based on MPlayer and mplayer2
-EAPI=6
-HOMEPAGE=https://mpv.io/
-IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib zsh-completion python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )
-RDEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( >=dev-libs/wayland-1.6.0 >=dev-libs/wayland-protocols-1.14 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( 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=|| ( 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c10e1c96e8f3fee91b6d3142656ca253
diff --git a/metadata/md5-cache/media-video/mpv-0.29.1 b/metadata/md5-cache/media-video/mpv-0.29.1
new file mode 100644
index 000000000000..4bfabc3731d4
--- /dev/null
+++ b/metadata/md5-cache/media-video/mpv-0.29.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( >=dev-libs/wayland-1.6.0 >=dev-libs/wayland-protocols-1.14 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) 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(-)] dev-python/docutils virtual/pkgconfig cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 ) doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) v4l? ( virtual/os-headers ) zsh-completion? ( dev-lang/perl ) >=sys-apps/sed-4
+DESCRIPTION=Media player based on MPlayer and mplayer2
+EAPI=6
+HOMEPAGE=https://mpv.io/
+IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib zsh-completion python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )
+RDEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( >=dev-libs/wayland-1.6.0 >=dev-libs/wayland-protocols-1.14 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( 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=|| ( 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.1.tar.gz -> mpv-0.29.1.tar.gz https://waf.io/waf-2.0.9
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fce6a3c332c081216385c828fe55b5ee
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index a42134951473..53fc82227e96 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e29c2ba421c362ca17ded7771e983da
diff --git a/metadata/md5-cache/media-video/obs-studio-21.1.2 b/metadata/md5-cache/media-video/obs-studio-21.1.2
index fac3396e5dbc..10fdbdaa3138 100644
--- a/metadata/md5-cache/media-video/obs-studio-21.1.2
+++ b/metadata/md5-cache/media-video/obs-studio-21.1.2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_
 SLOT=0
 SRC_URI=https://github.com/obsproject/obs-studio/archive/21.1.2.tar.gz -> obs-studio-21.1.2.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=11444b90373e31a4920c321fe757ca14
+_md5_=c2c7d4abb3d309957d652d5a4b55508b
diff --git a/metadata/md5-cache/media-video/obs-studio-22.0.3 b/metadata/md5-cache/media-video/obs-studio-22.0.3
index 834bb1259dcf..c3791c73bea1 100644
--- a/metadata/md5-cache/media-video/obs-studio-22.0.3
+++ b/metadata/md5-cache/media-video/obs-studio-22.0.3
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_
 SLOT=0
 SRC_URI=https://github.com/obsproject/obs-studio/archive/22.0.3.tar.gz -> obs-studio-22.0.3.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=48285472701c595236470e9ffd111463
+_md5_=ab9e58ecd2c88642f342d5233082f886
diff --git a/metadata/md5-cache/media-video/obs-studio-9999 b/metadata/md5-cache/media-video/obs-studio-9999
index 5ba5b2e9e2e7..bd1ad68933ab 100644
--- a/metadata/md5-cache/media-video/obs-studio-9999
+++ b/metadata/md5-cache/media-video/obs-studio-9999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtg
 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 ) )
 SLOT=0
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ac035fba7d1611d597b094f721d479c7
+_md5_=5ab13400defefa524474da3076208b2a
diff --git a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5 b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
index ac24bc72867f..20fe16b51627 100644
--- a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
+++ b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
@@ -1,13 +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/kdeclarative-5.46.0:5 >=kde-frameworks/kguiaddons-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/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 >=kde-frameworks/kfilemetadata-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 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.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.50.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=Unified media experience for any device capable of running KDE Plasma
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=semantic-desktop debug test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-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/kguiaddons-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/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 ) >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtmultimedia-5.9.4:5[qml] !media-video/plasma-mediacenter:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kactivities-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdeclarative-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.50.0:5 >=kde-frameworks/kfilemetadata-5.50.0:5 ) >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtmultimedia-5.9.4:5[qml] !media-video/plasma-mediacenter:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma-mediacenter/5.7.5/plasma-mediacenter-5.7.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d8715ec7136750a89735050447a89aca
diff --git a/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r4 b/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r4
deleted file mode 100644
index cb1dea339725..000000000000
--- a/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage media-libs/libvorbis media-libs/libogg media-libs/libtheora[encode] x11-libs/libICE x11-libs/libSM alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<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 desktop session recorder producing Ogg video/audio files
-EAPI=2
-HOMEPAGE=http://recordmydesktop.sourceforge.net/
-IUSE=alsa jack
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage media-libs/libvorbis media-libs/libogg media-libs/libtheora[encode] x11-libs/libICE x11-libs/libSM alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
-SLOT=0
-SRC_URI=mirror://sourceforge/recordmydesktop/recordmydesktop-0.3.8.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e09e1eb73a501bf6ea17e59a3dce819b
diff --git a/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r5 b/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r5
deleted file mode 100644
index 346a478d0a27..000000000000
--- a/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage media-libs/libvorbis media-libs/libogg media-libs/libtheora[encode] x11-libs/libICE x11-libs/libSM alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<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 desktop session recorder producing Ogg video/audio files
-EAPI=6
-HOMEPAGE=http://recordmydesktop.sourceforge.net/
-IUSE=alsa jack
-KEYWORDS=amd64 ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage media-libs/libvorbis media-libs/libogg media-libs/libtheora[encode] x11-libs/libICE x11-libs/libSM alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
-SLOT=0
-SRC_URI=mirror://sourceforge/recordmydesktop/recordmydesktop-0.3.8.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ccdbed01e9be6233ba5644ca3833437e
diff --git a/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r6 b/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r6
new file mode 100644
index 000000000000..6891ac23ca6a
--- /dev/null
+++ b/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage media-libs/libvorbis media-libs/libogg media-libs/libtheora[encode] x11-libs/libICE x11-libs/libSM alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<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 desktop session recorder producing Ogg video/audio files
+EAPI=6
+HOMEPAGE=http://recordmydesktop.sourceforge.net/
+IUSE=alsa jack
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage media-libs/libvorbis media-libs/libogg media-libs/libtheora[encode] x11-libs/libICE x11-libs/libSM alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
+SLOT=0
+SRC_URI=mirror://sourceforge/recordmydesktop/recordmydesktop-0.3.8.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c5169da6c72704f39657844e7f61451a
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.3.10 b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.10
index 6897818127be..172f13e9a208 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-0.3.10
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?] ) 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/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/MaartenBaert/ssr/archive/0.3.10.tar.gz -> simplescreenrecorder-0.3.10.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=89679332e719f5d8a81a827b84ff4adc
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.3.11 b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.11
index 6a52e9ed79bc..85c26b69cc03 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-0.3.11
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.11
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?] ) 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/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/MaartenBaert/ssr/archive/0.3.11.tar.gz -> simplescreenrecorder-0.3.11.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=89679332e719f5d8a81a827b84ff4adc
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.3.9-r1 b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.9-r1
index 912cdab9583b..80706294532e 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-0.3.9-r1
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?] ) 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/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/MaartenBaert/ssr/archive/0.3.9.tar.gz -> simplescreenrecorder-0.3.9.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=68880901dde3e1ad044a478dfc6ca134
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-9999 b/metadata/md5-cache/media-video/simplescreenrecorder-9999
index a4f8832a24b2..0408ae518685 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-9999
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-9999
@@ -7,5 +7,5 @@ IUSE=+asm jack mp3 pulseaudio theora vorbis vpx x264 abi_x86_32 abi_x86_64 abi_x
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?] ) 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/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=89679332e719f5d8a81a827b84ff4adc
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.6.4 b/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
index d6d0cc695f87..d4058fd6c177 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/ktextwidgets-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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/phonon[qt5(+)] mpv? ( media-video/mpv ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib x11-libs/libxcb ) 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.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
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/phonon[qt5(+)] mpv? ( media-video/mpv ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib x11-libs/libxcb ) 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.50.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=Text-based subtitles editor
 EAPI=6
 HOMEPAGE=https://github.com/maxrd2/subtitlecomposer
 IUSE=mpv unicode xine test debug test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=!media-video/subtitlecomposer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=!media-video/subtitlecomposer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/maxrd2/subtitlecomposer/archive/v0.6.4.tar.gz -> subtitlecomposer-0.6.4.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7eb543448aad1bd4430484a207ed8eea
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.6.6 b/metadata/md5-cache/media-video/subtitlecomposer-0.6.6
index 6dd9263261fe..4a24220b20a1 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.6.6
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.6.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/ktextwidgets-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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) mpv? ( media-video/mpv ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib x11-libs/libX11 x11-libs/libxcb ) sys-devel/gettext virtual/pkgconfig 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.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) mpv? ( media-video/mpv ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib x11-libs/libX11 x11-libs/libxcb ) sys-devel/gettext virtual/pkgconfig 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.50.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=Text-based subtitles editor
 EAPI=6
 HOMEPAGE=https://github.com/maxrd2/subtitlecomposer
 IUSE=gstreamer libav mpv unicode xine test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/ktextwidgets-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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) mpv? ( media-video/mpv ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib x11-libs/libX11 x11-libs/libxcb ) !media-video/subtitlecomposer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) mpv? ( media-video/mpv ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib x11-libs/libX11 x11-libs/libxcb ) !media-video/subtitlecomposer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://github.com/maxrd2/subtitlecomposer/archive/v0.6.6.tar.gz -> subtitlecomposer-0.6.6.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c92f15967d02fe46be8e7ae3ff95ade
diff --git a/metadata/md5-cache/media-video/vlc-3.0.4 b/metadata/md5-cache/media-video/vlc-3.0.4
index c925bf342eb0..2bf8f86522f0 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.4
+++ b/metadata/md5-cache/media-video/vlc-3.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Media player and framework with support for most multimedia files an
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( media-libs/libmpeg2:0 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.4/vlc-3.0.4.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=978122b1c6d3d128f24ff8fb52fb62c3
+_md5_=f52e6661c721c1a48204ddd2d9dd95cc
diff --git a/metadata/md5-cache/media-video/xine-ui-0.99.10 b/metadata/md5-cache/media-video/xine-ui-0.99.10
index ad6569f76145..43ed89c16160 100644
--- a/metadata/md5-cache/media-video/xine-ui-0.99.10
+++ b/metadata/md5-cache/media-video/xine-ui-0.99.10
@@ -4,10 +4,10 @@ DESCRIPTION=Xine movie player
 EAPI=6
 HOMEPAGE=https://xine-project.org/home
 IUSE=aalib curl debug libcaca lirc nls readline vdr X xinerama
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=|| ( app-arch/tar app-arch/libarchive ) media-libs/libpng:0= >=media-libs/xine-lib-1.2:=[aalib?,libcaca?] virtual/jpeg:0 aalib? ( media-libs/aalib:= ) curl? ( >=net-misc/curl-7.10.2:= ) libcaca? ( media-libs/libcaca:= ) lirc? ( app-misc/lirc:= ) nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2:= ) X? ( x11-libs/libICE:= x11-libs/libSM:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXft:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/libXv:= x11-libs/libXxf86vm:= xinerama? ( x11-libs/libXinerama:= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xine/xine-ui-0.99.10.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4f54473afbba87a969ca76c53f739812
+_md5_=8e2ffab975c84a93a67b02f7f4e0e5da
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 8c04352fc1a7..db245cdd70f6 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/bing-1.1.3-r1 b/metadata/md5-cache/net-analyzer/bing-1.1.3-r1
deleted file mode 100644
index d58b78902b39..000000000000
--- a/metadata/md5-cache/net-analyzer/bing-1.1.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A point-to-point bandwidth measurement tool
-EAPI=2
-HOMEPAGE=http://fgouget.free.fr/bing/index-en.shtml
-KEYWORDS=amd64 ~arm ia64 ppc sparc x86
-LICENSE=BSD-4
-SLOT=0
-SRC_URI=mirror://debian/pool/main/b/bing/bing_1.1.3.orig.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b4dba4a4345e110a755c996a6f54420c
diff --git a/metadata/md5-cache/net-analyzer/bing-1.1.3-r2 b/metadata/md5-cache/net-analyzer/bing-1.1.3-r2
new file mode 100644
index 000000000000..07c69d0d471a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/bing-1.1.3-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A point-to-point bandwidth measurement tool
+EAPI=7
+HOMEPAGE=http://fgouget.free.fr/bing/index-en.shtml
+KEYWORDS=amd64 ~arm ia64 ppc sparc x86
+LICENSE=BSD-4
+SLOT=0
+SRC_URI=mirror://debian/pool/main/b/bing/bing_1.1.3.orig.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c05975bf973f02a9878370713b5aa810
diff --git a/metadata/md5-cache/net-analyzer/bro-2.4.1-r2 b/metadata/md5-cache/net-analyzer/bro-2.4.1-r2
index d3a7aded0730..1c8bef46a10f 100644
--- a/metadata/md5-cache/net-analyzer/bro-2.4.1-r2
+++ b/metadata/md5-cache/net-analyzer/bro-2.4.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-shells/bash:0 dev-libs/openssl:0 net-analyzer/ipsumdump net-dns/bind-tools net-libs/libpcap sys-libs/zlib broker? ( =dev-libs/actor-framework-0.13.2* ) broctl? ( virtual/mta ) curl? ( net-misc/curl ) geoip? ( dev-libs/geoip ) ipv6? ( net-analyzer/ipsumdump[ipv6] ) jemalloc? ( dev-libs/jemalloc ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-1.8:= ) tcmalloc? ( dev-util/google-perftools ) >=dev-lang/swig-3.0.3 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=app-shells/bash:0 dev-libs/openssl:0= net-analyzer/ipsumdump net-dns/bind-tools net-libs/libpcap sys-libs/zlib broker? ( dev-libs/actor-framework:0/13.2 ) broctl? ( virtual/mta ) curl? ( net-misc/curl ) geoip? ( dev-libs/geoip ) ipv6? ( net-analyzer/ipsumdump[ipv6] ) jemalloc? ( dev-libs/jemalloc ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-1.8:= ) tcmalloc? ( dev-util/google-perftools ) >=dev-lang/swig-3.0.3 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=The Bro Network Security Monitor
 EAPI=6
 HOMEPAGE=https://www.bro.org
 IUSE=+broccoli +broctl -broker curl debug geoip ipv6 jemalloc +python -ruby tcmalloc static-libs +tools python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=app-shells/bash:0 dev-libs/openssl:0 net-analyzer/ipsumdump net-dns/bind-tools net-libs/libpcap sys-libs/zlib broker? ( =dev-libs/actor-framework-0.13.2* ) broctl? ( virtual/mta ) curl? ( net-misc/curl ) geoip? ( dev-libs/geoip ) ipv6? ( net-analyzer/ipsumdump[ipv6] ) jemalloc? ( dev-libs/jemalloc ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-1.8:= ) tcmalloc? ( dev-util/google-perftools )
+RDEPEND=app-shells/bash:0 dev-libs/openssl:0= net-analyzer/ipsumdump net-dns/bind-tools net-libs/libpcap sys-libs/zlib broker? ( dev-libs/actor-framework:0/13.2 ) broctl? ( virtual/mta ) curl? ( net-misc/curl ) geoip? ( dev-libs/geoip ) ipv6? ( net-analyzer/ipsumdump[ipv6] ) jemalloc? ( dev-libs/jemalloc ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-1.8:= ) tcmalloc? ( dev-util/google-perftools )
 REQUIRED_USE=broker? ( python ) broctl? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bro.org/downloads/release/bro-2.4.1.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e81f7191d1597e4de9bce867438ac10a
+_md5_=f433e116f05e9782ab38940450fd4388
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.10.1-r1 b/metadata/md5-cache/net-analyzer/icinga2-2.10.1-r1
new file mode 100644
index 000000000000..1acccde6d228
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.10.1-r1
@@ -0,0 +1,14 @@
+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 ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl 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=classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres 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 ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl 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? ( || ( mariadb mysql postgres ) )
+SLOT=0
+SRC_URI=https://github.com/Icinga/icinga2/archive/v2.10.1.tar.gz -> icinga2-2.10.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8da4a7d9dccb6df59be7881972ea0bb4
diff --git a/metadata/md5-cache/net-analyzer/icinga2-9999 b/metadata/md5-cache/net-analyzer/icinga2-9999
index 6f554e462610..ef1c4f438682 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? ( || ( mariadb mysql postgres ) )
 SLOT=0
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9c2c499a270439f2b6a8884475dc7ed7
+_md5_=8da4a7d9dccb6df59be7881972ea0bb4
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.3.3 b/metadata/md5-cache/net-analyzer/nagios-core-4.3.3
index b284f15a8ca5..acfad8c0d80c 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.3.3
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
 EAPI=6
 HOMEPAGE=https://www.nagios.org/
 IUSE=apache2 classicui lighttpd perl +web vim-syntax
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.3.3.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=fcfebd909a5a7cae325c8e3c0bfb7b8c
+_md5_=b187e163b1aa7696e2d894870a1ec085
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.3.4 b/metadata/md5-cache/net-analyzer/nagios-core-4.3.4
index fe3261c64a26..73642ca77d0e 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.3.4
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
 EAPI=6
 HOMEPAGE=https://www.nagios.org/
 IUSE=apache2 classicui lighttpd perl +web vim-syntax
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.3.4.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=66a9746136eeba503d1f1e675b394de6
+_md5_=d80eb9065ec5f73abdf0964c32c6300e
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.0 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.0
index a5507b9ca7f3..e6afaf11f0e0 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.0
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
 EAPI=6
 HOMEPAGE=https://www.nagios.org/
 IUSE=apache2 classicui lighttpd perl +web vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.4.0.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=cd4c04db9421b21a5eb1f2eb08fad4f3
+_md5_=48477ae49302fff4c694e3105b931b31
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.1 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.1
index e1225d0f4b53..e70d4883e5c5 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.1
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
 EAPI=6
 HOMEPAGE=https://www.nagios.org/
 IUSE=apache2 classicui lighttpd perl +web vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.4.1.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9ab87fafdb8b36a1b837585626eeb063
+_md5_=1cb5490af48dc1c937dc425ddc51df49
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.2 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.2
index aff3eaf2d12b..1130bce99829 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.2
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
 EAPI=6
 HOMEPAGE=https://www.nagios.org/
 IUSE=apache2 classicui lighttpd perl +web vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.4.2.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=1cba7f464dcceaedd129d27fd864c7b4
+_md5_=7f367e3c435b2c895e9ad39f7b6d2358
diff --git a/metadata/md5-cache/net-analyzer/testssl-2.9.5_p5-r2 b/metadata/md5-cache/net-analyzer/testssl-2.9.5_p5-r2
new file mode 100644
index 000000000000..885c89898d44
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/testssl-2.9.5_p5-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Tool to check TLS/SSL cipher support
+EAPI=7
+HOMEPAGE=https://testssl.sh/
+IUSE=bundled-openssl kerberos
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 bundled-openssl? ( openssl )
+RDEPEND=app-shells/bash[net] net-dns/bind-tools sys-apps/util-linux sys-libs/ncurses:0 sys-process/procps bundled-openssl? ( kerberos? ( sys-libs/zlib virtual/krb5 ) ) !bundled-openssl? ( dev-libs/openssl:0 )
+SLOT=0
+SRC_URI=https://github.com/drwetter/testssl.sh/archive/v2.9.5-5.tar.gz -> testssl-2.9.5_p5.tar.gz
+_md5_=5d8febd5b6d740b040ef7b933e05b31a
diff --git a/metadata/md5-cache/net-analyzer/traceroute-2.1.0 b/metadata/md5-cache/net-analyzer/traceroute-2.1.0
index 679859e5e6e7..ba114bece927 100644
--- a/metadata/md5-cache/net-analyzer/traceroute-2.1.0
+++ b/metadata/md5-cache/net-analyzer/traceroute-2.1.0
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to trace the route of IP packets
 EAPI=6
 HOMEPAGE=http://traceroute.sourceforge.net/
 IUSE=static
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!<net-misc/iputils-20121221-r1 !net-misc/iputils[traceroute]
 SLOT=0
 SRC_URI=mirror://sourceforge/traceroute/traceroute-2.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=662a67ace54347d6b9ce12bb4145093e
+_md5_=6a6da71a0a9e765bfbea02f05f389de0
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.6.4-r1 b/metadata/md5-cache/net-analyzer/wireshark-2.6.4-r1
new file mode 100644
index 000000000000..64c48c8eb87d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.6.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 filecaps? ( sys-libs/libcap ) >=sys-apps/sed-4
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=6
+HOMEPAGE=https://www.wireshark.org/
+IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+SLOT=0/2.6.4
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.6.4.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8d55994efbb5fc449e8dac5e13022e54
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index 2d30b0153927..c04b54ee36eb 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=media-libs/speex-1.2.0 media-libs/speexdsp x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl] >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl] >=sys-apps/sed-4
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=media-libs/speex-1.2.0 media-libs/speexdsp x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 SLOT=0/99999999
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1972b691bbf79280cc0c6bdea345a766
+_md5_=bb6792471def6fe3e786d7bc30c9522e
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 27cb565a5a51..4fab5849b53a 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
deleted file mode 100644
index c7b32968ac91..000000000000
--- a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=nls? ( virtual/libintl ) >=app-portage/elt-patches-20170815 !<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=Communication package providing the X, Y, and ZMODEM file transfer protocols
-EAPI=2
-HOMEPAGE=https://www.ohse.de/uwe/software/lrzsz.html
-IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a12e83af95aa99128ac8a9530c88a26d
diff --git a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
index 7b9a918e55c5..fed527adcbcc 100644
--- a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
+++ b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
@@ -5,9 +5,9 @@ DESCRIPTION=Communication package providing the X, Y, and ZMODEM file transfer p
 EAPI=7
 HOMEPAGE=https://www.ohse.de/uwe/software/lrzsz.html
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bc46239516e68b100913f7a3fdb83e90
+_md5_=af5478cd73f7bfead492f0f515caae38
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 0c3f2d46d6ed..219721096d1d 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/ddclient-3.9.0-r1 b/metadata/md5-cache/net-dns/ddclient-3.9.0-r1
index 6a16ea72f31c..b815d1dc6bdc 100644
--- a/metadata/md5-cache/net-dns/ddclient-3.9.0-r1
+++ b/metadata/md5-cache/net-dns/ddclient-3.9.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl client used to update dynamic DNS entries
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/ddclient/
 IUSE=examples iproute2
-KEYWORDS=~amd64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl dev-perl/Data-Validate-IP dev-perl/Digest-SHA1 dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL virtual/perl-Digest-SHA virtual/perl-JSON-PP iproute2? ( sys-apps/iproute2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ddclient/ddclient-3.9.0.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7a9a20d33478709f8d984be6604e34fc
+_md5_=6a0b7dd3751716bfd3708c50022ad430
diff --git a/metadata/md5-cache/net-dns/dnrd-2.20.3-r2 b/metadata/md5-cache/net-dns/dnrd-2.20.3-r2
new file mode 100644
index 000000000000..e2719b545e4b
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnrd-2.20.3-r2
@@ -0,0 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=install postinst prepare
+DESCRIPTION=A caching DNS proxy server
+EAPI=7
+HOMEPAGE=http://dnrd.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/dnrd/dnrd-2.20.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=8352b27c046b440d79ec151967b7d690
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.79 b/metadata/md5-cache/net-dns/dnsmasq-2.79
index be28f1cd4ea6..1d558cde25ff 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.79
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.79
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup
-DEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) app-arch/xz-utils dnssec? ( dev-libs/nettle[gmp] static? ( dev-libs/nettle[static-libs(+)] ) ) virtual/pkgconfig virtual/pkgconfig
+DEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn:0 ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) app-arch/xz-utils dnssec? ( dev-libs/nettle[gmp] static? ( dev-libs/nettle[static-libs(+)] ) ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Small forwarding DNS server
 EAPI=6
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
 IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
+RDEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn:0 ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.79.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b81cac16483e23f806960b6c22d1bee9
+_md5_=20b756b376443241d9d530205b9703ad
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80 b/metadata/md5-cache/net-dns/dnsmasq-2.80
new file mode 100644
index 000000000000..145c3f9a8752
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.80
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup
+DEPEND=dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( dev-libs/nettle:=[gmp] static? ( dev-libs/nettle[static-libs(+)] ) )
+DESCRIPTION=Small forwarding DNS server
+EAPI=7
+HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
+IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle:=[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
+REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
+SLOT=0
+SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.80.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=59fcf8ee4d6cba315722a9146ea34453
diff --git a/metadata/md5-cache/net-dns/dnssec-root-20170203-r1 b/metadata/md5-cache/net-dns/dnssec-root-20170203-r1
index b9b1cd184fb7..631ea1852292 100644
--- a/metadata/md5-cache/net-dns/dnssec-root-20170203-r1
+++ b/metadata/md5-cache/net-dns/dnssec-root-20170203-r1
@@ -3,8 +3,8 @@ DEPEND=>=dev-perl/XML-XPath-1.420.0
 DESCRIPTION=The DNSSEC root key(s)
 EAPI=7
 HOMEPAGE=https://www.iana.org/dnssec/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-20170203.xml https://data.iana.org/root-anchors/root-anchors.p7s -> root-anchors-20170203.p7s https://data.iana.org/root-anchors/icannbundle.pem -> icannbundle-20170203.pem
-_md5_=bcec06710e15c2cf29f350f62641f324
+_md5_=beb7fb913526c45e33c917e633e68388
diff --git a/metadata/md5-cache/net-dns/knot-2.7.3 b/metadata/md5-cache/net-dns/knot-2.7.3
new file mode 100644
index 000000000000..d4d2de8d597b
--- /dev/null
+++ b/metadata/md5-cache/net-dns/knot-2.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu dev-python/lmdb net-libs/gnutls caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) geoip? ( dev-libs/libmaxminddb ) idn? ( !libidn2? ( net-dns/libidn:* ) libidn2? ( net-dns/libidn2 ) ) systemd? ( sys-apps/systemd ) virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
+DESCRIPTION=High-performance authoritative-only DNS server
+EAPI=6
+HOMEPAGE=https://www.knot-dns.cz/
+IUSE=doc caps +fastparser idn libidn2 systemd +utils +cookies +dnsproxy dnstap geoip +noudp +onlinesign +queryacl +rrl +stats +synthrecord +whoami
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu dev-python/lmdb net-libs/gnutls caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) geoip? ( dev-libs/libmaxminddb ) idn? ( !libidn2? ( net-dns/libidn:* ) libidn2? ( net-dns/libidn2 ) ) systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-2.7.3.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=91db73466af1097abc7839d9b4a102f0
diff --git a/metadata/md5-cache/net-dns/pdns-4.1.4 b/metadata/md5-cache/net-dns/pdns-4.1.4
index 0a88045bf446..cfa5256262c1 100644
--- a/metadata/md5-cache/net-dns/pdns-4.1.4
+++ b/metadata/md5-cache/net-dns/pdns-4.1.4
@@ -5,11 +5,11 @@ DESCRIPTION=The PowerDNS Daemon
 EAPI=7
 HOMEPAGE=https://www.powerdns.com/
 IUSE=botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
 REQUIRED_USE=mydns? ( mysql )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.1.4.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5aa2b76d28e6d09f08e675d9d26fc672
+_md5_=c9e9be17495b691ccd16502ea3f45f7c
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.1.4 b/metadata/md5-cache/net-dns/pdns-recursor-4.1.4
index c9d5f72d9ce2..ac5c9c88e7a8 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.1.4
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.1.4
@@ -5,10 +5,10 @@ DESCRIPTION=The PowerDNS Recursor
 EAPI=7
 HOMEPAGE=https://www.powerdns.com/
 IUSE=libressl luajit protobuf snmp sodium systemd
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.1.4.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b427ada0e56d845c735cb9496be765ff
+_md5_=dfd7b17ec085ff5b65af12c6a15ba9c3
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.4 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.4
index 26a0ccc5f917..2bceb2ef5833 100644
--- a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.4
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.4.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=180f232ff690a4649b2da75687c0e237
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
index 7d2836a86ced..890bf97ab525 100644
--- a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.5.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e4c2137043f95b78889b4a520fe5163e
diff --git a/metadata/md5-cache/net-dns/s6-dns-2.3.0.1 b/metadata/md5-cache/net-dns/s6-dns-2.3.0.1
new file mode 100644
index 000000000000..05d03b2c9871
--- /dev/null
+++ b/metadata/md5-cache/net-dns/s6-dns-2.3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.7.0.0[static-libs?]
+DESCRIPTION=suite of DNS client programs and libraries for Unix systems
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-dns/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.7.0.0:= )
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/2.3
+SRC_URI=https://www.skarnet.org/software/s6-dns/s6-dns-2.3.0.1.tar.gz
+_md5_=2e925e525b4278677f2aed753677d719
diff --git a/metadata/md5-cache/net-dns/unbound-1.8.0-r1 b/metadata/md5-cache/net-dns/unbound-1.8.0-r1
index 54aac044d5e6..e44c64cfada8 100644
--- a/metadata/md5-cache/net-dns/unbound-1.8.0-r1
+++ b/metadata/md5-cache/net-dns/unbound-1.8.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A validating, recursive and caching DNS resolver
 EAPI=7
 HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
 IUSE=debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ppc64 x86
 LICENSE=BSD GPL-2
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.8.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=3c89f02e2d1ee4788cd9a8748505bd7f
+_md5_=ec7596c3d3842bd93e52b805c5992837
diff --git a/metadata/md5-cache/net-dns/unbound-1.8.1 b/metadata/md5-cache/net-dns/unbound-1.8.1
new file mode 100644
index 000000000000..b5f1d6134e69
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.8.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) redis? ( dev-libs/hiredis:= ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd )
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=7
+HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
+IUSE=debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0/8
+SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.8.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=5d09a0805558c64535bee376e6dda6c2
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 640c9f173060..6d00ed91629a 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/firewalld-0.6.3 b/metadata/md5-cache/net-firewall/firewalld-0.6.3
new file mode 100644
index 000000000000..600037404c7b
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/firewalld-0.6.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+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 ) 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(+)?] !!net-firewall/gshield dev-python/dbus-python[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(+)?] dev-python/decorator[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(+)?] >=dev-python/python-slip-0.2.7[dbus,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(+)?] dev-python/pygobject:3[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(+)?] net-firewall/ebtables net-firewall/iptables[ipv6] net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,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(+)?] ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext >=app-portage/elt-patches-20170815 !<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
+DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
+EAPI=6
+HOMEPAGE=http://www.firewalld.org/
+IUSE=gui kernel_linux 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
+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 ) 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(+)?] !!net-firewall/gshield dev-python/dbus-python[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(+)?] dev-python/decorator[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(+)?] >=dev-python/python-slip-0.2.7[dbus,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(+)?] dev-python/pygobject:3[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(+)?] net-firewall/ebtables net-firewall/iptables[ipv6] net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,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=^^ ( 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/firewalld/firewalld/archive/v0.6.3.tar.gz -> firewalld-0.6.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=40df32812314b9746fcc1eafcdfed162
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.0.4 b/metadata/md5-cache/net-firewall/shorewall-5.2.0.4
deleted file mode 100644
index 01cba454f0fe..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-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.4.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-5.2.0.4.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall6-5.2.0.4.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-lite-5.2.0.4.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall6-lite-5.2.0.4.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-init-5.2.0.4.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-docs-html-5.2.0.4.tar.bz2 )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fa7a39ed24d6bb5cf35533a498669df3
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.0.5 b/metadata/md5-cache/net-firewall/shorewall-5.2.0.5
index a76ea0c41470..fec62f912557 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.0.5
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.0.5
@@ -4,11 +4,11 @@ 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
+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	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=035b86132f05d41c34ff6a7066b3d954
+_md5_=906ab1a9c9fb58c2c168f30193cc0c19
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.1 b/metadata/md5-cache/net-firewall/shorewall-5.2.1
new file mode 100644
index 000000000000..05492da4da9f
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.1
@@ -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.1/shorewall-core-5.2.1.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.1/shorewall-5.2.1.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.1/shorewall6-5.2.1.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.1/shorewall-lite-5.2.1.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.1/shorewall6-lite-5.2.1.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.1/shorewall-init-5.2.1.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.1/shorewall-docs-html-5.2.1.tar.bz2 )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=cbb1f39b5d7de99e7563a268ebf7a3cc
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-2.13 b/metadata/md5-cache/net-firewall/xtables-addons-2.13
index f7818917edbb..0d24896557c2 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-2.13
+++ b/metadata/md5-cache/net-firewall/xtables-addons-2.13
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=net-firewall/iptables-1.4.5 virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=>=net-firewall/iptables-1.4.5 virtual/linux-sources modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
 DESCRIPTION=iptables extensions not yet accepted in the main kernel
 EAPI=6
 HOMEPAGE=http://xtables-addons.sourceforge.net/
-IUSE=modules xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux
+IUSE=xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux +modules
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.5 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) kernel_linux? ( virtual/modutils )
+RDEPEND=>=net-firewall/iptables-1.4.5 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xtables-addons/xtables-addons-2.13.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e65f485c5239da034b6552f16cc24bf
+_md5_=952f919ac6a00c9a23ed1088bac39ec4
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-2.14 b/metadata/md5-cache/net-firewall/xtables-addons-2.14
index 0570162e23f8..2248be1d85b1 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-2.14
+++ b/metadata/md5-cache/net-firewall/xtables-addons-2.14
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=net-firewall/iptables-1.4.5 virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=>=net-firewall/iptables-1.4.5 virtual/linux-sources modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
 DESCRIPTION=iptables extensions not yet accepted in the main kernel
 EAPI=6
 HOMEPAGE=http://xtables-addons.sourceforge.net/
-IUSE=modules xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux
+IUSE=xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux +modules
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.5 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) kernel_linux? ( virtual/modutils )
+RDEPEND=>=net-firewall/iptables-1.4.5 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xtables-addons/xtables-addons-2.14.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a6e85d67aa042ce4e132b03a724ac5c
+_md5_=c2a1711c4ad87d1443966a7fbf64ca93
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.0 b/metadata/md5-cache/net-firewall/xtables-addons-3.0
index 5ddeeccebc4e..1cba9c6f4df1 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.0
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=net-firewall/iptables-1.6.0 virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=>=net-firewall/iptables-1.6.0 virtual/linux-sources modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
 DESCRIPTION=iptables extensions not yet accepted in the main kernel
 EAPI=6
 HOMEPAGE=http://xtables-addons.sourceforge.net/
-IUSE=modules xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux
+IUSE=xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux +modules
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) kernel_linux? ( virtual/modutils )
+RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xtables-addons/xtables-addons-3.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=67097582ba614993c923be860c32d896
+_md5_=c3b81a11f0d0d0df7aaa67a24422095d
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.1 b/metadata/md5-cache/net-firewall/xtables-addons-3.1
index 59ec7ccfe9a4..0c269ee3a7b8 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.1
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=net-firewall/iptables-1.6.0 virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=>=net-firewall/iptables-1.6.0 virtual/linux-sources modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
 DESCRIPTION=iptables extensions not yet accepted in the main kernel
 EAPI=6
 HOMEPAGE=http://xtables-addons.sourceforge.net/
-IUSE=modules xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux
+IUSE=xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux +modules
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) kernel_linux? ( virtual/modutils )
+RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xtables-addons/xtables-addons-3.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=46ebc0cbe80fb5d25cff1470aaa66db4
+_md5_=49acebbc6b75a60e688bdeeea6162a31
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.2 b/metadata/md5-cache/net-firewall/xtables-addons-3.2
index 3bf6228453c5..77263cbac270 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.2
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=net-firewall/iptables-1.6.0 virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=>=net-firewall/iptables-1.6.0 virtual/linux-sources modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
 DESCRIPTION=iptables extensions not yet accepted in the main kernel
 EAPI=6
 HOMEPAGE=http://xtables-addons.sourceforge.net/
-IUSE=modules xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux
+IUSE=xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux +modules
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) kernel_linux? ( virtual/modutils )
+RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xtables-addons/xtables-addons-3.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=46ebc0cbe80fb5d25cff1470aaa66db4
+_md5_=49acebbc6b75a60e688bdeeea6162a31
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 2a0f36649707..d60c6ac34ba5 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/mc-2018.10.16.23.25.25 b/metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25
new file mode 100644
index 000000000000..ad383827928d
--- /dev/null
+++ b/metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
+EAPI=6
+HOMEPAGE=https://github.com/minio/mc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!app-misc/mc
+SLOT=0
+SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-10-16T23-25-25Z.tar.gz -> mc-2018.10.16.23.25.25.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58 b/metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58
new file mode 100644
index 000000000000..1e41d79d77a3
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58
@@ -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-10-18T00-28-58Z.tar.gz -> minio-2018.10.18.00.28.58.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/samba-4.5.16 b/metadata/md5-cache/net-fs/samba-4.5.16
index 41d8115985cf..10fb3da5d439 100644
--- a/metadata/md5-cache/net-fs/samba-4.5.16
+++ b/metadata/md5-cache/net-fs/samba-4.5.16
@@ -11,5 +11,5 @@ REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) cluster?
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.5.16.tar.gz https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=d2f5f70cbf98ea9d582730564b7ff319
diff --git a/metadata/md5-cache/net-fs/samba-4.7.10 b/metadata/md5-cache/net-fs/samba-4.7.10
index b47d78fdff44..dcd1471652ee 100644
--- a/metadata/md5-cache/net-fs/samba-4.7.10
+++ b/metadata/md5-cache/net-fs/samba-4.7.10
@@ -4,12 +4,12 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
 IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.3.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( python gnutls ) addns? ( python ) ads? ( acl gnutls ldap ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.7.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
-_md5_=714c6cec0bcb9e249b0be2fe2d406cb0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
+_md5_=7d577d4f5d8cc412ed6a8bfbda03c6ca
diff --git a/metadata/md5-cache/net-fs/samba-4.8.5 b/metadata/md5-cache/net-fs/samba-4.8.5
index 308443ac72d0..f60dec1ac83a 100644
--- a/metadata/md5-cache/net-fs/samba-4.8.5
+++ b/metadata/md5-cache/net-fs/samba-4.8.5
@@ -4,12 +4,12 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
 IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( python gnutls winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.8.5.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
-_md5_=eea0eb1bdf1f53387cad8d61fd089dc5
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
+_md5_=b67b359c548b56ba193607d91e7fb025
diff --git a/metadata/md5-cache/net-fs/samba-4.8.6 b/metadata/md5-cache/net-fs/samba-4.8.6
new file mode 100644
index 000000000000..321b9a1ce777
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.8.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.8.6.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
+_md5_=56308d9937ece8c4ec25abbd2fbd82fb
diff --git a/metadata/md5-cache/net-fs/samba-4.9.0 b/metadata/md5-cache/net-fs/samba-4.9.0
deleted file mode 100644
index 471c7e168dd7..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.2[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.2[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls json winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.9.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
-_md5_=c70141392440a78273744055b422cceb
diff --git a/metadata/md5-cache/net-fs/samba-4.9.1 b/metadata/md5-cache/net-fs/samba-4.9.1
index 55f001a70e50..6c1ea99f3905 100644
--- a/metadata/md5-cache/net-fs/samba-4.9.1
+++ b/metadata/md5-cache/net-fs/samba-4.9.1
@@ -4,12 +4,12 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
 IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.2[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( python gnutls json winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.9.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
-_md5_=abc7b664cd6e1a587c7c5d0fa2cadcd4
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
+_md5_=59453abd3b60444605386b3b0f5d9e34
diff --git a/metadata/md5-cache/net-fs/tahoe-lafs-1.10.2 b/metadata/md5-cache/net-fs/tahoe-lafs-1.10.2
index 313d880d1a5b..b380693c24cb 100644
--- a/metadata/md5-cache/net-fs/tahoe-lafs-1.10.2
+++ b/metadata/md5-cache/net-fs/tahoe-lafs-1.10.2
@@ -1,14 +1,15 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Secure, decentralized, data store
-EAPI=5
+EAPI=7
 HOMEPAGE=https://tahoe-lafs.org/trac/tahoe-lafs
 IUSE=doc python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/characteristic-14.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/foolscap-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nevow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyasn1-0.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1-modules[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-13.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zbase32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zfec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/characteristic-14.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/foolscap-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nevow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyasn1-0.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1-modules[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zbase32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zfec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d8f7f8d76f2b5b494f1f3464dfed6a68
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=238395e98b4ad8accca827779150f068
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 932f3e06d105..9ca3ba261372 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.37.0 b/metadata/md5-cache/net-ftp/filezilla-3.37.0
deleted file mode 100644
index c863b4f93a91..000000000000
--- a/metadata/md5-cache/net-ftp/filezilla-3.37.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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.1 >=dev-libs/pugixml-1.7 >=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-20170815 !<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.1 >=dev-libs/pugixml-1.7 >=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://download.filezilla-project.org/client/FileZilla_3.37.0_src.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4eee9ba223a0a72a2802bf8b5e7e13fa
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.37.4 b/metadata/md5-cache/net-ftp/filezilla-3.37.4
new file mode 100644
index 000000000000..0bee581afc8d
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.37.4
@@ -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.14.0 >=dev-libs/pugixml-1.7 >=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-20170815 !<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.14.0 >=dev-libs/pugixml-1.7 >=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://download.filezilla-project.org/client/FileZilla_3.37.4_src.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fad876c0d9866ebda595cfdd7aec4608
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 7e225b4a6a11..59dfc9dfda82 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/choqok-1.6.0-r1 b/metadata/md5-cache/net-im/choqok-1.6.0-r1
index 50729273711e..48d1b63f99c4 100644
--- a/metadata/md5-cache/net-im/choqok-1.6.0-r1
+++ b/metadata/md5-cache/net-im/choqok-1.6.0-r1
@@ -1,13 +1,13 @@
 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/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/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-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/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca[qt5(+)] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.46.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kdewebkit-5.46.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) telepathy? ( 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.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
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.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 app-crypt/qca[qt5(+)] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.50.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) telepathy? ( 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Free/Open Source micro-blogging client by KDE
 EAPI=6
 HOMEPAGE=http://choqok.gnufolks.org/
 IUSE=attica konqueror telepathy debug +handbook
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-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/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/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-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/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-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.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca[qt5(+)] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.46.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kdewebkit-5.46.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) !net-im/choqok:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/sonnet-5.50.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 app-crypt/qca[qt5(+)] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.50.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) !net-im/choqok:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/choqok/1.6/src/choqok-1.6.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e10df1f8f1d10d1a2b3f8f190b876e05
diff --git a/metadata/md5-cache/net-im/pidgin-2.13.0 b/metadata/md5-cache/net-im/pidgin-2.13.0
index fa7f53910e76..b0aa14a40af0 100644
--- a/metadata/md5-cache/net-im/pidgin-2.13.0
+++ b/metadata/md5-cache/net-im/pidgin-2.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=GTK Instant Messenger client
 EAPI=6
 HOMEPAGE=http://pidgin.im/
 IUSE=dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie networkmanager nls perl silc tcl tk spell sasl ncurses groupwise prediction python +xscreensaver zephyr zeroconf aqua python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses:0=[unicode] dbus? ( python_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(+)] ) 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(+)] ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1
 REQUIRED_USE=dbus? ( python_targets_python2_7 ) networkmanager? ( dbus ) python? ( python_targets_python2_7 )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.13.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=08267868228e3b640b7d13f5daad7a33
+_md5_=1e24897ed0a66dc4b04c90dba523fabc
diff --git a/metadata/md5-cache/net-im/qtox-1.16.3 b/metadata/md5-cache/net-im/qtox-1.16.3
index cf82317e8c14..806bd73cdd6d 100644
--- a/metadata/md5-cache/net-im/qtox-1.16.3
+++ b/metadata/md5-cache/net-im/qtox-1.16.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[gif,jpeg,png,xcb] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver ) dev-qt/linguist-tools:5 virtual/pkgconfig test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[gif,jpeg,png,xcb] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif:= media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver ) dev-qt/linguist-tools:5 virtual/pkgconfig test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=Most feature-rich GUI for net-libs/tox using Qt5
 EAPI=6
 HOMEPAGE=https://github.com/qTox/qTox
 IUSE=notification test X
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[gif,jpeg,png,xcb] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver )
+RDEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[gif,jpeg,png,xcb] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif:= media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver )
 SLOT=0
 SRC_URI=https://github.com/qTox/qTox/archive/v1.16.3.tar.gz -> qTox-1.16.3.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=445004c59a3df706b70c31f9417ffd2d
+_md5_=e3b2a01d69e5110e82b865b2610ca8bd
diff --git a/metadata/md5-cache/net-im/qtox-9999 b/metadata/md5-cache/net-im/qtox-9999
index 6f79cbcd9432..d8bc42c42d06 100644
--- a/metadata/md5-cache/net-im/qtox-9999
+++ b/metadata/md5-cache/net-im/qtox-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[gif,jpeg,png,xcb] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver ) dev-qt/linguist-tools:5 virtual/pkgconfig test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl] >=sys-apps/sed-4
+DEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[gif,jpeg,png,xcb] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif:= media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver ) dev-qt/linguist-tools:5 virtual/pkgconfig test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl] >=sys-apps/sed-4
 DESCRIPTION=Most feature-rich GUI for net-libs/tox using Qt5
 EAPI=6
 HOMEPAGE=https://github.com/qTox/qTox
 IUSE=notification test X
 LICENSE=GPL-3+
-RDEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[gif,jpeg,png,xcb] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver )
+RDEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[gif,jpeg,png,xcb] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif:= media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver )
 SLOT=0
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0249d85ad352b248c571d318363ee93a
+_md5_=e205ccb89087a15b03583c38a56f4ce0
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.16.2 b/metadata/md5-cache/net-im/signal-desktop-bin-1.16.2
deleted file mode 100644
index b8eef3bb7245..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.16.2
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.16.2_amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=631815cef6d71cf964acf78d49b715f4
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.16.3 b/metadata/md5-cache/net-im/signal-desktop-bin-1.16.3
new file mode 100644
index 000000000000..8e1be1368b92
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.16.3
@@ -0,0 +1,12 @@
+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
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.16.3_amd64.deb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f230a0d5f3ff125a1ded47b16291c154
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.29.0.41 b/metadata/md5-cache/net-im/skypeforlinux-8.29.0.41
deleted file mode 100644
index 61f5ea612dc8..000000000000
--- a/metadata/md5-cache/net-im/skypeforlinux-8.29.0.41
+++ /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.29.0.41-1.x86_64.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=402170f9b2c0db6d15e684cd46ba6c6b
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.29.0.50 b/metadata/md5-cache/net-im/skypeforlinux-8.29.0.50
deleted file mode 100644
index adceafdae8c6..000000000000
--- a/metadata/md5-cache/net-im/skypeforlinux-8.29.0.50
+++ /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.29.0.50-1.x86_64.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=402170f9b2c0db6d15e684cd46ba6c6b
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.30.0.50 b/metadata/md5-cache/net-im/skypeforlinux-8.30.0.50
deleted file mode 100644
index cfaf494e67ae..000000000000
--- a/metadata/md5-cache/net-im/skypeforlinux-8.30.0.50
+++ /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.30.0.50-1.x86_64.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=402170f9b2c0db6d15e684cd46ba6c6b
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.32.0.44 b/metadata/md5-cache/net-im/skypeforlinux-8.32.0.44
new file mode 100644
index 000000000000..79ff978e6dc5
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.32.0.44
@@ -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=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.32.0.44-1.x86_64.rpm
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=713e7e29f95f88176fbb9805620b1644
diff --git a/metadata/md5-cache/net-im/slack-bin-3.2.1 b/metadata/md5-cache/net-im/slack-bin-3.2.1
deleted file mode 100644
index c24b593cd929..000000000000
--- a/metadata/md5-cache/net-im/slack-bin-3.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Team collaboration tool
-EAPI=6
-HOMEPAGE=http://www.slack.com/
-IUSE=ayatana gnome-keyring pax_kernel abi_x86_64
-KEYWORDS=~amd64 -*
-LICENSE=all-rights-reserved
-RDEPEND=dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] net-misc/curl:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXcursor:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libXi:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/libXrender:0[abi_x86_64(-)?] x11-libs/libXScrnSaver:0[abi_x86_64(-)?] x11-libs/libXtst:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] ayatana? ( dev-libs/libappindicator:3[abi_x86_64(-)?] ) gnome-keyring? ( app-crypt/libsecret:0[abi_x86_64(-)?] )
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=71f92fca0a1b11952d5439dc5fe7fce7
diff --git a/metadata/md5-cache/net-im/slack-bin-3.3.3 b/metadata/md5-cache/net-im/slack-bin-3.3.3
new file mode 100644
index 000000000000..2a408abb1ff1
--- /dev/null
+++ b/metadata/md5-cache/net-im/slack-bin-3.3.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Team collaboration tool
+EAPI=6
+HOMEPAGE=http://www.slack.com/
+IUSE=ayatana gnome-keyring pax_kernel abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] net-misc/curl:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXcursor:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libXi:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/libXrender:0[abi_x86_64(-)?] x11-libs/libXScrnSaver:0[abi_x86_64(-)?] x11-libs/libXtst:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] ayatana? ( dev-libs/libappindicator:3[abi_x86_64(-)?] ) gnome-keyring? ( app-crypt/libsecret:0[abi_x86_64(-)?] )
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.3.3-amd64.deb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e8d39d46ce6702484d65819547832c22
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.4.0-r1 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.4.0-r1
deleted file mode 100644
index 7048e235cf7d..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=6
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=telegram
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb] >=media-libs/fontconfig-2.13
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.4.0.tar.gz -> tdesktop-1.4.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.4.0.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.4.0.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eb0762c9e36c6f264a45cf171733513f
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.4.3 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.4.3
new file mode 100644
index 000000000000..877fae3879c2
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-1.4.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=6
+HOMEPAGE=https://desktop.telegram.org
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=telegram
+RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb] >=media-libs/fontconfig-2.13
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.4.3.tar.gz -> tdesktop-1.4.3.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.4.3.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.4.3.tar.xz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=de6782522247f6f7dfb9a61d41c3ff11
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 6d0e634263af..821f6acd63c9 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/eggdrop-1.8.3 b/metadata/md5-cache/net-irc/eggdrop-1.8.3
index 329e0a075983..e4721f4c0ba4 100644
--- a/metadata/md5-cache/net-irc/eggdrop-1.8.3
+++ b/metadata/md5-cache/net-irc/eggdrop-1.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=An IRC bot extensible with C or TCL
 EAPI=7
 HOMEPAGE=https://www.eggheads.org/
 IUSE=debug doc ipv6 ssl static
-KEYWORDS=~alpha ~amd64 ia64 ~mips ppc sparc x86
+KEYWORDS=alpha ~amd64 ia64 ~mips ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=sys-apps/gentoo-functions dev-lang/tcl:0= ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://ftp.eggheads.org/pub/eggdrop/source/1.8/eggdrop-1.8.3.tar.gz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=e24ee11387c3a0e46fe285a2733a5219
+_md5_=efd0b8957de41cdf9526858eb5f3297e
diff --git a/metadata/md5-cache/net-irc/irssi-1.0.7 b/metadata/md5-cache/net-irc/irssi-1.0.7
index d8928613dd45..827ad6b621e5 100644
--- a/metadata/md5-cache/net-irc/irssi-1.0.7
+++ b/metadata/md5-cache/net-irc/irssi-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=https://irssi.org/
 IUSE=+perl selinux socks5 +proxy libressl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client ) dev-lang/perl:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/irssi/irssi/releases/download/1.0.7/irssi-1.0.7.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2069b3aad2c3588749be48037281396e
+_md5_=c2b18e47d89a88caad7bf940e0395951
diff --git a/metadata/md5-cache/net-irc/irssi-1.1.1 b/metadata/md5-cache/net-irc/irssi-1.1.1
deleted file mode 100644
index 37e6ac613ff2..000000000000
--- a/metadata/md5-cache/net-irc/irssi-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig dev-lang/perl:=
-DESCRIPTION=A modular textUI IRC client with IPv6 support
-EAPI=6
-HOMEPAGE=https://irssi.org/
-IUSE=+perl selinux socks5 +proxy libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client ) dev-lang/perl:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/irssi/irssi/releases/download/1.1.1/irssi-1.1.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b5920cb6f841681dc040faff0c92947
diff --git a/metadata/md5-cache/net-irc/irssi-1.1.1-r1 b/metadata/md5-cache/net-irc/irssi-1.1.1-r1
index fd92c6ff4f5b..270e31aec2fb 100644
--- a/metadata/md5-cache/net-irc/irssi-1.1.1-r1
+++ b/metadata/md5-cache/net-irc/irssi-1.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=https://irssi.org/
 IUSE=+perl selinux socks5 +proxy libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/irssi/irssi/releases/download/1.1.1/irssi-1.1.1.tar.xz
 _eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b76aae9f97bc82aeb69712d9ca419813
+_md5_=fdbd9860db64928d66041bd64fa9cfa2
diff --git a/metadata/md5-cache/net-irc/irssi-9999 b/metadata/md5-cache/net-irc/irssi-9999
index b53de5c6b0bd..61a673c10c10 100644
--- a/metadata/md5-cache/net-irc/irssi-9999
+++ b/metadata/md5-cache/net-irc/irssi-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7be9d58a86a7895bd40fca3337eb4a0c
+_md5_=1d6b5c1d0eb4b206e683c0bbcf91d0a0
diff --git a/metadata/md5-cache/net-irc/irssistats-0.75-r1 b/metadata/md5-cache/net-irc/irssistats-0.75-r1
new file mode 100644
index 000000000000..bab1b737997b
--- /dev/null
+++ b/metadata/md5-cache/net-irc/irssistats-0.75-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=net-irc/irssi
+DESCRIPTION=Generates HTML IRC stats based on irssi logs
+EAPI=6
+HOMEPAGE=http://royale.zerezo.com/irssistats/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://royale.zerezo.com/irssistats/irssistats-0.75.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9fde4c2216be301bc6a07337c3698cb7
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.5 b/metadata/md5-cache/net-irc/konversation-1.7.5
index 3ca96144b549..c3fc70d6de97 100644
--- a/metadata/md5-cache/net-irc/konversation-1.7.5
+++ b/metadata/md5-cache/net-irc/konversation-1.7.5
@@ -1,13 +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/kbookmarks-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/kemoticons-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/kio-5.46.0:5 >=kde-frameworks/kitemviews-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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-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/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext crypt? ( app-crypt/qca:2[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 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext crypt? ( app-crypt/qca:2[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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A user friendly IRC Client
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org
 IUSE=+crypt debug +handbook
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-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/kemoticons-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/kio-5.46.0:5 >=kde-frameworks/kitemviews-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/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-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/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5(+)] ) !net-irc/konversation:4 crypt? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kbookmarks-5.50.0:5 >=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kemoticons-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kidletime-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5(+)] ) !net-irc/konversation:4 crypt? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.7.5/src/konversation-1.7.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e1ec4a72075f2560df4e023f6d39b596
diff --git a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180401054732 b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180401054732
deleted file mode 100644
index 9ff877ef9218..000000000000
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180401054732
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) virtual/pkgconfig doc? ( app-doc/doxygen ) kde? ( kde-frameworks/extra-cmake-modules:5 ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Advanced IRC Client
-EAPI=6
-HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
-IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=kvirc
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
-REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/kvirc/KVIrc/archive/e6915e5ed77aef19080aeab5ca76a61faf1d4e41.tar.gz -> kvirc-5.0_pre20180401054732.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c12a2b269fffe3408681cc2898d25a22
diff --git a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180605072059 b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180605072059
deleted file mode 100644
index ee67c2edf99e..000000000000
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180605072059
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) virtual/pkgconfig doc? ( app-doc/doxygen ) kde? ( kde-frameworks/extra-cmake-modules:5 ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Advanced IRC Client
-EAPI=6
-HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
-IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=kvirc
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
-REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/kvirc/KVIrc/archive/8db61929facd9bfed245752c538b51d0242c3e2e.tar.gz -> kvirc-5.0_pre20180605072059.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ba9ce34572c4cce1ae0647417ce35b8d
diff --git a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180819121252 b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180819121252
index 3974d2ff68cd..d27f48deaafe 100644
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180819121252
+++ b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180819121252
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced IRC Client
 EAPI=6
 HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
 IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=kvirc
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
 REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/kvirc/KVIrc/archive/abc7a305d16d5ff939959164cff856af8f6d6ca1.tar.gz -> kvirc-5.0_pre20180819121252.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=318257147bcf81b4d137c783374854e1
+_md5_=9381e823779a1b3ba6b89325b1db21b0
diff --git a/metadata/md5-cache/net-irc/kvirc-5.0_pre20181013192652 b/metadata/md5-cache/net-irc/kvirc-5.0_pre20181013192652
new file mode 100644
index 000000000000..62e9ee250521
--- /dev/null
+++ b/metadata/md5-cache/net-irc/kvirc-5.0_pre20181013192652
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) virtual/pkgconfig doc? ( app-doc/doxygen ) kde? ( kde-frameworks/extra-cmake-modules:5 ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Advanced IRC Client
+EAPI=6
+HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
+IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=kvirc
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
+REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/kvirc/KVIrc/archive/c7eea2406bf70a77a127b6bf472f422f2dbd9de9.tar.gz -> kvirc-5.0_pre20181013192652.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0fcd80d4b06775031fb8b6157056333c
diff --git a/metadata/md5-cache/net-irc/kvirc-9999 b/metadata/md5-cache/net-irc/kvirc-9999
index 5dfb0ae3ce57..7e2b50693d6d 100644
--- a/metadata/md5-cache/net-irc/kvirc-9999
+++ b/metadata/md5-cache/net-irc/kvirc-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5
 REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0c449612d763cead4645d15dfa69956d
+_md5_=1f56bffd2e1e4a6edcee416bd44dee94
diff --git a/metadata/md5-cache/net-irc/quassel-0.13_rc1 b/metadata/md5-cache/net-irc/quassel-0.13_rc1
deleted file mode 100644
index 340929300fd1..000000000000
--- a/metadata/md5-cache/net-irc/quassel-0.13_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm prepare setup test
-DEPEND=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] ) ) ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
-EAPI=6
-HOMEPAGE=http://quassel-irc.org/
-IUSE=bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris
-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
-SRC_URI=http://quassel-irc.org/pub/quassel-0.13-rc1.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d5e6f8b53232145a284385c27b3d519
diff --git a/metadata/md5-cache/net-irc/quassel-0.13_rc2 b/metadata/md5-cache/net-irc/quassel-0.13_rc2
new file mode 100644
index 000000000000..c5c033401668
--- /dev/null
+++ b/metadata/md5-cache/net-irc/quassel-0.13_rc2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup test
+DEPEND=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] ) ) ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
+EAPI=6
+HOMEPAGE=http://quassel-irc.org/
+IUSE=bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris
+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
+SRC_URI=http://quassel-irc.org/pub/quassel-0.13-rc2.tar.bz2
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f3970c67d90486a12da74b017c066234
diff --git a/metadata/md5-cache/net-irc/quassel-9999 b/metadata/md5-cache/net-irc/quassel-9999
index 031db0eefe26..ff301a4bc379 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -9,4 +9,4 @@ 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
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7ef436d4f4288014121fcf2d63e18c9e
+_md5_=bbb689b10a4850c244c7f64ccfc56834
diff --git a/metadata/md5-cache/net-irc/unrealircd-4.0.18-r1 b/metadata/md5-cache/net-irc/unrealircd-4.0.18-r1
new file mode 100644
index 000000000000..e88298a07b05
--- /dev/null
+++ b/metadata/md5-cache/net-irc/unrealircd-4.0.18-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=dev-libs/openssl:0= dev-libs/libpcre2 dev-libs/tre >=net-dns/c-ares-1.7:= sys-libs/zlib curl? ( net-misc/curl[adns] ) virtual/pkgconfig || ( dev-libs/openssl:0 dev-libs/libressl:0 )
+DESCRIPTION=An advanced Internet Relay Chat daemon
+EAPI=6
+HOMEPAGE=https://www.unrealircd.org/
+IUSE=class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq showlistmodes shunnotices topicisnuhost +usermod
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:0= dev-libs/libpcre2 dev-libs/tre >=net-dns/c-ares-1.7:= sys-libs/zlib curl? ( net-misc/curl[adns] )
+SLOT=0
+SRC_URI=https://www.unrealircd.org/unrealircd4/unrealircd-4.0.18.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9c922f6dc59c64de2b1b1b3e98789aa5
diff --git a/metadata/md5-cache/net-irc/weechat-2.1 b/metadata/md5-cache/net-irc/weechat-2.1
deleted file mode 100644
index ff25eb2f2104..000000000000
--- a/metadata/md5-cache/net-irc/weechat-2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) 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(+)?] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) doc? ( >=dev-ruby/asciidoctor-1.5.4 dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Portable and multi-interface IRC client
-EAPI=6
-HOMEPAGE=https://weechat.org/
-IUSE=doc nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) 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(+)?] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-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://weechat.org/files/src/weechat-2.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=993ab32770aa35f77ba5b8c3a1aff36e
diff --git a/metadata/md5-cache/net-irc/weechat-2.2-r1 b/metadata/md5-cache/net-irc/weechat-2.2-r1
index 9732c1499c64..b90f2a3c3a30 100644
--- a/metadata/md5-cache/net-irc/weechat-2.2-r1
+++ b/metadata/md5-cache/net-irc/weechat-2.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Portable and multi-interface IRC client
 EAPI=6
 HOMEPAGE=https://weechat.org/
 IUSE=doc nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~x64-macos
+KEYWORDS=amd64 ~x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) 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(+)?] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://weechat.org/files/src/weechat-2.2.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fb1b80f5d342eb64fcab31688f07fc7d
+_md5_=6f05102a8f9e3bd452886082bb034add
diff --git a/metadata/md5-cache/net-irc/weechat-2.3 b/metadata/md5-cache/net-irc/weechat-2.3
new file mode 100644
index 000000000000..960ef1d0590f
--- /dev/null
+++ b/metadata/md5-cache/net-irc/weechat-2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) 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(+)?] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) doc? ( >=dev-ruby/asciidoctor-1.5.4 dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Portable and multi-interface IRC client
+EAPI=6
+HOMEPAGE=https://weechat.org/
+IUSE=doc nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc 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
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) 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(+)?] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+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_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 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://weechat.org/files/src/weechat-2.3.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=744d3cafea7fcd15f8d07db7813bedf9
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 0de3e679d116..ea197c526f43 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) 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(+)?] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) doc? ( >=dev-ruby/asciidoctor-1.5.4 dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) 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(+)?] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) doc? ( >=dev-ruby/asciidoctor-1.5.4 dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=6
 HOMEPAGE=https://weechat.org/
-IUSE=doc nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=doc nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc 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
 LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) 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(+)?] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-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 ) )
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) 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(+)?] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+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_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 ) )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fb1b80f5d342eb64fcab31688f07fc7d
+_md5_=744d3cafea7fcd15f8d07db7813bedf9
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 5f7a05fa3070..2ead255f44c5 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/ccrtp-2.1.2 b/metadata/md5-cache/net-libs/ccrtp-2.1.2
index 8a113a527d99..fd5c96ddfee6 100644
--- a/metadata/md5-cache/net-libs/ccrtp-2.1.2
+++ b/metadata/md5-cache/net-libs/ccrtp-2.1.2
@@ -1,13 +1,12 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=dev-cpp/commoncpp2-1.3.0:0= dev-libs/libgcrypt:0= >=dev-libs/ucommon-5.0.0:= virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install
+DEPEND=>=dev-cpp/commoncpp2-1.3.0:0= dev-libs/libgcrypt:0= >=dev-libs/ucommon-6.2.2:= virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=GNU ccRTP - Implementation of the IETF real-time transport protocol
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/ccrtp/
 IUSE=doc
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-cpp/commoncpp2-1.3.0:0= dev-libs/libgcrypt:0= >=dev-libs/ucommon-5.0.0:=
+RDEPEND=>=dev-cpp/commoncpp2-1.3.0:0= dev-libs/libgcrypt:0= >=dev-libs/ucommon-6.2.2:=
 SLOT=0/2
 SRC_URI=mirror://gnu/ccrtp/ccrtp-2.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=040bac1f1b714cfbdaf5b0bf2a608a0e
+_md5_=7c48b320789e136272c8bbd59e931a5d
diff --git a/metadata/md5-cache/net-libs/farstream-0.2.8-r2 b/metadata/md5-cache/net-libs/farstream-0.2.8-r2
index e9c941268a59..211068772dca 100644
--- a/metadata/md5-cache/net-libs/farstream-0.2.8-r2
+++ b/metadata/md5-cache/net-libs/farstream-0.2.8-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Audio/video conferencing framework specifically designed for instant
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/Farstream
 IUSE=+introspection test upnp
-KEYWORDS=~amd64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.32:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11:= ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-good-1.4:1.0 media-plugins/gst-plugins-srtp:1.0 media-plugins/gst-plugins-libnice:1.0
 RESTRICT=test
 SLOT=0.2/5
 SRC_URI=https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fbd31010f3b591bdf0b2573cb4375adb
+_md5_=8819d81756066f2e5f2023dca0718c02
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.51 b/metadata/md5-cache/net-libs/gsoap-2.8.51
deleted file mode 100644
index fa9ba02f98cd..000000000000
--- a/metadata/md5-cache/net-libs/gsoap-2.8.51
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) app-arch/unzip sys-devel/flex sys-devel/bison >=app-portage/elt-patches-20170815 !<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 cross-platform open source C and C++ SDK for SOAP/XML Web services
-EAPI=6
-HOMEPAGE=http://gsoap2.sourceforge.net
-IUSE=doc debug examples ipv6 libressl gnutls +ssl
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 gSOAP
-RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.51.zip
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a4ec000a21709948371351cdcd379fbb
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.55 b/metadata/md5-cache/net-libs/gsoap-2.8.55
deleted file mode 100644
index 604cb36b0f4d..000000000000
--- a/metadata/md5-cache/net-libs/gsoap-2.8.55
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-arch/unzip sys-devel/flex sys-devel/bison >=app-portage/elt-patches-20170815 !<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 cross-platform open source C and C++ SDK for SOAP/XML Web services
-EAPI=6
-HOMEPAGE=http://gsoap2.sourceforge.net
-IUSE=doc debug examples ipv6 libressl gnutls +ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 gSOAP
-RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.55.zip
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b463e38ce2b7c4840bf7a53f01a55a90
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.58 b/metadata/md5-cache/net-libs/gsoap-2.8.58
deleted file mode 100644
index eb070d75310c..000000000000
--- a/metadata/md5-cache/net-libs/gsoap-2.8.58
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-arch/unzip sys-devel/flex sys-devel/bison >=app-portage/elt-patches-20170815 !<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 cross-platform open source C and C++ SDK for SOAP/XML Web services
-EAPI=6
-HOMEPAGE=http://gsoap2.sourceforge.net
-IUSE=doc debug examples ipv6 libressl gnutls +ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 gSOAP
-RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.58.zip
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b463e38ce2b7c4840bf7a53f01a55a90
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.59 b/metadata/md5-cache/net-libs/gsoap-2.8.59
deleted file mode 100644
index 1b91815e2fc4..000000000000
--- a/metadata/md5-cache/net-libs/gsoap-2.8.59
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-arch/unzip sys-devel/flex sys-devel/bison >=app-portage/elt-patches-20170815 !<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 cross-platform open source C and C++ SDK for SOAP/XML Web services
-EAPI=6
-HOMEPAGE=http://gsoap2.sourceforge.net
-IUSE=doc debug examples ipv6 libressl gnutls +ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 gSOAP
-RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.59.zip
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=069ae7ad9337a506be2fb998078c59d3
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.63 b/metadata/md5-cache/net-libs/gsoap-2.8.63
index 30b8d4b3607c..b9df37c1dd39 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.63
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.63
@@ -4,10 +4,10 @@ DESCRIPTION=A cross-platform open source C and C++ SDK for SOAP/XML Web services
 EAPI=6
 HOMEPAGE=http://gsoap2.sourceforge.net
 IUSE=doc debug examples ipv6 libressl gnutls +ssl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 gSOAP
 RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.63.zip
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=069ae7ad9337a506be2fb998078c59d3
+_md5_=0e9a031cdf0d1fb10a784f24e70afcad
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.70 b/metadata/md5-cache/net-libs/gsoap-2.8.70
new file mode 100644
index 000000000000..83933d0ffdde
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.70
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-arch/unzip sys-devel/flex sys-devel/bison
+DESCRIPTION=A cross-platform open source C and C++ SDK for SOAP/XML Web services
+EAPI=7
+HOMEPAGE=http://gsoap2.sourceforge.net
+IUSE=doc debug examples ipv6 libressl gnutls +ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 gSOAP
+RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.70.zip
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2466bf8058f5eb0432151add58c47bbe
diff --git a/metadata/md5-cache/net-libs/ignition-msgs-0.7.0 b/metadata/md5-cache/net-libs/ignition-msgs-0.7.0
deleted file mode 100644
index ee905067d30c..000000000000
--- a/metadata/md5-cache/net-libs/ignition-msgs-0.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/protobuf:= sci-libs/ignition-math:3= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Protobuf messages and functions for robot applications
-EAPI=6
-HOMEPAGE=https://ignitionrobotics.org/libraries/messages https://bitbucket.org/ignitionrobotics/ign-msgs
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/protobuf:= sci-libs/ignition-math:3=
-SLOT=0
-SRC_URI=https://osrf-distributions.s3.amazonaws.com/ign-msgs/releases/ignition-msgs-0.7.0.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=66a875c028e120c9dbf27d69396f9187
diff --git a/metadata/md5-cache/net-libs/ignition-msgs-1.0.0 b/metadata/md5-cache/net-libs/ignition-msgs-1.0.0
index 2cdd655bc07b..bc34c94441d1 100644
--- a/metadata/md5-cache/net-libs/ignition-msgs-1.0.0
+++ b/metadata/md5-cache/net-libs/ignition-msgs-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/ignition-math: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(-)?]
 SLOT=1
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/ign-msgs/releases/ignition-msgs-1.0.0.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9532b0ca185462aaa4491a1403a90d45
diff --git a/metadata/md5-cache/net-libs/ignition-transport-3.1.0-r1 b/metadata/md5-cache/net-libs/ignition-transport-3.1.0-r1
deleted file mode 100644
index 8888a7ce5f57..000000000000
--- a/metadata/md5-cache/net-libs/ignition-transport-3.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/ignition-msgs:0= dev-libs/protobuf:= >=net-libs/zeromq-3.2.0:= sys-apps/util-linux net-libs/cppzmq virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Combines ZeroMQ with Protobufs to create a fast and efficient message passing system
-EAPI=5
-HOMEPAGE=https://ignitionrobotics.org/libraries/transport
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-libs/ignition-msgs:0= dev-libs/protobuf:= >=net-libs/zeromq-3.2.0:= sys-apps/util-linux net-libs/cppzmq
-SLOT=3/3
-SRC_URI=http://gazebosim.org/distributions/ign-transport/releases/ignition-transport3-3.1.0.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a0cd2cf98e14d0f71aea9ef6ddd545b9
diff --git a/metadata/md5-cache/net-libs/kdav2-0.1.0 b/metadata/md5-cache/net-libs/kdav2-0.1.0
deleted file mode 100644
index 088af494ef05..000000000000
--- a/metadata/md5-cache/net-libs/kdav2-0.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.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 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=KJob based DAV protocol implementation
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-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/unstable/kdav2/0.1.0/src/kdav2-0.1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d19bd9b820593324b6bbd8047667ffc1
diff --git a/metadata/md5-cache/net-libs/kdav2-0.2.0 b/metadata/md5-cache/net-libs/kdav2-0.2.0
new file mode 100644
index 000000000000..0846947fc453
--- /dev/null
+++ b/metadata/md5-cache/net-libs/kdav2-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.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.50.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=KJob based DAV protocol implementation
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/unstable/kdav2/0.2.0/src/kdav2-0.2.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=eb5c5e9cc8b9c36afe2148f35c33bc98
diff --git a/metadata/md5-cache/net-libs/kimap2-0.2.0-r1 b/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
index 1b4c70d4ef42..5d0f06d41882 100644
--- a/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
+++ b/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] dev-libs/cyrus-sasl:2 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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] dev-libs/cyrus-sasl:2 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Library for interacting with IMAP servers - successor of kimap
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] dev-libs/cyrus-sasl:2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcodecs-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] dev-libs/cyrus-sasl:2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kimap2/0.2.0/src/kimap2-0.2.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed07e24edea48b82ef1aa4c7da81ac72
diff --git a/metadata/md5-cache/net-libs/libaccounts-glib-1.23 b/metadata/md5-cache/net-libs/libaccounts-glib-1.23
index 2b5dc0dc7b8b..b2b2fac444f8 100644
--- a/metadata/md5-cache/net-libs/libaccounts-glib-1.23
+++ b/metadata/md5-cache/net-libs/libaccounts-glib-1.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 dev-util/gtk-doc >=app-portage/elt-patches-20170815 !<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=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 dev-util/glib-utils dev-util/gtk-doc >=app-portage/elt-patches-20170815 !<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=Accounts SSO (Single Sign-On) management library for GLib applications
 EAPI=6
 HOMEPAGE=https://01.org/gsso/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.gz?ref=VERSION_1.23 -> libaccounts-glib-1.23.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=842e422549e969a836b47391de6017e8
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ab40585eb4d7e779ea0d0c5c515322fd
diff --git a/metadata/md5-cache/net-libs/libbloom-1.5 b/metadata/md5-cache/net-libs/libbloom-1.5
deleted file mode 100644
index 2d5da9331c47..000000000000
--- a/metadata/md5-cache/net-libs/libbloom-1.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A simple and small bloom filter implementation in plain C.
-EAPI=6
-HOMEPAGE=https://github.com/jvirkki/libbloom
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/jvirkki/libbloom/archive/v1.5.tar.gz -> libbloom-1.5.tar.gz
-_md5_=52713127c9a681bb18a9f40841fceb8f
diff --git a/metadata/md5-cache/net-libs/libbloom-1.5-r1 b/metadata/md5-cache/net-libs/libbloom-1.5-r1
new file mode 100644
index 000000000000..1300054ce7f2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libbloom-1.5-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A simple and small bloom filter implementation in plain C.
+EAPI=6
+HOMEPAGE=https://github.com/jvirkki/libbloom
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/jvirkki/libbloom/archive/v1.5.tar.gz -> libbloom-1.5.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4ee834d0ebd76dab57e8e1fc894022e6
diff --git a/metadata/md5-cache/net-libs/libdom-0.3.1 b/metadata/md5-cache/net-libs/libdom-0.3.1
deleted file mode 100644
index 805a5d7f95f3..000000000000
--- a/metadata/md5-cache/net-libs/libdom-0.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.3.0[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(-)?] >=net-libs/libhubbub-0.3.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xml? ( expat? ( >=dev-libs/expat-2.1.0-r3[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(-)?] ) !expat? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) ) virtual/pkgconfig test? ( dev-perl/XML-XPath dev-perl/libxml-perl dev-perl/Switch ) virtual/pkgconfig
-DESCRIPTION=implementation of the W3C DOM, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libdom/
-IUSE=expat test xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.3.0[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(-)?] >=net-libs/libhubbub-0.3.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xml? ( expat? ( >=dev-libs/expat-2.1.0-r3[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(-)?] ) !expat? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) )
-REQUIRED_USE=test? ( xml )
-SLOT=0/0.3.1
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libdom-0.3.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dfb2fbff48c8e49c5e41e519cf8c15c8
diff --git a/metadata/md5-cache/net-libs/libdom-0.3.2 b/metadata/md5-cache/net-libs/libdom-0.3.2
deleted file mode 100644
index 5abf2a294c00..000000000000
--- a/metadata/md5-cache/net-libs/libdom-0.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.3.0[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(-)?] >=net-libs/libhubbub-0.3.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xml? ( expat? ( >=dev-libs/expat-2.1.0-r3[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(-)?] ) !expat? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) ) virtual/pkgconfig test? ( dev-perl/XML-XPath dev-perl/libxml-perl dev-perl/Switch ) virtual/pkgconfig
-DESCRIPTION=implementation of the W3C DOM, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libdom/
-IUSE=expat test xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
-LICENSE=MIT
-RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.3.0[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(-)?] >=net-libs/libhubbub-0.3.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xml? ( expat? ( >=dev-libs/expat-2.1.0-r3[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(-)?] ) !expat? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) )
-REQUIRED_USE=test? ( xml )
-SLOT=0/0.3.2
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libdom-0.3.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dfb2fbff48c8e49c5e41e519cf8c15c8
diff --git a/metadata/md5-cache/net-libs/libdom-0.3.3 b/metadata/md5-cache/net-libs/libdom-0.3.3
new file mode 100644
index 000000000000..46c17891a8a4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libdom-0.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.3.0[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(-)?] >=net-libs/libhubbub-0.3.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xml? ( expat? ( >=dev-libs/expat-2.1.0-r3[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(-)?] ) !expat? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) ) virtual/pkgconfig test? ( dev-perl/XML-XPath dev-perl/libxml-perl dev-perl/Switch ) virtual/pkgconfig
+DESCRIPTION=implementation of the W3C DOM, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/libdom/
+IUSE=expat test xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~m68k-mint
+LICENSE=MIT
+RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libwapcaplet-0.3.0[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(-)?] >=net-libs/libhubbub-0.3.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xml? ( expat? ( >=dev-libs/expat-2.1.0-r3[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(-)?] ) !expat? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) )
+REQUIRED_USE=test? ( xml )
+SLOT=0/0.3.3
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libdom-0.3.3-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=208f34229488dd85bdfa5453651bb081
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.3 b/metadata/md5-cache/net-libs/libhubbub-0.3.3
index 352caf5a3aea..25fe086abe81 100644
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.3
+++ b/metadata/md5-cache/net-libs/libhubbub-0.3.3
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_6
 SLOT=0/0.3.3
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.3-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d73d9dc4407f618ca127d4a6ac33173b
+_md5_=1306d18e35b878c60c7d29b5360e992e
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.4 b/metadata/md5-cache/net-libs/libhubbub-0.3.4
deleted file mode 100644
index ff2bb9615f42..000000000000
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !net-libs/hubbub virtual/pkgconfig test? ( dev-lang/perl >=dev-libs/json-c-0.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(-)?] ) virtual/pkgconfig
-DESCRIPTION=HTML5 compliant parsing library, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/hubbub/
-IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~m68k-mint
-LICENSE=MIT
-RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !net-libs/hubbub
-SLOT=0/0.3.4
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.4-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.6.tar.gz -> netsurf-buildsystem-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b28f8039e68cf8f61aa5ccd434ec5b9
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.5 b/metadata/md5-cache/net-libs/libhubbub-0.3.5
new file mode 100644
index 000000000000..73317c32777e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libhubbub-0.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !net-libs/hubbub virtual/pkgconfig test? ( dev-lang/perl >=dev-libs/json-c-0.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(-)?] ) virtual/pkgconfig
+DESCRIPTION=HTML5 compliant parsing library, written in C
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/projects/hubbub/
+IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~m68k-mint
+LICENSE=MIT
+RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !net-libs/hubbub
+SLOT=0/0.3.5
+SRC_URI=http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.5-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a8ed627a18a5d040b56d34c06e07af4a
diff --git a/metadata/md5-cache/net-libs/libircclient-1.10 b/metadata/md5-cache/net-libs/libircclient-1.10
new file mode 100644
index 000000000000..8294d9bc50bb
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libircclient-1.10
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install prepare
+DEPEND=ssl? ( dev-libs/openssl:0 )
+DESCRIPTION=Small but powerful library implementing the client-server IRC protocol
+EAPI=7
+HOMEPAGE=http://www.ulduzsoft.com/libircclient/
+IUSE=doc ipv6 ssl static-libs threads
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=ssl? ( dev-libs/openssl:0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/libircclient/libircclient-1.10.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5292284f61cb089189d3a680a8ceafb6
diff --git a/metadata/md5-cache/net-libs/libircclient-1.6-r2 b/metadata/md5-cache/net-libs/libircclient-1.6-r2
deleted file mode 100644
index 51f5a39fc0de..000000000000
--- a/metadata/md5-cache/net-libs/libircclient-1.6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( dev-libs/openssl ) >=app-portage/elt-patches-20170815 !<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=Small but powerful library implementing the client-server IRC protocol
-EAPI=5
-HOMEPAGE=http://www.ulduzsoft.com/libircclient/
-IUSE=doc ipv6 ssl static-libs threads
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/libircclient/libircclient-1.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=707e822d6ad2a33f4626174cfd82d4b5
diff --git a/metadata/md5-cache/net-libs/libktorrent-2.1-r1 b/metadata/md5-cache/net-libs/libktorrent-2.1-r1
index 8c84944a6981..b9d1a301e9ad 100644
--- a/metadata/md5-cache/net-libs/libktorrent-2.1-r1
+++ b/metadata/md5-cache/net-libs/libktorrent-2.1-r1
@@ -1,13 +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/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= dev-libs/boost 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.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
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= dev-libs/boost 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.50.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=BitTorrent library based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/internet/ktorrent/
 IUSE=test debug test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-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/kio-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= !net-libs/libktorrent:4 !dev-libs/botan[gmp(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= !net-libs/libktorrent:4 !dev-libs/botan[gmp(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.1/libktorrent-2.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd630996a3ab7cd66315c0c1238a83af
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0 b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
index 1a99454de789..7ab86a62d1bc 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
+++ b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdewebkit-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.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 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.50.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=Library for accessing the features of social networking site vkontakte.ru
 EAPI=6
 HOMEPAGE=https://www.digikam.org/
 IUSE=debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdewebkit-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-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
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/libkvkontakte/5.0.0/src/libkvkontakte-5.0.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8f8fb03993ccabd819ec98060259dd8c
diff --git a/metadata/md5-cache/net-libs/libmediawiki-5.37.0 b/metadata/md5-cache/net-libs/libmediawiki-5.37.0
index c0bc037c7286..c83e1af02bb3 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-5.37.0
+++ b/metadata/md5-cache/net-libs/libmediawiki-5.37.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=dev-qt/qtnetwork-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=dev-qt/qtnetwork-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=C++ interface for MediaWiki based web service as wikipedia.org
 EAPI=6
 HOMEPAGE=https://www.digikam.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=dev-qt/qtnetwork-5.9.4:5 !net-libs/libmediawiki:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=dev-qt/qtnetwork-5.9.4:5 !net-libs/libmediawiki:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/libmediawiki/libmediawiki-5.37.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba4fda50abae19b0b5896bfd4fbc6558
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.13-r2 b/metadata/md5-cache/net-libs/libproxy-0.4.13-r2
index 95a7b4c58cd1..c80d92695c90 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.4.13-r2
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.13-r2
@@ -11,5 +11,5 @@ RDEPEND=gnome? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://github.com/libproxy/libproxy/archive/0.4.13.tar.gz -> libproxy-0.4.13.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcfa9fe83ba967eb06cc80b731650127
diff --git a/metadata/md5-cache/net-libs/libsignon-glib-1.14 b/metadata/md5-cache/net-libs/libsignon-glib-1.14
index 012cb941a8ca..e0d08766e9d4 100644
--- a/metadata/md5-cache/net-libs/libsignon-glib-1.14
+++ b/metadata/md5-cache/net-libs/libsignon-glib-1.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) 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(-)] ) dev-util/gdbus-codegen doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170815 !<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=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) 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(-)] ) dev-util/glib-utils dev-util/gdbus-codegen doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170815 !<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=GLib binding for the D-Bus API provided by signond
 EAPI=6
 HOMEPAGE=https://01.org/gsso/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=VERSION_1.14 -> libsignon-glib-1.14.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ae64bb2b5d5d85b284584b08bbeab4fb
+_md5_=bcfdd41292c83c18d9e15b1999634188
diff --git a/metadata/md5-cache/net-libs/libssh-0.7.4 b/metadata/md5-cache/net-libs/libssh-0.7.4
index 1b767cf2ca08..eb4865e1b78b 100644
--- a/metadata/md5-cache/net-libs/libssh-0.7.4
+++ b/metadata/md5-cache/net-libs/libssh-0.7.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/4
 SRC_URI=https://red.libssh.org/attachments/download/210/libssh-0.7.4.tar.xz -> libssh-0.7.4.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ffe25db100781e601ed4bdf91bb0dd15
diff --git a/metadata/md5-cache/net-libs/libssh-0.7.5-r2 b/metadata/md5-cache/net-libs/libssh-0.7.5-r2
index f33f950aa226..ae2b1678fec0 100644
--- a/metadata/md5-cache/net-libs/libssh-0.7.5-r2
+++ b/metadata/md5-cache/net-libs/libssh-0.7.5-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/4
 SRC_URI=https://red.libssh.org/attachments/download/218/libssh-0.7.5.tar.xz -> libssh-0.7.5.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8f8c7ed3810bc789b8fa1dd98957c977
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.2 b/metadata/md5-cache/net-libs/libssh-0.8.2
deleted file mode 100644
index f37f5bb052e5..000000000000
--- a/metadata/md5-cache/net-libs/libssh-0.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) test? ( >=dev-util/cmocka-0.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Access a working SSH implementation by means of a library
-EAPI=6
-HOMEPAGE=https://www.libssh.org/
-IUSE=debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
-SLOT=0/4
-SRC_URI=https://www.libssh.org/files/0.8/libssh-0.8.2.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f6906ef650adff914d8b34ec235cd275
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.3 b/metadata/md5-cache/net-libs/libssh-0.8.3
deleted file mode 100644
index 5e4ad4611d58..000000000000
--- a/metadata/md5-cache/net-libs/libssh-0.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) test? ( >=dev-util/cmocka-0.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Access a working SSH implementation by means of a library
-EAPI=6
-HOMEPAGE=https://www.libssh.org/
-IUSE=debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
-SLOT=0/4
-SRC_URI=https://www.libssh.org/files/0.8/libssh-0.8.3.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=510113a4fd358b9b8f2d7a2ce26b971c
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.3-r1 b/metadata/md5-cache/net-libs/libssh-0.8.3-r1
deleted file mode 100644
index b12eb4c3c1b5..000000000000
--- a/metadata/md5-cache/net-libs/libssh-0.8.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) test? ( >=dev-util/cmocka-0.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Access a working SSH implementation by means of a library
-EAPI=6
-HOMEPAGE=https://www.libssh.org/
-IUSE=debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
-SLOT=0/4
-SRC_URI=https://www.libssh.org/files/0.8/libssh-0.8.3.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6a2f860aef8863704c212d5bd65d01ff
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.4 b/metadata/md5-cache/net-libs/libssh-0.8.4
new file mode 100644
index 000000000000..1646836919ed
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libssh-0.8.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) test? ( >=dev-util/cmocka-0.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Access a working SSH implementation by means of a library
+EAPI=6
+HOMEPAGE=https://www.libssh.org/
+IUSE=debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
+SLOT=0/4
+SRC_URI=https://www.libssh.org/files/0.8/libssh-0.8.4.tar.xz
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8c39c2f37a4d1dbeb0ec8f88f92a49cf
diff --git a/metadata/md5-cache/net-libs/libssh-9999 b/metadata/md5-cache/net-libs/libssh-9999
index a35396f49410..0314052b5b55 100644
--- a/metadata/md5-cache/net-libs/libssh-9999
+++ b/metadata/md5-cache/net-libs/libssh-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
 SLOT=0/4
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=510113a4fd358b9b8f2d7a2ce26b971c
diff --git a/metadata/md5-cache/net-libs/libssh2-1.8.0-r2 b/metadata/md5-cache/net-libs/libssh2-1.8.0-r2
index b73374749957..6e264295841f 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.8.0-r2
+++ b/metadata/md5-cache/net-libs/libssh2-1.8.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( gcrypt libressl mbedtls )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.libssh2.org/download/libssh2-1.8.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=075a46be32eac57115cfbb84a5fe182f
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8db7bc569296d2920c755a403811ff2f
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.9 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.9
index 529a469e615e..38f89f7ef5e3 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.9
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.9
@@ -4,11 +4,11 @@ DESCRIPTION=C++ BitTorrent implementation focusing on efficiency and scalability
 EAPI=7
 HOMEPAGE=http://libtorrent.org
 IUSE=debug +dht doc examples libressl python +ssl static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] virtual/libiconv examples? ( !net-p2p/mldonkey ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) 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(-)] dev-libs/boost:=[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(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0/9
 SRC_URI=https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_1_9/libtorrent-rasterbar-1.1.9.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a1ca4b9321002bbd3bd88309fdefe94c
+_md5_=eb2533f30c1f7503f9ff0879ddd7785d
diff --git a/metadata/md5-cache/net-libs/libupnpp-0.16.1 b/metadata/md5-cache/net-libs/libupnpp-0.16.1
index 31f597430231..99002ccba237 100644
--- a/metadata/md5-cache/net-libs/libupnpp-0.16.1
+++ b/metadata/md5-cache/net-libs/libupnpp-0.16.1
@@ -3,9 +3,9 @@ DEPEND=dev-libs/expat <net-libs/libupnp-1.6.24 net-misc/curl
 DESCRIPTION=The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay
 EAPI=6
 HOMEPAGE=http://www.lesbonscomptes.com/upmpdcli
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat <net-libs/libupnp-1.6.24 net-misc/curl
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.16.1.tar.gz
-_md5_=037524ec17fbc2eb358a8bba6d7c0dbb
+_md5_=6cbc25e721cbfe438f2c9de26d736adf
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.12.0 b/metadata/md5-cache/net-libs/mbedtls-2.12.0
index ebf207622aa3..5c38cbad4e3a 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.12.0
+++ b/metadata/md5-cache/net-libs/mbedtls-2.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cryptographic library for embedded systems
 EAPI=6
 HOMEPAGE=https://tls.mbed.org/
 IUSE=cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/11
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.12.0.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dd7694cb4248da5494897840606fd2d6
+_md5_=c0b80bc1a26cc7d9a8cf15ce017afb02
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180222 b/metadata/md5-cache/net-libs/miniupnpc-2.0.20180222
deleted file mode 100644
index ba5c110a0b24..000000000000
--- a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180222
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-DESCRIPTION=UPnP client library and a simple UPnP client
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd
-LICENSE=BSD
-SLOT=0/16
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20180222.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5e1060fe3672a459183653848ad40df2
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503 b/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503
index 80ac33cf70a0..2eacf9a4bdb3 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503
@@ -4,9 +4,9 @@ DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=6
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20180503.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=63b965a62a34d7db05fe58239305dd86
+_md5_=d29d6092dda8b2bbbdd59533bf0973ef
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.9.36-r1 b/metadata/md5-cache/net-libs/nativebiginteger-0.9.36-r1
new file mode 100644
index 000000000000..2d68cb0008c3
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nativebiginteger-0.9.36-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-libs/gmp:0= virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=jbigi library used by net-vpn/i2p
+EAPI=6
+HOMEPAGE=https://geti2p.net
+IUSE=test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=dev-libs/gmp:0= virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://download.i2p2.de/releases/0.9.36/i2psource_0.9.36.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=6bf551cc967667d765dae5e2577b4a1d
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.31.1 b/metadata/md5-cache/net-libs/nghttp2-1.31.1
deleted file mode 100644
index f1cec1e5a035..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.31.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=6
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd
-LICENSE=MIT
-RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.31.1/nghttp2-1.31.1.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ce80e53dad981140b94c3f9c52caf882
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.32.1 b/metadata/md5-cache/net-libs/nghttp2-1.32.1
deleted file mode 100644
index a15f232f0636..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.32.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=6
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
-LICENSE=MIT
-RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.32.1/nghttp2-1.32.1.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7ae1cb86f897c9e0f6e53619ec7acb81
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.33.0 b/metadata/md5-cache/net-libs/nghttp2-1.33.0
index a108c6bb59b1..00df5faf6810 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.33.0
+++ b/metadata/md5-cache/net-libs/nghttp2-1.33.0
@@ -4,10 +4,10 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.33.0/nghttp2-1.33.0.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1d901ee17744d47aa5574430a505f1b3
+_md5_=31099adb3781780e037b5e7448bf6066
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.34.0 b/metadata/md5-cache/net-libs/nghttp2-1.34.0
new file mode 100644
index 000000000000..bb4cbab5661e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.34.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=7
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=MIT
+RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.34.0/nghttp2-1.34.0.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3f9660ae93dbe14c36e96b7f1b9c6087
diff --git a/metadata/md5-cache/net-libs/nodejs-10.12.0 b/metadata/md5-cache/net-libs/nodejs-10.12.0
new file mode 100644
index 000000000000..ce86ec15caf3
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-10.12.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.23.1:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.34.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.23.1:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.34.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.12.0/node-v10.12.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1f242e4d3b1c85eaa692314e3c05a416
diff --git a/metadata/md5-cache/net-libs/ntirpc-1.6.1 b/metadata/md5-cache/net-libs/ntirpc-1.6.1
index 43d6ae74b740..64e370165216 100644
--- a/metadata/md5-cache/net-libs/ntirpc-1.6.1
+++ b/metadata/md5-cache/net-libs/ntirpc-1.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/mit-krb5 net-libs/libnsl rdma? ( sys-fabric/librdmacm )
 SLOT=0
 SRC_URI=https://github.com/nfs-ganesha/ntirpc/archive/v1.6.1.tar.gz -> ntirpc-1.6.1.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c11a24b8338c1511a555f981d8672069
diff --git a/metadata/md5-cache/net-libs/ntirpc-1.7.0 b/metadata/md5-cache/net-libs/ntirpc-1.7.0
index 37c66b9d1a36..493211f0a550 100644
--- a/metadata/md5-cache/net-libs/ntirpc-1.7.0
+++ b/metadata/md5-cache/net-libs/ntirpc-1.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/mit-krb5 net-libs/libnsl rdma? ( sys-fabric/librdmacm )
 SLOT=0
 SRC_URI=https://github.com/nfs-ganesha/ntirpc/archive/v1.7.0.tar.gz -> ntirpc-1.7.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cef6ec10d329cd207ca41035177278dc
diff --git a/metadata/md5-cache/net-libs/rabbitmq-c-0.8.0 b/metadata/md5-cache/net-libs/rabbitmq-c-0.8.0
index c2ddeb147fbd..cc21581c5c76 100644
--- a/metadata/md5-cache/net-libs/rabbitmq-c-0.8.0
+++ b/metadata/md5-cache/net-libs/rabbitmq-c-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=RabbitMQ C client
 EAPI=6
 HOMEPAGE=https://github.com/alanxz/rabbitmq-c
 IUSE=doc libressl test +ssl static-libs tools
-KEYWORDS=amd64 arm arm64 hppa ia64 ~ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ssl? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) tools? ( dev-libs/popt )
 REQUIRED_USE=test? ( static-libs )
 SLOT=0/4
 SRC_URI=https://github.com/alanxz/rabbitmq-c/archive/v0.8.0.zip -> rabbitmq-c-v0.8.0.zip
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=198ec6f2ac44b491608ebe97ddc3e301
+_md5_=104bb229f199a9c3c56717c3975e9f3c
diff --git a/metadata/md5-cache/net-libs/serf-1.3.8 b/metadata/md5-cache/net-libs/serf-1.3.8
index 546595cd0c09..e2305d573e8b 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.8
+++ b/metadata/md5-cache/net-libs/serf-1.3.8
@@ -7,7 +7,8 @@ IUSE=kerberos
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )
+RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.8.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=02e5162f8bdd69dcec7e54587d733998
+_md5_=05e70d492f234d2a1bf8d5a7f12e2627
diff --git a/metadata/md5-cache/net-libs/serf-1.3.8-r1 b/metadata/md5-cache/net-libs/serf-1.3.8-r1
index bd822234b92a..9d0c772c42f8 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.8-r1
+++ b/metadata/md5-cache/net-libs/serf-1.3.8-r1
@@ -7,7 +7,8 @@ IUSE=kerberos static-libs libressl
 KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0= kerberos? ( virtual/krb5 )
+RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.8.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9e8b289c95653860dc09113ef8dd7f3
+_md5_=70c98b810989ab89e45682f5a04a7960
diff --git a/metadata/md5-cache/net-libs/serf-1.3.9 b/metadata/md5-cache/net-libs/serf-1.3.9
index 037366c769dd..aa6f7d593ea6 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.9
+++ b/metadata/md5-cache/net-libs/serf-1.3.9
@@ -7,7 +7,8 @@ IUSE=kerberos static-libs libressl
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0= kerberos? ( virtual/krb5 )
+RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.9.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf28f114d32889d99cf51b6ec993d1c4
+_md5_=3766062e6e6ca7bab189afc82d068c05
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.1.6 b/metadata/md5-cache/net-libs/socket_wrapper-1.1.6
index 455a9c1ec1d6..f05502fe2bfc 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.1.6
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.1.6
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.1.6.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5cf638d284aa8e3a1cfc03c59e244a79
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.1.7 b/metadata/md5-cache/net-libs/socket_wrapper-1.1.7
index d6b953bfcb5e..5e0fb3526a35 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.1.7
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.1.7
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.1.7.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96365c06cec18f150c8081cbaab42738
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.1.8 b/metadata/md5-cache/net-libs/socket_wrapper-1.1.8
index e9296448631f..1e5c5702f253 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.1.8
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.1.8
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.1.8.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba0e570800cf0bb8a55fdf9c18713345
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.1.9 b/metadata/md5-cache/net-libs/socket_wrapper-1.1.9
index 793805ad6127..ea10d03677ea 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.1.9
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.1.9
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.1.9.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba0e570800cf0bb8a55fdf9c18713345
diff --git a/metadata/md5-cache/net-libs/srt-1.2.2 b/metadata/md5-cache/net-libs/srt-1.2.2
index f6476d840926..7d0e6add0684 100644
--- a/metadata/md5-cache/net-libs/srt-1.2.2
+++ b/metadata/md5-cache/net-libs/srt-1.2.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://github.com/Haivision/srt/archive/v1.2.2.tar.gz -> srt-1.2.2.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1970f2269a24d99f27442a51ea15738a
diff --git a/metadata/md5-cache/net-libs/stem-1.7.0 b/metadata/md5-cache/net-libs/stem-1.7.0
new file mode 100644
index 000000000000..95264c5207f1
--- /dev/null
+++ b/metadata/md5-cache/net-libs/stem-1.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( 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(-)] net-vpn/tor ) 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=Stem is a Python controller library for Tor
+EAPI=6
+HOMEPAGE=https://stem.torproject.org
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=LGPL-3
+RDEPEND=net-vpn/tor 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/stem/stem-1.7.0.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f9437e72dff096498a1d838a8ffc859d
diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0 b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0
index 95dc669d3171..f250c2adbe40 100644
--- a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0
+++ b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.9.4:5 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus || ( >=dev-lang/python-2.7.5-r2:2.7 ) 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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus || ( >=dev-lang/python-2.7.5-r2:2.7 ) 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Qt bindings for the Telepathy logger
 EAPI=6
 HOMEPAGE=https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt
 IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.9.4:5 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/telepathy-logger-qt/17.08/src/telepathy-logger-qt-17.08.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a0481d6515fffaa2cc909b506ef121d6
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.20.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.20.4
deleted file mode 100644
index 74f33da2b45a..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.20.4
+++ /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-20170815 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 ~ppc ~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	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0ebb351bf4a3e210dca483c894308aba
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.20.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.20.5
deleted file mode 100644
index 35da07197246..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.20.5
+++ /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-20170815 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=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~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.5.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3ab7144218f8856367e6b3c8d50d9912
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.22.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.22.2
index 44c9e8fec2f4..ac941170dede 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.22.2
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.22.2
@@ -4,7 +4,7 @@ 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=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~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.8.3:1.0 >=media-libs/gst-plugins-base-1.8.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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.22.2.tar.xz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1e464a8b3c4d2168a06976a5f9580199
+_md5_=bf9f8d5ef5fb8fd0c92fb62b71273eaf
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 52576e9ae12f..6f854175eca3 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.3.2.1 b/metadata/md5-cache/net-mail/dovecot-2.3.2.1
index bcb719c7af07..efa06b5f7154 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.2.1
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.2.1
@@ -4,10 +4,10 @@ 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
+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.2.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.2.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.2.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c0355758295506de242313402be082fd
+_md5_=37cdd8003dacd45381541c01953c4b1d
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.3-r1 b/metadata/md5-cache/net-mail/dovecot-2.3.3-r1
new file mode 100644
index 000000000000..c5b66cbca089
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare 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:= >=app-portage/elt-patches-20170815 !<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 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.3.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.3.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.3.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=7e360031a98a8d08127e89dc013b3045
diff --git a/metadata/md5-cache/net-mail/mailutils-3.4 b/metadata/md5-cache/net-mail/mailutils-3.4
index 8f5c824bd7bc..2031b1a43ee7 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.4
+++ b/metadata/md5-cache/net-mail/mailutils-3.4
@@ -4,11 +4,11 @@ DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
 IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:= ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) 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(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
 REQUIRED_USE=python? ( python_targets_python2_7 ) servers? ( tcpd )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.4.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8014d920a773c621ebf4d26f203b43e
+_md5_=f6c1ef7226b0d10133b04133aa97239a
diff --git a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2 b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
index a82b728f841d..f36ccaf46311 100644
--- a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
+++ b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Metamail (with Debian patches) - Generic MIME package
 EAPI=7
 HOMEPAGE=http://ftp.funet.fi/pub/unix/mail/metamail/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=app-misc/mime-types sys-apps/debianutils !app-misc/run-mailcap
 SLOT=0
 SRC_URI=http://ftp.funet.fi/pub/unix/mail/metamail/mm2.7.tar.Z mirror://debian/pool/main/m/metamail/metamail_2.7-53.diff.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d35137c2258e1f1917b2215257d5735c
+_md5_=b5b87b5769455422ea6ddaf2676aaaf7
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index baddb6666a34..3330d52ba7b5 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/asterisk-11.25.1 b/metadata/md5-cache/net-misc/asterisk-11.25.1
deleted file mode 100644
index d50b0b77b9af..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-11.25.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Asterisk: A Modular Open Source PBX System
-EAPI=6
-HOMEPAGE=http://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
-RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
-REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.25.1.tar.gz mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d8307181b53187af45c3e0579a96a3a
diff --git a/metadata/md5-cache/net-misc/asterisk-13.19.0-r1 b/metadata/md5-cache/net-misc/asterisk-13.19.0-r1
deleted file mode 100644
index 92a34a23abb7..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-13.19.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170815 !<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=Asterisk: A Modular Open Source PBX System
-EAPI=6
-HOMEPAGE=http://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
-RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
-REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.19.0.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d93055db1ef07d3fb2c7793fa1169390
diff --git a/metadata/md5-cache/net-misc/asterisk-13.19.2 b/metadata/md5-cache/net-misc/asterisk-13.19.2
deleted file mode 100644
index 8ce673ab3808..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-13.19.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170815 !<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=Asterisk: A Modular Open Source PBX System
-EAPI=6
-HOMEPAGE=http://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis kernel_linux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
-RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
-REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.19.2.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e9ea2d3acf7c668f6e1152add2c67df
diff --git a/metadata/md5-cache/net-misc/asterisk-13.20.0 b/metadata/md5-cache/net-misc/asterisk-13.20.0
deleted file mode 100644
index 4a30f1bb64cf..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-13.20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170815 !<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=Asterisk: A Modular Open Source PBX System
-EAPI=6
-HOMEPAGE=http://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis kernel_linux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
-RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
-REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.20.0.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e9ea2d3acf7c668f6e1152add2c67df
diff --git a/metadata/md5-cache/net-misc/asterisk-13.21.0 b/metadata/md5-cache/net-misc/asterisk-13.21.0
deleted file mode 100644
index 35b9c783b88e..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-13.21.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170815 !<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=Asterisk: A Modular Open Source PBX System
-EAPI=6
-HOMEPAGE=http://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis kernel_linux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
-RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
-REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.21.0.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e9ea2d3acf7c668f6e1152add2c67df
diff --git a/metadata/md5-cache/net-misc/asterisk-13.22.0 b/metadata/md5-cache/net-misc/asterisk-13.22.0
deleted file mode 100644
index be1fb7fcc258..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-13.22.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170815 !<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=Asterisk: A Modular Open Source PBX System
-EAPI=6
-HOMEPAGE=http://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis kernel_linux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
-RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
-REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.22.0.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e9ea2d3acf7c668f6e1152add2c67df
diff --git a/metadata/md5-cache/net-misc/asterisk-13.23.1 b/metadata/md5-cache/net-misc/asterisk-13.23.1
new file mode 100644
index 000000000000..2fb0f4ad894a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-13.23.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup
+DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170815 !<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=Asterisk: A Modular Open Source PBX System
+EAPI=6
+HOMEPAGE=http://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis kernel_linux
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
+RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
+REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0
+SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.23.1.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=baff20ca3c121164c19cca0e237b84da
diff --git a/metadata/md5-cache/net-misc/dropbox-58.3.88-r1 b/metadata/md5-cache/net-misc/dropbox-58.3.88-r1
new file mode 100644
index 000000000000..8edede66fef8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-58.3.88-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=librsync-bundled? ( dev-util/patchelf ) >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=6
+HOMEPAGE=https://www.dropbox.com/
+IUSE=+librsync-bundled selinux X 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
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] X? ( dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[-gles2,xcb] dev-qt/qtopengl:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5[-gles2] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5[-gles2] media-libs/fontconfig media-libs/freetype virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] x11-misc/wmctrl x11-themes/hicolor-icon-theme ) !librsync-bundled? ( <net-libs/librsync-2 ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/popt net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib sys-libs/ncurses:5/5
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) 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 )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-58.3.88.tar.gz ) amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-58.3.88.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=884cf8079645fe84ea1c1e7b9f0be56a
diff --git a/metadata/md5-cache/net-misc/electrum-3.2.3 b/metadata/md5-cache/net-misc/electrum-3.2.3
new file mode 100644
index 000000000000..63d6b3eb57a1
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-3.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=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(-)] >=sys-apps/sed-4
+DESCRIPTION=User friendly Bitcoin client
+EAPI=6
+HOMEPAGE=https://electrum.org/
+IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync revealer trustedcoin_com vkb l10n_ar l10n_be l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=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(-)] dev-python/ecdsa[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/jsonrpclib[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/pbkdf2[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/pyaes[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/PySocks[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/qrcode[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[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/six[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/tlslite[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/protobuf-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(-)] virtual/python-dnspython[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(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,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(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=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=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://download.electrum.org/3.2.3/Electrum-3.2.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b340b9dedf7c2b8959ee5b3c4a4b5050
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.1.3-r4 b/metadata/md5-cache/net-misc/gns3-server-2.1.3-r4
new file mode 100644
index 000000000000..3cc3f1ec2e03
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gns3-server-2.1.3-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=GNS3 server to asynchronously manage emulators
+EAPI=6
+HOMEPAGE=http://www.gns3.net/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=app-emulation/dynamips-0.2.12 >=dev-python/aiohttp-2.2.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/aiohttp-cors-0.6[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/aiohttp-cors-0.5.3[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/docker-py-1.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/netifaces-0.8-r2[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/jinja-2.7.3[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/jsonschema-2.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/libcloud-0.14.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/raven-5.23.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/prompt_toolkit[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/psutil-3.0.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/pyzmq-14.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/python-zipstream-1.1.4[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(-)] >=net-misc/ubridge-0.9.14 >=www-servers/tornado-3.1.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(-)] virtual/python-typing[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/yarl-0.11[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.1.3.tar.gz -> gns3-server-2.1.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3db3d19961b31f6b03b35ff538fb2556
diff --git a/metadata/md5-cache/net-misc/htpdate-1.0.7 b/metadata/md5-cache/net-misc/htpdate-1.0.7
index b02cfe87a044..91f0e77419a7 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.0.7
+++ b/metadata/md5-cache/net-misc/htpdate-1.0.7
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=Synchronize local workstation with time offered by remote webservers
 EAPI=5
-HOMEPAGE=http://www.vervest.org/fiki/bin/view/HTP/DownloadC
+HOMEPAGE=http://www.vervest.org/htp/
 KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 sh x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d13f70f55565aacbee28a5046b5b5942
+_md5_=405a6042d3fc0c56f26836e7ec73ef07
diff --git a/metadata/md5-cache/net-misc/htpdate-1.1.3 b/metadata/md5-cache/net-misc/htpdate-1.1.3
deleted file mode 100644
index e5f51a1ac8b2..000000000000
--- a/metadata/md5-cache/net-misc/htpdate-1.1.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=Synchronize local workstation with time offered by remote webservers
-EAPI=5
-HOMEPAGE=http://www.vervest.org/fiki/bin/view/HTP/DownloadC
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34138806a767c35c8874bdac2e968e90
diff --git a/metadata/md5-cache/net-misc/htpdate-1.2.0 b/metadata/md5-cache/net-misc/htpdate-1.2.0
index add653e80e0e..7ed3217385ca 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.2.0
+++ b/metadata/md5-cache/net-misc/htpdate-1.2.0
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install prepare unpack
+DEFINED_PHASES=compile install prepare
 DESCRIPTION=Synchronize local workstation with time offered by remote webservers
 EAPI=6
-HOMEPAGE=http://www.vervest.org/fiki/bin/view/HTP/DownloadC
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux
+HOMEPAGE=http://www.vervest.org/htp/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.2.0.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=8f40dd4e95943f8a778d3415e66ac213
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=338dde27ff643ce72eb024f2f39cad30
diff --git a/metadata/md5-cache/net-misc/ipv6calc-1.0.0 b/metadata/md5-cache/net-misc/ipv6calc-1.0.0
index a4793bf79d12..c20f952a3999 100644
--- a/metadata/md5-cache/net-misc/ipv6calc-1.0.0
+++ b/metadata/md5-cache/net-misc/ipv6calc-1.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=IPv6 address calculator
 EAPI=6
 HOMEPAGE=http://www.deepspace6.net/projects/ipv6calc.html
 IUSE=geoip libressl test
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 )
 SLOT=0
 SRC_URI=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ipv6calc-1.0.0.tar.gz
-_md5_=2dceb8cf15e81d314e9277d952e3d519
+_md5_=3b6368ab4bff7a0d90d3e3a1908e0d40
diff --git a/metadata/md5-cache/net-misc/ipv6calc-1.1.0 b/metadata/md5-cache/net-misc/ipv6calc-1.1.0
new file mode 100644
index 000000000000..ff7274242a02
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ipv6calc-1.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 ) test? ( dev-perl/Digest-SHA1 )
+DESCRIPTION=IPv6 address calculator
+EAPI=6
+HOMEPAGE=http://www.deepspace6.net/projects/ipv6calc.html
+IUSE=geoip libressl test
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 )
+SLOT=0
+SRC_URI=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ipv6calc-1.1.0.tar.gz
+_md5_=0a41fffdaf707948465a4750e24f71c4
diff --git a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211 b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
index fa18e061d984..fdd25bfc6694 100644
--- a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
+++ b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
@@ -1,13 +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/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/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-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-plasma/libksysguard-5.12.5:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libnl:3 sys-apps/net-tools wifi? ( net-wireless/wireless-tools ) 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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-plasma/libksysguard-5.12.5:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libnl:3 sys-apps/net-tools wifi? ( net-wireless/wireless-tools ) 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma Network Monitor
 EAPI=6
 HOMEPAGE=https://kde-apps.org/content/show.php?content=12956
 IUSE=wifi debug
 KEYWORDS=amd64 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/kdbusaddons-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/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-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-plasma/libksysguard-5.12.5:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libnl:3 sys-apps/net-tools wifi? ( net-wireless/wireless-tools ) !net-misc/knemo:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kglobalaccel-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=kde-plasma/libksysguard-5.12.5:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libnl:3 sys-apps/net-tools wifi? ( net-wireless/wireless-tools ) !net-misc/knemo:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/knemo-0.8.0_pre20161211.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eaa583196f2d7348b47ee246a0a48115
diff --git a/metadata/md5-cache/net-misc/liveice-2000530-r1 b/metadata/md5-cache/net-misc/liveice-2000530-r1
deleted file mode 100644
index 9638b459c2d4..000000000000
--- a/metadata/md5-cache/net-misc/liveice-2000530-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Live Source Client For IceCast
-EAPI=2
-HOMEPAGE=http://star.arm.ac.uk/~spm/software/liveice.html
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2+
-RDEPEND=media-sound/lame media-sound/mpg123
-SLOT=0
-SRC_URI=http://star.arm.ac.uk/~spm/software/liveice.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6a08aa07750448375fb4103d5848a3f2
diff --git a/metadata/md5-cache/net-misc/liveice-2000530-r2 b/metadata/md5-cache/net-misc/liveice-2000530-r2
new file mode 100644
index 000000000000..0e658dcd2363
--- /dev/null
+++ b/metadata/md5-cache/net-misc/liveice-2000530-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Live Source Client For IceCast
+EAPI=7
+HOMEPAGE=http://star.arm.ac.uk/~spm/software/liveice.html
+KEYWORDS=~amd64 x86
+LICENSE=GPL-2+
+RDEPEND=media-sound/lame media-sound/mpg123
+SLOT=0
+SRC_URI=http://star.arm.ac.uk/~spm/software/liveice.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9072aa2f68a3c6518a6a472f2c86a7af
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18
deleted file mode 100644
index 1c03b62a4c4c..000000000000
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=sys-kernel/linux-headers-2.6 >=app-portage/elt-patches-20170815 !<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=Tools for Linux Kernel Stream Control Transmission Protocol implementation
-EAPI=6
-HOMEPAGE=http://lksctp.sourceforge.net/
-IUSE=kernel_linux static-libs 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=|| ( GPL-2+ LGPL-2.1 )
-REQUIRED_USE=kernel_linux
-SLOT=0
-SRC_URI=https://github.com/sctp/lksctp-tools/archive/v1.0.18.tar.gz -> lksctp-tools-1.0.18.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b1fc54b6fdd36e9d8497a814661dafa
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
new file mode 100644
index 000000000000..579c83aa4812
--- /dev/null
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=sys-kernel/linux-headers-2.6 >=app-portage/elt-patches-20170815 !<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=Tools for Linux Kernel Stream Control Transmission Protocol implementation
+EAPI=6
+HOMEPAGE=http://lksctp.sourceforge.net/
+IUSE=kernel_linux static-libs 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=|| ( GPL-2+ LGPL-2.1 )
+REQUIRED_USE=kernel_linux
+SLOT=0
+SRC_URI=https://github.com/sctp/lksctp-tools/archive/v1.0.18.tar.gz -> lksctp-tools-1.0.18.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d71b764eaed72ef562fcb2330a8a9bb0
diff --git a/metadata/md5-cache/net-misc/megatools-1.10.2 b/metadata/md5-cache/net-misc/megatools-1.10.2
new file mode 100644
index 000000000000..467d88ebbcae
--- /dev/null
+++ b/metadata/md5-cache/net-misc/megatools-1.10.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:2 dev-libs/openssl:0= net-misc/curl virtual/pkgconfig app-text/asciidoc >=app-portage/elt-patches-20170815 !<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 tools and C library for accessing Mega cloud storage
+EAPI=5
+HOMEPAGE=https://github.com/megous/megatools
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/openssl:0= net-misc/curl net-libs/glib-networking[ssl]
+SLOT=0
+SRC_URI=https://github.com/megous/megatools/archive/1.10.2.tar.gz -> megatools-1.10.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=edc411079490d86fa42d61463d413faa
diff --git a/metadata/md5-cache/net-misc/megatools-1.9.97 b/metadata/md5-cache/net-misc/megatools-1.9.97
deleted file mode 100644
index 6814b1c14aef..000000000000
--- a/metadata/md5-cache/net-misc/megatools-1.9.97
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/openssl:0 net-misc/curl fuse? ( sys-fs/fuse ) virtual/pkgconfig app-text/asciidoc >=app-portage/elt-patches-20170815 !<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 tools and C library for accessing Mega cloud storage
-EAPI=5
-HOMEPAGE=https://github.com/megous/megatools
-IUSE=fuse introspection static-libs
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:0 net-misc/curl fuse? ( sys-fs/fuse ) net-libs/glib-networking[ssl]
-SLOT=0
-SRC_URI=https://github.com/megous/megatools/archive/1.9.97.tar.gz -> megatools-1.9.97.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3948d5a704301bcd9ae22eab1c45cd81
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.11 b/metadata/md5-cache/net-misc/memcached-1.5.11
new file mode 100644
index 000000000000..305140f62e41
--- /dev/null
+++ b/metadata/md5-cache/net-misc/memcached-1.5.11
@@ -0,0 +1,13 @@
+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-20170815 !<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.11.tar.gz https://www.memcached.org/files/old/memcached-1.5.11.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ab7eae03110e98e0609f00186fa4a6ea
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.8.2 b/metadata/md5-cache/net-misc/modemmanager-1.8.2
new file mode 100644
index 000000000000..8c59a53ea8d6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/modemmanager-1.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.36.0:2 udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.16.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.20.0:= ) systemd? ( >=sys-apps/systemd-209 ) dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 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-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Modem and mobile broadband management libraries
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
+IUSE=+introspection mbim policykit +qmi systemd +udev vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.36.0:2 udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.16.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.20.0:= ) systemd? ( >=sys-apps/systemd-209 )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0/1
+SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.8.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=dbcbdc30c358879d7ca935a14fa26bc8
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.12.2 b/metadata/md5-cache/net-misc/networkmanager-1.12.2
deleted file mode 100644
index ee99127cff01..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.12.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 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(-)?] introspection? ( || ( ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/dbus-python[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=iwd? ( wifi ) modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.12/NetworkManager-1.12.2.tar.xz https://dev.gentoo.org/~leio/distfiles/networkmanager-1.12.2-patchset.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6e28cfe8fead33f8251e273e98df61b7
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.14.2 b/metadata/md5-cache/net-misc/networkmanager-1.14.2
new file mode 100644
index 000000000000..31f8ddf9c440
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.14.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 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(-)?] introspection? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/dbus-python[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=iwd? ( wifi ) modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.14/NetworkManager-1.14.2.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cf3d0c13be39e8fc41178e5247897de4
diff --git a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.8 b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.8
new file mode 100644
index 000000000000..b76802730f64
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager OpenVPN plugin
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=gtk test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.8.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9694322bb931a005ef3d85d961e35331
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.0.0-r6 b/metadata/md5-cache/net-misc/ntpsec-1.0.0-r6
index 1fb1778d4606..aae5b80e2758 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.0.0-r6
+++ b/metadata/md5-cache/net-misc/ntpsec-1.0.0-r6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=8c5db8172c1b27c5874e9085bc6d09e4
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.1 b/metadata/md5-cache/net-misc/ntpsec-1.1.1
index fe6abba8e480..63431553bba0 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.1
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=85039ace8a2872544ce8b732d22593f7
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.2 b/metadata/md5-cache/net-misc/ntpsec-1.1.2
index 3c5ad7bfc790..be76d82139d2 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.2
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=85039ace8a2872544ce8b732d22593f7
diff --git a/metadata/md5-cache/net-misc/ntpsec-9999 b/metadata/md5-cache/net-misc/ntpsec-9999
index 312b2f3cae23..896f6209cea2 100644
--- a/metadata/md5-cache/net-misc/ntpsec-9999
+++ b/metadata/md5-cache/net-misc/ntpsec-9999
@@ -8,5 +8,5 @@ LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
 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(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) nist? ( rclock_local )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=85039ace8a2872544ce8b732d22593f7
diff --git a/metadata/md5-cache/net-misc/nyx-9999 b/metadata/md5-cache/net-misc/nyx-9999
deleted file mode 100644
index 508ea3694365..000000000000
--- a/metadata/md5-cache/net-misc/nyx-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-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(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Utility to monitor real time Tor status information
-EAPI=6
-HOMEPAGE=https://nyx.torproject.org
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-3
-RDEPEND=net-libs/stem net-vpn/tor 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
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c82e8be29bc43a3e425c7e2b5f05f580
diff --git a/metadata/md5-cache/net-misc/openssh-7.9_p1 b/metadata/md5-cache/net-misc/openssh-7.9_p1
new file mode 100644
index 000000000000..c5a51da0db9e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-7.9_p1
@@ -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 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g: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(+)] ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g: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-20170815 !<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 +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 ~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 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g: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.9p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-7.9p1-sctp-1.1.patch.xz ) hpn? ( mirror://sourceforge/hpnssh/HPN-SSH%2014v16%207.8P1/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff mirror://sourceforge/hpnssh/HPN-SSH%2014v16%207.8P1/openssh-7_8_P1-hpn-AES-CTR-14.16.diff ) X509? ( https://roumenpetrov.info/openssh/x509-11.5/openssh-7.9p1+x509-11.5.diff.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=54da8a4bb7edbef344afbf8941b45dd2
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.31.3 b/metadata/md5-cache/net-misc/remmina-1.2.31.3
index 117b01ad8c86..569dfab85c7f 100644
--- a/metadata/md5-cache/net-misc/remmina-1.2.31.3
+++ b/metadata/md5-cache/net-misc/remmina-1.2.31.3
@@ -1,13 +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
+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:0=[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
+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:0=[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://gitlab.com/Remmina/Remmina/-/archive/v1.2.31.3/Remmina-v1.2.31.3.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ff84d72cf3cc82f95e2eceb990fe6060
+_md5_=e4994b25356c5c74550ce9d307ed8611
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.0.2 b/metadata/md5-cache/net-misc/s3cmd-2.0.2
new file mode 100644
index 000000000000..88b5fccd0a79
--- /dev/null
+++ b/metadata/md5-cache/net-misc/s3cmd-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Command line client for Amazon S3
+EAPI=6
+HOMEPAGE=https://s3tools.org/s3cmd
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ia64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=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/python-magic[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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://sourceforge/s3tools/s3cmd-2.0.2.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5c694b033de8f99f78162c8cbe267967
diff --git a/metadata/md5-cache/net-misc/s6-networking-2.3.0.3 b/metadata/md5-cache/net-misc/s6-networking-2.3.0.3
new file mode 100644
index 000000000000..6b569045f248
--- /dev/null
+++ b/metadata/md5-cache/net-misc/s6-networking-2.3.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-lang/execline-2.5.0.1[static-libs?] >=sys-apps/s6-2.7.2.0[static-libs?] >=net-dns/s6-dns-2.3.0.1[static-libs?] >=dev-libs/skalibs-2.7.0.0[static-libs?] ssl? ( >=dev-libs/libressl-2.6.5[static-libs?] )
+DESCRIPTION=suite of small networking utilities for Unix systems
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-networking/
+IUSE=ssl static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.5.0.1:= >=sys-apps/s6-2.7.2.0:= !static? ( >=net-dns/s6-dns-2.3.0.1:= >=dev-libs/skalibs-2.7.0.0:= ssl? ( >=dev-libs/libressl-2.6.5:= ) )
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/2.3
+SRC_URI=https://www.skarnet.org/software/s6-networking/s6-networking-2.3.0.3.tar.gz
+_md5_=3a62768db758d84eb695cdcb95f9c587
diff --git a/metadata/md5-cache/net-misc/sitecopy-0.16.6-r1 b/metadata/md5-cache/net-misc/sitecopy-0.16.6-r1
index f0d2af7846ca..547ba23f115d 100644
--- a/metadata/md5-cache/net-misc/sitecopy-0.16.6-r1
+++ b/metadata/md5-cache/net-misc/sitecopy-0.16.6-r1
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] <=net-libs/neon-0.30.9999[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] ) >=app-portage/elt-patches-20170815 !<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
+BDEPEND=>=app-portage/elt-patches-20170815 !<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 prepare
+DEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] <=net-libs/neon-0.30.9999[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
 DESCRIPTION=Maintain remote web sites with ease
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.manyfish.co.uk/sitecopy/
 IUSE=expat nls rsh ssl webdav xml zlib
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] <=net-libs/neon-0.30.9999[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
 SLOT=0
-SRC_URI=http://www.manyfish.co.uk/sitecopy/sitecopy-0.16.6.tar.gz https://dev.gentoo.org/~idella4/sitecopy-0.16.6-04-manpages-addition-fixes.patch
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=860aa0f674724ff9f6a2e19da370d4a9
+SRC_URI=mirror://gentoo/sitecopy-0.16.6.tar.gz https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=05bb2fe55f18b750807b7e927f237340
diff --git a/metadata/md5-cache/net-misc/smb4k-2.1.0 b/metadata/md5-cache/net-misc/smb4k-2.1.0
deleted file mode 100644
index 2e3d062adcaf..000000000000
--- a/metadata/md5-cache/net-misc/smb4k-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.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/knotifications-5.46.0:5 >=kde-frameworks/kparts-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/solid-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/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced network neighborhood browser
-EAPI=6
-HOMEPAGE=https://sourceforge.net/p/smb4k/home/Home/
-IUSE=plasma debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-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/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/knotifications-5.46.0:5 >=kde-frameworks/kparts-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/solid-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/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-fs/samba[cups] plasma? ( >=kde-frameworks/plasma-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.9.4:5
-SLOT=5
-SRC_URI=mirror://sourceforge/smb4k/smb4k-2.1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d006ef235e5bf7fd36b280b4236148d7
diff --git a/metadata/md5-cache/net-misc/smb4k-2.1.1 b/metadata/md5-cache/net-misc/smb4k-2.1.1
index 3bde842a14b7..0d54fd73aa10 100644
--- a/metadata/md5-cache/net-misc/smb4k-2.1.1
+++ b/metadata/md5-cache/net-misc/smb4k-2.1.1
@@ -1,13 +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/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/knotifications-5.46.0:5 >=kde-frameworks/kparts-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/solid-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/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.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/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Advanced network neighborhood browser
 EAPI=6
 HOMEPAGE=https://sourceforge.net/p/smb4k/home/Home/
 IUSE=plasma debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-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/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/knotifications-5.46.0:5 >=kde-frameworks/kparts-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/solid-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/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-fs/samba[cups] plasma? ( >=kde-frameworks/plasma-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.9.4:5
+RDEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.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/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-fs/samba[cups] plasma? ( >=kde-frameworks/plasma-5.50.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://sourceforge/smb4k/smb4k-2.1.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=862582e96a1fde9b8179252df859307e
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1ba3aa121fb70a2548e5afa90f687885
diff --git a/metadata/md5-cache/net-misc/sshpass-1.06 b/metadata/md5-cache/net-misc/sshpass-1.06
index 3fe55b0073e4..5df1a9955f7e 100644
--- a/metadata/md5-cache/net-misc/sshpass-1.06
+++ b/metadata/md5-cache/net-misc/sshpass-1.06
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Tool for noninteractively performing password authentication with ssh
-EAPI=6
+EAPI=7
 HOMEPAGE=http://sshpass.sourceforge.net
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=net-misc/openssh
 SLOT=0
 SRC_URI=mirror://sourceforge/sshpass/1.06/sshpass-1.06.tar.gz
-_md5_=8125c77d81025c9a82bea3c672ba3c0d
+_md5_=ae0e7fda927bfa6d4769678d016d95a4
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.10.05 b/metadata/md5-cache/net-misc/youtube-dl-2018.10.05
index 37d86c63918f..2c73c0620284 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.10.05
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.10.05
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2018.10.05/youtube-dl-2018.10.05.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5d4ed1146554935bd38773d8302b774a
+_md5_=a08110ee84d5634010751a1d7aa7e6a8
diff --git a/metadata/md5-cache/net-misc/youtube-dl-99999999 b/metadata/md5-cache/net-misc/youtube-dl-99999999
index 178277faf913..3cf2752f2a9a 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-99999999
+++ b/metadata/md5-cache/net-misc/youtube-dl-99999999
@@ -9,4 +9,4 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=46f330ec15520c94ca8b29e344e8df0d
+_md5_=868357e0c8156318046c5a932ac5a79b
diff --git a/metadata/md5-cache/net-misc/zerotier-1.2.12 b/metadata/md5-cache/net-misc/zerotier-1.2.12
new file mode 100644
index 000000000000..c704292750f7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/zerotier-1.2.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-libs/json-glib:= net-libs/http-parser:= net-libs/libnatpmp:= net-libs/miniupnpc:= virtual/pkgconfig
+DESCRIPTION=A software-based managed Ethernet switch for planet Earth
+EAPI=6
+HOMEPAGE=https://www.zerotier.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/json-glib:= net-libs/http-parser:= net-libs/libnatpmp:= net-libs/miniupnpc:=
+SLOT=0
+SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.2.12.tar.gz -> zerotier-1.2.12.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1ed127593928926a67661c1980fc33d2
diff --git a/metadata/md5-cache/net-misc/zerotier-1.2.4 b/metadata/md5-cache/net-misc/zerotier-1.2.4
deleted file mode 100644
index 2a7ae12c84c5..000000000000
--- a/metadata/md5-cache/net-misc/zerotier-1.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-libs/miniupnpc net-libs/libnatpmp dev-libs/json-glib net-libs/http-parser >=sys-devel/gcc-4.9.3 virtual/pkgconfig
-DESCRIPTION=A software-based managed Ethernet switch for planet Earth
-EAPI=6
-HOMEPAGE=https://www.zerotier.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/miniupnpc net-libs/libnatpmp dev-libs/json-glib net-libs/http-parser
-SLOT=0
-SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.2.4.tar.gz -> zerotier-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d91bccb449c5a5dc5161d977ce459cc7
diff --git a/metadata/md5-cache/net-misc/zerotier-1.2.4-r1 b/metadata/md5-cache/net-misc/zerotier-1.2.4-r1
deleted file mode 100644
index 7ee8d2ebe7e5..000000000000
--- a/metadata/md5-cache/net-misc/zerotier-1.2.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-libs/miniupnpc net-libs/libnatpmp dev-libs/json-glib net-libs/http-parser >=sys-devel/gcc-4.9.3 virtual/pkgconfig
-DESCRIPTION=A software-based managed Ethernet switch for planet Earth
-EAPI=6
-HOMEPAGE=https://www.zerotier.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/miniupnpc net-libs/libnatpmp dev-libs/json-glib net-libs/http-parser
-SLOT=0
-SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.2.4.tar.gz -> zerotier-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=63bede32dcbfe6a55df8bac63dfbb77e
diff --git a/metadata/md5-cache/net-misc/zerotier-1.2.8 b/metadata/md5-cache/net-misc/zerotier-1.2.8
deleted file mode 100644
index 26ae43b52b0f..000000000000
--- a/metadata/md5-cache/net-misc/zerotier-1.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-libs/json-glib:= net-libs/http-parser:= net-libs/libnatpmp:= net-libs/miniupnpc:= virtual/pkgconfig
-DESCRIPTION=A software-based managed Ethernet switch for planet Earth
-EAPI=6
-HOMEPAGE=https://www.zerotier.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/json-glib:= net-libs/http-parser:= net-libs/libnatpmp:= net-libs/miniupnpc:=
-SLOT=0
-SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.2.8.tar.gz -> zerotier-1.2.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79c765fa33ce4b84636bf88d7286ba2a
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index e840b45039f0..a4dc488cf137 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/yp-tools-4.2.2-r2 b/metadata/md5-cache/net-nds/yp-tools-4.2.2-r2
index 37f0cad3396f..7bccfcd2d020 100644
--- a/metadata/md5-cache/net-nds/yp-tools-4.2.2-r2
+++ b/metadata/md5-cache/net-nds/yp-tools-4.2.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=net-libs/libtirpc net-libs/libnsl:0= virtual/pkgconfig
+DEPEND=net-libs/libtirpc >=net-libs/libnsl-1.2.0:0= virtual/pkgconfig
 DESCRIPTION=Network Information Service tools
 EAPI=6
 HOMEPAGE=http://www.linux-nis.org/nis/
 IUSE=nls
 KEYWORDS=alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=net-libs/libtirpc net-libs/libnsl:0=
+RDEPEND=net-libs/libtirpc >=net-libs/libnsl-1.2.0:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.linux-nis.org/download/yp-tools/yp-tools-4.2.2.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0e5db54b861a54ab3f713f31c40f9298
+_md5_=39942cd833fb2f690a60b4f151885b2d
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index cbe1d107ed0b..50484d098827 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/rssguard-3.3.5 b/metadata/md5-cache/net-news/rssguard-3.3.5
deleted file mode 100644
index 0a3afceb05cf..000000000000
--- a/metadata/md5-cache/net-news/rssguard-3.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=dev-qt/qtsql-5.6:5 >=dev-qt/qtwidgets-5.6:5 >=dev-qt/qtxml-5.6:5 webengine? ( >=dev-qt/qtwebengine-5.6:5[widgets] ) >=dev-qt/linguist-tools-5.6:5
-DESCRIPTION=A tiny RSS and Atom feed reader
-EAPI=6
-HOMEPAGE=https://github.com/martinrotter/rssguard
-IUSE=debug +webengine
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=dev-qt/qtsql-5.6:5 >=dev-qt/qtwidgets-5.6:5 >=dev-qt/qtxml-5.6:5 webengine? ( >=dev-qt/qtwebengine-5.6:5[widgets] )
-SLOT=0
-SRC_URI=https://github.com/martinrotter/rssguard/archive/3.3.5.tar.gz -> rssguard-3.3.5.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=71fbc78f51ee2996258e54077a2d7a2a
diff --git a/metadata/md5-cache/net-news/rssguard-3.4.1 b/metadata/md5-cache/net-news/rssguard-3.4.1
deleted file mode 100644
index e072a920d63c..000000000000
--- a/metadata/md5-cache/net-news/rssguard-3.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=dev-qt/qtsql-5.6:5 >=dev-qt/qtwidgets-5.6:5 >=dev-qt/qtxml-5.6:5 webengine? ( >=dev-qt/qtwebengine-5.6:5[widgets] ) >=dev-qt/linguist-tools-5.6:5
-DESCRIPTION=A tiny RSS and Atom feed reader
-EAPI=6
-HOMEPAGE=https://github.com/martinrotter/rssguard
-IUSE=debug webengine
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=dev-qt/qtsql-5.6:5 >=dev-qt/qtwidgets-5.6:5 >=dev-qt/qtxml-5.6:5 webengine? ( >=dev-qt/qtwebengine-5.6:5[widgets] )
-SLOT=0
-SRC_URI=https://github.com/martinrotter/rssguard/archive/3.4.1.tar.gz -> rssguard-3.4.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ddfe784aeb048e8bcc8241149a3e67a0
diff --git a/metadata/md5-cache/net-news/rssguard-3.5.5 b/metadata/md5-cache/net-news/rssguard-3.5.5
index 4f836fbb03b9..ad14e1aea88c 100644
--- a/metadata/md5-cache/net-news/rssguard-3.5.5
+++ b/metadata/md5-cache/net-news/rssguard-3.5.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-qt/qtcore-5.8:5 >=dev-qt/qtgui-5.8:5 >=dev-qt/qtnetwork-5.8:5 >=dev-qt/qtsql-5.8:5 >=dev-qt/qtwidgets-5.8:5 >=dev-qt/qtxml-5.8:5 webengine? ( >=dev-qt/qtwebengine-5.8:5[widgets] ) >=dev-qt/linguist-tools-5.8:5
+DEPEND=>=dev-qt/qtcore-5.8:5 >=dev-qt/qtgui-5.8:5 >=dev-qt/qtnetwork-5.8:5 >=dev-qt/qtconcurrent-5.8:5 >=dev-qt/qtsql-5.8:5 >=dev-qt/qtwidgets-5.8:5 >=dev-qt/qtxml-5.8:5 webengine? ( >=dev-qt/qtwebengine-5.8:5[widgets] ) >=dev-qt/linguist-tools-5.8:5
 DESCRIPTION=A tiny RSS and Atom feed reader
 EAPI=6
 HOMEPAGE=https://github.com/martinrotter/rssguard
 IUSE=debug webengine
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtcore-5.8:5 >=dev-qt/qtgui-5.8:5 >=dev-qt/qtnetwork-5.8:5 >=dev-qt/qtsql-5.8:5 >=dev-qt/qtwidgets-5.8:5 >=dev-qt/qtxml-5.8:5 webengine? ( >=dev-qt/qtwebengine-5.8:5[widgets] )
+RDEPEND=>=dev-qt/qtcore-5.8:5 >=dev-qt/qtgui-5.8:5 >=dev-qt/qtnetwork-5.8:5 >=dev-qt/qtconcurrent-5.8:5 >=dev-qt/qtsql-5.8:5 >=dev-qt/qtwidgets-5.8:5 >=dev-qt/qtxml-5.8:5 webengine? ( >=dev-qt/qtwebengine-5.8:5[widgets] )
 SLOT=0
 SRC_URI=https://github.com/martinrotter/rssguard/archive/3.5.5.tar.gz -> rssguard-3.5.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b808b330aa82616fbdcf9d5b0b447fc
+_md5_=32869d186fd5f742ede75317ba3dc50b
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index dd03044ed9e3..1877adddf384 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623 b/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
index 12d4432caa17..69ef6229a16f 100644
--- a/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
+++ b/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
@@ -1,13 +1,13 @@
 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/kdelibs4support-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/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 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Friendly nzb linux usenet binary client
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/content/show.php/Kwooty?content=114385
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-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/kdelibs4support-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/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 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !net-nntp/kwooty:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kguiaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwallet-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !net-nntp/kwooty:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/kwooty-1.1.0_p20150623.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f35dcc945e9be2d0e23c2735a5900f0
diff --git a/metadata/md5-cache/net-nntp/suck-4.3.3-r1 b/metadata/md5-cache/net-nntp/suck-4.3.3-r1
new file mode 100644
index 000000000000..2f90f082134a
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/suck-4.3.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install prepare
+DEPEND=sys-libs/gdbm:= ssl? ( dev-libs/openssl:0= ) sys-libs/db perl? ( dev-lang/perl )
+DESCRIPTION=Grab news from a remote NNTP server and feed them to another
+EAPI=7
+HOMEPAGE=https://lazarus-pkgs.github.io/lazarus-pkgs/suck.html
+IUSE=perl ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=sys-libs/gdbm:= ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=https://github.com/lazarus-pkgs/suck/archive/4.3.3.tar.gz -> suck-4.3.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9d57525ac02f890469542697a3c0c809
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 731657a813d0..5fe043c71452 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/ktorrent-5.1.0 b/metadata/md5-cache/net-p2p/ktorrent-5.1.0
deleted file mode 100644
index 1a767982b2d1..000000000000
--- a/metadata/md5-cache/net-p2p/ktorrent-5.1.0
+++ /dev/null
@@ -1,13 +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/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/knotifyconfig-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/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 =net-libs/libktorrent-2.1*:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.46.0:5 >=kde-apps/syndication-17.12.3:5 ) search? ( >=kde-frameworks/kdewebkit-5.46.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) stats? ( >=kde-frameworks/kplotting-5.46.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.46.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.46.0:5 ) dev-libs/boost 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.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=Powerful BitTorrent client based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/ktorrent/
-IUSE=+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-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/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/knotifyconfig-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/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 =net-libs/libktorrent-2.1*:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.46.0:5 >=kde-apps/syndication-17.12.3:5 ) search? ( >=kde-frameworks/kdewebkit-5.46.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) stats? ( >=kde-frameworks/kplotting-5.46.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.46.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.46.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-apps/kio-extras-17.12.3:5 ) !net-p2p/ktorrent:4 >=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/ktorrent/5.1/ktorrent-5.1.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0eca49844d85cec92d4e04e69907516f
diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.1.1 b/metadata/md5-cache/net-p2p/ktorrent-5.1.1
index 4aebaa775199..6ef0dd9a13ad 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-5.1.1
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Powerful BitTorrent client based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/internet/ktorrent/
 IUSE=+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 =net-libs/libktorrent-2.1*:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/syndication-5.50.0:5 ) search? ( >=kde-frameworks/kdewebkit-5.50.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) stats? ( >=kde-frameworks/kplotting-5.50.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.50.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.50.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-apps/kio-extras-17.12.3:5 ) !net-p2p/ktorrent:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 =net-libs/libktorrent-2.1*:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/syndication-5.50.0:5 ) search? ( >=kde-frameworks/kdewebkit-5.50.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) stats? ( >=kde-frameworks/kplotting-5.50.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.50.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.50.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-apps/kio-extras-18.04.3:5 ) !net-p2p/ktorrent:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.1.1/ktorrent-5.1.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=07fc1c972e3f0c503571be601affe3b5
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4648bb0ccf8246ee6184edbca4207f4d
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.1.3 b/metadata/md5-cache/net-p2p/qbittorrent-4.1.3
index 8b085bd2bfd9..02ebcb0f72e8 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-4.1.3
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=BitTorrent client in C++ and Qt
 EAPI=6
 HOMEPAGE=https://www.qbittorrent.org https://github.com/qbittorrent
 IUSE=+dbus debug webui +X
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=dbus? ( X )
 SLOT=0
 SRC_URI=https://github.com/qbittorrent/qBittorrent/archive/release-4.1.3.tar.gz -> qbittorrent-4.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=393d930f6d7921ffa454df9917e96bba
+_md5_=ad2e4aa886e36a5fa1113f2b802b052c
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.1 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
new file mode 100644
index 000000000000..725e3825ba83
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst setup unpack
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Resilient, fast and scalable file synchronization tool
+EAPI=6
+HOMEPAGE=https://resilio.com/
+IUSE=pax_kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/tmpfiles
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.6.1-1_amd64.deb ) x86? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.6.1-1_i386.deb )
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c83c801efb884bbf6beec0f7c1b81713
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.5.0 b/metadata/md5-cache/net-p2p/xmr-stak-2.5.0
new file mode 100644
index 000000000000..c428185570fd
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=Unified all-in-one Monero miner
+EAPI=6
+HOMEPAGE=https://github.com/fireice-uk/xmr-stak
+IUSE=cuda devfee hwloc opencl ssl webserver
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
+SLOT=0
+SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.5.0.tar.gz -> xmr-stak-2.5.0.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=effff6eefc01131f365a45a4eb1a3ff3
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.5.1 b/metadata/md5-cache/net-p2p/xmr-stak-2.5.1
new file mode 100644
index 000000000000..ab592a95501d
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=Unified all-in-one Monero miner
+EAPI=6
+HOMEPAGE=https://github.com/fireice-uk/xmr-stak
+IUSE=cuda devfee hwloc opencl ssl webserver
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
+SLOT=0
+SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.5.1.tar.gz -> xmr-stak-2.5.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=effff6eefc01131f365a45a4eb1a3ff3
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 189cb67bbd43..67dcd43b94dc 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/cups-filters-1.21.3 b/metadata/md5-cache/net-print/cups-filters-1.21.3
new file mode 100644
index 000000000000..a67bde44426f
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-filters-1.21.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.1.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-8.1.0:= ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig
+DESCRIPTION=Cups filters
+EAPI=6
+HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
+IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
+LICENSE=MIT GPL-2
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.1.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-8.1.0:= ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+SLOT=0
+SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.21.3.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4a1b5126ff6a39d20deb6196ff817654
diff --git a/metadata/md5-cache/net-print/hplip-3.18.6-r1 b/metadata/md5-cache/net-print/hplip-3.18.6-r1
new file mode 100644
index 000000000000..93c0a8b691c9
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.18.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( 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(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) )
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=7
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
+IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( 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(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[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(+)?] python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python3_4? ( dev-python/pygobject:3[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_single_target_python3_5? ( dev-python/pygobject:3[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_single_target_python3_6? ( dev-python/pygobject:3[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(+)?] ) fax? ( dev-python/reportlab[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(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,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(+)?] libnotify? ( dev-python/notify2[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(+)?] ) ) scanner? ( >=dev-python/reportlab-3.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/pillow-3.1.1[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(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
+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.6-patches-1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=281de12410157efe0efcb76b1a71445b
diff --git a/metadata/md5-cache/net-print/hplip-3.18.6-r2 b/metadata/md5-cache/net-print/hplip-3.18.6-r2
new file mode 100644
index 000000000000..e24d94c517c4
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.18.6-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( 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(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) )
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=7
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
+IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( 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(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[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(+)?] python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python3_4? ( dev-python/pygobject:3[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_single_target_python3_5? ( dev-python/pygobject:3[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_single_target_python3_6? ( dev-python/pygobject:3[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(+)?] ) fax? ( dev-python/reportlab[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(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,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(+)?] libnotify? ( dev-python/notify2[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(+)?] ) ) scanner? ( >=dev-python/reportlab-3.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/pillow-3.1.1[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(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
+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.6-patches-2.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=635165a4b7686e17c03cb2c3571e3a68
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index ec9c5b948db1..d9b075969634 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/http-replicator-4.0_alpha2-r5 b/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2-r5
deleted file mode 100644
index 870aa87a20af..000000000000
--- a/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst 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(-)] virtual/pkgconfig
-DESCRIPTION=Proxy cache for Gentoo packages
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/http-replicator
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/http-replicator/http-replicator_4.0alpha2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0305c3a40f451ec333ed9cc36fd1af24
diff --git a/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2-r6 b/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2-r6
new file mode 100644
index 000000000000..c3b29122e8fa
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2-r6
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst 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(-)] sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Proxy cache for Gentoo packages
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/http-replicator
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/http-replicator/http-replicator_4.0alpha2.tgz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=8ea93090776793985212cb3adf807410
diff --git a/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1 b/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
new file mode 100644
index 000000000000..88fe2251c311
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=>=app-portage/elt-patches-20170815 !<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=A lightweight HTTP/SSL proxy
+EAPI=6
+HOMEPAGE=https://github.com/tinyproxy/tinyproxy/
+IUSE=test debug +filter-proxy reverse-proxy transparent-proxy +upstream-proxy +xtinyproxy-header
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/tmpfiles
+REQUIRED_USE=test? ( xtinyproxy-header )
+SLOT=0
+SRC_URI=https://github.com/tinyproxy/tinyproxy/releases/download/1.10.0/tinyproxy-1.10.0.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=40cd5a17f7bc00587098e9f58ae14965
diff --git a/metadata/md5-cache/net-proxy/tinyproxy-1.8.3-r4 b/metadata/md5-cache/net-proxy/tinyproxy-1.8.3-r4
index 6c7e38a22748..d9ad4bd0e9b2 100644
--- a/metadata/md5-cache/net-proxy/tinyproxy-1.8.3-r4
+++ b/metadata/md5-cache/net-proxy/tinyproxy-1.8.3-r4
@@ -10,4 +10,4 @@ REQUIRED_USE=test? ( xtinyproxy-header )
 SLOT=0
 SRC_URI=http://www.banu.com/pub/tinyproxy/1.8/tinyproxy-1.8.3.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=acd174c70c2bcb3b22693b5ea7b50cd8
+_md5_=705df71a8aec9c77a12758028fb4d4e1
diff --git a/metadata/md5-cache/net-proxy/tinyproxy-1.8.4 b/metadata/md5-cache/net-proxy/tinyproxy-1.8.4
new file mode 100644
index 000000000000..75d220fce86f
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/tinyproxy-1.8.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=!minimal? ( app-text/asciidoc ) >=app-portage/elt-patches-20170815 !<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=A lightweight HTTP/SSL proxy
+EAPI=6
+HOMEPAGE=https://github.com/tinyproxy/tinyproxy/
+IUSE=test debug +filter-proxy minimal reverse-proxy transparent-proxy +upstream-proxy +xtinyproxy-header
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/tmpfiles
+REQUIRED_USE=test? ( xtinyproxy-header )
+SLOT=0
+SRC_URI=https://github.com/tinyproxy/tinyproxy/releases/download/1.8.4/tinyproxy-1.8.4.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=3360195c7737f0ab45f545078bba56bd
diff --git a/metadata/md5-cache/net-proxy/trojan-1.8.1 b/metadata/md5-cache/net-proxy/trojan-1.8.1
new file mode 100644
index 000000000000..c51d8106dc82
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/trojan-1.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.54.0:= >=dev-libs/openssl-1.0.2:= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An unidentifiable mechanism that helps you bypass GFW
+EAPI=6
+HOMEPAGE=https://github.com/trojan-gfw/trojan
+IUSE=mysql test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/boost-1.54.0:= >=dev-libs/openssl-1.0.2:= mysql? ( dev-db/mysql-connector-c:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/trojan-gfw/trojan/archive/v1.8.1.tar.gz -> trojan-1.8.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a0238d9e4816d84e0a01ee1c61446608
diff --git a/metadata/md5-cache/net-proxy/trojan-1.9.0 b/metadata/md5-cache/net-proxy/trojan-1.9.0
new file mode 100644
index 000000000000..62ab8a38380f
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/trojan-1.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.54.0:= >=dev-libs/openssl-1.0.2:= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An unidentifiable mechanism that helps you bypass GFW
+EAPI=6
+HOMEPAGE=https://github.com/trojan-gfw/trojan
+IUSE=mysql test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/boost-1.54.0:= >=dev-libs/openssl-1.0.2:= mysql? ( dev-db/mysql-connector-c:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/trojan-gfw/trojan/archive/v1.9.0.tar.gz -> trojan-1.9.0.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a0238d9e4816d84e0a01ee1c61446608
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 270b2ce2bd4b..ccddd1b52dfa 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/i2p-0.9.34 b/metadata/md5-cache/net-vpn/i2p-0.9.34
deleted file mode 100644
index d15c0efd3c61..000000000000
--- a/metadata/md5-cache/net-vpn/i2p-0.9.34
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/eclipse-ecj:* dev-libs/gmp:0 nls? ( >=sys-devel/gettext-0.19 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
-DESCRIPTION=A privacy-centric, anonymous network
-EAPI=6
-HOMEPAGE=https://geti2p.net
-IUSE=+ecdsa nls elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
-RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 ecdsa? ( || ( dev-java/icedtea:8[-sunec] dev-java/icedtea-bin:8 dev-java/oracle-jre-bin dev-java/oracle-jdk-bin ) ) !ecdsa? ( >=virtual/jre-1.7 ) >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.34/i2psource_0.9.34.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=eeed8ee4247ede469ee8b028846ade11
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.37 b/metadata/md5-cache/net-vpn/i2p-0.9.37
new file mode 100644
index 000000000000..c195930b4456
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/i2p-0.9.37
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/commons-logging:0 dev-java/slf4j-simple:0 java-virtuals/servlet-api:3.1 dev-java/eclipse-ecj:* nls? ( >=sys-devel/gettext-0.19 ) virtual/jdk:1.8 test? ( dev-java/ant-junit4:0 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
+DESCRIPTION=A privacy-centric, anonymous network
+EAPI=6
+HOMEPAGE=https://geti2p.net
+IUSE=+ecdsa nls test elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
+RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/commons-logging:0 dev-java/slf4j-simple:0 java-virtuals/servlet-api:3.1 ecdsa? ( || ( dev-java/icedtea:8[-sunec] dev-java/icedtea-bin:8 dev-java/oracle-jre-bin dev-java/oracle-jdk-bin ) ) !ecdsa? ( virtual/jre:1.8 ) net-libs/nativebiginteger:0 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://download.i2p2.de/releases/0.9.37/i2psource_0.9.37.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=cbc66aeaff279d547e0bb30da45c34ac
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.18.0 b/metadata/md5-cache/net-vpn/i2pd-2.18.0
deleted file mode 100644
index ea12fc2219c4..000000000000
--- a/metadata/md5-cache/net-vpn/i2pd-2.18.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) sys-libs/zlib upnp? ( net-libs/miniupnpc ) ) static? ( dev-libs/boost[static-libs,threads] !libressl? ( dev-libs/openssl:0[static-libs] ) libressl? ( dev-libs/libressl:0[static-libs] >=dev-libs/boost-1.65 ) sys-libs/zlib[static-libs] upnp? ( net-libs/miniupnpc[static-libs] ) ) websocket? ( dev-cpp/websocketpp ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
-EAPI=6
-HOMEPAGE=https://github.com/PurpleI2P/i2pd
-IUSE=cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) sys-libs/zlib upnp? ( net-libs/miniupnpc ) )
-SLOT=0
-SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.18.0.tar.gz -> i2pd-2.18.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=575d446ec0a5cc5f2793b8509549c0ab
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.20.0 b/metadata/md5-cache/net-vpn/i2pd-2.20.0
index 2e88b12a1023..a83357a42922 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.20.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.20.0
@@ -4,10 +4,10 @@ DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
 EAPI=6
 HOMEPAGE=https://github.com/PurpleI2P/i2pd
 IUSE=cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) sys-libs/zlib upnp? ( net-libs/miniupnpc ) )
 SLOT=0
 SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.20.0.tar.gz -> i2pd-2.20.0.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7f154899a6a6629c801ee01001ecb2b4
+_md5_=6a3c5a3df85b625c0f64f65041e443f5
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.21.0 b/metadata/md5-cache/net-vpn/i2pd-2.21.0
new file mode 100644
index 000000000000..ff55e128c265
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/i2pd-2.21.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) upnp? ( net-libs/miniupnpc ) ) static? ( dev-libs/boost[static-libs,threads] !libressl? ( dev-libs/openssl:0[static-libs] ) libressl? ( dev-libs/libressl:0[static-libs] >=dev-libs/boost-1.65 ) sys-libs/zlib[static-libs] upnp? ( net-libs/miniupnpc[static-libs] ) ) websocket? ( dev-cpp/websocketpp ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
+EAPI=6
+HOMEPAGE=https://github.com/PurpleI2P/i2pd
+IUSE=cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) upnp? ( net-libs/miniupnpc ) )
+SLOT=0
+SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.21.0.tar.gz -> i2pd-2.21.0.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9ccdcf0f4d5c6905e4751db5cf925a93
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.27 b/metadata/md5-cache/net-vpn/libreswan-3.27
new file mode 100644
index 000000000000..2667b1bd3e0e
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-3.27
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=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= ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+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
+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.27.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d00c6d3a29a732f354bbe6cdd3dbadd5
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.06-r1 b/metadata/md5-cache/net-vpn/openconnect-7.06-r1
deleted file mode 100644
index 80bd60488b65..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-7.06-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare pretend setup
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) virtual/pkgconfig doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) sys-apps/groff ) java? ( >=virtual/jdk-1.6 ) nls? ( sys-devel/gettext ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=5
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi java libproxy nls smartcard static-libs elibc_FreeBSD java kernel_linux
-KEYWORDS=amd64 arm ~arm64 ppc64 x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/5
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=eeaf34990dfc7114301c432f13de6932
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.06-r4 b/metadata/md5-cache/net-vpn/openconnect-7.06-r4
deleted file mode 100644
index 5724d7f32fb3..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-7.06-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare pretend setup
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) virtual/pkgconfig doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) sys-apps/groff ) java? ( >=virtual/jdk-1.6 ) nls? ( sys-devel/gettext ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=5
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi java libproxy libressl nls smartcard static-libs stoken elibc_FreeBSD java kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/5
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=52dadf5a1766b7724409308b185fe966
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614 b/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614
deleted file mode 100644
index f4444cc286a7..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare pretend setup unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) virtual/pkgconfig doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) sys-apps/groff ) java? ( >=virtual/jdk-1.6 ) nls? ( sys-devel/gettext ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=app-portage/elt-patches-20170815 !<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=Free client for Cisco AnyConnect SSL VPN software
-EAPI=6
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi java libproxy nls smartcard static-libs stoken elibc_FreeBSD java kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/5
-SRC_URI=https://dev.gentoo.org/~williamh/dist/openconnect-7.06_p20160614.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=68fd9dad3a62d2492aa79db0db313cf3
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.07-r1 b/metadata/md5-cache/net-vpn/openconnect-7.07-r1
deleted file mode 100644
index 7b856e49f60e..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-7.07-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare pretend setup unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) virtual/pkgconfig doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) sys-apps/groff ) java? ( >=virtual/jdk-1.6 ) nls? ( sys-devel/gettext ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=6
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi java libproxy nls smartcard static-libs stoken elibc_FreeBSD java kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/5
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.07.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20160829.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e21174e993036ca5d099389edd0530f3
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.07-r2 b/metadata/md5-cache/net-vpn/openconnect-7.07-r2
deleted file mode 100644
index d64806aa8c25..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-7.07-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare pretend setup unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) virtual/pkgconfig doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) sys-apps/groff ) java? ( >=virtual/jdk-1.6 ) nls? ( sys-devel/gettext ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=6
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi java libproxy lz4 nls smartcard static-libs stoken elibc_FreeBSD java kernel_linux
-KEYWORDS=amd64 arm ~arm64 ppc64 x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/5
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.07.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20160829.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b0f19eda0e1d1d326ef4db0feb7123a0
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.07-r3 b/metadata/md5-cache/net-vpn/openconnect-7.07-r3
deleted file mode 100644
index ea69a3f3ad99..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-7.07-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare pretend setup unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) virtual/pkgconfig doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) sys-apps/groff ) java? ( >=virtual/jdk-1.6 ) nls? ( sys-devel/gettext ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=6
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi java libproxy libressl lz4 nls smartcard static-libs stoken elibc_FreeBSD java kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/5
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.07.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20160829.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4b2df63397dff05e4339d2972b877c94
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.08 b/metadata/md5-cache/net-vpn/openconnect-7.08
deleted file mode 100644
index b2d583b06eab..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-7.08
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare pretend setup unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) virtual/pkgconfig doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) sys-apps/groff ) java? ( >=virtual/jdk-1.6 ) nls? ( sys-devel/gettext ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=6
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi java libproxy libressl lz4 nls smartcard static-libs stoken elibc_FreeBSD java kernel_linux
-KEYWORDS=amd64 arm ~arm64 ppc64 x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/5
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.08.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20160829.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3117f3542b802805c4e56b72f69470ab
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.08-r1 b/metadata/md5-cache/net-vpn/openconnect-7.08-r1
index 07db0f972029..dc176de6ea19 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.08-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-7.08-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
 EAPI=6
 HOMEPAGE=http://www.infradead.org/openconnect.html
 IUSE=doc +gnutls gssapi java libproxy libressl lz4 nls smartcard static-libs stoken elibc_FreeBSD java kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc64 x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.08.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20180227.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=00b773f86cbf55118872b54bdd2c6bc1
+_md5_=b3f63b4206ec69d1fb9e4d3a90564fd7
diff --git a/metadata/md5-cache/net-vpn/openconnect-9999 b/metadata/md5-cache/net-vpn/openconnect-9999
index f537cfae162c..4fc3afcff513 100644
--- a/metadata/md5-cache/net-vpn/openconnect-9999
+++ b/metadata/md5-cache/net-vpn/openconnect-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openss
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20180227.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=00b773f86cbf55118872b54bdd2c6bc1
+_md5_=92f5c1e6b9837f7a27b20f1dbbb497b0
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.5.3 b/metadata/md5-cache/net-vpn/strongswan-5.5.3
deleted file mode 100644
index 8e55d8486b2e..000000000000
--- a/metadata/md5-cache/net-vpn/strongswan-5.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/linux-sources sys-kernel/linux-headers virtual/pkgconfig
-DESCRIPTION=IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE
-EAPI=5
-HOMEPAGE=http://www.strongswan.org/
-IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_ctr strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_unbound strongswan_plugins_whitelist kernel_linux
-KEYWORDS=amd64 arm ppc ~ppc64 x86
-LICENSE=GPL-2 RSA DES
-RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
-SLOT=0
-SRC_URI=http://download.strongswan.org/strongswan-5.5.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e10d3dde0e38782b619a4a905102edd
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.6.0 b/metadata/md5-cache/net-vpn/strongswan-5.6.0
deleted file mode 100644
index e7d7e4c68c8f..000000000000
--- a/metadata/md5-cache/net-vpn/strongswan-5.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/linux-sources sys-kernel/linux-headers virtual/pkgconfig
-DESCRIPTION=IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE
-EAPI=5
-HOMEPAGE=http://www.strongswan.org/
-IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_ctr strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_unbound strongswan_plugins_whitelist kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 RSA DES
-RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
-SLOT=0
-SRC_URI=http://download.strongswan.org/strongswan-5.6.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1aa6777a8bf183c2c0d23927eb7e368a
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.7.1 b/metadata/md5-cache/net-vpn/strongswan-5.7.1
new file mode 100644
index 000000000000..016caec63147
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/strongswan-5.7.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/linux-sources sys-kernel/linux-headers
+DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
+EAPI=7
+HOMEPAGE=https://www.strongswan.org/
+IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist kernel_linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+LICENSE=GPL-2 RSA DES
+RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.strongswan.org/strongswan-5.7.1.tar.bz2
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=dac0e13a841e39b4c65f6712008e20d8
diff --git a/metadata/md5-cache/net-vpn/tinc-1.0.35 b/metadata/md5-cache/net-vpn/tinc-1.0.35
new file mode 100644
index 000000000000..cbf31e8ee194
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tinc-1.0.35
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DESCRIPTION=tinc is an easy to configure VPN implementation
+EAPI=6
+HOMEPAGE=http://www.tinc-vpn.org/
+IUSE=libressl +lzo uml vde +zlib
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
+SLOT=0
+SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.0.35.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=878455abff8d4028a5b4605614f34574
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.5.2_alpha b/metadata/md5-cache/net-vpn/tor-0.3.5.2_alpha
deleted file mode 100644
index f3ae94fe7604..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.3.5.2_alpha
+++ /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 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.5.2-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.5.2-alpha.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0cebe8a5b455212991bd48fe8a6ca5bb
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.5.3_alpha b/metadata/md5-cache/net-vpn/tor-0.3.5.3_alpha
new file mode 100644
index 000000000000..6b95c325536f
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.3.5.3_alpha
@@ -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 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.5.3-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.5.3-alpha.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0cebe8a5b455212991bd48fe8a6ca5bb
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20181006 b/metadata/md5-cache/net-vpn/wireguard-0.0.20181006
deleted file mode 100644
index 4f97652f8217..000000000000
--- a/metadata/md5-cache/net-vpn/wireguard-0.0.20181006
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) ) module? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
-EAPI=6
-HOMEPAGE=https://www.wireguard.com/
-IUSE=debug +module +tools module-src kernel_linux kernel_linux module
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20181006.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f922f976188e6f0c8d1d3325d9a6dd9
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20181018 b/metadata/md5-cache/net-vpn/wireguard-0.0.20181018
new file mode 100644
index 000000000000..8e0f05863da2
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20181018
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) ) module? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
+EAPI=6
+HOMEPAGE=https://www.wireguard.com/
+IUSE=debug +module +tools module-src kernel_linux kernel_linux module
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20181018.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4f922f976188e6f0c8d1d3325d9a6dd9
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 9f8abf0e6502..5335ed18633c 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-r3 b/metadata/md5-cache/net-wireless/aircrack-ng-1.3-r3
index 0aa9a54c0d7b..b94790796879 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.3-r3
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.3-r3
@@ -5,7 +5,7 @@ DESCRIPTION=WLAN tools for breaking 802.11 WEP/WPA keys
 EAPI=7
 HOMEPAGE=http://www.aircrack-ng.org
 IUSE=+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental python_targets_python2_7
-KEYWORDS=amd64 ~arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+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 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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 )
@@ -13,4 +13,4 @@ REQUIRED_USE=airdrop-ng? ( || ( python_targets_python2_7 ) ) airgraph-ng? ( || (
 SLOT=0
 SRC_URI=https://download.aircrack-ng.org/aircrack-ng-1.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=08767cc786ffa11296d093e9cd856082
+_md5_=9aa56e153213519a0a5550291d082be5
diff --git a/metadata/md5-cache/net-wireless/bluez-5.50 b/metadata/md5-cache/net-wireless/bluez-5.50
index ff9b65d943f7..1b2ed76fa205 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 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) 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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=31d77528343992281303686eb93f4a7e
+_md5_=25928978807d32bf8527e0495ea2a513
diff --git a/metadata/md5-cache/net-wireless/iwd-0.10 b/metadata/md5-cache/net-wireless/iwd-0.10
new file mode 100644
index 000000000000..139b5c91a718
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwd-0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend setup unpack
+DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Wireless daemon for linux
+EAPI=6
+HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
+IUSE=+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-0.10.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=69ef6cf89af8ed115b37f3982c59bc3e
diff --git a/metadata/md5-cache/net-wireless/iwd-0.7 b/metadata/md5-cache/net-wireless/iwd-0.7
index da59e8eb0e8e..701fef870999 100644
--- a/metadata/md5-cache/net-wireless/iwd-0.7
+++ b/metadata/md5-cache/net-wireless/iwd-0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Wireless daemon for linux
 EAPI=6
 HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
 IUSE=+client +monitor cpu_flags_x86_aes cpu_flags_x86_ssse3 kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-0.7.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=35c45517a8079fc91dbb08a73b9ea3a6
+_md5_=f096bd721d9f1ddea63c502776fda1d7
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index 677b9c53851a..5797f08b2d80 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install preinst prepare setup 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(+)] 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-20170815 !<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 >=dev-vcs/git-1.8.2.1[curl]
+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(+)] networkmanager? ( 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-20170815 !<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 >=dev-vcs/git-1.8.2.1[curl]
 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
 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 )
+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(+)] networkmanager? ( 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 )
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=35005dcb114e710dd4d70bf3b8344a4c
+_md5_=1436c8d40ebecbd3152599fa9f0c9421
diff --git a/metadata/md5-cache/net-wireless/ndiswrapper-1.61 b/metadata/md5-cache/net-wireless/ndiswrapper-1.61
index 7be260eb8079..501b4ae313de 100644
--- a/metadata/md5-cache/net-wireless/ndiswrapper-1.61
+++ b/metadata/md5-cache/net-wireless/ndiswrapper-1.61
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install postinst postrm preinst pretend setup
 DEPEND=sys-apps/pciutils kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Wrapper for using Windows drivers for some wireless cards
-EAPI=6
+EAPI=7
 HOMEPAGE=http://ndiswrapper.sourceforge.net/
 IUSE=debug usb kernel_linux kernel_linux
 KEYWORDS=amd64 x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils net-wireless/wireless-tools kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/ndiswrapper/stable/ndiswrapper-1.61.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bffe44db2103aeec80eda5c1542f2ec9
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0e6c704cf01d386327d6cac467c33c44
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 0755292d40a8..96138a092868 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/ros_control-0.15.1 b/metadata/md5-cache/ros-meta/ros_control-0.15.1
new file mode 100644
index 000000000000..2ef143704292
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ros_control-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface 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=Controller interfaces, controller managers, transmissions, hardware_interfaces, control_toolbox
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/ros_control https://github.com/ros-controls/ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface python_targets_python2_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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7ecfb050197e1622dafd3ba7818f9f17
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 9179837a1ce5..7583fe34bc37 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/kstars-2.9.5 b/metadata/md5-cache/sci-astronomy/kstars-2.9.5
index 1672c5e28870..a02893dbde9f 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-2.9.5
+++ b/metadata/md5-cache/sci-astronomy/kstars-2.9.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kcrash-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/knotifyconfig-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4: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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.4.0 ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) xplanet? ( x11-misc/xplanet ) >=dev-qt/qtconcurrent-5.9.4:5 dev-cpp/eigen:3 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
+DEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kplotting-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4: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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.4.0 ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) xplanet? ( x11-misc/xplanet ) >=dev-qt/qtconcurrent-5.9.4:5 dev-cpp/eigen:3 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Desktop Planetarium
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars
 IUSE=fits indi raw wcs xplanet debug +handbook python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=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/kcrash-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/knotifyconfig-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4: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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.4.0 ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) xplanet? ( x11-misc/xplanet ) python_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/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kauth-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kplotting-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.4: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/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.4.0 ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) xplanet? ( x11-misc/xplanet ) python_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/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=indi? ( fits ) python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-2.9.5.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2510b6d18250a2311c3c478edacdba9a
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1 b/metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1
index 246b3e7bc382..5b1b24c8ee4b 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=3D photo-realistic skies in real time
 EAPI=6
 HOMEPAGE=http://www.stellarium.org/
 IUSE=debug gps media nls stars l10n_af l10n_am l10n_ar l10n_as l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_bo l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_en-GB l10n_en-US l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fil l10n_fr l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kk l10n_kn l10n_ko l10n_ky l10n_la l10n_lb l10n_lo l10n_lt l10n_lv l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_se l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_sw l10n_ta l10n_te l10n_tg l10n_th l10n_tl l10n_tr l10n_tt l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-HK l10n_zh-TW l10n_zu
-KEYWORDS=amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=media-fonts/dejavu dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 virtual/opengl sys-libs/zlib media? ( dev-qt/qtmultimedia:5[widgets] ) gps? ( dev-qt/qtpositioning:5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/stellarium/stellarium-0.16.0.tar.gz stars? ( mirror://sourceforge/stellarium/stars_4_1v0_1.cat mirror://sourceforge/stellarium/stars_5_2v0_1.cat mirror://sourceforge/stellarium/stars_6_2v0_1.cat mirror://sourceforge/stellarium/stars_7_2v0_1.cat mirror://sourceforge/stellarium/stars_8_2v0_1.cat )
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9ffb39c205bd27cb7d63d089ccd439b5
+_md5_=9c091aba1499ae3a234b70bb909530ba
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 7be5031611f0..b75d6299442d 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/allpathslg-52488-r2 b/metadata/md5-cache/sci-biology/allpathslg-52488-r2
index 7d4580f5c803..45424e1f85bb 100644
--- a/metadata/md5-cache/sci-biology/allpathslg-52488-r2
+++ b/metadata/md5-cache/sci-biology/allpathslg-52488-r2
@@ -9,4 +9,4 @@ RDEPEND=!sci-biology/allpaths !sci-biology/vaal
 SLOT=0
 SRC_URI=ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-52488.tar.gz https://dev.gentoo.org/~mgorny/dist/allpathslg-52488-patchset.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c8bda5ab2704db1e969660ebe5882c1
+_md5_=7993b2efe97dac631506fe76aa46db2b
diff --git a/metadata/md5-cache/sci-biology/express-0.9.5-r1 b/metadata/md5-cache/sci-biology/express-0.9.5-r1
deleted file mode 100644
index ca344e738f87..000000000000
--- a/metadata/md5-cache/sci-biology/express-0.9.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.52.0:= sys-libs/zlib sci-biology/bamtools sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Streaming RNA-Seq Analysis
-EAPI=5
-HOMEPAGE=http://bio.math.berkeley.edu/eXpress/
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic
-RDEPEND=>=dev-libs/boost-1.52.0:= sys-libs/zlib sci-biology/bamtools
-SLOT=0
-SRC_URI=http://bio.math.berkeley.edu/eXpress/downloads/express-0.9.5/express-0.9.5-src.tgz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6d15a446bfc7659cceaabe3567001583
diff --git a/metadata/md5-cache/sci-biology/express-1.5.1 b/metadata/md5-cache/sci-biology/express-1.5.1
index d43cad983014..3b93b4074bc8 100644
--- a/metadata/md5-cache/sci-biology/express-1.5.1
+++ b/metadata/md5-cache/sci-biology/express-1.5.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.52.0:= dev-libs/protobuf dev-util/google-perftools sys-libs/zlib sci-biology/bamtools sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-libs/boost-1.52.0:= dev-libs/protobuf dev-util/google-perftools sci-biology/bamtools sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Streaming RNA-Seq Analysis
-EAPI=5
+EAPI=6
 HOMEPAGE=http://bio.math.berkeley.edu/eXpress/
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic
-RDEPEND=>=dev-libs/boost-1.52.0:= dev-libs/protobuf dev-util/google-perftools sys-libs/zlib sci-biology/bamtools
+RDEPEND=>=dev-libs/boost-1.52.0:= dev-libs/protobuf dev-util/google-perftools sci-biology/bamtools sys-libs/zlib
 SLOT=0
 SRC_URI=http://bio.math.berkeley.edu/eXpress/downloads/express-1.5.1/express-1.5.1-src.tgz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a2d4ea80b964801c45f62ae737430d6d
+_md5_=10c478f1e1a9a533322963cf4c2e92f8
diff --git a/metadata/md5-cache/sci-biology/fasttree-2.1.7 b/metadata/md5-cache/sci-biology/fasttree-2.1.7
deleted file mode 100644
index deeb21277763..000000000000
--- a/metadata/md5-cache/sci-biology/fasttree-2.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Fast inference of approximately-maximum-likelihood phylogenetic trees
-EAPI=5
-HOMEPAGE=http://www.microbesonline.org/fasttree/
-IUSE=double-precision openmp cpu_flags_x86_sse3
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-REQUIRED_USE=?? ( double-precision cpu_flags_x86_sse3 )
-SLOT=0
-SRC_URI=http://www.microbesonline.org/fasttree/FastTree-2.1.7.c http://www.microbesonline.org/fasttree/FastTreeUPGMA.c -> FastTreeUPGMA-2.1.7.c http://www.microbesonline.org/fasttree/MOTreeComparison.tar.gz -> MOTreeComparison-2.1.7.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=20d72299931c8f8e092006a9b668182c
diff --git a/metadata/md5-cache/sci-biology/fasttree-2.1.8 b/metadata/md5-cache/sci-biology/fasttree-2.1.8
index 3fe280d77e7f..d7463a242196 100644
--- a/metadata/md5-cache/sci-biology/fasttree-2.1.8
+++ b/metadata/md5-cache/sci-biology/fasttree-2.1.8
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Fast inference of approximately-maximum-likelihood phylogenetic trees
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.microbesonline.org/fasttree/
 IUSE=double-precision openmp cpu_flags_x86_sse3
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ REQUIRED_USE=?? ( double-precision cpu_flags_x86_sse3 )
 SLOT=0
 SRC_URI=http://www.microbesonline.org/fasttree/FastTree-2.1.8.c http://www.microbesonline.org/fasttree/FastTreeUPGMA.c -> FastTreeUPGMA-2.1.8.c http://www.microbesonline.org/fasttree/MOTreeComparison.tar.gz -> MOTreeComparison-2.1.8.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f2b648d93a4c0ca58285574958cde15a
+_md5_=5a3e768febbbadcd5c8a4141dd49e11c
diff --git a/metadata/md5-cache/sci-biology/rebase-1810 b/metadata/md5-cache/sci-biology/rebase-1810
new file mode 100644
index 000000000000..377675de0e57
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/rebase-1810
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
+DESCRIPTION=A restriction enzyme database
+EAPI=6
+HOMEPAGE=http://rebase.neb.com
+IUSE=emboss minimal
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/rebase-1810.tar.xz
+_md5_=03338bf80d0fb82894ab8e39e00b1898
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 7e872f7b6332..02bb1adac262 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/units-2.17 b/metadata/md5-cache/sci-calculators/units-2.17
index d83a05b198cc..9a080b7e834f 100644
--- a/metadata/md5-cache/sci-calculators/units-2.17
+++ b/metadata/md5-cache/sci-calculators/units-2.17
@@ -4,11 +4,11 @@ DESCRIPTION=Unit conversion program
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/units/units.html
 IUSE=+units_cur python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.3 GPL-3
 RDEPEND=sys-libs/readline:= units_cur? ( 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/future[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/requests[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=units_cur? ( ^^ ( 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://gnu/units/units-2.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6828770c50c672e023b2dfc104c8ec78
+_md5_=ae6491cb484a14dae801e91314aa866a
diff --git a/metadata/md5-cache/sci-calculators/units-2.18 b/metadata/md5-cache/sci-calculators/units-2.18
new file mode 100644
index 000000000000..1be916029bcd
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/units-2.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=sys-libs/readline:= units_cur? ( 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/future[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/requests[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(+)?] )
+DESCRIPTION=Unit conversion program
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/units/units.html
+IUSE=+units_cur python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=FDL-1.3 GPL-3
+RDEPEND=sys-libs/readline:= units_cur? ( 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/future[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/requests[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=units_cur? ( ^^ ( 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://gnu/units/units-2.18.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fbf79b6e19ecb579ccc36cd73e5e6292
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index d9127ed713fd..27fb0b14303e 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2 b/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
index 07aa43fb9592..fbc5fe23c843 100644
--- a/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
+++ b/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) 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_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(+)]
+DEPEND=dev-cpp/eigen:3 dev-libs/maloc[mpi=] sys-libs/readline virtual/blas fetk? ( sci-libs/amd sci-libs/fetk sci-libs/superlu sci-libs/umfpack ) mpi? ( virtual/mpi ) 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(+)] ) virtual/pkgconfig doc? ( app-doc/doxygen ) 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_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=Evaluation of electrostatic properties of nanoscale biomolecular systems
 EAPI=5
-HOMEPAGE=http://www.poissonboltzmann.org/apbs/
+HOMEPAGE=https://www.poissonboltzmann.org/apbs/
 IUSE=debug doc examples fast +fetk iapbs mpi openmp python tools python_targets_python2_7
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 dev-libs/maloc[mpi=] virtual/blas sys-libs/readline fetk? ( sci-libs/fetk sci-libs/amd sci-libs/umfpack sci-libs/superlu ) mpi? ( virtual/mpi ) 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(+)] ) python_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(+)]
+RDEPEND=dev-cpp/eigen:3 dev-libs/maloc[mpi=] sys-libs/readline virtual/blas fetk? ( sci-libs/amd sci-libs/fetk sci-libs/superlu sci-libs/umfpack ) mpi? ( virtual/mpi ) 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(+)] ) python_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=iapbs? ( fetk ) mpi? ( !python ) python? ( tools fetk iapbs python_targets_python2_7 ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/Electrostatics/apbs-pdb2pqr/archive/74fcb8676de69ed04ddab8976a8b05a6caaf4d65.zip -> apbs-1.4.1.zip
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b04838eb8d0fe55b17589c3ab6d29280
+_md5_=6a96394a927ad8fef2bf8994cd06837c
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.3.2-r1 b/metadata/md5-cache/sci-chemistry/openbabel-2.3.2-r1
deleted file mode 100644
index 59ff5e1f7132..000000000000
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:3.0[X] ) >=dev-util/cmake-2.4.8 doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interconverts file formats used in molecular modeling
-EAPI=5
-HOMEPAGE=http://openbabel.sourceforge.net/
-IUSE=doc openmp test wxwidgets
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:3.0[X] )
-SLOT=0
-SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d880844fba044836488350725d6a444f
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2 b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2
deleted file mode 100644
index 8e28c1297d72..000000000000
--- a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:= ~sci-chemistry/openbabel-2.3.2 >=dev-util/cmake-2.4.8 >=dev-lang/swig-2 sys-devel/make >=dev-util/cmake-3.9.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl bindings for OpenBabel
-EAPI=5
-HOMEPAGE=http://openbabel.sourceforge.net/
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:= ~sci-chemistry/openbabel-2.3.2 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7d40af4aa49703f526c8935423380ead
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2 b/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
deleted file mode 100644
index c9b818711f70..000000000000
--- a/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~sci-chemistry/openbabel-2.3.2 sys-libs/zlib >=dev-lang/swig-2 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Python bindings for OpenBabel (including Pybel)
-EAPI=5
-HOMEPAGE=http://openbabel.sourceforge.net/
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~sci-chemistry/openbabel-2.3.2 sys-libs/zlib
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3f5ab0b18673814af37849f1890bfb74
diff --git a/metadata/md5-cache/sci-chemistry/tm-align-20150914 b/metadata/md5-cache/sci-chemistry/tm-align-20150914
index d273814c79e4..cf7429298ae6 100644
--- a/metadata/md5-cache/sci-chemistry/tm-align-20150914
+++ b/metadata/md5-cache/sci-chemistry/tm-align-20150914
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 virtual/fortran
 DESCRIPTION=Quick & Accurate Structural Alignment
-EAPI=5
+EAPI=6
 HOMEPAGE=http://zhanglab.ccmb.med.umich.edu/TM-align/
-IUSE=static custom-cflags
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+IUSE=custom-cflags static
+KEYWORDS=~amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=tm-align
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools20150914.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dffd0173b777f1622e966e7bd1838993
+_md5_=0d96f6c5e40e3e66fd57af81a19fe028
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 9fa75b4a18dc..bb8c1cec5616 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/drahnr-oregano-0.84.40 b/metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
new file mode 100644
index 000000000000..7b0168e1a293
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup
+DEPEND=dev-libs/glib:2 dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 || ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Application for the schematic capturing and simulation of electrical circuits
+EAPI=6
+HOMEPAGE=https://github.com/drahnr/oregano
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 || ( gnome-base/dconf gnome-base/gconf ) sci-electronics/electronics-menu
+SLOT=0
+SRC_URI=https://github.com/drahnr/oregano/archive/v0.84.40.tar.gz -> drahnr-oregano-0.84.40.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=34e3bc5751e49f36840a205e2f72c458
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 5f5bb293c4a5..d2fd97dfa2da 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/mapnik-3.0.18 b/metadata/md5-cache/sci-geosciences/mapnik-3.0.18
index 800bec7bc001..1a4cd996e952 100644
--- a/metadata/md5-cache/sci-geosciences/mapnik-3.0.18
+++ b/metadata/md5-cache/sci-geosciences/mapnik-3.0.18
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.48:=[threads] dev-libs/icu:= sys-libs/zlib media-libs
 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=98aa3ccabdbbaa18fe91178fb6cd3ffe
+_md5_=892a4569ad8b691f30f362911567d095
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.0.3 b/metadata/md5-cache/sci-geosciences/mapserver-7.0.3
deleted file mode 100644
index 709aa3b5f073..000000000000
--- a/metadata/md5-cache/sci-geosciences/mapserver-7.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg:= virtual/libiconv x11-libs/agg bidi? ( dev-libs/fribidi media-libs/harfbuzz ) cairo? ( x11-libs/cairo ) gdal? ( >=sci-libs/gdal-1.8.0 ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff:= sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) perl? ( >=dev-lang/swig-2.0 ) python? ( >=dev-lang/swig-2.0 ) =www-servers/apache-2* >=app-admin/webapp-config-1.50.15 python_targets_python2_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-lang/perl:=[-build(-)] >=app-portage/elt-patches-20170815 !<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/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Development environment for building spatially enabled webapps
-EAPI=5
-HOMEPAGE=http://mapserver.org/
-IUSE=bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt vhosts python_targets_python2_7 php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg:= virtual/libiconv x11-libs/agg bidi? ( dev-libs/fribidi media-libs/harfbuzz ) cairo? ( x11-libs/cairo ) gdal? ( >=sci-libs/gdal-1.8.0 ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff:= sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) =www-servers/apache-2* >=app-admin/webapp-config-1.50.15 python_targets_python2_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-lang/perl:=[-build(-)] php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
-REQUIRED_USE=php? ( php_targets_php5-6 ) xslt? ( xml ) || ( python_targets_python2_7 ) php? ( || ( php_targets_php5-6 ) )
-SLOT=0
-SRC_URI=http://download.osgeo.org/mapserver/mapserver-7.0.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	php-ext-source-r2	bba5e9c6aaf088fd15faa2e767506125	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bf6219ca52d38eb3639df5491f62295b
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.2.3 b/metadata/md5-cache/sci-geosciences/qgis-3.2.3
index 7892c4baded0..eda7d2a9a377 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.2.3
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.2.3
@@ -4,7 +4,7 @@ DESCRIPTION=User friendly Geographic Information System
 EAPI=6
 HOMEPAGE=https://www.qgis.org/
 IUSE=3d examples georeferencer grass mapserver oracle polar postgres python +webkit python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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(+)?] dev-python/future[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/httplib2[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/jinja[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/markupsafe[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/owslib[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/pygments[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/PyQt5[designer,network,sql,svg,webkit?,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python-2.10.1[qt5(+),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/requests[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/sip:=[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/six[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(+)?] >=sci-libs/gdal-2.2.3[python,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(+)?] postgres? ( dev-python/psycopg: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(+)?] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
 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 ) mapserver? ( python )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.2.3.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=91d5e7430610756900856d9b81b5e82a
+_md5_=c477f69a90d44441810485060653886c
diff --git a/metadata/md5-cache/sci-geosciences/viking-1.6.2-r2 b/metadata/md5-cache/sci-geosciences/viking-1.6.2-r2
new file mode 100644
index 000000000000..6823b6ecfa29
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/viking-1.6.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=app-arch/bzip2 >=dev-tcltk/expect-5.45.4 dev-libs/expat dev-libs/glib:2 net-misc/curl sys-libs/zlib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 gps? ( >=sci-geosciences/gpsd-2.96 ) exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) ) magic? ( sys-apps/file ) mapnik? ( sci-geosciences/mapnik ) sqlite? ( dev-db/sqlite:3 ) app-text/gnome-doc-utils dev-util/intltool dev-util/gtk-doc-am app-text/rarian dev-libs/libxslt virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=GPS data editor and analyzer
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/viking/
+IUSE=doc +exif libexif gps +magic mapnik nls sqlite
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 >=dev-tcltk/expect-5.45.4 dev-libs/expat dev-libs/glib:2 net-misc/curl sys-libs/zlib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 gps? ( >=sci-geosciences/gpsd-2.96 ) exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) ) magic? ( sys-apps/file ) mapnik? ( sci-geosciences/mapnik ) sqlite? ( dev-db/sqlite:3 ) sci-geosciences/gpsbabel
+SLOT=0
+SRC_URI=mirror://sourceforge/viking/viking-1.6.2.tar.bz2 doc? ( mirror://sourceforge/viking/viking.pdf )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c306f842008f25874bd48ab798bc49b7
diff --git a/metadata/md5-cache/sci-geosciences/xtide-2.15.1 b/metadata/md5-cache/sci-geosciences/xtide-2.15.1
new file mode 100644
index 000000000000..1b8cde21c1af
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/xtide-2.15.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=media-libs/libpng:0= sci-geosciences/gpsd >=sci-geosciences/libtcd-2.2.5_p2 x11-libs/libX11 x11-libs/libXaw3d[unicode] x11-libs/libXaw3dXft x11-libs/libXft x11-libs/libXpm x11-libs/libXt >=sys-apps/sed-4
+DESCRIPTION=XTide provides tide and current predictions in a wide variety of formats
+EAPI=6
+HOMEPAGE=http://www.flaterco.com/xtide/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libpng:0= sci-geosciences/gpsd >=sci-geosciences/libtcd-2.2.5_p2 x11-libs/libX11 x11-libs/libXaw3d[unicode] x11-libs/libXaw3dXft x11-libs/libXft x11-libs/libXpm x11-libs/libXt media-fonts/font-schumacher-misc
+SLOT=0
+SRC_URI=ftp://ftp.flaterco.com/xtide/xtide-2.15.1.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5e6730411a1d2b2f97e5cc4edfd02364
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index ab604c07beb0..7f775f319a0e 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/armadillo-6.200.3 b/metadata/md5-cache/sci-libs/armadillo-6.200.3
deleted file mode 100644
index 62e05f1fbf90..000000000000
--- a/metadata/md5-cache/sci-libs/armadillo-6.200.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( sci-libs/superlu ) arpack? ( virtual/pkgconfig ) blas? ( virtual/pkgconfig ) hdf5? ( sci-libs/hdf5 ) lapack? ( virtual/pkgconfig ) mkl? ( sci-libs/mkl ) tbb? ( dev-cpp/tbb ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Streamlined C++ linear algebra library
-EAPI=5
-HOMEPAGE=http://arma.sourceforge.net/
-IUSE=arpack blas debug doc examples hdf5 lapack mkl superlu tbb test
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0
-PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( sci-libs/superlu ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl ) tbb? ( dev-cpp/tbb )
-RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( sci-libs/superlu )
-REQUIRED_USE=test? ( lapack )
-SLOT=0/6
-SRC_URI=mirror://sourceforge/arma/armadillo-6.200.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cab42ab5a04f3802281be5f1cb85fc9c
diff --git a/metadata/md5-cache/sci-libs/armadillo-7.950.1 b/metadata/md5-cache/sci-libs/armadillo-7.950.1
deleted file mode 100644
index 3105cb3814e8..000000000000
--- a/metadata/md5-cache/sci-libs/armadillo-7.950.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5 ) arpack? ( virtual/pkgconfig ) blas? ( virtual/pkgconfig ) hdf5? ( sci-libs/hdf5 ) lapack? ( virtual/pkgconfig ) mkl? ( sci-libs/mkl ) tbb? ( dev-cpp/tbb ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Streamlined C++ linear algebra library
-EAPI=6
-HOMEPAGE=http://arma.sourceforge.net/
-IUSE=arpack blas debug doc examples hdf5 lapack mkl superlu tbb test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5 ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl ) tbb? ( dev-cpp/tbb )
-RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5 )
-REQUIRED_USE=test? ( lapack )
-SLOT=0/7
-SRC_URI=mirror://sourceforge/arma/armadillo-7.950.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=40142eb9b9116bb77e532802909e0912
diff --git a/metadata/md5-cache/sci-libs/armadillo-8.200.0 b/metadata/md5-cache/sci-libs/armadillo-8.200.0
deleted file mode 100644
index 3be20ee5e9b3..000000000000
--- a/metadata/md5-cache/sci-libs/armadillo-8.200.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) arpack? ( virtual/pkgconfig ) blas? ( virtual/pkgconfig ) hdf5? ( sci-libs/hdf5 ) lapack? ( virtual/pkgconfig ) mkl? ( sci-libs/mkl ) tbb? ( dev-cpp/tbb ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Streamlined C++ linear algebra library
-EAPI=6
-HOMEPAGE=http://arma.sourceforge.net/
-IUSE=arpack blas debug doc examples hdf5 lapack mkl superlu tbb test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl ) tbb? ( dev-cpp/tbb )
-RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 )
-REQUIRED_USE=test? ( lapack )
-SLOT=0/8
-SRC_URI=mirror://sourceforge/arma/armadillo-8.200.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c2f77380377861f385b14ed9aabc695c
diff --git a/metadata/md5-cache/sci-libs/ceres-solver-1.11.0 b/metadata/md5-cache/sci-libs/ceres-solver-1.11.0
index 5b45bc64fac7..88f90a1e992c 100644
--- a/metadata/md5-cache/sci-libs/ceres-solver-1.11.0
+++ b/metadata/md5-cache/sci-libs/ceres-solver-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/glog[gflags?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 REQUIRED_USE=test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )
 SLOT=0/1
 SRC_URI=http://ceres-solver.org//ceres-solver-1.11.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cde15bfab4f3144e1f4d58de02c0c062
diff --git a/metadata/md5-cache/sci-libs/ceres-solver-1.12.0 b/metadata/md5-cache/sci-libs/ceres-solver-1.12.0
index 14ac3b9f6a62..724d5e995de3 100644
--- a/metadata/md5-cache/sci-libs/ceres-solver-1.12.0
+++ b/metadata/md5-cache/sci-libs/ceres-solver-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/glog[gflags?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 REQUIRED_USE=test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )
 SLOT=0/1
 SRC_URI=http://ceres-solver.org//ceres-solver-1.12.0.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4be63e92adbe6c861217add4f7bbf0ad
diff --git a/metadata/md5-cache/sci-libs/exodusii-6.02 b/metadata/md5-cache/sci-libs/exodusii-6.02
deleted file mode 100644
index 6830c0c662eb..000000000000
--- a/metadata/md5-cache/sci-libs/exodusii-6.02
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/netcdf[hdf5] test? ( app-shells/tcsh ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( virtual/fortran )
-DESCRIPTION=Model developed to store and retrieve transient data for finite element analyses
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/exodusii/
-IUSE=static-libs test
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sci-libs/netcdf[hdf5]
-SLOT=0
-SRC_URI=mirror://sourceforge/project/exodusii/exodus-6.02.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2f4173460e30909a79184aff11695269
diff --git a/metadata/md5-cache/sci-libs/exodusii-6.09 b/metadata/md5-cache/sci-libs/exodusii-6.09
index 62b5b462e4d6..a373915e081b 100644
--- a/metadata/md5-cache/sci-libs/exodusii-6.09
+++ b/metadata/md5-cache/sci-libs/exodusii-6.09
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sci-libs/netcdf[hdf5] test? ( app-shells/tcsh ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( virtual/fortran )
 DESCRIPTION=Model developed to store and retrieve transient data for finite element analyses
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/exodusii/
+EAPI=6
+HOMEPAGE=https://github.com/certik/exodus
 IUSE=static-libs test
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/netcdf[hdf5]
 SLOT=0
-SRC_URI=mirror://sourceforge/project/exodusii/exodus-6.09.tar.gz
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/exodus-6.09.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=37f4ee0cb29b032070dab5557237c8d8
+_md5_=220d289adf4bd78c66b8fcc42c1800d2
diff --git a/metadata/md5-cache/sci-libs/gdal-2.3.1 b/metadata/md5-cache/sci-libs/gdal-2.3.1
index 81570da1d730..ab46865b60b3 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.3.1
+++ b/metadata/md5-cache/sci-libs/gdal-2.3.1
@@ -11,4 +11,4 @@ REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_target
 SLOT=0/2.3
 SRC_URI=https://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fb1930f07645cfcde9237d8c3a16f2ab
+_md5_=650782c49babe7c32c13e9cf62d0bb23
diff --git a/metadata/md5-cache/sci-libs/geos-3.7.0 b/metadata/md5-cache/sci-libs/geos-3.7.0
index 7d60cc72de95..ac23fe5e2302 100644
--- a/metadata/md5-cache/sci-libs/geos-3.7.0
+++ b/metadata/md5-cache/sci-libs/geos-3.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=6
 HOMEPAGE=http://trac.osgeo.org/geos/
 IUSE=doc python ruby static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=LGPL-2.1
 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(+)] ) ruby? ( dev-lang/ruby:* )
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/geos/geos-3.7.0.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4bf0990c93772445b6497c43322ac6ed
+_md5_=ece7272ca6885c4ed96b5407a2a80cf1
diff --git a/metadata/md5-cache/sci-libs/ignition-math-3.2.0 b/metadata/md5-cache/sci-libs/ignition-math-3.2.0
deleted file mode 100644
index 412918a24c30..000000000000
--- a/metadata/md5-cache/sci-libs/ignition-math-3.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A small, fast, and high performance math library for robot applications
-EAPI=5
-HOMEPAGE=https://ignitionrobotics.org/libraries/math
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=3/3
-SRC_URI=https://bitbucket.org/ignitionrobotics/ign-math/get/ignition-math3_3.2.0.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a320764218e5888f10d2c4ab737bd38f
diff --git a/metadata/md5-cache/sci-libs/ignition-math-4.0.0-r1 b/metadata/md5-cache/sci-libs/ignition-math-4.0.0-r1
index cdbbdc1ff287..936742068a1c 100644
--- a/metadata/md5-cache/sci-libs/ignition-math-4.0.0-r1
+++ b/metadata/md5-cache/sci-libs/ignition-math-4.0.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=4/4
 SRC_URI=https://bitbucket.org/ignitionrobotics/ign-math/get/ignition-math4_4.0.0.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a4ffc806d9d936e843c846383d5fba51
diff --git a/metadata/md5-cache/sci-libs/lemon-1.3-r2 b/metadata/md5-cache/sci-libs/lemon-1.3-r2
deleted file mode 100644
index d11e9f9b3b3c..000000000000
--- a/metadata/md5-cache/sci-libs/lemon-1.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=glpk? ( sci-mathematics/glpk:= ) coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= ) doc? ( app-text/ghostscript-gpl dev-libs/mathjax app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C++ template static library of common data structures and algorithms
-EAPI=5
-HOMEPAGE=https://lemon.cs.elte.hu/trac/lemon/
-IUSE=+coin doc glpk static-libs test tools
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Boost-1.0
-RDEPEND=glpk? ( sci-mathematics/glpk:= ) coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= )
-REQUIRED_USE=|| ( coin glpk )
-SLOT=0
-SRC_URI=http://lemon.cs.elte.hu/pub/sources/lemon-1.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=028babec720eeea031801b4d07c37a53
diff --git a/metadata/md5-cache/sci-libs/lemon-1.3.1 b/metadata/md5-cache/sci-libs/lemon-1.3.1
new file mode 100644
index 000000000000..0d0f91b9d897
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/lemon-1.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= ) glpk? ( sci-mathematics/glpk:= ) doc? ( app-doc/doxygen app-text/ghostscript-gpl dev-libs/mathjax ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=C++ template static library of common data structures and algorithms
+EAPI=6
+HOMEPAGE=https://lemon.cs.elte.hu/trac/lemon/
+IUSE=+coin doc glpk static-libs test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Boost-1.0
+RDEPEND=coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= ) glpk? ( sci-mathematics/glpk:= )
+REQUIRED_USE=|| ( coin glpk )
+SLOT=0
+SRC_URI=https://lemon.cs.elte.hu/pub/sources/lemon-1.3.1.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b7447b16c338ff0283efa33005f253b0
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.0 b/metadata/md5-cache/sci-libs/libsigrok-0.5.0
index e130c92cb461..858f2dac79ed 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.0
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.0
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) 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/pygobject-3.0.0[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(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) test? ( >=dev-libs/check-0.9.4 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.4 ) python? ( dev-python/setuptools[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-lang/swig-3.0.6 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) 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/pygobject-3.0.0[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(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) test? ( >=dev-libs/check-0.9.4 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.4 ) python? ( dev-python/setuptools[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-lang/swig-3.0.6 ) virtual/pkgconfig >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=basic hardware drivers for logic analyzers and input/output file format support
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/Libsigrok
@@ -10,5 +10,5 @@ RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( de
 REQUIRED_USE=java? ( cxx ) python? ( cxx ^^ ( 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/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=270e27c70dd19ef2fc04b00afb07f462
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f8d06030a47ef6e9b77d268641055460
diff --git a/metadata/md5-cache/sci-libs/libsigrok-9999 b/metadata/md5-cache/sci-libs/libsigrok-9999
index dc365d7d0c6e..8154bee69d96 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-9999
+++ b/metadata/md5-cache/sci-libs/libsigrok-9999
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) 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/pygobject-3.0.0[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(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) test? ( >=dev-libs/check-0.9.4 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.4 ) python? ( dev-python/setuptools[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-lang/swig-3.0.6 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<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 postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) 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/pygobject-3.0.0[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(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) test? ( >=dev-libs/check-0.9.4 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.4 ) python? ( dev-python/setuptools[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-lang/swig-3.0.6 ) virtual/pkgconfig >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<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=basic hardware drivers for logic analyzers and input/output file format support
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/Libsigrok
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) 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/pygobject-3.0.0[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(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) 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/pygobject-3.0.0[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(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=java? ( cxx ) python? ( cxx ^^ ( 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/9999
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=94bc109db8785834c100f7df19a03a72
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3bfa8b460f71d1b16a095398cfd7d479
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.2.0_rc1 b/metadata/md5-cache/sci-libs/linux-gpib-4.2.0_rc1
index a0ae54381c17..6f7d6cc048fe 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.2.0_rc1
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.2.0_rc1
@@ -4,10 +4,11 @@ DESCRIPTION=Driver library for GPIB (IEEE 488.2) hardware
 EAPI=6
 HOMEPAGE=https://linux-gpib.sourceforge.io/
 IUSE=pcmcia static guile perl php python tcl doc firmware python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_6(-)?,python_targets_python3_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_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) firmware? ( sys-apps/fxload )
+RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_6(-)?,python_targets_python3_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_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) firmware? ( sys-apps/fxload ) ~sci-libs/linux-gpib-modules-4.2.0_rc1
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-user-4.2.0_rc1.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=87239da7010d71c6f04849b100ca1572
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=f018999386facc3a26142569175eb3ef
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0_rc1 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0_rc1
new file mode 100644
index 000000000000..22a5fc80368b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0_rc1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) >=app-portage/elt-patches-20170815 !<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=Kernel modules for GPIB (IEEE 488.2) hardware
+EAPI=6
+HOMEPAGE=https://linux-gpib.sourceforge.io/
+IUSE=isa pcmcia debug kernel_linux kernel_linux kernel_linux
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=!<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-kernel-4.2.0_rc1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9a37aab2fb7d690eb2b65566ecb741b6
diff --git a/metadata/md5-cache/sci-libs/mumps-5.1.2 b/metadata/md5-cache/sci-libs/mumps-5.1.2
new file mode 100644
index 000000000000..44f6c97e201e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/mumps-5.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/blas metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 ) mpi? ( <sci-libs/parmetis-4 ) ) scotch? ( <sci-libs/scotch-6[mpi=] ) mpi? ( sci-libs/scalapack ) virtual/pkgconfig virtual/fortran
+DESCRIPTION=MUltifrontal Massively Parallel sparse direct matrix Solver
+EAPI=6
+HOMEPAGE=http://mumps.enseeiht.fr/
+IUSE=doc examples metis mpi +scotch static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=public-domain
+RDEPEND=virtual/blas metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 ) mpi? ( <sci-libs/parmetis-4 ) ) scotch? ( <sci-libs/scotch-6[mpi=] ) mpi? ( sci-libs/scalapack ) virtual/fortran
+SLOT=0
+SRC_URI=http://mumps.enseeiht.fr/MUMPS_5.1.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=e6516a05d5267d008235fef40dc46842
diff --git a/metadata/md5-cache/sci-libs/nemesis-5.24 b/metadata/md5-cache/sci-libs/nemesis-5.24
deleted file mode 100644
index 8522e5aa2b8e..000000000000
--- a/metadata/md5-cache/sci-libs/nemesis-5.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/exodusii sci-libs/netcdf sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Enhancement to the EXODUSII finite element database model
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/exodusii/
-IUSE=static-libs test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sci-libs/exodusii sci-libs/netcdf
-SLOT=0
-SRC_URI=mirror://sourceforge/project/exodusii/exodus-5.24.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=44308529c157166c5c0d1d657760c247
diff --git a/metadata/md5-cache/sci-libs/nemesis-6.09 b/metadata/md5-cache/sci-libs/nemesis-6.09
index 4e6fadee5941..85e8ce94a476 100644
--- a/metadata/md5-cache/sci-libs/nemesis-6.09
+++ b/metadata/md5-cache/sci-libs/nemesis-6.09
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sci-libs/exodusii sci-libs/netcdf sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Enhancement to the EXODUSII finite element database model
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/exodusii/
-IUSE=static-libs test
+EAPI=6
+HOMEPAGE=https://github.com/certik/exodus
+IUSE=static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/exodusii sci-libs/netcdf
 SLOT=0
-SRC_URI=mirror://sourceforge/project/exodusii/exodus-6.09.tar.gz
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/exodus-6.09.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d20697b7006ad319a4135f54d734a1ea
+_md5_=01bce87a1cce36410f7a058de0575f8f
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1 b/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1
index 5a5b20787c60..e7133debaec5 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1
+++ b/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Scientific library and interface for array oriented data access
 EAPI=6
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
 IUSE=+dap examples hdf +hdf5 mpi static-libs szip test tools
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=dap? ( net-misc/curl:0= ) hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= ) hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )
 REQUIRED_USE=test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )
 SLOT=0/13
 SRC_URI=https://github.com/Unidata/netcdf-c/archive/v4.6.1.tar.gz -> netcdf-4.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ecbe65a26aa876b1b47931060fcbb5fb
+_md5_=bba7100c04f583ec140d32640831c529
diff --git a/metadata/md5-cache/sci-libs/scalapack-2.0.2 b/metadata/md5-cache/sci-libs/scalapack-2.0.2
deleted file mode 100644
index 374db3ca6974..000000000000
--- a/metadata/md5-cache/sci-libs/scalapack-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/lapack virtual/mpi virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/fortran
-DESCRIPTION=Subset of LAPACK routines redesigned for heterogenous (MPI) computing
-EAPI=5
-HOMEPAGE=http://www.netlib.org/scalapack/
-IUSE=static-libs test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=virtual/lapack virtual/mpi virtual/fortran
-SLOT=0
-SRC_URI=http://www.netlib.org/scalapack//scalapack-2.0.2.tgz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0162bd28f718a1176336c3a4b9c0de5e
diff --git a/metadata/md5-cache/sci-libs/scalapack-2.0.2-r1 b/metadata/md5-cache/sci-libs/scalapack-2.0.2-r1
new file mode 100644
index 000000000000..3219024a6054
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/scalapack-2.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/lapack virtual/mpi virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/fortran
+DESCRIPTION=Subset of LAPACK routines redesigned for heterogenous (MPI) computing
+EAPI=6
+HOMEPAGE=https://www.netlib.org/scalapack/
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=virtual/lapack virtual/mpi virtual/fortran
+SLOT=0
+SRC_URI=https://www.netlib.org/scalapack//scalapack-2.0.2.tgz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=88be3517c2b630b5e460d2a6e6745609
diff --git a/metadata/md5-cache/sci-libs/voro++-0.4.6-r1 b/metadata/md5-cache/sci-libs/voro++-0.4.6-r1
index f603f4443a9a..2cd2d2edd8c3 100644
--- a/metadata/md5-cache/sci-libs/voro++-0.4.6-r1
+++ b/metadata/md5-cache/sci-libs/voro++-0.4.6-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A 3D Voronoi cell software library
-EAPI=5
+EAPI=6
 HOMEPAGE=http://math.lbl.gov/voro++/
 KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://math.lbl.gov/voro++//download/dir/voro++-0.4.6.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bb312956dfb5e88ea622b1fa2c17dfe4
+_md5_=5bed2d96aa498dd80a221d9f87888850
diff --git a/metadata/md5-cache/sci-libs/vtk-6.1.0-r4 b/metadata/md5-cache/sci-libs/vtk-6.1.0-r4
index f881ef14cb29..5e7acb9d83e9 100644
--- a/metadata/md5-cache/sci-libs/vtk-6.1.0-r4
+++ b/metadata/md5-cache/sci-libs/vtk-6.1.0-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=dev-libs/expat dev-libs/jsoncpp dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0 media-libs/mesa media-libs/libtheora media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl >=x11-libs/gl2ps-1.3.8 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( >=dev-libs/boost-1.40.0[mpi?] ) cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jre-1.5:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 python? ( dev-python/autobahn[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/twisted-core[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/zope-interface[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(+)] ) ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-libs/expat dev-libs/jsoncpp dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0 media-libs/mesa media-libs/libtheora media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl >=x11-libs/gl2ps-1.3.8 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( >=dev-libs/boost-1.40.0[mpi?] ) cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jre-1.5:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python? ( dev-python/autobahn[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/twisted-core[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/zope-interface[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(+)] ) ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The Visualization Toolkit
 EAPI=5
 HOMEPAGE=https://www.vtk.org/
 IUSE=all-modules aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt5 rendering smp tbb test theora tk tcl video_cards_nvidia views web xdmf2 R +X elibc_FreeBSD java python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
-RDEPEND=dev-libs/expat dev-libs/jsoncpp dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0 media-libs/mesa media-libs/libtheora media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl >=x11-libs/gl2ps-1.3.8 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( >=dev-libs/boost-1.40.0[mpi?] ) cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jre-1.5:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 python? ( dev-python/autobahn[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/twisted-core[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/zope-interface[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(+)] ) ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=dev-libs/expat dev-libs/jsoncpp dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0 media-libs/mesa media-libs/libtheora media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl >=x11-libs/gl2ps-1.3.8 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( >=dev-libs/boost-1.40.0[mpi?] ) cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jre-1.5:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python? ( dev-python/autobahn[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/twisted-core[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/zope-interface[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(+)] ) ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=all-modules? ( python xdmf2 ) java? ( qt5 ) python? ( python_targets_python2_7 ) tcl? ( rendering ) smp? ( ^^ ( kaapi tbb ) ) test? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.vtk.org/files/release/6.1/VTK-6.1.0.tar.gz doc? ( https://www.vtk.org/files/release/6.1/vtkDocHtml-6.1.0.tar.gz ) test? ( https://www.vtk.org/files/release/6.1/VTKData-6.1.0.tar.gz https://www.vtk.org/files/release/6.1/VTKLargeData-6.1.0.tar.gz )
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ac74e4c339060d531dabfda8ba8d190a
+_md5_=794eb0db61d1ad6fbc83cddd15da5440
diff --git a/metadata/md5-cache/sci-libs/vtk-7.1.0 b/metadata/md5-cache/sci-libs/vtk-7.1.0
index 68309b9a7cba..e4ff8f1cf08e 100644
--- a/metadata/md5-cache/sci-libs/vtk-7.1.0
+++ b/metadata/md5-cache/sci-libs/vtk-7.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/autobahn[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/twisted[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/autobahn[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/twisted[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The Visualization Toolkit
 EAPI=6
 HOMEPAGE=https://www.vtk.org/
 IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt5 rendering tbb test theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java python_targets_python2_7 test
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
-RDEPEND=dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/autobahn[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/twisted[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/autobahn[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/twisted[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( python_targets_python2_7 ) tcl? ( rendering ) test? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.vtk.org/files/release/7.1/VTK-7.1.0.tar.gz doc? ( https://www.vtk.org/files/release/7.1/vtkDocHtml-7.1.0.tar.gz ) test? ( https://www.vtk.org/files/release/7.1/VTKData-7.1.0.tar.gz https://www.vtk.org/files/release/7.1/VTKLargeData-7.1.0.tar.gz )
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=57ef88ce3eaaca72079c90aa63f19a47
+_md5_=194399ac6f7df44da2d95ee53a9be21f
diff --git a/metadata/md5-cache/sci-libs/vtk-8.1.0 b/metadata/md5-cache/sci-libs/vtk-8.1.0
index b4b4110b38ed..bc524db08a25 100644
--- a/metadata/md5-cache/sci-libs/vtk-8.1.0
+++ b/metadata/md5-cache/sci-libs/vtk-8.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[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/constantly[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/hyperlink[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/incremental[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/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[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/txaio[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[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/constantly[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/hyperlink[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/incremental[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/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[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/txaio[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The Visualization Toolkit
 EAPI=6
 HOMEPAGE=https://www.vtk.org/
 IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java python_targets_python2_7 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
-RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[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/constantly[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/hyperlink[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/incremental[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/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[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/txaio[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[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/constantly[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/hyperlink[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/incremental[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/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[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/txaio[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( python_targets_python2_7 ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.vtk.org/files/release/8.1/VTK-8.1.0.tar.gz doc? ( https://www.vtk.org/files/release/8.1/vtkDocHtml-8.1.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.1/VTKData-8.1.0.tar.gz https://www.vtk.org/files/release/8.1/VTKLargeData-8.1.0.tar.gz )
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4fe5c9af0a6fb9712b7c998fd3817f86
+_md5_=2604d0265fff5e35762723bb38a370f8
diff --git a/metadata/md5-cache/sci-libs/vtk-8.1.0-r1 b/metadata/md5-cache/sci-libs/vtk-8.1.0-r1
index a0443539a619..293d6631c27f 100644
--- a/metadata/md5-cache/sci-libs/vtk-8.1.0-r1
+++ b/metadata/md5-cache/sci-libs/vtk-8.1.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[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/constantly[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/hyperlink[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/incremental[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/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[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/txaio[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[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/constantly[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/hyperlink[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/incremental[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/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[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/txaio[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The Visualization Toolkit
 EAPI=6
 HOMEPAGE=https://www.vtk.org/
 IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java python_targets_python2_7 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
-RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[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/constantly[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/hyperlink[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/incremental[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/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[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/txaio[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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-python/sip[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(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[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(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[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/constantly[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/hyperlink[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/incremental[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/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[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/txaio[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/zope-interface[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(+)] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( python_targets_python2_7 ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.vtk.org/files/release/8.1/VTK-8.1.0.tar.gz doc? ( https://www.vtk.org/files/release/8.1/vtkDocHtml-8.1.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.1/VTKData-8.1.0.tar.gz https://www.vtk.org/files/release/8.1/VTKLargeData-8.1.0.tar.gz )
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e28c3b30e36440b32fd9ad59e8d2f4d4
+_md5_=3d05bdc6bb60fd65dee5c3f30e188c9c
diff --git a/metadata/md5-cache/sci-libs/vtk-8.1.0-r2 b/metadata/md5-cache/sci-libs/vtk-8.1.0-r2
index 94a45f9d8157..dcc4bdc2c767 100644
--- a/metadata/md5-cache/sci-libs/vtk-8.1.0-r2
+++ b/metadata/md5-cache/sci-libs/vtk-8.1.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/constantly[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/hyperlink[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/incremental[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/twisted[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/txaio[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/zope-interface[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/constantly[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/hyperlink[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/incremental[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/twisted[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/txaio[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/zope-interface[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The Visualization Toolkit
 EAPI=6
 HOMEPAGE=https://www.vtk.org/
 IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java 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
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
-RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/constantly[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/hyperlink[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/incremental[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/twisted[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/txaio[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/zope-interface[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/constantly[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/hyperlink[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/incremental[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/twisted[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/txaio[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/zope-interface[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) 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 ) ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.vtk.org/files/release/8.1/VTK-8.1.0.tar.gz doc? ( https://www.vtk.org/files/release/8.1/vtkDocHtml-8.1.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.1/VTKData-8.1.0.tar.gz https://www.vtk.org/files/release/8.1/VTKLargeData-8.1.0.tar.gz )
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=77cd62bf882d0fc5836a349cb8f7a602
+_md5_=be84746f8b0547411b6c5ad5917f58dc
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 9b973afbf9bd..e2199763a88e 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/fann-2.2.0-r1 b/metadata/md5-cache/sci-mathematics/fann-2.2.0-r1
index 5056c8a7ea26..ed3785d4d722 100644
--- a/metadata/md5-cache/sci-mathematics/fann-2.2.0-r1
+++ b/metadata/md5-cache/sci-mathematics/fann-2.2.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/fann/FANN-2.2.0-Source.zip
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=473a5c96f452ef9896bca1cfa77731d2
diff --git a/metadata/md5-cache/sci-mathematics/fann-9999 b/metadata/md5-cache/sci-mathematics/fann-9999
index edfc2d2504f5..c0ebedf2f5c7 100644
--- a/metadata/md5-cache/sci-mathematics/fann-9999
+++ b/metadata/md5-cache/sci-mathematics/fann-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leenissen.dk/fann/
 IUSE=examples abi_x86_32 abi_x86_64 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=LGPL-2.1
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=284f6911c56975fb246ad0e9db697d2d
diff --git a/metadata/md5-cache/sci-mathematics/kodkod-1.5.2-r1 b/metadata/md5-cache/sci-mathematics/kodkod-1.5.2-r1
index 92efc5c459f7..aee69a8ec740 100644
--- a/metadata/md5-cache/sci-mathematics/kodkod-1.5.2-r1
+++ b/metadata/md5-cache/sci-mathematics/kodkod-1.5.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/1.5.2
 SRC_URI=http://alloy.mit.edu/kodkod/1.5.2/kodkod-1.5.2.zip https://waf.googlecode.com/files/waf-1.7.16
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=9b8110f4fce3531692000c0c4293e5da
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.42.0 b/metadata/md5-cache/sci-mathematics/maxima-5.42.0
deleted file mode 100644
index 62170ccce0e0..000000000000
--- a/metadata/md5-cache/sci-mathematics/maxima-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) ) sys-apps/texinfo >=app-portage/elt-patches-20170815 !<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=Free computer algebra environment based on Macsyma
-EAPI=6
-HOMEPAGE=http://maxima.sourceforge.net/
-IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp l10n_de l10n_es l10n_pt l10n_pt-BR
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2 GPL-2+
-RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/maxima/maxima-5.42.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5c53964ae1e83ddae0fb3dfbf9182dc1
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.42.1 b/metadata/md5-cache/sci-mathematics/maxima-5.42.1
new file mode 100644
index 000000000000..53acc893fdf4
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.42.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) ) sys-apps/texinfo >=app-portage/elt-patches-20170815 !<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=Free computer algebra environment based on Macsyma
+EAPI=6
+HOMEPAGE=http://maxima.sourceforge.net/
+IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp l10n_de l10n_es l10n_pt l10n_pt-BR
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2 GPL-2+
+RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/maxima/maxima-5.42.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5c53964ae1e83ddae0fb3dfbf9182dc1
diff --git a/metadata/md5-cache/sci-mathematics/pymc3-3.1 b/metadata/md5-cache/sci-mathematics/pymc3-3.1
index 525f0a5f3400..55d4cb944ddd 100644
--- a/metadata/md5-cache/sci-mathematics/pymc3-3.1
+++ b/metadata/md5-cache/sci-mathematics/pymc3-3.1
@@ -1,14 +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(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/CommonMark-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),lapack] >=dev-python/matplotlib-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pandas-0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/patsy-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/recommonmark-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/theano-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/tqdm-4.8.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(-)] >=sci-libs/scipy-0.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/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/nose-parameterized[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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 )
+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/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/commonmark-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),lapack] >=dev-python/matplotlib-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pandas-0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/patsy-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/recommonmark-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/theano-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/tqdm-4.8.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(-)] >=sci-libs/scipy-0.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/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/nose-parameterized[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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 )
 DESCRIPTION=Bayesian Modeling and Probabilistic Machine Learning in Python
 EAPI=6
 HOMEPAGE=http://pymc-devs.github.io/pymc3/
 IUSE=test 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=AFL-3.0
-RDEPEND=<=dev-python/CommonMark-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),lapack] >=dev-python/matplotlib-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pandas-0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/patsy-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/recommonmark-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/theano-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/tqdm-4.8.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(-)] >=sci-libs/scipy-0.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=<=dev-python/commonmark-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),lapack] >=dev-python/matplotlib-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pandas-0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/patsy-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/recommonmark-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/theano-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/tqdm-4.8.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(-)] >=sci-libs/scipy-0.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pymc3/pymc3-3.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=35e25b767b0fcd583ab7317a60317b22
+_md5_=c44fe95242d68c4098d8ff68ac526560
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.7.0 b/metadata/md5-cache/sci-mathematics/rkward-0.7.0
index 193060ff8cd7..3942e5e9357e 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.7.0
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.7.0
@@ -1,13 +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/kdewebkit-5.46.0:5 >=kde-frameworks/ki18n-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/kparts-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/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/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-lang/R 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.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
+DEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-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 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-lang/R 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=IDE for the R-project
 EAPI=6
 HOMEPAGE=https://rkward.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ 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/kcrash-5.46.0:5 >=kde-frameworks/kdewebkit-5.46.0:5 >=kde-frameworks/ki18n-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/kparts-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/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/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-lang/R virtual/libintl !sci-mathematics/rkward:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/ktexteditor-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-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 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-lang/R virtual/libintl !sci-mathematics/rkward:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rkward/0.7.0/src/rkward-0.7.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c96ac8a55e0111a22a3d6aab793202f4
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index f5b6cfdb8a97..1176c6215044 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/hepmc-2.06.09-r1 b/metadata/md5-cache/sci-physics/hepmc-2.06.09-r1
index b0b18ddc3376..15f209c737fe 100644
--- a/metadata/md5-cache/sci-physics/hepmc-2.06.09-r1
+++ b/metadata/md5-cache/sci-physics/hepmc-2.06.09-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=doc? ( app-doc/doxygen || ( dev-texlive/texlive-latex dev-tex/floatflt ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Event Record for Monte Carlo Generators
-EAPI=5
-HOMEPAGE=http://lcgapp.cern.ch/project/simu/HepMC/
+EAPI=6
+HOMEPAGE=https://hepmc.web.cern.ch/hepmc/
 IUSE=cm doc examples gev static-libs test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-2.06.09.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=19b67597330912fd7e8ed6a289dd9dc5
+_md5_=b80a8849a7c17817458185dd89885138
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 604c7e602230..a257e20a26b9 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/labplot-2.5.0 b/metadata/md5-cache/sci-visualization/labplot-2.5.0
deleted file mode 100644
index 3e91ddc60584..000000000000
--- a/metadata/md5-cache/sci-visualization/labplot-2.5.0
+++ /dev/null
@@ -1,12 +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/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/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-17.12.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) sys-devel/bison sys-devel/gettext 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 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=Scientific data analysis and visualisation based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/labplot/
-IUSE=cantor fftw fits hdf5 libcerf netcdf debug +handbook test
-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/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/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-17.12.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot:4 >=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/labplot/2.5.0/labplot-2.5.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e3604f1d5c793d6b905604f2ba82ee66
diff --git a/metadata/md5-cache/sci-visualization/labplot-2.5.0-r1 b/metadata/md5-cache/sci-visualization/labplot-2.5.0-r1
new file mode 100644
index 000000000000..5245955e6f1d
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/labplot-2.5.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=dev-qt/qtconcurrent-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/qtserialport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-18.04.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) sys-devel/bison sys-devel/gettext 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.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=Scientific data analysis and visualisation based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/labplot/
+IUSE=cantor fftw fits hdf5 libcerf netcdf debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=dev-qt/qtconcurrent-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/qtserialport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-18.04.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/labplot/2.5.0/labplot-2.5.0.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b29d3ef59099bb97dc50cc2a917806cd
diff --git a/metadata/md5-cache/sci-visualization/labplot-9999 b/metadata/md5-cache/sci-visualization/labplot-9999
index b62f1162261b..a29e4aa7bffa 100644
--- a/metadata/md5-cache/sci-visualization/labplot-9999
+++ b/metadata/md5-cache/sci-visualization/labplot-9999
@@ -1,11 +1,11 @@
 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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-apps/cantor-17.12.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 sys-libs/zlib ) sys-devel/bison sys-devel/gettext 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 >=dev-vcs/git-1.8.2.1[curl] >=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
+DEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=dev-qt/qtconcurrent-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/qtserialport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-apps/cantor-18.04.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 sys-libs/zlib ) sys-devel/bison sys-devel/gettext 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 >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils
 DESCRIPTION=Scientific data analysis and visualisation based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/education/labplot/
 IUSE=cantor fftw fits hdf5 libcerf netcdf root debug +handbook test
 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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-apps/cantor-17.12.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 sys-libs/zlib ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kcompletion-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/knewstuff-5.50.0:5 >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/syntax-highlighting-5.50.0:5 >=dev-qt/qtconcurrent-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/qtserialport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-apps/cantor-18.04.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 sys-libs/zlib ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cd2f3d3bf3c67bc0551b769badd42783
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a7778dc20f820c16b5fe50b05e19dd65
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index ee9ef4c6219a..b1a446e6c772 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/accountsservice-0.6.50-r1 b/metadata/md5-cache/sys-apps/accountsservice-0.6.50-r1
index af38f9c854a4..2c2de2cef230 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.50-r1
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.50-r1
@@ -4,11 +4,11 @@ DESCRIPTION=D-Bus interfaces for querying and manipulating user account informat
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/AccountsService/
 IUSE=doc elogind +introspection selinux systemd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44:2 sys-auth/polkit elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) !systemd? ( !elogind? ( sys-auth/consolekit ) ) selinux? ( sec-policy/selinux-accountsd )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.50.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a46e30940c97e205b7dc365cb6f67d9d
+_md5_=08b052797a04539ab788f475bb66b049
diff --git a/metadata/md5-cache/sys-apps/bubblewrap-0.3.1 b/metadata/md5-cache/sys-apps/bubblewrap-0.3.1
new file mode 100644
index 000000000000..f3832ee2013e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.3.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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 prepare setup
+DEPEND=dev-libs/libxslt sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
+DESCRIPTION=Unprivileged sandboxing tool, namespaces-powered chroot-like solution
+EAPI=7
+HOMEPAGE=https://github.com/projectatomic/bubblewrap
+IUSE=selinux kernel_linux
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libxslt sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
+SLOT=0
+SRC_URI=https://github.com/projectatomic/bubblewrap/archive/v0.3.1.tar.gz -> bubblewrap-0.3.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d53ddc89627e1a66dc889f65225ba879
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-16 b/metadata/md5-cache/sys-apps/dbus-broker-16
new file mode 100644
index 000000000000..9159ab11d8de
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dbus-broker-16
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) doc? ( dev-python/docutils ) launcher? ( >=sys-apps/dbus-1.10 >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux ) dev-python/docutils virtual/pkgconfig
+DESCRIPTION=Linux D-Bus Message Broker
+EAPI=7
+HOMEPAGE=https://github.com/bus1/dbus-broker/wiki
+IUSE=audit doc +launcher selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) doc? ( dev-python/docutils ) launcher? ( >=sys-apps/dbus-1.10 >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=https://github.com/bus1/dbus-broker/archive/v16/dbus-broker-16.tar.gz https://github.com/c-util/c-dvar/archive/9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46/c-dvar-9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46.tar.gz https://github.com/c-util/c-list/archive/dda36d30c7d655b4d61358519168fa7ce0e9dae9/c-list-dda36d30c7d655b4d61358519168fa7ce0e9dae9.tar.gz https://github.com/c-util/c-rbtree/archive/bf627e0c32241915108f66ad9738444e4d045b45/c-rbtree-bf627e0c32241915108f66ad9738444e4d045b45.tar.gz https://github.com/c-util/c-sundry/archive/50c8ccf01b39b3f11e59c69d1cafea5bef5a9769/c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz https://github.com/c-util/c-utf8/archive/b245df543717ee19ad398f8139447e3807c11c96/c-utf8-b245df543717ee19ad398f8139447e3807c11c96.tar.gz
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=bfd4eacb2aad9b51dc6f05b09cd1d63a
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-9999 b/metadata/md5-cache/sys-apps/dbus-broker-9999
index 32727bd51a36..b095702a97ac 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-9999
+++ b/metadata/md5-cache/sys-apps/dbus-broker-9999
@@ -1,11 +1,12 @@
+BDEPEND=>=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) doc? ( dev-python/docutils ) launcher? ( >=sys-apps/dbus-1.10 >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux ) dev-python/docutils virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) doc? ( dev-python/docutils ) launcher? ( >=sys-apps/dbus-1.10 >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux ) dev-python/docutils virtual/pkgconfig
 DESCRIPTION=Linux D-Bus Message Broker
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/bus1/dbus-broker/wiki
 IUSE=audit doc +launcher selinux
 LICENSE=Apache-2.0
 RDEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) doc? ( dev-python/docutils ) launcher? ( >=sys-apps/dbus-1.10 >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux )
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0c40f1f312a00486ef1ec0cdf9d8d35b
+_md5_=bfd4eacb2aad9b51dc6f05b09cd1d63a
diff --git a/metadata/md5-cache/sys-apps/dstat-0.7.3 b/metadata/md5-cache/sys-apps/dstat-0.7.3
index 9f135a88050d..f79a052602d8 100644
--- a/metadata/md5-cache/sys-apps/dstat-0.7.3
+++ b/metadata/md5-cache/sys-apps/dstat-0.7.3
@@ -10,4 +10,4 @@ REQUIRED_USE=wifi? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://github.com/dagwieers/dstat/archive/0.7.3.tar.gz -> dstat-0.7.3.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=45581a4aa2befa2619893755e1ef2426
+_md5_=c29586aada0d1e74ba986d7154883ba1
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.8 b/metadata/md5-cache/sys-apps/etckeeper-1.18.8
new file mode 100644
index 000000000000..a85addaa2f2d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-util/bats )
+DESCRIPTION=A collection of tools to let /etc be stored in a repository
+EAPI=6
+HOMEPAGE=https://etckeeper.branchable.com/
+IUSE=bazaar cron test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-portage/portage-utils cron? ( virtual/cron ) bazaar? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !bazaar? ( || ( dev-vcs/git dev-vcs/mercurial dev-vcs/darcs ) )
+REQUIRED_USE=bazaar? ( || ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.8.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=fc79107540c5e19d944759e78b76752c
diff --git a/metadata/md5-cache/sys-apps/ethq-0.5.0 b/metadata/md5-cache/sys-apps/ethq-0.5.0
new file mode 100644
index 000000000000..3f5f3d987565
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ethq-0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=sys-libs/ncurses:0
+DESCRIPTION=Ethernet NIC Queue stats viewer
+EAPI=7
+HOMEPAGE=https://github.com/isc-projects/ethq
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=https://github.com/isc-projects/ethq/archive/v0_5_0.tar.gz -> ethq-0_5_0.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=86a15b7f328800baf64f72e243a5b701
diff --git a/metadata/md5-cache/sys-apps/ethq-9999 b/metadata/md5-cache/sys-apps/ethq-9999
new file mode 100644
index 000000000000..bd8d25d14dfd
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ethq-9999
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=sys-libs/ncurses:0
+DESCRIPTION=Ethernet NIC Queue stats viewer
+EAPI=7
+HOMEPAGE=https://github.com/isc-projects/ethq
+IUSE=test
+LICENSE=MPL-2.0
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c7af9fbbbf41de8e7714ef8b78e2e67a
diff --git a/metadata/md5-cache/sys-apps/exa-0.8.0 b/metadata/md5-cache/sys-apps/exa-0.8.0
index 2bf00e10c407..80f415bb7bca 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
+DEPEND=>=virtual/rust-1.17 virtual/cargo
 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	47a7402d95930413ce25ba8d857339bb	cargo	da08619f6c16047185d20223904c8aef	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8ed9a2b34b7e1df772ae393a9f6d65fc
diff --git a/metadata/md5-cache/sys-apps/fakechroot-2.19 b/metadata/md5-cache/sys-apps/fakechroot-2.19
index ddd520991475..d8536043eb58 100644
--- a/metadata/md5-cache/sys-apps/fakechroot-2.19
+++ b/metadata/md5-cache/sys-apps/fakechroot-2.19
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Provide a faked chroot environment without requiring root privileges
 EAPI=7
 HOMEPAGE=http://fakechroot.alioth.debian.org/
-KEYWORDS=amd64 ~arm arm64 ~ia64 ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakechroot/fakechroot_2.19.orig.tar.gz
-_md5_=53a53f823ccc5fdd84f63eaa1eaced94
+_md5_=c862e4431880eee95f040755b6b922ad
diff --git a/metadata/md5-cache/sys-apps/fd-7.0.0 b/metadata/md5-cache/sys-apps/fd-7.0.0
index 7f0f54e89bb0..c554e9462993 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
+DEPEND=>=virtual/rust-1.20.0 virtual/cargo
 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	47a7402d95930413ce25ba8d857339bb	cargo	da08619f6c16047185d20223904c8aef	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7a00dea14b2d62370fb0bae87256fb3a
diff --git a/metadata/md5-cache/sys-apps/fd-7.1.0 b/metadata/md5-cache/sys-apps/fd-7.1.0
index 0c050b07d8b8..9fe3d48fa23d 100644
--- a/metadata/md5-cache/sys-apps/fd-7.1.0
+++ b/metadata/md5-cache/sys-apps/fd-7.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=virtual/rust-1.20.0
+DEPEND=>=virtual/rust-1.20.0 virtual/cargo
 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.1.0.tar.gz -> fd-7.1.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/bitflags/1.0.3/download -> bitflags-1.0.3.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.5/download -> cfg-if-0.1.5.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/ctrlc/3.1.1/download -> ctrlc-3.1.1.crate https://crates.io/api/v1/crates/diff/0.1.11/download -> diff-0.1.11.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.4.1/download -> globset-0.4.1.crate https://crates.io/api/v1/crates/ignore/0.4.3/download -> ignore-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/1.1.0/download -> lazy_static-1.1.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/log/0.4.4/download -> log-0.4.4.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.11.0/download -> nix-0.11.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.3/download -> rand-0.4.3.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/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.7/download -> tempdir-0.3.7.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.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.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-width/0.1.5/download -> unicode-width-0.1.5.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.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.4/download -> version_check-0.1.4.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.2.0/download -> walkdir-2.2.0.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
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	da08619f6c16047185d20223904c8aef	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=9abb2ea60cf399985e9f592dc60641ca
diff --git a/metadata/md5-cache/sys-apps/file-5.35 b/metadata/md5-cache/sys-apps/file-5.35
new file mode 100644
index 000000000000..bbd57c10354e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/file-5.35
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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-python/setuptools[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(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815
+DESCRIPTION=identify a file's format by scanning binary data for patterns
+EAPI=6
+HOMEPAGE=https://www.darwinsys.com/file/
+IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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-python/setuptools[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(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
+REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=ftp://ftp.astron.com/pub/file/file-5.35.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0b9e2602f546c8c87c1cf5664f08d08d
diff --git a/metadata/md5-cache/sys-apps/findutils-4.6.0-r1 b/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
index 4931f40097cb..e697e48032c4 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
+++ b/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
@@ -10,4 +10,4 @@ RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=789fe2c1161d65836649ec7f081634ba
+_md5_=dd8e0148a0666eaca297e19000d23074
diff --git a/metadata/md5-cache/sys-apps/firejail-0.9.56 b/metadata/md5-cache/sys-apps/firejail-0.9.56
new file mode 100644
index 000000000000..085464812dbd
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.56
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor )
+DESCRIPTION=Security sandbox for any type of processes
+EAPI=6
+HOMEPAGE=https://firejail.wordpress.com/
+IUSE=apparmor +chroot contrib +file-transfer +network +seccomp suid +userns x11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) x11? ( x11-wm/xpra[client,server] )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/firejail/firejail-0.9.56.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=805f51f246af7c3937061110e43cedca
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.1.1-r1 b/metadata/md5-cache/sys-apps/fwupd-1.1.1-r1
deleted file mode 100644
index c749f5ea929f..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[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[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(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo ) app-arch/gcab app-arch/libarchive >=dev-util/meson-0.41.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] )
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=6
-HOMEPAGE=https://fwupd.org
-IUSE=colorhug dell doc +gpg +man pkcs7 redfish systemd test thunderbolt uefi 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+
-PDEPEND=sys-apps/dbus
-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 ) >=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(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[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[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(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
-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 ) dell? ( uefi )
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.1.1.tar.gz -> fwupd-1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=452c7fd9a983363ca9028fe4699a2632
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.1.3 b/metadata/md5-cache/sys-apps/fwupd-1.1.3
new file mode 100644
index 000000000000..3efa8f62daaf
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.1.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=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(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[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(+)?] dev-python/pycairo[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(+)?] dev-python/pygobject:3[cairo,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(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo ) app-arch/gcab app-arch/libarchive >=dev-util/meson-0.41.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) nvme? ( >=sys-kernel/linux-headers-4.4 ) test? ( net-libs/gnutls[tools] )
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=6
+HOMEPAGE=https://fwupd.org
+IUSE=colorhug dell doc +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi 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 ~x86
+LICENSE=GPL-2+
+PDEPEND=sys-apps/dbus
+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(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[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(+)?] dev-python/pycairo[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(+)?] dev-python/pygobject:3[cairo,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(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
+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 ) dell? ( uefi )
+SLOT=0
+SRC_URI=https://github.com/hughsie/fwupd/archive/1.1.3.tar.gz -> fwupd-1.1.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=011c521438e9b96691547929ff6c8954
diff --git a/metadata/md5-cache/sys-apps/grep-3.1 b/metadata/md5-cache/sys-apps/grep-3.1
index bc1ecaf72f1a..0f17a3759d25 100644
--- a/metadata/md5-cache/sys-apps/grep-3.1
+++ b/metadata/md5-cache/sys-apps/grep-3.1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU regular expression matcher
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/grep/
 IUSE=nls pcre 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.1.tar.xz mirror://gentoo/grep-3.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1c596bd9a0faee48fa81cca78d5dcaa
+_md5_=57c552929bf43436670f55d7db9f9723
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.51 b/metadata/md5-cache/sys-apps/hdparm-9.51
deleted file mode 100644
index 6dc147b0ccc6..000000000000
--- a/metadata/md5-cache/sys-apps/hdparm-9.51
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Utility to change hard drive performance parameters
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/hdparm/
-IUSE=static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/hdparm/hdparm-9.51.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c40fec291283edecbdebd597dc10a460
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.55 b/metadata/md5-cache/sys-apps/hdparm-9.55
deleted file mode 100644
index 173c01cfa785..000000000000
--- a/metadata/md5-cache/sys-apps/hdparm-9.55
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Utility to change hard drive performance parameters
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/hdparm/
-IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/hdparm/hdparm-9.55.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d58788a7d340e2608b2fc00dccf751df
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.56 b/metadata/md5-cache/sys-apps/hdparm-9.56
index 8925990f9bba..093e777660f6 100644
--- a/metadata/md5-cache/sys-apps/hdparm-9.56
+++ b/metadata/md5-cache/sys-apps/hdparm-9.56
@@ -3,9 +3,9 @@ DESCRIPTION=Utility to change hard drive performance parameters
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/hdparm/
 IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hdparm/hdparm-9.56.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d58788a7d340e2608b2fc00dccf751df
+_md5_=2e07517fa89628bd7dd19a0e476d0cd9
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.57 b/metadata/md5-cache/sys-apps/hdparm-9.57
new file mode 100644
index 000000000000..1698dd1c458b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hdparm-9.57
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Utility to change hard drive performance parameters
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/hdparm/
+IUSE=static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/hdparm/hdparm-9.57.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0c1f46e002f318f4a1628fdd4e9e62d7
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.4 b/metadata/md5-cache/sys-apps/help2man-1.47.4
deleted file mode 100644
index fecede164270..000000000000
--- a/metadata/md5-cache/sys-apps/help2man-1.47.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
-DESCRIPTION=GNU utility to convert program --help output to a man page
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/help2man/
-IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
-SLOT=0
-SRC_URI=mirror://gnu/help2man/help2man-1.47.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4015485180736f9e9d79caa3947c7cee
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.6 b/metadata/md5-cache/sys-apps/help2man-1.47.6
index 88c471586f37..73ca911407cf 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.47.6
+++ b/metadata/md5-cache/sys-apps/help2man-1.47.6
@@ -4,9 +4,9 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/help2man/
 IUSE=nls
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.47.6.tar.xz
-_md5_=d9de3f2b16b2072305bc6635c7dfd62c
+_md5_=5f8d880cfabb14ded8f0ae242a555746
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.8 b/metadata/md5-cache/sys-apps/help2man-1.47.8
new file mode 100644
index 000000000000..9bf14b382c4b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/help2man-1.47.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
+DESCRIPTION=GNU utility to convert program --help output to a man page
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/help2man/
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
+SLOT=0
+SRC_URI=mirror://gnu/help2man/help2man-1.47.8.tar.xz
+_md5_=d449a7a6362b8ff00d319b56903ff0c9
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.11.10 b/metadata/md5-cache/sys-apps/hwloc-1.11.10
index ce7989d6125e..726381f945c2 100644
--- a/metadata/md5-cache/sys-apps/hwloc-1.11.10
+++ b/metadata/md5-cache/sys-apps/hwloc-1.11.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] ) >=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815 !<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-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] ) >=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815 !<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=displays the hardware topology in convenient formats
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
 IUSE=cairo cuda debug gl +numa +pci plugins svg static-libs xml X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] )
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/5
 SRC_URI=http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.10.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1688d06a99eeaf7a02d664a70d4e8592
+_md5_=f3ba9bdea64317d83aa566924e21567b
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.11.11 b/metadata/md5-cache/sys-apps/hwloc-1.11.11
index 016eb2697140..448650f068c9 100644
--- a/metadata/md5-cache/sys-apps/hwloc-1.11.11
+++ b/metadata/md5-cache/sys-apps/hwloc-1.11.11
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] ) >=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815 !<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-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] ) >=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815 !<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=displays the hardware topology in convenient formats
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
 IUSE=cairo cuda debug gl +numa +pci plugins svg static-libs xml X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] )
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/5
 SRC_URI=http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.11.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0b00faa18bbccaf26f67dc3928b95f81
+_md5_=5e348ff6d18bbc3257599289bba26588
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.11.2-r1 b/metadata/md5-cache/sys-apps/hwloc-1.11.2-r1
index b7e457125cff..15d24f088a01 100644
--- a/metadata/md5-cache/sys-apps/hwloc-1.11.2-r1
+++ b/metadata/md5-cache/sys-apps/hwloc-1.11.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] ) >=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815
+DEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] ) >=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815
 DESCRIPTION=displays the hardware topology in convenient formats
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
 IUSE=cairo cuda debug gl +numa +pci plugins svg static-libs xml X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] )
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/5
 SRC_URI=http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.2.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3a08589ef40813b4db596752b90480d1
+_md5_=b980486fb81aa971f728a841c7e51c63
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.11.7 b/metadata/md5-cache/sys-apps/hwloc-1.11.7
index 1cc577bc1809..71a52bd90501 100644
--- a/metadata/md5-cache/sys-apps/hwloc-1.11.7
+++ b/metadata/md5-cache/sys-apps/hwloc-1.11.7
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] ) >=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815 !<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-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] ) >=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815 !<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=displays the hardware topology in convenient formats
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
 IUSE=cairo cuda debug gl +numa +pci plugins svg static-libs xml X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] )
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/5
 SRC_URI=http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.7.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0f36e7f245b9a0fc83b21aead8114637
+_md5_=937c752f5e356c849709bd703670735b
diff --git a/metadata/md5-cache/sys-apps/hwloc-2.0.2 b/metadata/md5-cache/sys-apps/hwloc-2.0.2
index 38b9311c82a9..87cb7e115262 100644
--- a/metadata/md5-cache/sys-apps/hwloc-2.0.2
+++ b/metadata/md5-cache/sys-apps/hwloc-2.0.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] ) >=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815 !<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-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] ) >=virtual/pkgconfig-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(-)?] >=app-portage/elt-patches-20170815 !<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=displays the hardware topology in convenient formats
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
 IUSE=cairo cuda debug gl +numa +pci plugins svg static-libs xml X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=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(-)?] )
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( 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(-)?] ) numa? ( >=sys-process/numactl-2.0.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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/5
 SRC_URI=http://www.open-mpi.org/software/hwloc/v2.0/downloads/hwloc-2.0.2.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0b00faa18bbccaf26f67dc3928b95f81
+_md5_=5e348ff6d18bbc3257599289bba26588
diff --git a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923 b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923
index c21114a55dae..dc1f3cf4553a 100644
--- a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923
+++ b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware Monitoring user-space utilities
 EAPI=6
 HOMEPAGE=https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors
 IUSE=contrib sensord static-libs 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1
 RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.21.7
 SLOT=0/4.4.0
 SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/807f9b1529892c0ac89bca0c7ae781c59f9c8393.tar.gz -> lm_sensors-3.4.0_p20180923.tar.gz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=abba13c0f31a832cb701ec23e9b59785
+_md5_=b56ecda73d99267196c3867984626606
diff --git a/metadata/md5-cache/sys-apps/lsb-release-1.4-r3 b/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
index db53ca7b18a1..5eccaa3135b0 100644
--- a/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
+++ b/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=LSB version query program
 EAPI=5
 HOMEPAGE=https://wiki.linuxfoundation.org/lsb/
-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=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lsb/lsb-release-1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a8d57f2fd3ec11aca204964b4369b29a
+_md5_=e541180de4c4d9f5ca679d4877df3340
diff --git a/metadata/md5-cache/sys-apps/openrc-0.38.2 b/metadata/md5-cache/sys-apps/openrc-0.38.2
index e502098f5e3e..2d8fa0cee751 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.38.2
+++ b/metadata/md5-cache/sys-apps/openrc-0.38.2
@@ -4,11 +4,11 @@ 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
+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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=673edd79995ef47091b6692a7bfea063
+_md5_=427f8af1493cc9c780b86e0539b8d1c0
diff --git a/metadata/md5-cache/sys-apps/openrc-0.38.3 b/metadata/md5-cache/sys-apps/openrc-0.38.3
new file mode 100644
index 000000000000..8c4e1ba5fbaa
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.38.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=6
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.38.3.tar.gz -> openrc-0.38.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=427f8af1493cc9c780b86e0539b8d1c0
diff --git a/metadata/md5-cache/sys-apps/pacman-5.0.2-r1 b/metadata/md5-cache/sys-apps/pacman-5.0.2-r1
deleted file mode 100644
index 22fdfe0ffc11..000000000000
--- a/metadata/md5-cache/sys-apps/pacman-5.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=app-arch/libarchive:=[lzma] gpg? ( >=app-crypt/gpgme-1.4.0:= ) dev-libs/openssl:0= curl? ( net-misc/curl ) virtual/libiconv virtual/libintl app-text/asciidoc doc? ( app-doc/doxygen ) test? ( sys-apps/fakeroot sys-apps/fakechroot ) >=app-portage/elt-patches-20170815 !<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=Archlinux's binary package manager
-EAPI=6
-HOMEPAGE=https://archlinux.org/pacman/
-IUSE=curl debug doc +gpg test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-arch/libarchive:=[lzma] gpg? ( >=app-crypt/gpgme-1.4.0:= ) dev-libs/openssl:0= curl? ( net-misc/curl ) virtual/libiconv virtual/libintl
-RESTRICT=test
-SLOT=0/10
-SRC_URI=https://sources.archlinux.org/other/pacman/pacman-5.0.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=54394dacecf31b89e9c2dba4b6adc815
diff --git a/metadata/md5-cache/sys-apps/pacman-5.0.2-r2 b/metadata/md5-cache/sys-apps/pacman-5.0.2-r2
new file mode 100644
index 000000000000..340fdf7b75ed
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pacman-5.0.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=compile configure install postinst prepare
+DEPEND=app-arch/libarchive:=[lzma] gpg? ( >=app-crypt/gpgme-1.4.0:= ) curl? ( net-misc/curl ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/libiconv virtual/libintl app-text/asciidoc doc? ( app-doc/doxygen ) test? ( sys-apps/fakeroot sys-apps/fakechroot )
+DESCRIPTION=Archlinux's binary package manager
+EAPI=7
+HOMEPAGE=https://archlinux.org/pacman/
+IUSE=curl debug doc +gpg libressl test
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2
+RDEPEND=app-arch/libarchive:=[lzma] gpg? ( >=app-crypt/gpgme-1.4.0:= ) curl? ( net-misc/curl ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/libiconv virtual/libintl
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://sources.archlinux.org/other/pacman/pacman-5.0.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6ea8e5c540fae972b76f92067eaa889b
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.49 b/metadata/md5-cache/sys-apps/portage-2.3.49
index 439c5b5a7b1b..e30d47d8f9dc 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.49
+++ b/metadata/md5-cache/sys-apps/portage-2.3.49
@@ -4,7 +4,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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-14[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-20180706 >=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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.49.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.49.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eecc33fe059f1622bebeb509034e39f1
+_md5_=9eda1b80ed7796172fcc8721e233558a
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.51 b/metadata/md5-cache/sys-apps/portage-2.3.51
new file mode 100644
index 000000000000..118740f5dbd0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.51
@@ -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-14[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-20180706 >=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.51.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.51.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=03e1e1a59c19d9ba25098df427f9e752
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1 b/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
index f3b26794588c..9519bb6ee34b 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
+++ b/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=pcre? ( dev-libs/libpcre2 ) virtual/pkgconfig >=virtual/rust-1.20 man? ( app-text/asciidoc )
+DEPEND=pcre? ( dev-libs/libpcre2 ) virtual/pkgconfig >=virtual/rust-1.20 man? ( app-text/asciidoc ) virtual/cargo
 DESCRIPTION=a search tool that combines the usability of ag with the raw speed of grep
 EAPI=6
 HOMEPAGE=https://github.com/BurntSushi/ripgrep
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.8/download -> aho-corasick-0.6.8.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.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/base64/0.9.2/download -> base64-0.9.2.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/bytecount/0.3.2/download -> bytecount-0.3.2.crate https://crates.io/api/v1/crates/byteorder/1.2.6/download -> byteorder-1.2.6.crate https://crates.io/api/v1/crates/cc/1.0.24/download -> cc-1.0.24.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.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/crossbeam-channel/0.2.4/download -> crossbeam-channel-0.2.4.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.5.2/download -> crossbeam-epoch-0.5.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.5.0/download -> crossbeam-utils-0.5.0.crate https://crates.io/api/v1/crates/encoding_rs/0.8.6/download -> encoding_rs-0.8.6.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.2/download -> encoding_rs_io-0.1.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.4.2/download -> globset-0.4.2.crate https://crates.io/api/v1/crates/grep/0.2.2/download -> grep-0.2.2.crate https://crates.io/api/v1/crates/grep-cli/0.1.1/download -> grep-cli-0.1.1.crate https://crates.io/api/v1/crates/grep-matcher/0.1.1/download -> grep-matcher-0.1.1.crate https://crates.io/api/v1/crates/grep-pcre2/0.1.1/download -> grep-pcre2-0.1.1.crate https://crates.io/api/v1/crates/grep-printer/0.1.1/download -> grep-printer-0.1.1.crate https://crates.io/api/v1/crates/grep-regex/0.1.1/download -> grep-regex-0.1.1.crate https://crates.io/api/v1/crates/grep-searcher/0.1.1/download -> grep-searcher-0.1.1.crate https://crates.io/api/v1/crates/ignore/0.4.4/download -> ignore-0.4.4.crate https://crates.io/api/v1/crates/itoa/0.4.2/download -> itoa-0.4.2.crate https://crates.io/api/v1/crates/lazy_static/1.1.0/download -> lazy_static-1.1.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/lock_api/0.1.3/download -> lock_api-0.1.3.crate https://crates.io/api/v1/crates/log/0.4.5/download -> log-0.4.5.crate https://crates.io/api/v1/crates/memchr/2.0.2/download -> memchr-2.0.2.crate https://crates.io/api/v1/crates/memmap/0.6.2/download -> memmap-0.6.2.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.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/owning_ref/0.3.3/download -> owning_ref-0.3.3.crate https://crates.io/api/v1/crates/parking_lot/0.6.4/download -> parking_lot-0.6.4.crate https://crates.io/api/v1/crates/parking_lot_core/0.3.0/download -> parking_lot_core-0.3.0.crate https://crates.io/api/v1/crates/pcre2/0.1.0/download -> pcre2-0.1.0.crate https://crates.io/api/v1/crates/pcre2-sys/0.1.1/download -> pcre2-sys-0.1.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/proc-macro2/0.4.18/download -> proc-macro2-0.4.18.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.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.5/download -> regex-1.0.5.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.10.0/download -> ripgrep-0.10.0.crate https://crates.io/api/v1/crates/ryu/0.2.6/download -> ryu-0.2.6.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/same-file/1.0.3/download -> same-file-1.0.3.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/serde/1.0.77/download -> serde-1.0.77.crate https://crates.io/api/v1/crates/serde_derive/1.0.77/download -> serde_derive-1.0.77.crate https://crates.io/api/v1/crates/serde_json/1.0.27/download -> serde_json-1.0.27.crate https://crates.io/api/v1/crates/simd/0.2.2/download -> simd-0.2.2.crate https://crates.io/api/v1/crates/smallvec/0.6.5/download -> smallvec-0.6.5.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.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.15.1/download -> syn-0.15.1.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.3/download -> termcolor-1.0.3.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.6/download -> thread_local-0.3.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-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/utf8-ranges/1.0.1/download -> utf8-ranges-1.0.1.crate https://crates.io/api/v1/crates/version_check/0.1.4/download -> version_check-0.1.4.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.2.5/download -> walkdir-2.2.5.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-util/0.1.1/download -> winapi-util-0.1.1.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.1/download -> wincolor-1.0.1.crate
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	da08619f6c16047185d20223904c8aef	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=81491abc10015b7726286195e85dee06
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 7ca22375be22..da4c1ea1437c 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
+DEPEND=>=virtual/rust-1.20 app-text/asciidoc virtual/cargo
 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	47a7402d95930413ce25ba8d857339bb	cargo	da08619f6c16047185d20223904c8aef	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=27585d0d3928df428bc522248a1be9e1
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.9.0 b/metadata/md5-cache/sys-apps/ripgrep-0.9.0
index 7c5f86763cf4..f8cd35cb128a 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-0.9.0
+++ b/metadata/md5-cache/sys-apps/ripgrep-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=virtual/rust-1.20 doc? ( app-text/asciidoc )
+DEPEND=>=virtual/rust-1.20 doc? ( app-text/asciidoc ) virtual/cargo
 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.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	47a7402d95930413ce25ba8d857339bb	cargo	da08619f6c16047185d20223904c8aef	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=ad3f7bd9b26288b5b9b60021b0401c88
diff --git a/metadata/md5-cache/sys-apps/s6-2.7.2.1 b/metadata/md5-cache/sys-apps/s6-2.7.2.1
new file mode 100644
index 000000000000..87e5d5287d65
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-2.7.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-lang/execline-2.5.0.1[static-libs?] >=dev-libs/skalibs-2.7.0.0[static-libs?]
+DESCRIPTION=skarnet.org's small and secure supervision software suite
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.5.0.1:= !static? ( >=dev-libs/skalibs-2.7.0.0:= )
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/2.7
+SRC_URI=https://www.skarnet.org/software/s6/s6-2.7.2.1.tar.gz
+_md5_=445a6b33d18902b8b26fe5aaaa8c8b51
diff --git a/metadata/md5-cache/sys-apps/s6-linux-utils-2.5.0.0 b/metadata/md5-cache/sys-apps/s6-linux-utils-2.5.0.0
new file mode 100644
index 000000000000..db7832a226e6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-linux-utils-2.5.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=static? ( >=dev-libs/skalibs-2.7.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.7.0.0 )
+DESCRIPTION=set of tiny linux utilities
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-linux-utils/
+IUSE=static
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.7.0.0:= )
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-linux-utils/s6-linux-utils-2.5.0.0.tar.gz
+_md5_=ce43c151e7fbe07bb89ac38523cbf6c3
diff --git a/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.1.2 b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.1.2
new file mode 100644
index 000000000000..81ffec6ae727
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=static? ( >=dev-libs/skalibs-2.7.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.7.0.0 )
+DESCRIPTION=set of tiny portable unix utilities
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-portable-utils/
+IUSE=static
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.7.0.0:= )
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-portable-utils/s6-portable-utils-2.2.1.2.tar.gz
+_md5_=95198935f662e2e09e6aa9e10d9afbf7
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.4.1.0 b/metadata/md5-cache/sys-apps/s6-rc-0.4.1.0
new file mode 100644
index 000000000000..25ebeb0c2c19
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.4.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst prepare
+DEPEND=>=dev-lang/execline-2.5.0.1[static-libs?] >=sys-apps/s6-2.7.2.0[static-libs?] >=dev-libs/skalibs-2.7.0.0[static-libs?]
+DESCRIPTION=service manager for the s6 supervision suite
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-rc/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.5.0.1:= >=sys-apps/s6-2.7.2.0:= !static? ( >=dev-libs/skalibs-2.7.0.0:= )
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/0.4
+SRC_URI=https://www.skarnet.org/software/s6-rc/s6-rc-0.4.1.0.tar.gz
+_md5_=743fc57c92a1256ba21c65f3c416815f
diff --git a/metadata/md5-cache/sys-apps/shadow-4.6 b/metadata/md5-cache/sys-apps/shadow-4.6
index dd09d55d835e..22d803f02fcd 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.6
+++ b/metadata/md5-cache/sys-apps/shadow-4.6
@@ -10,4 +10,4 @@ RDEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib?
 SLOT=0
 SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.6/shadow-4.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a932d2924dd86cd1307815690cddff1f
+_md5_=1dba788a946a22d6e6b88c28e972925d
diff --git a/metadata/md5-cache/sys-apps/smc-sum-2.1.0.20180903 b/metadata/md5-cache/sys-apps/smc-sum-2.1.0.20180903
new file mode 100644
index 000000000000..a85fbbba7377
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/smc-sum-2.1.0.20180903
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install nofetch
+DESCRIPTION=Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards
+EAPI=7
+HOMEPAGE=https://www.supermicro.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=supermicro
+RDEPEND=sys-apps/smc-sum-driver
+RESTRICT=bindist fetch mirror
+SLOT=0
+SRC_URI=sum_2.1.0_Linux_x86_64_20180903.tar.gz
+_md5_=eae5aa5b1599ea1822255ddeb0fb30f8
diff --git a/metadata/md5-cache/sys-apps/systemd-readahead-216 b/metadata/md5-cache/sys-apps/systemd-readahead-216
index 98239dee8c39..63d44e4b3317 100644
--- a/metadata/md5-cache/sys-apps/systemd-readahead-216
+++ b/metadata/md5-cache/sys-apps/systemd-readahead-216
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/systemd-217:=
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/systemd/systemd-216.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=ffb3525d1f75657d507c4d30df9c9a5d
+_md5_=7da07563028e821778c5f86f5cae9631
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.91 b/metadata/md5-cache/sys-apps/sysvinit-2.91
new file mode 100644
index 000000000000..21ff9c99bf45
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.91
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
+DESCRIPTION=/sbin/init - parent of all processes
+EAPI=6
+HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
+IUSE=selinux ibm static kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
+SLOT=0
+SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.91.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5b22b20c722d5a16a7c8382af08391bc
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 a2daf5ff0538..7e008bac3c23 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=A tool for controlling 'flip flop' (multiple devices) USB gear like
 EAPI=5
 HOMEPAGE=http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt
 IUSE=jimtcl kernel_linux
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 arm x86
 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a52963e1252cf0c39ef18c76c5bd157e
+_md5_=a4f7f8e41681247813097aadbc794c85
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.33_rc1 b/metadata/md5-cache/sys-apps/util-linux-2.33_rc1
deleted file mode 100644
index aadbc4c23684..000000000000
--- a/metadata/md5-cache/sys-apps/util-linux-2.33_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) 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(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DESCRIPTION=Various useful Linux utilities
-EAPI=6
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
-IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_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 abi_x86_32 abi_x86_64 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-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) 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(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
-REQUIRED_USE=python? ( ^^ ( python_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 ) )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/util-linux/v2.33/util-linux-2.33-rc1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e574e9519f33e7d8248698cb536e235
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.33_rc2 b/metadata/md5-cache/sys-apps/util-linux-2.33_rc2
new file mode 100644
index 000000000000..c7c49680886b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.33_rc2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) 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(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DESCRIPTION=Various useful Linux utilities
+EAPI=6
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_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 abi_x86_32 abi_x86_64 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-2 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) 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(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
+REQUIRED_USE=python? ( ^^ ( python_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 ) )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/util-linux/v2.33/util-linux-2.33-rc2.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1e574e9519f33e7d8248698cb536e235
diff --git a/metadata/md5-cache/sys-apps/yarn-1.10.1 b/metadata/md5-cache/sys-apps/yarn-1.10.1
new file mode 100644
index 000000000000..7ad74a5f08be
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/yarn-1.10.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=!dev-util/cmdtest net-libs/nodejs
+DESCRIPTION=Fast, reliable, and secure node dependency management
+EAPI=6
+HOMEPAGE=https://yarnpkg.com
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=!dev-util/cmdtest net-libs/nodejs
+SLOT=0
+SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.10.1/yarn-v1.10.1.tar.gz
+_md5_=93fb275ae545d4fc0bbb29c829475556
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index e0fca1cebc40..2338afc42528 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/consolekit-1.2.1 b/metadata/md5-cache/sys-auth/consolekit-1.2.1
index cfd8c2e8160a..c20ec8598278 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.2.1
+++ b/metadata/md5-cache/sys-auth/consolekit-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for defining and tracking users, login sessions and seats
 EAPI=6
 HOMEPAGE=https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit
 IUSE=acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) evdev? ( dev-libs/libevdev:= ) udev? ( virtual/libudev x11-libs/libdrm:= ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) selinux? ( sys-libs/libselinux ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.2.1/ConsoleKit2-1.2.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2cc5d872f66347635d16318b375ce58f
+_md5_=17acbeca6de10e1622e2a83d4356307d
diff --git a/metadata/md5-cache/sys-auth/elogind-238.1 b/metadata/md5-cache/sys-auth/elogind-238.1
index 4222c81ad5d4..8f6bd06bdfc1 100644
--- a/metadata/md5-cache/sys-auth/elogind-238.1
+++ b/metadata/md5-cache/sys-auth/elogind-238.1
@@ -11,4 +11,4 @@ RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/ac
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v238.1.tar.gz -> elogind-238.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5ceff936697c85f22856ce3f431b28ee
+_md5_=b7213bdd632e39149e14d06bc114e2f7
diff --git a/metadata/md5-cache/sys-auth/sakcl-0.1.0 b/metadata/md5-cache/sys-auth/sakcl-0.1.0
index f85463017c98..9df560cb5422 100644
--- a/metadata/md5-cache/sys-auth/sakcl-0.1.0
+++ b/metadata/md5-cache/sys-auth/sakcl-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl )
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) virtual/cargo
 DESCRIPTION=OpenSSH AuthorizedKeysCmd provider utilizing LDAP
 EAPI=6
 HOMEPAGE=https://gitlab.com/cardoe/sakcl
@@ -10,5 +10,5 @@ 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	da08619f6c16047185d20223904c8aef	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	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
index e15a7980dcf2..40559e0bcefe 100644
--- a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0
+++ b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0
@@ -4,7 +4,7 @@ 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
+KEYWORDS=~alpha ~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 )
@@ -12,4 +12,4 @@ 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	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=83e87f54731794577c8a84162fb5284c
+_md5_=33b004037b5ca93c502c4f325c4a2809
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 4dc72b2dbe24..f608acce9bac 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/kvpm-0.9.10 b/metadata/md5-cache/sys-block/kvpm-0.9.10
index 86fbdaff24df..4b9ee6602961 100644
--- a/metadata/md5-cache/sys-block/kvpm-0.9.10
+++ b/metadata/md5-cache/sys-block/kvpm-0.9.10
@@ -1,13 +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 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/util-linux >=sys-block/parted-2.3 >=sys-fs/lvm2-2.02.120 !sys-block/kvpm:4 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
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/util-linux >=sys-block/parted-2.3 >=sys-fs/lvm2-2.02.120 !sys-block/kvpm:4 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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE frontend for Linux LVM2 and GNU parted
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/kvpm/
 IUSE=debug +handbook
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-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 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/util-linux >=sys-block/parted-2.3 >=sys-fs/lvm2-2.02.120 !sys-block/kvpm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kdelibs4support-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/util-linux >=sys-block/parted-2.3 >=sys-fs/lvm2-2.02.120 !sys-block/kvpm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kvpm/kvpm-0.9.10.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=81ac6084688dd6a95d9309513fbaa88b
diff --git a/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1 b/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1
index 70d3e212e80a..de3440f2f13b 100644
--- a/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1
+++ b/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Query tool to access the running configuration and status of LSI SCSI HBAs
-EAPI=5
-HOMEPAGE=http://www.drugphish.ch/~ratz/mpt-status/
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://www.drugphish.ch/~ratz/mpt-status/mpt-status-1.2.0.tar.bz2 mirror://gentoo/mpt-status-1.2.0-linux-sources.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b092f34eeb8a5cd8673c89cf4184d176
+SRC_URI=mirror://gentoo/mpt-status-1.2.0.tar.bz2 mirror://gentoo/mpt-status-1.2.0-linux-sources.tar.bz2
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e77a8c01f198f4e227f82b919f87837b
diff --git a/metadata/md5-cache/sys-block/partitionmanager-3.3.1 b/metadata/md5-cache/sys-block/partitionmanager-3.3.1
index ebcf4321bf78..c16cf336ed01 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-3.3.1
+++ b/metadata/md5-cache/sys-block/partitionmanager-3.3.1
@@ -1,13 +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/kcrash-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/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/util-linux >=sys-libs/kpmcore-3.3.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
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/util-linux >=sys-libs/kpmcore-3.3.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE utility for management of partitions and file systems
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/system/kdepartitionmanager
 IUSE=debug +handbook
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
-RDEPEND=>=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/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-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/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/util-linux >=sys-libs/kpmcore-3.3.0:5= >=kde-plasma/kde-cli-tools-5.12.5:5[kdesu] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/kjobwidgets-5.50.0:5 >=kde-frameworks/kservice-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/util-linux >=sys-libs/kpmcore-3.3.0:5= >=kde-plasma/kde-cli-tools-5.12.5:5[kdesu] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/3.3.1/src/partitionmanager-3.3.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d698b467fbb70bafeb18061295fa0aa7
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index fcbc351a271f..9c83a7822b63 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/woeusb-3.1.5 b/metadata/md5-cache/sys-boot/woeusb-3.1.5
index 2ced581979ce..7a1acab3968b 100644
--- a/metadata/md5-cache/sys-boot/woeusb-3.1.5
+++ b/metadata/md5-cache/sys-boot/woeusb-3.1.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/util-linux sys-block/parted sys-fs/dosfstools sys-fs/ntfs3g sys-boot/grub:2[grub_platforms_pc] !minimal? ( x11-libs/wxGTK:3.0-gtk3 ) >=app-portage/elt-patches-20170815 !<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-apps/util-linux sys-block/parted sys-fs/dosfstools sys-fs/ntfs3g sys-boot/grub:2[grub_platforms_pc] !minimal? ( x11-libs/wxGTK:3.0-gtk3[X] ) >=app-portage/elt-patches-20170815 !<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=Creates windows installer on usb media from an iso image
 EAPI=6
 HOMEPAGE=https://github.com/slacka/WoeUSB
 IUSE=minimal
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=sys-apps/util-linux sys-block/parted sys-fs/dosfstools sys-fs/ntfs3g sys-boot/grub:2[grub_platforms_pc] !minimal? ( x11-libs/wxGTK:3.0-gtk3 )
+RDEPEND=sys-apps/util-linux sys-block/parted sys-fs/dosfstools sys-fs/ntfs3g sys-boot/grub:2[grub_platforms_pc] !minimal? ( x11-libs/wxGTK:3.0-gtk3[X] )
 SLOT=0
 SRC_URI=https://github.com/slacka/WoeUSB/archive/v3.1.5.tar.gz -> woeusb-3.1.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=c30de11cca02adabc61127ed09f1650f
+_md5_=b6d49d9bb3a7537f101767898e7f1906
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index ef82d33de726..96a9a925eace 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 2fd65d2c4c5c..ce9bf7dcd12b 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.10-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.10-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.10.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d670b5355b15cca9aae5c8e20b38e6bc
+_md5_=8ed0eb40761a1c4e634bdce6c24a461a
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.8 b/metadata/md5-cache/sys-cluster/ceph-12.2.8
index 391c50587022..baf94bb9c009 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.8
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.8
@@ -4,7 +4,7 @@ DESCRIPTION=Ceph distributed filesystem
 EAPI=6
 HOMEPAGE=https://ceph.com/
 IUSE=babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl static-libs +system-boost systemd +tcmalloc test xfs zfs 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_ssse3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT
 RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] <dev-libs/crypto++-7.0:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) ssl? ( dev-libs/openssl:=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2 !<sys-apps/openrc-0.26.3 dev-python/cherrypy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pecan[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/prettytable[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/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(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/werkzeug[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ?? ( ssl nss ) ?? ( jemalloc tcmalloc )
@@ -12,4 +12,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.8.tar.gz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fe04e9419046ec96841dada8f1466ab5
+_md5_=795f7ffee69121f08821b8f44b2bbe7e
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.2 b/metadata/md5-cache/sys-cluster/ceph-13.2.2
new file mode 100644
index 000000000000..325acbd9a9e6
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-13.2.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) ssl? ( dev-libs/openssl:=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) mgr? ( <net-libs/nodejs-9.0 >net-libs/nodejs-8.10 ) mgr-frontend? ( net-libs/nodejs[npm] ) radosgw? ( dev-libs/expat:=[static-libs?] dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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(-)] amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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 dev-util/cunit dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig test? ( dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Ceph distributed filesystem
+EAPI=6
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr mgr-frontend +radosgw +ssl static-libs +system-boost systemd +tcmalloc test xfs zfs 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_ssse3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT
+RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) ssl? ( dev-libs/openssl:=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) mgr? ( <net-libs/nodejs-9.0 >net-libs/nodejs-8.10 ) mgr-frontend? ( net-libs/nodejs[npm] ) radosgw? ( dev-libs/expat:=[static-libs?] dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2 !<sys-apps/openrc-0.26.3 dev-python/bcrypt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/cherrypy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pecan[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/prettytable[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/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(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/werkzeug[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=!mgr-frontend
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.2.tar.gz mgr-frontend? ( mirror://gentoo/ceph-13.2.2-frontend-node-modules.tar.xz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=23166dfad361f93c446c2bba5a26ea47
diff --git a/metadata/md5-cache/sys-cluster/cinder-12.0.4 b/metadata/md5-cache/sys-cluster/cinder-12.0.4
new file mode 100644
index 000000000000..94f6991f81b2
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-12.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup 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/pbr-2.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/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
+EAPI=6
+HOMEPAGE=https://launchpad.net/cinder
+IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.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/decorator-3.4.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/defusedxml-0.5.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/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.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/eventlet-0.21.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/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(-)] >=dev-python/httplib2-0.9.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/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/jsonschema-2.6.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/jsonschema-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(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/keystoneauth-3.3.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/keystonemiddleware-4.17.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/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/lxml-3.7.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/oauth2client-1.5.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/oslo-config-5.1.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/oslo-concurrency-3.25.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/oslo-context-2.19.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/oslo-db-4.27.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/oslo-log-3.36.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/oslo-messaging-5.29.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/oslo-middleware-3.31.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/oslo-policy-1.30.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/oslo-privsep-1.23.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/oslo-reports-1.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/oslo-rootwrap-5.8.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/oslo-serialization-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/oslo-serialization-2.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-python/oslo-service-1.24.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/oslo-service-1.28.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/oslo-utils-3.33.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/oslo-versionedobjects-1.31.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/osprofiler-1.4.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/paramiko-2.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/paste-2.0.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/pastedeploy-1.5.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/prettytable-0.7.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/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/psutil-3.2.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/pyparsing-2.1.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/python-barbicanclient-4.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/python-barbicanclient-4.5.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/python-barbicanclient-4.5.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/python-glanceclient-2.8.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/python-keystoneclient-3.8.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/python-novaclient-9.1.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/python-swiftclient-3.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-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.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/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/retrying-1.3.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/routes-2.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(-)] >=dev-python/taskflow-2.16.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/rtslib-fb-2.1.43[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/rtslib-fb-2.1.60[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/rtslib-fb-2.1.61[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/rtslib-fb-2.1.64[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/simplejson-3.5.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/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.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/sqlalchemy-1.0.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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-migrate-0.11.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/stevedore-1.20.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/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.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/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-vmware-2.17.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/os-brick-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-python/os-win-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/tooz-1.58.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/google-api-python-client-1.4.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/castellan-0.16.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/cryptography-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/cryptography-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(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils 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=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample https://tarballs.openstack.org/cinder/cinder-12.0.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9074a86308c2c383e88b15147ebd649c
diff --git a/metadata/md5-cache/sys-cluster/nova-16.1.6 b/metadata/md5-cache/sys-cluster/nova-16.1.6
new file mode 100644
index 000000000000..c9590d62f27d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-16.1.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
+EAPI=6
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-privsep-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-brick-1.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-traits-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-vif-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-win-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/castellan-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tooz-1.47.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypowervm-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/libvirt-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(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-16.1.6 https://tarballs.openstack.org/nova/nova-16.1.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e3e5f491c88504fa3b5a4279e5f219c8
diff --git a/metadata/md5-cache/sys-cluster/nova-17.0.7 b/metadata/md5-cache/sys-cluster/nova-17.0.7
new file mode 100644
index 000000000000..5bd48ba5aced
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-17.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-16.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-24.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-34.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-34.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/setuptools-34.0.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/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/setuptools-34.1.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-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/setuptools-34.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-python/setuptools-34.3.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-34.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(-)] !~dev-python/setuptools-34.3.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/setuptools-36.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-python/pbr-2.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/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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=Cloud computing fabric controller (main part of an IaaS system) in Python
+EAPI=6
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-16.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-24.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-34.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-34.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/setuptools-34.0.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/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/setuptools-34.1.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-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/setuptools-34.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-python/setuptools-34.3.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-34.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(-)] !~dev-python/setuptools-34.3.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/setuptools-36.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-python/pbr-2.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/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.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/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.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/sqlalchemy-1.0.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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/decorator-3.4.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/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.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/eventlet-0.21.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/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jinja-2.9.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/jinja-2.9.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/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.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/lxml-2.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/lxml-3.7.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/routes-2.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(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/cryptography-2.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/webob-1.7.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/greenlet-0.4.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/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/paste-2.0.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/prettytable-0.7.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/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-migrate-0.11.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/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paramiko-2.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/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/jsonschema-2.6.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/jsonschema-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/python-cinderclient-3.3.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/keystoneauth-3.3.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/python-neutronclient-6.3.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/python-glanceclient-2.8.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/requests-2.14.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/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.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/websockify-0.8.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/oslo-cache-1.26.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/oslo-concurrency-3.25.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/oslo-config-5.1.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/oslo-context-2.19.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/oslo-log-3.36.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/oslo-reports-1.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/oslo-serialization-1.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/oslo-serialization-2.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-python/oslo-utils-3.33.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/oslo-db-4.27.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/oslo-rootwrap-5.8.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/oslo-messaging-5.29.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/oslo-policy-1.30.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/oslo-privsep-1.23.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/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-service-1.24.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/oslo-service-1.28.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/rfc3986-0.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(-)] >=dev-python/oslo-middleware-3.31.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/psutil-3.2.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/oslo-versionedobjects-1.31.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/os-brick-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-python/os-traits-0.4.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/os-vif-1.7.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/os-vif-1.8.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/os-win-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/castellan-0.16.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/microversion-parse-0.1.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/os-xenapi-0.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(-)] >=dev-python/tooz-1.58.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/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypowervm-1.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/os-service-types-1.1.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/taskflow-2.16.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/libvirt-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(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-17.0.7 https://tarballs.openstack.org/nova/nova-17.0.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b1eee0ffff26ef07d509825278b364cd
diff --git a/metadata/md5-cache/sys-cluster/nova-18.0.2 b/metadata/md5-cache/sys-cluster/nova-18.0.2
new file mode 100644
index 000000000000..c20a6de53939
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-18.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-21.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-24.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-34.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-34.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/setuptools-34.0.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/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/setuptools-34.1.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-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/setuptools-34.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-python/setuptools-34.3.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-34.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(-)] !~dev-python/setuptools-34.3.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/setuptools-36.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-python/pbr-2.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/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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=Cloud computing fabric controller (main part of an IaaS system) in Python
+EAPI=6
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-21.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-24.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-34.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-34.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/setuptools-34.0.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/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/setuptools-34.1.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-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/setuptools-34.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-python/setuptools-34.3.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-34.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(-)] !~dev-python/setuptools-34.3.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/setuptools-36.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-python/pbr-2.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/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.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/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.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/sqlalchemy-1.0.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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/decorator-3.4.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/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.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/jinja-2.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/keystonemiddleware-4.17.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/lxml-2.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/lxml-3.7.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/routes-2.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(-)] >=dev-python/cryptography-1.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/webob-1.8.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/greenlet-0.4.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/greenlet-0.4.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/paste-2.0.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/prettytable-0.7.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/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-migrate-0.11.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/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paramiko-2.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/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/jsonschema-2.6.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/jsonschema-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/python-cinderclient-3.3.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/keystoneauth-3.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-neutronclient-6.7.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/python-glanceclient-2.8.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/requests-2.14.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/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.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/websockify-0.8.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/oslo-cache-1.26.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/oslo-concurrency-3.26.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/oslo-config-6.1.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/oslo-context-2.19.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/oslo-log-3.36.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/oslo-reports-1.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/oslo-serialization-1.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/oslo-serialization-2.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-python/oslo-utils-3.33.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/oslo-db-4.27.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/oslo-rootwrap-5.8.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/oslo-messaging-6.3.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/oslo-policy-1.35.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/oslo-privsep-1.23.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/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-service-1.24.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/oslo-service-1.28.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/rfc3986-0.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(-)] >=dev-python/oslo-middleware-3.31.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/psutil-3.2.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/oslo-versionedobjects-1.31.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/os-brick-2.5.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/os-traits-0.4.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/os-vif-1.7.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/os-vif-1.8.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/os-win-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/castellan-0.16.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/microversion-parse-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-xenapi-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tooz-1.58.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/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypowervm-1.1.15[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/retrying-1.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-service-types-1.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-python/taskflow-2.16.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/python-dateutil-2.5.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zVMCloudConnector-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/futures-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/libvirt-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(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-18.0.2 https://tarballs.openstack.org/nova/nova-18.0.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8c93d67e6624a46856bae33464590f8d
diff --git a/metadata/md5-cache/sys-cluster/poolmon-0.6 b/metadata/md5-cache/sys-cluster/poolmon-0.6
new file mode 100644
index 000000000000..482f238b064f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/poolmon-0.6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A director mailserver pool monitoring script for Dovecot
+EAPI=6
+HOMEPAGE=https://github.com/brandond/poolmon
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/IO-Socket-SSL net-mail/dovecot
+SLOT=0
+SRC_URI=https://github.com/brandond/poolmon/archive/0.6.tar.gz -> poolmon-0.6.tar.gz
+_md5_=bf20478cf2a4c282dcf1d0dae0cb56bf
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.6.7 b/metadata/md5-cache/sys-cluster/teleport-2.6.7
index d0def696bfef..ddbe5361cae1 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	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ab657325f8d9faae6266739d57e32a4e
+_md5_=d31f51f24177a0cfdd4756f91e169119
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.7.1 b/metadata/md5-cache/sys-cluster/teleport-2.7.1
index c7136c7eea33..c1b4fd925dc8 100644
--- a/metadata/md5-cache/sys-cluster/teleport-2.7.1
+++ b/metadata/md5-cache/sys-cluster/teleport-2.7.1
@@ -11,4 +11,4 @@ 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	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ab657325f8d9faae6266739d57e32a4e
+_md5_=d31f51f24177a0cfdd4756f91e169119
diff --git a/metadata/md5-cache/sys-cluster/teleport-3.0.0 b/metadata/md5-cache/sys-cluster/teleport-3.0.0
new file mode 100644
index 000000000000..e48c573200b1
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/teleport-3.0.0
@@ -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/v3.0.0.tar.gz -> teleport-3.0.0.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ab657325f8d9faae6266739d57e32a4e
diff --git a/metadata/md5-cache/sys-cluster/teleport-3.0.1 b/metadata/md5-cache/sys-cluster/teleport-3.0.1
new file mode 100644
index 000000000000..8dbea2294d51
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/teleport-3.0.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/v3.0.1.tar.gz -> teleport-3.0.1.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ab657325f8d9faae6266739d57e32a4e
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d42f415777ae..b09e45cfeb9e 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.30-r4 b/metadata/md5-cache/sys-devel/binutils-2.30-r4
index ec1a73dcbb3a..e3287ce57fd3 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.30-r4
+++ b/metadata/md5-cache/sys-devel/binutils-2.30-r4
@@ -4,10 +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
+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.30
 SRC_URI=mirror://gnu/binutils/binutils-2.30.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.30.tar.xz https://dev.gentoo.org/~slyfox/distfiles/binutils-2.30-patches-5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4ef67581803f4245a22cc4fc9555b19b
+_md5_=58c972c3d05f821475a8f76b4a54efd6
diff --git a/metadata/md5-cache/sys-devel/crossdev-20181020 b/metadata/md5-cache/sys-devel/crossdev-20181020
new file mode 100644
index 000000000000..f89242034d65
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/crossdev-20181020
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Gentoo Cross-toolchain generator
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=|| ( >=sys-apps/portage-2.1 sys-apps/portage-mgorny ) >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
+SLOT=0
+SRC_URI=mirror://gentoo/crossdev-20181020.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20181020.tar.xz
+_md5_=928dfe9250174386e3e1afc09fdb2c70
diff --git a/metadata/md5-cache/sys-devel/gdb-8.2-r1 b/metadata/md5-cache/sys-devel/gdb-8.2-r1
new file mode 100644
index 000000000000..fa6055168045
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gdb-8.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=server? ( !dev-util/gdbserver ) client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) xml? ( dev-libs/expat ) sys-libs/zlib ) app-arch/xz-utils sys-apps/texinfo client? ( virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) )
+DESCRIPTION=GNU debugger
+EAPI=6
+HOMEPAGE=https://sourceware.org/gdb/
+IUSE=+client lzma multitarget nls +python +server test vanilla xml python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2
+RDEPEND=server? ( !dev-util/gdbserver ) client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) xml? ( dev-libs/expat ) sys-libs/zlib )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_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 ) ) || ( client server )
+SLOT=0
+SRC_URI=mirror://gnu/gdb/gdb-8.2.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-8.2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gdb-8.1-patches-1.tar.xz mirror://gentoo/gdb-8.1-patches-1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b90c440466039d3dc4d2bd583d4bde67
diff --git a/metadata/md5-cache/sys-devel/m4-1.4.18 b/metadata/md5-cache/sys-devel/m4-1.4.18
index dc3ac620b2ee..b9e57fdd07ae 100644
--- a/metadata/md5-cache/sys-devel/m4-1.4.18
+++ b/metadata/md5-cache/sys-devel/m4-1.4.18
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/m4/m4-1.4.18.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=583954a25a5b06d295fd57933be91c97
+_md5_=15b7e2feb230a691772ebe245da8a77a
diff --git a/metadata/md5-cache/sys-devel/prelink-99999999 b/metadata/md5-cache/sys-devel/prelink-99999999
new file mode 100644
index 000000000000..24a67c290bdb
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/prelink-99999999
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=selinux? ( sys-libs/libselinux[static-libs(+)] ) !dev-libs/libelf sys-libs/binutils-libs >=sys-libs/glibc-2.8
+DESCRIPTION=Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times
+EAPI=7
+HOMEPAGE=https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/ https://people.redhat.com/jakub/prelink
+IUSE=doc selinux
+LICENSE=GPL-2
+RDEPEND=selinux? ( sys-libs/libselinux[static-libs(+)] ) !dev-libs/libelf sys-libs/binutils-libs >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.18 >=dev-libs/elfutils-0.100[static-libs(+)]
+SLOT=0
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=47f6480e95b7e275b8171417267c69a2
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index c470e00a9e00..79ede884aaaa 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/bedup-0.10.1 b/metadata/md5-cache/sys-fs/bedup-0.10.1
deleted file mode 100644
index 526a55382d2f..000000000000
--- a/metadata/md5-cache/sys-fs/bedup-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/cffi-0.5:=[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(-)] >=sys-fs/btrfs-progs-0.20_rc1_p358 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Btrfs file de-duplication tool
-EAPI=6
-HOMEPAGE=https://github.com/g2p/bedup
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-python/cffi-0.5:=[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(-)] >=sys-fs/btrfs-progs-0.20_rc1_p358 dev-python/alembic[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/pyxdg[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/sqlalchemy-0.8.2[sqlite,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/g2p/bedup/archive/v0.10.1.tar.gz -> bedup-0.10.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=18b751edf039ad0343de468f41ea9124
diff --git a/metadata/md5-cache/sys-fs/bedup-9999 b/metadata/md5-cache/sys-fs/bedup-9999
deleted file mode 100644
index 55450b4f6774..000000000000
--- a/metadata/md5-cache/sys-fs/bedup-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/cffi-0.5:=[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(-)] >=sys-fs/btrfs-progs-0.20_rc1_p358 >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Btrfs file de-duplication tool
-EAPI=5
-HOMEPAGE=https://github.com/g2p/bedup
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-2+
-RDEPEND=>=dev-python/cffi-0.5:=[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(-)] >=sys-fs/btrfs-progs-0.20_rc1_p358 dev-python/alembic[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/pyxdg[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/sqlalchemy-0.8.2[sqlite,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c178df1730a2d4d525202e22e0d00632
diff --git a/metadata/md5-cache/sys-fs/btrfsmaintenance-0.4.2 b/metadata/md5-cache/sys-fs/btrfsmaintenance-0.4.2
new file mode 100644
index 000000000000..b1f3990c1721
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfsmaintenance-0.4.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare prerm
+DESCRIPTION=Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag
+EAPI=7
+HOMEPAGE=https://github.com/kdave/btrfsmaintenance
+IUSE=systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/btrfs-progs virtual/cron systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=https://github.com/kdave/btrfsmaintenance/archive/v0.4.2.tar.gz -> btrfsmaintenance-0.4.2.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=05223c0eca76704bc6dc05ac57bcada8
diff --git a/metadata/md5-cache/sys-fs/dfc-3.1.1 b/metadata/md5-cache/sys-fs/dfc-3.1.1
index 7f38bf4422ad..75711f2f9b8a 100644
--- a/metadata/md5-cache/sys-fs/dfc-3.1.1
+++ b/metadata/md5-cache/sys-fs/dfc-3.1.1
@@ -10,4 +10,4 @@ RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://projects.gw-computing.net/attachments/download/615/dfc-3.1.1.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ebc1dd734378b0415e4cc3781f96eb87
+_md5_=6ec13c3c236773f71d19717e81716e3f
diff --git a/metadata/md5-cache/sys-fs/dosfstools-4.1 b/metadata/md5-cache/sys-fs/dosfstools-4.1
index a92a45c0b588..3c88af71010a 100644
--- a/metadata/md5-cache/sys-fs/dosfstools-4.1
+++ b/metadata/md5-cache/sys-fs/dosfstools-4.1
@@ -4,10 +4,10 @@ DESCRIPTION=DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat
 EAPI=5
 HOMEPAGE=https://github.com/dosfstools/dosfstools
 IUSE=compat test +udev
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=udev? ( virtual/libudev )
 SLOT=0
 SRC_URI=https://github.com/dosfstools/dosfstools/releases/download/v4.1/dosfstools-4.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a39141e6520d5ad11a21d6022471ab91
+_md5_=af53b3322d8b916c1756c1b2b8540714
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1 b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1
index 40251d12dab3..41ba0f1bc514 100644
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1
+++ b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Toolset to accelerate the boot process and application startup
 EAPI=6
 HOMEPAGE=http://e4rat.sourceforge.net/
 IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl:= >=dev-libs/boost-1.42:= sys-fs/e2fsprogs sys-process/audit[static-libs(+)] sys-process/lsof
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/e4rat/e4rat-0.2.4_pre20141201.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=949a917657c58040bae72561802a36ed
+_md5_=1ca8240c8a6cfced897ab5f6c795e89d
diff --git a/metadata/md5-cache/sys-fs/f2fs-tools-1.11.0-r1 b/metadata/md5-cache/sys-fs/f2fs-tools-1.11.0-r1
index 922b2b5be39e..45a11a0ffd16 100644
--- a/metadata/md5-cache/sys-fs/f2fs-tools-1.11.0-r1
+++ b/metadata/md5-cache/sys-fs/f2fs-tools-1.11.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Tools for Flash-Friendly File System (F2FS)
 EAPI=7
 HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/
 IUSE=selinux
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux )
 SLOT=0/5
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/sys-fs/f2fs-tools/f2fs-tools-1.11.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d4c7f7e2bc23a045c1f49d61c359ba68
+_md5_=03fd8a8ff4fb24246c88f65286bf273b
diff --git a/metadata/md5-cache/sys-fs/fatsort-1.5.0 b/metadata/md5-cache/sys-fs/fatsort-1.5.0
new file mode 100644
index 000000000000..7b52cbca5201
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fatsort-1.5.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile prepare test
+DESCRIPTION=Sorts files on FAT16/32 partitions, ideal for basic audio players
+EAPI=7
+HOMEPAGE=http://fatsort.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/fatsort/fatsort-1.5.0.456.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d5bbba23cd04120986e6eabc59824795
diff --git a/metadata/md5-cache/sys-fs/lsscsi-0.28 b/metadata/md5-cache/sys-fs/lsscsi-0.28
deleted file mode 100644
index f58aa02cdcb9..000000000000
--- a/metadata/md5-cache/sys-fs/lsscsi-0.28
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=SCSI sysfs query tool
-EAPI=5
-HOMEPAGE=http://sg.danny.cz/scsi/lsscsi.html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://sg.danny.cz/scsi/lsscsi-0.28.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3eb18621ae77a811c4191f165d677f16
diff --git a/metadata/md5-cache/sys-fs/lsscsi-0.29 b/metadata/md5-cache/sys-fs/lsscsi-0.29
index a3fca055c295..484080c0dd08 100644
--- a/metadata/md5-cache/sys-fs/lsscsi-0.29
+++ b/metadata/md5-cache/sys-fs/lsscsi-0.29
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=SCSI sysfs query tool
 EAPI=6
 HOMEPAGE=http://sg.danny.cz/scsi/lsscsi.html
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://sg.danny.cz/scsi/lsscsi-0.29.tgz
-_md5_=a22cfece104d187434eec0e4881d425b
+_md5_=0b8aec2f295f16695645e0e5aa0a0d5b
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1 b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1
deleted file mode 100644
index 828ba5600725..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline: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 !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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index e7bac67de203..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline: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 !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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index 1f7c0b1d4b09..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline: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? ( app-arch/cpio sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index 6c7ffede7219..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r5
+++ /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= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) 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? ( app-arch/cpio sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index 1aa6aa4bb09f..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r6
+++ /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= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) 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? ( app-arch/cpio sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index 640867bc29b6..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.136
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline: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 !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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index b225a9522a4b..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.136-r1
+++ /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= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.136.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.136.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index c5ed9b2887de..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.136-r2
+++ /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= ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.136.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.136.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index 02d5dc5245e3..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.139
+++ /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= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.139.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.139.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index 9c0eec17f8b3..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.139-r1
+++ /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= ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.139.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.139.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index de7b3debcbbf..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.145
+++ /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= ) 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-20170815 !<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=5
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.145.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.145.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index 69a1e8b42625..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r1
+++ /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= ) 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-20170815 !<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 selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.145.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.145.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1d5d1187d5e92f1cda1ebfb7b6f0b72d
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.166 b/metadata/md5-cache/sys-fs/lvm2-2.02.166
deleted file mode 100644
index c874ae78cd70..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.166
+++ /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= ) 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-20170815 !<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 selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.166.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.166.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
deleted file mode 100644
index 5b913f0f2f9d..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2
+++ /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-20170815 !<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.166.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.166.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf1e12d6212c3b25cf546bad26c65cfe
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.173 b/metadata/md5-cache/sys-fs/lvm2-2.02.173
deleted file mode 100644
index 71ef6add8008..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.173
+++ /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-20170815 !<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.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	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
index 1fe9294b480a..feeed7ab16a7 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.181
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.181
@@ -3,12 +3,12 @@ DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync )
 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
+IUSE=readline static static-libs systemd clvm cman corosync 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* ) dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) 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 )
+REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=09fe9c4a7b153f95af5217eb9f4b1724
+_md5_=983905299fd6ba0fc1ddae039105a0ee
diff --git a/metadata/md5-cache/sys-fs/lxcfs-2.0.4 b/metadata/md5-cache/sys-fs/lxcfs-2.0.4
deleted file mode 100644
index 7b76f11a4855..000000000000
--- a/metadata/md5-cache/sys-fs/lxcfs-2.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=sys-apps/help2man dev-libs/glib:2 sys-fs/fuse virtual/pam virtual/pkgconfig
-DESCRIPTION=FUSE filesystem for LXC
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/
-IUSE=pam
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/glib:2 sys-fs/fuse virtual/pam
-SLOT=0
-SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-2.0.4.tar.gz -> lxcfs-2.0.4.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=dda79e55d62d9f9ca3c92a11dc23d4fc
diff --git a/metadata/md5-cache/sys-fs/lxcfs-2.0.6 b/metadata/md5-cache/sys-fs/lxcfs-2.0.6
deleted file mode 100644
index 7fd2ee2272c9..000000000000
--- a/metadata/md5-cache/sys-fs/lxcfs-2.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=sys-apps/help2man dev-libs/glib:2 sys-fs/fuse virtual/pam virtual/pkgconfig
-DESCRIPTION=FUSE filesystem for LXC
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/
-IUSE=pam
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/glib:2 sys-fs/fuse virtual/pam
-SLOT=0
-SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-2.0.6.tar.gz -> lxcfs-2.0.6.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8cef2e611890c5ffe173c4da68cbd484
diff --git a/metadata/md5-cache/sys-fs/lxcfs-3.0.0 b/metadata/md5-cache/sys-fs/lxcfs-3.0.0
index 965235ef54f1..1c7b304c08f4 100644
--- a/metadata/md5-cache/sys-fs/lxcfs-3.0.0
+++ b/metadata/md5-cache/sys-fs/lxcfs-3.0.0
@@ -3,10 +3,10 @@ DEPEND=sys-apps/help2man dev-libs/glib:2 sys-fs/fuse:0 virtual/pkgconfig
 DESCRIPTION=FUSE filesystem for LXC
 EAPI=6
 HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/glib:2 sys-fs/fuse:0
 SLOT=0
 SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-3.0.0.tar.gz -> lxcfs-3.0.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0c53d5234d70af537fcbc1d8c1f25c2d
+_md5_=2227c954e4c7eae686ae87a1442e106c
diff --git a/metadata/md5-cache/sys-fs/lxcfs-3.0.2 b/metadata/md5-cache/sys-fs/lxcfs-3.0.2
new file mode 100644
index 000000000000..4d1442072b32
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lxcfs-3.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst preinst prepare unpack
+DEPEND=sys-apps/help2man dev-libs/glib:2 sys-fs/fuse:0 virtual/pkgconfig
+DESCRIPTION=FUSE filesystem for LXC
+EAPI=6
+HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:2 sys-fs/fuse:0
+SLOT=0
+SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-3.0.2.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_md5_=55faf63e72dd1e17dc4a676014b69f49
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.13 b/metadata/md5-cache/sys-fs/ncdu-1.13
index fb69957dae24..cdead1133e48 100644
--- a/metadata/md5-cache/sys-fs/ncdu-1.13
+++ b/metadata/md5-cache/sys-fs/ncdu-1.13
@@ -3,9 +3,9 @@ DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
 DESCRIPTION=NCurses Disk Usage
 EAPI=6
 HOMEPAGE=https://dev.yorhel.nl/ncdu/
-KEYWORDS=~alpha amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses:0=[unicode]
 SLOT=0
 SRC_URI=https://dev.yorhel.nl/download/ncdu-1.13.tar.gz
-_md5_=194e2b7ca7bccfff22e6f327521b4bfb
+_md5_=610ef57229e81b37ce1c8a06c088cad0
diff --git a/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2 b/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
new file mode 100644
index 000000000000..f2d50b904b2e
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=ftdi? ( dev-embedded/libftdi:0 ) fuse? ( sys-fs/fuse:0= ) perl? ( dev-lang/perl:= ) parport? ( sys-kernel/linux-headers ) 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(-)] ) tcl? ( dev-lang/tcl:0= ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) >=app-portage/elt-patches-20170815 !<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=Access 1-Wire devices like a filesystem
+EAPI=6
+HOMEPAGE=http://owfs.org/ https://sourceforge.net/projects/owfs/
+IUSE=debug ftdi ftpd fuse httpd parport perl python tcl usb zeroconf python_targets_python2_7 kernel_linux
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=ftdi? ( dev-embedded/libftdi:0 ) fuse? ( sys-fs/fuse:0= ) perl? ( dev-lang/perl:= ) parport? ( sys-kernel/linux-headers ) 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(-)] ) tcl? ( dev-lang/tcl:0= ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+SLOT=0/3.2_p2
+SRC_URI=mirror://sourceforge/owfs/owfs-3.2p2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e99ea1743725beb0a4da204821bdf4ab
diff --git a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27 b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
index f1dd90e6535f..0e909b480226 100644
--- a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
+++ b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/fs/reiserfs/reiserfsprogs-3.6.27.tar.xz mirror://kernel/linux/kernel/people/jeffm/reiserfsprogs/v3.6.27/reiserfsprogs-3.6.27.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=209ba6a30401a91bbb9fb5b6f53e0296
+_md5_=ee7e0230ade4518a22bd95c18f6fc9db
diff --git a/metadata/md5-cache/sys-fs/treesize-0.54.1 b/metadata/md5-cache/sys-fs/treesize-0.54.1
deleted file mode 100644
index 02ca5a985afe..000000000000
--- a/metadata/md5-cache/sys-fs/treesize-0.54.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=x11-libs/gtk+:2 >=app-portage/elt-patches-20170815 !<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 disk consumption analyzing tool
-EAPI=2
-HOMEPAGE=http://treesize.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/treesize/treesize-0.54.1-src.tbz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=536fecb5bf48b19e840c19f3c1ffec87
diff --git a/metadata/md5-cache/sys-fs/treesize-0.54.1-r1 b/metadata/md5-cache/sys-fs/treesize-0.54.1-r1
index a5aa844e7285..d539208200ea 100644
--- a/metadata/md5-cache/sys-fs/treesize-0.54.1-r1
+++ b/metadata/md5-cache/sys-fs/treesize-0.54.1-r1
@@ -4,10 +4,10 @@ DEPEND=x11-libs/gtk+:2
 DESCRIPTION=A disk consumption analyzing tool
 EAPI=7
 HOMEPAGE=http://treesize.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/treesize/treesize-0.54.1-src.tbz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2967e911c7a5750d9796dbc8dbb032e1
+_md5_=a2654512556744055f05d1e15c153739
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-4.17.0-r1 b/metadata/md5-cache/sys-fs/xfsprogs-4.17.0-r1
index 6f7056c9131c..a6b8983e08c6 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-4.17.0-r1
+++ b/metadata/md5-cache/sys-fs/xfsprogs-4.17.0-r1
@@ -1,14 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] icu? ( dev-libs/icu:=[static-libs(+)] ) readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3 nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=xfs filesystem utilities
 EAPI=6
 HOMEPAGE=https://xfs.wiki.kernel.org/
-IUSE=icu libedit nls readline static static-libs
-KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+IUSE=icu libedit nls readline static-libs
+KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sh ~sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
-REQUIRED_USE=static? ( static-libs )
+RDEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.17.0.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=092f4924c092d82c3fc15dc6d6450b32
+_md5_=fc8867d269b67eab778c5b82a9d1538d
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-4.18.0 b/metadata/md5-cache/sys-fs/xfsprogs-4.18.0
index 21e71a67bbe1..e77b76c2704c 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-4.18.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-4.18.0
@@ -1,14 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] icu? ( dev-libs/icu:=[static-libs(+)] ) readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3 nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=xfs filesystem utilities
 EAPI=6
 HOMEPAGE=https://xfs.wiki.kernel.org/
-IUSE=icu libedit nls readline static static-libs
+IUSE=icu libedit nls readline static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1
-RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
-REQUIRED_USE=static? ( static-libs )
+RDEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.18.0.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d33e641a911dd640d3a9ddbcbefe3d0a
+_md5_=f29199c2005e6a81891edf39e5451a18
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b7aaf07ab74f..99c3baa9a921 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/aufs-sources-4.14.44 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.44
deleted file mode 100644
index 61d8af6149b0..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.44
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.44
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-49.base.tar.xz mirror://gentoo/genpatches-4.14-49.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-49.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24edf26a1f318fc46e49f0c9897403b1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.47 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.47
deleted file mode 100644
index 311e7783d78e..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.47
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.47
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-51.base.tar.xz mirror://gentoo/genpatches-4.14-51.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-51.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=df3117ed493c5a6c1b0353dfb1cc0138
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.48 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.48
deleted file mode 100644
index fcd061d5198f..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.48
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.48
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-52.base.tar.xz mirror://gentoo/genpatches-4.14-52.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-52.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=168cd447a9bf02e77e5890a58c786478
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.49 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.49
deleted file mode 100644
index e09e7feaca7c..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.49
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.49
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180611.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-53.base.tar.xz mirror://gentoo/genpatches-4.14-53.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-53.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cec673926aba4281bf50d728c8b4530e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.50 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.50
deleted file mode 100644
index b0853c8190c2..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.50
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.50
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180611.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-54.base.tar.xz mirror://gentoo/genpatches-4.14-54.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-54.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6fd43461248b0d47e24a5240cf0a06c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.51 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.51
deleted file mode 100644
index b5e2f97dffc8..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.51
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.51
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180611.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-56.base.tar.xz mirror://gentoo/genpatches-4.14-56.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-56.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b40064fe9498b765b46ae6ea0520f4c8
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.53 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.53
deleted file mode 100644
index 86acc4dbf9b8..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.53
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.53
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180702.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-58.base.tar.xz mirror://gentoo/genpatches-4.14-58.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-58.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a5fda8b393d04173da2401a21f130b7
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.65 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.65
new file mode 100644
index 000000000000..597865806a5a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.65
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.65
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-71.base.tar.xz mirror://gentoo/genpatches-4.14-71.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-71.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3bcd99af2a3e1d9d6e1917facc750e5a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.71 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.71
new file mode 100644
index 000000000000..1b249c7ad2aa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.71
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.71
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-77.base.tar.xz mirror://gentoo/genpatches-4.14-77.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-77.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a08dcc366f79e4dee475495c60c1b991
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.72 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.72
new file mode 100644
index 000000000000..958e4280021e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.72
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.72
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-78.base.tar.xz mirror://gentoo/genpatches-4.14-78.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-78.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b9f8df115c90176e9139b0b0db65dd4b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.73 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.73
new file mode 100644
index 000000000000..633c37cace6a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.73
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.73
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-79.base.tar.xz mirror://gentoo/genpatches-4.14-79.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-79.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ce567ebfa99fc19bcc22480779cb3e37
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.74 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.74
new file mode 100644
index 000000000000..608a160e585a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.74
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.74
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-80.base.tar.xz mirror://gentoo/genpatches-4.14-80.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-80.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7170b5f6dac76e286a29c38376b8d291
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.75 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.75
new file mode 100644
index 000000000000..a289dbfffe93
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.75
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.75
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-81.base.tar.xz mirror://gentoo/genpatches-4.14-81.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-81.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0c960c289649179de931f0b1703957df
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.76 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.76
new file mode 100644
index 000000000000..38f2f832b55f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.76
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.76
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-82.base.tar.xz mirror://gentoo/genpatches-4.14-82.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-82.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=42fa8614d38d3f686d413cf002396bcc
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.77 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.77
new file mode 100644
index 000000000000..a4cd53633f79
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.77
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.77
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-84.base.tar.xz mirror://gentoo/genpatches-4.14-84.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-84.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c106eda7fea50908f0e3411362d57375
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.78 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.78
new file mode 100644
index 000000000000..bb3e55af70aa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.78
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.78
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-85.base.tar.xz mirror://gentoo/genpatches-4.14-85.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-85.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6725828ad7922250ce76ad732e5bcac1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.18 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.18
deleted file mode 100644
index 902c3c2de6f4..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.18
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.16.18
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180702.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-19.base.tar.xz mirror://gentoo/genpatches-4.16-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-19.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c471191f76df0b3423829f1b6dd55f27
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.17.0 b/metadata/md5-cache/sys-kernel/aufs-sources-4.17.0
deleted file mode 100644
index 4b3d5b4f3f6a..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.17.0
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.17.0
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.17_p20180611.tar.xz !vanilla? ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f36dd546454e03da57fd407c26f6e25c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.17.1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.17.1
deleted file mode 100644
index f69c1b8af7bf..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.17.1
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.17.1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.17_p20180611.tar.xz !vanilla? ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ff04d42efd2cbd23a18e5019cf3e683
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.17.2 b/metadata/md5-cache/sys-kernel/aufs-sources-4.17.2
deleted file mode 100644
index 6279f588d97c..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.17.2
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.17.2
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.17_p20180611.tar.xz !vanilla? ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c200e201918633fd60f11ec6063ea3a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.17.3 b/metadata/md5-cache/sys-kernel/aufs-sources-4.17.3
deleted file mode 100644
index 32b1b280c7cd..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.17.3
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.17.3
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.17_p20180702.tar.xz !vanilla? ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ef3678470c708b01a956e630a7cfe782
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.17.4 b/metadata/md5-cache/sys-kernel/aufs-sources-4.17.4
deleted file mode 100644
index 6ab3babe951d..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.17.4
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.17.4
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.17_p20180702.tar.xz !vanilla? ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=413349d7e23be8653df9be28819fd7e2
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.18.10 b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.10
new file mode 100644
index 000000000000..8c6acefcfd8c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.10
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.10
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.18_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.18-13.base.tar.xz mirror://gentoo/genpatches-4.18-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-13.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ae292dbdf0f0d0d1aab761281a10148d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.18.11 b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.11
new file mode 100644
index 000000000000..8af4fe822161
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.11
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.11
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.18.11+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.18-14.base.tar.xz mirror://gentoo/genpatches-4.18-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-14.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a7a9f54afe7b3c573436c430f66f8851
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.18.12 b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.12
new file mode 100644
index 000000000000..c6870ec10525
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.12
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.12
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.18.11+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.18-15.base.tar.xz mirror://gentoo/genpatches-4.18-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-15.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=445064661c5334bb78d3ce6537ca66c8
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.18.13 b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.13
new file mode 100644
index 000000000000..3e9a2fa04da6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.13
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.13
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.18.11+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.18-16.base.tar.xz mirror://gentoo/genpatches-4.18-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-16.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4cb3a0eef617e1e70b217eaaf8b86ead
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.18.14 b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.14
new file mode 100644
index 000000000000..e225ef53aacb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.14
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.18.11+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.18-17.base.tar.xz mirror://gentoo/genpatches-4.18-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-17.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3a2bfdfe7b83e8f149fc682f3e65b884
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.18.15 b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.15
new file mode 100644
index 000000000000..703aa7eb2407
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.15
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.18.11+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.18-18.base.tar.xz mirror://gentoo/genpatches-4.18-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-18.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ff23bbc624092152822ba13505c4c483
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.18.16 b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.16
new file mode 100644
index 000000000000..1d496c5ff2b3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.16
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.16
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.18.11+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.18-19.base.tar.xz mirror://gentoo/genpatches-4.18-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-19.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=77734e9f9a1bd13ab2de48a92d86c71e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.18.9 b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.9
new file mode 100644
index 000000000000..27657d5d7961
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.18.9
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.9
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.18.11+_p20181008.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.18-12.base.tar.xz mirror://gentoo/genpatches-4.18-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-12.experimental.tar.xz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e34176f2a49a171bc372f10b40a49d73
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111-r1
deleted file mode 100644
index f4e39e2524e7..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111-r1
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.111-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-115.base.tar.xz mirror://gentoo/genpatches-4.4-115.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-115.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88db5891b051a7de239b5de0ce1d9806
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.128 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.128
deleted file mode 100644
index e8fa32851d94..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.128
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.128
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-130.base.tar.xz mirror://gentoo/genpatches-4.4-130.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-130.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5ce734061a4e5aede108c9f235c304ed
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.136 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.136
deleted file mode 100644
index 34730e58b6d0..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.136
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.136
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180611.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-138.base.tar.xz mirror://gentoo/genpatches-4.4-138.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-138.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=965929b9ea3ebf37fe4dec18c84505ce
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.137 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.137
deleted file mode 100644
index 2f3acbda0e09..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.137
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.137
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180611.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-139.base.tar.xz mirror://gentoo/genpatches-4.4-139.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-139.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6ec36c697c5408407862cebc2e85447
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.138 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.138
deleted file mode 100644
index dc6a5f838e7e..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.138
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.138
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180611.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-140.base.tar.xz mirror://gentoo/genpatches-4.4-140.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-140.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26ee8275f00f5f0c63db94535373ea82
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1
deleted file mode 100644
index 66378ebccde1..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.87-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20170925.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-91.base.tar.xz mirror://gentoo/genpatches-4.4-91.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-91.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=da960c4172a9c1ab906edc2e661c1334
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.105 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.105
deleted file mode 100644
index 5f5589cf2998..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.105
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.105
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-108.base.tar.xz mirror://gentoo/genpatches-4.9-108.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-108.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a7abe54bdbd6c0badb1354044cf9f187
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.106 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.106
deleted file mode 100644
index 3bd6877912f2..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.106
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.106
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-109.base.tar.xz mirror://gentoo/genpatches-4.9-109.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-109.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd16e911d351eccc68b91231c7e4209b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.107 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.107
deleted file mode 100644
index 97920e235eaf..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.107
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.107
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-110.base.tar.xz mirror://gentoo/genpatches-4.9-110.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-110.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f292df1c7d44c82d759c4b20cc6a82e6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.108 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.108
deleted file mode 100644
index af15f6ee043c..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.108
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.108
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180611.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-111.base.tar.xz mirror://gentoo/genpatches-4.9-111.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-111.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=692618c90ce313d8d63fd79b1e2c5888
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.109 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.109
deleted file mode 100644
index 4761c28e4e24..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.109
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.109
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180611.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-112.base.tar.xz mirror://gentoo/genpatches-4.9-112.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-112.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24fcc962d2df0afec547521c23672192
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.110 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.110
deleted file mode 100644
index 534d885392dd..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.110
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.110
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180702.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-113.base.tar.xz mirror://gentoo/genpatches-4.9-113.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-113.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=08ce455d54ef26a8141772d5c0a9c1a1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.111 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.111
deleted file mode 100644
index 4c67f52cbf4f..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.111
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.111
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180702.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-114.base.tar.xz mirror://gentoo/genpatches-4.9-114.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-114.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d558b902d0f54f59bbfa5c7edb883f2
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1
deleted file mode 100644
index e1985181fd3d..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.49-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20170925.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-51.base.tar.xz mirror://gentoo/genpatches-4.9-51.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-51.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=578b0af3a35a12512dcb7014d9f1fabb
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.72 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.72
deleted file mode 100644
index 65508e21351e..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.72
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.72
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-74.base.tar.xz mirror://gentoo/genpatches-4.9-74.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-74.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a24cadb0366ce77093ad745959c8109e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76-r1
deleted file mode 100644
index f7ffcfc82892..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76-r1
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.76-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-79.base.tar.xz mirror://gentoo/genpatches-4.9-79.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-79.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e613d81ca19d8608cf0d7aa774cb4bad
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.85 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.85
deleted file mode 100644
index a07f321b0906..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.85
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.85
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-88.base.tar.xz mirror://gentoo/genpatches-4.9-88.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-88.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=171a9a7ec12032a6ff17cb4bc8aa93b7
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.95 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.95
deleted file mode 100644
index 7160504027c6..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.95
+++ /dev/null
@@ -1,15 +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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.95
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-98.base.tar.xz mirror://gentoo/genpatches-4.9-98.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-98.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b3791633cb2fe5154e57c8cca3531a3a
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.75 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
new file mode 100644
index 000000000000..24963911d51f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.75
+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-81.base.tar.xz mirror://gentoo/genpatches-4.14-81.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-81.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 https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4aaa7d1e5433c87fe7c8ed0e23972e4b
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.78 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
new file mode 100644
index 000000000000..c58fe8612458
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.78
+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-85.base.tar.xz mirror://gentoo/genpatches-4.14-85.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-85.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 https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ffd76a558c1c04b1c5cf6fa596d6aa78
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.13 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
new file mode 100644
index 000000000000..4465655d173b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
@@ -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.18, 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.13
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-16.base.tar.xz mirror://gentoo/genpatches-4.18-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-16.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=946e2d0c28bb9b6e5c26aec001a7ceb8
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.16 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
new file mode 100644
index 000000000000..5581f06a7650
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
@@ -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.18, 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.16
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-19.base.tar.xz mirror://gentoo/genpatches-4.18-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-19.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=bded78c0fb5630e7d20dc7533170065f
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.132 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
new file mode 100644
index 000000000000..3585a69073be
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.132
+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-136.base.tar.xz mirror://gentoo/genpatches-4.9-136.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-136.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	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2f84d80ba564e8662c27588801389ecc
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.135 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
new file mode 100644
index 000000000000..f622207c8746
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.135
+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-139.base.tar.xz mirror://gentoo/genpatches-4.9-139.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-139.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	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7f6ce089d60648491b0a20622553331a
diff --git a/metadata/md5-cache/sys-kernel/dracut-044-r1 b/metadata/md5-cache/sys-kernel/dracut-044-r1
index 4c61c436da93..a8ae5ffd86f7 100644
--- a/metadata/md5-cache/sys-kernel/dracut-044-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-044-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-044.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c478ea3ae30d2eb877f0dfce25634d3c
+_md5_=561e5aea831aa255a9e4d86944ecfb40
diff --git a/metadata/md5-cache/sys-kernel/dracut-044-r3 b/metadata/md5-cache/sys-kernel/dracut-044-r3
index 900a48965a00..7940f154070d 100644
--- a/metadata/md5-cache/sys-kernel/dracut-044-r3
+++ b/metadata/md5-cache/sys-kernel/dracut-044-r3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-044.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cad1b96ba2b8e4a5025e25bb420889bd
+_md5_=a9d1ef7b3be4309ec66012e46617c755
diff --git a/metadata/md5-cache/sys-kernel/dracut-045-r2 b/metadata/md5-cache/sys-kernel/dracut-045-r2
index be9ab662d569..e8db88eb9f06 100644
--- a/metadata/md5-cache/sys-kernel/dracut-045-r2
+++ b/metadata/md5-cache/sys-kernel/dracut-045-r2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-045.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f788976d3212ff57e356e90b50a9f1e
+_md5_=5f28d689efb87c3a3e4d438b72915718
diff --git a/metadata/md5-cache/sys-kernel/dracut-046-r1 b/metadata/md5-cache/sys-kernel/dracut-046-r1
index 27073b1218ee..d4f0ce0209a2 100644
--- a/metadata/md5-cache/sys-kernel/dracut-046-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-046-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-046.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9b2fb453d7bbfeb69e9e61ac8962e37
+_md5_=263d1f68a8d35e2fd2363a3c46092c69
diff --git a/metadata/md5-cache/sys-kernel/dracut-047-r1 b/metadata/md5-cache/sys-kernel/dracut-047-r1
index a3986db06bba..80b2f735a858 100644
--- a/metadata/md5-cache/sys-kernel/dracut-047-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-047-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-047.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=517cd291cf2ff19ed1805244e8961626
+_md5_=c843024a52eba6d654dac503ab192eb9
diff --git a/metadata/md5-cache/sys-kernel/dracut-048 b/metadata/md5-cache/sys-kernel/dracut-048
index d58686b7c7e4..9ce1666e0484 100644
--- a/metadata/md5-cache/sys-kernel/dracut-048
+++ b/metadata/md5-cache/sys-kernel/dracut-048
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-048.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=30351c99006585248b3edfb9d15d1210
+_md5_=cb2e32c105e1ed985b5d236b8aeaa26e
diff --git a/metadata/md5-cache/sys-kernel/dracut-048-r1 b/metadata/md5-cache/sys-kernel/dracut-048-r1
new file mode 100644
index 000000000000..d144457e336f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/dracut-048-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=>=sys-apps/kmod-23[tools] virtual/pkgconfig virtual/udev app-text/asciidoc app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 virtual/pkgconfig
+DESCRIPTION=Generic initramfs generation tool
+EAPI=6
+HOMEPAGE=https://dracut.wiki.kernel.org
+IUSE=debug selinux kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/kmod-23[tools] virtual/pkgconfig virtual/udev app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-048.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e3b0d469f605b1272b108406d7c6ea14
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index 5d6d2b4a9150..6ea6a61cf1ab 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/kmod-23[tools] virtual/pkgconfig virtual/udev app-arch/cpio >
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf0443c23ae437a5d0b898bfb4eeae1b
+_md5_=9311e75aa48caedec7b25a83fc2d69c4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.75 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.75
new file mode 100644
index 000000000000..2ad4682c8df1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.75
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.75
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-81.base.tar.xz mirror://gentoo/genpatches-4.14-81.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-81.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ad61d654cfad95a8967e755830c14c11
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.76 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.76
new file mode 100644
index 000000000000..cf556eebaf79
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.76
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.76
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-82.base.tar.xz mirror://gentoo/genpatches-4.14-82.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-82.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7871b5ff6bcb18144ca582b9bcc1afef
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.77 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.77
new file mode 100644
index 000000000000..72f322ef64cb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.77
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.77
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-84.base.tar.xz mirror://gentoo/genpatches-4.14-84.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-84.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a5a5331fa64bad713f6e4d693528f357
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.78 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.78
new file mode 100644
index 000000000000..8aacc406c2a7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.78
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.78
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-85.base.tar.xz mirror://gentoo/genpatches-4.14-85.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-85.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=fc2d64c7eb0b907ccd66ae6de8109bbb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.13
new file mode 100644
index 000000000000..e49f660a601a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.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.18 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.13
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz mirror://gentoo/genpatches-4.18-16.base.tar.xz mirror://gentoo/genpatches-4.18-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-16.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=66fd3dcae594c8955d4cc4dceced7cd8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.14
new file mode 100644
index 000000000000..6454e4afcbec
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.14
@@ -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.18 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz mirror://gentoo/genpatches-4.18-17.base.tar.xz mirror://gentoo/genpatches-4.18-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-17.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1d0986af1a7e727401eb5004a2595409
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.15 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.15
new file mode 100644
index 000000000000..ff19608512b5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.15
@@ -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.18 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz mirror://gentoo/genpatches-4.18-18.base.tar.xz mirror://gentoo/genpatches-4.18-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-18.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a0dbfea13c5912eb77f24efb0a548bbc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.16
new file mode 100644
index 000000000000..0afbdb8154e6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.16
@@ -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.18 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.16
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz mirror://gentoo/genpatches-4.18-19.base.tar.xz mirror://gentoo/genpatches-4.18-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-19.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=bb2815422dbf0c9d112e41677edd0689
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.160 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.160
new file mode 100644
index 000000000000..f0d285043b02
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.160
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.160
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-161.base.tar.xz mirror://gentoo/genpatches-4.4-161.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-161.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ed37ea1d93b5f199a9b23554a1d4e85b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.161 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.161
new file mode 100644
index 000000000000..8d8e8667db36
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.161
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.161
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-162.base.tar.xz mirror://gentoo/genpatches-4.4-162.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-162.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=be7a634f5ef1b4b8356ab22f4be9805a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.118 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.118
deleted file mode 100644
index aa429b213238..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.118
+++ /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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=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	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=123fec3f7c04aaac5ec2e7719115837c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.119 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.119
deleted file mode 100644
index 3b505fcf4c48..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.119
+++ /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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.119
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-122.base.tar.xz mirror://gentoo/genpatches-4.9-122.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-122.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1ddfa86e7ecc26a6c2a540d8ee45b0c0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.120 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.120
deleted file mode 100644
index d14f3274c94c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.120
+++ /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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.120
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-123.base.tar.xz mirror://gentoo/genpatches-4.9-123.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-123.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e47c2939f62c7e8e599fdfdc1c105dca
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.120-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.120-r1
deleted file mode 100644
index d6365bd4460f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.120-r1
+++ /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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.120-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-124.base.tar.xz mirror://gentoo/genpatches-4.9-124.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-124.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=109febec758b08f6cb7652a285fc0f1f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.128 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.128
deleted file mode 100644
index 01fb612705d2..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.128
+++ /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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.128
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-132.base.tar.xz mirror://gentoo/genpatches-4.9-132.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-132.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a6d13421a54cc7443083aed8d9f89805
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.129 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.129
deleted file mode 100644
index d30f8c6cb60b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.129
+++ /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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.129
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-133.base.tar.xz mirror://gentoo/genpatches-4.9-133.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-133.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=78d74fc4ec393fa17f71bff24d9b16a7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.130 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.130
deleted file mode 100644
index 6623aaba697d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.130
+++ /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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.130
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-134.base.tar.xz mirror://gentoo/genpatches-4.9-134.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-134.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=fab9d0471acedc2544994fcd96631188
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.131 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.131
deleted file mode 100644
index 3c606111a89c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.131
+++ /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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.131
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-135.base.tar.xz mirror://gentoo/genpatches-4.9-135.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-135.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a8f9ce91821b60f90dc7104c63033e93
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.132 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.132
new file mode 100644
index 000000000000..5b57b164e2c9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.132
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.132
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-136.base.tar.xz mirror://gentoo/genpatches-4.9-136.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-136.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=78056ecdf44ea51cb668be126b6cc2d6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.133 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.133
new file mode 100644
index 000000000000..397b5d646fc3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.133
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.133
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-137.base.tar.xz mirror://gentoo/genpatches-4.9-137.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-137.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=86f0445bd9d899703bf9f01ca81784f4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.134 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.134
new file mode 100644
index 000000000000..5792f8c89ab8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.134
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.134
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-138.base.tar.xz mirror://gentoo/genpatches-4.9-138.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-138.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=8158322a9a652c1f9369215a9ab361e3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.135 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.135
new file mode 100644
index 000000000000..cecbe7266dc4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.135
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.135
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-139.base.tar.xz mirror://gentoo/genpatches-4.9-139.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-139.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0889379a69e9bad159f93449fa06ec38
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.49-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.49-r1
index 85b2e0d02fb3..1fcfbaf89699 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.49-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.49-r1
@@ -4,11 +4,11 @@ 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
+KEYWORDS=sparc
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.9.49-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-51.base.tar.xz mirror://gentoo/genpatches-4.9-51.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-51.experimental.tar.xz )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e203f895bcd82d9cd5e9247d665cf65a
+_md5_=feda3c02e757773f4eebc834ff992fc4
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.19_rc7 b/metadata/md5-cache/sys-kernel/git-sources-4.19_rc7
new file mode 100644
index 000000000000..b5194cbf1dc4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.19_rc7
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19_rc7
+SRC_URI=https://git.kernel.org/torvalds/p/v4.19-rc7/v4.18 -> patch-4.19-rc7.patch mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9ecef949eacc3bd58c07ca26cc3eaa33
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.19_rc8 b/metadata/md5-cache/sys-kernel/git-sources-4.19_rc8
new file mode 100644
index 000000000000..59666ebd55d7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.19_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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19_rc8
+SRC_URI=https://git.kernel.org/torvalds/p/v4.19-rc8/v4.18 -> patch-4.19-rc8.patch mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9ecef949eacc3bd58c07ca26cc3eaa33
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.18 b/metadata/md5-cache/sys-kernel/linux-headers-4.18
new file mode 100644
index 000000000000..6b21d8c1abbb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/xz-utils dev-lang/perl
+DESCRIPTION=Linux system headers
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
+IUSE=headers-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.18.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.18.tar.xz mirror://gentoo/gentoo-headers-4.18-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.18-1.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4bffdb63720ff27517495b7fd50287d6
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
deleted file mode 100644
index 4f5ba5ebaf29..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.117_p104
+++ /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 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=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	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ce7ec4b4d727cc6673b1465a873586a4
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.117_p105 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.117_p105
deleted file mode 100644
index e326b6ce5673..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.117_p105
+++ /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 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=3.18.117_p105
-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-rt105.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.117-rt105.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ce7ec4b4d727cc6673b1465a873586a4
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
new file mode 100644
index 000000000000..153bc136d34f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=3.18.123_p107
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.123.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.123-rt107.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.123-rt107.patch.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=938063b624f47c634e309538dccbfd39
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
deleted file mode 100644
index 3741ce0b8c19..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.59_p37
+++ /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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=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	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ae042b057632e118c858d57c024d4fdf
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
index a44883153550..be67b92eae5f 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.14.71_p44
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.71.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.71-rt44.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.71-rt44.patch.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1fcd2e14ab82f3638f9816a46e791c46
+_md5_=2e0c711bdf3a60eb764cc44a4bf16a69
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
index a9fa2d54ca31..bda007b14114 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
@@ -11,4 +11,4 @@ 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	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ae042b057632e118c858d57c024d4fdf
+_md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.18.12_p7 b/metadata/md5-cache/sys-kernel/rt-sources-4.18.12_p7
new file mode 100644
index 000000000000..92926cf84e1f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.18.12_p7
@@ -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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.12_p7
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://kernel/linux/kernel/projects/rt/4.18/patch-4.18.12-rt7.patch.xz mirror://kernel/linux/kernel/projects/rt/4.18/older/patch-4.18.12-rt7.patch.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2e0c711bdf3a60eb764cc44a4bf16a69
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
deleted file mode 100644
index 38d7d7b0c960..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.145_p162
+++ /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.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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=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	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ce7ec4b4d727cc6673b1465a873586a4
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.157_p174 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.157_p174
index 5425b5f9d377..6a9758d8acdc 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.157_p174
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.157_p174
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.4.157_p174
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.157.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.157-rt174.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.157-rt174.patch.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=28ac52e08a987a8fd95c0efc5b7613ee
+_md5_=938063b624f47c634e309538dccbfd39
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
index ed422b355166..adfdb77e98b2 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
@@ -11,4 +11,4 @@ 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	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ce7ec4b4d727cc6673b1465a873586a4
+_md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.74 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.74
deleted file mode 100644
index c92e1eed5567..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.74
+++ /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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.74
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.74.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.78 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.78
new file mode 100644
index 000000000000..f6bf8fbdb852
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.78
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.78
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.78.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.18.12 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.18.12
deleted file mode 100644
index 5ac4fca7e411..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.18.12
+++ /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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.18.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.18.16 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.18.16
new file mode 100644
index 000000000000..339bc0fb5d1d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.18.16
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.18.16
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.16.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.159 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.159
deleted file mode 100644
index 0126b25fc18b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.159
+++ /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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.159
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.159.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.162 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.162
new file mode 100644
index 000000000000..b8d346f34f8c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.162
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.162
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.162.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.131 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.131
deleted file mode 100644
index 2290a8dc3612..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.131
+++ /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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.131
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.131.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.135 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.135
new file mode 100644
index 000000000000..ee2349847ce7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.135
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.135
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.135.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index da443ddc10c8..5c17cd5df4c0 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.30-r4 b/metadata/md5-cache/sys-libs/binutils-libs-2.30-r4
index 3a7099afbf1b..abb71db4792a 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.30-r4
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.30-r4
@@ -4,10 +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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-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.30-r1
 SRC_URI=mirror://gnu/binutils/binutils-2.30.tar.xz https://dev.gentoo.org/~slyfox/distfiles/binutils-2.30-patches-5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8bdee8071ff0f706ef58b12eea7e78ad
+_md5_=5b5d8feff683cc4687742bc83019f202
diff --git a/metadata/md5-cache/sys-libs/glibc-2.27-r6 b/metadata/md5-cache/sys-libs/glibc-2.27-r6
index 7323df6bc78e..024122a7f9ec 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.27-r6
+++ b/metadata/md5-cache/sys-libs/glibc-2.27-r6
@@ -4,7 +4,7 @@ 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
+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 )
@@ -12,4 +12,4 @@ 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0529e2b0a70bec08f0b56f3dc496048f
+_md5_=5be9921f34e157cd026912a5d29308d9
diff --git a/metadata/md5-cache/sys-libs/glibc-2.28-r1 b/metadata/md5-cache/sys-libs/glibc-2.28-r1
new file mode 100644
index 000000000000..4f787c828239
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.28-r1
@@ -0,0 +1,14 @@
+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 !<sys-devel/make-4 doc? ( sys-apps/texinfo ) test? ( >=net-dns/libidn2-2.0.5 ) >=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 cet compile-locales doc gd hardened headers-only +multiarch multilib nscd profile selinux suid systemtap test vanilla
+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 ) >=net-dns/libidn2-2.0.5 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.28.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.28-patches-2.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=230c8a628b5659759d095dac38d133bb
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 05a6852739a1..dc8cfe12411f 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -9,6 +9,6 @@ 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 ) >=net-dns/libidn2-2.0.5 sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/glibc-9999-patches-7.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/glibc-9999-patches-8.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=99542e4e72969edebd165ea4505e2f21
+_md5_=eea15bfb939c78e7d694e3010ab6dcf1
diff --git a/metadata/md5-cache/sys-libs/kpmcore-3.3.0 b/metadata/md5-cache/sys-libs/kpmcore-3.3.0
index 462dd78d86c9..39bb1ab1d0d1 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-3.3.0
+++ b/metadata/md5-cache/sys-libs/kpmcore-3.3.0
@@ -1,13 +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/kwidgetsaddons-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-libs/libatasmart >=sys-apps/util-linux-2.30 >=sys-block/parted-3 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.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libatasmart >=sys-apps/util-linux-2.30 >=sys-block/parted-3 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.50.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Library for managing partitions
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/system/kdepartitionmanager
 IUSE=debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-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-libs/libatasmart >=sys-apps/util-linux-2.30 >=sys-block/parted-3 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libatasmart >=sys-apps/util-linux-2.30 >=sys-block/parted-3 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/7
 SRC_URI=mirror://kde/stable/kpmcore/3.3.0/src/kpmcore-3.3.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96b2634efaf50528187c4e6aaf393689
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.26 b/metadata/md5-cache/sys-libs/ldb-1.1.26
index 0bbc81f0e124..52510c3158e1 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.1.26
+++ b/metadata/md5-cache/sys-libs/ldb-1.1.26
@@ -10,5 +10,5 @@ RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0/1.1.26
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.1.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=7395e5a275477d6728858004e9c75fa0
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.29-r1 b/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
index 0561c7a72932..550a4e929ee8 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
+++ b/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
@@ -10,5 +10,5 @@ RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/1.1.29
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.1.29.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=6ae2ef87211a13d6d5ebd3b88c26963a
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.31 b/metadata/md5-cache/sys-libs/ldb-1.1.31
index dad4ad1159b2..0b1a89a3e051 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.1.31
+++ b/metadata/md5-cache/sys-libs/ldb-1.1.31
@@ -10,5 +10,5 @@ RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/1.1.31
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.1.31.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=408066e1eea427dfe07a75de297b5d68
diff --git a/metadata/md5-cache/sys-libs/ldb-1.2.3 b/metadata/md5-cache/sys-libs/ldb-1.2.3
index 6c85ee4d5cfa..51e2d61515ef 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.2.3
+++ b/metadata/md5-cache/sys-libs/ldb-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/1.2.3
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=2822513d1ad9194d3b1cfd484da3564b
diff --git a/metadata/md5-cache/sys-libs/ldb-1.3.5 b/metadata/md5-cache/sys-libs/ldb-1.3.5
index d92be75a863e..5a2739a77649 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.3.5
+++ b/metadata/md5-cache/sys-libs/ldb-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/1.3.5
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=9c71e00aecb16932ca43530eb2f8785c
diff --git a/metadata/md5-cache/sys-libs/ldb-1.3.6 b/metadata/md5-cache/sys-libs/ldb-1.3.6
index 4dc9dbf8033f..d369d94f31e3 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.3.6
+++ b/metadata/md5-cache/sys-libs/ldb-1.3.6
@@ -10,5 +10,5 @@ RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/1.3.6
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=9c71e00aecb16932ca43530eb2f8785c
diff --git a/metadata/md5-cache/sys-libs/ldb-1.4.2 b/metadata/md5-cache/sys-libs/ldb-1.4.2
index 9dffa168ae02..8a57cd841407 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.4.2
+++ b/metadata/md5-cache/sys-libs/ldb-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/1.4.2
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=7ca8e45f324f4883a3d0740774076853
diff --git a/metadata/md5-cache/sys-libs/ldb-1.5.1 b/metadata/md5-cache/sys-libs/ldb-1.5.1
index 36631341ea7f..01947180ac94 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.5.1
+++ b/metadata/md5-cache/sys-libs/ldb-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/1.5.1
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=7ca8e45f324f4883a3d0740774076853
diff --git a/metadata/md5-cache/sys-libs/libcxx-3.9.1 b/metadata/md5-cache/sys-libs/libcxx-3.9.1
index 87e33148384e..07d319e5ac7f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-3.9.1
+++ b/metadata/md5-cache/sys-libs/libcxx-3.9.1
@@ -10,5 +10,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-3.9.1[libunwind=,static-libs?,abi_x86_3
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 SLOT=0
 SRC_URI=https://llvm.org/releases/3.9.1/libcxx-3.9.1.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75e383188657686064f6c4d4c9990563
diff --git a/metadata/md5-cache/sys-libs/libcxx-4.0.1 b/metadata/md5-cache/sys-libs/libcxx-4.0.1
index 0668f72a234d..6514e711fdc8 100644
--- a/metadata/md5-cache/sys-libs/libcxx-4.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-4.0.1[libunwind=,static-libs?,abi_x86_3
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/libcxx-4.0.1.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a028e652358c0fe1d597f6435a66e5c9
diff --git a/metadata/md5-cache/sys-libs/libcxx-5.0.2 b/metadata/md5-cache/sys-libs/libcxx-5.0.2
index 3a8e0cfd0d1c..6aad57448200 100644
--- a/metadata/md5-cache/sys-libs/libcxx-5.0.2
+++ b/metadata/md5-cache/sys-libs/libcxx-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-5.0.2[libunwind=,static-libs?,abi_x86_3
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/libcxx-5.0.2.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4e8a3a5a4262d83fada3578d20b515b0
diff --git a/metadata/md5-cache/sys-libs/libcxx-6.0.1 b/metadata/md5-cache/sys-libs/libcxx-6.0.1
index 1af5ddafb6b0..168e738f8fab 100644
--- a/metadata/md5-cache/sys-libs/libcxx-6.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/libcxx-6.0.1.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03aea2816645180d10cada90e02069a7
diff --git a/metadata/md5-cache/sys-libs/libcxx-7.0.0 b/metadata/md5-cache/sys-libs/libcxx-7.0.0
index 9c7ae82cef7d..8ac65436d7c1 100644
--- a/metadata/md5-cache/sys-libs/libcxx-7.0.0
+++ b/metadata/md5-cache/sys-libs/libcxx-7.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.0.0/libcxx-7.0.0.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5fa95f5724c965e42832af93c475450c
diff --git a/metadata/md5-cache/sys-libs/libcxx-7.0.9999 b/metadata/md5-cache/sys-libs/libcxx-7.0.9999
index f72bd5ab8d04..66c0cbedbb07 100644
--- a/metadata/md5-cache/sys-libs/libcxx-7.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-7.0.9999
@@ -9,5 +9,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-7.0.9999[libunwind=,static-libs?,abi_x8
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17794f6f34416009e1191a9a3f6629c7
diff --git a/metadata/md5-cache/sys-libs/libcxx-9999 b/metadata/md5-cache/sys-libs/libcxx-9999
index 8ed36e6a3679..41b2f10db66c 100644
--- a/metadata/md5-cache/sys-libs/libcxx-9999
+++ b/metadata/md5-cache/sys-libs/libcxx-9999
@@ -9,5 +9,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-9999[libunwind=,static-libs?,abi_x86_32
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dfab7db40f4a6a738bf95e5c6b07e7dd
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-3.9.1 b/metadata/md5-cache/sys-libs/libcxxabi-3.9.1
index 3a265dfdb09d..6aef0b5c733c 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-3.9.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-3.9.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://llvm.org/releases/3.9.1/libcxxabi-3.9.1.src.tar.xz https://llvm.org/releases/3.9.1/libcxx-3.9.1.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14f2871792d8c05bc7c5db8719ba1d7f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-4.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-4.0.1
index 924ff598d6c2..76a03fa912b7 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-4.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-4.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/libcxxabi-4.0.1.src.tar.xz https://releases.llvm.org/4.0.1/libcxx-4.0.1.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4524dc967c39b158a58c4590fb67b7a3
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-5.0.2 b/metadata/md5-cache/sys-libs/libcxxabi-5.0.2
index f42f8acc2a8d..38198db17e74 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-5.0.2
+++ b/metadata/md5-cache/sys-libs/libcxxabi-5.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/libcxxabi-5.0.2.src.tar.xz https://releases.llvm.org/5.0.2/libcxx-5.0.2.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=61462aa731df90cdbdc2d66ed7cccf72
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-6.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-6.0.1
index 0b3e3936234d..10ad1962e1e6 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-6.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-6.0.1
@@ -10,5 +10,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/libcxxabi-6.0.1.src.tar.xz https://releases.llvm.org/6.0.1/libcxx-6.0.1.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=29bf3f305c4a0906a8d613fb777b02d8
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-7.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-7.0.0
index 26cbb60495ba..169a7f5fc716 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-7.0.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-7.0.0
@@ -10,5 +10,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.0.0/libcxxabi-7.0.0.src.tar.xz https://releases.llvm.org/7.0.0/libcxx-7.0.0.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e91e7c91cd0f6b6d48802665c1f6437
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-7.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-7.0.9999
index 10d51f2225f6..d9425f3fa16f 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-7.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-7.0.9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=134e0d197df3775bc431efbaddaf2767
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-9999 b/metadata/md5-cache/sys-libs/libcxxabi-9999
index b8fad67a16af..daf5d17b68f1 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d0562d98bd13cfc1f59c8e0aedda839
diff --git a/metadata/md5-cache/sys-libs/libomp-4.0.1 b/metadata/md5-cache/sys-libs/libomp-4.0.1
index 64933b96b352..b33bf323e117 100644
--- a/metadata/md5-cache/sys-libs/libomp-4.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/openmp-4.0.1.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8143f167f9da1b974c6b876240f7065
diff --git a/metadata/md5-cache/sys-libs/libomp-5.0.2 b/metadata/md5-cache/sys-libs/libomp-5.0.2
index aed7c9248a50..0d7de5f00405 100644
--- a/metadata/md5-cache/sys-libs/libomp-5.0.2
+++ b/metadata/md5-cache/sys-libs/libomp-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/openmp-5.0.2.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3616e9bb0a2656b2540169e8849e117a
diff --git a/metadata/md5-cache/sys-libs/libomp-6.0.1 b/metadata/md5-cache/sys-libs/libomp-6.0.1
index 346a09f1d6e0..3e2886a1df26 100644
--- a/metadata/md5-cache/sys-libs/libomp-6.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/openmp-6.0.1.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac3ba5d852c14d2f9726cd8edf3fc7e7
diff --git a/metadata/md5-cache/sys-libs/libomp-7.0.0 b/metadata/md5-cache/sys-libs/libomp-7.0.0
index 1052d13ae180..19d636d9a2de 100644
--- a/metadata/md5-cache/sys-libs/libomp-7.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-7.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.0.0/openmp-7.0.0.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9c04adf2ed5035a985a8f2a2f8fd2604
diff --git a/metadata/md5-cache/sys-libs/libomp-7.0.9999 b/metadata/md5-cache/sys-libs/libomp-7.0.9999
index 90fa5c51dd83..de4fd12377d3 100644
--- a/metadata/md5-cache/sys-libs/libomp-7.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-7.0.9999
@@ -9,5 +9,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f83b7071d6c3751b0de25790dfabe83
diff --git a/metadata/md5-cache/sys-libs/libomp-9999 b/metadata/md5-cache/sys-libs/libomp-9999
index b9d9ca4e356f..5ee17ca61e22 100644
--- a/metadata/md5-cache/sys-libs/libomp-9999
+++ b/metadata/md5-cache/sys-libs/libomp-9999
@@ -9,5 +9,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3b1f1de2d7885a2e570955f68ee33ca
diff --git a/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2 b/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
index 0b2656a157f7..1b150b9a9050 100644
--- a/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
+++ b/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
@@ -3,10 +3,10 @@ DESCRIPTION=Library that allows non-privileged apps to write utmp (login) info
 EAPI=4
 HOMEPAGE=https://altlinux.org/index.php?module=sisyphus&package=libutempter
 IUSE=static-libs elibc_FreeBSD
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=!sys-apps/utempter
 SLOT=0
 SRC_URI=ftp://ftp.altlinux.org/pub/people/ldv/libutempter/libutempter-1.1.6.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2fa98c711be09ef625923cbc366d38eb
+_md5_=754cb96d3b72852d1c411c023a69fd53
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.1
index 96567b35cf66..9e2fa1030549 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/libunwind-4.0.1.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=135bd5b6f2ca9fe9d918914b7bc67f42
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.2 b/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.2
index b1f0adf8c4a3..bb1042a3bc9d 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.2
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/libunwind-5.0.2.src.tar.xz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=824e7478480b4e8fa7ca72e6d475ef07
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.1
index f1557c185da7..cfbdf6d5ce86 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.1
@@ -10,5 +10,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/libunwind-6.0.1.src.tar.xz test? ( https://releases.llvm.org/6.0.1/libcxx-6.0.1.src.tar.xz https://releases.llvm.org/6.0.1/libcxxabi-6.0.1.src.tar.xz )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba9e2c67b31e5bf3c680bfd4cfd0e118
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-7.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-7.0.0
index c1e7a16fabf3..a8ed78eccc54 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-7.0.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-7.0.0
@@ -10,5 +10,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.0.0/libunwind-7.0.0.src.tar.xz test? ( https://releases.llvm.org/7.0.0/libcxx-7.0.0.src.tar.xz https://releases.llvm.org/7.0.0/libcxxabi-7.0.0.src.tar.xz )
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9dc48bfc5d778fa1d14ce96a8757f5c3
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-7.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-7.0.9999
index 733cc018f88a..a471ae949d51 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-7.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-7.0.9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2b9083f6f0fa15cdc69a4b7bd465e21f
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-9999
index 19c0b42c04be..94dfd263d1d5 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=245526a86ec7bd334c7e2ee9884f3455
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3 b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3
index ba3c8bf64183..6a531b143b70 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/nss_wrapper-1.1.3.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0622131c06e9f9d5d5e132d3335c5855
diff --git a/metadata/md5-cache/sys-libs/ntdb-1.0-r1 b/metadata/md5-cache/sys-libs/ntdb-1.0-r1
index 8acf88dc90aa..622a1855e9d9 100644
--- a/metadata/md5-cache/sys-libs/ntdb-1.0-r1
+++ b/metadata/md5-cache/sys-libs/ntdb-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[thr
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tdb/ntdb-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=0891c9964a12e2e319862d3621484724
diff --git a/metadata/md5-cache/sys-libs/pam-1.3.0-r2 b/metadata/md5-cache/sys-libs/pam-1.3.0-r2
index 5fbbaf585028..956ce60e03dd 100644
--- a/metadata/md5-cache/sys-libs/pam-1.3.0-r2
+++ b/metadata/md5-cache/sys-libs/pam-1.3.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
 EAPI=5
 HOMEPAGE=http://www.linux-pam.org/
 IUSE=audit berkdb +cracklib debug nis nls +pie selinux test vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +filecaps
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( BSD GPL-2 )
 PDEPEND=sys-auth/pambase vim-syntax? ( app-editors/vim )
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.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(-)?] ) audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-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-apps/openrc-0.11.8 !sys-auth/openpam !sys-auth/pam_userdb
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.3.0.tar.bz2 http://www.linux-pam.org/library/Linux-PAM-1.3.0-docs.tar.bz2
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a8fae5f074223162254d3d6a6f6a8a31
+_md5_=2e530b65c2f94c61af7965efa81c5c43
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.13 b/metadata/md5-cache/sys-libs/talloc-2.1.13
index 04fa209ad394..2c59c456993f 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.13
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.13.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=8e690bd94d524ee50482c6522e9e4f9e
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.14 b/metadata/md5-cache/sys-libs/talloc-2.1.14
index b84e33691b9b..c7a535e88e0d 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.14
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.14
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.14.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=8e690bd94d524ee50482c6522e9e4f9e
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.5 b/metadata/md5-cache/sys-libs/talloc-2.1.5
index 6314f254637d..71ace2c3e66e 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.5
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=273e15d003a1ecd811b3271376791b89
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.9 b/metadata/md5-cache/sys-libs/talloc-2.1.9
index 091ef538cb4b..b9de11f6f1b9 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.9
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.9
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.9.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=3a9394bbfe4fb0722a21db960ed38edc
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.13 b/metadata/md5-cache/sys-libs/tdb-1.3.13
index 72978be23d83..db1ac470b415 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.13
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.13
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[thr
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tdb/tdb-1.3.13.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=1582e108a13335986f5fa29edeefaf32
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.15 b/metadata/md5-cache/sys-libs/tdb-1.3.15
index 2a8fd069ddf9..d43fb3ad3b47 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.15
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.15
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[thr
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.15.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=315831c7c98a42d1cce7d6580d4dd36d
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.16 b/metadata/md5-cache/sys-libs/tdb-1.3.16
index 9486bdb72af9..464e3630f847 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.16
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.16
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[thr
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.16.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=e108ee7ff08d3cdfa1a30bada4d59ed8
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.8 b/metadata/md5-cache/sys-libs/tdb-1.3.8
index c4b346da1e28..980f8ec91a63 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.8
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.8
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[thr
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tdb/tdb-1.3.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=c27b60356857e88668686b4804476f22
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.28 b/metadata/md5-cache/sys-libs/tevent-0.9.28
index 25f731c83e8b..dc8c148d8b78 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.28
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.28
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/talloc-2.1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.9.28.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=27f9bd6a5e335ff6cb7ef98ec9b8848e
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.31-r1 b/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
index 31d7d1fca110..0ef92d1a00d9 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/talloc-2.1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.9.31.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=f31cc3954e41d8020aaaff44aec844b6
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.36 b/metadata/md5-cache/sys-libs/tevent-0.9.36
index cd07286def73..e48f56d6210d 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.36
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.36
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/talloc-2.1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.9.36.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=3bb127ab91fcf8ed998cd88c7f1287cd
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.37 b/metadata/md5-cache/sys-libs/tevent-0.9.37
index c128a4fee546..9a3d3ed905aa 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.37
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.37
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/talloc-2.1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.9.37.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=de809790c0a9fcdb3999112121ceccf3
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.33.2-r15 b/metadata/md5-cache/sys-libs/uclibc-0.9.33.2-r15
deleted file mode 100644
index b3fec42320cf..000000000000
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.33.2-r15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test unpack
-DESCRIPTION=C library for developing embedded Linux systems
-EAPI=0
-HOMEPAGE=https://www.uclibc.org/
-IUSE=debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only savedconfig
-KEYWORDS=-* amd64 arm m68k ~mips ppc sh sparc x86
-LICENSE=LGPL-2
-RDEPEND=!sys-libs/uclibc-ng
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://uclibc.org/downloads/uClibc-0.9.33.2.tar.bz2 mirror://gentoo/uClibc-0.9.33.2-patches-17.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f0b387833df7a7221e0d7d5dc0b1b15
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.33.9999 b/metadata/md5-cache/sys-libs/uclibc-0.9.33.9999
deleted file mode 100644
index c0bf2dbd184c..000000000000
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.33.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test unpack
-DEPEND=dev-vcs/git
-DESCRIPTION=C library for developing embedded Linux systems
-EAPI=0
-HOMEPAGE=https://www.uclibc.org/
-IUSE=debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only savedconfig
-LICENSE=LGPL-2
-RDEPEND=!sys-libs/uclibc-ng
-RESTRICT=strip
-SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ae7144a644d1bf70c8077fe8fbacd68
diff --git a/metadata/md5-cache/sys-libs/uclibc-9999 b/metadata/md5-cache/sys-libs/uclibc-9999
deleted file mode 100644
index 9695a7a621b3..000000000000
--- a/metadata/md5-cache/sys-libs/uclibc-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test unpack
-DEPEND=dev-vcs/git
-DESCRIPTION=C library for developing embedded Linux systems
-EAPI=0
-HOMEPAGE=https://www.uclibc.org/
-IUSE=debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only savedconfig
-LICENSE=LGPL-2
-RDEPEND=!sys-libs/uclibc-ng
-RESTRICT=strip
-SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=094cc0fb980913b7a280dd3450a74383
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1 b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1
index 52cd753523a7..8ee54018585f 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/uid_wrapper-1.2.1.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.1.tar.gz https://git.samba.org/?p=uid_wrapper.git;a=blobdiff_plain;f=src/uid_wrapper.c;h=ded857a1b18f4744bac324b0ccaee3b2d2d146fa;hp=34889e0c3f955ad04bda3859b734a86763dee529;hb=cf2b35344d4de927f158a1e6d5b6bbc1be2ffd96;hpb=a00a6b8b300b7baa867191e2bc016b835cf8d1b3 -> uid_wrapper-1.2.1-alpha_fix.patch
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7dde74db4b8cb08badec0210f30e7578
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.4 b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.4
index d69442a241fc..03c6ae96857f 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.4
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.4
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/uid_wrapper-1.2.4.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.4.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4302d869ca56ba63a8b423258cb6d291
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 93899fe24f01..e534a60c0da6 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/acpid-2.0.30 b/metadata/md5-cache/sys-power/acpid-2.0.30
index aa6404850a5d..6468592c8fb1 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.30
+++ b/metadata/md5-cache/sys-power/acpid-2.0.30
@@ -4,10 +4,10 @@ DESCRIPTION=Daemon for Advanced Configuration and Power Interface
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/acpid2
 IUSE=selinux kernel_linux
-KEYWORDS=~amd64 ~arm64 ~ia64 ~x86
+KEYWORDS=amd64 ~arm64 ia64 x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.30.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.29-r1_extras.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=89ce77a7ffaf78f402356afa72a00260
+_md5_=05c65f5a2b0bdfd0a69a62a6c5b5e685
diff --git a/metadata/md5-cache/sys-power/thermald-1.7.1 b/metadata/md5-cache/sys-power/thermald-1.7.1
index e7d86841cfa9..42b8f8c28635 100644
--- a/metadata/md5-cache/sys-power/thermald-1.7.1
+++ b/metadata/md5-cache/sys-power/thermald-1.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= sys-apps/dbus:= >=app-portage/elt-patches-20170815 !<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
+DEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= sys-apps/dbus:= dev-util/glib-utils >=app-portage/elt-patches-20170815 !<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=Thermal daemon for Intel architectures
 EAPI=6
 HOMEPAGE=https://01.org/linux-thermal-daemon
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= sys-apps/dbus:=
 SLOT=0
 SRC_URI=https://github.com/01org/thermal_daemon/archive/v1.7.1.tar.gz -> thermald-1.7.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=41f37c663709ea07a147b7d5b06228dd
+_md5_=8563d00233ee8e3c13ab5bee0ee12b4a
diff --git a/metadata/md5-cache/sys-power/thermald-1.8 b/metadata/md5-cache/sys-power/thermald-1.8
new file mode 100644
index 000000000000..327189b02900
--- /dev/null
+++ b/metadata/md5-cache/sys-power/thermald-1.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= sys-apps/dbus:= dev-util/glib-utils >=app-portage/elt-patches-20170815 !<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=Thermal daemon for Intel architectures
+EAPI=6
+HOMEPAGE=https://01.org/linux-thermal-daemon
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= sys-apps/dbus:=
+SLOT=0
+SRC_URI=https://github.com/01org/thermal_daemon/archive/v1.8.tar.gz -> thermald-1.8.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8563d00233ee8e3c13ab5bee0ee12b4a
diff --git a/metadata/md5-cache/sys-power/upower-0.99.7 b/metadata/md5-cache/sys-power/upower-0.99.7
deleted file mode 100644
index 79b88b9f6b56..000000000000
--- a/metadata/md5-cache/sys-power/upower-0.99.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( virtual/libusb:1 virtual/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) doc? ( dev-util/gtk-doc ) dev-libs/libxslt app-text/docbook-xsl-stylesheets dev-util/intltool >=sys-devel/gettext-0.17 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history and statistics
-EAPI=6
-HOMEPAGE=https://upower.freedesktop.org/
-IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( virtual/libusb:1 virtual/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) selinux? ( sec-policy/selinux-devicekit )
-SLOT=0/3
-SRC_URI=https://upower.freedesktop.org/releases/upower-0.99.7.tar.xz
-_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=26eb4bd6e858d1497a277c51f040fc14
diff --git a/metadata/md5-cache/sys-power/upower-0.99.8 b/metadata/md5-cache/sys-power/upower-0.99.8
index 8656afdf667a..d510e3c70c8b 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.8
+++ b/metadata/md5-cache/sys-power/upower-0.99.8
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history an
 EAPI=6
 HOMEPAGE=https://upower.freedesktop.org/
 IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( virtual/libusb:1 virtual/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=0/3
 SRC_URI=https://gitlab.freedesktop.org/upower/upower/uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/upower-0.99.8.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d5bfff898b05f988886d943e1d032de4
+_md5_=03bf0de2e057ce5fb07390cef62496ae
diff --git a/metadata/md5-cache/sys-power/upower-0.99.8-r1 b/metadata/md5-cache/sys-power/upower-0.99.8-r1
new file mode 100644
index 000000000000..dfaeaaf87550
--- /dev/null
+++ b/metadata/md5-cache/sys-power/upower-0.99.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( virtual/libusb:1 virtual/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) doc? ( dev-util/gtk-doc ) dev-libs/libxslt app-text/docbook-xsl-stylesheets dev-util/intltool >=sys-devel/gettext-0.17 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history and statistics
+EAPI=6
+HOMEPAGE=https://upower.freedesktop.org/
+IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( virtual/libusb:1 virtual/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) selinux? ( sec-policy/selinux-devicekit )
+SLOT=0/3
+SRC_URI=https://gitlab.freedesktop.org/upower/upower/uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/upower-0.99.8.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4130c55bcf7b5d73534182f5cb277f03
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 5befd05e1a72..317af92a1e5d 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.8.3 b/metadata/md5-cache/sys-process/audit-2.8.3
index cfa27f7d339f..28710651177a 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.3
+++ b/metadata/md5-cache/sys-process/audit-2.8.3
@@ -4,7 +4,7 @@ DESCRIPTION=Userspace utilities for storing and processing auditing records
 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
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.8.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5f468c2abcadc0571db2f7965367b3c4
+_md5_=713dcef2f53ff205a3096b6d6266515d
diff --git a/metadata/md5-cache/sys-process/htop-2.1.0-r1 b/metadata/md5-cache/sys-process/htop-2.1.0-r1
deleted file mode 100644
index bb9182b6fbf9..000000000000
--- a/metadata/md5-cache/sys-process/htop-2.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses:0=[unicode?] 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(+)?] virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=interactive process viewer
-EAPI=6
-HOMEPAGE=https://hisham.hm/htop/
-IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?]
-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://hisham.hm/htop/releases/2.1.0/htop-2.1.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8ea63887ad529e0eb5cf358f1dbb967e
diff --git a/metadata/md5-cache/sys-process/htop-2.2.0 b/metadata/md5-cache/sys-process/htop-2.2.0
index 1f6861620203..0e77e8ce8995 100644
--- a/metadata/md5-cache/sys-process/htop-2.2.0
+++ b/metadata/md5-cache/sys-process/htop-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=interactive process viewer
 EAPI=6
 HOMEPAGE=https://hisham.hm/htop/
 IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver kernel_linux 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 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_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 )
 SLOT=0
 SRC_URI=https://hisham.hm/htop/releases/2.2.0/htop-2.2.0.tar.gz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=515e7afa4fdda3d1901e9da0ea85decb
+_md5_=21d91111ab46c19f25c3da3467658f5e
diff --git a/metadata/md5-cache/sys-process/htop-3.0.0_beta4 b/metadata/md5-cache/sys-process/htop-3.0.0_beta4
deleted file mode 100644
index b5b757d7adda..000000000000
--- a/metadata/md5-cache/sys-process/htop-3.0.0_beta4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses:0=[unicode?] || ( 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 >=app-portage/elt-patches-20170815 !<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=interactive process viewer
-EAPI=6
-HOMEPAGE=https://hisham.hm/htop/
-IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver kernel_linux
-LICENSE=BSD GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?]
-SLOT=0
-SRC_URI=https://github.com/hishamhm/htop/archive/3.0.0beta4.tar.gz -> htop-3.0.0_beta4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=650e3b6ecc6cc7dce8c96bdaa0b76221
diff --git a/metadata/md5-cache/sys-process/htop-3.0.0_beta5 b/metadata/md5-cache/sys-process/htop-3.0.0_beta5
new file mode 100644
index 000000000000..73f08aa68b94
--- /dev/null
+++ b/metadata/md5-cache/sys-process/htop-3.0.0_beta5
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 prepare setup
+DEPEND=sys-libs/ncurses:0=[unicode?] || ( 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 )
+DESCRIPTION=interactive process viewer
+EAPI=7
+HOMEPAGE=https://hisham.hm/htop/
+IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver kernel_linux
+LICENSE=BSD GPL-2
+RDEPEND=sys-libs/ncurses:0=[unicode?]
+SLOT=0
+SRC_URI=https://github.com/hishamhm/htop/archive/3.0.0beta5.tar.gz -> htop-3.0.0_beta5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=53ff86a01989cd4808d5f6ae7c7bf756
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 49127e93a39e..0cbd6a5333fd 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/cargo-1.29.2 b/metadata/md5-cache/virtual/cargo-1.29.2
new file mode 100644
index 000000000000..d33564762f82
--- /dev/null
+++ b/metadata/md5-cache/virtual/cargo-1.29.2
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Package manager for Rust
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.29.2*[cargo] =dev-lang/rust-bin-1.29.2*[cargo] =dev-util/cargo-0.30.0* )
+SLOT=0
+_md5_=8e1f6bf663f0890cc235ca5b2e3007a9
diff --git a/metadata/md5-cache/virtual/glu-9.0-r2 b/metadata/md5-cache/virtual/glu-9.0-r2
index 678b3301c2e1..c18b052a0c65 100644
--- a/metadata/md5-cache/virtual/glu-9.0-r2
+++ b/metadata/md5-cache/virtual/glu-9.0-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for OpenGL utility library
 EAPI=6
 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=media-libs/glu-9.0.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(-)?] media-libs/opengl-apple dev-util/mingw64-runtime )
 SLOT=0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0b81574691786671fa65c588bea8c3c1
+_md5_=ac8220518e9bbcc322a467346e628d5a
diff --git a/metadata/md5-cache/virtual/httpd-php-7.2 b/metadata/md5-cache/virtual/httpd-php-7.2
index 33abc2ca4125..6d3b831134ab 100644
--- a/metadata/md5-cache/virtual/httpd-php-7.2
+++ b/metadata/md5-cache/virtual/httpd-php-7.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=6
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+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
 RDEPEND=|| ( dev-lang/php:7.2[fpm] dev-lang/php:7.2[apache2] dev-lang/php:7.2[cgi] )
 SLOT=7.2
-_md5_=c99cdfcdb1033bfdfcc7a1abc6b7ef78
+_md5_=f15c61b1eab5104255144f1ae080a13a
diff --git a/metadata/md5-cache/virtual/jdk-11 b/metadata/md5-cache/virtual/jdk-11
new file mode 100644
index 000000000000..270c1324fad1
--- /dev/null
+++ b/metadata/md5-cache/virtual/jdk-11
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Development Kit (JDK)
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64
+RDEPEND=|| ( dev-java/openjdk-bin:11[gentoo-vm(+)] dev-java/openjdk:11[gentoo-vm(+)] dev-java/oracle-jdk-bin:11[gentoo-vm(+)] )
+SLOT=11
+_md5_=7ec1c242b204731b096c8c9bf4759c1f
diff --git a/metadata/md5-cache/virtual/jre-11 b/metadata/md5-cache/virtual/jre-11
new file mode 100644
index 000000000000..07c013641cad
--- /dev/null
+++ b/metadata/md5-cache/virtual/jre-11
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Runtime Environment (JRE)
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64
+RDEPEND=|| ( virtual/jdk:11 dev-java/oracle-jre-bin:11[gentoo-vm(+)] )
+SLOT=11
+_md5_=be4e6e1e8e6dfe0af364a2520465d8a7
diff --git a/metadata/md5-cache/virtual/libmysqlclient-18-r1 b/metadata/md5-cache/virtual/libmysqlclient-18-r1
new file mode 100644
index 000000000000..15ec7a12517b
--- /dev/null
+++ b/metadata/md5-cache/virtual/libmysqlclient-18-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for MySQL client libraries
+EAPI=7
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+RDEPEND=dev-db/mysql-connector-c:0/18[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/18
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=30ca79cdb7c9df2ad1434738cd702cfd
diff --git a/metadata/md5-cache/virtual/opengl-7.0-r2 b/metadata/md5-cache/virtual/opengl-7.0-r2
index 5b2e03e614cc..9db376b7b54d 100644
--- a/metadata/md5-cache/virtual/opengl-7.0-r2
+++ b/metadata/md5-cache/virtual/opengl-7.0-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for OpenGL implementation
 EAPI=6
 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=media-libs/mesa-9.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(-)?] media-libs/opengl-apple dev-util/mingw64-runtime )
 SLOT=0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=dd232a7f90c8cd87f97eb2152144c92b
+_md5_=7729d49bd8d47689d33f3599b9fd11cb
diff --git a/metadata/md5-cache/virtual/perl-Time-Local-1.250.0-r1 b/metadata/md5-cache/virtual/perl-Time-Local-1.250.0-r1
index 29511d7c8289..578a3ae7506d 100644
--- a/metadata/md5-cache/virtual/perl-Time-Local-1.250.0-r1
+++ b/metadata/md5-cache/virtual/perl-Time-Local-1.250.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-Local
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Time-Local-1.250.0 ) dev-lang/perl:= !<perl-core/Time-Local-1.250.0 !>perl-core/Time-Local-1.250.0-r999
 SLOT=0
-_md5_=dda332626f7f80a0bb838605c927003e
+_md5_=93a0b0e3e5c9b740825306f97860ef6a
diff --git a/metadata/md5-cache/virtual/resolvconf-1 b/metadata/md5-cache/virtual/resolvconf-1
index c271c781312d..f68accf82b11 100644
--- a/metadata/md5-cache/virtual/resolvconf-1
+++ b/metadata/md5-cache/virtual/resolvconf-1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to select between different resolvconf providers
 EAPI=7
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
-RDEPEND=net-dns/openresolv
+RDEPEND=|| ( net-dns/openresolv >=sys-apps/systemd-239-r1[resolvconf] )
 SLOT=0
-_md5_=5f4c700b7f9399f18a1b64bcadb105fb
+_md5_=75e1cb945f984f18913bb709b115868b
diff --git a/metadata/md5-cache/virtual/rust-1.29.2 b/metadata/md5-cache/virtual/rust-1.29.2
new file mode 100644
index 000000000000..0cfdb370cdbb
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.29.2
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.29.2* =dev-lang/rust-bin-1.29.2* )
+SLOT=0
+_md5_=3c415d7d9908f5c90d29d966a1bf039b
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 4740fc9c5a33..5117c817d9e2 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.11.3 b/metadata/md5-cache/www-apache/mod_h2-1.11.3
new file mode 100644
index 000000000000..638230c41ca6
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-1.11.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4* >=app-portage/elt-patches-20170815 !<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/2 module for Apache
+EAPI=6
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/releases/download/v1.11.3/mod_http2-1.11.3.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d83bf078b99365887f6cfaed0ad86ca9
diff --git a/metadata/md5-cache/www-apache/mod_h2-9999 b/metadata/md5-cache/www-apache/mod_h2-9999
index c2c6935fbb7d..7a64663d37a2 100644
--- a/metadata/md5-cache/www-apache/mod_h2-9999
+++ b/metadata/md5-cache/www-apache/mod_h2-9999
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
 RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
 SLOT=0
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a3ece310a2dcd91523e4c4cd93aed8e0
+_md5_=d83bf078b99365887f6cfaed0ad86ca9
diff --git a/metadata/md5-cache/www-apache/mod_security-2.9.1-r1 b/metadata/md5-cache/www-apache/mod_security-2.9.1-r1
index 5ec2c0970464..0b1e66abb543 100644
--- a/metadata/md5-cache/www-apache/mod_security-2.9.1-r1
+++ b/metadata/md5-cache/www-apache/mod_security-2.9.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Application firewall and intrusion detection for Apache
 EAPI=5
 HOMEPAGE=http://www.modsecurity.org/
 IUSE=doc fuzzyhash geoip jit json lua mlogc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 PDEPEND=>=www-apache/modsecurity-crs-2.2.6-r1
 RDEPEND=dev-libs/apr dev-libs/apr-util[openssl] dev-libs/libxml2 dev-libs/libpcre[jit?] fuzzyhash? ( app-crypt/ssdeep ) json? ( dev-libs/yajl ) lua? ( dev-lang/lua:0 ) mlogc? ( net-misc/curl ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) mlogc? ( dev-lang/perl ) =www-servers/apache-2*
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0902368edfda1938ea8c499da39502bd
+_md5_=92b2363a2d3fc772b95d43c09094c418
diff --git a/metadata/md5-cache/www-apache/modsecurity-crs-3.0.2 b/metadata/md5-cache/www-apache/modsecurity-crs-3.0.2
index efa41175db66..bef6fb68c709 100644
--- a/metadata/md5-cache/www-apache/modsecurity-crs-3.0.2
+++ b/metadata/md5-cache/www-apache/modsecurity-crs-3.0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Core Rule Set for ModSecurity
 EAPI=6
 HOMEPAGE=https://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project https://modsecurity.org/crs/ https://coreruleset.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=www-apache/mod_security-2.9.1
 SLOT=0
 SRC_URI=https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/v3.0.2.tar.gz -> modsecurity-crs-3.0.2.tar.gz
-_md5_=4220719323f6a4cf4e040dd625e1c89d
+_md5_=cad4d4be41151d5e996fc204ef2ea69d
diff --git a/metadata/md5-cache/www-apache/passenger-5.3.5 b/metadata/md5-cache/www-apache/passenger-5.3.5
new file mode 100644
index 000000000000..3bb3be6a1e70
--- /dev/null
+++ b/metadata/md5-cache/www-apache/passenger-5.3.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
+EAPI=6
+HOMEPAGE=https://www.phusionpassenger.com/
+IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.3.5.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=5420563f6bc0de2495cd263576915b11
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index a348976732be..58b42cf8258b 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/drupal-7.59 b/metadata/md5-cache/www-apps/drupal-7.59
deleted file mode 100644
index 98762b11211c..000000000000
--- a/metadata/md5-cache/www-apps/drupal-7.59
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+accelerator +mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=7.59
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.59.tar.gz
-_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=4af5c80c391d957d2b818723f8003b1b
diff --git a/metadata/md5-cache/www-apps/drupal-7.60 b/metadata/md5-cache/www-apps/drupal-7.60
new file mode 100644
index 000000000000..0be9b8ef4fc5
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-7.60
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+accelerator +mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=7.60
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.60.tar.gz
+_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=04aa9a22efad7211eadbc16a98591450
diff --git a/metadata/md5-cache/www-apps/drupal-8.6.1 b/metadata/md5-cache/www-apps/drupal-8.6.1
deleted file mode 100644
index a3bb7dd4a93a..000000000000
--- a/metadata/md5-cache/www-apps/drupal-8.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+accelerator +mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=8.6.1
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.6.1.tar.gz
-_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=cfa1c1c07b9ec32664f479a353506643
diff --git a/metadata/md5-cache/www-apps/drupal-8.6.2 b/metadata/md5-cache/www-apps/drupal-8.6.2
new file mode 100644
index 000000000000..380dba8e9276
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-8.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+accelerator +mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=8.6.2
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.6.2.tar.gz
+_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=594f568f3b7deb186c1cf586030be223
diff --git a/metadata/md5-cache/www-apps/gitea-1.4.1 b/metadata/md5-cache/www-apps/gitea-1.4.1
deleted file mode 100644
index 1d7ddac71abe..000000000000
--- a/metadata/md5-cache/www-apps/gitea-1.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-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.1.tar.gz -> gitea-1.4.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=dd66520c215a12b8450a3939beef188f
diff --git a/metadata/md5-cache/www-apps/gitea-1.4.3 b/metadata/md5-cache/www-apps/gitea-1.4.3
deleted file mode 100644
index ea09345e9ae6..000000000000
--- a/metadata/md5-cache/www-apps/gitea-1.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-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	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=dd66520c215a12b8450a3939beef188f
diff --git a/metadata/md5-cache/www-apps/gitea-1.5.2 b/metadata/md5-cache/www-apps/gitea-1.5.2
new file mode 100644
index 000000000000..01567daf1387
--- /dev/null
+++ b/metadata/md5-cache/www-apps/gitea-1.5.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=dev-go/go-bindata sys-libs/pam >=dev-lang/go-1.9 virtual/pkgconfig
+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 sys-libs/pam
+SLOT=0
+SRC_URI=https://github.com/go-gitea/gitea/archive/v1.5.2.tar.gz -> gitea-1.5.2.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=74abbbea78990d4628d40a814e8d9f48
diff --git a/metadata/md5-cache/www-apps/grafana-bin-5.2.3 b/metadata/md5-cache/www-apps/grafana-bin-5.2.3
deleted file mode 100644
index f942c1266886..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-5.2.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=6
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.3.linux-amd64.tar.gz -> grafana-bin-5.2.3.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ae4cfc5032feb934b70d8e4295a4fad1
diff --git a/metadata/md5-cache/www-apps/grafana-bin-5.3.1 b/metadata/md5-cache/www-apps/grafana-bin-5.3.1
new file mode 100644
index 000000000000..049053ea42d3
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-5.3.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=6
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.3.1.linux-amd64.tar.gz -> grafana-bin-5.3.1.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=bef5791e7fd675f71bfa0c80e5544b7f
diff --git a/metadata/md5-cache/www-apps/nextcloud-12.0.12 b/metadata/md5-cache/www-apps/nextcloud-12.0.12
new file mode 100644
index 000000000000..212ac462dbb8
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-12.0.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=6
+HOMEPAGE=http://nextcloud.com
+IUSE=+curl mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=<dev-lang/php-7.2[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip] <virtual/httpd-php-7.2 >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=12.0.12
+SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-12.0.12.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=6f7abeba14837c264e0aece14140e982
diff --git a/metadata/md5-cache/www-apps/nextcloud-13.0.7 b/metadata/md5-cache/www-apps/nextcloud-13.0.7
new file mode 100644
index 000000000000..9a6419006d15
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-13.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=6
+HOMEPAGE=http://nextcloud.com
+IUSE=+curl mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=13.0.7
+SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-13.0.7.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=cef2f83b4b3218f8bc0ac09906cf2630
diff --git a/metadata/md5-cache/www-apps/nextcloud-14.0.3 b/metadata/md5-cache/www-apps/nextcloud-14.0.3
new file mode 100644
index 000000000000..a529f32766ef
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-14.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=6
+HOMEPAGE=http://nextcloud.com
+IUSE=+curl mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=14.0.3
+SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-14.0.3.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=cef2f83b4b3218f8bc0ac09906cf2630
diff --git a/metadata/md5-cache/www-apps/trac-1.0.13 b/metadata/md5-cache/www-apps/trac-1.0.13
deleted file mode 100644
index cc0a4a6979fd..000000000000
--- a/metadata/md5-cache/www-apps/trac-1.0.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) test? ( dev-python/twill[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/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/configobj[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Enhanced wiki and issue tracking system for software development projects
-EAPI=5
-HOMEPAGE=http://trac.edgewall.com/ https://pypi.org/project/Trac/
-IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test python_targets_python2_7 vhosts
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite ) python_targets_python2_7
-SLOT=0
-SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3effcf5e16a3c4565f2555edafc8cd90
diff --git a/metadata/md5-cache/www-apps/trac-1.0.9 b/metadata/md5-cache/www-apps/trac-1.0.9
index 0b18ec47527e..5ccb86537440 100644
--- a/metadata/md5-cache/www-apps/trac-1.0.9
+++ b/metadata/md5-cache/www-apps/trac-1.0.9
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) test? ( dev-python/twill[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/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/configobj[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
+DEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
 DESCRIPTION=Enhanced wiki and issue tracking system for software development projects
 EAPI=5
 HOMEPAGE=http://trac.edgewall.com/ https://pypi.org/project/Trac/
-IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test python_targets_python2_7 vhosts
+IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion python_targets_python2_7 vhosts
 KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite ) python_targets_python2_7
+RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.0.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0751904217fa740e1bc8da3c96367061
+_md5_=39bbde509cea6f324f68e99fa6f93158
diff --git a/metadata/md5-cache/www-apps/trac-1.2 b/metadata/md5-cache/www-apps/trac-1.2
deleted file mode 100644
index e37d491c9f3d..000000000000
--- a/metadata/md5-cache/www-apps/trac-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) test? ( dev-python/twill[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/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/configobj[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Enhanced wiki and issue tracking system for software development projects
-EAPI=5
-HOMEPAGE=http://trac.edgewall.com/ https://pypi.org/project/Trac/
-IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test python_targets_python2_7 vhosts
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite ) python_targets_python2_7
-SLOT=0
-SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3effcf5e16a3c4565f2555edafc8cd90
diff --git a/metadata/md5-cache/www-apps/trac-1.2-r1 b/metadata/md5-cache/www-apps/trac-1.2-r1
deleted file mode 100644
index 5708b185dce8..000000000000
--- a/metadata/md5-cache/www-apps/trac-1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) test? ( dev-python/twill[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/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/configobj[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Enhanced wiki and issue tracking system for software development projects
-EAPI=5
-HOMEPAGE=http://trac.edgewall.com/ https://pypi.org/project/Trac/
-IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test python_targets_python2_7 vhosts
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite ) python_targets_python2_7
-SLOT=0
-SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=94699421e4572d6baf4433567cbbb295
diff --git a/metadata/md5-cache/www-apps/trac-1.2.1 b/metadata/md5-cache/www-apps/trac-1.2.1
index 777655d8886d..504dd3c7aa78 100644
--- a/metadata/md5-cache/www-apps/trac-1.2.1
+++ b/metadata/md5-cache/www-apps/trac-1.2.1
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) test? ( dev-python/twill[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/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/configobj[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
+DEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
 DESCRIPTION=Enhanced wiki and issue tracking system for software development projects
 EAPI=5
 HOMEPAGE=http://trac.edgewall.com/ https://pypi.org/project/Trac/
-IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test python_targets_python2_7 vhosts
+IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion python_targets_python2_7 vhosts
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[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/genshi[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/pytz[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(+)] i18n? ( >=dev-python/Babel-0.9.5[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(+)] ) highlight? ( || ( dev-python/pygments[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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[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(+)] ) mysql? ( dev-python/mysql-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(+)] ) postgres? ( >=dev-python/psycopg-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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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(+)] >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite ) python_targets_python2_7
+RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=82baf7dea66014314f3d5a24120a2269
+_md5_=d8e06cf2923083b863cd85d8048025a3
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index e4d4274ed835..5ac7b5076d3b 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-69.0.3497.100 b/metadata/md5-cache/www-client/chromium-69.0.3497.100
deleted file mode 100644
index a9391a2d42e1..000000000000
--- a/metadata/md5-cache/www-client/chromium-69.0.3497.100
+++ /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/gn >=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 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.100.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4e7be384c03f9aad72b1b8e074ff67f0
diff --git a/metadata/md5-cache/www-client/chromium-70.0.3538.22 b/metadata/md5-cache/www-client/chromium-70.0.3538.22
deleted file mode 100644
index 92d07bcccad0..000000000000
--- a/metadata/md5-cache/www-client/chromium-70.0.3538.22
+++ /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.8.8:=[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/gn >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[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.8.8:=[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 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.3538.22.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1c6e086ef3a8a186fde8b7b5d540d305
diff --git a/metadata/md5-cache/www-client/chromium-70.0.3538.35 b/metadata/md5-cache/www-client/chromium-70.0.3538.35
deleted file mode 100644
index e8d9c5a5da42..000000000000
--- a/metadata/md5-cache/www-client/chromium-70.0.3538.35
+++ /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.8.8:=[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/gn >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[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.8.8:=[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 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.3538.35.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1c6e086ef3a8a186fde8b7b5d540d305
diff --git a/metadata/md5-cache/www-client/chromium-70.0.3538.67 b/metadata/md5-cache/www-client/chromium-70.0.3538.67
new file mode 100644
index 000000000000..106499864a5c
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-70.0.3538.67
@@ -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.8.8:0=[icu(-)] <media-libs/harfbuzz-2.0.0:0 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/gn >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git >=sys-devel/clang-5 >=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.8.8:0=[icu(-)] <media-libs/harfbuzz-2.0.0:0 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 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.3538.67.tar.xz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6649c2f86f4c08ea8b70816464920c32
diff --git a/metadata/md5-cache/www-client/chromium-70.0.3538.67-r1 b/metadata/md5-cache/www-client/chromium-70.0.3538.67-r1
new file mode 100644
index 000000000000..bb8a268e7b8a
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-70.0.3538.67-r1
@@ -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-2.0.0: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/gn >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git >=sys-devel/clang-5 >=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-2.0.0: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 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.3538.67.tar.xz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3242f9946402756893836a25107ca84f
diff --git a/metadata/md5-cache/www-client/chromium-71.0.3554.4 b/metadata/md5-cache/www-client/chromium-71.0.3554.4
deleted file mode 100644
index fd613b7ec48c..000000000000
--- a/metadata/md5-cache/www-client/chromium-71.0.3554.4
+++ /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.8.8:=[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/gn >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[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.8.8:=[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 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-71.0.3554.4.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eaa9bbb84657c35f2d4dead680d1ced5
diff --git a/metadata/md5-cache/www-client/chromium-71.0.3559.6 b/metadata/md5-cache/www-client/chromium-71.0.3559.6
deleted file mode 100644
index 67c26390af1b..000000000000
--- a/metadata/md5-cache/www-client/chromium-71.0.3559.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git >=sys-devel/clang-5
-DEFINED_PHASES=compile configure install postinst postrm 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.8.8:=[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 )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-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.8.8:=[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 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-71.0.3559.6.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0a66cb8e734838ec18faf866939a31ec
diff --git a/metadata/md5-cache/www-client/chromium-71.0.3573.0 b/metadata/md5-cache/www-client/chromium-71.0.3573.0
new file mode 100644
index 000000000000..f7f3cf3c0187
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-71.0.3573.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git >=sys-devel/clang-5
+DEFINED_PHASES=compile configure install postinst postrm 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.8.8:=[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 )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+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.8.8:=[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 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-71.0.3573.0.tar.xz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=496b1df345045d9eb73a1c5b77ff1c45
diff --git a/metadata/md5-cache/www-client/chromium-71.0.3578.10 b/metadata/md5-cache/www-client/chromium-71.0.3578.10
new file mode 100644
index 000000000000..e44039e09dcc
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-71.0.3578.10
@@ -0,0 +1,15 @@
+BDEPEND=>=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git >=sys-devel/clang-5
+DEFINED_PHASES=compile configure install postinst postrm 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-2.0.0: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 )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+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-2.0.0: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 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-71.0.3578.10.tar.xz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a001a3ecafbe84a616f3fb78ed590877
diff --git a/metadata/md5-cache/www-client/falkon-3.0.1 b/metadata/md5-cache/www-client/falkon-3.0.1
index 525a8584d09a..02e623fc9560 100644
--- a/metadata/md5-cache/www-client/falkon-3.0.1
+++ b/metadata/md5-cache/www-client/falkon-3.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.46.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= x11-libs/xcb-util ) >=dev-qt/linguist-tools-5.9.2:5 >=dev-qt/qtconcurrent-5.9.2:5 gnome-keyring? ( virtual/pkgconfig ) >=kde-frameworks/ki18n-5.46.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.46.0:5 test? ( >=dev-qt/qttest-5.9.2:5 ) >=dev-qt/qtcore-5.9.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.50.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= x11-libs/xcb-util ) >=dev-qt/linguist-tools-5.9.2:5 >=dev-qt/qtconcurrent-5.9.2:5 gnome-keyring? ( virtual/pkgconfig ) >=kde-frameworks/ki18n-5.50.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.50.0:5 test? ( >=dev-qt/qttest-5.9.2:5 ) >=dev-qt/qtcore-5.9.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Cross-platform web browser using QtWebEngine
 EAPI=6
 HOMEPAGE=https://www.falkon.org/
 IUSE=dbus gnome-keyring kwallet libressl +X test debug test
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.46.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= x11-libs/xcb-util ) !www-client/qupzilla >=dev-qt/qtsvg-5.9.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.2:5
+RDEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.50.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= x11-libs/xcb-util ) !www-client/qupzilla >=dev-qt/qtsvg-5.9.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.2:5
 SLOT=0
 SRC_URI=mirror://kde/stable/falkon/3.0.1/falkon-3.0.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c331b0be4ca319ce8dd3ee910d91d0d
diff --git a/metadata/md5-cache/www-client/firefox-62.0.3 b/metadata/md5-cache/www-client/firefox-62.0.3
index db207aea219d..c5ab2f62ebd3 100644
--- a/metadata/md5-cache/www-client/firefox-62.0.3
+++ b/metadata/md5-cache/www-client/firefox-62.0.3
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ach.xpi -> firefox-62.0.3-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/af.xpi -> firefox-62.0.3-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/an.xpi -> firefox-62.0.3-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ar.xpi -> firefox-62.0.3-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/as.xpi -> firefox-62.0.3-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ast.xpi -> firefox-62.0.3-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/az.xpi -> firefox-62.0.3-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/bg.xpi -> firefox-62.0.3-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/bn-BD.xpi -> firefox-62.0.3-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/bn-IN.xpi -> firefox-62.0.3-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/br.xpi -> firefox-62.0.3-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/bs.xpi -> firefox-62.0.3-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ca.xpi -> firefox-62.0.3-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/cak.xpi -> firefox-62.0.3-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/cs.xpi -> firefox-62.0.3-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/cy.xpi -> firefox-62.0.3-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/da.xpi -> firefox-62.0.3-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/de.xpi -> firefox-62.0.3-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/dsb.xpi -> firefox-62.0.3-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/el.xpi -> firefox-62.0.3-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/en-GB.xpi -> firefox-62.0.3-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/en-ZA.xpi -> firefox-62.0.3-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/eo.xpi -> firefox-62.0.3-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/es-AR.xpi -> firefox-62.0.3-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/es-CL.xpi -> firefox-62.0.3-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/es-ES.xpi -> firefox-62.0.3-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/es-MX.xpi -> firefox-62.0.3-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/et.xpi -> firefox-62.0.3-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/eu.xpi -> firefox-62.0.3-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/fa.xpi -> firefox-62.0.3-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ff.xpi -> firefox-62.0.3-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/fi.xpi -> firefox-62.0.3-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/fr.xpi -> firefox-62.0.3-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/fy-NL.xpi -> firefox-62.0.3-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ga-IE.xpi -> firefox-62.0.3-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/gd.xpi -> firefox-62.0.3-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/gl.xpi -> firefox-62.0.3-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/gn.xpi -> firefox-62.0.3-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/gu-IN.xpi -> firefox-62.0.3-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/he.xpi -> firefox-62.0.3-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/hi-IN.xpi -> firefox-62.0.3-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/hr.xpi -> firefox-62.0.3-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/hsb.xpi -> firefox-62.0.3-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/hu.xpi -> firefox-62.0.3-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/hy-AM.xpi -> firefox-62.0.3-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/id.xpi -> firefox-62.0.3-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/is.xpi -> firefox-62.0.3-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/it.xpi -> firefox-62.0.3-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ja.xpi -> firefox-62.0.3-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ka.xpi -> firefox-62.0.3-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/kab.xpi -> firefox-62.0.3-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/kk.xpi -> firefox-62.0.3-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/km.xpi -> firefox-62.0.3-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/kn.xpi -> firefox-62.0.3-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ko.xpi -> firefox-62.0.3-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/lij.xpi -> firefox-62.0.3-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/lt.xpi -> firefox-62.0.3-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/lv.xpi -> firefox-62.0.3-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/mai.xpi -> firefox-62.0.3-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/mk.xpi -> firefox-62.0.3-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ml.xpi -> firefox-62.0.3-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/mr.xpi -> firefox-62.0.3-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ms.xpi -> firefox-62.0.3-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/nb-NO.xpi -> firefox-62.0.3-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/nl.xpi -> firefox-62.0.3-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/nn-NO.xpi -> firefox-62.0.3-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/or.xpi -> firefox-62.0.3-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/pa-IN.xpi -> firefox-62.0.3-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/pl.xpi -> firefox-62.0.3-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/pt-BR.xpi -> firefox-62.0.3-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/pt-PT.xpi -> firefox-62.0.3-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/rm.xpi -> firefox-62.0.3-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ro.xpi -> firefox-62.0.3-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ru.xpi -> firefox-62.0.3-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/si.xpi -> firefox-62.0.3-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/sk.xpi -> firefox-62.0.3-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/sl.xpi -> firefox-62.0.3-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/son.xpi -> firefox-62.0.3-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/sq.xpi -> firefox-62.0.3-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/sr.xpi -> firefox-62.0.3-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/sv-SE.xpi -> firefox-62.0.3-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/ta.xpi -> firefox-62.0.3-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/te.xpi -> firefox-62.0.3-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/th.xpi -> firefox-62.0.3-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/tr.xpi -> firefox-62.0.3-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/uk.xpi -> firefox-62.0.3-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/uz.xpi -> firefox-62.0.3-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/vi.xpi -> firefox-62.0.3-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/xh.xpi -> firefox-62.0.3-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/zh-CN.xpi -> firefox-62.0.3-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xpi/zh-TW.xpi -> firefox-62.0.3-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/62.0.3/source/firefox-62.0.3.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-62.0-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-62.0-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-62.0-patches-01.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozcoreconf-v6	1139e0e37e324d9066382d5f359f574a	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1b80028e4c6320f324e13111b7e290b5
+_md5_=e394734f211324ab2af5fe512c307a52
diff --git a/metadata/md5-cache/www-client/google-chrome-69.0.3497.100 b/metadata/md5-cache/www-client/google-chrome-69.0.3497.100
deleted file mode 100644
index 4a6e9df486f0..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-69.0.3497.100
+++ /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-stable/google-chrome-stable_69.0.3497.100-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2a655510f6c9a1a87183ff004ee8a274
diff --git a/metadata/md5-cache/www-client/google-chrome-70.0.3538.67 b/metadata/md5-cache/www-client/google-chrome-70.0.3538.67
new file mode 100644
index 000000000000..2ff40e7dae23
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-70.0.3538.67
@@ -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-stable/google-chrome-stable_70.0.3538.67-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=35bd9901c262e94ed233921ccff25234
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-70.0.3538.35 b/metadata/md5-cache/www-client/google-chrome-beta-70.0.3538.35
deleted file mode 100644
index 6789be71d818..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-70.0.3538.35
+++ /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_70.0.3538.35-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d3c601874225d2641327e0dad32aaa08
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-70.0.3538.67 b/metadata/md5-cache/www-client/google-chrome-beta-70.0.3538.67
new file mode 100644
index 000000000000..b167fd287231
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-70.0.3538.67
@@ -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_70.0.3538.67-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d3c601874225d2641327e0dad32aaa08
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-71.0.3559.6 b/metadata/md5-cache/www-client/google-chrome-unstable-71.0.3559.6
deleted file mode 100644
index f92bedc47cd0..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-71.0.3559.6
+++ /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_71.0.3559.6-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0f91cda68f6c2007b328e32e3e7cd64a
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-71.0.3578.10 b/metadata/md5-cache/www-client/google-chrome-unstable-71.0.3578.10
new file mode 100644
index 000000000000..367c1abfc595
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-71.0.3578.10
@@ -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_71.0.3578.10-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0f91cda68f6c2007b328e32e3e7cd64a
diff --git a/metadata/md5-cache/www-client/netsurf-3.6 b/metadata/md5-cache/www-client/netsurf-3.6
deleted file mode 100644
index 28923195c626..000000000000
--- a/metadata/md5-cache/www-client/netsurf-3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libnsutils-0.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(-)?] >=dev-libs/libutf8proc-1.1.6-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2: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(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,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/libcss-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libhubbub-0.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(-)?] >=net-libs/libdom-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bmp? ( >=media-libs/libnsbmp-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gif? ( >=media-libs/libnsgif-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk2? ( 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(-)?] x11-libs/gtk+: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(-)?] ) gtk3? ( 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(-)?] 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(-)?] ) gtk? ( 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(-)?] 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(-)?] ) gstreamer? ( media-libs/gstreamer: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(-)?] ) javascript? ( >=dev-libs/nsgenbind-0.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(-)?] !duktape? ( dev-lang/spidermonkey:0= ) ) 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(-)?] ) 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(-)?] ) pdf-writer? ( media-libs/libharu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51: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(-)?] ) psl? ( media-libs/libnspsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rosprite? ( >=media-libs/librosprite-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !svgtiny? ( gnome-base/librsvg: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(-)?] ) ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/HTML-Parser virtual/pkgconfig
-DESCRIPTION=a free, open source web browser
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/
-IUSE=+bmp +duktape fbcon truetype +gif gstreamer gtk gtk2 gtk3 +javascript +jpeg +mng pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_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 debug
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=GPL-2 MIT
-RDEPEND=>=dev-libs/libnsutils-0.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(-)?] >=dev-libs/libutf8proc-1.1.6-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2: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(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,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/libcss-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libhubbub-0.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(-)?] >=net-libs/libdom-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bmp? ( >=media-libs/libnsbmp-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gif? ( >=media-libs/libnsgif-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk2? ( 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(-)?] x11-libs/gtk+: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(-)?] ) gtk3? ( 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(-)?] 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(-)?] ) gtk? ( 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(-)?] 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(-)?] ) gstreamer? ( media-libs/gstreamer: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(-)?] ) javascript? ( >=dev-libs/nsgenbind-0.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(-)?] !duktape? ( dev-lang/spidermonkey:0= ) ) 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(-)?] ) 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(-)?] ) pdf-writer? ( media-libs/libharu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51: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(-)?] ) psl? ( media-libs/libnspsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rosprite? ( >=media-libs/librosprite-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !svgtiny? ( gnome-base/librsvg: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(-)?] ) ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=|| ( fbcon gtk gtk2 gtk3 ) amd64? ( abi_x86_32? ( javascript? ( duktape ) ) ) fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x ) ) duktape? ( javascript )
-SLOT=0
-SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.6-src.tar.gz http://xmw.de/mirror/netsurf-fb.modes-example.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8da622b797f5f86bcc2747d3d4150323
diff --git a/metadata/md5-cache/www-client/netsurf-3.8 b/metadata/md5-cache/www-client/netsurf-3.8
new file mode 100644
index 000000000000..12514613d11a
--- /dev/null
+++ b/metadata/md5-cache/www-client/netsurf-3.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libnsutils-0.0.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libutf8proc-2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,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/libcss-0.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libhubbub-0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libdom-0.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(-)?] bmp? ( >=media-libs/libnsbmp-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fbcon? ( >=dev-libs/libnsfb-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(-)?] truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gif? ( >=media-libs/libnsgif-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk2? ( 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(-)?] x11-libs/gtk+: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(-)?] ) gtk3? ( 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(-)?] 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(-)?] ) gtk? ( 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(-)?] 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(-)?] ) javascript? ( >=dev-libs/nsgenbind-0.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(-)?] !duktape? ( dev-lang/spidermonkey:0= ) ) 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(-)?] ) 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(-)?] ) pdf-writer? ( media-libs/libharu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51: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(-)?] ) psl? ( media-libs/libnspsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rosprite? ( >=media-libs/librosprite-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !svgtiny? ( gnome-base/librsvg: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(-)?] ) ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/HTML-Parser virtual/pkgconfig
+DESCRIPTION=a free, open source web browser
+EAPI=6
+HOMEPAGE=http://www.netsurf-browser.org/
+IUSE=+bmp +duktape fbcon truetype +gif gtk gtk2 gtk3 +javascript +jpeg +mng pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_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 debug
+KEYWORDS=~amd64 ~arm ~ppc
+LICENSE=GPL-2 MIT
+RDEPEND=>=dev-libs/libnsutils-0.0.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libutf8proc-2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,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/libcss-0.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libhubbub-0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libdom-0.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(-)?] bmp? ( >=media-libs/libnsbmp-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fbcon? ( >=dev-libs/libnsfb-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(-)?] truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gif? ( >=media-libs/libnsgif-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk2? ( 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(-)?] x11-libs/gtk+: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(-)?] ) gtk3? ( 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(-)?] 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(-)?] ) gtk? ( 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(-)?] 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(-)?] ) javascript? ( >=dev-libs/nsgenbind-0.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(-)?] !duktape? ( dev-lang/spidermonkey:0= ) ) 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(-)?] ) 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(-)?] ) pdf-writer? ( media-libs/libharu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51: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(-)?] ) psl? ( media-libs/libnspsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rosprite? ( >=media-libs/librosprite-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !svgtiny? ( gnome-base/librsvg: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(-)?] ) ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=|| ( fbcon gtk gtk2 gtk3 ) amd64? ( abi_x86_32? ( javascript? ( duktape ) ) ) fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x ) ) duktape? ( javascript )
+SLOT=0
+SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.8-src.tar.gz http://xmw.de/mirror/netsurf-fb.modes-example.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz -> netsurf-buildsystem-1.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	f98e0347dc6382dca0027e44bdb21876	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=368af2bc8c3c7933963fef7fc329f824
diff --git a/metadata/md5-cache/www-client/opera-56.0.3051.31 b/metadata/md5-cache/www-client/opera-56.0.3051.31
deleted file mode 100644
index a778b69fc638..000000000000
--- a/metadata/md5-cache/www-client/opera-56.0.3051.31
+++ /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+: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=https://download1.operacdn.com/pub/opera/desktop/56.0.3051.31/linux/opera-stable_56.0.3051.31_amd64.deb https://download2.operacdn.com/pub/opera/desktop/56.0.3051.31/linux/opera-stable_56.0.3051.31_amd64.deb https://download3.operacdn.com/pub/opera/desktop/56.0.3051.31/linux/opera-stable_56.0.3051.31_amd64.deb https://download4.operacdn.com/pub/opera/desktop/56.0.3051.31/linux/opera-stable_56.0.3051.31_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d273a0c88b520998ecc63bd54d7d475e
diff --git a/metadata/md5-cache/www-client/opera-56.0.3051.36 b/metadata/md5-cache/www-client/opera-56.0.3051.36
deleted file mode 100644
index 0c1b84167d8e..000000000000
--- a/metadata/md5-cache/www-client/opera-56.0.3051.36
+++ /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+: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=https://download1.operacdn.com/pub/opera/desktop/56.0.3051.36/linux/opera-stable_56.0.3051.36_amd64.deb https://download2.operacdn.com/pub/opera/desktop/56.0.3051.36/linux/opera-stable_56.0.3051.36_amd64.deb https://download3.operacdn.com/pub/opera/desktop/56.0.3051.36/linux/opera-stable_56.0.3051.36_amd64.deb https://download4.operacdn.com/pub/opera/desktop/56.0.3051.36/linux/opera-stable_56.0.3051.36_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d273a0c88b520998ecc63bd54d7d475e
diff --git a/metadata/md5-cache/www-client/opera-56.0.3051.43 b/metadata/md5-cache/www-client/opera-56.0.3051.43
new file mode 100644
index 000000000000..b28937d1b408
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-56.0.3051.43
@@ -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+: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=https://download1.operacdn.com/pub/opera/desktop/56.0.3051.43/linux/opera-stable_56.0.3051.43_amd64.deb https://download2.operacdn.com/pub/opera/desktop/56.0.3051.43/linux/opera-stable_56.0.3051.43_amd64.deb https://download3.operacdn.com/pub/opera/desktop/56.0.3051.43/linux/opera-stable_56.0.3051.43_amd64.deb https://download4.operacdn.com/pub/opera/desktop/56.0.3051.43/linux/opera-stable_56.0.3051.43_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d273a0c88b520998ecc63bd54d7d475e
diff --git a/metadata/md5-cache/www-client/opera-56.0.3051.52 b/metadata/md5-cache/www-client/opera-56.0.3051.52
new file mode 100644
index 000000000000..9cffc10f47e1
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-56.0.3051.52
@@ -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+: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=https://download1.operacdn.com/pub/opera/desktop/56.0.3051.52/linux/opera-stable_56.0.3051.52_amd64.deb https://download2.operacdn.com/pub/opera/desktop/56.0.3051.52/linux/opera-stable_56.0.3051.52_amd64.deb https://download3.operacdn.com/pub/opera/desktop/56.0.3051.52/linux/opera-stable_56.0.3051.52_amd64.deb https://download4.operacdn.com/pub/opera/desktop/56.0.3051.52/linux/opera-stable_56.0.3051.52_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d273a0c88b520998ecc63bd54d7d475e
diff --git a/metadata/md5-cache/www-client/opera-beta-56.0.3051.28 b/metadata/md5-cache/www-client/opera-beta-56.0.3051.28
deleted file mode 100644
index d4287d8a0369..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-56.0.3051.28
+++ /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+: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-beta/56.0.3051.28/linux/opera-beta_56.0.3051.28_amd64.deb https://download2.operacdn.com/pub/opera-beta/56.0.3051.28/linux/opera-beta_56.0.3051.28_amd64.deb https://download3.operacdn.com/pub/opera-beta/56.0.3051.28/linux/opera-beta_56.0.3051.28_amd64.deb https://download4.operacdn.com/pub/opera-beta/56.0.3051.28/linux/opera-beta_56.0.3051.28_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b77efdb8e91bcd8026e9271143ca1599
diff --git a/metadata/md5-cache/www-client/opera-beta-57.0.3098.14 b/metadata/md5-cache/www-client/opera-beta-57.0.3098.14
new file mode 100644
index 000000000000..cfb7b53510cd
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-57.0.3098.14
@@ -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-beta/57.0.3098.14/linux/opera-beta_57.0.3098.14_amd64.deb https://download2.operacdn.com/pub/opera-beta/57.0.3098.14/linux/opera-beta_57.0.3098.14_amd64.deb https://download3.operacdn.com/pub/opera-beta/57.0.3098.14/linux/opera-beta_57.0.3098.14_amd64.deb https://download4.operacdn.com/pub/opera-beta/57.0.3098.14/linux/opera-beta_57.0.3098.14_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ea7d35380002c190fab8b56c8ce87871
diff --git a/metadata/md5-cache/www-client/opera-beta-57.0.3098.6 b/metadata/md5-cache/www-client/opera-beta-57.0.3098.6
new file mode 100644
index 000000000000..70b4485dd3ca
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-57.0.3098.6
@@ -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-beta/57.0.3098.6/linux/opera-beta_57.0.3098.6_amd64.deb https://download2.operacdn.com/pub/opera-beta/57.0.3098.6/linux/opera-beta_57.0.3098.6_amd64.deb https://download3.operacdn.com/pub/opera-beta/57.0.3098.6/linux/opera-beta_57.0.3098.6_amd64.deb https://download4.operacdn.com/pub/opera-beta/57.0.3098.6/linux/opera-beta_57.0.3098.6_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ea7d35380002c190fab8b56c8ce87871
diff --git a/metadata/md5-cache/www-client/opera-developer-57.0.3090.0 b/metadata/md5-cache/www-client/opera-developer-57.0.3090.0
deleted file mode 100644
index aecbd6888120..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-57.0.3090.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/57.0.3090.0/linux/opera-developer_57.0.3090.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/57.0.3090.0/linux/opera-developer_57.0.3090.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/57.0.3090.0/linux/opera-developer_57.0.3090.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/57.0.3090.0/linux/opera-developer_57.0.3090.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ea7d35380002c190fab8b56c8ce87871
diff --git a/metadata/md5-cache/www-client/opera-developer-57.0.3098.1 b/metadata/md5-cache/www-client/opera-developer-57.0.3098.1
deleted file mode 100644
index 6de6b206c5f0..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-57.0.3098.1
+++ /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/57.0.3098.1/linux/opera-developer_57.0.3098.1_amd64.deb https://download2.operacdn.com/pub/opera-developer/57.0.3098.1/linux/opera-developer_57.0.3098.1_amd64.deb https://download3.operacdn.com/pub/opera-developer/57.0.3098.1/linux/opera-developer_57.0.3098.1_amd64.deb https://download4.operacdn.com/pub/opera-developer/57.0.3098.1/linux/opera-developer_57.0.3098.1_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ea7d35380002c190fab8b56c8ce87871
diff --git a/metadata/md5-cache/www-client/opera-developer-58.0.3105.0 b/metadata/md5-cache/www-client/opera-developer-58.0.3105.0
new file mode 100644
index 000000000000..2510c909f8b2
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-58.0.3105.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/58.0.3105.0/linux/opera-developer_58.0.3105.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/58.0.3105.0/linux/opera-developer_58.0.3105.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/58.0.3105.0/linux/opera-developer_58.0.3105.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/58.0.3105.0/linux/opera-developer_58.0.3105.0_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ea7d35380002c190fab8b56c8ce87871
diff --git a/metadata/md5-cache/www-client/opera-developer-58.0.3111.0 b/metadata/md5-cache/www-client/opera-developer-58.0.3111.0
new file mode 100644
index 000000000000..93abf7c789fc
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-58.0.3111.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/58.0.3111.0/linux/opera-developer_58.0.3111.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/58.0.3111.0/linux/opera-developer_58.0.3111.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/58.0.3111.0/linux/opera-developer_58.0.3111.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/58.0.3111.0/linux/opera-developer_58.0.3111.0_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ea7d35380002c190fab8b56c8ce87871
diff --git a/metadata/md5-cache/www-client/pybugz-0.13 b/metadata/md5-cache/www-client/pybugz-0.13
index 4b341f949657..552851f07716 100644
--- a/metadata/md5-cache/www-client/pybugz-0.13
+++ b/metadata/md5-cache/www-client/pybugz-0.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) >=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(-)]
+DEPEND=dev-python/setuptools[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(-)] python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline(+)] ) >=dev-lang/python-exec-2:=[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(-)]
 DESCRIPTION=Command line interface to (Gentoo) Bugzilla
 EAPI=5
 HOMEPAGE=https://github.com/williamh/pybugz
-IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=zsh-completion 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 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) >=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 )
+RDEPEND=dev-python/setuptools[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(-)] python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline(+)] ) >=dev-lang/python-exec-2:=[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(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/williamh/pybugz/archive/0.13.tar.gz -> pybugz-0.13.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=89d815a722a88b7f843c5b82ce0267a6
+_md5_=528d69363bcf0a4119d4587c7d2256ba
diff --git a/metadata/md5-cache/www-client/pybugz-9999 b/metadata/md5-cache/www-client/pybugz-9999
index ad9f900711f2..f18061918518 100644
--- a/metadata/md5-cache/www-client/pybugz-9999
+++ b/metadata/md5-cache/www-client/pybugz-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) >=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(-)]
+DEPEND=dev-python/setuptools[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(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline(+)] ) >=dev-lang/python-exec-2:=[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(-)]
 DESCRIPTION=Command line interface to (Gentoo) Bugzilla
 EAPI=5
 HOMEPAGE=https://github.com/williamh/pybugz
-IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) >=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 )
+RDEPEND=dev-python/setuptools[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(-)] python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline(+)] ) >=dev-lang/python-exec-2:=[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(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f2f8b67ca154c962c690b4d1d5eb6c59
+_md5_=e2fcf6dd7ff3fdb35121b4c65430ca8e
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.4.2 b/metadata/md5-cache/www-client/qutebrowser-1.4.2
deleted file mode 100644
index 4f8c418dd492..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-1.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=6
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.4.2/qutebrowser-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4649ad2b7da150f7c82044597fc91630
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.5.0 b/metadata/md5-cache/www-client/qutebrowser-1.5.0
index 73db73471b3d..40e595ef8881 100644
--- a/metadata/md5-cache/www-client/qutebrowser-1.5.0
+++ b/metadata/md5-cache/www-client/qutebrowser-1.5.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
 IUSE=test python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.5.0/qutebrowser-1.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4649ad2b7da150f7c82044597fc91630
+_md5_=d8c10348d67b7a139580f3eb86c2cff6
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.5.1 b/metadata/md5-cache/www-client/qutebrowser-1.5.1
new file mode 100644
index 000000000000..00a336d7fe52
--- /dev/null
+++ b/metadata/md5-cache/www-client/qutebrowser-1.5.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
+EAPI=6
+HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,multimedia,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.5.1/qutebrowser-1.5.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9228c0924e728db5ab8f921a069240cf
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index 5f1d1ab8abf0..34313abb23a3 100644
--- a/metadata/md5-cache/www-client/qutebrowser-9999
+++ b/metadata/md5-cache/www-client/qutebrowser-9999
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
 IUSE=test python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5bba232b330035fe6b7235358120f7e6
+_md5_=d8c10348d67b7a139580f3eb86c2cff6
diff --git a/metadata/md5-cache/www-client/vivaldi-2.0.1309.29_p2 b/metadata/md5-cache/www-client/vivaldi-2.0.1309.29_p2
deleted file mode 100644
index 004543f3f3e4..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-2.0.1309.29_p2
+++ /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/stable/vivaldi-stable_2.0.1309.29-2_amd64.deb -> vivaldi-2.0.1309.29_p2-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.0.1309.29-2_armhf.deb -> vivaldi-2.0.1309.29_p2-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.0.1309.29-2_i386.deb -> vivaldi-2.0.1309.29_p2-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=da202a6814d9f48f6ae232f9cfcd2044
diff --git a/metadata/md5-cache/www-client/vivaldi-2.0.1309.37_p2 b/metadata/md5-cache/www-client/vivaldi-2.0.1309.37_p2
deleted file mode 100644
index 84362472feca..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-2.0.1309.37_p2
+++ /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/stable/vivaldi-stable_2.0.1309.37-2_amd64.deb -> vivaldi-2.0.1309.37_p2-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.0.1309.37-2_armhf.deb -> vivaldi-2.0.1309.37_p2-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.0.1309.37-2_i386.deb -> vivaldi-2.0.1309.37_p2-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=da202a6814d9f48f6ae232f9cfcd2044
diff --git a/metadata/md5-cache/www-client/vivaldi-2.0.1309.40_p1 b/metadata/md5-cache/www-client/vivaldi-2.0.1309.40_p1
new file mode 100644
index 000000000000..3663523cce73
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-2.0.1309.40_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/stable/vivaldi-stable_2.0.1309.40-1_amd64.deb -> vivaldi-2.0.1309.40_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.0.1309.40-1_armhf.deb -> vivaldi-2.0.1309.40_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.0.1309.40-1_i386.deb -> vivaldi-2.0.1309.40_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=da202a6814d9f48f6ae232f9cfcd2044
diff --git a/metadata/md5-cache/www-client/vivaldi-2.0.1309.42_p1 b/metadata/md5-cache/www-client/vivaldi-2.0.1309.42_p1
new file mode 100644
index 000000000000..6d46f78351de
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-2.0.1309.42_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/stable/vivaldi-stable_2.0.1309.42-1_amd64.deb -> vivaldi-2.0.1309.42_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.0.1309.42-1_armhf.deb -> vivaldi-2.0.1309.42_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.0.1309.42-1_i386.deb -> vivaldi-2.0.1309.42_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=76a15775c8a07d189dfaa8790361eb3e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1317.4_p2 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1317.4_p2
deleted file mode 100644
index edea79847066..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1317.4_p2
+++ /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 ~arm64 ~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_2.1.1317.4-2_amd64.deb -> vivaldi-snapshot-2.1.1317.4_p2-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1317.4-2_arm64.deb -> vivaldi-snapshot-2.1.1317.4_p2-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1317.4-2_armhf.deb -> vivaldi-snapshot-2.1.1317.4_p2-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1317.4-2_i386.deb -> vivaldi-snapshot-2.1.1317.4_p2-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=989f4853d8ad61711fd605c99031cf7e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1322.4_p2 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1322.4_p2
deleted file mode 100644
index 9dff166ada6e..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1322.4_p2
+++ /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 ~arm64 ~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_2.1.1322.4-2_amd64.deb -> vivaldi-snapshot-2.1.1322.4_p2-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1322.4-2_arm64.deb -> vivaldi-snapshot-2.1.1322.4_p2-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1322.4-2_armhf.deb -> vivaldi-snapshot-2.1.1322.4_p2-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1322.4-2_i386.deb -> vivaldi-snapshot-2.1.1322.4_p2-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=989f4853d8ad61711fd605c99031cf7e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1332.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1332.4_p1
new file mode 100644
index 000000000000..eb79da773baa
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1332.4_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 ~arm64 ~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_2.1.1332.4-1_amd64.deb -> vivaldi-snapshot-2.1.1332.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1332.4-1_arm64.deb -> vivaldi-snapshot-2.1.1332.4_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1332.4-1_armhf.deb -> vivaldi-snapshot-2.1.1332.4_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1332.4-1_i386.deb -> vivaldi-snapshot-2.1.1332.4_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=989f4853d8ad61711fd605c99031cf7e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1337.17_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1337.17_p1
new file mode 100644
index 000000000000..092ddfea5549
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1337.17_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 ~arm64 ~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_2.1.1337.17-1_amd64.deb -> vivaldi-snapshot-2.1.1337.17_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1337.17-1_arm64.deb -> vivaldi-snapshot-2.1.1337.17_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1337.17-1_armhf.deb -> vivaldi-snapshot-2.1.1337.17_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.1.1337.17-1_i386.deb -> vivaldi-snapshot-2.1.1337.17_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=989f4853d8ad61711fd605c99031cf7e
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index ca0f05cd514a..2f696c8ab2bb 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/adobe-flash-31.0.0.108 b/metadata/md5-cache/www-plugins/adobe-flash-31.0.0.108
deleted file mode 100644
index a6e427c35cc9..000000000000
--- a/metadata/md5-cache/www-plugins/adobe-flash-31.0.0.108
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=>=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Adobe Flash Player
-EAPI=6
-HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
-IUSE=+nsplugin +ppapi abi_x86_32 abi_x86_64 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
-LICENSE=AdobeFlash-11.x
-RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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/nspr[abi_x86_32(-)?,abi_x86_64(-)?,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/nss[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/glibc-2.4 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/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/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] !www-plugins/adobe-flash:0 )
-REQUIRED_USE=|| ( nsplugin ppapi )
-RESTRICT=strip mirror
-SLOT=22
-SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/31.0.0.108/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-31.0.0.108-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/31.0.0.108/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-31.0.0.108-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/31.0.0.108/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-31.0.0.108-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/31.0.0.108/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-31.0.0.108-ppapi.x86_64.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=493fc181efb99a52f53329878f9e5958
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-31.0.0.122 b/metadata/md5-cache/www-plugins/adobe-flash-31.0.0.122
new file mode 100644
index 000000000000..98d5319fe017
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/adobe-flash-31.0.0.122
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm test unpack
+DEPEND=>=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Adobe Flash Player
+EAPI=6
+HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
+IUSE=+nsplugin +ppapi abi_x86_32 abi_x86_64 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
+LICENSE=AdobeFlash-11.x
+RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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/nspr[abi_x86_32(-)?,abi_x86_64(-)?,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/nss[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/glibc-2.4 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/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/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] !www-plugins/adobe-flash:0 )
+REQUIRED_USE=|| ( nsplugin ppapi )
+RESTRICT=strip mirror
+SLOT=22
+SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/31.0.0.122/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-31.0.0.122-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/31.0.0.122/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-31.0.0.122-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/31.0.0.122/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-31.0.0.122-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/31.0.0.122/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-31.0.0.122-ppapi.x86_64.tar.gz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a38e8612a365f6d8b7dc193c9fcf2206
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-69.0.3497.100 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-69.0.3497.100
deleted file mode 100644
index 93fc7116ba7f..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-69.0.3497.100
+++ /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:unstable
-RESTRICT=bindist mirror strip
-SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_69.0.3497.100-1_amd64.deb
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=f63bdf2c0494694fd4c4ea6c6f2a143f
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.35_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.35_beta
deleted file mode 100644
index 12d3d1d59459..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.35_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_70.0.3538.35-1_amd64.deb
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=f3a3562d16034ecff6c99838db35fbfa
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.67 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.67
new file mode 100644
index 000000000000..0bd9ca109166
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.67
@@ -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:unstable
+RESTRICT=bindist mirror strip
+SLOT=stable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_70.0.3538.67-1_amd64.deb
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_md5_=d58b784292d2ea3658550689b4e7cbc7
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.67_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.67_beta
new file mode 100644
index 000000000000..1fcf8d1ec84a
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.67_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_70.0.3538.67-1_amd64.deb
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_md5_=f3a3562d16034ecff6c99838db35fbfa
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3559.6_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3559.6_alpha
deleted file mode 100644
index a5e4b8f9016e..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3559.6_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_71.0.3559.6-1_amd64.deb
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=f3a3562d16034ecff6c99838db35fbfa
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.10_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.10_alpha
new file mode 100644
index 000000000000..91084d5e95e0
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.10_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_71.0.3578.10-1_amd64.deb
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_md5_=f3a3562d16034ecff6c99838db35fbfa
diff --git a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329-r2 b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329-r2
deleted file mode 100644
index 57798a05b69b..000000000000
--- a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.41.0:0= dev-libs/expat dev-libs/libxml2:2 virtual/jpeg:0 media-libs/libpng:0= net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib:= agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( libav? ( media-video/libav:0=[vaapi?] ) !libav? ( media-video/ffmpeg:0=[vaapi?] ) ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) jemalloc? ( dev-libs/jemalloc ) opengl? ( virtual/glu virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) >=media-libs/speex-1.2.0 media-libs/speexdsp sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) vaapi? ( x11-libs/libva[opengl?] ) virtual/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) nsplugin? ( net-misc/npapi-sdk ) test? ( dev-util/dejagnu ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-portage/elt-patches-20170815 !<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 app-arch/unzip
-DESCRIPTION=GNU Flash movie player that supports many SWF v7,8,9 features
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/gnash/
-IUSE=X +agg cairo cygnal dbus doc dump egl fbcon +ffmpeg libav libressl gnome gtk harden jemalloc lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi
-KEYWORDS=amd64 ppc ~ppc64 ~sparc x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41.0:0= dev-libs/expat dev-libs/libxml2:2 virtual/jpeg:0 media-libs/libpng:0= net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib:= agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( libav? ( media-video/libav:0=[vaapi?] ) !libav? ( media-video/ffmpeg:0=[vaapi?] ) ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) jemalloc? ( dev-libs/jemalloc ) opengl? ( virtual/glu virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) >=media-libs/speex-1.2.0 media-libs/speexdsp sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) vaapi? ( x11-libs/libva[opengl?] )
-REQUIRED_USE=dump? ( agg ffmpeg ) fbcon? ( agg ) nsplugin? ( gtk ) openvg? ( egl ) python? ( gtk ) vaapi? ( agg ffmpeg ) || ( agg cairo opengl openvg ) || ( dump fbcon gtk sdl )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gentoo/gnash-0.8.10_p20160329.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=00c8a3a22650e1de5890d8626f2b8ba5
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index d161479d7835..1632bfb59820 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/spawn-fcgi-1.6.3-r2 b/metadata/md5-cache/www-servers/spawn-fcgi-1.6.3-r2
deleted file mode 100644
index 2462c913a9e7..000000000000
--- a/metadata/md5-cache/www-servers/spawn-fcgi-1.6.3-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A FCGI spawner for lighttpd and cherokee and other webservers
-EAPI=5
-HOMEPAGE=http://redmine.lighttpd.net/projects/spawn-fcgi
-IUSE=ipv6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=!<=www-servers/lighttpd-1.4.20 !<=www-servers/cherokee-0.98.1
-SLOT=0
-SRC_URI=http://www.lighttpd.net/download/spawn-fcgi-1.6.3.tar.bz2
-_md5_=3ce2ae47d8ce1f01de017f464fe92ff8
diff --git a/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4 b/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4
deleted file mode 100644
index a7b6495e1c44..000000000000
--- a/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A FCGI spawner for lighttpd and cherokee and other webservers
-EAPI=5
-HOMEPAGE=http://redmine.lighttpd.net/projects/spawn-fcgi
-IUSE=ipv6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=!<=www-servers/lighttpd-1.4.20 !<=www-servers/cherokee-0.98.1
-SLOT=0
-SRC_URI=http://www.lighttpd.net/download/spawn-fcgi-1.6.4.tar.xz
-_md5_=f1ae1b348130e7368178e293ac90aea4
diff --git a/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1 b/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
new file mode 100644
index 000000000000..f1edef80df17
--- /dev/null
+++ b/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=A FCGI spawner for lighttpd and cherokee and other webservers
+EAPI=7
+HOMEPAGE=http://redmine.lighttpd.net/projects/spawn-fcgi
+IUSE=ipv6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=!<=www-servers/lighttpd-1.4.20 !<=www-servers/cherokee-0.98.1
+SLOT=0
+SRC_URI=http://www.lighttpd.net/download/spawn-fcgi-1.6.4.tar.xz
+_md5_=029596f0c277a461280f606667e18888
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.17 b/metadata/md5-cache/www-servers/uwsgi-2.0.17
index 5ab7d1ce8d92..6dfca3c1e704 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.17
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.17
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gev
 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	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	php-ext-source-r2	bba5e9c6aaf088fd15faa2e767506125	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e1a6a214d1c5647b7e46c14a5949bbaa
+_md5_=5388b52230f615bb6b47b352fe01eec6
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 bd89cbed6c1a..6ee643c3c1b4 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.17.1
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gev
 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	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5f501b8102ab0066873f5439d5e08b60
+_md5_=5912898c9fbfc937f1943bf44861d44e
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1 b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1
new file mode 100644
index 000000000000..1f0a0e9bc13a
--- /dev/null
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) php_targets_php7-1? ( dev-lang/php:7.1[embed] ) php_targets_php7-2? ( dev-lang/php:7.2[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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(-)] ) python_asyncio? ( virtual/python-greenlet[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_gevent? ( >=dev-python/gevent-1.3.5[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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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/m4 sys-devel/libtool php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
+DESCRIPTION=uWSGI server for Python web applications
+EAPI=6
+HOMEPAGE=http://projects.unbit.it/uwsgi/
+IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php pypy python python_asyncio python_gevent ruby php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) php_targets_php7-1? ( dev-lang/php:7.1[embed] ) php_targets_php7-2? ( dev-lang/php:7.2[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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(-)] ) python_asyncio? ( virtual/python-greenlet[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_gevent? ( >=dev-python/gevent-1.3.5[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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
+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 ) 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_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=b13045b127aab385141b1f8a84d35848
diff --git a/metadata/md5-cache/www-servers/varnish-6.1.0 b/metadata/md5-cache/www-servers/varnish-6.1.0
index adc4415780de..e989465ac726 100644
--- a/metadata/md5-cache/www-servers/varnish-6.1.0
+++ b/metadata/md5-cache/www-servers/varnish-6.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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
+DEPEND=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils dev-python/sphinx virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Varnish is a state-of-the-art, high-performance HTTP accelerator
 EAPI=6
 HOMEPAGE=https://varnish-cache.org/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2
 SRC_URI=http://varnish-cache.org/_downloads/varnish-6.1.0.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=67d11d810782811c4ea682df92075abf
+_md5_=6aa35afa0a6b3616c7d74061ce9e4351
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 781fd21d39d3..eb9f31ebef03 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.5 b/metadata/md5-cache/x11-apps/xmessage-1.0.5
index b470ea53bfcc..9fae1b372908 100644
--- a/metadata/md5-cache/x11-apps/xmessage-1.0.5
+++ b/metadata/md5-cache/x11-apps/xmessage-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXt >=app-portage/elt-patches-20170815 !<sys-d
 DESCRIPTION=display a message or query in a window (X-based /bin/echo)
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xmessage-1.0.5.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=d162f7eb641a599b1d95a972d672cd14
+_md5_=5c0f86bc851af66ce20a5b9a4e57c6c1
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index da6666f75fcb..b2a758ac7f9d 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.13 b/metadata/md5-cache/x11-base/xcb-proto-1.13
index 7d96cddb19d6..11f5af2969c8 100644
--- a/metadata/md5-cache/x11-base/xcb-proto-1.13
+++ b/metadata/md5-cache/x11-base/xcb-proto-1.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test 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(-)] dev-libs/libxml2 >=app-portage/elt-patches-20170815 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+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/libxml2 >=app-portage/elt-patches-20170815 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=5
 HOMEPAGE=https://xcb.freedesktop.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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 )
+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=https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=217e48b30221ca37b8ec47baa6202556
+_md5_=db0722aa285aa7d67e859d42fc39f992
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.19 b/metadata/md5-cache/x11-base/xorg-drivers-1.19
index b3e196e90a86..e4feddfdc590 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.19
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.19
@@ -5,6 +5,6 @@ HOMEPAGE=https://www.gentoo.org/
 IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_i965 video_cards_intel video_cards_mga video_cards_newport video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tdfx video_cards_tegra video_cards_vesa video_cards_via video_cards_vc4 video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=metapackage
-PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_newport? ( x11-drivers/xf86-video-newport ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tegra? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( || ( x11-drivers/xf86-video-vboxvideo x11-drivers/xf86-video-virtualbox ) ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-ivtv !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-ark-0.7.5 !<=x11-drivers/xf86-video-newport-0.2.4 !<x11-drivers/xf86-input-evdev-2.10.4 !<x11-drivers/xf86-input-joystick-1.6.3 !<x11-drivers/xf86-input-libinput-0.20.0 !<x11-drivers/xf86-input-wacom-0.34.0 !<x11-drivers/xf86-video-amdgpu-1.2.0 !<x11-drivers/xf86-video-ati-7.8.0 !<x11-drivers/xf86-video-chips-1.2.7 !<x11-drivers/xf86-video-glint-1.2.9 !<x11-drivers/xf86-video-i740-1.3.6 !<x11-drivers/xf86-video-intel-2.99.917_p20160122 !<x11-drivers/xf86-video-mga-1.6.5 !<x11-drivers/xf86-video-nouveau-1.0.13 !<x11-drivers/xf86-video-nv-2.1.21 !<x11-drivers/xf86-video-omap-0.4.5 !<x11-drivers/xf86-video-r128-6.10.2 !<x11-drivers/xf86-video-savage-2.3.9 !<x11-drivers/xf86-video-siliconmotion-1.7.9 !<x11-drivers/xf86-video-sis-0.10.9 !<x11-drivers/xf86-video-sisusb-0.9.7 !<x11-drivers/xf86-video-sunleo-1.2.2 !<x11-drivers/xf86-video-tdfx-1.4.7 !<x11-drivers/xf86-video-trident-1.3.8 !<x11-drivers/xf86-video-virtualbox-5.1.14 !<x11-drivers/xf86-video-vmware-13.2.1
+PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_newport? ( x11-drivers/xf86-video-newport ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tegra? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-1.19[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-ivtv !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-ark-0.7.5 !<=x11-drivers/xf86-video-newport-0.2.4 !<x11-drivers/xf86-input-evdev-2.10.4 !<x11-drivers/xf86-input-joystick-1.6.3 !<x11-drivers/xf86-input-libinput-0.20.0 !<x11-drivers/xf86-input-wacom-0.34.0 !<x11-drivers/xf86-video-amdgpu-1.2.0 !<x11-drivers/xf86-video-ati-7.8.0 !<x11-drivers/xf86-video-chips-1.2.7 !<x11-drivers/xf86-video-glint-1.2.9 !<x11-drivers/xf86-video-i740-1.3.6 !<x11-drivers/xf86-video-intel-2.99.917_p20160122 !<x11-drivers/xf86-video-mga-1.6.5 !<x11-drivers/xf86-video-nouveau-1.0.13 !<x11-drivers/xf86-video-nv-2.1.21 !<x11-drivers/xf86-video-omap-0.4.5 !<x11-drivers/xf86-video-r128-6.10.2 !<x11-drivers/xf86-video-savage-2.3.9 !<x11-drivers/xf86-video-siliconmotion-1.7.9 !<x11-drivers/xf86-video-sis-0.10.9 !<x11-drivers/xf86-video-sisusb-0.9.7 !<x11-drivers/xf86-video-sunleo-1.2.2 !<x11-drivers/xf86-video-tdfx-1.4.7 !<x11-drivers/xf86-video-trident-1.3.8 !<x11-drivers/xf86-video-vmware-13.2.1
 SLOT=0
-_md5_=570828fa4e64d763467fe6434d57e098
+_md5_=3c7596755ca9190f29a00f8d61f8dcfd
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.20 b/metadata/md5-cache/x11-base/xorg-drivers-1.20
index 71181c55f9e4..b419de53038b 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.20
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.20
@@ -5,6 +5,6 @@ HOMEPAGE=https://www.gentoo.org/
 IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_i965 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tdfx video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=metapackage
-PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.9.3 ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.7 ) video_cards_tegra? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( || ( x11-drivers/xf86-video-vboxvideo >=x11-drivers/xf86-video-virtualbox-5.1.14 ) ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4
+PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.9.3 ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.7 ) video_cards_tegra? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4
 SLOT=0
-_md5_=026ce63c8d669e42a880f36a081a2bbf
+_md5_=c846dc806a17883a4d3d7487010a6008
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-9999 b/metadata/md5-cache/x11-base/xorg-drivers-9999
index e39c63f9c1c7..676a11b4dd66 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-9999
+++ b/metadata/md5-cache/x11-base/xorg-drivers-9999
@@ -4,6 +4,6 @@ EAPI=7
 HOMEPAGE=https://www.gentoo.org/
 IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_i965 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tdfx video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
 LICENSE=metapackage
-PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.9.3 ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.7 ) video_cards_tegra? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( || ( x11-drivers/xf86-video-vboxvideo >=x11-drivers/xf86-video-virtualbox-5.1.14 ) ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4
+PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.9.3 ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.7 ) video_cards_tegra? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4
 SLOT=0
-_md5_=cb2c78e9ff99d7b26e5c7d2402748f91
+_md5_=d584217e08adcd84d6a95be95d0fdaec
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.1 b/metadata/md5-cache/x11-base/xorg-server-1.20.1
index 3171e8e1f50a..eba6b4f02e11 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.1
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.1
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xeph
 SLOT=0/1.20.1
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=36412b0f0fc26fe1ac10ee49f35c65f8
+_md5_=8cbe33ccfff84e7e77a8402b1128be01
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.2 b/metadata/md5-cache/x11-base/xorg-server-1.20.2
new file mode 100644
index 000000000000..d95a96e70e31
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-18[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18 ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) sys-devel/flex >=x11-base/xorg-proto-2018.3 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) >=app-portage/elt-patches-20170815 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DESCRIPTION=X.Org X servers
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity static-libs doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
+RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-18[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18 ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
+REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xephyr? ( kdrive )
+SLOT=0/1.20.2
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.2.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_md5_=443159d7545ed085bbec1f911935a9a1
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 31de3f9a7637..0f49b2b5090a 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -10,4 +10,4 @@ RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) li
 REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xephyr? ( kdrive )
 SLOT=0/9999
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=5446b590e31b7e411ff9d58307de254e
+_md5_=9cef4971f27ae4518984930580f8fd82
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 9c920e1b9b86..80e701d7bb65 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-410.66 b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.66
new file mode 100644
index 000000000000..4b8aab1f87d2
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.66
@@ -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/410
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/410.66/NVIDIA-FreeBSD-x86_64-410.66.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/410.66/NVIDIA-Linux-x86_64-410.66.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-410.66.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=d39028fcb5ccb2d71fe47c679e784798
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.28.1 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.28.1
new file mode 100644
index 000000000000..fb113d5b0092
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.28.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=dev-libs/libinput-1.5.0:0= >=app-portage/elt-patches-20170815 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
+DESCRIPTION=X.org input driver based on libinput
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
+IUSE=kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libinput-1.5.0:0= x11-base/xorg-server:= x11-base/xorg-server[xorg]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.28.1.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_md5_=60d760d62e85785a670b92bef89c31c2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.36 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.36
deleted file mode 100644
index f724b5474632..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.36
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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/yasm-0.6.2 >=dev-util/kbuild-0.1.9998_pre20131130 sys-power/iasl x11-base/xorg-proto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( >=x11-libs/libdrm-2.4.5 )
-DESCRIPTION=VirtualBox X11 video driver for Gentoo guest
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=dri python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.1.36 )
-RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=667c46712abef496d88ac89be69cb161
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.38 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.38
deleted file mode 100644
index e6b313d6e090..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.38
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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/yasm-0.6.2 >=dev-util/kbuild-0.1.9998_pre20131130 sys-power/iasl x11-base/xorg-proto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( >=x11-libs/libdrm-2.4.5 )
-DESCRIPTION=VirtualBox X11 video driver for Gentoo guest
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=dri python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.1.38 )
-RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_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://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=eacdcc4424c3c4aa199c61f3cf18990f
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 39305cd93d6c..6f17f8e84543 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/agg-2.5-r2 b/metadata/md5-cache/x11-libs/agg-2.5-r2
deleted file mode 100644
index 79b7aff2a6a7..000000000000
--- a/metadata/md5-cache/x11-libs/agg-2.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=media-libs/libsdl[X?] X? ( >=x11-libs/libX11-1.3.99.901 ) truetype? ( media-libs/freetype:2 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Anti-Grain Geometry - A High Quality Rendering Engine for C++
-EAPI=2
-HOMEPAGE=http://antigrain.com/
-IUSE=+gpc +truetype +X
-KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[X?] X? ( >=x11-libs/libX11-1.3.99.901 ) truetype? ( media-libs/freetype:2 )
-SLOT=0
-SRC_URI=http://antigrain.com/agg-2.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd8c5fd3529ada1bad620feec4a29b6c
diff --git a/metadata/md5-cache/x11-libs/agg-2.5-r3 b/metadata/md5-cache/x11-libs/agg-2.5-r3
index 4ba3a9b6dd31..d368039f4768 100644
--- a/metadata/md5-cache/x11-libs/agg-2.5-r3
+++ b/metadata/md5-cache/x11-libs/agg-2.5-r3
@@ -5,10 +5,10 @@ DESCRIPTION=High quality rendering engine library for C++
 EAPI=7
 HOMEPAGE=http://antigrain.com/
 IUSE=+gpc sdl static-libs +truetype +X
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 gpc? ( free-noncomm )
 RDEPEND=sdl? ( >=media-libs/libsdl-1.2.0[X?] ) X? ( >=x11-libs/libX11-1.3.99.901 ) truetype? ( media-libs/freetype:2 )
 SLOT=0
 SRC_URI=http://antigrain.com/agg-2.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6081737b8fd38aefd2deff7fc4fb8fc7
+_md5_=ea0fc35687f7620d706904f0ff832da4
diff --git a/metadata/md5-cache/x11-libs/cairo-1.16.0 b/metadata/md5-cache/x11-libs/cairo-1.16.0
new file mode 100644
index 000000000000..7c289e5e5a7b
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/cairo-1.16.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/binutils-libs:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pixman-0.32.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig >=sys-devel/libtool-2 X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<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 vector graphics library with cross-device output support
+EAPI=6
+HOMEPAGE=https://www.cairographics.org
+IUSE=X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( LGPL-2.1 MPL-1.1 )
+RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/binutils-libs:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pixman-0.32.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=gles2? ( !opengl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.cairographics.org/releases/cairo-1.16.0.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6530933469cc3cb412b62983283e0644
diff --git a/metadata/md5-cache/x11-libs/cairo-9999 b/metadata/md5-cache/x11-libs/cairo-9999
index 4c96f0fbc022..6a6aee83b9df 100644
--- a/metadata/md5-cache/x11-libs/cairo-9999
+++ b/metadata/md5-cache/x11-libs/cairo-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=gles2? ( !opengl )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7407437e48c74dbc4fd3af35cbbb5781
+_md5_=6530933469cc3cb412b62983283e0644
diff --git a/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r1 b/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r1
index e2a038efe854..190d40c52c90 100644
--- a/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r1
+++ b/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libgnomecanvasmm-2.6:2.6 media-gfx/graphviz
 SLOT=0
 SRC_URI=http://download.drobilla.net/flowcanvas-0.7.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=ef677ce6b547a292613677e1835554de
diff --git a/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r2 b/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r2
index fcf6936f2579..9183fe4fddbc 100644
--- a/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r2
+++ b/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libgnomecanvasmm-2.6:2.6 media-gfx/graphviz
 SLOT=0
 SRC_URI=http://download.drobilla.net/flowcanvas-0.7.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=5907bbcbd897959c1562fe022149958c
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
index 344ea27f3087..8cd39f67da8b 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.11.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d2336526124e149be60cf5103cec8ee
+_md5_=8d14d1fe120626f2f583aecb553af191
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
index 3a647a1bbe25..099bad1ca2fc 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.12.tar.xz test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> gdk-pixbuf-2.36.12-bug753605-atsize.jpg )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f03d7777fc287e524850e8bf8b56ccfb
+_md5_=62eff41f1880035b6945964363e9cb0b
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-loader-webp-20160328234507 b/metadata/md5-cache/x11-libs/gdk-pixbuf-loader-webp-20160328234507
index b429b03b3b0a..42fb19db3109 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-loader-webp-20160328234507
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-loader-webp-20160328234507
@@ -7,5 +7,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 LICENSE=LGPL-2+
 RDEPEND=>=media-libs/libwebp-0.4.3 >=x11-libs/gdk-pixbuf-2.22
 SLOT=0
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=560a3463c17a6a1d04113270f2078c5b
diff --git a/metadata/md5-cache/x11-libs/gtkhotkey-0.2.1-r1 b/metadata/md5-cache/x11-libs/gtkhotkey-0.2.1-r1
index e1256542d6b0..78938dae59b9 100644
--- a/metadata/md5-cache/x11-libs/gtkhotkey-0.2.1-r1
+++ b/metadata/md5-cache/x11-libs/gtkhotkey-0.2.1-r1
@@ -1,8 +1,9 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12:2 virtual/pkgconfig >=dev-util/intltool-0.35.0 sys-devel/gettext
 DESCRIPTION=Cross platform library for using desktop wide hotkeys
 EAPI=6
 HOMEPAGE=https://launchpad.net/gtkhotkey
+IUSE=static-libs
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12:2 virtual/libintl
@@ -10,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/gtkhotkey/0.2/0.2.1/+download/gtkhotkey-0.2.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=42f872eed0e15dc36bed3d9f566d00cc
+_md5_=3a3e730aba1bc972d987e64e12af5448
diff --git a/metadata/md5-cache/x11-libs/hippo-canvas-0.3.0-r2 b/metadata/md5-cache/x11-libs/hippo-canvas-0.3.0-r2
index a386fafb5505..9d598f225206 100644
--- a/metadata/md5-cache/x11-libs/hippo-canvas-0.3.0-r2
+++ b/metadata/md5-cache/x11-libs/hippo-canvas-0.3.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.6:2 dev-libs/libcroco >=x11-libs/gtk+-2.6:2 x11-libs/pango gnome-base/librsvg:2 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pycairo[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/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.6:2 dev-libs/libcroco >=x11-libs/gtk+-2.6:2 x11-libs/pango gnome-base/librsvg:2 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pycairo[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/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-util/glib-utils dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A canvas library based on GTK+ 2, Cairo, and Pango
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/HippoCanvas
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/hippo-canvas/0.3/hippo-canvas-0.3.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=01bb977b72dfa38e8eec295cbe7d3c1a
+_md5_=f77de3340fe0c2ba399b3be01a11bfc6
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.3 b/metadata/md5-cache/x11-libs/libSM-1.2.3
new file mode 100644
index 000000000000..f2ff59e6947d
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=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/xtrans !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( uuid? ( >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) >=app-portage/elt-patches-20170815 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DESCRIPTION=X.Org Session Management library
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
+IUSE=doc ipv6 +uuid abi_x86_32 abi_x86_64 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 doc
+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 ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto >=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/xtrans !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( uuid? ( >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libSM-1.2.3.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_md5_=38a3512e0a9ec5308fc7881f98509728
diff --git a/metadata/md5-cache/x11-libs/libX11-1.6.7 b/metadata/md5-cache/x11-libs/libX11-1.6.7
new file mode 100644
index 000000000000..e1bb43daca8b
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libX11-1.6.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xtrans test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DESCRIPTION=X.Org X11 library
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
+IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
+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 ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xtrans
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.6.7.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_md5_=8d8d3c84cf88d96e2da60dc070ae9c66
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
index 5cd4e161845c..acd7e9b64b2c 100644
--- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org XScrnSaver library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.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 static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto >=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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXScrnSaver-1.2.3.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=32560200bb8dd3071966ee92c5534fcc
+_md5_=f29111d7801433dee1794f600e38b9e5
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.4 b/metadata/md5-cache/x11-libs/libXinerama-1.1.4
index 0cfb162269d0..685495fa85ea 100644
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.4
+++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xinerama library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.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 static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto >=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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXinerama-1.1.4.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=aa76d78028b7a7e82dbe8bd486803399
+_md5_=57187eacbedf64cf7f7f3b85ad91519e
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.96 b/metadata/md5-cache/x11-libs/libdrm-2.4.96
new file mode 100644
index 000000000000..fe1bb9d45412
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.96
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-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(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=X.Org libdrm library
+EAPI=6
+HOMEPAGE=https://dri.freedesktop.org/
+IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-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(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.96.tar.bz2
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=22d6f81d67f084a893a7ce103e74062b
diff --git a/metadata/md5-cache/x11-libs/libfm-1.2.3-r1 b/metadata/md5-cache/x11-libs/libfm-1.2.3-r1
deleted file mode 100644
index 824fd3609806..000000000000
--- a/metadata/md5-cache/x11-libs/libfm-1.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= ~x11-libs/libfm-extra-1.2.3 vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 !<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 library for file management
-EAPI=5
-HOMEPAGE=http://pcmanfm.sourceforge.net/
-IUSE=+automount debug doc examples exif gtk udisks vala
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= ~x11-libs/libfm-extra-1.2.3 !lxde-base/lxshortcut x11-misc/shared-mime-info automount? ( udisks? ( gnome-base/gvfs[udev,udisks] ) !udisks? ( gnome-base/gvfs[udev] ) ) exif? ( media-libs/libexif )
-REQUIRED_USE=udisks? ( automount ) doc? ( gtk )
-SLOT=0/4.3.0
-SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/libfm-1.2.3.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=24ca25e0c5b90a4e60ab5f43db8da509
diff --git a/metadata/md5-cache/x11-libs/libfm-1.2.4 b/metadata/md5-cache/x11-libs/libfm-1.2.4
deleted file mode 100644
index c966869acd4b..000000000000
--- a/metadata/md5-cache/x11-libs/libfm-1.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= ~x11-libs/libfm-extra-1.2.4 udisks? ( dev-libs/dbus-glib ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 !<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 library for file management
-EAPI=5
-HOMEPAGE=http://pcmanfm.sourceforge.net/
-IUSE=+automount debug doc examples exif gtk udisks vala
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= ~x11-libs/libfm-extra-1.2.4 udisks? ( dev-libs/dbus-glib ) !lxde-base/lxshortcut x11-misc/shared-mime-info automount? ( udisks? ( gnome-base/gvfs[udev,udisks] ) !udisks? ( gnome-base/gvfs[udev] ) ) exif? ( media-libs/libexif )
-REQUIRED_USE=udisks? ( automount ) doc? ( gtk )
-SLOT=0/4.4.0
-SRC_URI=https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> libfm-1.2.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=10e8d294b5fcca83b0023bbc1fe4c79f
diff --git a/metadata/md5-cache/x11-libs/libfm-extra-1.2.3 b/metadata/md5-cache/x11-libs/libfm-extra-1.2.3
deleted file mode 100644
index a546309b5614..000000000000
--- a/metadata/md5-cache/x11-libs/libfm-extra-1.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !!<=x11-libs/libfm-1.2.3 >=app-portage/elt-patches-20170815 !<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 library for file management
-EAPI=5
-HOMEPAGE=http://pcmanfm.sourceforge.net/
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2
-SLOT=0/4.3.0
-SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/libfm-1.2.3.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6e3927a9f51938c50758b8db5c5a9aca
diff --git a/metadata/md5-cache/x11-libs/libfm-extra-1.2.4 b/metadata/md5-cache/x11-libs/libfm-extra-1.2.4
deleted file mode 100644
index 6e13b3a47827..000000000000
--- a/metadata/md5-cache/x11-libs/libfm-extra-1.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !!<=x11-libs/libfm-1.2.3 >=app-portage/elt-patches-20170815 !<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 library for file management
-EAPI=5
-HOMEPAGE=http://pcmanfm.sourceforge.net/
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2
-SLOT=0/4.4.0
-SRC_URI=https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> libfm-1.2.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=de77dd8bd934b9983f9d152f63863ff9
diff --git a/metadata/md5-cache/x11-libs/libfm-qt-0.11.1 b/metadata/md5-cache/x11-libs/libfm-qt-0.11.1
deleted file mode 100644
index c8add4a7a21b..000000000000
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.11.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-0.4.1 >=x11-libs/libfm-1.2.0:= x11-libs/libxcb:= !<x11-misc/pcmanfm-qt-0.11.0 dev-qt/linguist-tools:5 lxqt-base/liblxqt virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt port of libfm, a library providing components to build desktop file managers
-EAPI=6
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-0.4.1 >=x11-libs/libfm-1.2.0:= x11-libs/libxcb:= !<x11-misc/pcmanfm-qt-0.11.0
-SLOT=0/3
-SRC_URI=https://github.com/lxde/libfm-qt/releases/download/0.11.1/libfm-qt-0.11.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2351ae62a7d9435dea143a38d10639ea
diff --git a/metadata/md5-cache/x11-libs/libfm-qt-0.13.1 b/metadata/md5-cache/x11-libs/libfm-qt-0.13.1
deleted file mode 100644
index 3f23af9bb0da..000000000000
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.13.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-1.1.0 media-libs/libexif:= >=x11-libs/libfm-1.2.0:= x11-libs/libxcb:= dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.5.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt port of libfm, a library providing components to build desktop file managers
-EAPI=6
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-1.1.0 media-libs/libexif:= >=x11-libs/libfm-1.2.0:= x11-libs/libxcb:=
-SLOT=0/5
-SRC_URI=https://downloads.lxqt.org/downloads/libfm-qt/0.13.1/libfm-qt-0.13.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=348776e9e719074b3ffd155ed2f57bec
diff --git a/metadata/md5-cache/x11-libs/libfm-qt-0.13.1-r1 b/metadata/md5-cache/x11-libs/libfm-qt-0.13.1-r1
index 9b736003b8f4..703553d2d7e5 100644
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.13.1-r1
+++ b/metadata/md5-cache/x11-libs/libfm-qt-0.13.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/
 DESCRIPTION=Qt port of libfm, a library providing components to build desktop file managers
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-1.1.0 media-libs/libexif:= >=x11-libs/libfm-1.2.0:= x11-libs/libxcb:=
 SLOT=0/5
 SRC_URI=https://downloads.lxqt.org/downloads/libfm-qt/0.13.1/libfm-qt-0.13.1.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fbc267d69d588d1f1684879c556ea2d3
+_md5_=b7aae5177017395b579de5c5e0a373ae
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.7 b/metadata/md5-cache/x11-libs/libnotify-0.7.7
deleted file mode 100644
index b8e728cac737..000000000000
--- a/metadata/md5-cache/x11-libs/libnotify-0.7.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-notify-send >=dev-libs/glib-2.26: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: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.32:= ) >=dev-libs/gobject-introspection-common-1.32 dev-util/glib-utils >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig test? ( 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(-)?] ) app-arch/xz-utils
-DESCRIPTION=A library for sending desktop notifications
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/libnotify
-IUSE=+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=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=LGPL-2.1+
-PDEPEND=virtual/notification-daemon
-RDEPEND=app-eselect/eselect-notify-send >=dev-libs/glib-2.26: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: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.32:= )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libnotify/0.7/libnotify-0.7.7.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3c8bfcb880df2bcb29e85056d306617c
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.7-r1 b/metadata/md5-cache/x11-libs/libnotify-0.7.7-r1
new file mode 100644
index 000000000000..c8421b6ba306
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libnotify-0.7.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-eselect/eselect-notify-send >=dev-libs/glib-2.26: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: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.32:= ) >=dev-libs/gobject-introspection-common-1.32 dev-util/glib-utils >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig test? ( 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(-)?] ) app-arch/xz-utils
+DESCRIPTION=A library for sending desktop notifications
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/libnotify
+IUSE=+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=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=LGPL-2.1+
+PDEPEND=virtual/notification-daemon
+RDEPEND=app-eselect/eselect-notify-send >=dev-libs/glib-2.26: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: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.32:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libnotify/0.7/libnotify-0.7.7.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=66b3c138814595321c96bcf4bcff22b2
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.13 b/metadata/md5-cache/x11-libs/libxcb-1.13
deleted file mode 100644
index 55182b99cea7..000000000000
--- a/metadata/md5-cache/x11-libs/libxcb-1.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) dev-libs/libxslt || ( dev-lang/python:3.6[xml] dev-lang/python:3.5[xml] dev-lang/python:3.4[xml] >=dev-lang/python-2.7.5-r2:2.7[xml] ) || ( ( dev-lang/python:3.6[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-portage/elt-patches-20170815 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X C-language Bindings library
-EAPI=5
-HOMEPAGE=https://xcb.freedesktop.org/
-IUSE=doc selinux test xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/1.12
-SRC_URI=https://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=b189b1ab24244fbacc5b8a91ac7d90d8
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.13.1 b/metadata/md5-cache/x11-libs/libxcb-1.13.1
index d65c4837d25a..6ba52d5539eb 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.13.1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) dev-libs/libxslt || ( dev-lang/python:3.6[xml] dev-lang/python:3.5[xml] dev-lang/python:3.4[xml] >=dev-lang/python-2.7.5-r2:2.7[xml] ) || ( ( dev-lang/python:3.6[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-portage/elt-patches-20170815 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) dev-libs/libxslt || ( dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] dev-lang/python:3.5[xml] dev-lang/python:3.4[xml] >=dev-lang/python-2.7.5-r2:2.7[xml] ) || ( ( dev-lang/python:3.7[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-portage/elt-patches-20170815 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings library
 EAPI=5
 HOMEPAGE=https://xcb.freedesktop.org/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 SLOT=0/1.12
 SRC_URI=https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=b189b1ab24244fbacc5b8a91ac7d90d8
+_md5_=24bb522238aafd0918c0f159d6c4b3a9
diff --git a/metadata/md5-cache/x11-libs/pango-1.42.4 b/metadata/md5-cache/x11-libs/pango-1.42.4
index a48b396d1972..bc8fa2717297 100644
--- a/metadata/md5-cache/x11-libs/pango-1.42.4
+++ b/metadata/md5-cache/x11-libs/pango-1.42.4
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=6
 HOMEPAGE=http://www.pango.org/
 IUSE=X +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=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] >=media-libs/fontconfig-2.12.92: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/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[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(-)?] >=dev-libs/fribidi-0.19.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.42/pango-1.42.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=baf152dc594ca54b6664b2ced927df74
+_md5_=9b4430ce3c5442c93d6f87c8471a918a
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.10.8 b/metadata/md5-cache/x11-libs/qscintilla-2.10.8
new file mode 100644
index 000000000000..7858584c776d
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.10.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
+DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
+EAPI=7
+HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
+IUSE=designer doc
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
+SLOT=0/13
+SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.8.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a0165e60ccb4725aef5cbdbac9d2af99
diff --git a/metadata/md5-cache/x11-libs/scw-0.4.7-r1 b/metadata/md5-cache/x11-libs/scw-0.4.7-r1
index a8889dc8c44a..360585e9050a 100644
--- a/metadata/md5-cache/x11-libs/scw-0.4.7-r1
+++ b/metadata/md5-cache/x11-libs/scw-0.4.7-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 doc? ( dev-util/gtk-doc ) virtual/pkgconfig
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 doc? ( dev-util/gtk-doc ) dev-util/glib-utils virtual/pkgconfig
 DESCRIPTION=A GTK+ widget set specifically designed for chat programs
-EAPI=6
+EAPI=7
 HOMEPAGE=http://scwwidgets.googlepages.com
 IUSE=doc
 KEYWORDS=~amd64 x86
@@ -9,4 +9,4 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://scwwidgets.googlepages.com/scw-0.4.7.tar.gz
-_md5_=bcd440f0204c467110465ebf9af09b87
+_md5_=f4ec5afaba8d2cada7e7bca2c3456ef3
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2
index e7c0807437de..281edc2deb22 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2
+++ b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=https://xcb.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-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/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,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://xcb.freedesktop.org/dist//xcb-util-cursor-0.1.3.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=593a150458b9e5a88b0d6c7050a67465
+_md5_=606c0eea94e4292441ab32142b96920c
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index c8b1c93267c2..7bc042772e52 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/albert-0.14.22 b/metadata/md5-cache/x11-misc/albert-0.14.22
index 61dfee440ccc..cf330ef7da5f 100644
--- a/metadata/md5-cache/x11-misc/albert-0.14.22
+++ b/metadata/md5-cache/x11-misc/albert-0.14.22
@@ -10,4 +10,4 @@ RDEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 d
 SLOT=0
 SRC_URI=https://github.com/albertlauncher/albert/archive/v0.14.22.tar.gz -> albert-0.14.22.tar.gz https://github.com/albertlauncher/plugins/archive/5dc169ce81002b4472cc55c0341f6ac52fe130f5.tar.gz -> albert-0.14.22-plugins.tar.gz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=217e637261cbe920b27206a9bf111bb5
+_md5_=e752c729ef8dbc9344f9f05c03217afe
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.11.1 b/metadata/md5-cache/x11-misc/i3lock-2.11.1
new file mode 100644
index 000000000000..e6126a4e7078
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/i3lock-2.11.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=install prepare
+DEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-xrm virtual/pkgconfig
+DESCRIPTION=Simple screen locker
+EAPI=7
+HOMEPAGE=https://i3wm.org/i3lock/
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-xrm
+SLOT=0
+SRC_URI=https://i3wm.org/i3lock/i3lock-2.11.1.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=52eddb0aacc655990789d85419036ed2
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.2.1 b/metadata/md5-cache/x11-misc/kronometer-2.2.1
index 46b113301143..f3b4272e28d0 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.2.1
+++ b/metadata/md5-cache/x11-misc/kronometer-2.2.1
@@ -1,13 +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/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.3:5 >=dev-qt/qtgui-5.9.3:5 >=dev-qt/qtwidgets-5.9.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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.3:5 ) >=dev-qt/qtcore-5.9.3:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.3:5 >=dev-qt/qtgui-5.9.3:5 >=dev-qt/qtwidgets-5.9.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.50.0:5 handbook? ( >=kde-frameworks/kdoctools-5.50.0:5 ) test? ( >=dev-qt/qttest-5.9.3:5 ) >=dev-qt/qtcore-5.9.3:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Stopwatch application
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/Kronometer
 IUSE=test debug +handbook test
 KEYWORDS=amd64
 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/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.3:5 >=dev-qt/qtgui-5.9.3:5 >=dev-qt/qtwidgets-5.9.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.3:5
+RDEPEND=>=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=dev-qt/qtdbus-5.9.3:5 >=dev-qt/qtgui-5.9.3:5 >=dev-qt/qtwidgets-5.9.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.3:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.2.1/src/kronometer-2.2.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7df043a82831534ad3fe2639a0efa3e8
diff --git a/metadata/md5-cache/x11-misc/libinput-gestures-2.31 b/metadata/md5-cache/x11-misc/libinput-gestures-2.31
deleted file mode 100644
index 9dbece0ec35a..000000000000
--- a/metadata/md5-cache/x11-misc/libinput-gestures-2.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=postinst setup
-DEPEND=>=dev-libs/libinput-1.8.0 dev-util/desktop-file-utils test? ( dev-python/flake8[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(+)?] )
-DESCRIPTION=Actions gestures on your touchpad using libinput
-EAPI=6
-HOMEPAGE=https://github.com/bulletmark/libinput-gestures
-IUSE=test 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-3
-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 ) >=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/libinput-1.8.0 x11-misc/xdotool x11-misc/wmctrl
-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/bulletmark/libinput-gestures/archive/2.31.tar.gz -> libinput-gestures-2.31.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bac04a5e17eb0a9a72d852b7c578feeb
diff --git a/metadata/md5-cache/x11-misc/libinput-gestures-2.34 b/metadata/md5-cache/x11-misc/libinput-gestures-2.34
deleted file mode 100644
index 40130d788386..000000000000
--- a/metadata/md5-cache/x11-misc/libinput-gestures-2.34
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=postinst postrm prepare setup
-DEPEND=>=dev-libs/libinput-1.8.0 dev-util/desktop-file-utils test? ( dev-python/flake8[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(+)?] ) >=sys-apps/sed-4
-DESCRIPTION=Actions gestures on your touchpad using libinput
-EAPI=6
-HOMEPAGE=https://github.com/bulletmark/libinput-gestures
-IUSE=test 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-3
-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 ) >=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/libinput-1.8.0 x11-misc/xdotool x11-misc/wmctrl
-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/bulletmark/libinput-gestures/archive/2.34.tar.gz -> libinput-gestures-2.34.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a2b3c396910844dd0116a5c288fc6268
diff --git a/metadata/md5-cache/x11-misc/libinput-gestures-2.36 b/metadata/md5-cache/x11-misc/libinput-gestures-2.36
index d83de000f817..4e9ba203f088 100644
--- a/metadata/md5-cache/x11-misc/libinput-gestures-2.36
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-2.36
@@ -5,10 +5,11 @@ EAPI=6
 HOMEPAGE=https://github.com/bulletmark/libinput-gestures
 IUSE=test 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-3
+LICENSE=GPL-3+
 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 ) >=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/libinput-1.8.0 x11-misc/xdotool x11-misc/wmctrl
 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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bulletmark/libinput-gestures/archive/2.36.tar.gz -> libinput-gestures-2.36.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a2b3c396910844dd0116a5c288fc6268
+_md5_=a5a5a77ca6cbbce8e864e185b628bbf6
diff --git a/metadata/md5-cache/x11-misc/libinput-gestures-2.38 b/metadata/md5-cache/x11-misc/libinput-gestures-2.38
new file mode 100644
index 000000000000..99fc02d53b70
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-2.38
@@ -0,0 +1,14 @@
+DEFINED_PHASES=postinst postrm prepare setup test
+DEPEND=>=dev-libs/libinput-1.8.0 dev-util/desktop-file-utils >=sys-apps/sed-4
+DESCRIPTION=Actions gestures on your touchpad using libinput
+EAPI=6
+HOMEPAGE=https://github.com/bulletmark/libinput-gestures
+IUSE=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 ~x86
+LICENSE=GPL-3+
+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(+)?] >=dev-libs/libinput-1.8.0 x11-misc/xdotool x11-misc/wmctrl
+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/bulletmark/libinput-gestures/archive/2.38.tar.gz -> libinput-gestures-2.38.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0f67691a4c5aa06a27131d169f9653d3
diff --git a/metadata/md5-cache/x11-misc/libinput-gestures-9999 b/metadata/md5-cache/x11-misc/libinput-gestures-9999
index 8089e71d3ce1..2298b03532bd 100644
--- a/metadata/md5-cache/x11-misc/libinput-gestures-9999
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=postinst postrm prepare setup unpack
-DEPEND=>=dev-libs/libinput-1.8.0 dev-util/desktop-file-utils test? ( dev-python/flake8[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(+)?] ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=postinst postrm prepare setup test unpack
+DEPEND=>=dev-libs/libinput-1.8.0 dev-util/desktop-file-utils >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Actions gestures on your touchpad using libinput
 EAPI=6
 HOMEPAGE=https://github.com/bulletmark/libinput-gestures
-IUSE=test 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
-LICENSE=GPL-3
-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 ) >=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/libinput-1.8.0 x11-misc/xdotool x11-misc/wmctrl
-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 )
+IUSE=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
+LICENSE=GPL-3+
+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(+)?] >=dev-libs/libinput-1.8.0 x11-misc/xdotool x11-misc/wmctrl
+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
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a2b3c396910844dd0116a5c288fc6268
+_md5_=0f67691a4c5aa06a27131d169f9653d3
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1 b/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1
deleted file mode 100644
index e7ff065ef8ec..000000000000
--- a/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=audit? ( sys-process/audit ) >=dev-libs/glib-2.32.3:2 dev-libs/libxml2 gnome? ( sys-apps/accountsservice ) virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) dev-util/gtk-doc-am dev-util/intltool gnome? ( gnome-base/gnome-common ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=A lightweight display manager
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/LightDM
-IUSE=audit +introspection qt5 +gnome
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
-LICENSE=GPL-3 LGPL-3
-PDEPEND=x11-misc/lightdm-gtk-greeter
-RDEPEND=audit? ( sys-process/audit ) >=dev-libs/glib-2.32.3:2 dev-libs/libxml2 gnome? ( sys-apps/accountsservice ) virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) >=sys-auth/pambase-20101024-r2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/lightdm/1.18/1.18.3/+download/lightdm-1.18.3.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fa9903ee7b7639fef6ce63d399460412
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.24.0-r1 b/metadata/md5-cache/x11-misc/lightdm-1.24.0-r1
deleted file mode 100644
index 56cc108b273a..000000000000
--- a/metadata/md5-cache/x11-misc/lightdm-1.24.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig gnome? ( gnome-base/gnome-common ) >=app-portage/elt-patches-20170815 !<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=A lightweight display manager
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/LightDM
-IUSE=audit +gtk +introspection qt5 +gnome
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 LGPL-3
-PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
-RDEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) >=sys-auth/pambase-20101024-r2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/lightdm/1.24/1.24.0/+download/lightdm-1.24.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=74dd4aab78cbddf5e1a2ab25f13954cd
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.26.0 b/metadata/md5-cache/x11-misc/lightdm-1.26.0
deleted file mode 100644
index 799e5a355b16..000000000000
--- a/metadata/md5-cache/x11-misc/lightdm-1.26.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig gnome? ( gnome-base/gnome-common ) >=app-portage/elt-patches-20170815 !<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=A lightweight display manager
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/LightDM
-IUSE=audit +gtk +introspection qt5 +gnome
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 LGPL-3
-PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
-RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) >=sys-auth/pambase-20101024-r2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.26.0/lightdm-1.26.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a319e9603fa633eac3af0290d0a97a2f
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1 b/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
index 6bcebb10df64..f21d6c4a9e78 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A lightweight display manager
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/LightDM
 IUSE=audit +gnome +gtk +introspection qt5 vala
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-3 LGPL-3
 PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
 RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) >=sys-auth/pambase-20101024-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.26.0/lightdm-1.26.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cf80b90965a756ba3d0806f0a363a395
+_md5_=843a3c83fd516f536467e7c46b0c1b8e
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.1-r1 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.1-r1
deleted file mode 100644
index 5044934fe473..000000000000
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ayatana? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 dev-util/intltool sys-devel/gettext
-DESCRIPTION=LightDM GTK+ Greeter
-EAPI=4
-HOMEPAGE=https://launchpad.net/lightdm-gtk-greeter
-IUSE=ayatana branding
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
-LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
-RDEPEND=ayatana? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
-SLOT=0
-SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.1/+download/lightdm-gtk-greeter-2.0.1.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=497972fd8db30451113ed2011ff57788
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.5-r1 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.5-r1
index ef7e405cd91f..b7e96d75d3f2 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.5-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=LightDM GTK+ Greeter
 EAPI=6
 HOMEPAGE=https://launchpad.net/lightdm-gtk-greeter
 IUSE=ayatana branding
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
 RDEPEND=ayatana? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
 SLOT=0
 SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.5/+download/lightdm-gtk-greeter-2.0.5.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=098a483f557b2c64e1479fcb739b3cb3
+_md5_=12750c8e42569173e292d988792a4957
diff --git a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1 b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
index bd92c2933317..9e8d7f7e5a54 100644
--- a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
+++ b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 >=x11-libs/libwnck-3:3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon virtual/pkgconfig gnome-base/gnome-common x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<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
+DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 >=x11-libs/libwnck-3:3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon dev-util/glib-utils gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Canonical's on-screen-display notification agent
 EAPI=6
 HOMEPAGE=https://launchpad.net/notify-osd
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/notify-osd/precise/0.9.34/+download/notify-osd-0.9.34.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=539943c1b4b09b259e471c364e0362f1
+_md5_=b17ef88a244b891828e15874f1569c92
diff --git a/metadata/md5-cache/x11-misc/obconf-qt-0.13.0 b/metadata/md5-cache/x11-misc/obconf-qt-0.13.0
index 72d41fcd16f3..50b49b46fe45 100644
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.13.0
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.13.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/
 DESCRIPTION=Openbox window manager configuration tool
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-wm/openbox:3 x11-libs/libX11
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/obconf-qt/0.13.0/obconf-qt-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ac5f05df1ae37c47f205fa4093944cc7
+_md5_=c3f21f0f508a3489c4ed4fe3fa9370fe
diff --git a/metadata/md5-cache/x11-misc/obconf-qt-0.9.0_p20150729 b/metadata/md5-cache/x11-misc/obconf-qt-0.9.0_p20150729
deleted file mode 100644
index 8e979a7cf73e..000000000000
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.9.0_p20150729
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype x11-wm/openbox:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/pango dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Openbox window manager configuration tool
-EAPI=5
-HOMEPAGE=https://lxqt.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype x11-wm/openbox:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/pango
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jauhien/distfiles/obconf-qt-0.9.0_p20150729.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=54946cefbfb4387ec86be14041ab25d0
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1
deleted file mode 100644
index 6e6265d59607..000000000000
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.18:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-1.2.0:= x11-libs/libfm-qt:= x11-libs/libxcb:= dev-qt/linguist-tools:5 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Fast lightweight tabbed filemanager (Qt port)
-EAPI=6
-HOMEPAGE=https://wiki.lxde.org/en/PCManFM
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.18:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-1.2.0:= x11-libs/libfm-qt:= x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://github.com/lxde/pcmanfm-qt/releases/download/0.11.1/pcmanfm-qt-0.11.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b7a2fe3b0cb482a489c9df9cc8d0565b
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.13.0 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.13.0
deleted file mode 100644
index 8ce39fe1446e..000000000000
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.13.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-1.2.0:= =x11-libs/libfm-qt-0.13* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-common dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.5.0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Fast lightweight tabbed filemanager (Qt port)
-EAPI=6
-HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-1.2.0:= =x11-libs/libfm-qt-0.13* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-common
-SLOT=0
-SRC_URI=https://downloads.lxqt.org/downloads/pcmanfm-qt/0.13.0/pcmanfm-qt-0.13.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=792ba5841a26871560818f977d4b3785
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.13.0-r1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.13.0-r1
index 53999d7916d8..7c24a87c56b3 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.13.0-r1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.13.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtw
 DESCRIPTION=Fast lightweight tabbed filemanager (Qt port)
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-1.2.0:= =x11-libs/libfm-qt-0.13* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-common
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/pcmanfm-qt/0.13.0/pcmanfm-qt-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8bf9945ab70c8bb918a3300331a6a6a9
+_md5_=bd6bf57c6476e3eb17ea0e4df7e53243
diff --git a/metadata/md5-cache/x11-misc/qps-1.10.17 b/metadata/md5-cache/x11-misc/qps-1.10.17
deleted file mode 100644
index d1a4236208b4..000000000000
--- a/metadata/md5-cache/x11-misc/qps-1.10.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Visual process manager - Qt version of ps/top
-EAPI=6
-HOMEPAGE=https://github.com/QtDesktop/qps
-IUSE=debug
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
-SLOT=0
-SRC_URI=https://github.com/QtDesktop/qps/releases/download/1.10.17/qps-1.10.17.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2659905eb5b5000c447527df3e21d95d
diff --git a/metadata/md5-cache/x11-misc/qps-1.10.18 b/metadata/md5-cache/x11-misc/qps-1.10.18
index 2e6c7eddc138..aee2a882516c 100644
--- a/metadata/md5-cache/x11-misc/qps-1.10.18
+++ b/metadata/md5-cache/x11-misc/qps-1.10.18
@@ -4,10 +4,10 @@ DESCRIPTION=Visual process manager - Qt version of ps/top
 EAPI=6
 HOMEPAGE=https://lxqt.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+ QPL-1.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/qps/1.10.18/qps-1.10.18.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0cacc56be2f96626d450342b90ea0c4f
+_md5_=8be599029e02e524e6d0707261ec22dd
diff --git a/metadata/md5-cache/x11-misc/qt5ct-0.36 b/metadata/md5-cache/x11-misc/qt5ct-0.36
new file mode 100644
index 000000000000..4eed6731a95f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/qt5ct-0.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] ) dev-qt/linguist-tools:5
+DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/qt5ct/
+IUSE=+dbus
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
+SLOT=0
+SRC_URI=mirror://sourceforge/qt5ct/qt5ct-0.36.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b00ce6e7cd3a00b0788d79f0c6f4a0d3
diff --git a/metadata/md5-cache/x11-misc/revelation-0.4.14-r2 b/metadata/md5-cache/x11-misc/revelation-0.4.14-r2
index e214c576bb39..49f887c8812c 100644
--- a/metadata/md5-cache/x11-misc/revelation-0.4.14-r2
+++ b/metadata/md5-cache/x11-misc/revelation-0.4.14-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A password manager for GNOME
 EAPI=6
 HOMEPAGE=https://revelation.olasagasti.info/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pycryptodome[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/gconf-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-python/libgnome-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-python/dbus-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(+)] sys-libs/cracklib[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(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bitbucket.org/erikg/revelation/downloads/revelation-0.4.14.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8e147eef41c08921b807d2d2c743c783
+_md5_=2c606f860255cffac9c44fccf806cf41
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.99 b/metadata/md5-cache/x11-misc/screengrab-1.99
index 1e955ba0452b..eb722f0449f1 100644
--- a/metadata/md5-cache/x11-misc/screengrab-1.99
+++ b/metadata/md5-cache/x11-misc/screengrab-1.99
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=Qt application for getting screenshots
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/screengrab/1.99/screengrab-1.99.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=813c75cf056d9df06194d5d8037e989d
+_md5_=3eb5795bcae2b9ebd3fdaf8a02fad401
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.10 b/metadata/md5-cache/x11-misc/shared-mime-info-1.10
index d1bc52432029..98ffd4e75e12 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.10
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.10
@@ -4,10 +4,10 @@ DESCRIPTION=The Shared MIME-info Database specification
 EAPI=6
 HOMEPAGE=https://freedesktop.org/wiki/Software/shared-mime-info
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.10.tar.xz
 _eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9a83c83eaf1e41a7dc396d1321dbcb30
+_md5_=e389ec11b47880475a3b03dfe1403775
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.5.2 b/metadata/md5-cache/x11-misc/virtualgl-2.5.2
index 6f570c368bfd..200758ea04ba 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.5.2
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.5.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,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/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,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/glu[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/virtualgl/files/2.5.2/VirtualGL-2.5.2.tar.gz
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d9e937a1706ff61d95bbcd4f9921509
diff --git a/metadata/md5-cache/x11-misc/wmctrl-1.07-r2 b/metadata/md5-cache/x11-misc/wmctrl-1.07-r2
index b70f43aa9aea..369677bae554 100644
--- a/metadata/md5-cache/x11-misc/wmctrl-1.07-r2
+++ b/metadata/md5-cache/x11-misc/wmctrl-1.07-r2
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=-
 DEPEND=>=dev-libs/glib-2:2 x11-libs/libX11 x11-libs/libXt x11-libs/libXmu virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=command line tool to interact with an EWMH/NetWM compatible X Window Manager
-EAPI=6
-HOMEPAGE=http://tomas.styblo.name/wmctrl/
+EAPI=7
+HOMEPAGE=http://sweb.cz/tripie/utils/wmctrl
 KEYWORDS=amd64 ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:2 x11-libs/libX11 x11-libs/libXt x11-libs/libXmu
 SLOT=0
-SRC_URI=http://tomas.styblo.name/wmctrl/dist/wmctrl-1.07.tar.gz
-_md5_=ddf1299e89b131ffdac64f4aaf44e958
+SRC_URI=http://sweb.cz/tripie/utils/wmctrl/dist/wmctrl-1.07.tar.gz
+_md5_=3c7a2f8c926059d9bf17b1b9d65661d0
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r1 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r1
index bb89157b5c99..b9c741322cf1 100644
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r1
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop intero
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
 IUSE=doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=dev-util/desktop-file-utils dev-perl/File-MimeInfo dev-perl/Net-DBus dev-perl/X11-Protocol sys-apps/dbus x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset
 RESTRICT=test
 SLOT=0
 SRC_URI=https://portland.freedesktop.org/download/xdg-utils-1.1.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6afe50aa1c2a913882f9448817818a55
+_md5_=7a6fb38f980ff5d0c41c2536c77980f5
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.25 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.25
new file mode 100644
index 000000000000..64eaf2dc1c67
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.25
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure prepare
+DEPEND=dev-util/intltool sys-devel/gettext
+DESCRIPTION=X keyboard configuration database
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!<x11-apps/xkbcomp-1.2.3 !<x11-libs/libX11-1.4.3
+SLOT=0
+SRC_URI=mirror://xorg/data/xkeyboard-config/xkeyboard-config-2.25.tar.bz2
+_md5_=821589b824792811c0ed6065320710fc
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-9999 b/metadata/md5-cache/x11-misc/xkeyboard-config-9999
index 79fe366d59d0..1c8af93a7373 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-9999
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-9999
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=!<x11-apps/xkbcomp-1.2.3 !<x11-libs/libX11-1.4.3
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=29748f5dde754c3e1bcd609f4f13a9fc
+_md5_=821589b824792811c0ed6065320710fc
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.40 b/metadata/md5-cache/x11-misc/xscreensaver-5.40
index d3f8cd23b0fb..2a5f0ba3aabd 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.40
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.40
@@ -4,10 +4,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=6
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.40.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a7c3078fe42ae778de4e598a1f20f93
+_md5_=2fd95ef6bf151f25ae56aca1ee0b3869
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.3.0 b/metadata/md5-cache/x11-misc/xwallpaper-0.3.0
index efd49c19f155..7986d7e8d4e7 100644
--- a/metadata/md5-cache/x11-misc/xwallpaper-0.3.0
+++ b/metadata/md5-cache/x11-misc/xwallpaper-0.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Wallpaper setting utility for X
 EAPI=6
 HOMEPAGE=https://github.com/stoeckmann/xwallpaper
 IUSE=jpeg png seccomp xpm
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( virtual/jpeg:0= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://github.com/stoeckmann/xwallpaper/releases/download/v0.3.0/xwallpaper-0.3.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c2c13ca878092c91f54783ab6791183f
+_md5_=16fd41daf941626fde32cbef7c9e53fd
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 31a249eab974..acefb05c04d6 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/bfm-0.6.4-r3 b/metadata/md5-cache/x11-plugins/bfm-0.6.4-r3
index 08ca820cd0ba..66ae74bcbf39 100644
--- a/metadata/md5-cache/x11-plugins/bfm-0.6.4-r3
+++ b/metadata/md5-cache/x11-plugins/bfm-0.6.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfi
 EAPI=7
 HOMEPAGE=https://github.com/JNRowe-retired/bfm
 IUSE=gkrellm
-KEYWORDS=~amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/JNRowe-retired/bfm/archive/0.6.4.tar.gz -> bfm-0.6.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9d921a25867b6a74e8e9894ea8df74a0
+_md5_=36decde9085a0009e179485be718911c
diff --git a/metadata/md5-cache/x11-plugins/bubblemon-1.46-r3 b/metadata/md5-cache/x11-plugins/bubblemon-1.46-r3
index 872ca725d974..f1bcea08247c 100644
--- a/metadata/md5-cache/x11-plugins/bubblemon-1.46-r3
+++ b/metadata/md5-cache/x11-plugins/bubblemon-1.46-r3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=A fun monitoring applet for your desktop, complete with swimming duck
 EAPI=7
 HOMEPAGE=http://www.ne.jp/asahi/linux/timecop
-KEYWORDS=~alpha ~amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.ne.jp/asahi/linux/timecop/software/bubblemon-dockapp-1.46.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4ce7d92f6e682fffbebf4fc26bc9a508
+_md5_=c96c9d3042d13b191121f44caf3ac1e1
diff --git a/metadata/md5-cache/x11-plugins/docker-1.5 b/metadata/md5-cache/x11-plugins/docker-1.5
deleted file mode 100644
index adbec67a9f16..000000000000
--- a/metadata/md5-cache/x11-plugins/docker-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/glib-2.0.4 x11-libs/libX11 !app-emulation/docker virtual/pkgconfig
-DESCRIPTION=Openbox app which acts as a system tray for KDE and GNOME2
-EAPI=0
-HOMEPAGE=https://icculus.org/openbox/2/docker/
-KEYWORDS=alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.0.4 x11-libs/libX11 !app-emulation/docker
-SLOT=0
-SRC_URI=https://icculus.org/openbox/2/docker/docker-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=03fe2f7959464111bcaa0b2e617a054d
diff --git a/metadata/md5-cache/x11-plugins/docker-1.5-r1 b/metadata/md5-cache/x11-plugins/docker-1.5-r1
index ba854be19539..2e103a87cb6d 100644
--- a/metadata/md5-cache/x11-plugins/docker-1.5-r1
+++ b/metadata/md5-cache/x11-plugins/docker-1.5-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.0.4 x11-libs/libX11 virtual/pkgconfig
 DESCRIPTION=Openbox app which acts as a system tray for KDE and GNOME2
 EAPI=5
 HOMEPAGE=https://icculus.org/openbox/2/docker/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.0.4 x11-libs/libX11
 SLOT=0
 SRC_URI=https://icculus.org/openbox/2/docker/docker-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3c7e0cc05143b99ecb0dc26474f1392
+_md5_=d6772a417cb5c7754c3e0be324f24bde
diff --git a/metadata/md5-cache/x11-plugins/docker-1.5-r2 b/metadata/md5-cache/x11-plugins/docker-1.5-r2
index eec98e87f245..734ccf2f8e9e 100644
--- a/metadata/md5-cache/x11-plugins/docker-1.5-r2
+++ b/metadata/md5-cache/x11-plugins/docker-1.5-r2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.0.4 x11-libs/libX11 virtual/pkgconfig
 DESCRIPTION=Openbox app which acts as a system tray for KDE and GNOME2
 EAPI=7
 HOMEPAGE=https://icculus.org/openbox/2/docker/
-KEYWORDS=~alpha ~amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha ~amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.0.4 x11-libs/libX11
 SLOT=0
 SRC_URI=https://icculus.org/openbox/2/docker/docker-1.5.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9e16cdee965d5afff111a2bb82209912
+_md5_=2ce2a6870b156c303a7c054645aa6b0e
diff --git a/metadata/md5-cache/x11-plugins/wmCalClock-1.25-r3 b/metadata/md5-cache/x11-plugins/wmCalClock-1.25-r3
index 3bb75f7e7aeb..dd8d212e9f4c 100644
--- a/metadata/md5-cache/x11-plugins/wmCalClock-1.25-r3
+++ b/metadata/md5-cache/x11-plugins/wmCalClock-1.25-r3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=WMaker DockApp: A Calendar clock with antialiased text
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmcalclock
-KEYWORDS=~alpha ~amd64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha ~amd64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmCalClock-1.25.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5acf944847dcf9affde03950bd6d3310
+_md5_=192da273592d2095a6317187b7fa1649
diff --git a/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r1 b/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r1
deleted file mode 100644
index 83987463b42d..000000000000
--- a/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
-DESCRIPTION=WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack
-EAPI=0
-HOMEPAGE=https://www.dockapps.net/wmmatrix
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-misc/xscreensaver
-SLOT=0
-SRC_URI=https://www.dockapps.net/download/wmMatrix-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7fe34682cbfd601046e786011679afdc
diff --git a/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r2 b/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r2
index eb7e24e155e9..4ad31a4be516 100644
--- a/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r2
+++ b/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmmatrix
-KEYWORDS=~amd64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-misc/xscreensaver
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmMatrix-0.2.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3c6d9d885589474740f4118153739923
+_md5_=d04b7299a4a8a128a2f197aafeeea58d
diff --git a/metadata/md5-cache/x11-plugins/wmapm-3.1-r1 b/metadata/md5-cache/x11-plugins/wmapm-3.1-r1
deleted file mode 100644
index a9f0d6f52576..000000000000
--- a/metadata/md5-cache/x11-plugins/wmapm-3.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
-DESCRIPTION=WindowMaker DockApp: Battery/Power status monitor for laptops
-EAPI=0
-HOMEPAGE=https://www.dockapps.net/wmapm
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-SLOT=0
-SRC_URI=https://www.dockapps.net/download/wmapm-3.1.tar.gz
-_md5_=8abe032335d2cb294e3d2b7376326275
diff --git a/metadata/md5-cache/x11-plugins/wmapm-3.1-r2 b/metadata/md5-cache/x11-plugins/wmapm-3.1-r2
index c41473c7ffce..719ad8bda520 100644
--- a/metadata/md5-cache/x11-plugins/wmapm-3.1-r2
+++ b/metadata/md5-cache/x11-plugins/wmapm-3.1-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=WindowMaker DockApp: Battery/Power status monitor for laptops
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmapm
-KEYWORDS=~amd64 ppc ~sparc x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmapm-3.1.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a5e84c77b395e74ebcf38a1804f78118
+_md5_=fe29a3cdffd133ce22dcd280913bb76c
diff --git a/metadata/md5-cache/x11-plugins/wmcp-1.2.8-r1 b/metadata/md5-cache/x11-plugins/wmcp-1.2.8-r1
index 0e62c4332312..5d76954e8dec 100644
--- a/metadata/md5-cache/x11-plugins/wmcp-1.2.8-r1
+++ b/metadata/md5-cache/x11-plugins/wmcp-1.2.8-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=A pager dockapp
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmcp
-KEYWORDS=~alpha ~amd64 ~hppa ia64 ~mips ppc ~sparc x86
+KEYWORDS=alpha ~amd64 ~hppa ia64 ~mips ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmcp-1.2.8.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b4b55281a3072b8ae72a9da603c48f18
+_md5_=7968528054a1dd27795c73583d7ebb9f
diff --git a/metadata/md5-cache/x11-plugins/wmdots-0.2_beta b/metadata/md5-cache/x11-plugins/wmdots-0.2_beta
deleted file mode 100644
index 89bb0deb9ed2..000000000000
--- a/metadata/md5-cache/x11-plugins/wmdots-0.2_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-DESCRIPTION=multishape 3d rotating dots
-EAPI=0
-HOMEPAGE=https://www.dockapps.net/wmdots
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-SLOT=0
-SRC_URI=https://www.dockapps.net/download/wmdots-0.2beta.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a518ed67b85a5fe15f0d411cb26cfb7
diff --git a/metadata/md5-cache/x11-plugins/wmdots-0.2_beta-r1 b/metadata/md5-cache/x11-plugins/wmdots-0.2_beta-r1
index 8c27308646aa..910b37660176 100644
--- a/metadata/md5-cache/x11-plugins/wmdots-0.2_beta-r1
+++ b/metadata/md5-cache/x11-plugins/wmdots-0.2_beta-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 DESCRIPTION=multishape 3d rotating dots
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmdots
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmdots-0.2beta.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9e4b0da3e05ebf1e2085d7145bebedb9
+_md5_=2bf5d62dc123a0ef8877c9d005aed1ae
diff --git a/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3 b/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
index 36680f59bf23..a181bbb37fca 100644
--- a/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
+++ b/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=dockapp which provides a drawer (retractable button bar) to launch applications
 EAPI=6
 HOMEPAGE=http://people.easter-eggs.org/~valos/wmdrawer/
-KEYWORDS=~amd64 ppc ~sparc x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://people.easter-eggs.org/~valos/wmdrawer/wmdrawer-0.10.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=996acabc6a2207cdd0aadd39663b8d15
+_md5_=e12bd5f1de66cfb97513f68abcc26c77
diff --git a/metadata/md5-cache/x11-plugins/wminet-3.0.0-r2 b/metadata/md5-cache/x11-plugins/wminet-3.0.0-r2
index 5a89339c3352..b91ed338fdff 100644
--- a/metadata/md5-cache/x11-plugins/wminet-3.0.0-r2
+++ b/metadata/md5-cache/x11-plugins/wminet-3.0.0-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=dockapp for monitoring internet connections to and from your computer
 EAPI=7
 HOMEPAGE=http://www.improbability.net/#wminet
-KEYWORDS=~amd64 ppc ~sparc x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=http://www.improbability.net/wmdock//wminet-3.0.0.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a0d302c37eeb94d2aeae94a9c181c31f
+_md5_=0f0c01ff4cd24ad32c7dfffe191a6a43
diff --git a/metadata/md5-cache/x11-plugins/wmitime-0.5-r1 b/metadata/md5-cache/x11-plugins/wmitime-0.5-r1
index 18286aa9f26e..6268bf83c3c6 100644
--- a/metadata/md5-cache/x11-plugins/wmitime-0.5-r1
+++ b/metadata/md5-cache/x11-plugins/wmitime-0.5-r1
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/lib
 DESCRIPTION=Overglorified clock dockapp w/time, date, and internet time
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmitime
-KEYWORDS=~amd64 ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmitime-0.5.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=db274d0cccbbe0411fe67dad53196af3
+_md5_=4566b603e40b118be667d9823ad09608
diff --git a/metadata/md5-cache/x11-plugins/wmload-0.9.7-r1 b/metadata/md5-cache/x11-plugins/wmload-0.9.7-r1
index 7f5c1c09c54b..7766f4db20a9 100644
--- a/metadata/md5-cache/x11-plugins/wmload-0.9.7-r1
+++ b/metadata/md5-cache/x11-plugins/wmload-0.9.7-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=yet another dock application showing a system load gauge
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmload
-KEYWORDS=~amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmload-0.9.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e5b712964b481f65853b00b32ed3222d
+_md5_=9a2e7ae330a5a7a0972e728d60364b8f
diff --git a/metadata/md5-cache/x11-plugins/wmmemload-0.1.8-r1 b/metadata/md5-cache/x11-plugins/wmmemload-0.1.8-r1
index 275386eb8fca..319bbfffbeef 100644
--- a/metadata/md5-cache/x11-plugins/wmmemload-0.1.8-r1
+++ b/metadata/md5-cache/x11-plugins/wmmemload-0.1.8-r1
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto x11-
 DESCRIPTION=dockapp that displays memory and swap space usage
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmmemload
-KEYWORDS=~alpha ~amd64 ~ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmmemload-0.1.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=973af57c4c8d5b7ee56f59be678442fa
+_md5_=d9e96caa90b924c1d203481bf41f4741
diff --git a/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r3 b/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r3
index d660a5b2cf65..5acf71a71dfc 100644
--- a/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r3
+++ b/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=Dockapp CPU monitor resembling Xosview, support for smp
 EAPI=7
 HOMEPAGE=http://www.ne.jp/asahi/linux/timecop/
-KEYWORDS=~amd64 ppc64 x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8c97255681b61c8fe5d3c16343b026ed
+_md5_=20974fd7a6217f38f5ee39b397da6c02
diff --git a/metadata/md5-cache/x11-plugins/wmnet-1.06-r1 b/metadata/md5-cache/x11-plugins/wmnet-1.06-r1
deleted file mode 100644
index 4581c186ee32..000000000000
--- a/metadata/md5-cache/x11-plugins/wmnet-1.06-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto x11-misc/imake app-text/rman
-DESCRIPTION=WMnet is a dock.app network monitor
-EAPI=0
-HOMEPAGE=https://www.dockapps.net/wmnet
-KEYWORDS=x86 sparc alpha amd64 ppc
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=https://www.dockapps.net/download/wmnet-1.06.tar.gz mirror://gentoo/wmnet-1.06-misc.patch.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c57143eaf8dd51faef60da8b22388a5e
diff --git a/metadata/md5-cache/x11-plugins/wmnet-1.06-r2 b/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
index 5b1b622ff880..3bc5fa9bd82d 100644
--- a/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
+++ b/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto x11-misc/imake app-t
 DESCRIPTION=WMnet is a dock.app network monitor
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmnet
-KEYWORDS=~alpha ~amd64 ppc ~sparc x86
+KEYWORDS=alpha amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmnet-1.06.tar.gz mirror://gentoo/wmnet-1.06-misc.patch.bz2
-_md5_=71fe5d028eca3044ab435f1fb82c1540
+_md5_=a55c39afe01a28af80002fa5236d22ff
diff --git a/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r2 b/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r2
deleted file mode 100644
index 417e6797225c..000000000000
--- a/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-DESCRIPTION=dockapp for checking up to 7 pop3 accounts
-EAPI=2
-HOMEPAGE=https://www.dockapps.net/wmpop3lb
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-SLOT=0
-SRC_URI=https://www.dockapps.net/download/wmpop3lb2.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36f7afc834196166a3dd41ad0fe52c0b
diff --git a/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r3 b/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r3
index ed1f0960118b..301f62d12bc8 100644
--- a/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r3
+++ b/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r3
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 DESCRIPTION=dockapp for checking up to 7 pop3 accounts
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmpop3lb
-KEYWORDS=~amd64 ~sparc x86
+KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmpop3lb2.4.2.tar.gz
-_md5_=47da0bad59b96eccb6cb59ae4d426f97
+_md5_=33ec46e4704de23049af5622d127527f
diff --git a/metadata/md5-cache/x11-plugins/wmpower-0.4.3 b/metadata/md5-cache/x11-plugins/wmpower-0.4.3
deleted file mode 100644
index e4691ac2d7e1..000000000000
--- a/metadata/md5-cache/x11-plugins/wmpower-0.4.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
-DESCRIPTION=a dockapp to get/set power management status for laptops (APM, ACPI and CPUfreq)
-EAPI=0
-HOMEPAGE=http://wmpower.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-SLOT=0
-SRC_URI=mirror://sourceforge/wmpower/wmpower-0.4.3.tar.bz2
-_md5_=ce5e413d30944ba37697700047cd5c2d
diff --git a/metadata/md5-cache/x11-plugins/wmpower-0.4.3-r1 b/metadata/md5-cache/x11-plugins/wmpower-0.4.3-r1
index ded6e430ce49..c6bb204eb331 100644
--- a/metadata/md5-cache/x11-plugins/wmpower-0.4.3-r1
+++ b/metadata/md5-cache/x11-plugins/wmpower-0.4.3-r1
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=a dockapp to get/set power management status for laptops (APM, ACPI and CPUfreq)
 EAPI=7
 HOMEPAGE=http://wmpower.sourceforge.net/
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/wmpower/wmpower-0.4.3.tar.bz2
-_md5_=46391691dc814fd92a23792261b3771f
+_md5_=f2c5890f0461340099e2ba1e5286ecf7
diff --git a/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1 b/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1
deleted file mode 100644
index 656c12e49495..000000000000
--- a/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-base/xorg-proto
-DESCRIPTION=fork of wmmixer adding scrollwheel support and other features
-EAPI=0
-HOMEPAGE=https://www.dockapps.net/wmsmixer
-KEYWORDS=amd64 ~ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.dockapps.net/download/wmsmixer-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79150b8aa46fe9234e90720d304e1782
diff --git a/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r1 b/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r1
index c097d59f55c8..3fca5cdda528 100644
--- a/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=fork of wmmixer adding scrollwheel support and other features
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmsmixer
-KEYWORDS=~amd64 ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmsmixer-0.5.1.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e2e56908dd1bc58d5dfd30694b71c648
+_md5_=b79ea4b76f78bb07d630a699b2eb203c
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 78080cddb1ae..41661201442d 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/guake-3.4.0-r1 b/metadata/md5-cache/x11-terms/guake-3.4.0-r1
index 937fadb28926..772c36b9f570 100644
--- a/metadata/md5-cache/x11-terms/guake-3.4.0-r1
+++ b/metadata/md5-cache/x11-terms/guake-3.4.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/glib[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-libs/keybinder:3[introspection] dev-python/dbus-python[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/pbr[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/pycairo[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/pygobject:3[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(+)?] x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) dev-python/setuptools[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(+)?] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make 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(+)?] >=sys-apps/sed-4
+DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[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/pbr[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/pycairo[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/pygobject:3[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(+)?] x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) dev-python/setuptools[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(+)?] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make 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(+)?] >=sys-apps/sed-4
 DESCRIPTION=Drop-down terminal for GNOME
 EAPI=6
 HOMEPAGE=https://github.com/Guake/guake https://pypi.org/project/Guake
 IUSE=utempter python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib[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-libs/keybinder:3[introspection] dev-python/dbus-python[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/pbr[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/pycairo[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/pygobject:3[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(+)?] x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) 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(+)?]
+RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[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/pbr[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/pycairo[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/pygobject:3[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(+)?] x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) 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(+)?]
 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=0
 SRC_URI=mirror://pypi/G/Guake/Guake-3.4.0.tar.gz -> guake-3.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=47747aae1a599e11c0e0f50e7ea86cc7
+_md5_=422e44241c451da93103b6e5a4d1be13
diff --git a/metadata/md5-cache/x11-terms/guake-9999 b/metadata/md5-cache/x11-terms/guake-9999
index 8c2473a73c19..9088d8218660 100644
--- a/metadata/md5-cache/x11-terms/guake-9999
+++ b/metadata/md5-cache/x11-terms/guake-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/glib[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-libs/keybinder:3[introspection] dev-python/dbus-python[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/pbr[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/pycairo[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/pygobject:3[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(+)?] x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) dev-python/setuptools[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(+)?] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make 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(+)?] >=dev-vcs/git-1.8.2.1[curl] >=sys-apps/sed-4
+DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[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/pbr[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/pycairo[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/pygobject:3[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(+)?] x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) dev-python/setuptools[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(+)?] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make 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(+)?] >=dev-vcs/git-1.8.2.1[curl] >=sys-apps/sed-4
 DESCRIPTION=Drop-down terminal for GNOME
 EAPI=6
 HOMEPAGE=https://github.com/Guake/guake https://pypi.org/project/Guake
 IUSE=utempter python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib[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-libs/keybinder:3[introspection] dev-python/dbus-python[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/pbr[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/pycairo[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/pygobject:3[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(+)?] x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) 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(+)?]
+RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[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/pbr[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/pycairo[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/pygobject:3[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(+)?] x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) 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(+)?]
 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=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=23bc880215dcf55961c45ace264fdc68
+_md5_=b6ab5a66fc986aba9077decc522268e2
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 1007358cbafa..1b0f50e3cfff 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.24.0 b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.24.0
index c74fce6f4b20..2842aac7de23 100644
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.24.0
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.24.0
@@ -4,9 +4,9 @@ DESCRIPTION=A set of backgrounds packaged with the GNOME desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-backgrounds
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
+LICENSE=CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0
 RDEPEND=!<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6556810cbae0f85a4a6cb4d77fdf8d0c
+_md5_=d358f25a3d7e84dcfb46d2cd1e7170c6
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.26.2 b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.26.2
new file mode 100644
index 000000000000..41028d0f0832
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.26.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=sys-devel/gettext-0.19.8 >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A set of backgrounds packaged with the GNOME desktop
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-backgrounds
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0
+RDEPEND=!<x11-themes/gnome-themes-standard-3.14
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-backgrounds/3.26/gnome-backgrounds-3.26.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fd2e1d5cc7451ec4a9d6055f59fe2105
diff --git a/metadata/md5-cache/x11-themes/lxqt-themes-0.13.0 b/metadata/md5-cache/x11-themes/lxqt-themes-0.13.0
index 9b77d753f36a..976965e3e629 100644
--- a/metadata/md5-cache/x11-themes/lxqt-themes-0.13.0
+++ b/metadata/md5-cache/x11-themes/lxqt-themes-0.13.0
@@ -3,10 +3,10 @@ DEPEND=!lxqt-base/lxqt-common >=dev-util/lxqt-build-tools-0.5.0 sys-devel/make >
 DESCRIPTION=Themes, graphics and icons for LXQt
 EAPI=6
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=!lxqt-base/lxqt-common
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-themes/0.13.0/lxqt-themes-0.13.0.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4b7e779d37c2ce8adef3be20f477478a
+_md5_=79641bf9d1b94481978fa3482307d280
diff --git a/metadata/md5-cache/x11-themes/numix-gtk-theme-2.6.7 b/metadata/md5-cache/x11-themes/numix-gtk-theme-2.6.7
index 85b42fb8b219..f56311fb3740 100644
--- a/metadata/md5-cache/x11-themes/numix-gtk-theme-2.6.7
+++ b/metadata/md5-cache/x11-themes/numix-gtk-theme-2.6.7
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
-DEPEND=dev-libs/libxml2 x11-libs/gtk+:3 x11-themes/gtk-engines-murrine dev-libs/glib:2 dev-ruby/sass:* x11-libs/gdk-pixbuf:2
+DEPEND=dev-libs/libxml2:2 x11-libs/gtk+:3 x11-themes/gtk-engines-murrine dev-libs/glib:2 >=dev-ruby/sass-3.5 x11-libs/gdk-pixbuf:2
 DESCRIPTION=A modern flat theme with a combination of light and dark elements
 EAPI=7
 HOMEPAGE=https://github.com/numixproject/numix-gtk-theme
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2 x11-libs/gtk+:3 x11-themes/gtk-engines-murrine
+RDEPEND=dev-libs/libxml2:2 x11-libs/gtk+:3 x11-themes/gtk-engines-murrine
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-gtk-theme/archive/2.6.7.tar.gz -> numix-gtk-theme-2.6.7.tar.gz
-_md5_=22bd0693ff2c95e2d49e3f254431e2fc
+_md5_=df4750548aa6f2108fddc69678e79017
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
index 1f8cdea4e87d..b4cce566a553 100644
--- a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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/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/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/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/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(-)?] !x11-themes/oxygen-gtk:0
 SLOT=3
 SRC_URI=mirror://kde/stable/oxygen-gtk3/1.4.1/src/oxygen-gtk3-1.4.1.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b9c5a4ce1c8ced2c17e83ef5d5a2ff3f
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
index 4722441fd9d8..822df2f123d9 100644
--- a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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/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/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] !x11-themes/oxygen-gtk:0
 SLOT=2
 SRC_URI=mirror://kde/stable/oxygen-gtk2/1.4.6/src/oxygen-gtk2-1.4.6.tar.bz2
-_eclasses_=cmake-multilib	a2ef7e88c0043ca9dcbe33db04c84f23	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed1491b652aa3cd101da90592113a126
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.9.0 b/metadata/md5-cache/x11-themes/qtcurve-1.9.0
index 02a7eac18334..d3a6492009e1 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-1.9.0
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.9.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kcompletion-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdelibs4support-5.46.0 >=kde-frameworks/kguiaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) virtual/pkgconfig nls? ( 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 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kcompletion-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdelibs4support-5.50.0 >=kde-frameworks/kguiaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) virtual/pkgconfig nls? ( 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 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Widget styles for Qt and GTK2
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/qtcurve.git
 IUSE=+X gtk nls plasma +qt5 test debug
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kcompletion-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdelibs4support-5.46.0 >=kde-frameworks/kguiaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kcompletion-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdelibs4support-5.50.0 >=kde-frameworks/kguiaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
 REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/KDE/qtcurve/archive/v1.9.0.tar.gz -> qtcurve-1.9.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=af7422526d7d328b5ec0bd3a892c1997
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1e54d06d68b4e1c39be609e25566a86c
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r2 b/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r2
index b9cec863eda2..1057b177cd60 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r2
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kcompletion-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdelibs4support-5.46.0 >=kde-frameworks/kguiaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) virtual/pkgconfig nls? ( 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 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kcompletion-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdelibs4support-5.50.0 >=kde-frameworks/kguiaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) virtual/pkgconfig nls? ( 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 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Widget styles for Qt and GTK2
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/qtcurve.git
 IUSE=+X gtk nls plasma +qt5 test debug
 KEYWORDS=alpha amd64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=LGPL-2+
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kcompletion-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdelibs4support-5.46.0 >=kde-frameworks/kguiaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kcompletion-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdelibs4support-5.50.0 >=kde-frameworks/kguiaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
 REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/KDE/qtcurve/archive/1.9.0-rc1.tar.gz -> qtcurve-1.9.0_rc1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e9a52b93efd31d49e2ce1d37d6f3fdfd
diff --git a/metadata/md5-cache/x11-themes/qtcurve-9999 b/metadata/md5-cache/x11-themes/qtcurve-9999
index 01f0c973ed7c..aacad7232a96 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-9999
+++ b/metadata/md5-cache/x11-themes/qtcurve-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kcompletion-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdelibs4support-5.46.0 >=kde-frameworks/kguiaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) virtual/pkgconfig nls? ( 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 >=dev-vcs/git-1.8.2.1[curl] dev-util/desktop-file-utils
+DEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kcompletion-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdelibs4support-5.50.0 >=kde-frameworks/kguiaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) virtual/pkgconfig nls? ( 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 >=dev-vcs/git-1.8.2.1[curl] dev-util/desktop-file-utils
 DESCRIPTION=Widget styles for Qt and GTK2
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/qtcurve.git
 IUSE=+X gtk nls plasma +qt5 test debug
 LICENSE=LGPL-2+
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.46.0 >=kde-frameworks/karchive-5.46.0 >=kde-frameworks/kcompletion-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdelibs4support-5.46.0 >=kde-frameworks/kguiaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kwindowsystem-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.50.0 >=kde-frameworks/karchive-5.50.0 >=kde-frameworks/kcompletion-5.50.0 >=kde-frameworks/kconfig-5.50.0 >=kde-frameworks/kconfigwidgets-5.50.0 >=kde-frameworks/kcoreaddons-5.50.0 >=kde-frameworks/kdelibs4support-5.50.0 >=kde-frameworks/kguiaddons-5.50.0 >=kde-frameworks/ki18n-5.50.0 >=kde-frameworks/kiconthemes-5.50.0 >=kde-frameworks/kio-5.50.0 >=kde-frameworks/kwidgetsaddons-5.50.0 >=kde-frameworks/kwindowsystem-5.50.0 >=kde-frameworks/kxmlgui-5.50.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
 REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	cb32ad42759e8fc24a57ced7d438657f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b4700ce093c927d3f723d4959611b93b
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index ad69966708a2..e789e3396bc3 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/ctwm-4.0.2 b/metadata/md5-cache/x11-wm/ctwm-4.0.2
index a4d379076e7b..795f335b925b 100644
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.2
+++ b/metadata/md5-cache/x11-wm/ctwm-4.0.2
@@ -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.2.tar.xz
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4253f13b02c41ec9bd3845c687bac89e
+_md5_=7effac4e6cc2cf4223261eac4795fa0a
diff --git a/metadata/md5-cache/x11-wm/fvwm-2.6.8-r1 b/metadata/md5-cache/x11-wm/fvwm-2.6.8-r1
new file mode 100644
index 000000000000..d4246091173a
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/fvwm-2.6.8-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender virtual/libiconv bidi? ( dev-libs/fribidi ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto doc? ( dev-libs/libxslt )
+DESCRIPTION=An extremely powerful ICCCM-compliant multiple virtual desktop window manager
+EAPI=7
+HOMEPAGE=http://www.fvwm.org/
+IUSE=bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2 FVWM
+RDEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender virtual/libiconv bidi? ( dev-libs/fribidi ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) dev-lang/perl perl? ( tk? ( dev-lang/tk dev-perl/Tk >=dev-perl/X11-Protocol-0.56 ) ) rplay? ( media-sound/rplay ) lock? ( x11-misc/xlockmore ) userland_GNU? ( sys-apps/debianutils ) !x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
+SLOT=0
+SRC_URI=https://github.com/fvwmorg/fvwm/releases/download/2.6.8/fvwm-2.6.8.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=eaae4dbbc94de3e6b724f2b59c1eef85
diff --git a/metadata/md5-cache/x11-wm/larswm-7.5.3-r1 b/metadata/md5-cache/x11-wm/larswm-7.5.3-r1
deleted file mode 100644
index 5c884c0e22b1..000000000000
--- a/metadata/md5-cache/x11-wm/larswm-7.5.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-base/xorg-proto x11-misc/imake x11-misc/gccmakedep app-text/rman
-DESCRIPTION=Tiling window manager for X11, based on 9wm by David Hogan
-EAPI=2
-HOMEPAGE=http://larswm.fnurt.net/
-KEYWORDS=alpha ~amd64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=9wm
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
-SLOT=0
-SRC_URI=http://larswm.fnurt.net/larswm-7.5.3.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=72ec644a913f788620df59649a45d601
diff --git a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2 b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
index 911ca552bc74..6e4d2fcb30cb 100644
--- a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
+++ b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-base/
 DESCRIPTION=Tiling window manager for X11, based on 9wm by David Hogan
 EAPI=7
 HOMEPAGE=http://www.fnurt.net/larswm/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=9wm
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.fnurt.net/larswm/larswm-7.5.3.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a9d8f4c5b1b54275fb4eb6cd8870f369
+_md5_=2e866a1577a412f04cd0570145aaba84
diff --git a/metadata/md5-cache/x11-wm/treewm-0.4.5 b/metadata/md5-cache/x11-wm/treewm-0.4.5
deleted file mode 100644
index be0073a9b02e..000000000000
--- a/metadata/md5-cache/x11-wm/treewm-0.4.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXau x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/libXdmcp x11-libs/libXpm x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=WindowManager that arranges the windows in a tree (not in a list)
-EAPI=0
-HOMEPAGE=http://treewm.sourceforge.net/
-KEYWORDS=x86 sparc ppc
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXau x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/libXdmcp x11-libs/libXpm
-SLOT=0
-SRC_URI=mirror://sourceforge/treewm/treewm-0.4.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b31d199843ab7e42ce84ed1c4a1daed5
diff --git a/metadata/md5-cache/x11-wm/treewm-0.4.5-r1 b/metadata/md5-cache/x11-wm/treewm-0.4.5-r1
deleted file mode 100644
index b82a42a09eca..000000000000
--- a/metadata/md5-cache/x11-wm/treewm-0.4.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/libXpm x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=WindowManager that arranges the windows in a tree (not in a list)
-EAPI=2
-HOMEPAGE=http://treewm.sourceforge.net/
-KEYWORDS=~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/libXpm
-SLOT=0
-SRC_URI=mirror://sourceforge/treewm/treewm-0.4.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d92f36642bd50a19a50d31e02d29f647
diff --git a/metadata/md5-cache/x11-wm/treewm-0.4.5-r2 b/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
index 039eb5b30e1c..c5d1c87dde71 100644
--- a/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
+++ b/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/libXpm x11-
 DESCRIPTION=WindowManager that arranges the windows in a tree (not in a list)
 EAPI=7
 HOMEPAGE=http://treewm.sourceforge.net/
-KEYWORDS=~ppc ~sparc ~x86
+KEYWORDS=ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/treewm/treewm-0.4.5.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=585367076dcff78b0f87e50b5c506776
+_md5_=7ea2d516e98369588de095a3f43e8325
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 8de2eea12d87..28d91bf0c348 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/exo-0.12.3 b/metadata/md5-cache/xfce-base/exo-0.12.3
new file mode 100644
index 000000000000..b81ea484c25b
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/exo-0.12.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42:= dev-perl/URI >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.22:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Extensions, widgets and framework library with session support for Xfce
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42:= dev-perl/URI >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.22:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/exo/0.12/exo-0.12.3.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=57189c8f4bf31653b3a0444e142f76cb
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.13.6 b/metadata/md5-cache/xfce-base/xfconf-4.13.6
new file mode 100644
index 000000000000..996fe5ddfa53
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfconf-4.13.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.30:= >=xfce-base/libxfce4util-4.10:= perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1 dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext perl? ( dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A configuration management system for Xfce
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=debug perl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.30:= >=xfce-base/libxfce4util-4.10:= perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1
+SLOT=0/3
+SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.13/xfconf-4.13.6.tar.bz2
+_eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=31fa095b32676c98a10fe02bde43a1dc
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index cff6c149e6bb..f19866be02bf 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-alsa-plugin-0.1.1 b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1
index 06f5c9656078..925c364002db 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib xfce-base/xfce4-panel x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/equeim/xfce4-alsa-plugin/archive/0.1.1.tar.gz -> xfce4-alsa-plugin-0.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	77ee347982e4e1d405ed64356b80201a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
 _md5_=d7fc1ede93095788e8060c2271194e85
diff --git a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.1-r1 b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.1-r1
index 3973406a4006..1eb51c2f798d 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.1-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= dev
 DESCRIPTION=A panel plug-in for disk usage and performance statistics
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-2.6.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cddc5713ea25d42a54da48a66ffbb2e7
+_md5_=e413ca0c9fa56f577b50c5d7095775a7
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.0 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.0
new file mode 100644
index 000000000000..c97e71fb14ac
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86misc:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= x11-misc/xscreensaver >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) locking? ( pam? ( virtual/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= ) dev-util/glib-utils dev-util/intltool sys-apps/dbus virtual/pkgconfig
+DESCRIPTION=Screen saver and locker (port of MATE screensaver)
+EAPI=6
+HOMEPAGE=https://git.xfce.org/apps/xfce4-screensaver/about/
+IUSE=consolekit +locking opengl pam systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86misc:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= x11-misc/xscreensaver >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) locking? ( pam? ( virtual/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/0.1/xfce4-screensaver-0.1.0.tar.bz2
+_md5_=135419f5ca632ada91ee72f8b8dc73d1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3
index 4bb0eaab45b0..892711344c61 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= dev-util/glib-utils dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
 DESCRIPTION=Xfce4 screenshooter application and panel plugin
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-screenshooter
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b9d3c36be4d67cfcdec440dc978a6bef
+_md5_=eb037b2002d6016e682bd07c023a4cca
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.6 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.6
index 733c5dcce77d..2c60733fcca4 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.6
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/xfce4-panel-4.8:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 >=dev-util/xfce4-dev-tools-4.10
+DEPEND=>=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/xfce4-panel-4.8:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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 >=dev-util/xfce4-dev-tools-4.10
 DESCRIPTION=A panel plug-in for different sensors using acpi, lm_sensors and hddtemp
 EAPI=5
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
 IUSE=+acpi debug hddtemp libnotify lm_sensors video_cards_nvidia
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/xfce4-panel-4.8:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+RDEPEND=>=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/xfce4-panel-4.8:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.2/xfce4-sensors-plugin-1.2.6.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=e0334145f053d20e452bcd4bffe73943
+_md5_=8946fec14dc28325f3606b17693cd36d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.98 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.98
index 6d022a32021a..f62378e3109a 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.98
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.98
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) dev-util/intltool virtual/pkgconfig
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
 DESCRIPTION=A panel plug-in for acpi, lm_sensors and hddtemp sensors
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
 IUSE=+acpi hddtemp libnotify lm_sensors video_cards_nvidia
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.2/xfce4-sensors-plugin-1.2.98.tar.bz2
-_md5_=e9a98fff3a19ca424fea61723af12183
+_md5_=0d6caa4ea781a29b5566fce1cf005f32
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0
index 8fcc08c95100..f7963be545fe 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
 DESCRIPTION=A panel plug-in for acpi, lm_sensors and hddtemp sensors
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
 IUSE=+acpi hddtemp libnotify lm_sensors video_cards_nvidia
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-1.3.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bfb3d5299083a1e20b04a0dfa8d54b88
+_md5_=54a0a2f8fc95054f42fe50d89242cd9a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 3107120703a8..3545325f763a 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 20301 BLAKE2B 94e5e08bb1fb06daafae41f3b009e2486b835bd0478950857eac122294511d53866717ddacc70984a676a09a2b97a064b0b9e8ecd5261e58b3a0ec55bd0f3e51 SHA512 b72f3b14f69444a7d849878751dfcf10341f96aea126f20e0209c97c73e22d9421610392df5ee4ceb1577f6541480778b86eba9a821033b7318f43cb04c9b479
-TIMESTAMP 2018-10-07T09:08:39Z
+TIMESTAMP 2018-10-22T09:08:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu5zRhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlvNk5hfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCxsxAAogi4L1OL1tFGmPK1tU2Rg/406GfiHBF2ZSqSMCOJfQShM7/sbCAQ3sNq
-NDcVa/aD4nf6Mh/+/jggukBbsWTuekogEak+HSQ6QomrmfNv5KkKv1JkNtxDv0JZ
-jrNTP4tEtHkrN0/VoB9I1+0CuPF/yudpL+8P+kIOp62B9t12n/Px1vTZkBRHIDTK
-dVOB5xI3OPVjvfncYL4/zgFhZ+7c8Jc4GF3aj9QyyFoFSVk80+GeOGeDcq5A0q6Y
-xS+eR7RvIztQe8MjfbPegSLwlF6r8j3OVWCiFE2rdiWeABkj04wnLMuLlEBEUwye
-4fuQIoUy4vA7Gfh8f3hZuSxxVLGAI6vKydKZ+jwhWzjmAtiBPBTjdAAq+CFWykr5
-PEn7pJ3SXPvocroGEsYDVbulLfnEiHAK5xbjtXYWi3p0Gtg9HCKlx1z1ZSoxIZZq
-j0JYR1JyNNRmhE7AUgOQh5JuK39koS9HaqeXsFVnMl4HNu4OoUNpzQNUhCv8Pd8p
-YYCsAT90q6FeT3rVkyIiqDTveC7FbQxupIBSyriMMb1ykKardyrtMchuInXJpTMt
-FROXolZZuD6tEqS82f7QFBuYpI21tl/6jKgtFpbB35D9ucGgYqHfy6ruHsZ5YEND
-mvSVZhjsHdOBrnYN/RNAAGRxy1R49t1JsYB5KhIEnIlKlHMT7VQ=
-=Weru
+klBJPA/8C8f03cHeipcoEtfVIIc6rq1QWyjbSNS6n9akf9nW8hJ3pfFsVf9uG8Ej
+jHNTYSP2xVnO6jl/LkSFxV26bASvsYeYJcTTCURPbhHzrvNGiSAUyfF+JirEt94r
+pVIha8KUhmh9UvCqXLj9cjzEQ+SDmgj/WN85f2RMuOUsvfv9wPKuzMmSWT3eQo6Q
+ot5psPzMkzpzHNJIvZ1xrpXtqmWsp1cb6lky8kMOuO/jF5A7S22bSrTakhbwdeBh
+tsDsiHthq++9gvXT6dD7nFFCR/nIgUj19JixvWPXFkLbkMc4qqdPRXcpgWCQsFFG
+Kt2kICQz46BJkHYuLMw8XX9pJMcBcgyIdcTVwH+h0I9XJ7dk+XJMsGuCSpEIdZTj
+3UQdRXqmcvjurFByUihTSAFNE4qEDQXCJU70fvXLbsvvf7fA0eE9GrHSoRz6F8h1
+L0f7Yfu4ni+m0xRQTDzruZgoPVDSLh4TKxksS5BarwzUU47JakU79Rz3eL1zxqFZ
+v35b/nA+NY+1Dn2Bx3SACISbfQJ0h8Esu0h4fuQab7Us2PfxWNiJd5yip2NjLq1d
+jl4ZdEKKHGHIbx//+EP5qh+f1QOFMRPzogfTS5EXQWJXLUXpf3lqy4P48HgnZ9QF
+Qpei1MYon2oUGsxpxED5/ztbUHN5ro0GI8lS+f/THQppVZ9D8hk=
+=sI7e
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4b5c84dd0035..4c320b721ab4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 07 Oct 2018 09:08:36 +0000
+Mon, 22 Oct 2018 09:08:36 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 5821c98b8c66..af7003dd56fb 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -81,7 +81,7 @@
     <member>
       <email>dilfridge@gentoo.org</email>
       <name>Andreas K. Hüttel</name>
-      <role>Member (Gentoo/ARM)</role>
+      <role>inactive (no hardware)</role>
     </member>
     <member>
       <email>dlan@gentoo.org</email>
@@ -854,7 +854,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>Mikhail Pukhlikov</name>
+      <name>Misha Pukhlikov</name>
     </member>
   </project>
   <project>
@@ -1428,7 +1428,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>Mikhail Pukhlikov</name>
+      <name>Misha Pukhlikov</name>
       <role>Member</role>
     </member>
     <member>
@@ -1609,7 +1609,7 @@
     <description>Support Haskell programming language ecosystem on Gentoo systems.</description>
     <member>
       <email>cynede@gentoo.org</email>
-      <name>Mikhail Pukhlikov</name>
+      <name>Misha Pukhlikov</name>
     </member>
     <member>
       <email>gienah@gentoo.org</email>
@@ -2951,7 +2951,7 @@ developers and volunteer mentors.</description>
     </member>
     <member>
       <email>cynede@gentoo.org</email>
-      <name>Mikhail Pukhlikov</name>
+      <name>Misha Pukhlikov</name>
       <role>Discord (admin)</role>
     </member>
     <member>
@@ -3320,7 +3320,7 @@ developers and volunteer mentors.</description>
     </member>
     <member>
       <email>cynede@gentoo.org</email>
-      <name>Mikhail Pukhlikov</name>
+      <name>Misha Pukhlikov</name>
     </member>
     <member>
       <email>djc@gentoo.org</email>
@@ -3835,6 +3835,11 @@ developers and volunteer mentors.</description>
       <name>Pacho Ramos</name>
       <role>Member</role>
     </member>
+    <member>
+      <email>vdupras@gentoo.org</email>
+      <name>Virgil Dupras</name>
+      <role>Member</role>
+    </member>
   </project>
   <project>
     <email>udev-bugs@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index 461eee25200e..f7a847046fd1 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Oct  7 09:08:36 UTC 2018
+Mon Oct 22 09:08:36 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1d691ac62de1..263fc4f5176b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 07 Oct 2018 09:15:01 +0000
+Mon, 22 Oct 2018 09:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 6faaa1953744..4901bc46dd77 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e09c96777582b82f6d84fb2d865151fbced1dfb4 1538900203 2018-10-07T08:16:43+00:00
+30840c90ad79e16625a0b6eba62ea1a5c8b8b854 1540195946 2018-10-22T08:12:26+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a18bd19b09a3..d18d2ab02def 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1538903101 Sun 07 Oct 2018 09:05:01 AM UTC
+1540199101 Mon 22 Oct 2018 09:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4b5c84dd0035..4c320b721ab4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 07 Oct 2018 09:08:36 +0000
+Mon, 22 Oct 2018 09:08:36 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c5819c04d49c..28c6598ab103 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bing/Manifest b/net-analyzer/bing/Manifest
index 29ef58ccbe0e..be9c1c27c07c 100644
--- a/net-analyzer/bing/Manifest
+++ b/net-analyzer/bing/Manifest
@@ -1,3 +1,3 @@
 DIST bing_1.1.3.orig.tar.gz 38847 BLAKE2B ba01ff0e9a53fa8e9cd44ee085d78ae8d8891cc5478697a0d8fb13917c9a4104a672dcc7aba0c6c91e7f0084ac4254b6f565cf44486b6162225c5a21cb1614a7 SHA512 df56f93047454a02b305154b12898b063c340e96778db9e11114ac4598446648b3ed5fe4304e0f3e33f612069b0f0e4e231396ee878655683f923ad5418d6242
-EBUILD bing-1.1.3-r1.ebuild 686 BLAKE2B 644689146cd749a0a929b423d5ea799b3237b4f3b9550823f52ad7256af252bbebc0423caf53e4c87a6636b031afd3ccd6500f51b2f06fc54b5bd481ab3cfe88 SHA512 e3914efe7f54fa8da148dd19b61bc8dcc2b33c6c3e5d13c54559282ecd49a2af6203b054868faf98d1a04f0d21e55b63c9c96e3d98d4621e69fc0fa0fb4c5e8e
+EBUILD bing-1.1.3-r2.ebuild 604 BLAKE2B e96192ba7e9eb17aa28a8e66628153ae652fedcbaa916482d81c56c16e7d14fefe0b0948763b048fb9cad3ede0b3f90952444419267b496277384fbc42d1a748 SHA512 1585c67cb662f5b0207a4e5cd6655cc16459e7763341b4482d69ec88998a0215cd2eedbbfd2d3f6c945c3f5ab2be754e2d58cbc022914fe150b64698c2219213
 MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
diff --git a/net-analyzer/bing/bing-1.1.3-r1.ebuild b/net-analyzer/bing/bing-1.1.3-r1.ebuild
deleted file mode 100644
index 02b9d58b1f04..000000000000
--- a/net-analyzer/bing/bing-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit toolchain-funcs
-
-DESCRIPTION="A point-to-point bandwidth measurement tool"
-SRC_URI="mirror://debian/pool/main/b/bing/${PN}_${PV}.orig.tar.gz"
-HOMEPAGE="http://fgouget.free.fr/bing/index-en.shtml"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="amd64 ~arm ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4"
-
-src_prepare() {
-	sed -i -e "s:#COPTIM = -g: COPTIM = ${CFLAGS}:" Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"|| die "emake failed"
-}
-
-src_install() {
-	dobin bing || die
-	doman unix/bing.8 || die
-	dodoc ChangeLog Readme.{1st,txt} || die
-}
diff --git a/net-analyzer/bing/bing-1.1.3-r2.ebuild b/net-analyzer/bing/bing-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..83f643000e81
--- /dev/null
+++ b/net-analyzer/bing/bing-1.1.3-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A point-to-point bandwidth measurement tool"
+SRC_URI="mirror://debian/pool/main/b/bing/${PN}_${PV}.orig.tar.gz"
+HOMEPAGE="http://fgouget.free.fr/bing/index-en.shtml"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="amd64 ~arm ia64 ppc sparc x86"
+
+src_prepare() {
+	default
+	sed -i -e "s:#COPTIM = -g: COPTIM = ${CFLAGS}:" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin bing
+	doman unix/bing.8
+	dodoc ChangeLog Readme.{1st,txt}
+}
diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
index 509df47459bf..cfbbf57168ef 100644
--- a/net-analyzer/bro/Manifest
+++ b/net-analyzer/bro/Manifest
@@ -1,5 +1,5 @@
 AUX bro-2.4.1-fix-python-install-dir.patch 1748 BLAKE2B 5e1f5695a5d5c21f2e3aa506a351f7c3a8ddfe14e80071fc197fe9dbe1a75fc76973461c0aa113318a2dc33e1d84875c66e3596a75ea07b295b0b59719c62fa9 SHA512 0957f05ef4e4efff90f23a6ac885277f4d57df8ade4cf2f9a22b6935fc46679369857ad181f7bb4f071cb4c373d6b4bc8c49c8e8f9bea9325d85a7b2d2e6b62e
 AUX bro-2.4.1-remove-unnecessary-remove.patch 878 BLAKE2B 00ace3b27a7a71e2ab7b6e0b3abe856864190b53b0c7fd693236504700c8c92cc36c80177cb9075f1d27b4320885569e182e58231b56d78bc6b1710a1442f7c9 SHA512 e996a7571c3f9b85f1eb40206c07825f0cfdf7f9fc4a930d8dbb216e8e4636461f0a6be01fc341e6b4d5396d7637d76e39911c3d65e2d645da959d3aad17252d
 DIST bro-2.4.1.tar.gz 15010455 BLAKE2B 34e087253a62ad3d6948e1175fa05c34ceac7298103aef40a0ce791e1e83c8495d6f65c9489d0e7214ff1b743db766dfbf7b44544f7796b7b1f70ee7a1bedc67 SHA512 4f7bf6c037fe7b16214830d2dba9f7abffd853f66030aa710fb9f174a475f8cd27d8de6bacf965f142f942a42093ceb78dcd8cbcedac6fbcfdd65ac07b3dd410
-EBUILD bro-2.4.1-r2.ebuild 2454 BLAKE2B 8729ac158182dae9b0ab2bb923ccf9496045781775f26fe6987490cc89ba01143ca4d77488fa4b65cc6cc045c6a27a7a3679e6efd0f7887a911dde4fb7e5a77e SHA512 b947b5b90dd38d95257ce93e2f7278bf2a1e80f50db9a5513da46758385c41ecb9bdc9f3f04d39afea6ff46113d475bc796dfc91d054baff0ff57fe7cd635b27
-MISC metadata.xml 1065 BLAKE2B f8d529f18a04bf8c5b5f5920dfe343e9fad6e8675a38cf889b729d4764735902958ede3734b09bd4d471b526762af60b44835006cf35c0b833972a6dfe50738b SHA512 db905212d8b96c0f9dc303f2c879c3644ce3e86ab8dd1601c2b1dc37317f3975e4216f398709ea21a6bdc845c7231f7a663bf052daac8fc1e41b20e6fec7606d
+EBUILD bro-2.4.1-r2.ebuild 2473 BLAKE2B 2671634c9b7a0ad22ac0eae5fd53f274bd71e6ed7fa07fb485034725f36698a0a2287140f1b968d051d2a85a204b5dfcde6b5a25657b6644698ed969082b9019 SHA512 9c9a29c1806453ba231ca243cd1368b27dff78efb65c497d31f45a19f99f1ff49b62cca710bbcf9e6c599c9bc1614226de382fbaf0d6a467960c3df542e76c28
+MISC metadata.xml 1023 BLAKE2B 2b02ca31298c44c9932802e1701cd490d371a9078dcddcf407c10f16890ca36e57e81fb92f65876bb643a9c8f5683534c0c29d09c9f0c8924f5e9b51d9f3c963 SHA512 d95795994abf21198ba6a64de4eb4073ad83fb77f1ae4bf171ba29677e03a4abcf94d8b6163fe2a009dc64956b4cd8ce54287f6993c262b43a7b9e2b5ee3a28c
diff --git a/net-analyzer/bro/bro-2.4.1-r2.ebuild b/net-analyzer/bro/bro-2.4.1-r2.ebuild
index 5170d3b253a6..68ee260dc778 100644
--- a/net-analyzer/bro/bro-2.4.1-r2.ebuild
+++ b/net-analyzer/bro/bro-2.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,13 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+broccoli +broctl -broker curl debug geoip ipv6 jemalloc +python -ruby tcmalloc static-libs +tools"
 
-RDEPEND="app-shells/bash:0
-	dev-libs/openssl:0
+RDEPEND="
+	app-shells/bash:0
+	dev-libs/openssl:0=
 	net-analyzer/ipsumdump
 	net-dns/bind-tools
 	net-libs/libpcap
 	sys-libs/zlib
-	broker? ( =dev-libs/actor-framework-0.13.2* )
+	broker? ( dev-libs/actor-framework:0/13.2 )
 	broctl? ( virtual/mta )
 	curl? ( net-misc/curl )
 	geoip? ( dev-libs/geoip )
@@ -29,16 +30,23 @@ RDEPEND="app-shells/bash:0
 	jemalloc? ( dev-libs/jemalloc )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( >=dev-lang/ruby-1.8:= )
-	tcmalloc? ( dev-util/google-perftools )"
+	tcmalloc? ( dev-util/google-perftools )
+"
 DEPEND="${RDEPEND}
 	>=dev-lang/swig-3.0.3
-	dev-lang/perl"
+	dev-lang/perl
+"
 
-REQUIRED_USE="broker? ( python )
+REQUIRED_USE="
+	broker? ( python )
 	broctl? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-PATCHES=( "${FILESDIR}/bro-2.4.1-remove-unnecessary-remove.patch"
-	"${FILESDIR}/bro-2.4.1-fix-python-install-dir.patch" )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}/bro-2.4.1-remove-unnecessary-remove.patch"
+	"${FILESDIR}/bro-2.4.1-fix-python-install-dir.patch"
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -57,10 +65,6 @@ src_configure() {
 		-DDISABLE_PERFTOOLS=$(usex tcmalloc false true)
 		-DENABLE_BROKER=$(usex broker true false)
 		-DENABLE_CXX11=$(usex broker true false)
-		-DBROKER_PYTHON_PREFIX="/usr"
-		-DLIBCAF_INCLUDE_DIR_CORE="/usr/include/"
-		-DLIBCAF_INCLUDE_DIR_IO="/usr/include/"
-		-DLIBCAF_ROOT_DIR="/usr"
 		-DENABLE_STATIC=$(usex static-libs true false)
 		-DINSTALL_BROCCOLI=$(usex broccoli true false)
 		-DINSTALL_BROCTL=$(usex broctl true false)
@@ -77,3 +81,10 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	keepdir /var/log/bro /var/spool/bro/tmp
+	# Doesn't exist
+	rm -f "${ED}"/usr/share/broctl/scripts/broctl-config.sh
+}
diff --git a/net-analyzer/bro/metadata.xml b/net-analyzer/bro/metadata.xml
index 90d38c4236c6..61a2fa9e9057 100644
--- a/net-analyzer/bro/metadata.xml
+++ b/net-analyzer/bro/metadata.xml
@@ -8,11 +8,10 @@
         <flag name="broker">Bro's new Messaging Library (experimental)</flag>
         <flag name="geoip">Enable support for Maxmind's GeoIP library</flag>
         <flag name="ipv6">Support for mobile IPv6</flag>
-        <flag name="jemalloc">Support for the Jemalloc allocator</flag>
         <flag name="python">Enable Python bindings</flag>
         <flag name="ruby">Enable Ruby bindings (deprecated)</flag>
         <flag name="tcmalloc">Enable Google's Performance Analysis Tools</flag>
-        <flag name="tools">Small auxiliary tools for Bro</flag>
+        <flag name="tools">Auxiliary tools for Bro: adtrace, bro-cut, devel-tools, rst</flag>
     </use>
     <longdescription lang="en">Bro is a powerful network analysis framework that is much different from the typical IDS you may know.
     </longdescription>
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 2a2f600c3378..d581f8620b43 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,12 +1,15 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-2 2682 BLAKE2B 613fdb4fdcef7c95bba710c5fcb6ee84dcb3cd739bf0caa42130e2d1a4faf7341d82447bbac6070567581b90beba261302e8d03c148876db157c68054f64e233 SHA512 1ca1001e6095b17d57cd7ff70a2cc302f6dfa466cbe0a71154dd188caabd31e4b69821a3d8383ed855dcb2d2c396b2141a70de298a6f3c40ab79993c292fa6cb
+AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
+DIST icinga2-2.10.1.tar.gz 4406432 BLAKE2B cccc60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178 SHA512 88e0ef1dfd93a399535f3238cb675e86159ca23d1abfd78009797c3533d10ac5c5167008ff04dfc64d4b9f225e75d85947ce85c5a941250699c0d772be9c0aeb
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6 SHA512 75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99
+EBUILD icinga2-2.10.1-r1.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
 EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
 EBUILD icinga2-2.9.1-r1.ebuild 4433 BLAKE2B aac55d84d5e6318524227b9477fa895d185d87dae43fabad5c0514580799d13f0f4d7c70bdd302333fb467cfdbfd77096ee99f9b15155d22c65c7c14be56ba5d SHA512 40a3f58a913c481d2e54550e7c9b6186f22542225fa069a06228d31a80868b6472ab7df1f5c5640eabcae9f70add5e3562084d27157505689980c0e8a5598331
 EBUILD icinga2-2.9.1-r2.ebuild 4742 BLAKE2B e16c72fda3de6b45a4f6f3682d683f8e037a3a2f3dbbea136f7c9c2a013892938586d2094cce045a81564046a80a9ba7bfa0f5925b92c3266695a24054235295 SHA512 2201d7a9f01dab71ed53245e9447044d928eb444da952f71aaa366bf27f5e9965e742ea70efd59064ffbc765940445f4b35b7cf5767524379e43a130da0b89fd
 EBUILD icinga2-2.9.1.ebuild 4416 BLAKE2B 0e9e5c307089b8e9feab2ab66468db68e83fd8c7ca54cb4f72dd4405f5ab2879a0a1bb671ddc6abc5638fb2a49cb7f07fc600579889bea1a6fa6540265f7372c SHA512 81ccd2334931c16fed9a5544ace4f8310519c5634437765c7fc9b4ff769def9a7cb717fefb39fc838f7d19f56c5a282f81aad73e8ec5aaa707907266f8d73343
 EBUILD icinga2-2.9.2.ebuild 4739 BLAKE2B 10e76feb6b03018bfdb9409e70c54c6309572eea19bbf57dbadcf6d85ccaea5b93e552d9116ad125adbba79390f6a52d35cc005beea443980739234d51301a59 SHA512 b045c1be0d84f1f7a63a6e8c4a3da4151d50e18d9fc738762efe8a7bc07bf7110c6718b36cc3cf371dfa3184d2a9e01dba58c9964bf6debd0d86f11d76f13b77
-EBUILD icinga2-9999.ebuild 4742 BLAKE2B e16c72fda3de6b45a4f6f3682d683f8e037a3a2f3dbbea136f7c9c2a013892938586d2094cce045a81564046a80a9ba7bfa0f5925b92c3266695a24054235295 SHA512 2201d7a9f01dab71ed53245e9447044d928eb444da952f71aaa366bf27f5e9965e742ea70efd59064ffbc765940445f4b35b7cf5767524379e43a130da0b89fd
+EBUILD icinga2-9999.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
 MISC metadata.xml 894 BLAKE2B 45c6d004ea4200544a543c452df876bd89ce3f2143ce5879c671cfc79c31878abb7ce127a350e3149214c3b5b69f5f8a1b75a4c59ac10d7016b4f5023b276646 SHA512 e370c17e46b447f97281616efab16e591b8c6ecfb85896259c2f7cb5ed61a474ccebceaefe5df5eb6885902f518990963324d13b942b3167d73de093499568dd
diff --git a/net-analyzer/icinga2/files/icinga2.initd-3 b/net-analyzer/icinga2/files/icinga2.initd-3
new file mode 100644
index 000000000000..5af259d5ddf8
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2.initd-3
@@ -0,0 +1,81 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+# Set defaults, see /etc/conf.d/icinga2 to override
+: ${DAEMON:=/usr/sbin/icinga2}
+: ${ICINGA2_CONFIG_FILE:=/etc/icinga2/icinga2.conf}
+: ${ICINGA2_RUN_DIR:=/run/icinga2}
+: ${ICINGA2_STATE_DIR:=/var/cache/icinga2}
+: ${ICINGA2_PID_FILE:=${ICINGA2_RUN_DIR}/icinga2.pid}
+: ${ICINGA2_CMD_DIR:=${ICINGA2_RUN_DIR}/cmd}
+: ${ICINGA2_LOG_DIR:=/var/log/icinga2}
+: ${ICINGA2_ERROR_LOG:=/var/log/icinga2/error.log}
+: ${ICINGA2_STARTUP_LOG:=/var/log/icinga2/startup.log}
+: ${ICINGA2_LOG:=/var/log/icinga2/icinga2.log}
+: ${ICINGA2_CACHE_DIR:=/var/cache/icinga2}
+: ${ICINGA2_USER:=icinga}
+: ${ICINGA2_GROUP:=icingacmd}
+: ${ICINGA2_COMMAND_GROUP:=icingacmd}
+
+ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
+
+depend() {
+    need net
+}
+
+checkconfig() {
+    if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
+       ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
+       eend 1
+    fi
+
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
+    checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CACHE_DIR
+
+    if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 2>&1; then
+        eerror "Icinga2 detected configuration errors. Check '$ICINGA2_STARTUP_LOG' for details."
+        return 1
+    fi
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting icinga2"
+    start-stop-daemon --start --exec "${DAEMON}" \
+        --pidfile "${ICINGA2_PID_FILE}" \
+        -- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping icinga2"
+    start-stop-daemon \
+        --stop \
+        --pidfile $ICINGA2_PID_FILE \
+        --retry "SIGTERM/15 SIGKILL/30" \
+        --progress
+    eend $?
+}
+
+reload() {
+    checkconfig || return 1
+
+    ebegin "Reloading icinga2"
+    start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
+
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error reloading icinga2."
+    fi
+    eend $retval
+}
diff --git a/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..913217ef694f
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres 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 )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl"
+
+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? ( || ( mariadb 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-3 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/*
+	fi
+	if use mariadb ; then  # same as mysql
+		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/*
+	fi
+	if 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.
+		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 c0f291e4ea22..913217ef694f 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -109,7 +109,7 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
 
 	if use mysql ; then
 		docinto schema
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index b5af2356ee87..06a6d6e2f51a 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -8,9 +8,9 @@ DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B f89e7934b13814ec8c0ae7a19f14eed8842c7b
 DIST nagios-4.4.1.tar.gz 11296403 BLAKE2B fdbaec5f913d18d5591f44cd1e0622b9741d7415b591f24f1521f2897b8a1bdbff00e9378ef6b3a6a99ab8d639960abd3d734fd66b665ea88ea1de169b552ace SHA512 d84f22a8fd21a573b4162f232c3a6bb2ba0b7d3a470e5fd80183a1862d2ae666956cfc2dd4c7fe6319ee7ccedb9f8a6920ba39a6b499ed9ff5b8be60a9779fa9
 DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b SHA512 a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-4.3.3.ebuild 7467 BLAKE2B f337eabcfbd918295f437ec735917fda59e0695ee2a6800eea4a15d9f49b1fb63ee135498c8556c0c1a545f7ff0f0141abfb2080a605f19928a5036cac1fdfac SHA512 250b84f3b417756fbb9034af2a909c94c7c2ec7e1539f66590f84b4ff3735314d403b8b6496880c9e0aee2f4052dd7d7829779d1fc4ae78e01f53449abe206ab
-EBUILD nagios-core-4.3.4.ebuild 6642 BLAKE2B c0791a70440fc8cacdd1c84a5d7e2789316554344d6b26654d8595664fdf67a67e2e278c690c666632995f3abcbca920ff612ca34862fe7a34ca69c35c8dfe1d SHA512 8309de23dfa46bb1a31e70c0f28b2d7c2e6719d8d1e0ce2660298d530d1123978814612dfdb9a56103d1209bea9477b4fb81df3c623f6bf8d07a7419a28d4ae3
-EBUILD nagios-core-4.4.0.ebuild 6650 BLAKE2B 71f116cd32789faa2bc1d4cbccf4042043da69dd26c1c561af86cd56a58c0ba5f48e84b2fa50c01a90bfd696787656921793079c97422a336a0483cba556f34a SHA512 701adbe2152b67cde427b279d201bb157d8c700a3457bb45eb50853185e0612b99a385e384b4c6ca0b9667bce68a6dee6b57a47dedaeb4db3398c49b95a06104
-EBUILD nagios-core-4.4.1.ebuild 6701 BLAKE2B 9fbd08043bbe2c31effaa3d01c45bee3d6b485e9d12890ac7463a0859cbbf6c61fe5732a32e33493c2db97c2bde3c8d15b25f1ce175dd72141d9d7d91e47dbfd SHA512 e2aabed02bcc285cfc8e0f117dc59f87c13f14eb61e2ac96361e746a44ce2da856c2af724f7470d58d7976a62df7df8835e383c2e35f17f22ef31abbdf978070
-EBUILD nagios-core-4.4.2.ebuild 6701 BLAKE2B 26c9c3ce190bf218341628e77932e3f8370661db3ae8ea203fdeb91e547792c636f5e5f5ea47bd0da835d3f63663441a0454f3fa4cac4fc82edfcbc8680f4153 SHA512 db1278c25750b93707362b2438e8677929f0a3d24e8ad36f687616758c442aeb9a4396497522b1dfd4e81c64c44545e85c3c4744df05c72bec34669933bff98d
+EBUILD nagios-core-4.3.3.ebuild 7459 BLAKE2B 24b655f0309a5b3793ded3d70110cbb2fd181834ca07673efca032d51a327b6522225f38a7feb57e542bf306ef86cb228d8e45bf4368cf237782ed60ed73748c SHA512 e00da7ae2a31559ff1510bd76117392014ea949db0a90575e1cc75f58ade9e481ace47afce06535d6684ff5a6e0e1de1149f53141b2c436a55abbf23d3dd503c
+EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411
+EBUILD nagios-core-4.4.0.ebuild 6641 BLAKE2B 1264cb8277e44b047418073c7808c4b99d865ebcd3ffd92f7c030703e8a04d2ef7c8aff89a3191d8cda4c5aa903297b6c7a83c6b354cd4c3956ce9ee107d1e5a SHA512 5bc7f701186cc0fc6869e606bd831fd66fe466865ec68144235a0d62ab8ae2c3893ba467201140b82e91d4e8e8ef615924b5a766a8a9507a3f8d2239e7f33456
+EBUILD nagios-core-4.4.1.ebuild 6692 BLAKE2B 74b0316cb39b05736af99112c2cd7d41733f9089d7826f1a808e79860dc5ae8dde4c23f69dc69c798c528f3ed53740c4eee01e97a1c58e965e0c919964c9b5c4 SHA512 cd8b77093fd231a531c432d51c1971b4c2018b8b3829648fc2ee32f7a2a5b3c1de5139f52e61f967c1558fcebc9fa9661f60eb6c8d78b3e8218be4379882a7a4
+EBUILD nagios-core-4.4.2.ebuild 6692 BLAKE2B cef816faef6561bb8ee0dae09266fb0fce684ac0d6e2c65227e0e6aa2080bf20ff4612e189d269f66c946de516dd7620820f9acc76d6cbb89380dbda1d552a0d SHA512 26524450d6a3c207d5d05562767f635f04828f19e7d065ab2e0a826b5c82c444811d344cc3380bee814d2369451a82423aab4047feadae84077e97c1b1130963
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index 5773285f59b5..11e40c1b8e02 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index 9ee27cd6da9c..1df849693e9b 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
index ec0577881b03..4f2dbf117c3f 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
index bfc0aac4a73d..b29021b26ea8 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
index cb47956dba4d..bfd8898d4883 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index fc2f228394c5..8a0e65b7a8da 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,4 +1,5 @@
 DIST testssl-2.9.5_p5.tar.gz 8955523 BLAKE2B dcafb0931ddfb9d653acf79f72d2e30b2acc4a80246ecb3f26eaa35d4a69d5af65123005de34d09c563978593450895bf451b866182fd3ea38bdb121fb8e9385 SHA512 8a26989e1b8f45a2ac25efab500c89eeec2dbdbb9c0af715a61433ce0737ed69221df09a9554b6ae4415081a66ef4f6afd44c92405afefe4a810cb4375988700
 EBUILD testssl-2.9.5_p5-r1.ebuild 1291 BLAKE2B dde1e0edccf415dc4f717515e6fb8f333e935215e6452c3457fd203153e523bdf4546a03aef68defee5234359d75d6ab8f74ad91a2504a2b4695e80b601fdd5d SHA512 6ec8005eb3a27a079e800d21b5b03382435e32e8fd9b1def669b464400cdcb182598b3a9f6ece631defc0ae2549fdebeed4f6da4c182929d227e6d63139a60ba
+EBUILD testssl-2.9.5_p5-r2.ebuild 1529 BLAKE2B 989592309812555613fd5d6ecff8173fe1c1bbe384aad4d406f8a827911037e459c1627b08ccf5f0f0f5f20c95f68f9eee0f358c77476d3f985c481d9b6cd6b3 SHA512 e1e6277065413fa8f80a734b008a60ace4ce7275981ff3a2f1d15ca960d69f124545496c39d86228b7f6cf605bf8d56edb48b6446dd54839417c9b75431deb04
 EBUILD testssl-2.9.5_p5.ebuild 1477 BLAKE2B a26cf73f44a63fe823838d748d943cf8e910fa36efc86b13a900af29a17c08061012fa66c07810473c5e9fa43ab6e49290903ebe8beaa2b2407529d7b4350436 SHA512 e217b3f116f62202485715a917f18ea32d902bcd0514dfaa9f5ddc6d3e435df76885daac253243dad99a812f31f51239c8dff6c886b1c376d3f6138f52639780
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-2.9.5_p5-r2.ebuild b/net-analyzer/testssl/testssl-2.9.5_p5-r2.ebuild
new file mode 100644
index 000000000000..2cabe7984eb1
--- /dev/null
+++ b/net-analyzer/testssl/testssl-2.9.5_p5-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}.sh"
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bundled-openssl kerberos"
+
+RDEPEND="
+	app-shells/bash[net]
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+	bundled-openssl? (
+		kerberos? (
+			sys-libs/zlib
+			virtual/krb5
+		)
+	)
+	!bundled-openssl? ( dev-libs/openssl:0 )
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	if use amd64; then
+		if use kerberos; then
+			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
+		else
+			BUNDLED_OPENSSL="openssl.Linux.x86_64"
+		fi
+	elif use x86; then
+		BUNDLED_OPENSSL="openssl.Linux.i686"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+
+	if use bundled-openssl; then
+		sed -i ${PN}.sh \
+			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
+	fi
+}
+
+src_install() {
+	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
+	dodoc openssl-rfc.mappping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+
+	if use bundled-openssl; then
+		exeinto /opt/${PN}
+		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+	fi
+}
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index a5be1019f5be..3a90d1029f17 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -3,5 +3,5 @@ DIST traceroute-2.0.22.tar.gz 69001 BLAKE2B 8678bf2636b3a0615e7282923ccfeae9c721
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
 EBUILD traceroute-2.0.20.ebuild 937 BLAKE2B c725daf3511d8d24b2e3a49942944595529245483bcb981457911be9c6216dd1baaa3a13ef2bbb78c9647d6e232d3829e31739880cdff65666ea00f935f3fddc SHA512 7bdeef7eedc93e792e57e8c09d256e55bc0b7f9216035d174da66523119e57ae71eb5f9b8805a4421b0910a0a658c2412053f67999ed34d140e2b9d3c2a9cb5f
 EBUILD traceroute-2.0.22.ebuild 888 BLAKE2B af947b2e99b1d4d6ea9996c40b3aded90699a04583ee9fc56714650df3762812e7c7628ca611ded9f2d694fa30240ae9b8a03a85bf4fe574396597c0351b2fad SHA512 0c299339fa16328123c82428f339cb7b1b1ffb528d76fbe0795f10035eb4520c507901c67c32a68e08cf2d221dad56b68cb239f9dbecb99611c28f90f77a094c
-EBUILD traceroute-2.1.0.ebuild 874 BLAKE2B accd50fa5679831bf1ea019525d79b92ea193373c0f5f93a38f31f96cb0f0465769b0c4eaae572fac1062db9047f8a6d34f28f76fd8ee90c3e1c31b77448e20f SHA512 575f1debae404646d78434912ca0ee25b363947021f2dc99e3a058bae64aa5cd3f122c554114bf049a3a479efef03d4f1a52d9a04aff86f768fff87909704e9f
+EBUILD traceroute-2.1.0.ebuild 873 BLAKE2B f8b93f99eb075c220dbeb76eb62882908b7b590524c79875f5695fa74faaf44d3decb12b1b72501cb478078d10f812fa7dbbd9b2cc831cfc44e8ef7bd4deb57c SHA512 c68761f15837ade0255b549e789f66ae781e295fd095c44a46eb0785f65fac234ac35d80cd01ca265185c388946c278828531d99ecc05209dd3a54573de68479
 MISC metadata.xml 437 BLAKE2B bbef3a65676e67e78b4f78846a46986a3ffc8b74bb73517795b4796b2865ee0ae4d6ecf99edb1a9b12dc97988cc51fb161dfb757e8ef449a3b46fa1eac5c8411 SHA512 928cbbbcefe88681f5f797616d8f8b4de75cf789157afa536a757e7e72f44b07c337105380816aa79713ec143c324ae16577351648357a77267b6625b962924d
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index 5b1611a1a775..4378e4df6646 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 114ac129b28d..7a557e676330 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -12,7 +12,9 @@ AUX wireshark-99999999-qtsvg.patch 900 BLAKE2B 309fa6d8f64962c2d255d6325b062e3ad
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
+DIST wireshark-2.6.4.tar.xz 28218232 BLAKE2B d54d7661801667f78f0c3248f4099c77ef016222ae942dc7a5776af2c5c18f7b00305556ac84df6afd19cf3d2bd59e78365067dd9402f978ae0a7db76c1730ca SHA512 bc740548901b30f2e44c2b0933717288615fa38edc5e092607a8b12c60ecfacaa5aa7c59d7644cf29238d0d636fbe03d85559a0f2de81a3bf8ceac55fcf9ff07
 EBUILD wireshark-2.4.5.ebuild 7324 BLAKE2B 37579953238776d82c3887994830e72d6df6b928471f6d5ae955c53a58b0b70887c139c0962d5a27119da15ec6af0e416793d41ea3aa4ee18374f441abec0876 SHA512 f8fa063eff8b7c3e76fe2861b287a8c65368710b2cdbec670453a54e5d629a060dc368d05a6c6efb2ad8031174613026c79a3d8eea9fe9e43caa3953e5a72d74
 EBUILD wireshark-2.6.3.ebuild 6603 BLAKE2B b9406cf5e104ab342ff8b9eaedd2b0a01b79b6f0bd6a79657c2860d53fcb648cb5868b97ec559b9cce5cdd9ed0ef5cb985edcfd093e60da16dbb42035cabec23 SHA512 95f5f555a393ce995c55a8dee07189fac90fc3032642dcecbf0f50e777d3bc919321d048c68e9bda3553ded1c92383235804cd47f6e0c9aa3303d116684e60d3
-EBUILD wireshark-99999999.ebuild 6375 BLAKE2B 05637feca26d8c5cc2329b5a86a6bef9742e4470309ff569ccc23a9f1da56f30d9ae2bd16fa1862c5a21508d56b467cbf51cf4f3a31ce08894a7a06691284266 SHA512 4cfc11f50a4eddc08b7f526350752cf60bb016f0992f0bafe892ef834def88fe7915ff7d856c27c4d709c4e2d34ad9bd3d6ebb4f1e4e363e60c62b3706f07cac
+EBUILD wireshark-2.6.4-r1.ebuild 6514 BLAKE2B 0203f94f5919cf7ee0d9434cdaea93383cc816568886fe050da346cd6bf285967214c3d75d579b76c130b9d41bcfaae81b02fb1b5865a46a3dccac81818371be SHA512 57b01b0093b4cb9cf083df51451c198fe740e34bc08e3709ae546df696681813c1dd89d582e68af72a41ca7318adec1ebe4d027ddb464ced5cab13622b239400
+EBUILD wireshark-99999999.ebuild 6323 BLAKE2B 0d65cabecbbba46d9e2164dc29024542d4497b80e5694dc004e7a1e2317f903b0df135b40d785150b1661dfe1f90ce12f4ab072391bdb04e88e5d8f4df582c44 SHA512 d422f24094189a03cef3947f1d1b05ad6537a0725572d23fd1060202a50ac8ede3cd9cbbe2da6eaa66bd55b560b66a2526b778c8073a54d799117089d0b4b5e2
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/wireshark-2.6.4-r1.ebuild b/net-analyzer/wireshark/wireshark-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..9dafeca71f94
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.6.4-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc64 x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
+	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
+	+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
+	zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	filecaps? ( sys-libs/libcap )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DBUILD_wireshark_gtk=$(usex gtk)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=no
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PORTAUDIO=$(usex portaudio)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index eb8caa256baa..325185d09e21 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,8 +42,6 @@ CDEPEND="
 		dev-qt/qtmultimedia:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
 		x11-misc/xdg-utils
 	)
 	sbc? ( media-libs/sbc )
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 9ad3116d9c42..4ff89f467cf9 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 235c05800bbd..66a3a5da9cf9 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -6,4 +6,4 @@ DIST freeradius-server-3.0.15.tar.gz 4818244 BLAKE2B 24cded2c4f0c6fc6a6135058c40
 DIST freeradius-server-3.0.17.tar.gz 4843020 BLAKE2B 9e1f54a9f5ad8ede471881ffe4ec987c3ac655a3c39fcd920094760c006102be02f3b7f25b14379a0bac876ac0944e8698c2781bbd804cd22d8b915b6c13a693 SHA512 381222e452288c56a1bf68953be57379a5568f0c92de022abc3004cc6a15078d46535b867b31801de3eb096ba7af92e745e79decfa7cc8151a1ffb371b1aea79
 EBUILD freeradius-3.0.15.ebuild 5995 BLAKE2B 2685b85c868d06961a1d552ff88371b485d090f08806d960a97e302361dad61238ffdacf7fa292403a3f652efe9ceff510ee1c53932bd68869a222dcc354555b SHA512 1dc84e269e26768da54a05a46e7e539b6ba06c5d5fd7ca3fd255457aca3d9e64cc4adc7a7a3d45cbe956c25a698b51bc6f5c20bd6b899e044363887cac1994b4
 EBUILD freeradius-3.0.17.ebuild 6384 BLAKE2B 65d5245912bfc975dd3bc259fe3e3e4ac130e47ce53dfc5f3ba9fe5782e9006e24334471a1997bdf80a603604717b9d318b93dd96b0aa737ae7ded299a32927d SHA512 5257fb0463b00582676a9af1325e8ed977341317bf513615c026799d101816cfb6e6288223f4ba789faa4104fd9a77e50bd0188a57b8c74432423c75107af38a
-MISC metadata.xml 719 BLAKE2B ae0beb2d6330f89d5c202cdb2cc01427f8c96728567921b985b3ec41f88218088da9a5efd522fff0870f1954281efd6c0893ffdd24603d73575431d1ad94d620 SHA512 b571e889f1133154da1994513b0f7643f2a0c853f75ea357154ec8e22957256b6ff2e2ef375d16c791ab8e1cafb4f46e46db72e1d9c22c94f8d4c4a37cf87477
+MISC metadata.xml 496 BLAKE2B c33709968ac35ff318966b7698ec73d52cf2f34eb4b964d184d7c72cd781266b18630aa929ce76455c871972ba500d6b1b0fbfa2a038d33f2b08c0f41e49b2a1 SHA512 63696cf2d237e124e91f465655f7b94de51a2260b492f8518c37855e07b55e3470f917e769a400f8d7aaa492b00c2f6dd6ca65950175f997ea8c17da3fd5d68d
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index ff1258ca8492..abccf7906065 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/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>herb@hlmjr.com</email>
-    <name>Herb Miller Jr. (herbmillerjr)</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!--maintainer-needed-->
   <use>
     <flag name="memcached">
       Include <pkg>dev-libs/libmemcached</pkg> in caching drivers
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index 2d7aa729e5c6..88467f4a3115 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -3,6 +3,5 @@ AUX lrzsz-0.12.20-automake-1.13.patch 454 BLAKE2B 19627ec86b92c5e1dfcd4404408b9a
 AUX lrzsz-autotools.patch 8725 BLAKE2B 8f499974f0184784d1e800a43e8fdd09b389bb2a2c48ae335708ca25eb2b7130b5554fcbb8217aa3833ffdf2d0756fe091df615351b4c23214e7889dbf2399aa SHA512 4ba98fb4a72d8fcc654741d57992598d56eded61e7b89c54d44edd7a609149e15d9948d777d70bf41137daa0b860c67e1212a3f38519434cb5d44546bfb94909
 AUX lrzsz-implicit-decl.patch 428 BLAKE2B c08a244d292be32bb49fff6186cbe847c106dee67b3ea463860d1e6387e159af1b106e5f78ea5bce31c347cb7207c95116243fa515e4daafb23d2cc309776480 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7
 DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
-EBUILD lrzsz-0.12.20-r3.ebuild 1586 BLAKE2B e0b54505e4ec5bde6039340fab0b5f3191f0feb1b60de82ab49a477c6b7e8f7726526c47b853bc2c7da9f2b50421070c45f6eb5098bd2fee8d743690eb76b7fa SHA512 5330b4ba5e07e0e3c61512c757cc46d33590e5aa9e9bb81289a8811a162e1b57ce048c3226724fb92184bc3a1b45ff9552fc6f259a679a107276630ba44ca58a
-EBUILD lrzsz-0.12.20-r4.ebuild 1541 BLAKE2B 77d884836156c108db551ce947a15bd5bd79513f3172d8b29ca049df2ce778089fea45f8b145a026b580e05a1bf2c0eafe4167498d9827b4bbaed173c9e770ac SHA512 cb7ef34ac19d7d095c23ca1515a4bb65bab2d6a4cb24e36e9fff13be04e55d2323a5bb7743b66a686bb06bc3412c7ad442e2eb007d3e26d4eb98196ecb8f889a
+EBUILD lrzsz-0.12.20-r4.ebuild 1526 BLAKE2B 3e78ffb152f06a7f77f312d9918cc2ad83d4f9655867e9f7def2797cb1c978da3c68f88e3488a346bf18ad5a95fa39c5338fd003dc733a0a415cf37eab2bb797 SHA512 3b6f34b961047010d5b22b00bf78b729c2ae4f463c58364b7e8afcc691ce4fafed3fe5c3ace0e6a44cb80dabbaf62b6ce35bf3ea13ab3c3c7250cb127a3423b9
 MISC metadata.xml 359 BLAKE2B 842a9354b4b11a8894d58eda8cee0a31b60bb74981333e3e8ee383cb8caa1f0ee0577060880b123c3d73fb7cb5562a542c346f04bba3e60c5e40d9ef83a26c26 SHA512 5e033194af9899fd66ee44372089c3e63a2839a486f845ba139786a862f1b0534902465e776d901155ddffb794e7419f338b4c5ed43d6a8301c98ae8dc24db70
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
deleted file mode 100644
index 8449f89be7ab..000000000000
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
-HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
-SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-autotools.patch
-	epatch "${FILESDIR}"/${PN}-implicit-decl.patch
-	epatch "${FILESDIR}"/${P}-automake-1.12.patch
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
-
-	# automake is unhappy if this is missing
-	>> config.rpath
-	# This is too old.  Remove it so automake puts in a newer copy.
-	rm -f missing
-	# Autoheader does not like seeing this file.
-	rm -f acconfig.h
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	append-flags -Wstrict-prototypes
-	econf $(use_enable nls) || die "econf failed"
-}
-
-src_test() {
-	#Don't use check target.
-	#See bug #120748 before changing this function.
-	make vcheck || die "tests failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		install || die "make install failed"
-
-	local x
-	for x in {r,s}{b,x,z} ; do
-		dosym l${x} /usr/bin/${x}
-		dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
-		[ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
-	done
-
-	dodoc AUTHORS COMPATABILITY ChangeLog NEWS README* THANKS TODO
-}
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
index 0b999da1b239..cb2d74b42e8e 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index a41568b15e2c..9f9428e5a149 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index 50a4566017cd..be50c7ccc140 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -16,5 +16,5 @@ DIST ddclient-3.9.0.tar.gz 59018 BLAKE2B b9b58108d9f124fcd5a72cc57bfb0e6a5bc2e11
 EBUILD ddclient-3.8.1-r5.ebuild 1416 BLAKE2B ea2a67f9e888bbeea5208309ee71c87d35c98fd36a94bcd445224c40915226a81ba70d253bac29f55c0b87649ba15122115c854b40b06d67ff85bd85c6ab7b78 SHA512 a9215c25bd9c90042267eb9c1f0c2258d86c814ac3d343c8c795ecf8eb7eda6cc3ce7fbf1823f917b60724232d118d5904cb55afa1549f875466fcefb7dfb2bb
 EBUILD ddclient-3.8.2.ebuild 1176 BLAKE2B 7e1a9334915c9eedd9c3069af36c7d54c7a5a086b4bade3ee4afb55985dc9972bc09295943b795bf086c03d3b8775ddf4089825a43e89438c3a93e98116a6aef SHA512 b1105c13c16deda9923b1507fe6727905bc92911c3d6f206047ef4f89fc046feb08ed982448ce42743be06bc9f7eea3a5a2fa28f863459930512b5adee51335b
 EBUILD ddclient-3.8.3.ebuild 1190 BLAKE2B eebc90117aaa01be120afbd067090d01a5e2c33a4f41ff0bdce474a1f7da5ca0ca805d5743fa4ae3f762d7a0398fac628b4c261b39ce375e7c7d74ee711f1b41 SHA512 584e18a5bdbc165e216e74650a3fa48fdffa1bfde112ae30ce0d7a3c677ee67dc9c988fecc9a7bf059a483dfa54837d075536cfd826a1613169140f32efde3e4
-EBUILD ddclient-3.9.0-r1.ebuild 1503 BLAKE2B a28084389ca9a45a2d7337fcf54e5368ae8cabcecb771f8b64fcf09ac3ac712f2e3a49221ddab216bbcbda90ece7f12d4bf69eb6229a90f917ba547a338d16e3 SHA512 e259bea837158be04298c32acb032bcf7d366eba2048836656c6da4afa7f204d71bf8c988f8f8d7f51e2f7ae44a897541ce485066f15c107e7f9ddcd68c9cbec
+EBUILD ddclient-3.9.0-r1.ebuild 1526 BLAKE2B e6bab744fcea641ec83cbdb928f288fb8f89a012a45fca18e17a86c21945cdb2e26e0e061be1b09b469d9483740ef61bca19ff128f30b39393a58dfde52407bb SHA512 bbb7db7c316250546423bdf748132a6539790500eb12634af9f1c4890b281222e43640b0c5006e9da6d168f416b6bf095cc9178486a1fd49e68baee9059f0b8e
 MISC metadata.xml 1291 BLAKE2B 65ca31729d3503bd783e30255bd2bbd4ecccd11d51ed608a3c3515e1f538570ac2e0919cc96dc1901dcd14660c55289b30c37e53d65d5a27ebf67eb1f4d2bdcf SHA512 fe66dba44ea97947a4f6d7367486be7a7fa3adf0a877b2f6fb7d3954e13b2fce1edc322078cd0cda3260896be9e533840fba8281eef74787640ac6350e722885
diff --git a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
index 5e18aacab160..e1563a5a0e8c 100644
--- a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ DESCRIPTION="Perl client used to update dynamic DNS entries"
 HOMEPAGE="https://sourceforge.net/projects/ddclient/"
 SRC_URI="mirror://sourceforge/ddclient/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc64 ~sparc x86 ~x86-fbsd"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-dns/dnrd/Manifest b/net-dns/dnrd/Manifest
index b4f35b43f979..7c580aac970f 100644
--- a/net-dns/dnrd/Manifest
+++ b/net-dns/dnrd/Manifest
@@ -1,6 +1,7 @@
-AUX dnrd 356 BLAKE2B 64a8d45b30c91271c64db78b44af7356af6f03c123d917804f4ca29e9f7232a79e3603becec06937e49fcef8d92447b359bd530eefffa39d90d4d380f94ede95 SHA512 16ac5a0f40206b3dfaa178adba77c605bee57eca7b81e026c4e76b520894876f28ed8cea4281410453cd7a46e5b306f2280b67c80f1c5254f2f16d5489640685
-AUX dnrd-2.20.3-docdir.patch 711 BLAKE2B 9626f7f89529a38ad19631bd3e73cc58e9fbfd915b9fcb2b771a022eba3ece8112bb7a7e5a8316e6550843e4b8df25f5533d76a51eaea6634349cd808c3d1fb6 SHA512 0f97a79bcad417cbef90fdedebd116bc89490588065a242b2e0002b10f98ec2ecf45807cfd3333882426ddbde64eedad6ccdc71a149b6c28f6cba03d7b3cabf6
+AUX dnrd 444 BLAKE2B 100e9de8f2f3191b4b1c8e78bea41f4a8ae2f5b1b48eca025d5e55f07241f42e0d6cae70281edf9722a7893978501b8ce39acddd12df4e372f5a1658cf96e660 SHA512 5aed41fd2f8a4b7395308341fd48ba00d7707d7ee942c2b57958eb36f4637b0d04468bd8c8fb324205992f39d2fb53af0abef8a33f2b964a763e093cc8659dfb
+AUX dnrd-2.20.3-docdir.patch 719 BLAKE2B 45cf21aaf65ef35c7de3ffd12398d6962fed28a86a5c91d7b1e17d838a0564c41313e11633e2da0fed010ab194c92bf6c09b8e9e83ab8d90ae49588ee6c39877 SHA512 384359d82e0b3cc3e70c9b6dc25363d4bbd117fb555022840eaa9061059c71575581e83243991941ad60282a3e964262b7f4c87379b7e0d038f5658db9de51e9
 AUX dnrd.conf 250 BLAKE2B a9334bdd7ed06152068e22d72c7fbb5c4de97fa888e0b0cde6a6517c8d29e47e9727c0bfdb732156b77e7f825413d31c808565c5a65103d90828ba04bbc3ee92 SHA512 461bbebba321b5216a15ea9550342ca9f7374af6446c2f515a3f5ce35bf45480c8f684b60ce8c206ec017e7ca060d4588c0d2da026d2e99162f3f9a6e58f03d2
 DIST dnrd-2.20.3.tar.gz 161887 BLAKE2B e04941fe59a8835386d398aa4a76bb0b2562705f98994b1d9d6c57557499de49a084dd2c3bab4c25499c81267fb336bac7a2b27dd8efd77164bf8d5409b2c94c SHA512 a526ec9c2f82ac36fa7beaf864ab39c56e5956530b10115ad2ca2f79ecb820fe865d9da9edd1dea5f4cb97508afbec88f0606b03f87baba25561c097e7c0ea9b
 EBUILD dnrd-2.20.3-r1.ebuild 802 BLAKE2B 4fb938b65b8f434e8de0aa777b2942398146867bf4607c338f232f92927dd6c9891492f1cfc1eefbfffc6a70496a865c60f32138aab0f71cbce25c56d7d50d23 SHA512 1a6a468a438974b54a6156f141c61789c8244f99083e37a5da9916e36dd9cfcc4c03ae04d5089ef2b113095f9d4a707c391595bcbef5d220a51aaa07b9824f13
+EBUILD dnrd-2.20.3-r2.ebuild 594 BLAKE2B 066fef67266ca9b4e765a13d42341f8ff74463cb2e17479224c9713407a1619c501ce22b62520cbd0bbfb0249ac623993876d89bfd102df05522fb0d6e1651f8 SHA512 3f9299d991e4e4b9de04fe08e756d54359c5d81910cfe858fc9e2aef120e2b3ca8357a0b442972ce68c333609a0a8e670c2232eac4cfbbf115d903808b37aeef
 MISC metadata.xml 657 BLAKE2B 2a27a4416cbee6eb65e220f99fc847fd2bedca655740ffbaf8fae61eb3986472b69f7ba89eca393049cc57ce94e38ca3b69bc8024f2aa344a50a816d4220f466 SHA512 1b241e4719fde34ca85e146e21906a0b82aaacd5e71cdd215365e32bb005d2166f39f90eab12bdcd574d9387175a5870af6d24a676a108470c30e096ff9f53f8
diff --git a/net-dns/dnrd/dnrd-2.20.3-r2.ebuild b/net-dns/dnrd/dnrd-2.20.3-r2.ebuild
new file mode 100644
index 000000000000..571076853a7f
--- /dev/null
+++ b/net-dns/dnrd/dnrd-2.20.3-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools user
+
+DESCRIPTION="A caching DNS proxy server"
+HOMEPAGE="http://dnrd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dnrd/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-docdir.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	keepdir /etc/dnrd
+	doinitd "${FILESDIR}"/dnrd
+	newconfd "${FILESDIR}"/dnrd.conf dnrd
+}
+
+pkg_postinst() {
+	enewgroup dnrd
+	enewuser dnrd -1 -1 /dev/null dnrd
+}
diff --git a/net-dns/dnrd/files/dnrd b/net-dns/dnrd/files/dnrd
index 9fb87107b7a8..4fcc2112cf2e 100644
--- a/net-dns/dnrd/files/dnrd
+++ b/net-dns/dnrd/files/dnrd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2003 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 PIDFILE="/var/run/dnrd.pid"
@@ -11,13 +11,16 @@ depend() {
 
 start() {
 	ebegin "Starting dnrd"
-	/usr/sbin/dnrd $DNRD_OPTS &> /dev/null &
+	start-stop-daemon --start \
+		--pidfile ${PIDFILE} \
+		--exec /usr/sbin/dnrd \
+		-- ${DNRD_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping dnrd"
-	/usr/sbin/dnrd -k	
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
 	eend $?
 }
 
diff --git a/net-dns/dnrd/files/dnrd-2.20.3-docdir.patch b/net-dns/dnrd/files/dnrd-2.20.3-docdir.patch
index a3d1c8002d51..fe0c0d347e7e 100644
--- a/net-dns/dnrd/files/dnrd-2.20.3-docdir.patch
+++ b/net-dns/dnrd/files/dnrd-2.20.3-docdir.patch
@@ -1,7 +1,7 @@
 Index: doc/Makefile.am
 ===================================================================
---- doc/Makefile.am	(revision 247)
-+++ doc/Makefile.am	(revision 248)
+--- a/doc/Makefile.am	(revision 247)
++++ b/doc/Makefile.am	(revision 248)
 @@ -1,5 +1,4 @@
  PACKAGE = @PACKAGE_TARNAME@
 -docdir = $(datadir)/doc/$(PACKAGE)
@@ -10,8 +10,8 @@ Index: doc/Makefile.am
  EXTRA_DIST = $(man_MANS) $(doc_DATA)
 Index: Makefile.am
 ===================================================================
---- Makefile.am	(revision 247)
-+++ Makefile.am	(revision 248)
+--- a/Makefile.am	(revision 247)
++++ b/Makefile.am	(revision 248)
 @@ -1,6 +1,5 @@
  PACKAGE = @PACKAGE_TARNAME@
  SUBDIRS = src doc
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 2a35a89465f8..9f518c17cee0 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -6,5 +6,7 @@ AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9
 AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f9002a3426c05632896a5f94a84ada168d672cb38e236cbde72b59201c970e348ba052dff655be1a9a57b4 SHA512 b59b299849487dcdfc18ab30ded0605e2df4876cb778b2d1cd03b740406a5580001028eb33f1ecf0dc910f393c58b7cad7c28801aa4641c3fa376e3dac997abf
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
-EBUILD dnsmasq-2.79.ebuild 4595 BLAKE2B 7745df4ce05578681a1986017f897cb14273c5fe9b47f6ca5b136266572617497120d2e3efefba53515a217f243774325c6ed2ccf100bca9aacee0bbe255a558 SHA512 2cd18fa87627421a6eb56d7e75ab9560cde53f80b04f13d85b0edd68a828740e1827c5f0231beb6590630ef38e9d6df4e5cd8572497c7d649d8df53ba37f2e54
-MISC metadata.xml 1149 BLAKE2B 9d9b9c87dd5bf6233d4656e0de77cd9e5d75ef631731c2e9d06917ade555422a5d4dbd846bc6bc7b5ff411a7d706f35ba68bb8d5ec8f793d878bba2de86a1b44 SHA512 7fad0bb400a664a67e82173015dcc2fc95644dd6c357e787b8257a193dc14adbee8f5a04cb4422fadefdeec0d3dc5bd986f4f5b44ee420b8a104cb5a8e1b58a6
+DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
+EBUILD dnsmasq-2.79.ebuild 4594 BLAKE2B 28cf745cd261bf067114adc98733f5e00a2f6a10a906d4eaf2175c0457d538d7d96b91fe87a87320c3df27a5c64234ed7d5bbee993070964fa421b8e5b12693c SHA512 eb8ac4fdf747657983909b22baa2e0af5f2299d2a5ab4d97933b185e528cddbb1d4cc7ca14c2efddcd8c6f4ec9861f3c37d9fc59c96b68f55c45a274acf7eff7
+EBUILD dnsmasq-2.80.ebuild 4740 BLAKE2B c7ed685f2713f23b9e29d1d1c18a52997b7f68e080a8ff23e9bd393eae755be65f52525c40e6ad2ce370eceb79f585b7a28672e00753e89b35b69bd93e42f458 SHA512 87512e61093cbcf24326a29bafb72f850f30e6099c8253acb41c1f10f4909d774e0d94e32a48d787117723817f547e6686464b523c1ae668b8b8f0779143574d
+MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.79.ebuild b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
index 3511354d396a..3b7329f0c0ac 100644
--- a/net-dns/dnsmasq/dnsmasq-2.79.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
 CDEPEND="dbus? ( sys-apps/dbus )
 	idn? (
-		!libidn2? ( net-dns/libidn )
+		!libidn2? ( net-dns/libidn:0 )
 		libidn2? ( >=net-dns/libidn2-2.0 )
 	)
 	lua? ( dev-lang/lua:* )
diff --git a/net-dns/dnsmasq/dnsmasq-2.80.ebuild b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
new file mode 100644
index 000000000000..5976927532a0
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2018 Gentoo Authors
+# Copyright 2017-2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic user systemd
+
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
+IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
+
+DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
+
+BDEPEND="app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="dbus? ( sys-apps/dbus:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= )
+		libidn2? ( >=net-dns/libidn2-2.0:= )
+	)
+	lua? ( dev-lang/lua:* )
+	conntrack? ( net-libs/libnetfilter_conntrack:= )
+	nls? ( sys-devel/gettext )
+"
+
+DEPEND="${COMMON_DEPEND}
+	dnssec? (
+		dev-libs/nettle:=[gmp]
+		static? ( dev-libs/nettle[static-libs(+)] )
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	dnssec? (
+		!static? (
+			dev-libs/nettle:=[gmp]
+		)
+	)
+	selinux? ( sec-policy/selinux-dnsmasq )
+"
+
+REQUIRED_USE="dhcp-tools? ( dhcp )
+	lua? ( script )
+	libidn2? ( idn )"
+
+use_have() {
+	local useflag no_only uword
+	if [[ ${1} == '-n' ]]; then
+		no_only=1
+		shift
+	fi
+	useflag="${1}"
+	shift
+
+	uword="${1:-${useflag}}"
+	shift
+
+	while [[ ${uword} ]]; do
+		uword="${uword^^}"
+
+		if ! use "${useflag}"; then
+			printf -- " -DNO_%s" "${uword}"
+		elif [[ -z "${no_only}" ]]; then
+			printf -- " -DHAVE_%s" "${uword}"
+		fi
+		uword="${1}"
+		shift
+	done
+}
+
+pkg_pretend() {
+	if use static; then
+		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
+		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \
+			"the static USE flag is ignored."
+	fi
+}
+
+pkg_setup() {
+	enewgroup dnsmasq
+	enewuser dnsmasq -1 -1 /dev/null dnsmasq
+}
+
+src_prepare() {
+	default
+
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
+	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
+}
+
+src_configure() {
+	COPTS=(
+		"$(use_have -n auth-dns auth)"
+		"$(use_have conntrack)"
+		"$(use_have dbus)"
+		"$(use libidn2 || use_have idn)"
+		"$(use_have libidn2)"
+		"$(use_have -n inotify)"
+		"$(use_have -n dhcp dhcp dhcp6)"
+		"$(use_have -n ipv6 ipv6 dhcp6)"
+		"$(use_have -n id id)"
+		"$(use_have lua luascript)"
+		"$(use_have -n script)"
+		"$(use_have -n tftp)"
+		"$(use_have dnssec)"
+		"$(use_have static dnssec_static)"
+		"$(use_have -n dumpfile)"
+	)
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		COPTS="${COPTS[*]}" \
+		CONFFILE="/etc/${PN}.conf" \
+		all$(use nls && printf -- "-i18n\n")
+
+	use dhcp-tools && emake -C contrib/lease-tools \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		all
+}
+
+src_install() {
+	local lingua puid
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		COPTS="${COPTS[*]}" \
+		DESTDIR="${ED}" \
+		install$(use nls && printf -- "-i18n\n")
+
+	for lingua in "${DM_LINGUAS[@]}"; do
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${ED}"/usr/share/locale/${lingua}
+	done
+	[[ -d "${D}"/usr/share/locale/ ]] && \
+		rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/
+
+	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
+	dodoc -r logo
+
+	docinto html/
+	dodoc *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
+
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	insinto /usr/share/dnsmasq
+	doins trust-anchors.conf
+
+	if use dhcp; then
+		keepdir /var/lib/misc
+		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
+	fi
+	if use dbus; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+
+	if use dhcp-tools; then
+		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
+		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
+		if use ipv6; then
+			dosbin contrib/lease-tools/dhcp_release6
+			doman contrib/lease-tools/dhcp_release6.1
+		fi
+	fi
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+}
+
+pkg_preinst() {
+	# temporary workaround to (hopefully) prevent leases file from being removed
+	[[ -f /var/lib/misc/dnsmasq.leases ]] && \
+		cp /var/lib/misc/dnsmasq.leases "${T}"
+}
+
+pkg_postinst() {
+	# temporary workaround to (hopefully) prevent leases file from being removed
+	[[ -f "${T}"/dnsmasq.leases ]] && \
+		cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
+}
diff --git a/net-dns/dnsmasq/metadata.xml b/net-dns/dnsmasq/metadata.xml
index dd1a2a161c68..9a597f9b11bb 100644
--- a/net-dns/dnsmasq/metadata.xml
+++ b/net-dns/dnsmasq/metadata.xml
@@ -11,6 +11,7 @@
 	<flag name="dhcp-tools">Install extra command line tools for manually managing DHCP leases.</flag>
 	<flag name="dhcp">Enable support for acting as a DHCP server.</flag>
 	<flag name="dnssec">Enable support DNSSEC validation and caching.</flag>
+	<flag name="dumpfile">Include code to dump packets to a libpcap-format file for debugging</flag>
 	<flag name="id">Whether report *.bind CHAOS info to clients, otherwise forward such requests upstream instead</flag>
 	<flag name="libidn2">Enable support for Internationalized Domain Names, via net-dns/libidn2 rather than net-dns/libidn</flag>
 	<flag name="script">Enable support for calling scripts when leases change.</flag>
diff --git a/net-dns/dnssec-root/Manifest b/net-dns/dnssec-root/Manifest
index ba27085fd605..0336ce2823ae 100644
--- a/net-dns/dnssec-root/Manifest
+++ b/net-dns/dnssec-root/Manifest
@@ -11,5 +11,5 @@ DIST root-anchors-20150504.p7s 5001 BLAKE2B 088dc39160013dbc63a82fcb7666c7c73707
 DIST root-anchors-20170203.p7s 4095 BLAKE2B 21c3d482cd2faa7dd85b45385b4dd4a00c8f0f5e8060a9f99df4e309e6d11bd77ae2dcc68d51eefed685dc48e9bba578ef885a6058ee3862072cdc156d254c1f SHA512 caecf5fbe3b0db140ed506fc7a3711e89e1fc2dacbdc7aefb36766f07af4c97c42466000e51bc2e9cd46a3764ccd482b93da448861aaed90a0f5cf13103b4792
 DIST root-anchors-20170203.xml 651 BLAKE2B 0f2321e27cfbf88fecee0840db3b3265c6f062753b8a15d972dca12c19fdfea616470fe200b7ec4cb069553f532b6464a2784d56636d9096956eabc496eb4a6e SHA512 a0799cf2d5bec0d527d511e016a075ffd0af450eda010a4c780f7e12b2218ec577576137703cf1413352d3aac3cfda945a8a830dbb3618557f5e629049d763f4
 EBUILD dnssec-root-20150403.ebuild 2986 BLAKE2B 44564df76bd319bcd88b5ccce52e5e344183749e031de3b3e6dc32f4a4f393b43d13ab7ad5cc3d6c3453c0f655fb812775d966b9021529657eda19ae6f3aa90e SHA512 2fb3d178b75d08b8e47c46b704dcbce0e30ddfbe5b272e8741c5ba3fc5ba3847f6bf6db552d18b1d77f56f40b336e1df543bd07c36e32654cec888edd180642a
-EBUILD dnssec-root-20170203-r1.ebuild 2788 BLAKE2B d8da2d3d90de8302c3eedd1b47bc15616fa8901edcc492275e71aa8b94fcd0adf4334fe82149f6f01059f39fda8422e83109e31629bb9d96876b9c44fbe978d5 SHA512 1601381d7403e53d19721f0d5349b1b79a201ee19d78dc9abc123a4499ebc0a126b7d0bb0f9e9fcce67649da424619b976fe5fc5f0c2c8ccf7cccaec809b94d9
+EBUILD dnssec-root-20170203-r1.ebuild 2787 BLAKE2B 32f4af0a3afbfd9a80fa5aac8245e4d6cc383a0518d04a1f9b06af6c96ddc15ead0c56f901b0ff6b45a35e79ff39193e05f5871e440d18bc0128cba74eb2d8d2 SHA512 94b89d0fca2dafbbf84f0845ed0ef9958d4bb77e8ed588633595ed9c026987897e45bf65cc8d3f5892f0dc0d29807b3e34121013953ad173cf3b125ab91524b8
 MISC metadata.xml 327 BLAKE2B 62401c527b8fc9b2bbcfe6502060fe06543e2fbebcea988e0b0c50223aec705d6c0e04e7233f5aedcf4694889fa23397c03b1048df07ec8de59f7bac3c3efdc0 SHA512 27361587e570a2f35e178724db7cf89cafc4da8e64984c7fd79971a469f96c128ed488b03e59fc3de4a1d1012664aaa66540dc79f0a85c9f191c19bc864bb1fc
diff --git a/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild b/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
index 63c08e88bb7e..46c77ef4d90b 100644
--- a/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
+++ b/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${P
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index ecb06e746775..b3ce3bd52df0 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -3,6 +3,8 @@ AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc3
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.6.9.tar.xz 1126872 BLAKE2B c15b7e61ccad5417ce53f3d3895014931a2825835958735bdd9459634d9d9f39d6bb3681036772e6a510570a7f6a8afc8b0de5e77e67778831dc6415378889fe SHA512 80fcbef17c3e6685c09eb57e59001a5f298a083c18ce077dc2f2d1fadbe7c36e543c205c0820bc7971a8ed7547897aec408f51e1a9555a50dae82d047fac471b
 DIST knot-2.7.2.tar.xz 1148880 BLAKE2B bf3042d762d2b66f47dbd27a1c9ecd03d111259c7db82254c1175e660497fd8343c3f1cf1cc14e6068cb3d3618931b659888a7b97d7d6e4ba9d0e74c00540e31 SHA512 e09f8a38e975ff4f90db59db9ae8a6baaca9b0cbc9c2ecd37225febfe718b7c2038ae45481ed830dc66f2b70d8312266e2dc7cb54a0aa0fdc02c87ca42bac96d
+DIST knot-2.7.3.tar.xz 1146456 BLAKE2B d584db01b2354c259cf5e5cdfeb2dff677b04e76b68156a2c672fffe95ee8c6516f82b8e199d8ec8cacfcd93f15b370a25172826460b82c5964f38207c9818f2 SHA512 ba735eb06d99f8cb41619f44413f6450178ab249ef9ff282bae36e8e965cb421f082852bbf0ae5814e3e3148f27431fc1f2b4ed30e21bfd0cbea1be189bdadfd
 EBUILD knot-2.6.9.ebuild 1863 BLAKE2B 4543b8035b5a1939c6b739ed9edcff94098e56184116a2f4f9408b3a2252fe37cd94264cde36304875e61767ceaf1e1dad77464c4200aa377a645db375091dba SHA512 808cf7f8b0a1e2a4232e8943c7dc02713cb724140e964b23e5a0d9d9201907c5f5ec4a8902d575adf398824757a51e0540b4be7c3b8597026a40c397e5a6e756
 EBUILD knot-2.7.2.ebuild 1908 BLAKE2B 50a876560f36b6c6fdfbef4f7c3ca0b6f15202be8d5d169ada4604ed0b9c5892f8930903b271384061dba154e07ba43ca6b30e67f64a68f184578a711f6ca53b SHA512 43081a407699b81af13382edf983d383ee0dbca2001943b9c8591641a4aade6fc789340f57156eab8494d3f0ea7714ec7c450f202209f1c0a2483ed3f1f96df7
-MISC metadata.xml 1695 BLAKE2B a9a57a1a47be9a439018eeb5e670c057812f8fe8e54fe3f19d95e096a9daf916578a2a8887d5dcba18ad92c2b630cbe01a4122ae8671ee0a44dab01221f69b91 SHA512 373dd428815ebc5b8d0f689ae6e6a3dd3788a63f01e26e51fd01d9174d5692c5a5180ac3b552fd377c1a78e461c4c1d21ce721bc9093d6188f0049634ed48d93
+EBUILD knot-2.7.3.ebuild 1921 BLAKE2B 7417f96a92271fc81b795cf3bbaad7ca005447b67bf27d3ef887732a0479584be2770e43604b383380cddbb3a36a251dcb3154d9866da65e1680c4041562952c SHA512 8f4586ec916dd33fd89a63fdba419a8a81318e023371392ff01ba0428263c5cc3890b2e6f098913b029d0437b865564752b715cb17b6658be507f742473657d4
+MISC metadata.xml 1776 BLAKE2B 704ee480034e47aa62a552ae559671728d96df078dca931c9acc1ab58bcd502188c21820cc8300f536e793515765ed32f6e9cc8f48d9b01b91a959df98a9aa92 SHA512 57ec897a014478f4f5693cd242ecf76215dcf2c331e951bc2a5c0f7b492a76a49cb86d54885325fff2777470119da2f8ea140afece4b70ae410ffe50a4a4679a
diff --git a/net-dns/knot/knot-2.7.3.ebuild b/net-dns/knot/knot-2.7.3.ebuild
new file mode 100644
index 000000000000..28488683ca8f
--- /dev/null
+++ b/net-dns/knot/knot-2.7.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+	"+cookies"
+	"+dnsproxy"
+	"dnstap"
+	"geoip"
+	"+noudp"
+	"+onlinesign"
+	"+queryacl"
+	"+rrl"
+	"+stats"
+	"+synthrecord"
+	"+whoami"
+)
+IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+	dev-db/lmdb
+	dev-libs/libedit
+	dev-libs/userspace-rcu
+	dev-python/lmdb
+	net-libs/gnutls
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	geoip? ( dev-libs/libmaxminddb )
+	idn? (
+		!libidn2? ( net-dns/libidn:* )
+		libidn2? ( net-dns/libidn2 )
+	)
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local u
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
+	for u in "${KNOT_MODULES[@]#+}"; do
+		my_conf+=("$(use_with ${u} module-${u})")
+	done
+
+	econf "${my_conf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -C doc html
+		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	rmdir "${D}var/run/${PN}" "${D}var/run/" || die
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	enewgroup knot 53
+	enewuser knot 53 -1 /var/lib/knot knot
+}
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index b4c4ececc733..d03b90100dde 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -39,6 +39,9 @@
 			Enable the module that sign zones on the fly instead of
 			pre-signing zone
 		</flag>
+		<flag name="queryacl">
+			Enable the module for query access control
+		</flag>
 		<flag name="rosedb">
 			Enable the module that staticaly override certain
 			responses
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index d14c8765dc47..0ac44464d92a 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -2,5 +2,5 @@ AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f775
 DIST pdns-recursor-4.0.8.tar.bz2 1071831 BLAKE2B d9ab0dada8efa4b05c136650b9a2eab3aec4acab28ffb6da5bb4f627dc085b2c2d046d1f0dac5cf6e7054b47d76b8d7b95f56cc096b613891a4422b77e9abe9d SHA512 9886fccd3042904b7133e03a7b45479c8f2f57ecb33e4a043703b5e84816cd04a331503870e16030c86b353c1e14d9283dba767c1247e46ed6e14b7e0e93a5ef
 DIST pdns-recursor-4.1.4.tar.bz2 1224360 BLAKE2B ddfa4f8c6a4534ef41dcb2e5341a9eece84a44a5a77f1f8cdd251a84888d428283a1396de74e9b50239f0663c05fa60fe36b2a4fb44689215518ea390584501e SHA512 1904685dfdcd69d4b85c4c70559d51cc8ef288551ffd8f93a96108c3aca4e46ec3950f93840e4bd39da00c63129033b5a541beb68d1e924d477b5b0abbf1d00c
 EBUILD pdns-recursor-4.0.8.ebuild 1698 BLAKE2B bf67849d5f47c1f0d148596aea3fbc4268ad6696761f76f7fdb3b3b574708b01a464f12ae2a6c1df8979d60ec0cb877542dbf927af91bb2709e4510ce675a691 SHA512 358312b26fad4c6f2c473b7756f9c6d71c77045d6c7d0e92a10555848bc1643d9fc59454f61f8286d0891d181a1f6b20eeae055598dc7b150ba06faa0af44650
-EBUILD pdns-recursor-4.1.4.ebuild 1761 BLAKE2B 58f387bb7f37ec1ddb90409ce756b399271d850088647b58528cd1e69b9fe0561e587bfddc11183dfa386c54f796f0923e20155c4d839bb91334aa1a00020dc9 SHA512 4afac7ed9c7948c0caa65c812cbc17883c1edde853f413862e29ed4c2bb9a61c97e18f68b31aa5c6ac6f4f6380f916e554fd061c934fd924439b1d955ee06afe
+EBUILD pdns-recursor-4.1.4.ebuild 1756 BLAKE2B 1a3c13fc02d5b8a7a42ca513155ba244497ec3f667dcff34a51e9e7cf3b67534d66aacfb6498bb895edf952e96aaf247e8b67f321d0cbfe1d47b193b60e77e74 SHA512 a740b4dee0291128f4e58655975bbf32752906bdc0b75392026a7baef90adc8bd14c500df7b123c56bc883c38687ac64e936a8deb0f9bedccb02a3ee371ebcac
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.4.ebuild
index 29926f6c42d1..2e627d8108a4 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.4.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="libressl luajit protobuf snmp sodium systemd"
 
 DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 7ef56f953141..f44ae7181f71 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -3,5 +3,5 @@ AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02
 DIST pdns-4.0.5.tar.bz2 1323468 BLAKE2B 7e10cc98177bfa4f81888e2598ab4f0ce83ee45e6349372c065940424a74015302da879536dea8346fe7b86f35c0524a5449489bdf71d1a091b7c6a82fac4b6f SHA512 4b0fa932c1d9caf35b988916447aa21c64ebe2a58bdd84417cf09321a21b264cf1057206dc6993a45a3b591eb1dfa49463710c06b6bdfaf6fb17ae6dec6086d9
 DIST pdns-4.1.4.tar.bz2 1089376 BLAKE2B bdf1736c547927579af7557f695bfd63c4f0ea270ce8d90ddbad186d24bc8c7851254b99ee44d418d0b8c92be0b9d61f10f11f7a491baa8e00e0197b511b1a1e SHA512 ae5cd89d039635beddcb9709d0f6b06321a923343900f88e536aac2feb1e08d41b466b6addb2399f50b20d7ac19fcf4c48d47d0d9219367b37b260c40863ad93
 EBUILD pdns-4.0.5.ebuild 4189 BLAKE2B e54c01a4a1882bb4e27b500ce18d7ff65694c8c22f575163878c183553dcd25f24a2cb9ed6e364efa68c26ba484b6119e55b78bf282def187559bad81ea297a9 SHA512 af0831d53921f643a124bcab3e4bcf7143345c4aa88e49ecd52fb2e3aece4414c0ec0c8e523f382c1ae30029de453f12e90dc8eb39ca27d9ed230d955b80c7d0
-EBUILD pdns-4.1.4.ebuild 4201 BLAKE2B 26d83c4153d0cd519c16352844fce4c8dc61cf4c80a0dd4022e2df9fb5b9633315bad89f97a2bd49ba3c4bd1a703b1dc5d8efa52a7a1ec1632e7a04d3e505902 SHA512 9e5bb2f914f0ea8b0edab84c8004a53b93f3910c4ecb549f9a836318b46a1781ca6927fe7673397bcaf451787337fe0ba07b8127c68da2ce9cce0ca04c0860dd
+EBUILD pdns-4.1.4.ebuild 4196 BLAKE2B 8db15298f19a709b4b2cbdc770dff132e1db2d3a77a9fade3cbe608fe377be82a89ffc578c23591eac78c6e364ec7bc87f81642e02c8945a3430929563cdf47b SHA512 464975e69174c198d75e92aa040d2fd8c720d78addf7c8f2bc3f187635f12246aea547b7b86f368eb430b102b2ca9160a1e8ed69754222286e5f03f84d606b0e
 MISC metadata.xml 1330 BLAKE2B 17be53a41fc13a3739905f8409b49996b1958cfd04baf1d2982c923ee7b39ef5b8be627017a6efb1261f158f45660337eb22157ceaadc7b07ed5b5b3da7c7cdf SHA512 fb13690059baceefc1366423c524427655d54313f5690e12709c9e1dd4b9567d111d7d748c530286dcd24dc78acfa38baac88a5cfc9a2b01996baae6b47f39dc
diff --git a/net-dns/pdns/pdns-4.1.4.ebuild b/net-dns/pdns/pdns-4.1.4.ebuild
index 45e60be2b588..d37fb5d3a775 100644
--- a/net-dns/pdns/pdns-4.1.4.ebuild
+++ b/net-dns/pdns/pdns-4.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep
diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index 923ede801e0c..b190cd429950 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -1,5 +1,7 @@
 DIST s6-dns-2.2.0.1.tar.gz 76046 BLAKE2B c7c7e94fa47fc20e2a328f2fc22650585e9bd0260f4676c5ef6078097a62c43d75b18977e31187008b9fb90bebefc9ffb8d999395b012d85bdef9a4220aa7a6d SHA512 9b62ddec94be86d186520f0240dafda95861c54345f92a1fac3251f8560e70932bc5915cca4136d428ed02d0718e8082ad382bffd0c707ae867f1896d93ecaed
 DIST s6-dns-2.3.0.0.tar.gz 76476 BLAKE2B 6896bf534d872aac19dd6b2ad819d7aee6d52737f33106640ad1c3afc7f8857e5672f3e35f7f2064cb8085a79adc33bdd33a99dc656a656040a93f813a986717 SHA512 9afa98d0a7a9d84311f6f93d5c1742f7dcfb84c76ca363f9e09b3b40cd3faa1721aebb6e974a98991c037d82b2540c1edbc3cc13ea5f7e3dd95a96d14918e454
+DIST s6-dns-2.3.0.1.tar.gz 77836 BLAKE2B 55f83152eea3e3c8f2d774d6330aadcb73ec9b7d1ca4b87d1093fb9ab216ac1ad130bc9437ff30311451b06f820720fec902ac40e9e8d63f9d605cbf13448edf SHA512 69ae32f9b4ff22a5d38e3a2c950357d8c8032a649c1d81e4a4e5f474ae5c1bb1072555baa1a34f955293aa0f66a93f51f2cc8efd8aa56704b906e0b0979f8157
 EBUILD s6-dns-2.2.0.1.ebuild 1316 BLAKE2B e413614e39b05f07c616d83e5f3d7998ad33948bd67d96eb4653e1c81865b33209fe9efb16dc5731fd093f7ee87eb662974475426b9d8cc7b7590c879e8d09ad SHA512 a0153e3c80f54fd744dc5e1412672857280e3204da461e8eb75e2c06133a9d4162eccec950ebed272061a1614e00e04ce8024be8ac1a001ae0e57187ff064557
 EBUILD s6-dns-2.3.0.0.ebuild 1316 BLAKE2B 2c9dfe840307a11cf193077abc5011df5b01f455e1e0d8f5080061d8019c0824d12923c9182c8a6b3e84ab09fa0d7add2a8e99a9c9f27f8a3a74265042768a0b SHA512 61865257ed9b3e1321bd9aa0694cba91dc12402a76ed8db9c24f7d99566b4e060120d070122af7eb24cb13d7353f8ad16b8de252f39b5cd9e447dea67582ea73
+EBUILD s6-dns-2.3.0.1.ebuild 1211 BLAKE2B e74799d0b902714589cdb91b305ca8ea69939dd13f69cde242ac17292225f66802c89b421a6c2dc6f543a20b1f174d0c675b077a0150e2bc6a29f5e89fe1b243 SHA512 670fc13663ec03faf9f86ce6f4777730341c19783b6671249debfc0ac3594a1e2d33967f7b041778ff69388c7b56554ef679e246b0e6cd172a50c1b98b828342
 MISC metadata.xml 764 BLAKE2B 7e6f7e1ea30dcf3e0b8c08d90457019cfb0d577f2c7ad4d4664d2770c150ac2e51d38c047a7b41c5541c1a3771b8c18ad547f2a87cb4d13f49b6cf9141cf1aae SHA512 d49c08c4eb0bcdc6bade611ced7588ed1f6e8bb6c71a677b1b1ab1ef2357229a3a380858aecbf57a4fd9a75511fcd32cb7ea1ea91b75c7a0787518a83fd4ab62
diff --git a/net-dns/s6-dns/s6-dns-2.3.0.1.ebuild b/net-dns/s6-dns/s6-dns-2.3.0.1.ebuild
new file mode 100644
index 000000000000..de60beb85347
--- /dev/null
+++ b/net-dns/s6-dns/s6-dns-2.3.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="suite of DNS client programs and libraries for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+DEPEND=">=dev-libs/skalibs-2.7.0.0[static-libs?]"
+RDEPEND="!static? ( >=dev-libs/skalibs-2.7.0.0:= )"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 96e51a0cdbf5..d5ed933f99b0 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -21,6 +21,7 @@ DIST unbound-1.7.0.tar.gz 5538228 BLAKE2B a825e2cbef74b3a78f9802056d6f0992f77e0d
 DIST unbound-1.7.1.tar.gz 5565938 BLAKE2B 423dde8a13ea3539d86eade96507e6cdb4ac816393e99f58b4e0dc74a79c31bae57c87924ef737a567cc338d02d672f6c059c86d2f28a634f06e5f9a339f4260 SHA512 99a68abf1f60f6ea80cf2973906df44da9c577d8cac969824af1ce9ca385a2e84dd684937480da87cb73c7dc41ad5c00b0013ec74103eadb8fd7dc6f98a89255
 DIST unbound-1.7.3.tar.gz 5570604 BLAKE2B 93a4e7cc0e13b3da1057ce4e4518ab2363f03bff7c820095ed30b5fccd2f4245cfade6bf68a424a090967053c7fd727f33352c9e8004bb05d907a878d69c2517 SHA512 34b2e93660e519b2eccefef26a6c7ac09fa3312384cc3bc449ff2b10743bd86bfeb36ec19d35eb913f8d0a3d91ad7923260a66fc799f28b0a2cc06741d80f27a
 DIST unbound-1.8.0.tar.gz 5609213 BLAKE2B 41e464df60e03d502f13758e75f9143658b2a496c4fad69804d9d404e23a8d4b5480cc09048197f8593e37feffdffaea33b18a06d864d0d35e986169b49f42e4 SHA512 6c46f5b86b5bd98a7b549b660173d487e59e65385cebd7bc29429b4fee69f2b490651a409c57b072b9b604fa98e289fa82eeecfea8779900038c25b28a6bd064
+DIST unbound-1.8.1.tar.gz 5610191 BLAKE2B 15118f5940b4362dd515f8b335c8a39fc5ef1d3fbf0c20efbf0097342fabb4890eae0527f8b00ace181a425b413882db962b63d329f664cf12649d4d6ec8e5ea SHA512 1872a980e06258d28d2bc7f69a4c56fc07e03e4c9856161e89abc28527fff5812a47ea9927fd362bca690e3a87b95046ac96c8beeccaeb8596458f140c33b217
 EBUILD unbound-1.5.1-r2.ebuild 3427 BLAKE2B 193c35ecb00ae6303e6ab97852f79dffdf2bef64ce0b7c6e961370eb87d9506569e8aadfa6386624ce121162380b24fde713b36865b18bf228aacb3651defde8 SHA512 d3630f81fd44b40f5deb155473dc5835cc68e444be26afd0207fa734f285b566694b92dc073185cb24c9588a0ca5cb9ebf9c9268c2725c24a6c61d7ca73d1bcf
 EBUILD unbound-1.5.10.ebuild 3465 BLAKE2B 765d3f8f6a987a22195a235e515fb4fd29005a8e2b8d2eeadc9328993ba41d95655db10e1f8426b449311b08516b8dbd4abae382bf6d9b2f3608716c7f57f30c SHA512 28fb9da2c9bf08fbdd8e440c7c0f61da5ef25f7ca179b18e7c189e5c23f70dea295e1dd9b0fa289c75f5a4ee24ed9e1b3248f62fb0dc05d78068f22c00d100a7
 EBUILD unbound-1.6.3.ebuild 3689 BLAKE2B 8bdfd0f5b48ed66d7eb167e187cac4c64c3c0a044f0523662f253514717a273671fa15e6e931ec03f3ea16a6f2f727701811f41a10ecd49326a9c855f694a2d1 SHA512 15d464ec999b6c98e05d5904e52af977036c2c7ea2bf1d54cebf05f6841f8c28adda1b5d6fa9f344d12ea8417f512a1f0c0487aad62627a7761e97e71f3b018c
@@ -32,5 +33,6 @@ EBUILD unbound-1.6.8.ebuild 3696 BLAKE2B 2b520948c09e02bba9a1685e25a46b94280d9ef
 EBUILD unbound-1.7.0.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
 EBUILD unbound-1.7.1.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
 EBUILD unbound-1.7.3-r1.ebuild 4964 BLAKE2B 29c4159dce7346ffe39c78f7cc41be8d2f5a559579eaee964fa1c3bdba44af19233b7eb3ccd3ee53e331c582d32f3df786ea417a05d294f46a9424a42010b507 SHA512 9b39243fe41302474917d775574113ba697672453f439d3d31f02aac77f70f4a4f4b6fd404ff5ddfe5f4c52786ef7fdd223fdd540b0ac695ea5e53c914d50dfc
-EBUILD unbound-1.8.0-r1.ebuild 5357 BLAKE2B f502e7c2953e02706e0b960e289d262c02d7317af25c0715727dd9ec63ecff34da99818989ab5451a57ebf4a7aa61c3e8257a2d2e96c0463d885fc4028afed9f SHA512 62ed3dbb2460694c424923637d95e91e589ca3179b4885b3e2c4af7291401e53d1d8df09c82d02c17c6286ef0b79d1829a5d257c24aa160382feb0ea1d326ed1
+EBUILD unbound-1.8.0-r1.ebuild 5354 BLAKE2B 7089f7d46a314234be51e3d848ccd517c4654dfb30030679e0c82c0e02092104f668a613c5f809e86c9f1a2e9bb4730dd011517e15979c60c6f4729f36b9f35b SHA512 8edf751c0287446d9910372a8a36f7f23fa408ab22f925d108f09fb8ef9218eb9b13e050475d3310afb8efb87c0f548084d0d652d5f27b55b89d8995c22e4bcb
+EBUILD unbound-1.8.1.ebuild 5359 BLAKE2B e4da9248acd01a82908bd859247358359a6a0b72837028dcb13ac90fb16b50294f0621bf68cd948c9b4909b167fb69ae9d3739fc7d8fd69036ac871102d13297 SHA512 03b019d9cc9a93e525846c44ef96e1db4cd7257db4334a0a1de4427e7839ab40e0acfe31e7c82d15057b9ec6c820dbd908dc786e0356da7b9b0f655ba3c08ab3
 MISC metadata.xml 1239 BLAKE2B b23dea4347aa4eff995ff69d8e708abbc46b4d222b65d2e87734e77925d8026003df95fe503d66a96dd9dc6a73c32b69e6bb2ad9678a40c5c01b028e5247013a SHA512 6aeb057a87d2705bc9b1c42458cbe27c2b8c21f16ad338ef4421716527347c207360e154c82821ae10b32a22868d16b24601c2d115bee9e70e00a60d7fc133af
diff --git a/net-dns/unbound/unbound-1.8.0-r1.ebuild b/net-dns/unbound/unbound-1.8.0-r1.ebuild
index 4a5830825022..db6d5e3b03ba 100644
--- a/net-dns/unbound/unbound-1.8.0-r1.ebuild
+++ b/net-dns/unbound/unbound-1.8.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-dns/unbound/unbound-1.8.1.ebuild b/net-dns/unbound/unbound-1.8.1.ebuild
new file mode 100644
index 000000000000..2073aa739bea
--- /dev/null
+++ b/net-dns/unbound/unbound-1.8.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+	# improve security on existing installs (bug #641042)
+	# as well as new installs where unbound homedir has just been created
+	if [[ -d "${ROOT}/etc/unbound" ]]; then
+		chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX%/}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX%/}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX%/}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX%/}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX%/}"/usr \
+		--with-libexpat="${EPREFIX%/}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED%/}/etc/unbound/unbound.conf" || \
+		die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	# make var/ writable by unbound
+	if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
+	fi
+
+	einfo ""
+	einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+	einfo "set 'auto-trust-anchor-file: ${EROOT%/}/etc/unbound/var/root-anchors.txt' in ${EROOT%/}/etc/unbound/unbound.conf"
+	einfo "and run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT%/}/usr/sbin/unbound-anchor -a ${EROOT%/}/etc/unbound/var/root-anchors.txt' unbound"
+	einfo ""
+	einfo "as root to create it initially before starting unbound for the first time after enabling this."
+	einfo ""
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index fc69f01c62e8..456d0b8b9877 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 3e92eb4e18d5..758d595d3463 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,6 +1,8 @@
 AUX firewalld-0.5.1-errorcodes1.patch 1491 BLAKE2B 63e10fa5628fdb766b03f544ec16f095a0c1ff0de92af0d2f959f209e842af0cd53a24165e4fc06e15dea35f933387c25a3289049e828409d2aede00d1dfa3cf SHA512 3f293d48455f9ecfd454eb2cb950b853b0bc43fd709de291a963e9a62cddb1685c7a8bffb735178f79966fc2a8031fdb382c61fdadf8dd0134741741461e7ba6
 AUX firewalld-0.5.1-errorcodes2.patch 1465 BLAKE2B 67da2f57a445113ac0334af5f58cd8425e11153d7b6be6183614d31897527afa5d24dec72a6102805ec14f1fe18ab72684e545d352672c950077e26d842f279b SHA512 92c34604f4e22e4e647255ffa51528c7daed9fc738c3fe118e51a2263732c24c416ab0604dbacb86601d9e9b247cef56c74024fc0eb2550c42b9b57b999fcd39
-AUX firewalld.init 272 BLAKE2B 0ba8a50a1e11f0416bc1d133a4e1c864958f2a60314cc97ea3cec9c0ac26ff7eb05d54c1a1f59feb4672a8e873c4d69ec39d8d100a2152048d59a568bae14e34 SHA512 ed71564d92f4235bb1209cf1141e28f825e4b0e3d84e7214456399e1ac0a787c02d06fecd38eaa7643b4c571b90bfe2e3c93d9826ea448ebd480c0794b62265d
+AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
+DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
 EBUILD firewalld-0.5.1-r2.ebuild 2846 BLAKE2B 34acbe45a138d3a70fa394843844ba7174de03e1c4aff26a9b2020baefaaff1e3781c0d053580b32bbb584094d6d633b46ba765237b06c80adf27f2719ca7a86 SHA512 08aaa0728b191bfbd69804ca359d634c828b0e7ad9e8ffd78927d6b2d192a80404dee0c15a629290e05332bc7e6717f38a334ed329a0dddb1fdab9873dfe5a22
+EBUILD firewalld-0.6.3.ebuild 2513 BLAKE2B e61b18cc5301d6d9df97b82ea44afa60c78a5c80dc5465b996bd7ac39a50edd4ccc13e5240d1a811c6743405004b2ae68add6d5cb2f659df6e5789a72fcdaa79 SHA512 8a696ecb03b7175eafe50588aedd84380b25cadec103f0c74c854baf286ff653a962c9f03e2f1b8393a5d2d335e17376b7039018a9d89d4b841938d85d1a288a
 MISC metadata.xml 365 BLAKE2B f5f2b3b7646cec193cffcef9ca3fe51f4f071a996c20dcd5669f428a6759be96a014f477281d58a127149d82422862178289b362b0f30603a9fbac62c59ff6e2 SHA512 b317c52dc7ab211183555f45d1b84786f9aede73f3b59eee54aa696b4e358e42dd7c30044e89931c2362f3a11c5180f1136f7631bf19c1fe02e29d68bea4c5a6
diff --git a/net-firewall/firewalld/files/firewalld.init b/net-firewall/firewalld/files/firewalld.init
index 2618338e9f81..3bd3623de868 100644
--- a/net-firewall/firewalld/files/firewalld.init
+++ b/net-firewall/firewalld/files/firewalld.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="FirewallD"
@@ -8,5 +8,5 @@ pidfile=/var/run/firewalld.pid
 
 depend() {
 	need dbus
-	provide iptables ip6tables ebtables
+	provide firewall
 }
diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
new file mode 100644
index 000000000000..f652630c3f4f
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 gnome2-utils linux-info python-single-r1 systemd bash-completion-r1
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	net-firewall/ebtables
+	net-firewall/iptables[ipv6]
+	net-firewall/ipset
+	net-firewall/nftables
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	gui? (
+		x11-libs/gtk+:3
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	econf \
+		--enable-systemd \
+		--with-iptables="${EPREFIX}/sbin/iptables" \
+		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
+		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
+		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
+		--with-ebtables="${EPREFIX}/sbin/ebtables" \
+		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+		--with-nft="${EPREFIX}/sbin/nft" \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/" || die
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+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
+}
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 5d0fbd49039e..8bd1aa4dcfb8 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,8 +1,11 @@
+AUX shorewall-5.2.1-no-gzipped-manpages.patch 1000 BLAKE2B 5e078f3c7e60e490c5efc5f7f3614c3ed1a5e280aea05fc759104b152d8e25d6a7ecb2ac41949b3d3028c3b00632d551ea1515ec5e956d55ed83a9bfc3686db2 SHA512 d38680b5df5533c767a47f81f13dabb9ff1904cdc9823afa45d024243e81ea175bf9b25c6a3df73dd81dedb349e783289a0856203579a042c1c5f39b3bb14c29
+AUX shorewall-core-5.2.1-no-gzipped-manpages.patch 533 BLAKE2B 88513fe65a7fe2a72425c3b1eaa054352f61fac34ebd8c46cb149c9364411e9dd9e69b8821bcac30ec0d32355c0cab53c5d574210a7eb5064e97376b7563d512 SHA512 f8c2bcebcfa157450bed8067ff7f0cc4a5e6f52fb717c8f6c717067020797d10ff9ab123b09a43faf534d10349735bfed82b32ce6530d166e51b7de1082b544c
 AUX shorewall-init-01_remove-ipset-functionality-r1.patch 799 BLAKE2B 5cbf0835d291464eca10356fcfe1de13bc90cf0e3b9869d0daf8e3ad3864a44939774179047cbf5e192f0e294d8e8765c6d7b60a02178c9c149cbda4d3342b83 SHA512 c8686cb9345abd1036a8fdc6cbdaacc21a69df9dc536393a65675a2ae19c9cfb71d71cc66a9776135ad923414bde783f01dfa69600d1cfaafd618fcea65c8dcf
 AUX shorewall-init.confd 152 BLAKE2B b670db8a1da8e37c9d0f856c27ceb9644ec7baebf82e8d053c02a6f133df15a04087340ac430c8dddc57295332834c3e8e1c6fcb994e96e7224452a5a039d1c4 SHA512 105393c3cbdd1820066e41ed941b6a79cafde3196eb723c06ca984fc663370d6902757467339b6b4ebfb8d00167b9f85311b6842dadc564029313eb36f1a389b
 AUX shorewall-init.initd 4357 BLAKE2B 192e36a9e488c510783454852e65e2963e400fcabc96a07201c9cc72e09bcb63171cd56665f4cc9e4b4631202f8bed3d618866bccdaf194dee25814241381739 SHA512 5cb410e0fe0391fd467f212b3e1cf3ec4c7fa3289de2341edbf301ce9087e7cba05a36999a8203d7bce28ac35a429c10bc017a96b750aec1bf257987aec23245
 AUX shorewall-init.readme 1233 BLAKE2B a0603996cba908f3ff101ea82761c5acc279ee590311e7a8cb911bbfc59b6736b74fbf515f65b75eb5c5337fdbc7f23a484b1b5eee3f07964778753b7ceaca03 SHA512 8dbb70cc381b81ae811dcbfbcff63f5de0ba776472107a7d3b53e912fe50f20acb59f5da2aecec5de87ad0513a40fb4b4dfa30b51ff5f4b0da9186504870304a
 AUX shorewall-init.systemd 389 BLAKE2B fe2ba4c0be798fb994643ff050bb3fdce5c97f43dd38d5c1e38eae010c32df80bbf065b654721ceb98c344a67d59324545b5155e16d01ce1f8e94b2bff768732 SHA512 458c5fb5d894f307cec27fd42d05a1b16f10d556afd11a7b73f75be8eb072aa5256ba6095b4e3454694b9bc3e6cf80d7f40314bbe368ebfd4646074a12669f4c
+AUX shorewall-lite-5.2.1-no-gzipped-manpages.patch 879 BLAKE2B eb6f0462cd52b20b7538c620ce448c2629cd2d90feac6ccba55dca1700a368032d04ea827471f0fa59db773fe0167cc9dc70b5e06daf443fd7bb44fd0a31bd02 SHA512 6e31caf1bef794eead617666c4150b1df98ddea5cca5afd920f48ddab7073491b706794c20ab728adcc9c81f0f88ffd63b056f6028597d2c63f3e4758f4e01db
 AUX shorewall-lite.confd-r1 197 BLAKE2B efd61f07ee3b601e7f2510e19a9ea065cf30fa414c23eb0d6e036b9bea6cff72ea5fa606033dfad4bd2f08db6d1a2a28b60ba3018e64e8f9d75366ed9f32d5bd SHA512 fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b
 AUX shorewall-lite.initd-r3 2238 BLAKE2B 4a1c559589a9e0f6a332879cc8c61228cc65f1fe6d648452009348a6b2a6578028a03e764518ed63b7994615149cec0524cffe66daa13b1805e0d155addf2352 SHA512 215a33cf378a12b6d1563b0b9fa95d372e069aa1cf7904a067c12cdfef80f1ba46910d37ba1be8f4ea6a272e5bf4d7ad37563257139d014f7f12ad91021b599b
 AUX shorewall-lite.systemd 603 BLAKE2B 527572f0d110ee94d8398789fb1d55acd6d91fbaf4ddf4c0bd8e606679beef5d9a3ce382cde1c5424813f04df14e98f9c71b0d0ef941826132c66143ca3d5361 SHA512 b9ac8ca1f31d29dfbd6a3e9387932ebf954e18c634df7e6118c55e3eaaf20a835e47e0bad07bb4ae1c47e76cda91bb3d03cd59f61805e48c194833b86d14a54d
@@ -12,20 +15,20 @@ AUX shorewall.systemd 568 BLAKE2B 385edad8857f029f691481483cc3e5e5981836254b7b39
 AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67a18be2465a1099b81f7ed89cc3c63d4ef550521d3b9e3cc995915439e21e1142f46f8df1e44e22b5c29009d5 SHA512 0bd832d4f8857bf9b1c9c776a53739d8666f002d1caab29c976a248916cf1eb5806d6b59dbf7ee8a120a3158b10e6fa6e179e34fe9fa6077a794ffa7d1e06cec
 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-5.2.1.tar.bz2 550552 BLAKE2B c7b77912f644b3ae1a15a366018bc57da72d23342ec9db4ba282c8bc993f4964b3ce6d783448e2e36a6370fd223e1d14f1b27e9cadfa47024a1dda8109419c7f SHA512 2c408196a142a314f72ea4adb4193fa5cf30300529c41661e157e7b69f2d8448a0c25bcd177f25d6f993494b26068edf48cc0fc8e6a526380726baa33a8e11c8
 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-core-5.2.1.tar.bz2 76562 BLAKE2B 6129e90f9cfca9b36221320eb917f3299dd151d366e2b98d546519330cd5c95511d4a1e7b1a4ea2de046aed2d2a72367f8e3039ad288de89178e161cb16eb5a0 SHA512 4ea3fdec0c4ffb57a7e63334aed3479819079936575928b01399a3c2a8515a4ecf1eb19f1e193849480e6ac84f4c7de9e4c84699765684fb2299bf1b5276a3a8
 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-docs-html-5.2.1.tar.bz2 4302517 BLAKE2B a38659f9740da36efe3a2bf844b9686a18bb47476388580d02462aec0715afb1d09d20ffb2ee708550f7288fb7bb36ae8e5f23d902bd126bb2a5c496866e49dd SHA512 c67c621c1fea599c5e1987a7847bed187d8d0571e1b6d42c9fc351022de04b47e4f57030f919b85e8c9fef51829e0b04cbbc14e29a0df6f084c765219d46591c
 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-init-5.2.1.tar.bz2 31705 BLAKE2B 7f6a6b5266d63e3b0fab99a49f342e8172a20f50471fdcebe07a6c62dc36fcf4d96a041870df815aa5ecf2c421b5d7cb1408c0f54f520295611d54a876150294 SHA512 caba4eebcc576bf261327cb7304aedcaaea7325a34e444b4dd9ce60cd545b479271ea9b7049743ac1499485695d7d0f2a37b127a895cb3d200e6dfb41a21fe17
 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 shorewall-lite-5.2.1.tar.bz2 37527 BLAKE2B 5a50d66366b5c4c456fd4291d1413923162cfe24f989df00be5f613089d96402430ec6c6780c78ee5e398cd931c964e8d164efefb4d1531cb870ba65040809be SHA512 111f68c2d59b58e7d344e55b293d78fe2013771be9f8399bea88d9699905f3683931668fad23e7efea1fcae9d3c6381bd9f2073c3f208e81cec958ab19b2510e
 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-5.2.1.tar.bz2 188322 BLAKE2B 5814433b11001f1e00ce3b124b5ec4ca6b1909ec00f966cb5fc93c34207325853249964492eb03f1f3c73cfc9c1b42def9578e507395395dd067f236475215b5 SHA512 b5dd5c4bf014c24a8a8bb4dc38b45dc92749182091b572340e1aef12d0aaeeb1dc436716b449cc1de34c74c6e4d590cc8cbe6b73aa3c614e8c9c37d7fa7a00a6
 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
+DIST shorewall6-lite-5.2.1.tar.bz2 37244 BLAKE2B 4fcd5a1b65b15a7c4214b079677f6ee3604d1a718fe6a4710d42085434af64bcef9db57135b0c6b0e6678dba6272a4341330e47b8a6917c759e450091c7d1b5a SHA512 ca807bf0d59db09439d80725e6eeafb7795346bd030fe8598dcccc4fc93a57819715c33c73035c1819a9eba93efe69e058be1377fcd9adf135a0a08f6ff3e481
+EBUILD shorewall-5.2.0.5.ebuild 16266 BLAKE2B 69e32d9dd1ffb111a0b2a570176d43ccdaa14a0dfa58a16bf183f14c1006637b98bd9d56dc11ca75f9965b13483a51b50f29010d4898e9485e5e181af942843a SHA512 d218f924678252ab7e91b2b6965299993ce9ee77bda85174e5b93a35ad4d742ae1c205c9ca8d43f3225f75584f684ded0a02e4fec95211a27fb77726f42586ef
+EBUILD shorewall-5.2.1.ebuild 17009 BLAKE2B fa636310f8f6746a98a83c5600b95dc697214a8239977f87dceb7ff520ca0a57ee5763feee0b6ac25a1fa311c9f00707e8c4a18fff91435ac59ce9188cd52dbe SHA512 8ff2886be685745c26cc0ac8274f2c0061b6ce9ae454412809c4230af9d53afc24e73898dd574c719bd7aba9226bd718085c49a3feaef101fbd96a7962b4273c
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/files/shorewall-5.2.1-no-gzipped-manpages.patch b/net-firewall/shorewall/files/shorewall-5.2.1-no-gzipped-manpages.patch
new file mode 100644
index 000000000000..386a55dfbad8
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-5.2.1-no-gzipped-manpages.patch
@@ -0,0 +1,28 @@
+diff --git a/install.sh b/install.sh
+index bd89420..6ad695e 100755
+--- a/install.sh
++++ b/install.sh
+@@ -1179,9 +1179,8 @@ if [ ${PRODUCT} = shorewall ]; then
+     [ -n "$INSTALLD" ] || make_parent_directory ${DESTDIR}${MANDIR}/man5 0755
+ 
+     for f in *.5; do
+-	gzip -9c $f > $f.gz
+-	run_install $INSTALLD  -m 0644 $f.gz ${DESTDIR}${MANDIR}/man5/$f.gz
+-	echo "Man page $f.gz installed to ${DESTDIR}${MANDIR}/man5/$f.gz"
++	run_install $INSTALLD  -m 0644 $f ${DESTDIR}${MANDIR}/man5/$f
++	echo "Man page $f installed to ${DESTDIR}${MANDIR}/man5/$f"
+     done
+ fi
+ 
+@@ -1212,9 +1211,8 @@ fi
+ [ -n "$INSTALLD" ] || make_parent_directory ${DESTDIR}${MANDIR}/man8 0755
+ 
+ for f in *.8; do
+-    gzip -9c $f > $f.gz
+-    run_install $INSTALLD  -m 0644 $f.gz ${DESTDIR}${MANDIR}/man8/$f.gz
+-    echo "Man page $f.gz installed to ${DESTDIR}${MANDIR}/man8/$f.gz"
++    run_install $INSTALLD  -m 0644 $f ${DESTDIR}${MANDIR}/man8/$f
++    echo "Man page $f installed to ${DESTDIR}${MANDIR}/man8/$f"
+ done
+ 
+ cd ..
diff --git a/net-firewall/shorewall/files/shorewall-core-5.2.1-no-gzipped-manpages.patch b/net-firewall/shorewall/files/shorewall-core-5.2.1-no-gzipped-manpages.patch
new file mode 100644
index 000000000000..52ef41040755
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-core-5.2.1-no-gzipped-manpages.patch
@@ -0,0 +1,16 @@
+diff --git a/install.sh b/install.sh
+index fd7f8f6..3872cc7 100755
+--- a/install.sh
++++ b/install.sh
+@@ -353,9 +353,8 @@ if [ -n "$MANDIR" ]; then
+     [ -n "$INSTALLD" ] || make_parent_directory ${DESTDIR}${MANDIR}/man8 0755
+ 
+     for f in *.8; do
+-	gzip -9c $f > $f.gz
+-	install_file $f.gz ${DESTDIR}${MANDIR}/man8/$f.gz 0644
+-	echo "Man page $f.gz installed to ${DESTDIR}${MANDIR}/man8/$f.gz"
++	install_file $f ${DESTDIR}${MANDIR}/man8/$f 0644
++	echo "Man page $f installed to ${DESTDIR}${MANDIR}/man8/$f"
+     done
+ 
+     cd ..
diff --git a/net-firewall/shorewall/files/shorewall-lite-5.2.1-no-gzipped-manpages.patch b/net-firewall/shorewall/files/shorewall-lite-5.2.1-no-gzipped-manpages.patch
new file mode 100644
index 000000000000..7f6a91ce4dff
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-lite-5.2.1-no-gzipped-manpages.patch
@@ -0,0 +1,26 @@
+diff --git a/install.sh b/install.sh
+index f66810a..051b861 100755
+--- a/install.sh
++++ b/install.sh
+@@ -448,17 +448,15 @@ if [ -d manpages -a -n "$MANDIR" ]; then
+     make_parent_directory ${DESTDIR}${MANDIR}/man5 0755
+ 
+     for f in *.5; do
+-	gzip -c $f > $f.gz
+-	install_file $f.gz ${DESTDIR}${MANDIR}/man5/$f.gz 0644
+-	echo "Man page $f.gz installed to ${DESTDIR}${MANDIR}/man5/$f.gz"
++	install_file $f ${DESTDIR}${MANDIR}/man5/$f 0644
++	echo "Man page $f installed to ${DESTDIR}${MANDIR}/man5/$f"
+     done
+ 
+     make_parent_directory ${DESTDIR}${MANDIR}/man8 0755
+ 
+     for f in *.8; do
+-	gzip -c $f > $f.gz
+-	install_file $f.gz ${DESTDIR}${MANDIR}/man8/$f.gz 0644
+-	echo "Man page $f.gz installed to ${DESTDIR}${MANDIR}/man8/$f.gz"
++	install_file $f ${DESTDIR}${MANDIR}/man8/$f 0644
++	echo "Man page $f installed to ${DESTDIR}${MANDIR}/man8/$f"
+     done
+ 
+     cd ..
diff --git a/net-firewall/shorewall/shorewall-5.2.0.4.ebuild b/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
deleted file mode 100644
index 041ddab407e0..000000000000
--- a/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# 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-firewall/shorewall/shorewall-5.2.0.5.ebuild b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
index a7f7766988aa..3794662afa62 100644
--- a/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 fi
 
 SRC_URI="
diff --git a/net-firewall/shorewall/shorewall-5.2.1.ebuild b/net-firewall/shorewall/shorewall-5.2.1.ebuild
new file mode 100644
index 000000000000..1666426f5c3c
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.1.ebuild
@@ -0,0 +1,479 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+
+	pushd "${S}"/${MY_PN_CORE} &>/dev/null || die
+	eapply "${FILESDIR}"/shorewall-core-5.2.1-no-gzipped-manpages.patch
+	popd &>/dev/null || die
+
+	# 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
+
+		pushd "${S}"/${MY_PN_IPV4} &>/dev/null || die
+		eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
+		popd &>/dev/null || die
+	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
+
+		pushd "${S}"/${MY_PN_IPV6} &>/dev/null || die
+		eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
+		popd &>/dev/null || die
+	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
+
+		pushd "${S}"/${MY_PN_LITE4} &>/dev/null || die
+		eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
+		popd &>/dev/null || die
+	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
+
+		pushd "${S}"/${MY_PN_LITE6} &>/dev/null || die
+		eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
+		popd &>/dev/null || die
+	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
+
+		pushd "${S}"/${MY_PN_INIT} &>/dev/null || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		popd &>/dev/null || 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-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 62c9eae6af32..cb364e1e676b 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -3,9 +3,9 @@ DIST xtables-addons-2.14.tar.xz 322296 BLAKE2B f739951ff535f73be8c96b271f929821f
 DIST xtables-addons-3.0.tar.xz 321960 BLAKE2B ce6e034ab42fda319217b464a2c3c639787a696d58739cc7ba8e1c699894c46590c34490c8ccc41c29b8dbfb4ad01859050bdeccbac08d09f297a49cdc920c6e SHA512 164b43ff23f33187b5f557bedf765fbad21721b236ac5f5e982c5fdf88cdcbf8ca106810d2df31d9ab79e9c518f7fec3d7dae297540d0b00326a0dfffd04cfec
 DIST xtables-addons-3.1.tar.xz 323684 BLAKE2B eb75bf41c7ca2f1b1dc41bb7c602de8856e86db244a4e247e3089037e176d5f84e472719e7fc31836e898b615f8b6630ddeacf0754807e6684a22aa593550b1a SHA512 d9cbd3278ac156b3edb024bad98dab2bb1f83546aacf038b85b9203064e301de17c638dae4e05ea907b00b4038377e9aefebb65367ffc335b149f7e17596d931
 DIST xtables-addons-3.2.tar.xz 323608 BLAKE2B a23ae7d779d7cb2f77f2c0cceae54c1b73fa9dcb9dab22a83c2af22562d2c1b1d0a6df7eef7809961d1cb0484793a65a57259af4934b3e7fe624c20c397ce215 SHA512 57b02aec83765ad407a813cc8bb5ba471739da09ee8177094592833d1eaa54300ce06b326e9897cb80f563bdaec24b33d42c2cdb72f8a0ec8f86b085fcc6494d
-EBUILD xtables-addons-2.13.ebuild 5452 BLAKE2B 9478b01b93135d67c55bf433df6c9cd9ff5d982435b75df7e6a70aab9d8462acd5884d8dac081609b1a0703bbbd6bd23a28d3f8ca6cf05b1e48547acf53467b7 SHA512 694392c6e2677936106a706f6f515d87b327bac2da5bfd026838997030837c0063145241c789ee457351cd8477661d2f127ab6b79e43b4dc93e9f979a3c98af6
-EBUILD xtables-addons-2.14.ebuild 5454 BLAKE2B 603754d0cf96bc86cb562dc18ca038cfa85ec6f70704d16e659a5d0623e7a761c77da8910d018ffa76dc3635e32aa44da62bd1380dd1953ea4d3013dcb72dc9d SHA512 8175f490a50def588c76a53eef86a8b1fe54e1a8f98d15105d698c92bab790a5eaa2172ea00263ed5d055f647fbfa959e392ddc8dc47afa5fbd8124d5cc721e3
-EBUILD xtables-addons-3.0.ebuild 5456 BLAKE2B 80bd48f0babc9da74d03d2c1392cbd932ddd9e77fc599c683cb7ee0a2cb600cc6fb9dfdf74c113cdc93ef4a1f43662aae5e0035f2755d3aa3ac92a70d8564982 SHA512 43d9fef667ebbd568b172dade03a0b1617fce1cee5f59fd784d0a3a3f61eb0bfcb426c6168fe3dda30bfe8a916f4b042f0560600f1bd5d7cfb47f92c2915aaa5
-EBUILD xtables-addons-3.1.ebuild 5399 BLAKE2B 4584f3f34534e19a85177089f9f1f73429b65932fb9d1a349d8414d621e1780282a6e63d26235cd4d10fca872921f5b61bac6d18a55401530150c5d872242a40 SHA512 ef8e7b5cf207550b6537274b4139fed5f9821a21cc0230ff11e28c7394fb7ba82788313ea2a921ae15fd512970aaa36c1a3316d2bed7c0132b39024b6c0e9ef1
-EBUILD xtables-addons-3.2.ebuild 5399 BLAKE2B 4584f3f34534e19a85177089f9f1f73429b65932fb9d1a349d8414d621e1780282a6e63d26235cd4d10fca872921f5b61bac6d18a55401530150c5d872242a40 SHA512 ef8e7b5cf207550b6537274b4139fed5f9821a21cc0230ff11e28c7394fb7ba82788313ea2a921ae15fd512970aaa36c1a3316d2bed7c0132b39024b6c0e9ef1
+EBUILD xtables-addons-2.13.ebuild 5499 BLAKE2B 165def630f60562886928e7cc45a58c2446dc345745fcb0bc8245681042d88eef72001c3d8c2c86d085bb7dd9596567f64366319bf4e403146459355fef30c62 SHA512 fce73d0812ae0923585fd5d02878677a8364cb5c256e411ff579bd60ac446188981c72bf534dcc0168098d727c404d567e42855aa24474c874ca562ec1e017ac
+EBUILD xtables-addons-2.14.ebuild 5501 BLAKE2B b0f5d1b577cee3effc7d24d342c36b3f49678860d2a498f496722b5e43d96d0a03f446c07753c0bd02ce908476f1076fb27421e23cb95739ec8d04091d95f56f SHA512 f9b1c681220f335fc4a258f487ea637780f2d8723429df78879b648c1da692d9695493c9de85d4e5b20cda4a399bdaef0b1ca5e2826ec4fa585180de9acc8f50
+EBUILD xtables-addons-3.0.ebuild 5503 BLAKE2B 62a2b6f18a5b8f42b2f593e913340476abd2c32cc6a66d68647d8618fef85a1068181b2d5c099a71c2cd599641c3e743392302c883e05c9f1209a7026e9fdbac SHA512 d3168387cac66c155c2bc7e3db3d46efdb684049f6c73833d5e83b097f2261578be89b20b1c58e80d923dcf34afe13b3fd4518a8ac7ef4c97a4185d9ce0b9d9f
+EBUILD xtables-addons-3.1.ebuild 5446 BLAKE2B 639870cffe55f38a98967830b1a12ea422090319a8a1afc991b36ef960d2fd4541e2678bdfa188707fcc756a4110b25e986f5055932b2024b111f78e7b8d2164 SHA512 0f6fa016b58d4739d9b0770925ef1cd26ec7b658e1f5bb211ba578b352c7612e270a2c4fe8bcef59d5f7c4792cc966e7367e671ad9eb7a79d0c3d365453a3984
+EBUILD xtables-addons-3.2.ebuild 5446 BLAKE2B 639870cffe55f38a98967830b1a12ea422090319a8a1afc991b36ef960d2fd4541e2678bdfa188707fcc756a4110b25e986f5055932b2024b111f78e7b8d2164 SHA512 0f6fa016b58d4739d9b0770925ef1cd26ec7b658e1f5bb211ba578b352c7612e270a2c4fe8bcef59d5f7c4792cc966e7367e671ad9eb7a79d0c3d365453a3984
 MISC metadata.xml 775 BLAKE2B 3462baf963682f15042f1fe9a985fdce50d46abb5fbe1080f6ce5285314a3e24581d780d84112a5bed0a4a132ce17f29678983711a38745d0fd7969091e76182 SHA512 85474ba552703d77bc7cc18ccef424f5eeb68e23eb41e14a8c360afcdcb2632a99420fda2dca57ea15dbda3f850d939c16b18cbdc96dbfcf31a6af3f40743f0c
diff --git a/net-firewall/xtables-addons/xtables-addons-2.13.ebuild b/net-firewall/xtables-addons/xtables-addons-2.13.ebuild
index 3722de98ac4a..5f99b5400fa7 100644
--- a/net-firewall/xtables-addons/xtables-addons-2.13.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-2.13.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
+MODULES_OPTIONAL_USE=modules
+MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
 inherit eutils linux-info linux-mod multilib
 
 DESCRIPTION="iptables extensions not yet accepted in the main kernel"
@@ -12,7 +14,6 @@ SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="modules"
 
 MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
 
diff --git a/net-firewall/xtables-addons/xtables-addons-2.14.ebuild b/net-firewall/xtables-addons/xtables-addons-2.14.ebuild
index f802d660a639..5fc031f3e9ca 100644
--- a/net-firewall/xtables-addons/xtables-addons-2.14.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-2.14.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
+MODULES_OPTIONAL_USE=modules
+MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
 inherit eutils linux-info linux-mod multilib
 
 DESCRIPTION="iptables extensions not yet accepted in the main kernel"
@@ -12,7 +14,6 @@ SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="modules"
 
 MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
 
diff --git a/net-firewall/xtables-addons/xtables-addons-3.0.ebuild b/net-firewall/xtables-addons/xtables-addons-3.0.ebuild
index 7683ecc923ed..80ab8675e8f4 100644
--- a/net-firewall/xtables-addons/xtables-addons-3.0.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-3.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
+MODULES_OPTIONAL_USE=modules
+MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
 inherit eutils linux-info linux-mod multilib
 
 DESCRIPTION="iptables extensions not yet accepted in the main kernel"
@@ -12,7 +14,6 @@ SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="modules"
 
 MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
 
diff --git a/net-firewall/xtables-addons/xtables-addons-3.1.ebuild b/net-firewall/xtables-addons/xtables-addons-3.1.ebuild
index 7a72a0a86734..bbc32dee9f88 100644
--- a/net-firewall/xtables-addons/xtables-addons-3.1.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-3.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
+MODULES_OPTIONAL_USE=modules
+MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
 inherit eutils linux-info linux-mod multilib
 
 DESCRIPTION="iptables extensions not yet accepted in the main kernel"
@@ -12,7 +14,6 @@ SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="modules"
 
 MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
 
diff --git a/net-firewall/xtables-addons/xtables-addons-3.2.ebuild b/net-firewall/xtables-addons/xtables-addons-3.2.ebuild
index 7a72a0a86734..bbc32dee9f88 100644
--- a/net-firewall/xtables-addons/xtables-addons-3.2.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-3.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
+MODULES_OPTIONAL_USE=modules
+MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
 inherit eutils linux-info linux-mod multilib
 
 DESCRIPTION="iptables extensions not yet accepted in the main kernel"
@@ -12,7 +14,6 @@ SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="modules"
 
 MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
 
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 9abb6a829cac..4d12cfb0856b 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/mc/Manifest b/net-fs/mc/Manifest
index 0db116af9ea1..3aa149e491e1 100644
--- a/net-fs/mc/Manifest
+++ b/net-fs/mc/Manifest
@@ -3,9 +3,11 @@ DIST mc-0_pre20180325.tar.gz 1367439 BLAKE2B 4c4a78bca067647b16d4ae0f142d78adaaf
 DIST mc-2018.09.06.23.26.56.tar.gz 1724855 BLAKE2B 6a100fd117830db096afd6b44b268e9dbe25185eb7ede56e300c6a4ac34e70a87f9184c77d54d52eda3eaece32bb6664bbeaac834624bab36d8c66e1bc31805d SHA512 2eafb9f9043d4931011c6b50cda5f8e9f794d56095de1f1cb4fb8110e109830ea6067f33b386ae2b1e8a7012f005fc0d0b0580ef70e3673c049ce81522635dc2
 DIST mc-2018.09.10.23.39.12.tar.gz 1725434 BLAKE2B bee959661fae0fccc9af655f84fab3ae4c900978b2fcfaf63287f717221065fc382f41618511c511dbe18f405b3fadfbbb2a66f1ed4a4b1c4db5d40f45b24f07 SHA512 c1183ed1499c4b3e24cf6494bd8f3b35e4d7aa9fb32d85b55d0464ef10eea25e4dd98730363d3b4d36d7cf288d652b7c2cf5738d2d3b82062f1d6f567a511af5
 DIST mc-2018.09.26.00.42.43.tar.gz 1727396 BLAKE2B 6f446229619e9116d9e8f62fc21d82aa5325b1d10d3786232741cf072fab18e5bccf14b1d49118532db5f6b0b4c2a792f15c28979af058cc75355e92fde88132 SHA512 e6be63004c0600b6e85ebd09033ebf3b7237f9829114b8b4e86c418015a94f465c26287221ddcf6371d5d414d2c037dc21a6136e1f6c8f1c27e363e0c67a1854
+DIST mc-2018.10.16.23.25.25.tar.gz 1749339 BLAKE2B b712b5111582b513c10ab1a39a9d7d5f0100fb1f6beb5e899f5e838ecd4428de4f3eda420e7c288e93b44a384c86fe65255ae086cb5adb99ffe19f8f364c09df SHA512 6d44a17fb469b2770ed9b278dcb72c9a8f3e738a4dfa4b9af888469b4228401639b74fb4891dc504fabb3def7319c367ffefb16897f6ea1d39af71c408c86af5
 EBUILD mc-0_pre20180209.ebuild 1188 BLAKE2B bc79dfcfdf898d0a0c3317c74dc4e787f5229e4b147221dac9a2284dbec6a7a74220c489eab490951c2253ec983ce9775ad6aac9470cecd5f97afe1d8131523a SHA512 a16cf03488aa12e5253e97811e4acd30d0f408af0a2b2254f80237e6c1408863651ea7a9ba24b9c5c3e3b380e615e7b8bcbc0fcaf71ab38f2ba3621a46e3d176
 EBUILD mc-0_pre20180325.ebuild 1188 BLAKE2B 66a6bb946e6a4037058cf3ce89f225e80bbb9e3e9cc7ab578288804443ad2cf6cb9320a36a58142b21979423e1e324cf2e4e1e356e30bec84199a69c94e19c5e SHA512 ece1f16ba709d123ad02e2c67ca315ec65df0aa92415c86f23a973107bab036e405d4d6403843abacbba9d34545d9e38d4857381255f8a43d85c203f67da5d1b
 EBUILD mc-2018.09.06.23.26.56.ebuild 1178 BLAKE2B 30e3b7ef2c39f0d0e930b7a1127ef9544077add85260ebe73251edf81f681934e85fa1dcdb2bb131f41b14a5fa12c8f627e54ef408f7b23f2dcea4fb78e390ac SHA512 19111a0ca521095705c8f09df126aa50325f99488c968a415f60874f63f370eca0f8043803464ffe9ca9753b0e445a809a2ed41fdda1f8fddcf93b00ab4bad29
 EBUILD mc-2018.09.10.23.39.12.ebuild 1178 BLAKE2B 1828f65d44b115d8a52690dbbdd6d2a756aec8b4ddd5e7ca4da0dc5c678d336adac6b7f4d78fd9118abf3c4293b879e4e584e913d3e5e6a262a965b21ca8a342 SHA512 f456334d9eaf2d41a2b8ffa3c50933fa8e8ec624ad02885eb63a0abe3d726fb890ded0d57059180157ff4aeabaa4b3849ed43497a6dc39d8648bc217c5454ebb
 EBUILD mc-2018.09.26.00.42.43.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
+EBUILD mc-2018.10.16.23.25.25.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
 MISC metadata.xml 316 BLAKE2B a9702a517ffa52bc439add8a4712f3835bb9b7200fcc0d0fba23c23e91387a185295198a80734c79dbd4cc0146f4b393f3396495830ecf0122cbbb334a5fa651 SHA512 630bdebb37c4df4255b8dd7dd28566e9f484697e1ff50981a743b94593ef56484b20aec86a0109458a0e88b7c357da78afa8ed946ba3bca2a7db5bf006747913
diff --git a/net-fs/mc/mc-2018.10.16.23.25.25.ebuild b/net-fs/mc/mc-2018.10.16.23.25.25.ebuild
new file mode 100644
index 000000000000..28574278fd8c
--- /dev/null
+++ b/net-fs/mc/mc-2018.10.16.23.25.25.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
+
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+
+EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
+
+EGO_PN="github.com/minio/mc"
+
+DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
+HOMEPAGE="https://github.com/minio/mc"
+SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="!!app-misc/mc"
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
+		-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
+	MC_RELEASE="${MY_PV}"
+	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 docs
+	dobin mc
+	newbashcomp autocomplete/bash_autocomplete ${PN}
+	popd  || die
+}
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index 376e064a7d22..e69ab032a205 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -5,10 +5,12 @@ DIST minio-2018.08.02.23.11.36.tar.gz 8381976 BLAKE2B 4081dcb34af05e6643ac64648b
 DIST minio-2018.09.01.00.38.25.tar.gz 8731636 BLAKE2B 4332d97d63c0e113de6e88ff9a4b1fc2db9b3e9b23caff19651641fcf08b5fd86c04155a30e84228433fd76160b70fb6e774421ec85a03df6fc94bdbde545ac1 SHA512 f445153be70c7370d8c96c3d7504ab4cb067fe8d36e0e0a8c014a026cf96fb3bddc9fb9b312a954a1c505e0ee7a36e33f67f3a460f8db58105d9880ee4a8de05
 DIST minio-2018.09.12.18.49.56.tar.gz 8743369 BLAKE2B 8f7f2fdb75a0130348a6e06182a1d24d8e6463543fad8d21f2aeab0e1d550b257d124cb13d0012b9f2864f8743c4ee3791605eb1614d8adf5d6008c9d67de685 SHA512 2f33e406f8be22ccb74c7d90a76d6a48699c7e1c95c3adc10f26e6945b56b8648626ce0cfcd255ecb56985f9e849c81a0dcc4c79f772d33804774a5fe65ae4b3
 DIST minio-2018.09.25.21.34.43.tar.gz 9187452 BLAKE2B d60567a90b95c86293cd34533cf65ced42ca11219963e2f6c843ed7d6988a9df160be3afda9cdbac4f5158f46b7daddb8c79e47e6a8ff54530725ada8fb14226 SHA512 2e70e09455ba56fc4230fbc836d2eb988315f0a43109cfdbaf49c57ef2ff126db4ba836473df3c9b6e7f3e69852fa44b894bcb8a7b49b688b0df73f2e7499fe8
+DIST minio-2018.10.18.00.28.58.tar.gz 9153624 BLAKE2B be2b9db53f0256bb7db1a1917003051ec0484d876702a54ea81ed38ae2853de296129a0ac1e5fbbf6e056bc5ac82e7ba389008001195f4b20daa8545275c9215 SHA512 64abcd10ade42f9bcecf498b2855426b8fbd2be428aa5aaa134295709849f8ebb57aede1d67a7302c7d05b8a861d5076a04ad126bc66d1fc9d4c45368e5e9cf1
 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
 EBUILD minio-2018.09.01.00.38.25.ebuild 1355 BLAKE2B fc3585902532d8e1486ff3fea62d48946b3db44843a947dab27a1a77fee39830bad3d49e83996d9ca0c2c1c59fdac23d4ed7a5799d11056b588bc473f6e6524a SHA512 84f8839313af5a5a26043f9cac138e94442436e5207c94622f96aa4836ba8193bc72a096b84fd1308350014f356de92d0fd5bb7d535119e842eb147545e425ce
 EBUILD minio-2018.09.12.18.49.56.ebuild 1348 BLAKE2B d27c700e8025bbacdb36bc4c0e42e273f4846312fa8320bfdcc0c5b4e85b92dd01608d124f7b32a4f1511ec48f3247dfaf864c53693a74782b26c471f8f3b282 SHA512 00be7fc9ec88e3bc36f0de276a924dc5e4b304830b75a5bae7c4f41bd96f4ecbf2512ea20a47388db44647d7c6f20d577953158f81db7a371383df79339cb7f8
 EBUILD minio-2018.09.25.21.34.43.ebuild 1348 BLAKE2B d27c700e8025bbacdb36bc4c0e42e273f4846312fa8320bfdcc0c5b4e85b92dd01608d124f7b32a4f1511ec48f3247dfaf864c53693a74782b26c471f8f3b282 SHA512 00be7fc9ec88e3bc36f0de276a924dc5e4b304830b75a5bae7c4f41bd96f4ecbf2512ea20a47388db44647d7c6f20d577953158f81db7a371383df79339cb7f8
+EBUILD minio-2018.10.18.00.28.58.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 MISC metadata.xml 323 BLAKE2B 53e4aa74bfb7ce2ce83686b69238aa7d248c06dfdf61703b7e5d40a099d0c972492a2a6eaed91fe16914443e1dab70ebd421c4dbec06064ac72736dc381d6a7e SHA512 827c8163d2b096af06bee067f81fb16236681807b71e945427290ee9b077be0520a4d18f404a8c75eef1d49eeaa36850d2035fd1addaf42dfada0922f2eac3b4
diff --git a/net-fs/minio/minio-2018.10.18.00.28.58.ebuild b/net-fs/minio/minio-2018.10.18.00.28.58.ebuild
new file mode 100644
index 000000000000..9adcc45356de
--- /dev/null
+++ b/net-fs/minio/minio-2018.10.18.00.28.58.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="ce419c98352324caa4c79b159a9f840ca714c3d5"
+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"
+
+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-fs/samba/Manifest b/net-fs/samba/Manifest
index 8dc7b6ae78de..b856a79cc170 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -16,11 +16,11 @@ DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
 DIST samba-4.7.10.tar.gz 16911799 BLAKE2B e8ee8763c9843d048589cb17c1b78a3e3983ff8766b2981a7da0c2e6f8425a85c97f2619a9a8259a94ccd07d7aa55bb9bf928261959c04eb0b7fdfe318fc2433 SHA512 4165cf9ec1c6355d0832fb4e17939f8f1544802e6e144d51a4f6030ad54660bb468b586d3db488f5e13f3d451fe4e2af94b748d2432da62ce256eb2467d3a51c
 DIST samba-4.8.5.tar.gz 17715401 BLAKE2B fc1aef2f5362fff1870abe40eebfe932f5ca347e65d1a2502ee19c9fce8cbf71e3f4181a18056d8d6b3e92d2515f946e3dc746b00f2398d91f88b1172e91cd43 SHA512 23a88c48214c3bf4cbc135cb84873bb8d12f32187ccbda47b02495fa4a12458f103de5e968e8f9a5958c116f618332cfffbf54d084e4f1e363fbf079b897e3a0
-DIST samba-4.9.0.tar.gz 18014609 BLAKE2B d91eca23402d9e4940f806c2bf81a28d9739f9a3c054be2776c923ea75d1a837a14d932fa080bd1ef1ac07b8cab92ea4e4b652a66c645873921fffca973cf673 SHA512 436743aff6415dbdd3495dff8a5264df16833fc5678539c4294a0de755f34661b660ce7a7b4bbb02a808ff1ca046f34072a30b9e89391034f2f391d3884ea630
+DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
 DIST samba-4.9.1.tar.gz 18018259 BLAKE2B 783423098864c391f08b30e05b70308e922bdb4dad08b8b0b4d1112808357b9bb96aad7a094d0fe2e308f84a143d5f90be523b9c3551a3068ecdcad7347613f6 SHA512 267673b6d6ab0db59063480c20f02e5864ef96e9ad1097c23a99b2ab4b5fd2252193d7a152729b40cae0751fb9b0b108b087a190f5db11eabbd075224bd6e663
 EBUILD samba-4.5.16.ebuild 8166 BLAKE2B 2a0d68ff2848c1dee76d8329cab4f5a0b06bcac989b55a97bac1211f194b4c10736d8fd99eb32779c86406c8aa4c45523af34f43f70eebf928e4ceb787d374e3 SHA512 5a3e1645ec3d05ddf26e66f75cc2f43c86baad8b08e40e137919f0b33d68701cef8460fd3da3d080905af538659b834169e66cc946517ed1c9190dc52ac697d3
-EBUILD samba-4.7.10.ebuild 8790 BLAKE2B 49fe86981456c824a8182a8f1260ea4b2124870cbf53cc4b805b55085a28a2b3ec872e770474838055c393658dd1538f59456da67887a11663d77911a55440f9 SHA512 8e941b52a13cbb45928667c7e8fdb76ede7ff3f67fc69a9278c9ef88a37118f2a79da0eeb99102c86d349804e7db18dfe16782cfc798133687e99bd97401a331
-EBUILD samba-4.8.5.ebuild 8401 BLAKE2B d3883005a9911fc3fd634c6c61cba2e84e13e58295455efc436d9aea589eecb59083a80888ac76cf75b15190af41c7ffd4bedf81c047a3eac8ed868429444d16 SHA512 50ee59a96250d45e37edd78bc1f0aced43a7a4ba17438e8a7f78d4b5162837d124b5954f2c4173847f0ecceeec9286bcb08823fdb01279d02ebb756b840d4b67
-EBUILD samba-4.9.0.ebuild 8485 BLAKE2B 519d2213dde7e94c4e05f4a3fd6dbd1e3f5996c620dfc0b8f365a96288ac2d37d6ec6ffa318b1dea82f98c7d4556bcab5b7ecbf643980c9fb16fa1680feb61e0 SHA512 f8c5c70745c7f84c7cba6ca519360997ddce78593b26e541cd9b00c7104035667707808377ce69be788b3035f56d8b830f8c2cbcdfa7ccec07acd1f89a6f6628
-EBUILD samba-4.9.1.ebuild 8482 BLAKE2B e06128ad3571bc3242e2cf9e233fca32dbc97a654bac5b256ab426610a9070d7dc19db770ccae2d2241cc94acba8374d5ec6f956deee0bd54a2fa4da27924185 SHA512 c1e4cbf37be8aac9aa1c16dcc5359e4173a80812d974a77923ab78f79d04addd0e362ab233ff8e2b9ee30e738331efcfda80f0672ca0d761f3ee23142b7258b5
+EBUILD samba-4.7.10.ebuild 8797 BLAKE2B 55cd5751599f69205abb9c6db4c575db7956dad63c1c74502d2249b88c480d21011911ea8d70cc47c7eb42304b4b20c04a3b9ab3f549726633c3514476b4fa8f SHA512 4c53c7748ad3acd4f4fc687eaa9d40808f5ec1b5bb02d97df46d3517ae4727343af29cf689065c483addeca86109561696156f77cdcb7edb5a835c17c7b96f62
+EBUILD samba-4.8.5.ebuild 8408 BLAKE2B 518354a225c001dbc3153e7fcb7f071b56e78108fcee69454bc04d92ef1c43e9b16703118e5926bf7ee3a189f19f2c0a02a2e1d251e909c73b8222cf5b326136 SHA512 b169a47c7b5967988874e549566102b18794c031b353dd5f7dc6ed47f4c5cfa36b5afc236f3c95a2937af8c76206c83ed4eb4297aa7202945aee9e62eaad6abf
+EBUILD samba-4.8.6.ebuild 8398 BLAKE2B 1ef857e09c2362a517a9d17438f2e4c6274c8fa9189f1910a70ace3cba3c1259c0afeac670341cc0bc01fae30fac9d89961c6f29ae918d417db4af0c44928e93 SHA512 355d1e4e8d99c762c3114719a6f983cb879f76ad515512338327d80c2582bc1b84558dce1737b6e5b1947a5201aace0158f49a24c8d29a13d1a764502e72f4a1
+EBUILD samba-4.9.1.ebuild 8489 BLAKE2B 597bb03e025bd209f80717b558d66c2ec53ad83508cb1f1b8ad79f84614b25f339d112bd4b015b439759e2e150a4feda3f751ab26d4103825134be38a2b6ed3a SHA512 d969ba1ec0b4f5b830fb57a9a44cbe870fcaba080c5df5d9be505b39298b348036e02af12e0fdb9e3ad127712ed779fc9b9aceb5f6912c22c227fa68c681d56e
 MISC metadata.xml 1673 BLAKE2B 56bdd566235a3db45ebcbb546a11c12b035b41f54bd00df2fbb65f47ff29c7a2ab5466cdaff8fef6fd72a7b5fc9af2bac1e4050bfd6db3220c32ac383eeeeb1a SHA512 2436c4c24de5cebee90c6fb49d52dd9228a3f0deced53701d229f1afa3bb7eb29621864678325381dfacd1d221142368b27d4800ebd2412b18595ab106ddff01
diff --git a/net-fs/samba/samba-4.7.10.ebuild b/net-fs/samba/samba-4.7.10.ebuild
index 7d60b913219c..f58bdca93404 100644
--- a/net-fs/samba/samba-4.7.10.ebuild
+++ b/net-fs/samba/samba-4.7.10.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/samba/samba-4.8.5.ebuild b/net-fs/samba/samba-4.8.5.ebuild
index 0fe80b5fd005..62ea2b0c9abd 100644
--- a/net-fs/samba/samba-4.8.5.ebuild
+++ b/net-fs/samba/samba-4.8.5.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/samba/samba-4.8.6.ebuild b/net-fs/samba/samba-4.8.6.ebuild
new file mode 100644
index 000000000000..9befc0e21193
--- /dev/null
+++ b/net-fs/samba/samba-4.8.6.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.7
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python gnutls winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+	)
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.9.0.ebuild b/net-fs/samba/samba-4.9.0.ebuild
deleted file mode 100644
index c95e2c0c1bd3..000000000000
--- a/net-fs/samba/samba-4.9.0.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
-pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.4.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( virtual/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-	addc? ( python gnutls json winbind )
-	addns? ( python )
-	ads? ( acl gnutls ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	test? ( python )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json json-audit)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-	)
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.9.1.ebuild b/net-fs/samba/samba-4.9.1.ebuild
index 89382226c0f1..752d6d250598 100644
--- a/net-fs/samba/samba-4.9.1.ebuild
+++ b/net-fs/samba/samba-4.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/tahoe-lafs/Manifest b/net-fs/tahoe-lafs/Manifest
index 769ae1854850..bc1b674831bc 100644
--- a/net-fs/tahoe-lafs/Manifest
+++ b/net-fs/tahoe-lafs/Manifest
@@ -1,3 +1,3 @@
 DIST allmydata-tahoe-1.10.2.tar.bz2 1378204 BLAKE2B bfbd36861b8f868ee0bf667a5b64b1a47d7a0fb255ff19a9f5c2db020988397a8ea57c7dadfd1fb8edbb94d55e247a78a8f61d0e66af56129aea4c528b0c6c84 SHA512 79d4e3395aa7ef8e1e7c97eebdfcb75b3b36edb75aa5d5f805c568b842b9b2f4ea5f8529dbf32fbdd9cc467cf82f153aca09310bc3b69fa00efae7be8a7bc198
-EBUILD tahoe-lafs-1.10.2.ebuild 1474 BLAKE2B ffd268f2c9e8319aa6efdd9d3961641d10d15478f54ff436216083b528e68d38c32435322b2b2fb1f5865e043890b0811a2efb514271d4bad7d5886a358a3bdf SHA512 02dc2ccede27e1445878bebfce270dfb4023ae9d131121208b6136a82b8724a2557f79f2acfadf7f0e390020560bcc31bc286b9522fa95d562ec50bc8bfa84b1
+EBUILD tahoe-lafs-1.10.2.ebuild 1352 BLAKE2B 1aa21cb2629604af7dde472e0314cc27a73a3f3f82755306b2d4f1ed93e8856f0ee5551098fb5645a25fc28d0226abc3377f1fd6c0fa6069d371b1dafbb31dfa SHA512 2397c34bca1c5a47542539a6a6a5729f6c0761457594312ecaab3461705ada73bb83babcbfe641e6cf9b64984bb0ebdda78d0e18c7df7ed4953b52c1df76c1e6
 MISC metadata.xml 736 BLAKE2B 7578baf99b5e3c54252c63cbc5793397a76de9926d7f389934174ba0d48f376e447e214573cc7e745051827dfbd822a35ef631c4bdb44acb16181de6c0c43c3c SHA512 52ad1244425d834c155be80945160903a0ed07d580be29fa31414edc0e53f9271c49eb32f864d07073e6870bc8f9a30db19f270d716387e0ed2faaef5a3285e2
diff --git a/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild b/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild
index bb0f4bca8131..031d09ff8c46 100644
--- a/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild
+++ b/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
@@ -26,19 +26,19 @@ RDEPEND="
 	dev-python/nevow[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
 	dev-python/pycryptopp[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	dev-python/pyutil[${PYTHON_USEDEP}]
 	dev-python/service_identity[${PYTHON_USEDEP}]
 	dev-python/simplejson[${PYTHON_USEDEP}]
-	>=dev-python/twisted-core-13.0.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 	dev-python/zbase32[${PYTHON_USEDEP}]
 	dev-python/zfec[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	rm -r setuptools* setup.cfg || die
@@ -49,10 +49,3 @@ src_install() {
 	distutils-r1_src_install
 	use doc && dodoc -r docs/*
 }
-
-pkg_postinst() {
-	elog
-	elog "optional dependencies:"
-	elog "  dev-python/twisted-conch (for sftp access)"
-	elog
-}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 0e36a7bbbba0..05915f87e333 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 33766eee5b35..984a1d723431 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -3,12 +3,12 @@ DIST FileZilla_3.34.0_src.tar.bz2 4869893 BLAKE2B 43f017a833191126526195636607b7
 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
 DIST FileZilla_3.36.0_src.tar.bz2 4981429 BLAKE2B f297671ead361b4b1b1063bca2c78ad1e8c029f9eb3eae2a6bd4bd56c794cfb4e9b70ee4cf9addda60635e12d7e37cf42b34763316d73beab37a24ab94eb03d8 SHA512 d5c9ebd49944b3f2b55f5b494113ffde13b61f5d98e3be0507731e0dfc0d18f1f36ec5d4bf0f9ce2bbcf9d9b91b92b93b192739fb89c99c6cced80e131b58322
-DIST FileZilla_3.37.0_src.tar.bz2 4982371 BLAKE2B 9b74200ab5029f781754b1087df10c751212c8abd0f167b020cd1080158f50fa63fa0c11c5f6e1c88ac7d81da4c59a5c3ec6c90ac71a3b83031854b024332970 SHA512 3fe6df22512d6c88cea6e7fc3712fba6bb3521996078564b7a6cfe35aec7c9317a00c0dea0e9e55ace8f1a51fb351bd40afb2606f788a1b5f168011f84b8d672
 DIST FileZilla_3.37.1_src.tar.bz2 4981676 BLAKE2B 984cd603ccf7990380accc3301cc794873dd76c9360afe7393aba9153a124805f21f41148356bfb9012d28329c48bb0e1ce378cb81477b4be22522b0daf53646 SHA512 eb333c9bcf812f0aa6e299432b5df10930d0d764ac101e4a08c4eceffc3b08d34c5d193caa626d2ebb62c9ecb0ea2bb59c1ed5d90ff1b47f34e1741a788e9ab9
+DIST FileZilla_3.37.4_src.tar.bz2 4983335 BLAKE2B 16929caca3aabfdea406469a4128878f3cc48b347084d5d362ad206a7549be129195e8f111324b259e64d8e9324d9decd4bb51d088367fcaa560ec1feeb03570 SHA512 3f6697fd411b898f0db375bba7e6a34157c73274ee463832c38a4897240d990654c447baad8b0024492cb882106e7e63757d54401c487cfad96038d1f5eabfea
 EBUILD filezilla-3.34.0.ebuild 1803 BLAKE2B c04510be956992888544049b5b6c837c377f72b695fb5800471c6f727b1a9c2926aef3db754846bcff850e7cfb3ea5a4c505272b76aaa35be19ec940cbf13561 SHA512 fd8e85a7b5d9755bab0379ed38a79750d0b9baf4b0a244779e0c49f72df566cefb14bea83eb00c20ff1bb9ad3f318c680b94c73fc5222025e25c6f1a40e5ec7e
 EBUILD filezilla-3.35.1.ebuild 1805 BLAKE2B 2630f6ea5376235b2cb3d842ac95446e0c80e3646f4510b55a9413583cd9060aaf4bdbac4b83ba027c1081fc7b5802c21889f6d24cee49712ba9683754e51bce SHA512 9f225e9c755485dea83b21d97e7be035d2db284e883415069cd5b38a63bcbcda19ce7aad670fa43970d3e93e0b03534b6d4a887ed0582a04b5f22156630d37cc
 EBUILD filezilla-3.35.2-r1.ebuild 1792 BLAKE2B 4752154db30ce86b898d543438e049cf19a8d347c84576eeaa30e341027cc4511b5556109c4220b88867c298883039f5cbfdf4f1a4a5389ff755408834adef69 SHA512 523a6202e22abbe2e5203bdc0e778b02a2118981eb5720e7ef4af7958159eeee59a74ece39615ebcb2301b09ca207c96056ee3531a4dd81bf767a9c579e4b802
 EBUILD filezilla-3.36.0.ebuild 1776 BLAKE2B 50665257d912c1242d41f64f030db667fd1adc1f54c1178486758ee2f8bde72baf8ba87213d75bb6216d02254a77442680f6d9668923350c4115b0e647ef74de SHA512 5d26cf0646a8b452fb4477ea7b7e1a286129013492cffaf012a5f428e47485db55a8ad89dacbad51628481f1e698a915188c2eb061088011c0d755955c9bdc8b
-EBUILD filezilla-3.37.0.ebuild 1776 BLAKE2B 3efe8ef2e7331f6e6ba0e86a4a732e8c9af19274db005f1ff5d747eddd64a3f61c7661a5b8d96ed8df26bc5d8b7c6864d50983c780e3e1407f2a5a0b18ed9e11 SHA512 ac7678328203377dc5d619148970b47830cd1638e36e20f6b963919f645cf801ac3ec4d8481d02122fdb7342ac238539f26e2f210634724f8ac479cd81b2f67d
 EBUILD filezilla-3.37.1.ebuild 1773 BLAKE2B dad1a0f9bb0d1f2fee8ffcd6c3f458b1b5a993eddb1df6b3f71e42025d1f21384feb91a4bf4255e10e5fe18c2ba318c6c5748f7ebe222d0d008746f024edcea3 SHA512 318cd19dd315f958c032720b97d16d47f2317e5932cdb951bc52a62d9b622cf0f55e69056f1c7f8b496b786b48829283acf4a8627041b61aa0756ebec314045c
+EBUILD filezilla-3.37.4.ebuild 1773 BLAKE2B f4047b62f61357055ef3dd02bb1c86c73e8813ba9fd1af34dc605b9925aeaff810d61c920672ce614174cae80ba3366b0d6cc8db3872227f3d2b0ae4c34211b3 SHA512 99bbd32e2a1c4f2944dbbe15b21b0ca6e572614e536270763de8b1bb863bafd333c7865df4282171b15adfe5e4e8421e8ce59dfd63e36d3bdba65d8799674265
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.37.0.ebuild b/net-ftp/filezilla/filezilla-3.37.0.ebuild
deleted file mode 100644
index 415759411030..000000000000
--- a/net-ftp/filezilla/filezilla-3.37.0.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
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic gnome2-utils 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://download.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.1
-	>=dev-libs/pugixml-1.7
-	>=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/filezilla/filezilla-3.37.4.ebuild b/net-ftp/filezilla/filezilla-3.37.4.ebuild
new file mode 100644
index 000000000000..85ff00f6e5bd
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.37.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic gnome2-utils 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://download.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.14.0
+	>=dev-libs/pugixml-1.7
+	>=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-im/Manifest.gz b/net-im/Manifest.gz
index a581f620cf4a..d8fec81ca297 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index a7ca2febd9e8..962671c5dfab 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -7,5 +7,5 @@ DIST pidgin-2.12.0.tar.bz2 9270704 BLAKE2B d12b84c4ff94e4dec67bf5e13607510a4ccd5
 DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
 EBUILD pidgin-2.12.0.ebuild 7505 BLAKE2B 39b377538424788b9b48168c30f651d3cb48ccf860d1d973d5de16b1141bac7108e7b1cbc65d5803f25b6370f57f6ad6cc83b6b90b68060c536b67c2c1f320b1 SHA512 984d41160dbc18272dd1bffc99aee0d756722f5c8a0d666cac21d99cfe5cb642481e20f62cd5c43454049194797bb60dd92697fa28c1036d6accc0f73fe70704
-EBUILD pidgin-2.13.0.ebuild 7701 BLAKE2B 4ff3f7c783c845ef1e34275c9e1cd4ca83ff4061487faf7e2a5e0528ebd589743f488262ac091aacb6713219157ccd320102118157bc17e36ff4467ccb2aaa90 SHA512 10833787f051632aaff15d717d1fea2fbd6d0d4880d2250c01d9f7d6ed1aa39fc31d4f7f98514b5922fe441dbc4e293bd38b769670150613f709d27845a50bc6
+EBUILD pidgin-2.13.0.ebuild 7699 BLAKE2B 31b194e18d76d1955635a3a9538426d5e28a448c2bae002cc0be7831366fe35bdcf19ad6a4ea9f910a91251e32e4e3fb5c21d2654c81150c874fdb311052e34d SHA512 973103813435d0b1117914f41ae5478ac5204b627a4654293c9d074b74731a6e2da554a86782b82fdecc4af48b8a80d499001d1129bac9b728e734250d0dce17
 MISC metadata.xml 1480 BLAKE2B 09a69fc87ec34ef69c1862ba62eefabdde0cc806e47e005d2e13cfd639c6cd0d7f7ec6ac5e9a9d2b438c29d98caaf613b472e41ede2cef93de303da15c553e43 SHA512 de9430a267c6d93ec7a922f7ee447e36c2008cc37931896513398ae3f32af7e2a08ebb2ff7f9fb254c7facbf1ee5a4959e562e2fccd6bd85595f3d9b1d0e1e00
diff --git a/net-im/pidgin/pidgin-2.13.0.ebuild b/net-im/pidgin/pidgin-2.13.0.ebuild
index 773bcebb6445..66afe43f5bd2 100644
--- a/net-im/pidgin/pidgin-2.13.0.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie"
 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index 245719d4401c..0e200845967c 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,4 +1,4 @@
 DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c
-EBUILD qtox-1.16.3.ebuild 1601 BLAKE2B 39f628a635d0c60c77056b7c16b64a4b1acadaa57b53d3c1d89f797c34a835a3bcc99c3fcb3ae3a1a977384f04173ff9314429e88c85ff427fc7f275f2a7bb42 SHA512 ef639dc5d0fc091964ead6968aed305e9f2db2d36119e4a10509191221e358dace817334d099c7b237bed0e268c6a69bbb0808827b90b47814244d8d3b043535
-EBUILD qtox-9999.ebuild 1498 BLAKE2B 046649895dcc7f10234d75e5ad9325dfb32035f2a6b2b523f686e06b5997051f00987b3035a6a38a4821d495ae32be6daacd0b9f278fc9b36469dae94e6a3911 SHA512 38af4bca3fb5ef242dcfae483d4b71ed007338b0c05f410fa7b990103a91e5a248a59a5fd03fd80f5e13e91a5d1f83674e1417340c1c109f619607390fe608a4
+EBUILD qtox-1.16.3.ebuild 1603 BLAKE2B 2156be2a355c03cade73132a487c3f4eeff005100019a530d6affdc73898dec6d69c2d4459b3c261051e49023ec545c39f87832362b28c138d3baa3e2dcddd8f SHA512 2940bf7fc4196746012f5cdf06081b7e607a131d5c110a6cb6501f135fea90be4e7ed6c59ef0550d012cc68ac9b85b79cea9692b22c1d9e488512f72ec1c8235
+EBUILD qtox-9999.ebuild 1520 BLAKE2B d220d89d4416624847318f8d7b696d02d02aff359676e37f011370b75b016f308e5d11d847f17f5f8c8828eb8d44be4530da03576815ee3130627333e126f01d SHA512 2ffcfce9fadd289f12ebc13173ea9ea6315a9c0a7e6fcf6b7dd6b62afeda1c1ddcf4363078fc413aeaf6a940792248ec13484b6dab7aaa90e22c03476003ee05
 MISC metadata.xml 387 BLAKE2B 16f71b094c5fcef1b3c0b3b7bb6bc962c9d7b332604d0c0d30676992b8ed0586b47d9b51470e41b5cd6c305895072661f8d7939ab90b780c28af460a80f660a5 SHA512 d941cb804aaf0f9d03fa699b0080b03afba798c5146ba21597349e65dc79c9c6a02fc23aec2db19403a19d906db3be55c56e5b8f4337a6871eb19ce3cecfe5cb
diff --git a/net-im/qtox/qtox-1.16.3.ebuild b/net-im/qtox/qtox-1.16.3.ebuild
index 0f7b98649ed2..028c8cdda832 100644
--- a/net-im/qtox/qtox-1.16.3.ebuild
+++ b/net-im/qtox/qtox-1.16.3.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	media-gfx/qrencode:=
-	media-libs/libexif
+	media-libs/libexif:=
 	media-libs/openal
 	>=media-video/ffmpeg-2.6.3:=[webp,v4l]
 	net-libs/tox:0/0.2[av]
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index 3ad3165b1bc9..24ca529bcbea 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	media-gfx/qrencode:=
+	media-libs/libexif:=
 	media-libs/openal
 	>=media-video/ffmpeg-2.6.3:=[webp,v4l]
 	net-libs/tox:0/0.2[av]
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index ffb5eabe3004..77565dc586ae 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.16.2_amd64.deb 72168974 BLAKE2B 2b55f94c9c66b8b19560c4fc95f20d25e44a02862335e9600a0065fa9b068a582560cb067af68a3f7825339485ef2687321d89d6cf0df308f9210561fea99266 SHA512 50cb5e7ef72ee344e09a38015b0eef87e373214202b68fa2db3809d97b1782b5e8d86d7d8adf0d38460a39ad1e1ed1ef9f50c569238af8112ce0fc5c3d28b236
-EBUILD signal-desktop-bin-1.16.2.ebuild 1360 BLAKE2B ecd87ec34c6aa4ab4a3d1fd4a749b54c3edf77619ca76af40f387277c854de6bebb109968a2fcb50108f457790c5f3f05ddd652f6358cedc7836476974a1f258 SHA512 e6087f261b262e2a8fbd5310bdc60a0b77786475ce5cd2eeeaeb62c50a732300866de8655d2060485cd0db9fc02e6dbafab80bc841b7cb6349189099fdebd02e
+DIST signal-desktop_1.16.3_amd64.deb 72171054 BLAKE2B b488ba95dcd26b87582c41cc51433b46ab9dcfcce4cbe002c87e9cee5b5d07c554093aab5b9b2cae42621bcaa8c63ae2d39e4f362a77f5292bc9786b1d76e920 SHA512 62bd8b6608c48b8a57471fd9aa5d2662634697aae7e9244c841d729fe8c25f18a2362593fcc522d97adce894209c4dac9379facd1b58b1dd380bb061cd08c4a6
+EBUILD signal-desktop-bin-1.16.3.ebuild 1357 BLAKE2B 509b1674cbd0bb0bc6cab228c839b3b33d380c00c378a832fc0966cfd7a5051095a1ac5908b3796fa3d261f14d44ab8da1e256d98f57de0630dbd420b2e35b00 SHA512 9938eb393fbbedb8568159cf252aa7c8f0073d373e4f092840c874774f8a660fd76e955e5db59d0b9f25aefa047512f522200d2cf3f8e8bbb4729d5c470af7c3
 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.16.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.16.2.ebuild
deleted file mode 100644
index e9c70cc55979..000000000000
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.16.2.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
-
-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=""
-
-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
-	unpack usr/share/doc/signal-desktop/changelog.gz
-}
-
-src_install() {
-	insinto /
-	dodoc changelog
-	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.16.3.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.16.3.ebuild
new file mode 100644
index 000000000000..e4a362f0ca50
--- /dev/null
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.16.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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=""
+
+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
+	unpack usr/share/doc/signal-desktop/changelog.gz
+}
+
+src_install() {
+	insinto /
+	dodoc changelog
+	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 049332aab48a..fb5f01f87d94 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,7 +1,3 @@
-DIST skypeforlinux_8.29.0.41-1.x86_64.rpm 95818619 BLAKE2B c1a291290bd4b92c51aad86ad814f17e4f4ea22d61e03402089f7089a38a78d35d1388f168e6f07e3ea154bc13de59963d03318500143347ee3974e25ad37fd9 SHA512 3d3a97193adb718d3e4eb7b15d0d9030a711849eab55cd1b2550beeb0c90d14d803603fb8b0f6612d8737da4c7a6a98ba54c472d537c46cb4cf93539191c8eb7
-DIST skypeforlinux_8.29.0.50-1.x86_64.rpm 95818686 BLAKE2B 6f3e65b558b0a79aa7a0fb3741299f396fe3420a82fce461756faa5bd9063fd38945b5935057fb5f6a0ff3b54a2a07adca026114caca4003d2ae1eca8b16d0df SHA512 f4cdf5376bb21a65f8fb7516be45ac6dfd0b98439c1eabbe491928d356cce0f7b3488ee2056e65c9be1fd9c53d3bb7c6c3f980562b10341d63cee9d3377b3e2b
-DIST skypeforlinux_8.30.0.50-1.x86_64.rpm 96093210 BLAKE2B f7807c3334c93864378245d004c3186dabf3fb224958e8cabfba5e6f3e26b07f32550752d7e50d13ea5af719d33d4c0ba2a1e6d52b6fdbfb307200438a9f0236 SHA512 c8eb4010d7c5162de21edceb6f4b2b5a6390305fdb3f2d1b28658ab869cbc749b8978906cfa7c5e72d37321500d7ebf5394a8f4283307aa464d459465d848f09
-EBUILD skypeforlinux-8.29.0.41.ebuild 3679 BLAKE2B 6b98754fa280237e7282a69292efb1aeccc7838847c74fb2cef6b7a0966e5b1f8cf55cf782c58bb1c421b60c85779c3c0344655f5b9ef3f62c9557e31f162ec0 SHA512 a670fd3d915bca1e9ce0e8585bf87cc9dd1c24858d2d48e979ab9f57ba1e5539bc29edf3e502b4fbd93389347f5b152909e3f9eadd438e656ac4094b94adf116
-EBUILD skypeforlinux-8.29.0.50.ebuild 3679 BLAKE2B 6b98754fa280237e7282a69292efb1aeccc7838847c74fb2cef6b7a0966e5b1f8cf55cf782c58bb1c421b60c85779c3c0344655f5b9ef3f62c9557e31f162ec0 SHA512 a670fd3d915bca1e9ce0e8585bf87cc9dd1c24858d2d48e979ab9f57ba1e5539bc29edf3e502b4fbd93389347f5b152909e3f9eadd438e656ac4094b94adf116
-EBUILD skypeforlinux-8.30.0.50.ebuild 3679 BLAKE2B 6b98754fa280237e7282a69292efb1aeccc7838847c74fb2cef6b7a0966e5b1f8cf55cf782c58bb1c421b60c85779c3c0344655f5b9ef3f62c9557e31f162ec0 SHA512 a670fd3d915bca1e9ce0e8585bf87cc9dd1c24858d2d48e979ab9f57ba1e5539bc29edf3e502b4fbd93389347f5b152909e3f9eadd438e656ac4094b94adf116
-MISC metadata.xml 684 BLAKE2B 90b427ff6ed13fb5046a188fc8476d45989bdb717c1a930e81270164d72b565942ecfd4f08821bcf265ef17fa79f515c205b314abd21b2e7335387ab10e7f93a SHA512 8a7481d0a0b8d453f7748491ebf12d34e1deeb2f0bfc618e27e15a1029bf04814afadc3ca169c12f1e7d199ec0deebcdf6369ccc6c6a41a2add78209c257f8c6
+DIST skypeforlinux_8.32.0.44-1.x86_64.rpm 96123759 BLAKE2B c362d1eaf2013514899225150cd47c1d0949d26dcefde58c6b2c14546aa8c56a1a4a5131996cb01115b77ae61afc3651ceabc58649c03ab058fdc208c3e51d3d SHA512 a51fdb7362f7b2e45a29869c18d3ae4475f9bfdc824e1b2862979e0c6a14378971c288bd48bcac09eeeaf532059975c615ed9504ee290ef1a1c32b431a75d6de
+EBUILD skypeforlinux-8.32.0.44.ebuild 3638 BLAKE2B dbedf4675d7c9958a2e7ae573633443c930e4758905f532691e50097345c72bfdd0b5d0aba20b70af6b9ea928d4ae8ef78390c4031aca4b58370394451b95cfe SHA512 b70a8a3914c8074c3c10286456c011e501e1b4d41e7cba3d440aefaebd1cf7c4a59a5c2c6ca339c0b4199677fb2d5d1d6cda062acb43132cadcc6cdeb84d0aa0
+MISC metadata.xml 678 BLAKE2B 08cae428a7267eb18dd5bbb460dcb617a8eaaf33ccce7229f90e3031f526125922b84d445577e91620e01ccaf789109c331bb11a03362cec9c15ad85162f4b43 SHA512 5372348bd01b1e828c29866180e85e9230ade0aa36f23bfcc89fb10dbf7f1b92530ac00c9dd0fe9977061a660abf9780ab2e59069db2115fb2dacbc5e3ffd26a
diff --git a/net-im/skypeforlinux/metadata.xml b/net-im/skypeforlinux/metadata.xml
index 434173bea000..01552bdd48c1 100644
--- a/net-im/skypeforlinux/metadata.xml
+++ b/net-im/skypeforlinux/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>krlgrudzinski@gmail.com</email>
-		<name>Karol Grudziński</name>
+		<email>onigino@protonmail.com</email>
+		<name>Gino McCarty</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/net-im/skypeforlinux/skypeforlinux-8.29.0.41.ebuild b/net-im/skypeforlinux/skypeforlinux-8.29.0.41.ebuild
deleted file mode 100644
index fe787944cfb9..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.29.0.41.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 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-im/skypeforlinux/skypeforlinux-8.29.0.50.ebuild b/net-im/skypeforlinux/skypeforlinux-8.29.0.50.ebuild
deleted file mode 100644
index fe787944cfb9..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.29.0.50.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 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-im/skypeforlinux/skypeforlinux-8.30.0.50.ebuild b/net-im/skypeforlinux/skypeforlinux-8.30.0.50.ebuild
deleted file mode 100644
index fe787944cfb9..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.30.0.50.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 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-im/skypeforlinux/skypeforlinux-8.32.0.44.ebuild b/net-im/skypeforlinux/skypeforlinux-8.32.0.44.ebuild
new file mode 100644
index 000000000000..18c49c0454ad
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.32.0.44.ebuild
@@ -0,0 +1,115 @@
+# 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="
+	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/slack-bin/Manifest b/net-im/slack-bin/Manifest
index b796cf937d72..3dd74fa1ac8d 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -1,10 +1,10 @@
 DIST slack-desktop-2.1.2-amd64.deb 46460486 BLAKE2B c6478764d3bd49745f9626d85287489fd58345b1315e41fdb1bfa9b93e4201aeeb2a22678e79f584c3da26d090136c1b8b18e449b518a69a0291072b5fc05089 SHA512 b23ccee498c2c6d043bdb4632b1b2755b3f0a96a1d78338020fb4221c49b7feeb437cc358abcf285e0f0a0f7b57f4db6792b2baa8b339596a287f1272ed12284
 DIST slack-desktop-2.1.2-i386.deb 42997902 BLAKE2B e5b3375efbe00d31e34c900aedde4c6c19b0e6a550d9db6155d9f8333c9d6db241da60e9b711eee7dbf6cf89d5ac4b84050c9e89c490172b7db205f38981dca3 SHA512 6b68123d3c85687043e886974449fe424af267c326ffc869d03d911ae5d0f30f5081b611e136bc4f832da8d555b2851a4c093df9c8be2de98235ebcd03528d8c
 DIST slack-desktop-3.1.1-amd64.deb 60320286 BLAKE2B 3054e8283b41d5b8b45323131b2a85800ba8b8e24e0b80aa0eff0c0152c7cad0a2914bf64a6b83621cf6c9ad52b9bf26c0d113cf5867d4c3f2e7d6129d4d27ae SHA512 06f209b07d1bbbadede592f4e63da7c53436ecc821585448269d4eda16ad0bdf8355ac46e508741150fae6dc883c90563509361f47dd02fda2f15b2829dda309
-DIST slack-desktop-3.2.1-amd64.deb 57873452 BLAKE2B 6445aabf6512c218779e769a05069ff29292ef31dd9f4e109f1d0044f3db117db86b2dfb86d6ce00c36933c763c2e4d4874f27f4c7cdd8a10837cd1ffd1228f1 SHA512 ba08afefc8383cfc46198a64de1278a924a6e3552057484cdb8823fbbb38861f4b6b457be44ffb7913c968e5d5d6e88893636ebecdd0a0a979a2f3639220333e
 DIST slack-desktop-3.3.1-amd64.deb 54172074 BLAKE2B 88402ce58e02e20a2c5a90358b979bb4acc0409eb32da87a517ebd8631be88e716033d3047a98462c50e8d31f177bae9bfe3e25404a7d3add320c157b381569b SHA512 9b284ba60c1a9dd9fbd489d34438dc343b5cf6d458ef7968a2d7bd65514f24c9a21f0824771ebffbf23c877fc191be19602e62ac5bcf8543e78156ba95c575f6
+DIST slack-desktop-3.3.3-amd64.deb 54203216 BLAKE2B 93f72a2a7ead75682b9ef9bd9f9b5ec19a5954d20e4ef3da214154eb53fd21533fac4e07893d883b7f9a51fd3af4e53f4b7102a0bee060d23f98b15bbc9207e9 SHA512 bb773ddc9cb13f520143412f73d47e308410d861fa63ca13a986d2c390900c59827b2cca6c55175a2778b341c534b0aab49841a4506f63d11359cada57473b67
 EBUILD slack-bin-2.1.2.ebuild 1769 BLAKE2B c667beab3b7754601efcce865265974c3c959189b41465b055ebe8402e9369009d1a1abc486422c6267e49737e5bf51ec8608cdca74b8e20e59ccc88d8b9c7d0 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b
 EBUILD slack-bin-3.1.1.ebuild 2734 BLAKE2B ae5cc6577c753a17c500e0d4cc873681f796abbff13f3586e4d1992b12c26a543a45d85657c120b171ade707f7bee9f1e2a8672528a5d4649f3e857e996a05c7 SHA512 90d8985fe16e357439b35f98138c635a4dc4f5bc550c0ae7992bda69e64198f1fae15770193382ba7bb5005ef4a79f19c9a667c503d921faa5a14d2224597fd9
-EBUILD slack-bin-3.2.1.ebuild 2734 BLAKE2B 078bc57225af42bb4a368aa3f2842119dbfa9919bbe31625b8aeaf39a09c39be01a90761af03cbd507ba038c14184661465cd0fe6eea60a717e17ac11320c5d9 SHA512 f7b7f996abaa7607937d028277e876b82b701982eea636202fdd4921ef2d921f6ae022fd69d3fc8ee3de8cf7bbc9c2e4c11a724f929551dc2931da20db03fd22
 EBUILD slack-bin-3.3.1.ebuild 2734 BLAKE2B 078bc57225af42bb4a368aa3f2842119dbfa9919bbe31625b8aeaf39a09c39be01a90761af03cbd507ba038c14184661465cd0fe6eea60a717e17ac11320c5d9 SHA512 f7b7f996abaa7607937d028277e876b82b701982eea636202fdd4921ef2d921f6ae022fd69d3fc8ee3de8cf7bbc9c2e4c11a724f929551dc2931da20db03fd22
+EBUILD slack-bin-3.3.3.ebuild 2731 BLAKE2B 257db9d33b821e42d166da5afdaa67829f3ac5fca364689123d2a14e81cf5464e7118e5c93ae4ce8d8d87b42bab422165f5729b787597b605c635f89a08b987e SHA512 0b4e895c465badb3b386e82f29b2019afb487b47340bf5c9656d90b421c1d073d2327954efd61c4d0a33d6fd7dbdc89e7c0fb1fc70b59d8d81ffd475fbee08af
 MISC metadata.xml 770 BLAKE2B b84907f7e6edab20de957ec2ecb5e9acb2c3167095b0a89bd41e00187d47defe6e2737324ca4b7ac2b01c16f5e12db118889bccdf3dd8b17a4ebc50b84be97e2 SHA512 6dba8262370ebbfceee5a9b8c26eca95b11271c74490ece09cec90a698d614902cec29104695692508a2d6b30a87efb1b82d44bef2edef828e26634c06aa6828
diff --git a/net-im/slack-bin/slack-bin-3.2.1.ebuild b/net-im/slack-bin/slack-bin-3.2.1.ebuild
deleted file mode 100644
index 450982ce199c..000000000000
--- a/net-im/slack-bin/slack-bin-3.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
-
-MY_PN="${PN/-bin/}"
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop gnome2-utils multilib-build pax-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE="ayatana gnome-keyring pax_kernel"
-RESTRICT="bindist mirror"
-
-RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	net-misc/curl:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libXi:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
-	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	if use ayatana ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for slack.desktop"
-	fi
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt/slack
-	doins -r usr/lib/slack/.
-	fperms +x /opt/slack/slack
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
-}
-
-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/slack-bin/slack-bin-3.3.3.ebuild b/net-im/slack-bin/slack-bin-3.3.3.ebuild
new file mode 100644
index 000000000000..9f937d1780a2
--- /dev/null
+++ b/net-im/slack-bin/slack-bin-3.3.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin/}"
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop gnome2-utils multilib-build pax-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="http://www.slack.com/"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="ayatana gnome-keyring pax_kernel"
+RESTRICT="bindist mirror"
+
+RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
+	dev-libs/expat:0[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr:0[${MULTILIB_USEDEP}]
+	dev-libs/nss:0[${MULTILIB_USEDEP}]
+	gnome-base/gconf:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	net-misc/curl:0[${MULTILIB_USEDEP}]
+	net-print/cups:0[${MULTILIB_USEDEP}]
+	sys-apps/dbus:0[${MULTILIB_USEDEP}]
+	x11-libs/cairo:0[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libX11:0[${MULTILIB_USEDEP}]
+	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
+	x11-libs/libXext:0[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
+	x11-libs/libXi:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
+	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
+	x11-libs/pango:0[${MULTILIB_USEDEP}]
+	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
+	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
+
+QA_PREBUILT="opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libnode.so
+	opt/slack/libffmpeg.so
+	opt/slack/libCallsCore.so"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	if use ayatana ; then
+		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for slack.desktop"
+	fi
+}
+
+src_install() {
+	doicon usr/share/pixmaps/slack.png
+	doicon -s 512 usr/share/pixmaps/slack.png
+	domenu usr/share/applications/slack.desktop
+
+	insinto /opt/slack
+	doins -r usr/lib/slack/.
+	fperms +x /opt/slack/slack
+	dosym ../../opt/slack/slack usr/bin/slack
+
+	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
+}
+
+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/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 3240f6e090ea..773ed2c336bf 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,8 +1,8 @@
 AUX fonts.conf 1656 BLAKE2B 551a0651aeeaf43ac955731c492232014d10cdbac7e04a0be7bb915218e1f70c4082491d5e081b3cdc4c713398119a7ce9d25c787647f521b37f00a5b16caa15 SHA512 662ad4f6b91ae4d8479ee79f298d94f7862eb71031b5aa726b89e1d1e1bc71050437af73137a3aad71236fd3535527cbc37d394300a2191bcc51ea8d075ec513
 AUX telegram-desktop-bin-r1 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
 AUX telegram-desktop-bin-r2 646 BLAKE2B 4a99820a48dee103680bd81ba738c3a56538864b44f39a950e41232a7f39d85aee69542abb2de3bdc09ce9bc00de20aa17983626ffe25ba71e53a7d25a2573c6 SHA512 56be7103c3d9aa120aa16f67e11c1600d52b69c9424f9cb88754bf2dd8b559abfa254ca60fba07d07de35c2d9375fce90fb37bb008e5cc806386df043dfab6ff
-DIST tdesktop-1.4.0.tar.gz 17318129 BLAKE2B bd77ac1c20aeb3e760294f32d8649d49740ef97aae37fabc90aee8207e87109812ce824e25b028785f4ab6fc932ed2e727022cf40a61a189e9f90eb056b0e19a SHA512 4eb123dc34edd3a47848abac66ca7c07a6bf9cf0658a9e904797ae52324f3cdcef3de9a63983f4003652c36087d4ab2e0a9fbf6c6c95b424fd68a65bd77ecadf
-DIST tsetup.1.4.0.tar.xz 34811788 BLAKE2B a46e38b8d27ce764b7e9e735809a5098456368ed747e83bc16d125d80e6b772e1fb0eeee0d6b8eab937c04148b2516d5130c365dbda7e7a05571b14137b5a9c5 SHA512 c646763d66a807ade2c5d475444ce651dfd8ff488cafc4148a9e6850485fcfa8bc41d821dea1a9a6d6d5ac8f97593f5cedefa20a533d057c40e72a497afe264c
-DIST tsetup32.1.4.0.tar.xz 37403084 BLAKE2B dd134c49da40fb25266e0bbaf5722675eea84bf760029646f0d727f6df587a789d42d40c1de1d3f8eb6a2623e5f5e569524b618df18ea48d26e0a05a1a597310 SHA512 8700221f791fa366bedbe666f8d73ec68a216db0dd0ceef43332fd4ce075897c003b069f51946e29dc1b1574dd50fdd6abb1ed491d1c09f5952d044628656a3a
-EBUILD telegram-desktop-bin-1.4.0-r1.ebuild 1981 BLAKE2B f6eb9c0679418be38ca899e4d9f958e1d745ebb684c4534586af855c5cc77b49fafd4b2f29d255337b29ca7ff965d8dd139e883a66cfda94f27d9d1f7512f5c7 SHA512 cce4faa310dcaf5d6f4be9c5118dc48d76fa1835d02d7c8c06c8a7e4f9b612ff1e31d9d6ab383a79a9516be7c57cd93925c96179531f185b02186c2991c17046
+DIST tdesktop-1.4.3.tar.gz 17341652 BLAKE2B 26bacb695bb6e5adfd9fcdb394652695b6d8300fb856caf12cb7e22dd571b370cf74d38363c7eecdd8d7bde9fc3d43a91fd08ab175c2d3406db4f8cfed8619aa SHA512 c72deb10be79221c86b84cb36cf647e69bd51f57c05ae0ab0a43a23b04829aed068536124acfafd308e2b850de64bf448eec770e1d6a5423bb4a6b4c445edb6f
+DIST tsetup.1.4.3.tar.xz 34895128 BLAKE2B efea0915fee03ff7eecd4739b4c656b7282858611c96d7a59faf8e59f94a6a6bb5e29060f280af2dee5e7f6516564268e977f1e801cce0f1bd7c6bbdf491128d SHA512 fb344584fa2ce2adb53c6377cee34d917464495aaa0aa20d80ef80071f480ea2477f5fed4d5af336e95c9999dc2f2c73d30ff72146662d076d254b23bfc57969
+DIST tsetup32.1.4.3.tar.xz 37493196 BLAKE2B 1643016dd13e4f214fbac9892c7784f6998ce5fefd50d001d38db1fbd92c2f102eadf4b7d15a46e2151eeff971b5ed70f5ac8b9476ff4d7d489ad8c0ebf95f17 SHA512 e5b321da75b15c97438d30d480ce73305d97fe3373146650f132931f0620ea75aeac369a031ed070e0695af0b85335bb605d9b8b3a8047de3d739ab08bfa8578
+EBUILD telegram-desktop-bin-1.4.3.ebuild 1980 BLAKE2B 186da1bd99b1eb42b0c76f47e5710feb2298d73cab3cc776f48d8b562557f27f4ca2fed0389ad5d5b959e4dcf7c3824489569ab1afae594f1b805c9344f16ca1 SHA512 cab58188bfcbb027cdad2347fe0c2220ddd82c2da4808cb5efcf0ab584a83b614b1c95eaa21af661f088ba3467707622995cbf767548c2b08a5845590c36e50e
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0-r1.ebuild
deleted file mode 100644
index c709f83a6719..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0-r1.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
-
-inherit desktop gnome2-utils xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
-"
-
-LICENSE="telegram"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=sys-apps/dbus-1.4.20
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-	>=media-libs/fontconfig-2.13
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN}-r2 "telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram-desktop.png
-	done
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}/
-	doins ${FILESDIR}/fonts.conf
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	einfo
-	einfo "Previous versions of ${PN} have created "
-	einfo "\"~/.local/share/applications/telegram.desktop\". These files"
-	einfo "conflict with the one shipped by portage and should be removed"
-	einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
-	einfo
-	einfo "This versions fixes fontconfig issues that have been reported"
-	einfo "by several users. However, the fix might have side-effects on"
-	einfo "non-latin fonts. If you have font issues with this version just"
-	einfo "delete \"/etc/${PN}/fonts.conf\" and leave a comment here"
-	einfo "https://bugs.gentoo.org/664872"
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.3.ebuild
new file mode 100644
index 000000000000..18ebadbaff9f
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="telegram"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=sys-apps/dbus-1.4.20
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+	>=media-libs/fontconfig-2.13
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN}-r2 "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram-desktop.png
+	done
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}/
+	doins "${FILESDIR}"/fonts.conf
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	einfo
+	einfo "Previous versions of ${PN} have created "
+	einfo "\"~/.local/share/applications/telegram.desktop\". These files"
+	einfo "conflict with the one shipped by portage and should be removed"
+	einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
+	einfo
+	einfo "This versions fixes fontconfig issues that have been reported"
+	einfo "by several users. However, the fix might have side-effects on"
+	einfo "non-latin fonts. If you have font issues with this version just"
+	einfo "delete \"/etc/${PN}/fonts.conf\" and leave a comment here"
+	einfo "https://bugs.gentoo.org/664872"
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 863b0bb00f80..0a72ad06041f 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 3fc347bba7e7..e7837a7b33a8 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -5,5 +5,5 @@ DIST eggdrop-1.6.21-patches-1.0.tar.bz2 322608 BLAKE2B 5589b4c826b6144b2c5b68df4
 DIST eggdrop-1.8.3.tar.gz 1756536 BLAKE2B c2693bc383e1d857fe784d54f34479e73902064196021788ddf21f0bb2910977c643d820d2f6b640bb459b2acbfad8158fc0b29b4d76c588dfd76fee09a6fa25 SHA512 ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3
 DIST eggdrop1.6.21.tar.bz2 999211 BLAKE2B f804ebe4f06176a6de7331d409f97ed1c3159cc32a8a06cb8c5c6e6a83bf181c7b9624a2a4aaee4d36361903a21b7ee1c052466faeebda357bb0675052e3a5da SHA512 9fd9a86c1c4b59a47a5eed4e2306e829a01bac2ad29e990ca9c0ec630d5814fd649a9216dae9ce49f734e3ac1728beb4f479ca10af583bd513f43bbbea23a653
 EBUILD eggdrop-1.6.21-r1.ebuild 2465 BLAKE2B 03701c6e050130c794db1ed6283a7088e57d54cae32cade79a3e070db13503d133a63daf444ea6046441ee407782ec21e060379906b95614e4efd03c220322de SHA512 19bdab29fa8becca0031e6156366a81b2b940da499284cfe4dfc6bfaf00a861a09aa4e5cfd4542c37f2ada8327b36800f901104d0db95cd2ec2ed0adc76dce16
-EBUILD eggdrop-1.8.3.ebuild 1718 BLAKE2B a2b4807d2dace8984f9020af5430db187d499e3bbe5dc41770108113fec48d41f56a3378268980503f6c3cacb00a8f2022d79cd925aac006cabf451cb6e5943f SHA512 01511150cfac095d7ef762a890e0dbc85d8f223346ad87f26c9828f8487a3633c1af2db85026f8ed441deaf0a0872764fdc9ca7fa06cafbc8c1ef98030588743
+EBUILD eggdrop-1.8.3.ebuild 1717 BLAKE2B b485a0aed5e0955b012cb72a4a9b0d077efe74ac5180006d4c5f6f068b5b7b05a963db1e548f8e63b17be869f5342f4d498ad02665c521f723d2f8c5338269f8 SHA512 38df420deb37f962a53795853abfdd50a83237d1220bf5b66c1c21887dbd7a61a6e62b9db6a93cf0abf0c646a09b56a50943405660021037b50579d3049ee26a
 MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708
diff --git a/net-irc/eggdrop/eggdrop-1.8.3.ebuild b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
index 3abb84aa61fa..45e57088d8b5 100644
--- a/net-irc/eggdrop/eggdrop-1.8.3.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="An IRC bot extensible with C or TCL"
 HOMEPAGE="https://www.eggheads.org/"
 SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ia64 ~mips ppc sparc x86"
+KEYWORDS="alpha ~amd64 ia64 ~mips ppc sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 07fb5c6cf296..92c140791aaa 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,8 +1,7 @@
 DIST irssi-1.0.7.tar.xz 1034188 BLAKE2B 738ac8c09bb70a1a4f2fea880cf745d38145637ba7afb02dca13be9ee8df1dc5f39eaedd9245a0511446d9ca3cac0a2729d818fa50ce8c2af1825aedc2d52e76 SHA512 f5593ffdbb15c815e1445d15379245a3dba7935a82a6caca0ca2b720e03000df06e6515f5f5d78eaec3923aafccea7396baf12ac945ecddd02664c5f10611bc5
 DIST irssi-1.1.1.tar.xz 1080992 BLAKE2B a7f7f2004958d9b71d0bba3dea2ee09ebd7f99246d9b6e950a36ae772e4e8c49e4f6be6b18b7cd05ec50397fef2b3c4d16dba41637773b149eff8f7755610df4 SHA512 b2fc0805d6213c31bc34c48237baf2e33ac509c0fa09c483fd39f1473e32eee227ff4532efc60fb495c2ec263c05290578bca7ad6d39149e0594f864da5986c0
 EBUILD irssi-1.0.7-r1.ebuild 1285 BLAKE2B 1f53752f6f47bfeebd6750603b7091ceaf1205e42fb08cb693968de1ec6e8df63a832384aca83f798e42b9a3894b8f9f495d83bbecbeeb4f2d6b509ebe86218b SHA512 86bc0b025697adc86cb4abe1bed602b1d3c5d7a3dc7cd05893a6b441b65c42af70d64ab657df1ffb1118931dffbe6712cf7dce3138e0eddac2d2d986e92620e4
-EBUILD irssi-1.0.7.ebuild 1247 BLAKE2B 7d76be7959bc79be57025d6b7219a97c9cbbd44a73cfa4cf7e47e15e5d077786f826c9caf34cdb64f998bb20abbaa2e4f45e9f1d73f31ba5ab64d1abd0a04409 SHA512 4c3a1a408c0bc2825a392abfc001b993d330ba695e586285770ba177b3f6f41eb8e826550f148f4b7323f9755f4ee572fc48a2f4ed3f17c3435bdc3671a9498a
-EBUILD irssi-1.1.1-r1.ebuild 1285 BLAKE2B 1f53752f6f47bfeebd6750603b7091ceaf1205e42fb08cb693968de1ec6e8df63a832384aca83f798e42b9a3894b8f9f495d83bbecbeeb4f2d6b509ebe86218b SHA512 86bc0b025697adc86cb4abe1bed602b1d3c5d7a3dc7cd05893a6b441b65c42af70d64ab657df1ffb1118931dffbe6712cf7dce3138e0eddac2d2d986e92620e4
-EBUILD irssi-1.1.1.ebuild 1256 BLAKE2B 443e8c17a0656108d92f747a6957c5592066a3de21ac7e1684b5f523b569828f37df772662986ca195c0a042c15aa75d9bfab62b96272371ffc295776f5a0422 SHA512 7248fcf3cf33a9603c1148fea6d97e2116b9a5f8de4f169978d933021590def7fd782f5f93014a419e31f19c92efecc046a718a64fbd729ea20ad8db7a713da2
-EBUILD irssi-9999.ebuild 1230 BLAKE2B 12e008f400099b7133c96edc8b702935b34526ff2b575aec5069532ef1acb11333dd78221a46517c9da5fa1210ef87257935387a56d3b4b4a6a498e77827ac41 SHA512 f10ba8f0ae8719c158d39eafae23b96d4105c0705f1dbe3d438d52d37959d803fdab2f196ea43215fcdbe3d67ae2dfd1851c63113c297ad6b1b87c994531cb40
+EBUILD irssi-1.0.7.ebuild 1245 BLAKE2B 32fa87796dbf411b5049432d30b90f81ff9f50e8191bdb7800226e2560c4c453d7e849860b8ceafb0f1e4c1b45f82a29fdb0e4e5e50ef5b2b0c7fb21d1c52e5c SHA512 81ddf2fc815a1233c38c0e701ab4ea3d0dd789b2fad8cc177372bbcf58e738b9d52c828ac3bf46ad6e4555a76365abe8abd32ef3c2deb27bbcd28ae14390c8e8
+EBUILD irssi-1.1.1-r1.ebuild 1274 BLAKE2B 718de0e5242f074832e73b2c3a345e75984901d94c75a5cdd45d4e0b02d46e19328df59e79b0d3982e34da6c0a5b5a8af9bdafabceb5dcc4fc0c059e012d1ef0 SHA512 1ff6aeeed105211b78be6047ad282e53fe111fe7aa52531ab26d1d740b22b1a78f96c5210b8ea7616621e56765db5dedfd7f99dd96d58c6c7be5d8a2404fed84
+EBUILD irssi-9999.ebuild 1227 BLAKE2B 05d2bdb2a2dfad06afb4951b4a489dbfc451fd97e40c6123c6b8bc8a4daa0f2a7fb772198da000da7a7db8fcc1deb59944df5742fdc773697815fd6deafbbcc3 SHA512 8bea8381bd09c5f4fc7bad261564eee950210a830f431bd3520e511f189d10fe2d4934fb4d0e0a7a5ed60049e53ffebf6ec1ba760970880988310e9dc3b5eb18
 MISC metadata.xml 631 BLAKE2B 1ed4dcb701f0884e365891d63aa8ae33d14bbc4b343703ea1ce446c3028ee115f4760fe42583c94e89f829f26dc0abf71192d216af4e6c241bc9a21ed1ab0cc6 SHA512 b3fbbd3085bf6e39d62373b9ac4eeaf423a019276d83319e2e72484763e3e1588c9060864cbb36c080847b6f46e299a17b61acfccea1dacdfdd0709f6c142543
diff --git a/net-irc/irssi/irssi-1.0.7.ebuild b/net-irc/irssi/irssi-1.0.7.ebuild
index 45a67e3e5fe2..3f6899b5e5d9 100644
--- a/net-irc/irssi/irssi-1.0.7.ebuild
+++ b/net-irc/irssi/irssi-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+perl selinux socks5 +proxy libressl"
 
 CDEPEND="
diff --git a/net-irc/irssi/irssi-1.1.1-r1.ebuild b/net-irc/irssi/irssi-1.1.1-r1.ebuild
index 5dfd52eed6e2..34f3518a7679 100644
--- a/net-irc/irssi/irssi-1.1.1-r1.ebuild
+++ b/net-irc/irssi/irssi-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+perl selinux socks5 +proxy libressl"
 
 CDEPEND="
diff --git a/net-irc/irssi/irssi-1.1.1.ebuild b/net-irc/irssi/irssi-1.1.1.ebuild
deleted file mode 100644
index 17380b8dfb18..000000000000
--- a/net-irc/irssi/irssi-1.1.1.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
-
-inherit eutils perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+perl selinux socks5 +proxy libressl"
-
-CDEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	default
-	use perl && perl_delete_localpod
-	prune_libtool_files --modules
-}
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 127644c7dd8b..615a7053a1c8 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-irc/irssistats/Manifest b/net-irc/irssistats/Manifest
index d703db8ed9ef..7ef0e4eda404 100644
--- a/net-irc/irssistats/Manifest
+++ b/net-irc/irssistats/Manifest
@@ -1,3 +1,4 @@
 DIST irssistats-0.75.tar.gz 54434 BLAKE2B 1bd35158bea9f24b8013834a876cbc3a3f285cea1802e6699f6e10af33dde1a648ec717b031819a999c0beb2cac394130da7a31b5bc877d32abb0a706142d972 SHA512 d7ac167d64c850f3803e6192f1fbf98e13cf296902b92bc3c5847f5f97a678938e7bff41b3195d2845c5ddb92f0557fea1b3a82b61d18b6a307b94ceae1c62f6
+EBUILD irssistats-0.75-r1.ebuild 574 BLAKE2B d9c49c3c008993299a2fb173748ce02f6f508281c8cb4aabf3aba14f22065d68fd7e28240fc6431a85427380fbc3b1505296af6b342ceca77739bb99a8138e3e SHA512 586f66d264675b9ad0d6e7da66054f03ae210930de956e02cce64a65a48212fd7fd010c86e035b116ee907470e7f9620a86d95a1871d6b3d833edec0a2a25dfa
 EBUILD irssistats-0.75.ebuild 622 BLAKE2B afd7a0819661ee7d80df38b8d57be616cb85c38391c604c03275aaa4415752833413862a97002b29d4fd5e6b01a82e588bf3454c9bf57a9c1e5e251c09193227 SHA512 62884d3bc57a926c148e7dfc27686098126796320cb2bcb36354784cce5b4a759fc8b78f56bf883676c735517da624dcdc798afdf6fc3ecede7e50e32cd20a8a
 MISC metadata.xml 247 BLAKE2B ad7649194ba47fd592d8a94cedd1132e472d7173de56a4e5d1b7af591a4063e27b4a196bef97c2aff4e5026ba2b22562c9d156bc93b1820b926151c205a696e6 SHA512 6b67bcfd1c47571c43f484d58c9132df98bb173dc939307124e0bacf8178a281d404b903954a5d23761a54b07123b0c0a83f999fa3cd578dcac141a5a6df661c
diff --git a/net-irc/irssistats/irssistats-0.75-r1.ebuild b/net-irc/irssistats/irssistats-0.75-r1.ebuild
new file mode 100644
index 000000000000..15a1faa17b14
--- /dev/null
+++ b/net-irc/irssistats/irssistats-0.75-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates HTML IRC stats based on irssi logs"
+HOMEPAGE="http://royale.zerezo.com/irssistats/"
+SRC_URI="http://royale.zerezo.com/irssistats/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+DEPEND="net-irc/irssi"
+
+src_compile() {
+	$(tc-getCC) -o irssistats ${CFLAGS} ${LDFLAGS} irssistats.c
+}
+
+src_install() {
+	emake \
+		PRE="${D}"/usr \
+		DOC="${D}"/usr/share/doc/${PF} \
+		install
+}
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 8bab47d92547..9722741d6b2a 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,8 +1,6 @@
-DIST kvirc-5.0_pre20180401054732.tar.gz 6040980 BLAKE2B fa023ef84f5c84e92b11ed043be0a2e52316fc92f206c41bcb7216760e0473e13e118398445137aeafd657c856cdccfa2f5202f9534904771d8a049d5139f41a SHA512 6d3a9bb06018e2d54369139bbf0a768d3c4e39754b908c1e4294c79707c8b5b751141ae10bdf8456465bd9bf6e4e426a91bc6bef5a1c3563bf32adecc10582eb
-DIST kvirc-5.0_pre20180605072059.tar.gz 6048634 BLAKE2B db2a7a5ff0fa10a1eea6f011b6ea83301d434b08ba3ee61656ddd136ca027c8ce57a2565b491a69f6f1dff138e984ba76f81dc30ed25b6a0e54bb27821448f05 SHA512 f0da384990fc4a9cdf2727abdcc68cfc9c35e925379635acf02e91dc7d83d5ed584798a3d6ac41d259724993b48a67f8bfdae5e0a8d869f0189fbec3c6a652cf
 DIST kvirc-5.0_pre20180819121252.tar.gz 6049652 BLAKE2B b4712e089a26498a7a3e4df10fe0def377814a9cc4082f55c2177da4929bc2fb02fbc947ee0603b62175a5cee657f6316ca246a275e96df71bd9d938453d4604 SHA512 de7ccb0f698488599ba3f58ca46ef2427632bdf1870d576baea8634e530cbe7654f60d4cdd58447301c4401941ef8b4e810f4d3eb4d6468a2899b80484380ea7
-EBUILD kvirc-5.0_pre20180401054732.ebuild 3837 BLAKE2B 46f2db335a4cdefd2da23c4a13be5cbe87e098450e457862d2a6017210ad3dd89cad2e82d245de5fce97f3b3209c60b21123226f0b266667f5f6e2552df5875f SHA512 2bc026d32a22d75396c4921efdcaa4e35dad27ae0cc6cde18ac965a0cabd556ef68557a691467c88b3ac637d6a1dbf6ca4f1501772255a96be6d0d0311b46175
-EBUILD kvirc-5.0_pre20180605072059.ebuild 3820 BLAKE2B ff7e9906b1239cf16c321e9ee4bcad4854671ac0c7a5a742f4b484b5079bf3c53b626980d3c0e4a08210b1a541b5aa93f61b53ec641c866325343cc41f04cde5 SHA512 79ce480e00deb9406d8416a60039e7fa4a621df2d97e4cf69b3ca9e84e2061616b605e2020bbb3e8b93a11760033e437f87232ecc6cdb18024784015dda51ae5
-EBUILD kvirc-5.0_pre20180819121252.ebuild 3822 BLAKE2B afe6090471b1c252b85dfeb45533bd338e8b2fd0306cc3505bd59e547a0e71378d5dbae59696098925d7d644f419a6a01b2f7eb5927f69ef5a248a47705dc963 SHA512 19ee1d7ddf04617955ce5d97e18312fa7b5ef6e760c3fd11f502554b35e24b1de1e4f205bed2b7d564b489538adc9ebb776064df54a7b94d53151db3a5dbcd85
-EBUILD kvirc-9999.ebuild 3759 BLAKE2B 3d8b72265f6f531fa139b64073f864efb70e0aa9725d43904e5e91dd27118917cdaa4ff775840d8f3e63dd4e00a32d060d5dc20128aeaede9b2eb8230c8d1850 SHA512 2875b8b78685e66c343213f9f82ba59107fc0082fc0fcfd410478beef315700a0cf250b1fc88212b6bfdb3d00ac3300ea835f7bc9afc5a33971acd5432eea18a
+DIST kvirc-5.0_pre20181013192652.tar.gz 5961689 BLAKE2B 9ee5536688e5e193b88e6425591d309396cd1c135622fd682fcc86e832ee72010493877d33bddd3a86bf6c18d34b252e6a4689f7001252e149eefbfd100da977 SHA512 1856f3fab772f04e01e6a367e101bdde0732c4439399f821cd50ffd4173b89de023e1da20327692387b3f002bda0f0880737a6f5f001e0112ae45e1257b0db24
+EBUILD kvirc-5.0_pre20180819121252.ebuild 3838 BLAKE2B c2bbe3f8ae2479d18b887207ab70cc2799004987052232e2e1e23674b0539fc90fdbb3854b9169d3f770561e9e75340caf280bc8515a2668d69c9b46607b6d8f SHA512 d34667e43f9efee5b9d835afb8f2aab0376d80bd9b2d4bd055b2af3886effaaf62d5ec1b98e723c318db539d1068012047b7b7ffe1d463a917ace14f96eee13d
+EBUILD kvirc-5.0_pre20181013192652.ebuild 3840 BLAKE2B 38fabc5eda639501c33dcf455936378c7418bd1d1c60662cbb65fc71881de81389afc71d6989a18e97e593ef65c795d2e947cd1b3eaa82650326a59928b696f5 SHA512 f2734739c7e64efe0adf79b6440cc31c2544a51f016cf68725494894898ee4ff13d469b5a1de76a34baaaffee0efd4980e65a7e8e78926bdb7a8c119c7525395
+EBUILD kvirc-9999.ebuild 3777 BLAKE2B 1fd03974614fb4b6c2bdec28d7a836ad8cbc242741ae143be2db1915b3f5724c5cb0f62e61ac5b55501fd1252b88f11aaff3115e5a58800bb1434d274eff8193 SHA512 e666615ce16b7a42fc9a638fe95decb92fa0a26c2abe78ed8264802123de090a46095d6770b98fa18ecd3d2e5dbae6b4187a8d4b641269713a9c6f0140a886f1
 MISC metadata.xml 618 BLAKE2B 5a6a28876a22cedbca154051a389fed0e7ef25039319786ed2303b580b1e421b648038237e0157678fb96e1b45839e725299e56584bcb770593f60f305932145 SHA512 af08ad67affb8dbe4ae6afbb2a251e5bd44e5fb30f9332dddebbb6dd504fa25b449b5b4c3a5c1f0337c6a7751b2395eb049cf94206a44cce2a7ab1df1d1b3eae
diff --git a/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild
deleted file mode 100644
index 56f9b6a0dd6c..000000000000
--- a/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild
+++ /dev/null
@@ -1,148 +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 flag-o-matic gnome2-utils python-single-r1 xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-	KVIRC_GIT_REVISION=""
-	KVIRC_GIT_SOURCES_DATE=""
-else
-	inherit vcs-snapshot
-
-	KVIRC_GIT_REVISION="e6915e5ed77aef19080aeab5ca76a61faf1d4e41"
-	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
-	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
-fi
-
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="kvirc"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:0= )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	webkit? ( dev-qt/qtwebkit:5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	gsm? ( media-sound/gsm )"
-
-DOCS=(ChangeLog doc/FAQ)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-	fi
-	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_ENV_FLAGS=yes
-		-DWANT_VERBOSE=yes
-
-		-DWANT_CRYPT=yes
-		-DWANT_DCC_VOICE=yes
-		-DWANT_IPC=yes
-		-DWANT_IPV6=yes
-		-DWANT_TRANSPARENCY=yes
-
-		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc_video)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_DOXYGEN=$(usex doc)
-		-DWANT_GETTEXT=$(usex nls)
-		-DWANT_GSM=$(usex gsm)
-		-DWANT_KDE=$(usex kde)
-		-DWANT_MEMORY_PROFILE=$(usex profile)
-		-DWANT_OGG_THEORA=$(usex theora)
-		-DWANT_OPENSSL=$(usex ssl)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
-		-DWANT_PYTHON=$(usex python)
-		-DWANT_QTDBUS=$(usex dbus)
-		-DWANT_QTWEBKIT=$(usex webkit)
-		-DWANT_SPELLCHECKER=$(usex spell)
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild
deleted file mode 100644
index 67faa87dff73..000000000000
--- a/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild
+++ /dev/null
@@ -1,148 +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 flag-o-matic gnome2-utils python-single-r1 xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-	KVIRC_GIT_REVISION=""
-	KVIRC_GIT_SOURCES_DATE=""
-else
-	inherit vcs-snapshot
-
-	KVIRC_GIT_REVISION="8db61929facd9bfed245752c538b51d0242c3e2e"
-	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
-	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
-fi
-
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="kvirc"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:0= )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	webkit? ( dev-qt/qtwebkit:5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	gsm? ( media-sound/gsm )"
-
-DOCS=()
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-	fi
-	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_ENV_FLAGS=yes
-		-DWANT_VERBOSE=yes
-
-		-DWANT_CRYPT=yes
-		-DWANT_DCC_VOICE=yes
-		-DWANT_IPC=yes
-		-DWANT_IPV6=yes
-		-DWANT_TRANSPARENCY=yes
-
-		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc_video)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_DOXYGEN=$(usex doc)
-		-DWANT_GETTEXT=$(usex nls)
-		-DWANT_GSM=$(usex gsm)
-		-DWANT_KDE=$(usex kde)
-		-DWANT_MEMORY_PROFILE=$(usex profile)
-		-DWANT_OGG_THEORA=$(usex theora)
-		-DWANT_OPENSSL=$(usex ssl)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
-		-DWANT_PYTHON=$(usex python)
-		-DWANT_QTDBUS=$(usex dbus)
-		-DWANT_QTWEBKIT=$(usex webkit)
-		-DWANT_SPELLCHECKER=$(usex spell)
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild
index 0957c93760ac..2ae7426292a4 100644
--- a/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild
+++ b/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2009-2018 Arfrever Frehtes Taifersar Arahesis
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -30,7 +30,7 @@ fi
 
 LICENSE="kvirc"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-irc/kvirc/kvirc-5.0_pre20181013192652.ebuild b/net-irc/kvirc/kvirc-5.0_pre20181013192652.ebuild
new file mode 100644
index 000000000000..a2c478a772c0
--- /dev/null
+++ b/net-irc/kvirc/kvirc-5.0_pre20181013192652.ebuild
@@ -0,0 +1,148 @@
+# Copyright 2009-2018 Arfrever Frehtes Taifersar Arahesis
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=(python2_7)
+
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE=""
+else
+	inherit vcs-snapshot
+
+	KVIRC_GIT_REVISION="c7eea2406bf70a77a127b6bf472f422f2dbd9de9"
+	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
+	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
+fi
+
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="kvirc"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	sys-libs/zlib:0=
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	audiofile? ( media-libs/audiofile )
+	dbus? ( dev-qt/qtdbus:5 )
+	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
+	kde? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/kservice:5
+		kde-frameworks/kwindowsystem:5
+		kde-frameworks/kxmlgui:5
+	)
+	perl? ( dev-lang/perl:0= )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant:0= )
+	ssl? ( dev-libs/openssl:0= )
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		media-libs/libvorbis
+	)
+	webkit? ( dev-qt/qtwebkit:5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	gsm? ( media-sound/gsm )"
+
+DOCS=()
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ "${PV}" == "9999" ]]; then
+		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
+		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
+	fi
+	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
+	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
+		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
+		-DWANT_ENV_FLAGS=yes
+		-DWANT_VERBOSE=yes
+
+		-DWANT_CRYPT=yes
+		-DWANT_DCC_VOICE=yes
+		-DWANT_IPC=yes
+		-DWANT_IPV6=yes
+		-DWANT_TRANSPARENCY=yes
+
+		-DWANT_AUDIOFILE=$(usex audiofile)
+		-DWANT_DCC_VIDEO=$(usex dcc_video)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_DOXYGEN=$(usex doc)
+		-DWANT_GETTEXT=$(usex nls)
+		-DWANT_GSM=$(usex gsm)
+		-DWANT_KDE=$(usex kde)
+		-DWANT_MEMORY_PROFILE=$(usex profile)
+		-DWANT_OGG_THEORA=$(usex theora)
+		-DWANT_OPENSSL=$(usex ssl)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PERL=$(usex perl)
+		-DWANT_PHONON=$(usex phonon)
+		-DWANT_PYTHON=$(usex python)
+		-DWANT_QTDBUS=$(usex dbus)
+		-DWANT_QTWEBKIT=$(usex webkit)
+		-DWANT_SPELLCHECKER=$(usex spell)
+
+		# COMPILE_SVG_SUPPORT not used in source code.
+		-DWANT_QTSVG=no
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index ddcaa318794f..543e5042b440 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2009-2018 Arfrever Frehtes Taifersar Arahesis
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index f25c62a9d2bb..a968aae15ebe 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,8 +4,8 @@ AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
-DIST quassel-0.13-rc1.tar.bz2 4114806 BLAKE2B 609d994c676b9e930884e738fb008a35e603e03fa0890b5119ffe91d7fbfd8d593eeefc903610309f360ca4c5cc985895e0e532c45d5eeafe1700f9de6735c9e SHA512 13cbaeae83673fc476b8e1f59ca1b6eb929b9bb6dddf15ca248d0fc9535cc8d98a02d194dc16e5c18197c9bacbe7142d1a4712d79133226f979fa9aa7a7813aa
+DIST quassel-0.13-rc2.tar.bz2 4260661 BLAKE2B 083fb6b832dc7297405fb5cb4e36b1d831ff000ef302627f798944bf242c87d4c9a78a797f0997fe1a8db9def23633af27de0c7c571c4051d039431043cb4363 SHA512 3444cf03250a1b0fd26563575e1b3fbabff382b6307e122a933b7f892250222d7277f5aaf0ceb7f53fb0924076d09a328f15e81b0fd7ff7483b54b8d0dac302c
 EBUILD quassel-0.12.5-r2.ebuild 4943 BLAKE2B 5f996b57334d498c9311e1df249fe6f6ca5703ff1b6d5cfc5d64cd82e08298a098b03f23f763f0580c8e328cea3fe49599f390476c8bf372e71d526f8ce90a32 SHA512 cda2554d2e63d4f600b82293e04dbd8e2d90be8ded0749ee95cd98c9b0363a33147b05fd05acb7b3e872742d54e9eca04daf1eed5a44d4285db815c401714255
-EBUILD quassel-0.13_rc1.ebuild 4979 BLAKE2B 6b39a3322e17ebc86a7897d8031a20385a38fa9815e458fd2297d7b10846da6b3a63b0520d20423151a7b6556de8ec8a1f39f6c09a77de088485d79854313ce8 SHA512 e2af4521ffd8f87d332ea82d66f405fa46c5ed141ecd83c930b31cffc011c922d63bc69843419e5e909e073ee48739a81b0d767fded91ba83fa1f259bad64cf0
-EBUILD quassel-9999.ebuild 4984 BLAKE2B 5c9a7134ead3008d6eefedc8007a03a216df0a49ff861c5da11f37a57e1e70fab57a8d87b8f54e1a27930202ae0d5cb2a23c53a4e4634208a899939b5d6a1519 SHA512 40d62c134fea0c93fc1f197a5f40f4333c70fa3acfd908c151fafe96e9227a0fcf2400200638029ea85e16f4c186fe2456ef555adb97aa7e3a7632dc16b981cd
+EBUILD quassel-0.13_rc2.ebuild 5038 BLAKE2B 14feb3ded40746e260a1f602fd81753442f422feef06017ac206844cf999388efcac9879567d87f3bf882797a6c1c4e524f5f21a8c00b61dfa6986a39336b876 SHA512 a581ca0cd4f3f20fb1ecc7c4c196dfb89d77af1bdd92a8673389e2b2b8d397c28f40d283da60e85983752277572b61cc8ca8b6cd08259402dc457ad0ea498f89
+EBUILD quassel-9999.ebuild 5043 BLAKE2B 5d6a0efe97940221762488df12448639fe4928e2401c583c1333c6df237d2e3ef0de84ba576e3bdc1d69e7725c34da6b1f7be91d3de09d12ed3a7b028a671434 SHA512 158bab31c9cc60aafc6e800b76a4b5deee011f0218e068a5a65214337a6af3166d14befdffe217af255b7ad29125cc76fafb0e19be4c5aeb62d2c90945a49ae7
 MISC metadata.xml 1960 BLAKE2B a7e329fb44a58cf74d1964b426cc75b7697160478d62d2c4216d93defb62fd6d9e018ab29689b7a8652571db62a2a2a00f22dda6fb697feb9a381c37cc4a6ac6 SHA512 17931d04330ce51f30dd77579ebed36c04050d150db1faa793fd65307f3808ee2cdfb807a40e3881ebd879c75a583434367e46963a90c99c1a1724659946a8ca
diff --git a/net-irc/quassel/quassel-0.13_rc1.ebuild b/net-irc/quassel/quassel-0.13_rc1.ebuild
deleted file mode 100644
index ed2efb5c8b9f..000000000000
--- a/net-irc/quassel/quassel-0.13_rc1.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 cmake-utils gnome2-utils pax-utils systemd user
-
-if [[ ${PV} != *9999* ]]; then
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
-	S="${WORKDIR}/${MY_P}"
-else
-	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
-	inherit git-r3
-fi
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
-HOMEPAGE="http://quassel-irc.org/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
-snorenotify +ssl syslog urlpreview X"
-
-SERVER_RDEPEND="
-	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 )
-"
-
-GUI_RDEPEND="
-	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] )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl?]
-	sys-libs/zlib
-	monolithic? (
-		${SERVER_RDEPEND}
-		${GUI_RDEPEND}
-	)
-	!monolithic? (
-		server? ( ${SERVER_RDEPEND} )
-		X? ( ${GUI_RDEPEND} )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
-	|| ( X server monolithic )
-	crypt? ( || ( server monolithic ) )
-	kde? ( || ( X monolithic ) dbus )
-	ldap? ( || ( server monolithic ) )
-	postgres? ( || ( server monolithic ) )
-	snorenotify? ( || ( X monolithic ) )
-	syslog? ( || ( server monolithic ) )
-"
-
-pkg_setup() {
-	if use server; then
-		QUASSEL_DIR=/var/lib/${PN}
-		QUASSEL_USER=${PN}
-		# create quassel:quassel user
-		enewgroup "${QUASSEL_USER}"
-		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT4=OFF
-		-DUSE_QT5=ON
-		-DUSE_CCACHE=OFF
-		-DCMAKE_SKIP_RPATH=ON
-		-DEMBED_DATA=OFF
-		-DWITH_WEBKIT=OFF
-		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-		$(cmake-utils_use_find_package crypt QCA2-QT5)
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		$(cmake-utils_use_find_package dbus Qt5DBus)
-		-DWITH_KDE=$(usex kde)
-		-DWITH_LDAP=$(usex ldap)
-		-DWANT_MONO=$(usex monolithic)
-		-DWITH_OXYGEN_ICONS=$(usex oxygen)
-		-DWANT_CORE=$(usex server)
-		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
-		-DWITH_WEBENGINE=$(usex urlpreview)
-		-DWANT_QTCLIENT=$(usex X)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server ; then
-		# needs PAX marking wrt bug#346255
-		pax-mark m "${ED}/usr/bin/quasselcore"
-
-		# prepare folders in /var/
-		keepdir "${QUASSEL_DIR}"
-		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
-		# init scripts & systemd unit
-		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
-		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
-		systemd_dounit "${FILESDIR}"/quasselcore.service
-
-		# logrotate
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/quassel.logrotate" quassel
-	fi
-}
-
-pkg_postinst() {
-	if use monolithic && use ssl ; then
-		elog "Information on how to enable SSL support for client/core connections"
-		elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
-	fi
-
-	if use server; then
-		einfo "If you want to generate SSL certificate remember to run:"
-		einfo "	emerge --config =${CATEGORY}/${PF}"
-	fi
-
-	if use server || use monolithic ; then
-		einfo "Quassel can use net-misc/oidentd package if installed on your system."
-		einfo "Consider installing it if you want to run quassel within identd daemon."
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
-
-pkg_config() {
-	if use server && use ssl; then
-		# generate the pem file only when it does not already exist
-		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
-			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
-			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
-				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
-				-out "${QUASSEL_DIR}/quasselCert.pem"
-			# permissions for the key
-			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
-			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
-		else
-			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
-			einfo "Remove it if you want to create new one."
-		fi
-	fi
-}
diff --git a/net-irc/quassel/quassel-0.13_rc2.ebuild b/net-irc/quassel/quassel-0.13_rc2.ebuild
new file mode 100644
index 000000000000..f6ff727068b4
--- /dev/null
+++ b/net-irc/quassel/quassel-0.13_rc2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils pax-utils systemd user
+
+if [[ ${PV} != *9999* ]]; then
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+	S="${WORKDIR}/${MY_P}"
+else
+	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+	inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="http://quassel-irc.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
+snorenotify +ssl syslog urlpreview X"
+
+SERVER_RDEPEND="
+	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 )
+"
+
+GUI_RDEPEND="
+	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] )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl?]
+	sys-libs/zlib
+	monolithic? (
+		${SERVER_RDEPEND}
+		${GUI_RDEPEND}
+	)
+	!monolithic? (
+		server? ( ${SERVER_RDEPEND} )
+		X? ( ${GUI_RDEPEND} )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="
+	|| ( X server monolithic )
+	crypt? ( || ( server monolithic ) )
+	kde? ( || ( X monolithic ) dbus )
+	ldap? ( || ( server monolithic ) )
+	postgres? ( || ( server monolithic ) )
+	snorenotify? ( || ( X monolithic ) )
+	syslog? ( || ( server monolithic ) )
+"
+
+pkg_setup() {
+	if use server; then
+		QUASSEL_DIR=/var/lib/${PN}
+		QUASSEL_USER=${PN}
+		# create quassel:quassel user
+		enewgroup "${QUASSEL_USER}"
+		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT4=OFF
+		-DUSE_QT5=ON
+		-DUSE_CCACHE=OFF
+		-DCMAKE_SKIP_RPATH=ON
+		-DEMBED_DATA=OFF
+		-DWITH_WEBKIT=OFF
+		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package dbus Qt5DBus)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_LDAP=$(usex ldap)
+		-DWANT_MONO=$(usex monolithic)
+		-DWITH_OXYGEN_ICONS=$(usex oxygen)
+		-DWANT_CORE=$(usex server)
+		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+		-DWITH_WEBENGINE=$(usex urlpreview)
+		-DWANT_QTCLIENT=$(usex X)
+	)
+
+	if use server || use monolithic; then
+		mycmakeargs+=(  $(cmake-utils_use_find_package crypt QCA2-QT5) )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server ; then
+		# needs PAX marking wrt bug#346255
+		pax-mark m "${ED}/usr/bin/quasselcore"
+
+		# prepare folders in /var/
+		keepdir "${QUASSEL_DIR}"
+		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
+
+		# init scripts & systemd unit
+		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
+
+		# logrotate
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/quassel.logrotate" quassel
+	fi
+}
+
+pkg_postinst() {
+	if use monolithic && use ssl ; then
+		elog "Information on how to enable SSL support for client/core connections"
+		elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
+	fi
+
+	if use server; then
+		einfo "If you want to generate SSL certificate remember to run:"
+		einfo "	emerge --config =${CATEGORY}/${PF}"
+	fi
+
+	if use server || use monolithic ; then
+		einfo "Quassel can use net-misc/oidentd package if installed on your system."
+		einfo "Consider installing it if you want to run quassel within identd daemon."
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
+
+pkg_config() {
+	if use server && use ssl; then
+		# generate the pem file only when it does not already exist
+		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
+			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
+				-out "${QUASSEL_DIR}/quasselCert.pem"
+			# permissions for the key
+			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
+			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+		else
+			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+			einfo "Remove it if you want to create new one."
+		fi
+	fi
+}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 5db02b583e65..e80faf93513f 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -106,7 +106,6 @@ src_configure() {
 		-DEMBED_DATA=OFF
 		-DWITH_WEBKIT=OFF
 		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-		$(cmake-utils_use_find_package crypt QCA2-QT5)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
 		$(cmake-utils_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
@@ -119,6 +118,10 @@ src_configure() {
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
+	if use server || use monolithic; then
+		mycmakeargs+=(  $(cmake-utils_use_find_package crypt QCA2-QT5) )
+	fi
+
 	cmake-utils_src_configure
 }
 
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index a6fcb4adbeb9..cfc537656d96 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,8 +1,10 @@
 AUX unrealircd-4.0.12-without-privatelibdir.patch 3050 BLAKE2B 8574bbd006253c824ef3a693248404c01ea8f3f856d0cd7d110a76664f809b7ede56181595ff5e0fba60bf738573396e64308a8f31bf762ef28d23177726b4d7 SHA512 f9bba46daa399bbcebc4b89ed129b270c1eaad3a7e2c573d20567b055fffd8185a987a6f394b35cb0f9e95288aacb73c201e9162b940fccf170c51e04bc72be7
 AUX unrealircd.confd-r1 1221 BLAKE2B 65c29bce13d54a3d87c89ff4fe124172a8237640c9cde8a7566a8e88e5dfd51099bfc1991779bd2b0f9770f065782a52505c7ba2b45efb2d02bfacbf89d3a9b4 SHA512 add347151035f8bef7fa77d8b675563c5308e39a7e1f6ce9c044fa1e38c5d2e662327d90b91fe9bb7e23fed3337db9c497c7275688048cbd12116f98e43ba94d
 AUX unrealircd.confd-r2 1366 BLAKE2B 093a1f6fbdf2015d170c0244d9870ca415b4f0e5b57d2bcd14539d901c45de3f0d66de6ff57fb6aaa0f0128f998516616418e0636fe177e31bd6bc949b70c5fc SHA512 7282da5b2d07e139bd579ce0012dd4a02b02b88e8f12bdf83e6742f8d221ee78568c5652933a065642561fca5902b256b10c61d5add3e4c587d4b4ac089751a4
+AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd 1139 BLAKE2B 8d401a42efe11a464e6b3cf482e44fa86ce66b71dcd68eebf7d49b1ac35d97f07afe35e28ff5ff316e989f5f9b4234a8c4d32dedd917f02418c7fae02d89ee41 SHA512 694230ad52450642d212aa88ad0d2c999a166b23bbbe44c07fd2574b29bc541cc727a75b8aeec41ca67bdb3125f04271bef9161ebaff409d161a2f47f15839da
 AUX unrealircd.initd-r1 1180 BLAKE2B bcc078dbe9d5cde47c230ba0b0d17ac3584a97a3d3b79943da2691147416179ba5ad73180b703981759d1f451577ff2f5f4738004ac7de86d80125797bc49a35 SHA512 108bfe0a79e7d25ee9d24980c9082d3ddf75d095d122576974319b68f5bebdcb088961276038ddfdb30aadbdfd5f7e247f61444675964604430c4092e517004f
+AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 DIST Unreal3.2.10.7.tar.gz 3539026 BLAKE2B a61fcd7cd4329c6b0991219a331482ca84aecfa37638762aa1c20166ab2ce0d4facb2a51b2010a9dd2fbc32278de91acaf8fd209ce5b8a2d4232dce154880904 SHA512 7d5fd4729fdde56c6b3e38a93bc365857b5b4faf58cb39e844b43e87872623abc7527025247eeda8c8535576e2b1b8ef14d482c964ce940cafb5de77cc9e1667
 DIST unrealircd-4.0.12.tar.gz 5521686 BLAKE2B d55973387f58cabd80156e1113491adec623a56d83e0043dcd89457b00cc6519ab37459eb2c0a10176b5d5bb1518a81fa288bdea43f0e4b9303f629103c5ea1d SHA512 3df18e07226673d76977771f91f0f6c2129955523f1330519e5cada7989c8987382d78770c95837d520737796cf4fa84f1de3eb0f08ef017c5c56f775cf45420
 DIST unrealircd-4.0.17.tar.gz 5325068 BLAKE2B d6d1c05234ee5921e65e0a7a4223152bd729878a5d8b40dfb4b1b2d066a891564b8cd66097e03a8a47f84878aeeadb7356ff222dd4d8efece69a9f1df5fe3542 SHA512 e02684ba7b61747f6d0edb8105c3d9cb1f383c79b9ff563b374fefe1ed5224c168d8f9e3e482a122acd7a2af12ee8595812e4c46654e651cde7115656fb3d36e
@@ -10,5 +12,6 @@ DIST unrealircd-4.0.18.tar.gz 5317767 BLAKE2B cb71144ce0fce7f719b3081f2da9f85c99
 EBUILD unrealircd-3.2.10.7.ebuild 6581 BLAKE2B c7c638865b036386c16ffb257632389e31b277bc9406ee081e7aa149b303af8ff02efcc5cbedea60eb6b7c76b5dfededae083f415dd392c022039401840fb677 SHA512 8bfbea36317e3984c4768e03f236d5a3bfbe5cc73d8d74798e80633cb9b4946489a8197bc7bacb1649f2d8cbea702c5cd6acb96645e97e89197d697f78eced89
 EBUILD unrealircd-4.0.12.ebuild 7879 BLAKE2B 272c2e142cfa449d307d48a009551e22025236eaf7c8b3c045c4e1908110a11be5add1a646b1ec83e6057e35dc75e2be1b0e8b785c912841a60c7b6dd0f1af38 SHA512 c3b1cbb3276ae0e8a5601989b3c65d49f7628926616cb0806fc8b0cc9588a942ffd3b0740bd7380f784960ed36f9ee3e0a5674d60099ef4fc8aa0963428be2fc
 EBUILD unrealircd-4.0.17.ebuild 7805 BLAKE2B a05eb46b95c093eaa26167291cd5e17c9413248e9db470ebcfd26344ad01bbeaf7c842bd71c79f12d3e2c59f8cfe9815bb62effeec2ede8960a92d94b5c0df6a SHA512 b2a7c952d9a957a77d11cabd0f72fcc29c056fcc5fa4f4f1c35e5d29237da97838c0af95b563bf89fffc2247dd808db703dce2b3429b996dd04ef8a9df444369
+EBUILD unrealircd-4.0.18-r1.ebuild 5413 BLAKE2B ee2940e61d56907d1830e0bec218d69d7ee183820ae77f5953b3a00d0e05a87186e963d51d82570455b19c84423459312ca99622bfed717569eaea27a9b29dce SHA512 135f5c9e0db38345f85f0dbe3c73feaa29516b2f5fcb06fb89df37ffbf276dbca88765200e794cd1a24482646f242440e4c8ea26efe0d645b8f873b5bb0b3bb8
 EBUILD unrealircd-4.0.18.ebuild 5413 BLAKE2B b13e7cba8238465aebb69ce2533773062cdecc01e87878c3fb11f3cb572157ac0b5dfb75b810c5fb1bd6ef28e74b663f56b95f5c3fae731f5849c4ea078e4720 SHA512 6a86677f08ad11732f74636992483e2c3c606db63263cab962c432a625811676606f58988ddff903d7f5ae48dde8d6708ea1b621f82d21f1270467a673f14470
 MISC metadata.xml 1133 BLAKE2B 28a4ad6235e9a0ec31202822149d2cdc68ddacc49130b14f960639eaed019654a0d90548201e7e312b33422762a23678f7e3e2c76cc9e004296c93309ebf3f29 SHA512 6066d46bce08535445ff400ded0a93ca6a0bb879771a512e05bc896a85ebaf98a0b80875f3cc4bac5eddb99c28bb7c855da0f577d603fb39d61e517ef69373a7
diff --git a/net-irc/unrealircd/files/unrealircd.confd-r3 b/net-irc/unrealircd/files/unrealircd.confd-r3
new file mode 100644
index 000000000000..66d9878f014c
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.confd-r3
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Which configuration file to load instead of unrealircd.conf. If you
+# want to run multiple instances of unrealircd, you must edit
+# files::pidfile to match UNREALIRCD_PIDFILE. You should also ensure
+# that files::tunefile is different for each unrealircd instance. See
+# https://www.unrealircd.org/docs/Configuration#Files_block
+#
+# To support multiple instances of unrealircd, you may create symlinks
+# in /etc/init.d pointing to /etc/init.d/unrealircd. It is recommended
+# that the scheme unrealircd.${instance_name} be used. For each
+# instance, you may make a copy of this file with the appropriate name
+# to override default options specific to that instance.
+UNREALIRCD_CONF="/etc/unrealircd/${SVCNAME}.conf"
+
+# The path where unrealircd is configured to create its pidfile.
+UNREALIRCD_PIDFILE="/run/unrealircd/${SVCNAME#unreal}.pid"
+
+# extra options to pass to unrealircd ...
+# You should not specify the -f option here; use
+# UNREALIRCD_CONF instead.
+#
+# [-h servername]
+# [-p portnumber]
+# [-x loglevel]
+# [-t] (to enable debug output)
+UNREALIRCD_OPTS=""
+
+# Extra flags to pass to start-stop-daemon. When initially
+# debugging, removing --quiet may help.
+UNREALIRCD_SSD_OPTS="--quiet"
diff --git a/net-irc/unrealircd/files/unrealircd.initd-r2 b/net-irc/unrealircd/files/unrealircd.initd-r2
new file mode 100644
index 000000000000..7d733a6e185a
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.initd-r2
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Defaults
+: ${UNREALIRCD_CONF:=/etc/unrealircd/${SVCNAME}.conf}
+: ${UNREALIRCD_PIDFILE:=/run/unrealircd/${SVCNAME#unreal}.pid}
+
+command="/usr/bin/unrealircd"
+# Run the daemon in the foreground and let OpenRC background it.
+# This way the PID file is created securely, as root.
+command_args="-F -f ${UNREALIRCD_CONF} ${UNREALIRCD_OPTS}"
+command_user=unrealircd
+command_background=true
+pidfile="${UNREALIRCD_PIDFILE}"
+start_stop_daemon_args="${UNREALIRCD_SSD_OPTS}"
+extra_started_commands="reload"
+
+depend() {
+	use dns net
+	provide ircd
+}
+
+# It is unsafe for the unrealircd user to be able to write to its own
+# PID file, since root will be sending e.g. kill signals to the PID
+# listed in that file. Ensure that we overwrite the ownership and
+# permissions on /run/unrealircd from previous init scripts.
+start_pre() {
+	checkpath --directory --owner root:root --mode 0700 /run/unrealircd
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --signal HUP \
+			  --pidfile "${pidfile}" \
+			  ${UNREALIRCD_SSD_OPTS}
+	eend $?
+}
diff --git a/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild b/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
new file mode 100644
index 000000000000..5c496d96d303
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert user versionator
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/${PN}$(get_version_component_range 1)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq
+	showlistmodes shunnotices topicisnuhost +usermod"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	dev-libs/libpcre2
+	dev-libs/tre
+	>=net-dns/c-ares-1.7:=
+	sys-libs/zlib
+	curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES{,.old},tao.of.irc,technical/,translations.txt} )
+
+pkg_pretend() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		version_is_at_least 4 "${v}" && continue
+		ewarn "The configuration file format has changed since ${v}."
+		ewarn "Please be prepared to manually update them and visit:"
+		ewarn "https://www.unrealircd.org/docs/Upgrading_from_3.2.x"
+		break
+	done
+}
+
+pkg_setup() {
+	enewuser unrealircd
+}
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm -r extras || die
+
+	if use class-nofakelag; then
+		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+	# that to look for ca-certificates-provided file instead. %s is
+	# CONFDIR. #618066
+	sed -i -e 's:%s/ssl/curl-ca-bundle.crt:%s/../ssl/certs/ca-certificates.crt:' src/s_conf.c || die
+
+	eapply_user
+}
+
+src_configure() {
+	# Default value for privatelibdir adds a build path to -Wl,-rpath.
+	econf \
+		--with-bindir="${EPREFIX}"/usr/bin \
+		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
+		--with-confdir="${EPREFIX}"/etc/${PN} \
+		--with-datadir="${EPREFIX}"/var/lib/${PN} \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--without-privatelibdir \
+		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+		--with-nick-history=2000 \
+		--with-sendq=3000000 \
+		--with-permissions=0640 \
+		--with-fd-setsize=1024 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--with-system-tre \
+		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable prefixaq) \
+		$(use_with showlistmodes) \
+		$(use_with topicisnuhost) \
+		$(use_with shunnotices) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify) \
+		$(use_with !usermod disableusermod) \
+		$(use_with !extban-stacking disable-extendedban-stacking)
+}
+
+src_install() {
+	keepdir /var/log/${PN}
+	keepdir /var/lib/${PN}/tmp
+
+	newbin src/ircd ${PN}
+
+	(
+		cd src/modules || die
+		for subdir in $(find . -type d -print); do
+			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+				doexe "${subdir}"/*.so
+			fi
+		done
+	)
+
+	insinto /etc/${PN}
+	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+	# is redundant with app-misc/ca-certificates and examples will all
+	# be in docs anyway.
+	doins -r doc/conf/{aliases,help}
+	doins doc/conf/*.conf
+	newins doc/conf/examples/example.conf ${PN}.conf
+	keepdir /etc/${PN}/ssl
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+	# config should be read-only
+	fperms -R 0640 /etc/${PN}
+	fperms 0750 /etc/${PN}{,/aliases,/help}
+	fperms 0750 /etc/${PN}/ssl
+	# state is editable but not owned by unrealircd directly
+	fperms 0770 /var/log/${PN}
+	fperms 0770 /var/lib/${PN}{,/tmp}
+	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+}
+
+pkg_postinst() {
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if [[ ! -f "${EROOT}"etc/${PN}/ssl/server.cert.key ]]; then
+		if [[ -f "${EROOT}"etc/${PN}/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}etc/${PN} to ${EROOT}etc/${PN}/ssl."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/ssl/server.cert
+				chown unrealircd "${EROOT}"etc/${PN}/ssl/server.cert.*
+				ln -snf server.cert.key "${EROOT}"etc/${PN}/ssl/server.key.pem
+			)
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"etc/${PN}/${PN}.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can also configure ${PN} start at boot with rc-update(1)."
+	elog "It is recommended to run unrealircd as an unprivileged user."
+	elog "The provided init.d script does this for you."
+}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 3979c06ce714..19c7b1aac98b 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,11 +1,10 @@
 AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16cdb19c7c7892abd3d702c86911a2c46519b84d7d71db40d89158b3662c93327e382a342bd2146dab98f4cbaed SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790
-AUX weechat-2.1-tinfo.patch 910 BLAKE2B 706949f07bac5e191e045bc6dfbb6e6b1dc4ec2e7347ff7c3f8b3f8af67e5d50b27a31368bf3d2a143eb7b0ec0dc0902fd787d803da8b604793d2b1b912e1dee SHA512 a1df83dc71c75047a8d898401551adc727df581b6e2a0fca366b67b380e688f95a375cdd9246cc4fff7a1cce22bf50e2bc3022a843e8994f8ee8660c7be77a15
 AUX weechat-2.2-tinfo.patch 910 BLAKE2B 37a02f7c56d6bdc42c01a5a9b622c79501d4ffb73152f7eb4c14182bf507319d9667fc2b64ebe33992fe6a1a88712ee37844278c802712412048ea6d6ba9d4fe SHA512 46ea2b0b6f03c3656d062a68e2d80edd2566dd8edc7ba6f3df0f29ae3222b8c1702378ff7d3b8cbcab917ec4310b7f2699e3f0f113671af778ad1e1f681c4c52
 DIST weechat-2.0.1.tar.xz 1967336 BLAKE2B 256f4bab45834ed2798490234c9417b8b8e4d06d0ed09f5779ad9d32321ab9aec58c38f4b048de319e4f46809313186462208258ca2d78d1e0470fa2014e7472 SHA512 3947e79a0ac8dce7605905c39039bedf9ba2af4778ee6905f12ca75786b62f3081568ce9426be251e65bad2837ddcf0664cbb08059f898d4ac60171325a94e74
-DIST weechat-2.1.tar.xz 1990748 BLAKE2B 5f417e282fe0bc10f1625e16fc173c09781284c27cf321e219c73fcfb3bac4118403598d6e5d06ed9852b1bdb1e645d7f43999a113101aebe6bd626e2278b661 SHA512 4bea8c0c4467b81e2241d68e5c6425274f0fe15d853ddac46ddf3cce481e03549660d6083277719d462ec5d0dea4b31d89f6b3f51f92f12908213232d2d807df
 DIST weechat-2.2.tar.xz 2007944 BLAKE2B 2892e50fcccf64fa34e4c7bd476323ad7a98d6b5d483254ffbed659a5997d3077a7347a1a9c006f50d52daf7808fe61cf5b396416d62da7f9260f717191b2a86 SHA512 bb5103c266f6e6850250a5e0602ff26be06289ea1e13511b111f975eb492a0bbe508b2a6088b15e5bfd5278341e9dd5ee0facfb08d23ff7335c5c18bc21e4b02
+DIST weechat-2.3.tar.xz 2025652 BLAKE2B 74c5d81a77f164c51bee01ff1be5731455ad85178005a360269ffa4ac59554c58dc97175fcb3fa62841b79e7711c1dc41876a839a9d1e4a1f4ce359bac1d6689 SHA512 0de827850de5c70c528e1a8cfa44220c3d48d6767df61a8a6283123173ba63b4c8554d5334a8b14976d19602c36bbc27d89ebbd201ccd8c048d50edc3a4ea19b
 EBUILD weechat-2.0.1.ebuild 3990 BLAKE2B da9076276439f03b616f711cd2af8189d0d131d1eefd2411e21a4aa917ce588cd3eb55a4e3fbf1346e6979f860ce013752450c39e8b342a7b1bba70161f13370 SHA512 4ec868198c7578d54247ae7e47cd2b9d12d50a99b2479b84b011298245107d5a4d8a3b0a38dc0973ed02d508619efc502db3af28538fd25f79ff0d2f0c12bd74
-EBUILD weechat-2.1.ebuild 4010 BLAKE2B b6c5ef8285055540e65fbd5e4c2e883c0b3aa72b0859a577a82af5dbbf6942a0b1271a14ee4e3602c3a7d1b07647156d4084f442ab86e8d3ef3d7e81bb0ae513 SHA512 eff92a3a9f57e8ab8e573b9709ba5257203cf4762355ff7d1927bcacbeceac88f0747e42cfcb870c8b09213b7bebba3f0119e564f3906a443cc9c8b42358bd8b
-EBUILD weechat-2.2-r1.ebuild 4113 BLAKE2B 7f3d07bb3af9b755942a4a3fbb4272fb3b82499b11cc809e435ce72f094b61591a2159db0df34ff8d7d3effc2029e23cd8ecc09feb0f2f5fe8650540252be6d8 SHA512 3679416b2ef023a96b8da814320fbfeab2237a5d03023210ca2a2aacbb4424218488958f86128474620203984fc4c09cae31e956c92d880441891441a06f916e
-EBUILD weechat-9999.ebuild 4113 BLAKE2B 7f3d07bb3af9b755942a4a3fbb4272fb3b82499b11cc809e435ce72f094b61591a2159db0df34ff8d7d3effc2029e23cd8ecc09feb0f2f5fe8650540252be6d8 SHA512 3679416b2ef023a96b8da814320fbfeab2237a5d03023210ca2a2aacbb4424218488958f86128474620203984fc4c09cae31e956c92d880441891441a06f916e
+EBUILD weechat-2.2-r1.ebuild 4109 BLAKE2B 9cc7833f623b3fa71b09713b9fc7b5d4fba1a64c9766685b7ef3047954f308c3772e61b410f02ced660ee0d2004aaffc2adba7d529366fbace1384224b3b126d SHA512 4ecdd4951b0d7aac80e2b62489e3b3ecf465b64f416e9bae5257555d39d350caf70392325047ccd61389d1f39122efa068350f2caf525cc4cd1df90b59c6d7e9
+EBUILD weechat-2.3.ebuild 4114 BLAKE2B f0bda2865c5789bcc7de775271a6d5825df188a1aad4cf307b6d07ff93724da96dd4005a750eb97989514ebe0b38092fcf80a51e7d3ae2be70b197a1ac333dbb SHA512 631f33448a4d8e57ff2f49c6c270dac5664fc73771538a982261be4fb7feb815936dd34c4186900a1cebcda89aa4027f9d982de6be84dfd03087e900f034baff
+EBUILD weechat-9999.ebuild 4114 BLAKE2B f0bda2865c5789bcc7de775271a6d5825df188a1aad4cf307b6d07ff93724da96dd4005a750eb97989514ebe0b38092fcf80a51e7d3ae2be70b197a1ac333dbb SHA512 631f33448a4d8e57ff2f49c6c270dac5664fc73771538a982261be4fb7feb815936dd34c4186900a1cebcda89aa4027f9d982de6be84dfd03087e900f034baff
 MISC metadata.xml 1015 BLAKE2B 84a29d39ade6afecbd613413d0dbd13decd292efe54882122b46c48e8ba33ebcd63ccf0ba0301716618054ce7dbcc30dc0649f8202612d2ccbbc3ef04e4cc135 SHA512 d63b0302cf3a026ab007a9d4bc9d2aec5e11587cdf736be871fc63431725cdc471cdc23ea58cdd30b74cb9d522e478c6e88dfa17ce4ecc5cbc1b0e2dcf3eb5fc
diff --git a/net-irc/weechat/files/weechat-2.1-tinfo.patch b/net-irc/weechat/files/weechat-2.1-tinfo.patch
deleted file mode 100644
index e44e06e61f99..000000000000
--- a/net-irc/weechat/files/weechat-2.1-tinfo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Use pkgconfig to find ncurses libs in order to support separate libtinfo.
-
---- weechat-2.1/src/gui/curses/normal/CMakeLists.txt
-+++ weechat-2.1/src/gui/curses/normal/CMakeLists.txt
-@@ -29,7 +29,13 @@
-   ../gui-curses-window.c
- )
- 
--find_package(Ncurses)
-+find_package(PkgConfig)
-+pkg_search_module(NCURSES ncursesw ncurses)
-+
-+if(NOT NCURSES_FOUND)
-+  find_package(Ncurses)
-+endif(NOT NCURSES_FOUND)
-+
- if(NCURSES_FOUND)
-   check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
-   if(NCURSESW_HEADERS)
-@@ -54,7 +60,7 @@
- 
- add_dependencies(${EXECUTABLE} weechat_gui_curses_normal)
- 
--list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
-+list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY} ${NCURSES_LIBRARIES})
- 
- # Due to circular references, we must link two times with libweechat_core.a and libweechat_gui_common.a
- target_link_libraries(${EXECUTABLE} ${STATIC_LIBS} weechat_gui_curses_normal ${EXTRA_LIBS} ${STATIC_LIBS})
diff --git a/net-irc/weechat/weechat-2.1.ebuild b/net-irc/weechat/weechat-2.1.ebuild
deleted file mode 100644
index b975945b6839..000000000000
--- a/net-irc/weechat/weechat-2.1.ebuild
+++ /dev/null
@@ -1,151 +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} )
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit python-single-r1 cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0[deprecated] )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:* )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-ruby/asciidoctor-1.5.4
-		dev-util/source-highlight
-	)
-	nls? ( >=sys-devel/gettext-0.15 )
-	test? ( dev-util/cpputest )
-"
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-# tests need to be fixed to not use system plugins if weechat is already installed
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.1-tinfo.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix libdir placement
-	sed -i \
-		-e "s:lib/:$(get_libdir)/:g" \
-		-e "s:lib\":$(get_libdir)\":g" \
-		CMakeLists.txt || die "sed failed"
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_NCURSES=ON
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_ASPELL=$(usex spell)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	if use python; then
-		python_export PYTHON_LIBPATH
-		mycmakeargs+=(
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/net-irc/weechat/weechat-2.2-r1.ebuild b/net-irc/weechat/weechat-2.2-r1.ebuild
index ee7ec6e3f6b6..53ed8873347e 100644
--- a/net-irc/weechat/weechat-2.2-r1.ebuild
+++ b/net-irc/weechat/weechat-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/net-irc/weechat/weechat-2.3.ebuild b/net-irc/weechat/weechat-2.3.ebuild
new file mode 100644
index 000000000000..f7ef20c9a4be
--- /dev/null
+++ b/net-irc/weechat/weechat-2.3.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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} )
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils gnome2-utils python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
+LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
+IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-misc/curl[ssl]
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( dev-lang/lua:0[deprecated] )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:* )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-ruby/asciidoctor-1.5.4
+		dev-util/source-highlight
+	)
+	nls? ( >=sys-devel/gettext-0.15 )
+	test? ( dev-util/cpputest )
+"
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+# tests need to be fixed to not use system plugins if weechat is already installed
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2-tinfo.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# fix libdir placement
+	sed -i \
+		-e "s:lib/:$(get_libdir)/:g" \
+		-e "s:lib\":$(get_libdir)\":g" \
+		CMakeLists.txt || die "sed failed"
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NCURSES=ON
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_ASPELL=$(usex spell)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	if use python; then
+		python_export PYTHON_LIBPATH
+		mycmakeargs+=(
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index ee7ec6e3f6b6..f7ef20c9a4be 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 CMAKE_MAKEFILE_GENERATOR=emake
 inherit cmake-utils gnome2-utils python-single-r1
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 49a2428cd968..67f7f66dd09a 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ccrtp/Manifest b/net-libs/ccrtp/Manifest
index d7b40540ce9b..329ed1d92870 100644
--- a/net-libs/ccrtp/Manifest
+++ b/net-libs/ccrtp/Manifest
@@ -1,5 +1,5 @@
 DIST ccrtp-2.0.9.tar.gz 751786 BLAKE2B afa105375a95cffc649704915e0532b20af2188186a6f7d9459285996dfcf583fd2cc1be8e4dc917d4a1acf4022d13db95c617710a2a13a9da9b7badab257fba SHA512 2e63a049ead5bd8a2f3c65d3badb6d6b2a20e185698f62ea9f7e559e8d0aac6151e7a314317d63ea33282c891d75af32571da3471254600abea462097c47dfe3
 DIST ccrtp-2.1.2.tar.gz 764869 BLAKE2B 8fc3aa22e715078dae64407da8b8c2dc6740994dad7bf7dab6369b1708e6261619107dd7484b1ec801b7a8bbb30d3387d8fab9c3503adf09209b2b8aeb6df56d SHA512 a835f57a0eef7cba11c55c93ce2f11ebd8ab4099e7c723043c51e4872f3da87af946fc50fac18b47ea5d72b2a1227b377810e9134c1f3a8982d4ce5944d043e9
 EBUILD ccrtp-2.0.9.ebuild 1094 BLAKE2B db56a4a22024aa65cc8cc80c92156d29df1057ce4a9d2b0a83bd77815a2d92314140cea73653a76e03af8b4cc1fb9699cbd00fd304ef785a30c85e59810adc12 SHA512 b7e86d6d707151f4bda0cb5fd22cae8a1fdade7cd6d4e7fbd821fade8d4cbe446b1da2fb4bc878bd4837eb03b1ad1998ca2cc08c5f124b4d995270845aa4038e
-EBUILD ccrtp-2.1.2.ebuild 1096 BLAKE2B 17dff7b748fccf5188f6f2443a665af7299d4771bafd0f58bf46ffbd8fece7c6353f9ba00257bf4fe87de23a712856ebbc2ac511d524159da419c88e8c23ccef SHA512 a0273ca7d0015e0bd4bc625ab7b7c99b5af2aa427938edf87df752b2f1b12310553923fc049fab47e1225bc5e8e3762ec7eef2cd2454384cf116459a858c8cde
+EBUILD ccrtp-2.1.2.ebuild 667 BLAKE2B 5ac5b4ffdb0a8138b0c6a608b44cbb4e6f61c219cb2c4e41d1384dd1b61b85807c90e861492ef4f2e3ad684596d743aa6876ce81734ebaab7a11f36722871bac SHA512 262ed129e83a9e757196078a98a0f4b91f255498744d4619a7cf25893b5404c2b38f4967548ac3edfa947d97d1e8fcebdaf6e8ef2b8f3f61afd47ff22ce052a1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/ccrtp/ccrtp-2.1.2.ebuild b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
index 02cf6d4014df..0ed701175c1c 100644
--- a/net-libs/ccrtp/ccrtp-2.1.2.ebuild
+++ b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib
+EAPI=7
 
 DESCRIPTION="GNU ccRTP - Implementation of the IETF real-time transport protocol"
 HOMEPAGE="https://www.gnu.org/software/ccrtp/"
@@ -13,31 +12,22 @@ LICENSE="GPL-2"
 IUSE="doc"
 SLOT="0/2"
 
-RDEPEND=">=dev-cpp/commoncpp2-1.3.0:0=
+RDEPEND="
+	>=dev-cpp/commoncpp2-1.3.0:0=
 	dev-libs/libgcrypt:0=
-	>=dev-libs/ucommon-5.0.0:="
+	>=dev-libs/ucommon-6.2.2:=
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
 
 src_configure() {
 	econf --disable-static
 }
 
 src_install() {
+	use doc && HTML_DOCS="doc/html/*"
 	default
-	prune_libtool_files
-	use doc && dohtml -r doc/html/*
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.4.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.4.so.0"
-	fi
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.5.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.5.so.0"
-	fi
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.6.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.6.so.0"
-	fi
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 38beb3e7033c..176c672cc815 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -3,5 +3,5 @@ DIST farstream-0.1.2.tar.gz 1265972 BLAKE2B 239deea639f3456170aee1633d0ec0856917
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 EBUILD farstream-0.1.2-r2.ebuild 2374 BLAKE2B c4832a241cce39990bc5a396503cb29090a67799edb33018d2f25a8fee56eb77b9ffa17a04b05ec608dc28cc90382fd7f2620924bd1b506ffd8273f9a5c0bf15 SHA512 1222e9257b9ac280dd94b1e2f75f12369db67ae8efbce4ab6403404b37e60b63de9c06c797eb716ea8150c642cf323153e7ee4a1e246ff51b9a5de69e76ca56c
 EBUILD farstream-0.2.8-r1.ebuild 1805 BLAKE2B 60c9a9e789c6cbf48ff33e53b1a4bb7d0e59d88f7f3b8a71254d3b18809fa79667836c60f55a756c7d271ef09e40b173c7c573e6ebb530aaa97bd992d382da45 SHA512 99f415b8069ebfe61bcd65d7679d61d7c12188e3c95955bef8ec0fcff71a2ec9cb3ee5d3bed6db3b0411080c1bf625e210530d855a2f9abee716029128316ab8
-EBUILD farstream-0.2.8-r2.ebuild 1819 BLAKE2B 9dcc52ac72766c36649fd13d75ca7efe7641237671a5bbd952fec059f3aee6150615c65d07a663117112dd8aaac3593b4e254c4e1002e99bb4f2066c86402607 SHA512 4c7308a49043f7b0b5801baefb43c83dec0bbb9c741e1a8d667190beeff8fa18f9b842bdd7bc6723a993d12368783d75893dff2e143d8f82d0848954cbf3ef1b
+EBUILD farstream-0.2.8-r2.ebuild 1828 BLAKE2B 2344f6d75489a3b8e80deed6519d4f6e2da828413ca37603db4369f3c4beae1f0461fee294ef4a98df48f6f88e8407a94246d39a412d1274a1d9345bbdf4a665 SHA512 139b9f3cf63894eade81da0bdfa9242f3921c02a0f87b8371809d03ebdb08bf14fac4c92a19d4cf9e9e9848b96b934dca43d3a1d8c5bec9ea3d400b57a1ce826
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index 5e47397a3ad9..a37762705792 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 017d6da106c7..9f83965e4723 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,15 +1,10 @@
 AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 BLAKE2B b54c19d6a465c71d3f7e4ac42ccc0add193b4b50b0047450583ee7c22d652b620e72f218ec5f87048331bd61e232b5ad1d2298f1ffdc17079ccdcf1d8f300aae SHA512 7a63d83db669ea0eba5dd43fb7a65e8a8b6bf6d397bf3884ab84eb5661f2b4fb0f19a9aead2851772d3d84e6b2ec470b67a2589f82fa28f7a27cb9b59d7890d8
-AUX gsoap-2.7.40-shared_libs.patch 6866 BLAKE2B 829a06165291a7887b8dc72b450b38a6f28cce51a6cf55d7d2ba1129a2f96036b5cbcf1a5e3b7d00c63a94674c42ea0b647818b9000e67191a75cf1a5660e0b9 SHA512 289c09f08d5881232fe169d37a0a76b58f8ec823305dd24f62b4cc04d7d1801be5b475ccd87c1f4ec3779c7972cb962a8a196d80e5fff91755d9b76bae0ac941
-AUX gsoap-2.8.51-libressl-2.6-compatibility.patch 1394 BLAKE2B 738e50bf8b8aad35e21b2ac03d9ca18713cbc694c01916163f0f22b8e16c11b156a9c92a209da56016cdc23e0438d23dc99ca7efed1eaec892462e231c9b9cac SHA512 51e1419bb88bf9de32caeaf4f7507eec05a65b4cac9aa02715c933d66c3685c1e611a52dbd1e77219bfffc8bd99c838f3c1e9270520a9e7b46a1651f79f00bab
 AUX gsoap-2.8.52-shared_libs.patch 6582 BLAKE2B beb15d19f782edd0fd0ac518001001f194fc26ef8e7964114809776d3b0dc5359f2cf39e0fe6813650afb7805ae389dc5e26ac4ac4bbe424e81135073ee7bd27 SHA512 7ddbd3c2597892357da0ced383b2286e057e5e3c44eec3fd96b2ecbb4759bb5624c047e77482c495d46796e20d0e587e637f7b3a0ca3a05ceeae40e63fd5049c
-DIST gsoap_2.8.51.zip 34505931 BLAKE2B 6f2d6ee2bd405054dc75105f42f6edeaa2300f1e7e6bea15f9e8f0dfcc2df56b36cddfc8f0a038b029f36a6dd1fd63f39eadb8d7f363335344eb142ec27be726 SHA512 491e31ce6be02c577b6184335672a0805e2287418a7e26d9b0f009aab8af462ddef7d7a1893dc867db5362c5f2a1e0022d0a45865d81e43286ce16c649da6910
-DIST gsoap_2.8.55.zip 32571850 BLAKE2B 6f262c0b65c7704fbf6c0973d766c0cff788745d0f6331afdffc6bbabbbeeea38222f8038d7a96eae63453a721f2b52b1623f4691e7c677489fb8a3c49d80bae SHA512 e0cb6809d5b8e4a068ed937f253844f88d8275e58f7590ca0dd52bede1ea74d5781d35664586f9e29f2e22c508167df8044d45101f0773c9b8d79b80aa188935
-DIST gsoap_2.8.58.zip 32931913 BLAKE2B ab6e1b9f1e3b866199236b471e638a80c3542ce709e5cca75df9b3d5cd06fc498d09e768078a6863c549e721f657723d50bf53274c7d6603da23f1ea7a887879 SHA512 019c428aee0309ac952af349738a062d4e6deae28f2c5d38178bcd2aa3ead76a7a43faf952ca61f15e8928600a46f1a865b7996ded1c32e1749d1036c5354e2b
-DIST gsoap_2.8.59.zip 33109898 BLAKE2B d05ddf0c1e24afc03a33592cf8abef6f0bb6c8a8a216aee9ce7614720a8e3cd015f1e03429113ac8bdc05e6b916fee022914db22d0c29b5c9c4d0fb60c549168 SHA512 d43320e6965c3f17d122ea7aeeecbc0b608dac52204e630c3254d32eadd3c93aaca446c92bb439b98207f8560b2ad6bff220c0502b75ebd18b99e37402570624
+AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6dd7bb1dc933216a1770accc94c2d1ef02fe6a3ad7643cb7d748a54e55e9ba3591d48f107485c9b9e4306763f2634 SHA512 d49527ae34788f8bc1a74c9a59890bdc13eb343fb3293fcc756b7dd7259cc7cd544bafc58a0c271cf7268b0a9c986db36e587fdc7fcc520ea05ab559e292649e
+AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af3a5d5778f3ba7f231e41d4b95a8fbffe2f94ab41b422cff21df3c25dbe5976da4da0626735fe84877407a6f0fa925247 SHA512 46cc3733f1b25c3c5ac81ff340b4254d29bdd8c93f5cc4cb5aad4a997e253aed513eb466070ae1697a308fba5cf2bb22bdda0c04eecd0979debe2b38c68fab83
+AUX gsoap-2.8.70-xlocale_h.patch 660 BLAKE2B afe47e3394b7417defc0cf38a08f1d0c44dbbe445f6042ea361011d97af3b321681912e3cecff574e218804aaf954239ef8eccb6a8dfd2e6d50c14afa4d70e2f SHA512 c86e465752a90519317d61399f09925d5dfaa6ce11651e5013d63ceb49a92aa3728c880d6d57c50e830b1fcabf359cbc18f1b78c0fc2168d98acfb73c89bf57f
 DIST gsoap_2.8.63.zip 32985252 BLAKE2B 6bedf06a98701dd63c13e805f865c3b84cae8c498a9ec1c4dd062e191f217c56cf9667046c5fbf0b33d94c5500e2eb4746eefa7cc909398a8ad891f2cb33e357 SHA512 1941aba9c4a7d5e57e8b8f4f2183ee3c24a9a5c3e93caedfd27a13cbc625dc06e3114f850f0dcddb87dd436a997e1157fb2c6fb20c28f1b0675e634c3d489d96
-EBUILD gsoap-2.8.51.ebuild 1793 BLAKE2B ac37c5aad219f159d1341f13d20ab187d70fd87619930ab13df8fd127f46ea15793c6d1f74def667c2a2f3384037193877d662eebdac7f73e530b8ebf7d9fe6b SHA512 45b0dc686746e51454340f1c8d59fb803e94666b50db4d2cc6b10ed31f0cb09daa3d1cd46f851b6fababb2363e1e14de5da6bf978a3b41b172170385d06db76f
-EBUILD gsoap-2.8.55.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
-EBUILD gsoap-2.8.58.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
-EBUILD gsoap-2.8.59.ebuild 1635 BLAKE2B 108f7d24270342c82c34c3ef000814a2af1de429230744aba9a819a988bc16619e79b3a59efd72939c57503698d3921b8ab8339a3c9ea7c2f1a5242c43ac8b7a SHA512 786bbd285e707c55acba1b1a357d51583cea9e1040673ebf35264d0d5d2ae8af1eb65e61123ce1b36865c57f20a942ed0e9deeab7c98ad2603a3bf7f730a9bc3
-EBUILD gsoap-2.8.63.ebuild 1635 BLAKE2B 108f7d24270342c82c34c3ef000814a2af1de429230744aba9a819a988bc16619e79b3a59efd72939c57503698d3921b8ab8339a3c9ea7c2f1a5242c43ac8b7a SHA512 786bbd285e707c55acba1b1a357d51583cea9e1040673ebf35264d0d5d2ae8af1eb65e61123ce1b36865c57f20a942ed0e9deeab7c98ad2603a3bf7f730a9bc3
+DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
+EBUILD gsoap-2.8.63.ebuild 1630 BLAKE2B ec07675d8a315a780c4f43b617099aa6211ffb584ea3a3e718500ad34063f28e6498e62d6fd040a108aad36cfde3aa41ceb8b52181d22b4febcaf66de457649b SHA512 310be6db4ad09a75b5a61ea91cd82f648e21102ce783009f13f1a97d390ed9cca59db06d707c0e3635a18ca5a4c35a359479755b38f218440b729b73fa84e397
+EBUILD gsoap-2.8.70.ebuild 1875 BLAKE2B f3d471fc3467e7c88c470b48f1d242bf7483a133d6b668e1cfe39e36e54eaa508e678881943ad1b7aa7845dda3b3f667e863b5a34e517f1c562769337ecdd364 SHA512 024549d143921d38866924105ed0d93b8445d2ceef717506575d26b7070697bce57e18df8b24e8aab20257f35f4c328ccaef4bcd286a7ec665cd6fdc4914ac34
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch
deleted file mode 100644
index 829e0e45a58c..000000000000
--- a/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac      2016-12-11 04:12:26.000000000 +0000
-+++ b/configure.ac      2017-01-10 13:41:24.743162628 +0000
-@@ -17,7 +17,7 @@
- AC_PROG_YACC
- AC_PROG_CPP
- AC_PROG_RANLIB
--#AM_PROG_LIBTOOL
-+AM_PROG_LIBTOOL
- AC_PROG_LN_S
- AC_PROG_AWK
- AC_PROG_INSTALL
-@@ -242,16 +242,18 @@
-     WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
-     SAMPLE_INCLUDES=
-     SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
--    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
-   else
-     AC_MSG_RESULT(no)
-     WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
-     # an ugly hack to get httpda and smdevp plugins to conditionally
-     # compile with wsdl2h when OPENSSL is available
--    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lssl -lcrypto -lz"
-+    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lcrypto"
-     SAMPLE_INCLUDES=
-     SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
--    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
-   fi
-   if test -n "$ZLIB"; then
-     WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
-@@ -270,13 +272,15 @@
-   WSDL2H_EXTRA_FLAGS=
-   SAMPLE_SSL_LIBS=
-   SAMPLE_INCLUDES=
--  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
-+  WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+  WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
- fi
- AC_SUBST(WSDL2H_EXTRA_FLAGS)
- AC_SUBST(WSDL2H_EXTRA_LIBS)
- AC_SUBST(SAMPLE_INCLUDES)
- AC_SUBST(SAMPLE_SSL_LIBS)
--AC_SUBST(WSDL2H_SOAP_CPP_LIB)
-+AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB)
-+AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB)
- 
- # enable the compile of the samples
- AC_ARG_ENABLE(samples,
-diff -Naur a/gsoap/Makefile.am b/gsoap/Makefile.am
---- a/gsoap/Makefile.am 2016-12-11 04:12:27.000000000 +0000
-+++ b/gsoap/Makefile.am 2017-01-10 13:41:36.487140423 +0000
-@@ -49,6 +49,29 @@
- libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
- libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
- 
-+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
-+SOVERSION = 0
-+libgsoap_la_SOURCES = stdsoap2.c dom.c
-+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
-+libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
-+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
-+libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
-+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-+libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
-+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-+libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
-+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-+libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
-+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
-+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-+libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
-+
- BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
- 
- include_HEADERS = stdsoap2.h
-diff -Naur a/gsoap/samples/autotest/Makefile.am b/gsoap/samples/autotest/Makefile.am
---- a/gsoap/samples/autotest/Makefile.am        2016-12-11 04:12:27.000000000 +0000
-+++ b/gsoap/samples/autotest/Makefile.am        2017-01-10 13:44:39.954389922 +0000
-@@ -14,7 +14,7 @@
- WSDLINPUT=$(srcdir)/examples.wsdl
- SOAPHEADER=$(srcdir)/examples.h
- SOAP_CPP_SRC=soapC.cpp soapServer.cpp
--SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
- 
- $(SOAP_CPP_SRC) : $(WSDLINPUT)
-        $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-@@ -40,6 +40,6 @@
- autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
- autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
- autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp
--autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
-+autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS)
- 
- CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap
-diff -Naur a/gsoap/samples/databinding/Makefile.am b/gsoap/samples/databinding/Makefile.am
---- a/gsoap/samples/databinding/Makefile.am     2016-12-11 04:12:27.000000000 +0000
-+++ b/gsoap/samples/databinding/Makefile.am     2017-01-10 13:43:51.788258087 +0000
-@@ -14,7 +14,7 @@
- WSDLINPUT=$(srcdir)/address.xsd
- SOAPHEADER=$(srcdir)/address.h
- SOAP_CPP_SRC=addressC.cpp
--SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.la
- 
- $(SOAP_CPP_SRC) : $(WSDLINPUT)
-        $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-@@ -28,6 +28,6 @@
- address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
- address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
- address_SOURCES=$(SOAP_CPP_SRC) address.cpp
--address_LDADD=$(SOAP_CPP_LIB)
-+address_LDADD=$(SOAP_CPP_SHARED_LIB)
- 
- CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap
-diff -Naur a/gsoap/wsdl/Makefile.am b/gsoap/wsdl/Makefile.am
---- a/gsoap/wsdl/Makefile.am    2016-12-11 04:12:28.000000000 +0000
-+++ b/gsoap/wsdl/Makefile.am    2017-01-10 13:42:08.991078959 +0000
-@@ -10,7 +10,7 @@
- AM_LDFLAGS=-L$(srcdir) -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
- AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
- SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT)
--SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB)
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB)
- SOAP_CPP_SRC=wsdlC.cpp
- SOAPHEADER=$(srcdir)/wsdl.h
- SOAP_FLAGS=-SC -pwsdl -I$(srcdir) -I$(top_srcdir)/gsoap/import
-@@ -29,6 +29,6 @@
- wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH)
- wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
- wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC)
--wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
-+wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS)
- 
- CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap
-
diff --git a/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch b/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch
deleted file mode 100644
index 8f13a39d32c6..000000000000
--- a/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/gsoap/plugin/smdevp.c	2018-04-20 15:45:25.112658174 +0000
-+++ b/gsoap/plugin/smdevp.c	2018-04-20 15:47:58.826360980 +0000
-@@ -479,7 +479,7 @@
-   /* allocate and init the OpenSSL HMAC or EVP_MD context */
-   if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
-   {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-     data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX));
-     if (data->ctx)
-       HMAC_CTX_init((HMAC_CTX*)data->ctx);
-@@ -489,7 +489,7 @@
-   }
-   else
-   {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-     data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX));
-     if (data->ctx)
-       EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx);
-@@ -642,7 +642,7 @@
-       *len = (int)n;
-   }
-   /* cleanup */
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-   if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
-     HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
-   else
-@@ -687,7 +687,7 @@
-     }
-     if (data->ctx)
-     {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-       if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
-         HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
-       else
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch
new file mode 100644
index 000000000000..8abd36d937c9
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch
@@ -0,0 +1,10 @@
+--- gsoap-2.8/gsoap/src/Makefile.am
++++ gsoap-2.8/gsoap/src/Makefile.am
+@@ -5,6 +5,7 @@
+ ## you have all needed files, that a GNU package needs
+ AUTOMAKE_OPTIONS = foreign 1.4
+ 
++include MakefileManual
+ 
+ #LIBS=
+ AM_YFLAGS=-d -v
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch
new file mode 100644
index 000000000000..cb3f11ed129a
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch
@@ -0,0 +1,141 @@
+--- gsoap-2.8/configure.ac
++++ gsoap-2.8/configure.ac
+@@ -17,7 +17,7 @@
+ AC_PROG_YACC
+ AC_PROG_CPP
+ AC_PROG_RANLIB
+-#AM_PROG_LIBTOOL
++AM_PROG_LIBTOOL
+ AC_PROG_LN_S
+ AC_PROG_AWK
+ AC_PROG_INSTALL
+@@ -278,15 +278,17 @@
+     WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
+     SAMPLE_INCLUDES=
+     SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
+-    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
++    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
++    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
+   else
+     AC_MSG_RESULT(no)
+     WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
+     # compile with wsdl2h when OPENSSL is available
+-    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
++    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto"
+     SAMPLE_INCLUDES=
+     SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
+-    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
++    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
++    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
+   fi
+   if test -n "$ZLIB"; then
+     WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
+@@ -305,7 +307,8 @@
+   WSDL2H_EXTRA_FLAGS=
+   SAMPLE_SSL_LIBS=
+   SAMPLE_INCLUDES=
+-  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
++  WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a"
++  WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
+ fi
+ AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
+ AC_SUBST(WITH_OPENSSL)
+@@ -313,7 +316,8 @@
+ AC_SUBST(WSDL2H_EXTRA_LIBS)
+ AC_SUBST(SAMPLE_INCLUDES)
+ AC_SUBST(SAMPLE_SSL_LIBS)
+-AC_SUBST(WSDL2H_SOAP_CPP_LIB)
++AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB)
++AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB)
+ 
+ # enable the compile of the samples
+ AC_ARG_ENABLE(samples,
+--- gsoap-2.8/gsoap/Makefile.am
++++ gsoap-2.8/gsoap/Makefile.am
+@@ -49,6 +49,29 @@
+ libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
+ libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+ 
++lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
++SOVERSION = 0
++libgsoap_la_SOURCES = stdsoap2.c dom.c
++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
++libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
++libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
++libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
++libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
++libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
++libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
++libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
++libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
++libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
++libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
++libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
++libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
++libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
++libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
++libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
++libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
++
+ BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
+ 
+ include_HEADERS = stdsoap2.h
+--- gsoap-2.8/gsoap/samples/autotest/Makefile.am
++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am
+@@ -14,7 +14,7 @@
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h
+ SOAP_CPP_SRC=soapC.cpp soapServer.cpp
+-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
+ 
+ $(SOAP_CPP_SRC) : $(WSDLINPUT)
+ 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
+@@ -40,6 +40,6 @@
+ autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
+ autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
+ autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp
+-autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
++autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS)
+ 
+ CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap
+--- gsoap-2.8/gsoap/samples/databinding/Makefile.am
++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am
+@@ -14,7 +14,7 @@
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h
+ SOAP_CPP_SRC=addressC.cpp
+-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
+ 
+ $(SOAP_CPP_SRC) : $(WSDLINPUT)
+ 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
+@@ -28,6 +28,6 @@
+ address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
+ address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
+ address_SOURCES=$(SOAP_CPP_SRC) address.cpp
+-address_LDADD=$(SOAP_CPP_LIB)
++address_LDADD=$(SOAP_CPP_SHARED_LIB)
+ 
+ CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap
+--- gsoap-2.8/gsoap/wsdl/Makefile.am
++++ gsoap-2.8/gsoap/wsdl/Makefile.am
+@@ -10,7 +10,7 @@
+ AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
+ AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
+ SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT)
+-SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB)
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB)
+ SOAP_CPP_SRC=wsdlC.cpp
+ SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h
+ SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import
+@@ -32,6 +32,6 @@
+ if WITH_OPENSSL
+ wsdl2h_SOURCES += $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c
+ endif
+-wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
++wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS)
+ 
+ CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch b/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch
new file mode 100644
index 000000000000..fd550dd2670d
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch
@@ -0,0 +1,20 @@
+--- gsoap-2.8/configure.ac
++++ gsoap-2.8/configure.ac
+@@ -196,15 +196,15 @@
+ AC_ARG_ENABLE(xlocale,
+               [AC_HELP_STRING([--enable-xlocale],
+                               [compile library with forced inclusion of xlocale.h])],
+-              [with_xlocale="$enable_xl"],
++              [with_xlocale="$enableval"],
+               [with_xlocale="no"])
+ 
+ AC_MSG_CHECKING(for enable xlocale usage in library)
+ if test "x$with_xlocale" = "xyes"; then
+   AC_MSG_RESULT(yes)
++  SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H"
+ else
+   AC_MSG_RESULT(no)
+-  SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H"
+ fi
+ AC_SUBST(SOAPCPP2_INCLUDE_XLOCALE)
+ 
diff --git a/net-libs/gsoap/gsoap-2.8.51.ebuild b/net-libs/gsoap/gsoap-2.8.51.ebuild
deleted file mode 100644
index 5dd67d3686ff..000000000000
--- a/net-libs/gsoap/gsoap-2.8.51.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 autotools eutils
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc debug examples ipv6 libressl gnutls +ssl"
-
-RDEPEND="
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Fix Pre-ISO headers
-	eapply "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# enable shared libs https://bugs.gentoo.org/583398
-	eapply "${FILESDIR}/${PN}-2.7.40-shared_libs.patch"
-
-	# fix building with libressl-2.6.x.  This will not be needed when 2.7.x goes stable
-	eapply "${FILESDIR}/${PN}-2.8.51-libressl-2.6-compatibility.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	use ssl || myconf+=( --disable-ssl )
-	use gnutls && myconf+=( --enable-gnutls )
-	use ipv6 && myconf+=( --enable-ipv6 )
-	econf \
-		${myconf[@]} \
-		$(use_enable debug) \
-		$(use_enable examples samples)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	dohtml changelog.md
-
-	prune_libtool_files --all
-
-	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		dohtml -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.8.55.ebuild b/net-libs/gsoap/gsoap-2.8.55.ebuild
deleted file mode 100644
index 28cf845a3274..000000000000
--- a/net-libs/gsoap/gsoap-2.8.55.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug examples ipv6 libressl gnutls +ssl"
-
-RDEPEND="
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-"
-
-PATCHES=(
-	# Fix Pre-ISO headers
-	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# enable shared libs https://bugs.gentoo.org/583398
-	"${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	use ssl || myconf+=( --disable-ssl )
-	use gnutls && myconf+=( --enable-gnutls )
-	use ipv6 && myconf+=( --enable-ipv6 )
-	econf \
-		${myconf[@]} \
-		$(use_enable debug) \
-		$(use_enable examples samples)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	dohtml changelog.md
-
-	prune_libtool_files --all
-
-	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		dohtml -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.8.58.ebuild b/net-libs/gsoap/gsoap-2.8.58.ebuild
deleted file mode 100644
index 28cf845a3274..000000000000
--- a/net-libs/gsoap/gsoap-2.8.58.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug examples ipv6 libressl gnutls +ssl"
-
-RDEPEND="
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-"
-
-PATCHES=(
-	# Fix Pre-ISO headers
-	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# enable shared libs https://bugs.gentoo.org/583398
-	"${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	use ssl || myconf+=( --disable-ssl )
-	use gnutls && myconf+=( --enable-gnutls )
-	use ipv6 && myconf+=( --enable-ipv6 )
-	econf \
-		${myconf[@]} \
-		$(use_enable debug) \
-		$(use_enable examples samples)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	dohtml changelog.md
-
-	prune_libtool_files --all
-
-	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		dohtml -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.8.59.ebuild b/net-libs/gsoap/gsoap-2.8.59.ebuild
deleted file mode 100644
index 84b2601d54ef..000000000000
--- a/net-libs/gsoap/gsoap-2.8.59.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug examples ipv6 libressl gnutls +ssl"
-
-RDEPEND="
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-"
-
-PATCHES=(
-	# Fix Pre-ISO headers
-	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# enable shared libs https://bugs.gentoo.org/583398
-	"${FILESDIR}/${PN}-2.8.52-shared_libs.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	use ssl || myconf+=( --disable-ssl )
-	use gnutls && myconf+=( --enable-gnutls )
-	use ipv6 && myconf+=( --enable-ipv6 )
-	econf \
-		${myconf[@]} \
-		$(use_enable debug) \
-		$(use_enable examples samples)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	dohtml changelog.md
-
-	prune_libtool_files --all
-
-	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		dohtml -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.8.63.ebuild b/net-libs/gsoap/gsoap-2.8.63.ebuild
index 84b2601d54ef..55a5b33b16db 100644
--- a/net-libs/gsoap/gsoap-2.8.63.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
 
 LICENSE="GPL-2 gSOAP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc debug examples ipv6 libressl gnutls +ssl"
 
 RDEPEND="
diff --git a/net-libs/gsoap/gsoap-2.8.70.ebuild b/net-libs/gsoap/gsoap-2.8.70.ebuild
new file mode 100644
index 000000000000..f09037b2e0fd
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.8.70.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-2.8"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples ipv6 libressl gnutls +ssl"
+
+RDEPEND="
+	sys-libs/zlib
+	gnutls? ( net-libs/gnutls )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	sys-devel/flex
+	sys-devel/bison
+"
+
+PATCHES=(
+	# Fix Pre-ISO headers
+	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+	# enable shared libs https://bugs.gentoo.org/583398
+	"${FILESDIR}/${PN}-2.8.70-shared_libs.patch"
+
+	# Fix --enable-xlocale configure switch
+	"${FILESDIR}/${PN}-2.8.70-xlocale_h.patch"
+
+	# Fix parallel make
+	"${FILESDIR}/${PN}-2.8.70-parallel.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# Don't include xlocale.h as it got removed in >=glibc-2.26
+		--disable-xlocale
+		$(use_enable debug)
+		$(use_enable examples samples)
+		$(usex gnutls --enable-gnutls '')
+		$(usex ipv6 --enable-ipv6 '')
+		$(usex ssl '' --disable-ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# yes, we also install the license-file since
+	# it contains info about how to apply the licenses
+	dodoc *.txt
+
+	docinto html
+	dodoc changelog.md
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	if use examples; then
+		rm -r gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
+		insinto /usr/share/doc/${PF}/examples
+		doins -r gsoap/samples/*
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r gsoap/doc/*
+	fi
+}
diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest
index 582d528e6341..cdffc840fc81 100644
--- a/net-libs/ignition-msgs/Manifest
+++ b/net-libs/ignition-msgs/Manifest
@@ -1,5 +1,3 @@
-DIST ignition-msgs-0.7.0.tar.bz2 327753 BLAKE2B 7709b7fe5bc8d3ebd16ae30ac91d088a7e3891bc378f24ca48b34b88c541c3583182c3d9d3d6c72b7005f01ae5383f6391b4e754adb26f8ab06e9a31680e99dd SHA512 78b35eb6c9b53bd567d227191009cfb8628afa70f244cf05ad9440f370aa9c51a649160c9c65d13e81a48a3a34553614e9835e9a37fb91cad330c363f0a5f62f
 DIST ignition-msgs-1.0.0.tar.bz2 315469 BLAKE2B a481f740ffb0795e64d1fa222ea4925e09839d56212f5218b4849c6f49a3e3a899af757ac1ad1997a95b57a401bac831a754ffa351cd142e6e9cbf07e7bae0ac SHA512 3ec16d68c35b1c7d77373eb3ed72304f5a990f57fc15a91f49af49bf0c6b43e6f31e888e4b0a8308cc63840aa995dd423d5b23d28a98f132b4be13c46f5d7d6e
-EBUILD ignition-msgs-0.7.0.ebuild 902 BLAKE2B b003b1f8aea21a1ba7d4d567e9793a09030a77eee4a8b60351fad863914837bd6d6127f1fbcf9235b02d87f8d2a09ec210927391e498f70432eabcb812864e93 SHA512 604b6673fc62042fd151b7abd1a0861ba17615e8df02b6138439d5e5ec9b7de768c2332a875e888f623530c61a66002178ac58b592d1b67b7f8eb63122125d01
 EBUILD ignition-msgs-1.0.0.ebuild 653 BLAKE2B afcc192b543a7ae2fc9f859943708e40ba36e2e0f260a729927c9d38a651e078995879e3c2cef643b342c35b1d3fe4fa93c8e2b8526579261adc91c427b3a20d SHA512 4c769905c78b7bf5b91c80a2188ba5e29ba91aaca55ceaec0434347858b2fe8d657521382380881ab455c98897bd911ced6425e5749047caadb10a916914b869
 MISC metadata.xml 342 BLAKE2B 8d111972a5a99679d9ad258649ea0308bc682663888b6228e92948dd88ee3e6d19bf04d940801f5d3ca069ba9173f248d557c2d44f304c86c074c3f68b0d9341 SHA512 4ec21d1b2f7525d07b3bbc624ec55edf1282652c74ee548e77c1b25c0242b0f01f846bdbe2203dca8c0217f25e5fc50ad6ff57f33694ea223941c8aaa8bc35fe
diff --git a/net-libs/ignition-msgs/ignition-msgs-0.7.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-0.7.0.ebuild
deleted file mode 100644
index 6618d9aad104..000000000000
--- a/net-libs/ignition-msgs/ignition-msgs-0.7.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
-
-inherit cmake-utils
-
-DESCRIPTION="Protobuf messages and functions for robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libraries/messages https://bitbucket.org/ignitionrobotics/ign-msgs"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-msgs/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-libs/protobuf:=
-	sci-libs/ignition-math:3="
-RDEPEND="${DEPEND}"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_configure() {
-	# upstream appends this conditionally...
-	append-flags "-fPIC"
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	cmake-utils_src_configure
-}
diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest
index 618764ae1706..4f6dcb9016f0 100644
--- a/net-libs/ignition-transport/Manifest
+++ b/net-libs/ignition-transport/Manifest
@@ -1,6 +1,4 @@
 AUX zmq.patch 1378 BLAKE2B 4fd868bc3d791e2f17fec392f8cdc5a6ce076b96453c35da46e8717e7274f29aa323dfc1985e819c49b587963b22813d4eb11b685d24c417d67720a7c5e3ac84 SHA512 9128f976e51dd333d856c15f1899955ff4879db229a174839be8e6d8c464cd7e0932c58098bcd1aa2e45fefdf5527bbe8a301306ddc75c022bc1fc0fd4ea9edc
-DIST ignition-transport3-3.1.0.tar.bz2 385946 BLAKE2B 0ae44f0e1cd17369de9ee39f0d128ee5edbc68c1be672be5476d7cf8c161f59c069af63cec1966f6e0ba1c9e56ade0563b6546f7f285bdc49b6941939e2a4379 SHA512 438ab49f1c506e098c00becccf1856b3e0129d60f9aca32f713a74b38aefb178833353ff479c8512e7ffec812bdc0a06eb7f28f09766dc0cc5a9707184151555
 DIST ignition-transport4-4.0.0.tar.bz2 396662 BLAKE2B cb4c56954ddcd863d60941c43e38624747ca07e6cb5c7404309012dc9d22fb8a053e1113b117a0ee8447e32b6b52318b5b4844a050e4b8c1feccc2de391c46bf SHA512 90facd527e953d3319b4b3b7c5efa610d6c965fcaaf053b8b32039825fccca89c17f153ffec5c0562d4d3d534741f3d6c1a603eb2c75fd5cb217bf22a6d6e503
-EBUILD ignition-transport-3.1.0-r1.ebuild 1051 BLAKE2B 9b9121d78653d91eac64929de06aa7e67a6a37e9968c286bdb686bd2346b34bfee3f2059e3af19f05fa59acdea3eb0db1cbc52b49981bd6b040165fb17f9589b SHA512 69559e48cb18de8dec8003c05352d506aa5348cb233be5d80bf37c782ab89e73f57414052b1c439b2e1055ed1fbbb5869990e30913da701bf7afa7c6bb131483
 EBUILD ignition-transport-4.0.0.ebuild 780 BLAKE2B 66873b9eb374d0775ce5ecbd794504c740a7c10279b35e76df328adc4c697db225f23d8ade9ffbbb08b8df976fbec8c752f477d0eedad6fdbd9084f7ad3c2be8 SHA512 df93993a6794f2d17f2f1c223bb944ce1b6b8eb8c45f865c247ad0bdee9c84b9095cbdb2062e6029a89d0ac0a2e5a9365fed44fec873aa7f0cac0590c0947f73
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/net-libs/ignition-transport/ignition-transport-3.1.0-r1.ebuild b/net-libs/ignition-transport/ignition-transport-3.1.0-r1.ebuild
deleted file mode 100644
index d061cf3b13b0..000000000000
--- a/net-libs/ignition-transport/ignition-transport-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils vcs-snapshot flag-o-matic
-
-DESCRIPTION="Combines ZeroMQ with Protobufs to create a fast and efficient message passing system"
-HOMEPAGE="https://ignitionrobotics.org/libraries/transport"
-SRC_URI="http://gazebosim.org/distributions/ign-transport/releases/${PN}3-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3/3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	net-libs/ignition-msgs:0=
-	dev-libs/protobuf:=
-	>=net-libs/zeromq-3.2.0:=
-	sys-apps/util-linux
-	net-libs/cppzmq
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-S="${WORKDIR}/${PN}3-${PV}"
-
-src_configure() {
-	# upstream appends this conditionally...
-	append-flags "-fPIC"
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	cmake-utils_src_configure
-}
diff --git a/net-libs/kdav2/Manifest b/net-libs/kdav2/Manifest
index 7cae726b6620..55d7dedca0c6 100644
--- a/net-libs/kdav2/Manifest
+++ b/net-libs/kdav2/Manifest
@@ -1,3 +1,4 @@
-DIST kdav2-0.1.0.tar.xz 47012 BLAKE2B 29d2c663590371dc1107a7a9408ae539780ab039af163b4e8b80c575ad7dda8d96f70ca4c43c0bbc1704c7583341b20f61ea567d912d7f4575bb2944190f93d7 SHA512 4d4e19ed9b8b44f5eea7d40d24dd4accd6b41ea5020b492d83d85ff7fee1e0bc72f50667a31b8021fe9aaa45fbaa6dea86fdb81a4f4db45d9d16ba98adb636b4
-EBUILD kdav2-0.1.0.ebuild 475 BLAKE2B a82a65715ecc0173c91bbb4d5f37071a017de8cc29e4a5e1178f4c035e489fe5830c7b6125bfc09c099b7dcdf0a05bafd1c18799e2cd9d8f7065adb07230c4ec SHA512 947b7a85e1e99ed2f842b72e3fb6e5186efef1a91c4072bd22ffbfadb9fe542b3336b718cd6d89ac4b54634364f0db857607326ac5a95b7796b67c818ba6967e
+AUX kdav2-0.2.0-qt-5.11.patch 209 BLAKE2B eb03b7877db105894d19d0a597c112f760b68a4d556762b8101f10cb8203a1fd0d417f124065cf0d9dfc1c3f40f5201c8e86bc083073acb3e65bc1ce21f863e0 SHA512 1e7ad2451b709b9c8fc301f4f7975dd725b02ae3f8640b1e172a8ff3fc21e91c62ea892ff42ae298331b20a01f967cfcf047955f87b38082a02553e6314a01d1
+DIST kdav2-0.2.0.tar.xz 49440 BLAKE2B 965f38b854f8aa95b907fbde136fbffdfdf47690e7816cc6a5e3d8014b97a57bad991a0a1aa488a855065eeba50bd7bb73f25ac05ccc9dedee563044da293519 SHA512 ef2510ae36a8e5be0903eb7e576c0f62c5e17d36cb42a9e6f07bb8d06f2e2a46354cf10256509f7c252e58f281f5e32e1c9dae682c421ac96941b7785df6a6a3
+EBUILD kdav2-0.2.0.ebuild 518 BLAKE2B 8124867db55fdeac5ac251850fe8c351377c9bb569657928b97785d475fe3b66e2cd33c831eb52e7cb9867e8a6869b16e182492356d87c060be041fcdbab710a SHA512 09a3152d2febd5b90863859dc0dd0f8aa70c4b59cb971c32106be0a0e79cff681cdfc27eb712568fef878244dfff4e476e4a78bfaa817739f9096a6b1d4facc0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdav2/files/kdav2-0.2.0-qt-5.11.patch b/net-libs/kdav2/files/kdav2-0.2.0-qt-5.11.patch
new file mode 100644
index 000000000000..b5db5c1966e2
--- /dev/null
+++ b/net-libs/kdav2/files/kdav2-0.2.0-qt-5.11.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/645392
+
+--- a/src/common/davjob.cpp
++++ b//src/common/davjob.cpp
+@@ -20,6 +20,8 @@
+ 
+ #include "daverror.h"
+ 
++#include <QDebug>
++
+ using namespace KDAV2;
+ 
+ class DavJobPrivate {
diff --git a/net-libs/kdav2/kdav2-0.1.0.ebuild b/net-libs/kdav2/kdav2-0.1.0.ebuild
deleted file mode 100644
index 4cab5434a661..000000000000
--- a/net-libs/kdav2/kdav2-0.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KJob based DAV protocol implementation"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-"
-RDEPEND="${DEPEND}"
diff --git a/net-libs/kdav2/kdav2-0.2.0.ebuild b/net-libs/kdav2/kdav2-0.2.0.ebuild
new file mode 100644
index 000000000000..1652b2375aeb
--- /dev/null
+++ b/net-libs/kdav2/kdav2-0.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KJob based DAV protocol implementation"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index 0f859656e20c..b4b24c48b1cd 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libaccounts-glib-1.23.tar.gz 127931 BLAKE2B 2379786bb4a658eaba632a1788782a0b5620e69fa058e991a41feeedf5b8f4786592077f237513fde9ed4ea00db015a7dd0be6ad852c265a5b7f8b1180ac01e4 SHA512 88fec1fed7a135375516363e4b7f1330d45a6337bbfb45dd35dabce87097ee4e550e968870541e1b496c2ee3db1bd26e0665f4155f1e64d1cc7b6b74d5b71b5c
-EBUILD libaccounts-glib-1.23.ebuild 818 BLAKE2B 5dd620e3cffa76ef1bfe5b28d51c59a2484026dd246fcf8f8c9d874023133aa2252564288d703ff7cb90fda7a5e85c0814e4eaddac654963a62144c4b741c501 SHA512 ed750fec2937c287744effc8bd5059779b7c042a5bee1e6ceb0a1ed20356d4349a17f6df598cfc068b2c7824e60f385e5c1a82abaa3cd631d8e3a067b96ca981
+EBUILD libaccounts-glib-1.23.ebuild 849 BLAKE2B 003c98a278c6aef16ad363e0dcfb6963134f643814e2c2e62a4bb47bcd1e8fdcccdb17dde3dab22dd3b68fa61040870e33db7611070db19b32a34ee65029e9ee SHA512 574ec15032d41dfe802b1d7f88e93b214df30f61e73fa5b65b2a9f5fb5cf5c4896dd90d89696a02b594388e7f4e2154c0eb48c22e41d82097aaf7f4545d2aa32
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
index 94c1a275a838..5752429d98ee 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils vcs-snapshot xdg-utils
+inherit autotools vcs-snapshot xdg-utils
 
 DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
 HOMEPAGE="https://01.org/gsso/"
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-libs/libxml2
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc
 "
 
@@ -43,5 +44,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libbloom/Manifest b/net-libs/libbloom/Manifest
index 2e361babc44d..a19fb5b68ff0 100644
--- a/net-libs/libbloom/Manifest
+++ b/net-libs/libbloom/Manifest
@@ -1,3 +1,3 @@
 DIST libbloom-1.5.tar.gz 1210081 BLAKE2B 8af463c487c2898c5a4cf3f7541490e2b069d4667ccda4b536f347535be5c7f5664c8ee17e0789ac5325feb8f325ae30a89e2de34323962e89378724cf130a84 SHA512 0dd69e3ee102e5808ba4350c71d212876db56235e263f8d5a66d6c3616d2e51cc18b5ca3a5a946d79c12751d9cc5667f7c633d77645c4b88a4d16ea344b51929
-EBUILD libbloom-1.5.ebuild 465 BLAKE2B ebabfdbbe91d970999ffc2d4d4e855a7fa99ebc940b5b0dd6a058726eb76190aa4ce32639eb7b5cfc61ddecadf9f3c136789c9e802b7cbde690e3455b1f3fd08 SHA512 26f81fa54486c1a0524305e5cfc57a22d1bc56b6049c58cf0a3b8b70bd3f879c737f004a935c633b6144d83ad4b35bf6086d2ce80a582574b8d6b1c1b2bf6bd0
+EBUILD libbloom-1.5-r1.ebuild 546 BLAKE2B b456b74c3cdf402a327734716cf2547d232277b9a280b1f77f22735e9e40bedb246c439f1122ff64bcbd99d352b29ecba28ec281a2a5da895703abfe897efdbb SHA512 36f2d61b296fb01d533e7038b3efa3ac582de7d16c4501d60c6c6de1e04adea5bd5f2535b7d3ca803429c3ba6f2f47bc1832b527bbaf60a254e885e71258ce3a
 MISC metadata.xml 321 BLAKE2B b9276958b83d4101521b0946b8cd6db70acfc4e7257fe1773cf0e85a1f6d9434c2d27022f3628578aad4156fedafd635f89c273b09933918149491c96918d207 SHA512 c744f0f8c72f05d96c85a7dade513d5aae40413450902b66d30a0eff88c92e4f9bbf2a1f0ccfef29bef817115dd85ff7ce4386592a25ee9f5e492a398a9ff4f8
diff --git a/net-libs/libbloom/libbloom-1.5-r1.ebuild b/net-libs/libbloom/libbloom-1.5-r1.ebuild
new file mode 100644
index 000000000000..7e255245ef90
--- /dev/null
+++ b/net-libs/libbloom/libbloom-1.5-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A simple and small bloom filter implementation in plain C."
+HOMEPAGE="https://github.com/jvirkki/libbloom"
+SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake CC=$(tc-getCC) BITS=default OPT=
+}
+
+src_install() {
+	doheader bloom.h
+	dolib.so build/${PN}.so*
+}
diff --git a/net-libs/libbloom/libbloom-1.5.ebuild b/net-libs/libbloom/libbloom-1.5.ebuild
deleted file mode 100644
index 665848c2f38d..000000000000
--- a/net-libs/libbloom/libbloom-1.5.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
-
-DESCRIPTION="A simple and small bloom filter implementation in plain C."
-HOMEPAGE="https://github.com/jvirkki/libbloom"
-SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	doheader bloom.h
-	dolib.so build/${PN}.so*
-}
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index a2731c543f4b..803eb0a57e7f 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,6 +1,4 @@
-DIST libdom-0.3.1-src.tar.gz 868959 BLAKE2B f132723aa9387b44cf2b07285eabb2f831103125a696a2a9d4a73275ea555663b26534b25f31f4da8211d6b70b2f4739d61934d8e9b33b3150d442c15249f538 SHA512 a7acd64a99145483274a44bd47af16474eadab5e6cf46847c61775c8d9fc03aa8cb4ad21fa63377b8c758c9556c140d626a2c3b2be31072fb5afdc2cee589e0c
-DIST libdom-0.3.2-src.tar.gz 869599 BLAKE2B 9a7a9cae1604624884be331e7d9ee578ffaa90a1fe4a29c97ef8f68e5ce40156ae87ad1345074b752a07298f8921955d786407d17d5d1dd612ec382e7daef72d SHA512 dd7a9e17539b0ac6088f6c395133296e2b200a5c6d342c8dd837e71d62826fa77cecf9b716e53102bd90b03c4653689c89e72683057dab0d62a530e940d6b6b3
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libdom-0.3.1.ebuild 1066 BLAKE2B 6a26b9cdd7b5ec0b818f8fe62556e023d6e0e38418ab06b9c53614611c13a534e429caa026134bb89969812f54dca6dff4a08c316478df9b11772c84bc19706d SHA512 ca234dbc7f51c92e2877a693b1bb713984f98032b85f664a522ea64e5047690814d528ada14433352ec7e8f730f7f6f1451cafb5fa455aeda5920ab30c74f476
-EBUILD libdom-0.3.2.ebuild 1066 BLAKE2B 6a26b9cdd7b5ec0b818f8fe62556e023d6e0e38418ab06b9c53614611c13a534e429caa026134bb89969812f54dca6dff4a08c316478df9b11772c84bc19706d SHA512 ca234dbc7f51c92e2877a693b1bb713984f98032b85f664a522ea64e5047690814d528ada14433352ec7e8f730f7f6f1451cafb5fa455aeda5920ab30c74f476
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libdom-0.3.3.ebuild 1154 BLAKE2B 97f611afccded19c7292e00a39187662116fac41740a7ce5d8afdfb2b92b33e7d412f5ad7eed97d15b83e0e3b46889cdf566017d8bf724c24479a6f4ee064ad4 SHA512 2719a5b91644a7ff0628cfbeb3a9c63e627db62e19a717f308e8b704f04179b8481fe973e2e7168b92113d44f2494717c96493622f9ef7f02a67ca4d4cb20313
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/net-libs/libdom/libdom-0.3.1.ebuild b/net-libs/libdom/libdom-0.3.1.ebuild
deleted file mode 100644
index 460b2a411916..000000000000
--- a/net-libs/libdom/libdom-0.3.1.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
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="implementation of the W3C DOM, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE="expat test xml"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.3.0[static-libs?,${MULTILIB_USEDEP}]
-	>=net-libs/libhubbub-0.3.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	xml? (
-		expat? ( >=dev-libs/expat-2.1.0-r3[static-libs?,${MULTILIB_USEDEP}] )
-		!expat? ( >=dev-libs/libxml2-2.9.1-r4[static-libs?,${MULTILIB_USEDEP}] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-perl/XML-XPath
-		dev-perl/libxml-perl
-		dev-perl/Switch )"
-
-REQUIRED_USE="test? ( xml )"
-
-src_configure() {
-	netsurf_src_configure
-
-	netsurf_makeconf+=(
-		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no)
-		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no)
-	)
-}
diff --git a/net-libs/libdom/libdom-0.3.2.ebuild b/net-libs/libdom/libdom-0.3.2.ebuild
deleted file mode 100644
index 460b2a411916..000000000000
--- a/net-libs/libdom/libdom-0.3.2.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
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="implementation of the W3C DOM, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE="expat test xml"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.3.0[static-libs?,${MULTILIB_USEDEP}]
-	>=net-libs/libhubbub-0.3.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	xml? (
-		expat? ( >=dev-libs/expat-2.1.0-r3[static-libs?,${MULTILIB_USEDEP}] )
-		!expat? ( >=dev-libs/libxml2-2.9.1-r4[static-libs?,${MULTILIB_USEDEP}] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-perl/XML-XPath
-		dev-perl/libxml-perl
-		dev-perl/Switch )"
-
-REQUIRED_USE="test? ( xml )"
-
-src_configure() {
-	netsurf_src_configure
-
-	netsurf_makeconf+=(
-		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no)
-		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no)
-	)
-}
diff --git a/net-libs/libdom/libdom-0.3.3.ebuild b/net-libs/libdom/libdom-0.3.3.ebuild
new file mode 100644
index 000000000000..d245b9d4989f
--- /dev/null
+++ b/net-libs/libdom/libdom-0.3.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="implementation of the W3C DOM, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE="expat test xml"
+
+RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
+	>=dev-libs/libwapcaplet-0.3.0[static-libs?,${MULTILIB_USEDEP}]
+	>=net-libs/libhubbub-0.3.1-r1[static-libs?,${MULTILIB_USEDEP}]
+	xml? (
+		expat? ( >=dev-libs/expat-2.1.0-r3[static-libs?,${MULTILIB_USEDEP}] )
+		!expat? ( >=dev-libs/libxml2-2.9.1-r4[static-libs?,${MULTILIB_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-perl/XML-XPath
+		dev-perl/libxml-perl
+		dev-perl/Switch )"
+
+REQUIRED_USE="test? ( xml )"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
+
+src_configure() {
+	netsurf_src_configure
+
+	netsurf_makeconf+=(
+		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no)
+		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no)
+	)
+}
diff --git a/net-libs/libdom/metadata.xml b/net-libs/libdom/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/net-libs/libdom/metadata.xml
+++ b/net-libs/libdom/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index e9fb2170e486..15a42c9b5b89 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,7 +1,7 @@
 DIST libhubbub-0.3.3-src.tar.gz 783945 BLAKE2B 826b089708dea8a88a522f9889f81e420feb6c616ef7ad826303eca3ab39d4940cbc8bcbfcf61c979dc488d77b4d32fb24c0602b73ed28ea4e8076f369c93388 SHA512 28a5668257eda8cf1ca0395505522eb0f847a4cceee46de067fcfb171baa114876156a7e2671fff93602b2de63c640095e1a940e4725afb24bd14b4fd5f64526
-DIST libhubbub-0.3.4-src.tar.gz 784522 BLAKE2B 462de8bf233a5ab8e6b90d20ea544b9efbcadd25421c1184544f99d5cebf4b8955d0d689f7fcf81246ff7fa38d5f6c6470542830f6c9c3390521dbaa44e239ac SHA512 3e97f8b8669d27d58026e73f4545462bf2cde4ffdb7f2435760311cef3655844146f5bcb448bd0a18345e7a345ff14c619229c8bd2e7c8d78d345ba480912f55
+DIST libhubbub-0.3.5-src.tar.gz 784526 BLAKE2B a7ba1be85ab01761894a1f2904fbcfbada0280c06ad0834288366f9ce42407a61978bbd775367cc064e367ad78bc792db66ad0e034ae6903c8ad5b44a1fc4d08 SHA512 57feb6ae74381e6b2c5c8a82aef7bcc5faf4a8303e41e39f4ba081a198c6f1225ec9952734ec97f20ba1b4fa3830543e43f4c2d2715b7a8467c19224a968073b
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libhubbub-0.3.3.ebuild 789 BLAKE2B 66d8a14f88b288a3c2754d91b74f2694f44b569571992a007fec785e8d6c1e0bd098b748e230d330402e6a774e9dc71b285328dcf24f2be38585142299b1d501 SHA512 0ceede1752f74cf990b992070435f27ffb516fe4af3fe5099478d1197e554ace10580d01be3798e6abe3c27d80115553c85e2efcaefb8bfc8eb004d713980ddc
-EBUILD libhubbub-0.3.4.ebuild 792 BLAKE2B daa109131a4c7509504178bd8ef8749be2ff1c55f3447981ccef54c674c117ad035c6a8717c836eeaa8b0495badfca3b85abc7044b52c037f86e2724994c85c7 SHA512 b02eb5f317151c93253b14daeef072a2b35453082a492379ce43e68313a1f4995750da665467211932e6381d3dc401155effe402bc398a9d0a97e14f08668ab1
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libhubbub-0.3.3.ebuild 786 BLAKE2B b995a7361dc41af100c17b781ac3f9daf3d5fc47d22905153167165b256765747a8199bdfe6041ac3147f51beb047f6c1010177d60ac0197fa82daae28126b62 SHA512 80f415406e399aa5045f5f946590a07e2f94c173e5bf34e1326d17658e0f89a775c1a689934ad93dec404e8f00195155cd747696b611482f90475f97adfedff7
+EBUILD libhubbub-0.3.5.ebuild 840 BLAKE2B 6de72af9228928530253017d73e57d840f9cce3c319743fa504dc81e1c342903d70a227910bd571d7778465f6c3832e68ea52eea9a0bf68f47b38f101d35026f SHA512 6a587b178d8e0a17c426a3375a1266b988e06b2249a33c8c9444348b77cbcba1901355e5e84604e1d614a21b9484e6e0a394830cd7278768f41431b4de737461
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/net-libs/libhubbub/libhubbub-0.3.3.ebuild b/net-libs/libhubbub/libhubbub-0.3.3.ebuild
index 54fad5a9ace2..833850b112d2 100644
--- a/net-libs/libhubbub/libhubbub-0.3.3.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-libs/libhubbub/libhubbub-0.3.4.ebuild b/net-libs/libhubbub/libhubbub-0.3.4.ebuild
deleted file mode 100644
index d1bc2bf99a28..000000000000
--- a/net-libs/libhubbub/libhubbub-0.3.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="HTML5 compliant parsing library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~m68k-mint"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	!net-libs/hubbub"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lang/perl
-		>=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )"
-
-DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
-
-src_prepare() {
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i test/tree2.c || die
-
-	netsurf_src_prepare
-}
diff --git a/net-libs/libhubbub/libhubbub-0.3.5.ebuild b/net-libs/libhubbub/libhubbub-0.3.5.ebuild
new file mode 100644
index 000000000000..8277a2ae87cc
--- /dev/null
+++ b/net-libs/libhubbub/libhubbub-0.3.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="HTML5 compliant parsing library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~m68k-mint"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
+	!net-libs/hubbub"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-lang/perl
+		>=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )"
+
+DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+		-i test/tree2.c || die
+
+	multilib_copy_sources
+}
diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/net-libs/libhubbub/metadata.xml
+++ b/net-libs/libhubbub/metadata.xml
@@ -1,8 +1,12 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libircclient/Manifest b/net-libs/libircclient/Manifest
index d8fa2c78b6ea..0e39af11e77a 100644
--- a/net-libs/libircclient/Manifest
+++ b/net-libs/libircclient/Manifest
@@ -1,13 +1,11 @@
-AUX libircclient-1.6-build.patch 376 BLAKE2B 2a55d532c9f738600b5b5686a9785409da7cd4fd53433aebc72d270f1c7d8e3b00f7d54b5b7c9a914b5e412a7067697eb95c74678667b5df18f55abfa7285740 SHA512 1dd6a8a7c71b331ab1fc6a5d5f0c204bcc0c09362271df1f3304f78291555f3cf7c4fba278123c4d12f59793e9cf8cc867aae365aef82a51bb2b019c804b558b
-AUX libircclient-1.6-include.patch 289 BLAKE2B 4ba6e8eecdaad20dacd96b8418150e371bdbc65d68b87fa45738b53499633d9fbf23f6745282af2287e0ddd3118b1cceabc0305d5d6c37ed5d04e7a88b1a4b6e SHA512 62e3c1cfe8843eb16efe9e803785ba759100e3cf4c82b7f9f2fe11bd92a5fe9ad85707ef21c6231e3ee23f6e283711f643db76e79699574b3fb01eb893977d02
-AUX libircclient-1.6-shared.patch 2286 BLAKE2B f3d7556050684e950d3c50c82b42e19024c5110fb4ba51844b70b66dddab004a8503a9ba3889d659bdd7ecb57533ecec44687c735d9729f819cb3ed753730b9a SHA512 aa0cb079d206748c68ac5fbd066f78271b15f76e06a443c38ea54d35e1e2ccffb500cddd4d6a361c094b199ded876d7b47a1d08ebadbc48ea57d2bbefabf3f30
-AUX libircclient-1.6-static.patch 213 BLAKE2B 3922125e04f4736baa9a80a81fee828e424ee74c8629cb4fbcaf9791f09c6939ebf0c15c79a00a971d11aff49166cca146e80abeebd128ec4e7b3ca862a0ab9f SHA512 b370de10c348928dc75c1844b2c9f02b832ef4f44a6c7ab887e1ede35e8dbcc7fcfd427e472e35ffebc33fa98556d1cbac25be233c4ed4d5d267912c12ee9397
+AUX libircclient-1.10-openssl.patch 1210 BLAKE2B 500273e2a0665fd1f6085651bf9292bea0fc33829f1bfa9a4f5eca585e969216738e029b5e54d88a581c88befa8841c740865d29d595b45f1c8c45fc527a07e2 SHA512 66381f37e660c2663a1a6d4e28f25129b4fa3dd418860360665d0a115964507916eb0fe55fc92ca23dbcbcbbbd9da4744fb00e938413e5657b1c9da815d25029
+AUX libircclient-1.10-shared.patch 2521 BLAKE2B 09a7af8fe521c57fc9da6f63ee6a5be69e6d8633e0ede3af0def8c4c036722125ab9ffd0e48d8b93fac63a92410cdbc3465a07003cfc5f062d66c8398b747830 SHA512 bc5fbe085139c1062f901a1fa2dc38dc91ffe8031df563144c53a3c0077f3d2997a7d769de601db900a504f4fcf892ef3c42464ef0ed56010a972c9a79693447
 AUX libircclient-1.8-build.patch 340 BLAKE2B aae0969fce33301022fa11f93a2eb1c81b2a9419aa5e1bd8e2116b21f16133d3a068751bfd23d723dafcd35d5ca09b9cedb1d8b8e5bf726e320718e5e1b6da2d SHA512 44ab22464672b1f5e5ff8266ce3b4ebd8356175da2803a6f8cfc2b1e581f03c5a96f2a12a4b0bcef7bce4aeb8b6c9e31a0f149ffb2ac1b200d040e734dbbb640
 AUX libircclient-1.8-include.patch 289 BLAKE2B 4ba6e8eecdaad20dacd96b8418150e371bdbc65d68b87fa45738b53499633d9fbf23f6745282af2287e0ddd3118b1cceabc0305d5d6c37ed5d04e7a88b1a4b6e SHA512 62e3c1cfe8843eb16efe9e803785ba759100e3cf4c82b7f9f2fe11bd92a5fe9ad85707ef21c6231e3ee23f6e283711f643db76e79699574b3fb01eb893977d02
 AUX libircclient-1.8-shared.patch 2348 BLAKE2B eea99254aed77d0f9f05968c7d08bd6d90d223d4865a0ed85ce919f1597834cb6430cb732b88e4f40a851f51b7ac1b506a64e1d3836ea0c357ab79786cfc857f SHA512 e61b6c2d56be6cefb4320a93dae96d2fb0dbaf9818246ba1b9be88ab21d3302108d4cfb650cf0db564c50b2913d67ac24183221f2f522eab21097cbbbb37b642
 AUX libircclient-1.8-static.patch 209 BLAKE2B cc25d264d6d1801584ee06ca51921f7ad1dee1499b1e604c8d732779b44f22aa93fc076c97fee45d131d10cb46cf611a4e03220e61462d2b0003653554667217 SHA512 b1161ce28e5a8d668c852ee0ac336c186426a9467156c66ebe4805a722297ec225cc6b859c13003741d05a15ced1ccfaca0a20d98bf0bf933fc84fc1a97d8827
-DIST libircclient-1.6.tar.gz 392788 BLAKE2B 143b080389442b4106715c4437e319a08ebfdf55cb8d2d510d4e10a68157f791d9ab01379c89facbcddc1e690cea39c8649cec65367d436ab57381633a1b9565 SHA512 94a68f27fcb12c918fa347d4ee44747e08e016245048c81f179b9a45081bd336c329e7185a3bc46deb28c9c77e1eff5dc53de7e723b1ed5ee2c1d3cc57ce0548
+DIST libircclient-1.10.tar.gz 288863 BLAKE2B 28bcfb36553c04be28ef4ffc0cf5fe3af8538704997f628f311719d245a0629ff49bee2c512d29e4d43a24a2803cbafc99512ebda7d5c991d9ecb2f1786a9d24 SHA512 d677ceae0bfabc112671b351fb94d048399a7ad025ff33a2ff1ae6313382fcc78b64d499f2c882eb8b894abdde949562395819e4059fd14640dfae6757b0c259
 DIST libircclient-1.8.tar.gz 291803 BLAKE2B 7fcbf8e8466ac95ca5a27475551af45f828b29385b28071d02271deae03d6bbd3589e86efe56b1fe5020be7894e699534ef1e3a2f2fedca1909e4d8e0c04d067 SHA512 f19e4b55cf49091ab2c83ff3d5cace2252daad6bf23cb61b7677b9c6055fe8a8a7d891f6e1e5962481c836f47b7dcd35ef563c8807737ac81e3c4cee253cfc4a
-EBUILD libircclient-1.6-r2.ebuild 1097 BLAKE2B 75dd684c0918d713e5fe96e5dcc9488ca92a448203b87f1ca09e445452d3421a287c90db0a716383e3c49c0f2aa8b0981c558cdb6c68ee580b4b182361ff0f8e SHA512 afa58d5fc2e91249fb9f97e3b366be1729714c0af38fcc93482cf8d2c7d23def5f47a387ec90596475174a7282e6c3540d7d8a5b3dd1c649ec84289f290b2919
+EBUILD libircclient-1.10.ebuild 1298 BLAKE2B 8014b74bf17844f0f658d0e6aecade76235e7e2aec1d010c0146ba8664aa676533cde6a5a09ab88b88e7be1f412baa60df6208f88b059acb5793b35849ec1349 SHA512 0df4434ad26da9256aec34d5a6e82ac8eb4e7f83e9e6760611e8406f8abc0989e791eb530f49c0689eab46382fdd9c39a39465ce86cefc40910bcc16de158468
 EBUILD libircclient-1.8.ebuild 1135 BLAKE2B f28f32d1a8a08987f214ca78c4c53a7108644495a9136b2145c36396a1bfcebf8e205cc69381b261183006ed1beec1f89c39ecb23e5e5d99d22f5f5c209bcf29 SHA512 c638d79b35913a4c095ce6a8b2b7122bed056fa0dd01242837067fe1273181d898970961647afeed42311a9cccfb1c6cdf00f0af4f33b6bdcbe899fa76517d03
 MISC metadata.xml 335 BLAKE2B 9616df0f3f19ee3ece536dfb658a60a9ffb53bed2562086cc5d0f15f27116a86d3ace0c0a796c476045a74d49e803008d9c345ad027f8bdfbb5923e008445268 SHA512 af62ea7ba30a57f3271bded0d53a9122693e992d1050667701ba54bb33d6851b6ddabecf5f54bbdf8aebb212bd3e6a5999a8e8c1b2bbdd6666243ccb24a6182b
diff --git a/net-libs/libircclient/files/libircclient-1.10-openssl.patch b/net-libs/libircclient/files/libircclient-1.10-openssl.patch
new file mode 100644
index 000000000000..b488f7f626c7
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.10-openssl.patch
@@ -0,0 +1,38 @@
+https://sourceforge.net/p/libircclient/code/141/
+https://sourceforge.net/p/libircclient/code/142/
+
+--- libircclient-1.10/src/ssl.c
++++ libircclient-1.10/src/ssl.c
+@@ -114,26 +114,23 @@
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_library_init();
+ #else
+-	OPENSSL_init_ssl(0, NULL);
++	if ( OPENSSL_init_ssl(0, NULL) == 0 )
++	 return LIBIRC_ERR_SSL_INIT_FAILED;
+ #endif 
+ 
+ 	if ( RAND_status() == 0 )
+ 		return LIBIRC_ERR_SSL_INIT_FAILED;
+ 
+ 	// Create an SSL context; currently a single context is used for all connections
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ssl_context = SSL_CTX_new( SSLv23_method() );
++#else
++	ssl_context = SSL_CTX_new( TLS_client_method() );
++#endif
+ 
+ 	if ( !ssl_context )
+ 		return LIBIRC_ERR_SSL_INIT_FAILED;
+ 
+-	// Disable SSLv2 as it is unsecure
+-	if ( (SSL_CTX_set_options( ssl_context, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) == 0 )
+-		return LIBIRC_ERR_SSL_INIT_FAILED;
+-
+-	// Enable only strong ciphers
+-	if ( SSL_CTX_set_cipher_list( ssl_context, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" ) != 1 )
+-		return LIBIRC_ERR_SSL_INIT_FAILED;
+-
+ 	// Set the verification
+ 	if ( session->options & LIBIRC_OPTION_SSL_NO_VERIFY )
+ 		SSL_CTX_set_verify( ssl_context, SSL_VERIFY_NONE, 0 );
diff --git a/net-libs/libircclient/files/libircclient-1.10-shared.patch b/net-libs/libircclient/files/libircclient-1.10-shared.patch
new file mode 100644
index 000000000000..33a1cc1d54e0
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.10-shared.patch
@@ -0,0 +1,50 @@
+--- libircclient-1.10/src/Makefile.in
++++ libircclient-1.10/src/Makefile.in
+@@ -1,8 +1,10 @@
+ # $Id: Makefile.in 137 2018-08-27 01:11:08Z gyunaev $
+ CC = @CC@
+-CFLAGS = -Wall -Wno-misleading-indentation -Wno-unused-function -Wno-nonnull -DIN_BUILDING_LIBIRC @CFLAGS@
++CFLAGS = -fPIC -Wall -Wno-misleading-indentation -Wno-unused-function -Wno-nonnull -DIN_BUILDING_LIBIRC @CFLAGS@
+ AR=@AR@ cr
+ RANLIB=@RANLIB@
++INSTALL=install
++LN=ln -sf
+ INCLUDES=-I../include
+ DESTDIR=
+ APIVERSION = 1
+@@ -15,19 +17,24 @@
+ shared: libircclient.so
+ shared_mingw: libircclient.dll
+ 
+-install:
+-	-mkdir -p $(DESTDIR)@prefix@/include
+-	-mkdir -p $(DESTDIR)@libdir@
+-	cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
+-	cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
+-	cp ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
+-	cp ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
+-	cp ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
+-	cp libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
+-	ln -fs libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
++install: install-headers install-static install-shared
++install-headers:
++	$(INSTALL) -d $(DESTDIR)@prefix@/include
++	$(INSTALL) -m0644 ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
++	$(INSTALL) -m0644 ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
++	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h
++	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h
++	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h
++install-shared:
++	$(INSTALL) -d $(DESTDIR)@libdir@
++	$(INSTALL) -m0755 libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
++	$(LN) libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
++install-static:
++	$(INSTALL) -d $(DESTDIR)@libdir@
++	$(INSTALL) -m0644 libircclient.a $(DESTDIR)@libdir@/libircclient.a
+ 
+ libircclient.so: libircclient.o
+-	$(CC) -shared -s -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@
++	$(CC) @CFLAGS@ -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@
+ 
+ libircclient.dll: libircclient.o
+ 	$(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libircclient/files/libircclient-1.6-build.patch b/net-libs/libircclient/files/libircclient-1.6-build.patch
deleted file mode 100644
index d3d6c0f3edf9..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libircclient-1.6/configure.in
-+++ libircclient-1.6.new/configure.in
-@@ -61,9 +61,7 @@ AC_CHECK_FUNCS([localtime_r socket])
- AC_CHECK_LIB(socket, socket, AC_DEFINE(HAVE_SOCKET) LIBS="$LIBS -lsocket")
- 
- if test "$use_debug" = "yes"; then
--	CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"
--else
--	CFLAGS="${CFLAGS} -O3"
-+	CFLAGS="${CFLAGS} -DENABLE_DEBUG"
- fi
- 
- # Choosing the target
diff --git a/net-libs/libircclient/files/libircclient-1.6-include.patch b/net-libs/libircclient/files/libircclient-1.6-include.patch
deleted file mode 100644
index c5bce1dfd947..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libircclient-1.6.orig/include/libircclient.h
-+++ libircclient-1.6/include/libircclient.h
-@@ -130,6 +130,7 @@
- #define IN_INCLUDE_LIBIRC_H
- #include "libirc_errors.h"
- #include "libirc_events.h"
-+#include "libirc_rfcnumeric.h"
- #include "libirc_options.h"
- #undef IN_INCLUDE_LIBIRC_H
- 
diff --git a/net-libs/libircclient/files/libircclient-1.6-shared.patch b/net-libs/libircclient/files/libircclient-1.6-shared.patch
deleted file mode 100644
index 44fe9ded64b6..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-shared.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- libircclient-1.6/src/Makefile.in
-+++ libircclient-1.6/src/Makefile.in
-@@ -1,10 +1,13 @@
- # $Id$
- CC = @CC@
--CFLAGS = -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
-+CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
- AR=@AR@ cr
- RANLIB=@RANLIB@
-+INSTALL = install
-+LN = ln -sf
- INCLUDES=-I../include
- DESTDIR=
-+APIVERSION = 1
- 
- OBJS = libircclient.o
- 
-@@ -14,19 +17,24 @@
- shared: libircclient.so
- shared_mingw: libircclient.dll
- 
--install: lib
--	-mkdir -p $(DESTDIR)@prefix@/include
--	-mkdir -p $(DESTDIR)@prefix@/lib
--	cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
--	cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
--	cp ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
--	cp ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
--	cp ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
--	cp libircclient.so $(DESTDIR)@prefix@/lib/
--	cp libircclient.a $(DESTDIR)@prefix@/lib/
-+install: install-headers install-static install-shared
-+install-headers:
-+	$(INSTALL) -d $(DESTDIR)@prefix@/include
-+	$(INSTALL) -m0644 ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
-+	$(INSTALL) -m0644 ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
-+	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
-+	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
-+	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
-+install-shared:
-+	$(INSTALL) -d $(DESTDIR)@libdir@
-+	$(INSTALL) -m0755 libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
-+	$(LN) libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
-+install-static:
-+	$(INSTALL) -d $(DESTDIR)@libdir@
-+	$(INSTALL) -m0644 libircclient.a $(DESTDIR)@libdir@/libircclient.a
- 
- libircclient.so: libircclient.o
--	$(CC) -shared -s -o libircclient.so libircclient.o @LIBS@
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o $(LDFLAGS) @LIBS@
- 
- libircclient.dll: libircclient.o
- 	$(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libircclient/files/libircclient-1.6-static.patch b/net-libs/libircclient/files/libircclient-1.6-static.patch
deleted file mode 100644
index 4ecbb3362223..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libircclient-1.6.orig/src/Makefile.in
-+++ libircclient-1.6/src/Makefile.in
-@@ -9,6 +9,9 @@
- DESTDIR=
- APIVERSION = 1
- 
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
- OBJS = libircclient.o
- 
- all:	@TARGET@
diff --git a/net-libs/libircclient/libircclient-1.10.ebuild b/net-libs/libircclient/libircclient-1.10.ebuild
new file mode 100644
index 000000000000..940b5f0a3967
--- /dev/null
+++ b/net-libs/libircclient/libircclient-1.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Small but powerful library implementing the client-server IRC protocol"
+HOMEPAGE="http://www.ulduzsoft.com/libircclient/"
+SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6 ssl static-libs threads"
+
+DEPEND="ssl? ( dev-libs/openssl:0 )"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8-build.patch
+	"${FILESDIR}"/${PN}-1.10-shared.patch
+	"${FILESDIR}"/${PN}-1.8-static.patch
+	"${FILESDIR}"/${PN}-1.8-include.patch
+
+	# upstream patches (can usually be removed with next version bump)
+	"${FILESDIR}"/${PN}-1.10-openssl.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable threads)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable ssl threads)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C src $(usex static-libs "shared static" "shared")
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install-shared $(usex static-libs "install-static" "")
+	insinto /usr/include/libircclient
+	doins include/*.h
+
+	dodoc Changelog THANKS
+	doman man/libircclient.1
+}
diff --git a/net-libs/libircclient/libircclient-1.6-r2.ebuild b/net-libs/libircclient/libircclient-1.6-r2.ebuild
deleted file mode 100644
index 1f6a2f5bbe59..000000000000
--- a/net-libs/libircclient/libircclient-1.6-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Small but powerful library implementing the client-server IRC protocol"
-HOMEPAGE="http://www.ulduzsoft.com/libircclient/"
-SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc ipv6 ssl static-libs threads"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-shared.patch \
-		"${FILESDIR}"/${P}-include.patch \
-		"${FILESDIR}"/${P}-static.patch
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable ipv6) \
-		$(use_enable ssl openssl) \
-		$(use_enable ssl threads)
-}
-
-src_compile() {
-	emake -C src $(usex static-libs "shared static" "shared")
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" $(usex static-libs "install" "install-shared")
-	insinto /usr/include/libircclient
-	doins include/*.h
-
-	dodoc Changelog THANKS
-	if use doc ; then
-		doman doc/man/man3/*
-		dohtml doc/html/*
-	fi
-}
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index c2dc2fb690db..85372603cb93 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,5 +1,5 @@
 AUX libsignon-glib-1.12-doc-disable.patch 844 BLAKE2B 600b936552c64473dfce637d60a782526a42858d3b7e3118c78ec442cb6d53e167503407d0bf3ded34024a7065d5fdbf3f487edd7e3fb701d0a009eff158d094 SHA512 690ee30d4e1d6277c0b02720212654d482173a75657da7f72c30f258921cbe790ea2d47d3de9a598be04e4ef55b995118ab5a537ed728c2735445915810f561d
 AUX libsignon-glib-1.14-default-opts.patch 1714 BLAKE2B 8c00bcf5b056cd0fe05f58ed5727569cf9b917d6e4e7e11d90bd52ef343f8b26e02f98ab463e5c2a1121ba48f0260896f1301b1446c0f26146a8e2e5d6ce3c05 SHA512 bb27417ff1dc03510fdd1f019b7b8d044a8c281243467dfa7d2fdd8123ef3290a325a7c9a96bd246f37891bd7ac9ce2702b40396ed067dbac4b9e995a89d2430
 DIST libsignon-glib-1.14.tar.gz 54019 BLAKE2B 9ffdb96a374ef0848c1b70cb369a533ea826b24856a32b4b454a0fd8982533041fcc88382fdf1eee6857aa36ec8d076885fc769a058e148e91da54dbddaf7125 SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d
-EBUILD libsignon-glib-1.14.ebuild 1756 BLAKE2B bb5a3f42035dee0647b6e13f040c766ab1b78210cd4fcdf39e05869e22e9a56ec9b7d4e7a10643765407a16ff173eb646b52599fc6ce6748b53d9b8cb6cb8d6a SHA512 1b11907e4a449014fa1a75ce0b06e1cc6790d9843dcf5725b4ac7bd5ce6e3ec33e8ae58702fcc5c0b0bb72eee27091528f7963a0325e55db7387ba1b776b745d
+EBUILD libsignon-glib-1.14.ebuild 1700 BLAKE2B 854e8555d79b659070278d39b16e60d616de010ae3b7b5053e2e5b882d94ac5297193a270853d5a6ad2ca905bf53853bad02bbd0d2b4882e3aed2d4b6c76580d SHA512 c26d4017da7a744631788a630a14bfbe01ce86cbf7592eddf5c5a2173eb5e19216f2017cc95746a45ebe0c519bc7936b4ab78c86c1990732f47e004427a3a947
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
index 51eecdc3d558..740195845377 100644
--- a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gdbus-codegen
 	doc? ( dev-util/gtk-doc )
 "
@@ -72,8 +73,6 @@ src_configure() {
 }
 
 src_compile() {
-	# fails to compile with more than one thread
-	MAKEOPTS="${MAKEOPTS} -j1"
 	default
 	if use python; then
 		python_foreach_impl run_in_build_dir default
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index d065910db0c9..82ffaabcd5c4 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -1,4 +1,3 @@
-AUX libsrtp-2.1.0-pcap-automagic-r0.patch 692 BLAKE2B 2d4f182d12b97dbf1a06ef178c4e0562e1ff91a8a194076c4aef9a73dc9a7dd5e47fdd8036d334f460c3aade43350b885ab05287842f287a0738c5d0aa9d377d SHA512 ac5ffa640d61332fcdb41e99895e2934e19211809011a9a8250a1e15dcc565072f7e2a6b4b24602769bf7c70a98ec3606832ef9ab2225bfa9fded2970b07d5fa
 AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cdddb6a959dc59d0fcaa340faf5d04ad9b6803d676d626ce6cecdee1e097defc3c69df7e1216f012276e81c22fb043e6b0e633c4 SHA512 b3c80f5d05748eeb5d93f1c5fe2cc73b3380529a8de44315291fe2a9fbf32df861dec511038f551df65c2cb2592ce337d497c06c8855ce8dd1def9a67bae40ad
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
diff --git a/net-libs/libsrtp/files/libsrtp-2.1.0-pcap-automagic-r0.patch b/net-libs/libsrtp/files/libsrtp-2.1.0-pcap-automagic-r0.patch
deleted file mode 100644
index b29fa1ba4f95..000000000000
--- a/net-libs/libsrtp/files/libsrtp-2.1.0-pcap-automagic-r0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uNr libsrtp-2.1.0.ORIG/configure.in libsrtp-2.1.0/configure.in
---- libsrtp-2.1.0.ORIG/configure.in	2017-09-18 23:53:18.241631991 +0100
-+++ libsrtp-2.1.0/configure.in	2017-09-18 23:55:30.077635461 +0100
-@@ -272,10 +272,13 @@
- AC_SUBST([HMAC_OBJS])
- 
- dnl Checking for PCAP
-+AC_ARG_ENABLE([pcap], AS_HELP_STRING([--disable-pcap], [Build without `pcap' library (-lpcap)]))
-+AS_IF([test "x$enable_pcap" != "xno"], [
- AC_CHECK_LIB([pcap], [pcap_create],
-   [LIBS="-lpcap $LIBS"
-    AC_DEFINE([HAVE_PCAP], [1], [Define to 1 if you have the `pcap' library (-lpcap)])
-    AC_SUBST([HAVE_PCAP], [1])])
-+])
- 
- AC_MSG_CHECKING([whether to redirect logging to stdout])
- AC_ARG_ENABLE([log-stdout],
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index a4626de0bcc0..0883d3fbcb78 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -7,12 +7,9 @@ AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a28
 AUX libssh-0.8.3-strict-overflow.patch 627 BLAKE2B 81d29d56f91bb5c649f8f2e3706034de59834b859725bddd9243a934335fc20d13dbc2fcb0e8627ba23856072958e1bf06224403ed24a871a38a909af09d38d8 SHA512 06529a3a6145ac4123f48b307b45376441b09c368a6cc89d514180e6a0e7fb5be46c3a1ed118bb2f8aec61a389fadbb7c8b2649d35dfa03bbdfc01befad56fc6
 DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
 DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
-DIST libssh-0.8.2.tar.xz 408412 BLAKE2B bbd531ed511baa84d40c2e156cc63fca09345196e24e485930d8f42fed451529ea6ec2ce6f50276dfa56d5523062bbc45774891ad47ce7c748e8b95bc28b9f8c SHA512 ef9877d2a35f1871139c12452c917a3888172ea29f71d880e824de182695e5a8786bb39ca2f4874a160e156648d52065a8b2e7c040220badf65eee35dcfddeb9
-DIST libssh-0.8.3.tar.xz 422244 BLAKE2B b24e4eed3ad1cd336b1864c68e366788ea62d0df2d527afaabf8d57c2f3e7b490a999bee8e4bfbfac512a77ee2a32cb1a95dbcdbcef2bd8aad5addbed1aeb01f SHA512 09e7ccbb2c584a9e51366a43f08f80cc5775c649886736629ab10f3520432d107c93e94a54c7d7e49a68f8f3b5d268bf1985acbe08d29dbffbfc0c53a4937ea5
+DIST libssh-0.8.4.tar.xz 425848 BLAKE2B 8ca913e4c9e2ffa231bb437ac6a4de695bbdf8720a7619f3fc310a3d724cb7e85bcf81d31761c3fe4e3c29010b67d3fc81cf391d5c2f7e051cb8cc2400763248 SHA512 73d685bab2e88ff6b03c95cc13f1bd341bce4c527353c7e4870865d236cfbe23dfd2d198a1ec1531aed1afd700ce8e5b738ec68ca9152a4b6ae63dd6cbbf0d51
 EBUILD libssh-0.7.4.ebuild 2510 BLAKE2B f644104dcf0707121f141a2b75bdb57935daf4a01d897b5ffb96d6875e681aecfd9730cd02d6330acdf96256f012643659951ca4cd97e2126bf6991fa88ab14e SHA512 1a7bf07e67bb6caf4a183095347fc512dcfcb98a729db2cc1416f39a3bb201ad3046eec7c82c3aa07c7a9f3c5e6b3d3e908a4d32252b0697bdc76173f287a8df
 EBUILD libssh-0.7.5-r2.ebuild 2720 BLAKE2B 76d98f803d58cdea91439451e4842c3079bc19c052845d4f18d27fbd94faf4f3028c244b9ccacbfc27edf87490cbad7af73c3f540f012b3c597ca3596f65c20e SHA512 80148669a5bdb2b0a1cdfdd295ef833ccd51270cfdc2986109b2a6b1bad5da3908642c89e929fed5dc2fda20d8104b3dace60c0d87c7c6450bace22d091efc82
-EBUILD libssh-0.8.2.ebuild 2883 BLAKE2B f59deaa0db71faae34fb699be9102a6d5c7ac88722390cdf16de2cedbea66368bc102105e6d200edcbaa525f12e5a3553d9a4dc1a852dc45c2989bb3e11c99d8 SHA512 da54bac3c25d77bfbaa0d6d6a1ab84a5fa4d00581ac31cd26c95d26ad669cca65f8538a7829dda348828c9e445bad4953ac8722dc46d443cf5fb5aeb5344e206
-EBUILD libssh-0.8.3-r1.ebuild 2966 BLAKE2B 9eed97687ac93fa78c65d9f6d0c939fd91ffeec0452ff76f5efd5ee64b21eb62075f09d52f674cba7d6b3e1acbf39e53311657530ea54202da7914afd365ed94 SHA512 af0724b5943b3c11f667508c8a232c5cf2dba642d6d72b0f4e307f5d93a26545ede0ce3dc1546d675c37b91c9367e1c6f45341d2ce42e32a907781fd324715d9
-EBUILD libssh-0.8.3.ebuild 2916 BLAKE2B 93e0101f64f7a11d8a2a83295057cecc7a4cc8cfb9ef0acf49bf00cb6a89bfda5d0e83518d28d60ffddddb069e841b3575e69194373687b77794198ddadfe0d7 SHA512 04d6693527a5d9b97fac07acc487a2bea86b968dd7dafbd3607b5811bd1e1de2edea1e63c28d23e93ea87dd7f841b8e2bdbcb8aaa210378e5f2f90817cd61481
+EBUILD libssh-0.8.4.ebuild 2959 BLAKE2B 57816055c70eba2227d28b3fda732b8dea5e9a6051264148e5e9f799bf28c7056d5f814abf3cae9359072cb3c39a54c589a79832741ca7ba9e4ea07daeef36c9 SHA512 27cd551e09bab6ad5551f9c0c11fe6501d6ed638762bf59d1d3728b042a21d63bf09f6ebacdd2ab9fc2afafe1b74b05e9c4c9f43ab11ba369c4d77ac2f410439
 EBUILD libssh-9999.ebuild 2916 BLAKE2B 93e0101f64f7a11d8a2a83295057cecc7a4cc8cfb9ef0acf49bf00cb6a89bfda5d0e83518d28d60ffddddb069e841b3575e69194373687b77794198ddadfe0d7 SHA512 04d6693527a5d9b97fac07acc487a2bea86b968dd7dafbd3607b5811bd1e1de2edea1e63c28d23e93ea87dd7f841b8e2bdbcb8aaa210378e5f2f90817cd61481
 MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8
diff --git a/net-libs/libssh/libssh-0.8.2.ebuild b/net-libs/libssh/libssh-0.8.2.ebuild
deleted file mode 100644
index d187c20721b6..000000000000
--- a/net-libs/libssh/libssh-0.8.2.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
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	inherit eapi7-ver
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.8.3-r1.ebuild b/net-libs/libssh/libssh-0.8.3-r1.ebuild
deleted file mode 100644
index 7b660604f3aa..000000000000
--- a/net-libs/libssh/libssh-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	inherit eapi7-ver
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.0-tests.patch"
-	"${FILESDIR}/${PN}-0.8.3-strict-overflow.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.8.3.ebuild b/net-libs/libssh/libssh-0.8.3.ebuild
deleted file mode 100644
index 0c794b8a473e..000000000000
--- a/net-libs/libssh/libssh-0.8.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	inherit eapi7-ver
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.8.4.ebuild b/net-libs/libssh/libssh-0.8.4.ebuild
new file mode 100644
index 000000000000..9d50b41535eb
--- /dev/null
+++ b/net-libs/libssh/libssh-0.8.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-${PV/_rc/rc}"
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+else
+	inherit eapi7-ver
+	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+
+RDEPEND="
+	!gcrypt? (
+		!mbedtls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		)
+	)
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.0-tests.patch"
+	"${FILESDIR}/${PN}-0.8.3-strict-overflow.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# just install the examples, do not compile them
+	cmake_comment_add_subdirectory examples
+
+	# keyfile torture test is currently broken
+	sed -i \
+		-e '/torture_keyfiles/d' \
+		tests/unittests/CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DUNIT_TESTING="$(usex test)"
+		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
+		-DWITH_DEBUG_CRYPTO="$(usex debug)"
+		-DWITH_GCRYPT="$(usex gcrypt)"
+		-DWITH_GSSAPI="$(usex gssapi)"
+		-DWITH_MBEDTLS="$(usex mbedtls)"
+		-DWITH_NACL=no
+		-DWITH_PCAP="$(usex pcap)"
+		-DWITH_SERVER="$(usex server)"
+		-DWITH_SFTP="$(usex sftp)"
+		-DWITH_STACK_PROTECTOR=OFF
+		-DWITH_STACK_PROTECTOR_STRONG=OFF
+		-DWITH_STATIC_LIB="$(usex static-libs)"
+		-DWITH_ZLIB="$(usex zlib)"
+	)
+
+	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+	# compatibility symlink until all consumers have been updated
+	# to no longer use libssh_threads.so
+	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
+}
+
+multilib_src_install_all() {
+	use mbedtls && DOCS+=( README.mbedtls )
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index e307766d4f9a..3d76137f7302 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -4,6 +4,6 @@ AUX libssh2-1.8.0-openssl11-memleak.patch 823 BLAKE2B 3d2abd43798a23b551ef5ba97b
 AUX libssh2-1.8.0-openssl11.patch 2551 BLAKE2B 32875e90a9cfb754050559a315c24d51065ceb9be22e450984aef9dea0a59b5b93cac7498e3c3e9cf8057ac13dd93330bc470bd717c9a06af9d9294ef7172eed SHA512 3cfd11ef23884a3de173422e001b0ec0f9af48c832948b5d0f90f0be2008334c30ed769a642786cad9aa68ea445b66780b10d3c64434178978018e709510deab
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
 EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579
-EBUILD libssh2-1.8.0-r2.ebuild 1617 BLAKE2B 78ec1143fb31a0903d31d00b3fb3af2190dae86eb3bb29832e3c3624694683401536bc43e8101589f46291d745ee96bc38690e2ca19a5b12e892e9a5847e2ae7 SHA512 c24e7aadb9c74629644dfe3ba4daf9618cd12c582b3da35c7510ac4d268eb9d063ecff49836aa74be69933094264ec60b511d13a170cabeda6ddd19d3f3beafc
+EBUILD libssh2-1.8.0-r2.ebuild 1621 BLAKE2B ce45c14d1f62ca3fc41bb1c0b3f3c51bb7b752fce9f24b53b4b6b59567ad89a02a0191e67935d93969b8b464eca017c5e2d6025c4dc648eed07103964793a08b SHA512 472bd3eadc918e6d785ce0af09bce7a811236dbe3a62de12612556a66d7c89fc20322a47c4779b389175ed39041a1ad710fd8956c2d11a1f79685b2f862980eb
 EBUILD libssh2-9999.ebuild 1131 BLAKE2B d4413bf097b892cb8fa1747614e0194ea0db57c91b00dad158da1b88405e3d1d6d9372efd5c39447f4a7c87b2e3d215f66df8bcc212e1fc599b839e8275ff6f2 SHA512 a9ed6e5e56b005f8c46f957befa279360e127f30b95a33f98e0f3dcd73fa3e921f45e5577f4d2632b841ee1ae002011b1042e1f67ac55bab2e56bbc19ef532c5
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
index 501d50e45694..bdab253bbeed 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
@@ -53,7 +53,7 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die
-	rm -r "${D}"/usr/share/doc/${PN}/ || die
+	find "${ED}" -name '*.la' -delete || die
+	mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF}/ || die
+	rm -r "${ED}"/usr/share/doc/${PN}/ || die
 }
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 90bff5635980..8b7912afc4f5 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -3,5 +3,5 @@ DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 BLAKE2B 0a1102e1b74049c1f5d898036
 DIST libtorrent-rasterbar-1.1.9.tar.gz 3903742 BLAKE2B a9f942e7d06e076dec98314bc44e8633731c51e8469095ebff8c9c8084305714ca40663a0d963f16188ba17fa640f273eaa1396784514bc04e4bc4cbcdc3aab2 SHA512 2dcf81fdf34b81790012a6c20dc344dccb89535359cffeb9a2725763f0a1842a00af1ae06b63e4e32054f06ceb14e32031afe479dc36897ddab28494241eb756
 EBUILD libtorrent-rasterbar-1.1.10.ebuild 2386 BLAKE2B 36723a88c2ac601e4cc474171d44130db9844403b6e15cd0a3c2a3137e8e7de6936e03bcce3c0afc2b42ce698569eff9e79feaa8092bb1fb6121a70c2ccb38c3 SHA512 4a81eedf874f80c4ea4168d909fee0a98b5110643e1decba90d323cdbd67fd87d8cca367fb2935b8d1c37ffba573fd29132371fd9a3f25367b8bbe6673fd346f
 EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2398 BLAKE2B 319dd61c379cc1e0b92f938c9364eb9af477e017fd2595ccf6bfde65a05bb8d7d27ac3ed7396233aedb24a1b02296e33fd66d42af74bc8b31f1ee97efc6c5a0d SHA512 ba767f43b744e9f1a50c7a559b91a8b45009a1b08820852c9a005d3d6a2c7f6114a6091cbfed2df34e9e7bb2c75ca10873af69bc067356913774f027b27dd2e4
-EBUILD libtorrent-rasterbar-1.1.9.ebuild 2389 BLAKE2B 070a26370780dd74a6066a10669822918d3089c7d2d3480566b991829d30f40c8e02baa658b8657fdd4ab83400d46ca5767a780a3b980206084a9a64ada30045 SHA512 fd0c27c7c6ccad5f01fce80a3427933a950ea3bb4f7b9a1ceb803640667c9854edefdb1ae7504f023d7d25797ec0ad6ebe93b4eee2738e9b7c8ba736b8c7739e
+EBUILD libtorrent-rasterbar-1.1.9.ebuild 2382 BLAKE2B 66850d5bd5eaa2760aa47dab753bc50935bdde25dd22f9b725b10e9749b54f479526018d26c45fb1a3447b95aab0d13f173e3b8f998511301b61a9370b32c2c3 SHA512 9be66c60b007b3e7b077deb7bcbcd3d84b2667143d5869729cb3b0a003f8152aabdcea2330a094802a6fad58ced81df5ccee3a0267d06cbc0d9af85f219d53f3
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild
index f9f8a919d1d5..dea208929568 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index aa4d1e71ea77..6cb7d16dc57a 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,3 +1,3 @@
 DIST libupnpp-0.16.1.tar.gz 470523 BLAKE2B f587633e796c34ed38c35559c935a7f1f4b6042f69d5cc76f268312b0a871988ee5521fba2de125a50c0067d4a5674850eb7d01cb36ed62c0f2b17267a1b3ad8 SHA512 c63eb8ab8a76b7e161625631bee645e7a1f8d779ea6b16ed0bbf43d0972e8875613f04dbf44cd43796273f7b20b4fa71b791d10867c6d220f0d78c15c016c275
-EBUILD libupnpp-0.16.1.ebuild 532 BLAKE2B 08d729a245056bbcb076c036fdeeadeaa1e69e6aaeadb4e3c14a98ce1475e9bdc3efc0d00b5ac18a74f2a93f1dde08d53674b312c50d1cdc0666334cd7ece318 SHA512 c76cbe559a83512ea841c31ed954f6a676e5372009a161faabadd4240b3bb5693642711faf13f77a2bee1881b44025b73b175c52dcb93d6675e6c154b2ee0b60
+EBUILD libupnpp-0.16.1.ebuild 528 BLAKE2B b8642e512974e10f081013e5722dff178e4da1e4ee6d88f1879091d5150d2656c7d36e8ed1fcbcead1e0a5e7bf10ed7118ec21c773dd8f1cf336c96072cef9e7 SHA512 8844b8d81e1b6738838f1644dd34f28f82e85f21e4883030ffc562f446f59701aa2d3cb80a013f02aee3a21caa68ae40c1756e57ddd8ccfeeb4fa54ca36404b6
 MISC metadata.xml 332 BLAKE2B 7d198d8b62aacf867ddb819dfeaf466ce052ae797b0d512fc14c294a2b7bb0adf9514ab0ae0055a38b5eec6d79ffa4b4e0970d5438b9d9b38a29ca8ea7022cc6 SHA512 1fc1d07c136b613f42418b92272c3d4093c9a3691fa9ad8a96ed0dd09639f50a5f55c2d41584511f64e4675f075fdd74faa33922b0b75a1ae6451250dacda682
diff --git a/net-libs/libupnpp/libupnpp-0.16.1.ebuild b/net-libs/libupnpp/libupnpp-0.16.1.ebuild
index 3cc8d14e6b9f..a9708d584ec7 100644
--- a/net-libs/libupnpp/libupnpp-0.16.1.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Unfortunatetly I receive segfaults from upmpcli on any newer version
 DEPEND="
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index b43c1e06dbd7..a4acc2a1e11a 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -2,6 +2,6 @@ DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d
 DIST mbedtls-2.12.0.tar.gz 2299830 BLAKE2B e65da9feaca4dc22e843cb645259ab8c81e24cec709f0f79475b53e3c319f6e5239bd6c82db07562252a35d9746600502c5a856bf6c0de67f2fbbea840b4491c SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
 DIST mbedtls-2.13.1.tar.gz 2345612 BLAKE2B 0b78a04407076016fb7f74b635cd2fc86119a9cd8571c6356715e3a680f5b16787c2b002830d103ebd4b995dda956ec874a35bf1a824489dc56f509a9485b1d3 SHA512 1a70446b533534c075de38ce0839f7947077ffdddffa57172594b8f8a3c4a3fbdfa9b06d13c198008abad33633e509f06abe5362f603f63850d9ec44734b3c0b
 EBUILD mbedtls-2.10.0.ebuild 2418 BLAKE2B aa3b1703e9054f1dbb4ad55eaf2ed3b286a1c3bd0f8a369f6123b1abfbcb42156bb2c71885c0ffa7710b6f842071532dd07776943cefd35728040c54ab307b87 SHA512 0ccf855ca1eb9cbf54a51ddd969bcf5feec66b3619d345be6cd480c782ddb36203f2e733475a5e2cf011c24ee1960f5f6ce03cc061cc55470328724844d8a942
-EBUILD mbedtls-2.12.0.ebuild 2446 BLAKE2B 7b6cff2d3aa000039062e1757044bbf9ee19830c990da4fc43ac8b9e3f7e32ecab248190a536cf5c6faef787ebe5861953ac83cc42868b3ed58992e3b7e93a7f SHA512 5e935a03dc7d638bfe7ad9d7664652d0078a23f6c6c58d2b8bb38c79c67b33a6571651bf62f47c283742263815856ea1ae3cf26255c1d5a0b428ea225c0adcc2
+EBUILD mbedtls-2.12.0.ebuild 2442 BLAKE2B c45bfa98c90f49219f6189a7f345aa64f4c5e6b4e6ea9037f323377b773d49ab3f8ad72858dbffd8a3112d85fe4938df8dfc01927bc9af36e7100d2921d84ead SHA512 a01f5cfecd3c93d95a65673659103d18415d9a72e464149bce3e20e8ccb4c3df97579571e5a8c3f6cdc550a3a6afae92af5e366db3efa8aca76813a9fdcfd20f
 EBUILD mbedtls-2.13.1.ebuild 2455 BLAKE2B cd57e8c219e29481e51c967ab0aa2c0e4f815293905114696dfa4a24ffa3a0d7c851cb8625a66d38e24a8d64b5661d26517b4521f5f451b18ff7456f8b9d0741 SHA512 0b292eecbd94c51a619310cf4ed7ebe9857c67e98815d590bc2dee84c6b8057128486f3da442f9d6bcc62a1c3bb58e584942f9177144a8444ae1fb74b80bec51
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
index 78a3d9a831f2..9b2bfed227cf 100644
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/11" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 
 RDEPEND="
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index faf6dfa1facb..cb6581adad6d 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,3 @@
-DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d2bbaec24cf44b5910d4fc1a956723a8ed8fecaa428aea361a7ec8a3ff60b82e0d9468ac21d251c16ac8c2b52eafec6ab3 SHA512 0cceeedff6c584d2d7037ff91fbba0fe580fabfda810b9a9ed7c8d8495445339e3ff115d63d4429bcd3eff2b13b123e1bd5855ff1bc9dcd986b968a82c368591
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
-EBUILD miniupnpc-2.0.20180222.ebuild 1337 BLAKE2B 12e0b065bb728b59c80a5604b34ec47916ed4b678ec3d774809a27420ed8c10c0f533b315978de8c50b1ea6070729bea941a45580f633816c8d02583953ffadb SHA512 e5c7a6a99f8881dfa57212b0765478a93d70e35cb9a0bb0503a9dd5fc06052ad5c4c05205674b8d09c8464d61ed690dbfc77c2ce4c391b690580e318ce8828c8
-EBUILD miniupnpc-2.0.20180503.ebuild 1333 BLAKE2B f06fb80639cc99208bcf620091990acc024d72f250331dd6c45000917ab41a376fa7a73deb760ddf87d20840ac61760246da8af9b182d77ab756e3d208792848 SHA512 feecafac74b3f269cce4b352155244488e60655ab4ccca8ef4e64fdf065f917976082eb4972e8f1b89d04f7c40b4c32d0b292a44f02c7a825dd2b458c79ec49f
+EBUILD miniupnpc-2.0.20180503.ebuild 1332 BLAKE2B 05167f65f6d6790d2bdc25d69b457f578767bac0c4b7aa578ab772f31cb5034c0bde7aec5e480a74d04b3e4de87b7d46cf2c4a5c7a31a8e9a5b1801dec91c5e3 SHA512 ce5dfc326f083c136ab99086262958f5b86b94c04bea773c3bebc64dee0850f83c895ccbc1f5ae322dc309bb6884508881dcc8906af83cc2a0c529cae29ee8f2
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
deleted file mode 100644
index 3547f9b9507a..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180222.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 toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
index 82b0fa4708b3..62fc8c8aedd2 100644
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 38784a3cb1ad..0efc1efb3304 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -7,5 +7,6 @@ AUX nativebiginteger-0.9.36-asmfix.patch 588 BLAKE2B 5bfc18fad9965210068df8cc86d
 DIST i2psource_0.8.7.tar.bz2 18473515 BLAKE2B 9f79cd2e69f26ba0fadc24b6cad0ff43301c65fd640313688687895de908c6a0c6fd9d1be6c82a6d7478cd4ecf633ce3b8fd4d200cce644512a7b4fa275a0927 SHA512 32b4eb4bf8bc7d6bb692b3ecd6b0a34c4d3d7c94b0d09a4ff330151979ccdaca9a6c88fef9b7e7965a1bba8ef54dbb710d89e0bb19265ee177ce547ff50ca969
 DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
 EBUILD nativebiginteger-0.8.7.ebuild 1760 BLAKE2B 2b5d1d3bccc75e254674b87f53563279dc474165f48d567e4e467dbcdb24f02c17f073e88ce597ff4948054af5e0f7d256109b3e90cd40cc0b83745ba190e5a4 SHA512 b6ea041425c3a69962dce78836aa0b0ec08d25cbbe513ddc9a0cf44cfb62d6686baf2491e600abe213b672d2fa675b7d1939284dc00b5210c8432c63426968ae
+EBUILD nativebiginteger-0.9.36-r1.ebuild 1450 BLAKE2B 56c42caa16590ca0bf44f401f0a3b75b6400d71f876bc0a0279ac27b2032450fbf68af66d066d9d10804b3284ff910dda9cf7984ad1612cb177262837a618dfa SHA512 31731ab0a369bb304e45bfca41ad42f0464601a97df1202ec9d7a5e8e2734ba9e06f817416631da18594fe2e5de8342e9f9ee965524a17274d81085710a787e6
 EBUILD nativebiginteger-0.9.36.ebuild 1528 BLAKE2B 6743746aca34ab8a4032a968e5bf2e1036707055ec7bbfe1f5a8cb3a1956cd1f274437db14d3e99c0f1f0732f0302e4dfdb9eb69d6c7e76bff8ddfa81ef83f6f SHA512 c9e455cd73955dbc6a65f39e4c6d83ddf5680d879871893a01656313f72fd7fcb890fa7c2cac3faf85cd1fd9606c575727ce4a6251dab1a1dfefa0ce7c71a661
-MISC metadata.xml 357 BLAKE2B 226a850638c4dba950a9a5f323e318a517dae550e18744deba0bf1252e84341c7e981aed1969ffe38dd441600cd2ca8c10793e663b1263fd311a65aa22c3c69b SHA512 77ead199b8c319b85982036765c8371a888121b3264669afb0a09aba0c79e7587f8da6910a130f737e12d395216cc0d2400ebc8877ecf14cc9e6b9ae0c31e307
+MISC metadata.xml 367 BLAKE2B e6ae176d14b1c47214343a27d2fe27d22f354879bbe3e27d01fd9fb06944ad57ca6791765dec8246e6a1583e9f66cfc72867b0f85a66f4d0752a64344d9fb5bc SHA512 a568f5918a48ac57cebe1bc19c22f8e7ee2f2e1e9710b088ae7411ae1435bc170a7e81307da909bea3781e2e3217f8791623e3b0f4a50658232af9b000bf4f2e
diff --git a/net-libs/nativebiginteger/metadata.xml b/net-libs/nativebiginteger/metadata.xml
index df6b33c99127..01c39ff1e755 100644
--- a/net-libs/nativebiginteger/metadata.xml
+++ b/net-libs/nativebiginteger/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>tharvik@gmail.com</email>
-		<name>Tharvik</name>
+		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild
new file mode 100644
index 000000000000..a4f330caaee7
--- /dev/null
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 toolchain-funcs
+
+DESCRIPTION='jbigi library used by net-vpn/i2p'
+HOMEPAGE='https://geti2p.net'
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE='public-domain'
+SLOT='0'
+KEYWORDS='~amd64 ~x86'
+IUSE='test'
+
+DEPEND='
+	dev-libs/gmp:0=
+	virtual/jdk:1.8
+'
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/i2p-${PV}/core"
+
+PATCHES=(
+	"${FILESDIR}/${P}-asmfix.patch"
+)
+
+src_compile() {
+	local compile_lib
+	compile_lib() {
+		local name="${1}"
+		local file="${2}"
+		shift 2
+
+		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
+			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+			"${file}" -o "lib${name}.so"
+	}
+
+	cd "${S}/c/jbigi/jbigi" &&
+		compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
+		die 'unable to build jbigi'
+
+	if use amd64 || use x86; then
+		cd "${S}/c/jcpuid" &&
+			compile_lib jcpuid src/jcpuid.c -Iinclude ||
+			die 'unable to build jcpuid'
+	fi
+
+	if use test; then
+		cd "${S}/java/src" &&
+			ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
+			die 'unable to build tests'
+	fi
+}
+
+src_test() {
+	cd "${S}/java/src" &&
+		"$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
+		die 'unable to pass tests'
+}
+
+src_install() {
+	dolib.so c/jbigi/jbigi/libjbigi.so
+
+	if use amd64 || use x86; then
+		dolib.so c/jcpuid/libjcpuid.so
+	fi
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index eb3d4a247780..1ba4e51ec96c 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,6 @@
-DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
-DIST nghttp2-1.32.1.tar.xz 1548812 BLAKE2B a4c1f4f8d5070d1ddc5a5680d9fda28ad0b3ee6b1241b58b2be2b63026af249a1bcaf62c158c084061802ce93934dc5648e20c54887df330e07407d5879d1412 SHA512 477e6f4ccdba5c86436d554be819fd10a715896173029aa72f9c90c2ee64dbe20e2ff4cde614be3a7683dec9e0feaa21d124493ed5fc12ad4c63a37a83bad57c
 DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
-EBUILD nghttp2-1.31.1.ebuild 1864 BLAKE2B 7a7dd9bb67e6f900d02ab38353764655ac32b5f7d62f44cbb0d6daca3e476626666330a27e85abb2297cc507206767f26fd7566c7e01b079d4ae213d552e2e4f SHA512 879b31dee79958bc567f0730718dbd2da3046e5a1104f8b619d2fe19f8fd3729dd3892a3e5c1856ef9cecb71bd4a2034e32ca99ef9121499ca5606bed06cf3ed
-EBUILD nghttp2-1.32.1.ebuild 1875 BLAKE2B 37ebd7c136d37837014690c8bd31022f3a289895d4ee85ec6654e0ef894b8e49a8d5777fd0cb3546a1918b30934a68ee63f4841c5b866696f12c42bd12611db4 SHA512 e57d14993874cbe2804ea7f78846fc03a975eca5474f143fc7497800fc0c2abcf94d2b636be4f55ba2d58f516dfccb880ad4342b8be245d4439104387d1dffbc
-EBUILD nghttp2-1.33.0.ebuild 1866 BLAKE2B 98df11188b329e536a77e47fe4313e9b04f36830461e98aefd70df142df51e586093ac269077a2b418fa7abd68275fdf5f543846e7483e9a40056012c2b9756f SHA512 772fc19a8eb1eb9d8a8ebf897dc55a90bf3dc1a7c50a52e9765c67f52843dfdcf2e4b443a0626e93f2d241654e7c927ca41e56f295d4b0cca9fda98dbfc6d0a1
+DIST nghttp2-1.34.0.tar.xz 1612432 BLAKE2B b5a53d5ffdb68e509cebf50993c3b9de4e597ae9079db505db6e6df67c1eb5f4b095f18dec9f1b946f05b83f3db8ba15e5e5cd7efd4921a94350bd47533a9164 SHA512 5ddc4ab443c51ce286a656d2013421172fc37608f14c0a7ea02fa9e5a0dd155e162d5602b55f34dacc69709525a9a8110dc4c42d92607bbad1951075d094c6a0
+EBUILD nghttp2-1.33.0.ebuild 1861 BLAKE2B 6bf71fd220cacaa02e17ee2ecc6c7dbd9810a0c45d92f63cc09bbf6631d27a4c9126a1691f42b7a42db4ea934c38c1cb753b364577ca89cc4ec318947cb2bdc0 SHA512 9026b56ba1d3b18b02473da0de7d880c95aae9eb208705938142be394424db9d9c7ed2d2033252cf68861f9b1ccb6811f68ed4f660bd92f38f320df5b8456c10
+EBUILD nghttp2-1.34.0.ebuild 1872 BLAKE2B 55df6bbaecb1e4048a359796697f10b313a4f38ecfe920bf6f6a029d3eea44a09c203af600eefeb13c1257c7563d47d90b7819068f1ed503425cb34047daf79e SHA512 b8cad5f9e006e2a0073b819a2f93aef80242136e85b03352faba79f15b13a55e096ae1fd5107417493e2a741c541c532406ad524e3e7a50dfdf7f09d6c34a77d
 EBUILD nghttp2-9999.ebuild 1949 BLAKE2B 56a3fc7ee584692bbf9219aaba3a56c0aa57f7b4479d6da0a12c77ce8b999a1db1aec3cf76203536cdd42254dd8c42ef2df63ba08fade93a0dc674502012858c SHA512 fe76714b538e6f49c44c3beb212f98b17644575a9b049981c44a4537d7501cf9b3f6bbdd2351a3c286d8c1e1c9acce09843eb86660b5ecfb38785ce920db4aef
-MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
+MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml
index 15ee3405227a..474284272d93 100644
--- a/net-libs/nghttp2/metadata.xml
+++ b/net-libs/nghttp2/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="hpack-tools">Install HPACK (header compression) helper tools</flag>
-		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation</flag>
 		<flag name="utils">Install nghttp, nghttpd and nghttpx</flag>
 	</use>
 	<upstream>
diff --git a/net-libs/nghttp2/nghttp2-1.31.1.ebuild b/net-libs/nghttp2/nghttp2-1.31.1.ebuild
deleted file mode 100644
index 26138c1a2905..000000000000
--- a/net-libs/nghttp2/nghttp2-1.31.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-SSL_DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-werror
-		--without-cython
-		--disable-python-bindings
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.32.1.ebuild b/net-libs/nghttp2/nghttp2-1.32.1.ebuild
deleted file mode 100644
index f472f1d77c9e..000000000000
--- a/net-libs/nghttp2/nghttp2-1.32.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-SSL_DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-werror
-		--without-cython
-		--disable-python-bindings
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.33.0.ebuild b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
index a0e6cd2b5638..8e3d343e95f3 100644
--- a/net-libs/nghttp2/nghttp2-1.33.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.34.0.ebuild b/net-libs/nghttp2/nghttp2-1.34.0.ebuild
new file mode 100644
index 000000000000..990e99d6dd0c
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.34.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-werror
+		--without-cython
+		--disable-python-bindings
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 2fa261ddb4b8..69d7fcbe36d1 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,6 +3,7 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.10.0.tar.xz 19960760 BLAKE2B dc16e2afba4be727c5169ac5cd77324e0e8d7270c96da141da21a175cfbd64a38f7b51b86264396f3866174abc9095f7c840303208f7193739a1970818d4ff3a SHA512 482518a72cb0bdd5d987a7855856eadaa4fecea933ff7791918edf3097588246782d86b27568c06764ef9f2bca62b64a4d65e4cbd0e934931a72dc5719db7446
 DIST node-v10.11.0.tar.xz 20144576 BLAKE2B 956d940554748f420589adab0f14bd6fcc6a4781cdecd537abd6eb9aa43e9cf754ef009b20d416f1ef4c9a01ef91a27a59a8c080c1c0a49a59388f75713d6286 SHA512 00a678a829de9b836e77dd0806799029b657cf000369ca653540d7e1b82c3895da43dbbfe4d3c2b3b2b1e711bf55b3835a351fad18affdd0c25dcceea8e3406c
+DIST node-v10.12.0.tar.xz 20185168 BLAKE2B 1a827ed08222900ef196921a57d64466fc558412bb27a26759553686c69d59d8e6686394a484156d254a01030077b09c9abfec87a7716aee06dbe9937a861efd SHA512 3b59bbe7b795e7a85520f6b4691806d8939d26cc2a5e5d22e6406d3d373ee7758da225bd25b6f6b71b105e3d7ef4c58220bfa5e558afd0cd873fbd7d6ba9efc4
 DIST node-v10.9.0.tar.xz 19987812 BLAKE2B 4a5bd257cd527500b691b15d177bde53158b5e46e710ffeaa45224bae821cfaffdf59f24ad6bdc822cf468b90c1a4422a2f82d29e1d4b2dc0f838e3e0ab5b4ac SHA512 19c7366b4c9d1e255b5ac56e974ff86b9ca87c363534b467ecc3c59e170b891e86c479a2bcda6647c6df686b018caaedea84270e848b93a4f1c80ff04af12461
 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
@@ -13,6 +14,7 @@ DIST node-v9.11.2.tar.xz 18507832 BLAKE2B f5ef210632065f2c99dbe3fd210fa832bdd096
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
 EBUILD nodejs-10.10.0.ebuild 6353 BLAKE2B fdb46cd02319dff1cce1b3c19523998da5b7d6ea69058f9b9f3763f093614a84b4dab91151797ce32d529b41d227a051ba489b3c41cffdf3597816bd1a9b926b SHA512 58a08d3e3d69784c41dccb32a3a7cced78e112ae8f30d86ea0d865255292941f953bca23a22bfb8a8a66135a688fe4c87f6af87f0526dc716ce177ab0f41ec66
 EBUILD nodejs-10.11.0.ebuild 6353 BLAKE2B 844b108d90a89a4fc70e1294b3e1efc4181a3555787a3446806ed62b79685a07544184da74face287074af67d2ec8abb9b1a91f3d0370b0d48d7185d1b7015ed SHA512 606e610f800ce9792d689fc813fdc09270ced425b4e76e07e8767853c33041f69d5cfa117976cf583c2bb811cfabf9ab2f86a287ed25b8bff9af4618bcd92660
+EBUILD nodejs-10.12.0.ebuild 6414 BLAKE2B 8f684f966fbc4e4a01a11dfae5bdd8ffd67ddbf896c229cc885e08e7b6360d07e3f3bc4eeee7086bde006d1098714c7077b777fc01d67383edfa37ffefebf147 SHA512 4e5782138680633590896771b5f548952a8b2f7665d0040d00bb37779616c44e3740bc808ed5a51114bcdd7b51d70a35183a1febf78eeaf53680137ecccd84b7
 EBUILD nodejs-10.9.0.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
 EBUILD nodejs-4.8.7.ebuild 4424 BLAKE2B fa72291c5b44ce0ba1a592b329be2cd9afa3539bf8419be567c457ef223d4ef3db32ae612795da32345c69bb8b141c350b312989df2869fea37e5ecd5afe44bd SHA512 461f777fac4899b55829edc55961ac021cbe6569fcec87bdb842c8a8b3db117ef74b0ec1e1ff01264f74ee71153e6a771d94d9bbea8fee753c1ea53b8c26dc9e
 EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
diff --git a/net-libs/nodejs/nodejs-10.12.0.ebuild b/net-libs/nodejs/nodejs-10.12.0.ebuild
new file mode 100644
index 000000000000..c543c3b59b1e
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.12.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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.23.1:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.34.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}'/" 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
+		docinto html
+		dodoc -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
+
+	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
+}
+
+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/pjproject/Manifest b/net-libs/pjproject/Manifest
index 5ce5bafeeff0..009c2f3c3e16 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -5,4 +5,4 @@ DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 EBUILD pjproject-2.7.1.ebuild 2612 BLAKE2B 19a3d988b01545ecf7c7682239ebf0650610d31d45fb39fb2e0d96962b1bc3cc3f76a6fc7b2d93fdd7f798710d92f69feea2cdae42f8517f67943b47fb8aae78 SHA512 00c6eaec1aaebbb6e7751c93eddb52dc3a0f329a781b3c715656b5a0154ae362ed0f11e1f7e066bf0a7fa40b3cc03bf99b040d6665608c5d30e39b7a03825a41
 EBUILD pjproject-2.7.2.ebuild 2753 BLAKE2B 126dde2738b6fed3554cdf49e30c819eee37608e272e2c8a1e48ab55e084586877bb03a549eff5dbe413a9a08ac9ddebeeb96f39c5ab57bbc1679e26b461ae1c SHA512 f4aaba317de182271d73ea91dec0e4fa8afd63353104eace94e513621d2b30ff30724d4fbd8cda0daec89709aa187714b02ea53dbdd8313b9007c02fd824265b
-MISC metadata.xml 1157 BLAKE2B 1b40ee1b635cb8cdafaf001ad458264c4e55344393fd76ac7263521069bd355e4febd7ef534b24bd3879a75e5229863d8b93b8d89019639c49bb7511e1044ca5 SHA512 1171e638d0320d07b0bf3d6a6d31a75722dd659b296d9f451cfe1d3cc12016ff5b1c94b690054bb3772462d7a8d70b47fcb8b5c760c8677a727743ecebb57dce
+MISC metadata.xml 1096 BLAKE2B 03a918c911b8a3c8bdd0aafaabc820b2750dbf5a3b7573ffe987e71ee8edad4a369e7c15845d4ad748150c8972d646d44f6489a9a54e16895dee7a6048b5eac5 SHA512 d2547bfdc7aced6f242f7493a39425f4c2ba5881ab2cc6b8da386e84c092780ab0f876dcf947436150a5060faedc3a0a55377ad389f3a53f6142ef188b321a92
diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml
index 339310ecf077..3d82a0d2376c 100644
--- a/net-libs/pjproject/metadata.xml
+++ b/net-libs/pjproject/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="l16">Include Linear/L16 codec family in the build</flag>
 		<flag name="libyuv">Include libyuv in the build</flag>
 		<flag name="openh264">Include Open H.264 support in the build</flag>
-		<flag name="opus">Include OPUS support in the build</flag>
 		<flag name="resample">Include resampling implementations in the build</flag>
 		<flag name="silk">Include SILK support in the build</flag>
 		<flag name="webrtc">Enable WebRTC support</flag>
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 46c4cdc56e90..4e691a2118fb 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,4 +1,4 @@
 DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 EBUILD qxmpp-0.9.3-r2.ebuild 1815 BLAKE2B 7e800dcaad27d3d876a07b41dbba5dfd2f27c506c8a95f0c75b42778054a25b584828756437309787fe0b585868e433e4cce764b8ce8325c044ba6218d4f0fdc SHA512 69a64ff108de9d7d0b70bc5f21d18c1bcc0c2949a701ba5b89eef13412fa4f85c7084ae3c6f3f70e814cb9aaeb027bfbf5afdd83c2ed7f43e40652f3766092b3
 EBUILD qxmpp-9999.ebuild 1770 BLAKE2B 8d0527aae9d208fd4272fbcde1dd3594a20a061233fc397cf602908aa938b687889888be6c9c0633376bdb35ad17b62e54e80542d5d7f71f7bcabfcfc9c756be SHA512 82826b15736b6f8b05ffe41dce048ca56ee321d6b2ea2bf9ed58908260091ce1f963d5ab3a4c3e1d7496991d926088bfe1030245d10eb7abf4cd0da6358fed8a
-MISC metadata.xml 794 BLAKE2B 039cc3d356927e6f18091e93f9c39a5bd07ee255eb71d588e417bfc9d446c2d00121a316f0c86e68296631c428358bdecab8877226ffd982f82ef8d001391402 SHA512 0486690da78f6876a4dc81eec34dbcfdb63df109ed9135c9fce5fe8355f3adb216e7766def8d87870a9ece522f57b295ed48aa7cca36f7bb2a64eef7f77bb74d
+MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
diff --git a/net-libs/qxmpp/metadata.xml b/net-libs/qxmpp/metadata.xml
index 128b3f2f7fdc..6fdcab97b78b 100644
--- a/net-libs/qxmpp/metadata.xml
+++ b/net-libs/qxmpp/metadata.xml
@@ -15,7 +15,6 @@
 		<remote-id type="github">qxmpp-project/qxmpp</remote-id>
 	</upstream>
 	<use>
-		<flag name="opus">Enable Opus codec support via <pkg>media-libs/opus</pkg></flag>
 		<flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index 977f1c9c1436..72d71fd804fa 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,3 +1,3 @@
 DIST rabbitmq-c-v0.8.0.zip 249220 BLAKE2B 171ae0ffc093851089f4dc11cc1e8ef25ae90cbb0cce75ffb93c04a765b7d195e5bde8bbdaa4ce0c598c7f4bb291ed204d157443ed927db373a89f8ab9e7ebc0 SHA512 e386979ce1bc05c02cda06e8582981e0df25f9b31ca950f8a921bd2b249020f751ba65a6f38b8f5ba0be1b3e89492b29b72c6cd1d5ed3d6f19440799d6419ba6
-EBUILD rabbitmq-c-0.8.0.ebuild 1105 BLAKE2B a7d1ca217963a2e10f3da769b315e5f1b021ff47f48517aecbf687f762775ef9b2366c2861a069b4a018dc834d4fb978953089be2bb66fe651fa944b2d457275 SHA512 8b71f307de3b83cd21e941219012e3e41d56a4f5a7e7880247129f2b214d84d03a34e27c0b059ac1b2979de91d339cb75267fd97b0f9a462320c740c4f38402b
+EBUILD rabbitmq-c-0.8.0.ebuild 1111 BLAKE2B 949f7f843f362345bab652f2bc7a7eb0d261fe8f6a5fecc50107ed01b4c99afa3ad744193819c21120ec3cebd997d3772eb54240124ed3e597dd2da10ae39cc1 SHA512 81e05977f399034885ca1699634e9403d8ec140e884c732415ab9e76309122d862b62b471143026a69dd2b1c4d0e7cc90794aeb39f23ab46546af039ef2da819
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
index f932c68e33f8..0a03a2d4ffab 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
-	KEYWORDS="amd64 arm arm64 hppa ia64 ~ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index f21ff9777143..bf5f239fb524 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -5,7 +5,7 @@ AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de
 AUX serf-1.3.8-tests.patch 3159 BLAKE2B 96cd539541f8ca59dd5693bed44854d2aa626cdecaf89e754e8123166559f8e6518f3cde372a42f6d0455302d53dba6a55e51fd44734e1984730f34a090969a3 SHA512 d2b89743e38492a0626b509864c34a3747d73b5aeb7a22df84ce739588663582eea3b6c3d599b8e42896b1720c529e19c5497ff4e830e67981f0664b5e6c533d
 DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.8-r1.ebuild 2086 BLAKE2B 539a84cba24b83dbd97a31ffd2ef8926555819bde39ef744bfe2fec2f5bc5afc83e329cbfa95fd20c4d46aa804244faf56cfa3c58a10a96dea7dd3254e1024fe SHA512 485fc3a9f2f303400498d3f7af02cc861b19fd306bead6da555f8af3a5c6e4518f6fa840dad8fd921c530c256e754e1406149436eae777ba603a85c2c7ec8b11
-EBUILD serf-1.3.8.ebuild 1467 BLAKE2B 06135ef40f6702fee26ae8fbd609260edaffd9461c62dbed325728548ef126867f211b77c1629452855e26f2c79558b6ed5198dbb3bacfa41c034daed8e46d7e SHA512 fcf34f98fb8f03a4db6c5140d3538308b3dffbbed2b5cb649cb6e7871ca59fa204f29d5df63667070f783aa1a2eb4c402ea1d0bfc41fc0b7ecc7dbef9c9b9f95
-EBUILD serf-1.3.9.ebuild 2092 BLAKE2B 94920aa41d663d406b572cb21adaf596e9bc67a2bc6ebf98f475955f13da1adb36fedb382723066605308b641c01c305397f6ef408896e04d16b73539cd53405 SHA512 b0fd733f83306234c0e93cb0fe9eefce2abc7cbbf71ef084a268fa231864580cb6f5614f261f9c0cd2d586c26bc7a5ff3343d8a37a30acd26da96cc29ec22fc9
+EBUILD serf-1.3.8-r1.ebuild 2131 BLAKE2B 39fdb4921083fc3d58e8b0104354bb912940fe4efaa61abf03dee18f9ed9d68ce923ad2f0c936259ab51499ec2d61880bcdbda08203ace585e28754c44d04f1f SHA512 3ccf27be31998557a14dfca50a64e974efb4cee2a7c999e9a70328ac216a84327b09f38704de5b6f095369f9529ccb98cfae5746b569ca5074e48aa2b65e178d
+EBUILD serf-1.3.8.ebuild 1512 BLAKE2B 79480348f4734e32d06e40f9ab7cdda4f464d9226b254d8f31a28f3468cef4af56f12c64e881b9bdc6b3aad0d926155706801729ad3645d70fad034fb33aba4d SHA512 92109ce007871baf0e52a100d8b88df475413b88e900beabb3598905ae41e8a4b8881ecebcd8788954a031c6c2c73742a43b4647aae46a713a0568083d4273a4
+EBUILD serf-1.3.9.ebuild 2137 BLAKE2B 89bf9822603a39f7b0d7e70dca6fac80833cf4f51bc11581210f7439e7349eabbb60831380924d02454613798d658cded8dfef694acd13ed4ae50343b9b99963 SHA512 43dc08a91fe547b4511aedf0c1f2d6d920d42935a9b1f9f2ae2950f344ba853e344d945044d2570ff67c2beb72c9e329ec47e65900d7d370164b4729f600e007
 MISC metadata.xml 339 BLAKE2B ff1bd30899bf67f73610a584e1d012632c801f3fecc39b5dc1a79025abdc151c650d26e5363bce5aace53798b20ec8931fc3532e83814b89fce767a2ecdc4e0d SHA512 b98b7e682407dd662a866336f76031793f13b0d76a7dae86b542afb515fdda1224b8141c71ff1f502294c2bcd88f3f80d18d654dcabe77088bef049bf462f18c
diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
index 4fad8345c3b0..7d6405b86653 100644
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ b/net-libs/serf/serf-1.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2008-2018 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
+RESTRICT="test"
 
 RDEPEND="dev-libs/apr:1=
 	dev-libs/apr-util:1=
diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild
index e5e7ae30a441..b0d5faed2f3f 100644
--- a/net-libs/serf/serf-1.3.8.ebuild
+++ b/net-libs/serf/serf-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2008-2018 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="kerberos"
+RESTRICT="test"
 
 RDEPEND="dev-libs/apr:1=
 	dev-libs/apr-util:1=
diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild
index 031df82e090b..66d367644854 100644
--- a/net-libs/serf/serf-1.3.9.ebuild
+++ b/net-libs/serf/serf-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2008-2018 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
+RESTRICT="test"
 
 RDEPEND="dev-libs/apr:1=
 	dev-libs/apr-util:1=
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index 2472424389af..6ed01d2c54c8 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -1,5 +1,7 @@
 DIST stem-1.5.4.tar.gz 1915722 BLAKE2B 37c278eab0d7c7c305d7fcb498ff39460921ff59ea16cbe97d985c742290b8ca938218cbc7d5e4d1106ffc9f6a20461a4692afd14565698abbdfbd8015cb6f18 SHA512 1ea74341a1013f1f98d3d5ed1d552e79277cf54a6337d1a8b66bda0baae022d70c4c0c9ce35c843222d183a716466d93e1df3ee55ae6cd16cf10c6cf415d3cf7
 DIST stem-1.6.0.tar.gz 2049999 BLAKE2B 10846dbd20f22b489fa885e8f100eb2ba4053aca46db140463882cbc1f5701893e6a4a28820100e05e3ed4fa5ff76135a3b20ec1af917a63f63b3abdf5361df6 SHA512 499a15b1cbd12d75865c93e253e797507564d5b5f2a9a0f021107d89c85db040e050944a9ac69b629f74e265d350467bef9d36ec52f7ef2e6a97180a7b93e94c
+DIST stem-1.7.0.tar.gz 2196759 BLAKE2B 2f4bf8a65e5e89b01e6d1054a9d7fe01d4775dc31f1846c300190320361e15a312ce35867fd7d6af2d0cb315894aa5f69f7e8a47cf184e1d9018342028ba1484 SHA512 10750266860f4f90df5d4a3bf24ec68e28d12c84c136c35d2f168f767f4facae3d02cc62dc972a08666689695ea17337a7a6b80ec1c5ed8b9e5035d7417b07f5
 EBUILD stem-1.5.4.ebuild 1273 BLAKE2B cf930d4cefb1463372c83247f194e54c25ba24edc88d33a8274699246cd87398f869f33fd83c030ddd70f1aedeaa01697e5a32b608a4b2bfabccf869298ab673 SHA512 7aa70c4e3fc49b371e0333e9c6bb91216f6e1dc8991d6fb6feb58e4499dd51f7e8f49535c30688c4ba7096d15144326e962bc556abb675761760f3deb3c21b5e
 EBUILD stem-1.6.0.ebuild 1273 BLAKE2B cf930d4cefb1463372c83247f194e54c25ba24edc88d33a8274699246cd87398f869f33fd83c030ddd70f1aedeaa01697e5a32b608a4b2bfabccf869298ab673 SHA512 7aa70c4e3fc49b371e0333e9c6bb91216f6e1dc8991d6fb6feb58e4499dd51f7e8f49535c30688c4ba7096d15144326e962bc556abb675761760f3deb3c21b5e
+EBUILD stem-1.7.0.ebuild 1368 BLAKE2B 05517311fd06cc2d8be9fee630872b6c5d709224b4d7053faade360fe1e5060ab9ed7d0fc60efc36736c1b186e74ab55cc8fb8daa35c062d54a785d172748044 SHA512 8e1a04b8089da0d90cb057eea67c94622fb304b47db9e38c604f8d827e7c5e43600332a169c90e52140bafe6b1cfd48a918eb680b1229018de7be2df72bdd5cd
 MISC metadata.xml 329 BLAKE2B 78eb533a5eea08ade1c17f2a70d204af1452de6d09cab0e4e06582291469b2abfca6cf86dffcf339797285590d3cfca481f14078f9cd5aaf138ba88f95877bb8 SHA512 e0be0234c4994bfff08e1790f82b8728a33961b9896ff5483b19591e2f00fe4b4ad83d42b59e64c056b393c35ec9ae92737f181d9549655853605537ac017974
diff --git a/net-libs/stem/stem-1.7.0.ebuild b/net-libs/stem/stem-1.7.0.ebuild
new file mode 100644
index 000000000000..8b3cd202ca92
--- /dev/null
+++ b/net-libs/stem/stem-1.7.0.ebuild
@@ -0,0 +1,45 @@
+# 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 vcs-snapshot distutils-r1
+
+DESCRIPTION="Stem is a Python controller library for Tor"
+HOMEPAGE="https://stem.torproject.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
+	net-vpn/tor )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="net-vpn/tor"
+
+DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
+
+python_prepare_all() {
+	# Disable failing test
+	sed -i -e "/test_expand_path/a \
+		\ \ \ \ return" test/integ/util/system.py || die
+	sed -i -e "/test_parsing_with_example/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_parsing_with_unknown_options/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_saving_manual/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_sdist_matches_git/a \
+		\ \ \ \ return" test/integ/installation.py || die
+	sed -i -e "/test_connections_by_ss/a \
+		\ \ \ \ return" test/integ/util/connection.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${PYTHON} run_tests.py --all --target RUN_ALL || die
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 67c8cb6242a1..759333caaf68 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,3 @@
-DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090
-DIST webkitgtk-2.20.5.tar.xz 16625200 BLAKE2B 1fd803d81df1659fd87a93821413326eb798fe9c21af86deeb92f16b3f8eab14350851db499e79745457b708305d013032769416877660db3d5bc7c6058b13cc SHA512 d92fd079ec2826b2880ae5b2d90795ee3071a331bd7a576230b77b9f67a829ab27f09a9b0241a780f612f4f78ea5cc849e4b3d09285d4903eb600a7a7729c1e7
 DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
-EBUILD webkit-gtk-2.20.4.ebuild 7860 BLAKE2B 425c3127e95c99e99a2289fc81d192a5290f2ec4df98a68f0263576d74b47b6b9084bd04fed17ed932bc1a5a13bf4cbd567764677f4244a70f42b66ae496d591 SHA512 78720140f6b08e3e109dd4edd14fbd9990095cbed1379d140173d5426a3cd90febd335e7edd3d80f515c7cb5e5b2f51308c461a85a82845dc6d64323e92228c8
-EBUILD webkit-gtk-2.20.5.ebuild 7881 BLAKE2B ab258b918df65d10a7a3a80654d86f03f8bba4f5506e3f81054a21539bae5cb59c0e550eb22f480210b9f8dc6039e83362dafb83eedaa0cc03e0fa38cb9ea7af SHA512 0820914a1c191cadd33a53caaafdf9d5a3e0274ec8efe296758c76c07594c5c629cb0f9134190155dd1777352a65f82d520286529d296c4e19976ea30756a6d7
-EBUILD webkit-gtk-2.22.2.ebuild 7899 BLAKE2B 61241a8651d7eff60f6b61623fdb612d5f43b6a9130aa150692cb639c34651eb5ed98ad6ad144008f21bbe5ab3e9736e5175d2f4a5a311d852aabe74305d7f81 SHA512 6d501935101283b5cfac537840efa82fdd9a87c420ec802603ae90480986244b6381bdb5e531d05fd2915ebce9c58a1870ca4f1bf5a8901256d7989a45ced1b4
+EBUILD webkit-gtk-2.22.2.ebuild 7897 BLAKE2B 41f73330349d83b62f2dae73fda624561ae0ad0f15462051dc50216bc4306981832d14030c78527beb8ed50bad3ce92892e24745d85e5409356f95f520a7b6fc SHA512 a43489a7166d8ae74a35bafa423b268c7ab9276854ef179a7f4cbe891125ecbe57b5b2e8d9c92f50cc08c765fe3cfedecf5b7107596443990c63e5e7e4cbd6bf
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
deleted file mode 100644
index b7b46a2a59f4..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
+++ /dev/null
@@ -1,271 +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 ~ppc ~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-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
deleted file mode 100644
index 67e35f0c639a..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
+++ /dev/null
@@ -1,271 +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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~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-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
index 57d749ac75cf..71766f4371b4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
@@ -15,7 +15,7 @@ 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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~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"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 551602d3cdc2..c12db45ec14d 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index e17ced12648f..ab5f499989cf 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,7 @@
 AUX dovecot-10-ssl.patch 550 BLAKE2B 5317b802113e6dd711056684bb2de8167113c95ea28ea805fd3a1f688878505d02d85bd9ab69fc222cb2debdc1b5186f48f3c2cbea2f1df24714482939284f46 SHA512 7acc31dd4a3f51a9c13d590fd2803c2cb98c281e0595ca2a800539a143f89b95f923a3678beb0aa2b254a54385522329e0f3e1e8ba4c5852e7b51f8f111122a9
 AUX dovecot-glibc226.patch 2838 BLAKE2B 522fd7552faf88cba7c48f5074d264ca4450d1f72113eba9a7cf23317402b76a53874998bc0eb6cadb4580935dca061314b7c6bd355a6ce618c43465a7c8c5d2 SHA512 5ed7a19941cec35a8edace588bedac7d6d12903bf5ece2a224a61f021ae663352dd668c81cebe2c9b132fd0614998c77f1d19de2f48b2d3794c453b9ae333693
 AUX dovecot-glibc228.patch 1375 BLAKE2B 737b631f7171f265d8d549fe549785bf381de8d954b79193b0405d9ecde27078df77fa56be062c8160f803bc8e3806f6b4763e31a9b1642d00e14a6ad9c6c22b SHA512 1d49c173115dbf76936a2071918249a4909833a8f2fe852f0e1257e58d4b938894abf62d9f305f7008f2d180b827a7e8313f24375116369f6ed644e26fff4de8
+AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d
 AUX dovecot.init-r4 1499 BLAKE2B 9c05fd7da0409b0944b0204bdcd683ab889190effc8cb7b072dcab140f52e2f39336a344deb74b63ef184152604412ca4c2b3d79c3d63341386e7952c54b0a26 SHA512 8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09
 AUX dovecot.init-r5 1461 BLAKE2B 9ac7c6503f1e97c25e69d3be3e105d66fa16a63896adbf8042a0752204cff84a7f123b8706df6683f4c1bb019b02282642765c911f65c5427cc07fd824509a67 SHA512 7a092a92346854a4bfb8bd4a0b935e2a1c3fb3fd27be000b72e8963b435095ee6ae71e582927c9dac8efd842a1814a38d27ce3df04a8a9e5579a7345d9bac9b0
 DIST dovecot-2.2-pigeonhole-0.4.21.tar.gz 1774887 BLAKE2B ebf2601e7b087d655713f985b72442496e36543ec32881d3bc84d2c6b132f58082aee6c5fae3747f756b72a3c9a2e11f78350bc34c398214de13dfc83cffdef1 SHA512 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de
@@ -16,6 +17,7 @@ DIST dovecot-2.3.3.tar.gz 6851107 BLAKE2B 87d6e11c8ff59cfe0b49d3561c307535efb092
 EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4
 EBUILD dovecot-2.2.34.ebuild 8652 BLAKE2B 473b843fa61c17b3ce4474175aca83e9b5c76641853475de27a87b4a84f8101a5dea4c22a6aac0eb21b253ba9dcc8e139eec3283629f2f672d350144f71d3fdd SHA512 0eed64f5d2841aa46c727ed75ba5ff7ac4da8b3bee056990d327e36a8e951e85b70822271dc30dbb3ba80b599dd5442c4ad5efe7cd00440795437ba7218b47dc
 EBUILD dovecot-2.2.36.ebuild 8680 BLAKE2B 72a70c2452e8bfd0364abafe74c6adaf466ef8ff1b73fee0738e75584515ec934ea13b00db597fc69aa9a42f3b0857321efc426f02a828adad8a31165eabbd1e SHA512 186ff159dbee204d75df7acf04001aa7c10c11ce87a05e89aff4d010233b9da27b51f59b0eec4a0535d3f404fcf330c391eb0e843d1d6de4d1bb73a9ce7f8740
-EBUILD dovecot-2.3.2.1.ebuild 8786 BLAKE2B 44feafc0b5cc9b80963ff415c933e1952f858de944b491c5a0a2dfac38fbc1772e068a9fffd928d83c1f3f4bffd83195934098806e5a1c779e01097fd895ec29 SHA512 f6a9f60b880d8ec88f3df7a7a4ab8455ea67dcc916aff33649aa653805b242d46a88f4ebe8a96e89547ef29ac32771b2955662aeaee0c50b3e6c20d9bb7d1786
+EBUILD dovecot-2.3.2.1.ebuild 8785 BLAKE2B a74d0a5012ca90860898099ae0872f88ab88795d185824fb3484828869b925f9bb3d6dfccecdd0ac409b4f08b18b2c3290ffdd0445707202a008dd0901d8fd0a SHA512 30ffba0a00509fc66cfee4cc89f086b99cd88d40fe5d313af638cc2b9feedbcffd5b958bd4a10125f07ae911150a85f8d30bd541d11efbdbfa614d13737f5f91
+EBUILD dovecot-2.3.3-r1.ebuild 8836 BLAKE2B 214e3df6d39beb54d30fb794b97368bea7555ec0e198a4d8d7f3379ad3a46514ee4bb326e33a853fc186c9ae88ea42d1870ef3a0ad0bff59ffe893d1a0bc9bdc SHA512 f83c6b24371de82172e256cd9f0f70ffcb903495316519eb9b4c1419b9d7d794749abcf0e8ad37fb9f96454f95d9d0743fffe8ced9513382c6413971eaae4c2b
 EBUILD dovecot-2.3.3.ebuild 8789 BLAKE2B 6ab8548635742ba2dc82fe4b06ee4438840ebcd1e2d4cbef4662e3fb42a74a10aed252e6e28ac6f56b60006f44c1fcd823373f86d4b06245e06a8ae3cb7b6cbd SHA512 466b7ef0098884c9ef885048337ac68aa9aa3f40ad9a2c5fa6231f3dfbc5909fa97128c2872c8e9fde6a9a2129a096cabb1e681e2dd5fa0ac3d9cf89912d2445
 MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
diff --git a/net-mail/dovecot/dovecot-2.3.2.1.ebuild b/net-mail/dovecot/dovecot-2.3.2.1.ebuild
index 51e78d3f8c55..c279e2cf36c9 100644
--- a/net-mail/dovecot/dovecot-2.3.2.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.2.1.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+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"
diff --git a/net-mail/dovecot/dovecot-2.3.3-r1.ebuild b/net-mail/dovecot/dovecot-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..120949b5d430
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.3-r1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 autotools 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.3"
+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=( 
+	"${FILESDIR}/${PN}-glibc228.patch"
+	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
+)
+
+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() {
+	default
+	# bug 657108
+	# elibtoolize
+	eautoreconf
+}
+
+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-r5 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/files/dovecot-userdb-passwd-fix.patch b/net-mail/dovecot/files/dovecot-userdb-passwd-fix.patch
new file mode 100644
index 000000000000..d5bff016394e
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-userdb-passwd-fix.patch
@@ -0,0 +1,18 @@
+diff --git a/src/auth/userdb-passwd.c b/src/auth/userdb-passwd.c
+index 03cbd554ff..699db314ce 100644
+--- a/src/auth/userdb-passwd.c
++++ b/src/auth/userdb-passwd.c
+@@ -172,8 +172,11 @@ static void passwd_iterate_next(struct userdb_iterate_context *_ctx)
+ 		return;
+ 	}
+ 
+-	errno = 0;
+-	while ((pw = getpwent()) != NULL) {
++	for (;;) {
++		errno = 0;
++		pw = getpwent();
++		if (pw == NULL)
++			break;
+ 		if (passwd_iterate_want_pw(pw, set)) {
+ 			_ctx->callback(pw->pw_name, _ctx->context);
+ 			return;
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 4a6462c27062..13651c44277d 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -16,5 +16,5 @@ EBUILD mailutils-3.1.1.ebuild 3575 BLAKE2B 27de93350eca9d9ca3c8503ebc3b78ad1661c
 EBUILD mailutils-3.4-r1.ebuild 3530 BLAKE2B ee9410a41c7e34e425e6c40c09e244c2d739b4cea8063f35090cbbf38ef14815be43de60d4c96b4856c5979f9f7ea0589d16f9c4db11837d2650c76f41fef4d8 SHA512 d08a536c05c6301555750e5ea4139b524aa1f71b99fd1b25b462c710695a3b976c1267a05448386d773650fba524cdc79c4131cb6dc44c0729cc3bfe5cb0e4a6
 EBUILD mailutils-3.4-r2.ebuild 3532 BLAKE2B e81fb4acdc0fff627e6e54222217485854de167f7a3d9f4b91d4b774f1a3ed919065ea08429a7cfbb80b180a2f8e77ea0fcbf668b7f5ef5c343edb8dd4409168 SHA512 6faf7e29b1464272a3fbd93290fdee06366b41f0297acd44bb7c5e2d2e5a1efb2e91952868a46302d769b21848610401f314d21037d5dd79cd22675059978665
 EBUILD mailutils-3.4-r3.ebuild 3662 BLAKE2B 520d119bdc9c6a79a14256aad74a286802cd9ac690b972058b2a240120e6f9802929daf170d000595a1d2fad076e5921714c96840ebacffde3b1d1effbdf622a SHA512 53f308c6bcf435cffa7030e58fc0f0becfd56ee21b75227cf567a26ca814f6380cdc1fa3cfae63d7e96fde22149dd29032925c11973b5c573c2ae4c90edaea3d
-EBUILD mailutils-3.4.ebuild 3480 BLAKE2B efeab718e516c9c89cf6c638b75d85fb15f39fc11fa9da4f4e22289565531a20c2bd1d7665f9c4621c5d19be7ebb8c7a78e624263a7746e33159c8763582d019 SHA512 7f6b384b5a0a227ec4fd18f5cb4f9797b588013d0897e5d62d878e6e6e703c84a5d7a06f164df38a7c8faf3b3aae8994b0e13171acd6d704eab891cc0f871cc7
+EBUILD mailutils-3.4.ebuild 3487 BLAKE2B 4b101761b0e72649cb83558a1eda59295c92185a334f322581f5d6b882adf74c71d94582b6777beb23107cf5bcb814ec1d6b728ad420572fa9fee228a7de633b SHA512 9337390ec168c2a50dc2316710e5f9f37f032e50873e24f829ea6dd174c1d5360fb7dee9da2cbc7b0174cc395d626c62121d77804bf4c5968469496bf33137a2
 MISC metadata.xml 598 BLAKE2B fce383bd86c8e43d7b9164abae6127ddc98b606b6a5e4afd17826f6a3fb683f92120d8c7877d250196bab51bfb37ab33454d3cfaeffd0b7a69a001481510f9a4 SHA512 16f2b6b082da7c932457df31809c8ca1caca1f8439037f56b5751c28cf1217658ed60fd4155871d4d5d71e7040c01edbe37198dee27beeae1905da954317c8e7
diff --git a/net-mail/mailutils/mailutils-3.4.ebuild b/net-mail/mailutils/mailutils-3.4.ebuild
index 856c9706d01c..45bb51d2ed8b 100644
--- a/net-mail/mailutils/mailutils-3.4.ebuild
+++ b/net-mail/mailutils/mailutils-3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
 	mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 396ac51183d0..b072df877ead 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -3,5 +3,5 @@ AUX metamail-2.7.53.3-glibc-2.10.patch 718 BLAKE2B 83a95d5e03008f16449676ea6e863
 DIST metamail_2.7-53.diff.gz 322363 BLAKE2B bfb3ee13816a62f03ba5cdc3e54957b03d41662d1d32a908b7a02d92490f4c5eafd8e57d945e18902b873c9bbc4615ce7819bfb4fea3f227e1ca918aaa81fd28 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed
 DIST mm2.7.tar.Z 262881 BLAKE2B da245467b5dd009eb489e136d072205e5bc4a190b2b3a9c558f30c7dc6dfbecff8df1f51359cdc2561f7cd85519a6fd40705f2f640cb6632857507cb6bd551fe SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e
 EBUILD metamail-2.7.53.3-r1.ebuild 1708 BLAKE2B 59c034ab96e4aa4381f0cb43199652a6ada61850abb66c5c2fef7acde31936e0dc45cad96dc4418f311ae049f2af456e16889e1374ffdfed447948b7a9a3d03c SHA512 b7d7ba31683dee40336927bc20c61bbbf716a61f08ff7e06798c8c0b157d5031796c0f5b36ab70b12c935db29d4c90ccfb4bba0bd0332d92215c64c3f2fcd7e4
-EBUILD metamail-2.7.53.3-r2.ebuild 1684 BLAKE2B b979cf434c02994f178f484db9b141cb4d85600a35e4b6939c893903cf78a89eac20af15fe632c7bdf6011796e457ddade02eedfce606d6e6e0cfa4425c0f80a SHA512 90a62004832eefd7febe843295d2ca33c3e6a86ca5ec289c04e87535b726bcdc80a76a3ae75c0cdad1a17b0fc120376a97a447903cd08ec2dfc03ec952ca5bef
+EBUILD metamail-2.7.53.3-r2.ebuild 1680 BLAKE2B e5eec50ef880c340e793eba7cd6d6f4a70b473e10f27d094342498d330d28b925d8b3a08d04e18182a61f07c808d9b2284077f4c80c4ec10ae26487cf1de5e9b SHA512 360895596c6bc501ebe5d1a99d55b2b68bc53a3f45aa37f523b2083b14acedfda86059c79eb1956c8adf76b8a9299d955ade0c3ae7817f2bba54121da6b347be
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
index 61aa9f24f9bf..866193ef9dc8 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-libs/ncurses
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a4a6154c6e00..9f1d4c946c17 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 1e7409ab07c0..ef61941075c5 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,4 +1,4 @@
 AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
 EBUILD aria2-1.34.0.ebuild 4322 BLAKE2B 8348642130cd7dc2707a417a90385ee4c3c292a6375acd89f37aa698c6d146982316c74d8286ad5eb715fb9d0330f60ba2f4ae4c59d6bc7a768750de9bbac192 SHA512 cffd85573414498aa96533c4b04d033330dfd5b573ab60abebb8ff93d141c5f715e9d6083ef5f888c3581a188d076b7401a06207f9d023766e321833cefed9f2
-MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f
+MISC metadata.xml 1195 BLAKE2B 393ba5f1d8bc975cbf2a7f4a7deef2929e5f8f3220895628535d5c9e78bb154c2b41a11628d4bfc30475936051c8b6975d6e1146dd4af612e10307572e6c361f SHA512 54ffe27c3c623befb40e1b66df8b4a6cfe9bc1101f65d6641ddc27de686cc0df600e72650f92c89402fdc30f535462ed1f0a6561967771a8e5c0d648890a9208
diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml
index 18fb229e976f..e5e58f42b404 100644
--- a/net-misc/aria2/metadata.xml
+++ b/net-misc/aria2/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="bittorrent">Enable support for the bittorrent protocol.</flag>
-		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> to replace the malloc() implementation with a possibly faster one</flag>
 		<flag name="libuv">Use <pkg>dev-libs/libuv</pkg> backend.</flag>
 		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of <pkg>dev-libs/expat</pkg>.</flag>
 		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> and <pkg>dev-libs/gmp</pkg> for bittorrent/metalink crypto instead of <pkg>dev-libs/libgcrypt</pkg> (when <pkg>dev-libs/openssl</pkg> is not being used).</flag>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9446ac70463d..c0e417179d79 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -12,20 +12,10 @@ AUX 1.8.0/find_call_sip_trace.sh 1115 BLAKE2B d9f5cc559f3dd3fbbb9c50a2b6e6ad30c9
 AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
 AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2c414a72e2e2a49436160edcd79b370df6cd830d37d713ee0083e11b92b8053a7822645db960af9fe97ba2f SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23
-DIST asterisk-11.25.1.tar.gz 35125897 BLAKE2B 42f79202c3e69dc0ff1ddad909c87bc0a0dd3c74bc674fbbcf339e00fedf829f7dd1ad5922fae82d26abc37cd62a44061a917861a2ee9b2fa4e26bec748b0aae SHA512 37144b7296f929bdb707853690a12d4c1403741221c943becc88c18fe20587ba2381425574e97647c10efa9f98200336ddae7e3433740e5a509a837ed28ca02c
 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed
-DIST asterisk-13.19.0.tar.gz 33027887 BLAKE2B f799f51dc4b45d6db2261abfae33f41416616650702ff0cf6c253a80cf2f554f180df9e90bd107ac6a29eeeeef16e3bfadba087f6485fa93978899590b417443 SHA512 5404080a42e2d6d76b8fa8629c9570ae55c943676c51901a34552dc69c35f82001a1738e2da3adedf1de254bc8d1821ea7708f844685462ecdd1fd4e979e0e7f
-DIST asterisk-13.19.2.tar.gz 32991960 BLAKE2B 3b1f731fb68e2d455bfc76e863a8abbd8903ac2f7e89f5bc4b97db0072b0999679a79e6ebbb55c886847fb1db639b6ad84d1f7de1fc3414968ab6b48c5eed72f SHA512 3ee3d57d359ce3049480303b9662a33a905d08491e84d898fd6ee170ee9d34b8bdfcd082b80120dab606929a03572141fe219da75bb87770ed206aeb0249f1e4
-DIST asterisk-13.20.0.tar.gz 32986236 BLAKE2B bc634d93ce4d0a6b524554fa35845a2f289035aea9e7da3098517cdd6d2c85c94482d393276937ea0bc7064260835757e5ffc048f10ea73ba9c0525fd1cf0457 SHA512 de3e740b0dc5bc90806282cbe16f5ec6d151c4a7520b965e6ed30e3cd88d3dc8aca1994c7ae929c039ad755688af6f09a825b665665aacb10cf2566eaa270ca5
-DIST asterisk-13.21.0.tar.gz 32998111 BLAKE2B 7119c541efe80435db6b39571e25e24159b3929f075bd7fd8b1e3260a309bf1ab03599a79aea7d47c429af7e1553d1d89f348c55022e359a43b3fb98ee94882d SHA512 05b10017429a5c339bd50f7576e3198ffd6a71d698f7ad3f604d3e87b76f86da59841bad583c3d979e6e1b7a9fe9fba432c2a9c5faaa1e4dc48003228c637110
-DIST asterisk-13.22.0.tar.gz 33036487 BLAKE2B 09febd1d9ca875b532dffb7e2be5bda0aa9b2aac22d39a28ee3270d5bcb46f56946549aa5d7c8159c00fdb5a7f36e6f5466d6ebfc93f39cb65276efe0bee52b9 SHA512 eb5416d6911aac474c4a1532b1452b0d05359e4150b2e03ba8ac7d5f5f8bfc837a1640fcf26dfa8452b3a738af37e5659f5db6680c16d3ff1ee6c785864c5d5c
+DIST asterisk-13.23.1.tar.gz 33064056 BLAKE2B 7f531766df5f2db29b562e7c7d4e265d5cf610f192188691279c0294195b835bb62beef19d7e9554862e6b44764064b21d50a3e307bbf85dd12b67a2df8be459 SHA512 227bfc80b2e6382019d608296c4e1c8e992ba867636fa2c8ee578d0aa406b8828bf7962b24035d9b581c433afd18be7cbe98eb954112661b9759b6296ee686dd
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f204d117ed715741623195af10c838ec3ac5ce6a26fbb2d76d4c45c538881b532084e2ce74d2de83a27a0abaa5f65791be91416ef6d SHA512 73a9f92e6a737687c311941100c45bbc573f54fa79d0284318996c0d70274a4d2218693406d71b371496d27123d4d99bbc159974388e6547a682c06084d3b4c5
-EBUILD asterisk-11.25.1.ebuild 9606 BLAKE2B a9175fdf2e654f5306ca07c001810f17229904d7ae9c08913cb0910d20d7f9aa9d27d719e06b23faf57174708cebc1212b11887de89d02b7916694702123b93a SHA512 bce64dc6beca0a55b8c8a86186e98f7947ee3ac8ad42ca9efb1b7bcfea105ef8a0c663568bbec1b157e225a12df3e2782f7fd5b92a353dc01317c0c6c0806887
 EBUILD asterisk-11.25.3.ebuild 9606 BLAKE2B a9175fdf2e654f5306ca07c001810f17229904d7ae9c08913cb0910d20d7f9aa9d27d719e06b23faf57174708cebc1212b11887de89d02b7916694702123b93a SHA512 bce64dc6beca0a55b8c8a86186e98f7947ee3ac8ad42ca9efb1b7bcfea105ef8a0c663568bbec1b157e225a12df3e2782f7fd5b92a353dc01317c0c6c0806887
-EBUILD asterisk-13.19.0-r1.ebuild 9715 BLAKE2B fe7475546c2ddf5adf4228ef38ce3944acf66d7537aefb1926072b28126b26e7c1e7dba8b95a30529dc598e84ca6823bbd961035c70dcc7e6e92b6e7274f258d SHA512 2b173fba18d6233628ef7db7fc797063ac0d9f584289b74a82d8b33722bcece400eafc50025648227cf2dd98aa09072d095aec4bbd362bc42b65f1f9d1e98d7d
-EBUILD asterisk-13.19.2.ebuild 9719 BLAKE2B bbffa0bc95f3604cfdb80d398bca9e609506898bfc89b8656cb65a1b76aae53eec2e111f32514e59f388da2188e4cd55f22ccf00c3e006bf25c1acc940753214 SHA512 2e63ed15f7982b787a8d03c721eaa46266981e49aeb0afaac6dd42fb100fda7a49600a4073445100925bfa6d9396a9eb293d6b73d091ce94f924fe67149945f4
-EBUILD asterisk-13.20.0.ebuild 9719 BLAKE2B bbffa0bc95f3604cfdb80d398bca9e609506898bfc89b8656cb65a1b76aae53eec2e111f32514e59f388da2188e4cd55f22ccf00c3e006bf25c1acc940753214 SHA512 2e63ed15f7982b787a8d03c721eaa46266981e49aeb0afaac6dd42fb100fda7a49600a4073445100925bfa6d9396a9eb293d6b73d091ce94f924fe67149945f4
-EBUILD asterisk-13.21.0.ebuild 9719 BLAKE2B bbffa0bc95f3604cfdb80d398bca9e609506898bfc89b8656cb65a1b76aae53eec2e111f32514e59f388da2188e4cd55f22ccf00c3e006bf25c1acc940753214 SHA512 2e63ed15f7982b787a8d03c721eaa46266981e49aeb0afaac6dd42fb100fda7a49600a4073445100925bfa6d9396a9eb293d6b73d091ce94f924fe67149945f4
-EBUILD asterisk-13.22.0.ebuild 9719 BLAKE2B bbffa0bc95f3604cfdb80d398bca9e609506898bfc89b8656cb65a1b76aae53eec2e111f32514e59f388da2188e4cd55f22ccf00c3e006bf25c1acc940753214 SHA512 2e63ed15f7982b787a8d03c721eaa46266981e49aeb0afaac6dd42fb100fda7a49600a4073445100925bfa6d9396a9eb293d6b73d091ce94f924fe67149945f4
+EBUILD asterisk-13.23.1.ebuild 9717 BLAKE2B edd999c6abf4b83c3028d8c69f167e494f372f1b8b2e5640569adf0a212617d96bcfc326fcbf45cf8200a7f9a6fd1836d974c267ef10777f0cbd5fbe7499a75e SHA512 110828ccedecf0bd535357134ee51c860ece343e4116e81d6242a8b9098d01f7889d6b440ccf23c9d0fcfe036083edde0be23fa82049463553c6b9c24b8b76ef
 MISC metadata.xml 1135 BLAKE2B c4572b7c187ff1e7ac66ad38c03a04b51b601990ad48563dbcfa046f03fe0f3587a1e58c1bed7abe6a13a7e2252526d03a0937b5ddbf1a2427ec14b3f115c58c SHA512 660666a8abae2edae04e3c32b272e4f1d509d18566c6c9eb0b0b8a93710d8a1284c68f7ee613ca70bf4c54779a1df1e29d9a56093212bc0fdf1c057450037ab1
diff --git a/net-misc/asterisk/asterisk-11.25.1.ebuild b/net-misc/asterisk/asterisk-11.25.1.ebuild
deleted file mode 100644
index 75bca5529286..000000000000
--- a/net-misc/asterisk/asterisk-11.25.1.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils linux-info multilib user systemd
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-CDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/ncurses:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	xmpp? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua:* )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp:0 )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	default
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select xmpp			res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown root:root $conffile
-			chmod 0644 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 11 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.19.0-r1.ebuild b/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
deleted file mode 100644
index 7d2ba52cdc0e..000000000000
--- a/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
+++ /dev/null
@@ -1,327 +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 user systemd
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-CDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/ncurses:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	xmpp? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua:* )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp:0 )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	virtual/pkgconfig
-	pjproject? ( >=net-libs/pjproject-2.6 )
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio) \
-		$(use_with pjproject)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select xmpp			res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown root:root $conffile
-			chmod 0644 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# install the upgrade documentation
-	#
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 13 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.19.2.ebuild b/net-misc/asterisk/asterisk-13.19.2.ebuild
deleted file mode 100644
index 99d5134312a7..000000000000
--- a/net-misc/asterisk/asterisk-13.19.2.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils linux-info multilib user systemd
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-CDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/ncurses:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	xmpp? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua:* )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp:0 )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	virtual/pkgconfig
-	pjproject? ( >=net-libs/pjproject-2.6 )
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio) \
-		$(use_with pjproject)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select xmpp			res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown root:root $conffile
-			chmod 0644 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# install the upgrade documentation
-	#
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 13 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.20.0.ebuild b/net-misc/asterisk/asterisk-13.20.0.ebuild
deleted file mode 100644
index 99d5134312a7..000000000000
--- a/net-misc/asterisk/asterisk-13.20.0.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils linux-info multilib user systemd
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-CDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/ncurses:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	xmpp? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua:* )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp:0 )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	virtual/pkgconfig
-	pjproject? ( >=net-libs/pjproject-2.6 )
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio) \
-		$(use_with pjproject)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select xmpp			res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown root:root $conffile
-			chmod 0644 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# install the upgrade documentation
-	#
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 13 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.21.0.ebuild b/net-misc/asterisk/asterisk-13.21.0.ebuild
deleted file mode 100644
index 99d5134312a7..000000000000
--- a/net-misc/asterisk/asterisk-13.21.0.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils linux-info multilib user systemd
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-CDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/ncurses:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	xmpp? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua:* )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp:0 )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	virtual/pkgconfig
-	pjproject? ( >=net-libs/pjproject-2.6 )
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio) \
-		$(use_with pjproject)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select xmpp			res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown root:root $conffile
-			chmod 0644 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# install the upgrade documentation
-	#
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 13 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.22.0.ebuild b/net-misc/asterisk/asterisk-13.22.0.ebuild
deleted file mode 100644
index 99d5134312a7..000000000000
--- a/net-misc/asterisk/asterisk-13.22.0.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils linux-info multilib user systemd
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-CDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/ncurses:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	xmpp? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua:* )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp:0 )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	virtual/pkgconfig
-	pjproject? ( >=net-libs/pjproject-2.6 )
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio) \
-		$(use_with pjproject)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select xmpp			res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown root:root $conffile
-			chmod 0644 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# install the upgrade documentation
-	#
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 13 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.23.1.ebuild b/net-misc/asterisk/asterisk-13.23.1.ebuild
new file mode 100644
index 000000000000..e55474c53fd1
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.23.1.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp:0 )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+	pjproject? ( >=net-libs/pjproject-2.6 )
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio) \
+		$(use_with pjproject)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 13 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 54ccb11c923b..5f1f69787e41 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -6,5 +6,6 @@ DIST dropbox-lnx.x86-58.3.88.tar.gz 73782589 BLAKE2B 406758f056dce4348706d181f16
 DIST dropbox-lnx.x86_64-48.3.56.tar.gz 114940928 BLAKE2B 7d678344b59aa12bdbd28f3e425c0b80b15feae403911ef25a03150d1dfa47e94da1eb17d4b703feea6721d2fdfa721da54fab92e1a56b6b8f31456482bc3614 SHA512 cbd3eed71286be079aa8c898929dea305a4cefb9b5e2e41b196d07f68bfc3b5f2839f78d676a3fd7df62644fe00b9ad1930121bde88a6eea9c864d956ccb6f8e
 DIST dropbox-lnx.x86_64-58.3.88.tar.gz 77899313 BLAKE2B ecf729f4cf8c8fabed0f6ca19a9c908f7adec1a58719fae8ef3a6cc80f26b453c678d241af987339e26ccbe988db45f57402ea497c54245691cb702a868fc2dd SHA512 50199f6e60f34a13376725d0deee7c0e6aa31e63574ecdcaf69b43427d262fb35dbf979798b704d6a5a33756e9cea5867591d9a632a311b111d6645123f3385e
 EBUILD dropbox-48.3.56.ebuild 3051 BLAKE2B d9cfe69c1692b41279515b7773b843d745617c0353093be3739f293a3451f144001c0f7d32fc09b8cf477faba9dab270aec6254128a7ad6d41bcdf8dbf3251f0 SHA512 8db5dd0e9491cd822308d32f13941512fc2808992bc61c871f86de3600ec20410f0839e63db328a749d7323e482ccca3bb098308cd0154c0f29e323d5eb90ff7
+EBUILD dropbox-58.3.88-r1.ebuild 3026 BLAKE2B c2b8aba2fbdd245aac386962009a9fbdab5eb2de835d500f6f1418c7436abb8f070a689f7475f38e46f5d2393ab85374db161db259668028dbc678b66dd60400 SHA512 a24de0a97271ad55448223de64a126d6e95e1653792ad08b43229ed56f845fd874cfa5ce32baf695f7124462ec40c961e14c81a1de8a52a3b4e6c0ba741e0be9
 EBUILD dropbox-58.3.88.ebuild 3041 BLAKE2B bd920090ea92b4069c8474375b52554237857be239e31faf34a13b1cd3369e7c199a2205638941755cd0978189148e12a70bcba3c0df82a4a26049fb1f826ad5 SHA512 bfa3ef8d2362a1896318571b2996e0569c7e5d359b31a5e1472189b58d93ff1e087a8a682b0be9b9b4b059586d2bd5b48bb04bfdeceb0f85d71e8d3005e58b62
 MISC metadata.xml 392 BLAKE2B 19f1d26ecc891282c1930e65db36adbfc73c6cc110dbfa1a90a6ed85f87dd1936860dd1710c3c3e2593df22fea34e5aa803a4b46a812e764563dcad19320c466 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141
diff --git a/net-misc/dropbox/dropbox-58.3.88-r1.ebuild b/net-misc/dropbox/dropbox-58.3.88-r1.ebuild
new file mode 100644
index 000000000000..57625334abc5
--- /dev/null
+++ b/net-misc/dropbox/dropbox-58.3.88-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+inherit eutils gnome2-utils pax-utils systemd python-single-r1
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
+
+LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+# USE=X require wxGTK's dependencies. system-library cannot be used due to
+# missing symbol (CtlColorEvent). #443686
+RDEPEND="${PYTHON_DEPS}
+	X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5[-gles2,xcb]
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses:5/5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	eapply_user
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 1b805814f96c..6b7fc7c6c9fb 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -5,16 +5,19 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694
 AUX 3.1.2-pip-optional-pkgs.patch 458 BLAKE2B 25f2ef7a37cb7e05fb0d4e9f70b6e4656d1423d940a1dcc8b6700d2fc67c221250a55f14fc5df99e2d6dede27c47223755e19e48ed776eb34432c8fd173a28a4 SHA512 ffe18ebfb67f6de8456e38228cbf864afce94a686ebc11ef866f4d9f0c324b3d96b8f3a315c13bd0efba0c62f6ee2af6f093005115be3cfb4d8a284d3a236b3f
 AUX 3.1.3-desktop.patch 683 BLAKE2B 15babc615c74152d5005ddc8dc644557fcaf176825fed335fa84168e66c16e2d3d946bd1be75bb15c78a06fc9efcb23a1797c6cfc74c821c2fe83044153fc6b2 SHA512 c05abf3d387143543ffec3342bdc6c820a56d82064f596c5e619286056f105c048db1947d13706d9aec45454f9133109bf3ec3de3ebf4aa4ace523f441a44b90
 AUX 3.2.2-pip-optional-pkgs.patch 725 BLAKE2B e0e5c3de68bc838665d818db491113c700e9512b6556ed2e24744f32c24f015ea4c28e93af16c25c04121b46e1c1275552100d4e65ae0491074870e46280326a SHA512 b85e11ada7e3a5849644262acf6a771f11d457ffdf46eaaf1f61183203bf8c7f7b07da54a57849198d2ea78d2fd43962970397d93af7a125bd9d381b0894267d
+AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
 DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
 DIST Electrum-3.0.6.tar.gz 2640475 BLAKE2B 2e10417fb59629b9e3af8ba10893fb85b3b0d0ed9f7d7226a58dc7a2f91ed682423168092101565b00824bc62cae60d878de0d78271b716c027c8616419037a8 SHA512 4df9d81d954a008c3a14a89a7191b8af94393701b55651ad19acc75addb70fea942876a45c545c89b290cbdd7adb41b2d36e3cbcf73449eaa5d0a39e1529b2ef
 DIST Electrum-3.1.1.tar.gz 2722902 BLAKE2B 31628d18a26f552469454c4f2712eee1aaba6ff5114a7cf0b7f261def5ed5731a267ae369ec3460c7f9bb5ad2b1713b2b464ef05fadb5e0e9ffd563adeee0ce8 SHA512 d7f987dde4a4fe5b2b0e576328c20b56ca650047321ac101dc6c3edd5bcbeedd569870d951262583a5ef1d1e40d6107ac46aa4fe031cc63d3a759d332db056cb
 DIST Electrum-3.1.2.tar.gz 2800714 BLAKE2B 0932932125f1fd7099c090806c669a998c00a70a8f34b20d0afe4b1f6c5c24ced8743a60923e466c3507d29c75ac58e2e3e01b422701be76bbcd8abf54497276 SHA512 e4e6d674817bacefaf9c64acfdf16c4c215264e825dd8b1bcf1d99429963b0da18d442b966ba986cf0ad2d621543c3e0e68e8ba023cca23b6626781c2e69a61e
 DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
 DIST Electrum-3.2.2.tar.gz 5617363 BLAKE2B aae6e12644c55542fb1e0ff702e751dc5ebcb3d1da6ef58c3509be248208c38b10f43bed555a1228f9e9f397350765d24544d89f56ffbfccda71ec39fe2256d3 SHA512 32c4a24c2d3e2e38b9d66f6102176533a991b1c1fd25173bcd3bdd2e78cf42fc5fd2f0d2ee0c6a8d99db1b17d47bd3e7f3cf1303964f0566f4eef4edb3c87f15
+DIST Electrum-3.2.3.tar.gz 8311398 BLAKE2B 389f2ce2982d40f69c1fe3bfcac3ffb70d4fa09265f1a0567ecbdad21b53ebfdd2473e8e56e024add8cd52d24f690467441ffd33509cb0ef20c4f30bfcbba2a7 SHA512 a1620d2a0f28ee8c61e0ddd985f9e2a219f2b9fe0316042fbc88533332fd95709a9f4e60a40494a9cc5c2fad08c6f318f38bcbe91bbb88d20811953d514682f7
 EBUILD electrum-3.0.5.ebuild 4258 BLAKE2B c17c9fcdfec66850c979f0b35e8544cca75cb812052c6b437f432a5fb0dd102545c0082e2bbf210171fb379e89bc4f8ba1644a9d0687055c1f14ef272722912a SHA512 e8e97edc343ef92ff8f54c965fe1e9c1cb9428292425c67e591721c0d8d1d685c3cd144a31f96f3c24161d93dd82209f97643a9909bdf5b9b896eff9055ccb0f
 EBUILD electrum-3.0.6.ebuild 4225 BLAKE2B 845f9b71a1b9288b32110658f9d0aed5c841fbde6c3a1f7814a0f87130cb5bde5b8a7982a3dbe814d4901faa7ac92205fbed5e73b4102359841fa1bfa48a5d8f SHA512 488fce80e3ef95a47cc9198dd3c3df263757536a2adec499a33c6836ef391f8c0e9650e7445ac6572be26c9de1db00b8bb541884749a30e72c340068e319f1d0
 EBUILD electrum-3.1.1.ebuild 4266 BLAKE2B f2215c3d8fa7380a11d2afaac31c4c732363a6292f632cad6a4a2a0d7c62cf0e4a2c19925cb7e8c4a28ba01f63b51c684e5e672e701b922aeefb149e413626ef SHA512 dee404b782ec8bf6e67ea9a6ad18f1c84d34b1d2ec785b6e6f0324353ab34c08fcb42b9c25316fcc59960385b6a1f4b6f9ca74dd96f58f953785e8aba528c1a2
 EBUILD electrum-3.1.2.ebuild 4308 BLAKE2B 2c8bde9e2e8624a2a87881bc44197883ea9ae5e1a099452f24053ac753cfd34a66c5e44bd05d8dfa40c6337879754acee815101250aa980d59d9fe3c0b436e83 SHA512 602c93d714e71ac737ac3930f09fc0712026a4c1703923908c63531a1e2b5a52785fe7011ee814a1a715bfbc93efc836721a4ad893488ee4eb3b4dec5803b896
 EBUILD electrum-3.1.3.ebuild 4329 BLAKE2B 250c545a93aa26f86dad7d87049a9e407e124041fd46a07083368bf528bce23d4c0031123dfc8b05ede465a47da6290202d8fc4fd1026aeafbfc338eddd8365f SHA512 0412d8a4252480c6cc903353f3a6fb912e79967db24c75f4be12c55b0db4d3eae1ad8b5a7b6201a6a39ae1eb19d3c5df40e613d33280c357ea6ac0e6c29ef036
 EBUILD electrum-3.2.2.ebuild 4393 BLAKE2B 26acc075fd21430cfd08cb940ffac4c1217c1ca23f035e53a0edb4cdfe704fd239e93fb9a564486b6dc5cb36a56151eb867f85468e509d491df2c2d0ec96c1ce SHA512 5152ee6d100af50f2eef4c47c844adb50be11a397e0f81e20dfac9111b7bfb43bbd50adc8d77dabf41ae33993668f236b12ef4777f9e4a9932d0925b8a167dfd
+EBUILD electrum-3.2.3.ebuild 4431 BLAKE2B 73632ec671f7a2b95b39bf068f727fbc5d2007a58531fc827d1375a569b7a92d4cd99f3ec0be7984436b7160ea951de618bd21384e0aed437ece99435c911e6c SHA512 dd37f22a0462612f3723597815150a8516c822b5e45e89382355815fcca2c5fa0be02227dca8a6532e330a3c088a28af819d44bba7eb422293512194ca29e587
 MISC metadata.xml 1310 BLAKE2B a513446594197d15f1ef462faf8730b0a5b593ff280b6221e6086f8caec173c6e75389c0dbb7b50e2ee2eba236350ab0503b5b9c4cd68beb570847b81847cc3a SHA512 4b07d535c78c4a039a426be75450f7a7718396e265f0fe19d22250be4f0090f6cad0d9ba383765a7cfc491d3c863c4bf0189c6f4de5ee08430080ddb41d1519f
diff --git a/net-misc/electrum/electrum-3.2.3.ebuild b/net-misc/electrum/electrum-3.2.3.ebuild
new file mode 100644
index 000000000000..39ebfd7e733f
--- /dev/null
+++ b/net-misc/electrum/electrum-3.2.3.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 gnome2-utils xdg-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
+
+my_langs_to_l10n() {
+	# Map all except pt_* and zh_* to their generic codes
+	case $1 in
+		pt_*|zh_*) echo ${1/_/-} ;;
+		*) echo ${1%%_*} ;;
+	esac
+}
+
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync revealer trustedcoin_com vkb"
+
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
+done
+unset lang
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	audio_modem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	greenaddress_it? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	trustedcoin_com? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
+	eapply "${FILESDIR}/3.1.3-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	# Remove unrequested localization files:
+	local lang
+	for lang in ${MY_LANGS}; do
+		use l10n_$(my_langs_to_l10n ${lang}) && continue
+		rm -r "${PN}/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja    '' japanese) \
+		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
+		$(usex l10n_es    '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		rm -f "${PN}/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" ${PN}/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm ${PN}/gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		$(usex greenaddress_it '' greenaddress_instant ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		$(usex revealer        '' revealer             ) \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin          ) \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r ${PN}/plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/electrum/files/3.2.3-pip-optional-pkgs.patch b/net-misc/electrum/files/3.2.3-pip-optional-pkgs.patch
new file mode 100644
index 000000000000..6d62f5675764
--- /dev/null
+++ b/net-misc/electrum/files/3.2.3-pip-optional-pkgs.patch
@@ -0,0 +1,11 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2018-09-17 12:56:34.000000000 +0100
++++ b/setup.py	2018-10-14 14:46:16.524385198 +0100
+@@ -72,7 +72,6 @@
+     name="Electrum",
+     version=version.ELECTRUM_VERSION,
+     install_requires=requirements,
+-    extras_require=extras_require,
+     packages=[
+         'electrum',
+         'electrum.gui',
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 1d589968dc3d..c11d6ee1f9c3 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -5,4 +5,5 @@ DIST gns3-server-2.1.3.tar.gz 1658657 BLAKE2B 4ce83aceff8f70f93032b2baafb0dd5c94
 EBUILD gns3-server-1.5.3.1-r1.ebuild 1583 BLAKE2B f609acbb3ad6df54f9c01a6bc0553d59732a4b591d81d8fed3896dddc4c6985be2eb56acf14efbcffa405ed41e91dbb519c499f563ddc8dcb85ccb168e29fd95 SHA512 52a2ce317b0c3586a63be29bd358e0a3271474ae9fb11f87affb82f8fc8797a9696308483dd8fae75d2b409dc1e2ee98e4d27c9588885bccf8a557103781399a
 EBUILD gns3-server-2.0.3-r2.ebuild 1644 BLAKE2B 0437d9b2d7f0a199de1ab40391dd42c506b019ece76fcb0cdda18d2e969d9e59486601c51e2f5bc7f8c280efb9c1299f212c76d4a8393e72fcddace949e9db2a SHA512 b241a4d568ecf9405252087aa8b3240ab05071f64769f1bd5547dd602af24077fee6e0c5eb97330bb6471b698a19bff0fac6a7685d947947ef1b0cc5ba88ac59
 EBUILD gns3-server-2.1.3-r3.ebuild 1887 BLAKE2B aac42a46ac5c720c83931df923bd75fec153477c7764829c068a20d1d4433f84a11d1302228008901598b53926ce383fb8617ebda1ff9918e6856f1aeb62d45d SHA512 a6ad54a38c85a180757e60c47d04cd857f98a089e5510a19550a04ff5deecb2809cbf3c06271fe7676544d47bed0c4037f16b4bba6cd8a1db7d59a2ca793ecbd
+EBUILD gns3-server-2.1.3-r4.ebuild 1884 BLAKE2B 18bbd7a7c90e84289c39f4aa51648f00dc637c21b3eac7da240b02598595eb96257c7ce2cdd1f7106488b838d00d27f978d73c12ed29526c42e31adba8b0591c SHA512 555522c18d7fb0160fe98cad5f60a5e0daa2f7a0043e3105eb5e003d5ff90cc2155f7d82808c9363501266b92546ed53eae647e4ae97bb794a10702397d818ae
 MISC metadata.xml 361 BLAKE2B 52549a2862a4e5aaf855909c27ce68640e52549b8e56a2284081cc1eedfe5b5e6e95c3f957f2d34022c43ce541ebd9c6cf94ff723d2843fc85732b76d6358d7a SHA512 10af38136367903504fcc02e0e3cce154283979bcf4c3398d4fde8fb48fc6716448fdece6a74bb240dd74f37487ef07e1ca0209f4c2b567b4f5f3c67c8ed7a4d
diff --git a/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
new file mode 100644
index 000000000000..0860f06ff843
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+RDEPEND="
+	>=app-emulation/dynamips-0.2.12
+	>=dev-python/aiohttp-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/aiohttp-cors-0.6[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-cors-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
+	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+	>=net-misc/ubridge-0.9.14
+	>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	>=dev-python/yarl-0.11[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# https://github.com/GNS3/gns3-server/pull/1368
+PATCHES=( "${FILESDIR}/${P}-typing.patch" )
+
+src_prepare() {
+	default
+
+	# Package installs 'tests' package which is forbidden
+	rm -rf tests || die
+}
+
+pkg_postinst() {
+	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	elog ""
+	elog "The following is a list of packages that can be added:"
+	elog "app-emulation/qemu, app-emulation/virtualbox"
+	elog "app-emulation/docker and net-analyzer/wireshark"
+	elog ""
+	elog "The following packages are currently unsupported:"
+	elog "iouyap and vpcs"
+}
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index 4514bf994e69..1b91a2fdd9bb 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -1,9 +1,7 @@
 AUX htpdate.conf 359 BLAKE2B 7bcd2aa3e818ee31796e6f1e3b060cb6c04558fbfcfbdc51cd6b8d787e3cc91ac8870ffd9b95df390bda3c90dd9e186bb6fc2629f56073a97e88fd5dc1141bd6 SHA512 28940548bb15484430cbc63d16eeb03934e6de82cb9729e85450f595712be9caf96e1cb84c55d17dd05f33661c2b657d76bfa8b40a3e0f649a0070aeb8be678b
 AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba97997925bd421164dd25d3820e4c7727e14389cd5372635afdf5cc8e313297679e74b3a65ab65f0c4a12b3 SHA512 d18a91792787fdcb4808da042025d60bbe19335fd8492b33af33d33bc24d250bcc65c8ead7d443e4d37a9ca61428361db7b418a5fb3256b030b02b9a772fe10f
 DIST htpdate-1.0.7.tar.gz 16848 BLAKE2B 2e7350f186af09d8876c9caddf3d3bdd1b3d361169417e1c672eb04e499d07391ec93c56fad7e6d0f947a5bf60580a9f52ba564f213662a65dbbd67df875399e SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360
-DIST htpdate-1.1.3.tar.gz 13421 BLAKE2B 6613fac2d9b01907d3cbb843bb88184b2fe87339d0eb26e3ed162e34262aa1f64fd445c14eab77b3862fcdad1da91e1420f8545a8924316511f5d4c84d931921 SHA512 b6924f49165768e65b2a843db176aa9e8208bdc9e7390fbd2e802dcb1016d9fc897c717743ae559f7a6b17b18a44294a7b8adfa68b547ed8bf66135a12cc5b30
 DIST htpdate-1.2.0.tar.gz 13618 BLAKE2B a94f08738d08c0caacc876d2e25e1dba43bbe371b0a31f957a1d5ff522b0ae5bd7bf5abcde63802843b1c32799e4cc38bacda657a9efb3a56a1eaccdb4f8c35c SHA512 5447d54a54038cc3c33f7877410ae42022e01eb10a93bd79fe4937452a823c65c6bdb743213bc77a8506128d5b384e26812f1291a0ffa1aeafde0230c1b645d4
-EBUILD htpdate-1.0.7.ebuild 1130 BLAKE2B ff3b9b231526190208d43461c1f6b84f763e8e57d0a4caad6faa77bb9afb2c111bf309fa211cf5a2bdfdda64850a1636065183d839fa9affea0bf4d691fc5486 SHA512 a1376b0c789910d96e83ae60416a80aa1c0835c83be9d26a6cb70555b8e21ae0cabf797ef658f9b4074a6ab97228ca52f14446f213ae372866bcc33c31cd7d38
-EBUILD htpdate-1.1.3.ebuild 1035 BLAKE2B 3bd74f03e2e84e59ed62e440dee8bb04d692343e734d45c4bbebf9a331440a8a387724f5072f114bd15e153b505cea66f8f023ff9704c7b810bd535ed1a00917 SHA512 e7db07178353c6d4237fba1064b1867bf60b958a1664bb478c4655cf64941725fb8aaaf00d81ac59cc3bc675d63e4f0180dd053748cd375f8612c6868bee1ab4
-EBUILD htpdate-1.2.0.ebuild 1048 BLAKE2B d114a11597279d650f431eb03daa817d20ef90ed6f58c182c15817d48b297a6d8ebbbaf6e507ce3bf990021c8cf2184cd02fc48ca94b85c289eebe1b61b6a6f4 SHA512 dc9bd915c482c830d564fcd202bb62902bbade7f7daed3ab1b4652141d73de256354126548f77fbb62d370f7e8f4c925d8820d7752abedb55dc6d8881fda3224
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+EBUILD htpdate-1.0.7.ebuild 1104 BLAKE2B f8430b15362130cc425a75b6b296b274e8f26ae4bc30085bd9d4d5d7330fa16560e19809e65dbf55d346f96a7f70901b8165526a0842b0b3a9cc2d9bf21671ad SHA512 b94a56bd7230572bc2b52fcba820a7606abd26254b202ad2c7be1ccbe29bb7a4fcce4e211576e06fe08d04d7b88979e4116b823254d9dd406cff61dd9b21fed5
+EBUILD htpdate-1.2.0.ebuild 1010 BLAKE2B d2618eb187746a32bfa2164024fcc04cf994a22d385dfe6cab5893559fad163f3831970078c15ae1a3d4ca8bcb7c17083a47cea6c08da4b442fd45eef05d817a SHA512 d026ca50acb4f8984df041c326b5d035c30f2f33d5cb08750ebd46d318573a71758383fc674dfc4a07d439eb694acefc4160c6cd177a35d4a6079ba12128b43e
+MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/htpdate/htpdate-1.0.7.ebuild b/net-misc/htpdate/htpdate-1.0.7.ebuild
index a912c582f9f4..a5d577a24e4f 100644
--- a/net-misc/htpdate/htpdate-1.0.7.ebuild
+++ b/net-misc/htpdate/htpdate-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit readme.gentoo toolchain-funcs unpacker
 
 DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="http://www.vervest.org/fiki/bin/view/HTP/DownloadC"
+HOMEPAGE="http://www.vervest.org/htp/"
 SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/htpdate/htpdate-1.1.3.ebuild b/net-misc/htpdate/htpdate-1.1.3.ebuild
deleted file mode 100644
index b37c01306f7a..000000000000
--- a/net-misc/htpdate/htpdate-1.1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo toolchain-funcs unpacker
-
-DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="http://www.vervest.org/fiki/bin/view/HTP/DownloadC"
-SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=""
-
-DOC_CONTENTS="If you would like to run htpdate as a daemon, set
-appropriate http servers in /etc/conf.d/htpdate!"
-
-src_prepare() {
-	# Use more standard adjtimex() to fix uClibc builds.
-	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
-}
-
-src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin htpdate
-	doman htpdate.8
-	dodoc README Changelog
-
-	newconfd "${FILESDIR}"/htpdate.conf htpdate
-	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
-
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/htpdate/htpdate-1.2.0.ebuild b/net-misc/htpdate/htpdate-1.2.0.ebuild
index 6e891f5ab55c..7c9ad1ec4d3a 100644
--- a/net-misc/htpdate/htpdate-1.2.0.ebuild
+++ b/net-misc/htpdate/htpdate-1.2.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit readme.gentoo-r1 toolchain-funcs unpacker
+inherit readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="http://www.vervest.org/fiki/bin/view/HTP/DownloadC"
+HOMEPAGE="http://www.vervest.org/htp/"
 SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux"
 
 DEPEND=""
 RDEPEND=""
diff --git a/net-misc/htpdate/metadata.xml b/net-misc/htpdate/metadata.xml
index 097975e3adc2..95aa13f6c5ef 100644
--- a/net-misc/htpdate/metadata.xml
+++ b/net-misc/htpdate/metadata.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index e12377fb420c..5f4541dda61a 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,7 +1,9 @@
 DIST ipv6calc-0.97.4.tar.gz 1037582 BLAKE2B b01929321c94169631c865ddf00067a85d0df8083f2d675b6fea6d4d780400d654cc802a94ff8c723f2e5f4f0d970e82338d5e9fc4bf4c1572b304fa017ec4db SHA512 133f4e281da8eb1ea13b7c37123ae9f1b88e100553de758ceaa6cc63b0306e4711447bc7a4c171508fc5ce1ed447daec9749c5a75e5288deef0efcdc095bfcde
 DIST ipv6calc-0.99.2.tar.gz 1287951 BLAKE2B 14de353f5883e1aa538c9fd1b66dbc9d9b485192a7cd7853f4b8a00a31b1b798cee33edb4263a9c5acd8b6dd42b26cbce35e0f072e7b92a7c40f1222bba27075 SHA512 f757a4a7d69b5dea34051125b96b9f9f36957bfabb1568ddae2aaefe6551aac7b9edb6abfdb3ac90aeaf32e517720157614cb7552b4e9dc18180904674e48f09
 DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
+DIST ipv6calc-1.1.0.tar.gz 1396498 BLAKE2B 67b95057ea75f7c26ab1f9fc8b8e869ef027594e71800c4f8f1c442f34bce31340f1e7160d4f48033b8bc080738051418be48e3913ccd62594256ab64eaef919 SHA512 8fe2a4717f2be4ceae051b635d4329b8c438d9741e9a99a3c12cc1c0d0daef89325cc9beb7ca65da3c671586ce2a596191962118005aeaaf7cfe33a1d4549101
 EBUILD ipv6calc-0.97.4.ebuild 1261 BLAKE2B 685a6981839b68a33c680812c5d4307a5d41ac580db6d08394134b000f9b0045eaadaf85491a6fecd4ee91b5540ab155354d3feeb0bb30271bc1671986fe118a SHA512 d80802c0164be4d04daf115945b0addf1e2821f8c6af49371378f39bc2df09b0431300ca76657b4149fa8865304074e07d63fb3d7e557d2acd3cb38a756b65bb
 EBUILD ipv6calc-0.99.2.ebuild 1509 BLAKE2B 9f5bfc6e3dea8ec9d1659a44b8e646f7fa41278db028d99c3451a201dbbd51d24d27117ecdd1a41cc1d16603a39115db093736cafe399eceef90593ddcb41135 SHA512 b0a1cd648acece998390e55d6ee38659f0352d1f82599e17c2761c9f384079c2eec4e371673f1566cb1d4baf61a97f3b0857f79f0c4ca6980b402c33ebcf0756
-EBUILD ipv6calc-1.0.0.ebuild 1514 BLAKE2B 56d45b5ee76725139cfd0f32038c59b37cc837d1b4108d54bd8de7bcaa0064a1f2ac74591c79e86b60664ee8cea2b3fe09c85f12a0b3572ecb2892b50657493e SHA512 618f534e7feb55ea0ec9c92c4a159b187c363797c5e6fa3be2045ae1d26d930529dea2c505c329d1d8de6cb4569489e5d83ad03d70bd79151de042134fac1c4c
+EBUILD ipv6calc-1.0.0.ebuild 1506 BLAKE2B e1c0db4b5904351ba98a0b141dcd906836cce9eac0f81d20ab86bafe52b9101f9cef108dc6fb08b948d940e42001b74533cd2c9e0fbe7ca0c7aa02eac12211fe SHA512 4dd8479d8738b0ba7c0cb31462981715dec73f820c4c6fb2829693359944b32babbba53315d019d37290c7722da1f4b941927c6baefd8bbd927f200d72fea78f
+EBUILD ipv6calc-1.1.0.ebuild 1514 BLAKE2B 1b520e08975817482c85dccf0ba9ff118a2f976dae4c83ee35f155277862969562ca8c880ef4d215ed92c9fc2f304d42d5f68b070f24a585c617c47e742d60d1 SHA512 34ce1a7e1ceecac75e0758078a72a7b9e319b2050eebc0b2f56497436744b1e7e9c74e44b36ec2457ef8658ff20aab560302a7c4037c9bff5d6e263a62209227
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
index 6ea0a78da694..b0e61d909d24 100644
--- a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="geoip libressl test"
 
 RDEPEND="
diff --git a/net-misc/ipv6calc/ipv6calc-1.1.0.ebuild b/net-misc/ipv6calc/ipv6calc-1.1.0.ebuild
new file mode 100644
index 000000000000..f16ce08a7706
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-1.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="geoip libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	if use geoip; then
+		myconf=$(use_enable geoip)
+		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+	fi
+	econf \
+		--disable-bundled-getopt \
+		--disable-bundled-md5 \
+		--enable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--enable-db-ipv6 \
+		--disable-dbip \
+		--disable-external \
+		--disable-ip2location \
+		${myconf}
+}
+
+src_compile() {
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/liveice/Manifest b/net-misc/liveice/Manifest
index 24b7daa37e9d..8c25e720553f 100644
--- a/net-misc/liveice/Manifest
+++ b/net-misc/liveice/Manifest
@@ -1,3 +1,3 @@
 DIST liveice.tar.gz 85171 BLAKE2B c804a4f64432cba3181e633b9edb4e67f39c18805290bfae290ae78bcb80d865a3106af8cfab40e214a043609d837bc887d0eb50adbaad3f1d2838dd44e4de58 SHA512 6b6b7ed7f4aa2b27e2b97db407554955e332002c059bbf3fbb5c5fe60c1d6aa5cd594d2698524a9b447fc3a81de96fb46945c2386467f1773ff0ba2b10da78e4
-EBUILD liveice-2000530-r1.ebuild 805 BLAKE2B 9345bc6422692d97baedf12c6f2aa696d089964db5312a45076e75df0c5f019b2f5270cbf8a7113f3d55db31fff4fe131f34569d1552df651ecd304d5a197e7a SHA512 9eeea18578b6d2b869df4620ea753b9d0d2877652bdd5841bebb3e8317ec69c2d291e7ce9c697d8158e411aeb3b61768fc56b53e05244fe7f413e41379116e52
+EBUILD liveice-2000530-r2.ebuild 787 BLAKE2B 6e1c557a66a66847718a013d53b85783497797c8731b59d69c6d6c1f1410d51dc7c81332482ee60e2912731ca86105d48bdb99329cb8c62bde8b7760fe7748e1 SHA512 0a18dfce846156b290059b7a5b3223027220c51c3cd312df2774a52634c9cce70a284487c24e7cf1247a79639b2068160fad410045f4e0b39584fbc7980d2e7b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/liveice/liveice-2000530-r1.ebuild b/net-misc/liveice/liveice-2000530-r1.ebuild
deleted file mode 100644
index bfdc4567572c..000000000000
--- a/net-misc/liveice/liveice-2000530-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Live Source Client For IceCast"
-HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html"
-SRC_URI="http://star.arm.ac.uk/~spm/software/liveice.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="media-sound/lame
-	media-sound/mpg123"
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# cannot use LDFLAGS directly as the Makefile uses it for LIBS
-	sed -i Makefile.in \
-		-e 's|-o liveice|$(LLFLAGS) &|' \
-		|| die "sed Makefile.in"
-	tc-export CC
-}
-
-src_compile() {
-	emake LLFLAGS="${LDFLAGS}" || die
-}
-src_install() {
-	dobin liveice || die
-	dodoc liveice.cfg README.liveice README.quickstart README_new_mixer.txt Changes.txt
-}
diff --git a/net-misc/liveice/liveice-2000530-r2.ebuild b/net-misc/liveice/liveice-2000530-r2.ebuild
new file mode 100644
index 000000000000..5efefe357e32
--- /dev/null
+++ b/net-misc/liveice/liveice-2000530-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Live Source Client For IceCast"
+HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html"
+SRC_URI="http://star.arm.ac.uk/~spm/software/liveice.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+
+RDEPEND="media-sound/lame
+	media-sound/mpg123"
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
+	# cannot use LDFLAGS directly as the Makefile uses it for LIBS
+	sed -i Makefile.in \
+		-e 's|-o liveice|$(LLFLAGS) &|' \
+		|| die "sed Makefile.in"
+	tc-export CC
+}
+
+src_compile() {
+	emake LLFLAGS="${LDFLAGS}"
+}
+src_install() {
+	dobin liveice
+	dodoc liveice.cfg README.liveice README.quickstart README_new_mixer.txt Changes.txt
+}
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index a81717c6f181..60ecb0cc92a8 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -1,4 +1,5 @@
 AUX lksctp-tools-1.0.13-build.patch 972 BLAKE2B 9b8d69a5de91aa21019b592b5040b061d37529d2226e7beee92624739f443c03972b0ccde4ed20b4785ac87ef59c9bea1d9588add6aa602173632b9c2de2acd1 SHA512 7db737b2e369e85f4e97c167bf8ca52d004fb19b3fbda7cc538cfcdbec19320ae94fb97e83451143eba91e1b44f11f11d4824511e203b85d2fa329d7aa66cba6
+AUX lksctp-tools-1.0.18-install-sctp.h.patch 335 BLAKE2B 513aca706f701591bca2e0814bcc6e7748fb4b1ffa97e8832e9fdac8dd62fd4ea5d60b2e385d5b8be0eaaa6e60b32f6ebc2f3962b43f6d6a39b14bc14eae7e08 SHA512 042611f2c2e7605e96552dc5bee79e014b9ba2db4e08fa7a5c5c821a86d22d970bfba40a477249aa6e9149a997aab1d48b133b97ec353d4ab22ed9e2de6f9096
 AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46215fcd8bb4f1b7cf9e860f9574c14d4f96f5f535f969aa827296e38017f3c56831ce820a2c5469ff9ef6b0afa39b553f SHA512 f64962208c270fbf39ba73b71801c27f5c2e45e4382c53bf3728e14c1300970b0d2a86d34132a4e8d24f8eb694bd234b11cefb7cc31eb232557d090c34d830e5
 DIST lksctp-tools-1.0.13.tar.gz 564530 BLAKE2B e9d374910e7acad2ce05f336e8f66c8ef22bce85912a02cf23c7f691b949b681e75cd9031cf676cb1f4911f311f0153e3a68730f3faba47714f020625924b5e2 SHA512 bdcf06223641ca062fd528ad87efbd3ac2a4e721b691bade528ae6d2ad8eaee5a6c0516eff42c83a3afed812c378f3ce782b93efe8ec830d91280b7419ce17b4
 DIST lksctp-tools-1.0.16.tar.gz 565446 BLAKE2B 2eff562809f24b76b8f129698c8fef30f9612706482e3061356e3a6fef2503c677421de4e7cb0ab30c8830cdccf7541f67234469920394554fc574fe45833a88 SHA512 ea771f3ffeef4630638ee9cbdf01723d01b1b0ca2e8f147a2b61b907339bd1a0c5d621a58638a3b700b6ffc41de06c7b9002645254a471e279663b64b313f467
@@ -7,5 +8,5 @@ DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f
 EBUILD lksctp-tools-1.0.13.ebuild 1325 BLAKE2B 2abb94d04bc857ce825ac73d11aa3eb0edf212f2665734e154196ffe7a420dbf50aac450de9b50710df6fadcb56e1b59a7f0f0c7e21fd41746e3be892908d35d SHA512 056d22e86c97ebab6a4b782ac069a18df5f3f023188e064ed0c600859dcb4c2a5eda9dd87e1caa0b733da3f40887afd02ab8c3835a745ea03b83567154de5586
 EBUILD lksctp-tools-1.0.16.ebuild 1262 BLAKE2B 5a1d23239b5a9db76cad9c1cb9004d70ac5bf0cdb7c5bfc6f40fae6a369668bda47943020d3412277540d73cc9cabf30eb4cad7eca2908070b05d7ee423a01ff SHA512 895d27b5a9250d835f9327ae66d45c05a0c714dc85c227c767bc255b7139f8beb46469c1201b293b482074722bee68a5f6d71648b9d91f85c1d5da67297edb5f
 EBUILD lksctp-tools-1.0.17.ebuild 1262 BLAKE2B cbe69e6d6aca2e34a238ac076cc9fb81ecd3a41139c4c54c2030272c4341d83419ac4c9bf3e94811af0d4340a4a66d0f095247bedf9bb8df742a81851606d7e1 SHA512 3cc1bd3e23845fa1c5247e4a52e04a331a9ec4dfc70035a4c63ab2e7f7d6f912ef37f7df5881d67f1d51b267195768b59344100b996461616a68ea16f62bb17a
-EBUILD lksctp-tools-1.0.18.ebuild 1341 BLAKE2B 43328be05e7d025a942420178491c5a479ebefe4eda1ac407831fcd928fe0c90e2d74cef263d2033584e6b33398d7efa98c7d20e2128ec189a140b35bb656d35 SHA512 7405cde2424fe7e9c0afc630ad36053432df4d4de1e08ec1dec3b3d3b88bd9cb8166f4673afe4cd04be5cb20bd4f435b50a58c952afcdc370ad513652d0c59c3
+EBUILD lksctp-tools-1.0.18-r1.ebuild 1394 BLAKE2B ee44d277a8f436d647fe9fb98979f3c435bf0a29b2159f742dd253887c1bb4720004ae568049bc62f6623769f7b8854a7e75d748e8bad509188909053b3d0410 SHA512 9e180886f60be58255b306ca03ec0494992af7faf1eac34c27e9b7542c1923006fae3670422671e985bdab3dc059762d15b8db57f381eedc669c1a949e59a4b2
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/files/lksctp-tools-1.0.18-install-sctp.h.patch b/net-misc/lksctp-tools/files/lksctp-tools-1.0.18-install-sctp.h.patch
new file mode 100644
index 000000000000..f831e6c30b3b
--- /dev/null
+++ b/net-misc/lksctp-tools/files/lksctp-tools-1.0.18-install-sctp.h.patch
@@ -0,0 +1,11 @@
+https://github.com/sctp/lksctp-tools/commit/378560050a8f93786c590cc99a55461666205b61
+
+--- a/src/include/netinet/Makefile.am
++++ b/src/include/netinet/Makefile.am
+@@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet
+ # API.
+ include_HEADERS =
+ 
+-libcnetinet_HEADERS = sctp.h.in
+-BUILT_SOURCES = sctp.h
++libcnetinet_HEADERS = sctp.h
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
new file mode 100644
index 000000000000..8dff226ebe28
--- /dev/null
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic autotools linux-info multilib-minimal
+
+DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
+HOMEPAGE="http://lksctp.sourceforge.net/"
+SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="kernel_linux static-libs"
+
+# This is only supposed to work with Linux to begin with.
+DEPEND=">=sys-kernel/linux-headers-2.6"
+RDEPEND=""
+
+REQUIRED_USE="kernel_linux"
+
+CONFIG_CHECK="~IP_SCTP"
+WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
+
+PATCHES=( "${FILESDIR}"/${P}-install-sctp.h.patch )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local myeconfargs=(
+		--docdir="${EPREFIX%/}"/usr/share/doc/${PF}
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+
+	dodoc doc/*txt
+	newdoc src/withsctp/README README.withsctp
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18.ebuild
deleted file mode 100644
index 3f6e48874618..000000000000
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic autotools linux-info multilib-minimal
-
-DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
-HOMEPAGE="http://lksctp.sourceforge.net/"
-SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="kernel_linux static-libs"
-
-# This is only supposed to work with Linux to begin with.
-DEPEND=">=sys-kernel/linux-headers-2.6"
-RDEPEND=""
-
-REQUIRED_USE="kernel_linux"
-
-CONFIG_CHECK="~IP_SCTP"
-WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local myeconfargs=(
-		--docdir="${EPREFIX%/}"/usr/share/doc/${PF}
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-
-	dodoc doc/*txt
-	newdoc src/withsctp/README README.withsctp
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest
index b4f619f01a3b..2f6ba8c8c065 100644
--- a/net-misc/megatools/Manifest
+++ b/net-misc/megatools/Manifest
@@ -1,5 +1,5 @@
-DIST megatools-1.9.97.tar.gz 105211 BLAKE2B d28e51fb178a7ff3378793261df73a53a64d0a650d7891e3bb6adaffb3ab26922f66fc48bbdc664d9103d791a83f13417e62991e0d8d8bb035f1ab339b96693b SHA512 bdc28b0d5abed23ef2b36c19d9b3572e776c293ff9e1b8cfc5966ae4a1107d554509bf136b4ceeb351cdfb3b0e094406d1ba5432c9a4572691b6ea16f6680552
+DIST megatools-1.10.2.tar.gz 103868 BLAKE2B 102cc4249706e199f23be3d91372d98dc9d74389c79796638e77fb65886c3561eb589717e00d724de0fb81bfb59acec8207ef4782f6037b34a0bad8d76ebf5db SHA512 6b8a5e92f24c9396a5f6572a0c67144216b75f9af9888dc41273d866d692eeb1f61d9337f74bd4c9e175f79f658f0f41de186147a4ede858797f2dacb98d0b97
 DIST megatools-1.9.98.tar.gz 83684 BLAKE2B f5c2a8559c7d4eb79eab2719fc63fd4a8c8d2acbf1d14e9de9d966a32043f291822bc5c67c9a5a63d5f9612ae3b3e3e3054ddf2f6b7695710ac6460021f5dc75 SHA512 0610809e16d135fd7cc3be45517a342f9800b098ed306b4341205bf0359832b4cb2a64220c84d5879cea6c4074229920dffd461824c93e08b492080ce87e012b
-EBUILD megatools-1.9.97.ebuild 974 BLAKE2B bfa854a0fd5807386b87bdbd25a2cc09813b0521551ede62878689def03aec6a0da37eec1ca1ee32bb37871cf0c9e8d672dcfbeac36544dbe43e408ff6d95d9d SHA512 41b24a0ae3b125e92406bed4ba40e75a3481f50cb748143289fcd2cd6f5068f530bad1c60bf962c05a607c8b4b23216a0bada21565038362a04274f1dfc1fce9
+EBUILD megatools-1.10.2.ebuild 795 BLAKE2B f36f8518b874bbea386451307a0b90c5a29c6da745bdeb014596ec5a5994e190225e18165cb17380aaf662cb86b1517845dd567c96dc71e1ce75725821abb20e SHA512 3077a23921e59316543ac3e5aa881213636f22aadb8a762c33cd7048d8db113eed5e3b6d2c06e0578f10073f4b6154583d395c524b357f80e90a7f4c0aa22896
 EBUILD megatools-1.9.98.ebuild 798 BLAKE2B 0f6c5d4fc2b8c5219ddc6c9f139601105430a066b41b2ee034d833bad57bebcb7012ba99e63ae8071ecaf9c58cf7f29ce3a1c5266f08cb1a585661755ceb8fa9 SHA512 21b483593d1c135208303350f36d8542bcdaa88d897c92ab5962d7c9fc23efa61d7207b1b3f97a4d277e48087687147dc6cffecef81d3b34d60eb2fe442bcc70
-MISC metadata.xml 666 BLAKE2B 22d33973b3a8d2433ed21c5682cbad6d037f16c93169ef17621d20d487028da766033b338b62f75a44d5cfd3d3daa358a3b3a5c7d35d2b2eac5105cbfb1e5a0b SHA512 321d7e5b4918744e25067abd15fdd0d1fc1a4f627915ad9f38ed059b0a69cada014c8bb28bddc584c0c405a308818b597ce37bdf8603aa3d7d21a995d3eafe18
+MISC metadata.xml 531 BLAKE2B cc1cb4fb594ec4ad7a48eb547e2d15a3f060b000596f81dcafc23d0ae50ee1a979a18f65747ace522ebaa315ecb863697280f09e9bccf01c4c695ccbf29b76ce SHA512 b6dba0febd0344a6bf61a64809b60cc67ed3ebbc48a363206ac5c86547f6da6cbf573e3e55734f6f966820ba01654109e9e0535a5434e62c461fb87866bb6c8f
diff --git a/net-misc/megatools/megatools-1.10.2.ebuild b/net-misc/megatools/megatools-1.10.2.ebuild
new file mode 100644
index 000000000000..23fe11cf1901
--- /dev/null
+++ b/net-misc/megatools/megatools-1.10.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils
+
+DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
+HOMEPAGE="https://github.com/megous/megatools"
+SRC_URI="https://github.com/megous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2
+	dev-libs/openssl:0=
+	net-misc/curl
+"
+RDEPEND="${COMMON_DEPEND}
+	net-libs/glib-networking[ssl]
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	app-text/asciidoc"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-warnings
+		--disable-glibtest
+	)
+	autotools-utils_src_configure
+}
diff --git a/net-misc/megatools/megatools-1.9.97.ebuild b/net-misc/megatools/megatools-1.9.97.ebuild
deleted file mode 100644
index 42d283b633f9..000000000000
--- a/net-misc/megatools/megatools-1.9.97.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils
-
-DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
-HOMEPAGE="https://github.com/megous/megatools"
-SRC_URI="https://github.com/megous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="fuse introspection static-libs"
-
-COMMON_DEPEND="dev-libs/glib:2
-	dev-libs/openssl:0
-	net-misc/curl
-	fuse? ( sys-fs/fuse )
-"
-RDEPEND="${COMMON_DEPEND}
-	net-libs/glib-networking[ssl]
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	app-text/asciidoc"
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--enable-docs-build
-		--disable-maintainer-mode
-		--disable-warnings
-		--disable-glibtest
-		$(use_enable static-libs static)
-		$(use_enable introspection)
-		$(use_with fuse)
-	)
-	autotools-utils_src_configure
-}
diff --git a/net-misc/megatools/metadata.xml b/net-misc/megatools/metadata.xml
index bab792ed6d53..f108816a6cdf 100644
--- a/net-misc/megatools/metadata.xml
+++ b/net-misc/megatools/metadata.xml
@@ -11,11 +11,6 @@ a command line of your desktop or server.
 
 Mega website can be found at http://mega.co.nz.
 </longdescription>
-	<use>
-		<flag name="fuse">
-		Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">megous/megatools</remote-id>
 	</upstream>
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 390de69a66d5..04d8398604ea 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -7,8 +7,10 @@ AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c0564
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.4.39.tar.gz 403751 BLAKE2B fc6082eb9b6dc5ee41c42ded9bcde03ebfe87d1c8ed9acbc6e61cb8889604c6c2715e49556473a1b9215974150b0ccb03d5dbb7210108c87d8e67f19eaccbd87 SHA512 055d39d9d681adebb9a6a255bce5d550b61df0a1981f0105f8ffcc936e2053bca60360d755b65d79af836ba1ca71d4c739c67e20a2e0e7110ada183a7b0b63d6
 DIST memcached-1.5.10.tar.gz 465169 BLAKE2B cfdd4cba4baf3c628b6cb655bbc91fc493b7183c2b403516cd68f7d7deff3ce2f9ba6bce2c92d9b1f0863d2da593f7f51def50afd7827996c109641efa71eaf1 SHA512 5b6217ab90492cb4b3f6597c935a4028697f1d071516d647a70f6ba9353db16184ef229935733e669d4120d34d72f6f2415edcfd3ec899e06eab9d3f494f11f1
+DIST memcached-1.5.11.tar.gz 457692 BLAKE2B 248e1b1e6aa54db06d18086add51964b8fc6b9966875de35fcdc322631e276becbc9bd694e1c7ea04822ccabd5796422f1f505bc046a08b3b69b76bf9fef1b42 SHA512 1d641383a9d5c6a1f074a1f30493d50fb3384f29d07078dc827fcb1f9e70f6c07f12a3c6c2a128905ffddf2c414998afbbe3456d8cd4fe43e43606bf9933d822
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
 EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9
 EBUILD memcached-1.5.10.ebuild 2933 BLAKE2B 53ed1e26ad2f3d60088b0f0eb4020d8338fcf27bca4a72224ecf61f3c9b31421ee1d6480f1aba03c7dfe07948fc0b7112f3442655ec27762d4dcc543b7d3c630 SHA512 450b27248f092e78827d95e7fab3276112b2da4b907339519e5afaaf3ce3902f2a5ac082db187d68fbd1c26874450596d5d2b42df4d6e96bcbf442b56e08f0b4
+EBUILD memcached-1.5.11.ebuild 2932 BLAKE2B 694ee35427d6009183f94e438b3ca51d2cb4bfda1c1bc0e93fa7e18b823c9291440698ffa364fe40fea6621248bfe87c6d789cb943dab9ca634550613e26fb4a SHA512 db18f156d71c8d7f31228669109ee1448ac6df8722b9f11ac02dcdcb0c33d4b367d1540c4cc5b3d1f036118c482a6e61a8672b3cde0c27c6f091a94d8a864475
 EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.11.ebuild b/net-misc/memcached/memcached-1.5.11.ebuild
new file mode 100644
index 000000000000..ca83bdfe6a22
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.11.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 67a4cb17a0ac..a4d843adf2c7 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,4 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 DIST ModemManager-1.6.12.tar.xz 1402364 BLAKE2B 11335c495cc428936c9b0dd319449a7bf4c58a95ccd53b7a5bb276d78030272a7f29e5f0fa96a96613c5e0cb6a62239d864a23de6260fb55f6ecab09a18e6454 SHA512 2ac72fb2d36530204528cc0cd4815d0b93a1a8c8539ac345101e5e15bbfffd3eda888bbdc54298d3547b9aeacb94c75be5c600e993099671da2f9f27e8ee93cd
+DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
 EBUILD modemmanager-1.6.12.ebuild 3143 BLAKE2B e125a1db92e2d1447f5e6334652a8147b3e0b7f36291b14fe605cfed502c7256c67e44c31fc4ccb6613be20b8383351772f32ca5d42b656485d434152eadb2d5 SHA512 3c294fa5022e2aed4d9ccc8f83bfa2eaffc216a29b48e77307bd2617ebad080657bb9d9239e053b22b3dfc469e6448d9e1aa01bdc435907d3c4402305b4d3ff7
+EBUILD modemmanager-1.8.2.ebuild 3359 BLAKE2B 6402f8d6fb0c7a136313775b78e1fe53dbe39a3424cf2c411bedceec20215b4f9529e0547dd6126908d8c9c6fa336a841563e7c5c8f6ceafd53ce83f16a1b76d SHA512 4ca894fa31f2ef55bb1aa21a92a06a8f1659e4305959587ea4aec223a30b8670ff9b522693a7aa28c3f768ac39a2b227477c2f53d40c35eae0d264af49ac2c82
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.8.2.ebuild b/net-misc/modemmanager/modemmanager-1.8.2.ebuild
new file mode 100644
index 000000000000..fe9c099b3601
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.8.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 user readme.gentoo-r1 systemd udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+introspection mbim policykit +qmi systemd +udev vala"
+REQUIRED_USE="
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
+	udev? ( >=virtual/libgudev-230:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.16.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.20.0:= )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="
+		If your USB modem shows up only as a storage device when you plug it in,
+		then you should install sys-apps/usb_modeswitch, which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=${PVR} \
+		--with-udev-base-dir="$(get_udevdir)" \
+		$(use_with udev) \
+		$(use_enable introspection) \
+		$(use_with mbim) \
+		$(use_with policykit polkit) \
+		$(use_with systemd systemd-suspend-resume) \
+		$(use_with systemd systemd-journal) \
+		$(use_with qmi) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	use policykit && enewgroup plugdev
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if ! use udev; then
+		ewarn "You have built ModemManager without udev support. You may have to teach it"
+		ewarn "about your modem port manually."
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 96649ee1af3a..fd333f0a8ff6 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,5 +1,7 @@
 DIST NetworkManager-openvpn-1.8.4.tar.xz 547984 BLAKE2B bb637c824414b792c6272a1791a3e99ebb3c0fc7145b01b4fa6c9b0bc2d8a0879141b7e2d1f3157b8b05366e3d0410370d3523dbe0d2daf069e4f73cdd9cf84c SHA512 dd0381175fa6a88259726a848ac46b7a5ee07a797cbe34382d3f4c0b6d8ad3807d224bfbb53cff793f4854558484d77fc7c6a6970e5364d39d058da5c35eac5a
 DIST NetworkManager-openvpn-1.8.6.tar.xz 561652 BLAKE2B 37c47c997f68879221cb346b4afe9653d78ef21398f568469c8f511c18feec12dfcf86677d09088119a16ef30c47ab6b5b5a30f2a3c24811a12e6d58c6809f5f SHA512 a2d711be58810aad337b9c8bdead1ba6f64c1d1315a772ab79815624794c79668ab5056587be7096ac7367554c16114c2a3805a03484c2ea265ba4cd3bd54d32
+DIST NetworkManager-openvpn-1.8.8.tar.xz 562748 BLAKE2B 8c75d30a8865d41cd564e719f08522482b0d6901a8e812dec5f5b9fd8c8c2839663d078148e9d505ee7b7fc6e5c96fda8c3c0a0390837211a1fe9689f01fd27d SHA512 8ed7612bcf727b540a74807ccc7ea7460dba3923a052e8716338bf2c852b6c027fd7547793af1b032a3c2348f9ffc579d1071aad2833baa37784bb5a17af1574
 EBUILD networkmanager-openvpn-1.8.4.ebuild 1239 BLAKE2B 5fabaf60af8232a3505af4453bf9f5dc38a764497ce79925df896803c4bd5ae4d0921232eee01af83c383d3f7aa590c20912fa01e25bbe38b794e957eb1b9779 SHA512 204909799d3d9df3b9e14de9797ecc20e95c9cf9d3290c0479450a6a87ec90793a94c05925ba75019a7ed02819033d67463f5d86c1adcdcaad904e5f06a9fb3d
 EBUILD networkmanager-openvpn-1.8.6.ebuild 1258 BLAKE2B 1ec67e433001a0b0d09caff892b0f3e5e1c62555ee84e900e18a2ceee9c796982aa29bc1ba24480f030c51f7c146c448841ec4d39ee6888408b46165fd8be7e9 SHA512 b8187a0a29bcda8855a3fcf2dbf9dcd28fabfcdfc1a0133321a0dbc6468dc7b7a53525e1e5498ca6c207d19ad4af02abfa86a9ca8dc76ab2117518e420a2ee04
+EBUILD networkmanager-openvpn-1.8.8.ebuild 1258 BLAKE2B 1ec67e433001a0b0d09caff892b0f3e5e1c62555ee84e900e18a2ceee9c796982aa29bc1ba24480f030c51f7c146c448841ec4d39ee6888408b46165fd8be7e9 SHA512 b8187a0a29bcda8855a3fcf2dbf9dcd28fabfcdfc1a0133321a0dbc6468dc7b7a53525e1e5498ca6c207d19ad4af02abfa86a9ca8dc76ab2117518e420a2ee04
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
new file mode 100644
index 000000000000..8fb5003d6544
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 70cfeda7f496..80d443dbba9e 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,14 +3,13 @@ AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
 DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f0801e30720334cb905c86abfaeb9bc3c60a2c1e9372b738b1eb43c55a34edf952905d94e3513cef653ea62e470d56bc575b65 SHA512 e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645
-DIST NetworkManager-1.12.2.tar.xz 4193776 BLAKE2B bc2b55f33e85dc8381eb18148cef02059e96abe1863da35af2b8f5671e3b2a4296eb1f9b79d864f3d0e6b362f7dbebdea4518a96d255acda9141b9ae95b49038 SHA512 cf5dae6ca8b6d3819a79485082f959907213d43413d15c41b79eb7da40edb913a41e7c18586b14bbf84f30ac493e2d9d466f5e66130c636f041ce939aaf49f35
 DIST NetworkManager-1.12.4.tar.xz 4195812 BLAKE2B 11c59da430cdf6f70cc841d980e0bc0280244a1a1ee52311946f27c1f61ae23b14e115caba02c80738ef35d67eab6f1fadc1a0dee3250510d05fd1e90aed5ac1 SHA512 6fc891a6f8c3b4cc43449dabf0c025a9e706b723f602085f34cc93bda885c300de293004390c4926b95e26201b86d97ecd23160f82ef03e4d2b680f822c827c3
 DIST NetworkManager-1.14.0.tar.xz 4389692 BLAKE2B 1d1b12764503d5f56d27f11449f3a0149491887312ed735c5cd25c0eeb6928fead30544d32cdd65262e00c4bdaed55dfb6dbc731c82de41ff8c49ff85937211e SHA512 cb0add2585c586ad36b4fb986a654de30047dc77f038927437156227f42622ac1045c58b76573f4e1acef22aa9f695da417f392a50fde70f4a086504701cecf1
+DIST NetworkManager-1.14.2.tar.xz 4415068 BLAKE2B e33d385f907feb6ca7cae51aaa4a0c64e9f33d7f3c9ba11ca19ba71d0d9f1f9b05ab99eb10debb65d4d0bf9d76be7d1610d23dfe84a2718be353725d8d0a7c70 SHA512 f2c45138daf8124704d4f8ee3966da8a2b6c9a18bc51332d19c36d6d5bbd795c6f85f182c7816604fa5e8be7e6ee1daa62b26a868b731e7bc4d4b72e543d3646
 DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
-DIST networkmanager-1.12.2-patchset.tar.xz 4944 BLAKE2B 3ab6e395b4e13fd019fbcf851286f1cc8a08eff9d93891174c19949efe10390c69d9aaf6cdbe81f33503ec96838eb001eda67f6d1da034195327e172527cd72b SHA512 bdb22c42a8c53dce2f81ecfd026685240c8b790c44b0f13767ccfa0834cb2edec61ade69c828fb21c54ad3d37412e89b15f1fff4a98577a5bea460ba78d43bc3
 EBUILD networkmanager-1.10.10.ebuild 10768 BLAKE2B b414e73cb89b97cf5a9d51b8a1823650c68050c936c0654d0add6e22ed8436f6335d3cf7a252aa2d143327ac6c6a0254f6f3cb3b376f38cc1d6c42341b163062 SHA512 43dca7293b9cc49d45fdeaa56ecbc37eb21213c8c25fe251c577c653cf1fd43fb72b798a60a70bf18a21837eb03441fb7cf38afef9a69e16f13bc516aa2cf1a0
-EBUILD networkmanager-1.12.2.ebuild 11210 BLAKE2B 5ce9200cb1c0f400ff27a5f0f0266035e2878f8f80b800feb8383b41a16dbdccaec312299483ba679ca5b56f955b54553195a1b960504664d585c3af932b5662 SHA512 53d07fe10d655729f24e1697f025740fb2000d532fec057912e9947eed43c5bdb3f917d589dc346c6d66ee10ece6ff04a95d0cd7ab4698c737ce004de0112258
 EBUILD networkmanager-1.12.4.ebuild 10955 BLAKE2B c7f6e7e1308dac603b48984d7910ca14b19d562e49cf52ec610eebf44d1ade0467b45150e97380a6fee9d5f2286ddecf8ebdfdb863f8c7af908994b065412c22 SHA512 7777538aebc1e0db66782e416c02c0d98da2aa849cb2828bbec0f00ce45323c8c8e9b3cf54ac0cc4443d261835908695ae27363dfacbf727396885c7c9efcc37
 EBUILD networkmanager-1.14.0.ebuild 10955 BLAKE2B c7f6e7e1308dac603b48984d7910ca14b19d562e49cf52ec610eebf44d1ade0467b45150e97380a6fee9d5f2286ddecf8ebdfdb863f8c7af908994b065412c22 SHA512 7777538aebc1e0db66782e416c02c0d98da2aa849cb2828bbec0f00ce45323c8c8e9b3cf54ac0cc4443d261835908695ae27363dfacbf727396885c7c9efcc37
+EBUILD networkmanager-1.14.2.ebuild 10956 BLAKE2B c83081c6d85a512d3c2cc4d7fe7dbc1fa309e062901c226c093ffa7a845057716a1521965b42bad595576670f8df980575205dd2de64a400e117260867291646 SHA512 c24174a3a5b67691eb07bd543b38d591cad6a5816cf457beb9618e5b043b2c9977582613f40417fe39f34bbd1dc5c23c239a5eedec40369a81d2eb3b3f974593
 EBUILD networkmanager-1.8.4.ebuild 10683 BLAKE2B 2c60630cbefd554f11e77b18a3bde0e0cc0dc361410ebcf36cb8e4223d715516268e862377fe2d2319ba67e9121153e6b6ec140254fdc159757a1d4a2e95b2d9 SHA512 93d62548e37ae437d7cd04801fdf723ba9e61034f605ab2e966a8958ac75d02ee210e6e7241ebcd7b47e6e9cca5212f0596421bacac7b07a6699996b0546bed5
 MISC metadata.xml 1808 BLAKE2B 836dc65487a0e7ab3e527726f7d34698b48ac1529f9d87113b4cfb8c3330449ae3c3c61b11c9b37bd62884e9ab9f2cd8a3aa6abf7272b0836cc24b395990f32a SHA512 9088a30ef5c513348e76303a00e6e0cc4c8fc82d03d52d4c55a9bd27d1bfdf9fc1a08037b162cd6bd28ca68afc50cf2c8f7aafa69c1fc441eff0355e8e189661
diff --git a/net-misc/networkmanager/networkmanager-1.12.2.ebuild b/net-misc/networkmanager/networkmanager-1.12.2.ebuild
deleted file mode 100644
index cdfd87acdf7e..000000000000
--- a/net-misc/networkmanager/networkmanager-1.12.2.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-	iwd? ( wifi )
-	modemmanager? ( ppp )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-PATCHES=( "${WORKDIR}"/patches/ ) # Selective patches from nm-1-12 branch, most importantly fix for NM_AVAILABLE_IN_1_12_2 macro, otherwise nm-applet and co fail to compile
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		linux-info_pkg_setup
-	fi
-	enewgroup plugdev
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--disable-lto
-		--disable-config-plugin-ibft
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-		# still not ready for removing that lib, bug #665338
-		--with-libnm-glib
-		--with-nmcli=yes
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	if multilib_is_native_abi && use policykit; then
-		myconf+=( --enable-polkit=yes )
-	else
-		myconf+=( --enable-polkit=disabled )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-			libnm-util/libnm-util.la
-			libnm-glib/libnm-glib.la
-			libnm-glib/libnm-glib-vpn.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libdeprecatedHEADERS
-			install-libnm_glib_libnmvpnHEADERS
-			install-libnm_glib_libnmincludeHEADERS
-			install-libnm_util_libnm_util_includeHEADERS
-			install-libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmvpnHEADERS
-			install-nodist_libnm_util_libnm_util_includeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.14.2.ebuild b/net-misc/networkmanager/networkmanager-1.14.2.ebuild
new file mode 100644
index 000000000000..4c5162b6508b
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.14.2.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	iwd? ( wifi )
+	modemmanager? ( ppp )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		linux-info_pkg_setup
+	fi
+	enewgroup plugdev
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--disable-lto
+		--disable-config-plugin-ibft
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib, bug #665338
+		--with-libnm-glib
+		--with-nmcli=yes
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+			libnm-util/libnm-util.la
+			libnm-glib/libnm-glib.la
+			libnm-glib/libnm-glib-vpn.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libdeprecatedHEADERS
+			install-libnm_glib_libnmvpnHEADERS
+			install-libnm_glib_libnmincludeHEADERS
+			install-libnm_util_libnm_util_includeHEADERS
+			install-libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmvpnHEADERS
+			install-nodist_libnm_util_libnm_util_includeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index 892259a58da2..17f41cbfb3ac 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,4 +1,3 @@
 DIST nyx-2.0.4.tar.gz 4074259 BLAKE2B 92296a319947803195a6ae3991f1991c9ee5dc8293144b31d143995a0b897e89812d4b012c330cb2d9e7ee2d2dbbc0ab0bbeb49135ec7e302aefde2dbe8159de SHA512 bb64b6c38bbfc9837215503a69b4a6b7a11b8a1e230f42c51a405472689a3d46d74dd06b2417c90512b63e9605b33198c5132b660f9eca037016a39c5e4f0ecf
 EBUILD nyx-2.0.4.ebuild 638 BLAKE2B b1e8e29f6c828e0542f46ea48ed2bb43ccfb422555813af9f9d6074489e19f3f939d81a37bb3d4c79f297c7299414294d35d4cc1fd84d9ff6c5211d1ffb4137c SHA512 06f90b0cb50d4ff5c8be27002c21eea2919230c911b1aee10f69f2fe78a4db866967044a9e94f9289ffbae486a0698f8addd5d42bb2bea3382a159b0aafa9611
-EBUILD nyx-9999.ebuild 638 BLAKE2B b1e8e29f6c828e0542f46ea48ed2bb43ccfb422555813af9f9d6074489e19f3f939d81a37bb3d4c79f297c7299414294d35d4cc1fd84d9ff6c5211d1ffb4137c SHA512 06f90b0cb50d4ff5c8be27002c21eea2919230c911b1aee10f69f2fe78a4db866967044a9e94f9289ffbae486a0698f8addd5d42bb2bea3382a159b0aafa9611
 MISC metadata.xml 328 BLAKE2B 388fd17862250e1c6df6dbcd5c29030fa6dd4ed70b8ba4e844fd9d1411f1f777bc5b448a7b52c177d5cb163e0e68976bbae55375da3c41c8e1a1719fd0fd96a0 SHA512 65455e32f59242a36f241e854624f0c38bcbe69cc70eafe39e8df6fbd6e000faf58d04a0310d018377d3440ad55a282f1bc8dbf83fa411221f13068675944737
diff --git a/net-misc/nyx/nyx-9999.ebuild b/net-misc/nyx/nyx-9999.ebuild
deleted file mode 100644
index a27cb04c7b15..000000000000
--- a/net-misc/nyx/nyx-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 vcs-snapshot distutils-r1
-
-DESCRIPTION="Utility to monitor real time Tor status information"
-HOMEPAGE="https://nyx.torproject.org"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.torproject.org/nyx.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	net-libs/stem
-	net-vpn/tor"
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 6073861f80bf..20d91446e45f 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -17,6 +17,11 @@ AUX openssh-7.8_p1-X509-no-version.patch 878 BLAKE2B 2ed1a11e4b9066720057e5ae0a8
 AUX openssh-7.8_p1-hpn-X509-glue.patch 2786 BLAKE2B ef0651dc65ea1ab22c17e6ba0efe34141bc3af4dafcdbfba5c7fd80107a31fbc7c2671670c57153918bd626f4172e7e16ba22b4f36d67ced1b6e9d7b03c9dbaa SHA512 a205809bded3ac0aba1aec0f27ddc3948414fc3354cf8ec2945fc91effb9a0617ef259475347164c2f7b95de280704be1646725dae183c070efd104c4c515510
 AUX openssh-7.8_p1-hpn-glue.patch 3644 BLAKE2B eed002fc87362fa8bf3a86681fdaf8153137b7a9de7ba4f6fe47dbb39031f61773e9546f226f8035ce4391dce62a1487ba1450cd92e02e4d74fc0875ef2ca603 SHA512 f6410be5632e4f04f6ba4517afe279640ddc7050750f036fb3e57ab4318e59b86dc44a983deacd6b6f88c4cd0f78dae523f9dded424dce3600a3b1d7a0964435
 AUX openssh-7.8_p1-hpn-sctp-glue.patch 597 BLAKE2B d7ac82653c48467ebdc59e1444eead84d3de8cdd93acda6361cedd0cc1e2969e52610c10075463ade71e4c1bb1fcb243bd34d11d6c21cd4c500b6743dc628770 SHA512 4742112e3d0e7463d9194a5ab068d3b6cae6bc4a9b5755599d49a13db514014c7d406c16c7ff59197917b5c152b2a54d15323d88de942215fced4c628cacf2c0
+AUX openssh-7.9_p1-X509-glue.patch 1204 BLAKE2B 643163cce91bb4767ac6850dfd62e0100def09501b25191586bb0d62ea391745ff9d922b2b67c60b6a413d6e75dd22e70fd3f4ff35365d9a0ddaf735ecbf49ec SHA512 63b7bdda10acc6bdadf207becbad91ee739f2f346c1bc637117256cc6ce97115fcc28f332fefa6cb17a93daa98bd28f85a71a67329c08965ef79cec86f5613a9
+AUX openssh-7.9_p1-hpn-X509-glue.patch 2786 BLAKE2B ef0651dc65ea1ab22c17e6ba0efe34141bc3af4dafcdbfba5c7fd80107a31fbc7c2671670c57153918bd626f4172e7e16ba22b4f36d67ced1b6e9d7b03c9dbaa SHA512 a205809bded3ac0aba1aec0f27ddc3948414fc3354cf8ec2945fc91effb9a0617ef259475347164c2f7b95de280704be1646725dae183c070efd104c4c515510
+AUX openssh-7.9_p1-hpn-glue.patch 3644 BLAKE2B eed002fc87362fa8bf3a86681fdaf8153137b7a9de7ba4f6fe47dbb39031f61773e9546f226f8035ce4391dce62a1487ba1450cd92e02e4d74fc0875ef2ca603 SHA512 f6410be5632e4f04f6ba4517afe279640ddc7050750f036fb3e57ab4318e59b86dc44a983deacd6b6f88c4cd0f78dae523f9dded424dce3600a3b1d7a0964435
+AUX openssh-7.9_p1-hpn-sctp-glue.patch 597 BLAKE2B d7ac82653c48467ebdc59e1444eead84d3de8cdd93acda6361cedd0cc1e2969e52610c10075463ade71e4c1bb1fcb243bd34d11d6c21cd4c500b6743dc628770 SHA512 4742112e3d0e7463d9194a5ab068d3b6cae6bc4a9b5755599d49a13db514014c7d406c16c7ff59197917b5c152b2a54d15323d88de942215fced4c628cacf2c0
+AUX openssh-7.9_p1-openssl-1.0.2-compat.patch 479 BLAKE2B 0550e0b7cb4bb4806b83dc6cc53836d8ad29311588099263e940223e131cd489965664b549a466a6a0ea572e4ab3a706c8b21af7a2b8d241443ff736f775d7b8 SHA512 d4f40fb05ddad61022124d1f9b8f9b01bb827403061abacd1f4ad13f4908400f42e8bda9e423d03755cef8bdff6fa5b0bc6b0fc0cd6e22363b358868e4d424ff
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
 AUX sshd.initd 2735 BLAKE2B c3fd3b653676b0e628d58939a55e0ff5cfdd177af18a9ef2d53dcb1717ce478ecb654da398752ee4fef0f6225416fd4fa5cfa6e83d7e977086744616d291dcd3 SHA512 9c3e908c79674bb070e99491dc587c1e6404b1e2eec711dc27cd54510ff68217c83e7ac6fcf7b89f62ba5393ff3e417774fd6d105422464203544e8fbc91c6bb
@@ -38,10 +43,14 @@ DIST openssh-7.7p1.tar.gz 1536900 BLAKE2B 7aee360f2cea5bfa3f8426fcbd66fde2568f05
 DIST openssh-7.8p1+x509-11.4.diff.gz 536597 BLAKE2B 18593135d0d4010f40a6e0c99a6a2e9fb4ca98d00b4940be5cb547fcb647adc9663245274d4e792bcc7c2ec49accaceb7c3c489707bbb7aaeed260dd2e0eb1c3 SHA512 b95d46201626797f197c5aa8488b0543d2c7c5719b99fadd94ef2c888a96c6a7b649527b78b6d6014d953ae57e05ecf116192cf498687db8cb7669c3998deecc
 DIST openssh-7.8p1-sctp-1.1.patch.xz 7548 BLAKE2B d74010028f097812f554f9e788aa5e46d75c12edbef18aaeaa9866665025bdad04a1a028cc862d11d718208c1b63862780840332536a535bb2eaff7661c966ef SHA512 c084f6b2cfa9cb70f46ecc9edfce6e2843cd4cd5e36ac870f5ceaaedd056ba9aa2ce8769418239ad0fe5e7350573397a222b6525a029f4492feb7b144ee22aa3
 DIST openssh-7.8p1.tar.gz 1548026 BLAKE2B 938428408596d24d497f245e3662a0cff3d462645683bf75cd29a0ea56fa6c280e7fa866bedf0928dd5bc4085b82d5a4ce74b7eea0b45b86f879b69f74db1642 SHA512 8e5b0c8682a9243e4e8b7c374ec989dccd1a752eb6f84e593b67141e8b23dcc8b9a7322b1f7525d18e2ce8830a767d0d9793f997486339db201a57986b910705
+DIST openssh-7.9p1+x509-11.5.diff.gz 594995 BLAKE2B 2c44df224e4114da0473cbbdfdcc4bd84b0b0235f80b43517d70fe1071f219d2631f784015ab1470eebcf8f3b6b5f8744862acebb22f217c6e76f79e6a49c099 SHA512 4d2fd950dee9721add822fdb54ff8c20fd18da85081ce8a2bd2a1050d3ff7900a7213782c479691de9dcfe4e2f91061e124d34b365edb3831e8bfe4aef3744f9
+DIST openssh-7.9p1-sctp-1.1.patch.xz 7552 BLAKE2B 0eeda7c8a50c0c98433b5ee0734b9f79043067be376a9ca724d574d4a595c3f7aed0626342300467b73ad9003392e22fda8abe778158ba5be5a50a57eeef79f8 SHA512 6cad32c40dd3901c4eadb0c463a35ec2d901e61220c333d3df7759f672259f66fc83e2b1ace8b0ef84cbc1a65397f00f9c670ffa23726d8309fa5060512d2c21
+DIST openssh-7.9p1.tar.gz 1565384 BLAKE2B de15795e03d33d4f9fe4792f6b14500123230b6c00c1e5bd7207bb6d6bf6df0b2e057c1b1de0fee709f58dd159203fdd69fe1473118a6baedebaa0c1c4c55b59 SHA512 0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e
 DIST openssh-7_8_P1-hpn-AES-CTR-14.16.diff 29231 BLAKE2B e25877c5e22f674e6db5a0bc107e5daa2509fe762fb14ce7bb2ce9a115e8177a93340c1d19247b6c2c854b7e1f9ae9af9fd932e5fa9c0a6b2ba438cd11a42991 SHA512 1867fb94c29a51294a71a3ec6a299757565a7cda5696118b0b346ed9c78f2c81bb1b888cff5e3418776b2fa277a8f070c5eb9327bb005453e2ffd72d35cdafa7
 DIST openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 43356 BLAKE2B 776fa140d64a16c339b46a7c773258d2f4fe44e48b16abccad1a8757a51cb6362722fc5f42c39159af12849f5c88cf574de64815085c97157e16653f18d4909b SHA512 53f2752b7aa02719c8dfe0fe0ef16e874101ba2ba87924aa1122cd445ece218ca09c22abaa3377307f25d459579bc28d3854e2402c71b794db65d58cdd1ebc08
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 EBUILD openssh-7.5_p1-r4.ebuild 11161 BLAKE2B e6276f34a75fbce06ebefa246786db15aff3bd9a59c77c41d96576b6aeb77c5e6fa17aceb573d4d1f0518aa703d298eb292d0d157fb843a702cbede1f42c0296 SHA512 446414c8961458b812b768d18afe46d60ef4dd54111d95b99654cfb3dfef592812b30527fdda352a595bba815e0ffea4a813e3291bcc96bacb368267ff837bdd
 EBUILD openssh-7.7_p1-r9.ebuild 15943 BLAKE2B 459a0f5920b3d5b4da2835e7f3c9f1edd185e48c509e5150a1306dbca3c2f17d0d9d3f41166c4263dd60c0218c11b278a4eaa6f53ae1429710fc749994f70d11 SHA512 3aa9018173cc53de22b1e4693daf4ca2716cd0bc0066f797b6b66926481aaabb3e82942beb305a95523ba64dc9ff95f54232c7538c1d30834f38d88dd94f18a2
 EBUILD openssh-7.8_p1.ebuild 15333 BLAKE2B 4452bc6cc03ed9fb8242b15894133e6e224e1ac0818688b02bc17850050bc67c0dd8fefcbba66c96bfedc8fb452bbcde7282062ea372d220a2b1d77fb0b48b20 SHA512 bff6000cd8913a885bcad3ffb60bde7760a24d37a4987afd34f4b38d603c8bc72bfe0d07f8f109c238d11e49bed72ddbcbe26838cd9d69b379dbf7521f12626f
+EBUILD openssh-7.9_p1.ebuild 15516 BLAKE2B eec5ec15916ad1ac9d2360fe33ebf1fe25784dd6a84f23970dc7e3c1a467d8bdf576360ca1112f2c8f860afcd9774a103cc1dbeae2bd6ce8815baad5b1fa6f9e SHA512 e61ba1ca3e50a84c67379d8c0774ac91942a283370e58d91ebe9576b2d2aedc90a15a6d53ab5f88565ca4eadb3eb5d13d9a6d15f2000045dd18fcb199ac72764
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch
new file mode 100644
index 000000000000..e1d63ecc8aef
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch
@@ -0,0 +1,28 @@
+--- a/openssh-7.9p1+x509-11.5.diff	2018-10-19 11:41:13.791285390 -0700
++++ b/openssh-7.9p1+x509-11.5.diff	2018-10-19 11:45:42.584694215 -0700
+@@ -44045,7 +44045,7 @@
+  	ENGINE_register_all_complete();
+ +#endif
+  
+--#if OPENSSL_VERSION_NUMBER < 0x10001000L
++-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ +	/* OPENSSL_config will load buildin engines and engines
+ +	 * specified in configuration file, i.e. method call
+ +	 * ENGINE_load_builtin_engines. Latter is only for
+@@ -77691,16 +77691,6 @@
+  		    setlocale(LC_CTYPE, "POSIX.UTF-8") != NULL))
+  			return;
+  		setlocale(LC_CTYPE, "C");
+-diff -ruN openssh-7.9p1/version.h openssh-7.9p1+x509-11.5/version.h
+---- openssh-7.9p1/version.h	2018-10-17 03:01:20.000000000 +0300
+-+++ openssh-7.9p1+x509-11.5/version.h	2018-10-19 19:07:00.000000000 +0300
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_7.9"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-7.9p1/version.m4 openssh-7.9p1+x509-11.5/version.m4
+ --- openssh-7.9p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-7.9p1+x509-11.5/version.m4	2018-10-19 18:13:58.000000000 +0300
diff --git a/net-misc/openssh/files/openssh-7.9_p1-hpn-X509-glue.patch b/net-misc/openssh/files/openssh-7.9_p1-hpn-X509-glue.patch
new file mode 100644
index 000000000000..c76d454c92f8
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.9_p1-hpn-X509-glue.patch
@@ -0,0 +1,79 @@
+--- temp/openssh-7_8_P1-hpn-AES-CTR-14.16.diff.orig	2018-09-12 15:58:57.377986085 -0700
++++ temp/openssh-7_8_P1-hpn-AES-CTR-14.16.diff	2018-09-12 16:07:15.376711327 -0700
+@@ -4,8 +4,8 @@
+ +++ b/Makefile.in
+ @@ -42,7 +42,7 @@ CC=@CC@
+  LD=@LD@
+- CFLAGS=@CFLAGS@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
++ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA)
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -788,8 +788,8 @@
+  ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
+  {
+  	struct session_state *state;
+--	const struct sshcipher *none = cipher_by_name("none");
+-+	struct sshcipher *none = cipher_by_name("none");
++-	const struct sshcipher *none = cipher_none();
+++	struct sshcipher *none = cipher_none();
+  	int r;
+
+  	if (none == NULL) {
+@@ -933,9 +933,9 @@
+  	/* Portable-specific options */
+  	sUsePAM,
+ +	sDisableMTAES,
+- 	/* Standard Options */
+- 	sPort, sHostKeyFile, sLoginGraceTime,
+- 	sPermitRootLogin, sLogFacility, sLogLevel,
++ 	/* X.509 Standard Options */
++ 	sHostbasedAlgorithms,
++ 	sPubkeyAlgorithms,
+ @@ -626,6 +630,7 @@ static struct {
+  	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
+  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
+--- temp/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff.orig	2018-09-12 16:38:16.947447218 -0700
++++ temp/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2018-09-12 16:32:35.479700864 -0700
+@@ -382,7 +382,7 @@
+ @@ -822,6 +822,10 @@ kex_choose_conf(struct ssh *ssh)
+  	int nenc, nmac, ncomp;
+  	u_int mode, ctos, need, dh_need, authlen;
+- 	int r, first_kex_follows;
++ 	int r, first_kex_follows = 0;
+ +	int auth_flag;
+ +
+ +	auth_flag = packet_authentication_state(ssh);
+@@ -1125,15 +1125,6 @@
+ index a738c3a..b32dbe0 100644
+ --- a/sshd.c
+ +++ b/sshd.c
+-@@ -373,7 +373,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
+- 	char remote_version[256];	/* Must be at least as big as buf. */
+- 
+- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
+--	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
+-+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
+- 	    *options.version_addendum == '\0' ? "" : " ",
+- 	    options.version_addendum);
+- 
+ @@ -1037,6 +1037,8 @@ listen_on_addrs(struct listenaddr *la)
+  	int ret, listen_sock;
+  	struct addrinfo *ai;
+@@ -1213,14 +1204,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index f1bbf00..21a70c2 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,5 @@
+- #define SSH_VERSION	"OpenSSH_7.8"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+-+ 
diff --git a/net-misc/openssh/files/openssh-7.9_p1-hpn-glue.patch b/net-misc/openssh/files/openssh-7.9_p1-hpn-glue.patch
new file mode 100644
index 000000000000..0561e3814067
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.9_p1-hpn-glue.patch
@@ -0,0 +1,112 @@
+--- temp/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff.orig	2018-09-11 17:19:19.968420409 -0700
++++ temp/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2018-09-11 17:39:19.977535398 -0700
+@@ -409,18 +409,10 @@
+ index dcf35e6..da4ced0 100644
+ --- a/packet.c
+ +++ b/packet.c
+-@@ -920,6 +920,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
++@@ -920,6 +920,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
+  	return 0;
+  }
+  
+-+/* this supports the forced rekeying required for the NONE cipher */
+-+int rekey_requested = 0;
+-+void
+-+packet_request_rekeying(void)
+-+{
+-+	rekey_requested = 1;
+-+}
+-+
+ +/* used to determine if pre or post auth when rekeying for aes-ctr
+ + * and none cipher switch */
+ +int
+@@ -434,20 +426,6 @@
+  #define MAX_PACKETS	(1U<<31)
+  static int
+  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+-@@ -946,6 +964,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
+- 		return 0;
+- 
+-+	/* used to force rekeying when called for by the none
+-+         * cipher switch methods -cjr */
+-+        if (rekey_requested == 1) {
+-+                rekey_requested = 0;
+-+                return 1;
+-+        }
+-+
+- 	/* Time-based rekeying */
+- 	if (state->rekey_interval != 0 &&
+- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
+ diff --git a/packet.h b/packet.h
+ index 170203c..f4d9df2 100644
+ --- a/packet.h
+@@ -476,9 +454,9 @@
+  /* Format of the configuration file:
+  
+ @@ -166,6 +167,8 @@ typedef enum {
+- 	oHashKnownHosts,
+  	oTunnel, oTunnelDevice,
+  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
++ 	oDisableMTAES,
+ +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
+ +	oNoneEnabled, oNoneSwitch,
+  	oVisualHostKey,
+@@ -615,9 +593,9 @@
+  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
+  	SyslogFacility log_facility;	/* Facility for system logging. */
+ @@ -111,7 +115,10 @@ typedef struct {
+- 
+  	int	enable_ssh_keysign;
+  	int64_t rekey_limit;
++ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+ +	int     none_switch;    /* Use none cipher */
+ +	int     none_enabled;   /* Allow none to be used */
+  	int	rekey_interval;
+@@ -673,9 +651,9 @@
+  	/* Portable-specific options */
+  	if (options->use_pam == -1)
+ @@ -391,6 +400,43 @@ fill_default_server_options(ServerOptions *options)
+- 	}
+- 	if (options->permit_tun == -1)
+  		options->permit_tun = SSH_TUNMODE_NO;
++ 	if (options->disable_multithreaded == -1)
++ 		options->disable_multithreaded = 0;
+ +	if (options->none_enabled == -1)
+ +		options->none_enabled = 0;
+ +	if (options->hpn_disabled == -1)
+@@ -1092,7 +1070,7 @@
+  	xxx_host = host;
+  	xxx_hostaddr = hostaddr;
+  
+-@@ -412,6 +423,28 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
++@@ -412,6 +423,27 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
+  
+  	if (!authctxt.success)
+  		fatal("Authentication failed.");
+@@ -1117,10 +1095,9 @@
+ +			fprintf(stderr, "NONE cipher switch disabled when a TTY is allocated\n");
+ +		}
+ +	}
+-+
+- 	debug("Authentication succeeded (%s).", authctxt.method->name);
+- }
+  
++ #ifdef WITH_OPENSSL
++ 	if (options.disable_multithreaded == 0) {
+ diff --git a/sshd.c b/sshd.c
+ index a738c3a..b32dbe0 100644
+ --- a/sshd.c
+@@ -1217,11 +1194,10 @@
+ index f1bbf00..21a70c2 100644
+ --- a/version.h
+ +++ b/version.h
+-@@ -3,4 +3,6 @@
++@@ -3,4 +3,5 @@
+  #define SSH_VERSION	"OpenSSH_7.8"
+  
+  #define SSH_PORTABLE	"p1"
+ -#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn14v16"
+ +#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+ + 
diff --git a/net-misc/openssh/files/openssh-7.9_p1-hpn-sctp-glue.patch b/net-misc/openssh/files/openssh-7.9_p1-hpn-sctp-glue.patch
new file mode 100644
index 000000000000..a7d51ad94839
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.9_p1-hpn-sctp-glue.patch
@@ -0,0 +1,17 @@
+--- dd/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff.orig	2018-09-12 18:18:51.851536374 -0700
++++ dd/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2018-09-12 18:19:01.116475099 -0700
+@@ -1190,14 +1190,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index f1bbf00..21a70c2 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,5 @@
+- #define SSH_VERSION	"OpenSSH_7.8"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+-+ 
diff --git a/net-misc/openssh/files/openssh-7.9_p1-openssl-1.0.2-compat.patch b/net-misc/openssh/files/openssh-7.9_p1-openssl-1.0.2-compat.patch
new file mode 100644
index 000000000000..9fc6d0a9dcec
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.9_p1-openssl-1.0.2-compat.patch
@@ -0,0 +1,13 @@
+diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
+index 8b4a3627..590b66d1 100644
+--- a/openbsd-compat/openssl-compat.c
++++ b/openbsd-compat/openssl-compat.c
+@@ -76,7 +76,7 @@ ssh_OpenSSL_add_all_algorithms(void)
+ 	ENGINE_load_builtin_engines();
+ 	ENGINE_register_all_complete();
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10001000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	OPENSSL_config(NULL);
+ #else
+ 	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
diff --git a/net-misc/openssh/openssh-7.9_p1.ebuild b/net-misc/openssh/openssh-7.9_p1.ebuild
new file mode 100644
index 000000000000..e92fbbc06ee8
--- /dev/null
+++ b/net-misc/openssh/openssh-7.9_p1.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user flag-o-matic multilib autotools pam systemd
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+#HPN_PV="${PV^^}"
+HPN_PV="7.8_P1"
+
+HPN_VER="14.16"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+)
+HPN_DISABLE_MTAES=1 # unit tests hang on MT-AES-CTR
+SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="11.5" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_}/%s\n" "${HPN_PATCHES[@]}") )}
+	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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 +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(+)] )
+	ssl? (
+		!libressl? (
+			|| (
+				(
+					>=dev-libs/openssl-1.0.1:0[bindist=]
+					<dev-libs/openssl-1.1.0:0[bindist=]
+				)
+				>=dev-libs/openssl-1.1.0g: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_VER)
+		$(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.9_p1-openssl-1.0.2-compat.patch
+	eapply "${FILESDIR}"/${PN}-7.8_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
+		pushd "${WORKDIR}" || die
+		eapply "${FILESDIR}/${P}-X509-glue.patch"
+		popd || die
+
+		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' )
+	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
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}"
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}"
+		pushd "${hpn_patchdir}"
+		eapply "${FILESDIR}"/${P}-hpn-glue.patch
+		use X509 && eapply "${FILESDIR}"/${P}-hpn-X509-glue.patch
+		use sctp && eapply "${FILESDIR}"/${P}-hpn-sctp-glue.patch
+		popd
+
+		eapply "${hpn_patchdir}"
+
+		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//./v}\"" \
+			"${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 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)"
+
+	[[ -d ${WORKDIR}/patch ]] && eapply "${WORKDIR}"/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 ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	# 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.initd 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 8c80c7d591b6..c3779d2e96e1 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -3,5 +3,5 @@ DIST Remmina-v1.2.31.3.tar.gz 1248295 BLAKE2B da748ceea5aa50702b060075c8e5c4aefe
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
 EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
 EBUILD remmina-1.2.31.2.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
-EBUILD remmina-1.2.31.3.ebuild 2236 BLAKE2B 9a8cd2fa813e2579b8cc400e7056812b6cf1f8afe814da1978b102962d77b00183a206303a22f7cc779435d10f7e1889ac261fae0a51361b574b6e1a5846a9cf SHA512 847f9a0bebcca9e888ce0498d9cec2146c31480579c9d133435c71552676acd44c76ba35a99b4c80db8b2560381a699fc50f982fe20c7a0353e284034e2e5f47
+EBUILD remmina-1.2.31.3.ebuild 2239 BLAKE2B 65e7720bc587f060e1014ea7c35832a4eb3a7c3a618913b35803c56103f814e0d82e65756471cef1e55da3f5d6a2044660b8adb33e7fa82618dba3c376e5fa6d SHA512 f038e0f8242aee5eb86403dc0e4758278f91407b9382b837d248de914037d88f7fac489ce326f5499c4cc548215f924b17ae10e8792955efec868b9e4c00f3f6
 MISC metadata.xml 1150 BLAKE2B b75ab4d0b30c602c1bdf2d9bb5701444570ea7cc53a97e3a27dde34044ab69f0f550fb2f8ca3d76ff04b0ff0a30164fc20696443896f3f732c4ce589a4a57b0d SHA512 9ed39584a65811d52192ff8390d02c3630f88a213c998e7990acf74f1aa26cb2abb54f4f75eb01cfe88b1986756eb9d59f2362e1ccfacc9e81c99e044a739809
diff --git a/net-misc/remmina/remmina-1.2.31.3.ebuild b/net-misc/remmina/remmina-1.2.31.3.ebuild
index 4fbd25cd8a09..661521f4fdd7 100644
--- a/net-misc/remmina/remmina-1.2.31.3.ebuild
+++ b/net-misc/remmina/remmina-1.2.31.3.ebuild
@@ -31,7 +31,7 @@ CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh[sftp]
+	ssh? ( net-libs/libssh:0=[sftp]
 		x11-libs/vte:2.91 )
 	telepathy? ( net-libs/telepathy-glib )
 	vnc? ( net-libs/libvncserver )
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index ca79ad644f86..9248c9fde428 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,5 +1,7 @@
 DIST s3cmd-1.6.1.tar.gz 102431 BLAKE2B a470417c790f60acd60cb23ad45d8d274b3f849f610cd582524c20fa88cbd592762f5e41a6abb36c6fc49ff6719b87322b12cc37c973d52847f9a400d8bf3024 SHA512 0b1e3cf839144b24e42974f973a8ae97e9b4c79df3a40e38f61cc4b5284ea41a1fcbdc9dd45ff2b402915acb1ffc908a1e1c45c12f93243211ef2349c9acf70b
 DIST s3cmd-2.0.0.tar.gz 115290 BLAKE2B 1dfc2498c2b89f6f94049b180049a2812c9fcee9e519d8ffdfddecb1c157fc39fe8b26f39cf698cedd83ddf2649abd8e509c97b6e3073f7baa29a229a9958a1c SHA512 77723c5fb20792b5202f689dcbd73025e3c8abdb4e2d773d4e653fb04935057bd49928d3ec40f3e3bab4b13af481ff7979d429dfff94f0cc10e5e3ba3ba1a0d9
+DIST s3cmd-2.0.2.tar.gz 124266 BLAKE2B ab5921f22af05007c57df84ab4df559f31a8b7f05427fa06fa7428d41de788e4824b6285b69de592ed84d72733d3ae455a20c017dd9cecf2e4e073bff5016fb0 SHA512 4cd155f4e24e462fcab009b5ae0844718b728134cf436a4c43a9380c178c2172bb5bccc780f0f174cb43793554cb4f9b5ca432c757c9e5a4a8eaa4efe656133d
 EBUILD s3cmd-1.6.1.ebuild 565 BLAKE2B 71458aa49a354e23c1f30edb6df5a14206a28ed933ccd91b35a46c4485a3a3e8e9745df589e59a3223f20e045c46b452e3d56d3012246313f0834b4b0cfa7891 SHA512 f0e4d0bc0d292d40b4733fccf197a046e69621fc30cab7c068a0622f28e3ec27dae99765663f037cd0c6c51780cd33e476f980f172437a2783dafb3d6d468050
 EBUILD s3cmd-2.0.0.ebuild 585 BLAKE2B e5893a2407d2068cc8e7d7e1e1c9490eb485a7104a42ef3c671afc4575221bf58c90fc4a7b0453f04c269695c29ccd1e5c970dc1382733ff8573169c91388e76 SHA512 aa9bda77e77a242e4438f24d020a246d2fc104c3ec40b439cbf8375f45d8f2cd7faeced7f1994fed77b84a90389c07796069e4f04fa23e30f10a574a58e61267
+EBUILD s3cmd-2.0.2.ebuild 585 BLAKE2B f60832cd97239541f9fb0572e26ad33bc7025dd02a13e5d90ac9a75ce9f905c24745b0ee03e5d0bd0a9800b89e235c2c59e358c3c549afb9ea2e47717242cf94 SHA512 fab67e3b49e7a1b057d813bd2fe38da354ee8119842987dc9284a45f92c8c1efbc4d4213938ba4a3541611e4574ccf40ba4c7d9a94f4a820a05a0089a82955a9
 MISC metadata.xml 653 BLAKE2B 917a644773bed192fb8223b7d4b83685ad70ef09cc0ba3afff7a86b5b238623b01501c7e2c5f7f6515374e4a0cb8a4b09f892638be6e71682536777583f1cb52 SHA512 8f60fecfd5bb15e38d76a37df6ea221b31492a6bc21679e8e327ccdc0f4450d874689948a3acf2b69b4067b8b2201531a844a4e52fddfb1eede3ac10783824ca
diff --git a/net-misc/s3cmd/s3cmd-2.0.2.ebuild b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
new file mode 100644
index 000000000000..c8ebf64df130
--- /dev/null
+++ b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}}  )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Command line client for Amazon S3"
+HOMEPAGE="https://s3tools.org/s3cmd"
+SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ia64 ~x86 ~x64-macos"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]"
+
+S="$WORKDIR/${P/_/-}"
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index 44a16ae21e92..d7b84fb2e3ff 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1,3 +1,5 @@
 DIST s6-networking-2.3.0.2.tar.gz 85977 BLAKE2B 883caa1d2376e1897b35fd6992a512bb9915be08b0fed10447fac3bf3acf8587153bb15d3b2c4750b02e7fdba8793253d7145afe9aef83a10efd33df3ee46c67 SHA512 c99afd9bdbd5003f57de8f88f091971f0269cd8efee5791c3c4aa90ad34b978d0f57724d4128e9d20d6a40d731853bb4bdaa76dd860f975ff7f84a56b0050256
+DIST s6-networking-2.3.0.3.tar.gz 86765 BLAKE2B 1454250de9014597e7cf3dfb7364fc5283b26c5510c5b7a825255af0626bd3b12ce456290c7a1fb58f61fae1bb5757ea4cd803a6896b554511e19cd01fa3741e SHA512 f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762
 EBUILD s6-networking-2.3.0.2.ebuild 1892 BLAKE2B 80830d023c1bebc7457fe4d882924f3761879665c771fd465e22e0cf095a76127f0b01eb891316366452d8fbe4065ddaaec7f157549ca72e6f21e97cc9d4cafe SHA512 26539e1976690200ff1882ae1fe761f45c670ac2192234d1a920d644a397be8144ee000100a43086ed19add9a5d403bee021f85b2be3badff1e3e2e67b60f76c
+EBUILD s6-networking-2.3.0.3.ebuild 1627 BLAKE2B 3d7db35321240f1445f904066c3b5d686c7533df0ef5b67c2264374b12f149d67039602e2a9ff4d8ec841c6bc8e91b51e06e06235a3c99abee99f08def666865 SHA512 804818cb31c44e11aa9d9a43c5c1a2f9a62cadd93abc9994d6ff9d77ed1e08dbab56a1940f1d092ec38a160d98bc3147f6583cd093b5f0e16d03dc163b7ef9e9
 MISC metadata.xml 970 BLAKE2B f9792b261130ed67ef4d8c39e2d2527af114ffa21c0fbb1213b9fda6f76235254b77521ecafb551345694e2a3334837a6f03f208048b6b109b06decdb8d9dd57 SHA512 29c7d44849f2e08812af16e5da7ac72858d9deff240d8ee71dae789b498e1f7385f3b94f39d87672ffb625eff4b4645f441858bf9463c269510439bb7c3987bc
diff --git a/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
new file mode 100644
index 000000000000..337a4b582c34
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?]
+	>=sys-apps/s6-2.7.2.0[static-libs?]
+	>=net-dns/s6-dns-2.3.0.1[static-libs?]
+	>=dev-libs/skalibs-2.7.0.0[static-libs?]
+	ssl? ( >=dev-libs/libressl-2.6.5[static-libs?] )
+"
+RDEPEND=">=dev-lang/execline-2.5.0.1:=
+	>=sys-apps/s6-2.7.2.0:=
+	!static? (
+		>=net-dns/s6-dns-2.3.0.1:=
+		>=dev-libs/skalibs-2.7.0.0:=
+		ssl? ( >=dev-libs/libressl-2.6.5:= )
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/s6-dns \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable ssl ssl libressl) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index 5ec8d9008b08..a0d37e1eb96d 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -7,5 +7,5 @@ AUX sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch 549 BLA
 AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 BLAKE2B 51f63c89f259b5e3a9c28dab50d563472f8e85a07d11853b076123f58e8abd7eaaa5e8d8d34a5295d0577655069a6e9dc404740566000b7cb160bb4bdf3fb52d SHA512 cdd3abe65fbaadc52caa83641212fd96430df9ea8dfaf08568d63907df3cc87b48b9de0febde545b24722ba7e77c5a8fb4226d8a6dd696b87820dfc1d4fdb6d4
 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965
 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734
-EBUILD sitecopy-0.16.6-r1.ebuild 3337 BLAKE2B 325be931832211c6c907001bc3d6068dd065acb387047763d6d2397d01b42315766922149cac38196875bed45c9a809bac86af017d37ae3a053506ecf6ca958e SHA512 90974bfa8bafed38ef4886c932f3a569f1db7e334e07819a046138d3f9495c91e75d184b58237a7b958837ec0f4fc85ad77fc8270657a578d17e5d257d180128
+EBUILD sitecopy-0.16.6-r1.ebuild 1978 BLAKE2B c7a74b61d04be2b0fab0607ff18ae3a3293c5114b0bef3cf6d1fa0500e88eb592b866087f29de2225829fb0ad8f8cb26828265fe9f0e47e647bb4c22b33d1d40 SHA512 6ad9aac3cf9a7352acf8109fbd2309e896e8f0e52adb1e50bcf235f61886e9db1ba770fe8c62c4894b494632b8989fa2a08be482b07743e6d846027bb9682e79
 MISC metadata.xml 612 BLAKE2B a17fd5ea60dc914fe857b32afdfe0782476d638106827e0c2ea22a5b7a365a6edc32eaca49d81089cfb19f5a7a239e63fb51653a7328bf94f2d8299ee8a14722 SHA512 04589e21fc83e206866825876bec4a4717708fff8b1e7192188f31ae08c278892ca286a362040cc21c0feb6041f413657ba9118b854f67cbe1ef3a9f8fd8696e
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
index 90a94c1f611d..94aa7118251e 100644
--- a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
@@ -1,87 +1,62 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
-DESCRIPTION="Maintain remote web sites with ease"
-SRC_URI="http://www.manyfish.co.uk/sitecopy/${P}.tar.gz
-	https://dev.gentoo.org/~idella4/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
 HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/"
-# Removed all Debian related stuff.  If you want more patches, they can be ported from
-# http://ftp.debian.org/debian/pool/main/s/sitecopy/
-# The sitecopy_0.16.6-5.debian.tar.gz contains their build scripts and patches.
-# This SiteCopy now builds using the original sources.
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
+DESCRIPTION="Maintain remote web sites with ease"
 KEYWORDS="amd64 x86"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="expat nls rsh ssl webdav xml zlib"
 
-# TODO: Depends copied over from old ebuild file, ensure they're still correct!
-DEPEND="rsh? ( net-misc/netkit-rsh )
+RDEPEND="
+	rsh? ( net-misc/netkit-rsh )
 	>=net-libs/neon-0.24.6[zlib?,ssl?,expat?]
 	<=net-libs/neon-0.30.9999[zlib?,ssl?,expat?]
-	xml? ( >=net-libs/neon-0.24.6[-expat] )"
-RDEPEND="${DEPEND}"
+	xml? ( >=net-libs/neon-0.24.6[-expat] )
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	# NOTE: Insert patches here.
+	default
+
 	# SiteCopy patches are being currently pulled & ported from
 	# http://ftp.debian.org/debian/pool/main/s/sitecopy/
 	# Consider SiteCopy to be more or less being actively maintained by
 	# Debian maintainers, but GPL patches ported into Gentoo.
 
-	# NOTE: epatch is provided by 'inherit eutils'
-	# Patch File Naming Format
-	# files/package_name - package_version - patch_order - patch_description
-
-	epatch "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \
-	"${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \
-	"${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \
-	"${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \
-	"${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \
-	"${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \
-	"${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \
-	"${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
+	eapply \
+		"${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \
+		"${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
 
 	# Source package uses incorrect '/usr/doc' for the doc folder.  So use
 	# sed to correct this error.
 	sed -i -e "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \
 		Makefile.in || die "Documentation directory patching failed"
 
-	# NOTE: eautoconf/eautomake is provided by 'inherit autotools'
-	# Need to recreate the source package provided configure script,
-	# because the package provided configure script only supports
-	# <neon-0.30.0 support.  A patch above patches the configure.in
-	# providing neon-0.30.0 support, and we then recreate the configure
-	# script based upon configure.in using autotools.
-
-	# First move configure.in to configure.ac, required by newer >autoconf-2.13
-	# per Bug #426262 automake-1.14 compatibility
-	# Should check first, autoconf-2.13 is still in the tree requiring configure.in!
-	# mv configure.in configure.ac || die
-
+	mv configure.in configure.ac || die
 	eautoconf
 	eautomake
 }
 
 src_configure() {
-	# TODO: USE functions copied over from old ebuild file, ensure they're still correct!
-	econf $(use_with ssl ssl openssl) \
+	econf \
+		$(use_with ssl ssl openssl) \
 		$(use_enable webdav) \
 		$(use_enable nls) \
 		$(use_enable rsh) \
 		$(use_with expat) \
 		$(use_with xml libxml2 ) \
-		--with-neon \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+		--with-neon
 }
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index c10876c07c9e..e45443516d08 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,3 @@
-DIST smb4k-2.1.0.tar.xz 3714936 BLAKE2B c105909034acbdb3c8593bb06d787a6602290dadc87982ff45703e574bf978ea8a93d88cd91d062a87683559cda020d4971a7784687a74901e97c0c4a6d66d90 SHA512 632d916d6a9cf08c883d4a17747cf036d8d6e285ee149c487cc305d036977e86a7ef4d3ba4630b3b8f29ca9123d894418348e687b0c009653297d77059fb535c
 DIST smb4k-2.1.1.tar.xz 3718220 BLAKE2B 99258ac57d3b8ff2861b8635b6a0799a347f3934c8d070d41c09f49b69caa7b59f502db9041d1bc4f875ae15544254faaafaae6429200ddf5526a06812983e1f SHA512 d69cb9f4c22e2afdd111e73c3d99d6868f959aa5476ffe10620862d3659b5a4f3b814856b17a9dced7bf6dde524f5bcf224e62d413d2aa92b0bcc2272ddf22b7
-EBUILD smb4k-2.1.0.ebuild 1355 BLAKE2B 88ba77eca88e4a8526859dfde99fc719f8c79a9f950c9f82c17f0dbe4e74a36b13b3dc1ef19b96614d254c2cbb8dcc026bf95284e034f250542c4e79422d7caf SHA512 d8d40ded13a6eea5062174a992badada8e1b609a65ff9b44954792841e5b4b07d9f39614273e0b98bff630a12dadc2f6970916fac5b09df85f90801fea9a1b5b
-EBUILD smb4k-2.1.1.ebuild 1357 BLAKE2B 15e02964186f102e9e5da73232a1d60bbd3ee882d5917216706b698db26360649a311e8912635e1968aa80c96b47ed0fa2808e54419765439d7582e147717bf2 SHA512 18716b09cc5962f1a2b478e546bb5695abdfe93a06521bd25699374e267d3c02235bf7088e9ee6d481463a643435c4528bae6bd4e6cead0f4da33cd9d42a6250
+EBUILD smb4k-2.1.1.ebuild 1352 BLAKE2B 98f727608542565fb7d3ea95feb5519dbc4c14ca6545ac332e5cf41495bb73f592303cb20f9d9d8a6466674aac6ee79f8f1c9be35fed91fc0b1639b7d2e38959 SHA512 fadf1efd2d4ceb8fc733397435d4ca39d8d336dfd47b6430cfa3009e02169450f47f06a651313056db1bc3e3f119ea375a0340a1727b4961e54da6ce373c45db
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-2.1.0.ebuild b/net-misc/smb4k/smb4k-2.1.0.ebuild
deleted file mode 100644
index dcc591316293..000000000000
--- a/net-misc/smb4k/smb4k-2.1.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-IUSE="plasma"
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(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 knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	net-fs/samba[cups]
-	plasma? ( $(add_frameworks_dep plasma) )
-"
-
-src_configure(){
-	local mycmakeargs=(
-		-DINSTALL_PLASMOID=$(usex plasma)
-	)
-	kde5_src_configure
-}
diff --git a/net-misc/smb4k/smb4k-2.1.1.ebuild b/net-misc/smb4k/smb4k-2.1.1.ebuild
index 74eb7914f02f..e2bb3549dff6 100644
--- a/net-misc/smb4k/smb4k-2.1.1.ebuild
+++ b/net-misc/smb4k/smb4k-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index 4e944dc1a26e..a3bcc4effa62 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -1,5 +1,5 @@
 DIST sshpass-1.05.tar.gz 98362 BLAKE2B 59a48391cd41e467b7ef2fdd14dc1ba4aa769868955326bc26ce603ce4a71780a431c6900ef67ef2d5a5940450b06605da46cfb1f5b6782aad92f2cbe8f67964 SHA512 92ff3428a3cbc2b517e8ee0a6676b409bac3ec0900bfb370cf3882ccc62017edb695ce00e025f73680e9718e1b0213b2ac1bbd2a2558fe43f0f5a7b0d690c810
 DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8
 EBUILD sshpass-1.05.ebuild 408 BLAKE2B ad99bb2fb89dfd18afeb1e28ee9583a695dc08b7f73a22a171e712aab623635563ee6242c185f093879e75f6b7d257880a650a7d913aa729e2406098c16b422f SHA512 cc073ce58bca4f7191c878912e6198acfcd75f49bc49d59089014e2f5fc47cfbc1e5041f142cb9a6e923cdbe989826d051d8c2483565a6c0881eaeace9157871
-EBUILD sshpass-1.06.ebuild 398 BLAKE2B 8feb5215a83009c7d7be398a9a80c5720398e70b0966a2b8984c89837cb18ca2b3f1d71d5e641d63708d04431d7d0cdccd88a868ebde546271688aa93af0f946 SHA512 9405313f06d315f04e5d353de12e010dd9b90fda1dd2b7ac8a8c3921039f9088048ddb82415150f08333fe346c4c8b4d2eef743b4e776e630bfa0bb8d1b330b5
+EBUILD sshpass-1.06.ebuild 394 BLAKE2B c638ea85bc1db201965566bab0c81b9d0985badcbae621d0550580d1e065c03b448b7614d26812ba2b090210977a99cfeba560696c2d37fd1b836b72e23d5c1d SHA512 8935b114136feb5fdbbcb335e34cf516ca641cb650506024f05e45f66c7482ee421362c5b35a6d5ae6263d1e5d94ad3ada9c617889a6c96185eabf4d9fd0a017
 MISC metadata.xml 322 BLAKE2B c05a742c8ed098102d51af6f02b578c0d53d26772a99fcd5ef16e58fcce6aaf2b2ff6bfdb2752e1c3f0ecc697bfb1f091bfb294e5ea7e385a3eef506ef3d9d56 SHA512 8cdaa25021136f87ed8c6197def5901ff101fd43b3938baf75f0246699711a8b8d7ad2bdcf4a8f8f5e1183c7e6f151a9496b1b0109690206958b521de15fd8f6
diff --git a/net-misc/sshpass/sshpass-1.06.ebuild b/net-misc/sshpass/sshpass-1.06.ebuild
index 6e138ac018fc..a1096135e199 100644
--- a/net-misc/sshpass/sshpass-1.06.ebuild
+++ b/net-misc/sshpass/sshpass-1.06.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Tool for noninteractively performing password authentication with ssh"
 HOMEPAGE="http://sshpass.sourceforge.net"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~x86 ~x64-macos"
 IUSE=""
 
 RDEPEND="net-misc/openssh"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index da66c95ce4ee..984f05a7cf57 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -5,6 +5,6 @@ DIST youtube-dl-2018.10.05.tar.gz 3044157 BLAKE2B c65651eebda6bd9c28245415f7aa80
 EBUILD youtube-dl-2017.11.15.ebuild 2365 BLAKE2B cff79a16ba920a6b85b9e7970a12065fade413701a7b0fbd86e739887ea86dde832e7d9344f73fef2480e32d689c8c89ed3926afc9f2cf702b9385550dd38c04 SHA512 5be26dbc448c37d37db450f7b70aed88124794e7f80ba584485ee99fdb6288093e5bae05ca8b2e58eb783b7a398fc5b866728711588d43da6bf46c07f47bf1fb
 EBUILD youtube-dl-2018.08.22.ebuild 3286 BLAKE2B 998db6c1bf8f4bdb39152fa75712e4ebe98a9d69422b464328da90fb986e8ea07ddeb9e90cbff52dcd8012cce96ab06e48d7e4c87e6a660cc5fd90dfa5bd731a SHA512 927eab9548db77ce0a3455023a2f85bab64a0dae9a03d09d8b1ce96ec891bf32e49b2b2292abc5688db940eefae51473918df6449469f054a859820398782a11
 EBUILD youtube-dl-2018.09.26.ebuild 3286 BLAKE2B 3d1dcd532b3718f37128c1b3e95ccb4bbff360335a28232e8169cc87de2f74c60b9ae1c51ded8d49ebb71cd4b864bae7ee5d5c09788eea8123e8430a34059634 SHA512 e72de7230ed2cfd9371e12bf2a74d1c42ca4f7f4c42bcb1d0e78735b7768521e55e3227706b24c50d4d394f19ef75d42b95d73d27464919cdc2a7b2cf34572b8
-EBUILD youtube-dl-2018.10.05.ebuild 3286 BLAKE2B 3d1dcd532b3718f37128c1b3e95ccb4bbff360335a28232e8169cc87de2f74c60b9ae1c51ded8d49ebb71cd4b864bae7ee5d5c09788eea8123e8430a34059634 SHA512 e72de7230ed2cfd9371e12bf2a74d1c42ca4f7f4c42bcb1d0e78735b7768521e55e3227706b24c50d4d394f19ef75d42b95d73d27464919cdc2a7b2cf34572b8
-EBUILD youtube-dl-99999999.ebuild 3156 BLAKE2B 3e94ee7379ea96aa47c6276d78bab9683bc2317980a7206d119c9710ccf99ec2da383bb8744208bf4d82af91990b12a769dc66760614330a2ef276c3051f3d05 SHA512 b45f8856a4d7067dfe53f1a7689373c001f0e1b98540cd1654001c9e23c442a245bf41d014945b2b84d818f0e26d0995fd7b35b73d3e3871a6c567c8e664c5e4
+EBUILD youtube-dl-2018.10.05.ebuild 3439 BLAKE2B 2e9fcd2e40f815a9d75bb7adff01f12afa5345c027f5dc55b9e20b30a3055bef402d66361048a9cc6cb71e1e6b3982e3b059bee837fb8d36c886be616d078490 SHA512 b46ab94dffbea58076d3b83de105a1c51ed1ae2213ff9b26b074cdcc41ec8ed97223baf92aec78ca2c56d0614826893a01ee0ca8e2e5667561dc43fec12ebbca
+EBUILD youtube-dl-99999999.ebuild 3306 BLAKE2B 7bd4ace3451b5edfef9e1ec119fc76b903aff5263e56a556334ccdf9df33fb223f3490de38edb61ce60e78efa5bcff7b8b3de144152db729b25b9ff58d9fc51e SHA512 ce0d4ae78c44450821d42948736ff85c78a84a1f96857588d18d0c43ac82dc55514c5d3b4b489ba6684565c800676231badab8e892f5b7110831432d6bf8807f
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.10.05.ebuild b/net-misc/youtube-dl/youtube-dl-2018.10.05.ebuild
index 8a6b3e14fd72..ccd279b522c6 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.10.05.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.10.05.ebuild
@@ -106,10 +106,12 @@ pkg_postinst() {
 	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."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
 }
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index beb514a7d658..62abae9c2005 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -105,10 +105,12 @@ pkg_postinst() {
 	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."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
 }
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index c57fb0ea6a2d..9bb461f4bca0 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,8 +1,5 @@
 AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
-DIST zerotier-1.2.4.tar.gz 7963254 BLAKE2B 0c79533429e7aab8dc0a93d46ace132b168b6d83276e72cd66c72660d4e44a5336a91c011404690301de0b5ef4b45f857b340f38cd195d6479b480d3a62b7abf SHA512 82adb110208d24ae2745e3839810afcac87955de050ebfe0517a7dc2a875881dafd40c1b16a041742d8c4d0f6513abcc71d6ea3e06c2fb89b47be2630a500363
-DIST zerotier-1.2.8.tar.gz 6009764 BLAKE2B 740b58888f6ce2808608867618df517996d423c61d2ab71f387405bb2528ac5edc6a890b9a7249eebe5d62be58e237362692c13725f0c5313b45102f5fc4824a SHA512 a97a8ff0e5050294fd8d56e74b5dd320b77822242ed4d43919c62a361ccbe1837417cba07d4114c91e277816f60bf47d226f37f816278bfd96505b752ef5d5ff
-EBUILD zerotier-1.2.4-r1.ebuild 900 BLAKE2B 78b4d45a2dbe5577f63193199125fa70298cf498300611f429771767fe165df4ac44a783104e3003628ecf1fa97c9b0de132fc021c759caed25be5ab93fb78b1 SHA512 3311a4b3431450384e08910fac3838b1221c1f6e46debb967e6d98b775aa433de588b6fbd03ca5cb0ae4c8ae28780344806891e5b421f5a90426045189b39434
-EBUILD zerotier-1.2.4.ebuild 910 BLAKE2B 1702a5bdbc81996fbc8503b88cc2149793d8391d80e736e57b6ded5556f0fd6f2d3a90c6d4105e453e4395de9b6cdd2fed835e99bb66361549ff89a82e7bd5c4 SHA512 0b0e295145b5c3b149a41a3645f080e644ca336e151a0dd7c7f6be4c8bfb508414616415b1c95e1f8f4dd34a00cec87ecec6cb67ad1a1642d833e6531a472d67
-EBUILD zerotier-1.2.8.ebuild 904 BLAKE2B 8abce716fdaea48a81bba690f91d987d48dae7fd2f39dc3a97f7583ff7dfab7dc9f6b2641db31e546f70089fb886d1cc1971fa399f760e6295ee89a30dc38623 SHA512 486490d097c4bdcd2049b700f294d112c34df920fb2086e57987e5c7141636b3bd1a372fbcb6cafbe5fe0aa6079468371dd78e477051626b40201ca80ff3e48e
-MISC metadata.xml 551 BLAKE2B f23a3b355a8f7a28b94328a4501c505ba1418426fbd0e97b1787ca085a416f664a3a2a065612d1371c8e79902445465bc2a308a8bffd60e8b767a50f4759b260 SHA512 5fae12e1943c36525f6d9206753cf59a9a27cd895872da9f9ebb31b1d07542b5a76dcf9295f20d2360fa0d56a3f3328cccbd2e2030a6494359c6c69e0c015a9f
+DIST zerotier-1.2.12.tar.gz 6058902 BLAKE2B 851d0d871fac7f6cdd9feafb375f97181f9155c265f13e44122424bd7adcaff10e3f2c2a4484d2e2ad1f4f2f174fc723681451c1a728c9aa324bdcb02300af57 SHA512 a35029993d9266f3529a9922daa606b0d56a332514545f8cfab2092a4c9db4fc7217223f3bd7dbe59e536de325ee9b4f0226d673c0f0ec5859cf2937e8a4a2d4
+EBUILD zerotier-1.2.12.ebuild 905 BLAKE2B 15730c3a9c069e8519998e1fcfcc1c44b38b6e9ec94cf3885562a08c4ad7212af5333dbcd021326f7e606f7c5c9312e0821944b523b6afa7c96ba1409f859aae SHA512 6b504bee732d704b692b00fa18fdc8c47054a1b38a082aa83d4335d2773308c0d12886327d4454a7d95ce43f37e931940c84d082f2e88e5c5e1bfea7002ac6ae
+MISC metadata.xml 550 BLAKE2B b2337f927bef36ec75e2329459f9f654e3e786ec8d4dfa2016e42c5c857db77a539df1e2e6398483995e72d2a71f9eee3bf81df3e26501354c8bdd8ac5243222 SHA512 2c76feb941ce99247828da120bf10b4c9152065a361230b06c2717716fe0eb8798fa59eb737dff449d9c2d8f7f99025576e42a1592ac7183163bd4d8e7e9ba8a
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
index 9ba830b73cc2..9a0bb99004b4 100644
--- a/net-misc/zerotier/metadata.xml
+++ b/net-misc/zerotier/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ramage.lucas@openmailbox.org</email>
+		<email>ramage.lucas@protonmail.com</email>
 		<name>Lucas Ramage</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/net-misc/zerotier/zerotier-1.2.12.ebuild b/net-misc/zerotier/zerotier-1.2.12.ebuild
new file mode 100644
index 000000000000..7d2f788b42ec
--- /dev/null
+++ b/net-misc/zerotier/zerotier-1.2.12.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic systemd toolchain-funcs
+
+HOMEPAGE="https://www.zerotier.com/"
+DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
+SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/ZeroTierOne-${PV}"
+
+RDEPEND="
+	dev-libs/json-glib:=
+	net-libs/http-parser:=
+	net-libs/libnatpmp:=
+	net-libs/miniupnpc:="
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md AUTHORS.md )
+
+src_compile() {
+	append-ldflags -Wl,-z,noexecstack
+	emake CXX="$(tc-getCXX)" STRIP=: one
+}
+
+src_test() {
+	emake selftest
+	./zerotier-selftest || die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}".init "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}".service
+	doman doc/zerotier-{cli.1,idtool.1,one.8}
+}
diff --git a/net-misc/zerotier/zerotier-1.2.4-r1.ebuild b/net-misc/zerotier/zerotier-1.2.4-r1.ebuild
deleted file mode 100644
index bd328bd24296..000000000000
--- a/net-misc/zerotier/zerotier-1.2.4-r1.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
-
-inherit flag-o-matic toolchain-funcs systemd
-
-HOMEPAGE="https://www.zerotier.com/"
-DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
-SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	net-libs/miniupnpc
-	net-libs/libnatpmp
-	dev-libs/json-glib
-	net-libs/http-parser"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.9.3"
-
-QA_PRESTRIPPED="/usr/sbin/zerotier-one"
-
-DOCS=( README.md AUTHORS.md )
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	emake CXX="$(tc-getCXX)" one
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.init" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	doman "${S}/doc/zerotier-"{cli.1,idtool.1,one.8}
-}
diff --git a/net-misc/zerotier/zerotier-1.2.4.ebuild b/net-misc/zerotier/zerotier-1.2.4.ebuild
deleted file mode 100644
index 9150c0a91052..000000000000
--- a/net-misc/zerotier/zerotier-1.2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs systemd
-
-HOMEPAGE="https://www.zerotier.com/"
-DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
-SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> zerotier-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	net-libs/miniupnpc
-	net-libs/libnatpmp
-	dev-libs/json-glib
-	net-libs/http-parser"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.9.3"
-
-QA_PRESTRIPPED="/usr/sbin/zerotier-one"
-
-DOCS=( README.md AUTHORS.md )
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	emake CXX="$(tc-getCXX)" one
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.init" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	doman "${S}/doc/zerotier-"{cli.1,idtool.1,one.8}
-}
diff --git a/net-misc/zerotier/zerotier-1.2.8.ebuild b/net-misc/zerotier/zerotier-1.2.8.ebuild
deleted file mode 100644
index e77b9a824dd8..000000000000
--- a/net-misc/zerotier/zerotier-1.2.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic systemd toolchain-funcs
-
-HOMEPAGE="https://www.zerotier.com/"
-DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
-SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	dev-libs/json-glib:=
-	net-libs/http-parser:=
-	net-libs/libnatpmp:=
-	net-libs/miniupnpc:="
-
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md AUTHORS.md )
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	tc-export AS CC CXX
-	emake STRIP=: one
-}
-
-src_test() {
-	emake selftest
-	./zerotier-selftest || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}".init "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}".service
-	doman doc/zerotier-{cli.1,idtool.1,one.8}
-}
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 78e1be60d204..9f86a5ce750a 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/yp-tools/Manifest b/net-nds/yp-tools/Manifest
index bf7c073d73e2..20e30d511ef3 100644
--- a/net-nds/yp-tools/Manifest
+++ b/net-nds/yp-tools/Manifest
@@ -1,5 +1,5 @@
 AUX domainname.service 165 BLAKE2B b36bb4877585f69503c319743a2e78f62f419852f235498791b007c4477d8622934263e3690cc2ba619d1c8ba925ca682b379720126915e5057210d893027105 SHA512 dc6cc79a1e6636f31706901bec45adc479231c883e149748989c038d4a9e2d3b1e15e3ba45ca7276700c68600cf6489b92bc4ada0c8ba630921a6d8cb8368de6
 AUX domainname.service.conf 89 BLAKE2B 22b81d78eb5df449658413dd2b23ceab02376fca3c061e328a3db36f88b3840296db961748679c8df9719dfb6cf3f4fd100ad6ed79916585aa79edbcf27c7577 SHA512 529f85f41e8204cc3dda72eb3c94c81443b8aa9f5af1ce4cab4510cbc42da79a4554d223893f0a968afb4476898b8a74ea061f8e9f40518b3066584ea9c7ad6c
 DIST yp-tools-4.2.2.tar.bz2 368673 BLAKE2B ddc0e6ff81042a632713afc201e8195f42346dd557e44770f8e0d48d2d510a5df1b51d9229912214cb6840a6cc97c6bbf8bbbfcac2eac5dbe06596a4fbd875be SHA512 e2856465e650823de87fcf0e7f18c4875b0540f271b3e564b3afe07d0df35dded7f09ecdf2494d099b31a15e098fc5e9065339f19df45c0489ca91a736c3eac9
-EBUILD yp-tools-4.2.2-r2.ebuild 797 BLAKE2B 20fabc250ae82db3265133d1ce3ae89996d8c447b0e40cf429c4679997feb71714a2ae602acddb4b53d8fea3d0ca9bfd55c138a82f9553b11fc275d06eaacba7 SHA512 781a2e1eb133c7613ce113701772f613d3c91c70327dad1452fc523ffe856c0029958990f3eed345dee8481cb337efaf19f450a5cf98384ec04bcaea42b25f76
+EBUILD yp-tools-4.2.2-r2.ebuild 802 BLAKE2B 59be1a7cdd2bbf6e94c7129430790eab2bb5c6e2c402bf1e8b0821b3c49ac9de2238d5f9846d8b52d54e7430121860c26ed0136412b8dfdd55a62705916ef446 SHA512 96e0fd567d0101a75d1dd14d384c5c4509ccd1e8c345f76a3690d2c60706e9b72b7cb6c1d3f01c113976701e519263e54b9ec96aed3a6a1f0d31f3e98b03c301
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-nds/yp-tools/yp-tools-4.2.2-r2.ebuild b/net-nds/yp-tools/yp-tools-4.2.2-r2.ebuild
index a4e1ae7b214f..1e03726249cd 100644
--- a/net-nds/yp-tools/yp-tools-4.2.2-r2.ebuild
+++ b/net-nds/yp-tools/yp-tools-4.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="nls"
 
 DEPEND="
 	net-libs/libtirpc
-	net-libs/libnsl:0=
+	>=net-libs/libnsl-1.2.0:0=
 "
 RDEPEND=${DEPEND}
 # uses always libtirpc if present
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index acc84a54a97a..8db814e9e3ce 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 945df4977483..bb457e618292 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,9 +1,5 @@
 AUX rssguard-3.3.5-deps.patch 886 BLAKE2B 407517f4b89d1667160ca672acd4dca34d1cccfb65a12358d9e9708a9a755310779fd8499856a3d4d8cb949014f59f95b94d302c9cf6844903643d4e9ce4ae8b SHA512 d76996c9cdc214f6f7be125e0e28f6d74cae9b8fc94646c50a139c7a7301d15615a80968246405a67ebbe3fceb0e209c8e986529bf16c43bba669f4f916f9161
-DIST rssguard-3.3.5.tar.gz 5310573 BLAKE2B 113f6149e646a90750a10b1bbb1ef649153df903cee4b03ee325bf8595a783052a9a8df37524fb34bb4838c4a5334e5eccee416bb24811a2f60c2582ad10eb35 SHA512 3d80cffa20f0f5f625907b0245a09ada18d56a190abddf2bcdc9eaa199867e29b68d445e12eec0dc544469e8ead4df2c6753da634346bf60e0913bdae41951be
-DIST rssguard-3.4.1.tar.gz 5128550 BLAKE2B 43f4e1dbe5fe40b69dcad98b48b088811a8d9d80f1b11ec66466d2fbbe82ace6cc12e3117e9ab4e37ebbf06aab89c1ab80d17ccdb82febae9a2a509da66ac52f SHA512 0f60bc7f1d000ec8e0f813cccf6235602b9a8f25b833b2bbf094601a0bfdeb5a7dfe7a0745f625812c1509b8489c45141fa51206175968897b394f942f4e6e2c
 DIST rssguard-3.5.5.tar.gz 6446094 BLAKE2B 81a862f25f2c3029d4453faf03ddcfac1cd420a430acafff75bf15132d080b726910da82d1b7422f383eaec8b40a3956d7ad91d9368d9bd68fabcb9940dc3ad2 SHA512 4e6512c0d58c678145f63a2a42c43abfe4a6ceb8c9d395aba52228ca3afdaaf3dafdd79ab846dada16963f1be5dd22afb877910acc1425aea037d6fa1fc08996
-EBUILD rssguard-3.3.5.ebuild 1127 BLAKE2B b62e43c3f16a57b1101ab17b5bb150850a97224b718ebd46fce7bf8dc2b18a5e53a9ecfee61363d4ea650e06ac5efad5503cc06fb7745f1296b201ce2654be27 SHA512 86c81432d5b95ca60ddd4131ad7be3aab952dae9a422b53afbb70e37c824154d2d008bca1ed98dbd5be740cff698c922793e80b5d5ed9a3c3c33c13826dc5636
-EBUILD rssguard-3.4.1.ebuild 1086 BLAKE2B 39305735fac3ec19496fbd07639530d9ba8cde569f9774298b681f138ca91da1f9a68e713e9298158f14a6a6f3a23f2738fa90c2cbe0b51da3788177f42ba67a SHA512 e02f5f9f24b5198b793b319d16d2616e79c02f81d74d8209699801bb64cbf7a958daa02f7d024952bb21984b65d9b568a6280abb65783412017f442c9693c5df
-EBUILD rssguard-3.5.5.ebuild 1226 BLAKE2B d8fac15df76f52d6ed4abbeabd6fac1cf078c323c907aa820dc31a39e01e4b65178bcc7479efee7254b4a6f7ff6de0b9997d4f71e91b97be295f0525626c6e8d SHA512 0303e730243ec58d5a2ded5d422682e8ef358a81a8a14afd2cdfb0cbd2c81d5bd99950fe62ee13e3ab60ba2ca4702076b09dbc0bbde19c4c7296664d8993f929
+EBUILD rssguard-3.5.5.ebuild 1255 BLAKE2B 3269ea0df4be234f889f9cb66807e07a637933fb9523361702b0562428bd7668b7dd48e1ebb819554b607203c7d631d8beeabf1d034df564e2b5ca99ae83b01d SHA512 de67c9de714966c491ba02435e221eac6db3ba666117074fcb7ae51810ec5a7190510deca5140807c3588eefa266349fa11f4cb452759a13f0a1cc5d770f0178
 EBUILD rssguard-9999.ebuild 1211 BLAKE2B 4d73726c9c2a20d27ab660063ee2cb23f666082ed656fec103ae7e1590988e9dba6b641110707ed5f29b7a21a65e42f94fea5e9e1b5016f4a2184fcc64ff4dba SHA512 3142786150353926da88de1b06cc60a029906d860d13ba83441a7ff516f87e6450d4ca44ee2565879718837e7b98a307d71aca21afcec370572f546141a890f5
 MISC metadata.xml 359 BLAKE2B 39ba3058386b88bd289077c592c99631c58e54a027c00afd6de5d27639019174039038f48323605071f5dc7184686675e337032866ec93fba5d769f975b2d43c SHA512 0a87ec4aa15bdd0932912f519be77ea3c9a524d26847397b0753b7624af73912b46c320c901304b8df128df75f517f7e7d920c87b840fcc31627c5e039700c5e
diff --git a/net-news/rssguard/rssguard-3.3.5.ebuild b/net-news/rssguard/rssguard-3.3.5.ebuild
deleted file mode 100644
index c7ba435e5114..000000000000
--- a/net-news/rssguard/rssguard-3.3.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="A tiny RSS and Atom feed reader"
-HOMEPAGE="https://github.com/martinrotter/rssguard"
-SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug +webengine"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=dev-qt/qtsql-5.6:5
-	>=dev-qt/qtwidgets-5.6:5
-	>=dev-qt/qtxml-5.6:5
-	webengine? ( >=dev-qt/qtwebengine-5.6:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-5.6:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-deps.patch" )
-
-src_prepare() {
-	default
-
-	# remove bundled qtbase translations
-	rm localization/qtbase* || die
-	sed -i -e "s|localization/qtbase-[a-z][a-z].ts||g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		CONFIG+=$(usex debug debug release) \
-		USE_WEBENGINE=$(usex webengine true false) \
-		LRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" \
-		PREFIX="${EPREFIX}"/usr \
-		INSTALL_ROOT=.
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/net-news/rssguard/rssguard-3.4.1.ebuild b/net-news/rssguard/rssguard-3.4.1.ebuild
deleted file mode 100644
index 8f2495596002..000000000000
--- a/net-news/rssguard/rssguard-3.4.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="A tiny RSS and Atom feed reader"
-HOMEPAGE="https://github.com/martinrotter/rssguard"
-SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug webengine"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=dev-qt/qtsql-5.6:5
-	>=dev-qt/qtwidgets-5.6:5
-	>=dev-qt/qtxml-5.6:5
-	webengine? ( >=dev-qt/qtwebengine-5.6:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-5.6:5
-"
-
-src_prepare() {
-	default
-
-	# remove bundled qtbase translations
-	rm -v localization/qtbase* || die
-	sed -i -e "s|localization/qtbase_[a-z][a-z].ts||g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		CONFIG+=$(usex debug debug release) \
-		USE_WEBENGINE=$(usex webengine true false) \
-		LRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" \
-		PREFIX="${EPREFIX}"/usr \
-		INSTALL_ROOT=.
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/net-news/rssguard/rssguard-3.5.5.ebuild b/net-news/rssguard/rssguard-3.5.5.ebuild
index ce581c458621..7d8229bd3313 100644
--- a/net-news/rssguard/rssguard-3.5.5.ebuild
+++ b/net-news/rssguard/rssguard-3.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ RDEPEND="
 	>=dev-qt/qtcore-${MINQT}
 	>=dev-qt/qtgui-${MINQT}
 	>=dev-qt/qtnetwork-${MINQT}
+	>=dev-qt/qtconcurrent-${MINQT}
 	>=dev-qt/qtsql-${MINQT}
 	>=dev-qt/qtwidgets-${MINQT}
 	>=dev-qt/qtxml-${MINQT}
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 1082ebff4ba4..573c453b040b 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/suck/Manifest b/net-nntp/suck/Manifest
index bc749ddcb3ae..a49e0f75b5a1 100644
--- a/net-nntp/suck/Manifest
+++ b/net-nntp/suck/Manifest
@@ -1,4 +1,5 @@
 AUX 4.3.3-fputs.patch 639 BLAKE2B acbb1344a34b8176abcc10d61ed08d506cd80ad331aba78c97c5c0de97192ec2708d5c21f34a9b329303ab6c5066b0b248128977eb5d9e2c44633acb56a9919e SHA512 70e7e117692b27e9bcc646eca4e41cf432aca180358922f900e02b0ffa4c98e0a4814f05aa6b318cb38c50075bedf560a74f1a3e9dadf3e88c855d4a43bcc24d
 DIST suck-4.3.3.tar.gz 153624 BLAKE2B 434bdb21ba37deefcba4c0fa9ec3cdf14bc49e1295533ae3c7fb298f49819113ad05e26b3ca72e20ebdd498b0514155f8d79e7c82e95f423521586de889c2371 SHA512 629ecbd7e8d070fc9c1175be6dd10d49fe71b59b8694f32a81cc2dd5ec46e32d64463d221052922a7e21fcac1c9a330f56399bad7c64fa653d68127cd16dbfdc
+EBUILD suck-4.3.3-r1.ebuild 1329 BLAKE2B 6f34ff3cf4f838877b981b6afa99a87e9b393ddc1cde51ac5dd17fabd1e68b316fe64b5346b67a8aacf4c14eb2a3b17372cbde77b163e3afb0f379b4c5ab51f1 SHA512 afe4b0bf7cc4102623565af5a1a02d448a0c59519d48e4333ff6a702dfdffb5a837ca4d8f313c56576896f2d5ac1887d0cdece05a8d014e8e461a735fdf9c6a7
 EBUILD suck-4.3.3.ebuild 1343 BLAKE2B 6a2982dac36e91102fa96da5b7035f66e3271fe9c5e8f64e3f7513df0acbb40e817219ef9d51b76e892d0a6594282ecfda9409e594caf3e778ea58dfb9dcb0dc SHA512 f8179fb68e8033c44e00d6cd68c855dd3790b93fdae78909bfaabf7e67f8102cd591e0171eabdc3426ed097fc875165b2bcd19b1f032aa77b14ea2ca7c5ecd8e
 MISC metadata.xml 446 BLAKE2B f1536ea731934392d13bec8052913b2b1735afb5bb8af79916fab70162b2575ece91eb5a93fecc69d1a964264bc1cf9ae4a44cbec89685fd02297bb1262c68ac SHA512 f8655b719c3dc9bd0a7fd4ef046c88c4e44624d206d544ba9c5f668084fc908c217813aedb6970dc9e081c8483fb1ddbf777e8e78e1432cb262c020e704e5c7c
diff --git a/net-nntp/suck/suck-4.3.3-r1.ebuild b/net-nntp/suck/suck-4.3.3-r1.ebuild
new file mode 100644
index 000000000000..264c898d7d64
--- /dev/null
+++ b/net-nntp/suck/suck-4.3.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Grab news from a remote NNTP server and feed them to another"
+HOMEPAGE="https://lazarus-pkgs.github.io/lazarus-pkgs/suck.html"
+SRC_URI="https://github.com/lazarus-pkgs/suck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="perl ssl"
+
+RDEPEND="
+	sys-libs/gdbm:=
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}
+	sys-libs/db
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=( "${FILESDIR}/${PV}-fputs.patch" )
+
+src_prepare() {
+	default
+
+	# Fix paths to the locations in Gentoo
+	sed -i \
+		-e 's:/usr/bin/rnews:/usr/$(get_libdir)/news/bin/rnews:' \
+		-e 's:/var/lib/news/history:/var/spool/news/db/history:' \
+		suck_config.h || die "path adaption sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	use ssl || sed -i -e 's/^SSL_/#SSL_/' Makefile.in || die "ssl sed failed"
+	use perl || sed -i -e 's/^PERL_/#PERL_/' Makefile.in || die "perl sed failed"
+
+	econf --without-inn-lib --without-inn-include
+}
+
+src_compile() {
+	emake phrases.h
+	emake all lpost
+}
+
+src_install() {
+	dobin lmove lpost rpost suck testhost
+	doman man/*
+	dodoc CHANGELOG CONTENTS README*
+	docinto java
+	dodoc java/*
+	docinto perl
+	dodoc perl/*
+	docinto sample
+	dodoc sample/*
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index f26ed35fcce4..c7ceeafa6c11 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 5fcb91934e06..a7b685c88334 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,8 +1,6 @@
 AUX ktorrent-5.1.0-cmake-3.11.patch 412 BLAKE2B 4ee01320022113b981ff1a314f8ed73895e0606615a5b91967bc04e72a328554f2345952f8bfd5bb09ff08991657b662f7db6d5a778316fd5ea5f4da1c8aeb1f SHA512 d3c3020407aabf8166ff08a1cce16a20693f273de5a1da5a2c6c21f5359a32799247153ca5d9e22fba45790ffd56b86e53465e2d3d9b0ce986fd896d5eedd63e
 AUX ktorrent-5.1.0-qt-5.11.patch 2249 BLAKE2B f6d27bc5ed7ccb55622412799df823e674b0e11d48a7fe91444e3f652a44fdffa17248e34446a54b197c1b177b333e85beeb73d0c0edcb62add96f7c65b3b98b SHA512 7482a3228794f36e368cf9ddadc9cb57f62cec0b87903a19a67572bc362fd8d63728400ac43626c5acc947b017c9e64886dc7c1ec949fed14a4fca401845b404
 AUX ktorrent-5.1.1-scanfolder-memcorruption.patch 2244 BLAKE2B 53efe0320124f954adff60144981d740e5cdf45ed4712fa43f112bb6133fb24b4303e6f969d9a73598525dea4f6706c22e57d2e5c7378c69e494dd924360a307 SHA512 8d3868a6f75e2f53fa11762378a676736df09e14e6fbde04f0dcfb45eb56e8b739d17b3ea96af4be21edb22edad610982865b33508847f07ac2eba744f62ae5e
-DIST ktorrent-5.1.0.tar.xz 2046916 BLAKE2B 865004b84d649774420e2bd0087c416c5de4df40dfe5800ec539049001d93f66925025780987060ad09e1ba2a20045bd6d92c9202c98c28ec68d87758a88af74 SHA512 7bfe3a04a2b0f62d68b41c946af34e9f6ead6aa4ff7818a9c0ce2e83629d311e9e9be5fb1689065ce2601c43bd576b27d8c6946b845d4cdf5fa6362d53e8dd25
 DIST ktorrent-5.1.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06
-EBUILD ktorrent-5.1.0.ebuild 3066 BLAKE2B afa0b164599cdb37394ae6460f140c4d731a88c0953503779c459cd6848fa2481bb0f5b430cd9ea0e5eb47e4fcd00b697255b86880fe1208fc528fbb0807112a SHA512 625f7977ab1bb4623b791fa193ff6d0826d3bbc6352586e1cd53b7a52d1c2a4f01402770a2964ba6b386e49a5590ffaf113ba20d9eae86fba87000f491491e92
-EBUILD ktorrent-5.1.1.ebuild 3088 BLAKE2B a85b69fbd6e0a7ec761a9633546df529a27b4a8fe13c4f1ebf178186a70675e0dc6a81b667f2a03966f4f52d89418310d7a41574f04676165bdd650a19c89162 SHA512 0c5f44c2553e7ee3f5006c81f65e7391f05d32231aef6853f053912a0717d93b3aaa95da9bd8f3d627a555f0fb4b43c2de38b203c78e1f512f1c73d8e4d83654
+EBUILD ktorrent-5.1.1.ebuild 3083 BLAKE2B a0fbf718816b1bf154f01dad9ff914fd7e3c9e1e620be3a825f49d03c3af4600ac5e7413e6b743df3477275e227628bbf999144122da2c20ce96d0753d339649 SHA512 e699da98a02493847f71011008311a37555293e5878986489114b7a1f0999c1a6f1ab76c6874babd9d4ba2adae39b2be880b2eb1a4c3ce4689a91593145f3a09
 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
diff --git a/net-p2p/ktorrent/ktorrent-5.1.0.ebuild b/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
deleted file mode 100644
index 567c2e977b4f..000000000000
--- a/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
+++ /dev/null
@@ -1,108 +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="Powerful BitTorrent client based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/internet/ktorrent/"
-SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
-+mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(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 qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	=net-libs/libktorrent-2.1*:5
-	infowidget? ( dev-libs/geoip )
-	kross? (
-		$(add_frameworks_dep karchive)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep kross)
-	)
-	mediaplayer? (
-		media-libs/phonon[qt5(+)]
-		>=media-libs/taglib-1.5
-	)
-	rss? (
-		$(add_frameworks_dep kdewebkit)
-		$(add_kdeapps_dep syndication)
-	)
-	search? (
-		$(add_frameworks_dep kdewebkit)
-		$(add_qt_dep qtwebkit)
-	)
-	shutdown? ( $(add_plasma_dep plasma-workspace) )
-	stats? ( $(add_frameworks_dep kplotting) )
-	upnp? ( $(add_frameworks_dep kcompletion) )
-	zeroconf? ( $(add_frameworks_dep kdnssd) )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	ipfilter? (
-		app-arch/bzip2
-		app-arch/unzip
-		$(add_frameworks_dep ktextwidgets)
-		$(add_kdeapps_dep kio-extras)
-	)
-	!net-p2p/ktorrent:4
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.11.patch"
-	"${FILESDIR}/${P}-cmake-3.11.patch" #650808
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
-		-DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
-		-DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
-		-DWITH_SYSTEM_GEOIP=$(usex infowidget)
-		-DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
-		-DENABLE_SCRIPTING_PLUGIN=$(usex kross)
-		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
-		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
-		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
-		$(cmake-utils_use_find_package rss KF5Syndication)
-		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
-		-DENABLE_SEARCH_PLUGIN=$(usex search)
-		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
-		-DENABLE_STATS_PLUGIN=$(usex stats)
-		-DENABLE_UPNP_PLUGIN=$(usex upnp)
-		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
-	)
-# add back when ported
-#		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
-	kde5_src_configure
-}
diff --git a/net-p2p/ktorrent/ktorrent-5.1.1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.1.ebuild
index dc9e90bf939a..7e2991a362c5 100644
--- a/net-p2p/ktorrent/ktorrent-5.1.1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.kde.org/applications/internet/ktorrent/"
 [[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index a4f72c898a7c..64adf74d6d5e 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -3,6 +3,6 @@ DIST qbittorrent-4.1.2.tar.gz 7697135 BLAKE2B 13e9456fd43395d597156519bdd665db89
 DIST qbittorrent-4.1.3.tar.gz 7268632 BLAKE2B 72388d1198dd9bdf4844c1769c7a7c8fe2fcf8213bc0442dc1900ec4b0968a5aa291b0fb35e3e89b7fa7395cc336c44a447ae6d4360504393a68343e5f10efff SHA512 ffacd3755c8f4487d13c339ff40f6e52765fad2e68f6ea2892ea58c9e702f591fd6aafda48ec4fc8b5fecfa81fd34e3a1d5b96676f76ae657b3420d080323c09
 EBUILD qbittorrent-4.1.1.ebuild 1412 BLAKE2B eb656b35b1bcb058350edc16f8da149f9d0b9a7d37c17774ac6af8a89e0e1812f630df648e653ee167ff3b5a45ee400917381810c235aea58a01007e05ae1c4c SHA512 0a4f96ad100320217ba09d49c9816ff754b03d5916b492dda4aca93e28b7a07b602f1f536e71991f1e7a9189627ba46aad0e46233859dd3134a5e34a3e942ec6
 EBUILD qbittorrent-4.1.2.ebuild 1525 BLAKE2B c039cdde5ac02a21596ee054e6c2418d8c7698b4711bef1a33a0e12db816616c102f628c918c5f82aa2fed8b4633264b28b130ee6948584b9ec9afe1540e5721 SHA512 511bc0b9a61f9733108dd1fe3157b54890c4e1a2a41d2c91c90817593e1e407010e9a96cd71701ba2ba9db53983a27b1b72262b389a5eab44d97075fb689f12c
-EBUILD qbittorrent-4.1.3.ebuild 1527 BLAKE2B 8029aa9e510f3ae444d6deb6a071a70ed27f2ee996f1b750b56ef3891570656dd662b935e7100456ea6ff8f4439d55fe96ffb82e7d4ecda16a7828b6deab5a5c SHA512 7603ac17904c1d53c9ff4793804c0073a84266b70a54102ac18d4f02d9dc1b11628566a327f74972308e5e159167465ef0197f6c03b8d83d42508a49bac0a9c1
+EBUILD qbittorrent-4.1.3.ebuild 1522 BLAKE2B 635627177cb24d40dc1c6a580dc2ae956fb327f017e2d5f98c78b8ef11da635a9dfd35c087710c4fe434c9c5a09d81c2d74ab023ebc425fc149205c94b67afc3 SHA512 d7cf4877b11e8e2ce0551f283b9a8e525c887190d3d17be3e0a554f2824eb21cde05c536ada2aada1460bb11d9f4dca2d2f024371134049615f4bd351dc421ed
 EBUILD qbittorrent-9999.ebuild 1481 BLAKE2B e44e1467247dd1e67b9595b354c137f5a0b6d5b7a61c0b00d1f05475dcb2b004d7f79aa76c9fa880bb6dfbe1c421723f76ef58c0bee19aaafa3ad899aeaab839 SHA512 d68658e22cc3e2eea08074f8e5ea45f646997c68c99dd72546f3b5ed14107a229acbfc9f0ff666891a49cfab3643856e31639b73b863b5d01d39e7a67ff70e8b
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.3.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.3.ebuild
index dba40dca433b..f990644fdeca 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.3.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
 else
 	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S="${WORKDIR}/qBittorrent-release-${PV}"
 fi
 
diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest
index 245e10157002..64603a841ab1 100644
--- a/net-p2p/resilio-sync/Manifest
+++ b/net-p2p/resilio-sync/Manifest
@@ -1,11 +1,14 @@
 AUX resilio-sync-user.confd 299 BLAKE2B 0e534911629f22010329ae441140649cff373d102d7191f057b7e72d5217bdb335457271b780ca5f4d3b3ca989a8c33d9d796491ac15347a5bdfa08b9cf6c7b5 SHA512 a156516938e5b69199c8a0de8d62ff969b8a938e5a2fd2983c0ecfc080682b1a5abeb21cf8193fc9f96954fa2a9658519e37758d6812b21971026af9b7be54ce
-AUX resilio-sync-user.initd 768 BLAKE2B b4dd9bab04ac242e258b5fd8412a2292f515535caf2845f2b2795584666924725c2c34684d6a6dfe50677b2ecc86e18a7a2c801467f8d352767138aa986f4aab SHA512 a46d90b7f85fc0d5ec88bded35cef42e105cbf8df1f65032dc79bada56ac8c50d42206fea0c5fa6cb82c4ee56eaa27f2059d283501d84ba90503b3ac6a9f9ef5
-AUX resilio-sync-user.service 324 BLAKE2B 5cec927346956c5219470021fdc73bf2be5486499e917453fd5fad94717e4ad6fc5467948b11b551b5f4cdc94d6ffbfbbd4a65fe21e62a4831f610437b92574c SHA512 95621e4df7de0f26da8c057432302a98927db47b4bf9484efe00cb0649020099050feba22a107b01e4c3998ff7d05edb77bdd1ba1f8899839c92984725427504
-AUX resilio-sync.confd 296 BLAKE2B c7fef752df5dcd4e903ebef2bc6da2780c9f19f5f690c505b8abd493081a1bc18a9ae18bba1700df15467786b2c50ca5b12e60cf1eef70a4169d7fc7e17a7897 SHA512 5db62947a34c3c5cedec1b4902b8291bfc46c10490f355ed1612a0f37854f3927d3e4550d1a920cd567a4a69403a80b3dd4150c8bd38906123be6542cd35459f
-AUX resilio-sync.initd 469 BLAKE2B 60002b8baa5889b82ac489aa8c29a9e814453c22ec08f81faea33527f18666350276b9cfadbe10324170eb97dcd9a7bef8048a6559e29fea6466718780edabd0 SHA512 930bb80ea365957c8336e744445ed3c74c4af166588447fcd502879bd9aed6851366a5897d199e4695972114b5247f4028e7463bc6a1e94ac5f4ff890c3c0802
-AUX resilio-sync.service 380 BLAKE2B bab5ea03b7f0db9845a29334f56839dec68fe1d8caf32015445b5b039389f87f729367748f839667b0eb933f95d4389e7c4e0481fb70fd1936b416eacc897a50 SHA512 af50f438111808426f6d80b7bfc77daf665e583540485831c7f51300e3f4768316d0cac2712d9564f1ffcccd7cfe21c48e3c72ba595776057038c230bb3cbdd8
+AUX resilio-sync-user.initd 767 BLAKE2B 24c55213c266eaa7d3a09dbac300dbe8b19fcc71c2eee10102ef0ea6f96b40408614b8d942d91a5863e0bf5d00e72f4262db354a16591c303145723aed2fc020 SHA512 6fc154a6c9e1a8b5978ca414ef338bd1ded30aa5e7f67929e16d934b89baffb2ecd9fda5c9e7f318493294a6846d3c5ff302155541eaf7f17eb2407358cf4c00
+AUX resilio-sync-user.service 324 BLAKE2B 992753f99df59d6def6c92400f7c2e76201b426ebe67437737444eb382cd3114159f910c72aa264abfdcd798dcf2a49555da600c5f4ec4f758d41258f0486f14 SHA512 973ec9326dd4b58ac76738a764f2d0cad5151176197a6aa9a2caf0c0cf88b5d76b69aa721971f9097ce4b61e681a657fad1c9013741cd5dd6679696f98d8fbf9
+AUX resilio-sync.confd 312 BLAKE2B eee3179791594a3af6176abc2eba5b2db3e0a14d602dd7ce44f141ba3005e0e441b94f504567eb42af1074b069bbe24c7f009ab87008005ff8fae1ee79b19dff SHA512 721e7e1afa121e6cf214ada1c3ff7f7ab1ed4d355fbb9e5adddfa073ef554c5912c5254fbda85fd4e2b8332df6a60468aa73ab4aa4779fed43a243cdb097f087
+AUX resilio-sync.initd 462 BLAKE2B 775e1824d9b374bef32798bb05bb7fb2fd66ff1b859aa50d72dd02c80033bcf8b12275bf1e4d9eae2b2fdc1a1da7a1710c8e5ce1bd6da37427a4433967afb1bb SHA512 06cc963db70c969ca81a249c17c467fd4013a7cde39b37f65c934393e9e891776f247397b976f5caf20b6d29cee64865703bb2b3b78cd7a0e68be102db46a7fb
+AUX resilio-sync.service 382 BLAKE2B f61c181137d41aeb59c721688a2b208c16d985c0b74c32e556cf3cc5218a549c7f58da50dde584bfbfca88ce6a00f1ecbbd67e58af04e88774b3e648d4d8513e SHA512 c278b35ba0cc888beb7d4b75e5b5c5c0304ec89ba1ac0136713256d05e95896254504b58f9c3a0a534aa04aee5e36468b579b2e18397f0bfb3615527b82195db
 AUX resilio-sync.tmpfile 41 BLAKE2B fb3e9001a32e45cd230f4efef60509f20f52253ad575fb2b1493bae9846ad46210eed639c7a3f9e4a4fa7c901b42a9a7756f8583c204a4bb847e6eb96a2af323 SHA512 d9d54076785ce601023980e3fe5e2eab42e5eaf3b0bdb9caefe508e0d5fda8d32faf1338c6b901deb29488401de74228023016d72d7b0ec9db362b4c2d87edd2
 DIST resilio-sync_2.5.12-1_amd64.deb 10466894 BLAKE2B d9125bfe49738db3a2cab0d66cad9fed2ae712ee613ccd104bc1d8764bd072b082f71fc0102b15d52f791b592d88ffa4f03892e7e4088e3bf4a847b6c15b4296 SHA512 bafc8dbce182253d585185e5d0a27f0a8ca18f768bba65c348752cc089e0e690c8c1848a71cb1b125c67d2c265cbbf13e98d7c99289b0bb0268d43d3e38454d3
 DIST resilio-sync_2.5.12-1_i386.deb 10334238 BLAKE2B 447baf18db1f6c47a6a2518f9ba6a27b0d9a7092cc41d63958a66be6492cab3868a0ecae9faadfa91cfc5f777e1289cb62017519a0994b93ae448042de9b32d3 SHA512 bb46498070f6aa0e3debee839f50a9292116bd5f9105fe75c65d11f9f3199e6e5b8f828b34b364e7f3cb896bf88fd37a255289c68158df7414acf809e4701b32
+DIST resilio-sync_2.6.1-1_amd64.deb 11576892 BLAKE2B 710bd96b91be84bc7210d8efe0d8954a33be878fc948694e7a1c62e7b53b5ac94133a16b89c4872e18798bc03f3508c7c130d4d56a3480c35d30edff5589ef3a SHA512 a37d73a621a740f57b4f2824cc2a3178f365ccc8180a0e814480dde8d1b74b9d54da4e07bd18c89cc6a93c12b526f8a43e08165d3c2f0fdc913e1f38e46eb183
+DIST resilio-sync_2.6.1-1_i386.deb 11465194 BLAKE2B b56e01f79c5beec6a5ebd09724bebd1ce8c6d44eac694cd7fb89dc44823ccba22531b14e241fdd985ae63e6e0f177021becb593923eac8ac0183629e533ac72d SHA512 84676c3fe5fcee484bcd58c6496aba0d2e3c86c339adb90b8b3cef28ae46d7b6f28c5fd0371a2cfe612ab8b3658eca2b9b2f6cfc9caa70aaff95946942a5c749
 EBUILD resilio-sync-2.5.12.ebuild 2349 BLAKE2B 3299319dec3fc935935c327a35a663307830a6d3ecb0caa1d9b4668385cfaf197796d9cb26b894eb784244f72ad9ff1eb4e4f92a751f33a5d18cc0ac75736d7b SHA512 8f8507ef0676b1265845201d3df6c4eb6b29b9d1a744967ab84414424c3edda4a805386898b6e9960eb56139ff7c04312f7bcc60c156242f6ba631b70f8bf628
-MISC metadata.xml 889 BLAKE2B e1ace94f1fe08c07df2825107b7f73a028894f551c5fb9a6a5986ee0fcecb29204ec19a87231153cdb16de672178eec045fabf01923bf16cb6c0307a024bdeca SHA512 cafa6e1e9a127ddc8ae14b5d52502caf5a297cb397e0770c3e7ef0bd810c4b12c197061ab1429a549054ab8c9674c9ef9d29639825f4f899892d57de41a21707
+EBUILD resilio-sync-2.6.1.ebuild 2229 BLAKE2B d23975c7f37c48b79e94e0a30fbabd14fa715beadce66b9afe2f2c83d35a698afa2e4d20c4552197099b9575e68f55a4f3043d5e0936093d67aee8cfa6c56a4e SHA512 dc85455bd1943f99a664dfea988d8899a18db51c4fc5e349eea8211773487afa5d0326f918177a8a14dbccc171c442ca325fb19a6455f0c24664ae79e9c4745d
+MISC metadata.xml 889 BLAKE2B e6e81874032bbb5ae212b3894f04cb1dbcefae1bf87dd94f86e16a5e6547cfa4e17c1db9214bfe9d2da35c86011501776ee1ed0e0327a8aa607db39ddac2595a SHA512 0943a2d2215dbe2534622e3f90edf51b340613294d9b0b2ed2594b4223c7a26a8c1d054e7d90d957874e204f7fe32cf5d6f00d43e16164d618e193ac86a96b4c
diff --git a/net-p2p/resilio-sync/files/resilio-sync-user.initd b/net-p2p/resilio-sync/files/resilio-sync-user.initd
index efcaa2d7778c..6772f6dc14d9 100644
--- a/net-p2p/resilio-sync/files/resilio-sync-user.initd
+++ b/net-p2p/resilio-sync/files/resilio-sync-user.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 USER="${RC_SVCNAME##*.}"
@@ -8,7 +8,7 @@ name="Resilio Sync for $USER"
 description="Resilio Sync"
 command_user="${USER:-rslsync}:${GROUP:-rslsync}"
 pidfile="${PIDFILE:-/home/$USER/.config/resilio-sync/resilio-sync.pid}"
-config=${CONFIG:-/home/$USER/.config/resilio-sync/config.json}
+config="${CONFIG:-/home/$USER/.config/resilio-sync/config.json}"
 command_args="--config $config ${OPTS}"
 start_stop_daemon_args="-q"
 retry="10"
diff --git a/net-p2p/resilio-sync/files/resilio-sync-user.service b/net-p2p/resilio-sync/files/resilio-sync-user.service
index 6c82440ac679..bb57c738b6d5 100644
--- a/net-p2p/resilio-sync/files/resilio-sync-user.service
+++ b/net-p2p/resilio-sync/files/resilio-sync-user.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Resilio Sync service
-Documentation=http://help.getsync.com/
+Documentation=https://help.resilio.com
 After=network.target network-online.target
 
 [Service]
diff --git a/net-p2p/resilio-sync/files/resilio-sync.confd b/net-p2p/resilio-sync/files/resilio-sync.confd
index 08c4255fe296..7d8e9ea27cff 100644
--- a/net-p2p/resilio-sync/files/resilio-sync.confd
+++ b/net-p2p/resilio-sync/files/resilio-sync.confd
@@ -5,8 +5,8 @@
 OPTS="--log /var/log/resilio-sync/resilio-sync.log"
 
 # User and group daemon runs as
-USER="rslsync"
-GROUP="rslsync"
+RSLSYNC_USER="rslsync"
+RSLSYNC_GROUP="rslsync"
 
 # Resilio Sync config file
 #CONFIG="/etc/resilio-sync/config.json"
diff --git a/net-p2p/resilio-sync/files/resilio-sync.initd b/net-p2p/resilio-sync/files/resilio-sync.initd
index 3e64f108e18a..8a7263446a5f 100644
--- a/net-p2p/resilio-sync/files/resilio-sync.initd
+++ b/net-p2p/resilio-sync/files/resilio-sync.initd
@@ -1,18 +1,17 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/rslsync"
 name="Resilio Sync"
 description="Resilio Sync"
-command_user="${USER:-rslsync}:${GROUP:-rslsync}"
+command_user="${RSLSYNC_USER:-rslsync}:${RSLSYNC_GROUP:-rslsync}"
 pidfile="/run/resilio-sync/resilio-sync.pid"
-config=${CONFIG:-/etc/resilio-sync/config.json}
+config="${CONFIG:-/etc/resilio-sync/config.json}"
 command_args="--config $config ${OPTS}"
 start_stop_daemon_args="-q"
 retry="10"
 
 depend() {
 	need net
-	provide resilio-sync
 }
diff --git a/net-p2p/resilio-sync/files/resilio-sync.service b/net-p2p/resilio-sync/files/resilio-sync.service
index 32f24a95aa84..1f1a0b95bc72 100644
--- a/net-p2p/resilio-sync/files/resilio-sync.service
+++ b/net-p2p/resilio-sync/files/resilio-sync.service
@@ -1,15 +1,17 @@
 [Unit]
 Description=Resilio Sync service
-Documentation=http://help.getsync.com/
+Documentation=https://help.resilio.com
 After=network.target network-online.target
 
 [Service]
 Type=forking
-User=rslsync
-Group=rslsync
 UMask=0002
 Restart=on-failure
 PermissionsStartOnly=true
+
+User=rslsync
+Group=rslsync
+
 PIDFile=/var/run/resilio-sync/resilio-sync.pid
 ExecStart=/usr/bin/rslsync --config /etc/resilio-sync/config.json
 
diff --git a/net-p2p/resilio-sync/metadata.xml b/net-p2p/resilio-sync/metadata.xml
index 35827ed4235b..1e9a6697329a 100644
--- a/net-p2p/resilio-sync/metadata.xml
+++ b/net-p2p/resilio-sync/metadata.xml
@@ -18,7 +18,7 @@
 		<flag name="pax_kernel">Use paxctl to mark binaries</flag>
 	</use>
 	<upstream>
-		<doc>https://help.getsync.com/</doc>
-		<bugs-to>https://help.getsync.com/hc/en-us/requests/new?ticket_form_id=91563</bugs-to>
+		<doc>https://help.resilio.com/</doc>
+		<bugs-to>https://help.resilio.com/hc/en-us/requests/new?ticket_form_id=91563</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/resilio-sync/resilio-sync-2.6.1.ebuild b/net-p2p/resilio-sync/resilio-sync-2.6.1.ebuild
new file mode 100644
index 000000000000..f4738e0d4d9a
--- /dev/null
+++ b/net-p2p/resilio-sync/resilio-sync-2.6.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles unpacker user
+
+QA_PREBUILT="usr/bin/rslsync"
+BASE_URI="http://linux-packages.resilio.com/${PN}/deb/pool/non-free/r/${PN}/${PN}_${PV}-1_@arch@.deb"
+
+DESCRIPTION="Resilient, fast and scalable file synchronization tool"
+HOMEPAGE="https://resilio.com/"
+SRC_URI="amd64? ( ${BASE_URI/@arch@/amd64} )
+	x86? ( ${BASE_URI/@arch@/i386} )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+DOC_CONTENTS="You may need to review /etc/resilio-sync/config.json\\n
+Default metadata path is /var/lib/resilio-sync/.sync\\n
+Default web-gui URL is http://localhost:8888/\\n\\n"
+
+pkg_setup() {
+	enewgroup rslsync
+	enewuser rslsync -1 -1 /var/lib/resilio-sync rslsync
+}
+
+src_unpack() {
+	unpacker_src_unpack
+
+	unpack usr/share/man/man1/resilio-sync.1.gz
+}
+
+src_install() {
+	dobin usr/bin/rslsync
+	use pax_kernel && pax-mark m "${ED%/}"/usr/bin/rslsync
+
+	doman resilio-sync.1
+
+	newinitd "${FILESDIR}"/resilio-sync.initd resilio-sync
+	newconfd "${FILESDIR}"/resilio-sync.confd resilio-sync
+	newinitd "${FILESDIR}"/resilio-sync-user.initd resilio-sync-user
+	newconfd "${FILESDIR}"/resilio-sync-user.confd resilio-sync-user
+	systemd_dounit "${FILESDIR}"/resilio-sync.service
+	systemd_douserunit "${FILESDIR}"/resilio-sync-user.service
+	newtmpfiles "${FILESDIR}"/resilio-sync.tmpfile resilio-sync.conf
+
+	readme.gentoo_create_doc
+
+	# Generate sample config, uncomment config directives and change values
+	insopts -orslsync -grslsync -m0644
+	insinto /etc/resilio-sync
+	newins - config.json < <("${ED%/}"/usr/bin/rslsync --dump-sample-config | \
+		sed \
+			-e "/storage_path/s|//| |g" \
+			-e "/pid_file/s|//| |g" \
+			-e "/storage_path/s|/home/user/.sync|/var/lib/resilio-sync/.sync|g" \
+			-e "/pid_file/s|resilio/resilio|resilio-sync/resilio-sync|g" \
+			|| die "sed failed for config.json" )
+
+	diropts -orslsync -grslsync -m0700
+	keepdir /etc/resilio-sync /var/lib/resilio-sync/ \
+		/var/lib/resilio-sync/.sync /var/log/resilio-sync
+}
+
+pkg_postinst() {
+	tmpfiles_process resilio-sync.conf
+	readme.gentoo_print_elog
+}
diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index 02d26a5690fa..c078ee73b869 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -5,11 +5,15 @@ DIST xmr-stak-2.4.4.tar.gz 337845 BLAKE2B d66e650aea8a299ec77c183b321330ca1a3fae
 DIST xmr-stak-2.4.5.tar.gz 338482 BLAKE2B 4f51925d86baab4a7a78803b45264ad731ac51d837e7f84138f4e82e14cd13a57b7f870f6e66f8306a09df0211dd65ca6998bfa1b0a55e97020cb63287b70c9c SHA512 22cb3c97b9e85ec50091e093488256beb484a9bcdd0496185531095c5e64289814873ac659dc0c71d01adccacf1394019aeff33d7fab4e71af3ae65545219f04
 DIST xmr-stak-2.4.6.tar.gz 340081 BLAKE2B 10520af3e696632c938e753acc1bd3a0439b1f240837e60eba0402a2efabc9ae493b85310a3c6ec27c6fca914955546854f12bea915c808e9b809a1b9af83653 SHA512 9f32af76f3043abee0c8bd8a46e239b07459c1ed800fa3afb4db022a9751ce7c8023fb5cbd79564323d2e625796fa6e05203501123de7a83cd9e22da951ccec2
 DIST xmr-stak-2.4.7.tar.gz 340026 BLAKE2B c6f898201ee744dea4aebf9bb3541efa7e5b78b740158c03ab044136eb8bdc768edb2118fa9f0eb48024aa70d52da7f281eb0443a42d4765bf3b7e39e98601fc SHA512 91557c88ec36cc96eaacfa71474a5d9e5ac8815904221bd588417b0b077cddef15c28bac62cadea8b7701ce87af8d8a43a911e6523a0bbad99577398e2f0056e
+DIST xmr-stak-2.5.0.tar.gz 356770 BLAKE2B faf4fe59b8038e3bdac8941a6bac8939e1244d258ea704df346252bb2b3dc9b82dc5cd3f57afda208253ddfa2be12256ff2d473729403f30c96aabc4ba9c0073 SHA512 11b59e4c11a75c9fdc500f835ce91584d71c128df1efe5170b4cf787897f729a38c4738bb20de52a78dd5d3506e31bb048f8b801cc73a6fefcc045ae0d94ee3d
+DIST xmr-stak-2.5.1.tar.gz 357295 BLAKE2B cbb91144f56abb3bb21d9b56d0e530847081698a90260e9e01f055138ff61a62e939e7546f359ac48afd3fb1d6b1bd7c10dc46c7ae628df02ec6d7a14e73f6dd SHA512 3899476430b50cf697588bce9b8b821c1cb6a5c4c24f0fa31c36030246a8092f6e3f959b8c0548fe26967d49cd0943843a53e49bf7420710382120292f1f2d2e
 EBUILD xmr-stak-2.4.3-r1.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
 EBUILD xmr-stak-2.4.4.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
 EBUILD xmr-stak-2.4.5-r1.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
 EBUILD xmr-stak-2.4.5.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
 EBUILD xmr-stak-2.4.6.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
 EBUILD xmr-stak-2.4.7.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
+EBUILD xmr-stak-2.5.0.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
+EBUILD xmr-stak-2.5.1.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-9999.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
 MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb
diff --git a/net-p2p/xmr-stak/xmr-stak-2.5.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.5.0.ebuild
new file mode 100644
index 000000000000..59442f8065c5
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.5.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:0= )
+	webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use devfee; then
+		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCUDA_ENABLE=$(usex cuda)
+		-DHWLOC_ENABLE=$(usex hwloc)
+		-DMICROHTTPD_ENABLE=$(usex webserver)
+		-DOpenCL_ENABLE=$(usex opencl)
+		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+	doinitd "${FILESDIR}"/${PN}
+	dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+		ewarn "To use xmr-stack:"
+		if use cuda || use opencl; then
+			ewarn "As root or as a user that is a member of the 'video' group,"
+		fi
+		ewarn "run:"
+		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt"
+		ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+	fi
+}
diff --git a/net-p2p/xmr-stak/xmr-stak-2.5.1.ebuild b/net-p2p/xmr-stak/xmr-stak-2.5.1.ebuild
new file mode 100644
index 000000000000..59442f8065c5
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.5.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:0= )
+	webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use devfee; then
+		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCUDA_ENABLE=$(usex cuda)
+		-DHWLOC_ENABLE=$(usex hwloc)
+		-DMICROHTTPD_ENABLE=$(usex webserver)
+		-DOpenCL_ENABLE=$(usex opencl)
+		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+	doinitd "${FILESDIR}"/${PN}
+	dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+		ewarn "To use xmr-stack:"
+		if use cuda || use opencl; then
+			ewarn "As root or as a user that is a member of the 'video' group,"
+		fi
+		ewarn "run:"
+		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt"
+		ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+	fi
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 858805f6549b..ddcb38b7017e 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 761899c029dd..9cf9f5b8ed36 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -3,8 +3,10 @@ AUX cups-filters-1.20.4-poppler-0.67.0.patch 826 BLAKE2B 0d85c9e27c588f2bd3c3535
 DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
 DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07
 DIST cups-filters-1.21.2.tar.xz 1473008 BLAKE2B fea7f0f92464f5e95f57f71b6f6bb5acc9cd6ccb8c97a6a54a40be4f462b76603879f85c9ae0a0c5f47d113e6de9642ee9707d7af1b5cf93f3c47a619db2be55 SHA512 07672737108e1593374fa95582e2c8ad7a3fec6202846ba85224c1c89f65b7b89de96ebf67841ec5d948fe556dddd06ae6a58ad6c5c0a25a82ce643c9384aaf0
+DIST cups-filters-1.21.3.tar.xz 1474152 BLAKE2B 7e5193b6d6989675fa9567cb76b7f29f411b28e251ff9c6fd8fafec9c9c3d914f21d7e51eb562820954b3cee70974c5a55351eb08a1f231fe820513a2ce92644 SHA512 2b00023ac4177046e3ab3c5b563b7bd92bb49e57e645e6e67e7b9358d00919e2d4ca43ef5d57684523d97f1f1df5d1014fc0a3a895476ce285ccb3ed2e3bc758
 EBUILD cups-filters-1.17.9.ebuild 3495 BLAKE2B 0354831007a19a9a5fc00152e52fec2d95a0b35adfb498278c3312cbcf00ecfc62f717e353e21085b1c55462ba81bb8aed9e60e8d439a5dbe9da9af838b2db92 SHA512 35391fc1cc809d8fbc2c7ba4944924244ea1f97bb14180532b30f841c2a6a8da3fc8e34def58417d11fc604821d010914d8f6462ce4fca69c44adcd754169d3e
 EBUILD cups-filters-1.20.4.ebuild 3558 BLAKE2B 3063fe64d43deea9c064553fb9da520a8c8d59fc113b1d26ce7e4a53d1b3a9d840b6cd0ad36bc22fac39ccc69ff85bbc7ece6aef98d6f5216c789bade6a8664f SHA512 d465bdd8dca34d128de311af00fe7b4787a854598c6ed976dc51527bfea7a3b433c3b2008afa42066c912c9c99194c66258351fbed8808f0991e149348ab64b7
 EBUILD cups-filters-1.21.2.ebuild 3502 BLAKE2B 17085b5c41c8e20f5c829a0a0ee3a19f646e056d5884be0d49bb1e53ca2b563b4d2d55aaba633d0aae9cb1d3f8a02495b2b539cfb7b5293ebfb05ee2c6544488 SHA512 1f49982ee5ce6d0a6c572d01abb3afb7744d8cab6b26284365c1716eb93f78926eec580bb0be5fc3951fa6aaf2abc96c7f9692a2c6da1a1ed9d5eb1cbece6ef6
+EBUILD cups-filters-1.21.3.ebuild 3499 BLAKE2B 3d905b568e5a6b0e35eedf4bf36d6e0cd8a4674ff5c9231f7060025042ce2bca9e57d7ae0e3eb17aa0a3ed3fdfdbf05867007374cb36bde15c2fdac3f7c6d4be SHA512 c05043f224c2b15b380057296fb263c5152677507b0a3ca5ddc87cdd68ac04083b996776328ea334a58cc458e4dbf08a0be3ea36b5f64798a86bd8d21a5827b4
 EBUILD cups-filters-9999.ebuild 3502 BLAKE2B 17085b5c41c8e20f5c829a0a0ee3a19f646e056d5884be0d49bb1e53ca2b563b4d2d55aaba633d0aae9cb1d3f8a02495b2b539cfb7b5293ebfb05ee2c6544488 SHA512 1f49982ee5ce6d0a6c572d01abb3afb7744d8cab6b26284365c1716eb93f78926eec580bb0be5fc3951fa6aaf2abc96c7f9692a2c6da1a1ed9d5eb1cbece6ef6
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.21.3.ebuild b/net-print/cups-filters/cups-filters-1.21.3.ebuild
new file mode 100644
index 000000000000..bf15e18628e9
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.21.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr autotools
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-8.1.0:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pclm? ( >=app-text/qpdf-8.1.0:= )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	test? ( media-fonts/dejavu )
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == "9999" ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ipp_autosetup auto-setup-driverless)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable postscript ijs)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index b6c36e94a986..01740cfc8608 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,4 +1,8 @@
 DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed
+DIST hplip-3.18.6-patches-1.tar.xz 10612 BLAKE2B 5fade89a54b5db9002ada0b1819b41cc177d1a709bdb74a32359927ddac35445275bbbbbdec4bcf64a8413fba94bde66c5f4eda2a8a460cc13afc187c59aa388 SHA512 ee1e4848ec7060aed688fb46263f87838a3116666a4d0161dd414ef6b4231c23a11090679d2525c65c2686838436735427a40de0ad80bca4cd5c48eff5207c59
+DIST hplip-3.18.6-patches-2.tar.xz 10632 BLAKE2B 7f0732e082bf44bfd5818a86f35f95a61c5ec6d0218a2be448746a950081d6fb551aea8183763de20154ab40f77f430941d14fa537e367f59d05fc9f0f182f7c SHA512 94be17d18075ea702a1fedec7ae9cc8ac55dfe5d0b2f8f4004412ae3bb84140aac11bb7f45d0ef8f06cbd560daa37859f14aedce87dc39b8368dbd07c7b85733
 DIST hplip-3.18.6.tar.gz 22590564 BLAKE2B edbc80120bb332de9848e528095839b8f3496404ae83482a17bb8bd196c30dd8d3fca4d3dbb60c048bfbeeddd4384b4d7844798dad993eaf52d5418a9391b4ad SHA512 deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f
+EBUILD hplip-3.18.6-r1.ebuild 7732 BLAKE2B 3aede7f2852e97e929d09163db6dcc25133debd868cba05d5623b8c3b4e530ff5dcd37e4ee84c2a5f47d45ca6ccc6291b6be7424f5e3199dbe397dce235a570d SHA512 b540c9f7f95706f42df678469efe32d9ad6e28181fd115d75baa095da05f1835ab7d8862cb76048685c12e1dab5628dded2fc66b7bc3c6857207e3e521a4b903
+EBUILD hplip-3.18.6-r2.ebuild 7732 BLAKE2B 19746e3f88431c49a7e6cdcc69f321120e6bb6f2a52985b43aee4d3f4098c19173d3c3509a5b87cff19a900629c9ff8e49f4cb8418a2b2c85dc69d8d7c5b4af0 SHA512 5acd5ca51222b736adeb8fbd5628d27855ecbba8a228327d9f1b46266317df01ff125a234074b68041eaded9c036d3079ac6128094f96f586d147bbe7c74419a
 EBUILD hplip-3.18.6.ebuild 7817 BLAKE2B 0a3ae6abfb6db06d51c13fae58cd90f17246bac765ba7e69d5632163ac8b2e521f5be379e2b6cf179b821fe1c3b4f215c710bce4c44a3628d611e3c8490023fa SHA512 f5793ed25258974257e4b8e6099b6d43ef52a18f37cac925e8af607e6f27f01e165549e490ed5c86f6f2d3655d1283dc1bc6c47dfce773f72d40faabce61928e
-MISC metadata.xml 1767 BLAKE2B 67ab6b778637b42f5849699aa506c48844ea510a6528c2e62e54164a1d4502def06f0461bb79e9ea525b09026b502039719dfb42d9168738822e4fd588989196 SHA512 eab26de132a410104ad260bf09962702fdc0c554261511264d4d95375a7afa07fa5b902115e4a500d5371e54f483c6f655f6d0c1fbc387e46f10e98d20b842b3
+MISC metadata.xml 1829 BLAKE2B 614757c5958bb24f223c75a252beb06014bfe7f47cfe58feb88be89918394224b7075e0d444d7bb898f9f478c2ae5cf572df3f905ff110ec1153cf1849cc8e46 SHA512 c6aae86cd5a200b7d42336f0884b87dc0b74d2b2216b8002929a56a53f42ec02447684eb8d0411e30ef707e01d930aac446866796c781f95a3463f84901666f6
diff --git a/net-print/hplip/hplip-3.18.6-r1.ebuild b/net-print/hplip/hplip-3.18.6-r1.ebuild
new file mode 100644
index 000000000000..687d6294c019
--- /dev/null
+++ b/net-print/hplip/hplip-3.18.6-r1.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.6-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+		kernel_linux? ( virtual/udev )
+		qt5? (
+			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
+		)
+		scanner? (
+			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+			X? (
+				|| (
+					kde? ( kde-misc/skanlite )
+					media-gfx/xsane
+					media-gfx/sane-frontends
+				)
+			)
+		)
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		--enable-hpps-install \
+		--disable-class-driver \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-print/hplip/hplip-3.18.6-r2.ebuild b/net-print/hplip/hplip-3.18.6-r2.ebuild
new file mode 100644
index 000000000000..a7c9aebea45e
--- /dev/null
+++ b/net-print/hplip/hplip-3.18.6-r2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.6-patches-2.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+		kernel_linux? ( virtual/udev )
+		qt5? (
+			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
+		)
+		scanner? (
+			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+			X? (
+				|| (
+					kde? ( kde-misc/skanlite )
+					media-gfx/xsane
+					media-gfx/sane-frontends
+				)
+			)
+		)
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		--enable-hpps-install \
+		--disable-class-driver \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 243ad8e5b591..52a5e27617f0 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="hpcups">Build the hpcups driver for cups (by HP)</flag>
 		<flag name="hpijs">Build the IJS driver for cups (Foomatic)</flag>
 		<flag name="kde">Enables <pkg>kde-misc/skanlite</pkg> as scanner GUI with USE="scanner X"</flag>
+		<flag name="libnotify">Enables desktop notifications</flag>
 		<flag name="libusb0">Depend on <pkg>virtual/libusb</pkg> SLOT 0. Some old printers do not work with <pkg>virtual/libusb</pkg> SLOT 1.</flag>
 		<flag name="minimal">Only build internal hpijs/hpcups driver (not recommended at all, make sure you know what you are doing)</flag>
 		<flag name="parport">Enable parallel port for devices which require it</flag>
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 02865ee65a77..8c39e99f49d1 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest
index 20e26bf43643..f689f67ca705 100644
--- a/net-proxy/http-replicator/Manifest
+++ b/net-proxy/http-replicator/Manifest
@@ -13,5 +13,5 @@ AUX http-replicator.service.conf 164 BLAKE2B 28006ec4c4b27eb1f75276432e30c0f9b33
 DIST http-replicator_3.0.tar.gz 39291 BLAKE2B a97d8b6b32f5d4ca4feefa9abaa7da7cb6570f76566c79d7371134c0edd74b2333a02480deff02fa1bf5b6cd6f2bfbfe4aaa649633d70bd2efbdd22701422651 SHA512 d98a608c38201db6f2d8ba809a4777ab5588f5ed395882bdf542c2788df1770c61a2de160604c09297d847f2c73463ba0530d7f2c2e482467f8e8f35be068d57
 DIST http-replicator_4.0alpha2.tgz 27575 BLAKE2B 48138bc8fa9695ddb31ce89c4638adda4a1d1b58c904cd98d0ee1dbab006f79ef7d19495db8eb4de0113f8e45da425950524c48ec9e3e864d8595ccdef9f7cfa SHA512 437e0cc881af0cb8f84bfd1366bb6edeee4f76112c4b2ac2af4bcb8809462852b96e9c99e04c8f370492c9e1eb33ddc68a85c4f09b073694242cd6c05b4d3a6c
 EBUILD http-replicator-3.0-r7.ebuild 3443 BLAKE2B 6b68836ebc6bb27f6ad76c9619b6b00069b9ea676ec9abf0b6b81a75d40e00062d650c3fdff1e8022b33ba5a517f590a440c7e159e498fa63379c6cdbb664996 SHA512 f2fca6973f801d66755cc5f79d19e44cab08d70211739d5cf0e8f4d25c66893afe79ca9126a8091477dbca75cfa797b334b6e11d236396c4505060ddbcf8a538
-EBUILD http-replicator-4.0_alpha2-r5.ebuild 1992 BLAKE2B fd9fb9eedab0f1e453fbcdb05ce951162a6de5709264140cde66e346b30954540ea1e901361e5251d47355e02a26fbefafd55047241bba17d93f78ca6cf1538e SHA512 2ced4476b701ddb536ec732f7623d22bd921510828706f25872411e26371ed9382836b24e49664bfff95725d9419228c25cccd28149dfcccb4c216db0d45faa5
+EBUILD http-replicator-4.0_alpha2-r6.ebuild 1995 BLAKE2B d8986ffdba23c817e7e4d84dd6f3d62889413db418944dd4fa1983b7b1d82eb94c63fa21e9cfc13d91ff26d684f12a52f09f579ac7981e4be387015f419abeaf SHA512 0a2ee980380061b5c3bdd82efe8003391ea78b3526c2a98608cb87b67571319d49d3217da927c1cf87a9a06e7fcd00a4a92fe7ae80a634b6533950b54b81957e
 MISC metadata.xml 252 BLAKE2B 5386635b038f2498cadf1730fa7ae823427900b961296f4acca678ea12eb7c66ed7ad6cbca15afd26042c7af8d687958c702a9c48fc00856b460e2b49e55b2ac SHA512 ffd7c4cd77545f753618c9e9cfeba05b557044879ce332c01deaad820e184329cf383c8488ba777e9653029d3f75e5c99936ca225ebc4a5fb9b4d4e257ba8e7d
diff --git a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r5.ebuild b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r5.ebuild
deleted file mode 100644
index 6810108b67b9..000000000000
--- a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r5.ebuild
+++ /dev/null
@@ -1,72 +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 python-r1 systemd
-
-MY_P="${PN}_${PV/_/}"
-
-DESCRIPTION="Proxy cache for Gentoo packages"
-HOMEPAGE="https://sourceforge.net/projects/http-replicator"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# Tests downloads files as well as breaks, should be turned into local tests.
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0_alpha2-r3-pid.patch
-}
-
-src_test() {
-	./unit-test && die
-}
-
-src_install() {
-	python_foreach_impl python_doscript http-replicator
-
-	newbin "${FILESDIR}"/${PN}-3.0-callrepcacheman-0.1 repcacheman
-
-	python_foreach_impl python_domodule *.py
-
-	python_foreach_impl python_newscript "${FILESDIR}"/${PN}-3.0-repcacheman-0.44-r2 repcacheman.py
-
-	newinitd "${FILESDIR}"/${PN}-4.0_alpha2-r3.init http-replicator
-	newconfd "${FILESDIR}"/${PN}-4.0_alpha2-r2.conf http-replicator
-
-	systemd_dounit "${FILESDIR}"/http-replicator.service
-	systemd_install_serviced "${FILESDIR}"/http-replicator.service.conf
-
-	dodoc README.user README.devel RELNOTES
-}
-
-pkg_postinst() {
-	echo
-	einfo "Before starting ${PN}, please follow the next few steps:"
-	einfo
-	einfo "- Modify /etc/conf.d/${PN} if required."
-	einfo "- Run \`repcacheman\` to set up the cache."
-	einfo "- Add HTTP_PROXY=\"http://serveraddress:8080\" to make.conf on"
-	einfo "  the server as well as on the client machines."
-	einfo "- Make sure GENTOO_MIRRORS in /etc/portage/make.conf"
-	einfo "  starts with several good HTTP mirrors."
-	einfo
-	einfo "For more information please refer to the following forum thread:"
-	einfo
-	einfo "  https://forums.gentoo.org/viewtopic-t-173226.html"
-	einfo
-	einfo "Starting with 4.x releases, the conf.d parameters have changed."
-	echo
-}
diff --git a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r6.ebuild b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r6.ebuild
new file mode 100644
index 000000000000..67f093d09fef
--- /dev/null
+++ b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 readme.gentoo-r1 systemd
+
+MY_P="${PN}_${PV/_/}"
+
+DESCRIPTION="Proxy cache for Gentoo packages"
+HOMEPAGE="https://sourceforge.net/projects/http-replicator"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/portage[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# Tests downloads files as well as breaks, should be turned into local tests.
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Before starting ${PN}, please follow the next few steps:
+
+- Modify /etc/conf.d/${PN} if required.
+- Run \`repcacheman\` to set up the cache.
+- Add HTTP_PROXY=\"http://serveraddress:8080\" to make.conf on
+the server as well as on the client machines.
+- Make sure GENTOO_MIRRORS in /etc/portage/make.conf
+starts with several good HTTP mirrors.
+
+For more information please refer to the following forum thread:
+https://forums.gentoo.org/viewtopic-t-173226.html
+
+Starting with 4.x releases, the conf.d parameters have changed.
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.0_alpha2-r3-pid.patch )
+
+src_test() {
+	./unit-test && die
+}
+
+src_install() {
+	python_foreach_impl python_doscript http-replicator
+
+	newbin "${FILESDIR}"/${PN}-3.0-callrepcacheman-0.1 repcacheman
+
+	python_foreach_impl python_domodule *.py
+
+	python_foreach_impl python_newscript "${FILESDIR}"/${PN}-3.0-repcacheman-0.44-r2 repcacheman.py
+
+	newinitd "${FILESDIR}"/${PN}-4.0_alpha2-r3.init http-replicator
+	newconfd "${FILESDIR}"/${PN}-4.0_alpha2-r2.conf http-replicator
+
+	systemd_dounit "${FILESDIR}"/http-replicator.service
+	systemd_install_serviced "${FILESDIR}"/http-replicator.service.conf
+
+	dodoc README.user README.devel RELNOTES
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index a706a1440214..5ec53991871e 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -1,9 +1,15 @@
+AUX tinyproxy-1.10.0.initd 855 BLAKE2B 4bd9a260a930958ea449a08edce1f9e8633429a5222a3ea7254b4bdc03808c5f9f87d9b33556f345e305d28e155834b33ff2a952c041af582cae3bedbae2034d SHA512 cd440ed686e8128ed46441ca29da8376c4d28e9e34ae9b85c18eb2f1681d60c0c04b79401a7368f917eeab6768965d6c867d0ac6578a7858557c11b356446c02
+AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca809aca67b658bb13917869e5203d66730f52670fb9030dd9f6cf249d09f357bbdd143436f6b358377d8f78036 SHA512 7721b986326f82b03d79983be33047fdf4b37b5c63992645a321bf8bd3edea63680a2bf81b2d51fbeab2a5884773a0598dba14f9d597d3db0eea7c7f6b4c79d3
 AUX tinyproxy-1.8.1-ldflags.patch 306 BLAKE2B 2a21760a37ccb0bff53cf1c89c220363d32cbca7f4738f65ab3e99b0609edba6796473600919b8ecd8537d57ca40fdb55ae40e213605ab008b3fe9958e1795f7 SHA512 d9daf50c1fcd2237ec59e7701adce76ba09347193439a1940c24e942600ab10bfc192e6c30a3fbcc3e1194f52b7aaab2fe5ef69468c01041f1a9d5fc6deacc8b
 AUX tinyproxy-1.8.1-minimal.patch 109 BLAKE2B 8ff9e2678150bcbef92c3e83a8e2b9996cfcce7aee50cddd2f61bed75af5e12e2694f5574df8f8fcbb54decdb4f791532df5ff9b6dad9bf0e47cb31a4f310a8f SHA512 56126f4e315dfade7983a9961ab3a30687e5fb575d9fd0964f081cb1e4be718f54b3999f69f769832717ebae1dd832aaff5e60289b465976b2f95325af48d79d
 AUX tinyproxy-1.8.3-r2-DoS-Prevention.patch 6100 BLAKE2B 81ee5fdbba35d02fc03d20b145a455ea0349bb03360b8fe7f797d9bde5c1cee188f1bb82e1d7a5535ff1566197ba3c22d1bf2885d666bc848cdf8602038fcfcd SHA512 ea023535ecf5fc9b0ab63d5e3ab4fe6222a54218de43894699ae742ff89e38ba65ea2a601f17de130e1169f37b0b7189ec55af471074222aecd827104d8f4ce0
-AUX tinyproxy-1.8.3-r2.initd 848 BLAKE2B 8c00d28e4c2a7731043e26b47bbd08fff21f92519dbd7beae0a8a4ffd6fae224a56be89bb1e97daea24a68b20bbdb35c548784d0405ebcb33792362cd4218c4f SHA512 424533167e6c50f6061190123203121f46d9e4e725de779ecb09a8695a8d3a22adb9b966de427cc9100a541ec0f12862323233af5a5b04dcb53357d332335098
+AUX tinyproxy-1.8.3-r2.initd 845 BLAKE2B 476c8e1b6ab41c42c65429fc031f8c58a2baa3298103b5d0550acec2d7b5909e6f4007d0a243042101a95e83aea49954dd19351527dad8e993ddc1c3768774e2 SHA512 b9baebf7d718b0acd3ee0c824c93cab836ae3233113b07d53e6aae204418992a9e9db83d8fceae949f36a72d000c6521efe3b0698421ee1561bb9201cd18d5e3
 AUX tinyproxy.service 172 BLAKE2B d2e6199bfee2bac52e08d4c5506131f19e2630ebe1d9ed12f71d575cef37454c229e9e08b1fc89d9e26052a1192913289ed3602d69686d6894eb68b8639e7a5a SHA512 4c4cd36a7e34d9ee27c05475b72d1b61f90592ccb44c9deb96a1375bb681b7901702f078ed24b7c633074c83e450275a4a66829f3b270f75fc786a50d1ef393f
 AUX tinyproxy.tmpfiles.conf 48 BLAKE2B f2cd35878580eb198920f5db8493e3e266b4325160a9590a0b59bef1cf0577d0129bb636d99442cdb2154b444a8cdc1c6d01b4850b57df774be00338c61902e4 SHA512 24440cdaed0af6cbdb191acb1769e0a17871ef95e03e62a6621a413a2616e5d90d748d909bb5d18c029b25d7bf91485dbe46ee11e8703a1cb9008be470536715
+DIST tinyproxy-1.10.0.tar.xz 176060 BLAKE2B 58f9b443c731de6b74d689a80ebd422d3b6f51f643546ee144b37fb3262725246f6a5fa1015267a94f192f8715eaf71ffc078ead75e6225a210f58ec28ee8fcf SHA512 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5
 DIST tinyproxy-1.8.3.tar.bz2 202430 BLAKE2B 1f85d6eb3a1b2cebe752f15e51869882c58f7dcafb2518511dd8c83c44a010a1cdac93e40e2c1f177a7687b126925258c79ff56011a42addd710b2009d546313 SHA512 69f1262b39d37f44a42621a0d25985632cdb790c8d9b49335a49a68c0f5237b97b111252856cba119895ac066770645560d2d7cd2de31f02103fa55fb4b3290c
-EBUILD tinyproxy-1.8.3-r4.ebuild 1968 BLAKE2B 8cf139adefc20e033e4678a9a97b38e9ff054d8271ee18e168d5944e73a70e7ceb88098a6fdf7a426fb982707d5635224024e6c75a0e9c883bf67419edf1d06e SHA512 63f04e0b44a85b1ba26275ddf72ce1a752702349a28da8ca01ff5fb014a45fbbd2abb0097403eec9f8e2d39b41fed2a89b39ba0183b2bf6be87f0fc76bf3d554
-MISC metadata.xml 567 BLAKE2B 2ba501cca993b35f40a39e8935c57d622760d4c9dee07868723b112595411475cf24c612ef8b3a0ed1fb07c0f8d374cbd758e95c8d034d5c3e03f4940a64bded SHA512 58a7a1bb222e94bc0104bcbda8860a3cff2b6e4f3036c3e797188396e0f55e7b2314d5df77009898c478a933fe17b372c1b656fa8728fe5161e4e9b18fc54c6f
+DIST tinyproxy-1.8.4.tar.xz 192300 BLAKE2B bc425ab40d5d5fb49111d74d67e7ac848d77ad4be87039b34543a118df317839aa529c6b9ca52f1eafe933e7d344e09770a76ed0184181591483c6b3f1d79243 SHA512 23398a2c8a6d926b371086ba96032d0fd8dd06d114edf24950b868f53bb6b4235cd0f5d6b9a0131879fcc16bbe6b71142a6855de593a937ef7b0c323b50e0aec
+EBUILD tinyproxy-1.10.0-r1.ebuild 1665 BLAKE2B bf45228833548cb2b1c72aac45b7ad639721af0cded7f6e5b6c88c153d01d7ea09cb409d37da2d4f8820b4bbcdb33c1f0f51618323dc12b8d42d41724e5acf64 SHA512 919ba85f49262335636e06a017707386c761795c71425daace940fbabcce614f2569d1912a4b3a06a15753f799fc172374f524f6a7ff510e7ac6bdbf4304b98a
+EBUILD tinyproxy-1.8.3-r4.ebuild 1965 BLAKE2B ff4e4b323dd7873329f8a0aeb13eec050a4f0ff1064faefb3da3dd58ed09650f1a889994c761a8d39bbc148e9efbc8fca3a474c16bb952040382d69a9e219081 SHA512 254ff872b2a6b0b837b6c43b83edcabf521d3bbf18f1cfdd45fd7f8e17f2202c35c4f8d7b365a9438a7eefd284f946df501c46df662c3d3e19847209bce69e8b
+EBUILD tinyproxy-1.8.4.ebuild 1847 BLAKE2B 16a1971bdd5c8f0f0304e217baccb189129d4e7bb2aa2ef0093304f079db567cb7a3321d2b41b95e34070a8338815bc2e06c88738e517eec229607df565ea414 SHA512 f5025431d4a18e1c5ee5e5012306651bed8ebce5bef193d254be55414aa30119c03122c321dfbbe7c5b3ce09ef141436c6408921adfca74aa5e899f18864d82f
+MISC metadata.xml 627 BLAKE2B 3acd13c1d7a698ad83efa30c8471d5241533d66c09c103cda58c20d420d3bec2de5fcd42535d6b0b8197ae1d1aea445674e563177237ee20c348beeaf44aaf2d SHA512 96b439d626b40c45952059c1e3599a0e1743e50644c605e1519e685337a3eff806c73a8e1b3fd13920908d44eb256bc39657c9c76535a8806193581053e7a657
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.10.0.initd b/net-proxy/tinyproxy/files/tinyproxy-1.10.0.initd
new file mode 100644
index 000000000000..48688a2c19c5
--- /dev/null
+++ b/net-proxy/tinyproxy/files/tinyproxy-1.10.0.initd
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+get_config() {
+    res=$(awk '$1 == "'$1'" { s=$2 } END { print s }' "$CONFFILE")
+
+    if [ "x$res" = "x" ]; then
+	echo "$2"
+    else
+	eval echo "$res"
+    fi
+}
+
+: ${CONFFILE:="/etc/${SVCNAME}/${SVCNAME}.conf"}
+
+command=/usr/bin/tinyproxy
+command_args="-c ${CONFFILE}"
+pidfile=$(get_config PidFile /run/tinyproxy/${SVCNAME}.pid)
+
+depend() {
+	config "$CONFFILE"
+
+	use dns
+
+	[ "$(get_config Syslog Off)" = "On" ] && \
+	    use logger
+}
+
+start_pre() {
+    piddir=$(dirname ${pidfile})
+
+    if [ "${piddir}" = "/run" ]; then
+	eerror "Please change your PidFile settings to be within the"
+	eerror "/run/tinyproxy directory"
+	eend 1
+    else
+	checkpath -d -o $(get_config User tinyproxy):$(get_config Group tinyproxy) ${piddir}
+    fi
+}
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.10.0.service b/net-proxy/tinyproxy/files/tinyproxy-1.10.0.service
new file mode 100644
index 000000000000..e78310098778
--- /dev/null
+++ b/net-proxy/tinyproxy/files/tinyproxy-1.10.0.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Tinyproxy Web Proxy Server
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/tinyproxy -d -c /etc/tinyproxy/tinyproxy.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd b/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd
index 9df4ef5046d7..0d6618b69a9a 100644
--- a/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd
+++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 get_config() {
diff --git a/net-proxy/tinyproxy/metadata.xml b/net-proxy/tinyproxy/metadata.xml
index b2a94affab61..228ebe4e18a0 100644
--- a/net-proxy/tinyproxy/metadata.xml
+++ b/net-proxy/tinyproxy/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>A lightweight HTTP/SSL proxy</longdescription>
-<use>
-	<flag name="filter-proxy">Enable filtering of domains/URLS</flag>
-	<flag name="reverse-proxy">Enable reverse proxying</flag>
-	<flag name="transparent-proxy">Enable transparent proxying</flag>
-	<flag name="upstream-proxy">Enable upstream proxying</flag>
-	<flag name="xtinyproxy-header">Include the X-Tinyproxy header</flag>
-</use>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+	</maintainer>
+	<longdescription>A lightweight HTTP/SSL proxy</longdescription>
+	<use>
+		<flag name="filter-proxy">Enable filtering of domains/URLS</flag>
+		<flag name="reverse-proxy">Enable reverse proxying</flag>
+		<flag name="transparent-proxy">Enable transparent proxying</flag>
+		<flag name="upstream-proxy">Enable upstream proxying</flag>
+		<flag name="xtinyproxy-header">Include the X-Tinyproxy header</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..16669d50efc5
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd tmpfiles user
+
+DESCRIPTION="A lightweight HTTP/SSL proxy"
+HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
+SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
++upstream-proxy +xtinyproxy-header"
+
+REQUIRED_USE="test? ( xtinyproxy-header )"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} "" "" "" ${PN}
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|nobody|${PN}|g" \
+		etc/${PN}.conf.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable filter-proxy filter) \
+		$(use_enable reverse-proxy reverse) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable upstream-proxy upstream) \
+		$(use_enable xtinyproxy-header xtinyproxy) \
+		--disable-silent-rules \
+		--localstatedir=/var
+}
+
+src_test() {
+	# The make check target does not run the test suite
+	emake test
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	diropts -m0775 -o ${PN} -g ${PN}
+	keepdir /var/log/${PN}
+
+	newinitd "${FILESDIR}"/${PN}-1.10.0.initd tinyproxy
+	systemd_newunit "${FILESDIR}"/${PN}-1.10.0.service tinyproxy.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
+	elog "For filtering domains and URLs, enable filter option in the configuration"
+	elog "file and add them to the filter file (one domain or URL per line)."
+}
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild
index 9f8aa70a55f5..c371c7b1b9ea 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.4.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.4.ebuild
new file mode 100644
index 000000000000..6c165306197c
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.8.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd tmpfiles user
+
+DESCRIPTION="A lightweight HTTP/SSL proxy"
+HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
+SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+IUSE="test debug +filter-proxy minimal reverse-proxy
+	transparent-proxy +upstream-proxy +xtinyproxy-header"
+
+REQUIRED_USE="test? ( xtinyproxy-header )"
+
+DEPEND="!minimal? ( app-text/asciidoc )"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} "" "" "" ${PN}
+}
+
+src_prepare() {
+	use minimal && PATCHES+=( "${FILESDIR}/${PN}-1.8.1-minimal.patch" )
+
+	default
+
+	sed -i \
+		-e "s|nobody|${PN}|g" \
+		etc/${PN}.conf.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	if use minimal; then
+		ln -s /bin/true "${T}"/a2x
+		export PATH="${T}:${PATH}"
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable filter-proxy filter) \
+		$(use_enable reverse-proxy reverse) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable upstream-proxy upstream) \
+		$(use_enable xtinyproxy-header xtinyproxy) \
+		--disable-silent-rules \
+		--localstatedir=/var
+}
+
+src_test() {
+	# The make check target does not run the test suite
+	emake test
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	diropts -m0775 -o ${PN} -g ${PN}
+	keepdir /var/log/${PN}
+
+	newinitd "${FILESDIR}"/${PN}-1.8.3-r2.initd tinyproxy
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
+	elog "For filtering domains and URLs, enable filter option in the configuration"
+	elog "file and add them to the filter file (one domain or URL per line)."
+}
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
new file mode 100644
index 000000000000..901e192ea21b
--- /dev/null
+++ b/net-proxy/trojan/Manifest
@@ -0,0 +1,6 @@
+AUX trojan.initd 542 BLAKE2B 2e5597381353f1aa8da392027b9a4179da08bb387a776f584bd508f9e7d20747317d78ed7506e97047eb809e0e9726f3f52a9f75a2aacf26d349ec8628b23acb SHA512 1e1f230c96c1d7f8c6f0dc23c40eb8895d004448d802c85d62b34e186bea964753e28e90978075dcbe9fbc2e73074564303f6e28cf12633e424230a2d415910e
+DIST trojan-1.8.1.tar.gz 37199 BLAKE2B be93a119ca95e5f4151db6ab58ffaa123d5bd304247d7835ca34ba870808d7e246d551c204d60ffb2a982f2fcb2c35ada1d9823e7f931b36377f99ebd0f48bd6 SHA512 1e2b8e2ddb02b2009181a980781574e6e6375c98475bda4096b70a9c00e61c5ca445f28730e195a5179b85bf5464a6dcb1bcb6ba8dc841d95c9a111f8f87c511
+DIST trojan-1.9.0.tar.gz 37704 BLAKE2B 5ddfab3408c0f665e0c43e1f23d4d5df6c2222d38f3525b524b6689e5b25603f928f718bcba7bbd077b7db1c241aea629d01c8dbefc1d35c3dc3d29757c04885 SHA512 3d671d1944bf79879bde8ba74d9c3270e475ff1c5d35ff1ef367391fdce223bd24e4c1072ae8506002e5ee10944bfbe10cfb434e8908c9670535c38b275293fa
+EBUILD trojan-1.8.1.ebuild 966 BLAKE2B 1f2463f68e2064c9f66b0fb9c9c2a5bb0a7253d4b45c55eb44b4a0a0020590673d871dd4bc2b45af5b081720f4157985155336f606bc03304af8c025de1bdef7 SHA512 205b38ffac20f40e55b03c567dcb21e2451c94d2c1cecfae5f4a84494ee287dbddd26a91991f48837bc293529baa61983b50eb9e1db23cd68d0bd731b2fadbf5
+EBUILD trojan-1.9.0.ebuild 966 BLAKE2B 1f2463f68e2064c9f66b0fb9c9c2a5bb0a7253d4b45c55eb44b4a0a0020590673d871dd4bc2b45af5b081720f4157985155336f606bc03304af8c025de1bdef7 SHA512 205b38ffac20f40e55b03c567dcb21e2451c94d2c1cecfae5f4a84494ee287dbddd26a91991f48837bc293529baa61983b50eb9e1db23cd68d0bd731b2fadbf5
+MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b
diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd
new file mode 100755
index 000000000000..f525eefe74df
--- /dev/null
+++ b/net-proxy/trojan/files/trojan.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+TJ_CONFIG="/etc/trojan/config.json"
+TJ_PIDFILE="/run/trojan.pid"
+TJ_LOG="/var/log/trojan.log"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting Trojan, Log File: ${TJ_LOG}"
+	start-stop-daemon --start -b \
+		-1 "${TJ_LOG}" -2 "${TJ_LOG}" \
+		-m -p "${TJ_PIDFILE}" \
+		--exec /usr/bin/trojan  -- "${TJ_CONFIG}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Trojan"
+	start-stop-daemon --stop -p "${TJ_PIDFILE}"
+	eend $?
+}
diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml
new file mode 100644
index 000000000000..9b97efd6cb49
--- /dev/null
+++ b/net-proxy/trojan/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>yangmame@icloud.com</email>
+		<name>Xin Yang</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		An unidentifiable mechanism that helps you bypass GFW.
+		Trojan features multiple protocols over TLS to avoid both
+		active/passive detections and ISP QoS limitations.
+		Trojan is not a fixed program or protocol. It's an idea,
+		an idea that imitating the most common service, to an extent
+		that it behaves identically, could help you get across the
+		Great FireWall permanently, without being identified ever.
+		We are the GreatER Fire; we ship Trojan Horses.
+	</longdescription>
+	<use>
+		<flag name="mysql">build with MySQL support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">trojan-gfw/trojan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-proxy/trojan/trojan-1.8.1.ebuild b/net-proxy/trojan/trojan-1.8.1.ebuild
new file mode 100644
index 000000000000..b6c8edf97d81
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.8.1.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=( python{3_4,3_5,3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
+HOMEPAGE="https://github.com/trojan-gfw/${PN}"
+SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/boost-1.54.0:=
+	>=dev-libs/openssl-1.0.2:=
+	mysql? ( dev-db/mysql-connector-c:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( net-misc/curl ${PYTHON_DEPS} )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_MYSQL=$(usex mysql)
+		-DSYSTEMD_SERVICE=ON
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/trojan.initd" trojan
+}
+
+src_test() {
+	cmake-utils_src_test -j1
+}
diff --git a/net-proxy/trojan/trojan-1.9.0.ebuild b/net-proxy/trojan/trojan-1.9.0.ebuild
new file mode 100644
index 000000000000..b6c8edf97d81
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.9.0.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=( python{3_4,3_5,3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
+HOMEPAGE="https://github.com/trojan-gfw/${PN}"
+SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/boost-1.54.0:=
+	>=dev-libs/openssl-1.0.2:=
+	mysql? ( dev-db/mysql-connector-c:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( net-misc/curl ${PYTHON_DEPS} )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_MYSQL=$(usex mysql)
+		-DSYSTEMD_SERVICE=ON
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/trojan.initd" trojan
+}
+
+src_test() {
+	cmake-utils_src_test -j1
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index e76c2cfb0354..21e14776046e 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index acb83c695818..e2718c93b995 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,7 +1,8 @@
+AUX 0.9.37-add-cp-to-tests 1880 BLAKE2B bd5da44d351acbea0583a7e26ead5c898739c87fc33b949772b8fdb9415c3277913cf0e97fadf6c379e8b4cfb4d723ea7e121b6c36ed72d4cec96b8d4bbd1fbd SHA512 3afcb97ad455777d9ad1f158d9a6f0de42694dd92841dc588a4308f666a6a4810cfa3be5a1f00a730e7f15f8573e9f7a5107885561f4e7a847da017904ee37a1
 AUX i2p.init 489 BLAKE2B f7c484713fa043f1db991e95d58f0d184c0d49062e807671f6aca2c7489ad52e072e2d0f5b6c5b666cbda77764e90da6506b7fd0f7a5b2fb34bbfc0b3c96da53 SHA512 3b9b2bce4359f0ba32f690f7922ed95ccaa133b1cff2e5a1d6bfc91a380757f79f03e8a4966259d19ec888e6db468825e6a9d0d1acdba9d38c81a86b99c4229a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.34.tar.bz2 29332692 BLAKE2B 16b15ac2c7eaa594fc6398105d7e22442fafc4036a54a66c91b3ca9bd98095a9192ae5c28123882ddc6acc7c68fb5eeed3ef1ed632a4b4b96a1abe28dff2286c SHA512 71c80710098ead34c159c6a6873c397048afc76974917e7b65d7846203900ab8bfb4840fec3c7d09ade48e93329b06ec33d9f367dae33a4708b4ea14268beefa
 DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
-EBUILD i2p-0.9.34.ebuild 4049 BLAKE2B a0104622fd5e19989304d3c0572715ea87cb9684aa6c8f0ef264f5fc17f592a1865e14211c932a4a0a8cb89e05f2f914a20867c141d2009764a60c361a2e0e3d SHA512 66fd700c6493bc79b5580b3c811eb0a7043d69b2b1033d4b1f0d95a5c0071a7af33a358a11c308ff9afc16a4b9027168d5cee13a2db7f55ac3ed3cfdbf13c314
+DIST i2psource_0.9.37.tar.bz2 30277506 BLAKE2B 2c0fe601b3a8967c23f00bd29aef197389039efbf1a3fc0847f819dea44f98e38b9b53b749763dccca740a50d467d5d079b0e4aad707347cc7c7a576fcc44407 SHA512 ce0d320810faaebe2926d988a40f4df968583edbc488b995a32cfd806550a8cf75d2c2397bfd9f3fd443cb462567cc2cdbf08d1de59b6806888724254faebf09
 EBUILD i2p-0.9.36.ebuild 4184 BLAKE2B 58fcad81d8247848e26af7881178618720778af04d513d972e4e894eeb37509cef7c09840bc075fe81b6de77ba33609d1bea73675cbc1ef2fd5cfa3dd3e82864 SHA512 46e4e100d34e65d11383a0e731788866e9c77137050c95c02869ebf4ae1db098bcaa9f1c31adc549ff3c6b02b667d257ea560fa62e90ea2214efac7e715ef1bf
-MISC metadata.xml 894 BLAKE2B 7f1415ae58ff6b83e05824111e0de818bce0f6b00fda294124eb838d3d24bab43e03f9224cdb3eb5e9b0625cb4a930fce107aa508275e398362ae4d3be502a73 SHA512 dbb318ce927a56d1f0d84cec63b1265969dd4d77021d36ee93e253c4cf02238265aa02a292353d6f520c223b433ce7dcafe605ce2bf97fa253e97f286be34cdb
+EBUILD i2p-0.9.37.ebuild 5212 BLAKE2B d7851583229df8021448749324ffe3927ca843ac59fc97ced69adeafed513a9c75be89346ff8f8353c0df02f963e06788e2653e2a3853aebea7604653ed33b08 SHA512 e6aaa547eb6039804b8af5c17fa35e532f303d54bfbcd5d3c25ba17b53cc390b1f7e87e257ea55e2311d2bc4cc2985a77401db44a7a4a3ea47cd6e64386c0341
+MISC metadata.xml 904 BLAKE2B cc55ce0d1f0cd042997b30a12405ad9e4f0e7e63926c8bc5409dae47d2f0aa37fd141ce8dd436abeb0b417b04484b7bc0155b075899c8127d424301b1af2913b SHA512 195b17fe2bedf530b32ef031b92044d9adf7c1e43d7ba067301bb02d716c9a9836c105663083aad79353afc9938cca1359dc57409adae809e12c8e2f260240c2
diff --git a/net-vpn/i2p/files/0.9.37-add-cp-to-tests b/net-vpn/i2p/files/0.9.37-add-cp-to-tests
new file mode 100644
index 000000000000..b8e967dd31d2
--- /dev/null
+++ b/net-vpn/i2p/files/0.9.37-add-cp-to-tests
@@ -0,0 +1,33 @@
+diff -Naur a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
+--- a/apps/ministreaming/java/build.xml	2018-10-04 12:05:09.000000000 +0200
++++ b/apps/ministreaming/java/build.xml	2018-10-12 08:15:16.481532093 +0200
+@@ -194,6 +194,7 @@
+             includeAntRuntime="false"
+             destdir="./build/obj" >
+             <classpath>
++                <pathelement path="${javac.classpath}" />
+                 <pathelement location="../../../core/java/build/i2p.jar" />
+                 <pathelement location="${junit.home}/junit4.jar" />
+                 <pathelement location="${hamcrest.home}/hamcrest.jar" />
+diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
+--- a/apps/streaming/java/build.xml	2018-10-04 12:05:09.000000000 +0200
++++ b/apps/streaming/java/build.xml	2018-10-12 11:17:22.814404049 +0200
+@@ -62,6 +62,7 @@
+             includeAntRuntime="false"
+             destdir="./build/obj" >
+             <classpath>
++                <pathelement path="${javac.classpath}" />
+                 <pathelement location="../../../core/java/build/i2p.jar" />
+                 <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
+                 <pathelement location="${junit.home}/junit4.jar" />
+diff -Naur a/router/java/build.xml b/router/java/build.xml
+--- a/router/java/build.xml	2018-10-04 12:05:14.000000000 +0200
++++ b/router/java/build.xml	2018-10-12 08:14:52.921530213 +0200
+@@ -162,6 +162,7 @@
+             includeAntRuntime="true"
+             destdir="./build/obj">
+             <classpath>
++                <pathelement path="${javac.classpath}" />
+                 <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
+                 <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
+                 <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
diff --git a/net-vpn/i2p/i2p-0.9.34.ebuild b/net-vpn/i2p/i2p-0.9.34.ebuild
deleted file mode 100644
index ea2983ad0cdc..000000000000
--- a/net-vpn/i2p/i2p-0.9.34.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2 java-ant-2 systemd user
-
-DESCRIPTION="A privacy-centric, anonymous network"
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
-SLOT="0"
-
-# Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
-IUSE="+ecdsa nls"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND="dev-java/bcprov:1.50
-	dev-java/jrobin:0
-	dev-java/slf4j-api:0
-	dev-java/tomcat-jstl-impl:0
-	dev-java/tomcat-jstl-spec:0
-	dev-java/java-service-wrapper:0"
-
-DEPEND="${CP_DEPEND}
-	dev-java/eclipse-ecj:*
-	dev-libs/gmp:0
-	nls? ( >=sys-devel/gettext-0.19 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CP_DEPEND}
-	ecdsa? (
-		|| (
-			dev-java/icedtea:8[-sunec]
-			dev-java/icedtea-bin:8
-			dev-java/oracle-jre-bin
-			dev-java/oracle-jdk-bin
-		)
-	)
-	!ecdsa? ( >=virtual/jre-1.7 )"
-
-EANT_BUILD_TARGET="pkg"
-JAVA_ANT_ENCODING="UTF-8"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	enewgroup i2p
-	enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
-}
-
-src_prepare() {
-	# as early as possible to allow generic patches to be applied
-	default
-
-	java-ant_rewrite-classpath
-
-	java-pkg-2_src_prepare
-
-	# We're on GNU/Linux, we don't need .exe files
-	echo "noExe=true" > override.properties || die
-	if ! use nls; then
-		echo "require.gettext=false" >> override.properties || die
-	fi
-
-	# avoid auto starting browser
-	sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
-		'installer/resources/clients.config' || die
-
-	# generate wrapper classpath, keeping the default to be replaced later
-	i2p_cp='' # global forced by java-pkg_gen-cp
-	java-pkg_gen-cp i2p_cp
-	local lib cp i=2
-	for lib in ${i2p_cp//,/ }
-	do
-		cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
-	done
-
-	# add generated cp and hardcode system VM
-	sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
-		-e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
-		-e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
-		-i 'installer/resources/wrapper.config' || die
-
-	# replace paths as the installer would
-	sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
-		-e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
-		-e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
-		-i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
-}
-
-src_install() {
-	# cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# we remove system installed jar and install the others
-	rm lib/{jrobin.jar,wrapper.jar} || \
-		die 'unable to remove locally built jar already found in system'
-	java-pkg_dojar lib/*.jar
-
-	# create own launcher
-	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-
-	# Install main files and basic documentation
-	insinto '/usr/share/i2p'
-	doins blocklist.txt hosts.txt *.config
-	dodoc history.txt INSTALL-headless.txt LICENSE.txt
-	doman man/*
-
-	# Install other directories
-	doins -r certificates docs eepsite geoip scripts
-	java-pkg_dowar webapps/*.war
-
-	# Install daemon files
-	newinitd "${FILESDIR}/i2p.init" i2p
-	systemd_dounit "${FILESDIR}/i2p.service"
-
-	# setup user
-	keepdir '/var/lib/i2p/.i2p'
-	fowners i2p:i2p '/var/lib/i2p/.i2p'
-}
-
-pkg_postinst() {
-	elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten."
-	elog 'I2P can be configured through the web interface at http://localhost:7657/console'
-
-	if use !ecdsa
-	then
-		ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and'
-		ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.'
-		ewarn
-		ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as"
-		ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation'
-		ewarn 'as the one you built with.'
-	fi
-}
diff --git a/net-vpn/i2p/i2p-0.9.37.ebuild b/net-vpn/i2p/i2p-0.9.37.ebuild
new file mode 100644
index 000000000000..b12699fa6694
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.37.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2 java-ant-2 systemd user
+
+DESCRIPTION="A privacy-centric, anonymous network"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
+SLOT="0"
+
+# Until the deps reach other arches
+KEYWORDS="~amd64 ~x86"
+IUSE="+ecdsa nls test"
+
+# dev-java/ant-core is automatically added due to java-ant-2.eclass
+CP_DEPEND='dev-java/bcprov:1.50
+	dev-java/jrobin:0
+	dev-java/slf4j-api:0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/java-service-wrapper:0
+	dev-java/commons-logging:0
+	dev-java/slf4j-simple:0
+	java-virtuals/servlet-api:3.1
+'
+
+DEPEND="${CP_DEPEND}
+	dev-java/eclipse-ecj:*
+	nls? ( >=sys-devel/gettext-0.19 )
+	virtual/jdk:1.8
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	ecdsa? (
+		|| (
+			dev-java/icedtea:8[-sunec]
+			dev-java/icedtea-bin:8
+			dev-java/oracle-jre-bin
+			dev-java/oracle-jdk-bin
+		)
+	)
+	!ecdsa? ( virtual/jre:1.8 )
+	net-libs/nativebiginteger:0
+"
+
+EANT_BUILD_TARGET="pkg"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET='junit.test'
+JAVA_ANT_ENCODING="UTF-8"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-add-cp-to-tests"
+)
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	enewgroup i2p
+	enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
+}
+
+src_prepare() {
+	# as early as possible to allow generic patches to be applied
+	default
+
+	java-ant_rewrite-classpath
+
+	java-pkg-2_src_prepare
+
+	# We're on GNU/Linux, we don't need .exe files
+	echo "noExe=true" > override.properties || die
+	if ! use nls; then
+		echo "require.gettext=false" >> override.properties || die
+	fi
+
+	# avoid auto starting browser
+	sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
+		'installer/resources/clients.config' || die
+
+	# generate wrapper classpath, keeping the default to be replaced later
+	i2p_cp='' # global forced by java-pkg_gen-cp
+	java-pkg_gen-cp i2p_cp
+	local lib cp i=2
+	for lib in ${i2p_cp//,/ }
+	do
+		cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
+	done
+
+	# add generated cp and hardcode system VM
+	sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
+		-e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
+		-e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
+		-e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \
+		-i 'installer/resources/wrapper.config' || die
+
+	# replace paths as the installer would
+	sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
+		-e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
+		-e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
+		-i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
+
+	if use test; then
+		# no *streaming as requiring >dev-java/mockito-1.9.5
+		sed -e '/junit\.test.*streaming/d' \
+			-i build.xml ||
+			die 'unable to remove ministreaming tests'
+	fi
+}
+
+src_test() {
+	# store built version of jars, overwritten by testing
+	mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
+		die 'unable to save jars before tests'
+
+	# generate test classpath
+	local cp
+	cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
+	EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
+
+	# redo work undone by testing
+	mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
+		die 'unable to restore jars after tests'
+}
+
+src_install() {
+	# cd into pkg-temp.
+	cd "${S}/pkg-temp" || die
+
+	# we remove system installed jar and install the others
+	rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
+		die 'unable to remove locally built jar already found in system'
+	java-pkg_dojar lib/*.jar
+
+	# create own launcher
+	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+
+	# Install main files and basic documentation
+	insinto '/usr/share/i2p'
+	doins blocklist.txt hosts.txt *.config
+	dodoc history.txt INSTALL-headless.txt LICENSE.txt
+	doman man/*
+
+	# Install other directories
+	doins -r certificates docs eepsite geoip scripts
+	java-pkg_dowar webapps/*.war
+
+	# Install daemon files
+	newinitd "${FILESDIR}/i2p.init" i2p
+	systemd_dounit "${FILESDIR}/i2p.service"
+
+	# setup user
+	keepdir '/var/lib/i2p/.i2p'
+	fowners i2p:i2p '/var/lib/i2p/.i2p'
+}
+
+pkg_postinst() {
+	elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten."
+	elog 'I2P can be configured through the web interface at http://localhost:7657/console'
+
+	if use !ecdsa
+	then
+		ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and'
+		ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.'
+		ewarn
+		ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as"
+		ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation'
+		ewarn 'as the one you built with.'
+	fi
+}
diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index f7a6c323e6cc..71d052d100fd 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <maintainer type="person">
 	<email>tharvik@gmail.com</email>
-	<name>Tharvik</name>
+	<name>Valérian Rousset</name>
 </maintainer>
 <maintainer type="project">
 	<email>java@gentoo.org</email>
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 0ce1e65a5757..9d3e0ee2fb28 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -4,10 +4,10 @@ AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
 AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
 AUX i2pd-2.6.0-r3.service 638 BLAKE2B 881b5e680af0dbb674766b4cc0a234e0a49db66f1f4a8ce762326f9bb8fb7437177d9c80988f514c34dd2ba2bab1909a10ee5ef912eee4711ea4ed9c5a6a4423 SHA512 8e35123ea30325e9f1de3d488d96a35b6e983e006084e983ab116aa5febd64feacb7643f3d9c3c7c7865375518e1acef060b4b02e9b052036f8d42f9dcc47a87
-DIST i2pd-2.18.0.tar.gz 1868440 BLAKE2B a5c65c379b38735bc43c81553416ac1dfd7064da33ff282de2ab7567aaeed1e49edbafb48c03f372f72e70bc4fe0e922036cd08538bf0b6c07e00c2c2f328dd9 SHA512 dc8e0f4df25188e4d72ea6ffa2c36e48a7d2103d025730b40e226ab631724a9a07a4dc03a1a3d08328972c98020c44535661820add80374f1dabdf3fc848ef84
 DIST i2pd-2.19.0.tar.gz 1982459 BLAKE2B b05f7a3018091e9c0008ca7037e44b6f5a4416be57054df5f9af72bd664b7d4fc7673e5d3eb1b8bb1ddfb61e81145eb0a847b301a580ef971d181ed00a4c960a SHA512 4c3d2408962f3e55e1a22491b0844ce44cacc7aa631541a86e94554da88e42234576fe221e1398c88e7e68d267bbf9e73cbea9cd74981c354e46ba82d62bb32f
 DIST i2pd-2.20.0.tar.gz 1991174 BLAKE2B 37b85dc37299cd6d2f64050eb096ecc11d75ccdcdba845f34c908e6467cbcb9fa7cea9243415bafd7c9167f5e8ea06c8729bcb885e78f45e37680f8001b69237 SHA512 affade889d32fdf20fc0bc4c7bb809fb511794421a80a93334707e26c72eecc83715d756d79ce7924d43ef44dc9f655925de860b5b392b6c4fe815eb873c1864
-EBUILD i2pd-2.18.0.ebuild 3100 BLAKE2B 27284f8510bfdf37c3d576fa1f4718134d5f948ee1f614272ae86b94cb2f68acb3f9ad59898f8a2b94280c3aa40e1f4c9410dd20d4ebd02e379099fbbad9db52 SHA512 809418d598459849a6d42322b1fa749f5eabcef3f0f3731ce44d74d5744716b5f3fdf979b1288f88b7667fe4e5aea5c83e73bdf5ff769e22b4d3dfb68306cbf6
+DIST i2pd-2.21.0.tar.gz 1993520 BLAKE2B 616f4938d547e6a5d27292bec1741fa28131c37ad12b0f7c564e24ff0fd3b0a01974989ac6f337cd58cc1a618980fd171692c0164d22c3e97080540318e5df89 SHA512 a9c2f4bb1ec6459e7f8f48b74a48dd192af0962876fc6dcf998febe342918f98a21ae421cf48402d5e0c4570641eb3112d85522230dad34cabe6c4f367d6d8ab
 EBUILD i2pd-2.19.0.ebuild 3100 BLAKE2B 27284f8510bfdf37c3d576fa1f4718134d5f948ee1f614272ae86b94cb2f68acb3f9ad59898f8a2b94280c3aa40e1f4c9410dd20d4ebd02e379099fbbad9db52 SHA512 809418d598459849a6d42322b1fa749f5eabcef3f0f3731ce44d74d5744716b5f3fdf979b1288f88b7667fe4e5aea5c83e73bdf5ff769e22b4d3dfb68306cbf6
-EBUILD i2pd-2.20.0.ebuild 3164 BLAKE2B a85df4f576fe3b82a49fd2083a8d910b9d9058ec6de930da06c5a4f58d494484b5737ffb368c80f72bb719f7db5a035e8abcf102cc5898e7d7a7d1ca57909000 SHA512 f5a4df46f7e0ec657c9132fe3ae5f6eda09d4869fc42d0fb22af8f821967cb3b7f5bc9a7f6b091e9cd81a89fd1b84c00bfa6c33fccb837d4144c62709f387125
+EBUILD i2pd-2.20.0.ebuild 3166 BLAKE2B 5a62ee83bd80beca39b265a8a6806c733d047066d204afe101ded329795b4f053af6dd13e93914bb22ab307729eda6ed72073a6cd0bd5699ed6f350b4ae136cf SHA512 24098b0bf0e114bbcda5eaa821906f7b7c4387b4202220526bf177c109979f6a0b65d0449a7e13bcc2d134a90cf9e8ca0fc2cd7db04620e1ad5a3115de36a017
+EBUILD i2pd-2.21.0.ebuild 3140 BLAKE2B 62e6f83535bb2067918b2a331b62a69a4b0138bde9e59abb6270759aa3d1fef08574ef5d02765bafb9bc9beaa3600ab82aa3acc134f97c245f494d585cd52107 SHA512 ed9c1091fe233788a5e73d9e5afe194e57cd3801cb2c71054ad3ad14f68d9b880163e75eb7d94512a7022303f92471bf444076c0e20e2ae6f54b1d6e5f56a8e3
 MISC metadata.xml 742 BLAKE2B 81ae213b17776466f9d33a4798bff20494ab8c09872d1a65fcb0ab4d05cbf2a0858c1c7538a205bbefa491a21d0b3deb613a362d7e5493e5c6ac074b1dacbe53 SHA512 ca6b5eea5aeb685632ed742144cf8a3fc19e7b0b1c213ea6fdf62a07a4f7727e8f001189e09daa201563bfbb79539cee0050c739a23320baa4b4d95a4279b553
diff --git a/net-vpn/i2pd/i2pd-2.18.0.ebuild b/net-vpn/i2pd/i2pd-2.18.0.ebuild
deleted file mode 100644
index 454dd172bd22..000000000000
--- a/net-vpn/i2pd/i2pd-2.18.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd user cmake-utils versionator toolchain-funcs
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PurpleI2P/i2pd"
-SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket"
-
-# if using libressl, require >=boost-1.65, see #597798
-RDEPEND="!static? ( dev-libs/boost[threads]
-			!libressl? ( dev-libs/openssl:0[-bindist] )
-			libressl? ( dev-libs/libressl:0
-						>=dev-libs/boost-1.65 )
-			sys-libs/zlib
-			upnp? ( net-libs/miniupnpc )
-		)"
-DEPEND="${RDEPEND}
-	static? ( dev-libs/boost[static-libs,threads]
-		!libressl? ( dev-libs/openssl:0[static-libs] )
-		libressl? ( dev-libs/libressl:0[static-libs]
-					>=dev-libs/boost-1.65 )
-		sys-libs/zlib[static-libs]
-		upnp? ( net-libs/miniupnpc[static-libs] )
-	)
-	websocket? ( dev-cpp/websocketpp )"
-
-I2PD_USER=i2pd
-I2PD_GROUP=i2pd
-
-CMAKE_USE_DIR="${S}/build"
-
-DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
-
-PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch" )
-
-pkg_pretend() {
-	if tc-is-gcc && ! version_is_at_least "4.7" "$(gcc-version)"; then
-		die "At least gcc 4.7 is required"
-	fi
-	if use i2p-hardening && ! tc-is-gcc; then
-		die "i2p-hardening requires gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=OFF
-		-DWITH_STATIC=$(usex static ON OFF)
-		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_WEBSOCKETS=$(usex websocket ON OFF)
-		-DWITH_LIBRARY=ON
-		-DWITH_BINARY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# config
-	insinto /etc/i2pd
-	doins contrib/i2pd.conf
-	doins contrib/tunnels.conf
-
-	# grant i2pd group read and write access to config files
-	fowners "root:${I2PD_GROUP}" \
-		/etc/i2pd/i2pd.conf \
-		/etc/i2pd/tunnels.conf
-	fperms 660 \
-		/etc/i2pd/i2pd.conf \
-		/etc/i2pd/tunnels.conf
-
-	# working directory
-	keepdir /var/lib/i2pd
-	insinto /var/lib/i2pd
-	doins -r contrib/certificates
-	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
-	fperms 700 /var/lib/i2pd/
-
-	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
-	doenvd "${FILESDIR}/99i2pd"
-
-	# openrc and systemd daemon routines
-	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
-	newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd
-	systemd_newunit "${FILESDIR}/i2pd-2.6.0-r3.service" i2pd.service
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
-}
-
-pkg_setup() {
-	enewgroup "${I2PD_GROUP}"
-	enewuser "${I2PD_USER}" -1 -1 /var/lib/run/i2pd "${I2PD_GROUP}"
-}
-
-pkg_postinst() {
-	if [[ -f ${EROOT%/}/etc/i2pd/subscriptions.txt ]]; then
-		ewarn
-		ewarn "Configuration of the subscriptions has been moved from"
-		ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
-		ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
-	fi
-}
diff --git a/net-vpn/i2pd/i2pd-2.20.0.ebuild b/net-vpn/i2pd/i2pd-2.20.0.ebuild
index 6e3dffbd6c17..aa8dd040979b 100644
--- a/net-vpn/i2pd/i2pd-2.20.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://github.com/PurpleI2P/i2pd"
 SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket"
 
 # if using libressl, require >=boost-1.65, see #597798
diff --git a/net-vpn/i2pd/i2pd-2.21.0.ebuild b/net-vpn/i2pd/i2pd-2.21.0.ebuild
new file mode 100644
index 000000000000..9b28206e7582
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.21.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user cmake-utils eapi7-ver toolchain-funcs
+
+DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
+HOMEPAGE="https://github.com/PurpleI2P/i2pd"
+SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket"
+
+# if using libressl, require >=boost-1.65, see #597798
+RDEPEND="
+	!static? (
+		dev-libs/boost[threads]
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+		libressl? (
+			dev-libs/libressl:0
+			>=dev-libs/boost-1.65
+		)
+		upnp? ( net-libs/miniupnpc )
+	)"
+DEPEND="${RDEPEND}
+	static? (
+		dev-libs/boost[static-libs,threads]
+		!libressl? ( dev-libs/openssl:0[static-libs] )
+		libressl? (
+			dev-libs/libressl:0[static-libs]
+			>=dev-libs/boost-1.65
+		)
+		sys-libs/zlib[static-libs]
+		upnp? ( net-libs/miniupnpc[static-libs] )
+	)
+	websocket? ( dev-cpp/websocketpp )"
+
+I2PD_USER=i2pd
+I2PD_GROUP=i2pd
+
+CMAKE_USE_DIR="${S}/build"
+
+DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
+
+PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch" )
+
+pkg_pretend() {
+	if tc-is-gcc && ! ver_test "$(gcc-version)" -ge "4.7"; then
+		die "At least gcc 4.7 is required"
+	fi
+	if use i2p-hardening && ! tc-is-gcc; then
+		die "i2p-hardening requires gcc"
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+		-DWITH_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_PCH=OFF
+		-DWITH_STATIC=$(usex static ON OFF)
+		-DWITH_UPNP=$(usex upnp ON OFF)
+		-DWITH_WEBSOCKETS=$(usex websocket ON OFF)
+		-DWITH_LIBRARY=ON
+		-DWITH_BINARY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# config
+	insinto /etc/i2pd
+	doins contrib/i2pd.conf
+	doins contrib/tunnels.conf
+
+	# grant i2pd group read and write access to config files
+	fowners "root:${I2PD_GROUP}" \
+		/etc/i2pd/i2pd.conf \
+		/etc/i2pd/tunnels.conf
+	fperms 660 \
+		/etc/i2pd/i2pd.conf \
+		/etc/i2pd/tunnels.conf
+
+	# working directory
+	keepdir /var/lib/i2pd
+	insinto /var/lib/i2pd
+	doins -r contrib/certificates
+	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
+	fperms 700 /var/lib/i2pd/
+
+	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
+	doenvd "${FILESDIR}/99i2pd"
+
+	# openrc and systemd daemon routines
+	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
+	newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd
+	systemd_newunit "${FILESDIR}/i2pd-2.6.0-r3.service" i2pd.service
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
+}
+
+pkg_setup() {
+	enewgroup "${I2PD_GROUP}"
+	enewuser "${I2PD_USER}" -1 -1 /var/lib/run/i2pd "${I2PD_GROUP}"
+}
+
+pkg_postinst() {
+	if [[ -f ${EROOT%/}/etc/i2pd/subscriptions.txt ]]; then
+		ewarn
+		ewarn "Configuration of the subscriptions has been moved from"
+		ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
+		ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
+	fi
+}
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 0d5092123ac7..9ba80e26a9e2 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -5,7 +5,9 @@ AUX libreswan-3.26-nss.patch 853 BLAKE2B 487afd48208223030aa5a4fc434f1bc5d817d9e
 DIST libreswan-3.22.tar.gz 6910418 BLAKE2B c06134fa2d1096231797f1ea93de8ed61121472b10ae30ee9a843250dce4ef9f21e7d3bf63f38daf53fbfd8d1e435cfdc704743d0fdcbde8ecac137d9becac48 SHA512 93868327394527750590e1297443d3eb1c9a528d680348098fd2913123dac52c9fecd73b855ee00586c2516b8aa00f7f0d158d8e9b19d7487b5fb26432b86aff
 DIST libreswan-3.25.tar.gz 3988630 BLAKE2B 8479b5b0d7d49055b7dcefa6c3b2f469b0aa60005e05446d5c1c6f73a32c904835422248c6ead2a1c2dc83b63794fd50f7461fd22c4206414b5890c01b99b722 SHA512 246649cb5bef1d0690217d1080f3f6f175a0d7a5f27e5a7affdf291b2f418a11937e96b64716a33e6312530409a2c1b10b90e2fa5ec339a27c94c990d86ed517
 DIST libreswan-3.26.tar.gz 3706205 BLAKE2B e54e6d3a0163f0b6812c53400e7f57e01319d7cf64a5d9e84d5002bbab24d5de1b6461c6bba02d60630017a50c23ecb1a095f3da1a36a4e6fc64e90cf08fd798 SHA512 10965a23197ef5d21a66dc0838066ceb620b2653f64471553284e0043fbc993584e497742b498e0be410427aeed3d8ce5bfdc6dfab59b8a1a1ba9a363473c4a4
+DIST libreswan-3.27.tar.gz 3720103 BLAKE2B 51ee792cd3fb8330a9cfee0b1a27e48c9a8c8fd3346e8c06fe0a911c813c400ef62d68b1d06bb849695aad5f4d5a496dc444b2543aa9ffbc59d373081c0b85e5 SHA512 b92ecfd08b9d19dc801032176eff3dd07f625223d4f0dd07ff10f639644573430a55f7aebfcc8b9d2424e194ca9d06b17ad5a13dad5dc6f659d19bc5d32520f5
 EBUILD libreswan-3.22.ebuild 2814 BLAKE2B 566683ee612fd84a0fe4cf49cd90bb2c8f67e9aa151461c0c0e68a9179ce5741203764ac520f9f434d8f02d0a30129d3e39059329ca5f991bed74437be4c117a SHA512 e337d3895fd3fe3a803b7e137407dff4ee5e6c4e9928c157715c1f87a6c877f2be4498d884254379c03d63b95f75e71df01a2d839535bb75bcbee7c770956654
 EBUILD libreswan-3.25.ebuild 2856 BLAKE2B 0e2573d71d4f96d6cf271e6d71ad7efffd336877ede43f5ed2f7e35103d8cd67194df195c7bab7d9be513c2ee85c869af8778a8f9fefaf2087e0114b4d052a90 SHA512 be841c666376e6b410b9bd5f15d84c23f3bfa5848ea382b29108ce104cdb22627af145bdaa9b5d5447560705859cc5726643562a109b8b9d126967251c8e0db8
 EBUILD libreswan-3.26.ebuild 2896 BLAKE2B 6887a7656d51395835ad41605b4ed9e9d915e0996cc2c6612a48abdc4c7a6071f3de69089bbc96212c39bcfba8076e2d857042aef1c7d172a0b29a06eb4afbe5 SHA512 cd803735a9b396205ba3e382befbd63b40cf7e8532de299ee8a1736208b7c2ca079fa4e083b272115fb53ecd8e1194003675110a50dc9313b4f06b45a101d844
+EBUILD libreswan-3.27.ebuild 2813 BLAKE2B 23c1d768e88dd76262c0dacdd412d5ce2565c86dfe9a216a44defea8e16430e9659fe695123e9e12255e71b769c82c2abd45654e8fa39466f495fb582af67fc2 SHA512 ad9325ee407f85a0ebf0bbe740b8c36c3c0078bdf9023ca6ec03b5e430ca0b3d4eee3ff590ee76b0c8729e7923e95966ae3ae44bfca543a7741e1efd1bace956
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.27.ebuild b/net-vpn/libreswan/libreswan-3.27.ebuild
new file mode 100644
index 000000000000..736e805196d8
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-3.27.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs
+
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
+
+COMMON_DEPEND="
+	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= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-misc/openswan
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export INC_USRLOCAL=/usr
+	export INC_MANDIR=share/man
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INC_RCDIRS=
+	export INC_RCDEFAULT=/etc/init.d
+	export USERCOMPILE=
+	export USERLINK=
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_XAUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	local IPSEC_CONFDIR=${ROOT%/}/etc/ipsec.d
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db ]]; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR}"
+		certutil -N -d "${IPSEC_CONFDIR}" -f <(echo)
+		eend $?
+	fi
+}
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index bb47726eb5d9..06baf7d367f1 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -1,23 +1,8 @@
-AUX openconnect-7.07-libressl.patch 2687 BLAKE2B a8222fd3e0078e9a60ea02577c84c729052bdbfea271d934bc5c5cae4ff983ee3ca260dd18a5b87ec867afa10e6337e362a8adc8e672a9390fd423e4906f5ac7 SHA512 e9e408eccb146004b308f6702750eab7ca764000f67db8c06f58394281f09e24ddb644699ce68c12463025e88c42e3cee81ed5285f0c23ba45bab17d5701f6e9
-AUX openconnect-7.07-mimic-pulse-client.patch 1280 BLAKE2B ca75ceb83098f915e83c318e16df6166fa4a3607d0580eb4af7beab19261fe26372f87eb89686d146aeb65fbdcc99e0ad30272b6f42a7cddf274db924aefd55f SHA512 87d40d896197532a9c6369cec17fbcbc37a8d9d4a8f6a550e0269071d88db7dd457860746ec383c83de42b39af0f3c0657fdaae5ab6e392bd910437597785f01
 AUX openconnect.conf.in 941 BLAKE2B 8cfa197edfe3b3754e45281b33d51bee0dd80746ac129b071710ca9d6f5aa5da16a3c3ad5fa52c6bfdc0ae4a9b1e3cfea2c20909c6164e67e0dba880cf08fc8a SHA512 a689df7141621c80bca77fdd1e01397b98882c7fd8db79b2fe1495916656522234e3af739538002533c003e4243e9af4bf80cd73bae961e15568997ce89ef6d5
-AUX openconnect.init.in 2747 BLAKE2B 69e748bd0a6603d0cca6b863134155d90cc106a5e2116d0108a2e167cd2aee00126909c4b907f337b79f3c5aacc02a7d7117ae4e74aa0cd18301c587f9c7e2aa SHA512 5f0c4c195e6e0e8770a3b6a6f8890962984cff9487f037cf1ca9cc565cfca0cabf0509060a08f1cabcdb1d34356f33dd843b852298d7531312568b2617cc05bc
 AUX openconnect.init.in-r4 1775 BLAKE2B 2237238a2d149532e90c96190829e9ef51afa50487a0fd45c3c4d2e983fb8755bdf0de3eca44df740b286f4d353b03d71fcd2c2a27129f18031b2bd01989f738 SHA512 7b832550ef21ddb4b1c0eae7f3838b925745a5ebbdb74f1583fb8710b75175ebcbc7b1558ce95f59cd78542bec8bc01f7ab6d32ec4a5b168bb8a516a8907d362
 AUX openconnect.logrotate 116 BLAKE2B 308d088f7c06239ec68831e415df420362c1825ae279fa6f736f36df0bf2e7efc8ea6a4ab43d9b53680dd0ab5028c92bf70a0597b56a20da06b302457e7d5f07 SHA512 ea1b6caf6278fea515c299072ee799ab3676014784703d7fa8e4f4d7bfc4599650c386d9706a3e6d92c195c9e5e1628fa6efc1124e1ae72875cc9eaab73cb077
-DIST openconnect-7.06.tar.gz 1343870 BLAKE2B db064490b40ab3e63560893aa8864f19386d8eba0c1d8072a16c36f678bb7734c9ead6c13b330c3b7319e46d6d3ceb8bec3899d0856838cfeff9979e293a005e SHA512 d1af9efe4ac1f6671dc6b92db0df981e8cae3f2f50b8b4c35a112b42a76517b7c8ea9fd5da93352445dd61da3012bf34fdbcc3add9d8727cbaad7d311e516108
-DIST openconnect-7.06_p20160614.tar.gz 2332148 BLAKE2B f6a46f58b52b65659f90d3ddb13f0e51fb96c96089358423c99e1dc0699f0501a1c4f1ba4b22b061e226f2046083dc38c06b4b879877905bb256d6dc978173a2 SHA512 7832251180e9c738c84ee89d0ad35144318f90cc9ede48e0cdb73747e64b2a3fbf4ad8175d0d755cb5629fbfc37c76a131a1b54a03c4249727102b572cbdfd66
-DIST openconnect-7.07.tar.gz 1557283 BLAKE2B 15b5470fdb1a497d9b238b4eee5ba9a8cb1cbe05ff42d4782b16305842544954e103671bf825e334ef2333861509b00aa7c54c10dc799072a0af7469f5f5fd49 SHA512 fcce82419a058f5210f8b6167a10e52eb572c93cda3ec941bf11e5bfcf8395ce2f816cba4f5f9a02920eb023fe7dfbd8192d5664ce5bab29bf88506b67ec34e3
 DIST openconnect-7.08.tar.gz 1686133 BLAKE2B 265c43982b475ef1e49d7bf16e782c82b9ac48fbfbe61b5b8fe250505391edea8e5050e8cc3dc9b3cadb349f3842e13c05e431172e8c7488d9052ad15c93e87e SHA512 22f9b0bd4bd17e2ab91ff42b2464c89abba035fe705c037ba4d1042ace460c8738e20481783a1edc3b7dd6503fe9fcc7fdd188552811fb1525310e25a4c2f400
-DIST vpnc-scripts-20140806.tar.gz 20070 BLAKE2B 8a53bb0794a6eb2c121fd3a9e7068e998d9386a9a8ee4f0670baca0ef11411f351c8beb7791fd9e31cef63734a1b3ce9a1c426ba2792c75b002c718c124f1ebd SHA512 bfa230d6eb2db0696a23228cef6e742dcf5e609c25de725c23e2c7bee96d00045ea656d6c7025cdf7785f70baeb8a8d79af6aec93d7285bcb3c029dc744e5380
-DIST vpnc-scripts-20160829.tar.gz 20297 BLAKE2B 42d107669c938e020f10ebd332ea5a27f93c3ec461c4b03c0885b96df1330d7b071d78ec61be08d53425b779edbb2b98222cc9313f89905c68d8ae7e44efc283 SHA512 0edd0e5184ac4a705f213a87fa8afa2e2cd54c9bd1aa01955a3a5107c42da8eae7b639896daceecc556a63b0663ee47e25fc21e77f0f74774330d546584fd2c1
 DIST vpnc-scripts-20180227.tar.gz 21241 BLAKE2B 2ba4c76121ba9c5d307233d6f8c91db03c8da4882b8f6dfeed335f7fcc30438df8fe0657a1177e7e551566b597e195cf41bb6e27e13b757a0c931e8574de9a5e SHA512 9a508426e9307213078ce57b59d25168647fa5d2e823b1085e93401259b0a52269e948c8292e4055babf3e8b3c087a23475b5caa2a43c11feb2df8b0d8843972
-EBUILD openconnect-7.06-r1.ebuild 3486 BLAKE2B 0939f656dfca55c414884c6f09c3ae221617872d229a2e9f03fd35dd70e0767581eed4b8d30e5571d37ac5d8c8f859c0b67bc2e879ecabfeb31d5607fd88e22e SHA512 80fb50f87efba75d3d25945b0f5956cf8c13984bedf9b2e5e4367f53655cd2ae2431c3efd751f05fae140f20b60c83b258c6f0727dcfe382f3922cd8a27f230d
-EBUILD openconnect-7.06-r4.ebuild 3599 BLAKE2B a2c10819815da62a7380bb7b77f818d4ea6a93273650dbfc5d824a187340b253559dbbd4c507d12e7cad6412910cf8a25914adc9b66511680293015b21378389 SHA512 ef0b4e2d0fe07a197701103b6df7d3b3ba52a683b7d1d5de8a3ab7a87a29dd9e24fec5b990ae0d433048832f7d8629e15903e0a4c479a47588c6596a79a9d14e
-EBUILD openconnect-7.06_p20160614.ebuild 3735 BLAKE2B 7ea20a35fe2c8e2f6a6271b49701f39b4ad0a9dc2b6044761bb05792440f7d2d1d09e91f71a65b44cc3b8aaa1e5f93d21b6bdc7eb520a2736766642507662806 SHA512 0102c424e2acf55e886071fa3fa7b0102634e18177ffed6ab2be065c9749b3d10647ce775e877e6df6a14555817645ed2bb766bbe8b2c856fbaa68ddf875a31e
-EBUILD openconnect-7.07-r1.ebuild 3746 BLAKE2B b19e7ef12f15a1f8b958c8ec459ef12cc16846ba333239628c2dcd395003015b8a7545279cbb32a7674ed437f970a219e1da4a5247d10e5eee93cefd60f8645a SHA512 e1caea75bad3efb24f2461742b0203ceb34d931541133d922586fc5a40cb280868d1676cedcb9cea0c0487fee835340f8146afccc334146380b377a9c427afce
-EBUILD openconnect-7.07-r2.ebuild 3850 BLAKE2B aea4f41c17d356eca03df60934911ffccf4c6af6cf297c631da35878d21291db5b0bd83eb1ed2ee664452c3f1f3704c0bc6ef0e7431508fb6114cd5f07248ad8 SHA512 e2a6699904d0da2251cad7b99f8490f606bc816e3d9ae762eaa8f4e5af6143cf9784d5a1bfa717f5cf323901b6be031c7d5ad76577e07c77ce186dd265e93628
-EBUILD openconnect-7.07-r3.ebuild 3969 BLAKE2B 644f5ea0cb09e757a186ca06a8ee0231dd30bef87cbeaa134b175f85956ef76045e6ed666796f110f67f4dac9f25a479d1a1730de63ea9f72b40ccd2d61ed162 SHA512 09e12f6b2037e2cd7110fd81fdfe8b517d82712ac27e5c9079c73c3b107a8fb9c06c5a368bdabe496b3ed501acbc6d752197d033308a69471acd747e2949e19b
-EBUILD openconnect-7.08-r1.ebuild 3728 BLAKE2B 19f238774a67f117e8f8ce98a904b46d782aba095f20c8b6cd6c8ba95727ef34191a0b32ea83ef86e37f5a827708079cfc4de01d6ef5f5b1c277b78c2603f71f SHA512 faddf72a3109b5393b90ef3bc9e72e7943ef5149c54d3a3029ffe92dd70b07270e982c4a21087544832b2f368d550935f7d511193f1b6d12fb55a540ada500f3
-EBUILD openconnect-7.08.ebuild 3724 BLAKE2B aa4953ed9d9b31045bcd16415a637114509ba401bb64b1f224de69260f6bf6ab90378ae377a005dd02221afbc14615abb13971949ff30d42c8f5a7c8f57a782b SHA512 64bac40b9d4caf55cb2a37a26ff292e8120c95d254beff1df9e85371eb2d97e90d1e7a00de30110431fa86f2f22130db43e1b5f02c367f083023a5e49b53665f
-EBUILD openconnect-9999.ebuild 3728 BLAKE2B 19f238774a67f117e8f8ce98a904b46d782aba095f20c8b6cd6c8ba95727ef34191a0b32ea83ef86e37f5a827708079cfc4de01d6ef5f5b1c277b78c2603f71f SHA512 faddf72a3109b5393b90ef3bc9e72e7943ef5149c54d3a3029ffe92dd70b07270e982c4a21087544832b2f368d550935f7d511193f1b6d12fb55a540ada500f3
+EBUILD openconnect-7.08-r1.ebuild 3721 BLAKE2B 765faa806a725c554faca14efe1317e7facddac5d701d9a3e252bca579f5be311576886d9b91e94fa31b0feec97ff5aee0427458ac66265edb51ce4671dacac6 SHA512 87eebbe79f95c5502b3eb3fcedbe38639fc700c76b3287d352f35e88e8d8a14dd1a992effe85154510bcea2e26895e00e43302709b370ad8ccc5b6343456e559
+EBUILD openconnect-9999.ebuild 3725 BLAKE2B da7d74ab67d7e6bb7fb6955a08dc4024cae8434569d9757c7bd9f332e5fe1d8bd0fadfeb0273ec68104bc02703bca4d7c3ff7271e07522b1928c937c1f57ce29 SHA512 5cf970b3d259569e607144e1b0035b807f1691b31fa411fb462ee8d7f859e2b250cc6ef532173a2c96cf2caaeecb7c3042ee156a17df018c40807db2f4b260e9
 MISC metadata.xml 642 BLAKE2B 57e9e1e2bdbbac2deaa1419dd84f793b9e6adfedddb04a57813633d1a552e13d392648782ed642bf6602b1e48b47432aa3bd05588f9e410ed67d775d34adca80 SHA512 3a6b08e9258161af07ff47a0c52fe294185a2dd41bb7786500bfc35d56a1c1e366d013979a3bba6a80d8350e5765cb06876e9f4270c1e504445224a308de185f
diff --git a/net-vpn/openconnect/files/openconnect-7.07-libressl.patch b/net-vpn/openconnect/files/openconnect-7.07-libressl.patch
deleted file mode 100644
index 4f9d34bceee1..000000000000
--- a/net-vpn/openconnect/files/openconnect-7.07-libressl.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d4a8afc2e8693628f2de554e717458e08bcc2fcf Mon Sep 17 00:00:00 2001
-From: Aric Belsito <lluixhi@gmail.com>
-Date: Thu, 3 Nov 2016 11:37:23 -0700
-Subject: [PATCH] Fix LibreSSL Build.
-
-From Voidlinux:
-
-From d51ab5615e11af4a2c160b2b8240e5d9f3c15422 Mon Sep 17 00:00:00 2001
-From: Duncaen <duncaen@voidlinux.eu>
-Date: Wed, 13 Jul 2016 15:21:16 +0200
-Subject: [PATCH] openconnect: update to 7.07.
----
- openssl-esp.c | 4 ++--
- openssl.c     | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/openssl-esp.c b/openssl-esp.c
-index 2c1aa49..bd4dce3 100644
---- a/openssl-esp.c
-+++ b/openssl-esp.c
-@@ -27,7 +27,7 @@
- #include <openssl/evp.h>
- #include <openssl/rand.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #define EVP_CIPHER_CTX_free(c) do {				\
- 				    EVP_CIPHER_CTX_cleanup(c);	\
-@@ -85,7 +85,7 @@ static int init_esp_ciphers(struct openconnect_info *vpninfo, struct esp *esp,
- 	}
- 	EVP_CIPHER_CTX_set_padding(esp->cipher, 0);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	esp->hmac = malloc(sizeof(*esp->hmac));
- 	esp->pkt_hmac = malloc(sizeof(*esp->pkt_hmac));
- 	if (!esp->hmac || &esp->pkt_hmac) {
-diff --git a/openssl.c b/openssl.c
-index 785fd2a..6007cef 100644
---- a/openssl.c
-+++ b/openssl.c
-@@ -36,11 +36,11 @@
- #include <openssl/ui.h>
- #include <openssl/rsa.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_up_ref(x) 	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509)
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define EVP_MD_CTX_new EVP_MD_CTX_create
- #define EVP_MD_CTX_free EVP_MD_CTX_destroy
- #define X509_STORE_CTX_get0_chain(ctx) ((ctx)->chain)
-@@ -991,7 +991,7 @@ static int set_peer_cert_hash(struct openconnect_info *vpninfo)
- 	return 0;
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
- static int match_hostname_elem(const char *hostname, int helem_len,
- 			       const char *match, int melem_len)
- {
-@@ -1653,7 +1653,7 @@ int openconnect_open_https(struct openconnect_info *vpninfo)
- 	 * 4fcdd66fff5fea0cfa1055c6680a76a4303f28a2
- 	 * cd6bd5ffda616822b52104fee0c4c7d623fd4f53
- 	 */
--#if OPENSSL_VERSION_NUMBER >= 0x10001070
-+#if OPENSSL_VERSION_NUMBER >= 0x10001070 || defined(LIBRESSL_VERSION_NUMBER)
- 	if (string_is_hostname(vpninfo->hostname))
- 		SSL_set_tlsext_host_name(https_ssl, vpninfo->hostname);
- #endif
--- 
-2.10.2
-
diff --git a/net-vpn/openconnect/files/openconnect-7.07-mimic-pulse-client.patch b/net-vpn/openconnect/files/openconnect-7.07-mimic-pulse-client.patch
deleted file mode 100644
index 5cfeca6ec52d..000000000000
--- a/net-vpn/openconnect/files/openconnect-7.07-mimic-pulse-client.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4ce9c9241f5707917e87e93a055f757cea5fb84d Mon Sep 17 00:00:00 2001
-From: Jon DeVree <nuxi@vault24.org>
-Date: Mon, 19 Sep 2016 21:00:18 -0400
-Subject: [PATCH] Add Content-Length header to mimic official pulse client
-
-The official pulse client sends in a fixed "Content-Length: 256" header
-with these two HTTP requests. Some versions of the VPN server will
-reject requests with an HTTP 400 error if they do not have this header.
-
-Signed-off-by: Jon DeVree <nuxi@vault24.org>
-Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
----
- oncp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/oncp.c b/oncp.c
-index cc9a223..2bf1571 100644
---- a/oncp.c
-+++ b/oncp.c
-@@ -562,6 +562,7 @@ int oncp_connect(struct openconnect_info *vpninfo)
- 
-  	buf_append(reqbuf, "POST /dana/js?prot=1&svc=1 HTTP/1.1\r\n");
- 	oncp_common_headers(vpninfo, reqbuf);
-+	buf_append(reqbuf, "Content-Length: 256\r\n");
- 	buf_append(reqbuf, "\r\n");
- 
- 	if (buf_error(reqbuf)) {
-@@ -606,6 +607,7 @@ int oncp_connect(struct openconnect_info *vpninfo)
- 	buf_truncate(reqbuf);
- 	buf_append(reqbuf, "POST /dana/js?prot=1&svc=4 HTTP/1.1\r\n");
- 	oncp_common_headers(vpninfo, reqbuf);
-+	buf_append(reqbuf, "Content-Length: 256\r\n");
- 	buf_append(reqbuf, "\r\n");
- 
- 	if (buf_error(reqbuf)) {
--- 
-2.7.3
-
diff --git a/net-vpn/openconnect/files/openconnect.init.in b/net-vpn/openconnect/files/openconnect.init.in
deleted file mode 100644
index c4497956d8a3..000000000000
--- a/net-vpn/openconnect/files/openconnect.init.in
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VPN="${RC_SVCNAME#*.}"
-VPNLOG="/var/log/openconnect/${VPN}"
-VPNLOGFILE="${VPNLOG}/openconnect.log"
-VPNERRFILE="${VPNLOG}/openconnect.err"
-VPNPID="/run/openconnect/${VPN}.pid"
-VPNDIR="/etc/openconnect/${VPN}"
-PREUPSCRIPT="${VPNDIR}/preup.sh"
-PREDOWNSCRIPT="${VPNDIR}/predown.sh"
-POSTUPSCRIPT="${VPNDIR}/postup.sh"
-POSTDOWNSCRIPT="${VPNDIR}/postdown.sh"
-SERVER="server_${VPN}"
-PASSWORD="password_${VPN}"
-VPNOPTS="vpnopts_${VPN}"
-
-depend() {
-	before netmount
-}
-
-checkconfig() {
-	if [ $VPN = "openconnect" ]; then
-		eerror "You cannot call openconnect directly. You must create a symbolic link to it with the vpn name:"
-		echo
-		eerror "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
-		echo
-		eerror "And then call it instead:"
-		echo
-		eerror "/etc/init.d/openconnect.vpn0 start"
-		return 1
-	fi
-}
-
-checktuntap() {
-	if [ $(uname -s) = "Linux" ] ; then
-		if [ ! -e /dev/net/tun ]; then
-			if ! modprobe tun ; then
-				eerror "TUN/TAP support is not available in this kernel"
-				return 1
-			fi
-		fi
-		if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
-			ebegin "Detected broken /dev/net/tun symlink, fixing..."
-			rm -f /dev/net/tun
-			ln -s /dev/misc/net/tun /dev/net/tun
-			eend $?
-		fi
-	fi
-}
-
-start() {
-	ebegin "Starting OpenConnect: ${VPN}"
-
-	checkconfig || return 1
-
-	checktuntap || return 1
-
-	if [ "${!SERVER}" == "vpn.server.tld" ]; then
-		eend 1 "${VPN} not configured"
-		return 1
-	fi
-
-	if [ ! -e "${VPNLOG}" ]; then
-		mkdir -p "${VPNLOG}"
-	fi
-
-        local piddir="${VPNPID%/*}"
-        if [ ! -d "$piddir" ] ; then
-                mkdir -p "$piddir"
-                if [ $? -ne 0 ]; then
-                        eerror "Directory $piddir for pidfile does not exist and cannot be created"
-                        return 1
-                fi
-        fi
-
-	if [ -x "${PREUPSCRIPT}" ] ; then 
-		"${PREUPSCRIPT}"
-	fi
-
-	start-stop-daemon --start --make-pidfile --pidfile "${VPNPID}" --stderr "${VPNERRFILE}" --stdout "${VPNLOGFILE}" --background \
-			--exec /usr/sbin/openconnect \
-			-- --pid-file="${VPNPID}" ${!VPNOPTS} ${!SERVER} <<< ${!PASSWORD}
-
- 	local retval=$?
-
- 	if [ ! ${retval} -eq 0 ]; then
-		eend ${retval}
-		return ${retval}
- 	fi
-
-	if [ -x "${POSTUPSCRIPT}" ] ; then 
-		"${POSTUPSCRIPT}"
-	fi
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping OpenConnect: ${VPN}"
-
-	checkconfig || return 1
-
-	if [ -x "${PREDOWNSCRIPT}" ] ; then 
-		"${PREDOWNSCRIPT}"
-	fi
-
-	start-stop-daemon --pidfile "${VPNPID}" --stop /usr/sbin/openconnect
- 	local retval=$?
-
- 	if [ ! ${retval} -eq 0 ]; then
-		eend ${retval}
- 		return ${retval}
- 	fi
-
-
-	if [ -x "${POSTDOWNSCRIPT}" ] ; then 
-		"${POSTDOWNSCRIPT}"
-	fi
-	eend $?
-}
diff --git a/net-vpn/openconnect/openconnect-7.06-r1.ebuild b/net-vpn/openconnect/openconnect-7.06-r1.ebuild
deleted file mode 100644
index 86c9caecd8f8..000000000000
--- a/net-vpn/openconnect/openconnect-7.06-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-VPNC_VER=20140806
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86"
-IUSE="doc +gnutls gssapi java libproxy nls smartcard static-libs"
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		>=dev-libs/openssl-1.0.1h:0[static-libs?]
-	)
-	gnutls? (
-		>=net-libs/gnutls-3[static-libs?] dev-libs/nettle
-		app-misc/ca-certificates
-	)
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )
-	smartcard? ( sys-apps/pcsc-lite:0= )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	!<sys-apps/openrc-0.13"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	java? ( >=virtual/jdk-1.6 )
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="~TUN"
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-
-	if use doc; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local ilinguas="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW"
-	strip-linguas ${ilinguas}
-	echo ${LINGUAS} > po/LINGUAS
-	if ! use doc; then
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# stoken and liboath not in portage
-	econf \
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		--without-stoken \
-		$(use_with gssapi) \
-		$(use_with smartcard libpcsclite) \
-		$(use_with java)
-}
-
-DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
-
-You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
-instead of calling it directly:
-
-ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
-
-You can then start the vpn tunnel like this:
-
-/etc/init.d/openconnect.vpn0 start
-
-If you would like to run preup, postup, predown, and/or postdown scripts,
-You need to create a directory in /etc/openconnect with the name of the vpn:
-
-mkdir /etc/openconnect/vpn0
-
-Then add executable shell files:
-
-mkdir /etc/openconnect/vpn0
-cd /etc/openconnect/vpn0
-echo '#!/bin/sh' > preup.sh
-cp preup.sh predown.sh
-cp preup.sh postup.sh
-cp preup.sh postdown.sh
-chmod 755 /etc/openconnect/vpn0/*
-"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	prune_libtool_files --all
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" net-dns/openresolv
-	fi
-}
diff --git a/net-vpn/openconnect/openconnect-7.06-r4.ebuild b/net-vpn/openconnect/openconnect-7.06-r4.ebuild
deleted file mode 100644
index c56cb72b396b..000000000000
--- a/net-vpn/openconnect/openconnect-7.06-r4.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 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-VPNC_VER=20140806
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc +gnutls gssapi java libproxy libressl nls smartcard static-libs stoken"
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] )
-		libressl? ( dev-libs/libressl:0=[static-libs?] )
-	)
-	gnutls? (
-		app-misc/ca-certificates
-		dev-libs/nettle
-		>=net-libs/gnutls-3:0=[static-libs?]
-	)
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )
-	smartcard? ( sys-apps/pcsc-lite:0= )
-	stoken? ( app-crypt/stoken )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	!<sys-apps/openrc-0.13"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	java? ( >=virtual/jdk-1.6 )
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="~TUN"
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-
-	if use doc; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local ilinguas="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW"
-	strip-linguas ${ilinguas}
-	echo ${LINGUAS} > po/LINGUAS
-	if ! use doc; then
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# liboath not in portage
-	econf \
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		$(use_with gssapi) \
-		$(use_with smartcard libpcsclite) \
-		$(use_with stoken) \
-		$(use_with java)
-}
-
-DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
-
-You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
-instead of calling it directly:
-
-ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
-
-You can then start the vpn tunnel like this:
-
-/etc/init.d/openconnect.vpn0 start
-
-If you would like to run preup, postup, predown, and/or postdown scripts,
-You need to create a directory in /etc/openconnect with the name of the vpn:
-
-mkdir /etc/openconnect/vpn0
-
-Then add executable shell files:
-
-mkdir /etc/openconnect/vpn0
-cd /etc/openconnect/vpn0
-echo '#!/bin/sh' > preup.sh
-cp preup.sh predown.sh
-cp preup.sh postup.sh
-cp preup.sh postdown.sh
-chmod 755 /etc/openconnect/vpn0/*
-"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	prune_libtool_files --all
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" net-dns/openresolv
-	fi
-}
diff --git a/net-vpn/openconnect/openconnect-7.06_p20160614.ebuild b/net-vpn/openconnect/openconnect-7.06_p20160614.ebuild
deleted file mode 100644
index 8702eba983c5..000000000000
--- a/net-vpn/openconnect/openconnect-7.06_p20160614.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="git://git.infradead.org/users/dwmw2/${PN}.git"
-	inherit git-r3 autotools
-else
-	inherit autotools
-	ARCHIVE_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-VPNC_VER=20140806
-SRC_URI="${ARCHIVE_URI}
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-IUSE="doc +gnutls gssapi java libproxy nls smartcard static-libs stoken"
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		>=dev-libs/openssl-1.0.1h:0[static-libs?]
-	)
-	gnutls? (
-		>=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle
-		app-misc/ca-certificates
-	)
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )
-	smartcard? ( sys-apps/pcsc-lite:0= )
-	stoken? ( app-crypt/stoken )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	!<sys-apps/openrc-0.13"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	java? ( >=virtual/jdk-1.6 )
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="~TUN"
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if [[ ${LINGUAS+set} == set ]]; then
-		strip-linguas -u po
-		echo "${LINGUAS}" > po/LINGUAS || die
-	fi
-
-	if use doc; then
-		python_setup
-	else
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# liboath not in portage
-	econf \
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		$(use_with gssapi) \
-		$(use_with smartcard libpcsclite) \
-		$(use_with stoken) \
-		$(use_with java)
-}
-
-DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
-
-You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
-instead of calling it directly:
-
-ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
-
-You can then start the vpn tunnel like this:
-
-/etc/init.d/openconnect.vpn0 start
-
-If you would like to run preup, postup, predown, and/or postdown scripts,
-You need to create a directory in /etc/openconnect with the name of the vpn:
-
-mkdir /etc/openconnect/vpn0
-
-Then add executable shell files:
-
-mkdir /etc/openconnect/vpn0
-cd /etc/openconnect/vpn0
-echo '#!/bin/sh' > preup.sh
-cp preup.sh predown.sh
-cp preup.sh postup.sh
-cp preup.sh postdown.sh
-chmod 755 /etc/openconnect/vpn0/*
-"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	prune_libtool_files --all
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" net-dns/openresolv
-	fi
-}
diff --git a/net-vpn/openconnect/openconnect-7.07-r1.ebuild b/net-vpn/openconnect/openconnect-7.07-r1.ebuild
deleted file mode 100644
index fac6e34d7ead..000000000000
--- a/net-vpn/openconnect/openconnect-7.07-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="git://git.infradead.org/users/dwmw2/${PN}.git"
-	inherit git-r3 autotools
-else
-	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-VPNC_VER=20160829
-SRC_URI="${ARCHIVE_URI}
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-IUSE="doc +gnutls gssapi java libproxy nls smartcard static-libs stoken"
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		>=dev-libs/openssl-1.0.1h:0[static-libs?]
-	)
-	gnutls? (
-		>=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle
-		app-misc/ca-certificates
-	)
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )
-	smartcard? ( sys-apps/pcsc-lite:0= )
-	stoken? ( app-crypt/stoken )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	!<sys-apps/openrc-0.13"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	java? ( >=virtual/jdk-1.6 )
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="~TUN"
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if [[ ${LINGUAS+set} == set ]]; then
-		strip-linguas -u po
-		echo "${LINGUAS}" > po/LINGUAS || die
-	fi
-
-	if use doc; then
-		python_setup
-	else
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# liboath not in portage
-	econf \
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		$(use_with gssapi) \
-		$(use_with smartcard libpcsclite) \
-		$(use_with stoken) \
-		$(use_with java)
-}
-
-DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
-
-You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
-instead of calling it directly:
-
-ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
-
-You can then start the vpn tunnel like this:
-
-/etc/init.d/openconnect.vpn0 start
-
-If you would like to run preup, postup, predown, and/or postdown scripts,
-You need to create a directory in /etc/openconnect with the name of the vpn:
-
-mkdir /etc/openconnect/vpn0
-
-Then add executable shell files:
-
-mkdir /etc/openconnect/vpn0
-cd /etc/openconnect/vpn0
-echo '#!/bin/sh' > preup.sh
-cp preup.sh predown.sh
-cp preup.sh postup.sh
-cp preup.sh postdown.sh
-chmod 755 /etc/openconnect/vpn0/*
-"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	prune_libtool_files --all
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" net-dns/openresolv
-	fi
-}
diff --git a/net-vpn/openconnect/openconnect-7.07-r2.ebuild b/net-vpn/openconnect/openconnect-7.07-r2.ebuild
deleted file mode 100644
index 5c8982b1bca5..000000000000
--- a/net-vpn/openconnect/openconnect-7.07-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="git://git.infradead.org/users/dwmw2/${PN}.git"
-	inherit git-r3 autotools
-else
-	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc64 x86"
-fi
-VPNC_VER=20160829
-SRC_URI="${ARCHIVE_URI}
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-IUSE="doc +gnutls gssapi java libproxy lz4 nls smartcard static-libs stoken"
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		>=dev-libs/openssl-1.0.1h:0[static-libs?]
-	)
-	gnutls? (
-		>=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle
-		app-misc/ca-certificates
-	)
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	lz4? ( app-arch/lz4:= )
-	nls? ( virtual/libintl )
-	smartcard? ( sys-apps/pcsc-lite:0= )
-	stoken? ( app-crypt/stoken )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	!<sys-apps/openrc-0.13"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	java? ( >=virtual/jdk-1.6 )
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="~TUN"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mimic-pulse-client.patch
-)
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if [[ ${LINGUAS+set} == set ]]; then
-		strip-linguas -u po
-		echo "${LINGUAS}" > po/LINGUAS || die
-	fi
-
-	if use doc; then
-		python_setup
-	else
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# liboath not in portage
-	econf \
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		$(use_with lz4) \
-		$(use_with gssapi) \
-		$(use_with smartcard libpcsclite) \
-		$(use_with stoken) \
-		$(use_with java)
-}
-
-DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
-
-You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
-instead of calling it directly:
-
-ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
-
-You can then start the vpn tunnel like this:
-
-/etc/init.d/openconnect.vpn0 start
-
-If you would like to run preup, postup, predown, and/or postdown scripts,
-You need to create a directory in /etc/openconnect with the name of the vpn:
-
-mkdir /etc/openconnect/vpn0
-
-Then add executable shell files:
-
-mkdir /etc/openconnect/vpn0
-cd /etc/openconnect/vpn0
-echo '#!/bin/sh' > preup.sh
-cp preup.sh predown.sh
-cp preup.sh postup.sh
-cp preup.sh postdown.sh
-chmod 755 /etc/openconnect/vpn0/*
-"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	prune_libtool_files --all
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" net-dns/openresolv
-	fi
-}
diff --git a/net-vpn/openconnect/openconnect-7.07-r3.ebuild b/net-vpn/openconnect/openconnect-7.07-r3.ebuild
deleted file mode 100644
index f0b04fd6c339..000000000000
--- a/net-vpn/openconnect/openconnect-7.07-r3.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="git://git.infradead.org/users/dwmw2/${PN}.git"
-	inherit git-r3 autotools
-else
-	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-VPNC_VER=20160829
-SRC_URI="${ARCHIVE_URI}
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-IUSE="doc +gnutls gssapi java libproxy libressl lz4 nls smartcard static-libs stoken"
-
-DEPEND="
-	dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] )
-		libressl? ( dev-libs/libressl:0=[static-libs?] )
-	)
-	gnutls? (
-		app-misc/ca-certificates
-		dev-libs/nettle
-		>=net-libs/gnutls-3:0=[static-libs?]
-	)
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	lz4? ( app-arch/lz4:= )
-	nls? ( virtual/libintl )
-	smartcard? ( sys-apps/pcsc-lite:0= )
-	stoken? ( app-crypt/stoken )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	!<sys-apps/openrc-0.13"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	java? ( >=virtual/jdk-1.6 )
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="~TUN"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mimic-pulse-client.patch
-	"${FILESDIR}"/${P}-libressl.patch
-)
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if [[ ${LINGUAS+set} == set ]]; then
-		strip-linguas -u po
-		echo "${LINGUAS}" > po/LINGUAS || die
-	fi
-
-	if use doc; then
-		python_setup
-	else
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# liboath not in portage
-	econf \
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		$(use_with lz4) \
-		$(use_with gssapi) \
-		$(use_with smartcard libpcsclite) \
-		$(use_with stoken) \
-		$(use_with java)
-}
-
-DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
-
-You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
-instead of calling it directly:
-
-ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
-
-You can then start the vpn tunnel like this:
-
-/etc/init.d/openconnect.vpn0 start
-
-If you would like to run preup, postup, predown, and/or postdown scripts,
-You need to create a directory in /etc/openconnect with the name of the vpn:
-
-mkdir /etc/openconnect/vpn0
-
-Then add executable shell files:
-
-mkdir /etc/openconnect/vpn0
-cd /etc/openconnect/vpn0
-echo '#!/bin/sh' > preup.sh
-cp preup.sh predown.sh
-cp preup.sh postup.sh
-cp preup.sh postdown.sh
-chmod 755 /etc/openconnect/vpn0/*
-"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	prune_libtool_files --all
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" net-dns/openresolv
-	fi
-}
diff --git a/net-vpn/openconnect/openconnect-7.08-r1.ebuild b/net-vpn/openconnect/openconnect-7.08-r1.ebuild
index 2eae9776f6ac..46f90fa74f44 100644
--- a/net-vpn/openconnect/openconnect-7.08-r1.ebuild
+++ b/net-vpn/openconnect/openconnect-7.08-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc64 x86"
 fi
 VPNC_VER=20180227
 SRC_URI="${ARCHIVE_URI}
@@ -157,6 +157,6 @@ pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog
 		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" net-dns/openresolv
+		optfeature "resolvconf support" virtual/resolvconf
 	fi
 }
diff --git a/net-vpn/openconnect/openconnect-7.08.ebuild b/net-vpn/openconnect/openconnect-7.08.ebuild
deleted file mode 100644
index e233f30d0203..000000000000
--- a/net-vpn/openconnect/openconnect-7.08.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="git://git.infradead.org/users/dwmw2/${PN}.git"
-	inherit git-r3 autotools
-else
-	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc64 x86"
-fi
-VPNC_VER=20160829
-SRC_URI="${ARCHIVE_URI}
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-IUSE="doc +gnutls gssapi java libproxy libressl lz4 nls smartcard static-libs stoken"
-
-DEPEND="
-	dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] )
-		libressl? ( dev-libs/libressl:0=[static-libs?] )
-	)
-	gnutls? (
-		app-misc/ca-certificates
-		dev-libs/nettle
-		>=net-libs/gnutls-3:0=[static-libs?]
-	)
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	lz4? ( app-arch/lz4:= )
-	nls? ( virtual/libintl )
-	smartcard? ( sys-apps/pcsc-lite:0= )
-	stoken? ( app-crypt/stoken )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	!<sys-apps/openrc-0.13"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	java? ( >=virtual/jdk-1.6 )
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="~TUN"
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if [[ ${LINGUAS+set} == set ]]; then
-		strip-linguas -u po
-		echo "${LINGUAS}" > po/LINGUAS || die
-	fi
-
-	if use doc; then
-		python_setup
-	else
-		export PYTHON=/bin/false
-	fi
-
-	local myconf=(
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
-		--without-openssl-version-check
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		$(use_with !gnutls openssl)
-		$(use_with gnutls)
-		$(use_with libproxy)
-		$(use_with lz4)
-		$(use_with gssapi)
-		$(use_with smartcard libpcsclite)
-		$(use_with stoken)
-		$(use_with java)
-	)
-
-	econf "${myconf[@]}"
-}
-
-DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
-
-You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
-instead of calling it directly:
-
-ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
-
-You can then start the vpn tunnel like this:
-
-/etc/init.d/openconnect.vpn0 start
-
-If you would like to run preup, postup, predown, and/or postdown scripts,
-You need to create a directory in /etc/openconnect with the name of the vpn:
-
-mkdir /etc/openconnect/vpn0
-
-Then add executable shell files:
-
-mkdir /etc/openconnect/vpn0
-cd /etc/openconnect/vpn0
-echo '#!/bin/sh' > preup.sh
-cp preup.sh predown.sh
-cp preup.sh postup.sh
-cp preup.sh postdown.sh
-chmod 755 /etc/openconnect/vpn0/*
-"
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	prune_libtool_files
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" net-dns/openresolv
-	fi
-}
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index 2eae9776f6ac..e5bb8a5a9d59 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -157,6 +157,6 @@ pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog
 		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" net-dns/openresolv
+		optfeature "resolvconf support" virtual/resolvconf
 	fi
 }
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index b2c688e64ee7..c7a07eb5e72f 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -1,11 +1,10 @@
 AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf3bc0629fe99cf9936b9cdb464627c1a8c121b8485f164166efda428825a55aab557d18 SHA512 d11ccc36ee89df5974547441fdb6c539dd3a7a5e235e318c1beddca7d4f5cace857f2dc75752e6fa913177eec9c3afcbed52de5bc08e8c314096d439cbc3bc6c
-DIST strongswan-5.5.3.tar.bz2 4768820 BLAKE2B 9f9da6c2ef27cec7f6a07f1cd5a7ecc8a92576fad2a5c6379b93d8a2e9d3b0804fe26dc0bc7b303754ef499ee938549c7cafbdf9a3f8f818d14cf88f613fe0fd SHA512 0b0b25d2102c98cda54300dc8c3c3a49a55e64f7c695dda65a24f2194f19bce0b7aab9e4f7486c243b552f9d1a94867d6a8782ee504aad1c9973809706d599ac
 DIST strongswan-5.6.0.tar.bz2 4850722 BLAKE2B edb9f2b277cd8bccf886a824e4b3fb3c06af7510d9e21283fcb8d8ba9cf234f38182fcd1ca0c350b4039945ab10888406986d9a0b8edac24fe09faf0b8967fb2 SHA512 9362069a01c3642e62864d88fdb409a3c7514bf7c92cbe36e552c6a80915119cf5bb91c39592aab2d15b562684a0628a764e4fa7636d3b5fd2ebaf165c0ce649
 DIST strongswan-5.6.2.tar.bz2 4977859 BLAKE2B 83943ec95e6b95724e9fc130a09f7c7364147d0ce50528ac8b64452db53516b143e92c7dcb746c0c25aaac9182dda14d55e5c267fbdcd5bb9a63cbf48801274b SHA512 cf2d5cb6c45d991fe0ad8eed4ea8628f95a1871e9728ddf0985aa26e78d1e6da1c92c961772aafd3e55cfcfa84516204a15561389d373f78140f05607b248c52
 DIST strongswan-5.6.3.tar.bz2 4961579 BLAKE2B 177d9ca9a730c8ccb3293c9f1c1397429879177aef60c90a3561fffed64cd4fe18cdf1c74bd52956c576e061ce33935b7dc34864576edeac7d4824841b0ee3e0 SHA512 080402640952b1a08e95bfe9c7f33c6a7dd01ac401b5e7e2e78257c0f2bf0a4d6078141232ac62abfacef892c493f6824948b3165d54d72b4e436ed564fd2609
-EBUILD strongswan-5.5.3.ebuild 9282 BLAKE2B 5532076749ccebd15e4b8442e5c674fed8fcea88b86cf9d2d60c69764763d3d5320aace805a7a8c8bea5d9d9be645f55aeca8d080212cea313ccd5e296b53061 SHA512 e2042e4aad5d7a3525eeba9164690a9c6563bb7e975ab4887ac17445da5050a57522f9621f576b14f2f871ff22e92cee8e8aebf537e65cfeb649ec94155a47ee
+DIST strongswan-5.7.1.tar.bz2 4967533 BLAKE2B e438d1b44a997eb0e012586b18604bd35ac6f53cce1c34ff89192a760bbd0d6a9aaa7b90b389ff1a5e7c6d2356ff5cc74b40daad1d6579fa5026f4878489bf66 SHA512 43102814434bee7c27a5956be59099cc4ffb9bb5b0d6382ce4c6a80d1d82ed6639f698f5f5544b9ca563554a344638c953525b0e2d39bc6b71b19055c80e07fc
 EBUILD strongswan-5.6.0-r1.ebuild 9316 BLAKE2B de030a9ae26d83c6f2aa2bdfadf3c6f29acebaa53b4e3b88389398c0ec8552f9107828afa0a5639471885e83cdf5b982373e9975ecb2567fb79adf3f3b9c6f7a SHA512 d2e6b7a8ce68033203d854429234e5a4600501d3d17db4b3f0b2e7f6c428aac5acbd74b48a88583464a5936467e180f126f269b5b046ebac047c547fa791222e
-EBUILD strongswan-5.6.0.ebuild 9286 BLAKE2B d0d7d0beb3d8a23f2b7594708f02c6eb79f07b3f73ac9f98202a97d3e51aef54f68df2575029db919f5d296e32cf08800ce8f7b904feae2f2e0acfa404c08749 SHA512 8c20bc8946c4b2f405afe37e05ca65bec82346b5eb96d444d0cd2cb8431551241482087799d0929f4fadc0511f2a723f431a254934866119d0ae3060513011d8
 EBUILD strongswan-5.6.2.ebuild 9320 BLAKE2B 3d760c087b443d75046c6db3e6dc079d401592588308379716781e25d5310844ec10464ba7791381fa7a6009a8af9217b6f64b442322320fb7cdd2b51ef87c3a SHA512 398534ef23686b54751f238c45a81d53990076eb3e7ff6c4591d5ddaadfb83808c0ad58d0ed46b467562f3c72693a414f4ad9645f51e9129758fcf8d255df8d9
 EBUILD strongswan-5.6.3.ebuild 9420 BLAKE2B b05e471c1a11f2a258a3f062c26a80a8a8426f798f09604c78926b2475ea63fc496da910286d94c1989330c7930680efc3cea8a0b97d484532d7e2acb79cbabb SHA512 6f2af391b174d5466e0d315a78884ea642aab521c3ddf1265acbdf28e802eb4c57695ecd612a6ea7f285e7e4245f2498d567079e949373d59db0979b3c54445e
+EBUILD strongswan-5.7.1.ebuild 9428 BLAKE2B f53b002ac83faa010e2e2b746b608c1966f428cc24c06aade953c757ef1ae70f3ec23dc5e9bc85eca8c9d84669a257386bb396106146972788027ca05aa8b623 SHA512 75d2922ee9927587f709291067fe639082733343dde255b3c35e015798c447d48a9a07761920788f848f2f05023240738212df58bf6c3cccca87372fe6a33e10
 MISC metadata.xml 4135 BLAKE2B 13739675c455765d7ce73df9744779636d36d3f93eee4567c931fb40e528e56d34912e26a82bd35e377fbd34613c0b7044841ff6c2dc26694187d0de355f8b86 SHA512 e09ef1afdf5002dab542312753cbce56e830b906aa5c5ac8fd5c7b57cbaf021eb0c466241cf810f446693b8dedd90f185f3e2c7a53a0b9a43e14913dcdd83b23
diff --git a/net-vpn/strongswan/strongswan-5.5.3.ebuild b/net-vpn/strongswan/strongswan-5.5.3.ebuild
deleted file mode 100644
index 7cf43b5ece0e..000000000000
--- a/net-vpn/strongswan/strongswan-5.5.3.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info systemd user
-
-DESCRIPTION="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
-HOMEPAGE="http://www.strongswan.org/"
-SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA DES"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86"
-IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11"
-
-STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
-STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
-for mod in $STRONGSWAN_PLUGINS_STD; do
-	IUSE="${IUSE} +strongswan_plugins_${mod}"
-done
-
-for mod in $STRONGSWAN_PLUGINS_OPT; do
-	IUSE="${IUSE} strongswan_plugins_${mod}"
-done
-
-COMMON_DEPEND="!net-misc/openswan
-	gmp? ( >=dev-libs/gmp-4.1.5:= )
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )
-	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] )
-	mysql? ( virtual/mysql )
-	sqlite? ( >=dev-db/sqlite-3.3.1 )
-	networkmanager? ( net-misc/networkmanager )
-	pam? ( sys-libs/pam )
-	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2
-	!net-vpn/libreswan
-	selinux? ( sec-policy/selinux-ipsec )"
-
-UGID="ipsec"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	elog "Linux kernel version: ${KV_FULL}"
-
-	if ! kernel_is -ge 2 6 16; then
-		eerror
-		eerror "This ebuild currently only supports ${PN} with the"
-		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
-		eerror
-	fi
-
-	if kernel_is -lt 2 6 34; then
-		ewarn
-		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
-		ewarn
-
-		if kernel_is -lt 2 6 29; then
-			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
-			ewarn "include all required IPv6 modules even if you just intend"
-			ewarn "to run on IPv4 only."
-			ewarn
-			ewarn "This has been fixed with kernels >= 2.6.29."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 33; then
-			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
-			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
-			ewarn "miss SHA384 and SHA512 HMAC support altogether."
-			ewarn
-			ewarn "If you need any of those features, please use kernel >= 2.6.33."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 34; then
-			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
-			ewarn "ESP cipher is only included in kernels >= 2.6.34."
-			ewarn
-			ewarn "If you need it, please use kernel >= 2.6.34."
-			ewarn
-		fi
-	fi
-
-	if use non-root; then
-		enewgroup ${UGID}
-		enewuser ${UGID} -1 -1 -1 ${UGID}
-	fi
-}
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	local myconf=""
-
-	if use non-root; then
-		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
-	fi
-
-	# If a user has already enabled db support, those plugins will
-	# most likely be desired as well. Besides they don't impose new
-	# dependencies and come at no cost (except for space).
-	if use mysql || use sqlite; then
-		myconf="${myconf} --enable-attr-sql --enable-sql"
-	fi
-
-	# strongSwan builds and installs static libs by default which are
-	# useless to the user (and to strongSwan for that matter) because no
-	# header files or alike get installed... so disabling them is safe.
-	if use pam && use eap; then
-		myconf="${myconf} --enable-eap-gtc"
-	else
-		myconf="${myconf} --disable-eap-gtc"
-	fi
-
-	for mod in $STRONGSWAN_PLUGINS_STD; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	for mod in $STRONGSWAN_PLUGINS_OPT; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	econf \
-		--disable-static \
-		--enable-ikev1 \
-		--enable-ikev2 \
-		--enable-swanctl \
-		--enable-socket-dynamic \
-		$(use_with caps capabilities libcap) \
-		$(use_enable curl) \
-		$(use_enable constraints) \
-		$(use_enable ldap) \
-		$(use_enable debug leak-detective) \
-		$(use_enable dhcp) \
-		$(use_enable eap eap-sim) \
-		$(use_enable eap eap-sim-file) \
-		$(use_enable eap eap-simaka-sql) \
-		$(use_enable eap eap-simaka-pseudonym) \
-		$(use_enable eap eap-simaka-reauth) \
-		$(use_enable eap eap-identity) \
-		$(use_enable eap eap-md5) \
-		$(use_enable eap eap-aka) \
-		$(use_enable eap eap-aka-3gpp2) \
-		$(use_enable eap md4) \
-		$(use_enable eap eap-mschapv2) \
-		$(use_enable eap eap-radius) \
-		$(use_enable eap eap-tls) \
-		$(use_enable eap xauth-eap) \
-		$(use_enable farp) \
-		$(use_enable gmp) \
-		$(use_enable gcrypt) \
-		$(use_enable mysql) \
-		$(use_enable networkmanager nm) \
-		$(use_enable openssl) \
-		$(use_enable pam xauth-pam) \
-		$(use_enable pkcs11) \
-		$(use_enable sqlite) \
-		"$(systemd_with_unitdir)" \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doinitd "${FILESDIR}"/ipsec
-
-	local dir_ugid
-	if use non-root; then
-		fowners ${UGID}:${UGID} \
-			/etc/ipsec.conf \
-			/etc/strongswan.conf
-
-		dir_ugid="${UGID}"
-	else
-		dir_ugid="root"
-	fi
-
-	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
-	dodir /etc/ipsec.d \
-		/etc/ipsec.d/aacerts \
-		/etc/ipsec.d/acerts \
-		/etc/ipsec.d/cacerts \
-		/etc/ipsec.d/certs \
-		/etc/ipsec.d/crls \
-		/etc/ipsec.d/ocspcerts \
-		/etc/ipsec.d/private \
-		/etc/ipsec.d/reqs
-
-	dodoc NEWS README TODO || die
-
-	# shared libs are used only internally and there are no static libs,
-	# so it's safe to get rid of the .la files
-	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
-}
-
-pkg_preinst() {
-	has_version "<net-vpn/strongswan-4.3.6-r1"
-	upgrade_from_leq_4_3_6=$(( !$? ))
-
-	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
-	previous_4_3_6_with_caps=$(( !$? ))
-}
-
-pkg_postinst() {
-	if ! use openssl && ! use gcrypt; then
-		elog
-		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
-		elog "Please note that this might effect availability and speed of some"
-		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
-	elif ! use openssl; then
-		elog
-		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
-		elog "availability and speed of some cryptographic features. There will be"
-		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
-		elog "25, 26) and ECDSA."
-	fi
-
-	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
-		chmod 0750 "${ROOT}"/etc/ipsec.d \
-			"${ROOT}"/etc/ipsec.d/aacerts \
-			"${ROOT}"/etc/ipsec.d/acerts \
-			"${ROOT}"/etc/ipsec.d/cacerts \
-			"${ROOT}"/etc/ipsec.d/certs \
-			"${ROOT}"/etc/ipsec.d/crls \
-			"${ROOT}"/etc/ipsec.d/ocspcerts \
-			"${ROOT}"/etc/ipsec.d/private \
-			"${ROOT}"/etc/ipsec.d/reqs
-
-		ewarn
-		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
-		ewarn "security reasons. Your system installed directories have been"
-		ewarn "updated accordingly. Please check if necessary."
-		ewarn
-
-		if [[ $previous_4_3_6_with_caps == 1 ]]; then
-			if ! use non-root; then
-				ewarn
-				ewarn "IMPORTANT: You previously had ${PN} installed without root"
-				ewarn "privileges because it was implied by the 'caps' USE flag."
-				ewarn "This has been changed. If you want ${PN} with user privileges,"
-				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
-				ewarn
-			fi
-		fi
-	fi
-	if ! use caps && ! use non-root; then
-		ewarn
-		ewarn "You have decided to run ${PN} with root privileges and built it"
-		ewarn "without support for POSIX capability dropping. It is generally"
-		ewarn "strongly suggested that you reconsider- especially if you intend"
-		ewarn "to run ${PN} as server with a public ip address."
-		ewarn
-		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
-		ewarn
-	fi
-	if use non-root; then
-		elog
-		elog "${PN} has been installed without superuser privileges (USE=non-root)."
-		elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
-		elog "but also a few to the IKEv2 daemon 'charon'."
-		elog
-		elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
-		elog
-		elog "pluto uses a helper script by default to insert/remove routing and"
-		elog "policy rules upon connection start/stop which requires superuser"
-		elog "privileges. charon in contrast does this internally and can do so"
-		elog "even with reduced (user) privileges."
-		elog
-		elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
-		elog "script to pluto or charon which requires superuser privileges, you"
-		elog "can work around this limitation by using sudo to grant the"
-		elog "user \"ipsec\" the appropriate rights."
-		elog "For example (the default case):"
-		elog "/etc/sudoers:"
-		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
-		elog "Under the specific connection block in /etc/ipsec.conf:"
-		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
-		elog
-	fi
-	elog
-	elog "Make sure you have _all_ required kernel modules available including"
-	elog "the appropriate cryptographic algorithms. A list is available at:"
-	elog "  http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
-	elog
-	elog "The up-to-date manual is available online at:"
-	elog "  http://wiki.strongswan.org/"
-	elog
-}
diff --git a/net-vpn/strongswan/strongswan-5.6.0.ebuild b/net-vpn/strongswan/strongswan-5.6.0.ebuild
deleted file mode 100644
index c4736a962302..000000000000
--- a/net-vpn/strongswan/strongswan-5.6.0.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info systemd user
-
-DESCRIPTION="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
-HOMEPAGE="http://www.strongswan.org/"
-SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11"
-
-STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
-STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
-for mod in $STRONGSWAN_PLUGINS_STD; do
-	IUSE="${IUSE} +strongswan_plugins_${mod}"
-done
-
-for mod in $STRONGSWAN_PLUGINS_OPT; do
-	IUSE="${IUSE} strongswan_plugins_${mod}"
-done
-
-COMMON_DEPEND="!net-misc/openswan
-	gmp? ( >=dev-libs/gmp-4.1.5:= )
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )
-	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] )
-	mysql? ( virtual/mysql )
-	sqlite? ( >=dev-db/sqlite-3.3.1 )
-	networkmanager? ( net-misc/networkmanager )
-	pam? ( sys-libs/pam )
-	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2
-	!net-vpn/libreswan
-	selinux? ( sec-policy/selinux-ipsec )"
-
-UGID="ipsec"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	elog "Linux kernel version: ${KV_FULL}"
-
-	if ! kernel_is -ge 2 6 16; then
-		eerror
-		eerror "This ebuild currently only supports ${PN} with the"
-		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
-		eerror
-	fi
-
-	if kernel_is -lt 2 6 34; then
-		ewarn
-		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
-		ewarn
-
-		if kernel_is -lt 2 6 29; then
-			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
-			ewarn "include all required IPv6 modules even if you just intend"
-			ewarn "to run on IPv4 only."
-			ewarn
-			ewarn "This has been fixed with kernels >= 2.6.29."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 33; then
-			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
-			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
-			ewarn "miss SHA384 and SHA512 HMAC support altogether."
-			ewarn
-			ewarn "If you need any of those features, please use kernel >= 2.6.33."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 34; then
-			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
-			ewarn "ESP cipher is only included in kernels >= 2.6.34."
-			ewarn
-			ewarn "If you need it, please use kernel >= 2.6.34."
-			ewarn
-		fi
-	fi
-
-	if use non-root; then
-		enewgroup ${UGID}
-		enewuser ${UGID} -1 -1 -1 ${UGID}
-	fi
-}
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	local myconf=""
-
-	if use non-root; then
-		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
-	fi
-
-	# If a user has already enabled db support, those plugins will
-	# most likely be desired as well. Besides they don't impose new
-	# dependencies and come at no cost (except for space).
-	if use mysql || use sqlite; then
-		myconf="${myconf} --enable-attr-sql --enable-sql"
-	fi
-
-	# strongSwan builds and installs static libs by default which are
-	# useless to the user (and to strongSwan for that matter) because no
-	# header files or alike get installed... so disabling them is safe.
-	if use pam && use eap; then
-		myconf="${myconf} --enable-eap-gtc"
-	else
-		myconf="${myconf} --disable-eap-gtc"
-	fi
-
-	for mod in $STRONGSWAN_PLUGINS_STD; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	for mod in $STRONGSWAN_PLUGINS_OPT; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	econf \
-		--disable-static \
-		--enable-ikev1 \
-		--enable-ikev2 \
-		--enable-swanctl \
-		--enable-socket-dynamic \
-		$(use_with caps capabilities libcap) \
-		$(use_enable curl) \
-		$(use_enable constraints) \
-		$(use_enable ldap) \
-		$(use_enable debug leak-detective) \
-		$(use_enable dhcp) \
-		$(use_enable eap eap-sim) \
-		$(use_enable eap eap-sim-file) \
-		$(use_enable eap eap-simaka-sql) \
-		$(use_enable eap eap-simaka-pseudonym) \
-		$(use_enable eap eap-simaka-reauth) \
-		$(use_enable eap eap-identity) \
-		$(use_enable eap eap-md5) \
-		$(use_enable eap eap-aka) \
-		$(use_enable eap eap-aka-3gpp2) \
-		$(use_enable eap md4) \
-		$(use_enable eap eap-mschapv2) \
-		$(use_enable eap eap-radius) \
-		$(use_enable eap eap-tls) \
-		$(use_enable eap xauth-eap) \
-		$(use_enable farp) \
-		$(use_enable gmp) \
-		$(use_enable gcrypt) \
-		$(use_enable mysql) \
-		$(use_enable networkmanager nm) \
-		$(use_enable openssl) \
-		$(use_enable pam xauth-pam) \
-		$(use_enable pkcs11) \
-		$(use_enable sqlite) \
-		"$(systemd_with_unitdir)" \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doinitd "${FILESDIR}"/ipsec
-
-	local dir_ugid
-	if use non-root; then
-		fowners ${UGID}:${UGID} \
-			/etc/ipsec.conf \
-			/etc/strongswan.conf
-
-		dir_ugid="${UGID}"
-	else
-		dir_ugid="root"
-	fi
-
-	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
-	dodir /etc/ipsec.d \
-		/etc/ipsec.d/aacerts \
-		/etc/ipsec.d/acerts \
-		/etc/ipsec.d/cacerts \
-		/etc/ipsec.d/certs \
-		/etc/ipsec.d/crls \
-		/etc/ipsec.d/ocspcerts \
-		/etc/ipsec.d/private \
-		/etc/ipsec.d/reqs
-
-	dodoc NEWS README TODO || die
-
-	# shared libs are used only internally and there are no static libs,
-	# so it's safe to get rid of the .la files
-	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
-}
-
-pkg_preinst() {
-	has_version "<net-vpn/strongswan-4.3.6-r1"
-	upgrade_from_leq_4_3_6=$(( !$? ))
-
-	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
-	previous_4_3_6_with_caps=$(( !$? ))
-}
-
-pkg_postinst() {
-	if ! use openssl && ! use gcrypt; then
-		elog
-		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
-		elog "Please note that this might effect availability and speed of some"
-		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
-	elif ! use openssl; then
-		elog
-		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
-		elog "availability and speed of some cryptographic features. There will be"
-		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
-		elog "25, 26) and ECDSA."
-	fi
-
-	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
-		chmod 0750 "${ROOT}"/etc/ipsec.d \
-			"${ROOT}"/etc/ipsec.d/aacerts \
-			"${ROOT}"/etc/ipsec.d/acerts \
-			"${ROOT}"/etc/ipsec.d/cacerts \
-			"${ROOT}"/etc/ipsec.d/certs \
-			"${ROOT}"/etc/ipsec.d/crls \
-			"${ROOT}"/etc/ipsec.d/ocspcerts \
-			"${ROOT}"/etc/ipsec.d/private \
-			"${ROOT}"/etc/ipsec.d/reqs
-
-		ewarn
-		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
-		ewarn "security reasons. Your system installed directories have been"
-		ewarn "updated accordingly. Please check if necessary."
-		ewarn
-
-		if [[ $previous_4_3_6_with_caps == 1 ]]; then
-			if ! use non-root; then
-				ewarn
-				ewarn "IMPORTANT: You previously had ${PN} installed without root"
-				ewarn "privileges because it was implied by the 'caps' USE flag."
-				ewarn "This has been changed. If you want ${PN} with user privileges,"
-				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
-				ewarn
-			fi
-		fi
-	fi
-	if ! use caps && ! use non-root; then
-		ewarn
-		ewarn "You have decided to run ${PN} with root privileges and built it"
-		ewarn "without support for POSIX capability dropping. It is generally"
-		ewarn "strongly suggested that you reconsider- especially if you intend"
-		ewarn "to run ${PN} as server with a public ip address."
-		ewarn
-		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
-		ewarn
-	fi
-	if use non-root; then
-		elog
-		elog "${PN} has been installed without superuser privileges (USE=non-root)."
-		elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
-		elog "but also a few to the IKEv2 daemon 'charon'."
-		elog
-		elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
-		elog
-		elog "pluto uses a helper script by default to insert/remove routing and"
-		elog "policy rules upon connection start/stop which requires superuser"
-		elog "privileges. charon in contrast does this internally and can do so"
-		elog "even with reduced (user) privileges."
-		elog
-		elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
-		elog "script to pluto or charon which requires superuser privileges, you"
-		elog "can work around this limitation by using sudo to grant the"
-		elog "user \"ipsec\" the appropriate rights."
-		elog "For example (the default case):"
-		elog "/etc/sudoers:"
-		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
-		elog "Under the specific connection block in /etc/ipsec.conf:"
-		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
-		elog
-	fi
-	elog
-	elog "Make sure you have _all_ required kernel modules available including"
-	elog "the appropriate cryptographic algorithms. A list is available at:"
-	elog "  http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
-	elog
-	elog "The up-to-date manual is available online at:"
-	elog "  http://wiki.strongswan.org/"
-	elog
-}
diff --git a/net-vpn/strongswan/strongswan-5.7.1.ebuild b/net-vpn/strongswan/strongswan-5.7.1.ebuild
new file mode 100644
index 000000000000..c787179ae1ee
--- /dev/null
+++ b/net-vpn/strongswan/strongswan-5.7.1.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit linux-info systemd user
+
+DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="https://www.strongswan.org/"
+SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT="aesni blowfish ccm chapoly ctr forecast gcm ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+	IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="!net-misc/openswan
+	gmp? ( >=dev-libs/gmp-4.1.5:= )
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap )
+	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] )
+	mysql? ( dev-db/mysql-connector-c:= )
+	sqlite? ( >=dev-db/sqlite-3.3.1 )
+	systemd? ( sys-apps/systemd )
+	networkmanager? ( net-misc/networkmanager )
+	pam? ( sys-libs/pam )
+	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
+DEPEND="${COMMON_DEPEND}
+	virtual/linux-sources
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	sys-apps/iproute2
+	!net-vpn/libreswan
+	selinux? ( sec-policy/selinux-ipsec )"
+
+UGID="ipsec"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	elog "Linux kernel version: ${KV_FULL}"
+
+	if ! kernel_is -ge 2 6 16; then
+		eerror
+		eerror "This ebuild currently only supports ${PN} with the"
+		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+		eerror
+	fi
+
+	if kernel_is -lt 2 6 34; then
+		ewarn
+		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+		ewarn
+
+		if kernel_is -lt 2 6 29; then
+			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+			ewarn "include all required IPv6 modules even if you just intend"
+			ewarn "to run on IPv4 only."
+			ewarn
+			ewarn "This has been fixed with kernels >= 2.6.29."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 33; then
+			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+			ewarn "miss SHA384 and SHA512 HMAC support altogether."
+			ewarn
+			ewarn "If you need any of those features, please use kernel >= 2.6.33."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 34; then
+			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+			ewarn "ESP cipher is only included in kernels >= 2.6.34."
+			ewarn
+			ewarn "If you need it, please use kernel >= 2.6.34."
+			ewarn
+		fi
+	fi
+
+	if use non-root; then
+		enewgroup ${UGID}
+		enewuser ${UGID} -1 -1 -1 ${UGID}
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if use non-root; then
+		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+	fi
+
+	# If a user has already enabled db support, those plugins will
+	# most likely be desired as well. Besides they don't impose new
+	# dependencies and come at no cost (except for space).
+	if use mysql || use sqlite; then
+		myconf="${myconf} --enable-attr-sql --enable-sql"
+	fi
+
+	# strongSwan builds and installs static libs by default which are
+	# useless to the user (and to strongSwan for that matter) because no
+	# header files or alike get installed... so disabling them is safe.
+	if use pam && use eap; then
+		myconf="${myconf} --enable-eap-gtc"
+	else
+		myconf="${myconf} --disable-eap-gtc"
+	fi
+
+	for mod in $STRONGSWAN_PLUGINS_STD; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	econf \
+		--disable-static \
+		--enable-ikev1 \
+		--enable-ikev2 \
+		--enable-swanctl \
+		--enable-socket-dynamic \
+		$(use_enable curl) \
+		$(use_enable constraints) \
+		$(use_enable ldap) \
+		$(use_enable debug leak-detective) \
+		$(use_enable dhcp) \
+		$(use_enable eap eap-sim) \
+		$(use_enable eap eap-sim-file) \
+		$(use_enable eap eap-simaka-sql) \
+		$(use_enable eap eap-simaka-pseudonym) \
+		$(use_enable eap eap-simaka-reauth) \
+		$(use_enable eap eap-identity) \
+		$(use_enable eap eap-md5) \
+		$(use_enable eap eap-aka) \
+		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap md4) \
+		$(use_enable eap eap-mschapv2) \
+		$(use_enable eap eap-radius) \
+		$(use_enable eap eap-tls) \
+		$(use_enable eap eap-ttls) \
+		$(use_enable eap xauth-eap) \
+		$(use_enable eap eap-dynamic) \
+		$(use_enable farp) \
+		$(use_enable gmp) \
+		$(use_enable gcrypt) \
+		$(use_enable mysql) \
+		$(use_enable networkmanager nm) \
+		$(use_enable openssl) \
+		$(use_enable pam xauth-pam) \
+		$(use_enable pkcs11) \
+		$(use_enable sqlite) \
+		$(use_enable systemd) \
+		$(use_with caps capabilities libcap) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doinitd "${FILESDIR}"/ipsec
+
+	local dir_ugid
+	if use non-root; then
+		fowners ${UGID}:${UGID} \
+			/etc/ipsec.conf \
+			/etc/strongswan.conf
+
+		dir_ugid="${UGID}"
+	else
+		dir_ugid="root"
+	fi
+
+	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+	dodir /etc/ipsec.d \
+		/etc/ipsec.d/aacerts \
+		/etc/ipsec.d/acerts \
+		/etc/ipsec.d/cacerts \
+		/etc/ipsec.d/certs \
+		/etc/ipsec.d/crls \
+		/etc/ipsec.d/ocspcerts \
+		/etc/ipsec.d/private \
+		/etc/ipsec.d/reqs
+
+	dodoc NEWS README TODO || die
+
+	# shared libs are used only internally and there are no static libs,
+	# so it's safe to get rid of the .la files
+	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+	has_version "<net-vpn/strongswan-4.3.6-r1"
+	upgrade_from_leq_4_3_6=$(( !$? ))
+
+	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
+	previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+	if ! use openssl && ! use gcrypt; then
+		elog
+		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+		elog "Please note that this might effect availability and speed of some"
+		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+	elif ! use openssl; then
+		elog
+		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+		elog "availability and speed of some cryptographic features. There will be"
+		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+		elog "25, 26) and ECDSA."
+	fi
+
+	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+		chmod 0750 "${ROOT}"/etc/ipsec.d \
+			"${ROOT}"/etc/ipsec.d/aacerts \
+			"${ROOT}"/etc/ipsec.d/acerts \
+			"${ROOT}"/etc/ipsec.d/cacerts \
+			"${ROOT}"/etc/ipsec.d/certs \
+			"${ROOT}"/etc/ipsec.d/crls \
+			"${ROOT}"/etc/ipsec.d/ocspcerts \
+			"${ROOT}"/etc/ipsec.d/private \
+			"${ROOT}"/etc/ipsec.d/reqs
+
+		ewarn
+		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+		ewarn "security reasons. Your system installed directories have been"
+		ewarn "updated accordingly. Please check if necessary."
+		ewarn
+
+		if [[ $previous_4_3_6_with_caps == 1 ]]; then
+			if ! use non-root; then
+				ewarn
+				ewarn "IMPORTANT: You previously had ${PN} installed without root"
+				ewarn "privileges because it was implied by the 'caps' USE flag."
+				ewarn "This has been changed. If you want ${PN} with user privileges,"
+				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+				ewarn
+			fi
+		fi
+	fi
+	if ! use caps && ! use non-root; then
+		ewarn
+		ewarn "You have decided to run ${PN} with root privileges and built it"
+		ewarn "without support for POSIX capability dropping. It is generally"
+		ewarn "strongly suggested that you reconsider- especially if you intend"
+		ewarn "to run ${PN} as server with a public ip address."
+		ewarn
+		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+		ewarn
+	fi
+	if use non-root; then
+		elog
+		elog "${PN} has been installed without superuser privileges (USE=non-root)."
+		elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
+		elog "but also a few to the IKEv2 daemon 'charon'."
+		elog
+		elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
+		elog
+		elog "pluto uses a helper script by default to insert/remove routing and"
+		elog "policy rules upon connection start/stop which requires superuser"
+		elog "privileges. charon in contrast does this internally and can do so"
+		elog "even with reduced (user) privileges."
+		elog
+		elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
+		elog "script to pluto or charon which requires superuser privileges, you"
+		elog "can work around this limitation by using sudo to grant the"
+		elog "user \"ipsec\" the appropriate rights."
+		elog "For example (the default case):"
+		elog "/etc/sudoers:"
+		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+		elog "Under the specific connection block in /etc/ipsec.conf:"
+		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
+		elog
+	fi
+	elog
+	elog "Make sure you have _all_ required kernel modules available including"
+	elog "the appropriate cryptographic algorithms. A list is available at:"
+	elog "  http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+	elog
+	elog "The up-to-date manual is available online at:"
+	elog "  http://wiki.strongswan.org/"
+	elog
+}
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index cb6beadf9b81..72e0bd53d081 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -7,8 +7,10 @@ AUX tincd.conf 728 BLAKE2B fdfe320df4ac8112fb5ee64cd88cd228bef8d1e701a00598691a3
 AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77d98679078bfddd2ad9a534e1ed7d8ac743aaf026863dd9952e96e3bf2a8f950115c9f059a2660afc6 SHA512 866f8adbc9c39cc6030e6046e4265a4f6e893960045df15abc0a1865599cf2576ac12468bd1a286df47248ebe2c6b16ba64a60f0ebeeb0212d850a9d7886c98a
 DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da SHA512 f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
 DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd SHA512 b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
+DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3 SHA512 037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
 DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b SHA512 b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43
 EBUILD tinc-1.0.33.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
 EBUILD tinc-1.0.34.ebuild 1212 BLAKE2B b1561117d04453a25dba0f834a30e7ca816fb439cecb5bed8879a73d980290e10ead3b77d2cd0332a16af4b3e0bb5ad9c8db71ce6f45af224f92d954eadb3a6e SHA512 d58d37be4d1c8852299bd9c72f152c2e156ff6838e04b4fb3d21bd7dbf218f53f37acf4edac292b1ba10fb7dfab295ee3d546e774866fd4cb0a82551c077f9e4
+EBUILD tinc-1.0.35.ebuild 1068 BLAKE2B 61e0222d74e8f01930905649be368cc6da9cc37d047f0d78259deca6badc296ff2e8738144e9eecb8b13848f4b34795cba39b623eb50af677d203169c1429f2c SHA512 86835b3684728c69084d59bb94f7d996a1c74a7a215ba11902c4dba3041a0569b88e90748f53412f395482c879f8fb96dee16905e8c605fc08ce3b4607114b38
 EBUILD tinc-1.1_pre16-r1.ebuild 2410 BLAKE2B 45ca4aa369b5d8fb66cd8af6c25b0f124059a86fece6ad89d72f83a5e76e7a4d92b8ed84cecf256737547f596ce32c3479cd68776bd47276d74e60943048374a SHA512 e95f032539e58a0387740f34ff82c51315454b117288a21d45cc620c763a76e3c17edd32b278ef606edf3119d8edd149be117ab95ac277ed01d6819e4ff9811c
 MISC metadata.xml 723 BLAKE2B 09ac4b61d77c06379478413b2c8f33762908f272de27f7721d7cc02ad77b91755944835544ec6219a5d2744e3d79b2262d570e319140c4d06fae988caf7a7666 SHA512 d1aa24b5c5548fc37c19a992d211918afb93d361b385307f3d6bef783d381a465d0a743832425857766e5af5a8f960e5708cb60a1738d4a29bc659f6293d3bda
diff --git a/net-vpn/tinc/tinc-1.0.35.ebuild b/net-vpn/tinc/tinc-1.0.35.ebuild
new file mode 100644
index 000000000000..8d387dbc59c8
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.0.35.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/"
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="libressl +lzo uml vde +zlib"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	lzo? ( dev-libs/lzo:2 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	vde? ( net-misc/vde )"
+
+src_configure() {
+	econf \
+		--enable-jumbograms \
+		--disable-tunemu  \
+		$(use_enable lzo) \
+		$(use_enable uml) \
+		$(use_enable vde) \
+		$(use_enable zlib)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodir /etc/tinc
+	dodoc AUTHORS NEWS README THANKS
+	doconfd "${FILESDIR}"/tinc.networks
+	newconfd "${FILESDIR}"/tincd.conf tincd
+	newinitd "${FILESDIR}"/tincd-r1 tincd
+	systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
+}
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 963ef93e3935..789f66fe124c 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,9 +7,9 @@ AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a
 DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
 DIST tor-0.3.4.7-rc.tar.gz 6668322 BLAKE2B 863d24d04ba7919d08b3c69bca2edf3ee46af6aa074812f76067199670b17bb8538233c7631cb17e1cada4b2b4527b0db4b3b7a7b945ae7ca7a03e52685fce00 SHA512 664211ffd6adcdb325cf669fed9fb7c70b1416da3df046c35622b5104a4b63d9a3123eb40744bc070d29ff97472adf31b1aaecea5b91c07059d0cdad79569b58
 DIST tor-0.3.4.8.tar.gz 6679385 BLAKE2B 9cb65442effd1cfceb34f3483a0e96de5e59e9ce1bd2241533dd8eb62e4428a6c0f9decd816dda49515fc92acd8c77e69f7d39133a67fb5053a858dc78464791 SHA512 bfedc29253cb8fdbe1864ea5992ad33184577d88ab806a249a544f3b3142a7bc1453892955df335185aff72508095fb2a2a07ac6b96c99668e5e8d593d7aea6d
-DIST tor-0.3.5.2-alpha.tar.gz 6698132 BLAKE2B a922ebb2b1967db57285abbde203f6accc95be3a5bb446df9aa332de11240fc65d61f944e9df860f8e2f57b943bade335098c1ddb05b194acffa6d6b2df10d97 SHA512 57344a71bbdf6bc0488f8ac5383de3832c411bdb34c620d3effb7146adbcccbb6e6c7a3a794e6b4a9ba5ff191c02f5e411fe96de41f21292385dcd46434903ce
+DIST tor-0.3.5.3-alpha.tar.gz 6862572 BLAKE2B c4832828042bbecaf7c34bcb8999873cb4a5314598b2731cba02b2335c09fd8685588c52b15345821288cc94c9ab731c150b5010dee27d2dce1a15914ee31a6d SHA512 fdbbf5a69f9c0708afa4bb9e4925db4f7384997d7f497f1298d0106b76944c060c858fd061aa292310384e7b35f0ac41570cd89bb8c7e8208c832908fa3288af
 EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
 EBUILD tor-0.3.4.7_rc.ebuild 2232 BLAKE2B 3932f94eadda82099130eea978fcb76a88ba5b60bc62942f40b53b1e1d3d47f6ba94d056159bb6ea7d13c4f36eee7ac74b2a1ea6c60a351f38a3dc246ad0ea63 SHA512 0550f1a625ff99adf97ff4dfccc4874596a32ae6ffbc550493acd29f3f8377c7029c142c2b9c4ecc201ab72914ccb26e583b4bd0f51cf5e590155daa870c4989
 EBUILD tor-0.3.4.8.ebuild 2237 BLAKE2B 2d21116f6249afbc98dc16881219fe689fec38c392e253d0b9661edf28d0fffb357c10c04fcf259368b66d0a25b7e2e558134cee404040b3bab78104985afad0 SHA512 64ed20c1dcd0486883729a8f90f89e80e9be5b499f17d3309313ea5aeaf29027ea82db0aa4ae00c107c3af123d4f1de5af003fbbee25cd188c2ea7cae398cb80
-EBUILD tor-0.3.5.2_alpha.ebuild 2215 BLAKE2B 33b04c74ef81f1ed3d18c84a0a5bf52db92d42037444d432f181cb36eef2b0cf056f79f642e9023758b6e2706253c122c43fe8e065e38865f555fc6d51263bc6 SHA512 bb2c831146afe5a57e4607c0cdaacc57b0b57667d514e63b31ba3d3468916b98836a96fffdf251ae41d9d52c92352174ece6c4e4eb069dafb9a677fa8fa7943f
+EBUILD tor-0.3.5.3_alpha.ebuild 2215 BLAKE2B 33b04c74ef81f1ed3d18c84a0a5bf52db92d42037444d432f181cb36eef2b0cf056f79f642e9023758b6e2706253c122c43fe8e065e38865f555fc6d51263bc6 SHA512 bb2c831146afe5a57e4607c0cdaacc57b0b57667d514e63b31ba3d3468916b98836a96fffdf251ae41d9d52c92352174ece6c4e4eb069dafb9a677fa8fa7943f
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.5.2_alpha.ebuild b/net-vpn/tor/tor-0.3.5.3_alpha.ebuild
index eec218e6109b..eec218e6109b 100644
--- a/net-vpn/tor/tor-0.3.5.2_alpha.ebuild
+++ b/net-vpn/tor/tor-0.3.5.3_alpha.ebuild
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index a78155158b23..551e35cf10b5 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20181006.tar.xz 298168 BLAKE2B 711c3dfe601b99f5525176aa2cb38722d6f4bf2b1704c6e0d09f78f588258e21d3a5dcbc407f18421964c79fd42e9f62a13312ba254fb1d7fe08c0fd1d75d5b7 SHA512 a8cfae43c3d1c4bcebd5f301eb7ce3d45f799383c8b696757e84e53d921027d415dc4459628a1dd441f0c5d31079582a54517e8de0b258452ea4a310362be9bf
-EBUILD wireguard-0.0.20181006.ebuild 5142 BLAKE2B 9741b00e97a85fe032de77fe709e403b0ab26c2a7a722eb2b84fe02b73070271f4b6a9e0703e5b2cbdb1918e88a7e7b810f686af80dc8b59f5285a7cc68bbcfd SHA512 e6755ac3095ab7e059ae036f7548ed25ce933e5f5170852993574f60a3ce73667592a8b31a8cae26f95190825395b86ad40542e4833bc3fb3b2b712b9caecafe
+DIST WireGuard-0.0.20181018.tar.xz 299432 BLAKE2B 05869b7a421761581445b8e383119a893d65ec9ff7b53551bede6022ee7609e9bc2c8081392ac5eba382ae817a281390f1fcfb35cd7c9a8b32794eb25878e541 SHA512 ab9f42bdae1b12a95faaf51d5b9e17a8635c67386feefaaa40e0395d78c3258b9afa8a1d2f64010fac4867fa0d229a4ed850fab8a24678d6c8aa2ab6e30ae1b3
+EBUILD wireguard-0.0.20181018.ebuild 5142 BLAKE2B 9741b00e97a85fe032de77fe709e403b0ab26c2a7a722eb2b84fe02b73070271f4b6a9e0703e5b2cbdb1918e88a7e7b810f686af80dc8b59f5285a7cc68bbcfd SHA512 e6755ac3095ab7e059ae036f7548ed25ce933e5f5170852993574f60a3ce73667592a8b31a8cae26f95190825395b86ad40542e4833bc3fb3b2b712b9caecafe
 EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
 MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20181006.ebuild b/net-vpn/wireguard/wireguard-0.0.20181018.ebuild
index 035320b20fd3..035320b20fd3 100644
--- a/net-vpn/wireguard/wireguard-0.0.20181006.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20181018.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index e280e798a136..3a5b05dffa75 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 556106a10b13..544e9c80b0da 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -5,7 +5,7 @@ DIST aircrack-ng-1.2-rc1.tar.gz 2046476 BLAKE2B aec848a3dedae564cc29fc94475d0dec
 DIST aircrack-ng-1.3.tar.gz 4501507 BLAKE2B ae73303fbc0c632faa2468d5fbf0daa318767633bf92571cc53fd79d8df518c1fc03ad83397e12585a804f0171e3fe3865c070ccdb39cb43ae46edbfc880b37e SHA512 0c2376ac702cd36021b9017b40c5af9466c5689832a0e40debcb8c0a2cd13ec942170930903c4e2e06678c429a89cd4d78ab43e925b707f816bf48d6c9514ec9
 DIST aircrack-ng-1.4.tar.gz 7138756 BLAKE2B 35a499877671be99271116eb4c5a26c7c803485e46d5e8e429b5beafe900455e88d52350107f96f5fb1f46643120a1ad63c96ab45672efdcbd23bdcc54aeedf4 SHA512 cad82b6fcd64c094d427a985cd1f5bc95434f83db1811e2c8798932983759e0846cf66034e444ba8ec861547d3107560e0f1430ec03e3d3a080c5fb1207a2a09
 EBUILD aircrack-ng-1.2_rc1-r1.ebuild 3523 BLAKE2B eeda867b14d763a397287928b64217635a2b4b11250b98fc818ce0910c9fa9e30e68a78c02a741c79a653f6c9177d733caaae7e63748c20f29ebd6c4819f007f SHA512 151fec44861e17742ec7cbbbc7198eaf24f9cdd4ceee78902c248fced3ab6df49ed1da466b39f203201e9c9124b5e8b1042df75ef705a7024205c5276853a0d7
-EBUILD aircrack-ng-1.3-r3.ebuild 2910 BLAKE2B 09832ee1f86e56b3c7e103d5f21bb08ebefb2bde192ae548c9962c12a17084e44c0d86acbc6183d5aa7853eb1ad063c8f4980635a9c5ff706558181206baa444 SHA512 fd9999c63bbb38c514c729d5a5cf50ed72be3a2086ce684a6b1380cbb2ba9520950c0d73f22677eb66960300f04c4fe94c4abf63d4ed13b9b3d05457ec4dbb41
+EBUILD aircrack-ng-1.3-r3.ebuild 2910 BLAKE2B 46031550c7729538b0ccdab9e3a95cd175371032697afd74acf8de3181793bb6038914d3aa87acf50e4085b777fffd44f0c2461cfd30d368b74117f34c3c629b SHA512 6e49a5f36bd9b69bf60c8d047df89cc7a342687156a8bdde68ecf5f4e8365bf508706bb15a7e6a28d8bc9749f5da95e59894fffb7eccbc95c464872122337ba3
 EBUILD aircrack-ng-1.4.ebuild 2879 BLAKE2B eb04cb35e19963dc2badfd43ca6fe94526506aba508c38945ffdd635d2a21330d08a385937ffb3739e5356e1e1c526c844417e3f452c1e23d5e3d91066a7001c SHA512 796529ab8d0940dad89766626b2d6ca4e61635431a53552bbdfaa749fd8be25f08cbcf940b09aef10dc1e0c1be4ce41b83f7c04b30cb1d80305953f9ee02d350
 EBUILD aircrack-ng-9999.ebuild 2870 BLAKE2B ce4d27a79c4745d75064cda730b644a4359dd3235a23e8a78e6480a21b2ebe8055c63bb864de4aecc0f6f6d655dcfcdb21086d26c144b12745fe6d8577375191 SHA512 7f5ecbf1b7ba3f8a281dea31e92ade9c540663b130921d520c60f33d88136b3ad3d16a47977408e6a460346aea2f30ebd3d8718b3c5aadbf8e56815e5a95e268
 MISC metadata.xml 1130 BLAKE2B 9d3c0463a4a1cf4360ce77c550a701a805cd3db5f06ee895aa8888180246d6b51970d23b74b723a241e09bb6dde426055ca8f1288afffa90e8e4abc7d9c4b92a SHA512 0ca935ebf651d221657fda9320fc8a8f8dbabd9d10fc4eebb8b301b63ca8f9316069bee16b2468d227ea5acf53a28747c8479eb776983334b9496d68fefa76ee
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild
index 40e884028410..5e921f46691a 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,11 +14,11 @@ 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="amd64 x86"
+	KEYWORDS="amd64 arm x86"
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 407226d27c0f..26a29b13c214 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -9,5 +9,5 @@ AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e59907
 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 8035 BLAKE2B e1b00db7d72012a8f3c6273ffa79bbabc3ec4581a2cd66b590ab235e5c4b231976bcf4e8ac44eed4063c71835b3282f07bb5f1eaba0b309ec588c422bb0f6c0c SHA512 244725cdc9572c8d5fcd724d0d00ce5fa372fbec9a757a7d63086143a20a4cd42d142be483c54b05ecd16eed87991973da482958591528f69fdabf9775d40e87
+EBUILD bluez-5.50.ebuild 8034 BLAKE2B 40c26daeb9815f19adbe23cf616d5e55f9df5808c8bb953e020c084f96102b8e0ffeb70d0a1ce455b3c138e94b0cea283150a55cdf6c214dc688e22715fc6484 SHA512 11cd1e2e38c6facf7f9c7a973225eec7b5f811b16713cd0a832cf12f151da4c37b9ae032dae21359c2060e14eedc8edfeac40d3bfd7ff14d4573bb479252d276
 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 0d27acb9a3b5..b6088a7fad22 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 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~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/iwd/Manifest b/net-wireless/iwd/Manifest
index 5ba453bd9b11..c839785f4437 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,8 +1,10 @@
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
+DIST iwd-0.10.tar.xz 676708 BLAKE2B 2d8eb4bbc3aca0c060965a86d55267de30cc5e0a42e262483e422611fb6a1890426b1b458539db757181226f84db17b2434b45a7b207d45e3009358d3e528e47 SHA512 143dc42bb09a62d80eaf43b6fc8a268ed423a15361f15ef555ee4ddd815319a99322517905b2de473624988da5eeba546b474880a583e9c605946ce22bd980ad
 DIST iwd-0.7.tar.xz 662984 BLAKE2B e6e7fa323749c8012c4df5f8f02f97523a37bcbb99d2a2f8c7678d4a1a73a3e24fc4321d53fb95f7fa325748f97b96e1a5f0fe0e956314eeb8534a8bc989a13f SHA512 e6029e33f43fda24f3ddb87b1bb878ad8926066380a0e71415e645bc4f8aa1a6aaa43d2482987b1d473c267fef6d5a2a676af80282ba4c77ab64605c348cabb1
 DIST iwd-0.8.tar.xz 670572 BLAKE2B aea20d9d68bb121912ed7a044853188317a1de344ceb09dca4fa1372ed35618b8e63656533329141d0e6f9c6a833238ee02ea807fa53fa19ecf90f8114d7fd69 SHA512 a7707f4c2730eeab0bf65d36c796d5f32b5ccfdb10a199dd2a7263d7297dfd336b8de434c90efb32b6151dfd41911511cd97d1c2ae42012653ee0b44ab709490
 DIST iwd-0.9.tar.xz 673716 BLAKE2B 5a736ff94af72a1251e678954f0c3aca873431baf2bb553481c439dda118ee4e0b80385b1aee14c11d02ced79d89242d994c598b63b6892e1d033d1c91924fef SHA512 6d87ba8cc487a9da0b3dc525f27d4643591d2c14f1dae2a5c5d07d29df30bb77e6184810dbfd6f54fc70ca9f21b6e0f11d75e7ee324f6cb43bdd1a8fb5aeaa42
-EBUILD iwd-0.7.ebuild 2533 BLAKE2B 464db65d7668436bda8af9b909a3a77ebe8add30430a50675873d2ca4367fabffe90d01a307dc150656d0827d509a3a59bd52652dace14c149794d916a9e6fd9 SHA512 b0b997df430397fbd8639c412d761bfcbd57722f216821eb9619ebdbeac9275be9aed0a21d6d9616079908c39e0a308d8e8d602dedaeabebfe578e3e7863e3ba
+EBUILD iwd-0.10.ebuild 2590 BLAKE2B 83be1d3ef277166d2fee4d1ae6ff60b0e12bb78a5165938e88f7c80beaa4ffce8eeda09c019b8e9debcbf2c6bde2dfdc302405e74ae3dc017a77b8fc5607d32d SHA512 faab0b1eb525768333040fe4abec6182492d03f341002b4cbdd30363342bd543a14f5c76adc62ecc335de5da0f83154ac41778a146024b5a09eeb721be7e5840
+EBUILD iwd-0.7.ebuild 2542 BLAKE2B d0ce9fbea00016efbba047cb44b6e6afd730bfab76b1fa74c954366c54ac85e0cdde8bf92b393bfca1af9532fb756c19f8413c92ffc1694beaa8e9e71f440aba SHA512 a541b0266efa1f646cbefe29db0b9e90d682e9f3169fb39a7f4258d0d30e0d2c0b42ba6d2a6933cf0c4454a918bd4ef6f709aefd56505eed37f41da4455b467e
 EBUILD iwd-0.8.ebuild 2593 BLAKE2B 5b2f609acc02f398208c08a09202ce99f28ddb43db9267ed216b8929d62f1e800e97ecdc6a3a69bfcd90f63acfbae212b74f1591e87449d698f07d8f651b1863 SHA512 c7a1b372c49901c23e2960bec22eb7066858f464b4f75a669216dc2740a43b43bfae0097006009533c6636800881fb1fc051c24b55c9b08d2a1c83483de4cf7b
 EBUILD iwd-0.9.ebuild 2590 BLAKE2B 83be1d3ef277166d2fee4d1ae6ff60b0e12bb78a5165938e88f7c80beaa4ffce8eeda09c019b8e9debcbf2c6bde2dfdc302405e74ae3dc017a77b8fc5607d32d SHA512 faab0b1eb525768333040fe4abec6182492d03f341002b4cbdd30363342bd543a14f5c76adc62ecc335de5da0f83154ac41778a146024b5a09eeb721be7e5840
 EBUILD iwd-9999.ebuild 2593 BLAKE2B 5b2f609acc02f398208c08a09202ce99f28ddb43db9267ed216b8929d62f1e800e97ecdc6a3a69bfcd90f63acfbae212b74f1591e87449d698f07d8f651b1863 SHA512 c7a1b372c49901c23e2960bec22eb7066858f464b4f75a669216dc2740a43b43bfae0097006009533c6636800881fb1fc051c24b55c9b08d2a1c83483de4cf7b
diff --git a/net-wireless/iwd/iwd-0.10.ebuild b/net-wireless/iwd/iwd-0.10.ebuild
new file mode 100644
index 000000000000..3296d7599855
--- /dev/null
+++ b/net-wireless/iwd/iwd-0.10.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+RDEPEND="sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CRYPTO_AES
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~X509_CERTIFICATE_PARSER
+	"
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	check_extra_config
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir=/etc/iwd --localstatedir=/var \
+		$(use_enable client) \
+		$(use_enable monitor) \
+		$(use_enable ofono) \
+		$(use_enable wired) \
+		--enable-systemd-service \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd" iwd
+
+	if [[ ${PV} == "9999" ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/iwd/iwd-0.7.ebuild b/net-wireless/iwd/iwd-0.7.ebuild
index fa3d32f34fab..8413b1d0ee49 100644
--- a/net-wireless/iwd/iwd-0.7.ebuild
+++ b/net-wireless/iwd/iwd-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 5cfcab9a3707..28201023aba5 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -6,5 +6,5 @@ DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e115
 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-r2.ebuild 2975 BLAKE2B 152d8f5996f1c2ede46629290f371a20aa5d6ccabe7a9741970eb0e85361deb19377a70c64a1c66446a35bc156d9b972f09ed42c7b6d39f5744429bcaac0d0e7 SHA512 6e360c190a2962c656be53400125295cd80dc46b452c725a00feacc2c97ba088a362b5b83c0c390495a2a74d5428c6fa4605a33abbfb637fa9b1441168466660
-EBUILD kismet-9999.ebuild 2975 BLAKE2B 152d8f5996f1c2ede46629290f371a20aa5d6ccabe7a9741970eb0e85361deb19377a70c64a1c66446a35bc156d9b972f09ed42c7b6d39f5744429bcaac0d0e7 SHA512 6e360c190a2962c656be53400125295cd80dc46b452c725a00feacc2c97ba088a362b5b83c0c390495a2a74d5428c6fa4605a33abbfb637fa9b1441168466660
+EBUILD kismet-9999.ebuild 2992 BLAKE2B 142d4e9f2c3f0ee3744ae2739e8793ef371ff790df04e25ec07cda66479cc201df7a238fe43c3ef06224b393b607a569144824d2fc1a50b5cb67ed0bd8809af0 SHA512 cef0f24f75eb14a451dfa681df4d6aeab8c227ac67617212c324d458dd46e9d4f8b6d957b6ab2790124decfc77c8273aa8d9b7379433695df5ad1f0dbdfcab6a
 MISC metadata.xml 1159 BLAKE2B 2e72c1c62f31b52445c83b6b0d7695c7f1231de69fbe865e123a18dc0030a0f57586b058a7e738d561f48413e8a6ff0e8ac73428de2c41688e5baa1e4c255af1 SHA512 cf7c0f4c38f0a5e7b9c51c9fc98f5dd49e51159986443687a81d486c8805aea069168832f406a16b36dc6342be063fdbcade74685273fcdd2111ea9a616437d7
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index c7a5653873cd..0ce34063df3a 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ IUSE="lm_sensors networkmanager +pcre selinux +suid"
 
 CDEPEND="
 	${PYTHON_DEPS}
-	net-misc/networkmanager:=
+	networkmanager? ( net-misc/networkmanager:= )
 	dev-libs/glib:=
 	dev-libs/elfutils:=
 	sys-libs/zlib:=
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index b9c7ef791a75..95df8bf150b9 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,6 +1,7 @@
 AUX ndiswrapper-1.59-cflags.patch 357 BLAKE2B db91c0a817db2dd2fc019f1ae41e7f12a77a3a71a48d6cef3c80227ca68f14bfcef65a9feb516266a0cf1cee8b80f271eb8210866c0634abff3b6a795d830cc8 SHA512 8c65a5af71bf3035e2d784b29ad45dc48bd70b155d988c2e6d511eb03d9a319d355d67f74e3270816e943abe051e442efe891de1d649e871b7e3b05690c71a9d
 AUX ndiswrapper-1.61-kernel-4.11.patch 1849 BLAKE2B 8ed5d1dfbc5b924e5a01e1c43c508a5c189a7d1cfd18117f2e90a84af6f63a5e04a7e881db2869dda1e53514f982cc4369dbd0479284c798748940bc04a1d077 SHA512 04c60101754a3286f2454cc3b39455186a211b52e09eef21d094b5adea1c176631246a71e0ea26b67e76a6733fe4048cf545ace28ab505acc6df9881aca138be
 AUX ndiswrapper-1.61-kernel-4.13.patch 987 BLAKE2B fe331b86f3967fe3b4f8118c2492825737468d12efb8d170cc8843e266acdc82ebbf303f1358eb79363ae1b3c5aa478451cc82e5691acd267ab3cb7cd89849cc SHA512 df43f17f63b7842b9a22f285b5fdf7e28ef20e975cd86cbdaaff7426e7dc1b413b978c6e85ac76420131fa7139542ae499becf7276b0d3e17f2c45df7ba1d5c7
+AUX ndiswrapper-1.61-kernel-4.15.patch 6676 BLAKE2B 536a220f7cf01aac8895e2c76ba5634f5411b2fa8ab8180f52c11c6576823e29cb9ef0bbffa8338de3768e1583ca764a72854f89a7e8df304107371dda6c02b7 SHA512 52bd3d2025ffb8a3f6a4a1a1fee1b87d3811f30a210a54aaa7b37838eb256cd766bc1aeda24e4b4f4829992584931ecd97a042794c9b854bd1ebbf452dce2abf
 DIST ndiswrapper-1.61.tar.gz 202240 BLAKE2B 1b9b60bdd389bb04e56b4b2986503063c4193d78fb06e34f6c91f67d214b112f498cc8d0fdd08c372da73bde8cb9d10c893b05020d81bf35e144e64c81a24797 SHA512 67a50071a2e04113b91259e0d5236b4bf02b46a0d60ecae779c34e047f678c70b18e3191bad1435525c8499e554bd26794a03a79a71e1e603987432f4c590b43
-EBUILD ndiswrapper-1.61.ebuild 2672 BLAKE2B 4a7dfd741b06091632dc189e9261744418b7990c74ab56631cd7e805d8ff44d8350aa00e85e9e3f3d119ea12c10d52af38bb456c3c36ea0ba4592ae710162f6b SHA512 99155f057a18fdb9f7fc46bd5b69f42d190d86dcaa8929e243dcb813dee80766e972699cd2a7a5116824f57a23b884f83e0390f66ef6fe427029a6224261e5a7
+EBUILD ndiswrapper-1.61.ebuild 2713 BLAKE2B ffbebde3e62f5d4591287362f2e2439df23b40b4e833a0a7ac8dc5121c8ef00502390f235cd81a227b2aa69d80c77dfb6107e927eb725ca3e3eb35e00687a65b SHA512 92e251bece459d07ae85482814214c1d0ed70b2e3ec7955cc2acc821052f0a2ffea7b45f57a4e5f821d702b09dda5376fcbab87a455d31790139b917e3d78058
 MISC metadata.xml 443 BLAKE2B 68db299fd4f25c833c09390c603fadb436c92a2149bfa4e96adb59464cb531b8213b5f755de321a3f0fd3242270e7d4b5e2f0f6b35cdc17d4abe478e91ab6aaf SHA512 5ca78950fbcacddec5ac12085ccc1314e0f55f2cf40d78374049c6dc5c7de39f4835eb586aa851373d80d3800c8c54079ef078bf187e85892ef23b0cd6d1bbd0
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.15.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.15.patch
new file mode 100644
index 000000000000..8e87ece03642
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.61-kernel-4.15.patch
@@ -0,0 +1,199 @@
+From: Seth Forshee <seth.forshee@canonical.com>
+Date: Wed, 13 Dec 2017 15:53:31 -0600
+Subject: [PATCH] Build fixes for Linux 4.15
+
+Fixes two build issues for 4.15:
+
+ - init_timer() was eliminated in 4.15, and all callers were
+   converted to using timer_setup(). The callback prototype has
+   also changed to pass a timer_list argument instead of callback
+   data, and from_timer() must be used to get to the object in
+   which the timer is embedded.
+
+ - usb_get_status() was changed to take an additional argument,
+   and usb_get_std_status() was added as a wrapper for callers to
+   use as a replacment. Call the wrapper in 4.15 and later.
+
+LP: #1737749
+---
+ driver/ntoskernel.c | 19 ++++++++++++++++++-
+ driver/usb.c        | 10 ++++++++--
+ driver/wrapndis.c   | 28 ++++++++++++++++++++++++++++
+ 3 files changed, 54 insertions(+), 3 deletions(-)
+
+diff --git a/driver/ntoskernel.c b/driver/ntoskernel.c
+index 4fe0dc1..156c688 100644
+--- a/driver/ntoskernel.c
++++ b/driver/ntoskernel.c
+@@ -77,7 +77,6 @@ u64 wrap_ticks_to_boot;
+ #if defined(CONFIG_X86_64)
+ static struct timer_list shared_data_timer;
+ struct kuser_shared_data kuser_shared_data;
+-static void update_user_shared_data_proc(unsigned long data);
+ #endif
+ 
+ WIN_SYMBOL_MAP("KeTickCount", &jiffies)
+@@ -91,7 +90,11 @@ DEFINE_PER_CPU(struct irql_info, irql_info);
+ #endif
+ 
+ #if defined(CONFIG_X86_64)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void update_user_shared_data_proc(unsigned long data)
++#else
++static void update_user_shared_data_proc(struct timer_list *t)
++#endif
+ {
+ 	/* timer is supposed to be scheduled every 10ms, but bigger
+ 	 * intervals seem to work (tried up to 50ms) */
+@@ -407,9 +410,15 @@ static void initialize_object(struct dispatcher_header *dh, enum dh_type type,
+ 	InitializeListHead(&dh->wait_blocks);
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void timer_proc(unsigned long data)
+ {
+ 	struct wrap_timer *wrap_timer = (struct wrap_timer *)data;
++#else
++static void timer_proc(struct timer_list *t)
++{
++	struct wrap_timer *wrap_timer = from_timer(wrap_timer, t, timer);
++#endif
+ 	struct nt_timer *nt_timer;
+ 	struct kdpc *kdpc;
+ 
+@@ -452,9 +461,13 @@ void wrap_init_timer(struct nt_timer *nt_timer, enum timer_type type,
+ 		return;
+ 	}
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	init_timer(&wrap_timer->timer);
+ 	wrap_timer->timer.data = (unsigned long)wrap_timer;
+ 	wrap_timer->timer.function = timer_proc;
++#else
++	timer_setup(&wrap_timer->timer, timer_proc, 0);
++#endif
+ 	wrap_timer->nt_timer = nt_timer;
+ #ifdef TIMER_DEBUG
+ 	wrap_timer->wrap_timer_magic = WRAP_TIMER_MAGIC;
+@@ -2559,9 +2572,13 @@ int ntoskernel_init(void)
+ #if defined(CONFIG_X86_64)
+ 	memset(&kuser_shared_data, 0, sizeof(kuser_shared_data));
+ 	*((ULONG64 *)&kuser_shared_data.system_time) = ticks_1601();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	init_timer(&shared_data_timer);
+ 	shared_data_timer.function = update_user_shared_data_proc;
+ 	shared_data_timer.data = 0;
++#else
++	timer_setup(&shared_data_timer, update_user_shared_data_proc, 0);
++#endif
+ #endif
+ 	return 0;
+ }
+diff --git a/driver/usb.c b/driver/usb.c
+index 3e7021a..e55c2c6 100644
+--- a/driver/usb.c
++++ b/driver/usb.c
+@@ -750,6 +750,12 @@ static USBD_STATUS wrap_set_clear_feature(struct usb_device *udev,
+ 	USBEXIT(return NT_URB_STATUS(nt_urb));
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
++#define wrap_usb_get_status usb_get_status
++#else
++#define wrap_usb_get_status usb_get_std_status
++#endif
++
+ static USBD_STATUS wrap_get_status_request(struct usb_device *udev,
+ 					   struct irp *irp)
+ {
+@@ -776,8 +782,8 @@ static USBD_STATUS wrap_get_status_request(struct usb_device *udev,
+ 		return NT_URB_STATUS(nt_urb);
+ 	}
+ 	assert(status_req->transfer_buffer_length == sizeof(u16));
+-	ret = usb_get_status(udev, type, status_req->index,
+-			     status_req->transfer_buffer);
++	ret = wrap_usb_get_status(udev, type, status_req->index,
++				  status_req->transfer_buffer);
+ 	if (ret >= 0) {
+ 		assert(ret <= status_req->transfer_buffer_length);
+ 		status_req->transfer_buffer_length = ret;
+diff --git a/driver/wrapndis.c b/driver/wrapndis.c
+index 870e4c2..f653440 100644
+--- a/driver/wrapndis.c
++++ b/driver/wrapndis.c
+@@ -1093,9 +1093,15 @@ send_assoc_event:
+ 	EXIT2(return);
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void iw_stats_timer_proc(unsigned long data)
+ {
+ 	struct ndis_device *wnd = (struct ndis_device *)data;
++#else
++static void iw_stats_timer_proc(struct timer_list *t)
++{
++	struct ndis_device *wnd = from_timer(wnd, t, iw_stats_timer);
++#endif
+ 
+ 	ENTER2("%d", wnd->iw_stats_interval);
+ 	if (wnd->iw_stats_interval > 0) {
+@@ -1111,8 +1117,12 @@ static void add_iw_stats_timer(struct ndis_device *wnd)
+ 		return;
+ 	if (wnd->iw_stats_interval < 0)
+ 		wnd->iw_stats_interval *= -1;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	wnd->iw_stats_timer.data = (unsigned long)wnd;
+ 	wnd->iw_stats_timer.function = iw_stats_timer_proc;
++#else
++	timer_setup(&wnd->iw_stats_timer, iw_stats_timer_proc, 0);
++#endif
+ 	mod_timer(&wnd->iw_stats_timer, jiffies + wnd->iw_stats_interval);
+ }
+ 
+@@ -1124,9 +1134,15 @@ static void del_iw_stats_timer(struct ndis_device *wnd)
+ 	EXIT2(return);
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void hangcheck_proc(unsigned long data)
+ {
+ 	struct ndis_device *wnd = (struct ndis_device *)data;
++#else
++static void hangcheck_proc(struct timer_list *t)
++{
++	struct ndis_device *wnd = from_timer(wnd, t, hangcheck_timer);
++#endif
+ 
+ 	ENTER3("%d", wnd->hangcheck_interval);
+ 	if (wnd->hangcheck_interval > 0) {
+@@ -1147,8 +1163,12 @@ void hangcheck_add(struct ndis_device *wnd)
+ 		wnd->hangcheck_interval = hangcheck_interval * HZ;
+ 	if (wnd->hangcheck_interval < 0)
+ 		wnd->hangcheck_interval *= -1;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	wnd->hangcheck_timer.data = (unsigned long)wnd;
+ 	wnd->hangcheck_timer.function = hangcheck_proc;
++#else
++	timer_setup(&wnd->hangcheck_timer, hangcheck_proc, 0);
++#endif
+ 	mod_timer(&wnd->hangcheck_timer, jiffies + wnd->hangcheck_interval);
+ 	EXIT2(return);
+ }
+@@ -2138,9 +2158,17 @@ static NTSTATUS ndis_add_device(struct driver_object *drv_obj,
+ 	wnd->dma_map_count = 0;
+ 	wnd->dma_map_addr = NULL;
+ 	wnd->nick[0] = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	init_timer(&wnd->hangcheck_timer);
++#else
++	timer_setup(&wnd->hangcheck_timer, NULL, 0);
++#endif
+ 	wnd->scan_timestamp = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	init_timer(&wnd->iw_stats_timer);
++#else
++	timer_setup(&wnd->iw_stats_timer, NULL, 0);
++#endif
+ 	wnd->iw_stats_interval = 10 * HZ;
+ 	wnd->ndis_pending_work = 0;
+ 	memset(&wnd->essid, 0, sizeof(wnd->essid));
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.61.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.61.ebuild
index bcb493f1a556..b815a61fcb19 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-1.61.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.61.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit linux-mod readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.59-cflags.patch
 	"${FILESDIR}"/${PN}-1.61-kernel-4.11.patch
 	"${FILESDIR}"/${PN}-1.61-kernel-4.13.patch
+	"${FILESDIR}"/${PN}-1.61-kernel-4.15.patch
 )
 
 MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 13631b71e6ef..5a6abf6ff047 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 dfc273aa4adc..d64b7654297d 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (15 Oct 2018)
+# Requires app-text/mecab which isn't yet keyworded
+# on alpha, bug 668674
+dev-db/mysql cjk
+dev-db/percona-server cjk
+
 # Mikle Kolyada <zlogene@gentoo.org> (05 Oct 2018)
 # Not keyworded (see bug #540540c#8)
 app-admin/sudo sssd
@@ -13,10 +19,6 @@ media-sound/mpd wildmidi
 # Optional dependency blocking updates.
 media-plugins/imlib2_loaders eet
 
-# Virgil Dupras <vdupras@gentoo.org> (23 Aug 2018)
-# Depends on vulnerable version of paramiko. Bug #664346
-dev-vcs/bzr sftp
-
 # Joonas Niilola <juippis@gmail.com> (17 Jun 2018)
 # Optional dependency not available for this arch
 dev-libs/efl vlc
@@ -175,10 +177,6 @@ net-analyzer/rrdtool rados
 # scrollview requires Java, which is unsupported on Alpha.
 app-text/tesseract scrollview
 
-# Michael Weber <xmw@gentoo.org> (09 Jan 2016)
-# no alpha support in media-libs/glfw
-app-text/mupdf opengl
-
 # Justin Lecher <jlec@gentoo.org> (18 Nov 2015)
 # requires dev-python/restkit which requires
 # dev-python/socketpool which requires dev-python/gevent which requires
diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index 30fc79015c0b..e1b9f434793c 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/use.stable.mask
@@ -1,13 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Brian Evans <grknight@gentoo.org> (14 Aug 2017)
-# Needs dev-lang/php:7.2 stable
-php_targets_php7-2
-
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index e1524c7aca18..3011e9344375 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
+# www-client/firefox is available on amd64
+app-misc/tracker -firefox-bookmarks
+
+# Michael Palimaka <kensington@gentoo.org> (12 Oct 2018)
+# Unmask arch-specific USE flags available on amd64
+net-analyzer/testssl -bundled-openssl -kerberos
+
 # Thomas Deutschmann <whissi@gentoo.org> (30 Sep 2018)
 # Unmask libheif support where media-libs/libheif is keyworded
 media-gfx/imagemagick -heif
@@ -164,10 +172,6 @@ sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv
 # It's only supported on amd64
 dev-db/mariadb -tokudb
 
-# Matt Turner <mattst88@gentoo.org> (07 Mar 2014)
-# media-libs/libomxil-bellagio keyworded on amd64/x86
-media-libs/mesa -openmax
-
 # Samuli Suominen <ssuominen@gentoo.org> (16 Feb 2014)
 # Still considered experimental by upstream:
 # https://sourceforge.net/p/mikmod/bugs/16/#17ea
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index cd87c3421d5f..0e7d0e044322 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Aaron W. Swenson <titanofold@gentoo.org> (19 Oct 2018)
+# Requires sys-devel/clang which isn’t keyworded for ARM.
+dev-db/postgresql llvm
+
+# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
+# Requires unported sys-libs/netbsd-csu.
+sys-devel/clang-runtime crt
+
+# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
+# Requires www-client/firefox which isn't available on ARM yet
+# due to dev-lang/rust requirement
+dev-ruby/capybara test
+
 # Michał Górny <mgorny@gentoo.org> (20 Sep 2018)
 # dev-libs/libpfm not keyworded here (and unclear if it supports ARM).
 # Bug #666651.
@@ -8,9 +21,8 @@ sys-devel/llvm exegesis
 
 # Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
 # media-libs/libaom not yet keyworded
-# media-libs/aribb24 not yet keyworded, bug #665048
 # projectm not yet keyworded, bug #314969
-media-video/vlc aom aribsub chromaprint opencv projectm
+media-video/vlc aom chromaprint opencv projectm
 
 # Christian Ruppert <idl0r@gentoo.org> (25 Aug 2018)
 # pre-built, no ARM support
@@ -222,10 +234,6 @@ dev-cpp/eigen test
 # scrollview requires SWT, which is currently unsupported on ARM.
 app-text/tesseract scrollview
 
-# Michael Weber <xmw@gentoo.org> (09 Jan 2016)
-# no arm support in media-libs/glfw
-app-text/mupdf opengl
-
 # Brian Evans <grknight@gentoo.org> (23 Nov 2015)
 # unmask galera for dev-db/mariadb
 >=dev-db/mariadb-10.1.0 -galera
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 800fe51e91a6..3255e280d638 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
+# Requires www-client/firefox which isn't yet keyworded on ARM64
+dev-ruby/capybara test
+
 # Dirkjan Ochtman <djc@gentoo.org> (29 Sep 2018)
 # Upstream doesn't build docs for tier 2 and lower architectures.
 # Bug #660512.
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 63d1d9945951..68da82ad967c 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Palimaka <kensington@gentoo.org> (12 Oct 2018)
+# Only available on amd64/x86
+net-analyzer/testssl bundled-openssl kerberos
+
 # Thomas Deutschmann <whissi@gentoo.org> (30 Sep 2018)
 # Requires media-libs/libheif which is only keyworded for amd64 and x86
 media-gfx/imagemagick heif
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 55ff1a4fc824..f10edb643a69 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Jeroen Roovers (jer@gentoo.org) (22 Mar 2018)
+# HiPE does not work on HPPA
+dev-lang/erlang hipe
+
 # Thomas Deutschmann <whissi@gentoo.org> (04 Jul 2018)
 # dev-libs/xxhash not keyworded for hppa
 app-admin/rsyslog xxhash
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 3f796af7144d..ff147fbde48f 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (13 Oct 2018)
+# USE=debug needs support for target-specific _FPU_MASK_IM. ia64
+# does not define those.
+media-sound/lame debug
+
 # Sergei Trofimovich <slyfox@gentoo.org> (25 Jul 2018)
 # USE=server does not compile and needs upstream fix: bug #662040
 >=sys-devel/gdb-8.1 server
@@ -148,10 +153,6 @@ dev-cpp/eigen test
 # Missing keywords, bug #560382
 media-video/ffmpeg snappy
 
-# Michael Weber <xmw@gentoo.org> (09 Jan 2016)
-# no ia64 support in media-libs/glfw
-app-text/mupdf opengl
-
 # Justin Lecher <jlec@gentoo.org> (18 Nov 2015)
 # requires dev-python/restkit which requires
 # dev-python/socketpool which requires dev-python/gevent which requires
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index b5844a549554..f8c08e17a22c 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -92,10 +92,6 @@ net-misc/bfgminer adl lm_sensors
 # media-libs/libcdr, app-text/libwpd and app-text/libwpg
 media-gfx/inkscape cdr visio wpg
 
-# Michael Weber <xmw@gentoo.org> (14 Mar 2017)
-# mask unkeyworded dependency media-libs/glfw
-app-text/mupdf opengl
-
 # Jason Zaman <perfinion@gentoo.org> (09 May 2017)
 # x11-libs/libXpresent is not keyworded on ppc
 xfce-base/xfwm4 xpresent
@@ -368,8 +364,3 @@ media-tv/mythtv vdpau
 # Brent Baude <ranger@gentoo.org>
 # masking zephyr USE on pidgin
 net-im/pidgin zephyr
-
-# Joseph Jezak <josejx@gentoo.org> (28 Jun 2007)
-# Masked Parallel LCD devices for bug #180683
-# app-misc/lcd4linux
-app-misc/lcd4linux lcd_devices_hd44780
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 23d9d45966ee..d9f02c573991 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -25,10 +25,6 @@ media-video/vlc libav
 # Non-stable dependency.  Used to be masked completely.
 media-sound/abcde replaygain
 
-# Virgil Dupras <vdupras@gentoo.org> (18 Aug 2018)
-# app-text/mupdf stable ppc/ppc64 keywords were dropped in bug #658618
-net-print/cups-filters pdf
-
 # Ulrich Müller <ulm@gentoo.org> (09 Aug 2018)
 # Needs net-mail/mailutils and net-libs/webkit-gtk which are not
 # stable (yet?), bug #663248
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 27935492196a..478c36b6e695 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (07 Oct 2018)
+# media-libs/x265[power8] fails to build on 32-bit ppc.
+media-libs/x265 power8
+
 # Mikle Kolyada <zlogene@gentoo.org> (01 Sep 2018)
 # The dependency is not keyworded
 net-analyzer/wireshark bcg729
@@ -51,7 +55,6 @@ net-irc/kvirc kde
 # Requires unkeyworded dev-qt/qtmultimedia:5
 media-plugins/audacious-plugins qt5
 net-analyzer/wireshark qt5
-sci-astronomy/stellarium sound
 
 # James Le Cuirot <chewi@gentoo.org> (30 Jan 2016)
 # scrollview requires Java, which is unsupported on ppc.
@@ -64,10 +67,6 @@ dev-lang/logtalk fop
 gnome-extra/libgda reports
 net-analyzer/wireshark doc-pdf
 
-# Michael Weber <xmw@gentoo.org> (09 Jan 2016)
-# no ppc support in media-libs/glfw
-app-text/mupdf opengl
-
 # Anthony G. Basile <blueness@gentoo.org> (26 Oct 2015)
 # Mask x265 on vlc for bug #564138
 media-video/vlc x265
diff --git a/profiles/arch/powerpc/ppc64/32ul/package.mask b/profiles/arch/powerpc/ppc64/32ul/package.mask
index 87c0b7d6d57e..1fc0ad794669 100644
--- a/profiles/arch/powerpc/ppc64/32ul/package.mask
+++ b/profiles/arch/powerpc/ppc64/32ul/package.mask
@@ -1,2 +1,6 @@
-# Copyright 2012-2012 Gentoo Foundation
+# Copyright 2012-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# James Le Cuirot <chewi@gentoo.org> (19 Oct 2018)
+# AdoptOpenJDK's ppc64 build is little-endian only.
+dev-java/openjdk-bin
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.mask b/profiles/arch/powerpc/ppc64/64ul/package.mask
index bbf97dd6ceef..def9c263cb79 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# James Le Cuirot <chewi@gentoo.org> (19 Oct 2018)
+# AdoptOpenJDK's ppc64 build is little-endian only.
+dev-java/openjdk-bin
+
 # <gcc-4 does not compile with >=gcc-4 on ppc64
 sys-libs/libstdc++-v3
 <sys-devel/gcc-4.1
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index d1eed069ec84..b6032b13eed1 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -46,10 +46,6 @@ dev-java/batik python
 dev-java/bsf python
 dev-java/ant-apache-bsf python
 
-# Michael Weber <xmw@gentoo.org> (09 Jan 2016)
-# no ppc64 support in media-libs/glfw
-app-text/mupdf opengl
-
 # Jeroen Roovers <jer@gentoo.org> (26 Dec 2015)
 # Mask until >sys-cluster/ceph-0.94 goes stable
 net-analyzer/rrdtool rados
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 2aba42b23ef7..fad34bb34190 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Virgil Dupras <vdupras@gentoo.org> (08 Oct 2018)
+# app-text/mupdf sparc keyword was dropped in bug #631970
+net-print/cups-filters pdf
+
 # Sergei Trofimovich <slyfox@gentoo.org> (28 Sep 2018)
 # mpir fails to build at least on sparc: bug #640424
 dev-python/gmpy mpir
@@ -138,10 +142,6 @@ media-video/ffmpeg snappy
 # scrollview requires Java, which is unsupported on SPARC.
 app-text/tesseract scrollview
 
-# Michael Weber <xmw@gentoo.org> (09 Jan 2016)
-# no sparc support in media-libs/glfw
-app-text/mupdf opengl
-
 # Mike Frysinger <vapier@gentoo.org> (22 Dec 2015)
 # Needs keywording. #569254
 net-firewall/iptables nftables
@@ -267,10 +267,6 @@ net-im/telepathy-connection-managers sipe
 # template-haskell not yet available
 dev-haskell/dataenc test
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
-# dev-libs/jemalloc is not keyworded
-www-plugins/gnash jemalloc
-
 # Pacho Ramos <pacho@gentoo.org> (20 Jul 2013)
 # Keywords pending, bug #476710
 >=gnome-base/gnome-extra-apps-3.8 games
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index 40d6e274774a..23afb7432244 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -21,10 +21,6 @@
 # media-libs/libraw is not stable
 media-gfx/imagemagick raw
 
-# Virgil Dupras <vdupras@gentoo.org> (18 Aug 2018)
-# app-text/mupdf stable sparc keyword was dropped in bug #658618
-net-print/cups-filters pdf
-
 # Andreas Sturmlechner <asturm@gentoo.org> (7 May 2018)
 # sci-visualization/gnuplot is not stable.
 app-admin/sysstat isag
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 36084bc584a6..83649173f152 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,8 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires >=portage-2.1.1
 
+# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
+# www-client/firefox is available on x86
+app-misc/tracker -firefox-bookmarks
+
+# Michael Palimaka <kensington@gentoo.org> (12 Oct 2018)
+# Unmask arch-specific USE flag available on x86
+net-analyzer/testssl -bundled-openssl
+
 # Thomas Deutschmann <whissi@gentoo.org> (30 Sep 2018)
 # Unmask libheif support where media-libs/libheif is keyworded
 media-gfx/imagemagick -heif
@@ -15,10 +23,6 @@ dev-python/pymongo test
 # media-libs/qtav not keyworded
 media-video/orion qtav
 
-# Virgil Dupras <vdupras@gentoo.org> (06 Sep 2018)
-# sci-libs/oce not yet keyworded
-sci-electronics/kicad oce
-
 # Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
 # media-libs/libaom not yet keyworded
 media-video/vlc aom
@@ -179,10 +183,6 @@ sys-cluster/ceph zfs
 # Works on 32bit x86
 media-sound/lmms -vst
 
-# Matt Turner <mattst88@gentoo.org> (07 Mar 2014)
-# media-libs/libomxil-bellagio keyworded on amd64/x86
-media-libs/mesa -openmax
-
 # Samuli Suominen <ssuominen@gentoo.org> (16 Feb 2014)
 # Still considered experimental by upstream:
 # https://sourceforge.net/p/mikmod/bugs/16/#17ea
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index a0a1d4f977ba..8e489bf49e13 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -92,11 +92,6 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 # Netbeans modules/clusters
 NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
 
-# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
-# https://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml
-# Build kernel modules from linux-mod by default:
-USE="${USE} modules"
-
 # Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
 # Default Ruby build target
 # Updated to include ruby23 on 21 Jan 2018
@@ -166,4 +161,4 @@ POSTGRES_TARGETS="postgres9_5 postgres10"
 # Moreover, it should only contain targets that have a stable version
 # of PHP, to avoid pulling in an unstable PHP on stable systems.
 #
-PHP_TARGETS="php5-6 php7-0"
+PHP_TARGETS="php5-6 php7-1"
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 6cfe118fb8ae..3e87f3085150 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires >=portage-2.1.1
@@ -7,13 +7,30 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Pacho Ramos <pacho@gento.org> (21 Oct 2018)
+# splashutils is being removed
+sys-power/suspend fbsplash
+
+# Lars Wendler <polynomial-c@gentoo.org> (18 Oct 2018)
+# gnutls is broken in older releases
+<net-libs/gsoap-2.8.64 gnutls
+
+# Matt Turner <mattst88@gentoo.org> (16 Oct 2018)
+# media-libs/libomxil-bellagio is masked for removal.
+media-libs/mesa openmax
+
+# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
+# Requires www-client/firefox which isn't available on all architectures
+# yet, unmask per arch
+app-misc/tracker firefox-bookmarks
+
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (06 Oct 2018)
 # address user visible breakage due to circular dependency #665008
 =media-fonts/encodings-1.0.4-r3 X
 
 # Dirkjan Ochtman <djc@gentoo.org> (29 Sep 2018)
 # Clippy is broken for now, can't find libraries (bug 667286)
-dev-lang/rust clippy
+<dev-lang/rust-1.29.2 clippy
 dev-lang/rust-bin clippy
 
 # Virgil Dupras <vdupras@gentoo.org> (26 Sep 2018)
@@ -121,12 +138,16 @@ sys-libs/glibc compile-locales
 media-video/ffmpeg appkit
 
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
-# Java 9 is not yet fully supported on Gentoo. Having a masked
+# Java 9+ is not yet fully supported on Gentoo. Having a masked
 # gentoo-vm flag allows us to provide it without it breaking Gentoo
 # packages. Those who wish to experiment with it as a fully recognised
 # Gentoo JVM can unmask the flag.
 dev-java/oracle-jdk-bin:9 gentoo-vm
 dev-java/oracle-jre-bin:9 gentoo-vm
+dev-java/oracle-jdk-bin:11 gentoo-vm
+dev-java/oracle-jre-bin:11 gentoo-vm
+dev-java/openjdk-bin:11 gentoo-vm
+dev-java/openjdk:11 gentoo-vm
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (04 Nov 2017)
 # Requires audacious, which is masked. Bug 632513
@@ -160,10 +181,6 @@ sys-devel/clang z3
 # Mask USE flag which has limited keywords for app-crypt/argon2
 dev-lang/php argon2
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Jul 2017)
-# Causes build to fail with ffmpeg-3, #602786
-www-plugins/gnash vaapi
-
 # Mike Gilbert <floppym@gentoo.org> (09 Jul 2017)
 # Matthias Dahl <matthias.dahl@binary-island.eu> (05 Jul 2017)
 # Both are not your typical garden-variety Linux programs and are
@@ -276,10 +293,6 @@ app-editors/emacs-vcs cairo
 # Needs a Gstreamer plugin from gst-plugins-bad that is not packaged to date
 media-plugins/grilo-plugins chromaprint
 
-# Lars Wendler <polynomial-c@gentoo.org> (19 Aug 2016)
-# gnutls is broken for years
->=net-libs/gsoap-2.8.0 gnutls
-
 # Michał Górny <mgorny@gentoo.org> (05 Jul 2016)
 # Mask system-clang support as it requires llvm-3.4 that is subject
 # to security bug cleanup, #585102.
@@ -450,10 +463,6 @@ dev-python/pypy3 sandbox
 # gentoo bugs.
 media-libs/libsdl2 custom-cflags
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
-# Causes build to fail, issue is being discussed with upstream
->=www-plugins/gnash-0.8.10_p20130822 openvg
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013)
 # GL/GLES support in cairo is mutually exclusive, bug #428770.
 x11-libs/cairo gles2
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index c416cbaa11c9..ce0805ba2c06 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2018)
+# app-misc/ddcutil is not yet stable.
+kde-plasma/powerdevil brightness-control
+
 # Andreas Sturmlechner <asturm@gentoo.org> (11 Sep 2018)
 # Sometimes crashes Plasma with Appstream versions pre-0.12.
 # Newer versions of dev-libs/appstream are not stable yet. See also:
@@ -31,8 +35,8 @@ dev-python/s3fs test
 =app-office/libreoffice-6.0* kde
 
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Mar 2018)
-# Depends on unstable dependencies; qt3d bug #652046
-sci-geosciences/qgis 3d grass
+# sci-geosciences/grass is not stable
+sci-geosciences/qgis grass
 
 # Thomas Beierlein <tomjbe@gentoo.org> (21 Mar 2018)
 # ~app-backup/bacula-9.0.6 does not compile with USE=libressl (bug #641492)
diff --git a/profiles/default/linux/amd64/17.0/uclibc/eapi b/profiles/default/linux/amd64/17.0/uclibc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/uclibc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/uclibc/hardened/eapi b/profiles/default/linux/amd64/17.0/uclibc/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/uclibc/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/uclibc/hardened/parent b/profiles/default/linux/amd64/17.0/uclibc/hardened/parent
new file mode 100644
index 000000000000..45a355b0beba
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/uclibc/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/amd64
diff --git a/profiles/default/linux/amd64/17.0/uclibc/make.defaults b/profiles/default/linux/amd64/17.0/uclibc/make.defaults
new file mode 100644
index 000000000000..c015f1daecd1
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/uclibc/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-gentoo-linux-uclibc"
+
+# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
+# Multilib-related setup, bug #515130
+MULTILIB_ABIS="amd64"
+CHOST_amd64="${CHOST}"
+LIBDIR_amd64="lib"
diff --git a/profiles/default/linux/amd64/17.0/uclibc/parent b/profiles/default/linux/amd64/17.0/uclibc/parent
new file mode 100644
index 000000000000..a56db381f595
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/uclibc/parent
@@ -0,0 +1,3 @@
+..
+../../../../../arch/amd64/no-multilib
+../../../../../features/uclibc/
diff --git a/profiles/default/linux/arm/13.0/armv6j/package.mask b/profiles/default/linux/arm/13.0/armv6j/package.mask
new file mode 100644
index 000000000000..6a132627c621
--- /dev/null
+++ b/profiles/default/linux/arm/13.0/armv6j/package.mask
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
+# Clang does not work correctly with the old *-hardfloat-* triplets.
+# Please switch to 17.0 profiles that use *eabihf triplets instead.
+# https://bugs.gentoo.org/595834
+dev-python/clang-python
+dev-util/lldb
+sys-devel/clang
+sys-devel/clang-common
+sys-devel/clang-runtime
+sys-libs/compiler-rt
+sys-libs/compiler-rt-sanitizers
+sys-libs/libcxx
+sys-libs/libcxxabi
+sys-libs/libomp
+sys-libs/llvm-libunwind
diff --git a/profiles/default/linux/arm/13.0/armv7a/package.mask b/profiles/default/linux/arm/13.0/armv7a/package.mask
new file mode 100644
index 000000000000..6a132627c621
--- /dev/null
+++ b/profiles/default/linux/arm/13.0/armv7a/package.mask
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
+# Clang does not work correctly with the old *-hardfloat-* triplets.
+# Please switch to 17.0 profiles that use *eabihf triplets instead.
+# https://bugs.gentoo.org/595834
+dev-python/clang-python
+dev-util/lldb
+sys-devel/clang
+sys-devel/clang-common
+sys-devel/clang-runtime
+sys-libs/compiler-rt
+sys-libs/compiler-rt-sanitizers
+sys-libs/libcxx
+sys-libs/libcxxabi
+sys-libs/libomp
+sys-libs/llvm-libunwind
diff --git a/profiles/default/linux/make.defaults b/profiles/default/linux/make.defaults
index 4d580b1ba06f..0716de8a14c9 100644
--- a/profiles/default/linux/make.defaults
+++ b/profiles/default/linux/make.defaults
@@ -53,8 +53,3 @@ VIDEO_CARDS="dummy fbdev v4l"
 # Note that adding LDFLAGS="-Wl,-O1 ${LDFLAGS}" breaks dev-util/boost-build
 # because of whitespace.
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-
-# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
-# https://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml
-# Build kernel modules from linux-mod by default:
-USE="${USE} modules"
diff --git a/profiles/default/linux/musl/arm/armv7a/package.mask b/profiles/default/linux/musl/arm/armv7a/package.mask
new file mode 100644
index 000000000000..6a132627c621
--- /dev/null
+++ b/profiles/default/linux/musl/arm/armv7a/package.mask
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
+# Clang does not work correctly with the old *-hardfloat-* triplets.
+# Please switch to 17.0 profiles that use *eabihf triplets instead.
+# https://bugs.gentoo.org/595834
+dev-python/clang-python
+dev-util/lldb
+sys-devel/clang
+sys-devel/clang-common
+sys-devel/clang-runtime
+sys-libs/compiler-rt
+sys-libs/compiler-rt-sanitizers
+sys-libs/libcxx
+sys-libs/libcxxabi
+sys-libs/libomp
+sys-libs/llvm-libunwind
diff --git a/profiles/default/linux/uclibc/arm/armv6j/package.mask b/profiles/default/linux/uclibc/arm/armv6j/package.mask
new file mode 100644
index 000000000000..6a132627c621
--- /dev/null
+++ b/profiles/default/linux/uclibc/arm/armv6j/package.mask
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
+# Clang does not work correctly with the old *-hardfloat-* triplets.
+# Please switch to 17.0 profiles that use *eabihf triplets instead.
+# https://bugs.gentoo.org/595834
+dev-python/clang-python
+dev-util/lldb
+sys-devel/clang
+sys-devel/clang-common
+sys-devel/clang-runtime
+sys-libs/compiler-rt
+sys-libs/compiler-rt-sanitizers
+sys-libs/libcxx
+sys-libs/libcxxabi
+sys-libs/libomp
+sys-libs/llvm-libunwind
diff --git a/profiles/default/linux/uclibc/arm/armv7a/package.mask b/profiles/default/linux/uclibc/arm/armv7a/package.mask
new file mode 100644
index 000000000000..6a132627c621
--- /dev/null
+++ b/profiles/default/linux/uclibc/arm/armv7a/package.mask
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
+# Clang does not work correctly with the old *-hardfloat-* triplets.
+# Please switch to 17.0 profiles that use *eabihf triplets instead.
+# https://bugs.gentoo.org/595834
+dev-python/clang-python
+dev-util/lldb
+sys-devel/clang
+sys-devel/clang-common
+sys-devel/clang-runtime
+sys-libs/compiler-rt
+sys-libs/compiler-rt-sanitizers
+sys-libs/libcxx
+sys-libs/libcxxabi
+sys-libs/libomp
+sys-libs/llvm-libunwind
diff --git a/profiles/default/linux/x86/17.0/uclibc/eapi b/profiles/default/linux/x86/17.0/uclibc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/uclibc/hardened/eapi b/profiles/default/linux/x86/17.0/uclibc/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/uclibc/hardened/parent b/profiles/default/linux/x86/17.0/uclibc/hardened/parent
new file mode 100644
index 000000000000..45a355b0beba
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/amd64
diff --git a/profiles/default/linux/x86/17.0/uclibc/make.defaults b/profiles/default/linux/x86/17.0/uclibc/make.defaults
new file mode 100644
index 000000000000..7242f3043f91
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="i686-gentoo-linux-uclibc"
+
+# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
+# Multilib-related setup, bug #515130
+MULTILIB_ABIS="x86"
+CHOST_x86="${CHOST}"
+LIBDIR_x86="lib"
diff --git a/profiles/default/linux/x86/17.0/uclibc/parent b/profiles/default/linux/x86/17.0/uclibc/parent
new file mode 100644
index 000000000000..bf856ff784ae
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/parent
@@ -0,0 +1,3 @@
+..
+../../../../../arch/x86
+../../../../../features/uclibc/
diff --git a/profiles/features/hardened/make.defaults b/profiles/features/hardened/make.defaults
index 1502b08728fc..88e165c4611a 100644
--- a/profiles/features/hardened/make.defaults
+++ b/profiles/features/hardened/make.defaults
@@ -24,4 +24,3 @@ USE="${USE} -berkdb -gdbm -tcpd"
 USE="${USE} -fortran"
 USE="${USE} -cli"
 USE="${USE} -dri"
-USE="${USE} -modules"
diff --git a/profiles/package.mask b/profiles/package.mask
index 14902d7e7374..04315ffa86cf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,95 @@
 
 #--- END OF EXAMPLES ---
 
+# Pacho Ramos <pacho@gentoo.org> (21 Oct 2018)
+# Lots of pending bugs for years, this needs a dedicated maintainer that
+# fixes them: bug #354157, #354639, #398075, #398077, #417375, #499654,
+# #539358, #591682, #625798, #639912, #662316, #664270...
+# Removal in a month.
+media-gfx/splashutils
+media-gfx/bootsplash-themes
+media-gfx/splash-themes-gentoo
+media-gfx/splash-themes-livecd
+media-gfx/splash-themes-livedvd
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (20 Oct 2018)
+# Fails to build with glibc-2.27, bug 648620. No reverse
+# dependencies. Removal in 30 days.
+dev-tcltk/ck
+
+# Matt Turner <mattst88@gentoo.org> (17 Oct 2018)
+# Multiple regressions causing pain for users and developers alike: Bug
+# Bugs #666892, #667686
+=sys-fs/eudev-3.2.6
+
+# Matt Turner <mattst88@gentoo.org> (16 Oct 2018)
+# Unmaintained. Unused. Removal in 30 days. Bug #668826
+media-libs/libomxil-bellagio
+
+# Virgil Dupras <vdupras@gentoo.org> (15 Oct 2018)
+# Unmaintained, no revdep. Removal in 30 days. Bug #650048
+dev-python/django-extensions
+dev-python/shortuuid
+dev-python/fexpect
+
+# Sobhan Mohammadpour <sobhan@gentoo.org> (15 Oct 2018)
+# Masked for testing.
+sys-apps/bubblewrap
+
+# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
+# EOL and has known vulnerabilities. Please move to
+# Firefox 60 or newer if you can.
+<www-client/firefox-60
+
+# Virgil Dupras <vdupras@gentoo.org> (12 Oct 2018)
+# Unmaintained, no revdep. Removal in 30 days. Bug #645384
+dev-python/jenkinsapi
+
+# Virgil Dupras <vdupras@gentoo.org> (12 Oct 2018)
+# Dead upstream, unmaintained, no revdep. Removal in 30 days.
+# Bug #285169
+dev-python/twill
+dev-python/flask-testing
+
+# Virgil Dupras <vdupras@gentoo.org> (11 Oct 2018)
+# Dead upstream, unmaintained, no revdep. Removal in 30 days.
+# Bug #659532
+net-libs/libgcal
+
+# Virgil Dupras <vdupras@gentoo.org> (11 Oct 2018)
+# Unmaintained, no revdep. Removal in 30 days.
+# Bug #661554 Bug #661552
+dev-libs/MicroJSON
+dev-libs/UTF8Strings
+
+# Virgil Dupras <vdupras@gentoo.org> (10 Oct 2018)
+# Unmaintained, no revdep. Removal in 30 days.
+# Bug #643536
+dev-python/stormpath
+
+# Virgil Dupras <vdupras@gentoo.org> (10 Oct 2018)
+# Dead upstream, depends on broken package. Removal in 30 days.
+# Bug #620098
+dev-python/flask-restless
+
+# Sergei Trofimovich <slyfox@gentoo.org> (09 Oct 2018)
+# Upstream is not actively maintained. Needs a port to mupdf-1.14.
+app-text/fbpdf
+
+# Davide Pesavento <pesa@gentoo.org> (08 Oct 2018)
+# Ebuild is not ready, major packaging changes required. Bug 668014.
+>=dev-python/PyQt5-5.11
+
+# Virgil Dupras <vdupras@gentoo.org> (07 Oct 2018)
+# Masked for removal, along with orphans, because it's unmaintained
+# and vulnerable. Bug #629270
+app-office/openerp
+dev-python/pywebdav
+
+# Andreas Sturmlechner <asturm@gentoo.org> (07 Oct 2018)
+# Masked for more testing especially of reverse-deps.
+>=dev-games/ogre-1.11.2
+
 # Mart Raudsepp <leio@gentoo.org> (06 Oct 2018)
 # Netspeed applet moved into mate-base/mate-applets since v1.14,
 # use that instead. Bug #667910
@@ -75,38 +164,11 @@ dev-python/tinydb
 # Apparently breaks sys-devel/gcc.  Bug #666954.
 =dev-util/debugedit-4.14.2
 
-# Michał Górny <mgorny@gentoo.org> (17 Sep 2018)
-# Obsolete LogiLab packages that are full of issues and were never
-# maintained properly.  Recently dev-python/logilab-common started
-# colliding with dev-python/pytest, making it practically non-
-# installable.  The only revdep left is app-vim/python-mode where
-# the dep looks completely mistaken.  Bug #666152.
-app-vim/python-mode
-dev-python/astng
-dev-python/logilab-common
-dev-python/logilab-constraint
-
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Sep 2018)
-# was merged into the IETF Opus codec and is now obsolete
-# Removal in 30 days, bug #664154
-media-libs/celt
-
 # Mike Gilbert <floppym@gentoo.org> (16 Sep 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-71
 
-# Brian Evans <grknight@gentoo.org> (16 Sep 2018)
-# Broken build on modern clients. Please update to latest slot.
-# Slot to be removed in 30 days
-dev-db/myodbc:5.2
-
-# Michał Górny <mgorny@gentoo.org> (13 Sep 2018)
-# Depends on old version of dev-libs/jsoncpp, blocking its pruning.
-# Downstream maintainer is inactive to bump it.  Removal in 30 days.
-# Bug #656678.
-dev-lang/solidity
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (11 Sep 2018)
 # Mask transition ebuilds that were needed only for <glibc-2.26
 # We will keep them in the tree as long as we have masked
@@ -114,83 +176,12 @@ dev-lang/solidity
 ~net-libs/libnsl-0
 ~net-libs/rpcsvc-proto-0
 
-# Aaron W. Swenson <titanofold@gentoo.org> (09 Sep 2018)
-# PostgreSQL beta and release candidate releases are pre-release testing
-# versions, not meant for production use. They are feature-frozen, and are
-# released to the public for testing before final release
-#
-# NOTE: Successive beta or candidate releases may not be backwards compatible,
-# so it is important that you review the release notes before upgrading.
-#
-# For more information about beta and release candidate versions, see:
-#     https://www.postgresql.org/developer/beta/
-=dev-db/postgresql-11_beta1
-=dev-db/postgresql-11_beta2
-=dev-db/postgresql-11_beta3
-
-# Joerg Bornkessel <hd_brummy@gentoo.org> (02/Sep/2018)
-# homepage dead
-# dead on upstream
-# not converted to gettext
-# a lot of compile warnings
-# bug 665124
-# masked for removal on End Sep 2018
-media-plugins/vdr-prefermenu
-
-# Joerg Bornkessel <hd_brummy@gentoo.org> (02/Sep/2018)
-# fails on latest imagemagick
-# not converted to gettext
-# bug 665126
-# masked for removal on End Sep 2018
-media-plugins/vdr-text2skin
-
-# Joerg Bornkessel <hd_brummy@gentoo.org> (02/Sep/2018)
-# quit old
-# unmanged on upstream since ~ 10 years
-# bug 665128
-# masked for removal on End Sep 2018
-media-plugins/vdr-vodcatcher
-
-# Joerg Bornkessel <hd_brummy@gentoo.org> (02/Sep/2018)
-# homepage dead
-# not addapted to latest xine
-# fails on compile
-# quit old
-# bug 665132
-# masked for removal on End Sep 2018
-media-plugins/vdr-xine
-
-# Joerg Bornkessel <hd_brummy@gentoo.org> (02/Sep/2018)
-# dead on upstream since 2014
-# not git-r3 eclass adaption
-# only pmasked -9999.ebuild in the tree
-# bug 665134
-# masked for removal on End Sep 2018
-media-plugins/vdr-xvdr
-
-# Joerg Bornkessel <hd_brummy@gentoo.org> (02/Sep/2018)
-# homepage dead
-# dead on upstream
-# depends on vdr-1.3 (quit old)
-# bug 665136
-# masked for removal on End Sep 2018
-media-plugins/vdr-autosort
-
 # Matthias Maier <tamiko@gentoo.org> (1 Sep 2018)
 # Mask 0.7.0 and  1.0.1 for the time being until a compatible LLVM version
 # made it into the tree, bug #665192
 ~dev-lang/julia-0.7.0
 ~dev-lang/julia-1.0.1
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (29 Aug 2018)
-# Masked for removal in 30 days. Multiple build failures. Upstream inactive.
-# (bugs #321017, #581284, #588692, #602786, #649006, #654140)
-www-plugins/gnash
-
-# Virgil Dupras <vdupras@gentoo.org> (23 Aug 2018)
-# Vulnerable and can't be removed yet because of alpha. Bug #664346
-<dev-python/paramiko-2.4.1
-
 # Bernard Cafarelli <voyageur@gentoo.org> (20 Aug 2018)
 # Requires >=dev-libs/openssl-1.1.0
 >=net-misc/nextcloud-client-2.5.0_beta1
@@ -266,10 +257,6 @@ dev-python/wxpython:2.8
 =virtual/perl-threads-2.220.0
 =virtual/perl-version-0.992.300
 
-# Thomas Deutschmann <whissi@gentoo.org> (23 Jun 2018)
-# Doesn't pass QA full boot test
-=sys-kernel/ck-sources-4.16.17
-
 # Mart Raudsepp <leio@gentoo.org> (16 Jun 2018)
 # No upstream (website disappeared), no upstream plugin maintainer,
 # and pretty much a fringe format anyway.
@@ -328,22 +315,11 @@ media-libs/libglvnd
 # Bug 629682.
 =net-misc/asterisk-11.25.1
 
-# Aaron W. Swenson <titanofold@gentoo.org> (22 Mar 2018)
-# EOL. No longer receives bug or security fixes. Recommended to update
-# to latest available.
-# Removal in 30 days (21 Apr 2018). Bug 634028.
-<dev-db/postgresql-9.3
-
 # Michał Górny <mgorny@gentoo.org> (20 Mar 2018)
 # Poorly tested version bump followed by a series of quick hacks
 # that do not make it any more working. Bug #651030.
 >=sys-devel/distcc-3.3
 
-# Anthony G. Basile <blueness@gentoo.org> (25 Feb 2018)
-# Upstream has been dead since 2012.  Migrate to uclibc-ng.
-# See https://wiki.gentoo.org/wiki/Project:Hardened_uClibc
-sys-libs/uclibc
-
 # Eray Aslan <eras@gentoo.org> (08 Feb 2018)
 # Mask experimental software
 =mail-mta/postfix-3.4*
@@ -365,11 +341,13 @@ sys-libs/uclibc
 >=sci-electronics/pcb-20000000
 
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
-# Java 9 is not yet fully supported on Gentoo. Packages cannot depend
+# Java 9+ is not yet fully supported on Gentoo. Packages cannot depend
 # on it so these virtuals are not yet required. If you wish to use
-# Java 9 now then install oracle-(jdk|jre)-bin:9 directly.
+# Java 9+ then install oracle-(jdk|jre)-bin or openjdk(-bin) directly.
 virtual/jdk:9
 virtual/jre:9
+virtual/jdk:11
+virtual/jre:11
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (22 Oct 2017)
 # Broken with recent Perl (5.26) and not used by anything
@@ -580,15 +558,6 @@ dev-java/jcs
 # Needs a bump and substantial ebuild rewrite
 =sci-mathematics/reduce-20110414-r1
 
-# Michał Górny <mgorny@gentoo.org> (30 Oct 2015)
-# Uses unsafe ioctls that could result in data corruption. Upstream
-# is working on replacing them in the wip/dedup-syscall branch.
-# Keep it masked until they are done. sys-fs/duperemove is
-# the suggested replacement for the meantime.
-# Michał Górny <mgorny@gentoo.org> (13 Sep 2018)
-# No upstream commits since 2016.  Removal in 30 days.  Bug #546144.
-sys-fs/bedup
-
 # Robin H. Johnson <robbat2@gentoo.org> (04 Aug 2014)
 # Masked for testing, presently fails upstream testsuite:
 # FAIL:07:02:35 (00:00:00) db_dump/db_load(./TESTDIR.3/recd001.db:child killed: kill signal): expected 0, got 1
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 1c2ea775d5bd..66686051a7f7 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -13,11 +13,11 @@ alpha           default/linux/alpha/13.0/desktop                stable
 alpha           default/linux/alpha/13.0/desktop/gnome          stable
 alpha           default/linux/alpha/13.0/desktop/gnome/systemd  stable
 alpha           default/linux/alpha/13.0/developer              stable
-alpha           default/linux/alpha/17.0                        exp
-alpha           default/linux/alpha/17.0/desktop                exp
-alpha           default/linux/alpha/17.0/desktop/gnome          exp
-alpha           default/linux/alpha/17.0/desktop/gnome/systemd  exp
-alpha           default/linux/alpha/17.0/developer              exp
+alpha           default/linux/alpha/17.0                        stable
+alpha           default/linux/alpha/17.0/desktop                stable
+alpha           default/linux/alpha/17.0/desktop/gnome          stable
+alpha           default/linux/alpha/17.0/desktop/gnome/systemd  stable
+alpha           default/linux/alpha/17.0/developer              stable
 
 # AMD64 Profiles
 # @MAINTAINER: amd64@gentoo.org
@@ -351,6 +351,8 @@ x86		default/linux/x86/17.0/musl/selinux			exp
 # @MAINTAINER: uclibc@gentoo.org
 amd64		default/linux/uclibc/amd64				exp
 amd64		hardened/linux/uclibc/amd64				exp
+amd64		default/linux/amd64/17.0/uclibc				exp
+amd64		default/linux/amd64/17.0/uclibc/hardened		exp
 arm		default/linux/uclibc/arm/armv7a				exp
 arm		hardened/linux/uclibc/arm/armv7a			exp
 arm		default/linux/arm/17.0/uclibc/armv6j			exp
@@ -365,6 +367,8 @@ ppc		default/linux/uclibc/ppc				exp
 ppc		hardened/linux/uclibc/ppc				exp
 x86		default/linux/uclibc/x86				exp
 x86		hardened/linux/uclibc/x86				exp
+x86		default/linux/x86/17.0/uclibc				exp
+x86		default/linux/x86/17.0/uclibc/hardened			exp
 
 # These are Gentoo Prefix profiles, maintained by the Prefix team
 # @MAINTAINER: prefix@gentoo.org
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 6197195026f2..9f6f05419cc9 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -23,7 +23,7 @@ lokigames	http://updates.lokigames.com
 mplayer		http://www1.mplayerhq.hu/MPlayer http://www2.mplayerhq.hu/MPlayer http://www5.mplayerhq.hu/MPlayer http://www7.mplayerhq.hu/MPlayer http://www8.mplayerhq.hu/MPlayer ftp://ftp1.mplayerhq.hu/MPlayer/ ftp://ftp6.mplayerhq.hu/MPlayer/ ftp://ftp7.mplayerhq.hu/MPlayer/ ftp://ftp8.mplayerhq.hu/MPlayer/
 mysql		https://artfiles.org/mysql/ https://www.mirrorservice.org/sites/ftp.mysql.com/ https://ftp.gwdg.de/pub/misc/mysql/ https://ftp.jaist.ac.jp/pub/mysql/ http://mysql.he.net/ http://mysql.mirrors.ovh.net/ftp.mysql.com/ http://mirror.switch.ch/ftp/mirror/mysql/ http://vesta.informatik.rwth-aachen.de/mysql/ http://ftp.ntua.gr/pub/databases/mysql/ http://mysql.linux.cz/ http://linorg.usp.br/mysql/
 nongnu		http://download.savannah.nongnu.org/releases/ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ http://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.csclub.uwaterloo.ca/nongnu/ http://mirrors.fe.up.pt/pub/nongnu/ ftp://mirrors.fe.up.pt/pub/nongnu/ http://nongnu.askapache.com/ http://nongnu.uib.no/ ftp://nongnu.uib.no/pub/nongnu/ http://savannah.c3sl.ufpr.br/ ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ ftp://ftp.twaren.net/Unix/NonGNU/
-openbsd		https://mirrors.evowise.com/pub/OpenBSD/
+openbsd		https://cdn.openbsd.org/pub/OpenBSD https://cloudflare.cdn.openbsd.org/pub/OpenBSD https://fastly.cdn.openbsd.org/pub/OpenBSD
 openssl		https://artfiles.org/openssl.org/ https://www.mirrorservice.org/sites/ftp.openssl.org/ ftp://ftp.openssl.org
 opera		ftp://ftp.opera.com/pub/opera ftp://ftp.tu-cottbus.de/pub/net/opera ftp://ftp.task.gda.pl/pub/opera ftp://ftp.ntua.gr/pub/www/Opera ftp://ftp.rediris.es/mirror/opera ftp://ftp.heanet.ie/pub/opera
 postgresql	https://ftp.postgresql.org/pub/
diff --git a/profiles/updates/4Q-2018 b/profiles/updates/4Q-2018
new file mode 100644
index 000000000000..e579bb4e45f4
--- /dev/null
+++ b/profiles/updates/4Q-2018
@@ -0,0 +1,2 @@
+slotmove dev-libs/girara 3 0
+move dev-python/CommonMark dev-python/commonmark
diff --git a/profiles/use.desc b/profiles/use.desc
index b03b5b9dade7..b786ad2eb3a5 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -159,6 +159,7 @@ jack - Add support for the JACK Audio Connection Kit
 java - Add support for Java
 javascript - Enable javascript support
 jbig - Enable jbig-kit support for tiff, Hylafax, ImageMagick, etc
+jemalloc - Use dev-libs/jemalloc for memory management
 jingle - Enable voice calls for jabber
 jit - Enable just-in-time compilation for improved performance. May prevent use of some PaX memory protection features in Gentoo Hardened.
 joystick - Add support for joysticks in all packages
@@ -249,6 +250,7 @@ openal - Add support for the Open Audio Library
 openexr - Support for the OpenEXR graphics file format
 opengl - Add support for OpenGL (3D graphics)
 openmp - Build support for the OpenMP (support parallel computing), requires >=sys-devel/gcc-4.2 built with USE="openmp"
+opus - Enable Opus audio codec support
 oracle - Enable Oracle Database support
 orc - Use dev-lang/orc for just-in-time optimization of array operations
 osc - Enable support for Open Sound Control
@@ -398,5 +400,6 @@ xvid - Add support for xvid.org's open-source mpeg-4 codec
 yahoo - Enable Yahoo Messenger IM protocol support
 yaz - Add in optional support for the Z39.50 Protocol for Information Retrieval (YAZ)
 zeroconf - Support for DNS Service Discovery (DNS-SD)
+zip - Enable support for ZIP archives
 zlib - Add support for zlib (de)compression
 zsh-completion - Enable zsh completion support
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d69638783243..9dd1ecfce2af 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -119,7 +119,6 @@ app-admin/rsyslog:elasticsearch - Build the Elasticsearch output module (require
 app-admin/rsyslog:gcrypt - Add support for encrypted log files using dev-libs/libgcrypt
 app-admin/rsyslog:gnutls - Build the GnuTLS network stream driver (requires net-libs/gnutls)
 app-admin/rsyslog:grok - Build the grok modify module (requires dev-libs/grok)
-app-admin/rsyslog:jemalloc - Use dev-libs/jemalloc for allocations.
 app-admin/rsyslog:kafka - Build the Apache Kafka input/output module (requires dev-libs/librdkafka)
 app-admin/rsyslog:kerberos - Build the GSSAPI input and output module (requires virtual/krb5)
 app-admin/rsyslog:kubernetes - Build the kubernetes modify plugin (requires net-misc/curl)
@@ -313,6 +312,7 @@ app-crypt/gnupg:smartcard - Build scdaemon software. Enables usage of OpenPGP ca
 app-crypt/gnupg:tofu - Enable support for Trust on First use trust model; requires dev-db/sqlite.
 app-crypt/gnupg:tools - Install extra tools (including gpgsplit and gpg-zip).
 app-crypt/gnupg:usb - Build direct CCID access for scdaemon; requires dev-libs/libusb.
+app-crypt/gnupg:user-socket - try a socket directory which is not removed by init manager at session end
 app-crypt/gnupg:wks-server - Install the wks-server
 app-crypt/gnupg-pkcs11-scd:proxy - Build the gnupg-pkcs11-scd-prox
 app-crypt/gpgme:common-lisp - Install common-lisp files
@@ -429,7 +429,6 @@ app-editors/nano:magic - Add magic file support (sys-apps/file) to automatically
 app-editors/nano:minimal - Disable all fancy features, including ones that otherwise have a dedicated USE flag (such as spelling).
 app-editors/ne:tinfo - Link against libtinfo from sys-libs/ncurses
 app-editors/neovim:clipboard - Enable clipboard support through a provider
-app-editors/neovim:jemalloc - Use dev-libs/jemalloc for allocations
 app-editors/neovim:nvimpager - Install nvimpager symlink to less.sh macro
 app-editors/neovim:remote - Enable support for remote options using nvr
 app-editors/neovim:tui - Build the neovim unix tui
@@ -636,7 +635,6 @@ app-emulation/virt-viewer:vnc - Support connecting to VNC-enabled virtual machin
 app-emulation/virt-what:dmi - Use sys-apps/dmidecode to read firmware data
 app-emulation/virtualbox:headless - Build without any graphic frontend
 app-emulation/virtualbox:lvm - Build VBoxVolInfo that needs devicemapper from sys-fs/lvm2.
-app-emulation/virtualbox:opus - Adds support for the Opus codec via media-libs/opus
 app-emulation/virtualbox:pax_kernel - Apply patch needed for pax enabled kernels.
 app-emulation/virtualbox:sdk - Enable building of SDK
 app-emulation/virtualbox:udev - Controls installation of special USB udev rules.
@@ -916,6 +914,7 @@ app-misc/ca-certificates:insecure_certs - Install certificates which are known t
 app-misc/carbon-c-relay:lz4 - add support for LZ4 compressed transport
 app-misc/carbon-c-relay:oniguruma - use dev-libs/oniguruma as regex implementation
 app-misc/carbon-c-relay:pcre2 - use dev-libs/libpcre2 as regex implementation
+app-misc/carbon-c-relay:snappy - add support for Snappy compressed transport
 app-misc/ddccontrol:pci - enable direct PCI memory access (the setuid ddcpci util)
 app-misc/ddcutil:drm - Use x11-libs/libdrm for more verbose diagnostics.
 app-misc/ddcutil:usb-monitor - Adds support for monitors attached via USB.
@@ -1008,9 +1007,7 @@ app-misc/lirc:audio - Support using an audio device connected to an IR receiver
 app-misc/lirc:devinput - Support the devinput input device
 app-misc/lirc:ftdi - Support FTDI devices
 app-misc/lirc:gtk - Include GTK support which enables the use of lirc-setup
-app-misc/lirc:hardware-carrier - The transmitter device generates its clock signal in hardware
 app-misc/lirc:inputlirc - Add a dependency on app-misc/inputlircd
-app-misc/lirc:transmitter - Add transmitter support to some lirc-drivers (e.g. serial)
 app-misc/lirc:uinput - Enable support for uinput
 app-misc/mc:edit - Compile and install the mcedit application
 app-misc/mc:mclib - Compile and install the libmc.so shared library
@@ -1127,7 +1124,6 @@ app-office/kraft:pim - Enable support for KDE PIM resources integration
 app-office/libreoffice:coinmp - Use sci-libs/coinor-mp as alternative solver
 app-office/libreoffice:googledrive - Enable support for remote files on Google Drive
 app-office/libreoffice:gtk2 - Enable legacy gtk2 frontend
-app-office/libreoffice:jemalloc - Use dev-libs/jemalloc for allocations
 app-office/libreoffice:odk - Build the Office Development Kit
 app-office/libreoffice:pdfimport - Enable PDF import via the Poppler library
 app-office/libreoffice:vlc - Use media-video/vlc for video embedding
@@ -1230,7 +1226,6 @@ app-text/groonga:dynamic-malloc-change - Allow dynamic memory allocation change
 app-text/groonga:exact-alloc-count - Atomic counting for memory alloc count
 app-text/groonga:fmalloc - Make memory allocation failed in specified condition for debug
 app-text/groonga:futex - Use futex
-app-text/groonga:jemalloc - Enable dev-libs/jemalloc for memory management
 app-text/groonga:libevent - Enable dev-libs/libevent used for suggestion
 app-text/groonga:mecab - Use app-text/mecab for morphological analysis
 app-text/groonga:msgpack - Enable dev-libs/msgpack used for suggestion
@@ -1299,7 +1294,6 @@ app-text/tesseract:opencl - Enable opencl support for speedup using GPU computat
 app-text/tesseract:osd - Enable support orientation and script detection.
 app-text/tesseract:scrollview - Install viewer to debug recognition (ScrollView).
 app-text/tesseract:training - Install training applications to add support for new languages.
-app-text/tesseract:webp - Enable support for webp image format.
 app-text/texlive:context - Add support for the ConTeXt format (dev-texlive/texlive-context)
 app-text/texlive:detex - Add support for dev-tex/detex, a filter program that removes the LaTeX (or TeX) control sequences
 app-text/texlive:dvi2tty - Add support for dev-tex/dvi2tty to preview dvi-files on text-only devices
@@ -1448,7 +1442,6 @@ dev-db/mariadb:innodb-lz4 - Enables lz4 compression methods for InnoDB/XtraDB
 dev-db/mariadb:innodb-lzo - Enables lzo compression methods for InnoDB/XtraDB
 dev-db/mariadb:innodb-snappy - Enables snappy compression methods for InnoDB/XtraDB using app-arch/snappy
 dev-db/mariadb:jdbc - Enable the CONNECT engine to access foreign databases via JDBC
-dev-db/mariadb:jemalloc - Use dev-libs/jemalloc for allocations.
 dev-db/mariadb:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/mariadb:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
 dev-db/mariadb:mroonga - Add support for the Mroonga engine for interfacing with the Groonga text search
@@ -1470,7 +1463,6 @@ dev-db/mariadb-connector-c:mysqlcompat - Enable mysqlclient library symbolic lin
 dev-db/mariadb-galera:client-libs - Build the client libraries from the server package instead of the C Connector packages
 dev-db/mariadb-galera:extraengine - Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)
 dev-db/mariadb-galera:jdbc - Enable the CONNECT engine to access foreign databases via JDBC
-dev-db/mariadb-galera:jemalloc - Use dev-libs/jemalloc for allocations.
 dev-db/mariadb-galera:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/mariadb-galera:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
 dev-db/mariadb-galera:numa - Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)
@@ -1486,9 +1478,10 @@ dev-db/mariadb-galera:tokudb - Add support for TokuDB storage engine
 dev-db/mariadb-galera:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
 dev-db/mongodb:mms-agent - Install the MongoDB Monitoring Service agent
 dev-db/mongodb:tools - Install the MongoDB tools (mongoimport, mongodump...) from app-admin/mongo-tools
+dev-db/mysql:cjk - Add CJK support for InnoDB fulltext search using app-text/mecab
 dev-db/mysql:client-libs - Build the client libraries from the server package instead of the C Connector packages (not recommended)
+dev-db/mysql:experimental - Build experimental features aka "rapid" plugins
 dev-db/mysql:extraengine - Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)
-dev-db/mysql:jemalloc - Use dev-libs/jemalloc for allocations.
 dev-db/mysql:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/mysql:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
 dev-db/mysql:numa - Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)
@@ -1501,7 +1494,6 @@ dev-db/mysql-cluster:cluster - Add support for NDB clustering
 dev-db/mysql-cluster:community - Enables the community features from upstream.
 dev-db/mysql-cluster:embedded - Build embedded server (libmysqld)
 dev-db/mysql-cluster:extraengine - Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)
-dev-db/mysql-cluster:jemalloc - Use dev-libs/jemalloc for allocations.
 dev-db/mysql-cluster:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/mysql-cluster:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
 dev-db/mysql-cluster:max-idx-128 - Raise the max index per table limit from 64 to 128
@@ -1517,11 +1509,13 @@ dev-db/mysql-connector-c++:gcov - Build coverage support
 dev-db/mysql-connector-c++:legacy - Build the legacy 1.x API as well as the DevX API
 dev-db/oracle-instantclient:jdbc - Support for XA, Internationalization, and RowSet operations under JDBC
 dev-db/oracle-instantclient:odbc - Libraries for enabling ODBC applications
+dev-db/oracle-instantclient:precomp - "proc" binary and related files to precompile a Pro*C application
 dev-db/oracle-instantclient:sdk - Header files and an example makefile for developing Oracle applications
-dev-db/oracle-instantclient:sqlplus - Libraries and executable for running SQL*Plus
-dev-db/oracle-instantclient:tools - Workload Replay Client
+dev-db/oracle-instantclient:sqlplus - The SQL*Plus command line tool for SQL and PL/SQL queries
+dev-db/oracle-instantclient:tools - Data Pump, SQL*Loader and Workload Replay Client
+dev-db/percona-server:cjk - Add CJK support for InnoDB fulltext search using app-text/mecab
 dev-db/percona-server:client-libs - Build the libmysqlclient libraries
-dev-db/percona-server:jemalloc - Use dev-libs/jemalloc for allocations.
+dev-db/percona-server:experimental - Build experimental features aka "rapid" plugins
 dev-db/percona-server:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/percona-server:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
 dev-db/percona-server:numa - Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)
@@ -1549,9 +1543,7 @@ dev-db/postgresql:pg_legacytimestamp - Use double precision floating-point numbe
 dev-db/postgresql:server - Disable to build and install the clients and libraries only.
 dev-db/postgresql:uuid - Enable server side UUID generation (via dev-libs/ossp-uuid).
 dev-db/psqlodbc:iodbc - Use dev-db/libiodbc. Disable to use dev-db/unixODBC.
-dev-db/redis:jemalloc - Use dev-libs/jemalloc for allocations.
 dev-db/redis:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations.
-dev-db/rethinkdb:jemalloc - Use dev-libs/jemalloc for allocations (default).
 dev-db/rethinkdb:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations.
 dev-db/soci:boost - Enable boost support
 dev-db/soci:empty - Build the sample backend called Empty
@@ -1598,7 +1590,6 @@ dev-embedded/urjtag:ftd2xx - Enable support for USB FTDI chips via dev-embedded/
 dev-embedded/urjtag:ftdi - Enable support for USB FTDI chips via dev-embedded/libftdi
 dev-games/aseprite:bundled-libs - Use the upstream provided bundled version of allegro 4.4.2
 dev-games/aseprite:gtk3 - Enable support for the experimental native GTK File Dialog
-dev-games/aseprite:webp - Enable webp image format support
 dev-games/cegui:devil - Build the DevIL based ImageCodec module
 dev-games/cegui:freeimage - Build the FreeImage based ImageCodec module
 dev-games/cegui:irrlicht - Enable the Irrlicht renderer
@@ -1620,18 +1611,20 @@ dev-games/ogre:cache - Enable GL state cache support
 dev-games/ogre:cg - NVIDIA toolkit plugin
 dev-games/ogre:double-precision - More precise calculations at the expense of speed
 dev-games/ogre:egl - Use egl instead of glx
-dev-games/ogre:experimental - Build experimental BETA components 'Bites' and 'HLMS'
+dev-games/ogre:experimental - Build experimental BETA component 'HLMS'
 dev-games/ogre:freeimage - Support images via media-libs/freeimage
 dev-games/ogre:gl3plus - Build OpenGL 3+ RenderSystem (EXPERIMENTAL)
 dev-games/ogre:gles2 - Build OpenGL ES 2.x RenderSystem
 dev-games/ogre:gles3 - Enable OpenGL ES 3.x Features
+dev-games/ogre:json - Use dev-libs/rapidjson (needed by Hlms JSON materials)
+dev-games/ogre:legacy-animations - Use the skeletal animation from 1.x. It's much slower, but the new system is still experimental.
+dev-games/ogre:mobile - Build for OpenGL ES 2.0 only and use the mobile variants of the PBS and unlit material systems.
 dev-games/ogre:ois - Pull in Object-oriented Input System library dev-games/ois for samples
 dev-games/ogre:poco - When USE=threads, use poco for threading
 dev-games/ogre:resman-pedantic - Resource Manager PEDANTIC : require an explicit resource group. Case sensitive lookup. Some demos might not work with this setting. (default: case-insensitive + sensitive lookup in all groups)
 dev-games/ogre:resman-strict - Resource Manager STRICT : search in default group if not specified otherwise. Case sensitive lookup. Some demos might not work with this setting. (default: case-insensitive + sensitive lookup in all groups)
 dev-games/ogre:tbb - When USE=threads, use tbb for threading
 dev-games/ogre:tools - Build and install helper tools
-dev-games/ogre:zip - Support zip archives
 dev-games/openscenegraph:asio - Enable support for dev-cpp/asio library
 dev-games/openscenegraph:fox - Build examples using x11-libs/fox library
 dev-games/openscenegraph:gdal - Enable support for sci-libs/gdal library
@@ -1649,7 +1642,6 @@ dev-games/physfs:qpak - Enable Quake I/II QPAK archive support
 dev-games/physfs:slb - Enable Independence War SLB archive support
 dev-games/physfs:vdf - Enable Gothic/Gothic II VDF archive support
 dev-games/physfs:wad - Enable Doom WAD archive support
-dev-games/physfs:zip - Enable ZIP archive support
 dev-games/simgear:dns - Enable DNS resolver via net-libs/udns
 dev-games/simgear:gdal - Enable alternative terrain engine based on pagedLOD via sci-libs/gdal
 dev-games/simgear:subversion - Enable terrasync scenery downloader
@@ -1935,6 +1927,10 @@ dev-java/log4j:jms - Build the JMSAppender
 dev-java/logback:tomcat - Builds Apache Tomcat support
 dev-java/lucene:contrib - Include extra functionality from contrib/
 dev-java/miglayout:swt - Add support for the SWT toolkit.
+dev-java/openjdk-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
+dev-java/openjdk-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
+dev-java/openjdk-bin:source - Install JVM sources
+dev-java/openjdk-bin:webstart - Provide javaws command through symlink to icedtea-web
 dev-java/oracle-jdk-bin:commercial - Install features requiring a commercial license for production use
 dev-java/oracle-jdk-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/oracle-jdk-bin:gtk2 - Enable GTK+ 2 support in JavaFX
@@ -2045,7 +2041,6 @@ dev-lang/php:webp - Enable webp support for GD in php-7.x
 dev-lang/php:xmlreader - Enable XMLReader support
 dev-lang/php:xmlwriter - Enable XMLWriter support
 dev-lang/php:xslt - Enable the XSL extension
-dev-lang/php:zip - Enable ZIP file support
 dev-lang/php:zip-encryption - Enable ZIP file encryption from dev-libs/libzip
 dev-lang/polyml:portable - Build the portable interpreter version of Poly/ML instead of native
 dev-lang/python:bluetooth - Build Bluetooth protocol support in socket module
@@ -2055,13 +2050,11 @@ dev-lang/python:wininst - Install Windows executables required to create an exec
 dev-lang/qu-prolog:pedro - Pedro subscription/notification communications system
 dev-lang/rakudo:clang - Use Clang to compile the MoarVM backend
 dev-lang/rakudo:moar - Use the MoarVM as backend
-dev-lang/ruby:jemalloc - Use dev-libs/jemalloc for memory allocation.
 dev-lang/ruby:rdoc - Install dev-ruby/rdoc after installing Ruby.
 dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readline extension, used for instance by the irb tool. This flag is meaningful only if the libedit USE flag is disabled. If neither libedit nor readline USE flags are enabled, the readline extension will not be built (and irb will lose line editing functionality).
 dev-lang/ruby:rubytests - Install ruby tests that can only be run after ruby is installed
 dev-lang/rust:cargo - Install cargo component
 dev-lang/rust:clippy - Install clippy component
-dev-lang/rust:jemalloc - Use dev-libs/jemalloc as the standard memory allocator
 dev-lang/rust:rls - Install rls component
 dev-lang/rust:rustfmt - Install rustfmt component
 dev-lang/rust:wasm - Build support for the wasm32-unknown-unknown target
@@ -2255,7 +2248,6 @@ dev-libs/aws-sdk-cpp:aws_targets_workspaces - SDK Support for AWS workspaces
 dev-libs/aws-sdk-cpp:aws_targets_xray - SDK Support for AWS xray
 dev-libs/beignet:ocl-icd - Enable compatibility with the dev-libs/ocl-icd OpenCL ICD loader
 dev-libs/beignet:ocl20 - Enable experimental OpenCL 2.0 support on Skylake and newer architectures
-dev-libs/bitset:jemalloc - Use dev-libs/jemalloc for allocations
 dev-libs/bitset:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations
 dev-libs/blitz:boost - Enable usage of boost::serialization
 dev-libs/boost:context - Build and install the Boost.Context (and Boost.Fiber) library and all other Boost libraries that depend on it
@@ -2307,7 +2299,6 @@ dev-libs/efl:tslib - Enable x11-libs/tslib for touchscreen events
 dev-libs/efl:unwind - Enable debug support via sys-libs/libunwind
 dev-libs/efl:valgrind - Enable usage of dev-util/valgrind in debug
 dev-libs/efl:vlc - Enable media-video/vlc support
-dev-libs/efl:webp - Enable WebP image loader
 dev-libs/efl:xcf - Enable XCF image loader
 dev-libs/efl:xim - Enable X Input Method
 dev-libs/efl:xpresent - Enable x11-libs/libXpresent support
@@ -2455,9 +2446,9 @@ dev-libs/m17n-lib:libxml2 - Use dev-libs/libxml2 to parse XML
 dev-libs/nss:cacert - Include root/class3 certs from CAcert (http://www.cacert.org/)
 dev-libs/nss:nss-pem - Add support for libnsspem
 dev-libs/nss:utils - Install utilities included with the library
+dev-libs/ocl-icd:khronos-headers - Install Khronos OpenCL headers.
 dev-libs/onigmo:combination-explosion-check - enable combination explosion check
 dev-libs/onigmo:crnl-as-line-terminator - enable CR+NL as line terminator
-dev-libs/oniguruma:combination-explosion-check - enable combination explosion check
 dev-libs/oniguruma:crnl-as-line-terminator - enable CR+NL as line terminator
 dev-libs/opencryptoki:tpm - Enable support for Trusted Platform Module (TPM) using app-crypt/trousers
 dev-libs/openct:debug - Add debug output to the driver library for pcsc-lite.
@@ -2525,7 +2516,6 @@ dev-libs/weston:resize-optimization - Increase performance, allocate more RAM. R
 dev-libs/weston:screen-sharing - Enable screen-sharing through RDP
 dev-libs/weston:unwind - Enable libunwind usage for backtraces
 dev-libs/weston:wayland-compositor - Enable Wayland compositor support
-dev-libs/weston:webp - Add support for the WebP image format
 dev-libs/weston:xwayland - Enable ability support native X11 applications
 dev-libs/wlc:X - Enable X11 backend.
 dev-libs/wlc:systemd - Enable support for systemd-logind.
@@ -2927,6 +2917,7 @@ dev-qt/qtwayland:libinput - Enable support for input devices via dev-libs/libinp
 dev-qt/qtwebchannel:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtwebengine:designer - Install the QWebEngineView plugin used to add widgets in dev-qt/designer forms that display web pages.
 dev-qt/qtwebengine:geolocation - Enable physical position determination via dev-qt/qtpositioning
+dev-qt/qtwebengine:jumbo-build - Combine source files to speed up build process.
 dev-qt/qtwebengine:pax_kernel - Enable building under a PaX enabled kernel
 dev-qt/qtwebengine:system-ffmpeg - Use the system-wide media-video/ffmpeg instead of bundled.
 dev-qt/qtwebengine:system-icu - Use the system-wide dev-libs/icu instead of bundled.
@@ -2939,7 +2930,6 @@ dev-qt/qtwebkit:multimedia - Enable HTML5 audio/video support via dev-qt/qtmulti
 dev-qt/qtwebkit:orientation - Enable device orientation detection via dev-qt/qtsensors
 dev-qt/qtwebkit:printsupport - Enable printing via dev-qt/qtprintsupport
 dev-qt/qtwebkit:qml - Build QML/QtQuick bindings
-dev-qt/qtwebkit:webp - Add support for WebP image format
 dev-qt/qtwebsockets:qml - Build QML bindings
 dev-qt/qtwidgets:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-ros/rosbag:lz4 - Add support for lz4 compressed bags.
@@ -3080,6 +3070,7 @@ dev-util/diffoscope:zip - Use app-arch/unzip
 dev-util/edb-debugger:graphviz - Add support for the Graphviz library
 dev-util/edb-debugger:legacy-mem-write - Probe if writes to /proc/PID/mem are broken.
 dev-util/edb-debugger:pax_kernel - Enable building under a PaX enabled kernel
+dev-util/edi:clang - Provide integration with sys-devel/clang for autocompletion and inline errors
 dev-util/electron:gconf - Use gnome-base/gconf
 dev-util/electron:gtk3 - Use GTK+3 instead of GTK+2
 dev-util/electron:lto - Build with link time optimization enabled
@@ -3132,7 +3123,6 @@ dev-util/kdevelop:hex - Enable hex editor plugin via app-editors/okteta
 dev-util/kdevelop:qmake - Enable support for QMake build system
 dev-util/kdevelop:reviewboard - Enable reviewboard support
 dev-util/kdevelop:webkit - Enable deprecated dev-qt/qtwebkit instead of dev-qt/qtwebengine for integrated documentation
-dev-util/kdevelop:welcomepage - Enable welcome page, requires dev-qt/qtdeclarative
 dev-util/ltrace:unwind - Use sys-libs/libunwind for frame unwinding support
 dev-util/lttng-tools:ust - Support LTTng-UST (Userspace Tracing)
 dev-util/massif-visualizer:callgraph - Enable detailed snapshot analysis using media-gfx/kgraphviewer
@@ -3419,7 +3409,6 @@ games-fps/unreal-tournament-goty:S3TC - Add the extra fancy textures to UT ... o
 games-fps/urbanterror:altgamma - Alternative way for gamma setting with modesetting driver
 games-fps/urbanterror:client - Build binary for client (includes code for non-dedicated server)
 games-fps/urbanterror:mumble - Use Mumble for ingame VoIP (experimental)
-games-fps/urbanterror:opus - Use opus as sound codec
 games-fps/urbanterror:server - Build binary for dedicated server
 games-fps/urbanterror:skeetshootmod - Build support for skeetshoot mod for specific maps
 games-fps/urbanterror:voip - Use ioq3 ingame VoIP (experimental)
@@ -3608,7 +3597,8 @@ gnome-extra/nm-applet:gcr - Enable advanced certificate chooser, requires app-cr
 gnome-extra/nm-applet:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
 gnome-extra/nm-applet:teamd - Enable teamd configuration editor
 gnome-extra/sushi:office - Support viewing file formats such as generated by app-office/libreoffice
-gnome-extra/synapse:plugins - Build support for plugins using librest
+gnome-extra/synapse:indicator - Build support for application indicators using dev-libs/libappindicator
+gnome-extra/synapse:plugins - Build support for plugins using net-libs/rest
 gnustep-apps/gemas:projectcenter - Build and install plugin for gnustep-apps/projectcenter
 gnustep-apps/gworkspace:gwmetadata - Enable the metadata indexing and searching system
 gnustep-base/gnustep-back-art:xim - Enable X11 XiM input method
@@ -3698,7 +3688,6 @@ kde-apps/ktp-accounts-kcm:experimental - Enables disabled telepathy services (cu
 kde-apps/ktp-common-internals:otr - Enable support for encrypted conversations using Off-The-Records messaging
 kde-apps/ktp-common-internals:sso - Enable support for Single sign-on through KAccounts
 kde-apps/ktp-text-ui:speech - Enable incoming messages to be read out using text-to-speech
-kde-apps/kwave:opus - Enable Opus audio codec support
 kde-apps/kwave:qtmedia - Enable playback via Qt5Multimedia
 kde-apps/libkdepim:designer - Build plugins for dev-qt/designer
 kde-apps/libksane:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
@@ -3799,12 +3788,10 @@ lxde-base/lxterminal:gtk3 - Use GTK+3 instead of GTK+2
 lxqt-base/lxqt-config:monitor - Build monitor settings tool
 lxqt-base/lxqt-meta:about - Install lxqt-base/lxqt-about
 lxqt-base/lxqt-meta:admin - Install lxqt-base/lxqt-admin
-lxqt-base/lxqt-meta:filemanager - Install x11-misc/pcmanfm-qt file manager
-lxqt-base/lxqt-meta:icons - Install an icon theme
-lxqt-base/lxqt-meta:lightdm - Install x11-misc/lightdm display manager
-lxqt-base/lxqt-meta:lximage - Install media-gfx/lximage-qt image viewer
-lxqt-base/lxqt-meta:minimal - Do not install x11-wm/openbox window manager
-lxqt-base/lxqt-meta:oxygen - Prefer kde-frameworks/oxygen-icons (default)
+lxqt-base/lxqt-meta:filemanager - Install x11-misc/pcmanfm-qtfile manager
+lxqt-base/lxqt-meta:lightdm - Install x11-misc/lightdmdisplay manager
+lxqt-base/lxqt-meta:lximage - Install media-gfx/lximage-qtimage viewer
+lxqt-base/lxqt-meta:minimal - Do not install x11-wm/openboxwindow manager
 lxqt-base/lxqt-meta:powermanagement - Install lxqt-base/lxqt-powermanagement package
 lxqt-base/lxqt-meta:processviewer - Install x11-misc/qps package
 lxqt-base/lxqt-meta:screenshot - Install x11-misc/screengrab package
@@ -3906,7 +3893,6 @@ mail-client/thunderbird:clang - Use Clang compiler instead of GCC
 mail-client/thunderbird:crypt - Enable encryption support with enigmail
 mail-client/thunderbird:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
 mail-client/thunderbird:gtk2 - Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3
-mail-client/thunderbird:jemalloc - Enable or disable jemalloc
 mail-client/thunderbird:lightning - Enable app-global calendar support (note 38.0 and above bundles calendar support when this flag is off)
 mail-client/thunderbird:minimal - Remove the software development kit and headers
 mail-client/thunderbird:mozdom - Enable Mozilla's DOM inspector
@@ -3994,7 +3980,6 @@ mail-filter/postgrey:targrey - Enables the targrey patch
 mail-filter/rmilter:dkim - Enable support for DomainKeys Identified Mail
 mail-filter/rmilter:memcached - Enable support for memcached
 mail-filter/rspamd:fann - Enable neural network plugin (requires sci-mathematics/fann).
-mail-filter/rspamd:jemalloc - Use dev-libs/jemalloc for allocations
 mail-filter/rspamd:pcre2 - Use dev-libs/libpcre2
 mail-filter/rspamd:torch - Enable torch support. This is required for the neural module
 mail-filter/spamassassin:cron - Install a cron job to update SpamAssassin's rules daily.
@@ -4101,6 +4086,9 @@ media-fonts/terminus-font:ru-i - Changes view of Russian letter 'i' - not like L
 media-fonts/terminus-font:ru-k - Changes view of Russian letter 'k' (see homepage)
 media-fonts/unifont:fontforge - Use media-gfx/fontforge to build fonts from source
 media-fonts/unifont:utils - Install unifont utilities
+media-gfx/ahoviewer:libsecret - Support password storing using libsecret
+media-gfx/ahoviewer:rar - Rar archive support
+media-gfx/ahoviewer:zip - Zip archive support
 media-gfx/album:plugins - Install optional plugins
 media-gfx/album:themes - Install optional themes
 media-gfx/alembic:arnold - Add support for arnold renderer (experimental)
@@ -4129,7 +4117,6 @@ media-gfx/blender:doc - Build C and Python API documentation directly from the s
 media-gfx/blender:elbeem - Adds surface fluid simulation to Blender using El'Beem library.
 media-gfx/blender:game-engine - Adds Game Engine support to Blender.
 media-gfx/blender:headless - Build without graphical support (renderfarm, server mode only).
-media-gfx/blender:jemalloc - Use dev-libs/jemalloc for memory allocation.
 media-gfx/blender:llvm - Enable features depending on llvm.
 media-gfx/blender:man - Build and install man pages.
 media-gfx/blender:ndof - Enable NDOF input devices (SpaceNavigator and friends).
@@ -4151,7 +4138,6 @@ media-gfx/darktable:geolocation - Enable geotagging support
 media-gfx/darktable:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
 media-gfx/darktable:opencl - Enable opencl support
 media-gfx/darktable:pax_kernel - Triggers paxmarking of main darktable binary
-media-gfx/darktable:webp - Enable WebP export support
 media-gfx/digikam:addressbook - Enable akonadi contact integration
 media-gfx/digikam:kipi - Enable support for media-plugins/kipi-plugins
 media-gfx/digikam:lensfun - Enable support for media-libs/lensfun
@@ -4166,7 +4152,6 @@ media-gfx/exiv2:webready - Support reading metadata over the internet
 media-gfx/fbida:X - Install the Motif based image viewer "ida"
 media-gfx/fbida:fbcon - Install the framebuffer image viewer "fbi"
 media-gfx/fbida:ghostscript - Install the framebuffer ghostscript viewer "fbgs"
-media-gfx/fbida:webp - Enable support for the WebP image format
 media-gfx/fim:bmp - Enable BMP file support
 media-gfx/fim:dia - Enable DIA file support via app-office/dia
 media-gfx/fim:imagemagick - Use convert from media-gfx/imagemagick as fallback file opener
@@ -4184,6 +4169,7 @@ media-gfx/geeqie:ffmpegthumbnailer - Enable video thumbnail support with media-v
 media-gfx/geeqie:gpu-accel - Enable GPU acceleration support - experimental
 media-gfx/geeqie:gtk3 - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2
 media-gfx/geeqie:map - Enable items map display - experimental
+media-gfx/gimp:heif - Enable support for ISO/IEC 23008-12:2017 HEIF files
 media-gfx/gimp:smp - Enable support for multiprocessors
 media-gfx/gimp:vector-icons - Enable support for vector icons (experimental)
 media-gfx/gmic:cli - Build CLI interface
@@ -4193,7 +4179,6 @@ media-gfx/graphicsmagick:fpx - Enable FlashPix support with media-libs/libfpx
 media-gfx/graphicsmagick:modules - Compile graphicsmagick with dynamically loadable modules
 media-gfx/graphicsmagick:q16 - Set storage quantum size to 16 (~2*memory)
 media-gfx/graphicsmagick:q32 - Set storage quantum size to 32 (~5*memory)
-media-gfx/graphicsmagick:webp - Enable support for webp image format
 media-gfx/graphviz:X - Builds lefty front-end, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)
 media-gfx/graphviz:devil - Enables DevIL output plugin -Tdevil
 media-gfx/graphviz:gdk-pixbuf - Enables gdk-pixbuf2 plugin
@@ -4204,7 +4189,6 @@ media-gfx/gthumb:colord - Use x11-misc/colord for color management
 media-gfx/gthumb:http - Enable webservice integration through net-libs/libsoup
 media-gfx/gthumb:json - Compile code that uses the libjson-glib library
 media-gfx/gthumb:slideshow - Enable slideshow plugin
-media-gfx/gthumb:webp - Enable support for webp image format
 media-gfx/hugin:sift - automatically align images with media-gfx/autopano-sift-C
 media-gfx/imagemagick:corefonts - Use media-fonts/corefonts which is required by some commands
 media-gfx/imagemagick:fpx - Enable media-libs/libfpx support
@@ -4215,8 +4199,6 @@ media-gfx/imagemagick:opencl - Enable OpenCL support
 media-gfx/imagemagick:pango - Enable Pango support using x11-libs/pango
 media-gfx/imagemagick:q32 - Set quantum depth value to 32
 media-gfx/imagemagick:q8 - Set quantum depth value to 8
-media-gfx/imagemagick:webp - Enable webp image format support using media-libs/libwebp
-media-gfx/imageworsener:webp - enable webp image format support
 media-gfx/inkscape:cdr - Enable support for CorelDRAW Diagrams
 media-gfx/inkscape:dia - pull in app-office/dia for dia import extension
 media-gfx/inkscape:inkjar - Enable support for OpenOffice.org SVG jar files
@@ -4236,7 +4218,6 @@ media-gfx/librecad:tools - Build additional tool programs: tff2lff
 media-gfx/luminance-hdr:fits - Enable support for the FITS format
 media-gfx/mandelbulber:opencl - Enable GPU rendering support using OpenCL
 media-gfx/nomacs:opencv - Build support for media-libs/opencv
-media-gfx/nomacs:zip - Build support for zip archives
 media-gfx/nvidia-texture-tools:cg - Enable NVIDIA C graphics compiler toolkit plug-in
 media-gfx/nvidia-texture-tools:cuda - Enable NVIDIA CUDA toolkit support
 media-gfx/nvidia-texture-tools:glew - Enable support for The OpenGL Extension Wrangler Library (media-libs/glew)
@@ -4272,7 +4253,6 @@ media-gfx/yafaray:fasttrig - Enable trigonometric approximations to make code fa
 media-gfx/yafaray:opencv - Use media-libs/opencv
 media-libs/a52dec:djbfft - Prefer D.J. Bernstein's library for fourier transforms
 media-libs/allegro:dumb - Enable media-libs/dumb module library support
-media-libs/allegro:opus - Enable Opus codec support
 media-libs/allegro:physfs - Enable physfs support
 media-libs/allegro:vga - Enables the VGA graphics driver
 media-libs/alsa-lib:alisp - Enable support for ALISP (ALSA LISP) interpreter for advanced features.
@@ -4290,7 +4270,6 @@ media-libs/avidemux-plugins:dcaenc - Enable DTS Coherent Acoustics audio encoder
 media-libs/avidemux-plugins:fdk - Adds support for encoding AAC using media-libs/fdk-aac.
 media-libs/avidemux-plugins:fribidi - Enable unicode bidirectional algorithm support via dev-libs/fribidi.
 media-libs/avidemux-plugins:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.
-media-libs/avidemux-plugins:opus - Adds support for the Opus codec via media-libs/opus.
 media-libs/avidemux-plugins:twolame - Enable TwoLAME support via media-sound/twolame, an optimised MPEG Audio Layer 2 (MP2) encoder.
 media-libs/avidemux-plugins:vpx - Enable WebM VP8 Codec SDK support via media-libs/libvpx.
 media-libs/avidemux-plugins:x265 - Enables HEVC support with media-libs/x265.
@@ -4328,7 +4307,6 @@ media-libs/ganv:fdgl - Use experimental force-directed graph layout
 media-libs/gd:webp - Enable support for the webp format
 media-libs/gegl:lensfun - Enable support for media-libs/lensfun.
 media-libs/gegl:umfpack - Enable sparse solving via sci-libs/umfpack.
-media-libs/gegl:webp - Enable support for media-libs/libwebp
 media-libs/giflib:rle - Build converters for RLE format (utah raster toolkit)
 media-libs/gmtk:dconf - Enable support for gnome-base/dconf
 media-libs/grilo:network - Enable network access for media discovery using net-libs/libsoup
@@ -4349,9 +4327,7 @@ media-libs/gstreamer:unwind - Enable sys-libs/libunwind usage for better backtra
 media-libs/harfbuzz:glib - Compile with GLib Unicode support
 media-libs/harfbuzz:graphite - Use graphite to render complex non-Roman writing systems
 media-libs/imlib2:shm - Use MIT shared memory support for X image transfer.
-media-libs/jbig2enc:webp - Add support for WEBP image format
 media-libs/leptonica:utils - Install command-line utilities
-media-libs/leptonica:webp - Adds support for the WebP image format
 media-libs/libafterimage:shaping - Use MIT shaped X windows extention.
 media-libs/libafterimage:shm - Use MIT shared memory extention for X image transfer.
 media-libs/libass:harfbuzz - Enables OpenType shaping via media-libs/harfbuzz.
@@ -4424,7 +4400,6 @@ media-libs/mediastreamer:g726 - Support g726 codec
 media-libs/mediastreamer:g729 - Use g726 codec plugin
 media-libs/mediastreamer:ilbc - Use of iLBC (RFC3951) codec plugin
 media-libs/mediastreamer:ntp-timestamp - Turn on NTP timestamping on received packet
-media-libs/mediastreamer:opus - Enable opus codec support
 media-libs/mediastreamer:ortp - Enable usage of net-libs/ortp
 media-libs/mediastreamer:pcap - Enable usage of net-libs/libpcap
 media-libs/mediastreamer:silk - Use silk (skype protocol) codec plugin
@@ -4477,7 +4452,6 @@ media-libs/opencv:opencl - Add support for OpenCL
 media-libs/opencv:tesseract - Use Google's OCR Engine
 media-libs/opencv:testprograms - Build and install programs for testing OpenCV (performance)
 media-libs/opencv:vtk - Build new 3D visualization module viz based on sci-libs/vtk
-media-libs/opencv:webp - Enable support for webp image format
 media-libs/openh264:plugin - Install the Gecko Media Plugin (GMP) for use with Mozilla packages
 media-libs/openh264:utils - Install the CLI encoder and decoder utilities
 media-libs/openimageio:colorio - Use media-libs/opencolorio
@@ -4507,7 +4481,6 @@ media-libs/quvi:json - Enable support for JSON output
 media-libs/raptor:json - Enable support for JSON parsing
 media-libs/raspberrypi-userland-bin:hardfp - Use armv6 hardfp ABI
 media-libs/sdif:ftruncate - Enables usage of ftruncate v. truncate
-media-libs/sdl-image:webp - support loading WEBP images
 media-libs/sdl-mixer:fluidsynth - Use media-sound/fluidsynth for MIDI support
 media-libs/sdl-mixer:midi - basic support for MIDI files
 media-libs/sdl-mixer:mod - basic support for MOD files
@@ -4597,7 +4570,6 @@ media-plugins/gst-plugins-gtk:gles2 - Enable gtkglsink OpenGL sink based on GLES
 media-plugins/gst-plugins-gtk:opengl - Enable gtkglsink OpenGL sink based on desktop OpenGL API
 media-plugins/gst-plugins-meta:http - Enable http streaming via net-libs/libsoup
 media-plugins/gst-plugins-meta:libvisual - Enable visualization effects via media-libs/libvisual
-media-plugins/gst-plugins-meta:opus - Enable Opus audio codec support
 media-plugins/gst-plugins-meta:vpx - Enables vp8 codec support using libvpx, required to play some HTML5 videos
 media-plugins/gst-plugins-vaapi:drm - Enable DRM renderer
 media-plugins/gst-plugins-vaapi:egl - Enable EGL support
@@ -4633,10 +4605,8 @@ media-plugins/vdr-epgsearch:tre - Add support for unlimited fuzzy searching with
 media-plugins/vdr-pvr350:yaepg - Enables full support for the output format of vdr-yaepg
 media-plugins/vdr-streamdev:client - Compile the VDR plugin vdr-streamdev-client that acts like a dvb-budget card
 media-plugins/vdr-streamdev:server - Compile the VDR plugin vdr-streamdev-server that allows remote systems to access the DVB cards used for the local VDR
-media-plugins/vdr-text2skin:contrib - Install user contributed scripts
 media-plugins/vdr-vdrmanager:stream - Add support for streaming Video to Android client
 media-plugins/vdr-weatherng:dxr3 - enables lower osd color depth for dxr3 cards
-media-plugins/vdr-xine:yaepg - Enables support for the plugin vdr-yaepg (showing scaled video besides OSD)
 media-plugins/vdr-xineliboutput:bluray - Enable BluRay metadata support through media-libs/libbluray
 media-plugins/vdr-xineliboutput:cec - Enable CEC support through dev-libs/libcec
 media-plugins/vdr-xineliboutput:libextractor - Use media-libs/libextractor to gather files' metadata in media-player
@@ -4652,7 +4622,6 @@ media-radio/xastir:geotiff - Install geotiff support. Allows using USGS DRG topo
 media-sound/abcde:id3tag - Support ID3, ID3v2 tagging of audio files
 media-sound/abcde:mac - Enable support for Monkey's Audio files
 media-sound/abcde:normalize - Add support for normalizing audio file volume levels
-media-sound/abcde:opus - Support opus encoding using opusenc
 media-sound/abcde:replaygain - Support for Replay Gain metadata, for relative volume adjustment
 media-sound/abcm2ps:pango - Use the pango library to render fonts with non-latin characters
 media-sound/alsa-utils:bat - install basic audio tester (BAT) util
@@ -4669,7 +4638,6 @@ media-sound/aqualung:systray - Enable system tray support
 media-sound/ario:audioscrobbler - Enable song tracking via last.fm
 media-sound/ario:idle - Enable experimental support for MPD's idle command to reduce bandwidth and cpu usage, requires MPD 0.14
 media-sound/asunder:mac - Support for creation of Monkey's Audio files (APE)
-media-sound/asunder:opus - Support for creation of Opus files
 media-sound/audacious:gtk3 - Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)
 media-sound/audacity:id3tag - Enables ID3 tagging with id3tag library
 media-sound/audacity:lv2 - Add support for Ladspa V2
@@ -4706,7 +4674,6 @@ media-sound/clementine:wiimote - Enable support for Wii remote
 media-sound/cmus:cdio - use libcdio for CD support
 media-sound/cmus:cue - enable CUE sheet parsing
 media-sound/cmus:discid - enable reading the ID of the inserted CD
-media-sound/cmus:opus - enable support for media-libs/opusfile
 media-sound/cmus:pidgin - install support script for net-im/pidgin
 media-sound/cmus:tremor - use libivorbis from media-libs/tremor instead of media-libs/libvorbis
 media-sound/csound:beats - Build the beats score frontend
@@ -4726,14 +4693,22 @@ media-sound/csound:tcl - Build the tcl interface and clients
 media-sound/csound:utils - Build stand-alone executables for utilities that can also be used via `csound -U`
 media-sound/csound:websocket - Build the websocket opcode
 media-sound/darkice:aacplus - AAC+ encoding via media-libs/libaacplus
-media-sound/darkice:opus - Enable Opus audio codec support
 media-sound/darkice:twolame - Build with twolame support
 media-sound/deinvert:liquid - improve sound quality using net-libs/liquid-dsp
 media-sound/deinvert:wav - wav file support using media-libs/libsndfile
+media-sound/denemo:alsa - Enable alsa support through media-libs/alsa-lib
+media-sound/denemo:aubio - Enable media-libs/aubio support
+media-sound/denemo:doc - Use dev-util/gtk-doc to build documentation in html format
+media-sound/denemo:evince - Use app-text/evince document viewer
+media-sound/denemo:fluidsynth - Enable Fluidsynth MIDI software synthesis using media-sound/fluidsynth
+media-sound/denemo:gtk3 - Enable support for the GTK+. If enabled uses slot 3 of x11-libs/gtk+, if disabled it uses slot 2
+media-sound/denemo:jack - Enable jack support through virtual/jack
+media-sound/denemo:portaudio - Enable support for media-libs/portaudio
+media-sound/denemo:portmidi - Enable support for the media-libs/portmidi backend
+media-sound/denemo:rubberband - Enable support for media-libs/rubberband
 media-sound/dir2ogg:mac - Add support for decoding Monkey's Audio files
 media-sound/dir2ogg:wma - Add support for wma files through mplayer
 media-sound/drumstick:fluidsynth - Enable support for media-sound/fluidsynth
-media-sound/easytag:opus - Enable support for media-libs/opus and media-libs/opusfile (opus audio codec)
 media-sound/ecasound:lv2 - Add support for Ladspa V2
 media-sound/ecasound:oil - Use dev-libs/liboil for inner loop optimizations
 media-sound/elisa:mpris - Enable MPRIS support
@@ -4746,16 +4721,14 @@ media-sound/gimmix:lyrics - Enable lyric fetching
 media-sound/gmpc:unique - Enable single instance support using dev-libs/libunique
 media-sound/gmpc:xspf - Enable support for reading and saving XSPF playlists
 media-sound/gmusicbrowser:extras - Install some extra deps for plugins (ex. Titlebar)
-media-sound/gogglesmm:opus - Enable support for opus codec
 media-sound/herrie:http - Enable http streaming
 media-sound/herrie:xspf - Enable support for reading and saving XSPF playlists
 media-sound/hydrogen:archive - Use libarchive instead of libtar
 media-sound/hydrogen:portmidi - Add portmidi support
 media-sound/jack-audio-connection-kit:coreaudio - Build the CoreAudio driver on Mac OS X systems
 media-sound/jack-audio-connection-kit:pam - Add basic realtime configuration via sys-auth/realtime-base
-media-sound/jack2:celt - Support CELT low delay audio codec (media-libs/celt)
+media-sound/jack2:celt - Support CELT low delay audio codec
 media-sound/jack2:classic - Enable building of jackd
-media-sound/jack2:opus - Support media-libs/opus
 media-sound/jack2:pam - Add basic realtime configuration via sys-auth/realtime-base
 media-sound/jalv:gtk2 - Adds support for GTK+2 in addition to GTK+3 controlled by the gtk useflag.
 media-sound/jalv:gtkmm - Adds support for dev-cpp/gtkmm: C++ interface for GTK+2
@@ -4773,9 +4746,7 @@ media-sound/lmms:vst - Enables the VeSTige plugin to run VST plugins through Win
 media-sound/lyvi:mpris - Enable MPRIS support
 media-sound/mangler:espeak - Text to speech engine
 media-sound/mangler:g15 - Logitech g15 lcd support
-media-sound/mangler:opus - Codec specialized for speech over the internet
 media-sound/mixxx:hid - Enable HID controller support
-media-sound/mixxx:opus - Enable support for opus codec via media-libs/opusfile.
 media-sound/mixxx:shout - Enable broadcasting support via media-libs/libshout
 media-sound/moc:cache - Enable tags caching support
 media-sound/moc:magic - Use libmagic to determine mimetypes
@@ -4799,7 +4770,6 @@ media-sound/mpd:libsoxr - Enable the libsoxr resampler
 media-sound/mpd:mpg123 - Enable support for mp3 decoding over media-sound/mpg123
 media-sound/mpd:network - Enables network streaming support
 media-sound/mpd:nfs - Enable support for the Network File System
-media-sound/mpd:opus - Enable Opus codec support
 media-sound/mpd:pipe - Support writing audio to a pipe
 media-sound/mpd:recorder - Enables output plugin for recording radio streams
 media-sound/mpd:sid - Build with SID (Commodore 64 Audio) support
@@ -4809,11 +4779,9 @@ media-sound/mpd:systemd - Enable support for systemd socket activation
 media-sound/mpd:twolame - Support twolame MPEG-2 encoding
 media-sound/mpd:webdav - Enable using music from a WebDAV share
 media-sound/mpd:wildmidi - Enable MIDI support via wildmidi
-media-sound/mpd:zip - Support for ZIP files
 media-sound/mpfc:wav - Enable wav audio codec support
 media-sound/mpg123:int-quality - Use rounding instead of fast truncation for integer output, where possible
 media-sound/mumble:g15 - Enable support for the Logitech G15 LCD (and compatible devices).
-media-sound/mumble:opus - Enable Opus codec support via media-libs/opus.
 media-sound/mumble:rnnoise - Enable alternative noise suppression option based on RNNoise.
 media-sound/mumble:speech - Enable text-to-speech support in Mumble.
 media-sound/murmur:ice - Use dev-libs/Ice to enable remote control capabilities.
@@ -4839,7 +4807,6 @@ media-sound/patchage:session - Include experimental Jack session management (sav
 media-sound/pithos:appindicator - Enable usage of appindicator to export menu options in to unity
 media-sound/pithos:keybinder - Use keybinder to enable global key bindings
 media-sound/pms:regex - Enable regular expression searches
-media-sound/potamus:opus - Adds support for the Opus codec.
 media-sound/pragha:glyr - Enable music metadata searchengine support using media-libs/glyr
 media-sound/pragha:grilo - Play songs on DLNA servers using media-libs/grilo
 media-sound/pragha:keybinder - Enable shortcut support using dev-libs/keybinder
@@ -4884,7 +4851,6 @@ media-sound/qmmp:gnome - Enable Gnome hotkey support (requires Qt5DBus)
 media-sound/qmmp:lyrics - Fetch track lyrics from the web
 media-sound/qmmp:midi - Enable midi support using wildmidi library
 media-sound/qmmp:notifier - Enable qmmps' notifier system
-media-sound/qmmp:opus - Enable the opus plugin
 media-sound/qmmp:projectm - Enable projectm music visualization plugin
 media-sound/qmmp:qsui - Enable QMMP simple UI
 media-sound/qmmp:qtmedia - Enable playback via dev-qt/qtmultimedia
@@ -4900,14 +4866,18 @@ media-sound/qtractor:rubberband - Enable support for in-place audio clip pitch-s
 media-sound/rhythmbox:daap - Build the local network music sharing plugin which uses the DAAP protocol using net-libs/libdmapsharing
 media-sound/shntool:alac - Add support for Apple Lossless Audio Codec files
 media-sound/shntool:mac - Add support for Monkey's Audio files
+media-sound/snapcast:avahi - Build with avahi support
+media-sound/snapcast:client - Build and install Snapcast client component
+media-sound/snapcast:flac - Build with FLAC compression support
+media-sound/snapcast:server - Build and install Snapcast server component
+media-sound/snapcast:tremor - Build with TREMOR version of vorbis
+media-sound/snapcast:vorbis - Build with libvorbis support
 media-sound/snd:s7 - Enable the s7 extension language (a version of Scheme)
 media-sound/sonata:lyrics - Support for lyrics fetching
 media-sound/sonata:trayicon - Enable support for trayicon
 media-sound/sonic-visualiser:id3tag - Enables ID3 tagging with id3tag library
-media-sound/soundconverter:opus - Enable Opus audio codec support
 media-sound/sox:amr - Enables Adaptive Multi-Rate Audio support
 media-sound/sox:id3tag - Enables ID3 tagging with id3tag library
-media-sound/sox:opus - Enables reading Ogg Opus files.
 media-sound/sox:twolame - Enables twolame support (MPEG Audio Layer 2 encoder)
 media-sound/split2flac:enca - Try to guess the charset using enca
 media-sound/split2flac:flake - Add support for Flake, alternative FLAC encoder
@@ -4941,7 +4911,6 @@ media-sound/xmms2:ices - Icecast source output plugin
 media-sound/xmms2:mac - Support for Monkey's Audio (APE) format with help of media-sound/mac
 media-sound/xmms2:mlib-update - Enable building of xmms2-mlib-updater client
 media-sound/xmms2:ofa - Support for Open Fingerprint Architecture (OFA)
-media-sound/xmms2:opus - Enable Opus audio codec support
 media-sound/xmms2:phonehome - This client sends anonymous usage-statistics to the xmms2
 media-sound/xmms2:server - Build xmms2 player daemon (otherwise only clients are built)
 media-sound/xmms2:sid - Support for C64 SID
@@ -5004,7 +4973,6 @@ media-tv/tvheadend:dvben50221 - Enable support for hardware CAM
 media-tv/tvheadend:hdhomerun - Enable support for the HDHomeRun device
 media-tv/tvheadend:imagecache - Enable support for image caching
 media-tv/tvheadend:iptv - Enable support for Internet Protocol TV
-media-tv/tvheadend:opus - Enable transcoding with the Opus audio codec
 media-tv/tvheadend:satip - Enable support for IP-based Satellite TV
 media-tv/tvheadend:timeshift - Enable TimeShift support
 media-tv/tvheadend:uriparser - Use dev-libs/uriparser
@@ -5079,7 +5047,7 @@ media-video/ffmpeg:armvfp - Enables VFP optimizations for ARM processors.
 media-video/ffmpeg:bluray - Enable playback of Blu-ray filesystems
 media-video/ffmpeg:bs2b - Enables media-libs/libbs2b based Bauer stereo-to-binaural filter.
 media-video/ffmpeg:cdio - Enables audio CD grabbing with dev-libs/libcdio.
-media-video/ffmpeg:celt - Adds Xiph CELT audio decoding support via media-libs/celt
+media-video/ffmpeg:celt - Adds Xiph CELT audio decoding support
 media-video/ffmpeg:chromaprint - Enables audio fingerprinting support with media-libs/chromaprint.
 media-video/ffmpeg:chromium - Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi.
 media-video/ffmpeg:codec2 - Enables codec2 low bit rate speech codec support via media-libs/codec2.
@@ -5111,7 +5079,6 @@ media-video/ffmpeg:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardw
 media-video/ffmpeg:opencl - Enable OpenCL support
 media-video/ffmpeg:openh264 - Enables H.264 encoding suppoprt via media-libs/openh264.
 media-video/ffmpeg:openssl - Enables dev-libs/openssl support. Adds support for encrypted network protocols (TLS/HTTPS).
-media-video/ffmpeg:opus - Adds (decoding) support for the Opus codec via media-libs/opus.
 media-video/ffmpeg:pic - Force shared libraries to be built as PIC (this is slower)
 media-video/ffmpeg:postproc - Build and install libpostproc.
 media-video/ffmpeg:rubberband - Adds time-stretching and pitch-shifting audio filter based on media-libs/rubberband.
@@ -5121,7 +5088,6 @@ media-video/ffmpeg:sofalizer - Enables Sofalizer filter
 media-video/ffmpeg:ssh - Enable SSH/sftp support via net-libs/libssh.
 media-video/ffmpeg:twolame - Enables MP2 encoding via media-sound/twolame as an alternative to the internal encoder.
 media-video/ffmpeg:vpx - Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.
-media-video/ffmpeg:webp - Enables WebP encoding with media-libs/libwebp.
 media-video/ffmpeg:x265 - Enables HEVC encoding with media-libs/x265.
 media-video/ffmpeg:zeromq - Enables net-libs/zeromq support with the zmq/azmq filters.
 media-video/ffmpeg:zimg - Enables media-libs/zimg based scale filter.
@@ -5165,7 +5131,6 @@ media-video/libav:tools - Build and install small tools like aviocat, cws2fws, g
 media-video/libav:twolame - Enable MP2 encoding via media-sound/twolame as an alternative to the internal encoder
 media-video/libav:vis - Adds support for SIMD optimizations for UltraSPARC processors.
 media-video/libav:vpx - Enable vp8 encoding support using media-libs/libvpx.
-media-video/libav:webp - Enable WebP encoding with media-libs/libwebp.
 media-video/libav:x265 - Enable HEVC encoding with media-libs/x265.
 media-video/libva-utils:drm - Enables VA/DRM API support.
 media-video/makemkv:gui - Build the Qt5 GUI
@@ -5319,7 +5284,6 @@ media-video/vlc:nfs - Enable support for nfs protocol via net-fs/libnfs
 media-video/vlc:omxil - Enable OpenMAX Integration Layer codec module
 media-video/vlc:opencv - Enable OpenCV (computer vision) filter module
 media-video/vlc:optimisememory - Enable optimisation for memory rather than performance
-media-video/vlc:opus - Support opus decoding via libopus
 media-video/vlc:postproc - Enable image post-processing via libpostproc (part of FFmpeg)
 media-video/vlc:projectm - Enable the projectM visualization plugin
 media-video/vlc:rtsp - Enable real audio and RTSP modules
@@ -5361,11 +5325,10 @@ net-analyzer/bro:broctl - An interactive shell for managing Bro installations
 net-analyzer/bro:broker - Bro's new Messaging Library (experimental)
 net-analyzer/bro:geoip - Enable support for Maxmind's GeoIP library
 net-analyzer/bro:ipv6 - Support for mobile IPv6
-net-analyzer/bro:jemalloc - Support for the Jemalloc allocator
 net-analyzer/bro:python - Enable Python bindings
 net-analyzer/bro:ruby - Enable Ruby bindings (deprecated)
 net-analyzer/bro:tcmalloc - Enable Google's Performance Analysis Tools
-net-analyzer/bro:tools - Small auxiliary tools for Bro
+net-analyzer/bro:tools - Auxiliary tools for Bro: adtrace, bro-cut, devel-tools, rst
 net-analyzer/bwm-ng:csv - Enable csv output
 net-analyzer/bwm-ng:html - Enable html output
 net-analyzer/cacti:doc - install html documentation
@@ -5680,6 +5643,7 @@ net-dns/dnsmasq:conntrack - Add support for Linux conntrack connection marking.
 net-dns/dnsmasq:dhcp - Enable support for acting as a DHCP server.
 net-dns/dnsmasq:dhcp-tools - Install extra command line tools for manually managing DHCP leases.
 net-dns/dnsmasq:dnssec - Enable support DNSSEC validation and caching.
+net-dns/dnsmasq:dumpfile - Include code to dump packets to a libpcap-format file for debugging
 net-dns/dnsmasq:id - Whether report *.bind CHAOS info to clients, otherwise forward such requests upstream instead
 net-dns/dnsmasq:libidn2 - Enable support for Internationalized Domain Names, via net-dns/libidn2 rather than net-dns/libidn
 net-dns/dnsmasq:script - Enable support for calling scripts when leases change.
@@ -5704,6 +5668,7 @@ net-dns/knot:geoip - Enable the Geography-based responses module
 net-dns/knot:libidn2 - If IDN support is enabled, use net-dns/libidn2 instead of net-dns/libidn
 net-dns/knot:noudp - Enable the module which can send empty truncated responses to UDP queries
 net-dns/knot:onlinesign - Enable the module that sign zones on the fly instead of pre-signing zone
+net-dns/knot:queryacl - Enable the module for query access control
 net-dns/knot:rosedb - Enable the module that staticaly override certain responses
 net-dns/knot:rrl - Enable the response rate limiting module
 net-dns/knot:stats - Enable the server statistics module
@@ -6223,7 +6188,6 @@ net-libs/mbedtls:programs - Build PolarSSL programs
 net-libs/neon:libproxy - Add support for net-libs/libproxy
 net-libs/neon:pkcs11 - Add support for PKCS#11 using dev-libs/pakchois
 net-libs/nghttp2:hpack-tools - Install HPACK (header compression) helper tools
-net-libs/nghttp2:jemalloc - Use dev-libs/jemalloc for memory allocation
 net-libs/nghttp2:utils - Install nghttp, nghttpd and nghttpx
 net-libs/nodejs:inspector - Enable V8 inspector
 net-libs/nodejs:npm - Enable NPM package manager
@@ -6247,12 +6211,10 @@ net-libs/pjproject:ilbc - Include iLBC codec in the build
 net-libs/pjproject:l16 - Include Linear/L16 codec family in the build
 net-libs/pjproject:libyuv - Include libyuv in the build
 net-libs/pjproject:openh264 - Include Open H.264 support in the build
-net-libs/pjproject:opus - Include OPUS support in the build
 net-libs/pjproject:resample - Include resampling implementations in the build
 net-libs/pjproject:silk - Include SILK support in the build
 net-libs/pjproject:v4l2 - Include Video4Linux v2 support in the build
 net-libs/pjproject:webrtc - Enable WebRTC support
-net-libs/qxmpp:opus - Enable Opus codec support via media-libs/opus
 net-libs/qxmpp:vpx - Enable VP8 codec support via media-libs/libvpx
 net-libs/rabbitmq-c:tools - Builds cli tools to interact with brokers
 net-libs/shairplay:alac - Add support for Apple Lossless Audio Codec files
@@ -6350,7 +6312,6 @@ net-mail/vpopmail:maildrop - Enables mail-filter/maildrop support in vdelivermai
 net-mail/vpopmail:spamassassin - Enables mail-filter/spamassassin support
 net-misc/apt-cacher-ng:fuse - Install the sys-fs/fuse based acngfs, to use a userspace filesystem for the apt cache.
 net-misc/aria2:bittorrent - Enable support for the bittorrent protocol.
-net-misc/aria2:jemalloc - Use dev-libs/jemalloc to replace the malloc() implementation with a possibly faster one
 net-misc/aria2:libuv - Use dev-libs/libuv backend.
 net-misc/aria2:libxml2 - Use dev-libs/libxml2 for XML parsing (preferred) instead of dev-libs/expat.
 net-misc/aria2:metalink - Enable support for metalink.
@@ -6612,7 +6573,6 @@ net-misc/lldpd:old-kernel - Enable compatibility with Linux kernel older than 2.
 net-misc/lldpd:sanitizers - Enable code instrumentation with selected sanitizers
 net-misc/lldpd:snmp - Enable the use of SNMP
 net-misc/lldpd:sonmp - Enable SynOptics Network Management
-net-misc/megatools:fuse - Enables support for the filesystem in userspace plugin through sys-fs/fuse.
 net-misc/memcached:slabs-reassign - Allow manual reassignment of memory slabs at the cost of slab optimizations.
 net-misc/minidlna:netgear - Enable netgear branding
 net-misc/minidlna:readynas - Enable readynas branding
@@ -6950,6 +6910,7 @@ net-print/hplip:fax - Enable fax on multifunction devices which support it
 net-print/hplip:hpcups - Build the hpcups driver for cups (by HP)
 net-print/hplip:hpijs - Build the IJS driver for cups (Foomatic)
 net-print/hplip:kde - Enables kde-misc/skanlite as scanner GUI with USE="scanner X"
+net-print/hplip:libnotify - Enables desktop notifications
 net-print/hplip:libusb0 - Depend on virtual/libusb SLOT 0. Some old printers do not work with virtual/libusb SLOT 1.
 net-print/hplip:minimal - Only build internal hpijs/hpcups driver (not recommended at all, make sure you know what you are doing)
 net-print/hplip:parport - Enable parallel port for devices which require it
@@ -7002,6 +6963,7 @@ net-proxy/tinyproxy:reverse-proxy - Enable reverse proxying
 net-proxy/tinyproxy:transparent-proxy - Enable transparent proxying
 net-proxy/tinyproxy:upstream-proxy - Enable upstream proxying
 net-proxy/tinyproxy:xtinyproxy-header - Include the X-Tinyproxy header
+net-proxy/trojan:mysql - build with MySQL support
 net-proxy/tsocks:dns - Force DNS queries to use SOCKS server via tcp
 net-proxy/tsocks:envconf - Allow TSOCKS_CONF_FILE to specify configuration file
 net-proxy/tsocks:server-lookups - Allow hostname resolution _for_ SOCKS servers
@@ -7452,7 +7414,6 @@ sci-libs/ipopt:mumps - Enable sci-libs/mumps support
 sci-libs/lapack-reference:deprecated - Build deprecated routines
 sci-libs/lemon:coin - Enable the sci-libs/coinor-clp and sci-libs/coinor-cbc graph algorithms
 sci-libs/lemon:glpk - Enable GNU Linear Programming Kit sci-mathematics/glpk support
-sci-libs/lemon:tools - Build additional tools
 sci-libs/libccd:double - Use double precision floats.
 sci-libs/libghemical:mopac7 - Use sci-chemistry/mopac7 for semi-empirical calculations
 sci-libs/libghemical:mpqc - Use sci-chemistry/mpqc for quantum-mechanical calculations
@@ -7463,6 +7424,7 @@ sci-libs/libsigrok:serial - Enable drivers that are serial (RS232) based
 sci-libs/libsvm:tools - Install python based tool scripts for data selection and visualization with sci-visualization/gnuplot
 sci-libs/linux-gpib:firmware - Install firmware
 sci-libs/linux-gpib:isa - Build ISA kernel modules; from 3.12 on the setting is ignored and the decision based on the kernel configuration
+sci-libs/linux-gpib-modules:isa - Build ISA kernel modules; from 3.12 on the setting is ignored and the decision based on the kernel configuration
 sci-libs/lis:quad - Enable quadruple precision operations
 sci-libs/lis:saamg - Build the Smoothed Aggregation Algebraic MultiGrid preconditioner
 sci-libs/magma:fermi - Compile for GPU NVIDIA Fermi family (2.x cards)
@@ -7540,7 +7502,6 @@ sci-libs/symengine:mpc - Add support for multiprecision complex arithmetic(dev-l
 sci-libs/symengine:mpfr - Add support for multiprecision floating point rouding(dev-libs/mpfr)
 sci-libs/taucs:cilk - Enable multithreading using dev-lang/cilk
 sci-libs/tensorflow:cuda - Enable support for nVidia CUDA
-sci-libs/tensorflow:jemalloc - Enable support for dev-libs/jemalloc
 sci-libs/tensorflow:mpi - Enable support for MPI
 sci-libs/tensorflow:system-libs - Link with system instead of bundled libraries
 sci-libs/umfpack:cholmod - Use sci-libs/cholmod for matrix ordering
@@ -7680,7 +7641,6 @@ sci-physics/root:fits - Enable support for images and data from FITS files with
 sci-physics/root:fortran - Compile included Fortran programs
 sci-physics/root:gdml - Enable GDML writer and reader
 sci-physics/root:http - Enable http server support including but not limited to fastcgi support
-sci-physics/root:jemalloc - Enable support for dev-libs/jemalloc
 sci-physics/root:libcxx - Build ROOT against sys-libs/libcxx
 sci-physics/root:memstat - Build memory statistics library, helps to detect memory leaks
 sci-physics/root:minuit - Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)
@@ -8062,7 +8022,6 @@ sys-cluster/ceph:cephfs - Build support for cephfs, a POSIX compatible filesyste
 sys-cluster/ceph:cryptopp - Use dev-libs/crypto++ for cryptography
 sys-cluster/ceph:dpdk - Enable DPDK messaging
 sys-cluster/ceph:fuse - Build fuse client
-sys-cluster/ceph:jemalloc - Use dev-libs/jemalloc for allocations
 sys-cluster/ceph:libaio - Use libaio as asynchronous input/output library
 sys-cluster/ceph:libatomic - Use libatomic instead of builtin atomic operations
 sys-cluster/ceph:lttng - Add support for LTTng
@@ -8112,7 +8071,6 @@ sys-cluster/glusterfs:rsyslog - Install configuration snippet for app-admin/rsys
 sys-cluster/glusterfs:systemtap - Enable support for dev-util/systemtap
 sys-cluster/glusterfs:tiering - Enable support for data classification/tiering (requires dev-db/sqlite SLOT 3)
 sys-cluster/heat:memcached - Installs the memcached server
-sys-cluster/hpx:jemalloc - Use dev-libs/jemalloc for memory allocation
 sys-cluster/hpx:papi - Use dev-libs/papi for NaCl
 sys-cluster/hpx:perftools - Use dev-util/google-perftools for memory allocation
 sys-cluster/hpx:tbb - Use dev-cpp/tbb for memory allocation
@@ -8485,11 +8443,6 @@ sys-libs/pam:cracklib - Build the pam_cracklib module, that allows to verify the
 sys-libs/readline:utils - Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline
 sys-libs/talloc:compat - Enable extra compatibility stuff
 sys-libs/timezone-data:leaps_timezone - Install the set of "right" timezones; these timezones include leap seconds when counting seconds since the epoch (while POSIX does not) as they are based on the TAI (International Atomic Time) clock
-sys-libs/uclibc:rpc - Enable sun nis/rpc support (you should use libtirpc though)
-sys-libs/uclibc:savedconfig - Adds support for user defined configs
-sys-libs/uclibc:ssp - Force the use of ssp to be built into a hardened uclibc setup
-sys-libs/uclibc:uclibc-compat - Build uclibc with backwards compatible options
-sys-libs/uclibc:wordexp - Add support for word expansion (wordexp.h)
 sys-libs/uclibc-ng:rpc - Enable sun nis/rpc support (you should use libtirpc though)
 sys-libs/uclibc-ng:symlink-compat - Explicitly add sym links for libdl.so.0, libm.so.0, and friends for backward compatibility with sys-libs/uclibc-ng-1.0.17 and earlier
 sys-libs/zlib:minizip - include the minizip library for quick and dirty zip extraction
@@ -8689,7 +8642,6 @@ www-client/firefox:geckodriver - Enable WebDriver support
 www-client/firefox:gmp-autoupdate - Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles
 www-client/firefox:gtk2 - Use the cairo-gtk2 rendering engine
 www-client/firefox:hwaccel - Force-enable hardware-accelerated rendering (Mozilla bug 594876)
-www-client/firefox:jemalloc - Enable or disable jemalloc
 www-client/firefox:lto - Enable Link Time Optimization (LTO). Requires Gold linker when using GCC or LDD linker when using Clang
 www-client/firefox:pgo - Add support for profile-guided optimization using gcc-4.5, for faster binaries. This option will double the compile time.
 www-client/firefox:rust - Enable support for using rust compiler (experimental)
@@ -8723,7 +8675,6 @@ www-client/netsurf:pdf-writer - PDF output support (media-libs/libharu)
 www-client/netsurf:psl - Use public suffix list via media-libs/libnspsl
 www-client/netsurf:rosprite - RISC OS Sprite bitmap image support (media-libs/librosprite)
 www-client/netsurf:svgtiny - SVG image support via media-libs/svgatiny instead of gnome-base/librsvg
-www-client/netsurf:webp - WebP image support (media-libs/libwebp)
 www-client/opera:gtk - Install support libraries and runtime dependencies to support GTK+/GNOME desktop integration
 www-client/otter:webengine - Use dev-qt/qtwebengine as backend instead of dev-qt/qtwebkit (experimental)
 www-client/qupzilla:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
@@ -8734,7 +8685,6 @@ www-client/seamonkey:custom-optimization - Build with user-specified compiler op
 www-client/seamonkey:force-gtk3 - Use the cairo-gtk3 rendering engine
 www-client/seamonkey:gmp-autoupdate - Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles
 www-client/seamonkey:ipc - Use inter-process communication between tabs and plugins. Allows for greater stability in case of plugin crashes
-www-client/seamonkey:jemalloc - Enable or disable jemalloc
 www-client/seamonkey:roaming - Build roaming extension support (default on)
 www-client/seamonkey:system-cairo - Use the system-wide x11-libs/cairo instead of bundled
 www-client/seamonkey:system-harfbuzz - Use the system-wide media-libs/harfbuzz instead of bundled
@@ -8771,16 +8721,6 @@ www-plugins/chrome-binary-plugins:widevine - Install the Widevine DRM library
 www-plugins/freshplayerplugin:gles2 - Use system GLESv2 libraries instead of ANGLE for shader translation
 www-plugins/freshplayerplugin:gtk3 - Build with GTK+ 3 instead of GTK+ 2
 www-plugins/freshplayerplugin:v4l - Use libv4l2 for colorspace conversion
-www-plugins/gnash:agg - Rendering based on the Anti-Grain Geometry Rendering Engine library
-www-plugins/gnash:cygnal - Enable building of the cygnal server
-www-plugins/gnash:dump - Enable dump output module for creating video from SWF
-www-plugins/gnash:egl - Enable EGL support for the OpenVG, OpenGL and X11 renderers
-www-plugins/gnash:harden - Enable upstream recommended hardening build flags (may conflict with system ones)
-www-plugins/gnash:jemalloc - Use dev-libs/jemalloc for allocations
-www-plugins/gnash:openvg - Rendering based on the OpenVG graphics acceleration API
-www-plugins/gnash:sdl-sound - Enable SDL audio output for the standalone player
-www-plugins/gnash:ssh - Enable using SSH for network authentication in libnet
-www-plugins/gnash:ssl - Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support)
 www-plugins/lightspark:gles - Replace default OpenGL renderer with GLESv2
 www-plugins/lightspark:ppapi - Install the PPAPI plugin (for Chromium)
 www-plugins/lightspark:rtmp - Enable Real Time Messaging Protocol using librtmp
@@ -8856,7 +8796,6 @@ www-servers/tomcat:extra-webapps - Build also the docs and examples webapp
 www-servers/tomcat:websockets - Builds websockets api and implementation (requires java 7)
 www-servers/uwsgi:embedded - Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.
 www-servers/uwsgi:go - Build the gccgo plugin to run Go applications.
-www-servers/uwsgi:jemalloc - Use dev-libs/jemalloc instead of libc's malloc
 www-servers/uwsgi:json - Support json as a configuration file format.
 www-servers/uwsgi:pypy - Build the pypy plugin to run your code using virtual/pypy.
 www-servers/uwsgi:python_asyncio - Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).
@@ -8865,7 +8804,6 @@ www-servers/uwsgi:routing - Enable routing support
 www-servers/uwsgi:yajl - Use dev-libs/yajl instead of dev-libs/jansson for parsing JSON configuration files (if USe=json is set)
 www-servers/uwsgi:yaml - Support yaml as a configuration file format.
 www-servers/uwsgi:zeromq - Enable logging and deployment via ZeroMQ.
-www-servers/varnish:jemalloc - Use dev-libs/jemalloc for allocations
 www-servers/xsp:developer - creates .mdb files for either Release and Debug
 www-servers/xsp:net35 - use .NET 3.5 Framework
 www-servers/xsp:net40 - use .NET 4.0 Framework
@@ -9126,7 +9064,6 @@ x11-wm/subtle:xrandr - Enable support for the X RandR extension
 x11-wm/subtle:xtest - Enable support for the XTest extension
 x11-wm/vtwm:rplay - Enable rplay support, needed for sound.
 x11-wm/windowmaker:modelock - Enable XKB language status lock support. README says: "If you don't know what it is you probably don't need it."
-x11-wm/windowmaker:webp - Enables WebP image format support using media-libs/libwebp
 x11-wm/windowmaker:xrandr - Enable XRandR window extension support
 x11-wm/wmfs:imlib2 - Enable image support through media-libs/imlib2
 x11-wm/xmonad:default-term - Pull terminal specified in default xmonad config to be a bit less hostile by default.
@@ -9143,7 +9080,6 @@ x11-wm/xpra:pillow - Enable pillow support
 x11-wm/xpra:server - Build server-side code
 x11-wm/xpra:vpx - Enable vpx image format support
 x11-wm/xpra:webcam - Enable webcam support via opencv
-x11-wm/xpra:webp - Enable webp image format support
 xfce-base/garcon:gtk2 - Build the garcon-gtk2-1 library (required for xfce-base/xfce4-panel < 4.13 only).
 xfce-base/libxfce4ui:glade - Build support for Glade 3's GtkBuilder implementation
 xfce-base/thunar:trash-panel-plugin - Build the trash status indicator plugin for the XFCE panel
@@ -9159,6 +9095,8 @@ xfce-extra/xfce4-playercontrol-plugin:mpd - Enable Music Player Daemon support
 xfce-extra/xfce4-power-manager:panel-plugin - Build the power management plugin for the XFCE panel
 xfce-extra/xfce4-pulseaudio-plugin:keybinder - Enable support for global hotkeys using dev-libs/keybinder.
 xfce-extra/xfce4-pulseaudio-plugin:wnck - Enable experimental support for raising media player windows using x11-libs/libwnck.
+xfce-extra/xfce4-screensaver:consolekit - Enable ConsoleKit support
+xfce-extra/xfce4-screensaver:locking - Enable screen locking support
 xfce-extra/xfce4-soundmenu-plugin:glyr - Enable music metadata searchengine support using media-libs/glyr
 xfce-extra/xfce4-soundmenu-plugin:keybinder - Enable shortcut support using dev-libs/keybinder
 xfce-extra/xfce4-soundmenu-plugin:lastfm - Enable last.fm support using media-libs/libclastfm
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 314024aeadde..7644e1676d46 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/ros_control/Manifest b/ros-meta/ros_control/Manifest
index 18c71754c943..f98d602868e9 100644
--- a/ros-meta/ros_control/Manifest
+++ b/ros-meta/ros_control/Manifest
@@ -1,8 +1,10 @@
 DIST ros_control-0.14.1.tar.gz 655028 BLAKE2B 86bdce47b947fc4f9b8be9c791ba4247240b81e391bb3f5916b26ff67256c928ea4c68d46ac3ffbe2ddb4f3b746769799bbc6617ae7822618f47770b55a09f15 SHA512 c668e589361084e51359bff2af055978cfd73c99fd33ae51962a7cefa7c6fd5a7027c0b2e5ca0c045a602b33b8037d587f9b4d958eea8b2f4199bff1e4016689
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
+DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
 EBUILD ros_control-0.14.1.ebuild 713 BLAKE2B 36734e4c3bcefbb8a92dd9dd5df289c9217fdb7fc25a13110c461f556e6993e07e583b8561c82e7f67dfb6724608ac52bfca7dd0f3d7bd708a5892cd819d9af5 SHA512 d7bd30446de06477fbb967595859e2860b77f2df94e1cef22dcc51d5288f6603c81501b1ae899b1562ef559a6da3f04ac3dc0a6a68b62c6adffd11b62952d6eb
 EBUILD ros_control-0.14.2.ebuild 713 BLAKE2B 36734e4c3bcefbb8a92dd9dd5df289c9217fdb7fc25a13110c461f556e6993e07e583b8561c82e7f67dfb6724608ac52bfca7dd0f3d7bd708a5892cd819d9af5 SHA512 d7bd30446de06477fbb967595859e2860b77f2df94e1cef22dcc51d5288f6603c81501b1ae899b1562ef559a6da3f04ac3dc0a6a68b62c6adffd11b62952d6eb
 EBUILD ros_control-0.15.0.ebuild 713 BLAKE2B 36734e4c3bcefbb8a92dd9dd5df289c9217fdb7fc25a13110c461f556e6993e07e583b8561c82e7f67dfb6724608ac52bfca7dd0f3d7bd708a5892cd819d9af5 SHA512 d7bd30446de06477fbb967595859e2860b77f2df94e1cef22dcc51d5288f6603c81501b1ae899b1562ef559a6da3f04ac3dc0a6a68b62c6adffd11b62952d6eb
+EBUILD ros_control-0.15.1.ebuild 710 BLAKE2B 72aa7065f477b45dbab7c7147de34723a5c0ad19107af4941f5929bfc4a0e8a1602407cb8c18eed301f28bfc4353d9cac852d00fe4e810acb1d62edbca9e2548 SHA512 c6d2d7a8a72c0e543b5dedb638952251d9371a204387b5c941809339abdd687e90f4fa6bfb0814ab4aec8cfbf16d56dab0ebae1f1fcf90f658a3c2b6f6d888ca
 EBUILD ros_control-9999.ebuild 713 BLAKE2B 429e6d050f66f8a405872eb4ddbd32ae86bfb2c11fcea7dadbc04f7e90d84e6e059e2ea5f72a45d12d3e7eaedbd138e50bf99025e1f3b9d6f12269039e00235d SHA512 453c6a0089331dd0f3aa7d0fa32ed706b2b12b05ac0de923d8aa6d5aeac0de3edd0886dbb388a66b25aa551d303f2c8a71ec711b5758bec059175c0f9db8bcd8
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/ros-meta/ros_control/ros_control-0.15.1.ebuild b/ros-meta/ros_control/ros_control-0.15.1.ebuild
new file mode 100644
index 000000000000..296bdc2ad2df
--- /dev/null
+++ b/ros-meta/ros_control/ros_control-0.15.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Controller interfaces, controller managers, transmissions, hardware_interfaces, control_toolbox"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/combined_robot_hw
+	dev-ros/combined_robot_hw_tests
+	dev-ros/controller_interface
+	dev-ros/controller_manager
+	dev-ros/controller_manager_msgs
+	dev-ros/controller_manager_tests
+	dev-ros/hardware_interface
+	dev-ros/joint_limits_interface
+	dev-ros/rqt_controller_manager
+	dev-ros/transmission_interface
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 384d917e6bbd..852e74c85233 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 0f07006214da..73274474dd37 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -4,5 +4,5 @@ DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f0
 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
 DIST stellarium-0.16.0.tar.gz 204675673 BLAKE2B fe34ab611569e23277ae9f273d1ae72139d5b860d0ae1b5650a9744960ce8bac6953d7de98b60bd224374aa77db33c00081ed90d1683b2007ef1b5068af158ff SHA512 0f75441435ff1d0fa149264116e9ae6ec3b3553f7c66e78832bdb0ffd55cbef656b820680134d95f89c73e80ef283372660ea7545db7fff205da66cf4cf8e9d6
-EBUILD stellarium-0.16.0-r1.ebuild 2682 BLAKE2B a7d339dba9db7e9e61d7ae2f87392ccd2e75f127aead0c93f79c0dcf6477ecaf891b9318a4a8e0741ef6ffaf7d91f0a49cc1d45d54b3c16299dc899622847400 SHA512 d3f8dd098fa304ed3e9030d02b842bf8c640ca0200731b9864f70f8e5e0b141b9666dc22014d54308ce4a7c5cc563a632460aa8beb41189f8c466c62f0a88afa
+EBUILD stellarium-0.16.0-r1.ebuild 2678 BLAKE2B 4ad1b128b5d332059796e02782935c7fbb4c355339264eb5679e86a2d10e734f76bb203c6b18401e7ef96f7b851b862a9a7d6501e86a76a45aa831dcd856d01f SHA512 db6a1df905b969aa878ed6bd5274e7496696805df7200366f70621929aa83239d5d20082d89eab83af02cd99b843d695ab8dbcbe3e750da54f3d2bbc3b68cabf
 MISC metadata.xml 758 BLAKE2B 69f3db0b3705b55f1eb04d67e0e6d6baab7e7e7df214f0a5386b74efd2863b63290581cd6c5b90000bab20a423902722ab560a670aa25796c7d555875a5961ac SHA512 33bc261705580ece702dce6d2f4d4143e80daa072a09bfbb40bb522d3a494f5f438d560a3ff0aa089313b365015189aa909b831a95166c8e709477dc6625a31c
diff --git a/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild b/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
index 343831a3b7bc..c812fd7ca1c7 100644
--- a/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug gps media nls stars"
 
 RESTRICT="test" # There are no tests
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 6716c2378851..6ba6bf0411ba 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/allpathslg/Manifest b/sci-biology/allpathslg/Manifest
index dab34c2f1993..e53ae3bcab60 100644
--- a/sci-biology/allpathslg/Manifest
+++ b/sci-biology/allpathslg/Manifest
@@ -1,5 +1,5 @@
 AUX allpathslg-52488-gcc7.patch 790 BLAKE2B d3993e840b7b53791b0830fc993553c45c00d5d81881750066327106ad45f13bd0f4dba48c8cc0bdf3655d20ff3cefa659b8d41f582a73376188109860e5f2eb SHA512 bde085541f74278aba8edd1c41dd3a2541a7ce7f3a6647b5f3ed19613545bbfff287463e90e785b4476c677d2456d4c87818730b95941b27744549fcdd62d935
 DIST allpathslg-52488-patchset.tar.bz2 11405 BLAKE2B 7a4c36884ac95a4eb23291720e422ce1ec41d0bea3a0b10582aa1d8154234971eb8d06979a969e65c1ec1eab031d2500a1ec40809019c8b4aa1d1d2e81427dbe SHA512 a1d58c131afeef04a9d7a2520fcd28a853317323fdcab1a253cb2548546bbc559993c74a68a8032a5d0e865ac2c2d53ff6b4c149aade2d1f87a2ab4116ebe4cc
 DIST allpathslg-52488.tar.gz 3121949 BLAKE2B b75904f9e8256a14c97abae45a0cb41718f95d27a4a072b6144bd125abb57682faa180de6a18399ab4fa43988344c436ca1eab8412433353fcc746c432c33031 SHA512 c44ef1a3ed5b343bf096663309cc399e79d65e83175232743cf330fd0d426633bd0d388922fd0c73ac0927d85ea9005549c8e4f7711c79fea7107068510ef30d
-EBUILD allpathslg-52488-r2.ebuild 1016 BLAKE2B e707f2cebafd829c0ccf712a5b72eb10c39663ccfa3f2a8f279200286f609905b3be756d64c42748667e4171aef36435bb9386f8d807db29584bdc74ceee92ab SHA512 106002b58ebd2616d216e61d164102f5eed7204a19d470a30d2f0e6ef685009fa737866c563fccc1980a6577b1f2e30af01756f291701914a67101a96a60bd87
+EBUILD allpathslg-52488-r2.ebuild 1106 BLAKE2B 13dc0cde0d77d22c93883e9bda7d58a1ba7efcb957cbb18aafecf51e87f089b97538106e4fa35e296ecab6a51f43fc7219bcb84fee01c1b19761ff9398515c55 SHA512 1b809a21a660027113199b8e68a21ce578a65ec9edcea8b4bfc4af14e7ff02a3cfa2340415349bd4d8ee72c3e4bdcb18db396c8787632eb23a5ba20f703409bc
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/allpathslg/allpathslg-52488-r2.ebuild b/sci-biology/allpathslg/allpathslg-52488-r2.ebuild
index 964904d66551..cc9498b65f70 100644
--- a/sci-biology/allpathslg/allpathslg-52488-r2.ebuild
+++ b/sci-biology/allpathslg/allpathslg-52488-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,5 +39,8 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# Fix building with glibc-2.27, bug #647340
+	sed -i -e 's/-mieee-fp//' configure.ac || die
+
 	eautoreconf
 }
diff --git a/sci-biology/express/Manifest b/sci-biology/express/Manifest
index 655d3b4097ad..4919e7df05e4 100644
--- a/sci-biology/express/Manifest
+++ b/sci-biology/express/Manifest
@@ -1,7 +1,5 @@
 AUX express-1.5.1-buildsystem.patch 1956 BLAKE2B 3cc9bc2a3fb8bc55444ed17984645bf900f253fed8b611395f7de3e744cd1c448af00bb8a83244f344801b9cc9d68c731e8338689bf29463cf2aacb35765d741 SHA512 246788b75a7f40c825cc7bf811de2bd44607b7ccf139d7302480ed7faae441ec95d5a37aec7f04effb1e3e47ed774b08291321cd227b0fa79306969b39e93d54
 AUX express-1.5.1-gcc6.patch 722 BLAKE2B d4c5972d7f3714e33ca85258a32101cd8975527aaf52846b116b75d0cfba94af9173d338d3de0e9051e844f23d6cf2e578340e0986afa9e5ee1ccc29b0781db3 SHA512 bbc7d7980bc88e241a76ad2b8a661ac8232f2cbc1a8cbf526b43905f9cdc52b57aadf8fb6bb03181b51893ac4e9d384ababb6d34582f7e24e6ef2ecc8fbfd73f
-DIST express-0.9.5-src.tgz 766024 BLAKE2B 3818bc9de30a5201d587d3e18feee85f3014b68672eaef32ce0fa5989e0ce2cd7ee8bb8c617db0cde2d061db0f31ba76c49aa03f66be92c40826a6ede35ebca9 SHA512 3a7360ffbe57f4f712b6db38d551d31384d995050a86238d79299edb12f0e7f5dca6f362b7858b5051ea2879af2b3559f78f9780d75ef2ef6fdad7398f781403
 DIST express-1.5.1-src.tgz 931166 BLAKE2B 5eb185e4b001f26f0dd32885b256b9fa48c89f546d67d7f8472cade69dde25375a5fc8efed5f01b615d63b641b674f7034a13f9483eb7967a6fd784a55c8878e SHA512 59cf6511a879311247c65334285ea056d571d4fd950aa6243041fa10075ff0d1ddd2afbcfe12e5f7f3e7cdd22fe37fd7f6b43ed4a8eb28d7a33d72366dc549ee
-EBUILD express-0.9.5-r1.ebuild 877 BLAKE2B 9b942dd82849a8f94b6ae542ec0b52608c0faba49a99b77d423658cd56d2763b09eccb3b0cffc4e58d8a54c11b61581e85ffb045d933111d9ab0b17afa8fa0bc SHA512 6f3277de1bffa5855cf6db9c4733bb75420bc453f0feba464dacf51625d768ac23f3eb2ad3dd5de3389ae820371265085047d12224c08a05ced29d3b7f7cfe1f
-EBUILD express-1.5.1.ebuild 737 BLAKE2B a4d7d15d3e9d553c46c7ebbde640e1ef315c31925de8c93e3532ffc4113d11b2a08031d34edc03703c93c8a82141593f5e5d56228d8c125c8e8c8ee0f2aee248 SHA512 23eb67f560b4b5ad76ecac73bab010a811363ae746c66cef13506e8fd2264f567bdcc283dc58face003bd3f63f077dbaf7d0b55616f50e2f55641a8beb58ceb0
+EBUILD express-1.5.1.ebuild 735 BLAKE2B 581596936624a18170d1421adc64abf379a3a34587344fe6360dfffdf242fa9fae9b4030c37707634a0ae3451ae2eefb37f6145eaf133d8d40eecf0d4f3ed801 SHA512 b2d1d4550dedde0e6242a86a72134ef77fe4c016e725dca902e70cbc78c9e78e06aa484fd1ff5b05b7e574bbf28ed7aec42878eb06d7adde881e8ab5c4743783
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/express/express-0.9.5-r1.ebuild b/sci-biology/express/express-0.9.5-r1.ebuild
deleted file mode 100644
index 945398a17a8f..000000000000
--- a/sci-biology/express/express-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Streaming RNA-Seq Analysis"
-HOMEPAGE="http://bio.math.berkeley.edu/eXpress/"
-SRC_URI="http://bio.math.berkeley.edu/eXpress/downloads/express-${PV}/express-${PV}-src.tgz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=dev-libs/boost-1.52.0:=
-	sys-libs/zlib
-	sci-biology/bamtools"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-CMAKE_USE_DIR="${S}/src"
-
-src_prepare() {
-	sed \
-		-e 's|"${CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/libbamtools.a"|bamtools|' \
-		-e '1 a find_package(Boost 1.52 COMPONENTS filesystem program_options system thread)' \
-		-e '1 a find_package(ZLIB)' \
-		-e '/add_executable/ a include_directories("/usr/include/bamtools")' \
-		-i src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
diff --git a/sci-biology/express/express-1.5.1.ebuild b/sci-biology/express/express-1.5.1.ebuild
index 62e5361f529f..148df8a8ce14 100644
--- a/sci-biology/express/express-1.5.1.ebuild
+++ b/sci-biology/express/express-1.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
@@ -18,8 +18,9 @@ DEPEND="
 	>=dev-libs/boost-1.52.0:=
 	dev-libs/protobuf
 	dev-util/google-perftools
+	sci-biology/bamtools
 	sys-libs/zlib
-	sci-biology/bamtools"
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P}-src"
diff --git a/sci-biology/fasttree/Manifest b/sci-biology/fasttree/Manifest
index 27717e601bb7..31f22a31dfc1 100644
--- a/sci-biology/fasttree/Manifest
+++ b/sci-biology/fasttree/Manifest
@@ -1,12 +1,7 @@
 AUX CMakeLists.txt 948 BLAKE2B b2a5908a2d24533f474d399b97b8941fbbe392e2b078890bc2e62dbd232912e6bbaec25fbb31592b1015c8c4234178a34ffd9bd4815935d64ea6da3dd21cd474 SHA512 9858800bfce8d256ccb834a06bad5a5230f90f025a9c9b3c9aafe7244d219d66810530f6688e02889cdb67d6a9459d8e26cd1a9fcf2e8825278b31d0e8d51ff3
-AUX fasttree-2.1.7-format-security.patch 783 BLAKE2B 99ed512570ed98d83df2480424a32641e451e88f89e02f6387d7d176ed1a67ec673da21076abfebf9548adcf9bce4689a462a19aa28e076d48d9832b6862b222 SHA512 cabda061de75a1e1b34732946448ee08717f265d7fa8ea413f56eb8bad150ebde9f376a13591167a7786caf17a0d4bb1f8cb7176b74965a47f79b9608d32bcf8
 AUX fasttree-2.1.8-format-security.patch 783 BLAKE2B c400b89a17287817f82a8747082b3bf35d8097941c591923fcff073618fae0423b97fb5bc9a12a199acea0de61d451378beaf0070beb9b20274da81b936f2296 SHA512 9bbf66cddca2b6c202fdeeab4092036852cb1ebe132ebf4d96cba1bea75bb5668dd6ee97d4d020a4b7cf7111bee6d0c3004b0bd74ee4685ef98eeeb5e9a23eb3
-DIST FastTree-2.1.7.c 383551 BLAKE2B 853881cb39355a134133b012ef311702481d7883e8398bc55bcb3d3274f8414d2579a086176c3d2abdb59ecff7bf8cb6223e89b5ea320a3292f0a9915950c6fa SHA512 e88916e6586885e095948e78e6654081f966c78fbf637cfdac01970f5337bfe5616efcd165fb5f9718af0831ff45047b165944f5da9c5931d9725ea6f49cb59e
 DIST FastTree-2.1.8.c 385231 BLAKE2B 6f42025ef69b990e051263ccfa23f95d0cde326798c54d8f702c50127338711898c380d1dbd82ab775667eada047048ba8d68288b030af4984019a5f2c23729f SHA512 39a7d284412a602208c2a5df3d0a9a30fe3a584f7f7788d741fb1463b698692017f47bb23f70046d0873e9c8fd27c84ec23f6ca48adb0594193765ac732e6559
-DIST FastTreeUPGMA-2.1.7.c 95271 BLAKE2B 1de328881f6452b9c7423c9ed381ab2eb31c4f3ee6426481a6b1089c1359627d4cbbfbea868ebeab9538f82e17f45f1bff8ec07c7370e6432bef6bae449798a8 SHA512 4d6a8e2cb28b8ee201091172a3baa59d432420839c6d2244b5fb8230ed9daa626b6bed22cb692393ca3d78b8f2d071fe18fbb4f9bdcdc47ef149c31e3f45546c
 DIST FastTreeUPGMA-2.1.8.c 95271 BLAKE2B 1de328881f6452b9c7423c9ed381ab2eb31c4f3ee6426481a6b1089c1359627d4cbbfbea868ebeab9538f82e17f45f1bff8ec07c7370e6432bef6bae449798a8 SHA512 4d6a8e2cb28b8ee201091172a3baa59d432420839c6d2244b5fb8230ed9daa626b6bed22cb692393ca3d78b8f2d071fe18fbb4f9bdcdc47ef149c31e3f45546c
-DIST MOTreeComparison-2.1.7.tar.gz 13523 BLAKE2B 97638edd945412ff00e3dfcfc89ec6ea52ae8c43531d5cb680d97e9c62fcad80e861f58ec987abcd2282166dd7886101edba4875531bd9d6ac23df242e0dbd5b SHA512 24d2247650d7728942bd1d987b548cefd65a16b433a3810876613e9fd1cff223d4349ee720b3d8d10a73af220c2c9f59a24d77ad34ff009325fe9f22aa35c72b
 DIST MOTreeComparison-2.1.8.tar.gz 13523 BLAKE2B 97638edd945412ff00e3dfcfc89ec6ea52ae8c43531d5cb680d97e9c62fcad80e861f58ec987abcd2282166dd7886101edba4875531bd9d6ac23df242e0dbd5b SHA512 24d2247650d7728942bd1d987b548cefd65a16b433a3810876613e9fd1cff223d4349ee720b3d8d10a73af220c2c9f59a24d77ad34ff009325fe9f22aa35c72b
-EBUILD fasttree-2.1.7.ebuild 1191 BLAKE2B e1b512b81abca6a7b644aff2e26b22573bc68485439143fb1e6fd5bdd77dcb939e2f241c8c91d8b44d51a3b2351fa8a718e6e120a29772d7042ec768c06a7345 SHA512 0f229a132f237f11ac0fdd15083745e71fbb5072fe58afcc1ed1d41050520d3da030e23f57ed50fc3c2460c123b5a4d5665242caf21408b5c032828e8fe2cc46
-EBUILD fasttree-2.1.8.ebuild 1193 BLAKE2B c80c87cb452643db90a1c2da1db1485182f5ecf4db6800cfb848bcaa8d9fc480f1436e842dadfc7f4ace1fd2023820c027c0addfa85e75303584fa29483c3ca6 SHA512 e14223969bdac00b28a2223ce500cf6acf9d2d964f9bb5e55b6ebd22fa453e88a8943d195c655c4f6c246cf1dddac7c6f06aeab7d8f4e35f596192674ca2fa3f
+EBUILD fasttree-2.1.8.ebuild 1170 BLAKE2B afc7e5b975fea59bc720d59732dac792662717aee591f9dc532d532a43ff7a7563f401fce51d0bb9e2d31315b24fe45d098825bdbcbc5264fcfb461cba68ba03 SHA512 798b161e7c9c70e5fd0de3a8018f1e3f95c59b354517ca9539845ec1462d506ab20b4fe629b9666614969a7d05101bf01121c2df34ad9e8a86ff63e136b6f51b
 MISC metadata.xml 410 BLAKE2B 92ee74c67cebb5ac4db5217355e6f01f893387d7fe0da1dd5048207149e385927f05c324d8299682b42bc7ba895e1f42a0ee5d7e9442d03d33ea3511dc704ffd SHA512 6f380e2353b1a0ff33c75cd593d2cf3e12d56c99478e7a5bdb37459b10449ae88065d265820f2a9c6d61d53a295ed1a4e18b8595e23c137c9788c658080caff0
diff --git a/sci-biology/fasttree/fasttree-2.1.7.ebuild b/sci-biology/fasttree/fasttree-2.1.7.ebuild
deleted file mode 100644
index aa5979522691..000000000000
--- a/sci-biology/fasttree/fasttree-2.1.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Fast inference of approximately-maximum-likelihood phylogenetic trees"
-HOMEPAGE="http://www.microbesonline.org/fasttree/"
-SRC_URI="
-	http://www.microbesonline.org/fasttree/FastTree-${PV}.c
-	http://www.microbesonline.org/fasttree/FastTreeUPGMA.c -> FastTreeUPGMA-${PV}.c
-	http://www.microbesonline.org/fasttree/MOTreeComparison.tar.gz -> MOTreeComparison-${PV}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="double-precision openmp cpu_flags_x86_sse3"
-
-REQUIRED_USE="?? ( double-precision cpu_flags_x86_sse3 )"
-
-DOCS=( README )
-
-PATCHES=( "${FILESDIR}"/${P}-format-security.patch )
-
-src_unpack() {
-	mkdir "${S}" || die
-	cd "${S}" || die
-	unpack ${A}
-	cp "${DISTDIR}"/{FastTreeUPGMA-${PV}.c,FastTree-${PV}.c} . || die
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/CMakeLists.txt . || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DVERSION="${PV}"
-		$(cmake-utils_use_has cpu_flags_x86_sse3 sse3)
-		$(cmake-utils_use_use openmp)
-		$(cmake-utils_use_use double-precision double)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-biology/fasttree/fasttree-2.1.8.ebuild b/sci-biology/fasttree/fasttree-2.1.8.ebuild
index 7df71ee4474d..3f9e4ad5f759 100644
--- a/sci-biology/fasttree/fasttree-2.1.8.ebuild
+++ b/sci-biology/fasttree/fasttree-2.1.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
@@ -39,9 +39,9 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DVERSION="${PV}"
-		$(cmake-utils_use_has cpu_flags_x86_sse3 sse3)
-		$(cmake-utils_use_use openmp)
-		$(cmake-utils_use_use double-precision double)
+		-DHAS_SSE3=$(usex cpu_flags_x86_sse3)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_DOUBLE=$(usex double-precision)
 	)
 	cmake-utils_src_configure
 }
diff --git a/sci-biology/fasttree/files/fasttree-2.1.7-format-security.patch b/sci-biology/fasttree/files/fasttree-2.1.7-format-security.patch
deleted file mode 100644
index 31dafdad46de..000000000000
--- a/sci-biology/fasttree/files/fasttree-2.1.7-format-security.patch
+++ /dev/null
@@ -1,25 +0,0 @@
- FastTreeUPGMA-2.1.7.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/FastTreeUPGMA-2.1.7.c b/FastTreeUPGMA-2.1.7.c
-index af76cb1..4065f42 100644
---- a/FastTreeUPGMA-2.1.7.c
-+++ b/FastTreeUPGMA-2.1.7.c
-@@ -535,7 +535,7 @@ int main(int argc, char **argv) {
-       break;
-   }
-   if(iArg < argc-1) {
--    fprintf(stderr, usage);
-+    fprintf(stderr, "%s", usage);
-     exit(1);
-   }
- 
-@@ -953,7 +953,7 @@ void PrintUPGMA(FILE *fp, UPGMA_t *UPGMA, char **names,
-       assert(first >= 0);
-       /* Print the name, or the subtree of duplicate names */
-       if (nameNext[first] == -1) {
--	fprintf(fp, names[uniqueFirst[node]]);
-+	fprintf(fp, "%s", names[uniqueFirst[node]]);
-       } else {
- 	fprintf(fp,"(%s:0.0",names[first]);
- 	int iName = nameNext[first];
diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest
index 7c3b9744f04c..0fecc9b5505d 100644
--- a/sci-biology/rebase/Manifest
+++ b/sci-biology/rebase/Manifest
@@ -4,10 +4,12 @@ DIST rebase-1703.tar.xz 122252304 BLAKE2B 26afca990e300a5c471f55b1a168b1930212a3
 DIST rebase-1704.tar.xz 124351900 BLAKE2B bdbda714cc07f744b56c83b80a1b0f0a724a990b200c615458852910f282761aaf37a312a388ec7fee94a62ead47e01ddca8b205f2ad05d780a299e7547206f7 SHA512 0e4019d41ccbae86b8cb1f6dfa4c34d3fccbe084a330f04f2fdb774186e35c761655e1619d9a90d444ea3bab0910df1b60cf9a249ee31d66a254d28dd6b32cc7
 DIST rebase-1803.tar.xz 152581448 BLAKE2B 7907f0aee9e202f062f5ec4b5e4a112cd0fb3900b3d65dc57ffe4832c5aac088f50c2661f1b9c1bb8b57e7b4f6d453bec2899b460383d06b4e679da13e92aad2 SHA512 ab718e87c33c975bc6a93d3c6be130c9751612b744dc5451bcfde5c10d3d9d68ed4a4d921fff1f48063bfa2e9f3c8a016d4e5e0afa4eb7e4131511767608534b
 DIST rebase-1806.tar.xz 161844712 BLAKE2B 901167b502b85e88eaa9a8886c5ccac8bf1ec16a7736694b90f896bd4d87ae3792d09f6b154118a6063e30b94a5633b37a7811aefc1d39467d0043d887aeb64a SHA512 9c9c0ef89c8f8e43516c052a06395d61c423b53a79553ceccd992bf72872ece44696091c11c816213b93532aac54a476fe87475f4f67baaa87bc50f64e847d48
+DIST rebase-1810.tar.xz 173538148 BLAKE2B 4630d6a2addbb95e70cff73c8f81552545c81be2893dd9f38d19d8bc2fd7ecf4340441498187b654a05012d4dafbd5ad0634e3281f7aed1ee61618308a2325a5 SHA512 641ed61b14970e9804e98abab4e982aeaff378638730964ba162dffacea1c5869e4b1202462f422307d039e1bc6053403c801273f1ca9021c38f29e68a7bfae2
 EBUILD rebase-1701.ebuild 1052 BLAKE2B da1b6a61d2ed830a9421862c5539a3cfd0a438c3068c2a00af55fba5f7b5d4c1a3ac9bb9c4d7fc8b3552b9c6cdb7651479c70fc81136ba02d1bee73693e53f8b SHA512 f5ebc17df3c888caebc01f66e813f0482279bfa89bf5ae67ebf67fc3ca6e762246cd40b35d6713510850a63e7322916b9dd8fb88c841b82c7a1734a562df494b
 EBUILD rebase-1702.ebuild 1091 BLAKE2B 221cc96837849c39c75edcac6179d29b4adbbbceb5a13317993cc23ae8d18c1e24f11cabe9515d99cdd978e75e2c1b635d866ba63aba7f1cb5a0e66a3b22165e SHA512 6b4d6cd81f35284ecee921ca02bf524d4774cc4d9115c50bcc594124d3ef3617db9802e0577a5402ceee0f139a674492e053c532a78cbad3879987b5574c4ebf
 EBUILD rebase-1703.ebuild 1091 BLAKE2B 221cc96837849c39c75edcac6179d29b4adbbbceb5a13317993cc23ae8d18c1e24f11cabe9515d99cdd978e75e2c1b635d866ba63aba7f1cb5a0e66a3b22165e SHA512 6b4d6cd81f35284ecee921ca02bf524d4774cc4d9115c50bcc594124d3ef3617db9802e0577a5402ceee0f139a674492e053c532a78cbad3879987b5574c4ebf
 EBUILD rebase-1704.ebuild 1091 BLAKE2B 221cc96837849c39c75edcac6179d29b4adbbbceb5a13317993cc23ae8d18c1e24f11cabe9515d99cdd978e75e2c1b635d866ba63aba7f1cb5a0e66a3b22165e SHA512 6b4d6cd81f35284ecee921ca02bf524d4774cc4d9115c50bcc594124d3ef3617db9802e0577a5402ceee0f139a674492e053c532a78cbad3879987b5574c4ebf
 EBUILD rebase-1803.ebuild 1091 BLAKE2B ef6b34c8ac22b17109044d8b483d9a7657a9df755f41d4ebb02cbf9756d0514be5c6ebabc67520df121cec563165351b42574d3e1e1300021f58531b45bce2cb SHA512 764e3bbf5537e6753d703dbdd03261ff82da63ad59ffd33a843254343a1677bfc321e322225bc514f949b91dfedc65dbae54ebfb05a73cd2ec70611f70fa954b
 EBUILD rebase-1806.ebuild 1091 BLAKE2B ef6b34c8ac22b17109044d8b483d9a7657a9df755f41d4ebb02cbf9756d0514be5c6ebabc67520df121cec563165351b42574d3e1e1300021f58531b45bce2cb SHA512 764e3bbf5537e6753d703dbdd03261ff82da63ad59ffd33a843254343a1677bfc321e322225bc514f949b91dfedc65dbae54ebfb05a73cd2ec70611f70fa954b
+EBUILD rebase-1810.ebuild 1091 BLAKE2B ef6b34c8ac22b17109044d8b483d9a7657a9df755f41d4ebb02cbf9756d0514be5c6ebabc67520df121cec563165351b42574d3e1e1300021f58531b45bce2cb SHA512 764e3bbf5537e6753d703dbdd03261ff82da63ad59ffd33a843254343a1677bfc321e322225bc514f949b91dfedc65dbae54ebfb05a73cd2ec70611f70fa954b
 MISC metadata.xml 907 BLAKE2B 87023eda8004c64dbd6ec605dcc7cff07f247f5cbf140ee65932c1e80ace99be4f43f2e529b9569a0220e2e60e03e88ef323af1c0dbbbdbee5da0eb0e46ba5f2 SHA512 dfbf6a8c60f75b92b056f6dc5b74adfc588ab0b1edb48ba15a6516254a58b736f101036d8061ed2abd69ca202356f6653bdd578f1a94ae54e5f6df6cc2e5155f
diff --git a/sci-biology/rebase/rebase-1810.ebuild b/sci-biology/rebase/rebase-1810.ebuild
new file mode 100644
index 000000000000..e9944bde30fb
--- /dev/null
+++ b/sci-biology/rebase/rebase-1810.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV#1}
+
+DESCRIPTION="A restriction enzyme database"
+HOMEPAGE="http://rebase.neb.com"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emboss minimal"
+
+RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="binchecks strip"
+
+src_compile() {
+	if use emboss; then
+		echo; einfo "Indexing Rebase for usage with EMBOSS."
+		mkdir REBASE || die
+		EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
+				-protofile proto.${MY_PV} -equivalences \
+				|| die "Indexing Rebase failed."
+		echo
+	fi
+}
+
+src_install() {
+	if ! use minimal; then
+		insinto /usr/share/${PN}
+		doins withrefm.${MY_PV} proto.${MY_PV}
+	fi
+	newdoc REBASE.DOC README
+	if use emboss; then
+		insinto /usr/share/EMBOSS/data/REBASE
+		doins REBASE/embossre.{enz,ref,sup}
+		insinto /usr/share/EMBOSS/data
+		doins REBASE/embossre.equ
+	fi
+}
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 6f54c49804df..7090ab4d1eb6 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 3bcf69ed2abb..8edeab07a740 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,6 +1,8 @@
 AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97
 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
 DIST units-2.17.tar.gz 1185070 BLAKE2B 44db938b214596058cdfaeda7fd8d70161221c196a0971b5a0e03331e30fdeb52db85ab43b721f25efd755f4baee4f92aa6204a85d38703a31ec7cac0cefd689 SHA512 e4114f7dc0e40146f969375511c5d930497cb9502306ef82feac78c8e09a03e84ed0b582ff82e2878beae41702c9612f7a3d28fc6e9ed2cfae708f9feb8b737b
+DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7
 EBUILD units-2.16.ebuild 1301 BLAKE2B c2c88bf299514de215d2a14f446a4e119a81d392102bf690314e5c6117fc6440dc7095f1173b7a8f4f37169b765e02bd771bc4fc8f8f2f6b97652fcf7520f525 SHA512 78696d32f52f9590f8e31f8989a67d35f034bea82c564f5d6d1e2f360f4f5d429f22f99fb167158376a613d5bc258819608332feabc02a8cd01b70823de94ee2
-EBUILD units-2.17.ebuild 1411 BLAKE2B 38458bff4085643b793b6e65ad0ae6d18cddbab7a8e6aba78d4fe59f009612cffc1736d3ede883b58c7e660bc5b9e29cc33a65be11db0a9238af6bb150192e34 SHA512 a5b27e4b285ff4f8e841fe55dbdb7b03a21ce00b06873a86285898da49fe73d3b1e129ca78aa2d64445c1df9fc080a2cf6c1550bcd6cc62466971f2337ee36e7
+EBUILD units-2.17.ebuild 1405 BLAKE2B d72ea5f2d6ac71b788b649cd7c3cc8adab361998d088fb22a918a2e3c000f340801b20e00c74ded7bde36d64f5694436241e12a524c34134ad301ce494091c64 SHA512 38f8951b45a9be52bcfef55ee2d7c4ddf154d644d031229c213cdd7a4caa77e021da60041fc7599b920fb11bd04ce59079b9407fd7850a8e18aa51c0f5f5d12c
+EBUILD units-2.18.ebuild 1408 BLAKE2B 0af4f29d37e3fd00978822a2652d54782c0e56709afbb07ff9e8cb7fbf9439389875c5a37c678d100d081bad9bb078e84cf42945e685d8fd6ab1360235724438 SHA512 924f4f7dc8ad6c6f92bd5acaad3cac4d6c18c3eca44369dab43f51262eec07582addd2a13073e11401c61efbc5d030c310a6b590f3ba34bc5c93a299a5c6c3a9
 MISC metadata.xml 341 BLAKE2B 60596aa39a0a3810573ced2896624fe01b49ed1138c942969bcd97884078cf69ace3d6cb4d0121de7d548da422a4b823982dc2771dea21817c207285b402ad2a SHA512 b32fc161804c8cd09f6b67923911ddfbdc9c5ba6e5dc61e951bbbe6fd54dd495209c519ead1dd46cb62cf5fd90978472f0d58ed2b66cc079c3ca91a36d22e822
diff --git a/sci-calculators/units/units-2.17.ebuild b/sci-calculators/units/units-2.17.ebuild
index 01fbb74ef39d..6229de34513e 100644
--- a/sci-calculators/units/units-2.17.ebuild
+++ b/sci-calculators/units/units-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+units_cur"
 REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild
new file mode 100644
index 000000000000..fa2bb6214ccb
--- /dev/null
+++ b/sci-calculators/units/units-2.18.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit eutils python-single-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units_cur"
+REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/readline:=
+	units_cur? (
+		${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
+)
+
+pkg_setup() {
+	use units_cur && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--sharedstatedir="${EROOT}/var/lib" \
+		ac_cv_path_PYTHON=no
+}
+
+src_compile() {
+	emake ${PN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog NEWS README
+
+	# we're intentionally delaying this since 'make install' would
+	# get confused if we shove 'units_cur' there, and there is no real
+	# need to add more complexity for it
+	if use units_cur; then
+		sed \
+			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
+			-e 's|^#!|&/usr/bin/python|g' \
+			units_cur_inst > units_cur || die
+		python_fix_shebang units_cur
+		python_doscript units_cur
+	fi
+}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 1be75c4273c8..dd8fa32bf085 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 912658bff2af..d83109851ca0 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -2,5 +2,5 @@ AUX apbs-1.4.1-manip.patch 1522 BLAKE2B 4a30aadc2d80fef5d813ea29f20073b6c4d1cefe
 AUX apbs-1.4.1-multilib.patch 3301 BLAKE2B 4268a21ec878d780c7a1efe433bf2c82ef2e72f49a6071b6df695bf672ee999be9c29fed06e949b80cc230333d8deca1094c946662ec657d31e3b6f86e873969 SHA512 cdd72fd23a57ee8413f72bf674ae246543b1c9f326727ff07c3b8848d59f98ab7d2daf28677460cb4726f919832079c1d280bcdc86a8bef5c0875583c789b7c0
 AUX apbs-1.4.1-python.patch 4109 BLAKE2B 25193eb227ab9d34f3f636b6264bdbaecdbe48747220582b39798c5c6631bdc7731645f66096dbf659c9eea7f31c8e20c0944796f8f89d995a4cd2712be91a3b SHA512 369c0fa08187ba80d8ce72542fc2942f28426beed39619dd6a90a9ef8dfecb47ea6dc7aa20994629a69d63b55d72d1f837c442744bf5499a942bf312f6723092
 DIST apbs-1.4.1.zip 37999283 BLAKE2B 2301deb7ab4eb2f20098cf63df180bb53189e42a89cd5559357cdcf08e84d27a44eafe8557bb460574802d24d29741ad4606dc3bd7f32911d0d0f2c7453d6470 SHA512 3a127af3940054e5a43b3c0c620507f4f9baa69049e5a0933d8e8825458ad2faba840392752de49fe68d91e2054fb1394cf87bb5bb1c0b48305368e2f404cf6a
-EBUILD apbs-1.4.1-r2.ebuild 3117 BLAKE2B 0d5b38d97ab3c9917b4b4ced1cd5a5ff20dc03522bbedc3492ff2276b59f41b48a3b48cc97a660144afda07fc677f131e56293b8467a27cc3bab70cef0a7bfa3 SHA512 e8f20517537119640c8f12accdcc37a2f25b30d3b25923f54a5bff3c88b679219f029b49ae96ac66acf04599877f1b33289e1ce15462a0e7a6a4cd5f979ac3fc
+EBUILD apbs-1.4.1-r2.ebuild 3140 BLAKE2B b31ecbf8ddb9e8824917cb7c79ba5239957e1723c56a60b9b20aa6d818a0140ce0e4ace7691ac9663d0e38f99b5d851b529b1355b965d071d7e6b65566763bf9 SHA512 e97100de2ed58f60b414cead8aea44d53178f2b28ca016c9fa4a783993b3be0c66a53eb541e4679f58bc3054e18ab8866bef1a31b817cf62031b65ad3044e1a5
 MISC metadata.xml 1048 BLAKE2B 53a61bd7e05e53b294f0cbd1a21b86f391429ad5f23a545e7cbb27625b152589247a08db06c5d7f6658425de032be970fae0230ad1ac14ac4f6de42663d6c97c SHA512 7d68049cb9b044676430fe879890cc4cd869b99f85696f579d9cbf3b156081301792fd7f03205a9b9d429d71c9a35b4815f4236573f68d3ef6b4718e6e1f0bb3
diff --git a/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild b/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild
index aecbcd3ce745..108e43bf904b 100644
--- a/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild
+++ b/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ inherit cmake-utils distutils-r1 flag-o-matic multilib toolchain-funcs
 GITHUB_REV="74fcb8676de69ed04ddab8976a8b05a6caaf4d65"
 
 DESCRIPTION="Evaluation of electrostatic properties of nanoscale biomolecular systems"
-HOMEPAGE="http://www.poissonboltzmann.org/apbs/"
+HOMEPAGE="https://www.poissonboltzmann.org/apbs/"
 #SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
 SRC_URI="https://github.com/Electrostatics/apbs-pdb2pqr/archive/${GITHUB_REV}.zip -> ${P}.zip"
 
@@ -28,18 +28,18 @@ REQUIRED_USE="
 RDEPEND="
 	dev-cpp/eigen:3
 	dev-libs/maloc[mpi=]
-	virtual/blas
 	sys-libs/readline
+	virtual/blas
 	fetk? (
-		sci-libs/fetk
 		sci-libs/amd
-		sci-libs/umfpack
+		sci-libs/fetk
 		sci-libs/superlu
+		sci-libs/umfpack
 	)
 	mpi? ( virtual/mpi )
 	python? ( ${PYTHON_DEPS} )
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
@@ -63,7 +63,8 @@ src_prepare() {
 	use doc && MAKEOPTS+=" -j1"
 	if use python; then
 		unset PATCHES || die
-		cd tools/python && distutils-r1_src_prepare
+		cd tools/python || die
+		distutils-r1_src_prepare
 	fi
 }
 
@@ -92,7 +93,8 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 	if use python; then
-		cd tools/python && distutils-r1_src_configure
+		cd tools/python || die
+		distutils-r1_src_configure
 	fi
 }
 
@@ -100,7 +102,8 @@ src_compile(){
 	cmake-utils_src_compile
 	if use python; then
 		append-ldflags -L"${S}"/lib
-		cd tools/python && distutils-r1_src_compile
+		cd tools/python || die
+		distutils-r1_src_compile
 	fi
 }
 
@@ -121,7 +124,8 @@ src_install() {
 		fi
 	done
 	if use python; then
-		cd tools/python && distutils-r1_src_install
+		cd tools/python || die
+		distutils-r1_src_install
 		rm -rf "${ED}"/usr/share/apbs/tools/python || die
 	fi
 }
diff --git a/sci-chemistry/openbabel-perl/Manifest b/sci-chemistry/openbabel-perl/Manifest
index 3a0ffb6f92bb..079b42b9f50f 100644
--- a/sci-chemistry/openbabel-perl/Manifest
+++ b/sci-chemistry/openbabel-perl/Manifest
@@ -1,8 +1,4 @@
-AUX openbabel-perl-2.3.2-bindings_only.patch 4557 BLAKE2B 3549bc5f6d0c02ace76d8f26e5669c83ea6dc1912f28433bec54f837c2a8276ee243f4311fd65766b0e5af4bb5d6a6a627ba5ef42c0aa919d842c945aa6db9bc SHA512 475600513f188f2e3dee711ab2073954511b7d71c0af222dc9fe121bcbd4821d0ab32934d5035452ad4820d0dd750899995696c20504769b25cad7ef2d27aa5e
 AUX openbabel-perl-2.3.2-gcc-6_and_7-backport.patch 635 BLAKE2B 4e98dedd149b14d5bb02fb6d2fa03e07242d100c7b41f36f749ff3d587080eeca44aa26ca095d31e0309e45f3780b67deaa97f1177ed35a9b7407bd7c33f78ff SHA512 e1b4402f34d01ced5b4caaa184b4e5544cf47893cfe7958054052b05a57dc34b4d44239a212c7d909f29b9366b83b6df74993f844a20f23748c01272ec093081
-AUX openbabel-perl-2.3.2-trunk_cmake.patch 2335 BLAKE2B 5e829c555d8a06bf9524b5008c21dfd6830b1c95a40834f248d4b4d875fcd8cd64f664ab93a5f37f614201c106277bc0ae75bbd5f4cd392517e9d8f198e39946 SHA512 9f42cb3c8aff7eb765790fd3a7f259d8076ebce11f3c2e324a9568a94d948583455db90a8714cdcbd6b6a74087167ada9ec19261862233823d0792bc79302f30
-DIST openbabel-2.3.2.tar.gz 20509105 BLAKE2B d475c2da0d7171650eeb4b78a948421b783bdbb9342c81114d3dbc19d5cbb273f7303438920ffaeef5b6332e4b72606a86ded5cbd3d7e541f62b59b46483bb69 SHA512 d0e1f8b758ffdd65ec6c31d988bffe3279355e286ce69fad12c5905b3b832e2b73ee95b1061b1576aba1ee9fe4da5e31ec30350c473be17493c657dc80caf919
 DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6
-EBUILD openbabel-perl-2.3.2.ebuild 1638 BLAKE2B 01039ea5f28d080cc2dd47dd2c13260644be996eb9f2f7bfe4db73dabfd6c3e0ed2136a69040e4ed1ce868f21e0fafff647ad16fa995ca2f7a7967c2d0622e0d SHA512 73cb5637922195122ed9cc75092b03b34a595763baa81d8edb4ad323c4381a68593d22b023cb1ad004329b7d54e126b0227bf4211845468811711e374ff0c7ae
 EBUILD openbabel-perl-2.4.1.ebuild 1583 BLAKE2B 233459caeea67df903f80dff500cce8fc1e4a99cc13124d8cee60fecd59261979c62ee0f5072f955d2c95043722c98450ad27187f7d0443c8ecc4a27f4c9ffee SHA512 6336a34a6d5dca6d573a62276cccf34cee37e95c31704f52a178366910d5267353b49fb981c1dce07ea935cac0e7887aad60df77468f7d4838ca18b901998651
 MISC metadata.xml 735 BLAKE2B de3dbec049667c35b29293f9c27e81b0e0ffade4c57ffa519c013c788409f310dac834fd92f0d72c05281bf76317b3c7fc2b429b8644a7d350020caf425185c0 SHA512 62052b0e677a52adba98961185e5b83525c652e260ebad1b820ed19b071a1f6476cca550ec0c570a5faf0cbad7189cadb78ac8d6de077fbf15e346b7c66e4cf7
diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch
deleted file mode 100644
index 92e126a77d86..000000000000
--- a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 449f4b4..1c9ad00 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -252,7 +252,8 @@ if(NOT MSVC)
-     }
-    " SCANDIR_NEEDS_CONST)
- 
--  set(OB_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${OB_PLUGIN_INSTALL_DIR}")
-+  set(OB_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${OB_PLUGIN_INSTALL_DIR}"
-+      CACHE PATH "Set to system install for bindings only build")
-   add_definitions(-DOB_MODULE_PATH="\\"${OB_MODULE_PATH}\\"")
- 
-   # Add some visibility support when using GCC
-@@ -380,7 +381,8 @@ if(UNIX AND BUILD_SHARED)
-   if(APPLE)
-     set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR})
-   else()
--    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
-+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}"
-+        CACHE PATH "Set sane rpath")
-     set(CMAKE_SKIP_BUILD_RPATH FALSE)
-     set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-     set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-@@ -477,6 +479,13 @@ endif()
- # Should the language bindings be regenereted?
- option(RUN_SWIG "Generate language bindings with SWIG" OFF)
- 
-+# Build bindings only
-+option(BINDINGS_ONLY "Build bindings only" OFF)
-+
-+# Point to library if building bindings only
-+set(BABEL_SYSTEM_LIBRARY ${BABEL_LIBRARY}
-+    CACHE PATH "Point to openbabel library if building bindings only")
-+
- # Should all bindings be built?
- option(ALL_BINDINGS "Build all languages bindings" OFF)
- 
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index 16e9000..8f92e91 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -92,16 +92,30 @@ if (DO_PYTHON_BINDINGS)
-     endif(RUN_SWIG)
- 
-     add_library(bindings_python MODULE ${openbabel_SOURCE_DIR}/scripts/python/openbabel-python.cpp)
--    target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_LIBRARY})
-+    if(BINDINGS_ONLY)
-+        target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_SYSTEM_LIBRARY})
-+    else()
-+        target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_LIBRARY})
-+    endif()
-+
-     if(NOT WIN32)
-         set_target_properties(bindings_python PROPERTIES
-             OUTPUT_NAME _openbabel
-             PREFIX ""
-             SUFFIX .so )
--        add_dependencies(bindings_python openbabel)
--        install(TARGETS bindings_python LIBRARY DESTINATION ${LIB_INSTALL_DIR})
--        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/openbabel.py DESTINATION ${LIB_INSTALL_DIR})
--        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/pybel.py DESTINATION ${LIB_INSTALL_DIR})
-+        if(NOT BINDINGS_ONLY)
-+            add_dependencies(bindings_python openbabel)
-+        endif()
-+
-+        install(TARGETS bindings_python
-+                LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+                COMPONENT bindings_python)
-+        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/openbabel.py
-+                DESTINATION ${LIB_INSTALL_DIR}
-+                COMPONENT bindings_python)
-+        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/pybel.py
-+                DESTINATION ${LIB_INSTALL_DIR}
-+                COMPONENT bindings_python)
-     else(NOT WIN32)
-         set_target_properties(bindings_python PROPERTIES
-             OUTPUT_NAME _openbabel
-@@ -231,13 +245,25 @@ if (DO_PERL_BINDINGS)
-     endif (RUN_SWIG)
- 
-     add_library(bindings_perl MODULE ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp)
--    target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_LIBRARY} ${PERL_EXTRA_LINK_FLAGS})
-+    if(BINDINGS_ONLY)
-+      target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_SYSTEM_LIBRARY} ${PERL_EXTRA_LINK_FLAGS})
-+    else()
-+      target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_LIBRARY} ${PERL_EXTRA_LINK_FLAGS})
-+    endif()
-+
-     set_target_properties(bindings_perl PROPERTIES
-         PREFIX ""
-         OUTPUT_NAME OpenBabel)
--    add_dependencies(bindings_perl openbabel)
--    install(TARGETS bindings_perl LIBRARY DESTINATION ${LIB_INSTALL_DIR})
--    install(FILES ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm DESTINATION ${LIB_INSTALL_DIR})
-+    if(NOT BINDINGS_ONLY)
-+      add_dependencies(bindings_perl openbabel)
-+    endif()
-+
-+    install(TARGETS bindings_perl
-+            LIBRARY DESTINATION ${LIB_INSTALL_DIR}/auto/Chemistry/OpenBabel/
-+            COMPONENT bindings_perl)
-+    install(FILES ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm
-+            DESTINATION ${LIB_INSTALL_DIR}/Chemistry/
-+            COMPONENT bindings_perl)
- 
- endif (DO_PERL_BINDINGS)
- 
diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch
deleted file mode 100644
index b72a622a3afb..000000000000
--- a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index e7298ce..16e9000 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -231,36 +239,6 @@ if (DO_PERL_BINDINGS)
-     install(TARGETS bindings_perl LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-     install(FILES ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm DESTINATION ${LIB_INSTALL_DIR})
- 
--    set(PERL_INSTALLDIRS_TEXT "")
--    if (OBPERL_INSTALLDIRS)
--      set(PERL_INSTALLDIRS_TEXT "INSTALLDIRS=${OBPERL_INSTALLDIRS}")
--    endif (OBPERL_INSTALLDIRS)
--
--    if (NOT MSVC)
--      add_custom_target(pre_bindings_perl ALL
--        # Create the scripts/perl directory; we cannot do this inside
--        # bindings_perl as the WORKING_DIRECTORY needs to already exist!
--        COMMAND ${CMAKE_COMMAND} -E make_directory ${openbabel_BINARY_DIR}/scripts/perl
--        )
--      add_custom_target(bindings_perl ALL
--        COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/Makefile.PL ${openbabel_BINARY_DIR}/scripts/perl
--        COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm ${openbabel_BINARY_DIR}/scripts/perl
--        COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp ${openbabel_BINARY_DIR}/scripts/perl
--        COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL ${PERL_PREFIX_TEXT} ${PERL_INSTALLDIRS_TEXT}
--        COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc make
--            DEPENDS openbabel ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp
--            WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts/perl
--        )
--      add_dependencies(bindings_perl pre_bindings_perl openbabel)
--      install(CODE "execute_process(COMMAND make install DESTDIR=\$ENV{DESTDIR} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts/perl)")
--
--    else (NOT MSVC)
--      add_library(bindings_perl MODULE ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp)
--      target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_LIBRARY})
--      set_target_properties(bindings_perl PROPERTIES
--          OUTPUT_NAME openbabel_perl )
--    endif(NOT MSVC)
--
- endif (DO_PERL_BINDINGS)
- 
- ###################
diff --git a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild
deleted file mode 100644
index 25a87bc1b7ef..000000000000
--- a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils eutils perl-module
-
-DESCRIPTION="Perl bindings for OpenBabel"
-HOMEPAGE="http://openbabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openbabel/openbabel-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="
-	dev-lang/perl:=
-	~sci-chemistry/openbabel-${PV}"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.8
-	>=dev-lang/swig-2"
-
-S="${WORKDIR}/openbabel-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-trunk_cmake.patch
-	"${FILESDIR}"/${P}-bindings_only.patch
-	"${FILESDIR}"/${P}-gcc-6_and_7-backport.patch
-)
-
-src_prepare() {
-	sed \
-		-e '/__GNUC__/s:== 4:>= 4:g' \
-		-i include/openbabel/shared_ptr.h || die
-	cmake-utils_src_prepare
-	perl_set_version
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_RPATH=
-		-DBINDINGS_ONLY=ON
-		-DBABEL_SYSTEM_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libopenbabel.so"
-		-DOB_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/openbabel/${PV}"
-		-DLIB_INSTALL_DIR="${D}/${VENDOR_ARCH}"
-		-DPERL_BINDINGS=ON
-		-DRUN_SWIG=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile bindings_perl
-}
-
-src_test() {
-	mkdir "${CMAKE_BUILD_DIR}/$(get_libdir)/Chemistry"
-	cp \
-		"${CMAKE_USE_DIR}/scripts/perl/OpenBabel.pm" \
-		"${CMAKE_BUILD_DIR}/$(get_libdir)/Chemistry/"
-	for i in "${CMAKE_USE_DIR}"/scripts/perl/t/*; do
-		einfo "Running test: ${i}"
-		perl -I"${CMAKE_BUILD_DIR}/$(get_libdir)" "${i}" || die
-	done
-}
-
-src_install() {
-	cd "${CMAKE_BUILD_DIR}"
-	cmake -DCOMPONENT=bindings_perl -P cmake_install.cmake
-}
diff --git a/sci-chemistry/openbabel-python/Manifest b/sci-chemistry/openbabel-python/Manifest
index 0431b6bcd93d..fb43c0117165 100644
--- a/sci-chemistry/openbabel-python/Manifest
+++ b/sci-chemistry/openbabel-python/Manifest
@@ -1,9 +1,4 @@
-AUX openbabel-python-2.3.2-bindings_only.patch 8843 BLAKE2B 55661b83b40d440c3c442e84a75baa0c7c7cfe697626fd9e51b00975959438304dfb6220684edfd4cc3a12f20ac1a608a9bc1d8aa606159591a44da3d4987c1c SHA512 c933ac9f0c2370ceb305ebb831ab81e3d66dc9233d175f2b31f0e6ca0cc91dce591c46478ef5d5ccc118cfa8f6d82459331d5e7885bffa904ad486215c657333
 AUX openbabel-python-2.3.2-gcc-6_and_7-backport.patch 635 BLAKE2B 4e98dedd149b14d5bb02fb6d2fa03e07242d100c7b41f36f749ff3d587080eeca44aa26ca095d31e0309e45f3780b67deaa97f1177ed35a9b7407bd7c33f78ff SHA512 e1b4402f34d01ced5b4caaa184b4e5544cf47893cfe7958054052b05a57dc34b4d44239a212c7d909f29b9366b83b6df74993f844a20f23748c01272ec093081
-AUX openbabel-python-2.3.2-swig-3.0.3.patch 4138 BLAKE2B c029caf309007de63c13f876c7e26f30078b8171cbf171f025d0a18267128b0e44faf1b503c38f88774ffc2f2a67669463513f3cca46bb78375bd04a2d89f2d4 SHA512 ac454d8f8a8e6d8942d493ee648ad190e275d616bea99cc16bede97e00733d4aa6522cf43a80707b3aa59a78ba68731ccdf748beb76fb2b69267b3b060a5e96f
-AUX openbabel-python-2.3.2-testpybel.patch 1105 BLAKE2B a73e76780b0d3c3d0e2f16e5e90c2a6bd1ed83186955eb7e2ead3d9196ed684a447fb17ed71b544f45f03e9c42ae516309d4c755ad1933d766953f9a1c0df168 SHA512 65df0351fc626ba9d88c06c7f9e84e5707585f302baea4b4885faa3b190c29483b0016d7390e23c2d2444e83c39ad525ba52d7b8d22faed89d82beb480c5b469
-DIST openbabel-2.3.2.tar.gz 20509105 BLAKE2B d475c2da0d7171650eeb4b78a948421b783bdbb9342c81114d3dbc19d5cbb273f7303438920ffaeef5b6332e4b72606a86ded5cbd3d7e541f62b59b46483bb69 SHA512 d0e1f8b758ffdd65ec6c31d988bffe3279355e286ce69fad12c5905b3b832e2b73ee95b1061b1576aba1ee9fe4da5e31ec30350c473be17493c657dc80caf919
 DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6
-EBUILD openbabel-python-2.3.2.ebuild 2249 BLAKE2B 9ebd9593daa4d35cca9192e6cc83e46deaecbcc724ec1ead9a60101b7adc25abf108c8280c9be88c4efb9e083c62a3e6e2f86d95429edfe70436150e0c14c476 SHA512 5cda71fe2a54d46eb8d7d68e03c0791866172466a54769a032a03e3ab7327ad3c5dac96a937416dd576635528f6b1c0602f753fc13a3f44e8d79579620279fe7
 EBUILD openbabel-python-2.4.1-r1.ebuild 2175 BLAKE2B a940a18ee6b73bd62143546a9a1bee6f8d06637af8f366cbfdde1a6827ea8e2ac707df4c354cf6a782282bf008befb92e903f40b8289ec19f5c131d0071bf711 SHA512 a4174ac5fabedd91719a7adba9bfac803ca231e223243a32eff6bfd98a95d6d21e0ab7c9ac0457f43b064866bb5876fb684449f6389764afa2365a83aa749ae2
 MISC metadata.xml 737 BLAKE2B 9a5fe97df44ce22c6ee27133bbc6144132ee3775db77440adcd6c3e9c44b87cefbace4ebe17906af87f841e07deef5183e451a8c193232d2a6ca7da05c7a0ed7 SHA512 7ff97ef3f6752a8fed578676aa2cb9706b7d68e31ee22d26e90d4bbb01c10ff410b66da20a91b078293add3bcb3a3711ad180d5174368e0d588ea718ad297d7e
diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-bindings_only.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-bindings_only.patch
deleted file mode 100644
index 2e776b4029ec..000000000000
--- a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-bindings_only.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 449f4b4..1c9ad00 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -252,7 +252,8 @@ if(NOT MSVC)
-     }
-    " SCANDIR_NEEDS_CONST)
- 
--  set(OB_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${OB_PLUGIN_INSTALL_DIR}")
-+  set(OB_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${OB_PLUGIN_INSTALL_DIR}"
-+      CACHE PATH "Set to system install for bindings only build")
-   add_definitions(-DOB_MODULE_PATH="\\"${OB_MODULE_PATH}\\"")
- 
-   # Add some visibility support when using GCC
-@@ -380,7 +381,8 @@ if(UNIX AND BUILD_SHARED)
-   if(APPLE)
-     set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR})
-   else()
--    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
-+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}"
-+        CACHE PATH "Set sane rpath")
-     set(CMAKE_SKIP_BUILD_RPATH FALSE)
-     set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-     set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-@@ -477,6 +479,13 @@ endif()
- # Should the language bindings be regenereted?
- option(RUN_SWIG "Generate language bindings with SWIG" OFF)
- 
-+# Build bindings only
-+option(BINDINGS_ONLY "Build bindings only" OFF)
-+
-+# Point to library if building bindings only
-+set(BABEL_SYSTEM_LIBRARY ${BABEL_LIBRARY}
-+    CACHE PATH "Point to openbabel library if building bindings only")
-+
- # Should all bindings be built?
- option(ALL_BINDINGS "Build all languages bindings" OFF)
- 
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index 16e9000..ecd2295 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -92,16 +92,30 @@ if (DO_PYTHON_BINDINGS)
-     endif(RUN_SWIG)
- 
-     add_library(bindings_python MODULE ${openbabel_SOURCE_DIR}/scripts/python/openbabel-python.cpp)
--    target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_LIBRARY})
-+    if(BINDINGS_ONLY)
-+        target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_SYSTEM_LIBRARY})
-+    else()
-+        target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_LIBRARY})
-+    endif()
-+
-     if(NOT WIN32)
-         set_target_properties(bindings_python PROPERTIES
-             OUTPUT_NAME _openbabel
-             PREFIX ""
-             SUFFIX .so )
--        add_dependencies(bindings_python openbabel)
--        install(TARGETS bindings_python LIBRARY DESTINATION ${LIB_INSTALL_DIR})
--        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/openbabel.py DESTINATION ${LIB_INSTALL_DIR})
--        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/pybel.py DESTINATION ${LIB_INSTALL_DIR})
-+        if(NOT BINDINGS_ONLY)
-+            add_dependencies(bindings_python openbabel)
-+        endif()
-+
-+        install(TARGETS bindings_python
-+                LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+                COMPONENT bindings_python)
-+        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/openbabel.py
-+                DESTINATION ${LIB_INSTALL_DIR}
-+                COMPONENT bindings_python)
-+        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/pybel.py
-+                DESTINATION ${LIB_INSTALL_DIR}
-+                COMPONENT bindings_python)
-     else(NOT WIN32)
-         set_target_properties(bindings_python PROPERTIES
-             OUTPUT_NAME _openbabel
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 7841782..6f3495f 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -2,7 +2,12 @@
- add_definitions(-DTESTDATADIR="\\"${CMAKE_SOURCE_DIR}/test/files/\\"")
- 
- # define FORMATDIR for location of format plugin binaries
--add_definitions(-DFORMATDIR="\\"${openbabel_BINARY_DIR}/lib/\\"")
-+if(BINDINGS_ONLY)
-+  set(FORMATDIR "${OB_MODULE_PATH}/")
-+else()
-+  set(FORMATDIR "${openbabel_BINARY_DIR}/lib${LIB_SUFFIX}/")
-+endif()
-+add_definitions(-DFORMATDIR="\\"${FORMATDIR}/\\"")
- 
- ###########################################################
- #  new tests using obtest.h
-@@ -89,7 +94,7 @@ foreach(test ${tests})
-   add_test(${test}_Test ${TEST_PATH}/test_${test})
-   set_tests_properties(${test}_Test PROPERTIES
-     FAIL_REGULAR_EXPRESSION "ERROR;FAIL;Test failed"
--    ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib")
-+    ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}")
- endforeach(test ${tests})
- 
- ############################################################
-@@ -152,7 +157,7 @@ if(WITH_INCHI)
-              ${TEST_PATH}/test_inchiwrite ${inchidata}/${test} ${inchidata}/${test}.txt)
-     set_tests_properties(inchi${test}_Test PROPERTIES
-                          FAIL_REGULAR_EXPRESSION "Not ok"
--                         ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib"
-+                         ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
-     )
-   endforeach(test ${inchitests})
- endif(WITH_INCHI)
-@@ -166,7 +171,7 @@ foreach(test ${old_tests})
-   add_test(${test}_Test ${TEST_PATH}/test_${test})
-   set_tests_properties(${test}_Test PROPERTIES
-     FAIL_REGULAR_EXPRESSION "not ok"
--    ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib"
-+    ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
-  )
- endforeach(test ${old_tests})
- 
-@@ -181,8 +186,8 @@ if(NOT BUILD_SHARED AND NOT BUILD_MIXED)
- endif()
- install(TARGETS roundtrip
-                 RUNTIME DESTINATION bin
--                LIBRARY DESTINATION lib
--                ARCHIVE DESTINATION lib
-+                LIBRARY DESTINATION lib${LIB_SUFFIX}
-+                ARCHIVE DESTINATION lib${LIB_SUFFIX}
- )
- 
- ###########################
-@@ -199,10 +204,10 @@ if(NOT MINGW AND NOT CYGWIN)
-         babel sym smartssym fastsearch unique kekule)
-     foreach(pytest ${pytests})
-     SET_SOURCE_FILES_PROPERTIES(test${pytest}.py PROPERTIES
--      PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib"
--      BABEL_LIBDIR "${CMAKE_BINARY_DIR}/lib"
-+      PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
-+      BABEL_LIBDIR "${FORMATDIR}"
-       BABEL_DATADIR "${CMAKE_SOURCE_DIR}/data"
--      LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib"
-+      LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
-     )
-       ADD_PYTHON_TEST(pytest_${pytest} test${pytest}.py)
-       set_tests_properties(pytest_${pytest} PROPERTIES
-@@ -221,10 +226,10 @@ if (PYTHON_BINDINGS)
-       bindings _pybel example)
-   foreach(pybindtest ${pybindtests})
-     SET_SOURCE_FILES_PROPERTIES(test${pybindtest}.py PROPERTIES
--        PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib"
--        BABEL_LIBDIR "${CMAKE_BINARY_DIR}/lib"
-+        PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
-+        BABEL_LIBDIR "${FORMATDIR}"
-         BABEL_DATADIR "${CMAKE_SOURCE_DIR}/data"
--        LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib"
-+        LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
-     )
-     if(MSVC)
-       SET_SOURCE_FILES_PROPERTIES(test${pybindtest}.py PROPERTIES
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index 1f547bf..fb98441 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -38,8 +38,8 @@ if(BUILD_SHARED)
-     target_link_libraries(${tool} ${BABEL_LIBRARY})
-     install(TARGETS ${tool}
-                     RUNTIME DESTINATION bin
--                    LIBRARY DESTINATION lib
--                    ARCHIVE DESTINATION lib
-+                    LIBRARY DESTINATION lib${LIB_SUFFIX}
-+                    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-     )
-   endforeach(tool)
- 
-@@ -53,8 +53,8 @@ if(BUILD_SHARED)
-     target_link_libraries(obspectrophore ${BABEL_LIBRARY})
-     install(TARGETS obspectrophore
-                     RUNTIME DESTINATION bin
--                    LIBRARY DESTINATION lib
--                    ARCHIVE DESTINATION lib
-+                    LIBRARY DESTINATION lib${LIB_SUFFIX}
-+                    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-     )
- 
-     # obgrep -- requires getopt
-@@ -66,8 +66,8 @@ if(BUILD_SHARED)
-       target_link_libraries(obgrep ${BABEL_LIBRARY})
-       install(TARGETS obgrep
-                       RUNTIME DESTINATION bin
--                      LIBRARY DESTINATION lib
--                      ARCHIVE DESTINATION lib
-+                      LIBRARY DESTINATION lib${LIB_SUFFIX}
-+                      ARCHIVE DESTINATION lib${LIB_SUFFIX}
-       )
-   endif(NOT MINIMAL_BUILD)
- 
-@@ -146,7 +146,7 @@ else(BUILD_SHARED)
- 
-   install(TARGETS babel
-           RUNTIME DESTINATION bin
--          LIBRARY DESTINATION lib
--          ARCHIVE DESTINATION lib)
-+          LIBRARY DESTINATION lib${LIB_SUFFIX}
-+          ARCHIVE DESTINATION lib${LIB_SUFFIX})
- 
- endif(BUILD_SHARED)
diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-swig-3.0.3.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-swig-3.0.3.patch
deleted file mode 100644
index d30efd55bd92..000000000000
--- a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-swig-3.0.3.patch
+++ /dev/null
@@ -1,97 +0,0 @@
- scripts/openbabel-python.i | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/scripts/openbabel-python.i b/scripts/openbabel-python.i
-index 7cb8f24..d893129 100644
---- a/scripts/openbabel-python.i
-+++ b/scripts/openbabel-python.i
-@@ -227,7 +227,7 @@ CAST_GENERICDATA_TO(SquarePlanarStereo)
- %include <openbabel/math/transform3d.h>
- %include <openbabel/math/spacegroup.h>
- 
--# CloneData should be used instead of the following method
-+// CloneData should be used instead of the following method
- %ignore OpenBabel::OBBase::SetData;
- %include <openbabel/base.h>
- 
-@@ -289,7 +289,7 @@ OBMol.BeginResidues = OBMol.EndResidues = OBMol.BeginResidue = OBMol.EndResidue
- %ignore OpenBabel::OBDescriptor::LessThan;
- %include <openbabel/descriptor.h>
- 
--# Ignore shadowed methods
-+// Ignore shadowed methods
- %ignore OpenBabel::OBForceField::VectorSubtract(const double *const, const double *const, double *);
- %ignore OpenBabel::OBForceField::VectorMultiply(const double *const, const double, double *);
- %include <openbabel/forcefield.h>
-@@ -310,7 +310,7 @@ OBMol.BeginResidues = OBMol.EndResidues = OBMol.BeginResidue = OBMol.EndResidue
- 
- %warnfilter(503) OpenBabel::OBBitVec; // Not wrapping any of the overloaded operators
- %include <openbabel/bitvec.h>
--# Ignore shadowed method
-+// Ignore shadowed method
- %ignore OpenBabel::OBRotor::GetRotAtoms() const;
- %include <openbabel/rotor.h>
- %ignore OpenBabel::Swab;
-@@ -321,13 +321,13 @@ OBMol.BeginResidues = OBMol.EndResidues = OBMol.BeginResidue = OBMol.EndResidue
- %include <openbabel/math/align.h>
- #endif
- 
--# The following %ignores avoid warning messages due to shadowed classes.
--# This does not imply a loss of functionality as (in this case)
--# the shadowed class is identical (from the point of view of SWIG) to
--# the shadowing class.
--# This is because C++ references (&) are transformed by SWIG back into
--# pointers, so that OBAtomIter(OBMol &) would be treated the same as
--# OBAtomIter(OBMol *).
-+// The following %ignores avoid warning messages due to shadowed classes.
-+// This does not imply a loss of functionality as (in this case)
-+// the shadowed class is identical (from the point of view of SWIG) to
-+// the shadowing class.
-+// This is because C++ references (&) are transformed by SWIG back into
-+// pointers, so that OBAtomIter(OBMol &) would be treated the same as
-+// OBAtomIter(OBMol *).
- 
- %ignore OBAtomAtomIter(OBAtom &);
- %ignore OBAtomBondIter(OBAtom &);
-@@ -346,9 +346,9 @@ OBMol.BeginResidues = OBMol.EndResidues = OBMol.BeginResidue = OBMol.EndResidue
- %ignore OBResidueIter(OBMol &);
- %ignore OBResidueAtomIter(OBResidue &);
- 
--# These classes are renamed so that they can be replaced by Python
--# classes of the same name which provide Pythonic iterators
--# (see %pythoncode section below)
-+// These classes are renamed so that they can be replaced by Python
-+// classes of the same name which provide Pythonic iterators
-+// (see %pythoncode section below)
- 
- %rename(_OBAtomAtomIter) OpenBabel::OBAtomAtomIter;
- %rename(_OBAtomBondIter) OpenBabel::OBAtomBondIter;
-@@ -367,8 +367,8 @@ OBMol.BeginResidues = OBMol.EndResidues = OBMol.BeginResidue = OBMol.EndResidue
- 
- %include <openbabel/obiter.h>
- 
--# The following class, OBiter, is subclassed to provide Python iterators
--# equivalent to the C++ iterators in obiter.h and the plugin iterators
-+// The following class, OBiter, is subclassed to provide Python iterators
-+// equivalent to the C++ iterators in obiter.h and the plugin iterators
- 
- %pythoncode %{
- class OBIter(object):
-@@ -459,7 +459,7 @@ def double_array(mylist):
-     return c
- %}
- 
--# Copy some of the global variables in cvar into the openbabel namespace
-+// Copy some of the global variables in cvar into the openbabel namespace
- 
- %pythoncode %{
- obErrorLog = cvar.obErrorLog
-@@ -470,7 +470,7 @@ atomtyper = cvar.atomtyper
- aromtyper = cvar.aromtyper
- %}
- 
--# Functions to set the log file to std::cout and std::cerr
-+// Functions to set the log file to std::cout and std::cerr
-        
- %ignore OBForceField::SetLogFile(std::ostream *pos);
- %extend OpenBabel::OBForceField {
diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-testpybel.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-testpybel.patch
deleted file mode 100644
index 7a0114975fff..000000000000
--- a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-testpybel.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b34edb6de512e5735d87cb0893804a4abd14f9b7 Mon Sep 17 00:00:00 2001
-From: baoilleach <baoilleach@71e0b675-c112-0410-beda-96664073b5c2>
-Date: Mon, 1 Oct 2012 20:40:36 +0000
-Subject: [PATCH] scripts/python/testpybel.py: Minor fix to enable failing
- test to pass. Failures due to the new MOL Chiral Flag data
- that I stored a while ago.
-
-git-svn-id: https://openbabel.svn.sourceforge.net/svnroot/openbabel/openbabel/trunk@5022 71e0b675-c112-0410-beda-96664073b5c2
----
- scripts/python/examples/testpybel.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/python/examples/testpybel.py b/scripts/python/examples/testpybel.py
-index aa5fcd4..7951851 100644
---- a/scripts/python/examples/testpybel.py
-+++ b/scripts/python/examples/testpybel.py
-@@ -336,7 +336,7 @@ class TestPybel(TestToolkit):
-     tpsaname = "TPSA"
-     Nbits = 3
-     Nfpbits = 32
--    datakeys = ['NSC', 'Comment', 'OpenBabel Symmetry Classes']
-+    datakeys = ['NSC', 'Comment', 'OpenBabel Symmetry Classes', 'MOL Chiral Flag']
- 
-     def testFP_FP3(self):
-         "Checking the results from FP3"
--- 
-1.7.12.3
-
diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
deleted file mode 100644
index 999a73bc7948..000000000000
--- a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
+++ /dev/null
@@ -1,93 +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 )
-
-inherit cmake-utils eutils multilib python-r1
-
-DESCRIPTION="Python bindings for OpenBabel (including Pybel)"
-HOMEPAGE="http://openbabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openbabel/openbabel-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	~sci-chemistry/openbabel-${PV}
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2"
-
-S="${WORKDIR}"/openbabel-${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-testpybel.patch
-	"${FILESDIR}"/${P}-bindings_only.patch
-	"${FILESDIR}"/${P}-swig-3.0.3.patch
-	"${FILESDIR}"/${P}-gcc-6_and_7-backport.patch
-	)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed \
-		-e "s:\"\.\.\":\"${EPREFIX}/usr\":g" \
-		-i test/testbabel.py || die
-	swig -python -c++ -small -O -templatereduce -naturalvar \
-		-I"${EPREFIX}/usr/include/openbabel-2.0" \
-		-o scripts/python/openbabel-python.cpp \
-		-DHAVE_EIGEN \
-		-outdir scripts/python \
-		scripts/openbabel-python.i \
-		|| die "Regeneration of openbabel-python.cpp failed"
-	sed \
-		-e '/__GNUC__/s:== 4:>= 4:g' \
-		-i include/openbabel/shared_ptr.h || die
-}
-
-src_configure() {
-	my_impl_src_configure() {
-		local mycmakeargs=(
-			-DCMAKE_INSTALL_RPATH=
-			-DBINDINGS_ONLY=ON
-			-DBABEL_SYSTEM_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libopenbabel.so"
-			-DOB_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/openbabel/${PV}"
-			-DLIB_INSTALL_DIR="${D}$(python_get_sitedir)"
-			-DPYTHON_BINDINGS=ON
-			-DPYTHON_EXECUTABLE=${PYTHON}
-			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-			-DPYTHON_LIBRARY="$(python_get_library_path)"
-			-DENABLE_TESTS=ON
-		)
-
-		cmake-utils_src_configure
-	}
-
-	python_foreach_impl my_impl_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_make bindings_python
-}
-
-src_test() {
-	python_foreach_impl cmake-utils_src_test -R py
-}
-
-src_install() {
-	my_impl_src_install() {
-		cd "${BUILD_DIR}" || die
-
-		cmake -DCOMPONENT=bindings_python -P cmake_install.cmake
-
-		python_optimize
-	}
-
-	python_foreach_impl my_impl_src_install
-}
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest
index 970eee422e6d..4e551dea6d29 100644
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -1,8 +1,5 @@
 AUX openbabel-2.3.2-gcc-6_and_7-backport.patch 635 BLAKE2B 4e98dedd149b14d5bb02fb6d2fa03e07242d100c7b41f36f749ff3d587080eeca44aa26ca095d31e0309e45f3780b67deaa97f1177ed35a9b7407bd7c33f78ff SHA512 e1b4402f34d01ced5b4caaa184b4e5544cf47893cfe7958054052b05a57dc34b4d44239a212c7d909f29b9366b83b6df74993f844a20f23748c01272ec093081
-AUX openbabel-2.3.2-test_lib_path.patch 837 BLAKE2B 1d6e1c26cd794cef61bde2c2821b937cf0aa2f0a6e812579a44f65bc787b63cb8e85e0979cf945c2892cbd4a39ffaddb8464f93b0a08f6751b8fc062495b42a4 SHA512 d065eef0bb8d751d3292206feb25557394dc203e810b5f0eb7c52a28cb9e2bfaaf60f195d295ef6e58619ab9fa87d84e6b55ad822cfdefc22e02e8b5a8b49efb
 AUX openbabel-2.4.1-gcc-8.patch 706 BLAKE2B 085b2f5a1678c02a6a8efc5f760dc43ef311774a47d80c87efb75111ac750ec6bf520286fa74325eca71138eecff4b2772ab087d4de1b9b9a5f1c81806d6be87 SHA512 04884d47a9549d2c107bbeb9c36edbe18ee68a7edd447fce405f39a4297bdacf3f81ddf4c5c19e9728355f07960b836e684087573b3a2b7892225de8b7beaea1
-DIST openbabel-2.3.2.tar.gz 20509105 BLAKE2B d475c2da0d7171650eeb4b78a948421b783bdbb9342c81114d3dbc19d5cbb273f7303438920ffaeef5b6332e4b72606a86ded5cbd3d7e541f62b59b46483bb69 SHA512 d0e1f8b758ffdd65ec6c31d988bffe3279355e286ce69fad12c5905b3b832e2b73ee95b1061b1576aba1ee9fe4da5e31ec30350c473be17493c657dc80caf919
 DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6
-EBUILD openbabel-2.3.2-r1.ebuild 2061 BLAKE2B 292e860a5ae8eac6de4d273fe4030965ac4f710224127b2aa5155dd12e7452fe3204ffb49388d290555574124fc004930cd0af38028c30c73aa99fa4cf802dfa SHA512 acc8b99854f852375a19a5b6316cc439016aa258e369892bc524949e709c48412f7925e57f2b684de6a327960b09324d0327aee066560d8dd2194b279de53e0f
 EBUILD openbabel-2.4.1.ebuild 2013 BLAKE2B b7fe713786600ac7efc9b4541663b8049c0145863cd6efc397dbed8a858cb006746e8ae6ddb4b9148023d5bf3a7f1cca76a4327577a5f9809c8e17d5a4f78945 SHA512 2eddc590968cb39a8c87563eb724669742b795bbf1861d85d9892e87fa9137b989f36ba435f98fe1b8151a142aa73a73df49ab5ef5ad1617e2d3875ad655ee1e
 MISC metadata.xml 665 BLAKE2B 4657b85c826c006b6d69e06240dd908a72397a32cb0c0512810e22d1b02478eaa3ab460535b300eba653a334a79c81a102007da1a901d6d1dbd04fc5e795df73 SHA512 0555e7c7401dfd5fbeee339302f8eb7a104ad6538db2839d8e89c20ac5ad2184070335677671a58eb91be2780ae485467d33302f3a14d0caab4ae8c0148f03bb
diff --git a/sci-chemistry/openbabel/files/openbabel-2.3.2-test_lib_path.patch b/sci-chemistry/openbabel/files/openbabel-2.3.2-test_lib_path.patch
deleted file mode 100644
index 66a796d17b7f..000000000000
--- a/sci-chemistry/openbabel/files/openbabel-2.3.2-test_lib_path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru old/openbabel-2.3.0/test/CMakeLists.txt new/openbabel-2.3.0/test/CMakeLists.txt
---- a/test/CMakeLists.txt	2010-10-26 17:39:01.000000000 +0300
-+++ b/test/CMakeLists.txt	2010-11-14 18:13:32.000000000 +0200
-@@ -2,7 +2,7 @@
- add_definitions(-DTESTDATADIR="\\"${CMAKE_SOURCE_DIR}/test/files/\\"")
- 
- # define FORMATDIR for location of format plugin binaries
--add_definitions(-DFORMATDIR="\\"${openbabel_BINARY_DIR}/lib/\\"")
-+add_definitions(-DFORMATDIR="\\"${openbabel_BINARY_DIR}/lib${LIB_SUFFIX}/\\"")
- 
- ###########################################################
- #  new tests using obtest.h
-@@ -32,12 +35,12 @@ set(tests
-     uniqueid
-   )
- 
--if (EIGEN2_FOUND)
-+if(EIGEN2_FOUND OR EIGEN3_FOUND)
- set(tests
-         align
-         ${tests}
- )
--endif (EIGEN2_FOUND)
-+endif()
- 
- set(TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
- 
diff --git a/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild
deleted file mode 100644
index 9665a2ffebcb..000000000000
--- a/sci-chemistry/openbabel/openbabel-2.3.2-r1.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
-
-WX_GTK_VER="3.0"
-
-inherit cmake-utils eutils wxwidgets
-
-DESCRIPTION="Interconverts file formats used in molecular modeling"
-HOMEPAGE="http://openbabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc openmp test wxwidgets"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/libxml2:2
-	sci-libs/inchi
-	sys-libs/zlib
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.8
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/*.inc doc/README* doc/*.mol2"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test_lib_path.patch
-	"${FILESDIR}"/${P}-gcc-6_and_7-backport.patch
-	)
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-}
-
-src_prepare() {
-	sed \
-		-e '/__GNUC__/s:== 4:>= 4:g' \
-		-i include/openbabel/shared_ptr.h || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-	local mycmakeargs=()
-	mycmakeargs+=(
-		-DOPENBABEL_USE_SYSTEM_INCHI=ON
-		$(cmake-utils_use_enable openmp OPENMP)
-		$(cmake-utils_use wxwidgets BUILD_GUI)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dohtml doc/{*.html,*.png}
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/API/html
-		doins doc/API/html/*
-	fi
-
-	cmake-utils_src_install
-}
-
-src_test() {
-	local mycmakeargs=""
-	mycmakeargs="${mycmakeargs}
-		-DOPENBABEL_USE_SYSTEM_INCHI=ON
-		-DPYTHON_EXECUTABLE=false
-		$(cmake-utils_use_enable openmp OPENMP)
-		$(cmake-utils_use wxwidgets BUILD_GUI)
-		$(cmake-utils_use_enable test TESTS)"
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test -E py
-}
-
-pkg_postinst() {
-	optfeature "perl support" sci-chemistry/openbabel-perl
-	optfeature "python support" sci-chemistry/openbabel-python
-}
diff --git a/sci-chemistry/tm-align/Manifest b/sci-chemistry/tm-align/Manifest
index 59bbb7ff261d..8260fae5754a 100644
--- a/sci-chemistry/tm-align/Manifest
+++ b/sci-chemistry/tm-align/Manifest
@@ -2,5 +2,5 @@ AUX CMakeLists.txt 182 BLAKE2B a6bd5aedcbeb2b8019d59123da91cf668c3717a3e41c2259b
 DIST TMtools20140601.tar.gz 934391 BLAKE2B 4dfe18501bfd26b0c12f734175b908f65e97cea9cf2c620c100aa2f68f10fb288c8973c71c9fc6364a635f0275d3a04d7eaffdd5833345dda57e7a318e7c4e5f SHA512 99b90425ff051c836e19225601ddfb1576bec9c8f233aafeba96075f924a3c0892b5b1cfef36254ff5ef468a6dbf64f7fcc9a3ce24a0d869b3c1eb87c0149765
 DIST TMtools20150914.tar.gz 982948 BLAKE2B 788f43040c1262c7e9eae2b47b0035d320a30fe7194e340d682b78e5961b82e46eef2b0a43d1ae458b9d5da6570f9c0ec0aca51b6ec3e25f0447fd43d629f592 SHA512 5fda29f6437ac9b0216a037496a01502de07e5a36736815833cb09217158a959370e750b75c55a54a49c733e4bd28be53b2dcbb25d71e2897273a4280ed3b530
 EBUILD tm-align-20140601.ebuild 720 BLAKE2B 169462fabc7fb255e1746ae1f692b6f989591787ca53023ded771f56489c4c8a2407d40d45186b8fa89ba3750d51e45ab889e4ca6b4f768fa28f1f8eea004f4b SHA512 04d20ceb4a1a33277af7cee7ec49e1902eceb5cb33361020a56f6b9bad62b0c423867104fb6b4bda8b0197d3b7d0a0e057cea87907ab43d69cf10961ca082543
-EBUILD tm-align-20150914.ebuild 724 BLAKE2B 1b14b8ee35ebc27c8d30f6d458b15bfb90d4024bf99cbe547afd70da46f9b475cf34ee09c67f4583002210d8e80b8fd5e501c37dcb737a8a17c1c18f4e9b7b07 SHA512 dde3650a7d1361c46fe93d99ea1b8df3bc40f0a067f3df8cc79b1187d6c44f588e228ff60e0c4fa9702160d310b439cdae901db5ed6067ce81b934d280af4714
+EBUILD tm-align-20150914.ebuild 719 BLAKE2B 085ff1781394ded54c8f8759c5dcb3c74f92283cfe94ab6f6f85b5d6f8e09eeb84d539aacfe998384870db0f7f34f7cb3c560d316eb55ffb9628d6cfb343dbbf SHA512 e725f7d70953c620a4082049e435647d2ead74359912e0028ef065d6fb428e4ac885f8c13f7c4d72fbe91367853066b2451d351c4aa0a4ab82339bac85608ef0
 MISC metadata.xml 1294 BLAKE2B 7972c0f1c379a3929c3d561756099a2071ddc9a6ff35a905a30807f1d724100aa39e98bf549ab4614a7f7b95628246fde7f44d655dceebb0e8f4a4f70686123d SHA512 e1b90b61682c3c1099c3b2d5d5fad166e408b14aca67e49521f470b2df1c746aa4c1eeae06f4f67fe6ccf8ded94c5fbe7a194a441fae8fab450f69acdcb49663
diff --git a/sci-chemistry/tm-align/tm-align-20150914.ebuild b/sci-chemistry/tm-align/tm-align-20150914.ebuild
index 6732f611eaad..a19b8da0b4c1 100644
--- a/sci-chemistry/tm-align/tm-align-20150914.ebuild
+++ b/sci-chemistry/tm-align/tm-align-20150914.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils flag-o-matic fortran-2
 
@@ -11,15 +11,15 @@ SRC_URI="http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools${PV}.tar.gz"
 
 LICENSE="tm-align"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static custom-cflags"
+KEYWORDS="~amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="custom-cflags static"
 
 S="${WORKDIR}"
 
 src_prepare() {
+	cp "${FILESDIR}"/CMakeLists.txt . || die
 	cmake-utils_src_prepare
 
-	cp "${FILESDIR}"/CMakeLists.txt . || die
 	use static && append-fflags -static && append-ldflags -static
 	# recommended by upstream
 	use custom-cflags || replace-flags -O* -O3 && append-fflags -ffast-math
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 23f0ff84127d..d754d518deed 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/drahnr-oregano/Manifest b/sci-electronics/drahnr-oregano/Manifest
new file mode 100644
index 000000000000..e05f0415a1f9
--- /dev/null
+++ b/sci-electronics/drahnr-oregano/Manifest
@@ -0,0 +1,3 @@
+DIST drahnr-oregano-0.84.40.tar.gz 1879082 BLAKE2B 8b8e0ffc6af0205018bb1a415f1f0e067d30f8c86681f145b8000a71d414c540c32cfb99af48b9e7c4a1b1e71cebbe76b22c05ccd511797ba7db2efdc8de2079 SHA512 f4e38ccf09f148cbe609ccfebe3d3476e6b385f4d002cb951ed0d488d84f65557c0fcac986c6e7657684a07d7f7dac4dda663278ed85363de0dcf48f8d02f73e
+EBUILD drahnr-oregano-0.84.40.ebuild 1766 BLAKE2B 81d40972dc1b48fdf3c821a07fd830fae3edcd224d8ed6bf240f072241dedf0b424b5eee975176e5e5379e0768c9451eed30430d29a750dc935723c7af07522b SHA512 66ffaf033246f6994a4ad2c5342f852a4eb0ca0ed58c7c09cb5aee3fbfd5839a9bc62fba5bb3ead82a11ffb6b01c14b123266978f71c112991d9bd60c97e023e
+MISC metadata.xml 724 BLAKE2B fe414b214433f33f0e4a6787389f3169a1e892df0a815848bd56d939f0760afe23b74ace96d842eb2a1552332e60264be0245933e696616f6c7b90476ebddc41 SHA512 733a85af3d7f9205df6fb78456b334be12f56ba316abcd9c3cd21d7774807f8d58907a549482625c4d6dfcacdb7d8c1101bf2748566791ac7924b7a9136d02af
diff --git a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
new file mode 100644
index 000000000000..2ce8945195d8
--- /dev/null
+++ b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit gnome2-utils python-any-r1 waf-utils xdg-utils
+
+DESCRIPTION="Application for the schematic capturing and simulation of electrical circuits"
+HOMEPAGE="https://github.com/drahnr/oregano"
+SRC_URI="https://github.com/drahnr/oregano/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/oregano-${PV}"
+
+COMMON_DEP="dev-libs/glib:2
+	dev-libs/libxml2:2
+	x11-libs/goocanvas:2.0
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0"
+
+DEPEND="${COMMON_DEP}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEP}
+	|| ( gnome-base/dconf gnome-base/gconf )
+	sci-electronics/electronics-menu"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_configure() { waf-utils_src_configure; }
+
+src_install() {
+	waf-utils_src_install --no-xdg --no-install-gschema
+	docompress -x /usr/share/doc/${PF}/{dev-docs,sequence}
+	dodoc -r docs/{dev-docs,sequence,user-docs}
+	insinto /usr/share/glib-2.0/schemas
+	doins data/settings/io.ahoi.oregano.gschema.xml
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	elog "Note: You'll need to emerge your prefered simulation backend"
+	elog "such as sci-electronics/ngspice (preferred) or sci-electronics/gnucap"
+	elog "for simulation to work."
+	elog "As an alternative generate a netlist and use sci-electronics/spice"
+	elog "from the command line for simulation."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/sci-electronics/drahnr-oregano/metadata.xml b/sci-electronics/drahnr-oregano/metadata.xml
new file mode 100644
index 000000000000..da419bd7c8af
--- /dev/null
+++ b/sci-electronics/drahnr-oregano/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ktrace@yandex.ru</email>
+		<name>Victor Kustov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Oregano is an application for schematic capture and simulation of electrical
+		circuits. The actual simulation is performed by Berkeley Spice, or GNUcap or
+		the new generation ngspice.
+		It's alive fork of <pkg>sci-electronics/oregano</pkg>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">drahnr/oregano</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 264ab4b4136b..691424a3969a 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 08bcdec05bb4..081b4524cd41 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,10 +1,11 @@
 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-3.0.18-icu-61.patch 2148 BLAKE2B 3dfc1a8fe598c13317576a31bd758bd28cf24140b02fd46eaf97e9bbb9cc10c56ad5f2b68ebde4e3ccd12f2275469f556edeee21c6f3b7d92e426a6f0b147730 SHA512 32ff973dde413c85fb03769d7b07dc3e1dcdf9fd2e398fb9a77e618a461a8613056cf978d2e1ff4679738e1122af563c6dd5238dcc1d434a19b70b314ea1faa1
 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.18.ebuild 2768 BLAKE2B fa9fb68ad23c4b17d1163492f375735f26925137327f9b1dc6eefdc9d078e67a6f31331d21a3fcd3f90ff75242bc30429ded2c7f46df7aa08c545cecf43d3efe SHA512 0c27792c584dd10f845bff899318b685cdb7fffb08e3d0335628cf37d9a365b2e53fc65023bc0c229d018e6ae50d27dfeeaabf483f2a7a864013e8a09d948823
+EBUILD mapnik-3.0.18.ebuild 2806 BLAKE2B d732995c0cf6dd805dbc01def9e1185cd6c2424de42d6cd92b07aaf89b6fc9e89d60f95f7de80e0510afda4f1e4bb38a8069b6d77797c086a6e01b34c0443218 SHA512 2ba308aa071f761ee278eda592956d1ce6ae1d932fdab3870fa593d3793c8376154747bd352bb4204caab2a3425884ae52e3ded9234d763cc16d630f9e0dc73f
 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-3.0.18-icu-61.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch
new file mode 100644
index 000000000000..1330fe6c0fb2
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch
@@ -0,0 +1,54 @@
+From 1ddfe6c315487a802f2ea38119255a203a25913c Mon Sep 17 00:00:00 2001
+From: Raul Marin <git@rmr.ninja>
+Date: Tue, 3 Apr 2018 13:18:03 +0200
+Subject: [PATCH] Qualify ICU types explicitly
+
+ICU 61 has dropped the global `using namespace icu;`
+http://site.icu-project.org/download/61#TOC-Migration-Issues
+---
+ include/mapnik/text/scrptrun.hpp | 2 +-
+ src/text/text_layout.cpp         | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/include/mapnik/text/scrptrun.hpp b/include/mapnik/text/scrptrun.hpp
+index 2161c510d9..c219a2a0d3 100644
+--- a/include/mapnik/text/scrptrun.hpp
++++ b/include/mapnik/text/scrptrun.hpp
+@@ -37,7 +37,7 @@ struct ParenStackEntry
+     UScriptCode scriptCode = USCRIPT_INVALID_CODE;
+ };
+ 
+-class ScriptRun : public UObject {
++class ScriptRun : public icu::UObject {
+ public:
+     ScriptRun();
+ 
+diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp
+index 663cbe11aa..ecf02ab8e3 100644
+--- a/src/text/text_layout.cpp
++++ b/src/text/text_layout.cpp
+@@ -207,6 +207,7 @@ void text_layout::layout()
+ // At the end everything that is left over is added as the final line.
+ void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits)
+ {
++    using BreakIterator = icu::BreakIterator;
+     text_line line(line_limits.first, line_limits.second);
+     shape_text(line);
+ 
+@@ -228,7 +229,7 @@ void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits)
+     }
+ 
+     mapnik::value_unicode_string const& text = itemizer_.text();
+-    Locale locale; // TODO: Is the default constructor correct?
++    icu::Locale locale; // TODO: Is the default constructor correct?
+     UErrorCode status = U_ZERO_ERROR;
+     std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status));
+ 
+@@ -336,6 +337,7 @@ inline int adjust_last_break_position (int pos, bool repeat_wrap_char)
+ 
+ void text_layout::break_line(std::pair<unsigned, unsigned> && line_limits)
+ {
++    using BreakIterator = icu::BreakIterator;
+     text_line line(line_limits.first, line_limits.second);
+     shape_text(line);
+     double scaled_wrap_width = wrap_width_ * scale_factor_;
diff --git a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
index 8c0db9a6c0be..5a5a4d1e20f0 100644
--- a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
+++ b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,6 +48,7 @@ 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"
+	"${FILESDIR}/${PN}-3.0.18-icu-61.patch"
 )
 
 src_prepare() {
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index c1a278462bb1..2d72eff3b75e 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,8 +1,6 @@
 AUX mapserver-7.0.0-no-applicable-code.patch 812 BLAKE2B b3946628fc518dd37111e6f2293391fb6ddca7ba7ceb019a764c528d3c6e450e3ef5941fa2201995b40efe39e63c78c14a4e321f49f96c811541a99e90e83a71 SHA512 dab7c98095791b369c52d10e6737ac65f60ff7e02b8fcb5bceb2440025fa0552a936a16593aaa66b35434db0659184b667cc54962274510b062690029778a44c
 AUX mapserver-7.0.0-sec-format.patch 470 BLAKE2B 2156f485b0b1917fb6c6f4d34938cb083533b8658c4d29d5299475dfdfc14113ef87ca46a126e94fe69fc89463c493761e0d3cc1f981c154e96dfde1224972eb SHA512 7cddc978bce3691bfa19ea7f7782ce1e0a59c12b2142ebdb2c2dcdcb1076a79992e1a477f7b99e638d457136d167066b867de85b07574c766babd16c1f238a8f
 AUX mapserver-7.0.5-missing-macro.patch 439 BLAKE2B 4ef13371034994ed7a6e61a61463831dfb8a8d7a49812fe85d20cdd548159646d3c518f239d66112bfdfe019d74793a5f3a1ca6133a63adfbac3c8d5047757e7 SHA512 351f19b670b4352934150e8ab49af9bc5c47cad3b9bc5c5a25d92ddef19f66f91ab923590f764f5bb2cc9f12a313ab0f85d6c9eaa1c55f8b630362ce597552a2
-DIST mapserver-7.0.3.tar.gz 2621285 BLAKE2B b2fd9a4050ffee3bf4175971e0588ddc022f473e35c3953a098865898275ae66c2f889aef7df21231a9d9fdbecfda75490c21c67771745f0b6f18dbf11febb8e SHA512 7630461948e7b371c6d4d6d49cc596ad8fc6b076a8bbfdc88358fc076fa0d4ebaaab10663ec9c3c64e246b5735a07cef5cc28eba88b00dd09259048a49d2b81b
 DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753
-EBUILD mapserver-7.0.3.ebuild 4606 BLAKE2B 5db66fd9b135e33e04c2f39e09a0638cade589b5dbcd99f0b6c91b4658a558c39620c6b36893e1f7ea06196a439b55322fa34de7c4cb4f0f93babd914f74ce51 SHA512 593f16f85412b967d8b8acf758d61535814e2fb4d4706a327c4a25947a4320f2e658a396a6786cc63babbfc47fd9a482e90d05f573ed58ab369f177241052a21
 EBUILD mapserver-7.0.5.ebuild 4510 BLAKE2B 6ebcc5ecc23196c283845943ab6eba9033acd1e8113709a1efb96c5d5c4985a289835961bb208f17d4c83d5edb3ff834a4882ded8859633cc771a33f5d330491 SHA512 63f7156c6127b5bf3124a56698c30e2f4e14de229df39fa201d196d3f3f8d89e82a2b32b6c1f0b6b48e51fbd0ab40f9ab5069011a3fa98ce8d1c4d41a134374c
 MISC metadata.xml 682 BLAKE2B 28881d5c3c341fc24d970d19e69602942623fe9f180cd3dad30ff37b5c3550c158ec11964a76540bbcdc2e62f8ca1c47be1e58ea8a6cd035ff6d450ce25b77ec SHA512 09ba242fe23bdf10d76b882ac32d9952e88e5bc630eb8569e74cfdacae587ec534e8014d6b015387fa2c63047e130dd1f918340cb382413bcbf14f321a296436
diff --git a/sci-geosciences/mapserver/mapserver-7.0.3.ebuild b/sci-geosciences/mapserver/mapserver-7.0.3.ebuild
deleted file mode 100644
index 44a5419ef6a1..000000000000
--- a/sci-geosciences/mapserver/mapserver-7.0.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-${PV/_/-}"
-
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscript"
-PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
-PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-6"
-
-PYTHON_COMPAT=( python2_7 )
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-
-inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="http://mapserver.org/"
-SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="php? ( php_targets_php5-6 )
-			xslt? ( xml )"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/fcgi
-	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
-	media-libs/giflib
-	net-misc/curl
-	virtual/jpeg:=
-	virtual/libiconv
-	x11-libs/agg
-	bidi? ( dev-libs/fribidi
-			media-libs/harfbuzz )
-	cairo? ( x11-libs/cairo )
-	gdal? ( >=sci-libs/gdal-1.8.0 )
-	geos? ( sci-libs/geos )
-	mysql? ( virtual/mysql )
-	opengl? (
-		media-libs/ftgl
-		media-libs/mesa
-	)
-	perl? ( dev-lang/perl:= )
-	postgis? ( dev-db/postgis )
-	proj? ( sci-libs/proj net-misc/curl )
-	tiff? (
-		media-libs/tiff:=
-		sci-libs/libgeotiff
-	)
-	xml? ( dev-libs/libxml2:2 )
-	xslt? ( dev-libs/libxslt[crypt] )
-"
-DEPEND="${RDEPEND}
-	perl? ( >=dev-lang/swig-2.0 )
-	python? ( >=dev-lang/swig-2.0 )"
-
-need_apache2
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.0-sec-format.patch"  # see https://github.com/mapserver/mapserver/pull/5248
-	"${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-	use perl && perl_set_version
-	#use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	# unpack A and then copy the php thingies into workdir/php-slot
-	php-ext-source-r2_src_unpack
-	# HACK: and then remove it and replace by symlink
-	local slot
-	for slot in $(php_get_slots); do
-		rm -rf "${WORKDIR}/${slot}" || die
-		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
-	done
-}
-
-src_prepare() {
-	local glibdir="${EPREFIX}/usr/include/glib-2.0"
-	local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-
-	sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
-		-i "${S}/CMakeLists.txt" || die
-	sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
-		-i "${S}/CMakeLists.txt" || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DWITH_ORACLESPATIAL=OFF"
-		"-DWITH_SDE=OFF"
-		"-DWITH_APACHE_MODULE=ON"
-		"-DWITH_ICONV=ON"
-		"-DWITH_GD=ON"
-		"-DWITH_GIF=ON"
-		"-DWITH_CURL=ON"
-		"-DWITH_FCGI=ON"
-		"-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
-		"-DWITH_PROJ=$(usex proj ON OFF)"
-		"-DWITH_WMS=$(usex proj ON OFF)"
-		"-DWITH_KML=$(usex xml ON OFF)"
-		"-DWITH_GEOS=$(usex geos ON OFF)"
-		"-DWITH_GDAL=$(usex gdal ON OFF)"
-		"-DWITH_OGR=$(usex gdal ON OFF)"
-		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
-		"-DWITH_MYSQL=$(usex mysql ON OFF)"
-		"-DWITH_LIBXML2=$(usex xml ON OFF)"
-		"-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
-		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
-		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
-		"-DWITH_CAIRO=$(usex cairo ON OFF)"
-		"-DWITH_PHP=$(usex php ON OFF)"
-		"-DWITH_PYTHON=$(usex python ON OFF)"
-		"-DWITH_PERL=$(usex perl ON OFF)"
-	)
-
-	if use gdal && use proj ; then
-		mycmakeargs+=( "-DWITH_WFS=ON"
-				"-DWITH_WCS=ON"
-				"-DWITH_CLIENT_WMS=ON"
-				"-DWITH_CLIENT_WFS=ON"
-				"-DWITH_SOS=$(usex xml ON OFF)"
-			)
-	else
-		mycmakeargs+=( "-DWITH_WFS=OFF"
-			"-DWITH_WCS=OFF"
-			"-DWITH_CLIENT_WMS=OFF"
-			"-DWITH_CLIENT_WFS=OFF"
-			"-DWITH_SOS=OFF"
-		)
-	fi
-
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots); do
-			local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
-			[[ -x ${php_config} ]] \
-				|| die "php-config '${php_config}' not valid or not executable"
-
-			local php_include_dir=$(${php_config} --include-dir)
-			[[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid"
-
-			mycmakeargs+=(
-				-DPHP5_CONFIG_EXECUTABLE="${php_config}"
-				-DPHP5_INCLUDES="${php_include_dir}"
-			)
-		done
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use php ; then
-		php-ext-source-r2_createinifiles
-	fi
-	webapp_src_preinst
-	exeinto "${MY_CGIBINDIR}"
-	doexe "${S}_build/mapserv"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	webapp_pkg_prerm
-}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 6c319d2487b4..6b16c82b1673 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -8,6 +8,6 @@ DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed733
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.0.3-r1.ebuild 6233 BLAKE2B df8a8d83be8b563027abc3d7e6f759357449bd9852a205e7583e5055e564da68645df7be5f8aab8107bfa115d5eb48889acdee6c8c98b1eed4f14379e5b9cf07 SHA512 18da6eb489ca5095099c11d20582c1ea140f4c843f3fc6f02c01b8a338a522420a7be44479cd61f9101ecc90621ba5da6581e28dbe7fe90cdb5377fd4f91f096
 EBUILD qgis-3.2.2.ebuild 6200 BLAKE2B af609ca54b0333b34f0f0f6c5d940e88f49093d4ffe4326af010b21f5ac456ddca9dde7d71b3c8fbda78122309401026139c4a1da6e42b3a6e195b610a16dad3 SHA512 59a5b4868a1fa0cc6f5949553918b90f7dce113e0cf8474fda13d445f2ee313d732cb824ac73eee735633bd2fdcbe79ba2d54d485cb3a6744d663a72bbb7abd6
-EBUILD qgis-3.2.3.ebuild 6200 BLAKE2B af609ca54b0333b34f0f0f6c5d940e88f49093d4ffe4326af010b21f5ac456ddca9dde7d71b3c8fbda78122309401026139c4a1da6e42b3a6e195b610a16dad3 SHA512 59a5b4868a1fa0cc6f5949553918b90f7dce113e0cf8474fda13d445f2ee313d732cb824ac73eee735633bd2fdcbe79ba2d54d485cb3a6744d663a72bbb7abd6
+EBUILD qgis-3.2.3.ebuild 6195 BLAKE2B 92beb6aef1915030ae047a9216d2593f2c9a5f0cace785b4ac95aaa38472b1cef8012474eac3f5a59cf2dadb1f93383e6fe0d9016af447404573ad285e40ee1a SHA512 a322aa327c5c2e6512e74597216edb6fef931cb5c2e0a85f28614bda0c5a96b4ba561e1ba2613dc875921a291f4d4dee33cb35ae51ee618b91b7969b777a0a9b
 EBUILD qgis-9999.ebuild 6299 BLAKE2B f0e1b484879bfb2d2545694183f81afd9994eac66575d108c072d74f2ac3f5006c8c1cbb08d46fa4961123089bcb9edb5685255d04c2cd6598ac4282a2810af7 SHA512 ec18b18d2b791372df0a5e3d0d37d76d368a193f465aca05cf2636883f91e1050e7d99dad71d2755ef2f3c1b9fdd99badab9e3c8765c9a54e1492164a831e0aa
 MISC metadata.xml 1211 BLAKE2B 761852f48581c7cca9f9474d1e2e99c751ca2597726cbbb973c82c6292806e4908fcaa091ad4ad5b60f73cea831db2f94be9c7ae3627ad9bfbe0a7572638c929 SHA512 22aa2127957668f8017e20d08297ef222bb1f9fd0a420398ee191426de0b681fb90138bfa8117f67612001d64020455871db4b8a772653d9ee02d7777555e48b
diff --git a/sci-geosciences/qgis/qgis-3.2.3.ebuild b/sci-geosciences/qgis/qgis-3.2.3.ebuild
index 23afe352fad8..7c4de2ebd699 100644
--- a/sci-geosciences/qgis/qgis-3.2.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.4"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index a86412c8ff11..91f46e35fbae 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,4 +1,5 @@
 DIST viking-1.6.2.tar.bz2 3324897 BLAKE2B ef3ab1d60d6cdca514776aaf59d01dedd063c8850ad842d7cbd23c321304b51ccceaa9e5c4f702afc56819e557b28a7ca2b3242ae2fa207e172f7cfdfbba0c45 SHA512 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
 EBUILD viking-1.6.2-r1.ebuild 1732 BLAKE2B 1696a27bbfbaa72b9e49baa87b06b0f0a89a6ee1cee0a936138e46b96f60bdc7bf846d355a8a204429a6f52e63818899674f15dc026c76f129388cef3563ea92 SHA512 9d460c58cb898ce1c65217596c9be4c91311302aec42184c5864ad2826d2116cd30e609e76e2490aae76c3745c3ad48ca150423311e873c33fc3718611e7a7d4
+EBUILD viking-1.6.2-r2.ebuild 1756 BLAKE2B 5d914b4f1ab4d07fba05485d77e6a5802a4c59d5110b49a0c7914367a4684d9a64f8bbdc164bbcbb961b5372eff36fe9ebd58fac4d6ac4567031d12820c7f1ea SHA512 b2672f59cc289c0554989adec8d20eab69b81c27305a9a36c7227f4393afac4b99f03549ae122a59aa497c5ad26f0760df4b85015ad2053b4d120b977e84d438
 MISC metadata.xml 828 BLAKE2B 4ca303eae02e593e48080b7fbd77fbaeff6b617b221621509932b0ef209d64ca356c9aca9504867508f3e857e587ed5db61ed97d12c49dfafe458bbfe66ec567 SHA512 c8b9fe12169e2ea31110188f2bb0aba17138dd325af8ad04d26803bed10ec63657a2de7fcc0ccb774b2731a1a85cf3bdad14c88796e6747ecbe5abb72d88e057
diff --git a/sci-geosciences/viking/viking-1.6.2-r2.ebuild b/sci-geosciences/viking/viking-1.6.2-r2.ebuild
new file mode 100644
index 000000000000..365f8b560b11
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.6.2-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="GPS data editor and analyzer"
+HOMEPAGE="https://sourceforge.net/projects/viking/"
+IUSE="doc +exif libexif gps +magic mapnik nls sqlite"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMONDEPEND="
+	app-arch/bzip2
+	>=dev-tcltk/expect-5.45.4
+	dev-libs/expat
+	dev-libs/glib:2
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	gps? ( >=sci-geosciences/gpsd-2.96 )
+	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
+	magic? ( sys-apps/file )
+	mapnik? ( sci-geosciences/mapnik )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${COMMONDEPEND}
+	sci-geosciences/gpsbabel
+"
+DEPEND="${COMMONDEPEND}
+	app-text/gnome-doc-utils
+	dev-util/intltool
+	dev-util/gtk-doc-am
+	app-text/rarian
+	dev-libs/libxslt
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_configure() {
+	econf \
+		--disable-deprecations \
+		--with-libcurl \
+		--with-expat \
+		--enable-google \
+		--enable-terraserver \
+		--enable-expedia \
+		--enable-openstreetmap \
+		--enable-bluemarble \
+		--enable-geonames \
+		--enable-geocaches \
+		--disable-dem24k \
+		$(use_enable exif geotag) \
+		$(use_with libexif ) \
+		$(use_enable gps realtime-gps-tracking) \
+		$(use_enable magic) \
+		$(use_enable mapnik) \
+		$(use_enable nls) \
+		$(use_enable sqlite mbtiles )
+}
+
+src_install() {
+	default
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/${PN}.pdf
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
index 28a7bbf1c76d..75c5872c2e07 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -2,5 +2,7 @@ AUX xtide-2.13.1-Werror.patch 611 BLAKE2B 624b5e8c67eb1d916a8ce519a22c4590e8e4c1
 AUX xtide-2.13.1-gps-switch.patch 2413 BLAKE2B 87414b04c6fea28ac235e7a497de8363696160691ae5a81d898c5b3d83639e863b2a9b495d69092f3316f07ba431a4d50b6ff63d3e78d6cc3700e42ae0de108e SHA512 0f6dc8399962c76853d75dc00e4929ca7fa9c0f004c47902936b586e231ba8772b333330ae0ec909bb45c13ff393dcf212fabba3b7e52ddaa50e93920a9852f5
 AUX xtide-2.13.2-clang.patch 913 BLAKE2B 0bf2e94888907030f2d5752886d1c39cd89b182c34a3c2471b08cebb57037954c4f27612c3e37f47b70d671106862c66b60e0e4fcf0c8010309f50147484e00b SHA512 5f9d5ea48706cb42a6fe8be8615b54eb67b7304a933f6e7a577ac3ea162a374221cb325766263664dc74c6bb5d1340f9f3417032a663ae446892c17d5561b88b
 DIST xtide-2.13.2.tar.bz2 481183 BLAKE2B b9d294ef1e212ecf2a9850082f0861efd85a8e151da265e3faf06e51a77c2769f68135cad4751edb3517a9dacfc75d45b43f2dc1810351e6d7788228c46ccbfc SHA512 31b35190932413bf5021c82c640ec3f03424807ffd5295abd8ab9554febbe495896bc0d08f901e70e11b04d92c0d1991b8214dcdd5e95e04173f3e7bbf5faec0
+DIST xtide-2.15.1.tar.bz2 710182 BLAKE2B 31c336c16d855615bb3b33571f71cf47ff4ae524c1ca987e4b29a1c0a88844d9de7fa9f0340a07360c6e0299826e47d0c448dec074a3755a929300cc72cb6462 SHA512 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448
 EBUILD xtide-2.13.2.ebuild 1190 BLAKE2B a6302e79d6e6122b53e46e725b755d55d7e051f2610085a790eed8968f1d2984b38a24b4b56a760bf78987e4273e26344e76cce0983e63caafeb363c9083bf3c SHA512 32e5948a9e7d20633209c3079d13a0fa5bb979f92580b888dc3a5da4cd7104e5d60442b05162273ca4487c910d7f4a84ea422913b80c4385e65f2a077b5eb610
+EBUILD xtide-2.15.1.ebuild 993 BLAKE2B 24cd2e5298197fceec878a491bbc86ccf502b9440302fae6a49f2ba016c805925b1fffdeefaf3b8534ca28d1f1c911b351bddd4b17a77b70888dbb7408e5a755 SHA512 ac6aaa94e37d2673db0eb33747eea2c2a66a60f15b7beee7de9d624d6cbbf79d5ee12953d8f9cf7df1b7165ae376f0a1fa71b85d38da1fb116862ed81a58a8f1
 MISC metadata.xml 244 BLAKE2B 934bb17faea52392265caa18c77fd32ecb9b80303c9f67145928471c0ad0c4e18f0500b35db4de459ad3575c3a111e2e5afa88fd7c3ab40c15d9d1e9446603c4 SHA512 2cf646d59cd730a1d957a67d2a5735dc205f9270342b86b4a201213e3c9455d8a73a640cac5248a4655f93ac2258f8092a3907553818783da3d864e8fe74323a
diff --git a/sci-geosciences/xtide/xtide-2.15.1.ebuild b/sci-geosciences/xtide/xtide-2.15.1.ebuild
new file mode 100644
index 000000000000..351bc65c9bc5
--- /dev/null
+++ b/sci-geosciences/xtide/xtide-2.15.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop gnome2-utils
+
+DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
+HOMEPAGE="http://www.flaterco.com/xtide/"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	media-libs/libpng:0=
+	sci-geosciences/gpsd
+	>=sci-geosciences/libtcd-2.2.5_p2
+	x11-libs/libX11
+	x11-libs/libXaw3d[unicode]
+	x11-libs/libXaw3dXft
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXt
+"
+RDEPEND="${DEPEND}
+	media-fonts/font-schumacher-misc
+"
+
+src_install() {
+	default
+
+	echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm
+	doenvd 50xtide_harm
+
+	newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png
+	make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 603cee54f7ae..f0b29cb729aa 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 791516c37f58..dde33d299ead 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,9 +1,3 @@
-DIST armadillo-6.200.3.tar.gz 5442342 BLAKE2B b67b942dcf5da9b878465b2458ce78a61acc1fbc8a05a345a3df70c467e7ac4c3c8a6bac745897fd3b8786dfbce71dabca0d11f9d101df46e9a1d59f7242e84d SHA512 598ba8be19971fc0e44703b17be922568e697c592ed85d0148c31f8476ecd7b5a0e6185918763bc063ba68244330b17594333c1453e9c1cfd39b9fefe85be222
-DIST armadillo-7.950.1.tar.xz 4022716 BLAKE2B 9f6961c9745caa4c7347082f77934a90487daf1c03fc342133ef06e13dbfad38cc9e2f8713015b93fc277ae2ccd61302d7ba55f2a82ccd997b67eae481f6442c SHA512 e061a09ba45359c6a1d422cbb1586b2c1d3d5edaec8a0a885030c4aa3295eb5b90b45df6e4d5bec6ca57d290020a33afc8ed9a940a08b3ec0f0736a278b0484d
-DIST armadillo-8.200.0.tar.xz 4456824 BLAKE2B a9124c8e15807a00b8495e90934d71a3b270e8bf5c9319fe3a28c2e65ed4d8f23e7ca61992a661e8e7f65244203da65d85514ebd91b9adf7edb055551d9177d0 SHA512 d7b49e79a40a50de99c3b227eada7d628bd325aaab5bc4b016c0bd957475fc042518edf88e2f749fa8851d54d3e2269c705175afde3942fa3818f8a7f931d0b9
 DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
-EBUILD armadillo-6.200.3.ebuild 2992 BLAKE2B 29a1dd94fee4f8e82447a65921cfa8ad3d3c632fa86adfb6c29b98ece345f60042768e793d0df5ba3af4f0d24ddc1f7b19f0eae7b3b957acc304174cb9300b59 SHA512 39ac3f773cee2493e4511f51fa9a37bad89b2507aad03298bccacec1d4f76992dc3805b3a79fe81d0bd7fcc02db2c879e9237cb88c8925f6562712ce895da918
-EBUILD armadillo-7.950.1.ebuild 3377 BLAKE2B 7cb31f807a6e4c9114eda569b74795bf94f806b2640485be49069793f4b100b611166724d1ef6d8f78aa1afacbed73834f6d2e82e8ed268123d9222e7b52773d SHA512 e585c4981c3c8338594f6cbb3feffdd869afd4c9bd41446f2c33f22443fca24ea747514e27c5e5e4fb9b02f3cacf3ccc0cfeffd89843a8dceabc6a837715fdc6
-EBUILD armadillo-8.200.0.ebuild 3379 BLAKE2B 5975e874dc9569ff03f71601c9af9d14cc0ac6407bccebc6e3379ca5e152735fdfd18947756e1898cb72e29b76b9b91be692f82d6942377d5492805555685002 SHA512 74d5355a77a1edf9ad891fcc978e043b12415490822fc2e3914f87196ac42773e82f6e10687134be5995a394c7c521fcce603b3de17465b8a6a5ee493df57738
 EBUILD armadillo-8.300.2.ebuild 3376 BLAKE2B 3919b3ff29586060911230a35fa61aa590cec61f982c9b817ad468eea146ea142cc6fe021a4240ffc7bc3562e1349e59f76a868a2632f03bc9a626da0811f08e SHA512 4983eb6be844203df5ebb1cc15d2005ec953c05af300ddcba5d656f4cbf03207998a0c198afee9e43d81d7788799b31d4e13a929f74399dc55120ede0538652b
 MISC metadata.xml 1537 BLAKE2B 5116cb259f8e27fb11430cc2b3ab3a351afcefa0734e7997c962596aab226cfdd052ba3186ea068d8d31d501520d063037185909bcf02de72f57b4c8dfd86e31 SHA512 206e3f8912bd753837b0e8301c1db0f94e3480d0f50ba83c1b9a4be44498507ccade8f0b317c3bf2baa8aa782a93c88806ddbe710eed9d8fecb135494c26bc71
diff --git a/sci-libs/armadillo/armadillo-6.200.3.ebuild b/sci-libs/armadillo/armadillo-6.200.3.ebuild
deleted file mode 100644
index 74c00365c047..000000000000
--- a/sci-libs/armadillo/armadillo-6.200.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/6"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-REQUIRED_USE="test? ( lapack )"
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( sci-libs/superlu )
-"
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
-		$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
-		$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf && dohtml *html
-	if use examples; then
-		insinto /usr/share/examples/${PF}
-		doins -r examples/*
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-7.950.1.ebuild b/sci-libs/armadillo/armadillo-7.950.1.ebuild
deleted file mode 100644
index f51cc63bdf42..000000000000
--- a/sci-libs/armadillo/armadillo-7.950.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-REQUIRED_USE="test? ( lapack )"
-
-#	atlas? ( sci-libs/atlas[lapack] )
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( >=sci-libs/superlu-5 )
-"
-
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DARMA_EXTRA_DEBUG="$(usex debug)"
-		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
-		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	else
-		mycmakeargs+=(
-			-DARPACK_FOUND=OFF
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	else
-		mycmakeargs+=(
-			-DBLAS_FOUND=OFF
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	else
-		mycmakeargs+=(
-			-DHDF5_FOUND=OFF
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	else
-		mycmakeargs+=(
-			-DLAPACK_FOUND=OFF
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
-		)
-	else
-		mycmakeargs+=(
-			-DSuperLU_FOUND=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf *html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-8.200.0.ebuild b/sci-libs/armadillo/armadillo-8.200.0.ebuild
deleted file mode 100644
index dccb43520ea1..000000000000
--- a/sci-libs/armadillo/armadillo-8.200.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-REQUIRED_USE="test? ( lapack )"
-
-#	atlas? ( sci-libs/atlas[lapack] )
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( >=sci-libs/superlu-5.2 )
-"
-
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DARMA_EXTRA_DEBUG="$(usex debug)"
-		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
-		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	else
-		mycmakeargs+=(
-			-DARPACK_FOUND=OFF
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	else
-		mycmakeargs+=(
-			-DBLAS_FOUND=OFF
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	else
-		mycmakeargs+=(
-			-DHDF5_FOUND=OFF
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	else
-		mycmakeargs+=(
-			-DLAPACK_FOUND=OFF
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
-		)
-	else
-		mycmakeargs+=(
-			-DSuperLU_FOUND=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf *html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/exodusii/Manifest b/sci-libs/exodusii/Manifest
index c2e4d887173f..1ff7d7998db4 100644
--- a/sci-libs/exodusii/Manifest
+++ b/sci-libs/exodusii/Manifest
@@ -1,7 +1,4 @@
-AUX exodusii-5.26-multilib.patch 3148 BLAKE2B 09e88bebddc10fb1940ec14c43a75352059f0fe07082b75adfe4a494371f67da1649b85eecee6e27b3fbc36ee77c9864b27f8e3d458b3f8adad28dfb07313ebf SHA512 f37a2463b7c8a243a6fdd690e8a2b18601188ba144862842833e81120226c6969f4ed815eef89a3b4f47b2fa55dbe3d0799441783f4acc478eaeed4c0217644b
-AUX exodusii-6.09-multilib.patch 3125 BLAKE2B 9b6151c227d235689f99155e53c20053adb0cbcdcda265f2e66c4fb7c4ddf2da36d3657d9cc43ec723d6f5ef8e099acfb94a4b9a40a1f3bbbfddf3bc917fe71b SHA512 7575ea71ed4d21135c6ddeb6932298951ac4d1cdef3b0129104f12c475308bd9224fef4f85233e9ffb644dabba0dec2bdc1819f7d6c0f6b4adb73bc98636f41c
-DIST exodus-6.02.tar.gz 4735364 BLAKE2B 3744bf218e0cc3e8e012ddb61833fd6129f8c394159cc1de9ff4a07af5eb220b468da8148aa3cf70a32aa6d776a10db57aee8576c1592707a1db6c353a639b06 SHA512 d086464f0af2edd06d6e6a49be28d3bdfe00c0e9a9a09abad7822a49c7a7fbb75b61324ea54d2163c73b45ee90222c22754c804ee6868cdb0f9e4b780d6d5ad0
+AUX exodusii-6.09-multilib.patch 2891 BLAKE2B 0bca9f2e768b409f1683c3d1925add553f86a9fca393551b98fefac1d4cc9913d50be4660bd4c62474a95f2aae129480533d2a51aaa2083cb5461b91c8655f7f SHA512 189047d12455c539308b8eeb81334d980f847d68b96df7cef442f8d552404e5c70f42a3e3649d62cc7db395ae2ca2f6988ee0638eebf52b3cab9c3bf964d5fc2
 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
-EBUILD exodusii-6.02.ebuild 1156 BLAKE2B 7c10f3a8506bdde2165f00eb5a339e623b4072b95e8a8db6f65d4655d7eaef46772a187128fc65ee2098ff074e62bdc000d10241b0e576183b0f4949836601b8 SHA512 916371ad1b1d62e046b4f52f9b88b32292fc8cedc456aa3d4a469757bb7eb1ddf7ff1d610ddd466c4745b3cc6b495fb436fe634aab6a025cfffbcadd7f708cd8
-EBUILD exodusii-6.09.ebuild 1200 BLAKE2B 004033d07cdd7b20252d7666d1672102f05104eed94cb66d60e2811acc6373ae849774b7f3fe16a2d0f3fd47e15fa7cd4c72a043c49c1685b4aee8699f9f4c0b SHA512 891bf37f0810fbde2cfac9e8141971c3feccc43bd42966ed63af01dd09fbd350c24a2abf48550743be291f91f9aa701e0ff1be9ae0d95eb4c09351dc4d1b8788
+EBUILD exodusii-6.09.ebuild 1196 BLAKE2B c2ec5c8ed0c7665420cfa52edfac0e0deb6c504345775e31324d552e2dd103fed776ad31144f360b0b17ffbb33238130e73d1eb92025992368a4bcae7e611a0d SHA512 93d3dec6907f696c84ff8962dd9d942ddbabb0195e220332537500418d6d916c0281de58774eb4311cb78c5d513a63860a1b40af3a153024f5f581da99fa1804
 MISC metadata.xml 603 BLAKE2B 99e4fc167e1cf5e96571a2024a8b217083a200fa3850d09c2d520939a87608ecc70708dd302f1c292338aa4c07d0a586c77da80392f85c16e2fb122f98c86cee SHA512 9d703efe9fbf4d49438d83bcdca60db2cd9a40f0b853fcf8cd796d9f96d304c84825c9e2cb26ba98f1893e3e85ddd1af8a5e15c4c4e179d6de25b1df98be3a55
diff --git a/sci-libs/exodusii/exodusii-6.02.ebuild b/sci-libs/exodusii/exodusii-6.02.ebuild
deleted file mode 100644
index dcaf91498fb5..000000000000
--- a/sci-libs/exodusii/exodusii-6.02.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED="test"
-
-inherit cmake-utils fortran-2 multilib
-
-MY_PN="${PN%ii}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-RDEPEND="sci-libs/netcdf[hdf5]"
-DEPEND="${RDEPEND}
-	test? ( app-shells/tcsh )
-"
-
-S="${WORKDIR}"/${MY_P}/${MY_PN}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.26-multilib.patch )
-
-src_prepare() {
-	use test || \
-		sed \
-		-e 's:Fortran::g' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use_build !static-libs SHARED)
-		$(cmake-utils_use_build test TESTING)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/cbind/test || die
-	ctest || die
-	cd "${BUILD_DIR}"/forbind/test || die
-	emake f_check
-}
diff --git a/sci-libs/exodusii/exodusii-6.09.ebuild b/sci-libs/exodusii/exodusii-6.09.ebuild
index a91a3e96e992..1b8221b53486 100644
--- a/sci-libs/exodusii/exodusii-6.09.ebuild
+++ b/sci-libs/exodusii/exodusii-6.09.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 FORTRAN_NEEDED="test"
-
-inherit cmake-utils fortran-2 multilib
+inherit cmake-utils fortran-2
 
 MY_PN="${PN%ii}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/certik/exodus"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 RDEPEND="sci-libs/netcdf[hdf5]"
@@ -29,21 +28,23 @@ S="${WORKDIR}"/${MY_P}/${MY_PN}
 PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
 
 src_prepare() {
-	use test || \
-		sed \
-		-e 's:Fortran::g' \
-		-i CMakeLists.txt || die
 	cmake-utils_src_prepare
+
+	if ! use test; then
+		sed -e 's:Fortran::g' -i CMakeLists.txt || die
+	fi
 }
 
 src_configure() {
+	local libdir="$(get_libdir)"
+
 	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
+		-DLIB_SUFFIX=${libdir#lib}
 		-DPYTHON_INSTALL="${EPREFIX}/usr/share/${PN}"
-		$(cmake-utils_use_build !static-libs SHARED)
-		$(cmake-utils_use_build test TESTING)
+		-DBUILD_SHARED=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
 	)
+	export NETCDF_DIR="${EPREFIX}/usr/"
 	cmake-utils_src_configure
 }
 
diff --git a/sci-libs/exodusii/files/exodusii-5.26-multilib.patch b/sci-libs/exodusii/files/exodusii-5.26-multilib.patch
deleted file mode 100644
index 1d1c1fca6c2b..000000000000
--- a/sci-libs/exodusii/files/exodusii-5.26-multilib.patch
+++ /dev/null
@@ -1,95 +0,0 @@
- CMakeLists.txt         |  6 +++---
- cbind/CMakeLists.txt   |  6 +++---
- forbind/CMakeLists.txt | 12 ++++++------
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ca372f5..a071d99 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,7 +27,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
- find_library( NETCDF_LIBRARY
-    NAMES netcdf
-    PATHS "$ENV{ACCESS}/lib"
--         "$ENV{NETCDF_DIR}/lib"
-+         "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}"
- 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
- )
- 
-@@ -41,14 +41,14 @@ find_program (NETCDF_NCDUMP ncdump
- find_library( HDF5_LIBRARY hdf5
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
- find_library( HDF5HL_LIBRARY hdf5_hl
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
-diff --git a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt
-index 083891f..66fd17b 100644
---- a/cbind/CMakeLists.txt
-+++ b/cbind/CMakeLists.txt
-@@ -293,9 +293,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
- 
- IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
-   INSTALL(TARGETS exoIIv2c
--    RUNTIME DESTINATION lib COMPONENT Runtime
--    LIBRARY DESTINATION lib COMPONENT Runtime
--    ARCHIVE DESTINATION lib COMPONENT Development)
-+    RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
-+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development)
-   INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
- ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
- 
-diff --git a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt
-index 5ee026c..66ba1b3 100644
---- a/forbind/CMakeLists.txt
-+++ b/forbind/CMakeLists.txt
-@@ -14,7 +14,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
- find_library( NETCDF_LIBRARY
-    NAMES netcdf
-    PATHS "$ENV{ACCESS}/lib"
--         "$ENV{NETCDF_DIR}/lib"
-+         "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}"
- 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
- )
- 
-@@ -28,14 +28,14 @@ find_program (NETCDF_NCDUMP ncdump
- find_library( HDF5_LIBRARY hdf5
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
- find_library( HDF5HL_LIBRARY hdf5_hl
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
-@@ -61,9 +61,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
- 
- IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
-   INSTALL(TARGETS exoIIv2for
--    RUNTIME DESTINATION lib COMPONENT Runtime
--    LIBRARY DESTINATION lib COMPONENT Runtime
--    ARCHIVE DESTINATION lib COMPONENT Development)
-+    RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
-+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development)
-   INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development)
- ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
- 
diff --git a/sci-libs/exodusii/files/exodusii-6.09-multilib.patch b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
index 3b1b5e2ace7f..5463fba50019 100644
--- a/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
+++ b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
@@ -1,6 +1,6 @@
-diff -Naur exodus-6.09.orig/exodus/cbind/CMakeLists.txt exodus-6.09/exodus/cbind/CMakeLists.txt
---- exodus-6.09.orig/exodus/cbind/CMakeLists.txt	2016-05-10 13:20:06.408385120 -0600
-+++ exodus-6.09/exodus/cbind/CMakeLists.txt	2016-05-10 13:22:35.378385120 -0600
+diff -Naur a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt
+--- a/cbind/CMakeLists.txt	2016-05-10 13:20:06.408385120 -0600
++++ b/cbind/CMakeLists.txt	2016-05-10 13:22:35.378385120 -0600
 @@ -293,9 +293,9 @@
  
  IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
@@ -14,9 +14,9 @@ diff -Naur exodus-6.09.orig/exodus/cbind/CMakeLists.txt exodus-6.09/exodus/cbind
    INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
  ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
  
-diff -Naur exodus-6.09.orig/exodus/CMakeLists.txt exodus-6.09/exodus/CMakeLists.txt
---- exodus-6.09.orig/exodus/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
-+++ exodus-6.09/exodus/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
++++ b/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
 @@ -27,7 +27,7 @@
  find_library( NETCDF_LIBRARY
     NAMES netcdf
@@ -43,9 +43,9 @@ diff -Naur exodus-6.09.orig/exodus/CMakeLists.txt exodus-6.09/exodus/CMakeLists.
    $ENV{NETCDF_DIR}/libsrc/.libs
    /usr/local/hdf5/lib
    )
-diff -Naur exodus-6.09.orig/exodus/forbind/CMakeLists.txt exodus-6.09/exodus/forbind/CMakeLists.txt
---- exodus-6.09.orig/exodus/forbind/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
-+++ exodus-6.09/exodus/forbind/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
+diff -Naur a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt
+--- a/forbind/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
++++ b/forbind/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
 @@ -14,7 +14,7 @@
  find_library( NETCDF_LIBRARY
     NAMES netcdf
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 3e155f1cba33..6df23c34f961 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -9,5 +9,5 @@ AUX gdal-2.3.0-libtiff.patch 306 BLAKE2B 8f2b39c812ceeee94b95102638885d0ff25086d
 DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab
-EBUILD gdal-2.3.1.ebuild 7988 BLAKE2B 62f4a17522a39a3fb054be6e4d516d3795a3f63481f13bb4a43dbf2fb1c7e62de4f5e9297ffa5bd37eec977acf01c4794c298c342f7544f3fb589c76eee9d0f7 SHA512 674bee0f3e1b2094186ec76255dd252c045642ad9a30619a346dc4fc4f2d65ba9586a02d806a39537dfabff6eb8a96f1ea01139f716b333682e161bd807c52cb
+EBUILD gdal-2.3.1.ebuild 8013 BLAKE2B 8b4b8c647241b9828a6860327c2e58165882417945998029c811a4008c5f12770d811448a993f46bcf5681d7911af63986c9cb4bbcb985e972659db415ecf0db SHA512 fd61d52be4f9529c50b0b6ab6d62fff932cc5e57ef69572d2d4ef6a1ef88cafcc6ef5a59a53e8b0fe663197f60379b0a3665fc756be619a546d1eed0a0faa1ef
 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index e1f97f524f2e..65af4595613d 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -276,6 +276,7 @@ src_compile() {
 src_install() {
 	if use perl ; then
 		pushd "${S}"/swig/perl > /dev/null || die
+		myinst=( DESTDIR="${D}" )
 		perl-module_src_install
 		popd > /dev/null || die
 		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index e20aeee6e652..4598bef808ef 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -2,5 +2,5 @@ AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb1
 DIST geos-3.6.2.tar.bz2 2030705 BLAKE2B f23cf1fc080fb7b353fb6292900d84811ace04a5364200bfea19f79d7b09a795d36e30cd6e4dbb7acd8417245bc2ce644298dc1b4140ef70495e4f7d71fc522b SHA512 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016
 DIST geos-3.7.0.tar.bz2 2028814 BLAKE2B 17385d9be831d4812391a30627e13989d3ca099ca9b0a719a92cdb2503dadff3693d4b3d320652764185db05782b33760ca14d155365d87167bb4ef6d6c2463c SHA512 fcca5e503efa32bb388376b2a06b9ca5c74fbcddba750cce6b3b4109eb2eb122058aead12b9462cdd881f425cd75d7241645ab344f25ce022bc0659954560742
 EBUILD geos-3.6.2.ebuild 1342 BLAKE2B 2cdc55473a3c7e2f4cf45b77de88e3e359598e1b9a7f6ee33d221474853ad191c61692ed84b1648204fe71b4e8c3fec70710725a1f30f4c81c89c3607db6e51a SHA512 91f4a1f15927b151e2d7811410dfa3cf4ccee0a667751eb05f6ebdcaa12b2a8c38e0c6ce08018f22da7bb7220ac77846a5975d4dd439c230eb326718a03ea6ba
-EBUILD geos-3.7.0.ebuild 1348 BLAKE2B b1d14ccab7424bd6f3789fed0f482a3ba7729b87db3645e68c15aa17eee3e44eac3be356e7113db6052b916506113a08e37a7f3d92e0f5ddc8c615a98e7b4f68 SHA512 8bc9a1d54600f1092eace39c7d5ee120baa820d4338580bc7bb2ef4613e597986185e72d883983afd59bf07c6b195a3eff6a79ed8b115a09e4d5c508f62b8f3a
+EBUILD geos-3.7.0.ebuild 1341 BLAKE2B 63aea3f6575420ac79fff622b78a0163e50c869a834aae6cd1a3c0d4b987ad8cf828c134315c3614ded327cee90fe90ecc53fb8e125613b767de4ace789ed2a9 SHA512 11defd6dcdc8a34580a6c9b1b55a6dd6adf95a44882b13627b12b6e206979f3ade8938a40a4c06f6eb51146bd34fa8574d62323a2c9dc628b6e95c6bcd4b9d2b
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.7.0.ebuild b/sci-libs/geos/geos-3.7.0.ebuild
index 230e09c56c97..0fff8e009461 100644
--- a/sci-libs/geos/geos-3.7.0.ebuild
+++ b/sci-libs/geos/geos-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index 98e435bacbc9..697ae3ec174a 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1,5 +1,3 @@
-DIST ignition-math3_3.2.0.tar.bz2 382201 BLAKE2B 79d0450356d931e3150afddd8f0d558923c6a27be4a56566ba18c6dc654b61b32acb92eff2ce5a87228bd512058e4b68d85b26bbbf1ac6a6c6af617b5ebcf59e SHA512 ffb5d61105ba0951c6420c53d64b47bdd65bdcac17e8ef2ce7cb83aeb2310280e5acb4d029d1af5c05fb5c40accf05df61d1e04dc990225159f1749284e3dcf1
 DIST ignition-math4_4.0.0.tar.bz2 387717 BLAKE2B 1b19bcd377eb18b616a300e022419ba2651795e04c0f0a3769f565e6febdc1a37f321c81730e1c13c9f9b17f35e6cf558d1129b278b2477ec8d5a5f46b927d66 SHA512 4815c6222945fd228b2d23c9da7ad8876f8ba1fea382312e1eb320819ec5d8bbf637095c18dbe2413184bbea77040bd1a5492ea9427355fc5e62f6169277530e
-EBUILD ignition-math-3.2.0.ebuild 881 BLAKE2B b22579cc9846ff35aa82bbcc84565881803a180ccb52bf675d0fd80fb58a5f386d014e8f14b2b91602f3ab8450a9caaec6bef4dbcf6656dd0d67201fd4de8ffa SHA512 f13343d8a98b7e40e2e9c67142831fcd52e86aa42246cd5c8ea81f3821518746e9786fb9ea81b2b205a4841557f33f6d0ed389f758a112f29905646d7b60284c
 EBUILD ignition-math-4.0.0-r1.ebuild 574 BLAKE2B 8c5a200993a7b60fca7b899c7df9986c91f4f378eccf710f123869bdca2c58ef78ade67e513b78c0fb2418cd802bab708392bfda8cb247e01e67241911880e50 SHA512 3b6bf6e3089ce46f58352ae80585235189494cc07dc3f4dfccca791d03de21e59e3594bd0be3b05e57555279435642d80569c98ce2804ea4e456f91de9a55cf2
 MISC metadata.xml 342 BLAKE2B 6b306ac4d7ec4a09c238f7b8c048589b7937b8a1e1e0573658ece2217054cb8a47da6e77d75439472dce378a4f4b1390ce8517352aa486db323a594f2a576131 SHA512 8969e6c2df55cfae7cc21640498871d7049499d146d06b13057701e742e9ef6f2c5124acd144b9e7f0974ea39032e89402252e32192242697555c64d90eb4b4a
diff --git a/sci-libs/ignition-math/ignition-math-3.2.0.ebuild b/sci-libs/ignition-math/ignition-math-3.2.0.ebuild
deleted file mode 100644
index a4ba79c991d3..000000000000
--- a/sci-libs/ignition-math/ignition-math-3.2.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
-
-inherit cmake-multilib vcs-snapshot flag-o-matic
-
-DESCRIPTION="A small, fast, and high performance math library for robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libraries/math"
-SRC_URI="https://bitbucket.org/ignitionrobotics/ign-math/get/${PN}3_${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3/3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}3_${PV}"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_configure() {
-	# upstream appends this conditionally...
-	append-flags "-fPIC"
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	cmake-multilib_src_configure
-}
diff --git a/sci-libs/lemon/Manifest b/sci-libs/lemon/Manifest
index 444f153062fa..ba25fca14284 100644
--- a/sci-libs/lemon/Manifest
+++ b/sci-libs/lemon/Manifest
@@ -1,5 +1,5 @@
 AUX lemon-1.3-as-needed.patch 1346 BLAKE2B 9c198c0062a47f2da724149a147bd2ab1b798df60ec5a8945249b9d8c09ab94094458ba6df7fc9d17b7e51f57f1268432e2ec3086013b3cd0f174af0ffe1c896 SHA512 20aef0cfc1b6884604a3cf1f4a60feb688ab4d1a958314c242e965195d6cc950062f67f7ef273fc096fe5fcd7a7ee9acb76215c1a6a173587da3b5e76b163468
-AUX lemon-1.3-multilib.patch 437 BLAKE2B aea3b751939620ec8ddc10f586404501b05d5a935d612fd8cb9db2336d728a87cdb0d0c1a9adf541b2e0247cf87b4039ba85bf546cf2fe69377bbbd1081888bc SHA512 6efd7280070bae7bf7e62b28fb6a99e5f2190ddff75f8dd500a629c2a60908670c3ea19aeaf0086059ba9c3c7439e0c835811684dc1c2525c4f8a304a36bba8c
-DIST lemon-1.3.tar.gz 5454290 BLAKE2B f204b84d6ce82d1e942597e40c3b35e0a218d110017bc74d8982d09270e2d94e260e2a62e818e88d69a56a75886a60343b787e2cf05d581b5e520faaf2c73b02 SHA512 f48c14e42e0a463a3d203a05a012fdf635cf09503a5d18e14e64722e9f7f68d7fc223059e0a6a5d118491a473a25196d531e0a6302552f9fb8c121a4ed70af45
-EBUILD lemon-1.3-r2.ebuild 1822 BLAKE2B 84dcdcb8951c75f8ca3898b091b5805af8846f1a474bd22c564c262507c535026dff99e9d2acc30ebd9adb0a9a6dee8a58efe1b96433d476116b1a018280ef9b SHA512 d9fc4a966c4cbfe05f034acc1a3ce8d789aa2b7daeded6bbe95ccc00433ca222e54d78ff9ab6de3b100891058cf3928d7800e27272f80c804c90e99122eb80e8
-MISC metadata.xml 969 BLAKE2B 441103bb2e1358e30c137760af47dd6151f14c54e99ef7dac8cec16f92e4e53150aa38dbd22a18d5bd0f4c794b2a6e78b05c98c9b1a75b6053b5c59ba9d334c3 SHA512 2d83367611c99baa4a589677c752344b4d72ec460456d99ff1cc030f202df32e680b871159532cf5d06472dda596919e8edc23872eb166e25277015c38b9c9e8
+AUX lemon-1.3.1-multilib.patch 841 BLAKE2B 416a2cff88fd4cb1f07a10a9bfe1ca1861c82c70055a30a900bcd622c307b2bd34f87eb1731b6dbe19e1b6e68148cb9d020082cc13ddd24ae375e0db9d0909f6 SHA512 4e31feda5672bcc02bad95d2b794aa2df9d028c655f157f2f95ba0d75679dce68a2cd54e5aa7c6e61f8eec71b7801e57456ca1def3c50d67c17e16a195b9efed
+DIST lemon-1.3.1.tar.gz 5142826 BLAKE2B 23d3b637b4dd32d73bb053b4f5d032e16be787ba162eed6df793f65b81efef6d7ca66d6e5a483b75ac7b1ddb7c8a2698b3b13eb16fcd44e0b726052290082bee SHA512 715eb45e790c908e41de4c13e68b7880e1d86c54eca53f896c95b6bc411ded504f3f768bed9d63562ed4adad53167fb3a7828c67456fdea645a5d0a94ae2e038
+EBUILD lemon-1.3.1.ebuild 1922 BLAKE2B 1593132815565bc5765507d6834bd6fe233ce6fac41dc01fa77a2e3fa4209c867df336208d8f513670c2b926f2edf6b8e48e7994bdcc013be06d527e2de5537d SHA512 8895c41d7bbed07e57dac8cad33b938c0b859702983a21e92235d768cd27c42fb6a24ce140b4bbed7348def71ded6cfd2a8fa129e9ab5fdbb67031a19a64fefa
+MISC metadata.xml 813 BLAKE2B 1f398a318d3bdf0b2929a992e80f64df34fa71dbb118de41ae369d46b5c1b763bbedf0b623a056e71ecb98befe5b6dbd6fa29fa71ffe3dd2735f2c5911871580 SHA512 a95dba8ed4531ca6563f4a9582933215f7136d13c3ead6d5a0ff5ff765c66d3f085c31908ed547297e28afd6a5ce7d0368f85b8053f8f9ab95da26db667a2afc
diff --git a/sci-libs/lemon/files/lemon-1.3-multilib.patch b/sci-libs/lemon/files/lemon-1.3-multilib.patch
deleted file mode 100644
index ee578d4a0f6a..000000000000
--- a/sci-libs/lemon/files/lemon-1.3-multilib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- lemon/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
-index 8011833..0209acf 100644
---- a/lemon/CMakeLists.txt
-+++ b/lemon/CMakeLists.txt
-@@ -61,8 +61,8 @@ ENDIF()
- 
- INSTALL(
-   TARGETS lemon
--  ARCHIVE DESTINATION lib
--  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib${LIB_SUFFIX}
-+  LIBRARY DESTINATION lib${LIB_SUFFIX}
-   COMPONENT library
- )
- 
diff --git a/sci-libs/lemon/files/lemon-1.3.1-multilib.patch b/sci-libs/lemon/files/lemon-1.3.1-multilib.patch
new file mode 100644
index 000000000000..f2b3cd6bf00c
--- /dev/null
+++ b/sci-libs/lemon/files/lemon-1.3.1-multilib.patch
@@ -0,0 +1,31 @@
+--- a/lemon/CMakeLists.txt	2014-07-07 16:40:24.911315501 +0200
++++ b/lemon/CMakeLists.txt	2018-10-15 22:13:12.040890710 +0200
+@@ -66,8 +66,8 @@
+ 
+ INSTALL(
+   TARGETS lemon
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib${LIB_SUFFIX}
++  LIBRARY DESTINATION lib${LIB_SUFFIX}
+   COMPONENT library
+ )
+ 
+@@ -86,6 +86,6 @@
+ 
+ INSTALL(
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
+-  DESTINATION lib/pkgconfig
++  DESTINATION lib${LIB_SUFFIX}/pkgconfig
+ )
+ 
+--- a/lemon/lemon.pc.in	2014-07-07 16:40:24.949315716 +0200
++++ b/lemon/lemon.pc.in	2018-10-15 22:45:28.869931587 +0200
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: @PROJECT_NAME@
diff --git a/sci-libs/lemon/lemon-1.3-r2.ebuild b/sci-libs/lemon/lemon-1.3-r2.ebuild
deleted file mode 100644
index 4ebb5c672099..000000000000
--- a/sci-libs/lemon/lemon-1.3-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="C++ template static library of common data structures and algorithms"
-HOMEPAGE="https://lemon.cs.elte.hu/trac/lemon/"
-SRC_URI="http://lemon.cs.elte.hu/pub/sources/${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+coin doc glpk static-libs test tools"
-
-RDEPEND="
-	glpk? ( sci-mathematics/glpk:= )
-	coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/ghostscript-gpl
-		dev-libs/mathjax
-		app-doc/doxygen )"
-
-REQUIRED_USE="|| ( coin glpk )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-as-needed.patch
-)
-
-src_prepare() {
-	sed -i \
-		-e '/ADD_SUBDIRECTORY(demo)/d' \
-		CMakeLists.txt || die
-
-	use doc || sed -i \
-		-e '/ADD_SUBDIRECTORY(doc)/d' \
-		CMakeLists.txt || die
-
-	use tools || sed -i \
-		-e '/ADD_SUBDIRECTORY(tools)/d' \
-		CMakeLists.txt || die
-
-	use test || sed -i \
-		-e '/ADD_SUBDIRECTORY(test)/d' \
-		CMakeLists.txt || die
-
-	for t in \
-		max_clique \
-		max_flow \
-		graph_utils \
-		random \
-		time_measure \
-		tsp; do
-		sed -i -e "/${t}_test/d" test/CMakeLists.txt || die
-	done
-	sed -i \
-		-e '/ADD_TEST(lp_test lp_test)/d' \
-		-e '/ADD_DEPENDENCIES(check lp_test)/d' \
-		test/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=TRUE
-		-DCOIN_ROOT_DIR="${EPREFIX}/usr"
-		-DLEMON_DOC_MATHJAX_RELPATH="${EPREFIX}/usr/share/mathjax"
-		$(cmake-utils_use doc LEMON_DOC_SOURCE_BROWSER)
-		$(cmake-utils_use doc LEMON_DOC_USE_MATHJAX)
-		$(cmake-utils_use coin LEMON_ENABLE_COIN)
-		$(cmake-utils_use glpk LEMON_ENABLE_GLPK)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" check
-}
diff --git a/sci-libs/lemon/lemon-1.3.1.ebuild b/sci-libs/lemon/lemon-1.3.1.ebuild
new file mode 100644
index 000000000000..3a35fa7919de
--- /dev/null
+++ b/sci-libs/lemon/lemon-1.3.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="C++ template static library of common data structures and algorithms"
+HOMEPAGE="https://lemon.cs.elte.hu/trac/lemon/"
+SRC_URI="https://lemon.cs.elte.hu/pub/sources/${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+coin doc glpk static-libs test"
+
+REQUIRED_USE="|| ( coin glpk )"
+
+RDEPEND="
+	coin? (
+		sci-libs/coinor-cbc:=
+		sci-libs/coinor-clp:=
+	)
+	glpk? ( sci-mathematics/glpk:= )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		app-text/ghostscript-gpl
+		dev-libs/mathjax
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${PN}-1.3-as-needed.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	cmake_comment_add_subdirectory demo
+
+	use doc || cmake_comment_add_subdirectory doc
+	use test || cmake_comment_add_subdirectory test
+
+	for t in \
+		max_clique \
+		max_flow \
+		graph_utils \
+		random \
+		time_measure \
+		tsp; do
+		sed -i -e "/${t}_test/d" test/CMakeLists.txt || die
+	done
+	sed -i \
+		-e '/ADD_TEST(lp_test lp_test)/d' \
+		-e '/ADD_DEPENDENCIES(check lp_test)/d' \
+		test/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=TRUE
+		-DLEMON_ENABLE_COIN=$(usex coin)
+		-DLEMON_ENABLE_GLPK=$(usex glpk)
+	)
+	use coin && mycmakeargs+=( -DCOIN_ROOT_DIR="${EPREFIX}/usr" )
+	if use doc; then
+		mycmakeargs+=(
+			-DLEMON_DOC_MATHJAX_RELPATH="${EPREFIX}/usr/share/mathjax"
+			-DLEMON_DOC_SOURCE_BROWSER=$(usex doc)
+			-DLEMON_DOC_USE_MATHJAX=$(usex doc)
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	# TODO: Upstream needs to see the light of GNUInstallDirs
+	if use doc; then
+		mv "${D}"/usr/share/doc/lemon/html "${D}"/usr/share/doc/${PF} || die
+		rmdir "${D}"/usr/share/doc/lemon || die
+	fi
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" check
+}
diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index 1802bf9066b2..92e66a920f00 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>mmokrejs@gmail.com</email>
-  <name>Martin Mokrejs</name>
-</maintainer>
-<maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription>
-  LEMON stands for Library for Efficient Modeling and Optimization in
-  Networks. It is a C++ template library providing efficient
-  implementations of common data structures and algorithms with focus
-  on combinatorial optimization tasks connected mainly with graphs and
-  networks.
-</longdescription>
-<use>
-  <flag name="coin">Enable the <pkg>sci-libs/coinor-clp</pkg> and
-  <pkg>sci-libs/coinor-cbc</pkg> graph algorithms</flag>
-  <flag name="glpk">Enable GNU Linear Programming Kit
-  <pkg>sci-mathematics/glpk</pkg> support</flag>
-  <flag name="tools">Build additional tools</flag>
-</use>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		LEMON stands for Library for Efficient Modeling and Optimization in
+		Networks. It is a C++ template library providing efficient
+		implementations of common data structures and algorithms with focus
+		on combinatorial optimization tasks connected mainly with graphs and
+		networks.
+	</longdescription>
+	<use>
+		<flag name="coin">Enable the <pkg>sci-libs/coinor-clp</pkg> and <pkg>sci-libs/coinor-cbc</pkg> graph algorithms</flag>
+		<flag name="glpk">Enable GNU Linear Programming Kit <pkg>sci-mathematics/glpk</pkg> support</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 282c5bc473df..d1768de69031 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -5,6 +5,6 @@ DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183
 DIST libsigrok-0.5.0.tar.gz 1560400 BLAKE2B 2093a7f2855708ef5b8d260fb6721c1ed66cade65ceecdce5808d4edf97f65026755586ca28888969417c19b89bde46b0b786287dcf0bf554d8faba42f8f51a9 SHA512 56129da97830d9c98c73612a6ce21664b4365aafa2939c1dd9e4ff3f7397b3a07f82684b3d34fc998acd32a04f17a7a629dde455e4ed6310f0075dabaae0e5ec
 EBUILD libsigrok-0.3.0.ebuild 1700 BLAKE2B 33dc1607eb3aaf38b7547fafe90940b3cf3b539fd257d394ee27225d3c40fea9d9d349a1ecaf8b7b4c99b6a57e590aae4c9b5225e6baf514d2bdfe47c4043107 SHA512 73f17a46ea7bfb003dc1ac6be3b32e43bffe2bbe135c6f5c667419ecae5ee0a57f77377d2eb69113e8e50cd25b73f123dffa2711a64837a1035841f3f4d7df43
 EBUILD libsigrok-0.4.0.ebuild 2115 BLAKE2B f15bc1e01ea4cc389148eb6b3ebc5bc6f1ef42d14662888562ca48a1e1f5a1afe639ebd7755e36994675a461f4c4ac85e962efb4467503d9926ce4f06b51b2c9 SHA512 c0106ee8b697b6932a1ea69721b51e43d84d145ba9050e79afc3dc2e97303f93e73f2e8717a3ea4e6f522ec68830382def004283d32807be5bac647e47f78c4d
-EBUILD libsigrok-0.5.0.ebuild 2115 BLAKE2B b12bec2ba2253be3b93e9e78aa9328ccb0f280c340a71e6aa90dfb560b416ff52a24013f162f4c3cc8896a1b996e63c54ed1ccb520f86e69d3750b11e37083c9 SHA512 0674f759ab0af36e929bccca0867baa9e7b2e38e773222f9c664492766b1ba95c168e2bdd152b69a04a3e97752e4c40e9300cfb80b66417d16a5f236c5eca7f0
-EBUILD libsigrok-9999.ebuild 2118 BLAKE2B 88769b3e391af7d2e077aec987366235e939c80431eb17c023fce2ac4497fef812b8cdac1b5a3d89b8693cbb23e814b5e76defc28c09d05fa298f09c8f7b1912 SHA512 3bf83e9cfad8129dca24c5a61fe984120d3f307923b8a00a3539da823f9e17ded92865883ca65b3c586ae05d7629b6e27931df873c78ebe96667463c4e0ddaa0
+EBUILD libsigrok-0.5.0.ebuild 2285 BLAKE2B 7a0d70723315dcd5f1c012d3730e3e3c44b69f92f91fb02c2a3f5a3a4c85b90ca5c4694f020a27fa7ded5833de515c3679951520fcac0d07fcd76f12b2f832d8 SHA512 0f2ae431afbcdf3b4df3ff48a59d44406d70b8b75fc02129229643f8a5afb2ca31f82df7e6c192412416efb975ee270f699e13dca707246d5cf98fde1b59a11c
+EBUILD libsigrok-9999.ebuild 2288 BLAKE2B d10e435f1b15d58980ddbc9d89c49b68502d2d95ba3fad33b08f2ff916bfae7c3cbf3ddf82b2e4d62e8d94ad09481f5d2c199e29823cf8ab6e40757357520307 SHA512 1c04d587e6adda41c877ea5d8f0a07a89f354b757d1f412d9b91c85a7c575825cce4ff56049eae82d019c7078f0da7644bfe8237358b2ce24f9927098bd34925
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
index 2119698af8f7..8d56edf96992 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit eutils python-single-r1 java-pkg-opt-2
+inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -80,3 +80,13 @@ src_install() {
 	default
 	prune_libtool_files
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index c3a463fbec8a..aeb0f3c4579d 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit eutils python-single-r1 java-pkg-opt-2
+inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -80,3 +80,13 @@ src_install() {
 	default
 	prune_libtool_files
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
new file mode 100644
index 000000000000..3877c6abcc6f
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -0,0 +1,5 @@
+AUX linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd605bd68100726bbcc8d96fa457caabfb91cbc17ce37e61194ac32e573acc797d71c448454d03e6202ec331cb25c056f8ee7b78829 SHA512 6f6b25695ae81671a93e8b86978ea1ef9e71ba5a38d14ad95b9a6aa59704bb2d6a8064c1ac006b1e7c4740d059184d4d4cefef88a2fd0c2a09406f64f6597187
+AUX linux-gpib-modules-4.2.0_rc1-reallydie.patch 737 BLAKE2B 198c078a168071e04efcfdad11bf93c2682ab2f2160d7f93fc9c49fdcd2cbbe9174be53502fa5a2c0eedf448e0f438130646cfe902673383925156244a80bf5d SHA512 96b7e459da514f4a4f84e746a3121baa0076c479ad435fd182a90714aeec21d32dcdbb6871deacab532c722e89970aa7cbccbcbea494195dfa86c7ebb95142d9
+DIST linux-gpib-kernel-4.2.0_rc1.tar.gz 332525 BLAKE2B e84f9da9902d139474cf68e49922f7b402c6d11113eab8c009683c1b4304a505eb6aba86a60b019e4d3ad0ef1d003c743f14f60b61b3d7f31e8aeca99a4a16c1 SHA512 8bf1a2b04d6128c513c5d13549fb95e563e719e43ffb3b303fc5aa2376f57a69774c1afdb901281933f6b253068461ce59bd9564146a0c5a6483e1ccc47d259f
+EBUILD linux-gpib-modules-4.2.0_rc1.ebuild 1587 BLAKE2B 8e27c06ac44e9bbecf2925a9f93380fce2afcd110c37640ffb2ac8abf3c1471217ff601a0e0b831efce053de12ea10e03ef59dab561b0c2da56995f6b97d041f SHA512 d8d26687c404bada61b92a4935f3c7e0680488dc0f8cb8e3fdf1e71feebc95ec7279459009bc217080063e163b875d1e1a99570c6a9fd8db8fd2be6aba78eec6
+MISC metadata.xml 638 BLAKE2B 6367f8fe90e75e2a3593d5d79ae09e6c75fa990ae037b58cba80ecdc4f7023a5b116ee2d6eadcdd6960133cd08a5103ebd1870906e2136af064a048603bb2562 SHA512 0bce2e72363ccdec78efa46158bade5135cae3d2d7b97de6836c4708f5823f2c1539f7441f0382061c4e0c4c7b5b1498bc5a4be6949b7dea015c873381010744
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch
new file mode 100644
index 000000000000..c3a9764924c2
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch
@@ -0,0 +1,10 @@
+--- linux-gpib-4.0.4rc2.orig/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c 2016-06-22 09:48:47.000000000 +0100
++++ linux-gpib-4.0.4rc2/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c  2017-05-02 00:59:04.509950834 +0100
+@@ -37,6 +37,7 @@
+ #include <linux/file.h>
+ #include <linux/timer.h>
+ #include <linux/delay.h>
++#include <linux/sched/signal.h>
+ #include <asm/uaccess.h>
+
+ #include "gpibP.h"
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
new file mode 100644
index 000000000000..cba29eece374
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
@@ -0,0 +1,15 @@
+diff -ruN linux-gpib-kernel-4.2.0_rc1.orig/drivers/Makefile.am linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am
+--- linux-gpib-kernel-4.2.0_rc1.orig/drivers/Makefile.am	2018-10-02 11:32:11.000000000 +0200
++++ linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am	2018-10-09 12:03:21.272433209 +0200
+@@ -14,10 +14,8 @@
+ 
+ -include $(top_srcdir)/util/linux_flags/flags
+ 
+-#ignore errors from kernel's make modules in all-local, to avoid failure of make install
+-#on nfs filesystem with root_squash
+ all-local:
+-	-$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
++	$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
+ 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/compat/include" \
+ 		CONFIG_GPIB_ISA="$(ENABLE_ISA)" \
+ 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
new file mode 100644
index 000000000000..b08d9a3d45a7
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod autotools toolchain-funcs
+
+MY_PN=${PN/modules/kernel}
+
+DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="isa pcmcia debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+	!<sci-libs/linux-gpib-4.2.0_rc1
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.0_rc1-reallydie.patch
+)
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+pkg_setup () {
+	linux-mod_pkg_setup
+
+	if kernel_is -lt 2 6 8; then
+		die "Kernel versions older than 2.6.8 are not supported."
+	fi
+
+	# https://sourceforge.net/p/linux-gpib/bugs/43/
+	if use pcmcia && kernel_is -ge 2 6 38; then
+		die "pcmcia support is broken on kernels newer 2.6.38"
+	fi
+}
+
+src_prepare () {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	set_arch_to_kernel
+	econf \
+		$(use_enable isa) \
+		$(use_enable pcmcia) \
+		$(use_enable debug driver-debug) \
+		--with-linux-srcdir=${KV_DIR}
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		DEPMOD="/bin/true" \
+		docdir=/usr/share/doc/${PF}/html install
+
+	dodoc ChangeLog AUTHORS README* NEWS
+}
+
+pkg_preinst () {
+	linux-mod_pkg_preinst
+	enewgroup gpib
+}
+
+pkg_postinst () {
+	linux-mod_pkg_postinst
+}
diff --git a/sci-libs/linux-gpib-modules/metadata.xml b/sci-libs/linux-gpib-modules/metadata.xml
new file mode 100644
index 000000000000..b53300ac1ed5
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
+  <use>
+    <flag name="isa">Build ISA kernel modules; from 3.12 on the setting is ignored and the decision based on the kernel configuration</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">linux-gpib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 073b7e3e5878..e1e4c01e9bb1 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -6,5 +6,5 @@ DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5d
 DIST linux-gpib-4.1.0.tar.gz 1529480 BLAKE2B b49df07f15d0f91b9d475052993421979d6776ef15aaa9b7e49632db9018f0cbd9ff38d12e2afa9e8027202e450dfc487ac9e2e6ab719086646d983cc41b3482 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8
 DIST linux-gpib-user-4.2.0_rc1.tar.gz 1098181 BLAKE2B 3f35eacfcffe04598322af6faed921b20b49959433b6e3c3a4bb2c0b9e3f71a2c00a13d7dec6b4e0bc415f1f8635945419805d5c9dec4ddcddb18fc7e8c5e7b4 SHA512 69d8b3059eab8d1d09006b4da13dbf3479c9a9d45e464767a13a2b1d6d32705e91e2800ca79015d302ea05e4fcbddb433dd817d208d751b6af8ac3867b7cee78
 EBUILD linux-gpib-4.1.0.ebuild 6110 BLAKE2B 354731c55d29f49b1aaca808c45128f7826b322555d5340fa9fd11481a9ec171bfa8cd365c5329f033e46f49d677c1a2a9f56cb8bc02e911224025de51505563 SHA512 29592c5c05b72e8a4263781636aa9a68b3d4e38743f5c7228a9ed449ab1e877141c5f238789e2942dbaa8c883439086c87321e55a7f8be653b91056b9f677656
-EBUILD linux-gpib-4.2.0_rc1.ebuild 4628 BLAKE2B ed09916953f4230719526614c74432ca5722e9a79ee2c5f87c8114442849dc691d5819a3170d3c786915fe6b0eece4c2ae9f1e1acb014b05c119f0b15d0b0f71 SHA512 f29ff1e34b82dd8bde3934b5d9732efe7352a61a8c48f5d94186c4c9398b7a1319ab1614c8145877e9706eb0780678ea82fb98938c42e36f84a371775c97fdf6
+EBUILD linux-gpib-4.2.0_rc1.ebuild 4564 BLAKE2B 2ef4a9d177727d993e5aa30163a055b01463cc8f161b8f23f3a1c2b56be18b03dbbc5c24fddadf755232a106392284447fae97541539776060bfafbc11008c2e SHA512 82188aa008de95105189777f0c47f2379eec67951698ffb60b096f02ace16d288f765678d03f801ca94e8e89dc9ad82a9d2653d42f36d78cef02c7210b23ee53
 MISC metadata.xml 688 BLAKE2B 405c816eb10feec819da0e5994c2ebe1e73ae4882cecf9f619bf30674b9ff499ae044cca42bad687d97cf3aef2a70eb826d5b07695cbde0c164a00cbac576e0a SHA512 d5af868c802d6c01b8267038cc5bdffc61677403ecb88cdfaf97f31d6b80d1e9318bcd507199d6a850df221cda2baf2869a1de4d732cde75a4aea2ec54f944b8
diff --git a/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild b/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
index b378c006c710..5bb251f06487 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
-inherit readme.gentoo-r1 versionator eutils autotools perl-functions python-single-r1 toolchain-funcs udev user
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev user
 
 DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
 HOMEPAGE="https://linux-gpib.sourceforge.io/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/${PN}-user-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="pcmcia static guile perl php python tcl doc firmware"
 
 S="${WORKDIR}/${PN}-user-${PV}"
@@ -28,7 +28,9 @@ COMMONDEPEND="
 	php? ( dev-lang/php:= )
 	python? ( ${PYTHON_DEPS} )
 	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}
+	~sci-libs/linux-gpib-modules-${PV}
+"
 DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 	doc? ( app-text/docbook-sgml-utils )
@@ -46,8 +48,6 @@ pkg_setup () {
 }
 
 src_prepare () {
-	[[ ${I_KNOW_WHAT_I_AM_DOING} == "1" ]] || \
-		die "This ebuild is work in progress. Do not use."
 	default
 	eautoreconf
 }
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index 3287a1a97f73..ae7b8d9d5389 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1,3 +1,5 @@
 DIST MUMPS_4.10.0.tar.gz 2481516 BLAKE2B ddd3f28bf9627806e9bb5597adc94e2b8f504adf220a8a64ea50630edbde75358bd97e91a53ebd341132a34db5d7248d32a892a060bdf8f205c8aac3b9c88722 SHA512 348df048618ea2086fbe805a90f2e31f57e0db4aa6f4843a0e3c7142bac80fe45e54768e65921657c970bc286b59c2bca91e5006ed8000678f26ba2efe2bfda8
+DIST MUMPS_5.1.2.tar.gz 3351215 BLAKE2B 1c77c2a217c101245a9a96a59be6b9bfd67ceffa603d807b5a7173026c5c33e2c4de78c14833d7b7f0a90130b9ebc0ac9c7d4ebfbf881d0bd2210a542887c239 SHA512 38a63b14a8df835be68b5fa310b39aa1815799220d56c176e4005797800959e9e08c9a6bf11d308ab82ea40b6f34d36072cebe7c1de39e0c314eb138b93f1b74
 EBUILD mumps-4.10.0-r1.ebuild 5585 BLAKE2B 6fa009a933a891b0b31284e0c3f206c21890d0379a502154526b3839cf5d2d67558a47790bcad641eabfef184d12cd09bf6eda8ff99b384fdef5ac65a99f768e SHA512 578f6584f115e6299bac629073701bd8534864693afa7c70f98ed6b0b4edc466e6f242733ec3baaec9b98c61f796a1d822ab10b2671fc90230fb2d73129310ea
+EBUILD mumps-5.1.2.ebuild 5592 BLAKE2B 59e2b9281ddbc2fc0d01eac5282ccbb67bec250899af1aac096ccb449091ee4120c5ca58e4d68906fc7c6759ea0b194ecf545447239fa6992ae96073eaf061e3 SHA512 1050b95e746486e6a3f302f396dd534e362c0baa1228456fcf31d80ac9330427b40f5b7aff281fc2489a73b6c27b16f1cd532e39a5fc6341086f3390b7195fb3
 MISC metadata.xml 864 BLAKE2B 78db103b861071cbad317a65db2bb1c7eafc6c3936728cf3854ea05e92210abbf552e01dcbc974dc5238fc1a432ad7ff48fab3d662ea6081ff70fd86263ac11b SHA512 c285d7ed4bd26bb603f40f9d5e4e7262aea8a2679d14f65a4f8959a9bf2c622310422790e6221708fa227cd2c3bb2f4ba140eb5f23acc71b3f1ca20c04c4711a
diff --git a/sci-libs/mumps/mumps-5.1.2.ebuild b/sci-libs/mumps/mumps-5.1.2.ebuild
new file mode 100644
index 000000000000..725e1ab60e64
--- /dev/null
+++ b/sci-libs/mumps/mumps-5.1.2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs flag-o-matic versionator fortran-2 multilib
+
+MYP=MUMPS_${PV}
+
+DESCRIPTION="MUltifrontal Massively Parallel sparse direct matrix Solver"
+HOMEPAGE="http://mumps.enseeiht.fr/"
+SRC_URI="${HOMEPAGE}${MYP}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples metis mpi +scotch static-libs"
+
+RDEPEND="
+	virtual/blas
+	metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 )
+		mpi? ( <sci-libs/parmetis-4 ) )
+	scotch? ( <sci-libs/scotch-6[mpi=] )
+	mpi? ( sci-libs/scalapack )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		[[ $(get_version_component_count) -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	sed -e "s:^\(CC\s*=\).*:\1$(tc-getCC):" \
+		-e "s:^\(FC\s*=\).*:\1$(tc-getFC):" \
+		-e "s:^\(FL\s*=\).*:\1$(tc-getFC):" \
+		-e "s:^\(AR\s*=\).*:\1$(tc-getAR) cr :" \
+		-e "s:^\(RANLIB\s*=\).*:\1$(tc-getRANLIB):" \
+		-e "s:^\(LIBBLAS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs blas):" \
+		-e "s:^\(INCPAR\s*=\).*:\1:" \
+		-e 's:^\(LIBPAR\s*=\).*:\1$(SCALAP):' \
+		-e "s:^\(OPTF\s*=\).*:\1${FFLAGS} -DALLOW_NON_INIT \$(PIC):" \
+		-e "s:^\(OPTC\s*=\).*:\1${CFLAGS} \$(PIC):" \
+		-e "s:^\(OPTL\s*=\).*:\1${LDFLAGS}:" \
+		Make.inc/Makefile.inc.generic > Makefile.inc || die
+	# fixed a missing copy of libseq to libdir
+
+	default
+}
+
+src_configure() {
+	LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
+	local ord="-Dpord"
+	if use metis && use mpi; then
+		sed -i \
+			-e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs parmetis):" \
+			-e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags parmetis):" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs parmetis)"
+		ord="${ord} -Dparmetis"
+	elif use metis; then
+		sed -i \
+			-e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs metis):" \
+			-e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags metis):" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs metis)"
+		ord="${ord} -Dmetis"
+	fi
+	if use scotch && use mpi; then
+		sed -i \
+			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \
+			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"
+		ord="${ord} -Dptscotch"
+	elif use scotch; then
+		sed -i \
+			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lesmumps -lscotch -lscotcherr:" \
+			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"
+		ord="${ord} -Dscotch"
+	fi
+	if use mpi; then
+		sed -i \
+			-e "s:^\(CC\s*=\).*:\1mpicc:" \
+			-e "s:^\(FC\s*=\).*:\1mpif90:" \
+			-e "s:^\(FL\s*=\).*:\1mpif90:" \
+			-e "s:^\(SCALAP\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs scalapack):" \
+			Makefile.inc || die
+		export LINK=mpif90
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs scalapack)"
+	else
+		sed -i \
+			-e 's:-Llibseq:-L$(topdir)/libseq:' \
+			-e 's:PAR):SEQ):g' \
+			-e "s:^\(SCALAP\s*=\).*:\1:" \
+			-e 's:^LIBSEQNEEDED =:LIBSEQNEEDED = libseqneeded:g' \
+			Makefile.inc || die
+		export LINK="$(tc-getFC)"
+	fi
+	sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die
+}
+
+src_compile() {
+	# Workaround #462602
+	export FAKEROOTKEY=1
+
+	# -j1 because of static archive race
+	emake -j1 alllib PIC="-fPIC"
+	if ! use mpi; then
+		#$(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
+		LIBADD+=" -Llibseq -lmpiseq"
+		static_to_shared libseq/libmpiseq.a
+	fi
+	static_to_shared lib/libpord.a ${LIBADD}
+	static_to_shared lib/libmumps_common.a ${LIBADD}
+
+	local i
+	for i in c d s z; do
+		static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common ${LIBADD}
+	done
+	if use static-libs; then
+		emake clean
+		emake -j1 alllib
+	fi
+}
+
+src_test() {
+	emake all
+	local dotest
+	if use mpi; then
+		dotest="mpirun -np 2"
+	else
+		export LD_LIBRARY_PATH="${S}/libseq:${LD_LIBRARY_PATH}"
+	fi
+	cd examples
+	${dotest} ./ssimpletest < input_simpletest_real || die
+	${dotest} ./dsimpletest < input_simpletest_real || die
+	${dotest} ./csimpletest < input_simpletest_cmplx || die
+	${dotest} ./zsimpletest < input_simpletest_cmplx || die
+	einfo "The solutions should be close to (1,2,3,4,5)"
+	${dotest} ./c_example || die
+	einfo "The solution should be close to (1,2)"
+	make clean
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)*
+	use static-libs && dolib.a lib/lib*.a
+	insinto /usr
+	doins -r include
+	if ! use mpi; then
+		dolib.so libseq/lib*$(get_libname)*
+		insinto /usr/include/mpiseq
+		doins libseq/*.h
+		use static-libs && dolib.a libseq/libmpiseq.a
+	fi
+	dodoc README ChangeLog VERSION
+	use doc && dodoc doc/*.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/sci-libs/nemesis/Manifest b/sci-libs/nemesis/Manifest
index 0609bc6ff5d4..8cf7c806ed8c 100644
--- a/sci-libs/nemesis/Manifest
+++ b/sci-libs/nemesis/Manifest
@@ -1,7 +1,4 @@
-AUX nemesis-5.22b-multilib.patch 1885 BLAKE2B 1c678e89e5b5f0ba7d13b5bc258c343d727a93ae32ff1eb64a3de352ad0d9d189433537ab22c8547167adfda95257ecd144016d505a087b9dcab440ce666687c SHA512 d068f9d2f35b306fe9c57b41a065c8c6aea85bfa1f0b4d42c538a17c3563840c014cc0b0f93da79a5bfd98d5c8e6007d6f99d03e92aa534278b90871e7da663d
-AUX nemesis-6.09-multilib.patch 1649 BLAKE2B 620cc881f48b925e4b50fb8306d190ba64ee5bd76d752bb4208a733ece871486964260771096c1894db8a77b28461035ff95e09793bd5a5d5a1ebb5f2ff6d151 SHA512 db01d3afe33bc2f30868e5ceceb4fbe5a0eb10c08b39a72f2d3cb0d363eb837c79bd62e4590a0013602419ecfcb6dcc33eaf656e670d2b25600409e8b07890e7
-DIST exodus-5.24.tar.bz2 4252980 BLAKE2B 44c0233077a3dbcba11e79643e2b81c5529e21b0c447e8621f5247817df95f91ee992091135d8ead694f5817e4575eb88825a0e90703b332c79164c91cfb828b SHA512 d31cf17d2112b625259a70a7f73609323b94a3eed77be3b09961e67518d1b8caf82617a18f8c651fa6549988aa9a02455aea04402463b4fb7e66dd4e15b7e87e
+AUX nemesis-6.09-multilib.patch 1617 BLAKE2B 706800577f7ff5865e54502bbe2fb18d64a6c247880c30a1101ede1d27edb5fc3b6e7ffdd6d04c1e84e3b6c29b65042fb0839906ca81fee6971fbd2ea566738e SHA512 4b9b21b67a85c3f4a69a97de1676cd0c8fbc1285737412d0996822d8e1a0e19700e1c5e4990a0dc7cc92db5315415fc8af1d1f3a8a9dfe4fb11cf5cf13e59f27
 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
-EBUILD nemesis-5.24.ebuild 1073 BLAKE2B 520b7c8b97e70060d574e0a1f0e1aa1cf6293887b7c5dc034aaee496a6c01e58b5920ccb8b27a3da22477f6496620505d3305594efd5594f5d5d81a52569e897 SHA512 181b306208310225bd22dc328f7dc40c49279ff70a8b504063df2031a5e6ce4eae91b68d54699d6d39a8ba4f72738668dad71b17c0977eaa85dd741039e6bab6
-EBUILD nemesis-6.09.ebuild 994 BLAKE2B f04ec75808a19745daf6965352aa97f19d1b956818c74b8202d1c42ac1394bde3f6a3dced77fa181a37207a93a188c0b01327c887c86333093acf8835bee8c43 SHA512 e9e6e4c3d6c56816144f2d3ef8104a452fa042ec97484b619b0b4c9dee614896a41b89e6625c6c5dbbd57f041ff90ed9e53e3b863417620c7ff5ac0805153ac7
+EBUILD nemesis-6.09.ebuild 899 BLAKE2B 7419ff1d1fe6b888363f0220b014880553aee7fd6f55893c457cd9aaf26e0cf1982209ccb919c39734e1ba6cf3a32ace853c5772f32f0fb1859503556573594f SHA512 537f625ed53c0f361af88f4ddec033b06f25321a2717c4bbc3235f1c38949bf1f9a6ad0aa55eabae652ebe2ef7a9b3e07cbbdd3ade17705305ef01092da479dd
 MISC metadata.xml 1055 BLAKE2B 3ba3589e0f67d44da504eff1e008e0b6ac9b43b9e8eceac9089de61c8333b41b2c04db33bcfc6e3d52e1d083778bd49fdb2702154cebb0fca38e055a44f3b2ed SHA512 bf7702146727a7449c7a0988d64f0036809e3688801a2cca42a8f7a442e4f1f204c0101e50c3ffc98e4a04ee13cc01105c12bad3a480a0179574ae4d1ff6ac14
diff --git a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch b/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch
deleted file mode 100644
index b99add01ea56..000000000000
--- a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch
+++ /dev/null
@@ -1,57 +0,0 @@
- nemesis/CMakeLists.txt | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt
-index 64aff5d..bed5ede 100644
---- a/nemesis/CMakeLists.txt
-+++ b/nemesis/CMakeLists.txt
-@@ -19,7 +19,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
- find_library( NETCDF_LIBRARY netcdf
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   )
- 
-@@ -29,16 +29,17 @@ find_program (NETCDF_NCDUMP ncdump
-    $ENV{NETCDF_DIR}/ncdump
-    )
- 
--find_library( EXODUS_LIBRARY exodus
-+find_library( EXODUS_LIBRARY exoIIv2c
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
-+  $ENV{EXODUS_DIR}/${CMAKE_INSTALL_LIBDIR}
-   )
- 
- # Hack for HDF5
- find_library( HDF5_LIBRARY hdf5
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
-@@ -46,7 +47,7 @@ find_library( HDF5_LIBRARY hdf5
- find_library( HDF5HL_LIBRARY hdf5_hl
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
-@@ -79,8 +80,8 @@ ADD_EXECUTABLE(ne_test ne_ctest_wrap.c)
- TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
-  
- INSTALL(TARGETS nemesis
--  RUNTIME DESTINATION lib COMPONENT Runtime
--  LIBRARY DESTINATION lib COMPONENT Runtime
--  ARCHIVE DESTINATION lib COMPONENT Development)
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
- INSTALL(FILES ${HEADERS} DESTINATION include COMPONENT Development)
- 
diff --git a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
index d0f05f23a2d2..09b5c9a60377 100644
--- a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
+++ b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
@@ -1,10 +1,10 @@
  nemesis/CMakeLists.txt | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
 
-diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 64aff5d..bed5ede 100644
---- a/nemesis/CMakeLists.txt
-+++ b/nemesis/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -19,7 +19,7 @@
  find_library( NETCDF_LIBRARY netcdf
    $ENV{ACCESS}/lib/shared
diff --git a/sci-libs/nemesis/nemesis-5.24.ebuild b/sci-libs/nemesis/nemesis-5.24.ebuild
deleted file mode 100644
index 7a5a5b95805c..000000000000
--- a/sci-libs/nemesis/nemesis-5.24.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-MY_PN="exodus"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enhancement to the EXODUSII finite element database model"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-DEPEND="
-	sci-libs/exodusii
-	sci-libs/netcdf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}/${PN}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.22b-multilib.patch )
-
-src_prepare() {
-	find ../exodus -delete || die
-	cmake-utils_src_prepare
-	sed -i 's/exoIIv2c/NAMES exodus &/' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		-DEXODUS_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
-		$(cmake-utils_use test BUILD_TESTING)"
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}"/ne_test || die
-}
diff --git a/sci-libs/nemesis/nemesis-6.09.ebuild b/sci-libs/nemesis/nemesis-6.09.ebuild
index 4bd332e3b01c..3e18bd12f610 100644
--- a/sci-libs/nemesis/nemesis-6.09.ebuild
+++ b/sci-libs/nemesis/nemesis-6.09.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 MY_PN="exodus"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Enhancement to the EXODUSII finite element database model"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/certik/exodus"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
+IUSE="static-libs"
 
 DEPEND="
 	sci-libs/exodusii
@@ -32,13 +32,11 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		-DEXODUS_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
-		$(cmake-utils_use test BUILD_TESTING)
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 	)
+	export NETCDF_DIR="${EPREFIX}/usr/"
+	export EXODUS_DIR="${EPREFIX}/usr/"
 	cmake-utils_src_configure
 }
 
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 18879e3c5b07..a31c62ff7002 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -6,6 +6,6 @@ DIST netcdf-4.6.1.tar.gz 18201700 BLAKE2B 2dab9add736d0db3ad91fb1ccda63c200fe5a2
 EBUILD netcdf-4.3.2-r1.ebuild 1474 BLAKE2B 4a7ae70e9f5442edd52ebff9263ad517345dd5c930af61668b0a013789052a42aae892ad2816368735ef0963c139ef1446a769366fb67dd842bdfb969045e371 SHA512 b5927be5e0c9d3c2833acc9612e2148b7d9fe92a444f0d662a24ee27956f40e5f1be19341ca7fa4ebabf5c0354d4ea43de20553d3d180a32ecc13454e448336f
 EBUILD netcdf-4.4.0-r1.ebuild 1311 BLAKE2B b2a0e74d7ebba7bd0f7bcfd67be94ec68ff389993c568ff72be61e7b48642a62db3e6cfa2a6a9d0375b45274f5c801d1c2fcc0c476370808bdca7388b9b9559b SHA512 16743218eea2154354c57c02b2f3cf76b0c85d9f3d7afa2f7cdb660cbcd7199509fc72a9da6be6b188390ddabe790c29b167b8c33c12835a0a672ac5273df54c
 EBUILD netcdf-4.4.1.1.ebuild 1387 BLAKE2B 35be1dfd64aeb91426dc92850d40e1ea066c1c0aeb29bbdbc9a280dd38680ee715bcddc24b33c3caafe428d0aad0ea17b5f17a605c89d1fad27238895ddd1978 SHA512 0023d4da50a3045313fa0698d6f867050c95e8e22cc882dd5d50a5ebaf7089f9b6d4ff521588a6c22f0be521d84a0c5fc3176005b2ce9ad6d878a725d4483944
-EBUILD netcdf-4.6.1-r1.ebuild 1304 BLAKE2B 3c8c2d5a9953efbe47beec71748301be6599f8eebbc98853932e10e90cb79d7519d72649b8f9b1249339216c1a897c9b98d7f6986b7a253e97a022623f1a42f8 SHA512 f809c16b23972993dcfb9f0a6cb9a53555ed02454ae7e8025cdb3aff7b52bb9939ed07800a52ee66c335c76956f96384f9efdd49a53283b3f1aca864afad47fe
+EBUILD netcdf-4.6.1-r1.ebuild 1303 BLAKE2B 1de11a2598f0be06756961a2238afe07b89a7e1f047227fbd9ab41c2791e189d6eaf8e0a14a24f5cac1084da97fab7a2b88849dab01be7b27829fbb42f456f21 SHA512 ed61101c13ec79900be83ee002c03ec9f26e5b95bad64cbf1c941678f037b7ad5dcb48fb3fc6987f765bb70fd976999e78a3e5d58349cfb9dfe32c6ce24195a1
 EBUILD netcdf-4.6.1.ebuild 1309 BLAKE2B 1f3b940aea083c0f02a6266e323edd8693d3eb97a9daaabd142950237c3345ae0154e69e221fa6ce6bba1897b005d55aa74cf567850ae0b45445d86b346c34a0 SHA512 982b9c8923f7223a794b3ac82967fa33fdc646d3e7493a54d02a2182b2e927a78e3672e32045151833b51a949db2ce715211ee4e9e67a42fca9fef88250605ed
 MISC metadata.xml 1064 BLAKE2B 7980e918eb2d2f438aeb5deb4a678c2e324606b40e8d04e592df7d24492bdfbc548082f6fa372c168b09597c3511df15a046cd8f6d746db3d9aeae31cf3604ac SHA512 2aaa7a6c4659ff3daf81bdb63541ce08359f43bb7007f38dea333d0a05fc920e6780b79a9b0f79fec59d4e05a005efd3642acaedcd3223a21d5aa919110545dd
diff --git a/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
index a37c4a93ef33..3ccbe77b51a9 100644
--- a/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="UCAR-Unidata"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
 
 RDEPEND="
diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index e8967bcb7b78..d93c4aa9e24a 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1,3 +1,4 @@
+AUX scalapack-2.0.2-libdir.patch 2159 BLAKE2B e96c845a6e841b8a432268b76755d92158ef880cff11b8925c82651cb2fda736e60da94ea075b44eff9f7a0e00854ac81308d762523351b68b66a782e131aa3a SHA512 40fa841fe31c6665eab09065eed8f5aed8ed48a8e2211ee5fd9365c5c101a2d7167c9d084628ee5f5a26475599a210c4011ce4a207c8df677cf72a67b6a26cac
 DIST scalapack-2.0.2.tgz 4779534 BLAKE2B c2aabd87bc8f7c0d9af31bd8ad8c933703dcbba399658d15c1e5256da2350c1a0feac2ca4a205f697b1c48083df89cbcd64ba432da036081c0f33d5d2acddc9b SHA512 92c71d3de0900955511c527ab3ca57ff69d6d9edc390e69f93ac3769d32ce83a714326bcb6218c8c74b8874be2fdc8aad5e42c912a12581e8d4ce8829ea39248
-EBUILD scalapack-2.0.2.ebuild 1540 BLAKE2B 242720d4449a61a52f3507d3e252c6201806d970c625dab93afa7bd3a86137b9c835e49277237db428159398621080ba77735df6f884ce2dbebee0f23d84d935 SHA512 653d3002b4a16ddc5e8b9de2b6b7918e8a7380f5366d7bcd7506ce9c2fc3feb9547c2b9a6af4b85711c46d378282af29435fad60b43f5fa61914786bfbc7bbac
+EBUILD scalapack-2.0.2-r1.ebuild 1586 BLAKE2B 028aef875fb1a867d43a0f07297352786aeca0292765bdf6aa3292022277e470ba5e426dc33c45c100a0fcef339c26835763a00bdfa5f0617505c0b67fd5cc3f SHA512 e39ccd1cd62ad9ff94d1eee1358fb49fe5b2da4fdf0e18e224f5d44344b5b01b31019e53eba1f82a8b728ad059e4f25a1e7d347ceea94d3d8c22068e5cd17491
 MISC metadata.xml 662 BLAKE2B aacea4e0ad09d68f6d953ba2eeac01ffe9660d389271be5335686b2f2d1000ddc79e0a7f24e506749d57f5e6adc3c7f1f82f3d758fe1d62145dea29d5dcc05f4 SHA512 90820c7f860bfabd8b057277a967bffac6af9d12c334a5813ea4fc75cbdf90d63e5e8d8ec04d5c28e819785dafbbe698ca8e5933f97102c1369727a8a9eaa5b0
diff --git a/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch
new file mode 100644
index 000000000000..a1604a8fd856
--- /dev/null
+++ b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch
@@ -0,0 +1,45 @@
+--- a/CMakeLists.txt	2012-05-02 05:58:24.000000000 +0200
++++ b/CMakeLists.txt	2018-10-15 23:57:22.716171671 +0200
+@@ -101,8 +101,8 @@
+ # Organize output files.  On Windows this also keeps .dll files next
+ # to the .exe files that need them, making tests easy to run.
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/TESTING)
+-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
+-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX})
++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX})
+ 
+ # --------------------------------------------------
+ # Check for any necessary platform specific compiler flags
+@@ -163,8 +163,8 @@
+         PREFIX ${SCALAPACK_BINARY_DIR}/dependencies
+       )
+ 	  if (UNIX)
+-         SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.a CACHE STRING "LAPACK library" FORCE)
+-         SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.a CACHE STRING "BLAS library" FORCE)
++         SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/liblapack.a CACHE STRING "LAPACK library" FORCE)
++         SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/libblas.a CACHE STRING "BLAS library" FORCE)
+ 	  else (UNIX) # On Windows
+          SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.lib CACHE STRING "LAPACK library" FORCE)
+          SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.lib CACHE STRING "BLAS library" FORCE)
+@@ -283,7 +283,7 @@
+ if( NOT LAPACK_FOUND )
+  install(FILES
+   ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
+-  DESTINATION lib
++  DESTINATION lib${LIB_SUFFIX}
+    )
+ endif( NOT LAPACK_FOUND )
+ 
+@@ -303,9 +303,9 @@
+ install(FILES
+   ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack-config.cmake
+   ${SCALAPACK_BINARY_DIR}/scalapack-config-version.cmake
+-  DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION}
++  DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION}
+   )
+ 
+ install(EXPORT scalapack-targets
+-  DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION})
++  DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION})
+ 
diff --git a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..3e60e55da8f2
--- /dev/null
+++ b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils fortran-2
+
+DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing"
+HOMEPAGE="https://www.netlib.org/scalapack/"
+SRC_URI="${HOMEPAGE}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+
+RDEPEND="
+	virtual/lapack
+	virtual/mpi"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-libdir.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use static-libs; then
+		mkdir "${WORKDIR}/${PN}_static" || die
+	fi
+	# mpi does not have a pc file
+	sed -i -e 's/mpi//' scalapack.pc.in || die
+}
+
+src_configure() {
+	scalapack_configure() {
+		local mycmakeargs=(
+			-DUSE_OPTIMIZED_LAPACK_BLAS=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+			-DBUILD_TESTING=$(usex test)
+			$@
+		)
+		cmake-utils_src_configure
+	}
+
+	scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+	use static-libs && \
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \
+		-DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use static-libs && \
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	use static-libs && \
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
+
+	insinto /usr/include/blacs
+	doins BLACS/SRC/*.h
+
+	insinto /usr/include/scalapack
+	doins PBLAS/SRC/*.h
+}
diff --git a/sci-libs/scalapack/scalapack-2.0.2.ebuild b/sci-libs/scalapack/scalapack-2.0.2.ebuild
deleted file mode 100644
index 68ade1f4a1ba..000000000000
--- a/sci-libs/scalapack/scalapack-2.0.2.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 cmake-utils eutils fortran-2
-
-DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing"
-HOMEPAGE="http://www.netlib.org/scalapack/"
-SRC_URI="${HOMEPAGE}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-RDEPEND="
-	virtual/lapack
-	virtual/mpi"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	use static-libs && mkdir "${WORKDIR}/${PN}_static"
-	# mpi does not have a pc file
-	sed -i -e 's/mpi//' scalapack.pc.in || die
-}
-
-src_configure() {
-	scalapack_configure() {
-		local mycmakeargs=(
-			-DUSE_OPTIMIZED_LAPACK_BLAS=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-			$(cmake-utils_use_build test TESTING)
-			$@
-		)
-		cmake-utils_src_configure
-	}
-
-	scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
-	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \
-		-DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
-
-	insinto /usr/include/blacs
-	doins BLACS/SRC/*.h
-
-	insinto /usr/include/scalapack
-	doins PBLAS/SRC/*.h
-}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index adb13858a205..50a7d20ad733 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -29,4 +29,4 @@ DIST tensorflow-patches-1.11.0.tar.bz2 11013 BLAKE2B 929cb9fee5e6b63f00341351908
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
 EBUILD tensorflow-1.10.0.ebuild 13829 BLAKE2B dd99f463536047e6b5acaa9aa6341d367b91d1a864f9b641bfab2b4522e73c669bc80641ad8feb5134926ac70eb8b3dee1e8551508ba25ae0c93fe59f713aba4 SHA512 29cf0984492d506aebfcab35e6c889e497c8771a8cf5974abf2b5752b2ea4d082491149f76beb3cc66eda7dd1d173322bab478df5fffe02494eac58a6154541f
 EBUILD tensorflow-1.11.0.ebuild 13608 BLAKE2B ad8462cc4bc779dadde6093912940b368ba1e4abcf3996c4b570aa599d4970a5fe709d53152b4a6d35326610ae09e128fd6b674fc1176677ba60c9d3849f896d SHA512 696fd969e06a4f2390ad420d6e713a5f7b025034630593b7f8644509622fda1d766af1737ae5174dcccdff80592b5a0ae6d9f5a3ea94383c4e947688b26e8daa
-MISC metadata.xml 720 BLAKE2B f8069d999e401f2110a64b002912462d9a6f30674dd42efcd4d5f9d16641e320ba078c539f562d9257c5be1028d58963d060672c9df0f4615519bc02baa0bcd2 SHA512 5f5813e3a398381254e86c96c718ecfd3b0503029f10adc6601476ab3f5f80033cbfd5292280c94d4ca1cda7774b66bc13796e62d1d3d3181b7c72dcb6420b47
+MISC metadata.xml 641 BLAKE2B 6e87fea81b3a1cdbd96bc190a2b39509549a6c3fe384597c394e142e20f0005329df309edf03d7c304e8adb62876a33c8d0c54161e5fb09fbda1df7e9d774fe3 SHA512 42fe38c07d34999da7cf47b780e69b4fa65245763761a915bd35af3d4441f583f477fd84952680d736be8514a049f49ab1dad9a7d4a6963baff00f94f5efa308
diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml
index 5fc9f21f4638..1dca7af5e0f3 100644
--- a/sci-libs/tensorflow/metadata.xml
+++ b/sci-libs/tensorflow/metadata.xml
@@ -11,7 +11,6 @@
 	<use>
 		<flag name="cuda">Enable support for nVidia CUDA</flag>
 		<flag name="mpi">Enable support for MPI</flag>
-		<flag name="jemalloc">Enable support for <pkg>dev-libs/jemalloc</pkg></flag>
 		<flag name="system-libs">Link with system instead of bundled libraries</flag>
 	</use>
 	<upstream>
diff --git a/sci-libs/voro++/Manifest b/sci-libs/voro++/Manifest
index 7f500afef064..5f5d2b8d5500 100644
--- a/sci-libs/voro++/Manifest
+++ b/sci-libs/voro++/Manifest
@@ -1,4 +1,4 @@
-AUX voro++-0.4.6-cmake.patch 5803 BLAKE2B d0d95f17ac824a2689e59d21425dd1c347f3fed17ff6b54f0c19b0a782c802108974f94eca9a399020c030568c7023691c9f91e3f0d79d999c4d992c65d8d5d8 SHA512 547e63a20f9dacf946a927f932150e61fc4a08e22f605dedaf9a1d7c2a24583119d61daadb7a657f0bbfbea121687e185ebd1f300abc08c9290ee45a342bd3f1
+AUX voro++-0.4.6-cmake.patch 5811 BLAKE2B 2d0e54fdbc4b3603624365a08c2b9cf76271a403308ade16c36b74c01b3cb7273d47fd25ff9d6eccb3ed292ac87d9256e827276dd4034064167b335856eb48e1 SHA512 6c8d8168432a5cad2713e8fea7e990004f9ff99a5114b0687e7e277cc09009d2545e47ab3389332f3ae342ae71ecae2b71e1cbe85dc5ed20fff29200b95912c1
 DIST voro++-0.4.6.tar.gz 809124 BLAKE2B 0b12f68fe2400d850353171a79aa41dd0a7780dd38d8b7d5fcda6621ba43e5bad60d72a1dd24c3ef9e30d4b63c0be9467062ef33f27138a838f7a984dd3321a2 SHA512 aa8c73d7634bb4ec4c0a7d4d18c0df07511ef975338f2517e6f0ec65de56bac10397adccf1c0e13439d29d096b7cb9b4540d7cfc191a1662f15dc0c3c1ff77c1
-EBUILD voro++-0.4.6-r1.ebuild 494 BLAKE2B 919db050ad8c3681da141c000b245b5ae2eb05697e775402fc20f9fcba2c06fcde75a42fdcb471530751beb0cbe1ac5dd6d8d91c2b3a389421b3fcf1b9092b23 SHA512 ad52da9b5e67151d5d1ab8ff3e9fac5c295a51f114a0cd42d88811fb4e5a5ca9bc56b88d093a28dc972b0624f89cc7390ad65ea9cc13020b07302903692ea409
+EBUILD voro++-0.4.6-r1.ebuild 460 BLAKE2B 84a9160c6aa57179c2090107c2ded1b9131ee4e9448dcdb259d1ca93c3f742c7ec4d810551bdee65148df850fff773039a69a4be4681844f759cd6ac402908de SHA512 b4613a7ebc2b430803c6549ca5a5f57c0eb033486ad3beba2c22b4e116ee5dd215e061833e4e6c2561523ae6ed0630ec1e9a258363b94045e582a18656dbcf50
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/voro++/files/voro++-0.4.6-cmake.patch b/sci-libs/voro++/files/voro++-0.4.6-cmake.patch
index 375d58f6474e..c848748c5cf7 100644
--- a/sci-libs/voro++/files/voro++-0.4.6-cmake.patch
+++ b/sci-libs/voro++/files/voro++-0.4.6-cmake.patch
@@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 ===================================================================
---- CMakeLists.txt	(revision 0)
-+++ CMakeLists.txt	(working copy)
+--- a/CMakeLists.txt	(revision 0)
++++ b/CMakeLists.txt	(working copy)
 @@ -0,0 +1,109 @@
 +cmake_minimum_required(VERSION 2.6)
 +
@@ -114,8 +114,8 @@ Index: CMakeLists.txt
 +add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 Index: CMakeModules/cmake_uninstall.cmake.in
 ===================================================================
---- CMakeModules/cmake_uninstall.cmake.in	(revision 0)
-+++ CMakeModules/cmake_uninstall.cmake.in	(working copy)
+--- a/CMakeModules/cmake_uninstall.cmake.in	(revision 0)
++++ b/CMakeModules/cmake_uninstall.cmake.in	(working copy)
 @@ -0,0 +1,22 @@
 +IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
 +  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
diff --git a/sci-libs/voro++/voro++-0.4.6-r1.ebuild b/sci-libs/voro++/voro++-0.4.6-r1.ebuild
index 1f1aa5a860ae..203bee51e027 100644
--- a/sci-libs/voro++/voro++-0.4.6-r1.ebuild
+++ b/sci-libs/voro++/voro++-0.4.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="A 3D Voronoi cell software library"
 HOMEPAGE="http://math.lbl.gov/voro++/"
@@ -14,12 +14,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
 src_configure() {
-	mycmakeargs=( -DLIB=$(get_libdir) )
+	local mycmakeargs=(
+		-DLIB=$(get_libdir)
+	)
 	cmake-utils_src_configure
 }
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index f90ff3a7ad74..90c09bb15e97 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -20,9 +20,9 @@ DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c
 DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B a323728450c5054d715dac137e54ed9b901019af595ea3abca9e7865d0b420d7b5f87789a9489df116f982633984d74721153dc3ab735e97455f64c2ffc4aa95 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60
 DIST vtkDocHtml-7.1.0.tar.gz 128927849 BLAKE2B 93ad088ec0578bf8008a789f71d7d70eff13899ab216af1499c88870189fe53c426fd23fea5f1c0ff5e8cfd9ec5c6fe03ad2b691edf88d0fbf55b7593778b3fd SHA512 cac6d005262d3849f84c2632dd737c4dcd9f23d5015266d683bcc8c65fad0d88e87faf9b1d5f68fdabe7b2ed97927a9f907020cbeae2b6e7223a5ffee54f2679
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
-EBUILD vtk-6.1.0-r4.ebuild 10518 BLAKE2B a303880cb6d411975e5e2d2b455385289390411a7bff4fc63fa69121e0f75749a6d235d5581b9bdc63475f87126f5ca6721cca9e7e7ab742a0cfe1fb2a799c24 SHA512 27a5deff359c5fae24ea08b3b697dcdd27e6457d44c594186ff4057ab3d18738cb52af787824c104645d116f44de46081bd3bf48182e29cc3c7b0877bd6d12f2
-EBUILD vtk-7.1.0.ebuild 9334 BLAKE2B 07ec2edf00e7e559fccbec16815d0780b2c1bb21cde482a14eeeb2301a9a732b16ea567fc39593bc2087269b3a34ca86020d8cee23705d3d9fdcfb9e7729fc8f SHA512 93bd46a125ef9993cdf9adde1f2f5ab0ba48bb0d4d9f81d01b792c40aa6a4280a01bfcaf1733c3451344d95fd6a809adf451707cb250499f403aa333f66627b1
-EBUILD vtk-8.1.0-r1.ebuild 9065 BLAKE2B 24248fdc362a1b19055a23d78beac200bbdcd03da33c7f6f1634aad9a1abe3b11ad6cae00eb16a3b7d121fc7ec4682c8ba0f7a32a10f7d65c093b5ee2f2c9f6e SHA512 c131e1417fa5fde3398199f3bb45f73653a4436c6ed09f4b4689af448f568e276f59cae90ddd4d4fe0c01b05741fe88bedc1bbf40e4615c92ff5ee45b33c6850
-EBUILD vtk-8.1.0-r2.ebuild 9075 BLAKE2B aa64cab06dd32cdde01d03ae900448d6a615398261e194bbe120d3e4edd5703f3095481d0490f79b0b3e7228f9482fe4897c400f85462bc9fa656cf5de9c7efe SHA512 39721de229b5bad6d447ac71db98b8472f7879514ed9185bbf4016bccb7903c26aa8df9e87ffbab14fa81a0f9eaeeedd66ce96b704a275b6e879e479ebccd186
-EBUILD vtk-8.1.0.ebuild 9252 BLAKE2B fce898b26eabbb7f80afb9b858289a09cb3a35c288b98d4ffaf76bfa077aa787be2aa2589e313c0333ae7e9b4e2ef14a35ab3eefd6d3058da7801e1a4b910067 SHA512 be0bfdf8611e50bc1ac19460e79f533fd7fac863ac5de1c36777d0dd5ca7244b0fdaefb9129c6cb55a9892fc4054febabcf8521bdb8f13a7b143e0f26ca0f670
+EBUILD vtk-6.1.0-r4.ebuild 10480 BLAKE2B 72dc967f163fed46bcbe7dc0a2b4de89840c95134a5b89522ed2d8962873a4ee54d7e2a0a9dc9814f003e3aa5d206e39ec77b799690b7ba8af1fec5d874cef48 SHA512 b299bee838d2fac4b44d56039856a326388186bac7d7c154bc4b144db66df1c04b9c74db3039f6e2ff8d3b25714a3e37d097e47a573b4a1851be09acbe161794
+EBUILD vtk-7.1.0.ebuild 9296 BLAKE2B 0fd4cb6ff13fe68d9a39bd686a18477fc0f8daad711910135448aacc96e06820251921263dc9517f400454fbdbda26ad5dc9633e98557b2246fe6e8658495537 SHA512 622eabfbb2a4b2c80a6254b09779f05b9354082402f3fead1010767c660b86c0e94413026a27bd06ea8eb7a07bea14d747db3bec51d9b5bf6ccb669d660d937f
+EBUILD vtk-8.1.0-r1.ebuild 9027 BLAKE2B 45d5ef5b8177e418424135b9ee70af8e4d681731584a595bb4108cdff1e8f3fe29f0293bd668fba67967dfcd4e9b7e26ae51e3dea92e72ed0bc7d4589c82597c SHA512 36a149ad672f38d48f767c4381bb04bc4054edd76776430d3157f034f4faf58ddaed43675c712e1d4787ae01f05ed8c2b64988dfb30392a43faeb6c37416d115
+EBUILD vtk-8.1.0-r2.ebuild 9037 BLAKE2B 8f8f89c3d158b826591eb07fe0250c16d0ba9dca9ea11011254152ac37b15bb840a815eb1bcb7b8a7c92524eb12f44d56a5ca16d91ca47b0d2797fa6e43db214 SHA512 5e0285464d4a41370a9e6586f9fb57fa6a1bebc2785f996c9a48d4066022f05103a7f233570cb729a79052a6684c51e682229376afab359b2c56bdbe52ad0a33
+EBUILD vtk-8.1.0.ebuild 9214 BLAKE2B 4705a1ba19eee614686234bb3297f70104fd1b050f51bfd3c16f2c01cc33f745d2fdcf70331dc060852923da8f319cbc554c9296e76d6a742215e3c31990b77d SHA512 34a8ab6760d0b3fbb25dbf9d2c4a9eb5507b7de777bcce509b8d80e92131290d31b747921a1cd0905001b4657c6eba68f6497b024f2ff70cecaa7bdacaccb11a
 MISC metadata.xml 1120 BLAKE2B 17456da598e4b7dfddec75a323def586e3b099ddfaa2e5883410afdd9143d317a6db53ead747b097cf8631f738d6a0b38a1e27ea37b445ba667a403053223e02 SHA512 d0d9ccd1922afe496e24d38fee05793fdf3983f798bef817a00c77bb632f2cabe3d2be554d0e979c223fd4005f3186b9ef78d394050539bd21cba5c2b6e56143
diff --git a/sci-libs/vtk/vtk-6.1.0-r4.ebuild b/sci-libs/vtk/vtk-6.1.0-r4.ebuild
index 13badd6cfd51..a24386e16e6b 100644
--- a/sci-libs/vtk/vtk-6.1.0-r4.ebuild
+++ b/sci-libs/vtk/vtk-6.1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -99,7 +99,7 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	web? (
 		${WEBAPP_DEPEND}
 		python? (
diff --git a/sci-libs/vtk/vtk-7.1.0.ebuild b/sci-libs/vtk/vtk-7.1.0.ebuild
index 80be41eec4c5..7d06c7c1ccb3 100644
--- a/sci-libs/vtk/vtk-7.1.0.ebuild
+++ b/sci-libs/vtk/vtk-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -96,7 +96,7 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	web? (
 		${WEBAPP_DEPEND}
 		dev-python/six[${PYTHON_USEDEP}]
diff --git a/sci-libs/vtk/vtk-8.1.0-r1.ebuild b/sci-libs/vtk/vtk-8.1.0-r1.ebuild
index a2eaa5fe648e..6524c600faba 100644
--- a/sci-libs/vtk/vtk-8.1.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -95,7 +95,7 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	web? (
 		${WEBAPP_DEPEND}
 		dev-python/autobahn[${PYTHON_USEDEP}]
diff --git a/sci-libs/vtk/vtk-8.1.0-r2.ebuild b/sci-libs/vtk/vtk-8.1.0-r2.ebuild
index 6b84275f59c7..7cad42c1018f 100644
--- a/sci-libs/vtk/vtk-8.1.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -95,7 +95,7 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	web? (
 		${WEBAPP_DEPEND}
 		dev-python/autobahn[${PYTHON_USEDEP}]
diff --git a/sci-libs/vtk/vtk-8.1.0.ebuild b/sci-libs/vtk/vtk-8.1.0.ebuild
index 7a718420fbc9..6604f443bb3c 100644
--- a/sci-libs/vtk/vtk-8.1.0.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -95,7 +95,7 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	web? (
 		${WEBAPP_DEPEND}
 		dev-python/autobahn[${PYTHON_USEDEP}]
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 16da0672bb28..d9acf1d54812 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 1eedb1109b1e..8d7b851d9041 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -13,9 +13,9 @@ AUX xdg-utils-0.patch 1090 BLAKE2B 7a342a9e0bfd5b3aae1e3f8c45046c4fcaffea277cb68
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
 DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9
 DIST maxima-5.41.0.tar.gz 41540226 BLAKE2B ff726044c9026bc58d04832fa6382146ed7e7d61d801fa7131b1e7e2ed386b99e238e039481697f9aa24cea59ffd0f6811675cd28818c9fe53f023f965f9d149 SHA512 1b93ae2db055ba7fb4a95924a896667f0cfa1c675c603c104181662aeb32b10b006158526b2f3ad93a59688a23eacdc82e870bb8ffb182a89e1e51de013ec209
-DIST maxima-5.42.0.tar.gz 41902466 BLAKE2B ff09294ee66fc407845b1713e5762d28597bda067fdcaca942a61e6f07365965a9cdeb3f6d7369d9a074f5835cf64d9724d1ac8f2ad84033b84483f3cb619476 SHA512 dedd86838b254c9932166eb161589187f353e986ecd398e9405db43b5159597ba87369e9d7afa8bbfd18288c1213818812fe27881b5f5e99efc63bf31a1d7854
+DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
 EBUILD maxima-5.38.1.ebuild 4823 BLAKE2B e2f4aa9b01a251b0ff0250df56a9b9cb904ea1d859ff32414fc38f48d9cd772ebe5bab5dbe02fdfe87f6c70c848ad9b2b0b724a8dcbd8aecf459d492cbfa6132 SHA512 88dfd3edcef7450247c1c62b1c9c8759a8816ff6ba6691074088253d5ae3922afa828b21e543978617cc022701a2dfc82e2d2436c21430da1249949393cf6e12
 EBUILD maxima-5.41.0-r1.ebuild 4890 BLAKE2B 5aa2a97dfd4dc72718a544c7de8a058d7a5ed102086b52e51906421cc69182df0252b336a7e4c2469cbe51fb761154088812edb764355859e3718eaa1b574783 SHA512 a2bfb607dfe6faa7098ae880ca4f3b7e3db808ecfa714611947df5d4fe00d7fdc6b9f7477ae9ccd3d83f25ae70c7eeffd0295105b5043ebbaeaa4c7f1bea8ee3
 EBUILD maxima-5.41.0-r2.ebuild 4919 BLAKE2B 3f0de627f910ab9f749983c1dda434834738c2d9fed5749260a7d97bef9af64de6347a236a185e61312bd851afbd98d3fbbe769cbdff135188a99d7269011a6f SHA512 4cd6fff9032366c57bdc314716c58f72a2bfe61961db813cd3eab3b8a1c31349215ec338927dfface779d3386a85b32802a46beb90a3096690da8e4880a69902
-EBUILD maxima-5.42.0.ebuild 4910 BLAKE2B aa4d06f09fd352360b361b935e2484a7d2787beced1d9bf2aadc2bdee148f1465ed05a370e987d45381bfa877fe447a26e246d540ab5af1826986e37d58ac504 SHA512 9c8293d6dedf745389f528ae8570f1fa842bf5ab7767b4f7088368307a6da1088cdaa5670096a59a806008e42ad6206cb3c675ce38bf70be786c30377784c9e8
+EBUILD maxima-5.42.1.ebuild 4910 BLAKE2B aa4d06f09fd352360b361b935e2484a7d2787beced1d9bf2aadc2bdee148f1465ed05a370e987d45381bfa877fe447a26e246d540ab5af1826986e37d58ac504 SHA512 9c8293d6dedf745389f528ae8570f1fa842bf5ab7767b4f7088368307a6da1088cdaa5670096a59a806008e42ad6206cb3c675ce38bf70be786c30377784c9e8
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/maxima-5.42.0.ebuild b/sci-mathematics/maxima/maxima-5.42.1.ebuild
index 1c0c67e3ac6e..1c0c67e3ac6e 100644
--- a/sci-mathematics/maxima/maxima-5.42.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.42.1.ebuild
diff --git a/sci-mathematics/pymc3/Manifest b/sci-mathematics/pymc3/Manifest
index a6b79199c3f6..98ef8bcd7b8a 100644
--- a/sci-mathematics/pymc3/Manifest
+++ b/sci-mathematics/pymc3/Manifest
@@ -1,3 +1,3 @@
 DIST pymc3-3.1.tar.gz 34553828 BLAKE2B 73c4d50f7d656322fa1a7384aefa1f46caacccc8055138fefc27a82d765866efb9d4853a842a2df312058c558edd66b37a40295904c86f023f8fec5503877206 SHA512 30799d9c1b670adbcf5cc1463029d71a87c7b917e83b1f6cb453d75553616da7173421e7ae6e31b332c85f8170daea735344ff83ba6605cf3b15cf79c5c4fb97
-EBUILD pymc3-3.1.ebuild 1562 BLAKE2B 6ebd6e2553e3ecc8d8ef96f8debf276ec7f57748733393f2c7839f40eed855481ba8b6e2fa43f07c8ee2ed1648aeadbe29682784a30764207e96a44f89f1f890 SHA512 982a99a83889fee4cd533e4ccad379e8051910e38a1f18935e2f8fc9845928f7c946ab949b938c7b11f19d8f6a1a664c402ed1e1e33617b27bca6ce2b9b1daca
+EBUILD pymc3-3.1.ebuild 1562 BLAKE2B 15fc65a48ca5c60060552cdd466cdfe2e33400e71aa7ba4651dddeb7cd801344bf5f33fac36bbf5f21af312aa12fdd095dadfc3221597e4b6f723a79cdc17d88 SHA512 f9e6baa94c074b6f065d5f0512112f423a1510b93f364a013af822a680658f387eef6e97c7f595542135d95cbf7fa24aa2d8629cc805b1e93c0cd03837bb7e76
 MISC metadata.xml 740 BLAKE2B 2c56161497137f40e0e25e85299af90c361ddbcaccb4436747ba111e725c9a881fdf88944dd0208909275bf4013b9e1d5983b590ad7f46589f584549288aa02c SHA512 c75ed4b57479fef93c4b667792cb284212f859532697c4d4876e2dc23ab13d2c470143d3236de03e741a0797049a12d3a7e2f0d2ae4f07b2cfb0b7943c78526d
diff --git a/sci-mathematics/pymc3/pymc3-3.1.ebuild b/sci-mathematics/pymc3/pymc3-3.1.ebuild
index 658b90729d13..b35ff453eaef 100644
--- a/sci-mathematics/pymc3/pymc3-3.1.ebuild
+++ b/sci-mathematics/pymc3/pymc3-3.1.ebuild
@@ -21,7 +21,7 @@ LICENSE="AFL-3.0"
 IUSE="test"
 
 RDEPEND="
-	<=dev-python/CommonMark-0.5.4[${PYTHON_USEDEP}]
+	<=dev-python/commonmark-0.5.4[${PYTHON_USEDEP}]
 	>=dev-python/joblib-0.9[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.11[${PYTHON_USEDEP},lapack]
 	>=dev-python/matplotlib-1.5[${PYTHON_USEDEP}]
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 939bcd02c032..b65b31c814f2 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/hepmc/Manifest b/sci-physics/hepmc/Manifest
index 586c75a0a368..7b019433a0ab 100644
--- a/sci-physics/hepmc/Manifest
+++ b/sci-physics/hepmc/Manifest
@@ -1,3 +1,3 @@
 DIST HepMC-2.06.09.tar.gz 4612637 BLAKE2B 6bbf1a6a8410b6717ddff29fc3643247582f7a61a05fd9e52a0b09f78bf75de587c1c55525f6a1367b306a26a4687ce55b64908c049d91bdb2db3d40467af62b SHA512 1030f31ad9d19d8ae184145a693c4a3092131f485e2ed89598b7172992a825ad9aa46fb44a9199a00c4a6bd7e163daead9452e9bc4fe32cb3b97351cf22906c4
-EBUILD hepmc-2.06.09-r1.ebuild 2034 BLAKE2B de4821607cdadfc233c0fa028d962fd9a6a09b74ef3e3baba127c4c55d4d85b0c40f3e390dff9aabe3dd90e6542fce5335194cbc2a768239f6421e0e602a316c SHA512 0c83528e2872cacac7ea2e343a479fb383f6a64af6286737a09e2ed5d57e12cba1e0d579662e7a3a866f75790726b56e822131e9572d1c85fd4951fec823fc51
+EBUILD hepmc-2.06.09-r1.ebuild 1983 BLAKE2B 834ec2bedcb51e1193a5da3bece07ea4813861fd2b607b09eb61e828746ff95b6429845a3990a7bfd4b4c3ac6e20c1012f344e144dcb8a6534e52e545b7e03ce SHA512 1480b2fea426367d582335d111d3ae154f146ecd09ee4f36d745b0c66a7be2c21f9b3da4888c7aac494712a52298144e19df24c5bd7e4db8e01942ead939e419
 MISC metadata.xml 1386 BLAKE2B aafa21d2da77f67da6bb8f88ea88e96365f3575a4435614a010c4f8b7241a2f4837623ced2f86f781fa8f0dba72048fb22c9ab72677d7ff128e5c3ba4767f95e SHA512 b0ef90b6404b04d1d393e9e8bb04ff08a51f72938362f4ae1e2806bfe29c99d50089f15ddacb59b94d6d554d0ec8842ba7b89777434e0bab08c51627ab8bd9ce
diff --git a/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild b/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
index 46b3b6d47d9e..fd3d790263ae 100644
--- a/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
+++ b/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
 MYP=HepMC-${PV}
 
 DESCRIPTION="Event Record for Monte Carlo Generators"
-HOMEPAGE="http://lcgapp.cern.ch/project/simu/HepMC/"
+HOMEPAGE="https://hepmc.web.cern.ch/hepmc/"
 SRC_URI="http://lcgapp.cern.ch/project/simu/HepMC/download/${MYP}.tar.gz"
 
 LICENSE="GPL-2"
@@ -33,7 +33,7 @@ DOCS=( ChangeLog AUTHORS )
 src_prepare() {
 	cmake-utils_src_prepare
 
-	sed -i -e '/add_subdirectory(doc)/d' CMakeLists.txt
+	sed -i -e '/add_subdirectory(doc)/d' CMakeLists.txt || die
 	# CMake doc building broken
 	# gentoo doc directory
 	#sed -i \
@@ -56,8 +56,12 @@ src_prepare() {
 		{src,fio}/CMakeLists.txt || die
 
 	# remove targets if use flags not set
-	use examples || sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt
-	use test || sed -i -e '/add_subdirectory(test)/d' CMakeLists.txt
+	if ! use examples; then
+		sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt || die
+	fi
+	if ! use test; then
+		sed -i -e '/add_subdirectory(test)/d' CMakeLists.txt || die
+	fi
 	if ! use static-libs; then
 		sed -i \
 			-e '/(HepMC\(fio\|\)S/d' \
@@ -68,13 +72,9 @@ src_prepare() {
 
 src_configure() {
 	# use MeV over GeV and mm over cm
-	local length_conf="MM"
-	use cm && length_conf="CM"
-	local momentum_conf="MEV"
-	use gev && momentum_conf="GEV"
-	mycmakeargs+=(
-		-Dlength=${length_conf}
-		-Dmomentum=${momentum_conf}
+	local mycmakeargs=(
+		-Dlength=$(usex cm CM MM)
+		-Dmomentum=$(usex gev GEV MEV)
 	)
 	cmake-utils_src_configure
 }
@@ -89,6 +89,7 @@ src_compile() {
 }
 
 src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	use doc && dodoc doc/*.pdf
 	cmake-utils_src_install
-	use doc && dodoc doc/*.pdf && dohtml -r doc/html/*
 }
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 318f49da4cf6..191772a26568 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -14,4 +14,4 @@ DIST root_v6.14.04.source.tar.gz 162451369 BLAKE2B c7af9cf18736c900f71c35b7f9df9
 EBUILD root-6.12.06-r7.ebuild 7895 BLAKE2B 1edf90da948b0c3165624648f2679b602569d52484e6c49100d7e8834ff91ce84ae342da932c76c19b1dedd1dffeb175770e2a8c3f2a24dfb0e14938cefbdaff SHA512 786cdcb479098dc18e07e03201d6c27da80aef873997f828eda430499d462b2532cc1219432095eb34fb721e10a903a760be336111537379488c57ebf3ae2558
 EBUILD root-6.14.04-r3.ebuild 7918 BLAKE2B 40bc6ad41f77f2d844f4f75b09b05f44a311fe268545b4cccafae84169735926238321874d5fcc2e3a7ec18578cd194208f5153559ef3f2ae1188c90a1a9637e SHA512 aac213999b59f79112150ecb4785135dfe59948cf37cde2afddf3f3751574cb7457a9d124bd555cf5c119a426ceabc8f926452c5927294824616e6672220d71f
 EBUILD root-9999.ebuild 8142 BLAKE2B 785d7040bfdb6664c613390e7b16e5d05259b9e46ab35a956a53b6534cdd92338513055b807dd12398e3f3910d946fa81c0dcde57aeb253b438c1b0ab6f361ea SHA512 52ee93459aca1826856d22c89982ef2281d855d89be88340d1d24d0aac47c43aefd23da024e0333b0a3d0a8e825fbb09302e17a69ea6b817cc03f2d52af718ef
-MISC metadata.xml 2977 BLAKE2B f0c2cd6f71ff44c2e3f767ec08ee7051c3501f6e57998dc0ad744f609862c0ac686d85fa65f85cf562edfbc51d4f62048a3beaa31e6c66aa965d8a182d438a42 SHA512 f9d4a99776394f7c273b7eb2c69060e5580bbc4f546b6f2001690c1dbcfc5f56e090c259beadc18d54aae4a0fcb3ba517143e6fad268caa8e60adac453f1b689
+MISC metadata.xml 2896 BLAKE2B e84b7e82aba212c161c6d6d00b78d365c689a131d6786b641529e32ecb69d55cdad6f0a44d6a4cac6d33643f0f721fe68891a5ce7c1f976268dbaf880a25b0ae SHA512 cd477aee55ae4147ec9e153e3c478e2d42538e364e2946837458b9d287252fb7d98e1dd79d06245e9c20c94b50d98e1729e663e2307ca2ae5b4200537f618da0
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index baf90a1a37bc..6d5558e76bbf 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -27,7 +27,6 @@
     <flag name="fortran">Compile included Fortran programs</flag>
     <flag name="gdml">Enable GDML writer and reader</flag>
     <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
-    <flag name="jemalloc">Enable support for <pkg>dev-libs/jemalloc</pkg></flag>
     <flag name="libcxx">Build ROOT against <pkg>sys-libs/libcxx</pkg></flag>
     <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
     <flag name="minuit">Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)</flag>
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index ca7c136e202a..e7db021ebb9a 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index a0126d385c1e..b4c2ce785305 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,4 @@
 DIST labplot-2.5.0.tar.xz 11831656 BLAKE2B b6c122509874f1f7a554814b7ac9889b416d36f750ff831773aed313f9eff23abc0809f40f6f591051b287bd1a875af455f5d500ce54130c4d8ddfe5fcfa0870 SHA512 a4b285917e30b0ac00cb8c8ad6827ba3884d95fccc0511a0a317bb2d637e48e6579929c45cfb8bba737bb5a01472a2baa9d812a688730ac4fa40b23cc6625eba
-EBUILD labplot-2.5.0.ebuild 1787 BLAKE2B f52173bd8823f2c4230aaa590029b83cc14b16f49e830ae1ffdb97de6ab55bd7a8da70504feade41bde4be3a21b4016d4aede6977931b64924babaa311434873 SHA512 c97ca8487324750c24574ddc330b7f8358c5142372b660b106e759dc6f7548c349ee1be8fca5f6941f0c418c454405a42814f127a5096e1c9a32520fb4b25bb8
-EBUILD labplot-9999.ebuild 1864 BLAKE2B 8ecb810a66b3979d9d81292bdb2ec9c24601b7744bf465d70e929b250e2b0fe3a88088cd5e908862370f77f8f6a157e86a612a4fc7053143724246fafcf17eea SHA512 62e2ddb4d1d87d55e64f05045a5d2aca416426cf41169eaba421c750d7d7ee79d47192f08a6a0a64f5aca0a36580a1c3b3d68917644bf26533e78ce0fd4da177
+EBUILD labplot-2.5.0-r1.ebuild 1841 BLAKE2B 4ea7459048e1caa44821e7e29e7da8278960284d350ee7e9f1273a1f68e2b4b72ca9f688648620aa4d44d8201c74a3783aeb371f6a15b6f453ab516af22d5d5e SHA512 50e21d992b1257fd76bd80be919c6be2c1724f33c8d9967f3943094bfa3b9ec2bcee1978720b93414e6b9d2c0fdd266134d3a3624cb185f5c1a2978768c17f54
+EBUILD labplot-9999.ebuild 1907 BLAKE2B e2bc89a7337ab97ecfb2ce642b00e7c223740f083249be6701320e990bc559926c549ac200e6439df570705d7fafadd73639074dece44c4a37e1254a9569e7d4 SHA512 2ff3405a30ca68887be97eba341e4efffcdcdd99bfba1d85096675110425678ba0f67d3b6bfbbf967739dba4ec811873915d22d8e8ec5d15d09696be33561100
 MISC metadata.xml 864 BLAKE2B 08fc970f0e9804d36cc5ccbd2b08ee9dbfac30322e5cf56b0253ac3665bced133c2d28d27c64a47cc1faa0f310e6acf8b3f8b774174cab3a2b78da1cf1f0de79 SHA512 04ad431c7e59b54a713c34f35baf3e16b585e45784a39de7bd2a42deea36f27b96d1ea27d1b7bf052934d8f02d57370663c393219fba39bffe6d4d74e07868d0
diff --git a/sci-visualization/labplot/labplot-2.5.0-r1.ebuild b/sci-visualization/labplot/labplot-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..be9f065e8b54
--- /dev/null
+++ b/sci-visualization/labplot/labplot-2.5.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/education/labplot/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="cantor fftw fits hdf5 libcerf netcdf"
+
+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 kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtserialport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	>=sci-libs/gsl-1.15:=
+	cantor? ( $(add_kdeapps_dep cantor) )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:= )
+	hdf5? ( sci-libs/hdf5:= )
+	libcerf? ( sci-libs/libcerf )
+	netcdf? ( sci-libs/netcdf:= )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/bison
+	sys-devel/gettext
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	!sci-visualization/labplot:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CANTOR=$(usex cantor)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_FITS=$(usex fits)
+		-DENABLE_HDF5=$(usex hdf5)
+		-DENABLE_LIBCERF=$(usex libcerf)
+		-DENABLE_NETCDF=$(usex netcdf)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	kde5_src_configure
+}
diff --git a/sci-visualization/labplot/labplot-2.5.0.ebuild b/sci-visualization/labplot/labplot-2.5.0.ebuild
deleted file mode 100644
index 40f32162ebc7..000000000000
--- a/sci-visualization/labplot/labplot-2.5.0.ebuild
+++ /dev/null
@@ -1,68 +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="Scientific data analysis and visualisation based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/education/labplot/"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE="cantor fftw fits hdf5 libcerf netcdf"
-
-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 kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtserialport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	>=sci-libs/gsl-1.15:=
-	cantor? ( $(add_kdeapps_dep cantor) )
-	fftw? ( sci-libs/fftw:3.0= )
-	fits? ( sci-libs/cfitsio:= )
-	hdf5? ( sci-libs/hdf5:= )
-	libcerf? ( sci-libs/libcerf )
-	netcdf? ( sci-libs/netcdf:= )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/bison
-	sys-devel/gettext
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	!sci-visualization/labplot:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CANTOR=$(usex cantor)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_FITS=$(usex fits)
-		-DENABLE_HDF5=$(usex hdf5)
-		-DENABLE_LIBCERF=$(usex libcerf)
-		-DENABLE_NETCDF=$(usex netcdf)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	kde5_src_configure
-}
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index b6d50918c311..8b114b533318 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,8 +30,10 @@ COMMON_DEPEND="
 	$(add_frameworks_dep syntax-highlighting)
 	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtserialport)
+	$(add_qt_dep qtsql)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 	>=sci-libs/gsl-1.15:=
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 58aa4696fb65..44038cc73277 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index bf53dbbcf680..ed938f0067bd 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -4,6 +4,6 @@ AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740
 DIST accountsservice-0.6.45.tar.xz 382740 BLAKE2B ce88e53c7d0187f53ed0a2758f81c8e2d1083ab1c95ec6cddebb2167b36706b1537ecf74b7904a9002c6179cfdf811a3268451af9443727ba9793a9af06cf8aa SHA512 09975f9fa03a3177d923de6d6f6e6acfffeb2ff4924c45eaac78c994c16974427c8e936a87034747ba494d2bb3df6e8a92ff44db387761b06e06e311d7cf105a
 DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
 EBUILD accountsservice-0.6.45.ebuild 1543 BLAKE2B 187f75fa6dc5883ba6f27ce72cfe47cf32a841651b7df7c3375d0e88ee087036e375f7475379bce6d3db9daa186320d110b0f9e1f84e8018cf0e6eadebe484bc SHA512 cafc7f6cff3c5e569d7093a8a5a43fbd83794c3e4b15e507ea7486265ca95bc63f5f6cfb98bc543d19600e9bf69ef6d6efe88a1d8085737f7cde99fad20080f5
-EBUILD accountsservice-0.6.50-r1.ebuild 1608 BLAKE2B ff6a6740463ac1cc16a18de721b0fdac4573ba95ca575c540aee719c39928f51d904b002926f2b01da5f560e180e806a674e8b6edc3518956b641537a270cf56 SHA512 e06f0d20b0d9883753d33ba66c45507d25665a55b8b54e0f1275f08a8bf595ed50dd75d47aa3e009a1a4a1a4a70c44d6263e4ae90a50cf324239ffaae1a4cbb1
+EBUILD accountsservice-0.6.50-r1.ebuild 1606 BLAKE2B 0bd1f8201d424225c80328a931545fcfbb91b3a80072a9da43fc932b30b9b659babdbc0042efc2f1e1580b16042d84c63d0544848d771d02ea33578b6c610192 SHA512 929e6e9e853a94dcfd2a9f50a2fa2a324ed47a91df0e5ab70fe1812a2b47c0f2d73870dc45374a06eacf3925716a355c16cd8b8a09ff22a94bd8b0ec5fc01290
 EBUILD accountsservice-0.6.50.ebuild 1499 BLAKE2B 49968684a8a34c6b5af66417106526a41cb624b74eb5f5d7b01b23698c05507a8d8e14722668179cd2f3d77ed6504117e5c6be362d3fc96b28d6153af5769a92 SHA512 46f2173a4d67eec92950bf7181f662796ba0039cde4280a63cae9a2007db870424d2bb31c4c907acd7edcb5dfc466b937cd3868baf6cd7dd21de9a7307f884c9
 MISC metadata.xml 524 BLAKE2B a48a629a81d6502b8c54c466c6d901fe02e0fbe14ddbfd3294501560a19e33c3915c1305ea981fe41c572689def2d0a8f00de4b3131a19297f4ef3db9d6b5b06 SHA512 a0c662b3c0c45df43780f160b6db6db67561a1b2c84ce60929707d94cd9f1bf76588420189b91e0eafe58001a61d8a313f2a4b421b980a7c7f988c95e782ee07
diff --git a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
index ac040961862d..87bb35ec47e0 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 IUSE="doc elogind +introspection selinux systemd"
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
new file mode 100644
index 000000000000..93e1fd6e357a
--- /dev/null
+++ b/sys-apps/bubblewrap/Manifest
@@ -0,0 +1,3 @@
+DIST bubblewrap-0.3.1.tar.gz 62768 BLAKE2B a8c29102f9b69bfbd6b6aebb9aa0878bd1e31b52a6cb6374b8341c1410526872d4063ff0524ab4f98d7cac7358dad3190144d12bb0b11cf26eeed2730c4ec475 SHA512 fbc44976f53fdf8913b94c57d1f26a3b87c773e86a289e58fd3d7b1c4ea7f33c862f1a38a4f791315358990928768a68334f0a171302c18a16c7e2e9f1a146dd
+EBUILD bubblewrap-0.3.1.ebuild 1020 BLAKE2B 929f69c3a456c30f581dd393e3c3cb919c0026d6d71a03ecec19f05de48e423a4758692a5ba9328279062724f06c159a8b41973cbb270bc017db75e0182c2d13 SHA512 bb7421b23f7eef4890779fc716cf2c5a76ccd1824f58f2172db3f77158b2f048968df100796c7da310983ff47b62aa743f2ac61dac19ecc7ed5395ef332c1f67
+MISC metadata.xml 342 BLAKE2B de8d3ba1c95b39bd6e582b27b186ef0805fd9be1fe6c806fb8bcfa28f7cafb3a2068be0e21baa13ca08895db0d0b666b5c1eab573f38fac251ce9d41c793866e SHA512 25752c1aae465ac49409e35c32863b945c1dc8989ddb4fab2999cf890cf4ec33fc82e9324e3af49c15a8580a566e5f737ec270646b4cc569c3c5dd472eb1b2bb
diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1.ebuild
new file mode 100644
index 000000000000..6a54ac1e8458
--- /dev/null
+++ b/sys-apps/bubblewrap/bubblewrap-0.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools bash-completion-r1 linux-info
+
+DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
+HOMEPAGE="https://github.com/projectatomic/bubblewrap"
+SRC_URI="https://github.com/projectatomic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="selinux"
+
+DEPEND="
+	dev-libs/libxslt
+	sys-libs/libseccomp
+	sys-libs/libcap
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+# FIXME: we don't need bashcomp righ??
+RDEPEND="${DEPEND}"
+# FIXME: bash comp is not working
+# FIXME: test is not working
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable selinux) \
+		"--enable-man" \
+		"--with-bash-completion-dir=${get_bashcompdir}" \
+		"--with-priv-mode=none"
+}
diff --git a/sys-apps/bubblewrap/metadata.xml b/sys-apps/bubblewrap/metadata.xml
new file mode 100644
index 000000000000..29a569e6d411
--- /dev/null
+++ b/sys-apps/bubblewrap/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="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">projectatomic/bubblewrap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index e9399688c163..5946e217ce7c 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,11 +1,17 @@
+DIST c-dvar-9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46.tar.gz 36281 BLAKE2B 4a1ee57e1aeec5010bd5b84d355aa94a923dc6e03f5cd1b58db3af9b64f15e9e565a0930e9e1d8ca79602ac7e366a3231ed66d7a2429b0ff769e0c3428742493 SHA512 b77ce063fbaf92d3ee4462eb440229870fe3bb41ea3d02e79502cca48eb8983da4f8e3d6fa29fb2f066879af0d7e9166e0105ca56d1ff12d47f2592f2be1b2e2
 DIST c-dvar-f0a525477142f64c45b0be9393cc3b5dc3a6d6f9.tar.gz 26255 BLAKE2B 10941922212219f3b4c09306b8daf26cd921b078472c15db85205adcd65d503de5f58bc05eef3a2e60ca1485ebe44d282c2966ddd732d42ee092fe7880db5bbf SHA512 bf1593ca794ca973e8336954b527733f61c0bd389a729da32c84bc35ba6decea6434ea9728789e92f1663d2ec10cf3e4d4f50c8db907ed1566790214c40eaf5c
 DIST c-list-071841c28d96e9104761af815a7ea367390c3174.tar.gz 24662 BLAKE2B d1d859d4c6c80540d984083c70b58fde62eed2074d942222d15430c475ee46280af098c2a4dbe00ccd81a80884432ae3043480f9a050cb73fe5c1675c0a3d6ef SHA512 de4fc5ed4d893b122ef320ad0323d44e616210fe590fedad8e38c3c3f8a6c0778178fb85e6e970913ff441f9b3e8861491f59fcef2c2c02ddf59120620d8cbe3
+DIST c-list-dda36d30c7d655b4d61358519168fa7ce0e9dae9.tar.gz 21457 BLAKE2B cec1ffbc7591479c8a7b1fbbfbef69a8dfc8b756a864f31910202967be431027d85191b4f412f04507152d5d81113e3668ab1e22319547607d21a139f75ea4a5 SHA512 0b0add65248cd17a5d3c52adf3f709ce8a7c5739f153516fb9577b0a44b709242b3571637efbaa0f78f0afba2691ec0993561b1fb643df4d1eb6a45167f50473
 DIST c-rbtree-ba0527e9157316cdb60522f23fb884ea196b1346.tar.gz 28400 BLAKE2B 35a0529bd262cbd8aa11228714ac331d7cd8202bd79165db4bebe5d5a1895adb58440d52edd7fcbfffb8d9a2f86c44d7642b0328ffae0bbcbdcd5c48999fdd12 SHA512 425c4525b7aead4f68ed401eefdff81b3fe1f444c76e934a67e0f18a3ba17b52bf3a1398879fa929d97186da7d4cb485618aec74b671145560ba251f5d24af8b
+DIST c-rbtree-bf627e0c32241915108f66ad9738444e4d045b45.tar.gz 37838 BLAKE2B 5c40f444f43cb2f76c60fbd3ecedfb084ca39e90db9a297d630f6ca8ef931e52917e1ef1bd310d1024b003a37214d6549dce6f3d2b49f9b7e1f19441d04c64fa SHA512 6ac8e0eb7b704e2dfd1b69f9dd20ad08d490d13bcf7198d30825d5c8fb20d001998df3e5beece7346a1bda4341c900f63e3c67da9648ea8492607851946a1265
 DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e
 DIST c-utf8-a77769a6c5b40c4a2e900cb4d1b59535696ef7e8.tar.gz 24767 BLAKE2B 064b2b7eabf8b23fcbd841a863c6c10c5079a534c5cdc9326486b2c5a0d754c86300c58edfb1fafc3972335fd3a90eeb0b8a14531d1f911ab3148c332fb48ed0 SHA512 d7e6b4162b452cd6e05bf9cdea039a7acbb02a1d72bc0197149745c9416b11ec394c0ea1363c72a3082931f0f738b34a11124d9e2aa962e83f4739e65e571065
+DIST c-utf8-b245df543717ee19ad398f8139447e3807c11c96.tar.gz 21611 BLAKE2B 17ae3aa209361629e02ddd8d2725da85cf54c06d8c27ff706d736b130a854711efbeacce87f4cc20703dbeb8479efc6c4e67e9196d65b0f92e41a67a6d0cf987 SHA512 c868587efc0d14ff13525edcb4149f84fb9ac7a4cd7ef5e29fed9f374436c36ff318d54a4d2555874ec06ec60b40eb6399ada1fb32daa023727694d0a4a6190d
 DIST dbus-broker-14.tar.gz 179880 BLAKE2B bce75a5dacef22166c244151a1960119b1fb853357ffcdf5adf523223ed5a7beb2173fa872983cb1672c6fa2713e0a36916d7ff2ae6251c19bc0ec4ccc4e917d SHA512 7313a30facf2e64e98ac9d5e109b4ea2d5d0ad70bb4b82edd168ad7a7188b17710651b870827ae4d3b88db6dfdd41d4e9d0becea12307c481a581bfb524b572d
 DIST dbus-broker-15.tar.gz 181175 BLAKE2B 94a51451e17e898d2c83b49c2d5415fc97ae38d035464268a9036e980fc5de6c65a436c2c019f92d1244a57a620b4dd3c3cccb2681afc26047e124b41c15ddcd SHA512 efb54ec7bc1918918794b106066219d9367cbaffa777ca9b3809af2d5c42c704dd4255cfb69e93afdb0f4db2d1a9adcbd491998201057ad656754908b177e1d6
+DIST dbus-broker-16.tar.gz 187157 BLAKE2B 2a7a0abbfa3dc1398b6cd9ba78e77ab5d055b7d797183b322ab03fea92aeb9dfd3b5a168de6f193ee719ba09ad1c69ec9e3e8cc2697c08c12eebb7cfcd7b6a99 SHA512 f71261474898c3d100b35fd611a3284743ac7fe7cc65b43007893610c56f19660cff701fb8943b75988f2b3812c5433947d1181b4f8de22cbaf04063bb122237
 EBUILD dbus-broker-14.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
 EBUILD dbus-broker-15.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
-EBUILD dbus-broker-9999.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
+EBUILD dbus-broker-16.ebuild 2078 BLAKE2B 707e10ba5666dad7d176dab2ce7d35a352d1cb4928c720c6b0b45c9681e7e1200386e0d35407dc29da730a9028b17b447971e18cf4519c794831062aed404e3c SHA512 93c63e0a39bf9fc6022419d0f0b95f639e05b488ccf04c300f08398934c741b08eeacf80c1f3643ef728019dc8a85b0f36065c0a1847db35c52f9ca40384beab
+EBUILD dbus-broker-9999.ebuild 2078 BLAKE2B 707e10ba5666dad7d176dab2ce7d35a352d1cb4928c720c6b0b45c9681e7e1200386e0d35407dc29da730a9028b17b447971e18cf4519c794831062aed404e3c SHA512 93c63e0a39bf9fc6022419d0f0b95f639e05b488ccf04c300f08398934c741b08eeacf80c1f3643ef728019dc8a85b0f36065c0a1847db35c52f9ca40384beab
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-16.ebuild b/sys-apps/dbus-broker/dbus-broker-16.ebuild
new file mode 100644
index 000000000000..14fef904b6ea
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-16.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
+else
+	dvar=9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46
+	list=dda36d30c7d655b4d61358519168fa7ce0e9dae9
+	rbtree=bf627e0c32241915108f66ad9738444e4d045b45
+	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
+	utf8=b245df543717ee19ad398f8139447e3807c11c96
+	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz
+		https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz
+		https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz
+		https://github.com/c-util/c-rbtree/archive/${rbtree}/c-rbtree-${rbtree}.tar.gz
+		https://github.com/c-util/c-sundry/archive/${sundry}/c-sundry-${sundry}.tar.gz
+		https://github.com/c-util/c-utf8/archive/${utf8}/c-utf8-${utf8}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Linux D-Bus Message Broker"
+HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="audit doc +launcher selinux"
+
+RDEPEND="
+	audit? (
+		>=sys-process/audit-2.7
+		>=sys-libs/libcap-ng-0.6
+	)
+	doc? ( dev-python/docutils )
+	launcher? (
+		>=sys-apps/dbus-1.10
+		>=dev-libs/expat-2.2
+		>=dev-libs/glib-2.50:2
+		>=sys-apps/systemd-230
+	)
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry,c-utf8} || die
+		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
+		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
+		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
+		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
+		mv "${WORKDIR}/c-utf8-${utf8}" subprojects/c-utf8 || die
+	fi
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Daudit=$(usex audit true false)
+		-Ddocs=$(usex doc true false)
+		-Dlauncher=$(usex launcher true false)
+		-Dselinux=$(usex selinux true false)
+	)
+	meson_src_configure
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index f3dd9cd82a47..14fef904b6ea 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit meson
 
@@ -9,11 +9,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	dvar=f0a525477142f64c45b0be9393cc3b5dc3a6d6f9
-	list=071841c28d96e9104761af815a7ea367390c3174
-	rbtree=ba0527e9157316cdb60522f23fb884ea196b1346
+	dvar=9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46
+	list=dda36d30c7d655b4d61358519168fa7ce0e9dae9
+	rbtree=bf627e0c32241915108f66ad9738444e4d045b45
 	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
-	utf8=a77769a6c5b40c4a2e900cb4d1b59535696ef7e8
+	utf8=b245df543717ee19ad398f8139447e3807c11c96
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz
 		https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz
 		https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index 989475de5efb..99747f171faf 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -1,3 +1,4 @@
+AUX dstat-0.7.3-skip-non-sandbox-tests.patch 705 BLAKE2B 3a20e75fd1aaed47d02066b7c889c13b4e1d8a2f8fd9772973d99736eb7cdf1fa9b8c04126beace166a6ac65de5de8743b904e9fa20d60a3aeae706f7ca41d18 SHA512 efa1c6a807efc7fabf8566ec446be94922e1fe78191101648dc066f107474f1b89c4c8cac51d6d1ba7d4b1061ce0358abf317761ce52199479667da1684f0929
 DIST dstat-0.7.3.tar.gz 135583 BLAKE2B c846a06b6039e49944d43cc36178fed74fd4e0e3a1a4418dbe0e5987763995eb36dff0245cfa7107d446b8ac2ea500e13980f87e97aa8e5b8d566ee188be1639 SHA512 db37cc8bb7afd235ae9088e76c4defaa4d76651b111fbfdcd0980bc96376de20d57964912799a413397a79651730503bdeb8fea5cb97ab4d6d81632f528aefd2
-EBUILD dstat-0.7.3.ebuild 797 BLAKE2B 9846a833e6b416f09446c324141ec27cbfc7111cac5a2e45cb7b5bf15f99ea758b726a0b23d0622800f935735fefff49bc64daef79d567bea952625d4129c828 SHA512 cba3abfed39aac4d2d7fc02feef57f95f768d3c3d23ed0ee3a183a2ba9ca7299e67a3faa588ff429c53849c52610510e9a9c2ccaeb43482960e8b64c8219bdb7
-MISC metadata.xml 750 BLAKE2B d9ff390a9b80fa81887a4f4dea5aa925df36249c298add72c420e277bb7cb69b6cecc4c046dd714d2b0e3a3f7eb3a1d7b103c98c688f329099ee0af68151d60c SHA512 49b359fc5fc453c8d6e1246fb74d2dfbcef34b1a427c95db0aab7b736878c87f08548d7418f4ed8658c1bfb5dd8966bff840c1e4a7c0f081be9856c68e35c612
+EBUILD dstat-0.7.3.ebuild 865 BLAKE2B 60f79ac34d777a864ad9aaa154346323b7818e219833ff152597cf1f148f60439e19430e303b0ca3fc66c69538fde1d3744d91246fe5779644a73c77558fe52a SHA512 b4462000fcd9ff5554f6e3c5571997e0db595613efb13eaf7fe2a722a79e5115046039fd09ecac7578b661c6aec15a4180ff53f87dee51e17b3b9e11f95cfbe0
+MISC metadata.xml 943 BLAKE2B 3eb8757b717c959a6b187ae40393e737ac93941fa579095e7b73dd71400be60f3c75deb316b2509029bf369abb10ac5aae16bac306fbdbe480109d81088ef34b SHA512 6f6a07f819f8b710ce19a5ff28f3c1655a158a92cb2ccd05deeb3840c15702ca9d727e2c39d32ba8c9b52a8f45bdfe3c10da6241495c793aaf95564bab9ea0a4
diff --git a/sys-apps/dstat/dstat-0.7.3.ebuild b/sys-apps/dstat/dstat-0.7.3.ebuild
index cbdd1df1a54c..372d70a1fd0a 100644
--- a/sys-apps/dstat/dstat-0.7.3.ebuild
+++ b/sys-apps/dstat/dstat-0.7.3.ebuild
@@ -24,6 +24,8 @@ RDEPEND="
 	)"
 DEPEND=""
 
+PATCHES=( "${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" )
+
 src_install() {
 	emake DESTDIR="${ED}" install
 	einstalldocs
diff --git a/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch b/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch
new file mode 100644
index 000000000000..48eb542ed195
--- /dev/null
+++ b/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch
@@ -0,0 +1,15 @@
+--- a/Makefile	2016-03-18 13:03:22.000000000 +0000
++++ b/Makefile	2018-10-02 11:11:00.344942941 +0100
+@@ -32,9 +32,11 @@
+ 	rm -f examples/*.pyc plugins/*.pyc
+ 	$(MAKE) -C docs clean
+ 
++TEST_PLUGINS=--cpufreq --disk-avgqu --disk-avgrq --disk-svctm --disk-tps --disk-util --disk-wait --dstat-cpu --dstat-ctxt --dstat-mem --dstat --helloworld --md-status --net-packets --proc-count --snooze --test --top-bio-adv --top-bio --top-childwait --top-cpu-adv --top-cpu --top-cputime-avg --top-cputime --top-int --top-io-adv --top-io --top-latency-avg --top-latency --top-mem --top-oom
++
+ test:
+ 	./dstat -taf 1 5
+-	./dstat -t --all-plugins 1 5
++	./dstat -t $(TEST_PLUGINS) 1 5
+ 
+ dist: clean
+ 	$(MAKE) -C docs dist
diff --git a/sys-apps/dstat/metadata.xml b/sys-apps/dstat/metadata.xml
index 4fb9befed7d8..97a18fb59d10 100644
--- a/sys-apps/dstat/metadata.xml
+++ b/sys-apps/dstat/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>lmiphay@gmail.com</email>
+		<name>Paul Healy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 Dstat is a versatile replacement for vmstat, iostat and ifstat. Dstat overcomes
 some of the limitations and adds some extra features.
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 5ff32ae66e59..ebdafb433448 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -3,7 +3,9 @@ AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb
 AUX etckeeper-1.18.6-gentoo.patch 2812 BLAKE2B 4df25391aad119d6c01cb4e35cf83a1105c7f125079b3bb3418f8b7c6cff52400eeceff8cfe5785eb968b6c4a3e9fd1112fe1fd7b654982141d9a0b7596d0ce1 SHA512 2f399e12c7bbeef539fd846532068c18fd0becdab505cbe56759c6eb7f9c4463eff49526858ffa745d4bc50619685dab81811db257506f9b537bbd7af9986958
 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
 DIST etckeeper-1.18.7.tar.gz 77568 BLAKE2B 168b5b683c25a60c6626a678aed2f650106d4db554acbc239a2cd3c937f4b399ccca4f28fded30175c5787d8bd0907a25d62e6566e7902a2e914cd01513a8c2e SHA512 44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a
+DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c
 EBUILD etckeeper-1.18.6-r1.ebuild 1775 BLAKE2B 6b957febafaa09290c02a9946f9745ce28fbbd4652df0297ba10e3f10b6fc838ea819e672a72eb0870dce44293c184a294e5d0c6d4624b3ced129a5a9a7156b6 SHA512 e4fa61e5c49e2149adbc511466d995c03afc350df8ba5d767c493733e8a2ab4c24161a549e3628b33d2d808b1937678c6968e541362fac3ea3e23a4c9d0fc5b8
 EBUILD etckeeper-1.18.6.ebuild 1718 BLAKE2B 79005365182bb210feefd82d5b5230097433922fed15cc5efdb3fb81109d2f3493aaf0283e4eaf0a0cce4fc3cd059cdd411a7f649fd699cd2dba7b72fb598954 SHA512 91f3da5f0d1022e47038d45820b6e3daba1739fc9dd650a576023b8da487270b2f4babbaac30be91e99cbddd8b68595e2c8998fdaded81bf520154b6d0c91795
 EBUILD etckeeper-1.18.7.ebuild 1866 BLAKE2B f04bba588be503ba8d6acd96aeee63a39c60fe9463477cee3f1d45fc6a70fb43c067996d22172521f1ec25118ec1fdbf8b53d06443c45b4e450fdfab000d63f7 SHA512 e2e44061b211a5278e0bcabcc42a88ba5c46f09fa02d40d10b84369430e4d27977237c900b26f615e297bc70f7c58061d7dd03d05a3b6fadfa2ff6d90d5ec045
+EBUILD etckeeper-1.18.8.ebuild 1863 BLAKE2B 5d24b9337feaaba19b3b96d1999e7c6c8e763227d77db048a45add4ef750965386adb7667023eaf7427b250f7f80cb1551126abdf7be0a1a6ce47cfaa9f21828 SHA512 ca5bb103396b54d5d38124e267c22dbc0da2444b7ab85b6168be9289ce3ad08703c8bf15da3ab332c921c50a8d9262d4544973066eea8ab19999b74e72daa51b
 MISC metadata.xml 980 BLAKE2B c3c6a13f0b45eddef29c767f55c739298f6554e94f444723e19d6b93dd9af2bfda7aabcf8c6d0e56fba482b4067a2130c4474373708652eb9d8216119177fd7d SHA512 41d4b97b4073278af7543cd459c1c5bcfc951bdb6a6c2a201cba6cdc0e0fedc640fca5d9e59041951315a961f5eea284eb3c12260148bfbe97c11ee15b11ad9f
diff --git a/sys-apps/etckeeper/etckeeper-1.18.8.ebuild b/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
new file mode 100644
index 000000000000..2cd9ba354260
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 prefix python-r1
+
+DESCRIPTION="A collection of tools to let /etc be stored in a repository"
+HOMEPAGE="https://etckeeper.branchable.com/"
+SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+SLOT="0"
+IUSE="bazaar cron test"
+REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
+
+VCS_DEPEND="dev-vcs/git
+	dev-vcs/mercurial
+	dev-vcs/darcs"
+DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+	app-portage/portage-utils
+	cron? ( virtual/cron )
+	bazaar? ( ${PYTHON_DEPS} )
+	!bazaar? ( || ( ${VCS_DEPEND} ) )"
+DEPEND="${DEPEND}
+	test? ( dev-util/bats )"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch )
+
+src_prepare() {
+	default
+	hprefixify *.d/* etckeeper
+}
+
+src_compile() {
+	:
+}
+
+src_install(){
+	emake DESTDIR="${ED}" install
+
+	bzr_install() {
+		"${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
+			die "bzr support installation failed!"
+	}
+	use bazaar && python_foreach_impl bzr_install
+
+	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
+
+	newbashcomp bash_completion ${PN}
+	dodoc doc/README.mdwn
+	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
+
+	if use cron ; then
+		exeinto /etc/cron.daily
+		newexe debian/cron.daily etckeeper
+	fi
+}
+
+pkg_postinst(){
+	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
+	elog "	dev-vcs/bzr"
+	elog "This ebuild just ensures at least one is installed!"
+	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
+	elog
+	elog "You may want to adjust your /etc/portage/bashrc"
+	elog "see the example file in /usr/share/doc/${PF}/examples"
+	elog
+	elog "To initialise your etc-dir as a repository run:"
+	elog "${PN} init -d /etc"
+}
diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest
new file mode 100644
index 000000000000..dabe90e07503
--- /dev/null
+++ b/sys-apps/ethq/Manifest
@@ -0,0 +1,4 @@
+DIST ethq-0_5_0.tar.gz 15830 BLAKE2B b18326f1564d08f94500aa934838053a3b84b78f3d6fa90984c3730ac8922fbe3fd5141d5e9ff4a2c8db54bb8d2c2e493f5583f46b287324d4327583f29b8bf5 SHA512 989978e0dfbb553497f5325807f2d09e4e2842de9df5f5717e832312141adba3e99ef1d57dde4ac0fdd2919c9f5a0eadef5b5f76a300ab4ac7e881c8509fbbec
+EBUILD ethq-0.5.0.ebuild 1107 BLAKE2B c16d86af32ff3ab46cd9be8eb731a5dbabd6543325d92ec92a55bf36c0f85c0578e509361761877fd3f94d5b988866b54af9cbd7aa25b80ad7d81bb07d0f5254 SHA512 0fea1c575876caadc05f3f85a30eb2cab3a9bdd8bd3b0c006445c0a7be996715382b363c6575bdb370097e724ea6784aeb68c2fbaeca687e2f3ce93d59ba7801
+EBUILD ethq-9999.ebuild 1021 BLAKE2B 0951c541021a76b564a18b97bf262e113f00195448ae6fbe6ffa9abed38aeed94fe58f71365aaba4d1f772202fd9b9e24a1a7844aa7a1ef8d36624bef62a1780 SHA512 84363ea2108c843b9caf0b4970bb2392e2656f2f1caa8c3a923a7b35aa6390062324ec7d3fcad553d1b339e2366a1d886e05e5c5bc846c158cf708b9aba080a0
+MISC metadata.xml 627 BLAKE2B b215c0a1e6902bcab4f169740279965bb2b3b26e3bbd79e73aca34449942c6f49a5142758e1b726415f5094f737b86bc4f3625c94a2c575e14f00fbb140e7958 SHA512 c7d1186a0f354e9fa9d44569f7ab22e596d3b5dd996677d080da838f0f0274396fecf208751d7ff3e03123202391a4f1deed6c893310a64575d3a570094bc655
diff --git a/sys-apps/ethq/ethq-0.5.0.ebuild b/sys-apps/ethq/ethq-0.5.0.ebuild
new file mode 100644
index 000000000000..eaaf909be1af
--- /dev/null
+++ b/sys-apps/ethq/ethq-0.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV//./_}
+MY_P=${PN}-${MY_PV}
+
+inherit toolchain-funcs
+
+DESCRIPTION="Ethernet NIC Queue stats viewer"
+HOMEPAGE="https://github.com/isc-projects/ethq"
+SRC_URI="https://github.com/isc-projects/ethq/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="sys-libs/ncurses:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Respect FLAGS
+	sed -i \
+		-e '/CXXFLAGS/s/= -O3/+=/' \
+		-e 's/ -Werror//' \
+		-e '/LDFLAGS/s/=/+=/' Makefile || die "sed failed for Makefile"
+
+	if ! use test ; then
+		sed -i '/TARGETS/s/ethq_test//' Makefile \
+			|| die "sed failed for USE flag test"
+	fi
+}
+
+src_compile() {
+	# override for ncurses[tinfo]
+	emake CXX="$(tc-getCXX)" LIBS_CURSES="$($(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_test() {
+	local driver
+	for driver in tests/* ; do
+		"${S}"/ethq_test "${driver##*/}" "${driver}" \
+			|| die "test failed on ${driver}"
+	done
+}
+
+src_install() {
+	einstalldocs
+	dobin ethq
+}
diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-9999.ebuild
new file mode 100644
index 000000000000..a64bcead00ae
--- /dev/null
+++ b/sys-apps/ethq/ethq-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/isc-projects/${PN}.git"
+
+inherit git-r3 toolchain-funcs
+
+DESCRIPTION="Ethernet NIC Queue stats viewer"
+HOMEPAGE="https://github.com/isc-projects/ethq"
+SRC_URI=""
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+DEPEND="sys-libs/ncurses:0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# Respect FLAGS
+	sed -i \
+		-e '/CXXFLAGS/s/= -O3/+=/' \
+		-e 's/ -Werror//' \
+		-e '/LDFLAGS/s/=/+=/' Makefile || die "sed failed for Makefile"
+
+	if ! use test ; then
+		sed -i '/TARGETS/s/ethq_test//' Makefile \
+			|| die "sed failed for USE flag test"
+	fi
+}
+
+src_compile() {
+	# override for ncurses[tinfo]
+	emake CXX="$(tc-getCXX)" LIBS_CURSES="$($(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_test() {
+	local driver
+	for driver in tests/* ; do
+		"${S}"/ethq_test "${driver##*/}" "${driver}" \
+			|| die "test failed on ${driver}"
+	done
+}
+
+src_install() {
+	einstalldocs
+	dobin ethq
+}
diff --git a/sys-apps/ethq/metadata.xml b/sys-apps/ethq/metadata.xml
new file mode 100644
index 000000000000..61adaf0931ba
--- /dev/null
+++ b/sys-apps/ethq/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>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+	Displays an auto-updating per-second count of the number of packets
+	and bytes being handled by each queue on a multi-queue NIC.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">isc-projects/ethq</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index 3dec25d80739..bb5e57a5f7ec 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,3 +1,3 @@
 DIST fakechroot_2.19.orig.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
-EBUILD fakechroot-2.19.ebuild 527 BLAKE2B 6a003a18d75671344c0fb1da468dae6de3b65a514df7f41bd141fb08add3fcfceb82270c7dfe95032c3311c95cb941f3b598862e4860c7b158c5a784bd80e6cc SHA512 dd9a688b2517193882a785b640b030b9ed90083b465a80dcada4c23036a8169999b22de616e655329047e9844aedab83bb1c51c6c5b10badadbec363a0c10ac7
+EBUILD fakechroot-2.19.ebuild 534 BLAKE2B 162d4395be3776fb3ecad31f31cdf14178886bb84b9e6262b95029cd521be013383d4148e89c2323dd72d5a77ccb105f31803df5868f180b58b18e9f4228a4a0 SHA512 f94f9b68def8856248b72676a53741ccb13e89bb491ec061c43221369a1bde477ed27ff41581c8e3b96b4ebe9aee699318c5d4b3e2b89086c13bcf467fca26be
 MISC metadata.xml 217 BLAKE2B 6e1cd12af01db3565487a9412bae9a06912408439877e1a81fc466c0dc0612175846256a14be3b1102bbd43ac663311d34bc441b5d64caf9462c25ada2cfa3a3 SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4
diff --git a/sys-apps/fakechroot/fakechroot-2.19.ebuild b/sys-apps/fakechroot/fakechroot-2.19.ebuild
index 4064d50e4d8a..4ec6b04865ff 100644
--- a/sys-apps/fakechroot/fakechroot-2.19.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.19.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 
 RESTRICT="test"
 
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 5edf55f33e3e..609c539684ee 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -3,7 +3,9 @@ AUX file-5.33-berkdb_bogus_magic.patch 1133 BLAKE2B b00b3b1271d47bdcc75858d59350
 AUX file-5.33-gl_VISIBILITY-macro.patch 3209 BLAKE2B 50fa53df86ce25bbc1f64525a23adbd7f117d6f97e97dacc56031f564dfd2c4742a86128738acc0495869500c986273f815c5f49c24c79e8e0659fc26f3e38fc SHA512 e3d0be41d4889db8b77a7c8a56c0f7996071277e5288af18010c5736555b1a4f31ac1767969e8b3f1cbe8d4bc800e8c1faa27aa82ac58069faa2d314c6737ad1
 DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f08022ed1874e84fd0c84679b5a765383c5c5ad27a7216abc23b9c2211fb7110846122563e18285de0f0e51 SHA512 36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e
 DIST file-5.34.tar.gz 840219 BLAKE2B 20f34684e583d1cb42967f1106d979a42f55fd78097e26929ab4e6cd470b0d3a12c9f1fad89c982ed42869455ba0f3381c812ed00c31112e5ad17edcd50783e0 SHA512 57849f8496fd356a66e5559804fdd907059dc2e2f75ede470a25c65b1c499481aad3d7978454b15a15e94c07c9d6795864e8705304a2281dacf1c4e31501bed8
+DIST file-5.35.tar.gz 865425 BLAKE2B 325b95bc45b8e21b568ad816f8c1817dc170f56b78e460ac9bb18c70f22df2491c37f7f9c38c3d85010a7a609e75c26b19b6adef208137cb04c4c40fbe8c1d05 SHA512 cbecc52e9209be8bc090752d0672efa181625d4e1e688e63edd1f5657b29bad69364a477fb4ed85d1fa413b8002c8578c86153d2acaaecce78446c0ca6ea9e38
 EBUILD file-5.33-r4.ebuild 3325 BLAKE2B 4d3d5d900cde2eff2fa7c79ab577ce8fa6eb7e3379b0e8d4ca6978f7c551be6d046d2ff9f8f50ad9309f2facdd67ed4140a45e13ba5958bb4ee3968f18d2fe06 SHA512 8b69bec29f3b7dd8c1102bf52683c4195a26d2feaba4437767755084aa7768d5c2331c2ff8b3b2f8c956b8b8d348a421e9572b19f0028682e8fd2c9974257363
 EBUILD file-5.34.ebuild 3173 BLAKE2B 820282d182b13e9971fa9599456fa0ef53696970056600cf9d6b226a8694230bddbd667c7cb841017840df46d718d670dfbdafffb0a1c0695fc404eca28873a3 SHA512 27fee86b699c6caad4aa9e53177ee60ce56f6cb562811c1a62854ca40460eeab7c6f35e7c521af0d87d621bafee0e85429977a0dae188ebaaaa4b452747ae40e
+EBUILD file-5.35.ebuild 3170 BLAKE2B 38bedde390c583373f64786ea8105e197ed13631c2506fbb33d959391f0396c875631e16926954a4f4f3d2733e4902971ec22cf199cb22c98393728e756ca5d9 SHA512 61654de52a638abd61051bc3a2bc551373906d18feea41b948f91702c0ad04b00770d99a72c0dc49c5540bb87cf25329dc9784ac29e53892fe1565280d10c257
 EBUILD file-9999.ebuild 3259 BLAKE2B 786b89386f6070703ad7cbe15f93cce4ec2073a59c74db596c728e9fda8f6cb23b8023f8b482f33130f01a06742e7581b02e07ac812c944a586c842952161a36 SHA512 b1cb4176878e92d18ba2e63038d1b6ff271265a02a4e13f3c6319b1c81e0abc40cb595f5318d5b3116f949d24d9053d8ad9d39f4941520ea4ce5d5efccc9fc40
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.35.ebuild b/sys-apps/file/file-5.35.ebuild
new file mode 100644
index 000000000000..9ac215be618c
--- /dev/null
+++ b/sys-apps/file/file-5.35.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-libseccomp
+		--enable-fsect-man5
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		tc-export_build_env BUILD_C{C,XX}
+		ECONF_SOURCE="${S}" \
+		ac_cv_header_zlib_h=no \
+		ac_cv_lib_z_gzopen=no \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		econf --disable-shared --disable-libseccomp
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index f366c8e0a1a7..30047aee1a03 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,5 +1,6 @@
 AUX findutils-4.4.2-gnulib-date-x32.patch 1210 BLAKE2B 21c799083621d06e0505b8dba2a166d9136b4dd8b7be8053850d6051008300c601c28301f4932e17188ab24dbfff7c580a92954aab50adcc6ea7ac3b6d525266 SHA512 51bd15305d12a93f2a83faa359d1a2501fd96dea2c8dbed25cafa60c5d7f17b7a86d2d7dd0095dc0a6e0c1e9eaf2775bc6e1ceaadbdf5e2ffbaab6a4a4b9ff60
 AUX findutils-4.4.2-selinux.diff 15603 BLAKE2B 9fac4cb7a522cdce1c13ed4a7b60bba5d1778b0ec4b07e8e8b77461eece3373d516b4711749e531f951b5d95f9bf0594b569dbc54778b7ba305fa3add120608d SHA512 5fb4346b56cab0a470358e75c4c4a57f6709f7a987b1e6887242b9a4f241590adcaba7061d71752a5d2f8ac3598ecc1dffdb92b2bc072f5f31152088b88ed7f9
+AUX findutils-4.6.0-glibc228.patch 14434 BLAKE2B b125febb478b1abd7db298b6faaab139f6efb0ccd975d7f0abb1270eddc9e8cef20461d8f2aecb15adb74af54cfa6672c3b6b3eb13d8e7a2f502028c0060880c SHA512 ee02f9664e7f59dbd8a57e307f09ffbc8a383cef6ab4ddf0a1e79baa860ef5740120aaebeff7fdded1adc8b1d16b79bd4aec04d05653fa4f5f73619271ae7cab
 AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718acda183bf153cb42bf05bf48c4cb83b95721c0d7e4e2025d58a957fa07ba6fc1406702528b347eb410f627893eacc9ece40aab0cfeab SHA512 2b8024827bea7e0cd4e9f60c52bcef3147e2ba2236d10b2763e510c9e9e7ace8331034db7599f4792802b9dc1619f5086738dcece63b896c0a9ea73ab0068b27
 AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6
 DIST findutils-4.4.2.tar.gz 2149838 BLAKE2B be061487c8b50bbb8aa1e085dc46f9b71dcc465c884417531d56bda6dcf35746ec9c25f940ec660d83431787b88a3cb6931382326fdc3ab82575f236e9543163 SHA512 262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1
@@ -7,5 +8,5 @@ DIST findutils-4.5.18.tar.gz 3870196 BLAKE2B 766c072aed143313460facf8179ff3645f4
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 EBUILD findutils-4.4.2-r2.ebuild 1334 BLAKE2B 79b08e96148ec6a073aafcb00fbd1a49dd03861582744d3a9c02867d396a20aa1bdd5318e6b36148f90d5de1a639212c94111479868d819b285f579162836a6b SHA512 83c6b0066bc3ac61b50924fbfeba59bc7161987b402465fec1267ebd3d518331cbcf639fc6b5442a8ae9b3b7eb642d853b38883412328f0609a8a8fa4a058b6b
 EBUILD findutils-4.5.18.ebuild 1554 BLAKE2B c2fb2c7c3c49673adde0b9dfb136a05fa980cf47e0d5b8ff677883b580fe10e759ab87f808f249d5ea385645913f8a8cbc0e1f18cc8885e3aa57e9dd4e2d7bf9 SHA512 87e20215836682aaa186507908548737c25befa31d600dc144f5e1be93a580e63b467bbd24a483a2ba393324cdc91f399584a225d427e616417b056f952a875c
-EBUILD findutils-4.6.0-r1.ebuild 1894 BLAKE2B 8916b2ce41e96a88368e3ce6328f2aed26b8775b5906b26bfc8cab184da384a688be256865a1115b85ed050905f4733015ede517057b7e5b2ba62880589b1571 SHA512 4abb07dbc93d782ca59fa84a507d45193e8ae0d795175462c844d093406de6e134ac23bafd7206459770eda7f7a783b25afe58667eacd5c9dce63105f1f7e06f
+EBUILD findutils-4.6.0-r1.ebuild 1954 BLAKE2B a7e0dcd9564f3a2f4c5bd744acd131105898ee3f18e667c427bd2a411da9773fbd198f3ca8eeb14dba735546ddb962fcebc058a1077bb192d3274e0678a81a58 SHA512 319fccfcb878b2db2b9d5845ecaa0e447253c9e5df2ecdadb2d57d089a9b71be7e7497e9872e4d44e232110e0d7ee534ef4dc60414553d14a71cc2395bac5a61
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/files/findutils-4.6.0-glibc228.patch b/sys-apps/findutils/files/findutils-4.6.0-glibc228.patch
new file mode 100644
index 000000000000..651c2d265324
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.6.0-glibc228.patch
@@ -0,0 +1,335 @@
+Fix build failure on glibc-2.28:
+    fseeko.c: In function 'rpl_fseeko':
+    fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+       #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+
+Patch by milan hodoscek.
+
+https://bugs.gentoo.org/663242
+--- a/old/stdio-impl.h
++++ b/gl/lib/stdio-impl.h
+@@ -1,5 +1,5 @@
+ /* Implementation details of FILE streams.
+-   Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc.
++   Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -12,12 +12,18 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+ 
+ /* Many stdio implementations have the same logic and therefore can share
+    the same implementation of stdio extension API, except that some fields
+    have different naming conventions, or their access requires some casts.  */
+ 
++/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
++   problem by defining it ourselves.  FIXME: Do not rely on glibc
++   internals.  */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+ 
+ /* BSD stdio derived implementations.  */
+ 
+@@ -29,10 +35,10 @@
+ #include <errno.h>                             /* For detecting Plan9.  */
+ 
+ #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+ 
+ # if defined __DragonFly__          /* DragonFly */
+-  /* See <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.  */
++  /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/lib/libc/stdio/priv_stdio.h>.  */
+ #  define fp_ ((struct { struct __FILE_public pub; \
+                          struct { unsigned char *_base; int _size; } _bf; \
+                          void *cookie; \
+@@ -49,30 +55,84 @@
+                          fpos_t _offset; \
+                          /* More fields, not relevant here.  */ \
+                        } *) fp)
+-  /* See <http://www.dragonflybsd.org/cvsweb/src/include/stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.  */
++  /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/stdio.h>.  */
+ #  define _p pub._p
+ #  define _flags pub._flags
+ #  define _r pub._r
+ #  define _w pub._w
++# elif defined __ANDROID__ /* Android */
++  /* Up to this commit from 2015-10-12
++     <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
++     the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
++     see <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/fileext.h>
++     and <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/local.h>.
++     After this commit, the innards of FILE are hidden.  */
++#  define fp_ ((struct { unsigned char *_p; \
++                         int _r; \
++                         int _w; \
++                         int _flags; \
++                         int _file; \
++                         struct { unsigned char *_base; size_t _size; } _bf; \
++                         int _lbfsize; \
++                         void *_cookie; \
++                         void *_close; \
++                         void *_read; \
++                         void *_seek; \
++                         void *_write; \
++                         struct { unsigned char *_base; size_t _size; } _ext; \
++                         unsigned char *_up; \
++                         int _ur; \
++                         unsigned char _ubuf[3]; \
++                         unsigned char _nbuf[1]; \
++                         struct { unsigned char *_base; size_t _size; } _lb; \
++                         int _blksize; \
++                         fpos_t _offset; \
++                         /* More fields, not relevant here.  */ \
++                       } *) fp)
+ # else
+ #  define fp_ fp
+ # endif
+ 
+-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */
++# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */
+   /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
+-     and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
++     and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
++     and <https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/lib/libc/stdio/fileext.h> */
+   struct __sfileext
+     {
+       struct  __sbuf _ub; /* ungetc buffer */
+       /* More fields, not relevant here.  */
+     };
+ #  define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
+-# else                                         /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */
++# elif defined __ANDROID__                     /* Android */
++  struct __sfileext
++    {
++      struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */
++      /* More fields, not relevant here.  */
++    };
++#  define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub
++# else                                         /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */
+ #  define fp_ub fp_->_ub
+ # endif
+ 
+ # define HASUB(fp) (fp_ub._base != NULL)
+ 
++# if defined __ANDROID__ /* Android */
++  /* Needed after this commit from 2016-01-25
++     <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7> */
++#  ifndef __SEOF
++#   define __SLBF 1
++#   define __SNBF 2
++#   define __SRD 4
++#   define __SWR 8
++#   define __SRW 0x10
++#   define __SEOF 0x20
++#   define __SERR 0x40
++#  endif
++#  ifndef __SOFF
++#   define __SOFF 0x1000
++#  endif
++# endif
++
+ #endif
+ 
+ 
+@@ -81,7 +141,7 @@
+ #ifdef __TANDEM                     /* NonStop Kernel */
+ # ifndef _IOERR
+ /* These values were determined by the program 'stdioext-flags' at
+-   <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>.  */
++   <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>.  */
+ #  define _IOERR   0x40
+ #  define _IOREAD  0x80
+ #  define _IOWRT    0x4
+@@ -99,6 +159,8 @@
+                          int _file; \
+                          unsigned int _flag; \
+                        } *) fp)
++# elif defined __VMS                /* OpenVMS */
++#  define fp_ ((struct _iobuf *) fp)
+ # else
+ #  define fp_ fp
+ # endif
+@@ -110,4 +172,31 @@
+ #  define _flag __flag
+ # endif
+ 
++#elif defined _WIN32 && ! defined __CYGWIN__  /* newer Windows with MSVC */
++
++/* <stdio.h> does not define the innards of FILE any more.  */
++# define WINDOWS_OPAQUE_FILE
++
++struct _gl_real_FILE
++{
++  /* Note: Compared to older Windows and to mingw, it has the fields
++     _base and _cnt swapped. */
++  unsigned char *_ptr;
++  unsigned char *_base;
++  int _cnt;
++  int _flag;
++  int _file;
++  int _charbuf;
++  int _bufsiz;
++};
++# define fp_ ((struct _gl_real_FILE *) fp)
++
++/* These values were determined by a program similar to the one at
++   <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>.  */
++# define _IOREAD   0x1
++# define _IOWRT    0x2
++# define _IORW     0x4
++# define _IOEOF    0x8
++# define _IOERR   0x10
++
+ #endif
+--- a/old/fseeko.c
++++ b/gl/lib/fseeko.c
+@@ -1,5 +1,5 @@
+ /* An fseeko() function that, together with fflush(), is POSIX compliant.
+-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
++   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -12,7 +12,7 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License along
+-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
++   with this program; if not, see <https://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ #if _GL_WINDOWS_64_BIT_OFF_T
+ # undef fseeko
+-# if HAVE__FSEEKI64 /* msvc, mingw64 */
++# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */
+ #  define fseeko _fseeki64
+-# else /* mingw */
++# else /* mingw before msvcrt8.0 */
+ #  define fseeko fseeko64
+ # endif
+ #endif
+@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+ # if defined __SL64 && defined __SCLE /* Cygwin */
+   if ((fp->_flags & __SL64) == 0)
+     {
+@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #elif defined __minix               /* Minix */
+   if (fp_->_ptr == fp_->_buf
+       && (fp_->_ptr == NULL || fp_->_count == 0))
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+   if (fp_->_ptr == fp_->_base
+       && (fp_->_ptr == NULL || fp_->_cnt == 0))
+ #elif defined __UCLIBC__            /* uClibc */
+@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence)
+       if (pos == -1)
+         {
+ #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-          /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++          /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+           fp_->_flags &= ~__SOFF;
+ #endif
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++      /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-      /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+-# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000)
++      /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
++# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix
+       /* fp_->_offset is typed as an integer.  */
+       fp_->_offset = pos;
+ # else
+@@ -150,8 +152,8 @@ fseeko (FILE *fp, off_t offset, int whence)
+       fp_->_flags &= ~__SEOF;
+ #elif defined __EMX__               /* emx+gcc */
+       fp->_flags &= ~_IOEOF;
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
+-      fp->_flag &= ~_IOEOF;
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
++      fp_->_flag &= ~_IOEOF;
+ #elif defined __MINT__              /* Atari FreeMiNT */
+       fp->__offset = pos;
+       fp->__eof = 0;
+--- a/old/freadahead.c
++++ b/gl/lib/freadahead.c
+@@ -1,5 +1,5 @@
+ /* Retrieve information about a FILE stream.
+-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
++   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -12,7 +12,7 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+@@ -22,17 +22,26 @@
+ #include <stdlib.h>
+ #include "stdio-impl.h"
+ 
++#if defined __DragonFly__
++/* Defined in libc, but not declared in <stdio.h>.  */
++extern size_t __sreadahead (FILE *);
++#endif
++
++/* This file is not used on systems that have the __freadahead function,
++   namely musl libc.  */
++
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_write_ptr > fp->_IO_write_base)
+     return 0;
+   return (fp->_IO_read_end - fp->_IO_read_ptr)
+          + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base :
+             0);
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+   if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0)
+     return 0;
+ # if defined __DragonFly__
+@@ -53,7 +62,7 @@ freadahead (FILE *fp)
+   if ((fp_->_flags & _IOWRITING) != 0)
+     return 0;
+   return fp_->_count;
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+   if ((fp_->_flag & _IOWRT) != 0)
+     return 0;
+   return fp_->_cnt;
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index d59a80b99113..0d3700374197 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -39,6 +39,8 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-gnulib-mb.patch #576818
 	epatch "${FILESDIR}"/${P}-gnulib-S_MAGIC_NFS.patch #580032
+	epatch "${FILESDIR}"/${P}-glibc228.patch #663242
+	epatch_user
 }
 
 src_configure() {
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index b5e877cb6414..cccd304d4e51 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -3,6 +3,7 @@ AUX 0.9.48-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5
 AUX 0.9.50-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 AUX 0.9.52-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 AUX 0.9.54-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
+AUX 0.9.56-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 DIST firejail-0.9.44.10.tar.xz 216216 BLAKE2B 15e0a9b2dec55639006efc39271dc5317fc06c9a764109e4d11df37d564eee9d017d9cf83ebb16adf39a6229e3119072137a4256906366c5e52f7ad7b429c2b7 SHA512 d9d259c25964eeea87311353a4488e56d1bd65c024aa79f5f2493100f58de4904e081db42132e8d190a05a105fb51dba1d0ac174bf786dc3ec43f356380b3fa6
 DIST firejail-0.9.44.8.tar.xz 214624 BLAKE2B 05faddb65ea1736ff0a098f5ac8ae8bec62a74aa4e7cbaf1acc2d3c9b549c322a141ab424f73272ad2517817bfff053c798ca8acdfa4e11b1b0829bbdbda162a SHA512 5dc56e259b18c1bd853d15b44bd266b59f45b8ede7e370ce59bfeff7e390d7f4a1784c1c0986d039e2f8de6329984748c8ed287a4a715e95886607f0fd91fd4f
 DIST firejail-0.9.46.tar.xz 254748 BLAKE2B bf9c6af2bbc53c153d39c16b4d1720f61110e40b5b7a57fd1f4edc4d758d7edb3cbfde17dbc1865ab1d3ad7cfc58e28d0e4d6aab1109bcdf9a4fb0179d1f5c98 SHA512 839f3d6146129ceb9e9a613a51ce76d1d0a8a9ccab85c807bb0e71354b5c25fbc2a76e1004400bba8b70434dd886bc67250a2fe0b0eaa7d1ee65f6472bc9f786
@@ -10,6 +11,7 @@ DIST firejail-0.9.48.tar.xz 257592 BLAKE2B 6e346f97417ceb2fbd31779715b652130466d
 DIST firejail-0.9.50.tar.xz 279488 BLAKE2B 96d8e9161f0631ebfa400fd79c1d8d139d014da46cc2bf7fd3683f75ef7dced6a435e09e1733b675bc549662d50fddca9bd8811872a5ed186d731bb3c16903ea SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d
 DIST firejail-0.9.52.tar.xz 299396 BLAKE2B 62b7798e46b69f1ae12ac85f219cc7414652e64d3bf9e1b206f8956febdc53c78151f08052fe694c691b787356b6821e8ff0df71a4277a238a4dc7d724165969 SHA512 f7318bcbd68f6d8c709cdc1f5065cb1019c1c64fdbd47c0fd698975412c4e075c7209bd275056daf61558b79d79127c88f1580cb8e4e034cc0551c7d34e11d06
 DIST firejail-0.9.54.tar.xz 315884 BLAKE2B 62eaf42711aa3560c7ecb965903b64b10e04ea2898950b13c5371d859ccb1633634e1455c5558bf6fc02211d9937270fbc82cdd8409ff060f3a2c5aa8eb51517 SHA512 84bb5992ea4846d4398cc72dd9d65a8c4f20da9a2798ccd74a9157088313b768ef361bada62617d02b31174bca4b95e6560140f448021e1b93740a37992fe3df
+DIST firejail-0.9.56.tar.xz 327336 BLAKE2B 4fe2276c3007e995ca2113ef870918287e1178ff0effdcd5d635fce6d170b6c3df2f75b45315fed1e58e1c993324b84091f7e6912493608233f96661c85ce7e2 SHA512 f9685be0cbfdf45f8f895041c63e005da483d9b09482ebda2776633ae0b048cd355b57bf4431348295507059633dfda45b0c8b2c1f4a83ad02ff661d32448d24
 EBUILD firejail-0.9.44.10.ebuild 1073 BLAKE2B c23401fc4ec21fb065ec425cbfb0884ecbd8ccb47de2a8440b8cc06684c4700f323045336ef7e932c42d688a8f728dae30cd07ca4c84535c730a2c84960c4ed7 SHA512 f325496430f7b4603cea1e9401398d7ac36ca7904aa89c5c4a99ab07a03a38d38b34f85078a0ce1b2928464ff6290817e1ae0525d5efcefe12c74fa82506514f
 EBUILD firejail-0.9.44.8.ebuild 1072 BLAKE2B 645fa0f1fc4663dcedc59a8751e78a136a8e2a95c069f9842fec18feef4a39dc3db3c2a9b899bb59ff9c601d6be7f65574d137d59d5998164987c5fe0e4ed694 SHA512 37ebb09a4198526c968e569aab7c0b9ed8b55ca60c5b0e48a14d9deceb458a8ad63513a3867f2c28da0ede185e656cc32309873303eae498ebcd691662480e97
 EBUILD firejail-0.9.46.ebuild 1172 BLAKE2B 9135994888bbaa4993a28a82b21f1e15b5fb8aa61916f3f40b8ef2f11eab2dbddda43585b0bc0d60d5065fcf0dc8f6f1e565b713d65f7857ea07cc17ab031fda SHA512 425127acc54623c7a4715a1170a620720030a126937bcadcd8322736751178d75501c4cd8ec88a22ee036e137b405cad88885f1b331eb8856ce510c21e57538b
@@ -17,4 +19,5 @@ EBUILD firejail-0.9.48.ebuild 1172 BLAKE2B 9135994888bbaa4993a28a82b21f1e15b5fb8
 EBUILD firejail-0.9.50.ebuild 1171 BLAKE2B 5b36b05b69a2936a8a94e56950fed464abc9719960305adbab0a228baedd930492ffca5cba4097db8ca68ca4371db74eaebbf702dd136876941c9a4556cbf0fc SHA512 639bebf94119505b10629c481c5db8df7eff476d84afe9795f4b9b9d56bb720c9e2a2507e9c50fa8156156badbe5ccfddc1d5f6f15b6b16591a594a4eea4b0df
 EBUILD firejail-0.9.52.ebuild 1172 BLAKE2B 5f3823c3164430d96a09f43dfad141baa75c204b1d31a6320aa1bda9c0cf89dd368a10aed89be01f74b2dcc670d944d181883502a63283b4d392494a41cf4cea SHA512 5164b018431a665f66073d1f0d182e736cfda8a0ec0fa9371f93f7f77d4ee2b7fabc2a02a2363ae0d100d0b0bd987e3cab153a97aa6d2cdfea3b5cf9a9ca5965
 EBUILD firejail-0.9.54.ebuild 1198 BLAKE2B 667e689b728eb60cea02afbe4f3afa2cfc0f9116bcc3bb57c6ba80ce417fe726c44b1a39b9c922a08c9d744b830d4300323e86fe6d79dbcd4e8c36c321641f2d SHA512 0ab3d2b8772981fc713f525acfad263a34fac2191b2a2ea365e0470d7da5f884b7414147bad6128f77e66a5f863f6b4f703911b1b6654f2056b0ffebde32a97d
+EBUILD firejail-0.9.56.ebuild 1080 BLAKE2B 3b582b3ecd88c9ec67bb8033c3d5c545e01a9f9e8121ca4986131d786dff15150f27d3d61942b41b590f9e21e643cd6f2695247c6f3b251809ae5cea046e3ecb SHA512 136fcf1f21e23427766e2580c2b94702700d7cc4bde298a28c4cdd82d47425f30dc84123434229e1a0d71d231565e3904ecb0438fcf19293b8699af9ef80490c
 MISC metadata.xml 1627 BLAKE2B 1029e5cce7af2355b66b4c600e96273669a0876ebc1c85dd1c169eaf6419e48d4173db1a99851963ace27f90b7965d7032a00309f124ffe3545d3325b450fcbf SHA512 081d4f02dafd4c82aca839117c52b744ba50d3816b2ee01916c8f5fe60ae914717c7d3a36cdd0d064f3bc2ae1d4a7fa75e946536fce509c6aac37c84832ef946
diff --git a/sys-apps/firejail/files/0.9.56-contrib-fix.patch b/sys-apps/firejail/files/0.9.56-contrib-fix.patch
new file mode 100644
index 000000000000..7192bba34807
--- /dev/null
+++ b/sys-apps/firejail/files/0.9.56-contrib-fix.patch
@@ -0,0 +1,36 @@
+diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
+--- firejail-0.9.48/contrib/fix_private-bin.py	2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fix_private-bin.py	2017-08-27 23:19:52.868481040 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+ 
+ __author__ = "KOLANICH"
+ __copyright__ = """This is free and unencumbered software released into the public domain.
+diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
+--- firejail-0.9.48/contrib/fjclip.py	2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjclip.py	2017-08-27 23:19:58.476562539 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import re
+ import sys
+diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
+--- firejail-0.9.48/contrib/fjdisplay.py	2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjdisplay.py	2017-08-27 23:20:01.932612762 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import re
+ import sys
+diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
+--- firejail-0.9.48/contrib/fjresize.py	2017-05-24 23:01:32.000000000 +0100
++++ firejail-0.9.48.new/contrib/fjresize.py	2017-08-27 23:20:06.932685422 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import sys
+ import fjdisplay
diff --git a/sys-apps/firejail/firejail-0.9.56.ebuild b/sys-apps/firejail/firejail-0.9.56.ebuild
new file mode 100644
index 000000000000..e3704836fb2a
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.56.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apparmor +chroot contrib +file-transfer +network
+	+seccomp suid +userns x11"
+
+DEPEND="!sys-apps/firejail-lts
+	apparmor? ( sys-libs/libapparmor )"
+RDEPEND="${DEPEND}
+	x11? ( x11-wm/xpra[client,server] )"
+
+PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" )
+
+RESTRICT=test
+
+src_prepare() {
+	default
+	find -name Makefile.in -exec sed -i -r \
+			-e '/^\tinstall .*COPYING /d' \
+			-e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+			-e '1iCC=@CC@' {} + || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable apparmor)
+		$(use_enable chroot)
+		$(use_enable contrib contrib-install)
+		$(use_enable file-transfer)
+		$(use_enable network)
+		$(use_enable seccomp)
+		$(use_enable suid)
+		$(use_enable userns)
+		$(use_enable x11)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index cab23c9f584e..73ed937f94b6 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,6 +1,6 @@
 AUX fwupd 291 BLAKE2B e8125cdf0cb70adb3e9fb962383da71a101816764a022c13de2812f501bddabeea87a35eeb18096fb748d17f61592d8714661efb5bbad2b0393b76902ed1f3bf SHA512 ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766
-DIST fwupd-1.1.1.tar.gz 1669430 BLAKE2B 92073f1e3b6c6b68da48de792d58d218c0b0bfce2a3765c257253d6fb93974dccadc2ae71ab6275d0e9ad6775642eba1e2613ad2a3f11cd4d4225affdedc7561 SHA512 b825b565b6c85bbf703352eb0aff40de8e348c96537316373de718faf82bbdd425ba1b8091d1ab4b5403f2fbe46ceda45a502a5fea4ad3bd51e6cc5a2aad6ddc
 DIST fwupd-1.1.2.tar.gz 1690384 BLAKE2B 988c27dbc522b27f03c94072aa85930f77d5b115aea93e485e9da853cea4f37a44aa6f8af542b24e5cd2f1ba65f4ede52e2f15dc2a366d2fa27370d8bda76164 SHA512 f9ca8d34608ee7b7fd2047c9897a898a8680da096db2fb123e698c9b5443d4285d91d67aa1fb928f3c653e9a6d3646a0228a0a630f9262b80e47525591b5659e
-EBUILD fwupd-1.1.1-r1.ebuild 3078 BLAKE2B d6a888e5d80eea9c916c43ac446edcd3dc7f866f0fc6b1159fb73a97eb41602cdb4b9d9ce909786eb63e415b63fa645b18181206cb2aae79d81cd0d4f28f3377 SHA512 20f7fb99062c561fc3eb12c674a811d47969177dafb393ea33df8caa613c2ef68804cbc3d4d7c6dd11d8586d5708b48aea8d069754a3229bd4c79189453bf7c1
+DIST fwupd-1.1.3.tar.gz 1731079 BLAKE2B 7de39c00d96b9bed29e7ee04c46f71ed033c53e2b132bfd220b932217ab3bb5c6b0bc24adc594cf2f27c483e22e7366aa90172db93757fcb48894b9573269bca SHA512 7f0899cfeb5119c35d7eacdafdc3367de1d2da29942d0099983a05f633ae95a28e16c00b46ad405f1ac60e679cf6bd5dcad2869c2bd48f936ea2c29a3c235c27
 EBUILD fwupd-1.1.2-r1.ebuild 3215 BLAKE2B 4573ec59c93dd5d399bc2a2cdbb8743ced4f842084d34a553e1631693d204d4b8439e915b73de1a1b67726c335dec41128708e82463bdecd05855835a8c0b1fa SHA512 419bbfb78209be21f077b78e5c7a8a9c62ee52358fd0aa22a76d6ff866ff4f80446053f0c45b55b644e40082f49981b78d75d61d07065485bec7c7b7ab4ae628
+EBUILD fwupd-1.1.3.ebuild 3214 BLAKE2B c4c1d20d591e7eae1f6a75c73b497a6c384218ba0bdcad2e567528f75878cb21590ec0e9526809b514bbc69621373373bd28ce90ed53878080301283097cc760 SHA512 8bf8ff7f1ffd74364632945a0e82e5a0bdeea0f5cc38aeca82d7b3a738da54d2997940bcea624e53af8c43982b06f28ae0629486033c5c03bc71c3f10beecd95
 MISC metadata.xml 948 BLAKE2B 8578206c4d73e98035e7af30868d299d8dc06db4ead6c60e7d5027f4f4de2db2fbb3e7fb351b4c936bc076559691af8a431df9f52a3613179b98da0305f62455 SHA512 0eeb5d9923b201a0803368b709586dd46615441300d764140e08fcfdf70189ee197d66ec603b5a9c26b8ec48fed960964c7844bd33cc50747042391e94196c31
diff --git a/sys-apps/fwupd/fwupd-1.1.1-r1.ebuild b/sys-apps/fwupd/fwupd-1.1.1-r1.ebuild
deleted file mode 100644
index 7ea5b6e73fc7..000000000000
--- a/sys-apps/fwupd/fwupd-1.1.1-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
-
-# Package requires newer meson than eclass provides
-MESON_AUTO_DEPEND="no"
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 vala xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc +gpg +man pkcs7 redfish systemd test thunderbolt uefi"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	dell? ( uefi )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.7.4:=[introspection]
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	>=net-libs/libsoup-2.51.92:2.4[introspection]
-	>=sys-auth/polkit-0.103
-	virtual/libelf:0=
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? (
-		dev-libs/json-glib
-		sys-libs/efivar
-	)
-	systemd? ( >=sys-apps/systemd-211 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
-	uefi? (
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/gcab
-	app-arch/libarchive
-	>=dev-util/meson-0.41.0
-	>=dev-util/ninja-1.7.2
-	virtual/pkgconfig
-	$(vala_depend)
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	test? ( net-libs/gnutls[tools] )
-"
-
-# required for fwupd daemon to run.
-# NOT a build time dependency. The build system does not check for dbus.
-PDEPEND="sys-apps/dbus"
-
-src_prepare() {
-	default
-	sed -e "s/'--create'/'--absolute-name', '--create'/" \
-		-i data/tests/builder/meson.build || die
-	sed -e "/'-Werror',/d" \
-		-i plugins/uefi/efi/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		-Dconsolekit="$(usex systemd false true)"
-		-Dgpg="$(usex gpg true false)"
-		-Dgtkdoc="$(usex doc true false)"
-		-Dman="$(usex man true false)"
-		-Dpkcs7="$(usex pkcs7 true false)"
-		-Dplugin_dell="$(usex dell true false)"
-		-Dplugin_redfish="$(usex redfish true false)"
-		-Dplugin_synaptics="$(usex dell true false)"
-		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
-		-Dplugin_uefi="$(usex uefi true false)"
-		-Dsystemd="$(usex systemd true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	doinitd "${FILESDIR}"/${PN}
-}
-
-pkg_postinst() {
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.1.3.ebuild b/sys-apps/fwupd/fwupd-1.1.3.ebuild
new file mode 100644
index 000000000000..50ed19c99320
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.1.3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Package requires newer meson than eclass provides
+MESON_AUTO_DEPEND="no"
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit meson python-single-r1 vala xdg-utils
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colorhug dell doc +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dell? ( uefi )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-arch/libarchive:=
+	dev-db/sqlite
+	>=dev-libs/appstream-glib-0.7.4:=[introspection]
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libgusb-0.2.9[introspection]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	>=net-libs/libsoup-2.51.92:2.4[introspection]
+	>=sys-auth/polkit-0.103
+	virtual/libelf:0=
+	colorhug? ( >=x11-misc/colord-1.2.12:0= )
+	dell? (
+		sys-libs/efivar
+		>=sys-libs/libsmbios-2.4.0
+	)
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	nvme? ( sys-libs/efivar )
+	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+	redfish? (
+		dev-libs/json-glib
+		sys-libs/efivar
+	)
+	systemd? ( >=sys-apps/systemd-211 )
+	!systemd? ( >=sys-auth/consolekit-1.0.0 )
+	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
+	uefi? (
+		media-libs/fontconfig
+		media-libs/freetype
+		sys-boot/gnu-efi
+		>=sys-libs/efivar-33
+		x11-libs/cairo
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/gcab
+	app-arch/libarchive
+	>=dev-util/meson-0.41.0
+	>=dev-util/ninja-1.7.2
+	virtual/pkgconfig
+	$(vala_depend)
+	doc? ( dev-util/gtk-doc )
+	man? ( app-text/docbook-sgml-utils )
+	nvme? (	>=sys-kernel/linux-headers-4.4 )
+	test? ( net-libs/gnutls[tools] )
+"
+
+# required for fwupd daemon to run.
+# NOT a build time dependency. The build system does not check for dbus.
+PDEPEND="sys-apps/dbus"
+
+src_prepare() {
+	default
+	sed -e "s/'--create'/'--absolute-name', '--create'/" \
+		-i data/tests/builder/meson.build || die
+	sed -e "/'-Werror',/d" \
+		-i plugins/uefi/efi/meson.build || die
+	vala_src_prepare
+}
+
+src_configure() {
+	xdg_environment_reset
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dconsolekit="$(usex systemd false true)"
+		-Dgpg="$(usex gpg true false)"
+		-Dgtkdoc="$(usex doc true false)"
+		-Dman="$(usex man true false)"
+		-Dpkcs7="$(usex pkcs7 true false)"
+		-Dplugin_dell="$(usex dell true false)"
+		-Dplugin_nvme="$(usex nvme true false)"
+		-Dplugin_redfish="$(usex redfish true false)"
+		-Dplugin_synaptics="$(usex dell true false)"
+		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
+		-Dplugin_uefi="$(usex uefi true false)"
+		-Dsystemd="$(usex systemd true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	doinitd "${FILESDIR}"/${PN}
+}
+
+pkg_postinst() {
+	elog "In case you are using openrc as init system"
+	elog "and you're upgrading from <fwupd-1.1.0, you"
+	elog "need to start the fwupd daemon via the openrc"
+	elog "init script that comes with this package."
+}
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index d03878eb7f3e..cb0820025b78 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,5 @@
 DIST grep-3.0.tar.xz 1375156 BLAKE2B 19f5441ed3fe5bb16d9d8327e76f0beb7eb837b727f6da99844dc9c74eb4def9eab857059c527e651758fa224a6f4079ec5939806645806f2db341ed0cb727e4 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58
 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
 EBUILD grep-3.0.ebuild 1358 BLAKE2B d3dd5e78bf8763f54b30e1447b61248673d0da1151458c6bcd0bfd4dcd4784e45aac6adb71b2cb26cab95762e0c7ec5d54c0ea85ea01df174bc2e0367ba3499e SHA512 3778bc0473f795069196d67b7b806f368994396454d0255c9d37a68b33e35e1b8415c8760373819aa59c12ab2533faf30fb27dad032da40007781ac05fe8cb09
-EBUILD grep-3.1.ebuild 1402 BLAKE2B dd1e60f885b919e2c9baa0b5ab6119011553171b503f0986172fdcf03920a74c1d587cc0058715666ebb94a26b5fd05ec032e957e95d6db956997a10ce4d3ed1 SHA512 0d4f22aaf6ef1e60bfbab6a3b11e9096fa9e0e3d984f109a55138c69b63a28336c19d85bbef237ace38157ee9ce082917014d6cb85bb4ac22d8857bb3eb3e7e9
+EBUILD grep-3.1.ebuild 1395 BLAKE2B 03e82ee1da75c7a2cc4f021f851a1f5fed420a3425359059e626a90f2d889fa42cdcc52abdc51e2ec410d16ed3506ae79fb8ca67c1179fbd2158bab8dca445a3 SHA512 5f25a2f668f86f8044d278fc8d8b814dcf3414c3e2ca764568af3a165d742eb180d9a0e9886a17322c9b489c6218de3aed986ff8f728e28011289915047fd016
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.1.ebuild b/sys-apps/grep/grep-3.1.ebuild
index 24f509c2bfa5..05ec1d0402d6 100644
--- a/sys-apps/grep/grep-3.1.ebuild
+++ b/sys-apps/grep/grep-3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 2aa70c162781..9a6ff9ad703f 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -2,12 +2,10 @@ AUX hdparm-9.48-sysmacros.patch 474 BLAKE2B 846b0ff44445fc50dcc9f0de00ee936cda84
 AUX hdparm-9.51-build.patch 1210 BLAKE2B cb35c2fa451a0746ffc2f431ef3857b313f1e8c1e0cac7297deb5113944cb642a38734f1ba7d8538c1c1b4b0ec322827f87eb8e91520623712f3db67379c8aae SHA512 d8efe50cc8ab963be2ace3e52e077e3be8d266b2c5c293febe344fc53760d53c1b52f7bbd1c7813f7a7979a6e4ebc52cb808dc3797f6e1ac7949ac5f9696239a
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
-DIST hdparm-9.51.tar.gz 133725 BLAKE2B a507046d1026e901fb0feb9c61dac60d8bf8427f7ac62cbde58c8aeaed1f317b3d6a71c1de039516bf9b9b5dd221d87f1e52dc318b1f3b551bb1f40fbb26830c SHA512 144d073d697d05058e0240ff46e5517803baa8475e1d381a31c25179ceb1564bbb561ba7f9dee8654d80a3510e3bf2f2d2f4a267618f0ab27967f37626aef91c
 DIST hdparm-9.52.tar.gz 140737 BLAKE2B 0614bfb0844f088b533951c4636bf92879c4ff7e9bb4d150965e936eaa2a4e0ffd350689fc359757a2f9e80a6c93cd111a25b8e2824737e01b4deb6e543b2868 SHA512 7c37d1381c1dd2d46762a8cdcaba2015b0b051ee7bd135dbcf6346def51b085cc2f9ecd7e1ebdc67e12ab4b765df548d4757b3700ed6e7514c2b13ed40661c59
-DIST hdparm-9.55.tar.gz 136805 BLAKE2B 0739295dcc80a2b774b2edd8c447ee739476e5fe55695e22f867de2c8352746ac8dcbef220554a36bcb9417317f44c433cbbd807629ef7514b5e1d93be56c280 SHA512 a9b5be38fda9db7f125ecc5a174668e81464266493672184d214ea9b50437e089482799fb5c817c433f897eac8741fe3dc052658969bb1ebac158606dee51196
 DIST hdparm-9.56.tar.gz 137213 BLAKE2B ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd SHA512 5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
-EBUILD hdparm-9.51.ebuild 1057 BLAKE2B 301fef8bbd555444009d97aaa19b70bef9ac29051f36e508cc102464823b95eac989e0ff804b167699da76babd48bcece26a4e6f2f56743cdfea94d210a90652 SHA512 fdca7a1af7e4e5fa7ccaaf8abe0c4ca2afebde913853f3d8cb1928773ee945480220f77e527c713e7f9d817a6fcf7d51612617b4fc25df0c35741f7257b17e8d
+DIST hdparm-9.57.tar.gz 138791 BLAKE2B de4eea48eabaaa0fbfd505e0d23d260a87570407dbb6670c61afd396c3e757aa9d9bb7dedc3e128fd0a0f4f127e050e509bf70168e8666b6f9247a80072bd030 SHA512 c816e0cbf3a68a6a15de8c8e7b6448995f22c32c6f6b1e16ece725e61900b1aed2ff6ccd69b20aeccca003b290bfe3c12ce5917146e14d0dfab11305d6a394c9
 EBUILD hdparm-9.52.ebuild 1057 BLAKE2B 6a29ec1c584e1be1d7cab0831303d07a4622f9bf3f58b0bd68ed2a7b4a64f91ede06d3b967afe0b8427c98e071d2149b1887ea35ad4e48ab2a3ea1f807b3400a SHA512 98961f82c74bf33fa2deb324605f4485687e81de8cb3ffd8dc2f2591d12d9a06421ce670ef10e28f71844786c24709d503d7fdebca890c5645eac78034d9bbc4
-EBUILD hdparm-9.55.ebuild 995 BLAKE2B 60ecc008af48a81bbf1db8bbc0ba60a0fcf217e4b35267d8cb2cb2db01ab26fd33e3652c277fc85b039065ca98f7ac9b539d14d73adc8c56727924c9368e1159 SHA512 5e92cf3b1f13d46ee0ea91a86f069dda3f7898a6ffdb7d2cd5aa6826f33d70cdc1ad1692464007239c2170b0535e5993767a8f947abf9f25e19de3b137e35b72
-EBUILD hdparm-9.56.ebuild 995 BLAKE2B 60ecc008af48a81bbf1db8bbc0ba60a0fcf217e4b35267d8cb2cb2db01ab26fd33e3652c277fc85b039065ca98f7ac9b539d14d73adc8c56727924c9368e1159 SHA512 5e92cf3b1f13d46ee0ea91a86f069dda3f7898a6ffdb7d2cd5aa6826f33d70cdc1ad1692464007239c2170b0535e5993767a8f947abf9f25e19de3b137e35b72
+EBUILD hdparm-9.56.ebuild 984 BLAKE2B db15fe1aa53350b5ff3b447b72fd4a0e3126fa601257cb0b87755af60efb086db94ad97f78fb141b40fc63529e2e6fc7066236b9d6ff5eac486d1790615c2a06 SHA512 af826745c4f21e2500dae758b888643810384825cb2b8e6f629d24c8532f9a7e4a01feebb779eca4e58134d6fd7b2d9541b3da976b3759f4bdbc9029f7df8085
+EBUILD hdparm-9.57.ebuild 992 BLAKE2B 8447286f9f0b65a89e091a37d4b875c9153965c72a6727db1d330b3fbeea6269d759b69f49b3e26413011e7874e62e0eddca60f74ca4a907d042d2557a4c3bf7 SHA512 b808f3d1685042b2663e5e73cd2eba2b7a920cb2fa7eface0f48740a998ffa0a90b75b24e72e0038b51bcce5140d21b16c97cabec618586a3fe6a58a6234721c
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.51.ebuild b/sys-apps/hdparm/hdparm-9.51.ebuild
deleted file mode 100644
index 6a190878d36b..000000000000
--- a/sys-apps/hdparm/hdparm-9.51.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 toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.48-sysmacros.patch #580052
-	"${FILESDIR}"/${PN}-9.51-build.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	use static && append-ldflags -static
-}
-
-src_configure() {
-	tc-export CC
-	export STRIP=:
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl
-
-	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
-	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
-	doman hdparm.8
-	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
-	docinto wiper
-	dodoc wiper/{README.txt,wiper.sh}
-	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
-}
diff --git a/sys-apps/hdparm/hdparm-9.55.ebuild b/sys-apps/hdparm/hdparm-9.55.ebuild
deleted file mode 100644
index e4ef9c841faa..000000000000
--- a/sys-apps/hdparm/hdparm-9.55.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
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.51-build.patch
-)
-
-src_prepare() {
-	default
-	use static && append-ldflags -static
-}
-
-src_configure() {
-	tc-export CC
-	export STRIP=:
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl
-
-	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
-	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
-	doman hdparm.8
-	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
-	docinto wiper
-	dodoc wiper/{README.txt,wiper.sh}
-	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
-}
diff --git a/sys-apps/hdparm/hdparm-9.56.ebuild b/sys-apps/hdparm/hdparm-9.56.ebuild
index e4ef9c841faa..cc9b435bfe9d 100644
--- a/sys-apps/hdparm/hdparm-9.56.ebuild
+++ b/sys-apps/hdparm/hdparm-9.56.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/hdparm/hdparm-9.57.ebuild b/sys-apps/hdparm/hdparm-9.57.ebuild
new file mode 100644
index 000000000000..71243dbbf090
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.57.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="https://sourceforge.net/projects/hdparm/"
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+LICENSE="BSD GPL-2" # GPL-2 only
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.51-build.patch
+)
+
+src_prepare() {
+	default
+	use static && append-ldflags -static
+}
+
+src_configure() {
+	tc-export CC
+	export STRIP=:
+}
+
+src_install() {
+	into /
+	dosbin hdparm contrib/idectl
+
+	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
+	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
+
+	doman hdparm.8
+	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
+	docinto wiper
+	dodoc wiper/{README.txt,wiper.sh}
+	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
+}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 84281e83d5f2..6fb978c0b3fe 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,8 +1,8 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
-DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
 DIST help2man-1.47.7.tar.xz 200128 BLAKE2B bdac9d1db29b03bbb8e41caecfdf3a7273b69d9b9fa2e206b2e6c28d1144c3104b8d4b7d4a43aab1b405bffd6e097db63a2f4e97a76dfcd980ee5d8a9ffc2114 SHA512 e6ec25d973df68edde87d3314b1bef2e679d57d4c9e024bca17362b9da058c80314050e1ae61d73179b8c2662c8692caa1f223fc48b8d02f2d4f040d16e51d14
-EBUILD help2man-1.47.4.ebuild 1069 BLAKE2B 389e39c59f7fc01a5f38f52768e952ecfc5a773cf9ba99219415f1ee48632b8aebc83d641a8b7db8918a74032f45828f1c04b27363532ac0c76449e6c8af9670 SHA512 6d3bcd6558285498dbc900e5b500327c341c5314b08bfe2205567a8e529dffb86f1d5e335fc0b3f00665c0008e08a008d59a51175fad95cdc26db7297f37d96a
-EBUILD help2man-1.47.6.ebuild 1043 BLAKE2B 2fe0d25baacac4a7179380f4787d1b6b339c8551923b1f619cc81c3111ea8a289b8730742431aa3180b77dcad4257871116e436b0edf65702cf468550ead6bac SHA512 bc782810b7953cabcabc34ba7ec63dfa648e8756a586973e29f2510f58e395c034703735884a211d6cb3438d923fbf539a0470fca5ee603673b5fc83298898da
+DIST help2man-1.47.8.tar.xz 200264 BLAKE2B 2650909986649a471cfa13db96fda34e864312aab96ffa2692c2d38cbb9b36149d90a398b3ea9568992b9da01ab7aeeab8022ee74edebf2e7c83cac48c951e7c SHA512 05e420560b143042418db2e992beaef45cc5a568cdbf640c7b285ba2dc322290d14e0df978ff4c412a99f4346e38f6fb9796ebda695ddc002a3d0e74e85725d6
+EBUILD help2man-1.47.6.ebuild 1038 BLAKE2B d619dac2146e132d60389ede2dcede7cd22437d5ce7b6c60f485923611b2238a0b12a5f240267037ae934b9d1321660bbf459ca5ca8157150c96d74fb51bb31b SHA512 ba5512917df566f73e5a52e4411625251d166e807087b0be23988259d63d3f99368630385eb60e1ce74f7d9ad14b1fd745326a1317908010af7b753f7ef6266e
 EBUILD help2man-1.47.7.ebuild 1051 BLAKE2B 6bde9567cb042fb11341f6d6081b7efefaf3f0c1231523040d42267d9abd1d774e276c497d767a0ca475e64524e92f71d30c811532296cc166861ed95a0e68f4 SHA512 a1dafde12c1bd8a58714601bc36e28589940d3e709060722b8996fcce0087d7604f6342d1fe006b297e29100d4d216f12d75377103c31642a43ed93b3170fc6b
+EBUILD help2man-1.47.8.ebuild 1051 BLAKE2B 6bde9567cb042fb11341f6d6081b7efefaf3f0c1231523040d42267d9abd1d774e276c497d767a0ca475e64524e92f71d30c811532296cc166861ed95a0e68f4 SHA512 a1dafde12c1bd8a58714601bc36e28589940d3e709060722b8996fcce0087d7604f6342d1fe006b297e29100d4d216f12d75377103c31642a43ed93b3170fc6b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
deleted file mode 100644
index 6919046d8960..000000000000
--- a/sys-apps/help2man/help2man-1.47.4.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
-inherit eutils
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND=${RDEPEND}
-
-DOCS="debian/changelog NEWS README THANKS" #385753
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e 's/-shared/-bundle/' \
-			Makefile.in || die
-	fi
-	epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	econf \
-		ac_cv_path_MSGFMT=$(type -P false) \
-		$(use_enable nls)
-}
diff --git a/sys-apps/help2man/help2man-1.47.6.ebuild b/sys-apps/help2man/help2man-1.47.6.ebuild
index ac10192b4498..9eda286297ee 100644
--- a/sys-apps/help2man/help2man-1.47.6.ebuild
+++ b/sys-apps/help2man/help2man-1.47.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.8.ebuild b/sys-apps/help2man/help2man-1.47.8.ebuild
new file mode 100644
index 000000000000..7c0baf97fcee
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.47.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND=${RDEPEND}
+
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+	default
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files #555018
+	econf \
+		ac_cv_path_MSGFMT=$(type -P false) \
+		$(use_enable nls)
+}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 2c7447b7bf65..a8210efc90a4 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -4,9 +4,9 @@ DIST hwloc-1.11.11.tar.bz2 4114437 BLAKE2B 57666c4a0a49898f55eba991a52954bb9dbc8
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-1.11.7.tar.bz2 4187754 BLAKE2B 9d55c35ee328eddbdb9364f4330d157eeefb53fd01b3d0cba23423515302ab0f43aac6c6aaec3a96277411883e3806888aa1c55d2312e102d00302305279f044 SHA512 f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e
 DIST hwloc-2.0.2.tar.bz2 6032384 BLAKE2B 868c57b434f7722202ec07747dcc62b320ed265ff8334347d824151eb0d37ff626a90f8b66828f82e9ea9e17b95f41f4ffe509f00e7aa9c822bb5080fb4edbd8 SHA512 b3bbf56bea99e3c381f72989aa18bc2329f15d7d12d9386ea7049fc875be4b5f89f2476a3c6cbaea562d1c91f147a3a2c80a50e93b824c7ef6323eed1d6126ef
-EBUILD hwloc-1.11.10.ebuild 2239 BLAKE2B 33eb03ed6ce9de352f53602c6e687e409b63cec0a4141c2e7e416be4f98dde7d867e7a8158d09168a563bb39c19578b44397c1a8f3a08662d4e375ca80456d48 SHA512 006165b38fa9c332b4cd24aef0876555ba5e4cfd5d4dcae22a82beb0fd5f253197dc87e691291eb2e9b3e7e681c7d504d4df4e44ccd8e537b7008aefb2f34563
-EBUILD hwloc-1.11.11.ebuild 2220 BLAKE2B d7f1c3ebdff8a23587a59330fc67a9498e9e2d7094561018978e604c54d5ed70c1dbf6f463419a63732c3efea042dae052cf176dcea5e117fecfeb2eb5cf3fd1 SHA512 9b8e6dab069f5b31f13f6ff68464d932c4eec9dcd5c17307b3ed29e3313170ad0a2e0df3f4582936fa503f44232b4e014fe8d438a97754b691895a1c9e82b345
-EBUILD hwloc-1.11.2-r1.ebuild 2207 BLAKE2B 56a2d0b7383b173cc389a22b3a3ee68a867db2339bad083720bb6c1a8f5e8879e414a87039164b019140f959d742519d5d5cc9126a8712e4ddb9af2dffedd964 SHA512 ec68dd2534e19ef77a0bd4fd87b357d8dc05bddc6a361ee320fe7b9145ed0a6988d219ec8c56c6ea66036db61e1cbd2ade9f34e4470b997684f95309287fce6d
-EBUILD hwloc-1.11.7.ebuild 2218 BLAKE2B e085ef7ca3e0d275b5e59b4e14206450bc4c820addef6931547247037862072d988e70f37f900a9a6bf66d478c48b97500ae1d5cbba1b405e5321e7841c217ab SHA512 984bb91ccc20ee9afeee0cc474141a7c967deb8e4cc02235a095161721e16aeec43901fb9fcd1eff0b3dd05e5f3a46691711a64a838d90423ecded36e900baf5
-EBUILD hwloc-2.0.2.ebuild 2220 BLAKE2B d7f1c3ebdff8a23587a59330fc67a9498e9e2d7094561018978e604c54d5ed70c1dbf6f463419a63732c3efea042dae052cf176dcea5e117fecfeb2eb5cf3fd1 SHA512 9b8e6dab069f5b31f13f6ff68464d932c4eec9dcd5c17307b3ed29e3313170ad0a2e0df3f4582936fa503f44232b4e014fe8d438a97754b691895a1c9e82b345
+EBUILD hwloc-1.11.10.ebuild 2201 BLAKE2B 4980f997dd06d6b5bfd621cccfba878f373900ce134485c59a0b41a01120950c1c083915a2cd1752c3da2811914d8c007d7d726a1b9c8ee37d7ead9a27e92a70 SHA512 e3d6fdbb65ccfe9a19bbadac45e19c2d485b303995ef790cacbf441e30009c808dc6e2981822e246ea5db662a03eb6382ec21b63bd7d63948a6778f4da4e47be
+EBUILD hwloc-1.11.11.ebuild 2182 BLAKE2B 469799a5cf4adb7fb5698a07eaf7e8e2eb3106c2247a79d68b4f1f4293279642a6a32b78e9dfc848d58c4bdab7105031e1e7c02a0186c3f0c4663915a70eb8e0 SHA512 bc4a29313f2c771847a09c2a59d2eeff560e0a74947b8d12cbaba6665540ab87e3f7378e0391bacaa9c83bc6d35de61c10ab623b8cd76870ef5962eeb12fce8c
+EBUILD hwloc-1.11.2-r1.ebuild 2169 BLAKE2B 938851b64cc610349a7a204953fbad5914d238afc5f170ef48b56b7905184747c2b5d84261478a3921946743a35e2a9da0d723cc09b97f785b4acb4c32899cfd SHA512 7b5931e6e1d4670a7f8aa6a93b367351da99bce3dfcea04c88865e47a617e93928c24eefec5a6a92d85950e3081cb08d61a4aa1e0842f2d11eea670d27d487a3
+EBUILD hwloc-1.11.7.ebuild 2180 BLAKE2B eccaadf693dbe56efb83112b561af209370bcef87618bd89e96ff05a90c74b08bbebd3fc481d67b45a5aefe1cb0e220233a4e4169bcd6f5cb03730c52df944fc SHA512 7c2209cc58dd22e76cfcde886b2d8bec3bf0732f3f48c8cc47b19adc1626f9034246681e4ca9e11d0c9f97445da581792ea8a31ebacd1c21faae54a248d6e107
+EBUILD hwloc-2.0.2.ebuild 2182 BLAKE2B 469799a5cf4adb7fb5698a07eaf7e8e2eb3106c2247a79d68b4f1f4293279642a6a32b78e9dfc848d58c4bdab7105031e1e7c02a0186c3f0c4663915a70eb8e0 SHA512 bc4a29313f2c771847a09c2a59d2eeff560e0a74947b8d12cbaba6665540ab87e3f7378e0391bacaa9c83bc6d35de61c10ab623b8cd76870ef5962eeb12fce8c
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild b/sys-apps/hwloc/hwloc-1.11.10.ebuild
index 83dab218d512..e2f6d1687b8c 100644
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) )
+	gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
 	pci? (
 		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
 		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
diff --git a/sys-apps/hwloc/hwloc-1.11.11.ebuild b/sys-apps/hwloc/hwloc-1.11.11.ebuild
index 99b6fa5187f1..971dfae0ef6d 100644
--- a/sys-apps/hwloc/hwloc-1.11.11.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) )
+	gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
 	pci? (
 		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
 		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
index 2f6751aa3cea..cb05149d393e 100644
--- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) )
+	gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
 	pci? (
 		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
 		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
diff --git a/sys-apps/hwloc/hwloc-1.11.7.ebuild b/sys-apps/hwloc/hwloc-1.11.7.ebuild
index 1978df29ec28..d0ae44270893 100644
--- a/sys-apps/hwloc/hwloc-1.11.7.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) )
+	gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
 	pci? (
 		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
 		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
diff --git a/sys-apps/hwloc/hwloc-2.0.2.ebuild b/sys-apps/hwloc/hwloc-2.0.2.ebuild
index 99b6fa5187f1..971dfae0ef6d 100644
--- a/sys-apps/hwloc/hwloc-2.0.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) )
+	gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
 	pci? (
 		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
 		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 71e3e7d48d43..49832c911ca6 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -10,5 +10,5 @@ AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc0
 DIST lm_sensors-3.4.0_p20170901.tar.gz 208487 BLAKE2B b6d2eb6efee25891fbd655738ba25e91d8ec5d97f07e24ee217ab1a59c51a8ab59e042a90ed6fa1de4459992adc740252588419c0f74ce02f9ad7c1f4f9750da SHA512 5c4a750efdff2ef086a5ed1b6a8a03278872ca077255eae91d0696af229f37b09216e2f53d1d6e4602596fd8b978e0b9c27327357621486c5d7b1d39ecd16fea
 DIST lm_sensors-3.4.0_p20180923.tar.gz 264263 BLAKE2B 7444934429b16ae19af0390e8d3e6a2cf979dccf3c83ee8a3fd0f1f358d07bbc3e446197d44deb994a6d3313cff492625b8fd5c7462c39eb5e10b998b6588cb1 SHA512 cf6ea7898248420e2927aa673ba166ede8e774f605038fad4e503f178ab36c2b371253c69197739fe533663dac191b40dce7c3b4ad71488e4f15e4583f6ad363
 EBUILD lm_sensors-3.4.0_p20170901.ebuild 6319 BLAKE2B d1ddc399feb10b050e28e0e7b2ae05178b3de4eacde019ae615f57d2d83c214b54330f1f0923ffe2e27838b6048f27b4cb2225ead5436002a84da2fbbddb2a50 SHA512 72759cde25a87a464e9ee6f25945965172c514c0878eb44c258ac295142575815975aa4425e1c13522e94faadabdbcaef6248e2b4b89af14bcd4e047241685bb
-EBUILD lm_sensors-3.4.0_p20180923.ebuild 6328 BLAKE2B 33bad3726e565d3c3c031269500336d629bf0db65a2d08b8108b7c6f2c017c98bc49266110ad364e0996a1cdd6102ba8b752ee703f71cd57477eb8dc8609217b SHA512 4322c84f866a66fa6633f2890cea104a48cc4fc5500543eeec6646812af99ed5ca05cbaee5502462a7c32b13051ab99916d3c6e5b2ab19e5d3307f45ec83bc9d
+EBUILD lm_sensors-3.4.0_p20180923.ebuild 6321 BLAKE2B a22fb11ea35831abd29628b4cd769ea83bd466a8acf47da4c9c33c2617c34e5b76c7f9bf3757452f3e09a53be7cbef5e3836aa5282f42aca7d88c6c1763b50ba SHA512 82cdf729b29e9a5e00aaa3bd5351e2259b6536c270c74228755d656bce63a2eaed45a55ce2f367324d90871d4c578ddc50ae071d8d429999ea23697347d0b7f3
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
index 9ab915de11ac..df1cf70de95f 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/4.4.0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index e0cbdad2c1d4..f7ded53279c4 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -2,6 +2,6 @@ AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca
 DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
 EBUILD lsb-release-1.4-r1.ebuild 732 BLAKE2B 86e83fb65af3f76b58fda76f2005738c4ae724a9fce7b13c85664262bba7e817ddb42697000394cec90830a5e280f62ff0b61a00781fcba8937e55e7deb09a75 SHA512 ec24e3ade879837b901ac4beee6bd354d0070965386683c40ce27d3b239ad8a5522f77ffc07f96a91c685c4ccbeeae006257e1420d60d58e6a59ba33cd7550a9
 EBUILD lsb-release-1.4-r2.ebuild 854 BLAKE2B ca559ce9afc79b56a947e6dc4d91e445f26ffcde324ad75d5fad418499a226dc25b7473f541d258dba3bc853e08cedfb4d05613e64650a13d60071b3daeb2193 SHA512 ab5356625e24fc97349be711516cf346d21bb3a414c72ae5d6c95cf18b307df74ff8a1ded89d700ef65307b3c79205644e815d2281725c265e3ff61c4cef4dc8
-EBUILD lsb-release-1.4-r3.ebuild 908 BLAKE2B 2a0960731df44a0c16c4504bd4a8d400f2b68921e027ea8be548092ff1d9186c9eba02b493f053eee03d6100ac3293337a37bb238c52ea6e80fbe9f8155feae8 SHA512 f7c1c31bae996497ae0c73df1b707c4a69b05439a7a9e0db2bb102e276699a878b092484492cd094920a5ff3940b3f50b9db7a0362a11b6a9c3a62a621ee884a
+EBUILD lsb-release-1.4-r3.ebuild 907 BLAKE2B 380e8bdf3760f8ed97148cf3db4c61ff11aa248432216e76eb90d8c37005c177f8e6ff38c298755d638e3459496c19eabe69fe06e02525c7c0130f11875cdd6f SHA512 477e2c0ed94a2f5dba9bb0d296ab66375ff5beb8cf8f7624f3b79aa59df3f11cf70994989bbd483bed7d4e086857123c1602c46febb1b5caceaac73ef9d3ab07
 EBUILD lsb-release-1.4.ebuild 690 BLAKE2B 6c0f11ac818e4c90150aa66f1497a565119e9733df7fb471f275cc8b0348958e0097dd27cd83c478d84b8e5f52ea8650a24ccb29c9048c23907f61e710ea26de SHA512 e1a2159c9549ad1596eeea49734f85c0b46497c36778df27c6477c570e26170d0a4875d656b7f825497c0573d06c574695b7bcfc15cfcb458892905a48b3ec26
 MISC metadata.xml 795 BLAKE2B 3af7256256701726c04244c09e8cb8aa9e560cea0b16502412f3565235cae17ab172daf4cc26cf7356ef021d2989752c733a8d4250d241e32e1c79f2149622b8 SHA512 e0951bbb925a0729e886a608c2b177fa9a68aea5571316d0d89f8cae3fa6f48c97aeb37c1393ae429f02ec40f640fe237836f018ba31c2a3d0b9a81ef2661dcf
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
index ab2624601ee8..aa52345334e8 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 
 # Perl isn't needed at runtime, it is just used to generate the man page.
 DEPEND="dev-lang/perl"
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index eadcfba0e7f8..0de104e2917d 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -4,4 +4,4 @@ DIST miller-5.3.0.tar.gz 4940072 BLAKE2B 2e34ae010d409877040a60b08dd615f32e6945c
 EBUILD miller-4.2.0.ebuild 1244 BLAKE2B 9912b82b168fafc00541b7715895060c62bf1279d551006784b07c4231d61e2a287f6b2705ed6c2e72edb975105f1be9a3bf4979d07a1cff885420af5debf3fa SHA512 16f983250db1ecd7a417ce37a95a623f3113ec155c896d0b95604a1414872d7b575ae913de1209b592bf2bcf74d0274a7c29d560891a9f6f84665c4baa8c684e
 EBUILD miller-5.2.2.ebuild 1022 BLAKE2B b3b03253ad56d663729fa7bda4d832f367586f7655b02bb78fe36b932cb18972109d55f49ae67fafb16b2a5a69a5d580fbdfe745e251675538a3205c5741437c SHA512 d04cbecb30b102a9ea39dfbd56f9992926d183ab8935a6c4efd89e20597afb378e5c2ece2a0a9ebd1f337525a57e434bda1c7383ed8559dd4fe8c53f3e47a08f
 EBUILD miller-5.3.0.ebuild 1022 BLAKE2B b3b03253ad56d663729fa7bda4d832f367586f7655b02bb78fe36b932cb18972109d55f49ae67fafb16b2a5a69a5d580fbdfe745e251675538a3205c5741437c SHA512 d04cbecb30b102a9ea39dfbd56f9992926d183ab8935a6c4efd89e20597afb378e5c2ece2a0a9ebd1f337525a57e434bda1c7383ed8559dd4fe8c53f3e47a08f
-MISC metadata.xml 457 BLAKE2B ca81aa24bf7634b723208b902df033b665fb97b195f002a2a8250c4e00db0b93da2be68af87b23cb7cc749b479735121d58b1cddae4a6a69cc67d7bf04860596 SHA512 1d55a1c34c8c1c1b69036028b9d2f65b8d36b1f102da9041d3e4469c821d0bba20c56d88eb7641ce9f3b8ab26e4ee756595028f9f77345b1fbf19c2aa09237b1
+MISC metadata.xml 245 BLAKE2B 183034a40812aee01ddfd5d59eac1d2d1d42d281575fd5a3c900bd96af21cad81f9262b41f81c39f34dc60078ffa3db70149f8d50ecb09cb6003ed8602ab3ecd SHA512 b7b2cb8f6f35a36afa6a90e1d66747c2bc3e26a202483ec1d5c32346e75a738ee59be158af291a18c55140486d519c159492d12e3d25134ec20cc03fd7627cad
diff --git a/sys-apps/miller/metadata.xml b/sys-apps/miller/metadata.xml
index bea67532f6a5..8181d42fee83 100644
--- a/sys-apps/miller/metadata.xml
+++ b/sys-apps/miller/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>herb@hlmjr.com</email>
-		<name>Herb Miller Jr. (herbmillerjr)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">johnkerl/miller</remote-id>
 	</upstream>
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 139732269328..a01ac97e0197 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -6,10 +6,12 @@ DIST openrc-0.35.5.tar.gz 241784 BLAKE2B 6f63dcf30c430949f25108b0ca808f2317b2e58
 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.2.tar.gz 240924 BLAKE2B a50e567aa3ac1edfd4e7cbdfbf3d7ce6ac39b7d7c2b4a9bcc8cf088735fa436a334eb077ecb10b67f6f5faab979ba62729aca4f3f61e12167cbd48fc8a7f3776 SHA512 5c5f1cfa9990970a02619c5b97c0d424d921fe16e83767372beee9a7b296c6ea33b43ae4045cf7266254b98871a5d347de1040443fe8fc68d7b9d164eed909e6
+DIST openrc-0.38.3.tar.gz 238031 BLAKE2B 87d1546e21d581feda4064cd64bf43f762203becdcc4b002bf868f17403bd42770cb1106a8bc383c8d69e19ad66ad2bedaa7090c95206597e8a9b6e2ba481dcc SHA512 6bb42ccdab5fb24b11f5042bf19850f440d3494b6bd1d7b8db31b592f051fcd26feac1c8d9ef515238c53c6f5bf98a8c367a48471c178ae829e05c56bd24cfde
 EBUILD openrc-0.34.11.ebuild 10093 BLAKE2B 4f1e8fd970cc608d56df44eefe714390bf68ed18f499ee305f9e5908703f5b36228932e2b7384301021af330ac2ae5455f5b07cbcd6d5da475c042386b31fd9e SHA512 99ddc25723791ca82cd80c55790da6738b796d9fdd61c804821e3e26e4c8be5d9eeac56a9c689977008ce01f56b49319f0b5f65a5d7a08b318c9f38040553928
 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.2.ebuild 9837 BLAKE2B f089ebcc4c20bd528cffaa50aa4db2ac99b82efa2c449ec7ba9f88ca09bbc515d5df5637d639cd4650497e277057d6cb9078a6c7a417c9b2d9eb7ec59aa48e7d SHA512 9658b8f880105ce6cff9c11d40ba2526bdec9089dbfafcf5214e6660855f28b344da042d4411b9c1b2940b2fa00197d1a173fd75280ebf17d10201cbd01a0417
+EBUILD openrc-0.38.2.ebuild 9836 BLAKE2B 2538028c1766036d79089965a9402c3fa7a65178aa42d68caa22ae2e1c8962bddb21663867d5f0a245fe274227bf9d9dde925ef385fec9060c5f8bd5e0804585 SHA512 0145fab466fcc7f0d5ec48bae7b7a42b5967215e04c3896a5b4f47735994af966ad99ef19de9b5c8ce33037d851a6edc195ea5466ae2e2a8ec3243c6d292fda2
+EBUILD openrc-0.38.3.ebuild 9836 BLAKE2B 2538028c1766036d79089965a9402c3fa7a65178aa42d68caa22ae2e1c8962bddb21663867d5f0a245fe274227bf9d9dde925ef385fec9060c5f8bd5e0804585 SHA512 0145fab466fcc7f0d5ec48bae7b7a42b5967215e04c3896a5b4f47735994af966ad99ef19de9b5c8ce33037d851a6edc195ea5466ae2e2a8ec3243c6d292fda2
 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.2.ebuild b/sys-apps/openrc/openrc-0.38.2.ebuild
index 86ce817e9122..bbca849aa190 100644
--- a/sys-apps/openrc/openrc-0.38.2.ebuild
+++ b/sys-apps/openrc/openrc-0.38.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.38.3.ebuild b/sys-apps/openrc/openrc-0.38.3.ebuild
new file mode 100644
index 000000000000..bbca849aa190
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.38.3.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKZSHCOMP=yes"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /lib/rc/init.d
+	fi
+	keepdir /lib/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+
+	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
+
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/pacman/Manifest b/sys-apps/pacman/Manifest
index 66a8cd6c7211..42be8a87c232 100644
--- a/sys-apps/pacman/Manifest
+++ b/sys-apps/pacman/Manifest
@@ -1,4 +1,4 @@
 AUX pacman-5.0.2-CVE-2016-5434.patch 3938 BLAKE2B 67ef2e348502753df10f7dbc9235401dcc8fe1e304a718592fafb6e84e7e045635890aeffe5ab808808f02392c6a141add8d97370957cef8fce357c8dd17b90b SHA512 432922e485a2aa1d82d7654c615333bfd8ff74c89fcb3fa5728618d8947175172e043ae231c7bf04387a0770421ccf96bb0d492a061b4da12ea7f212fe07ca30
 DIST pacman-5.0.2.tar.gz 3361701 BLAKE2B 499041cb9914991c12c21383aaf36465189ced456ca8b2908d3c036acc3ef9dde0fba1efd823580c12e6d8dbdcaa5e53a7b1329cac347208d1de21702e8f3efa SHA512 94a8cce1a52d2365a993c72f16537f4dbea6100feb8f22e8782cc7d2c1ef8a525a63f3c40bb183294c0faedcc743e3d806d2fc3c50a21ab9b03df2910039d628
-EBUILD pacman-5.0.2-r1.ebuild 2952 BLAKE2B 0cd3a4905b9ca217747786d3e2cb98b01e0371f968799aff33a89885bc07332c9a45f6df41499e515b7c48423ab450ebb7ff4ce909d1561cff2797a6a71cf347 SHA512 451a898cef0974bd1ec2967dfc6d121021cf3176fc3632f4fa4851875d0ea16bb8bebb221cc759f9c9c18b8d9682ca000204da0ad106b83e35ed5c1b6e050695
+EBUILD pacman-5.0.2-r2.ebuild 2892 BLAKE2B cfd40c949162e4cbee77e82a9fb36e9628c5b1ab807c67635422dd65c6b3be1b22809ceef17122d323f644a6c796b06388fdae0bc1e96b8e5cc135fd8902ca84 SHA512 69cbd3d0b71674a47868c9891ca66cac5a03c40d0959f6d84f302bcf14ae12125197e568a71c4aa2f473e97210c4039eecc57f1ee8f41bd6c1063ed7217a8bfb
 MISC metadata.xml 675 BLAKE2B 4019b589f7cc08897c958654944004864bebf838e50d32fa18b295ecbf99d137431402dffbda17b9578f3b0c005e46ef0295d8edc73f01f840d5822c478595fc SHA512 52987ad9ce090732316a0fde96b26cfe3a21cdf1f4ba7b4dc661d21568d22a8972e8dbd90afd7a183fca64a13051c2723f2732fafc56413dfeb156fa7d7d0886
diff --git a/sys-apps/pacman/pacman-5.0.2-r1.ebuild b/sys-apps/pacman/pacman-5.0.2-r1.ebuild
deleted file mode 100644
index f60a609779c2..000000000000
--- a/sys-apps/pacman/pacman-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,112 +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 autotools
-
-DESCRIPTION="Archlinux's binary package manager"
-HOMEPAGE="https://archlinux.org/pacman/"
-
-PATCHES=()
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.archlinux.org/pacman.git"
-else
-	SRC_URI="https://sources.archlinux.org/other/pacman/${P}.tar.gz"
-	# Do *not* re-add ~x86!
-	# https://www.archlinux.org/news/phasing-out-i686-support/
-	KEYWORDS="~amd64"
-
-	PATCHES+=( "${FILESDIR}"/${PN}-5.0.2-CVE-2016-5434.patch )
-fi
-
-LICENSE="GPL-2"
-SLOT="0/10"
-
-IUSE="curl debug doc +gpg test"
-COMMON_DEPEND="app-arch/libarchive:=[lzma]
-	gpg? ( >=app-crypt/gpgme-1.4.0:= )
-	dev-libs/openssl:0=
-	curl? ( net-misc/curl )
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	doc? ( app-doc/doxygen )
-	test? ( sys-apps/fakeroot
-	sys-apps/fakechroot )"
-
-# workaround until tests are fixed/sorted out
-RESTRICT="test"
-
-src_prepare() {
-	# Remove a line that adds "-Werror" in ./configure when
-	# "--enable-debug" is passed:
-	sed -i -e '/-Werror/d' configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--disable-git-version
-		--with-openssl
-		# Help protect user from shooting his/her Gentoo installation
-		# in its foot.
-		--with-root-dir="${EPREFIX}/var/chroot/archlinux"
-		$(use_enable debug)
-		# full doc with doxygen
-		$(use_enable doc doxygen)
-		$(use_with curl libcurl)
-		$(use_with gpg gpgme)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	emake -C contrib
-}
-
-src_install() {
-	dodir /etc/pacman.d/
-	# contributed parts, i.e. not pacman itself, but useful helpers and some templates and basic docs
-	dobin "${S}"/contrib/{bacman,checkupdates,pac{cache,diff,list,log-pkglist,scripts,search},rankmirrors,updpkgsums}
-	newdoc "${S}"/contrib/README contrib-README
-	dodoc "${S}"/contrib/PKGBUILD.vim
-	# create /var/chroot/archlinux
-	# see bug #631754
-	dodir /var/chroot/archlinux
-
-	default
-	# avoid creating stuff inside /var/cache/
-	# see bug #633742 for more information
-	rm -r "${D}"/var/cache/pacman
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "The default root dir was set to ${EPREFIX}/var/chroot/archlinux"
-	einfo "to avoid breaking Gentoo systems due to oscitancy."
-	einfo "If you prefer another directory, take a look at"
-	einfo "pacman’s parameter -r|--root)."
-	einfo ""
-	einfo "You will need to setup at least one mirror in /etc/pacman.d/mirrorlist."
-	einfo "Please generate it manually according to the Archlinux documentation:"
-	einfo "https://wiki.archlinux.org/index.php/Mirror"
-	einfo ""
-	ewarn "Archlinux is dropping support for x86 (i686 called there) entirely"
-	ewarn "in Nov 2017. Please keep this in mind when setting up new systems."
-	ewarn "For more details see"
-	ewarn "https://www.archlinux.org/news/phasing-out-i686-support"
-	einfo ""
-}
diff --git a/sys-apps/pacman/pacman-5.0.2-r2.ebuild b/sys-apps/pacman/pacman-5.0.2-r2.ebuild
new file mode 100644
index 000000000000..37ec0a9e7aaf
--- /dev/null
+++ b/sys-apps/pacman/pacman-5.0.2-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools
+
+DESCRIPTION="Archlinux's binary package manager"
+HOMEPAGE="https://archlinux.org/pacman/"
+
+PATCHES=()
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.archlinux.org/pacman.git"
+else
+	SRC_URI="https://sources.archlinux.org/other/pacman/${P}.tar.gz"
+	# Do *not* re-add ~x86!
+	# https://www.archlinux.org/news/phasing-out-i686-support/
+	KEYWORDS="-* ~amd64"
+
+	PATCHES+=( "${FILESDIR}"/${PN}-5.0.2-CVE-2016-5434.patch )
+fi
+
+LICENSE="GPL-2"
+SLOT="0/10"
+
+IUSE="curl debug doc +gpg libressl test"
+COMMON_DEPEND="
+	app-arch/libarchive:=[lzma]
+	gpg? ( >=app-crypt/gpgme-1.4.0:= )
+	curl? ( net-misc/curl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	virtual/libiconv
+	virtual/libintl
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	doc? ( app-doc/doxygen )
+	test? (
+		sys-apps/fakeroot
+		sys-apps/fakechroot
+	)
+"
+
+# workaround until tests are fixed/sorted out
+RESTRICT="test"
+
+src_prepare() {
+	# Remove a line that adds "-Werror" in ./configure when
+	# "--enable-debug" is passed:
+	sed -i -e '/-Werror/d' configure.ac || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--localstatedir=/var
+		--disable-git-version
+		--with-openssl
+		# Help protect user from shooting his/her Gentoo installation
+		# in its foot.
+		--with-root-dir="${EPREFIX}/var/chroot/archlinux"
+		$(use_enable debug)
+		# full doc with doxygen
+		$(use_enable doc doxygen)
+		$(use_with curl libcurl)
+		$(use_with gpg gpgme)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	emake -C contrib
+}
+
+src_install() {
+	dodir /etc/pacman.d/
+	# contributed parts, i.e. not pacman itself, but useful helpers and some templates and basic docs
+	dobin "${S}"/contrib/{bacman,checkupdates,pac{cache,diff,list,log-pkglist,scripts,search},rankmirrors,updpkgsums}
+	newdoc "${S}"/contrib/README contrib-README
+	dodoc "${S}"/contrib/PKGBUILD.vim
+	# create /var/chroot/archlinux
+	# see bug #631754
+	dodir /var/chroot/archlinux
+	keepdir /var/chroot/archlinux /var/lib/pacman
+
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	# avoid creating stuff inside /var/cache/
+	# see bug #633742 for more information
+	rm -r "${D}"/var/cache/pacman
+	rmdir "${D}"/var/cache
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "The default root dir was set to ${EPREFIX}/var/chroot/archlinux"
+	einfo "to avoid breaking Gentoo systems due to oscitancy."
+	einfo "If you prefer another directory, take a look at"
+	einfo "pacman’s parameter -r|--root)."
+	einfo ""
+	einfo "You will need to setup at least one mirror in /etc/pacman.d/mirrorlist."
+	einfo "Please generate it manually according to the Archlinux documentation:"
+	einfo "https://wiki.archlinux.org/index.php/Mirror"
+	einfo ""
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ceb8b1e5cc22..ee679474e8c7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,10 +5,12 @@ DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b05
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
 DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e10772bab9539ff27cb165b6749090be887b6f48d449f4e7650e618d43be1b0d26ba59597996a9d3d3ecd0caea166a SHA512 d3daee0075eee61c354ad1d4865b1cf433d9afe5ed56101758219694325c7c5ad62a0d9ce41bf2205934b6e073d0eba3ef3f7c8b6633b5a3448e469783c5329a
 DIST portage-2.3.50.tar.bz2 1012905 BLAKE2B 8eebb6ea412db4d07be64047c8e9995c7d61906ff3c387495f144acd5b7d31e9d8ede3f9e606dc7a28df5b5726a0a6d55e2e0d79c78848213f4835fb1a588f30 SHA512 120514e4e176de9ad27892d547825d4fd51d250266f9de8f2f96d689ff1373adab77b838e9801043f0053111063857e957e83b495d520db8cc7733af28b03b64
+DIST portage-2.3.51.tar.bz2 1013015 BLAKE2B f7f5e6c9e627db5a9e4bfcc9a6cbebb40fda910d3cc928922870b295c706a9f669d3d812e726b220610efe6b182460811eb9420d6fa5b8756481df64a88fe2b9 SHA512 6c22b97959d4b5be263b9a1de6bb343b1f8300e989f37c7334a9d5d6fb65fe2390958e222bc5379ec95099124fc51a049ecca6e1bfc18f0a6c57e4601342bb94
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.40-r1.ebuild 9684 BLAKE2B 25337738dd51a60f4b8348796348572bc92e95af3178ae4c4097225697923aa14bbc5e206160ed569bf9f84cbe354823c2326eb54173bc455c4d46566050d002 SHA512 20184f3260d3d8c413ea2a87eaec2eda08e94a27290f658c12ae3490712e6773c95e52818b8224882380a55c4eca77b42d9233d23ea64aae6cbdfb43e90bdbe1
-EBUILD portage-2.3.49.ebuild 8683 BLAKE2B c0a2a77fe3c82a1dfbf190773b88fdc4d8f4bc92eb72c7f2806dd4854f3f1a14532ff46c8d10c8a795ecb0adb1320656b537ae5207a000bc57d24f76967d55b4 SHA512 b89cf6c8e80646955869c0ea3fedab46bb37cb9e5edb8f5363d989ce47a5a953118d214f2bbe6bd33eb28a8b239933879f85ba91452acc69fad995399dc7dfab
+EBUILD portage-2.3.49.ebuild 8681 BLAKE2B b09a5d1c4795765ffe01c31eafe0578b9c6b8177997799c15965b4be5a5d00d69cd0747667384eb4ba33fb2f52f703b3b03ad4e64c4f8581754841ed0979d912 SHA512 737694cb627e10191769e820903a66fa2d74bc0b4a6070c59cdc3c865a20e2d7c1c8ff949417202c97c2e217e0214c251ef956cfa6b99ecd83b71ec607d910bf
 EBUILD portage-2.3.50-r4.ebuild 9772 BLAKE2B 5a8d97b843b85a65e1dc5814018d88cded1d6b6a9122172eb1bc23eec223b131d21649ecd2d8097a8f902dba2037562acc6bd584e0e42c02d95abe8e8c469d09 SHA512 656d58ea557bb3664291730c50cca18648770bf23ab5a6cc78e85ba0318ee57bdeb380247d48ab7b02dce7e06917946a8d38f526fd14faf6694aa33dad866535
+EBUILD portage-2.3.51.ebuild 8684 BLAKE2B b791f7450129848669a613f0515481a8fc91624a40bf92ede8de4c5f757a92ac021db109a9731762be05153aa8837d5e228d0b7b44e92e8306dca22acaf040f7 SHA512 836e4fa69675e609f4627e91f1e3c6a87e51db8e9f194bba59f0b454e271196c86afebad6db10db7820322f87a7bdac8c14b8c4dabc6339773e5c310f0ab6de5
 EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c
 EBUILD portage-9999.ebuild 8553 BLAKE2B 3341e4fe3dd6601a1a5c94a166910f61bdb9bf860fdcd7bdf725bb0e424b016800a58cae1c547cabd70604d7b4b1a3ef11535afa875a75203e1911c42f8f920d SHA512 de3bee0495126b35c22947a238c57fa6b92eb9b553f540f6617f12cb4861f1f5e9ab611548a4660e87612bc2dee8f1f5c1e38de207fa67ea9617d89858d9ff54
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.49.ebuild b/sys-apps/portage/portage-2.3.49.ebuild
index 8ca04fb2dee1..17a87caa73ec 100644
--- a/sys-apps/portage/portage-2.3.49.ebuild
+++ b/sys-apps/portage/portage-2.3.49.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.51.ebuild b/sys-apps/portage/portage-2.3.51.ebuild
new file mode 100644
index 000000000000..9fc9f28ea21b
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.51.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=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/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index c59edb44eb9c..21fca9fcecbe 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,3 +1,5 @@
 DIST s6-linux-utils-2.4.0.2.tar.gz 40832 BLAKE2B 24ce6d51aacfcaeeb8531931a0deac4e2430f627907157022ed6378e7058afcc946f1c620bb3758e43a1911db517dd46e65a43f338c446e61711b000d6751523 SHA512 4b0c8f1b65b8eb47f3aa7aa365d20dcd46fc144e166f78825ee53aeb789e009b2716a826efa1e92e86e8fe86421efc6ae07970ce421c6913f0b1db679eb6117e
+DIST s6-linux-utils-2.5.0.0.tar.gz 34976 BLAKE2B ccbe5a24c39d32a6d3e9c1ba09c76c278ed33e831ba9d124e30615204f4084823efd13500b2b2a0efa0ddd703996ec3a47ea66a2b5c1f832d8003cffccf6b773 SHA512 0433fd7863135629d2ab849db34c77f0cbc146f7a84833fcb9263d49ed8366f370f0513bb055990e40a17dff69a1b83a741b1bac2fc8d159d866b45a6b81bdc9
 EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a0ab15c7a29f51480779f96ff25799494f73e268d6ca9e8ccbd82c3259b6df1dba770d29f94459b9c4d2fe97b1eba27eab1 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a
+EBUILD s6-linux-utils-2.5.0.0.ebuild 1111 BLAKE2B 929e7af3a4579360a9eae8292c1e8ea840b7d347f3c350b44e5699674bbc7e0c86ac4d7e5a8bb68e2232882cea8e93f94e104b0875b339d22946575d3a0c3b5b SHA512 cff3803a8525bd6760d8c1a3fec8aedb945b68a70228d30cd235a5bdb914d436979759cdba79c12606d58e29319754968510e4f1e8167421139810b9d32e1f09
 MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.0.ebuild
new file mode 100644
index 000000000000..cbebf69605fa
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND="static? ( >=dev-libs/skalibs-2.7.0.0[static-libs] )
+	!static? ( >=dev-libs/skalibs-2.7.0.0 )
+"
+RDEPEND="!static? ( >=dev-libs/skalibs-2.7.0.0:= )"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index fb0ea461b1a7..a4cfdab827a9 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,3 +1,5 @@
 DIST s6-portable-utils-2.2.1.1.tar.gz 47138 BLAKE2B f5519fbedc2599c0b9366bbff38a9438cb4cdf3b770dfec6e519f8857bd77a3bea172284318df224104fe7003af4a68cadc8089d77c98ba4da85eb59d59819f4 SHA512 fba7a4d1f5e0c969dc254775f28c02f1b8673ead28022962175bd605125dc56012cfdeb177037c322780be93a5191a5292a47cb26cf5d466bb5eb081fa5a9657
+DIST s6-portable-utils-2.2.1.2.tar.gz 47446 BLAKE2B 31093828bbff8d7ebd68e9b9024abff802511d6def436b6c4a42e127fc8ee84544a3e590db2e59d76f2ab407b29edbd462725d8f6c8b4923b999809c58126c8f SHA512 697356a1bea6a0d9ca2dc995667fb2c3ab0e0ec72f9cba9f64a3b745e17ff85793be4b9a3bfcb8137938b732195fdabd2ffba5cef26f86f3ad2705907c6a8ab4
 EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca6bf89428f339f55827290cdbaa185adb62982247fc61346adc75025c0d0312d0292c7364105cc787b550e52bac09dc4e9db1d SHA512 e29fc657d3088c4d160a0526ed09d6377d777ee3b9c4c5ff23db7eeb174e0ed52f14f08d7a02e3a72249391d0c91f038e1d348763071ed100a200b4611ccc5f3
+EBUILD s6-portable-utils-2.2.1.2.ebuild 1127 BLAKE2B 2b392e393616de97b9cceb711a5e9af725f580a66d9c945513f95724735b46c3ab83287b836b4915813b344cc66fe459ca50d1b7979792132fd1b8afc80ff9cd SHA512 456b6f9cbcccef87307f1fec2ec2302acccca5d362b81e56b1dbab1d32488391275959c9bfac9cb1e7b997c8e6fb1e8d8403cc63b55ab65fba78ea60ae88b260
 MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.2.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.2.ebuild
new file mode 100644
index 000000000000..d10b94ff05bd
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND="static? ( >=dev-libs/skalibs-2.7.0.0[static-libs] )
+	!static? ( >=dev-libs/skalibs-2.7.0.0 )
+"
+RDEPEND="!static? ( >=dev-libs/skalibs-2.7.0.0:= )"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 344be908619d..6405d39315a4 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,7 +1,9 @@
 DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 0096fe268393192867b1e2d45f9a46c0a76184783e16dbf066891a84a3f6177aec40a4cc78c276126c4588d7d57e4c5a2fa609b1b0276a12a595b99bc7440497 SHA512 d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06
 DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83 SHA512 81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21
 DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B fe6aa6e2ed868cca6d76928571d561784012ded476825501bb137798c644495a06c2b08c752198d6e985f48fe34404868fa24d49785ff42610e1dd7314ee8088 SHA512 f4e4105dd51eb9dfa4ba45d3f85970d763c70eb5e276de818d9b2c75db9153d3000dd7579ca8e7c4bf814b05bcbcde1dd9b363c57c6507f1cc5af7898049fba7
+DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89 SHA512 12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92
 EBUILD s6-rc-0.3.0.0.ebuild 1619 BLAKE2B 3746812cc4b8c852ae97dad2b9e28e7b84713f98a08df1fd11660507f4810357d8cd1e4798ea246440206fbf4ad1ac452f773f0ac1442e27a4897b4d084d4db3 SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c
 EBUILD s6-rc-0.4.0.0.ebuild 1866 BLAKE2B bdb83058265bfbeca41faf995b796c042f7b4f2f27816cfe6b6039e88ecc6b1f81db18337925673cd82106ce950c4d2ca533614009fb4e18d35072a562764bc0 SHA512 c0c00a6a58ea33ba062a41e26911875c944d77ff20875f8569542d17fa0e075fbe05e0018f92eab6671cd20d2ecfdcb9de0a64f1fe27f785b97ff8b0c75f6027
 EBUILD s6-rc-0.4.0.1.ebuild 1866 BLAKE2B 85c17232f071f38901f70e762f74ef89dda79d75f506b99321467f408978d23bc1bd568911357c2e5a76da03681e62ab62e58f5df95df961caac4b4d10a448f3 SHA512 30168528ecf7f8ab574c981f57fddc37d8b10b0f7985e789ecf3baa1f6f63575018aa7bf468f1439804db32f1b608b727c8d1bc7a79ef105c1abb5a3beb13035
+EBUILD s6-rc-0.4.1.0.ebuild 1671 BLAKE2B 610a7c4282a400632a26529f9d426e371c2b7c846ab06d021839797131ec3555084783e697d1247fb40494ea753d0f5ab71da60ae3a629baabe9a1e87583ca9e SHA512 f6a038ad6168aa2338ec492befe8fe8eb6d566bc9c46e87099f472b04d62b68d91527176b4aad3f4658ad9705d17855f693fb1a0101061b0bb9e8326872cd8db
 MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild b/sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild
new file mode 100644
index 000000000000..9074e87b7229
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?]
+	>=sys-apps/s6-2.7.2.0[static-libs?]
+	>=dev-libs/skalibs-2.7.0.0[static-libs?]
+"
+RDEPEND=">=dev-lang/execline-2.5.0.1:=
+	>=sys-apps/s6-2.7.2.0:=
+	!static? ( >=dev-libs/skalibs-2.7.0.0:= )
+"
+
+DOCS="examples"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
+
+pkg_postinst() {
+	ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!"
+	ewarn "See the upgrade notes at ${EPREFIX}/usr/share/doc/${P}/html/upgrade.html"
+	ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index c43ea2011072..e3075725e549 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -2,8 +2,10 @@ DIST s6-2.1.3.0.tar.gz 181237 BLAKE2B 8cf3b4d4da81aacc17fb663a0648bae1a17085c796
 DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d
 DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53
 DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79
+DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790
 EBUILD s6-2.1.3.0.ebuild 1284 BLAKE2B 805f6f16a33b6a150ef75c2c3775c715598694b13d68dfb930a438df946ed1d0ea3c668024ed963997f2667883765dbe0814ade890b80c8c2ccd35ac2bb5e7c4 SHA512 f5f2e6a032852380cd2991cd09c09f4c55d498c42b33af819893f3f81335db221827e5400633d99f18502d0fb9e8965728d7ce32129f1736aee049c498bcf193
 EBUILD s6-2.6.1.1.ebuild 1508 BLAKE2B fbfa323712511650c38cfce93faf3c4408791ca887ba7a77e4c9b4022b36cd42ee719b8691bfe8976db608ff4a7822753fabd78d51f107b77ee84d117fc55d10 SHA512 194af6e8227a1f63e5285af765dcb43ae3c06e07daa33c83718e73077d3a3848e1edddef3acd49e48618e2ac10c240bb60313338248a1fc6395b326064cf6a6b
 EBUILD s6-2.7.0.0.ebuild 1508 BLAKE2B e04f58311a19ea1ed6088b46f7919296a234efd09d07bd77207f1d9432183c57081072974b4c720a40f57af0dfb8ebbd447f47ca862c89e8f612b825a43bfe25 SHA512 ad05a4ed4e5c0f98c52cf9a3b37c33de5025cfa04b3d240f7a8487b86637f4317ae6cd10d835f18734326bd3e47d1777d91c860dc2020f16e5d9f888172323b3
 EBUILD s6-2.7.1.1.ebuild 1508 BLAKE2B bd4df2ccff6fbe2e72e4643c33a1a37e6d008ada08f5f0806faa8c14905cda8e0e7e00b3d52da57dab5ba58428ded71d4b188b2b714a37ef015b424433ab8cea SHA512 fa2e5517bc36bbd43a56e35a960aacf13ca0d39bfeec82feb17dc0479c8bdc24b636f38a54d302149a816dc18e8f3fa1250e526bd8b8c890db01bf473fa3e5e2
+EBUILD s6-2.7.2.1.ebuild 1356 BLAKE2B cdd91b51bfe13f668b319b39ac60d158c866321066ccb25af78fa70ad0ed1d624378cfd9769c54439f096f6606ca6edacb9c4955b7f021656f47f24bab0a9ca7 SHA512 33afe19eac96603b5c5a856a437b7c15fa86cec7dc074749e69e4f7e93c32a49ba03f810ab2e14335f7ccb4d5d0fde7c241be3c6b21b0751a8ed34a347ff74a8
 MISC metadata.xml 743 BLAKE2B 51cce1b0cbf5b0a026853d24c760d20cd8a82baae31bd4c7dc67af31933beaec632d8937dc8236ae2fec3807ffdc748f82cdd50a025179659ac3e3854f209006 SHA512 7391141506e39054d73b3ef9a336feaef887896603db105d493cfa50fa7dad721c8b0aaee16efb10be5aaa0561f2db19987de1431ee79e312cdb04e7edf77b6f
diff --git a/sys-apps/s6/s6-2.7.2.1.ebuild b/sys-apps/s6/s6-2.7.2.1.ebuild
new file mode 100644
index 000000000000..d91e04cfffd3
--- /dev/null
+++ b/sys-apps/s6/s6-2.7.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?]
+	>=dev-libs/skalibs-2.7.0.0[static-libs?]
+"
+RDEPEND=">=dev-lang/execline-2.5.0.1:=
+	!static? ( >=dev-libs/skalibs-2.7.0.0:= )
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 6628ec50e66d..08eab0698461 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -3,5 +3,5 @@ AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d3
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
-EBUILD shadow-4.6.ebuild 5349 BLAKE2B 06f7ef54c7e2f34a679364b51c0447ad9b4c221225e3d47489132da7ddf3b0c2d9483f0ae2a338f83242fc9969d57b5ce56a5ddc562b5ef481b7ae64c4b9d582 SHA512 2d6b2f974c4540ddc0ef987416636e3ce8e52feac028eaa29a6d86570c1b16d2b50c8613a7dff27a4132a0a3f2b554ae7cb000aed333e99b7883a3a10d26d479
+EBUILD shadow-4.6.ebuild 5361 BLAKE2B e054cb117ded301b86a8f8abbe288f877b4f5bee029011c7608e4ac6f8a086c3c3ae37f528212b1fdab285f076a5d9e1b89abd803e12175ed44bfd46407e172a SHA512 0a6b20756c171fc2cd83d250e2573dffd6b03cb216fb45463a6a9505d769873616b24e67d5460d41f344d861131ab444892e3bed9c643379cf5055416c8017f8
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index 2c4f91f2ecd8..6c3e7bef5d76 100644
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -110,6 +110,7 @@ src_install() {
 	doins "${FILESDIR}"/default/useradd
 
 	# move passwd to / to help recover broke systems #64441
+	dodir /bin
 	mv "${ED%/}"/usr/bin/passwd "${ED%/}"/bin/ || die
 	dosym ../../bin/passwd /usr/bin/passwd
 
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index 30f913bde009..a18a6ea19249 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,3 +1,5 @@
 DIST sum_2.0.1_Linux_x86_64_20180420.tar.gz 6150348 BLAKE2B 1aa520ac18f97bfe16b9160c632cf09bc2021d47789712dec5ea9c9789022cfc8a24f15b1cebd0bdfde65af639a97b2de1474ea0af07c9bf569a56d02e1e8e56 SHA512 61a46b7bc745267fb2f224151fa29b965a56d163ec0e30d46ebdc925b3fab036903f9364cf83428f3e17c6e57db93be48a1ec2a5e7ab6599588d7430af1af628
+DIST sum_2.1.0_Linux_x86_64_20180903.tar.gz 6958388 BLAKE2B 5252408762912ab73c48b2167fd76cac719f909268132d959a86963c209787d2578cae89ff778823cea51049b618124ccc83a4d0cca461a814385516dc1298b8 SHA512 78665600083c12aa45cfb4176cb6b52a02291933bd4b771c2dee5519fdc00dcbf3a09cbb11ab9eb7471b99729640c322a156ece71398d859259af5720ab99bbb
 EBUILD smc-sum-2.0.1.20180420-r1.ebuild 911 BLAKE2B 1ed79dbeaa8c2952cf2f17e45ad1f870b439c0dcfa0e56786e538e61bb7c852fb1b939df9b76669e43beeaed7586606db04598271c168f45a7aba96b41044dae SHA512 1e8fa0022c8ea2906a9a6caf22e7041f075a3e3cb09af6db941b0a787ed4574c3877c1eec3bad52cc2f18b107b73fe1b683af0afef67236c4824c5ffb0f4412a
+EBUILD smc-sum-2.1.0.20180903.ebuild 919 BLAKE2B 350651812050c8c6d674bb9c9e9abd8626358fe5d8ea354b47c8f621ea8403f84b9869bb28ab6174d0b6a32550ab871e0042b5186515777b87e371976972f323 SHA512 bbe2d5d735f6bc3277758836520ea1837bcb2e6625145523794f150e5da38e7c746929185bb9f0c00841b98c34fd9ddb8dcc0253f143936548b49a4bb41b5663
 MISC metadata.xml 1136 BLAKE2B 4fbbabd1a17374af0549a687211c55f4633ae1beea70b844b85b5f90b8f0c1cf053e11d271c9fd61be371a443bb0dcff268ac08476b5ae8d27a2580fa35a8371 SHA512 0d16f9dc63d86b301ce11ca3ae269aa9ea0e755370f46d875dabaf33f0ea244eb304d622bfe22d92dafbf014eb259f56c69ac53dcd0d8688f4792760f267531b
diff --git a/sys-apps/smc-sum/smc-sum-2.1.0.20180903.ebuild b/sys-apps/smc-sum/smc-sum-2.1.0.20180903.ebuild
new file mode 100644
index 000000000000..878ee9ea607c
--- /dev/null
+++ b/sys-apps/smc-sum/smc-sum-2.1.0.20180903.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN/smc-/}"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="${MY_PN}_${MY_PV}_Linux_x86_64_${MY_DATE}.tar.gz"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="supermicro"
+SLOT="0"
+
+RDEPEND="sys-apps/smc-sum-driver"
+
+RESTRICT="bindist fetch mirror"
+
+S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64"
+
+DOCS=( "ReleaseNote.txt" "SUM_UserGuide.pdf" "sumrc.sample" "ExternalData/SMCIPID.txt" "ExternalData/VENID.txt" )
+
+QA_PREBUILT="usr/bin/smc-sum"
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SUM"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	newbin sum smc-sum
+
+	einstalldocs
+}
diff --git a/sys-apps/systemd-readahead/Manifest b/sys-apps/systemd-readahead/Manifest
index 6c725ddf48af..b2ae55415e81 100644
--- a/sys-apps/systemd-readahead/Manifest
+++ b/sys-apps/systemd-readahead/Manifest
@@ -1,4 +1,5 @@
+AUX systemd-readahead-216-glibc-2.27.patch 397 BLAKE2B 020f750428b4cebb642a6ea98a8f85bfad0f4758c3643b2d5d66374015ffa745e9c849fe77d6f5367b10c8fa60b249edeefb1fc678e5b8ed0042eaf6b4e89061 SHA512 5a9ae51246342a81727e672e8528b95dbf18c18129c2c90521fc79e5c57b039e05706c78aa683da736f4e879fad948622b3723678604ee2629faa679afe68714
 AUX systemd-readahead-216-sysmacros.patch 1814 BLAKE2B 74dc5ed9bd5bc1947889c8f7a7e5574322ee8bf2bdee3cd068cbb3a453eae09cf13500757608b4e6b4a24d012a9c7af3f67e444b6ea68ff4dc2b3b658e062b1e SHA512 e48c013913b4db636f070d045eb65dff193d0b5cd25a0d1c98ed62b4071bc6925dce7c835341122fd6e0dc3136d11a8fa4ed35332a8b44ffb6f13195db9d6763
 DIST systemd-216.tar.xz 3612960 BLAKE2B 677fa79e7a8dae5d62f37115c3087d89c46a28515c1fe48abbd77016ee41565583e407913b5a9738908436a2ccc36a1d3305392d8dfa5ac053a44ca66d587611 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2
-EBUILD systemd-readahead-216.ebuild 4873 BLAKE2B 44a79597767759f87831c3cdbfe50b20764af32361b1a09eb973709cdcbd896508cb79f107153c9320b739ad6f13e73a33b1236f8e7fe7a1b0a96e1db630f93d SHA512 7953f2d2b213ccf6685b46d5377887fd621fb1f751ab2d54525b192be10f785033989e99f5936b57af1fa4d6f923396b65a80477779faf8116f65b88c7b28339
+EBUILD systemd-readahead-216.ebuild 4971 BLAKE2B b2ac4edf851d975d86c47e783da10c6f9404e6986f2ac1d9e2c7144ac851ae3c54f59756961c83ed52b45bafe815f7d3bfba12f7df65a68e6912615afdb2b137 SHA512 65418575593a6aabba47f5a609d295e5203c3d3dcdc13f24da45963bd10b7ebd27b80a1f6570a9de2fad436df90745669b424dbfb0ed42632b945b048c767340
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/systemd-readahead/files/systemd-readahead-216-glibc-2.27.patch b/sys-apps/systemd-readahead/files/systemd-readahead-216-glibc-2.27.patch
new file mode 100644
index 000000000000..11837c6cc04b
--- /dev/null
+++ b/sys-apps/systemd-readahead/files/systemd-readahead-216-glibc-2.27.patch
@@ -0,0 +1,15 @@
+--- a/src/shared/missing.h.orig	2018-10-21 16:47:25.858241043 +0200
++++ b/src/shared/missing.h	2018-10-21 16:47:36.986335212 +0200
+@@ -204,12 +204,6 @@
+ }
+ #endif
+ 
+-#ifndef HAVE_MEMFD_CREATE
+-static inline int memfd_create(const char *name, uint64_t flags) {
+-        return syscall(__NR_memfd_create, name, flags);
+-}
+-#endif
+-
+ #ifndef BTRFS_IOCTL_MAGIC
+ #define BTRFS_IOCTL_MAGIC 0x94
+ #endif
diff --git a/sys-apps/systemd-readahead/systemd-readahead-216.ebuild b/sys-apps/systemd-readahead/systemd-readahead-216.ebuild
index a7580f0a561f..301b757c717d 100644
--- a/sys-apps/systemd-readahead/systemd-readahead-216.ebuild
+++ b/sys-apps/systemd-readahead/systemd-readahead-216.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,9 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	# https://github.com/systemd/systemd/pull/2838 , bug #604614
 	"${FILESDIR}/${P}-sysmacros.patch"
+
+	# https://github.com/systemd/systemd/issues/8099, bug #650314
+	"${FILESDIR}"/${P}-glibc-2.27.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index c0b1e101014d..d9800a554665 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -9,7 +9,9 @@ AUX sysvinit-2.88-ttydefaults.patch 266 BLAKE2B 037f77b059dbd593b9f8eb683a0be57c
 DIST sysvinit-2.88dsf.tar.bz2 105551 BLAKE2B 2378a7ab96d059fc781b8b7dd130f4c6311a83527e80e6d40b0970140f0f6c0b081eec502b0c9e461fe5ac02cc064437c2bef2237b20209c8c5f8535a45e50d1 SHA512 0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf
 DIST sysvinit-2.89.tar.bz2 113231 BLAKE2B defb82041edd5d9b95a7c73c950df18107aad292279270b0248b6c803b297c7c2f3edebfeb96ef2d7c3908de689ae265790b2379b9fb63c03d42138af8c418c1 SHA512 3582da52364e3c1f1a488c415f875ab264630cb23f85bc356915f50afc5a42ace18278ed04086cf38c1fe9c7a860f6fc3c2bb1cc50e5560b350a92c24411682c
 DIST sysvinit-2.90.tar.xz 112840 BLAKE2B 24ecd6cbb0dd5c6695ae60fcfab062cafcbe7867cdba2cb3b05c7cf0e9c129364c968e70579ef904f5c617788bc607bdb9068d633afd53e0bb3cbcf41d562f0f SHA512 0fc05cba767d6285504c1c791e2e136cff7865fc6ef8beb8287bede305668ab09590a9b25ebc75bfc2060ea76707ac3dc529bc661a6a92c7b2cc23f5b0a801e6
+DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0d308b7027d54031848407e6b7667b59096044eb186a7f6a862521d4a670c05a17dcc929d07da6515058949606 SHA512 8dcf6de79b03567c300ef5f2b7dd211895745e231510d730092085a15f61f06f28cee7c504b0b022bdcb4b4e903f44946537d4fbb2b5069fb5d29bb099fd45f5
 EBUILD sysvinit-2.88-r9.ebuild 3470 BLAKE2B 6963eb9b677c53c0b7fe67c6dd3d9cf4b0ee89f8670abc6e9d8481b2d0dab41c7428b6293f00f039d286eac0c223ebe4d250bfda27fb82beca8812b188de232d SHA512 3beb173dc4b830874f20e16f9d079abba86c2813f81719d091c174aed9591a803fb92d5fa2d20884f8aebb755b6735fa6183613271a576cd93f51c17a072b0f5
 EBUILD sysvinit-2.89-r1.ebuild 3375 BLAKE2B 71bbe33ad11398149b4ebd7e9cc42b1c3809a4173f25a0e7e960e083d1f715a6baea2027b120611c334bf9f2a14699d50e94a7a67b5c6cd4f3e6a680e80e8446 SHA512 c3a34770ec58142cc18b2a9607fad0a1235d56f9c8e1b5594c39bbbe654e17a0d39da35e4ee887b893519705838c8b60737659a1346565da4aa1c22d5463b577
 EBUILD sysvinit-2.90.ebuild 3375 BLAKE2B 73d413d29a9e6331351cfc505e72f12e56335d1b0c188209d87e8baf6b224cef75a0f5c575d64134c55a8930bcb5ec79256880035eedc3624485ba92748fa1b2 SHA512 c2afaf594ec8f1cbc7c78261c2021d61a733b9bd744e21507950999504c1f8f9ce65071394e64e40664ae514096f9ed3d5acc1961819d8a795cd86b1e6712935
+EBUILD sysvinit-2.91.ebuild 3353 BLAKE2B 5fb9f6d78adb1602c6eac4326c91a567d9c6102081469c79868d40bdebb7b562f49e746d17f74b45b418c8905ade25827b1b900d757209a10a660c0640a78b35 SHA512 5bbe681adfd50cf2a87de5c82407e8f4ec3d0db78ba7a3cb964dfb3772a2ce6bb67a162cf6ddcbae84d528fee37e5508bf3647d5c538bcf978a63ded08efba75
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.91.ebuild b/sys-apps/sysvinit/sysvinit-2.91.ebuild
new file mode 100644
index 000000000000..a59013bd45e8
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.91.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux ibm static kernel_FreeBSD"
+
+CDEPEND="
+	selinux? (
+		>=sys-libs/libselinux-1.28
+	)"
+DEPEND="${CDEPEND}
+	virtual/os-headers"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-shutdown )
+	!<sys-apps/openrc-0.13
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
+	"${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615
+	"${FILESDIR}/${PN}-2.88-shutdown-h.patch" #449354
+)
+
+src_prepare() {
+	default
+	sed -i '/^CPPFLAGS =$/d' src/Makefile || die
+
+	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
+		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
+		src/Makefile || die
+
+	# pidof has moved to >=procps-3.3.9
+	sed -i -r \
+		-e '/\/bin\/pidof/d' \
+		-e '/^MAN8/s:\<pidof.8\>::g' \
+		src/Makefile || die
+
+	# Mung inittab for specific architectures
+	cd "${WORKDIR}" || die
+	cp "${FILESDIR}"/inittab-2.88 inittab || die "cp inittab"
+	local insert=()
+	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
+	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
+	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
+	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
+	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
+	if use ibm ; then
+		insert+=(
+			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
+			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
+		)
+	fi
+	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
+	if use kernel_FreeBSD ; then
+		sed -i \
+			-e 's/linux/cons25/g' \
+			-e 's/ttyS0/cuaa0/g' \
+			-e 's/ttyS1/cuaa1/g' \
+			inittab #121786
+	fi
+	if use x86 || use amd64 ; then
+		sed -i \
+			-e '/ttyS[01]/s:9600:115200:' \
+			inittab
+	fi
+	if [[ ${#insert[@]} -gt 0 ]] ; then
+		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	append-lfs-flags
+	export DISTRO= #381311
+	export VERSION="${PV}"
+	use static && append-ldflags -static
+	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
+}
+
+src_install() {
+	emake -C src install ROOT="${D}"
+	dodoc README doc/*
+
+	insinto /etc
+	doins "${WORKDIR}"/inittab
+
+	# dead symlink
+	rm "${ED%/}"/usr/bin/lastb || die
+}
+
+pkg_postinst() {
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ ${ROOT} == / ]] ; then
+		if [[ -e /dev/initctl && ! -e /run/initctl ]]; then
+			ln -s /dev/initctl /run/initctl
+		fi
+		# Do not return an error if this fails
+		/sbin/telinit U &>/dev/null
+	fi
+
+	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
+	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
+}
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index 9b17da4db0eb..d2436a8090a5 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -10,5 +10,5 @@ DIST usb-modeswitch-data-20170806.tar.bz2 32700 BLAKE2B 954aa513a74774cdabb2e382
 EBUILD usb_modeswitch-2.2.6.ebuild 1617 BLAKE2B 216b3c94b7f204ee41fc36f95e5a3b6329ef5e2b225f78ea0d037cdd9f5530d12cb3cae88330ea300c2d37170612482525189f26792b872872f7ba65d66637e8 SHA512 905090c51fe23cc47d3f36cbed21cd590eb1132857fbd49c3fa821f824e39e535917c96f48b4716a524cb9fa3d68b13a5221ce57109d59e7782cb17624112664
 EBUILD usb_modeswitch-2.3.0.ebuild 1620 BLAKE2B ea03a8ba28fd05a2c09c1584ac97ca306fb4a085d20d9c1299f1b4878095f0b7e14ab5bc5cb47c5aa938e2a7823f7421f95564f82c62cf02fa1040f028ea2399 SHA512 1bffa0315fe2dac3b7748b3f227a8942b9f0e26e91f581e9c6b24927f564bf85d73c08ce061224fc0aad9ac6429b1e4d160f60bdbe6ca0d3bc916827f29c761b
 EBUILD usb_modeswitch-2.4.0-r1.ebuild 1673 BLAKE2B 4e9bcf904dc03abdb4ea4a4115826b1efc6760e10cc162ffd4996ce550eff77d30c9675e9b8f4a6487ff96cc0e764f6e64bdb81b22472f7ec2472599571c939b SHA512 a3e049d75118661a57bf590234f399a43c2774c5908e2b7b804287f2173e65178b171197019e672d6101308d3e477a788ef8de650a95a194f0523573510ebb5b
-EBUILD usb_modeswitch-2.5.2.ebuild 1669 BLAKE2B a755ff2453b15e72245fa837a7f9abd83abd0da932e955abb04caacaba8c6dc0584ae48562667725598b0f8472dbaf04a336623551afcf91c098eb5075748158 SHA512 f3b5eb0c6fb9d96ea280db886c093c524da0fd637e5ac7b47e135a6791ae9ee8be3964d2b20182fb8b1235baa4a12b39cf6ce61c3472950cdabbc14f3487fc3e
+EBUILD usb_modeswitch-2.5.2.ebuild 1667 BLAKE2B 85e8027af34df36bb2f050abcc661acdddec7f9c8d5b513fd4ae4537e4c5a254cf31570345a2f426f1c0cc1ddaf914c3fe9851932a7b51e027be5b2c5e7a3eac SHA512 220921d67101afd233872eec5e6ce1c180dd0ee377da35a9b964f966d8d49cdbd3666ed9f916586db5b375f6f3bf9f0ecb081b9fbf110dc35f2a479e58b84807
 MISC metadata.xml 541 BLAKE2B edede0ecefedff47ad5641a9661eb7d192f339ae48f7c562309412a545f4e3897a4dfd521e56c8f906326578fefe1e489905be98df240a240944c4c2520ea4c2 SHA512 a7d85ab85e65702c21bb6235e55482a678fa3e990c0b75f147b91970286784e26f7aff11b6538278ac51ce7003f7e55cc8a0bc51ede9f219354c7e5693dad80b
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
index 2192dbd4d067..7e1756d13366 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="jimtcl"
 
 COMMON_DEPEND="
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 95b4582d8fa0..b35a84bb033d 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,9 +4,9 @@ AUX util-linux-2.32-add-missing-lintl.patch 1279 BLAKE2B d76fac864c34f38f51fdf42
 AUX util-linux-2.32-python3-tests.patch 4512 BLAKE2B ae8f93748f4ef71e0bb7952272b7d3e7c4a3e63adecfe341e60fc65cf784a2df021cc7b567b0283902f22e1653a54644f508c4ae16d8056c21c3b279649af04a SHA512 9c065bc91e22f38eb8ad8156db8e66671749d2544cb8452da787f0d9e07f34107e9db49beb0d80962020e0b5c134fd8b090d7484d1dbf87eac933e65c81989dc
 DIST util-linux-2.32.1.tar.xz 4561088 BLAKE2B 9e89b7fa2eacd51ad8c5cf90cc78df73de5d414c1039bb38784a376841806c1e0d38b702d29c6a8e91a2c3464fec1edcf68caaaa655400db2e5be483eb5efbcf SHA512 267fedae24a874ee4dc558081f6b8d07b33b955b0635f3348f021c111c17f2e95c01b2cbf909fe13c6ca448cbcf23c658c75f72f25749aa65e99f68fabb94698
 DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
-DIST util-linux-2.33-rc1.tar.xz 4619236 BLAKE2B cee133c9d17fd86c5750d3a53e86d0beae2a53db7cf56b7602a7d497d5d615a85ed21ec8349b4a30b5d5dce3e29b3ac421e969b2a9230efca89ed8260f120352 SHA512 7a9de1a60854892f8b3215964a1a934d1fbcce92e159e542977094cbf12e156f37954764cf955e911f28411b8996ac1496c471d560d534204f9b6970dd605684
+DIST util-linux-2.33-rc2.tar.xz 4613036 BLAKE2B ac17fc3efea4f5d637e00cf367f087dfc25cea9f024aa2d6510262b3db236fb0e0b280db35d32848e9569603a494fd59a516ae02a178f8d7ac1f9f3936493563 SHA512 7a38a7408a42a47f4e67ead068b5418490c8871ed452613cd2459bd7af64b1a218dc4e826197730b2de60d5d757c02ef79dc7e0f8aeb3f24be9cf8934e40a5ad
 EBUILD util-linux-2.32-r4.ebuild 7269 BLAKE2B 415ff80ef80ad95e10e4fc79c830e0ed5bfeaad4671a049eeb081ac7ee2fa7ff67ec47f9368af0fea2b19896b2b00bbac8cd00e331c8a56241fe116670b26665 SHA512 89746556f3753e5cbbb10bb1e56c275f5dd434b61a6e6d3bc7366cc02dcf7a596f1343eb674caf427909706e8ee00ad0aa6b03a84526028f719e977de2390db3
 EBUILD util-linux-2.32.1.ebuild 7370 BLAKE2B f613cace23c64e8d7e69dfe785cc1cc4a2e7c77897867d2e84943559e7030841ec929fa8b178d75096ce1ec0adf2af861fcfc99bc7d446760727432637212c2f SHA512 ea7131a22979df1efcbd041ce5539ef3b3ca5df31713ea46952af3fbee143a5b609b114fdc1be6e0d981f23e82d1bfce2fa489f2e5aeae0d19a01ff04530b5ca
-EBUILD util-linux-2.33_rc1.ebuild 7106 BLAKE2B 0bd60a716b8e26afd8232c18a802aee9c290c27a17d3d827538726c511f74a0a96b9ef37129713156d83292f226ff818f8a129243fd4e876903ad67a8d3f91f7 SHA512 0a407281f42dab3413e6861bd809dd92cdb6d9bb21618934193bd78f74b1ba4e1c3e4aef5fe3da1b8cf51e413b1d09111c05fad83474c533c07faaaec51c6462
+EBUILD util-linux-2.33_rc2.ebuild 7106 BLAKE2B 0bd60a716b8e26afd8232c18a802aee9c290c27a17d3d827538726c511f74a0a96b9ef37129713156d83292f226ff818f8a129243fd4e876903ad67a8d3f91f7 SHA512 0a407281f42dab3413e6861bd809dd92cdb6d9bb21618934193bd78f74b1ba4e1c3e4aef5fe3da1b8cf51e413b1d09111c05fad83474c533c07faaaec51c6462
 EBUILD util-linux-9999.ebuild 7109 BLAKE2B 6b87ab1217a31c3387048d6c32331e2f7f3e428791eb6c1affab05de219814cefd8f25cc2ac7ca237e60a38dcda27a1966e4ba46908cee4970acebd9dfd2c166 SHA512 2e3ee3b8c31486e3ac92e2e3838e619671e34755393f48bd2389582ba00b17b8abd8c92e026cd81d87ab6e10b5a0b4f213059ed43e91180c6c2371f195997986
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/util-linux-2.33_rc1.ebuild b/sys-apps/util-linux/util-linux-2.33_rc2.ebuild
index 7060ef533f6d..7060ef533f6d 100644
--- a/sys-apps/util-linux/util-linux-2.33_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33_rc2.ebuild
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 68c0832531fc..556ca081afeb 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,4 +1,5 @@
 DIST yarn-v1.1.0.tar.gz 874168 BLAKE2B 2c2e00237e4c1264ba3167f5fbeb40ef64d9ca42b05bd4e005673437c9c2ef084e93db00811840aa6cac6fbdec912cff654b09a81bbd6ccfb954d1e14128cd79 SHA512 7ce740ac47d8ba42c47d0262979fcd1d22daede2a298e1743341c52584bee7d4beca8758c118deccaefd9cb0bc2780a37e110ae3633af56ac6916ae0389eadf6
+DIST yarn-v1.10.1.tar.gz 1107068 BLAKE2B ce9870d5f149b53d056682190a4bd3bcd2a8d2c30fb06f053626f55db506100f9db212103c3f498b44a53f94dfa0b5c4ce37453d72e05533476ff6a2d99a4099 SHA512 107d07d5fc9f171904e14a46e1bf9509a558e08e3cf08d84c903661a31862a6bec4886f41b76fed4871f1983c8da0a9ad5dbb8de0e190378c7f1f5e5abaa15c6
 DIST yarn-v1.2.1.tar.gz 885691 BLAKE2B ba7a291e4b071cd285e890fbd8af2a1adf78bc7a65ddaf7adcebee2b8bc15d4b98293eeae79be5ad664daa6a56d553ade1fd5e50aaafc7ed2f980ebfe4feac58 SHA512 cb61788e16cd3537073b3a8711ce6a29f7e14380cea20ca16144e97ed05ec62c685b805a18af9e70d16f7aedb4c460cad97027e37fb43596f97570386d596477
 DIST yarn-v1.3.2.tar.gz 886500 BLAKE2B 224503241b646bd6befe6571022e1081c4e9cce2371ce0c111704a6f0ceb7c4b4f0267c9c37d05feec60311cc7804706fb47d130ca64e6182590e88d8476b386 SHA512 d488ae56b60884bb42e5e2ac8a0359c6947e234ed8b5bba12a93f24abb4419b4a6fef708c35df8caa9e68edca3fe570d1dcda9295d29438e45a32ef5d029aedf
 DIST yarn-v1.5.1.tar.gz 936225 BLAKE2B b35631ba0fef692797c83431fb673c0286dbd29a5a3e5819111bcc189a136d7059afd7e1901a249204e1a14ff4c7a7321207d7fe1c057d4e585184424f9c26dc SHA512 b58b712ee395d4cfec5271e02e8cf77489438815aeebea1c6844866eb6161be9ae078f62f726e44eeb704d0195b94339d1e89991ce56de8690d613d4bab5f548
@@ -7,6 +8,7 @@ DIST yarn-v1.7.0.tar.gz 944751 BLAKE2B 468ee9fbc94e5ae74137f9232929e78213ee435a3
 DIST yarn-v1.8.0.tar.gz 953127 BLAKE2B b290c4e6a5800afd8706954dab424f7cf0c784c0dade705f10a06803dfe64b83206f534dbb41e3e804593a17d722ddc3253377465413be571bb2b29639f99ea6 SHA512 12919a27d0845644992a60c87a919ef2776e5959c43d1c31767021475b8cbb591f5f6ff2b214eaddc11d520f91d758bee439abe077717a7348eb387813dbefb6
 DIST yarn-v1.9.4.tar.gz 937393 BLAKE2B 188e270b2a8b5b357b85101eda2552d675e3f41d30bc7b45266f34831cbcfc00feefe452c420f3aaefad7423c2af342d5fdb859ec6420faf689b680b5acda00f SHA512 1e3a908cf47a2fe46d7ce8db549b91cd0b3372c7c43c6b0029f1060b044a0a65e5bc3323f4ed6baf20bbbcb49ba358a6bb8f2691a591e4d3e8a01bc31372cb5b
 EBUILD yarn-1.1.0.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
+EBUILD yarn-1.10.1.ebuild 853 BLAKE2B e42d2ade1f7b02d9e5a312eea6a0f81cb21fe98a174e42f3fa62e5a414e5d7dee57b7b55aed0a32171407fc20ae06f141fd47c3d061abb4861c563a19aec293f SHA512 4159c1e9702a91c10792ef92f8c444d35176f67977914c5fb100df15c28555a14bc81d9e77e879bc7b78afa7ffdf80185b9a878198ef8c7b9428cdb661320860
 EBUILD yarn-1.2.1.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
 EBUILD yarn-1.3.2.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
 EBUILD yarn-1.5.1.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
diff --git a/sys-apps/yarn/yarn-1.10.1.ebuild b/sys-apps/yarn/yarn-1.10.1.ebuild
new file mode 100644
index 000000000000..7bd9670239d3
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.10.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com"
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+	net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
+	insinto "${install_dir}"
+	doins -r .
+	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+
+	while read -r -d '' path; do
+		read -r shebang < ${path} || die
+		[[ "${shebang}" == \#\!* ]] || continue
+		chmod +x "${path}" || die #614094
+	done < <(find "${ED}" -type f -print0 || die)
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 9c4808ab64b2..3f06f195dd2d 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index abb589493e3f..6618d763c125 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -17,6 +17,6 @@ EBUILD consolekit-0.4.6.ebuild 3396 BLAKE2B 6e271acbf554e69a9cf82886db1e30991a70
 EBUILD consolekit-1.1.0-r1.ebuild 3238 BLAKE2B 98ff5d64cc793705bc1d8da4b7cc4ed17803de1ae0c9fb4bc9e974ecc500f544e4839b198b905f369ed4b2f7006d7b60f4c058f540bfd11e690780f0349c9ce6 SHA512 d124ec42562ab4bb87e34344dd165a70f5fb0116f016d901dd6f2cfa3123540f72ec1466c0c40406f9b1a7629c4a2854c8905ba24984851cf4acfdcd1a3226b8
 EBUILD consolekit-1.1.2.ebuild 3505 BLAKE2B 94aea3cf4069293d6716cd60ec5d81f77f316acd5bd0a351fb93488db981e1f8cf233ffbc8ae7a1fbaaa3f0ccefa21829a0a2c66d2d961d64851ed543c9c1435 SHA512 f5e7616bff11f00502ca5f6c1a33ba1cdafcf28b4e8f87cc2e3f1f67b8018e6718c610fe3a0908b7caabf903a4131ed611491e0c26c8405cd43bd445b1ae4e60
 EBUILD consolekit-1.2.0.ebuild 3541 BLAKE2B dc13b73b3f704f48943168d5c1bb7373b53a74b064c7a7d10f1ddd405c3922048cdf218bcfa39da99e9d41c0c19fc9c20066565360f72460613b7af1e15652e7 SHA512 93595ae532dddaf904b103af31c74ab8ee0fa8f2dbb10ffd7fe9fae017d77d4914291f0e0f97f73bb5c35c5a427aa25eaaafc4878c3ebf11b8cf75f977ba6544
-EBUILD consolekit-1.2.1.ebuild 3537 BLAKE2B 5ba6c3ea67c43c0e79aff6a698bf80a31db6fdff4daf874f0165d68acdd12fd686a0311d64112d261bae98449f5a6b0cc6fcea2749dba7ae0df66b3e27225ed1 SHA512 fda196c65297f40617f35c8d09213be18880685b496a91bd8b7fab8b8516877fec78e7a46173db7c4b67caf8f949effa3515619d3b726529d33585f90f0df495
+EBUILD consolekit-1.2.1.ebuild 3534 BLAKE2B c56a2bf9ad00c222fa6db1bf6e3d511668a928af5983cc4a4d07bc57aa763ef472be7a2344678941599f94f682463c05f04d215b4b1e6bae136b8c84b2ca7a40 SHA512 457224a04daf8bcc3f3dae0e1c982f864c33c1dea7e12727b5c4386d05ce0bde064d035d66243dfa5587db9b3aee47a54f540b252435f44a24a68cd13f4e9ca3
 EBUILD consolekit-9999.ebuild 3311 BLAKE2B 7210f04e5d06c75375122a984ad04c47043811b83b2ff208e1e3dd2e8d3667a52c9db0fd3f3a82cb1a4dda9c8effa7b49495ee9f9a5bf0e4e89595b9dd73bb1b SHA512 d28c3a5da5ece93cf7e9f22746ffcbd53beee19b9106258c210b4ff937713cff650771cdfd4d2919d4122517f2e534d5e7861d3a8392d4fc4e691e92a25e4b69
 MISC metadata.xml 1053 BLAKE2B 221df4a94a8c48265cc70ab9fa60a409fdfaa0cf9662a3b89b3851e6aac9664e183e54bf09b957ee5f8f69dd3bdcb9d5c8493071d00dde7daf11378f0bed2fd7 SHA512 866958aa11b4410414886c8de76948212e356bb9784f241238aae0bb1b5cccc39731b660ec7affe88aff1095470c37ff076bd09a7546d202aa7a95acc5748014
diff --git a/sys-auth/consolekit/consolekit-1.2.1.ebuild b/sys-auth/consolekit/consolekit-1.2.1.ebuild
index 729174707654..2116ef04125a 100644
--- a/sys-auth/consolekit/consolekit-1.2.1.ebuild
+++ b/sys-auth/consolekit/consolekit-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
 
 COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index b71411f0417f..28362553938f 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,6 +1,7 @@
 AUX elogind-238.1-docs.patch 793 BLAKE2B eb6683d5bf221459fb0ff0aab6f10f179769bcaf6a914f6b41f8526ee2075924f80cee1cd320aa7697d60bed24d5652e6bc8c02451a0da98c4b29cb8a73641ce SHA512 16503a616b511e4cf049260c34b1390844ce06b22a99e31813b11886d1dc12c90aa46b3dc67343b2a33df85923b5cd6116d7338ee9bd32f2d7a9be9db934ca74
+AUX elogind-238.1-meson-0.48.patch 1749 BLAKE2B 4c1174484c75fb33702d47110b95a97ee231756369b39775c1d03a3d4d56b3c48e3b8b9ab71e14c1e5ed667b62b12c999b2edc168b546de45e07fbcc1be7c088 SHA512 d1a97303a4498dc9adf671c2cc150fa1a1391dffa5830f6f9ef4ddf4f0f9f00e4ca700a7f2d500d5de29eed4327b11acdbee92bfd261dc26c3f1243cd179f9b4
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 DIST elogind-238.1.tar.gz 1074179 BLAKE2B 3041e9cfa0d454f653db164db8e59af4db5f3821bbb65cb5482d83f63e410612e121791f7ef3e08c9ac3940c7b6c7931df2b072ba452d2073c3e424e4dfe10c3 SHA512 ba0a74e9b9168b08a54b13ed500e9c713c48bb1648aa6064dbe666a96fa3fbd5b69447c35f686db3a1813476a5585be34b1ae13e3c9017eac8171b73f6311c4c
-EBUILD elogind-238.1.ebuild 3472 BLAKE2B e0be747f257ee41fabb5294e16aef69f4d071aa04b6bf6dad05b67648957b69a41f99d80515d37a038fa11e539d657dac23fab4fe757365974d691b2914354bc SHA512 907afc4f04ad48b7eb9ea278e6ea116639c5d27d71f52b1dbe236f3b4016cff1fa5323686b27d27723589c86479922c0801ea9aa0d0596b2931a82615d912a08
+EBUILD elogind-238.1.ebuild 3507 BLAKE2B 7f90251cecf01c57d24e4a7ef473acdcdc5ef1e39b0d51ca3a1d69d89518682f6ec0e4dbb3659ba21b4bc183a4667123b0e1d58777c122514c4d3306bcd2f370 SHA512 34e14cefed34dca89a15d222d90cebf588986bb866e2a40a24e10208025ad1a2ce6052b3110333f1f13a962be268c1ee6b9931450acf56ba571c8331a62a8e9f
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-238.1.ebuild b/sys-auth/elogind/elogind-238.1.ebuild
index cc148ee6f8da..176b4b39bba9 100644
--- a/sys-auth/elogind/elogind-238.1.ebuild
+++ b/sys-auth/elogind/elogind-238.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,10 @@ PDEPEND="
 
 DOCS=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
 
-PATCHES=( "${FILESDIR}/${P}-docs.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-docs.patch"
+	"${FILESDIR}/${P}-meson-0.48.patch"
+)
 
 pkg_setup() {
 	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
diff --git a/sys-auth/elogind/files/elogind-238.1-meson-0.48.patch b/sys-auth/elogind/files/elogind-238.1-meson-0.48.patch
new file mode 100644
index 000000000000..ea4ce0f8f933
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-238.1-meson-0.48.patch
@@ -0,0 +1,46 @@
+From 63c4b947c4fddbefd8d35acf6dffdaf34d6077ee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sun, 19 Aug 2018 19:11:30 +0200
+Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
+
+Meson added -Doptimization and -Ddebug options, which obviously causes
+a conflict with our -Ddebug options. Let's rename it.
+
+Fixes #76.
+---
+ meson.build       | 2 +-
+ meson_options.txt | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 05a257d1f..117af9e5e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -936,7 +936,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+ # substs.set('DEBUGTTY', get_option('debug-tty'))
+ #endif // 0
+ 
+-debug = get_option('debug')
++debug = get_option('debug-extra')
+ enable_debug_hashmap = false
+ enable_debug_mmap_cache = false
+ #if 1 /// additional elogind debug mode
+diff --git a/meson_options.txt b/meson_options.txt
+index 84100b629..f12b542e5 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -77,12 +77,12 @@ option('kexec-path', type : 'string', description : 'path to kexec')
+ #        description : 'path to debug shell binary')
+ # option('debug-tty', type : 'string', value : '/dev/tty9',
+ #        description : 'specify the tty device for debug shell')
+-# option('debug', type : 'string',
++# option('debug-extra', type : 'string',
+ #        description : 'enable extra debugging (hashmap,mmap-cache)')
+ # option('memory-accounting-default', type : 'boolean',
+ #        description : 'enable MemoryAccounting= by default')
+ #else
+-option('debug', type : 'string',
++option('debug-extra', type : 'string',
+        description : 'enable extra debugging (elogind,hashmap,mmap-cache)')
+ #endif // 0
+ 
\ No newline at end of file
diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest
index 4273b17816e0..caceaeee4c72 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1,3 +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
+EBUILD ssh-ldap-pubkey-1.3.0.ebuild 1549 BLAKE2B b3e5ad64260e124a64d27aee8c67d0b83d4087c1852c190a5ee812334384fcf4b6ef44f669d136a777248af74098dca922e6a56466c53107e24cfbfaaef82949 SHA512 6ed615036d12a00aab37eeb2f8b17d06d35dcf2823679d3f795cdf1e8d130159bf8406ee6949ecd32a35d0f91b5873baf7f4e68a5344612259506ea91230d83c
 MISC metadata.xml 416 BLAKE2B f3aafc3351de51af856f2b046be4071d01801110e952bca75fceea99f4216c6cceefb97f4b5847136ea3c6f842eb4b088b44958a31e5c0ca9dc0c739cc06e404 SHA512 a58364a55b4ff512e42eaa31b2003b40ab16db428e5305d8637d166e7357dadad3f608ccbe01e9bae8e41e996ea6bba216865df7bcc662553082be812a7f7ec6
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
index 6381fe6c4296..1c422cf550fa 100644
--- 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
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 93039853311d..032536df0243 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/mpt-status/Manifest b/sys-block/mpt-status/Manifest
index 39089fe0ceaf..ea3cb319d17c 100644
--- a/sys-block/mpt-status/Manifest
+++ b/sys-block/mpt-status/Manifest
@@ -1,5 +1,5 @@
 AUX mpt-status-1.2.0-gentoo.patch 1704 BLAKE2B 7497d7468dfb395292c69876a8504d658766437fd599b1b785d875acf8bb3192a2edf55e5c1fe7ab6c5612744ae5a27a9d4d9b421281e8cee989d36dc14a1527 SHA512 87beecaaa3210548025275085694e02c88b722f1cab4869a6298c43fd3f55f9cf8055868bfb32c40e55f3694485cb9154b0218c0fc246829a40885a85fbc55a1
 DIST mpt-status-1.2.0-linux-sources.tar.bz2 33155 BLAKE2B 8ffd6c7ba99d4eedfd6260698a93af432ab5d330ef5c609a3ce28325bfe4208842b8f61bf351c3f1b5c3eef3770c08861fa6965c5de65fa9b71e1b5321c8b53d SHA512 f5155dba7125e658d2a4a500e0ca6cddbee0102f4e8b19908b9a1ea53ece06af8a97583efaca737486c67f8caefb08318efb8f8cde7bb2d6ce3bfa00a02ebb62
 DIST mpt-status-1.2.0.tar.bz2 36060 BLAKE2B f17cb1c224256c244c4263e9604d2e708bc236447c338015ba83b37e0edf9dcf047312ee758a5d67a821a3f7cc97ac2376779bd74a84cc0a5559d85f3b2606d6 SHA512 854c21aa2c6bda1683ff162342cac2139fd7a98de693edab345b053d6c2fc2dfe6db09f12237ad140cadf10e95f64c7f5fa773a4e4d063654eddede1ce52bbec
-EBUILD mpt-status-1.2.0-r1.ebuild 821 BLAKE2B 3d5a57a171218c83d1cc4a0dd429698bed3c18ad30e364be40837fc073781a5384f5d88242b9a13b8a9cfcfdf2770bfa44f52b7185f2d200a432cf5a62b545c1 SHA512 6d27e7d0edc7a469f1b0f09a3da53e777fe95a7f898efd9c4652807874e7092ffe24075029e47f777b0ed51033e20b8fb36a0df30c1bcb59be32e8cbbe0c5c01
+EBUILD mpt-status-1.2.0-r1.ebuild 759 BLAKE2B 8c91aa5252eea71802fdc8661ea22835029509ec6f8495bdcf5575f721290129705c8a0fd783b73ebfdd782f1c6238e910f7d44990f5f9345c54ddfee3ecfddb SHA512 04e3a3e90cbe02b5b881b968966e80587aaa67232e2a775c6b56b3793215cf60935d3d7150bb8b0f01896fa0addea4b6f9da0a36782198e6c1d6fd7eae7d5e9a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild b/sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild
index 38a202f87455..67bf731a9f90 100644
--- a/sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild
+++ b/sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils toolchain-funcs
+EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="Query tool to access the running configuration and status of LSI SCSI HBAs"
-HOMEPAGE="http://www.drugphish.ch/~ratz/mpt-status/"
-SRC_URI="http://www.drugphish.ch/~ratz/mpt-status/${P}.tar.bz2
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${PN}-1.2.0-linux-sources.tar.bz2"
 
 LICENSE="GPL-2"
@@ -15,12 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.0-gentoo.patch"
+	default
+
+	eapply "${FILESDIR}/${PN}-1.2.0-gentoo.patch"
 
 	sed -i -e 's,\(^.*linux/compiler\.h.*$\),,' mpt-status.h || die
 	sed -i -e '/KERNEL_PATH/d' Makefile || die
-
-	epatch_user
 }
 
 src_compile() {
@@ -28,6 +27,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dodoc doc/{AUTHORS,Changelog,DeveloperNotes,FAQ,README,ReleaseNotes,THANKS,TODO}
 }
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index d52935938a5b..3b1a400883ac 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index 2e3ed9fb3f23..ddfa3f5664a0 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,3 +1,3 @@
 DIST woeusb-3.1.5.tar.gz 399712 BLAKE2B d52b29249af680577299a02cb9a2c1436aef73a0240bff2525c494657c197a2fc0709e0ff6f35eb5d18592145347af284a998deacecff37effd95b75ab13bc9a SHA512 5cf4eb45b126d71bcb376148383faf9713bc06ec4ee3ccc2dfa6528d9fba382bceaae2cdd47f2d8ba775dad1ca8e6258af40fc6362336927894398193600c965
-EBUILD woeusb-3.1.5.ebuild 1036 BLAKE2B e0daa3852bc84b27c218d9be5a10f497a7653a0b94fa3e47807f6b99b2399ba0f612e9345e9d6ef1d56a179e9eb320e15e2e0b258273af57011d337e10a4a2f4 SHA512 66f0e68bb9e37d7bc18f6e7e88042bf9b2da13827dbc23fdcfeee82897252fc03a0b34c6cd14a5d129f4ac4b62dc47b0c62fbd7c8762c02e14654e82f37a676d
+EBUILD woeusb-3.1.5.ebuild 1036 BLAKE2B 05f973a5a8fd401e9555b5d87cb961a78d0383c8944eabdd35387bb4edb0897eeb184d379647496b6765bcce1d1016cf7d5baa6abba89b6ba1483a91b090b4b8 SHA512 1c8b86ec2a14ff16ad6e82616ff2430b1a364a68ef00b03a330240800ded5e55e1ca0f518523a7c792955846a35b372b396c804c29e1b68c479ec8a49d600671
 MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9
diff --git a/sys-boot/woeusb/woeusb-3.1.5.ebuild b/sys-boot/woeusb/woeusb-3.1.5.ebuild
index a3f3d8132079..6e6027efa6a3 100644
--- a/sys-boot/woeusb/woeusb-3.1.5.ebuild
+++ b/sys-boot/woeusb/woeusb-3.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ RDEPEND="
 	sys-fs/dosfstools
 	sys-fs/ntfs3g
 	sys-boot/grub:2[grub_platforms_pc]
-	!minimal? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!minimal? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 01b204193b34..b08148b4799c 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index f95afcdfca21..eb942ed66227 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -21,6 +21,7 @@ AUX ceph-13.2.0-boost-sonames.patch 6598 BLAKE2B 906530f288518b26b005140645241da
 AUX ceph-13.2.0-cflags.patch 1011 BLAKE2B a7d911ed0ded1a1eb5426bae3a7b1cc169774668cdefd120ce8a5bb2f2082d792dfa0d2e14bac558bf27343763b66d42b9d84046acfa5a1cb1d61fc1219955b3 SHA512 8ec0d668fefee12d2c7f5b5297dd81fc6a559f5823d069e6395d9b4240110eb8f95049d3054697a459948c1f3784b4450539849cf9d7f3b1aa1c7fbd96c475df
 AUX ceph-13.2.0-mgr-python-version.patch 675 BLAKE2B 2458bd067f9947189b65c439df501f1c31eaf6a9ca7d46164e84a37aec7e99ac12456bd299604d18b2f0ac70898de90427a80390644a8e3d455c5e3caf297854 SHA512 aa0f3dab73573c1ac91513bca378a8441ace5f58a0e469f4f01d7ab22869b41e5d4a1e44c3fe8e2bc23ab5249fd1a52a4b72000d458521b6ee291512e51d474c
 AUX ceph-13.2.0-no-virtualenvs.patch 4466 BLAKE2B 9f5176b7d3ee3b3602341864af8eb2494cfcc2268492d7ecf9f43576963de913c9be52259dd16c2a3ad6440eeb33604ce609fc11e7e36236a37c02b84ad81890 SHA512 7b9ab0a7e22784f66253f873dd76bb3e76cfff4781632ed51d39beefacdd1a7f4d90441aff9fd93987837fadaa847906bba32eb18c86f8a8fe31205246cbfd8d
+AUX ceph-13.2.2-dont-install-sysvinit-script.patch 471 BLAKE2B 85ef94f49408496360fa24a433e9d6f3568749a6dfb415cbd17bfb950b9500f182c5141eab402686001f95e1611e60accdac7111ceca14f03b1ff8b4345c087f SHA512 ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -32,6 +33,7 @@ AUX ceph.initd-r2 958 BLAKE2B 9aeda4d2a0bad2fc1c190b19b78dd165230aeef932a5335038
 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
+AUX ceph.logrotate-r1 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae
 AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c594c03d09bf13dfa645e5a0bde1189211ad20036dc4fcfce6758d3a5829d943eb337cc65783af9 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c
 AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e3543dd9875db79b2f08fd99419fc2a693e24a5d0c36e7db7b9c46f02bb78b51359e844c8265ff266e8a931a32b877b665 SHA512 4c13ebc9f2a7ba3d45a01cd72135a57b2dc6ad3edfe06a05645957c5522a053be940782f1148c117d8bf785937655083d3d1c74668e8c72d75ae000888a65d85
 AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b
@@ -42,9 +44,12 @@ DIST ceph-12.2.7.tar.gz 78783279 BLAKE2B 9058a5e408b3431cf0e8c28b44f95f6eb12f029
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
 DIST ceph-13.2.1-frontend-node-modules.tar.xz 44352460 BLAKE2B 0a0099e60f0b36d48928dcda3f69dbb00e14a9a9e10c688ecbeb3daa3adbe339655652a43924043fe140ce1754525be2abed61f1ad5f24779fa4ff890d2b7cf6 SHA512 3938e8cadb6385cdaf023fe55ab5f202e44ed80173b128e3b76fc4849556cea90ce5d8884a928b93776b0509b5aef814f1078ba5e44a9d644b43a871aea06dd9
 DIST ceph-13.2.1.tar.gz 90786830 BLAKE2B e0884a039ff0e8a1705d8f31f4dcf4cd8ab8989d7c2fa703417038ff9a6cf7b0fbca09abceb901970fbb2dd9a1dc87c2500fec38a2bfca86a9a6dcaab15be991 SHA512 411218ea6037bdf9425a741720ea89876e893e64fbfa518c9584ba581f805fde2c82b13ed47313279665e5d20f36223fc8d5c27055b580c72b22c2004e4da81b
-EBUILD ceph-10.2.10-r2.ebuild 7632 BLAKE2B cb306ece7fb2d9c3fc87fd75a06adeba5f6b96f459d957be09429a2c6e480d37c48785b143a8960c46882ed81ebdea1f700e8f660d94a6aa55bb629de5084dee SHA512 fbbf3070b2ac2358b49747455adf999385eecd63c6063a5a23353743d77251bf2fb7dd2c197a9a30f2859080110ae44f0b8f52699cf58a741d44414405a6218d
+DIST ceph-13.2.2-frontend-node-modules.tar.xz 45100632 BLAKE2B c3929a6c5e6ec3da5ff60967ae40b99377b2186f31e64af571d9be14889d90bc48b570489aea300ead8e99afc0e62db4438cf343686757a39d84889e772c7fa9 SHA512 93eabc2010c0977c2980c739e131d231a809e375c42120e81effc6cecdeaf0e50b4f8c88286993ef60f1ffaede94f637475104e09fd7af58a289350bd670bf2f
+DIST ceph-13.2.2.tar.gz 90840817 BLAKE2B db5933f358a1ae6888030bca7522e20545a2e107055dca44b371e295537c854568682fa558d3f90193e0dfe618947918ce21816b5e20795fff8a14bc837216bb SHA512 37c4845ae52550428c7f1e0d77d9d671ea1d6f5cad5bce0713dce97b54f3abe7346daa2cbd44b76638fb74fe7bdc4797033a4bf808253cfc8bec0fa495ec7e03
+EBUILD ceph-10.2.10-r2.ebuild 7629 BLAKE2B 1aa3f1ada65198fa2591c51871c76158d60f64f2e631cdd3c8e87e7d5e76812365db79321ce01d642a400e5a2656aed57876ab2fa9713723ec3f88150ea59056 SHA512 f735d0c6642e80ce689a00719d4225effc113fc537668178a95914471065fa95dd65f21ba55cea2075c83541a74ceca4309097d86d3e16db3f8a6d5eefc54638
 EBUILD ceph-10.2.3-r2.ebuild 6108 BLAKE2B fa77d99bce7fbc4cc135a0f705551564e484659a5471d87edf9d412ca4b6f0d58b0f6f0f217a9487660f5040b0b5c73afcbb6b8e9d0ab9d2c087710f388dac52 SHA512 d0bfa7305db9b82be225871b1784a4b33bc7d8ff32a1cfabf441592ac9a5f161efb8df4bb06ed15ac56d61108c4a379c7ac30f8ef1d27b144123bc0f1d8f681f
 EBUILD ceph-12.2.7.ebuild 7886 BLAKE2B ce57a94c7a55e88ecc8729fc3a46433854d65d222561b418416b3aab52c689cca2487304b4925a070834e75e3bf82d82dded2207683d4374fd7314d8fe0aeb36 SHA512 69b46ff16141c2efeb0e650b3f0f48905608f33ca8316a6b394262cfb12d54b65ec07a5805053aae71533f5eb62314d5435f25a835635b7d3fc13666865d0615
-EBUILD ceph-12.2.8.ebuild 7888 BLAKE2B 3a3217559b057241721cecbd6643b756b0c19f544e070cdd0cd50a64dbb6ea82e499584500c218cc3bcccbcf54e7d5ad0e7124437c1e43f24ef90712157bda21 SHA512 5523093016901bb806d6f9b45b6ed3f3966ed6ff045f723cd32f626430716a79f0b3305ba1aa0f7d9bdfb08ca986a2fadbd210713ba3de8974adf6ad5e7e3232
+EBUILD ceph-12.2.8.ebuild 7883 BLAKE2B c07770b4b606ff78e362d0d3d6a8121f02e63e2b19c7f7150641d9832827df1cef960b31f16f24524e573081f6a389041933344e315ee42ef2d194ac1544311e SHA512 d20e6f115d0a56885045e5955c5cd8d1bb0a36ab28255581d76f3fcffb5b787c030f1454ad296396dc1fabd3193410cc3d0b1d0c6888b684d53e104e0432ab73
 EBUILD ceph-13.2.1-r1.ebuild 9212 BLAKE2B dc1bad7c2e864edcd301097937894aa58abbadbcee9b2cd6d33b10c2366ac5bc9000460465910bf72b8c30a60b74a6be8ccc7591c1b9ddbc912182dd4dc4179f SHA512 365777bb2ebff564a503a6816e257c95ef0e3414f274b9613acb561d5744738b43aebb8488e09da5d230ee59e02003dc560f6216531dbb04c6c6a172475f011d
-MISC metadata.xml 1812 BLAKE2B c30ca0b3f96ba7e3f6fe9e6bb380a9ab296488cd8624aeeea45c0ac24b9df565c8fe86ae2fd9e15667bc3a0dff9a21e8c93bcc0e8dd0c9c1cdfb2f940434a4ba SHA512 d1a59aa0769afecf799f6ddda2cd1f11f2f36e790958079bb0913658837c7d4580c62aba33e2eb390162cdb281d9972567b2023f7aa427ee2abef0d9ee1893b6
+EBUILD ceph-13.2.2.ebuild 9613 BLAKE2B fee868ed95180b1232bf964436d0a75803c8493e46851a4fcf655f0f6c5c063b6d1de87550915d8ff9e41694273256e697ea9342414e926b5812e7ce57779b71 SHA512 77058c5ca9dee88143aafdd39b9ae346a2dd9b3ddb47ab821da6074d0f221aea46b7b92104f1015a531fa56041dca83e204db796f8c11d7235f121b938fdc716
+MISC metadata.xml 1730 BLAKE2B 0cf24323ef1e88d95e448ecaa2df8a4b2a1ac9baf3f433931cd588bdb34b2f268a280a0756402787c73e4ac33dceb60042bafee1d3124dc6e98ba33abc541c73 SHA512 e54693fd32f6ecc16ca244067ce1ebf63ea5939926be2466a9d88a5373b25651bb5c25984ee6dbeecf0099be0988f002ed824b874c5a308fd4fbe35b87dcb53a
diff --git a/sys-cluster/ceph/ceph-10.2.10-r2.ebuild b/sys-cluster/ceph/ceph-10.2.10-r2.ebuild
index bf6eaeec4b63..74ca90cef62b 100644
--- a/sys-cluster/ceph/ceph-10.2.10-r2.ebuild
+++ b/sys-cluster/ceph/ceph-10.2.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-cluster/ceph/ceph-12.2.8.ebuild b/sys-cluster/ceph/ceph-12.2.8.ebuild
index 9de69307ead2..56f05c940aa1 100644
--- a/sys-cluster/ceph/ceph-12.2.8.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
diff --git a/sys-cluster/ceph/ceph-13.2.2.ebuild b/sys-cluster/ceph/ceph-13.2.2.ebuild
new file mode 100644
index 000000000000..b5c1fb29a629
--- /dev/null
+++ b/sys-cluster/ceph/ceph-13.2.2.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2018 Gentoo Authors
+# Copyright 2017-2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
+		multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \
+		systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz
+		mgr-frontend? ( mirror://gentoo/${P}-frontend-node-modules.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr mgr-frontend"
+IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test"
+IUSE+=" xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+# unbundling code commented out pending bugs 584056 and 584058
+#>=dev-libs/jerasure-2.0.0-r1
+#>=dev-libs/gf-complete-2.0.0
+COMMON_DEPEND="
+	virtual/libudev:=
+	app-arch/bzip2:=[static-libs?]
+	app-arch/lz4:=[static-libs?]
+	app-arch/snappy:=[static-libs?]
+	app-arch/zstd:=[static-libs?]
+	app-misc/jq:=[static-libs?]
+	dev-libs/crypto++:=[static-libs?]
+	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
+	dev-libs/libaio:=[static-libs?]
+	dev-libs/libxml2:=[static-libs?]
+	dev-libs/nss:=
+	sys-auth/oath-toolkit:=
+	sys-apps/keyutils:=[static-libs?]
+	sys-apps/util-linux:=[static-libs?]
+	sys-libs/zlib:=[static-libs?]
+	babeltrace? ( dev-util/babeltrace )
+	ldap? ( net-nds/openldap:=[static-libs?] )
+	lttng? ( dev-util/lttng-ust:= )
+	fuse? ( sys-fs/fuse:0=[static-libs?] )
+	ssl? ( dev-libs/openssl:=[static-libs?] )
+	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
+	zfs? ( sys-fs/zfs:=[static-libs?] )
+	mgr? (
+		<net-libs/nodejs-9.0
+		>net-libs/nodejs-8.10
+	)
+	mgr-frontend? ( net-libs/nodejs[npm] )
+	radosgw? (
+		dev-libs/expat:=[static-libs?]
+		dev-libs/openssl:=[static-libs?]
+		net-misc/curl:=[curl_ssl_openssl,static-libs?]
+	)
+	system-boost? (
+		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+	)
+	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
+	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+	${PYTHON_DEPS}
+	"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/valgrind
+	sys-apps/which
+	sys-devel/bc
+	virtual/pkgconfig
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lvm2
+	!<sys-apps/openrc-0.26.3
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python3*') )
+	mgr-frontend? ( mgr || ( $(python_gen_useflags 'python2*') ) )
+	?? ( jemalloc tcmalloc )
+	"
+
+# building npm stuff is currently broken
+REQUIRED_USE="!mgr-frontend"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI="no"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+UNBUNDLE_LIBS=(
+	src/erasure-code/jerasure/jerasure
+	src/erasure-code/jerasure/gf-complete
+)
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-12.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
+	"${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
+	"${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+)
+
+check-reqs_export_vars() {
+	if use amd64; then
+		CHECKREQS_DISK_BUILD="12G"
+		CHECKREQS_DISK_USR="460M"
+	else
+		CHECKREQS_DISK_BUILD="1400M"
+		CHECKREQS_DISK_USR="450M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+user_setup() {
+	enewgroup ceph ${CEPH_GID}
+	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup 'python3*'
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+	user_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-boost; then
+		eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch"
+	fi
+
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+
+	#rm -rf "${UNBUNDLE_LIBS[@]}"
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=$(usex mgr-frontend)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=no
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
+	cmake-utils_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	rm -r "${BUILD_DIR}/lib/cython_modules" || die
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	if use mgr-frontend; then
+		# npm likes trying to create /etc/npm
+		addpredict /etc/npm
+
+		# subshell to avoid polluting the environment
+		(
+			python_setup 'python2*'
+
+			export CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+			set -e
+
+			pushd src/pybind/mgr/dashboard/frontend >/dev/null
+
+			npm install --offline --no-save --verbose --parseable \
+				--no-rollback --no-progress --fetch-retries=0 \
+				--nodedir="/usr/include/node" \
+				--cache="${WORKDIR}/${P}-npm-cache" \
+				--registry="http://npmjs.invalid" \
+				--sass-binary-site="http://sass.invalid"
+
+			# this tends to get installed to the system if it's still here
+			rm -rf node_modules/node-sass/build
+
+			popd >/dev/null
+
+		) || die "failed to build node modules for mgr-frontend"
+	fi
+
+	cmake-utils_src_make VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake install
+	popd >/dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_foreach_impl python_install
+
+	prune_libtool_files --all
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+
+	readme.gentoo_create_doc
+
+	python_setup 'python3*'
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
+		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/files/ceph-13.2.2-dont-install-sysvinit-script.patch b/sys-cluster/ceph/files/ceph-13.2.2-dont-install-sysvinit-script.patch
new file mode 100644
index 000000000000..4fbc8b6c8102
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-13.2.2-dont-install-sysvinit-script.patch
@@ -0,0 +1,15 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 874eabfaa1..e337f4cf8e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -601,10 +601,6 @@ install(PROGRAMS
+   ${CMAKE_SOURCE_DIR}/src/ceph-run
+   ${CMAKE_SOURCE_DIR}/src/ceph-clsinfo
+   DESTINATION bin)
+-install(PROGRAMS
+-  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/init-ceph
+-  DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d
+-  RENAME ceph)
+ 
+ install(FILES
+   ${CMAKE_SOURCE_DIR}/share/id_rsa_drop.ceph.com
diff --git a/sys-cluster/ceph/files/ceph.logrotate-r1 b/sys-cluster/ceph/files/ceph.logrotate-r1
new file mode 100644
index 000000000000..df03f5e69a4b
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.logrotate-r1
@@ -0,0 +1,18 @@
+/var/log/ceph/*.log
+{
+    rotate 7
+    daily
+    compress
+    sharedscripts
+    prerotate
+	for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
+		ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null
+	done
+    endscript
+    postrotate
+	for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
+		ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null
+        done
+    endscript
+    missingok
+}
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index 01d3158a6145..9e6dc1edfa56 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -22,7 +22,6 @@
     <flag name="cephfs">Build support for cephfs, a POSIX compatible filesystem built on top of ceph</flag>
     <flag name="dpdk">Enable DPDK messaging</flag>
     <flag name="fuse">Build fuse client</flag>
-    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="libatomic">Use libatomic instead of builtin atomic operations</flag>
     <flag name="libaio">Use libaio as asynchronous input/output library</flag>
     <flag name="lttng">Add support for LTTng</flag>
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 5cb04e7c174c..61b312c01d71 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -2,6 +2,7 @@ AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-11.1.1.tar.gz 5808526 BLAKE2B 1b773e45673c35faff1a327d73608949e088f3635adb6dd6c7e779e708dd8f2270b85086378d48042b86e60ad7ca94754d56c1d0193f1d715112a03cf3163c77 SHA512 10ecf0068c57077a24bb0445a0901e07e7ad211cd7fac67ed016b770b477e9ba0e9954de70f165aae69e079f6b2e9416d8292ec701db4c97b987c7dac8f69a43
 DIST cinder-12.0.3.tar.gz 5333501 BLAKE2B a2ee71f1e35813162e5f37abdf7a3b1fd2bc7fe283422e07ad4506d7d0d6d322d7488876b1d4a8966ad357d8439f4f8e8322926c66810ed76210caa077d94910 SHA512 51b151d0fff6f2983ab0d0f90fb2e29bf04e54f51925d2b8acdda715f6a1eb83cd44f6e2a42243298ce4e8e8d23cdeedbf902d778e259960d56f8bccfd8420a2
+DIST cinder-12.0.4.tar.gz 5349921 BLAKE2B 168beb53879656956a97a4e787aba200b119e80e3b787fa94534c7ca8a68fb641df47069e19759ef022103a3f306402711ec315bc61d6387b427c6f5672919fc SHA512 0a139c25458020a869ab9395f42cd31b83cbfb65640a41ef0039aef48a92fd641a0084c5fd8fbdc35b6c8b6e9250e1d0a845816b92a882358acf4e2793be536c
 DIST cinder-13.0.0.tar.gz 5515802 BLAKE2B 9893e3cef0f14684ac6e1dff2a33cc96dd8f47a403e1d8a9a993be3be38f8c76f239535ef5faed72c991c88b51de106f54a5741688d457da654cfaa4a2c1843e SHA512 842e6cd858910cabc99bed874f5bd6b7234da0f676e91b83a767ba357b0eb7f4409dd383a9c64896dc6346a87399296399954af96f13b21cd655be5c89b3e978
 DIST cinder.conf.sample-13.0.0 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
@@ -9,6 +10,7 @@ DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd50
 DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713 SHA512 346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908
 EBUILD cinder-11.1.1.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
 EBUILD cinder-12.0.3.ebuild 8045 BLAKE2B 387da43bbcfd8c0ba87ae7f27191be797e8f52c3d7db71e5b24c586b19f0ed47b493d92f6079c97cf11440925753d5cb5252e47438bc3d7078d6253ade898606 SHA512 7f3e2d5afdba73d6c2d5095cedd2008fdafddc32aaa5986ce36d445472d89a738ce21d97d15c44b1eac22debd6ecbf82db009d65f36fcd6d22752f2f070ebe09
+EBUILD cinder-12.0.4.ebuild 8044 BLAKE2B 42542b032f10aa1800a8a0eeb536ec6000f494f624a35344b539f69b38bcfd5647824a4e85c788c4c43416a88c3ce74e7b8df728e61a9f7ce79fe881d697451b SHA512 e2a86fae89e08900da52b54b54ee62ff52bdc8037cacaef3ec383d11fe5150b4fe1d76c3f6e179dc39d961d0d69a0ea3737de8684a70927976283fdbcd2eb39c
 EBUILD cinder-13.0.0.ebuild 7809 BLAKE2B 6cccea4fe5e344a68ccf332d00ceabf0b0b9239c2195529906c594eda1237028185325a4d8ebab9ccaf6f7ca09cf493c76fb49155805b63d49677f1f735c4e72 SHA512 d76b40f51177aa545ff001c78f41add0fd8df45869a60df9eaf7b6a58d3f77b54d2cba9d5c53ac8e4f3e7e0b6260556f1bfe93d92e3af05b63479aba3d2f23bb
 EBUILD cinder-2017.2.9999.ebuild 7774 BLAKE2B f1c7f6f21eed9724ca1ba3a4461be1c1c8c7d17b6bd6e0d7eaa2f3f9ad56cf6c96946266eaafca58624a5501d5560307a776cb8c4209f18525589738aa388b16 SHA512 0d985ee9d439aaaad712d065ed66c3b603688f516172d50f004c4a4793554755fc7bcf2c787bd85ecc7076ea2b489f971567efa042a718764b64c23edaa21ddf
 EBUILD cinder-2018.1.9999.ebuild 8047 BLAKE2B 9d4be05868caddcf9d8bc1d7355c1c9efba7860f5d3adc01fac2be8376ea7c6dbda724de54c5cd5bc505c01dd36962c24d0e53eb8e6dfb749bacfa7676c0c2f1 SHA512 4ccc67e7c2a7603b48268f548662e0b974e688383f546b4b35346cd248705221536f25408936cac050c1b366ffa4a06b7d9254a9480c4e6c656440743247bed1
diff --git a/sys-cluster/cinder/cinder-12.0.4.ebuild b/sys-cluster/cinder/cinder-12.0.4.ebuild
new file mode 100644
index 000000000000..03e6d85f8fe9
--- /dev/null
+++ b/sys-cluster/cinder/cinder-12.0.4.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	dev-python/enum34[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
+	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
+	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
+	!~dev-python/rtslib-fb-2.1.64[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	~dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	iscsi? (
+		tgt? ( sys-block/tgt )
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES=""
+	if use tcp; then
+		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+	fi
+	if use rdma; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+	fi
+	if use infiniband; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	fi
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	doins "etc/cinder/api-httpd.conf"
+	doins "etc/cinder/logging_sample.conf"
+	doins "etc/cinder/rootwrap.conf"
+	doins "etc/cinder/api-paste.ini"
+	doins "etc/cinder/resource_filters.json"
+	newins "${DISTDIR}/queens-cinder.conf.sample" "cinder.conf.sample"
+	insinto /etc/cinder/rootwrap.d
+	doins "etc/cinder/rootwrap.d/volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 946fb47ccf4c..9950ee86dbc0 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -3,4 +3,4 @@ DIST hpx_1.0.0.tar.gz 3972403 BLAKE2B 737282f2b547c2ce7e6e0367df64beaf22760d7384
 EBUILD hpx-0.9.99.ebuild 1890 BLAKE2B 4dfb8ac3b1aab563e889b3ea89f9ed0fe8dbb09fe7da47293d03f829dd92fa7a429e55228546d6dbd03c5070a0c9356f56a44b5fc71640586aaf4d122336c76f SHA512 8300f95ef02cbad1e959f6958d680f1cbd46729adf813af54063652ad5e3413e67664be743fe8950ae743d9074cc58c3f0175d3dcbe014e1d734844f2bb50e21
 EBUILD hpx-1.0.0.ebuild 1946 BLAKE2B 948184f9c8be17b11a3b089e39c782bbc2abd858c5bcf1bdb115b8a7cff6a9d5044d872340acf07f1b08d4acf6898435149cc2319f22fe206a270bc3bd1c58f5 SHA512 adacf71dc11747e3d1535044929a3a8f379f46a63c3e95e70eec96f0766eb39f921914899033a8250804930e38796cccdfc5afee6b3b5e617e916ea416339658
 EBUILD hpx-9999.ebuild 1898 BLAKE2B c283b73f9a7f4bd17e5a10fca81b0db3d11c800e22de95d0b3263d180a767739eaf193dca014a58e63e53662601dd60604f029851ac3423b4835ea9b5f77f772 SHA512 b6236b45b54a40ad1e01f34e6a750758294cb5b486d66b2a25fd6e0f2043cffed3143e6fab169980db2d09c6959986cd2350ad60bf6c5fdffbce2ef4c4cf99e1
-MISC metadata.xml 1103 BLAKE2B 3e5aaded5a18994113a69617689468f69edb27fa0274efaedf7c75d57fdeb75e1f8d97109a6f97e0f1268a0f5d52e380a4ee8974bfc8b4916ea5482026d83f92 SHA512 392455d961f4048e58d51138990b7a329c6454efee2c1fd90fce822def39d8c62e76e9e1ac3f19b4170ba7d5826a315c35224fe50152d0c6cf0f8d276e80af2a
+MISC metadata.xml 1015 BLAKE2B 10711221bc93b52b674b0179b1d27ab762fc4f9de3a97e3af2e26296f7b42097aa75ab9acc0f6a5ed3faf053c31a575dd50dd2f1b7a69eb1ad4c7a745a547992 SHA512 a0215ad65388b911bb093d58903fb0b4948bfaaf32db26223c21ee2bd63bc7797f14f01d9a8e1203a27dea6bb6ea70c8f34bbeb22b53f49f70971d5e60ba8949
diff --git a/sys-cluster/hpx/metadata.xml b/sys-cluster/hpx/metadata.xml
index 8cef5eececcc..1a1ee0ef0fd7 100644
--- a/sys-cluster/hpx/metadata.xml
+++ b/sys-cluster/hpx/metadata.xml
@@ -14,7 +14,6 @@
     <email>slis@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation</flag>
     <flag name="perftools">Use <pkg>dev-util/google-perftools</pkg> for
   memory allocation</flag>
     <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> for memory
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 11e0f3538dc3..ce2b43a060ab 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,17 +4,26 @@ AUX nova.initd 745 BLAKE2B 3242a38313147eaffc096752b35cbed34e16f1133cb482515086a
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
 DIST nova-16.1.5.tar.gz 10992593 BLAKE2B c62ac7c4628fd50fb6d2d9410bd85ad1a62cc01a6767fcc218b05a862798ace53f423516392d693283a361e1744c7b798adde89cb692d2f2fe1806a5fd8204aa SHA512 bb653f062f192409296dc3a294fa94e657fc61c530fa8c0c75f80c2c8ab10d69008a46e6b6fafe407ed138d9b727e7fe8f5e54f275a41c3615bc1acadb9a73b9
+DIST nova-16.1.6.tar.gz 10987755 BLAKE2B e536df63847bab971ed09ef91fb719f630ea7d61dfc209032ea7522551f79788fd1029f9abe87ceee485c6ccd144a9dae513f08d920b49b1fa7355cab2d4197c SHA512 c021e5535a1e27dbe6c93b19fbb71608d0a137b271605f24e8c1aa60ca5c0e55d075e298d2cba06d3eb4619215e512883bb071e24ddc439d420bc5681d861092
 DIST nova-17.0.6.tar.gz 11094548 BLAKE2B 3c8d8a1d5b422e8c561dc77261a0c4cc5bd0fb0254f41dc57a351f74392b275ae8aa7d6854075ccb2bf0f9a156a7c0cd9d91caf532231fb9006138ec8e6353c7 SHA512 667abea6cdc44b2ec76e460e353d44f29acb673d0edb4e0bd0934c9498cdfc24b47f74f518a863d8c4f06106aeb8e981f6067c1754df81dcc13f0d6b42f273ee
+DIST nova-17.0.7.tar.gz 11087543 BLAKE2B 4fbdafc24022da5eeec4bf81ec173578e8ff16cccca10381e7195b9f9ac45e1e178cfb70afdc1646b604b80021af19bf65ea25f5a3166471562ca086d29353af SHA512 23d6a0d0cd252f80d63063043c8ebe89d4614cc206a5de68d1e143894ca29c5e2e82217378af938c2abbbddb391585d434ef0d027931c9d5d8dd82e207f1d023
 DIST nova-18.0.1.tar.gz 11447569 BLAKE2B b9ddfb5d7366abaf95afa19d5a09fb65d930f2ab3aff7323ee979ddf3652c30d2d63d1116b92978d5547e0c8d9a87aebb3fa855308ba3785abf3347cc8736c8b SHA512 d2470f874351c0fd332cf0c6e1b54309aad34827c5c20317e8bf0700973327c1c057eb110b3cba16cb4091298517ea82f49e577eee10cde90a9baa03c6cb3b3a
+DIST nova-18.0.2.tar.gz 11440035 BLAKE2B 5f39efa6aa6c30c458d4719540f4462e0f783d1cddc949872a845385d939e1b6963830c5601bc67e0e8d31999fa3a3990686be3d0a29911441d66c1e491130b1 SHA512 a662d61929570d65c82dcee6bd12693a565debe15212ec3ee91fce4eb47a260c11a0be781b221cf9a2a4229497fa0679f608c5fc605af63c33581ec5af02cb8e
 DIST nova.conf.sample-16.1.5 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
+DIST nova.conf.sample-16.1.6 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
 DIST nova.conf.sample-17.0.6 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
+DIST nova.conf.sample-17.0.7 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
 DIST nova.conf.sample-18.0.1 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
+DIST nova.conf.sample-18.0.2 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-2017.2.9999 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
 DIST nova.conf.sample-2018.1.9999 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 EBUILD nova-16.1.5.ebuild 9542 BLAKE2B 85a1bae101ab87c6878f5bd75c2c2e44ae963a38cdb79aec2594d5293d654e58da96e4f47441523a2c6bc1874b93c8a17755b0a16d37e7c1f56ce2619f508353 SHA512 17c6fac5ec300e5327704632f5242420cab1d27f99bce15d02db5ff829829e6b75765c6fa1d7e0ce2f2590532b80f27cc5f164acacd7c1c2245a2b849e9f0595
+EBUILD nova-16.1.6.ebuild 9544 BLAKE2B e4d13559127100934e56430ed470b0c12ef32eee2bd6d9e8270d9674846225b78d0898d986927de870e4a1a81d3e2d22a169b8f9c77585a0c1deae6c1c545d1d SHA512 8707bc6796db9ff94047fd5ea37959a7213cad0d7a682a7cd531d59bde91fb0b2b1404a05f5393f1061f45f6c12a0192a795c809ec56070db872675ac042b4a9
 EBUILD nova-17.0.6.ebuild 9716 BLAKE2B eda0e0a5031e839951ce06fa051807f6610c494624fb04685d1c20b95924ac6f2f3eac82b0f19c3132581f313d9029284f8d54b920f064d81406803cefd2eff7 SHA512 a043c6053b73d14b607cdae8c4ca8d4680335dcf1aed24491ba4147eb9fcc2eca5651a4fee82b6bd4808eaa9a0eacf16ac807d22080a3389cea8903916a16ed3
+EBUILD nova-17.0.7.ebuild 9718 BLAKE2B 222c6fddb34f4ab546060f46fb1c401ded737359c7802a148001ea39c8c7c313e2ed4af0f31681b74bf752be3257c10be4c3e4f1f733fd5aa28c06a51c1d4d62 SHA512 eb199df413363313aa5e039cd3a384c64dc30f49e3ca608a852aea8ea09b0608dfe72d54dbc2c76ca0192f53db1092cc62bf554b4f2ce78be99756580ffe7ad1
 EBUILD nova-18.0.1.ebuild 9502 BLAKE2B e32c4586a6d54d24eabb8effb48791cef3a2048190fce677ab4eb6eb737e304ec449765d92c75404a70b7de514db840f774532f97db19a667492ba84d5af20c4 SHA512 80abc2c021039567cf12a5c37d4e8350ab97b76b13869ea2fc3fe74fb55460800b6a3c9da6300397dd4d1da7d6f53cf4dfdf5c207703e3b35d78c53308c74c9f
+EBUILD nova-18.0.2.ebuild 9504 BLAKE2B 82fe8c31223ba7d9f2ab137d1cdbc8801dd0377431c3f03cc3e8f7f08c28525ab88e4f91fcfcc40c8b3814fd49a239a9e7d1cdcb22bd3403a862da7066eab09c SHA512 7bbea11c0f4d57f29e7b285952c9bab51a2abf6a00a9db1e546abb60def27e8b02445f7d892a2ea0a95a03ad59dd0a23565b2b6b631be993503831fc87b0c754
 EBUILD nova-2017.2.9999.ebuild 9568 BLAKE2B 0b26430ff222e0b4d373a67a6f2d3bf116a147be3731d2fd891555b032de32b14fa08f3f6fbab5a7f0adfdb02772d76df04630c52ab66cee2633a8a36bbb9b4a SHA512 780468c60c5ec932044014d9e6e2e95eebaad6c668b8d8e226706f4044c0a16a4d3f5adebf3497a3877727f24e5ff9d7a7d02c455e521942ecad34cd092e511a
 EBUILD nova-2018.1.9999.ebuild 9721 BLAKE2B 60cde2747c9d1f3316988bedc480141d174abf3e647391b53708854abb6d1d6a55deb41f4e3896c21ff9cf3c4bdf6a5295cd6ec931c58d7075a99df0eb7bb534 SHA512 416f1b4c6295afe9d9a5b0c3aee22030fa1442e973b73a0b93ca2f064f2bfb89c8d3970163f2cfcd5d1f53bfa6130aae570d748a6f38869016217b5023da49a6
 EBUILD nova-2018.2.9999.ebuild 9507 BLAKE2B 8090cacd3c743e7c924d2b6774e68597c1fcad3cc6daa7abaac674716ed61d50a9bb73ebfa79a9de9e2a2a5bd33b496dc1709767ca229728daf7c22e5ae838cc SHA512 0c0665f8948c2a6d1b8296a6477bc9c7c9df93c3f79e1c83e5fe88dd697b9ad2a3b61ab53fe7094e941be99aebe89b579c4008538b92676b020adf4ee36e57f5
diff --git a/sys-cluster/nova/nova-16.1.6.ebuild b/sys-cluster/nova/nova-16.1.6.ebuild
new file mode 100644
index 000000000000..073e8f6c41a1
--- /dev/null
+++ b/sys-cluster/nova/nova-16.1.6.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.6[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	# copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/nova/nova-17.0.7.ebuild b/sys-cluster/nova/nova-17.0.7.ebuild
new file mode 100644
index 000000000000..2b93ede15012
--- /dev/null
+++ b/sys-cluster/nova/nova-17.0.7.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.10[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	# copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/nova/nova-18.0.2.ebuild b/sys-cluster/nova/nova-18.0.2.ebuild
new file mode 100644
index 000000000000..7802571382b4
--- /dev/null
+++ b/sys-cluster/nova/nova-18.0.2.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/rocky"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/setuptools-21.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/futures-3.0.0[$(python_gen_usedep 'python2_7')]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/poolmon/Manifest b/sys-cluster/poolmon/Manifest
index 46c713f50311..000708ae1075 100644
--- a/sys-cluster/poolmon/Manifest
+++ b/sys-cluster/poolmon/Manifest
@@ -2,5 +2,7 @@ AUX poolmon.conf 67 BLAKE2B 33ea31b0decdcd7d2ff660f813af4b8c9bade3f0abeaab40dfcf
 AUX poolmon.init 416 BLAKE2B 8c96021af268786248cda12f669dc120878cfb454c1a947ecfba6c74b313950fabdcfc771d8cfa9ca01ad696c1ee40372658b20f184b7508c31bb847e97620b3 SHA512 f82e806ae9b57dc91a42e53ff1a7ce40423a48c8220616be3bf3ec0e9b2035baed2304b9e82fab0a8cc2ccd3f8e8fb325b319f587595d4c31f66db84b47f9e59
 AUX poolmon.logrotate 132 BLAKE2B 0dbddd9ab47494e5410779e24dd60bffd16339638d7dc9994937200c36ea12d50393ee2abcc7fcabfda05271ee511c89d5f045e5643970cd62e4d320e7056d41 SHA512 b18cca84d2d12aca84a5b53369631a34cc93d58fd74877c38f7577e68657510d741e3897e42b8ceab8c8c109916d1992dbf7bc4bb886803c9f3de7e640738590
 DIST poolmon-0.5.tar.gz 6902 BLAKE2B 1cdeb196b124a50b55f629cb9d6223b5f070932d2c88e222e60cf10e2aaccbda46c2b326de8aa7b72abdcb5510a567228b2b8d99564d89b3d64b808beeb61a7c SHA512 17faa13e6b9b42f0913673598002aa5ad65e7d35b6ed4f5d6a1bb36d7fce630a7e9f1afc6979d7a098a2b66e5943901213b5617ba6190b5b7e1e9a6a55f6cbf5
+DIST poolmon-0.6.tar.gz 7460 BLAKE2B 2be5320c9c8ec5df7aac168e141ffd2ed09415bebb9b817a536fb180385371012fc1f88d09b682b0a016fdee3122d6f9ed47d3956c49c65016c35e572d7fbbe2 SHA512 8a702acd57093ba8806c4135cddc421979c718a881c8a49de3aea70b0f05c041a66dd04b838e5251fd05ccdc694d00e85d5894d677c2684baf5231b4ce0a1453
 EBUILD poolmon-0.5.ebuild 650 BLAKE2B 8b13f35553ef4df2ae90875b69f0352a49066f2f731c68ab202a07b93e39d0be8db79c03e730b14f68482565be5e7bb6b253418d6041c404fc8261d1a3fe4772 SHA512 674d185811dc2ed7709fae06e8e241072d0dc349c6a027858e47fea1c783408094398e10ad324b082d07bc42f95aab838dde7c5de6bbe38a21a56663ae07d195
+EBUILD poolmon-0.6.ebuild 650 BLAKE2B 2f83a5c5abda3e9033d649b2fc3f1d13cd8760875e241a6f441bb72a8ded144a59fe1c3317e03825923f86037e78d8e740dd8d5b76faec053899aaf03d9386e0 SHA512 db28f9e257ed54c55e3593db4b8c8889758fb18db1c9cf6ebc1ff55c7a522536ff9d14c2294717fc5f61bcc67b7400f921c3f6144dcca490c0bbd0020f6c5b23
 MISC metadata.xml 341 BLAKE2B 24f2599e86a24cb445afab6aba2004a3bdc3cca4fa449dd7b2b98b3ded41670be28483795c255e9fc21f78f9ad6f29553d155c757483e1791bd0f88ab9fa9f05 SHA512 38660612f1c77312b67e4fbc505cbb32fe7f9052b7aeca505f8ee5ed8dba2d4e1755a9bd7f326c65de24719558d0bf13bd8921f1ab12f5b7c6b744283ad9e215
diff --git a/sys-cluster/poolmon/poolmon-0.6.ebuild b/sys-cluster/poolmon/poolmon-0.6.ebuild
new file mode 100644
index 000000000000..b66b1ce8c23d
--- /dev/null
+++ b/sys-cluster/poolmon/poolmon-0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A director mailserver pool monitoring script for Dovecot"
+HOMEPAGE="https://github.com/brandond/poolmon"
+SRC_URI="https://github.com/brandond/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-perl/IO-Socket-SSL
+	net-mail/dovecot
+	"
+
+src_install() {
+	dobin poolmon
+	dodoc README
+	newinitd "${FILESDIR}"/poolmon.init poolmon
+	newconfd "${FILESDIR}"/poolmon.conf poolmon
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/poolmon.logrotate poolmon
+}
diff --git a/sys-cluster/teleport/Manifest b/sys-cluster/teleport/Manifest
index b659b5f45921..c56b4171e0e4 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -1,11 +1,16 @@
+AUX teleport-2.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 4823 BLAKE2B ed9fc1cf1d70872fb7e0798707f4bc6b121a0ac417a5062451937240abd9f51999a8990bdf6714abd9517118aa9dc87c2bfbf4f8b8e9e309a080cc5e04f10d68 SHA512 1430a78b89fd758e967acf76c3166b9c50017d6df2f4e6e23b6e683c39e5a1e5cb13012dc218482f38abaca14d45b7df7ba0a55d1598f13dd2c46732d12f1b45
+AUX teleport.yaml 9564 BLAKE2B e797480ebddc081a5fdbc10b5b2490aac675412638dee2f8790b289cbb061506c890156fb1a4807e28f14303e661864e5fc7922d01557815399adb13f2682930 SHA512 427e219fa6b787d0bf3a4e72f1573b50e52863d75444ca1d1da76812acb427bda3a537590856a39aad40a03415237b2a1f4893ed11e11039b287f7f5b97d2fa2
 DIST teleport-2.6.7.tar.gz 16655508 BLAKE2B a020ab999b7503cb7aec54ed81532baf9d08b98000f2c659f63859d89f7f2b5fb311c41d6fcafb7d9bf72ea1c97eecfc6ac621b7c90d74f5afe2717edb8b0402 SHA512 45002dcf7b99108ca6fffae94d6608188eb9b0bea05cd14068618bfb11c496cad5546e261f349fee70f2acb574e7fc44093683dd991001e01406da6982c5c4c3
 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
+DIST teleport-3.0.0.tar.gz 22365657 BLAKE2B a9cfec07ec73970b1050c51819ef4820be95fcd94dce0ffbb62deca38af28a944929c83a9ed2b443a93eb21f55d0cac024b66acf81c5d6939ba8e6b6ba40438a SHA512 8cba0b7471bebe9cdac07b44f17c99b7b323061f310ef0e61a3ebe1c4ea2ca2b1c853177528c4725a83366406e8b1a5aba23ecdd5fba7290bd6cab74ada3340d
+DIST teleport-3.0.1.tar.gz 22365638 BLAKE2B 200d7612a56520607f7c157a4e1ff095f8621c2495cef520ce4db7b75f61346e7e5588ca8c9a9b9aa30b87d692c05d488343c3c7b1d30a46e90cacef42ed4172 SHA512 9a477ad174f0d7b0179cb4063731ebf0bd7cf31af22fb6db350b12839bfcdc9c8b68847bc33639546bf6b9026ee62ceb3197176f81a36d67f6b070f2eb4d65e1
+EBUILD teleport-2.6.7.ebuild 1251 BLAKE2B e03ca3a59d482d100c78a22197c205515c59ebfb0acee6286b3e6612a7bf6a71ae598d37bf935abc99a9b369de15e77ee1929d762e101d1a1a446aece769165c SHA512 da7ed88a169950fea543619e277d75d4c0a5d44d63552f43d9290deb748cbbd7b8094afeb386a088b887173332863c6a4f47ba117320d758809b7562b30d4037
+EBUILD teleport-2.7.1.ebuild 1251 BLAKE2B e03ca3a59d482d100c78a22197c205515c59ebfb0acee6286b3e6612a7bf6a71ae598d37bf935abc99a9b369de15e77ee1929d762e101d1a1a446aece769165c SHA512 da7ed88a169950fea543619e277d75d4c0a5d44d63552f43d9290deb748cbbd7b8094afeb386a088b887173332863c6a4f47ba117320d758809b7562b30d4037
+EBUILD teleport-3.0.0.ebuild 1249 BLAKE2B 01c6f8a1581bc6fd38569b67721f4e5a24447cd9c6ccf625bba939605663f5bb643e343d6c46da1091bc872d64d049e639a4be55a5a375c20ddb59d609c9e119 SHA512 c921673cf7955253255dd41b7f53954acce2a9b53b55b88c7385bf65d087b084159152966d172151f5567a67c3794c50fc5756f871ffd1b0e5c3253553ac2cc8
+EBUILD teleport-3.0.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.yaml b/sys-cluster/teleport/files/teleport-2.yaml
new file mode 100644
index 000000000000..384dea937c97
--- /dev/null
+++ b/sys-cluster/teleport/files/teleport-2.yaml
@@ -0,0 +1,130 @@
+# 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 384dea937c97..0ab548c1a46b 100644
--- a/sys-cluster/teleport/files/teleport.yaml
+++ b/sys-cluster/teleport/files/teleport.yaml
@@ -1,6 +1,5 @@
 # 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:
@@ -8,21 +7,23 @@ teleport:
     # 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 directory where Teleport daemon keeps its data. 
+    # See "Filesystem Layout" section above for more details.
     data_dir: /var/lib/teleport
 
-    # one-time invitation token used to join a cluster. it is not used on 
+    # Invitation token used to join a cluster. it is not used on
     # subsequent starts
-    auth_token: xxxx-token-xxxx
+    # auth_token: xxxx-token-xxxx
 
-    # when running in multi-homed or NATed environments Teleport nodes need 
+    # 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
+    # 
+    # This value can be specified as FQDN e.g. host.example.com
+    # advertise_ip: 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: 
+    auth_servers:
         - localhost:3025
 
     # Teleport throttles all connections to avoid abuse. These settings allow
@@ -31,100 +32,209 @@ teleport:
         max_connections: 1000
         max_users: 250
 
-    # Logging configuration. Possible output values are 'stdout', 'stderr' and 
+    # 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.
+    # Type of storage used for keys. You need to configure this to use etcd or 
+    # a DynamoDB backend if you want to run Teleport in HA configuration.
     storage:
-        type: bolt
+        # By default teleport uses the `data_dir` directory on a local filesystem
+        type: dir
+
+        # Array of locations where the audit log events will be stored. by
+        # default they are stored in `/var/lib/teleport/log`
+        # audit_events_uri: [file:///var/lib/teleport/log, dynamo://events_table_name]
+
+        # Use this setting to configure teleport to store the recorded sessions in
+        # an AWS S3 bucket. see "Using Amazon S3" chapter for more information.
+        # audit_sessions_uri: s3://name-of-s3-bucket
+
+    # Cipher algorithms that the server supports. This section only needs to be
+    # set if you want to override the defaults.
+    ciphers:
+      - aes128-ctr
+      - aes192-ctr
+      - aes256-ctr
+      - aes128-gcm@openssh.com
+
+    # Key exchange algorithms that the server supports. This section only needs
+    # to be set if you want to override the defaults.
+    kex_algos:
+      - curve25519-sha256@libssh.org
+      - ecdh-sha2-nistp256
+      - ecdh-sha2-nistp384
+      - ecdh-sha2-nistp521
+      - diffie-hellman-group14-sha1
+      - diffie-hellman-group1-sha1
+
+    # Message authentication code (MAC) algorithms that the server supports.
+    # This section only needs to be set if you want to override the defaults.
+    mac_algos:
+      - hmac-sha2-256-etm@openssh.com
+      - hmac-sha2-256
+      - hmac-sha1
+      - hmac-sha1-96
+
+    # List of the supported ciphersuites. If this section is not specified, 
+    # only the default ciphersuites are enabled.
+    ciphersuites:
+       - tls-rsa-with-aes-128-cbc-sha # default
+       - tls-rsa-with-aes-256-cbc-sha # default
+       - tls-rsa-with-aes-128-cbc-sha256
+       - tls-rsa-with-aes-128-gcm-sha256
+       - tls-rsa-with-aes-256-gcm-sha384
+       - tls-ecdhe-ecdsa-with-aes-128-cbc-sha
+       - tls-ecdhe-ecdsa-with-aes-256-cbc-sha
+       - tls-ecdhe-rsa-with-aes-128-cbc-sha
+       - tls-ecdhe-rsa-with-aes-256-cbc-sha
+       - tls-ecdhe-ecdsa-with-aes-128-cbc-sha256
+       - tls-ecdhe-rsa-with-aes-128-cbc-sha256
+       - tls-ecdhe-rsa-with-aes-128-gcm-sha256
+       - tls-ecdhe-ecdsa-with-aes-128-gcm-sha256
+       - tls-ecdhe-rsa-with-aes-256-gcm-sha384
+       - tls-ecdhe-ecdsa-with-aes-256-gcm-sha384
+       - tls-ecdhe-rsa-with-chacha20-poly1305
+       - tls-ecdhe-ecdsa-with-chacha20-poly1305
+
 
 # This section configures the 'auth service':
 auth_service:
+    # Turns 'auth' role on. Default is 'yes'
     enabled: yes
 
-    # defines the types and second factors the auth server supports
+    # A cluster name is used as part of a signature in certificates
+    # generated by this CA. 
+    #
+    # We strongly recommend to explicitly set it to something meaningful as it 
+    # becomes important when configuring trust between multiple clusters. 
+    #
+    # By default an automatically generated name is used (not recommended)
+    #
+    # 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"
+
     authentication:
+        # default authentication type. possible values are 'local', 'oidc' and 'saml'
+        # only local authentication (Teleport's own user DB) is supported in the open
+        # source version
+        type: local
         # second_factor can be off, otp, or u2f
         second_factor: otp
-
-        # this section is only used if using u2f
+        # this section is used if second_factor is set to 'u2f'
         u2f:
-            # app_id should point to the Web UI.
+            # app_id must point to the URL of the Teleport Web UI (proxy) accessible
+            # by the end users
             app_id: https://localhost:3080
-
-            # facets should list all proxy servers.
+            # facets must list all proxy servers if there are more than one deployed
             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 
+    # this port (AKA "Auth API" or "Cluster API") to validate client
+    # certificates
     listen_addr: 0.0.0.0:3025
 
+    # The optional DNS name the auth server if locataed behind a load balancer.
+    # (see public_addr section below)
+    # public_addr: auth.example.com: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. 
+    # 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"
+    # 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"
+    # Optional setting for configuring session recording. Possible values are:
+    #    "node"  : sessions will be recorded on the node level  (the default)
+    #    "proxy" : recording on the proxy level, see "recording proxy mode" section.
+    #    "off"   : session recording is turned off
+    session_recording: "node"
+
+    # This setting determines if a Teleport proxy performs strict host key checks.
+    # Only applicable if session_recording=proxy, see "recording proxy mode" for details.
+    proxy_checks_host_keys: yes
+
+    # Determines if SSH sessions to cluster nodes are forcefully terminated 
+    # after no activity from a client (idle client).
+    # Examples: "30m", "1h" or "1h30m"
+    client_idle_timeout: never
+
+    # Determines if the clients will be forcefully disconnected when their
+    # certificates expire in the middle of an active SSH session. (default is 'no')
+    disconnect_expired_cert: no
+
+    # If the auth service is deployed outside Kubernetes, but Kubernetes integration
+    # is required, you have to specify a valid kubeconfig credentials:
+    # kubeconfig_file: /path/to/kubeconfig
 
 # 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. 
+
+    # IP and the port for SSH service to bind to.
     listen_addr: 0.0.0.0:3022
+
+    # The optional public address the SSH service. This is useful if administrators
+    # want to allow users to connect to nodes directly, bypassing a Teleport proxy
+    # (see public_addr section below)
+    # public_addr: node.example.com: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
+
+    # List of the commands to periodically execute. Their output will be used as node labels.
+    # See "Labeling Nodes" section below for more information.
     commands:
-    - name: hostname
-      command: [/usr/bin/hostname]
-      period: 1m0s
-    - name: arch
-      command: [/usr/bin/uname, -p]
+    - name: arch             # this command will add a label like 'arch=x86_64' to a node
+      command: [uname, -p]
       period: 1h0m0s
 
+    # enables reading ~/.tsh/environment before creating a session. by default
+    # set to false, can be set true here or as a command line flag.
+    permit_user_env: false
+
+    # configures PAM integration. see below for more details.
+    pam:
+        enabled: no
+        service_name: teleport
+
 # 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
 
-    # 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 
+    # 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 
+    # 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 
+    # The DNS name the proxy server is accessible by cluster users. Defaults to 
+    # the proxy's hostname if not specified. If running multiple proxies behind 
+    # a load balancer, this name must point to the load balancer
+    # (see public_addr section below)
+    # public_addr: proxy.example.com: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
+    https_key_file: /var/lib/teleport/webproxy_key.pem
+    https_cert_file: /var/lib/teleport/webproxy_cert.pem
diff --git a/sys-cluster/teleport/teleport-2.6.7.ebuild b/sys-cluster/teleport/teleport-2.6.7.ebuild
index 4a7a27e42a48..e7bfb7ce0408 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}.yaml ${PN}.yaml
+	newins "${FILESDIR}"/${PN}-2.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
index 4a7a27e42a48..e7bfb7ce0408 100644
--- a/sys-cluster/teleport/teleport-2.7.1.ebuild
+++ b/sys-cluster/teleport/teleport-2.7.1.ebuild
@@ -35,7 +35,7 @@ src_install() {
 	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
 
 	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}.yaml ${PN}.yaml
+	newins "${FILESDIR}"/${PN}-2.yaml ${PN}.yaml
 
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
diff --git a/sys-cluster/teleport/teleport-3.0.0.ebuild b/sys-cluster/teleport/teleport-3.0.0.ebuild
new file mode 100644
index 000000000000..4a7a27e42a48
--- /dev/null
+++ b/sys-cluster/teleport/teleport-3.0.0.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/teleport/teleport-3.0.1.ebuild b/sys-cluster/teleport/teleport-3.0.1.ebuild
new file mode 100644
index 000000000000..4a7a27e42a48
--- /dev/null
+++ b/sys-cluster/teleport/teleport-3.0.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-devel/Manifest.gz b/sys-devel/Manifest.gz
index 67cafb4e8f65..f1346b56d2c0 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 1a29018fa883..b75c91f87e96 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -26,7 +26,7 @@ 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 11851 BLAKE2B 877f1e096972b66f9cde62f23f5dd1d2bd1098d27a01eecadf667f5b1792271e50a4697908492bd9c2d3c0d688de1245cda86cd566c142d1fba4fb0265819d1d SHA512 2f257fc05336b0e2cb45bc48185df2f0d226683b81d2fe835f856fdda9843f2b32f3267d6d5b9d29fe3dcf61d827aa846acea59d705ada30ac2d9b69772cf92a
 EBUILD binutils-2.30-r3.ebuild 11864 BLAKE2B 18001b8d905368b565e15ab852cb0e18a3354cfc31db5f3799b0d84ab837dabc50a7e0bb2656622c972fb46525b8007fe641f4ef76e837006791ecca9aa46131 SHA512 ddeedc8aa8c1a72ea16855c15e4660e5db335b8d50e45444233c755928eb9138168819e7ea9998759e71dd6582b296445679333363e0f5abe62788d17417999f
-EBUILD binutils-2.30-r4.ebuild 12031 BLAKE2B c7a34d2f9807b0bddcc5836af75f33b1fa396f3972b4c2fa8d09f97eb694203e22a773e23177497f807c0be14dca1b1b8e11ea9837ee442a037462a04505800e SHA512 8dc6c9aced9face3b6259d35190ef4b15020432aa522b8529cd40ffe14564f4e611e9bf3e2151c3dc2300dd2f323ffb098bf1ef8b84d69ec4e783a10729f269d
+EBUILD binutils-2.30-r4.ebuild 12025 BLAKE2B 8709907900b0af3372d076eb5ccb6f6447d7c126948248593c15c7f98b8c5b8c5dd1d0630e4d515a19b4d354b8a6c52ecbbc458ed9e5708e409d62271974092d SHA512 8bfa5ab5888fef964bab40ae9d53e3dd5ee76a21c7303ce0ed8d44499ad8c631b269896d6b1177c790126502ace8d8affe81abbabdab5e5335ecc508dc45a091
 EBUILD binutils-2.31.1-r1.ebuild 11982 BLAKE2B 87ec050dd2a1d568d40743cb2ee121246307af8f681ca7a21e0799b1b8c136427c0d1aa5040b7d67fcf4fe085d08887ea4cadc3d256c56e75cebca90cf183f74 SHA512 105f266b196eca929c5511ae8fbf7a80e74f641c8ffd790ecd36bd2e828eab5580941073f6de2cfaf834d3c7678e8023a847c001cc170d07ceb3ff590dd7b7c1
 EBUILD binutils-2.31.1.ebuild 12062 BLAKE2B d733159c07280791ed54a721f3ea517b490899c0faaa7ac34ca1f7dcf7f2ac658a547dd41b0414f141c8d8dec74925d9bca7500859dc51bda4c0d3c8d6670d8a SHA512 b39036aaa8a9d53f0b7d12f6884ed3f2a414f0a6d8c9198d4fe4387a755d409441ddfb7d64368ffd39bb76ae69442365bef4c1929c648feb355b92d3bfddee2a
 EBUILD binutils-9999.ebuild 11887 BLAKE2B 22f26d379bf519b20672f745913d559ed8a0d5098bf7b721b5fd52718de791e46edb7a2b1f3748676dbeffda68d4c2ab36a993d05b8282d136be13e746175b53 SHA512 de5c353d38df1f386d95383f0a782e6220a279ebd4c44894042a2a92e418271371ea4e7e4d070996e6507599209ad0f89f458822b38c8c45b989894ec715b6c8
diff --git a/sys-devel/binutils/binutils-2.30-r4.ebuild b/sys-devel/binutils/binutils-2.30-r4.ebuild
index 9c417b75742d..bee5ec6cf227 100644
--- a/sys-devel/binutils/binutils-2.30-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.30-r4.ebuild
@@ -35,7 +35,7 @@ case ${PV} in
 		;;
 esac
 SLOT="${BVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 #
 # The Gentoo patchset
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index da816c7a6936..ce05ed2a24f2 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -4,11 +4,13 @@ DIST crossdev-20180508.tar.xz 26728 BLAKE2B ab92cac544ee787ca91c794191c51faeab99
 DIST crossdev-20180731.tar.xz 26808 BLAKE2B eea12e6405546ca5a8409a853afdcbb25f3f2a7336c428b7c6a5d38b29d772989da7c0a59ce282ee925a9126e396bead17798a25bff1b5019a28ba0ef3bc55fc SHA512 245144b57242b7ae1bca65f457bfb60ec4fe1a4cb5f332dc5ac42d14740dda49e7e5266b10e60bebc84be7fabbac827335fcbc8e0dd74e24f423ddfef33edb7e
 DIST crossdev-20180818.tar.xz 26904 BLAKE2B 8fce23db9a00429ec8f8487a72cd5724200336bbd1d50ef62d1170cdd2ccb2b3255ba47c516b89f0394fd7e7c935842269eddeddbc308ffdd1194edd7cc916cd SHA512 11ecd46026c1ec673fc18e86d3cc8570341288b2cf4c4a54aa62d3afddb2ad3d3005a30f2b5b35264af89511975b532cb6014009d0f5ec0b18c0256f49196cb5
 DIST crossdev-20180918.tar.xz 26984 BLAKE2B 67cbddfc1ee2a4e6b3cb443b2cb8ac9468067356b007306db01081ee5bb3335548d4a80ecd604510cf806d68190be2b67e73d0a3f25968a7ebc9eb478fdaac73 SHA512 daeb864a88de6a64ab72b7dd3024106b8afa1e6de0b143042466435d4df2b7da1e1a6b314d3f2c2b01fc273b722871352321054d1fc5158d6b7bbabc01ba327c
+DIST crossdev-20181020.tar.xz 27172 BLAKE2B 8a388d5201ab419b865b96a4314190a693a7e00f3b5ecc2db2efdf36efca102206b5c4c5633e5e4ee508f5433ff4e086460501462bacc86c2adb10cab33a0244 SHA512 dd7fa9522ce6f58684b54ddc57e088f19a8ad5392ff45ed5b2b1f95f4be7dbc753442adc1c2591a785d94070979200936ca713913e547e84ae02b05c83bf8cde
 EBUILD crossdev-20171230.ebuild 854 BLAKE2B d10029ed5c6d5c9333a949d3d0a9df31a3b5b180328036c90188ce326bc83a3801638379a6b856010fedf04ae12ebf14e9a8953084acec7ec87dc889d21057d2 SHA512 955cee7f5bb76c933c2c206d65cb6c25ba78725e6f414a0860fb9c09d244221837a2ac25767828c97acbff46b6d3241582ba0a54f2ebcc31d34ed616d1ce8a33
 EBUILD crossdev-20180410.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d
 EBUILD crossdev-20180508.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d
 EBUILD crossdev-20180731.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d
 EBUILD crossdev-20180818.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d
 EBUILD crossdev-20180918.ebuild 905 BLAKE2B 725bb647f16d86cf8ee74d6c90f35d23321899e331059b14ff7e151e92a7a82b9e1f7ddb30be162d79f38d8b2d7e249c35a1537640abc40b13775b8fe7102f42 SHA512 c962c298ceb6f6a7ab1307b916ec66274da802fd1ee1bb35ae02c18bd069dd86ad8c2ddd55b23421cfc77bde8ce6136054e7888f4a2223f1d7936b8648247b5d
+EBUILD crossdev-20181020.ebuild 902 BLAKE2B 4641f43a96ce6195f904fa8350c36becb6ab1e7b7be4035e4a225768ad11a072d1c8aea839948aec5871acb3376dd1127244feb5bba65666ec2b3fdc9f54a24a SHA512 eebf6782cbb43862064d3c2356860693e68d4e517ddc3c712feef4a6c1084d9ae43bd2518aa1b1e6b0f99b16ac0b85f33e12457f3fcca01d3233c2c02d389cc3
 EBUILD crossdev-99999999.ebuild 911 BLAKE2B 4ae5b9af089c6ff5911dd16b91144b403ab40676dbbfeb93739835084bd2f8dc8b01c157d7042bef68c6620c2ff387dd76073dc26ebf3267a6b618bdbc806485 SHA512 0c495670181efe2b105768c7715e55d65a487ccaa3c2fd4ebbe5272e04425c40aec365ce3a248743b97dec49446ba07cda0d7d7f17dec94297c36182a9c456a6
 MISC metadata.xml 356 BLAKE2B 2220babfa5cc38c63a0e8361b84d1f3b288e5d050fd587562cac160621a60efb109df5af98b6108c1cd442947911d76db38cc9b82ef83c7a52553d5dab231116 SHA512 9b90e3370e18885739fad8a1ff7fd420eae5cf188fde84e8aec8002bbbc390291bd37481e308ad584d33e643e9d17a47000c8ce0852780ff18c0bfddb7327cae
diff --git a/sys-devel/crossdev/crossdev-20181020.ebuild b/sys-devel/crossdev/crossdev-20181020.ebuild
new file mode 100644
index 000000000000..5df04406ba65
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20181020.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	|| (
+		>=sys-apps/portage-2.1
+		sys-apps/portage-mgorny
+	)
+	>=app-portage/portage-utils-0.55
+	app-shells/bash
+	sys-apps/gentoo-functions
+	!sys-devel/crossdev-wrappers"
+DEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index d1f58ffa6916..7b06792204f2 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,4 +1,5 @@
 AUX gdb-7.12.1-ia64-include.patch 891 BLAKE2B ab8fd5cf7c394a302d3c6de36f1157623dce854c0b10c9d3925db0b09aeea7d3a6c788dbed3f3e4d338535b35c3913ce8ff57edaa3d5cb587612a9de96718ec7 SHA512 0891e407b9a97dc26d99cf91f01f1316076dc5c303ddfd49e535ccf442d70cfb1b3d0b078c28da7208009fc4674606be96467fbd9b3d6773d1fe12305d89bdb0
+AUX gdb-8.2-tinfow.patch 1629 BLAKE2B eb771e3ce9add5eeb6c9d87cec229fda6557eb907877ecb4461060b8869c8598891368bb83c9ae71f5840edc0d95c9fa6d7c386e78afb724fdeadf5d1619269f SHA512 a406922c3fa9c0264cb4250895783d433f59f88eda8df63e509bc8c43d6b55b540262f34dd6f57894958574d9f3412d9d6f46397c229515204d62b0e642570d2
 DIST gdb-7.10.1.tar.xz 18531436 BLAKE2B b50a1b6b5b867e4a52943fdc4992c654ceec180099771381df78de5ba79086e822264356a762c61b89e986407d6f0cce336be216276545591e637131dc02f4a8 SHA512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010
 DIST gdb-7.12.1.tar.xz 19225392 BLAKE2B 2e4b7fe69c3cb11c04b505d1e110bf0a9ca65b6178f3e6a6ccc11fde1e8750b595016baf64adb2c22903d346cec1dab15574681de812ac8d260aebf4152a3027 SHA512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8
 DIST gdb-7.9.1.tar.xz 17867692 BLAKE2B f5de07a4ebf1a5112a1b40341b217d08f1eb6820eb2237a4be2cd289f832600b81b3c14f4632a762fdc13945a2fb65ffb58f13eb330f3d48892799e27bb62c87 SHA512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414
@@ -12,6 +13,7 @@ EBUILD gdb-7.9.1.ebuild 5945 BLAKE2B 2f767de7261f2924808b0eeeed463fb46b6cf490ed5
 EBUILD gdb-8.1-r1.ebuild 7114 BLAKE2B ffb1e998275339b3cdcf5c6babb344171b7d533e15046b912b4096e57ed9d49543bc46ac8d20add3ca8f6805722312c4a441826f145daae5114279ad988d9ac1 SHA512 83dd71f26aa311982d23012899d8684a4a5ec132c134957ae969d151c5d3e56a10464da7fec7ae9383d47c44804bb2174ecea6ba176c267ad348412f9d598292
 EBUILD gdb-8.1-r2.ebuild 7110 BLAKE2B 399cf3ef970f92d911a9a1b5eb2e4c0058e5c1f6c70a9c1e41919b45d046d2f704d865670d4dfd39f13d36dc9f4a19f22ba6082321ffb36b373de709c79e28d6 SHA512 95e0952c373b5f2e8d6013a281f2982c096c035ec01503ac36308f5bac29ec58d7775ad04375cb5702ecaa6d2509e178c1ed1cea8719fe662ce3868ca98500e7
 EBUILD gdb-8.1.1.ebuild 7115 BLAKE2B 07455f6ec0eb8d32bd57f404b2e831accb70995e61bd82232c8150b6f6acec2690d8b9419245e006074d4e89aaf60ffcf6571c3b09099b5d4d0ca2b11ea11318 SHA512 41864e8336b484cd7fbddac2151d567821923545442e8ed4c6717e928c76b72c5a843eab5d35b053eaf9a94ff3435e617ef68a8ff705f99752fb90ea5ef20699
+EBUILD gdb-8.2-r1.ebuild 7269 BLAKE2B dddd371aa22c1b24ff256126aefc0491228881530f16a45eb2ec572c1e6a3f91db5d81ffaa9619bc691e0fc3667083f41373039483b0832cc93c095b45f2b946 SHA512 e33c85dc69973cf51f003f6fbee914e618bdd9036c83841704ac3091ddb8dd2bcfe55439a13ed87ae94d1ec55ea85fcb3c799d0d9bd4c2ffb696052d27e02c1b
 EBUILD gdb-8.2.ebuild 7232 BLAKE2B 50ae71f70afbbbd0198394b6a638a68b29c3be243add4178b5fb2c4d5d2d6e940875c0e677d24cb1af16ee79d3c15cf99ed1160c36830e9c71fd6f92ea86f71d SHA512 ce0d2accd9d22baf1842737129925554291b1c4c9fa7f45cb853712a9ce5984d3305ab77721095d2483db1eddb025aa36b766195c98d404bcd9aec1bfff52a90
 EBUILD gdb-9999.ebuild 7082 BLAKE2B bb3a92633e1bd39084f0188474cfc2e5df6c2a3421edc7d6a884dc1b0b3474a631b8c82222f46fda2fb8af16d68ee722734d5276674a1a2fc38d5ffde2863f27 SHA512 8364ce6883ede62ca5e863781309bf832402e7f67400dc5f67539f5b47566692b82ca8324e6bcebe5001fbe2f4688302aa4f2b6e90bf455c17b7d174ab5947eb
 MISC metadata.xml 914 BLAKE2B 1260cb2638b32429345bd92c06c58074b3486ba3c516e25dab674b4589bf774f2f7192f7ed3ab9da4ed31e313038a389904bee6f9b77707d794530e3a244dfb4 SHA512 515a5bcd6c70fc87309cd4e3822d83e1b8fdf52e58cbf331df0c38b9096ad2410dfdad14aed100ea0a53457f57ecdf2b61b910b6a52765219815e1872872ee0c
diff --git a/sys-devel/gdb/files/gdb-8.2-tinfow.patch b/sys-devel/gdb/files/gdb-8.2-tinfow.patch
new file mode 100644
index 000000000000..48f6109664a2
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-8.2-tinfow.patch
@@ -0,0 +1,44 @@
+Try to link gdb against tinfow first, then tinfo.
+
+In bug #669096 gdb was directly linked both
+to libtinfo.so.6 and libncursesw.so.6:
+    $ lddtree /usr/bin/gdb
+    /usr/bin/gdb (interpreter => /lib64/ld-linux-x86-64.so.2)
+    libtinfo.so.6 => /lib64/libtinfo.so.6
+    libncursesw.so.6 => /lib64/libncursesw.so.6
+        libtinfow.so.6 => /lib64/libtinfow.so.6
+    ...
+and caused gdb to SIGSEGV at start.
+
+Let's consistently link against *w libraries.
+
+Note: the fix on it's own is not enough:
+- we don't pass include paths to ncursesw libraries
+- libreadline.so.7 is still linked against libtinfo.so.6 in Gentoo
+  and needs a separate fix.
+
+But it's enough to make immediate SIGSEGV to go away.
+
+Reported-by: Michał Górny
+Bug: https://bugs.gentoo.org/669096
+--- a/gdb/configure.ac
++++ b/gdb/configure.ac
+@@ -616,4 +616,4 @@ esac
+ 
+-# These are the libraries checked by Readline.
+-AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncursesw ncurses])
++# These are the libraries checked by Readline. Not really: readline does not know about *w libs.
++AC_SEARCH_LIBS(tgetent, [termcap tinfow tinfo curses ncursesw ncurses])
+ 
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -8984,3 +8984,3 @@ esac
+ 
+-# These are the libraries checked by Readline.
++# These are the libraries checked by Readline. Not really: readline does not know about *w libs.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
+@@ -9009,3 +9009,3 @@ return tgetent ();
+ _ACEOF
+-for ac_lib in '' termcap tinfo curses ncursesw ncurses; do
++for ac_lib in '' termcap tinfow tinfo curses ncursesw ncurses; do
+   if test -z "$ac_lib"; then
diff --git a/sys-devel/gdb/gdb-8.2-r1.ebuild b/sys-devel/gdb/gdb-8.2-r1.ebuild
new file mode 100644
index 000000000000..d7f7e1ef262d
--- /dev/null
+++ b/sys-devel/gdb/gdb-8.2-r1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 epatch eutils flag-o-matic python-single-r1
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+RPM=
+MY_PV=${PV}
+case ${PV} in
+9999*)
+	# live git tree
+	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
+	inherit git-r3
+	SRC_URI=""
+	;;
+*.*.50.2???????)
+	# weekly snapshots
+	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+	;;
+*.*.*.*.*.*)
+	# fedora versions; note we swap the rpm & fedora core versions.
+	# gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild
+	# gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild
+	inherit versionator rpm
+	gvcr() { get_version_component_range "$@"; }
+	parse_fedora_ver() {
+		set -- $(get_version_components)
+		MY_PV=$(gvcr 1-$(( $# - 2 )))
+		RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm"
+	}
+	parse_fedora_ver
+	SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}"
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+	;;
+esac
+
+PATCH_VER="1"
+PATCH_DEV="slyfox"
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.1-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${PN}-8.1-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+client lzma multitarget nls +python +server test vanilla xml"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	|| ( client server )
+"
+
+RDEPEND="
+	server? ( !dev-util/gdbserver )
+	client? (
+		dev-libs/mpfr:0=
+		>=sys-libs/ncurses-5.2-r2:0=
+		sys-libs/readline:0=
+		lzma? ( app-arch/xz-utils )
+		python? ( ${PYTHON_DEPS} )
+		xml? ( dev-libs/expat )
+		sys-libs/zlib
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-apps/texinfo
+	client? (
+		virtual/yacc
+		test? ( dev-util/dejagnu )
+		nls? ( sys-devel/gettext )
+	)"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
+
+	# upstreamed
+	EPATCH_EXCLUDE+=" 01_all_ia64-TRAP_HWBKPT.patch"
+	EPATCH_EXCLUDE+=" 02_all_solaris-no-uuidsys.patch"
+	! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	eapply "${FILESDIR}"/${P}-tinfow.patch
+
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	local myconf=(
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	if use server && ! use client ; then
+		# just configure+build in the gdbserver subdir to speed things up
+		cd gdb/gdbserver
+		myconf+=( --program-transform-name='' )
+	else
+		# gdbserver only works for native targets (CHOST==CTARGET).
+		# it also doesn't support all targets, so rather than duplicate
+		# the target list (which changes between versions), use the
+		# "auto" value when things are turned on.
+		is_cross \
+			&& myconf+=( --disable-gdbserver ) \
+			|| myconf+=( $(use_enable server gdbserver auto) )
+	fi
+
+	if ! ( use server && ! use client ) ; then
+		# if we are configuring in the top level, then use all
+		# the additional global options
+		myconf+=(
+			--enable-64-bit-bfd
+			--disable-install-libbfd
+			--disable-install-libiberty
+			# Disable guile for now as it requires guile-2.x #562902
+			--without-guile
+			# This only disables building in the readline subdir.
+			# For gdb itself, it'll use the system version.
+			--disable-readline
+			--with-system-readline
+			# This only disables building in the zlib subdir.
+			# For gdb itself, it'll use the system version.
+			--without-zlib
+			--with-system-zlib
+			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+			$(use_with xml expat)
+			$(use_with lzma)
+			$(use_enable nls)
+			$(use multitarget && echo --enable-targets=all)
+			$(use_with python python "${EPYTHON}")
+		)
+	fi
+	if use sparc-solaris || use x86-solaris ; then
+		# disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	nonfatal emake check || ewarn "tests failed"
+}
+
+src_install() {
+	if use server && ! use client; then
+		cd gdb/gdbserver || die
+	fi
+	default
+	if use client; then
+		find "${ED}"/usr -name libiberty.a -delete || die
+	fi
+	cd "${S}" || die
+
+	# Delete translations that conflict with binutils-libs. #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
+
+	if use client ; then
+		docinto gdb
+		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+	fi
+	docinto sim
+	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+	if use server ; then
+		docinto gdbserver
+		dodoc gdb/gdbserver/{ChangeLog,README}
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+
+	# gcore is part of ubin on freebsd
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		rm "${ED}"/usr/bin/gcore || die
+	fi
+}
+
+pkg_postinst() {
+	# portage sucks and doesnt unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index f9412c1fb107..fcaa68e37d56 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,7 +1,8 @@
 AUX m4-1.4.17-posix_spawn.patch 3302 BLAKE2B fe00346f2f180fe70ef867376d9a3f0da632d83aeee21aa524642ec061e6c1e37538c37d266a32aea63c6a8f776ee3bc85fd82f447704c1e73965132f528030a SHA512 82f6f1960a290265f1a7a3c868a780fa0816194c26ed5fc8337e35983021798c55db7c75fccf979a7dcc73253d1864cbf2de89a906fc6bf8458a524e2c4604c8
 AUX m4-1.4.18-darwin17-printf-n.patch 1386 BLAKE2B e5b1e4750b21b4efc0e62f2447a3f40dd037e28b5fe833d3ddf87fe853ee8885e34c5720b7b00f08242131df9996d36f4a954571ed21d067ca0dfeae69961e09 SHA512 4ad476e538c85ee41280461269dd8acabdbdb9cd2e0e2e49ea43bc14eb370e17282c504403a7c2914d886adf703bcc3b95991724bed90dc014a66cb861a70faf
+AUX m4-1.4.18-glibc228.patch 13863 BLAKE2B f8b54c3b7feae5d458ba893e08313f5e9772e66be03a5db2fe3929e671002cc3c80cf8cc6ca0a68b792f729404dc27c95cf436663026b50682f47c306721b581 SHA512 c81df4510b01044578e11c7bd1046ec297ab195f6e5c7d7eaad7aae31862326d12cf00a9f36218f93db88e36f88ec73be8e320214b999330da3dc5bba9a3be46
 DIST m4-1.4.17.tar.xz 1149088 BLAKE2B ccba6a1cd80de241bc2e755addbf4876b00ab776e0a3c85691998e3e84e8a091d57d8c3e9b43a115e52e416450de791662a54ca8e64e1603a166029164f140ce SHA512 406e6e97c3f5c5f3c8055bac748d4fe8c2e861d97e84ab6d840a2caa7df04f523cc662d6d51f6afae7d6c219d03693c7ae0c1e669a80246a3ceb5e8342b82389
 DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174
 EBUILD m4-1.4.17.ebuild 1620 BLAKE2B 789c68b68c8265b799623fede4da9ab2aa344b67972d8abe220aa03c80732425ac474cbd01f0ac3538f8b110ce6dffd5d8844b9cad079cdde5fa283c9216e5e5 SHA512 e5642fde4f5f83daaeac3ab340abd845285d90320ac9c72b4465de4c06c05206c5bc9a3208f1fbf94609552b264de47ee1359e07b0d2c791cb160a4be605ff72
-EBUILD m4-1.4.18.ebuild 1402 BLAKE2B b74e5896824ead629906a4e42613a3cb427b9e52817be0e3f8296f0bcce1762f1709ab18506bb479ef40c87d64c5c781cf7e15a744b99f80fe2e4340313a39fb SHA512 602cf672efeeed2b4a210d5fc95e673e2019510e1ac1065e6c860312d6743a3ff94d4492ba39470ea2c167590685c9eb98293c17dc046c401b995d7e9573b401
+EBUILD m4-1.4.18.ebuild 1462 BLAKE2B 36c2f2cef7b4b3df2bae33314fcdd739620554fc482002e9f833db6bbc0a380ed37bed3200e440c3b54e97194e73824787df62a66c0871ca08da60737101ba1c SHA512 3ed2b17f679d3c61fb67ae3234dbe74b0130f304db957d97da30268fb28667ceb147c87fd160144874f51b5bbe984b31e796f3a98b3106f70a4f819ce6d6312b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/m4/files/m4-1.4.18-glibc228.patch b/sys-devel/m4/files/m4-1.4.18-glibc228.patch
new file mode 100644
index 000000000000..6b5593bfa639
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.18-glibc228.patch
@@ -0,0 +1,310 @@
+Fix build failure on glibc-2.28:
+    fseeko.c: In function 'rpl_fseeko':
+    fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+       #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+
+Patch by milan hodoscek.
+
+https://bugs.gentoo.org/663924
+--- a/old/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -1,5 +1,5 @@
+ /* Implementation details of FILE streams.
+-   Copyright (C) 2007-2008, 2010-2016 Free Software Foundation, Inc.
++   Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -12,12 +12,18 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+ 
+ /* Many stdio implementations have the same logic and therefore can share
+    the same implementation of stdio extension API, except that some fields
+    have different naming conventions, or their access requires some casts.  */
+ 
++/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
++   problem by defining it ourselves.  FIXME: Do not rely on glibc
++   internals.  */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+ 
+ /* BSD stdio derived implementations.  */
+ 
+@@ -29,10 +35,10 @@
+ #include <errno.h>                             /* For detecting Plan9.  */
+ 
+ #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+ 
+ # if defined __DragonFly__          /* DragonFly */
+-  /* See <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.  */
++  /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/lib/libc/stdio/priv_stdio.h>.  */
+ #  define fp_ ((struct { struct __FILE_public pub; \
+                          struct { unsigned char *_base; int _size; } _bf; \
+                          void *cookie; \
+@@ -49,30 +55,84 @@
+                          fpos_t _offset; \
+                          /* More fields, not relevant here.  */ \
+                        } *) fp)
+-  /* See <http://www.dragonflybsd.org/cvsweb/src/include/stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.  */
++  /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/stdio.h>.  */
+ #  define _p pub._p
+ #  define _flags pub._flags
+ #  define _r pub._r
+ #  define _w pub._w
++# elif defined __ANDROID__ /* Android */
++  /* Up to this commit from 2015-10-12
++     <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
++     the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
++     see <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/fileext.h>
++     and <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/local.h>.
++     After this commit, the innards of FILE are hidden.  */
++#  define fp_ ((struct { unsigned char *_p; \
++                         int _r; \
++                         int _w; \
++                         int _flags; \
++                         int _file; \
++                         struct { unsigned char *_base; size_t _size; } _bf; \
++                         int _lbfsize; \
++                         void *_cookie; \
++                         void *_close; \
++                         void *_read; \
++                         void *_seek; \
++                         void *_write; \
++                         struct { unsigned char *_base; size_t _size; } _ext; \
++                         unsigned char *_up; \
++                         int _ur; \
++                         unsigned char _ubuf[3]; \
++                         unsigned char _nbuf[1]; \
++                         struct { unsigned char *_base; size_t _size; } _lb; \
++                         int _blksize; \
++                         fpos_t _offset; \
++                         /* More fields, not relevant here.  */ \
++                       } *) fp)
+ # else
+ #  define fp_ fp
+ # endif
+ 
+-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */
++# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */
+   /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
+-     and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
++     and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
++     and <https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/lib/libc/stdio/fileext.h> */
+   struct __sfileext
+     {
+       struct  __sbuf _ub; /* ungetc buffer */
+       /* More fields, not relevant here.  */
+     };
+ #  define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
+-# else                                         /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */
++# elif defined __ANDROID__                     /* Android */
++  struct __sfileext
++    {
++      struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */
++      /* More fields, not relevant here.  */
++    };
++#  define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub
++# else                                         /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */
+ #  define fp_ub fp_->_ub
+ # endif
+ 
+ # define HASUB(fp) (fp_ub._base != NULL)
+ 
++# if defined __ANDROID__ /* Android */
++  /* Needed after this commit from 2016-01-25
++     <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7> */
++#  ifndef __SEOF
++#   define __SLBF 1
++#   define __SNBF 2
++#   define __SRD 4
++#   define __SWR 8
++#   define __SRW 0x10
++#   define __SEOF 0x20
++#   define __SERR 0x40
++#  endif
++#  ifndef __SOFF
++#   define __SOFF 0x1000
++#  endif
++# endif
++
+ #endif
+ 
+ 
+@@ -81,7 +141,7 @@
+ #ifdef __TANDEM                     /* NonStop Kernel */
+ # ifndef _IOERR
+ /* These values were determined by the program 'stdioext-flags' at
+-   <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>.  */
++   <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>.  */
+ #  define _IOERR   0x40
+ #  define _IOREAD  0x80
+ #  define _IOWRT    0x4
+@@ -99,6 +159,8 @@
+                          int _file; \
+                          unsigned int _flag; \
+                        } *) fp)
++# elif defined __VMS                /* OpenVMS */
++#  define fp_ ((struct _iobuf *) fp)
+ # else
+ #  define fp_ fp
+ # endif
+@@ -110,7 +172,7 @@
+ #  define _flag __flag
+ # endif
+ 
+-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__  /* newer Windows with MSVC */
++#elif defined _WIN32 && ! defined __CYGWIN__  /* newer Windows with MSVC */
+ 
+ /* <stdio.h> does not define the innards of FILE any more.  */
+ # define WINDOWS_OPAQUE_FILE
+@@ -130,7 +192,7 @@ struct _gl_real_FILE
+ # define fp_ ((struct _gl_real_FILE *) fp)
+ 
+ /* These values were determined by a program similar to the one at
+-   <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>.  */
++   <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>.  */
+ # define _IOREAD   0x1
+ # define _IOWRT    0x2
+ # define _IORW     0x4
+--- a/old/fseeko.c
++++ b/lib/fseeko.c
+@@ -1,5 +1,5 @@
+ /* An fseeko() function that, together with fflush(), is POSIX compliant.
+-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
++   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -12,7 +12,7 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License along
+-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
++   with this program; if not, see <https://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ #if _GL_WINDOWS_64_BIT_OFF_T
+ # undef fseeko
+-# if HAVE__FSEEKI64 /* msvc, mingw64 */
++# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */
+ #  define fseeko _fseeki64
+-# else /* mingw */
++# else /* mingw before msvcrt8.0 */
+ #  define fseeko fseeko64
+ # endif
+ #endif
+@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+ # if defined __SL64 && defined __SCLE /* Cygwin */
+   if ((fp->_flags & __SL64) == 0)
+     {
+@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #elif defined __minix               /* Minix */
+   if (fp_->_ptr == fp_->_buf
+       && (fp_->_ptr == NULL || fp_->_count == 0))
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+   if (fp_->_ptr == fp_->_base
+       && (fp_->_ptr == NULL || fp_->_cnt == 0))
+ #elif defined __UCLIBC__            /* uClibc */
+@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence)
+       if (pos == -1)
+         {
+ #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-          /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++          /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+           fp_->_flags &= ~__SOFF;
+ #endif
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++      /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-      /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+-# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000)
++      /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
++# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix
+       /* fp_->_offset is typed as an integer.  */
+       fp_->_offset = pos;
+ # else
+@@ -150,7 +152,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+       fp_->_flags &= ~__SEOF;
+ #elif defined __EMX__               /* emx+gcc */
+       fp->_flags &= ~_IOEOF;
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+       fp_->_flag &= ~_IOEOF;
+ #elif defined __MINT__              /* Atari FreeMiNT */
+       fp->__offset = pos;
+--- a/old/freadahead.c
++++ b/lib/freadahead.c
+@@ -1,5 +1,5 @@
+ /* Retrieve information about a FILE stream.
+-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
++   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -12,7 +12,7 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+@@ -22,17 +22,26 @@
+ #include <stdlib.h>
+ #include "stdio-impl.h"
+ 
++#if defined __DragonFly__
++/* Defined in libc, but not declared in <stdio.h>.  */
++extern size_t __sreadahead (FILE *);
++#endif
++
++/* This file is not used on systems that have the __freadahead function,
++   namely musl libc.  */
++
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_write_ptr > fp->_IO_write_base)
+     return 0;
+   return (fp->_IO_read_end - fp->_IO_read_ptr)
+          + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base :
+             0);
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+   if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0)
+     return 0;
+ # if defined __DragonFly__
diff --git a/sys-devel/m4/m4-1.4.18.ebuild b/sys-devel/m4/m4-1.4.18.ebuild
index 9c6670123534..378946733cae 100644
--- a/sys-devel/m4/m4-1.4.18.ebuild
+++ b/sys-devel/m4/m4-1.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -20,6 +20,8 @@ RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-darwin17-printf-n.patch
+	epatch "${FILESDIR}"/${P}-glibc228.patch #663924
+	epatch_user
 	default
 }
 
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index 3b44a49698d8..5c23fecf453f 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -9,4 +9,5 @@ DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8f
 EBUILD prelink-20130503-r1.ebuild 2458 BLAKE2B 27df684421d5857a5727916bbcdbadca5d9e8847a1f8c0abafb892fc6af029932687c0819013416d36ad0182bf771ed89e238a8122cc83631b6cc5717ade8563 SHA512 2cc0e66fb48f2137bc9a8118d1ed97e58dd5725bd30b042c4276dad5df2d65ef8298e93cdaeb0b8b292c16ff255fa1ddacdc104150ac478e1bf8677869ce4939
 EBUILD prelink-20130503.ebuild 2617 BLAKE2B 24308a12628eadef19728c07f6a2be21671e2119d6570fd7d2fe8cb7805a041edf4bb54cdc391b808d396e2585e54fbd0c2f46fe755ab35722bfcfd2690fa7c1 SHA512 4ba50aad1ba5e142f8a0c96d2ab73fca49712202c506a57af58e9fee5021446e6587f9715420244c39aef9f006baf8cfef7cd318e8e6e21f36aa590f7840cbc0
 EBUILD prelink-20151030.ebuild 1737 BLAKE2B e8d5ee89e48725c4b054bb83a3f4867cce35cab2ac63a02a28a28044e0b169c1cfe547ea906fb38a91946769afbaa9a4ef2f6d8ec1969aa7dc646ab09fe5d1d7 SHA512 7889421c986260cac8f31d3eafe1e354bb78dec1e00f2fec5798a3347c845c4dd4ba973e5f0c0728d4efe993f393ea50607b5d00591488a0b38574d519d70f36
+EBUILD prelink-99999999.ebuild 1585 BLAKE2B 37746d0631d4a07c94f9ad71cc00512b4c485ce13b00ca84263be41f0e8a1b00a315764a845740fe3cee30cdd5acb7d87d41fc0be2d764a158fda62bcabc4df5 SHA512 5d844567440de565d363cff958b3027ce5a7e80a68e46dc2c10e2176bf2306788d4c2d86d6a92a83324a6264e6c374d8d48a38665535588c4b71ac07a03d7a5e
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/prelink/prelink-99999999.ebuild b/sys-devel/prelink/prelink-99999999.ebuild
new file mode 100644
index 000000000000..390d0c35e0cd
--- /dev/null
+++ b/sys-devel/prelink/prelink-99999999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="${PN}-cross"
+MY_P="${MY_PN}-${PV}"
+
+inherit autotools flag-o-matic git-r3
+
+DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
+HOMEPAGE="https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/ https://people.redhat.com/jakub/prelink"
+EGIT_REPO_URI="https://git.yoctoproject.org/git/prelink-cross"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux[static-libs(+)] )
+	!dev-libs/libelf
+	sys-libs/binutils-libs
+	>=sys-libs/glibc-2.8"
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-2.18
+	>=dev-libs/elfutils-0.100[static-libs(+)]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20130503-prelink-conf.patch
+	"${FILESDIR}"/${PN}-20130503-libiberty-md5.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
+
+	has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable selinux)
+}
+
+src_install() {
+	default
+
+	use doc && dodoc doc/prelink.pdf
+
+	insinto /etc
+	doins doc/prelink.conf
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/prelink.cron prelink
+	newconfd "${FILESDIR}"/prelink.confd prelink
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ] ; then
+		elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
+		elog "found online at:"
+		elog "    https://wiki.gentoo.org/wiki/Prelink"
+		elog "Please edit /etc/conf.d/prelink to enable and configure prelink"
+	fi
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 4c5bbe6fb152..5ce1aa34989e 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bedup/Manifest b/sys-fs/bedup/Manifest
deleted file mode 100644
index 29450078e868..000000000000
--- a/sys-fs/bedup/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bedup-0.10.1.tar.gz 48138 BLAKE2B 75072623ef631b88d4cbca746a5344836a642e283fbeaa452b78a78ae7ab4faf2bb10fce5177beb0af056e3e80a2ae677160ba8292a53d52978889436a05b230 SHA512 681d925b4ce948efb85fe04b4b2083e72089c28c5fc24a5c367007870975e65bd112a538069be5f32df9d06eed418ced51bfc44da295d0ea3b946069faf8b23e
-EBUILD bedup-0.10.1.ebuild 695 BLAKE2B a5bd7cce6641d8bf9931dd57c1115d2f4256f3cc20e93e6aec673f89e4a0e579dbb08b9d5771153b468a5ad8541e2d02d16d384f46471b90d7e10cfd01fa2b2d SHA512 385d5a51f99bafa1638366be2eafb1b198c8c6eb027eb1c047fb590c4e917b09e968510059e964fc8bddeb0f1bdfb89938c383cd8cb35d713b280d513c7a89c4
-EBUILD bedup-9999.ebuild 845 BLAKE2B a7fe1cd84174c7309267dac31dc270bc1fb606ff64d1a0712b85492a526dd02f2d27202a3c8feab77c2a7c119142623fcd80446de4ca94c12979af7838d5784f SHA512 ae5a182dba00fe5954bc851fd30779f093b024d34bbd74679607c705a9534b424d9b9cd518b50a7d231994f6fd108b7d6eeb2199c74870810b11b6c75a0dae26
-MISC metadata.xml 321 BLAKE2B 3864043708fb5447e0d3fd415da951e12047524de0331d825a46a78697977f24adf9aba20d48f1bfce90812e1ae753160dda5f41962212b1de327073fdc6ccba SHA512 c0e402519353b29d43d9944739ea4d2e2fb9ae845def7827b3aa6166738b271d805ac81f9ff9435efcc848ed312b8d30f2d25249d501f8262223bafa312c2c41
diff --git a/sys-fs/bedup/bedup-0.10.1.ebuild b/sys-fs/bedup/bedup-0.10.1.ebuild
deleted file mode 100644
index ba5aa99cdcf0..000000000000
--- a/sys-fs/bedup/bedup-0.10.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Btrfs file de-duplication tool"
-HOMEPAGE="https://github.com/g2p/bedup"
-SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# we need btrfs-progs with includes installed.
-DEPEND=">=dev-python/cffi-0.5:=[${PYTHON_USEDEP}]
-	>=sys-fs/btrfs-progs-0.20_rc1_p358"
-RDEPEND="${DEPEND}
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.2[sqlite,${PYTHON_USEDEP}]"
diff --git a/sys-fs/bedup/bedup-9999.ebuild b/sys-fs/bedup/bedup-9999.ebuild
deleted file mode 100644
index 94d37527fda4..000000000000
--- a/sys-fs/bedup/bedup-9999.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
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-#if LIVE
-EGIT_REPO_URI="https://github.com/g2p/bedup.git"
-inherit git-r3
-#endif
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Btrfs file de-duplication tool"
-HOMEPAGE="https://github.com/g2p/bedup"
-SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# we need btrfs-progs with includes installed.
-DEPEND=">=dev-python/cffi-0.5:=[${PYTHON_USEDEP}]
-	>=sys-fs/btrfs-progs-0.20_rc1_p358"
-RDEPEND="${DEPEND}
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.2[sqlite,${PYTHON_USEDEP}]"
-
-#if LIVE
-SRC_URI=
-KEYWORDS=
-
-src_unpack() { git-r3_src_unpack; }
-#endif
diff --git a/sys-fs/bedup/metadata.xml b/sys-fs/bedup/metadata.xml
deleted file mode 100644
index a2bbde201ace..000000000000
--- a/sys-fs/bedup/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="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">g2p/bedup</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index da2737dd5f1c..b9a1e73620d6 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,6 +1,8 @@
 AUX fix-btrfs-defrag.patch 298 BLAKE2B 3fb4d86066af4a09701494c82b1aa595d7a8989732c12e0aa41cfe9c4faf1f03a5a9b2e8b74b06118e4d789fd914a0f142af1ef4b877d9a99d0d1aa89b429a81 SHA512 5305f9e7d7b80f901c6a8a9a52d6a08cfa38a720b590f9413a621604fe6f468d7259491ebb08e8dd87a2fd5274bc9d493d2e47a6b642e535114fd8a3b3a9a5e6
 DIST btrfsmaintenance-0.4.1.tar.gz 21621 BLAKE2B 36632d64022c7bf64548b0f6076640ee41cc9a6705b521fdc841f72f46808006ea6888476e05bb18bc51c44cb29eb444f816f34a1f251a8254156959aa178cdd SHA512 9a7ccc874e5c62689a0c899e8cc40d0b61625a492d28d8a0fe6c8a32be5990600d55094cb203d81a66488ff363fb960208bda5c19cf2948b51ba1b2764e34000
+DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991580d518ab756ae80c9f4328f113ab7de87367c6730c23b408298919ac740da3b0ec85ae76face60ad97bf75d9aaa2a178 SHA512 802c131edfbc07bca13b89cd8bfc90923b2f23ba780dcb07009a4c4991a588c66a6ffe780938e66ab632201980e5087cd0751cd9185a8bae1a5faba84bf87233
 DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
 EBUILD btrfsmaintenance-0.4.1-r1.ebuild 2061 BLAKE2B 4d019f8de6871da3319c52d040c2d23f7abbe52f804450801a20d97451b5ab70b7bd705f1aa0f23fd383fb57e82e80b38a55c8fd2da0792186bfa80e52726d3b SHA512 ba9f8b94f49b686f637086f68a6db23437a13bd661ee03ae2b4b26e114e0aa5b179ae29d3a9191348750be6b47f950f0d55ddb8bdb288fcee93545a78019df8f
+EBUILD btrfsmaintenance-0.4.2.ebuild 2011 BLAKE2B c4a6f7332654a54cb7817e57a0eed16c75b67132139f3f9eabc0b524b0baf0a6ba2a29b1cec71deed80b1b418916a03652d5ea27cf69069a5627647fc371978f SHA512 d318c006d688b2d2ba134f1e81aca918e603f84926a2e39c40d0886f5f1158dd154191ddb00f5ea73c9fb551e0eb2906abd82cdb5a7899b9951b2ac48483aa8a
 EBUILD btrfsmaintenance-0.4.ebuild 2052 BLAKE2B 066777c1ce55409a50ea2e1a640881cc0161ebc128e1d5d84bf7081f0ce5834bcf00ff5dc2d85d8fedccc7d2283223bf0842d227604fc6bd9ab3c2ac31de249c SHA512 80c3f7ae618e6b14dff3aae9d8387654de280388cbb7607d8a347d016c7c73a5015942fd1bf1a2fbbbd1f1e68e139c1d3af393aee6d4bd56b6836ee7c65c3b1a
 MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
new file mode 100644
index 000000000000..1b59d4752a34
--- /dev/null
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
+HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
+SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+RDEPEND="
+	sys-fs/btrfs-progs
+	virtual/cron
+	systemd? ( sys-apps/systemd )
+"
+
+src_prepare() {
+	# Fix config path into watching service
+	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
+		die "Unable to patch btrfsmaintenance-refresh.*"
+	default
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md CHANGES.md
+	insinto /etc/default
+	newins sysconfig.btrfsmaintenance btrfsmaintenance
+	insinto /usr/share/btrfsmaintenance
+	doins btrfsmaintenance-functions
+	exeinto /usr/share/btrfsmaintenance
+	doexe btrfs*.sh
+	systemd_dounit *.service *.timer *.path
+}
+
+pkg_postinst() {
+	elog "Installing default btrfsmaintenance scripts"
+	if use systemd; then
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
+	else
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
+	fi
+	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
+	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
+	elog "update cron symlinks or run"
+	elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
+	elog "to update systemd timers."
+	elog "You can also enable btrfsmaintenance-refresh.path service in order to"
+	elog "monitor the config files changes and update systemd timers accordly."
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		elog "Removing symlinks from btrfsmaintenance cron tasks"
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
+	fi
+}
diff --git a/sys-fs/dfc/Manifest b/sys-fs/dfc/Manifest
index a9374d3f6f92..1786f5bb9302 100644
--- a/sys-fs/dfc/Manifest
+++ b/sys-fs/dfc/Manifest
@@ -1,5 +1,5 @@
 DIST dfc-3.0.5.tar.gz 43310 BLAKE2B 4698c5f5caf249695598b01dab471c978e9a5b83b2c1610af466588bbac182ea7f51a7017d6be0b0f753f1abf41b7aa054e67049ff74344271c2dc5c01a8ef02 SHA512 f828ede8aee0a496518d1ee9583ba71495cdd01ee0d22833e3b46aeb5f5f870ce7de629923d129a7bf795b458feec10f9a16882134dae34dd2ace7ea9eebb134
 DIST dfc-3.1.1.tar.gz 52709 BLAKE2B 543795af9c0f3309ee497bc0bdfe144bec3cac69b4772803204d794acb9513e7f7b2726ea16640492a6c477f5c3c7fa872284efd5b7c690bf1bfde4608f7281d SHA512 eac2c8d464d57626efe939f515889cf91510f7e6eb50382d045204d4f1d6b9b9f0af4b1d8974c9cbcff1eb5b8802157e421ec06e5a1e38dac74eba72f43f9701
 EBUILD dfc-3.0.5-r1.ebuild 836 BLAKE2B e1fee8e45a8dfc7ab923a79bcaaf2483f1ad4dc0331a107952392c0c6add71bdb6c6494ac04d8315140687d46bcc38bf35a2f5a8f36d57a2d4ec8045d945c343 SHA512 d86e384267c8e9c34b45302199064dd694404815c5bd71cd4b7dae1a45fe8e92a7a4a1dcf823508b2a51b51c70660b37e49e48ade0758791b66558da8f0b81bf
-EBUILD dfc-3.1.1.ebuild 831 BLAKE2B fbe2b17ddf14461875b9f8449fb1f771069a403c53dada147927353aac245a1f7b1c6bb8606253d200b6a20a4cb92310a2f179058428aca52081731b9c99f996 SHA512 2b0e6b9beaa4e5228fb6879ddc657cb85acadd4e133ea0729edaecb4dca9882f38b96649aff99cd02a9af2d7edaa2afef1ebeebbac0fcb4dcb229443fe93a8c3
+EBUILD dfc-3.1.1.ebuild 815 BLAKE2B 4d7b584f10ae76aede0267290cc5d5b56f3afcd60f9b4a8e0f7a45a59fc742bb32325207d55e8b15a38ba8af431f7fae4af14d5a82050f14c24a91c13363a4c0 SHA512 ffa6c25b2973cf60ff0d73b0d40e66567d8a2629c527ca19531be08d0bad0a69f18682c547a9a84f7bf571af83bb42d20df9a0565f169403d11976282adb61cb
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/sys-fs/dfc/dfc-3.1.1.ebuild b/sys-fs/dfc/dfc-3.1.1.ebuild
index d13715350a12..47407f3ae117 100644
--- a/sys-fs/dfc/dfc-3.1.1.ebuild
+++ b/sys-fs/dfc/dfc-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,6 @@ src_configure() {
 		# disable automagic dependency
 		-DNLS_ENABLED="$(usex nls)"
 		-DLFS_ENABLED=ON
-		-DGRIM=OFF
 	)
 
 	cmake-utils_src_configure
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index cab325f5d379..8d49a542328b 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -2,5 +2,5 @@ AUX dosfstools-4.0-udevlibs.patch 1132 BLAKE2B f6d5d052a56a8d997e12cf293bfa7e482
 DIST dosfstools-4.0.tar.xz 157564 BLAKE2B 13dd374eb6824b2c5d5ae849dd802a4bb1b85729f4654e3d23ee8c3698a72a45a73e1a7d7cb95ae7cba13ea9737e80e253eb4603b342e49743a8402d7f7ceeba SHA512 81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
 EBUILD dosfstools-4.0-r1.ebuild 1117 BLAKE2B a973db2963f44141e73cd3fe8e680ae4ec10564bf3eb2397254d5070a7ad395a4905484d1d61bdc91c89464c02bcb494efa9195cb76608966966101e013a8816 SHA512 f00d35306a1a95d7b3b23fb8e23f5587e16cb8f4e02244f53fc4ddda3b07a704727a7d463bda724015f1e08273102f2aa1f165e4b9bf5be468bc7f9363fda597
-EBUILD dosfstools-4.1.ebuild 992 BLAKE2B 51e05ea5b1dadbcb7a8f751e44e858f1b3c99723f806e76aca14969f2ed2a156c21d76f38621f16da95eea5c0b98f6c7ebeb97a0648145ac13284ffaa911a595 SHA512 1539f755bea79409f8adb3e275da612fc0040bf57f6aae058431d713a98054f4da37fc2fef83d60fc76be7179ec580077482395cb356599c069995b14f9fc165
+EBUILD dosfstools-4.1.ebuild 994 BLAKE2B 8203419c4de24b235d76e59853cd494948bae42e9a2de715865c1d66040b06387c0f5a84c110ad097692ba748f8c37f0910515baafa5ffe6cd762becd1bec22c SHA512 a5ec100924c99ab2b9af1e10e1c20f5f37a0105e97e674c630c14b35ee01f2cc9e916b653f98dbd9179f0c64709467dc9fcaad1f2621a37a60f5e03867ec2650
 MISC metadata.xml 424 BLAKE2B 01d65645ef9a1e617bf40a2d401a5fd3f1444c68f41a3c64e746e445b100ebd7c8af05b48c250f4bd9c679842906dd2e9b679edc298b1001f7dfe5b183f5f77a SHA512 d82795b70fc583b8154a2c3b14b6565cff36924b91fb3888cd2b6c36d8036614be6d67a0ea0fc96f2fa4bfa5516675b8aa74571e578ad8d42c06cb9f503c565d
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index c78c0fbac6ff..5ad335273a1f 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="compat test +udev"
 
 CDEPEND="udev? ( virtual/libudev )"
diff --git a/sys-fs/e4rat/Manifest b/sys-fs/e4rat/Manifest
index 2082edfc9b41..dd9f5574c9c5 100644
--- a/sys-fs/e4rat/Manifest
+++ b/sys-fs/e4rat/Manifest
@@ -4,6 +4,6 @@ AUX e4rat-0.2.4-gcc6.patch 542 BLAKE2B 9548cb2f2fa7f7d43db35e0f97915fa2a81d63f93
 AUX e4rat-0.2.4-strdup.patch 1427 BLAKE2B 1ab2f089f346ac635a8417d9e608695e18f77d12c15cf0fa35b4c1dc1fdfca2761308e8d21b1fa2daeee83e82f9f893a9d4e014e77538c3d345b2cca4b85676a SHA512 62d2b4b2b5e8a9b309b920d20fee98057f7e7564cf86e01f8d4cbd3219b47caf7d78ddfe71b01fde46997bb8966e2ce76df4d32ec6ab9a6190a1351bc2faf6cc
 AUX e4rat-0.2.4-sysmacros.patch 288 BLAKE2B de96b8e8dc03359e2eda1357dcd76233ac9a7a5e6a6c8f2c187372e5dcfeccc3eb89d8aa349a0a07e2fc7ab59320428b46c3dcd5c45c0eb2433bfdc63355806f SHA512 50883828bf95368c31c620fac46728c6bfaf768a794158b30614cb2c0b7a65ee82e8bcf12268a26de93e87fb6b0466bc93e29a7dd69895234693745e24a6da59
 DIST e4rat-0.2.4_pre20141201.tar.xz 60408 BLAKE2B 4ebedfcca7f21bb1f3be59dac64694e0f69ecb5ebdc1637210c68097178e2ae38959581a51fc55b8773d63ce629aaf69765bb755d45467bf5e4f4e741b715101 SHA512 61a53f6ac420392df5894d3f76de28c5d2e33fd3a6548cf8c9de52818bf937ba8bf8629db1b89103faa73b660548d7e467e17d7f2794a4100ca07971ded0cfb9
-EBUILD e4rat-0.2.4_pre20141201-r1.ebuild 1612 BLAKE2B f7f869ffdb4bfa28f7e6ba61b1466934ce7c5dec84d0aba68a8e4c4a522afd4db1018a0cd9de8becf88bfe2f3f1182403969152ba0fe565df1aeb79026f721c3 SHA512 889c80b66c54fc1377c4ccc66608093fc09e0e389acf56b0ad9fa69c2cf1c8d8fafc39a612cb76530fb67087698b3c3543fcd40fe9b3420677ed5fd85dc5e793
+EBUILD e4rat-0.2.4_pre20141201-r1.ebuild 1608 BLAKE2B 018441bbd55cb869cd9f3c021612c89c7b4a35c059802784328f223e0a444a978557e777714341b8aafb96862aa83ffdc6e62cc81a5217d2ad1bf07bb26ae1dc SHA512 727fd43369000df0729bd8fcd5aa7c19160dd736ca377c733f3b5177936b7491b23d7874f6b52572753602067be01d78608851b06f41e95be033a8be44637659
 EBUILD e4rat-0.2.4_pre20141201.ebuild 1570 BLAKE2B 06e9c1ab5fb57790f0d95e2d6a0d245892903b9d3cc7aaa53bf1c4e730a04a515681e90875b761fb3dbe7ed14be5f63654c9a3fa76bd58cf8bc4c6f07240beae SHA512 9f8fcdeea6541af1f20487920fdb3d11e3ab2dbda7a8b7ecf284492a48338e264616a475442ce765c937c7f2d44b2b2f277d0a8fc73021f7fa7391fa7e92c21e
 MISC metadata.xml 325 BLAKE2B fbbaf2b12226db46c1204d826d2e47f3ff4d77c6aeaafcc299011c9ca93b4d44af769766c95c3f074047ed4d6e6d043844ac4f4f1728e7bb060238dd88f32cc1 SHA512 3630260f53b5922cd23604a77495370f77cef226d9ca2ba42b31f3ed342f53f9f00c5c4a22eb2f9041dde577f612f8ba2ea9af1a649d105f52c1d15b41a0d516
diff --git a/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild b/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
index b7a6e6d7662a..20bfb662e0dc 100644
--- a/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
+++ b/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${PN}-0.2.4_pre20141201.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 3fa7fe08cf16..11d06e4fb5df 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -4,6 +4,6 @@ DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c776
 DIST f2fs-tools-1.11.0.tar.gz 278795 BLAKE2B 8faefb1554283291ad2dc2b66800b88bbdcf07dcb1896a206fd56d52eaa19761c6b008a4961bcec12843a96d2df1744bb5394b4f7bf3830315f4bd3180850e8d SHA512 a69fbd01826909576634f40343293addae3a9c3be09bf8210e2abc1ae12f385fe24dd71c623d14a0a15a81d12f404f193981caaadacbd663bc1502de9a8f7fb7
 DIST f2fs-tools-1.6.1.tar.xz 282152 BLAKE2B f8535a5415e012834b749bba2123151d8a39c8fa757905c45be20478d6a795ff64dfbcf0cf9679f2bd70cb1d92717d8df70efb4beb4d749677a6c8758ebdde0e SHA512 108327042079d9e864899a20f2dd94019be1b957fd7ffa295af097c5b93a5065ea9c36de9bae83f84a6412ac496340849fc44de041e24461a2919073eed15cf2
 EBUILD f2fs-tools-1.10.0.ebuild 789 BLAKE2B 0680b935d90f332dc60206b041008379cd9b16afcd6c8abb69ad2b66cd715ad4cc72e72fbdf8a19e570aa1851a5ca69338f38de7ae51eea0d6becc6a4b2e5b77 SHA512 8c5f8da38251d75da53783dd47b904c53e5dd0fd054089c7338859e71ebacba47894b2d597ed171a000e33675975e1b23bac20a78f8c88de40fbe5904f24ecd4
-EBUILD f2fs-tools-1.11.0-r1.ebuild 787 BLAKE2B 44e10e6e57bca8c3844886bd46dce89c8f1466665bc445f2c160c45eea112842288464edbcc7743557688a1010c61eb3d31ab6b88ebef311188251f82cb2346a SHA512 0579edf3680740c3f6cce1c3d50153ee40ccad3132423a6dd195ccb5ec15e4ce7ef60d36f96381310783e88e89dd8064b77583eaaadc764c35ee93dd776bea50
+EBUILD f2fs-tools-1.11.0-r1.ebuild 779 BLAKE2B 98b962936657814d59a229304d966362efde637a62e879adecf35acdce778d22fe0eb6059985cc31db9087d8e879e72d4ac33a7d1e3daf6a8ee83eb714ae4d64 SHA512 09849f743eb3db3eb1bc8ffa8cee82708d44a5d78ca1845c59b88a9bbd8ef8c3c20ee0beb91b4be498088d82b80dba9cd98f296eeca383b5ca8fc8259e6b8b6b
 EBUILD f2fs-tools-1.6.1.ebuild 737 BLAKE2B fd513f95c8c154cf24f3cf74483a7c0c9fb6094780234c6eda83af63ae66c9c7d059bf0aec26e902aff8c782ae44fdcbc9989852450d07b0b99d21b9fda12225 SHA512 a303cc13d4fee5657d93008d9d189dfcfed920bc80e6f4e383d751e29f83745659ee23d8917abddc733a1f2ed66d991c8b9a10aa93ac2134e7e164899a789d22
 MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild
index 700844feff8d..7d9f76759f8b 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sys-libs/libselinux )"
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index f2d65f4af4e1..4c67acc6ea72 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,3 +1,5 @@
 DIST fatsort-1.4.2.439.tar.xz 41852 BLAKE2B 30ffc8575ca50a71c09c5f90e658a150ece34a9bed664696d8969ccbe4c3cb1b0130d830990e259889fab331ccf0c35e3f0aa3401628fdff3e04acbb7d0b53dd SHA512 c51b5316b34e1a74e2a8d1c625716fd022d32e40a92ef56b88fbc940b5e6dd6c978b733f180477e8b5b3235b46cd16eb74798c5aadd45de9ead1f1bafdf52fee
+DIST fatsort-1.5.0.456.tar.xz 56100 BLAKE2B 996f144c67a2311ef9962b06e776d0a0c8897814383e50c9f48f5af0bc800159ee34c10d9f8d51dae5160844dfe9fcbc4b56bb9883cbdb0402a0ea20198fc1d6 SHA512 fe9d8108494fd64da730ec40882582fc16a89e76a5ba4e8040d03a3dbbf12c525904abe24814337713f5f1d15c72e8321b27fad69db816c073a96fbfd15ea486
 EBUILD fatsort-1.4.2.ebuild 794 BLAKE2B c84ad6c26cf1ef2c014c02083cb133d6870189ff5b613c679663b9f41f0fc5d7c610b2f7c8453b442b078c06cee609acacb2b0f847f24dd8713ed2ecbe0b2722 SHA512 b5ccb6f60d1ed3aaebfc3eebefa6fc5169a7cded74dc4e4af76f907a2f4ba9080782d25802a282e2b77902c999be148edf2e210588e781e04706c86b21783c0d
+EBUILD fatsort-1.5.0.ebuild 793 BLAKE2B 964806771eceb19bce520a8d10b8ebe1350789b596387892af3ff67b7a585aecff3b4d3da13da24df7ec6985d1b2aedf69956eb8a28c1ee6b07ff3b111a9b704 SHA512 f8e17b99640ac6cda32fd5e025298ed1d287e34d11d5c39028ee858125e198603a3657f6322674157ffbd8fd1be55960e86266b2ee63df8ad69e81d908426fad
 MISC metadata.xml 738 BLAKE2B b4ae8042af9b7a74705b42322ffcfba47aa18e3cb1bee693ff2db3fecb6555d516ec9a3f4746643ef37007e9d1b44ea79d5fa0e4bc12b6ca4ba813129d208dcd SHA512 42cb5be41b29129b17ea55591d352872ccd6078705068c6899d4f1f5a5b99ab5f6809e75ee6b49bd6b536f6b66632ce9e1859f4bbad764b966d5520a8aa5a228
diff --git a/sys-fs/fatsort/fatsort-1.5.0.ebuild b/sys-fs/fatsort/fatsort-1.5.0.ebuild
new file mode 100644
index 000000000000..55682645fa1e
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-1.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+SVN_REV=456
+MY_P=${P}.${SVN_REV}
+
+DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
+HOMEPAGE="http://fatsort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	sed -i -e '/^\(MANDIR=\|SBINDIR=\)/s|/usr/local|/usr|' \
+		$(find ./ -name Makefile) || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		DESTDIR="${D}"
+}
+
+src_test() {
+	# Tests require root permissions and mounting filesystems which does
+	# not work inside the ebuild environment
+	true
+}
diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index 0751a0bb7e42..e25afda0cc04 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -1,8 +1,5 @@
-AUX lsscsi-0.28-sysmacros.patch 1232 BLAKE2B 655fd3daf9da57c30b2e65632e863e9ec7794421ab86c21bd5895bd2b25edb0fc8e5635dffe7b3661c6556e061c92179ec60574948024c505bdb6393c0f272fc SHA512 d597b32f42a9616476cd54ceb7480cd34850289dd3c0fff8d0d54aad22a6fbc473613f18ab011819de7eeefb4232ad0152630a6da03cc02057b3d9eec763ac62
-DIST lsscsi-0.28.tgz 150259 BLAKE2B e8376f306c61ebcbef055ba603bf42ece4dab13bd7755a1a90df64d9d70997943e73388c5a56b182d2fa3aed7aad8afeeab9ff89dd1ae9d0178f740de701503d SHA512 6d5cf8ebc42af0d8dbe8f2a1e90f4c429d058f184027318686fd22bc117e66c0b1847e4c97964d3d0e1b7bf4a5f1e296e1e3575ed2f5ff999eef70bdfb9ea4d4
 DIST lsscsi-0.29.tgz 353116 BLAKE2B 6374410cadf7fb091f6dcc99bf9435b0af56bc603bbecdeadb76407efc5b2f6106a0fc65f9705d6dfe4cdbbd66494b8a966caffb08bb350d2e6128ee881546d9 SHA512 2c595cfc738815c9231ac078e47215ac46c1283bc8ad784a898eaef6d64f41311a9a08c96ea0dc9379bd79fe6c6ff4d2af176cea5aecaca74a0fa255746d84ad
 DIST lsscsi-0.30.tgz 190598 BLAKE2B e22000c4c03fe31f40e6e95dbb6875fdf9266cb103108dc93748d2b245f2dc7edd93da7d3bf3b176187a2d8cace78ce1f7ce8f42da1454c05d8fd308e02db3b3 SHA512 ea1ba2bd2892b7e7feff0bf08ea09ffcdc38d21e4dba2cdce598d8ffde926a5908f2d02116d692bf4747b76c76c1c35974569583cb2da75eb49553959368dc76
-EBUILD lsscsi-0.28.ebuild 424 BLAKE2B aa2f6df0b61816d547c8670bb06cd65f8f16402c3ff1c3164b905eef22565097f43383127dcf7820576527d8598bdef51687add0faf88d526666c0abd78845dd SHA512 4efed74f282adc66f35b6c2308ffea8a4d96a815a15406622eb52cf2077e3fcb9480f98b2882bc3e57127d7543ea4d36da122348dd5952f5231a9a072e1adf4f
-EBUILD lsscsi-0.29.ebuild 340 BLAKE2B 7ec2757d4b6f46bc4b80dc1de287ef6235e1c876d8c738d22fd70c9f875af3dc0fc8242875e213096b5fa1632c548734b0350259de6335c7ba5aba25903d9f47 SHA512 1dd0ebe8a4d85a1dcf1f8d85095723077f34b5bf5285cb4e24094dcd175c4be261f1338d8479dab62f7b3d2c779770ea75fd9630d92e14c44980d4b0fa568b9d
+EBUILD lsscsi-0.29.ebuild 336 BLAKE2B ba2f977431250c9ddc5ebffa2678fb336a3468d46058b76e1cdf1b0d013b6989fd29caee177896406dd86bf7822f83b1851f7d80419fc33536747fe7e00e84d9 SHA512 6bb1bb5649eb8544b3f4617f6da90ffb0cccc42174ee924e1d2154bbba9fb933e8f1e819cb75b1f8a18c776cf2927889a9bb262821edaaaaea3d9622ec7a9433
 EBUILD lsscsi-0.30.ebuild 377 BLAKE2B aac0c30fcbd3b83940dab241e9bae9b62a8e31c36bbb293aa09997ed2a7d4483e1c73e89519c79ef2b546be0726ec24b8a29a9a8b5ad50028031cd5ddc55d4ef SHA512 d437e2da55502b0dbfc524c66409a3a90c255df0b92a27fb63d49059d1b5b9e9deec473e5abd0646be8e468f9ef2183e9b9cc10494c9e8ce08dfc810b25408df
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/lsscsi/files/lsscsi-0.28-sysmacros.patch b/sys-fs/lsscsi/files/lsscsi-0.28-sysmacros.patch
deleted file mode 100644
index 099256fdcdca..000000000000
--- a/sys-fs/lsscsi/files/lsscsi-0.28-sysmacros.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/580494
-
-From 5f1d6f46c8c1ac134841cfcce22dc7639598e032 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 19 Apr 2016 03:07:23 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor
-
-These funcs are defined in sys/sysmacros.h, so include it to avoid:
-lsscsi.c: In function 'collect_dev_nodes':
-lsscsi.c:961:32: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration]
-                 cur_ent->maj = major(stats.st_rdev);
-                                ^
-lsscsi.c:962:32: warning: implicit declaration of function 'minor' [-Wimplicit-function-declaration]
-                 cur_ent->min = minor(stats.st_rdev);
-                                ^
-lsscsi.o: In function 'get_dev_node':
-lsscsi.c:(.text+0x10f0): undefined reference to 'major'
-lsscsi.c:(.text+0x1117): undefined reference to 'minor'
----
- src/lsscsi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lsscsi.c b/src/lsscsi.c
-index e494169..61cfebd 100644
---- a/src/lsscsi.c
-+++ b/src/lsscsi.c
-@@ -23,6 +23,7 @@
- #include <unistd.h>
- #include <getopt.h>
- #include <fcntl.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
--- 
-2.7.4
-
diff --git a/sys-fs/lsscsi/lsscsi-0.28.ebuild b/sys-fs/lsscsi/lsscsi-0.28.ebuild
deleted file mode 100644
index e45263a560f3..000000000000
--- a/sys-fs/lsscsi/lsscsi-0.28.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="SCSI sysfs query tool"
-HOMEPAGE="http://sg.danny.cz/scsi/lsscsi.html"
-SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580494
-}
diff --git a/sys-fs/lsscsi/lsscsi-0.29.ebuild b/sys-fs/lsscsi/lsscsi-0.29.ebuild
index f327ebdf96e8..67ee21242156 100644
--- a/sys-fs/lsscsi/lsscsi-0.29.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.29.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index b6c5b29f1c20..994e246890da 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -7,9 +7,7 @@ AUX dmtab 319 BLAKE2B 5753b72e44325e467c0e4ea1bbce8faafe1c5e2509d2e02a5ad428b39e
 AUX lvm-monitoring.initd-2.02.105-r2 963 BLAKE2B 2a193578c642e05a2a492fb025bdacd2594953405a58517bf6a93a04db29be03e16a33b2c5cd57c463f55f30fd47a4fb7766f52b149a298db4dcefed4ed30012 SHA512 dc13304e8d644a55f0490c84acc36b95f43fc0e86c4b44f85f54f6ed3213ad665454e7432b3621f307b3468af0c33525c24705f4a2783e35a26e02ff1c828779
 AUX lvm.confd-2.02.28-r2 173 BLAKE2B 4b9d115ed31b3777bd3c925b75bd0ebb186bace92b6d294e6a1ff7cdb7c206374a06738a73edc401a5547016a08721013fe3ad66b52d8cf08de75d030813ab2d SHA512 67b153cbc5c2327c15f042b3b5590c1d8fdf9823efb19c80192ac4dcf98e530efea8ecae0aaaa4a54b0e3e4907565aa21455b364df1dbe8f2e7dffa1c5d355d0
 AUX lvm.rc-2.02.105-r2 2960 BLAKE2B 40cdd0e6c3a717367fe6854524b5f355e952f2640823242e5fd18374e3a161e97fff6ce9ec7c052d25ea04f60e75cc2d89e2c48b0e218b62d917916e110c0461 SHA512 8d8ccac694110e3538aeb246244b1b129d960f35d54eb583d77e9d54bed243248b121262557fc0c69bc734a04ca35c0485428e65b1a4d06c438828a239053fae
-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 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
@@ -22,7 +20,6 @@ AUX lvm2-2.02.139-dynamic-static-ldflags.patch 2874 BLAKE2B 2a0000761b65f79cef0b
 AUX lvm2-2.02.145-mkdev.patch 4111 BLAKE2B 478c987c900c4ccfe3bb7d099b8af580f057ba6f4746644560c55e4e1a3894c617c31357e88525f728db005e8a882b2edf18576370d73eca026ee0563c02444a SHA512 f3953eb8bf73adc8d048edd2c560fad3c5afbfcee19ca354f06de2b10ea2e947c972cd180fa26cf0d3dc30b5aae8946e79faac3f3a1cfb6f31222244d308a588
 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
@@ -38,28 +35,9 @@ AUX lvmetad.initd-2.02.105-r2 287 BLAKE2B 613baa6c794a971257ea25061d51ce2923475e
 AUX lvmetad.initd-2.02.116-r3 348 BLAKE2B 6ad8f51dc6498703840a0917cdbcb5d1f179e2f8f0b2bc06f08e1c65e0dce2e63da3ca7295a8fcfc01019724bc9468d9d1338f3c2d879b4446980b5aa3e10441 SHA512 19aafd07aa6ebe3f05e321048480f746a9aafd1ad4e0323486db5c54035430f607e171d2246e91bbbf8a2a7e15278d793ad13d84e824df7af65345070483a696
 AUX lvmlockd.initd-2.02.166-r1 393 BLAKE2B 83eb337aa1069e66d7746b23141da24717303552016497d29d4df304bb174b2c380cc7c09df7b3529e355cf172150c7cf254afb984a6561e1fa3459aeed43421 SHA512 11d6f186799d8628220eccb4823e5bd251bc3c447e6c3f8a63c025dc4e08e0a7638a8439967ea2ee8a717264887597be4992afca59571ebaa651441782288081
 DIST LVM2.2.02.116.tgz 1538340 BLAKE2B 718261b60626f2eca5ba13011646bf551523ed8e59aaceceb9097221c000268b7533ac43151ff1d9229911d87e764fbdb29ffa1d305f2aae99220a68e301559a SHA512 992541339637d597257850b4ff7f5348fb7cdcccf806ac8d986a3be1ad1edc5f6bfaedeed5128690c541d1a485cdc75742e90a766363c39867901003518fb84d
-DIST LVM2.2.02.136.tgz 1891010 BLAKE2B 606900337eec96a5a124518b1cc20712763f0c79b2b3a726210e5b4ad8f775d9f5951ff12894ab7b1d8c8271febd318417a86fc3d5bb7209af40bd4c164472b9 SHA512 ebda683e7dbeb2c4860a583d47e60756d18127e37a373ab2958af8e54b9bee0d2e3370b7803d88fa4b08564345c88af55bfbac317081160118ce4b3733b69f9d
-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.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
-EBUILD lvm2-2.02.116-r5.ebuild 9797 BLAKE2B 9bdeee75bc2eb70cd6e5e6184ee73100ef5c5623d8c9de734c7bfc8cf31fafe0036ed21259edbe0d58346671147b828d5ff9bbcd4a009ec1f40318f1e1660931 SHA512 49b95949d45d7afaeb64012b771dc0bf7c16ff7b8d59cb8840b2d3df2875c1c1daf80e2918014bcde381e42220056cb9005e2f5587d0b35aca07ae4c4ac3d009
-EBUILD lvm2-2.02.116-r6.ebuild 9797 BLAKE2B 7f0e4e9afaa3eaf09fa1af01baed139ee72c2f72999fd1928a4b655f8581c3fb44d62718e21177458e7a685048ecaa6e6f9349e40d52b94b394ee684e5e0701b SHA512 614c3a457fd5d2964d9da4801c537a5b0e3860477a7403ba02c05648d145899572b41b42174c767224f8a08308937ff97db0143f963c9f9b17d7628eef60832f
 EBUILD lvm2-2.02.116.ebuild 9206 BLAKE2B 57b75864d65327f5b4b6b69cf48bd22e03d7e71757a19767f3bed0a5c0d1b0622c074ebf43f4794a2eb4d934d2dad6b5db004c1f51cdef4916bf88233ac1f481 SHA512 b687bc4adbe48a19a26581596cec343cc0d99affd8d2d1b035a4fc4ddfa0fb5557315515c13adbac7daeee70156b3bd9a4586c97a7b34fc00f2a367c3e7b447d
-EBUILD lvm2-2.02.136-r1.ebuild 9605 BLAKE2B d1f4ed3557d1b5e68cb5811898e0fda5a30bfbfd053d4612191a15404612ce4bac4d7ee318b3e4df03df2d28bc909d5449c5ad28f82cc39b50166ff4fe52e0a6 SHA512 d50d04bf8743983e600d3b2f86b2deec12154d528c7dafbf7091c9a07d0a93d9cb30dabe4b9ad74115c41a374eab1990578fd72324e562511fefcf3410b299ec
-EBUILD lvm2-2.02.136-r2.ebuild 9645 BLAKE2B 70b3842e01dc3301d29ed589337c747ca1456124a6f904f0e643cb22d83c29ce3430a9ddd30fe1e70cf23a851655356eb236786fcd1913e5f5ee1126de7f6ce4 SHA512 9f76ca5aa607fbc40e52ab77ca0bfe57cae2c54a32def22c9de7e5a4a4485cb875d6263ccb306cfb351d091df435228a2d311f520fc18aed753420065be8622b
-EBUILD lvm2-2.02.136.ebuild 9387 BLAKE2B 7c276bf2805ca9e14f4412805602ae226f3ffe02c1d317d1124cbbcb82911160747d077629cbaa1212dd27dc971d4c99d52edbe2ede6b6a887f77ba2226e8c26 SHA512 59045f50c3c71af252eb3455a496764dad79d327e989bb57546f499fe3f00a83531f505100513f0a62187872e126c3ec53e2090a0697bb63f3557175319a7474
-EBUILD lvm2-2.02.139-r1.ebuild 9645 BLAKE2B e1d9ed44c0aad39a752713329d6373102e9daf2796a5df5d28f09b3e0845791a2ca46d0990d37c4ed93c9a49f898df559ab5b190c1c46e00154c24e124416c85 SHA512 84e13facf26a8df7ff7cbb3bee6d23d9f97d7a178628c98dcfd0bb84d5e5081313786f98bfdd7332e9b29fe6324bdfac6efb77f00c2b078793e74a8a0b970db2
-EBUILD lvm2-2.02.139.ebuild 9605 BLAKE2B 015621056feebe04b17e5ab856ec0babd3463982098ede66815ec9e3e765063de55fd4b49f37618d37c168f1d7a8f5c78ddae049332898f47a4d83194d053244 SHA512 7d0367f75cc7fcb5639dca3e6eaac201392706a2bf0f548c2244c09f8106eabc1fad292fc56913d48a221c9c7cfa325376b3523f75f921e877dc4c3b624b947c
-EBUILD lvm2-2.02.145-r1.ebuild 9495 BLAKE2B a03f884dfbb56268c9d6a09187ed0267cdcfd8986906ffbe2580fa035447bdb48551de4c991088ce827a91638ecd26630f3f400cabe1d490c0c2973b8cac556d SHA512 ff2473dab88dab220b394c15f6ba401b6988c23f4d0dcc864527b428ef583e603c6984dcc58574ea3a25010ca055e7cef711c618f032623ee63edd922861fdbf
 EBUILD lvm2-2.02.145-r2.ebuild 9619 BLAKE2B 4461e5fee86d087e94fa8d64bbfe73f746ebe24839323a0048d413a8b1263cd0a39c477677f4903a4643f9395c06a9db2c8801e119ec896055840398600d4159 SHA512 77df933073cba908620b4237550cd20294f8ece45aed17da7ccf4c2f2f431136db7ec820d923781ac9249da62680924c985811e0733932598244d1837474a6d0
-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.173.ebuild 9926 BLAKE2B 5d6d1e95795def64b1f91d8ad52b091f9971802e54e4526eff16986319125ed49561598bede91f20702ece9c1db07a1cab558702b1d6369050de8168bdaa7cb6 SHA512 e25c41a2fb284ba759788538d975b2476047f64e4ad301665bfdb3c3075ccc32470085b449766e59085ef1690e9522c83b60b900a67f229b468a0c1c010b033b
-EBUILD lvm2-2.02.181.ebuild 10044 BLAKE2B eccbaefe8c4e18ededb7cb342101089f2d7bc54ed41624212df70b6f3237e773cf2c2e1d7004449503ab720c517611627425ad909be9ff580bd754fc454f5a3c SHA512 c6bb94fec0a38b342d10422229a6291227d2879b759a80decab58f54e19086fc5917da27036dc9ef111c5724e534dd3956eed24263889feabe6152d66d67aa36
+EBUILD lvm2-2.02.181.ebuild 9776 BLAKE2B 576cfc1ec1c80a3924e54b902fb19c2e5e00e3a273f1e04025e82898106dae18b24152405d469ffdf87cc3d80f09562f0f84ec49944b94708bb35d811ff9822a SHA512 927332abc99c545815974f40b063b9412dc0c9fc97ddc647092baf4ebf1783121fea1d1568ea53e9ef192dcdb87e58b261409cc13d2321ee762a3ba5e3d9b40c
 MISC metadata.xml 1397 BLAKE2B fb780193c777b248648d09cc4c0f287f07b64df79912a4c1c37b5c456f8fc8ea98470c03501619432bddb5df1e3f877178a0c7e630b295a01a3bfc27fa63520e SHA512 1ed97dbef323b6703097c20de99e9003c88663a887bcf87c9489baddfa180aa3d8645e4e60cd3eb3b9505603997ac3ab98a7ee96a813b77b9dc25862dd332d35
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.116-r4 b/sys-fs/lvm2/files/lvm.rc-2.02.116-r4
deleted file mode 100644
index 74b4a41b9ea0..000000000000
--- a/sys-fs/lvm2/files/lvm.rc-2.02.116-r4
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-_get_lvm_path() {
-	local lvm_path=
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	echo "${lvm_path}"
-}
-
-_need_lvmetad()
-{
-	local lvm_path="$(_get_lvm_path)"
-	[ ! -x "${lvm_path}" ] && return 1
-	${lvm_path} dumpconfig global | grep -q 'use_lvmetad=1'
-}
-
-depend() {
-	before checkfs fsck
-	after modules device-mapper
-	# We may use lvmetad based on the configuration. If we added lvmetad
-	# support while lvm2 is running then we aren't dependent on it. For the
-	# more common case, if its disabled in the config we aren't dependent
-	# on it.
-	config /etc/lvm/lvm.conf
-	local _need=
-	if service_started; then
-		_need=$(service_get_value need)
-	else
-		if _need_lvmetad; then
-			_need="${_need} lvmetad"
-		fi
-	fi
-	need sysfs ${_need}
-}
-
-config='global { locking_dir = "/run/lock/lvm" }'
-
-dm_in_proc() {
-	local retval=0
-	for x in devices misc ; do
-		grep -qs 'device-mapper' /proc/${x}
-		retval=$((${retval} + $?))
-	done
-	return ${retval}
-}
-
-start() {
-	# LVM support for /usr, /home, /opt ....
-	# This should be done *before* checking local
-	# volumes, or they never get checked.
-
-	# NOTE: Add needed modules for LVM or RAID, etc
-	#       to /etc/modules.autoload if needed
-	lvm_path="$(_get_lvm_path)"
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		eerror "Cannot find lvm binary in /sbin or /bin!"
-		return 1
-	fi
-	if [ -z "${CDBOOT}" ] ; then
-		if [ -e /proc/modules ] && ! dm_in_proc ; then
-			modprobe dm-mod 2>/dev/null
-		fi
-		if [ -d /proc/lvm ] || dm_in_proc ; then
-			ebegin "Setting up the Logical Volume Manager"
-			#still echo stderr for debugging
-			lvm_commands="#! ${lvm_path} --config '${config}'\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}pvscan\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgscan --mknodes\n"
-			# And turn them on!
-			lvm_commands="${lvm_commands}vgchange --sysinit -a ly\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 to setup the LVM"
-		fi
-	fi
-}
-
-start_post()
-{
-	# Save if we needed lvmetad
-	if _need_lvmetad; then
-		service_set_value need lvmetad
-	fi
-}
-
-stop() {
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		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)
-
-        if [ "$VGS" ]
-        then
-            ebegin "  Shutting Down LVs & VGs"
-			#still echo stderr for debugging
-			lvm_commands="#! ${lvm_path} --config '${config}'\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgchange --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
-
-	einfo "Finished shutting down the Logical Volume Manager"
-	return 0
-fi
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.166-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.166-r2
deleted file mode 100644
index 11329bbeaf33..000000000000
--- a/sys-fs/lvm2/files/lvm.rc-2.02.166-r2
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-_get_lvm_path() {
-	local lvm_path=
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	echo "${lvm_path}"
-}
-
-_need_lvmetad()
-{
-	local lvm_path="$(_get_lvm_path)"
-	[ ! -x "${lvm_path}" ] && return 1
-	${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmetad=1'
-}
-
-_need_lvmlockd()
-{
-	local lvm_path="$(_get_lvm_path)"
-	[ ! -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
-	# We may use lvmetad based on the configuration. If we added lvmetad
-	# support while lvm2 is running then we aren't dependent on it. For the
-	# more common case, if its disabled in the config we aren't dependent
-	# on it.
-	config /etc/lvm/lvm.conf
-	local _need=
-	if service_started; then
-		_need=$(service_get_value need)
-	else
-		if _need_lvmetad; then
-			_need="${_need} lvmetad"
-		fi
-		if _need_lvmlockd; then
-			_need="${_need} lvmlockd"
-		fi
-	fi
-	need sysfs ${_need}
-}
-
-config='global { locking_dir = "/run/lock/lvm" }'
-
-dm_in_proc() {
-	local retval=0
-	for x in devices misc ; do
-		grep -qs 'device-mapper' /proc/${x}
-		retval=$((${retval} + $?))
-	done
-	return ${retval}
-}
-
-start() {
-	# LVM support for /usr, /home, /opt ....
-	# This should be done *before* checking local
-	# volumes, or they never get checked.
-
-	# NOTE: Add needed modules for LVM or RAID, etc
-	#       to /etc/modules.autoload if needed
-	lvm_path="$(_get_lvm_path)"
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		eerror "Cannot find lvm binary in /sbin or /bin!"
-		return 1
-	fi
-	if [ -z "${CDBOOT}" ] ; then
-		if [ -e /proc/modules ] && ! dm_in_proc ; then
-			modprobe dm-mod 2>/dev/null
-		fi
-		if [ -d /proc/lvm ] || dm_in_proc ; then
-			ebegin "Setting up the Logical Volume Manager"
-			#still echo stderr for debugging
-			lvm_commands="#! ${lvm_path} --config '${config}'\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}pvscan\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgscan --mknodes\n"
-			# And turn them on!
-			lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n"
-			if _need_lvmlockd; then
-				# Start lockd VGs as required
-				lvm_commands="${lvm_commands}vgchange --lock-start --lock-opt auto\n"
-			fi
-			# 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 to setup the LVM"
-		fi
-	fi
-}
-
-start_post()
-{
-	# Save if we needed lvmetad
-	if _need_lvmetad; then
-		service_set_value need lvmetad
-	fi
-}
-
-stop() {
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		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)
-
-        if [ "$VGS" ]
-        then
-            ebegin "  Shutting Down LVs & VGs"
-			#still echo stderr for debugging
-			lvm_commands="#! ${lvm_path} --config '${config}'\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgchange --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
-
-	einfo "Finished shutting down the Logical Volume Manager"
-	return 0
-fi
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-2.02.172-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.172-static-pkgconfig-libs.patch
deleted file mode 100644
index e25cb760ea89..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.172-static-pkgconfig-libs.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.172.orig/configure.in LVM2.2.02.172/configure.in
---- LVM2.2.02.172.orig/configure.in	2017-06-28 08:54:27.000000000 -0700
-+++ LVM2.2.02.172/configure.in	2017-07-09 14:58:11.933777531 -0700
-@@ -1324,6 +1324,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
-@@ -1372,6 +1373,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,
-@@ -1653,19 +1655,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
- 
- ################################################################################
-@@ -2011,6 +2026,7 @@
- ################################################################################
- AC_SUBST(APPLIB)
- AC_SUBST(AWK)
-+AC_SUBST(BLKID_STATIC_LIBS)
- AC_SUBST(BLKID_PC)
- AC_SUBST(BUILD_CMIRRORD)
- AC_SUBST(BUILD_DMEVENTD)
-@@ -2125,6 +2141,7 @@
- AC_SUBST(SALCK_CFLAGS)
- AC_SUBST(SALCK_LIBS)
- AC_SUBST(SELINUX_LIBS)
-+AC_SUBST(SELINUX_STATIC_LIBS)
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-@@ -2140,6 +2157,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)
-diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.172.orig/make.tmpl.in LVM2.2.02.172/make.tmpl.in
---- LVM2.2.02.172.orig/make.tmpl.in	2017-06-28 08:54:28.000000000 -0700
-+++ LVM2.2.02.172/make.tmpl.in	2017-07-09 14:56:38.262933483 -0700
-@@ -53,7 +53,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@
-@@ -68,10 +68,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@
- VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
- TESTING = @TESTING@
- 
diff --git a/sys-fs/lvm2/lvm2-2.02.116-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r1.ebuild
deleted file mode 100644
index 7bf32bb4ee63..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.116-r1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
-	systemd? ( udev )"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline: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
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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_systemd_units install_systemd_generators install_tmpfiles_configuration"
-	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.105-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.105-r2 lvmetad
-	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.116-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild
deleted file mode 100644
index b75896fd51a0..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
-	systemd? ( udev )
-	clvm? ( !systemd )"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline: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
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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.105-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.105-r2 lvmetad
-	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.116-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r4.ebuild
deleted file mode 100644
index a57c5a4e6c59..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.116-r4.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
-	systemd? ( udev )
-	clvm? ( !systemd )"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline: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? (
-		app-arch/cpio
-		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
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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.116-r4 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 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."
-	ewarn
-	ewarn "After enabling or disabling lvmetad in /etc/lvm/lvm.conf you must"
-	ewarn "run the following to update the init script dependencies: "
-	ewarn "# rc-update -u"
-}
-
-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.116-r5.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r5.ebuild
deleted file mode 100644
index edc9aaf28c12..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.116-r5.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
-	systemd? ( udev )
-	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= )
-	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? (
-		app-arch/cpio
-		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
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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.116-r4 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 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."
-	ewarn
-	ewarn "After enabling or disabling lvmetad in /etc/lvm/lvm.conf you must"
-	ewarn "run the following to update the init script dependencies: "
-	ewarn "# rc-update -u"
-}
-
-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.116-r6.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r6.ebuild
deleted file mode 100644
index 7bfc87028dc8..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.116-r6.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
-	systemd? ( udev )
-	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= )
-	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? (
-		app-arch/cpio
-		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
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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.116-r6 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 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."
-	ewarn
-	ewarn "After enabling or disabling lvmetad in /etc/lvm/lvm.conf you must"
-	ewarn "run the following to update the init script dependencies: "
-	ewarn "# rc-update -u"
-}
-
-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.136-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.136-r1.ebuild
deleted file mode 100644
index 850400f1e6d5..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.136-r1.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
-	systemd? ( udev )
-	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= )
-	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
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.129-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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.105-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.105-r2 lvmetad
-	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.136-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.136-r2.ebuild
deleted file mode 100644
index 033673bad6d7..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.136-r2.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
-	systemd? ( udev )
-	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= )
-	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
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.129-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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.116-r6 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 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.136.ebuild b/sys-fs/lvm2/lvm2-2.02.136.ebuild
deleted file mode 100644
index 27ff76be110b..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.136.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
-	systemd? ( udev )
-	clvm? ( !systemd )"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline: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
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.129-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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.105-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.105-r2 lvmetad
-	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.139-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.139-r1.ebuild
deleted file mode 100644
index f53818cede0b..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.139-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
-	systemd? ( udev )
-	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= )
-	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
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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.116-r6 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 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.139.ebuild b/sys-fs/lvm2/lvm2-2.02.139.ebuild
deleted file mode 100644
index 6c0d688e3f0b..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.139.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
-	systemd? ( udev )
-	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= )
-	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
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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.105-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.105-r2 lvmetad
-	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.145-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r1.ebuild
deleted file mode 100644
index cb4b2497860d..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.145-r1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2016 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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
-	systemd? ( udev )
-	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= )
-	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
-)
-
-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} )
-	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 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.105-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.105-r2 lvmetad
-	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.145.ebuild b/sys-fs/lvm2/lvm2-2.02.145.ebuild
deleted file mode 100644
index 342b7c910666..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.145.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
-	systemd? ( udev )
-	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= )
-	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}
-
-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() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
-
-	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
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
-
-	# 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="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-	use device-mapper-only && myconf="${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="${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="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	if use thin; then
-		myconf="${myconf} --with-thin=internal --with-cache=internal"
-		local texec
-		for texec in check dump repair restore; do
-			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
-			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
-		done
-	else
-		myconf="${myconf} --with-thin=none --with-cache=none"
-	fi
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${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="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${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 systemd udev-systemd-background-jobs) \
-		"$(systemd_with_unitdir)" \
-		${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.105-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.105-r2 lvmetad
-	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.166-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild
deleted file mode 100644
index 52adb6bb332c..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild
+++ /dev/null
@@ -1,298 +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.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} )
-
-	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 lockd-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.166.ebuild b/sys-fs/lvm2/lvm2-2.02.166.ebuild
deleted file mode 100644
index b8cb4920dfde..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.166.ebuild
+++ /dev/null
@@ -1,291 +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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
-	systemd? ( udev )
-	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= )
-	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.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} )
-	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 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.116-r6 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 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.173.ebuild b/sys-fs/lvm2/lvm2-2.02.173.ebuild
deleted file mode 100644
index 64a75336d322..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.173.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
index 9e8a0dfcb8fa..749cef8bdd56 100644
--- a/sys-fs/lvm2/lvm2-2.02.181.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.181.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/"
@@ -12,8 +12,8 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 )
+IUSE="readline static static-libs systemd clvm cman corosync lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm2create_initrd !openais !sanlock !thin )
 	systemd? ( udev )
 	clvm? ( !systemd )"
 
@@ -120,61 +120,53 @@ src_prepare() {
 	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; }
+	if ! use thin ; then
+		sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
+	fi
 
 	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 )
+	local myeconfargs=()
 
 	# 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"
+	myeconfargs+=(
+		$(use_enable !device-mapper-only dmeventd)
+		$(use_enable !device-mapper-only cmdlib)
+		$(use_enable !device-mapper-only applib)
+		$(use_enable !device-mapper-only fsadm)
+		$(use_enable !device-mapper-only lvmetad)
+		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
+
 		# 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)
+		$(usex static --enable-static_link '')
+
+		# dmeventd requires mirrors to be internal, and snapshot available
+		# so we cannot disable them
+		--with-mirrors="$(usex device-mapper-only none internal)"
+		--with-snapshots="$(usex device-mapper-only none internal)"
+
+		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+		$(usex hppa --disable-o_direct '')
+	)
 
-	# 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 )
+		myeconfargs+=( --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} )
+			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
+			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
 		done
 	else
-		myconf+=( --with-thin=none --with-cache=none )
+		myeconfargs+=( --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} )
+		myeconfargs+=( --with-cluster="$(usex static internal shared)" )
 		# 4-state! Make sure we get it right, per bug 210879
 		# Valid options are: none, cman, gulm, all
 		#
@@ -191,35 +183,35 @@ src_configure() {
 		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 )
+		myeconfargs+=( --with-clvmd=${clvmd} )
+		myeconfargs+=( --enable-lvmlockd-dlm )
 	else
-		myconf+=( --with-clvmd=none --with-cluster=none )
+		myeconfargs+=( --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[@]} \
+	myeconfargs+=(
+		$(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)"
 		CLDFLAGS="${LDFLAGS}"
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -273,7 +265,7 @@ src_install() {
 		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
+		rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
 	fi
 
 	if use lvm2create_initrd; then
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 3b3c6815677b..8c06e515b480 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,13 +1,9 @@
-AUX lxcfs-2.0.4-fusermount-path.patch 380 BLAKE2B b69b1d6e74cd434b18fb762aabd8db27f747eeceec7f137c13b0f42a9c445cb12019d21b551bedac815b1fd635d49c3f510b3adee72fb78dd6976ae1ed41a4bd SHA512 ce2f250cc6e8430dd928615d23a37edd136d559e42d2a695222372a2c4300d85753ddb6cc9d0b7a55d34f6f8a01bcf1951fdc815788cb5832bc59385cda43426
-AUX lxcfs-2.0.4.initd 533 BLAKE2B 261fc441f57030f879cb3f74920842c4dfb057f6cf437e37ca8e074122910a9a48185693d15b0949ca79a685a486d30dba04492d162a87d111ec5f06022923f3 SHA512 9c53354c9c11189e488baa396817cf5182be2c082e40ba458dc7b55b79e30a7ee0415ed319539e7f1ebc4df36530119935c88956d61b22071a65bc4ab412f71a
-AUX lxcfs-2.0.6-fusermount-path.patch 380 BLAKE2B b69b1d6e74cd434b18fb762aabd8db27f747eeceec7f137c13b0f42a9c445cb12019d21b551bedac815b1fd635d49c3f510b3adee72fb78dd6976ae1ed41a4bd SHA512 ce2f250cc6e8430dd928615d23a37edd136d559e42d2a695222372a2c4300d85753ddb6cc9d0b7a55d34f6f8a01bcf1951fdc815788cb5832bc59385cda43426
-AUX lxcfs-2.0.6.initd 533 BLAKE2B f049d6cb7b9d32de8b0bc550d8ba259a18ac230c4ce5f33f7f9a530afc312df09a8a5e39a4e98f5e88693a30ec4fade89e9764ffd9ea5663a82c2724d56e6fc7 SHA512 6e52dedcc36d6db4529b796a4a881fd3966b165d2cefc6a64c638bd06b1b2ee29323e91ee2dd92d6b855e8ec6dd7c1e3d2c25af7dd047dae23ca817781cad5fc
 AUX lxcfs-3.0.0-fusermount-path.patch 380 BLAKE2B b69b1d6e74cd434b18fb762aabd8db27f747eeceec7f137c13b0f42a9c445cb12019d21b551bedac815b1fd635d49c3f510b3adee72fb78dd6976ae1ed41a4bd SHA512 ce2f250cc6e8430dd928615d23a37edd136d559e42d2a695222372a2c4300d85753ddb6cc9d0b7a55d34f6f8a01bcf1951fdc815788cb5832bc59385cda43426
 AUX lxcfs-3.0.0.initd 533 BLAKE2B dc9bafd1256ba1e07d774d4629d489c8c073df7e3b57e18e809f97ddc4493cbda1a43594768184906f3f9fac6f9548b00be66d2eff2c2093e41375fe6a34ca5e SHA512 f2347bba95eea6b28f1e0e4bef7bd71ae2ee0283aae73efe57574dbbcd57839235190b460dc853924be84b58ba88e943dc222f538b75daa0fba788a1f1d74a27
-DIST lxcfs-2.0.4.tar.gz 52639 BLAKE2B 4ef8509b05ac98338003801afeb67a15fcfd1270f90e7b5d1970c4171b9296b77e116f91ec29ec29f3feb0e03c5f2ddf49d014824869aa6cf9897441ebac17a3 SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90
-DIST lxcfs-2.0.6.tar.gz 62632 BLAKE2B 2bc76de0a7e2657b0d73e79260bfaf5a1ba070a4571d81a7c26d3637fc93937c824496119ff32fbfa56b6f97deca4bb145a952862aff148932531c489eea57a9 SHA512 52baf15eb9dc2b694085635f7d8e5c6f1207099173cda607d758b8837a720e4808cacbf83f900a6734d3260d34abafbebdcbb0618cb3cf67c5d304f50d66244d
+AUX lxcfs-3.0.2-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6
+AUX lxcfs-3.0.2.initd 536 BLAKE2B 273704e8b23ca463d77515c7605f32d0fd9910e6875e28011714e80a9d94dcca5f82668cdd53e8bfa3a62ed2ec64184a99d5187f7cfad7b92e079d13eca3408c SHA512 0abb3d93e77571d3cf319ba5ac2b8e0b2ba3bda4571a8f11f6220310b595cc9f560acbaca941fb0bb25b0c2a3061981c58b9864fd1e135ffc83f8ae8d9008bcc
 DIST lxcfs-3.0.0.tar.gz 49219 BLAKE2B c21cd9983e9175bf3a31bafd8a29ddd6a6a549226bd432636dd4ea48bf6268c403f236ca39739a989cd89fa7b0b05043c179ca328fd739f5a9d56e27907a7a60 SHA512 99fe11e99c2e487d6ecd9a8484be6413563ddcb33740631ee6fe1b60d3d2d62cea1bb44d1ef6dc45283f5b3d20cd680d48ea3cb5ad17f0c3e7ba6ed56186c42f
-EBUILD lxcfs-2.0.4.ebuild 1671 BLAKE2B dbad405edfa6be804e89a2a602ec1b7eb02b997b59a7b5b7fe150b825722d4489d577c9fd2dd791c8f90ffb5cbd94360ce847bd16b4bd5eeefaf00183a86fc7c SHA512 ffa8a2fd888dcf313f66facfd5c6035bb969876d30121ec56c6fcdd2ca384673b464fa4c8f6356d7a08f6896ad394a1ba8573ee9f142bc484c5f6dd5ed3da92d
-EBUILD lxcfs-2.0.6.ebuild 1671 BLAKE2B 967bd63d82b88165755c2a24c8c755aeae04a126d8eb86412a4742b69a03d91dfb74e0f776008c45caeba9b2016377df133dfad592fe982de0666f2c45b2f6a4 SHA512 6de43babc7b874a71e1691713a51ea5e5721a9d94371bee396130d262186fa7935e0a48d9f12d098963e4111720decd58003bf042d80ef0abdfca4d86f5f1512
-EBUILD lxcfs-3.0.0.ebuild 1882 BLAKE2B 7d354696ab1c6852185ebb7320ac396fdf12621b1e33d843cebdbb43b6316592629f7f8840e581692c1d9b3f005d28ba77e2d753c93ec54b2720e96f4642bbf4 SHA512 21fe8da3824fad50dd0d297449ed50d9ffd998607f7321f53e200c8d742bc280228ac2be3bc44ed04c0a9e2d0cbead66327d6ad4373fa66bd2c7149f9a14809b
+DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218
+EBUILD lxcfs-3.0.0.ebuild 1878 BLAKE2B 5fd90ffb93644ebf06bfd7f434effad86feb4b2773b8533af4575fde37e14a415abac7980b10f82d0368596bf7a07cd4a1af1d3574e125f7ffad1b9189d54680 SHA512 daa74fcc99c892df783b496eb0d2a38fa4a751610474f6a89c2e543d02f86c4fe7332766c9d686dcec8d4ee832a4a79207f26ded3ce525d2df06b735d4b23083
+EBUILD lxcfs-3.0.2.ebuild 1736 BLAKE2B 32ca0319b2a10bf6c352be5fe5c53e940a7f696d8a00777f6b29a1bd6e02e6bb38c8439e43f929837eb293d6363aad84a5383658228bf9aa8242018dae13fc97 SHA512 1aae443c01905892150204331ca79ed3312292195b64e76febe315c14ebb801833756cc8933c60b1bba1068d5e80e78a2e3741b8d4379345925609c74a35800d
 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch
deleted file mode 100644
index 61d3494fb7f3..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig	2016-07-11 01:18:57.688074437 +0000
-+++ /config/init/systemd/lxcfs.service	2016-07-11 01:19:48.516477185 +0000
-@@ -7,7 +7,7 @@
- ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
- 
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.4.initd b/sys-fs/lxcfs/files/lxcfs-2.0.4.initd
deleted file mode 100644
index dd556894b7fc..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.4.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
-    ebegin "Starting lxcfs"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      -- \
-		      -f -o allow_other /var/lib/lxcfs
-
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping lxcfs"
-    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-    eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch
deleted file mode 100644
index 61d3494fb7f3..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig	2016-07-11 01:18:57.688074437 +0000
-+++ /config/init/systemd/lxcfs.service	2016-07-11 01:19:48.516477185 +0000
-@@ -7,7 +7,7 @@
- ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
- 
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.6.initd b/sys-fs/lxcfs/files/lxcfs-2.0.6.initd
deleted file mode 100644
index dfc5725f693f..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.6.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
-    ebegin "Starting lxcfs"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      -- \
-		      -f -o allow_other /var/lib/lxcfs
-
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping lxcfs"
-    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-    eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch
new file mode 100644
index 000000000000..99a5addf1d10
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch
@@ -0,0 +1,15 @@
+--- /config/init/systemd/lxcfs.service.orig	2018-10-13 17:24:46.534035126 -0500
++++ /config/init/systemd/lxcfs.service	2018-10-13 17:25:33.007034294 -0500
+@@ -5,10 +5,10 @@
+ Documentation=man:lxcfs(1)
+ 
+ [Service]
+-ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
++ExecStart=/usr/bin/lxcfs -o allow_other,nonempty /var/lib/lxcfs/
+ KillMode=process
+ Restart=on-failure
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+ Delegate=yes
+ 
+ [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.2.initd b/sys-fs/lxcfs/files/lxcfs-3.0.2.initd
new file mode 100644
index 000000000000..52d8202d7ac3
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-3.0.2.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+    ebegin "Starting lxcfs"
+
+    start-stop-daemon --start \
+		      --pidfile ${PIDFILE} \
+		      --exec ${DAEMON} \
+		      --background \
+		      --make-pidfile \
+		      -- \
+		      -o allow_other,nonempty /var/lib/lxcfs
+
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping lxcfs"
+    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+    eend $?
+}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.4.ebuild b/sys-fs/lxcfs/lxcfs-2.0.4.ebuild
deleted file mode 100644
index 82ea9915b320..000000000000
--- a/sys-fs/lxcfs/lxcfs-2.0.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd vcs-snapshot versionator
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-else
-	# e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
-	UPSTREAM_PV=$(replace_version_separator 3 '.' )
-	SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-IUSE="pam"
-
-# Omit all dbus.  Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
-	dev-libs/glib:2
-	sys-fs/fuse
-	virtual/pam
-"
-DEPEND="
-	sys-apps/help2man
-	${RDEPEND}
-"
-PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
-
-src_prepare() {
-	default
-	./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
-	use pam || pamflag="--with-pamdir=none"
-
-	# Without the localstatedir the filesystem isn't mounted correctly
-	econf --localstatedir=/var ${pamflag}
-}
-
-# Test suite fails for me
-# src_test() {
-# 	emake tests
-# 	tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
-	default
-	dodir /var/lib/lxcfs
-	newinitd "${FILESDIR}"/${P}.initd lxcfs
-	systemd_dounit config/init/systemd/lxcfs.service
-}
-
-pkg_preinst() {
-	# In an upgrade situation merging /var/lib/lxcfs (an empty dir)
-	# fails because that is a live mountpoint when the service is
-	# running.  It's unnecessary anyway so skip the action.
-	[[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
-}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.6.ebuild b/sys-fs/lxcfs/lxcfs-2.0.6.ebuild
deleted file mode 100644
index bc296b6a704e..000000000000
--- a/sys-fs/lxcfs/lxcfs-2.0.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd vcs-snapshot versionator
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-else
-	# e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
-	UPSTREAM_PV=$(replace_version_separator 3 '.' )
-	SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-IUSE="pam"
-
-# Omit all dbus.  Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
-	dev-libs/glib:2
-	sys-fs/fuse
-	virtual/pam
-"
-DEPEND="
-	sys-apps/help2man
-	${RDEPEND}
-"
-PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
-
-src_prepare() {
-	default
-	./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
-	use pam || pamflag="--with-pamdir=none"
-
-	# Without the localstatedir the filesystem isn't mounted correctly
-	econf --localstatedir=/var ${pamflag}
-}
-
-# Test suite fails for me
-# src_test() {
-# 	emake tests
-# 	tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
-	default
-	dodir /var/lib/lxcfs
-	newinitd "${FILESDIR}"/${P}.initd lxcfs
-	systemd_dounit config/init/systemd/lxcfs.service
-}
-
-pkg_preinst() {
-	# In an upgrade situation merging /var/lib/lxcfs (an empty dir)
-	# fails because that is a live mountpoint when the service is
-	# running.  It's unnecessary anyway so skip the action.
-	[[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
-}
diff --git a/sys-fs/lxcfs/lxcfs-3.0.0.ebuild b/sys-fs/lxcfs/lxcfs-3.0.0.ebuild
index 1e619383c4cd..a16a47a4d9fb 100644
--- a/sys-fs/lxcfs/lxcfs-3.0.0.ebuild
+++ b/sys-fs/lxcfs/lxcfs-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ else
 	# e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
 	UPSTREAM_PV=$(replace_version_separator 3 '.' )
 	SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 # Omit all dbus.  Upstream appears to require it because systemd, but
diff --git a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
new file mode 100644
index 000000000000..ce923205a59a
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd vcs-snapshot
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# Omit all dbus.  Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+	dev-libs/glib:2
+	sys-fs/fuse:0
+"
+DEPEND="
+	sys-apps/help2man
+	${RDEPEND}
+"
+PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+
+src_prepare() {
+	default
+	./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+	# Without the localstatedir the filesystem isn't mounted correctly
+	econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# 	emake tests
+# 	tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+	default
+	keepdir /var/lib/lxcfs
+	newinitd "${FILESDIR}"/${P}.initd lxcfs
+	systemd_dounit config/init/systemd/lxcfs.service
+}
+
+pkg_preinst() {
+	# In an upgrade situation merging /var/lib/lxcfs (an empty dir)
+	# fails because that is a live mountpoint when the service is
+	# running.  It's unnecessary anyway so skip the action.
+	[[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and"
+	einfo "will eventually be available in app-emulation/lxc.  See:"
+	einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html"
+	einfo "for more information."
+	einfo
+}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index fdebd6b59e42..443a5464ac38 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,5 @@
 DIST ncdu-1.12.tar.gz 140596 BLAKE2B 5594d2d1e0b96eb7a1aa4a8461592e0298f0cd95a6ecb1cf18e09dc62fa1af9b7c8ac7f7ce4f7e5ec76ae1fe4702d9e47fc6d5e8410ac9bac86f444b02053792 SHA512 20620dd79d2af878442769e097f13806f64f23875dcb85ebccd573a3de43aba5663d496049b64015d13f9a79d624298032c008ef61dfb6f61d8b12902b8dca12
 DIST ncdu-1.13.tar.gz 143819 BLAKE2B 8ba489dab1cbafec5b1d9b437b44aa7aa5d79ed7b6938f7904465c4d3803390307bfdfed531641fa186873005ce7f0c37db058855ffcd4ce45888bfbffd03c3b SHA512 f1f417caa9bd9e9d9aa6311962b461e48301cf9eab5d0f57073e25df01f96ded05dd093627b95b43afc659ad99aed869efd4a98d723f5835b100747b5525a60c
 EBUILD ncdu-1.12.ebuild 432 BLAKE2B 188c880232163301bb308b4080f32b7b249c2f13c144dda7786d30bd4deca2cf332d3c72863f5cd2b11cee5a724bca4524db0db62aa371b70b8396707f09122f SHA512 3450a2c99c636046913074afc646e79292de567533c8c31fdb59f58d3dff179c4b3581d16dd45147113c25de63d6666071bd597356ea5593a351c3a7a711c476
-EBUILD ncdu-1.13.ebuild 436 BLAKE2B 6315deebd10a847adb2c9f8dd917a0244cadcbee5fce34956fb2d37d820147834d6d418ddd45631b45a9aad54e5ee41e557272bbc066797c285f681975e8ddc0 SHA512 879773bd6c0d1cd05271f1dcc1eb2c2692bc13d8707258cf0635e3b25e4ed451937b3ed3a476217cdb16412ae5a54c0977b2d25511a0f95267537091d6565ec8
+EBUILD ncdu-1.13.ebuild 430 BLAKE2B dac0ab95cf5251ea72dcc1c5afaca83e5bd38f9f139c927363e92bc6c6755711c1fafb8de8e0dfb5437cf683fe98d4f66028c98c50fc75d064b6a339e331bfc5 SHA512 e54c312b90ee02d7e0db790a8b0326718dca03cc1668d8589dfbce0b13dccbab28e051d6fccb0d348863b36d3a571b453a058a4129761738db16ffc314972d99
 MISC metadata.xml 580 BLAKE2B 02c4868a6afb6f72a6e8ce6b2f6310dc05f895f08783d1163601c79f0ffc913f7e8f92cdf4eb53156ab4afba573eb17d0bb5763b0bf6409632b10d948e9e2a1f SHA512 71aa0fba8e2f364b9f4a7da7d50ab86e5534518d84f8a26f08a5738655eb5f335de1da5b373dae93b21610881023b6197ca06cedb3c12f4b7f1a02850bf1729f
diff --git a/sys-fs/ncdu/ncdu-1.13.ebuild b/sys-fs/ncdu/ncdu-1.13.ebuild
index d16fd10811c8..2783275b895e 100644
--- a/sys-fs/ncdu/ncdu-1.13.ebuild
+++ b/sys-fs/ncdu/ncdu-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
index 40504cb01d81..360bbd5930b1 100644
--- a/sys-fs/owfs/Manifest
+++ b/sys-fs/owfs/Manifest
@@ -12,4 +12,5 @@ DIST owfs-3.1p4.tar.gz 1455420 BLAKE2B 58a0356d0abffd1bda3585a8e05faed0cf80c3818
 DIST owfs-3.2p2.tar.gz 1491195 BLAKE2B 3e56b954fc61e097d6e39345d689d3ba5386f2ed4383bb7755da6a867d802fe56b9e920fe9b4f24cdd639543bad79a6d13bd549e7ce81afb8eab52372864565a SHA512 d64078639ce4c1c5c42735c720cfa6741a34b91297500d6a7cff6e48a0a87b6391e43fc0c5f6bf44cec27feffb9a2f9b5510e085c602666a5adf803bb8ba3338
 EBUILD owfs-3.1_p4-r1.ebuild 4757 BLAKE2B 7b0bdec4f19c2abada54f6ed210895ca426a61d4aa8b994f1cf17b69f14521fb484a36d99b70868efc49828f4d7ec0187796cb6757448f94fddc48a9ca6ecab4 SHA512 6ad887858e45a066e277f49f4ff2a48244f702a965bf0d5862a9a7a54d3bf9614f705efe005627862a84aae8d139a6d0ad1b1e42e8ba61bddc426f81db6b5f47
 EBUILD owfs-3.2_p2-r1.ebuild 4761 BLAKE2B 89dd1f022fabdcb7a87d16b3bc9b296006f1d24f1f44623b46b20c2ecf6206a3fdf12339d7476a919611837323fd02c89353cc7e4f04b6276baf2cf9ebe9854f SHA512 0deff6a1cb75beb10f7c987fc0cfce7d662b28c209f121f96e4e6dd84c4f414f10c996f31f86078fd33ec133bbfeab35bee7129e637c7c40350d4c1a20904465
+EBUILD owfs-3.2_p2-r2.ebuild 4784 BLAKE2B 61e34f01cddf667188e6f23b0ca7aea18da78c86f8f8ec0c42ee1e8dc88304fb730df066e617ccfc96b5d6fc2c2026c0486e21d297f1ee1876d753408ec06239 SHA512 499f96ba7463e8d54086d5957e63c46bd55ba9eec90f6c772229f1c19040f4b4c208a0d8955552de9470e4048765b9a018594748f2127a8bdcc3772c8222a657
 MISC metadata.xml 1159 BLAKE2B 6a55584f7bf0ae7b11441169d59f53138a2e82a3ac38a53b9ab77c8a4e6baf5c268864e7f6897eb2fd9b35888f8373a6756b8760d894c5f4aeaae394f8cb3706 SHA512 4cff718d367711e5a99891caa7c19db9f50d885200841096f17ec3ee64cd01d3938fa34d1f2c5e6de575dd3cb36c5ea4f3625fa604b11cfdebe13362ea37cefe
diff --git a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild b/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
new file mode 100644
index 000000000000..109235a70a35
--- /dev/null
+++ b/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 linux-info perl-functions systemd user
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Access 1-Wire devices like a filesystem"
+SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
+HOMEPAGE="http://owfs.org/ https://sourceforge.net/projects/owfs/"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# Upstream uses crazy SONAME, https://github.com/owfs/owfs/commit/c696fa9b9b44f49c96b9f1c2b3159d277e0c1273
+SLOT="0/${PV}"
+LICENSE="GPL-2"
+
+IUSE="debug ftdi ftpd fuse httpd parport perl python tcl usb zeroconf"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	ftdi? ( dev-embedded/libftdi:0 )
+	fuse? ( sys-fs/fuse:0= )
+	perl? ( dev-lang/perl:= )
+	parport? ( sys-kernel/linux-headers )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )
+	usb? ( virtual/libusb:0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-vendordir.patch
+	"${FILESDIR}"/${PN}-3.1p4-sysmacros.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+OWUID="${OWUID:-owfs}"
+OWGID="${OWGID:-owfs}"
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if linux_config_exists; then
+			if ! linux_chkconfig_present W1; then
+				ewarn "CONFIG_W1 isn't set. You will not be able to use 1-wire bus on this system!"
+			fi
+		else
+			elog "Cannot find a linux kernel configuration. Continuing anyway."
+		fi
+	fi
+
+	use perl && perl_set_version
+
+	enewgroup ${OWGID} 150
+	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
+}
+
+src_prepare() {
+	default
+
+	# Support user's CFLAGS and LDFLAGS.
+	sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \
+		module/swig/perl5/OW/Makefile.linux.in || die
+	sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \
+		module/swig/perl5/OW/Makefile.linux.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable owpython since we can build python anyway
+	# and without it, we don't have to fix the build ;)
+	# disable owphp because it is not compatible with PHP-7, bug #651106
+	local myeconf=(
+		$(use_enable debug)
+		$(use_enable fuse owfs)
+		$(use_enable ftdi)
+		$(use_enable ftpd owftpd)
+		$(use_enable httpd owhttpd)
+		$(use_enable parport)
+		$(use_enable perl owperl)
+		--disable-owphp
+		--disable-owpython
+		$(use_enable tcl owtcl)
+		$(use_enable zeroconf avahi)
+		$(use_enable zeroconf zero)
+		$(use_enable usb)
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+	)
+
+	if use httpd || use ftpd || use fuse; then
+		myeconf+=( --enable-owserver )
+	else
+		myeconf+=( --disable-owserver )
+	fi
+
+	econf ${myeconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+		pushd module/ownet/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+
+		pushd module/swig/python > /dev/null || die
+		emake ow_wrap.c
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_test() { :; }
+
+src_install() {
+	default
+
+	if use httpd || use ftpd || use fuse; then
+		newinitd "${FILESDIR}"/owserver.initd-r1 owserver
+		newconfd "${FILESDIR}"/owserver.confd owserver
+
+		for i in httpd ftpd; do
+			if use ${i}; then
+				newinitd "${FILESDIR}"/ow${i}.initd-r1 ow${i}
+				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
+			fi
+		done
+
+		if use fuse; then
+			dodir /var/lib/owfs
+			dodir /var/lib/owfs/mnt
+			newinitd "${FILESDIR}"/owfs.initd-r1 owfs
+			newconfd "${FILESDIR}"/owfs.confd owfs
+		fi
+	fi
+
+	use perl && perl_delete_localpod
+
+	if use python; then
+		pushd module/ownet/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		pushd module/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if use httpd || use ftpd || use fuse; then
+		echo
+		if [[ ${OWUID} != root ]]; then
+			ewarn
+			ewarn "In order to allow the OWFS daemon user '${OWUID}' to read"
+			ewarn "from and/or write to a 1 wire bus controller device, make"
+			ewarn "sure the user has appropriate permission to access the"
+			ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example"
+			ewarn "by adding the user to the group 'uucp' (for serial devices)"
+			ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb),"
+			ewarn "or install an appropriate UDEV rules (see http://owfs.org/index.php?page=udev-and-usb"
+			ewarn "for more information)."
+			ewarn
+			if use fuse; then
+				ewarn "In order to allow regular users to read from and/or write to"
+				ewarn "1 wire bus devices accessible via the owfs FUSE filesystem"
+				ewarn "client and its filesystem mountpoint, make sure the user is"
+				ewarn "a member of the group '${OWGID}'."
+				ewarn
+			fi
+			echo
+		fi
+	fi
+}
diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index c80ae659dbf9..9c0086b8de92 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -1,8 +1,9 @@
 AUX reiserfsprogs-3.6.25-no_acl.patch 274 BLAKE2B 1b49c0c98d935c1bfcb0191882a7e8e21aecd042dc8a8ba5d3a807dc59534b9b47e727ca668741fd8a82c811a744706348c3ea88c39837af891a2c711437f5c3 SHA512 29419b64f7749612ab2883da91ac97831a2ba8aee819b6e0e8b781b34594541e59b6b7a3841e9967e4623fb9772e4be81b13970c86d61497222789ffa8b4e20e
+AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc299fdd3a4529bc29370ffa8129499ac9d6e1f0a7ed66c93fefa1a647a304ae77309dc87deeeb8b29961398e509f30d0cb27 SHA512 74332f8acd84a3d0374d6ff9803e63bc78ceb18ec130fef213bf326a6b146b8e4951ac8aee5b7349239716627889febd1c832862ae058a822cc71b0a75333d2f
 DIST reiserfsprogs-3.6.25.tar.xz 448984 BLAKE2B d9f032e51f70497cf84f5877172b68e8acacf8fecb3fee7d7c3d82c98cbd5c70f870baa96471b02f092345a86bb02501bd53156cc8e7e3230660a7a6865c2421 SHA512 247ca392d227680fb24e94cd490319e77e82d00d7d357516690d2cab6f0bbe8b35879f8a25ed5046bd3a7a3e1f2b140a8a82404043aa0e7f6f60f57d069857ae
 DIST reiserfsprogs-3.6.26.tar.xz 357276 BLAKE2B 820ec1733c96c9f63a52622424856b5030eba3878d00fbd389781eeea824ef128789168c84e46b8242c1bd96cf3e68e61bc91010b16789c499a44e451c8c261b SHA512 366f326d25fc5940ebc37b2b340607d2234296dfa42795e584cda670597e8dd859633499e6ab87ae8d53cd31b293ddbb15113944a17bfd601baa494abb02a9fa
 DIST reiserfsprogs-3.6.27.tar.xz 449176 BLAKE2B cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341 SHA512 bc524aa1ad7f8502238761fd185bfb8473048947bd579e2803c73371928c6b245e0d90bd9d458f4bebcbf163892dbc9f4bae65aec68ebbaa436be7451c13f50c
 EBUILD reiserfsprogs-3.6.25.ebuild 1161 BLAKE2B 10e8fc09d0f8892e29d135438dbbe0e75ba6410e3d534c543ec6eb3f2d7536bca47089d443ed4f989a187742ebe5d34ed8c4f781c1d97b7b08aa4b52a2974942 SHA512 0f119c895f87c32d09d722dfbe1a8dd27fbece3ff6991ea83d01ac039a1450b981e017fe66225f7b545764d7fc2d69915079528ec6ac6d61dcfebeaf35a4a492
 EBUILD reiserfsprogs-3.6.26.ebuild 1190 BLAKE2B 550e1f3fd16a54c5853df647f69c38bfaf82972de06c57474c07b198f349a2ae1f56a3313af0c8b3c9179e535e36dc40020f0f7eb8876b5f12a99f43a535f29b SHA512 c3f2f7642d89b8b95a4ac6baaad9a6a5d6a5c40f5f1f662c21c08ab90f9d3976cb4f39f2e5675565603b76d41c958d3d60250dc28648df499abd4f8d0696c936
-EBUILD reiserfsprogs-3.6.27.ebuild 1173 BLAKE2B 1c56d879a68b455ab233a33180f694ccb1b82bafb20e7343a2c665b99aeac4b29f701d0d459278e364b7a2fed14031c58838a20a10ab9195ae950d195a5b6e46 SHA512 3e392a18badcaf0e106d7b1b4104f443608f7a20d51f45a6429df6759cc561c48417e97d3a8958ec33bfee1b53c9e204d750022297ecede92293f6fc28893e70
+EBUILD reiserfsprogs-3.6.27.ebuild 1211 BLAKE2B d90fb8c6cb47aed64387617120db1b4829c0f5df9721bbf7670cf5f5d0bc18fc1d70cb30c84ef15220413cacb4b87cbf33963db7fd4be4da67f101dab3167f46 SHA512 94a99dad70da403ecf4dd5ab49ae384a99b9195624ab4f72cc33d6085e91baf4af0c2d86c2ecd451171cc0bfba25e048e6e7f38d836e158793367f8f7c64f581
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.27-loff_t.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.27-loff_t.patch
new file mode 100644
index 000000000000..9ab8519e77f6
--- /dev/null
+++ b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.27-loff_t.patch
@@ -0,0 +1,16 @@
+glibc-2.28 did hide loff_t indef system-specific macros:
+    https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=663e7d784977f6b15c0cab73f754f9f39c9c0c2c
+
+This caused build failure:
+    ../include/reiserfs_lib.h:300:55: error: unknown type name 'loff_t'; did you mean 'off_t'?
+
+Re-enable extensions to pull loff_t back.
+
+https://bugs.gentoo.org/663930
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,2 +23,4 @@ AC_PROG_MAKE_SET
+ AC_PROG_LIBTOOL
++dnl pull in loff_t from glibc
++AC_USE_SYSTEM_EXTENSIONS
+ 
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
index c1feff860a29..04b0f4bf7daf 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ IUSE="static-libs"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.6.25-no_acl.patch"
+	"${FILESDIR}/${PN}-3.6.27-loff_t.patch"
 )
 
 src_prepare() {
diff --git a/sys-fs/treesize/Manifest b/sys-fs/treesize/Manifest
index e92e3d270b4b..91b479ee5610 100644
--- a/sys-fs/treesize/Manifest
+++ b/sys-fs/treesize/Manifest
@@ -1,5 +1,4 @@
 AUX 0.54.1-amd64.patch 286 BLAKE2B 2321c2fffb5fd3f92dcdb4de7a446b709857e0a9b6b8eaca4a8e82195e5b2df95c2527ac4c8dacdab30415d6995ac3e6b4128344c57642c373c156addd27c1a7 SHA512 260901b9ae35b1e85cbc761a34e042723b5d2ee000807e7bc0487202df6ee5a7bf19561649032fac898c649159f75e3053867474419732c31193dd075c2ce0ac
 DIST treesize-0.54.1-src.tbz2 296047 BLAKE2B a00cdadc225976bc2cecb8e0e26509650c1a2707eaaa14b6edbbb5ee88871eaa5e56f164aa7285efa369aad77ec6414e9d025de31d1aef16c5910d9142fb07dc SHA512 461e3f6aa01127afd11b98395d65911f441012fcdaa3741ef35789d51fdb491731cfc62b5616150d74bbcbb8c2742561a387aef8ec4f9a493e9ce6683fb5fcae
-EBUILD treesize-0.54.1-r1.ebuild 461 BLAKE2B fbe7f2010b2348aaedba9dcf2975a83c865531d3a80748759925e3339fd14aafb58c8848b89a2d6f679370629bcb8442b9f402f823665e8842ea655c94b6412d SHA512 fd670cb5903524d2580aefc16312fbb1e6a55bb52dd1fae14499180385bb7f8f48fcd73ef081ece8a63026e8e30eb52e57b202bdb2f0656fd6be048ed4110c6d
-EBUILD treesize-0.54.1.ebuild 619 BLAKE2B 6b39f2983a8da5b40bbbcee71b989021a393ebbd96721ddfb03d8806dd7c419f33daf4ef9717cc372e9b59003cf172b4c95a9a813a6bf366cd14cc8a0fa8001d SHA512 7ea14f520ffd8c410e2c48f5d48e81598e69b0267c8f8b53f1fde03bd572ea50924918aa7920187c8d52f8ffe8f43b73a8911ea256c9d9d88f263e020004350b
+EBUILD treesize-0.54.1-r1.ebuild 456 BLAKE2B 7044a51c077ebdf06710ec8a68b0cd606a71ba1c849b9edf0fea818238fd91cff7b57aae55ecf9997b8f57939d39eee99bfcdb6589be7a475bd6e5259cf6b037 SHA512 65020fc042cc24427e2d0a917b51ff7226e4353047a9a177758cddba8a82548f2f53e8961f71dd3d023526a16858a9931ddd5081110f019d436ed3c049617f70
 MISC metadata.xml 245 BLAKE2B 379d9f118f924bb9c4fca6ccf376e9be6d26f243e0517922acc4a2959912dced4b592df9440699016c20a8a1280577cb7c71b0f744b66e46266c64955b66eec0 SHA512 ce493a808a1b4807488b017b1813c1ae857367457fec5fa2f27ba9bdb780f6aa431fe30e33a3dcb7574168ef9245305ea223a273c9e9f0557b7aa12bd02b5ef7
diff --git a/sys-fs/treesize/treesize-0.54.1-r1.ebuild b/sys-fs/treesize/treesize-0.54.1-r1.ebuild
index ab8727ebfd4f..315e9e86c23f 100644
--- a/sys-fs/treesize/treesize-0.54.1-r1.ebuild
+++ b/sys-fs/treesize/treesize-0.54.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tbz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/sys-fs/treesize/treesize-0.54.1.ebuild b/sys-fs/treesize/treesize-0.54.1.ebuild
deleted file mode 100644
index 22a73312bac5..000000000000
--- a/sys-fs/treesize/treesize-0.54.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools base
-
-DESCRIPTION="A disk consumption analyzing tool"
-HOMEPAGE="http://treesize.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PV}-amd64.patch" )
-
-src_prepare() {
-	eautoreconf
-	base_src_prepare
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "installation failed"
-	dodoc NEWS README TODO ChangeLog || die "nothing to read"
-}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index bfcee3789e3f..4e3f278fd407 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -7,6 +7,6 @@ DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4b
 DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400
 DIST xfsprogs-4.18.0.tar.xz 1214480 BLAKE2B 78db41319e53be1f03b66f85ecc7c50e0c6658fa3fd8ddd8539bac04e656614a5cb54dc930a324d9df6afe4024c2be10259b903e1ca0ccd0ffb340e7410692c2 SHA512 0629400f8824620138928a7d72908b7a852408814238a55e11d6eb3b2da42cd56273960430d3ea729a9bce95f605d225607940d4728b68c468c39eb5a9a590be
 EBUILD xfsprogs-4.14.0.ebuild 2655 BLAKE2B 8aa62f0b2a4aecaebf4842edf8c636f0dddee92b2635ff8355f26e6cd95ff5b328e613e325463cb3dc22d1a7dad376b0ff3ef8840da0bfa9e9dbf775ee8a7d9d SHA512 a9bd435a3d8ec8f6ca2c3b1408cff7eb5c8f5bfeba876d4fad81c7ec6bf1f2cb35c2380badea5fc556ac386f933c8764521cfa35fa5c8ce5e2cd2f3bec57bd22
-EBUILD xfsprogs-4.17.0-r1.ebuild 2880 BLAKE2B 3383295cbdd67ceafdb14af6e57b12f0e090f3ca9d97ff418c2fc314bd6a39a53423457db18825275de162990f689a80d69f308f54943d9664f5d1652b9c0c4c SHA512 bec7dda7404dcd6854290ea91fd76840339c16b6a01918dd8f0690ae74135db00f63098d4d16807e68c56b1ea829e2ca93cdc4ed118a53cdee7a43946daa3d8b
-EBUILD xfsprogs-4.18.0.ebuild 2887 BLAKE2B e17dfa5a76155525edf9a5bfae7ddf2d869a8c16a846bc5e2db122c327b3214a9ce59b91429eed89f5cc179fe7549c796933640ac85c8072dc97e40037068f39 SHA512 8599b45f034314a0e9f48e97551bf4d8efbbc50aa2b72a86975ee5788362c507d904b45a69eeacc9b31eabbe80177f0d7ed7d3600de6c9024519dd7ea5da48c6
+EBUILD xfsprogs-4.17.0-r1.ebuild 2305 BLAKE2B 71456bbc5893d4289ebd432ffea3d8e0e4fbf8927b89368290a577ecaaae28e47b7cf5cae0e365e6b6462ee74e28ec60152fdac6f9a81627379d708081468903 SHA512 2c7270c10661d5894a15da2f8aa723714106abc8c58013b0435551c84f4e38abf3aab5d928e2ee2ca1716f07faf2ff3831441e2e05b0137e3af2cf7605c84647
+EBUILD xfsprogs-4.18.0.ebuild 2314 BLAKE2B b2a8dd0f0a36b5461bdc34b5ec061e261f24040c29b49989977927e05bd66a3716cf275f5ae7d2d3ce54e64f78b919f3fc9e939539482294ce7d17067c03824d SHA512 01ccc49541ff057324b706fb2a8474492422e5b32ada74844494ca53a010920eeafde7e321e2a94c9c2b9c25823bae86db5b50597c87407202147f94ef92e4ad
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
index e13414de1dad..70e095eb507f 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,21 +11,16 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE="icu libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sh ~sparc x86"
+IUSE="icu libedit nls readline static-libs"
 
 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
 	icu? ( dev-libs/icu:=[static-libs(+)] )
 	readline? ( sys-libs/readline:0=[static-libs(+)] )
 	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
 	!<sys-fs/xfsdump-3"
 DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses:0=[static-libs] )
-	)
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
@@ -44,22 +39,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
 	# Clear out -static from all flags since we want to link against dynamic xfs libs.
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
 		include/builddefs.in || die
 	find -name Makefile -exec \
 		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
-	# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|& -lncurses|' \
-			-e 's|-lblkid|& -luuid|' \
-			configure || die
-	fi
 }
 
 src_configure() {
@@ -76,12 +61,8 @@ src_configure() {
 		$(use_enable nls gettext)
 		$(use_enable readline)
 		$(usex readline --disable-editline $(use_enable libedit editline))
+		$(use_enable static-libs static)
 	)
-	if use static || use static-libs ; then
-		myconf+=( --enable-static )
-	else
-		myconf+=( --disable-static )
-	fi
 
 	econf "${myconf[@]}"
 
diff --git a/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild
index 273db91aea0b..ac490a41e289 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,20 +12,15 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="icu libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
+IUSE="icu libedit nls readline static-libs"
 
 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
 	icu? ( dev-libs/icu:=[static-libs(+)] )
 	readline? ( sys-libs/readline:0=[static-libs(+)] )
 	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
 	!<sys-fs/xfsdump-3"
 DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses:0=[static-libs] )
-	)
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
@@ -44,22 +39,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
 	# Clear out -static from all flags since we want to link against dynamic xfs libs.
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
 		include/builddefs.in || die
 	find -name Makefile -exec \
 		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
-	# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|& -lncurses|' \
-			-e 's|-lblkid|& -luuid|' \
-			configure || die
-	fi
 }
 
 src_configure() {
@@ -76,12 +61,8 @@ src_configure() {
 		$(use_enable nls gettext)
 		$(use_enable readline)
 		$(usex readline --disable-editline $(use_enable libedit editline))
+		$(use_enable static-libs static)
 	)
-	if use static || use static-libs ; then
-		myconf+=( --enable-static )
-	else
-		myconf+=( --disable-static )
-	fi
 
 	econf "${myconf[@]}"
 
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 092993c36618..9c686688000d 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 6e609aad5f63..94c9e8a4c0e1 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,152 +1,81 @@
 AUX README.gentoo 933 BLAKE2B a3f338e7fc85ccf980178ccd2b1b4706e11269a00ee4411645286f19730dbfc78a6905c792567f735ceb057dee35e282d78ca3c1fc6d01b53a93fe08f727d431 SHA512 31bac1d8acbc50dfed3d06cdd6c89f3e9847276e18b9379989cc5a3d3696805d7b020a39fef309d1ea53fae3e42530e26016c621b24019174705173b2264db5d
 AUX README.gentoo-r1 913 BLAKE2B dbe93c8d6c289a229d158fe6e4434f139d89f4164db850639d8db9f4eae18369204582ee7515ba0e8708757ed53bed4e0f01ed268544904bb77c7bc9248fd52a SHA512 b4522a200410fc6b30b36796f60843c4065a136c19477049271d8898d6bb6fb08874071181d0e4c6f5568d271098becead30d13eb904aff64ed8e2faacf21c8d
-DIST aufs-sources-4.14_p20180409.tar.xz 181264 BLAKE2B 580de640580fcc15c6d7e1de0e480b803aca878d087aee63455674f0a74156849882331805cf70c8df439c8b6ce67b7883930c0f388c8e7ed1f643028ce98140 SHA512 b7bbb239d5681479ad822c9bcc28c78bc8e713cd5577192c630bf2363e9dbc1009c05d11fe01668735651f602d111ee59fe0b1c259f56e8485f9cc25b0865b38
-DIST aufs-sources-4.14_p20180611.tar.xz 181208 BLAKE2B c915c145092df4608e2ba5a8346328114912c10974561e3c5fa1135a8eb53b04d222d0f0948e7fb15ee376c5d61a098747ca37dfba494061261f32dbdc621a83 SHA512 f350cc8d67aa8b99ca7a44f3c665d9f4b5a345dc330ac4e8bf26e4355a033e21d6c04953bffa78e9f8c093131b84a82432b18db020e4b55b0e609692f0dcc217
+DIST aufs-sources-4.14.56+_p20181008.tar.xz 184372 BLAKE2B 145c9aea8918702ad8eb6a0a76e3a107f168c7136198ac01ffe1372adcfb14387558a71445f1f9e7dc9642ef3c58b78f5e2fccf29931cf7f190abd43156d0c54 SHA512 f39b202b3b7c2eab26fae58c034d901258a951d3c63dc864bd7f8c866da5767133eab61eb9c56fe2eeac0f0353cb1d965d5d190ac76cc1d334795891b8246e9c
 DIST aufs-sources-4.14_p20180702.tar.xz 182024 BLAKE2B f57a26a6d28b3ca347e2aa96d1b54579c3f195b9020f26ca618f228e061d6d9d2c1d93269a2927753c407b83cae91602cc751a345c20f4f6c08a93928160a1f6 SHA512 423e31e290e92dae1cd57e2caabc31ccc2026a027bdaa363d37686b5c0087da5346785ebe0560d5a9cb6def0c019d41734e0ede84a6fe1472ab0581a9d6e3c27
-DIST aufs-sources-4.16_p20180702.tar.xz 182028 BLAKE2B e6ef948079c59a96a13c3d56ee6a84c30e97a4e30e3d3440e6122bdeedcbe2afd3ebda8e9a10fea1c0ecde8584282f6fbcc961e21c96993bda465e1bd2d79425 SHA512 2302d55d63de82fe4926140f049fd427f37b550b24e82558a72adc87eb96f22ec88c459667118898e4b28c6a466e5038fe835fc6ab3a6c83b2fb86499bc3b2dd
-DIST aufs-sources-4.17_p20180611.tar.xz 181272 BLAKE2B 3e1cd5f0d9ab42dd8fb06f62a68503c6b486724e4bc0df165ab43765ce43957d3df7771e95d6320af7e6957c8a0a61f334f65bc4b830fb88339226d4180fb4c2 SHA512 cafddc580e9b73b39efe9197a75d8325d0c52118409684f66b9f0f2a13e3436a75d1f63118132ddf3db58849bb01be1e11412cbebfb28e99fbf37d6e0741f28a
-DIST aufs-sources-4.17_p20180702.tar.xz 181992 BLAKE2B 9d0193e1db4fa97959b1a2308474c250fad6173ac76c31a70f3b980f44b2ef1da6093da955acfce62876cb19e15d2f1e56f0fa5fa543173b03613ed57577a42b SHA512 805c21bf49c857d66a8b42c889e623d9c779ee466bf06e7cf4719e80e1a2e3a85793aae8ce3266fdaebcc8c962be073c0dfd6581a786924bb8bc225e708176a9
-DIST aufs-sources-4.4_p20170925.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
-DIST aufs-sources-4.4_p20171127.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
-DIST aufs-sources-4.4_p20180409.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
-DIST aufs-sources-4.4_p20180611.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
-DIST aufs-sources-4.9_p20170925.tar.xz 180584 BLAKE2B 82c7bc47df1fb843706b3110a2a778a60840bd874393fd7b0a0ddfb40399e057895ce5360e59a9c0162333661ac7c00c6cbfe8b68d4abea537e6b8bdf92c061d SHA512 06d8db9f115fbf89f5bd8f47ff5ef3b0643b7a5d925d82a113c203272d234b9261a214e4eb9ea4fd083c9cf5d6a8bb64e37a7d4b1c47e1e636f6e56eeebe863f
-DIST aufs-sources-4.9_p20171127.tar.xz 180656 BLAKE2B 35826be242a2da7c1bb47aa81e14e6020345825a52d108f2c0a6dde7637ea6c8943b3f1c6d654811b9bd18b285d1dda96a29580d4338330de45c8ea68874e8d4 SHA512 934756ed0d6030853e7fcd2f3458936ed25829dc1f882b7bd3bdf308dadf1d33135411dec438f1515372838300f1acef53f46b2e2c39228df7c6429f27270a9a
-DIST aufs-sources-4.9_p20180219.tar.xz 180636 BLAKE2B 836f895dd6124faaf875b029826d3b19891253e143f8a7e71ffea6584ce67cc1cdcc8d09cbb9f1e942ece86d4e95934d542d21dd4bf5dbc310cca207b8a0a8b1 SHA512 bf3b64d5e77ad96710e3c333c7e3a095bfd150e6af90d295ce5d09ababf7d64f4e9892859d21decefa59842ec68c6fb761d9bc8cca2d12f7a53e45b0b71fa1d6
-DIST aufs-sources-4.9_p20180409.tar.xz 180656 BLAKE2B 373fcebfaed2b8ab4c831fbdd640136ac542e22db0d3b30b6d59db647459f327b7b3c6c2f130d83359107922441288da83a8632523bb94fd7d0287173a0da995 SHA512 0b11775389a22905e941c87d74fa95e7142e80ace7c734623c09fff4709f4ddaa8806a0dfe3a3eae8a01d6a4f1591ffcdacc32e5e5d3d7f7715edba342f45d10
-DIST aufs-sources-4.9_p20180611.tar.xz 180692 BLAKE2B 8958283914bc66199a68eb1289722ee4fa8ec05f3a827e2c0f8886d02ce395609870fae5623357f4b957e17e7cc6dbe3d26af22ecd4d002bfb4fc44b73ecc1a1 SHA512 8cde580a66bbe5374d9662e16de62d220201568c31971a96854bf2d593b28a29eca93de7575396939cd349d9c0f17cdf1805e189d7c272e08a84350f8f3fd0e2
-DIST aufs-sources-4.9_p20180702.tar.xz 181400 BLAKE2B 3fbaf2efa9f1b3a26c999498bc63c9d0ae8587343bf12d8635dc3569f125c2130787b3f6ccdda9270673b06b8a51a9524f10197fee9e015f5ae4608862ddaba6 SHA512 58b0b8be91ed6601a8ef488c842f702de6ab060bd1e1f487bd8710d5d12e3681bc772c2a37fd7d8e40b0948740502dad54909c9d9039d995ff7cf21fa3c84c6a
-DIST genpatches-4.14-49.base.tar.xz 1263704 BLAKE2B ee928e64ea2fc44b7d7a4e9ae91cc133b53c6976a3861f9a92fc4edfbded92737967f1f7f6c4d292b41228a67479ff4260f7366387a7e4a7892fc4b930b3ed7d SHA512 59cd1e3c873a78b088fb64baf92f84f6cfc1d3590e7b367ea881cfb41bf0264127f0056553a84bbb62fd69eca3d58ae29620ff9c52aec2ebab34ca370e371889
-DIST genpatches-4.14-49.experimental.tar.xz 5180 BLAKE2B fdcca0bdd975b24542eec8a67c3693ce8c27f889231025711d0a221a6e23a20256444f3b9320cdd58646c345e10dcb1817bb6e98528e5cc421d00b63a2b8a65d SHA512 f2ef797aec3c6c0376e7e9a1a974db7d8f439988f82ee4af07984bc71ae88eee03d49f2e450f49120255d38f8087497c7fa92da16064992692d0460629af9c72
-DIST genpatches-4.14-49.extras.tar.xz 17500 BLAKE2B f4c4d6408999934c03b2d0543b12fc6b227ac994201f9b31872342c63d930d4280bd1f93625c148eefb126f9269fc1fea1872ac4920ba679938c6aec7d916449 SHA512 a32823c41c47b26110da59d63bd6104d8b38ae9ecac43e87ec03ecef726349475e40fe88354a1680bf816a12f6edd0dbfb1a2b2865be0a0716047b12d2cfbded
-DIST genpatches-4.14-51.base.tar.xz 1377292 BLAKE2B e438be087cc2f48fa174f568008687dc8f0352fc15352c5e9d59ab9b741fd836f5ef9adf3284b843a2dffea1d34c735e2f08bccee23ca93470dbb32bbda1750f SHA512 a421da5d03d099808202f2c032c29a55967a8053177fa60b9181ef0668d1b38182440b7d5699696560f165b380e2d007cd6d9f9b8cf1ab6e91fb44826692155f
-DIST genpatches-4.14-51.experimental.tar.xz 5184 BLAKE2B bb7b10584d230d6295bd57e50eeacffab7044061ba09806e812c18e4d5926516ec5674cfd8925fc838304987b115509aaaea07f8f3af1c4822bae0df78476363 SHA512 b79937209b305e1738c857a8bbd46a1394cc4893fd5052eb5f037edc6c29d83b3ef013eecc2ff93da08b8a90cdebc169e277be0f81231c26468091ff33e6d9dd
-DIST genpatches-4.14-51.extras.tar.xz 17496 BLAKE2B 115e99b501a0119809f2abe84c3bb8a66b2b450f53003441593654c23a4bb653c4b40da1ba31e53f7f4db69c99511b2dd41f53b4adf8bd377714b1ace8abd9e2 SHA512 a01c90e36504f17495c8691ba6fa99870fd03b65299730df57e767e2562a90b6a04da24c50983cb8ea12ac276e6805f3b5fdaa30ad175ae5ee28f147f75dc3ec
-DIST genpatches-4.14-52.base.tar.xz 1393612 BLAKE2B f408007ae60b6580104f0a2ba35af383bb294508800540d62593a4d0cf57addc518b926a7ca8c0398c89c6762b0389de553af189a100031929770a5b84d08ce0 SHA512 f114baf7273dde352905f1dff5dd72f4822f01ba906ba04d49f68ff779d9b27359564f15e57d3d091fe942c8c1d679227020e5937fe82ac5dcb59d270104b971
-DIST genpatches-4.14-52.experimental.tar.xz 5188 BLAKE2B 8212503f164cfbba9d6d59624ed29bea6ae1a5a027cf6afa484e90c931a4cc32c954216e91a442ad27834049ce90a4b262aa82b14763c72096d933d8459977ca SHA512 8475a0f915b49e003ba362f47e909ae97bf9dd2f94c8eb96fbf07899fc6884309f4f49bc17ab49de0bd8ad0066ef1e63cf1d19ba2d8a493ea1478b431e2d2034
-DIST genpatches-4.14-52.extras.tar.xz 17496 BLAKE2B 402ab3be4571457aa71ad0e4785abc5ca4ab3b245d7009bb3c89d730f57b4cf78b6e7b0127907c31e4a21e96f3de367e19a71778d3dcf02ec269345d60a02cd2 SHA512 fc3d536bfa95854ddf788de3bd603a44b4aad3cfd11e464e54b7bcdd328513a048ff3a4e882c4a90fd3d21989aa3e5c0b46f4d0f22d58b93f3bab0f95801694f
-DIST genpatches-4.14-53.base.tar.xz 1402232 BLAKE2B e71d86a6296bc0e00033d6d1105c119366694e6d6bb21e67b1d8187091fcf81a3140fd492fa403cb119baba60502ee4e4604f82fd411c367ce3a985267fe82af SHA512 e96a69e6f2ab4bb8525e3d3ae214d228008d84cf2a4e57dbd7dba3966cbe066bec3d3accc2e986c957a02ebed68e13646d90cf15f1b762911d100266aa2e8325
-DIST genpatches-4.14-53.experimental.tar.xz 5224 BLAKE2B 57b4282cfbd86aef19b48c12948a041b155b75184ee94b543d47e4bf754947c228f2c0f123b9814568ad6c782cd6f16908b825141ef1957299ccb21a0a10cc1b SHA512 7eb0d1caeca30369eb2003b9814b9be8308b2081219b178363bc95645aac5f0d352546323ce17b2eb28b57f09e5efffe079449ce42e48f37ed96b4d853e77cb3
-DIST genpatches-4.14-53.extras.tar.xz 17496 BLAKE2B 402ab3be4571457aa71ad0e4785abc5ca4ab3b245d7009bb3c89d730f57b4cf78b6e7b0127907c31e4a21e96f3de367e19a71778d3dcf02ec269345d60a02cd2 SHA512 fc3d536bfa95854ddf788de3bd603a44b4aad3cfd11e464e54b7bcdd328513a048ff3a4e882c4a90fd3d21989aa3e5c0b46f4d0f22d58b93f3bab0f95801694f
-DIST genpatches-4.14-54.base.tar.xz 1416012 BLAKE2B 43b4a3d2f739aa28f78c370f750a2cae4685eefd305119bec12fbe701ff456c3691f7af07a5168cb70aa81d235eee478485a27833d2c279038545c0d3c8a6b9f SHA512 385c548cdb99b80d126c3e48b2444f8aa99818cc2408adad76c95095344e403c8eb9dcecf8dfd830a745c66423fbe3549cab5f9fddf2a259606c42c0b470e373
-DIST genpatches-4.14-54.experimental.tar.xz 5224 BLAKE2B b8e988b07ffe7c2fcf93cc5e3d27945b575d6734c3d31df369c5106ae1ca581db760bfa262639cdef7640146811eb395b79d70c21319a0564592c14faa547e5b SHA512 c698bed59b03094e80a59f64a362b0e956237c0004e2e9c5a608889aa14e92d701160ddf149d45e39643cbdb5107d51becca427ed4b0d38219d4b392c27fc31e
-DIST genpatches-4.14-54.extras.tar.xz 17492 BLAKE2B f993363b6205021049a653828ee314cf2da0e5e18612cf0d0361ddd83832a4297fa56fbe7be64ec3dfc164836da41fea1058b930f38bf569dddae0f94a3adbd7 SHA512 886279967efbc449797424e4f5d68ec9982049ae38fe0d7a3b81aaf058ac58971d32d196c6b70c7a382e09307d56cc599c504d5cb63fafb307a5141c7a4e08f3
-DIST genpatches-4.14-56.base.tar.xz 1459612 BLAKE2B cb36e0e5f7c998fb660e320e3a9cf1ad0412bd26fd92af6889c09ce70fbd4a8d7e2f78b8c178828fcfa95859d3cdfc1ed3370b2e8eacb32e8198d91e2bd37480 SHA512 35b1c2c915e7c493e53663c4140fbb0708cb2ae5a95dfdf420009ebe7d7df0890f3c1f66b694f46e033af5f24057e779c406cb510ab24d83e00731c6ad696726
-DIST genpatches-4.14-56.experimental.tar.xz 5224 BLAKE2B b8e988b07ffe7c2fcf93cc5e3d27945b575d6734c3d31df369c5106ae1ca581db760bfa262639cdef7640146811eb395b79d70c21319a0564592c14faa547e5b SHA512 c698bed59b03094e80a59f64a362b0e956237c0004e2e9c5a608889aa14e92d701160ddf149d45e39643cbdb5107d51becca427ed4b0d38219d4b392c27fc31e
-DIST genpatches-4.14-56.extras.tar.xz 17492 BLAKE2B f993363b6205021049a653828ee314cf2da0e5e18612cf0d0361ddd83832a4297fa56fbe7be64ec3dfc164836da41fea1058b930f38bf569dddae0f94a3adbd7 SHA512 886279967efbc449797424e4f5d68ec9982049ae38fe0d7a3b81aaf058ac58971d32d196c6b70c7a382e09307d56cc599c504d5cb63fafb307a5141c7a4e08f3
+DIST aufs-sources-4.18.11+_p20181008.tar.xz 184324 BLAKE2B e75f1bcb4fd020e2307a82896880a6bec8892d8d145ab740e4b72dbed0d2152a4e9b732a017a44fc9a2de6159ca30bfb709108567048e0ed7f16352ed57609d2 SHA512 5c4f3fa430783263f52dcdf71bf1754b8b90c10044a8e3740d9f9bdd3afcf0845039ae6ea61598e2bb8a0766dc7140ab6787d3e923f5987a781954cc3a9b614c
+DIST aufs-sources-4.18_p20181008.tar.xz 184396 BLAKE2B fb5939732a21a981be75fa337bb1311a3d14d7973dc6fa6ad021997c5f9a7bbf94cdb65865fd276b61c2b8d90bf1e0795cb4073914c0877946705663aca64c5d SHA512 f838272b2673088458f8993c101cd6f89611f217224afc273abdfcac855f2ecebc51460895bf2d19748751ae931f3dfe9db5cc2d3f43a80b4776137cae78da5c
 DIST genpatches-4.14-57.base.tar.xz 1472016 BLAKE2B 1905e983d34220a97bda5eb7b1fff09d7ac42dc129b722611c079418133231d6d41f871c20df94a3db5440c8b1374d09ae3303be9e2cb8b70f5d92b61382f3ed SHA512 bace21a042f6e45512a8ffe3cb329c70b3f3548142fbaddbd76b2be50f50276db8f4cc410a7d05915c30c443cc82934893203d3025cd4653387ff6fd64f0b4ae
 DIST genpatches-4.14-57.experimental.tar.xz 5216 BLAKE2B ac751059eb363f1327b8cc6a9ad6c993cc56e3a57010f6a7d8b30220a401ec2b607b7eda601b39f1d6480fddb45f7a980ba7ffe7cf808ae382a57cc57a785f39 SHA512 efb2bf34ea83789437388b6becb4c51564c885355dffdfe0f902ded0cd0a9dbc534a891a8eddde76418a651f0da41d8a7402e672688b2cccaae5897ce0bfb744
 DIST genpatches-4.14-57.extras.tar.xz 17488 BLAKE2B 6dbe6859eafa2a61d2139572a28046a1278a965aa6a82518b5658c61f18ece4054175116b5907436bc40bd4c32458752fc381cb29806d9e25550a17f81684eab SHA512 49d7a27075e7e113ef39f2da651e9302b51c66d46c4d2960acc648dcd0eb4b608118584dbcbf169d73cf1ed4e105fbae9125f06dda46d346a63f0f35bf23bb4e
-DIST genpatches-4.14-58.base.tar.xz 1514872 BLAKE2B 1ab441025043ce159131d12731adfdb60ab194a1c681d3f93f82b67e22b4451cfe4d50157158607abaf7538e6c148ed8b34deb1f9af92bec91fd20f2d3ad84f3 SHA512 55d50bc2f401ddf9ce903d200ef4216824d6303ad5a3b59e1e07741775b2737dc1b0454ebd1c769953f8365e9d1279417c1c21c1b7192a61b6432d4ece209a76
-DIST genpatches-4.14-58.experimental.tar.xz 5224 BLAKE2B 53ea54483b2e3a2f683baaae6ae116a313fb9c960224fc350c0853f90402d9130e2efd7a3c0dbb8504a125cf5a112a613cb8052195b6393dc07af87990d4664e SHA512 62481c468cb73b443bafb6f222ace0a93f1ab7df79323730235903b75fd91ef15ef410f61115c97baaad89f99feb96811890a37e92d1436b51748fdeeb395687
-DIST genpatches-4.14-58.extras.tar.xz 17492 BLAKE2B d627fe1135d0db2bc4be04bd906f16116544eebd72862f842f14dda66172e5fefaeefa70b482689e97e8aba34473f9460f6ed81e366e711af52ebadeb0380632 SHA512 eb52794c163aa5abdd21b8dec218f8232b38694acaa1415f6082c30373b61f2bae39567da3536c0c22b9309d0cd85f7e5d449e58772ecbb0eaa058e4355ecffd
-DIST genpatches-4.16-19.base.tar.xz 523512 BLAKE2B d28c63e46779861cecc7ef02c0b49a52794d8ab4a369ba9789cb2783af3440121c2e1906eaca15a0973db84c52d2fe52fbfa03734336c9f1b2651ef9ca10325d SHA512 7dc7ff4fe9f0b75dc5ced0ead5dafec43633bcd95b1fe605f6729d1d9a3ac9155bd3bec605edff1563a37654f55123a68c93d7b70b411f1ce22ac1a2e1b24599
-DIST genpatches-4.16-19.experimental.tar.xz 5160 BLAKE2B 101cb9fe2be60a0e9ff7089ccc4c5c808c436fceaadfc40e4e8fa86eaaead8875ef592521f5005e5b8746087aa133236faf80c1a6448d316ef28d2ce7d27ffe1 SHA512 c452893e1778951865d72611b9ebb38edaa3d3de452693ee1c3fe9ab18063e6093f0a115f571f90ed50153b6052f2d4ac396ea4aa2a66ce0d0b27a99f13972b6
-DIST genpatches-4.16-19.extras.tar.xz 17484 BLAKE2B f9a8c00f4fe7fa0853bc358af5a525c5b81638b52dae4ea2ea9fd5cd27bb0d8dfbfa1670c73782a1e45a48319b07cc20b8892da2872fc3d56c2b706961e214b4 SHA512 8bb725a9e0c09ce2ce3130e2f76d4d434216d8f9471e314849d585de192e0943d8583eae93197c541ae5b011a8a2d64ec2b76c2a45cb0f47670483b8ad83e0d3
-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-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.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
-DIST genpatches-4.4-130.base.tar.xz 1999668 BLAKE2B 836af798adf3fc1e67543096595655b633c9f7d3736b00527bab7423b488e6c4ba7bfbd63d9443a06d32de3726ef64bc963134e97a1eeba5aad8d23022b352d6 SHA512 fd514523b3f54ca67f665f5feb9340713f6af00e73e7b9948f5909bab21c8c5b3f90a044ff04d59d4032c34c8e4c1a0805657bfd549156d2ed0e9f646d57dd27
-DIST genpatches-4.4-130.experimental.tar.xz 87772 BLAKE2B 23cb4e28fa407f4eae82987f02c4fbecd8239dcc12e8259e21d3738db8950b05d1c602461cd0be0e64eb777dfb7edee3950baf56e9069f5b1db5df01d53fb4ac SHA512 0fb0c082e25459a0168aaa49c99bf3373f337b0f993d73d8c40d0c8d1c6d2c0d281a3231113204eef5c7535dd231d0765227c96bd3d07609dca2274e93e4a690
-DIST genpatches-4.4-130.extras.tar.xz 16456 BLAKE2B 4b2fdd50e47225cbcccc6a8776bbf47a1007cdf442ea6df2dc854241bef5ff75377a9e79a9bd43d2d2a2c511482f69ea09fc9340ba4af8adb1c027e64bd6dd33 SHA512 89beb61226a4495a4880f1900eb43e61514f20fcc9db34522b89bc0f6ae1c978ca631f8b7b19a65cc5e7209d28273f4b67abd1734330567056b4da76c76db25d
-DIST genpatches-4.4-138.base.tar.xz 2156432 BLAKE2B b0de2f52bde393f8d3bbbce95c1c60098c15bc3b980c3de98cb6b77165341687051e8ffb981d12746b7dac1695f8bb41f7e4352720daaf74f6326bd07735c5c2 SHA512 06470ff4da718da9df72afd188b16e38810bf5861b7a682770f9462b8b2a5ad0b548c2c446aba628ecce694052a8045b202c03965b9c5706b246991a6ff9cb6a
-DIST genpatches-4.4-138.experimental.tar.xz 87772 BLAKE2B 850d12d3c31c2d47f3eede09a9b6149a8eea97d20147912b7712e0546f3bd43157f6425c51edcadfe8c487fb3d82cbd488fca73ef8f0d07bca22e3f0c1133e4b SHA512 27a895137302f00810cf8808b4bb705959edbb1e377874d0e0277d24844d48b53ed1db208a5be746013ae2605be56dc7a6ba89ab527315da92309d0ce26ce1d9
-DIST genpatches-4.4-138.extras.tar.xz 16468 BLAKE2B e5ca7895b711e54c81425a963d91a3d4fa7fe6c9f8177ea96e8d971a956995c1942a079c71edbc16662e3ceec8a116efef6fd3410292c7c14a9088dc6e154142 SHA512 4134053d7813f0cb938f975eb73212c6cdc9a089b9638d1fada37488b2c6c729dd8e7152c98abdfb2fdf24c3db432adec9d04588c4f1e8f38b3640a2feb37cc1
-DIST genpatches-4.4-139.base.tar.xz 2160572 BLAKE2B c8a1ea11cf66beb67d1eeca34928886dc669e40367ccef05a810ba91c07a5987d18d099defe68b21667922d82e9cff00ba0420009ff9ed37e8ed1e7423e945fb SHA512 ad49df12b0aec4223690237bd05cb07cb82d5d866b7449c77eb21f6b078cd86d3e708b36f26cfa2a50c80f2d8b17170ad39bfe128e7397cd6e9bf4d09ab3d5b1
-DIST genpatches-4.4-139.experimental.tar.xz 87772 BLAKE2B 4a1099727add8940c8af4f8386ffef761c26d428937e14b5cf843e5f3b4624109b1171006a955eb8dc626dbbfd51b6bb436a97a2702c967026a255c5dbf4f976 SHA512 72af4fc7bb37acb4cc0762b97c431dc2f8d12263f18c628cce305200f285f0179ec8a889d4703d3078f241813f713510979f384a245aff9cce04af7cf96399d4
-DIST genpatches-4.4-139.extras.tar.xz 16468 BLAKE2B 0f8fbf193148d78dc247e18d41c2f7c73219891c7cc78a7602a392ceece8b06511554c00c2e2a327a0781d955faae920921c7860f8996201bdbd4da05ec94f4c SHA512 5624cbc402f1f6188fddd02049298f1d034a5af02fd4ea8a84a39146ecc17f4c1a8c92558320d948cbf3e16a965af697cc3de75210542b33f46fa51c6c22a301
-DIST genpatches-4.4-140.base.tar.xz 2170752 BLAKE2B cd41ff8c9914509613e272e2b4a7bff404d3fd32b21209f4878a0b379d296de96cedf7b3d0f590499805d9a236e4c6d4cbe8887f257788ec9b974ce39ce53f99 SHA512 426270dbd5ec5211c6e31ceecbcf3a8356fde5483982537b6c4752ba269fa7b39c7a8909e0f3616f7fb53f3c10105f43c2ffdfb2f33689923a7856c21be55275
-DIST genpatches-4.4-140.experimental.tar.xz 87764 BLAKE2B c2a92920425a94b9f3101aa870750dcae3234b1c4f9b862a8980cf295d6d5d42c0abe1ebda6fe6ba5d897944099d31d706856d6d7f377cbef3cf5eb047b62c6b SHA512 fa5a0c1dbb00bd04671bf625b85b5263aa34a319f94db7693c7909c828626136d5eeaf3ee3de5a951fcc1cd9d18410a364c0ed15b56f33aa7ee125eabca5f433
-DIST genpatches-4.4-140.extras.tar.xz 16468 BLAKE2B 0c29a4579a4de7934c0f816297823c11124b3a6fce12aa7dde628a83d08b0dd2f56fa5b4606d2b8115668a6631f2031203e312f364db7dc26274e2e4d5f6d6c0 SHA512 34aa5b35b3b1eca213b417536a114eb9011666619466c1e163063904795c202ebe07eac7d594551ad628aae999388cc79c2208ec67b801c8971e25096bf934f8
-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
-DIST genpatches-4.9-108.base.tar.xz 2109320 BLAKE2B 0b6090a5f84a6aea248f6e1ab784cde6e361deb38332486870625ad73d35e7bbb677d6dba2e423e0d946f0f896c6aca8833d9aa51dad6fcd2a18586ff267aecb SHA512 831ca65141984839bee54a16e66b2f45f7f91197d7413b3c54167cab8e14aa52eb3199e2a39f4000d83ed22b601eebe05acc3503dff35e375e3467207cb04ae7
-DIST genpatches-4.9-108.experimental.tar.xz 106392 BLAKE2B 9372c6e3674c0821afdad18b02ec96433e3d05f966a3258949ab15cce4bcb9318880a2c003a8e2b11e230051dfc4614c14c42a7195d492241f398a0ebf51d32f SHA512 c04f80593307cf95f5042b31cd664bfd67dbdc20bc33357c6ec2da749183e34381c218ca9206beb4e962ac9c1aa3033c22c724717016c82be913d208968890c7
-DIST genpatches-4.9-108.extras.tar.xz 17348 BLAKE2B 2c1b5ebbe4075a645b2f19bc516f41634e270c27294f71d6f44cba8009c8f29b39cff16c1ea59368c03c5e17f737bf2bf5e0917ae2c3fe4a53530f89d52dbe80 SHA512 7b55d30a37b234e9de1fd3d34ea0177d7913fbde1451d5b9232a72c096f5fe218aaefa73169fe3473d2e802e0f8c7785d0e9fa9a501a99b52e6e2fcfc95445c8
-DIST genpatches-4.9-109.base.tar.xz 2163312 BLAKE2B f1c8c90ca875064c1750e749aa1d4fa769f709221a805bbc386e3cd455074a2b71a82b15dfa1ed4ca1752869fbbab64d5064d8d4031dd4fb97efb52472d65bae SHA512 69d4c91b69d4d2c6850efa929411d565ca568ebe722adae62d70aa132a6cb8fbe9a3e1e117c6a5e4c5d43262be5f717bb6b2ee975899375065a5415dd5ffb598
-DIST genpatches-4.9-109.experimental.tar.xz 106388 BLAKE2B af09dd2031127f4dfc4b37a5eddc4e8a095b992f5f393ad25a1f9dbc5c6f594daf3da77c985363df452ded27a66b455292b454792f9704390f2d0fb8b1e4adc6 SHA512 c9e3d8285bc7730156b9529edd0269791e406d2cdf2d4056fe03fd43eedcd391392444160c3e1796ae465fa1f6b90a6ccaab80335f8fc681589f455dc85a05f9
-DIST genpatches-4.9-109.extras.tar.xz 17364 BLAKE2B ef6582471bb173341c240e57ac534913818121b96a0af3f86c4a2d47b675ff45bf3751cd45c9058e8bd4b262f7a21e5c9c42c994a7ceb7c86c10fc87232c1f34 SHA512 7af25cd2d50bdb0c8b838776701b0f9238df877efb728ae8f79855948cdef9dd92f705665afd99f92a0c80f20c7f42c7e8ef2285656c19f8ff853fcff46abdd9
-DIST genpatches-4.9-110.base.tar.xz 2180268 BLAKE2B fe0f707079302189ac484fcb67151216cbfc9c84627db81aaf5db32a5dd371ee1a356379a9592ea86d51a7a7534c117dea4be71706ed8b591bfd60e30ebe0c93 SHA512 0b957de2d1f2d09e69a4850dcb31fe0c12d7ab701479d7b952523c9c2c6c4ea1b8ae1521fd02c18c312cc4399dfc81989f2cb7fac0b3468f1bb9e92cb554a6b4
-DIST genpatches-4.9-110.experimental.tar.xz 106392 BLAKE2B 831759d456c12bcfb433f0eb8e4b90b8f2337741415b3272ff77af8d7bc510cc548287318b6672794ae66f645efedfb37c9dd65333fcf2cdd804bda29bbae4bd SHA512 fae0aad5cee94b79bf7f2b70c4d95704408ac5615056aa590a7eb5586234eb46da2b2eb90c762df84b1d0713b84e6aade1505b8ac24e7cb7a08e158782d2fbed
-DIST genpatches-4.9-110.extras.tar.xz 17352 BLAKE2B c4d6d32fd0e61bfb439a543694bf266bb83e886f69b28d03bd1af12e10dbfb4d822517c15688b0acc4473329035a3b87028b3ba39c52429fa385a2125c27db5f SHA512 5adb32f3970030b7cb9e237070ff38d055e2143237c9198e9c651d80102efa1be48e7ce5de5d9515ae7d1363523c4e6c2774d933812b68f4be72824f31daba45
-DIST genpatches-4.9-111.base.tar.xz 2185460 BLAKE2B eb836a00755b7d812fa79aa3755a36618ad55a5cb593065c20acc8ca04aa6ddfd8b86abb7acf5f71f4cb49642b59d07b2426d96219f533d2b5f5abbfa488d3a3 SHA512 a222952f7278e0f33aff78d84455f9909b0b4c28cd137011fd634aa00ef0d9b194d13787deb002d85b474642b95caa9bd1137cb1999c8dd2bffc7c808252c427
-DIST genpatches-4.9-111.experimental.tar.xz 106388 BLAKE2B 77852526bdeebae8f98cb2f86163b91669321a2a3eba50d5832c4ddc3ab7a1f844731afe40c83c4fd836a76f4b791a67e8f43aa0b354f828a48783f8e3db8280 SHA512 fbe3f4657c3dd987471121ccc048b1ce12e41825ff97e43e2caeca4b9cfe2c8069da9c0f17b7af56a00686a073b2aab2c698f5943bf98d18233048f3626d5e85
-DIST genpatches-4.9-111.extras.tar.xz 17356 BLAKE2B d493644ea8f452eca55b31a5a46cd1265413a7439eb71b02e4e56eb80ae93173d67d4799b9040fa531b0e9719e1d9dcea85ab112ee3e5ba43159b826ca7796ee SHA512 df4a6f2b86abad55d1e46ee943a757fac1276e66d3aa107ec6064aca9a7937e256407777184342871548d8d7bf2a452267745d86a8f291ccb65929169223cae4
-DIST genpatches-4.9-112.base.tar.xz 2194176 BLAKE2B 553bd26548e65098f0866b28ecadfc7b0eb413cf081929aba8c15475762d738dc4d99cac6e69fb8751b3f2564e5ebdb60ff05b829fa9d6200819afaa6e3cffd4 SHA512 d41394381b2a0c78b289822b238712ef04d28bad314b394d9f34194df4cece64ff0036eb3d7553a24abb2ce9b817fcfe0c0a698cdcde7cadc46b9df4ee277600
-DIST genpatches-4.9-112.experimental.tar.xz 106364 BLAKE2B 05842eb8ba76f254a499eeca205280b9756e08b5f9afba9f81199207763a04f3bdd6c4b03c67d74d031672e2c189a3180efef3bc3ff1ebf4b9e7cd6f8bf6e1e3 SHA512 038ec30ba1bb37aab87dd4ddc8226f084d9e01a3a7a99711298e220e71a2b8f188bc46481d653ca7177cb1661d0f24475929c02924cc13af173b4c7fa5a151cc
-DIST genpatches-4.9-112.extras.tar.xz 17344 BLAKE2B 2c5030d5254e954c5def20a4bc35d7531733e59aa23c51bce848d0a3af4372c34d00d42e901f5acbb8499b384d647f1996d6a1d0046f8f15fe6b32791399618b SHA512 98e1e6f0ec8c5f67ee23b63f831e6fb96e3581749a7d0c124b24b4b40d1c5ec89a42cb09d68e926e8e78342d450a20c1feb8b78e9ffb918e4a8bc26bf198c8c7
-DIST genpatches-4.9-113.base.tar.xz 2201076 BLAKE2B 36a36f238cbe1a406929fbcfd3f887c2ab2bec31c7ccefe2ca22a1c4695611de58a3639fca988c09bedf208795f303b5b5baeff5f1e8fba38773b741f63fd163 SHA512 3d3e81bbc35c58d0bb920522092d3490e74371f77678bb94570cb457285a4a66a95a7d96b5c7b3512b80dd39d3c0ad5b7d811b83b8ceabb41be085075ec4cd68
-DIST genpatches-4.9-113.experimental.tar.xz 106472 BLAKE2B 36fea162310280dae65417da6dc722bd539ec6b108efcae16ad0ba79ff131b1e59cd343e5de1a8722b051b0ec55df7c65c9a3db217bdfe879ece8f2b84738552 SHA512 5fce146ab8ecdd8a252ba4a2e28b0bd2274c243d4fa5730228ea27cbf7b0470b40b060e51d7753fe66eac4569be650e383acb8204b383d0bed33b851ff0f26d4
-DIST genpatches-4.9-113.extras.tar.xz 17352 BLAKE2B 48d898c4d97fcf1768abd2a8919b9cdadba7e8d6540f68404cc8597cdb192aa7f11a03193799a65a4492f9fb3cbaea43d80eb3185efa4b49d58ec11b33b85ece SHA512 8da5dc558897efcd724ace128818dc2e460899c1cac229eb131c72a868841f6f25d62bdf7d5f88cee065fb95039ab78b04adfbc9c3a7464c8189c0f8edae3e62
-DIST genpatches-4.9-114.base.tar.xz 2222376 BLAKE2B 8f773b85ab1787ceda8be275bde6c46be29ab27db5105bdb65aaa0be38b369df64ea2ae1af5d324810f6eb7c7853bd52bf2154b83743eeabb753c5c821bee67b SHA512 9f7696a84cf257c23b5f4cb4e57e6291961a7b5ee362ab538754251a01299f2014f0f56442b8be179f20cbd6c0de5520ad72bca1a2805ccbb06b55b889a1d2ae
-DIST genpatches-4.9-114.experimental.tar.xz 106388 BLAKE2B ad5fee26f465efc9ca5b4c8c823c51770f0399d2be95b12ed57e47b0ee8a2c3d63cb4a2ce33946c501c59bcb19c516208d831468202acceed5e3a6355f5f26a0 SHA512 8a3c2a8101988ebc5c05ec34e5369dbfef078f6bb87fe8be744672be895282e1031078c688ec64fa9025c3f3750f0340299cb493b15aded109bb8525955e6200
-DIST genpatches-4.9-114.extras.tar.xz 17356 BLAKE2B 53adee41fa88f2979f1857885f06456947cd0c6872a8962922a27a55a5492f22bf6d90d0213087a15b6b783a3d950c6389fb595eda98b3608084f1ef233899a0 SHA512 c6c9aa4e23351f58ac46ebfb088254f2c9690760b972743273700cd76dc873f63fbddaaeff934b64a29956c1ee951917afaef18ae5dcca44d371baafbf321ecf
-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
-DIST genpatches-4.9-74.base.tar.xz 1393624 BLAKE2B 988c985f1c0e6f70d0b4307e42ee0f153a6a287066bd52e8238cffea2b73ab34e2dd65bb2fd923211fd09566b62020a71cb62be1320a6c9a04d5f4e425931725 SHA512 d128939df8670a5140f497521813d5b220ef618d342d94576d2f287df08fca0cae0a4104884202b993e747c5085742f0d7d5ecff39b5f502911efb2d580ce8fd
-DIST genpatches-4.9-74.experimental.tar.xz 106368 BLAKE2B 790d7e4b6f3fbded41a486c623a4b18d47a6598b19e12eaa170c68607a258363485f236009d4032d4d2c17ced519c78ee2d246fd357e4d692aceddd936e3e232 SHA512 68a17e9457b4ec6e089e86db8f1ac129d9394bc07a54e63d230e709dc7c542c99cd3190206b3e2b921799ea64d2fd1076b2178515cd2532b8be9f04e93abb237
-DIST genpatches-4.9-74.extras.tar.xz 17356 BLAKE2B b0c02db68443f53360e0b0cd611af39386c87054b3668c5e3231df6595d1d82b4a767fac65ffaef6f7d29b29447411a2dd70e0dd1f8666a69b9360ea93e3a3cf SHA512 19cef8790311e3b54258df25f9accffec42db2654b82a39f1dde9a154cc0e0789783ea11bb9bb4e4b1b7a3f902bce65ff7898c516993aa9de8e0efc5f3e07b1d
-DIST genpatches-4.9-79.base.tar.xz 1439664 BLAKE2B 2b4b32c798e2080e0e730c408cbae7fde31a89e59ae9291ade87d797da28173ca563fbf9306b3d4b575db11bc5eef26ab8590275802f6c925141c92a377f331b SHA512 359f6bb0e079d3ac905b682ebef7991e446c6fa0b6a88ef8422d950525a791c4055b529d154c16409cae484209a4d71283c93810f1afd01d2ac06fc20199067f
-DIST genpatches-4.9-79.experimental.tar.xz 106344 BLAKE2B e7e874e9a738f4cc1ad68c81a201e77fd8658db65788037bfbb8bb097f2f96434fc6d49b694ba607173457d3c865a212118eeb16c5188c26e31ef9c10043b20b SHA512 0d0b5da7c66a0bbf997940f91c87b7d033b8a88621d3448dfe39c7c2cf6c8483d6178b1cff499463f803e53391eb53e8dd3ee3f3008b9509e3d8f3643ab400b4
-DIST genpatches-4.9-79.extras.tar.xz 17352 BLAKE2B c194973419a011d035ccd6c5d98a90d04c2c2242f18dc950536a7dc9f505de7416047fb0893787f17023951aea59f21062d3f5a3a0d2ad3eab5127dbfb46df9c SHA512 27ff88dae9a66784d842410b0e3f02c66d748dab63fe391701624d4ca398c824819c7a9fa2dd474e62fd29bf7d8576ae4162c53b3127bccbe30a1657a2760ad2
-DIST genpatches-4.9-88.base.tar.xz 1635784 BLAKE2B 984b572eda6e5e529b572e184b4f0a37b6d9f919c4711f5f73a89a8214ab2671bd4ab495e16dfd77e802692e769901865075779cf404f359be14921b0f5e65af SHA512 9041d8fffb4e4242aba90472c2469ced6c71b2ab51c135ae2dfc8bb48e5f56cf7dae9405445282db40dd0ddeb4d8c5ac615d00972ce16550084443964c33260a
-DIST genpatches-4.9-88.experimental.tar.xz 106372 BLAKE2B bece20f11e36c6aa3d40e82a411515aaa71ad00910dc73bbc303b3875d18de664e1b9daca434359f1ad0efdb4500b362d208f5161df4e5846955c671f2dc2d7b SHA512 85210e31c24cb1380ca9c55c63838857808ed57f35982231d0d584e1dc8827008087a51b8ce23c3f947f94085d85a00e822a6cd42e3fee70ad4630e264d7b4b5
-DIST genpatches-4.9-88.extras.tar.xz 17360 BLAKE2B 00e0aeb808a94997964f266f4518b97163f5f25948940ac15a0f77c3a53e8b8ea60361071b332ae095c96957736c1640034ae51a07fdecddbd73d6678ad61897 SHA512 758ca092dc266278b68dedeafe98831961a0eb0beb89f8ffd9dd398b38808cd0d26d0f7c527dcaa4d6fd3bdd33838d37d057fc2a88a3a77723158bcfcbda57cb
-DIST genpatches-4.9-98.base.tar.xz 1905108 BLAKE2B ce390d21113a94d44489155fd554cc83a2496b6a035492993c8fc144a3fc77633649de58bf98d10c03c02d3d4ebec3f9e7a7329f56c89e34b842d61824196490 SHA512 ed71478b4c44fda51349e09f9ca805f519a1873d2fb1de88cbc7ee806ad2117a5809f0eae3a2ccb71ec51652422a8a1754298edf0dabd0064aa87b1a833f518d
-DIST genpatches-4.9-98.experimental.tar.xz 106408 BLAKE2B 27dea027500bf5c2230db2d693875748c1bd021cd3898aebefe041eedfe8a7e39339939810e6a5f48e872403ed3aa4857693545d15f79ff52afde20faa48b2d7 SHA512 e3f76f33094b2bbf0f8cdfa90560a45d20d8341bfa426e18d777ec02ba0e959d99f683f63172588f0dfbb7034d70d70d5d123ecc3cfe50255ef9f4550015550d
-DIST genpatches-4.9-98.extras.tar.xz 17348 BLAKE2B 03b455ea225eb4c99f1c263ed694de45674e2242c00776462a412e8a49fc826cf26630564857207b7944d5b5ff3f8955a3bd0a7ae3a33bc59bc06bd3f0c064f6 SHA512 6bba9882f346577fd685de2172e12708fc757f86efdba63d33d805710e00bf4eacb537968a548528a20d50f5a726516050e0e4e0170d3db652bddbaac9d3f23a
+DIST genpatches-4.14-71.base.tar.xz 1731348 BLAKE2B 0b34671aede1514bde244e76319cd91ad73ce8f6a4b0b5708aef4664bc8bec1e246b407429711dcda49d150415fffb1d1284dccf50ca6e6aff58bfe898d732dd SHA512 9a6154fd4948389f1431833f7f743760dd9ac2ae4f8b6ea045e928384f48823303b2883f84b42f841ec83d0b80ed221011f01d2d94f22afac7eef6fba6c7c6a0
+DIST genpatches-4.14-71.experimental.tar.xz 5228 BLAKE2B 9cf712fc523acd6c7325f2f726e8b658d5df27c9d183d748374a700023f059c40a2eb25bfb1a9b5d682ed0e1fefcc9c88431a421392c7d5ec8a7612d0fb503bc SHA512 6ba3451a7248226b18d37d1496aaee3159f46ae533288f1a090129aef9660b5bdadbff7bd7f90e3677100180afcb09afeb610d1c6a97483815399467ae1ad036
+DIST genpatches-4.14-71.extras.tar.xz 17492 BLAKE2B 6c382cf00c22aba0dd280e6ce7ef0e8689560ca4318205a56b674c9c2f1c01e6942f9fcfcc6d417d56cabba0a762bb6a7250f0df8af5f88a0ac2dfcc02e77af5 SHA512 72ab2425270c43ec4bf36be83f22a25030e0d3ea3a01fc4835fe31652c7a61a07510f01ff99f02f6311eaeff651d249faaf2e0d4315c0983ff0114be91938537
+DIST genpatches-4.14-77.base.tar.xz 1897728 BLAKE2B 0481c22f540d3a8f663717ca5771c480a4c88dcd59323ee313b0fa08f887ec855a43cccf928e21978a666509ee96c1a1eb360909278944e625c0c802a2d7e7ac SHA512 d9433d1e5b9232dca6d74928a835bed1e3f27c0affa96e335895df67cb2f7d11d2ba27cd3f6ac40cc51a5a7a670008df91061be5274d61bcc08eb0f06f90d5fe
+DIST genpatches-4.14-77.experimental.tar.xz 5224 BLAKE2B 8d0b8f1e8a2953e500b9d3e654cd89d40ba0bae53a014b1bee8fb19e6580dbf33687821bb3edbffa2db8daf3fdfb521ce3232f9b4aca0f4d2661be8115220c8c SHA512 a063a5e76f391a0d8011a0a1bb1fa06e6693c7efb211e5d25bfa5f39b6dc216f3c965ec1303a1d865c4b3c1484e03a4b99f3097759a0e15b15ca8b11215a3342
+DIST genpatches-4.14-77.extras.tar.xz 17492 BLAKE2B abaf103790fceab73cacd949473e50b8d678e0fb1ead41a36577a02e48805052c8d10f78ce474c215773117e9aeb97a49123b58a3ce42348520e32415838ec13 SHA512 28db86e6cfeaa3293d5a9db43774d5c0710492e9ca6b750a687b65a4d38e3a6cc196f689025bf7ce8fded4e97a221f4e2c4352e1ffc2a465fb3546a8d6712536
+DIST genpatches-4.14-78.base.tar.xz 1929676 BLAKE2B 6021bef7b29ba475ff72d28cd908540555131d482f31086f449ba01fdcb3cab3994f55fec9e7247ab3099f82ff49b671f157b56604735bb8d2414b446c74d530 SHA512 f77d30b803273a271fb60bc2e14a31149bb20816d161567d32423ceaecde64eef256450ddf596da19c47214cb1ab86a71b95f673f6600f0d10540c9be25c1866
+DIST genpatches-4.14-78.experimental.tar.xz 5224 BLAKE2B 8d0b8f1e8a2953e500b9d3e654cd89d40ba0bae53a014b1bee8fb19e6580dbf33687821bb3edbffa2db8daf3fdfb521ce3232f9b4aca0f4d2661be8115220c8c SHA512 a063a5e76f391a0d8011a0a1bb1fa06e6693c7efb211e5d25bfa5f39b6dc216f3c965ec1303a1d865c4b3c1484e03a4b99f3097759a0e15b15ca8b11215a3342
+DIST genpatches-4.14-78.extras.tar.xz 17492 BLAKE2B 204b65089d2f320424fff929d21f3ba9f6c630adca2017b5789003ed310df8025b57e9984a0c03486f065fac26c4f7aecf8cee3f694ce860a9749327057501c1 SHA512 e2ac22696b426d52f71424209493ce5305fa6b4b611a7ab51a7818e09493507f5cb006a9b5c6295bebd30faf31619f4b4acaa7cc8b82088c4efe7893f5d37f3a
+DIST genpatches-4.14-79.base.tar.xz 1941112 BLAKE2B eadad4bd05e013fa68a47a420cfd76764df91f12ae1f25fc1e32fa30b7da999ac3eae42aaf6ae14a18b949f28adb4f4ec1557bc2a6cb3d496954851066b06a24 SHA512 8955f649752dd1bf2e8223f8bf6ac65a8b8775299a34c8d9ea3a7bb37d744444fd013b30118be9041a59a54671a3f5cf517d840b2f83f9fe431bcc51e7019508
+DIST genpatches-4.14-79.experimental.tar.xz 5224 BLAKE2B f03b0806ab474eb5fc3fe58a873cea76c16d39fe87629a15941eee0eca9b980714f099526741df8b2ce7203cadb7b0b1680422083b61e4725152421d43f737bb SHA512 5de7d487a229d26ab62518a670a55cd41f563455084c6f8a55f035c613df969e8c0698518243081859cb52c4e7df0fb6cb349c841fcb979e9a94212617ec523f
+DIST genpatches-4.14-79.extras.tar.xz 17496 BLAKE2B c543f7d58552cd519dd722f1d7912909a2216868201a5d5b3712a96b17f41b9f05df24fbee03d874a5fb2d8b8e32eb35907cc0ed569c85bdf4dd5be942d1680a SHA512 d789ae7affb905622f1d556f07450a842974296f7fa109152a9edba74e41fdf4f5ea0f1bc6a054ca02a4fbb99f472b85b2bef4005335e6e1a7c112a993220491
+DIST genpatches-4.14-80.base.tar.xz 1970464 BLAKE2B cdb1a4c7f6b6412e6936be19bcb4f429c035b5d46d03c2aeb8a90d588eafd7427b5968ff42f8c44b6332e53223f4da0c6e46d8891f981a3180fadb3a9c455c37 SHA512 327a2bf6effe3479a202e6a6bf8a9318804ff84f53050f786546d6d1fa265ad068a0fd4df5c1d64724f613a076c10d305a48f0e68ab2f119fa7e9ec0a200f979
+DIST genpatches-4.14-80.experimental.tar.xz 5228 BLAKE2B 0ac2b4b56e615216918d7f5739668223d4692a9dd1273202c6b346f223b149e306797693c1ac034e4316102e774a472bc8872c9486a862f841f20c0f13ba4d4f SHA512 9f143960a869c2ef2ab9ef31dc73de3f1ea9b1a34ceac332f6e7ac448d4380ceb7359b9014298a6f17cce2d12bfe270b2af112dd60a7feadf994ad28d5a717da
+DIST genpatches-4.14-80.extras.tar.xz 17496 BLAKE2B 9668753679261522d678778c29b3637388624ab6a8ae1223241c5c47979083caaa37b4926d7239ff574977c29afc66c7147a34eb42538f1f10fa7b5006fdaea4 SHA512 0459e6453a44ae88870890756b9e3a852b3da0356c3df723e4f81593a52d85b5547ce18470ca831f3f0eeb43feebbc5255167c8a73e69d6b94719b4b2167ac86
+DIST genpatches-4.14-81.base.tar.xz 1993216 BLAKE2B 96a60ade763801820a818d18973abec10833104da7f067c03863883aa94e96ea5134599e913015d551cae27b5f9a56efb87b10a60265608fd230567244bc371e SHA512 bb9e356425ea24e01350384956ebaaf3f9677449b2b0393dc130c586e7b337442d3a38a6b138009838d8dfeeaf89c61e1257c8a13eb79749dc5cd96132d06c3f
+DIST genpatches-4.14-81.experimental.tar.xz 5228 BLAKE2B 0ac2b4b56e615216918d7f5739668223d4692a9dd1273202c6b346f223b149e306797693c1ac034e4316102e774a472bc8872c9486a862f841f20c0f13ba4d4f SHA512 9f143960a869c2ef2ab9ef31dc73de3f1ea9b1a34ceac332f6e7ac448d4380ceb7359b9014298a6f17cce2d12bfe270b2af112dd60a7feadf994ad28d5a717da
+DIST genpatches-4.14-81.extras.tar.xz 17496 BLAKE2B 9668753679261522d678778c29b3637388624ab6a8ae1223241c5c47979083caaa37b4926d7239ff574977c29afc66c7147a34eb42538f1f10fa7b5006fdaea4 SHA512 0459e6453a44ae88870890756b9e3a852b3da0356c3df723e4f81593a52d85b5547ce18470ca831f3f0eeb43feebbc5255167c8a73e69d6b94719b4b2167ac86
+DIST genpatches-4.14-82.base.tar.xz 2005944 BLAKE2B aba29a0c50aafc3827c3516736b2cd866952634982ec9e263c2fd6a260111469d7ed66ab3c9e3d8e3119a42b8a2c1f448b6fabb54eac9f893653e1a42fda621b SHA512 a804cea5fe03f1d826d9f654e30abf2d3b15a4d0d0c01fce37ed6a5c216c38082563257c715801d248cef2ef224f04f2d3ec17c85f1576debf94f2a8e35de877
+DIST genpatches-4.14-82.experimental.tar.xz 5228 BLAKE2B 935ebacd334480a9b2158b007c3cbe5f4c294578ff4d3183beeab265c0d0d3ebe0ea0676c83eb7e882341ded772e0289950506e5916a5072453b7aad22f5085a SHA512 c2fa8d3ca9603d6f970da0d56b57785b14a92713b0ac2eb80729351650ee954c9472dd5e581449e08e7b11556ec4dae5af783a9595d2efe4f97d677eb8b991f4
+DIST genpatches-4.14-82.extras.tar.xz 17476 BLAKE2B 3d19e44e381105fc312aedea0cf1abd588c9020f499c3c7370dca8ebae604911c21f94b6630bd6242ba6d2fd9aff777d8e9e5b44a7d6d3405edd25d665a812f3 SHA512 cd66cd90020da58ff88cb50bfd76c1257ce8ab0ae69b29c480d8d6eb5666dfe1589716aa64678f3f921fd8b4e9668b994f568d2dcf8ee234750ef254060fca47
+DIST genpatches-4.14-84.base.tar.xz 2036956 BLAKE2B 588ac8a824ca7b34629e38d27468f16351ed0e33004c95f36b74b6aafd2d74b6b91e05a1d96524d8f02a360ab0bd8d43c0c1f736b2e06f7222e86c131cc7c320 SHA512 50d42017c1bb87d95f1003042cc35cf727021c16f2eef1337b7d4e6816186edd314042d80ceeb9f125dbc15c97145a48b4b823f093a7088b849a048276b91a9b
+DIST genpatches-4.14-84.experimental.tar.xz 5228 BLAKE2B 81938c317aac4669ea29895ac91d8a5445ea41c82a1bc78f673e1c552415a77428e71f30170537064ebed698095cc47431777f3d562795138d7c065cd121eef7 SHA512 72f1bd49724ae8f548377724acfc30665b92f29d8e67dbd11495ba82a5044accc8913ddd84e5cac1f3660a76adfdd5057b4e4cff3754c14f10d1e672c4196d59
+DIST genpatches-4.14-84.extras.tar.xz 17484 BLAKE2B a85d48a013393e6bb775c93138d447d806f78608175789e19acfa7acfa0d2f35c2c4d0e4fce6944112dbc56a6e38de25d9cf107a398c76813f9d7c2cbd65deb0 SHA512 23fa91880759b9ada54de2656086e2af252bd3e8ee35baaf43b615231bdf20ebeae28c18b677ef470a0231c3731d9699806e50d32f6fbd87df1b89d332d0a07b
+DIST genpatches-4.14-85.base.tar.xz 2050508 BLAKE2B 3d4b9917b538d6f906f8112cce00d06e07d09783fce9478ce7f166c900707d56cc147d30ffe4dcc6f26c1975881aa2771dfb76dd21d3580dc47430c035d6d850 SHA512 23b1b30c43e78ebe57c7dc06fb6a6aea035b1160d421c6577eaeb5afe0eb8c72390eb5b33e708990f3c0452fad4678946a74279f3e9ba547ebd385f59bfc6ead
+DIST genpatches-4.14-85.experimental.tar.xz 5224 BLAKE2B dcedc912566883c0c57934acc23a8c5d89c95d14bc3e6f52b715562a414a535896774f5e184c1c83f1d601c32231ab3b98579eac848fd6a71ee7f833a044088a SHA512 6beeb2a40e8f668f833da082d79fa33a3901891a7f062fca56f4f6182fe6d6368466ed9eef4ad1daddc62b383ec5aeb8189b09577b33fd39be9b53e1e53c920a
+DIST genpatches-4.14-85.extras.tar.xz 17492 BLAKE2B 220ed00e4813e2b94bc1815e5cdca40409239864b1447bc7eb261a37a6b132b92935f0cf1a01749d4d2b2522c7e932c2e5fd3eb127fb0d09b7b3615dcb8d531c SHA512 fa0cf06245bb72a36bece9cd98daa55ae49b82e08ad5bdd3474ac6fd875f43278eaaf85e64620c120856700222e4f8b61102cb0349566be3a2f39e561140bd43
+DIST genpatches-4.18-12.base.tar.xz 237564 BLAKE2B 221499b05746862c8d7261959b63791efc1450329ec50b14d487306fa97398c364ee553922bdfb7b4dbf688792fcb778e6a30a57a6df10099f5367f01f1869db SHA512 08efe1e89151e1c7c2e19ca48380fa797297879d83b7a51ea3278a966a39324a2a1e5f66f2e46a64ed88d24c243576b119967d3bbccfdb78c7388525bbdb9472
+DIST genpatches-4.18-12.experimental.tar.xz 5224 BLAKE2B 8d0b8f1e8a2953e500b9d3e654cd89d40ba0bae53a014b1bee8fb19e6580dbf33687821bb3edbffa2db8daf3fdfb521ce3232f9b4aca0f4d2661be8115220c8c SHA512 a063a5e76f391a0d8011a0a1bb1fa06e6693c7efb211e5d25bfa5f39b6dc216f3c965ec1303a1d865c4b3c1484e03a4b99f3097759a0e15b15ca8b11215a3342
+DIST genpatches-4.18-12.extras.tar.xz 17508 BLAKE2B c324b68771942f0372d0f4f34904e3f52b021ef36453002732ab041096714cb9949f03840ab7bc2197c498ff3bfd6d8f4f7000a27e9668b9cc9d3c90e40dc466 SHA512 746c0bab36b8a1ca9171882cb21735378a12636ce5e157dcebe3b286abb5392c6a2e099226cce5bca77ad808c233c9f968aeceb2fc4744a94cc9c2372dacfaf9
+DIST genpatches-4.18-13.base.tar.xz 291576 BLAKE2B 1509cc8eb389160035e4a5c8302a6a1691172c9a16c38b7639ce77db5e929fbc8dd309c8bbe256812429e0301197efc002e13d6de8a040e147d93203b389935b SHA512 b7fbef424051f03baee67db1996165cd7335368d355fba17c2bac9fbeeda03bfd76c8813d6e3d73a8e62350f4db3e450336cad41ae1358a23539c6d01647ee8b
+DIST genpatches-4.18-13.experimental.tar.xz 5220 BLAKE2B 96fd84ec13f0d71c3b1c45d042e3aa8c23c2adcb8db245e61ad9c4e241f452690475d9e0515b8f852961cee3821d62e728485cda31799d9500400811cbcfc4e1 SHA512 6ccacee89ee451ed648a926e44cb55e077034086496f34550b8891d854840743ff2a13caad8ec0c921b05243f71e626bec8041024f0f7c5a27d7e48d27b8db40
+DIST genpatches-4.18-13.extras.tar.xz 17496 BLAKE2B defec1bd1c54e450673498b22bb6f5726b728781a1060fd66180b481d933458c7fa95c0d2835c44bfa6a215b4029d1185378ef94ec81476f0ecd454bded77ddb SHA512 66ff28aaa4666011a9879cb8a103e1c0f500d0a35393fd1055bebd86b141dbe85cfe8006840e76fac8cd9ea72e0cf85e051f33cab09223e78c7ab7fa893decc7
+DIST genpatches-4.18-14.base.tar.xz 313244 BLAKE2B a47c0b01dffdc9480d99137b8d2d2ee4d125e86fdc653e6ed54acadb4818ee12b904335bd996577fb12a0132ffd8f565da9669b4033531fdb1cb53ff28a5c9a7 SHA512 8f59ef57c0c698932032e181044b2fd78d6f43a8022b75139c6aade451d946816329129047de8514d4c2f6c0c6eedf6a16786063584bb2c141e1a50fb83debd9
+DIST genpatches-4.18-14.experimental.tar.xz 5224 BLAKE2B 659859efd41430c3da5c104cc8e148d85df75ec323364f845a2f15b848544aaf0d7d9cd8b595c04a9209542bdb865874b9c8928d264ba896a70d701690464869 SHA512 50e172f6244741ed6d5e440ab55c4928c11c7cbe9d2bdc5891bd254e2aa05b7ed0387e85d3135745af0e056dfc0be9a325581d5cf38df1659d89cf387ed72625
+DIST genpatches-4.18-14.extras.tar.xz 17512 BLAKE2B f9a02074660a4f2c7b24d00035f0e529a1283a853d7271dea8a459fa1d5a6a2508ad400e828e47ac1b1f610b0732a9380301951f091cc9657d15f9c784e0d9ff SHA512 e27f7d5fc0ea35cb66d8478c83df36d5c28d2eaa87b65cdea77254d7cd665ba0f2a016927ba70e71c33920d80341270bc5419c610971989b1ec573631be080ab
+DIST genpatches-4.18-15.base.tar.xz 370976 BLAKE2B d52c551875151b809e9b3ae28f23add15dba9ee258e0e3b85ff4e00d2b7deb42a1a0ec5ac237f62761ec2e90b1c509c68be74ba52f8ee637b80a912217e75b31 SHA512 026f3003ad668ab1cf409115411319d6efa08fc41e1f48e91c494d7524d86f2ec5a341ad2055bd622aa56f56ba480fc5f9975ab272f6ae994315ded1942e6e78
+DIST genpatches-4.18-15.experimental.tar.xz 5216 BLAKE2B a83c158e2af03afa637fba6dd934fd2db8168940b856cb2c7e0a9a9489db1b0393852589d1532f8a58463c54a159914621095f47275bec1cb97f29774fd29499 SHA512 7b462f37ab6dfc25b184b225d14f2483b1d14f52c0b0dd7c85884787811545b2137843d393dea98bf7440e2bfbbf82240f31abc136a8e4cdde85c9ae0dee9f33
+DIST genpatches-4.18-15.extras.tar.xz 17524 BLAKE2B ec0af95e43a958eb548233b7b18685471d5d26c1c3760e1f0d1ff1e1b757a4bb85d9bff5afc376711661badf528d07ddc9ffab8a670d090c4f453d7d27d7f53e SHA512 a73360051da5a9e59ec5e92dba2a934c158b1d9c806ba89cf02e3c34149825439db8d93627d55bdeb2050105ce2d63a1c56b871bc83a61f92b5cfe7cda40bf1a
+DIST genpatches-4.18-16.base.tar.xz 422672 BLAKE2B 688de9ccda3e62656a046207aeaa2bf09d3c3f7138a78343e2d362099f0f3b245ac59be420db4f209dbdcf3f1d1ac6ae1ac5fc96713e91c5088123dc03d6e5e7 SHA512 6e55ce52f2175a897dc2ada9ba76befe48a9c19544b3df1a39540d5e66fac7351e9fbe0799f6f6f23923a48f17d6181ba580c7e3afd40029039f5e6bfc826a0e
+DIST genpatches-4.18-16.experimental.tar.xz 5228 BLAKE2B 558fd2197c5ccdb034b6d6284dd90ccd92cba09993fa58996febf340a6225bc46c458c3e9e47f69f1f31dc4ffa31675f3f9a33f7e5c0b499afe7db2b1c2b71fe SHA512 c64277edadd67d46d2e9a97c423fab5ab5e7d2a21e27b54c1118400b15d6fd5b406d3ac3fc9b6bc8ee49b94801748f88df7cbbd439e62e6061bf36d27c703dfd
+DIST genpatches-4.18-16.extras.tar.xz 17500 BLAKE2B f3bfb098fdb5db5651c78fdb26ce927420dc6cf08479b98cd820284e21f6323c8a3e95000c8839ae7de88b3088a96725607611979408fb553534c4531ddee69f SHA512 13dc9cace14c765301deb1ad929f4564565a480c7b347b25878122fe103a528198e9601288b6b930aee3d6ac703d03e9ed236e9954f3fb2194d0ac49488bddc0
+DIST genpatches-4.18-17.base.tar.xz 434484 BLAKE2B f42a17a28b03589f67ec3c37f627cb8a0c35c98c3be3d9ad5733607a6c11c238f41d3216f2e9d82290899a59ce831ce826ab925ec710991f7f5e3a578af36d53 SHA512 d2efd7a23ee284cd5841c82a93d232297b2f21ce756337cc35a4e9920563a154db2239db88e9ba6c89cb3feb99073747aaa8571d527d023741c7cebe2d551995
+DIST genpatches-4.18-17.experimental.tar.xz 5228 BLAKE2B 558fd2197c5ccdb034b6d6284dd90ccd92cba09993fa58996febf340a6225bc46c458c3e9e47f69f1f31dc4ffa31675f3f9a33f7e5c0b499afe7db2b1c2b71fe SHA512 c64277edadd67d46d2e9a97c423fab5ab5e7d2a21e27b54c1118400b15d6fd5b406d3ac3fc9b6bc8ee49b94801748f88df7cbbd439e62e6061bf36d27c703dfd
+DIST genpatches-4.18-17.extras.tar.xz 17500 BLAKE2B f3bfb098fdb5db5651c78fdb26ce927420dc6cf08479b98cd820284e21f6323c8a3e95000c8839ae7de88b3088a96725607611979408fb553534c4531ddee69f SHA512 13dc9cace14c765301deb1ad929f4564565a480c7b347b25878122fe103a528198e9601288b6b930aee3d6ac703d03e9ed236e9954f3fb2194d0ac49488bddc0
+DIST genpatches-4.18-18.base.tar.xz 474704 BLAKE2B 66fc0675de5c337c7ef913e276c4b71ad45eec0ca21ccfe9ed5913408885ab8722f85451cefdfc6ea686a270ed9773295d60ebaebb8c61c068913d59d04b8e7b SHA512 dbd05cb459628e23043180df5bfcd33c22c859ae2b3e849d325b8234cd8eff423ff4f9ea58af91bb5b347450f43ca33ce97fe0f43d8f3c8d52f53984b5fb8c4a
+DIST genpatches-4.18-18.experimental.tar.xz 5228 BLAKE2B 81938c317aac4669ea29895ac91d8a5445ea41c82a1bc78f673e1c552415a77428e71f30170537064ebed698095cc47431777f3d562795138d7c065cd121eef7 SHA512 72f1bd49724ae8f548377724acfc30665b92f29d8e67dbd11495ba82a5044accc8913ddd84e5cac1f3660a76adfdd5057b4e4cff3754c14f10d1e672c4196d59
+DIST genpatches-4.18-18.extras.tar.xz 17504 BLAKE2B 6b3b9b142b9fd254af235217c1681f41019e1c789c2162f7735052698b68e583788503cfd0f151df8ca45b5d528a81f103727f74704db73cbf58b9ec5499d142 SHA512 d132b8c44e94409b44dd0d2d51886a189b7233f5441cf38a5785ea6742849a1d67764ec3a1f702ac7d49b4050ec2af00d1cd8f61bc9b636e019f474ba0812705
+DIST genpatches-4.18-19.base.tar.xz 491560 BLAKE2B 37464af933a0611a40bb0795e2639c0b0e8ecd112a6b7664d3ce19932a25ca4c6a5f36a7eb07005abb7c85c7be3bd8fbcae6e2959031467d871f62c5b89f571e SHA512 7b07af0ece2511fb4cb39ef35c9ba926a6d2e34eb24829f957876e6be6f56ad6bae89d6aa818ae81bcdffb16e26471a4fa9adcc4ac6f48efb3e53151310755c9
+DIST genpatches-4.18-19.experimental.tar.xz 5220 BLAKE2B ae3cfe1a10e76bd22905db948770fb51bc3181a4218f1a4f010d656ad41528ada6f6e507de1bc238cd68b6e6f3cd5a87aa7ff6a3516e441b672b902a4402ea76 SHA512 937b8db859823aa2612430cc24e2e4441afa20539fa2427c15182d21aaf9bb2d2cf1d520a2a9fb2d04971c9bd75b885205fda940d89ff892c290b92db1cca13f
+DIST genpatches-4.18-19.extras.tar.xz 17512 BLAKE2B eb3d70211535ca9fc9a58ef02304d2ff87c48acc5c47804de401599c8618cc1adede45ab2cb9bb59acfde6c7434bf8cdf32f6efd2c2fdf4d34ed619882a04b89 SHA512 35dfcc2122fe3d383bcf9da1ee032f21bc0dc4f36d29c82e829270775c21d8a816eace717a1e65938f4b01eec7b1f584f865d5a9ee997e732292f9840ace9005
 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
-DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
-DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-EBUILD aufs-sources-4.14.44.ebuild 2230 BLAKE2B e5a06f9e819599658526607116c660f5d5305dc3f39413beea6eed4886940078b9bef7f71785f853ff3ada209b4c770e09689a49ce5f5937eb77ad37da037867 SHA512 2196f6d6bd22b18613955450aba2c7608e6b2745136d155a19fc950d7ae059ec325015c921fb1117ed94ada4892bb862d8a143161eee0b375cfce18d9533997e
-EBUILD aufs-sources-4.14.47.ebuild 2230 BLAKE2B bc6e55fa702b32487a545ff8857e1d8a45096ee5984e2269ed18051ee893be73b309d46183109f7657b7e9a5207e08f99b51046ae0e506035f4e5c862774a8bf SHA512 b7635de258e1c90d05309958854bf50f8f896f504b745ac2c6e3464c1dcd186f2ce028baa2c061f0dfd92aa3c0a3568089849a27790067702e498cf0863cac73
-EBUILD aufs-sources-4.14.48.ebuild 2230 BLAKE2B 59dc21131797dc34e7c5a6393c757c4095b9e0a12fdf09c886d7094534ff85853eb3fa1aae6ae0b134cc9c7cd4a9177799399cf4d8a32148f399fe828fc1c82e SHA512 18e3164f84a42e650622c6713303d850fc0d3974269bd3fda4e5a3343d3f0244f2949ae541a87d683b9da1d85a83cc636e721bf7b3411d68a834a613067d1892
-EBUILD aufs-sources-4.14.49.ebuild 2230 BLAKE2B e9edc6d49bd5f48b34bf28ab87ac57ba2d30f0d9e010eec5d2f2bca60bfb19a64deb15743c192fa9beac0ab56c843bf9bba2894351aa1261209688e1ab719fa0 SHA512 c597ff908e57fc3987cf4c16769e61a640d9b782c2281e5bafa355714b44bfbb23a093f7dbfc4ec6b36fb2b5903a453a873892909ba908c0edac0611f52ff624
-EBUILD aufs-sources-4.14.50.ebuild 2230 BLAKE2B 05439af8e847ae47dcb2dc213a25f3a859b1c1f2a4bd23a487c9bd9b8f673d86c85b410c971d1988f5bf0fa0e97cee9343ddca4cee3922b56899dba473cfc303 SHA512 8e02b16fc4fa95294ae6ce4c7616b65fca0cec711e4d6585395678a1cbb90941be89f2c54cf033fa9d98f45aadf507930e322ea37665b251ce4ce682afddd80b
-EBUILD aufs-sources-4.14.51.ebuild 2230 BLAKE2B 884cd09efc828fe7f8396c07a8a96d753d36adf66c12219b2e209320f7e7a026d1de6ebc2c5118c214b522a01021f7d98580fa66a12fdfdb1aa45f46212e4982 SHA512 0b71ebf90e8e29d764c340012c5a1b31fbee92949e404da249e7f1a6c4d64228edb8487ee5615e641179d35bc9d2f95a0f8b9a992963d15f709a671d3eb78ddd
+DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
 EBUILD aufs-sources-4.14.52.ebuild 2230 BLAKE2B 2eeb0a53156ee59ca5a9f6a47331b3e0bfbddbc14f52e9d00e0ef9459eef31a939adaba454e495b070c8313b3e2856b7dfdadff3fab95a619895fd6862ce9476 SHA512 8c1867f16fcc80d773b5e8b5d91f73eaa2c01a7c2ef06484a63ee8273fd0839408476999baea47661bbacbce4d3e3f0f78b080bf433bb72f6bdb950b27ca88bc
-EBUILD aufs-sources-4.14.53.ebuild 2230 BLAKE2B 42ffb4fb0db5b1c4d8ce115c7e46b9d8c01daf945de015dc50597613730209f83bb18b79181a6eca7eb828115c25a8eb52226d981fed622e4fcba99b9b1411b1 SHA512 f9f4fdf67fc32d69e7e9160c80816d3df156fecfce56d91c0100485e45f26ce45e37d29b107a955204245f3bf50c9c4a9710a275ea5e7551b4489cb3c0a07ccf
-EBUILD aufs-sources-4.16.18.ebuild 2230 BLAKE2B cb8cdf9f96aab641edfa648df4ed8983705ff3fa5145bd1f3328cfebce9269f969154050036f9c299f28555796232bb417df1aaeff0440e4baa32963fa6efa0b SHA512 e7e5ff7dc20eba01e614e87ca86f05ee0f342c170022fa6844e6bc0c4370158e31f51de6002f087e08d3ca1ecdfbca7d7e7a8949a50c95a5631148b27aa50ccf
-EBUILD aufs-sources-4.17.0.ebuild 2229 BLAKE2B b636be6195e9a785bd259e8641f059fc278a0ad7aa4b139ea8b23c06051bc49b56425182d651903a8a1408e35ac580920949ec4ced3506971f281976d6a749b0 SHA512 2bcedfd8ad6ca1d3fe743b2552e8fc33508e034addc020b9fe32225da9c43a3374355b3e81fd01870f71df68a16097db1f267146ef30b7db7e2ee20894d70299
-EBUILD aufs-sources-4.17.1.ebuild 2229 BLAKE2B 3b3f360e8b1997eb5d2f3a7390d384b1a32fbd2928aff67d88f103046ab5ca4e879cf8b4c43107d27407a225985960aa8f2205b6f497dc702434a344c4e660bb SHA512 5ea74cb5b0fad1b85abf7baed109ee2fc26d45d5a1eb52ef8946f018f35887dcfe92dd0b74da599e0adf2b0c67ed0a4fa32f14fdc88e59d9277ee6224f4a23a2
-EBUILD aufs-sources-4.17.2.ebuild 2229 BLAKE2B b048d567ba06f0ba41a50d46990b6401591043a20c2f0cbcfe0cb68aa72016c272eb5acd23835682b453456244455788b9e38ad2ace9d048291a0e9bf1ae6914 SHA512 e7b372a6bef31fb496e31526134506045e4f85682831381fe5fe67c9e2eb897af304db576f733627a881e1a2db9e9d1c7c72b84c29c132c6a357f94b0e5f1aaa
-EBUILD aufs-sources-4.17.3.ebuild 2229 BLAKE2B 4c801149ec7ba578df6c656c625fd6a464a89c2e4ecf2aebec7766f7708050fcef45da975a976c139b050d75128e7bb3462ad5004decacbe22c117f0042c2801 SHA512 0112a684348aaaaf0811a1d45815de880bf59a67ee51276804b1a208931f6893a6f2582eb22dbedb1075fa37dad14ade179257693a64c2ef6a15e37b036f6372
-EBUILD aufs-sources-4.17.4.ebuild 2229 BLAKE2B d56e9431e38eebe1537b32f7bdbf7746c613b81b1cbcdf77d1e66cb5dcf75b22e8251b49a89c2de1ccbc3807f8e78fff340582672353ac946add677ceb58d1e4 SHA512 68ad13a454a0b8d63aac62dd223ad095d323ce04e1dd2d8ca977cb642e52bff0a9c2880454d4ce3f0762e0943de328f15ab0cf6a0c8784df37ad4ba5fe157fc8
-EBUILD aufs-sources-4.4.111-r1.ebuild 2230 BLAKE2B 88826920ce4a394b5c46c94e93688ee402942adedb38bc83a89289e6e06e2a67e2e3340e1dcbc9e57e105d42d7446d3a8babafeef460e04727db00af6b272bac SHA512 e41732c3c3f822c6aad493a2a727e9ad9b06ba07734b62214b953388db85f378adce14ec75de9fc0540a3c95de75fd90ffccddbfbeee9dd980eb293e513bafdc
-EBUILD aufs-sources-4.4.128.ebuild 2230 BLAKE2B 9c8b376a76e71d4383c4f45abd1e4f1656c40bce6c73cf4df4f6a7ce1a5cbb4fc7ef5eb351c70f76548ab579811c7529adf6fb9e8ad7ca1d2feb9974aee8f0f3 SHA512 d7aa57ecbcd5564e373af977f81b01cdf723f1ddaeb30676ca448827d2088c96e0e7d711df4c64c16552f415ae9c412652a8bca1b249e93402e505a6eaf7b57f
-EBUILD aufs-sources-4.4.136.ebuild 2230 BLAKE2B e662810e6d41d752e94a9edb10f986ffc1f87cd2b6e001a4eac2a641eee851b24fa49f2970dec7c40e146114b7d0fcfc973b5dae5287941a8de7c5ac32ea8cc2 SHA512 609e267541f1b18087191fb3f6ab4b66c91913278510a9c03ba3845f7e1ef105031c29ecbe259984ef599d0018a843372b0d544b5f0af5c689307df58178aa98
-EBUILD aufs-sources-4.4.137.ebuild 2230 BLAKE2B 19764d22531524c8894d191ddf8ba6da6d5e3fd380347fa271a1e5b65ae5063d0716b6f8511c4deff25b4ec0200a5a49b2e398afdadccfea7b1a95ec916d7b38 SHA512 1e6a757c3fe282b3a790d47d1ff046959c49139518c90cfef5bf68b709aa4768642a62ee2e6465966a2a5896f124aa0c0a31d284c10b43dd2b9ec27974d48350
-EBUILD aufs-sources-4.4.138.ebuild 2230 BLAKE2B 0f5bd879be723089d6be7cdc159323680b8913764594236969ac283348a360f31cd3ac994d31f95cc1ca61347e83a992fff44e97ac8c175e0de045e66511550f SHA512 40e290406c82ee57c7858c73ad8cf4bbf52fda55ba579193b67b21fa7d3f6c47affcafce131c81ce670f57eb652074416e7c0f0e7df92398e2e075d82da4662a
-EBUILD aufs-sources-4.4.87-r1.ebuild 2229 BLAKE2B c833f0bdf1e89ee3f3a3258de89a4e53c1d35cd7774fd2e93e1ce0cc532f6995f4ff99d1df83de37acd82fac150fd7f305b08588e4b48727ac865b5758889381 SHA512 f6caec63aba14857d6992cc9d2edd2b6bc345c93a2ab36efe6b87e5d6412c295d64d4777bf9174a71d3fdecaa90d5af7596c66343a2b875d5be1b6d1e64971a1
-EBUILD aufs-sources-4.9.105.ebuild 2230 BLAKE2B 517507d37998f58ef2786b85e2ccd8cd3bf6de4033e5212e33e5af05f6473f29794bb23dab4e565128403b0610861ffc224a9da9a89aeeffa58ff1e947963959 SHA512 274c76ddf415af6d72334ac2927f750401ee3278516f70ff11d68993d3e8f184785a977195992b6e52f98bc54f9dfcf96dcaa1f28e6280073a244460a9bee8b3
-EBUILD aufs-sources-4.9.106.ebuild 2230 BLAKE2B 7f4875ae063d462c2402eb64088d6ebb979829f86205ef032b4b956dee191e1a952abac4c3946a7de541d0e4497322a7ddd15dd526d229b8456c4b05c778982c SHA512 9d58e207d31078992775dffa30c6809b39f560e58567176f19429e8b4e90172871ed0fbe2e0da0c1ed5b28e51db97e6048a486a5a173ea983d2e5562bdb5545b
-EBUILD aufs-sources-4.9.107.ebuild 2230 BLAKE2B a5f574ea8e1df86601ed417a7b311e1ada6b36ae686ed10b0cd6ed0c0881c8b1458ff74e0afb8d98231d998b22db137ff32b135a948304992cfd6174163a0a7f SHA512 e405a5d3b6a7f5ee32e7cb27e207aa98f65d6f761112f0dfa1f01e109c81e0e5aafeffaeaf46fa785d49a7a3aaba37f1d471889d673ce7a028561bf0192ea673
-EBUILD aufs-sources-4.9.108.ebuild 2230 BLAKE2B 9e617aeb45bc9d1ede03fc7ae68fc4e60421a650427a21bfebfad958973d317ff303b06d4043e88bc82f8e39aa39f0a6be16f3493fdd7a668e4b027074478319 SHA512 ab63580640477b6199328f69b60cd3a3bdc24215be12278effa8ec11aed34fa40227eb26e191ebc1cbf056a516aa9ffa5eb757a1f60d69bfbb7498e39e8972dd
-EBUILD aufs-sources-4.9.109.ebuild 2230 BLAKE2B d0acd1baaf6204a43d6e091ff9be82ae0e7a5945450171a46141ab3adc0202c6bc385ab02424c23df947c1adee703a5b7b9d5b1a0724bce6940e5964345c3d8f SHA512 5f022f758574b87626464f0b8f6a5ce4497a1ba810acb4aaf6c597d2db763401bf37ecaaaf15f796d8ca2520c5bb6b2483e2d15d42e28b9868775fdaecbfa746
-EBUILD aufs-sources-4.9.110.ebuild 2230 BLAKE2B f57b2718b6473aad81de3d69295854fe341575ecd36be348c78eb542be518077c7a9bcfa6fb396e6c56c26454c8f27fa820772c26b89272006282f9197516e00 SHA512 95497f360e965fdeabec81a1e8c1cd7309cb53444193cd98c0b042efe3952e9d3bb47dc3ffca1b445f8959638ebe9004b52e1a47640b08532a49308cf05c7493
-EBUILD aufs-sources-4.9.111.ebuild 2230 BLAKE2B d690f6ada449e058003e4adc297ea63c686da2e8d77e0717a007ddc267b6ef4d80a0f0ac316b8a8a13659d71b9e9a2c6309137ec8f5284d66ec8b8f38dfa95f0 SHA512 a7ba2e5e8eb04fb411d4a4341530225bd30ff46aefbb6da235883a117a2e2f4e5cfa49eef28663873047eadee89878a27357f96b7294588409503d1a437bb372
-EBUILD aufs-sources-4.9.49-r1.ebuild 2229 BLAKE2B 2b551c3767df65c6008704f6e4c0beee15b26fc255e5f11f126b8f82950dee9c6797d7cf216898c3e4b50b3638fc7ffa2b77721611db325138e08cbb9cdabc70 SHA512 5c0a4dd8fce85cf8db60366e3bb8bf851310e00f02b368890e7f2cdda8ec8adc40791e77160081ac664ab86a8350d1508783f8a738a11bbe12e0c31e95d2ed9d
-EBUILD aufs-sources-4.9.72.ebuild 2229 BLAKE2B 3d61a3886f2714e24576fa4dea00002f54ec815c6a4523789aacfcfcb3e7a0bf0cc3c6a374c0bb1fed643b413a3f1b116fd21721ae8b4787034aa48cf156f5bd SHA512 55520bcfa08ed8932d2d40c3c10824e1bdcc9bcd97cdfdc248a3baedfd342d5fb327604afc48c0c9d83f1f5ede109103b836e0f4ba5203b7c35ab7df6066d657
-EBUILD aufs-sources-4.9.76-r1.ebuild 2229 BLAKE2B 85b1d667b2d821a5af3d620f1c521a648a712b3f478af806363a395fd49b875e07cffed452016b829ae07285668d90ee3c5815f95f92891669ed27f96ee0782f SHA512 4d3cd4a437b4ff07f5702fd49a849e8a0366e3adc5e216de1b04e360900c85d268d4745ed1ae8ad6a54c7a2eaecad7e37ff606f2182a1d3ea1ee0b1d7d6ab0d6
-EBUILD aufs-sources-4.9.85.ebuild 2229 BLAKE2B b39af5fd11c8a064f891586b63a7edcd02d0a81fa435d3ff1ed890485ed8ea5e250fcfebb8d8f61d2010e5887feb3135d9bac0382596e2eeded9aa3e75be33ef SHA512 24f3258edb29ca79afb25a84896f408bf0f55e37b1720b6cedabe015ad2f2bf98c84dc0cbd06df71db1b4939891d86a1489d5b15c43c2eb0c4f0da1759fb7018
-EBUILD aufs-sources-4.9.95.ebuild 2229 BLAKE2B 856ec9dbc8d8b92950cff9b458a59389339904301cd8813b3740aaa17283985300c6eb6a277911c30d28a426aa0f7a2b8efabb6cfb242266f6d3004179bb513c SHA512 77b91d55f91d5e76363bde930a2b5b14ba7c4157ce06c96f4f286bcbb584624ffc1d5fce73fff4fa788e40f001f0ffeffcccf7287bc2d9e1d0667e8e1ad41e68
+EBUILD aufs-sources-4.14.65.ebuild 2234 BLAKE2B 52efc69c7f3b912edeb5619a1414228616cf84ca162d1ac18c1385eefb26636f69e78137bd0fa064a805f1fd5c9aad0faa8e89627eff94f9c9a10171315efe07 SHA512 c3c5ce27ba7b5405a0017bac044a121f9adb9d703452adf4a247642b7afaa3fa9a688ace11454b0414c3c0c2b4e5331fcf43c20c4a9e3cf8ea68cf76e3efa8ed
+EBUILD aufs-sources-4.14.71.ebuild 2234 BLAKE2B 926ad17e42fbdb15527a1b4f3dd8f7813a03261c6c935a7a6fd18ef3304f1da04a2bf2705eeb726f0eb320c61bdd9c073e52fcbbe91c70c47f9ae27ff283d26e SHA512 6a620081c637c40d52c6b983421dc80952fa3f8f7ed4650a7e56198259ff2bd5b8671197c018ba93522529e21ca5b8ae510bc468df54dcee2f0f3651c29e13e2
+EBUILD aufs-sources-4.14.72.ebuild 2234 BLAKE2B 5aad3f6821eb583ca3f6fe22575f9f8a5f4b3c0acb0df1cc182004224d393eacab9144b485b52ad595ec840b93131c7d48dae041dc9f664f4d708bb560bc5a1d SHA512 43d65c7b17ee184cba54efdd57ea8f251ff1d27b94a16c99b4fc3cca178a6c771403510d2812df216a526b8fcf00ea4deaa951d987e6cc829592801065c9808d
+EBUILD aufs-sources-4.14.73.ebuild 2234 BLAKE2B 6512c3e4e9f8e728a3a39f334b70ccbcf40de6653680777e91c7ec14c0088e627e464dc23d2fd51c58c805a78ac2c5e04157485566e9e78d752c515c092ebbba SHA512 85743b1dfae3c80241c83eaf2b2f59949544a32a12f3498a34be8213c99a070ca00075de437fb9de383ac705c062ce312dda1f61ac317effe537edfeb43cb433
+EBUILD aufs-sources-4.14.74.ebuild 2234 BLAKE2B d90ef6d0a4ac03d0c76fb405da3850970dd66a3ec0187cf438009c5eaad90eed5a411441915565436d169befae9e65a5f816dbc3555a072a3bc3f17b10e8ce1c SHA512 3ca9f587eb3b154d1c769179671e08477038ab017bea6e7d0698dd0159542f552521e38a8d3c682a0995a24cb124d39600699c62e63d96f62ec4ff3ae3ce98c6
+EBUILD aufs-sources-4.14.75.ebuild 2234 BLAKE2B 2fec7433bf8217e166b69b59d06276ca69590929af8110b93869cd6dbd63ca1159399afbc38c02e80e2f435749ed652ceb20744963470941edecdb63b0346204 SHA512 deb42963d8f5d2c9b3b605d8e843c39ddba70fa39538a76956100e1cee3c50436a372a14d3674a5d3b69799665e491c30fd447ccb89cbcd64f375ce45014658c
+EBUILD aufs-sources-4.14.76.ebuild 2234 BLAKE2B ee1b9d856d657e71d0cbef333d0c7d949390281e5bc3659eb4f09762e7626c33a420d2d15d7f3d05aa5525beecb1a3df7c233c92f0eb7315170cfd00572a1184 SHA512 b193af1d5603eba1ef04c80145ee4ccf4ea29a8acf25f3166f922e123cb62d87d50a42724d85a4feb4fb1b1a7189ed35cc50a078082f0ae8966b9fe0224ce416
+EBUILD aufs-sources-4.14.77.ebuild 2234 BLAKE2B 4f7fc403e26e6939d1465b2de45d613b5e0b925cb05ae37a3a1ede578630b748139912f22aeb3e739c085f0939701df146ac658d56b8cae62c1b3b04301aa1eb SHA512 9d0a4f1864b3042f8c1b67c88b2bd08f512adc2df9c198fb700ed4e99564b86722fab5fd7403f5d98d425437a52ecf968eeef7438460c3f201d29d1534111ce1
+EBUILD aufs-sources-4.14.78.ebuild 2234 BLAKE2B ceac16c6a33c69b6284786b36e082574cf94851dc5d0dd1b8d6fbf62c304690e28296929cd4e25eaf44067295476811a84e8414daadb0ce989dcc84d76bd4358 SHA512 606ed9f9af95711a606231f31f49b358d351f18f912bed37610514fb6116eca11feadb9a5ee744a3b0d674d7ede80ecea4d6b040b75f29c02f5fcf6707a4d4ad
+EBUILD aufs-sources-4.18.10.ebuild 2230 BLAKE2B 33ec69a2dce2dd9695a9caa7a95a2761e297315de14dae579ecb737115ba8b16ecec665a48c0c644fca3b3d42627ed00dd45e4cf8c6476135dbb436f39aa0e44 SHA512 12d920a2bfd37ecd53c9be53108d4526cc86670a84e9e6c7191cc8e91082a1430e50023c5d45b1b22d6ae1ee9a26d571e439e1d56ec3a3ee242c52f63272c3fe
+EBUILD aufs-sources-4.18.11.ebuild 2234 BLAKE2B 8a80cfbba73eb480c8470ca77cc2a519240aba6d3d4902cc0e6579a600a4ed29f2f94bc3c3e1580ed7a19c3a2e42ee9f1d8a65ab01b5ac76af504ac0b4b2e6df SHA512 0f9db22ef8029d7bec8fe04dafe2b99087d1ff2224be3a2c05fe47061a05b934fedaf8817100baea38c4c6e4bf211835f99c3a85b87c44804ab514e3bb144902
+EBUILD aufs-sources-4.18.12.ebuild 2234 BLAKE2B 5057328128b488e989e427776d50e6ebdfeb4ff5161c089a48d15a8ca757f0c1be1162fb99893b47fe7d8b2fd1839b96c0585dcdcdc3763f2c4ba86576728f0a SHA512 7f1d96cdc2b3f0b57f7433a96373cf45b43bff6a0db93a01e282b3973a3ffce8e0b9ef8711b53a1637ff71766d29be0c8b0c309fde7d0b9b8188632b38bf0baa
+EBUILD aufs-sources-4.18.13.ebuild 2234 BLAKE2B 38fadd4aa96b7355c5cf2cccd4c1131134913e3a1986c269d18af1e61a6667d73d77d2c1021fa8a8d8d8dc508cca189bfdbe5c554654dde04ed72878325d1f00 SHA512 4fe39738bec4c447adc504a2773376fcc91e90e9deadc6e57e30bdd60a88ae946affd583adccc545bd5dbb8dc9fb9237cd141808ad03104bf1492bf61f22dfc9
+EBUILD aufs-sources-4.18.14.ebuild 2234 BLAKE2B 3b2e81b6d30127cab96221866ff3b9d000b71e4b68e46789ec7a77c55742e6934ee89398c5f5889496e9fb5d3a96085fa74f6a69e0e3e326887d2b378d5cfd79 SHA512 dfb0ef427ba46accdbcd33ae51bf42da768d2881e1edd918cf4dabe5ccbc59da9647d46520526ef234e397647e66b43ecdc35d3732a1023ff0af2dfd8f93e65a
+EBUILD aufs-sources-4.18.15.ebuild 2234 BLAKE2B b75449b8e68b5e8e7f17f33f19711298fa95cac557bae738638faf897b7ec31b81e2e9be964a3d9605b42d12ce266dd632081f89fa9f6386d54e41da66e724b8 SHA512 14e2511a6ce804b552c1aaa266bf78d8d628c3892342584828ac5f7c3f6e4c11463efa4e344158484874d2a48c634abdf58b701b6377b6baa7ca278c5a9a6308
+EBUILD aufs-sources-4.18.16.ebuild 2234 BLAKE2B e8d5852bedf86e7feadf2d444c1c3ef7c9c6708e8706906f8a914c4a86a2abaf42c4cc2d21da1d4def420cdddc0d530a6af4c0cbd80892b41700df4522c5c765 SHA512 e147ab443f480d6c9d549330472187c4d27156b994c551f45224ea2ce7fe375bb0e23bcc61f9edfd56fde2c8809b01637225cfa043256e5e4820b04b1d474199
+EBUILD aufs-sources-4.18.9.ebuild 2234 BLAKE2B c965fb09a64ba6fa8d5e941ccb4bfdc67a0f978b4dc14a664337ea30cee76337918199ae850142126fe189c68ad80937fff9991edfb39d317f805a96e284884b SHA512 ab5ebd277e2b729d038c732ed125dcee7e8e22fe371014b21c2afc75a0b00559cd2d65f574af6f949b7fd05333bd9026b0f4a8ab252443dbd94bd5d7e885f62e
 MISC metadata.xml 786 BLAKE2B 4a7ec566e14be79c65ccf8f9b04db4c66ef27e0940af8d3d870a3f08d96bbc8987836100aff699d90a5564a1986c929af02b9cb00553ed3f400378ca20f41fda SHA512 95853521c2369a4bfa752be73e2e7e8e5665e790a5763c7d347da1762ac142fd6caec3e20f7d31f58c16f3a38df6dfcca63b296569b7131dcbd72eeb23e9d3ff
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.44.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.44.ebuild
deleted file mode 100644
index 2b41afa2393e..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.44.ebuild
+++ /dev/null
@@ -1,84 +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=49
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180409
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.47.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.47.ebuild
deleted file mode 100644
index 380fe9f6c872..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.47.ebuild
+++ /dev/null
@@ -1,84 +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=51
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180409
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.48.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.48.ebuild
deleted file mode 100644
index 15263fbf9036..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.48.ebuild
+++ /dev/null
@@ -1,84 +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=52
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180409
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.49.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.49.ebuild
deleted file mode 100644
index 0dd64512a3f4..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.49.ebuild
+++ /dev/null
@@ -1,84 +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=53
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.50.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.50.ebuild
deleted file mode 100644
index 000287f4d092..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.50.ebuild
+++ /dev/null
@@ -1,84 +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=54
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.51.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.51.ebuild
deleted file mode 100644
index 323ce2a01e83..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.51.ebuild
+++ /dev/null
@@ -1,84 +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=56
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.53.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.53.ebuild
deleted file mode 100644
index bbd7860895c4..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.53.ebuild
+++ /dev/null
@@ -1,84 +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=58
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180702
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.65.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.65.ebuild
new file mode 100644
index 000000000000..07e3a54d7b19
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.65.ebuild
@@ -0,0 +1,84 @@
+# 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=71
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14.56+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.71.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.71.ebuild
new file mode 100644
index 000000000000..c8d291fca93b
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.71.ebuild
@@ -0,0 +1,84 @@
+# 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=77
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14.56+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.72.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.72.ebuild
new file mode 100644
index 000000000000..3d93e29db894
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.72.ebuild
@@ -0,0 +1,84 @@
+# 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=78
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14.56+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.73.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.73.ebuild
new file mode 100644
index 000000000000..4c2d64a779f5
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.73.ebuild
@@ -0,0 +1,84 @@
+# 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=79
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14.56+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.74.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.74.ebuild
new file mode 100644
index 000000000000..eadd06c9fefd
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.74.ebuild
@@ -0,0 +1,84 @@
+# 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=80
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14.56+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.75.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.75.ebuild
new file mode 100644
index 000000000000..e34ce123a2f5
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.75.ebuild
@@ -0,0 +1,84 @@
+# 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=81
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14.56+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.76.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.76.ebuild
new file mode 100644
index 000000000000..c47053499d7c
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.76.ebuild
@@ -0,0 +1,84 @@
+# 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=82
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14.56+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.77.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.77.ebuild
new file mode 100644
index 000000000000..733afd75c2fa
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.77.ebuild
@@ -0,0 +1,84 @@
+# 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=84
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14.56+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.78.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.78.ebuild
new file mode 100644
index 000000000000..9550ecfccd48
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.78.ebuild
@@ -0,0 +1,84 @@
+# 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=85
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14.56+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.18.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.18.ebuild
deleted file mode 100644
index 2cba18bb6c04..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.16.18.ebuild
+++ /dev/null
@@ -1,84 +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=19
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.16_p20180702
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.17.0.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.17.0.ebuild
deleted file mode 100644
index 41ebca8564bc..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.17.0.ebuild
+++ /dev/null
@@ -1,84 +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
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.17_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.17.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.17.1.ebuild
deleted file mode 100644
index a1332024cfcb..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.17.1.ebuild
+++ /dev/null
@@ -1,84 +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
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.17_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.17.2.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.17.2.ebuild
deleted file mode 100644
index 3c8588caad80..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.17.2.ebuild
+++ /dev/null
@@ -1,84 +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
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.17_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.17.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.17.3.ebuild
deleted file mode 100644
index 9dfb20178e65..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.17.3.ebuild
+++ /dev/null
@@ -1,84 +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
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.17_p20180702
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.17.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.17.4.ebuild
deleted file mode 100644
index b113415f6fdd..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.17.4.ebuild
+++ /dev/null
@@ -1,84 +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
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.17_p20180702
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.18.10.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.18.10.ebuild
new file mode 100644
index 000000000000..04513e77230a
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.18.10.ebuild
@@ -0,0 +1,84 @@
+# 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=13
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.18_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.18.11.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.18.11.ebuild
new file mode 100644
index 000000000000..952a3f828ebd
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.18.11.ebuild
@@ -0,0 +1,84 @@
+# 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
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.18.11+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.18.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.18.12.ebuild
new file mode 100644
index 000000000000..41f3c60af4d5
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.18.12.ebuild
@@ -0,0 +1,84 @@
+# 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=15
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.18.11+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.18.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.18.13.ebuild
new file mode 100644
index 000000000000..dfd53d045dc9
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.18.13.ebuild
@@ -0,0 +1,84 @@
+# 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=16
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.18.11+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.18.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.18.14.ebuild
new file mode 100644
index 000000000000..18f5b37d33a1
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.18.14.ebuild
@@ -0,0 +1,84 @@
+# 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=17
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.18.11+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.18.15.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.18.15.ebuild
new file mode 100644
index 000000000000..43b26f2c0f71
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.18.15.ebuild
@@ -0,0 +1,84 @@
+# 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=18
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.18.11+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.18.16.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.18.16.ebuild
new file mode 100644
index 000000000000..471393e4a61e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.18.16.ebuild
@@ -0,0 +1,84 @@
+# 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=19
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.18.11+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.18.9.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.18.9.ebuild
new file mode 100644
index 000000000000..4ba778152001
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.18.9.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=12
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.18.11+_p20181008
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.111-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.111-r1.ebuild
deleted file mode 100644
index 0e73d5dcc3bc..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.111-r1.ebuild
+++ /dev/null
@@ -1,84 +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=115
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.128.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.128.ebuild
deleted file mode 100644
index 84551e23b668..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.128.ebuild
+++ /dev/null
@@ -1,84 +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=130
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180409
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.136.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.136.ebuild
deleted file mode 100644
index b6c82d54622e..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.136.ebuild
+++ /dev/null
@@ -1,84 +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=138
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.137.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.137.ebuild
deleted file mode 100644
index f6361948ac9b..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.137.ebuild
+++ /dev/null
@@ -1,84 +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=139
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.138.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.138.ebuild
deleted file mode 100644
index 7c84db08bf1b..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.138.ebuild
+++ /dev/null
@@ -1,84 +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=140
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.87-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.87-r1.ebuild
deleted file mode 100644
index 3f86314bb679..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.87-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=91
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20170925
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.105.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.105.ebuild
deleted file mode 100644
index 43c5740ca785..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.105.ebuild
+++ /dev/null
@@ -1,84 +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=108
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180409
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.106.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.106.ebuild
deleted file mode 100644
index ff7a0dfa826a..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.106.ebuild
+++ /dev/null
@@ -1,84 +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=109
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180409
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.107.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.107.ebuild
deleted file mode 100644
index 745f886136f8..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.107.ebuild
+++ /dev/null
@@ -1,84 +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=110
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180409
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.108.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.108.ebuild
deleted file mode 100644
index d7b3e969eadc..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.108.ebuild
+++ /dev/null
@@ -1,84 +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=111
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.109.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.109.ebuild
deleted file mode 100644
index 476d4689ab79..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.109.ebuild
+++ /dev/null
@@ -1,84 +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=112
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.110.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.110.ebuild
deleted file mode 100644
index 539cbb66b963..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.110.ebuild
+++ /dev/null
@@ -1,84 +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=113
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180702
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.111.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.111.ebuild
deleted file mode 100644
index b4f91545e762..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.111.ebuild
+++ /dev/null
@@ -1,84 +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=114
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180702
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.49-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.49-r1.ebuild
deleted file mode 100644
index e2cb8eee6606..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.49-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=51
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20170925
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.72.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.72.ebuild
deleted file mode 100644
index 2dc39bf2f1a7..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.72.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=74
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.76-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.76-r1.ebuild
deleted file mode 100644
index 719e592e54b2..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.76-r1.ebuild
+++ /dev/null
@@ -1,84 +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=79
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.85.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.85.ebuild
deleted file mode 100644
index 41a68a94bcf9..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.85.ebuild
+++ /dev/null
@@ -1,84 +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=88
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.95.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.95.ebuild
deleted file mode 100644
index 7f2578ea5203..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.95.ebuild
+++ /dev/null
@@ -1,84 +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=98
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180409
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 53300d063c31..803a557bfb4d 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -28,6 +28,12 @@ DIST genpatches-4.14-77.extras.tar.xz 17492 BLAKE2B abaf103790fceab73cacd949473e
 DIST genpatches-4.14-79.base.tar.xz 1941112 BLAKE2B eadad4bd05e013fa68a47a420cfd76764df91f12ae1f25fc1e32fa30b7da999ac3eae42aaf6ae14a18b949f28adb4f4ec1557bc2a6cb3d496954851066b06a24 SHA512 8955f649752dd1bf2e8223f8bf6ac65a8b8775299a34c8d9ea3a7bb37d744444fd013b30118be9041a59a54671a3f5cf517d840b2f83f9fe431bcc51e7019508
 DIST genpatches-4.14-79.experimental.tar.xz 5224 BLAKE2B f03b0806ab474eb5fc3fe58a873cea76c16d39fe87629a15941eee0eca9b980714f099526741df8b2ce7203cadb7b0b1680422083b61e4725152421d43f737bb SHA512 5de7d487a229d26ab62518a670a55cd41f563455084c6f8a55f035c613df969e8c0698518243081859cb52c4e7df0fb6cb349c841fcb979e9a94212617ec523f
 DIST genpatches-4.14-79.extras.tar.xz 17496 BLAKE2B c543f7d58552cd519dd722f1d7912909a2216868201a5d5b3712a96b17f41b9f05df24fbee03d874a5fb2d8b8e32eb35907cc0ed569c85bdf4dd5be942d1680a SHA512 d789ae7affb905622f1d556f07450a842974296f7fa109152a9edba74e41fdf4f5ea0f1bc6a054ca02a4fbb99f472b85b2bef4005335e6e1a7c112a993220491
+DIST genpatches-4.14-81.base.tar.xz 1993216 BLAKE2B 96a60ade763801820a818d18973abec10833104da7f067c03863883aa94e96ea5134599e913015d551cae27b5f9a56efb87b10a60265608fd230567244bc371e SHA512 bb9e356425ea24e01350384956ebaaf3f9677449b2b0393dc130c586e7b337442d3a38a6b138009838d8dfeeaf89c61e1257c8a13eb79749dc5cd96132d06c3f
+DIST genpatches-4.14-81.experimental.tar.xz 5228 BLAKE2B 0ac2b4b56e615216918d7f5739668223d4692a9dd1273202c6b346f223b149e306797693c1ac034e4316102e774a472bc8872c9486a862f841f20c0f13ba4d4f SHA512 9f143960a869c2ef2ab9ef31dc73de3f1ea9b1a34ceac332f6e7ac448d4380ceb7359b9014298a6f17cce2d12bfe270b2af112dd60a7feadf994ad28d5a717da
+DIST genpatches-4.14-81.extras.tar.xz 17496 BLAKE2B 9668753679261522d678778c29b3637388624ab6a8ae1223241c5c47979083caaa37b4926d7239ff574977c29afc66c7147a34eb42538f1f10fa7b5006fdaea4 SHA512 0459e6453a44ae88870890756b9e3a852b3da0356c3df723e4f81593a52d85b5547ce18470ca831f3f0eeb43feebbc5255167c8a73e69d6b94719b4b2167ac86
+DIST genpatches-4.14-85.base.tar.xz 2050508 BLAKE2B 3d4b9917b538d6f906f8112cce00d06e07d09783fce9478ce7f166c900707d56cc147d30ffe4dcc6f26c1975881aa2771dfb76dd21d3580dc47430c035d6d850 SHA512 23b1b30c43e78ebe57c7dc06fb6a6aea035b1160d421c6577eaeb5afe0eb8c72390eb5b33e708990f3c0452fad4678946a74279f3e9ba547ebd385f59bfc6ead
+DIST genpatches-4.14-85.experimental.tar.xz 5224 BLAKE2B dcedc912566883c0c57934acc23a8c5d89c95d14bc3e6f52b715562a414a535896774f5e184c1c83f1d601c32231ab3b98579eac848fd6a71ee7f833a044088a SHA512 6beeb2a40e8f668f833da082d79fa33a3901891a7f062fca56f4f6182fe6d6368466ed9eef4ad1daddc62b383ec5aeb8189b09577b33fd39be9b53e1e53c920a
+DIST genpatches-4.14-85.extras.tar.xz 17492 BLAKE2B 220ed00e4813e2b94bc1815e5cdca40409239864b1447bc7eb261a37a6b132b92935f0cf1a01749d4d2b2522c7e932c2e5fd3eb127fb0d09b7b3615dcb8d531c SHA512 fa0cf06245bb72a36bece9cd98daa55ae49b82e08ad5bdd3474ac6fd875f43278eaaf85e64620c120856700222e4f8b61102cb0349566be3a2f39e561140bd43
 DIST genpatches-4.18-10.base.tar.xz 145340 BLAKE2B 052e5eba856e416cfb303ec9b8a064ef8a47492134cb4632ce5ba1818bf4dcdfc6b34a3c276017214a47ac4b4483fd46272a9c284b1abbe81960de55d118b3ee SHA512 af67a9316370bfbaf8999e993efb766928b729ebf1587a9804dd6ef89e5c7190577fda022b8ac128576e9e60d4ff638b780d6e324dcd244d4c8e7ce33f2a9abc
 DIST genpatches-4.18-10.experimental.tar.xz 5228 BLAKE2B 3485bbf76b9c6ab4382a835984d9c55a052fefafbc9550f2a08bbcb383991a8ceb0ca53b5931f57bace9e8893a2ccb2c2aea15f2939a6a4e69de1d924aeb5071 SHA512 45ef8b07719263eb2ffd75fc0c24dd0357bc6cf2e76e129d8c2ecdfaecca4f864b5ad091685e9d94a7460422e7c49fac68cf2f4b0bb90e2faeb5f0b9b94fbc0a
 DIST genpatches-4.18-10.extras.tar.xz 17504 BLAKE2B 2bd2aed76a5b1b9fe5200407edda412fe220d5a23f2baa5967c5930b182a74e97eb289006571a0400ad09b4397315c27fc1ca8f18f0e1c496a52c47029f61a69 SHA512 585de2757b97c6cfaed2ef52b00c8b6c784a0abe3937d58784bb473a1ea3c85b22a21bb978f6d6d9b772b6522370d141ea50440258aad5949ad2984723699a9a
@@ -37,6 +43,12 @@ DIST genpatches-4.18-12.extras.tar.xz 17508 BLAKE2B c324b68771942f0372d0f4f34904
 DIST genpatches-4.18-14.base.tar.xz 313244 BLAKE2B a47c0b01dffdc9480d99137b8d2d2ee4d125e86fdc653e6ed54acadb4818ee12b904335bd996577fb12a0132ffd8f565da9669b4033531fdb1cb53ff28a5c9a7 SHA512 8f59ef57c0c698932032e181044b2fd78d6f43a8022b75139c6aade451d946816329129047de8514d4c2f6c0c6eedf6a16786063584bb2c141e1a50fb83debd9
 DIST genpatches-4.18-14.experimental.tar.xz 5224 BLAKE2B 659859efd41430c3da5c104cc8e148d85df75ec323364f845a2f15b848544aaf0d7d9cd8b595c04a9209542bdb865874b9c8928d264ba896a70d701690464869 SHA512 50e172f6244741ed6d5e440ab55c4928c11c7cbe9d2bdc5891bd254e2aa05b7ed0387e85d3135745af0e056dfc0be9a325581d5cf38df1659d89cf387ed72625
 DIST genpatches-4.18-14.extras.tar.xz 17512 BLAKE2B f9a02074660a4f2c7b24d00035f0e529a1283a853d7271dea8a459fa1d5a6a2508ad400e828e47ac1b1f610b0732a9380301951f091cc9657d15f9c784e0d9ff SHA512 e27f7d5fc0ea35cb66d8478c83df36d5c28d2eaa87b65cdea77254d7cd665ba0f2a016927ba70e71c33920d80341270bc5419c610971989b1ec573631be080ab
+DIST genpatches-4.18-16.base.tar.xz 422672 BLAKE2B 688de9ccda3e62656a046207aeaa2bf09d3c3f7138a78343e2d362099f0f3b245ac59be420db4f209dbdcf3f1d1ac6ae1ac5fc96713e91c5088123dc03d6e5e7 SHA512 6e55ce52f2175a897dc2ada9ba76befe48a9c19544b3df1a39540d5e66fac7351e9fbe0799f6f6f23923a48f17d6181ba580c7e3afd40029039f5e6bfc826a0e
+DIST genpatches-4.18-16.experimental.tar.xz 5228 BLAKE2B 558fd2197c5ccdb034b6d6284dd90ccd92cba09993fa58996febf340a6225bc46c458c3e9e47f69f1f31dc4ffa31675f3f9a33f7e5c0b499afe7db2b1c2b71fe SHA512 c64277edadd67d46d2e9a97c423fab5ab5e7d2a21e27b54c1118400b15d6fd5b406d3ac3fc9b6bc8ee49b94801748f88df7cbbd439e62e6061bf36d27c703dfd
+DIST genpatches-4.18-16.extras.tar.xz 17500 BLAKE2B f3bfb098fdb5db5651c78fdb26ce927420dc6cf08479b98cd820284e21f6323c8a3e95000c8839ae7de88b3088a96725607611979408fb553534c4531ddee69f SHA512 13dc9cace14c765301deb1ad929f4564565a480c7b347b25878122fe103a528198e9601288b6b930aee3d6ac703d03e9ed236e9954f3fb2194d0ac49488bddc0
+DIST genpatches-4.18-19.base.tar.xz 491560 BLAKE2B 37464af933a0611a40bb0795e2639c0b0e8ecd112a6b7664d3ce19932a25ca4c6a5f36a7eb07005abb7c85c7be3bd8fbcae6e2959031467d871f62c5b89f571e SHA512 7b07af0ece2511fb4cb39ef35c9ba926a6d2e34eb24829f957876e6be6f56ad6bae89d6aa818ae81bcdffb16e26471a4fa9adcc4ac6f48efb3e53151310755c9
+DIST genpatches-4.18-19.experimental.tar.xz 5220 BLAKE2B ae3cfe1a10e76bd22905db948770fb51bc3181a4218f1a4f010d656ad41528ada6f6e507de1bc238cd68b6e6f3cd5a87aa7ff6a3516e441b672b902a4402ea76 SHA512 937b8db859823aa2612430cc24e2e4441afa20539fa2427c15182d21aaf9bb2d2cf1d520a2a9fb2d04971c9bd75b885205fda940d89ff892c290b92db1cca13f
+DIST genpatches-4.18-19.extras.tar.xz 17512 BLAKE2B eb3d70211535ca9fc9a58ef02304d2ff87c48acc5c47804de401599c8618cc1adede45ab2cb9bb59acfde6c7434bf8cdf32f6efd2c2fdf4d34ed619882a04b89 SHA512 35dfcc2122fe3d383bcf9da1ee032f21bc0dc4f36d29c82e829270775c21d8a816eace717a1e65938f4b01eec7b1f584f865d5a9ee997e732292f9840ace9005
 DIST genpatches-4.18-8.base.tar.xz 61984 BLAKE2B fc4b575978ef25f2ac1ea23453a820cd3fce9fb99bdcc071e88d8d52113b3ad1b44725b1bddf8a9b0e17fcc4022b8a7ea1ca10925c560ebd2480ae7edbf08a93 SHA512 fb98eff21e6cfbf03feb1df16241e564acb086026db360136a46c78d7658cd76dbc98f698279e2e5e1c55c675acadf7da45136bcff5fc929d0fc155a70def29e
 DIST genpatches-4.18-8.experimental.tar.xz 5224 BLAKE2B 1577cd444c84c7a8fef88e167e3027773a5574459124f007ecbcccab5f7f9d544d594616ab4c43c58edcf97e2af699c82fea4995a98aa2a4a196f5aa8d345350 SHA512 57b87c85d902246a38f7822f296736cc471509c5ff63e1da8999fdd285437add9e0a20ced9d1997df1e1cbf6fdcee45c62747bcda9de4cbcfa3009a0d6ded06c
 DIST genpatches-4.18-8.extras.tar.xz 17508 BLAKE2B 2e9e8c17aacbd6894f682c6f95b767228c54673e23dd401519d69606177334408acee5c018b164c797750018d015c8abe35e48f5b00b45f5502b0dd72f776941 SHA512 059cf39a752f0088884cb3fe57f7d98118879bdd1d40c1242a012a11275a29dc7744d6333686fadda2fe08bbbea5a9b45f3f3cc9bfc20203f22184b2068baf07
@@ -58,6 +70,12 @@ DIST genpatches-4.9-132.extras.tar.xz 17356 BLAKE2B b7cbf6b4fb753c8b2155d61e8635
 DIST genpatches-4.9-134.base.tar.xz 2469148 BLAKE2B 98d632d35eecd9965bb78d0baf8889c22999c324ab2f93a27ed606b8f1fc9fbcc3ed473bca16d5d508b7aea57f3b9db0fdfa904e4dfe59d2d2849454e8d6d1da SHA512 75b10ad827435c6cf5bdc568bfb5d48d703c2117563cdd406e7d98701bb22e2944695295933ab7bae03e3647565fd8d86f3f4142ca2ea538dde4e9ea8d350ff0
 DIST genpatches-4.9-134.experimental.tar.xz 106384 BLAKE2B cf341a8c8f43353fead3844c549932de413380b72f5efb686031a35c5de78c13f66d606d5884bfea45333c7aaa39589d93cd6c295fc34dd103f354209a94116e SHA512 491a2b541b933a0e6f0eac55eb939ab668085158d059a2bbe99826e657bba3576bd6092a83baeda8c11a29a770823228ead660a5d64cce09354fb177eb857cd0
 DIST genpatches-4.9-134.extras.tar.xz 17356 BLAKE2B a6a8fd7226f451ea0a42abffab2a74c2dfc2ad61130b49a51548d72c98a3f1c96dba5432fc3abf88d3c08d1cb07b28ad7d252e22ad04443e3fc251a03affa045 SHA512 221edf2d3ca1f11d48dafd3cb86b316153ffd6928c1dc690fe5b69f212ae20ccd7b203c272e4554f3045da51cef7a3bc50d388cfe7bee7630ccee586ae3d7986
+DIST genpatches-4.9-136.base.tar.xz 2499112 BLAKE2B d68b80514607892807b343ba310cd87df1e655f290e265572e6162529bf65205723dc89cf3520ada6f7f9d2d94e9f9a9ed2a9f709096e2c4fae5db07a5921540 SHA512 286063c44a5752162924d4a1b1a1f34dda1f9bb5f81576a96a083d1b91ff2f846d813fb7c5bf312f711e4fbb5c1cebe700907eba78d936259fff27c27db0ab6f
+DIST genpatches-4.9-136.experimental.tar.xz 106404 BLAKE2B 7b3434f32eb16392162824e1a374f675c1e993a3e076b0d464812b420fcbb0d887bd8fc5b1316b71a4adcfeef714b9576a09c737e0c22374967d771417664757 SHA512 1241adbf933ec79f1ed809521c55e44a51b3060ef544ade05ee90ffbfd355613268beda4a1683f9b9a7b172f8f6305271b3caa9adea99980a0b1848f94e8cb86
+DIST genpatches-4.9-136.extras.tar.xz 17360 BLAKE2B e038a5f1fab6209642f023bbe789f540c2ffc4e946fa0c0d460ae9a9ee7c712c1c932317838313694a4a3312a4639e1f56db8e181825d2055c321e2f0fa6015e SHA512 49ec9be3ad02078fb235e4dda2111069244c37d04d434028d4fd5eb81e495480b2fdf1953d3671254839b3ddbf50a74c1f86bce2738db05180a0f3eb0b2d25f0
+DIST genpatches-4.9-139.base.tar.xz 2546088 BLAKE2B 5259a374fc11ef4ff950bb6104d6bfd958699541d9b9d5cffadb1d756df20c9c2c6be8b342beaef82d504a5c37f3406737ae7343ee9ac98c7e18e62fbd77a1ca SHA512 de1e97149cc8ee141aaf10e514cf0cdab71c318334ec19fffd74ec8465f58413b394ae2495ad60c995f28065824862532b9676e2de866be3718fc521dc37ecb0
+DIST genpatches-4.9-139.experimental.tar.xz 106392 BLAKE2B d3ba4c3d708147c4455202343bf824d257408dac6ccc0318e8dccb65ed0337b096d688fe9a28896cbe59bbb76fa74f663a9632ed38ed8532015b5613111ff9a2 SHA512 3353fbeac023b765f1e33040fe58600a85f620c19d7d530a27f3e5652c1536df5daf607edf682ec8616beee1a88e235bc4c916bff8575215d821b42de15396b9
+DIST genpatches-4.9-139.extras.tar.xz 17356 BLAKE2B a72f7b748397ee23ba94a4a8976acbc94a3a227ae027e0f4d02ce323925c248d31c376f10579cc54bb4ac551a1b546b1403f9d996050fe4f995e02848df76b10 SHA512 8c44046440d4bf97a21c84ab375b5c5441f4d8cefd2e273ee864460f90ebc104e35d24f44eb0f66ff420d958b70d87095df87d267fe4bf8ebacbaf681c2af1fd
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
@@ -67,7 +85,11 @@ EBUILD ck-sources-4.14.67.ebuild 2074 BLAKE2B f7146a9c010f385bd795b0af2794d15200
 EBUILD ck-sources-4.14.69.ebuild 2074 BLAKE2B 2c1367db62cb1702ad84db3d1da2b298c1e2e1f063f34b599b432c7e2534e7d9f2dea6f2a4b43210339bfc726e508dca4cf7e91240a973840a944000284545a0 SHA512 f38e42c959a312fe46130838dda2b3adb9685c622aefc0c3907f95bc83afb572ff4d1a0c0c8c329039462270907489dfa45e3d1ba3f48149bff0b42d8be795cf
 EBUILD ck-sources-4.14.71.ebuild 2073 BLAKE2B 991572edd450012855e8ff25c192356a4e4a5bc7a5ba0c720d0f12cef861a3581694c622e518f6e270b1b9ef34a9e5b8dae9f4e31591255225fa963ed96a9f3f SHA512 56db521f1173a10b2f41925259e969bde8b568aac612cc8ff667bee926d705e5611a7490e940f5fe646519b3e688a05d80643ba55b03bb74d6894a6923a2aecd
 EBUILD ck-sources-4.14.73.ebuild 2073 BLAKE2B 0110288e6a73b02fb59b848787423acb968bb7caf9eea90cf7730b709e0e6a9c26d7fb4540eaa186d1bb6403f2544eb8ac2ab63fc3282e51fa46a1c5cd188158 SHA512 8272b48308fab58379e9f75d3079ef2a602340d1b578c735b545338f6ce7727528a819a7f157cf96ca56b974dbfbf5bfda6038e2b3c323eaed501f424accb154
+EBUILD ck-sources-4.14.75.ebuild 1783 BLAKE2B ce82ae7c83fecbe87fb90e6ba54f35334ba1be0a0918ccb05d440278b49bdc58a7d3f385e61596a9056370dc5b8265d186a4dc8d922a37823e7195343f166700 SHA512 45383a17abe498db25d496ef584f9bcf90d63b8ccb042749ca76a3b4fefb0a3177441fa3d560cf1d7c4cf8a8c377cd1f5a3ae4a0ee35d9fd01c8d4be4bf825d0
+EBUILD ck-sources-4.14.78.ebuild 1783 BLAKE2B 7acfedd08733927bb840bc96b74b25f1555f521aacee4e013b62ba432db60d88282e2273dee0f72aaa135c4fab60b182e039aa73010db73458840a97c9f2ccfd SHA512 545f980b4c84d3f7d5ccbd3309dba03f170e34436a9675898658b4e50b4e31296f0c1cba2be8ec308be15af42c1af88cc34c52c0e2426b9b2b629096a5182f03
 EBUILD ck-sources-4.18.11.ebuild 1511 BLAKE2B 8915cc92f239bceef46074191b5fc9afd2d89075d106700321e05715700a0754bae4720bd163aa18586317d272b4a6d01c0721477d69b9f437097339d3db5a53 SHA512 f09f855b5fe3ed9fd6b292d8c3f8e923cbbd47fce95ad2667b3b82f769fed69a3af154fba7f6c14694026b0d313bb27bed758bc9060561f6dcff87215e00ffce
+EBUILD ck-sources-4.18.13.ebuild 1221 BLAKE2B 03fca4dbea4cb84b872f481e0723e7668c786267a07612a7a332decd0f33d7585fe706b5cb0ccfe687d6b533128220b9f2776fa9b84bcdff990eeca04278af0f SHA512 625c4be0959c47279d7ef72b0ff13c21af76fb05e92ea79bf04428b0447ba61a8b9d9aecb1b6d390edf5fac20e749b5bdb87972f760abf48b3d258089ac776b1
+EBUILD ck-sources-4.18.16.ebuild 1221 BLAKE2B 8c1e3377e4b397e9417f22552b48190eed0df721c2ebd65da2c49117ddf01deb539c2d56440d6cdb553c3b042200bb23a967bc718c11391a59df4168f77b5d38 SHA512 825bc9681df4e0935666d5364b290afea4da9817c825454a434c581cabeffb595e3a846b8d43d7d3e3a22e50f5c4298578348ebd45c170bbdd10400f833b0d13
 EBUILD ck-sources-4.18.5.ebuild 1511 BLAKE2B ee8b03758666a88d93db67d48c604b973d067b324188d0d79601cc75935c1953a1b67935c123acc8aefd860fadd8b22e3fc73167e768c3b12ee1963f88068dfe SHA512 3498d2429575dac5d87f0da0a6569417c165611bf75c40b1af9811132e4c570f7a6c89b89f908080959489c10d09416a72aea2f2f7cd7fdc30aeb3ed5768fe66
 EBUILD ck-sources-4.18.7.ebuild 1512 BLAKE2B ec2fcf9463fc25165e0a14b3a4ca3d120ec840ef7003a6b38a3819db2d0cee8ff0564d24a653635b46bd383c8f83a2081295ebb3fe768559dc2218d7a5a18cd9 SHA512 663cb98c751eb5c8ca269acedefee0be568d593dcff7f8559552fa2694bc1d93de4f4dd8e59562670fba682f79ae72c4d38cccedaa82dcae376e9fa37ae9a325
 EBUILD ck-sources-4.18.9.ebuild 1511 BLAKE2B 74bb0b27dbd960bcdca7cb0a7d3c56b81abccf49cf58ce8a3629cb567f936bb06522c5b0efc93abbdad0a91fa6fc72a96e166ea74837ee8e4df562956dfab8e9 SHA512 1f524ce7593ae4a8e97faf64964b8757579a3145118398ecb6404d476e057a1fb6465214637c41b94bd7803c90321fae28e5e591d279e7fba91499259eff5408
@@ -77,4 +99,6 @@ EBUILD ck-sources-4.9.124.ebuild 1774 BLAKE2B b71617301bdc9e3c07dbea8d7fb7769e9e
 EBUILD ck-sources-4.9.126.ebuild 1774 BLAKE2B 9d85ac571c999334e9f7902635da3beab581f287663de47cfb6dcb0510f7f6d416f7f3f36fef2e3ec30c9a5a656ee8f9e4d685685b1447170fca81e46b3869fd SHA512 30cd01af2fb73d08604851cadd88e3e34e303ccea3091c3dcc59e57ecc84ef3e199759a33675052db4870def6b303446cfece43c4028c8b3742f0cd3c4adce81
 EBUILD ck-sources-4.9.128.ebuild 1773 BLAKE2B 29c2fd36626f270aaab6758432c3a00bba623e38596a217bc44e31c56652acfc1b866b9550f0c45a4c4a8c8819fd846eb524b8c8e5f0135743178da1fee30aea SHA512 0732641d537a983e4276b6f46d3211cb729fea32853ca82523e4d8f1e56044f9355c1500b2340189bce4d8b8dbf1129cd41c2f060adf6ea682bd41cac61477cb
 EBUILD ck-sources-4.9.130.ebuild 1773 BLAKE2B 78043f0d0bee9866f13e8807755e34131b7980a3161261b7868b8f14dd5fe8cb41167963d29e42259ca54790b40031e76994685010a39520e1512b424d8f0f27 SHA512 40c5bef22596523e954f22a28e8cfe99eb1f0c492c838484fd723b984d9787290bb297e8dea60249c8198217870e636ad9378f7a605b98bc27619d55abe69fda
+EBUILD ck-sources-4.9.132.ebuild 1483 BLAKE2B 4bbc486f7893024f0a34cee1e3f19a1b8b29d818bf7c2d015996609af9ab9bc083c11962c3d9c0ca2afa2fc09fd523fa88499371c4b7a04a92545fcda3fe931c SHA512 6ec5bf40d7a59e3c776fcc1bb5accc98456da9510e085058fe37c62dd57a2cf0ffb60136370f33be65d0de8af4a4219f799154b68e8a401ca09c47a9b3318fef
+EBUILD ck-sources-4.9.135.ebuild 1483 BLAKE2B ee8a7c7db018167c7bcc7a1209078c90e7acd12ad2a8435f11657d3ab3333c5c777f39efb1046296700ae8564fb980757106a764e53703989a2adfbcbdc3d492 SHA512 6c778e88b73e49cb5d604329ab24a2eae3deec5ef1c1ed068fcb19a7f9aa263b8c03ce19fad4a8a7e4999dd4dcd428e3c3ab5d040e27c64c7a793be0751e498a
 MISC metadata.xml 930 BLAKE2B 6db7f2d1532b0023fdf4c931210e471efce5566762d899ccbb8e40249d3622fea3a275f3ea7e42842b841655e22d9efd8831eaef661bc19d7354ad8a9eacc169 SHA512 30b9d4dbaae0820bdd294c1a94faa96d0d395ac3c9c7313e01f122a36349921cf624286022e750c43b80839018c348ab86baed21b34dc9c189fee0415e9c5fc6
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.75.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.75.ebuild
new file mode 100644
index 000000000000..1156a3af4e98
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.14.75.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2018 kuzetsaâ„  and others
+# 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="81"
+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}"
+
+# Upstream: https://github.com/ckolivas/linux/pull/9/
+IRQREGS_HASH="7bb09fbdf490f5de8eafc635ab858b1f38dca84c"
+IRQREGS_FILE="${PN}-4.14-irqregsdeclaration-fix.patch"
+IRQREGS_URI="https://github.com/ckolivas/linux/commit/${IRQREGS_HASH}.patch -> ${IRQREGS_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI} ${IRQREGS_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${MUQSS_DISTNAME} ${DISTDIR}/${BLKIO_FILE} ${DISTDIR}/${IRQREGS_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.78.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.78.ebuild
new file mode 100644
index 000000000000..712f46ca996b
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.14.78.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2018 kuzetsaâ„  and others
+# 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="85"
+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}"
+
+# Upstream: https://github.com/ckolivas/linux/pull/9/
+IRQREGS_HASH="7bb09fbdf490f5de8eafc635ab858b1f38dca84c"
+IRQREGS_FILE="${PN}-4.14-irqregsdeclaration-fix.patch"
+IRQREGS_URI="https://github.com/ckolivas/linux/commit/${IRQREGS_HASH}.patch -> ${IRQREGS_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI} ${IRQREGS_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${MUQSS_DISTNAME} ${DISTDIR}/${BLKIO_FILE} ${DISTDIR}/${IRQREGS_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.18.13.ebuild b/sys-kernel/ck-sources/ck-sources-4.18.13.ebuild
new file mode 100644
index 000000000000..1c6f9715c18a
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.18.13.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2018 kuzetsaâ„  and others
+# 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="16"
+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="173"
+MUQSS_FILE="0001-MultiQueue-Skiplist-Scheduler-version-v0.${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}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${MUQSS_DISTNAME}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.18.16.ebuild b/sys-kernel/ck-sources/ck-sources-4.18.16.ebuild
new file mode 100644
index 000000000000..044e8de61f01
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.18.16.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2018 kuzetsaâ„  and others
+# 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="19"
+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="173"
+MUQSS_FILE="0001-MultiQueue-Skiplist-Scheduler-version-v0.${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}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${MUQSS_DISTNAME}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.132.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.132.ebuild
new file mode 100644
index 000000000000..7809ea8b79b5
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.132.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2018 kuzetsaâ„  and others
+# 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="136"
+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
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.135.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.135.ebuild
new file mode 100644
index 000000000000..4e9d7c121b50
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.135.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2018 kuzetsaâ„  and others
+# 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="139"
+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
+}
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 6592519aaf20..cfe86a3e3fda 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -5,6 +5,7 @@ AUX 045-systemdutildir.patch 1665 BLAKE2B ddca173403586e0ec4f8af86bf9d8004a0fa61
 AUX 046-amd-microcode.patch 1013 BLAKE2B be9f9b545e5d68285f2b4e3a4ccee3e39c0c41349450053e411532c47e9634157df190ea2bceacb422a3f1b874ae256c34a4822f3fb964b8c06a05f7adec3a59 SHA512 c37734a66a9727cb0effc5a02b85e6bd2d3e5b05913657f517fcb26fc6cacc89398e28dd2865e5abe0148520bc95530a6cffb904b5dbde00af1d85e7d1c26b65
 AUX 047-all-fix-issues-found-by-shellcheck.patch 3265 BLAKE2B 0f7e227311c96ca204d5b23093003b38c120dfe208482e421f7104fdfb29beb925239e007d372ba1e7b9e75ad395f2a4b59a5a0dbed02389398f678f480fb45b SHA512 21fbcb0558a543402325f3b356d08ce4747c82e337a3f196a1ded20b633bcf79ab14323858386a5c35ef4857f8795f14b0df874596ecb1a4f8aed90160405dc8
 AUX 047-plymouth-fix-detection-of-plymouth-directory.patch 1055 BLAKE2B 285e008dcbada06a475f1cbfe67602f046c7bb354b812ea614d99a921d40d09d099f3329cbc348b8bc4dd17bbbdcc0da986f0de5cce7f07464d2318dd9f0d719 SHA512 90372cd630903981528acd6aec1f1051e94ca2a0e53a834583faf6bf244aa7967f590f9bc38db3233e78bfd859388c011484a624d7f092c863755f73d6285b21
+AUX 048-dracut-install-simplify-ldd-parsing-logic.patch 1488 BLAKE2B 3a76ff666482b17adb49e3e9fb6483f7545136df33624d5bd76d472328c7a68532fbb1bace2988b62f279b0dba7d3c53e023146711474ef8497502aee8042a41 SHA512 09992afca26026b8f77de371486c655feabb1626120a571cbf24e1a230725c7debe56c9e47eb365aa200cf7aab15798ecc57e9d764887e42cee8d3c59fb341c9
 AUX dracut-044-bash-4.4.patch 5036 BLAKE2B faf944f4405b560d7f43ce2fd0595b223f1c91eed11422b19a5b61b710e69c10b855d3fb99fd28f204d8c31c49c272259704e148fcb794bbd8309b3779a62b4f SHA512 68522464fb446175f967c8453e8427f961e97522661a22a7c302a90ff716ab75b0cfc32f568a06f1e1821ba7115d6d2f48b6ded9ed65b30806d4d505a0903279
 AUX dracut-044-preserve-xattrs-when-copying.patch 2354 BLAKE2B a7195fdf0663e71b5e5eb2f8c9d971f5bd2bdc8b8a49399d836efc8efed2547118399ae7780c93014659d88c0359e7336f2e2a345ce009b5f872468d0412aaf9 SHA512 b15babf62a4ece46c8b55a2ac21c3284665da8c38c10fc1209c08605b778689cf80108b8baa0ce66eee2218d6975cc5b9401d8a70326ddb6f731c55373e52a02
 DIST dracut-044.tar.xz 280004 BLAKE2B 5b9603eb769b542e2d56fae4d0f0fe250e7e60eb9c85f9c7b7a472b9d889a9f323b3ba1cbbeb1d5de10507498542275cd4430695cc8b48426b42c03d0672ea87 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d
@@ -12,11 +13,12 @@ DIST dracut-045.tar.xz 292652 BLAKE2B 0e7c57ddca6757d59823afdc4ff23dcb06cc9cec31
 DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122
 DIST dracut-047.tar.xz 305836 BLAKE2B 18333ae1e24cfbbb6a152bf9ba2c48884821f6a506344259ba56c581a9f3efac7b4c88e8ca149ef1f83347a5e4d59acba61e42b8e0ab3a9e9beb8684d5db28b0 SHA512 03369726b6c2b682d0c9dead7b7dbd1c3989aaf2b4a561015634d33a94e5230d03cb634c3890191b19dd8c1c83389533ae1a46d45d2024ba885e0d2d46c5d035
 DIST dracut-048.tar.xz 308484 BLAKE2B b19c8122034a8b40cbc9d09245730900b59691c336f1d231e768786ad64068e0a8daf57ae9a4182ab50d9e1c683c9b7dcac354eb26d8a60f061db78121bc11c7 SHA512 97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0
-EBUILD dracut-044-r1.ebuild 7658 BLAKE2B a91ac6e72fc1c2a38647cddf723af6af2f512cd448a2452ed331c64d8a21f81fea03a9dc1e7bb51ce644e887dad2eb3e5b16ecc833e605f382a2b40b4c6648a4 SHA512 736269ae2121b198127eeec0bc34618c6c5e51ea9c4d44306252cf1ef91e8c6fb38438863cda7c2d451fd7e98f8abd37ebd701cfa2a9a0a92e7fa6c6d67f890f
-EBUILD dracut-044-r3.ebuild 6916 BLAKE2B 1716e8f1fdf2e9422284b364642ce8adbf0ebbb29c3d4d46461bcc6119b2a7ade7c114e4f2bcb01ffa60dc83d7710473316333d737d3666e4df92c29dc5dd073 SHA512 8eb5753edeb092f3a26b72826d87d30c6557242e4c977572bd8e96055fbd1086062febbb6320fd3a695aa24c7f73acdd62c9618d67b1e9c6672ce5e07e4b7c37
-EBUILD dracut-045-r2.ebuild 4768 BLAKE2B 34616da5042feb908053be73605f2fad2f3afd106722c65724696ddff4415265fcc7aa989204af431a22a975519a60769f1c14eb366645e803dd336765a754c7 SHA512 acd10bbf8133d0516b630e9df3a5145edb59497c960b98f8f4f30d6d983bb53770c10a616e96099ec0b61a0b95befa34d7c94799ee31df6f4f2a0288b17f45bb
-EBUILD dracut-046-r1.ebuild 4807 BLAKE2B f31663293ad74ca0ac058a43edac505a8f7bea5af6677535a6425588de39bbd2a0750085e0c290af234de075d05cb9c71f43587490f7090724140856361e424b SHA512 b6c93ec687c3d005ba7e2b0f5ad1317f343edc20c527b68927b00c6c64c29c74fdcb6db0b4a738e22de94141bae43e5aef37aaf1625667f8824dd8dbc5691748
-EBUILD dracut-047-r1.ebuild 4736 BLAKE2B 6940ade45fdac58fabaf6f814037ca704e77f01872163da3e4dc96572051961ca92a1e467dfe0541e40c920988400fbaa37e2a62a1e7edda31d99564d4c3b5b9 SHA512 4f39489389f78dc8aab806156821e6bd95a276f117c5d1711a8fe4498a94d83590cdab10d533bfc0bf5e6e0b66de46c349aa827f244ca86101aa67aad9ba2756
-EBUILD dracut-048.ebuild 4553 BLAKE2B abe855be0a4c988226f90e1877be3ceda45709858fa8d3cfe709385ee8f983922091ab6d5a5facf2f09aeaf8c476899433a91dc1abcbf7bec49fc2b31baa7775 SHA512 31b789b5823e031a74932e5cfc3a5a4abaa24333466342dd3cb8b2890d42ee9d0988983849f6fe6ef9ee333f9fbcb027fdf3c4683bf021b7f2adf1f8303cebf2
-EBUILD dracut-9999.ebuild 4701 BLAKE2B c0da9267ec48b6c5640e4bc425eba6997023fa5a80cf1e22f613aa852270fc4cecac9261736730646d70a838f8aa74f3f509b2411afc12ae6c512396f14e523c SHA512 e508b5128a039a920ea792ddc1cf9393f2bdf0a6188c6eb4209e7625b17da982283d401fe7fcb5f048ad965ca56878b73a4548295fece70d24de81940dc0aed3
+EBUILD dracut-044-r1.ebuild 7572 BLAKE2B 7423dfc6afbd25e7204571256af4bd9d58a6940dbb4b850b575e28562dc77e112af7304880637a8b7e04ec6feb8944fd66559016678913b158ac70b15ae342d7 SHA512 692d82df9f6903c67d46b58f8346e71df531816124feb08dfeb1b21e72959978292219b07c354fdea9b53ef4cfda29ca326f0fcb91e31931522a0f8e6edf07a9
+EBUILD dracut-044-r3.ebuild 6830 BLAKE2B f8c788af4032f80d9783ae185c90a18ecf5464f148f04bbc4752dfaca5c61a4cb7677767f8c98168550a30fe3692a7b60d33b528121c57c9f40db41623e72121 SHA512 30c24288ee9a08d5ba872e06199a5478c57fddc2987a9f48d5fffffb85ffcdb7970c7fa13a27a64ff318fecf69eaef0b10d701d434877938a190bed648327725
+EBUILD dracut-045-r2.ebuild 4682 BLAKE2B 58b7ae444da1fc1f9c414c7b7af4ba295af646e31e52f1c18bc371ee9eb00830cd23b080632f15920139b2184edd4f1f808509accdbd8cb4135a7f2732f7bbd8 SHA512 f19d68207ab99cdeaa2ed6c846a7660944f6142aea3939711c74cd3a7dc6a04d2088c816e141869da5e115818591129702249afcad6a417ffe5c1e3d166d357e
+EBUILD dracut-046-r1.ebuild 4721 BLAKE2B 88e0b0fad86e6cd97ed38ba86704c483d3685f27006e27de281638716a4960a48e2e3cd930036c7e73590f61fa1ac6e266fb6849952d42c3c0aa0c8f3005224f SHA512 074a97777eb21bd14df311ea861d2deff4173a62ff5ea1686f245b0abbd8d14256190b979cfc93fdfabd59f1b25c77d2df9f97733931e3d51485234058a034e2
+EBUILD dracut-047-r1.ebuild 4650 BLAKE2B 6847c8bc55aac1ccabaf258577a0cd07d749a54c27db9338d845db1905974b5a419f88b2f76c5769d5765e01a714c4de3bebf953625a4473f0cb0373d2e157af SHA512 c20892b9c02e27c9c3af59abef2adb90d3410fe889f82e1a74855ff3e87d3865483728d53a9898c82fac8824409ac3a1c65f23f53c0e63491a7cbcc5855b64f4
+EBUILD dracut-048-r1.ebuild 4547 BLAKE2B 891990985f6b459377f94811840774b86e01225b6996055ad050e7bc71331f7d10494f7fc514cf13df68dc3441b4726023bc871e8b50558c88db528289158c96 SHA512 3576ec29ad05c2bec9406b21dba1e207491a2cb9e7d054d522affc4501020280e2fe3357f6d283ea4c2cd9770ec4d5e2fa6d73bae86597d736da5db1f3e0c510
+EBUILD dracut-048.ebuild 4467 BLAKE2B f6c816fac85d808363953c15cc73a7d6da99934129de297258114c6117a711b58aea818d568604215b3bfc7bf86934130c358701bb2380fd559d2bcd16fe69dc SHA512 11062f8ae2506bd54f6bb784c6c2be6416748fcd84a33554e4b58d66b87aea2b3324c2216a01a211e9bbd207e7e4065537cbcc5bd612b6aac46e2e0912ecec77
+EBUILD dracut-9999.ebuild 4615 BLAKE2B 23b0c5d8e6dc0ba223fcd16975f84e2d599e26a794e0ee822f7305fef72885f1fdfaf7d7bbf05fc79575c5a1a6960d0e6e59f2fe9ef8a6a6ef93e23c559c226b SHA512 2ec1162a3b753e2381d0fc9f3ad33eb60328ea235cc5a95d781098d2012d4cec927d2bdd73a112d9c86601a81a7cc9eb497090aa3c8daf3724100624934ff8f3
 MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb
diff --git a/sys-kernel/dracut/dracut-044-r1.ebuild b/sys-kernel/dracut/dracut-044-r1.ebuild
index 9257c5e40e29..d3f5fbfcdfe9 100644
--- a/sys-kernel/dracut/dracut-044-r1.ebuild
+++ b/sys-kernel/dracut/dracut-044-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -243,8 +243,6 @@ pkg_postinst() {
 	optfeature \
 		"Allows use of dash instead of default bash (on your own risk)" \
 		app-shells/dash
-	optfeature "Framebuffer splash (media-gfx/splashutils)" \
-		media-gfx/splashutils
 	optfeature "Support iSCSI" sys-block/open-iscsi
 	optfeature "Support Logical Volume Manager" sys-fs/lvm2
 	optfeature "Support MD devices, also known as software RAID devices" \
diff --git a/sys-kernel/dracut/dracut-044-r3.ebuild b/sys-kernel/dracut/dracut-044-r3.ebuild
index fe6b6da7f562..ba9c06437c03 100644
--- a/sys-kernel/dracut/dracut-044-r3.ebuild
+++ b/sys-kernel/dracut/dracut-044-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -230,8 +230,6 @@ pkg_postinst() {
 	optfeature \
 		"Allows use of dash instead of default bash (on your own risk)" \
 		app-shells/dash
-	optfeature "Framebuffer splash (media-gfx/splashutils)" \
-		media-gfx/splashutils
 	optfeature "Support iSCSI" sys-block/open-iscsi
 	optfeature "Support Logical Volume Manager" sys-fs/lvm2
 	optfeature "Support MD devices, also known as software RAID devices" \
diff --git a/sys-kernel/dracut/dracut-045-r2.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild
index c5346244e0b9..396de86b3d2a 100644
--- a/sys-kernel/dracut/dracut-045-r2.ebuild
+++ b/sys-kernel/dracut/dracut-045-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -148,8 +148,6 @@ pkg_postinst() {
 	optfeature \
 		"Allows use of dash instead of default bash (on your own risk)" \
 		app-shells/dash
-	optfeature "Framebuffer splash (media-gfx/splashutils)" \
-		media-gfx/splashutils
 	optfeature "Support iSCSI" sys-block/open-iscsi
 	optfeature "Support Logical Volume Manager" sys-fs/lvm2
 	optfeature "Support MD devices, also known as software RAID devices" \
diff --git a/sys-kernel/dracut/dracut-046-r1.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild
index c9eb00c37e5e..e3ba1f41733d 100644
--- a/sys-kernel/dracut/dracut-046-r1.ebuild
+++ b/sys-kernel/dracut/dracut-046-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -149,8 +149,6 @@ pkg_postinst() {
 	optfeature \
 		"Allows use of dash instead of default bash (on your own risk)" \
 		app-shells/dash
-	optfeature "Framebuffer splash (media-gfx/splashutils)" \
-		media-gfx/splashutils
 	optfeature "Support iSCSI" sys-block/open-iscsi
 	optfeature "Support Logical Volume Manager" sys-fs/lvm2
 	optfeature "Support MD devices, also known as software RAID devices" \
diff --git a/sys-kernel/dracut/dracut-047-r1.ebuild b/sys-kernel/dracut/dracut-047-r1.ebuild
index d663ce2a26f6..5010bcc1f359 100644
--- a/sys-kernel/dracut/dracut-047-r1.ebuild
+++ b/sys-kernel/dracut/dracut-047-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -138,8 +138,6 @@ pkg_postinst() {
 	optfeature \
 		"Allows use of dash instead of default bash (on your own risk)" \
 		app-shells/dash
-	optfeature "Framebuffer splash (media-gfx/splashutils)" \
-		media-gfx/splashutils
 	optfeature "Support iSCSI" sys-block/open-iscsi
 	optfeature "Support Logical Volume Manager" sys-fs/lvm2
 	optfeature "Support MD devices, also known as software RAID devices" \
diff --git a/sys-kernel/dracut/dracut-048-r1.ebuild b/sys-kernel/dracut/dracut-048-r1.ebuild
new file mode 100644
index 000000000000..274f7b9cc49a
--- /dev/null
+++ b/sys-kernel/dracut/dracut-048-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux"
+
+# Tests need root privileges, bug #298014
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/kmod-23[tools]
+	virtual/pkgconfig
+	virtual/udev
+	"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	>=app-shells/bash-4.0:0
+	sys-apps/coreutils[xattr(-)]
+	|| (
+		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/systemd[sysv-utils]
+	)
+	>=sys-apps/util-linux-2.21
+
+	debug? ( dev-util/strace )
+	selinux? (
+		sec-policy/selinux-dracut
+		sys-libs/libselinux
+		sys-libs/libsepol
+	)
+	"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	>=dev-libs/libxslt-1.1.26
+	"
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+	README.testsuite TODO )
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+	"${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
+)
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--bashcompletiondir="$(get_bashcompdir)"
+		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	tc-export CC PKG_CONFIG
+
+	echo ./configure "${myconf[@]}"
+	./configure "${myconf[@]}" || die
+}
+
+src_install() {
+	default
+
+	local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
+	if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
+		# Preserve lib -> lib64 symlinks in initramfs
+		libdirs+=( /lib /usr/lib )
+	fi
+
+	einfo "Setting libdirs to \"${libdirs[*]}\" ..."
+	echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
+	insinto "/usr/lib/dracut/dracut.conf.d"
+	doins "${T}/gentoo.conf"
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+
+	docinto html
+	dodoc dracut.html
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_exists; then
+		ewarn ""
+		ewarn "If the following test report contains a missing kernel"
+		ewarn "configuration option, you should reconfigure and rebuild your"
+		ewarn "kernel before booting image generated with this Dracut version."
+		ewarn ""
+
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+		# Kernel configuration options descriptions:
+		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
+		ERROR_DEVTMPFS+='is missing and REQUIRED'
+		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
+		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
+
+		check_extra_config
+		echo
+	else
+		ewarn ""
+		ewarn "Your kernel configuration couldn't be checked."
+		ewarn "Please check manually if following options are enabled:"
+		ewarn ""
+		ewarn "  CONFIG_BLK_DEV_INITRD"
+		ewarn "  CONFIG_DEVTMPFS"
+		ewarn ""
+	fi
+
+	elog "To get additional features, a number of optional runtime"
+	elog "dependencies may be installed:"
+	elog ""
+	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2 "net-misc/iputils[arping]"
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		"sys-fs/cryptsetup[-static-libs]"
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		net-misc/openssh
+	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+		app-admin/rsyslog
+}
diff --git a/sys-kernel/dracut/dracut-048.ebuild b/sys-kernel/dracut/dracut-048.ebuild
index 2d407afa962b..122f8c7dabee 100644
--- a/sys-kernel/dracut/dracut-048.ebuild
+++ b/sys-kernel/dracut/dracut-048.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -132,8 +132,6 @@ pkg_postinst() {
 	optfeature \
 		"Allows use of dash instead of default bash (on your own risk)" \
 		app-shells/dash
-	optfeature "Framebuffer splash (media-gfx/splashutils)" \
-		media-gfx/splashutils
 	optfeature "Support iSCSI" sys-block/open-iscsi
 	optfeature "Support Logical Volume Manager" sys-fs/lvm2
 	optfeature "Support MD devices, also known as software RAID devices" \
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 161652aa8438..a686d0637f20 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -142,8 +142,6 @@ pkg_postinst() {
 	optfeature \
 		"Allows use of dash instead of default bash (on your own risk)" \
 		app-shells/dash
-	optfeature "Framebuffer splash (media-gfx/splashutils)" \
-		media-gfx/splashutils
 	optfeature "Support iSCSI" sys-block/open-iscsi
 	optfeature "Support Logical Volume Manager" sys-fs/lvm2
 	optfeature "Support MD devices, also known as software RAID devices" \
diff --git a/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch b/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch
new file mode 100644
index 000000000000..aa9c543fdce3
--- /dev/null
+++ b/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch
@@ -0,0 +1,41 @@
+From 6d886bb74d1608e4565d926aa259ea5afc9df7b9 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 4 Oct 2018 16:45:47 -0400
+Subject: [PATCH] dracut-install: simplify ldd parsing logic
+
+The previous logic would not handle absolute paths on the left side of
+the "=>" properly. For example, on Gentoo ARM64, ldd outputs this:
+
+	/lib/ld-linux-aarch64.so.1 => /lib64/ld-linux-aarch64.so.1
+
+At runtime, the kernel tries to load the file from /lib, and fails if we
+only provide it in /lib64.
+
+Instead of looking for the first slash after the "=>", just look for the
+first slash, period. This would fail if we somehow had a relative path
+on the left side (foo/libbar.so), but I'm not aware of any binaries that
+would contain such an entry in DT_NEEDED.
+
+Bug: https://bugs.gentoo.org/667752
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ install/dracut-install.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/install/dracut-install.c b/install/dracut-install.c
+index 88bca1d44..5f352b360 100644
+--- a/install/dracut-install.c
++++ b/install/dracut-install.c
+@@ -479,11 +479,7 @@ static int resolve_deps(const char *src)
+                 if (strstr(buf, destrootdir))
+                         break;
+ 
+-                p = strstr(buf, "=>");
+-                if (!p)
+-                        p = buf;
+-
+-                p = strchr(p, '/');
++                p = strchr(buf, '/');
+                 if (p) {
+                         char *q;
+ 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 200d8ed01660..976c7d8968d4 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -16,6 +16,18 @@ DIST genpatches-4.14-79.extras.tar.xz 17496 BLAKE2B c543f7d58552cd519dd722f1d791
 DIST genpatches-4.14-80.base.tar.xz 1970464 BLAKE2B cdb1a4c7f6b6412e6936be19bcb4f429c035b5d46d03c2aeb8a90d588eafd7427b5968ff42f8c44b6332e53223f4da0c6e46d8891f981a3180fadb3a9c455c37 SHA512 327a2bf6effe3479a202e6a6bf8a9318804ff84f53050f786546d6d1fa265ad068a0fd4df5c1d64724f613a076c10d305a48f0e68ab2f119fa7e9ec0a200f979
 DIST genpatches-4.14-80.experimental.tar.xz 5228 BLAKE2B 0ac2b4b56e615216918d7f5739668223d4692a9dd1273202c6b346f223b149e306797693c1ac034e4316102e774a472bc8872c9486a862f841f20c0f13ba4d4f SHA512 9f143960a869c2ef2ab9ef31dc73de3f1ea9b1a34ceac332f6e7ac448d4380ceb7359b9014298a6f17cce2d12bfe270b2af112dd60a7feadf994ad28d5a717da
 DIST genpatches-4.14-80.extras.tar.xz 17496 BLAKE2B 9668753679261522d678778c29b3637388624ab6a8ae1223241c5c47979083caaa37b4926d7239ff574977c29afc66c7147a34eb42538f1f10fa7b5006fdaea4 SHA512 0459e6453a44ae88870890756b9e3a852b3da0356c3df723e4f81593a52d85b5547ce18470ca831f3f0eeb43feebbc5255167c8a73e69d6b94719b4b2167ac86
+DIST genpatches-4.14-81.base.tar.xz 1993216 BLAKE2B 96a60ade763801820a818d18973abec10833104da7f067c03863883aa94e96ea5134599e913015d551cae27b5f9a56efb87b10a60265608fd230567244bc371e SHA512 bb9e356425ea24e01350384956ebaaf3f9677449b2b0393dc130c586e7b337442d3a38a6b138009838d8dfeeaf89c61e1257c8a13eb79749dc5cd96132d06c3f
+DIST genpatches-4.14-81.experimental.tar.xz 5228 BLAKE2B 0ac2b4b56e615216918d7f5739668223d4692a9dd1273202c6b346f223b149e306797693c1ac034e4316102e774a472bc8872c9486a862f841f20c0f13ba4d4f SHA512 9f143960a869c2ef2ab9ef31dc73de3f1ea9b1a34ceac332f6e7ac448d4380ceb7359b9014298a6f17cce2d12bfe270b2af112dd60a7feadf994ad28d5a717da
+DIST genpatches-4.14-81.extras.tar.xz 17496 BLAKE2B 9668753679261522d678778c29b3637388624ab6a8ae1223241c5c47979083caaa37b4926d7239ff574977c29afc66c7147a34eb42538f1f10fa7b5006fdaea4 SHA512 0459e6453a44ae88870890756b9e3a852b3da0356c3df723e4f81593a52d85b5547ce18470ca831f3f0eeb43feebbc5255167c8a73e69d6b94719b4b2167ac86
+DIST genpatches-4.14-82.base.tar.xz 2005944 BLAKE2B aba29a0c50aafc3827c3516736b2cd866952634982ec9e263c2fd6a260111469d7ed66ab3c9e3d8e3119a42b8a2c1f448b6fabb54eac9f893653e1a42fda621b SHA512 a804cea5fe03f1d826d9f654e30abf2d3b15a4d0d0c01fce37ed6a5c216c38082563257c715801d248cef2ef224f04f2d3ec17c85f1576debf94f2a8e35de877
+DIST genpatches-4.14-82.experimental.tar.xz 5228 BLAKE2B 935ebacd334480a9b2158b007c3cbe5f4c294578ff4d3183beeab265c0d0d3ebe0ea0676c83eb7e882341ded772e0289950506e5916a5072453b7aad22f5085a SHA512 c2fa8d3ca9603d6f970da0d56b57785b14a92713b0ac2eb80729351650ee954c9472dd5e581449e08e7b11556ec4dae5af783a9595d2efe4f97d677eb8b991f4
+DIST genpatches-4.14-82.extras.tar.xz 17476 BLAKE2B 3d19e44e381105fc312aedea0cf1abd588c9020f499c3c7370dca8ebae604911c21f94b6630bd6242ba6d2fd9aff777d8e9e5b44a7d6d3405edd25d665a812f3 SHA512 cd66cd90020da58ff88cb50bfd76c1257ce8ab0ae69b29c480d8d6eb5666dfe1589716aa64678f3f921fd8b4e9668b994f568d2dcf8ee234750ef254060fca47
+DIST genpatches-4.14-84.base.tar.xz 2036956 BLAKE2B 588ac8a824ca7b34629e38d27468f16351ed0e33004c95f36b74b6aafd2d74b6b91e05a1d96524d8f02a360ab0bd8d43c0c1f736b2e06f7222e86c131cc7c320 SHA512 50d42017c1bb87d95f1003042cc35cf727021c16f2eef1337b7d4e6816186edd314042d80ceeb9f125dbc15c97145a48b4b823f093a7088b849a048276b91a9b
+DIST genpatches-4.14-84.experimental.tar.xz 5228 BLAKE2B 81938c317aac4669ea29895ac91d8a5445ea41c82a1bc78f673e1c552415a77428e71f30170537064ebed698095cc47431777f3d562795138d7c065cd121eef7 SHA512 72f1bd49724ae8f548377724acfc30665b92f29d8e67dbd11495ba82a5044accc8913ddd84e5cac1f3660a76adfdd5057b4e4cff3754c14f10d1e672c4196d59
+DIST genpatches-4.14-84.extras.tar.xz 17484 BLAKE2B a85d48a013393e6bb775c93138d447d806f78608175789e19acfa7acfa0d2f35c2c4d0e4fce6944112dbc56a6e38de25d9cf107a398c76813f9d7c2cbd65deb0 SHA512 23fa91880759b9ada54de2656086e2af252bd3e8ee35baaf43b615231bdf20ebeae28c18b677ef470a0231c3731d9699806e50d32f6fbd87df1b89d332d0a07b
+DIST genpatches-4.14-85.base.tar.xz 2050508 BLAKE2B 3d4b9917b538d6f906f8112cce00d06e07d09783fce9478ce7f166c900707d56cc147d30ffe4dcc6f26c1975881aa2771dfb76dd21d3580dc47430c035d6d850 SHA512 23b1b30c43e78ebe57c7dc06fb6a6aea035b1160d421c6577eaeb5afe0eb8c72390eb5b33e708990f3c0452fad4678946a74279f3e9ba547ebd385f59bfc6ead
+DIST genpatches-4.14-85.experimental.tar.xz 5224 BLAKE2B dcedc912566883c0c57934acc23a8c5d89c95d14bc3e6f52b715562a414a535896774f5e184c1c83f1d601c32231ab3b98579eac848fd6a71ee7f833a044088a SHA512 6beeb2a40e8f668f833da082d79fa33a3901891a7f062fca56f4f6182fe6d6368466ed9eef4ad1daddc62b383ec5aeb8189b09577b33fd39be9b53e1e53c920a
+DIST genpatches-4.14-85.extras.tar.xz 17492 BLAKE2B 220ed00e4813e2b94bc1815e5cdca40409239864b1447bc7eb261a37a6b132b92935f0cf1a01749d4d2b2522c7e932c2e5fd3eb127fb0d09b7b3615dcb8d531c SHA512 fa0cf06245bb72a36bece9cd98daa55ae49b82e08ad5bdd3474ac6fd875f43278eaaf85e64620c120856700222e4f8b61102cb0349566be3a2f39e561140bd43
 DIST genpatches-4.18-12.base.tar.xz 237564 BLAKE2B 221499b05746862c8d7261959b63791efc1450329ec50b14d487306fa97398c364ee553922bdfb7b4dbf688792fcb778e6a30a57a6df10099f5367f01f1869db SHA512 08efe1e89151e1c7c2e19ca48380fa797297879d83b7a51ea3278a966a39324a2a1e5f66f2e46a64ed88d24c243576b119967d3bbccfdb78c7388525bbdb9472
 DIST genpatches-4.18-12.experimental.tar.xz 5224 BLAKE2B 8d0b8f1e8a2953e500b9d3e654cd89d40ba0bae53a014b1bee8fb19e6580dbf33687821bb3edbffa2db8daf3fdfb521ce3232f9b4aca0f4d2661be8115220c8c SHA512 a063a5e76f391a0d8011a0a1bb1fa06e6693c7efb211e5d25bfa5f39b6dc216f3c965ec1303a1d865c4b3c1484e03a4b99f3097759a0e15b15ca8b11215a3342
 DIST genpatches-4.18-12.extras.tar.xz 17508 BLAKE2B c324b68771942f0372d0f4f34904e3f52b021ef36453002732ab041096714cb9949f03840ab7bc2197c498ff3bfd6d8f4f7000a27e9668b9cc9d3c90e40dc466 SHA512 746c0bab36b8a1ca9171882cb21735378a12636ce5e157dcebe3b286abb5392c6a2e099226cce5bca77ad808c233c9f968aeceb2fc4744a94cc9c2372dacfaf9
@@ -28,6 +40,18 @@ DIST genpatches-4.18-14.extras.tar.xz 17512 BLAKE2B f9a02074660a4f2c7b24d00035f0
 DIST genpatches-4.18-15.base.tar.xz 370976 BLAKE2B d52c551875151b809e9b3ae28f23add15dba9ee258e0e3b85ff4e00d2b7deb42a1a0ec5ac237f62761ec2e90b1c509c68be74ba52f8ee637b80a912217e75b31 SHA512 026f3003ad668ab1cf409115411319d6efa08fc41e1f48e91c494d7524d86f2ec5a341ad2055bd622aa56f56ba480fc5f9975ab272f6ae994315ded1942e6e78
 DIST genpatches-4.18-15.experimental.tar.xz 5216 BLAKE2B a83c158e2af03afa637fba6dd934fd2db8168940b856cb2c7e0a9a9489db1b0393852589d1532f8a58463c54a159914621095f47275bec1cb97f29774fd29499 SHA512 7b462f37ab6dfc25b184b225d14f2483b1d14f52c0b0dd7c85884787811545b2137843d393dea98bf7440e2bfbbf82240f31abc136a8e4cdde85c9ae0dee9f33
 DIST genpatches-4.18-15.extras.tar.xz 17524 BLAKE2B ec0af95e43a958eb548233b7b18685471d5d26c1c3760e1f0d1ff1e1b757a4bb85d9bff5afc376711661badf528d07ddc9ffab8a670d090c4f453d7d27d7f53e SHA512 a73360051da5a9e59ec5e92dba2a934c158b1d9c806ba89cf02e3c34149825439db8d93627d55bdeb2050105ce2d63a1c56b871bc83a61f92b5cfe7cda40bf1a
+DIST genpatches-4.18-16.base.tar.xz 422672 BLAKE2B 688de9ccda3e62656a046207aeaa2bf09d3c3f7138a78343e2d362099f0f3b245ac59be420db4f209dbdcf3f1d1ac6ae1ac5fc96713e91c5088123dc03d6e5e7 SHA512 6e55ce52f2175a897dc2ada9ba76befe48a9c19544b3df1a39540d5e66fac7351e9fbe0799f6f6f23923a48f17d6181ba580c7e3afd40029039f5e6bfc826a0e
+DIST genpatches-4.18-16.experimental.tar.xz 5228 BLAKE2B 558fd2197c5ccdb034b6d6284dd90ccd92cba09993fa58996febf340a6225bc46c458c3e9e47f69f1f31dc4ffa31675f3f9a33f7e5c0b499afe7db2b1c2b71fe SHA512 c64277edadd67d46d2e9a97c423fab5ab5e7d2a21e27b54c1118400b15d6fd5b406d3ac3fc9b6bc8ee49b94801748f88df7cbbd439e62e6061bf36d27c703dfd
+DIST genpatches-4.18-16.extras.tar.xz 17500 BLAKE2B f3bfb098fdb5db5651c78fdb26ce927420dc6cf08479b98cd820284e21f6323c8a3e95000c8839ae7de88b3088a96725607611979408fb553534c4531ddee69f SHA512 13dc9cace14c765301deb1ad929f4564565a480c7b347b25878122fe103a528198e9601288b6b930aee3d6ac703d03e9ed236e9954f3fb2194d0ac49488bddc0
+DIST genpatches-4.18-17.base.tar.xz 434484 BLAKE2B f42a17a28b03589f67ec3c37f627cb8a0c35c98c3be3d9ad5733607a6c11c238f41d3216f2e9d82290899a59ce831ce826ab925ec710991f7f5e3a578af36d53 SHA512 d2efd7a23ee284cd5841c82a93d232297b2f21ce756337cc35a4e9920563a154db2239db88e9ba6c89cb3feb99073747aaa8571d527d023741c7cebe2d551995
+DIST genpatches-4.18-17.experimental.tar.xz 5228 BLAKE2B 558fd2197c5ccdb034b6d6284dd90ccd92cba09993fa58996febf340a6225bc46c458c3e9e47f69f1f31dc4ffa31675f3f9a33f7e5c0b499afe7db2b1c2b71fe SHA512 c64277edadd67d46d2e9a97c423fab5ab5e7d2a21e27b54c1118400b15d6fd5b406d3ac3fc9b6bc8ee49b94801748f88df7cbbd439e62e6061bf36d27c703dfd
+DIST genpatches-4.18-17.extras.tar.xz 17500 BLAKE2B f3bfb098fdb5db5651c78fdb26ce927420dc6cf08479b98cd820284e21f6323c8a3e95000c8839ae7de88b3088a96725607611979408fb553534c4531ddee69f SHA512 13dc9cace14c765301deb1ad929f4564565a480c7b347b25878122fe103a528198e9601288b6b930aee3d6ac703d03e9ed236e9954f3fb2194d0ac49488bddc0
+DIST genpatches-4.18-18.base.tar.xz 474704 BLAKE2B 66fc0675de5c337c7ef913e276c4b71ad45eec0ca21ccfe9ed5913408885ab8722f85451cefdfc6ea686a270ed9773295d60ebaebb8c61c068913d59d04b8e7b SHA512 dbd05cb459628e23043180df5bfcd33c22c859ae2b3e849d325b8234cd8eff423ff4f9ea58af91bb5b347450f43ca33ce97fe0f43d8f3c8d52f53984b5fb8c4a
+DIST genpatches-4.18-18.experimental.tar.xz 5228 BLAKE2B 81938c317aac4669ea29895ac91d8a5445ea41c82a1bc78f673e1c552415a77428e71f30170537064ebed698095cc47431777f3d562795138d7c065cd121eef7 SHA512 72f1bd49724ae8f548377724acfc30665b92f29d8e67dbd11495ba82a5044accc8913ddd84e5cac1f3660a76adfdd5057b4e4cff3754c14f10d1e672c4196d59
+DIST genpatches-4.18-18.extras.tar.xz 17504 BLAKE2B 6b3b9b142b9fd254af235217c1681f41019e1c789c2162f7735052698b68e583788503cfd0f151df8ca45b5d528a81f103727f74704db73cbf58b9ec5499d142 SHA512 d132b8c44e94409b44dd0d2d51886a189b7233f5441cf38a5785ea6742849a1d67764ec3a1f702ac7d49b4050ec2af00d1cd8f61bc9b636e019f474ba0812705
+DIST genpatches-4.18-19.base.tar.xz 491560 BLAKE2B 37464af933a0611a40bb0795e2639c0b0e8ecd112a6b7664d3ce19932a25ca4c6a5f36a7eb07005abb7c85c7be3bd8fbcae6e2959031467d871f62c5b89f571e SHA512 7b07af0ece2511fb4cb39ef35c9ba926a6d2e34eb24829f957876e6be6f56ad6bae89d6aa818ae81bcdffb16e26471a4fa9adcc4ac6f48efb3e53151310755c9
+DIST genpatches-4.18-19.experimental.tar.xz 5220 BLAKE2B ae3cfe1a10e76bd22905db948770fb51bc3181a4218f1a4f010d656ad41528ada6f6e507de1bc238cd68b6e6f3cd5a87aa7ff6a3516e441b672b902a4402ea76 SHA512 937b8db859823aa2612430cc24e2e4441afa20539fa2427c15182d21aaf9bb2d2cf1d520a2a9fb2d04971c9bd75b885205fda940d89ff892c290b92db1cca13f
+DIST genpatches-4.18-19.extras.tar.xz 17512 BLAKE2B eb3d70211535ca9fc9a58ef02304d2ff87c48acc5c47804de401599c8618cc1adede45ab2cb9bb59acfde6c7434bf8cdf32f6efd2c2fdf4d34ed619882a04b89 SHA512 35dfcc2122fe3d383bcf9da1ee032f21bc0dc4f36d29c82e829270775c21d8a816eace717a1e65938f4b01eec7b1f584f865d5a9ee997e732292f9840ace9005
 DIST genpatches-4.4-151.base.tar.xz 2298156 BLAKE2B 8a6ebf847b2447abdac3a544130721d54d51216d8bf2c7db34bc34154dd236cedceedc9190e5a5b9b972209c4180cc57b501b392be7f4b26684c95742e3741b9 SHA512 7e82eaaa0559dea96b5f53eb2ca231872db5cb45f2a5627f7d68fd9dab3f1840944bb613df9e909c0e734df515236ed35fbe4051124703ac7090c0a68d8aa6f8
 DIST genpatches-4.4-151.experimental.tar.xz 87748 BLAKE2B 90e9341cdd0d2d9f174cf28f063d8f8a50319529b96f9b6f2547535ed4fc560ed02d3f857bbd3bdc8d11bfda0f12957a6da9539cc7d15b12b74aba870c83785e SHA512 f465b647d9c57cabf87ca899e1d3c465d9a8690d05f2a64f71aa9333ba88ec3c0b7248321c5fd161149126c345b569a728f2a22eb4422c8b45fcff8dd319a67f
 DIST genpatches-4.4-151.extras.tar.xz 16452 BLAKE2B 9c7fdf7b009d5d58b919f7f1b395249748bd7489ea052702838fcc2adac6e605422fcf404b76db0206a6bda006a16401182684626a980b727301b963a713fffd SHA512 2470a74a73e91d4d0534521bda198f14450304910eace137b17fbd611281a2864907a724c600de4433484d76b8fdb794e11b48cf5e5d7ac5adaff518dd921e5e
@@ -37,33 +61,27 @@ DIST genpatches-4.4-158.extras.tar.xz 16456 BLAKE2B 98d8e7b860b014f83911f137d8e4
 DIST genpatches-4.4-160.base.tar.xz 2380092 BLAKE2B 6b49e3242cefe9b919ef5f12edb9c4ac664f4ab64f0d53c9fe5bb384cd2c2ad67fead2c0f478714b2e5eaecfe0a3ba43ffb3da3b022c762121c49e11e16efbb7 SHA512 7c307683ce1f9c90715b04a8ab47715e2ee760d3e475def2bd662c4973158972d9f62a1f4e3c7d1abd7b47bb1dd97e61a612c29b2f3d33b7a42c3273ff10f326
 DIST genpatches-4.4-160.experimental.tar.xz 87804 BLAKE2B 554213910881d20749634cf2bae37dddd2f49c26fbe25b21bddf0b452637b1e54bdb7bcc245f76dd181c8c3c3a5a624df882ca407e43091af3991f47d66e19ea SHA512 43acbd61d782f0a9afb1b5f3d38cc2f74c8f9e8aaf2a61897418df56188af3b0270e6ea239b545b5d7c46da5da1b15d752dc1fcd387c13c460f2695531ad222f
 DIST genpatches-4.4-160.extras.tar.xz 16460 BLAKE2B 8dfce6f8f44f738b91e5fdf2614cc63ee3ef252074ec459aafd04dc9d536e243c7f730b1deadca709c2c867b2514c573bd6ba521ca38f37089cb40f52e33c53a SHA512 c06e9b30cfa2bf5f04776e473501f9ab0e203060bc0ca3ee43057cbc1ac5939b3fa50406f19e6e78705f955323a01a1e43b1c7e43e4fbdcf5a2ca1d005b1e612
-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-122.base.tar.xz 2308844 BLAKE2B a1b7d6e0817b284ada41a2eb6f2b0c25c637d55addd1ec424d67ca5d56eb66f42f91b32d875011636c4be65aedab08895be3667071ff0089465fff7f47d10cb3 SHA512 1c1297e0f788fdbd04085e3c0ab4257e6d4a6c63b2c171cef9c85211267717d6d0a85ae9c23c1e8be48e0161b8a9c49da62780312e79520797839ff1abf39482
-DIST genpatches-4.9-122.experimental.tar.xz 106376 BLAKE2B 76dc6065de926924c51cdefc7aa0e70fc36ce172911b439817451826e233fa6360335374bd5cf95a044315bbdb37b55e22e1476f45f07e8ecb2dc6f46d2a1b41 SHA512 d4a54597a5d52108496481d4e9e1260beb36a375c9f36809e569eb8fc859f15af1a62bbb77ae10a50a46a8174ba765ba4a4a27ae370a0e4ae7d239838fc03d7b
-DIST genpatches-4.9-122.extras.tar.xz 17356 BLAKE2B 640509ded58da944c037cf78c973561bd4c8b6ee4a8e36fa6de67e4a741bbc8a4711dd9f5b57c64d831729c598d248b45304a2ae33794069a5906c0e2cf27706 SHA512 126a3b5c81c7cf42be2374f92535c8741389a5e72a184a566a643942bd793a541ae57db957b492d502b9cf4a28d8fce33c6c160340cd654617950939f4880ce7
-DIST genpatches-4.9-123.base.tar.xz 2343444 BLAKE2B a92f02a0e413c7de2f76c1fd560fcb4771de31e50c544b408b14ef5dc778a39e2124d4c494df91a4494e29d39fba0be3242aeff0913298c10ccd1a4b6a31ce38 SHA512 0f06293abed07720114858c9931d1b241942ce0e73ee1438ba3b44ba1087ed65e215b6de4c02362baab7bbd418f442bc07f6f25b722b6fc708ca1613f52acb69
-DIST genpatches-4.9-123.experimental.tar.xz 106400 BLAKE2B 55a6834704b4749c2680289be3ce979e4c1f46f12b7d32f23fc17f91e885a2bc9ea50143c574b754d61cc9f828f60cc21a548068e8870eabbe0632ae5b7d3f3b SHA512 d914583c41ef8f811c6926ef1c51920ef660ee3fc2705e5db5cf8b139f2e63876e747addde5c8838b9411aee4706b3f43281ff515b01d81c4b2f9dd35140187a
-DIST genpatches-4.9-123.extras.tar.xz 17360 BLAKE2B 175da34d3cf438009b747c7a99a1ae708f99e86bd97e15b35614915e2a3d8df9a7213b31f0745548861a0549f6e5116fdcf39aa5f8ab2978f2e9f0aedcb976ab SHA512 356c53be46f111ab466972412ce4b8cbc2d7a16c439f43780cd490265a118561b59d5a1eb53cb00c92032dc7e40439b46bbbcb02bab9743fa1269371069ff904
-DIST genpatches-4.9-124.base.tar.xz 2343936 BLAKE2B 44da7d48a609b3092182f9a166d62c1398b7ae62ad8df795a3ba886b164b3bf5a74a799ca51af3844950fcbe36ce4c3927a27b2add287f0c88687576a096d616 SHA512 56308bb2d7b887413e2b1ca93a85b35de224e4ddce8aa6a9cf0d06df9e810ead1c608fec134401dcc2fc0b67b62b89ba1fceef4f3216295b8605593d51566efa
-DIST genpatches-4.9-124.experimental.tar.xz 106420 BLAKE2B e705d0a2cc9f8b4f83cdea1f49253ff751d7ddec8a464878a47b0534c645142f34f7803a16792050f70a02e3552a8083d32ff65129892726b2698b62181ce36f SHA512 fccd08a565e5913ba5e821b3965f3a8ac6932ee1e8556cd88aff5ee973c0fca973e42969634db1b3be76512eaa3b077b0a0c5773a66403e3ee585b3aea1b04df
-DIST genpatches-4.9-124.extras.tar.xz 17348 BLAKE2B 60c69049baa4a00291a00e6a7ae022b2a049ba0fb34f34523621ea98b661c4171e37fbf302bda33c9ab2b3d6890184aeac97d004b0ceca309f595756bfd41374 SHA512 5083dfac483e44fba5df781ce68e8b7851347e7e4fa9b5d55d79c8527a23c034134035bfb093d83a2b89a83ba617773a0f6b461bf787930afd555dcc84afd108
+DIST genpatches-4.4-161.base.tar.xz 2401264 BLAKE2B d797bdae8905c1fe8bbb629ac7b58df7d0ea53c583df016047f911c814e35566a087e41271ee459e5260c29551ebb2062ac41b03dac94159a5339ba5125ed88a SHA512 1845a12ddf707d1539b8c9c89423c229ee9f43b664a99eb0eb2eb8bd50ef6623a39ce6b233a5dc00e259c2befdb74ecc5df79aae88a4bcc47eb22de0c41fed91
+DIST genpatches-4.4-161.experimental.tar.xz 87804 BLAKE2B 554213910881d20749634cf2bae37dddd2f49c26fbe25b21bddf0b452637b1e54bdb7bcc245f76dd181c8c3c3a5a624df882ca407e43091af3991f47d66e19ea SHA512 43acbd61d782f0a9afb1b5f3d38cc2f74c8f9e8aaf2a61897418df56188af3b0270e6ea239b545b5d7c46da5da1b15d752dc1fcd387c13c460f2695531ad222f
+DIST genpatches-4.4-161.extras.tar.xz 16460 BLAKE2B 8dfce6f8f44f738b91e5fdf2614cc63ee3ef252074ec459aafd04dc9d536e243c7f730b1deadca709c2c867b2514c573bd6ba521ca38f37089cb40f52e33c53a SHA512 c06e9b30cfa2bf5f04776e473501f9ab0e203060bc0ca3ee43057cbc1ac5939b3fa50406f19e6e78705f955323a01a1e43b1c7e43e4fbdcf5a2ca1d005b1e612
+DIST genpatches-4.4-162.base.tar.xz 2409748 BLAKE2B 2c7ac50926e0cd757033468802e7c81d2672a25cf2957d3b85f228be3dc7dc728cefcb11d06c8102e09c49aeadceafe60926a9fa6791eb0f4b9a9254d8c91ce7 SHA512 cda0d9e9fd8f3d674b8dd44c99982c8eb7dc1023dd0b1c9752f10b5a335aa29e6bdcc9c147f9811aa925073cad79f03f5d9d5459c1a1419145a29c07360f6dc6
+DIST genpatches-4.4-162.experimental.tar.xz 87804 BLAKE2B 554213910881d20749634cf2bae37dddd2f49c26fbe25b21bddf0b452637b1e54bdb7bcc245f76dd181c8c3c3a5a624df882ca407e43091af3991f47d66e19ea SHA512 43acbd61d782f0a9afb1b5f3d38cc2f74c8f9e8aaf2a61897418df56188af3b0270e6ea239b545b5d7c46da5da1b15d752dc1fcd387c13c460f2695531ad222f
+DIST genpatches-4.4-162.extras.tar.xz 16460 BLAKE2B 8dfce6f8f44f738b91e5fdf2614cc63ee3ef252074ec459aafd04dc9d536e243c7f730b1deadca709c2c867b2514c573bd6ba521ca38f37089cb40f52e33c53a SHA512 c06e9b30cfa2bf5f04776e473501f9ab0e203060bc0ca3ee43057cbc1ac5939b3fa50406f19e6e78705f955323a01a1e43b1c7e43e4fbdcf5a2ca1d005b1e612
 DIST genpatches-4.9-126.base.tar.xz 2350460 BLAKE2B 78e57b619a1ed60ccc91afd330638c88f41366019322edafe261065407620ecc128f6564934879042859734f4edfb1da31d4874c2d4bd39fd4eecb6095681e81 SHA512 7d476e3e52f747b93dd23004e6c180fa760d499c278dff104fafa52e845ff37ad963a8ed75c54c5a121bc1f8469775a23d123dcd0c2fa3be7d9df9d13d3f5658
 DIST genpatches-4.9-126.experimental.tar.xz 106412 BLAKE2B a7b77b95ffd76d1a337752cdec820599dd9e71c25d4c943e4374986dec08b6ff3526459807ae85d47beb5c6948763bcaf302ac6addc3139b4ca1e1f0ef0640e6 SHA512 1060c045836060eada07a716def24547e575c7a67edd69f663369f40f7737a8c2592a602aa184f6d69db8dcba0a1bffb687c91af55917d9e52ed48a091873e00
 DIST genpatches-4.9-126.extras.tar.xz 17344 BLAKE2B 0d28a44855994d1fead8eca518822ea8c706f2fdd3b845c17bf7771a03dc68fcafbf1eeca81a1982bffc38a1ab14192a182996a07ab0717dd31ce4f836dae9ec SHA512 72b3c88fa2beb9305de8792de4057716a1e4cf96f456cf2e0f8e2db385be0641bb975de3b809a5f230bc911cdf9fa63eba9ae25b5ce2633765bb3b4ea01dd329
-DIST genpatches-4.9-132.base.tar.xz 2441816 BLAKE2B 53a8675afe92c3821aca2251aa7e4cb5ccd5bd007871ddb6bbeeea9cf9ff7953505e67e4bc91685598734451bd2c470250bfc3ce4e2bfb749adbf0c606f89cd0 SHA512 f43ed194035db4eabdfd7c29113faaf6605d56e64613771011793fc7740fa06db0727328eaef33f847f6fbba6a7f8830f5d3b9c70b7268c7cf6974ce2afe2243
-DIST genpatches-4.9-132.experimental.tar.xz 106392 BLAKE2B e37bc8e9b99c2afdd0e57606d8a8f5eeeeda93013e6219801c3e9d14d91a6d70dfa4f7830a54293eabb81e821138432d18ef96ec98e3070a46b4b11680165ded SHA512 7fa9bba8c07d5cf861bf7dac0e8261e90c3ef834acca4768606d3292d664ed46cd790df7ab6f82fcaf83861ff9395a1a32da9122d99074c851aafade9cbbbde0
-DIST genpatches-4.9-132.extras.tar.xz 17356 BLAKE2B b7cbf6b4fb753c8b2155d61e86357a41978f9a218daedc016a1e11f2917294a82e1bca3915db80de9f6120e214869f7ae90b647b95fdd674b10eae651576affd SHA512 6e0777f4a57dd7e2f2771fd2416858a40f130cd110f1458debfad66a2ef6847969fda59ffa8f796a6f2736a3ccdd0f41b5fc1c66e3a507ff2b0b48ee6f291fbc
-DIST genpatches-4.9-133.base.tar.xz 2461436 BLAKE2B b558db80f864cfbbd46e842f925d882c877d8f1da5187483384ba7ca1713fff9db6815be114e169b69002bee3459a132ee30904c17c3c4bec9e99212cf67224c SHA512 9bd16c0141ee360101c60bbd2e77bee5bb8de3c881acb7ab3693329b6539728461509cac4f234d4581effc582f60c21b85ea3f09c273941a610e2fa5c2745b2e
-DIST genpatches-4.9-133.experimental.tar.xz 106376 BLAKE2B 69a24533ce6e1d2e1104f2964ab33013ca942fadb88916790d042eb246e8f40fb70af112aacd2828553ed68252ca687998052c46c1dd19af65af266bc59b3d69 SHA512 b645a3a470b99b4454f886d43172eb6d9ed2fff14632fb0259eac8c6019809ab1aac8af0003d392932ede01c9f1953f4c3ecb88a2b1506e8f384769d2c5625e1
-DIST genpatches-4.9-133.extras.tar.xz 17360 BLAKE2B 047b135d3c06e48c80eb84d75ccae69fbf624414263d3ce8caeb0be30070e810b58f0b4af9100d10489430b6f12f59195c0e794239ab35ad76cb58b8ab54edde SHA512 95f9f69b3c1de4f7f9c9d7838d4ca2e26d23390bcd5218ff2ea29bade40ff3bc6eb80c55036f12047aa6b1b3e09328a55bb3e80d0443c6ad802ed057d720fdbf
-DIST genpatches-4.9-134.base.tar.xz 2469148 BLAKE2B 98d632d35eecd9965bb78d0baf8889c22999c324ab2f93a27ed606b8f1fc9fbcc3ed473bca16d5d508b7aea57f3b9db0fdfa904e4dfe59d2d2849454e8d6d1da SHA512 75b10ad827435c6cf5bdc568bfb5d48d703c2117563cdd406e7d98701bb22e2944695295933ab7bae03e3647565fd8d86f3f4142ca2ea538dde4e9ea8d350ff0
-DIST genpatches-4.9-134.experimental.tar.xz 106384 BLAKE2B cf341a8c8f43353fead3844c549932de413380b72f5efb686031a35c5de78c13f66d606d5884bfea45333c7aaa39589d93cd6c295fc34dd103f354209a94116e SHA512 491a2b541b933a0e6f0eac55eb939ab668085158d059a2bbe99826e657bba3576bd6092a83baeda8c11a29a770823228ead660a5d64cce09354fb177eb857cd0
-DIST genpatches-4.9-134.extras.tar.xz 17356 BLAKE2B a6a8fd7226f451ea0a42abffab2a74c2dfc2ad61130b49a51548d72c98a3f1c96dba5432fc3abf88d3c08d1cb07b28ad7d252e22ad04443e3fc251a03affa045 SHA512 221edf2d3ca1f11d48dafd3cb86b316153ffd6928c1dc690fe5b69f212ae20ccd7b203c272e4554f3045da51cef7a3bc50d388cfe7bee7630ccee586ae3d7986
-DIST genpatches-4.9-135.base.tar.xz 2486572 BLAKE2B 5e5a19c8934d79481ee51c0990ffa77c557410fd3a58510df3f3da5b209329f7aea4c11bb8a3beb7200853bb57405f32bddbf03a35a03c0959d97e70ed4fe2e1 SHA512 336288690f7a66140c8d1d34906a629639a6230e34d9719ef129ffed035ee15ecf95ac36020e1d31bfe08441bb1649cba0d661018a38fcc6054d65ad7045aae9
-DIST genpatches-4.9-135.experimental.tar.xz 106384 BLAKE2B cf341a8c8f43353fead3844c549932de413380b72f5efb686031a35c5de78c13f66d606d5884bfea45333c7aaa39589d93cd6c295fc34dd103f354209a94116e SHA512 491a2b541b933a0e6f0eac55eb939ab668085158d059a2bbe99826e657bba3576bd6092a83baeda8c11a29a770823228ead660a5d64cce09354fb177eb857cd0
-DIST genpatches-4.9-135.extras.tar.xz 17356 BLAKE2B a6a8fd7226f451ea0a42abffab2a74c2dfc2ad61130b49a51548d72c98a3f1c96dba5432fc3abf88d3c08d1cb07b28ad7d252e22ad04443e3fc251a03affa045 SHA512 221edf2d3ca1f11d48dafd3cb86b316153ffd6928c1dc690fe5b69f212ae20ccd7b203c272e4554f3045da51cef7a3bc50d388cfe7bee7630ccee586ae3d7986
+DIST genpatches-4.9-136.base.tar.xz 2499112 BLAKE2B d68b80514607892807b343ba310cd87df1e655f290e265572e6162529bf65205723dc89cf3520ada6f7f9d2d94e9f9a9ed2a9f709096e2c4fae5db07a5921540 SHA512 286063c44a5752162924d4a1b1a1f34dda1f9bb5f81576a96a083d1b91ff2f846d813fb7c5bf312f711e4fbb5c1cebe700907eba78d936259fff27c27db0ab6f
+DIST genpatches-4.9-136.experimental.tar.xz 106404 BLAKE2B 7b3434f32eb16392162824e1a374f675c1e993a3e076b0d464812b420fcbb0d887bd8fc5b1316b71a4adcfeef714b9576a09c737e0c22374967d771417664757 SHA512 1241adbf933ec79f1ed809521c55e44a51b3060ef544ade05ee90ffbfd355613268beda4a1683f9b9a7b172f8f6305271b3caa9adea99980a0b1848f94e8cb86
+DIST genpatches-4.9-136.extras.tar.xz 17360 BLAKE2B e038a5f1fab6209642f023bbe789f540c2ffc4e946fa0c0d460ae9a9ee7c712c1c932317838313694a4a3312a4639e1f56db8e181825d2055c321e2f0fa6015e SHA512 49ec9be3ad02078fb235e4dda2111069244c37d04d434028d4fd5eb81e495480b2fdf1953d3671254839b3ddbf50a74c1f86bce2738db05180a0f3eb0b2d25f0
+DIST genpatches-4.9-137.base.tar.xz 2509096 BLAKE2B e3165ed862705fd51aacd8803cb5f1987b4be318d637c9fbb94ee0151b9031f53ab91b62b6533321aa46e6622007bd92a6dd4863bf7bdd905aa3887891c15024 SHA512 2e168bb38f3051dcfcb6cfbf39153588fbd9c23399a0c5b80503e686a0f296ec6173f96dddd58ea1c4e52456978a3cf49b19e795e55e4c7833a88ba07338faf4
+DIST genpatches-4.9-137.experimental.tar.xz 106388 BLAKE2B 35fd2b3abc3bfc9a239248a90592592c19d4205beed2b3c8c9ffea522031121d3eafb513f40c719fd86ed0fb116e6db4ffbc56274dc5676669c0fc5056aee3fe SHA512 70d53587939c6a1503823e56f9837b9f4133a4e7aa1152815d8996bdd12fb6a66fa21c552c4c7901b37178015aa141e5b48bfbf6cf0f6f68eb8e83119fc01b0d
+DIST genpatches-4.9-137.extras.tar.xz 17360 BLAKE2B e2c34195a7fdba0b30b2d4df4a922cc02e980986ecf1041fb623357ceb8a78fd580a52a0e3d7195b6e2544df93ede2a1daef648b515f14c1430234b29443ffc6 SHA512 f38c7a06c7adc4f57b6564a645de8ca98ca44d69441f95eeac4bea0d6ff6b5daa490b9b0c60a7513fdf051122a2fa6a6dd2335807988e7b2c6d199b8fc4a8696
+DIST genpatches-4.9-138.base.tar.xz 2535084 BLAKE2B 4c0bfaa7076a069fd7d506048efc55b3548d1c416081dacbaf2406eea164be7c579a23a8f225c15314c726d00db236b1e6b0cfceaa79aacfdddea5df8bea193e SHA512 1889caf81a833fe4cacebb2aaaf1efc0433172af20e64bf5800ea6d6484568df6f9e6acb114f01ee5e42529ec6605b46b28d44b6f53761e71b2e76ba0e6d421a
+DIST genpatches-4.9-138.experimental.tar.xz 106396 BLAKE2B 251204916d878f6b1a6c85ae03f8189ec71fc5026c946b973e752d3c3bee896fe2c9acebac3706c5d3fb9e52fcd8d491d323adc6e17b47603c59330f513bfa8d SHA512 1a4144e9dcc6dde30c5df4766fda4fe5a1be368ae0a8af076e3f401b3b4d06f6fa7299f625e08e265c59791f155cd4774a1f4d32aaad068759899640f6afb77b
+DIST genpatches-4.9-138.extras.tar.xz 17364 BLAKE2B de7b03db834ffa8cadc63afa0d70d36840a597102a78a10ebcdb46ce122e4b374acb1fa57727a7d608176e7e14af5d0d4a65b43905a787f7c54aca295ca63d81 SHA512 cc69f78ffddd5820c93afb67b11923ac3b14d1a7924b4aa4eb7e5c8431bb0dd15879758dc61c964762dee031a1f9c12474025444ccaff8d05cee343b6ea0e564
+DIST genpatches-4.9-139.base.tar.xz 2546088 BLAKE2B 5259a374fc11ef4ff950bb6104d6bfd958699541d9b9d5cffadb1d756df20c9c2c6be8b342beaef82d504a5c37f3406737ae7343ee9ac98c7e18e62fbd77a1ca SHA512 de1e97149cc8ee141aaf10e514cf0cdab71c318334ec19fffd74ec8465f58413b394ae2495ad60c995f28065824862532b9676e2de866be3718fc521dc37ecb0
+DIST genpatches-4.9-139.experimental.tar.xz 106392 BLAKE2B d3ba4c3d708147c4455202343bf824d257408dac6ccc0318e8dccb65ed0337b096d688fe9a28896cbe59bbb76fa74f663a9632ed38ed8532015b5613111ff9a2 SHA512 3353fbeac023b765f1e33040fe58600a85f620c19d7d530a27f3e5652c1536df5daf607edf682ec8616beee1a88e235bc4c916bff8575215d821b42de15396b9
+DIST genpatches-4.9-139.extras.tar.xz 17356 BLAKE2B a72f7b748397ee23ba94a4a8976acbc94a3a227ae027e0f4d02ce323925c248d31c376f10579cc54bb4ac551a1b546b1403f9d996050fe4f995e02848df76b10 SHA512 8c44046440d4bf97a21c84ab375b5c5441f4d8cefd2e273ee864460f90ebc104e35d24f44eb0f66ff420d958b70d87095df87d267fe4bf8ebacbaf681c2af1fd
 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
@@ -77,21 +95,27 @@ EBUILD gentoo-sources-4.14.71.ebuild 742 BLAKE2B bc74daa96072fba3bdc880132b8c3ee
 EBUILD gentoo-sources-4.14.72.ebuild 739 BLAKE2B d512b32e8dff512ec0fab8b36cc0b3eac7574f64c7f6c006b84e5668e50fff6846ec288c40cffe7fa94aac962873464e06066b547dbab582c3e0e5fc032d83fd SHA512 2a7c69c79dec97097b6b13cea3b675d231841bc6f427252b596421e3454ba30ef6ebc6506b8016c9cb7c84c48fa332013d92acc2fa8fcc543f1ac88ab4ce2935
 EBUILD gentoo-sources-4.14.73.ebuild 739 BLAKE2B e1ed1b15098e3cfda4730538c260f155a3da72df124bf664a638a7d1933dec4bd0f7365c903835b4d9568aeb4fdc99806c0d011ce61f0200ebad6fdd11675573 SHA512 66ff0e905cf26e31d5146e7b581aef3a4131f345cabf1e197db60c6dc6ad4fad39178ab8ba20f221f3ebc7ea2698dd8c9ec4ca4f6c9481d485e5f9b6591356ad
 EBUILD gentoo-sources-4.14.74.ebuild 739 BLAKE2B fdc66abe4817269487646d7b2a3af75175bb6bf55c51e7bbb6b224ece27eaf8a7fac332d3355aa2735e5247dabf6681b25b1c5950dd7edd4540a9d79412f5571 SHA512 460c3d1fafe3c552aa14d9157d0b9af18ffb0dd4bd94efb710d9ce523ceaf2931b835a2a52e127eefad87d15915806ad2f24666819eaddb1fd1add58efd260c3
+EBUILD gentoo-sources-4.14.75.ebuild 739 BLAKE2B 7c7cc4f46f88f9c1ee64203538da568ac83ea51c1fb3b1abe20799b99b9cec5e79e124076f58b284d023106ce20679e915e241cb9ebe9a78e57b780ef55ec0b2 SHA512 9e12028b3ddd357996fb4b37e23652e9420cae39ca351a427cdd8f40269779b81349d2cd00bb787fb34173eba0984ec69674b53166ad53c7ffd6edfd3b16c6ba
+EBUILD gentoo-sources-4.14.76.ebuild 739 BLAKE2B d54573644272a6f0798f8011642ec99faddce6f3bbb2a3f1d696fa26f8fc10fd794bd0841a53aff228d1cb7414907f619bd13d7b5f57d98798df17c656cf903e SHA512 f9403d4df7c481cfffd29260ad436ba3ffceaa3937dc44835aca5ff1b0348650412d5266677b718d683985f255d83607ad2ec99dec8f09c30038c8c4a5a67d11
+EBUILD gentoo-sources-4.14.77.ebuild 739 BLAKE2B c84f440f3813def0061177d91824b60a358e0ac855274aa02689e43df758f45775e27225d854d0235e8e33631b2c1d3175233a74a604bf37873ee560b57ba116 SHA512 e7a002806c09b51f16657de6371bb319e7d5b11713330bce6c076bcd9ef740d9e7d732323cada813bba60f8372bb979cb2ecac92f9d0925701c99e6781403ed1
+EBUILD gentoo-sources-4.14.78.ebuild 739 BLAKE2B e72b500b92e58263e4cec1c1c3c638de334fdc0aa9fd863a876af859d2a249516c144753c8664da107e7b4778c1e2f9701ad6c9afbe64645894d4de7d4ca4723 SHA512 774131e92fa7772a6de2bb7230b7980dae1ef76441ad7e78fa437a707cabc9119fb50bf135c7c4dd01c6b667b52d9bee191880e1840247a13d921c87833726a7
 EBUILD gentoo-sources-4.18.10.ebuild 742 BLAKE2B 818a7736a0eadd81c931bf616cf58ce7011ca1bc2095e765c40faf3d77f5197b695b5bb4ab3b5d0670ef6227180b480e761d64550e4621671231992570b7fc80 SHA512 5bd1d2ead0d2519803c6ba7d09a431d1d0ecb32f92238b60bbbcee3f687ff0aae3f271886ff62281276bb972c29117cc6ea2c1d011735d6025862da0e552f8cc
 EBUILD gentoo-sources-4.18.11.ebuild 742 BLAKE2B 758990368d1b70dc99338f90b7773a5d43db3c05247ed8301014975ad9f9e764aa45f336bfa827c0607f579d397f1dd0eeb3f602181c39b4e1afc0cb02ec5a6d SHA512 b42bc2e3146536e00b240b83120960e13adb9b7409cfb4210be65f24b7e64829807f4ac4235811f7e07e61676da86929f75db6aa24e382cd0f6084366a4be411
 EBUILD gentoo-sources-4.18.12.ebuild 742 BLAKE2B c2a813ca6dc44d5c9aa406b764023fcfc0d2937cc6becad1db47b6b845086d6850acb733cb09519d5a1bd10c21d5444d27228d3c8fb88cedcb634bd60b47ddd9 SHA512 29a60c02f676af5dafee0c7f0035e3a829d56b81662c3fc596b214fc528ea0612b2b9e0d3c600a8cf25919c11b95199e6227a6845c6c1bb6679e067c2b00bb9a
+EBUILD gentoo-sources-4.18.13.ebuild 739 BLAKE2B 552f3da032c10c80529fa40000f2b9e603268fff852db363f4526a24ef2f1bee7e7f6910dd06b812b7ece7da77888cbb24e18799d9ca578834357d04cb95b0e8 SHA512 597492cd91956c2910cc6d755c668f75f9605778d7fbe6bacbe6c200375b4b818a8aced285754f482ac4a64b7ff2f311f533eff267f5dfd8145dd0bf1bbcf836
+EBUILD gentoo-sources-4.18.14.ebuild 739 BLAKE2B b5e0340d531ebc56a9e53e68abaa9b3782cbd66c3aa71efc2efe18a6508f2bed06b28717a6080b2dac59b39e467fb1c4496ecf6c74beba1979ba18ea49558140 SHA512 1800af4dc95a605942db5c3ec9b8a12af4a34a84e00910d7b3172c85107ea812b65f42f577a85466a62340045be6b53e7e52f8a3a6433903bc4e18b9501ae85d
+EBUILD gentoo-sources-4.18.15.ebuild 739 BLAKE2B 0dac94bf1a90d7122d9553763e099978c0781941cd19c3226608f9c2289c41572c1817699864d61e731a3abc8b5a588dce8b3cb1f2f2574c9371ec8670261217 SHA512 36602d5efce5d1c52f3fb48ce25cd3fce36ec3fa225c35ad68b34f3fe21f6067f35750b83a184f53b36ca70449e25f730ba8741b5196edd76674de69a4e12e9e
+EBUILD gentoo-sources-4.18.16.ebuild 739 BLAKE2B d4138aa4c69a3013bc9ad5a459fdddb08a252b32bae88fd1815f43e9e0befb8d0fcd4a9aa408df3aab4caf027aedaa09760a24a3bc3f4d0e19270074181781c3 SHA512 e3c854e8e683aa79d4fbedcd8cca094cb3100f71422434245fd1227beb9c3461e9658f86cb5dd952261e1b9b131e75469a2d4c21faabce3e026a3bb45028d61e
 EBUILD gentoo-sources-4.18.9.ebuild 742 BLAKE2B 9b4b7701175fa852367e1dd0087d34a2b8439cdc800501cc95d5139664172ba3a42c84d7c8ababce19a50c7e025b7107e4d286a1cb17e8402ff61d85910dd605 SHA512 fe6760cad937d2e862172c7e4e0a6a2a03efeea2dea4a141261f357f8759afc80387ed1d13378c40de09e612ae3f88c9fd11c4c900e949dea373ae5da8024770
 EBUILD gentoo-sources-4.4.150.ebuild 736 BLAKE2B e27c55031b444caf6d6ae06522551c19be67a7d07dae01938801adbfb4e77783508f74e8ccb61c2e8d988be67136e039fc06c641d7ff39e34b56fc5c5d517de8 SHA512 ec712f868914d711293a876366d25232d6e6415a8b8840e3ce3e3ef6c308d3c8c1ac012fd8dc972d29810b7e113b23b715df84b02105e1cdbb3093be7e972b09
 EBUILD gentoo-sources-4.4.157.ebuild 743 BLAKE2B 96227f1c15f25d84e71494321ffd614e87c42b60b0e8728745f229944d5420014c8a4da64261bed4ffee89ea2bd0b8ad4f48f4993476375035ac202251b1ad40 SHA512 e3edb4b007ff6d2361bf5db83a8ee4fe3277e8fc298306d2de7e7c604771fcf1b5dc4cc122940b15c303dd72e8b82070513d0bb29cd9df9a4c496e8c44897906
 EBUILD gentoo-sources-4.4.159.ebuild 743 BLAKE2B fa859f10a2abc85a0bf064a5371ba2b57433d3f9062afb5aea23cb9888523d0aeaa8472607cbfbcc26b6a6a4df443b5c8eb85c52f2a41d473a3fdea2e931d046 SHA512 81a0aa730165939f7a20aa6c95988ccf16cee204eb39a0a4a5e26ee4a41501988529f31db48cbe6c4bc65ec1e29ad855dcfb4174ad374d65e60cb42a39faf3b4
-EBUILD gentoo-sources-4.9.118.ebuild 741 BLAKE2B 58dbe5f53edf250b8e69f26c6702488426aaea4831afda19920718649b6c42a8aa92fa2e4488c35787fa666f2e3f7c7957b3d8c739f7522098a3053a5fd10dc0 SHA512 897c910425493a7c89d79ef24231903dcc40a774fd28472d1f3c35033a6d68cea5cceb14ce113ad852002c737ace73d1f45c4178f34e7e2d0286416b7fcf4da2
-EBUILD gentoo-sources-4.9.119.ebuild 743 BLAKE2B df51ed12fcc8c79456b03972a34a1bdd9c2278d582deb95355d12c7015a7efda33ee44bf7c65c99cdf3da924ef3c84656d6850935ee0861abb6add7d6f65e333 SHA512 11ae9347b175bb9d260f0350a0ace71223d9f24fd00931a96d175587905e3fdd30dd8b3a16a897ff68c5f6558c83b6b150f88e402d03433921f3d7a87c5c2dfd
-EBUILD gentoo-sources-4.9.120-r1.ebuild 741 BLAKE2B d17652c3d64c55fa20fe874af99afe9ae7ce7dbcffd12eba33b2fd31d9c41693e7415dbff62919e120fb05901c29db4186bea0fdd8275320d2075fb6dcd45665 SHA512 dd71e87b29a11c77027e336151ba05da0a6806ee6d8d083160ff31a6456c8ae4e94525419328b3663ce8807f8a5eb06d49957bbc6dc230237f6294e9f68fd79c
-EBUILD gentoo-sources-4.9.120.ebuild 741 BLAKE2B 0f93efecdbdf163e42ce53abde6281191f966a00d7bdccaa5e8fb8239b8d060515b7b5d994edd7b1d5a171e7f94c4ce116cdb4a8c2069496074863dff7a0e4a8 SHA512 5e2f62111d836c48ee5e56cba694f9b8803e291b6cc51e6804b4b70c631454c2e139e98e495918e9055ab555535d32d6f5e4739b33200b9a2d2278b7a3f2ee9e
+EBUILD gentoo-sources-4.4.160.ebuild 740 BLAKE2B 8ab8be45a7cf44c8854e51b251306af0146bb7397ab4dce9e758911cc859033078042ff1196b311eaa7a7cf691be493ee60290944203bfc173fb3ad578c45c1b SHA512 f67a10cd981a6c41cf7343833f84a81486bcd2c2dab90cce87c9124119656ec83aa871442a5aa3f5512bcaf00ea2d00d1b875b6451a0307ca390c174bbae5e6e
+EBUILD gentoo-sources-4.4.161.ebuild 740 BLAKE2B ad0efce802cb9b60597e9d30f7484fd37988ca002cfc9ea5c07f4594c58c404e5ee4e33595d77c7855ea2fb83b3231fcd1efc76b35032dcf832773aacc79efe0 SHA512 4d6c36b7f197dbd5e1c9a3f3e1a4c1309962a24b1a156cd15ba39329842d3e1203e7671a2214dbaeea7d15af648f0af29bf6d5cb039e159c375cd5bc7433e713
 EBUILD gentoo-sources-4.9.122.ebuild 736 BLAKE2B 5ec7f2f3a8f97684ff8f68035b115f70e6db5b012e7af409f49a804683315d19dd83924cf047173330568bd4f17fc67b2ed3cf81cd4f62ae105b42d235235f52 SHA512 f07c65eba4211216c9fd33669b376143b33f48a4eabf3fa916788a9fb66916a22b4dfb693806dc59fe2756011747215236945a18023a66a610dd167ee11c616a
-EBUILD gentoo-sources-4.9.128.ebuild 743 BLAKE2B b6506daa3ec45e7a32a142f5d46d2dd2462d31dd9c2e2a7d184262981c9ad7d49687797ad8bc1faf4e82c8e2cf6d428e92508347f1e7798cb867961726dde4c1 SHA512 fa3a73d80f97f7268ed57ebbdac5d78ef0025154b6ed4eba455548187dc90252f36254ae6cc2af1c0d55e5c844ce5ffe47b82d3b7fec662d15c9fb72f3df0acc
-EBUILD gentoo-sources-4.9.129.ebuild 743 BLAKE2B cdd429f650da7e9bfdfba79f33f60248c240502d9812da2b026aaeb71cfdd73f2f1f278db56f39fc5f664da9f6c784dfc96f1da4ffb556a5c3a3754accc099b9 SHA512 8375444ac4f871ce848726e0e43b8d0ecf9b461fc9b9dfdf8d5ad43dc3ed6d9dba4dfbea414d8b0180cdd317d1bd5fda4cbac9a504ad4798275636ae4e239146
-EBUILD gentoo-sources-4.9.130.ebuild 740 BLAKE2B 193f8bab92aab1384225bff8573905cd9511e0be5727965a180a44937c002e1c1e7ca825447e706ad7bc256ef01685795711207c78640a12c8cc153a631d332b SHA512 68f6b989012e00ae8ee089b4a70a47b82b0a43b0320fb6a2d38e0490046d76a241c220cc9ba924dd2efdfe798f774cc395eba8bd7c94d61e960ba7bc7f736bce
-EBUILD gentoo-sources-4.9.131.ebuild 740 BLAKE2B 66ef69aaa9d311d88716ff16272b7a4e93b857f25976ede816b59a374a18baa7e509139ddaa171cf7012f4dcde00947ab6b004f2ed273c0316507d0893a10948 SHA512 320979a065d1c6ddb5ccf2f9b1406ab857b5a3065694d6ea954db89398e9b6163d4642ebdaf41f0229932eaaa15668b2d51a5be089a3e1c1419d3ba570baf790
-EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
+EBUILD gentoo-sources-4.9.132.ebuild 740 BLAKE2B 949412789fed64458f2b0a1fbefecc22fb69efe106630e8dfd69f85e1b8b14011877e2ed83b5c4a63059df0c564ba284897201a2b79c21d252307512a2346833 SHA512 ebb10da07e7edc177f797a182bd7f190a142f8082441e19f3753d4528736f878023af67eb117ae666e10adda40cbc40fced0324ed672a3e291337556aed766c3
+EBUILD gentoo-sources-4.9.133.ebuild 740 BLAKE2B 052d2fb88a8446789eca702bc7e92c357fa5e9e631472c5262db3493a9cd13e654be847954308dcf4f5983f56bbfad8855b01366171ea8a44ba523ca7ec5de6b SHA512 4ad7fb46b7491c12686fe80c2335a9306130e68ad154c39880775c184f5783e53011ed056e7fae91412c49d11b597a6eeee699fbf4d194f8db27010e03d85c31
+EBUILD gentoo-sources-4.9.134.ebuild 740 BLAKE2B 9dc7e22c12b70d0c600521887cc29b58d474d40f51520b5304a280e15edb03157c64c031f9a9e5f6f062bf42960ffe9fe54b4d29e13c75deeaa55081c0fd23a1 SHA512 721b151650e7f8d744a4d0fe0972fadb50d1f8f7dc1e4f8c37915a5f957b37559a099e07c8b0f4360249ee83fd62340057a09ef691403bc963ccf49c734bb3a1
+EBUILD gentoo-sources-4.9.135.ebuild 740 BLAKE2B e9f04843b02526c47d9c48a60052e31d7c12873d77d2f169889d807b8adb650f1abec5a96f08020a66ce5f88f3a93a01948008c3b84498e4e3d90d1d1c48389b SHA512 02d5e1670fcd48bbfbe9c0947f5416118d347988cdc36220686b295d36a2858df1157ccee06a546b93a93afa39fbcb4635fff2f15b731cec0ee925007a47a198
+EBUILD gentoo-sources-4.9.49-r1.ebuild 667 BLAKE2B 30dcd86292abe4a5c271f4a0dd4e68d92a74007afe4ba7fef2f191d52c6f00a419c467a4a90afa902572c6fb879a59e9efa68ee93c763e83699cf789db4742c6 SHA512 1415586a7ca7c7710e36535c75a88402c8b6072be52959113874cdefa9978d2f5eb35085be67cc63d60c9249d5b498112ca157b41e519973573705be5fcbb20f
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.75.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.75.ebuild
new file mode 100644
index 000000000000..c387aa411c15
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.75.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="81"
+
+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.14.76.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.76.ebuild
new file mode 100644
index 000000000000..137c77b36b4f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.76.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="82"
+
+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.14.77.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.77.ebuild
new file mode 100644
index 000000000000..43c2d3febbe6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.77.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="84"
+
+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.14.78.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.78.ebuild
new file mode 100644
index 000000000000..4e3c5d0e25a1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.78.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="85"
+
+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.18.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.18.13.ebuild
new file mode 100644
index 000000000000..8da04d54054d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.18.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="16"
+
+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.18.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.18.14.ebuild
new file mode 100644
index 000000000000..f68894374f6c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.18.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="17"
+
+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.18.15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.18.15.ebuild
new file mode 100644
index 000000000000..c44f667e877c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.18.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="18"
+
+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.18.16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.18.16.ebuild
new file mode 100644
index 000000000000..b608e8df998c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.18.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="19"
+
+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.160.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.160.ebuild
new file mode 100644
index 000000000000..1f07daccdd74
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.160.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="161"
+
+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.161.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.161.ebuild
new file mode 100644
index 000000000000..831ed34d7952
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.161.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="162"
+
+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
deleted file mode 100644
index 7a2b8f72da72..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.118.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="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/gentoo-sources/gentoo-sources-4.9.119.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.119.ebuild
deleted file mode 100644
index 2f59d91e5290..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.119.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="122"
-
-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.120-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.120-r1.ebuild
deleted file mode 100644
index 6d495aa502da..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.120-r1.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="124"
-
-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.120.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.120.ebuild
deleted file mode 100644
index ea034cf84a67..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.120.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="123"
-
-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.128.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.128.ebuild
deleted file mode 100644
index d4bbb4ba83aa..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.128.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="132"
-
-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.129.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.129.ebuild
deleted file mode 100644
index 6bb78759671e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.129.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="133"
-
-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.130.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.130.ebuild
deleted file mode 100644
index 1d1aa3640803..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.130.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="134"
-
-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.131.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.131.ebuild
deleted file mode 100644
index 5e2e7a8e60d6..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.131.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="135"
-
-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.132.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.132.ebuild
new file mode 100644
index 000000000000..f59eab667e17
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.132.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="136"
+
+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.133.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.133.ebuild
new file mode 100644
index 000000000000..11b40a48a4b3
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.133.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="137"
+
+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.134.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.134.ebuild
new file mode 100644
index 000000000000..1b730e9aa938
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.134.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="138"
+
+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.135.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.135.ebuild
new file mode 100644
index 000000000000..b4519c95cabe
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.135.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="139"
+
+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.49-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.49-r1.ebuild
index bbde981c05ac..2d7ca65bc70e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.49-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.49-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="sparc"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index fec0f47acb6c..86c0ec1cb6bd 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -5,10 +5,14 @@ DIST patch-4.19-rc3.patch 38635039 BLAKE2B c6f5840a1483c0a97b284f038f965d74b268c
 DIST patch-4.19-rc4.patch 38932487 BLAKE2B fc07f52bc086f9d4f52e1ebd996ac1a2cdfce8130edb2f26251863b2f4a78f0f55c82a7f7aaf744db8b40e1ad4ab8aa3f16f3934960c46a06edb5967382d5d96 SHA512 8d61ff650a479676310db533d0d0625c5304caf777d924199b91a7b94d4840d9088def4a9b184e493a083a03ed20853811a5ee45b4f5074efd79129d6b3fb7b1
 DIST patch-4.19-rc5.patch 39132199 BLAKE2B 511377a23c45f3905fb710c09727a2a8ce93b7e1b10e2274dd38ee7b2095390a4f99c6e193756719b5de9fd6c17d0d901be1aef78b92718436745ece0a57b82f SHA512 0080e66cf9f0ae187c9210ecc5af15978642916d71920383e365cfcb3c837a5ee4052fd53030eafa1ccdd996663ad66d1730c8e49e85e584bc616dcf6389868e
 DIST patch-4.19-rc6.patch 39335180 BLAKE2B 94bbeb07c7d0dadabdad0c177148747d04d3f1d1dc47257183113d6d54d9b59f67a80efeed8d7c8116d088065435b9c87352631cb910ac583f02688ee96f2884 SHA512 15b4748e8d98a6843c7fc47081996c79c3d4a11302ef786193432f70ec809628294dbffc5b162113aa04d2313ad69d8fafe5713a19397ce82d36e134630be59b
+DIST patch-4.19-rc7.patch 39634304 BLAKE2B 98bf6c83118e7ce7f90ecd7c70412b8854a83c4ed6843021e7fc6b4340dc9bf89e29b30404c2e4ba16a3ba7c85d7d48bb00b16531de7b625a5ddf731b43c526c SHA512 cb0bc2ab8b3efe7332fb498bef706c556071e6623d76092dbbcc14d6741051bb1fe97d7c52baa0a950803c7cc186868b87b842e9fb9f61fce95befaa5be40cd0
+DIST patch-4.19-rc8.patch 39758717 BLAKE2B 56c7188f0a47b042fa92c3492feb3ff4f980508afbab17adada089ad6549c0b204b619555573221557d05b11a0b0d225a7d3f2929778e2ee66d7c73cd942a690 SHA512 b20a6aa57f6609d41a0687aad9b90bf1be04fbdc4c7312520bb3b28405142d684a7018071afd5bf8034130ce297f424c68fd93922faa0a27268c73e572213ed6
 EBUILD git-sources-4.19_rc1.ebuild 1179 BLAKE2B 84e8be0dc12da309695bb9ee46080c35c4a3dd0fd1b6f56f86e415886bdda8c51836cacffbb2ec19da06070952168c346d2648aadc2e9acb307c19ef082a5757 SHA512 dce7854f70a9da74dfe4ac0f923314b36378634b1fc2906ab09165338d930eca5016bd26abd88968ff964d79a4b4e257a941a57de5d7ce8fbd0420dcde660a58
 EBUILD git-sources-4.19_rc2.ebuild 1179 BLAKE2B 84e8be0dc12da309695bb9ee46080c35c4a3dd0fd1b6f56f86e415886bdda8c51836cacffbb2ec19da06070952168c346d2648aadc2e9acb307c19ef082a5757 SHA512 dce7854f70a9da74dfe4ac0f923314b36378634b1fc2906ab09165338d930eca5016bd26abd88968ff964d79a4b4e257a941a57de5d7ce8fbd0420dcde660a58
 EBUILD git-sources-4.19_rc3.ebuild 1179 BLAKE2B 84e8be0dc12da309695bb9ee46080c35c4a3dd0fd1b6f56f86e415886bdda8c51836cacffbb2ec19da06070952168c346d2648aadc2e9acb307c19ef082a5757 SHA512 dce7854f70a9da74dfe4ac0f923314b36378634b1fc2906ab09165338d930eca5016bd26abd88968ff964d79a4b4e257a941a57de5d7ce8fbd0420dcde660a58
 EBUILD git-sources-4.19_rc4.ebuild 1179 BLAKE2B 84e8be0dc12da309695bb9ee46080c35c4a3dd0fd1b6f56f86e415886bdda8c51836cacffbb2ec19da06070952168c346d2648aadc2e9acb307c19ef082a5757 SHA512 dce7854f70a9da74dfe4ac0f923314b36378634b1fc2906ab09165338d930eca5016bd26abd88968ff964d79a4b4e257a941a57de5d7ce8fbd0420dcde660a58
 EBUILD git-sources-4.19_rc5.ebuild 1179 BLAKE2B 84e8be0dc12da309695bb9ee46080c35c4a3dd0fd1b6f56f86e415886bdda8c51836cacffbb2ec19da06070952168c346d2648aadc2e9acb307c19ef082a5757 SHA512 dce7854f70a9da74dfe4ac0f923314b36378634b1fc2906ab09165338d930eca5016bd26abd88968ff964d79a4b4e257a941a57de5d7ce8fbd0420dcde660a58
 EBUILD git-sources-4.19_rc6.ebuild 1179 BLAKE2B 84e8be0dc12da309695bb9ee46080c35c4a3dd0fd1b6f56f86e415886bdda8c51836cacffbb2ec19da06070952168c346d2648aadc2e9acb307c19ef082a5757 SHA512 dce7854f70a9da74dfe4ac0f923314b36378634b1fc2906ab09165338d930eca5016bd26abd88968ff964d79a4b4e257a941a57de5d7ce8fbd0420dcde660a58
+EBUILD git-sources-4.19_rc7.ebuild 1176 BLAKE2B a12ade8feb61f1fe846f85647338f593ae7ed071935f71d4b51b2296a3b44de0e3a0809d53fc0a6fd4f5c3ff9c6bc01b82b230338e64c05abebefa0d18c9698e SHA512 95e6517f76c41af405d665153ff6739b9909c0f27e510c9b1ecf831ce0136689fcb39dbf6dee8bb83cef851fb375f4755a030290783c0c029ff6ee17782fee92
+EBUILD git-sources-4.19_rc8.ebuild 1176 BLAKE2B a12ade8feb61f1fe846f85647338f593ae7ed071935f71d4b51b2296a3b44de0e3a0809d53fc0a6fd4f5c3ff9c6bc01b82b230338e64c05abebefa0d18c9698e SHA512 95e6517f76c41af405d665153ff6739b9909c0f27e510c9b1ecf831ce0136689fcb39dbf6dee8bb83cef851fb375f4755a030290783c0c029ff6ee17782fee92
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-4.19_rc7.ebuild b/sys-kernel/git-sources/git-sources-4.19_rc7.ebuild
new file mode 100644
index 000000000000..73fcf5fcd5c2
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.19_rc7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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.18"
+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/git-sources/git-sources-4.19_rc8.ebuild b/sys-kernel/git-sources/git-sources-4.19_rc8.ebuild
new file mode 100644
index 000000000000..73fcf5fcd5c2
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.19_rc8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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.18"
+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/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index b652eed6591d..653517af2115 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -4,6 +4,7 @@ DIST gentoo-headers-4.14-1.tar.xz 4080 BLAKE2B 5d8bb4453d3b0b739922a86e0e45120fe
 DIST gentoo-headers-4.15-1.tar.xz 4068 BLAKE2B fc99b99637a11dc0cc6b4d79be3e32242f4b4f3c86a4618b3a51839e902ebad045b335f531ca41c10a6a597111f2cf77a0ae17518fb17a8441b26f1bd98c19e7 SHA512 cb973625381ac0115344d9aa1ddd927d75f0c11961526844a9da6a0aebcd28b488a7af3b423ac8358808d998d9d00d51156780905a04c01c6c512215cad6de7d
 DIST gentoo-headers-4.16-1.tar.xz 4044 BLAKE2B c35efb14266d7d7f06de79f584c6e13a700c38793d7df399e668d5de269088d8a441a10e9d0b7acc5b6d1a116343d516aba58a4823cf51845fe9913dea81cb76 SHA512 a1fdf775bc27e5db2ccf1f86f12e78a25a4127673eb0a87639d548dc6246b81e5df0e8d56c0314ba833fe82d2825f8620addd408782e2f5152fb0b056b870d7c
 DIST gentoo-headers-4.17-1.tar.xz 4072 BLAKE2B 7de125ac87b0344a5ff7dfbbe3d15d62cd3364116750e35b72d9e404512267a497df1ce8c52df0ba97c836df68287fe239bf29fec25d43b11be67aa17833c097 SHA512 0a837b227b7e923232438f1961535fc9becb6ed4c95290da76631489ce318a875bd3cd12ec110dedf77026c5cb9761cf8ae5c9fcf2abd736f0f7b7249228efdd
+DIST gentoo-headers-4.18-1.tar.xz 4040 BLAKE2B fc4462bc8e59a58658c6bd2669840d7105f6bcde5e7cc2633f53ae4aaf44a67aebef24d944d9d3edb95abb4110ddeeb86a6fc0cbebcf6cbe23b59b97c16a0daf SHA512 8f58df3a5e5bf26e06c300354ec1e468f40593601e6645dc1b51491f5a678020598c1c72f72e616b499f503d98da4d4bf9cdf804a15cac73f51b7877756dd7fb
 DIST gentoo-headers-4.4-1.tar.xz 6624 BLAKE2B 9cdf0c22520e413f175942c4994dd90b0fed8f72c67332a05e7ed72b901ee04594f4e4a3c0252e0a6e057d9c08c4d653387dc36cda82ce9ef8a16e7317ba9ea0 SHA512 dd8a5c627a9cd373022d7afa1beb126f15694f80452821f31fc5c1a3439635814d205bcbc873a5869946472d86cdec872a44f4870751b96d42e89893fca1b983
 DIST gentoo-headers-4.9-1.tar.xz 5416 BLAKE2B 2538870b340d4e4b260ada37b0571ba770a4bf93b0f0cf78819b4bf68b8ddc43c314d7fc5d12a78bc71c9bb12306d986ae0ae74159ec7edc7deea371f6b5f015 SHA512 1069f50c58f25ceb8a13c8e53dce6a21e352e2a624da3b9a6d139939e7613e9a97226eb0173fa060ee69443c6a50b53b6d5c6d752dcaebffbe2a78f06cfbe2b6
 DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535
@@ -13,6 +14,7 @@ DIST gentoo-headers-base-4.15.tar.xz 8199628 BLAKE2B 79a4f694a8335ed4bf1df94ab78
 DIST gentoo-headers-base-4.16-r1.tar.xz 8227040 BLAKE2B 95b2d64a614430e49d849ab54c58cbc3a850faea1bb5d9f7f43733d7b745ceb5ea3d1f8cc4dbb36c20797ae7d10bd736b99d17f5bfd0cdb90ecedb4eeb0f8610 SHA512 9b7cc82a322bd43dbf07c63d465200c87b838252e449028a363f3ff10921fe3889b503f20184168c7413d792c3d33b4324d89c89b95c8143a4a3c9c3e7e2d28e
 DIST gentoo-headers-base-4.16.tar.xz 8222256 BLAKE2B a5065cb49b549ea5eff33bc3a60ed070511cc463258666c30681aceaba97a108be059e4fc175bd6ba4dd0b27cf8bab14e0a8225346811eaacb4ddf8b2ba5a147 SHA512 2a5beadc61532d23f999c24101f3ab6db5d184a7327fa26330e318ac6b5b38b14c0e73ead2f550707b4e24c1f4f1a11c306c97608d98d530978fdeb43b4d58d9
 DIST gentoo-headers-base-4.17.tar.xz 7908432 BLAKE2B b0f39145db10dba1998e3facfb0565dd240ba26ce4b2744cfaaca8cfa2890f70a69cf65464163e053a05b0bf4d464f251d90f1cc266de604da2f8dc0889b34c3 SHA512 4d1f8f7a392a8ffdd1144c1d3126473f91cddfe1f750e9c7916e75aec4c571c1c3d2508c0967db12d8ed3e27623c8b2a5e2a47ff1710d55fbba91a84ec8434d4
+DIST gentoo-headers-base-4.18.tar.xz 7878256 BLAKE2B 9a97fed9ae4d16af57bb4aa069cceeb357ca79314ab57b6fbaec0dde75f9504b166a3b0017582bc00fc10b74298fcd4468332ef210e90e1e3daa4681b88e45f2 SHA512 c623b3962fe06150ecad60fa6c7c89e0ad83fad4c8886513f9948352ce0044420d8eb8ccdaa08f7bc957b892472041dd42709fbf396c93a0d0292ff7edbc713e
 DIST gentoo-headers-base-4.4.tar.xz 3911752 BLAKE2B 5031ecd48b99cb0c9c35ca935fa6a62cc36c076bab193ec397fc0d543170f29c6d5a0827a2ea5517eb68fc838819cbe3e5abd125bb920992492369d5e5c1e7cb SHA512 1cd3de58ff790c3730bea38138c7a45ef95d04288c69ffeabebb884fab3add13bd9c99785ddd87a3ee467a0e1b1cdc457bbd28da349e7c178b4d2374c5fb78a3
 DIST gentoo-headers-base-4.9.tar.xz 4052748 BLAKE2B e279954c56170fbfa4ebae8dade731825b3d5f0cd5d73a5b33cd93a9c8f5fa140e14edf0d5ac26a452fe8a61b16fdcc851f5329f56e4c8dcf4472a995de44c4c SHA512 a03418cfba7fa4531279d9122411af3e285e962506e8df9279fbbb27ae08a4e30725bd1cf03f48ad523f61f2889195e6c844fa4c7b4ef2f828baf47ef402abfa
 EBUILD linux-headers-3.18.ebuild 1433 BLAKE2B e9f705fade3656a6e3662737a30e44dc2c2354184304222fe466471440116762ad1976f6ca56d223bcd51afa82bde434c9d26c43450b274d0842f0ee87afef6d SHA512 8bba162f7ec52127681302a552fdb090a6fbe000e741307663d98003476a056ebc25e2cbd1b98f0e1bff0b8ef274627ff920901d3c79cf6196e16a5da04b8a98
@@ -22,6 +24,7 @@ EBUILD linux-headers-4.15-r1.ebuild 1519 BLAKE2B 6d1b24772c1aea77fc91386872801eb
 EBUILD linux-headers-4.16-r2.ebuild 1698 BLAKE2B 83414bf8ba9db9e6ecb9a42c34db25a6ed9b43111ef86158a3c13b431609bfce5b8a282ef2253bdc3ec65563ff29c01067473a17fa837e705fd5ce1888746a57 SHA512 bb0f928e073ae3f793098c7ce59ea85462405cd52a47cb627d2fb576b060c5eb60464757aa392d2748be6333508b56b6f59a04606bda6f2c6b7641acba263f37
 EBUILD linux-headers-4.16.ebuild 1709 BLAKE2B feb0f31d53c3c095d9db9e09ba24bfbacada0b82f0959ea2a97c26ce7806a3cffbbed01b8d6cb0ac88c8bb8c7361327c3ae37189b82cf29ae03fc4409e63c1cf SHA512 b0e68a128feb68bf21e717ec0224d0a6033249f553cbc161b3d5da5cc8ac94220ec3870c2f5933d1c8bd49b38f5c21886227638cb3fac1f7e49f4950fcb2ddd8
 EBUILD linux-headers-4.17.ebuild 1512 BLAKE2B c8a60ea81bccb9ab9473103c91fa5be6b747aa93b17397185db2e0c2c118398041ede217b88c7986e0e0e524eeb368e24282ad70d35e4b0b680946b30de16430 SHA512 df4ad787de80a15524f835504d1d4fae62daa43ad7d59a956356087b94b3e791110126f4df9d489436cc2c328cc3cbb1d1585ebdc843514bd8e43b4b92a7c4b1
+EBUILD linux-headers-4.18.ebuild 1656 BLAKE2B d3faa18b909ec76946e23a2b5ff08617413adb033483f51e1ceb134406f278ba0d3a51c0c34d14a1b5c612f2a1d2913ca858b703307ba882572929e01a4040ab SHA512 820a5a8c46364eb00d21cd4c7d2326710d6ab7327de90f3dd9023ae72b648be65168c6ba475e6ab73ac726e6a0621afd30f14eeca3ef1b0335aadad6a3021cb3
 EBUILD linux-headers-4.4.ebuild 1507 BLAKE2B f2d0b18c5199f23281c13133126b8c9a44f82c5aefa67e301e07a23a92d47fb994a91c83a8bde12b6c31e1774f429ca1f7d9d82deb7e1675bc1ea1ee32f4b45d SHA512 043a707b24da31410c0c238fe504494dcade9d120508e951086b0176966cf053e63aab7463bdaacb5a7aba851959413bd9c99230c6e54d5bb128346a987dc105
 EBUILD linux-headers-4.9.ebuild 1520 BLAKE2B c14d3e0d385266f5b9ed40f3c76f472fc161803463b37526cd4b6ebd840721888e14556dc42899b22e90c6a380fdfc0ac51a3a01e0e3447c514669493dff1e04 SHA512 55f158fbf4691941f4c0cf3763d17b6ae7d2146a33875956c373aeee94fe9d1260386b21e478edaad8a363e2f02b464698cdd3a7b4c3205236d593c69546cb67
 MISC metadata.xml 344 BLAKE2B 383045f9629523bb66545a2e141c51056a1dffcc7cb084b251efd9da73253dbd4be8beebc659d65dbe2faf7852207db39feadac2ab07dff140db1c7f8dbf992a SHA512 4dfc3a4130e5ae01c17510c693c4f2bd81fb019cf003e866c7f359213b58c6e36ed59699d6a458464e1dabd73c8f4a24eada8ced06d7ac513ec3553c0179f164
diff --git a/sys-kernel/linux-headers/linux-headers-4.18.ebuild b/sys-kernel/linux-headers/linux-headers-4.18.ebuild
new file mode 100644
index 000000000000..1d8f8e6123c1
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-4.18.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_VER="1"
+SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
+	https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}.tar.xz
+	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="app-arch/xz-utils
+	dev-lang/perl"
+RDEPEND=""
+
+S=${WORKDIR}/gentoo-headers-base-${PV}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_prepare() {
+	default
+
+	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PV}/*.patch
+}
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
+	find "${ED}" -depth -type d -delete 2>/dev/null
+}
+
+src_test() {
+	# Make sure no uapi/ include paths are used by accident.
+	egrep -r \
+		-e '# *include.*["<]uapi/' \
+		"${D}" && die "#include uapi/xxx detected"
+
+	einfo "Possible unescaped attribute/type usage"
+	egrep -r \
+		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
+		-e '\<([us](8|16|32|64))\>' \
+		.
+
+	einfo "Missing linux/types.h include"
+	egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
+
+	emake ARCH=$(tc-arch-kernel) headers_check
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 4503dddea859..af6ba6c56ba7 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -17,13 +17,10 @@ DIST linux-4.16.tar.xz 103020152 BLAKE2B c7f7b36280b74b2112a098733680e1e93c4f995
 DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST patch-3.18.117-rt104.patch.xz 174976 BLAKE2B c7a066ebd4b3450d26c1825ae8c2f2afc784c9941838a071387dead23dba12d1e75b879a15967adbfe279b379bc49053c5ccd0a5a14e134103403bf4b551f358 SHA512 a6df3bf5ae5c5471847ec8e88d9040270ce56d1d8050cf9b49e7aa988d219ca9b8fc0c0e5dbd5f02188f9b752338ef17b2f0e58175d269f1e80cd104a592dbad
-DIST patch-3.18.117-rt105.patch.xz 177028 BLAKE2B 04f0f3f1d7c5e91bb6754f6074dece164e3b05df17581435b045271bd09409e48986df6e4239366358d9ec3e351e643c051deed681b4aec6c2f7af8f6057c228 SHA512 c95e900223a473c1d96181df8576f6b3f9b136ce9e493fb24b78837c1d9afcce56e847f6f0f08144390c2f3e35829b12cebf871f8319b82cbdea5bc694193587
-DIST patch-3.18.117.xz 1614868 BLAKE2B ff86219c3547c60d603313fb6628d718dae24e2d114cec6544aed301dabb3c79e2e91dfd25e5e71e9aede7a6c29d3653cb3bdb135dafb1911180dc671d6559c2 SHA512 537efe3d940d65b045cafa95b25dad23849c63cfd751d8f936cf3d6eff4c10667ac236db55df0079ea8e17c6c256ec9fe11f4e8295e088fc4bcacc654f9551cc
 DIST patch-3.18.121-rt106.patch.xz 177004 BLAKE2B 9895f40d07e889bb75f632ee1c470476712247badec2c13725a919dce6875944251f383dd09c619c0ed498ce50a53fb653255525c86e7f4744a7f29f06bd828f SHA512 8723e66be3ec448e059cc03054538ab97d469090e7d21e4d15d25eac22cbec39c7c001519eef439a837b6466fb8e5918299a5f6536ac52958922998955bdd35c
 DIST patch-3.18.121.xz 1649336 BLAKE2B e3091aea9e6ec131dc5a3e374337ed257333946e222e5ba188c980f861b7075cfb3643ba3fe14aefd2c96bca411fb9aa692c50fcadb86b70a9e54aed362aeb18 SHA512 c3b94c32a716b9d9d8fa7ed7057d49fb0402bb9fbde0ac38e247eea128655ffaa390194b89cb2687cbbeacecd38c964350bff7d30866668f81c774174206defa
-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-3.18.123-rt107.patch.xz 177044 BLAKE2B 26ec7f306d1e5dfdf8677c7a20474f769a4974649660a20b562e1361843ecf7ba65b5661d99e195e195d3d6200b9aa5a066962bbfa25f4d3490713a5decf6c91 SHA512 6e54e6667f747b0bee79f65ed0f41d1df599247b40f17b04c9e3b22bd1bede0bc8772d5b4babe64ad1e7fb2efbea1e66946a3fb82dfda9f8d1dae323a1ceda37
+DIST patch-3.18.123.xz 1670860 BLAKE2B 48fd660879ae27e05d30577b6c5dc2c3a8b83a2fb029ecfe4eae6b5dcc2f0b0afad5411cffb1454227c1b19a719feef8b32556c24c5955670fc358c649f248ad SHA512 7bdd4ab38bf7cdb0148dc062010c9c0af6f75eb36ad30b384cc79ae28233cdc6eac897317f8513c7d42e1ba71bd5d4ebe963325fca6e8180438e7973cf1ce4e9
 DIST patch-4.14.63-rt40.patch.xz 229024 BLAKE2B ba69e2388a4e6d585a042771e8f4da153c5c256cf057be98c9a3a062cde3f523d2e49b56bc4df071ee3f4bd75c07659e2fce2072a317643bd6e77d08877cf15d SHA512 667f872df8ee8cb86fb923500115c23efce3329ddba38875c13e4a02e793eae7b73215dfa7c8fb9efdca7e3e2fc1843801ead5f6947cea6234be454e4b7ec856
 DIST patch-4.14.63.xz 1598940 BLAKE2B 532af2963b6be9361b8acda05d59c942e69ee27656c47cec3f078a8932a967c8f1a171c0e6688b6ceba656407f577f2b334533bea348720353de06ed39375e01 SHA512 09871bb57e36b15859cfe67691d9cf60831f73e10a8bc43dfe89d22aebf249a84326293612dd620b6ee118b0e60daead76acd93eb1c2a0eb15613836fed5e7b7
 DIST patch-4.14.69-rt43.patch.xz 231208 BLAKE2B 462434ae3f9a5babb90427a9197303aa1f3fd5eeacb144e567ca575cc83f671917031c24e237e0e0461aa3af4da0118565bd4dc489727203ed87ee9a5da36a9c SHA512 e5b7344f2dc782f9084cde1f0714536e8a4dfa451df31afb16c905be71efaad762924403e8fd555e49d074c3048820d2d52e2dbc47b7da380506e69656db2a11
@@ -32,30 +29,28 @@ DIST patch-4.14.71-rt44.patch.xz 231184 BLAKE2B 4e8a9874a2b731ab0d89d44c0993d855
 DIST patch-4.14.71.xz 1755512 BLAKE2B df4194c2540ebfd7ef39045c7af03e2211e42dd0efcc47cf09b852c1a042960ecf339e17ecf0424dae3be1601a3787b81aded5edad0b4c85077d7468a8ad2788 SHA512 2c3a330a25c6f563a6a5c4462d2c43b3184bd7c1fe619d2166d7cb46157f7e8a17105116449d7a695f63242fa9ce48037681e5980e93dcc7dac2b94e0a42f34d
 DIST patch-4.16.18-rt12.patch.xz 230644 BLAKE2B d3e777b47c6b33ceab5d7829a54ff76c08682958b7e2798b7dae177281514f89e98833883d8757adfc687f88c23ef55ea3c0392da398ac92454bb5e3f870a609 SHA512 d15089470ea9317aac8be600f09bd76566a65a1f48b3efe22a0ad1269444cd9fa15723dd190fe5e2a30c2464a9cc3b53200d7a7d462b3adac00e70ecfae593ba
 DIST patch-4.16.18.xz 506924 BLAKE2B dc41b7247e58808e1827fda7b4236ccac1ef8150f4c200161f4a9cd91912a7cb8b72337dfd403c3b1d7bee3d2626b5d53e3c3d595d80418da57bc3f9b58fdbce SHA512 9e1cf90b874c757393680026cb74500ca9fa22c0047ac820f4e5f43062125f8cf469f1e8e93a084b9ecc28a177e55c8b733c2fe620e46694a338f1b2ff4180f8
+DIST patch-4.18.12-rt7.patch.xz 161484 BLAKE2B 12c9fa67d27d1f933f892ce2782367cfd49b1e2558b76c202549f3cfafca172bb3beb8d831ddc26124eb422512a63e4c14b7452695136dc98a103113db6f7028 SHA512 01e82621a4265d68303b1ba3ebd5cdb59fa6aeeff31008bc553d1a621c20aa72a592c1de8cfebebac3e744c9032402e7195754f4f9751947169107e400803fa9
+DIST patch-4.18.12.xz 360576 BLAKE2B 40737d68a61211898a215883b2292d72104de3d4e67b37823eaec80eb546132bfe41ba29f5269044997146d4a9b2d79e004c7b437a5b4b51c9382f441b4ddcf7 SHA512 26d739fd52d4017666bc4f3203cc71ed48ed92a6b42e683421dfbffd67cddab0ebdeccc3a46d1e8e1e6b7fe22a7881c0c08c87936e2fc19238d25f09f1b494e3
 DIST patch-4.18.5-rt3.patch.xz 159224 BLAKE2B 7b7cd22d0da7a15cd2682f7a24a7bdf5eeea265f7397a5e9524194adc3bd1cf3f75e22699ce024ee7bf425596ba7c4a87547d4a2ccbc5b2a9428aa656395d63a SHA512 78ce98933ea463df3dedfca0dd531a736aa8f77ee39e5946785da55639d87c36c3801b77bf80105554845a9a3734c584d80803357e4f4d7ad91f1be2b02482f0
 DIST patch-4.18.5.xz 58136 BLAKE2B dfcd74b39247ff1983086e93b675ec7d4a5e2914517c4536c47ba04a0f5431374991765e0568c907921bd441ca08e50f341171f6b252b963095f8c165034895e SHA512 b7c1457b92051d79a6dfe1d1acbe3e9cf589ba1aac0db61d76a500f0966854307c35e91016b6175f2a863a4cd63e0c99fa879eea2e5467d38e86afa44bfcfd52
 DIST patch-4.18.7-rt5.patch.xz 159768 BLAKE2B f4acf5678562a29559cbe3f18db9c127183216983a9fcdce4d7145331390eae55f376776c1ffbf1616974c56e2616898801f7134ae6d52057396816329ed5eb1 SHA512 66b20734a5a78db0b5c9a718030b13ec6c619a92546b3ddfce26850f1bf254750cd463925209cfddf9c1fa90e13dad08e5b2d7efe7cb0a1faa637db3336152ac
 DIST patch-4.18.7.xz 140532 BLAKE2B 0e5c586070e67738fba0c9d144ce196dc1bfee2ed12556efdf8104764400aeebe6d018a8d036a51e1cf26c064a17aed7a9f6f01f2125f45022fcc070960641a5 SHA512 483ce39833de636cc8ba52908db14819fcd61bf3a3bfe6409dc858bd5a563de24beade909fb71c3a529a5761f638398bc30fdf2796220ae3da78e3e2a363fdb7
-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.4.148-rt165.patch.xz 196240 BLAKE2B 18bb4cc4b8ed700677173ff7eae90ddf891d1f2f162a93cb83a414e1d34a4c05ee758f081b1300f3355848569bcc6bc381c0775a821729659c9a18e4b0503bde SHA512 133f2ee8135a1c00f8d8342b8d0a3f80dfff3973a1f09688d1a61f4648475ba5a7df7f94506c9b371cacb63afaa8fd7473cfa47cf7c5ab97764de29bf2288da0
 DIST patch-4.4.148.xz 2078624 BLAKE2B bd77d546ed28a2f6f9d79be6487d39ad38a774c81e38b10bf61ae25185a13b076081fc650dc2bceb36b3ff5ba8ecb4ef6f31fdd2850a71a6747798b1e183f625 SHA512 9448779b00090f997a690b142917fb1236a2fc5ee938f6822e6b9713c51415c483f2cfb7f8af42ef0ed2eeb3fd7468d2d38e69efdc2622a9433b888a19ab1677
 DIST patch-4.4.157-rt174.patch.xz 196276 BLAKE2B 92fe9d3558f1d8f9fb584ac2f431055443282a5f792378085bf6830606d651b108c4699abede5cb71441f4fa6972ec62b4684d6f6fb0fea52b6acf12b8f2123c SHA512 d50fe3fbcea1962022744bf9f2c24d0c797a24a5ca37d0983be9dede698774ce94a44bd4494fc9c9a58ad9f68b403b77991ad5aba71818cff3bd4ebe693ff163
 DIST patch-4.4.157.xz 2139452 BLAKE2B 6c923215d17361d20e622450371454321b1c60eb821e2c94887f2431923a3186b789b859c700fe560ae2bc005fda9b3e2838b77a30f161ff06973d9590514979 SHA512 ab96bc8e1807e1bbc3d4c0758fd9bdf2f34730f5744e533eac6fd32a7c50ef22a2695f6748339b078d7991a761daf1132ed5ba5140fddf2ee7d86f25117ded39
 DIST patch-4.9.115-rt93.patch.xz 173136 BLAKE2B 5ed7aec677fdcb97f1d56ea3e6984828bc0581e9f39cc9f231445ff3be0561f9a691e6e3e6f17929d3a4aee031fa64f1cb114d4d3cf54d7294073cd85e94ec58 SHA512 a86dff8c348b3260a75f83c2a287eddb1df36c013b3d3dce91e3fcad624c851003ac4754b177805a99f8237676cf2da3de4a0657777902bdbfc40c5cecf2b18a
 DIST patch-4.9.115.xz 2080804 BLAKE2B 6c2d1b957b55ea6a28b82fa7bafb7bac56b5345297de2e5a53e54ff817b27fb7371a36e5424fd58479359edc3e4a4e8dd41f1dd8b8d612ce10d4bbc615c2c432 SHA512 ad0ed227bf915ab2a7093237c3a482909497b1a00cc5262c79e720a50b008b4942904658fe2e8f764df0ac6e855a632de0bbd4d5788e63c4dbfa3e8f2f8fcf97
-EBUILD rt-sources-3.18.117_p104.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
-EBUILD rt-sources-3.18.117_p105.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
 EBUILD rt-sources-3.18.121_p106.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
-EBUILD rt-sources-4.14.59_p37.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
+EBUILD rt-sources-3.18.123_p107.ebuild 1507 BLAKE2B 3752b55241122af7e910e34ffd4ed681c8fadecf984524be8c24990b334ab3a20372d1817e739336112c002a486bd3ab80d77e01cc719b15a4d5c260005f1402 SHA512 14e5b696c45b7199dee47bec21c68aaed6276ffb9059a100b7e9caedbb24ab68cf1c75a075f13dcd52238a755ef1f211645d5e5c031e42e59288b98f026858bc
 EBUILD rt-sources-4.14.63_p40.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
 EBUILD rt-sources-4.14.69_p43.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
-EBUILD rt-sources-4.14.71_p44.ebuild 1420 BLAKE2B e4e0b8a945e660aef3de9f8dd8a8cf3d99531ce82d28305b2be34c2ce47154f88815652b4bc6e1e03f20b048c9f8721a0dd537a32715f5fb243f6ed38affa475 SHA512 745ec57de0cc0d01bc661f8ad7b3271afad8d53df7da6f3f40601738258935a0994cea69cf2b723cd31f36294e16208af09aab9229270489a2955632609b28fc
-EBUILD rt-sources-4.16.18_p12.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
+EBUILD rt-sources-4.14.71_p44.ebuild 1440 BLAKE2B 9b52e664d8b68979ef02799cd0b79db114e597866f44c5ab3b1dcc5d15fc693ef99217a9456015a4effe37c7477c6d607813e2481a7e5e2df904c7fa1c0c46bd SHA512 50aca0676f77895191163f263a7942639da988f3bc73f1acdf3422f272dbc295f0f2ebfbdf6fb48ce50713a80c4843aabbedbd363c8388040d074d6dd8585f21
+EBUILD rt-sources-4.16.18_p12.ebuild 1440 BLAKE2B 9b52e664d8b68979ef02799cd0b79db114e597866f44c5ab3b1dcc5d15fc693ef99217a9456015a4effe37c7477c6d607813e2481a7e5e2df904c7fa1c0c46bd SHA512 50aca0676f77895191163f263a7942639da988f3bc73f1acdf3422f272dbc295f0f2ebfbdf6fb48ce50713a80c4843aabbedbd363c8388040d074d6dd8585f21
+EBUILD rt-sources-4.18.12_p7.ebuild 1440 BLAKE2B 9b52e664d8b68979ef02799cd0b79db114e597866f44c5ab3b1dcc5d15fc693ef99217a9456015a4effe37c7477c6d607813e2481a7e5e2df904c7fa1c0c46bd SHA512 50aca0676f77895191163f263a7942639da988f3bc73f1acdf3422f272dbc295f0f2ebfbdf6fb48ce50713a80c4843aabbedbd363c8388040d074d6dd8585f21
 EBUILD rt-sources-4.18.5_p3.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
 EBUILD rt-sources-4.18.7_p5.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
-EBUILD rt-sources-4.4.145_p162.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
 EBUILD rt-sources-4.4.148_p165.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
-EBUILD rt-sources-4.4.157_p174.ebuild 1487 BLAKE2B 14b684be8f446a16b9d78b2ea0bc9e34020d0f381b4975f9540d793168fe55326eadacd268792db3d5f48a2a3b4784be84169b961d2298ab151081ab7953a22c SHA512 42364efe528c9dfd5c0e279b960dc762158f638ca8741fd41c6916403d5a59f3cc8abc02ca6e42a7ef05a7900ebd593b2e2e7f4afd24e56e0bfdc941c112b0b7
-EBUILD rt-sources-4.9.115_p93.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
+EBUILD rt-sources-4.4.157_p174.ebuild 1507 BLAKE2B 3752b55241122af7e910e34ffd4ed681c8fadecf984524be8c24990b334ab3a20372d1817e739336112c002a486bd3ab80d77e01cc719b15a4d5c260005f1402 SHA512 14e5b696c45b7199dee47bec21c68aaed6276ffb9059a100b7e9caedbb24ab68cf1c75a075f13dcd52238a755ef1f211645d5e5c031e42e59288b98f026858bc
+EBUILD rt-sources-4.9.115_p93.ebuild 1507 BLAKE2B 3752b55241122af7e910e34ffd4ed681c8fadecf984524be8c24990b334ab3a20372d1817e739336112c002a486bd3ab80d77e01cc719b15a4d5c260005f1402 SHA512 14e5b696c45b7199dee47bec21c68aaed6276ffb9059a100b7e9caedbb24ab68cf1c75a075f13dcd52238a755ef1f211645d5e5c031e42e59288b98f026858bc
 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
deleted file mode 100644
index 6ec80f749bb1..000000000000
--- a/sys-kernel/rt-sources/rt-sources-3.18.117_p104.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"
-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-3.18.117_p105.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.117_p105.ebuild
deleted file mode 100644
index 6ec80f749bb1..000000000000
--- a/sys-kernel/rt-sources/rt-sources-3.18.117_p105.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"
-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-3.18.123_p107.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.123_p107.ebuild
new file mode 100644
index 000000000000..14daca2ddbc5
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-3.18.123_p107.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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" || die "sed failed"
+}
+
+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
deleted file mode 100644
index d65a86c4c306..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.14.59_p37.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 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.14.71_p44.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.71_p44.ebuild
index 489dbd6243b5..18034a53cddd 100644
--- a/sys-kernel/rt-sources/rt-sources-4.14.71_p44.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.14.71_p44.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
 	# 627796
 	sed \
 		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt"
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
 }
 
 pkg_postinst() {
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
index d65a86c4c306..18034a53cddd 100644
--- a/sys-kernel/rt-sources/rt-sources-4.16.18_p12.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.16.18_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -37,7 +37,7 @@ src_prepare() {
 	# 627796
 	sed \
 		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt"
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/rt-sources/rt-sources-4.18.12_p7.ebuild b/sys-kernel/rt-sources/rt-sources-4.18.12_p7.ebuild
new file mode 100644
index 000000000000..18034a53cddd
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.18.12_p7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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" || die "sed failed"
+}
+
+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
deleted file mode 100644
index 6ec80f749bb1..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.4.145_p162.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"
-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.4.157_p174.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.157_p174.ebuild
index a9f986337c30..14daca2ddbc5 100644
--- a/sys-kernel/rt-sources/rt-sources-4.4.157_p174.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.4.157_p174.ebuild
@@ -41,7 +41,7 @@ src_prepare() {
 	# 627796
 	sed \
 		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt"
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
 }
 
 pkg_postinst() {
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
index 6ec80f749bb1..14daca2ddbc5 100644
--- a/sys-kernel/rt-sources/rt-sources-4.9.115_p93.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.9.115_p93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -41,7 +41,7 @@ src_prepare() {
 	# 627796
 	sed \
 		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt"
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 73d956d18bf4..8811d50f598c 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -4,13 +4,13 @@ DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff48
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST patch-3.16.59.xz 2085812 BLAKE2B 4b2985074e7604f7f9fd6478dbfe167fc7cfe472968a9723558db383305e7bb719fdbb58c6adc5cb5a568461c31e540c2ab943a7ad97b933d4a860d7d355d989 SHA512 f02e3924b79a538ebc01fa39c8c7ca0e5ddc294ba3636675147cc9c4d680b22d1cf66dd014c9787ccbf9cee6299d54de148c91ea018c02d72560483cd2c9ebdd
-DIST patch-4.14.74.xz 1818060 BLAKE2B d375c5e0e87fa9a963b3315596227b250500253837eb873162103ba66122eb5244313a69f03b921d08ed87d427a6589b547d021cd7b02021829a703bc8a788e8 SHA512 86b6e8ed2a3493e0d97efba5c7c94a7f1c91735fc0b8479ffeb74b894910b317172ec6af37fe5e83ef6b42130fc83da8a299cabc9f5c8ec7f32a72bde8cf1703
-DIST patch-4.18.12.xz 360576 BLAKE2B 40737d68a61211898a215883b2292d72104de3d4e67b37823eaec80eb546132bfe41ba29f5269044997146d4a9b2d79e004c7b437a5b4b51c9382f441b4ddcf7 SHA512 26d739fd52d4017666bc4f3203cc71ed48ed92a6b42e683421dfbffd67cddab0ebdeccc3a46d1e8e1e6b7fe22a7881c0c08c87936e2fc19238d25f09f1b494e3
-DIST patch-4.4.159.xz 2152392 BLAKE2B f6cc38a499ddcd833d6bb867525ead1125eb6977c60e09ee436c7eaceb896d7b05db0bf6ebbc8ce70ee26c9d8147cd1e0a7c3a0887702ca294d0c3fdc5c75735 SHA512 f812b23a47a3683202d1e6f3a3d884291c7992cd1185c8374840fc38f564990507dfc8f79ff4fb130e510e2e90f1da3fbcb5878c045c09ae4b389a2ee9c85dd5
-DIST patch-4.9.131.xz 2263536 BLAKE2B 3792e6fec407d64c7a478f49352a50c63616ca6c5f66113023711cece268d54a77151ca17415cca806453aa5811027c78500a314556fc7f345d654eb5ee0f8bc SHA512 02228ddfb02b077ab48241b6e2e1fbc4e6994ad4fa37a8d2856d95b8ff6869a0750eb7effcb6ba6f36a8f58a3557d4b6e3c9c1b994b638b77702342df36b5136
+DIST patch-4.14.78.xz 1888728 BLAKE2B 37d2cf9594422748e493b7d7b000917a45fb5d231b088945f8a458d522b7c42754beb2bed138b562c823d5aaa31c2c9dcda276a9460e57fb857899037c4777d8 SHA512 bf0c0cbe9ee7ddfee0d8a70656e6db5979d1928c7aad917039c471ad6e2b049fe9d0f59161dab5ccfb9180263d2630cd6df735524b5886f0d05f709cb30b11bd
+DIST patch-4.18.16.xz 476164 BLAKE2B a9b684c3249cf20cb3672f3b5195b91128918cee459ebb1326f4c0ac6ba45036b14afaa16d3ef900884cba83a901c638bc0c19843c029902b1180c49e577e176 SHA512 f857cfa386fa6837f5c6dd4c1ea32e827abcfd0d2103e547b7c78a87c9f89598e9bce9d5a63c411ee99ef22ef66280ce9b308369722813e2fff5b1fa8284fd64
+DIST patch-4.4.162.xz 2189224 BLAKE2B 90e23534c08fafb27a76a59068a8372d706fc8d8a9bbb1ec4aa43ce92702116c72a5319cc657b5b15b7d139004e596d77a3862bf425cbffc2bd1777f55c4d7ca SHA512 370860bcd43ea6285a61cac6833c0a6f3dd6f1d914f06e567c772c33311d09cbfa092e312439eb4090b35e9144f2e26c88945d4d1b3fd28f071d22aa17e2ea41
+DIST patch-4.9.135.xz 2314976 BLAKE2B c219d932f64666ed2deb805a70548477bac2eb9e43b5dcb42b23405732073e6c1c60a29736b536cb799e4e60a56915dafb1a74edaecd5a1e51efa0f7177014ac SHA512 80d6eaf21fb6f12e487ac53169555af9ce3553ae3ada8b7bd75542da4bd1c359f2e200c53b72233a195f84675f9333ef8f65f93fa81af5e58dbfede8d730bbcb
 EBUILD vanilla-sources-3.16.59.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.14.74.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.18.12.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.4.159.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.9.131.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
+EBUILD vanilla-sources-4.14.78.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
+EBUILD vanilla-sources-4.18.16.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
+EBUILD vanilla-sources-4.4.162.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
+EBUILD vanilla-sources-4.9.135.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.74.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.78.ebuild
index 4d8a2803b8a7..4d8a2803b8a7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.74.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.78.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.18.12.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.18.16.ebuild
index 4d8a2803b8a7..4d8a2803b8a7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.18.12.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.18.16.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.159.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.162.ebuild
index 4d8a2803b8a7..4d8a2803b8a7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.159.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.162.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.131.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.135.ebuild
index 4d8a2803b8a7..4d8a2803b8a7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.131.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.135.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index cc8bf67b112f..e51203703b0b 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 6f0e84d6c24a..dca3288819b5 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -19,7 +19,7 @@ EBUILD binutils-libs-2.28.1.ebuild 2872 BLAKE2B f0ef199dfc0025b06dbdab74f76f0a17
 EBUILD binutils-libs-2.29.1-r1.ebuild 2921 BLAKE2B f38060716462c9c51bc84b98348b82952b6bb47cd33136d7eaaca822ba6e40504fad2b0c778a4a02989ca9e20f812d928d718295376141dd02e519e541a605a3 SHA512 8fc849244e3cdb9b1a35e9bed1f2e57e8bba210e6ab9aa7408904b5a04cc532dfff52a9840e866df5985f6b1d05c96ce7549c7514389a8dae9a4d5d798d48c8e
 EBUILD binutils-libs-2.30-r2.ebuild 3198 BLAKE2B 02001b84f17d61382bfa152c31dc0e54f98b3db753a41efa7a4e658917c17b4927e5f868dd64af356867f0bd0d33f5de7315b1f260d5a6d655b7645ca7bc5c48 SHA512 f028499c94299f331dc597c87f4fd8d2f96393e55af73f85275ae1cdd30a74ba73004b7aef31b5e561ec56d157d1def72425e9de8a3fd70e44df33ad94739e58
 EBUILD binutils-libs-2.30-r3.ebuild 3211 BLAKE2B 7715a2ba111df9c62f3b00998ecb7d2b6d9aa42273195488fd121ea3f0d52554a7dd1a98e138d5b9870becfe9038ba57da8254c84720f5768af60822113386b8 SHA512 f08ecc65cb4ec222ae651ecb9fce48ebe2503ffb18204fb3183f18e802485721937e41f9140b54d56068bfa69468261d32aacaeffe595feb8788bcc837795c39
-EBUILD binutils-libs-2.30-r4.ebuild 3602 BLAKE2B 79fae579b8f61c1ba84ee242491d5cc38401814b9b15b07a8e1c77315790123569302b29999a96de97ea86e4e9ab456ed5a53b6f92ec6ca029725e8a0b811309 SHA512 ffae2a03e5c53c205bd92adf0afc77a4a52306dd52f2d488c1250758eb11ea6b72a38f10cf53ed0edcfb6994b98645ea3268eb88dc249441feca7d5e31b390d1
+EBUILD binutils-libs-2.30-r4.ebuild 3596 BLAKE2B f1a2394d52f8dfa577bf7de32fd8be94c8fab51a26a474cd55e9f196c0f7e45fcb4f82c51025cdc1950c7d2ea93a767df130a0fb3eef3f23cd37d3ed0fddbf2c SHA512 7dc4aa97aecc0bb2a086a533d18ec98265efc95c8a37cc33bba00c05ea01b419d5fcd34f5e2a44b85d6ccf16cb642b54617ef5cca364c4d24194f1b9f2fdfcbd
 EBUILD binutils-libs-2.31.1-r1.ebuild 3495 BLAKE2B e5c9ed2a14efb11e121cf853291f670c782e66584375b854f99e36dd9901b2fce09c6a58b355f517d0f8fe4297dee4b602a3ed4125650a9ed3bf12825bd1c239 SHA512 b4743dfff7d2781b0b6e5a566df944558e55c82287bc146a52551bbf762a1449ef198f04745714c0ca792e5288b07293a02c69b9e20248e6f36b52459539b564
 EBUILD binutils-libs-2.31.1.ebuild 3093 BLAKE2B da00f2d3a3d3d53fffd02f1d0236b6d8f2c5b184001d7ed47e5c91ae06b524e9f9b2cd85a3ce6877de9be609a75b784db0da2413bb4cabec626abe291b072939 SHA512 762534285aa25b69e981fc50a22baeb882ce758f9e62e42eda20612041aaf7fb04b89699979659850224b5d1403523a74c8f14db0360f12b012b596aeb66872e
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild b/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild
index f44a3e1e5349..1f35f4dd31a2 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild
@@ -21,7 +21,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 # -r1 is a one-off subslot bump where SONAME changed for bug #666100
 SLOT="0/${PV}-r1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="64-bit-bfd multitarget nls static-libs"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d28581f29880..57b5e8d77528 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -34,8 +34,9 @@ DIST glibc-2.26.tar.xz 14682748 BLAKE2B c1c9dbec110dd4e25b2f463a96d8afc43b8e3ebf
 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-patches-2.tar.xz 43216 BLAKE2B e33b76d401343239ad32a1f142a214ae81a3ec3fc99ea21200255c0aee40a6b702ce98f0ffdacb2546711820ce1f51cd0782d405388bb815133739ad00c0183a SHA512 90ebfe90b79f869a8604150023aaf2d5b4de1c3d0028ebd48d803dd980efd149ced4276617a944931a2875f70918372f3a061a1f06d96f74cc96d65c117fdfef
 DIST glibc-2.28.tar.xz 16484344 BLAKE2B 9aa8cbd5a145c2a6fde3a60b3d0a14b12b46ed79333ad1ca3e73464adcfe700277a17a9e7fd0ca36e355a0c5b0b27decfa091da320ba802741ad75cc955bbcc8 SHA512 521f820953ff07c69ece4c2186f59fc061a7f9747932cd70ef2995c2b2deee76eeb6de700d85071cdca5949179aa8ccee75eda7feca1394121ec7b821ad0a3f3
-DIST glibc-9999-patches-7.tar.bz2 15065 BLAKE2B 23dbe7b6dac30aedb8f563d492a2d44673c1a8233ac67b05a88fb9658b437eda8dff7ef8199d30ea07a0ef5d95b51a57c7db405ba3fdeab108b797caf6811d22 SHA512 ec2bee03969144e42849cb9923a11ac7dfe7418d8214243469227a97cd440c998d027d4d91b8e5d6c42fe5614f4c2fdfe4bfa06022e1e98efaa4150ca65387e2
+DIST glibc-9999-patches-8.tar.xz 14708 BLAKE2B 6c468f11f5b85460219f56ac694e1d3dc3de9a2a23daf7d4f2c715e1b9189bd7a5383093fd8076c2456f9ac0874cb0e2daad8fb360a62038e763a87234f95d95 SHA512 172ab4bc2e716900224b699c9ef89629ffc12756cb72fb7d9628e0ea8fc840cfb2da20ca69fa6c6e1a709f7e2a990bb0f85c32b6ace6fd2d57e2242471900e30
 EBUILD glibc-2.19-r2.ebuild 40604 BLAKE2B 8fea38d437019ff88a832d725a5fc76f58b382bc297ba13ad3c61a283a5549210307495e34fecbfcda30a5a9925416d963340c25a5e61ade4bd1637141849a53 SHA512 4ce1a7397be122d0fbb7369f8bf62599e5f8ee55a1626ce85f6f6f13a2b932c0574a7534442ed0a62c269dda07d73ba1cedf6c559a59385bc22c0f1fd406c5b9
 EBUILD glibc-2.20-r2.ebuild 4924 BLAKE2B 8f2b71dd56f535915564e2517769844b234b5b02cbd4edaeb9ffd0a323e8cc7be663e6e57bad0c28df453ea332bfbb5891b07a569a0885a76c9427d680959ecd SHA512 00af5f249a1fcb0eb3ecc460ccd288daf752575df6ef3887bbffbaf3999360a24ae4058ad7e770206d8c2a86828238981d1820e28780be38481361f2f55518a8
 EBUILD glibc-2.21-r2.ebuild 4899 BLAKE2B 4097f29160b437edb96e6f731c797cba43bfb65fe164c1ffc3af0025d52c18a286b9a75d56d3e371e33e87f99a71a2115ba2eba7cb174dd2787a9b6a6d84b674 SHA512 68cc49c310ff816b2433b4f9e389e992d64f623809d4a4c3391dcce7ee4c385365ef4278de79bf4b6b9a4ed969e10b94bebabe86e560295bd1c0a9652aec12ec
@@ -44,7 +45,8 @@ EBUILD glibc-2.23-r4.ebuild 4949 BLAKE2B 99db0ec4a452f04a2aef9b347a5ddec03cc88fb
 EBUILD glibc-2.24-r4.ebuild 4988 BLAKE2B 8e08345c96e176984b73a073efca21f771d41af1af75106ec88a22bd55d7f69f28d9c01989026a3e58f3df4fac2a59db68d5ac8a8bbb0f411c75da8792f3402a SHA512 dd1d996eaf35197f7b7b6c111957eb98ef776d0a76a949b95f9bb17075dca43b2a354f8d15be133b9f3ff6c40a5b1f4ec28bd8d41c5cfc51da006eda8b005a05
 EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff8fca6b64c083c3e05d07533e445a6139939710b9284f7587bbf3977ca556caeb964e73ac21a382d942423d886a SHA512 f26645acc02f16209ec068641a800ef0a4ad2a422c9473e14a273fdece9b53074b837907d635a8585cf9dbb1acea14178166a4a3410aa4c70a745b89a764b6f1
 EBUILD glibc-2.26-r7.ebuild 25616 BLAKE2B 924fbcb527d249abe6d5e74211d0339cacdc03db08c9504c6bcdefb4e320d3c3767708707e9dba4becc083b020db480238afa2bdd46d43a9e8cb7e23cc85d6d9 SHA512 f18bd985fef3ae83b4ea88ccc783dc7f5eaa3952218a9cbb7f9817b63d32481b7b4edc0a5c6121e792678107e348a41424f19a066923e76d2cfc43d6848c7723
-EBUILD glibc-2.27-r6.ebuild 41539 BLAKE2B 336165f2198d1572acdddb3c4c855c4e510938289fb62438e312320f4d3e793b9f70583cf3901f0f370f7c38756dddeb6a7349d0def99272b7f3ad2d630c43ac SHA512 38f361e8a17dd72612899dc8e69f2784b760e6a49d0b006343919d62403facb28385e6715003924248fc40f4fb448d7fb36ac14887aa7ff9e9726dec8a423a3b
+EBUILD glibc-2.27-r6.ebuild 41534 BLAKE2B 7c09a90a8e780ff1daf87046bf0c62d74cbd3ef975890d3cf8f843f2664e3c99d2a4afc0cdf2bda147aafb4b8cc772f3badd7b4944a2c9021023b0e36a29d593 SHA512 e1fc683d4bfa5204225e9e70c07d3ee10f0f363019acf5d197a703c442357fac94c900c8a29837794af20dc2a7e485b76100f9d0387885bcf94febae1fa68363
+EBUILD glibc-2.28-r1.ebuild 41856 BLAKE2B 84d4f7c35f44bddd2ad4e63d66385a43e8d39168c2c67b3e17317a55f34b998a9514f6034ad05201f0bf39e48529432e1e4ef049f4a7843dac041bb269eede5e SHA512 1a19a5bbf4f6e2846438a32e4f37f62be24444ab849cf089634b96d5c550afca35f6f3538798f138a2723c76c3efb0acc3ee60fb80160c65bbe282f83b130536
 EBUILD glibc-2.28.ebuild 41861 BLAKE2B f747cf7117f8a629e8353fee9a5ca2ddc8a128e2722381fdbf27849ff6be676b147596d0cbea52c78edc0e4a369d0eb4cda0a4c33d8eb99b4a1ee51aef68bfda SHA512 80015c199dbb2086daf7801184ce3501838fd97265378ed732fce96ff7dda95524ababdc738d392411d35bc174522a25dd62571676cd4c09435769bb855ea990
-EBUILD glibc-9999.ebuild 41861 BLAKE2B fae057c79abc53eb68b73394cb03404a8c6e33d07f3c60df52ee089322503bafa196bea96736966fe5eef8b224ee018ed26ecf0da188371a635bb676da429506 SHA512 7bd763ec64e227da5f6e8960e4d004c894bd744a0136b2f7fd3ce7b0f6cff48a9e8302a98ad5bb6cb7a86db2d2038b9c3c3a5069a11e3f7d09842c1420c53d93
+EBUILD glibc-9999.ebuild 41856 BLAKE2B 06bd334aa7a53f08e52c0d29744eccce8ac150b4dcea62beba6a26b11a81722b8e42a8d52abb846f94adf4b3a76268fe4657d0e530cdd728403133daa84a0ecc SHA512 894a4416f45cbd848749ba4c3ca7c7dbfab87d21942e9e04bddafbb33b19b860a2dc8bda78213054fdd57f71c3ac22d8fdd5d8946975968a970bdd37f752aef2
 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
index 4f328fea7cb0..b176360b42d3 100644
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ 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"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
diff --git a/sys-libs/glibc/glibc-2.28-r1.ebuild b/sys-libs/glibc/glibc-2.28-r1.ebuild
new file mode 100644
index 000000000000..5d2d8b788b90
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.28-r1.ebuild
@@ -0,0 +1,1429 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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"
+	KEYWORDS=""
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20180511
+
+# Gentoo patchset
+PATCH_VER=2
+
+SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps cet compile-locales doc gd hardened headers-only +multiarch multilib nscd profile selinux suid systemtap test 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
+	!<sys-devel/make-4
+	doc? ( sys-apps/texinfo )
+	test? ( >=net-dns/libidn2-2.0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=net-dns/libidn2-2.0.5
+	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
+		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 [[ ${CTARGET} == *-linux* ]] ; 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}
+
+			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
+	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.xz
+}
+
+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
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	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-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 4069c5f71ea1..8da63740e858 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,9 +28,9 @@ RELEASE_VER=${PV}
 GCC_BOOTSTRAP_VER=20180511
 
 # Gentoo patchset
-PATCH_VER=7
+PATCH_VER=8
 
-SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
 
 IUSE="audit caps cet compile-locales doc gd hardened headers-only +multiarch multilib nscd profile selinux suid systemtap test vanilla"
@@ -752,7 +752,7 @@ src_unpack() {
 	touch locale/C-translit.h || die #185476 #218003
 
 	cd "${WORKDIR}" || die
-	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
+	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
 }
 
 src_prepare() {
diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest
index 5446c016a3fe..32ad4f36cb44 100644
--- a/sys-libs/libutempter/Manifest
+++ b/sys-libs/libutempter/Manifest
@@ -1,3 +1,3 @@
 DIST libutempter-1.1.6.tar.bz2 15705 BLAKE2B 147bf96990913019c35565507eb635ba60ff5ed67134805e9f146f8f70882615ff96d7b2e52b40fb73110905afb87893a72bdec4327d879e5bdc2ec1d39ff9f0 SHA512 6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede
-EBUILD libutempter-1.1.6-r2.ebuild 1705 BLAKE2B 9a4119063b004d4efb0780968e24c07d2724ed42ebf022edcd28c688dd2c199236dcaf6614991b9579e621b605195cfd1c0071cefa0c5e13528e3f2b2cd2f243 SHA512 c137947e45a12ba756e68d84d3c713c83b7a06b3887d1598d1463e34189be00a7dbf8112cca55ada8879baf8a65aa8b8766191a4d79ef8d0d3680fa8eef8ef9e
+EBUILD libutempter-1.1.6-r2.ebuild 1701 BLAKE2B 8b4877016d23794374fb96067ae3e1dd32add78f7aaffa7978ec5ff3a32a3a620f9f503142cb8419044179cf30b7dfe9afd4212f789fb1f5cd0e902634afa0c7 SHA512 4831c68a45394cbc38ee84a5b62547eca87f989be444189670cc5493e76aafddf20b17c4e1ff099d8e8160da090a59c340fe73df3908b370badf9ba03eb1dfc2
 MISC metadata.xml 344 BLAKE2B 090f0e14a3a7fec427cbffa3abc85b6caf242a4f471358ba0614a23682a183a2ac93fd4d6695ab0059b0c7e5573d8429ea4600506050753e2ceca3c1217c394a SHA512 77307533cb1ddb71561957493f7062330c1748f62ab1381f369c5fb864f0e2a6608cfa5c86005b816c2a9a2523bb9a2264c807f1d6c31a5e2bb6177876b94ed9
diff --git a/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild b/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
index 0d3be4809b93..5e7ac7cbd6a8 100644
--- a/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
+++ b/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs elibc_FreeBSD"
 
 RDEPEND="!sys-apps/utempter"
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 9dd20048b65a..d0a194aa1733 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -5,6 +5,6 @@ DIST Linux-PAM-1.3.0-docs.tar.bz2 492805 BLAKE2B 1dd48f65ae76e0d4d2c02664f9a2ada
 DIST Linux-PAM-1.3.0.tar.bz2 1302820 BLAKE2B 0ed5553308e8bc4bef91746a1c79db41bf5f0a48a31796d5a13819387c0a04d553efa210435273ad8565d0a53f354817bc3e0f254e35a5e75b7b7b586cad5d16 SHA512 4a89ca4b6f4676107aca4018f7c11addf03495266b209cb11c913f8b5d191d9a1f72197715dcf2a69216b4036de88780bcbbb5a8652e386910d71ba1b6282e42
 DIST pam-1.3.1.tar.gz 749997 BLAKE2B 3b44c41daaa5810c53e3e2baeac1ab58463768fde433f874b9bd09c7c28cfd55e0f227c9a0c318e66444a3adb23c112a2db32d5c7211b07c84c2d4600a47ca5c SHA512 0c5019493b2ac42180ee9c4974a51329a2395a44f5f892c1ca567ec9b43cc3a9bce0212861d4dfb82eb236c5eaa682b27189ce672ed6cafa37d8801d059a944d
 EBUILD pam-1.2.1-r2.ebuild 6111 BLAKE2B fe4c0f339a51a041932d25426845ab48b2d73789a17f950cb9a7bcbb13657677da3ebbf3f9f92a7ff91d1fcf106b54bd3a5403d212f1e3d7474367dbb8eb3045 SHA512 3024bdb42d6dba4831e3b7dc80b017184907422d34750c2895897fe6a066be139fa8b688d0f0874b6d788c54f680d29b532615ed10b3ab8e82984fc5a582d8af
-EBUILD pam-1.3.0-r2.ebuild 5989 BLAKE2B 1f81638ced909b267474c79bcee93a1dd0e417a8d14ea320cc928c6156f998dca1eaf1994042c6a5a3ee43354f21a963b238b21674d1c492ff2992a4829a297d SHA512 405d2f70877fa938e24f121121a653c0a4cef3abce8ee4770f18c2e0727b18588bd19687503460fcd59399a8a8d40527ac849c022adbe9e60c3d9c1b359334c3
+EBUILD pam-1.3.0-r2.ebuild 5987 BLAKE2B 532105561700adc457cf26b95d83fa89a8bc6a2694688335a1c16fc470f2e43460a9e3e490c2724fd4d142376c66a20033f1ebf68055fd769ca1ab0de88124d2 SHA512 a417c8a2710e6ccdfe60ea6a76dc9dc4a9d268afbdaea16f479b5587fcd0c08fa4e4ef147fba935f994d25fcce4df3b3dfb8722094701d6516b035bb834564f5
 EBUILD pam-1.3.1.ebuild 3682 BLAKE2B ff4750e0a084a0ae199ca729eb08f47daef9747746f3889dba38460a4ec4fda67b7897f9e68897a140d1777f7e475d684ea78dabacf378961b2fca02942158ec SHA512 8b830ac4815d499c7773289bc470e95e2cc26717ab2103cf7fee1b7ad53eba905cde75f8bd449005a56f51022b1e02d18808546fb7eb538045ec09b65946ea98
 MISC metadata.xml 1187 BLAKE2B 10a98ba0eb29e16429e80c982bbcfabf5e13d357c79dcd8c9b29edb78c95d640c24a0e6dd765c681c9a3e0d53236d8593fd60a023a15a368268b6cf857c74e0c SHA512 a259f44cac488c66bc07ac28448200251bfa9fa12d696bc6ba4e98456c2d96ae90236017d3c7cd9364c6b9a46e3742bb2c5fa995fe178d38453bcbbb58c527a2
diff --git a/sys-libs/pam/pam-1.3.0-r2.ebuild b/sys-libs/pam/pam-1.3.0-r2.ebuild
index 2c79c948e747..8c4a1274f905 100644
--- a/sys-libs/pam/pam-1.3.0-r2.ebuild
+++ b/sys-libs/pam/pam-1.3.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="audit berkdb +cracklib debug nis nls +pie selinux test vim-syntax"
 
 RDEPEND="
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
deleted file mode 100644
index 8c1290f51547..000000000000
--- a/sys-libs/uclibc/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST uClibc-0.9.33.2-patches-17.tar.bz2 32437 BLAKE2B c051e8acf4f7d8da219918a5cd7b465865da7e64307b2a1c64b6b86f8381340edf03745301f0b3b358403d56712964c3d57f330b88a3e8ff2da22d898a35c909 SHA512 6a6ad8aef862f742e60965c447e5abee2349886f01bf5e44111b2a6c21e59e4644195cf36e85b8ce0dabbf7b92dc2c36ae27f0b7a02b0f9f4278e46ec5fb5a76
-DIST uClibc-0.9.33.2.tar.bz2 2834029 BLAKE2B a23e7b3a1a8142ef08349179e27f2d47765757829c2a88d4937d02314bc7c07bd36a21d815213f1478b24075bb029112738161bb1be383df08cec5e786aae260 SHA512 1cf18fe5418e12ae12ce995d7455d465bc4737f225afc49512ec69858771e099bead7b18408b01c7e6f845dcc80c3b4f875332eeffdcc04ae4b48474fb29a8dd
-EBUILD uclibc-0.9.33.2-r15.ebuild 9386 BLAKE2B ac8aa826c8b51d9bc6d3a54b35105af17fa3d735cbeeca5283ef1a6312aad80e405100af6078658b51037bbeba3a873846d6244753dcd8c08027eab2f56af19a SHA512 7bdf5a54c1fe8a781c655ec44a8b4f50f7f758b4b7547de0d2a44a2c321291282c427e6d140de581ebb471a377009eec77d8c27f432617b91863bb780ad37d1d
-EBUILD uclibc-0.9.33.9999.ebuild 9348 BLAKE2B 0889fa7e2bc7c86f5a461ad43bfde8b7968e3ab7624ee881da04b11000164f6586683095fcd0773eb6e47d195b48b041450999da67f226939c1ecef6a724fbf5 SHA512 f9f97e41563be062974547c6945c45716edf16433c308bee9593ee051e6fb0d5ce786348d76acc8318db7d48ed27e451eba16a121538ed658218503492938e34
-EBUILD uclibc-9999.ebuild 9329 BLAKE2B c833b8f34dd30ef29c0d843731ded7b8778b9a60c675b5e8c009ed82bd827a9ed3355b7fd613e99b7fa2655f49cefe04147b5b3075e4691a2c74231fb75b7ac7 SHA512 ea49b5e167e624328efa4a145183e500ac916a979216d38e7d642ee3aaad704da70cb0b957bb0161242ce3709d123d701664a43717e38cb172c5b09ff5ef41d8
-MISC metadata.xml 1388 BLAKE2B 2c031c5d87aefe90b83a2d0de01ee836b978bf1e89a8b16cbbf71acbc5366a57c3d15423a4beb6a6c51ad6adecc45731b949591fdf6faa5de7a6516ea04d5ce9 SHA512 59111cac2b1c0e2df5ed96d01e6913307915281c8d24019f5a12213dabd0621adfb52e87d344e1de484e1b6dd19014ce695f00b96f27ce26d7632e825863beeb
diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
deleted file mode 100644
index d5ebc1b71d8d..000000000000
--- a/sys-libs/uclibc/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<longdescription>
-		uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux
-		systems. It is much smaller than the GNU C Library, but nearly all applications supported
-		by glibc also work perfectly with uClibc. Porting applications from glibc to uClibc
-		typically involves just recompiling the source code. uClibc even supports shared libraries
-		and threading. It currently runs on standard Linux and MMU-less (also known as uClinux)
-		systems with support for alpha, ARM, cris, i386, i960, h8300, m68k, mips/mipsel, PowerPC,
-		SH, SPARC, and v850 processors.
-	</longdescription>
-	<use>
-		<flag name="rpc">Enable sun nis/rpc support (you should use libtirpc though)</flag>
-		<flag name="ssp">Force the use of ssp to be built into a hardened uclibc setup</flag>
-		<flag name="savedconfig">Adds support for user defined configs</flag>
-		<flag name="uclibc-compat">Build uclibc with backwards compatible options</flag>
-		<flag name="wordexp">Add support for word expansion (wordexp.h)</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
deleted file mode 100644
index 32bb54180854..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="17"
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
-RESTRICT="strip"
-
-# We cannot migrate between uclibc and uclibc-ng because as soon as portage
-# updates the ld.so sym link, the system breaks.  Ideally this should be a
-# hard blocker, but EAPI=0 doesn't allow hard blockers.
-RDEPEND="!sys-libs/uclibc-ng"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-
-	if use nptl ; then
-		case ${CTARGET} in
-		i386*)
-			die "Your target has no support for NPTL"
-			;;
-		esac
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		LDSO_GNU_HASH_SUPPORT
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_SHA256_CRYPT_IMPL
-		UCLIBC_HAS_SHA512_CRYPT_IMPL
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
deleted file mode 100644
index fbc8a60a1fc9..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_BRANCH="0.9.33"
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != *9999 ]] ; then
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
-RESTRICT="strip"
-
-# We cannot migrate between uclibc and uclibc-ng because as soon as portage
-# updates the ld.so sym link, the system breaks.  Ideally this should be a
-# hard blocker, but EAPI=0 doesn't allow hard blockers.
-RDEPEND="!sys-libs/uclibc-ng"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-
-	if use nptl ; then
-		case ${CTARGET} in
-		i386*)
-			die "Your target has no support for NPTL"
-			;;
-		esac
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		LDSO_GNU_HASH_SUPPORT
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
deleted file mode 100644
index f5cec3749e75..000000000000
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
-RESTRICT="strip"
-
-# We cannot migrate between uclibc and uclibc-ng because as soon as portage
-# updates the ld.so sym link, the system breaks.  Ideally this should be a
-# hard blocker, but EAPI=0 doesn't allow hard blockers.
-RDEPEND="!sys-libs/uclibc-ng"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-
-	if use nptl ; then
-		case ${CTARGET} in
-		i386*)
-			die "Your target has no support for NPTL"
-			;;
-		esac
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		LDSO_GNU_HASH_SUPPORT
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 5122b88d5ce3..964ccf3d07ac 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index aa1212fe37b1..57a8df3e0c06 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -11,5 +11,5 @@ DIST acpid-2.0.30.tar.xz 155528 BLAKE2B cbf387dc6342e0f4256360e99c02f8ebf4c322cd
 DIST sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd294248d48c8852f689f0a6082d9b74b33b77918d3ce21d7f1bf8a3aafeaa252e8fe170b3829155344a256f01fe80414369f02d50a17ff55 SHA512 f2c366c50c75790df32a1f6573b7de640fd09a97c4598155ebd0aad2eba118961ddc82fe0fbb4dc935aa5b6d7fcfe3ade73fff555b4588b0e4579a1028bef12f
 EBUILD acpid-2.0.29-r1.ebuild 2104 BLAKE2B f477d8ec3a9f417e2b3b44ef24652c0653ed01ed7b013ef86c9bab17463441da4da3c8939c1b4fdad4cae78f4eca783dca1dc251fa8621d2c92961c7c1eec6a9 SHA512 a88604dc9044e2dc401b3dd5bf469b88fe8526b0250c2c266ba81c260e785e68aa13ce8ddf8c4b37c9c6f069c31b45e22893799648ef10524f3f063f6960d575
 EBUILD acpid-2.0.29.ebuild 1858 BLAKE2B 4bf788cb1010e66eebc1aaa34b4b3851307588bcb1b78f6dfcc0fd236db897f512d4ca3f98d0c0864c6bd10fb1fc27fcbaa94c8439d2d647caf1f684de9f1847 SHA512 a76fbf6aa2260cecf8a08a0fa013dc14a7a4d7fd90ad65f6a8a70c64d1dea445c97cff7413cb08c13e1251e9634ae3f2c33f8866f4e0c561635c79eb4e6e08be
-EBUILD acpid-2.0.30.ebuild 1964 BLAKE2B 9d7d5320ae264613c61d57c32e4d76dcc9b4a4e9b8e1fc21a4cfe08eba4538b79ecbcde5f60aa3971b0a77cd3c229c3b2397796229f5524eb457e0b4423e2c08 SHA512 e69f770e5baf539b219984432d8bc6309051c9787141558ee17412fb0732ced6c1aea7062387c4734523b240921c9ca10b69a9b3a04e477886f3cbb57030fc46
+EBUILD acpid-2.0.30.ebuild 1958 BLAKE2B beeea000807a07fec996e98b99733bf7448095047d323ea4e95a7eb1981c854d529b912c33e60322e07ce40f5b4731c96d8f3ad6e7ec3d7d85e327e5ca226db6 SHA512 2aedfc086f71a4e96ec84a2085c3c83b447bbfec2410e57277647dba14d52db47bc9dadc5a1014161b98d40eac210fb7ec823619439aa47396e5874434d8ddf4
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.30.ebuild b/sys-power/acpid/acpid-2.0.30.ebuild
index 931b65a63269..5a03e4e034bc 100644
--- a/sys-power/acpid/acpid-2.0.30.ebuild
+++ b/sys-power/acpid/acpid-2.0.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+KEYWORDS="amd64 ~arm64 ia64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 741739375036..398b4b5ec4fc 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,4 +1,6 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
 DIST thermald-1.7.1.tar.gz 420725 BLAKE2B 99e176e978e56d453fe5ff409f048122d18b9c554ed3128dac1c704a61ab483ab3ca21c2c360d1dc763de9770f877948d62d8c2216072d23fa1b828913a8e766 SHA512 a78f8aa9ef0f3e3b57fc1ebbd7ad7e67985676ad7adf5b6a6d23e4aed4e2ccb8273fb67ccd9a2133f91f7f6b19f793c9ba68e41208aabde4248ca666061fe5e0
-EBUILD thermald-1.7.1.ebuild 908 BLAKE2B a0782e36588e8e6738763c57f9b66ada8850e54e21e3b5d2639a659e278898c6954f42deb3e4aa27773017fe33791873b5d43631e55940e9602327add7b69c97 SHA512 73710812af363409df87f09b87336d06c9b37666134a8f8329bf7a02ce8371aaa9f2e66573092625445bda9e26a85fa391bedb4dccc446eb1f2e71bf809f62dd
+DIST thermald-1.8.tar.gz 422982 BLAKE2B 6970190182a6ebcd6b39fcd34d75221173e1bbbf32cb7c0009001cd2934cf18bbc524ec43d1e99dbf7a1a0bda53b0b2239c9e25e08c4cb9435bceb0a512c5e3b SHA512 2360cfad311a804d7609b9879c5a0db749e1813085093e535eaa948b6fa289c385b8e6762ab15270e2e19170a4f48e0b0d736ffff029651289ec23c8dfc61743
+EBUILD thermald-1.7.1.ebuild 926 BLAKE2B f762bc030610b646ef784b0f51b5d80648fe1c70e362fffc2fd7254fbecf8fbecb848fd3309cda10d836471fcff4a24d5f907624b5b3a07f9899c565d4095bbb SHA512 37de5bf2a66a67a126a94d566d000854d2ce2977c6cf1a398ef4cd44dce932f0bca682d0424edca16cd1aeff4d8beb91bf5a72ec32311559c6320b646f0891ea
+EBUILD thermald-1.8.ebuild 926 BLAKE2B f762bc030610b646ef784b0f51b5d80648fe1c70e362fffc2fd7254fbecf8fbecb848fd3309cda10d836471fcff4a24d5f907624b5b3a07f9899c565d4095bbb SHA512 37de5bf2a66a67a126a94d566d000854d2ce2977c6cf1a398ef4cd44dce932f0bca682d0424edca16cd1aeff4d8beb91bf5a72ec32311559c6320b646f0891ea
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-1.7.1.ebuild b/sys-power/thermald/thermald-1.7.1.ebuild
index d3ca3808cb98..525bb27d6f06 100644
--- a/sys-power/thermald/thermald-1.7.1.ebuild
+++ b/sys-power/thermald/thermald-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,8 @@ RDEPEND="
 	dev-libs/glib:=
 	dev-libs/libxml2:=
 	sys-apps/dbus:="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils"
 
 S=${WORKDIR}/thermal_daemon-${PV}
 DOCS=( thermal_daemon_usage.txt README.txt )
diff --git a/sys-power/thermald/thermald-1.8.ebuild b/sys-power/thermald/thermald-1.8.ebuild
new file mode 100644
index 000000000000..525bb27d6f06
--- /dev/null
+++ b/sys-power/thermald/thermald-1.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic out-of-source systemd
+
+DESCRIPTION="Thermal daemon for Intel architectures"
+HOMEPAGE="https://01.org/linux-thermal-daemon"
+SRC_URI="https://github.com/01org/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/dbus-glib:=
+	dev-libs/glib:=
+	dev-libs/libxml2:=
+	sys-apps/dbus:="
+DEPEND="${RDEPEND}
+	dev-util/glib-utils"
+
+S=${WORKDIR}/thermal_daemon-${PV}
+DOCS=( thermal_daemon_usage.txt README.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+my_src_configure() {
+	# bug 618948
+	append-cxxflags -std=c++14
+
+	ECONF_SOURCE="${S}" econf \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+my_src_install_all() {
+	einstalldocs
+
+	rm -rf "${ED%/}"/etc/init || die
+	doinitd "${FILESDIR}"/thermald
+}
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 8eb778b66b59..2d69c3357735 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,7 +1,8 @@
+AUX upower-0.99.8-keyboard-backlight.patch 831 BLAKE2B 530ca1f8a4a7d9caf830813c99c9a1619b540a7a1e45384ab01a348e3830e34edd8972d313becc4cc0eb84ec3517a90a0d153ad05cdf80ee867936cc313105ec SHA512 43e33447769696c99a96cd801d4397ab21400814e5df40d1dfb22504b25caa0be2f0a28a54fa27cc579505b184fb29f29e161e54b568a600156b7e1ef2237d33
+AUX upower-0.99.8-udev-events.patch 915 BLAKE2B 8f951b607bbe0237d71bec20d55310c227680f6df4035ac53c335215234c48d40a120bcd1ac2a992a280263525797981c7316bb3e269fcb3507292bf5cb7222d SHA512 9ed2522a45318c8c7b2fd4b9d6c10f029df0909c76625b553ba8f76f4a4af8018bef3f56a30913eb5eed53dc9bdf2d71486ec5930d00375e24597997f26cf2c8
 DIST upower-0.99.5.tar.xz 432344 BLAKE2B 048471cee61e57ee673e2ba2e2f826ef1770291ca5b7a02adcce11acd78f96a3aa443b5f66abc595ce6578ca59a15a940b0c4924b443babc798fa54f4f629564 SHA512 2fb06bea69455f538146576665e36c5b91eb18b119fa77e29d383fcb2a86ea58650b82e258f157d03c40147ecb12ea545997199580f0e24847ac6ea04d46e5ea
-DIST upower-0.99.7.tar.xz 447832 BLAKE2B 3342f38552a5eb6abffc6b15803db0e8a24e6a3345fe1007f3a5fa66dd06ddebacf2352a751f7a3adf7ee0fe28797d7a1c5b3ec27cd190aabed17e2c7070a438 SHA512 a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4
 DIST upower-0.99.8.tar.xz 448664 BLAKE2B e101e7d1b2aede77c1ed2da1fd23b87a95ccac8d901bd8d1f8bebcd5de7052a66f1840cf578a48453538e166aae56ef4bc6d3a2b85f7ba148ecac5cc0a486809 SHA512 dfd2960cae382195dfc7a703a02af298d9de55bc626cde2a1f97e7983842191ba9d99eb2044190214e792539e7d6c9d8e00b5aed17e5e86b04544e9ab90278b1
 EBUILD upower-0.99.5.ebuild 1978 BLAKE2B 9c989aba064d6208a66d283acac361e5d64965b76838f13709e3d4fad815e9d7170393965b0438cd0a8d7da1813da4d3016d0f2544f380cb90a96c375d16fe4c SHA512 e3d30dd8aa51bf408510d2809f984e74940c4ebb1658b66ff75ca5e25cc3459589a64ea7faf263fd39012304f5a0793d6a75df79f75fb013e0fd1610c74dbf7c
-EBUILD upower-0.99.7.ebuild 1986 BLAKE2B e527fbadac423b52703d289dad520cf20f3ee6edec82161195f13c319393de65a6d29879fd1f1cdc2999f7e678676b077979a2db24fae6ac1fc71b03e9a35daf SHA512 515f932021a9b31b6439fb385b08d394915ba1cb4cdf4e83d1c077e62dfb8b84453c3c8e8cf0bc68b78cc5562fdacb01bbea15fdd61a9184d4c84ba1a1a3f83a
-EBUILD upower-0.99.8.ebuild 2173 BLAKE2B e9ed21c7e7a47902768db82aff42c6b79e98845efeb73cf9a868ab4eaec97f2918158ef2537bc67fee4ac30d904331c8a5450218117c527d65d239aae6ae1dd2 SHA512 0c9991706616683feb6f92a3a6410136af797d8e1a571098b2e44840b09fb3b2f7396ed7084ecc8fffcdac4351d9e25ea79743fccd1cbd5412d8781cbee86637
+EBUILD upower-0.99.8-r1.ebuild 2373 BLAKE2B d96df72161a3c2735728aa3d3275d6f8dba95ad4519fea3fcc988fff7fbf402c004b040956b5fdc696c042e9274222bc5da1a9264066981435e9f8375fd88d7c SHA512 63e349f2f93205892b8b5fb6f2003181d00ab01d3801475ac43a6806770d44f0c6eb5286bd842ec4be29b121c2aec2bc05ced85cba42898d1db87b9f83f575f3
+EBUILD upower-0.99.8.ebuild 2170 BLAKE2B d6ef2e7c688f16893ed08a6897ad659d83630e8986731a0265a284acdecb23d9d73b3c83e2c3c41919c395eb9ad55ea3c811ba8cb0d4bdae84fc8e8578caf32b SHA512 aef6c980937ef5ea1ceb872066415529abeed577680faf970f7dd36753185cfe588792751b8b1c198035036393029b7774521bd406dc7c859548b3e27aaba0f9
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch b/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch
new file mode 100644
index 000000000000..07b1731ad2c4
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch
@@ -0,0 +1,30 @@
+From 0a9d9ab4949effb20e77aa52e7b4ee07e776fc0d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 4 Sep 2018 09:58:21 +0200
+Subject: daemon: Fix upower's keyboard backlight support
+
+Disabling kernel tunables blocked us from accessing /sys, meaning we
+couldn't change keyboard backlight levels.
+
+Closes: #73
+---
+ src/upower.service.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/upower.service.in b/src/upower.service.in
+index 8838655..4566ad3 100644
+--- a/src/upower.service.in
++++ b/src/upower.service.in
+@@ -10,7 +10,8 @@ Restart=on-failure
+ 
+ # Filesystem lockdown
+ ProtectSystem=strict
+-ProtectKernelTunables=true
++# Needed by keyboard backlight support
++ProtectKernelTunables=false
+ ProtectControlGroups=true
+ ReadWritePaths=@historydir@
+ ProtectHome=true
+-- 
+cgit v1.1
+
diff --git a/sys-power/upower/files/upower-0.99.8-udev-events.patch b/sys-power/upower/files/upower-0.99.8-udev-events.patch
new file mode 100644
index 000000000000..d164824b735f
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.8-udev-events.patch
@@ -0,0 +1,32 @@
+From fe356951a9d45fee73036aaa72661f0319dffba3 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 21 Aug 2018 13:30:44 +0200
+Subject: daemon: Fix upower not having access to udev events
+
+PrivateNetwork=true will cut off upower from the udev netlink socket, so
+it's not what we want to use, as we want those events.
+
+See https://lists.freedesktop.org/archives/systemd-devel/2018-July/041000.html
+
+Closes: #68
+---
+ src/upower.service.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/upower.service.in b/src/upower.service.in
+index 835529a..8838655 100644
+--- a/src/upower.service.in
++++ b/src/upower.service.in
+@@ -17,7 +17,8 @@ ProtectHome=true
+ PrivateTmp=true
+ 
+ # Network
+-PrivateNetwork=true
++# PrivateNetwork=true would block udev's netlink socket
++RestrictAddressFamilies=AF_UNIX AF_NETLINK
+ 
+ # Execute Mappings
+ MemoryDenyWriteExecute=true
+-- 
+cgit v1.1
+
diff --git a/sys-power/upower/upower-0.99.7.ebuild b/sys-power/upower/upower-0.99.7.ebuild
deleted file mode 100644
index b41d3df9819a..000000000000
--- a/sys-power/upower/upower-0.99.7.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
-inherit ltprune systemd xdg-utils
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# gtk-doc files are not available as prebuilt in the tarball
-IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
-
-COMMON_DEPS="
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.34:2
-	sys-apps/dbus:=
-	introspection? ( dev-libs/gobject-introspection:= )
-	kernel_linux? (
-		virtual/libusb:1
-		virtual/libgudev:=
-		virtual/udev
-		ios? (
-			>=app-pda/libimobiledevice-1:=
-			>=app-pda/libplist-1:=
-			)
-		)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPS}
-	doc? ( dev-util/gtk-doc )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	dev-util/intltool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-src_prepare() {
-	default
-	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-}
-
-src_configure() {
-	local backend
-
-	if use kernel_linux ; then
-		backend=linux
-	elif use kernel_FreeBSD ; then
-		backend=freebsd
-	else
-		backend=dummy
-	fi
-
-	local myeconfargs=(
-		--disable-static
-		--disable-tests
-		--enable-man-pages
-		--libexecdir="${EPREFIX%/}"/usr/lib/${PN}
-		--localstatedir="${EPREFIX%/}"/var
-		--with-backend=${backend}
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdutildir="$(systemd_get_utildir)"
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_with ios idevice)
-	)
-	xdg_environment_reset
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/upower #383091
-	prune_libtool_files
-}
diff --git a/sys-power/upower/upower-0.99.8-r1.ebuild b/sys-power/upower/upower-0.99.8-r1.ebuild
new file mode 100644
index 000000000000..be82b5b6047a
--- /dev/null
+++ b/sys-power/upower/upower-0.99.8-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd xdg-utils
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="https://upower.freedesktop.org/"
+
+# No tarball released, use the same commit as Fedora
+#SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+COMMIT="9125ab7ee96fdc4ecc68cfefb50c1cab"
+SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # based on SONAME of libupower-glib.so
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+
+# gtk-doc files are not available as prebuilt in the tarball
+IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
+
+COMMON_DEPS="
+	>=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.34:2
+	sys-apps/dbus:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	kernel_linux? (
+		virtual/libusb:1
+		virtual/libgudev:=
+		virtual/udev
+		ios? (
+			>=app-pda/libimobiledevice-1:=
+			>=app-pda/libplist-1:=
+			)
+		)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPS}
+	doc? ( dev-util/gtk-doc )
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	dev-util/intltool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+DOCS=( AUTHORS HACKING NEWS README )
+
+PATCHES=(
+	# daemon: Fix upower not having access to udev events
+	"${FILESDIR}"/${P}-udev-events.patch
+
+	# daemon: Fix upower's keyboard backlight support
+	"${FILESDIR}"/${P}-keyboard-backlight.patch
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+}
+
+src_configure() {
+	local backend
+
+	if use kernel_linux ; then
+		backend=linux
+	elif use kernel_FreeBSD ; then
+		backend=freebsd
+	else
+		backend=dummy
+	fi
+
+	local myeconfargs=(
+		--disable-static
+		--disable-tests
+		--enable-man-pages
+		--libexecdir="${EPREFIX%/}"/usr/lib/${PN}
+		--localstatedir="${EPREFIX%/}"/var
+		--with-backend=${backend}
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdutildir="$(systemd_get_utildir)"
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_with ios idevice)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	keepdir /var/lib/upower #383091
+}
diff --git a/sys-power/upower/upower-0.99.8.ebuild b/sys-power/upower/upower-0.99.8.ebuild
index 2885a37afdab..b209ba507eb5 100644
--- a/sys-power/upower/upower-0.99.8.ebuild
+++ b/sys-power/upower/upower-0.99.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index d8cf7b8f9314..115e66654018 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 9ca2675ac8cc..37136e25be6d 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -13,5 +13,5 @@ DIST audit-2.8.3.tar.gz 1107583 BLAKE2B 21c2b8543a31c0ca4319af40b844f4400615108a
 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 6206 BLAKE2B 53f6c31cef0611bce59eb7e133416298059ddad30bd269dd82ce4382ad8ea14848acc18bb0f194ad1f46f047ea0d61ca32ba95e4807948e745d01dafba612089 SHA512 1d6faa1c4d716b5f37b6d265b5d61f18a07f341fcc4197530d4d6437fd76cddead0233e7d46cf00832ceb51c381f5f567bcc13639d5099247697c5eb3c1b9163
+EBUILD audit-2.8.3.ebuild 6203 BLAKE2B 428c823da15178e0d3569495d392da41dd93dfcf1c9fa65cc8fcc7f1704894d13d6718cdf8548c855444d439a4f7934cf01ffd6deb2d9eab5b23aef11675d74d SHA512 51665b60a864d92bdf0239cc54099db0c5a8248a5ef6c85ff62a97eef738caf9ff85f35e8cdbf07b6a562a3e6ad31b5834994f13c599b04dcfe5619261c07454
 MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-2.8.3.ebuild b/sys-process/audit/audit-2.8.3.ebuild
index 4e8dbdc441a3..1533da37d5c2 100644
--- a/sys-process/audit/audit-2.8.3.ebuild
+++ b/sys-process/audit/audit-2.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="gssapi ldap python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Testcases are pretty useless as they are built for RedHat users/groups and kernels.
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index e3f9a4a9f266..389d44291b2b 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,18 +1,9 @@
 AUX htop-2.0.2-tinfo.patch 3655 BLAKE2B 505aacb774b54e4c7d9238942ff74cc96d0f5c93c7b74e9531e41e2ffa994b4d475b16620b65b824c28da2856294ef7fcd3562d9c318d4adbcc30bb512431b0f SHA512 33273ddcb89e955ef499854fb9361b65bafa83cce8e91f4ef62dd70fc29e58e169148c957d9cd0c5a123b9e5fe66f838212c8066bff12ada38c430087d02b210
-AUX htop-2.1.0-MakeHeader-python3.patch 710 BLAKE2B 26da173c3582436157175c46efd3f8c3571b9d02a96d8fa66e410dfc0db75cb9811f9171ff26cab503360f6252077e77bbd81ad180fc7521a413e4b71e866233 SHA512 caf2e9fe36b0d0f1f76d0d352c7cd11aab4c6b4196f2281f026257a695350541b62e23ae1db5906fb21f9360042c2d4b7ebf5b8a9ebcfb1c276dc44f690d0479
-AUX htop-2.1.0-bashisms.patch 1697 BLAKE2B 56af3d8931780a6e0e7a6f530267d295f7a94ec3f60847d1bef2897bc6f06a2aceb4290c2a1efc4747794887a9ab218f06dcf3c0176fc3e26c417315c33f6599 SHA512 92bbda50297971704f81d47284b6775bcd24a9f7a1698d66c029efdf74b9487ef92cec526829ba2f6e866f630817839776b7bd51bb588dd5c4a2340773801b80
-AUX htop-2.1.0-clear_on_sigwinch.patch 621 BLAKE2B a17551f19f48f57924e440e605dd893822b43068d12bb9d32eb11357d0431a785016d74b0c33234a68da265a530f8488c63510d4f69f205ff4c6fbfa35aa864e SHA512 b3fc6775549bb0e3c4a6f0d90a658e1b129bbc70d10d042dddc1bff9d8a35764ae6dbee69e83f61cc0d3d8a54d3ef78fb55312f4a3bb7750e4e2be1f421257fd
-AUX htop-2.1.0-color_issues.patch 2923 BLAKE2B ca204caed20c5ade062e78b8b3950424d771a9674b17f14cb892edf6c690af15d4d49776ddfe92b4bbf967281bd92e5033180fe372292480a4097ccec705366c SHA512 40c3bf80d051408fda9df4a98b9c8f3f909521549cdfca96e0468feadf53ffdf5ce62a61d6a55a91708c8db33c34a2389ecbcd6b7a8a34a1e9c0e69ce1bfb733
 AUX htop-2.1.0-header_updates.patch 1213 BLAKE2B 4bf06329ee553b29c40c46b8dd0a267d19d17c0b19e8f7938b9276cfced5ba734924c2228408e7e2bee8088250c85d9cfa1cee508c1f3b4f8554d4be8e47cd2b SHA512 63644982da6a92a5477286df4c2cc16097aee8b6f8fcee6c37448d36074770b2f5f8f5a1dbac32728db79dbfb4a094fdd31128cec1ba322ada0b6a0968e53f98
-AUX htop-2.1.0-ldflags.patch 635 BLAKE2B 7f35a75f9e35007029c05dacc8f5198b924b19e3ef28235bd0feae4d87f4d8016803f094f485030831725df6b2b7140e7c755b70e4118eee98d1acdaf16368ed SHA512 3500ba9182f2739327d0b6db1e273ab7d4d09f5c902ec78d852dba0168f30ad138aaf81fbe11b8a21848eedba394b32b0f3f2a78747c61f1fab4464f7fb44fdd
-AUX htop-2.1.0-ncurses_cflags.patch 1827 BLAKE2B 1881d0de7a8e1e16eb55280fc25d66bf00aabd3ee3ba06f74bc1f56222e324cd54c6e0458951507d296ba7573e7417b4c57c2d14f31b36487bfffbbd4cce8633 SHA512 cd3bcfd59f84828ce7842ef58ed37ed7fd376c841d7d54c634eb46bad7a5b86f02355a17a85e93c67d63382cefc51adce41ed9dbf355bd3083013c3cde38630f
-AUX htop-2.1.0-sysmacros.patch 2913 BLAKE2B 85ab3ffb0892c676a2c00519872faa898a2baad45948ac3d794eacc5bd045f592e0b46be7477c4ba27f1019f54911c11ee18cd90de433e11820cfd018c5aa7bc SHA512 ed4b05923ab4597afe6abd0c39107c858b2e9af7938625aefa23a300cfb12cf11f7f13704133d085c5bd8c64c70cc28d2db2f80a68e7a76ad4af3a9cc8c3bffa
 DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
-DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb
 DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
-DIST htop-3.0.0_beta4.tar.gz 179849 BLAKE2B 2990090a3b898673fd3bf985077721aed79d00ee07c8a6808b25eb84e320a9c494bd8ad7440ea142ae01bd634ab8863e2cca01c5a52bd19a7e2f4746334acce8 SHA512 4a9c8765ddbd366b06f23e14dc2176cd2da5346e32867c6fa9f11e57018acb6cc37f9ada044febb1b9d414e4dc5958c3c84455649e9c05f64ddf1b37c59fc05e
+DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344
 EBUILD htop-2.0.2.ebuild 1392 BLAKE2B 951213ba4c64dd0aafed491cfc608075015b22c8bfc5cb7af0436b46bb5a624d5584fe07a6e10b68d336a9a9c1aebf6a361feb0eaa18818082d404b4c14e455d SHA512 034da8860aae7b9f4587acb420cd51367eec49a062488f4ac97d0caa4093209448efc7357dbd8ff1376673259211f31a09f82172442d09578bcf40c1e8e4caf0
-EBUILD htop-2.1.0-r1.ebuild 1992 BLAKE2B 1eb22bcc2d7d5a78ab7f5db4aff0c5e2908f58b42dffeaa10ef7730b7a5dd2c5dc403c048c09ca959cea68edd3ddd6c2ad8da5e7860a6ae0e663e5a631e6ca85 SHA512 96f1d32dc7f3f5decf550af430d81e16f0368deb0ab4142e2960d79e753cb486238f746d8eb6e6790fd5f874acde158ddf5e6638aa8bffd80edc89dbea1734e3
-EBUILD htop-2.2.0.ebuild 1508 BLAKE2B 9be84608f2bfb6dfdd02e114b1e66542a614607ac076514976078e64da67c0ce173cf8b87e6dfe3d44333b7487cc08e1aadd3b9d32358ddd1b91e1c150faff8a SHA512 726d006e4e3a8e537039a8021b14c5d6a82c273f29175994a5dc020e1612294d60c3146e4572ef5509d766df8196336f649844b0123c96cf657baa9289e1be8b
-EBUILD htop-3.0.0_beta4.ebuild 1811 BLAKE2B e32ebe3f3a2e6c703b7599f0c43f7cb891368d342a4ddd42198cec5cea470bcf52bfb8f931f4edf5b5298fd167197f8d41e15f426617c40adec1b32044370769 SHA512 6375ffac952ed8126c23a617660f76f4fd2e181790d387baa221cbe40a836cfbe5f2154718247d883abec5e76c8f6c817279d90b19fa61a12d549bac3ca19d65
+EBUILD htop-2.2.0.ebuild 1496 BLAKE2B 6b43d2f0d200480be4214631e3afd49e1d73ad802eeacbedadd9fe019cbf54cba2fb7300aac7285ecd936d7b19d41d45c744551e2788f2156b251a28d6f69bc3 SHA512 86cc7d5d2b766acbad6ec771b8646dd8f050eb25a86ad6a8cfbd8f2791777619a3e3eeee8646cdfae860b0d97c76384234bad29f3c93657c395ccec09437ee71
+EBUILD htop-3.0.0_beta5.ebuild 1817 BLAKE2B db602dec500e6d0643d60b8c727b33e8696b12217019c6e5963df78abd98cae22e772ae09b59109fb6b593ebda918e96937493753afcedd3756cae30506710f7 SHA512 ac9885ac84d472d4a7d7173fa27c897bf657fffb29457bb4d10a579afe61846a2c5e5d7780ca6fef9a7760e5c755cad1180b44977f5932d88d93f2c118b67fe9
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch b/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch
deleted file mode 100644
index 7c8590a29919..000000000000
--- a/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/646880
-
---- a/scripts/MakeHeader.py
-+++ b/scripts/MakeHeader.py
-@@ -1,5 +1,5 @@
- #!/usr/bin/env python
--import os, sys, string
-+import os, sys, string, io
- try:
-    from cStringIO import StringIO
- except ImportError:
-@@ -16,7 +16,7 @@ SKIPONE=4
- state = ANY
- static = 0
- 
--file = open(sys.argv[1])
-+file = io.open(sys.argv[1], "r", errors="ignore")
- name = sys.argv[1][:-2]
- 
- out = StringIO()
-@@ -94,7 +94,7 @@ out.write( "#endif\n" )
- # This prevents a lot of recompilation during development
- out.seek(0)
- try:
--   with open(name + ".h", "r") as orig:
-+   with io.open(name + ".h", "r", errors="ignore") as orig:
-       origcontents = orig.readlines()
- except:
-    origcontents = ""
diff --git a/sys-process/htop/files/htop-2.1.0-bashisms.patch b/sys-process/htop/files/htop-2.1.0-bashisms.patch
deleted file mode 100644
index 3b5bdabe82fd..000000000000
--- a/sys-process/htop/files/htop-2.1.0-bashisms.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d4ea7cd65ccf8551cabb0706167b2c15aad7866d Mon Sep 17 00:00:00 2001
-From: Jesin <jesin00@gmail.com>
-Date: Mon, 26 Feb 2018 18:07:52 -0500
-Subject: [PATCH] Fix bashisms (#749)
-
-The configure script relied on bash-specific extensions to shell syntax
-and behavior, causing build failures on systems with other /bin/sh
-implementations. This commit replaces those with equivalent constructs
-that should work in all POSIX shells.
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d4bb36b0..3d69756d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -66,7 +66,7 @@ dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to
- dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet
- dnl been updated in Autoconf 2.69, so use a workaround:
- m4_version_prereq([2.70], [],
--[if test $ac_cv_header_sys_mkdev_h = no; then
-+[if test "x$ac_cv_header_sys_mkdev_h" = xno; then
-    AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1,
-       [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])])
- fi])
-@@ -278,8 +278,8 @@ then
-    PKG_PROG_PKG_CONFIG()
-    PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [missing_libraries="$missing_libraries libnl-3"])
-    PKG_CHECK_MODULES(LIBNL3GENL, libnl-genl-3.0, [], [missing_libraries="$missing_libraries libnl-genl-3"])
--   CFLAGS+=" $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS"
--   LIBS+=" $LIBNL3_LIBS $LIBNL3GENL_LIBS"
-+   CFLAGS="$CFLAGS $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS"
-+   LIBS="$LIBS $LIBNL3_LIBS $LIBNL3GENL_LIBS"
-    AC_DEFINE(HAVE_DELAYACCT, 1, [Define if delay accounting support should be enabled.])
- fi
- 
diff --git a/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch b/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch
deleted file mode 100644
index 3ba7147e3b4f..000000000000
--- a/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5fca258f33e08cd7733940391edbf9e22208de83 Mon Sep 17 00:00:00 2001
-From: guoci <zguoci@gmail.com>
-Date: Sat, 17 Feb 2018 13:25:57 -0500
-Subject: [PATCH] call clear() function when SIGWINCH is received. (#660)
-
----
- Action.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Action.c b/Action.c
-index a6394ac3..50ab0bb9 100644
---- a/Action.c
-+++ b/Action.c
-@@ -185,6 +185,7 @@ static Htop_Reaction sortBy(State* st) {
- // ----------------------------------------
- 
- static Htop_Reaction actionResize(State* st) {
-+   clear();
-    Panel_resize(st->panel, COLS, LINES-(st->panel->y)-1);
-    return HTOP_REDRAW_BAR;
- }
diff --git a/sys-process/htop/files/htop-2.1.0-color_issues.patch b/sys-process/htop/files/htop-2.1.0-color_issues.patch
deleted file mode 100644
index 0b4bea8bb956..000000000000
--- a/sys-process/htop/files/htop-2.1.0-color_issues.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From ac2dff2881a7ab203750e8edf7a46b69ae492ed0 Mon Sep 17 00:00:00 2001
-From: Hisham Muhammad <hisham@gobolinux.org>
-Date: Mon, 5 Feb 2018 07:01:12 +0100
-Subject: [PATCH] Fix color behavior on some terminals.
-
-Fixes #635.
----
- CRT.c         | 32 +++++++++++++++++---------------
- CRT.h         |  1 +
- ColorsPanel.c |  1 +
- 3 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git a/CRT.c b/CRT.c
-index 237e30ef..ca9a10dd 100644
---- a/CRT.c
-+++ b/CRT.c
-@@ -37,6 +37,7 @@ in the source distribution for its full text.
- #define White COLOR_WHITE
- 
- #define ColorPairGrayBlack ColorPair(Magenta,Magenta)
-+#define ColorIndexGrayBlack ColorIndex(Magenta,Magenta)
- 
- #define KEY_WHEELUP KEY_F(20)
- #define KEY_WHEELDOWN KEY_F(21)
-@@ -713,22 +714,23 @@ void CRT_enableDelay() {
- 
- void CRT_setColors(int colorScheme) {
-    CRT_colorScheme = colorScheme;
--   if (colorScheme == COLORSCHEME_BLACKNIGHT) {
--      for (int i = 0; i < 8; i++)
--         for (int j = 0; j < 8; j++) {
--            if (ColorIndex(i,j) != ColorIndex(Magenta,Magenta)) {
--               init_pair(ColorIndex(i,j), i, j);
--            }
--         }
--      init_pair(ColorIndex(Magenta,Magenta), 8, 0);
--   } else {
--      for (int i = 0; i < 8; i++) 
--         for (int j = 0; j < 8; j++) {
--            if (ColorIndex(i,j) != ColorIndex(Magenta,Magenta)) {
--               init_pair(ColorIndex(i,j), i, (j==0?-1:j));
--            }
-+
-+   for (int i = 0; i < 8; i++) {
-+      for (int j = 0; j < 8; j++) {
-+         if (ColorIndex(i,j) != ColorPairGrayBlack) {
-+            int bg = (colorScheme != COLORSCHEME_BLACKNIGHT)
-+                     ? (j==0 ? -1 : j)
-+                     : j;
-+            init_pair(ColorIndex(i,j), i, bg);
-          }
--      init_pair(ColorIndex(Magenta,Magenta), 8, -1);
-+      }
-    }
-+
-+   int grayBlackFg = COLORS > 8 ? 8 : 0;
-+   int grayBlackBg = (colorScheme != COLORSCHEME_BLACKNIGHT)
-+                     ? -1
-+                     : 0;
-+   init_pair(ColorIndexGrayBlack, grayBlackFg, grayBlackBg);
-+
-    CRT_colors = CRT_colorSchemes[colorScheme];
- }
-diff --git a/CRT.h b/CRT.h
-index 590fff6e..933fe068 100644
---- a/CRT.h
-+++ b/CRT.h
-@@ -26,6 +26,7 @@ in the source distribution for its full text.
- #define White COLOR_WHITE
- 
- #define ColorPairGrayBlack ColorPair(Magenta,Magenta)
-+#define ColorIndexGrayBlack ColorIndex(Magenta,Magenta)
- 
- #define KEY_WHEELUP KEY_F(20)
- #define KEY_WHEELDOWN KEY_F(21)
-diff --git a/ColorsPanel.c b/ColorsPanel.c
-index 627a516a..2028335f 100644
---- a/ColorsPanel.c
-+++ b/ColorsPanel.c
-@@ -78,6 +78,7 @@ static HandlerResult ColorsPanel_eventHandler(Panel* super, int ch) {
-       this->settings->changed = true;
-       const Header* header = this->scr->header;
-       CRT_setColors(mark);
-+      clear();
-       Panel* menu = (Panel*) Vector_get(this->scr->panels, 0);
-       Header_draw(header);
-       RichString_setAttr(&(super->header), CRT_colors[PANEL_HEADER_FOCUS]);
diff --git a/sys-process/htop/files/htop-2.1.0-ldflags.patch b/sys-process/htop/files/htop-2.1.0-ldflags.patch
deleted file mode 100644
index 386542f35479..000000000000
--- a/sys-process/htop/files/htop-2.1.0-ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From df9922a67eb8e02ab4cf1ff8f24b40f14094e699 Mon Sep 17 00:00:00 2001
-From: Hisham Muhammad <hisham@gobolinux.org>
-Date: Sat, 17 Feb 2018 14:50:55 -0200
-Subject: [PATCH] Fix preservation of LDFLAGS value during configure script
-
-Fixes #738.
----
-
-diff --git a/configure.ac b/configure.ac
-index df922e07..44595050 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -167,7 +167,7 @@ m4_define([HTOP_CHECK_SCRIPT],
-          LIBS="$htop_config_script $LIBS "
-          htop_script_success=yes
-       ], [])
--      LDFLAGS="$save_LDFLAGS"
-+      LDFLAGS="$htop_save_LDFLAGS"
-    fi
-    if test "x$htop_script_success" = xno; then
-       [$5]
diff --git a/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch b/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch
deleted file mode 100644
index 0a25aeb7fa23..000000000000
--- a/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc5d46982f3504000567e00f59e4f7a5905597a9 Mon Sep 17 00:00:00 2001
-From: Michael Klein <michael.klein@puffin.lb.shuttle.de>
-Date: Mon, 26 Feb 2018 14:19:01 +0100
-Subject: [PATCH] use CFLAGS from ncurses*-config, if present (#745)
-
-Fixes #695.
----
- configure.ac | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 36aebc5e..d4bb36b0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -164,19 +164,25 @@ m4_define([HTOP_CHECK_SCRIPT],
- [
-    if test ! -z "m4_toupper($HTOP_[$1]_CONFIG_SCRIPT)"; then
-       # to be used to set the path to ncurses*-config when cross-compiling
--      htop_config_script=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null)
-+      htop_config_script_libs=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null)
-+      htop_config_script_cflags=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --cflags 2> /dev/null)
-    else
--      htop_config_script=$([$4] --libs 2> /dev/null)
-+      htop_config_script_libs=$([$4] --libs 2> /dev/null)
-+      htop_config_script_cflags=$([$4] --cflags 2> /dev/null)
-    fi
-    htop_script_success=no
-    htop_save_LDFLAGS="$LDFLAGS"
--   if test ! "x$htop_config_script" = x; then
--      LDFLAGS="$htop_config_script $LDFLAGS"
-+   htop_save_CFLAGS="$CFLAGS"
-+   if test ! "x$htop_config_script_libs" = x; then
-+      LDFLAGS="$htop_config_script_libs $LDFLAGS"
-+      CFLAGS="$htop_config_script_cflags $CFLAGS"
-       AC_CHECK_LIB([$1], [$2], [
-          AC_DEFINE([$3], 1, [The library is present.])
--         LIBS="$htop_config_script $LIBS "
-+         LIBS="$htop_config_script_libs $LIBS "
-          htop_script_success=yes
--      ], [])
-+      ], [
-+        CFLAGS="$htop_save_CFLAGS"
-+      ])
-       LDFLAGS="$htop_save_LDFLAGS"
-    fi
-    if test "x$htop_script_success" = xno; then
diff --git a/sys-process/htop/files/htop-2.1.0-sysmacros.patch b/sys-process/htop/files/htop-2.1.0-sysmacros.patch
deleted file mode 100644
index 0ab1bb0c02a0..000000000000
--- a/sys-process/htop/files/htop-2.1.0-sysmacros.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From d2d413161bbdf009f232faa5789131326225f838 Mon Sep 17 00:00:00 2001
-From: Explorer09 <explorer09@gmail.com>
-Date: Sat, 24 Feb 2018 11:57:18 +0800
-Subject: [PATCH] Fix build failure ('major' undefined) in glibc 2.28.
-
-glibc 2.28 no longer defines 'major' and 'minor' in <sys/types.h> and
-requires us to include <sys/sysmacros.h>. (glibc 2.25 starts
-deprecating the macros in <sys/types.h>.) Now do include the latter if
-found on the system.
-
-At the moment, let's also utilize AC_HEADER_MAJOR in configure script.
-However as Autoconf 2.69 has not yet updated the AC_HEADER_MAJOR macro
-to reflect the glibc change [1], so add a workaround code.
-
-Fixes #663. Supersedes pull request #729.
-
-Reference:
-[1] https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=e17a30e987d7ee695fb4294a82d987ec3dc9b974
-
-Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
----
- Process.c                |  6 ++++++
- configure.ac             | 10 ++++++++++
- linux/LinuxProcessList.c |  6 ++++++
- 3 files changed, 22 insertions(+)
-
-diff --git a/Process.c b/Process.c
-index 2ff778df..845ca54b 100644
---- a/Process.c
-+++ b/Process.c
-@@ -28,6 +28,12 @@ in the source distribution for its full text.
- #include <time.h>
- #include <assert.h>
- #include <math.h>
-+#ifdef MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif defined(MAJOR_IN_SYSMACROS) || \
-+   (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
-+#include <sys/sysmacros.h>
-+#endif
- 
- #ifdef __ANDROID__
- #define SYS_ioprio_get __NR_ioprio_get
-diff --git a/configure.ac b/configure.ac
-index 44595050..36aebc5e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,6 +61,16 @@ AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[
- ])
- AC_CHECK_HEADERS([execinfo.h],[:],[:])
- 
-+AC_HEADER_MAJOR
-+dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to
-+dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet
-+dnl been updated in Autoconf 2.69, so use a workaround:
-+m4_version_prereq([2.70], [],
-+[if test $ac_cv_header_sys_mkdev_h = no; then
-+   AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1,
-+      [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])])
-+fi])
-+
- # Checks for typedefs, structures, and compiler characteristics.
- # ----------------------------------------------------------------------
- AC_HEADER_STDBOOL
-diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
-index c8ba89d2..158a7ea2 100644
---- a/linux/LinuxProcessList.c
-+++ b/linux/LinuxProcessList.c
-@@ -26,6 +26,12 @@ in the source distribution for its full text.
- #include <assert.h>
- #include <sys/types.h>
- #include <fcntl.h>
-+#ifdef MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif defined(MAJOR_IN_SYSMACROS) || \
-+   (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
-+#include <sys/sysmacros.h>
-+#endif
- 
- #ifdef HAVE_DELAYACCT
- #include <netlink/attr.h>
diff --git a/sys-process/htop/htop-2.1.0-r1.ebuild b/sys-process/htop/htop-2.1.0-r1.ebuild
deleted file mode 100644
index c0f863a1c769..000000000000
--- a/sys-process/htop/htop-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,76 +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 autotools linux-info python-single-r1
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://hisham.hm/htop/"
-SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-PATCHES=(
-
-	# Fixes from upstream (can usually be removed with next version bump)
-	"${FILESDIR}/${P}-sysmacros.patch"
-	"${FILESDIR}/${P}-ldflags.patch"
-	"${FILESDIR}/${P}-bashisms.patch"
-	"${FILESDIR}/${P}-ncurses_cflags.patch"
-	"${FILESDIR}/${P}-clear_on_sigwinch.patch"
-	"${FILESDIR}/${P}-header_updates.patch"
-	"${FILESDIR}/${P}-color_issues.patch"
-)
-
-pkg_setup() {
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop(what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	rm missing || die
-
-	default
-	use python_single_target_python2_7 || \
-		eapply "${FILESDIR}/${PN}-2.1.0-MakeHeader-python3.patch" #646880
-	eautoreconf
-	python_fix_shebang scripts/MakeHeader.py
-}
-
-src_configure() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	local myeconfargs=(
-		# fails to build against recent hwloc versions
-		--disable-hwloc
-		--enable-taskstats
-		$(use_enable kernel_linux cgroup)
-		$(use_enable kernel_linux linux-affinity)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable vserver)
-	)
-	econf ${myeconfargs[@]}
-}
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index bd549ea95a59..b2c5951cf851 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
 
 RDEPEND="sys-libs/ncurses:0=[unicode?]"
diff --git a/sys-process/htop/htop-3.0.0_beta4.ebuild b/sys-process/htop/htop-3.0.0_beta4.ebuild
deleted file mode 100644
index 0b5a668213d3..000000000000
--- a/sys-process/htop/htop-3.0.0_beta4.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-
-inherit autotools linux-info python-any-r1
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://hisham.hm/htop/"
-if [[ "${PV}" = *_beta* ]] ; then
-	SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P/_}"
-else
-	SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-fi
-LICENSE="BSD GPL-2"
-SLOT="0"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-PATCHES=(
-
-	# Fixes from upstream (can usually be removed with next version bump)
-	"${FILESDIR}/${PN}-2.1.0-header_updates.patch"
-)
-
-pkg_setup() {
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop (what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	if [[ "${PV}" != *_beta* ]] ; then
-		rm missing || die
-	fi
-
-	default
-	eautoreconf
-	python_fix_shebang scripts/MakeHeader.py
-}
-
-src_configure() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	local myeconfargs=(
-		# fails to build against recent hwloc versions
-		--disable-hwloc
-		--enable-taskstats
-		$(use_enable kernel_linux cgroup)
-		$(use_enable kernel_linux linux-affinity)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable vserver)
-	)
-	econf ${myeconfargs[@]}
-}
diff --git a/sys-process/htop/htop-3.0.0_beta5.ebuild b/sys-process/htop/htop-3.0.0_beta5.ebuild
new file mode 100644
index 000000000000..1265e744290b
--- /dev/null
+++ b/sys-process/htop/htop-3.0.0_beta5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit autotools linux-info python-any-r1
+
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="https://hisham.hm/htop/"
+if [[ "${PV}" = *_beta* ]] ; then
+	SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P/_}"
+else
+	SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+fi
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
+
+RDEPEND="sys-libs/ncurses:0=[unicode?]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog README )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+PATCHES=(
+
+	# Fixes from upstream (can usually be removed with next version bump)
+	"${FILESDIR}/${PN}-2.1.0-header_updates.patch"
+)
+
+pkg_setup() {
+	if ! has_version sys-process/lsof; then
+		ewarn "To use lsof features in htop (what processes are accessing"
+		ewarn "what files), you must have sys-process/lsof installed."
+	fi
+
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	if [[ "${PV}" != *_beta* ]] ; then
+		rm missing || die
+	fi
+
+	default
+	eautoreconf
+	python_fix_shebang scripts/MakeHeader.py
+}
+
+src_configure() {
+	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+	local myeconfargs=(
+		# fails to build against recent hwloc versions
+		--disable-hwloc
+		--enable-taskstats
+		$(use_enable kernel_linux cgroup)
+		$(use_enable kernel_linux linux-affinity)
+		$(use_enable openvz)
+		$(use_enable unicode)
+		$(use_enable vserver)
+	)
+	econf ${myeconfargs[@]}
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index e26eaf278ed8..2d0c0b8ea842 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/cargo/Manifest b/virtual/cargo/Manifest
index ad91b12535f7..3eca1d6b6161 100644
--- a/virtual/cargo/Manifest
+++ b/virtual/cargo/Manifest
@@ -1,2 +1,3 @@
 EBUILD cargo-1.29.1.ebuild 406 BLAKE2B 95fcbb2f79bf6172755f87f8da1fd7068a9af9f4da1638907467216e5055481990ce6b9f10cde120cbb770344e538fc9dcfb0d2607360b9279ab2699464592e2 SHA512 2137c8e5524319bc8a21f27032c220a94b1bc2b181254f758b50f64cd25c5fb8610c78d7b2e1b91835dbabdbbab2a7563abac5566643e4bf4dbd7edcdd2b5ad7
+EBUILD cargo-1.29.2.ebuild 408 BLAKE2B c311ee0a7f479e7350cc24e26a86d7c62b62a9f254e2f473dbb47788c559ec500719d68a524a552233e6d714d3d09fbc732765012ee7d1f2e35db3771321e19c SHA512 b7a0396f07f824a0b6e7a2de2bffa0d5864e0a94e8290e2b3f05687de41b5620b980ba7868a0e58bd768eabb7ba8af037b917ed3c2a8ffc8f04deda7d77668e9
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/cargo/cargo-1.29.2.ebuild b/virtual/cargo/cargo-1.29.2.ebuild
new file mode 100644
index 000000000000..75db85982890
--- /dev/null
+++ b/virtual/cargo/cargo-1.29.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/glu/Manifest b/virtual/glu/Manifest
index fda4b5e320d8..482565f65374 100644
--- a/virtual/glu/Manifest
+++ b/virtual/glu/Manifest
@@ -1,2 +1,2 @@
-EBUILD glu-9.0-r2.ebuild 520 BLAKE2B 57631849d316433d6af6bd5c937e093a9f03eb11d9984a7c102f6e8985b417dfd52c19d3935e1d1056d84e3077f24300395fd6d9f18c8f0d15f2da6ba63cfb55 SHA512 9b6bf8b67f2600453cf13a21d684b8cddd334ea2fff4ac9971ade03954ebb77220ff1e65d27c3a1aeadd72b608fa971c4da4f26c1a37a1cac967a1972f4cfb2f
+EBUILD glu-9.0-r2.ebuild 516 BLAKE2B 8ab5e62667d83649ec20fe6fa3631ee0cb379a73dc141eed6ec253df2aae821cd0acfdaeef2ec28c9fb4dea62a005691814437664af39c9d38cd87f4e05e661f SHA512 309f5ce76a5a7e126beff90d8a5568b34655eac7ffaa0f6230d1a8606f5bf069c988eceb13de80f6c30bd4cde52a5c43a939d8200211da1abb3feb8b01e17269
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/virtual/glu/glu-9.0-r2.ebuild b/virtual/glu/glu-9.0-r2.ebuild
index b896d0308e2e..0a20a43947bf 100644
--- a/virtual/glu/glu-9.0-r2.ebuild
+++ b/virtual/glu/glu-9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for OpenGL utility library"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/httpd-php/Manifest b/virtual/httpd-php/Manifest
index fbb6bc790adc..ce497210915f 100644
--- a/virtual/httpd-php/Manifest
+++ b/virtual/httpd-php/Manifest
@@ -1,6 +1,6 @@
 EBUILD httpd-php-5.6.ebuild 456 BLAKE2B 86ecf7aa3a4ea648a54ab3bd7ae24575fbd7037505484c2c3654818d0417619140259a8d5b279c895bc6cf386b82aab1e235ab667d2e59c12d389f18d6a041fc SHA512 b5df88abfb2639c9aae271822b66749cfa5e5a6ba2307303875eb6c12dd2578d85686d277f1bb986a3c5dc6484734e06ca60d0b2be702f4f1cbb3c835cf6b086
 EBUILD httpd-php-7.0.ebuild 456 BLAKE2B 86ecf7aa3a4ea648a54ab3bd7ae24575fbd7037505484c2c3654818d0417619140259a8d5b279c895bc6cf386b82aab1e235ab667d2e59c12d389f18d6a041fc SHA512 b5df88abfb2639c9aae271822b66749cfa5e5a6ba2307303875eb6c12dd2578d85686d277f1bb986a3c5dc6484734e06ca60d0b2be702f4f1cbb3c835cf6b086
 EBUILD httpd-php-7.1.ebuild 456 BLAKE2B bb673212a0a1ca2e36f359605e3c1318b68ea7e3f606a4d43567c95bb41cca7ea44a26104bdfac17e1a211985dc6baddd0be0c708243b3e7e93083eb6c9a0a5d SHA512 f671d017af91e780556de3dc261a679176722d1c4a461fa85edf0c39fe792945d3026924eed6d6672d8aac55a91ad48bcef1ebd17f6160e00588fcb2e7242d7b
-EBUILD httpd-php-7.2.ebuild 455 BLAKE2B c85e9ecc495b0bbd8826b91de58312a2e919de5b75c4142bc21eb3cb3e6d5a8d664f970abcdd0d716456c08b75cb57738aa0d685d82307ecd8f4336be9a1a7f3 SHA512 7b22c1cca461da72202bd34d09257bc24aff664a8e5bd5bc384a38e3d92289bbf54e0bfa08c9a77ae09a2a62824ed3bea2d65ca702d16ccebe7383918c3b74ae
+EBUILD httpd-php-7.2.ebuild 454 BLAKE2B e5cabb35442ff77b360eff30208392444ef5cfdf4b3c2c11e51c83eace392663cb86270d075dfb0e16306be566e2251d6bc2aa7a3a67b24f4bbbe62f75ae72a4 SHA512 4aa4bcbb6698b114d742b6ae11375c4bf9a505ca8488bff5a90b61fd019f9ff2a63b284d445f7ac054386edb760f26b4748090e9b55d9aa35fd8622b5041b6b0
 EBUILD httpd-php-7.3.ebuild 465 BLAKE2B 80b73f8ff858c7a50ad928775ed37d8adec651fe927c12ae5bdaac35d4fbbf7c02fdc8a18b9cf1a78c94ac64dd90ab94ecd3ca2dfbe45cb6bca89932ca2c6b54 SHA512 c21a81bab0a76b70e071281ebb4eae8f45d6700bbf74546151e6b2fbdec869e809908d6b40d59fac6d5b08e8bc12a24cdbbbc0d894ea3e5a65e093183f7a5088
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/virtual/httpd-php/httpd-php-7.2.ebuild b/virtual/httpd-php/httpd-php-7.2.ebuild
index 1e585fbd4712..591022a243b1 100644
--- a/virtual/httpd-php/httpd-php-7.2.ebuild
+++ b/virtual/httpd-php/httpd-php-7.2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index d26c576965d4..bb9f64f89283 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,3 +1,4 @@
 EBUILD jdk-1.8.0-r3.ebuild 403 BLAKE2B e80a768ae6876ac384f50d9dcaba436f42babf812e635a6ea59c3835c2b3c87fb8b3538478b4b8776759f57e7b34d2c4b9fc6b736bdf75126210184c5b066b9f SHA512 48473c2c28a1775dab16624e2a7479b91282f39b719557903e1ca499d736cdb82de842ac80c83399583facadc985815700b65d0a960ce81e85dc5cc0535b5a9f
+EBUILD jdk-11.ebuild 364 BLAKE2B c44c4a193945dd07f271e5894235577d86453961fd5fb0251f9ca9202e405835ed5d460e8d871864a8dcdec6896c89c0a714c2a78af37c4c7230dfc0984b5c0a SHA512 4edd6302773a65eaa581e05032a1a7f8c867f566ed122c7bb8ee1dccbf588823e54a9908386aa0711478273bae0077a2f4fde8fd1c55a9ac14e3a03573b0f916
 EBUILD jdk-9.ebuild 290 BLAKE2B 629927326cbe9f207205e211fc8b0165ba281df815369ee068d1caf12b343b7f4779be356814128ad196c0484928387ce1e3b7a46951df2217846bc619a9772e SHA512 f4946e3cd9dd420c24b2c3dd10138679d59988c980b102eb961df99ad007c4809d82cf309f814cba71e0d79d2becff5bf567e9628b699214665f21fa9f50ef2f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/virtual/jdk/jdk-11.ebuild b/virtual/jdk/jdk-11.ebuild
new file mode 100644
index 000000000000..ece992cf94d9
--- /dev/null
+++ b/virtual/jdk/jdk-11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND="|| (
+		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
+		dev-java/openjdk:${SLOT}[gentoo-vm(+)]
+		dev-java/oracle-jdk-bin:${SLOT}[gentoo-vm(+)]
+	)"
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index 6bbf04a4ef29..7c2c878da4a2 100644
--- a/virtual/jre/Manifest
+++ b/virtual/jre/Manifest
@@ -1,3 +1,4 @@
 EBUILD jre-1.8.0-r1.ebuild 379 BLAKE2B 4e35789a6f87dd7e76a62a2b8a8a477a59a13968ac0e613c419bfb90d72d2372082e5948cb5086b33117c5ba391b2f1102055bdc3e23aa8e4b3ae089e92ed105 SHA512 43cda60d964ea06a6ed494c4a3a8f067802d258f09be50edfa111c2fb04a7c1c86310339d39a38b67b661647505bd8d386fb5d645c543554a886a818fb5a5d8c
+EBUILD jre-11.ebuild 304 BLAKE2B 8217e2ab5290b301caab4a14791c20fd2296d63843f051b499d9d5d955495efc90b7431da85af052e3ad51f15ff28b9b1d898806468ae42201744f5e9947292b SHA512 707b264cf8652cc56000f1d8387c104d30be4db57a5ac82e0931dfb193031194dac49615f4e955168016b41f144873be75dccca0c117a2414972851a96d2c2c1
 EBUILD jre-9.ebuild 321 BLAKE2B 5d7705f5c9e52261c1625fa93827fea95863d2c1665773c7c86be9b773c68738e379c0a4d257f427496e8d543ba29b6ffe572b781edd4be352fed4edea2f58fc SHA512 71b9e922fc59ee6621c01506f4d7caf8fa3bfc282f70cba5b2546e3d670a8988845261d2840833a254f3a43da722a65c2fc7eede6cbaa6d9dd2f82a44e265ec4
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/virtual/jre/jre-11.ebuild b/virtual/jre/jre-11.ebuild
new file mode 100644
index 000000000000..ebd9c8db284f
--- /dev/null
+++ b/virtual/jre/jre-11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND="|| (
+		virtual/jdk:${SLOT}
+		dev-java/oracle-jre-bin:${SLOT}[gentoo-vm(+)]
+	)"
diff --git a/virtual/libmysqlclient/Manifest b/virtual/libmysqlclient/Manifest
index 8f753ee894b9..ae9baddd9486 100644
--- a/virtual/libmysqlclient/Manifest
+++ b/virtual/libmysqlclient/Manifest
@@ -1,2 +1,3 @@
+EBUILD libmysqlclient-18-r1.ebuild 391 BLAKE2B e417680c13233787b6de6a8842dbea81f77f878a6c5fd2e8ece12a0f3a2dc83f515900f2ac8ddc34e5dd38509d15948367e55aab8e8758f54b628c017c770de3 SHA512 4c33ef7ff48790bad19ce943dadf5cb462e208a30b8d0bdeb7ac178d5fccfdd315f2a46b83e09489fa527477b3803276bc9fbf8d3b4e8bbd4b1c059c6dcbd863
 EBUILD libmysqlclient-18.ebuild 869 BLAKE2B a99776d5adacd32a5a92e4b98b0044c117064d46ff691c03f63409d01a493efa38a9b00d4e5c6cc8b31bc20c65a6acb365073d512d9292ea780c4d8a584f1285 SHA512 693e4f34a092adedb6e74b8c1682a96f247aad642a3ba05a704c2924ec10947694cc340907801227656e4d92afbe1338ab0ad758c3ae81632172d2ef076fa80f
-MISC metadata.xml 249 BLAKE2B 7ecbba6fdffd276328b798bcb6efb0a7444e1e5b70f14364c229d989853afdf0665cf804143ba732ff84f6f97216e8cec5ed2ee83cb0e1231c176e0c98662280 SHA512 916effd7bd6976c7ca956f9262ed7921a9fbeac0be2f60b80c3f8cf78f16b12cefb8e06ced95d693e4682d4c5c71eba87c832da9a21c4804e1e1c7d35028918c
+MISC metadata.xml 520 BLAKE2B fe2b3ec4abd9113d3c518af3596ee6c808d1c4a17442455e5a01bde37538c9673cb0535f4ab261ad57af01a27ba586562eb4ae2e89632f10b315b7615114923e SHA512 2f6bd12295a94b31a26ccc926f5642f60cbd2b9560b52a755236e035199d1792188527476d078963558d28cfa286a2c042b9bce67ca69b43962abb25b8ca3e08
diff --git a/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild b/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild
new file mode 100644
index 000000000000..8eb093fb8b05
--- /dev/null
+++ b/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for MySQL client libraries"
+SLOT="0/18"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="dev-db/mysql-connector-c:${SLOT}[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/virtual/libmysqlclient/metadata.xml b/virtual/libmysqlclient/metadata.xml
index 70da03df9f65..6bad6e2ed2d1 100644
--- a/virtual/libmysqlclient/metadata.xml
+++ b/virtual/libmysqlclient/metadata.xml
@@ -5,4 +5,9 @@
     <email>mysql-bugs@gentoo.org</email>
     <name>MySQL</name>
   </maintainer>
+  <longdescription>
+    Originally, this package was meant to have providers be switched easily.
+    However, the dependency resolution and rebuilding does not work through a virtual.
+    This package is deprecated and will be removed in the future.
+  </longdescription>
 </pkgmetadata>
diff --git a/virtual/opengl/Manifest b/virtual/opengl/Manifest
index 74aa4e92d51e..c34b501c4208 100644
--- a/virtual/opengl/Manifest
+++ b/virtual/opengl/Manifest
@@ -1,2 +1,2 @@
-EBUILD opengl-7.0-r2.ebuild 517 BLAKE2B f486b4661ee212b61b486d261dc304dd1989669d595b40d6a8ba95cae6f318b2aefc1e23cf70899ea46e206a062ffeb05736e28b84fdd0f0dccfb1ad9f4de57d SHA512 19d2f1464299029cf5b99d42b367d5f26383f33322d38fec68c5e1a64320b9e1f73c0fc5195ccdd29b15a6c4d3ae0bf4291184be12993bff7ecd6de7a6c5adfd
+EBUILD opengl-7.0-r2.ebuild 513 BLAKE2B 6b16f9782932ffde52b6cda20a57333eed62410ce1fbef61d7cdd622755db748e974e98eacb53caef01d740f1b769fa709cdc440f938b5e5ccc6e537afd593b6 SHA512 900bc44c3f185888f89d4d7a09aca67347eab6a518926c5966c937551c4f58b5bc24f28bcaa3324f2b07db0acaee7e0f506131162b78b09288adaa85d0e66475
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/virtual/opengl/opengl-7.0-r2.ebuild b/virtual/opengl/opengl-7.0-r2.ebuild
index dd7fabb9abeb..1b20ab60b570 100644
--- a/virtual/opengl/opengl-7.0-r2.ebuild
+++ b/virtual/opengl/opengl-7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for OpenGL implementation"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/perl-Time-Local/Manifest b/virtual/perl-Time-Local/Manifest
index 1d6291c5901f..0d2df1e7a56d 100644
--- a/virtual/perl-Time-Local/Manifest
+++ b/virtual/perl-Time-Local/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Time-Local-1.230.0-r6.ebuild 558 BLAKE2B 1e383ac0e19f4445bacc353e033cd0b74d4e0490cffe60563519b0596b348ec820854610bff0dd8be171667e2a42bdacea31ff9e7e3d406348e11a15e94534c9 SHA512 2eb78f698b1f8e9941725544a1d4f4bd20c1cbad3325e68bcfdce3e7297d63d844f25ad0e548c759ec0e631974754b78af45050844e15f2189e9315c43d28863
-EBUILD perl-Time-Local-1.250.0-r1.ebuild 592 BLAKE2B f0550cb421493e32199235fbf0c68e7af1449c94d62aafb2a82734c21a871ade9d673fe13b6b1eb446c1f2155e8bbc93c6e2d71c29f4438fc8d766d5fca5c276 SHA512 d55052585886970da0e7c375e466bf51076f6fc8de007cd4de5ced1cf0beba367d68bbf46e076eba628a474425135b3ed929a2d89cad8859bd91d075f81ddc0e
+EBUILD perl-Time-Local-1.250.0-r1.ebuild 600 BLAKE2B 0aee7fb123a599d64413fac93107ddadb78d9cb372b3e290e842fd1420ffb2670743363d0ecc79212da9f694ce8fa716f57bd423360494cb3e7e6dd0d4e91029 SHA512 0624a0fe7c6c45361f37eb9be2fd23c739a95edd4e98a02263af3e0fbd261248b29659333beeaa6c93da1ba2e53154c92f436e18a6f824713632d639639756c5
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Time-Local/perl-Time-Local-1.250.0-r1.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.250.0-r1.ebuild
index 388ff1070880..c83ccc553e64 100644
--- a/virtual/perl-Time-Local/perl-Time-Local-1.250.0-r1.ebuild
+++ b/virtual/perl-Time-Local/perl-Time-Local-1.250.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/resolvconf/Manifest b/virtual/resolvconf/Manifest
index e7f45e373b9a..d74f76322825 100644
--- a/virtual/resolvconf/Manifest
+++ b/virtual/resolvconf/Manifest
@@ -1,2 +1,2 @@
-EBUILD resolvconf-1.ebuild 337 BLAKE2B 5435f04a364f24cae9da9f49d5a17c4c6d8ba0a6329935a6216f4a8a0e66e0635a4bab98c97fe0ddad3971b4212a8dd6632812fe4f67156099b2f0888e19942e SHA512 198500d6bf4949eda445d73df538bf1eecdd52e18e0decf8efc68d1bc9e30ec0a14aff91b8b897e1be753e9807abe8619e503a92ab53bae976322f7e0ad31f54
+EBUILD resolvconf-1.ebuild 384 BLAKE2B 8ed4710a353a6f122b5c51ad56ed7b437cd05e3228ef5a30ba42d00b309920e2523e19dbc6893e4bddb48f3f58360adf201e140760caec8398efba8e400ea3cb SHA512 d540beab9c29b0af0d11d240777c8790155caa73bf1f6bcd82702c447cee0baefc0a5e35d71b0ece90b924ec4ec830fa4ee5818bcc955085e1bc06885f85ea2e
 MISC metadata.xml 217 BLAKE2B 6e1cd12af01db3565487a9412bae9a06912408439877e1a81fc466c0dc0612175846256a14be3b1102bbd43ac663311d34bc441b5d64caf9462c25ada2cfa3a3 SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4
diff --git a/virtual/resolvconf/resolvconf-1.ebuild b/virtual/resolvconf/resolvconf-1.ebuild
index fb7c7cdfe0a1..1a77aab6a0c7 100644
--- a/virtual/resolvconf/resolvconf-1.ebuild
+++ b/virtual/resolvconf/resolvconf-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,4 +8,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
-	net-dns/openresolv"
+	|| (
+		net-dns/openresolv
+		>=sys-apps/systemd-239-r1[resolvconf]
+	)"
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 7f4b0e02b786..683e771b6d57 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,2 +1,3 @@
 EBUILD rust-1.29.1.ebuild 311 BLAKE2B 2da16fc2517bdef6fba4c22e3c0be641ea877ad69a221f6e0f0fdfe0b102cf8375e747453fa911443387397638966554ce399076198b7da9900f146738242fa6 SHA512 8340b1479cdf26fa44497e26786389946870c73883f1aa2fb331eb5d3de7c44189e44384b08a9f36b8ece50037a323a8c2425b8834b56d105ace54e349e05a00
+EBUILD rust-1.29.2.ebuild 313 BLAKE2B 7b374833da9a71474ba138e7ac71e54eb943b8f1563f013af3dae240d094632dd111b7657da6c68decab76c7bb0582115d6d5a15c93401f444a6e371ed705cdc SHA512 04469519b134180d5c7e95c256ebd9f8f0fbddac48185d6119d95f5608b16390e52abdd500e56bce5363e3c01770767a42f3bdcbd5594ec870d59023d9673424
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.29.2.ebuild b/virtual/rust/rust-1.29.2.ebuild
new file mode 100644
index 000000000000..f0642556ce55
--- /dev/null
+++ b/virtual/rust/rust-1.29.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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-apache/Manifest.gz b/www-apache/Manifest.gz
index 886bf4ca18af..6e91a7aa1c23 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 12ca77b972bc..950d8839f94e 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,7 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
 DIST mod_http2-1.10.10.tar.gz 528560 BLAKE2B 7389441b1d30d0448bb17fc02a73957cf20365020796ce7260c1d63d1468537ecdeab83db12d1b245af1e760236da8e8d0ccf9ffb222d2dec1e55491ac77dc11 SHA512 b4b9e734ed35ca63fa114462f1adb358bb73e4cbd8df95ab28c4518b8f7db40233f4ba13bc2194847eb9c1adbc3eb86fc63cbb56389fc0867767658d4d8ba77b
+DIST mod_http2-1.11.3.tar.gz 1028467 BLAKE2B 3a5d644f87104e1f7baae05396fefe94975e86e9289bb9c4e6d7ed94e45e1d9b38dfc79d0e0d9ee9270efedcd811db2374c898e419d4c16f73b38f53512e91ed SHA512 b97697f44eab9984b7dcaa7d941f23375cd5c2c81405842e17910a37dc2c952fc36a37e0802755457ccedd196c5fd2fb5b60467cb0ed16ed7aeb88cce4eabd2f
 EBUILD mod_h2-1.10.10.ebuild 913 BLAKE2B 8efef07e602ac6dfd6db30f8b36ad91c5675c949b65848e6ec6948abd4e031aa86170406186d3e8a1294f2a6276618bc0cf98d868e56a938dc435836579bc614 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25
-EBUILD mod_h2-9999.ebuild 913 BLAKE2B 8efef07e602ac6dfd6db30f8b36ad91c5675c949b65848e6ec6948abd4e031aa86170406186d3e8a1294f2a6276618bc0cf98d868e56a938dc435836579bc614 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25
+EBUILD mod_h2-1.11.3.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
+EBUILD mod_h2-9999.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
 MISC metadata.xml 244 BLAKE2B 8d77ec488a1873fece64c647739c050cd3fbc933824576c2f35205a20fb47cdbb2be17cdc278ebbae566d29aaeda094098b5a6e9505036ca3977b3fba2123858 SHA512 e024554a3ed54f32c7d2adddf91a72743ee6da18f02d4955126bc4286e545944bddddcb09bc6bb8520a2dad285b9616c38735f25d7ff7e0b5c8875e1d08fd04b
diff --git a/www-apache/mod_h2/mod_h2-1.11.3.ebuild b/www-apache/mod_h2/mod_h2-1.11.3.ebuild
new file mode 100644
index 000000000000..7a124f105c05
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.11.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild
index eaf87ecaf6b9..7a124f105c05 100644
--- a/www-apache/mod_h2/mod_h2-9999.ebuild
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit apache-module
+inherit apache-module autotools
 
 MY_P="${PN/h2/http2}-${PV}"
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
@@ -31,7 +31,7 @@ need_apache2_4
 
 src_prepare() {
 	default
-	[[ ${PV} = 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_compile() {
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index fab09f8ca4e8..1301332da185 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -3,5 +3,5 @@ AUX modsecurity-2.7.conf 394 BLAKE2B c9d55e8b4419e5b54a364e03dd02e9d0e5609954d15
 DIST modsecurity-2.9.1.tar.gz 4261212 BLAKE2B c47c7934d8da870e629c5733cc8c37452e4d90351269a14b99483188e8e3161891bd63bfd70e0723648c8daf51f1c33d900bd90ab0157332f826eab772f09f62 SHA512 374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269
 DIST modsecurity-apache_2.7.7.tar.gz 1003835 BLAKE2B b36370e67945928df1948adcacb2303f80b461eb48409b2bda6b8013620e0dd977bec6a0c5d3c3cc098479f5c231c558fb7462b6300b4552ad65064f8ce1fb8d SHA512 859f72580b6acaae5db180f98ee32ad2cb0f3ef24321d0c2df20ddd9fcfbc6c09c98b672012dc4931a6fd14f3c21c38ed31ab8900940382fcb48b37f30005a7d
 EBUILD mod_security-2.7.7.ebuild 2400 BLAKE2B c2332486bf76795fa8340c257b6b87c034a5208e8a91d89149f62bcdbe2eccba667ad4e65c889252af58061865fa09eb89944ed886eef1694f79726201f8e5c6 SHA512 66bc689874fd34b924ef902c72844e0e66f2faa3afac637e40cd8b8ff4c46a6f7ce3867c5892fd2126827b82cfd5d6694bd14fbb3d0acee1be6fa3784c52ea8b
-EBUILD mod_security-2.9.1-r1.ebuild 2773 BLAKE2B 192628953bc1b028214fd322c40f25d1cb4b6ca718fafd8fd90d9929d68373af6948fd0944cc2c7201f8e81a06e6e2de8e9d5abbccb1e8079ed711b0f14c3404 SHA512 55e682098d6c5775cf06de18d98e8548943c50bcecee15c0047ebb50c2896dee3318336fec305843a6be4046ce04bb1cb847e66479ba934b9d17a1edafd7d8a2
+EBUILD mod_security-2.9.1-r1.ebuild 2768 BLAKE2B a278a8138efb52c23378fc561adcb2e72345bf63d5c628f11e7c2ecf641ce16dcc5d9d018a7fdfd78f95e03783f8700062ab3fc8e78f1ed41ea3a53bb93fbec1 SHA512 09a1dacfa56d0c188976312a0d4786ee712dfba38ca2d280f96945c308d6f2cae54c014edbc6f5c9ea82bb233fba2bca368a3e7c1123bfa9032ca00666f113e8
 MISC metadata.xml 982 BLAKE2B f65a4592e166d75885dd1f2c9a9de79a4f3cb44be079c38300f65f3ffad9eccad8f87695ba665a175b3a38cd249aeb7875dc16884218b735e51b13812b7be3ea SHA512 a2a0c01efa1c1bf5193c0d41df0fd03f915bf53ffa51205d32cc76b633d1707a832b0177b0fc09dd88ea7e44b53caa1c03820c2e0934ced2411862674332a293
diff --git a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild b/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
index 6dc8bf354d1c..bd1f363f6e7a 100644
--- a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fuzzyhash geoip jit json lua mlogc"
 
 COMMON_DEPEND="dev-libs/apr
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 01bab1472a62..fa5c73d3ea6b 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -4,5 +4,5 @@ DIST modsecurity-crs-2.2.9.tar.gz 279898 BLAKE2B 75e9c5c9fb0fdf3957b17926b923d1d
 DIST modsecurity-crs-3.0.2.tar.gz 156751 BLAKE2B 111a330b6081d476899be321e15d74379b3c3db23f429a4a4ef1900c87e4b29229638acf3bb367745446ef97ccba4679db91b0d84bae93f2c127bbb6e8031851 SHA512 ae8fe9a0f00a57708c8680cb76882214e4f5ff647e13087aaf1bfc7382cefb38d2f3a88eb1f210031b553f56d3e44c12dbdc68f8b0d09fb4a9e2f15a70d885aa
 EBUILD modsecurity-crs-2.2.7.ebuild 4130 BLAKE2B 891afb7917e10f74674c039725c393129ab6bf7be717dd517794566dc06f1ac917dc8421ccfb5af866077ff256fa78f75ddb80840e969f3088a53b002b14ce27 SHA512 21ae265889535b3dd18b0adec162f744425da149f58c4ab0ebfb245bd02d8e21abe0cbc21f14a587f9e619b3a5d10fd027deb3a71815ecf383e473fc4634dc6b
 EBUILD modsecurity-crs-2.2.9.ebuild 4221 BLAKE2B 0270d493848b9ab2a72938bda4fec4a7fb43ffed160c91100eabb98c52a48d4c6aac19443995a0edd460185837eee250936b6aa17ae41024bbfe69fe828d2d4d SHA512 aa2bceb00dc5d61b560d61e21b217ecae63661080e902a1519fb9644cc50a3ba113cb3a86293accb6de7288ef72be4f1bb5b45b78f58ce97504293de44506003
-EBUILD modsecurity-crs-3.0.2.ebuild 1562 BLAKE2B bddc90140b7988843f06cf1f12fda32393e4bbc3264cc19f922507889c4e79c4643e02b3938980213ac1cb220f9d403b8f7ff5855901280c740f538634ebb2ca SHA512 10ae6dac8b32afccf1e5620cef1feb7dc250054a39f74e8c3850b11ee4c373df723f3164c08d10f4a4e904999b6c0a47b92be90d2eec0ffb0c6be968c23f925e
+EBUILD modsecurity-crs-3.0.2.ebuild 1558 BLAKE2B 19f4f4c2def91ffb8337caa4ad286138474fd4c3db64cc057a51a5ba34111987ceb994923835d7be583642da222221016063bfcae9049334ae5ab25b43b5f5d5 SHA512 c35167cf77bf17c8f34103911178cd4bf51f057176cdccc9cda639a64c6cebd8bf1369981b6ff362d91bd5cae3703feee11d15c67c28f552f961890cc238eef6
 MISC metadata.xml 240 BLAKE2B 9ac73447401500c93e9ab7fce069726f63e07989f48154f4c99346e7913696e53d2451b08ea9fe4c72af28c43e13091599d84c70979e3cb504e301ac785d37a0 SHA512 f387811090c36052ca6dfd48c20af460ebb892738ecd449a5a213ecf7313dfc1cc6eb118e4d28ec24e26078995c4d291784f26b6afc1f822cf83ca5482bd7310
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
index 7ac22cdb9d30..5eca2f158d2c 100644
--- a/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
+++ b/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/SpiderLabs/owasp-${PN}/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index c6127e0f1d9b..ff106a3e26e5 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,10 +1,12 @@
 AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b0245c2c37c27cc69eeba9be62c8b626b8fdf26c18ddffe0a06743abf1d529318f46c0091f64370f2a9d82f1b54116 SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d
 AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9
-AUX passenger-5.1.11-gentoo.patch 1064 BLAKE2B f62d689d7425e11609917506b1c19e15f9eebd5255c3b16f89d98ed44493af7dd0b7e5576430b2c603af29f51ea1ee2c82c34b83d6042c0419db2069740183e2 SHA512 7aa098e4c2d4958deaf1369c0570e5f0c5661739047982d428555e5136dc9d5414ce575b3236b30223f14178dd2a4262f62f129d1d383f5c0c78312e80634670
+AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
 DIST passenger-5.3.2.tar.gz 7039759 BLAKE2B be10b368530b8560d7d93664bbf91711ace0cadb0d1e15a978c0a52311a626ea2e1c6d05e507ef488b384e4a7ccc4b02da35bd5bd5878788b036401e06a33b5f SHA512 97900a0e0de67cc3c3770c291c85c6fe937fceab5632c9832bc5c461d3b4e586a47c9733a1a50a805834f591e5af90651789ed74bf74e0eed4d6ce8084c51967
 DIST passenger-5.3.3.tar.gz 7040055 BLAKE2B 1a9caa34dd809f96da84e9e3c00f365fd5a5e80c5134c25be810ad2bd9e1f01d0f64c6323211f28121590ac4d4593572c5f4392e1be2bc87d78741a0fdd73885 SHA512 ae0b4a2681e7877c7a57d236139033f17782f3d0d891ac58bbfec211e77e3ada9d36c250c9c9234d853c666d1501ccc0e2d5997c247f10985cad936ad97a741e
 DIST passenger-5.3.4.tar.gz 7201951 BLAKE2B bc67fc5a0a1a8a38918d5c36470cc9df888eb7b85304b06f283199692b18922a9077db11db374fded091f851d5af67e7852d662f0e22a7ac4d49381eae35cbf9 SHA512 08fa0b06ae85cd48c748739be77713752c989ef031910441c243b5beacef398d544c41c87faa05a4d3f088da048b20ff5923d368ca12e0e2fd815726e9ce8c1a
+DIST passenger-5.3.5.tar.gz 7217952 BLAKE2B 80fca5713590c73b7d6afa73b5d3e323188ba6496082d0203dd09ee7d52d9751c6780ef1f68cb646722973743dfecf3aa810019c68a3f3ff0220a42de84d4081 SHA512 3b892f5d86247913572eb28541625f62fc22efba907541f5d3ef8a2d3a7bc81b7d90d5789650353bb4f2e11184e9ac272ea3d954db20ad5c6f9c9bdc52d2d035
 EBUILD passenger-5.3.2.ebuild 3980 BLAKE2B 90f06491d9546734822f033e4f8acf0aeae40e2a8f8185ff48d9995869eea7aa6731a290d0f7e8066c4ef92d50f5ed458ec1de979df518b3b29e0bbf6fd31c51 SHA512 c0defec19d84def74d81f1b3e8fb2f69228a5f1805d3a7fd40ea2894b22662deda3dbce5ba4fbba8c4481483718618fe4a9602666a0fa8b6b06e0d795905b0c4
 EBUILD passenger-5.3.3.ebuild 3982 BLAKE2B 89e14bf8db6ed5f52a9b7ac08ca58977e1b7d8afd492bbfd67dec1174046c030168cbc2462db0e8eefdb90c1f11f64c311b75dfc5988d2259f09f65536454912 SHA512 2fb7572a1c84e6d28a73ec33da00dfdf484bc8152018d5a713b096631e704b4b32947cb901809adf5ad46ba9a765dd410f1ab251fc0c78ebeb0b4ef3a60f7c05
 EBUILD passenger-5.3.4.ebuild 3982 BLAKE2B 89e14bf8db6ed5f52a9b7ac08ca58977e1b7d8afd492bbfd67dec1174046c030168cbc2462db0e8eefdb90c1f11f64c311b75dfc5988d2259f09f65536454912 SHA512 2fb7572a1c84e6d28a73ec33da00dfdf484bc8152018d5a713b096631e704b4b32947cb901809adf5ad46ba9a765dd410f1ab251fc0c78ebeb0b4ef3a60f7c05
+EBUILD passenger-5.3.5.ebuild 3979 BLAKE2B 93e7172e6d1886aece5cee9e34f9d85479f226203424aa71c22bfce2acee354574fbe0144f2303c6a08a2adf4e5bebd07333a42dcf82ff6a6b859cf43c34aa86 SHA512 c237287d7c5a09f0ada83551c152d16660705da43af3a9b1d68a906f02e7eb5403b614125077f016b54856da561b20783150f6abbbc571612b0f1cb38e12c974
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/files/passenger-5.1.11-gentoo.patch b/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
index 5a2565c0315d..5981ead136f0 100644
--- a/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
+++ b/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
@@ -1,5 +1,5 @@
---- build/packaging.rb.~1~	2013-10-27 00:00:00.000000000 +0200
-+++ build/packaging.rb	2015-09-28 07:44:04.584236386 +0200
+--- a/build/packaging.rb.~1~	2013-10-27 00:00:00.000000000 +0200
++++ b/build/packaging.rb	2015-09-28 07:44:04.584236386 +0200
 @@ -575,7 +575,7 @@
    psg_ruby       = ENV['RUBY'] || "#{fs_bindir}/ruby"
    psg_free_ruby  = ENV['FREE_RUBY'] || "/usr/bin/env ruby"
diff --git a/www-apache/passenger/passenger-5.3.5.ebuild b/www-apache/passenger/passenger-5.3.5.ebuild
new file mode 100644
index 000000000000..3e6bbbe20254
--- /dev/null
+++ b/www-apache/passenger/passenger-5.3.5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.8.0
+	net-misc/curl[ssl]
+	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+want_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+	depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
+	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+
+	# Make sure apache support is not attempted with -apache2
+	if ! use apache2 ; then
+		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
+	fi
+}
+
+all_ruby_compile() {
+	if use apache2 ; then
+		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+		 APXS2="${APXS}" \
+		 HTTPD="${APACHE_BIN}" \
+		 FS_LIBDIR='/usr/'$(get_libdir) \
+		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+		 ruby -S rake apache2 || die "rake failed"
+	fi
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	if use apache2 ; then
+		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+		apache-module_src_install
+
+		# Patch in the correct libdir
+		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+	fi
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index c0b3964ce38b..940c7ff8df73 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index ea9a7b30c90a..b8c5216fba86 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
-DIST drupal-7.59.tar.gz 3282260 BLAKE2B bf7d74926fe4e94149ef7ff622cf7889f45f3e35b9bfd19fed12aa688c8131f2f8daa2a261796896d5386966603e837b6dec3b6c02221f9b0c527c4a6f5ff9da SHA512 68f02b39d1a4658adc0f0046c22cc1059b68f952f9cd753f5a3e379cf93705be308b4727519e90d77a42437442daebaa78d76745954be4d40e1a5105c319069c
-DIST drupal-8.6.1.tar.gz 16236559 BLAKE2B 6c7b2d396b285290e0ef537777054cfe1d50b6188d3400bb0f0c6c35f3ae677b6d7f9ba53e28f95c4a89aeadd2dc7fc1b7c659048332a21d0ffc543bf8c4df41 SHA512 f42eab1f7110219d11f398c5099cd0abf50883819fbe6a879d08f1117e3cc413937772a269d28ffe09ba59b24f79516d03601ccfd2abfb37ed18064f34368b5a
-EBUILD drupal-7.59.ebuild 1773 BLAKE2B 7ac284fc9078c37f97510f8e2c474cbd155b910204b73365a531bc9b27df891d99cdc5d0e695a510e931ddf9e13ffdf177367b6c10e6b75af009e69910d0686e SHA512 59be44f0d0b52ce977061a4f3e35ec542519ee077e9c7dba931160ffda1cc8551ca05b6652b4e3efe75327e6698b1552d1dad45d8e5bb763d4ee07e1e0334762
-EBUILD drupal-8.6.1.ebuild 2428 BLAKE2B fa031355fd6bc3268fe3fdf735859d8a2b4a171a9dc27ba0b1c7495fd2dcf45c0a26c950c5dacd1c113e29a229cd25928c7ceb9aa09c7434ce6df6112e31e52d SHA512 349ff3f6752752012254cd816db0320ffc40420c01fad22af466ca366d769db99c6f7ec0648042a4cb30b21a16789c63f95d67138952aa977ed03a9820be9a47
+DIST drupal-7.60.tar.gz 3283058 BLAKE2B 2c29c089e0e13ce52c5d7a0bbf72c79596fbdc1a370a60b33d617ab29f2aaec86e36545ced7620832f333de66bb775178f7eeeca80976d6e2616553b766c07b3 SHA512 fee59cf303a6c44e3fa3cbeda4912f7d61ffe8294282f9ad0416a6536cc6ea65cf114a6a801dd1f68572185c2b1e300f58f907f9bd61f96beaba3706c527d512
+DIST drupal-8.6.2.tar.gz 16240694 BLAKE2B 122ff2464af6376256d96db8b470cf5f83beeba80a5c63e549e7eb0cfc875629d0b2d4ed46b130294e2145ea5a428b15cfa0edfcd31596660188df769b68bcd2 SHA512 8cdcd31f3a112a577e622cca0fb7957580b5691102421344c6f6bfc3096f33aae3a68d7d8eb9062ad14761bac14b68c2967973b1b1ef367dcbd79b972493b7c5
+EBUILD drupal-7.60.ebuild 1770 BLAKE2B c95fb45714d745fe90f8522f44f4c6c4e8447fc0ca70bef0ba14e4d9112f6d17cb8241a15f6eec9cd3ff7dc4821f2f3744f797c9a756224efbc4dda6e1104251 SHA512 cc332985461f2fd70e73231af6841c8f9c64d5f9ec961b46ca2814d24bc6a2d4a29e35c53ea1fe231de4f8c6183461402fcdce46a37db64e28af6f36658e095c
+EBUILD drupal-8.6.2.ebuild 2425 BLAKE2B 6c7c13e66671b68a6f3d1305bdbd07e06fc1d07e4f9d44fd093196f266f690cff3d1e02444c3b9fbf9ca4733f32d396be55888e4fb87c464706fdf36692f9481 SHA512 5e436f0647278c0f2775ce4aa3096fa32e7f9b9d682e16b1cbda27d622fc5b9f11842b002d39efd47f6430e5799199c6bd28b4f980bfaa75ad2be20776fc74ff
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-7.59.ebuild b/www-apps/drupal/drupal-7.59.ebuild
deleted file mode 100644
index f2d68ea226da..000000000000
--- a/www-apps/drupal/drupal-7.59.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
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
-	dodoc ${docs}
-	rm -f ${docs} INSTALL COPYRIGHT.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-}
diff --git a/www-apps/drupal/drupal-7.60.ebuild b/www-apps/drupal/drupal-7.60.ebuild
new file mode 100644
index 000000000000..6f40a8c2e6ea
--- /dev/null
+++ b/www-apps/drupal/drupal-7.60.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
+	dodoc ${docs}
+	rm -f ${docs} INSTALL COPYRIGHT.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+}
diff --git a/www-apps/drupal/drupal-8.6.1.ebuild b/www-apps/drupal/drupal-8.6.1.ebuild
deleted file mode 100644
index ec2dacba2d14..000000000000
--- a/www-apps/drupal/drupal-8.6.1.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
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.6.2.ebuild b/www-apps/drupal/drupal-8.6.2.ebuild
new file mode 100644
index 000000000000..236af8564a81
--- /dev/null
+++ b/www-apps/drupal/drupal-8.6.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index ea15d91129f7..4284cd7455aa 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -3,8 +3,6 @@ AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064
 AUX gitea.initd-r1 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2ed8b624ed2776c7522455a469c00172ecbbe2151ccab476baa0c779baf8a39f63348bdc7ebbd29c2 SHA512 4a6bba463c9abafcb6fc9f3854efd1a69fb3b213c2b34ff6a233f90db535c2ab0f375a0809e4c4be6651ed60d7696a54148a5ee9192567d70ca6a5203a8d3266
 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
+DIST gitea-1.5.2.tar.gz 18866286 BLAKE2B a9a31fa6a310dcb6debd9399f234262214021d72adda52af959e6d9d692d5902ff6955a9802bf60212cecb2a0146c4905952d44643aa83e49c645d32541907c2 SHA512 ef91c881b3cb81d79d182b78c95624f24d63e21daa2d6e561fca79edba0ad588fae7c55503f900a8f05c566ed3bff92a9c4385fc7e5c701a80749d2a8c58b599
+EBUILD gitea-1.5.2.ebuild 1923 BLAKE2B 5267d3a75c41ba874b4db011de06ec14aa1356358104bb2d715b10d47ecd1e862ce1852ee04289842b00c99c4f22b307ee18db5d4b830d20231e358f8952f248 SHA512 d5601d742af950ae69e00f2800caea64196f34626eefeba9910cc049ce82265ce6a9572c52ae74b7a48fbf863fbdc6a05edeb10235f468c39d66039e6e8e89f3
 MISC metadata.xml 246 BLAKE2B 291057fd61e77f8d99f9518e3f709d79ab79ac5ac5ce1387d27a26cec6272698fe6bda7cfacaeb203411413ed003c71cdaead8316cd9e5a2c1ce1056637eaee4 SHA512 9af718c7e0ca960324b9fc168e85824099a5434a322d7da78dabc90b8cd3be2201a3eb321facd0df575fa1d0865c1f80280d290589f0ff1d27bdef575297abb7
diff --git a/www-apps/gitea/gitea-1.4.1.ebuild b/www-apps/gitea/gitea-1.4.1.ebuild
deleted file mode 100644
index 41abc1c912b1..000000000000
--- a/www-apps/gitea/gitea-1.4.1.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
-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/gitea/gitea-1.4.3.ebuild b/www-apps/gitea/gitea-1.4.3.ebuild
deleted file mode 100644
index 41abc1c912b1..000000000000
--- a/www-apps/gitea/gitea-1.4.3.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
-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/gitea/gitea-1.5.2.ebuild b/www-apps/gitea/gitea-1.5.2.ebuild
new file mode 100644
index 000000000000..49bba0eddfbc
--- /dev/null
+++ b/www-apps/gitea/gitea-1.5.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot systemd user
+
+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"
+
+DEPEND="
+	dev-go/go-bindata
+	sys-libs/pam
+"
+RDEPEND="
+	dev-vcs/git
+	sys-libs/pam
+"
+
+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="" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
+}
+
+src_install() {
+	diropts -m0750 -o git -g git
+	keepdir /var/log/gitea /var/lib/gitea /var/lib/gitea/data
+	pushd src/${EGO_PN} >/dev/null || die
+	dobin gitea
+	insinto /var/lib/gitea/conf
+	newins custom/conf/app.ini.sample app.ini.example
+	popd >/dev/null || die
+	newinitd "${FILESDIR}"/gitea.initd-r1 gitea
+	newconfd "${FILESDIR}"/gitea.confd 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/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 46c230fe42fe..5e2c40c59f65 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,8 +1,8 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-5.2.3.tar.gz 54301168 BLAKE2B 42d86f74179040f36860f49b687a210247bf55728502279c77bd58b934edfe0d42ad81e4e924de9a0db952c2158ff16bcab094d992c1913a244028ceafe60544 SHA512 c7c8ed116a72a41cc4c2c8abe2c47b77ebd071d2112c4a88f3a9e76a524f21ef97386b3fa1364776c3f715ce0def75428e113226b1ce288f81896e2bd1dfebb4
 DIST grafana-bin-5.2.4.tar.gz 54300847 BLAKE2B defb1b32fafe95c17ab4201665df053d8cb1cf7154a366d2b0bbf3936ffa4baf6f5a3ae3e5fe9fa96334fc0bfcc557106c38d4dcab5d5b5ca64b588726274034 SHA512 75c0ca8735ab0e8c2b340322cc5b0d5adec90a7159761cd9fa2c346a5a4e9fcceb904d160e55be2e4c9b5fa582356aa20430f9d4577e2df3195825d83de897d2
-EBUILD grafana-bin-5.2.3.ebuild 1746 BLAKE2B 913e4249c53721a7a5ac44f2047fa815b4a8900c67811b2b46677dd9afdea6ec5d352150acef9fd2d7459fb659a23afa455b836a1db68c55501cc1d7494eb5d8 SHA512 e3e61b3821699073253cc6cb6f6b910792e6e6e9bf8f256c6d1447dc689d47dc8e7c0ab098cebdf4af399cae1111b17fa82c439ca69952a65d52f6103229eaf3
+DIST grafana-bin-5.3.1.tar.gz 54595281 BLAKE2B a6feb32e885bb6ce89c168e51e2b2ef6fd33557b44e6ed5f23a3b724b67f7e3055234bb25a714cc515a89d0de6dd69ccfec92c5aeeed72865ce4f646b3a9bba5 SHA512 b439be6d031d24f046985cddce0ce2866efb808f9d107f305998ed042b6bc86f5fdb4482d31bb3da53e4f57d52ac61bd7448394410cd063e46f396f7506cd179
 EBUILD grafana-bin-5.2.4.ebuild 1780 BLAKE2B 603d8212864953f010df6846f9ab863a3a0256d912a0d53d4d5b0b1239c3d60252ae9a2781d210daddbaff0970095740f6cd900b6863aaa1cb38da9debf1b75c SHA512 0674a4fee1ae83ff36ca4506c534b7c02f2bc47e930f67ab76dd2ac9eae979022cb9d23a85c45c4ccc395ce3245125930878cf6513d61c65afed90dd233f034d
+EBUILD grafana-bin-5.3.1.ebuild 1743 BLAKE2B f9636d2f85fd3c96a88a915b0bb173bec3f2cb46db4c9434eb44840a6a93e0657f3b00542ccdffe82bf3f737338511249c76884c9dfd599f34182ead06889586 SHA512 d5612249b0f78b21ccfdea99b034ffc9697367c64cb6fbff5578ccca279d3c23e08c360965f71e038caf1b41dc2a8142ba4c0edc4db74cadb52dc28f24f3ab96
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.2.3.ebuild b/www-apps/grafana-bin/grafana-bin-5.2.3.ebuild
deleted file mode 100644
index c398e8e88585..000000000000
--- a/www-apps/grafana-bin/grafana-bin-5.2.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
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-QA_PRESTRIPPED=${QA_EXECSTACK}
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	elog "${PN} has built-in log rotation. Please see [log.file] section of"
-	elog "/etc/grafana/grafana.ini for related settings."
-	elog
-	elog "You may add your own custom configuration for app-admin/logrotate if you"
-	elog "wish to use external rotation of logs. In this case, you also need to make"
-	elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-5.3.1.ebuild b/www-apps/grafana-bin/grafana-bin-5.3.1.ebuild
new file mode 100644
index 000000000000..e918394e986d
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-5.3.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PRESTRIPPED=${QA_EXECSTACK}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 2f9c747e31e7..d97a87b80633 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,14 +1,20 @@
 AUX nextcloud-12.0.4-destroy_modal_when_closed.patch 786 BLAKE2B 24222dde0d9ed5f3c5fa31b7cd1b837f765837543475db235056dccff9fa17cce83a37b0ed64a1999a6b61dedd5857866debb1950686acf062e42d80bccb3813 SHA512 93297f991312c5fd2504267bb16a8c38797970fdf8d109d4c4b4416a5e72c8677141ebc9a13a2dadc40845348e07f264937dd852384f88d65be4f3cc4f0cb462
 DIST nextcloud-12.0.10.tar.bz2 45114548 BLAKE2B e993c617d27fea12ba95e4fa365c02ae6a6930ef944fcd1604862d4aca331291d1e738a846316f89947f466095b300fa53f652e1ac501440fe88512f8bf0b096 SHA512 10ec239f55e88f247bb52816c8c959b9e504c5a0ae428d0ff372866f72d900e6e9cf8dee43f24f906bebf2db4b4a9d2d8386447b838d834b24da404ee1e5849a
 DIST nextcloud-12.0.11.tar.bz2 45123785 BLAKE2B 3d1f9131ff89d348dd18c0f7de284b13563177b388729e6049909fa1be3ae3ccdd03a85094869a872e4eb18e210a7ef406b0813e2ec5a1804aaecd9df4cf770d SHA512 885daa98ce602c6b59adaf66eb2e10ac6f5c5b2a607b5ebb80b82ee08256fd77d12aa1dee4db463d42abdd169e4acad14ee793cdfbcfa5b466f25ca3fb6ffa79
+DIST nextcloud-12.0.12.tar.bz2 45164894 BLAKE2B b316a5e831148787569ac80b55c411a8ed59eae312c48badd0aeeadec9dd0c048194b8feeea720b1ad4f19eae906fd1e114299756351b4831af744a918bb7210 SHA512 fd47157dc8437718e2765ed3b0644fa1ecd76707ed8aab06648524fe42cbe8e1c66244d85cd6e48bc5babf4a4a4f684b2da7a29ad60fde7755988a474fdf55f4
 DIST nextcloud-13.0.5.tar.bz2 44792418 BLAKE2B 0582b36a078ccea7a2b482e8be213f0102fff2d60f0b92736d7c488498cf8ae4b75ea6a9e5c14cd0d71f2b3ad9d0ff9b6a2fba7b809bcc89e2287c7801e26a49 SHA512 5456f95d3835e0c9fcf015453e1f6e75ba6f5c0266d8951596fad7d3bf06230199a22e5869bc616581410db0ed831a5cdec123a9d2955898a837614a2bfff32c
 DIST nextcloud-13.0.6.tar.bz2 44769940 BLAKE2B e9c227d64a23dbd677326f528cc268842403c6d51514e8b0d5d446ca5e91fd49910777b6cc7d7bbf0e7f6e1c422fed390cd38506edde019dc5a1955d94757102 SHA512 cbecd5dc98c96f28cbefe6b25e51f4be4583004841eb38d32a3261ed01f906590e16053dd7d8e31589a2288eafd368a47e280d511ee8c994886b4ea892f535ff
+DIST nextcloud-13.0.7.tar.bz2 45085663 BLAKE2B 1d4f07310fd0b85981c8f45197b0c760e484db5eb47b347ce6d51b6e7729072a1ff13ed30739ee5b96a7456fab20d4f4ec5b3651e709aa466f305ca3ea374ca3 SHA512 511a4f35f03e9696806342781f4b8b7e2265a8209d9c8b01aa1b9f58a9ab55876e9feb90357816ff991d19a27862fe3009f0f081b5c2e971e919412eb4e71024
 DIST nextcloud-14.0.0.tar.bz2 49762528 BLAKE2B 4c5bbddda0d93504b3530ac0a69511b66faba5d64014a372cd411b9807ca931de484f0db74823534fe97ad5beee25d8c3a0eb001e25a208983b7f13545bd1af4 SHA512 8028f46a6b45834f411ff0942dfc41b72d41d356d01136c74c82fabe1247cd5e62e3b57a298b706a02eb27fabc03790a6ec6a8618b70f2016ae756cf8b523014
 DIST nextcloud-14.0.1.tar.bz2 49761953 BLAKE2B bd7886defeee82d28cbe28548a015cd64bac7d15a3f4d1a6c458f25b87d07370537c26a432c3abf32c574f6b202f15a2cd6a5f1fbbb40bd50b4bd94132154619 SHA512 2d74ac3806372f86020f586f33bde6e4b7694f6dca38a49eaba8955c2108b034e62042e4fa166b3b8e2ecf979c4130674408c4500c461637037a9d4a55fc5465
+DIST nextcloud-14.0.3.tar.bz2 49713609 BLAKE2B 0b87b899a273fc5a31b3e3e0451f2214e4377bec8671e9ca7022054d294820de4964053be950cf951b8c0d7a10f4958648164b3a76681ee2fc7aad7a902a1be7 SHA512 09f224d5e55496dcad4d743a0b62af407b4e1fece009fea19d87ac32672cec83bde135e25607236971af0ba32804cc5ebff9295472c276eb2898e21400c6e2c5
 EBUILD nextcloud-12.0.10.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
 EBUILD nextcloud-12.0.11.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
+EBUILD nextcloud-12.0.12.ebuild 1033 BLAKE2B e0d1fd02c8e6be0937378d98d72dd0e2ad42111a5fd7234b0767d29e1273c8442adb7bfb71125ea0992e9418ca0f898680e290ce023dbcab9d0aea5dc9676657 SHA512 d7d046780d5a02555f5c804eca9d3de0c96ae21d66f52022ecd0460516f9614f72626e6a3b1ad1535ebbfc234d57844669b55bec0144b14d2477551149888a7f
 EBUILD nextcloud-13.0.5.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
 EBUILD nextcloud-13.0.6.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
+EBUILD nextcloud-13.0.7.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
 EBUILD nextcloud-14.0.0.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
 EBUILD nextcloud-14.0.1.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
+EBUILD nextcloud-14.0.3.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-12.0.12.ebuild b/www-apps/nextcloud/nextcloud-12.0.12.ebuild
new file mode 100644
index 000000000000..5509a59a7522
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-12.0.12.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="<dev-lang/php-7.2[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	<virtual/httpd-php-7.2"
+
+PATCHES=( "${FILESDIR}"/${PN}-12.0.4-destroy_modal_when_closed.patch )
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-13.0.7.ebuild b/www-apps/nextcloud/nextcloud-13.0.7.ebuild
new file mode 100644
index 000000000000..b6bf2a09eba7
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-13.0.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-14.0.3.ebuild b/www-apps/nextcloud/nextcloud-14.0.3.ebuild
new file mode 100644
index 000000000000..b6bf2a09eba7
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-14.0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index a441f32e1243..085a88df1e42 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -2,13 +2,8 @@ AUX postinst-en.txt 1331 BLAKE2B 45313107abc05238160eeda67db0aab4917d18ee0e4d788
 AUX postupgrade-en.txt 665 BLAKE2B a504090cabc4d8645c31d1aecc7419059b84b8ba9a7b42331f53fe1953d3e5bb44ed0327411acbc711eb31a06e4bc83b7577d6d7d054ee74bfbccfadb58685ea SHA512 bc4684dff491d6140d7d97a1de6cc2773d5f834054bc3d8c122c5d6777f543a08f93e4142c50dcbda862d75ba5c19ffd49ca37876e57df4ee19869099a346a4f
 AUX tracd.confd 359 BLAKE2B 5bf14f9828f3eb22c39a27dd20da219032cc3157d45b16a54a0a6530923c694f7a424c08c09458fdf9e422a3819a7e30619a1c82966ac5aafa2355528e666e3f SHA512 38a961fe59b690eb91e20143aaea6aa1becda8c2afa103599d14ff86c7aae88f06b57b342302de1f067dac5d99024b9cc72896a84349e09b3ff40c9a20f97bb1
 AUX tracd.initd 823 BLAKE2B 4325de1322cda7885539859c2b2ea3d27acaf636bde728c50fcc4c769acec308e6b56d3449109171ce9bdd2bdda9f9364f93c7069debd0a0ecb1009ce0bbf29b SHA512 88a2c92fc1f947d794e68b158db1786cd9c2891de5d3d0d5b738e1245f35998e17741176ecd2a9562d21058f480668cfa61628c7a7b4bccf62e1373728db5be6
-DIST Trac-1.0.13.tar.gz 3671741 BLAKE2B d8b2783ed57fd696e09c2bf4a52c9d9eb6b37576cc1c478f2e6d0f0935e9bc8ca145b89136a9adfcd0fb840faef3e93d4310b110287a84b922f72c1a9d991aa6 SHA512 b4b2066482bdd6ba16183f2021bc069d1054177462726de1d844a28eccdc0b32405a0c510143f6ff84caaebebc571114e81cc0acc679ce94f8046b49d6854c1e
 DIST Trac-1.0.9.tar.gz 3642845 BLAKE2B de0a6fdfc59c5c3f1e795a7e0a006e724491d1d084c9fefcc35185a40430e06ed781c94cf9190d394b943064fd87a34a6fffea7f57c3d4b55b591a6aab5a83ad SHA512 af429db720049ab344ce3c3b430dcf0ab7530013f59ccd2334633de9babc3f31b14829b9b5aa48aa05f614ca72d1d557953c58bbfb93faae2267afeac72e6304
 DIST Trac-1.2.1.tar.gz 6212917 BLAKE2B 6445ec515b295d0fdd3a75e93da853d136f19083b6e87cbe9c856e2502d217c433bfd7f885d8ff45556882e8c99a7d6e966761027f72e32e675278ee83a67eb6 SHA512 0ee008ce0d890873eb6db7eca60e362760c4a4857dd74bda67c30e566dcb5bd64ccd6d5e7317da904e8dcfb7d4a017004d3bb794dd405936c94803b2fcc4829f
-DIST Trac-1.2.tar.gz 3821867 BLAKE2B 0ba6da89dc6cf015f2dc912c54a5df6d93e676e42a31dd269ec8a0a4aba88065c931d30a3e4dfed23b6d66f85f22f8b989fda7a20db115cdf8a5e6c5038d4b99 SHA512 0655723a6727df389d66bb9c752436a81c820750659e5bf7a64485c4362fa1b1c1cb6dcdaa9936003838ce5874b20bbc5a8d8fc1034b96ff31b3bbc6f7fca105
-EBUILD trac-1.0.13.ebuild 2946 BLAKE2B 2767696f5d5c17dcdc0c3e35a00561aba863d7e3295b68874f2f9cf0bf7ed4f8c1427d478a7fafb7d2708de9fe43036c80948dcbd28db7930a9dc9bfd1b863aa SHA512 7be6a5a617d94fabba4822a113a6554437c8b7242c229086c9293fd6bb5cbda779c6da387629b7bbb9f81524e6721e7c45077e5e490e6821d2f70dd43581f240
-EBUILD trac-1.0.9.ebuild 2943 BLAKE2B d35f571c95a943b1a2ea99076f10dbf193c3af3b17a9d77863d709c04b2698fe04b35ada3e55e799dcacf18d0d9a8fc574cb6d640d8737d340ae3517a3157cc8 SHA512 5b0f08cd832101090c008916184a4d2ba12705383767f716581f9b7089158435515287e510aaf3ceb01d91d62ee45930aa56adb8190a3a0faf4975eb36a91acb
-EBUILD trac-1.2-r1.ebuild 2620 BLAKE2B a0cfca1d272203ce69a889d85430ddec36df6f4c9cf37b808f2e87be042ee339ff0cb700b10fa29d86e486e57318f0a9c298339fa237a13f05efea521163f629 SHA512 199801b1ed91d23f83c6e94f822ab1eb1fb1d9ec2eae5818d551c66ea19aad2cb6b94516a20a68a7cfc28f9a87ee5a6528a587b12ff7ce7809fdd0eae3aadf78
-EBUILD trac-1.2.1.ebuild 2620 BLAKE2B 7e8e9b103f7c08e05b5229bd874bc18460904693ce5f0799c0cc74f8c67a5b17dff4321300093fef8f263d5da78231cca5219ecd40989782ea02fe9274722b21 SHA512 8daa40075cf5f2ae457ecc48ffe128f179ef1fc811ef1b817ffb85b110aad9e4993959bec5f38c02c877b664249a711756def1f0dc46b6342ada69b950452b79
-EBUILD trac-1.2.ebuild 2946 BLAKE2B 2767696f5d5c17dcdc0c3e35a00561aba863d7e3295b68874f2f9cf0bf7ed4f8c1427d478a7fafb7d2708de9fe43036c80948dcbd28db7930a9dc9bfd1b863aa SHA512 7be6a5a617d94fabba4822a113a6554437c8b7242c229086c9293fd6bb5cbda779c6da387629b7bbb9f81524e6721e7c45077e5e490e6821d2f70dd43581f240
+EBUILD trac-1.0.9.ebuild 2868 BLAKE2B b0f9fd97c94dc4a2752a54401c10acd5f1bdf625fde169da91344df992ba1affc0aaa8d73951928673cc33e3c41c82153a8312d763fc038c102c64073809df32 SHA512 158b1b2a4ca52d503b1ab4eaac23f2d600ece7b6d43687ed99b7fc2c22fe2caa6c82446c5d855c7cb3a9f326968af46c27815f2e055d01294525654208e1d41b
+EBUILD trac-1.2.1.ebuild 2545 BLAKE2B b228bf1ee59360014fe0ea05ddf6ab984f23457fcc68b8eec0e4101a9ae742b8f54288351bc922ba8c8c4ef375417c9eb96d4a9f273b06fcc0116fa8440c7230 SHA512 1090c83e12026709d670514692c5504fe6b1f47debba05e84fcb2dfca59bfb6b87b14f5c5cdb247a8ef97b28a3b7c616dafb0bd33870148bc3d6dafa5fbdd438
 MISC metadata.xml 506 BLAKE2B 4b408bc9a05c2bddccf9c733ea9f58c6f2be64f3dc8b04f4a3f3330b3ac21157f3468144a62f6473c253e8e8019c759a3d2bfbd1ad36633c3097bc061b88a8b4 SHA512 06c8b9589b20dfa824822b3129d7f62bc2aaad12f37b16e735604469a94ed51c6c8b57cce53efb1e81d748bae56ae90d74837d60667a4826ac53044e2afdf048
diff --git a/www-apps/trac/trac-1.0.13.ebuild b/www-apps/trac/trac-1.0.13.ebuild
deleted file mode 100644
index 14de0469b9b1..000000000000
--- a/www-apps/trac/trac-1.0.13.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
-		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	cgi? ( virtual/httpd-cgi )
-	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-python_install() {
-	if use cgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.cgi
-	fi
-	if use fastcgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.fcgi
-	fi
-	distutils-r1_python_install
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
diff --git a/www-apps/trac/trac-1.0.9.ebuild b/www-apps/trac/trac-1.0.9.ebuild
index 9c5c03009742..4246afbb2b2f 100644
--- a/www-apps/trac/trac-1.0.9.ebuild
+++ b/www-apps/trac/trac-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
@@ -44,15 +44,13 @@ RDEPEND="
 	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
 	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
 	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+# Tests depend on twill, a broken package
+RESTRICT="test"
+
 WEBAPP_MANUAL_SLOT="yes"
 
 pkg_setup() {
diff --git a/www-apps/trac/trac-1.2-r1.ebuild b/www-apps/trac/trac-1.2-r1.ebuild
deleted file mode 100644
index 5ca86ea808b0..000000000000
--- a/www-apps/trac/trac-1.2-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
-		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
diff --git a/www-apps/trac/trac-1.2.1.ebuild b/www-apps/trac/trac-1.2.1.ebuild
index 74a2d85d5fd7..b8da6df8dbc2 100644
--- a/www-apps/trac/trac-1.2.1.ebuild
+++ b/www-apps/trac/trac-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
@@ -42,15 +42,13 @@ RDEPEND="
 	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
 	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
 	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+# Tests depend on twill, a broken package
+RESTRICT="test"
+
 WEBAPP_MANUAL_SLOT="yes"
 
 pkg_setup() {
diff --git a/www-apps/trac/trac-1.2.ebuild b/www-apps/trac/trac-1.2.ebuild
deleted file mode 100644
index 14de0469b9b1..000000000000
--- a/www-apps/trac/trac-1.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
-		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	cgi? ( virtual/httpd-cgi )
-	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-python_install() {
-	if use cgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.cgi
-	fi
-	if use fastcgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.fcgi
-	fi
-	distutils-r1_python_install
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 92fe4e7d6a8a..ce1d81ded805 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index cf6467792a76..893df35ac66f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,7 +1,10 @@
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
+AUX chromium-ceil-r0.patch 2820 BLAKE2B 378779130d0fcfb929eff886feb699ec0b73e32cccc779048cf1dcdcfa7067a9aab66a4188917b095da8810e95c0097bb0154b67f2fef8a1584b03011c7517b1 SHA512 80abc53eebd5bbd5ee6b66f1d311ad47c2fa7fc3e39682843ec974b4f3dbb6012c7c053aa9f01fb3ffceecc92f964cdd3bd3b233c12f927a720c03610b0e7d3c
 AUX chromium-compiler-r4.patch 5640 BLAKE2B 2fe93975237f112bb280bd5b51f48e0e8454d11a91b81ce2ae0520fb59ff2c00498319e202e34f4c2abb1330ba2c7dbe9dd1a75bfd578453da533531b7dfaf8e SHA512 34e32d9e46a5981b021cffee3440582ef312e78ec1bf287c6d0f14f5ff7921a5b229238394259b8df5aa081360dd76aa6d7db095ed4e1841479d8fe55cde9fe8
 AUX chromium-compiler-r5.patch 5577 BLAKE2B 622f89f30ce182805198cf9162b867cadc72bf480a64b043772f3a525ad65beca429d3b7f6bb225cd22857d0335ed2e9a7cb72659c0c90d1a49daefeea0e7d72 SHA512 ed66baa3db6d31c9f5bfaab0fba82ff97a10fa009724d3a11db448e93c8e37ae0ba96b22476b41981da94a65d568866a0756a72b3a92cc385f8a54485612cc71
+AUX chromium-compiler-r6.patch 5675 BLAKE2B 94b38e63deae80aa5f98edf60d35d2c49d57b84feda2944b363a8a230f1282e6da1c7175383bad8ccb7e272a88532fa9a718b824edfb1d52902490abc3b832e9 SHA512 455f7d1e5eed767c7917cd8cac842c51447f05d51110da5f3509fc21870e3bc1775029cb90c39b0522ac16b239565ba5e19fe0513e609128eb59a1759a0de6cd
 AUX chromium-ffmpeg-ebp-r1.patch 553 BLAKE2B 2f9799b38436f37ed7f7de06d6f7692bcadcacc0269169cc75e48f52ad6eb1c5af54891249eecf1bd5e10efad3888dc650326b53878ad1d9360d6304b12d51ed SHA512 27d929756707b964465c2cc1b586b118ffd67b3fec84e1c6606c2d4141a6717741cbc1ebf5b4c3b40f9476220610a1ada6e80b342506c4f9d2ccbe7e067191ba
+AUX chromium-harfbuzz-r0.patch 4173 BLAKE2B 5c74627b52d004a6b108c69a87ecf7472a7d1c213cba3801d28e83806df5604de55831ac348561a3cd9471b3b3a69c6e08a2b1271b980478c1b815f14435c575 SHA512 174b1fbaec1b8a88f41a06855f0475ca18f40ee5c0a9ac8a9223c7d06fcc1173f36c85d90a332dbf48bd315bf646ca1d4943d351ba510f3045500264e82c037c
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
 AUX chromium-math.h-r0.patch 1092 BLAKE2B abdef69cacaa5af0cd84b293b300fa5db631b7df8d4f1237449e858dc3ff56589a3f46d8228fc0c969552f41bd9cf2a0c2cbf4a1936c2729f701aa1d4ad86b94 SHA512 91a0d74ec51a6776bfc4212a132963fbc4688c47ee1da40cfbebf696ef26a766f5189cb0a972ef2cf4338daa5355ce79002d624b5f30a7c2de36e40b07355f8d
 AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e439c6a23e2f27844c308984a2066a70913669b3e1797233f86e25a119e494156c0b869eccc94d21c2abaeadba4 SHA512 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a
@@ -9,15 +12,13 @@ AUX chromium-pdfium-stdlib-r0.patch 986 BLAKE2B 58dadfcf17149382890e168cbfffefd2
 AUX chromium-stdint.patch 623 BLAKE2B a4bc24a472bef266cc8e67fde8249b17dcd407fd86e6f614f24bb5acb18426b620b7b5e8e4d392940cab3474e8e8ee9633c61a99853f6316c77417ff78f1c034 SHA512 adfd265ecb2326f221eae07f910b7217f5bccf6be4ba750069bc05d7ae458f3b32ae825782d032299330e7c29a93a76fc732c5f5865669ea5eecbe167e04133a
 AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051
 AUX chromium-widevine-r2.patch 1488 BLAKE2B fc4dc6ce40b2d2a152a0bbc5958d8050d9a7f4176cd0121d81ae1a9e76d361c064f54e034fb9213fc802e0a4b1b8d661788dbe9089daf8b197414724a057d4e4 SHA512 6fe8eb7b0e6c88e00d1b3dadf433b886c71cbf9b3dd4e712845a636a689cad6bc58fa8b20b412a1f7a8a1b649bccc8c961e762fa5f4d4ae092355e70db0a9cfe
+AUX chromium-widevine-r3.patch 854 BLAKE2B 27c0366bc9a7a38024a4ad6a1ee2f4730443984ea70fc1b248147f18f3f73bf87fc4c0231c071fd712f2b9cedc17126f53d8f95c96dd608d7281404222558e08 SHA512 997199a748fa8e9f552f6238364cd2430675a6eee915f76454c0d5eab01eb089d14f8ab5fa78eb37acfa1fba527e206320ba9a3ea13bdab39a5d001238df8c91
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-69.0.3497.100.tar.xz 617374764 BLAKE2B 45805e7a743982c167974cbe223b126dad83cca2eca6c78b6fe707431b2df45cb30271c0ee5002839c84f661260063852a1e1a913d26a073a87fb20e7b4d964e SHA512 bc9dd4a63eb9a8c369bd360f7fd0fb9b72addfa553e9a9d8adbfafe7ec4af39ec1fb3dd6523af1f17cb141aaf017ca4b6abc357c4a595ff627e88c58e87e8f6f
-DIST chromium-70.0.3538.22.tar.xz 622935696 BLAKE2B d2eb7f72aa9967d2620a705549c13d081aa5b011d47536ca3e1aa77989a9723a6187dab0d0c31c6f4e50469b05960411c8635c24cc9e58a5ed2651c5affb13d9 SHA512 5af260a217734965e4475211646a992b0c568e81610f552c13773082055ee7cc3356f9d60b85abc118e7d7866c903ddc6f4e64d1f0c4126cba19d886dc79b189
-DIST chromium-70.0.3538.35.tar.xz 622959384 BLAKE2B 1b32897a08a63e6e1a4bcabef97d5b92a568632014b1c197ae76da6f1a6fb76f0ef93b50d41556d27943c72e8b7cefd36249cdd08204992abb54742c63b4c00f SHA512 e4539ab964d95cc56c5c7d963787207b5e2c50a8aa12ac5e6d1e71f35be3adf60881b63f4c189c53f3f80bc69779556d61365afa2d8db43dba4a7bbd781591d9
-DIST chromium-71.0.3554.4.tar.xz 626667348 BLAKE2B 4cdbd7041fd087c860bfc5c731073713ac01059fa388de10684058a81178d007e6fe2ad2bf6ce58a44b5489b24ded1a29862f98dd8f9ec8484e5e0d9d7a2e38e SHA512 ad4c6bc8ab857bf1a928b959129f5b64c1333f109cc7a5482f3bea3cab070faee85e41128acc4d9e479a312dd66ec201cf115e2dd8e35587f1bdd95ff78dfd18
-DIST chromium-71.0.3559.6.tar.xz 626881656 BLAKE2B 4712e7bb9c7018ed4ace7f8d7d7c313e26c6a156c937084f5553e18bd38edd98536b09e867718ed1e9e561c3f39ddc6de4802b780e33d72f1329f636fa356250 SHA512 12ba43ee94aa185d13035c01755b0166082fe4831f1787e755de11a9b6121c0384eb04352f0582659a23908acc4544db359a30e0f22715d69f357c8a1baa3aac
-EBUILD chromium-69.0.3497.100.ebuild 20419 BLAKE2B 9620d0135e88331bba1d3c68633f299a721bae31358845689512cebb07f6d6ef36ce49a046970df97e6c22c8532b43ea1be0de597dc8f82f86625252a41c0ae6 SHA512 fb0a20c0e36d2652f827ae92f76144ce0bc32fce4f54e38796d3db166175f9e1cc31ba73efd88e7fed9e3912a3e9e9a6d48bbf75fec8dae37f3e061d8f28c72a
-EBUILD chromium-70.0.3538.22.ebuild 21072 BLAKE2B a4e1808cee6b4eb5f35064e2e3665c88d9d6b1be880dc74d13246777188b188c3b1132a441474af3f5b667103d73743ccf6ebd18d63fbc95dad59230978e92c6 SHA512 454863e19a715238563d332d8102089db00f2583b4f6cf72fd48c560ef091c3ee0ca34a4a81a83ec57698f040a863c7c85cb6502f8abecefb36b4f8e1c819792
-EBUILD chromium-70.0.3538.35.ebuild 21072 BLAKE2B a4e1808cee6b4eb5f35064e2e3665c88d9d6b1be880dc74d13246777188b188c3b1132a441474af3f5b667103d73743ccf6ebd18d63fbc95dad59230978e92c6 SHA512 454863e19a715238563d332d8102089db00f2583b4f6cf72fd48c560ef091c3ee0ca34a4a81a83ec57698f040a863c7c85cb6502f8abecefb36b4f8e1c819792
-EBUILD chromium-71.0.3554.4.ebuild 20967 BLAKE2B 0177de325dd03e94507e791f50cea58226a0a94e07c665cbed1ae838225ea68e9a20ec8d5d62b3cff7fdb71e2389e3c0a7ca0e8e393ecac8fd3933c557d39eab SHA512 7d1603753e61ecc073fef073a1506a4e57963ab156d0267013a6f2e0f3b9559d4c7296a299489667f23419a5ee5cf2455366e6dbbcf8876204a3ced7fabc3c78
-EBUILD chromium-71.0.3559.6.ebuild 21303 BLAKE2B 4d25ed2f3e2395619fbc6813d6a1b777f087f3587046e05d6ba41072156985dbd0b95259933c1ba907494a0f1bf9345467e1d2eb492d929fade6ebaae0437993 SHA512 ef2bc25cf4b1f9986705ac0d488758ea3ee7bcddd8492583b4b0abab1608b89f63275ec6cbe830d599fde0e257ad2cdf655040011ddec3c1ed2767b0847bda5d
+DIST chromium-70.0.3538.67.tar.xz 623057648 BLAKE2B fd6667d8ca82721ca4cb70b39f66c88f1e10f82a5f9b8beadabd56882f9e4e32e249b25f4484a323f8efc9d940f2afb1c73b76cea0803ce18c138adfc8bdc3c0 SHA512 923dd574dce15627678d1601d34e37285ac438bb61ee252ecd15bdec3e5f76066897848addeedd3c61f2c5e550a284d14e0af3d02ae5666c9f6eb047c9d4441f
+DIST chromium-71.0.3573.0.tar.xz 626729588 BLAKE2B 5fc5b030f8bfef2721234026ba5411896795132592db2c4732f98b08d74b31ed2fe9b59efc78754b5f72d5908f1d5ccb1054abdead51c53235c1118fa91b2cbf SHA512 27a8dd60dc319b33d954440b1e8aac382a4fe6afaca88e63175b72c6040c5bb5653d01ecabd8e8ebd99d954781299fa3bf44518c0fc396d9d56a97bdb1291503
+DIST chromium-71.0.3578.10.tar.xz 633514144 BLAKE2B 6a90e46378d2ffe97a1ab6a104f0e6bc5332750d18116ee78ad7200192260aad5ee0fcee917e6c6d065aa227eb2b5e84f392e96a6b8ec18d8bbe805a5f371594 SHA512 b17db9c3fac5f96d59bdc11faaa4664d977293eabb9d74120c2af961af8c866aaa5f017ce3a2629bcf189bbeb2e7e2d9c7d6ca9716ff361e3cfe648f0b802f1e
+EBUILD chromium-70.0.3538.67-r1.ebuild 21247 BLAKE2B 3681307167370a38aa663fcb5b8ea6bc968410f2279a7ab4eb1fcea6ddf27f781efdb9580a71f2ad03c89a092dd499f2e98bf35fcb69c5702bc18a2b44e748bf SHA512 0497ba8ac3bf278b597b07a0f2bd45d2f7e9cf62936855f388b05d2bbfe690d7e05d32abbc6bdbf2d467085b1669d1e085ccaed940eee52629bece2639bbb387
+EBUILD chromium-70.0.3538.67.ebuild 21234 BLAKE2B 02f36d673b2ddb2096a61b918127cdd2cde4d0fc3bb1543fa08d4b37537052282dc16831b857e0d6867260e32400fa14f14567895fbdecd2ad1691fbb7872316 SHA512 740627027e9f0ba5430c3f22a7560b2e6a40c07fe1429c62d2399b41e425ec0886450b61baf1521a83900cbdfe20bbc9f01733d8c741699b0028ab96513f46b7
+EBUILD chromium-71.0.3573.0.ebuild 21367 BLAKE2B b8eb58c08a386d90bbede8f61dd80e1eb7cbbdaacbfad45ad4c35482a7221cf42a44bd6999b0e44df81eeb5af6f13df2028fde1c2fdc084fa1d37153fa204113 SHA512 c20a74d4f5a75067ad5f560d8fec3e41326335e9dd8cbcca28a542d30e29f2d4e9cf8419f2941bcd25e807300d95a35268380443003a5f2fd9ca0b9d33d08672
+EBUILD chromium-71.0.3578.10.ebuild 21394 BLAKE2B 30db4490a0b8e755ae1e36be21607592456087b2accd3999b8bc0853307b1ce3def34a58f761b56d8f80d48d3e5b87bdef4bbb6343e2cef619443bce85b40dc0 SHA512 a9a65247ce68f391d00099b08d0b0b22ac97473def56b067227918a7226dcec032b200bc27a5b80fcf8ba7f0a33a95c14c98868d93e3ea88528893c69e27a51f
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-69.0.3497.100.ebuild b/www-client/chromium/chromium-69.0.3497.100.ebuild
deleted file mode 100644
index 9b12bab541e7..000000000000
--- a/www-client/chromium/chromium-69.0.3497.100.ebuild
+++ /dev/null
@@ -1,681 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs 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
-	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/gn
-	>=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
-"
-
-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/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/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/antlr4
-		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
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# 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/chromium-70.0.3538.22.ebuild b/www-client/chromium/chromium-70.0.3538.22.ebuild
deleted file mode 100644
index 536322cbe16a..000000000000
--- a/www-client/chromium/chromium-70.0.3538.22.ebuild
+++ /dev/null
@@ -1,695 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.8.8:=[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
-	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/gn
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[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-pdfium-stdlib-r0.patch"
-)
-
-pre_build_checks() {
-	#if [[ ${MERGE_TYPE} != binary ]]; then
-	#	local -x CPP="$(tc-getCXX) -E"
-	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-	#		# bugs: #601654
-	#		die "At least clang 3.9.1 is required"
-	#	fi
-	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
-	#		# bugs: #535730, #525374, #518668, #600288, #627356
-	#		die "At least gcc 5.0 is required"
-	#	fi
-	#fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		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
-		net/third_party/uri_template
-		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/common_audio/third_party/spl_sqrt_floor
-		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
-		v8/third_party/v8
-
-		# 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
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Work around broken deps
-	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom.h
-	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom-shared.h
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-70.0.3538.35.ebuild b/www-client/chromium/chromium-70.0.3538.35.ebuild
deleted file mode 100644
index 536322cbe16a..000000000000
--- a/www-client/chromium/chromium-70.0.3538.35.ebuild
+++ /dev/null
@@ -1,695 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.8.8:=[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
-	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/gn
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[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-pdfium-stdlib-r0.patch"
-)
-
-pre_build_checks() {
-	#if [[ ${MERGE_TYPE} != binary ]]; then
-	#	local -x CPP="$(tc-getCXX) -E"
-	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-	#		# bugs: #601654
-	#		die "At least clang 3.9.1 is required"
-	#	fi
-	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
-	#		# bugs: #535730, #525374, #518668, #600288, #627356
-	#		die "At least gcc 5.0 is required"
-	#	fi
-	#fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		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
-		net/third_party/uri_template
-		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/common_audio/third_party/spl_sqrt_floor
-		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
-		v8/third_party/v8
-
-		# 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
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Work around broken deps
-	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom.h
-	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom-shared.h
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-70.0.3538.67-r1.ebuild b/www-client/chromium/chromium-70.0.3538.67-r1.ebuild
new file mode 100644
index 000000000000..6d86b451b471
--- /dev/null
+++ b/www-client/chromium/chromium-70.0.3538.67-r1.ebuild
@@ -0,0 +1,701 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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-2.0.0: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
+	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/gn
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+"
+
+: ${CHROMIUM_FORCE_CLANG=yes}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	DEPEND+=" >=sys-devel/clang-5"
+fi
+
+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-pdfium-stdlib-r0.patch"
+	"${FILESDIR}/chromium-harfbuzz-r0.patch"
+)
+
+pre_build_checks() {
+	#if [[ ${MERGE_TYPE} != binary ]]; then
+	#	local -x CPP="$(tc-getCXX) -E"
+	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+	#		# bugs: #601654
+	#		die "At least clang 3.9.1 is required"
+	#	fi
+	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+	#		# bugs: #535730, #525374, #518668, #600288, #627356
+	#		die "At least gcc 5.0 is required"
+	#	fi
+	#fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		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
+		net/third_party/uri_template
+		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/common_audio/third_party/spl_sqrt_floor
+		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
+		v8/third_party/v8
+
+		# 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 [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! 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
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Work around broken deps
+	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom.h
+	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom-shared.h
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-70.0.3538.67.ebuild b/www-client/chromium/chromium-70.0.3538.67.ebuild
new file mode 100644
index 000000000000..5bcc26022156
--- /dev/null
+++ b/www-client/chromium/chromium-70.0.3538.67.ebuild
@@ -0,0 +1,701 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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.8.8:0=[icu(-)]
+	<media-libs/harfbuzz-2.0.0:0
+	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
+	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/gn
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+"
+
+: ${CHROMIUM_FORCE_CLANG=yes}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	DEPEND+=" >=sys-devel/clang-5"
+fi
+
+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-pdfium-stdlib-r0.patch"
+)
+
+pre_build_checks() {
+	#if [[ ${MERGE_TYPE} != binary ]]; then
+	#	local -x CPP="$(tc-getCXX) -E"
+	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+	#		# bugs: #601654
+	#		die "At least clang 3.9.1 is required"
+	#	fi
+	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+	#		# bugs: #535730, #525374, #518668, #600288, #627356
+	#		die "At least gcc 5.0 is required"
+	#	fi
+	#fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		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
+		net/third_party/uri_template
+		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/common_audio/third_party/spl_sqrt_floor
+		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
+		v8/third_party/v8
+
+		# 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 [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! 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
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Work around broken deps
+	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom.h
+	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom-shared.h
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-71.0.3554.4.ebuild b/www-client/chromium/chromium-71.0.3554.4.ebuild
deleted file mode 100644
index d01d061f6aba..000000000000
--- a/www-client/chromium/chromium-71.0.3554.4.ebuild
+++ /dev/null
@@ -1,693 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.8.8:=[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
-	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/gn
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[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"
-)
-
-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
-		net/third_party/uri_template
-		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/common_audio/third_party/spl_sqrt_floor
-		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
-		v8/third_party/v8
-
-		# 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
-
-	# Work around broken deps
-	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# 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/chromium-71.0.3559.6.ebuild b/www-client/chromium/chromium-71.0.3559.6.ebuild
deleted file mode 100644
index 71d7284a09c2..000000000000
--- a/www-client/chromium/chromium-71.0.3559.6.ebuild
+++ /dev/null
@@ -1,702 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 desktop 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.8.8:=[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
-	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}
-"
-BDEPEND="
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-util/gn
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-"
-
-: ${CHROMIUM_FORCE_CLANG=yes}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-5"
-fi
-
-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-r5.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"
-)
-
-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"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	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
-		net/third_party/uri_template
-		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/common_audio/third_party/spl_sqrt_floor
-		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
-		v8/third_party/v8
-
-		# 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 [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! 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
-
-	# Work around broken deps
-	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# 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_postrm() {
-	if type gtk-update-icon-cache &>/dev/null; then
-		ebegin "Updating GTK icon cache"
-		gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
-		eend $?
-	fi
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	if type gtk-update-icon-cache &>/dev/null; then
-		ebegin "Updating GTK icon cache"
-		gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
-		eend $?
-	fi
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-71.0.3573.0.ebuild b/www-client/chromium/chromium-71.0.3573.0.ebuild
new file mode 100644
index 000000000000..4b58a52df69d
--- /dev/null
+++ b/www-client/chromium/chromium-71.0.3573.0.ebuild
@@ -0,0 +1,704 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 desktop 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.8.8:=[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
+	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}
+"
+BDEPEND="
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-util/gn
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+"
+
+: ${CHROMIUM_FORCE_CLANG=yes}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-5"
+fi
+
+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-r6.patch"
+	"${FILESDIR}/chromium-widevine-r3.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-ceil-r0.patch"
+)
+
+pre_build_checks() {
+	#if [[ ${MERGE_TYPE} != binary ]]; then
+	#	local -x CPP="$(tc-getCXX) -E"
+	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+	#		# bugs: #601654
+	#		die "At least clang 3.9.1 is required"
+	#	fi
+	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+	#		# bugs: #535730, #525374, #518668, #600288, #627356
+	#		die "At least gcc 5.0 is required"
+	#	fi
+	#fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	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
+		net/third_party/uri_template
+		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
+		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/common_audio/third_party/spl_sqrt_floor
+		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
+		v8/third_party/v8
+
+		# 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 [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! 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
+
+	# Work around broken deps
+	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# 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_postrm() {
+	if type gtk-update-icon-cache &>/dev/null; then
+		ebegin "Updating GTK icon cache"
+		gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
+		eend $?
+	fi
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	if type gtk-update-icon-cache &>/dev/null; then
+		ebegin "Updating GTK icon cache"
+		gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
+		eend $?
+	fi
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-71.0.3578.10.ebuild b/www-client/chromium/chromium-71.0.3578.10.ebuild
new file mode 100644
index 000000000000..849cee3f284b
--- /dev/null
+++ b/www-client/chromium/chromium-71.0.3578.10.ebuild
@@ -0,0 +1,705 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 desktop 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-2.0.0: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
+	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}
+"
+BDEPEND="
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-util/gn
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+"
+
+: ${CHROMIUM_FORCE_CLANG=yes}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-5"
+fi
+
+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-r6.patch"
+	"${FILESDIR}/chromium-widevine-r3.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-harfbuzz-r0.patch"
+)
+
+pre_build_checks() {
+	#if [[ ${MERGE_TYPE} != binary ]]; then
+	#	local -x CPP="$(tc-getCXX) -E"
+	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+	#		# bugs: #601654
+	#		die "At least clang 3.9.1 is required"
+	#	fi
+	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+	#		# bugs: #535730, #525374, #518668, #600288, #627356
+	#		die "At least gcc 5.0 is required"
+	#	fi
+	#fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	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
+		net/third_party/uri_template
+		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/jsoncpp
+		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
+		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/common_audio/third_party/spl_sqrt_floor
+		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
+		v8/third_party/v8
+
+		# 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 [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! 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
+
+	# Work around broken deps
+	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# 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_postrm() {
+	if type gtk-update-icon-cache &>/dev/null; then
+		ebegin "Updating GTK icon cache"
+		gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
+		eend $?
+	fi
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	if type gtk-update-icon-cache &>/dev/null; then
+		ebegin "Updating GTK icon cache"
+		gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
+		eend $?
+	fi
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-ceil-r0.patch b/www-client/chromium/files/chromium-ceil-r0.patch
new file mode 100644
index 000000000000..9e7f2a7392e9
--- /dev/null
+++ b/www-client/chromium/files/chromium-ceil-r0.patch
@@ -0,0 +1,59 @@
+From cc843eb64f6599d9ede176f711fe6355015c30b1 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Mon, 8 Oct 2018 22:33:38 +0000
+Subject: [PATCH] PictureLayerImpl: Use ceil() instead of ceilf()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ceilf() is only formally mentioned in C++17, even though previous versions
+of the standard say <cmath> should have the same contents as C's math.h.
+
+libstdc++ does not ship ceilf() in its cmath, but the ceil(float) overload
+that _is_ in the standard is available everywhere, so use that instead.
+
+This fixes the build with libstdc++ after 77b67445ba ("Elements with fixed
+bottom and top stick to top"):
+
+    ../../cc/layers/picture_layer_impl.cc: In member function ‘void cc::PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace()’:
+    ../../cc/layers/picture_layer_impl.cc:738:16: error: ‘ceilf’ is not a member of ‘std’
+               std::ceilf(-total_controls_height * hidden_ratio));  // bottom
+                    ^~~~~
+    ../../cc/layers/picture_layer_impl.cc:738:16: note: suggested alternative: ‘ceil’
+               std::ceilf(-total_controls_height * hidden_ratio));  // bottom
+                    ^~~~~
+                    ceil
+
+Bug: 819294
+Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
+Change-Id: Ida69eb3127ca132e7090c9aad0dd17dc314b6992
+Reviewed-on: https://chromium-review.googlesource.com/c/1264537
+Commit-Queue: David Bokan <bokan@chromium.org>
+Reviewed-by: David Bokan <bokan@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#597709}
+---
+ cc/layers/picture_layer_impl.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
+index 937255884a6e..020bcee55201 100644
+--- a/cc/layers/picture_layer_impl.cc
++++ b/cc/layers/picture_layer_impl.cc
+@@ -727,10 +727,10 @@ void PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace() {
+           1.f - layer_tree_impl()->CurrentBrowserControlsShownRatio();
+ 
+       viewport_rect_for_tile_priority_in_content_space_.Inset(
+-          0,                                                   // left
+-          0,                                                   // top,
+-          0,                                                   // right,
+-          std::ceilf(-total_controls_height * hidden_ratio));  // bottom
++          0,                                                  // left
++          0,                                                  // top,
++          0,                                                  // right,
++          std::ceil(-total_controls_height * hidden_ratio));  // bottom
+     }
+   }
+ }
+-- 
+2.19.1
+
diff --git a/www-client/chromium/files/chromium-compiler-r6.patch b/www-client/chromium/files/chromium-compiler-r6.patch
new file mode 100644
index 000000000000..db8d04649fdc
--- /dev/null
+++ b/www-client/chromium/files/chromium-compiler-r6.patch
@@ -0,0 +1,170 @@
+From cec10e55fdb150b33342ad462907fb6202de364e 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 | 63 ++++++++++------------------------
+ 1 file changed, 18 insertions(+), 45 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 0f7a6b48f7b2..c91b702147d4 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -236,8 +236,6 @@ config("compiler") {
+ 
+   configs += [
+     # See the definitions below.
+-    ":clang_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+   ]
+ 
+@@ -502,17 +500,6 @@ config("compiler") {
+     }
+   }
+ 
+-  if (is_clang && !is_nacl && !use_xcode_clang) {
+-    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.
+@@ -1498,13 +1485,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",
+-
+-          # TODO(hans): https://crbug.com/890307
+-          "-Wno-defaulted-function-deleted",
+         ]
+       }
+     }
+@@ -1546,22 +1526,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) {
+       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
+       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
+@@ -1931,7 +1895,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) {
+@@ -1965,7 +1930,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.
+@@ -1988,7 +1954,8 @@ config("optimize_no_wpo") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+   if (is_win) {
+     cflags = [
+       "/Od",  # Disable optimization.
+@@ -2012,7 +1979,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:
+@@ -2059,7 +2027,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:
+@@ -2097,7 +2066,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" ]
+@@ -2183,7 +2153,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.
+@@ -2281,7 +2252,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 = []
+@@ -2321,7 +2293,8 @@ config("minimal_symbols") {
+ }
+ 
+ # No symbols.
+-config("no_symbols") {
++config("no_symbols") { }
++config("xno_symbols") {
+   if (!is_win) {
+     cflags = [ "-g0" ]
+     asmflags = cflags
+-- 
+2.19.1
+
diff --git a/www-client/chromium/files/chromium-harfbuzz-r0.patch b/www-client/chromium/files/chromium-harfbuzz-r0.patch
new file mode 100644
index 000000000000..2d5602de280d
--- /dev/null
+++ b/www-client/chromium/files/chromium-harfbuzz-r0.patch
@@ -0,0 +1,80 @@
+From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster@gmail.com>
+Date: Sun, 21 Oct 2018 10:06:53 -0400
+Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t
+ pointers
+
+This resolves a build failure against harfbuzz 2.0.
+
+Based on a patch by Alexandre Fierreira.
+
+Bug: https://bugs.gentoo.org/669034
+---
+ .../renderer/platform/fonts/shaping/harfbuzz_face.cc     | 2 +-
+ .../renderer/platform/fonts/skia/skia_text_metrics.cc    | 9 +++++++--
+ .../renderer/platform/fonts/skia/skia_text_metrics.h     | 2 +-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+index 8e7d91ca371f..e279a5876cb3 100644
+--- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
++++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font,
+ static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font,
+                                                void* font_data,
+                                                unsigned count,
+-                                               hb_codepoint_t* first_glyph,
++                                               const hb_codepoint_t* first_glyph,
+                                                unsigned int glyph_stride,
+                                                hb_position_t* first_advance,
+                                                unsigned int advance_stride,
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+index 77ec6209fab9..9f9070921448 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) {
+   return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size);
+ }
+ 
++template <class T>
++T* advance_by_byte_size_const(T* p, unsigned byte_size) {
++  return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size);
++}
++
+ }  // namespace
+ 
+ SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) {
+@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint,
+ }
+ 
+ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+-                                               hb_codepoint_t* glyphs,
++                                               const hb_codepoint_t* glyphs,
+                                                unsigned glyph_stride,
+                                                hb_position_t* advances,
+                                                unsigned advance_stride) {
+@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+   // array that copy them to a regular array.
+   Vector<Glyph, 256> glyph_array(count);
+   for (unsigned i = 0; i < count;
+-       i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) {
++       i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) {
+     glyph_array[i] = *glyphs;
+   }
+   Vector<SkScalar, 256> sk_width_array(count);
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+index 787d8af0375a..3bc4407c641b 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+@@ -19,7 +19,7 @@ class SkiaTextMetrics final {
+ 
+   void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width);
+   void GetGlyphWidthForHarfBuzz(unsigned count,
+-                                hb_codepoint_t* first_glyph,
++                                const hb_codepoint_t* first_glyph,
+                                 unsigned glyph_stride,
+                                 hb_position_t* first_advance,
+                                 unsigned advance_stride);
+-- 
+2.19.1
+
diff --git a/www-client/chromium/files/chromium-widevine-r3.patch b/www-client/chromium/files/chromium-widevine-r3.patch
new file mode 100644
index 000000000000..a126084563ce
--- /dev/null
+++ b/www-client/chromium/files/chromium-widevine-r3.patch
@@ -0,0 +1,23 @@
+From 5818fdbef3d399fe1bfbb56f81e59184e1a8e467 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster@gmail.com>
+Date: Sun, 14 Oct 2018 20:04:03 -0400
+Subject: [PATCH] Define WIDEVINE_CDM_VERSION_STRING
+
+---
+ third_party/widevine/cdm/widevine_cdm_version.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h
+index dd6efed02646..eaa017197e61 100644
+--- a/third_party/widevine/cdm/widevine_cdm_version.h
++++ b/third_party/widevine/cdm/widevine_cdm_version.h
+@@ -11,5 +11,6 @@
+ // If the Widevine CDM is available define the following:
+ //  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+ //    as a string, e.g., "1.0.123.456").
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
+ 
+ #endif  // WIDEVINE_CDM_VERSION_H_
+-- 
+2.19.1
+
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 543a7b02afd1..fad1a596d317 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -291,5 +291,5 @@ DIST firefox-62.0.3-zh-TW.xpi 494524 BLAKE2B 491437706ecf92a563e79735ea7ddd91d60
 DIST firefox-62.0.3.source.tar.xz 259531444 BLAKE2B 94dc812e288054f230ec0faae44155e6a9d5e72fc5bcb78341d61f8391d17d72d3731c7fffb66c2a59cb572f8b18458c5fbabaa94779d48b5660db245aedba14 SHA512 487bb7791284367158c79cf7918fecf3d598627a6416e679aeb5d22626089aeffe07762fa2389819ba881c90ece1c5a83cf2d85b2def15b8d5ba0ed1c498b527
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
 EBUILD firefox-60.2.2.ebuild 13107 BLAKE2B a183f3234bb013310915a8a5a8245b99162e88c6ccb82563f64de1063b3f3acc1815f5ac3c931f75d2df43de0c15d7c42c53c2aecc6338f4a188a30970ba259c SHA512 a6189cd01791e445c1fe1df101d9040ba8e49ebc7dfe43c5a031c109b97531383fe0b0e26c1f6ba426234f9cffd3f744000086a971d50c16455211ab45d941ec
-EBUILD firefox-62.0.3.ebuild 19851 BLAKE2B c3f3127c87429c817c9a3cbbe5fe74fcbade36a73e573a459a25ca47ea95121631ff9889dccde2c0941ba9d61de056001bdaf4a5b767c6c1fa87961f6f338370 SHA512 ac463f1e22fc5567b57e350a2d60e09f1a3115ff143119a495b5574ac4fb8881d0445e69c9219cf20a64cb489f0631b77b4de93ec829276a02141b6cf8975a49
-MISC metadata.xml 2347 BLAKE2B ea74b91ed7af45d318660870984f9b9c4ebca2559801499bbc2249cefa694bca53a1a6dbb126cc606b4784b6a8c0ee1f1f2178dd03584fc28eca2a5204c4ad6a SHA512 3450f2c8fbf1d41755fe6b649eaa370dd93d4367b7ff151582699cfeef013dcd8eddf649cfc220da8567f9123eb11a7e484e85176f8d892580b703510e76f81b
+EBUILD firefox-62.0.3.ebuild 19851 BLAKE2B f13453406e28a5b0b302c6ddea7e39c073525485154b918f72853898957f9e88970814ddfb19a7fbd8413ed9aa4e36ac5c20f363d9e9034944baa4e634cd5aac SHA512 80ff07001e11c40108fea368666c724f49af5805ff7cd2b1c9b087925230023923e7ce632d8a523e01f5d07bd37af38b5fc86888b4d19e756dd331addbaf7b7d
+MISC metadata.xml 2290 BLAKE2B b820d2a49926c5b313d55161a92e94ef88638a2c21d80d346a0cea93d2d9d2f6e81f23c45d4f4b759357f19d91f4162445deda77e8ef7dcc87fb5bafc4bef930 SHA512 42513d5043efca1f8cf3cd6e9114a84c2013c3f782dfdb0f2c1c3a27b0b1d95d889f032b0df7b75a3c97d07782f70fdc316e2944fafb2a140d191ae4127857a7
diff --git a/www-client/firefox/firefox-62.0.3.ebuild b/www-client/firefox/firefox-62.0.3.ebuild
index 98a5c00667ab..1b23c6994a07 100644
--- a/www-client/firefox/firefox-62.0.3.ebuild
+++ b/www-client/firefox/firefox-62.0.3.ebuild
@@ -299,7 +299,7 @@ src_configure() {
 			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
 		fi
 
-		mozconfig_annotate '+lto' --enable-lto=full
+		mozconfig_annotate '+lto' --enable-lto=thin
 	else
 		# Avoid auto-magic on linker
 		if use clang ; then
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index c8b46b53b3bc..a4a9dced62e9 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -17,7 +17,6 @@
 	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
 		downloaded and kept up-to-date in user profiles</flag>
 	<flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag>
-	<flag name="jemalloc">Enable or disable jemalloc</flag>
 	<flag name="lto">Enable Link Time Optimization (LTO). Requires Gold linker when using GCC
 		or LDD linker when using Clang</flag>
 	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 8a20966ba2a0..6de691ca4ea4 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_70.0.3538.35-1_amd64.deb 57135036 BLAKE2B 32bb60b0391b0736b9d466ea7a41c2a3234e5294362da44e72e4c20078fa0ed4e4acb5871174b22e9ed505cde3a8bb6585c80863d7fed3c9071536519d8a06e9 SHA512 751843d0ad0d74586b9100c07a29579509e56694972eef089697df8dd05128484bd2bdd656bcbaacd6f90177ec3dd6cecd39b1df095ec7936abffe2ee6161223
-EBUILD google-chrome-beta-70.0.3538.35.ebuild 2712 BLAKE2B ab39deb472a45e85a570997a8bdac2d42e014b2fdef04115eaac90f4ae0b5d5e23fff628653d181f470e51915434e894c4d3249b643922fe9e83d2f10e76a02c SHA512 17d349603f6ace9267591e71c95ea6960d02723fb6b55c7281631de51dd8dd0344134d5064a754a6af01382e871872d9483715bf370aa8b98d70663740002c96
+DIST google-chrome-beta_70.0.3538.67-1_amd64.deb 57157608 BLAKE2B 6ae713e29bc49d3c2526032e0eff9d310addcb9543f06b61fd1284358282137aabf9a394f81369d028ea7d73bdbec8bfaafd71e0ff8055e9b69c722582e586e5 SHA512 120674dfdc2f059ed863f7c2cb28b8d417206c58979fd5f24bc880c69c2574f4001b2452146aebb8f5ac0c76527dcf5a3c98c9df1cf54f13fa7f5aa9dc10aef8
+EBUILD google-chrome-beta-70.0.3538.67.ebuild 2712 BLAKE2B ab39deb472a45e85a570997a8bdac2d42e014b2fdef04115eaac90f4ae0b5d5e23fff628653d181f470e51915434e894c4d3249b643922fe9e83d2f10e76a02c SHA512 17d349603f6ace9267591e71c95ea6960d02723fb6b55c7281631de51dd8dd0344134d5064a754a6af01382e871872d9483715bf370aa8b98d70663740002c96
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.35.ebuild b/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.67.ebuild
index 3a03ee42c9b5..3a03ee42c9b5 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.35.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.67.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 754862b47a07..7219f4994e4b 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_71.0.3559.6-1_amd64.deb 57503184 BLAKE2B 48fdb39d3523e1cd58641d57a7fd10172c67879fbcf327a68fdf76b4ce7adfbeddced03136f2a89d9012cfd27d79bd32c20f7c158d6541be5dcbc0180791beb9 SHA512 30367f713bb283df64c157f01bb9c3d6dc393546255558f331d5aca8b886d213d2f5b990536468a57979c7fc2fd89350abe32d47dbc1a4ebffa4055a2193ad4e
-EBUILD google-chrome-unstable-71.0.3559.6.ebuild 2691 BLAKE2B 396276e8de230d6c5f78b02d6bd6a1f06e8a3313f08f9c8dc125ac8d59fc23bbf212a0eb3e09944cb411d6b16baec64d6d3e98f916512753228f170e5a0ffa65 SHA512 ebd353de2344e6e574a2d2e5180b98334ec52f0f9d245f0a7dc1d035afeebf4d4bcfc58fe8b3305172d6ee8d6493162eba751d8816b3e4afa220307f5f09a839
+DIST google-chrome-unstable_71.0.3578.10-1_amd64.deb 57838364 BLAKE2B 786ab75466be4be8bcc6fcb13c57c1292ee27a78c84b6c4c1cdfda43677d652de69cba7dda7f07a6177000111b8495a504e9375f1656c656a7532dcd41f22f66 SHA512 3d95c702e080d0a3b575cc17eb6659e4d350d7a8d7d24f1c841bc4a844ca26b6f0ff991f851d60fe260df564a8a42e3793617d582fc72fcda98b1c72c6486ce2
+EBUILD google-chrome-unstable-71.0.3578.10.ebuild 2691 BLAKE2B 396276e8de230d6c5f78b02d6bd6a1f06e8a3313f08f9c8dc125ac8d59fc23bbf212a0eb3e09944cb411d6b16baec64d6d3e98f916512753228f170e5a0ffa65 SHA512 ebd353de2344e6e574a2d2e5180b98334ec52f0f9d245f0a7dc1d035afeebf4d4bcfc58fe8b3305172d6ee8d6493162eba751d8816b3e4afa220307f5f09a839
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-71.0.3559.6.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-71.0.3578.10.ebuild
index 57fa25d49a63..57fa25d49a63 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-71.0.3559.6.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-71.0.3578.10.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 25a8b48c9bc6..24d2a250dfcc 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_69.0.3497.100-1_amd64.deb 54675966 BLAKE2B 7043eca541b3dd75ed45ffd7bd06b26f2c3561378be913bc3988274ac1adc98ac05df7e7d42ec24402dea482131494f939578b5b1fde87224caa3e59bad25e96 SHA512 6566fefd13ef3013368d3f9edb7aa967d83fa888bec429beca16c0cab6398eaef5c07c31f399417baebeb7d0f79f5eebd651a31d0bca34eaa6ec729798b430e4
-EBUILD google-chrome-69.0.3497.100.ebuild 2709 BLAKE2B 1d0e19dba3750d8f89e3b7fd99f3d3f353e183c466bcbe0db4a9f83453dbb3da18829973eece4311a22cf6f8d2e83d311bef9c379101632910e847e6226d7bc8 SHA512 10f86cdf637aa0489c6fa90de462309419085d86b7cbf0634c5baa60a4d764af7064dbc4d5338c4cfe8c137345478e4023f7e1adafca91f66c7a2977256a0aa2
+DIST google-chrome-stable_70.0.3538.67-1_amd64.deb 56079500 BLAKE2B 3835e5b088b9259ea32ed6689f0ed670e21841a35a34be741fd8ae47ad16d7f1642cb49e2e2a7fba23695a2578b1bb9bfa1fc4a57c0dca61fbd9c85ca4b3a008 SHA512 8f11a8a0caa6ce95d2f21b408ac70c4da1852465958e2515f874be6c55a8f109754e680f52cf81bd7aef691aa693d036fbcd1ae4f5d024213fc8de38d52ae66d
+EBUILD google-chrome-70.0.3538.67.ebuild 2706 BLAKE2B c93c05c189187d3b623b8434b571340ee661d685a66e62bc2071e850c36d9c2f68f4ee56bc5c09a31db76b349dc89935a1bfacdce4b39a76924b06c9d57fd41d SHA512 d1e16148ce0892ac1ff4e14061ab2b3f66c4e3fa39e28b051090836ca9f7bc992e24329920e5a2a0c603cb8887eedfa499a2c44f7bd702eb7a1c359676d49bd4
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome/google-chrome-69.0.3497.100.ebuild b/www-client/google-chrome/google-chrome-69.0.3497.100.ebuild
deleted file mode 100644
index 806c156e4b16..000000000000
--- a/www-client/google-chrome/google-chrome-69.0.3497.100.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-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
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${CHROME_HOME}/${PN}" || die
-	fi
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
-
-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/google-chrome/google-chrome-70.0.3538.67.ebuild b/www-client/google-chrome/google-chrome-70.0.3538.67.ebuild
new file mode 100644
index 000000000000..d7d8f612b2b9
--- /dev/null
+++ b/www-client/google-chrome/google-chrome-70.0.3538.67.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* amd64"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+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
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
+
+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/netsurf/Manifest b/www-client/netsurf/Manifest
index ed3a37130f5a..ea87dc7377dd 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,9 +1,8 @@
-AUX netsurf-3.6-CFLAGS.patch 1821 BLAKE2B eb0bfa30abb7dc23845a6ade5edec90a607019298d917932ddcbfcb13e1c468f453eb256719c33e2494b0bee6858600d6d2b9b9ca93735029410bf67b5c582c4 SHA512 4eed05c11dc548cce4a0d88fcff547d8efabf3d2bab2067136585fefc5b96ee79be318304c31ed7aa5bebca479d8af082198059de9a05782eb939f0c3f8338e9
 AUX netsurf-3.6-conditionally-include-image-headers.patch 598 BLAKE2B d55ff86b9b6981671eb9466ce989145ba79b00aa791ae361367362c9938335f561aa828911e44ea25637ff3e6de637180b76649f55df27b4d7d4269652f19f9a SHA512 346e7befaeb337cb33963794303eb18cccd280eaa86aed205fee9b50bcb3cbea8d5c4025b439d7d737036e66a76354871b1765eae7dd11e2d1a71dc3084747c3
-AUX netsurf-3.6-gstreamer.patch 900 BLAKE2B 1182c00378c796e9ca11b0070094b8b2dc7ce17b47ecd58a264125a7b672b22c802d3c1bf42401f477de3b734563ea97e3e4f04391491925c22dd9f33ca31306 SHA512 9dd8510cc343c2b627001e7ec80603d8e0de8cb4bbd1e8f53e8ffea5b2adfa915633e50a0b6d99b13a453d3375fa66cfb466658931a0f5454f36363d56d53bb3
-AUX netsurf-3.6-pdf-writer.patch 2408 BLAKE2B 65c4356531d7de89708e0ffe79f900e95d74cdce383621b7d41afacd0ca516bc3abab7da85b6c29e6db0eff1d6e0f8fada2e1c343c7551a11b87009886caea7c SHA512 d3aee4ce0b509743a7efbf2262ca4ae64564d5e4b01453c621868eba20ef97bef8322a042a27606196456be38f09a7ca6be82fee3747cb93140e24b265133225
-DIST netsurf-3.6-src.tar.gz 4129091 BLAKE2B d6b08069e34a8fd4f2010c6b3efbde9d7b13e40d3f3fdceeee92eb9d2bbeb92fac6f0a1ca9ac263ebc1904ad04a42c97a6418da7e095d18eda3be952129ac718 SHA512 6141cd94b2b6c8e56f682599e4929690f6ca668d1f6ff20bad93e30cf3a3b27475146f2b3c9dbc9f1b2e44b729d74c346254959b7def1f8d194e1c6efac3078d
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
+AUX netsurf-3.8-CFLAGS.patch 2544 BLAKE2B 1d71cd9f577b9a909c90117d4ba6933dacc58423e9db3bc060e79baf7c3bfb71b2eb11c82d53495be92098f50923675a6be6eef5458461d8bc0accd22136c7dc SHA512 87e2698a9b58a8871d9a7fb0bc42368974a9fb815adcacb7ee29d73ed5ac6747ccb944a15e41620841ff813dce95feae1e664ba0fcf332bfd6e8b830e82d3810
+AUX netsurf-3.8-pdf-writer.patch 2807 BLAKE2B 93ee86a467a01a2da07269ef32a672b8337d93a91b65fbcbe4c21e05f9f702baa70f79ca2757cf535ad0b4490c00bbc3c9276f6ed392d56e3a766553e2a5ab42 SHA512 40f6c88b5946822699a125a8c6c5eb631990828bd7b4e31be330191a41588d1978083db9fdca2752f8bb0c3af5afe7ed896d8b79b8eaa6f45523da74c36eda07
+DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 DIST netsurf-fb.modes-example.gz 4586 BLAKE2B 89c76fde1ddc79e46f22d9f628f8d75ec57be2a29d31383550137e3b502aa4d8c0a733b755731c916d4d544679a4253323bc343528c5e2c4f145c3318ac1d86d SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981
-EBUILD netsurf-3.6.ebuild 6584 BLAKE2B 0ad265b70d65e1e3fde6529fb75de17c7e5faa0682e73fb490935692614de0500f47ae532330589a81e0c72699eea9509348b316176a4b335fe7b519ab4ae6aa SHA512 5c0ca0d136ef9b2ed899a0626409117288f60424e1c6aee1ef0e0afc9ce32cf51384c9b861498fc13d487282fb705f3f9748e0dc9f557ea3d77e1e296e9ea553
-MISC metadata.xml 1855 BLAKE2B e4c0c4b14d68ce4f9036c984a6f543211b69bcd5e519eb7e889d75766d5bebb54cd4a40fd3af0c301061ded8f108a2f884b8f62bdb5409c3212a4c5f658fa111 SHA512 bef58b8b699cd7d7259c6affd5fb4a12f0358b57b9a1e0b7db938a7ef5c633c82acd5136b047b42f55794cc9c555825bd7a407c9a15d2ade72ba2d1d831e21c1
+EBUILD netsurf-3.8.ebuild 6404 BLAKE2B 903bc25775d1b5aa09f154b8e6e6b846f3e407caeb5c0d38d7764fe7ebe9b55a524cb4f9d72461f5e328461325299363ce33dd2e2eba59aa7db4683041749211 SHA512 2e35e4adf4c2c5e99beb3777136bbc15d13291326f92a4a63e41213d6a87507703ba8452d5c6bbf74b07c48d6378e9c6027fdb91bd974d2f8e67fadbd23f4b4c
+MISC metadata.xml 1903 BLAKE2B 2bbf38d061d0e1ad59c99b451f008619553442c436fa065f2066c964d9189d805f38b6571f7f54aeaa9d2512c403d2b4390afaed4a5559f5b273720aae416562 SHA512 79648e993db4b42d50244d1ec3efcb781d7c12f41f01056de5ce88aec9884bf6f23408421823970ccb3e46211d39736ae997f2e18a3d883a9cf553bb93923636
diff --git a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
deleted file mode 100644
index 8004aa4c6206..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- netsurf-3.6/Makefile.defaults
-+++ netsurf-3.6/Makefile.defaults
-@@ -96,12 +96,6 @@
- # Valid options: YES, NO
- NETSURF_FS_BACKING_STORE := NO
- 
--# Initial CFLAGS. Optimisation level etc. tend to be target specific.
--CFLAGS :=
--
--# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
--CXXFLAGS :=
--
- # Default installation/execution prefix
- PREFIX ?= /usr/local
- 
---- netsurf-3.6/frontends/framebuffer/Makefile
-+++ netsurf-3.6/frontends/framebuffer/Makefile
-@@ -20,7 +20,7 @@
- CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
- CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
- 
--CFLAGS += -std=c99 -g -Dsmall \
-+CFLAGS += -std=c99 -Dsmall \
- 	  -D_BSD_SOURCE \
- 	  -D_DEFAULT_SOURCE \
- 	  -D_XOPEN_SOURCE=600 \
---- netsurf-3.6/frontends/framebuffer/Makefile.defaults
-+++ netsurf-3.6/frontends/framebuffer/Makefile.defaults
-@@ -3,7 +3,7 @@
- # ----------------------------------------------------------------------------
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
- 
- # Framebuffer default surface provider.
- # Valid values are: x, sdl, linux, vnc, able,
---- netsurf-3.6/frontends/gtk/Makefile
-+++ netsurf-3.6/frontends/gtk/Makefile
-@@ -33,7 +33,7 @@
- endif
- 
- 
--GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
-+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
- 		$(GTKDEPFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_DEFAULT_SOURCE \
---- netsurf-3.6/frontends/gtk/Makefile.defaults
-+++ netsurf-3.6/frontends/gtk/Makefile.defaults
-@@ -39,4 +39,4 @@
- NETSURF_GTK_MAJOR ?= 2
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
---- netsurf-3.6/test/Makefile
-+++ netsurf-3.6/test/Makefile
-@@ -105,7 +105,7 @@
-   COMMON_WARNFLAGS += -Wno-unused-parameter
- endif
- 
--TESTCFLAGS := -std=c99 -g \
-+TESTCFLAGS := -std=c99 \
- 		$(COMMON_WARNFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch b/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
deleted file mode 100644
index 6aca4f6abdf9..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- netsurf-3.6/frontends/gtk/Makefile
-+++ netsurf-3.6/frontends/gtk/Makefile
-@@ -16,7 +16,6 @@
- 
- # GTK and GLIB flags to disable depricated usage
- GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
--		-DG_DISABLE_DEPRECATED \
- 	       	-DGTK_DISABLE_SINGLE_INCLUDES \
- 		-DGTK_MULTIHEAD_SAFE \
- 		-DPANGO_DISABLE_DEPRECATED
---- netsurf-3.6/content/handlers/image/video.c
-+++ netsurf-3.6/content/handlers/image/video.c
-@@ -22,6 +22,8 @@
- #include "content/content_protected.h"
- 
- #include "image/video.h"
-+#include "utils/http/parameter.h"
-+#include "content/llcache.h"
- 
- typedef struct nsvideo_content {
- 	struct content base;
---- netsurf-3.6/content/content_factory.h
-+++ netsurf-3.6/content/content_factory.h
-@@ -25,6 +25,7 @@
- 
- #include "netsurf/content_type.h"
- #include "utils/errors.h"
-+#include "utils/utils.h"
- 
- #define CONTENT_FACTORY_REGISTER_TYPES(HNAME, HTYPELIST, HHANDLER)	\
- 									\
diff --git a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
deleted file mode 100644
index 5824adc1ecbf..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- netsurf-3.6/desktop/font_haru.c
-+++ netsurf-3.6/desktop/font_haru.c
-@@ -37,7 +37,7 @@
- #include <hpdf.h>
- 
- #include "utils/nsoption.h"
--#include "desktop/save_pdf/font_haru.h"
-+#include "desktop/font_haru.h"
- #include "desktop/font.h"
- #include "utils/log.h"
- 
---- netsurf-3.6/desktop/save_pdf.c
-+++ netsurf-3.6/desktop/save_pdf.c
-@@ -60,6 +60,8 @@
- #include "utils/useragent.h"
- #include "content/hlcache.h"
- #include "utils/nsoption.h"
-+#include "desktop/gui_misc.h"
-+#include "desktop/gui_internal.h"
- #include "netsurf/bitmap.h"
- 
- #include "netsurf/plotters.h"
-@@ -450,11 +452,6 @@
- 
- 		switch(content_get_type(content)){
- 		/*Handle "embeddable" types of images*/
--		case CONTENT_JPEG:
-- 			image = HPDF_LoadJpegImageFromMem(pdf_doc,
-- 					(const HPDF_BYTE *) source_data,
-- 					source_size);
-- 			break;
- 
- 		/*Disabled until HARU PNG support will be more stable.
- 
-@@ -700,7 +697,7 @@
- 
- 
- #ifndef PDF_DEBUG
--	if (option_enable_PDF_compression)
-+	if (nsoption_bool(enable_PDF_compression))
- 		HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
- #endif
- 	HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
-@@ -774,7 +771,7 @@
- 	assert(settings->output != NULL);
- 
- 	/*Encryption on*/
--	if (option_enable_PDF_password)
-+	if (nsoption_bool(enable_PDF_password))
- 		guit->misc->pdf_password(&owner_pass, &user_pass,
- 				(void *)settings->output);
- 	else
-@@ -789,7 +786,7 @@
- {
- 	nserror res = NSERROR_OK;
- 
--	if (option_enable_PDF_password && owner_pass != NULL ) {
-+	if (nsoption_bool(enable_PDF_password) && owner_pass != NULL ) {
- 		HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
- 		HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
- 		free(owner_pass);
---- netsurf-3.6/frontends/gtk/scaffolding.c
-+++ netsurf-3.6/frontends/gtk/scaffolding.c
-@@ -731,14 +731,14 @@
- 
- 	free(url_name);
- 
--	strncpy(dirname, option_downloads_directory, PATH_MAX);
-+	strncpy(dirname, nsoption_charp(downloads_directory), PATH_MAX);
- 	strncat(dirname, "/", PATH_MAX - strlen(dirname));
- 	dirname[PATH_MAX - 1] = '\0';
- 
- 	/* this way the scale used by PDF functions is synchronized with that
- 	 * used by the all-purpose print interface
- 	 */
--	haru_nsfont_set_scale((float)option_export_scale / 100);
-+	haru_nsfont_set_scale((float)nsoption_int(export_scale) / 100);
- 
- 	save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window,
- 		GTK_FILE_CHOOSER_ACTION_SAVE,
diff --git a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
new file mode 100644
index 000000000000..c52422dcb92b
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
@@ -0,0 +1,79 @@
+diff --git a/Makefile.defaults b/Makefile.defaults
+index 51090109e..f1ec46f73 100644
+--- a/Makefile.defaults
++++ b/Makefile.defaults
+@@ -114,12 +114,6 @@ NETSURF_USE_SANITIZERS := NO
+ # But recover after sanitizer failure
+ NETSURF_RECOVER_SANITIZERS := YES
+ 
+-# Initial CFLAGS. Optimisation level etc. tend to be target specific.
+-CFLAGS :=
+-
+-# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
+-CXXFLAGS :=
+-
+ # Default installation/execution prefix
+ PREFIX ?= /usr/local
+ 
+diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
+index bdedd903b..35179138a 100644
+--- a/frontends/framebuffer/Makefile
++++ b/frontends/framebuffer/Makefile
+@@ -20,7 +20,7 @@ CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"'
+ CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
+ CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
+ 
+-CFLAGS += -std=c99 -g -Dsmall \
++CFLAGS += -std=c99 -Dsmall \
+ 	  -D_BSD_SOURCE \
+ 	  -D_DEFAULT_SOURCE \
+ 	  -D_XOPEN_SOURCE=600 \
+diff --git a/frontends/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults
+index cc712e992..f132c97d6 100644
+--- a/frontends/framebuffer/Makefile.defaults
++++ b/frontends/framebuffer/Makefile.defaults
+@@ -3,7 +3,7 @@
+ # ----------------------------------------------------------------------------
+ 
+ # Optimisation levels
+-CFLAGS += -O2
++CFLAGS += 
+ 
+ # Framebuffer default surface provider.
+ # Valid values are: x, sdl, linux, vnc, able,
+diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
+index ec60ce70c..04af6df8f 100644
+--- a/frontends/gtk/Makefile
++++ b/frontends/gtk/Makefile
+@@ -33,7 +33,7 @@ GTKDEPFLAGS += -DGTK_DISABLE_DEPRECATED
+ endif
+ 
+ 
+-GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
++GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
+ 		$(GTKDEPFLAGS) \
+ 		-D_BSD_SOURCE \
+ 		-D_DEFAULT_SOURCE \
+diff --git a/frontends/gtk/Makefile.defaults b/frontends/gtk/Makefile.defaults
+index a98043eb9..bb5371230 100644
+--- a/frontends/gtk/Makefile.defaults
++++ b/frontends/gtk/Makefile.defaults
+@@ -39,4 +39,4 @@ NETSURF_FS_BACKING_STORE := YES
+ NETSURF_GTK_MAJOR ?= 2
+ 
+ # Optimisation levels
+-CFLAGS += -O2
++CFLAGS += 
+diff --git a/test/Makefile b/test/Makefile
+index 4f9dd22c9..8bec9b88a 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -134,7 +134,7 @@ ifneq ($(CC_MAJOR),2)
+   COMMON_WARNFLAGS += -Wno-unused-parameter
+ endif
+ 
+-BASE_TESTCFLAGS := -std=c99 -g \
++BASE_TESTCFLAGS := -std=c99 \
+ 	$(COMMON_WARNFLAGS) \
+ 	-D_DEFAULT_SOURCE \
+ 	-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
new file mode 100644
index 000000000000..e9c2420a33fd
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
@@ -0,0 +1,86 @@
+diff --git a/desktop/font_haru.c b/desktop/font_haru.c
+index 4ee9824f0..3304ba82a 100644
+--- a/desktop/font_haru.c
++++ b/desktop/font_haru.c
+@@ -37,7 +37,7 @@
+ #include <hpdf.h>
+ 
+ #include "utils/nsoption.h"
+-#include "desktop/save_pdf/font_haru.h"
++#include "desktop/font_haru.h"
+ #include "desktop/font.h"
+ #include "utils/log.h"
+ 
+diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
+index 889190089..9e6265cfb 100644
+--- a/desktop/save_pdf.c
++++ b/desktop/save_pdf.c
+@@ -60,6 +60,8 @@
+ #include "utils/useragent.h"
+ #include "content/hlcache.h"
+ #include "utils/nsoption.h"
++#include "desktop/gui_misc.h"
++#include "desktop/gui_internal.h"
+ #include "netsurf/bitmap.h"
+ 
+ #include "netsurf/plotters.h"
+@@ -455,11 +457,6 @@ HPDF_Image pdf_extract_image(struct bitmap *bitmap)
+ 
+ 		switch(content_get_type(content)){
+ 		/*Handle "embeddable" types of images*/
+-		case CONTENT_JPEG:
+- 			image = HPDF_LoadJpegImageFromMem(pdf_doc,
+- 					(const HPDF_BYTE *) source_data,
+- 					source_size);
+- 			break;
+ 
+ 		/*Disabled until HARU PNG support will be more stable.
+ 
+@@ -706,7 +703,7 @@ bool pdf_begin(struct print_settings *print_settings)
+ 
+ 
+ #ifndef PDF_DEBUG
+-	if (option_enable_PDF_compression)
++	if (nsoption_bool(enable_PDF_compression))
+ 		HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
+ #endif
+ 	HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
+@@ -780,7 +777,7 @@ void pdf_end(void)
+ 	assert(settings->output != NULL);
+ 
+ 	/*Encryption on*/
+-	if (option_enable_PDF_password)
++	if (nsoption_bool(enable_PDF_password))
+ 		guit->misc->pdf_password(&owner_pass, &user_pass,
+ 				(void *)settings->output);
+ 	else
+@@ -795,7 +792,7 @@ nserror save_pdf(const char *path)
+ {
+ 	nserror res = NSERROR_OK;
+ 
+-	if (option_enable_PDF_password && owner_pass != NULL ) {
++	if (nsoption_bool(enable_PDF_password) && owner_pass != NULL ) {
+ 		HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
+ 		HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
+ 		free(owner_pass);
+diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
+index 8c46fd884..748518fdc 100644
+--- a/frontends/gtk/scaffolding.c
++++ b/frontends/gtk/scaffolding.c
+@@ -853,14 +853,14 @@ MULTIHANDLER(pdf)
+ 
+ 	free(url_name);
+ 
+-	strncpy(dirname, option_downloads_directory, PATH_MAX);
++	strncpy(dirname, nsoption_charp(downloads_directory), PATH_MAX);
+ 	strncat(dirname, "/", PATH_MAX - strlen(dirname));
+ 	dirname[PATH_MAX - 1] = '\0';
+ 
+ 	/* this way the scale used by PDF functions is synchronised with that
+ 	 * used by the all-purpose print interface
+ 	 */
+-	haru_nsfont_set_scale((float)option_export_scale / 100);
++	haru_nsfont_set_scale((float)nsoption_int(export_scale) / 100);
+ 
+ 	save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window,
+ 		GTK_FILE_CHOOSER_ACTION_SAVE,
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index e53232c547c3..a35fcb05331d 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,10 +1,14 @@
 <?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>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 <upstream>
 	<changelog>http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt</changelog>
 </upstream>
@@ -18,7 +22,6 @@
 	<flag name="pdf-writer">PDF output support (media-libs/libharu)</flag>
 	<flag name="rosprite">RISC OS Sprite bitmap image support (media-libs/librosprite)</flag>
 	<flag name="svgtiny">SVG image support via media-libs/svgatiny instead of gnome-base/librsvg</flag>
-	<flag name="webp">WebP image support (media-libs/libwebp)</flag>
 	<flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
 	<flag name="gtk">Build GTK GUI, defaults to GTK3</flag>
 	<flag name="gtk2">Build GTK2 GUI</flag>
diff --git a/www-client/netsurf/netsurf-3.6.ebuild b/www-client/netsurf/netsurf-3.6.ebuild
deleted file mode 100644
index 4397fe9dfaa6..000000000000
--- a/www-client/netsurf/netsurf-3.6.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="a free, open source web browser"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz
-	http://xmw.de/mirror/netsurf-fb.modes-example.gz
-	${NETSURF_BUILDSYSTEM_SRC_URI}"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE="+bmp +duktape fbcon truetype +gif gstreamer gtk gtk2 gtk3 +javascript +jpeg +mng
-	pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_able
-	fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
-
-REQUIRED_USE="|| ( fbcon gtk gtk2 gtk3 )
-	amd64? ( abi_x86_32? ( javascript? ( duktape ) ) )
-	fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
-		fbcon_frontend_vnc fbcon_frontend_x ) )
-	duktape? ( javascript )"
-
-RDEPEND=">=dev-libs/libnsutils-0.0.2[${MULTILIB_USEDEP}]
-	>=dev-libs/libutf8proc-1.1.6-r1[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
-	net-misc/curl[${MULTILIB_USEDEP}]
-	>=dev-libs/libcss-0.6.0[${MULTILIB_USEDEP}]
-	>=net-libs/libhubbub-0.3.1-r1[${MULTILIB_USEDEP}]
-	>=net-libs/libdom-0.3.0[${MULTILIB_USEDEP}]
-	bmp? ( >=media-libs/libnsbmp-0.1.2-r1[${MULTILIB_USEDEP}] )
-	fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[${MULTILIB_USEDEP}]
-		truetype? ( media-fonts/dejavu
-			>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
-	)
-	gif? ( >=media-libs/libnsgif-0.1.2-r1[${MULTILIB_USEDEP}] )
-	gtk2? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
-	gtk3? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] )
-	javascript? ( >=dev-libs/nsgenbind-0.3[${MULTILIB_USEDEP}]
-		!duktape? ( dev-lang/spidermonkey:0= ) )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
-	pdf-writer? ( media-libs/libharu[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
-	psl? ( media-libs/libnspsl[${MULTILIB_USEDEP}] )
-	rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )
-	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[${MULTILIB_USEDEP}] )
-		!svgtiny? ( gnome-base/librsvg:2[${MULTILIB_USEDEP}] ) )
-	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-libs/check[${MULTILIB_USEDEP}]
-	dev-perl/HTML-Parser"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.6-CFLAGS.patch
-	"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
-	"${FILESDIR}"/${PN}-3.6-pdf-writer.patch
-	"${FILESDIR}"/${PN}-3.6-gstreamer.patch )
-DOCS=( fb.modes README Docs/USING-Framebuffer
-	Docs/ideas/{cache,css-engine,render-library}.txt )
-
-src_prepare() {
-	rm -r frontends/{amiga,atari,beos,cocoa,monkey,riscos,windows} || die
-
-	mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
-
-	netsurf_src_prepare
-}
-
-src_configure() {
-	netsurf_src_configure
-
-	netsurf_makeconf+=(
-		NETSURF_USE_BMP=$(usex bmp YES NO)
-		NETSURF_USE_GIF=$(usex gif YES NO)
-		NETSURF_USE_JPEG=$(usex jpeg YES NO)
-		NETSURF_USE_PNG=$(usex png YES NO)
-		NETSURF_USE_NSPSL=$(usex psl YES NO)
-		NETSURF_USE_MNG=$(usex mng YES NO)
-		NETSURF_USE_WEBP=$(usex webp YES NO)
-		NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
-		NETSURF_USE_JS=NO
-		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
-		NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
-		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
-		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
-		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
-		PKG_CONFIG=$(tc-getPKG_CONFIG)
-		$(usex fbcon_frontend_able  NETSURF_FB_FRONTEND=able  "")
-		$(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
-		$(usex fbcon_frontend_sdl   NETSURF_FB_FRONTEND=sdl   "")
-		$(usex fbcon_frontend_vnc   NETSURF_FB_FRONTEND=vnc   "")
-		$(usex fbcon_frontend_x     NETSURF_FB_FRONTEND=x     "")
-		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
-		NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
-		TARGET=dummy
-		NETSURF_USE_VIDEO=dummy
-	)
-}
-
-src_compile() {
-	if use fbcon ; then
-		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
-		netsurf_src_compile
-	fi
-	if use gtk2 ; then
-		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
-		netsurf_src_compile
-	fi
-	if use gtk3 || use gtk ; then
-		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
-		netsurf_src_compile
-	fi
-}
-
-src_install() {
-	sed -e '1iexit;' \
-		-i "${WORKDIR}"/*/utils/git-testament.pl || die
-
-	if use fbcon ; then
-		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
-		netsurf_src_install
-		elog "framebuffer binary has been installed as netsurf-fb"
-		make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
-		elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
-		elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
-		elog "Please make /dev/input/mice readable to the account using netsurf-fb."
-		elog "Either use chmod a+r /dev/input/mice (security!!!) or use an group."
-	fi
-	if use gtk2 ; then
-		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
-		netsurf_src_install
-		elog "netsurf gtk2 version has been installed as netsurf-gtk"
-		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
-	fi
-	if use gtk3 || use gtk ; then
-		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
-		netsurf_src_install
-		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
-		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
-	fi
-
-	insinto /usr/share/pixmaps
-	doins frontends/gtk/res/netsurf.xpm
-}
diff --git a/www-client/netsurf/netsurf-3.8.ebuild b/www-client/netsurf/netsurf-3.8.ebuild
new file mode 100644
index 000000000000..5722a925d819
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.8.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_COMPONENT_TYPE=binary
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+DESCRIPTION="a free, open source web browser"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz
+	http://xmw.de/mirror/netsurf-fb.modes-example.gz
+	${NETSURF_BUILDSYSTEM_SRC_URI}"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc"
+IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 gtk3 +javascript +jpeg +mng
+	pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_able
+	fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
+
+REQUIRED_USE="|| ( fbcon gtk gtk2 gtk3 )
+	amd64? ( abi_x86_32? ( javascript? ( duktape ) ) )
+	fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
+		fbcon_frontend_vnc fbcon_frontend_x ) )
+	duktape? ( javascript )"
+
+RDEPEND=">=dev-libs/libnsutils-0.0.5[${MULTILIB_USEDEP}]
+	>=dev-libs/libutf8proc-2.2[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+	net-misc/curl[${MULTILIB_USEDEP}]
+	>=dev-libs/libcss-0.8[${MULTILIB_USEDEP}]
+	>=net-libs/libhubbub-0.3[${MULTILIB_USEDEP}]
+	>=net-libs/libdom-0.3[${MULTILIB_USEDEP}]
+	bmp? ( >=media-libs/libnsbmp-0.1[${MULTILIB_USEDEP}] )
+	fbcon? ( >=dev-libs/libnsfb-0.2[${MULTILIB_USEDEP}]
+		truetype? ( media-fonts/dejavu
+			>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	)
+	gif? ( >=media-libs/libnsgif-0.1[${MULTILIB_USEDEP}] )
+	gtk2? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	gtk3? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+	gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+	javascript? ( >=dev-libs/nsgenbind-0.3[${MULTILIB_USEDEP}]
+		!duktape? ( dev-lang/spidermonkey:0= ) )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
+	pdf-writer? ( media-libs/libharu[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
+	psl? ( media-libs/libnspsl[${MULTILIB_USEDEP}] )
+	rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )
+	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[${MULTILIB_USEDEP}] )
+		!svgtiny? ( gnome-base/librsvg:2[${MULTILIB_USEDEP}] ) )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-libs/check[${MULTILIB_USEDEP}]
+	dev-perl/HTML-Parser"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8-CFLAGS.patch
+	"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
+	"${FILESDIR}"/${PN}-3.8-pdf-writer.patch
+)
+
+DOCS=( fb.modes README docs/using-framebuffer.md
+	docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
+
+	mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
+
+	multilib_copy_sources
+}
+
+src_configure() {
+	netsurf_src_configure
+
+	netsurf_makeconf+=(
+		NETSURF_USE_BMP=$(usex bmp YES NO)
+		NETSURF_USE_GIF=$(usex gif YES NO)
+		NETSURF_USE_JPEG=$(usex jpeg YES NO)
+		NETSURF_USE_PNG=$(usex png YES NO)
+		NETSURF_USE_NSPSL=$(usex psl YES NO)
+		NETSURF_USE_MNG=$(usex mng YES NO)
+		NETSURF_USE_WEBP=$(usex webp YES NO)
+		NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
+		NETSURF_USE_JS=NO
+		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
+		NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
+		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
+		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
+		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
+		PKG_CONFIG=$(tc-getPKG_CONFIG)
+		$(usex fbcon_frontend_able  NETSURF_FB_FRONTEND=able  "")
+		$(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
+		$(usex fbcon_frontend_sdl   NETSURF_FB_FRONTEND=sdl   "")
+		$(usex fbcon_frontend_vnc   NETSURF_FB_FRONTEND=vnc   "")
+		$(usex fbcon_frontend_x     NETSURF_FB_FRONTEND=x     "")
+		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+		NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
+		TARGET=dummy
+		NETSURF_USE_VIDEO=dummy
+	)
+}
+
+src_compile() {
+	if use fbcon ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+		netsurf_src_compile
+	fi
+	if use gtk2 ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+		netsurf_src_compile
+	fi
+	if use gtk3 || use gtk ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+		netsurf_src_compile
+	fi
+}
+
+src_install() {
+	sed -e '1iexit;' \
+		-i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+	if use fbcon ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+		netsurf_src_install
+		elog "framebuffer binary has been installed as netsurf-fb"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+		elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
+		elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
+		elog "Please make /dev/input/mice readable to the account using netsurf-fb."
+		elog "Either use chmod a+r /dev/input/mice (security!!!) or use an group."
+	fi
+	if use gtk2 ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+		netsurf_src_install
+		elog "netsurf gtk2 version has been installed as netsurf-gtk"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+	fi
+	if use gtk3 || use gtk ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+		netsurf_src_install
+		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
+	fi
+
+	insinto /usr/share/pixmaps
+	doins frontends/gtk/res/netsurf.xpm
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index a62e167653dd..4a6d0701a123 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,3 +1,5 @@
-DIST opera-beta_56.0.3051.28_amd64.deb 56825330 BLAKE2B d4e68402793db977f1a9722140802e755e65a208e9b99e497132aa3ecb65fa6df5b5b10be160c08a933929e6d132c0af7ccf2148fbc8c52cc4ebf8179f6effda SHA512 8933173f70425997f4ec35864f05d7bd60002516be1095685d86887019bdd451b55b207a16fbdd6b3a49f5e1cca98b8b58277c23ea4ff011385473d14eb221d1
-EBUILD opera-beta-56.0.3051.28.ebuild 2321 BLAKE2B c69702f75840d6023471010024926366e861d5e0dcb330a49faaea5cc32aae4d82af89abc62360592f80f73fc6701fedb300b381d1cbd2c697edf8d95881544a SHA512 923d0cd12aec9f692c1768d6a789b2e7bafb026e7d3b17d213414d87105b915f0be8f9315ff32e90663554416e0a9cd323a12e33e442e0b772a9210de3b2942f
+DIST opera-beta_57.0.3098.14_amd64.deb 69960852 BLAKE2B 98009e5ce89c4bc5c6375de6e2448fecaa31fcf52ba08aa8d9265db0c28c059199e1bbaf29aba545df15342b407882b462f8809a6f7805b14d61f7712d97c1e5 SHA512 168576ecb02581af0ddc347f6d17d9e1627c356a9c025083c483cce31aa6f442517812f119eb4b115c4f4ef2183f983e0d88b560863cc2bcf2de36cbe422d433
+DIST opera-beta_57.0.3098.6_amd64.deb 70093468 BLAKE2B 934b90347ba9e8b456a161a8c72e57d51798da46202e959c07ab0e4cbb33dd16bd824e1b04a487eb2c7df887cf6386dce5e00406da6a59cd61d4f88ddce496cc SHA512 c4b11d4fff600b3fc7637fd5a02a72d0d0367271602fc4f61da8df376bf6e25074c25566757719c44da5967571a6216c7dfc5ae438aaf033d0b008843dbf8d7e
+EBUILD opera-beta-57.0.3098.14.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+EBUILD opera-beta-57.0.3098.6.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-56.0.3051.28.ebuild b/www-client/opera-beta/opera-beta-56.0.3051.28.ebuild
deleted file mode 100644
index 7febec80c8f9..000000000000
--- a/www-client/opera-beta/opera-beta-56.0.3051.28.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-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]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/opera-developer-57.0.3090.0.ebuild b/www-client/opera-beta/opera-beta-57.0.3098.14.ebuild
index c09ad3685d1c..c09ad3685d1c 100644
--- a/www-client/opera-developer/opera-developer-57.0.3090.0.ebuild
+++ b/www-client/opera-beta/opera-beta-57.0.3098.14.ebuild
diff --git a/www-client/opera-developer/opera-developer-57.0.3098.1.ebuild b/www-client/opera-beta/opera-beta-57.0.3098.6.ebuild
index c09ad3685d1c..c09ad3685d1c 100644
--- a/www-client/opera-developer/opera-developer-57.0.3098.1.ebuild
+++ b/www-client/opera-beta/opera-beta-57.0.3098.6.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 9c4699c1d113..99c163bccfb0 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_57.0.3090.0_amd64.deb 69308000 BLAKE2B 1309205234788452f333f18bbf55d0d4d795e433f9cbf95ada7417597db4d6bb90aeb510402a9669f8188c6689eb5b3976f831312659454f7565ebf2399bbe9f SHA512 9c33f1c171543f56fa1a26369ca0fe8a393d180e46c7edc4224a0fc74a19345b8f9236abe556f858b76bb00baa351c5c5d0cc5cc16c70bc3afa659e64a24d88e
-DIST opera-developer_57.0.3098.1_amd64.deb 69970320 BLAKE2B 32190e19c4c4771401ad6963e567f1c0c5e09f2bea57fcc7c0381af1c8505cf2f53e4c7f4fc339ee4d5e49197d72457c0bbcf962aba0d24033258654eb255c05 SHA512 2b85fdc5bca06bbdd55258fb786bed59ae4799c15025659daceb2e44b29fe520205ed49d3c9fa300e985031f3cd3d53be0343a3b12671158b71cd42c6186908a
-EBUILD opera-developer-57.0.3090.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
-EBUILD opera-developer-57.0.3098.1.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+DIST opera-developer_58.0.3105.0_amd64.deb 70419486 BLAKE2B 7c3b8ac9ece6c124cb5016f99a260be4416d99fc36a2c6bd02ac2fce3161ddfb51ec094ee9722081055b3ef78ad568b3b7b6a75351ea72bdab42645739dda65c SHA512 76b29d408dcf6115807ce75f318f0b37fb16da32125d7e859e00ef5f5ba1c0b38dc0b9e5af8251bc013cc4a3f1050ba5af3b923b17ce00b820e5bd983ca5d89c
+DIST opera-developer_58.0.3111.0_amd64.deb 69837552 BLAKE2B 1146bb9b7e8ffe4e3e7e352957f26e8bc77194f61e6c959d24538815e11aaf448984065a55e6c0de85eca5be8a04fea4dd0da6c6f196596c1b62eac1e8bf2d2a SHA512 8228d15efe92f29908190d2bdeb819d3b5b1b734a7e7db9287b5601d4a4b4f706da9a4327ffe8066e757094ddfb4888c42f1d5a52fbd6aeb121d9657e5e0b716
+EBUILD opera-developer-58.0.3105.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+EBUILD opera-developer-58.0.3111.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-58.0.3105.0.ebuild b/www-client/opera-developer/opera-developer-58.0.3105.0.ebuild
new file mode 100644
index 000000000000..c09ad3685d1c
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-58.0.3105.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+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]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera-developer/opera-developer-58.0.3111.0.ebuild b/www-client/opera-developer/opera-developer-58.0.3111.0.ebuild
new file mode 100644
index 000000000000..c09ad3685d1c
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-58.0.3111.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+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]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 63e0bdd29b00..21cb29470bff 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_56.0.3051.31_amd64.deb 56660522 BLAKE2B 2f216399e9e74e65d7cdc3fb813097241924e06e30c483a9cead56097a324ab97260b95a6cb746a5d52eab58687ca5a5aea71c63f5739603a50ab2082afd381f SHA512 53ebbd077068feededcf1bd1be9da339b3e8c8665665d22cb3347ec80b8bfc625911218e9bbf72b6f5420fe9fd3a7726ed68cc41ab3f7019e1b416586e7ac4ae
-DIST opera-stable_56.0.3051.36_amd64.deb 56664360 BLAKE2B c815479fa67b3333585eef6a261a4fcce974a31a07427455f2817f0bc6277cd2778ec8dd3558da16e60b316225e7f5ebf8a1c52a3e9931383fc0b36d55e793fc SHA512 269654bcc590c5bf40e7998f9fe1940a47374c04de10b5b7c740828509dae72303f0975a0c889c648fc6c3297d994c2a1997ffdafb17e11e987e13fef87e1a92
+DIST opera-stable_56.0.3051.43_amd64.deb 55966290 BLAKE2B 8c4f9b3584974a93ad2fd9b170ed19b3836ebadb17e9266726f617e3002808029615bcc78a87487191fbcd5adf9b349c35fff471cc69c7da3d83ebc798fb2a74 SHA512 24c8682e7f41d5f62ded79fadf3dc04e74c1226481ede09c0b5442268d69aac84a3f713194648ffe6e802d12539ffa404dd8ec6df75395509b85e4547f72e0c2
+DIST opera-stable_56.0.3051.52_amd64.deb 56675592 BLAKE2B cbaafec8c8a4132187bfab9a13f66bb1ffdf5e9e677dcbda39f0953d0ce7768adfa65ed4ab19155f7da6e35d96848f8f836c630c620fba875f246a51bb999d60 SHA512 76869c151c37dfedaa4fcacb6f1a38ddcbb6cfec36dfacaad7e12977c3f2e1be706dc2820201f38f98391d469a5a3ca0ce15a61e1b04b5b74a6c3be375f94bc4
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-56.0.3051.31.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
-EBUILD opera-56.0.3051.36.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
+EBUILD opera-56.0.3051.43.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
+EBUILD opera-56.0.3051.52.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-56.0.3051.31.ebuild b/www-client/opera/opera-56.0.3051.43.ebuild
index 89d2858058e3..89d2858058e3 100644
--- a/www-client/opera/opera-56.0.3051.31.ebuild
+++ b/www-client/opera/opera-56.0.3051.43.ebuild
diff --git a/www-client/opera/opera-56.0.3051.36.ebuild b/www-client/opera/opera-56.0.3051.52.ebuild
index 89d2858058e3..89d2858058e3 100644
--- a/www-client/opera/opera-56.0.3051.36.ebuild
+++ b/www-client/opera/opera-56.0.3051.52.ebuild
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
index c1c57b30d2df..4026bdc8256f 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1,6 +1,6 @@
 DIST pybugz-0.12.1.tar.gz 25606 BLAKE2B 907a87346dbe0a949c3cf2c1b8e601dfbc0a1122c0647e8fc9de25b097fb5f31f39dd99016ee2febde11ac58f5cfb527127331e53f71fef3ad64de213664afe0 SHA512 bb76baf8105f4b56b106c3e63f5aebb322659141edf9c5e5af747db5824abffb7b127703ecb7111f9480d05bdb2f11b3fef2cd5f99078d9dda00e841b4ce7394
 DIST pybugz-0.13.tar.gz 26876 BLAKE2B fbab5ff308e137bf590620362fe102408444c7c1cb375f2c2d426cf5873fba5cf8759d7083be4c6bd305191680af8d1afc3aaf0648e186a93af4dd0b60442093 SHA512 2cbbd32b44d0d513e91e5c35dca5c68e34a963190c31f9139922f6b8ba69c7362063155b35833a00c2bd064f94d99367e2941a573aed4488f9a71a3b163d4b54
 EBUILD pybugz-0.12.1.ebuild 1109 BLAKE2B 1dc0497d725e601115955e0ed30c3675c584ea58cfa6db3052ea7a042f506cf9106c1dd148fb06b2ec9810c363f49d209acbc27f786bb880933782d883b7c711 SHA512 ba6414e1c15fab1ee7770afe9229f22b976e71eed1952efab6f9e3cee02146d83db8b60d81f041a70f70716bceeb10c984b4ef7b634588bf511df306badfecd4
-EBUILD pybugz-0.13.ebuild 1105 BLAKE2B 1f56186aa9053ae3c5a57a2357d3c191d070b47a7cf523cdb4550ce8c817a9f10bcef30ff440a5d4586e71e94587ca58cae04731eb9202cc56c066076aab8732 SHA512 e0e2bd50a53be0ad976fb16c6adc7b3e359c9a9d62a463fa7c5ce8c55294947ffbe6d72b5a4373a58f2523296ae44ad5526e2c773d2da4d529590e92e739eba9
-EBUILD pybugz-9999.ebuild 1114 BLAKE2B 2f251d1ba88f4744d3c86f165801c03657d472f613822e6c0cfd82eb3d5ee618c657b103aa5be7db652f0743b4f00e2c2247d527244d60ef863c42f5777ac424 SHA512 16a4d899163f01387c6dffbfc300f0304dfba442ac22eaf6760813b9c26ffc91fffeea0903e25ff243c9e967fec4846235e8d17a315cac6bc3b4f5665441c6df
+EBUILD pybugz-0.13.ebuild 1104 BLAKE2B c12424095f8be8a1db82d52796f7ac0a5e70c70728a5aa5b14ce619382ee1d216f67584b424fcc9b62478975a6f7a0513436b73801db97771d73fbf5b3077429 SHA512 f2b48966e46b29347ca820cf3364194274de2276653ccdca6796cff7c434e330c84aa94cb39a3c20287bd5f90c6426680b11f69e7ddc94c069446553b273c051
+EBUILD pybugz-9999.ebuild 1113 BLAKE2B b12a63d93396c78ba067ac046f660e0cfb6e3740987894f7b27fe103fb978483bfafbf355544a9bbb4cb568c327345667e8731e96466793e591dd51c6aaa9083 SHA512 1baeebfa9c4048dba6a80c6da48776fc0ce5d3afc786c6d171f40e54b77d4b9f4153ecb99a83af63684f1d92d708304507476af03bcc9d2316aaef704fff8215
 MISC metadata.xml 307 BLAKE2B 35d9a21eb8997a7ebed4e14a088ac85802c9828d3d968adc0b41b1c7f5a54d863747cd32a96624785e16caecb6ca0a5b645aec61459c19ce746bedd67000a3a6 SHA512 ae4880029f219b2a1db5b8975ae0b442eb23d9059bdf5798f79d2f23a7d43bdd5efd7e8c626cb3dc642936f7ae84bbdf66d9509cd96e5c986bba136c77668b75
diff --git a/www-client/pybugz/pybugz-0.13.ebuild b/www-client/pybugz/pybugz-0.13.ebuild
index 1376fb7ff52e..575ba97f84d7 100644
--- a/www-client/pybugz/pybugz-0.13.ebuild
+++ b/www-client/pybugz/pybugz-0.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PYTHON_REQ_USE="readline(+)"
 
 if [ "${PV}" = "9999" ]; then
diff --git a/www-client/pybugz/pybugz-9999.ebuild b/www-client/pybugz/pybugz-9999.ebuild
index 580e0af4cd1f..f53054468776 100644
--- a/www-client/pybugz/pybugz-9999.ebuild
+++ b/www-client/pybugz/pybugz-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PYTHON_REQ_USE="readline(+)"
 
 if [ "${PV}" = "9999" ]; then
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 148c27c1b9c5..ae2ff0c2f547 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
-DIST qutebrowser-1.4.2.tar.gz 3549553 BLAKE2B a3f5c6b8b12ca050618a0a949a29b38c6c02bbb2c754e959f691650f5283861ab7cdb1ae14844b2e8331eaf18f263c5e4c5279441b75393fcd2388890ad456c3 SHA512 bad09a49dc69fdf2188f88d94056f30cc7e0107e02b2acbcdaa64706efdf748e1bd499f28419c6a91438572f005070a379b33f431c38e437975f11aa69f49a31
 DIST qutebrowser-1.5.0.tar.gz 3565920 BLAKE2B e1915e1eefe6ba7ae7b4143fd6c289e6c521f0800cdd866158e8183315ce13f22053f51eada8c3797c3f3338525dd7a44fce75c21eacfe5a4b674382d091b147 SHA512 c77febd1f6dbe2d578f0935c0de0c89556b8c408eb5e6a265a77bf0dac2c2e81659debbd7989806b8e567acf8c42c16bf3ee6bd8115615c0246e6ae5a34f0ef5
-EBUILD qutebrowser-1.4.2.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
-EBUILD qutebrowser-1.5.0.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
-EBUILD qutebrowser-9999.ebuild 2005 BLAKE2B 03a01c10c1d39b85b98fd500a52ebdc62367f046bfafbae315827711f09501ccb9125f68124949844518ff3c1e8127a46742f70d4b02fc1e1f4ae4c6e4e248bd SHA512 51821081bdfc9a4650343c99fea14fdb7599f1691cd22014933a04303e92947aa73d9016531b21ca8a601374cd7a7b2a46c9bb18ca0841c9ac0915aef698d247
+DIST qutebrowser-1.5.1.tar.gz 3566699 BLAKE2B 55a5df744fa0558697ac38d020c40f358c64d9e47e887f77489c125ee359fa93b0af530aa5cb44491b98481869a7341c4b782055eaeace72be2795e763db969b SHA512 6db4ed253c9b69aeed190c4920f85e2fc87dda5403bd2b263cf92ec47569e64b8275677a45c4de4f255fd6f9987d90fc2ccacb7bb10eacad1ca683daa0ce513c
+EBUILD qutebrowser-1.5.0.ebuild 2016 BLAKE2B c8baa854aa36a9a7a65d357f762ae35a2bdf82e86d00d637d36db1a3cb69e46a3657deeb5253d9a2dc907cac00422b684b4185d324ba9cf3ea9192d467c962de SHA512 c84bb4603ad2c4236c15c294109bc0c6e46b805b2265541f72ded5f1037eec20831ae255ab85458b8aeae6f3357e292e7ee824c8d38a945c9f5ad25a0f0f440a
+EBUILD qutebrowser-1.5.1.ebuild 2016 BLAKE2B 08656591e6576d6465bb48ce0e4a51ffe952cd391702c39a2f8868237d817cd3e41b17790226fcff4fb04d86ce5772c7aad2b45d55cdcf7ba20a3c33cd3fdbfd SHA512 3cbbadcf0209765038f4a2fe95a89a76bc44503ce66d6d32322cd8b8bd4792651be06ad8846088de25fb112687a2675ac7334fd82adb7511fa468fae961a71e5
+EBUILD qutebrowser-9999.ebuild 2016 BLAKE2B c8baa854aa36a9a7a65d357f762ae35a2bdf82e86d00d637d36db1a3cb69e46a3657deeb5253d9a2dc907cac00422b684b4185d324ba9cf3ea9192d467c962de SHA512 c84bb4603ad2c4236c15c294109bc0c6e46b805b2265541f72ded5f1037eec20831ae255ab85458b8aeae6f3357e292e7ee824c8d38a945c9f5ad25a0f0f440a
 MISC metadata.xml 445 BLAKE2B 11eed2c826838fbdf314c3c1a070bf152fd440891896e5adf6614c29685a4a4c4f5bf46e767de31ef7fbe3ee057ae752f12cfa078c5dda41860cf41708844d2e SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed
diff --git a/www-client/qutebrowser/qutebrowser-1.4.2.ebuild b/www-client/qutebrowser/qutebrowser-1.4.2.ebuild
deleted file mode 100644
index e7535337c44e..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.4.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 eutils gnome2-utils xdg-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}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-"
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	if [[ ${PV} == "9999" ]]; then
-		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
-	fi
-
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_test() {
-	py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	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/www-client/qutebrowser/qutebrowser-1.5.0.ebuild b/www-client/qutebrowser/qutebrowser-1.5.0.ebuild
index e7535337c44e..2ac3df7f628e 100644
--- a/www-client/qutebrowser/qutebrowser-1.5.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.5.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 "
 
diff --git a/www-client/qutebrowser/qutebrowser-1.5.1.ebuild b/www-client/qutebrowser/qutebrowser-1.5.1.ebuild
new file mode 100644
index 000000000000..dc148cdc4722
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-1.5.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit distutils-r1 eutils gnome2-utils xdg-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}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,multimedia,network,opengl,printsupport,sql,webengine,widgets]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+"
+
+# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
+# isn't complete and X11 is required in order to start up qutebrowser.
+RESTRICT="test"
+
+python_compile_all() {
+	if [[ ${PV} == "9999" ]]; then
+		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+	fi
+
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_test() {
+	py.test tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+	domenu misc/${PN}.desktop
+	doicon -s scalable icons/${PN}.svg
+
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	optfeature "PDF display support" www-plugins/pdfjs
+	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/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index cf674525e31a..2ac3df7f628e 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 "
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index edd494b07b2e..4169819e5868 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -24,4 +24,4 @@ DIST seamonkey-2.49.9.1-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3a
 DIST seamonkey-2.49.9.1-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
 DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
 EBUILD seamonkey-2.49.9.1_p0.ebuild 12772 BLAKE2B df92edd700ab71f3ac14af6d04bb31dc44d29c41082706f704543e71493605bb25a5e289417d3b2284c8f10ec55cb476ccec382a88d7fae754135f83e78fa96b SHA512 1f78461f5f0af1b3a6901481b2f9a9f2e5b15bb1e91c54c44987be253bcac9b7a0020227c8a7b2671305601de4155a7d4afc07854150d3347ff1764e6fccf557
-MISC metadata.xml 1882 BLAKE2B e72fa92838230026eaab872a858ba54ccecf47055bff324215219f785e3143daa13984d1f8b2bc746d8a0cc1a07c74a0ee2067f029b92df098431a43588a27a3 SHA512 d533b6033b37fe1410722b2f005a147e1508a2e9a390176a199b15a6464ff5b354ba5ee2542ea243c33b4d4d1e1f91b6e331f9bf43f13b0ef1ceb973e8e9e117
+MISC metadata.xml 1824 BLAKE2B 877054e919c97e12d11882714747601b9f455dc73304be2656583fc2875ae68a2178b2afd4d4adbd25c1f13b938c24d6f7d07c4808d85c70c4753dda1dd2677c SHA512 b5a1ea2051d02dc8ccd79d36c7d7b169dbb4fa694d1319596386b93cc9c695cde8aeac15741ff668f6e6ec6e1b77e3140c260f81579a91ca4e581107b51749c6
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index c817c037ff70..b240cff91141 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles</flag>
 		<flag name="force-gtk3">Use the cairo-gtk3 rendering engine</flag>
 		<flag name="ipc">Use inter-process communication between tabs and plugins. Allows for greater stability in case of plugin crashes</flag>
-		<flag name="jemalloc">Enable or disable jemalloc</flag>
 		<flag name="roaming">Build roaming extension support (default on)</flag>
 		<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg> instead of bundled</flag>
 		<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg> instead of bundled</flag>
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 6344bdcba270..6dd49cd6b095 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-snapshot-2.1.1317.4_p2-amd64.deb 58852884 BLAKE2B 887de4a17ef097d87502e65ae6ee89c4f8e51d8225d870a1b352ad6d9d51170ec87b2fa42a0d749b8654789b374d30a7af599dcab26c1314178106b801a2f5cc SHA512 95b3dc1c2f78f2730edc2e30697c8ce49ffa954874c537af24dc0636e42563e81b8d2f0762b4a16a4047f9751d8fe5da0299b024d4b84048f6e2ebd3a2bc9e5c
-DIST vivaldi-snapshot-2.1.1317.4_p2-arm64.deb 51161024 BLAKE2B 60c14b57fee6e39a05b9d7d62a327d961c5ec8cb2239b21f51c5f1fa98752f93f86162cec6176a1342d6588e95d818bcb79b2f331ceb11c4ce422f8925922926 SHA512 311cdec2f8063fb20dbb410cddec7013d251971f73d278be8dc5d9843a7901bcd1bd1f6aadfeb1f4fe7df118a31696328cad821b3b85fcd594b2b1d47b5a1fc9
-DIST vivaldi-snapshot-2.1.1317.4_p2-armhf.deb 51996466 BLAKE2B c2ed497b681ce0523cd0fbe0eedccdce656357b65bf620b27a80a499ead390af68cf0958d21f0d59af393248e7ed3b896684c9e9cf6d0514af273c4b8784525b SHA512 bc4e5be2c4f36f80a4a19e7530a523b95c28b654f898f34d97ebd72d83754101280355f73bca5388d90b858d4aefd2eb0d836fec9541b069ec6ed44f6c3a8503
-DIST vivaldi-snapshot-2.1.1317.4_p2-i386.deb 58080282 BLAKE2B 5da79ebbb45986ab267744ef675c16cc4392742da74610f33f8dc167945b8177531c66664990d53a1ae45d85d82aa3f269bb9c97fc8e18292cf47749c904401b SHA512 c32f14ed23dbc1d174ccea8e9b491de5f2e200a5e2aa5c56ca078b9b4ee03e40f1802113b37343d70a38e716305de6e0588b67cc2a8e12d7526e7456cffd5294
-DIST vivaldi-snapshot-2.1.1322.4_p2-amd64.deb 59786836 BLAKE2B b8bff50bdb60c21274cc4b1789423ca71961539e6ffcaaa25e8085cc98786267d391fc724dbd0153bd11f9c4e1ed1df31d2028d93b9433f6dd76ae415ddc0b9d SHA512 fcb6b4b91cc393f839f77d1cfbffa455779498573bdedf915fd853b8ec37e107f78cfdfc1152053594644b006d336fc70f41386e0d11a83e03f6cb902871addd
-DIST vivaldi-snapshot-2.1.1322.4_p2-arm64.deb 51899344 BLAKE2B ea2583529002760eb79c76110605f2b5600fa244583f6df06a4447b38fb4fc62c4b5fbd4ab9c08c7795a66a48f5c1585b67c540e653ef2adfc2aa8200031f43d SHA512 ee1578fbb3f22dbadafde60b3cc415bd0b2250bcfc61250f57c5c0158ba55a9cdedb44087d6c1995c923d05f765d049d7f77db3d559d6b05e35a3a5e65d02c2c
-DIST vivaldi-snapshot-2.1.1322.4_p2-armhf.deb 52667198 BLAKE2B 5cac3b2da91026ceab5b2cdac5a002ea80fba7dc4b0588443687a04f7bcccf35e83d87de77a50c357acd95a580e50977ca20ced0cad47ce4a02d3dfc8a81b4dd SHA512 75a3fd46eb2a5c3128d8e46eac12cd432da203ff658171725e0f2b833b5fe91bb4caf4f029fb9d4fc1607ab97052135826b7d61bac0d401da1da98a48ce6a579
-DIST vivaldi-snapshot-2.1.1322.4_p2-i386.deb 58598378 BLAKE2B 7f7b205303a8d8eace01c9f94326af2ee6b92cc37c993cc2c18ccbf70e2a27ca16dbdd8f35de400811c86264f1c6374fa7886ef47b4e405edec38e2b05550d85 SHA512 46d14eee44bad24660e9489bcdfc88aa53ee63fb7cf2b81d7f16d23a0c0e26777c0af9059a311444229cf17e1208b2f32bb301c0a07e14434615b600ddacad3c
-EBUILD vivaldi-snapshot-2.1.1317.4_p2.ebuild 2621 BLAKE2B e882d2ad4124d27fd3b7f5ebb7428bbf73d7b9576c303c890e03a510d9218585c006838022eba6164651615aaedd6d9984240fb06f42097e69053c74fbdd5f37 SHA512 8ba29ea3575a298ece9825ae5eaeedadfe4bf7bc47c9495191320293869a524b8bf656a7ca718cfb4eec8bd1735273cb0ed830891728a9f786620401e1fc4721
-EBUILD vivaldi-snapshot-2.1.1322.4_p2.ebuild 2621 BLAKE2B e882d2ad4124d27fd3b7f5ebb7428bbf73d7b9576c303c890e03a510d9218585c006838022eba6164651615aaedd6d9984240fb06f42097e69053c74fbdd5f37 SHA512 8ba29ea3575a298ece9825ae5eaeedadfe4bf7bc47c9495191320293869a524b8bf656a7ca718cfb4eec8bd1735273cb0ed830891728a9f786620401e1fc4721
+DIST vivaldi-snapshot-2.1.1332.4_p1-amd64.deb 58107088 BLAKE2B 111424cb9de5aaab2281f390cdd4405a2913bc1fe82cb9ac6e5af971c19ce5b39fa1bfebaa094b6146f7fe8fc22fd6013cbe1cbd001bb527fcc9a1d3076e339f SHA512 90e83702871a2ed9af3a00cde90a192b450defe01cdc0e14c6478cf0897724927055ec7d6855b437788d85fff1d891142a174cc35784bfbb5d6eb97e2f1f3ab0
+DIST vivaldi-snapshot-2.1.1332.4_p1-arm64.deb 50357660 BLAKE2B 47af324087647fa288a265f5e386771895ee78bd905512624255108984190f20396724000ffea3d1917b1df3ebfe5aa996bf9e2f8a22387413aa7a5a2715315a SHA512 06038c1f87a5704ccdd208bf892ca3608d5b096d5d7ffe0f7a56637098c477c73013f49b6584b3567cce00a9eca25e52c88c561e6e65ba930cd046ad94e93727
+DIST vivaldi-snapshot-2.1.1332.4_p1-armhf.deb 51256222 BLAKE2B 65a39ad25415e4937e8698446f7a97bcc7cce2bb425df7ea88dac42715e1575beeef9b570fc987b1b5419b3146c0510a6df0ad5bff9167fe07cd683f53b20808 SHA512 f3c036a73ec3f3a71219b9dab740348467b275c9fc3a0f5c45b44d4e8ee4e7ac9e64084dd7be2283518126e1477688b46a1d6bb3b94e357c689cc74e9b9afa07
+DIST vivaldi-snapshot-2.1.1332.4_p1-i386.deb 56904124 BLAKE2B 10fec817ec87946b07b2b1cc2b15f4008a1f4a58d1798a518709abe3fcaf51d2067d542524a738871916698e557693739c76c835b44f46ce2aae1da8001fe0da SHA512 3279913022fdcd55d60ac0ad3ec4697f5f0b21f6b7c73c0887fc8ec61daf9970214b310654263ba752c2f18951f341a9cc0f39aeb32864b634e3fd794ceab766
+DIST vivaldi-snapshot-2.1.1337.17_p1-amd64.deb 58480706 BLAKE2B d86a87f199cfea16f855e56221ca9baeb75045f02cc39e8384eb1278b96468bc39e53c0d32cb63550c81a47794887997a25ec354bb2f9f1afcabe4c5ca333ca8 SHA512 84e49b82b3b499eed088e8c32b3509a6a0fc594ca6b1dda556b987a95a25daad69d4d5e597feeee49064b7d2c93ba783ae783bcac8992f8111ecb700cf116b43
+DIST vivaldi-snapshot-2.1.1337.17_p1-arm64.deb 50290640 BLAKE2B 7caba0afc906f410da12182a7de595b6eda0e30369e8a3c7755d346a0d6120770566357a2df4a78485551281345ef25d19a6b62395a9f741856ab65ceee6be1b SHA512 6501426fcca421ba156d1db4e4da744ce5cb2e51579d3e182393f3349f0e569f9d08f7c1ad1c8db7ed9b3e2569b71b0045e0a4a31d7533d4ca2df08ffc14cd36
+DIST vivaldi-snapshot-2.1.1337.17_p1-armhf.deb 51215486 BLAKE2B c7ad32d3eb26c2dda805bcbdec0d45b9f458095dae0ec3ed674c017d043490803ebb86abf85059c4a7ef364aaa27bbdcfb1e42138758d207ca5ccb6db3494f31 SHA512 d9f968ebb05e26ecd14b3c5ec82fc628fbbbe314d9ccb2c847a4882db49e48e73865e51f8387595c9f7f7ec51be04612595c7aa5a56d52cab04ce22db7bb13d0
+DIST vivaldi-snapshot-2.1.1337.17_p1-i386.deb 57383112 BLAKE2B a7f12b8b952bbaf12e9499c6c029e98d42096bdfbaca2d9c8c28582a2ece9fb054062d4d259fed5d700047cf7065aa9f4f1f9f5ced1dfebd90fcab56a4784362 SHA512 3ca65c6b68a4d9baf7d1bf5b7413d1a3f191d1fac83d46bed5da0e16d73fc00574200b2977e7c39b0cceecb1f0a6906a977a8e5682f9dd88ec2de97a302c246d
+EBUILD vivaldi-snapshot-2.1.1332.4_p1.ebuild 2621 BLAKE2B e882d2ad4124d27fd3b7f5ebb7428bbf73d7b9576c303c890e03a510d9218585c006838022eba6164651615aaedd6d9984240fb06f42097e69053c74fbdd5f37 SHA512 8ba29ea3575a298ece9825ae5eaeedadfe4bf7bc47c9495191320293869a524b8bf656a7ca718cfb4eec8bd1735273cb0ed830891728a9f786620401e1fc4721
+EBUILD vivaldi-snapshot-2.1.1337.17_p1.ebuild 2621 BLAKE2B e882d2ad4124d27fd3b7f5ebb7428bbf73d7b9576c303c890e03a510d9218585c006838022eba6164651615aaedd6d9984240fb06f42097e69053c74fbdd5f37 SHA512 8ba29ea3575a298ece9825ae5eaeedadfe4bf7bc47c9495191320293869a524b8bf656a7ca718cfb4eec8bd1735273cb0ed830891728a9f786620401e1fc4721
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1317.4_p2.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1332.4_p1.ebuild
index 91b5d4fe6abf..91b5d4fe6abf 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1317.4_p2.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1332.4_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1322.4_p2.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1337.17_p1.ebuild
index 91b5d4fe6abf..91b5d4fe6abf 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1322.4_p2.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1337.17_p1.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 1bcdaae7ab34..0340d23e4589 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,13 +1,13 @@
 DIST vivaldi-1.15.1147.64_p1-amd64.deb 52878648 BLAKE2B d08f55f4e2e3a831d4a50a7401eaa7385452f47f28d1194cf8549f27244bf2ea0985d77602149be20b0eba6cecf6acb28d7f3029b19497db7063198f4e09a856 SHA512 f9f2d4073d87a57bfcf28d3d51e78f45a69e4db86c44eb9fb89bd1fcf14561239f90f112f8c07d0004ed740fe2495d10c66f49bb7d99f9c104f28df38d40013b
 DIST vivaldi-1.15.1147.64_p1-armhf.deb 46832630 BLAKE2B 9daa424babfb71dcaba253a98e88a3aba1cbcee9a1aa870070b89ef58a48bd01dc54d3de0e9641b3f1b43f7523ad13a3a873f300304b60b2a8d86b0facdf2125 SHA512 8159afec10f8c6584dc8f28350fe30de155977d1e7b14a269bdd0bf3818a39381fe341e0fadf0d9cc9a683d9c4e2115dc3ae796dca41da4efd4703de572734ec
 DIST vivaldi-1.15.1147.64_p1-i386.deb 52496664 BLAKE2B 3b246203e11c0654bc455ca96194e236c931453f4889fb474a07a0875358642c57425f208ca3a739bdac76d6bb36982c56930bbf290983e666dbc165454dcb8b SHA512 7c5278cb3341bc8932d82005b062324a71fd025e67f3c5d9eaea83ff636a5b7462c33e2cde6efd37e7095df2a229a4dcc8a82b27bccc61905f46a19163134fc2
-DIST vivaldi-2.0.1309.29_p2-amd64.deb 57575078 BLAKE2B c35cadec153f8d00f55ac5e30281f15bbe60ed9051753787453224fc44e98baa63e67613e59e947f80586e6289c518fbcf9890d73102135bd7ed0612345eaa05 SHA512 5c07c13a2c6b5a8220bcd618796f0acdc363ec72af885939ec515e622cff5b5efc0c3b5818e31fcc668d590a1a13576532c8872dcfc95f7e99a57df50e828ef2
-DIST vivaldi-2.0.1309.29_p2-armhf.deb 50850396 BLAKE2B fabc41a1e19b7bde4c824e8ada8759d2268bbf4ea5e9894a4cf17abb5b75ee66ec6717bbb5fcbe7c20e8ae41caf5870a8dc989446f607cf3448e8b20152fe2f2 SHA512 2637911ab51a9150d586be6bc61cd5f82b1f8d98b094b5d92afe3170245b317525936572106192e3265f61c993bd8eba7f0c9fc46ba98d02768f358dfdd62557
-DIST vivaldi-2.0.1309.29_p2-i386.deb 56864360 BLAKE2B 82f243ef0a6976bc52a66875d59ce9f1052dd1bb727fd51d7fa000b22d37c2b573a024b6b90c794825090a153dd91aad408b8387cc2371f866827d049228a05e SHA512 9ef2001b13330695530c1b318107c4db6738b75f08877a53ae1ec1e32fae7749006f770b0a4381df6bfbad500033e73f9d68b855ca563d2cab9c64fcd20cbdc0
-DIST vivaldi-2.0.1309.37_p2-amd64.deb 57597642 BLAKE2B fcfdb5f04ac2821a975d0b7085fb81404fe70035afbd2ce50e2c322070ee1d8f16105eeddbaf416828283535db08f9e3b3ce32b1d3a70e7f1515e685713468c4 SHA512 b616c00be20e3790267c602e07834cc6e7b0ccfaf4aa32ac2d308ef41e3c35ace23c1bd9c5d96da18b37dc2faf4e8618c1c07c1f4c635282cd100dc746dfd3f7
-DIST vivaldi-2.0.1309.37_p2-armhf.deb 50850020 BLAKE2B 55478da8d46061ca36f3386d05c60eb49b4039f9af48f4338d871f15a07e24828cfdf50a10bc6485f8cc1895d308d76896cce454036686f65e288064301b9bd5 SHA512 9327743f1bc535eb36c304fe6e05b1da7db3c424c73a9a47ed6657f9f621ecd433d2c7f6ecd5cb2a68a7058da241b8655dbf90495fada27a09e8c05dda20a3e0
-DIST vivaldi-2.0.1309.37_p2-i386.deb 56890714 BLAKE2B 91170d73f569e7d5b973cffba027ad7ee98b342dde3bf4d51590862505039d551244d9607ac25d79979dc7ab7cbf27b1ef461fc89d2f0828c83e5c0b16ecad23 SHA512 370da0b01522d7b70854f1a73c05035d461088a097a13d6950e1d0b5ed0536c3fd50612c2d939e0ca834c2aed1481942e5baeaa247cdaeb70d6220c9ae3b2478
+DIST vivaldi-2.0.1309.40_p1-amd64.deb 56228348 BLAKE2B 6818250191c3b3a658d543b537e5dbb753a4570e1d56e690c45ff2a3daf519435e8099a2f0a5d5f76dda8a58b5fc2c944549f9b530411ea83fba76f9be44a209 SHA512 f7d52ea615615cb72f16ec2e42fb2a767b2dccfc74f01282a5709858876c0ea804b5299920178683b237b63861939b9f34a5d6aff9057b478498389f05c50a74
+DIST vivaldi-2.0.1309.40_p1-armhf.deb 49870528 BLAKE2B 3474634e3b9a648fb95068e96728ae90b4054c9c8af442e809700776cc2ecfe8583a203ff44162fc7dc3ea424f461b12522b308bd50a20cd3a00f0a9797d697f SHA512 3776560e41900acab5dcd27365cad872b1bfe1fd4d9c3a046b8b45c327bb78ac8f52f271d129d5360601bbb8d8743c3ddcd70fd2e0a8b9b2b146e5f8aa5683bf
+DIST vivaldi-2.0.1309.40_p1-i386.deb 55518798 BLAKE2B bc32914d537cb07d306c54625ad90477c12fba604bd21d678624706d374fabfb3385d756dc8ea1bce2ac1b96432e99469bd03d2b41679b406399642e16fc28e5 SHA512 28cfc62aaf97f4c2774a6c98af0fe3b95c5ad78ddb2c77987f279a81835c0ccbe481fc3800acfe899ce0dfc0344f47c79329050bd06cb70253bd06feb950807e
+DIST vivaldi-2.0.1309.42_p1-amd64.deb 56271120 BLAKE2B 0a1f358692ba0d8db4be6f735bbe567dda018b578eb3013e828876919fdf78db563993691978fb261432c812432ad38a1dd5e61cef43c7ca06e7960d8272a8d8 SHA512 b3cf26a4524626287a38472c4d26cf89560f22d5ea7d272f5be49dbe13f5d83d74bd2eda893eb665eb7886f740bd7d70d23fbd796395a0cc17233ceee874fa28
+DIST vivaldi-2.0.1309.42_p1-armhf.deb 49878626 BLAKE2B 36750726b7f9386214e27194158409b2637546858fb0e53d82645ab933a002eb2231829007b766b65bdb3ef85a95a82f2531080f0c99ee6063922be61aba2c3e SHA512 24885e94ae680618e922f303ef0989fd8a40a697eab7d7504ef3eaa711f3c3c5786076487dd6b64a0299137d96f6db29ddcb8de30b5e478355f54bf2a83c8c97
+DIST vivaldi-2.0.1309.42_p1-i386.deb 55525322 BLAKE2B 15b93162b5880adc2159d026b0638830adcce7fb194d52f15cba77dce24168cdba2ecdff1ac74d384b7e857fa81efd5fe45472e6558e3b76968991f9821ce778 SHA512 eebedd6c275621602b4034d0872b51a54cea28850fe4b2fb959aa9b049f60d325037bb80b78fd447797841fe651a05e2d3c1d209e44153504f9e8175db0eae3b
 EBUILD vivaldi-1.15.1147.64_p1.ebuild 2870 BLAKE2B fc9de8b2fe9abd757136231329e48dd936dc0330e87af8b97ffc40443a8b130d39eba9a025fd01f4903eb851203cf2ff15aab8cb7f93cc2b7be516f57de55243 SHA512 9e0c40988d5713e4403ef273d0d627480da23e26f1ff3f008f3681ba72a3e5244b5de409b4868d3687310a7b36dfb320d7f3bd2501de1b7bc33e152aeb62154e
-EBUILD vivaldi-2.0.1309.29_p2.ebuild 2914 BLAKE2B c7358066060d6eda51d2138fda438cbb48b0bdc0053f51d6b803b3e35985614cd22613b9bbe941700206006b933d21dd595ef8ef357218a4f6d049e13b7a7741 SHA512 71dc9acb076a7c4780f646301d6eb43b6ca1c9c98805b7d483235c9b13c2f2b35e8b71f7753fbcbeaf05c28fb3844fe9d3593617d3289088c9b4d8833e4dc704
-EBUILD vivaldi-2.0.1309.37_p2.ebuild 2914 BLAKE2B c7358066060d6eda51d2138fda438cbb48b0bdc0053f51d6b803b3e35985614cd22613b9bbe941700206006b933d21dd595ef8ef357218a4f6d049e13b7a7741 SHA512 71dc9acb076a7c4780f646301d6eb43b6ca1c9c98805b7d483235c9b13c2f2b35e8b71f7753fbcbeaf05c28fb3844fe9d3593617d3289088c9b4d8833e4dc704
+EBUILD vivaldi-2.0.1309.40_p1.ebuild 2914 BLAKE2B c7358066060d6eda51d2138fda438cbb48b0bdc0053f51d6b803b3e35985614cd22613b9bbe941700206006b933d21dd595ef8ef357218a4f6d049e13b7a7741 SHA512 71dc9acb076a7c4780f646301d6eb43b6ca1c9c98805b7d483235c9b13c2f2b35e8b71f7753fbcbeaf05c28fb3844fe9d3593617d3289088c9b4d8833e4dc704
+EBUILD vivaldi-2.0.1309.42_p1.ebuild 2912 BLAKE2B 34c217b5a8ed91836102ed0704d04e584bad47db6865eab825201f2d315b5ee291dd0350b0fa76aee9298705e1517374392dbff67c79353d487509fc356af313 SHA512 9d98a8b01a0078d30b91061bc479064016d318165f00508a5d37a9915ab5e037433d2dade42b3adc1d859b3ee3a6d30c0a8f5e933fdcd8960110bad51718d8e8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi/vivaldi-2.0.1309.37_p2.ebuild b/www-client/vivaldi/vivaldi-2.0.1309.37_p2.ebuild
deleted file mode 100644
index 5978d2dcb6e5..000000000000
--- a/www-client/vivaldi/vivaldi-2.0.1309.37_p2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_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/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
-		${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}/${PN}-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/vivaldi-2.0.1309.29_p2.ebuild b/www-client/vivaldi/vivaldi-2.0.1309.40_p1.ebuild
index 5978d2dcb6e5..5978d2dcb6e5 100644
--- a/www-client/vivaldi/vivaldi-2.0.1309.29_p2.ebuild
+++ b/www-client/vivaldi/vivaldi-2.0.1309.40_p1.ebuild
diff --git a/www-client/vivaldi/vivaldi-2.0.1309.42_p1.ebuild b/www-client/vivaldi/vivaldi-2.0.1309.42_p1.ebuild
new file mode 100644
index 000000000000..548c8b37f6c1
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-2.0.1309.42_p1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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_BRANCH="snapshot"
+
+VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
+VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
+VIVALDI_HOME="opt/${VIVALDI_BIN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_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/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
+	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
+
+	sed -i \
+		-e "s|${VIVALDI_BIN}|${PN}|g" \
+		usr/share/applications/${VIVALDI_PN}.desktop \
+		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
+
+	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${VIVALDI_BIN} \
+		${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}/${PN}-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-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 0bd80181ca83..2c67dee3fa12 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 65156d235abe..42d5792a66af 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,9 +1,9 @@
 AUX mms.cfg 4420 BLAKE2B 4557315bfa6f8edb6c8b28907065cdac3771175bd36a8ce2b6e72f0e1f0af20a7bb1ea8abb67f5c7b16fcaa7dd81c3eb89f926957d2ae5fffd499a7e6e709354 SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd
 AUX pepper-flash 151 BLAKE2B ab58f8d7dd307fea0d53b7f58887e3caeef8913940d6bfb662a42cc1f475ec59009998898e991d7a82d55a26ec1b2fbbc8b2a626fb8c9ba0d2da1e1735ab26ac SHA512 f20176b9567097482c3b1fdd062affb33a69b671f6298a98cd58e03ca80dd01bada4126ac5fd940fddc53a097669f52d4b8bba7850daf211e11dc24cc4d97eb1
 AUX pepper-flash-r1 143 BLAKE2B 049f7ec4e3df5fbdaa62e40acf8d21d42f61789c6d9ecde64f300df3d3c51f2b5580fb571ebbf172d590799801c632a2eb4daa01dd86e318441719ff6412f3ed SHA512 e4e1c1f204af1e5ce531dd43a22b4cd08e8def1099bba88ac96af09bd0879dfbb6383653ec85d5d199d418098e4b17d71998bee5a9fb5bb7bd8873432a4f66ee
-DIST adobe-flash-31.0.0.108-npapi.i386.tar.gz 8529291 BLAKE2B ded98c85f55dbc9bc80b89e6b787fed16d3123d0941e9cefbb3f843c2f35df483b4ebe0f5f078b2e99e3606845fb0e7e9b79990b72f5f0c4bc6f78598e954f7f SHA512 ef11942c9b7d69cf610885f53c1b1cee4e44c81d5229faaa6d38b30d4846892250ec0366deaa84d98ed1a8e12e526daf2c9a39f6a2e1f7f590914983f32b7641
-DIST adobe-flash-31.0.0.108-npapi.x86_64.tar.gz 9047129 BLAKE2B 11a3d90683442261ebb79fbc21bdcbf31b4369815c74a6460d7b59b01b7f0d8444143b540c7635c07aa3fd300feaceb1e3e6b1812d0c6b4f1b39f21cf5ee2a12 SHA512 6cf83b12002220aef393115b27e6b3e4bcd9901c3e6c782bbe2a0c2fbcee498454d34cecd6c629252b24c25966e2703ca9b5b193d14fcb0a3be39ebd38fd2a18
-DIST adobe-flash-31.0.0.108-ppapi.i386.tar.gz 8561961 BLAKE2B 4917fb4188b1c12e077babdfa0def0148bbad95359a48fce9ec94d934341c00aae6e19879f4287058706992baa6a44b3047ef5997d8f18ea2456c0701f61cfae SHA512 4ddaaeaf2fe5768ffd8fd91b97021625f1f9472c58ec51e2e385113e90096e51563d04cca9d7fb1932e818ff3c6a6370ce95b356882e846407af00f58c41e3ff
-DIST adobe-flash-31.0.0.108-ppapi.x86_64.tar.gz 9479466 BLAKE2B 13b8165081aa9e99f164406c23c4a816ad6f2e2ea235e0d8914626b6b70fedddcf641d1879a5b6ca4e41194cf424f877928bd2a93b408d8bb763d8d01c55c2eb SHA512 e4846fdd0301e7f4df811128c97bf782d34abde60c440e66335cdd99cc458a5ac120cc4f8ef7707f7383dbc89db3d9ecf46cbd39822f4f889b3e9664e61a1091
-EBUILD adobe-flash-31.0.0.108.ebuild 3662 BLAKE2B 498cd0a7cfd254b95c9f597a640131189fdd0c18889c0f932cdf93b07d4d9f5e19205f4fd625942c73bea2531feafb04266cb528d121352752629d8abce61519 SHA512 aa2662560e571a3adce5860f107ce640cf5dc6a8a77f75223f76cebdace872e7d6b305ed9c107efd0b48b379d19fe4477bc890a231b14bc8ab2fcfa76183c9fd
+DIST adobe-flash-31.0.0.122-npapi.i386.tar.gz 8529106 BLAKE2B 71984e263ec5fb1720288208371551a74a22a982832dc16b2da314fc1fc1ee1009faf36b2648e9ed52a6eb4b7a34a5ffef5af266e31daca0fc3049162cc6c4f9 SHA512 8383f15cf14528a9b3bbf15b880b530f15fbec18708ccbfce83bdd6ec6bef8b7b7fd8f8231dfa534e42d077ef7b5bf92627a6fcc14749abefca748b307680e4b
+DIST adobe-flash-31.0.0.122-npapi.x86_64.tar.gz 9044791 BLAKE2B 4f659381aeffd1a46e8a72cad7612c9b626ff0bf208492502c887a9bcd5beb9888bd8063265a81dd3b848fa97dedde327ab4563b262719fab7620912efe2c1e6 SHA512 c8f27ef630ac6797c0879b444499e954ba5e46564a9d35842134fb963cf7866bbc1badbc773ccdce928c158c716d63d91b79e47b10f8388c97493dd16bd66911
+DIST adobe-flash-31.0.0.122-ppapi.i386.tar.gz 8563099 BLAKE2B 0951b14ed7a3c8ea7dbb7ab2de93521435a164a4358f20084cb3e407fb45d19561fd17871553bb2a39da9caf7dec17388d825b51ccafa8184e6fbfd006c328e0 SHA512 fc2efd870a6a2fabd53b1c6d095fd0ffc6c9e1d05a13ebaec93ea31bc84e022e8b54e8c2194a42a54dd3258c8d2fb378fa14205acb3c4a876b07c48e40c18d96
+DIST adobe-flash-31.0.0.122-ppapi.x86_64.tar.gz 9482137 BLAKE2B 25585e857de26917880aa09289b7ea2e3b0191f958495d2523461ffd55869a67808c604b9bd5d80c9ea4326df9b72a5a4a3c47a8f2cb32071093df9a7f7ea673 SHA512 64e18f58ce7abda62aa098c47c260226f67d78e17698175629f2777fbcde84b2bd88e80b6247af34bcfe6bed3a558e767b43f45fdf2164cb974d59e70751a4fc
+EBUILD adobe-flash-31.0.0.122.ebuild 3659 BLAKE2B 9d46597ab12ed0a7192d58ff8f55cbbe7eea0abc4ce3f54e102627eabc6cc2c5c4ae962a630bc38eb8b1cef6b2af0e21ba53849f5d7ea150fb7a5241c482f6f6 SHA512 cad71da8394e5dfcbd021e42ea08a8812ef2a803a479e4b89fb657a386fcebabedba69a71951a949b9c4e029d127eabfa5309d046fc875714a64531fb6da7e2d
 MISC metadata.xml 552 BLAKE2B 56ec8c5f43e9624c4102f52834b63855be35d064ce05bfbc866af225fb8e60cf1b83e02c9917b474183b81cad9e4ecfba7595d8de7fa94974824d2a7f4de302d SHA512 0f84cf3e517eb92f73629e6a157a2999f409fa6dea40682e2248edeb957e5bc6f5228c49aebdc3b5d434d0fd8f717a19c793aee8776397871e1bc5ebf8cf7fa1
diff --git a/www-plugins/adobe-flash/adobe-flash-31.0.0.108.ebuild b/www-plugins/adobe-flash/adobe-flash-31.0.0.108.ebuild
deleted file mode 100644
index c0de0f4b7479..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-31.0.0.108.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils nsplugins multilib multilib-minimal
-
-DESCRIPTION="Adobe Flash Player"
-HOMEPAGE="
-	https://www.adobe.com/products/flashplayer.html
-	https://get.adobe.com/flashplayer/
-	https://helpx.adobe.com/security/products/flash-player.html
-"
-
-AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc/${PV}"
-AF_NP_32_URI="${AF_URI}/flash_player_npapi_linux.i386.tar.gz -> ${P}-npapi.i386.tar.gz"
-AF_NP_64_URI="${AF_URI}/flash_player_npapi_linux.x86_64.tar.gz -> ${P}-npapi.x86_64.tar.gz"
-AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz"
-AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz"
-
-IUSE="+nsplugin +ppapi"
-REQUIRED_USE="
-	|| ( nsplugin ppapi )
-"
-
-SRC_URI="
-	nsplugin? (
-		abi_x86_32? ( ${AF_NP_32_URI} )
-		abi_x86_64? ( ${AF_NP_64_URI} )
-	)
-	ppapi? (
-		abi_x86_32? ( ${AF_PP_32_URI} )
-		abi_x86_64? ( ${AF_PP_64_URI} )
-	)
-"
-SLOT="22"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-11.x"
-RESTRICT="strip mirror"
-
-NPAPI_RDEPEND="
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	media-libs/freetype[${MULTILIB_USEDEP}]
-	>=sys-libs/glibc-2.4
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXt[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	!www-plugins/chrome-binary-plugins[flash(-)]
-	nsplugin? (
-		${NPAPI_RDEPEND}
-		!www-plugins/adobe-flash:0
-	)
-"
-
-S="${WORKDIR}"
-
-# Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="usr/*"
-
-src_unpack() {
-	local files=( ${A} )
-
-	multilib_src_unpack() {
-		mkdir -p "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		# we need to filter out the other archive(s)
-		local other_abi
-		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
-		unpack ${files[@]//*${other_abi}*/}
-	}
-
-	multilib_parallel_foreach_abi multilib_src_unpack
-}
-
-multilib_src_install() {
-	local pkglibdir=lib
-	[[ -d usr/lib64 ]] && pkglibdir=lib64
-
-	if use nsplugin; then
-		# PLUGINS_DIR comes from nsplugins.eclass
-		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
-		doexe libflashplayer.so
-
-		if multilib_is_native_abi; then
-			# No KDE applet, so allow the GTK utility to show up in KDE:
-			sed \
-				-i usr/share/applications/flash-player-properties.desktop \
-				-e "/^NotShowIn=KDE;/d" || die
-
-			# The userland 'flash-player-properties' standalone app:
-			dobin usr/bin/flash-player-properties
-
-			# Icon and .desktop for 'flash-player-properties'
-			insinto /usr/share
-			doins -r usr/share/{icons,applications}
-			dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
-				/usr/share/pixmaps/flash-player-properties.png
-		fi
-
-		# The magic config file!
-		insinto "/etc/adobe"
-		doins "${FILESDIR}/mms.cfg"
-	fi
-
-	if use ppapi; then
-		exeinto /usr/$(get_libdir)/chromium/PepperFlash
-		doexe libpepflashplayer.so
-		insinto /usr/$(get_libdir)/chromium/PepperFlash
-		doins manifest.json
-
-		if multilib_is_native_abi; then
-			dodir /etc/chromium
-			sed "${FILESDIR}"/pepper-flash-r1 \
-				-e "s|@FP_LIBDIR@|$(get_libdir)|g" \
-				-e "s|@FP_PV@|${PV}|g" \
-				> "${D}"/etc/chromium/pepper-flash \
-				|| die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-plugins/adobe-flash/adobe-flash-31.0.0.122.ebuild b/www-plugins/adobe-flash/adobe-flash-31.0.0.122.ebuild
new file mode 100644
index 000000000000..43c2833801f5
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-31.0.0.122.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils nsplugins multilib multilib-minimal
+
+DESCRIPTION="Adobe Flash Player"
+HOMEPAGE="
+	https://www.adobe.com/products/flashplayer.html
+	https://get.adobe.com/flashplayer/
+	https://helpx.adobe.com/security/products/flash-player.html
+"
+
+AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc/${PV}"
+AF_NP_32_URI="${AF_URI}/flash_player_npapi_linux.i386.tar.gz -> ${P}-npapi.i386.tar.gz"
+AF_NP_64_URI="${AF_URI}/flash_player_npapi_linux.x86_64.tar.gz -> ${P}-npapi.x86_64.tar.gz"
+AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz"
+AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz"
+
+IUSE="+nsplugin +ppapi"
+REQUIRED_USE="
+	|| ( nsplugin ppapi )
+"
+
+SRC_URI="
+	nsplugin? (
+		abi_x86_32? ( ${AF_NP_32_URI} )
+		abi_x86_64? ( ${AF_NP_64_URI} )
+	)
+	ppapi? (
+		abi_x86_32? ( ${AF_PP_32_URI} )
+		abi_x86_64? ( ${AF_PP_64_URI} )
+	)
+"
+SLOT="22"
+
+KEYWORDS="-* amd64 x86"
+LICENSE="AdobeFlash-11.x"
+RESTRICT="strip mirror"
+
+NPAPI_RDEPEND="
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	>=sys-libs/glibc-2.4
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	!www-plugins/chrome-binary-plugins[flash(-)]
+	nsplugin? (
+		${NPAPI_RDEPEND}
+		!www-plugins/adobe-flash:0
+	)
+"
+
+S="${WORKDIR}"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="usr/*"
+
+src_unpack() {
+	local files=( ${A} )
+
+	multilib_src_unpack() {
+		mkdir -p "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		# we need to filter out the other archive(s)
+		local other_abi
+		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
+		unpack ${files[@]//*${other_abi}*/}
+	}
+
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+multilib_src_install() {
+	local pkglibdir=lib
+	[[ -d usr/lib64 ]] && pkglibdir=lib64
+
+	if use nsplugin; then
+		# PLUGINS_DIR comes from nsplugins.eclass
+		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+		doexe libflashplayer.so
+
+		if multilib_is_native_abi; then
+			# No KDE applet, so allow the GTK utility to show up in KDE:
+			sed \
+				-i usr/share/applications/flash-player-properties.desktop \
+				-e "/^NotShowIn=KDE;/d" || die
+
+			# The userland 'flash-player-properties' standalone app:
+			dobin usr/bin/flash-player-properties
+
+			# Icon and .desktop for 'flash-player-properties'
+			insinto /usr/share
+			doins -r usr/share/{icons,applications}
+			dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+				/usr/share/pixmaps/flash-player-properties.png
+		fi
+
+		# The magic config file!
+		insinto "/etc/adobe"
+		doins "${FILESDIR}/mms.cfg"
+	fi
+
+	if use ppapi; then
+		exeinto /usr/$(get_libdir)/chromium/PepperFlash
+		doexe libpepflashplayer.so
+		insinto /usr/$(get_libdir)/chromium/PepperFlash
+		doins manifest.json
+
+		if multilib_is_native_abi; then
+			dodir /etc/chromium
+			sed "${FILESDIR}"/pepper-flash-r1 \
+				-e "s|@FP_LIBDIR@|$(get_libdir)|g" \
+				-e "s|@FP_PV@|${PV}|g" \
+				> "${D}"/etc/chromium/pepper-flash \
+				|| die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index ac84e01dc1f1..5e584ea2d2fb 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_70.0.3538.35-1_amd64.deb 57135036 BLAKE2B 32bb60b0391b0736b9d466ea7a41c2a3234e5294362da44e72e4c20078fa0ed4e4acb5871174b22e9ed505cde3a8bb6585c80863d7fed3c9071536519d8a06e9 SHA512 751843d0ad0d74586b9100c07a29579509e56694972eef089697df8dd05128484bd2bdd656bcbaacd6f90177ec3dd6cecd39b1df095ec7936abffe2ee6161223
-DIST google-chrome-stable_69.0.3497.100-1_amd64.deb 54675966 BLAKE2B 7043eca541b3dd75ed45ffd7bd06b26f2c3561378be913bc3988274ac1adc98ac05df7e7d42ec24402dea482131494f939578b5b1fde87224caa3e59bad25e96 SHA512 6566fefd13ef3013368d3f9edb7aa967d83fa888bec429beca16c0cab6398eaef5c07c31f399417baebeb7d0f79f5eebd651a31d0bca34eaa6ec729798b430e4
-DIST google-chrome-unstable_71.0.3559.6-1_amd64.deb 57503184 BLAKE2B 48fdb39d3523e1cd58641d57a7fd10172c67879fbcf327a68fdf76b4ce7adfbeddced03136f2a89d9012cfd27d79bd32c20f7c158d6541be5dcbc0180791beb9 SHA512 30367f713bb283df64c157f01bb9c3d6dc393546255558f331d5aca8b886d213d2f5b990536468a57979c7fc2fd89350abe32d47dbc1a4ebffa4055a2193ad4e
-EBUILD chrome-binary-plugins-69.0.3497.100.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
-EBUILD chrome-binary-plugins-70.0.3538.35_beta.ebuild 1360 BLAKE2B d30b0fb27e6fa08e4a6137db221ff313580f7043862ffc3d2731058ffb26668d2ec3e247c69b323bd09b81d44bc845bc2d4745b040e4acb89503b1c9e75e81b8 SHA512 23e9ed678427dee23ab15c0196ed0772bd0647d9ee5e925698b988f72551aaa8e10f4952e376cb09b1f6554d8abe49277cd25d663285b57886f6edca31acaa54
-EBUILD chrome-binary-plugins-71.0.3559.6_alpha.ebuild 1360 BLAKE2B d30b0fb27e6fa08e4a6137db221ff313580f7043862ffc3d2731058ffb26668d2ec3e247c69b323bd09b81d44bc845bc2d4745b040e4acb89503b1c9e75e81b8 SHA512 23e9ed678427dee23ab15c0196ed0772bd0647d9ee5e925698b988f72551aaa8e10f4952e376cb09b1f6554d8abe49277cd25d663285b57886f6edca31acaa54
+DIST google-chrome-beta_70.0.3538.67-1_amd64.deb 57157608 BLAKE2B 6ae713e29bc49d3c2526032e0eff9d310addcb9543f06b61fd1284358282137aabf9a394f81369d028ea7d73bdbec8bfaafd71e0ff8055e9b69c722582e586e5 SHA512 120674dfdc2f059ed863f7c2cb28b8d417206c58979fd5f24bc880c69c2574f4001b2452146aebb8f5ac0c76527dcf5a3c98c9df1cf54f13fa7f5aa9dc10aef8
+DIST google-chrome-stable_70.0.3538.67-1_amd64.deb 56079500 BLAKE2B 3835e5b088b9259ea32ed6689f0ed670e21841a35a34be741fd8ae47ad16d7f1642cb49e2e2a7fba23695a2578b1bb9bfa1fc4a57c0dca61fbd9c85ca4b3a008 SHA512 8f11a8a0caa6ce95d2f21b408ac70c4da1852465958e2515f874be6c55a8f109754e680f52cf81bd7aef691aa693d036fbcd1ae4f5d024213fc8de38d52ae66d
+DIST google-chrome-unstable_71.0.3578.10-1_amd64.deb 57838364 BLAKE2B 786ab75466be4be8bcc6fcb13c57c1292ee27a78c84b6c4c1cdfda43677d652de69cba7dda7f07a6177000111b8495a504e9375f1656c656a7532dcd41f22f66 SHA512 3d95c702e080d0a3b575cc17eb6659e4d350d7a8d7d24f1c841bc4a844ca26b6f0ff991f851d60fe260df564a8a42e3793617d582fc72fcda98b1c72c6486ce2
+EBUILD chrome-binary-plugins-70.0.3538.67.ebuild 1359 BLAKE2B bc5be0b8ac549ee39dac4b57e6141690930077493a500d12210c60e807a1f6c20bb6077cd91f366cfeb76c43404ff28b82bd1f40c844b1cd7613e11d9d69c83b SHA512 71498b335fdbfec0711b278b70dc06d048024bba3a2e7b6581aa9c824a7152aa3ad6df59f2578f2497cd79731bf317f58d682254d84feca17fdad40c4093e981
+EBUILD chrome-binary-plugins-70.0.3538.67_beta.ebuild 1360 BLAKE2B d30b0fb27e6fa08e4a6137db221ff313580f7043862ffc3d2731058ffb26668d2ec3e247c69b323bd09b81d44bc845bc2d4745b040e4acb89503b1c9e75e81b8 SHA512 23e9ed678427dee23ab15c0196ed0772bd0647d9ee5e925698b988f72551aaa8e10f4952e376cb09b1f6554d8abe49277cd25d663285b57886f6edca31acaa54
+EBUILD chrome-binary-plugins-71.0.3578.10_alpha.ebuild 1360 BLAKE2B d30b0fb27e6fa08e4a6137db221ff313580f7043862ffc3d2731058ffb26668d2ec3e247c69b323bd09b81d44bc845bc2d4745b040e4acb89503b1c9e75e81b8 SHA512 23e9ed678427dee23ab15c0196ed0772bd0647d9ee5e925698b988f72551aaa8e10f4952e376cb09b1f6554d8abe49277cd25d663285b57886f6edca31acaa54
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.100.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.100.ebuild
deleted file mode 100644
index 8dcc557fdf85..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.100.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 multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-KEYWORDS="-* amd64"
-
-LICENSE="google-chrome"
-IUSE="+widevine"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	widevine? (
-		dev-libs/glib:2
-		dev-libs/nspr
-		dev-libs/nss
-		!<www-client/chromium-57[widevine(-)]
-	)
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/chromium
-	if use widevine; then
-		doins libwidevinecdm.so
-		dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
-	fi
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.67.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.67.ebuild
new file mode 100644
index 000000000000..e57d8b916e0c
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.67.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+KEYWORDS="-* amd64"
+
+LICENSE="google-chrome"
+IUSE="+widevine"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	widevine? (
+		dev-libs/glib:2
+		dev-libs/nspr
+		dev-libs/nss
+		!<www-client/chromium-57[widevine(-)]
+	)
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/chromium
+	if use widevine; then
+		doins libwidevinecdm.so
+		dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
+	fi
+}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.35_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.67_beta.ebuild
index 6fcfccb7dc18..6fcfccb7dc18 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.35_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.67_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3559.6_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3578.10_alpha.ebuild
index 6fcfccb7dc18..6fcfccb7dc18 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3559.6_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3578.10_alpha.ebuild
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
deleted file mode 100644
index a99b611d8d5f..000000000000
--- a/www-plugins/gnash/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX gnash-0.8.10-amf-include.patch 1245 BLAKE2B f73c74329ae848e6dc1674d58179d5c04cb30dd7b4dcfe30b0e09ed350ad2ceabc7d5b1fde2866fc691f558cbe277bde3f594b6b5e11609b404998312a8b3d49 SHA512 46c2b9d4a57a1180626760ebcdbcbdc10c01fba4e01d8c45378ad26da3bf1181daaa54a2c88419452b6e691467c1ccb77374d8e926776b5f1b93ee2baa875986
-AUX gnash-0.8.10_p20150316-boost-1.60.patch 746 BLAKE2B cdb98c9424940aa5b2596bd94f037708211323f2fa1d371ba923d12f1279644e517bd4eccaa42528b13e452e915b8ebd7e6f032e8add1be7590a76e9a02f7599 SHA512 302946a47710978471837a8ddacd4be0eaf116cd6d1389f98155a939df774d61557eaafcec473cfdb37c06439b6f7cc5de8a5494fb880aa62669df5d951feb5d
-AUX gnash-0.8.9-external-dejagnu.patch 700 BLAKE2B c01f515259aa96076cf47f0f3a5553b405dae0ce997dc50310207189fc3aacd89a6f3158bb8ec47ff6a30072d872884f159c7e3c35176929639bb0222775887a SHA512 1b6714e0d44d3d43dcef53622cb6a8c153a1e336a99ef5ee13de1a092e54dc1b1c346e4468e9ea66035762195bd45b84dd185370bb726427472e5b5d6b470556
-AUX gnash-0.8.9-kde4-libdir.patch 498 BLAKE2B ae7d071ef8026e134415481b613c343fea78e038ba7568a6b05e319eaf7c02ec6a20502a7486e560beec30f05d50716ec468456f5a0fd5b88c94c64f71bc5c1a SHA512 df1a6faf5b3cae8a519b590ee3e26009b5a194a01f5dacc5b1862751118d1172f0babf85f7641d6b8e898d5013b6c11002c593df589c57312d842930ab964341
-AUX gnash-0.8.9-klash.patch 471 BLAKE2B 0006bfe83a78dd923766972b44138ceea36befaaf5e9b09560e2a06b0d902791a8d7645e32d357196264fc126c34d448585672647cf800085e07a48138fd5980 SHA512 4a57310522ac2323eee26bb027432b12606d91add6d528b31afd69e172c73aa9f80bafc7c0a84fed4214773f901b65ddea4a7de67865f82a2984ac1dfe274c4d
-DIST gnash-0.8.10_p20160329.tar.xz 4079572 BLAKE2B 4d5f4799add9d2e00a9b9322dc48be0b8b3c9f790dc5881d9fba6e4d9646537786f7644d3dbbf3bd259d1975062438af071eb2ab28c661de2b5510368c9d218e SHA512 e8956d6277dde29a22bfe5af4279b40f80dad5659961d042e0bb57505b084f3ef1b489cf6fdf06730a8f3e2f9fdb737d7b1bc015a0255a80b167b98e686aa245
-EBUILD gnash-0.8.10_p20160329-r2.ebuild 6437 BLAKE2B 39440995a62854e1fdfcf72915f79f4b8970d6a4fe088ffa3f36376e09a59a519ae0a9b7e13c6e98226eeb5bbac1e67a38bed258bcac61b38b5a456a0a3a5cd9 SHA512 03ffb5419c74b676701bdb69a69be0536df793f40883de1d7fae056f1ed8d7f936f4ca3ae4dad5f4a8fcc9ed22d8b74fe0889df55651656c98aeedcc66de3585
-MISC metadata.xml 1139 BLAKE2B 9734261c64faac7dd8d8326bb939f154577ae0540e9b259bad40e871249b3878bdee4ef941b6e8c787e11779a7ef793f3505d2207d7166d0c1db4b098f5895f8 SHA512 10fea436cf59f26ccf534d869379a101ee0e3fb1a47950b58e12a0e3027314b0f4ac1bc4f72817dd1be0ca64f18b2463ef89587dd8d45b7a20929218dccef41e
diff --git a/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch b/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch
deleted file mode 100644
index 983fa6b70eb1..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur a/cygnal/libnet/cque.h b/cygnal/libnet/cque.h
---- a/cygnal/libnet/cque.h	2012-01-19 20:17:47.000000000 +0100
-+++ b/cygnal/libnet/cque.h	2012-02-23 20:13:39.000000000 +0100
-@@ -25,8 +25,9 @@
- #include <boost/thread/condition.hpp>
- #include <deque>
- 
-+#include "../libamf/amf.h"
- #include "getclocktime.hpp"
--#include "buffer.h"
-+#include "../libamf/buffer.h"
- #include "network.h"
- #include "dsodefs.h" //For DSOEXPORT.
- 
-diff -ur a/cygnal/libnet/sshclient.h b/cygnal/libnet/sshclient.h
---- a/cygnal/libnet/sshclient.h	2012-01-19 20:17:47.000000000 +0100
-+++ b/cygnal/libnet/sshclient.h	2012-02-23 20:13:09.000000000 +0100
-@@ -32,9 +32,10 @@
- #include <libssh/sftp.h>
- }
- 
-+#include "../libamf/amf.h"
- #include "cque.h"
- #include "network.h"
--#include "buffer.h"
-+#include "../libamf/buffer.h"
- 
- namespace gnash
- {
-diff -ur a/cygnal/libnet/sslclient.h b/cygnal/libnet/sslclient.h
---- a/cygnal/libnet/sslclient.h	2012-01-19 20:17:47.000000000 +0100
-+++ b/cygnal/libnet/sslclient.h	2012-02-23 20:13:21.000000000 +0100
-@@ -36,10 +36,11 @@
- #include <openssl/err.h>
- #endif
- 
-+#include "../libamf/amf.h"
- #include "dsodefs.h"
- #include "cque.h"
- #include "network.h"
--#include "buffer.h"
-+#include "../libamf/buffer.h"
- 
- 
- namespace gnash
diff --git a/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch b/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch
deleted file mode 100644
index 6671d361e325..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git i/libbase/accumulator.h w/libbase/accumulator.h
-index 694cbd2..876c669 100644
---- i/libbase/accumulator.h
-+++ w/libbase/accumulator.h
-@@ -22,6 +22,7 @@
- 
- #include <boost/program_options/value_semantic.hpp>
- #include <boost/any.hpp>
-+#include <boost/version.hpp>
- #include <functional>
- #include <vector>
- #include <string>
-@@ -61,6 +62,11 @@ public:
-     virtual unsigned min_tokens() const { return 0; }
-     virtual unsigned max_tokens() const { return 0; }
- 
-+#if BOOST_VERSION >= 105900
-+    /// There are no tokens, so this is indifferent.
-+    virtual bool adjacent_tokens_only() const { return false; }
-+#endif
-+
-     /// Accumulating from different sources is silly.
-     virtual bool is_composing() const { return false; }
- 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch b/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch
deleted file mode 100644
index eaffda77bc00..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/plugin/npapi/test.cpp b/plugin/npapi/test.cpp
---- a/plugin/npapi/test.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ b/plugin/npapi/test.cpp	2011-03-20 23:52:20.369998096 +0100
-@@ -35,7 +35,7 @@
- #include "npfunctions.h"
- #endif
- #include "pluginbase.h"
--#include "dejagnu.h"
-+#include <dejagnu.h>
- #include "../../testsuite/check.h"
- #include <regex.h>
- 
-diff -ur a/testsuite/check.h b/testsuite/check.h
---- a/testsuite/check.h	2011-02-26 19:11:08.000000000 +0100
-+++ b/testsuite/check.h	2011-03-20 23:52:32.570998094 +0100
-@@ -29,7 +29,7 @@
- 
- #define HAVE_DEJAGNU_H 1 // we ship our own now...
- #ifdef HAVE_DEJAGNU_H
--#include "dejagnu.h"
-+#include <dejagnu.h>
- 
- #define info(x) note x
- 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch b/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch
deleted file mode 100644
index b3279441d2f0..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/macros/kde4.m4 b/macros/kde4.m4
---- a/macros/kde4.m4	2011-02-26 19:11:08.000000000 +0100
-+++ b/macros/kde4.m4	2011-11-25 18:09:25.000000000 +0100
-@@ -198,7 +198,7 @@
-       if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release; then
-         KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4"
-       else
--        KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
-+        KDE4_PLUGINDIR="${KDE4_PREFIX}/${acl_libdirstem}/kde4"
-       fi
-     fi
-     if test x"${with_kde4_servicesdir}" != x ; then 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-klash.patch b/www-plugins/gnash/files/gnash-0.8.9-klash.patch
deleted file mode 100644
index e6afec04d293..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-klash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/macros/kde4.m4 b/macros/kde4.m4
---- a/macros/kde4.m4	2011-02-26 19:11:08.000000000 +0100
-+++ b/macros/kde4.m4	2011-03-21 00:04:38.845997945 +0100
-@@ -210,7 +210,7 @@
-       KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
-     fi
-     if test x"${KDE4_APPSDATADIR}" = x ; then 
--      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
-+      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
-     fi
- 
-   if test x"${ac_cv_path_kde4_incl}" != x ; then
diff --git a/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild b/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild
deleted file mode 100644
index 1d167f04709a..000000000000
--- a/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-AT_M4DIR="cygnal"
-# won't build with python-3, bug #392969
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib nsplugins python-any-r1 flag-o-matic xdg-utils
-
-DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
-HOMEPAGE="https://www.gnu.org/software/gnash/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
-	inherit git-2
-else
-# Release tarball is b0rked, upstream #35612
-#	SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
-IUSE="X +agg cairo cygnal dbus doc dump egl fbcon +ffmpeg libav libressl gnome gtk harden jemalloc lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
-REQUIRED_USE="
-	dump? ( agg ffmpeg )
-	fbcon? ( agg )
-	nsplugin? ( gtk )
-	openvg? ( egl )
-	python? ( gtk )
-	vaapi? ( agg ffmpeg )
-	|| ( agg cairo opengl openvg )
-	|| ( dump fbcon gtk sdl )
-"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0:0=
-	dev-libs/expat
-	dev-libs/libxml2:2
-	virtual/jpeg:0
-	media-libs/libpng:0=
-	net-misc/curl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	media-libs/giflib:=
-	agg? ( x11-libs/agg )
-	cairo? ( x11-libs/cairo )
-	doc? (
-		>=app-text/docbook2X-0.8.8
-		app-text/docbook-sgml-utils
-	)
-	egl? (
-		media-libs/mesa[egl]
-	)
-	fbcon? (
-		x11-libs/tslib
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:0=[vaapi?] )
-		!libav? ( media-video/ffmpeg:0=[vaapi?] )
-	)
-	gtk? (
-		x11-libs/gtk+:2
-		python? ( dev-python/pygtk:2 )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		gtk? ( x11-libs/gtkglext )
-	)
-	openvg? (
-		media-libs/mesa[openvg]
-	)
-	sdl? ( media-libs/libsdl[X] )
-	sdl-sound? ( media-libs/libsdl )
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-libs/zlib
-	>=sys-devel/libtool-2.2
-	mysql? ( virtual/mysql )
-	lirc? ( app-misc/lirc )
-	dbus? ( sys-apps/dbus )
-	ssh? ( >=net-libs/libssh-0.4[server] )
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	vaapi? ( x11-libs/libva[opengl?] )
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	gnome? ( app-text/rarian )
-	nsplugin? ( net-misc/npapi-sdk )
-	test? ( dev-util/dejagnu )
-	${PYTHON_DEPS}
-"
-# Tests hang with sandbox, bug #321017
-RESTRICT="test"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-
-	if use !ffmpeg; then
-		ewarn "You are trying to build Gnash without choosing a media handler."
-		ewarn "Sound and video playback will not work."
-	fi
-}
-
-src_unpack() {
-	default
-	# rename git snapshot directory to what portage expects
-	mv ${PN}-*/ ${P} || die
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset # 591014
-
-	# Fix paths for klash, bug #339610
-	eapply "${FILESDIR}"/${PN}-0.8.9-klash.patch
-
-	# Use external dejagnu for tests, bug #321017
-	eapply "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
-
-	# Fix building on ppc64, bug #342535
-	use ppc64 && append-flags -mminimal-toc
-
-	# Fix kde multilib library path, bug #391283
-	eapply "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch
-
-	# Fix libamf includes
-	eapply "${FILESDIR}"/${PN}-0.8.10-amf-include.patch
-
-	# Fix new adjacent_tokens_only() in >=boost-1.59 (bug 579142)
-	# See https://savannah.gnu.org/bugs/?46148
-	eapply "${FILESDIR}"/${PN}-0.8.10_p20150316-boost-1.60.patch
-
-	eautoreconf
-}
-src_configure() {
-	local device gui input media myconf myext renderers
-
-	# Set nsplugin install directory.
-	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
-
-	# Set hardware acceleration.
-	use X && device+=",x11"
-	use egl && device+=",egl"
-	use fbcon && device+=",rawfb"
-	use vaapi && device+=",vaapi"
-	[[ "${device}x" == "x" ]] && device+=",none"
-
-	# Set rendering engine.
-	use agg && renderers+=",agg"
-	use cairo && renderers+=",cairo"
-	use opengl && renderers+=",opengl"
-	use openvg && renderers+=",openvg"
-
-	# Set media handler.
-	use ffmpeg || media+=",none"
-	use ffmpeg && media+=",ffmpeg"
-
-	# Set gui.
-	use dump && gui+=",dump"
-	use fbcon && gui+=",fb"
-	use gtk && gui+=",gtk"
-	use sdl && gui+=",sdl"
-
-	if use sdl-sound; then
-		myconf="${myconf} --enable-sound=sdl"
-	else
-		myconf="${myconf} --enable-sound=none"
-	fi
-
-	# Set extensions
-	use mysql && myext=",mysql"
-	use gtk && myext="${myext},gtk"
-	use lirc && myext="${myext},lirc"
-	use dbus && myext="${myext},dbus"
-
-	# Strip extra comma from gui, myext, hwaccel and renderers.
-	device=$( echo $device | sed -e 's/,//' )
-	gui=$( echo $gui | sed -e 's/^,//' )
-	myext=$( echo $myext | sed -e 's/,//' )
-	renderers=$( echo $renderers | sed -e 's/,//' )
-	media=$( echo $media | sed -e 's/,//' )
-
-	econf \
-		--disable-kparts3 \
-		--disable-kparts4 \
-		--without-gconf \
-		$(use_enable cygnal) \
-		$(use_enable cygnal cgibins) \
-		$(use_enable doc docbook) \
-		$(use_enable gnome ghelp) \
-		$(use_enable harden) \
-		$(use_enable jemalloc) \
-		$(use_enable nls) \
-		$(use_enable nsplugin npapi) \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable ssl) \
-		$(use_enable test testsuite) \
-		--enable-gui=${gui} \
-		--enable-device=${device} \
-		--enable-extensions=${myext} \
-		--enable-renderer=${renderers} \
-		--enable-media=${media} \
-		${myconf}
-}
-src_test() {
-	local log=testsuite-results.txt
-	cd testsuite
-	emake check || die "make check failed"
-	./anaylse-results.sh > $log || die "results analyze failed"
-	cat $log
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install nsplugin in directory set by --with-npapi-plugindir.
-	if use nsplugin; then
-		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
-	fi
-
-	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
-	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so
-
-	# Remove eglinfo, bug #463654
-	if use egl; then
-		rm -f "${D}"/usr/bin/eglinfo || die
-	fi
-
-	einstalldocs
-}
-pkg_postinst() {
-	if use !gnome || use !ffmpeg ; then
-		ewarn ""
-		ewarn "Gnash was built without a media handler and or http handler !"
-		ewarn ""
-		ewarn "If you want Gnash to support video then you will need to"
-		ewarn "rebuild Gnash with the ffmpeg and gnome use flags set."
-		ewarn ""
-	fi
-	ewarn "${PN} is still in heavy development"
-	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
-	ewarn "And then report a Gentoo bug to the maintainer"
-}
diff --git a/www-plugins/gnash/metadata.xml b/www-plugins/gnash/metadata.xml
deleted file mode 100644
index 66ccd5f77743..000000000000
--- a/www-plugins/gnash/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chithanh@gentoo.org</email>
-		<name>Chí-Thanh Christopher Nguyễn</name>
-	</maintainer>
-	<use>
-		<flag name="agg">Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
-		<flag name="cygnal">Enable building of the cygnal server</flag>
-		<flag name="dump">Enable dump output module for creating video from SWF</flag>
-		<flag name="egl">Enable EGL support for the OpenVG, OpenGL and X11 renderers</flag>
-		<flag name="harden">Enable upstream recommended hardening build flags (may conflict with system ones)</flag>
-		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
-		<flag name="openvg">Rendering based on the OpenVG graphics acceleration API</flag>
-		<flag name="sdl-sound">Enable SDL audio output for the standalone player</flag>
-		<flag name="ssh">Enable using SSH for network authentication in libnet</flag>
-		<flag name="ssl">Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support)</flag>
-	</use>
-</pkgmetadata>
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 667532f700fb..b81b8678720c 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index f63211417c7a..fbd2038141eb 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -1,9 +1,8 @@
 AUX spawn-fcgi.confd 2238 BLAKE2B 0364383f12b79728830556244485b991f5bf5f7f4595e5500b81330c43b752aca8f3fce53cd08d4f007a69279668c7d212c74ff0682a3e37ae0ec545744836c8 SHA512 0b0d5754de17dd691ead380a93526aa7fbdd432359b248ce06f030daefb1ad96e4a81fe5319557fb66602baccb45a0febf6417ec7b79eee91e1e070d9a852b90
 AUX spawn-fcgi.initd-r1 3090 BLAKE2B c59836f3c67fbf1d3cdd8db0efd923387e7e9f5c2f913cb276b695512cf6ab3f1fc1a9fd14bb654b9b109cbff3ffe31ce75ffb62573f56f2d851fa92d6ab24bf SHA512 e7336da885a19497247648c9b2e04044005285f8b989386d6d5441dbf284ebffa9df062e6e23cd0ae635232abaa2d41ff408b0c913683a6240929c5d1ec8a624
-AUX spawn-fcgi.initd-r2 3082 BLAKE2B 6fa89815bc51816ff5b15859716273b4780225ad3e934416f9e09ad754c2cef07ba7a8d24c55b5232834b9c5290adba5b7da0472f6ca90fa65979c1362bf3873 SHA512 86a82debd752709af3abd6056b31839a87d4dd14e990e5256a97e40b25c2293c113fc672b24ef7f2122b3d7b43de0d3434248240bf56c616ea2cbafcb5c82a29
+AUX spawn-fcgi.initd-r3 3048 BLAKE2B 5b501069acfe3a535f1d73cbb706d05de50ea8562e09a49209da551dc5ba9626ddc0093b76139d4291ce8ac4c3e329be0bbf494c41c6ec137a182b8b35c3c891 SHA512 6c983f9d741f508d12b728d24dc5b57396cbd2272ae71c7127ba95aef70bd1a90b68d2b15e3481dfdbcfa723ca73a92deea61baae64051a83cec0b583c7da1e1
 DIST spawn-fcgi-1.6.3.tar.bz2 77607 BLAKE2B eb6331f2f4ec1270f47ba317dcc60668e5d02dea9ed3a840033febd98443a73194559bcf56ff039131c8bf374108b72c47ccc531b7549bb3dee5f4f111308608 SHA512 136a198cbcda0d3ae4e445eac2ccdcc5483801514ce77542c630d615a7a19a68864b9d7d79733adb16347ba64c833afbf2a18df82937107a6bc8467f630b03b4
 DIST spawn-fcgi-1.6.4.tar.xz 79944 BLAKE2B 06fb92261042fe6bccda1a472a712a7c9bc7f56ee04b72f31ee133079f6c1d07ca07ef6c1b7c878db2e32861ea20914998411a3f6b596e4ba950f8767a899346 SHA512 e2b317997b56f852ad644b80fe36fa08376ae81f93566e181c31a3b6764de2eeb32a2e10e420136d8536487c575678ca52a33f7cb3488aadf7185fbd0196bee0
 EBUILD spawn-fcgi-1.6.3-r1.ebuild 784 BLAKE2B e7bf66cdf6281dbfc877e7953df82b1a39fc6826b3e72aeabb5cccd6cf868f5098b8a6c3bb2ce046d3ef203ff5975d32c2bec1b4da08288f59d368a5b6b84ce2 SHA512 402d57c189dfb2bdf1181f84ddc52cacfe31b663cf56fc80c7dac1a5d41f33e81df242ba752acd3d3822214f9a11ae38b4acd283a4e95f3fa7801d163065087c
-EBUILD spawn-fcgi-1.6.3-r2.ebuild 756 BLAKE2B 1d998dc556659faa637e8acfed73141406f67303bd8960bf900e63a8e5fbc4f1cbd2d763f591764b5d2a5cd9696b1ea44d815066288bcb5abce9df07fe5f526d SHA512 b249896cdf9ae55680803f1b7a91bb08d106e2ea084e529ff9312eb45755d1c0d095121752e13eb95d45e991316a80831d08665c459a83f5537e8f272b089e94
-EBUILD spawn-fcgi-1.6.4.ebuild 755 BLAKE2B 894ee21f39e946bb0fdd400b6b1b216f55cf527b67f2845a5945bc7be89b832a515e2f376652b768643c749a374b659c3c1c572ec4dc0d2b17cf52b3a91f5e9f SHA512 48019e1e463067b5164e2e5557be78217cdf636bffdea8af0fdeeeef5b5231f7a51a7d71f40ae187bcab99c94201a536da92666e466174f1cc558ff30d997525
+EBUILD spawn-fcgi-1.6.4-r1.ebuild 753 BLAKE2B 0a2f3ec9b32d168fedb18954cabad015414c19c6018ab8ac56d7d257f824c7bb6f9c545ad1483d2036d7fba886494a5880e87e25ea0e9948743377088707a277 SHA512 189949b622f7038703eb9554585fa9c7db3de57690000967fc25dc9a6717ee928581916294e9c6ce10f126a87c51d3e48f13cf68c83ae45263e2b8897bd12ca2
 MISC metadata.xml 448 BLAKE2B c5651b029dc5d74e075b0a3ee7eb0b9b1cca540a579ef017faca1363f920fd374277d4e24d25db64d81c5dcea05da91e5d9f3043f98863ca31f38893f67ba041 SHA512 461925b80f58574c97b298aa4b26314e26f40d8874bd3d8e4fc6f9bd1aa7161f9c69cfcc47dd9bd9077b631827e5a6631e0322174fb1387624b7bc3d021e29a2
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2 b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
deleted file mode 100644
index e7941a125a58..000000000000
--- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PROGNAME=${SVCNAME#*.}
-SPAWNFCGI=/usr/bin/spawn-fcgi
-PIDPATH=/run/spawn-fcgi
-PIDFILE=${PIDPATH}/${PROGNAME}
-
-depend() {
-	need net
-}
-
-start() {
-	local X E OPTIONS i RETVAL FCGI_PROGRAM_EXEC
-	FCGI_PROGRAM_EXEC=$(echo ${FCGI_PROGRAM} | awk "{print \$1}")
-
-	if [ "${SVCNAME}" = "spawn-fcgi" ]; then
-		eerror "You are not supposed to run this script directly. Create a symlink"
-		eerror "for the FastCGI application you want to run as well as a copy of the"
-		eerror "configuration file and modify it appropriately like so..."
-		eerror
-		eerror "  ln -s spawn-fcgi /etc/init.d/spawn-fcgi.trac"
-		eerror "  cp /etc/conf.d/spawn-fcgi /etc/conf.d/spawn-fcgi.trac"
-		eerror "  `basename "${EDITOR}"` /etc/conf.d/spawn-fcgi.trac"
-		eerror
-		return 1
-	fi
-
-	if [ ! -z "${FCGI_SOCKET}" ] && [ ! -z "${FCGI_PORT}" ]; then
-		eerror "Only one of the two may be defined:"
-		eerror "  FCGI_SOCKET=${FCGI_SOCKET}"
-		eerror "  FCGI_PORT=${FCGI_PORT}"
-		return 1
-	fi
-
-	if [ -z "${FCGI_PROGRAM}" ]; then
-		eerror "You need to specify which \$FCGI_PROGRAM"
-		eerror "you want to start."
-		eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}"
-		return 1
-	fi
-
-	if [ ! -x "${FCGI_PROGRAM_EXEC}" ]; then
-		eerror "The file specified as \$FCGI_PROGRAM"
-		eerror "does not exist or is not executable."
-		eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}"
-		return 1
-	fi
-
-	if [ -z "${FCGI_ADDRESS}" ]; then
-		FCGI_ADDRESS=127.0.0.1
-	fi
-
-	if [ -z "${FCGI_CHILDREN}" ]; then
-		FCGI_CHILDREN=1
-	fi
-
-	if [ -n "${FCGI_CHROOT}" ]; then
-		OPTIONS="${OPTIONS} -c ${FCGI_CHROOT}"
-	fi
-
-	if [ -n "${FCGI_DIR}" ]; then
-		OPTIONS="${OPTIONS} -d ${FCGI_DIR}"
-	fi
-
-	if [ -n "${FCGI_USER}" ] && [ "${FCGI_USER}" != "root" ]; then
-		OPTIONS="${OPTIONS} -u ${FCGI_USER}"
-	fi
-
-	if [ -n "${FCGI_GROUP}" ] && [ "${FCGI_GROUP}" != "root" ]; then
-		OPTIONS="${OPTIONS} -g ${FCGI_GROUP}"
-	fi
-
-	if [ -n "${FCGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${FCGI_EXTRA_OPTIONS}"
-	fi
-
-	unset E
-	for i in ${ALLOWED_ENV}; do
-		local j
-		eval j=$(echo \$"$i")
-		[ -n "${j}" ] && E="${E} ${i}=${j}"
-	done
-
-	ebegin "Starting FastCGI application ${PROGNAME}"
-	checkpath -q -d -m 700 /run/spawn-fcgi
-	X=0
-	while [ $X -lt ${FCGI_CHILDREN} ]; do
-		X=$(($X+1))
-		local P SOCKET_OPTION INET_OPTION
-		P=${PIDFILE}-${X}.pid
-		[ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}"
-		[ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
-
-		env -i ${E} /sbin/start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
-			--name ${FCGI_PROGRAM_EXEC} -- ${SOCKET_OPTION} ${INET_OPTION} \
-			-P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
-		RETVAL=$?
-
-		# Stop on error. Don't want to spawn a mess!
-		[ "${RETVAL}" != "0" ] && break
-	done
-	eend ${RETVAL}
-}
-
-stop() {
-	local X RETVAL=0
-
-	ebegin "Stopping FastCGI application ${PROGNAME}"
-	for X in ${PIDFILE}-[0-9]*.pid ; do
-		start-stop-daemon --stop --pidfile ${X} || \
-			{ RETVAL=$? && break ; }
-	done
-	eend ${RETVAL}
-}
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r3 b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r3
new file mode 100644
index 000000000000..ef680aad2776
--- /dev/null
+++ b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r3
@@ -0,0 +1,116 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PROGNAME=${SVCNAME#*.}
+SPAWNFCGI=/usr/bin/spawn-fcgi
+PIDPATH=/run/spawn-fcgi
+PIDFILE=${PIDPATH}/${PROGNAME}
+
+depend() {
+	need net
+}
+
+start() {
+	local X E OPTIONS i RETVAL FCGI_PROGRAM_EXEC
+	FCGI_PROGRAM_EXEC=$(echo ${FCGI_PROGRAM} | awk "{print \$1}")
+
+	if [ "${SVCNAME}" = "spawn-fcgi" ]; then
+		eerror "You are not supposed to run this script directly. Create a symlink"
+		eerror "for the FastCGI application you want to run as well as a copy of the"
+		eerror "configuration file and modify it appropriately like so..."
+		eerror
+		eerror "  ln -s spawn-fcgi /etc/init.d/spawn-fcgi.trac"
+		eerror "  cp /etc/conf.d/spawn-fcgi /etc/conf.d/spawn-fcgi.trac"
+		eerror "  `basename "${EDITOR}"` /etc/conf.d/spawn-fcgi.trac"
+		eerror
+		return 1
+	fi
+
+	if [ ! -z "${FCGI_SOCKET}" ] && [ ! -z "${FCGI_PORT}" ]; then
+		eerror "Only one of the two may be defined:"
+		eerror "  FCGI_SOCKET=${FCGI_SOCKET}"
+		eerror "  FCGI_PORT=${FCGI_PORT}"
+		return 1
+	fi
+
+	if [ -z "${FCGI_PROGRAM}" ]; then
+		eerror "You need to specify which \$FCGI_PROGRAM"
+		eerror "you want to start."
+		eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}"
+		return 1
+	fi
+
+	if [ ! -x "${FCGI_PROGRAM_EXEC}" ]; then
+		eerror "The file specified as \$FCGI_PROGRAM"
+		eerror "does not exist or is not executable."
+		eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}"
+		return 1
+	fi
+
+	if [ -z "${FCGI_ADDRESS}" ]; then
+		FCGI_ADDRESS=127.0.0.1
+	fi
+
+	if [ -z "${FCGI_CHILDREN}" ]; then
+		FCGI_CHILDREN=1
+	fi
+
+	if [ -n "${FCGI_CHROOT}" ]; then
+		OPTIONS="${OPTIONS} -c ${FCGI_CHROOT}"
+	fi
+
+	if [ -n "${FCGI_CHDIR}" ]; then
+		OPTIONS="${OPTIONS} -d ${FCGI_CHDIR}"
+	fi
+
+	if [ -n "${FCGI_USER}" ] && [ "${FCGI_USER}" != "root" ]; then
+		OPTIONS="${OPTIONS} -u ${FCGI_USER}"
+	fi
+
+	if [ -n "${FCGI_GROUP}" ] && [ "${FCGI_GROUP}" != "root" ]; then
+		OPTIONS="${OPTIONS} -g ${FCGI_GROUP}"
+	fi
+
+	if [ -n "${FCGI_EXTRA_OPTIONS}" ]; then
+		OPTIONS="${OPTIONS} ${FCGI_EXTRA_OPTIONS}"
+	fi
+
+	unset E
+	for i in ${ALLOWED_ENV}; do
+		local j
+		eval j=$(echo \$"$i")
+		[ -n "${j}" ] && E="${E} --env ${i}=${j}"
+	done
+
+	ebegin "Starting FastCGI application ${PROGNAME}"
+	checkpath -q -d -m 700 /run/spawn-fcgi
+	X=0
+	while [ $X -lt ${FCGI_CHILDREN} ]; do
+		X=$(($X+1))
+		local P SOCKET_OPTION INET_OPTION
+		P=${PIDFILE}-${X}.pid
+		[ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}"
+		[ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
+
+		start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
+			${E} -- ${SOCKET_OPTION} ${INET_OPTION} \
+			-P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
+		RETVAL=$?
+
+		# Stop on error. Don't want to spawn a mess!
+		[ "${RETVAL}" != "0" ] && break
+	done
+	eend ${RETVAL}
+}
+
+stop() {
+	local X RETVAL=0
+
+	ebegin "Stopping FastCGI application ${PROGNAME}"
+	for X in ${PIDFILE}-[0-9]*.pid ; do
+		start-stop-daemon --stop --pidfile ${X} || \
+			{ RETVAL=$? && break ; }
+	done
+	eend ${RETVAL}
+}
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild
deleted file mode 100644
index a19ec429e424..000000000000
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers"
-HOMEPAGE="http://redmine.lighttpd.net/projects/spawn-fcgi"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="ipv6"
-
-DEPEND=""
-RDEPEND="
-	!<=www-servers/lighttpd-1.4.20
-	!<=www-servers/cherokee-0.98.1"
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi
-	newinitd "${FILESDIR}"/spawn-fcgi.initd-r2 spawn-fcgi
-
-	docinto examples
-	dodoc doc/run-generic doc/run-php doc/run-rails
-}
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..92e2c3777b59
--- /dev/null
+++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers"
+HOMEPAGE="http://redmine.lighttpd.net/projects/spawn-fcgi"
+SRC_URI="http://www.lighttpd.net/download/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="ipv6"
+
+DEPEND=""
+RDEPEND="
+	!<=www-servers/lighttpd-1.4.20
+	!<=www-servers/cherokee-0.98.1
+"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi
+	newinitd "${FILESDIR}"/spawn-fcgi.initd-r3 spawn-fcgi
+
+	docinto examples
+	dodoc doc/run-generic doc/run-php doc/run-rails
+}
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild
deleted file mode 100644
index 4068e674e390..000000000000
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers"
-HOMEPAGE="http://redmine.lighttpd.net/projects/spawn-fcgi"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="ipv6"
-
-DEPEND=""
-RDEPEND="
-	!<=www-servers/lighttpd-1.4.20
-	!<=www-servers/cherokee-0.98.1"
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi
-	newinitd "${FILESDIR}"/spawn-fcgi.initd-r2 spawn-fcgi
-
-	docinto examples
-	dodoc doc/run-generic doc/run-php doc/run-rails
-}
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index c6f7be608e25..87b5c062cae1 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -5,6 +5,7 @@ AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.17.1.tar.gz 800156 BLAKE2B a8697263e6e7689c0062a06a9fdb1101a2df72e0ac9122b5f8a0acc78bbdbdeaa96faa1c8870b9c3a43e2e1fb5fc835e708e1bc3d0171ae746467b4734dc299d SHA512 10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b
 DIST uwsgi-2.0.17.tar.gz 798642 BLAKE2B 86efb2103efaeedb37ebb00de4c01477162d119ae3dea0dc0696385216e30ff2c74eb48576f86eb181b8ada4b9eaa63b0aa761e966e3301597633d33b81142e1 SHA512 639427fbb89a1c2610c1cafb6ff009398a3c0a8e27c3de3f00829428271ba97b64b1253368dd6150912cf44441052be2a63cbe81613bbe964be27ee2e570d2b2
-EBUILD uwsgi-2.0.17.1.ebuild 12786 BLAKE2B 0ec5625970bd579005e552862aeca312793b6b91c40ac0064adb9c4bdea75b97cfa13a69f92d17912655c00e4556f4f06486d1289b97127e88bd5a712506423f SHA512 0b987ba9c350f647ccd8aa8fda1e11b82ab989b5cc92abe00bc36a1a3fb860c99693e1e50494f369cf08afba3645826dbd806466e2bb493d933826686b55bf14
-EBUILD uwsgi-2.0.17.ebuild 12846 BLAKE2B 90fcbf6300de611aa3d7c930dd94c4a55c175656e2bbcdcc606e1b77df1b2e481fb31beedbb20b33db0bc3c4b0e8338661fd471ae7a088a5eaa386b66c4b9b39 SHA512 7940ac487b2ab57bca5790836c40e604fe5129449aac5d6de474f31a4fb1357ce0b724647e73639e2b3f062f0a9243106d352d2413424408f30c44ec9c3e59b4
-MISC metadata.xml 1597 BLAKE2B ddee6196349d4be8f3b5ba5a370eeae27bbc834d41e9f3803a2e6aef0966b01f4decbefe0cc4df3f174dde6fe8189120218a598d67dbcde20bf4fc20ad535871 SHA512 6f31168a12d1c3a95cb140624584214fcefda352b4c4904425d633a6d94a74d30186e7fa25c19b6f97cc0ca6ab0a8253cdbcedd11df3be2a32400a6292f2877b
+EBUILD uwsgi-2.0.17.1-r1.ebuild 12303 BLAKE2B 02bc993575884d6aa66d562a5085caaae8426c23d27ef6c8049c174e080404665cb3a33b742e6b3bf1e704429b1d333e7ce8243e6acf0be452de78753f1fef13 SHA512 8442acec2af67c093e08535669aa61a8a6030325de248062721438d4333b5308d69f621b11c36d00a150a32cb9d42e2f167500984768c4cf32ac87945c013268
+EBUILD uwsgi-2.0.17.1.ebuild 12776 BLAKE2B b64029a6b42b9ce2143940a8fd6dd4b485608d387710b911f25b026752fea585f7058e3ac125ce08560bfca08c8bed41a9abc80b348ee11b2cf8abd788521d38 SHA512 02233ce930b73f7b605cb96a1f8f5fda4a78f100a4d89d3ab8afeaccccb600ab97b800d0c0033b61d1e4d868bb3b3d69304b9698f91f3d8929d85c6936662513
+EBUILD uwsgi-2.0.17.ebuild 12836 BLAKE2B fd66096fef520da676395ffb80e7f2d6893459a653d7ba1fb19922488ab2734ac267edf1ad1fe9624f3367a8fc709546ece2398b87625059cc9d4a7042a7fe3c SHA512 3712520d98bc55fd60a4417a5d616b6955b2ce04b935e23218ac718cc6d6447fe0bb81cc1545a674d18983c8d21470979feac61c2ba2d978adebb39aea68ea11
+MISC metadata.xml 1508 BLAKE2B 22125c58eed49b27100421613726f650e78bba0fb712eea2a3e122862101f34803636c12fa98cdb7483dbfad00e51cba6419ee4a93d43e5116530cb43e6778b2 SHA512 4a925a03e1ff9fedf6d7d4ad9673fdf12caaf6d9b2c4ce5cce01b964ae50294451b6d2f820121dfbe8a9288d0ae62180acc243a07ab1b365e10fef65adff2a02
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index 498f2a5fb33d..9d3b99eed957 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -7,7 +7,6 @@
 	<use>
 		<flag name="embedded">Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag>
 		<flag name="go">Build the gccgo plugin to run Go applications.</flag>
-		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> instead of libc's malloc</flag>
 		<flag name="json">Support json as a configuration file format.</flag>
 		<flag name="pypy">Build the pypy plugin to run your code using <pkg>virtual/pypy</pkg>.</flag>
 		<flag name="python_asyncio">Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).</flag>
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
new file mode 100644
index 000000000000..248929d1ca5b
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
@@ -0,0 +1,395 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby23 ruby24 ruby25"
+
+PHP_EXT_INI="no"
+PHP_EXT_NAME="dummy"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php5-6 php7-0 php7-1 php7-2" # deps must be registered separately below
+
+MY_P="${P/_/-}"
+
+inherit eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng versionator
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
+	http ugreen signal syslog rsyslog
+	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
+	{core,fast,raw,ssl}router
+	redislog mongodblog log{file,socket}
+	spooler cheaper_busyness symcall
+	transformation_{chunked,gzip,offload,tofile}
+	zergpool )
+UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
+	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
+	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
+	rados router_{access,radius,spnego,xmldir}
+	sqlite ssi stats_pusher_statsd
+	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
+
+LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby )
+
+# plugins to be ignored (for now):
+# cheaper_backlog2: example plugin
+# coroae: TODO
+# cplusplus: partially example code, needs explicit class
+# dummy: no idea
+# example: example plugin
+# exception_log: example plugin
+# *java*: TODO
+# v8: TODO
+# matheval: TODO
+IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq"
+
+for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
+for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
+IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
+
+REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
+	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_REQUIRED_USE} )
+	python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+	python_gevent? ( python )
+	expat? ( xml )"
+
+# util-linux is required for libuuid when requesting zeromq support
+# Order:
+# 1. Unconditional
+# 2. General features
+# 3. Plugins
+# 4. Language/app support
+CDEPEND="sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	json? ( !yajl? ( dev-libs/jansson )
+		yajl? ( dev-libs/yajl ) )
+	pcre? ( dev-libs/libpcre:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	xml? ( !expat? ( dev-libs/libxml2 )
+		expat? ( dev-libs/expat ) )
+	yaml? ( dev-libs/libyaml )
+	zeromq? ( net-libs/zeromq sys-apps/util-linux )
+	uwsgi_plugins_alarm_curl? ( net-misc/curl )
+	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
+	uwsgi_plugins_curl_cron? ( net-misc/curl )
+	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
+	uwsgi_plugins_geoip? ( dev-libs/geoip )
+	uwsgi_plugins_ldap? ( net-nds/openldap )
+	uwsgi_plugins_pam? ( virtual/pam )
+	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
+	uwsgi_plugins_rados? ( sys-cluster/ceph )
+	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
+	uwsgi_plugins_router_spnego? ( virtual/krb5 )
+	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
+	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
+	uwsgi_plugins_xslt? ( dev-libs/libxslt )
+	go? ( dev-lang/go:=[gccgo] )
+	lua? ( dev-lang/lua:= )
+	mono? ( dev-lang/mono:= )
+	perl? ( dev-lang/perl:= )
+	php? (
+		php_targets_php5-6? ( dev-lang/php:5.6[embed] )
+		php_targets_php7-0? ( dev-lang/php:7.0[embed] )
+		php_targets_php7-1? ( dev-lang/php:7.1[embed] )
+		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
+	)
+	pypy? ( virtual/pypy )
+	python? ( ${PYTHON_DEPS} )
+	python_asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
+	python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
+	ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-uwsgi )
+	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	echo ${PYTHON_USEDEP}
+	default
+}
+
+pkg_setup() {
+	python_setup
+	use ruby && ruby-ng_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|'-O2', ||" \
+		-e "s|'-Werror', ||" \
+		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+		uwsgiconfig.py || die "sed failed"
+
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+	local embedded_plugins=()
+	local plugins=()
+	local malloc_impl="libc"
+	local json="false"
+	local xml="false"
+
+	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
+		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
+	done
+	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
+		use ${p} && plugins+=("${p}")
+	done
+
+	# do not embed any plugins
+	if ! use embedded; then
+		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
+		embedded_plugins=()
+	fi
+
+	# flatten the arrays
+	plugins=${plugins[@]}
+	embedded_plugins=${embedded_plugins[@]}
+
+	# rename some of the use flags, language plugins are always real plugins
+	plugins="${plugins/perl/psgi}"
+	plugins="${plugins/sqlite/sqlite3}"
+	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
+
+	# override defaults as requested by the user
+	if use xml; then
+		use expat && xml="expat" || xml="libxml2"
+	fi
+	if use json; then
+		use yajl && json="yajl" || json="jansson"
+	fi
+	use jemalloc && malloc_impl="jemalloc"
+
+	# prepare the buildconf for gentoo
+	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
+	sed -i \
+		-e "s|VAR_XML|${xml}|" \
+		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
+		-e "s|VAR_JSON|${json}|" \
+		-e "s|VAR_SSL|$(usex ssl true false)|" \
+		-e "s|VAR_PCRE|$(usex pcre true false)|" \
+		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
+		-e "s|VAR_ROUTING|$(usex routing true false)|" \
+		-e "s|VAR_DEBUG|$(usex debug true false)|" \
+		-e "s|VAR_MALLOC|${malloc_impl}|" \
+		-e "s|VAR_PLUGINS|${plugins// /, }|" \
+		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
+		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
+		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
+		buildconf/gentoo.ini || die "sed failed"
+
+	if ! use caps; then
+		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if ! use zeromq; then
+		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if use uwsgi_plugins_emperor_pg ; then
+		PGPV="$(best_version dev-db/postgresql)"
+		PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})"
+		sed -i \
+			-e "s|pg_config|pg_config${PGSLOT/.}|" \
+			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
+	fi
+}
+
+each_ruby_compile() {
+	cd "${WORKDIR}/${MY_P}" || die "sed failed"
+
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
+}
+
+python_compile_plugins() {
+	local EPYV
+	local PYV
+	EPYV=${EPYTHON/.}
+	PYV=${EPYV/python}
+
+	if [[ ${EPYTHON} == pypy* ]]; then
+		einfo "skipping because pypy is not meant to build plugins on its own"
+		return
+	fi
+
+	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
+
+	if use python_asyncio ; then
+		if [[ "${PYV}" != "27" ]] ; then
+			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
+		fi
+	fi
+
+	if use python_gevent ; then
+		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
+	fi
+
+	if use python_gevent || use python_asyncio; then
+			${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
+	fi
+
+	if use pypy ; then
+		if [[ "${PYV}" == "27" ]] ; then
+			# TODO: do some proper patching ? The wiki didn't help... I gave up for now.
+			# QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so
+			append-ldflags -Wl,-z,noexecstack
+			${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed"
+		fi
+	fi
+}
+
+python_install_symlinks() {
+	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
+}
+
+src_compile() {
+	mkdir -p "${T}/plugins" || die
+
+	python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+	if use go ; then
+		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
+	fi
+
+	if use lua ; then
+		# setting the name for the pkg-config file to lua, since we don't have
+		# slotted lua
+		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+	fi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_compile_plugins
+	fi
+
+	if use ruby ; then
+		ruby-ng_src_compile
+	fi
+}
+
+src_install() {
+	dobin uwsgi
+	pax-mark m "${D}"/usr/bin/uwsgi
+
+	insinto /usr/$(get_libdir)/uwsgi
+	doins "${T}/plugins"/*.so
+
+	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
+	use go && dosym uwsgi /usr/bin/uwsgi_go
+	use lua && dosym uwsgi /usr/bin/uwsgi_lua
+	use mono && dosym uwsgi /usr/bin/uwsgi_mono
+	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			dosym uwsgi /usr/bin/uwsgi_${s/.}
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_install_symlinks
+		python_foreach_impl python_domodule uwsgidecorators.py
+	fi
+
+	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
+	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
+	keepdir /etc/"${PN}".d
+	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+	if use apache2 ; then
+		ewarn "As reported on bug #650776 [1], Apache module mod_proxy_uwsgi"
+		ewarn "is being transferred to upstream Apache since 2.4.30, see [2]."
+		ewarn "We therefore do not build them any more."
+		ewarn "    [1] https://bugs.gentoo.org/650776"
+		ewarn "    [2] https://github.com/unbit/uwsgi/issues/1636"
+	fi
+
+	elog "Append the following options to the uwsgi call to load the respective language plugin:"
+	use cgi    && elog "  '--plugins cgi' for cgi"
+	use lua    && elog "  '--plugins lua' for lua"
+	use mono   && elog "  '--plugins mono' for mono"
+	use perl   && elog "  '--plugins psgi' for perl"
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			elog "  '--plugins ${s/.}' for ${s}"
+		done
+	fi
+
+	python_pkg_postinst() {
+		local EPYV
+		local PYV
+		EPYV=${EPYTHON/.}
+		PYV=${EPYV/python}
+
+		if [[ ${EPYTHON} == pypy* ]] ; then
+			elog "  '--plugins pypy' for pypy"
+			return
+		fi
+
+		elog " "
+		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
+		if use python_asyncio ; then
+			if [[ ${EPYV} == python34 ]] ; then
+				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
+			else
+				elog "  (asyncio is only supported in python3.4)"
+			fi
+		fi
+		if use python_gevent ; then
+			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
+		fi
+	}
+
+	use python && python_foreach_impl python_pkg_postinst
+
+	if use ruby ; then
+		for ruby in $USE_RUBY; do
+			if use ruby_targets_${ruby} ; then
+				elog "  '--plugins rack_${ruby/.}' for ${ruby}"
+				elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
+				elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
+			fi
+		done
+	fi
+}
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
index 623312528d19..54a77a5c73b5 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 PHP_EXT_INI="no"
 PHP_EXT_NAME="dummy"
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
index 1ffb13273bce..799cf972f8b2 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 PHP_EXT_INI="no"
 PHP_EXT_NAME="dummy"
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index c62e696ba6e8..ffded9ba4f6a 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -19,5 +19,5 @@ EBUILD varnish-4.1.8.ebuild 2208 BLAKE2B 6a0509906c324ead94dc1706dfcb22156d04c23
 EBUILD varnish-5.1.3.ebuild 2213 BLAKE2B 33a0b63f322d721c352748ac54b9e78c3df4b1916950bf698960bab57cfabfd39efa1c7a5ca4ea945f77fbebd943cfdf2579eb92e21a98bf24690a8a537b14b6 SHA512 290570d1a668f5ed0a4acda504313d5264c9d0dc7dc2d49a237b4bfa16c5c5b31749c48fa20e79fc06cb54a5ad100231da6fef00cdb75362a926f123ff17320f
 EBUILD varnish-5.2.1.ebuild 2267 BLAKE2B 6b6886e00415115a3649eee695bbbd4bbc2a7ab8590edf9cd7951a50cdf6f6e32bd3384514bd3330086dfab18dfc5a39c79db36f40cec76a9c66cdbc4e26ce3b SHA512 d3dec4d67b7e22981ecb643cefdb8729e51cb7545178eee996d96e15875e6373cf9b2956e29b3acc888b5ec6db430164096f0ce9e2bb24b295c01435870d27a3
 EBUILD varnish-6.0.1.ebuild 2241 BLAKE2B ddfcb5a33309872865b766f3259d00a16368f895e786ece160217cfa134643a8f776f5c87733461a8a57d3f6d715b0d618412b6fbbfc3c14c81dc95c853a45d1 SHA512 0b7c5e688d3d0cd2003842b2085c8894b52acdb0f1ecb72d77ef35ecc349ac5e00adc4c34ea488d60c01e648d7eca6582b5dbfd5939c1d99819f11fdd72a41b2
-EBUILD varnish-6.1.0.ebuild 2241 BLAKE2B 8ea2b313770d6518b3ca7076ee474c6b9ce9a3401fae3f3ee5b9582a0c676f8ebdf9a1a2b2219b6b2bbfa580f97277777bcc608b9a97a2f82b46e07dba8cecff SHA512 7c7f57a72cd87495608b8a22ac1e56d8915241d7229ab82e622e808e4f3d0a3fa36a187671618040a1a084402234105a54eb1f8e1f6e5c2fcddf33e8b48db759
-MISC metadata.xml 1238 BLAKE2B cef661c859116827e87bf628c89350a59bf0f3edca8ab9570089198c40867cfcd04d368db42ab5f11c0725813f2c866fd44ca4d988e0c26c6f7e632475156b44 SHA512 472dab09769715fecd8ead6d95ee11b4cd83a6ab5b22901094635ac62fb94fa9cae9beb3c08c4918958ccda1d32239d8b196d03908a78f6791aeaee9a779a865
+EBUILD varnish-6.1.0.ebuild 2260 BLAKE2B 317004952169a6c652e229f606e6616c3b12489df02a71a184c61bf5470a4c03d410ec592e845ef9f5ddbecb2b0759ece1992af071b5b30afc03ed9e11945d78 SHA512 a1a936029d0120ba00b45eccdb95eba69c8c48d184ec95f3c03e61715b1bddcf7226aa0f646c4a9caaee491c7b2b29407bd2a8dd216bad3731965c210cb84bee
+MISC metadata.xml 1154 BLAKE2B eef29e16772e06a4b08bb7c2de3c02570a698eafe1eb9f3d1d6708cbf4ea3ef2644642b3040ebea108477e331aff164e4e540dc7f5620f15643b385d1523fd7f SHA512 a429d2e7604fb1e1f1d3ef48c13ab2151f7e2adab6a81021f473d7b56bdc9fc8d7700370125908b0278c2b0621afb3cccb73c4f3284b288cbceac05294e70f99
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml
index 5046b2337ea0..d2fb18c34590 100644
--- a/www-servers/varnish/metadata.xml
+++ b/www-servers/varnish/metadata.xml
@@ -5,9 +5,6 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<use>
-		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
-	</use>
 	<longdescription lang="en">
 	Varnish is an HTTP accelerator. An HTTP accelerator (often called Reverse Proxy)
 	is an application that stores (caches) documents that have been requested over
diff --git a/www-servers/varnish/varnish-6.1.0.ebuild b/www-servers/varnish/varnish-6.1.0.ebuild
index 87fca369e166..af7e42b863da 100644
--- a/www-servers/varnish/varnish-6.1.0.ebuild
+++ b/www-servers/varnish/varnish-6.1.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 DEPEND="
 	${CDEPEND}
 	dev-python/docutils
+	dev-python/sphinx
 	virtual/pkgconfig"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index ef6d32e4ec3a..478b1e2cc87c 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index 8a620176afa9..431c56fb46bc 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,5 +1,5 @@
 DIST xmessage-1.0.4.tar.bz2 125011 BLAKE2B 4b1134ac3dcb6a696ba75dddb3fcd348222763c375067279e4d6af41c3c2c855249cd76b888693a5c0136144071acb628c0e3a653ce0afed70d0e6910d055a4f SHA512 a087fb09595bf0b188a4525b45e9b607acd063cceae36c69c78a48674fb7eca1c82d5c2d2770c7f4425b499e4c002bfc0e377935308c218a330a2b4994b94ebd
 DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
 EBUILD xmessage-1.0.4.ebuild 494 BLAKE2B 4cb86431cab9b0abfeb31521693848f4336db7635c7c19cba7802fad02f3c11c3b25fc4e642d18d61a2cb9c7db41d0eb34e5d259949ca0986bdbc71bfe0df114 SHA512 48affa08cb4259b5a015d19dbb57e4da58bd55a4cefaaca1f87ca2ae4212636195735c6c094ad9e5528d2aabbe2dc07f31972336765348a27808d6330e17ea01
-EBUILD xmessage-1.0.5.ebuild 494 BLAKE2B d6c7e63266bd72056e3bf3796e42a8ad0aa6883d29ebda4545a55363273615744634a1d622498dbde42994aa70a8076e96be2e00aa82a1afce8a1dba432d79b0 SHA512 9b1940936b392ed86c629201d7e509de42f0b931813e781566599f5f391a1c3a654e8c390aa25066926091cfcfc327d131b145c76311edc97a37f81cfe608ad0
+EBUILD xmessage-1.0.5.ebuild 490 BLAKE2B 5dd0fd6edfd682349b2ec0f85a1026c534fc35d42752c251b070b63108c952c9e34100bf598ddf400ad1f51f58256b09a0fb4499913e79fee51bc8d3dbca108c SHA512 16516edf4b651ee23d213f1c6a1b88f5bcdff5af62028e1731dce97849fbbc57bb350046d9722c1e52447e932db45f7b944ac2b549d235fca0b6d5be4984c057
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmessage/xmessage-1.0.5.ebuild b/x11-apps/xmessage/xmessage-1.0.5.ebuild
index 3c288246a6ae..5dee36d7acc2 100644
--- a/x11-apps/xmessage/xmessage-1.0.5.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 356de0a04a21..a1e7254af759 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 8bfbab6d344b..73638b5760c6 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
-EBUILD xcb-proto-1.13.ebuild 1530 BLAKE2B 40242fd5e864fa5e0fdc243915521ee538f8a8c47c50346e1956e66c976fbf430504fb4a09c30922e58e0c2970233d22b3db045642d6ab6d3ed9bb21e8266013 SHA512 ff3388f28274aad90c00f33ec483d1669b0e0a6ee783834db3766a3d921aa76e659be3476e02430c5bcd60d173e02bda6c2480e037934c9e4c2b2d24528db1df
+EBUILD xcb-proto-1.13.ebuild 1531 BLAKE2B 27ebc43319a56641b2013c9cbb027cb0baa059326ac129f2dc5f17a9ce3449f1271863440da38f2a9b9cb7e135b0dfc623d28b0377da98fbb4e1de8d33587161 SHA512 a98a081e84fae154ae9070453fd10117c6fe72d56b2843125c88db0554e6fbc3c2e80158fbae68b9809e068484b98c5338075ecdd6c5b073061c4c6d54c234a0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
index be027567fd73..2140e9956510 100644
--- a/x11-base/xcb-proto/xcb-proto-1.13.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 XORG_MULTILIB=yes
 XORG_STATIC=no
 
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 930f7f393d47..699b6422e311 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,4 +1,4 @@
-EBUILD xorg-drivers-1.19.ebuild 5103 BLAKE2B e182f00ee2818a1c74440edbbdf77a0a0bd94cacaa31a9ab05a092df3ed885fba425894d35282cc790d15cfe35724a2982da1b2b70bb82b53200482be262ae37 SHA512 dd55aaf3e14330b15957a5f372b798cc9337a978346ff6a8a09e5e43da5e35595f04a4a913784cb215301b1de3b2831d161642987212e3239bc15090c667c0d2
-EBUILD xorg-drivers-1.20.ebuild 4961 BLAKE2B a0595e691d19c73be267d6fdfa533697b0d66a8d2f4955861e5c44d7b89046c177d2df3c5bb6bb0b919df1ffa3408819d5162f37ca799a9083cfadd2a3bf0f85 SHA512 928984f544ea0cfe7face01c826506921dd2eeae19f6d40691bccc9ed2b0bd83a2bba8d2d9eb1e32b9ae80c02193326d13495fb2edf0a304170177038fbba66b
-EBUILD xorg-drivers-9999.ebuild 4838 BLAKE2B f0ba1390b5572e91c3415822e8ca0d9be2721810f5f133bd871e0a590f8001ab5c3f4ff0901f5cf308d418745a4d020c3d9701aa8a2d6be0d1afe2536ed1d914 SHA512 3abf15f7e8a2c7e1459b631fe6c722ad1b424d622defc6d4a6a2bdfe0650a1ba6a06e7c6e305e0d24d1655dd664e297170e9fa415df1aa9377867cfe7b8d0745
+EBUILD xorg-drivers-1.19.ebuild 5000 BLAKE2B d839d95a107e1f3d2c962bfe05b78a8ae53f987f4f012e08d179305c0f5b4befe91e8b54a8b2d2e53fd7db7b151ea924e087f8ec0c6bcd3cf2fd54099e0c59d1 SHA512 e479f91c7d428857cb612794b3d07d06c9e3d7921ea09c92b0a46da1c21003ffac8ca00adb5fc8de4700eced20a129184d2166630a1efbde1e4c36152589c826
+EBUILD xorg-drivers-1.20.ebuild 4893 BLAKE2B 11b8bb3428e6c39ecb15e124321a6a9f79a777a4b17bcd66cbc057aab4b411b904d72494f3365507afcc2e6afe8097fc4d9c0dbea79b5ca724591fcbde63c5a7 SHA512 2944656306b8ca91fc228533a9322e495c098a2ca9ee3232346e9c7cf9da0984d500533e7c1cab3560bb4ca32a4ec31bfada049ef3987a7bcbb8bb1ab43127c2
+EBUILD xorg-drivers-9999.ebuild 4770 BLAKE2B ef3732c9647dddc173923789d4aad17e3ba408f90f822e61d2a226d03c21b0601840f0706ba28b2e7211c4500d6225563769b528359373f5e617d54cf9516af1 SHA512 7a56b3a2abb99b29f86326151aca78c85dedf780c781fcea69dfb63d28e4a762262f20b60f46862940d45851d7322b09f57b5145a0dc3c98e37454948f6919bb
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
index 73a61b07b1ba..c2382d5cb061 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -97,10 +97,7 @@ PDEPEND="
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
-	video_cards_virtualbox?    ( || (
-					x11-drivers/xf86-video-vboxvideo
-					x11-drivers/xf86-video-virtualbox
-					) )
+	video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
 	video_cards_vmware?        ( x11-drivers/xf86-video-vmware )
 	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
@@ -136,6 +133,5 @@ PDEPEND="
 	!<x11-drivers/xf86-video-sunleo-1.2.2
 	!<x11-drivers/xf86-video-tdfx-1.4.7
 	!<x11-drivers/xf86-video-trident-1.3.8
-	!<x11-drivers/xf86-video-virtualbox-5.1.14
 	!<x11-drivers/xf86-video-vmware-13.2.1
 "
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
index a93b958ee8c1..cdbed7492168 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -95,10 +95,7 @@ PDEPEND="
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
-	video_cards_virtualbox?    ( || (
-					x11-drivers/xf86-video-vboxvideo
-					>=x11-drivers/xf86-video-virtualbox-5.1.14
-					) )
+	video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
 	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
 	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 4e994a9b9503..99c062fe8555 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -95,10 +95,7 @@ PDEPEND="
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
-	video_cards_virtualbox?    ( || (
-					x11-drivers/xf86-video-vboxvideo
-					>=x11-drivers/xf86-video-virtualbox-5.1.14
-					) )
+	video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
 	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
 	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index ee3ffc37f2f0..3c14a6e37ae5 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,7 +8,9 @@ AUX xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75 SHA512 ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b
+DIST xorg-server-1.20.2.tar.bz2 6204242 BLAKE2B 05333d12ca3ca2bca879410093fb193dc2476780b857cd22dcfb22d0dffe0e17afd161ee3a87030bd76ff4109fa1884768614f0bc26318d576f7c65b885aa425 SHA512 1c87d78b14529dd4b438ef038118c8540d1d17bdd58bf08ec5408a2ddbe8d0dda48033a9a9477cfc2c4c304dd1078fa40968a03c4d0cd3398359dd0fadb8e7c7
 EBUILD xorg-server-1.19.5-r2.ebuild 5766 BLAKE2B 87a961606f85b4c83d9eaebc9cac3ab8d650bf27a204a74f847459996c6cd51c28b94f5ee91bcee549e06a07aa260bf132609a60be733ddc5b51759d111aef4b SHA512 d63b8c99b046240476c93559fb9b672f0214db117c82e05130413b1751e57a43babdc366c7ec9ff0d9db9d08a3b1aa7493da7a6e3e9a73d531722374067b6dd6
-EBUILD xorg-server-1.20.1.ebuild 5522 BLAKE2B 7b66829d822ddff06e190d566871b7a9d915ae093264be4fd25ae5a4fd786f93394dee8e91132aef4b3faae88280e8cbd5786fd6efd658dadeeaa9c7a7fa8041 SHA512 e8a8fb57d5f527786cd6567d9f26f88de0bee3706e7da9a1c59f7d9fd4753db4ebb998288b7d3b663fc0f9869f8992db6615d3371c933f4a1b8f97913b348c4e
-EBUILD xorg-server-9999.ebuild 5527 BLAKE2B ec541ef3827abbdd2a7408df5f00b37692989f3225fd8fbe187bbdc5719a24aae8f6fec8537baffbb32ee3f394d4ce99540985a846109405297a27cdb70abc1d SHA512 011350ca9a119d266bb0a87e05b61c2c64344db1505aae3ed157d0815bf5559dad0cab0fecc6870c9fa58d3d39c93fde8b080345b75a5fec96b1b2992b59ab80
+EBUILD xorg-server-1.20.1.ebuild 5552 BLAKE2B 9104cf713a3bd2bd8578c1f7831ab2736cfc282368b884bc386c37925e313e4d96120a1fabf10f4f4ab26c2a56a482cd447486123bcb8b766b6f8a7a2ee5e79c SHA512 275c564a4d872ad3bb24041d5e836be544c50582da5951e9a308a809b0c70b552e5e06c993b85826d3fea5eaf5991a14132209e01fd561193a1895896004511e
+EBUILD xorg-server-1.20.2.ebuild 5549 BLAKE2B 445c4c499f1900bc85820daf0b1a25017c3a4c402d312f0af4c67677d273f0ae3b59afd57c147ce7e7e06d459d8ef1c90031b6806ad23345a5163ee083a3eb51 SHA512 855b6327daff396cc964755c26fbabf657e5f0296c8f407b197581fba0e6caaf754451df67777a1c466b07aacfd304c73e60cf02ffa536bb18022aabf21c5951
+EBUILD xorg-server-9999.ebuild 5557 BLAKE2B 16a913a88e418f6bf6d58cc358f6aafce34672bc16a4553fef8e448569afe60854b146c90f1215fd3074dff504e97596989b08a01d4d56e310f76d92af729466 SHA512 4fcc051eeeea84849cfd9c264a246b43b317c7c1c335855dd36dbfb3fd7536d4e855f9382b3f0b9e98eda1c11fa9925a1ce29d3d86400a77c8adcf6a4972022c
 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/xorg-server-1.20.1.ebuild b/x11-base/xorg-server/xorg-server-1.20.1.ebuild
index 4bb5e00c6eba..e721825fa7eb 100644
--- a/x11-base/xorg-server/xorg-server-1.20.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.1.ebuild
@@ -150,6 +150,7 @@ src_configure() {
 		$(use_enable !minimal xfree86-utils)
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
+		$(use_enable !minimal dri3)
 		$(use_enable !minimal glx)
 		$(use_enable xcsecurity)
 		$(use_enable xephyr)
diff --git a/x11-base/xorg-server/xorg-server-1.20.2.ebuild b/x11-base/xorg-server/xorg-server-1.20.2.ebuild
new file mode 100644
index 000000000000..be5e57d8cb27
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.20.2.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_EAUTORECONF=yes
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-libs/xtrans-1.3.5
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	glamor? (
+		media-libs/libepoxy[X]
+		>=media-libs/mesa-18[egl,gbm]
+		!x11-libs/glamor
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	xephyr? (
+		x11-libs/libxcb[xkb]
+		x11-libs/xcb-util
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-18
+	)
+	udev? ( virtual/libudev:= )
+	unwind? ( sys-libs/libunwind )
+	wayland? (
+		>=dev-libs/wayland-1.3.0
+		media-libs/libepoxy
+		>=dev-libs/wayland-protocols-1.1
+	)
+	>=x11-apps/xinit-1.3.3-r1
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)"
+
+DEPEND="${CDEPEND}
+	sys-devel/flex
+	>=x11-base/xorg-proto-2018.3
+	dmx? (
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+	!x11-drivers/xf86-video-modesetting
+"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)
+	xephyr? ( kdrive )"
+
+UPSTREAMED_PATCHES=(
+)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+pkg_setup() {
+	if use wayland && ! use glamor; then
+		ewarn "glamor is necessary for acceleration under Xwayland."
+		ewarn "Performance may be unacceptable without it."
+	fi
+}
+
+src_configure() {
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable debug)
+		$(use_enable dmx)
+		$(use_enable glamor)
+		$(use_enable kdrive)
+		$(use_enable unwind libunwind)
+		$(use_enable wayland xwayland)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal dri3)
+		$(use_enable !minimal glx)
+		$(use_enable xcsecurity)
+		$(use_enable xephyr)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		$(use_with systemd systemd-daemon)
+		$(use_enable systemd systemd-logind)
+		$(use_enable systemd suid-wrapper)
+		$(use_enable !systemd install-setuid)
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
+		--disable-config-hal
+		--disable-linux-acpi
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		--with-sha1=libcrypto
+	)
+
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+
+	server_based_install
+
+	if ! use minimal && use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-11 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
+	fi
+}
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 07e8f095df96..22ad7ddccf9b 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -150,6 +150,7 @@ src_configure() {
 		$(use_enable !minimal xfree86-utils)
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
+		$(use_enable !minimal dri3)
 		$(use_enable !minimal glx)
 		$(use_enable xcsecurity)
 		$(use_enable xephyr)
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 35652f61cefe..91ad9e96d602 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 74af6f5dd1aa..911056d5ed37 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -35,6 +35,7 @@ DIST NVIDIA-FreeBSD-x86_64-387.34.tar.gz 63387097 BLAKE2B 53689ba098b4a4de08dca0
 DIST NVIDIA-FreeBSD-x86_64-390.87.tar.gz 63648591 BLAKE2B 88aa38b11b64b2ad91f723ec84a2adb6829571136aabb1441a9119418395d5f143736487902f0c60b49ebc1284f3100fbd089e4c941cdd3519ab8511cc1d3261 SHA512 0865fef8b8a3be8f6d9fc81908b162fd6062ba0ea81fd00200e7b2a1e3149ef62408b46bc4ccb7a77f1ac943557a22b13a10cfdde084f0b76cf2b23432e57540
 DIST NVIDIA-FreeBSD-x86_64-396.54.tar.gz 60938322 BLAKE2B a23488b625a15703b0c40bc6871314b05d117d489f64a6f7c70ac3c934b02028b9623be10f0369c98c7d3b5e018e1eb6f1d2cde9d9e1b90be5065f06f6a646dd SHA512 52df85364bfd45a23394078855859ce85de996f7990bb96ba63eb33e516c3cf8e72c4391af9817213f735286f2cf6444bc8ed00312365f12ae17373cfbdc3fc7
 DIST NVIDIA-FreeBSD-x86_64-410.57.tar.gz 62103893 BLAKE2B 30313d5d0759e85ca9679e2fd5f7a6b816bf9d7b3afcb068b9de50639461d15ef3e1e0b552430271cfbfed32b20762f9bf439ed5f9450b3741c8b3436ac12cdf SHA512 1a7f0d32ce7619ebb9f6f1c1de3c1ef50747fe10864480529d6602534657cc8b9200970da080dfc0440963c00e9fb23f11e1904ced4898010757946c967af8a1
+DIST NVIDIA-FreeBSD-x86_64-410.66.tar.gz 61916683 BLAKE2B 835e40820339ce333a92b757087a09d8340cf957fa42257cbde1337b00c3156bb5ef23ba7c727b94146883c93e6a55a20ae5db4017d28f79d7d58b17d3b372d5 SHA512 c17d999c1f971ec597a6c52067f97f5395c5ca745d8db4b8c8f4d8519bf244b083b2ab0ac65f1bcf8b1525d18f1fb297092231edf7a7bb175befaaaf51601c06
 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
@@ -59,6 +60,7 @@ DIST NVIDIA-Linux-x86_64-387.34.run 82784271 BLAKE2B b7140d5d6a693892df50b3ad2e2
 DIST NVIDIA-Linux-x86_64-390.87.run 82690871 BLAKE2B b43a45a7d48160a72185417360a4ff4238922f6d77c7b58c0562f0e01c8aa33e89057e8a5d354e8d3c8e6fa86acf8908a6c2eab81e06158a92908eec18a9b02e SHA512 f4883744f5e07150677918669eed03c7b87774f752112aabd52d903a09ae16351b34105075da2ff0fcb7a847cf66ec17e9797826859fcaecc44fdcd464a61805
 DIST NVIDIA-Linux-x86_64-396.54.run 86946680 BLAKE2B 9b3ab39c9d09c663238d0fac6346c24feea6ecc44b0ecaf3de871522697685c1c474ec4cc83f3bab0a2bcfecc7c77acea0e6bfee6e8ca8e6883bd338fd6da8a2 SHA512 17139abe99d4f32ec87379ee57af2cc0fec7d24605b2be7e3cd6609d9fcdf871e3c1cb7414b3544e14eb32d2213fec7ac45b3261f27c8d6565d510ccb14a1247
 DIST NVIDIA-Linux-x86_64-410.57.run 107221029 BLAKE2B e873c9a21422fde847c10fd4286705e6ad6942c8a8f86cd514cbb8782f792051b1b1645990bd3a8ad025eeded853d23f9925b16a5bb108524346602462eaa1b8 SHA512 2ba6b4b7829410152e0fa57772969ca59f134995ef93d08c12cc6a7a97e081c1d718600a25f541444ce66603ed84b99e66b0ced6fb773ca40f98cd5dc1348d79
+DIST NVIDIA-Linux-x86_64-410.66.run 107130897 BLAKE2B 1f294dd1b248fede6c8a418ffadd3035a9d1c516b9b52a04dc2366fa7dab63993bd2d7d111c0bbc4cc12411bbb219fb504dec1e82e1bfb72a25e719917b32147 SHA512 1773ea5150822735cf02808df68cd2f9ff8b502633632a7748b4bff387daec44527f1bfb0508938c9eee7fb12ac070b99b3f5a903e592bf6d9c6461f4f7a7e9e
 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
@@ -69,6 +71,7 @@ DIST nvidia-settings-387.34.tar.gz 1267616 BLAKE2B 62d2fd329417f54bf384918889603
 DIST nvidia-settings-390.87.tar.bz2 1109274 BLAKE2B 20eb809ceeade932e89592ac91071e6d3311f4a075812225d68342806b7ab1f9f8ed0399ea7a47241b7974311794852fd932fd8e824065589de6c124a3c81ef3 SHA512 cafdf2bfefac187409dfcffd593ff23eaba5ab7ab8dd85a9f14a4b6a47ffb3649af770bd2615887af9d30de3ef8fedaad7afc2ebe9f60a8ba7355a9004702959
 DIST nvidia-settings-396.54.tar.bz2 1116371 BLAKE2B 114b88f393b0909c8d84a56a280854e258d0e7e7ce800ee58547ef68b4989f22a3bbb380795472b8222493a988dc9308fc20ef03c81589448b518a12285cf204 SHA512 23dc3c61bef71200b3e8185940dd52a50dae7ca7f2b8a68fa96eaa937aabc87ded5d5f73081af51d1e7af2b78b0ec10ab80d28dadbcf10a046c32ec14db1d83c
 DIST nvidia-settings-410.57.tar.bz2 1115668 BLAKE2B 7c6554226110da4dcff9b71bde0f1caa9c857a170da65d0224db0c1c0445b34a91db2858d371cc1f0ddc895d361fe074b95c7c421dc55eeebe478a7faa313db8 SHA512 c909af30b31d32e1369970c9a52eae0cf8018be509ce8297f5a60d25a937ec1abe18dc6462f12c9b20fb52d83157c60af53eb599a353748ad976f7a0a67cd756
+DIST nvidia-settings-410.66.tar.bz2 1115615 BLAKE2B e9e608978849a9b3106745c80ddd85270406e1c1fd6c5353a19e54877a5b3e8aa3f169c06c669a2278a40f64e2cc27930565c02ff2d40250030933b05ecdb962 SHA512 90e4716622d9eabdc32b707fb139390f228db0d60b55bc5d1e3e15ead64ee47a49fd15e47301a85f1ea7dbfb5ae877e03d4b48c88e47db08f3c3ebd280abe989
 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
@@ -79,4 +82,5 @@ EBUILD nvidia-drivers-387.34.ebuild 16295 BLAKE2B 0e6e77ed5654425bf03e358d5d8c53
 EBUILD nvidia-drivers-390.87.ebuild 16288 BLAKE2B 2ddb885d8171c4f06c31460b54ea9caf540453d425088f7d8b77d19a5872ad55ff692cf4022004360633f98e28b5b51cdeb60797f0590e8299ed3f76014a3035 SHA512 954931e10623047555af2bbf805915c4335e64e2d593d9e6958355195986900c3ce314fa2527d96161077f3a5f3a5e7370df8b79fdcd5deb84fd7046b6a3aa1e
 EBUILD nvidia-drivers-396.54.ebuild 15944 BLAKE2B e9741974f11dc113a84c55f9fbe863ee6a71e8f36b0ef372c55a775e4a33ae5a8cd1982357a1fb46cb43bbb863554557eae37ec02475427b2dbe1f4150b8ccba SHA512 5e3c9b8db1d22b475459b160d6c6f04d6f238ddd5601b85870d367f0e8530772e3cbce9f8dcc6d416c326ed5a153af8b8aba093a086ef8309e97211370736985
 EBUILD nvidia-drivers-410.57-r1.ebuild 16174 BLAKE2B a1557248b2f07b4a9025ed05f31fb59a96f2ab89209cc8267ef381da6e2fdb47746b3fdec46f00d10e6dc3fd40bbeb1472dd4efb1aea957108a8447ad2c79ea8 SHA512 5de509e3548bc0874079cbe8214639295f575bae473408019fe898e06b18412fc309496df3e4c205644bd97485a90c9ca825f665246c6f87a12bbf6dcf8d6ab3
+EBUILD nvidia-drivers-410.66.ebuild 16174 BLAKE2B a1557248b2f07b4a9025ed05f31fb59a96f2ab89209cc8267ef381da6e2fdb47746b3fdec46f00d10e6dc3fd40bbeb1472dd4efb1aea957108a8447ad2c79ea8 SHA512 5de509e3548bc0874079cbe8214639295f575bae473408019fe898e06b18412fc309496df3e4c205644bd97485a90c9ca825f665246c6f87a12bbf6dcf8d6ab3
 MISC metadata.xml 1275 BLAKE2B df5cb10ac396802437bf6efb3e80226124c11d6167bef2b64c3e525c17fb27213b13d7413ef909469440804a373b6e5c7088c53e0a6b44897860b7276ac3de6b SHA512 464ba5638a5d82a6e6bcbfe11b52759846f9f81e3f223cc313e0059b923427f21dab95b84595d6bffad4441fec96fe5f01044be572b72add8196a812f5682edb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-410.66.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-410.66.ebuild
new file mode 100644
index 000000000000..530a5814ec31
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-410.66.ebuild
@@ -0,0 +1,590 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 19; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.19"
+		ewarn "<sys-kernel/vanilla-sources-4.19"
+		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}/libglxserver_nvidia.so.${NV_SOVER} \
+			/usr/$(get_libdir)/xorg/modules/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.1.0"
+			)
+		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
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-rtcore.so.${NV_SOVER}"
+				"libnvoptix.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-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index c76ef7e650dc..5dd77fedad34 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,5 +1,7 @@
 DIST xf86-input-libinput-0.27.1.tar.bz2 373248 BLAKE2B 499c5c1b33f5159374775317777741db361620583f9d647ab5ee63193f5b82ecbbe5c124a447509c6b7de281cf6330f9747032d8bad8c2b1dbbcdd4517cf4f82 SHA512 01379f5d71bf39214c4dff428173512df57fd12e782f3fcde757be923aa0dbf4e010a0395a81bd8e4fb518edc7e05ca1ee64b1e313eb4df5d4990315580609a1
 DIST xf86-input-libinput-0.28.0.tar.bz2 374318 BLAKE2B b8629115fce658d9d432c05a983227aa1fa40da51e14c366bc0880b9d7c81c971abcb4c4b60ec37b756efad60be8eef061c0d3dcdd86f4fdb8b56e13f4ed9409 SHA512 4276b6aea87ddc83fa1f5e8d8949e34ad117186a6b5b599549231cb90424cd0fa69f3a4701ce529739c676665bb5c936eb447817c9420511d23bc048f6be92a4
+DIST xf86-input-libinput-0.28.1.tar.bz2 375923 BLAKE2B f676e857fd47baad848a9325dd23ff41d9f3a0e1ab148b4e0662fe5c47f1c148bf702189c16990defdc18a33378647373ca18a379cb4421043871ec44f1224cc SHA512 2b8cabfbc3490edbe928771ed9d62a0d4a423bc1373fc6cf9d3a6b5937e17ddc48ebb1b70f1191e507024e4b8220c137495cbba825292b51e50709daa7d31623
 EBUILD xf86-input-libinput-0.27.1.ebuild 424 BLAKE2B f2308bb6428e36ccee7681f3e37d978f6aaedef8f81d9f577afcc0d5f8d5ea11a301b7ff19d5208aa7c4d9c6b9e2ded8a5d097fc312fd909bfb118bcecc615ee SHA512 1aac87fc2723d9a1cf5cef59289a807f747b0e99561cdd0ada145ea24dfd4e486f86883f9bed77b05e428a847e924e9da7edf514d199dc70cb341e4cf950bbf5
 EBUILD xf86-input-libinput-0.28.0-r1.ebuild 434 BLAKE2B eeec242b7c0d1e7f7396ca98d9091d425ff25a850f000f8a8d34ed7ede9c26a9bc5d19468542bd2cf5996d099ea8abf80d67388be65f9b44c140c584266e3bf5 SHA512 345005269d8f91d1e9b2a05c4b5158c8109dba78bc1358c7ca31249b2f211655f335ee904c03228a558adb05ef35ff4bce80fc113c0c58f763c0dbe33f339748
+EBUILD xf86-input-libinput-0.28.1.ebuild 431 BLAKE2B 38beb24390f1775df812e229cd1671a564cc3c320d9653a05e8054655c68a3ee6efaa58a990a9ac9a5cdf9da481895b4a10f34e67bc48a77027294ae63c87391 SHA512 59835ed71f403fe8ca333cc1e4154c92483bee2487883b18c9d459675e9278c25c34dfdb37c4a3b3fe3493535c2d95975ff4014ee12fa202d8185419812c5273
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild
new file mode 100644
index 000000000000..5095d59d7bbc
--- /dev/null
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info xorg-2
+
+DESCRIPTION="X.org input driver based on libinput"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libinput-1.5.0:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( "README.md" )
+
+pkg_pretend() {
+	CONFIG_CHECK="~TIMERFD"
+	check_extra_config
+}
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
deleted file mode 100644
index ac840276cae5..000000000000
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX xf86-video-virtualbox-2.2.0-enable-opengl.patch 230 BLAKE2B d70c72c65164d736cc8fb09b5b4ccda4baa3b0ad446ffc11f08b53757d5e57a5cf4e6876dec0a9cc4e5da2574a80ee531831e1c7802e4a48a4cf30c29a002bfb SHA512 a8f4243ef70c72fa4e3dc71a4ab319ee77aac9e077804fa53f53ab338ad44773645af6c658da9d67b45c362632f0ed17edc13887721e013ceda7455bb9a28108
-AUX xf86-video-virtualbox-5-localconfig 996 BLAKE2B 67ce33deaa4073b4d522ec5865670627921d18442b01ef0d6eccffd67ca43cd7b73fda794cc56b9b3bc44a7ee9b99de6b4b1a0346bb5c078163983782d7e4ae7 SHA512 385711818aad370b87992190017d35f9caadb96d8dec387cdf6e70a4f70718107af36b98b2396a7255b2fbbd121644267e81804d397a6246969b5977bd9e94e8
-AUX xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch 1248 BLAKE2B 449981786700fd7c01d1d7346489553afc6959912c882aba750cb062009f773955efb247dc0bfeb4dca298da09393e0cd749c592a580e7509db10a7bea7a3dce SHA512 793a7f937eddf955ae7a2ca48d41675c8a6ec8c34e9f76d3edc8618562c2d0333714d9de7ae5927e16df7bc750e0309a3dd4173f3f9e262aa5c0d80190c98302
-AUX xf86-video-virtualbox-5.1.10-xorg119.patch 3375 BLAKE2B 52b6999cffb8b60ceac7949af1d3bb8452e138a9d6f8d84ac6587a121e1a379f9e69a0b9896c83e63c7ebfec26abe2b46e957a25385d04cc8613aec407483906 SHA512 f84cdbb6b43444eda753f6a31b3fe2514152545a7d75569d88f3b2d22542e5d087dfbd735457155f1463449f4e2138382d6f730978bd8d80280ad609dc826718
-AUX xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch 533 BLAKE2B 3ef40088fb83096c17944609d4fb7c14b7e7bb39ef0bf08d3bcda2795d4ead8801f06e7761804191ca4eec537bc22f45dcd6085407b1e6ef3ed4227a1fd594b0 SHA512 325a7adca76884e40be17d756ebdee3c8e8565d50a872c7cb2e429d046fd91b44acc6b788abb0eb28ab14594687203894ffe0c2d441c38ea5f87a88e76e87997
-DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1
-DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8
-EBUILD xf86-video-virtualbox-5.1.36.ebuild 4861 BLAKE2B 05cd603650893c24947c2dff997795ed3e21cad2e1807f90da9ac6a07a909036e91b1f2b9ca35aeeeac1a204ae01777ceb6cb9b070882e742418ccd886f4a1ef SHA512 a6c1d53eaecaae808be63ec339b9a1a9e544cd8292a987e8ecd90dae6eba9382251c4545bb94bd8c4e3af419b7df5da5f775015f8396366245756b6d7f8b16cd
-EBUILD xf86-video-virtualbox-5.1.38.ebuild 4863 BLAKE2B c4c6a46322d0ea152c28344923cec7cac42b858b1265aacad129b2586b4c5997f0662bd2e18e4c5685b983de9a344a55bb31ae2046ab5a014183e652e2471856 SHA512 4ef1aa96f10b26e9e6ae14d8938303defa3bc25eb29aa8da18a501586161c71610e9a4d3a70ee03c4a96fcae187930bc0566077bbb5a462549ee663bc727527e
-MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch
deleted file mode 100644
index b0779d42270a..000000000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -1955,8 +1955,8 @@
-       HEADLESS=1
-       WITH_SDL=0
-       WITH_SDL_TTF=0
--      WITH_X11=0
--      WITH_OPENGL=0
-+      WITH_X11=1
-+      WITH_OPENGL=1
-       WITH_QT4=0
-       ;;
-     --ose)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig
deleted file mode 100644
index aee5ec1ea83a..000000000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Makefile -*-
-#
-# Overwrite some default kBuild settings
-#
-
-#
-# Copyright (C) 2006-2008 Sun Microsystems, Inc.
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation,
-# in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
-# distribution. VirtualBox OSE is distributed in the hope that it will
-# be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-# don't build testcases to save time, they are not needed for the package
-VBOX_WITH_TESTCASES     :=
-VBOX_WITH_VALIDATIONKIT :=
-
-KBUILD_MSG_STYLE        := brief
-
-## paths, origin, hardening
-VBOX_WITH_HARDENING        := 2
-VBOX_WITH_ORIGIN           :=
-VBOX_ONLY_ADDITIONS        := 1
-
-TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release =
-TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch
deleted file mode 100644
index 92f8a182e34d..000000000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- VirtualBox-5.0.0_BETA3/configure
-+++ VirtualBox-5.0.0_BETA3/configure
-@@ -1258,10 +1258,7 @@
-   XCloseDisplay(dpy);
- }
- EOF
--  [ -n "$INCX11" ] && I_INCX11=`prefix_I "$INCX11"`
--  if test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs; then
--    log_success "found"
--  fi
-+  test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs
- }
- 
- 
-@@ -1415,21 +1412,6 @@
- #include <GL/glu.h>
- extern "C" int main(void)
- {
--  Display *dpy;
--  int major, minor;
--
--  dpy = XOpenDisplay(NULL);
--  if (dpy)
--  {
--    Bool glx_version = glXQueryVersion(dpy, &major, &minor);
--    XCloseDisplay(dpy);
--    if (glx_version)
--    {
--      printf("found version %u.%u, OK.\n", major, minor);
--      return 0;
--    }
--  }
--  printf("found (inactive), OK.\n");
-   return 0;
- }
- EOF
-@@ -2706,7 +2688,6 @@
-   # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
-   # [ "$OS" != "darwin" ] && check_yasm
-   [ "$OS" != "darwin"  ] && check_xsltproc
--  [ "$OS" != "darwin"  ] && check_mkisofs
- fi
- 
- # the libraries
-@@ -2774,7 +2755,6 @@
-   check_compiler_h
-   [ $ONLY_ADDITIONS -eq 0 -a "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
-   # tools/common/makeself*
--  [ $OSE -ge 1 ] && check_makeself
- fi
- 
- [ -n "$SETUP_WINE" ] && setup_wine
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch
deleted file mode 100644
index 26958fe8abbe..000000000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Fix from opensuse:
-https://build.opensuse.org/package/view_file/Virtualization/virtualbox/Fix_for_server_1.19.patch
-
-https://bugs.gentoo.org/602784
-
-Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-===================================================================
---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-@@ -52,6 +52,10 @@
- #ifndef _VBOXVIDEO_H_
- #define _VBOXVIDEO_H_
- 
-+#if XORG_VERSION_CURRENT >= 11900000
-+#include <bits/sigset.h>
-+typedef __sigset_t sigset_t;
-+#endif
- #include <VBox/VBoxVideoGuest.h>
- #include <VBox/VBoxVideo.h>
- #include "version-generated.h"
-Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c
-===================================================================
---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/helpers.c
-+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c
-@@ -82,7 +82,11 @@ void vbvxSetIntegerPropery(ScrnInfoPtr p
- 
-     property_name = MakeAtom(pszName, strlen(pszName), TRUE);
-     VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName));
-+#if XORG_VERSION_CURRENT >= 11900000
-+    dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
-+#else
-     ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
-+#endif
- }
- 
- void vbvxReprobeCursor(ScrnInfoPtr pScrn)
-Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-===================================================================
---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-@@ -1229,7 +1229,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
-     updateGraphicsCapability(pScrn, TRUE);
- 
-     /* Register block and wake-up handlers for getting new screen size hints. */
-+#if XORG_VERSION_CURRENT >= 11900000
-+    RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
-+#else
-     RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
-+#endif
- 
-     /* software cursor */
-     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
-Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c
-===================================================================
---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
-+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c
-@@ -15,6 +15,10 @@
-  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-  */
- 
-+#if XORG_VERSION_CURRENT >= 11900000
-+#include <bits/sigset.h>
-+typedef __sigset_t sigset_t;
-+#endif
- #include <VBox/VBoxGuestLib.h>
- 
- #ifndef PCIACCESS
-Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c
-===================================================================
---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/edid.c
-+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c
-@@ -44,6 +44,10 @@
-  *    Dave Airlie <airlied@redhat.com>
-  */
- 
-+#if XORG_VERSION_CURRENT >= 11900000
-+#include <bits/sigset.h>
-+typedef __sigset_t sigset_t;
-+#endif
- #include <misc.h>
- #include <xf86DDC.h>
- #include <xf86Crtc.h>
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch
deleted file mode 100644
index c5d3c3fc730e..000000000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix bug #625690
-
---- a/src/VBox/Additions/linux/drm/Makefile.module.kms
-+++ b/src/VBox/Additions/linux/drm/Makefile.module.kms
-@@ -50,7 +50,7 @@ MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -fno-pie
- ifneq ($(KERN_VERSION),24)
- MOD_CFLAGS += -include $(MANGLING)
- endif
--MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include)
-+MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
- # What on earth is this?
- MOD_INCL  += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include)
- MOD_INCL  += -Iinclude/drm
diff --git a/x11-drivers/xf86-video-virtualbox/metadata.xml b/x11-drivers/xf86-video-virtualbox/metadata.xml
deleted file mode 100644
index 8dafc466cde2..000000000000
--- a/x11-drivers/xf86-video-virtualbox/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  </pkgmetadata>
-
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild
deleted file mode 100644
index 22ec6dd17a30..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild
+++ /dev/null
@@ -1,184 +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 eutils multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox X11 video driver for Gentoo guest"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dri"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=x11-base/xorg-server-1.7:=[-minimal]
-	x11-libs/libXcomposite
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-lang/yasm-0.6.2
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	sys-power/iasl
-	x11-base/xorg-proto
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	dri? ( >=x11-libs/libdrm-2.4.5 )"
-PDEPEND="dri? ( ~app-emulation/virtualbox-guest-additions-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-S="${WORKDIR}/${MY_P}"
-MODULES_SRC_DIR="${S}/src/VBox/Additions/linux/drm"
-
-PATCHES=(
-	# Ugly hack to build the opengl part of the video driver
-	"${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-	# unset useless/problematic checks in configure
-	"${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
-
-	# xorg-1.19 patch from opensuse (bug #602784)
-	"${FILESDIR}/${PN}-5.1.10-xorg119.patch"
-)
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-	if [ "${MERGE_TYPE}" != "binary" ]; then
-		version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 4.9 or higher as active in gcc-config to build ${PN}"
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prepare the vboxvideo_drm Makefiles and build dir
-	eapply "${FILESDIR}"/${PN}-5.1.24-Makefile.module.kms.patch
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	default
-
-	# link with lazy on hardened #394757
-	sed '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' \
-		-i Config.kmk || die
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	local each targets=(
-		Runtime
-		Additions/common/VBoxGuestLib
-		GuestHost/OpenGL
-		Additions/x11/x11stubs
-		Additions/common/crOpenGL
-		Additions/x11/vboxvideo
-	)
-
-	# need to use the upstream build system to create necessary objects properly
-	use dri && targets+=( Additions/linux/drm )
-
-	for each in ${targets[@]} ; do
-		pushd "${S}"/src/VBox/${each} &>/dev/null || die
-		MAKE="kmk" \
-		emake TOOL_YASM_AS=yasm \
-		VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-		KBUILD_PATH="${S}/kBuild" \
-		KBUILD_VERBOSE=2
-		popd &>/dev/null || die
-	done
-
-	if use dri; then
-		local objdir="out/linux.${ARCH}/release/obj/vboxvideo_drm"
-		# We need a Makefile, so use Makefile.module.kms
-		ln -s Makefile.module.kms "${MODULES_SRC_DIR}"/Makefile || die
-		# All of these are expected to be in $(KBUILD_EXTMOD)/ so symlink them into place
-		targets=(
-			include
-			src/VBox/Runtime/r0drv
-			src/VBox/Installer/linux/Makefile.include.{head,foot}er
-			out/linux.${ARCH}/release/{product,version,revision}-generated.h
-		)
-		for each in ${targets[@]} ; do
-			ln -s "${S}"/${each} \
-				"${MODULES_SRC_DIR}"/${each##*/} || die
-		done
-		# see the vboxvideo_drm_SOURCES list in Makefile.kmk for the below,
-		# and replace '..' with 'dt'
-		targets=(
-			dt/dt/common/VBoxVideo/HGSMIBase.o
-			dt/dt/common/VBoxVideo/Modesetting.o
-			dt/dt/common/VBoxVideo/VBVABase.o
-			dt/dt/dt/GuestHost/HGSMI/HGSMICommon.o
-			dt/dt/dt/GuestHost/HGSMI/HGSMIMemAlloc.o
-			dt/dt/dt/Runtime/common/alloc/heapoffset.o
-		)
-		for each in ${targets[@]} ; do
-			ln -s "${S}"/${objdir}/${each} \
-				"${MODULES_SRC_DIR}" || die
-			ln -s "${S}"/${objdir}/${each}.dep \
-				"${MODULES_SRC_DIR}" || die
-		done
-	fi
-}
-
-src_install() {
-	cd "${S}/out/linux.${ARCH}/release/bin/additions" || die
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	newins vboxvideo_drv_system.so vboxvideo_drv.so
-
-	# Guest OpenGL driver
-	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL*
-
-	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so \
-			/usr/$(get_libdir)/dri/vboxvideo_dri.so
-	fi
-}
-
-pkg_postinst() {
-	elog "You need to edit the file /etc/X11/xorg.conf and set:"
-	elog ""
-	elog "  Driver  \"vboxvideo\""
-	elog ""
-	elog "in the Graphics device section (Section \"Device\")"
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild
deleted file mode 100644
index 8bf3e1f2873b..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild
+++ /dev/null
@@ -1,184 +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 eutils multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox X11 video driver for Gentoo guest"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dri"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=x11-base/xorg-server-1.7:=[-minimal]
-	x11-libs/libXcomposite
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-lang/yasm-0.6.2
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	sys-power/iasl
-	x11-base/xorg-proto
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	dri? ( >=x11-libs/libdrm-2.4.5 )"
-PDEPEND="dri? ( ~app-emulation/virtualbox-guest-additions-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-S="${WORKDIR}/${MY_P}"
-MODULES_SRC_DIR="${S}/src/VBox/Additions/linux/drm"
-
-PATCHES=(
-	# Ugly hack to build the opengl part of the video driver
-	"${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-	# unset useless/problematic checks in configure
-	"${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
-
-	# xorg-1.19 patch from opensuse (bug #602784)
-	"${FILESDIR}/${PN}-5.1.10-xorg119.patch"
-)
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-	if [ "${MERGE_TYPE}" != "binary" ]; then
-		version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 4.9 or higher as active in gcc-config to build ${PN}"
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prepare the vboxvideo_drm Makefiles and build dir
-	eapply "${FILESDIR}"/${PN}-5.1.24-Makefile.module.kms.patch
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	default
-
-	# link with lazy on hardened #394757
-	sed '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' \
-		-i Config.kmk || die
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	local each targets=(
-		Runtime
-		Additions/common/VBoxGuestLib
-		GuestHost/OpenGL
-		Additions/x11/x11stubs
-		Additions/common/crOpenGL
-		Additions/x11/vboxvideo
-	)
-
-	# need to use the upstream build system to create necessary objects properly
-	use dri && targets+=( Additions/linux/drm )
-
-	for each in ${targets[@]} ; do
-		pushd "${S}"/src/VBox/${each} &>/dev/null || die
-		MAKE="kmk" \
-		emake TOOL_YASM_AS=yasm \
-		VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-		KBUILD_PATH="${S}/kBuild" \
-		KBUILD_VERBOSE=2
-		popd &>/dev/null || die
-	done
-
-	if use dri; then
-		local objdir="out/linux.${ARCH}/release/obj/vboxvideo_drm"
-		# We need a Makefile, so use Makefile.module.kms
-		ln -s Makefile.module.kms "${MODULES_SRC_DIR}"/Makefile || die
-		# All of these are expected to be in $(KBUILD_EXTMOD)/ so symlink them into place
-		targets=(
-			include
-			src/VBox/Runtime/r0drv
-			src/VBox/Installer/linux/Makefile.include.{head,foot}er
-			out/linux.${ARCH}/release/{product,version,revision}-generated.h
-		)
-		for each in ${targets[@]} ; do
-			ln -s "${S}"/${each} \
-				"${MODULES_SRC_DIR}"/${each##*/} || die
-		done
-		# see the vboxvideo_drm_SOURCES list in Makefile.kmk for the below,
-		# and replace '..' with 'dt'
-		targets=(
-			dt/dt/common/VBoxVideo/HGSMIBase.o
-			dt/dt/common/VBoxVideo/Modesetting.o
-			dt/dt/common/VBoxVideo/VBVABase.o
-			dt/dt/dt/GuestHost/HGSMI/HGSMICommon.o
-			dt/dt/dt/GuestHost/HGSMI/HGSMIMemAlloc.o
-			dt/dt/dt/Runtime/common/alloc/heapoffset.o
-		)
-		for each in ${targets[@]} ; do
-			ln -s "${S}"/${objdir}/${each} \
-				"${MODULES_SRC_DIR}" || die
-			ln -s "${S}"/${objdir}/${each}.dep \
-				"${MODULES_SRC_DIR}" || die
-		done
-	fi
-}
-
-src_install() {
-	cd "${S}/out/linux.${ARCH}/release/bin/additions" || die
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	newins vboxvideo_drv_system.so vboxvideo_drv.so
-
-	# Guest OpenGL driver
-	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL*
-
-	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so \
-			/usr/$(get_libdir)/dri/vboxvideo_dri.so
-	fi
-}
-
-pkg_postinst() {
-	elog "You need to edit the file /etc/X11/xorg.conf and set:"
-	elog ""
-	elog "  Driver  \"vboxvideo\""
-	elog ""
-	elog "in the Graphics device section (Section \"Device\")"
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 946b69277c84..04b33231feeb 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index 0574f2101098..e3305848f769 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -22,6 +22,5 @@ AUX agg-2.5-pkgconfig.patch 387 BLAKE2B 7f0034bf791618bf3fdc59ec60210732f582b54d
 AUX agg-2.5-sdl-automagic.patch 811 BLAKE2B 9cb34b0efc6980b5269f6d82e524ddde3557b11e369bcb5e351b4b7d814d92a52bc13cd9a1b85487ce9d3d42b897712e93fdb17fa191e0f8850160402acaa415 SHA512 11166f6b8ca9cdaef2e510c7752c643ee6c7a56051c6214111e56dd0274f2e0023be073014a806ecf9ffc086b1436adefd04b563fc82cdd53f9910d281fe2b8e
 AUX agg-2.5-sdl-m4.patch 6797 BLAKE2B 1050aa706618ad34f03d437105449b071478b37655b6799be0258fb5afe27238dfbd029aae77e339847372a97ab99946078a677d691895e05a046389e618b3d7 SHA512 880594c3ea43846e79529444608301b323acbec4dc1bb883880ae4610f8041e95ac31743f0edd042be7d70d36928295b571265910e9342f2538ee68e557406bd
 DIST agg-2.5.tar.gz 564313 BLAKE2B 6451688dad51fe9d0433218109fd555fcaea3dd5933ebb13bc5c6d935640885f007b5dba8607cf45c94f58f0974391ca4fcd2ea9fda954334c8a4309b881d994 SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
-EBUILD agg-2.5-r2.ebuild 1414 BLAKE2B 34d9946175b2dcea675588fc74597f4e87c8e2b1f270657f49811afaac08ce9ccac721ab7f21a401c0b683209117436f9aa127fdd1b3bc7a9b5975ff9f71f482 SHA512 5d0f131ccb63c448e1a767b206f3bb98a86dfc1705962455b31a409d15edb151cec991d01b7395c7285642676f9e85eb91ed633166eb8076dded576c3708ff7d
-EBUILD agg-2.5-r3.ebuild 1347 BLAKE2B ffc1e449b15e237ae544c5d85ac1e6b9806e897cfec021406865474799f773f22772ce4227dd979a3f6f51e8ecbb39b73f88a8b4a23c109454866f17cbda6545 SHA512 deb1e61acae6a43f9a205d0fcd6192b339c3c5f6475e0c584bb9f479926a7d3ce330241293f084e276c2cbe47f1a0503b4f9d29439b86bb594eb2ff527571b00
+EBUILD agg-2.5-r3.ebuild 1346 BLAKE2B 2385cb5a987a8ed519eff4aaf00c846985ede913b49a7d9334a18772842a2baf1d5379dcfab16cc304cfb5b77606dad25f02fc1c252789d6a38b84433fc69e7b SHA512 8c572853428ba46d2c3048997e66a5348dd3d0b1b1fd6c29f801ace6e546cc5fe193f263981c868334e36a88bf05d99ce440b63cdebb961191f47eef100e593e
 MISC metadata.xml 335 BLAKE2B 4f8f3f570b1640e3dd48210e17eba5e9e0749313f4ba21d1d2f2565d8dbb2a7ec16ad73852ddeb0dd11f25887319bbbc44b9bc1c7397e02e43c36123789d186a SHA512 014f102fc0a515f69a841d11f7485287fe7fd4c4b44f33ea972813879d20e6c26d0ff2146268caf7332219055f6c968feb5d59951ee2c0e3e4a439c8f7fef68f
diff --git a/x11-libs/agg/agg-2.5-r2.ebuild b/x11-libs/agg/agg-2.5-r2.ebuild
deleted file mode 100644
index 8228f01acbce..000000000000
--- a/x11-libs/agg/agg-2.5-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools base
-
-DESCRIPTION="Anti-Grain Geometry - A High Quality Rendering Engine for C++"
-HOMEPAGE="http://antigrain.com/"
-SRC_URI="http://antigrain.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="+gpc +truetype +X"
-
-# preffer X with enabled xcb, really
-RDEPEND="
-	media-libs/libsdl[X?]
-	X? ( >=x11-libs/libX11-1.3.99.901 )
-	truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# taken from debian
-PATCHES=(
-	"${FILESDIR}/${PV}/02_maintainer_mode.patch"
-	"${FILESDIR}/${PV}/04_no_rpath.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	sed -r -i \
-		-e 's:^(.*)  -L@.*:\1:' \
-		src/platform/X11/Makefile.am || die "Failed to sed"
-	# fix building against automake-1.12, bug 420701
-	sed -i '/^AM_C_PROTOTYPES/d' configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# examples are not (yet) installed, so do not compile them
-	# sdl is harddep only sdl-tests are optional so we enable them anyway
-	econf \
-		--enable-ctrl \
-		--enable-sdltest \
-		--disable-examples \
-		--disable-dependency-tracking \
-		$(use_enable gpc gpc) \
-		$(use_enable truetype freetype) \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc readme authors ChangeLog news
-}
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index a8beefe015cf..98492c566a25 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://antigrain.com/${P}.tar.gz"
 
 LICENSE="GPL-2 gpc? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+gpc sdl static-libs +truetype +X"
 
 # preffer X with enabled xcb, really
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 0b558bcc7ca6..69cc01ec45d1 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,6 +1,8 @@
 AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b291d66ae563d8dfeabde2f7b017fda4cb272cee856e9d29dfddcc22e3cfcb3e2ff62c9eba802ace0e5ef1e49aeeef26002482ec9 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
+DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
 EBUILD cairo-1.14.12.ebuild 3761 BLAKE2B f17fc603afc4bc9e29963742340ec1327d437c47d241e4311cffbf65018ee7acee099a3b921a0676abf2b712fd9f0f334f8906ea0a02125f00b330e08358b423 SHA512 da0960521e98184c23bb6d141c511f8de7ba01b42fac8634e18cc4ec32682188451f360fd1049a1097c3d0fa191021f6d346f20636fe2f7829e621bc68e3bad0
-EBUILD cairo-9999.ebuild 3821 BLAKE2B 0c45341a0bdcdef51cdf6e1f92341f9bc79a3a65a10e3f2b22fbf16b510e35f5d02f549d8293faaf92cb92d0d9bd37606bb1bf04b67c82aeb5ced3e00ed4b5ea SHA512 65feac02926e14ffc8432ba7379f3e767f05baf2278c9bcdfb729aa48981cfb2710789d5a4319489533ef4f945b72d5356ece9d7c94fc8b2db195c35eeb15850
+EBUILD cairo-1.16.0.ebuild 3676 BLAKE2B 4197653a25a3b25f78219c60823aebb1289855677210de6aef5d35477898fe8070cfed51d1016d8fc11e72566f38c5a77f066a20f261070d2f966bbf544ce604 SHA512 327c358eb5fadf96dd2bca519b9cf73ceef6c12d1dea362efee7c721c9163aa60ced0d312d106a9d2890f1a9de24abda5eeed41902d8dd985374f6b7be846502
+EBUILD cairo-9999.ebuild 3676 BLAKE2B 4197653a25a3b25f78219c60823aebb1289855677210de6aef5d35477898fe8070cfed51d1016d8fc11e72566f38c5a77f066a20f261070d2f966bbf544ce604 SHA512 327c358eb5fadf96dd2bca519b9cf73ceef6c12d1dea362efee7c721c9163aa60ced0d312d106a9d2890f1a9de24abda5eeed41902d8dd985374f6b7be846502
 MISC metadata.xml 821 BLAKE2B 849b86bb474319b9787ec50aa29354fa84a2decdf36074e6618a2a5f1c120c48470c4a54ac7ad8e1c34e9d79b190e1b265f8eaa4f8179c15fb1679d4e35b9ffe SHA512 f15c40e43476dbf8ea426092f80110f10fc3acf3035b57b1d25a94cb4437252cdbee59fca5f054248c62eecf75afe49ab4ba8b12818e8f571217899c2b536ec5
diff --git a/x11-libs/cairo/cairo-1.16.0.ebuild b/x11-libs/cairo/cairo-1.16.0.ebuild
new file mode 100644
index 000000000000..ecceec470191
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
+	SRC_URI=""
+else
+	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	)
+	xcb? (
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	X? ( x11-base/xorg-proto )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
+
+REQUIRED_USE="
+	gles2? ( !opengl )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+src_prepare() {
+	default
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myopts
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X tee) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable gles2 glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable opengl gl) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable utils interpreter) \
+		$(use_enable utils script) \
+		$(use_enable utils trace) \
+		$(use_enable valgrind) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-drm \
+		--disable-directfb \
+		--disable-gallium \
+		--disable-qt \
+		--disable-vg \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index cf8db822d91b..ecceec470191 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -88,11 +88,6 @@ multilib_src_configure() {
 
 	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
 
-	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
-	if ! multilib_is_native_abi; then
-		myopts+=" --disable-qt"
-	fi
-
 	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
 
 	ECONF_SOURCE="${S}" \
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index b94341b1dcb0..e80bab31c112 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -3,6 +3,6 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e
 DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
 DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
-EBUILD gdk-pixbuf-2.36.11.ebuild 3873 BLAKE2B 4472edbddf2264083f297d8d9afd78b2daeb789300c7a8dbc67f5e2f8342e7b63bf1ff65a7276c89b20d570142deba4a72d7200e5842dd2e5b7f68fa848b025a SHA512 14353cad1704c517110a509d7ac5d85cdca850acda696cb8c6fde5e809f497d8997ca371bfd08c291781c904a28ef08c6121a66d65c3f247f11cd580afe973ff
-EBUILD gdk-pixbuf-2.36.12.ebuild 4060 BLAKE2B b00f4c4ad2602a3bddd23ddd974bbcc5eff20e738b86c260b8b870f4e28ccd4a9ccdb2db0187be40d394a5ef0d028ebbc4c8c0b874d41a9ffc235ddf34eeedc5 SHA512 e32dadce0912058ce4370074332c19f32c54b5ff79a8dbfdac7515d75f5f21df629b3bd9cd15b0ce2fb1d3db56011e960ec51bb358342a135b35e9c128868733
+EBUILD gdk-pixbuf-2.36.11.ebuild 3891 BLAKE2B 04adc6a0d4efe34b9402d3d7464eb03f5082f8cd2aa942b4e8f33476de40bd4455d664768f957f74b28f84e6407fa763db0ee5bda2aac44320d174693cbd62a4 SHA512 037a2b68b2d072603cf751008388dba3011c5ebb5e529a99a71d78746ca354b94445097a047eef5a7d1698662068f26f2c46865d458f695d340e5db2ca4c8dba
+EBUILD gdk-pixbuf-2.36.12.ebuild 4078 BLAKE2B 6bf393a944b47eb42148ffaa01ccf7c37c26e1a71cad50172c72760a8704c1962dcd06bb9a7495045cf1a154babbf6e3827d789c254d8ef9a197525b7931f79c SHA512 3e8bd86c56377db4f648a30000db9f13b56b1a5b0d26bf43427ca7f026cfb41d8d18e6f5c2d2c911ccebaffcedd26882d265a771b666811bfaa9b54692998fff
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
index 67766b367ca7..5cf84878340b 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ COMMON_DEPEND="
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
 	>=sys-devel/gettext-0.19
 	virtual/pkgconfig
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index 4f8ee189a2f4..9778d4bb90d1 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ COMMON_DEPEND="
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
 	>=sys-devel/gettext-0.19
 	virtual/pkgconfig
diff --git a/x11-libs/gtkhotkey/Manifest b/x11-libs/gtkhotkey/Manifest
index af6d82e69a8e..cb294b41b50a 100644
--- a/x11-libs/gtkhotkey/Manifest
+++ b/x11-libs/gtkhotkey/Manifest
@@ -1,4 +1,4 @@
 AUX gtkhotkey-0.2.1-glibheaders.patch 726 BLAKE2B 53e4bc2502e6d8dc936bc201335a54a06160d03063a57b27c18800e05cdd2a7b84508b22f7239a26b59ad60fff7f0c1905a8d0de799d580b10ababc0046c5f48 SHA512 32ed2b19a0f61edb877c70353abfd3817c3ca59010efbce6ea7d4332455e0468d527fdb5c8e749d8e6240723063dcff27b5c2589290e40fa08b0f00e0db189d5
 DIST gtkhotkey-0.2.1.tar.gz 382043 BLAKE2B 05ed162cc1eec7e6c981e796a5dca125e5c940c38ed79d67699d7194fce0c77489f3aae9747ae8610c14417b9871859cb5024990f6adb3524e6e14265603a07b SHA512 7f7e1b9bd94ff806d98277f2dafbf5b6569efdc6f0367a83e885d38584a8f6e098f31d0f03b080f2ca76394eb73e43f9da07e0d944a2e6443a55d9f2e8fee324
-EBUILD gtkhotkey-0.2.1-r1.ebuild 991 BLAKE2B cb216bb9910c965c74cf1ea64aa680f49c869e31d86ce97f4b753110657b877fec8b22e84cd50c5fd17b83776710e00aeb07aabbc18c8e75947456b42821ed61 SHA512 ebd0360dc36b47b9079fffb9404dc0114c0e1eb0521aebddb049eea1a573f84b0be843eb63d39208674e0fd6cc985314ffe25f22fde1136c3dc11262abff96fc
+EBUILD gtkhotkey-0.2.1-r1.ebuild 1041 BLAKE2B cf88b914f0091229140f3fdc6fcd5f203400111fabc132eb4c1f16d19fb22335c723616787f68ec3268efaafb9d1a5e62c04fd96e1441a8d8e24a6a56cf28682 SHA512 66ae720ee97835b629692ecb52b6f2bf8a864d2a71e707758bcd6e54591a6f00ec68a68596914ebe7285d3232531f9d747ab39f0dcfa74fa6b0ca508a7356240
 MISC metadata.xml 244 BLAKE2B cd13229535e9e125ecc3f936c85809a9eaf68cd4af4700c9fe06202625ee69f862708fc27bb0623e54b8958610b0fed734a10257ff7d04bbced67aaf1a338044 SHA512 6fe538123e95fd8536bc8965f2f8316828a399536618130db5b27f08add330a0bdef412e1f5ac8360df5c7bd8df56789e716d6d1d8cfd7b31f8c5e126f64f391
diff --git a/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild b/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild
index c4e3b9053cff..3470b1d217a0 100644
--- a/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild
+++ b/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,24 +18,33 @@ SRC_URI="https://launchpad.net/${PN}/${MY_CRV}/${PV}/+download/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.12:2"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl"
-
-DEPEND="${COMMON_DEPEND}
+IUSE="static-libs"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.12:2
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	virtual/libintl
+"
+DEPEND="
+	${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=dev-util/intltool-0.35.0
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 PATCHES=( "${FILESDIR}/${P}-glibheaders.patch" )
 
 src_prepare() {
-	sed -i -e "s: install-gtkhotkeydocDATA ::" Makefile.in || die "Patching Makefile.in failed"
 	default
+	sed -i -e "s: install-gtkhotkeydocDATA ::" Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
 }
 
 src_install() {
diff --git a/x11-libs/hippo-canvas/Manifest b/x11-libs/hippo-canvas/Manifest
index 21a3c8011442..c8a335961df0 100644
--- a/x11-libs/hippo-canvas/Manifest
+++ b/x11-libs/hippo-canvas/Manifest
@@ -1,4 +1,4 @@
 AUX hippo-canvas-python-override.patch 349 BLAKE2B 92912d75c47e78adf8129d85c963709dbf8200bf30c197e2da3c02837e5e2afcce050d4c4ce94f17a4ac53ad84167acabce2ae0ec3afae4fbd66c309b46b92f0 SHA512 58bb19ed76a4ef07cbebb7b7fad46b931ba7e81ea2e38a6596ea0247ea38bca96c392b13db9673a43f973b67b3297ae7d6a4656772105db688a34ef3be7847f4
 DIST hippo-canvas-0.3.0.tar.bz2 376859 BLAKE2B f224aab41c0cd34c2e65e30a36f0ce58969a20d911c7d63ec488634879206a4b02fa246f6540f5b3fce4a7ffa6a5953aec8b6f93501c9fd711211d1182386206 SHA512 8290f6ab1875eed606ea152f12741ec4ebd8839091a9c258b8c4fa39f395adf94217576c6c689c5ab22b62c65e37d82991c7b8942815cb2030bd45616528f4f3
-EBUILD hippo-canvas-0.3.0-r2.ebuild 1021 BLAKE2B b63e66ffdcdc7c7928c6321e06b7bb2bddea8d58fcd2e387bf35450deb3e9840d0d17b22d22ff259bee01b1703264a15ee8466fe3e2d228797976ef81c7acbe8 SHA512 f4050adb70e78a271baeb9a41d23783d8bc32e6a780cffed8bd2acbff6a743cabeeb010d56b656dd52aebd6978331d54300e1eacff61cd5b41ed2a6d7d76f099
+EBUILD hippo-canvas-0.3.0-r2.ebuild 1039 BLAKE2B 35b9f9585bed04c6bf7fbcc5f8d9491d93e70285e16c1260ecdf2987ba3cbb0d1a1c52b4e0e0238eca1b84fd17058a017ad290f2fe59e9f4acf476768d0a083f SHA512 ec0c767752fb6df100fca88b04d3f777dea7a61f0651a5c90daa79058a70676f38dcf7c54fa4a5c3550f51e76b7086708aacbfa3771bf1545b26f78c1f8eb68c
 MISC metadata.xml 487 BLAKE2B 922f057e5ea68f201e92d05f8cda6e5e4ca5a2f551f21e10d05f7027940fbd6ca4005cea99559261b8f0b0859d6e985508f84b6c2e63a4ace39ed2d218ac1005 SHA512 4fcbed02fb004fdde36668aa8c089a0180f38355103720d55f94687868189f1583f09d29c8c071f5151fa24695491044445f6444c5af4776b8e8517307388e8e
diff --git a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
index 36b88c85f039..5def06c083aa 100644
--- a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
+++ b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,6 +30,7 @@ RDEPEND="
 		dev-python/pygtk:2[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	virtual/pkgconfig
 "
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 5692e037196e..15d08f5933a2 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,3 +1,5 @@
 DIST libSM-1.2.2.tar.bz2 348908 BLAKE2B f3d6d40bfb3058000fd13e9f5ed8daa6628ef197d737e9186e66a517d4c0d4238fa65d0f922b9e6b2839a6f37344c64a560b126911679315cb3824c814d474c7 SHA512 dfb91dcc7200fce8d0a62953ae4b81fcb00d525674bbcc6dfcaa23ecb35e1213ceb07cc51f590072dce2107909903160d9f3636a0434fe2a605b1e9a9bd0a6ca
+DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
 EBUILD libSM-1.2.2-r2.ebuild 1716 BLAKE2B 929e1c043c04cfda1ee1805cb0db16a120a606628acf25feb09528db7c4bdec0b975398a7a413bd212936292cbde3217c938dde3d0157b57b9389999071ba305 SHA512 5d43444bb8e99a89c79cde615359d7ddf3f326428d8a368282e19f9df4b405ab146040c22c674d4eb5818059aecddb3125484de0e18859c08dd6b8fb20986b09
+EBUILD libSM-1.2.3.ebuild 1724 BLAKE2B 0e815750b78b5bbb11d61f0b21590dbccd39153353994422e3c0fb8e7ee7c07ea57a2d811ab4f863f46420da0bdcfdbe938266f7e3fda772908141452ae4066b SHA512 75845756c00100108153d9e8f702685f99da7c375423799e44c34f7ee85818c139e8db38dd96c84a8ec639be38719fda026b7c7ee41a81f2f51074081f21506a
 MISC metadata.xml 348 BLAKE2B 475822d6499e8c44bda145b3fb4d72b0f462c03ddddf44cdfb8359a2b0a0e44917a0004a53ace75218efa01c25491fd66e52c1bc0c7e392c88ba9cdbbe414e54 SHA512 4fa0439dc05b56a6fc0280c020ccbc52438ba0d22a4a9b8c0e4830844fa50bc6af8096498336b0d9752687b6e30dce581a24b4b67a812d2e7a62783e37af86d5
diff --git a/x11-libs/libSM/libSM-1.2.3.ebuild b/x11-libs/libSM/libSM-1.2.3.ebuild
new file mode 100644
index 000000000000..f122e0662537
--- /dev/null
+++ b/x11-libs/libSM/libSM-1.2.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Session Management library"
+
+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 ~x86-winnt"
+IUSE="doc ipv6 +uuid"
+
+RDEPEND="x11-base/xorg-proto
+	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+	x11-libs/xtrans
+	!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
+		uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
+	) ) )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local withuuid=$(use_with uuid libuuid)
+
+	# do not use uuid even if available in libc (like on FreeBSD)
+	use uuid || export ac_cv_func_uuid_create=no
+
+	if use uuid ; then
+		case ${CHOST} in
+			*-solaris*|*-darwin*)
+				if [[ ! -d ${EROOT}usr/include/uuid ]] &&
+					[[ -d ${ROOT}usr/include/uuid ]]
+				then
+					# Solaris and Darwin have uuid provided by the host
+					# system.  Since util-linux's version is based on this
+					# version, and on Darwin actually breaks host headers when
+					# installed, we can "pretend" for libSM we have libuuid
+					# installed, while in fact we don't
+					withuuid="--without-libuuid"
+					export HAVE_LIBUUID=yes
+					export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
+					# Darwin has uuid in libSystem
+					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
+				fi
+				;;
+		esac
+	fi
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		${withuuid}
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 2c1a7035471d..229e6e080cc8 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -2,5 +2,7 @@ AUX libX11-1.1.4-aix-pthread.patch 300 BLAKE2B fbf3b97b3c7e70875b28a6813525435d3
 AUX libX11-1.1.5-solaris.patch 246 BLAKE2B 38bdf941f63ff7ca3adb13af2bc26e1248e41bc84ad47b58db88d63a0994ac4a30841c85a1d9471686fae517f95edbf5f514c7af7b90d79203e1ba72d4c8f1ac SHA512 8f6faa51f5d3cb25f32c9a3ac6ce96140748836cc5d101b5a1202d6d68d45d10401d7a4e45bfc11b9e71872acc96616b180795a7a617491058e1d856e7762878
 AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf3fcb49f0e3a3acd43e4d0c1b5dcc3fe2e9a6556171f7d55712e37dfa6dc54d1c2463b872f310629ea24a131f945a55bdd SHA512 71f036f88ab45286826bde20fafaa1eea86aade16d21601e4da0ed935e2a937c6570969e3b173967e1860778c594b0ea08eb905e7c47b67e147d65834905c251
 DIST libX11-1.6.6.tar.bz2 2342730 BLAKE2B 7b3936606a6cf8981d691caa06b2ebbf2383259a4b74ebc6fa72277ce4870222d7e797037f21cd669dc1f1177f5a08f7fdd5d0158b6579c3ca3d0587a3e4e950 SHA512 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7
+DIST libX11-1.6.7.tar.bz2 2290260 BLAKE2B d149d3eacdb1cd80de378076dd96bbaa2cf0cf24d4431ed1afbc00f6ff43cb5dbbea01345230e8b06cd05900d77d4771a72e3b8c5ddda69cb25c95f02a58d9ce SHA512 edd2273b9dadbbf90ad8d7b5715db29eb120a5a22ad2595f697e56532cc24b84e358580c00548fa6be8e9d26601a2b2cdab32272c59266709534317abbd05cd5
 EBUILD libX11-1.6.6.ebuild 1278 BLAKE2B b77b105807f0740d4207a1dfb980532f91f06d4b1ba4bd0575e9cd14976597afee960ba722315839cde89c883d7054b0c7a94c98dbb115cce2ed7259ec188a73 SHA512 e521b1fb9b085feda4ea22ccaa36b2bbfcfc5756287ecfc3dba6823b6dbadc2620981b15d6b2e22473005cb3fe7adc6b5382eeeda18331e7c5e061457817ca00
+EBUILD libX11-1.6.7.ebuild 1286 BLAKE2B 0cca32a8f311107f2de3ca511b3f259e078d4d2ff2398b73f29c8e11101fb47cc9784e1cdea5d4cdaf11ce8b28edf018f1df71b7803ac8a506f52f0f501b443a SHA512 d62c9d394c4b64143c99aa700e4b464168cd8c71343727a6b2a03d5ca70d259861139601e0584978f1e6684036eaaed57212f5dba63656d0a4dd5cd78775fd94
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.7.ebuild b/x11-libs/libX11/libX11-1.6.7.ebuild
new file mode 100644
index 000000000000..8434eea640fe
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_EAUTORECONF=yes
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs
+
+DESCRIPTION="X.Org X11 library"
+
+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 ~x86-winnt"
+IUSE="ipv6 test"
+
+RDEPEND="x11-base/xorg-proto
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	x11-libs/xtrans"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch
+	"${FILESDIR}"/${PN}-1.1.5-winnt-private.patch
+	"${FILESDIR}"/${PN}-1.1.5-solaris.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+	)
+
+	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
+	xorg-2_src_configure
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		# Make sure the build-time tool "makekeys" uses build settings.
+		tc-export_build_env BUILD_CC
+		emake -C src/util \
+			CC="${BUILD_CC}" \
+			CFLAGS="${BUILD_CFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			clean all
+	fi
+
+	default
+}
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index e1b066bc92a4..20a4a2039ab6 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
 DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
-EBUILD libXScrnSaver-1.2.3.ebuild 524 BLAKE2B 7805fc2630257cd0f58b000e6ae9f7d9d664c91b4af6260b757f638fcec34b7de197767f848c6d977ed76d4e0baa30b7d233ee6ae7b3ba9302211ea27e80e7cc SHA512 4f6b5db5a88c3fcfc056b6302f6e9ac97ab3453641107879645fe01d8ce7f9f4fe30eff45455c6d91b1305dc2059fe4fbfbdab9480d6f3794423d53f84c1347e
+EBUILD libXScrnSaver-1.2.3.ebuild 520 BLAKE2B 08a9e8575f1cbaab178f933c1d300d11833855ee4f88c369011d195ed1d775dd1f3fa13a6a97a761868f9e19b3c770b0008deb84d7f243c51bbeedbe22ce2ab9 SHA512 a75128b98fec70a83252c590cc520e41a278c5bd92be61520dd0fa3b94568ee17ac23656884a6f517f557fd14f1dc54443f7cff5c9b97d9ad67101c89b37a1b6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index c4535430c85a..22b97bc96ca7 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 9b01afdf86ad..761d586600d5 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,3 +1,3 @@
 DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
-EBUILD libXinerama-1.1.4.ebuild 527 BLAKE2B 3ecb61891773fcd8b679f3c1a33ca646f1de3e9cc690a16b568c224bd55a9adf1cf8f71feceb84353b0fc000ad21165d54cdde93673359cf9aaa529b9dc1c466 SHA512 42a1924340cdefb54d4a55d49aa58f2d00f20b03833061dbd989583515903d04b49f195a18fedf20075e33ea355bd3c1c3d464af17a5e13b501c5f3c8654861e
+EBUILD libXinerama-1.1.4.ebuild 523 BLAKE2B d90d16a41c6b7e196f69a52d7ba6d7be34aa850e4daaeee7431a2be5d835d6ba4378e03428c564680a5866a8ccd1a5c9363e8ee5ee10c26e8a08f20f27ad6405 SHA512 db7319c54578985e5ceb41fa223d721165b3fd04792745d0084a4b4c3114e259938173e7d4ea746f167aead141d122bc7434f4f0643ae48da6ae406f3b08b457
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
index cba156923c8f..2996782670e5 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 441330329c14..9fd66f150d8c 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,8 +1,10 @@
 DIST libdrm-2.4.93.tar.bz2 826579 BLAKE2B 6b2775a6bc631001be874d1337ef9607ee8ff5b86ce5e3d8ff6c6eb58182a30e2c70592cb4eb9e88c9e046d73b510f632272c57621706afd1db416acc6ce366c SHA512 ba4221e8d6a3a9872fb6d30a0ea391e30ea0e17f249c66f067bed9c2161ed1ad8083959cb2c212834c6566c3e025f4daae31e9533d77aae19bbbbb9de6c2ab3d
 DIST libdrm-2.4.94.tar.bz2 829060 BLAKE2B 99de0fb3df6ea9bb5540cf0e3bdfe182c28db9876f679030eaaed1abd873bb818586bc07e73e0499f831ccaa7ede91a5b73b2b2bf681853e14e786a4af9abd98 SHA512 1a1699d6ea70b8759b37f3863e0802a99430b58f02e62632ad451356e2463eaf6faf4b810323f7dcc85ffdcca28f674b32caa5631ebd65b83e5b86bd59a35937
 DIST libdrm-2.4.95.tar.bz2 820722 BLAKE2B ee12f1b9fabc0a00f5adba33fe17000d018cfd5d7fbb4e737bceadcd8e897b846fcccdc262582c4d37508738671a0fedc1a653976214327eb998dca7d5834e01 SHA512 9bf8178a871bb059471f58f236c8362245e08877b732b2c8366d402e8066c9a74707e4ec3bf680fca12303f1319875edc98ae8e31bc9826f172798f47197e631
+DIST libdrm-2.4.96.tar.bz2 829518 BLAKE2B d9a21ce31af65812c1b23968ef6c1901aea106b4cc68d76d3641a17b98423024b804bfda509862174eba98271bd7156c7f08d81bc0a520ea4a25c8e2e0bfd598 SHA512 008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b
 EBUILD libdrm-2.4.93.ebuild 2113 BLAKE2B bd75b9274d572854c30020c44ad6a59ea91c563709f2641483f18355a8b10e6780e377e8853255c761c2f967e22b230b71fc208b85a63dd59d04c22964a54835 SHA512 650a6a3dae11732881598e9af1ba7c1966128840069d1f5408d66f5d26f5ce7180e1e4f9edb0842c52cce3fc35f6f88cca5bc4dc53bb06a5be322c8a5e6eaea6
 EBUILD libdrm-2.4.94.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
 EBUILD libdrm-2.4.95.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
+EBUILD libdrm-2.4.96.ebuild 2119 BLAKE2B 82bbec93aa08d5a3cc52ca7110ffd16f747eec48c38be529cad7bced1f5bbdc8c80fcedc136568642a2f5fc69e959d0bcb87c52c82c5b9f39ba6b17668285f46 SHA512 fddafc73e1d88e9172b51d7b43cb15b5d492debdf0f05c1f683411a1a11929d391fc891d13802a6b9711978fc5877a1e1f00feef39eda224378a757f2f1e0a25
 EBUILD libdrm-9999.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.96.ebuild b/x11-libs/libdrm/libdrm-2.4.96.ebuild
new file mode 100644
index 000000000000..1e8cf3979538
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.96.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Udev is only used by tests now.
+		-Dudev=false
+		-Dcairo-tests=false
+		-Damdgpu=$(usex video_cards_amdgpu true false)
+		-Dexynos=$(usex video_cards_exynos true false)
+		-Dfreedreno=$(usex video_cards_freedreno true false)
+		-Dintel=$(usex video_cards_intel true false)
+		-Dnouveau=$(usex video_cards_nouveau true false)
+		-Domap=$(usex video_cards_omap true false)
+		-Dradeon=$(usex video_cards_radeon true false)
+		-Dtegra=$(usex video_cards_tegra true false)
+		-Dvc4=$(usex video_cards_vc4 true false)
+		-Detnaviv=$(usex video_cards_vivante true false)
+		-Dvmwgfx=$(usex video_cards_vmware true false)
+		-Dlibkms=$(usex libkms true false)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index eb785cfdd5f0..a748d2a03d0f 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,7 +1,3 @@
-DIST libfm-1.2.3.tar.xz 898256 BLAKE2B 96a384cf2ebba7a833a97825dd1c3ba499bec1099d321eb6e400b7e09116d28f7835228be7a98eb46630e9fed286ef12e58c1a5f06d7efc75ba4ecfafdd80eae SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443
-DIST libfm-1.2.4.tar.gz 1259686 BLAKE2B 4c81e93c1d7f46d805167a3873ac3dfc6ff481df43258a0ea8d28614ba271496490ad02720cdf316fc563cfb273e38afb482a6aa44256f40f10cda3546565db3 SHA512 7196ae4af99ef41d77e1113dea62e35244b0be57c8cd7fcef2e0559daa5564ddfb163293225708c1697068e6a41d9842f96991145c34c41a7f510f38345d2f9c
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
-EBUILD libfm-extra-1.2.3.ebuild 2554 BLAKE2B 9d5eaa416fb02fe0b3ee09b47cc2bcc33ad0d1e0e1831f977f2e429bbc4540fb7c67a0e46986eb1022f4714d14efa650f64f79553215a59a39b317203daa7dee SHA512 a2f7d8697f369aeef4b7d5ec823c6dcb9815a1d4bbae9d28eafaecb94a17d588d151c404493e8f3a01c314e53ef4a8176b77541a52839d7eab422868aa38b83f
-EBUILD libfm-extra-1.2.4.ebuild 2565 BLAKE2B 9237f5c5eadfcc85084b6914ea49d166221909b4e1be76757f5a9215c31ffcd98067cf703cc641a60c4e3cde60446ce31184a329c18d2511d6a6a56bfe103631 SHA512 f7df23c3a13f3f3bcd65e4e103a31dc0903b1c1509ceea4625d0f0e36074638cb475365622d511b34eaec54997b695f8672496098e0ef1bfa086d7f0a34af810
 EBUILD libfm-extra-1.2.5.ebuild 2565 BLAKE2B d39853407d9a146d8114f9f06c53551b0a800acfe15be1e425b6e5b0a7a4396ec912cf63d486537820c32a70628178e7111933f5be0dbc5b62203c85872a69af SHA512 f4775b74a6496c15115d8e2c79b8faeddbb6dd0e18cf93e5675d51f7d62c9b490dee85c9bfd8ca0f0b7a28e0f74913580a12ecef83aa89e944d226d8569a86a5
 MISC metadata.xml 493 BLAKE2B 5f295aa7bd56f402ee0452a48ef4a68088d4256bc33480bebe6406e144e4bcfdf3efbf92d39a2f166b6265c8ad9459543cd82cfdbd03e4fb29ffbf2c3a0735eb SHA512 12e967cd0e2f30984b1c3d826c65e33033391687210e1a39efc837871b671fd002f2e2d17673366dadcf74bb55cf2c253524eb7b5e200160b6d982974ad6249b
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
deleted file mode 100644
index 56f056e2e917..000000000000
--- a/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools xdg-utils
-
-MY_PV=${PV/_/}
-MY_PN="libfm"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	!!<=x11-libs/libfm-1.2.3"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}/etc" --disable-dependency-tracking \
-		--disable-static --with-extra-only
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
-		rm -r "${D}"/usr/include/${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${MY_PN}
-	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${MY_PN}-1.0 ${MY_PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild
deleted file mode 100644
index aa65e3f1c6ce..000000000000
--- a/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools xdg-utils
-
-MY_PV=${PV/_/}
-MY_PN="libfm"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> ${MY_P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	!!<=x11-libs/libfm-1.2.3"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}/etc" --disable-dependency-tracking \
-		--disable-static --with-extra-only
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
-		rm -r "${D}"/usr/include/${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${MY_PN}
-	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${MY_PN}-1.0 ${MY_PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index da84c6adeb74..49e82924235a 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,9 +1,6 @@
 AUX libfm-qt-0.13.1-check-if-app-exists-before-opening.patch 2010 BLAKE2B 3f33d70abe1467df3b799602c3232af7a490481c1fb2c3dd5a68f4792dc45a251f1e5518df36604090d23a42c43d13051bd144b54eb15cb2a7c722c9283cbacf SHA512 cafb1b97a1f6faeb7e7e9da5fa7c323eea1754078d08e5e0ea4e437c29d7da371318ecc7b944c595ef60f3169697f35db9efbd2ee23282a2bd694fac19d2e634
 AUX libfm-qt-0.13.1-correctly-handle-mountable-types.patch 3498 BLAKE2B ed7a0541d2bcbed1afd30d0045f676f179a0c123376afaeeef29260107f80ea8b0cf89a3a55f4e004fd11a6157b4ef2d3c092c8ddedd2013bef321fb59728660 SHA512 3bc193a1ef82bbe64181e596e082cbcc26b60f1cad8f05cb1d1fdcc1d162af21f8935179e3cf8ff370a7640bd5299a2ef7380436f80f9c620489365fe76c31c3
 AUX libfm-qt-0.13.1-fix-smb-error.patch 11579 BLAKE2B 4a0cdc5c9579415a3334de6295cae8ae5b9a4fdbbd0ecf647484b58edd3c6bed07fc0b93050a81c6d0d55343ea3b0f554cde536f6873ce3db057a6da3e6c267a SHA512 cc00a79ceac417d969001ac35b3c65bb6b437b3c98c62d5e70ea1e23b1a0ad0e11f05ad5c49cee64cdc23b16121ba14a8fc8978aa42b4ba6c64da00f07f72f8d
-DIST libfm-qt-0.11.1.tar.xz 127624 BLAKE2B a6651e5ffc79a49f17f4ab95dbb9e4f51bd8de08f9d207970e32e2732eec920eaba0edf404ef1fa2fcc1e9b7f14fbc869eeb1ba334dae4b2f5ef3a9f5b94c713 SHA512 e7cb545e81459f459aafdf491541c3de7cc91249c2179f74bc1ddab0f0c50467e82b731afce22b3a86a2462d331f55794f4336912ec607bfb5e2faa43ad58079
 DIST libfm-qt-0.13.1.tar.xz 191972 BLAKE2B 760847be1fbb209003bd2b61a9c475ccf57721c469927039518a5f65543b8264c32f3e2c66c867be0b969fdf4636fb82cde0b2bd4e77b1365fcb9f61b0bd02c8 SHA512 29b8f686950a7b0ea86468d01ca64a6ff8316ccd5f0144808a4332692cf96199431470880a9b560780efeba7add833ab6a0d9b4b24220f8fb7091cc5ef151dc8
-EBUILD libfm-qt-0.11.1.ebuild 905 BLAKE2B 617800ac0b96fb5ad880dddda765d1f66836871911c04f8a8b1388673bb3849edbd4ec242620f741e127fdf769d87e3bc20b16313ade87005cf7a80e28d76b16 SHA512 4d230db20a9c7aa842aa5b855080e7d01273f15eb2968d5a4de4211c1d9d5db5f7d3ebbc0db74b4dcf8b65744419552c04514ae51710532238c3e24db1b83ccc
-EBUILD libfm-qt-0.13.1-r1.ebuild 1099 BLAKE2B 16213a455bd0710d7171b6fe6e8161e466c06251985edff6fbf342a9f48677e6f19fdfb67abc81f25fabd07cf56aeb7f405987198771c6735167b3ac8d81e3aa SHA512 ad0560427f59782cf05974fd20598fe697f8f872506a59d87065c195e3fb3de255dfa62fb6749d0574711a5335a1b6ddbc6ba92615f04576c289280ca0a9beec
-EBUILD libfm-qt-0.13.1.ebuild 926 BLAKE2B 3f1262e5cc7c7c2113e50db9cf19327281b125820b03f5114eae2524f406ded9dd6697ec37b92eb7292a44fc19811e3505e39f880b4039616c0d6594ba101975 SHA512 0413552e13a4ea4e5b1ebe0cd2b6cc82b846fc0da0c58ecd21212583fcc9bcc76831c3c013c54bd7979896a5fbf3a6ea2f4e5e5be4ade801fea99688dc5fae0c
+EBUILD libfm-qt-0.13.1-r1.ebuild 1094 BLAKE2B eb12936a58ed4f3c8893fbecd0909cd58256d2b934cfd8301524e599cccef728ede24ef62c6a781bd88eab2d93a359bf816b2132163bb9aab2663d92d142743b SHA512 cf39485d2e53a40c43d61797915f0cdfe3cfcb94c1efeb18c17448a0f627927e8ca5925e29f513c3a355ae2ce21de42927f69514cdef0f891ed9f9a6e16ba957
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
deleted file mode 100644
index f377c3afce2f..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.11.1.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
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}"
-else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
-HOMEPAGE="https://lxqt.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxde-base/menu-cache-0.4.1
-	>=x11-libs/libfm-1.2.0:=
-	x11-libs/libxcb:=
-	!<x11-misc/pcmanfm-qt-0.11.0
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	lxqt-base/liblxqt
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=NO
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
index 95dea87773b8..e41d449e1331 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/libfm-qt/libfm-qt-0.13.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.13.1.ebuild
deleted file mode 100644
index d3a2aa6d6bfa..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.13.1.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
-
-inherit cmake-utils eapi7-ver
-
-DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/5"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxde-base/menu-cache-1.1.0
-	media-libs/libexif:=
-	>=x11-libs/libfm-1.2.0:=
-	x11-libs/libxcb:=
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 73bb72b98ae8..1a0448de19e9 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,9 +1,5 @@
 AUX libfm-fix-use-after-free.diff 863 BLAKE2B 6ec30c5c96ea4b33a1b21427e223bde954596ecea752286816e338b3255498a8fbaa79839344b77507f731012cd66a511ffe2bfca416e398f84d9dcd567b3df0 SHA512 7d9cc8699b66ec3538c27ee65b03f892752036d57432e861acfa76983ffbaeac9c1252e400f9cae3d05e7b49a33cc0af8299236c5b74a86b4c967392b879e47e
-DIST libfm-1.2.3.tar.xz 898256 BLAKE2B 96a384cf2ebba7a833a97825dd1c3ba499bec1099d321eb6e400b7e09116d28f7835228be7a98eb46630e9fed286ef12e58c1a5f06d7efc75ba4ecfafdd80eae SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443
-DIST libfm-1.2.4.tar.gz 1259686 BLAKE2B 4c81e93c1d7f46d805167a3873ac3dfc6ff481df43258a0ea8d28614ba271496490ad02720cdf316fc563cfb273e38afb482a6aa44256f40f10cda3546565db3 SHA512 7196ae4af99ef41d77e1113dea62e35244b0be57c8cd7fcef2e0559daa5564ddfb163293225708c1697068e6a41d9842f96991145c34c41a7f510f38345d2f9c
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
-EBUILD libfm-1.2.3-r1.ebuild 3504 BLAKE2B b7c0820ef9de929f94807cfd2ca0767033772fdc9da79f5c5b361f80a88a314c72ee8510ad790864bc537037653a0e1cb5db18348d80af4a31d56f1848065ba9 SHA512 32504d47f8f78d8771c5b73f2d39ebb4f84d604bd2fd6adfa4b2b83e4b0fa1d24efc30c264fae88b6920641943bcd59dc46618f2378fe4cf66f0e5e6b207e0d7
-EBUILD libfm-1.2.4.ebuild 3721 BLAKE2B 116ce5c067e3f05af89accde41d155d87bbb74b783a0a249b6f571dfca9e614471a8195f1794c92a232d42fdc528bbebc4f62d44164761673decba7ee4710567 SHA512 0e06741bdfcae3b237ad9a90184275b79935885057b8008a06b6a1e862e13edcc6532ff8c6e2f80f0d3ed2c4dc827bbdeaf2b221646b5f342749fce20672793b
 EBUILD libfm-1.2.5.ebuild 3721 BLAKE2B 66ac26f51b4088f142b468ad08fd3eacae2b6a2921fc5dfdabdd561fee47701bc37618f512d8b52e1f795156894044ae9e883701e6fdbaa2522f46858fcc04ff SHA512 cf0c08209691d48837e07954654046e5c5798053989bf0299d6e21e890980cc9fc6bab6e0b5e7b937b2edad1556bca83d4710c2aee9a34dab3a3ef8c43fd4c38
 EBUILD libfm-9999.ebuild 3433 BLAKE2B a9f4c902f98da8f78f14a66cc248f043c34443e417934bcf756d931885163abb2016893b4aa44435f1fb40fa8a331d201ef27641c39e1009ef4368fd42e839f2 SHA512 933f45c173ac3df6493e8b190955cf310e119826dd1fdefddf68f03ba956210cd49115659e7a31f2a816168811b5d0f9f7e74074519e2eea17ecf820875dabde
 MISC metadata.xml 774 BLAKE2B caefdee6833d990105f460b981552ead9ccf7e463bc54816c93de770efcaec85ba3e9d6bd43c56fb0ed36736ec7e850a70c57b49d5b3f262b25bac1f3712552e SHA512 025fd60a7244e8cc4040da0f53c47be6437c1d4c1cee5601f25fd54a9b6f294abd8e0c10ef356e6a3a390f8bf773a6a9a17271ba448a686764e75d332119b7d4
diff --git a/x11-libs/libfm/libfm-1.2.3-r1.ebuild b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
deleted file mode 100644
index c9bde1ffe20f..000000000000
--- a/x11-libs/libfm/libfm-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools multilib vala xdg-utils
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif gtk udisks vala"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	gtk? ( >=x11-libs/gtk+-2.16:2 )
-	>=lxde-base/menu-cache-0.3.2:=
-	~x11-libs/libfm-extra-${PV}"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxshortcut
-	x11-misc/shared-mime-info
-	automount? (
-		udisks? ( gnome-base/gvfs[udev,udisks] )
-		!udisks? ( gnome-base/gvfs[udev] )
-	)
-	exif? ( media-libs/libexif )"
-DEPEND="${COMMON_DEPEND}
-	vala? ( $(vala_depend) )
-	doc? (
-		dev-util/gtk-doc
-	)
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
-
-src_prepare() {
-	if ! use doc; then
-		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	fi
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}/etc" \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable examples demo) \
-		$(use_enable exif) \
-		$(use_enable debug) \
-		$(use_enable udisks) \
-		$(use_enable vala actions) \
-		$(use_with gtk) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
-		rm -r "${D}"/usr/include/${PN}
-	fi
-	# Remove files installed by split-off libfm-extra package
-	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
-	rm "${D}"/usr/$(get_libdir)/libfm-extra*
-	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${PN}
-	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${PN}-1.0 ${PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm/libfm-1.2.4.ebuild b/x11-libs/libfm/libfm-1.2.4.ebuild
deleted file mode 100644
index 12d09617ea74..000000000000
--- a/x11-libs/libfm/libfm-1.2.4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools multilib vala xdg-utils
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> ${MY_P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif gtk udisks vala"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	gtk? ( >=x11-libs/gtk+-2.16:2 )
-	>=lxde-base/menu-cache-0.3.2:=
-	~x11-libs/libfm-extra-${PV}
-	udisks? ( dev-libs/dbus-glib )"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxshortcut
-	x11-misc/shared-mime-info
-	automount? (
-		udisks? ( gnome-base/gvfs[udev,udisks] )
-		!udisks? ( gnome-base/gvfs[udev] )
-	)
-	exif? ( media-libs/libexif )"
-DEPEND="${COMMON_DEPEND}
-	vala? ( $(vala_depend) )
-	doc? (
-		dev-util/gtk-doc
-	)
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
-
-src_prepare() {
-	# Fix use after free bug, see
-	# https://github.com/lxde/libfm/pull/11/commits/9e3a809c6a8a5079f05e04edac9457d317822321
-	epatch "${FILESDIR}"/libfm-fix-use-after-free.diff
-
-	if ! use doc; then
-		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	fi
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}/etc" \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable examples demo) \
-		$(use_enable exif) \
-		$(use_enable debug) \
-		$(use_enable udisks) \
-		$(use_enable vala actions) \
-		$(use_with gtk) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
-		rm -r "${D}"/usr/include/${PN}
-	fi
-	# Remove files installed by split-off libfm-extra package
-	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
-	rm "${D}"/usr/$(get_libdir)/libfm-extra*
-	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${PN}
-	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${PN}-1.0 ${PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 9bda6d76788f..914cfb8d82dc 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,5 +1,5 @@
 DIST libnotify-0.7.6.tar.xz 280388 BLAKE2B 89b5853f940be94884f6e50b1114bbc3428a5ee1645fc0b72cbfd2ca0f0bb574353ca0b379f0ded077022a478713419654598fdc603652f00c2d772a58666a40 SHA512 5d656ee7ee5caeb95aec4adb973795dc72fc620cd36b9fe3d4f910951945bd5df70ee1c422cd6aca9c38a9ba2760562e479fc8fb9269449924a5b24d762d03df
 DIST libnotify-0.7.7.tar.xz 285356 BLAKE2B ace0eedb1beecfbb89726960e441821d64f5ac456dfc6294b051479078726aed6fbacbd1e8cb17578933adbc4c94711b0d69a292778ba4bce096552a5197722b SHA512 133874114407bf12267ef609f5941657181760bc7cf115c5973b1810cb72bf55072b621c143e32be1e7e8b49f244851925d14bc3f9f26457747b8a8695ee9954
 EBUILD libnotify-0.7.6-r3.ebuild 1604 BLAKE2B f32ab469583abf5e62f6ee4cda0fa93397d7da8d4f050d014db0ec401b7370b5a1abecf3a4812bad09b128b185afd33e89630fce013c64aeeb9fbab32062c863 SHA512 7fee9407a9e5aae59ea94cc58c797d888992f754b3e17090de2b59b047a70aa7c962aa55788640d23d89d92efbf90a4c7cf82dd08842f0a845c69fca6494e339
-EBUILD libnotify-0.7.7.ebuild 1490 BLAKE2B 24679e740e217b1d79ff2e116eb1d270ca817875914f32f3d21f86fc5304dd5fe042c380fd55a2c2db7f5dabca426a4e0c21553e8e9f6511ff6c6f3107b7afbb SHA512 75911e883870aa6c9f41bd98e922e35cc18480f9e7f5fd6562e3ff69962622af54a4cd679ea13889962d6b3db9f36342da69c2eb68091bbe7930fbcec0849cb5
+EBUILD libnotify-0.7.7-r1.ebuild 1511 BLAKE2B e4a659b54a85c76b1e05e3417330763618845e2afd4f19451a294c6722bb4625ff9449b975ba7c4446ae0f7effa71df5a99a65b6e54f963d3f7fdbc4a1fff645 SHA512 8b320e306cddcd594d5683fd2c39311f6ac67566b7c4ffab6bf02755290a8fc4da2691646bf5ea1772b739314c80e4734bdc333ec7131ada1deef04616ca1c85
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild b/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
new file mode 100644
index 000000000000..684fa67f7764
--- /dev/null
+++ b/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org multilib-minimal xdg-utils
+
+DESCRIPTION="A library for sending desktop notifications"
+HOMEPAGE="https://git.gnome.org/browse/libnotify"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="+introspection test"
+
+RDEPEND="
+	app-eselect/eselect-notify-send
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.32
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+	test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+"
+PDEPEND="virtual/notification-daemon"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		--disable-gtk-doc \
+		--disable-static \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable test tests)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
+}
+
+pkg_postinst() {
+	eselect notify-send update ifunset
+}
+
+pkg_postrm() {
+	eselect notify-send update ifunset
+}
diff --git a/x11-libs/libnotify/libnotify-0.7.7.ebuild b/x11-libs/libnotify/libnotify-0.7.7.ebuild
deleted file mode 100644
index b281671c8f6a..000000000000
--- a/x11-libs/libnotify/libnotify-0.7.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org multilib-minimal xdg-utils
-
-DESCRIPTION="A library for sending desktop notifications"
-HOMEPAGE="https://git.gnome.org/browse/libnotify"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="+introspection test"
-
-RDEPEND="
-	app-eselect/eselect-notify-send
-	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/gobject-introspection-common-1.32
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-	test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-"
-PDEPEND="virtual/notification-daemon"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		--disable-gtk-doc \
-		--disable-static \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable test tests)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	default
-	prune_libtool_files
-
-	mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
-}
-
-pkg_postinst() {
-	eselect notify-send update ifunset
-}
-
-pkg_postrm() {
-	eselect notify-send update ifunset
-}
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index a9fde8628fbc..ff04236d4b75 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,5 +1,3 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
-DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c
-EBUILD libxcb-1.13.1.ebuild 1468 BLAKE2B 1a5cd7c835a58dfbf7032967cad02f1736f84279b96c8f11595d3ab22dfd82c1ae76d0846dfc5d29e350fe7a47fe2f81854707f93a08433fd51fb524fbf3c4ad SHA512 e0d1457e26b423a83a3054bfb76e59b70843a84f9346658f35f09dcf4406ad9f85279bd5c307d8fd235b7141cc1f4991973347be5afd7d7eba060cb5c4d1d120
-EBUILD libxcb-1.13.ebuild 1468 BLAKE2B 1a5cd7c835a58dfbf7032967cad02f1736f84279b96c8f11595d3ab22dfd82c1ae76d0846dfc5d29e350fe7a47fe2f81854707f93a08433fd51fb524fbf3c4ad SHA512 e0d1457e26b423a83a3054bfb76e59b70843a84f9346658f35f09dcf4406ad9f85279bd5c307d8fd235b7141cc1f4991973347be5afd7d7eba060cb5c4d1d120
+EBUILD libxcb-1.13.1.ebuild 1469 BLAKE2B 4f5e7e5242d65494d1c52b4c26cb6c1cd9f8f66b9cc513609793ed648ef808758e90b2e49ee4a76ff574007d6d2b22a8be8079cde92813d91aa1bf0079906d88 SHA512 725acc3d795ed3286e66b2c9ea24e7c3236607039de6bd7777e86c47e62c081067c6dc1a634d5dbd453510ef6ec4cfbd4474c1549f8e166008e79514d0463298
 MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
index 102ff1507d80..9bbbd758b0aa 100644
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 PYTHON_REQ_USE=xml
 
 XORG_DOC=doc
diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
deleted file mode 100644
index 102ff1507d80..000000000000
--- a/x11-libs/libxcb/libxcb-1.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test xkb"
-SLOT="0/1.12"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-	doc? ( app-doc/doxygen[dot] )
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep \
-		">=x11-base/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-base/xcb-proto-1.13[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc devel-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 93aed60d2d7a..8cc62a7ad219 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,5 +2,5 @@ AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbe
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 EBUILD pango-1.40.14-r1.ebuild 1662 BLAKE2B e367786214b081a64fa9036f06ed205200ee2a2ff110d269efd5eb0d3fab3d3ec401d327369a901c415aa6aa93ccdfcd740f729f2fbc6a361c50e2f8fbb5067b SHA512 be9bc00dcb297db2b0d367640ced582685c2aa452ad129b6bdfb9426183b634c094cc985a91309c82e003f23ff9f5714292e54f67d3e5874596f2ec0f7014550
-EBUILD pango-1.42.4.ebuild 2013 BLAKE2B 4326042dd1f3ccd825945515400896f46c45d505f152ad8445bd5f4ffb8fefc3d7f1a3c57f12a1c84daf42dd302d4b11a277581a3e65c87efd461d6ded013e49 SHA512 f1409a9a2b0b2be9d19584bbae8ed1a837fffc2bef88ec04d1d9ef113339198d5556009bf2e3f6dc1c6ffe0a032fd938935bfc5f0a983c8dc5daae33c955f9b6
+EBUILD pango-1.42.4.ebuild 2009 BLAKE2B 88249b266b08ec139933aac606cf7620020f4d1624f9e9528cd21c9ef6dd91dc76b275ad4a1ad276f10069e1ab0b6de633f5ae78ce9606de5492c0d41b1da91c SHA512 de72ed1ee81c1108db5964221e1ef41fa9ef73dcd5e59d4de3cfcd4239c0f4e894496e98eacd1afa6009db311113a9da6211c91634153fc35a681e4c6569ecdf
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4.ebuild b/x11-libs/pango/pango-1.42.4.ebuild
index 9b2387917637..73a617d84d49 100644
--- a/x11-libs/pango/pango-1.42.4.ebuild
+++ b/x11-libs/pango/pango-1.42.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index fd7a915bafe6..74c88a89cbf2 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c
+DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
 EBUILD qscintilla-2.10.4.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
 EBUILD qscintilla-2.10.7.ebuild 1802 BLAKE2B 54a078d16a981c7f5ca4b332592e388376caa4201f02867464dda62e2fda08b0f9e3a5535558367198931a67c657161b20e93b3982c62f83c92fbc308950c32d SHA512 d304e9df12f1915e24890bfe02e8019d6a9cdc660deb65467aa17c36979ce2947a615d09cc82d532b75e1b42c54cf4f18b48791b10787e1bf834d2096a1cb6a8
+EBUILD qscintilla-2.10.8.ebuild 1799 BLAKE2B 7674060f252519b516ce8ec1530eef5f943381b0f1ba3bb19bb450f035f040c624fdac411e5d82040b0aa76c5144135b82994e74c91a878dfeea4fa6620465b9 SHA512 c1af6dc28219da9fd43fbd9df0d4d2bb25402cf8f9865e16bcbda52a2b3c38c8717c363ae8e50748982b05160ea1cdb4868eacb6c9ae7bcc9599529b3a0e923f
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
new file mode 100644
index 000000000000..45509318b948
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="designer doc"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+	fi
+
+	qsci_run_in Qt4Qt5 eqmake5
+	use designer && qsci_run_in designer-Qt4Qt5 eqmake5
+}
+
+src_compile() {
+	qsci_run_in Qt4Qt5 emake
+	use designer && qsci_run_in designer-Qt4Qt5 emake
+}
+
+src_install() {
+	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
+	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
+
+	DOCS=( ChangeLog NEWS )
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
+}
diff --git a/x11-libs/scw/Manifest b/x11-libs/scw/Manifest
index 9e49233d204c..2b59be561379 100644
--- a/x11-libs/scw/Manifest
+++ b/x11-libs/scw/Manifest
@@ -1,3 +1,3 @@
 DIST scw-0.4.7.tar.gz 410761 BLAKE2B b241f6b54e11631611f26fcff807b406b7ecfbc29c140e805a5d1902c93f98247386e33294d1a03b953c4b58317f65660ab24c74185f333f0583e48b5b4453fb SHA512 bf042396cfeb7a4266a5e7156c618a533cbccd21ae499154c704e233b719a7031f051f421b3ed9371a60f2a1ba0ca3a86b5a665de1ef5443bbd12063ce013f8f
-EBUILD scw-0.4.7-r1.ebuild 518 BLAKE2B 2db575825fd5c5fba67a2fae0d1c5ae22f1b671aaf11f7c85c62b8f90f1a6e3eb23a0ea6e47a779cb497e260bda80cce0e916b11a384c70938adc57c877131c7 SHA512 3ef99ed6c77daef6fb795d674e7c1312620105bc03cb160781c9cdb02a115ad02196b9fd245488d317464d0833030c25688d50f549e7a021a7b3a71e3b58f12e
+EBUILD scw-0.4.7-r1.ebuild 537 BLAKE2B db28ac60d379f9208995fda39819d724750d6c655f256cdfeb0b7e7c92f6dac85a40868786f85b2bcc7dc746365cb40005e0562e29542b1bdc082b7c2af5189d SHA512 78b489c47071a734e8ab17b4b8912486eaff12e3b16673a4e3d0f1c169e2827d86edf5de530a883de90699eb0e5c52861e9e622560202ae0083b04e6fbd8b492
 MISC metadata.xml 313 BLAKE2B e36cbf2fad338d261f015642096991ebea26e5cec6d4782cfd4c432019973e22fb3f39a2e354ed52e9d586317fd3e7aac45d6a5256ffc1a53f41ae1cf8f143e9 SHA512 88293932281dbd3587e85abe6602aed94678efd91ab737e597f30f8f16b0747c77440ed2e99389f78070aae0f89fff575879561220647e0683895ba2867c5466
diff --git a/x11-libs/scw/scw-0.4.7-r1.ebuild b/x11-libs/scw/scw-0.4.7-r1.ebuild
index 732ab3fd45b3..479049556dfe 100644
--- a/x11-libs/scw/scw-0.4.7-r1.ebuild
+++ b/x11-libs/scw/scw-0.4.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A GTK+ widget set specifically designed for chat programs"
 HOMEPAGE="http://scwwidgets.googlepages.com"
@@ -14,12 +14,14 @@ IUSE="doc"
 
 RDEPEND="
 	dev-libs/glib:2
-	x11-libs/gtk+:2"
-
+	x11-libs/gtk+:2
+"
 DEPEND="
 	${RDEPEND}
 	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
 
 src_configure() {
 	econf $(use_enable doc gtk-doc)
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index 664920a9a189..caca8bfae54b 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
-EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1319 BLAKE2B d2bf6f579a5e058ac15ea6ce2947e9fdb46c135e4d80879c0d8d2ad9921ebdb1ee01c3952eae1afa4eee35ab2e48a85d008b2802a64fb261153abde05de4ab3d SHA512 bf4865a70b8a5da98bfa60ebbc99e7da4ffe156462bf6b2f11b526388289c2c4245bae0010e350e0501e54706499b296ef2f258db35ddefdf245ec63dde9fc29
+EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1315 BLAKE2B 84da77a43a6f6d8e152049a474fe71e32e484313e85e64b3da30145deae9e6a47079e2d7b870053750e9f71750dd8c930560b617e2d6269dfad9416083eaaef1 SHA512 d1cfb842a47ceba48b336508988fb86a44ec917dd366eda1081f2cd5a6b1f0dc3d3091e90b19b7094e74d7d8f2cab8a9587fc6099214654cdfbdfca01d4a94fd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index 1b44dc87488b..25d4ccc8c913 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0c1244f75bb6..bb36ecb23fe2 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 654669a4e67e..6147ea09b773 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,7 +1,8 @@
+AUX albert-0.14.22-qt-5.11.patch 703 BLAKE2B bac316c4a75d1bed79517f4e25c7844c5e3671f85051a9654c31a1337dbb692c6f52b2adee38c0ede081b0230db0c1cb4e963e875cfae717fc98839180dfd42c SHA512 e27bff9359ae9b3c7ee1be0ab1098073ccbaef65eca316351c63c616a4772be73cefabb9ee62f9b79238eb039520d89f4aecc79eca5f0bda7490e231000490eb
 DIST albert-0.14.21-plugins.tar.gz 538315 BLAKE2B 84c482bd2c9a7dfe38927da4531727a361014d0a8f6e4da923904253d5a322c37837f9eb7873621fd55581be7b0c1c7149b005f7729606444a9fc8b8e96b70fd SHA512 ae680b3ea8292c49858d029a16fb3ee6b5c33a96351afb9e962538ebb4d39fd5b862fe6da5592b03bfdc3c9622671a0d1140d6924e36ea2b67842490ffd102b0
 DIST albert-0.14.21.tar.gz 85541 BLAKE2B c8ddf61f3f001e92b3c889c8a3b748cb45ccf06896c990f1937484917496cb78510c17b479e61af8fbfc13c2ddc84ede7f70de15e09246c7dca4876eb644b910 SHA512 dc1e1121abb3534d32775cd8c8e3b832c037e997588b7e0d7356d933f6a1d15c669c3f0362c9c2bfb37256d80cef4175c9c8d22a095b5191453a44e0f20f9cc6
 DIST albert-0.14.22-plugins.tar.gz 540446 BLAKE2B 22cf69698614a1b0e97fd1f5e3224b9097141c4a32c7999b9468c3c59b6af0d7a753de59a7abeb07f9ef9655abc05b8cb5e5079c9b41eb9f51dc09291b89b635 SHA512 4cce6ad717991a6a2293b491f17838a01ba51e4222deb78d5b793ab3390692131f4938027b96863c6cd61ec7a764fa6d52b3c3ef33cadd3183b2fe1498b6d344
 DIST albert-0.14.22.tar.gz 84925 BLAKE2B b009bd0420f2e5894e2e71e526361c6b177ceb0ed9339efd276228e3cb8aed52eba811b8f2f6ade8f39357017458f2cbfddec25f0df4de8d12397451bd98cb57 SHA512 91c131140f666dda665e07e617ce0d2af5c776233f9cf1430aedfc18299dcc22c6dcdec4d82f15fc2d81fa44679f9d3608a47128d33bfbddeb97481b430608c8
 EBUILD albert-0.14.21.ebuild 1364 BLAKE2B 23c4f8216726ada93c05fdf7b951102ba6f2d940b7ee6300dbd319014f7141bcffe56c8ae2d1e97a234f88e71ca77363a9077dc509222f4a1a3c4a9466fa7dd0 SHA512 2228e31c4f9a751fccc113c85e78e29c49fcc82fcdf8e5c33fbf691cc9eb4edad7b5703ab82d1f1227c97a67f44a151a0cd99f48e11c9b3431a6518a90ee0cd6
-EBUILD albert-0.14.22.ebuild 1365 BLAKE2B 59bcced9cbba35cd9baf10c9aa6cd7e4ea819fb703fea3becfb8958d0664e3baffe9ad2286ec583ba2470e7b5ef3e780b6523b6e34cc7891f835319798b058f6 SHA512 222145e57e28fb5b12951a58d50f14a9ab3ce1a593956ff995d304ffac36d1d7fb1410d81ec31018671c893a4892f39ef30a3861849ee65366718a2808eb4eb6
+EBUILD albert-0.14.22.ebuild 1408 BLAKE2B b9cc7d816da0aa763e9fc9f04b835c734a5c3c2cb5bb6c7a80224a57c3536094fc463a33ac15a0ae999ee2a084b1107cc97e07cb12ba5a6668fe7e9dc279cd03 SHA512 62191f1b9a94682e602566d276f901e9b67a702a8446f94f51db54aa55e16f3c662c08bf25ca1616d0db1eb54302d64af3d67e17d7f8e2914100557985d75a2c
 MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
diff --git a/x11-misc/albert/albert-0.14.22.ebuild b/x11-misc/albert/albert-0.14.22.ebuild
index 3eb4aa9e5eb3..7c672bb96f35 100644
--- a/x11-misc/albert/albert-0.14.22.ebuild
+++ b/x11-misc/albert/albert-0.14.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,6 +34,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_prepare() {
 	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
 
diff --git a/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch b/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch
new file mode 100644
index 000000000000..1fa8a2fa7126
--- /dev/null
+++ b/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/666998
+
+From 97fdca06dc7f82c92e5bb71e05f4fd7e74bbc616 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 23:09:51 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ lib/albertcore/src/core/telemetry.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/albertcore/src/core/telemetry.cpp b/lib/albertcore/src/core/telemetry.cpp
+index 1fd6b06..09b7713 100644
+--- a/lib/albertcore/src/core/telemetry.cpp
++++ b/lib/albertcore/src/core/telemetry.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include <QApplication>
+ #include <QDateTime>
++#include <QDebug>
+ #include <QJsonDocument>
+ #include <QMessageBox>
+ #include <QNetworkAccessManager>
+-- 
+2.18.1
+
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index dabaf307fc6a..a2437633cbba 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,3 +1,6 @@
+AUX i3lock-2.11-version.patch 395 BLAKE2B dee64a9c8b255e3cbadd27419929da66a8fe66c097dac64ada091d78d900595cd32645eac912eaa151b11fa565cbd4d613502e218cef8d118892bf7455fb0749 SHA512 26bffc363d833a6c7049bd6cc0b05d6d2e737dce184e0265d67949f04371c399f41cc54e7071a63d1bffec5d9166aa7c4a4d0bb8fc3fe6b67cb1366963dc08b0
 DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
+DIST i3lock-2.11.1.tar.bz2 145434 BLAKE2B 9a2ff0be922162710f9dbbf597f93ad939684641d2264c6ed38dc8a7eeb77c253f61aa1a2e873f03de2c8cc6d661e79ff166e4302c423261a65f66582749c962 SHA512 8b779aa0a560884adc1a508e1f07f712bdf043f72c377c24d5e7e186a6b97f34a5bda7aa67de41f5e15a1a541f4a2c2d28bc284057926a5833d70b67437d073c
 EBUILD i3lock-2.10.ebuild 670 BLAKE2B d0da8763dd30fc3f354176f3c1d8e0ec2bc0758c4a732c485cdcb9b6510445644117a3b3bff77a78e2eb5c45df09b948e75c8fe186888baabad0d3e06d3e9a2e SHA512 1e77903498fc04b1f8daea6ceebace300dffa77eb97156c33e0be880cc73dfdd89827bde6ee1db23d83f23f8b9466b3520cfd6f9ef57397d515fa1a785e5fd14
+EBUILD i3lock-2.11.1.ebuild 789 BLAKE2B 612927a6c0f810b9516070a650dddcb67571ca544dda01c99e574df67013364cfb3defd3bc2bcb2dfa7cbcef57f618a13628f6ad9fdfdc9b4e64435b46ab4a27 SHA512 3891d25eb3dcd515356e2892fb6f0e1404de3c83c9d6070cecfddc4be9ef1e1b42494768cf35c25d897167b7f85055ac284f3ff413ffc9be1991f3eb023eb14c
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/i3lock/files/i3lock-2.11-version.patch b/x11-misc/i3lock/files/i3lock-2.11-version.patch
new file mode 100644
index 000000000000..df133cb91cdb
--- /dev/null
+++ b/x11-misc/i3lock/files/i3lock-2.11-version.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@
+ # Run autoreconf -fi to generate a configure script from this file.
+ 
+ AC_PREREQ([2.69])
+-AC_INIT([i3lock], [2.10], [https://github.com/i3/i3lock/issues])
++AC_INIT([i3lock], [2.11], [https://github.com/i3/i3lock/issues])
+ # For AX_EXTEND_SRCDIR
+ AX_ENABLE_BUILDDIR
+ AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])
+
diff --git a/x11-misc/i3lock/i3lock-2.11.1.ebuild b/x11-misc/i3lock/i3lock-2.11.1.ebuild
new file mode 100644
index 000000000000..2df68dac048d
--- /dev/null
+++ b/x11-misc/i3lock/i3lock-2.11.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Simple screen locker"
+HOMEPAGE="https://i3wm.org/i3lock/"
+SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=x11-libs/libxkbcommon-0.5.0[X]
+	dev-libs/libev
+	virtual/pam
+	x11-libs/cairo[xcb]
+	x11-libs/libxcb[xkb]
+	x11-libs/xcb-util
+	x11-libs/xcb-util-xrm
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+DOCS=( CHANGELOG README.md )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11-version.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > I3LOCK_VERSION
+
+	sed -i -e 's:login:system-auth:' pam/${PN} || die
+
+	eautoreconf
+
+	tc-export CC
+}
+
+src_install() {
+	default
+	doman ${PN}.1
+}
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 8544aa902d94..a79b5fcc549b 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,8 +1,6 @@
-DIST libinput-gestures-2.31.tar.gz 15872 BLAKE2B 0fe671f50ee6e7b06362591d68d259587347794c80df27c73d833e459eb9499ae919bf3e4f12e1dfc2852fd9b70c3962963f3a291107bab8ea0a8f1576dddde4 SHA512 fc3c90025486c8da5b2419f99666737dca40dfc962a549bd1955ea792137a1377a9697c8cab908991503fa9dd6d72520a04ac2dbc9463bc228566569be43ca67
-DIST libinput-gestures-2.34.tar.gz 16321 BLAKE2B ae1fc850a075fd0b8e4aec6b94f0257f10f309a28a4893aad608eff59afede28b4126734a14f510ca569f64d79492461000dfca8c34e614a5e99839f3c5d952d SHA512 47ffa36b9abb01e62a046d1135cf3ec2773285f94ba68d66c03f877b6acf057491fb4a7645198d8c3bde39e38e12e039f3b10c6987d5765798d969d23359269f
 DIST libinput-gestures-2.36.tar.gz 16598 BLAKE2B 3c30408ce394cf8bbc5a68c5f37c9106bb481ad47c75f25bfbba7470da0cbfb330512fe0422588408f177085c23a5cf0379c13a49c9fce438e8d8b1179c91d50 SHA512 69f77d0681f37deee3f215e71e4410d5c45107d2d0a1addb897de14d7f83bcb3e2285ed9ba605f30db23441a9d7bc9a6960b2a49d53ad71a379d0b874d36d645
-EBUILD libinput-gestures-2.31.ebuild 1017 BLAKE2B 611b39ec192cc040fd79ef4d262fc15ee31515ebafa478d1a406f64b4da6d32679945d5e0554df832a73cc7ed19c1cc41e830205f3fbced34f40c54f44542a7e SHA512 26486d673e801c4af689661765eca932cc46bf1abc68f67038455ccdeef036bed0ec579bebf3bb6abe74f8daaf12df9772d9e938bc70de314fc3a23fd68ec9a7
-EBUILD libinput-gestures-2.34.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
-EBUILD libinput-gestures-2.36.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
-EBUILD libinput-gestures-9999.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
+DIST libinput-gestures-2.38.tar.gz 17054 BLAKE2B 037d095674df9b00c9d23762745d35beaab03d0f5b361030a9177f84c540ef2ef45fb6fa4b9fe80a6500c81a8973aac46019931d8a548b02a6527ba09ca1fc13 SHA512 3152bcb0fd78551be14dda23fdce9f9216fc56e7a2dc4734b73949b4bd9c87fe6c9e2fc95f65a328b46c577abc05889a3a6290c6eb9390a94d9eb254c2fc7550
+EBUILD libinput-gestures-2.36.ebuild 1369 BLAKE2B 480f4582ae605fe66662eddee2172b15542055c03ee85bb0b12c3bb4e6dca264860b6a3ef50006c016f8f13e1245ec9a495c87afd4dd169465e9b5eb084401d2 SHA512 3ff9eff82d180809d1fc802d93ac647e1333d8e1bbc0f155a2888a34257b618e667874a99f0ea42bfb0c09d21c0d2f358f69ba8a53b12ab72bdeb5033ff80d1d
+EBUILD libinput-gestures-2.38.ebuild 1305 BLAKE2B d324f46c616f20588614678f741383cf5e2dc7f916f82e493bf282cfc4a9be6a0f2abebb7c819831ce6ed5a9fea30e009ec71ea323f66e44d614ad4c28d2c3e7 SHA512 f552a25ee6da9a229bbd1002dd905c6bfeb5f435cbefc9c549c5047f3faee1fa06b4c4f0bfa341c2c658a0c8aae5f29a03da456cdb6e4517a52ef8dba8474f3d
+EBUILD libinput-gestures-9999.ebuild 1305 BLAKE2B d324f46c616f20588614678f741383cf5e2dc7f916f82e493bf282cfc4a9be6a0f2abebb7c819831ce6ed5a9fea30e009ec71ea323f66e44d614ad4c28d2c3e7 SHA512 f552a25ee6da9a229bbd1002dd905c6bfeb5f435cbefc9c549c5047f3faee1fa06b4c4f0bfa341c2c658a0c8aae5f29a03da456cdb6e4517a52ef8dba8474f3d
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild
deleted file mode 100644
index abfc20a74249..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit python-single-r1
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
-SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/libinput-1.8.0
-	x11-misc/xdotool
-	x11-misc/wmctrl"
-DEPEND=">=dev-libs/libinput-1.8.0
-	dev-util/desktop-file-utils
-	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
-
-pkg_postinst() {
-	elog "You must be in the input group to read the touchpad device."
-
-	if ! has_version x11-libs/gtk+:3 ; then
-		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
-	fi
-	if ! has_version kde-plasma/kde-cli-tools:5 ; then
-		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
-	fi
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.34.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.34.ebuild
deleted file mode 100644
index 39fb049c736d..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.34.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
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2-utils python-single-r1
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
-else
-	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/libinput-1.8.0
-	x11-misc/xdotool
-	x11-misc/wmctrl"
-DEPEND=">=dev-libs/libinput-1.8.0
-	dev-util/desktop-file-utils
-	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	default
-
-	# Fix docdir installation path
-	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "You must be in the input group to read the touchpad device."
-
-	if ! has_version x11-libs/gtk+:3 ; then
-		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
-	fi
-	if ! has_version kde-plasma/kde-cli-tools:5 ; then
-		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild
index 39fb049c736d..a2cf956e87db 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild
@@ -17,10 +17,11 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/libinput-1.8.0
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.38.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.38.ebuild
new file mode 100644
index 000000000000..87acd6131454
--- /dev/null
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.38.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4..7} )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="Actions gestures on your touchpad using libinput"
+HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
+else
+	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/libinput-1.8.0
+	x11-misc/xdotool
+	x11-misc/wmctrl"
+DEPEND=">=dev-libs/libinput-1.8.0
+	dev-util/desktop-file-utils"
+
+src_prepare() {
+	default
+
+	# Fix docdir installation path
+	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
+}
+
+src_test() { :; }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "You must be in the input group to read the touchpad device."
+
+	if ! has_version x11-libs/gtk+:3 ; then
+		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
+	fi
+	if ! has_version kde-plasma/kde-cli-tools:5 ; then
+		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index 39fb049c736d..87acd6131454 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{4..7} )
 
 inherit gnome2-utils python-single-r1
 
@@ -17,9 +17,9 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-IUSE="test"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -27,8 +27,7 @@ RDEPEND="${PYTHON_DEPS}
 	x11-misc/xdotool
 	x11-misc/wmctrl"
 DEPEND=">=dev-libs/libinput-1.8.0
-	dev-util/desktop-file-utils
-	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
+	dev-util/desktop-file-utils"
 
 src_prepare() {
 	default
@@ -37,6 +36,8 @@ src_prepare() {
 	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
 }
 
+src_test() { :; }
+
 pkg_postinst() {
 	gnome2_icon_cache_update
 
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 42d6dabc038c..4380a3fd9331 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,10 +1,6 @@
-AUX lightdm-gtk-greeter-2.0.1-gcc6.patch 512 BLAKE2B d694ae119437b12ad13f94fcdbe6b18ea14f84de507ddcb602b081af6f22b3406e7e3c1cd67059cfb6bcba942c943133aed660fa84bb53eea492044b6553d67a SHA512 50ad27370f0ea355c27bc91d3a1c2df234dd7bb39e2763d37b93ed5ebdb69bf79be65b07a22fbe94cd3f2945cd4672ef4f97a2862ef15d245a7d0b2d2f7ff009
-AUX lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch 2129 BLAKE2B 5f6d70a42a986c7da34c563487583a2b520bf6f56208a4fac9e5aa0122a89135a5eb007f160464a6e0f7f94ab33e308e16e3004d95f34e0b07d88d06269336ee SHA512 70bbed98680f6cb6746b4d4cb2ce113d6900373fe701c72a95e70e890e700b337b2ef6f7283bceeb22cecc3098f2cd94cd917bc0c21d034bf2e19be0688f62a4
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
-DIST lightdm-gtk-greeter-2.0.1.tar.gz 467375 BLAKE2B 9b6e4c597b0dcace770609f7bbe55dac627445b609619b7965566e964f1584bb75ed3ff7d45567dbdded5fb777578043990b9f8ba6f17d27951adf222740cee8 SHA512 fd41cae828f7feafb462143519500d0d98a8b6729eb5ffd9be4247d47fa0074fa00ac9892c8cbdda9d7656e9d6949ae65e69911ae911269e99e80e4fefb19a08
 DIST lightdm-gtk-greeter-2.0.5.tar.gz 571189 BLAKE2B 583e75b1d621ffef4ade7e65fb3ab4891a119f1d416c8011a80d06e1916ecb5903f4c1af432052cb05a72aa38cde38293dd90eed00295fec5ff758e78576e10e SHA512 1ae31a36e19a2e8825bb0bfe4eef51f317306636bc0f14df9ee4c89c81d60ce7193d74e053ce59ae50c6fe05d27be73fb5a83cce732a0df4a3b4390539418fad
 DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
-EBUILD lightdm-gtk-greeter-2.0.1-r1.ebuild 1759 BLAKE2B 73e02d31e97346a014eb288309af245764e490fe37c51e274392435bd36e1c4ac1c56c3ca6ff2c53cae1a2ee1a540c3e8ab9dc6e9c9fb048ddb1bd9b14cd6e28 SHA512 b5c7c28333f7d09b9984e4bc26692919662e5a2e4b66bfc5683c1d8c5ff2e4f7733e9b544e6091f0f903eff993394665df6babdbaa18caea758fd782453e0f33
-EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2085 BLAKE2B 5b74f1788e563c1b32615df7d1cb37f54cabe2d2e1420df73805e52ce32b31cf228334f7188bc6a0bcd586a47f8d50c1ae49577fa1dc34eb48ff29dc0202a1f0 SHA512 88497f45067513784612497866e0029927116f1fed2c9eb4de09f68e9244411742d45ea0b7b8bc757805d45c2a22b21fee054ad248ad7651b459a55c9afc2628
+EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2084 BLAKE2B ff426d325619f5c5cfa3743489f1fec4d1aafbe069aab8b1161e3fd725fd952b2964c4e359cfaa5f84634670c61121be2b136c8ed14d55ecf377cbdbdd0fdfc9 SHA512 d4b4f3abc92be4cd211603a976ace4aafb6442c837e3b2d6edb03849cf4da860c47abaffcd342843915cac26d147930b3a5e6ab72bedc218b89519ad14dac405
 EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2070 BLAKE2B b02fa7a18a45fe31a7e94ddef55b037dd0ebaa40513d38b132ce4312a150e797b43fcdc348cddc578628cdc96655916697287166a55568d920b4c9462623da04 SHA512 0a2d0a5dd3af18c833b0e948690d1382828f8178f19df5db36b5b2bad53c6ef35b89d2dc39e0847a31913ea854750037f52c206ecb20ac388aca46864f0ae03f
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch
deleted file mode 100644
index f72a93abfc1c..000000000000
--- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=619782
-Upstream commit: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/349
-
---- a/src/lightdm-gtk-greeter.c
-+++ b/src/lightdm-gtk-greeter.c
-@@ -677,6 +677,9 @@
- 
- /* Clock */
- 
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-+
- static gboolean
- clock_timeout_thread (void)
- {
-@@ -697,6 +700,8 @@
-     return TRUE;
- }
- 
-+#pragma GCC diagnostic pop
-+
- /* Message label */
- 
- static gboolean
-
diff --git a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch
deleted file mode 100644
index 81f158b2176f..000000000000
--- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=627208
-Upstream commit: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/350
-
---- a/src/lightdm-gtk-greeter.c
-+++ b/src/lightdm-gtk-greeter.c
-@@ -1937,11 +1937,11 @@
-     {
-         gtk_widget_show (GTK_WIDGET (username_entry));
-         gtk_widget_show (GTK_WIDGET (cancel_button));
--        lightdm_greeter_authenticate (greeter, NULL);
-+        lightdm_greeter_authenticate (greeter, NULL, NULL);
-     }
-     else if (g_strcmp0 (username, "*guest") == 0)
-     {
--        lightdm_greeter_authenticate_as_guest (greeter);
-+        lightdm_greeter_authenticate_as_guest (greeter, NULL);
-     }
-     else
-     {
-@@ -1961,7 +1961,7 @@
-             set_language (NULL);
-         }
- 
--        lightdm_greeter_authenticate (greeter, username);
-+        lightdm_greeter_authenticate (greeter, username, NULL);
-     }
- }
- 
-@@ -1983,7 +1983,7 @@
-     if (lightdm_greeter_get_in_authentication (greeter))
-     {
-         cancelling = TRUE;
--        lightdm_greeter_cancel_authentication (greeter);
-+        lightdm_greeter_cancel_authentication (greeter, NULL);
-         set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, NULL);
-     }
- 
-@@ -2017,7 +2017,7 @@
- 
-     language = get_language ();
-     if (language)
--        lightdm_greeter_set_language (greeter, language);
-+        lightdm_greeter_set_language (greeter, language, NULL);
-     g_free (language);
- 
-     session = get_session ();
-@@ -2238,7 +2238,7 @@
-         start_session ();
-     else if (lightdm_greeter_get_in_authentication (greeter))
-     {
--        lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry));
-+        lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry), NULL);
-         /* If we have questions pending, then we continue processing
-          * those, until we are done. (Otherwise, authentication will
-          * not complete.) */
-@@ -2331,7 +2331,7 @@
-             }
-         }
-         else
--            lightdm_greeter_authenticate_autologin (greeter);
-+            lightdm_greeter_authenticate_autologin (greeter, NULL);
-     }
- }
- 
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
deleted file mode 100644
index 0a245234b38b..000000000000
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit versionator eutils
-
-DESCRIPTION="LightDM GTK+ Greeter"
-HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
-SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? (
-https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3
-	branding? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
-IUSE="ayatana branding"
-
-COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
-	x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.2.2"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-themes-standard
-	>=x11-themes/adwaita-icon-theme-3.14.1"
-
-GENTOO_BG="gentoo-bg_65.jpg"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-	if has_version '>=x11-misc/lightdm-1.19.2'; then
-		epatch "${FILESDIR}"/${P}-lightdm-1.19.2.patch
-	fi
-
-	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
-	# I will fix this once I decide to update the tarball with a new gentoo
-	# background
-	# Bug #404467
-	if use branding; then
-		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
-			"${WORKDIR}"/${PN}.conf || die
-	fi
-}
-
-src_configure() {
-	econf --enable-kill-on-sigterm \
-		$(use_enable ayatana libindicator)
-}
-
-src_install() {
-	default
-
-	if use branding; then
-		insinto /etc/lightdm/
-		doins "${WORKDIR}"/${PN}.conf
-		insinto /usr/share/lightdm/backgrounds/
-		doins "${WORKDIR}"/${GENTOO_BG}
-		sed -i -e \
-			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
-			"${D}"/etc/lightdm/${PN}.conf || die
-		newdoc "${WORKDIR}"/README.txt README-background.txt
-	fi
-}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
index d0278ccc4699..199f3d937304 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="ayatana branding"
 
 COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 40729a78002f..a2d3fe7b6d73 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,16 +1,10 @@
 AUX README.gentoo 494 BLAKE2B 8a92171cbc9e8a93cc5e73101bf478b27945e85f843ef244daea881f0aa061820645c425e52dd6a75adc0bd09c95126a059694bc7d5f6084e4f0222fc5e8ab85 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c
 AUX Xsession 1819 BLAKE2B 3d0502ca0d353c4bf16aec063dacde3a57da0062595821aaebd783fb568368b540cf1dfb2f9f888b3131238abac70e970081e59fed74e19f2380729c7f3de2b4 SHA512 f1f9264ef6103e66ced2d94bdb24dafb71a37ed8286b35536fa992d774f288bb9b8e338e184c955b39f0448da91af5d7c2d12c5536521186d8ee5db832e20e7e
-AUX lightdm 257 BLAKE2B e5923b3bfa6bd72078163347b54d1ab51ad0f46d4cb1de05dcd3efbaa62405206c8610ec23dde727f0c820afbcfca09f1fca4afab38e37f6793117b505941d34 SHA512 b7d08013758d8755eb015e64dc67d58cfe13006c4ccfa7f22d795233b932888a36fb2ede938db619f718769cb4c836e960385c21a5a16df5e7235550148eb6f3
 AUX lightdm-autologin 155 BLAKE2B 0236489d922c07cc84e17b403e746af052b9fcec1671c4b41184a26399ff8b310083c17959327eb752f8ff9ada04a7ff012ed6708c7ff50324dd0a3cef42efd8 SHA512 d09be0a61b7eea18a5c5977182362226e82a39b238c401f636bdf0a83381b97a16efc19e67be10b76854c95186dd65f539431d2352ce87a4e35dd1d40e388064
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
-DIST lightdm-1.18.3.tar.xz 503968 BLAKE2B ec1fa0a62880708d223da972b3d9c2f2961e3e8f8baf6da9012de98818b27e0bc0e37cb6f460a25821779d83e9da1cd632484ad75ba95cb26cb9d23254600024 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234
-DIST lightdm-1.24.0.tar.xz 517552 BLAKE2B b4ab92b313bbb3a7bcc48a1d02b7bfb978bbc5041dbb81ceaa59c4296b2e4b069f90d9f09a4289376cb34e11331c39740f4e5370273d1315c75a9a35bd01cbb0 SHA512 30bad8887928f22bf2cc7ce8d7a323637dec669d47d69fb326cfcf1bb5ee9e52c1232cf680af94a25cf90a9de13d9b5ff73307c1dc8829422600d350401555b8
 DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
 DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
-EBUILD lightdm-1.18.3-r1.ebuild 3804 BLAKE2B 0a9e0ac82b6b671ebef81433faa82e0b98cb1e38438c86c9a411d41ab2847956ac34396c5201a1c9ed33932a9fd4c19f700aa12411314ec064e7557df485d1c2 SHA512 f84aba34fe5d2fcd7bdafe1b8c787876b5d99a4276b274d698a91af05f4d149e6ba3f794c4d9bdcabb41da528274ac0c2606cb13a88c6c101bc33481d63d1f84
-EBUILD lightdm-1.24.0-r1.ebuild 3769 BLAKE2B cf78459133c836c6702d362a3977f3149d88d7c31aa950799a6cb3cac2480c592f6a953cc3a437939ab0aedfe06ddb0db60493f3b38a2d3ec3bdffc51325a796 SHA512 68d690c0e7a48b0d5e3db8977f2f48f8041cf298beec1d6d65d3f591676bf960cc54d140a65b9a7874f52d00d8954574258ea5d37d103fb724468d1809b2c650
-EBUILD lightdm-1.26.0-r1.ebuild 3863 BLAKE2B 3b9b8f07798911884e83c357c0ad96c0f84057f9e77f3c1d183daf41b2f9c82a93260ecb1d6604b6bff42fa7f351cad07f637aeb356f5a2c4ba025c74fa62795 SHA512 3b1c19fec5028778e074170bf0811fc2ec089b0fbf7ab3911bad1813a99151ee7f7a8cddfcbd5c5651b69f9bd36fcc0d235ad48a1068526cc63de80f54eef26e
-EBUILD lightdm-1.26.0.ebuild 3780 BLAKE2B bf14b85e4a808d3f0743135c325b5c91289ff80097ac22d968942e520551c8a6176e02a4444032ab4cd917d6c2a264901ba517918baa2d78d24e48c72bbba390 SHA512 6fdeac35cfab56c7df81cbd393b1eca4b39114087593731dcd340c9bb30781404c2365d448002c30f863a9441d3709d0984adaa638740bf1b2facce440cb789e
+EBUILD lightdm-1.26.0-r1.ebuild 3862 BLAKE2B c5eb278cb20a1a0c5ccf12c1a6b2a318ef1b8fe6aa166336d479420acc4ff30ceb8cdb2c8ef0dc9f6e18f265ee61ef383e771cbb032357a4737f726f0726f39d SHA512 8244d0ecdc706273d3735da5846c27bbad57e5319b0fdbc6d941378c83d5ba2107886016bc914d886f4c7b8acfb0d9d0bc5c87e8367265089387b56548e7ae45
 EBUILD lightdm-1.28.0.ebuild 3899 BLAKE2B 8dae4273893bde7f0f6f0818e03f61e40bb5b7896d500e6ec804816e4aa190b2475bb1dfed979e336a010dc6d061505f82f1ba44698a417bd2ccd1ec9e88c340 SHA512 7258bede873fd974a3fe1e63678b518626b656922c0bed6a5a631b7ddf91c3fa996aa66f3139d97ff4bc868408d64305c0fdcef10662f016ef71c45257b9da6b
 MISC metadata.xml 392 BLAKE2B b3c495f83a30fe7dfee0e7f244c8d2d2df1a30fa8e50a071e0d63dbefa15189058d54ea3e881ab953c1cd9cd8dca74c37b0013da56f795422c0d0e9c2a0297bb SHA512 f44fb165a56a51fea1f3c1afddaab69971d9d56249b74eb7bf1263c120581d2e0b699f1f7fa94a9d3da57421b5d6070f03cb10643e3b3713c771f8c992457fa3
diff --git a/x11-misc/lightdm/files/lightdm b/x11-misc/lightdm/files/lightdm
deleted file mode 100644
index 6286d6ab4f66..000000000000
--- a/x11-misc/lightdm/files/lightdm
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth       optional		pam_env.so
-auth       include		system-login
-auth       required		pam_nologin.so
-account    include		system-login
-password   include		system-login
-session    optional             pam_loginuid.so
-session    include		system-auth
diff --git a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
deleted file mode 100644
index 2cd6c3cd5cd7..000000000000
--- a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
+++ /dev/null
@@ -1,132 +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 qmake-utils readme.gentoo-r1 systemd versionator xdg-utils
-
-TRUNK_VERSION="$(get_version_component_range 1-2)"
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
-IUSE="audit +introspection qt5 +gnome"
-
-COMMON_DEPEND="audit? ( sys-process/audit )
-	>=dev-libs/glib-2.32.3:2
-	dev-libs/libxml2
-	gnome? ( sys-apps/accountsservice )
-	virtual/pam
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		)"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	gnome? ( gnome-base/gnome-common )
-	sys-devel/gettext
-	virtual/pkgconfig"
-PDEPEND="x11-misc/lightdm-gtk-greeter"
-
-DOCS=( NEWS )
-RESTRICT="test"
-
-src_prepare() {
-	xdg_environment_reset
-
-	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
-	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
-	einfo "Fixing the session-wrapper variable in lightdm.conf"
-	sed -i -e \
-		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
-		data/lightdm.conf || die "Failed to fix lightdm.conf"
-
-	# use correct version of qmake. bug #566950
-	sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die
-
-	default
-
-	# Remove bogus Makefile statement. This needs to go upstream
-	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${_greeter}"
-	einfo "Default session: ${_session}"
-	einfo "Greeter user: ${_user}"
-
-	use qt5 && append-cxxflags -std=c++11
-
-	# also disable tests because libsystem.c does not build. Tests are
-	# restricted so it does not matter anyway.
-	econf \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-tests \
-		$(use_enable audit libaudit) \
-		$(use_enable introspection) \
-		--disable-liblightdm-qt \
-		$(use_enable qt5 liblightdm-qt5) \
-		--with-user-session=${_session} \
-		--with-greeter-session=${_greeter} \
-		--with-greeter-user=${_user} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# Delete apparmor profiles because they only work with Ubuntu's
-	# apparmor package. Bug #494426
-	if [[ -d ${D}/etc/apparmor.d ]]; then
-		rm -r "${D}/etc/apparmor.d" || die \
-			"Failed to remove apparmor profiles"
-	fi
-
-	insinto /etc/${PN}
-	doins data/{${PN},keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-	# /var/lib/lightdm-data could be useful. Bug #522228
-	dodir /var/lib/lightdm-data
-
-	prune_libtool_files --all
-	rm -rf "${ED}"/etc/init
-
-	# Remove existing pam file. We will build a new one. Bug #524792
-	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
-	pamd_mimic system-local-login ${PN} auth account password session #372229
-	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
-	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-
-	readme.gentoo_create_doc
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	systemd_reenable "${PN}.service"
-}
diff --git a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
deleted file mode 100644
index 21d21a811118..000000000000
--- a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,133 +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 qmake-utils readme.gentoo-r1 systemd versionator xdg-utils
-
-TRUNK_VERSION="$(get_version_component_range 1-2)"
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="audit +gtk +introspection qt5 +gnome"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.3:2
-	dev-libs/libxml2
-	virtual/pam
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5
-	audit? ( sys-process/audit )
-	gnome? ( sys-apps/accountsservice )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-	)"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	gnome? ( gnome-base/gnome-common )"
-PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
-
-DOCS=( NEWS )
-RESTRICT="test"
-
-src_prepare() {
-	xdg_environment_reset
-
-	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
-	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
-	einfo "Fixing the session-wrapper variable in lightdm.conf"
-	sed -i -e \
-		"/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
-		data/lightdm.conf || die "Failed to fix lightdm.conf"
-
-	# use correct version of qmake. bug #566950
-	sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die
-
-	default
-
-	# Remove bogus Makefile statement. This needs to go upstream
-	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${_greeter}"
-	einfo "Default session: ${_session}"
-	einfo "Greeter user: ${_user}"
-
-	use qt5 && append-cxxflags -std=c++11
-
-	# also disable tests because libsystem.c does not build. Tests are
-	# restricted so it does not matter anyway.
-	econf \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-tests \
-		$(use_enable audit libaudit) \
-		$(use_enable introspection) \
-		--disable-liblightdm-qt \
-		$(use_enable qt5 liblightdm-qt5) \
-		--with-user-session=${_session} \
-		--with-greeter-session=${_greeter} \
-		--with-greeter-user=${_user}
-}
-
-src_install() {
-	default
-
-	# Delete apparmor profiles because they only work with Ubuntu's
-	# apparmor package. Bug #494426
-	if [[ -d ${D}/etc/apparmor.d ]]; then
-		rm -r "${D}/etc/apparmor.d" || die \
-			"Failed to remove apparmor profiles"
-	fi
-
-	insinto /etc/${PN}
-	doins data/{${PN},keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-	# /var/lib/lightdm-data could be useful. Bug #522228
-	dodir /var/lib/lightdm-data
-
-	prune_libtool_files --all
-	rm -rf "${ED}"/etc/init
-
-	# Remove existing pam file. We will build a new one. Bug #524792
-	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
-	pamd_mimic system-local-login ${PN} auth account password session #372229
-	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
-	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-
-	readme.gentoo_create_doc
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	systemd_reenable "${PN}.service"
-}
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
index 8d4e3781fef1..427dd1c1e1ef 100644
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="audit +gnome +gtk +introspection qt5 vala"
 
 COMMON_DEPEND="
diff --git a/x11-misc/lightdm/lightdm-1.26.0.ebuild b/x11-misc/lightdm/lightdm-1.26.0.ebuild
deleted file mode 100644
index 4d2efe7088f5..000000000000
--- a/x11-misc/lightdm/lightdm-1.26.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="audit +gtk +introspection qt5 +gnome"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2
-	dev-libs/libxml2
-	virtual/pam
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5
-	audit? ( sys-process/audit )
-	gnome? ( sys-apps/accountsservice )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-	)"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	gnome? ( gnome-base/gnome-common )"
-PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
-
-DOCS=( NEWS )
-RESTRICT="test"
-
-src_prepare() {
-	xdg_environment_reset
-
-	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
-	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
-	einfo "Fixing the session-wrapper variable in lightdm.conf"
-	sed -i -e \
-		"/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
-		data/lightdm.conf || die "Failed to fix lightdm.conf"
-
-	# use correct version of qmake. bug #566950
-	sed \
-		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
-		-i configure.ac || die
-
-	default
-
-	# Remove bogus Makefile statement. This needs to go upstream
-	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${_greeter}"
-	einfo "Default session: ${_session}"
-	einfo "Greeter user: ${_user}"
-
-	use qt5 && append-cxxflags -std=c++11
-
-	# also disable tests because libsystem.c does not build. Tests are
-	# restricted so it does not matter anyway.
-	local myeconfargs=(
-		--localstatedir=/var
-		--disable-static
-		--disable-tests
-		$(use_enable audit libaudit)
-		$(use_enable introspection)
-		--disable-liblightdm-qt
-		$(use_enable qt5 liblightdm-qt5)
-		--with-user-session=${_session}
-		--with-greeter-session=${_greeter}
-		--with-greeter-user=${_user}
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Delete apparmor profiles because they only work with Ubuntu's
-	# apparmor package. Bug #494426
-	if [[ -d ${ED%/}/etc/apparmor.d ]]; then
-		rm -r "${ED%/}/etc/apparmor.d" || die \
-			"Failed to remove apparmor profiles"
-	fi
-
-	insinto /etc/${PN}
-	doins data/{${PN},keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-	# /var/lib/lightdm-data could be useful. Bug #522228
-	dodir /var/lib/lightdm-data
-
-	find "${ED}" \( -name '*.a' -o -name "*.la" \) -delete || die
-	rm -rf "${ED%/}"/etc/init
-
-	# Remove existing pam file. We will build a new one. Bug #524792
-	rm -rf "${ED%/}"/etc/pam.d/${PN}{,-greeter}
-	pamd_mimic system-local-login ${PN} auth account password session #372229
-	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
-	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-
-	readme.gentoo_create_doc
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	systemd_reenable "${PN}.service"
-}
diff --git a/x11-misc/notify-osd/Manifest b/x11-misc/notify-osd/Manifest
index 9fb87c91a293..49caf93096bb 100644
--- a/x11-misc/notify-osd/Manifest
+++ b/x11-misc/notify-osd/Manifest
@@ -1,3 +1,3 @@
 DIST notify-osd-0.9.34.tar.gz 635387 BLAKE2B 469369f9fde562c605c131608b56eb54ea2a5f3d16f530e5b383d04fd8de2fbd531b58ed43caceeaeef65840cb00917484c02f8af0d7a0fc464ab131c1193853 SHA512 60ca63c2041f129d5139537242c2260908cedef633df977a608e19dcb01b75b2280ec80abe2b6da5eff76621107ee9d294742abfae301bc24eaa3aa855c56ce1
-EBUILD notify-osd-0.9.34-r1.ebuild 1485 BLAKE2B 718cf2009f2f6d4831037a8d222eb3330ace30b4bd07311f204a6335a269d49199d6b668fd10d9caee1d3b3758a92e0c5f89547422644342da3d99ef8603f8fe SHA512 1c7d9067cfb61eb8627a47bd8a0be03c30e031e1f946a7757183cc6d51652dc22ca7502a548b4f21a363f0131bb2ecbe9e51ea0f4809ec347eba126fc3aa90ea
+EBUILD notify-osd-0.9.34-r1.ebuild 1503 BLAKE2B b59b0bd60fcb8c299121cbd5feaff737bc7c610082c5ad6fea5e883bb1160a18f265b11282d611bc244aab61644bb06691df4200944b9a649e3b53e63a09360c SHA512 cd212fdeef62bf4c45a24bc895d5512437a13649aa92930fc16746d71acd0961a30b02017c16e58d491d427c62d7fd33b20277b5216113ec9b0ecc9a30160795
 MISC metadata.xml 250 BLAKE2B 138c4f4c717e9e24abf19f3d4cb9a8a8b49761ac301ac26b527c86802bbc509a4afd2678adb71bc3a9ef3d0ea17438d57d03211627bcf6ace221f08f39151f56 SHA512 0bed48908552a27396c77549264bbb7516677909afdecd967cce446529ea944c8f9ddf167241a033ca790123be27f8e3a4c503954100f9ea076f40b8ef5b0209
diff --git a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
index d94dd9b86c08..6a1096cc8f5b 100644
--- a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
+++ b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,9 +29,10 @@ RDEPEND="${COMMON_DEPEND}
 	!minimal? ( x11-themes/notify-osd-icons )
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
+	dev-util/glib-utils
 	gnome-base/gnome-common
 	x11-base/xorg-proto
+	virtual/pkgconfig
 "
 
 RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index 6d4459ac051b..316043ce787d 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,5 +1,3 @@
 DIST obconf-qt-0.13.0.tar.xz 34348 BLAKE2B c44a79f4c70d07907ee4332ea75267b1b9c000371ee4d53b8db9eb9c624c6bd62a739413b8cf4038a514a1417ebbb8318c791bda2774d7420ac8a7b8b211d09f SHA512 537c10e286311d39f3e69c2940f4267d7dd2e55888e1e50d6aeb3cad8f694fec7792ca30e258a69cfe0c5361acecd4232605e47e71e27fa53b25f4bb65a0d703
-DIST obconf-qt-0.9.0_p20150729.tar.gz 96660 BLAKE2B dea66b2bd4084ecd5936612bb52cee1395866d7b4b3b3f211abfa60bd5b4318cc6e31b04867dd600caec5347cb38bad5be854be1e1051bd232b4f4328a8d3121 SHA512 cb4318608fb49926212130de368b059af34c9731d5edf19fca4b05f583ec0d37ce7568f95a5a3f1533642503fd3c7f03fee65ca96796cbc0bb16e92f9890efe3
-EBUILD obconf-qt-0.13.0.ebuild 986 BLAKE2B b29461611694ae86e7eabd7bf4095544d324537692631fd05ed9297970155fab530d8bbd9f54d3dba77e96c7b4f96093de9dfc62cf500df761b7683119a03be8 SHA512 e23f6e315bcc9d8ca4bc098af878fb69aa14cbf47b3ccf7b60e72ea7038afb6372d95d37bfeafc8073f419c85c95401c611b3c4b2a1fe05fd6bf38a5c060946b
-EBUILD obconf-qt-0.9.0_p20150729.ebuild 814 BLAKE2B dcb1c53f696945f8234d559631ed11efbd26e57212cf806838fab6257a91b419c5f66237beec924479f6d76c7bdf03abc83e3d5caadc6c158d52f35a6e0b96f5 SHA512 e48ddaec10f0329b230278138a6d03eda8291fbf5a22f7307b2e3cd8c2159e47cb55358441bea89e4f67a09eeb87bc50cc67bae279d9e553973de6570b4fd22c
+EBUILD obconf-qt-0.13.0.ebuild 981 BLAKE2B 7d1e7bb88f8439c558bf752d1a534839fb8ae1873365ffac8b688e4ac327e98d38f86a7492e3b064a80a4a34fa8af0004ef4a4e9e0857d24964821513b931572 SHA512 2d618927d07d3ebceaedf3ce5bd84a998301afd8dd41185cafd413d20e30a41c21b66b883d2a2f6b6bc677232be5ddebdf17252622cdb9ecb54eb73fea682c4b
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.13.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.13.0.ebuild
index ef705f4bba6f..2218c7e93b9c 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.13.0.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild b/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild
deleted file mode 100644
index bb19a85d36f9..000000000000
--- a/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Openbox window manager configuration tool"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-wm/openbox:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index e4003594eacd..6df158d55c1d 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,6 +1,3 @@
-DIST pcmanfm-qt-0.11.1.tar.xz 92916 BLAKE2B 8f71b5c1845ac4761fe8ba48734905e63011b98a4856b1d7759259b387d897483315dbadc6d68aa588f1ad223c4a3cefd83b00979a04723cc706d75cb26611c4 SHA512 860a0853b6c42e04ba6cdbe617d4c5f61e0033c9ae5483c5b8a457368fe23084af813feab5fa50accecc8d21055a5ef073731b94ea3eb4b3ca6eacb0dbe41450
 DIST pcmanfm-qt-0.13.0.tar.xz 104864 BLAKE2B 47e24ccb415bea27db9cb5f0ccd1ce6aebedc2f7140572939e533c3da9aca6aca29227a5be7954944ed82483b4420501adf22152628e3d44a206d4f9d5250412 SHA512 7b0d4ca5274e369e3af3c4b332a95ae78af54142aee39aae36832e85ca27d1f2f7509f00dc29d18a1e5a2558c8a82acd6569d2433acf13b2f95174c47779c089
-EBUILD pcmanfm-qt-0.11.1.ebuild 976 BLAKE2B 54a2e5395fc1ed8f0ee47b0110225dd996d773f4ea3b0ce6fae89b9a85b2d09cbef9273fb3ca8ea24a669a637cf327b87c4c7ccd7173da9f091061b238396288 SHA512 b9d6f0335b90d524eb8921a94891d715603f3a90f62874bac37fd052d1ba1ae1ea96054867d450503437e8f0e723625341598bcc1e6a30b45fda4315b710c121
-EBUILD pcmanfm-qt-0.13.0-r1.ebuild 1069 BLAKE2B bd8acc860ecdc1088b84a29250051e88780d48f5945de53c7047b61b49d95101e2258c67d90abd69c3789d060b308aafa3b413b8d2053cf9240cee60be549a77 SHA512 f438d3997af5af6a073556bfaa81938afe9046c94bb1e126380dd050e085af3565a38a0806661d4b32823a5040eabcb460a717500f6101d54e8f2d57ecb12c46
-EBUILD pcmanfm-qt-0.13.0.ebuild 963 BLAKE2B bdcbfd42fe5b2e2bb6aaece64906c152683ac31da4c410c3d02644ef0df625ad84ef60a8ce5c2bae2bab80ff34fb45add2cd38946ef01c016d97e807d7edbad8 SHA512 caf7eda87637c65038ec56d21e9048c16880b6734f6808b9b2317153c20dd836d2038bff22295075e14252b4d5a4e3d24b8c7fb882f6a5682f1ed6bced204883
+EBUILD pcmanfm-qt-0.13.0-r1.ebuild 1064 BLAKE2B 2281e8f6f34669d2069a36a1a73a9246d1bcd6aa45e9f5f03d2b4f8f661b94975ce446e8d71c8f1384f5ec76d1e6a0a1bc28cabda36275c6ffb98b5563adb12a SHA512 8b27f29933e62f1f0545509924d2deff9712f9975ffcfed25e3d8fe345530bb3746d0df1eb243677ba826d32c1728275052743a152b7ab58bc6715b95fae2964
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild
deleted file mode 100644
index 1abdd3e692e1..000000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.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
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
-else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-CDEPEND=">=dev-libs/glib-2.18:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=x11-libs/libfm-1.2.0:=
-	x11-libs/libfm-qt:=
-	x11-libs/libxcb:=
-"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils
-	virtual/eject
-	virtual/freedesktop-icon-theme"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=NO
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-r1.ebuild
index 3c0eff8e3ba3..45339fe1683f 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-r1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0.ebuild
deleted file mode 100644
index 7deeb4f0f2ec..000000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0.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
-
-inherit cmake-utils eapi7-ver
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
-HOMEPAGE="https://lxqt.org/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=x11-libs/libfm-1.2.0:=
-	=x11-libs/libfm-qt-$(ver_cut 1-2)*
-	x11-libs/libxcb:=
-	x11-misc/xdg-utils
-	virtual/eject
-	virtual/freedesktop-icon-theme
-	!lxqt-base/lxqt-common
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index 71195a934a97..c0c43c069998 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,3 @@
-DIST qps-1.10.17.tar.xz 163212 BLAKE2B a6832212f338cf9ac41d3b6916a2a22a8728f8dbb1a0f16c44a0bde6e275f7c83a31bfd1c6d5eea40d738857f28e3b2993be2fa8a81f082841bc86537bcc2457 SHA512 81d4ef9cdd732edc6dd060998f10124663d26ec8250fc1de62eb020624111eb3ba595058bd74d5cee1bde84326f26579ab40c4ed7ef58f0aa44baca96921cfb5
 DIST qps-1.10.18.tar.xz 164256 BLAKE2B 5eee79c2bab6eac23a91292132da4054836f86315a18399099aaad8853a06dbd79cb7c52af8c0e7098125d5cc06c04516235d6acb461e2caaf72584e7e05aa1b SHA512 f2647cb814e6cefba71aa70ee63c92dde88b312c9ada67e677de2bf22141afa3d7196d089606d270b610ddf3bd7466e6534de3614bea1a68d3a3b61a23b1c37d
-EBUILD qps-1.10.17.ebuild 638 BLAKE2B 7c3d7d6a1318b8eb0e838bd6270267256f3a1efbb25208631624a6301234d85c5bb5b25f6ceb79edf849fe8934d69f53b1b2bd21300d52ef159fc4ec001bd19d SHA512 89d67357e91e64f3624a1676ba9dad67850649010de4956e21f8730900a8015ddc8872a8ff1463b18751ce304989de195f18c63f43b7591124d921605c3d5fcf
-EBUILD qps-1.10.18.ebuild 747 BLAKE2B ce1b69d0926fef3fab0af67bf7a9a3b54090ef676c6243d83974bf06750d1d9e639163105b1f65157e30184a059ee4e3535819a674086d0dc151e3e03c0b9de1 SHA512 814beb1de0fd95b7a012ceece5e742fd3746ec183b6a6867bae16d4489ff018f5d55cb69ae5e5ecc689fa3721e21833cfb3e7b9ffc9050db2359181b62bc9892
+EBUILD qps-1.10.18.ebuild 742 BLAKE2B 6c0df4f82820d6c0fcdc54a28af624a301759c3b490585a61d74a16202a6ccc67af22f948d64cac14244a674304442e2f92a9fe9d7d39307152163c29ddbd04f SHA512 cc59e7c752c5f3ee9472e1d92713db7fba7df21b793af980b86d0d6196451f99e0cedf9cc3897534fe27c3382c0167eb258f74983261f18db6eb1914e2fadfb6
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-1.10.17.ebuild b/x11-misc/qps/qps-1.10.17.ebuild
deleted file mode 100644
index f0a63360792a..000000000000
--- a/x11-misc/qps/qps-1.10.17.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Visual process manager - Qt version of ps/top"
-HOMEPAGE="https://github.com/QtDesktop/qps"
-SRC_URI="https://github.com/QtDesktop/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/qps/qps-1.10.18.ebuild b/x11-misc/qps/qps-1.10.18.ebuild
index 017fbcf6cc56..90055187fdf8 100644
--- a/x11-misc/qps/qps-1.10.18.ebuild
+++ b/x11-misc/qps/qps-1.10.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 30361aaba857..f47ab5f74793 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,4 +1,6 @@
 AUX qt5ct-0.35-fix-qtdbus-automagic.patch 1194 BLAKE2B 7a076ca63cdbcae61a517f91c501eeb48a93dd484b6472d95fca2e4ffcbd7240b2169d316e9f5f10385c7fadcfd89195ed13ab673b2de8769d71520e7f594874 SHA512 e90688a59a3fe81cb8ffcce290d061728dcc662b3763e258745361e2eea2a6b32efd51e0e338378b83d2fe5ba73c7984e8d5f858e8ad772ffc19246b4465de60
 DIST qt5ct-0.35.tar.bz2 62547 BLAKE2B dd61f151e1c6c58095889b90cb30bb2baaf21fd8f181af37ee43c1d00404655d57c941cee905e737aff29122ae3f588d5c7ba46dc80ca76d749cc2dd66f35d57 SHA512 2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a
+DIST qt5ct-0.36.tar.bz2 68181 BLAKE2B b2bf21a1e3f4c6045af5f2e633c2a839bdb49165eb7f3a7d84021faa1c178e4ab84556460c2aa5e2b530fa32fdf29e0f7d3b37c9c839b7bbc7cfc8b77dffbb70 SHA512 dfd6f85328fe8f14c8f2349bc0cac698e549350e2c000a73ac26474ca38ec5f44fd4ebed9b6976fc3423dda8322fd80355eafa6ecbec17495d1e2278c3189a88
 EBUILD qt5ct-0.35.ebuild 1092 BLAKE2B e429fdfa2eb628ad2b6ca420258dc45873fb1b4d3d904905c06dd9489bb69a913b8c69c6e5136e0f422700c8c9f32717b36c4ba3dd8d6e4bdc29096d09f88578 SHA512 57ae70772ae917725776b4debcd2a90264655d2c4c5705fb7c07c12da2fba77917152f47832dcb537990803649e0152e16a09ad25750a2c954868ea2b612f600
+EBUILD qt5ct-0.36.ebuild 1001 BLAKE2B 51d2ad811d8610bc1884f5bb5ff5b4a1e83d8d4893cc34b51c3c3ad095de5893343983540f4cc89f7ceee76db6b84f587dbee8f056e35c2ec4e2882f85e3b858 SHA512 8e63386f4399da9ffa2a74182fd29a89747664a8798f35258fa46228c220e30f5abed841baec6679433f46b866f1b49e4b14c8255ccb505b965c46988cf590f9
 MISC metadata.xml 685 BLAKE2B a1a01cf474fd069651dd4bdddd4b58e7b352f91bcf147dbaf6ab0c6992d4f5636abbd6514be1c125802c21c4f8fb7ef3220474f45c55f3aa570b1128ae6148c7 SHA512 0fb47a823c4ef40aecf8775ae89dacfc8b4c16fef6baceafd3a36ff2864bbe63f40b2bbab0ac4ab16dd3e15f6e618be050f515af2d474e2752035bf311fb0d0a
diff --git a/x11-misc/qt5ct/qt5ct-0.36.ebuild b/x11-misc/qt5ct/qt5ct-0.36.ebuild
new file mode 100644
index 000000000000..ddf6c018a695
--- /dev/null
+++ b/x11-misc/qt5ct/qt5ct-0.36.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
+HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+dbus"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5[dbus]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+src_configure() {
+	eqmake5 DISABLE_DBUS=$(usex !dbus 1 0)
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	newenvd - 98${PN} <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "qt5ct configuration won't be applied to the currently running sessions."
+		ewarn "Please relogin."
+	fi
+	if ! has_version 'dev-qt/qtsvg:5'; then
+		elog
+		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
+		elog
+	fi
+}
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index 644c42a0e9cc..eaf85d92318a 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -2,5 +2,5 @@ AUX revelation-0.4.14-random.patch 2127 BLAKE2B 9fa01845124172e9544679c144cc49f2
 AUX revelation-0.4.14-xor.patch 1874 BLAKE2B 44b4e6b6f1323201818c55ecedb464304dc5265a7d356224dff41021554f8611f05fabc2fc353bf7a43b7bc4e2afe32f16c7b57ef30539abeb307de50f7b270d SHA512 c4b76a92f0b6e4e1856948e1c1d4bb118bc8f2383e9ec778515fd87949814b60dd51b8dc814a070665c0138111b3ffd9d8fdad03c43bdbb0320ad19ddea23ddc
 DIST revelation-0.4.14.tar.xz 316096 BLAKE2B 163fe15fe9ae1f35613390cec6d67b7b0193aea1d613d8ed0b237c190680b700fe509e076911cf28233194c3e82917ae0772d9fbe842eada0ac8bffae256dd4d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145
 EBUILD revelation-0.4.14-r1.ebuild 958 BLAKE2B 405c6fd1723cf31a4b00763b8f102e88716e8130a2f5b146184bfd64fa5cbb700aa230ff1176f002b7ed16179cd7037da504c57ba0e7826e1abe65a4435c0b87 SHA512 31dc4c383c5992570206f779f9bec62c6ea2511d2997c19eb5e758ef2f422e00bdd4f8c8172583e983b573c97bd944cf2e4ef8f5e376ea64ed342f049d13841d
-EBUILD revelation-0.4.14-r2.ebuild 1051 BLAKE2B 626492e800adb5e7341afd7d647c9667fee7e8bc31764a0d9fc333bdc2ffc3ad1e40cb31d20e3b4353747a2c0a7e2f9670cd0081527aa35390a265eea6f9cbc1 SHA512 0548637f2932d677a9ec7c04fde0a53a470ed0612e74015df0e6a7254c8ee03436ea8f22df173d28ba7ef39c4185a2c6d60e3bd7f061d3caf2b197a20bc66aac
+EBUILD revelation-0.4.14-r2.ebuild 1053 BLAKE2B 480c69cf01fde86f00102b0a0a5ceece8debd8574b519d3861757186692b8580b04840be01350a4e87a5c122f1b576e09fb3eb696af0568b9d798a77ba799046 SHA512 a41a193fa0f0e6ec10b97c9d6f03f5816efd3844d82fc8693fc7f3a10f54d9d5ab7e1e5430a32f9a9bb821abc423286710769ce04a7f7f58e4fcd31bc54b2427
 MISC metadata.xml 221 BLAKE2B 62f515310d9bccb1e3747264848ac800fc9489f83567f3e23f1b3a2f6636f6a499652435e153728de911f47a8534279f3ade767815414523f15077584397a632 SHA512 9ca3dafa7e44ec0f210681f8f524549f103695d57d0f8463a9044ac9456e6bf99ad6c7448e62a672471b7e82535b76214b924e3b336f186bced032750e68754b
diff --git a/x11-misc/revelation/revelation-0.4.14-r2.ebuild b/x11-misc/revelation/revelation-0.4.14-r2.ebuild
index b3589929fc21..3c4415d8beb2 100644
--- a/x11-misc/revelation/revelation-0.4.14-r2.ebuild
+++ b/x11-misc/revelation/revelation-0.4.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 56cd1a8deaa9..f8af235f6cc3 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -3,5 +3,5 @@ DIST screengrab-1.98.tar.gz 146776 BLAKE2B b795a881c4d12f8d0328b6eebb9632983ef9b
 DIST screengrab-1.99.tar.xz 118756 BLAKE2B 0c18d07ee9fbce0686604e90a988e903bf9a13346e0667091d0e7e5bd42ce03975db1d43dda3d809d92fd2469101efc733fd58bccf9f2ce3af80c210c35179a1 SHA512 06666cad70a9309f987b6fff8f85028b877f0c621cdcc5cb91f8b82a954637a45af30a144cfe50dc6dc04fb24c17ff2768368f3bf318f244b8a8d5b922bfa42c
 EBUILD screengrab-1.97.ebuild 718 BLAKE2B 9ea014854d796cc578a7ac45b172d01d3f0f2aba416ace4128f75b66e6c4a2c1fe3c00fa88242d3e4e27e0ab9a63e4f558a8e1399a38caabc8c0ddbebd2344aa SHA512 fe7adc46cd3f8b27ef1401b0f88018b484755a73332037191b2cf4c23752593eb76b52a4c25c08d6174e16718a931b3e30ddc7271091dc2a5496d372397eb137
 EBUILD screengrab-1.98.ebuild 720 BLAKE2B d04845edffa7d7380476f0026cccbe2dbad20f9271300f0c30513f412f52b8b899da9333fab7f6c6feb5fb0ea3e35ad236adcf16916ba45bae04a9be27a299e7 SHA512 afb366bed856d58deabe293a591b29e774c4a65ebf52fe69d6a77e7891bce528a3faae78fdedee6183a0020fdee6a18adbc3b0679185281a732f0c85c8f1449e
-EBUILD screengrab-1.99.ebuild 781 BLAKE2B 4fad1ccbb909715cfbd4da6a5d1de9778f699d02df95b236d7bdbcf97e90130ac06c90a75ed7d5f081bb18d82f5c0542a6b4670e54482a642b17f27cc4d183d2 SHA512 6e257c3fd132aabe08d04250e99ed5237ece6e859eea3f743c980e3fed57de3a2716b195feb6dcc8a30a06764c58d75081c231392bc27b56110410e317105d0f
+EBUILD screengrab-1.99.ebuild 776 BLAKE2B 51c00451c1bb6d6a67d2c67560e9fc19646340cd61621febdc5f02a1f8596fc9632dfdbba6d727f0a1111fae33bd1eb84517a5701d9d0c63372ec9da875501ec SHA512 f80ff00faa1161087455689bf8817ae79736b423c057f3f6e9ee6700f164fe2428c7bc2b78e70ac7abf75557e8fad597fe8275b06fd1b719c27f67b3af654255
 MISC metadata.xml 439 BLAKE2B 87d0955baa4cf7c8587121cb9cbe863bffd94cf8886019b9c97153fdd034aa10425d71e5fbc172be6605534a45cf838b2c04aace8a63e1cf4c6adc91251e2e63 SHA512 991791fce13ef70f4eb0c0916150d0d46ac49dbf5b56b4644cc6b399f6fbbf7f7391ad9359f22f3ffee03759fb3fea1e88905a2f444ede1b37e9a4136f3f6e58
diff --git a/x11-misc/screengrab/screengrab-1.99.ebuild b/x11-misc/screengrab/screengrab-1.99.ebuild
index dafad04b9e77..6925d882f65c 100644
--- a/x11-misc/screengrab/screengrab-1.99.ebuild
+++ b/x11-misc/screengrab/screengrab-1.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 4f4c5c5e86d1..8996e372571e 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,5 +1,5 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
 DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
-EBUILD shared-mime-info-1.10.ebuild 1499 BLAKE2B 35b714f53be2155c2b52fff34a1433ed03538dfd000a90aa9be84ee11a5449eaaedf5e98178d9e53d071e9a97375d5f28c34bd3d3658baf19e30f6f7b987a351 SHA512 6a01d4bbdaec281003bb7f580d75a7964921c0d3c8250f3adff57dbb8055954c24b2dabb211731a76142363c4c54468060be3519fcc6c2e63bca71205e91e9db
+EBUILD shared-mime-info-1.10.ebuild 1494 BLAKE2B f958e53f7f581f9b081a16f962e82a4f56c31056b9203bd1969be5f97e393505018c37efd3502f95b64a95ec03d434e107e934ba8ca8af6fa0793c79ce568e01 SHA512 9ac4861ae32f3bc9120b1a84d318f0ebdf5b026a4bb899a538833ac365a46958637f7698cd4d7db561a7a26cbb003e0c09208ae535a34f69258b12092a9c2880
 EBUILD shared-mime-info-1.9.ebuild 1457 BLAKE2B 582d75bcee9c267dc39f7120cd734085a963621e82fa4ba91288420f3390767c03672aca23f1b367aba252f8ae24396be44084f8a90cbb3da213f081de2aad3a SHA512 112646b17c088c2e0f34f8bce8255738ebc5881f404437d2eacb3dc101bf3362b2409a2923dd33ee9198da804d0a4f9b24c052b87499081621131e751f6c8070
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
index 95efb722f106..6d7292882049 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/wmctrl/Manifest b/x11-misc/wmctrl/Manifest
index 95f6a8622ddc..7f43ba829a52 100644
--- a/x11-misc/wmctrl/Manifest
+++ b/x11-misc/wmctrl/Manifest
@@ -1,4 +1,4 @@
 AUX amd64-Xlib.patch 1126 BLAKE2B f867b520c9175f0ecef50734ba3a7af78e474ff30b5c40bc88e3df5cd7dd85889a07e0d2f197f23807ae7234c6e407d3562801799c76001e9afa4964026a04f3 SHA512 8db78cf8c267bf2af30e3e91bcd334ea3c6fc8bb5e76afe4a6d9923341631402bf09c7ad55975c8c74f7b54ae288fae7dfdfe737227a72663785b02ec3416f63
 DIST wmctrl-1.07.tar.gz 87820 BLAKE2B e1059bef92fd4cf6cca3f539c68bfe3745c95abbefecabe3b1592a7dc3c69d769551f0ea4acc1d1e0c57024ce64e3fa0f0248fcf0f5776617d1ab88d667b662a SHA512 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa
-EBUILD wmctrl-1.07-r2.ebuild 687 BLAKE2B 5f9a0dc862b5c56bffe936c599d7a52d7850dc98c6a102bde7f252e540850fe37f35d194b9bda46d1e9ae8caae3ffb9273e83e86daeb0bddb312240c416f734b SHA512 a773435ed52d33530948ca91853b26e8790b91ecbadfa75dc5233620b1d999632cf44559d99c22c8c18908fef1b2a531cbfa4599f5d55780cee0c7adaa126b0e
+EBUILD wmctrl-1.07-r2.ebuild 586 BLAKE2B f26447f8373740cfc4e5b3cfebda3d6f487853336b4f4b97278dbd78574f03e3764cd7c3ee6bdff87055d389643377eaffdcc47df7efa1009786d4fcfdf86d10 SHA512 2b47fa26f961cd299c7cb385771b63ee1b7cc362d767fa5f847268691a67a93a6179873f18d67b8f38bd478bd8745cbdfe96b57bf3a704f4e6eb17e39caf1de9
 MISC metadata.xml 725 BLAKE2B 51248fb91da3dd937aaf5635c0593fd6ad53382f697fafeb12e489ffac96ea397dba3fb72a6ee0d7eefcedcd7af764dd7ab39d5a3bcb6870d928864ed0d71281 SHA512 40ab1356eedf0c9df493bd7647e789b60d38c49cc7d859605ece25743867e9b75e4083f2dbd71ff61422564e6d4172ca9ba02061e35cbef2ea885248abc8fbd6
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
index a4def6b97b6a..b2ed49feea27 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-HOMEPAGE="http://tomas.styblo.name/wmctrl/"
-SRC_URI="http://tomas.styblo.name/${PN}/dist/${P}.tar.gz"
+HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl"
+SRC_URI="http://sweb.cz/tripie/utils/${PN}/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,18 +16,12 @@ RDEPEND="
 	>=dev-libs/glib-2:2
 	x11-libs/libX11
 	x11-libs/libXt
-	x11-libs/libXmu"
-
+	x11-libs/libXmu
+"
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+"
 
 PATCHES=( "${FILESDIR}/amd64-Xlib.patch" )
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_install () {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 3d9168478508..ca7966655f2e 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -3,5 +3,5 @@ AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bf
 DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
 EBUILD xdg-utils-1.1.1-r1.ebuild 2181 BLAKE2B 18d2104aec42d81ff47e5ec2fe6659304217af3b36e76c8ab8212282c2cf3e75f087cc3787eeb76d4050742b59d35d12e62c99a4aecad3c17ba9f9369dc04ff3 SHA512 c6681cc7404329d3206a20188380c923ab24fdee29f917e42c55bdb3aa31a06b6711103d599f817f4c05121844c262489b2de374421796e4ba06c509d6d8c619
-EBUILD xdg-utils-1.1.3-r1.ebuild 2138 BLAKE2B 28b572021c43fb8d04a2c27e88599cd2297af917dd72db1df51547c37a8519e56589bf989e8b6616510f8f2ff328ea21a8fe0625c3d2299ceb7063960d0a0f14 SHA512 751d728cc95288d3e9a4ed99f9a4ca4d9e524ccb0929574ca7702dda0c92654daf04c01598b812368597744a438db6a109022acbd9a30e1557de89344a6ada29
+EBUILD xdg-utils-1.1.3-r1.ebuild 2136 BLAKE2B 3e73355bf3c1dd246f6fbf7447e4da0b1f8e20b32a854bd13886967c35054cf6b5d79879a6e631319f8dedff0f1319667512034ac44453cb09397c5e8d243b7b SHA512 10945ca0a93a3e8e76b05e926b1b82a95f8fff298129d4861a776c742f5b789ad80ac0aa1b162cbdafa1c9a7a68014e8d1dcc61609fd52f4d97a7fa6c01ae9d3
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index dd9b39c7adb5..88c11df35fcc 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index ddb34d10e73a..73c14eee274c 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,9 +1,11 @@
 AUX xkeyboard-config-2.23.1_fix_typo_in_polish.patch 609 BLAKE2B cf0dd9cabb3195fc7edf09996ec2de854c37893fbe0dca935ec0cedc8f80778c8c45088f7e6952073b34c854635212a79d068dd3c7c6c15a101ddf86aa856193 SHA512 7cd6193496ee9da7867d5121d995e360a3e2c31210794496b62338fae1eb0cf434712db11dfc2f25fd6eebffb92243589bddba98286c189757923bff39cd16bd
 DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
 DIST xkeyboard-config-2.24.tar.bz2 1057889 BLAKE2B be9c6e0e0885c8a40406b3cf761f854268026084f2025a1a9f3e0326570543dd7fa11a2355947da1018d35af2ab4818092abbef5b7bdc3da923fcfe65059977d SHA512 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0
+DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
 EBUILD xkeyboard-config-2.23.1-r1.ebuild 1131 BLAKE2B c959f3a2c32887490d4e5723b0b219c887f347d2c839a9038226065ba7d8d11d44c08857c352fd1f84973140adbff5f7c6d7e137f7fad5ed3c6a236a3b2d1193 SHA512 f212dc2bf40ca4297f4e0ec5f4faec599e4d836109282a511826186a9ebae190eae2e12a0f409e225756914c70715f09c2b896b86b1ad8567b0dfafc5ff5aab2
 EBUILD xkeyboard-config-2.23.1-r2.ebuild 1250 BLAKE2B 5a694d2394b39a7f998753cd77c8995aca9659845b56a4fd299d4c56d63f3f1abc0192a2888f7f3e36bd51e4cbce3e4b2fda502612d50271d64a2b928c267fbf SHA512 fe6e2b00bd09d9d4adcfc3683309e98350580f27ba965ca8ca8017ba666dc094a3746e6f4d38d0d96065b27af83d06cd1a4e180d7e2135c5e345b6af4bd08135
 EBUILD xkeyboard-config-2.24-r1.ebuild 1192 BLAKE2B fd3a5acdc4153a3c459cca540299a5ef52bf987df748bcc27fe0303d53ad9e450bf0f5ce81f4f95ec4ad1bed4ff81ee095ff1086cfae3920e0b74f362cf18a14 SHA512 2a06221496386dc2c3777a5209e54d931cc7bc91916e72804a63b5fa7fda1a6b4126bc4a2f96ab1a27d08eb16621c4d23ad6235dd1873badcc4332c18f63a135
 EBUILD xkeyboard-config-2.24.ebuild 1084 BLAKE2B 790e68a4f4b1ecb3c534d1ca086ee44746fd295bedcec05fa2edcad92a7c0ec60dc686bf7a9d39204b37c9e1b7498ebea69081b0c62cf1098f769f6a54cfd746 SHA512 1c2888737aea4b19df1dbc6d9d8859e54716986982ed961a160da1face286f6c4c702781987b4f6ec68a6b9f1a80d6e0d17eef714961b29a08ad3acf2a582222
-EBUILD xkeyboard-config-9999.ebuild 1192 BLAKE2B fd3a5acdc4153a3c459cca540299a5ef52bf987df748bcc27fe0303d53ad9e450bf0f5ce81f4f95ec4ad1bed4ff81ee095ff1086cfae3920e0b74f362cf18a14 SHA512 2a06221496386dc2c3777a5209e54d931cc7bc91916e72804a63b5fa7fda1a6b4126bc4a2f96ab1a27d08eb16621c4d23ad6235dd1873badcc4332c18f63a135
+EBUILD xkeyboard-config-2.25.ebuild 1189 BLAKE2B 28da1b87ddede17e959e2e41334f008628c574a67c17338c3178eda168c02ff142ab8806e06de6503451065772d2eb96f44a69e73c9581446c322f4dfb8f1a0e SHA512 5f76c09ba657c602fab4337afceb1087629ef4caac8988dcc2cd877db264ed4ac63804d5502adbdcb20f87bb5130dc6fd259a192b2e8674017d90a34a6292200
+EBUILD xkeyboard-config-9999.ebuild 1189 BLAKE2B 28da1b87ddede17e959e2e41334f008628c574a67c17338c3178eda168c02ff142ab8806e06de6503451065772d2eb96f44a69e73c9581446c322f4dfb8f1a0e SHA512 5f76c09ba657c602fab4337afceb1087629ef4caac8988dcc2cd877db264ed4ac63804d5502adbdcb20f87bb5130dc6fd259a192b2e8674017d90a34a6292200
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
new file mode 100644
index 000000000000..9c806160acaa
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3
+"
+DEPEND="
+	${LIVE_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index e517c9fc8366..9c806160acaa 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index b94ce7dc5e2a..9b08185bde6d 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -11,5 +11,5 @@ DIST xscreensaver-5.39.tar.gz 12157285 BLAKE2B b33bf64541d07b2f65788160af0bac308
 DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f7e1648e3be841f99d63cfc6e43f2c813f01cc5e87ec3b502c286e7d1d5562b3f00fe831e1e2f55dd47c4dd98cf84866 SHA512 e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d
 EBUILD xscreensaver-5.38.ebuild 3397 BLAKE2B 9848d30fdb05f6ddc95d11272832f4b79e7b775e4aa08119a7892e373db9e5698fd3034749a64faa3a99b1bc964481270926df750ce151a824508bc58d410853 SHA512 950d1b8b3646c14bee671f75aaf5ed25cb6b2443922f131eb1c6d024efb4e5a2c856b4fd9d59a1d5727f738a6ccf340b99e304f2af4a5986a859100d5e835077
 EBUILD xscreensaver-5.39.ebuild 3406 BLAKE2B c584e9332e24aa43d35b80aa9b55114e13f0f3ceb29504034f27e0143594949c419d08188c16d814553c71acb915ac622cb37e0484db8a03b605ea8c0048d45b SHA512 0a721d26c16ff1c6d1f78975894b2ac89930dbf215f9265f834136a0400717dd08906cf4a7b41a33865445d61dae1780c5d35e0818c3373610fa0eabf2b07f64
-EBUILD xscreensaver-5.40.ebuild 3357 BLAKE2B b1e8e9aa0d5edc8c6c831e2c75830ac785773c24f0b4d2514f0a1f3c2b384ef2a58bfafcdd0f6295e7a7070447f6f4ce3753352cb355708d4a8b3319f399ca3d SHA512 73def590ba9fbbbcda87871665197673d52fce08067d3fc375518553a6529b9b1c4082bf9e45c53c70682bca60950c0ade456810ed24fdd4995601ca3aa752b7
+EBUILD xscreensaver-5.40.ebuild 3351 BLAKE2B 8c649d16315f36741e47c58dfc42de728c3010dfefcc33a9572252f87a90359d66af3feb938215078ca88a6ffe9b0af7cf13d4bdeb099635af8b75aec1a41ac7 SHA512 7b61319958afb344ac5569d78e0db09f8287e9bf1ecbeccb2bdefa261fcd972fb31deadff0c8faec440fd000151dabb55a3ea6178bd2f7edd6c03b477c8079b7
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.40.ebuild b/x11-misc/xscreensaver/xscreensaver-5.40.ebuild
index 8a99a27c81fb..ba1e3200fe98 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.40.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 83cd3533ef83..e6a7741e6e23 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,4 +1,4 @@
 DIST xwallpaper-0.3.0.tar.gz 104300 BLAKE2B 23ec3b4ccbaf910c9ba4afbd1d9237223654a85c90b0a147141b017a9b3917316f745e1dd70a89e385110d380d5bbba8ee7c2d1ed4188d87a98ba0e94c5a7b6c SHA512 c73583fdbd573329951178d7db36fb1ae18a4294207de85dfb93e367be0ed103e8de7e2dd8ec61a0a23541457c930e8b0e5eb12dd5024808de3e02ddefb6b4a3
-EBUILD xwallpaper-0.3.0.ebuild 985 BLAKE2B ca30cbc340bc8fe03c97580d31e93a48fb81c67e9fceeffa491e0c193e297a7fa6981abac9cbc8e24913c2246c850c78e478021de5eea3f6f50ef4412ddfcb1c SHA512 514fa89bfafab2b0e2086d74eccf45f6e64b1d447167f5ba83c185ae0764cd5c03336f08a3755a80b947eb80ed9abf6666648288ccdf1c6731aabe0fca73fde2
+EBUILD xwallpaper-0.3.0.ebuild 984 BLAKE2B 57285f28d6321e391eb65d1263dc41e65d6a393451aa25ae1601b7ae0ac89d56e3c756e5967eee7ade1b1cc1e7b219b9b99046a6a2e544663ca65bd3d9c475aa SHA512 64b915f529ce987bceac1d59b86dbfec49dd4b7e67725beb7b11c5607de5213ea6743af0d1f24225a35405557eb0e808b3c2f07ea188a6a7508a073a63490299
 EBUILD xwallpaper-9999.ebuild 989 BLAKE2B 99fb573839f4990f7a3ab6b0ece3e87f8389b66e4dac4a303fb5372d143c008b808fc06a0ca43636d612d6c976717cea5d7f8cd711136476a837bf7f3a26fbec SHA512 b338de596750da56107cf760420451b129ead2bd233b593012e921fd86bd5b19554b74e1304442a038c79a1542ad64a2e9016d9212f30a5d783020b95204da19
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
index bcd7c89858c7..914adac64a90 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index eedea28623b1..c90dd4c8fca8 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/bfm/Manifest b/x11-plugins/bfm/Manifest
index 84cccf358a65..4be9829f2ee6 100644
--- a/x11-plugins/bfm/Manifest
+++ b/x11-plugins/bfm/Manifest
@@ -1,5 +1,5 @@
 AUX bfm-0.6.4-makefile.patch 1767 BLAKE2B 684136ca5d6efea77304fe735d8ae740c9d72c4aafed1f9ac9194320c800142902c2641c119a1c99aad753ed2032f63ff479888a3004ff37691b92e3fbb43428 SHA512 f5d1353e2ba61377ab03db53640df497eaa1287500d7eecb3b9b1e25f65a7ff9c73d04e48fd2395e5a0636b8db3750396d05f547be661834ee7d65f5fe7bf2b4
 DIST bfm-0.6.4.tar.gz 59288 BLAKE2B b70d98a944e2e6daaf694dc90a0f8cebc01afd8e11c46fde614e2b2affbe0e331cc15a308837fe987238182a3b4b631bb0d8f8d7f50b84c8705e113425cec7ec SHA512 1a039ef7448c610d2629b50bcac082e7d70eb755aa43e79e6b0868448f92aea5078548273c5f278fac878433cdcd9492589fb1612108807a4fd2afb0e07612a4
 EBUILD bfm-0.6.4-r2.ebuild 985 BLAKE2B 757d3a92839c1c33be79889b5e752a1dc24c93c24bf0125f3bdd9b362a806c35fba340ed33899e3610db05637c4f2a389231564ae13027870345c2f4b8c51338 SHA512 c7bdb388203ce8e8129049f50fa7a466a9d29eacf07535474c4a71829708148684b116b4a19a3a6d4fbb94445dc4f3d86a1df7652c525aa1164f1a97e4a6c909
-EBUILD bfm-0.6.4-r3.ebuild 956 BLAKE2B 882db11b6351693029d3cbb9793e879a30c75e5a49a9246b920c93ddad05804084b3240c39c87e7d7b4a8799df4b2df6de3f7b24e6027afc3f3f41f8bf7bbb7a SHA512 473b9948a9d53ad03d67d87fae2e340c5ce146e5006f5531a1aaae10d6eff7592f79a5467b198a916c17cf0fd083aef88e77364999ac89d4dedbd87020fd2fa9
+EBUILD bfm-0.6.4-r3.ebuild 952 BLAKE2B 8d43da45c852023f0c52930511ec580281b83ea56861cbd99836c72cbf35958c746311d63f33dd9677110d7ca2416143f06958a466b5584580abb15270eae037 SHA512 59182c3a12c0f4a552877d9982d727f548d81bf506d9adbf1dfbcae760932a8eab02bfdd0b5ae73eb91f7c2db749dfa6b01f6db5762c69e9ce29e1f74bc52b88
 MISC metadata.xml 348 BLAKE2B 97496aab8db3d8075f89e58745d4f988cc33fe4570ade80f97a5bfcda4ddad4be5f2de4fb695eb0b1a6f66af36986ec609bee10ee34fbef7a244489d6ed2e5c3 SHA512 fe0a9044c9c8d839007a04e0ed0012da1d22df3435f237620d49b0d1efa4bce533b116f15e6fa34d1c494d65729d0667ac29a2e06a4b2009ba24510b97f4f93f
diff --git a/x11-plugins/bfm/bfm-0.6.4-r3.ebuild b/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
index be7bd7601bbd..0418d5e6eb4e 100644
--- a/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
+++ b/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/JNRowe-retired/${PN}/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gkrellm"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/bubblemon/Manifest b/x11-plugins/bubblemon/Manifest
index 14ddbbdaca3a..5a0f02821ae7 100644
--- a/x11-plugins/bubblemon/Manifest
+++ b/x11-plugins/bubblemon/Manifest
@@ -3,5 +3,5 @@ AUX bubblemon-1.46-gtk.patch 3035 BLAKE2B 409edca6249903ab0e5bf241a9282cc3fedf68
 AUX bubblemon-1.46-no_display.patch 724 BLAKE2B 964793bc692ec4737e563c828c9a50fe9f71390b21d465dbfe63ecee342341b94da9de7d54f1f93cf831ef654c759afd2db7049474713c051cd36393ddf0ff83 SHA512 d00d43b8d7ba870fee5406b495d6577062e4bebd9864dfbf5a29a691dd85d65fab7956c4750e16aa06a4c85ec5f030c9ce22d2f12e77b816d0a80f7e61b06349
 DIST bubblemon-dockapp-1.46.tar.gz 40001 BLAKE2B 1b4bfb91d19d4e2cd653e7df258b248d0e101b431b5ce79900520d75ad39bd006ef583d148afecc1ba1b3f6ace44387f0f1ddf9ad803b47a9bf6481202353bca SHA512 c3d42f82ea7fb837839787a184a6198d7b092451e629562c90735a22166e75f55e8e1af1026e0314a4f06ff68bc48a22157e62bd19e54a4e38b4c12228396fa3
 EBUILD bubblemon-1.46-r2.ebuild 954 BLAKE2B 7e9dc43979c430ea55bbe1cc4cbbbd6c8062c11c973ea45e65b2f90052cb37cbf5110b915769b22595ac4fdcdeb290df026010b7c74fcb4ef5986070b9b985a7 SHA512 b2af344c0fe6957e2e176ad6dcd89887db1ddf4c33484c274280a990b49ea5c5edbf1efb51b37a263b6bbdfa8261c901438af8de2d3ebf5f42754e64c4bfb608
-EBUILD bubblemon-1.46-r3.ebuild 926 BLAKE2B a1e594fcccf96ed129feb1e33d764f164ac90cf5aec6d9775e4fb72e8bae905d238d9698c080d18c665f829a50fdb0a944312bd4694a9a98132e7b73abf96cd8 SHA512 b57dd5b8c57d337a9f4a1cda568b3ec90e2b4398d8aa481b6f609b333489d4d2312a805af906fef1c8aad1612737f68a31b493741bca8daea90d6be026d99356
+EBUILD bubblemon-1.46-r3.ebuild 921 BLAKE2B 76aa053d534228594827c8ad1f55a5125fbcc54c7283c4ea5be3434f5e6b8e3e5122ff68b513cc10ff8852ead7dbe596343557c0a713c5ef875f26eddee23c29 SHA512 2f195a04a043c7473858800aeb18e7cca886aa755ea1ba31b6fb0c44b4854cebd7775e942513a70ae5154c0ceed1273939c15b74b074c74e9d2c2e54dee1ce15
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
index 9096eb37876d..b67aad505cee 100644
--- a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
+++ b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
index df645de3742d..b3b8c2d78e69 100644
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -1,7 +1,6 @@
 AUX docker-1.5-makefile.patch 1437 BLAKE2B 2b21739cfed306b73d4e7041eaffbc5456118d70f828a36b6519f4d2cabd62ad8ffcc0842707b378b2046a1b367685fc1162f6e0865c45ff8b5ad46fd347324f SHA512 c48a8926b49d34fe7c794380d63c240e60d1df7c3d38c2e3ad8762593f36b478f6e90ce2acd4028491f2ad6b615cca3d81be503e60361ca607bef0f617645834
 AUX docker-1.5-makefile_rename.patch 1484 BLAKE2B e5543ba0aa9557f76164f271b01ce1252ccdcbcb633b605c5250b698bbcf7b3e07476d1c474b716db75bfcda3f98dc29e820dfe581a578faa54db5502575c821 SHA512 6299d1bdea793d68212b65525b9b0f0548bdc379b7cd020c2f3d384fe629df42e2be4c29c3a26d06aa7f03abab83e82a33e9aba7edbe34dd1896604a2695622d
 DIST docker-1.5.tar.gz 14863 BLAKE2B 258e0a8a4fbf5246480bb833bf8eca83a983d256b70b02f41123c3788a1381e93a793332b8e857a03bc8afd27aba2201825d290d1d3f3b42decac5fe9b1f06e6 SHA512 71b47156c31e5db5620612d3444eb298489fb33da296742c10543838e65677daa1b81bb054e6a7f57b9e2adef47406c32040983cb09988d93778a555e72cd861
-EBUILD docker-1.5-r1.ebuild 789 BLAKE2B 6b47f8794d0e65bcc924c9c587285cdb8a882108fc13ad731c42b731e99abd1e9a11b784e61f8fbfa1ee4e2baad234b620a4617e215c45664ca8a038de1ef0e9 SHA512 9a3c449bacb800e4c08c9a8a9f799e913d332aad5a4bb30f68223679590b8f8f8259f79b37957299c3e5e6a728de4cfca47f6eb52ca364c00de1560d84eae7e5
-EBUILD docker-1.5-r2.ebuild 703 BLAKE2B e917f3994bb201dec8c1a73a49f488880c53574ede23c8490cf45623b3dffaaf61e58712d81c895f18a0ff11fe650553b2c6194ade0eefa66f47a7bc8d01df29 SHA512 d99e69e96e3b040c7d389db6101c19839047beba8da292f628a9afb092b99c1927eb01693f5aea19049858f6d7adfb35e32fb7655904b4386cf63fefaf51aee5
-EBUILD docker-1.5.ebuild 771 BLAKE2B 42795ce2e264a5368340781f97a31e52a0be2c76ef448555fd3e41a9201ddb5d00615adc0001a952210a0f4562c740eb8d07d03a012c9b92f8ea4242876632e2 SHA512 d47992ff6c593309d4962e26df3f58eb8f482a4c33e055e374e19c02e774f9b6d145da650b53eed9cbecc15df8894e0a9f0b78840b7ae89b58fbc77535a2bc4f
+EBUILD docker-1.5-r1.ebuild 785 BLAKE2B ae97ad0ab29796e3c08451d339dd5fa8cf5033f97e7af4f54fa714cb8d331b7d21d589ac5491ba460808071cb0fa5a0056dd9e5d29ca114a9192ceb22cafeb9f SHA512 b00b0efb4868d2cf60d252ffaa2d8270dfee634287707068f9750b99edafb8dabc460f8504b682f4ab0111363b0eab47a5be457c1f2267e8777a56ddec9c8af9
+EBUILD docker-1.5-r2.ebuild 702 BLAKE2B cc3809bbc6af3dcdc3df2badddd9b44ffaacd7b545bbef4972a3988cb9ea71664aa00281f89f5183e427033a3a0c519f87def0f006524a9db6288ceeb95ecf6c SHA512 2ea6b692a16986a515b327de9fd8ef60bdc19d68bb05102237c8c95c7819eb44c0c8f36dce883f761b9fec2f158b9717b6d7084a7eec494375e01e4d3d555f79
 MISC metadata.xml 353 BLAKE2B daba7749ff12a604d50b655d91edc03ea4b2259e871f42275ac69b9ce2587ecb6f98f0bd33d664f5b1029bbef88e4575b3a35b102df0999dd8e6d456382a5b96 SHA512 4a9684de4ffe83fb609b3c36e721cf0033814ab4f5d664725d1af8caa9c77e095c03d61c33dd7a0f9458a37c184bd8606235f74cbbc6f5c25665681a6e5c0fb3
diff --git a/x11-plugins/docker/docker-1.5-r1.ebuild b/x11-plugins/docker/docker-1.5-r1.ebuild
index 124debd82e1c..94b0e79967ce 100644
--- a/x11-plugins/docker/docker-1.5-r1.ebuild
+++ b/x11-plugins/docker/docker-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0.4
diff --git a/x11-plugins/docker/docker-1.5-r2.ebuild b/x11-plugins/docker/docker-1.5-r2.ebuild
index 40f8b0626264..ba8e36d2e952 100644
--- a/x11-plugins/docker/docker-1.5-r2.ebuild
+++ b/x11-plugins/docker/docker-1.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0.4
diff --git a/x11-plugins/docker/docker-1.5.ebuild b/x11-plugins/docker/docker-1.5.ebuild
deleted file mode 100644
index 3059159f7eb4..000000000000
--- a/x11-plugins/docker/docker-1.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
-HOMEPAGE="https://icculus.org/openbox/2/docker/"
-SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	x11-libs/libX11
-	!app-emulation/docker"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/x11-plugins/wmCalClock/Manifest b/x11-plugins/wmCalClock/Manifest
index dc3e951d47ca..0ea623b009e1 100644
--- a/x11-plugins/wmCalClock/Manifest
+++ b/x11-plugins/wmCalClock/Manifest
@@ -1,5 +1,5 @@
 AUX wmCalClock-1.25-makefile.patch 1054 BLAKE2B 4928c86294dffbf353d88910db3f6757746934738cd5027f5a12719f85dbd933a2d07f4cee5b1d856a6201ef97aa5591a0683a5554cabe15fe12cedd64861df0 SHA512 fc062a5cd3a18d6ac1485d953052e8519c6ba375fb6cfb61511e6526ba24cb7fb391dd0971422c78743cd8cf4cdcc3abb68910939e7f7b8160191f1c6eaff14c
 DIST wmCalClock-1.25.tar.gz 71574 BLAKE2B b1e308d99ee1b66fa9bb7cfcf0c83ae5e637ff7f17a2d07bb43a57d941c654d53f37ee9941e0fafedd617d64cde8c2880cfcbf664c03e109e80fa523ea9a6e09 SHA512 499f91856e79fee4fb776b3fa8cbcc70cae2e28a1e9ea5d2c1dbf5a7684cff4be4e5e9362d672aa7cf459d0bfe14f68ec51a10376558a9635d77e5e6ce7f149f
 EBUILD wmCalClock-1.25-r2.ebuild 840 BLAKE2B 93955ebc51f859e6a6aafe9d3ebaf99235c848c423afd09d5d83f591e62b46fc50af716243fa95fa77bd97375fbd1bd49df586fd32a98ad48aee402c07f1ad1d SHA512 8bb5cd95aa5b9552e8e368668fbfadfd9bd79097112fee323adfd904120e9535a228ef35df9075fad0c4e4ce935174717c3fed05e8d4f564513d690d8853ac2a
-EBUILD wmCalClock-1.25-r3.ebuild 694 BLAKE2B a86fd22f882e29fbd2b865a40269ada20e10a3070aa50977dd9605b13dc9714d46f1678b9c18a3ed7b906f84d01f788fc068bdcd8bff18f9eafdc6d76d2ce08c SHA512 8df4840f622bab2a6e3164f1032d2f2f105d802ff1b02ee19f748e110901b48c70ce392066e6e2df49ad030528b8948506e4562b8fdc93de353c4dd27a23f31a
+EBUILD wmCalClock-1.25-r3.ebuild 693 BLAKE2B d38e69dfc786df9d2d1ba6c7229d08748638c403eef25f731b0267caddb63e6fab798bdbc9bb4c586611995830f4a251828d0bd543cb1b6bde2ff0c7b25d036c SHA512 01ff03edecb79bb0543b8d114e4b6700359b7358c504d1615c5263984bd617e8b976185133fd78c278a7004ff76eec791de44273738343752d65a13fc386db72
 MISC metadata.xml 476 BLAKE2B 743b22ba315a1e4f01909148a31b652ff649a05bed840f8c2a2a2c69ddc45afc32b5604083ec9e5c623621291a7603b66c5e0153e782fce98353c513655f049d SHA512 2281d53175fc5377c916eed033127c71d17b572982fb0c0c9264349866f9c0cc784771fb9d34b7542972b623e784c4bb76c0c4524db160884ad1d1e08e29aa43
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
index bc7e366d0b2a..a59a7b2e157f 100644
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
@@ -17,7 +17,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha ~amd64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${P}/Src"
diff --git a/x11-plugins/wmMatrix/Manifest b/x11-plugins/wmMatrix/Manifest
index 0c387da267dd..5e5aaae21838 100644
--- a/x11-plugins/wmMatrix/Manifest
+++ b/x11-plugins/wmMatrix/Manifest
@@ -1,5 +1,4 @@
 AUX wmMatrix-0.2-makefile.patch 866 BLAKE2B 1c57ef78dc72af8f9ec41830e3109b6958e4d834191134e0d04877d98864d605668d89c894ef1d4360ed7e2eaa98a2666d5fb9b720c77dc40c11881c7165a348 SHA512 1e843e3699c634f9f9f42ba850d0552afddaff45e36e89cd15511cc9c1cb57822d354d8d6bd2d3eb56564c4e225025280ebc8686e48e9e0f70c38e294397d43c
 DIST wmMatrix-0.2.tar.gz 225343 BLAKE2B 4d649ac8e9691a75c7e9a32266074a5624ef83e4f91a6474bfef67df1e3d5b653b63b5909a5bb5460312b36ea661404aa843e2d7ba56a39e43b9a815e734d121 SHA512 4cc65c90e5279645163833f6c8a57bce0d81428c1e5106a98dd74c1b0d693f2dfd3b230e49f9ce710ecc8073477750db94dd9b3c2b96ee026ef0c666f4bc3c4c
-EBUILD wmMatrix-0.2-r1.ebuild 891 BLAKE2B 385c3da2de6cc29e17404c556b32bbd01069334d7bf1d6983a54b2f603ab26e2c4be5bfe955870aca67d7da7552704d7c82163c9cf444931b24d899e76098637 SHA512 c592bdf2eaca1956095eced7a07f8f8362c8e3394da6b54796fed8259f2dc5a1f7b9c960485c094d2f2200e603eed53e2f980e55737a93749d6c3700521a6a06
-EBUILD wmMatrix-0.2-r2.ebuild 742 BLAKE2B e882779fbcf4e86f851955cee3d1054c52e9f9bde83ea525f73a60eb1499a0d2754729c010da7b10ad2fa3c8b85484f4ac99f96fe949da828f1fc0bd1fe412fc SHA512 85d56442067f4b40b012013620a23e355fec2eeacfbdff4de34a023e5b7b4bfe23b90cb5f4480bd0fafbfcb8aef4fa068c78f3eba30147ce459e212cd1bccad9
+EBUILD wmMatrix-0.2-r2.ebuild 738 BLAKE2B 7f6bb4093bee694a7e3d67d2905459a1ba6d5802edb063766a360c3bbc16fad7108f66b156e3c6c7f5b57beb6ddd510ee44e90053c814e7da41e8cc024559059 SHA512 d57a4a69f31ea15c4a3de95c760507d1508353ee4102c57932f03710333761aa02aab825b94196122efd724fed76b6ec4bfde24ccafb7dff75844bc8cdaf9a48
 MISC metadata.xml 399 BLAKE2B 6bfd19f3c2d730bf940451fc81183a61fc8ec623a7d50d5873b0209a66a0c529fe1a04e41f87ccb63f3dcf8fd4c53b188fc16c200c2dd11b6be0ec348626d036 SHA512 88cc0fb5ea844bfe955eb9af1d8d10e333ddce44e27bb10d8cc538c2a662b990ec001e25d86475f26720b76eea8fcbd70885593744395f0e99f33ee6352770c3
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
deleted file mode 100644
index 3faffc472b9a..000000000000
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack"
-HOMEPAGE="https://www.dockapps.net/wmmatrix"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-CDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${CDEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${CDEPEND}
-	x11-misc/xscreensaver"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	# this version is distributed with compiled binaries!
-	make clean
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "compile failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
index 561d4e7bf7f2..e66928258312 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ RDEPEND="${CDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
diff --git a/x11-plugins/wmapm/Manifest b/x11-plugins/wmapm/Manifest
index 130a8cecf9c0..e954acde65e0 100644
--- a/x11-plugins/wmapm/Manifest
+++ b/x11-plugins/wmapm/Manifest
@@ -1,4 +1,3 @@
 DIST wmapm-3.1.tar.gz 28321 BLAKE2B 13373f675bb2561c6034268d4afab12bfb6b5ef99da7fd975842392519a8f87726455e807baecc29f15403a0c711228be8513125def3b32b36683dd386b91f54 SHA512 478edf6b48d4c44017f5f2d50efc7e757b33b14d283dfa062dcf2084c9bffe1e7624651dfd22236a98ca9aa49306849cabd1a1fd09d1d3f709e715cf0fa2f84e
-EBUILD wmapm-3.1-r1.ebuild 794 BLAKE2B 6c432b8fbd47d75cfaae2c41349713df253b78cfde0db4d2c4f0c7ab9bb8182cd6934b9ee9af490bfefa1a93313f8e1d8b74d38cd1d8f35c8412aa3045b46094 SHA512 848f4d86daa542dc980e9a50939580be852a87ab1eb998712d084af3374e9d5da37b17b41e27ce3513ff3f95abce17cb3f3e8141501324652099ca05078e9161
-EBUILD wmapm-3.1-r2.ebuild 781 BLAKE2B abb12b385d90e7dcef33a936f29c1c80bf8aaf48b107cdab71f56f6f913b969aadef85b3413158349cbfacad7107e241c6467cdf815493f98ab886f4a0efaf3f SHA512 97aa6cb74be3d14a9c85679d457e1712846ab4bc09a3f5c168c5e4133af87146631a244e73e2b65f850bbe025310c20060b76195428cb6616d33320ab06a1793
+EBUILD wmapm-3.1-r2.ebuild 777 BLAKE2B 70630c9faafd4a563ea5801ce88c152d1bed01c55d62485dde2088785dfef00946f576cc469d5d23dbfd8b5e5d940a4b3cdd7a7aa571aab3966bf0beb89cdc05 SHA512 2e9372b490b87e8ed9351e294bdbe9c2c9177a8008e74485eb79cfc116b88effe45a2e83ecb0d93407a18da4542b1a27b1035b6abf963569677b3a43e1f352d9
 MISC metadata.xml 586 BLAKE2B 1cab619da94bf64d9919cad5164f23e03fbb7b1a503e6012a7c99701291dbc9e842df5f28327cb67135bd86f3ea4c6c4f622610eb45dd3cb004b2610baead1f1 SHA512 e0ccbf5129fce75fcfb4ead8ab9d90403a12647541517f1ca62e75f029d63e0e50c805714189d411eaf146d559c011ce194c6f3e79904e14222496e9d3d4b0ad
diff --git a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
deleted file mode 100644
index b18603385ab4..000000000000
--- a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="WindowMaker DockApp: Battery/Power status monitor for laptops"
-HOMEPAGE="https://www.dockapps.net/wmapm"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_unpack()
-{
-	unpack ${A}
-	cd "${S}"
-
-	#Respect LDFLAGS, see bug #334747
-	sed -i 's/ -o wmapm/ ${LDFLAGS} -o wmapm/' "Makefile"
-}
-
-src_compile() {
-	emake COPTS="${CFLAGS}" || die "make failed"
-}
-
-src_install() {
-	dobin wmapm || die "dobin failed."
-	doman wmapm.1
-	dodoc ../{BUGS,CHANGES,HINTS,README,TODO}
-}
diff --git a/x11-plugins/wmapm/wmapm-3.1-r2.ebuild b/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
index 522a770d9471..870dfd26f77c 100644
--- a/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmcp/Manifest b/x11-plugins/wmcp/Manifest
index 6e2fe6e6be82..091fd280e3d8 100644
--- a/x11-plugins/wmcp/Manifest
+++ b/x11-plugins/wmcp/Manifest
@@ -1,6 +1,6 @@
 AUX wmcp-1.2.8-gcc33.patch 2397 BLAKE2B faf1538bdd47573478ce79c71a9e273348ecccfe472f709cc39ffc4085aa13f3bbebe0046e8ded77bc7e17102c891e64a81bb737e451154dd613d3e30b9ba737 SHA512 92155c2213425ebab4938c00f9b9164b247c7e3437d332d7bd479dc5eec6394d63cfb3383f98f9508ae8c12d18dec862875a5b2da69bf7b8f97f30b72a29c716
 AUX wmcp-1.2.8-stdlibh.patch 321 BLAKE2B d32f57cdd8617ed1d511d0e2b3deca1513106bfa69b07a92b8485deaa356bb71e0b19d12e601193d8ac91bf186c8f3529e7679fd8f94f5a8e19abe297ec09ab8 SHA512 1fbc0c1a26539a989de20e4abc90663e52fa65cb4279e93e22f30b7bd818f6993eca69f5a6926e2d1d2fe76bdc9be1c5e556569dc2b335d6b308cd22c4726f11
 DIST wmcp-1.2.8.tar.gz 8673 BLAKE2B 28cad145f6c41829a740cbcef043fe54d940019ea42cbc6aebbc6b8022cf15c642f1c1dbbc0e34721442d4c3974224b498e436b5eae4ea30c766b2512f58939d SHA512 ac8db45800573810389d8103b5086966bd6bd5b03620338e736e05633fca570639d94e1ceaf24f882619f7de048c70e5ba9996849e0062407e32a74d971a3b01
-EBUILD wmcp-1.2.8-r1.ebuild 913 BLAKE2B 4d9d6205f90aa0da5c408d8a26cf59f018a2fc387f807ad2ae91aaa4b47eabbb5e223e6a63bb2816b95d27ffc7b38de8ecf6bd4c157bbab132e0a4a35c488a01 SHA512 142623f2f4b152413a362573023a4475a0ce57a840b6c0ea5920e4657128df197221a98b9ad29f6b270f91a4f607cce193ac0eaf6d31ea9ee7ce2e4bf6f32a1f
+EBUILD wmcp-1.2.8-r1.ebuild 912 BLAKE2B 3c083a39a23f44594ec044ca98686a111829b104c1a14d3ec9a924dff0eb6c68e696aacf383f320dfc4291668f7cc1cea71cb187f8c95dd467a27b2975a7bb68 SHA512 65e45ee55b0a2f2c4854e251249e4127d23a73764930d9d9a68d8f3b678c0a39134b01cbeea663d8af9a3f4c1baa336b04e647f0ce95bc79a94efe9a0e3f9fcc
 EBUILD wmcp-1.2.8.ebuild 981 BLAKE2B 910a7c56ee2ff6af5dfbf441d10da264c9042853c56eb2ff1eeda25a2e490e5dfe43498a2b28d03ce03dbc35bc136f66ebaa38a75e8f96d187b0a387ef2eecc1 SHA512 3424ffb1b0f34e6e855f2d6ef07fb4817d33f64a08c14a6eacd58a315b9f95d34dca8f95d60b2c479f8a6a4881aa432824859eeaa882665609dbb6ee4a14c18a
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild b/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
index f340c00c7706..d8056d2a0994 100644
--- a/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ppc ~sparc x86"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ppc ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmdots/Manifest b/x11-plugins/wmdots/Manifest
index 7b9d82fe1e40..f2dc89530a1a 100644
--- a/x11-plugins/wmdots/Manifest
+++ b/x11-plugins/wmdots/Manifest
@@ -1,5 +1,4 @@
 AUX wmdots-0.2_beta-stringh.patch 325 BLAKE2B fdd3cc86c6eab458926bdb1a33f6050c36716e9840e2d20b60e4835a4895cd3083760c0f01953ab9470691b23fda40e7001f135dfa994d16aee3253205d6e741 SHA512 b2da0950f0b74f6a25bb57d5fd27e315e5e4a1cca41c5cf413bbcf5a7d50ff5312a8d2903a646b2ba7c79007b8804e6518fb9a14b25fdd1028104d7800726f60
 DIST wmdots-0.2beta.tar.gz 94933 BLAKE2B 76a722b60989855b47dcf08539299c7bdf57485595d0f452d8ec10ef57f350810396bda396757c266dda8cb1db9bb3f1823b0f9759b1cb85c7e1ff469f5d2a60 SHA512 2e9d42c4086f240ece0a29cb6131bad2d499bb7f08e8a444cf72ce1a9813f9919f9d47c4dd5ae015e6c2e76601f1e7ab421a67daed1cefed45dcb06e4cbd8488
-EBUILD wmdots-0.2_beta-r1.ebuild 867 BLAKE2B 8daaf77c265bc72e6087980fc5e6ea821ad236b48e3a058e42df947e00971b40fc257ef8c42051dbc046802db0c0d7510cd29e2148c475e67b01d127199d5472 SHA512 fd39e44775eef5edf67978d601472fe269bd86db177a12e9a1c7ea4785a7ade1b03df231d265a6e10f404fe7725a2de7773a8036608932ba13e5ac0ab105d7f3
-EBUILD wmdots-0.2_beta.ebuild 933 BLAKE2B fc9b12cd3d4fedfae8418b7e11c3e73d3b55cd9739de1814d5894e8572cebdee24e55b30f84aabf25c533796262ea2e2d5e97465e4b36f9958d319b6b8d6bbfc SHA512 ec5c90f87ffecafc15efa1863a6800a6f0e831b98ed9c767aff4ca18f36ca8f98087b062b3466bf8cb21e301c17ff36bdb917d8a6873da4b8c5c28e4f5cebe75
+EBUILD wmdots-0.2_beta-r1.ebuild 863 BLAKE2B 237b2450c2300672a91c38ac221cfaf2f730a7a1b2983be57214158110d59ea8fa8de36dbbdd1fa53acd52a9e53f2b1d717976f48e1d95711e898c05e987621b SHA512 4b0feedf8be98b9efa773840745740e768f35ed7b314c0bcb289f57683c6b01663fbfe4ad56caf4ab2850d2b35cb9efd1d471f99ff2abc1e65b207fc9e998695
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
index 239c3539f11e..e38905e13292 100644
--- a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
+++ b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
deleted file mode 100644
index 4883a2add90f..000000000000
--- a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="multishape 3d rotating dots"
-HOMEPAGE="https://www.dockapps.net/wmdots"
-SRC_URI="https://www.dockapps.net/download/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-stringh.patch
-	sed -e "s:cc:$(tc-getCC):g" \
-		-e "s:-g -O2:${CFLAGS}:g" -i Makefile
-
-	#Fix compilation target
-	sed -e "s:wmifs:wmdots:" -i Makefile
-
-	#Honour Gentoo LDFLAGS, see bug #336982
-	sed -e "s:-o wmdots:\$(LDFLAGS) -o wmdots:" -i Makefile
-}
-
-src_compile() {
-	emake clean || die "emake clean failed."
-	emake LIBDIR="-L/usr/$(get_libdir)" || die "emake failed."
-}
-
-src_install() {
-	dobin wmdots
-}
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index 309531d8f10a..f33f3d11c35d 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,5 +1,5 @@
 AUX wmdrawer-0.10.5-gtk+-2.patch 370 BLAKE2B f308ef901a7d609bd257253ed092b2bf8a53e8b87afc973024b4249f56c4ae0a9b757a203ce5df180a31feb512bf6dff559a93081c0ae5314d6b3afe3785fa84 SHA512 4ee57e974cb4828a20fe5313746a0c646f793793a89ce70fb3bbdf28cf397fb4112121eb7f4274a67601f5e18487cbabf2b655161d575b8a58740eaa6aec87e6
 DIST wmdrawer-0.10.5.tar.gz 49413 BLAKE2B df77a7e7fedc1a648fccb6efc4315f1f7c4d316a475b3d0044578df0cc0ef5f5d481eec11a23a33682fd8f8bb5faeedb66e82916becb668546cbc5b9e5a61dd7 SHA512 f1e7cb7dc16841a7176e628f42ba5834200707dc162838e62fc7233e383d0aab6ce7fe22017286d26ce6ddc2e3cb6f1d0d21acd176fd36a0cdcd7ab04a2dbae1
 EBUILD wmdrawer-0.10.5-r2.ebuild 1106 BLAKE2B fc3d43c92554cbf5a89c9ad781e969a53deb5907ea6a2aac7f90e8a7624c860a7413c7c50fba290397453f721cb4b0239b028afced205ab0176d31d36ad82907 SHA512 be30573f16e71c66f54bfe35190df9133f6b3c4e8497a2692f69d8ac3450e03977f1bcd9e362f7cf1c90473aed3dc64efd5fba6ca43604db98bfcb528355e453
-EBUILD wmdrawer-0.10.5-r3.ebuild 1169 BLAKE2B 2698783141e576b5d9d461d753bb78f4c33354f9494c20c2d2c2efd88d8418be45f6c7951b8a74c7e32bf20657128c1b2fb168541762f2211fc7ad9074eeba23 SHA512 b72a84b5701f91d4dd15ba585015de5cf5c4449e336f94cbf3f39f648028fbbe5903cb9367d8767bff8b59ce2c50d189c55eea4cc5084499dd1952c97c971277
+EBUILD wmdrawer-0.10.5-r3.ebuild 1165 BLAKE2B 28c33506888835d60f69cd1195d86a640ff09adc6072955e104d855401bc2c68ae71901a717e95e00f8f4013d38bb4abdbedc93f61d7f37ade94a7ba162db1c6 SHA512 88c6753ff421cc141af530573fbfbf322cc30f400d3ae3268445a3c23a1d7443f714f0e8937f63430d91a9b432a952077025b4ee5b7afad9e1981564d609bd61
 MISC metadata.xml 386 BLAKE2B c880c70034059ce7e0c93132413243a49e869bdc2b8f9448e6ad537812509276645e85bb9bba664ddb1e0a7b260933603ed2e1558c24c25f85894863b66c1d33 SHA512 7d950dea28887653d783e742c946186617791c535a131aaf0b78d51fd413fdf1868428a71afe5e1c0a673083ce1630e4a5d1524d166590c14f84d94fc5adffeb
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
index 70a42459d811..9bec6c6314a4 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://people.easter-eggs.org/~valos/wmdrawer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gdk-pixbuf:2[X]
diff --git a/x11-plugins/wminet/Manifest b/x11-plugins/wminet/Manifest
index 34dd0d5f7f69..92472c34ff0e 100644
--- a/x11-plugins/wminet/Manifest
+++ b/x11-plugins/wminet/Manifest
@@ -1,5 +1,5 @@
 AUX wminet-3.0.0-list.patch 7026 BLAKE2B 4a4011cbb4e74caee67a6974967a69189702510a7319679c3f2b039c1039f9a62338d0abf960aae598fc06c49c5bc349e3d86b3b445ca45a7592b14926f7c8c2 SHA512 9c51ab9ed8f00648f7f24d070657c9126b26e19a4dbda8dac8d127030858f2a9eb385443fcd452560974bad6ccb986962087bd60fe78c5c1cc6ba43c91313b96
 DIST wminet-3.0.0.tar.gz 47576 BLAKE2B 318a180998f815e4ac274b98fdc14914f2d69eac1a5bf6c4382b0f8b01594d56dece8f168a069fd45cb6be373f1c3507aa0a0e5fd27ab571ee21912d0c02e5e6 SHA512 594d4a2019e424b27e717d3ffd64071f7888b40bf9b31332a877e71d85c0eb89f65490268276def30f530f187f3796a14c5e412af8cb461311e3f1e0a6478e51
 EBUILD wminet-3.0.0-r1.ebuild 720 BLAKE2B 9fd7759f4a20008da705d4256e1db9acaa5e7928ac39ffccc396dbc497a15cf9a0d462d32bd89bebc68c853f3ced999189f00e7f05fc9d23c19f36e516bfffae SHA512 c78df063dd73673e31ba823cf45938c1f4a4ab258f61b51b8a4a76412877862a7851b14f0eca77db57a142c932f985d3cdebbfbbd8e5725ea308a14fccd7daa9
-EBUILD wminet-3.0.0-r2.ebuild 647 BLAKE2B ea52227fe7f315740eb36767a23ecc7c0e738c3b53eb6bbfcaf5c14d18741064fd8fb0f23b28d8fd5fc666a2275b7cf534129eeae49e94ad4df9ca1a1e2659df SHA512 08b9aea9df56a19c4d0498e1ad13ac1b884f161cb7dc0322fc1b0e119c05fd5a3a24186208ab0a2b75509c7302444e99bfb782b6073b810375faf6fb5e615865
+EBUILD wminet-3.0.0-r2.ebuild 643 BLAKE2B 4b6a9888d031e5de93dd2ccca2b70ca143ceb828e5c6090219d17964fa08759997b83220fd73e541c367136c9e47c208116737db2c2e341b4f2a559b73139c59 SHA512 8dc3e1414866c8fa70a77d3cf4bf8081ad9fdeccd8b1da90dbf6bd8e2dcdd4cf8998e089f45aa5d436ac4244b849210d15fc3aaf170402c079ba347170cbfedd
 MISC metadata.xml 455 BLAKE2B b17f992bf7af49680eff6c95cde64caa3dce145e40c385fa03bce4a4075793eb946e79fd80f56d88c006149915ccc68499f538eff59b2888b617f47d638e332f SHA512 c27ab04917d6dc1e914f77ae4c215fb9c9f8f0062357ba8f4c197a5ee879335ba196f4249eca2b036717d4eb896c7802ba274fbf39288559012e4992140f70d7
diff --git a/x11-plugins/wminet/wminet-3.0.0-r2.ebuild b/x11-plugins/wminet/wminet-3.0.0-r2.ebuild
index 3135e576f992..e4fc9ee0d5ad 100644
--- a/x11-plugins/wminet/wminet-3.0.0-r2.ebuild
+++ b/x11-plugins/wminet/wminet-3.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.improbability.net/wmdock//${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmitime/Manifest b/x11-plugins/wmitime/Manifest
index ad427e403882..8394545be44e 100644
--- a/x11-plugins/wmitime/Manifest
+++ b/x11-plugins/wmitime/Manifest
@@ -1,4 +1,4 @@
 DIST wmitime-0.5.tar.gz 15099 BLAKE2B 5e5197054d8dd716550235709b86bc4a6de707d04c61a9492e7dd7405dc0940cc2f3b637ce542059f549a512e19fd1b72047fbd4ad29de46c936d6c07af91daa SHA512 ae7d36eaf92e1a5f7481fc92685b87c2ee1092e73ed85450686b0c22e3502cd2ff82787a24bf396bf346d6e3bdb3950306fd237ea750c4ada87f0b56d3b23cab
-EBUILD wmitime-0.5-r1.ebuild 662 BLAKE2B 13ed8aadf323a2d43bca2f872deca43367339e6f69b3115d0efa90ae2755e73874077af726b3aed6d09dbff628db5724ea9a1373ff01db11ebab4cde353dde9d SHA512 0ae77239792cdeda9c999886ea9ef2c5109ac9bb99b4efd83507181f34f7097a86ff8d5506ffdbda95924e9750a9abda7c40ab120e7ea9948036534f0856ba7c
+EBUILD wmitime-0.5-r1.ebuild 658 BLAKE2B 77fd029fe22b5d9854c1d4e5972b4ac26c694c06371161a71600e3f4d252f2bb5870e2030158d167c3eba7eba1c479eff0c0a8edf0d34bd93c500ecd6eeb4188 SHA512 c87ae9676d6b8f033b7f21e8363d94345864156a0fb272f744ff183d16b353492f6b8e355bb988da919fdf9f6df26dc2ed2dd8e21ba2a83d3100b9663be3fb9d
 EBUILD wmitime-0.5.ebuild 682 BLAKE2B 2f2d754aaaf7b45449178712c625a6aa3849de424cfb38469bf91f753db3bfd7bdfc27151c809ecfb5db998460df19a0a65df4e67fcedfc2c1707147c110c671 SHA512 94491547456cda8bd4e64171b8998b5f7f99ba439ed8f4659bc622cdb12c4ff79c88186326c2178a82c66d5b0d196f22d388c59d0feb2555f1654f2ab6f18df0
 MISC metadata.xml 446 BLAKE2B 684a273490a9b6209c7e5a493484e863f75a4b6ac755a84352d4dca44da373b92737032fdc094a01fa47e21882af6798f97d3dd0a27722f5800aaedc5b27521e SHA512 9a760943540f8eeae5e9c86ef8c0bd38441e44de95ade057ffa5997da71167e808745fcfb3f8f74d4f5a68f37737b8f4635f4667e649db450e2f73aa799344fe
diff --git a/x11-plugins/wmitime/wmitime-0.5-r1.ebuild b/x11-plugins/wmitime/wmitime-0.5-r1.ebuild
index 83f2dc17fca6..c6fb25531b12 100644
--- a/x11-plugins/wmitime/wmitime-0.5-r1.ebuild
+++ b/x11-plugins/wmitime/wmitime-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 
 RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
diff --git a/x11-plugins/wmload/Manifest b/x11-plugins/wmload/Manifest
index eded2c7011fd..e332080bd388 100644
--- a/x11-plugins/wmload/Manifest
+++ b/x11-plugins/wmload/Manifest
@@ -1,6 +1,6 @@
 AUX wmload-0.9.6-solaris.patch 3040 BLAKE2B 95f8c6368a7f1f3d476da2d089e6a72854f7cf7411b212bed54e26f0c6b4917c340722788a41bfb63c80cbb49b18a1539c0002fe9eb7bd785aa10e2ab0be62b8 SHA512 083d4d3e3bbbf8646db8286cb8350c3c2cd766cea6cca9cee36cc2a4fa04993b73d629b652879a685e4b8440f3545c36bbeeb5e9017339425de5eb4164bacdc2
 AUX wmload.desktop 155 BLAKE2B 50461febd5980fce4d55231c958b1959066b791cd99c807ed9c82a96c6d833d930f3c9ee90148c3a99efbed789399669363129f26fb5d676e092eb610ac48489 SHA512 260b0370bbd730ce89f7452e1c8d8ccdacee047aa025ea4e832405534e9a0418983e1724fa01ab143e7d978906708697ea338d1f831a8de5c3a790f0f238395b
 DIST wmload-0.9.7.tar.gz 17648 BLAKE2B 418b18390035eec14fdd2d715519aff0807c7c5171448818e113ebe27ba908c5416baaa2e605daf3701c7acac6cde6d76c2b26a85f8cae18efd95b000d0e510a SHA512 5d08f34013c23c85de88adbfeca31e8399f0f9ce5573845aa50c1f4a06488d729de637b1d0f8b5739194b30ba8e085d40022926a3a8328d3cdab462f9e649801
-EBUILD wmload-0.9.7-r1.ebuild 775 BLAKE2B 32f72840beb8e61d9a9a2bd6f2fceedcb96cb668d234f3b147e88a942e93985070bc8cc0ab4be749d290ba56588dd066085d13869cefa78f2ce231d863979841 SHA512 ffc3f6f90bb61b41932a387658f38e79b39de1c0baeb9959d535f1201f0d6fb636682d7218869c24175abb20319036980814a3114666e031442243c27dd9537a
+EBUILD wmload-0.9.7-r1.ebuild 771 BLAKE2B 9cf4fb95c367aaf411002d0040b94062ba5a4b4d88a3fb7f093989f7a7c7c12010b9baf69b6d88f0fc9b6a16becca8fde50187ba4528e55f3f459fd99b2ce64b SHA512 146a2f6b8e01693a2efcd52057daf40952e01d9be10478fe718d795091d4c3507b3285a4a06702be1b8623879102a1301696d67970214d2f04da9cb76508f516
 EBUILD wmload-0.9.7.ebuild 793 BLAKE2B b2125693aa6672aca3f6fd238ef39f45b3f179c72223feb89a075119a0ebd64d456381ef767e726791daa07f892cbb74a7ba3fff5aab97fe1e72dfad113eec0f SHA512 87c1d718acff0dedc4574409c772fd9578e0205ec54fcf702ad6ad320bf396908c24a7ac23aa9a768b5a0064e02d1e765278e1d3d0ae9c7bf47bbcac750d51d2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmload/wmload-0.9.7-r1.ebuild b/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
index 831d40ed2281..3b438d697b05 100644
--- a/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
+++ b/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmmemload/Manifest b/x11-plugins/wmmemload/Manifest
index b9f63920f977..29766c95b6f7 100644
--- a/x11-plugins/wmmemload/Manifest
+++ b/x11-plugins/wmmemload/Manifest
@@ -1,4 +1,4 @@
 DIST wmmemload-0.1.8.tar.gz 23114 BLAKE2B 3d0a56a6908dc1e0617ea43aa73fc07a294575fce8e3f54b7769d8eda49b134cf292caf8d92930bf8a22e7a4f33080da531403bbea6443333859def6937cfbfe SHA512 7139e92e15371ff493784c0677d6697074d85c5f4457d0c5caa146bf1aef481a4afc31a4b70bf8ec0edcc90390c18e16daa8efff7d418f96c137c72f7c7819f9
-EBUILD wmmemload-0.1.8-r1.ebuild 584 BLAKE2B 4d978fd1c02bc3471f36937742e9a1032e0d322eabc021c9a82ca42c4af604ae9ea65c28d1510611b3d60d6fa6ebafeeedd817f6d1f22d107190a73c8dc6f273 SHA512 aa9f935249b52c0ac2d05a2d646aa70f35a65c63b35f1eb2cb99eeef89fc4d91019251e4ed7bc918ff340e5d71f675e40e27e3ba76b8c72e4c3003502bbe3694
+EBUILD wmmemload-0.1.8-r1.ebuild 579 BLAKE2B ef280fe09cb36b6eb4fb3164f43e44ca7cda77d3833cbefcdfdf9e74ba065134ac09886b89a7af6dd0d15b6e1ab067e852e15f05dcbaf9e68423e078b8904705 SHA512 b28646bf90a536541c288fdac0615781c467dc4cda3f3965c45ff77c2f8d9320c34cc6b12041315cf7fa1721f9ea0bc15fd85e72a7c38b724db22a7b8258f412
 EBUILD wmmemload-0.1.8.ebuild 666 BLAKE2B 18a9cac6e02679ae8b9e9a2fe4e85af4fe78dab7e1d3e6edd139ac47ed37a62fc9d581475f5b81ca017c2cb58ead71df62e6f63f5cd62bf2b973dce377c5741e SHA512 5c84bb721f88bf9138c686e0f72d3c083275e999f7d90373417092c1dfca291b8f8d2eb2e8014a60b8a5dc8573646ac60ec6509f122ca54100ffa5af204f5479
 MISC metadata.xml 428 BLAKE2B 42e4fa840c3d15800b5a4fbbadfdb824b0885f50dc83a01b06c9bb0b5db3e2b8b81557abda856ff2e6a46993c7dfb8f712afcfef1595d6debe45993a51ea2386 SHA512 ddd7223a4e535dc0f919347778fb1ad9edc1a183ff9cc85b5dcc5820454021d38ba57d230c6825055252d007c0b63e20b2b374100748ecc6e18cbceaf51adb37
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild
index 59f3860a1084..55e2d0a3e7d7 100644
--- a/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~ppc ppc64 ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmmon+smp/Manifest b/x11-plugins/wmmon+smp/Manifest
index c0342f4dba95..33a00716a1db 100644
--- a/x11-plugins/wmmon+smp/Manifest
+++ b/x11-plugins/wmmon+smp/Manifest
@@ -1,5 +1,5 @@
 AUX wmmon+smp-1.0-list.patch 2916 BLAKE2B 112b15af9d697dff61fd9273526f88330b14a4882d2ed0346df318ffcf0eb53d2778a924fbcae9bb392375545dd4a2103283f129068a499e5bfc44c7186104af SHA512 6b0032f8c518f77cf7d221bf06900209018dca35a75998cb80bac636a8cd8a19f6aee3628acf75780bdfcd09aec454dd1a7e4670627524812040d829a6b0d7fd
 DIST wmmon+smp.tar.gz 15807 BLAKE2B e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728 SHA512 9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94
 EBUILD wmmon+smp-1.0-r2.ebuild 846 BLAKE2B 80dd4f0534ff34e484807e4cf55dba234d5a209593a14899643ab88e77833cf14ee116a7c5e247f37e6300d83c9fcf7fe7e2662c3946e76c8bf30fa4df2a41d4 SHA512 27f649a6d4fd987eb4a042649e3fda50194836ad3740ec78a02bfb6267f3c25b051543ecac7e4a713f5f6eec537025315b0c76b0d520228298b891488047666d
-EBUILD wmmon+smp-1.0-r3.ebuild 844 BLAKE2B 5ee5c9de466372cb8ae73491a73c852a6b8b8eda2a4b58f78e85363821bf82d97005aabb9e97caec82f0bb7fc475c496b30fa2c1c705500624d5a6e743b7777c SHA512 1d283423a0613cf989aae6686581534907849e1d2c739489aff72d3a79375d67e738469b1668b579655d4a27a18147acdc8df1c9138d94133084254377edf4ac
+EBUILD wmmon+smp-1.0-r3.ebuild 840 BLAKE2B 958a62d5868c7549b16677532d30dcd5978dcd917431003810f356627ac60055fc139c98398ebaa8607b45c89fd3211acd1f0b021146c806bcc54deaf46477be SHA512 753e603c50bd469f77b5e3ed4a3e4fc5da4365ab83bf96cafa67d246efd519e42d41775391660b42c7328d59a3b6171cbaab081a5064312e317a51d13adec126
 MISC metadata.xml 533 BLAKE2B e0e0d04cd468503f8219f1fb6b0c30eb7272344f23e8477670372f3d5d347dc9e3558326bb90cfe79ec245f591cc28d5c20520f76f250a58f279a003385cbb90 SHA512 9ea486d5d5b12a67fb8b25ab2be9c67420f8f7903a00ebf414f3f85441b543775085c2c85cfb2c5eda28e264e9ac0878bdb670e7eb9646644bae0b803f90d67e
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
index 29fa6afe079d..45c4bc627777 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index a81bae6b5a60..807f44bd1a26 100644
--- a/x11-plugins/wmnet/Manifest
+++ b/x11-plugins/wmnet/Manifest
@@ -1,5 +1,4 @@
 DIST wmnet-1.06-misc.patch.bz2 11327 BLAKE2B c03f25270c37e9a54731547a51c00983df802b5f4278d02b7051571de45bd326bb5eda330bbba8e09be6bcb4b3afca111956d6506e73c13f955afd40b9c967ea SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3
 DIST wmnet-1.06.tar.gz 27506 BLAKE2B 9cd5cb626406238e5dc20ff58f26b13389c5b8bff9569e3cc8fc4f083422d213702fc387521bffc003339ef4e0c6223f5cfcec8617ba3e71b516786c6950cdf8 SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a
-EBUILD wmnet-1.06-r1.ebuild 804 BLAKE2B dd43869d6648d8a7bf33e6f4b9b4a42e2eabea73713e557a9900c34f7441f78458a6b90244153dbc50ca698b473e5b9c622ea25071e590f8344c734c0f75647c SHA512 dababf35f29f1b6ce7ee5167a4c7f808676f1c28f4bedbdd2a4c8e89aaadea885eb619277b039ebf53b8538b8e81d24eec04e99ae75f9d65f1bbea0500921329
-EBUILD wmnet-1.06-r2.ebuild 719 BLAKE2B 962487e2abcce6f8ac5a2dbd15475b3a4fa34e3392693a7d0382ca217e817d5295be0c808abe1bd5cb454eca244929ed09fa05614cae1482ff274ffc1878e5f2 SHA512 d4c893c7ec7d1353866f4702c01f53d28ac6790cd196ac821021ec74b6b54b12b3a20fba58bed1dd4a663904d524c5703c5a5dbd4a43cabbb43861c138ba30fe
+EBUILD wmnet-1.06-r2.ebuild 714 BLAKE2B 429508f474c6e30217c34ddaf918eb921f1d8f7e57d7f024cfb1f0db1e398011ce87304cb27cfab0e11da4c33c044012165e35b94ad730f78bf1e5dfb5e02c79 SHA512 b91594524501e078e4ec38e1c8b0a5cff4613a0a9126b86f34b8d3885ea0355d18ed41e4326b13c5aebc96c0cc9ff30d899394d7f2545fcf73297e195bcb3338
 MISC metadata.xml 780 BLAKE2B 254fdfced5817ebf8e2594d8cdf77828066acd2b27c17bb8050dd7cb6d4ce848de69485064fab61473b3313b19bcd6b30fbad2cf0cdaca2cac72f802d1d1ac5e SHA512 c9382651f9b9aca829c4cbbb5d27451351f56b7ed9138ede20646c591a54711d3170b45b6c021ca7ca728e6bd22ae421ce8eb18d09a65ad69d37f3cff260b860
diff --git a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
deleted file mode 100644
index ab44a64942e3..000000000000
--- a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-IUSE=""
-DESCRIPTION="WMnet is a dock.app network monitor"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-misc.patch.bz2"
-HOMEPAGE="https://www.dockapps.net/wmnet"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake
-	app-text/rman"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc alpha amd64 ppc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${P}-misc.patch # bug 72818
-}
-
-src_compile() {
-	xmkmf || die "xmkmf failed."
-	emake CDEBUGFLAGS="${CFLAGS}" LDOPTIONS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	dobin wmnet
-	newman wmnet.man wmnet.1
-	dodoc README Changelog
-}
diff --git a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
index bc4a43c32e6b..eebaab37ef11 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmpop3lb/Manifest b/x11-plugins/wmpop3lb/Manifest
index e920043680e2..4864fd5d4065 100644
--- a/x11-plugins/wmpop3lb/Manifest
+++ b/x11-plugins/wmpop3lb/Manifest
@@ -1,6 +1,5 @@
 AUX wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch 5642 BLAKE2B 50c94971c380b01abb1bc7797d286bc8fc484105969583c4ada10f07dd3bfef60f9382208d961a54113d59b7ecb6e6fd253b6f72c6f7d9b914567b6a504f82be SHA512 d0f5696c8db4fd8fadd95325abfaabe8f72cd5fff87cab5d36e927b60a582857ec0fac114d6e895d749a3aded0f439c71a655947c4bab9308bc346906938982a
 AUX wmpop3lb-2.4.2-list.patch 2941 BLAKE2B 387a8b4cb87d0ca0ba865539e3c17ca54ac5056f9229832308d5dd89b62b2bf5b9912c394aba1951fb999bc3a7ad257987228c0f3a69e50092735e640fec0c66 SHA512 0a8f5cb7da8ed6143276eb081585621b108a92865de7d6780aaf3c98144a22af6eae89e2ed661926552196fa351fa805d4e6f51e243693f1c537ee96f91b958f
 DIST wmpop3lb2.4.2.tar.gz 37391 BLAKE2B a9e1acaa35b965db90d5e272382629d02b127b19e9501a6e26094f204463a1f33023cdcf4b7910a045abd2e412c0a41cd3d67fb98378b164f2a3c3f0f457f8af SHA512 6d9d12261c457542ba45bbbb2f07ea9895a456d87c60187e2df0f0cc6e6da57fb498ea642346d113749b9529f1bebc623ec9dad48ee84e5016925b2440211e0f
-EBUILD wmpop3lb-2.4.2-r2.ebuild 1007 BLAKE2B 538816729c0378e654d8e54a0ddf4f88fc1790ac6ba69cd8d0710e2a3b1863854e2197b5d5f101ffc5e0f65798844135edd207d80d4d0525c8c8012132a8cd04 SHA512 c7ccc12d81c13a3e53211daf426d7a2575f954d244cd1127fedb91eeb78e2f98ae0eb5666072fd5c589aaebb8c155ae1f3f18bfe3621554da9097513362ebe76
-EBUILD wmpop3lb-2.4.2-r3.ebuild 971 BLAKE2B 93116c6b91f500e9dd76fbf3cb3106abc2a7631504306b6d1d7bb8019b7a7b24f6be573ce248e2abff0f8ff02ddb86c51a202e4b2a68337dba0ef112e9d1a3d3 SHA512 9f81056511c89e6cadc96bd52a6f17a4c011714386f16a14734e6d301ccff95915e34ef2cec52838cf9b7f86cb2a27c2faa1407f5309a6dd6005607c7c0c9291
+EBUILD wmpop3lb-2.4.2-r3.ebuild 967 BLAKE2B c35eb1ad6634f803a54e1b26d2507a56553735e278ee7c3764b317d96f01badff9baffa4f64fb769f41ce9fc1481a1e1231fc45092a473e9e8660bf668471bc3 SHA512 1312de99c811f36301a49b266dce5b2883aec8f436dd3fc8d75e3edef3d34781b077c08825ea1f140927f0fdc619027bcec38773d681a4f4e333c08bb8d25169
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
deleted file mode 100644
index ba983fab624c..000000000000
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="dockapp for checking up to 7 pop3 accounts"
-HOMEPAGE="https://www.dockapps.net/wmpop3lb"
-SRC_URI="https://www.dockapps.net/download/${P/-}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	#Honour Gentoo CFLAGS
-	sed -i -e "s:-g2 -D_DEBUG:${CFLAGS}:" "wmpop3/Makefile"
-
-	#Fix bug #161530
-	epatch "${FILESDIR}"/${P}-fix-RECV-and-try-STAT-if-LAST-wont-work.patch
-
-	#De-hardcode compiler
-	sed -i -e "s:cc:\$(CC):g" "wmpop3/Makefile"
-
-	#Honour Gentoo LDFLAGS - bug #335986
-	sed -i -e "s:\$(FLAGS) -o wmpop3lb:\$(LDFLAGS) -o wmpop3lb:" "wmpop3/Makefile"
-
-	epatch "${FILESDIR}"/${P}-list.patch
-}
-
-src_compile() {
-	emake -C wmpop3 || die "parallel make failed"
-}
-
-src_install() {
-	dobin wmpop3/wmpop3lb
-	dodoc CHANGE_LOG README
-}
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
index d32a540ca69a..99e7ab4db582 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P/-}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmpower/Manifest b/x11-plugins/wmpower/Manifest
index a3b8479fd99f..6fb8f2b5166f 100644
--- a/x11-plugins/wmpower/Manifest
+++ b/x11-plugins/wmpower/Manifest
@@ -1,4 +1,3 @@
 DIST wmpower-0.4.3.tar.bz2 99178 BLAKE2B 191c562d0b3a2d738d826030323b17db049868bef988ac49250af3e0c32b0c531bb1d819526de609fae3da8bd74b2bc78d724c58999f5fae5e6655e0c1aaa5a1 SHA512 90d96949472497e39760f76b33f4363751863d3f824b1cb22ab9ff333f496b1f329db5fda1a2353c871f87b9f9f09781c410b51907cf13c617cdd3af2c2c84e9
-EBUILD wmpower-0.4.3-r1.ebuild 675 BLAKE2B 11007e713e3ffffa76fdfa9b0803d8b7ff751d66f24ad993d638e3630e1187a708caa6c809cc42e3b9107b9c2279a9bf8f9b96483ad9cc46fa2cb350358efeaf SHA512 afc8734d0b206672517c7bff0ea79ef2e1a23e35f2a9d0c70cd79a65d8bce013bed94bdecb0589ec7990caaa3acd95c49c9410147f0d99104347e354b9c6fcbd
-EBUILD wmpower-0.4.3.ebuild 794 BLAKE2B 2202e428661db4cf9a36e1577a8753d982648c007e49ff3946b25277432ae0e9773afc6e4ba6e24ac6c0ed608485955041308576247917f8f813deb2f2fc716c SHA512 d9e451190d5d54f647f18a986255378999a68b5bc84666e31d8d149f371edd503a18e5073ffe9dfe250a41871607fd50f147d370c56098eb782d7b7df0f8510b
+EBUILD wmpower-0.4.3-r1.ebuild 671 BLAKE2B 47d64382b046698a52291e43f71b2fe9c95f1ee857a3467b0bffdb97223bc560ad0421a514c6b89995bfe01b3474b743950291a4521f9b1e4ff833669901c2f8 SHA512 bdd1c1230481ef8c326e2e221e557e36927df1d5d17e4bb00400053bddb474e7bab936a4bb71a54ae56b0b1e1df1e95fccf760fe06026879e099056849693c5a
 MISC metadata.xml 684 BLAKE2B 3d50ae0a0c2d8c358b709fd5a2c0b86906aa1cddeeeed3f9f62a31d3aa56d533331d0254d1b74df833f0ab80a745b59c67ddad74875ba9677cdfc40a43945275 SHA512 56eff68c510d855dcfb617977cf9d837741441d1a8ec40e9c984c306b104c573f880d126dc61a8016b80351e6a77f9564e50288a3392e26dd32bf0fe2525403e
diff --git a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
index 81d0e102ca8f..d161fd1e3b51 100644
--- a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmpower/wmpower-0.4.3.ebuild b/x11-plugins/wmpower/wmpower-0.4.3.ebuild
deleted file mode 100644
index 3235f25cf635..000000000000
--- a/x11-plugins/wmpower/wmpower-0.4.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=0
-
-DESCRIPTION="a dockapp to get/set power management status for laptops (APM, ACPI
-and CPUfreq)"
-HOMEPAGE="http://wmpower.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_compile() {
-	# override wmpower self-calculated cflags
-	econf MY_CFLAGS="${CFLAGS}" || die "Configuration failed"
-	emake prefix="/usr/" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS BUGS ChangeLog LEGGIMI NEWS README README.compal THANKS TODO
-}
diff --git a/x11-plugins/wmsmixer/Manifest b/x11-plugins/wmsmixer/Manifest
index 1f3cfcea5a0a..fee970a66d55 100644
--- a/x11-plugins/wmsmixer/Manifest
+++ b/x11-plugins/wmsmixer/Manifest
@@ -1,4 +1,3 @@
 DIST wmsmixer-0.5.1.tar.gz 33350 BLAKE2B 9f80e0680834b0c8537baececa1a80708ef249db3b58cd77d8d5ab2d13a96959d55f016b38bc5975f8c3decf7569a3a356e5c09cb27c2b5a662dc2fe00766962 SHA512 2731645addb9888b30cbfcaa1f9609c036855d3ee864628535fc5a0dd4c005d01b111bac3dd7f9d11f4794f55f22be65564ccafe598f098b13abdfa9277da299
-EBUILD wmsmixer-0.5.1-r1.ebuild 803 BLAKE2B 737c3051ab73fc116c6995537ba294098a864fd182eb5e8027eb713cc753f1170fe70b784ff2f0984bcdec5f4a608ecf5e46718d191e3bdfceb48c8246d3776f SHA512 c18f519059f287865f14d11ca48b7ecfa1d3b17c32480a0649760d210507624f2aa433229e6727aecab1248f6f77367f2082e5feb8455bd6951ddfb7dc642a36
-EBUILD wmsmixer-0.5.1.ebuild 766 BLAKE2B fad312494ceb4f84ad9623e7fa5978c1399fac9db8970a61b4c40deaedca4d074c3975bce7224397d7190ce9e6141d6f1c4365b451108e7b68894c40902cd341 SHA512 bddab4b86259fab433b87374707bf8193c8f0b4febaf4edd5f1f4af6177a957c62b8fe599416ed6f4a81ca7e5a54a41d2bd3ffaa34fe5eb6b36bcd3e442b1235
+EBUILD wmsmixer-0.5.1-r1.ebuild 799 BLAKE2B 4dc59a27f5bdedb55f719803c0ac9f713756cc1347868138423dc5fe151523cbf3ef63528713579a443a97a026cd6f1cbcb4d38d816c45bc79380d908a5173b5 SHA512 dea489e02d5fba22932b10f37dbb988f56469b7679e2ffdaf241a622db4e9e1ff1e1c86ed648a33735c26a4625247498f54c74e1a23907d44b9909d593277332
 MISC metadata.xml 464 BLAKE2B cda6cb18a92e65299fcbd76d3cb5c22755d17c16d4d634db82dbee0a7421c0023159ac479369e9bd7c448b1e72b53d3b28ec393190c92d09856ff86c7f2fc3cd SHA512 ff0c18c9f0dd4c316c9e82b22a18d15a08d68b58e63420d96da5ae0e70872e2946e0c767f8b5c80951aedce5057a5e8bacafacdcff84416e7eb529c8746c186d
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
index f60c53331932..0b0c25be6b64 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
deleted file mode 100644
index 1a156b595773..000000000000
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.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=0
-
-inherit eutils
-IUSE=""
-DESCRIPTION="fork of wmmixer adding scrollwheel support and other features"
-HOMEPAGE="https://www.dockapps.net/wmsmixer"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-
-RDEPEND="x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_compile() {
-	g++ ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
-	rm -f wmsmixer
-	g++ ${LDFLAGS} -o wmsmixer ${CFLAGS} -L/usr/X11R6/lib wmsmixer.o -lXpm -lXext -lX11
-}
-
-src_install() {
-	insinto /usr/bin
-	insopts -m0655
-	doins wmsmixer
-	dodoc README README.wmmixer
-}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index ca26f42e8506..dd26aa9fcb7c 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 6f0a55273f71..8afa7c89532f 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -9,6 +9,6 @@ EBUILD guake-0.8.13.ebuild 1061 BLAKE2B 612ed58bcfddcb870c16fdf09cf6c76c55af652c
 EBUILD guake-0.8.8.ebuild 1058 BLAKE2B 5dbb934d346f0278b921a6a25d28d1dee40460ca122d7e4594a78f1f6a4043afa576d6813f2231ef9747667141ca9c3deb182aef00bb7b30bf89d14ad6b2c0db SHA512 c54fcbf25a5c05632fac0d8d63c3ac1b65a55e9eb8e5e33a0130f6f2622514da25b3d0af6d8231040dc6a2e362cc34f1b7b2a88484f29503d3566c103d173135
 EBUILD guake-3.3.0.ebuild 1355 BLAKE2B cc7e4a89920a56b095f22e7542acbba3aed0ae5ca4acb709ef278749f499f44f0448b0fccb7949c97726aa7a9e7c981c34878aac2259d38966501b9e3569f60a SHA512 cd4507485ee77ee61b7e51a75de238c6102d27b89e8871fb0c9f65fc86d6d2deb0f2a661cf2ada94cc0d05cb4d80124963bfaeedd29bb8c572a0ab02bb538280
 EBUILD guake-3.3.2.ebuild 1375 BLAKE2B 7a6bdb335f6e183f794e50276be61f0f3910f4a626e4fd1e45e5e7443968bc6e9b29492f65f8b7a5032a9a59044a2b7cda3617a098b8b84d7aaa0769b6adbb6a SHA512 50846354bb23ca4799d506afdda2ae4aafd26029dff318862d230decd7ebc59e85e02526bdb88b771a4e3cc3bbca6b36c55ce8b91a0263a5ddfbc681bee99471
-EBUILD guake-3.4.0-r1.ebuild 1489 BLAKE2B 8305fd4a2f76f780686758d6958b8986923ed6400512b5e539e35888b804afa241e405874e618aade95db0f2575f1f11c15a17c93997e9bc97f809dcc7a089bd SHA512 428689bded27b8f67b4123c8c7d475eb4ece7531e86d7b80dcbaf6aff4912539a5782d27f00dc04f3046a0e01c425590f3391af861d9d6040b22666708ecfdfb
-EBUILD guake-9999.ebuild 1451 BLAKE2B 88093ded4bca1b26b77d554a5b048733e6a19ca728fcf7c513fcd11f8180de68e139edcca2984adbc912fdfcaf9a3d89a04041688660638203442da5511bb204 SHA512 1dd05b62e534278e2e728ca8ff211b5c1dc68a3ad22a6c19d9ce84691d6243a6da7eebec09a2e6d0a3534f7b9c66e9ef2e16c446537958bbfd9c99153e63ee61
+EBUILD guake-3.4.0-r1.ebuild 1471 BLAKE2B cc59b72a8adff828124411ce4cefb777ec5fa990fe549b60f36d5f406c777c3698fb7d5f785d061c742be4db504e644ec6bd27f64c8e93798eec674610770a83 SHA512 96db7b3cc5906166f8f2f463ffbf95e96d175af32ee865d57d90ec4ed9ce6397e454b84ddfaabcf506383d2b20461c84a51aaa3c943cbd05d045e70a834ef6fd
+EBUILD guake-9999.ebuild 1433 BLAKE2B fbb5bc1663b5b33ab401301457fad155209df4402b88eb4695c3b46b888c584073c1ee7b02c67570119e364e3c47856c0ac44a740d10134b7d6efe19eee184a0 SHA512 7f4d7330a5cb770c5a2a0e86e2630ff1b3088973f36981c9cde233ca57e6e2732abedaf33ecc035e89dcadfe6f2f8f104da05f527bdc4ded4b3d6c1e41e53316
 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/guake-3.4.0-r1.ebuild b/x11-terms/guake/guake-3.4.0-r1.ebuild
index a9aeb41ea1cf..fdf22837bc0d 100644
--- a/x11-terms/guake/guake-3.4.0-r1.ebuild
+++ b/x11-terms/guake/guake-3.4.0-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="utempter"
 
 RDEPEND="
-	dev-libs/glib[${PYTHON_USEDEP}]
+	dev-libs/glib
 	dev-libs/keybinder:3[introspection]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index 593f8375adb6..b12d887f6d2e 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="utempter"
 
 RDEPEND="
-	dev-libs/glib[${PYTHON_USEDEP}]
+	dev-libs/glib
 	dev-libs/keybinder:3[introspection]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 3ca573e11c15..81bdc585088c 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index 7cb8b6f4af2a..1209a29ea316 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-backgrounds-3.24.0.tar.xz 15223020 BLAKE2B 5a4bf10bb767da9ac1b89e426a517c0ad9b76d62d764b4398e3381cb9b1bd425ab8f36835a681e1586bbd95f5f2d08307a2680d2aae45bcfc400fa0c61e3938d SHA512 ba044cd21d4c22dd6bf1a93a17579f2bc5f2b9198e40331486772f4fcb81a1c0179949a162e5a1e332f49cd833ca773cf27c1592966e94afbecd8b4d0728c24b
-EBUILD gnome-backgrounds-3.24.0.ebuild 471 BLAKE2B 1663953d7c6de873193b5055fdc99ccc130ece72462c30c161ec7a89166693080337e6269c6c3787643c61b9e1099a0bb8027725d0a4441ab5301f2b46f212b4 SHA512 fb99037fea4eb191e784996e24a8484e81a770e6eb038c442017f0176fcbbabae65fe777a532c74fe73b259ef962fcaa4f408325001f526772338958421b638a
+DIST gnome-backgrounds-3.26.2.tar.xz 19289360 BLAKE2B 757ba9a77d81f3cb5fe80df37f1377770cd6594d5e8127c8e2e05e90952d755d25be6e7896a3c737cbbef84f8f8f63f7a88ab893ff3d78e472fd3b156d849c8b SHA512 14970e3c87a94a503d5a260304e100e64ea76fdaa5fc5c7d5b1c35444f5f4046abc95041c57bf31350aed4de37c6aaa80fd3d2905a52881d93c49487dd868791
+EBUILD gnome-backgrounds-3.24.0.ebuild 498 BLAKE2B 34d0aefb8c17a481d48315b19e356ec2cca85bb8c47e5e9d5a6cfb5ab84910cc8252df3515f8f35e4908af2a911b2177ce1e861ad7f961d13fada162ac26b795 SHA512 f9b18ff4c8bcf023d7d16f2b1a89be55da6c95fee07acb1dc1cec96db63d71a5e7f4f00e0d80b4b016436def6d3ee86de9496c315b4ba6f50c8cfe9341c29519
+EBUILD gnome-backgrounds-3.26.2.ebuild 478 BLAKE2B 0d5db8537aedb8ea2237ea798c4f2967386eb537f31d187932563a6c9e5cdcbe8b6eef65a0c9ac4e50cd8ec9d8d4637d0da5c45b753b5b53725ee173071ef083 SHA512 62a0224b9bad42f8fca5c2810ef4aea8a88c911adaaf51ee99acb108454558aa6cc09a5a3979a93d75881f2f30b1605e4d39221a13047708c30841aff89e2094
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.24.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.24.0.ebuild
index cc430be80293..5b601d7fb92f 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.24.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit gnome2
 DESCRIPTION="A set of backgrounds packaged with the GNOME desktop"
 HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
 
-LICENSE="GPL-2"
+LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.26.2.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.26.2.ebuild
new file mode 100644
index 000000000000..05cd98be6293
--- /dev/null
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.26.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A set of backgrounds packaged with the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
+
+LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="!<x11-themes/gnome-themes-standard-3.14"
+DEPEND=">=sys-devel/gettext-0.19.8"
diff --git a/x11-themes/lxqt-themes/Manifest b/x11-themes/lxqt-themes/Manifest
index 994807ab25ec..ea4e67fc87e1 100644
--- a/x11-themes/lxqt-themes/Manifest
+++ b/x11-themes/lxqt-themes/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-themes-0.13.0.tar.xz 3203740 BLAKE2B 4dd461e576d2c9231b856dcec39c88098f0058f76bd61fa489bb77aee56f13d7407f17de6d85b254c8d80bd9893a177dc7b6a236d307895f0b12bd7b1dc4b372 SHA512 d246719a04b9247e099a19f8ce1b3d27a2b8c4b57266043fe219daff796014f963b65f50b73a4115badf4901a7b2bdd145f0518647ced45a5857f5b859b14081
-EBUILD lxqt-themes-0.13.0.ebuild 550 BLAKE2B 033d2c619c2a3624a7eab63eea2c85721c44b5c87ed25eb058f5c9e8b1589c4a76f48d357213abda653c9c7b9591ed0e958972e47f58ba3018f0c6ac75ba4ecf SHA512 ae750d36afb273b5957edc2470e4b28b331bdcfde49746325cf861ffe1ba4b4861d178ac67c2f10ac2e43e085cd924f5edcd95bde31a77112644c0d941e966d3
+EBUILD lxqt-themes-0.13.0.ebuild 545 BLAKE2B 5657915234ae348049050a2d60b9169c758dda2aeb0efeb73e110b0c177fc6d813b6ecb27aa5c02c9ce232e0259e732d48650db695353db420332c29b2ad44ae SHA512 134d9ad234c635477b37bdd844136ecbc9c9179db85ba7df649c987d11a8175dd2a5da49663d8757843b2c3dacc015787549bc9df434fd180eda45da0ea824ff
 MISC metadata.xml 317 BLAKE2B 5570995b3ad6a8fbde584e6ec5d9d0e09e6000313c1b7e1caaea7fc36aed93f86af522fd4ce0ace8ad764135d7d07a3c3a27b97e8144c915a9d3621f53e77c3f SHA512 7ac9d03d1f2248513ae60d61ec213d18ac6757f66924d0273bf93f9c47e6b32a5f05d393c4c92484c59b23d7ddb8f4fd915bc31e45885bef91f44f6a9cabad41
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.13.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.13.0.ebuild
index bb2aebce25e3..a926019d9f9c 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-0.13.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/x11-themes/numix-gtk-theme/Manifest b/x11-themes/numix-gtk-theme/Manifest
index 0b67c0947329..0f8287a89667 100644
--- a/x11-themes/numix-gtk-theme/Manifest
+++ b/x11-themes/numix-gtk-theme/Manifest
@@ -1,3 +1,3 @@
 DIST numix-gtk-theme-2.6.7.tar.gz 156607 BLAKE2B 0ba8476ffa6e94b83412a76fd7a7c9b17453e886f4c1168cb663cb780e3b9e8cf238f06c04b979d6847eb932623fc59eb8d8736293735f11d23cad1dbb4017dd SHA512 a034644a08173e70de496b88b40c8749d3c3dc988da0c09a03eca77a5263704b001114678e0492988831b1664593d4054f2d7c0d90d95f5b05dcd05914577a03
-EBUILD numix-gtk-theme-2.6.7.ebuild 543 BLAKE2B 6f5ee2b38140fa6dd4c1785016592163a3f70b6c0a91101c825071e65dbba5c4f3b3fada47c013691edeb8ee55bf56ff2b2ce7a34d4bfbe824215fc212a66927 SHA512 88c11d26624a5dbd4ed68eeefd49b286ec2910eb4d3d96fc5b502ffc0f468a9a372bf50fb12818c7b57c6c42fae9a431fa22d4f189be34637cd3124448b25e6b
+EBUILD numix-gtk-theme-2.6.7.ebuild 546 BLAKE2B 44a3f16d58d715d85b81c69a65918272e27983301bb394546190f2f091996d63d0259d148469118e5d31734bccfd7ff96e0121a0d528a249c3d8b22e277ff9b7 SHA512 0661ba521b5a9d6e933c2d46d0b9937d39feef8a2df2da147108091dd2cf5b1186a8a7a87e245818d2211bdecf37f95838beeb65ceae8629fa250f6b1716f3ab
 MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/x11-themes/numix-gtk-theme/numix-gtk-theme-2.6.7.ebuild b/x11-themes/numix-gtk-theme/numix-gtk-theme-2.6.7.ebuild
index e2db2a61e1b6..9f2ff52cfbc7 100644
--- a/x11-themes/numix-gtk-theme/numix-gtk-theme-2.6.7.ebuild
+++ b/x11-themes/numix-gtk-theme/numix-gtk-theme-2.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,11 +11,11 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-libs/libxml2
+RDEPEND="dev-libs/libxml2:2
 	x11-libs/gtk+:3
 	x11-themes/gtk-engines-murrine"
 
 DEPEND="${RDEPEND}
 	dev-libs/glib:2
-	dev-ruby/sass:*
+	>=dev-ruby/sass-3.5
 	x11-libs/gdk-pixbuf:2"
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index b7e8a97d51db..2b5f786b43bf 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -2,7 +2,7 @@ AUX qtcurve-1.9.0-build_testing.patch 1241 BLAKE2B e4a9c8d947bcb129ad6f532962849
 AUX qtcurve-1.9.0-rare_crash_hang_fix.patch 9205 BLAKE2B 30f40705b238d390f05a7c71ac44ae94fabccc66a56c97f280a28b44b4ee1e1f8dc3c1fe41aa0df2ba9690f725e1535557ede6c371f7af87eff17d3080f85d85 SHA512 dbffea87cd3e88e2c06bb7fb6a0e684e3e8bc3e58e841cba8838acf3ca9624364f40b74b05ea827706cb386d53b1fd298152a6f758c349a2fdac7efafda5d2f1
 DIST qtcurve-1.9.0.tar.gz 801675 BLAKE2B ed8d490b6e00e527f7da62c1fb676072ed3d75e50e14ae57e7807e7a9bd37f10a7b6b29e062ac05e02507c19be13ac3d003ea240fd00cff27bc74938a216a3e0 SHA512 a158f0880a2dc657e5f14366e046b18f0fe9d9983d1e1b243417f26987f6e69612c83f8b69293ae9036361adf67833b296564750f0f4cc0f405604f628dbff66
 DIST qtcurve-1.9.0_rc1.tar.gz 800845 BLAKE2B a63049086d967bb755d4f071ac4a5058a679d4d2914855b98e82763cbd9a22cdc6d75afb6ddb15b7e24a55e8e248b8df0a5cb517fc9be7ef3b07881448c2b5be SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e
-EBUILD qtcurve-1.9.0.ebuild 1940 BLAKE2B ed736138e4e148f4aac0d8ec5e5982d16c15f3a008a6970e08849f9d45582b60de2e8690991ef5974e99c6f9810060d2616e3377c3dc940b5eaa398cd44fec57 SHA512 c26975371d232e637b2104eebf8146509a1e293f719595b8d17e3c5368e6de3288cc40e60f6d733be5c78e1b1d39e1b7260125fbaa834c8600ab19b4f52e96f5
+EBUILD qtcurve-1.9.0.ebuild 1935 BLAKE2B e3fbef80435438375bd6fb9f42dffd57e3697b4a024c0dd339cd684b84a95f5b584be79cf311b95db5b15e8c524f870f19e5c38c8b7a3a984212b258c7f7529e SHA512 937d89c004588ecdb4dceb6657b7d79684dfa7ccdfb8693269cbf4816b291a35f0fbb2395086134ee8a1207b00ad601fe53aba137feac25170fd292dac8f9bb5
 EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1987 BLAKE2B 2f321fbfea11cba255d14d59d5211ab27e44d95fbf5107b0cad998bd799835a3ddaaae0ed0260e4a6223958fab7d6885681647a49984c6227e77192c46ef66bb SHA512 37e08003b638b27d36346d05bd19037af1f7d53c0e5d12a0de2a0341e602d63b89ce64acc4527adf2bd44babeb9adb57cb7b10ac6ede60c2133c5b801b9c9539
 EBUILD qtcurve-9999.ebuild 1939 BLAKE2B cc64e737f57f494291cc957c4e23dbbf5f0c034f01f9340a77934f84cba43b8352e8d004889b344a7821aa3db3eda1bb8ca5707b9bea2044c41810cd8489794e SHA512 9ff4d5abf4d4d53136f4fc38b780ebe334a91d11eb2f334f4d1081844ed4012263d2ca70650375cef32721b743d9c48927a39f9fa4ca0ab43768b88757e502a6
 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
index 3d7024de6a83..cb783404aa59 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE="+X gtk nls plasma +qt5 test"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/KDE/qtcurve/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 4f9677aa880d..c94bb6d2205d 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index a39f89eb53b8..97fd083c6ee0 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -2,5 +2,5 @@ AUX ctwm-4.0.1-m4.patch 600 BLAKE2B 119ca96ba88e694d5a8269c67869e3185d15701dd9c3
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7 SHA512 8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
 DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40 SHA512 445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
 EBUILD ctwm-4.0.1-r1.ebuild 984 BLAKE2B cba23544d81b5cc2eed545e11147302ec6cdc34d3da21e7ae1ba1795757eef3e213e5345a4bcd07a7cf725fb0401129e8eec968b63cf2dc9a2428ab6c80f2f98 SHA512 b5b2d3782bec877df729a6c516bd2c1c3bb852633d38796f14978e0321468cd691254408c9339ed712ed85f61b2622b5863064286c05bd45b6b2ea2ec2a956af
-EBUILD ctwm-4.0.2.ebuild 884 BLAKE2B e30e63758298128dc9abe7ceddf7bce548bf3cb5a797b3db017ed2863ca25df1986945b011925000f711a3a7ada2f4c545754eb96a02f52e7b1639fccf5c01fc SHA512 9948e749e0714e05d3b808a6d79031cd36697b62bc45d6f7fb51c625c1333c1b26338950d5c76c7253d0ebdf6145680e33a48ad176fcccdf8c81767eaa7af239
+EBUILD ctwm-4.0.2.ebuild 878 BLAKE2B 4bd7b7a394707aa325203ce972947e1a2cbe88de61faf436773b2c464ccba2164b2e7865c591656cbbcde9485152347f9b75f67be6092ae727a4bc4bd73b90b6 SHA512 a2951928b6cd49fe015a20d696e58415271c68658b6fb93036d7a1ce85d96ff40fdbedbad14702eea6afca75fcb74f182c526bc1b2412ea957aef837c655e075
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
index d4278854c5be..7160731c35e1 100644
--- a/x11-wm/ctwm/ctwm-4.0.2.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index c67e327bfa81..6220cc7eb8b5 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -5,5 +5,6 @@ AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017f
 DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698
 DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
 EBUILD fvwm-2.6.5-r2.ebuild 4793 BLAKE2B 10d28f244881fd41ba3ec89b36b25cffad5bb33daf609cfabe8f159a61307c4704c4652906a330c4df8f185497a3b5d288b2938707b8477683ae4abcc349ffcf SHA512 f30727158ce0f7962963396efe10c8b860516ef7413e9a10da1247d850f8ab3b2968860f1b7b45e5041fe045a6c51597c8bfd16575856c7e3d8665ffd0c43da5
+EBUILD fvwm-2.6.8-r1.ebuild 4081 BLAKE2B 49cb162bd5f249f556043369657e895c4e7a39759936e223531b873539effe9690d7e23b1a9937abba673f65878264b80b39568e56a53d65592b4a255d83f561 SHA512 cf138e0c8477d0166b8b9695c218e277d52ed1ed80b1d07bbe0071014dc1fb7b4018026c86de03302afdc6709645a47d149f247dbc9820d91c50889ff6103053
 EBUILD fvwm-2.6.8.ebuild 4030 BLAKE2B 34e314c8d5eec26e851bc6590b33814ab9d7cc4902a000c92f782133f48fdae50c67916cb93f39adf26cb73b5e767ff4c2479abdb9fef634b629ebf488e99877 SHA512 03e7d5d30383bd81c533a642d92fc78d8ce5e1ed9db11859c5c3c24b8b035e1eb2343dade1cb5d87500e87ab568aff4713dec8b0fc0c3e72bc1e9bfcef867f9e
 MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
diff --git a/x11-wm/fvwm/fvwm-2.6.8-r1.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r1.ebuild
new file mode 100644
index 000000000000..ffbb42db076a
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.6.8-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic desktop
+
+DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
+HOMEPAGE="http://www.fvwm.org/"
+SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 FVWM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
+
+COMMON_DEPEND="
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/libiconv
+	bidi? ( dev-libs/fribidi )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:0= )
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+	stroke? ( dev-libs/libstroke )
+	svg? ( gnome-base/librsvg )
+	truetype? (
+		media-libs/fontconfig
+		x11-libs/libXft
+	)
+	xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	perl? ( tk? (
+			dev-lang/tk
+			dev-perl/Tk
+			>=dev-perl/X11-Protocol-0.56
+		)
+	)
+	rplay? ( media-sound/rplay )
+	lock? ( x11-misc/xlockmore )
+	userland_GNU? ( sys-apps/debianutils )
+	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( dev-libs/libxslt )
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# Enables fast translucent menus; patch from fvwm-user mailing list.
+		eapply -p0 "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
+
+		# Allow more mouse buttons, bug #411811
+		eapply -p0 "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
+	fi
+
+	eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
+		--enable-iconv
+		--enable-package-subdirs
+		--docdir="/usr/share/doc/${P}"
+		$(use_enable bidi)
+		$(use_enable debug debug-msgs)
+		$(use_enable debug command-log)
+		$(use_enable doc htmldoc)
+		$(use_enable nls)
+		$(use_enable perl perllib)
+		$(use_enable png)
+		$(use_with readline readline-library)
+		$(use_with rplay rplay-library)
+		$(use_with stroke stroke-library)
+		$(use_enable svg rsvg)
+		$(use_enable truetype xft)
+		$(use_enable xinerama)
+	)
+
+	# Non-upstream email where bugs should be sent; used in fvwm-bug.
+	export FVWM_BUGADDR="maintainer-needed@gentoo.org"
+
+	# Recommended by upstream, reference ????
+	append-flags -fno-strict-aliasing
+
+	# Signed chars are required.
+	use ppc && append-flags -fsigned-char
+
+	use readline && myeconfargs+=( --without-termcap-library )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	make_session_desktop fvwm /usr/bin/fvwm
+
+	if ! use lock; then
+		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
+	fi
+
+	if use perl; then
+		if ! use tk; then
+			rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die
+			rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die
+			find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; 2>/dev/null
+		fi
+	else
+		# Completely wipe it if ! use perl
+		rm -r "${D}"/usr/bin/fvwm-perllib "${D}"/usr/share/man/man1/fvwm-perllib.1
+	fi
+
+	# Utility for testing FVWM behaviour by creating a simple window with
+	# configurable hints.
+	if use debug; then
+		dobin "${S}"/tests/hints/hints_test
+		newdoc "${S}"/tests/hints/README README.hints
+	fi
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/fvwm" > "${D}"/etc/X11/Sessions/${PN} || die
+	fperms a+x /etc/X11/Sessions/${PN} || die
+
+	dodoc docs/{COMMANDS,DEVELOPERS.md}
+
+	# README file for translucent menus patch.
+	if ! use vanilla; then
+		dodoc "${FILESDIR}"/README.translucency
+		ewarn "You are using a patched build, so, please, don't"
+		ewarn "report bugs at the fvwm-workers list unless you are"
+		ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
+	fi
+}
diff --git a/x11-wm/larswm/Manifest b/x11-wm/larswm/Manifest
index 58463d11b78c..1f2588ab4934 100644
--- a/x11-wm/larswm/Manifest
+++ b/x11-wm/larswm/Manifest
@@ -1,5 +1,4 @@
 AUX larswm.desktop 125 BLAKE2B 15556dde41d8bbec4649e946a0cc8113fda06d667bb0c85691964af2513e32a36da0e0ce5bf979c212f295e4305b3fae202f62f883c459b297516facc66547db SHA512 033ca80e83d928eca524c0a5473f2776f363ff301442a7a7c3f34bb99bc61af8a524f6bf39ee1d6282ce5f732bd1fd7b0b242ad4909063496c4c6965becd7b43
 DIST larswm-7.5.3.tar.gz 84505 BLAKE2B 4548f8d757b8dc86f8bf545bc45b09f8b934792fea2a9a49d905669b767b453d007b29923fc0d7c9b4bd744f8c77e72652388bb66f51658846699d6b517f40d5 SHA512 7c99aadcc419f695b55bf0ea2f9833757c06f6ba0f00ae58e1db6e38df70bf944bac44834418bb52188d844722a7ac3c49388280c649ede073a74c21572cf3d4
-EBUILD larswm-7.5.3-r1.ebuild 1078 BLAKE2B f8b14cf87f046a374f7e0eb58d6f2ffebfedd2c67509d371bb08d28ddf92f8a1431d1516707715f67b81979ad47d1f5acb85183e70c2f7a411d950d81afd663a SHA512 da3268fd8b1ab4fb827cad6c574431ddacd5c6072a44b382055ea627515d021cc676baefb0a2cc5f75d24a41f44a670bf44454f717589f402932319385cc7cf2
-EBUILD larswm-7.5.3-r2.ebuild 1062 BLAKE2B 264987fd2b95cfcd219324818449cdf4ffcff9a2b6cb2c9121471bf63c79dc3b459224a8963e520d557953aaae50a8e7889be1b02ea4d267c3ba83dce6b7640e SHA512 b97af0e59075b108afa05d111bfe06179c22a3da3f734653c0c8926b1996b02323476722c406e9f48324fa95dab9f118035e59c2fe87296853575fd2782195ef
+EBUILD larswm-7.5.3-r2.ebuild 1057 BLAKE2B a7afdecda207c950831fcf873c551929168ed37735749c62affc636cbb682c1e8f5bc708467f5944190418865d88f2bc9ee457819549b166c4c823b026caaf56 SHA512 c17d3d863ed37be157893696f03d1eaaf9dbfc5d80ab50640e95dd797249ab9d1e790357c7800e68f628ee73e9f483ac9f8e5c6f3b1d8915fea2cabca6a865ea
 MISC metadata.xml 605 BLAKE2B a55956469773e235d3c3bae88bcc826689fcc80aad5b1cfbf36908875253a0ce4728cd1a8692bd91c551e1cc1c2c5aa293a5339beb27799c5fa8d5fcf94438c8 SHA512 5c777d2c54e8cbe89c8644cd68697e1da2049c75a450cd6be085fba62bab7d56a8b4a28850330599684dfe9c9725977d14f8de1e52e624911d5c5c7088acb29d
diff --git a/x11-wm/larswm/larswm-7.5.3-r1.ebuild b/x11-wm/larswm/larswm-7.5.3-r1.ebuild
deleted file mode 100644
index 6c4d029b86c5..000000000000
--- a/x11-wm/larswm/larswm-7.5.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tiling window manager for X11, based on 9wm by David Hogan"
-HOMEPAGE="http://larswm.fnurt.net/"
-SRC_URI="http://larswm.fnurt.net/${P}.tar.gz"
-LICENSE="9wm"
-
-SLOT="0"
-KEYWORDS="alpha ~amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake
-	x11-misc/gccmakedep
-	app-text/rman"
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		|| die
-}
-
-src_install() {
-	dobin larsclock larsmenu larsremote larswm
-	newbin sample.xsession larswm-session
-	for x in *.man ; do
-		newman $x ${x/man/1}
-	done
-	dodoc ChangeLog README* sample.*
-
-	insinto /etc/X11
-	newins sample.larswmrc larswmrc || die
-	exeinto /etc/X11/Sessions
-	newexe sample.xsession larswm
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/larswm.desktop || die
-}
diff --git a/x11-wm/larswm/larswm-7.5.3-r2.ebuild b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
index 84b61cef262f..e3ae4ba69ed7 100644
--- a/x11-wm/larswm/larswm-7.5.3-r2.ebuild
+++ b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fnurt.net/larswm/${P}.tar.gz"
 LICENSE="9wm"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc ppc64 x86 ~x86-fbsd"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
index 4ee581955458..541ca3571592 100644
--- a/x11-wm/treewm/Manifest
+++ b/x11-wm/treewm/Manifest
@@ -1,6 +1,4 @@
 AUX treewm-0.4.5-gcc43.patch 568 BLAKE2B 481b948412109a7febbf97dbab7681b7ff33c3f603885755103cff663288b97925d8122ee3eb18ce2b0c448830c73b92db4162c02c992781f9ee07955e925de5 SHA512 db7bede71787693a561072ad2fd89a8a5a9c46918d4f98021d587ec447318adaf76235db189990597eba36db44f720b5ab486ee7b4aae529fb0a4fed26eeebc4
 DIST treewm-0.4.5.tar.bz2 87098 BLAKE2B 4ec890573aa32fafef99590f12b1e5491759ece65347339654844f077e9fdf794a96322d62066196eb3c50be271e8f16e842344a755411f3914a347b8cf2835e SHA512 96eb8eec11cec992daa4492b5a9243db5cc80b23d3827169d223d81b9ff289b62dbe6c8c3ea9da5da2e32435d98cc4552038c26e975cddec795de3b88f9db9cf
-EBUILD treewm-0.4.5-r1.ebuild 1599 BLAKE2B 904b4cada4b8c3be319caaee79be8f3b3b0454a7c565877ddf190ac10d35514e74c0a98b1f6040ef50aefa0295b853acf610d243d592592a64bd427a6b4a17f7 SHA512 539d70320dfd4aabf552e9ca89e0ec19ffaaf8c362a01a82d33cfc02ad33afa4468cd7cede0d760b5ebbf9d54a60244c299254471d353c24de6fefec02581d9c
-EBUILD treewm-0.4.5-r2.ebuild 1589 BLAKE2B 78a64ae7946970acf37a9b7820c812f6bcb35d6dfb537a5ce31b087cf14e454415e20cf7435c0ae28d0db880941d2a48a9d42968fd37dbe7f3c5f27c7648dffb SHA512 a40275d30c81d01fac01cda23e83c724c46a6dac289fa181d508d7d813b68edfb4136363cbfb6b667cbeb459d28f9c6fca02aa7c7995c537e7784497853f2492
-EBUILD treewm-0.4.5.ebuild 925 BLAKE2B fdb77850da3956c010cdc3323eac63f44d128a986fd5d740891deb6ca90ca96eb18d27a296385bc651adb44dfdbc0a9c53075e26c4296d9bfb7b0918ea18ecb6 SHA512 08d4c32998543e58c3dc3afa4b4c41508c5a6bec8ead513d230b32cb8bd3773bcdbf71b5759de0021d1788ed8c8cee970c4e44f750cc01020a4fafc6319fe605
+EBUILD treewm-0.4.5-r2.ebuild 1583 BLAKE2B 9ea87f10c0b815c46c000791b3cbb673b60e8d3a1568d5be33e59d9d69df02d900800b1fa1350a1d21bc558c803bd9d925426c32fdb5decf829a58322bee7e7b SHA512 d83150b844b926dbf4c2531f1715facc401ef6abee1b5cc4d2c74f8cd2ff9b63b73d6d9ec738395ec68f4787bcfb7ed9d50deea23f7db89a80298d86edb11732
 MISC metadata.xml 436 BLAKE2B 666d6583ce2dc47607e4e99557a889d765cd2436131ccba2496e4ea00e9d288e943e4b8aeed2bf4645671baa6911b5063c41fc65511bd854c0dd008b9ba65ba3 SHA512 cde7c7c0dadb71cb58c15a2fa7efb031fda246d1464bebb476c4a02c64baf1f90a03198b82e1188ac83b36eb4778e21595335bce5af14beb1cf20de4b978b7e8
diff --git a/x11-wm/treewm/treewm-0.4.5-r1.ebuild b/x11-wm/treewm/treewm-0.4.5-r1.ebuild
deleted file mode 100644
index 7c71b8f47a2f..000000000000
--- a/x11-wm/treewm/treewm-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="WindowManager that arranges the windows in a tree (not in a list)"
-SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2"
-HOMEPAGE="http://treewm.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake"
-
-src_prepare() {
-	# bug 251845
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	# bug 86453
-	sed -i xprop/dsimple.c \
-		-e 's:malloc:Malloc:g' \
-		|| die "sed xprop/dsimple.c"
-}
-
-src_compile() {
-	# only compile treewm, not (x11-apps/){xprop,xkill}
-	emake treewm \
-		CXX=$(tc-getCXX) \
-		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		PREFIX="/usr" ROOT="${D}" \
-		|| die "emake"
-}
-
-src_install() {
-	# only install treewm, not (x11-apps/){xprop,xkill}
-	dobin src/treewm
-	dodoc AUTHORS ChangeLog PROBLEMS README README.tiling TODO default.cfg \
-		sample.cfg
-	insinto /usr/share/pixmaps/treewm
-	doins src/pixmaps/*.xpm
-}
-
-pkg_postinst() {
-	elog "x11-wm/treewm used to install its own versions of x11-apps/xprop and"
-	elog "x11-apps/xkill as treewm-xprop and treewm-xkill respectively, since"
-	elog "they are assumed to be broken in combination with treewm. Since"
-	elog "X(org) has become modular since treewm's last release and are not"
-	elog "installed by default, we can leave those out and simply point out"
-	elog "that it is NOT adviseable to use these programs when using treewm."
-}
diff --git a/x11-wm/treewm/treewm-0.4.5-r2.ebuild b/x11-wm/treewm/treewm-0.4.5-r2.ebuild
index 751b8b2fe249..78121114220c 100644
--- a/x11-wm/treewm/treewm-0.4.5-r2.ebuild
+++ b/x11-wm/treewm/treewm-0.4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="ppc sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-wm/treewm/treewm-0.4.5.ebuild b/x11-wm/treewm/treewm-0.4.5.ebuild
deleted file mode 100644
index 0351757d1ac3..000000000000
--- a/x11-wm/treewm/treewm-0.4.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="WindowManager that arranges the windows in a tree (not in a list)"
-SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2"
-HOMEPAGE="http://treewm.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
-IUSE=""
-
-RDEPEND="x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXdmcp
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake"
-
-src_unpack() {
-	unpack ${A}
-	# bug 251845
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	# bug 86453
-	sed -i -e "s:malloc:Malloc:g" "${S}"/xprop/dsimple.c
-}
-
-src_compile() {
-	emake PREFIX="/usr" ROOT="${D}" || die
-}
-
-src_install() {
-	make PREFIX="/usr" ROOT="${D}" install || die
-
-	# hack for Gentoo's doc policy:
-	cd "${D}/usr/share/doc/treewm" && dodoc * && cd .. && rm -rf treewm || die
-}
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 8147e03ce07c..f3c034c3c0af 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -6,4 +6,4 @@ DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449f
 EBUILD windowmaker-0.95.7.ebuild 2928 BLAKE2B 4de4877dde6b7fbb16d8c2cbbf7285a9214f2352a200baf261eb891f1f23ecd5389b079735482448fa6c4e2804bab2139fd3ebcbf293ad88786ff30a7e0c91a0 SHA512 3b79d3e51efd6707995d4a327b3cc720f3ad668bc990e4dad801ab38f9fdc15efeb1f90819c4119e365d2a346378a009001326679e18cb78a26da11b0c08d0b4
 EBUILD windowmaker-0.95.8-r1.ebuild 3073 BLAKE2B 3a3f5e06b09699353e363e3ef4eba698a1340365039701e63985fad796d2dcf17b41ed1b085ee6bde10d6c021c46b9d80fe2ad9de3b3c60d52169ea40cc62d16 SHA512 ec185f8d7650ddaa24453acb256cc845761fc46fed32f855b12b23e27c3b59d4413e588fe5926ca0be71060157808804904c204a71932f4f68f8d7f128cb28fe
 EBUILD windowmaker-9999.ebuild 2956 BLAKE2B e427220753263ee20a1cfc6eefe114ff8f9db8f51faf7acd111c6729c246cee0c0479c94fa7a6d8e5d80a25474885e5a7c9f695269274a43210dd44523424793 SHA512 f4f33e43b2bff957a446586e650c3a0f0c86cfbb288295fe80304928404635ad83a9ab354143589081324c621bb78d864136f0fbfdc4e2d0b068f637fc03bc4d
-MISC metadata.xml 587 BLAKE2B 6480b551cac2e643a59a9c80e66ad6db4168e992e409dea260297275e9460edafe6d9e19daf0bc75c22d2d0ffe4b43d91dc8c5630a26e68a48a1ceb4c50ae4e2 SHA512 6c84dc7cc81239d8acee4b155f91855a945b532e20c5c5d6a51fb1c85e2150f2b8013203112b9f87f8e72b888175b3e16885fb5ff81a5ada414ce2e556957981
+MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml
index 1cc63f50be9a..3f4061e7a525 100644
--- a/x11-wm/windowmaker/metadata.xml
+++ b/x11-wm/windowmaker/metadata.xml
@@ -10,6 +10,5 @@
 			says: "If you don't know what it is you probably don't need
 			it."</flag>
 		<flag name="xrandr">Enable XRandR window extension support</flag>
-		<flag name="webp">Enables WebP image format support using <pkg>media-libs/libwebp</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 6ea7c724732d..7ddd8da58ecd 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -12,4 +12,4 @@ EBUILD xpra-2.1.3.ebuild 3931 BLAKE2B e140452157211b386f97ee56e01a410bf332b770d4
 EBUILD xpra-2.2.1.ebuild 4090 BLAKE2B ab05de6287b29e3928fba97f27a6637bf83506d8464859b10c7820278c99c5a5354c30be95c32e164c116e88533bdb1afe192cd5521ffbdc2047f73b9170892d SHA512 17d9f938b7d3958a77dfabc519b696a6706722927ebfbbf39b7bda327539a1b789bb857fb86a7bb3f1890a290daff4ee153fe4167b94fb0d861a65b2198c397c
 EBUILD xpra-2.2.2.ebuild 4088 BLAKE2B 8e0fe8bc971767d2f09bfe60b07673afca82f2861aa3f9e9018230d4f5a6f6986b51dd9019c5fb592980633a6145eabc0f48ef12fe58b9419edf43fa6d6c17f9 SHA512 24379373b72e3e812c3aa3956adf322e527a2c227ec563200f4e94840dee432d0fd9f0cb79bfd2d7afc5b0c4df75a250ae71b5d06846c500b6b787926d511d7a
 EBUILD xpra-2.2.6-r1.ebuild 4136 BLAKE2B a8a4f2360dbd12c012ef3645136c24187a45bf09fa1b8f514da2f106debb813e4b1f83d5299f036764f4fe1220bb80a8501edf3f3fa442713ee5c0a20d19654d SHA512 3ab2f8b5a3d028be3f5f66c76e834dffdd703f8dc4e5f3029a006d8e21e223950a8214a3dad4abce28222c4122622011f748ba31a3d6685bf583357421c18f59
-MISC metadata.xml 1087 BLAKE2B d8378019afa40ddee2d56f31ac3482374a018dbd2294a9163b2e85adbdb65b46d49872948cfc95915d0f1b986266be9c088ba5daf85ae74b9bb76275f3175b10 SHA512 8bf4ba96000fdf8b0c66d655194d4e5bf2f41f3e06754a7411cf5dc9c130d80519419cad73fff69418d01ae59db07b15aa96acd4ec4581958c22572abec6031c
+MISC metadata.xml 1028 BLAKE2B 125d8c5e383c543817024a58996fe8108a0e019523f4a44a4bb3fb16cb01b380fa724e8b8fb3d15f38bb7fd05c5937a2021dbec94b5253fb76727f65e7e78f9c SHA512 23fcf8d7e15b0f6b45de40b91d1c8a55878aa548448475a7e29a49ae978353888008fab214f7eb85e5ef097c3ea13476c624619e23e017f9e56849fb93063566
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 4e1ba55af217..d8680e04081a 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -20,7 +20,6 @@
 	<flag name="pillow">Enable pillow support</flag>
 	<flag name="server">Build server-side code</flag>
 	<flag name="vpx">Enable vpx image format support</flag>
-	<flag name="webp">Enable webp image format support</flag>
 	<flag name="webcam">Enable webcam support via opencv</flag>
 </use>
 </pkgmetadata>
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 9c3b9b452b10..59024b771597 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index e46aed78c80e..ee1c7d3e323c 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,5 +1,7 @@
 DIST exo-0.12.0.tar.bz2 1310691 BLAKE2B 6acdfe0b3cf7b19717d17c4acc7973bc8e27e963b4213376061cee0bec72734303ed75b7bfd8d8cbe1da98af4a9b43132657ade0020f9d26add36aa77c184ff4 SHA512 8ec52aba3faa9728bb60e09cf696f772160bfd8357c06015a6d72a2302572e74389f78a20addcf3ac632a3ac84b3ee2f40750483a16e2f7e1cff7de6f7aa2692
 DIST exo-0.12.2.tar.bz2 1321379 BLAKE2B bf17b8dfb6489b5c168893599e67bac603e6915e78930d0d460e94d23a60b53e720439653358c2566083a3773cd5bb898da5210200a2c6dfac7ca9b730ca4aaf SHA512 771c4e3c09683ccf2d028a5203d4b2af0da38e6ae97baa7825714ad6e2e81d128d9238d060cdd80c95660a0394b632caec3e31df1f2cc28b1fed8ef19ee2011a
+DIST exo-0.12.3.tar.bz2 1233053 BLAKE2B 27cb6041778d5b0c93002f474d96d3a0ae9b02d651d3be047eb0e3d1e6640614c457fbac7557216c46b28008bca3f3be674e29e8be48243b6bf15917bae0c907 SHA512 1a727050b822aa4bdfbce22c1668372b10ddfd9c3988f6949ee32a5c5213d90e20ebafc923193c70dea373d217994fb42101fe2aad7bf55c8e81f983c5a2106f
 EBUILD exo-0.12.0.ebuild 974 BLAKE2B 41181a6cdeb7163c0a85dfca00214b9f4234a48b93264fb8fe284a3a86fff516a1286b0a0045389f5e2e76fff364d07011f82c54d54bde844823157870ed1b99 SHA512 3e6cbbd1e1ad33c5b0dca9013bf449a3ce88a11a8aa9b278b65e3bec6eb8b7d8c56a81dc29e4057a38116adf9c8595156675385e6dc10153a076b4c31e5d2a83
 EBUILD exo-0.12.2.ebuild 981 BLAKE2B 2bd59fef6efbcbd3cece52cc786a273a9780cd494a449899afcefa9351f40ce15fff26d8c9b5d4f5c36816c8e42a19cc792cf27317a04f94f313d6850d443313 SHA512 21c17ba439953fb6b4456e9535723fcce794c8fb766d5b3cbb4e1be06c1e5556c0e627119f4a7f6c216c370beec67560118613648bdb013e673caef82fdc24fe
+EBUILD exo-0.12.3.ebuild 983 BLAKE2B 8d943d2e0d3cfb0af3e13cc8bec6c7205e7c44555b81ce6061848f2ffd1b4446c7135e6681abfa3ce8af9c64b055532e406130e87c2b760cee42b329d0194e38 SHA512 048c01308bb3207c295f7e21f27fba7e7e0b3250c61b8ff98f6febef5e27ba3ffb79bb02eed15a73cc603da250b3fe785e5b2e4dfd7532dd2aee6dc3d21fe37c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/exo/exo-0.12.3.ebuild b/xfce-base/exo/exo-0.12.3.ebuild
new file mode 100644
index 000000000000..9a0d73773d13
--- /dev/null
+++ b/xfce-base/exo/exo-0.12.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.42:=
+	dev-perl/URI
+	>=x11-libs/gtk+-2.24:2=
+	>=x11-libs/gtk+-3.22:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:="
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index c239ba681d24..df3f9f76039b 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,8 +1,10 @@
 DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
 DIST xfconf-4.13.4.tar.bz2 598700 BLAKE2B 05d4f7e360359e8d56b8a4cf6a39f22506113a758861fb730d9fb858f92554af3e28c49a21ceb246f8503087bec1032d430b16df999f7db22c56d3d3cb12ad68 SHA512 17c4c2ff4b02eef2d3040c21120e34863e4b38794d7670e42a31e4062a0ba0d4064d4239e8166a2c05d5d316773fdc96ae6098e78ab9b058b9c5a31f94c7f3dc
 DIST xfconf-4.13.5.tar.bz2 609549 BLAKE2B ccd5e907752d8fa5b5c4a7468c9eeec4083709bbe11b14ae79b20938e3b7c6ff097805be56b3f8cee146e2d0c0ffb272b856e559d1699c4e40d7c140fe7515fe SHA512 34e6b99be0b288707f8632c5fe4f2e66e01ec3950f4d194a7007afb4bc1cfe8bea44f8f80873de2364680481921332c9860b23bca4ced94ecb95c9199df5315b
+DIST xfconf-4.13.6.tar.bz2 578107 BLAKE2B 6348b536978d1d3f611783e530be7b694c46ad3030ed02e04a6e38122028068ec8392f34667e5d54a09d9115db191d6366619707e117f2b37f3ad8f14a3de2c2 SHA512 0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755
 EBUILD xfconf-4.12.1-r1.ebuild 1833 BLAKE2B 9bca9d31e9c753fefff39b9265b24cd21c6f1e6760c748f6074e96e930e665f138d5a30ee9443526d407321017417dd0d400909e73a438fe8ebbf8762e3d49d8 SHA512 0588601a0cd15eebc6405d6bb4b5a1cdc6dcdaf33b5cbe36313b64741563da57f068674e8367f1734cf61161bcbd02b60e87585a868b0eaf5e284273e3699dbe
 EBUILD xfconf-4.12.1.ebuild 1507 BLAKE2B 03e1ea51842ae97a8bace0626ea2057bec514205c8e08034d5728ebc66601596506a677dffcc15271896fbc6b77e10b0883f4fff2b0952a976e8a347b18f69db SHA512 d3d6c22b4cc9de16056580a81faddba0c1629b711a389ecbfbe10313273bfb2d558a97c06e39e546183580ed7525257fa791e3162c355e7ac5dde71154d8e703
 EBUILD xfconf-4.13.4.ebuild 1625 BLAKE2B 65367829873114f7b9990458fd85341a15f9e00c6ebace1bae53f3465dc534932c94670f2798aef0fb3190599dfd7b23e5242f79da696ffcbb2e75c74ee4b7ee SHA512 68d8c46f9a547588a713b9edc023e8889dab1ff69fdc7cd476c5ce9c0ab61becb9a643c023a5d66c05fed054e4abad69d5049b50c608076888214bb663bf01aa
 EBUILD xfconf-4.13.5.ebuild 1625 BLAKE2B 65367829873114f7b9990458fd85341a15f9e00c6ebace1bae53f3465dc534932c94670f2798aef0fb3190599dfd7b23e5242f79da696ffcbb2e75c74ee4b7ee SHA512 68d8c46f9a547588a713b9edc023e8889dab1ff69fdc7cd476c5ce9c0ab61becb9a643c023a5d66c05fed054e4abad69d5049b50c608076888214bb663bf01aa
+EBUILD xfconf-4.13.6.ebuild 1625 BLAKE2B 65367829873114f7b9990458fd85341a15f9e00c6ebace1bae53f3465dc534932c94670f2798aef0fb3190599dfd7b23e5242f79da696ffcbb2e75c74ee4b7ee SHA512 68d8c46f9a547588a713b9edc023e8889dab1ff69fdc7cd476c5ce9c0ab61becb9a643c023a5d66c05fed054e4abad69d5049b50c608076888214bb663bf01aa
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.13.6.ebuild b/xfce-base/xfconf/xfconf-4.13.6.ebuild
new file mode 100644
index 000000000000..39a35ac7568d
--- /dev/null
+++ b/xfce-base/xfconf/xfconf-4.13.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit virtualx xdg-utils
+
+DESCRIPTION="A configuration management system for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug perl"
+
+RDEPEND=">=dev-libs/glib-2.30:=
+	>=xfce-base/libxfce4util-4.10:=
+	perl? (
+		dev-lang/perl:=[-build(-)]
+		dev-perl/glib-perl
+	)
+	!<xfce-base/xfce4-panel-4.13.1
+	!<xfce-base/xfce4-settings-4.13.1"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	perl? (
+		dev-perl/ExtUtils-Depends
+		dev-perl/ExtUtils-PkgConfig
+	)"
+
+src_configure() {
+	local myconf=(
+		$(use_enable perl perl-bindings)
+		$(use_enable debug checks)
+		--with-perl-options=INSTALLDIRS=vendor
+	)
+
+	xdg_environment_reset
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake OTHERLDFLAGS="${LDFLAGS}"
+}
+
+my_test() {
+	local out=$(./xfconfd/xfconfd --daemon) || return 1
+	eval "${out}"
+
+	local ret=0
+	# https://bugzilla.xfce.org/show_bug.cgi?id=13840
+	nonfatal emake -j1 check || ret=1
+
+	kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
+	return "${ret}"
+}
+
+src_test() {
+	virtx my_test
+}
+
+src_install() {
+	default
+	find "${D}" -type f -name '*.la' -delete || die
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -delete || die
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
+	fi
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index ded5a83e4570..e4277f1d709d 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index 22c315a0c3ad..5a6fcf24fa43 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,6 +1,6 @@
 AUX xfce4-diskperf-plugin-2.6.1-majorminor.patch 2194 BLAKE2B 70154d161e60132b994dd279a1e5983e14f7786899f479042cc08a4bacbbf3677d46a9265863b59eb567cdabb433a67100f0ea6cbad12f90e0ba96fac6221d9c SHA512 167751a95d33f7a91a8a2cd70d444c31667ad30fa8f99b74f303f9edf699708511d0cdfa0830b07f08191ae4d1e4932cf3e350501e1ca809b255f0a1673d5406
 AUX xfce4-diskperf-plugin-2.6.1-sysmacros.patch 626 BLAKE2B 116648fa6b865abd4e9a1ec2f42cc6d3efb8c5f1380fdd197722a50206460573e3a4c6eeee61f3f1005962c36d1cbc8371112204c4745ab4c816a1c108f01d0a SHA512 d2e42cb9c5b430d20996ca912504bbce949c4153bff12f6be72ed6b73e891194ce2d1de0f3ed8e1cefca0d7740732a01e8dd38b522deb0b29ff6b35f32341626
 DIST xfce4-diskperf-plugin-2.6.1.tar.bz2 338723 BLAKE2B 4bf0fa9c741e3efe276c7b00f8997ee49611809f7a19fa8bbf955cff2218c2654924f1b5a324f9d659adc02d728e451e7565c5ce457ef4a99fababe89d7a687e SHA512 ba01ec30e31db0c936b2b18df7c68883f89c6c4d5b82392759c25ef41fa89de37e2e635abd169745a9790d81af5b327768eb62ec3cc369f85e2da0bedc4c7cea
-EBUILD xfce4-diskperf-plugin-2.6.1-r1.ebuild 1064 BLAKE2B 178b1cc2826fc01947c8bff95723b53f42aab15d2e777a19abdf1de3ab8ed1bca7396ac905f4313456f97fb524bbbd7872c5b244f314fb2d5062af2ac4297803 SHA512 e561fc89d2f69b82a52b5a49c3246403da81298e06b8cf998cc377c90a08c65fe20d9ee5a9eea04b115e575a3da6f5688f335381c03c06aea4c4ec6767f037f2
+EBUILD xfce4-diskperf-plugin-2.6.1-r1.ebuild 1058 BLAKE2B 32df565ba5cdebdd438d8278e26ddf1ac3ce5f9a50a93a4592d9ba5a7b3e7cda160ef8bbf5e5eacf3eee083d59de8be54dc68a897f4ebf910464afe85dc64493 SHA512 6b5a984d997d3bb6b48f2a4e172d465dc19434fbc836a7d9ac6212246c00a1f5ff890a5f737f47040026cc2dd949c3ef4a5a6fd0546bc828c2b2e81f479fc780
 EBUILD xfce4-diskperf-plugin-2.6.1.ebuild 1000 BLAKE2B 30a4dbe0665b1747a1a6dbb30abc353fde200732981796e57a5aa39b4592ab568c61c35528117ab67431b7cdf6a97b96263f37a6a20d0cd531df28db6c21b0db SHA512 33a01df02451d0f000351a3f4f41327a0b7f3a008a57aba4f5c5197b4a358aee9a0ddac9714bd707435f32fa87de337f70be669f172bbb25829053f57ce82b06
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild
index 6484f9ed6053..3d8b6c40f952 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
new file mode 100644
index 000000000000..55368bc42526
--- /dev/null
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -0,0 +1,3 @@
+DIST xfce4-screensaver-0.1.0.tar.bz2 525080 BLAKE2B be1b4add2f72cf7d93bcb651852bb398c38e7d4637c03d90ea277dc3ea50147e8bca9a870b8b5fe2353fd71ad180684214cdeb0e18808f3ced234f9a03b2bf13 SHA512 a925deada7313e3d156d4b19fd38e50538e2ac429c657f9f29b727c4c20ccd83a07dafdc4fa14fca26bcc09961ee42700685097260473a5fdec8877114a8a048
+EBUILD xfce4-screensaver-0.1.0.ebuild 1595 BLAKE2B 32f30569e00da8b078a257e6c1a2dfd5c7f9af435a3f00f06cb55ea27ca3ec09ab23dea8f8c34dc1c63229c12e5d67a34b203cc81dda88befda86e8290732f5e SHA512 f72a210038490c280299494a071d42056b8b809f6b6249a1628c7940dd8f57da42744e7239abde0a703c52018658d245cbe7a33eacbdadfaec080062963ba7df
+MISC metadata.xml 349 BLAKE2B b9a70b461f2064eeeec11db52c92d2e6b0a018dc4ed7ffb390f8ce72fca6c92802cb376f82e47a6b53bec0c1bf715e59cdea836dea514de05fb352279ff28407 SHA512 e655e51231b6f407bda45915fa7a9e1db53aa122f1609a1c4c78020ca7465ea13279bf6dc440d5d66de73aad42c1f20c4678f8100f0551211d9818618c356d95
diff --git a/xfce-extra/xfce4-screensaver/metadata.xml b/xfce-extra/xfce4-screensaver/metadata.xml
new file mode 100644
index 000000000000..f97bcaffd83e
--- /dev/null
+++ b/xfce-extra/xfce4-screensaver/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>xfce@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='consolekit'>Enable ConsoleKit support</flag>
+		<flag name='locking'>Enable screen locking support</flag>
+	</use>
+</pkgmetadata>
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.0.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.0.ebuild
new file mode 100644
index 000000000000..33e37d91f142
--- /dev/null
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
+HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="consolekit +locking opengl pam systemd"
+
+# Xrandr: optional but automagic
+RDEPEND="
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE:=
+	x11-libs/libX11:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXext:=
+	x11-libs/libXxf86misc:=
+	x11-libs/libXxf86vm:=
+	>=x11-libs/libXrandr-1.3:=
+	>=x11-libs/libxklavier-5.2:=
+	x11-misc/xscreensaver
+	>=xfce-base/garcon-0.5.0:=
+	>=xfce-base/libxfce4ui-4.12.1:=
+	>=xfce-base/libxfce4util-4.12.1:=
+	>=xfce-base/xfconf-4.12.1:=
+	consolekit? ( sys-auth/consolekit )
+	locking? (
+		pam? ( virtual/pam )
+	)
+	opengl? ( virtual/opengl )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-apps/dbus
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		# disable docbook for now
+		ac_cv_path_XMLTO=no
+
+		# xscreensaver dirs autodetection doesn't seem to work
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+
+		$(use_with opengl libgl)
+		$(use_enable locking)
+		$(use_enable pam)
+		$(use_with consolekit console-kit)
+		$(use_with systemd)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 2eb6718e7df0..e61cfb963b05 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-screenshooter-1.9.2.tar.bz2 504757 BLAKE2B 6c22e409974b6251a756f0b7ad
 DIST xfce4-screenshooter-1.9.3.tar.bz2 502188 BLAKE2B 93b60422eb6cef23b4d1f29fca49370cead8f74c4ee27ea4abf2bb9b4fa006f1dd9e39ccc87c1d915a5e7cc902245caff4b7778b801436a1c25893f46e35f3fb SHA512 ba59fdca3900143a50b3b858986b1152d4574d302d2e041a5287933427a67f64542ca691c130030937344433ea893a1f082086f9c02a9edccaeedbdc0a2a50a2
 EBUILD xfce4-screenshooter-1.9.1.ebuild 1100 BLAKE2B ba25af07633cc8c2636029d83dd4a7b03b03b1da2635c2110481b52c4ae8681809de81f6c0c9949c722a20f9c0f43d4d6b36b8ba185058199d1ac8b1cf2390c4 SHA512 373707325c3cfc345ea5b34ea81bdbf29b1efa67968cf6e12ab3c825995ac17055b9773740e15be7207d4ef377e2f10ffd1562def72d31bca93434f7919d66a5
 EBUILD xfce4-screenshooter-1.9.2.ebuild 1105 BLAKE2B 7425ab4787a4c726185fff2aa8cdaafe3d04f9dddac33628ef2eec1cbd111de07e3e0469341cb81f19c1739fb83067895dadbb4018f9bc2f3a615be22bad7dfb SHA512 05bada967a36563c6d1f3913ae9ff93ed0646a5a8369caed2fd47905893b00c71a805713135e3275786a9435d1cda525ff300d6b8005ede65b50999ec9f922cc
-EBUILD xfce4-screenshooter-1.9.3.ebuild 1105 BLAKE2B 7425ab4787a4c726185fff2aa8cdaafe3d04f9dddac33628ef2eec1cbd111de07e3e0469341cb81f19c1739fb83067895dadbb4018f9bc2f3a615be22bad7dfb SHA512 05bada967a36563c6d1f3913ae9ff93ed0646a5a8369caed2fd47905893b00c71a805713135e3275786a9435d1cda525ff300d6b8005ede65b50999ec9f922cc
+EBUILD xfce4-screenshooter-1.9.3.ebuild 1126 BLAKE2B 3c5684d33d36f2af1e59b14048260275fa37eb14357bd2ede66ef55bbac5446190e093e1983e45aa0a9d31749380d6b23dd83a991a78b9f89845cfa9634587f8 SHA512 fe4ca51e5c3a719bb30649b41bb83fbed877fd38e19b054726218ef17ed066b4d033ede6898f5e9faba1d6fa54f4dd15eabdd2e5a747ff312b55cffaa0d84e83
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
index a4b036e1dc6c..c3dbc8cab621 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
@@ -27,6 +27,7 @@ RDEPEND=">=dev-libs/glib-2.16:=
 	>=xfce-base/libxfce4util-4.10:=
 	>=xfce-base/libxfce4ui-4.12:="
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/intltool
 	virtual/pkgconfig"
 
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index e533ce6a0c5c..b898defd5aea 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,7 +1,7 @@
 DIST xfce4-sensors-plugin-1.2.6.tar.bz2 454524 BLAKE2B 1dc663f726f6079fc030ef08fc9384fd4ccf3b05786bb899c7028d9adb66d85e3da4d9aed5a29cc5b15c0bb258538fdca31cd2a9430710c1e0a383f8eb8d2353 SHA512 5c520f1c253df1bb9e29855c5ccfc1536034945ca68b43cd8b6d97083e528b2430230d9c51d43953a71c3f0171ae718bf1557714729b1343ebd51f91f3f36d60
 DIST xfce4-sensors-plugin-1.2.98.tar.bz2 477241 BLAKE2B dcb757e7014a159fbba77a24248a0663207aa0031a624d60c899483b608f729e31dafdd2de4e5d6a64122a2abbaa21eaa857afdbfa266203b0639ced7f299d4a SHA512 6437acc17d2719e3deef011c206c8c5593f4b14a8263e82bb3b0e8b1cb7e17e842adf2cb3a479e1a8e2729db744df2778ee04bc9af5e4c918f417e1c8ac4d17e
 DIST xfce4-sensors-plugin-1.3.0.tar.bz2 466468 BLAKE2B 52eadaec22980105fcf4c4e5efb4621b0966e86520e7ded90a1514f7925d76232278ec105785409dbe13f5ab4019363b47b63b5df642319a924fe5a8882b847c SHA512 77f6df354c883f9f0b99856738e0976e7bddd5f16c90a8715777c4f4d6debe116cdc21c2e0efbbe9f371d36f9469797d3e631854c33f8561e3ff32291cdef35a
-EBUILD xfce4-sensors-plugin-1.2.6.ebuild 1874 BLAKE2B a6d6192a3613a8a006b15ef14a587e5b6f01080e445e56bfb5936b0d43e314dbdc90c812a16e61fe636c38bad210e8d425169965f55a5dcfbf54430b19fe063c SHA512 d0333126b63d3e913a71afe88c770960a1f578e9b89ed1a573441f3aa3fca86c08621ec7c789c2c1dd50d2ddf54081c091389fa242af91fef3be2d5fe19c0e9a
-EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1461 BLAKE2B 082d21aac4042b4aaf0914e74a0caf222837869242bffe4e4bb86d6ad51991fe23b7f6f224ed46b99e7b4e5f289a2bf98749b1cd8268a92039463cd35e2d383e SHA512 aa5eb5bef8659f59a87963e70f3513248589dd5eea1d7a80da4c3ba2d5300f1e023d1ed11725826a23e698a85394cbcd66f828f48f411830ef80a760bffc1abb
-EBUILD xfce4-sensors-plugin-1.3.0.ebuild 1574 BLAKE2B c4c1204086170e1ee5e701e1302b4722ad7d689a68f936f44d041a07f2adbf68ee9303f99cbd5e4aca7fa2128fd85c78bb3ce76a28ab072d9bc714d74cc21c60 SHA512 1276e3e7d27a996cb70a60a8f70435dc9c8c6ab1cf27592edeb56983481b2520af92b157f87e8888fef4687037080bf09ac890ba4d39e7b4908fce405515a2bc
+EBUILD xfce4-sensors-plugin-1.2.6.ebuild 1825 BLAKE2B a83553cc2f8da8268ed29b9d6e32c3b9f495d00c40c4cabf50458ffaca2115803bdd50b28af201664e8a5df1ee335acd525d2b41611a2cd70564f619c5b02f63 SHA512 fcbbd7a6f2b1f699578107298bb8af49d9c1fbbe4dd911c1abaf0635677731afd16de4eb99a67796adcdaa6ec13e7f6963b162c76824099760fa6f5378629218
+EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1412 BLAKE2B 97e2eb9a00ce3b34606e023f917bc89f23fff70609327be9c9948f6990bf3c484a1cab8443f6b1399998c469e431530aae1210c00a84aa4a3549e8c8a59942c4 SHA512 b0e07260882350536c16d155c7918f54e060f2f815af62c18ef2c6ec45dc725157c5dd94f52a5d0fb595a9a691e794a72f1a28c56cdc9b93c6581b89b633f35a
+EBUILD xfce4-sensors-plugin-1.3.0.ebuild 1525 BLAKE2B 0746195fa636699147cf2b222d2002d4819f4d1a7006d2c0f130ab69f44b592250b2b0fcd2fda9b22fdbd3dd3864c7508db9779d33f4533d87a4c4f2c23cb83a SHA512 22392b48411fa32e7bd51058164cabbf160a26bfe29c224dbd885f79a1702bb4a1e2a4f446d12ef847f7bed3c805d45a2e0ec97975bd8c0a53a8fae1da86b9ac
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild
index acd8d1da0c1c..655ceef8317d 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,12 +22,8 @@ RDEPEND=">=x11-libs/gtk+-2.14:2=
 	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
 	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
-	video_cards_nvidia? (
-		|| (
-			x11-drivers/nvidia-drivers[tools,static-libs]
-			media-video/nvidia-settings
-			)
-	)"
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
+
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
index 225cabbdbf2a..57eab8986b1c 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,12 +20,8 @@ RDEPEND=">=x11-libs/gtk+-3.20:3=
 	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
 	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
-	video_cards_nvidia? (
-		|| (
-			x11-drivers/nvidia-drivers[tools,static-libs]
-			media-video/nvidia-settings
-			)
-	)"
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
+
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
index 0a7079f854dd..bae1569ee838 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,12 +22,8 @@ RDEPEND=">=x11-libs/gtk+-3.20:3=
 	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
 	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
-	video_cards_nvidia? (
-		|| (
-			x11-drivers/nvidia-drivers[tools,static-libs]
-			media-video/nvidia-settings
-			)
-	)"
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
+
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"